diff --git a/.circleci/README.md b/.circleci/README.md
deleted file mode 100644
index 6af7fd45cc3d..000000000000
--- a/.circleci/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-## CircleCI integration
-
-### Docker images
-
-The docker images are build locally on the developer machine:
-
-```sh
-cd .circleci/docker/
-
-docker build -t ethereum/solidity-buildpack-deps:ubuntu2204-<revision> -f Dockerfile.ubuntu2204 .
-docker push ethereum/solidity-buildpack-deps:ubuntu2204-<revision>
-```
-
-The current revisions per docker image are stored in [circle ci pipeline parameters](https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/pipeline-parameters.md#pipeline-parameters) called `<image-desc>-docker-image-rev` (e.g., `ubuntu-2204-docker-image-rev`). Please update the value assigned to the parameter(s) corresponding to the docker image(s) being updated at the time of the update. Please verify that the value assigned to the parameter matches the revision part of the docker image tag (`<revision>` in the docker build/push snippet shown above). Otherwise, the docker image used by circle ci and the one actually pushed to docker hub will differ.
-
-Once the docker image has been built and pushed to Dockerhub, you can find it at:
-
-    https://hub.docker.com/r/ethereum/solidity-buildpack-deps:ubuntu2204-<revision>
-
-where the image tag reflects the target OS and revision to build Solidity and run its tests on.
-
-### Testing docker images locally
-
-```sh
-cd solidity
-# Mounts your local solidity directory in docker container for testing
-docker run -v `pwd`:/src/solidity -ti ethereum/solidity-buildpack-deps:ubuntu2204-<revision> /bin/bash
-cd /src/solidity
-<commands_to_test_build_with_new_docker_image>
-```
diff --git a/.circleci/build_win.ps1 b/.circleci/build_win.ps1
deleted file mode 100644
index 730bb6319586..000000000000
--- a/.circleci/build_win.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-cd "$PSScriptRoot\.."
-
-if ("$Env:FORCE_RELEASE" -Or "$Env:CIRCLE_TAG") {
-	New-Item prerelease.txt -type file
-	Write-Host "Building release version."
-}
-else {
-	# Use last commit date rather than build date to avoid ending up with builds for
-	# different platforms having different version strings (and therefore producing different bytecode)
-	# if the CI is triggered just before midnight.
-	$last_commit_timestamp = git log -1 --date=unix --format=%cd HEAD
-	$last_commit_date = (Get-Date -Date "1970-01-01 00:00:00Z").toUniversalTime().addSeconds($last_commit_timestamp).ToString("yyyy.M.d")
-	-join("ci.", $last_commit_date) | out-file -encoding ascii prerelease.txt
-}
-
-mkdir build
-cd build
-$boost_dir=(Resolve-Path $PSScriptRoot\..\deps\boost\lib\cmake\Boost-*)
-..\deps\cmake\bin\cmake -G "Visual Studio 16 2019" -DBoost_DIR="$boost_dir\" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="$PSScriptRoot\..\upload" -DUSE_Z3=OFF ..
-if ( -not $? ) { throw "CMake configure failed." }
-msbuild solidity.sln /p:Configuration=Release /m:10 /v:minimal
-if ( -not $? ) { throw "Build failed." }
-..\deps\cmake\bin\cmake --build . -j 10 --target install --config Release
-if ( -not $? ) { throw "Install target failed." }
diff --git a/.circleci/cln-asan.supp b/.circleci/cln-asan.supp
deleted file mode 100644
index b16becf29bf6..000000000000
--- a/.circleci/cln-asan.supp
+++ /dev/null
@@ -1 +0,0 @@
-leak:*libcln*
diff --git a/.circleci/compare_bytecode_reports.sh b/.circleci/compare_bytecode_reports.sh
deleted file mode 100755
index 7b62656bf24e..000000000000
--- a/.circleci/compare_bytecode_reports.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-#------------------------------------------------------------------------------
-# Compares bytecode reports generated by prepare_report.py/.js.
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-#------------------------------------------------------------------------------
-
-no_cli_platforms=(
-    emscripten
-)
-native_platforms=(
-    ubuntu2004-static
-    ubuntu
-    osx
-    windows
-)
-interfaces=(
-    cli
-    standard-json
-)
-
-for preset in "$@"; do
-    report_files=()
-    for platform in "${no_cli_platforms[@]}"; do
-        report_files+=("bytecode-report-${platform}-${preset}.txt")
-    done
-    for platform in "${native_platforms[@]}"; do
-        for interface in "${interfaces[@]}"; do
-            report_files+=("bytecode-report-${platform}-${interface}-${preset}.txt")
-        done
-    done
-
-    echo "Reports to compare:"
-    printf -- "- %s\n" "${report_files[@]}"
-
-    if ! diff --brief --report-identical-files --from-file "${report_files[@]}"; then
-        diff --unified=0 --report-identical-files --from-file "${report_files[@]}" | head --lines 50
-        zip "bytecode-reports-${preset}.zip" "${report_files[@]}"
-        exit 1
-    fi
-done
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 7ec500e2e823..000000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,1875 +0,0 @@
-# vim:ts=2:sw=2:et
-# --------------------------------------------------------------------------
-#   Prefixes used in order to keep CircleCI workflow overview more readable:
-#     - b: build
-#     - t: test
-#     - ubu: ubuntu
-#     - ems: Emscripten
-version: 2.1
-parameters:
-  ubuntu-2004-docker-image:
-    type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-20
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a1e1b01eda0d1e20704279672bcfd53dbbc481898ff960958a225dea76345bd"
-  ubuntu-2204-docker-image:
-    type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-5
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:4df420b7ccd96f540a4300a4fae0fcac2f4d3f23ffff9e3777c1f2d7c37ef901"
-  ubuntu-2204-clang-docker-image:
-    type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-4
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:538596bf55961197f8b5670d8a6742d9bcd502b6a1045ae9d372cdf35ce69d93"
-  ubuntu-clang-ossfuzz-docker-image:
-    type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-2
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:a4fc3a41240c3bc58882d3f504e446c6931b547119012f5c45f79b0df91dbdd1"
-  emscripten-docker-image:
-    type: string
-    # NOTE: Please remember to update the `build_emscripten.sh` whenever the hash of this image changes.
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-16
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:19fcb5ac029bbc27ec36e10f7d14ea224d8010145f9690562ef084fd16146b0c"
-  evm-version:
-    type: string
-    default: london
-
-orbs:
-  win: circleci/windows@2.2.0
-
-commands:
-  matrix_notify_unless_pr:
-    description: "Posts a notification to the solidity-dev room on Matrix (if not running on a PR)."
-    parameters:
-      event:
-        type: enum
-        enum: ["failure", "success", "release"]
-      condition:
-        type: string
-    steps:
-      - run:
-          name: "Matrix notification"
-          when: << parameters.condition >>
-          command: scripts/ci/notification/matrix_notification.sh << parameters.event >>
-
-  matrix_notify_failure_unless_pr:
-    description: "Posts a failure notification to the main room on Matrix (if not running on a PR)."
-    steps:
-      - matrix_notify_unless_pr:
-          event: failure
-          condition: on_fail
-
-  matrix_notify_success_unless_pr:
-    description: "Posts a success notification to the main room on Matrix (if not running on a PR)."
-    steps:
-      - matrix_notify_unless_pr:
-          event: success
-          condition: on_success
-
-  matrix_notify_release_unless_pr:
-    description: "Posts a release notification to the main room on Matrix (if not running on a PR)."
-    steps:
-      - matrix_notify_unless_pr:
-          event: release
-          condition: on_success
-
-  prepare_bytecode_report:
-    description: "Generate bytecode report and upload it as an artifact."
-    parameters:
-      label:
-        type: string
-      binary_type:
-        type: enum
-        enum:
-          - solcjs
-          - native
-      binary_path:
-        type: string
-      preset:
-        type: string
-    steps:
-      - run:
-          name: Generate bytecode reports for the selected preset
-          no_output_timeout: 30m
-          command: |
-            .circleci/parallel_bytecode_report.sh \
-                "<< parameters.label >>" \
-                "<< parameters.binary_type >>" \
-                "${PWD}/<< parameters.binary_path >>" \
-                "<< parameters.preset >>"
-      - store_artifacts:
-          path: bytecode-report-<< parameters.label >>-standard-json-<< parameters.preset >>.txt
-      - store_artifacts:
-          path: bytecode-report-<< parameters.label >>-cli-<< parameters.preset >>.txt
-      - store_artifacts:
-          path: bytecode-report-<< parameters.label >>-<< parameters.preset >>.txt
-      - persist_to_workspace:
-          root: .
-          paths:
-            - bytecode-report-<< parameters.label >>*.txt
-      - matrix_notify_failure_unless_pr
-
-  install_python3:
-    description: "Install python3 and given packages."
-    parameters:
-      packages:
-        description: "List of extra Python packages to be installed (separated by space)."
-        type: string
-        default: ""
-    steps:
-      - run:
-          name: Install python and dependencies
-          command: |
-            sudo apt update
-            sudo apt install python3 python3-pip --assume-yes --no-install-recommends
-            if [[ "<< parameters.packages >>" != "" ]]
-            then
-              echo "Installing additional packages..."
-              python3 -m pip install --user << parameters.packages >>
-            fi
-
-  install_foundry:
-    description: "Install Foundry."
-    parameters:
-      version:
-        type: string
-        default: "nightly"
-      install_path:
-        type: string
-        default: /home/circleci/bin
-    steps:
-      - run:
-          name: Setup Foundry environment variables
-          command: |
-            FOUNDRY_REPO="foundry-rs/foundry"
-            FOUNDRY_VERSION="<< parameters.version >>"
-            # Make authenticated requests when the Github token is available
-            if [[ -n "$GITHUB_ACCESS_TOKEN" ]]; then
-              EXTRA_HEADERS=(--header 'Authorization: Bearer '"${GITHUB_ACCESS_TOKEN}")
-            fi
-            FOUNDRY_RELEASE_SHA=$(curl \
-              --silent \
-              --fail \
-              --show-error \
-              "${EXTRA_HEADERS[@]}" \
-              "https://api.github.com/repos/${FOUNDRY_REPO}/git/refs/tags/${FOUNDRY_VERSION}" \
-              | jq --raw-output .object.sha \
-            )
-            echo "export FOUNDRY_REPO=$FOUNDRY_REPO" >> "$BASH_ENV"
-            echo "export FOUNDRY_VERSION=$FOUNDRY_VERSION" >> "$BASH_ENV"
-            echo "export FOUNDRY_RELEASE_TAG='nightly-${FOUNDRY_RELEASE_SHA}'" >> "$BASH_ENV"
-            # Save commit sha for caching
-            echo "$FOUNDRY_RELEASE_SHA" > /tmp/workspace/foundry-release-sha
-      - restore_cache:
-          keys:
-            - foundry-<< parameters.version >>-{{ arch }}-{{ checksum "/tmp/workspace/foundry-release-sha" }}
-      # WARNING! If you edit anything between here and save_cache, remember to invalidate the cache manually.
-      - run:
-          name: Install foundry
-          command: |
-            ! forge --version 2> /dev/null
-            curl \
-              --fail \
-              --location \
-              --output /tmp/foundry.tar.gz \
-              "https://github.com/${FOUNDRY_REPO}/releases/download/${FOUNDRY_RELEASE_TAG}/foundry_${FOUNDRY_VERSION}_linux_amd64.tar.gz"
-            cd "<< parameters.install_path >>"
-            tar --extract --gzip --file /tmp/foundry.tar.gz --one-top-level
-            ln --symbolic --force foundry/{forge,anvil,cast,chisel} .
-      - save_cache:
-          key: foundry-<< parameters.version >>-{{ arch }}-{{ checksum "/tmp/workspace/foundry-release-sha" }}
-          paths:
-            - << parameters.install_path >>
-
-  # --------------------------------------------------------------------------
-  # Build Commands
-
-  setup_prerelease_commit_hash:
-    steps:
-      - run:
-          name: Store commit hash and prerelease
-          command: |
-            if [[ $CIRCLE_BRANCH == release || -n $CIRCLE_TAG ]]; then
-              echo -n > prerelease.txt;
-            else
-              date -u +"nightly.%Y.%-m.%-d" > prerelease.txt;
-            fi
-            echo -n "$CIRCLE_SHA1" > commit_hash.txt
-
-  run_build:
-    steps:
-      - run:
-          name: Build
-          command: scripts/ci/build.sh
-
-  run_build_ossfuzz:
-    steps:
-      - run:
-          name: Build_ossfuzz
-          command: scripts/ci/build_ossfuzz.sh
-
-  run_proofs:
-    steps:
-      - run:
-          name: Correctness proofs for optimization rules
-          command: scripts/run_proofs.sh
-
-  run_soltest:
-    steps:
-      - run:
-          name: soltest
-          no_output_timeout: 30m
-          command: .circleci/soltest.sh
-
-  run_soltest_all:
-    steps:
-      - run:
-          name: soltest_all
-          no_output_timeout: 30m
-          command: .circleci/soltest_all.sh
-
-  run_cmdline_tests:
-    steps:
-      - run:
-          name: command line tests
-          no_output_timeout: 30m
-          command: .circleci/parallel_cli_tests.py
-
-  run_docs_pragma_min_version:
-    steps:
-      - run:
-         name: docs pragma version check
-         command: scripts/docs_version_pragma_check.sh
-
-  # --------------------------------------------------------------------------
-  # Artifact Commands
-
-  store_artifacts_solc:
-    description: Store compiled solc executable as artifact
-    steps:
-      - store_artifacts:
-          path: build/solc/solc
-          destination: solc
-
-  store_artifacts_yul_phaser:
-    steps:
-      - store_artifacts:
-          path: build/tools/yul-phaser
-          destination: yul-phaser
-
-  persist_executables_to_workspace:
-    description: Persist compiled target executables to workspace
-    steps:
-      - persist_to_workspace:
-          root: build
-          paths:
-            - solc/solc
-            - test/soltest
-            - test/tools/solfuzzer
-
-  persist_executables_to_workspace_osx:
-    description: Persist compiled target executables to workspace on macOS
-    steps:
-      - persist_to_workspace:
-          root: .
-          paths:
-            - build/solc/solc
-            - build/test/soltest
-            - build/test/tools/solfuzzer
-
-  persist_ossfuzz_executables_to_workspace:
-    description: Persist compiled OSSFUZZ executables to workspace
-    steps:
-      - persist_to_workspace:
-          root: build
-          paths:
-            - test/tools/ossfuzz/abiv2_proto_ossfuzz
-            - test/tools/ossfuzz/abiv2_isabelle_ossfuzz
-            - test/tools/ossfuzz/const_opt_ossfuzz
-            - test/tools/ossfuzz/solc_mutator_ossfuzz
-            - test/tools/ossfuzz/solc_ossfuzz
-            - test/tools/ossfuzz/stack_reuse_codegen_ossfuzz
-            - test/tools/ossfuzz/strictasm_assembly_ossfuzz
-            - test/tools/ossfuzz/strictasm_diff_ossfuzz
-            - test/tools/ossfuzz/strictasm_opt_ossfuzz
-            - test/tools/ossfuzz/yul_proto_diff_ossfuzz
-            - test/tools/ossfuzz/yul_proto_diff_custom_mutate_ossfuzz
-            - test/tools/ossfuzz/yul_proto_ossfuzz
-            - test/tools/ossfuzz/sol_proto_ossfuzz
-
-  store_artifacts_test_results:
-    description: Store test output dir as artifact
-    steps:
-      - store_artifacts:
-          path: test_results/
-          destination: test_results/
-
-  # --------------------------------------------------------------------------
-  # Complex Build Commands
-
-  soltest:
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      # NOTE: Different build jobs produce different soltest executables (release/debug,
-      # clang/gcc, windows/linux/macos, etc.). The executable used by these steps comes from the
-      # attached workspace and we only see the items added to the workspace by jobs we depend on.
-      - run_soltest
-      - store_test_results:
-          path: test_results/
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  test_lsp:
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: Install dependencies
-          command: pip install --user deepdiff colorama
-      - run:
-          name: Executing solc LSP test suite
-          command: test/lsp.py build/solc/solc --non-interactive
-      - matrix_notify_failure_unless_pr
-
-  build:
-    steps:
-      - checkout
-      - run_build
-      - store_artifacts_solc
-      - store_artifacts_yul_phaser
-      - persist_executables_to_workspace
-      - matrix_notify_failure_unless_pr
-
-  soltest_all:
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run_soltest_all
-      - store_test_results:
-          path: test_results/
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  cmdline_tests:
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run_cmdline_tests
-      - store_test_results:
-          path: test_results/
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  install_dependencies_osx:
-    steps:
-      # FIXME: We used to cache dependencies on macOS but now it takes longer than just installing
-      # them each time. See https://github.com/ethereum/solidity/issues/12925.
-      - run:
-          name: Install build dependencies
-          command: .circleci/osx_install_dependencies.sh
-
-defaults:
-
-  # --------------------------------------------------------------------------
-  # Matrix templates
-
-  - bytecode_compare_env_presets: &bytecode_compare_env_presets
-      PRESETS:
-        legacy-optimize
-        legacy-no-optimize
-        via-ir-optimize
-        via-ir-no-optimize
-
-  - bytecode_compare_preset_matrix: &bytecode_compare_preset_matrix
-      parameters:
-        preset:
-          # NOTE: Keep in sync with preset list in bytecode_compare_env_presets
-          - legacy-optimize
-          - legacy-no-optimize
-          - via-ir-optimize
-          - via-ir-no-optimize
-
-  # --------------------------------------------------------------------------
-  # --------------------------------------------------------------------------
-  # Base Image Templates
-
-  - base_archlinux: &base_archlinux
-      docker:
-        - image: archlinux:base
-      environment: &base_archlinux_env
-        TERM: xterm
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_archlinux_large: &base_archlinux_large
-      <<: *base_archlinux
-      resource_class: large
-      environment: &base_archlinux_large_env
-        <<: *base_archlinux_env
-        MAKEFLAGS: -j 5
-        CPUs: 5
-
-  - base_cimg_small: &base_cimg_small
-      docker:
-        - image: cimg/base:current
-      resource_class: small
-      environment: &base_cimg_small_env
-        TERM: xterm
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_ems_large: &base_ems_large
-      docker:
-        - image: << pipeline.parameters.emscripten-docker-image >>
-      resource_class: large
-      environment: &base_ems_large_env
-        TERM: xterm
-        MAKEFLAGS: -j 5
-        CPUs: 5
-
-  - base_node_small: &base_node_small
-      docker:
-        - image: cimg/node:current
-      resource_class: small
-      environment: &base_node_small_env
-        TERM: xterm
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_osx: &base_osx
-      macos:
-        xcode: "14.2.0"
-      resource_class: macos.x86.medium.gen2
-      environment: &base_osx_env
-        TERM: xterm
-        MAKEFLAGS: -j5
-        CPUs: 5
-
-  - base_python_small: &base_python_small
-      docker:
-        - image: cimg/python:3.6
-      resource_class: small
-      environment: &base_python_small_env
-        TERM: xterm
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_ubuntu_clang: &base_ubuntu_clang
-      docker:
-        - image: << pipeline.parameters.ubuntu-clang-ossfuzz-docker-image >>
-      environment: &base_ubuntu_clang_env
-        TERM: xterm
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_ubuntu_clang_small: &base_ubuntu_clang_small
-      <<: *base_ubuntu_clang
-      resource_class: small
-      environment: &base_ubuntu_clang_small_env
-        <<: *base_ubuntu_clang_env
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_ubuntu2004: &base_ubuntu2004
-      docker:
-        - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-      environment: &base_ubuntu2004_env
-        TERM: xterm
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_ubuntu2004_small: &base_ubuntu2004_small
-      <<: *base_ubuntu2004
-      resource_class: small
-      environment: &base_ubuntu2004_small_env
-        <<: *base_ubuntu2004_env
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
-      <<: *base_ubuntu2004
-      resource_class: xlarge
-      environment: &base_ubuntu2004_xlarge_env
-        <<: *base_ubuntu2004_env
-        MAKEFLAGS: -j 10
-        CPUs: 10
-
-  - base_ubuntu2204: &base_ubuntu2204
-      docker:
-        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
-      environment: &base_ubuntu2204_env
-        TERM: xterm
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_ubuntu2204_clang: &base_ubuntu2204_clang
-      docker:
-        - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >>
-      environment: &base_ubuntu2204_clang_env
-        TERM: xterm
-        CC: clang
-        CXX: clang++
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
-      <<: *base_ubuntu2204_clang
-      resource_class: large
-      environment: &base_ubuntu2204_clang_large_env
-        <<: *base_ubuntu2204_clang_env
-        MAKEFLAGS: -j 5
-        CPUs: 5
-
-  - base_ubuntu2204_small: &base_ubuntu2204_small
-      <<: *base_ubuntu2204
-      resource_class: small
-      environment: &base_ubuntu2204_small_env
-        <<: *base_ubuntu2204_env
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_ubuntu2204_large: &base_ubuntu2204_large
-      <<: *base_ubuntu2204
-      resource_class: large
-      environment: &base_ubuntu2204_large_env
-        <<: *base_ubuntu2204_env
-        MAKEFLAGS: -j 5
-        CPUs: 5
-
-  - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
-      <<: *base_ubuntu2204
-      resource_class: xlarge
-      environment: &base_ubuntu2204_xlarge_env
-        <<: *base_ubuntu2204_env
-        MAKEFLAGS: -j 10
-        CPUs: 10
-
-  - base_win: &base_win
-      executor:
-        name: win/default
-        shell: bash.exe
-
-  - base_win_large: &base_win_large
-      executor:
-        name: win/default
-        size: large
-        shell: bash.exe
-
-  # --------------------------------------------------------------------------
-  # Workflow Templates
-
-  - on_all_tags_and_branches: &on_all_tags_and_branches
-      filters:
-        tags:
-          only: /.*/
-
-  - on_version_tags: &on_version_tags
-      filters:
-        tags:
-          only: /^v.*/
-        branches:
-          ignore: /.*/
-
-  - on_develop: &on_develop
-      filters:
-        branches:
-          only:
-            - develop
-
-  - requires_nothing: &requires_nothing
-      <<: *on_all_tags_and_branches
-
-  - requires_b_ubu: &requires_b_ubu
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu
-
-  - requires_b_ubu_clang: &requires_b_ubu_clang
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_clang
-
-  - requires_b_ubu_force_release: &requires_b_ubu_force_release
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_force_release
-
-  - requires_b_ubu_static: &requires_b_ubu_static
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_static
-
-  - requires_b_archlinux: &requires_b_archlinux
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_archlinux
-
-  - requires_b_ubu_codecov: &requires_b_ubu_codecov
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_codecov
-
-  - requires_b_osx: &requires_b_osx
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_osx
-
-  - requires_b_ubu_asan: &requires_b_ubu_asan
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_asan
-
-  - requires_b_ubu_asan_clang: &requires_b_ubu_asan_clang
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_asan_clang
-
-  - requires_b_ubu_ubsan_clang: &requires_b_ubu_ubsan_clang
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_ubsan_clang
-
-  - requires_b_ems: &requires_b_ems
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ems
-
-  - requires_b_ubu_ossfuzz: &requires_b_ubu_ossfuzz
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_ossfuzz
-
-  - requires_b_win: &requires_b_win
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_win
-
-  # --------------------------------------------------------------------------
-  # Parameterized Job Templates
-
-  # Separate compile-only runs of those external tests where a full run takes much longer.
-  # Also see https://github.com/ethereum/solidity/pull/14234 for why we excluded those
-  # external tests from the nightly jobs.
-  - job_ems_compile_ext_colony: &job_ems_compile_ext_colony
-      <<: *requires_b_ems
-      name: t_ems_compile_ext_colony
-      project: colony
-      binary_type: solcjs
-      compile_only: 1
-      image: cimg/node:14.20
-      python2: true
-
-  - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_gnosis
-      project: gnosis
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_zeppelin
-      project: zeppelin
-      binary_type: native
-      image: cimg/node:18.16
-      resource_class: large
-
-  - job_native_test_ext_ens: &job_native_test_ext_ens
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_ens
-      project: ens
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_trident: &job_native_test_ext_trident
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_trident
-      project: trident
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_euler: &job_native_test_ext_euler
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_euler
-      project: euler
-      binary_type: native
-      resource_class: medium
-
-  - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_yield_liquidator
-      project: yield-liquidator
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_bleeps
-      project: bleeps
-      binary_type: native
-      resource_class: medium
-
-  - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_pool_together
-      project: pool-together
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_perpetual_pools
-      project: perpetual-pools
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_uniswap
-      project: uniswap
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_prb_math
-      project: prb-math
-      binary_type: native
-      image: cimg/rust:1.70
-
-  - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_elementfi
-      project: elementfi
-      binary_type: native
-      image: cimg/node:18.16
-      resource_class: medium
-
-  - job_native_test_ext_brink: &job_native_test_ext_brink
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_brink
-      project: brink
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_chainlink
-      project: chainlink
-      binary_type: native
-      image: cimg/node:18.16
-      resource_class: large # Tests run out of memory on a smaller machine
-
-  - job_native_test_ext_gp2: &job_native_test_ext_gp2
-      <<: *requires_b_ubu_static
-      name: t_native_test_ext_gp2
-      project: gp2
-      binary_type: native
-      image: cimg/node:18.16
-
-  - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
-      <<: *on_all_tags_and_branches
-      name: b_ubu_asan_clang
-      cmake_options: -DSANITIZE=address
-
-  - job_b_ubu_ubsan_clang: &job_b_ubu_ubsan_clang
-      <<: *on_all_tags_and_branches
-      name: b_ubu_ubsan_clang
-      cmake_options: -DSANITIZE=undefined
-
-# -----------------------------------------------------------------------------------------------
-jobs:
-
-  chk_spelling:
-    <<: *base_python_small
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: Install dependencies
-          command: |
-            pip install --user codespell
-      - run:
-          name: Check spelling
-          command: |
-            ~/.local/bin/codespell \
-              --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" \
-              --ignore-words scripts/codespell_whitelist.txt \
-              --exclude-file scripts/codespell_ignored_lines.txt
-      - matrix_notify_failure_unless_pr
-
-  chk_docs_examples:
-    <<: *base_node_small
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: JS deps
-          command: sudo npm install -g solhint
-      - run:
-          name: Test Docs examples
-          command: test/docsCodeStyle.sh
-      - matrix_notify_failure_unless_pr
-
-  chk_coding_style:
-    <<: *base_cimg_small
-    steps:
-      - checkout
-      - run:
-          name: Install shellcheck
-          command: |
-            sudo apt -q update
-            sudo apt install -y shellcheck
-      - run:
-          name: Check for C++ coding style
-          command: scripts/check_style.sh
-      - run:
-          name: checking shell scripts
-          command: scripts/chk_shellscripts/chk_shellscripts.sh
-      - run:
-          name: Check for broken symlinks
-          command: scripts/check_symlinks.sh
-      - matrix_notify_failure_unless_pr
-
-  chk_errorcodes:
-    <<: *base_python_small
-    steps:
-      - checkout
-      - run:
-          name: Check for error codes
-          command: scripts/error_codes.py --check
-      - matrix_notify_failure_unless_pr
-
-  chk_pylint:
-    <<: *base_cimg_small
-    steps:
-      - checkout
-      - install_python3:
-          packages: >
-            pylint
-            z3-solver
-            pygments-lexer-solidity
-            parsec
-            tabulate
-            deepdiff
-            colorama
-            requests
-      - run: pylint --version
-      - run:
-          name: Linting Python Scripts
-          command: scripts/pylint_all.py
-      - matrix_notify_failure_unless_pr
-
-  chk_antlr_grammar:
-    <<: *base_cimg_small
-    steps:
-      - checkout
-      - run:
-          name: Install Java
-          command: |
-            sudo apt -q update
-            sudo apt install -y openjdk-17-jdk
-      - run:
-          name: Run tests
-          command: scripts/test_antlr_grammar.sh
-      - matrix_notify_failure_unless_pr
-
-  chk_buglist:
-    <<: *base_node_small
-    steps:
-      - checkout
-      - run:
-          name: JS deps
-          command: |
-            npm install download
-            npm install JSONPath
-            npm install mktemp
-      - run:
-          name: Test buglist
-          command: test/buglistTests.js
-      - matrix_notify_failure_unless_pr
-
-  chk_proofs:
-    <<: *base_cimg_small
-    steps:
-      - checkout
-      - install_python3:
-          packages: z3-solver
-      - run_proofs
-      - matrix_notify_failure_unless_pr
-
-  chk_docs_pragma_min_version:
-    <<: *base_ubuntu2204_small
-    steps:
-      - checkout
-      - run_docs_pragma_min_version
-      - matrix_notify_failure_unless_pr
-
-  t_ubu_pyscripts:
-    <<: *base_ubuntu2204_small
-    steps:
-      - checkout
-      - run:
-          name: Python unit tests
-          command: python3 test/pyscriptTests.py
-      - matrix_notify_failure_unless_pr
-
-  t_win_pyscripts:
-    <<: *base_win
-    steps:
-      - run: git config --global core.autocrlf false
-      - checkout
-      - run:
-          name: Python unit tests
-          command: python.exe test/pyscriptTests.py
-      - matrix_notify_failure_unless_pr
-
-  b_ubu: &b_ubu
-    # this runs 2x faster on xlarge but takes 4x more resources (compared to medium).
-    # Enough other jobs depend on it that it's worth it though.
-    <<: *base_ubuntu2204_xlarge
-    steps:
-      - build
-
-  # x64 ASAN build, for testing for memory related bugs
-  b_ubu_asan: &b_ubu_asan
-    # Runs slightly faster on large and xlarge but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2204
-    environment:
-      <<: *base_ubuntu2204_env
-      CMAKE_OPTIONS: -DSANITIZE=address
-      CMAKE_BUILD_TYPE: Release
-    steps:
-      - build
-
-  b_ubu_clang: &b_ubu_clang
-    <<: *base_ubuntu2204_clang_large
-    environment:
-      <<: *base_ubuntu2204_clang_large_env
-      MAKEFLAGS: -j 10
-    steps:
-      - build
-
-  b_ubu_san_clang:
-    # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
-    parameters:
-      cmake_options:
-        type: string
-    <<: *base_ubuntu2204_clang
-    environment:
-      <<: *base_ubuntu2204_clang_env
-      CMAKE_OPTIONS: << parameters.cmake_options >>
-    steps:
-      - build
-
-  b_ubu_force_release: &b_ubu_force_release
-    <<: *b_ubu
-    environment:
-      <<: *base_ubuntu2204_xlarge_env
-      FORCE_RELEASE: ON
-
-  b_ubu_static:
-    # We temporarily keep building static release binaries on ubuntu 20.04
-    # to avoid glibc incompatibilities.
-    # See: https://github.com/ethereum/solidity/issues/13954
-    # On large runs 2x faster than on medium. 3x on xlarge.
-    <<: *base_ubuntu2004_xlarge
-    environment:
-      <<: *base_ubuntu2204_xlarge_env
-      CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
-    steps:
-      - checkout
-      - run_build
-      - run:
-          name: strip binary
-          command: strip build/solc/solc
-      - store_artifacts:
-          path: build/solc/solc
-          destination: solc-static-linux
-      - run: mv build/solc/solc build/solc/solc-static-linux
-      - persist_to_workspace:
-          root: build
-          paths:
-            - solc/solc-static-linux
-      - matrix_notify_failure_unless_pr
-
-  b_ubu_codecov:
-    # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2204
-    environment:
-      <<: *base_ubuntu2204_env
-      COVERAGE: ON
-      CMAKE_BUILD_TYPE: Debug
-    steps:
-      - checkout
-      - run_build
-      - persist_executables_to_workspace
-      - matrix_notify_failure_unless_pr
-
-  t_ubu_codecov:
-    <<: *base_ubuntu2204_large
-    environment:
-      <<: *base_ubuntu2204_large_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 1
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: "soltest: Syntax Tests"
-          command: build/test/soltest -t 'syntaxTest*' -- --testpath test
-      - run:
-          name: "Code Coverage: Syntax Tests"
-          command: codecov --flags syntax --gcov-root build
-      - run_soltest
-      - run:
-          name: "Coverage: All"
-          command: codecov --flags all --gcov-root build
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  # Builds in C++20 mode and uses debug build in order to speed up.
-  # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
-  b_ubu_cxx20:
-    <<: *base_ubuntu2204_large
-    environment:
-      <<: *base_ubuntu2204_large_env
-      CMAKE_BUILD_TYPE: Debug
-      CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
-      MAKEFLAGS: -j 10
-    steps:
-      - checkout
-      - run_build
-      - matrix_notify_failure_unless_pr
-
-  b_ubu_ossfuzz: &b_ubu_ossfuzz
-    <<: *base_ubuntu_clang
-    steps:
-      - checkout
-      - setup_prerelease_commit_hash
-      - run_build_ossfuzz
-      - persist_ossfuzz_executables_to_workspace
-      - matrix_notify_failure_unless_pr
-
-  t_ubu_ossfuzz: &t_ubu_ossfuzz
-    <<: *base_ubuntu_clang_small
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: Regression tests
-          command: |
-            git clone https://github.com/ethereum/solidity-fuzzing-corpus /tmp/solidity-fuzzing-corpus
-            mkdir -p test_results
-            scripts/regressions.py -o test_results
-      - store_test_results:
-          path: test_results/
-      - store_artifacts_test_results
-
-  b_archlinux:
-    <<: *base_archlinux_large
-    environment:
-      <<: *base_archlinux_large_env
-      # This can be switched off if we run out of sync with Arch.
-      USE_Z3: ON
-    steps:
-      - run:
-          name: Install build dependencies
-          command: |
-            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake cvc4 git openssh tar
-      - checkout
-      - run_build
-      - store_artifacts_solc
-      - persist_executables_to_workspace
-      - matrix_notify_failure_unless_pr
-
-  b_osx:
-    <<: *base_osx
-    environment:
-      <<: *base_osx_env
-      CMAKE_BUILD_TYPE: Release
-    steps:
-      - checkout
-      - install_dependencies_osx
-      - run_build
-      - store_artifacts_solc
-      - store_artifacts_yul_phaser
-      - persist_executables_to_workspace_osx
-      - matrix_notify_failure_unless_pr
-
-  t_osx_soltest: &t_osx_soltest
-    <<: *base_osx
-    environment:
-      <<: *base_osx_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 0
-    steps:
-      - checkout
-      - install_dependencies_osx
-      - attach_workspace:
-          at: .
-      - run_soltest
-      - store_test_results:
-          path: test_results/
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  t_osx_cli:
-    <<: *base_osx
-    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
-    steps:
-      - checkout
-      - install_dependencies_osx
-      - attach_workspace:
-          at: .
-      - run_cmdline_tests
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  b_ems:
-    <<: *base_ems_large
-    environment:
-      <<: *base_ems_large_env
-      MAKEFLAGS: -j 10
-    steps:
-      - checkout
-      - run:
-          name: Build
-          command: |
-            scripts/ci/build_emscripten.sh
-      - store_artifacts:
-          path: upload/soljson.js
-          destination: soljson.js
-      - run: mkdir -p workspace
-      - run: cp upload/soljson.js workspace/soljson.js
-      - run: scripts/get_version.sh > workspace/version.txt
-      - persist_to_workspace:
-          root: workspace
-          paths:
-            - soljson.js
-            - version.txt
-      - matrix_notify_failure_unless_pr
-
-  b_docs:
-    <<: *base_ubuntu2204_small
-    steps:
-      - checkout
-      - setup_prerelease_commit_hash
-      - run:
-          name: Build documentation
-          command: docs/docs.sh
-      - store_artifacts:
-          path: docs/_build/html/
-          destination: docs-html
-      - matrix_notify_failure_unless_pr
-
-  t_ubu_soltest_all: &t_ubu_soltest_all
-    <<: *base_ubuntu2204_large
-    parallelism: 50
-    steps:
-      - soltest_all
-
-  t_ubu_lsp: &t_ubu_lsp
-    <<: *base_ubuntu2204_small
-    steps:
-      - test_lsp
-
-  t_archlinux_soltest: &t_archlinux_soltest
-    <<: *base_archlinux
-    parallelism: 20
-    environment:
-      <<: *base_archlinux_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 0
-      # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
-      # thus we forgo semantics tests to speed things up.
-      SOLTEST_FLAGS: --no-semantic-tests --no-smt
-    steps:
-      - run:
-          name: Install runtime dependencies
-          command: |
-            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
-      - soltest
-
-  t_ubu_clang_soltest: &t_ubu_clang_soltest
-    <<: *base_ubuntu2204_clang
-    parallelism: 20
-    environment:
-      <<: *base_ubuntu2204_clang_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 0
-      # The high parallelism in this job is causing the SMT tests to run out of memory,
-      # so disabling for now.
-      SOLTEST_FLAGS: --no-smt
-    steps:
-      - soltest
-
-  t_ubu_force_release_soltest_all: &t_ubu_force_release_soltest_all
-    # NOTE: This definition is identical to t_ubu_soltest_all but in the workflow we make it depend on
-    # a different job (b_ubu_force_release) so the workspace it attaches contains a different executable.
-    <<: *t_ubu_soltest_all
-
-  t_ubu_cli: &t_ubu_cli
-    <<: *base_ubuntu2204_small
-    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
-    steps:
-      - cmdline_tests
-
-  t_ubu_force_release_cli: &t_ubu_force_release_cli
-    <<: *t_ubu_cli
-
-  t_ubu_locale:
-    <<: *base_ubuntu2204_small
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run: test/localeTest.sh build/solc/solc
-      - matrix_notify_failure_unless_pr
-
-  t_ubu_asan_cli:
-    # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2204
-    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
-    environment:
-      <<: *base_ubuntu2204_env
-      ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
-      # Suppress CLN memory leak.
-      # See: https://github.com/ethereum/solidity/issues/13891 for details.
-      LSAN_OPTIONS: suppressions=/root/project/.circleci/cln-asan.supp:print_suppressions=0
-    steps:
-      - cmdline_tests
-
-  t_ubu_asan_soltest:
-    <<: *base_ubuntu2204
-    parallelism: 20
-    environment:
-      <<: *base_ubuntu2204_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 0
-      SOLTEST_FLAGS: --no-smt
-      ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
-      # Suppress CLN memory leak.
-      # See: https://github.com/ethereum/solidity/issues/13891 for details.
-      LSAN_OPTIONS: suppressions=/root/project/.circleci/cln-asan.supp
-    steps:
-      - soltest
-
-  t_ubu_asan_clang_soltest:
-    <<: *base_ubuntu2204_clang
-    parallelism: 20
-    environment:
-      <<: *base_ubuntu2204_clang_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 0
-      SOLTEST_FLAGS: --no-smt
-      ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
-    steps:
-      - soltest
-
-  t_ubu_ubsan_clang_soltest:
-    <<: *base_ubuntu2204_clang
-    parallelism: 20
-    environment:
-      <<: *base_ubuntu2204_clang_env
-      EVM: << pipeline.parameters.evm-version >>
-      SOLTEST_FLAGS: --no-smt
-    steps:
-      - soltest
-
-  t_ubu_ubsan_clang_cli:
-    <<: *base_ubuntu2204_clang
-    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
-    steps:
-      - cmdline_tests
-
-  t_ems_solcjs:
-    # Unlike other t_ems jobs this one actually runs 2x faster on medium (compared to small).
-    <<: *base_ubuntu2204
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Install test dependencies
-          command: |
-            apt-get update
-            apt-get install -qqy --no-install-recommends nodejs npm
-      - run:
-          name: Test solcjs
-          no_output_timeout: 30m
-          command: |
-            node --version
-            npm --version
-            test/externalTests/solc-js/solc-js.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
-      - matrix_notify_failure_unless_pr
-
-  t_ems_ext_hardhat:
-    <<: *base_node_small
-    docker:
-      - image: cimg/node:18.16
-    environment:
-      <<: *base_node_small_env
-      HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/workspace
-      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git
-      - run:
-          name: Install dependencies
-          command: |
-            cd hardhat
-            yarn
-      - run:
-          name: Run hardhat-core test suite
-          command: |
-            HARDHAT_TESTS_SOLC_VERSION=$(scripts/get_version.sh)
-            export HARDHAT_TESTS_SOLC_VERSION
-
-            # NOTE: This is expected to work without running `yarn build` first.
-            cd hardhat/packages/hardhat-core
-            yarn test
-      - matrix_notify_failure_unless_pr
-
-  t_ext:
-    parameters:
-      project:
-        type: string
-      binary_type:
-        type: enum
-        enum:
-          - solcjs
-          - native
-      compile_only:
-        type: integer
-        default: 0
-      image:
-        type: string
-        default: cimg/node:current
-      resource_class:
-        type: string
-        default: small
-      python2:
-        type: boolean
-        default: false
-    docker:
-      - image: << parameters.image >>
-    resource_class: << parameters.resource_class >>
-    # NOTE: Each external test runs up to 6 independent settings presets. If parallelism is higher than
-    # actual preset count, some runs will exit immediately. If it's lower, some runs will get more than one preset.
-    parallelism: 6
-    environment:
-      TERM: xterm
-      COMPILE_ONLY: << parameters.compile_only >>
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/workspace
-      - install_foundry
-      - install_python3:
-          packages: requests
-      - run:
-          name: Install lsof
-          command: |
-            # lsof is used by Colony in its stop-blockchain-client.sh script
-            sudo apt update
-            sudo apt-get --quiet --assume-yes --no-install-recommends install lsof
-      - when:
-          condition: << parameters.python2 >>
-          steps:
-            - run:
-                name: Install Python 2 and make it the default
-                command: |
-                  # python is used by node-gyp to build native modules (needed for Colony).
-                  # In the 14.x image node-gyp still requires Python 2.
-                  sudo apt install python2 --assume-yes --no-install-recommends
-                  sudo update-alternatives --install /usr/bin/python python /usr/bin/python2 1
-      - when:
-          condition:
-            equal: [<< parameters.binary_type >>, "solcjs"]
-          steps:
-            - run:
-                name: External << parameters.project >> tests (<< parameters.binary_type >>)
-                command: |
-                  test/external_tests.py test --solc-binary-type "<< parameters.binary_type >>" --solc-binary-path /tmp/workspace/soljson.js --run "<< parameters.project >>"
-      - when:
-          condition:
-            equal: [<< parameters.binary_type >>, "native"]
-          steps:
-            - run:
-                name: External << parameters.project >> tests (<< parameters.binary_type >>)
-                command: |
-                  test/external_tests.py test --solc-binary-type "<< parameters.binary_type >>" --solc-binary-path /tmp/workspace/solc/solc-static-linux --run "<< parameters.project >>"
-      - store_artifacts:
-          path: reports/externalTests/
-      # persist_to_workspace fails if the directory does not exist and the test script will create
-      # it only if it actually has benchmark results.
-      - run: mkdir -p reports/externalTests/
-      - persist_to_workspace:
-          root: .
-          paths:
-            - reports/externalTests/
-      - matrix_notify_failure_unless_pr
-
-  c_ext_benchmarks:
-    <<: *base_node_small
-    steps:
-      - install_python3:
-          packages: requests
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Combine benchmark reports
-          command: cat reports/externalTests/benchmark-*.json | scripts/externalTests/merge_benchmarks.sh > reports/externalTests/all-benchmarks.json
-      - run:
-          name: Summarize reports
-          command: cat reports/externalTests/all-benchmarks.json | scripts/externalTests/summarize_benchmarks.sh > reports/externalTests/summarized-benchmarks.json
-      - run:
-          name: Download reports from base branch
-          command: |
-            if [[ $CIRCLE_PULL_REQUEST != "" ]]; then
-              mkdir reports/externalTests/base-branch/
-              cd reports/externalTests/base-branch/
-
-              pr_id=$(echo "$CIRCLE_PULL_REQUEST" | sed 's|\(.*\)\/||')
-              scripts_dir=../../../scripts
-
-              # Our main goal here is to provide new benchmarks, the diff is optional. When benchmarks from
-              # the previous run are not available for whatever reason, we still succeed and just skip the diff.
-              # download_benchmarks.py exits with status 2 in that case.
-              if "${scripts_dir}/externalTests/download_benchmarks.py" --base-of-pr "$pr_id" || [[ $? == 2 ]]; then
-                echo 'export SKIP_BENCHMARK_DIFF=true' >> $BASH_ENV
-              fi
-            fi
-      - run:
-          name: Diff benchmarks
-          command: |
-            if [[ $CIRCLE_PULL_REQUEST != "" && $SKIP_BENCHMARK_DIFF != "true" ]]; then
-              cd reports/externalTests/
-              mkdir diff/
-              scripts_dir=../../scripts
-
-              "${scripts_dir}/externalTests/benchmark_diff.py" table \
-                --output-format markdown \
-                --style humanized \
-                base-branch/summarized-benchmarks-*.json \
-                summarized-benchmarks.json > diff/benchmark-diff-summarized-table-markdown-humanized.md
-              "${scripts_dir}/externalTests/benchmark_diff.py" table \
-                --output-format markdown \
-                --style absolute \
-                base-branch/summarized-benchmarks-*.json \
-                summarized-benchmarks.json > diff/benchmark-diff-summarized-table-markdown-absolute.md
-              "${scripts_dir}/externalTests/benchmark_diff.py" inplace \
-                --style absolute \
-                base-branch/summarized-benchmarks-*.json \
-                summarized-benchmarks.json > diff/benchmark-diff-summarized-inplace-absolute.md
-              "${scripts_dir}/externalTests/benchmark_diff.py" inplace \
-                --style absolute \
-                base-branch/all-benchmarks-*.json \
-                all-benchmarks.json > diff/benchmark-diff-all-table-inplace-absolute.md
-            fi
-      - store_artifacts:
-          path: reports/externalTests/all-benchmarks.json
-      - store_artifacts:
-          path: reports/externalTests/summarized-benchmarks.json
-      - store_artifacts:
-          path: reports/externalTests/diff/
-      - store_artifacts:
-          path: reports/externalTests/base-branch/
-
-  b_win: &b_win
-    <<: *base_win_large
-    steps:
-      # NOTE: Not disabling git's core.autocrlf here because we want to build using the typical Windows config.
-      - checkout
-      - restore_cache:
-          keys:
-            - dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }}
-      # DO NOT EDIT between here and save_cache, but rather edit .\scripts\install_deps.ps1
-      # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
-      - run:
-          name: "Installing dependencies"
-          command: .\scripts\install_deps.ps1
-          shell: powershell.exe
-      - save_cache:
-          key: dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }}
-          paths:
-            - .\deps
-      - run:
-          name: "Building solidity"
-          command: .circleci/build_win.ps1
-          shell: powershell.exe
-      - run:
-          name: "Run solc.exe to make sure build was successful."
-          command: .\build\solc\Release\solc.exe --version
-          shell: powershell.exe
-      - store_artifacts:
-          path: upload/
-      - persist_to_workspace:
-          root: build
-          paths:
-            - .\solc\*\solc.exe
-            - .\test\*\soltest.exe
-      - matrix_notify_failure_unless_pr
-
-  t_win_soltest: &t_win_soltest
-    <<: *base_win
-    steps:
-      # NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage
-      # for files using CRLF that way.
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: "Install evmone"
-          command: scripts/install_evmone.ps1
-          shell: powershell.exe
-      - run:
-          name: "Run soltest"
-          command: .circleci/soltest.ps1
-          shell: powershell.exe
-      - run:
-          name: Install LSP test dependencies
-          command: python -m pip install --user deepdiff colorama
-      - run:
-          name: Executing solc LSP test suite
-          command: python test/lsp.py build\solc\Release\solc.exe --non-interactive
-          shell: powershell.exe
-      - store_test_results:
-          path: test_results/
-      - store_artifacts_test_results
-      - matrix_notify_failure_unless_pr
-
-  # Note: b_bytecode_ubu_static is required because b_ubu_static and b_ubu
-  # are currently built on different Ubuntu base images.
-  # It can be safely removed once we move both to the same Ubuntu version.
-  b_bytecode_ubu_static:
-    parameters:
-      preset:
-        type: string
-    <<: *base_ubuntu2004_small
-    parallelism: 2 # For prepare_bytecode_report
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - prepare_bytecode_report:
-          label: "ubuntu2004-static"
-          binary_type: native
-          binary_path: "build/solc/solc-static-linux"
-          preset: "<< parameters.preset >>"
-
-  b_bytecode_ubu:
-    parameters:
-      preset:
-        type: string
-    <<: *base_ubuntu2204_small
-    parallelism: 2 # For prepare_bytecode_report
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - prepare_bytecode_report:
-          label: "ubuntu"
-          binary_type: native
-          binary_path: "build/solc/solc"
-          preset: "<< parameters.preset >>"
-
-  b_bytecode_osx:
-    parameters:
-      preset:
-        type: string
-    <<: *base_osx
-    parallelism: 2 # For prepare_bytecode_report
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - prepare_bytecode_report:
-          label: "osx"
-          binary_type: native
-          binary_path: "build/solc/solc"
-          preset: "<< parameters.preset >>"
-
-  b_bytecode_win:
-    parameters:
-      preset:
-        type: string
-    <<: *base_win
-    parallelism: 2 # For prepare_bytecode_report
-    steps:
-      # NOTE: For bytecode generation we need the input files to be byte-for-byte identical on all
-      # platforms so line ending conversions must absolutely be disabled.
-      - run: git config --global core.autocrlf false
-      - checkout
-      # Ensure windows has python3 alias required by prepare_bytecode_report
-      - run: ln -s /c/tools/miniconda3/python /c/tools/miniconda3/python3
-      - attach_workspace:
-          at: build
-      - prepare_bytecode_report:
-          label: "windows"
-          binary_type: native
-          binary_path: "build/solc/Release/solc.exe"
-          preset: "<< parameters.preset >>"
-
-  b_bytecode_ems:
-    parameters:
-      preset:
-        type: string
-    <<: *base_node_small
-    steps:
-      - checkout
-      - attach_workspace:
-          at: emscripten_build/libsolc
-      - prepare_bytecode_report:
-          label: "emscripten"
-          binary_type: solcjs
-          binary_path: "emscripten_build/libsolc/soljson.js"
-          preset: "<< parameters.preset >>"
-
-  t_bytecode_compare:
-    <<: *base_ubuntu2204_small
-    environment:
-      <<: *base_ubuntu2204_small_env
-      <<: *bytecode_compare_env_presets
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: .circleci/compare_bytecode_reports.sh $PRESETS
-      - store_artifacts:
-          # NOTE: store_artifacts does not support the 'when' attribute.
-          # Fortunately when the artifact does not exist it just says "No artifact files found" and ignores it.
-          path: bytecode-reports-*.zip
-      - matrix_notify_failure_unless_pr
-
-  c_release_binaries:
-    <<: *base_ubuntu2204
-    steps:
-      - checkout
-      - attach_workspace:
-          at: workspace
-      - run:
-          name: Gather and rename binaries from dependent jobs
-          command: |
-            mkdir github/
-            cp workspace/solc/solc-static-linux github/solc-static-linux
-            cp workspace/build/solc/solc        github/solc-macos
-            cp workspace/solc/Release/solc.exe  github/solc-windows.exe
-            cp workspace/soljson.js             github/soljson.js
-
-            cd github/
-            tar --create --file ../github-binaries.tar *
-      - store_artifacts:
-          path: github-binaries.tar
-      - run:
-          name: Rename binaries to solc-bin naming convention
-          command: |
-            full_version=$(
-              github/solc-static-linux --version |
-              sed -En 's/^Version: ([0-9.]+.*\+commit\.[0-9a-f]+(\.mod)?).*$/\1/p'
-            )
-
-            mkdir -p solc-bin/{linux-amd64,macosx-amd64,windows-amd64,bin}
-
-            mv github/solc-static-linux "solc-bin/linux-amd64/solc-linux-amd64-v${full_version}"
-            mv github/solc-macos        "solc-bin/macosx-amd64/solc-macosx-amd64-v${full_version}"
-            mv github/solc-windows.exe  "solc-bin/windows-amd64/solc-windows-amd64-v${full_version}.exe"
-            mv github/soljson.js        "solc-bin/bin/soljson-v${full_version}.js"
-
-            cd solc-bin/
-            tar --create --file ../solc-bin-binaries.tar *
-      - store_artifacts:
-          path: solc-bin-binaries.tar
-      - matrix_notify_failure_unless_pr
-      - matrix_notify_release_unless_pr
-
-workflows:
-  version: 2
-
-  main:
-    jobs:
-      # basic checks
-      - chk_spelling: *requires_nothing
-      - chk_coding_style: *requires_nothing
-      # DISABLED FOR 0.6.0 - chk_docs_examples: *requires_nothing
-      - chk_buglist: *requires_nothing
-      - chk_proofs: *requires_nothing
-      - chk_pylint: *requires_nothing
-      - chk_errorcodes: *requires_nothing
-      - chk_antlr_grammar: *requires_nothing
-      - chk_docs_pragma_min_version: *requires_nothing
-      - t_ubu_pyscripts: *requires_nothing
-      - t_win_pyscripts: *requires_nothing
-
-      # build-only
-      - b_docs: *requires_nothing
-      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *requires_nothing
-      # Issue: https://github.com/ethereum/solidity/issues/13868
-      - b_ubu_ossfuzz: *requires_nothing
-
-      # OS/X build and tests
-      - b_osx: *requires_nothing
-      - t_osx_cli: *requires_b_osx
-      - t_osx_soltest: *requires_b_osx
-
-      # ArchLinux build and tests
-      - b_archlinux: *requires_nothing
-      - t_archlinux_soltest: *requires_b_archlinux
-
-      # Static build
-      - b_ubu_static: *requires_nothing
-
-      # Ubuntu build and tests
-      - b_ubu: *requires_nothing
-      - t_ubu_cli: *requires_b_ubu
-      - t_ubu_locale: *requires_b_ubu
-      - t_ubu_soltest_all: *requires_b_ubu
-      - b_ubu_clang: *requires_nothing
-      - t_ubu_clang_soltest: *requires_b_ubu_clang
-      - t_ubu_lsp: *requires_b_ubu
-
-      # Ubuntu fake release build and tests
-      - b_ubu_force_release: *requires_nothing
-      - t_ubu_force_release_cli: *requires_b_ubu_force_release
-      - t_ubu_force_release_soltest_all: *requires_b_ubu_force_release
-
-      # Emscripten build and tests that take 15 minutes or less
-      - b_ems: *requires_nothing
-      - t_ems_solcjs: *requires_b_ems
-      - t_ems_ext_hardhat: *requires_b_ems
-
-      - t_ext: *job_ems_compile_ext_colony
-
-      # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
-      #       Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
-      #- t_ext: *job_native_test_ext_gnosis
-      - t_ext: *job_native_test_ext_zeppelin
-      - t_ext: *job_native_test_ext_ens
-      - t_ext: *job_native_test_ext_yield_liquidator
-      - t_ext: *job_native_test_ext_perpetual_pools
-      - t_ext: *job_native_test_ext_uniswap
-      - t_ext: *job_native_test_ext_prb_math
-      - t_ext: *job_native_test_ext_elementfi
-      - t_ext: *job_native_test_ext_brink
-      # NOTE: We are disabling gp2 tests due to constant failures.
-      # - t_ext: *job_native_test_ext_gp2
-      # NOTE: The external tests below were commented because they
-      # depend on a specific version of hardhat which does not support shanghai EVM.
-      #- t_ext: *job_native_test_ext_trident
-      #- t_ext: *job_native_test_ext_euler
-      #- t_ext: *job_native_test_ext_bleeps
-      #- t_ext: *job_native_test_ext_pool_together
-      #- t_ext: *job_native_test_ext_chainlink
-
-      - c_ext_benchmarks:
-          <<: *requires_nothing
-          requires:
-            - t_ems_compile_ext_colony
-            # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
-            #       Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
-            #- t_native_test_ext_gnosis
-            - t_native_test_ext_zeppelin
-            - t_native_test_ext_ens
-            - t_native_test_ext_yield_liquidator
-            - t_native_test_ext_perpetual_pools
-            - t_native_test_ext_uniswap
-            - t_native_test_ext_elementfi
-            - t_native_test_ext_brink
-            # NOTE: We are disabling gp2 tests due to constant failures.
-            #- t_native_test_ext_gp2
-            # TODO: Dropping prb-math from the benchmarks since it is not implemented yet
-            # in the new Foundry external testing infrastructure.
-            # - t_native_test_ext_prb_math
-            # NOTE: The external tests below were commented because they
-            # depend on a specific version of hardhat which does not support shanghai EVM.
-            #- t_native_test_ext_trident
-            #- t_native_test_ext_euler
-            #- t_native_test_ext_bleeps
-            #- t_native_test_ext_pool_together
-            #- t_native_test_ext_chainlink
-
-      # Windows build and tests
-      - b_win: *requires_nothing
-      - t_win_soltest: *requires_b_win
-
-      # Bytecode comparison:
-      - b_bytecode_ubu_static:
-          <<: *on_all_tags_and_branches
-          matrix: *bytecode_compare_preset_matrix
-          requires:
-            - b_ubu_static
-      - b_bytecode_ubu:
-          <<: *on_all_tags_and_branches
-          matrix: *bytecode_compare_preset_matrix
-          requires:
-            - b_ubu
-      - b_bytecode_win:
-          <<: *on_all_tags_and_branches
-          matrix: *bytecode_compare_preset_matrix
-          requires:
-            - b_win
-      - b_bytecode_osx:
-          <<: *on_all_tags_and_branches
-          matrix: *bytecode_compare_preset_matrix
-          requires:
-            - b_osx
-      - b_bytecode_ems:
-          <<: *on_all_tags_and_branches
-          matrix: *bytecode_compare_preset_matrix
-          requires:
-            - b_ems
-      - t_bytecode_compare:
-          <<: *on_all_tags_and_branches
-          requires:
-            - b_bytecode_ubu_static
-            - b_bytecode_ubu
-            - b_bytecode_win
-            - b_bytecode_osx
-            - b_bytecode_ems
-
-      # Final artifacts
-      - c_release_binaries:
-          <<: *on_version_tags
-          requires:
-            - b_ubu_static
-            - b_osx
-            - b_win
-            - b_ems
-
-  nightly:
-
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          <<: *on_develop
-
-    jobs:
-      # OSSFUZZ builds and (regression) tests
-      - b_ubu_ossfuzz: *requires_nothing
-      - t_ubu_ossfuzz: *requires_b_ubu_ossfuzz
-
-      # Code Coverage enabled build and tests
-      - b_ubu_codecov: *requires_nothing
-      - t_ubu_codecov: *requires_b_ubu_codecov
-
-      # ASan build and tests
-      - b_ubu_asan: *requires_nothing
-      - b_ubu_san_clang: *job_b_ubu_asan_clang
-      - t_ubu_asan_soltest: *requires_b_ubu_asan
-      - t_ubu_asan_clang_soltest: *requires_b_ubu_asan_clang
-      - t_ubu_asan_cli: *requires_b_ubu_asan
-
-      # UBSan build and tests
-      - b_ubu_san_clang: *job_b_ubu_ubsan_clang
-      - t_ubu_ubsan_clang_soltest: *requires_b_ubu_ubsan_clang
-      - t_ubu_ubsan_clang_cli: *requires_b_ubu_ubsan_clang
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
deleted file mode 100755
index 8e795b1dc833..000000000000
--- a/.circleci/osx_install_dependencies.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/bash
-#------------------------------------------------------------------------------
-# Bash script to install osx dependencies
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-# ------------------------------------------------------------------------------
-
-# note that the following directories may be cached by circleci:
-# - /usr/local/bin
-# - /usr/local/sbin
-# - /usr/local/lib
-# - /usr/local/include
-# - /usr/local/Cellar
-# - /usr/local/Homebrew
-
-set -eu
-
-function validate_checksum {
-  local package="$1"
-  local expected_checksum="$2"
-
-  local actual_checksum
-  actual_checksum=$(sha256sum "$package")
-  if [[ $actual_checksum != "${expected_checksum}  ${package}" ]]
-  then
-    >&2 echo "ERROR: Wrong checksum for package $package."
-    >&2 echo "Actual:   $actual_checksum"
-    >&2 echo "Expected: $expected_checksum"
-    exit 1
-  fi
-}
-
-if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not restored), rebuild dependencies
-then
-  brew update
-  brew upgrade
-  brew install boost
-  brew install cmake
-  brew install wget
-  brew install coreutils
-  brew install diffutils
-  ./scripts/install_obsolete_jsoncpp_1_7_4.sh
-
-  # z3
-  z3_version="4.12.1"
-  z3_dir="z3-${z3_version}-x64-osx-10.16"
-  z3_package="${z3_dir}.zip"
-  wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" 7601f844de6d906235140d0f76cca58be7ac716f3e2c29c35845aa24b24f73b9
-  unzip "$z3_package"
-  rm "$z3_package"
-  cp "${z3_dir}/bin/libz3.a" /usr/local/lib
-  cp "${z3_dir}/bin/z3" /usr/local/bin
-  cp "${z3_dir}/include/"* /usr/local/include
-  rm -r "$z3_dir"
-
-  # evmone
-  evmone_version="0.10.0"
-  evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
-  wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
-  validate_checksum "$evmone_package" 1b7773779287d7908baca6b8d556a98800cbd7d6e5c910b55fa507642bc0a15c
-  tar xzpf "$evmone_package" -C /usr/local
-  rm "$evmone_package"
-
-fi
diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
deleted file mode 100755
index 4a19015ce62f..000000000000
--- a/.circleci/parallel_bytecode_report.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-#------------------------------------------------------------------------------
-# Splits all test source code into multiple files, generates bytecode and metadata
-# for each file and combines it into a single report.txt file.
-#
-# The script is meant to be executed in CI on all supported platforms. All generated
-# reports must be identical for a given compiler version.
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-#------------------------------------------------------------------------------
-
-(( $# == 4 )) || { >&2 echo "Wrong number of arguments."; exit 1; }
-label="$1"
-binary_type="$2"
-binary_path="$3" # This path must be absolute
-preset="$4"
-
-[[ $binary_type == native || $binary_type == solcjs ]] || { >&2 echo "Invalid binary type: ${binary_type}"; exit 1; }
-
-# NOTE: Locale affects the order of the globbed files.
-export LC_ALL=C
-
-mkdir test-cases/
-cd test-cases/
-
-echo "Preparing input files"
-python3 ../scripts/isolate_tests.py ../test/
-
-# FIXME: These cases crash because of https://github.com/ethereum/solidity/issues/13583
-rm ./*_bytecode_too_large_*.sol ./*_combined_too_large_*.sol
-
-if [[ $binary_type == native ]]; then
-    interface=$(echo -e "standard-json\ncli" | circleci tests split)
-    echo "Selected interface: ${interface}"
-
-    echo "Generating bytecode reports"
-    python3 ../scripts/bytecodecompare/prepare_report.py \
-        "$binary_path" \
-        --interface "$interface" \
-        --preset "$preset" \
-        --report-file "../bytecode-report-${label}-${interface}-${preset}.txt"
-else
-    echo "Installing solc-js"
-    git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
-    cp "$binary_path" solc-js/soljson.js
-
-    cd solc-js/
-    npm install
-    npm run build
-
-    cd ..
-    npm install ./solc-js/dist
-
-    cp ../scripts/bytecodecompare/prepare_report.js .
-
-    echo "Generating bytecode reports"
-    # shellcheck disable=SC2035
-    ./prepare_report.js \
-        --preset "$preset" \
-        *.sol > "../bytecode-report-${label}-${preset}.txt"
-fi
diff --git a/.circleci/parallel_cli_tests.py b/.circleci/parallel_cli_tests.py
deleted file mode 100755
index 45cc83aec318..000000000000
--- a/.circleci/parallel_cli_tests.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-
-import subprocess
-import sys
-
-# Slowest CLI tests, whose execution takes time on the order of minutes (as of June 2023).
-# When adding/removing items here, remember to update `parallelism` value in jobs that run this script.
-# TODO: We should switch to time-based splitting but that requires JUnit XML report support in cmdlineTests.sh.
-tests_to_run_in_parallel = [
-    '~ast_import_export',                   # ~7 min
-    '~evmasm_import_export',                # ~5 min
-    '~ast_export_with_stop_after_parsing',  # ~4 min
-    '~soljson_via_fuzzer',                  # ~3 min
-    '~via_ir_equivalence',                  # ~1 min
-    '~compilation_tests',                   # ~1 min
-    '~documentation_examples',              # ~1 min
-    '*',                                    # This item represents all the remaining tests
-]
-
-# Ask CircleCI to select a subset of tests for this parallel execution.
-# If `parallelism` in CI config is set correctly, we should get just one but we can handle any split.
-selected_tests = subprocess.check_output(
-    ['circleci', 'tests', 'split'],
-    input='\n'.join(tests_to_run_in_parallel),
-    encoding='ascii',
-).strip().split('\n')
-selected_tests = set(selected_tests) - {''}
-excluded_tests = set(tests_to_run_in_parallel) - selected_tests
-assert selected_tests.issubset(set(tests_to_run_in_parallel))
-
-if len(selected_tests) == 0:
-    print("No tests to run.")
-    sys.exit(0)
-
-if '*' in selected_tests:
-    filters = [arg for test_name in excluded_tests for arg in ['--exclude', test_name]]
-else:
-    filters = list(selected_tests)
-
-subprocess.run(
-    ['test/cmdlineTests.sh'] + filters,
-    stdin=sys.stdin,
-    stdout=sys.stdout,
-    stderr=sys.stderr,
-    check=True,
-)
diff --git a/.circleci/soltest.ps1 b/.circleci/soltest.ps1
deleted file mode 100755
index 3c800903be11..000000000000
--- a/.circleci/soltest.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-cd "$PSScriptRoot\.."
-
-.\build\solc\Release\solc.exe --version
-if ( -not $? ) { throw "Cannot execute solc --version." }
-
-mkdir test_results
-.\build\test\Release\soltest.exe --color_output=no --show_progress=yes --logger=JUNIT,error,test_results/result.xml --logger=HRF,error,stdout -- --no-smt
-if ( -not $? ) { throw "Unoptimized soltest run failed." }
-.\build\test\Release\soltest.exe --color_output=no --show_progress=yes --logger=JUNIT,error,test_results/result_opt.xml --logger=HRF,error,stdout -- --optimize --no-smt
-if ( -not $? ) { throw "Optimized soltest run failed." }
diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
deleted file mode 100755
index 488201bae3ff..000000000000
--- a/.circleci/soltest.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-#------------------------------------------------------------------------------
-# Bash script to execute the Solidity tests by CircleCI.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# Configuration Environment Variables:
-#
-#     EVM=version_string      Specifies EVM version to compile for (such as homestead, etc)
-#     OPTIMIZE=1              Enables backend optimizer
-#     ABI_ENCODER_V1=1        Forcibly enables ABI coder version 1
-#     SOLTEST_FLAGS=<flags>   Appends <flags> to default SOLTEST_ARGS
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-# ------------------------------------------------------------------------------
-set -e
-
-OPTIMIZE=${OPTIMIZE:-"0"}
-EVM=${EVM:-"invalid"}
-CPUs=${CPUs:-3}
-REPODIR="$(realpath "$(dirname "$0")/..")"
-
-IFS=" " read -r -a BOOST_TEST_ARGS <<< "$BOOST_TEST_ARGS"
-IFS=" " read -r -a SOLTEST_FLAGS <<< "$SOLTEST_FLAGS"
-
-# shellcheck source=scripts/common.sh
-source "${REPODIR}/scripts/common.sh"
-# Test result output directory (CircleCI is reading test results from here)
-mkdir -p test_results
-
-# in case we run with ASAN enabled, we must increase stack size.
-ulimit -s 16384
-
-get_logfile_basename() {
-    local run="$1"
-    local filename="${EVM}"
-    test "${OPTIMIZE}" = "1" && filename="${filename}_opt"
-    test "${ABI_ENCODER_V1}" = "1" && filename="${filename}_abiv1"
-    filename="${filename}_${run}"
-
-    echo -ne "${filename}"
-}
-
-[ -z "$CIRCLE_NODE_TOTAL" ] || [ "$CIRCLE_NODE_TOTAL" = 0 ] && CIRCLE_NODE_TOTAL=1
-[ -z "$CIRCLE_NODE_INDEX" ] && CIRCLE_NODE_INDEX=0
-[ -z "$INDEX_SHIFT" ] && INDEX_SHIFT=0
-
-# Multiply by a prime number to get better spread, just in case
-# long-running test cases are next to each other.
-CIRCLE_NODE_INDEX=$(((CIRCLE_NODE_INDEX + 23 * INDEX_SHIFT) % CIRCLE_NODE_TOTAL))
-
-PIDs=()
-for run in $(seq 0 $((CPUs - 1)))
-do
-    BOOST_TEST_ARGS_RUN=(
-        "--color_output=no"
-        "--show_progress=yes"
-        "--logger=JUNIT,error,test_results/$(get_logfile_basename "$((CPUs * CIRCLE_NODE_INDEX + run))").xml"
-        "--logger=HRF,error,stdout"
-        "${BOOST_TEST_ARGS[@]}"
-    )
-    SOLTEST_ARGS=("--evm-version=$EVM" "${SOLTEST_FLAGS[@]}")
-
-    test "${OPTIMIZE}" = "1" && SOLTEST_ARGS+=(--optimize)
-    test "${ABI_ENCODER_V1}" = "1" && SOLTEST_ARGS+=(--abiencoderv1)
-
-    BATCH_ARGS=("--batches" "$((CPUs * CIRCLE_NODE_TOTAL))" "--selected-batch" "$((CPUs * CIRCLE_NODE_INDEX + run))")
-
-    echo "Running ${REPODIR}/build/test/soltest ${BOOST_TEST_ARGS_RUN[*]} -- ${SOLTEST_ARGS[*]}"
-
-    "${REPODIR}/build/test/soltest" -l test_suite "${BOOST_TEST_ARGS_RUN[@]}" -- "${SOLTEST_ARGS[@]}" "${BATCH_ARGS[@]}" &
-    PIDs+=($!)
-done
-
-# wait for individual processes to get their exit status
-for pid in "${PIDs[@]}"
-do
-    wait "$pid"
-done
diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
deleted file mode 100755
index 4be427f192d2..000000000000
--- a/.circleci/soltest_all.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/bash
-#------------------------------------------------------------------------------
-# Bash script to execute the Solidity tests by CircleCI.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-# ------------------------------------------------------------------------------
-set -e
-
-REPODIR="$(realpath "$(dirname "$0")"/..)"
-
-# shellcheck source=scripts/common.sh
-source "${REPODIR}/scripts/common.sh"
-
-EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai)
-DEFAULT_EVM=shanghai
-[[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
-OPTIMIZE_VALUES=(0 1)
-
-# Run for ABI encoder v1, without SMTChecker tests.
-EVM="${DEFAULT_EVM}" \
-OPTIMIZE=1 \
-ABI_ENCODER_V1=1 \
-BOOST_TEST_ARGS="-t !smtCheckerTests" \
-"${REPODIR}/.circleci/soltest.sh"
-
-# We shift the batch index so that long-running tests
-# do not always run in the same executor for all EVM versions
-INDEX_SHIFT=0
-for OPTIMIZE in "${OPTIMIZE_VALUES[@]}"
-do
-    for EVM in "${EVM_VALUES[@]}"
-    do
-        ENFORCE_GAS_ARGS=""
-        [ "${EVM}" = "${DEFAULT_EVM}" ] && ENFORCE_GAS_ARGS="--enforce-gas-cost"
-        # Run SMTChecker tests only when OPTIMIZE == 0
-        DISABLE_SMTCHECKER=""
-        [ "${OPTIMIZE}" != "0" ] && DISABLE_SMTCHECKER="-t !smtCheckerTests"
-
-        EVM="$EVM" \
-        OPTIMIZE="$OPTIMIZE" \
-        SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS" \
-        BOOST_TEST_ARGS="-t !@nooptions $DISABLE_SMTCHECKER" \
-        INDEX_SHIFT="$INDEX_SHIFT" \
-        "${REPODIR}/.circleci/soltest.sh"
-
-        INDEX_SHIFT=$((INDEX_SHIFT + 1))
-    done
-done
diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 95b0feba1eb4..000000000000
--- a/.clang-format
+++ /dev/null
@@ -1,41 +0,0 @@
-# Formatting approximately used in Solidity's C++
-#
-# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-# For an online formatter to test settings, see
-# https://zed0.co.uk/clang-format-configurator/
-# Note that clang-format cannot express the style that closing parentheses
-# behave similar to closing curly braces in a multi-line setting in that
-# they have to be on a line of their own at the same indentation level
-# as the opening part (aka "dangling parenthesis", see https://reviews.llvm.org/D33029).
-
-Language: Cpp
-BasedOnStyle: LLVM
-AccessModifierOffset: -4
-AlignAfterOpenBracket: AlwaysBreak
-AlignEscapedNewlines: Left
-AlwaysBreakAfterReturnType: None
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: All
-BreakBeforeBraces: Allman
-ColumnLimit: 120
-ContinuationIndentWidth: 4
-FixNamespaceComments: false
-IndentWidth: 4
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 2
-PenaltyBreakBeforeFirstCallParameter: 2000
-PointerAlignment: Left
-SpaceAfterCStyleCast: true
-SpaceAfterTemplateKeyword: false
-SpaceBeforeCtorInitializerColon: false
-SpaceBeforeInheritanceColon: false
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: false
-TabWidth: 4
-UseTab: Always
-
-# Local Variables:
-# mode: yaml
-# End:
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index ab452ecf2823..000000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# out-of-tree builds usually go here. This helps improving performance of uploading
-# the build context to the docker image build server
-/build
-
-# in-tree builds
-/deps
diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 0bb3fce2eceb..000000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{cpp,h}]
-indent_style = tab
-indent_size = 4
-
-[*.{py,rst,sh,yml}]
-indent_style = space
-indent_size = 4
-
-[*.{sol,yul}]
-indent_style = space
-indent_size = 4
-
-[*.{txt,cmake,json}]
-indent_style = tab
-indent_size = 4
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index d50c44566a89..000000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-/docs/style-guide.rst @fulldecent
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 30c09039ef79..000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: Bug Report
-about: Problems, deficiencies, inaccuracies or crashes discovered on Solidity.
-title: ''
-labels: 'bug :bug:'
-assignees: ''
-
----
-
-<!--## Prerequisites
-
-- First, many thanks for taking part in the community. We really appreciate that.
-- We realize there is a lot of information requested here. We ask only that you do your best to provide as much information as possible so we can better help you.
-- Support questions are better asked in one of the following locations:
-    - [Solidity chat](https://gitter.im/ethereum/solidity)
-    - [Stack Overflow](https://ethereum.stackexchange.com/)
-- Ensure the issue isn't already reported.
-- The issue should be reproducible with the latest solidity version; however, this isn't a hard requirement and being reproducible with an older version is sufficient.
-
-*Delete the above section and the instructions in the sections below before submitting*
--->
-
-## Description
-
-<!--Please shortly describe the bug you have found, and what you expect instead.-->
-
-## Environment
-
-- Compiler version:
-- Target EVM version (as per compiler settings):
-- Framework/IDE (e.g. Truffle or Remix):
-- EVM execution environment / backend / blockchain client:
-- Operating system:
-
-## Steps to Reproduce
-
-<!--
-Please provide a *minimal* source code example to trigger the bug you have found.
-Please also mention any command-line flags that are necessary for triggering the bug.
-Provide as much information as necessary to reproduce the bug.
-
-```solidity
-// Some *minimal* Solidity source code to reproduce the bug.
-// ...
-```
--->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 69f42abb0fe0..000000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Initiate a language design or feedback discussion
-    url: https://forum.soliditylang.org
-    about: Open a thread on the Solidity forum.
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
deleted file mode 100644
index 91082a9aaf6b..000000000000
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Documentation Issue
-about: Corrections, improvements or requests for new content on Solidity's documentation.
-title: ''
-labels: 'documentation :book:'
-assignees: ''
-
----
-
-## Page
-
-<!--Please link directly to the page which you think has a problem.-->
-
-## Abstract
-
-<!--Please describe in detail what is wrong.-->
-
-## Pull request
-
-<!--Please link to your pull request which resolves this issue.-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 7ec729b1c7a3..000000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-name: Feature Request
-about: Ideas, comments or messages asking for a particular functionality to be added
-  to Solidity.
-title: ''
-labels: feature
-assignees: ''
-
----
-
-<!--## Prerequisites
-
-- First, many thanks for taking part in the community. We really appreciate that.
-- We realize there is a lot of data requested here. We ask only that you do your best to provide as much information as possible so we can better help you.
-- Support questions are better asked in one of the following locations:
-    - [Solidity chat](https://gitter.im/ethereum/solidity)
-    - [Stack Overflow](https://ethereum.stackexchange.com/)
-- Ensure the issue isn't already reported (check `feature` and `language design` labels).
-- If you feel uncertain about your feature request, perhaps it's better to open a language design or feedback forum thread via the issue selector, or by going to the forum directly.
-    - [Solidity forum](https://forum.soliditylang.org/)
-
-*Delete the above section and the instructions in the sections below before submitting*
--->
-
-## Abstract
-
-<!--Please describe by example what problem you see in the current Solidity language and reason about it.-->
-
-## Motivation
-
-<!--In this section you describe how you propose to address the problem you described earlier, including by giving one or more exemplary source code snippets for demonstration.-->
-
-## Specification
-
-<!--The technical specification should describe the syntax and semantics of any new feature. The specification should be detailed enough to allow any developer to implement the functionality.-->
-
-## Backwards Compatibility
-
-<!--
-All language changes that introduce backwards incompatibilities must include a section describing these incompatibilities and their severity.
-
-Please describe how you propose to deal with these incompatibilities.
--->
diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
deleted file mode 100644
index 6a261bd2eb9c..000000000000
--- a/.github/workflows/buildpack-deps.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: buildpack-deps
-
-on:
-  pull_request:
-    branches: [ develop ]
-    paths:
-      - 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
-
-jobs:
-  buildpack-deps:
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      DOCKER_REPOSITORY: solbuildpackpusher/solidity-buildpack-deps
-      IMAGE_NAME: buildpack-deps
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Upgrade ${{ env.IMAGE_NAME }}-${{ matrix.image_variant }}
-        run: |
-          echo ${DOCKERHUB_TOKEN} | docker login -u solbuildpackpusher --password-stdin
-          scripts/ci/docker_upgrade.sh ${{ env.IMAGE_NAME }} ${{ matrix.image_variant }} ${{ env.DOCKER_REPOSITORY }}
-          docker logout
-
-      - name: comment PR
-        if: "env.DOCKER_IMAGE"
-        # NOTE: Can't update to v1.3.1 due to an error: `/entrypoint.sh:5:in 'require_relative': cannot load such file -- /lib/github (LoadError)`
-        uses: unsplash/comment-on-pr@ffe8f97ccc63ce12c3c23c6885b169db67958d3b #v1.3.0
-        with:
-          msg: "`${{ env.DOCKER_IMAGE }} ${{ env.DOCKER_REPO_DIGEST }}`."
-          check_for_duplicate_msg: false
-
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index d982c43f2b59..000000000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Check stale issues and pull requests
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 12 * * *'
-
-permissions:
-  issues: write
-  pull-requests: write
-
-env:
-  BEFORE_ISSUE_STALE: 90
-  BEFORE_ISSUE_CLOSE: 7
-  BEFORE_PR_STALE: 14
-  BEFORE_PR_CLOSE: 7
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v6
-        with:
-          debug-only: false
-          days-before-issue-stale: ${{ env.BEFORE_ISSUE_STALE }}
-          days-before-issue-close: ${{ env.BEFORE_ISSUE_CLOSE }}
-          stale-issue-message: |
-            This issue has been marked as stale due to inactivity for the last ${{ env.BEFORE_ISSUE_STALE }} days.
-            It will be automatically closed in ${{ env.BEFORE_ISSUE_CLOSE }} days.
-          close-issue-message: |
-            Hi everyone! This issue has been automatically closed due to inactivity.
-            If you think this issue is still relevant in the latest Solidity version and you have something to [contribute](https://docs.soliditylang.org/en/latest/contributing.html), feel free to reopen.
-            However, unless the issue is a concrete proposal that can be implemented, we recommend starting a language discussion on the [forum](https://forum.soliditylang.org) instead.
-          ascending: true
-          stale-issue-label: stale
-          close-issue-label: 'closed due inactivity'
-          exempt-issue-labels: 'bug :bug:,epic,roadmap,selected for development,must have,must have eventually,smt'
-          stale-pr-message: |
-            This pull request is stale because it has been open for ${{ env.BEFORE_PR_STALE }} days with no activity.
-            It will be closed in ${{ env.BEFORE_PR_CLOSE }} days unless the `stale` label is removed.
-          close-pr-message: |
-            This pull request was closed due to a lack of activity for ${{ env.BEFORE_PR_CLOSE }} days after it was stale.
-          stale-pr-label: stale
-          close-pr-label: closed-due-inactivity
-          days-before-pr-stale: ${{ env.BEFORE_PR_STALE }}
-          days-before-pr-close: ${{ env.BEFORE_PR_CLOSE }}
-          exempt-pr-labels: 'external contribution :star:,roadmap,epic'
-          exempt-draft-pr: false
-          exempt-all-milestones: true
-          remove-stale-when-updated: true
-          operations-per-run: 256
diff --git a/.github/workflows/welcome-external-pr.yml b/.github/workflows/welcome-external-pr.yml
deleted file mode 100644
index ac8d1362eac3..000000000000
--- a/.github/workflows/welcome-external-pr.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: External contributor greeter
-
-on:
-  pull_request_target:
-    types:
-      - opened
-
-env:
-  DRY_RUN: false
-
-jobs:
-  comment-external-pr:
-    runs-on: ubuntu-latest
-    steps:
-      # Note: this step requires that the INTERNAL_CONTRIBUTORS environment variable
-      # is already defined in the repository with the current json list of internal contributors.
-      - name: Comment on external contribution PR
-        if: "!contains(fromJSON(vars.INTERNAL_CONTRIBUTORS), github.event.pull_request.user.login)"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR: ${{ github.event.pull_request.html_url }}
-        run: |
-          echo "Commenting in a newly submitted or reopened external PR: $PR"
-          if [[ $DRY_RUN == 'false' ]]; then
-            gh pr edit "$PR" --add-label "external contribution :star:"
-            comment_body=(
-              "Thank you for your contribution to the Solidity compiler! A team member will follow up shortly."
-              "\n\n"
-              "If you haven't read our [contributing guidelines](https://docs.soliditylang.org/en/latest/contributing.html) and our "
-              "[review checklist](https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md) before, "
-              "please do it now, this makes the reviewing process and accepting your contribution smoother."
-              "\n\n"
-              "If you have any questions or need our help, feel free to post them in the PR or talk to us directly on the "
-              "[#solidity-dev](https://matrix.to/#/#ethereum_solidity-dev:gitter.im) channel on Matrix."
-            )
-            gh pr comment $PR --body "$(IFS='' ; echo -e "${comment_body[*]}")"
-          fi
diff --git a/.gitignore b/.gitignore
index 8ca5f86e7e43..9322b0c81564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,11 @@
-/commit_hash.txt
-/prerelease.txt
-
-# Auth config for ppa release
-/.release_ppa_auth
+commit_hash.txt
+prerelease.txt
 
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
-*.pyc
-__pycache__
 
 # Precompiled Headers
 *.gch
@@ -21,15 +16,15 @@ __pycache__
 *.dylib
 *.dll
 
+# Fortran module files
+*.mod
+
 # Compiled Static libraries
 *.lai
 *.la
 *.a
 *.lib
 
-# ignore git mergetool backup files
-*.orig
-
 # Executables
 *.exe
 *.out
@@ -38,10 +33,14 @@ __pycache__
 # Build directory
 /build*
 emscripten_build/
-/docs/_build
-/docs/_static/robots.txt
-/deps
-/reports
+docs/_build
+docs/_static/robots.txt
+__pycache__
+docs/utils/*.pyc
+/deps/downloads/
+deps/install
+deps/cache
+cmake-build-*/
 
 # vim stuff
 [._]*.sw[a-p]
@@ -51,15 +50,14 @@ emscripten_build/
 *~
 
 # IDE files
-/.idea/
-/.vscode/
-/browse.VC.db
-/CMakeLists.txt.user
+.idea
+.vscode
+browse.VC.db
+CMakeLists.txt.user
 /CMakeSettings.json
 /.vs
 /.cproject
 /.project
 
-# OS specific local files
-.DS_Store
-Thumbs.db
+# place to put local temporary files
+tmp
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000000..3cce948f67db
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "restructuredtext.confPath": ""
+}
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e7930b7222..18af34d26bf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.22")
+set(PROJECT_VERSION "0.8.25")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 4c75649ae8a0..000000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at solidity@ethereum.org.
-To report an issue involving the Solidity team please email José Pedro Cabrita at zepedro@ethereum.org.
-All complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
diff --git a/CODING_STYLE.md b/CODING_STYLE.md
deleted file mode 100644
index 5b9129fbd07b..000000000000
--- a/CODING_STYLE.md
+++ /dev/null
@@ -1,243 +0,0 @@
-## 0. Formatting
-
-**GOLDEN RULE**: Follow the style of the existing code when you make changes.
-
-1. Use tabs for leading indentation:
-   - tab stops are every 4 characters (only relevant for line length).
-   - one indentation level -> exactly one byte (i.e. a tab character) in the source file.
-2. Line widths:
-   - Lines should be at most 99 characters wide to make diff views readable and reduce merge conflicts.
-   - Lines of comments should be formatted according to ease of viewing, but simplicity is to be preferred over beauty.
-3. Single-statement blocks should not have braces, unless required for clarity.
-4. Never place condition bodies on same line as condition.
-5. Space between keyword and opening parenthesis, but not following opening parenthesis or before final parenthesis.
-6. No spaces for unary operators, `->` or `.`.
-7. No space before `:` but one after it, except in the ternary operator: one on both sides.
-8. Add spaces around all other operators.
-9. Braces, when used, always have their own lines and are at same indentation level as "parent" scope.
-10. If lines are broken, a list of elements enclosed with parentheses (of any kind) and separated by a separator (of any kind) are formatted such that there is exactly one element per line, followed by the separator, the opening parenthesis is on the first line, followed by a line break and the closing parenthesis is on a line of its own unindented). See example below.
-
-Yes:
-```cpp
-if (a == b[i])
-    printf("Hello\n");	// NOTE spaces used instead of tab here for clarity - first byte should be '\t'.
-foo->bar(
-    someLongVariableName,
-    anotherLongVariableName,
-    anotherLongVariableName,
-    anotherLongVariableName,
-    anotherLongVariableName
-);
-cout <<
-    "some very long string that contains completely irrelevant " <<
-    "text that talks about this and that and contains the words " <<
-    "\"lorem\" and \"ipsum\"" <<
-    endl;
-```
-
-No:
-```cpp
-if( a==b[ i ] ) { printf ("Hello\n"); }
-foo->bar(someLongVariableName,
-         anotherLongVariableName,
-         anotherLongVariableName,
-         anotherLongVariableName,
-         anotherLongVariableName);
-cout << "some very long string that contains completely irrelevant text that talks about this and that and contains the words \"lorem\" and \"ipsum\"" << endl;
-```
-
-To set indentation and tab width settings uniformly, the repository contains an [EditorConfig](https://editorconfig.org/) [`.editorconfig`](https://github.com/ethereum/solidity/blob/develop/.editorconfig) file, which describes some of the styles used and which is recognized by many IDE's and editors.
-
-## 1. Namespaces
-
-1. No `using namespace` declarations in header files.
-2. `using namespace solidity;` and other project local namespaces is fine in cpp files, and generally encouraged.
-3. Avoid `using namespace` at file level for third party libraries, such as boost, ranges, etc.
-4. All symbols should be declared in a namespace except for final applications.
-5. Use anonymous namespaces for helpers whose scope is a cpp file only.
-6. Preprocessor symbols should be prefixed with the namespace in all-caps and an underscore.
-
-Only in the header:
-```cpp
-#include <cassert>
-namespace myNamespace
-{
-std::tuple<float, float> meanAndSigma(std::vector<float> const& _v);
-}
-```
-
-## 2. Preprocessor
-
-1. File comment is always at top, and includes:
-   - Copyright
-   - License (e.g. see COPYING)
-2. Never use `#ifdef`/`#define`/`#endif` file guards. Prefer `#pragma` once as first line below file comment.
-3. Prefer static constexpr variables to value macros.
-4. Prefer inline constexpr functions to function macros.
-5. Split complex macro on multiple lines with `\`.
-
-## 3. Capitalization
-
-**GOLDEN RULE**: Preprocessor: `ALL_CAPS`; C++: `camelCase`.
-
-1. Use camelCase for splitting words in names, except where obviously extending STL/boost functionality in which case follow those naming conventions.
-2. The following entities' first alpha is upper case:
-   - Type names
-   - Template parameters
-   - Enum members
-   - static const variables that form an external API.
-3. All preprocessor symbols (macros, macro arguments) in full uppercase with underscore word separation.
-
-All other entities' first alpha is lower case.
-
-## 4. Variable prefixes
-
-1. Leading underscore "_" to parameter names:
-   - Exception: "o_parameterName" when it is used exclusively for output. See 6(f).
-   - Exception: "io_parameterName" when it is used for both input and output. See 6(f).
-2. Leading "g_" to global (non-const) variables.
-3. Leading "s_" to static (non-const, non-global) variables.
-
-## 5. Assertions
-
-Use `solAssert` and `solUnimplementedAssert` generously to check assumptions that span across different parts of the code base, for example before dereferencing a pointer.
-
-## 6. Declarations
-
-1. {Typename} + {qualifiers} + {name}.
-2. Only one per line.
-3. Associate */& with type, not variable (at ends with parser, but more readable, and safe if in conjunction with (b)).
-4. Favour declarations close to use; do not habitually declare at top of scope ala C.
-5. Pass non-trivial parameters as const reference, unless the data is to be copied into the function, then either pass by const reference or by value and use std::move.
-6. If a function returns multiple values, use std::tuple (std::pair acceptable) or better introduce a struct type. Do not use */& arguments.
-7. Use parameters of pointer type only if ``nullptr`` is a valid argument, use references otherwise. Often, ``std::optional`` is better suited than a raw pointer.
-8. Never use a macro where adequate non-preprocessor C++ can be written.
-9. Only use ``auto`` if the type is very long and rather irrelevant.
-10. Do not pass bools: prefer enumerations instead.
-11. Prefer enum class to straight enum.
-12. Always initialize POD variables, even if their value is overwritten later.
-
-Yes:
-```cpp
-enum class Accuracy
-{
-	Approximate,
-	Exact
-};
-struct MeanSigma
-{
-	float mean = 0.0f;
-	float standardDeviation = 1.0f;
-};
-double const d = 0;
-int i = 0;
-int j = 0;
-char* s = nullptr;
-MeanAndSigma ms meanAndSigma(std::vector<float> const& _v, Accuracy _a);
-Derived* x = dynamic_cast<Derived*>(base);
-for (auto i = x->begin(); i != x->end(); ++i) {}
-```
-
-No:
-```cpp
-const double d = 0;
-int i, j;
-char *s;
-float meanAndSigma(std::vector<float> _v, float* _sigma, bool _approximate);
-Derived* x(dynamic_cast<Derived*>(base));
-for (map<ComplexTypeOne, ComplexTypeTwo>::iterator i = l.begin(); i != l.end(); ++l) {}
-```
-
-## 7. Structs & classes
-
-1. Structs to be used when all members public and no virtual functions:
-   - In this case, members should be named naturally and not prefixed with `m_`.
-2. Classes to be used in all other circumstances.
-
-## 8. Members
-
-1. One member per line only.
-2. Private, non-static, non-const fields prefixed with `m_`.
-3. Avoid public fields, except in structs.
-4. Use override, final and const as much as possible.
-5. No implementations with the class declaration, except:
-   - template or force-inline method (though prefer implementation at bottom of header file).
-   - one-line implementation (in which case include it in same line as declaration).
-6. For a property `foo`
-   - Member: `m_foo`
-   - Getter: `foo()` [ also: for booleans, `isFoo()` ]
-   - Setter: `setFoo()`
-
-## 9. Naming
-
-1. Avoid unpronounceable names.
-2. Names should be shortened only if they are extremely common, but shortening should be generally avoided
-3. Avoid prefixes of initials (e.g. do not use `IMyInterface`, `CMyImplementation`)
-4. Find short, memorable & (at least semi-) descriptive names for commonly used classes or name-fragments:
-   - A dictionary and thesaurus are your friends;
-   - Spell correctly;
-   - Think carefully about the class's purpose;
-   - Imagine it as an isolated component to try to decontextualise it when considering its name;
-   - Don't be trapped into naming it (purely) in terms of its implementation.
-
-## 10. Type definitions
-
-1. Prefer `using` to `typedef`. e.g. `using ints = std::vector<int>;` rather than typedef `std::vector<int> ints;`
-2. Generally avoid shortening a standard form that already includes all important information:
-   - e.g. stick to `shared_ptr<X>` rather than shortening to `ptr<X>`.
-3. Where there are exceptions to this (due to excessive use and clear meaning), note the change prominently and use it consistently:
-   - e.g. `using Guard = std::lock_guard<std::mutex>;` ///< Guard is used throughout the codebase since it is clear in meaning and used commonly.
-4. In general expressions should be roughly as important/semantically meaningful as the space they occupy.
-5. Avoid introducing aliases for types unless they are very complicated. Consider the number of items a brain can keep track of at the same time.
-
-## 11. Commenting
-
-1. Comments should be doxygen-compilable, using @notation rather than \notation.
-2. Document the interface, not the implementation:
-   - Documentation should be able to remain completely unchanged, even if the method is reimplemented;
-   - Comment in terms of the method properties and intended alteration to class state (or what aspects of the state it reports);
-   - Be careful to scrutinise documentation that extends only to intended purpose and usage;
-   - Reject documentation that is simply an English transaction of the implementation.
-3. Avoid in-code comments. Instead, try to extract blocks of functionality into functions. This often already eliminates the need for an in-code comment.
-
-## 12. Include Headers
-
-1. Includes should go in increasing order of generality (`libsolidity` -> `libevmasm` -> `libsolutil` -> `boost` -> `STL`).
-2. The corresponding `.h` file should be the first include in the respective `.cpp` file.
-3. Insert empty lines between blocks of include files.
-
-Example:
-```cpp
-#include <libsolidity/codegen/ExpressionCompiler.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/codegen/LValue.h>
-
-#include <libevmasm/GasMeter.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/SHA3.h>
-
-#include <boost/range/adaptor/reversed.hpp>
-#include <boost/algorithm/string/replace.hpp>
-
-#include <utility>
-#include <numeric>
-```
-
-See [this issue](https://stackoverflow.com/questions/614302/c-header-order/614333#614333 "C header order") for the reason: this makes it easier to find missing includes in header files.
-
-## 13. Recommended reading
-
-- Herb Sutter and Bjarne Stroustrup:
-  - [C++ Core Guidelines](https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md)
-
-- Herb Sutter and Andrei Alexandrescu:
-  - "C++ Coding Standards: 101 Rules, Guidelines, and Best Practices"
-
-- Scott Meyers:
-  - "Effective C++: 55 Specific Ways to Improve Your Programs and Designs (3rd Edition)"
-  - "More Effective C++: 35 New Ways to Improve Your Programs and Designs"
-  - "Effective Modern C++: 42 Specific Ways to Improve Your Use of C++11 and C++14"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index e071a2290dab..000000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Contribution Guidelines
-
-Please see our contribution guidelines in [the Solidity documentation](https://docs.soliditylang.org/en/latest/contributing.html).
-
-Thank you for your help!
diff --git a/Changelog.md b/Changelog.md
deleted file mode 100644
index 279fbec6348f..000000000000
--- a/Changelog.md
+++ /dev/null
@@ -1,2664 +0,0 @@
-### 0.8.22 (unreleased)
-
-Language Features:
- * Allow defining events at file level.
-
-
-Compiler Features:
- * Code Generator: Remove redundant overflow checks of certain ``for`` loops when the counter variable cannot overflow.
- * Commandline Interface: Add ``--no-import-callback`` option that prevents the compiler from loading source files not given explicitly on the CLI or in Standard JSON input.
- * Commandline Interface: Add an experimental ``--import-asm-json`` option that can import EVM assembly in the format used by ``--asm-json``.
- * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
- * EVM: Deprecate support for "homestead", "tangerineWhistle", "spuriousDragon" and "byzantium" EVM versions.
- * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
- * SMTChecker: Support user-defined operators.
- * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
- * Yul Optimizer: Run the ``Rematerializer`` and ``UnusedPruner`` steps at the end of the default clean-up sequence.
-
-
-Bugfixes:
- * AST: Fix wrong initial ID for Yul nodes in the AST.
- * Code Generator: Fix output from via-IR code generator being dependent on which files were discovered by import callback. In some cases, a different AST ID assignment would alter the order of functions in internal dispatch, resulting in superficially different but semantically equivalent bytecode.
- * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
- * SMTChecker: Fix encoding error that causes loops to unroll after completion.
- * SMTChecker: Fix inconsistency on constant condition checks when ``while`` or ``for`` loops are unrolled before the condition check.
- * Yul Optimizer: Fix replacement decisions during CSE being affected by Yul variable names generated by the compiler, resulting in different (but equivalent) bytecode in some situations.
-
-
-### 0.8.21 (2023-07-19)
-
-Important Bugfixes:
- * Code Generator: Always generate code for the expression in ``<expression>.selector`` in the legacy code generation pipeline.
- * Yul Optimizer: Fix ``FullInliner`` step (``i``) not preserving the evaluation order of arguments passed into inlined functions in code that is not in expression-split form (i.e. when using a custom optimizer sequence in which the step not preceded by ``ExpressionSplitter`` (``x``)).
-
-
-Language Features:
- * Allow qualified access to events from other contracts.
- * Relax restrictions on initialization of immutable variables. Reads and writes may now happen at any point at construction time outside of functions and modifiers. Explicit initialization is no longer mandatory.
-
-
-Compiler Features:
- * Commandline Interface: Add ``--ast-compact-json`` output in assembler mode.
- * Commandline Interface: Add ``--ir-ast-json`` and ``--ir-optimized-ast-json`` outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
- * Commandline Interface: Respect ``--optimize-yul`` and ``--no-optimize-yul`` in compiler mode and accept them in assembler mode as well. ``--optimize --no-optimize-yul`` combination now allows enabling EVM assembly optimizer without enabling Yul optimizer.
- * EWasm: Remove EWasm backend.
- * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
- * SMTChecker: Add ``--model-checker-print-query`` CLI option and ``settings.modelChecker.printQuery`` JSON option to output the SMTChecker queries in the SMTLIB2 format. This requires using ``smtlib2`` solver only.
- * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
- * Standard JSON Interface: Add ``irAst`` and ``irOptimizedAst`` contract-level outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
- * Yul Optimizer: Remove experimental ``ReasoningBasedSimplifier`` optimization step.
- * Yul Optimizer: Stack-to-memory mover is now enabled by default whenever possible for via IR code generation and pure Yul compilation.
-
-
-Bugfixes:
- * Code Generator: Disallow complex expressions whose results are types, built-ins, modules or some unassignable functions. The legacy code generation pipeline would not actually evaluate them, discarding any side-effects they might have.
- * Code Generator: Fix not entirely deterministic order of functions in unoptimized Yul output. The choice of C++ compiler in some cases would result in different (but equivalent) bytecode (especially from native binaries vs emscripten binaries).
- * Commandline Interface: Fix internal error when using ``--stop-after parsing`` and requesting some of the outputs that require full analysis or compilation.
- * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
- * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
- * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
- * SMTChecker: Fix generation of invalid SMT-LIB2 scripts in BMC engine with trusted mode for external calls when CHC engine times out.
- * SMTChecker: Fix internal error caused by incorrectly classifying external function call using function pointer as a public getter.
- * SMTChecker: Fix internal error caused by using external identifier to encode member access to functions that take an internal function as a parameter.
- * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
- * Type Checker: Disallow using certain unassignable function types in complex expressions.
- * Type Checker: Function declaration types referring to different declarations are no longer convertible to each other.
- * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
- * Yul Optimizer: Fix ``FullInliner`` step not ignoring code that is not in expression-split form.
- * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
-
-
-AST Changes:
- * AST: Add the ``experimentalSolidity`` field to the ``SourceUnit`` nodes, which indicate whether the experimental parsing mode has been enabled via ``pragma experimental solidity``.
-
-
-### 0.8.20 (2023-05-10)
-
-Compiler Features:
- * Assembler: Use ``push0`` for placing ``0`` on the stack for EVM versions starting from "Shanghai". This decreases the deployment and runtime costs.
- * EVM: Set default EVM version to "Shanghai".
- * EVM: Support for the EVM Version "Shanghai".
- * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
- * NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
- * NatSpec: Include NatSpec from events that are emitted by a contract but defined outside of it in userdoc and devdoc output.
- * Optimizer: Re-implement simplified version of ``UnusedAssignEliminator`` and ``UnusedStoreEliminator``. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
- * Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
- * SMTChecker: Add CLI option ``--model-checker-bmc-loop-iterations`` and a JSON option ``settings.modelChecker.bmcLoopIterations`` that specify how many loop iterations the BMC engine should unroll. Note that false negatives are possible when unrolling loops. This is due to the possibility that bmc loop iteration setting is less than actual number of iterations needed to complete a loop.
- * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
- * SMTChecker: Properties that are proved safe are now reported explicitly at the end of analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
- * Standard JSON Interface: Add experimental support for importing ASTs via Standard JSON.
- * Yul EVM Code Transform: If available, use ``push0`` instead of ``codesize`` to produce an arbitrary value on stack in order to create equal stack heights between branches.
-
-
-Bugfixes:
- * ABI: Include events in the ABI that are emitted by a contract but defined outside of it.
- * Immutables: Disallow initialization of immutables in try/catch statements.
- * SMTChecker: Fix false positives in ternary operators that contain verification targets in its branches, directly or indirectly.
-
-
-AST Changes:
- * AST: Add the ``internalFunctionIDs`` field to the AST nodes of contracts containing IDs of functions that may be called via the internal dispatch. The field is a map from function AST IDs to internal dispatch function IDs. These IDs are always generated, but they are only used in via-IR code generation.
- * AST: Add the ``usedEvents`` field to ``ContractDefinition`` which contains the AST IDs of all events emitted by the contract as well as all events defined and inherited by the contract.
-
-
-### 0.8.19 (2023-02-22)
-
-Language Features:
- * Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
-
-
-Compiler Features:
- * SMTChecker: New trusted mode that assumes that any compile-time available code is the actual used code even in external calls. This can be used via the CLI option ``--model-checker-ext-calls trusted`` or the JSON field ``settings.modelChecker.extCalls: "trusted"``.
-
-
-Bugfixes:
- * Assembler: Avoid duplicating subassembly bytecode where possible.
- * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
- * ContractLevelChecker: Properly distinguish the case of missing base constructor arguments from having an unimplemented base function.
- * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
- * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
- * TypeChecker: Also allow external library functions in ``using for``.
-
-
-AST Changes:
- * AST: Add ``function`` field to ``UnaryOperation`` and ``BinaryOperation`` AST nodes. ``functionList`` in ``UsingForDirective`` AST nodes will now contain ``operator`` and ``definition`` members instead of ``function`` when the list entry defines an operator.
-
-
-### 0.8.18 (2023-02-01)
-
-Language Features:
- * Allow named parameters in mapping types.
-
-
-Compiler Features:
- * Commandline Interface: Add ``--no-cbor-metadata`` that skips CBOR metadata from getting appended at the end of the bytecode.
- * Commandline Interface: Return exit code ``2`` on uncaught exceptions.
- * EVM: Deprecate ``block.difficulty`` and disallow ``difficulty()`` in inline assembly for EVM versions >= paris. The change is due to the renaming introduced by [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399).
- * EVM: Introduce ``block.prevrandao`` in Solidity and ``prevrandao()`` in inline assembly for EVM versions >= paris.
- * EVM: Set the default EVM version to "Paris".
- * EVM: Support for the EVM version "Paris".
- * Language Server: Add basic document hover support.
- * Natspec: Add event Natspec inheritance for devdoc.
- * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
- * Parser: More detailed error messages about invalid version pragmas.
- * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
- * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary ``eld`` must be available in the system.
- * Solidity Upgrade Tool: Remove ``solidity-upgrade`` tool.
- * Standard JSON: Add a boolean field ``settings.metadata.appendCBOR`` that skips CBOR metadata from getting appended at the end of the bytecode.
- * TypeChecker: Warn when using deprecated builtin ``selfdestruct``.
- * Yul EVM Code Transform: Generate more optimal code for user-defined functions that always terminate a transaction. No return labels will be pushed for calls to functions that always terminate.
- * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
- * Yul Optimizer: Eliminate ``keccak256`` calls if the value was already calculated by a previous call and can be reused.
-
-
-Bugfixes:
- * Parser: Disallow several ``indexed`` attributes for the same event parameter.
- * Parser: Disallow usage of the ``indexed`` attribute for modifier parameters.
- * SMTChecker: Fix display error for negative integers that are one more than powers of two.
- * SMTChecker: Fix internal error on chain assignments using static fully specified state variables.
- * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
- * SMTChecker: Fix internal error when a public library function is called internally.
- * SMTChecker: Fix internal error when deleting struct member of function type.
- * SMTChecker: Fix internal error when using user-defined types as mapping indices or struct members.
- * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
- * TypeChecker: Fix bug where private library functions could be attached with ``using for`` outside of their declaration scope.
- * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
-
-
-### 0.8.17 (2022-09-08)
-
-Important Bugfixes:
- * Yul Optimizer: Prevent the incorrect removal of storage writes before calls to Yul functions that conditionally terminate the external EVM call.
-
-
-Compiler Features:
- * Code Generator: More efficient overflow checks for multiplication.
- * Language Server: Analyze all files in a project by default (can be customized by setting ``'file-load-strategy'`` to ``'directly-opened-and-on-import'`` in LSP settings object).
- * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
-
-
-Bugfixes:
- * Type Checker: Fix internal compiler error on tuple assignments with invalid left-hand side.
- * Yul IR Code Generation: Fix internal compiler error when accessing the ``.slot`` member of a mapping through a storage reference in inline assembly.
-
-
-Build System:
- * Allow disabling pedantic warnings and do not treat warnings as errors during compiler build when ``-DPEDANTIC=OFF`` flag is passed to CMake.
- * Update emscripten to version 3.1.19.
-
-
-### 0.8.16 (2022-08-08)
-
-Important Bugfixes:
- * Code Generation: Fix data corruption that affected ABI-encoding of calldata values represented by tuples: structs at any nesting level; argument lists of external functions, events and errors; return value lists of external functions. The 32 leading bytes of the first dynamically-encoded value in the tuple would get zeroed when the last component contained a statically-encoded array.
-
-
-Compiler Features:
- * Code Generator: More efficient code for checked addition and subtraction.
- * TypeChecker: Support using library constants in initializers of other constants.
- * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
- * Yul Optimizer: Add rule to convert ``mod(add(X, Y), A)`` into ``addmod(X, Y, A)``, if ``A`` is a power of two.
- * Yul Optimizer: Add rule to convert ``mod(mul(X, Y), A)`` into ``mulmod(X, Y, A)``, if ``A`` is a power of two.
-
-
-Bugfixes:
- * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
- * Type Checker: Fix compiler crash on tuple assignments involving certain patterns with unary tuples on the left-hand side.
- * Type Checker: Fix compiler crash when ``abi.encodeCall`` received a tuple expression instead of an inline tuple.
- * Type Checker: Fix null dereference in ``abi.encodeCall`` type checking of free function.
-
-
-### 0.8.15 (2022-06-15)
-
-Important Bugfixes:
- * Code Generation: Avoid writing dirty bytes to storage when copying ``bytes`` arrays.
- * Yul Optimizer: Keep all memory side-effects of inline assembly blocks.
-
-
-Language Features:
- * Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
-
-
-Compiler Features:
- * Language Server: Add rudimentary support for semantic highlighting.
- * Language Server: Adds support for configuring ``include-paths`` JSON settings object that can be passed during LSP configuration stage.
- * Language Server: Always add ``{project_root}/node_modules`` to include search paths.
- * Type Checker: Warn about assignments involving multiple pushes to storage ``bytes`` that may invalidate references.
- * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
-
-Bugfixes:
- * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
- * Common Subexpression Eliminator: Process assembly items in chunks with maximum size of 2000. It helps to avoid extremely time-consuming searches during code optimization.
- * DocString Parser: Fix ICE caused by an immutable struct with mapping.
- * Yul IR Code Generation: More robust cleanup in corner cases during memory to storage copies.
- * Yul Optimizer: Do not remove ``returndatacopy`` in cases in which it might perform out-of-bounds reads that unconditionally revert as out-of-gas. Previously, any ``returndatacopy`` that wrote to memory that was never read from was removed without accounting for the out-of-bounds condition.
-
-
-### 0.8.14 (2022-05-17)
-
-Important Bugfixes:
- * ABI Encoder: When ABI-encoding values from calldata that contain nested arrays, correctly validate the nested array length against ``calldatasize()`` in all cases.
- * Override Checker: Allow changing data location for parameters only when overriding external functions.
-
-
-Compiler Features:
- * Assembly-Json Exporter: Include source list in `sourceList` field.
- * Commandline Interface: Option ``--pretty-json`` works also with the following options: ``--abi``, ``--asm-json``, ``--ast-compact-json``, ``--devdoc``, ``--storage-layout``, ``--userdoc``.
- * Language Server: Allow full filesystem access to language server.
- * Peephole Optimizer: Remove operations without side effects before simple terminations.
- * SMTChecker: Support ``abi.encodeCall`` taking into account the called selector.
-
-
-Bugfixes:
- * Assembly-Json Exporter: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
- * SMTChecker: Fix ABI compatibility with z3 >=4.8.16.
- * SMTChecker: Fix bug when z3 is selected but not available at runtime.
- * Type Checker: Properly check restrictions of ``using ... global`` in conjunction with libraries.
- * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
-
-
-### 0.8.13 (2022-03-16)
-
-Important Bugfixes:
- * Code Generator: Correctly encode literals used in ``abi.encodeCall`` in place of fixed bytes arguments.
-
-
-Language Features:
- * General: Allow annotating inline assembly as memory-safe to allow optimizations and stack limit evasion that rely on respecting Solidity's memory model.
- * General: ``using M for Type;`` is allowed at file level and ``M`` can now also be a brace-enclosed list of free functions or library functions.
- * General: ``using ... for T global;`` is allowed at file level where the user-defined type ``T`` has been defined, resulting in the effect of the statement being available everywhere ``T`` is available.
-
-
-Compiler Features:
- * Commandline Interface: Allow the use of ``--via-ir`` in place of ``--experimental-via-ir``.
- * Compilation via Yul IR is no longer marked as experimental.
- * JSON-AST: Added selector field for errors and events.
- * Language Server: Implements goto-definition.
- * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
- * Yul EVM Code Transform: Avoid unnecessary ``pop``s on terminating control flow.
- * Yul IR Code Generation: When the result of an external call is statically-sized, ignore any returndata past the size expected by the compiler.
- * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.
-
-
-Bugfixes:
- * General: Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored.
- * Type Checker: Fix incorrect type checker errors when importing overloaded functions.
- * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
-
-
-### 0.8.12 (2022-02-16)
-
-Language Features:
- * General: Add equality-comparison operators for external function types.
- * General: Support ``ContractName.functionName`` for ``abi.encodeCall``, in addition to external function pointers.
-
-
-Compiler Features:
- * Commandline Interface: Event and error signatures are also returned when using ``--hashes``.
- * Yul Optimizer: Remove ``mstore`` and ``sstore`` operations if the slot already contains the same value.
- * Yul: Emit immutable references for pure yul code when requested.
-
-
-
-Bugfixes:
- * Antlr Grammar: Allow builtin names in ``yulPath`` to support ``.address`` in function pointers.
- * Code Generator: Fix internal error when accessing the members of external functions occupying more than two stack slots.
- * Code Generator: Fix internal error when doing an explicit conversion from ``string calldata`` to ``bytes``.
- * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
- * General: ``string.concat`` now properly takes strings as arguments and returns ``string memory``. It was accidentally introduced as a copy of ``bytes.concat`` before.
- * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the derived contract contains immutable variables.
- * Inheritance: Consider functions in all ancestors during override analysis.
- * IR Generator: Add missing cleanup during the conversion of fixed bytes types to smaller fixed bytes types.
- * IR Generator: Add missing cleanup for indexed event arguments of value type.
- * IR Generator: Fix internal error when copying reference types in calldata and storage to struct or array members in memory.
- * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
- * Natspec: Fix internal error when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
- * Type Checker: Fix internal error when a constant variable declaration forward references a struct.
- * Yul EVM Code Transform: Improved stack shuffling in corner cases.
-
-
-Solc-Js:
- * The wrapper now requires at least nodejs v10.
- * The code has been ported to TypeScript.
-
-
-Build System:
- * Emscripten builds store the embedded WebAssembly binary in LZ4 compressed format and transparently decompress on loading.
-
-
-### 0.8.11 (2021-12-20)
-
-Language Features:
- * General: New builtin function ``abi.encodeCall(functionPointer, (arg1, arg2, ...))`` that type-checks the arguments and returns the ABI-encoded function call data.
-
-
-Compiler Features:
- * Commandline Interface: Add ``--lsp`` option to get ``solc`` to act as a Language Server (LSP) communicating over stdio.
-
-
-Bugfixes:
- * Code Generator: Fix a crash when using ``@use-src`` and compiling from Yul to ewasm.
- * SMTChecker: Fix internal error when an unsafe target is solved more than once and the counterexample messages are different.
- * SMTChecker: Fix soundness of assigned storage/memory local pointers that were not erasing enough knowledge.
- * Fix internal error when a function has a calldata struct argument with an internal type inside.
- * IR Generator: Fix IR syntax error when copying storage arrays of functions.
-
-
-### 0.8.10 (2021-11-09)
-
-Language Features:
- * Inline Assembly: Support ``.address`` and ``.selector`` on external function pointers to access their address and function selector.
-
-
-Compiler Features:
- * Code Generator: Skip existence check for external contract if return data is expected. In this case, the ABI decoder will revert if the contract does not exist.
- * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
- * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
- * Commandline Interface: Support ``--asm``, ``--bin``, ``--ir-optimized``, ``--ewasm`` and ``--ewasm-ir`` output selection options in assembler mode.
- * Commandline Interface: Use different colors when printing errors, warnings and infos.
- * JSON AST: Set absolute paths of imports earlier, in the ``parsing`` stage.
- * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
- * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
- * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
- * Standard JSON: Add ``settings.debug.debugInfo`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
- * Yul EVM Code Transform: Switch to new optimized code transform when compiling via Yul with enabled optimizer.
- * Yul Optimizer: Take control-flow side-effects of user-defined functions into account in various optimizer steps.
-
-
-Bugfixes:
- * Code Generator: Fix constructor source mappings for immutables.
- * Commandline Interface: Disallow ``--error-recovery`` option outside of the compiler mode.
- * Commandline Interface: Don't return zero exit code when writing linked files to disk fails.
- * Commandline Interface: Fix extra newline character being appended to sources passed through standard input, affecting their hashes.
- * Commandline Interface: Report output selection options unsupported by the selected input mode instead of ignoring them.
- * Commandline Interface: When linking only accept exact matches for library names passed to the ``--libraries`` option. Library names not prefixed with a file name used to match any library with that name.
- * SMTChecker: Fix internal error in magic type access (``block``, ``msg``, ``tx``).
- * SMTChecker: Fix internal error in the CHC engine when passing gas in the function options.
- * TypeChecker: Fix internal error when using arrays and structs with user defined value types before declaration.
- * TypeChecker: Fix internal error when using user defined value types in public library functions.
- * TypeChecker: Improved error message for constant variables with (nested) mapping types.
- * Yul Assembler: Fix internal error when function names are not unique.
- * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
-
-
-Important Bugfixes in Experimental Features:
- * Yul IR Generator: Changes to function return variables referenced in modifier invocation arguments were not properly forwarded if there was more than one return variable.
-
-
-Build System:
- * Pass linker-only emscripten options only when linking.
- * Remove obsolete compatibility workaround for emscripten builds.
- * Update emscripten to version 2.0.33.
-
-
-### 0.8.9 (2021-09-29)
-
-Important Bugfixes:
- * Immutables: Properly perform sign extension on signed immutables.
- * User Defined Value Type: Fix storage layout of user defined value types for underlying types shorter than 32 bytes.
-
-
-Bugfixes:
- * AST: Export ``canonicalName`` for ``UserDefinedValueTypeDefinition`` and ``ContractDefinition``.
-
-
-
-### 0.8.8 (2021-09-27)
-
-Language Features:
- * Inheritance: A function that overrides only a single interface function does not require the ``override`` specifier.
- * Type System: Support ``type(E).min`` and ``type(E).max`` for enums.
- * User Defined Value Type: allows creating a zero cost abstraction over a value type with stricter type requirements.
-
-
-Compiler Features:
- * Commandline Interface: Add ``--include-path`` option for specifying extra directories that may contain importable code (e.g. packaged third-party libraries).
- * Commandline Interface: Do not implicitly run evm bytecode generation unless needed for the requested output.
- * Commandline Interface: Normalize paths specified on the command line and make them relative for files located inside base path and/or include paths.
- * Immutable variables can be read at construction time once they are initialized.
- * SMTChecker: Add constraints to better correlate ``address(this).balance`` and ``msg.value``.
- * SMTChecker: Support constants via modules.
- * SMTChecker: Support low level ``call`` as external calls to unknown code.
- * SMTChecker: Support the ``value`` option for external function calls.
- * SMTChecker: Support user defined value types.
-
-
-Bugfixes:
- * Code Generator: Fix ICE on assigning to calldata structs and statically-sized calldata arrays in inline assembly.
- * Code Generator: Use stable source order for ABI functions.
- * Commandline Interface: Disallow the ``--experimental-via-ir`` option in Standard JSON, Assembler and Linker modes.
- * Commandline Interface: Fix resolution of paths whitelisted with ``--allowed-paths`` or implicitly due to base path, remappings and files being compiled. Correctly handle paths that do not match imports exactly due to being relative, non-normalized or empty.
- * Commandline Interface: Report optimizer options as invalid in Standard JSON and linker modes instead of ignoring them.
- * Name Resolver: Fix that when importing an aliased symbol using ``import {AliasedName} from "a.sol"`` it would use the original name of the symbol and not the aliased one.
- * Opcode Optimizer: Prevent the optimizer from running multiple times to avoid potential bytecode differences for referenced code.
- * Parser: Properly check for multiple SPDX license identifiers next to each other and validate them.
- * SMTChecker: Fix BMC's constraints regarding internal functions.
- * SMTChecker: Fix false negative caused by ``push`` on storage array references returned by internal functions.
- * SMTChecker: Fix false positive in external calls from constructors.
- * SMTChecker: Fix internal error on some multi-source uses of ``abi.*``, cryptographic functions and constants.
- * Standard JSON: Fix non-fatal errors in Yul mode being discarded if followed by a fatal error.
- * Type Checker: Correct wrong error message in inline assembly complaining about ``.slot`` or ``.offset`` not valid when actually ``.length`` was used.
- * Type Checker: Disallow modifier declarations and definitions in interfaces.
- * Yul Optimizer: Fix a crash in LoadResolver, when ``keccak256`` has particular non-identifier arguments.
-
-
-
-### 0.8.7 (2021-08-11)
-
-Language Features:
- * Introduce global ``block.basefee`` for retrieving the base fee of the current block.
- * Yul: Introduce builtin ``basefee()`` for retrieving the base fee of the current block.
-
-
-Compiler Features:
- * AssemblyStack: Also run opcode-based optimizer when compiling Yul code.
- * Commandline Interface: option ``--pretty-json`` works also with ``--standard--json``.
- * EVM: Set the default EVM version to "London".
- * SMTChecker: Do not check underflow and overflow by default.
- * SMTChecker: Unproved targets are hidden by default, and the SMTChecker only states how many unproved targets there are. They can be listed using the command line option ``--model-checker-show-unproved`` or the JSON option ``settings.modelChecker.showUnproved``.
- * SMTChecker: new setting to enable/disable encoding of division and modulo with slack variables. The command line option is ``--model-checker-div-mod-slacks`` and the JSON option is ``settings.modelChecker.divModWithSlacks``.
- * Yul EVM Code Transform: Also pop unused argument slots for functions without return variables (under the same restrictions as for functions with return variables).
- * Yul EVM Code Transform: Do not reuse stack slots that immediately become unreachable.
- * Yul Optimizer: Move function arguments and return variables to memory with the experimental Stack Limit Evader (which is not enabled by default).
-
-
-Bugfixes:
- * Code Generator: Fix crash when passing an empty string literal to ``bytes.concat()``.
- * Code Generator: Fix internal compiler error when calling functions bound to calldata structs and arrays.
- * Code Generator: Fix internal compiler error when passing a 32-byte hex literal or a zero literal to ``bytes.concat()`` by disallowing such literals.
- * Commandline Interface: Apply ``--optimizer-runs`` option in assembly / yul mode.
- * Commandline Interface: Fix crash when a directory path is passed to ``--standard-json``.
- * Commandline Interface: Read JSON from standard input when ``--standard-json`` gets ``-`` as a file name.
- * Standard JSON: Include source location for errors in files with empty name.
- * Type Checker: Fix internal error and prevent static calls to unimplemented modifiers.
- * Yul Code Generator: Fix internal compiler error when using a long literal with bitwise negation.
- * Yul Code Generator: Fix source location references for calls to builtin functions.
- * Yul Parser: Fix source location references for ``if`` statements.
-
-
-### 0.8.6 (2021-06-22)
-
-Language Features:
- * Yul: Special meaning of ``".metadata"`` data object in Yul object.
-
-
-Bugfixes:
- * Control Flow Graph: Fix incorrectly reported unreachable code.
- * Solc-Js: When running ``solcjs`` without the ``--optimize`` flag, use ``settings.optimizer.enabled=false`` in Standard JSON instead of omitting the key.
- * Standard JSON: Omitting ``settings.optimizer.enabled`` was not equivalent to setting it to ``false``. It meant disabling also the peephole optimizer and jumpdest remover which by default still run with ``enabled=false``.
-
-
-### 0.8.5 (2021-06-10)
-
-Language Features:
- * Allowing conversion from ``bytes`` and ``bytes`` slices to ``bytes1``/.../``bytes32``.
- * Yul: Add ``verbatim`` builtin function to inject arbitrary bytecode.
-
-
-Compiler Features:
- * Code Generator: Insert helper functions for panic codes instead of inlining unconditionally. This can reduce costs if many panics (checks) are inserted, but can increase costs where few panics are used.
- * EVM: Set the default EVM version to "Berlin".
- * SMTChecker: Function definitions can be annotated with the custom Natspec tag ``custom:smtchecker abstract-function-nondet`` to be abstracted by a nondeterministic value when called.
- * Standard JSON / combined JSON: New artifact "functionDebugData" that contains bytecode offsets of entry points of functions and potentially more information in the future.
- * Yul Optimizer: Evaluate ``keccak256(a, c)``, when the value at memory location ``a`` is known at compile time and ``c`` is a constant ``<= 32``.
-
-
-Bugfixes:
- * AST: Do not output value of Yul literal if it is not a valid UTF-8 string.
- * Code Generator: Fix internal error when function arrays are assigned to storage variables and the function types can be implicitly converted but are not identical.
- * Code Generator: Fix internal error when super would have to skip an unimplemented function in the virtual resolution order.
- * Control Flow Graph: Assume unimplemented modifiers use a placeholder.
- * Control Flow Graph: Take internal calls to functions that always revert into account for reporting unused or unassigned variables.
- * Function Call Graph: Fix internal error connected with circular constant references.
- * Name Resolver: Do not issue shadowing warning if the shadowing name is not directly accessible.
- * Natspec: Allow multiple ``@return`` tags on public state variable documentation.
- * SMTChecker: Fix internal error on conversion from ``bytes`` to ``fixed bytes``.
- * SMTChecker: Fix internal error on external calls from the constructor.
- * SMTChecker: Fix internal error on struct constructor with fixed bytes member initialized with string literal.
- * Source Locations: Properly set source location of scoped blocks.
- * Standard JSON: Properly allow the ``inliner`` setting under ``settings.optimizer.details``.
- * Type Checker: Fix internal compiler error related to having mapping types in constructor parameter for abstract contracts.
- * Type Checker: Fix internal compiler error when attempting to use an invalid external function type on pre-byzantium EVMs.
- * Type Checker: Fix internal compiler error when overriding receive ether function with one having different parameters during inheritance.
- * Type Checker: Make errors about (nested) mapping type in event or error parameter into fatal type errors.
- * Type Checker: Fix internal compiler error when overriding an implemented modifier with an unimplemented one.
-
-
-AST Changes:
- * Add member `hexValue` for Yul string and hex literals.
-
-
-
-### 0.8.4 (2021-04-21)
-
-Important Bugfixes:
- * ABI Decoder V2: For two-dimensional arrays and specially crafted data in memory, the result of ``abi.decode`` can depend on data elsewhere in memory. Calldata decoding is not affected.
-
-
-Language Features:
- * Assembly / Yul: Allow hex string literals.
- * Possibility to use ``bytes.concat`` with variable number of ``bytes`` and ``bytesNN`` arguments which behaves as a restricted version of `abi.encodePacked` with a more descriptive name.
- * Support custom errors via the ``error`` keyword and introduce the ``revert`` statement.
-
-
-Compiler Features:
- * Analysis: Properly detect circular references to the bytecode of other contracts across all function calls.
- * Commandline Interface: Model checker option ``--model-checker-targets`` also accepts ``outOfBounds``.
- * Commandline Interface: New model checker option ``--model-checker-contracts`` allows users to select which contracts should be analyzed as the most derived.
- * Low-Level Inliner: Inline ordinary jumps to small blocks and jumps to small blocks that terminate.
- * NatSpec: Allow ``@notice`` tag on non-public state variables and local variable declarations. The documentation will only be part of the AST, under the field ``documentation``.
- * SMTChecker: Deprecate ``pragma experimental SMTChecker;`` and set default model checker engine to ``none``.
- * SMTChecker: Report local variables in CHC counterexamples.
- * SMTChecker: Report out of bounds index access for arrays and fixed bytes.
- * SMTChecker: Support file level functions and constants.
- * Standard JSON: Model checker option ``settings.modelChecker.targets`` also accepts ``outOfBounds``.
- * Standard JSON: Model checker option ``settings.modelChecker.targets`` takes an array of string targets instead of string of comma separated targets.
- * Standard JSON: New model checker option ``settings.modelChecker.contracts`` allows users to select which contracts should be analyzed as the most derived.
- * Yul EVM Code Transform: Stack Optimization: Reuse slots of unused function arguments and defer allocating stack slots for return variables until after expression statements and assignments that do not reference them.
- * Yul Optimizer: Added a new step FunctionSpecializer, that specializes a function with its literal arguments.
-
-
-Bugfixes:
- * Antlr Grammar: Fix parsing of import paths involving properly distinguishing between empty and non-empty string literals in general.
- * AST Output: Fix ``kind`` field of ``ModifierInvocation`` for base constructor calls.
- * Commandline interface: Fix internal error when printing AST and using ``--base-path`` or ``file://`` prefix in imports.
- * Commandline interface: Fix standard input bypassing allowed path checks.
- * Natspec: Fix internal error related to the `@returns` documentation for a public state variable overriding a function.
- * SMTChecker: Fix false positive and false negative on ``push`` as LHS of a compound assignment.
- * SMTChecker: Fix false positive in contracts that cannot be deployed.
- * SMTChecker: Fix internal error on public getter returning dynamic data on older EVM versions where these are not available.
- * SMTChecker: Fix internal error on try-catch with function call in catch block.
- * Type Checker: Fix missing error when events are used without an emit statement.
-
-
-AST Changes:
- * New property for ``ContractDefinition`` nodes: ``usedErrors`` lists AST IDs of all errors used by the contract (even if defined outside).
-
-
-
-### 0.8.3 (2021-03-23)
-
-Important Bugfixes:
- * Optimizer: Fix bug on incorrect caching of Keccak-256 hashes.
-
-Compiler Features:
- * Command Line Interface: Drop experimental support for ``--machine evm15``.
- * Optimizer: Try to move ``and`` with constant inside ``or`` to improve storage writes of small types.
- * Optimizer: Replace multiplications and divisions with powers of two by shifts.
-
-Bugfixes:
- * AST Import: For constructors, a public visibility is ignored during importing.
- * Error Reporter: Fix handling of carriage return.
- * SMTChecker: Fix internal error in BMC on resolving virtual functions inside branches.
- * SMTChecker: Fix internal error on ``array.pop`` nested inside 1-tuple.
- * SMTChecker: Fix internal error on ``FixedBytes`` constant initialized with string literal.
- * SMTChecker: Fix internal error on array slices.
- * SMTChecker: Fix internal error on calling public getter on a state variable of type array (possibly nested) of structs.
- * SMTChecker: Fix internal error on pushing to ``string`` casted to ``bytes``.
- * SMTChecker: Fix bug in virtual functions called by constructors.
-
-AST Changes:
- * ModifierInvocation: Add ``kind`` field which can be ``modifierInvocation`` or ``baseConstructorSpecifier``.
-
-
-### 0.8.2 (2021-03-02)
-
-Compiler Features:
- * AST: Export NatSpec comments above each statement as their documentation.
- * Inline Assembly: Do not warn anymore about variables or functions being shadowed by EVM opcodes.
- * NatSpec: Provide source locations for parsing errors.
- * Optimizer: Simple inlining when jumping to small blocks that jump again after a few side-effect free opcodes.
- * NatSpec: Allow and export all tags that start with ``@custom:``.
-
-
-Bugfixes:
- * AST: Added ``referencedDeclaration`` for enum members.
- * Code Generator: Fix internal error when functions are passed as parameters of other callables, when the function types can be implicitly converted, but not identical.
- * Parser: Properly parse ``.address`` in some situations.
- * SMTChecker: Fix missing type constraints on block and transaction variables in the deployment phase.
- * Type Checker: Fix internal error when override specifier is not a contract.
- * Type Checker: Make function-hash collision errors into fatal type errors.
-
-
-AST Changes:
- * Adds ``nameLocation`` to declarations to represent the exact location of the symbolic name.
- * Removed the redundant function type "bytearraypush" - replaced by "arraypush".
- * Support field ``documentation`` to hold NatSpec comments above each statement.
-
-
-### 0.8.1 (2021-01-27)
-
-Language Features:
- * Possibility to use ``catch Panic(uint code)`` to catch a panic failure from an external call.
-
-Compiler Features:
- * Code Generator: Reduce the cost of ``<address>.code.length`` by using ``extcodesize`` directly.
- * Command Line Interface: Allow ``=`` as separator between library name and address in ``--libraries`` commandline option.
- * Command Line Interface: New option ``--model-checker-targets`` allows specifying which targets should be checked. The valid options are ``all``, ``constantCondition``, ``underflow``, ``overflow``, ``divByZero``, ``balance``, ``assert``, ``popEmptyArray``, where the default is ``all``. Multiple targets can be chosen at the same time, separated by a comma without spaces: ``underflow,overflow,assert``.
- * Command Line Interface: Only accept library addresses with a prefix of ``0x`` in ``--libraries`` commandline option.
- * Optimizer: Add rule to replace ``iszero(sub(x,y))`` by ``eq(x,y)``.
- * Parser: Report meaningful error if parsing a version pragma failed.
- * SMTChecker: Output internal and trusted external function calls in a counterexample's transaction trace.
- * SMTChecker: Show ``msg.value`` in counterexample transaction traces when greater than 0.
- * SMTChecker: Show contract name in counterexample function call.
- * SMTChecker: Support ABI functions as uninterpreted functions.
- * SMTChecker: Support try/catch statements.
- * SMTChecker: Synthesize untrusted functions called externally.
- * SMTChecker: Use checked arithmetic by default and support ``unchecked`` blocks.
- * Standard JSON: New option ``modelCheckerSettings.targets`` allows specifying which targets should be checked. The valid options are ``all``, ``constantCondition``, ``underflow``, ``overflow``, ``divByZero``, ``balance``, ``assert``, ``popEmptyArray``, where the default is ``all``. Multiple targets can be chosen at the same time, separated by a comma without spaces: ``underflow,overflow,assert``.
-
-Bugfixes:
- * Code Generator: Fix length check when decoding malformed error data in catch clause.
- * Control Flow Graph: Fix missing error caused by read from/write to uninitialized variables.
- * SMTChecker: Fix false negatives in overriding modifiers and functions.
- * SMTChecker: Fix false negatives in the presence of inline assembly.
- * SMTChecker: Fix false negatives when analyzing external function calls.
- * SMTChecker: Fix internal error on ``block.chainid``.
- * SMTChecker: Fix internal error on pushing string literal to ``bytes`` array.
- * SMTChecker: Fix missing type constraints for block variables.
- * Type Checker: Fix infinite loop when accessing circular constants from inline assembly.
- * Type Checker: Fix internal error caused by constant structs containing mappings.
- * Type System: Disallow implicit conversion from ``uintN`` to ``intM`` when ``M > N``, and by extension, explicit conversion between the same types is also disallowed.
-
-Build System:
- * Update the soljson.js build to emscripten 2.0.12 and boost 1.75.0.
-
-
-### 0.8.0 (2020-12-16)
-
-Breaking Changes:
- * Code Generator: All arithmetic is checked by default. These checks can be disabled using ``unchecked { ... }``.
- * Code Generator: Cause a panic if a byte array in storage is accessed whose length is encoded incorrectly.
- * Code Generator: Use ``revert`` with error signature ``Panic(uint256)`` and error codes instead of invalid opcode on failing assertions.
- * Command Line Interface: JSON fields `abi`, `devdoc`, `userdoc` and `storage-layout` are now sub-objects rather than strings.
- * Command Line Interface: Remove the ``--old-reporter`` option.
- * Command Line Interface: Remove the legacy ``--ast-json`` option. Only the ``--ast-compact-json`` option is supported now.
- * General: Enable ABI coder v2 by default.
- * General: Remove global functions ``log0``, ``log1``, ``log2``, ``log3`` and ``log4``.
- * Parser: Exponentiation is right associative. ``a**b**c`` is parsed as ``a**(b**c)``.
- * Scanner: Remove support for the ``\b``, ``\f``, and ``\v`` escape sequences.
- * Standard JSON: Remove the ``legacyAST`` option.
- * Type Checker: Function call options can only be given once.
- * Type System: Declarations with the name ``this``, ``super`` and ``_`` are disallowed, with the exception of public functions and events.
- * Type System: Disallow ``msg.data`` in ``receive()`` function.
- * Type System: Disallow ``type(super)``.
- * Type System: Disallow enums with more than 256 members.
- * Type System: Disallow explicit conversions from negative literals and literals larger than ``type(uint160).max`` to ``address`` type.
- * Type System: Disallow the ``byte`` type. It was an alias to ``bytes1``.
- * Type System: Explicit conversion to ``address`` type always returns a non-payable ``address`` type. In particular, ``address(u)``, ``address(b)``, ``address(c)`` and ``address(this)`` have the type ``address`` instead of ``address payable`` (Here ``u``, ``b``, and ``c`` are arbitrary variables of type ``uint160``, ``bytes20`` and contract type respectively.)
- * Type System: Explicit conversions between two types are disallowed if it changes more than one of sign, width or kind at the same time.
- * Type System: Explicit conversions from literals to enums are only allowed if the value fits in the enum.
- * Type System: Explicit conversions from literals to integer type is as strict as implicit conversions.
- * Type System: Introduce ``address(...).code`` to retrieve the code as ``bytes memory``. The size can be obtained via ``address(...).code.length``, but it will currently always include copying the code.
- * Type System: Introduce ``block.chainid`` for retrieving the current chain id.
- * Type System: Support ``address(...).codehash`` to retrieve the codehash of an account.
- * Type System: The global variables ``tx.origin`` and ``msg.sender`` have type ``address`` instead of ``address payable``.
- * Type System: Unary negation can only be used on signed integers, not on unsigned integers.
- * View Pure Checker: Mark ``chainid`` as view.
- * Yul: Disallow the use of reserved identifiers, such as EVM instructions, even if they are not available in the given dialect / EVM version.
- * Yul: The ``assignimmutable`` builtin in the "EVM with objects" dialect takes the base offset of the code to modify as an additional argument.
-
-Language Features:
- * Super constructors can now be called using the member notation e.g. ``M.C(123)``.
-
-Bugfixes:
- * Type Checker: Perform proper truncating integer arithmetic when using constants in array length expressions.
-
-AST Changes:
- * New AST Node ``IdentifierPath`` replacing in many places the ``UserDefinedTypeName``.
- * New AST Node ``UncheckedBlock`` used for ``unchecked { ... }``.
-
-### 0.7.6 (2020-12-16)
-
-Language Features:
- * Code generator: Support conversion from calldata slices to memory and storage arrays.
- * Code generator: Support copying dynamically encoded structs from calldata to memory.
- * Code generator: Support copying of nested arrays from calldata to memory.
- * Scanner: Generate a parser error when comments or unicode strings contain an unbalanced or underflowing set of unicode direction override markers (LRO, RLO, LRE, RLE, PDF).
- * The fallback function can now also have a single ``calldata`` argument (equaling ``msg.data``) and return ``bytes memory`` (which will not be ABI-encoded but returned as-is).
- * Wasm backend: Add ``i32.select`` and ``i64.select`` instructions.
-
-Compiler Features:
- * Build System: Optionally support dynamic loading of Z3 and use that mechanism for Linux release builds.
- * Code Generator: Avoid memory allocation for default value if it is not used.
- * SMTChecker: Apply constant evaluation on binary arithmetic expressions.
- * SMTChecker: Create underflow and overflow verification targets for increment/decrement in the CHC engine.
- * SMTChecker: Report struct values in counterexamples from CHC engine.
- * SMTChecker: Support early returns in the CHC engine.
- * SMTChecker: Support getters.
- * SMTChecker: Support named arguments in function calls.
- * SMTChecker: Support struct constructor.
- * Standard-Json: Move the recently introduced ``modelCheckerSettings`` key to ``settings.modelChecker``.
- * Standard-Json: Properly filter the requested output artifacts.
-
-Bugfixes:
- * Code generator: Do not pad empty string literals with a single 32-byte zero field in the ABI coder v1.
- * NatSpec: Fix segfault when inheriting return parameter documentation for modifiers with no parameters.
- * SMTChecker: Fix cast string literals to byte arrays.
- * SMTChecker: Fix internal compiler error when doing bitwise compound assignment with string literals.
- * SMTChecker: Fix internal error when trying to generate counterexamples with old z3.
- * SMTChecker: Fix segmentation fault that could occur on certain SMT-enabled sources when no SMT solver was available.
- * SMTChecker: Fix internal error when ``bytes.push()`` is used as the LHS of an assignment.
- * Type Checker: ``super`` is not available in libraries.
- * Type Checker: Disallow leading zeroes in sized-types (e.g. ``bytes000032``), but allow them to be treated as identifiers.
- * Yul Optimizer: Fix a bug in NameSimplifier where a new name created by NameSimplifier could also be created by NameDispenser.
- * Yul Optimizer: Removed NameSimplifier from optimization steps available to users.
-
-### 0.7.5 (2020-11-18)
-
-Language Features:
- * Ability to select the abi coder using ``pragma abicoder v1`` and ``pragma abicoder v2``.
- * Inline Assembly: Use ``.offset`` and ``.length`` for calldata variables of dynamic array type to access their calldata offset and length (number of elements). Both of them can also be assigned to.
- * Immutable variables with literal number values are considered pure.
-
-Compiler Features:
- * Assembler: Perform linking in assembly mode when library addresses are provided.
- * Command Line Interface: New option ``--experimental-via-ir`` allows switching compilation process to go through the Yul intermediate representation. This is highly experimental and is used for development purposes.
- * Command Line Interface: New option ``--model-checker-timeout`` sets a timeout in milliseconds for each individual query performed by the SMTChecker.
- * Command Line Interface: Report error if file could not be read in ``--standard-json`` mode.
- * Command Line interface: Report proper error for each output file which could not be written. Previously an exception was thrown, and execution aborted, on the first error.
- * SMTChecker: Add division by zero checks in the CHC engine.
- * SMTChecker: More precise analysis of external calls using ``this``.
- * SMTChecker: Support ``selector`` for expressions with value known at compile-time.
- * Standard JSON: New option ``modelCheckerSettings.timeout`` sets a timeout in milliseconds for each individual query performed by the SMTChecker.
- * Standard JSON: New option ``settings.viaIR`` allows the same switch as ``--experimental-via-ir`` on the commandline.
-
-
-Bugfixes:
- * Code generator: Fix missing creation dependency tracking for abstract contracts.
- * Command Line Interface: Fix write error when the directory passed to ``--output-dir`` ends with a slash.
- * Command Line Interface: Reject duplicate libraries in ``--libraries`` option instead of arbitrarily choosing one.
- * NatSpec: Fix internal error when inheriting return parameter documentation but the parameter names differ between base and inherited.
- * SMTChecker: Fix CHC false positives when branches are used inside modifiers.
- * SMTChecker: Fix false negative in modifier applied multiple times.
- * SMTChecker: Fix incorrect counterexamples reported by the CHC engine.
- * SMTChecker: Fix internal error in the BMC engine when inherited contract from a different source unit has private state variables.
- * SMTChecker: Fix internal error on conversion from string literal to byte.
- * SMTChecker: Fix internal error when ``array.push()`` is used as the LHS of an assignment.
- * SMTChecker: Fix internal error when assigning state variable via contract's name.
- * SMTChecker: Fix internal error when using tuples of rational literals inside the conditional operator.
- * SMTChecker: Fix lack of reporting potential violations when using only the CHC engine.
- * Standard JSON: Fix library addresses specified in ``libraries`` being used for linking even if the file names do not match.
-
-AST Changes:
- * New member ``suffix`` for inline assembly identifiers. Currently supported values are ``"slot"``, ``"offset"`` and ``"length"`` to access the components of a Solidity variable.
-
-
-### 0.7.4 (2020-10-19)
-
-Important Bugfixes:
- * Code Generator: Fix data corruption bug when copying empty byte arrays from memory or calldata to storage.
-
-
-Language Features:
- * Constants can be defined at file level.
-
-
-Compiler Features:
- * Command Line Interface: New option ``--model-checker-engine`` allows to choose a specific SMTChecker engine. Options are ``all`` (default), ``bmc``, ``chc`` and ``none``.
- * Control Flow Graph: Print warning for non-empty functions with unnamed return parameters that are not assigned a value in all code paths.
- * SMTChecker: Support ``keccak256``, ``sha256``, ``ripemd160`` and ``ecrecover`` in the CHC engine.
- * SMTChecker: Support inline arrays.
- * SMTChecker: Support variables ``block``, ``msg`` and ``tx`` in the CHC engine.
- * Standard JSON: New option ``modelCheckerSettings.engine`` allows to choose a specific SMTChecker engine. Options are ``all`` (default), ``bmc``, ``chc`` and ``none``.
-
-
-Bugfixes:
- * Code generator: Fix ``ABIEncoderV2`` pragma from the current module affecting inherited functions and applied modifiers.
- * Code generator: Fix internal compiler error when referencing members via module name but not using the reference.
- * Code generator: Fix internal error on returning structs containing mappings from library function.
- * Code generator: Use revert instead of invalid opcode for out-of-bounds array index access in getter.
- * Contract Level Checker: Add missing check against inheriting functions with ABIEncoderV2 return types in ABIEncoderV1 contracts.
- * Name Resolver: Fix shadowing/same-name warnings for later declarations.
- * Type Checker: Allow arrays of contract types as type expressions and as arguments for ``abi.decode``.
- * Type Checker: Disallow invalid use of library names as type name.
- * Type Checker: Fix internal compiler error caused by storage parameters with nested mappings in libraries.
-
-
-### 0.7.3 (2020-10-07)
-
-Important Bugfixes:
- * Code Generator: Properly cleanup after copying dynamic-array to storage for packed types.
-
-Compiler Features:
- * Code generator: Implemented events with function type as one of its indexed parameters.
- * General: Option to stop compilation after parsing stage. Can be used with ``solc --stop-after parsing``
- * Optimizer: Optimize ``exp`` when base is ``-1``.
- * SMTChecker: Support ``addmod`` and ``mulmod``.
- * SMTChecker: Support array slices.
- * SMTChecker: Support type conversions.
-
-
-Bugfixes:
- * Fixed internal compiler errors for certain contracts involving the ``new`` expression.
- * JSON AST: Fix internal error when using ``--ast-json`` on a function with memory arguments in ABIEncoderV2 contracts.
- * Type Checker: Add missing checks for calls using types incompatible with ABIEncoderV1 in modules where ABIEncoderV2 is not enabled.
- * Type Checker: Fix internal compiler error when calling `.push(<arg>)` for a storage array with a nested mapping.
-
-
-### 0.7.2 (2020-09-28)
-
-Important Bugfixes:
- * Type Checker: Disallow two or more free functions with identical name (potentially imported and aliased) and parameter types.
-
-Compiler Features:
- * Export compiler-generated utility sources via standard-json or combined-json.
- * Optimizer: Optimize ``exp`` when base is 0, 1 or 2.
- * SMTChecker: Keep knowledge about string literals, even through assignment, and thus support the ``.length`` property properly.
- * SMTChecker: Support ``address`` type conversion with literals, e.g. ``address(0)``.
- * SMTChecker: Support ``revert()``.
- * SMTChecker: Support ``type(T).min``, ``type(T).max``, and ``type(I).interfaceId``.
- * SMTChecker: Support compound and, or, and xor operators.
- * SMTChecker: Support events and low-level logs.
- * SMTChecker: Support fixed bytes index access.
- * SMTChecker: Support memory allocation, e.g. ``new bytes(123)``.
- * SMTChecker: Support shifts.
- * SMTChecker: Support structs.
- * Type Checker: Explain why oversized hex string literals can not be explicitly converted to a shorter ``bytesNN`` type.
- * Type Checker: More detailed error messages why implicit conversions fail.
- * Type Checker: Report position of first invalid UTF-8 sequence in ``unicode""`` literals.
- * Yul IR Generator: Report source locations related to unimplemented features.
- * Yul Optimizer: Inline into functions further down in the call graph first.
- * Yul Optimizer: Prune unused parameters in functions.
- * Yul Optimizer: Try to simplify function names.
-
-
-Bugfixes:
- * Code generator: Fix internal error on stripping dynamic types from return parameters on EVM versions without ``RETURNDATACOPY``.
- * Type Checker: Add missing check against nested dynamic arrays in ABI encoding functions when ABIEncoderV2 is disabled.
- * Type Checker: Correct the error message for invalid named parameter in a call to refer to the right argument.
- * Type Checker: Disallow ``virtual`` for modifiers in libraries.
- * Name Resolver: Correct the warning for homonymous, but not shadowing declarations.
- * Type system: Fix internal error on implicit conversion of contract instance to the type of its ``super``.
- * Type system: Fix internal error on implicit conversion of string literal to a calldata string.
- * Type system: Fix named parameters in overloaded function and event calls being matched incorrectly if the order differs from the declaration.
- * ViewPureChecker: Prevent visibility check on constructors.
-
-
-### 0.7.1 (2020-09-02)
-
-Language Features:
- * Allow function definitions outside of contracts, behaving much like internal library functions.
- * Code generator: Implementing copying structs from calldata to storage.
-
-Compiler Features:
- * SMTChecker: Add underflow and overflow as verification conditions in the CHC engine.
- * SMTChecker: Support bitwise or, xor and not operators.
- * SMTChecker: Support conditional operator.
- * Standard JSON Interface: Do not run EVM bytecode code generation, if only Yul IR or EWasm output is requested.
- * Yul Optimizer: LoopInvariantCodeMotion can move reading operations outside for-loops as long as the affected area is not modified inside the loop.
- * Yul: Report error when using non-string literals for ``datasize()``, ``dataoffset()``, ``linkersymbol()``, ``loadimmutable()``, ``setimmutable()``.
-
-Bugfixes:
- * AST: Remove ``null`` member values also when the compiler is used in standard-json-mode.
- * General: Allow `type(Contract).name` for abstract contracts and interfaces.
- * Immutables: Disallow assigning immutables more than once during their declaration.
- * Immutables: Properly treat complex assignment and increment/decrement as both reading and writing and thus disallow it everywhere for immutable variables.
- * Optimizer: Keep side-effects of ``x`` in ``byte(a, shr(b, x))`` even if the constants ``a`` and ``b`` would make the expression zero unconditionally. This optimizer rule is very hard if not impossible to trigger in a way that it can result in invalid code, though.
- * References Resolver: Fix internal bug when using constructor for library.
- * Scanner: Fix bug where whitespace would be allowed within the ``->`` token (e.g. ``function f() -   > x {}`` becomes invalid in inline assembly and Yul).
- * SMTChecker: Fix internal error in BMC function inlining.
- * SMTChecker: Fix internal error on array implicit conversion.
- * SMTChecker: Fix internal error on fixed bytes index access.
- * SMTChecker: Fix internal error on lvalue unary operators with tuples.
- * SMTChecker: Fix internal error on tuple assignment.
- * SMTChecker: Fix internal error on tuples of one element that have tuple type.
- * SMTChecker: Fix internal error when using imported code.
- * SMTChecker: Fix soundness of array ``pop``.
- * Type Checker: Disallow ``using for`` directive inside interfaces.
- * Type Checker: Disallow signed literals as exponent in exponentiation operator.
- * Type Checker: Disallow structs containing nested mapping in memory as parameters for library functions.
- * Yul Optimizer: Ensure that Yul keywords are not mistakenly used by the NameDispenser and VarNameCleaners. The bug would manifest as uncompilable code.
- * Yul Optimizer: Make function inlining order more resilient to whether or not unrelated source files are present.
-
-
-### 0.7.0 (2020-07-28)
-
-Breaking changes:
- * Inline Assembly: Disallow ``.`` in user-defined function and variable names.
- * Inline Assembly: Slot and offset of storage pointer variable ``x`` are accessed via ``x.slot`` and ``x.offset`` instead of ``x_slot`` and ``x_offset``.
- * JSON AST: Mark hex string literals with ``kind: "hexString"``.
- * JSON AST: Remove members with ``null`` value from JSON output.
- * Parser: Disallow ``gwei`` as identifier.
- * Parser: Disallow dot syntax for ``value`` and ``gas``.
- * Parser: Disallow non-printable characters in string literals.
- * Parser: Introduce Unicode string literals: ``unicode"😃"``.
- * Parser: NatSpec comments on variables are only allowed for public state variables.
- * Parser: Remove the ``finney`` and ``szabo`` denominations.
- * Parser: Remove the identifier ``now`` (replaced by ``block.timestamp``).
- * Reference Resolver: ``using A for B`` only affects the contract it is mentioned in and not all derived contracts
- * Type Checker: Disallow ``virtual`` for library functions.
- * Type Checker: Disallow assignments to state variables that contain nested mappings.
- * Type checker: Disallow events with same name and parameter types in inheritance hierarchy.
- * Type Checker: Disallow shifts by signed types.
- * Type Checker: Disallow structs and arrays in memory or calldata if they contain nested mappings.
- * Type Checker: Exponentiation and shifts of literals by non-literals will always use ``uint256`` or ``int256`` as a type.
- * Yul: Disallow consecutive and trailing dots in identifiers. Leading dots were already disallowed.
- * Yul: Disallow EVM instruction `pc()`.
-
-
-Language Features:
- * Inheritance: Allow overrides to have stricter state mutability: ``view`` can override ``nonpayable`` and ``pure`` can override ``view``.
- * Parser: Deprecate visibility for constructors.
- * State mutability: Do not issue recommendation for stricter mutability for virtual functions but do issue it for functions that override.
-
-
-Compiler Features:
- * SMTChecker: Report multi-transaction counterexamples including the function calls that initiate the transactions. This does not include concrete values for reference types and reentrant calls.
- * Variable declarations using the ``var`` keyword are not recognized anymore.
-
-
-Bugfixes:
- * Immutables: Fix internal compiler error when immutables are not assigned.
- * Inheritance: Disallow public state variables overwriting ``pure`` functions.
- * NatSpec: Constructors and functions have consistent userdoc output.
- * SMTChecker: Fix internal error when assigning to a 1-tuple.
- * SMTChecker: Fix internal error when tuples have extra effectless parenthesis.
- * State Mutability: Constant public state variables are considered ``pure`` functions.
- * Type Checker: Fixing deduction issues on function types when function call has named arguments.
-
-
-### 0.6.12 (2020-07-22)
-
-Language Features:
- * NatSpec: Implement tag ``@inheritdoc`` to copy documentation from a specific base contract.
- * Wasm backend: Add ``i32.ctz``, ``i64.ctz``, ``i32.popcnt``, and ``i64.popcnt``.
-
-
-Compiler Features:
- * Code Generator: Avoid double cleanup when copying to memory.
- * Code Generator: Evaluate ``keccak256`` of string literals at compile-time.
- * Optimizer: Add rule to remove shifts inside the byte opcode.
- * Peephole Optimizer: Add rule to remove swap after dup.
- * Peephole Optimizer: Remove unnecessary masking of tags.
- * Yul EVM Code Transform: Free stack slots directly after visiting the right-hand-side of variable declarations instead of at the end of the statement only.
-
-
-Bugfixes:
- * SMTChecker: Fix error in events with indices of type static array.
- * SMTChecker: Fix internal error in sequential storage array pushes (``push().push()``).
- * SMTChecker: Fix internal error when using bitwise operators on fixed bytes type.
- * SMTChecker: Fix internal error when using compound bitwise operator assignments on array indices inside branches.
- * Type Checker: Fix internal compiler error related to oversized types.
- * Type Checker: Fix overload resolution in combination with ``{value: ...}``.
-
-
-Build System:
- * Update internal dependency of jsoncpp to 1.9.3.
-
-
-### 0.6.11 (2020-07-07)
-
-
-Language Features:
- * General: Add unit denomination ``gwei``
- * Yul: Support ``linkersymbol`` builtin in standalone assembly mode to refer to library addresses.
- * Yul: Support using string literals exceeding 32 bytes as literal arguments for builtins.
-
-
-Compiler Features:
- * NatSpec: Add fields ``kind`` and ``version`` to the JSON output.
- * NatSpec: Inherit tags from unique base functions if derived function does not provide any.
- * Commandline Interface: Prevent some incompatible commandline options from being used together.
- * NatSpec: Support NatSpec comments on events.
- * Yul Optimizer: Store knowledge about storage / memory after ``a := sload(x)`` / ``a := mload(x)``.
- * SMTChecker: Support external calls to unknown code.
- * Source Maps: Also tag jumps into and out of Yul functions as jumps into and out of functions.
-
-
-Bugfixes:
- * NatSpec: Do not consider ``////`` and ``/***`` as NatSpec comments.
- * Type Checker: Disallow constructor parameters with ``calldata`` data location.
- * Type Checker: Do not disallow assigning to calldata variables.
- * Type Checker: Fix internal error related to ``using for`` applied to non-libraries.
- * Wasm backend: Fix code generation for for-loops with pre statements.
- * Wasm backend: Properly support both ``i32.drop`` and ``i64.drop``, and remove ``drop``.
- * Yul: Disallow the same variable to occur multiple times on the left-hand side of an assignment.
- * Yul: Fix source location of variable multi-assignment.
-
-
-### 0.6.10 (2020-06-11)
-
-Important Bugfixes:
- * Fixed a bug related to internal library functions with ``calldata`` parameters called via ``using for``.
-
-
-Compiler Features:
- * Commandline Interface: Re-group help screen.
- * Output compilation error codes in standard-json and when using ``--error-codes``.
- * Yul: Raise warning for switch statements that only have a default and no other cases.
-
-
-Bugfixes:
- * SMTChecker: Fix internal error when encoding tuples of tuples.
- * SMTChecker: Fix aliasing soundness after pushing to an array pointer.
- * Type system: Fix internal compiler error on calling externally a function that returns variables with calldata location.
- * Type system: Fix bug where a bound function was not found if ``using for`` is applied to explicit reference types.
-
-
-### 0.6.9 (2020-06-04)
-
-Language Features:
- * Permit calldata location for all variables.
- * NatSpec: Support NatSpec comments on state variables.
- * Yul: EVM instruction `pc()` is marked deprecated and will be removed in the next breaking release.
-
-
-Compiler Features:
- * Build system: Update the soljson.js build to emscripten 1.39.15 and boost 1.73.0 and include Z3 for integrated SMTChecker support without the callback mechanism.
- * Build system: Switch the emscripten build from the fastcomp backend to the upstream backend.
- * Code Generator: Do not introduce new internal source references for small compiler routines.
- * Commandline Interface: Adds new option ``--base-path PATH`` to use the given path as the root of the source tree (defaults to the root of the filesystem).
- * SMTChecker: Support array ``length``.
- * SMTChecker: Support array ``push`` and ``pop``.
- * SMTChecker: General support to BitVectors and the bitwise ``and`` operator.
-
-
-Bugfixes:
- * Code Generator: Trigger proper unimplemented errors on certain array copy operations.
- * Commandline Interface: Fix internal error when using ``--assemble`` or ``--yul`` options with ``--machine ewasm`` but without specifying ``--yul-dialect``.
- * NatSpec: DocString block is terminated when encountering an empty line.
- * Optimizer: Fixed a bug in BlockDeDuplicator.
- * Scanner: Fix bug when two empty NatSpec comments lead to scanning past EOL.
- * SMTChecker: Fix internal error on try/catch clauses with parameters.
- * SMTChecker: Fix internal error when applying arithmetic operators to fixed point variables.
- * SMTChecker: Fix internal error when assigning to index access inside branches.
- * SMTChecker: Fix internal error when short circuiting Boolean expressions with function calls in state variable initialization.
- * Type Checker: Disallow assignments to storage variables of type ``mapping``.
- * Type Checker: Disallow inline arrays of non-nameable types.
- * Type Checker: Disallow usage of override with non-public state variables.
- * Type Checker: Fix internal compiler error when accessing members of array slices.
- * Type Checker: Fix internal compiler error when forward referencing non-literal constants from inline assembly.
- * Type Checker: Fix internal compiler error when trying to decode too large static arrays.
- * Type Checker: Fix wrong compiler error when referencing an overridden function without calling it.
-
-
-### 0.6.8 (2020-05-14)
-
-Important Bugfixes:
- * Add missing callvalue check to the creation code of a contract that does not define a constructor but has a base that does define a constructor.
- * Disallow array slices of arrays with dynamically encoded base types.
- * String literals containing backslash characters can no longer cause incorrect code to be generated when passed directly to function calls or encoding functions when ABIEncoderV2 is active.
-
-
-Language Features:
- * Implemented ``type(T).min`` and ``type(T).max`` for every integer type ``T`` that returns the smallest and largest value representable by the type.
-
-
-Compiler Features:
- * Commandline Interface: Don't ignore `--yul-optimizations` in assembly mode.
- * Allow using abi encoding functions for calldata array slices without explicit casts.
- * Wasm binary output: Implement ``br`` and ``br_if``.
-
-
-Bugfixes:
- * ABI: Skip ``private`` or ``internal`` constructors.
- * Fixed an "Assembly Exception in Bytecode" error where requested functions were generated twice.
- * Natspec: Fixed a bug that ignored ``@return`` tag when no other developer-documentation tags were present.
- * Type Checker: Checks if a literal exponent in the ``**`` operation is too large or fractional.
- * Type Checker: Disallow accessing ``runtimeCode`` for contract types that contain immutable state variables.
- * Yul Assembler: Fix source location of variable declarations without value.
-
-
-### 0.6.7 (2020-05-04)
-
-Language Features:
- * Add support for EIP 165 interface identifiers with `type(I).interfaceId`.
- * Allow virtual modifiers inside abstract contracts to have empty body.
-
-
-Compiler Features:
- * Optimizer: Simplify repeated AND and OR operations.
- * Standard Json Input: Support the prefix ``file://`` in the field ``urls``.
- * Add option to specify optimization steps to be performed by Yul optimizer with `--yul-optimizations` in the commandline interface or `optimizer.details.yulDetails.optimizerSteps` in standard-json.
-
-Bugfixes:
- * SMTChecker: Fix internal error when fixed points are used.
- * SMTChecker: Fix internal error when using array slices.
- * Type Checker: Disallow ``virtual`` and ``override`` for constructors.
- * Type Checker: Fix several internal errors by performing size and recursiveness checks of types before the full type checking.
- * Type Checker: Fix internal error when assigning to empty tuples.
- * Type Checker: Fix internal error when applying unary operators to tuples with empty components.
- * Type Checker: Perform recursiveness check on structs declared at the file level.
-
-Build System:
- * soltest.sh: ``SOLIDITY_BUILD_DIR`` is no longer relative to ``REPO_ROOT`` to allow for build directories outside of the source tree.
-
-
-
-### 0.6.6 (2020-04-09)
-
-Important Bugfixes:
- * Fix tuple assignments with components occupying multiple stack slots and different stack size on left- and right-hand-side.
-
-
-Bugfixes:
- * AST export: Export `immutable` property in the field `mutability`.
- * SMTChecker: Fix internal error in the CHC engine when calling inherited functions internally.
- * Type Checker: Error when trying to encode functions with call options gas and value set.
-
-
-
-### 0.6.5 (2020-04-06)
-
-Important Bugfixes:
- * Code Generator: Restrict the length of dynamic memory arrays to 64 bits during creation at runtime fixing a possible overflow.
-
-
-Language Features:
- * Allow local storage variables to be declared without initialization, as long as they are assigned before they are accessed.
- * State variables can be marked ``immutable`` which causes them to be read-only, but assignable in the constructor. The value will be stored directly in the code.
-
-
-Compiler Features:
- * Commandline Interface: Enable output of storage layout with `--storage-layout`.
- * Metadata: Added support for IPFS hashes of large files that need to be split in multiple chunks.
-
-
-Bugfixes:
- * Inheritance: Allow public state variables to override functions with dynamic memory types in their return values.
- * Inline Assembly: Fix internal error when accessing invalid constant variables.
- * Inline Assembly: Fix internal error when accessing functions.
- * JSON AST: Always add pointer suffix for memory reference types.
- * Reference Resolver: Fix internal error when accessing invalid struct members.
- * Type Checker: Fix internal errors when assigning nested tuples.
-
-
-### 0.6.4 (2020-03-10)
-
-Language Features:
- * General: Deprecated `value(...)` and `gas(...)` in favor of `{value: ...}` and `{gas: ...}`
- * Inline Assembly: Allow assigning to `_slot` of local storage variable pointers.
- * Inline Assembly: Perform control flow analysis on inline assembly. Allows storage returns to be set in assembly only.
-
-
-Compiler Features:
- * AssemblyStack: Support for source locations (source mappings) and thus debugging Yul sources.
- * Commandline Interface: Enable output of experimental optimized IR via ``--ir-optimized``.
-
-
-Bugfixes:
- * Inheritance: Fix incorrect error on calling unimplemented base functions.
- * Reference Resolver: Fix scoping issue following try/catch statements.
- * Standard-JSON-Interface: Fix a bug related to empty filenames and imports.
- * SMTChecker: Fix internal errors when analysing tuples.
- * Yul AST Import: correctly import blocks as statements, switch statements and string literals.
-
-### 0.6.3 (2020-02-18)
-
-Language Features:
- * Allow contract types and enums as keys for mappings.
- * Allow function selectors to be used as compile-time constants.
- * Report source locations for structured documentation errors.
-
-
-Compiler Features:
- * AST: Add a new node for doxygen-style, structured documentation that can be received by contract, function, event and modifier definitions.
- * Code Generator: Use ``calldatacopy`` instead of ``codecopy`` to zero out memory past input.
- * Debug: Provide reason strings for compiler-generated internal reverts when using the ``--revert-strings`` option or the ``settings.debug.revertStrings`` setting on ``debug`` mode.
- * Yul Optimizer: Prune functions that call each other but are otherwise unreferenced.
- * SMTChecker: CHC support to internal function calls.
-
-
-Bugfixes:
- * Assembly: Added missing `source` field to legacy assembly json output to complete the source reference.
- * Parser: Fix an internal error for ``abstract`` without ``contract``.
- * Type Checker: Make invalid calls to uncallable types fatal errors instead of regular.
-
-
-### 0.6.2 (2020-01-27)
-
-Language Features:
- * Allow accessing external functions via contract and interface names to obtain their selector.
- * Allow interfaces to inherit from other interfaces
- * Allow gas and value to be set in external function calls using ``c.f{gas: 10000, value: 4 ether}()``.
- * Allow specifying the ``salt`` for contract creations and thus the ``create2`` opcode using ``new C{salt: 0x1234, value: 1 ether}(arg1, arg2)``.
- * Inline Assembly: Support literals ``true`` and ``false``.
-
-
-Compiler Features:
- * LLL: The LLL compiler has been removed.
- * General: Raise warning if runtime bytecode exceeds 24576 bytes (a limit introduced in Spurious Dragon).
- * General: Support compiling starting from an imported AST. Among others, this can be used for mutation testing.
- * Yul Optimizer: Apply penalty when trying to rematerialize into loops.
-
-
-Bugfixes:
- * Commandline interface: Only activate yul optimizer if ``--optimize`` is given.
- * Fixes internal compiler error on explicitly calling unimplemented base functions.
-
-
-Build System:
- * Switch to building soljson.js with an embedded base64-encoded wasm binary.
-
-
-### 0.6.1 (2020-01-02)
-
-Bugfixes:
- * Yul Optimizer: Fix bug in redundant assignment remover in combination with break and continue statements.
-
-
-### 0.6.0 (2019-12-17)
-
-Breaking changes:
- * ABI: Remove the deprecated ``constant`` and ``payable`` fields.
- * ABI: The ``type`` field is now required and no longer specified to default to ``function``.
- * AST: Inline assembly is exported as structured JSON instead of plain string.
- * C API (``libsolc``): Introduce context parameter to both ``solidity_compile`` and the callback.
- * C API (``libsolc``): The provided callback now takes two parameters, kind and data. The callback can then be used for multiple purposes, such has file imports and SMT queries.
- * C API (``libsolc``): ``solidity_free`` was renamed to ``solidity_reset``. Functions ``solidity_alloc`` and ``solidity_free`` were added.
- * C API (``libsolc``): ``solidity_compile`` now returns a string that must be explicitly freed via ``solidity_free()``
- * Commandline Interface: Remove the text-based AST printer (``--ast``).
- * Commandline Interface: Switch to the new error reporter by default. ``--old-reporter`` falls back to the deprecated old error reporter.
- * Commandline Interface: Add option to disable or choose hash method between IPFS and Swarm for the bytecode metadata.
- * General: Disallow explicit conversions from external function types to ``address`` and add a member called ``address`` to them as replacement.
- * General: Enable Yul optimizer as part of standard optimization.
- * General: New reserved keywords: ``override``, ``receive``, and ``virtual``.
- * General: ``private`` cannot be used together with ``virtual``.
- * General: Split unnamed fallback functions into two cases defined using ``fallback()`` and ``receive()``.
- * Inheritance: State variable shadowing is now disallowed.
- * Inline Assembly: Only strict inline assembly is allowed.
- * Inline Assembly: Variable declarations cannot shadow declarations outside the assembly block.
- * JSON AST: Replace ``superFunction`` attribute by ``baseFunctions``.
- * Natspec JSON Interface: Properly support multiple ``@return`` statements in ``@dev`` documentation and enforce named return parameters to be mentioned documentation.
- * Source mappings: Add "modifier depth" as a fifth field in the source mappings.
- * Standard JSON Interface: Add option to disable or choose hash method between IPFS and Swarm for the bytecode metadata.
- * Syntax: ``push(element)`` for dynamic storage arrays do not return the new length anymore.
- * Syntax: Abstract contracts need to be marked explicitly as abstract by using the ``abstract`` keyword.
- * Syntax: ``length`` member of arrays is now always read-only, even for storage arrays.
- * Type Checker: Resulting type of exponentiation is equal to the type of the base. Also allow signed types for the base.
-
-Language Features:
- * Allow explicit conversions from ``address`` to ``address payable`` via ``payable(...)``.
- * Allow global enums and structs.
- * Allow public variables to override external functions.
- * Allow underscores as delimiters in hex strings.
- * Allow to react on failing external calls using ``try`` and ``catch``.
- * Introduce syntax for array slices and implement them for dynamic calldata arrays.
- * Introduce ``push()`` for dynamic storage arrays. It returns a reference to the newly allocated element, if applicable.
- * Introduce ``virtual`` and ``override`` keywords.
- * Modify ``push(element)`` for dynamic storage arrays such that it does not return the new length anymore.
- * Yul: Introduce ``leave`` statement that exits the current function.
- * JSON AST: Add the function selector of each externally-visible FunctonDefinition to the AST JSON export.
-
-Compiler Features:
- * Allow revert strings to be stripped from the binary using the ``--revert-strings`` option or the ``settings.debug.revertStrings`` setting.
- * ABIEncoderV2: Do not warn about enabled ABIEncoderV2 anymore (the pragma is still needed, though).
-
-
-### 0.5.17 (2020-03-17)
-
-Bugfixes:
- * Type Checker: Disallow overriding of private functions.
-
-
-### 0.5.16 (2020-01-02)
-
-Backported Bugfixes:
- * Yul Optimizer: Fix bug in redundant assignment remover in combination with break and continue statements.
-
-
-### 0.5.15 (2019-12-17)
-
-Bugfixes:
- * Yul Optimizer: Fix incorrect redundant load optimization crossing user-defined functions that contain for-loops with memory / storage writes.
-
-### 0.5.14 (2019-12-09)
-
-Language Features:
- * Allow to obtain the selector of public or external library functions via a member ``.selector``.
- * Inline Assembly: Support constants that reference other constants.
- * Parser: Allow splitting hexadecimal and regular string literals into multiple parts.
-
-
-Compiler Features:
- * Commandline Interface: Allow translation from yul / strict assembly to EWasm using ``solc --yul --yul-dialect evm --machine ewasm``
- * Set the default EVM version to "Istanbul".
- * SMTChecker: Add support to constructors including constructor inheritance.
- * Yul: When compiling via Yul, string literals from the Solidity code are kept as string literals if every character is safely printable.
- * Yul Optimizer: Perform loop-invariant code motion.
-
-
-Bugfixes:
- * SMTChecker: Fix internal error when using ``abi.decode``.
- * SMTChecker: Fix internal error when using arrays or mappings of functions.
- * SMTChecker: Fix internal error in array of structs type.
- * Version Checker: ``^0`` should match ``0.5.0``, but no prerelease.
- * Yul: Consider infinite loops and recursion to be not removable.
-
-
-Build System:
- * Update to emscripten version 1.39.3.
-
-
-### 0.5.13 (2019-11-14)
-
-Language Features:
- * Allow to obtain the address of a linked library with ``address(LibraryName)``.
-
-
-Compiler Features:
- * Code Generator: Use SELFBALANCE opcode for ``address(this).balance`` if using Istanbul EVM.
- * EWasm: Experimental EWasm binary output via ``--ewasm`` and as documented in standard-json.
- * SMTChecker: Add break/continue support to the CHC engine.
- * SMTChecker: Support assignments to multi-dimensional arrays and mappings.
- * SMTChecker: Support inheritance and function overriding.
- * Standard JSON Interface: Output the storage layout of a contract when artifact ``storageLayout`` is requested.
- * TypeChecker: List possible candidates when overload resolution fails.
- * TypeChecker: Disallow variables of library types.
-
-Bugfixes:
- * Code Generator: Fixed a faulty assert that would wrongly trigger for array sizes exceeding unsigned integer.
- * SMTChecker: Fix internal error when accessing indices of fixed bytes.
- * SMTChecker: Fix internal error when using function pointers as arguments.
- * SMTChecker: Fix internal error when implicitly converting string literals to fixed bytes.
- * Type Checker: Disallow constructor of the same class to be used as modifier.
- * Type Checker: Treat magic variables as unknown identifiers in inline assembly.
- * Code Generator: Fix internal error when trying to convert ``super`` to a different type
-
-
-### 0.5.12 (2019-10-01)
-
-Language Features:
- * Type Checker: Allow assignment to external function arguments except for reference types.
-
-
-Compiler Features:
- * ABI Output: Change sorting order of functions from selector to kind, name.
- * Optimizer: Add rule that replaces the BYTE opcode by 0 if the first argument is larger than 31.
- * SMTChecker: Add loop support to the CHC engine.
- * Yul Optimizer: Take side-effect-freeness of user-defined functions into account.
- * Yul Optimizer: Remove redundant mload/sload operations.
- * Yul Optimizer: Use the fact that branch conditions have certain value inside the branch.
-
-
-Bugfixes:
- * Code Generator: Fix internal error when popping a dynamic storage array of mappings.
- * Name Resolver: Fix wrong source location when warning on shadowed aliases in import declarations.
- * Scanner: Fix multi-line natspec comment parsing with triple slashes when file is encoded with CRLF instead of LF.
- * Type System: Fix arrays of recursive structs.
- * Yul Optimizer: Fix reordering bug in connection with shifted one and mul/div-instructions in for loop conditions.
-
-
-### 0.5.11 (2019-08-12)
-
-
-Language Features:
- * Inline Assembly: Support direct constants of value type in inline assembly.
-
-Compiler Features:
- * ABI: Additional internal type info in the field ``internalType``.
- * eWasm: Highly experimental eWasm output using ``--ewasm`` in the commandline interface or output selection of ``ewasm.wast`` in standard-json.
- * Metadata: Update the swarm hash to the current specification, changes ``bzzr0`` to ``bzzr1`` and urls to use ``bzz-raw://``.
- * Standard JSON Interface: Compile only selected sources and contracts.
- * Standard JSON Interface: Provide secondary error locations (e.g. the source position of other conflicting declarations).
- * SMTChecker: Do not erase knowledge about storage pointers if another storage pointer is assigned.
- * SMTChecker: Support string literal type.
- * SMTChecker: New Horn-based algorithm that proves assertions via multi-transaction contract invariants.
- * Standard JSON Interface: Provide AST even on errors if ``--error-recovery`` commandline switch or StandardCompiler `settings.parserErrorRecovery` is true.
- * Yul Optimizer: Do not inline function if it would result in expressions being duplicated that are not cheap.
-
-
-Bugfixes:
- * ABI decoder: Ensure that decoded arrays always point to distinct memory locations.
- * Code Generator: Treat dynamically encoded but statically sized arrays and structs in calldata properly.
- * SMTChecker: Fix internal error when inlining functions that contain tuple expressions.
- * SMTChecker: Fix pointer knowledge erasing in loops.
- * SMTChecker: Fix internal error when using compound bitwise assignment operators inside branches.
- * SMTChecker: Fix internal error when inlining a function that returns a tuple containing an unsupported type inside a branch.
- * SMTChecker: Fix internal error when inlining functions that use state variables and belong to a different source.
- * SMTChecker: Fix internal error when reporting counterexamples concerning state variables from different source files.
- * SMTChecker: Fix SMT sort mismatch when using string literals.
- * View/Pure Checker: Properly detect state variable access through base class.
- * Yul Analyzer: Check availability of data objects already in analysis phase.
- * Yul Optimizer: Fix an issue where memory-accessing code was removed even though ``msize`` was used in the program.
-
-
-### 0.5.10 (2019-06-25)
-
-Important Bugfixes:
- * ABIEncoderV2: Fix incorrect abi encoding of storage array of data type that occupy multiple storage slots
- * Code Generator: Properly zero out higher order bits in elements of an array of negative numbers when assigning to storage and converting the type at the same time.
-
-
-Compiler Features:
- * Commandline Interface: Experimental parser error recovery via the ``--error-recovery`` commandline switch or StandardCompiler `settings.parserErrorRecovery` boolean.
- * Optimizer: Add rule to simplify ``SUB(~0, X)`` to ``NOT(X)``.
- * Yul Optimizer: Make the optimizer work for all dialects of Yul including eWasm.
-
-
-Bugfixes:
- * Type Checker: Set state mutability of the function type members ``gas`` and ``value`` to pure (while their return type inherits state mutability from the function type).
- * Yul / Inline Assembly Parser: Disallow trailing commas in function call arguments.
-
-
-Build System:
- * Attempt to use stock Z3 cmake files to find Z3 and only fall back to manual discovery.
- * CMake: use imported targets for boost.
- * Emscripten build: upgrade to boost 1.70.
- * Generate a cmake error for gcc versions older than 5.0.
-
-
-
-### 0.5.9 (2019-05-28)
-
-Language Features:
- * Inline Assembly: Revert change introduced in 0.5.7: The ``callvalue()`` instruction does not require ``payable`` anymore.
- * Static Analyzer: Disallow libraries calling themselves externally.
-
-
-Compiler Features:
- * Assembler: Encode the compiler version in the deployed bytecode.
- * Code Generator: Fix handling of structs of dynamic size as constructor parameters.
- * Inline Assembly: Disallow the combination of ``msize()`` and the Yul optimizer.
- * Metadata: Add IPFS hashes of source files.
- * Optimizer: Add rule to simplify SHL/SHR combinations.
- * Optimizer: Add rules for multiplication and division by left-shifted one.
- * SMTChecker: Support inherited state variables.
- * SMTChecker: Support tuples and function calls with multiple return values.
- * SMTChecker: Support ``delete``.
- * SMTChecker: Inline external function calls to ``this``.
- * Yul Optimizer: Simplify single-run ``for`` loops to ``if`` statements.
- * Yul Optimizer: Optimize representation of numbers.
- * Yul Optimizer: Do not inline recursive functions.
- * Yul Optimizer: Do not remove instructions that affect ``msize()`` if ``msize()`` is used.
-
-Bugfixes:
- * Code Generator: Explicitly turn uninitialized internal function pointers into invalid functions when loaded from storage.
- * Code Generator: Fix assertion failure when assigning structs containing array of mapping.
- * Compiler Internals: Reset the Yul string repository before each compilation, freeing up memory.
- * SMTChecker: Fix bad cast in base constructor modifier.
- * SMTChecker: Fix internal error when visiting state variable inherited from base class.
- * SMTChecker: Fix internal error in fixed point operations.
- * SMTChecker: Fix internal error in assignment to unsupported type.
- * SMTChecker: Fix internal error in branching when inlining function calls that modify local variables.
-
-
-### 0.5.8 (2019-04-30)
-
-Important Bugfixes:
- * Code Generator: Fix initialization routine of uninitialized internal function pointers in constructor context.
- * Yul Optimizer: Fix SSA transform for multi-assignments.
-
-
-Language Features:
- * ABIEncoderV2: Implement encoding of calldata arrays and structs.
- * Code Generation: Implement copying recursive structs from storage to memory.
- * Yul: Disallow function definitions inside for-loop init blocks.
-
-
-Compiler Features:
- * ABI Decoder: Raise a runtime error on dirty inputs when using the experimental decoder.
- * Optimizer: Add rule for shifts by constants larger than 255 for Constantinople.
- * Optimizer: Add rule to simplify certain ANDs and SHL combinations
- * SMTChecker: Support arithmetic compound assignment operators.
- * SMTChecker: Support unary increment and decrement for array and mapping access.
- * SMTChecker: Show unsupported warning for inline assembly blocks.
- * SMTChecker: Support mod.
- * SMTChecker: Support ``contract`` type.
- * SMTChecker: Support ``this`` as address.
- * SMTChecker: Support address members.
- * Standard JSON Interface: Metadata settings now re-produce the original ``"useLiteralContent"`` setting from the compilation input.
- * Yul: Adds break and continue keywords to for-loop syntax.
- * Yul: Support ``.`` as part of identifiers.
- * Yul Optimizer: Adds steps for detecting and removing of dead code.
- * Yul Code Generator: Directly jump over a series of function definitions (instead of jumping over each one)
-
-
-Bugfixes:
- * SMTChecker: Implement Boolean short-circuiting.
- * SMTChecker: SSA control-flow did not take into account state variables that were modified inside inlined functions that were called inside branches.
- * Type System: Use correct type name for contracts in event parameters when used in libraries. This affected code generation.
- * Type System: Allow direct call to base class functions that have overloads.
- * Type System: Warn about shadowing builtin variables if user variables are named ``this`` or ``super``.
- * Yul: Properly register functions and disallow shadowing between function variables and variables in the outside scope.
-
-
-Build System:
- * Soltest: Add commandline option `--test` / `-t` to isoltest which takes a string that allows filtering unit tests.
- * soltest.sh: allow environment variable ``SOLIDITY_BUILD_DIR`` to specify build folder and add ``--help`` usage.
-
-
-### 0.5.7 (2019-03-26)
-
-Important Bugfixes:
- * ABIEncoderV2: Fix bugs related to loading short value types from storage when encoding an array or struct from storage.
- * ABIEncoderV2: Fix buffer overflow problem when encoding packed array from storage.
- * Optimizer: Fix wrong ordering of arguments in byte optimization rule for constants.
-
-
-Language Features:
- * Function calls with named arguments now work with overloaded functions.
-
-
-Compiler Features:
- * Inline Assembly: Issue error when using ``callvalue()`` inside nonpayable function (in the same way that ``msg.value`` already does).
- * Standard JSON Interface: Support "Yul" as input language.
- * SMTChecker: Show callstack together with model if applicable.
- * SMTChecker: Support modifiers.
- * Yul Optimizer: Enable stack allocation optimization by default if Yul optimizer is active (disable in ``yulDetails``).
-
-
-Bugfixes:
- * Code Generator: Defensively pad memory for ``type(Contract).name`` to multiples of 32.
- * Type System: Detect and disallow internal function pointers as parameters for public/external library functions, even when they are nested/wrapped in structs, arrays or other types.
- * Yul Optimizer: Properly determine whether a variable can be eliminated during stack compression pass.
- * Yul / Inline Assembly Parser: Disallow more than one case statement with the same label inside a switch based on the label's integer value.
-
-
-Build System:
- * Install scripts: Fix boost repository URL for CentOS 6.
- * Soltest: Fix hex string update in soltest.
-
-
-### 0.5.6 (2019-03-13)
-
-Important Bugfixes:
- * Yul Optimizer: Fix visitation order bug for the structural simplifier.
- * Optimizer: Fix overflow in optimization rule that simplifies double shift by constant.
-
-Language Features:
- * Allow calldata arrays with dynamically encoded base types with ABIEncoderV2.
- * Allow dynamically encoded calldata structs with ABIEncoderV2.
-
-
-Compiler Features:
- * Optimizer: Add rules for ``lt``-comparisons with constants.
- * Peephole Optimizer: Remove double ``iszero`` before ``jumpi``.
- * SMTChecker: Support enums without typecast.
- * SMTChecker: Support one-dimensional arrays.
- * Type Checker: Provide better error messages for some literal conversions.
- * Yul Optimizer: Add rule to remove empty default switch cases.
- * Yul Optimizer: Add rule to remove empty cases if no default exists.
- * Yul Optimizer: Add rule to replace a switch with no cases with ``pop(expression)``.
-
-
-Bugfixes:
- * JSON ABI: Json description of library ABIs no longer contains functions with internal types like storage structs.
- * SMTChecker: Fix internal compiler error when contract contains too large rational number.
- * Type system: Detect if a contract's base uses types that require the experimental abi encoder while the contract still uses the old encoder.
-
-
-Build System:
- * Soltest: Add support for arrays in function signatures.
- * Soltest: Add support for struct arrays in function signatures.
- * Soltest: Add support for left-aligned, unpadded hex string literals.
-
-### 0.5.5 (2019-03-05)
-
-Language Features:
- * Add support for getters of mappings with ``string`` or ``bytes`` key types.
- * Meta programming: Provide access to the name of contracts via ``type(C).name``.
-
-
-Compiler Features:
- * Support ``petersburg`` as ``evmVersion`` and set as default.
- * Commandline Interface: Option to activate the experimental yul optimizer using ``-optimize-yul``.
- * Inline Assembly: Consider ``extcodehash`` as part of Constantinople.
- * Inline Assembly: Instructions unavailable to the currently configured EVM are errors now.
- * SMTChecker: Do not report underflow/overflow if they always revert. This removes false positives when using ``SafeMath``.
- * Standard JSON Interface: Allow retrieving metadata without triggering bytecode generation.
- * Standard JSON Interface: Provide fine-grained control over the optimizer via the settings.
- * Static Analyzer: Warn about expressions with custom types when they have no effect.
- * Optimizer: Add new rules with constants including ``LT``, ``GT``, ``AND`` and ``BYTE``.
- * Optimizer: Add rule for shifts with constants for Constantinople.
- * Optimizer: Combine multiple shifts with constant shift-by values into one.
- * Optimizer: Do not mask with 160-bits after ``CREATE`` and ``CREATE2`` as they are guaranteed to return an address or 0.
- * Optimizer: Support shifts in the constant optimiser for Constantinople.
- * Yul Optimizer: Add rule to replace switch statements with literals by matching case body.
-
-
-Bugfixes:
- * ABIEncoderV2: Fix internal error related to bare delegatecall.
- * ABIEncoderV2: Fix internal error related to ecrecover.
- * ABIEncoderV2: Fix internal error related to mappings as library parameters.
- * ABIEncoderV2: Fix invalid signature for events containing structs emitted in libraries.
- * Inline Assembly: Proper error message for missing variables.
- * Optimizer: Fix internal error related to unused tag removal across assemblies. This never generated any invalid code.
- * SMTChecker: Fix crash related to statically-sized arrays.
- * TypeChecker: Fix internal error and disallow index access on contracts and libraries.
- * Yul: Properly detect name clashes with functions before their declaration.
- * Yul: Take built-in functions into account in the compilability checker.
- * Yul Optimizer: Properly take reassignments to variables in sub-expressions into account when replacing in the ExpressionSimplifier.
-
-
-Build System:
- * Soltest: Add support for left-aligned, padded hex literals.
- * Soltest: Add support for right-aligned, padded boolean literals.
-
-### 0.5.4 (2019-02-12)
-
-Language Features:
- * Allow calldata structs without dynamically encoded members with ABIEncoderV2.
-
-
-Compiler Features:
- * ABIEncoderV2: Implement packed encoding.
- * C API (``libsolc`` / raw ``soljson.js``): Introduce ``solidity_free`` method which releases all internal buffers to save memory.
- * Commandline Interface: Adds new option ``--new-reporter`` for improved diagnostics formatting
-   along with ``--color`` and ``--no-color`` for colorized output to be forced (or explicitly disabled).
-
-
-Bugfixes:
- * Code Generator: Defensively pad allocation of creationCode and runtimeCode to multiples of 32 bytes.
- * Commandline Interface: Allow yul optimizer only for strict assembly.
- * Parser: Disallow empty import statements.
- * Type Checker: Disallow mappings with data locations other than ``storage``.
- * Type Checker: Fix internal error when a struct array index does not fit into a uint256.
- * Type System: Properly report packed encoded size for arrays and structs (mostly unused until now).
-
-
-Build System:
- * Add support for continuous fuzzing via Google oss-fuzz
- * SMT: If using Z3, require version 4.6.0 or newer.
- * Soltest: Add parser that is used in the file-based unit test environment.
- * Ubuntu PPA Packages: Use CVC4 as SMT solver instead of Z3
-
-
-### 0.5.3 (2019-01-22)
-
-Language Features:
- * Provide access to creation and runtime code of contracts via ``type(C).creationCode`` / ``type(C).runtimeCode``.
-
-
-Compiler Features:
- * Control Flow Graph: Warn about unreachable code.
- * SMTChecker: Support basic typecasts without truncation.
- * SMTChecker: Support external function calls and erase all knowledge regarding storage variables and references.
-
-
-Bugfixes:
- * Emscripten: Split simplification rule initialization up further to work around issues with soljson.js in some browsers.
- * Type Checker: Disallow calldata structs until implemented.
- * Type Checker: Return type error if fixed point encoding is attempted instead of throwing ``UnimplementedFeatureError``.
- * Yul: Check that arguments to ``dataoffset`` and ``datasize`` are literals at parse time and properly take this into account in the optimizer.
- * Yul: Parse number literals for detecting duplicate switch cases.
- * Yul: Require switch cases to have the same type.
-
-
-Build System:
- * Emscripten: Upgrade to emscripten 1.38.8 on travis and circleci.
-
-
-### 0.5.2 (2018-12-19)
-
-Language Features:
- * Control Flow Graph: Detect every access to uninitialized storage pointers.
-
-
-Compiler Features:
- * Inline Assembly: Improve error messages around invalid function argument count.
- * Code Generator: Only check callvalue once if all functions are non-payable.
- * Code Generator: Use codecopy for string constants more aggressively.
- * Code Generator: Use binary search for dispatch function if more efficient. The size/speed tradeoff can be tuned using ``--optimize-runs``.
- * SMTChecker: Support mathematical and cryptographic functions in an uninterpreted way.
- * SMTChecker: Support one-dimensional mappings.
- * Standard JSON Interface: Disallow unknown keys in standard JSON input.
- * Standard JSON Interface: Only run code generation if it has been requested. This could lead to unsupported feature errors only being reported at the point where you request bytecode.
- * Static Analyzer: Do not warn about unused variables or state mutability for functions with an empty body.
- * Type Checker: Add an additional reason to be displayed when type conversion fails.
- * Yul: Support object access via ``datasize``, ``dataoffset`` and ``datacopy`` in standalone assembly mode.
-
-
-Bugfixes:
- * Standard JSON Interface: Report specific error message for json input errors instead of internal compiler error.
-
-
-Build System:
- * Replace the trusty PPA build by a static build on cosmic that is used for the trusty package instead.
- * Remove support for Visual Studio 2015.
-
-
-### 0.5.1 (2018-12-03)
-
-Language Features:
- * Allow mapping type for parameters and return variables of public and external library functions.
- * Allow public functions to override external functions.
-
-Compiler Features:
- * Code generator: Do not perform redundant double cleanup on unsigned integers when loading from calldata.
- * Commandline interface: Experimental ``--optimize`` option for assembly mode (``--strict-assembly`` and ``--yul``).
- * SMTChecker: SMTLib2 queries and responses passed via standard JSON compiler interface.
- * SMTChecker: Support ``msg``, ``tx`` and ``block`` member variables.
- * SMTChecker: Support ``gasleft()`` and ``blockhash()`` functions.
- * SMTChecker: Support internal bound function calls.
- * Yul: Support Yul objects in ``--assemble``, ``--strict-assembly`` and ``--yul`` commandline options.
-
-Bugfixes:
- * Assembly output: Do not mix in/out jump annotations with arguments.
- * Commandline interface: Fix crash when using ``--ast`` on empty runtime code.
- * Code Generator: Annotate jump from calldata decoder to function as "jump in".
- * Code Generator: Fix internal error related to state variables of function type access via base contract name.
- * Optimizer: Fix nondeterminism bug related to the boost version and constants representation. The bug only resulted in less optimal but still correct code because the generated routine is always verified to be correct.
- * Type Checker: Properly detect different return types when overriding an external interface function with a public contract function.
- * Type Checker: Disallow struct return types for getters of public state variables unless the new ABI encoder is active.
- * Type Checker: Fix internal compiler error when a field of a struct used as a parameter in a function type has a non-existent type.
- * Type Checker: Disallow functions ``sha3`` and ``suicide`` also without a function call.
- * Type Checker: Fix internal compiler error with ``super`` when base contract function is not implemented.
- * Type Checker: Fixed internal error when trying to create abstract contract in some cases.
- * Type Checker: Fixed internal error related to double declaration of events.
- * Type Checker: Disallow inline arrays of mapping type.
- * Type Checker: Consider abstract function to be implemented by public state variable.
-
-Build System:
- * CMake: LLL is not built anymore by default. Must configure it with CMake as `-DLLL=ON`.
- * Docker: Includes both Scratch and Alpine images.
- * Emscripten: Upgrade to Emscripten SDK 1.37.21 and boost 1.67.
-
-Solc-Js:
- * Fix handling of standard-json in the commandline executable.
- * Remove support of nodejs 4.
-
-
-### 0.5.0 (2018-11-13)
-
-How to update your code:
- * Change every ``.call()`` to a ``.call("")`` and every ``.call(signature, a, b, c)`` to use ``.call(abi.encodeWithSignature(signature, a, b, c))`` (the last one only works for value types).
- * Change every ``keccak256(a, b, c)`` to ``keccak256(abi.encodePacked(a, b, c))``.
- * Add ``public`` to every function and ``external`` to every fallback or interface function that does not specify its visibility already.
- * Make your fallback functions ``external``.
- * Explicitly state the data location for all variables of struct, array or mapping types (including function parameters), e.g. change ``uint[] x = m_x`` to ``uint[] storage x = m_x``. Note that ``external`` functions require parameters with a data location of ``calldata``.
- * Explicitly convert values of contract type to addresses before using an ``address`` member. Example: if ``c`` is a contract, change ``c.transfer(...)`` to ``address(c).transfer(...)``.
- * Declare variables and especially function arguments as ``address payable``, if you want to call ``transfer`` on them.
-
-Breaking Changes:
- * ABI Encoder: Properly pad data from calldata (``msg.data`` and external function parameters). Use ``abi.encodePacked`` for unpadded encoding.
- * C API (``libsolc`` / raw ``soljson.js``): Removed the ``version``, ``license``, ``compileSingle``, ``compileJSON``, ``compileJSONCallback`` methods
-   and replaced them with the ``solidity_license``, ``solidity_version`` and ``solidity_compile`` methods.
- * Code Generator: Signed right shift uses proper arithmetic shift, i.e. rounding towards negative infinity. Warning: this may silently change the semantics of existing code!
- * Code Generator: Revert at runtime if calldata is too short or points out of bounds. This is done inside the ``ABI decoder`` and therefore also applies to ``abi.decode()``.
- * Code Generator: Use ``STATICCALL`` for ``pure`` and ``view`` functions. This was already the case in the experimental 0.5.0 mode.
- * Commandline interface: Remove obsolete ``--formal`` option.
- * Commandline interface: Rename the ``--julia`` option to ``--yul``.
- * Commandline interface: Require ``-`` if standard input is used as source.
- * Commandline interface: Use hash of library name for link placeholder instead of name itself.
- * Compiler interface: Disallow remappings with empty prefix.
- * Control Flow Analyzer: Consider mappings as well when checking for uninitialized return values.
- * Control Flow Analyzer: Turn warning about returning uninitialized storage pointers into an error.
- * General: ``continue`` in a ``do...while`` loop jumps to the condition (it used to jump to the loop body). Warning: this may silently change the semantics of existing code.
- * General: Disallow declaring empty structs.
- * General: Disallow raw ``callcode`` (was already deprecated in 0.4.12). It is still possible to use it via inline assembly.
- * General: Disallow ``var`` keyword.
- * General: Disallow ``sha3`` and ``suicide`` aliases.
- * General: Disallow the ``throw`` statement. This was already the case in the experimental 0.5.0 mode.
- * General: Disallow the ``years`` unit denomination (was already deprecated in 0.4.24)
- * General: Introduce ``emit`` as a keyword instead of parsing it as identifier.
- * General: New keywords: ``calldata`` and ``constructor``
- * General: New reserved keywords: ``alias``, ``apply``, ``auto``, ``copyof``, ``define``, ``immutable``,
-   ``implements``, ``macro``, ``mutable``, ``override``, ``partial``, ``promise``, ``reference``, ``sealed``,
-   ``sizeof``, ``supports``, ``typedef`` and ``unchecked``.
- * General: Remove assembly instruction aliases ``sha3`` and ``suicide``
- * General: C99-style scoping rules are enforced now. This was already the case in the experimental 0.5.0 mode.
- * General: Disallow combining hex numbers with unit denominations (e.g. ``0x1e wei``). This was already the case in the experimental 0.5.0 mode.
- * JSON AST: Remove ``constant`` and ``payable`` fields (the information is encoded in the ``stateMutability`` field).
- * JSON AST: Replace the ``isConstructor`` field by a new ``kind`` field, which can be ``constructor``, ``fallback`` or ``function``.
- * Interface: Remove "clone contract" feature. The ``--clone-bin`` and ``--combined-json clone-bin`` commandline options are not available anymore.
- * Name Resolver: Do not exclude public state variables when looking for conflicting declarations.
- * Optimizer: Remove the no-op ``PUSH1 0 NOT AND`` sequence.
- * Parser: Disallow trailing dots that are not followed by a number.
- * Parser: Remove ``constant`` as function state mutability modifier.
- * Parser: Disallow uppercase X in hex number literals
- * Type Checker: Disallow assignments between tuples with different numbers of components. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow values for constants that are not compile-time constants. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow arithmetic operations for boolean variables.
- * Type Checker: Disallow tight packing of literals. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow calling base constructors without parentheses. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow conversions between ``bytesX`` and ``uintY`` of different size.
- * Type Checker: Disallow conversions between unrelated contract types. Explicit conversion via ``address`` can still achieve it.
- * Type Checker: Disallow empty return statements for functions with one or more return values.
- * Type Checker: Disallow empty tuple components. This was partly already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow multi-variable declarations with mismatching number of values. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow specifying base constructor arguments multiple times in the same inheritance hierarchy. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow calling constructor with wrong argument count. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Disallow uninitialized storage variables. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Detecting cyclic dependencies in variables and structs is limited in recursion to 256.
- * Type Checker: Require explicit data location for all variables, including function parameters. This was partly already the case in the experimental 0.5.0 mode.
- * Type Checker: Only accept a single ``bytes`` type for ``.call()`` (and family), ``keccak256()``, ``sha256()`` and ``ripemd160()``.
- * Type Checker: Fallback function must be external. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Interface functions must be declared external. This was already the case in the experimental 0.5.0 mode.
- * Type Checker: Address members are not included in contract types anymore. An explicit conversion is now required before invoking an ``address`` member from a contract.
- * Type Checker: Disallow "loose assembly" syntax entirely. This means that jump labels, jumps and non-functional instructions cannot be used anymore.
- * Type System: Disallow explicit and implicit conversions from decimal literals to ``bytesXX`` types.
- * Type System: Disallow explicit and implicit conversions from hex literals to ``bytesXX`` types of different size.
- * Type System: Distinguish between payable and non-payable address types.
- * View Pure Checker: Disallow ``msg.value`` in (or introducing it via a modifier to) a non-payable function.
- * Remove obsolete ``std`` directory from the Solidity repository. This means accessing ``https://github.com/ethereum/solidity/blob/develop/std/*.sol`` (or ``https://github.com/ethereum/solidity/std/*.sol`` in Remix) will not be possible.
- * References Resolver: Turn missing storage locations into an error. This was already the case in the experimental 0.5.0 mode.
- * Syntax Checker: Disallow functions without implementation to use modifiers. This was already the case in the experimental 0.5.0 mode.
- * Syntax Checker: Named return values in function types are an error.
- * Syntax Checker: Strictly require visibility specifier for functions. This was already the case in the experimental 0.5.0 mode.
- * Syntax Checker: Disallow unary ``+``. This was already the case in the experimental 0.5.0 mode.
- * Syntax Checker: Disallow single statement variable declaration inside if/while/for bodies that are not blocks.
- * View Pure Checker: Strictly enforce state mutability. This was already the case in the experimental 0.5.0 mode.
-
-Language Features:
- * General: Add ``staticcall`` to ``address``.
- * General: Allow appending ``calldata`` keyword to types, to explicitly specify data location for arguments of external functions.
- * General: Support ``pop()`` for storage arrays.
- * General: Scoping rules now follow the C99-style.
- * General: Allow ``enum``s in interfaces.
- * General: Allow ``mapping`` storage pointers as arguments and return values in all internal functions.
- * General: Allow ``struct``s in interfaces.
- * General: Provide access to the ABI decoder through ``abi.decode(bytes memory data, (...))``.
- * General: Disallow zero length for fixed-size arrays.
- * Parser: Accept the ``address payable`` type during parsing.
-
-Compiler Features:
- * Build System: Support for Mojave version of macOS added.
- * Code Generator: ``CREATE2`` instruction has been updated to match EIP1014 (aka "Skinny CREATE2"). It also is accepted as part of Constantinople.
- * Code Generator: ``EXTCODEHASH`` instruction has been added based on EIP1052.
- * Type Checker: Nicer error message when trying to reference overloaded identifiers in inline assembly.
- * Type Checker: Show named argument in case of error.
- * Type System: IntegerType is split into IntegerType and AddressType internally.
- * Tests: Determine transaction status during IPC calls.
- * Code Generator: Allocate and free local variables according to their scope.
- * Removed ``pragma experimental "v0.5.0";``.
- * Syntax Checker: Improved error message for lookup in function types.
- * Name Resolver: Updated name suggestion look up function to take into account length of the identifier: 1: no search, 2-3: at most one change, 4-: at most two changes
- * SMTChecker: Support calls to internal functions that return none or a single value.
-
-Bugfixes:
- * Build System: Support versions of CVC4 linked against CLN instead of GMP. In case of compilation issues due to the experimental SMT solver support, the solvers can be disabled when configuring the project with CMake using ``-DUSE_CVC4=OFF`` or ``-DUSE_Z3=OFF``.
- * Tests: Fix chain parameters to make ipc tests work with newer versions of cpp-ethereum.
- * Code Generator: Fix allocation of byte arrays (zeroed out too much memory).
- * Code Generator: Properly handle negative number literals in ABIEncoderV2.
- * Code Generator: Do not crash on using a length of zero for multidimensional fixed-size arrays.
- * Commandline Interface: Correctly handle paths with backslashes on windows.
- * Control Flow Analyzer: Ignore unimplemented functions when detecting uninitialized storage pointer returns.
- * Fix NatSpec json output for `@notice` and `@dev` tags on contract definitions.
- * Optimizer: Correctly estimate gas costs of constants for special cases.
- * Optimizer: Fix simplification rule initialization bug that appeared on some emscripten platforms.
- * References Resolver: Do not crash on using ``_slot`` and ``_offset`` suffixes on their own.
- * References Resolver: Enforce ``storage`` as data location for mappings.
- * References Resolver: Properly handle invalid references used together with ``_slot`` and ``_offset``.
- * References Resolver: Report error instead of assertion fail when FunctionType has an undeclared type as parameter.
- * References Resolver: Fix high CPU usage when using large variable names issue. Only suggest similar name if identifiers shorter than 80 characters.
- * Type Checker: Default data location for type conversions (e.g. from literals) is memory and not storage.
- * Type Checker: Disallow assignments to mappings within tuple assignments as well.
- * Type Checker: Disallow packed encoding of arrays of structs.
- * Type Checker: Allow assignments to local variables of mapping types.
- * Type Checker: Consider fixed size arrays when checking for recursive structs.
- * Type Checker: Fix crashes in erroneous tuple assignments in which the type of the right hand side cannot be determined.
- * Type Checker: Fix freeze for negative fixed-point literals very close to ``0``, such as ``-1e-100``.
- * Type Checker: Dynamic types as key for public mappings return error instead of assertion fail.
- * Type Checker: Fix internal error when array index value is too large.
- * Type Checker: Fix internal error when fixed-size array is too large to be encoded.
- * Type Checker: Fix internal error for array type conversions.
- * Type Checker: Fix internal error when array index is not an unsigned.
- * Type System: Allow arbitrary exponents for literals with a mantissa of zero.
- * Parser: Fix incorrect source location for nameless parameters.
- * Command Line Interface: Fix internal error when compiling stdin with no content and --ast option.
-
-
-### 0.4.26 (2019-04-29)
-
-Important Bugfixes:
- * Code Generator: Fix initialization routine of uninitialized internal function pointers in constructor context.
- * Type System: Use correct type name for contracts in event parameters when used in libraries. This affected code generation.
-
-Bugfixes:
- * ABIEncoderV2: Refuse to generate code that is known to be potentially buggy.
- * General: Split rule list such that JavaScript environments with small stacks can use the compiler.
-
-Note: The above changes are not included in 0.5.0, because they were backported.
-
-
-### 0.4.25 (2018-09-12)
-
-Important Bugfixes:
- * Code Generator: Properly perform cleanup for exponentiation and non-256 bit types.
- * Type Checker: Report error when using indexed structs in events with experimental ABIEncoderV2. This used to log wrong values.
- * Type Checker: Report error when using structs in events without experimental ABIEncoderV2. This used to crash or log the wrong values.
- * Parser: Consider all unicode line terminators (LF, VF, FF, CR, NEL, LS, PS) for single-line comments
-   and string literals. They are invalid in strings and will end comments.
- * Parser: Disallow unterminated multi-line comments at the end of input.
- * Parser: Treat ``/** /`` as unterminated multi-line comment.
-
-### 0.4.24 (2018-05-16)
-
-Language Features:
- * Code Generator: Use native shift instructions on target Constantinople.
- * General: Allow multiple variables to be declared as part of a tuple assignment, e.g. ``(uint a, uint b) = ...``.
- * General: Remove deprecated ``constant`` as function state modifier from documentation and tests (but still leave it as a valid feature).
- * Type Checker: Deprecate the ``years`` unit denomination and raise a warning for it (or an error as experimental 0.5.0 feature).
- * Type Checker: Make literals (without explicit type casting) an error for tight packing as experimental 0.5.0 feature.
- * Type Checker: Warn about wildcard tuple assignments (this will turn into an error with version 0.5.0).
- * Type Checker: Warn when ``keccak256``, ``sha256`` and ``ripemd160`` are not used with a single bytes argument (suggest to use ``abi.encodePacked(...)``). This will turn into an error with version 0.5.0.
-
-Compiler Features:
- * Build System: Update internal dependency of jsoncpp to 1.8.4, which introduces more strictness and reduces memory usage.
- * Control Flow Graph: Add Control Flow Graph as analysis structure.
- * Control Flow Graph: Warn about returning uninitialized storage pointers.
- * Gas Estimator: Only explore paths with higher gas costs. This reduces accuracy but greatly improves the speed of gas estimation.
- * Optimizer: Remove unnecessary masking of the result of known short instructions (``ADDRESS``, ``CALLER``, ``ORIGIN`` and ``COINBASE``).
- * Parser: Display nicer error messages by showing the actual tokens and not internal names.
- * Parser: Use the entire location of the token instead of only its starting position as source location for parser errors.
- * SMT Checker: Support state variables of integer and bool type.
-
-Bugfixes:
- * Code Generator: Fix ``revert`` with reason coming from a state or local string variable.
- * Type Checker: Show proper error when trying to ``emit`` a non-event.
- * Type Checker: Warn about empty tuple components (this will turn into an error with version 0.5.0).
- * Type Checker: The ABI encoding functions are pure and thus can be used for constants.
-
-### 0.4.23 (2018-04-19)
-
-Features:
- * Build system: Support Ubuntu Bionic.
- * SMTChecker: Integration with CVC4 SMT solver
- * Syntax Checker: Warn about functions named "constructor".
-
-Bugfixes:
- * Type Checker: Improve error message for failed function overload resolution.
- * Type Checker: Do not complain about new-style constructor and fallback function to have the same name.
- * Type Checker: Detect multiple constructor declarations in the new syntax and old syntax.
- * Type Checker: Explicit conversion of ``bytesXX`` to ``contract`` is properly disallowed.
-
-### 0.4.22 (2018-04-16)
-
-Features:
- * Code Generator: Initialize arrays without using ``msize()``.
- * Code Generator: More specialized and thus optimized implementation for ``x.push(...)``
- * Commandline interface: Error when missing or inaccessible file detected. Suppress it with the ``--ignore-missing`` flag.
- * Constant Evaluator: Fix evaluation of single element tuples.
- * General: Add encoding routines ``abi.encodePacked``, ``abi.encode``, ``abi.encodeWithSelector`` and ``abi.encodeWithSignature``.
- * General: Add global function ``gasleft()`` and deprecate ``msg.gas``.
- * General: Add global function ``blockhash(uint)`` and deprecate ``block.hash(uint)``.
- * General: Allow providing reason string for ``revert()`` and ``require()``.
- * General: Introduce new constructor syntax using the ``constructor`` keyword as experimental 0.5.0 feature.
- * General: Limit the number of errors output in a single run to 256.
- * General: Support accessing dynamic return data in post-byzantium EVMs.
- * General: Allow underscores in numeric and hex literals to separate thousands and quads.
- * Inheritance: Error when using empty parentheses for base class constructors that require arguments as experimental 0.5.0 feature.
- * Inheritance: Error when using no parentheses in modifier-style constructor calls as experimental 0.5.0 feature.
- * Interfaces: Allow overriding external functions in interfaces with public in an implementing contract.
- * Optimizer: Optimize ``SHL`` and ``SHR`` only involving constants (Constantinople only).
- * Optimizer: Remove useless ``SWAP1`` instruction preceding a commutative instruction (such as ``ADD``, ``MUL``, etc).
- * Optimizer: Replace comparison operators (``LT``, ``GT``, etc) with opposites if preceded by ``SWAP1``, e.g. ``SWAP1 LT`` is replaced with ``GT``.
- * Optimizer: Optimize across ``mload`` if ``msize()`` is not used.
- * Static Analyzer: Error on duplicated super constructor calls as experimental 0.5.0 feature.
- * Syntax Checker: Issue warning for empty structs (or error as experimental 0.5.0 feature).
- * Syntax Checker: Warn about modifiers on functions without implementation (this will turn into an error with version 0.5.0).
- * Syntax Tests: Add source locations to syntax test expectations.
- * Type Checker: Improve documentation and warnings for accessing contract members inherited from ``address``.
-
-Bugfixes:
- * Code Generator: Allow ``block.blockhash`` without being called.
- * Code Generator: Do not include internal functions in the runtime bytecode which are only referenced in the constructor.
- * Code Generator: Properly skip unneeded storage array cleanup when not reducing length.
- * Code Generator: Bugfix in modifier lookup in libraries.
- * Code Generator: Implement packed encoding of external function types.
- * Code Generator: Treat empty base constructor argument list as not provided.
- * Code Generator: Properly force-clean bytesXX types for shortening conversions.
- * Commandline interface: Fix error messages for imported files that do not exist.
- * Commandline interface: Support ``--evm-version constantinople`` properly.
- * DocString Parser: Fix error message for empty descriptions.
- * Gas Estimator: Correctly ignore costs of fallback function for other functions.
- * JSON AST: Remove storage qualifier for type name strings.
- * Parser: Fix internal compiler error when parsing ``var`` declaration without identifier.
- * Parser: Fix parsing of getters for function type variables.
- * Standard JSON: Support ``constantinople`` as ``evmVersion`` properly.
- * Static Analyzer: Fix non-deterministic order of unused variable warnings.
- * Static Analyzer: Invalid arithmetic with constant expressions causes errors.
- * Type Checker: Fix detection of recursive structs.
- * Type Checker: Fix asymmetry bug when comparing with literal numbers.
- * Type System: Improve error message when attempting to shift by a fractional amount.
- * Type System: Make external library functions accessible.
- * Type System: Prevent encoding of weird types.
- * Type System: Restrict rational numbers to 4096 bits.
-
-### 0.4.21 (2018-03-07)
-
-Features:
- * Code Generator: Assert that ``k != 0`` for ``mulmod(a, b, k)`` and ``addmod(a, b, k)`` as experimental 0.5.0 feature.
- * Code Generator: Do not retain any gas in calls (except if EVM version is set to homestead).
- * Code Generator: Use ``STATICCALL`` opcode for calling ``view`` and ``pure`` functions as experimental 0.5.0 feature.
- * General: C99/C++-style scoping rules (instead of JavaScript function scoping) take effect as experimental v0.5.0 feature.
- * General: Improved messaging when error spans multiple lines of a sourcefile
- * General: Support and recommend using ``emit EventName();`` to call events explicitly.
- * Inline Assembly: Enforce strict mode as experimental 0.5.0 feature.
- * Interface: Provide ability to select target EVM version (homestead or byzantium, with byzantium being the default).
- * Standard JSON: Reject badly formatted invalid JSON inputs.
- * Type Checker: Disallow uninitialized storage pointers as experimental 0.5.0 feature.
- * Syntax Analyser: Do not warn about experimental features if they do not concern code generation.
- * Syntax Analyser: Do not warn about ``pragma experimental "v0.5.0"`` and do not set the experimental flag in the bytecode for this.
- * Syntax Checker: Mark ``throw`` as an error as experimental 0.5.0 feature.
- * Syntax Checker: Issue error if no visibility is specified on contract functions as experimental 0.5.0 feature.
- * Syntax Checker: Issue warning when using overloads of ``address`` on contract instances.
- * Type Checker: disallow combining hex numbers and unit denominations as experimental 0.5.0 feature.
-
-Bugfixes:
- * Assembly: Raise error on oversized number literals in assembly.
- * JSON-AST: Add "documentation" property to function, event and modifier definition.
- * Resolver: Properly determine shadowing for imports with aliases.
- * Standalone Assembly: Do not ignore input after closing brace of top level block.
- * Standard JSON: Catch errors properly when invalid "sources" are passed.
- * Standard JSON: Ensure that library addresses supplied are of correct length and hex prefixed.
- * Type Checker: Properly detect which array and struct types are unsupported by the old ABI encoder.
- * Type Checker: Properly warn when using ``_offset`` and ``_slot`` for constants in inline assembly.
- * Commandline interface: throw error if option is unknown
-
-### 0.4.20 (2018-02-14)
-
-Features:
- * Code Generator: Prevent non-view functions in libraries from being called
-   directly (as opposed to via delegatecall).
- * Commandline interface: Support strict mode of assembly (disallowing jumps,
-   instructional opcodes, etc) with the ``--strict-assembly`` switch.
- * Inline Assembly: Issue warning for using jump labels (already existed for jump instructions).
- * Inline Assembly: Support some restricted tokens (return, byte, address) as identifiers in Iulia mode.
- * Optimiser: Replace ``x % 2**i`` by ``x & (2**i-1)``.
- * Resolver: Continue resolving references after the first error.
- * Resolver: Suggest alternative identifiers if a given identifier is not found.
- * SMT Checker: Take if-else branch conditions into account in the SMT encoding of the program
-   variables.
- * Syntax Checker: Deprecate the ``var`` keyword (and mark it an error as experimental 0.5.0 feature).
- * Type Checker: Allow `this.f.selector` to be a pure expression.
- * Type Checker: Issue warning for using ``public`` visibility for interface functions.
- * Type Checker: Limit the number of warnings raised for creating abstract contracts.
-
-Bugfixes:
- * Error Output: Truncate huge number literals in the middle to avoid output blow-up.
- * Parser: Disallow event declarations with no parameter list.
- * Standard JSON: Populate the ``sourceLocation`` field in the error list.
- * Standard JSON: Properly support contract and library file names containing a colon (such as URLs).
- * Type Checker: Suggest the experimental ABI encoder if using ``struct``s as function parameters
-   (instead of an internal compiler error).
- * Type Checker: Improve error message for wrong struct initialization.
-
-### 0.4.19 (2017-11-30)
-
-Features:
- * Code Generator: New ABI decoder which supports structs and arbitrarily nested
-   arrays and checks input size (activate using ``pragma experimental ABIEncoderV2;``).
- * General: Allow constant variables to be used as array length.
- * Inline Assembly: ``if`` statement.
- * Standard JSON: Support the ``outputSelection`` field for selective compilation of target artifacts.
- * Syntax Checker: Turn the usage of ``callcode`` into an error as experimental 0.5.0 feature.
- * Type Checker: Improve address checksum warning.
- * Type Checker: More detailed errors for invalid array lengths (such as division by zero).
-
-Bugfixes:
-
-### 0.4.18 (2017-10-18)
-
-Features:
- * Code Generator: Always use all available gas for calls as experimental 0.5.0 feature
-   (previously, some amount was retained in order to work in pre-Tangerine-Whistle
-   EVM versions)
- * Parser: Better error message for unexpected trailing comma in parameter lists.
- * Standard JSON: Support the ``outputSelection`` field for selective compilation of supplied sources.
- * Syntax Checker: Unary ``+`` is now a syntax error as experimental 0.5.0 feature.
- * Type Checker: Disallow non-pure constant state variables as experimental 0.5.0 feature.
- * Type Checker: Do not add members of ``address`` to contracts as experimental 0.5.0 feature.
- * Type Checker: Force interface functions to be external as experimental 0.5.0 feature.
- * Type Checker: Require ``storage`` or ``memory`` keyword for local variables as experimental 0.5.0 feature.
- * Compiler Interface: Better formatted error message for long source snippets
-
-Bugfixes:
- * Code Generator: Allocate one byte per memory byte array element instead of 32.
- * Code Generator: Do not accept data with less than four bytes (truncated function
-   signature) for regular function calls - fallback function is invoked instead.
- * Optimizer: Remove unused stack computation results.
- * Parser: Fix source location of VariableDeclarationStatement.
- * Type Checker: Allow ``gas`` in view functions.
- * Type Checker: Do not mark event parameters as shadowing state variables.
- * Type Checker: Prevent duplicate event declarations.
- * Type Checker: Properly check array length and don't rely on an assertion in code generation.
- * Type Checker: Properly support overwriting members inherited from ``address`` in a contract
-   (such as ``balance``, ``transfer``, etc.)
- * Type Checker: Validate each number literal in tuple expressions even if they are not assigned from.
-
-### 0.4.17 (2017-09-21)
-
-Features:
- * Assembly Parser: Support multiple assignment (``x, y := f()``).
- * Code Generator: Keep a single copy of encoding functions when using the experimental "ABIEncoderV2".
- * Code Generator: Partial support for passing ``structs`` as arguments and return parameters (requires ``pragma experimental ABIEncoderV2;`` for now).
- * General: Support ``pragma experimental "v0.5.0";`` to activate upcoming breaking changes.
- * General: Added ``.selector`` member on external function types to retrieve their signature.
- * Optimizer: Add new optimization step to remove unused ``JUMPDEST``s.
- * Static Analyzer: Warn when using deprecated builtins ``sha3`` and ``suicide``
-   (replaced by ``keccak256`` and ``selfdestruct``, introduced in 0.4.2 and 0.2.0, respectively).
- * Syntax Checker: Warn if no visibility is specified on contract functions.
- * Type Checker: Display helpful warning for unused function arguments/return parameters.
- * Type Checker: Do not show the same error multiple times for events.
- * Type Checker: Greatly reduce the number of duplicate errors shown for duplicate constructors and functions.
- * Type Checker: Warn on using literals as tight packing parameters in ``keccak256``, ``sha3``, ``sha256`` and ``ripemd160``.
- * Type Checker: Enforce ``view`` and ``pure``.
- * Type Checker: Enforce ``view`` / ``constant`` with error as experimental 0.5.0 feature.
- * Type Checker: Enforce fallback functions to be ``external`` as experimental 0.5.0 feature.
-
-Bugfixes:
- * ABI JSON: Include all overloaded events.
- * Parser: Crash fix related to parseTypeName.
- * Type Checker: Allow constant byte arrays.
-
-### 0.4.16 (2017-08-24)
-
-Features:
- * ABI JSON: Include new field ``stateMutability`` with values ``pure``, ``view``,
-   ``nonpayable`` and ``payable``.
- * Analyzer: Experimental partial support for Z3 SMT checker ("SMTChecker").
- * Build System: Shared libraries (``libsolutil``, ``libevmasm``, ``libsolidity``
-   and ``liblll``) are no longer produced during the build process.
- * Code generator: Experimental new implementation of ABI encoder that can
-   encode arbitrarily nested arrays ("ABIEncoderV2")
- * Metadata: Store experimental flag in metadata CBOR.
- * Parser: Display previous visibility specifier in error if multiple are found.
- * Parser: Introduce ``pure`` and ``view`` keyword for functions,
-   ``constant`` remains an alias for ``view`` and pureness is not enforced yet,
-   so use with care.
- * Static Analyzer: Warn about large storage structures.
- * Syntax Checker: Support ``pragma experimental <feature>;`` to turn on
-   experimental features.
- * Type Checker: More detailed error message for invalid overrides.
- * Type Checker: Warn about shifting a literal.
-
-Bugfixes:
- * Assembly Parser: Be more strict about number literals.
- * Assembly Parser: Limit maximum recursion depth.
- * Parser: Enforce commas between array and tuple elements.
- * Parser: Limit maximum recursion depth.
- * Type Checker: Crash fix related to ``using``.
- * Type Checker: Disallow constructors in libraries.
- * Type Checker: Reject the creation of interface contracts using the ``new`` statement.
-
-### 0.4.15 (2017-08-08)
-
-Features:
- * Type Checker: Show unimplemented function if trying to instantiate an abstract class.
-
-Bugfixes:
- * Code Generator: ``.delegatecall()`` should always return execution outcome.
- * Code Generator: Provide "new account gas" for low-level ``callcode`` and ``delegatecall``.
- * Type Checker: Constructors must be implemented if declared.
- * Type Checker: Disallow the ``.gas()`` modifier on ``ecrecover``, ``sha256`` and ``ripemd160``.
- * Type Checker: Do not mark overloaded functions as shadowing other functions.
- * Type Checker: Internal library functions must be implemented if declared.
-
-### 0.4.14 (2017-07-31)
-
-Features:
- * C API (``jsonCompiler``): Export the ``license`` method.
- * Code Generator: Optimise the fallback function, by removing a useless jump.
- * Inline Assembly: Show useful error message if trying to access calldata variables.
- * Inline Assembly: Support variable declaration without initial value (defaults to 0).
- * Metadata: Only include files which were used to compile the given contract.
- * Type Checker: Disallow value transfers to contracts without a payable fallback function.
- * Type Checker: Include types in explicit conversion error message.
- * Type Checker: Raise proper error for arrays too large for ABI encoding.
- * Type checker: Warn if using ``this`` in a constructor.
- * Type checker: Warn when existing symbols, including builtins, are overwritten.
-
-Bugfixes:
- * Code Generator: Properly clear return memory area for ecrecover.
- * Type Checker: Fix crash for some assignment to non-lvalue.
- * Type Checker: Fix invalid "specify storage keyword" warning for reference members of structs.
- * Type Checker: Mark modifiers as internal.
- * Type Checker: Re-allow multiple mentions of the same modifier per function.
-
-
-### 0.4.13 (2017-07-06)
-
-Features:
- * Syntax Checker: Deprecated "throw" in favour of require(), assert() and revert().
- * Type Checker: Warn if a local storage reference variable does not explicitly use the keyword ``storage``.
-
-Bugfixes:
- * Code Generator: Correctly unregister modifier variables.
- * Compiler Interface: Only output AST if analysis was successful.
- * Error Output: Do not omit the error type.
-
-### 0.4.12 (2017-07-03)
-
-Features:
- * Assembly: Add ``CREATE2`` (EIP86), ``STATICCALL`` (EIP214), ``RETURNDATASIZE`` and ``RETURNDATACOPY`` (EIP211) instructions.
- * Assembly: Display auxiliary data in the assembly output.
- * Assembly: Renamed ``SHA3`` to ``KECCAK256``.
- * AST: export all attributes to JSON format.
- * C API (``jsonCompiler``): Use the Standard JSON I/O internally.
- * Code Generator: Added the Whiskers template system.
- * Inline Assembly: ``for`` and ``switch`` statements.
- * Inline Assembly: Function definitions and function calls.
- * Inline Assembly: Introduce ``keccak256`` as an opcode. ``sha3`` is still a valid alias.
- * Inline Assembly: Present proper error message when not supplying enough arguments to a functional
-   instruction.
- * Inline Assembly: Warn when instructions shadow Solidity variables.
- * Inline Assembly: Warn when using ``jump``s.
- * Remove obsolete Why3 output.
- * Type Checker: Enforce strict UTF-8 validation.
- * Type Checker: Warn about copies in storage that might overwrite unexpectedly.
- * Type Checker: Warn about type inference from literal numbers.
- * Static Analyzer: Warn about deprecation of ``callcode``.
-
-Bugfixes:
- * Assembly: mark ``MLOAD`` to have side effects in the optimiser.
- * Code Generator: Fix ABI encoding of empty literal string.
- * Code Generator: Fix negative stack size checks.
- * Code generator: Use ``REVERT`` instead of ``INVALID`` for generated input validation routines.
- * Inline Assembly: Enforce function arguments when parsing functional instructions.
- * Optimizer: Disallow optimizations involving ``MLOAD`` because it changes ``MSIZE``.
- * Static Analyzer: Unused variable warnings no longer issued for variables used inside inline assembly.
- * Type Checker: Fix address literals not being treated as compile-time constants.
- * Type Checker: Fixed crash concerning non-callable types.
- * Type Checker: Fixed segfault with constant function parameters
- * Type Checker: Disallow comparisons between mapping and non-internal function types.
- * Type Checker: Disallow invoking the same modifier multiple times.
- * Type Checker: Do not treat strings that look like addresses as addresses.
- * Type Checker: Support valid, but incorrectly rejected UTF-8 sequences.
-
-### 0.4.11 (2017-05-03)
-
-Features:
- * Implement the Standard JSON Input / Output API
- * Support ``interface`` contracts.
- * C API (``jsonCompiler``): Add the ``compileStandard()`` method to process a Standard JSON I/O.
- * Commandline interface: Add the ``--standard-json`` parameter to process a Standard JSON I/O.
- * Commandline interface: Support ``--allow-paths`` to define trusted import paths. Note: the
-   path(s) of the supplied source file(s) is always trusted.
- * Inline Assembly: Storage variable access using ``_slot`` and ``_offset`` suffixes.
- * Inline Assembly: Disallow blocks with unbalanced stack.
- * Static analyzer: Warn about statements without effects.
- * Static analyzer: Warn about unused local variables, parameters, and return parameters.
- * Syntax checker: issue deprecation warning for unary '+'
-
-Bugfixes:
- * Assembly output: Implement missing AssemblyItem types.
- * Compiler interface: Fix a bug where source indexes could be inconsistent between Solidity compiled
-   with different compilers (clang vs. gcc) or compiler settings. The bug was visible in AST
-   and source mappings.
- * Gas Estimator: Reflect the most recent fee schedule.
- * Type system: Contract inheriting from base with unimplemented constructor should be abstract.
- * Optimizer: Number representation bug in the constant optimizer fixed.
-
-### 0.4.10 (2017-03-15)
-
-Features:
- * Add ``assert(condition)``, which throws if condition is false (meant for internal errors).
- * Add ``require(condition)``, which throws if condition is false (meant for invalid input).
- * Commandline interface: Do not overwrite files unless forced.
- * Introduce ``.transfer(value)`` for sending Ether.
- * Code generator: Support ``revert()`` to abort with rolling back, but not consuming all gas.
- * Inline assembly: Support ``revert`` (EIP140) as an opcode.
- * Parser: Support scientific notation in numbers (e.g. ``2e8`` and ``200e-2``).
- * Type system: Support explicit conversion of external function to address.
- * Type system: Warn if base of exponentiation is literal (result type might be unexpected).
- * Type system: Warn if constant state variables are not compile-time constants.
-
-Bugfixes:
- * Commandline interface: Always escape filenames (replace ``/``, ``:`` and ``.`` with ``_``).
- * Commandline interface: Do not try creating paths ``.`` and ``..``.
- * Commandline interface: Allow long library names.
- * Parser: Disallow octal literals.
- * Type system: Fix a crash caused by continuing on fatal errors in the code.
- * Type system: Disallow compound assignment for tuples.
- * Type system: Detect cyclic dependencies between constants.
- * Type system: Disallow arrays with negative length.
- * Type system: Fix a crash related to invalid binary operators.
- * Type system: Disallow ``var`` declaration with empty tuple type.
- * Type system: Correctly convert function argument types to pointers for member functions.
- * Type system: Move privateness of constructor into AST itself.
- * Inline assembly: Charge one stack slot for non-value types during analysis.
- * Assembly output: Print source location before the operation it refers to instead of after.
- * Optimizer: Stop trying to optimize tricky constants after a while.
-
-### 0.4.9 (2017-01-31)
-
-Features:
- * Compiler interface: Contracts and libraries can be referenced with a ``file:`` prefix to make them unique.
- * Compiler interface: Report source location for "stack too deep" errors.
- * AST: Use deterministic node identifiers.
- * Inline assembly: introduce ``invalid`` (EIP141) as an opcode.
- * Type system: Introduce type identifier strings.
- * Type checker: Warn about invalid checksum for addresses and deduce type from valid ones.
- * Metadata: Do not include platform in the version number.
- * Metadata: Add option to store sources as literal content.
- * Code generator: Extract array utils into low-level functions.
- * Code generator: Internal errors (array out of bounds, etc.) now cause a reversion by using an invalid
-   instruction (0xfe - EIP141) instead of an invalid jump. Invalid jump is still kept for explicit throws.
-
-Bugfixes:
- * Code generator: Allow recursive structs.
- * Inline assembly: Disallow variables named like opcodes.
- * Type checker: Allow multiple events of the same name (but with different arities or argument types)
- * Natspec parser: Fix error with ``@param`` parsing and whitespace.
-
-### 0.4.8 (2017-01-13)
-
-Features:
- * Optimiser: Performance improvements.
- * Output: Print assembly in new standardized Solidity assembly format.
-
-Bugfixes:
- * Remappings: Prefer longer context over longer prefix.
- * Type checker, code generator: enable access to events of base contracts' names.
- * Imports: ``import ".dir/a"`` is not a relative path.  Relative paths begin with directory ``.`` or ``..``.
- * Type checker, disallow inheritances of different kinds (e.g. a function and a modifier) of members of the same name
-
-### 0.4.7 (2016-12-15)
-
-Features:
- * Bitshift operators.
- * Type checker: Warn when ``msg.value`` is used in non-payable function.
- * Code generator: Inject the Swarm hash of a metadata file into the bytecode.
- * Code generator: Replace expensive memcpy precompile by simple assembly loop.
- * Optimizer: Some dead code elimination.
-
-Bugfixes:
- * Code generator: throw if calling the identity precompile failed during memory (array) copying.
- * Type checker: string literals that are not valid UTF-8 cannot be converted to string type
- * Code generator: any non-zero value given as a boolean argument is now converted into 1.
- * AST Json Converter: replace ``VariableDefinitionStatement`` nodes with ``VariableDeclarationStatement``
- * AST Json Converter: fix the camel case in ``ElementaryTypeNameExpression``
- * AST Json Converter: replace ``public`` field with ``visibility`` in the function definition nodes
-
-### 0.4.6 (2016-11-22)
-
-Bugfixes:
- * Optimizer: Knowledge about state was not correctly cleared for JUMPDESTs (introduced in 0.4.5)
-
-### 0.4.5 (2016-11-21)
-
-Features:
- * Function types
- * Do-while loops: support for a ``do <block> while (<expr>);`` control structure
- * Inline assembly: support ``invalidJumpLabel`` as a jump label.
- * Type checker: now more eagerly searches for a common type of an inline array with mixed types
- * Code generator: generates a runtime error when an out-of-range value is converted into an enum type.
-
-Bugfixes:
-
- * Inline assembly: calculate stack height warning correctly even when local variables are used.
- * Code generator: check for value transfer in non-payable constructors.
- * Parser: disallow empty enum definitions.
- * Type checker: disallow conversion between different enum types.
- * Interface JSON: do not include trailing new line.
-
-### 0.4.4 (2016-10-31)
-
-Bugfixes:
- * Type checker: forbid signed exponential that led to an incorrect use of EXP opcode.
- * Code generator: properly clean higher order bytes before storing in storage.
-
-### 0.4.3 (2016-10-25)
-
-Features:
-
- * Inline assembly: support both ``suicide`` and ``selfdestruct`` opcodes
-   (note: ``suicide`` is deprecated).
- * Inline assembly: issue warning if stack is not balanced after block.
- * Include ``keccak256()`` as an alias to ``sha3()``.
- * Support shifting constant numbers.
-
-Bugfixes:
- * Commandline interface: Disallow unknown options in ``solc``.
- * Name resolver: Allow inheritance of ``enum`` definitions.
- * Type checker: Proper type checking for bound functions.
- * Type checker: fixed crash related to invalid fixed point constants
- * Type checker: fixed crash related to invalid literal numbers.
- * Type checker: ``super.x`` does not look up ``x`` in the current contract.
- * Code generator: expect zero stack increase after ``super`` as an expression.
- * Code generator: fix an internal compiler error for ``L.Foo`` for ``enum Foo`` defined in library ``L``.
- * Code generator: allow inheritance of ``enum`` definitions.
- * Inline assembly: support the ``address`` opcode.
- * Inline assembly: fix parsing of assignment after a label.
- * Inline assembly: external variables of unsupported type (such as ``this``, ``super``, etc.)
-   are properly detected as unusable.
- * Inline assembly: support variables within modifiers.
- * Optimizer: fix related to stale knowledge about SHA3 operations
-
-### 0.4.2 (2016-09-17)
-
-Bugfixes:
-
- * Code Generator: Fix library functions being called from payable functions.
- * Type Checker: Fixed a crash about invalid array types.
- * Code Generator: Fixed a call gas bug that became visible after
-   version 0.4.0 for calls where the output is larger than the input.
-
-### 0.4.1 (2016-09-09)
-
- * Build System: Fixes to allow library compilation.
-
-### 0.4.0 (2016-09-08)
-
-This release deliberately breaks backwards compatibility mostly to
-enforce some safety features. The most important change is that you have
-to explicitly specify if functions can receive ether via the ``payable``
-modifier. Furthermore, more situations cause exceptions to be thrown.
-
-Minimal changes to be made for upgrade:
- - Add ``payable`` to all functions that want to receive Ether
-   (including the constructor and the fallback function).
- - Change ``_`` to ``_;`` in modifiers.
- - Add version pragma to each file: ``pragma solidity ^0.4.0;``
-
-Breaking Changes:
-
- * Source files have to specify the compiler version they are
-   compatible with using e.g. ``pragma solidity ^0.4.0;`` or
-   ``pragma solidity >=0.4.0 <0.4.8;``
- * Functions that want to receive Ether have to specify the
-   new ``payable`` modifier (otherwise they throw).
- * Contracts that want to receive Ether with a plain "send"
-   have to implement a fallback function with the ``payable``
-   modifier. Contracts now throw if no payable fallback
-   function is defined and no function matches the signature.
- * Failing contract creation through "new" throws.
- * Division / modulus by zero throws.
- * Function call throws if target contract does not have code
- * Modifiers are required to contain ``_`` (use ``if (false) _`` as a workaround if needed).
- * Modifiers: return does not skip part in modifier after ``_``.
- * Placeholder statement `_` in modifier now requires explicit `;`.
- * ``ecrecover`` now returns zero if the input is malformed (it previously returned garbage).
- * The ``constant`` keyword cannot be used for constructors or the fallback function.
- * Removed ``--interface`` (Solidity interface) output option
- * JSON AST: General cleanup, renamed many nodes to match their C++ names.
- * JSON output: ``srcmap-runtime`` renamed to ``srcmapRuntime``.
- * Moved (and reworked) standard library contracts from inside the compiler to github.com/ethereum/solidity/std
-   (``import "std";`` or ``import owned;`` do not work anymore).
- * Confusing and undocumented keyword ``after`` was removed.
- * New reserved words: ``abstract``, ``hex``, ``interface``, ``payable``, ``pure``, ``static``, ``view``.
-
-Features:
-
- * Hexadecimal string literals: ``hex"ab1248fe"``
- * Internal: Inline assembly usable by the code generator.
- * Commandline interface: Using ``-`` as filename allows reading from stdin.
- * Interface JSON: Fallback function is now part of the ABI.
- * Interface: Version string now *SemVer* compatible.
- * Code generator: Do not provide "new account gas" if we know the called account exists.
-
-Bugfixes:
-
- * JSON AST: Nodes were added at wrong parent
- * Why3 translator: Crash fix for exponentiation
- * Commandline Interface: linking libraries with underscores in their name.
- * Type Checker: Fallback function cannot return data anymore.
- * Code Generator: Fix crash when ``sha3()`` was used on unsupported types.
- * Code Generator: Manually set gas stipend for ``.send(0)``.
-
-Lots of changes to the documentation mainly by voluntary external contributors.
-
-### 0.3.6 (2016-08-10)
-
-Features:
-
- * Formal verification: Take external effects on a contract into account.
- * Type Checker: Warning about unused return value of low-level calls and send.
- * Output: Source location and node id as part of AST output
- * Output: Source location mappings for bytecode
- * Output: Formal verification as part of json compiler output.
-
-Bugfixes:
-
- * Commandline Interface: Do not crash if input is taken from stdin.
- * Scanner: Correctly support unicode escape codes in strings.
- * JSON output: Fix error about relative / absolute source file names.
- * JSON output: Fix error about invalid utf8 strings.
- * Code Generator: Dynamic allocation of empty array caused infinite loop.
- * Code Generator: Correctly calculate gas requirements for memcpy precompile.
- * Optimizer: Clear known state if two code paths are joined.
-
-### 0.3.5 (2016-06-10)
-
-Features:
-
- * Context-dependent path remappings (different modules can use the same library in different versions)
-
-Bugfixes:
-
- * Type Checking: Dynamic return types were removed when fetching data from external calls, now they are replaced by an "unusable" type.
- * Type Checking: Overrides by constructors were considered making a function non-abstract.
-
-### 0.3.4 (2016-05-31)
-
-No change outside documentation.
-
-### 0.3.3 (2016-05-27)
-
- * Allow internal library functions to be called (by "inlining")
- * Fractional/rational constants (only usable with fixed point types, which are still in progress)
- * Inline assembly has access to internal functions (as jump labels)
- * Running `solc` without arguments on a terminal will print help.
- * Bugfix: Remove some non-determinism in code generation.
- * Bugfix: Corrected usage of not / bnot / iszero in inline assembly
- * Bugfix: Correctly clean bytesNN types before comparison
-
-### 0.3.2 (2016-04-18)
-
- * Bugfix: Inline assembly parser: `byte` opcode was unusable
- * Bugfix: Error reporting: tokens for variably-sized types were not converted to string properly
- * Bugfix: Dynamic arrays of structs were not deleted correctly.
- * Bugfix: Static arrays in constructor parameter list were not decoded correctly.
-
-### 0.3.1 (2016-03-31)
-
- * Inline assembly
- * Bugfix: Code generation: array access with narrow types did not clean higher order bits
- * Bugfix: Error reporting: error reporting with unknown source location caused a crash
-
-### 0.3.0 (2016-03-11)
-
-BREAKING CHANGES:
-
- * Added new keywords `assembly`, `foreign`, `fixed`, `ufixed`, `fixedNxM`, `ufixedNxM` (for various values of M and N), `timestamp`
- * Number constant division does not round to integer, but to a fixed point type (e.g. `1 / 2 != 1`, but `1 / 2 == 0.5`).
- * Library calls now default to use DELEGATECALL (e.g. called library functions see the same value as the calling function for `msg.value` and `msg.sender`).
- * `<address>.delegatecall` as a low-level calling interface
-
-Bugfixes:
- * Fixed a bug in the optimizer that resulted in comparisons being wrong.
-
-
-### 0.2.2 (2016-02-17)
-
- * Index access for types `bytes1`, ..., `bytes32` (only read access for now).
- * Bugfix: Type checker crash for wrong number of base constructor parameters.
-
-### 0.2.1 (2016-01-30)
-
- * Inline arrays, i.e. `var y = [1,x,f()];` if there is a common type for `1`, `x` and `f()`. Note that the result is always a fixed-length memory array and conversion to dynamic-length memory arrays is not yet possible.
- * Import similar to ECMAScript6 import (`import "abc.sol" as d` and `import {x, y} from "abc.sol"`).
- * Commandline compiler solc automatically resolves missing imports and allows for "include directories".
- * Conditional: `x ? y : z`
- * Bugfix: Fixed several bugs where the optimizer generated invalid code.
- * Bugfix: Enums and structs were not accessible to other contracts.
- * Bugfix: Fixed segfault connected to function parameter types, appeared during gas estimation.
- * Bugfix: Type checker crash for wrong number of base constructor parameters.
- * Bugfix: Allow function overloads with different array types.
- * Bugfix: Allow assignments of type `(x) = 7`.
- * Bugfix: Type `uint176` was not available.
- * Bugfix: Fixed crash during type checking concerning constructor calls.
- * Bugfix: Fixed crash during code generation concerning invalid accessors for struct types.
- * Bugfix: Fixed crash during code generating concerning computing a hash of a struct type.
-
-### 0.2.0 (2015-12-02)
-
- * **Breaking Change**: `new ContractName.value(10)()` has to be written as `(new ContractName).value(10)()`
- * Added `selfdestruct` as an alias for `suicide`.
- * Allocation of memory arrays using `new`.
- * Binding library functions to types via `using x for y`
- * `addmod` and `mulmod` (modular addition and modular multiplication with arbitrary intermediate precision)
- * Bugfix: Constructor arguments of fixed array type were not read correctly.
- * Bugfix: Memory allocation of structs containing arrays or strings.
- * Bugfix: Data location for explicit memory parameters in libraries was set to storage.
-
-### 0.1.7 (2015-11-17)
-
- * Improved error messages for unexpected tokens.
- * Proof-of-concept transcompilation to why3 for formal verification of contracts.
- * Bugfix: Arrays (also strings) as indexed parameters of events.
- * Bugfix: Writing to elements of `bytes` or `string` overwrite others.
- * Bugfix: "Successor block not found" on Windows.
- * Bugfix: Using string literals in tuples.
- * Bugfix: Cope with invalid commit hash in version for libraries.
- * Bugfix: Some test framework fixes on windows.
-
-### 0.1.6 (2015-10-16)
-
- * `.push()` for dynamic storage arrays.
- * Tuple expressions (`(1,2,3)` or `return (1,2,3);`)
- * Declaration and assignment of multiple variables (`var (x,y,) = (1,2,3,4,5);` or `var (x,y) = f();`)
- * Destructuring assignment (`(x,y,) = (1,2,3)`)
- * Bugfix: Internal error about usage of library function with invalid types.
- * Bugfix: Correctly parse `Library.structType a` at statement level.
- * Bugfix: Correctly report source locations of parenthesized expressions (as part of "tuple" story).
-
-### 0.1.5 (2015-10-07)
-
- * Breaking change in storage encoding: Encode short byte arrays and strings together with their length in storage.
- * Report warnings
- * Allow storage reference types for public library functions.
- * Access to types declared in other contracts and libraries via `.`.
- * Version stamp at beginning of runtime bytecode of libraries.
- * Bugfix: Problem with initialized string state variables and dynamic data in constructor.
- * Bugfix: Resolve dependencies concerning `new` automatically.
- * Bugfix: Allow four indexed arguments for anonymous events.
- * Bugfix: Detect too large integer constants in functions that accept arbitrary parameters.
-
-### 0.1.4 (2015-09-30)
-
- * Bugfix: Returning fixed-size arrays.
- * Bugfix: combined-json output of solc.
- * Bugfix: Accessing fixed-size array return values.
- * Bugfix: Disallow assignment from literal strings to storage pointers.
- * Refactoring: Move type checking into its own module.
-
-### 0.1.3 (2015-09-25)
-
- * `throw` statement.
- * Libraries that contain functions which are called via CALLCODE.
- * Linker stage for compiler to insert other contract's addresses (used for libraries).
- * Compiler option to output runtime part of contracts.
- * Compile-time out of bounds check for access to fixed-size arrays by integer constants.
- * Version string includes libevmasm/libethereum's version (contains the optimizer).
- * Bugfix: Accessors for constant public state variables.
- * Bugfix: Propagate exceptions in clone contracts.
- * Bugfix: Empty single-line comments are now treated properly.
- * Bugfix: Properly check the number of indexed arguments for events.
- * Bugfix: Strings in struct constructors.
-
-### 0.1.2 (2015-08-20)
-
- * Improved commandline interface.
- * Explicit conversion between `bytes` and `string`.
- * Bugfix: Value transfer used in clone contracts.
- * Bugfix: Problem with strings as mapping keys.
- * Bugfix: Prevent usage of some operators.
-
-### 0.1.1 (2015-08-04)
-
- * Strings can be used as mapping keys.
- * Clone contracts.
- * Mapping members are skipped for structs in memory.
- * Use only a single stack slot for storage references.
- * Improved error message for wrong argument count. (#2456)
- * Bugfix: Fix comparison between `bytesXX` types. (#2087)
- * Bugfix: Do not allow floats for integer literals. (#2078)
- * Bugfix: Some problem with many local variables. (#2478)
- * Bugfix: Correctly initialise `string` and `bytes` state variables.
- * Bugfix: Correctly compute gas requirements for callcode.
-
-### 0.1.0 (2015-07-10)
diff --git a/README.md b/README.md
index 6242a69f0b54..0b5fda4375cc 100644
--- a/README.md
+++ b/README.md
@@ -1,49 +1,50 @@
-# The Solidity Contract-Oriented Programming Language
+# ���约的Solidity编程语言
 
 [![Matrix Chat](https://img.shields.io/badge/Matrix%20-chat-brightgreen?style=plastic&logo=matrix)](https://matrix.to/#/#ethereum_solidity:gitter.im)
 [![Gitter Chat](https://img.shields.io/badge/Gitter%20-chat-brightgreen?style=plastic&logo=gitter)](https://gitter.im/ethereum/solidity)
-[![Solidity Forum](https://img.shields.io/badge/Solidity_Forum%20-discuss-brightgreen?style=plastic&logo=discourse)](https://forum.soliditylang.org/)
+[![Solidity Forum](https://img.shields.io/badge/Solidity_Forum%20-discuss-brightgreen?style=plastic&logo=discourse)](https://forum.soliditylang.org/)
 [![Twitter Follow](https://img.shields.io/twitter/follow/solidity_lang?style=plastic&logo=twitter)](https://twitter.com/solidity_lang)
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/000335908?domain=https%3A%2F%2Ffosstodon.org%2F&logo=mastodon&style=plastic)](https://fosstodon.org/@solidity)
 
-You can talk to us on Gitter and Matrix, tweet at us on Twitter or create a new topic in the Solidity forum. Questions, feedback, and suggestions are welcome!
+您�以在Gitter和Matrix上与我们交谈，在Twitter上�我们�推特，或者在Solidity论�上创建一个新的主题。
+我们欢迎一切问题，�馈和建议。
 
-Solidity is a statically typed, contract-oriented, high-level language for implementing smart contracts on the Ethereum platform.
+Solidity是一���类型的，���约的高级语言，用于在Ethereum平�上实现智能�约。
 
-For a good overview and starting point, please check out the official [Solidity Language Portal](https://soliditylang.org).
 
-## Table of Contents
+为了获得一个好的概述和起点，请查看官方的 [Solidity语言门户](https://soliditylang.org)。
 
-- [Background](#background)
-- [Build and Install](#build-and-install)
-- [Example](#example)
-- [Documentation](#documentation)
-- [Development](#development)
-- [Maintainers](#maintainers)
-- [License](#license)
-- [Security](#security)
+## 目录
 
-## Background
+- [背景介�](#背景介�)
+- [构建和安装](#构建和安装)
+- [示例](#示例)
+- [文档](#文档)
+- [�展](#�展)
+- [维护者](#维护者)
+- [许�](#许�)
+- [安全](#安全)
 
-Solidity is a statically-typed curly-braces programming language designed for developing smart contracts
-that run on the Ethereum Virtual Machine. Smart contracts are programs that are executed inside a peer-to-peer
-network where nobody has special authority over the execution, and thus they allow anyone to implement tokens of value,
-ownership, voting, and other kinds of logic.
+## 背景介�
 
-When deploying contracts, you should use the latest released version of
-Solidity. This is because breaking changes, as well as new features and bug fixes, are
-introduced regularly. We currently use a 0.x version
-number [to indicate this fast pace of change](https://semver.org/#spec-item-4).
+Solidity是一���类型的大括�编程语言，用于开�在以太�虚拟机上�行的智能�约。
+智能�约是在点对点网络内执行的程�，没有人对执行有特别的��，
+因此它们�许实现价值代�，所有�，投票和其他�类的逻辑。
 
-## Build and Install
+当部署�约时，您应该使用最新�布的 Solidity 版本。
+这是因为�大的�化，以�新的功能和错误修�都是定期引入的。
+我们目�使用 0.x 版本� [以表示这�快速�化的节�](https://semver.org/#spec-item-4)。
 
-Instructions about how to build and install the Solidity compiler can be
-found in the [Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html#building-from-source).
+## 构建和安装
 
+关于如何构建和安装 Solidity 编译器的说明�以在
+[Solidity 文档](https://docs.soliditylang.org/en/latest/installing-solidity.html#building-from-source)
+中找到。
 
-## Example
 
-A "Hello World" program in Solidity is of even less use than in other languages, but still:
+## 示例
+
+在 Solidity 中的 “Hello World� 程�比其他语言更没有用处，但此处�然以此�展示：
 
 ```solidity
 // SPDX-License-Identifier: MIT
@@ -56,37 +57,36 @@ contract HelloWorld {
 }
 ```
 
-To get started with Solidity, you can use [Remix](https://remix.ethereum.org/), which is a
-browser-based IDE. Here are some example contracts:
+�开始使用 Solidity，您�以使用 [Remix](https://remix.ethereum.org/)，
+它是一个基于�览器的IDE。这里有一些�约的例�：
+
+1. [投票�约](https://docs.soliditylang.org/en/latest/solidity-by-example.html#voting)
+2. [盲��约](https://docs.soliditylang.org/en/latest/solidity-by-example.html#blind-auction)
+3. [安全的远程购买�约](https://docs.soliditylang.org/en/latest/solidity-by-example.html#safe-remote-purchase)
+4. [微支付通��约](https://docs.soliditylang.org/en/latest/solidity-by-example.html#micropayment-channel)
 
-1. [Voting](https://docs.soliditylang.org/en/latest/solidity-by-example.html#voting)
-2. [Blind Auction](https://docs.soliditylang.org/en/latest/solidity-by-example.html#blind-auction)
-3. [Safe remote purchase](https://docs.soliditylang.org/en/latest/solidity-by-example.html#safe-remote-purchase)
-4. [Micropayment Channel](https://docs.soliditylang.org/en/latest/solidity-by-example.html#micropayment-channel)
+## 文档
 
-## Documentation
+Solidity 文档托管在 [阅读文档](https://docs.soliditylang.org) 。
 
-The Solidity documentation is hosted using [Read the Docs](https://docs.soliditylang.org).
+## �展
 
-## Development
+Solidity �在开�中。我们�时欢迎您的贡献!
+如果您想�供帮助，请�循 [开�者指�](https://docs.soliditylang.org/en/latest/contributing.html)。
 
-Solidity is still under development. Contributions are always welcome!
-Please follow the
-[Developers Guide](https://docs.soliditylang.org/en/latest/contributing.html)
-if you want to help.
+您�以在 [项目管�](https://github.com/ethereum/solidity/projects)
+中找到我们目�对�将�布的版本的功能和错误的优先级。
 
-You can find our current feature and bug priorities for forthcoming
-releases in the [projects section](https://github.com/ethereum/solidity/projects).
 
-## Maintainers
-The Solidity programming language and compiler are open-source community projects governed by a core team.
-The core team is sponsored by the [Ethereum Foundation](https://ethereum.foundation/).
+## 维护者
+* [@axic](https://github.com/axic)
+* [@chriseth](https://github.com/chriseth)
 
-## License
-Solidity is licensed under [GNU General Public License v3.0](LICENSE.txt).
+## 许�
+Solidity 有 [GNU 通用公共许�� v3.0](LICENSE.txt) 的许�。
 
-Some third-party code has its [own licensing terms](cmake/templates/license.h.in).
+一些第三方代�有其 [自己的许��款](cmake/templates/license.h.in)。
 
-## Security
+## 安全
 
-The security policy may be [found here](SECURITY.md).
+安全政策�以 [在这里找到](SECURITY.md)。
diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
deleted file mode 100644
index db07fb888555..000000000000
--- a/ReleaseChecklist.md
+++ /dev/null
@@ -1,117 +0,0 @@
-## Checklist for making a release:
-
-### Requirements
- - [ ] GitHub account with access to [solidity](https://github.com/ethereum/solidity), [solc-js](https://github.com/ethereum/solc-js),
-       [solc-bin](https://github.com/ethereum/solc-bin), [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum),
-       [solidity-website](https://github.com/ethereum/solidity-website).
- - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
- - [ ] Launchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
-       a gnupg key for your email in the ``ethereum.org`` domain (has to be version 1, gpg2 won't work).
- - [ ] Ubuntu/Debian dependencies of the PPA scripts: ``devscripts``, ``debhelper``, ``dput``, ``git``, ``wget``, ``ca-certificates``.
- - [ ] [npm Registry](https://www.npmjs.com) account added as a collaborator for the [``solc`` package](https://www.npmjs.com/package/solc).
- - [ ] Access to the [solidity_lang Twitter account](https://twitter.com/solidity_lang).
- - [ ] [Reddit](https://www.reddit.com) account that is at least 10 days old with a minimum of 20 comment karma (``/r/ethereum`` requirements).
-
-### Pre-flight checks
-At least a day before the release:
- - [ ] Run ``make linkcheck`` from within ``docs/`` and fix any broken links it finds.
-       Ignore false positives caused by ``href`` anchors and dummy links not meant to work.
- - [ ] Double-check that [the most recent docs builds at readthedocs](https://readthedocs.org/projects/solidity/builds/) succeeded.
- - [ ] Make sure that all merged PRs that should have changelog entries do have them.
- - [ ] Rerun CI on the top commits of main branches in all repositories that do not have daily activity by creating a test branch or PR:
-      - [ ] ``solc-js``
-      - [ ] ``solc-bin`` (make sure the bytecode comparison check did run)
-      - [ ] ``homebrew-ethereum``
- - [ ] (Optional) Create a prerelease in our Ubuntu PPA by following the steps in the PPA section below on ``develop`` rather than on a tag.
-       This is recommended especially when dealing with PPA for the first time, when we add a new Ubuntu version or when the PPA scripts were modified in this release cycle.
- - [ ] Verify that the release tarball of ``solc-js`` works.
-       Bump version locally, add ``soljson.js`` from CI, build it, compare the file structure with the previous version, install it locally and try to use it.
-
-### Drafts
-At least a day before the release:
- - [ ] Create a draft PR to sort the changelog.
- - [ ] Create draft PRs to bump version in ``solidity`` and ``solc-js``.
- - [ ] Create a draft of the release on github.
- - [ ] Create a draft PR to update soliditylang.org.
- - [ ] Create drafts of blog posts.
- - [ ] Prepare drafts of Twitter, Reddit and Solidity Forum announcements.
-
-### Blog Post
- - [ ] Create a post on [solidity-website](https://github.com/ethereum/solidity-website/tree/main/src/posts) in the ``Releases`` category and explain some of the new features or concepts.
- - [ ] Create a post on [solidity-website](https://github.com/ethereum/solidity-website/tree/main/src/posts) in the ``Security Alerts`` category in case of important bug(s).
-
-### Changelog
- - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.
- - [ ] Update the changelog to include a release date.
- - [ ] Run ``scripts/update_bugs_by_version.py`` to regenerate ``bugs_by_version.json`` from the changelog and ``bugs.json``.
-       Make sure that the resulting ``bugs_by_version.json`` has a new, empty entry for the new version.
- - [ ] Commit changes, create a pull request and wait for the tests. Then merge it.
- - [ ] Copy the changelog into the release blog post.
-
-### Create the Release
- - [ ] Create a [release on GitHub](https://github.com/ethereum/solidity/releases/new).
-       Set the target to the ``develop`` branch and the tag to the new version, e.g. ``v0.8.5``.
-       Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
-       Do not publish it yet - click the ``Save draft`` button instead.
- - [ ] Thank voluntary contributors in the GitHub release notes.
-       Use ``scripts/list_contributors.sh v<previous version>`` to get initial list of names.
-       Remove different variants of the same name manually before using the output.
- - [ ] Check that all tests on the latest commit in ``develop`` are green.
- - [ ] Click the ``Publish release`` button on the release page, creating the tag.
- - [ ] Wait for the CI runs on the tag itself.
-
-### Upload Release Artifacts and Publish Binaries
- - [ ] Switch to the tag that archives have to be created for.
- - [ ] Create the ``prerelease.txt`` file: (``echo -n > prerelease.txt``).
- - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. This will create the tarball in a directory called ``upload``.
- - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page.
- - [ ] Take the ``github-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page.
-       Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``.
- - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin.
- - [ ] Run ``npm run update -- --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
- - [ ] Create a pull request in solc-bin and merge.
-
-### Homebrew and MacOS
- - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in the [``solidity`` formula in Homebrew core repository](https://github.com/Homebrew/homebrew-core/blob/master/Formula/solidity.rb).
- - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in [our custom ``solidity`` Homebrew formula](https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb).
-
-### Docker
- - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``.
-
-### PPA
- - [ ] Create ``.release_ppa_auth`` at the root of your local Solidity checkout and set ``LAUNCHPAD_EMAIL`` and ``LAUNCHPAD_KEYID`` to your key's email and key id.
- - [ ] Double-check that the ``DISTRIBUTIONS`` list in ``scripts/release_ppa.sh`` and ``scripts/deps-ppa/static_z3.sh`` contains the most recent versions of Ubuntu.
- - [ ] Make sure the [``~ethereum/cpp-build-deps`` PPA repository](https://launchpad.net/~ethereum/+archive/ubuntu/cpp-build-deps) contains ``libz3-static-dev builds`` for all current versions of Ubuntu.
-       Note that it may be included in the ``z3-static`` multipackage (follow the ``View package details`` link to check).
-       If not present, run ``scripts/deps-ppa/static_z3.sh`` and wait for the builds to succeed before continuing.
- - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release.
-       This will create a single package containing static binary for older Ubuntu versions in the [``~ethereum/ethereum-static`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static)
-       and separate packages with dynamically-linked binaries for recent versions (those listed in ``DISTRIBUTIONS``) in the [``~ethereum/ethereum`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum).
- - [ ] Wait for the build to be finished and published for *all architectures* (currently we only build for ``amd64``, but we may add ``arm`` in the future).
-       **SERIOUSLY: DO NOT PROCEED EARLIER!!!**
- - [ ] *After* the package with the static build is *published*, use it to create packages for older Ubuntu versions.
-       Copy the static package to the [``~ethereum/ethereum`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum)
-       for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
-
-### Release solc-js
- - [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.
- - [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
- - [ ] Run ``npm run build:tarball`` in the updated ``solc-js`` repository to create ``solc-<version>.tgz``. Inspect the tarball to ensure that it contains an up to date compiler binary.
- - [ ] Run ``npm run publish:tarball`` to publish the newly created tarball.
- - [ ] Create a tag using ``git tag --annotate v$VERSION`` and push it with ``git push --tags``.
-
-### Post-release
- - [ ] Make sure the documentation for the new release has been published successfully.
-       Go to the [documentation status page at ReadTheDocs](https://readthedocs.org/projects/solidity/) and verify that the new version is listed, works and is marked as default.
- - [ ] Remove "still in progress" warning from the [release notes](https://github.com/ethereum/solidity/releases).
- - [ ] Merge the [blog posts](https://github.com/ethereum/solidity-website/pulls) related to the release.
- - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
- - [ ] Update the release information section [in the source of soliditylang.org](https://github.com/ethereum/solidity-website/blob/main/src/pages/index.tsx).
- - [ ] Announce on [Twitter](https://twitter.com/solidity_lang), including links to the release and the blog post.
- - [ ] Announce on [Fosstodon](https://fosstodon.org/@solidity/), including links to the release and the blog post.
- - [ ] Share the announcement on Reddit in [``/r/ethdev``](https://reddit.com/r/ethdev/), cross-posted to [``/r/ethereum``](https://reddit.com/r/ethereum/).
- - [ ] Share the announcement on the [Solidity forum](https://forum.soliditylang.org) in the ``Announcements`` category.
- - [ ] Share the announcement on [Project Updates](https://discord.com/channels/420394352083337236/798974456704925696)
- - [ ] Share the announcement on [`#solidity` channel on Matrix](https://matrix.to/#/#ethereum_solidity:gitter.im)
- - [ ] Share the announcement on [`#solc-tooling`](https://matrix.to/#/#solc-tooling:matrix.org)
- - [ ] Lean back, wait for bug reports and repeat from step 1 :).
diff --git a/ReviewChecklist.md b/ReviewChecklist.md
deleted file mode 100644
index 3f0af6f981d2..000000000000
--- a/ReviewChecklist.md
+++ /dev/null
@@ -1,200 +0,0 @@
-# PR Review Checklist
-The Solidity compiler is a critical piece of infrastructure in the Ethereum ecosystem.
-For this reason, our review process is quite strict and all PRs have to fulfill certain quality
-expectations and guidelines.
-The list below is meant to reduce the workload on the core team by helping contributors self-identify
-and solve common issues before they are pointed out in the review.
-It is also meant to serve as a final checklist for reviewers to go through before approving a PR.
-
-## Before You Submit a PR
-- [ ] **Do you have any other open PRs?**
-    Work on a PR is not done until it is merged or closed.
-    Our reviewing capacity is limited, so we require that external contributors work on **no more than one PR at a time**.
-    - If your PR is not getting reviewed, feel free to bring it to our attention on the [#solidity-dev](https://gitter.im/ethereum/solidity-dev) channel.
-    - Unless they were requested, we are going to close any excess PRs, leaving only the earliest one open.
-        You may reopen them, one at a time, when your current PR is done.
-- [ ] **Is the issue ready to be worked on?**
-    - If the issue does not have a desirability label (`nice to have`, `should have`,
-        `must have eventually`, `must have`, `roadmap`) we have not yet decided whether to implement it.
-    - If the issue has the `needs design` label, we have not yet decided how it should be implemented.
-    - `good first issue candidate` means that the issue will potentially be a `good first issue`
-        eventually but at the moment it is not yet ready to be worked on.
-- [ ] **Is this a breaking change?** Breaking changes should be based on the `breaking` branch rather than on the `develop` branch.
-- [ ] **Does the PR actually address the issue?**
-    - [ ] Mention the issue number in the PR description.
-        If the PR solves it completely, use the `Fixes #<issue number>` form so that Github will close the issue automatically.
-    - [ ] Do not include the issue number in the PR title, branch name or commit description.
-- [ ] When submitting a PR from a fork **create a branch and give it a descriptive name.**
-    E.g. `fix-array-abi-encoding-bug`.
-    Do not submit PRs directly from the `develop` branch of your fork since it makes rebasing and fetching new changes harder.
-- [ ] **Does the PR depend on other PRs?**
-    - [ ] If the PR has dependencies, mention them in bold in the description.
-    - [ ] Avoid basing PRs from forks on branches other than `develop` or `breaking` because
-        GitHub closes them when the base branch gets merged.
-        Do this only for PRs created directly in the main repo.
-- [ ] **Does the PR update test expectations to match the modified code?** If not, your PR will not pass some of the `_soltest_`,  jobs in CI.
-    In many cases the expectations can be updated automatically:
-    - `cmdlineTests.sh --update` for command-line tests.
-    - `isoltest --enforce-gas-cost --accept-updates` for soltest-based tests.
-        - If your PR affects gas costs, an extra run of `isoltest --enforce-gas-cost --optimize --accept-updates` is needed to update gas expectations with optimizer enabled.
-    - Review updated files before committing them.
-        **Are expectations correct and do updated tests still serve their purpose?**
-
-## Abandoned PRs
-- [ ] **Is the submitter still responsive?**
-    - If the PR had no activity from the submitter in the last 2 weeks (despite receiving reviews and our prompts) we consider it abandoned.
-- [ ] **Is the abandoned PR easy to finish or relevant?**
-    - Apply the `takeover` label if the PR can be finished without significant effort or is something that actually needs to be done right now.
-        Otherwise close it.
-        It can still be taken over later or reopened by the submitter but until then we should not be getting sidetracked by it.
-
-## Light Review
-Before an in-depth review, it is recommended to give new PRs a quick, superficial review, which
-is not meant to provide complete and detailed feedback, but instead give the submitter a rough idea
-if the PR is even on the right track and let them solve the obvious problems on their own.
-
-Light review should focus on the following three areas:
-- [ ] **Are there any obvious mistakes?** Style issues, bad practices, easy to identify bugs, etc.
-- [ ] **Is there anything missing?** Tests (of the right kind), documentation, etc. Does it address the whole issue?
-- [ ] **Is it the right solution?** Are there better ways to do this? Is the change even necessary?
-
-If the answers above are "Yes, Yes, No", thank the contributor for their effort and **close the PR**.
-
-## Coding Style and Good Practices
-- [ ] Does the PR follow our [coding style](CODING_STYLE.md)?
-
-### Reliability
-- [ ] **Use assertions liberally.** If you are certain your assumption will not be broken, prove it with `solAssert()`.
-- [ ] **Validate inputs and handle errors**. Note that assertions are **not** validation.
-
-### Readability
-- [ ] **Choose good names.**
-    - [ ] Is the name straightforward to understand?
-        Do you feel the need to jump back to the definition and remind yourself what it was whenever you see it?
-    - [ ] Is the name unambiguous in the context where it is used?
-    - [ ] Avoid abbreviations.
-- [ ] **Source files, classes and public functions should have docstrings.**
-- [ ] **Avoid code duplication.** But not fanatically. Minimal amounts of duplication are acceptable if it aids readability.
-- [ ] **Do not leave dead or commented-out code behind.** You can still see old code in history.
-      If you really have a good reason to do it, always leave a comment explaining what it is and why it is there.
-- [ ] **Mark hacks as such.** If you have to leave behind a temporary workaround, make
-    sure to include a comment that explains why and in what circumstances it can be removed.
-    Preferably link to an issue you reported upstream.
-- [ ] **Avoid obvious comments.**
-- [ ] **Do include comments when the reader may need extra context to understand the code.**
-
-### Commits and PRs
-- [ ] **Avoid hiding functional changes inside refactors.**
-    E.g. when fixing a small bug, or changing user-visible behavior, put the change in a separate commit.
-    Do not mix it with another change that renames things or reformats the code around, making the fix itself hard to identify.
-- [ ] **Whenever possible, split off refactors or unrelated changes into separate PRs.**
-    Smaller PRs are easier and quicker to review.
-    Splitting off refactors helps focus on the main point of the PR.
-
-### Common Pitfalls
-The following points are all covered by the coding style but come up so often that it is worth singling them out here:
-- [ ] **Always initialize value types in the definition,** even if you are sure you will assign them later.
-- [ ] **Use "east const" style.** I.e. `T const*`, not `const T *`.
-- [ ] **Keep indentation consistent.** See our [`.editorconfig`](.editorconfig).
-    - [ ] Tabs for C++. But use them for indentation only. Any whitespace later on the line must consist of spaces.
-    - [ ] 4 spaces for most other file types.
-- [ ] **Use `auto` sparingly.** Only use it when the actual type is very long and complicated or when it is
-    already used elsewhere in the same expression.
-- [ ] **Indent braces and parentheses in a way that makes nesting clear.**
-- [ ] **Use `using namespace` only in `.cpp` files.** Use it for `std` and our own modules.
-    Avoid unnecessary `std::` prefix in `.cpp` files (except for `std::move` and `std::forward`).
-- [ ] **Use range-based loops and destructuring.**
-- [ ] **Include any headers you use directly,** even if they are implicitly included through other headers.
-
-## Documentation
-- [ ] **Does the PR update relevant documentation?**
-
-### Documentation Style and Good Practices
-- [ ] **Use double backticks in RST (``` ``x`` ```). Prefer single backticks in Markdown (`` `x` ``),**
-    but note that double backticks are valid too and we use them in some cases for legacy reasons.
-- [ ] **Always start a new sentence on a new line.**
-    This way you do not have to rewrap the surrounding text when you rewrite the sentence.
-    This also makes changes actually easier to spot in the diff.
-
-## Testing
-
-### What to Test
-- [ ] **Is newly added code adequately covered by tests?** Have you considered all the important corner cases?
-- If it is a bugfix:
-    - [ ] **The PR must include tests that reproduce the bug.**
-    - [ ] **Are there gaps in test coverage of the buggy feature?** Fill them by adding more tests.
-    - [ ] **Try to break it.** Can you of any similar features that could also be buggy?
-        Play with the repro and include prominent variants as separate test cases, even if they don't trigger a bug.
-- [ ] **Positive cases (code that compiles) should have a semantic test.**
-- [ ] **Negative cases (code with compilation errors) should have a syntax test.**
-- [ ] **Avoid mixing positive and negative cases in the same syntax test.**
-    If the test produces an error, we stop at the analysis stage and we will not detect
-    problems that only occur in code generation, optimizer or assembler.
-    - [ ] If you have to do it, at least mark positive cases inside the file with a short comment.
-        - This way, when the test is updated, it is easier to verify that these cases still do not trigger an error.
-- [ ] New syntax: **does it have an [`ASTJSON`](test/libsolidity/ASTJSON/) test?**
-- [ ] New CLI or StandardJSON option:
-    - [ ] **Does it have a [command-line test](test/cmdlineTests/)?**
-    - [ ] **Is the option listed for every input mode in [`CommandLineParser` tests](test/solc/CommandLineParser.cpp)?**
-- [ ] **Did you consider interactions with other language features?**
-    - [ ] Are all types covered? Structs? Enums? Contracts/libraries/interfaces? User-defined value types?
-        Value types: integers, fixed bytes, `address`, `address payable`, `bool`? Function pointers?
-        Static and dynamic arrays? `string` and `bytes`? Mappings?
-        Values of types that cannot be named: literals, tuples, array slices, storage references?
-    - [ ] If it accepts a function, does it also accept an event or an error? These have function types but are not functions.
-    - [ ] If it affects free functions, what about internal library functions?
-    - [ ] Attached library functions? Functions attached with `using for`?
-    - [ ] Possible combinations of `storage`, `memory`, `calldata`, `immutable`, `constant`?
-        Remember that internal functions can take `storage` arguments.
-    - [ ] Does it work at construction time as well? What if you store it at construction time and read after deployment?
-    - [ ] What about importing it from a different module or inheriting it?
-    - [ ] Have you tested it with the ternary operator?
-
-### Test Style and Good Practices
-- [ ] **Make test case file names long and specific enough** so that it is easy to guess what is inside.
-    When checking if we have the case already covered the name is usually the only clue we see.
-    - [ ] Place them in the right subdirectory.
-    - [ ] **Avoid simply appending numbers to the name to distinguish similar cases.**
-        Coming up with good names is hard but figuring out if any of hundreds of tests with names that
-        match your search actually fits your case is even harder.
-- [ ] **Do not include version pragma and the SPDX comment in semantic and syntax test cases**.
-    In other test types include them if necessary to suppress warnings.
-- [ ] **If you have to use a version pragma, avoid hard-coding version.** Use `pragma solidity *`.
-- [ ] **When writing StandardJSON command-line tests, use `urls` instead of `content`** and put
-    the Solidity or Yul code in a separate file.
-
-## Compiler-specific
-- [ ] **Are error messages sensible and understandable to users?**
-- [ ] **Are error codes consistent?**
-    - [ ] Avoid randomly changing or reassigning error codes.
-    - [ ] Avoid defining separate codes for trivial variants of the same issue.
-        Make it easy for tools to consistently refer to the same error with the same code.
-- [ ] **Error messages should end with a full stop.**
-- [ ] **Prefer Ranges v3 to Boost where possible.**
-
-## Take a Step Back
-- [ ] **Do you fully understand what the PR does and why?**
-- [ ] **Are you confident that the code works and does not break unrelated functionality?**
-- [ ] **Is this a reasonable way to achieve the goal stated in the issue?**
-- [ ] **Is the code simple?** Does the PR achieve its objective at the cost of significant
-    complexity that may be a source of future bugs?
-- [ ] **Is the code efficient?** Does the PR introduce any major performance bottlenecks?
-- [ ] **Does the PR introduce any breaking changes beyond what was agreed in the issue?**
-
-## Final Checks Before Merging
-- [ ] **Is the PR rebased on top of the `develop` branch** (or `breaking` if it is a breaking change)?
-- [ ] **Did all CI checks pass?**
-    - Note that we have a few jobs that tend to randomly fail due to outside factors, especially external tests (with `_ext_` in the name).
-        If these fail, rebase on latest `develop` (or `breaking`) and try rerunning them.
-        Note also that not all of these checks are required for the PR to be merged.
-- [ ] If the change is visible to users, **does the PR have a [changelog](Changelog.md) entry?**
-    - [ ] Is the changelog entry in the right section?
-        Make sure to move it up if there was a release recently.
-- [ ] **Is commit history simple and understandable?**
-    - [ ] Each commit should be a self-contained, logical step leading the goal of the PR, without going back and forth.
-        In particular, review fixups should be squashed into the commits they fix.
-    - [ ] Do not include any merge commits in your branch. Please use rebase to keep up to date with the base branch.
-- [ ] **Is the PR properly labeled?**
-    - Use `external contribution` label to mark PRs not coming from the core team.
-    - If the PR depends on other PRs, use `has dependencies` and set the base branch accordingly.
-    - Labels like `documentation` or `optimizer` are helpful for filtering PRs.
diff --git a/SECURITY.md b/SECURITY.md
deleted file mode 100644
index d319b332f26f..000000000000
--- a/SECURITY.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Security Policy
-
-The Solidity team and community take all security bugs in Solidity seriously.
-We appreciate your efforts and responsible disclosure and will make every effort to acknowledge your contributions.
-
-## Scope
-
-Bugs in the Solidity repository are in scope.
-Bugs in third-party dependencies e.g., jsoncpp, boost etc. are not in scope unless they result in a Solidity specific bug.
-
-Only bugs that have a demonstrable security impact on smart contracts are in scope.
-For example, a Solidity program whose optimization is incorrect (e.g., leads to an incorrect output) qualifies as a security bug.
-Please note that the [rules][2] of the [Ethereum bounty program][1] have precedence over this security policy.
-
-## Supported Versions
-
-As a general rule, only the latest release gets security updates.
-Exceptions may be made when the current breaking release is relatively new, e.g. less than three months old.
-If you are reporting a bug, please state clearly the Solidity version(s) it affects.
-
-Example 1: Assuming the current release is `0.6.3` and a security bug has been found in it that affects both `0.5.x` and `0.6.x` trees, we may not only patch `0.6.3` (the bug-fix release numbered `0.6.4`) but `0.5.x` as well (the bug-fix release numbered `0.5.(x+1)`).
-
-Example 2: Assuming the current release is `0.6.25` and a security bug has been found in it, we may only patch `0.6.25` (in the bug-fix release numbered `0.6.26`) even if the bug affects a previous tree such as `0.5.x`.
-
-## Reporting a Vulnerability
-
-To report a vulnerability, please follow the instructions stated in the [Ethereum bounty program][1].
-
-In the bug report, please include all details necessary to reproduce the vulnerability such as:
-
-- Input program that triggers the bug
-- Compiler version affected
-- Target EVM version
-- Framework/IDE if applicable
-- EVM execution environment/client if applicable
-- Operating system
-
-Please include steps to reproduce the bug you have found in as much detail as possible.
-
-Once we have received your bug report, we will try to reproduce it and provide a more detailed response.
-Once the reported bug has been successfully reproduced, the Solidity team will work on a fix.
-
-The Solidity team maintains the following JSON-formatted lists of patched security vulnerabilities:
-
-- [Summary of known security vulnerabilities][3]
-- [List of security vulnerabilities affecting a specific version of the compiler][4].
-
-
-[1]: https://bounty.ethereum.org/
-[2]: https://bounty.ethereum.org/#rules
-[3]: https://docs.soliditylang.org/en/develop/bugs.html
-[4]: https://github.com/ethereum/solidity/blob/develop/docs/bugs_by_version.json
diff --git a/cmake/EthBuildInfo.cmake b/cmake/EthBuildInfo.cmake
deleted file mode 100644
index 1316a888cd53..000000000000
--- a/cmake/EthBuildInfo.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-function(create_build_info NAME)
-
-	# Set build platform; to be written to BuildInfo.h
-	set(ETH_BUILD_OS "${CMAKE_SYSTEM_NAME}")
-
-	if (CMAKE_COMPILER_IS_MINGW)
-		set(ETH_BUILD_COMPILER "mingw")
-	elseif (CMAKE_COMPILER_IS_MSYS)
-		set(ETH_BUILD_COMPILER "msys")
-	elseif (CMAKE_COMPILER_IS_GNUCXX)
-		set(ETH_BUILD_COMPILER "g++")
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-		set(ETH_BUILD_COMPILER "msvc")
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		set(ETH_BUILD_COMPILER "clang")
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-		set(ETH_BUILD_COMPILER "appleclang")
-	else ()
-		set(ETH_BUILD_COMPILER "unknown")
-	endif ()
-
-	set(ETH_BUILD_PLATFORM "${ETH_BUILD_OS}.${ETH_BUILD_COMPILER}")
-
-	#cmake build type may be not speCified when using msvc
-	if (CMAKE_BUILD_TYPE)
-		set(_cmake_build_type ${CMAKE_BUILD_TYPE})
-	else()
-		set(_cmake_build_type "${CMAKE_CFG_INTDIR}")
-	endif()
-
-	# Generate header file containing useful build information
-	add_custom_target(${NAME}_BuildInfo.h ALL
-		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-		COMMAND ${CMAKE_COMMAND} -DETH_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DETH_BUILDINFO_IN=${ETH_CMAKE_DIR}/templates/BuildInfo.h.in -DETH_DST_DIR=${PROJECT_BINARY_DIR}/include/${PROJECT_NAME} -DETH_CMAKE_DIR=${ETH_CMAKE_DIR}
-		-DETH_BUILD_TYPE="${_cmake_build_type}"
-		-DETH_BUILD_OS="${ETH_BUILD_OS}"
-		-DETH_BUILD_COMPILER="${ETH_BUILD_COMPILER}"
-		-DETH_BUILD_PLATFORM="${ETH_BUILD_PLATFORM}"
-		-DPROJECT_VERSION="${PROJECT_VERSION}"
-		-DPROJECT_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}"
-		-DPROJECT_VERSION_MINOR="${PROJECT_VERSION_MINOR}"
-		-DPROJECT_VERSION_PATCH="${PROJECT_VERSION_PATCH}"
-		-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
-		)
-	include_directories("${PROJECT_BINARY_DIR}/include")
-endfunction()
diff --git a/cmake/EthCcache.cmake b/cmake/EthCcache.cmake
deleted file mode 100644
index 9410cbcde7f1..000000000000
--- a/cmake/EthCcache.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# Setup ccache.
-#
-# The ccache is auto-enabled if the tool is found.
-# To disable set -DCCACHE=OFF option.
-if(NOT DEFINED CMAKE_CXX_COMPILER_LAUNCHER)
-  find_program(CCACHE ccache DOC "ccache tool path; set to OFF to disable")
-  if(CCACHE)
-    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
-    if(COMMAND cotire)
-      # Change ccache config to meet cotire requirements.
-      set(ENV{CCACHE_SLOPPINESS} pch_defines,time_macros)
-    endif()
-    message(STATUS "[ccache] Enabled: ${CCACHE}")
-  endif()
-endif()
diff --git a/cmake/EthCheckCXXCompilerFlag.cmake b/cmake/EthCheckCXXCompilerFlag.cmake
deleted file mode 100644
index 3e62885fe8ef..000000000000
--- a/cmake/EthCheckCXXCompilerFlag.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-include(CheckCXXCompilerFlag)
-
-# Adds CXX compiler flag if the flag is supported by the compiler.
-#
-# This is effectively a combination of CMake's check_cxx_compiler_flag()
-# and add_compile_options():
-#
-#    if(check_cxx_compiler_flag(flag))
-#        add_compile_options(flag)
-#
-function(eth_add_cxx_compiler_flag_if_supported FLAG)
-  # Remove leading - or / from the flag name.
-  string(REGEX REPLACE "^[-/]" "" name ${FLAG})
-  # Deletes any ':' because it's invalid variable names.
-  string(REGEX REPLACE ":" "" name ${name})
-  check_cxx_compiler_flag(${FLAG} ${name})
-  if(${name})
-    add_compile_options(${FLAG})
-  endif()
-
-  # If the optional argument passed, store the result there.
-  if(ARGV1)
-    set(${ARGV1} ${name} PARENT_SCOPE)
-  endif()
-endfunction()
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
deleted file mode 100644
index 6cfa864c1d1a..000000000000
--- a/cmake/EthCompilerSettings.cmake
+++ /dev/null
@@ -1,279 +0,0 @@
-#------------------------------------------------------------------------------
-# EthCompilerSettings.cmake
-#
-# CMake file for cpp-ethereum project which specifies our compiler settings
-# for each supported platform and build configuration.
-#
-# The documentation for cpp-ethereum is hosted at http://cpp-ethereum.org
-#
-# Copyright (c) 2014-2016 cpp-ethereum contributors.
-#------------------------------------------------------------------------------
-
-# Clang seeks to be command-line compatible with GCC as much as possible, so
-# most of our compiler settings are common between GCC and Clang.
-#
-# These settings then end up spanning all POSIX platforms (Linux, OS X, BSD, etc)
-
-include(EthCheckCXXCompilerFlag)
-
-if(NOT EMSCRIPTEN)
-	eth_add_cxx_compiler_flag_if_supported(-fstack-protector-strong have_stack_protector_strong_support)
-	if(NOT have_stack_protector_strong_support)
-		eth_add_cxx_compiler_flag_if_supported(-fstack-protector)
-	endif()
-endif()
-
-if(PEDANTIC)
-	eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough)
-endif()
-
-# Prevent the path of the source directory from ending up in the binary via __FILE__ macros.
-eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${PROJECT_SOURCE_DIR}=/solidity")
-
-# -Wpessimizing-move warns when a call to std::move would prevent copy elision
-# if the argument was not wrapped in a call.  This happens when moving a local
-# variable in a return statement when the variable is the same type as the
-# return type or using a move to create a new object from a temporary object.
-if(PEDANTIC)
-	eth_add_cxx_compiler_flag_if_supported(-Wpessimizing-move)
-endif()
-
-# -Wredundant-move warns when an implicit move would already be made, so the
-# std::move call is not needed, such as when moving a local variable in a return
-# that is different from the return type.
-if(PEDANTIC)
-	eth_add_cxx_compiler_flag_if_supported(-Wredundant-move)
-endif()
-
-if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
-	# Enables all the warnings about constructions that some users consider questionable,
-	# and that are easy to avoid.  Also enable some extra warning flags that are not
-	# enabled by -Wall.   Finally, treat at warnings-as-errors, which forces developers
-	# to fix warnings as they arise, so they don't accumulate "to be fixed later".
-	if(PEDANTIC)
-		add_compile_options(-Wall)
-		add_compile_options(-Wextra)
-		add_compile_options(-Werror)
-		add_compile_options(-pedantic)
-		add_compile_options(-Wmissing-declarations)
-		add_compile_options(-Wno-unknown-pragmas)
-		add_compile_options(-Wimplicit-fallthrough)
-		add_compile_options(-Wsign-conversion)
-		add_compile_options(-Wconversion)
-
-		check_cxx_compiler_flag(-Wextra-semi WEXTRA_SEMI)
-		if(WEXTRA_SEMI)
-			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
-		endif()
-		# See https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=6b927b1297e66e26e62e722bf15c921dcbbd25b9
-		check_cxx_compiler_flag(-Wno-dangling-reference WNO_DANGLING_REFERENCE)
-		if (WNO_DANGLING_REFERENCE)
-            add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-dangling-reference>)
-		endif()
-
-
-		eth_add_cxx_compiler_flag_if_supported(-Wfinal-dtor-non-final-class)
-		eth_add_cxx_compiler_flag_if_supported(-Wnewline-eof)
-		eth_add_cxx_compiler_flag_if_supported(-Wsuggest-destructor-override)
-		eth_add_cxx_compiler_flag_if_supported(-Wduplicated-cond)
-		eth_add_cxx_compiler_flag_if_supported(-Wduplicate-enum)
-		eth_add_cxx_compiler_flag_if_supported(-Wlogical-op)
-		eth_add_cxx_compiler_flag_if_supported(-Wno-unknown-attributes)
-	endif()
-
-	# Configuration-specific compiler settings.
-	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g3 -DETH_DEBUG")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g3")
-
-	# Additional GCC-specific compiler settings.
-	if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-		# Check that we've got GCC 8.0 or newer.
-		if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0))
-			message(FATAL_ERROR "${PROJECT_NAME} requires g++ 8.0 or greater.")
-		endif ()
-
-		# Use fancy colors in the compiler diagnostics
-		add_compile_options(-fdiagnostics-color)
-
-	# Additional Clang-specific compiler settings.
-	elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-		# Check that we've got clang 7.0 or newer.
-		if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0))
-			message(FATAL_ERROR "${PROJECT_NAME} requires clang++ 7.0 or greater.")
-		endif ()
-
-		if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-			# Set stack size to 32MB - by default Apple's clang defines a stack size of 8MB.
-			# Normally 16MB is enough to run all tests, but it will exceed the stack, if -DSANITIZE=address is used.
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-stack_size -Wl,0x2000000")
-
-			# Boost libraries use visibility=hidden to reduce unnecessary DWARF entries.
-			# Unless we match visibility, ld will give a warning message like:
-			#   ld: warning: direct access in function 'boost::filesystem... from file ...
-			#   means the weak symbol cannot be overridden at runtime. This was likely caused by different translation units being compiled with different visibility settings.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-		endif()
-
-		# Some Linux-specific Clang settings.  We don't want these for OS X.
-		if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-			# Use fancy colors in the compiler diagnostics
-			add_compile_options(-fcolor-diagnostics)
-
-			# See "How to silence unused command line argument error with clang without disabling it?"
-			# When using -Werror with clang, it transforms "warning: argument unused during compilation" messages
-			# into errors, which makes sense.
-			# http://stackoverflow.com/questions/21617158/how-to-silence-unused-command-line-argument-error-with-clang-without-disabling-i
-			add_compile_options(-Qunused-arguments)
-		elseif(EMSCRIPTEN)
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --memory-init-file 0")
-			# Leave only exported symbols as public and aggressively remove others
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -ffunction-sections -fvisibility=hidden")
-			# Optimisation level
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
-			# Re-enable exception catching (optimisations above -O1 disable it)
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s DISABLE_EXCEPTION_CATCHING=0")
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DISABLE_EXCEPTION_CATCHING=0")
-			# Remove any code related to exit (such as atexit)
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXIT_RUNTIME=0")
-			# Remove any code related to filesystem access
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s FILESYSTEM=0")
-			# Allow memory growth, but disable some optimisations
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_MEMORY_GROWTH=1")
-			# Disable eval()
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DYNAMIC_EXECUTION=0")
-			# Disable greedy exception catcher
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s NODEJS_CATCH_EXIT=0")
-			# Abort if linking results in any undefined symbols
-			# Note: this is on by default in the CMake Emscripten module which we aren't using
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
-			# Disallow deprecated emscripten build options.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s STRICT=1")
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s STRICT=1")
-			# Export the Emscripten-generated auxiliary methods which are needed by solc-js.
-			# Which methods of libsolc itself are exported is specified in libsolc/CMakeLists.txt.
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap','addFunction','removeFunction','UTF8ToString','lengthBytesUTF8','stringToUTF8','setValue']")
-			# Build for webassembly target.
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM=1")
-			# Set webassembly build to synchronous loading.
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM_ASYNC_COMPILATION=0")
-			# Allow new functions to be added to the wasm module via addFunction.
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_TABLE_GROWTH=1")
-			# Disable warnings about not being pure asm.js due to memory growth.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-almost-asm")
-		endif()
-	endif()
-
-# The major alternative compiler to GCC/Clang is Microsoft's Visual C++ compiler, only available on Windows.
-elseif (DEFINED MSVC)
-	# Remove NDEBUG from RELWITHDEBINFO (to enable asserts)
-	# CMAKE_CXX_FLAGS_RELWITHDEBINFO for GCC/Clang does not include NDEBUG
-	string(REPLACE "/DNDEBUG" " " CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-
-	add_compile_options(/MP)						# enable parallel compilation
-	add_compile_options(/EHsc)						# specify Exception Handling Model in msvc
-	if(PEDANTIC)
-		add_compile_options(/WX)					# enable warnings-as-errors
-	endif()
-	add_compile_options(/wd4068)					# disable unknown pragma warning (4068)
-	add_compile_options(/wd4996)					# disable unsafe function warning (4996)
-	add_compile_options(/wd4503)					# disable decorated name length exceeded, name was truncated (4503)
-	add_compile_options(/wd4267)					# disable conversion from 'size_t' to 'type', possible loss of data (4267)
-	add_compile_options(/wd4180)					# disable qualifier applied to function type has no meaning; ignored (4180)
-	add_compile_options(/wd4290)					# disable C++ exception specification ignored except to indicate a function is not __declspec(nothrow) (4290)
-	add_compile_options(/wd4244)					# disable conversion from 'type1' to 'type2', possible loss of data (4244)
-	add_compile_options(/wd4800)					# disable forcing value to bool 'true' or 'false' (performance warning) (4800)
-	add_compile_options(-D_WIN32_WINNT=0x0600)		# declare Windows Vista API requirement
-	add_compile_options(-DNOMINMAX)					# undefine windows.h MAX && MIN macros cause it cause conflicts with std::min && std::max functions
-	add_compile_options(/utf-8)						# enable utf-8 encoding (solves warning 4819)
-	add_compile_options(-DBOOST_REGEX_NO_LIB)		# disable automatic boost::regex library selection
-	add_compile_options(-D_REGEX_MAX_STACK_COUNT=200000L)	# increase std::regex recursion depth limit
-	add_compile_options(/permissive-)				# specify standards conformance mode to the compiler
-
-	# disable empty object file warning
-	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-	# warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/SAFESEH' specification
-	# warning LNK4099: pdb was not found with lib
-	# stack size 16MB
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099,4075 /STACK:16777216")
-
-# If you don't have GCC, Clang or VC++ then you are on your own.  Good luck!
-else ()
-	message(WARNING "Your compiler is not tested, if you run into any issues, we'd welcome any patches.")
-endif ()
-
-if (SANITIZE)
-	# Perform case-insensitive string compare
-	string(TOLOWER "${SANITIZE}" sanitizer)
-	# -fno-omit-frame-pointer gives more informative stack trace in case of an error
-	# -fsanitize-address-use-after-scope throws an error when a variable is used beyond its scope
-	if (sanitizer STREQUAL "address")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=address -fsanitize-address-use-after-scope")
-	elseif (sanitizer STREQUAL "undefined")
-		# The following flags not used by fuzzer but used by us may create problems, so consider
-		# disabling them: alignment, pointer-overflow.
-		# The following flag is not used by us to reduce terminal noise
-		# i.e., warnings printed on stderr: unsigned-integer-overflow
-		# Note: The C++ standard does not officially consider unsigned integer overflows
-		# to be undefined behavior since they are implementation independent.
-		# Flags are alphabetically sorted and are for clang v10.0
-		list(APPEND undefinedSanitizerChecks
-			alignment
-			array-bounds
-			bool
-			builtin
-			enum
-			float-divide-by-zero
-			function
-			integer-divide-by-zero
-			null
-			object-size
-			pointer-overflow
-			return
-			returns-nonnull-attribute
-			shift
-			signed-integer-overflow
-			unreachable
-			vla-bound
-			vptr
-		)
-		list(JOIN undefinedSanitizerChecks "," sanitizerChecks)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${sanitizerChecks} -fno-sanitize-recover=${sanitizerChecks}")
-	endif()
-endif()
-
-# Code coverage support.
-# Copied from Cable:
-# https://github.com/ethereum/cable/blob/v0.2.4/CableCompilerSettings.cmake#L118-L132
-option(COVERAGE "Build with code coverage support" OFF)
-if(COVERAGE)
-	# Set the linker flags first, they are required to properly test the compiler flag.
-	set(CMAKE_SHARED_LINKER_FLAGS "--coverage ${CMAKE_SHARED_LINKER_FLAGS}")
-	set(CMAKE_EXE_LINKER_FLAGS "--coverage ${CMAKE_EXE_LINKER_FLAGS}")
-
-	set(CMAKE_REQUIRED_LIBRARIES "--coverage ${CMAKE_REQUIRED_LIBRARIES}")
-	check_cxx_compiler_flag(--coverage have_coverage)
-	string(REPLACE "--coverage " "" CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-	if(NOT have_coverage)
-		message(FATAL_ERROR "Coverage not supported")
-	endif()
-	add_compile_options(-g --coverage)
-endif()
-
-# SMT Solvers integration
-option(USE_Z3 "Allow compiling with Z3 SMT solver integration" ON)
-if(UNIX AND NOT APPLE)
-	option(USE_Z3_DLOPEN "Dynamically load the Z3 SMT solver instead of linking against it." OFF)
-endif()
-option(USE_CVC4 "Allow compiling with CVC4 SMT solver integration" ON)
-
-if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
-	option(USE_LD_GOLD "Use GNU gold linker" ON)
-	if (USE_LD_GOLD)
-		execute_process(COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-		if ("${LD_VERSION}" MATCHES "GNU gold")
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-		endif ()
-	endif ()
-endif ()
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
deleted file mode 100644
index 7a84a01d9868..000000000000
--- a/cmake/EthDependencies.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-# all dependencies that are not directly included in the cpp-ethereum distribution are defined here
-# for this to work, download the dependency via the cmake script in extdep or install them manually!
-
-if (DEFINED MSVC)
-	# by defining CMAKE_PREFIX_PATH variable, cmake will look for dependencies first in our own repository before looking in system paths like /usr/local/ ...
-	# this must be set to point to the same directory as $ETH_DEPENDENCY_INSTALL_DIR in /extdep directory
-
-	if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0)
-		set (ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../extdep/install/windows/x64")
-	else()
-		get_filename_component(DEPS_DIR "${CMAKE_CURRENT_LIST_DIR}/../deps/install" ABSOLUTE)
-		set(ETH_DEPENDENCY_INSTALL_DIR
-			"${DEPS_DIR}/x64"					# Old location for deps.
-			"${DEPS_DIR}/win64"					# New location for deps.
-			"${DEPS_DIR}/win64/Release/share"	# LLVM shared cmake files.
-		)
-	endif()
-	set (CMAKE_PREFIX_PATH ${ETH_DEPENDENCY_INSTALL_DIR} ${CMAKE_PREFIX_PATH})
-endif()
-
-# custom cmake scripts
-set(ETH_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(ETH_SCRIPTS_DIR ${ETH_CMAKE_DIR}/scripts)
-
-## use multithreaded boost libraries, with -mt suffix
-set(Boost_USE_MULTITHREADED ON)
-option(Boost_USE_STATIC_LIBS "Link Boost statically" ON)
-if (WIN32)
-	option(Boost_USE_STATIC_RUNTIME "Link Boost against static C++ runtime libraries" ON)
-endif()
-
-set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options;system")
-
-if (WIN32)
-	# Boost 1.77 fixes a bug that causes crashes on Windows for some relative paths in --allow-paths.
-	# See https://github.com/boostorg/filesystem/issues/201
-	find_package(Boost 1.77.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-else()
-	# Boost 1.65 is the first to also provide boost::get for rvalue-references (#5787).
-	find_package(Boost 1.65.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-endif()
-
-# If cmake is older than boost and boost is older than 1.70,
-# find_package does not define imported targets, so we have to
-# define them manually.
-
-if (NOT TARGET Boost::boost) # header only target
-	add_library(Boost::boost INTERFACE IMPORTED)
-	set_property(TARGET Boost::boost APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
-endif()
-get_property(LOCATION TARGET Boost::boost PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-message(STATUS "Found Boost headers in ${LOCATION}")
-
-foreach (BOOST_COMPONENT IN LISTS BOOST_COMPONENTS)
-	if (NOT TARGET Boost::${BOOST_COMPONENT})
-		add_library(Boost::${BOOST_COMPONENT} UNKNOWN IMPORTED)
-		string(TOUPPER ${BOOST_COMPONENT} BOOST_COMPONENT_UPPER)
-		set_property(TARGET Boost::${BOOST_COMPONENT} PROPERTY IMPORTED_LOCATION ${Boost_${BOOST_COMPONENT_UPPER}_LIBRARY})
-		set_property(TARGET Boost::${BOOST_COMPONENT} PROPERTY INTERFACE_LINK_LIBRARIES ${Boost_${BOOST_COMPONENT_UPPER}_LIBRARIES})
-		set_property(TARGET Boost::${BOOST_COMPONENT} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
-	endif()
-	get_property(LOCATION TARGET Boost::${BOOST_COMPONENT} PROPERTY IMPORTED_LOCATION)
-	message(STATUS "Found Boost::${BOOST_COMPONENT} at ${LOCATION}")
-endforeach()
diff --git a/cmake/EthOptions.cmake b/cmake/EthOptions.cmake
deleted file mode 100644
index cd6fe8133732..000000000000
--- a/cmake/EthOptions.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-# CMAKE macros to set default CMAKE options and to show the
-# resulting configuration.
-
-macro(configure_project)
-	set(NAME ${PROJECT_NAME})
-
-	# features
-	eth_default_option(COVERAGE OFF)
-	eth_default_option(OSSFUZZ OFF)
-
-	# components
-	eth_default_option(TESTS ON)
-	eth_default_option(TOOLS ON)
-
-	# Define a matching property name of each of the "features".
-	foreach(FEATURE ${ARGN})
-		set(SUPPORT_${FEATURE} TRUE)
-	endforeach()
-
-	include(EthBuildInfo)
-	create_build_info(${NAME})
-	print_config(${NAME})
-endmacro()
-
-macro(print_config NAME)
-	message("")
-	message("------------------------------------------------------------------------")
-	message("-- Configuring ${NAME} ${PROJECT_VERSION}")
-	message("------------------------------------------------------------------------")
-	message("--                  CMake Version                            ${CMAKE_VERSION}")
-	message("-- CMAKE_BUILD_TYPE Build type                               ${CMAKE_BUILD_TYPE}")
-	message("-- TARGET_PLATFORM  Target platform                          ${CMAKE_SYSTEM_NAME}")
-	message("--------------------------------------------------------------- features")
-	message("-- COVERAGE         Coverage support                         ${COVERAGE}")
-	message("------------------------------------------------------------- components")
-if (SUPPORT_TESTS)
-	message("-- TESTS            Build tests                              ${TESTS}")
-endif()
-if (SUPPORT_TOOLS)
-	message("-- TOOLS            Build tools                              ${TOOLS}")
-endif()
-	message("------------------------------------------------------------------ flags")
-	message("-- OSSFUZZ                                                   ${OSSFUZZ}")
-	message("------------------------------------------------------------------------")
-	message("")
-endmacro()
diff --git a/cmake/EthPolicy.cmake b/cmake/EthPolicy.cmake
deleted file mode 100644
index eb5c37e246f7..000000000000
--- a/cmake/EthPolicy.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# it must be a macro cause policies have scopes
-# http://www.cmake.org/cmake/help/v3.0/command/cmake_policy.html
-macro (eth_policy)
-	# link_directories() treats paths relative to the source dir.
-	cmake_policy(SET CMP0015 NEW)
-
-	# Avoid warnings in CMake 3.0.2:
-	cmake_policy(SET CMP0042 NEW)
-	cmake_policy(SET CMP0043 NEW)
-
-	# allow VERSION argument in project()
-	cmake_policy(SET CMP0048 NEW)
-
-	if (POLICY CMP0054)
-		# do not interpret if() arguments as variables!
-		cmake_policy(SET CMP0054 NEW)
-	endif()
-
-	if (POLICY CMP0091)
-		# Allow selecting MSVC runtime library using CMAKE_MSVC_RUNTIME_LIBRARY.
-		cmake_policy(SET CMP0091 NEW)
-	endif()
-
-	# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
-	if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
-		cmake_policy(SET CMP0135 NEW)
-	endif()
-
-	if(POLICY CMP0115)
-		# Require explicit extensions for source files, do not guess.
-		# The extra calls to GetFileAttributesW significantly slow down cmake on Windows.
-		# https://gitlab.kitware.com/cmake/cmake/-/issues/23154
-		cmake_policy(SET CMP0115 NEW)
-	endif()
-endmacro()
diff --git a/cmake/EthToolchains.cmake b/cmake/EthToolchains.cmake
deleted file mode 100644
index c2306bd75d11..000000000000
--- a/cmake/EthToolchains.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# Require C++17.
-if (NOT DEFINED CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17) # This requires at least CMake 3.8 to accept this C++17 flag.
-endif ()
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if(NOT CMAKE_TOOLCHAIN_FILE)
-  # Use default toolchain file if none is provided.
-  set(
-      CMAKE_TOOLCHAIN_FILE
-      "${CMAKE_CURRENT_LIST_DIR}/toolchains/default.cmake"
-      CACHE FILEPATH "The CMake toolchain file"
-  )
-endif()
diff --git a/cmake/EthUtils.cmake b/cmake/EthUtils.cmake
deleted file mode 100644
index 44b92f4a0aa1..000000000000
--- a/cmake/EthUtils.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# renames the file if it is different from its destination
-include(CMakeParseArguments)
-#
-macro(replace_if_different SOURCE DST)
-	set(extra_macro_args ${ARGN})
-	set(options CREATE)
-	set(one_value_args)
-	set(multi_value_args)
-	cmake_parse_arguments(REPLACE_IF_DIFFERENT "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
-
-	if (REPLACE_IF_DIFFERENT_CREATE AND (NOT (EXISTS "${DST}")))
-		file(WRITE "${DST}" "")
-	endif()
-
-	execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files "${SOURCE}" "${DST}" RESULT_VARIABLE DIFFERENT OUTPUT_QUIET ERROR_QUIET)
-
-	if (DIFFERENT)
-		execute_process(COMMAND ${CMAKE_COMMAND} -E rename "${SOURCE}" "${DST}")
-	else()
-		execute_process(COMMAND ${CMAKE_COMMAND} -E remove "${SOURCE}")
-	endif()
-endmacro()
-
-macro(eth_default_option O DEF)
-	if (DEFINED ${O})
-		if (${${O}})
-			set(${O} ON)
-		else ()
-			set(${O} OFF)
-		endif()
-	else ()
-		set(${O} ${DEF})
-	endif()
-endmacro()
-
-function(detect_stray_source_files FILELIST DIRECTORY)
-	if(CMAKE_VERSION VERSION_LESS 3.12)
-		file(GLOB sources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${DIRECTORY}/*.cpp" "${DIRECTORY}/*.h")
-	else()
-		file(GLOB sources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "${DIRECTORY}/*.cpp" "${DIRECTORY}/*.h")
-	endif()
-	foreach(path IN LISTS FILELIST)
-		list(REMOVE_ITEM sources ${path})
-	endforeach()
-	list(LENGTH sources leftover_sources)
-	if (leftover_sources)
-		message(SEND_ERROR "The following source files are present but are not compiled: ${sources}")
-	endif()
-endfunction(detect_stray_source_files)
-
-# CreateExportedFunctionsForEMSDK(OUTPUT_VARIABLE Symbol1 Symbol2 ... SymbolN)
-function(CreateExportedFunctionsForEMSDK OUTPUT_VARIABLE)
-	list(TRANSFORM ARGN PREPEND "\"_")
-	list(TRANSFORM ARGN APPEND "\"")
-	list(JOIN ARGN "," ARGN)
-	set(${OUTPUT_VARIABLE} "[${ARGN}]" PARENT_SCOPE)
-endfunction()
diff --git a/cmake/FindCLN.cmake b/cmake/FindCLN.cmake
deleted file mode 100644
index 0b574ab9f7cb..000000000000
--- a/cmake/FindCLN.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_library(CLN_LIBRARY NAMES cln)
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CLN DEFAULT_MSG CLN_LIBRARY)
-
-if(CLN_FOUND AND NOT TARGET CLN::CLN)
-    add_library(CLN::CLN UNKNOWN IMPORTED)
-    set_property(TARGET CLN::CLN PROPERTY IMPORTED_LOCATION ${CLN_LIBRARY})
-endif()
diff --git a/cmake/FindCVC4.cmake b/cmake/FindCVC4.cmake
deleted file mode 100644
index 887b907b8320..000000000000
--- a/cmake/FindCVC4.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-if (USE_CVC4)
-    find_path(CVC4_INCLUDE_DIR cvc4/cvc4.h)
-    find_library(CVC4_LIBRARY NAMES cvc4)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(CVC4 DEFAULT_MSG CVC4_LIBRARY CVC4_INCLUDE_DIR)
-    if(CVC4_FOUND)
-        # CVC4 may depend on either CLN or GMP.
-        # We can assume that the one it requires is present on the system,
-        # so we quietly try to find both and link against them, if they are
-        # present.
-        find_package(CLN QUIET)
-        find_package(GMP QUIET)
-
-        set(CVC4_LIBRARIES ${CVC4_LIBRARY})
-
-        if (CLN_FOUND)
-            set(CVC4_LIBRARIES ${CVC4_LIBRARIES} CLN::CLN)
-        endif ()
-
-        if (GMP_FOUND)
-            set(CVC4_LIBRARIES ${CVC4_LIBRARIES} GMP::GMP)
-        endif ()
-
-        if (NOT TARGET CVC4::CVC4)
-            add_library(CVC4::CVC4 UNKNOWN IMPORTED)
-            set_property(TARGET CVC4::CVC4 PROPERTY IMPORTED_LOCATION ${CVC4_LIBRARY})
-            set_property(TARGET CVC4::CVC4 PROPERTY INTERFACE_LINK_LIBRARIES ${CVC4_LIBRARIES})
-            set_property(TARGET CVC4::CVC4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CVC4_INCLUDE_DIR})
-        endif()
-    endif()
-else()
-    set(CVC4_FOUND FALSE)
-endif()
diff --git a/cmake/FindGMP.cmake b/cmake/FindGMP.cmake
deleted file mode 100644
index c3a0265429b8..000000000000
--- a/cmake/FindGMP.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_library(GMP_LIBRARY NAMES gmp)
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GMP DEFAULT_MSG GMP_LIBRARY)
-
-if(GMP_FOUND AND NOT TARGET GMP::GMP)
-    add_library(GMP::GMP UNKNOWN IMPORTED)
-    set_property(TARGET GMP::GMP PROPERTY IMPORTED_LOCATION ${GMP_LIBRARY})
-endif()
diff --git a/cmake/FindZ3.cmake b/cmake/FindZ3.cmake
deleted file mode 100644
index 092b8636b8e9..000000000000
--- a/cmake/FindZ3.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-if (USE_Z3)
-    # Save and clear Z3_FIND_VERSION, since the
-    # Z3 config module cannot handle version requirements.
-    set(Z3_FIND_VERSION_ORIG ${Z3_FIND_VERSION})
-    set(Z3_FIND_VERSION)
-    # Try to find Z3 using its stock cmake files.
-    find_package(Z3 QUIET CONFIG)
-    # Restore Z3_FIND_VERSION for find_package_handle_standard_args.
-    set(Z3_FIND_VERSION ${Z3_FIND_VERSION_ORIG})
-    set(Z3_FIND_VERSION_ORIG)
-
-    include(FindPackageHandleStandardArgs)
-
-    if (Z3_FOUND)
-        set(Z3_VERSION ${Z3_VERSION_STRING})
-        find_package_handle_standard_args(Z3 CONFIG_MODE)
-    else()
-        find_path(Z3_INCLUDE_DIR NAMES z3++.h PATH_SUFFIXES z3)
-        find_library(Z3_LIBRARY NAMES z3)
-        find_program(Z3_EXECUTABLE z3 PATH_SUFFIXES bin)
-
-        if(Z3_INCLUDE_DIR AND Z3_LIBRARY)
-            if(Z3_EXECUTABLE)
-                execute_process (COMMAND ${Z3_EXECUTABLE} -version
-                    OUTPUT_VARIABLE libz3_version_str
-                    ERROR_QUIET
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-                string(REGEX REPLACE "^Z3 version ([0-9.]+).*" "\\1"
-                       Z3_VERSION_STRING "${libz3_version_str}")
-                unset(libz3_version_str)
-            else()
-                message(WARNING "Could not determine the version of z3, since the z3 executable was not found.")
-                set(Z3_VERSION_STRING "0.0.0")
-            endif()
-        endif()
-        mark_as_advanced(Z3_VERSION_STRING z3_DIR)
-
-        find_package_handle_standard_args(Z3
-            REQUIRED_VARS Z3_LIBRARY Z3_INCLUDE_DIR
-            VERSION_VAR Z3_VERSION_STRING)
-
-        if (NOT TARGET z3::libz3)
-            add_library(z3::libz3 UNKNOWN IMPORTED)
-            set_property(TARGET z3::libz3 PROPERTY IMPORTED_LOCATION ${Z3_LIBRARY})
-            set_property(TARGET z3::libz3 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Z3_INCLUDE_DIR})
-        endif()
-    endif()
-else()
-    set(Z3_FOUND FALSE)
-endif()
diff --git a/cmake/fmtlib.cmake b/cmake/fmtlib.cmake
deleted file mode 100644
index 032a68cd52a0..000000000000
--- a/cmake/fmtlib.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-include(FetchContent)
-
-FetchContent_Declare(
-	fmtlib
-	PREFIX "${PROJECT_BINARY_DIR}/deps"
-	DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
-	DOWNLOAD_NAME fmt-9.1.0.tar.gz
-	URL https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
-	URL_HASH SHA256=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
-)
-
-if (CMAKE_VERSION VERSION_LESS "3.14.0")
-	FetchContent_GetProperties(fmtlib)
-	if (NOT fmtlib_POPULATED)
-		FetchContent_Populate(fmtlib)
-		add_subdirectory(${fmtlib_SOURCE_DIR} ${fmtlib_BINARY_DIR})
-	endif()
-else()
-	FetchContent_MakeAvailable(fmtlib)
-endif()
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
deleted file mode 100644
index cf1cc656b3b0..000000000000
--- a/cmake/jsoncpp.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-include(ExternalProject)
-
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
-    set(JSONCPP_CMAKE_COMMAND emcmake cmake)
-else()
-    set(JSONCPP_CMAKE_COMMAND ${CMAKE_COMMAND})
-endif()
-
-set(prefix "${PROJECT_BINARY_DIR}/deps")
-set(JSONCPP_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}")
-set(JSONCPP_INCLUDE_DIR "${prefix}/include")
-
-# TODO: Investigate why this breaks some emscripten builds and
-# check whether this can be removed after updating the emscripten
-# versions used in the CI runs.
-if(EMSCRIPTEN)
-    # Do not include all flags in CMAKE_CXX_FLAGS for emscripten,
-    # but only use -std=c++17. Using all flags causes build failures
-    # at the moment.
-    set(JSONCPP_CXX_FLAGS -std=c++17)
-else()
-    # jsoncpp uses implicit casts for comparing integer and
-    # floating point numbers. This causes clang-10 (used by ossfuzz builder)
-    # to error on the implicit conversions. Here, we request jsoncpp
-    # to unconditionally use static casts for these conversions by defining the
-    # JSON_USE_INT64_DOUBLE_CONVERSION preprocessor macro. Doing so,
-    # not only gets rid of the implicit conversion error that clang-10 produces
-    # but also forces safer behavior in general.
-    set(JSONCPP_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSON_USE_INT64_DOUBLE_CONVERSION")
-endif()
-
-set(byproducts "")
-if(CMAKE_VERSION VERSION_GREATER 3.1)
-    set(byproducts BUILD_BYPRODUCTS "${JSONCPP_LIBRARY}")
-endif()
-
-# Propagate CMAKE_MSVC_RUNTIME_LIBRARY on Windows builds, if set.
-if (WIN32 AND POLICY CMP0091 AND CMAKE_MSVC_RUNTIME_LIBRARY)
-    list(APPEND JSONCPP_CMAKE_ARGS "-DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW")
-    list(APPEND JSONCPP_CMAKE_ARGS "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}")
-endif()
-
-ExternalProject_Add(jsoncpp-project
-    PREFIX "${prefix}"
-    DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
-    DOWNLOAD_NAME jsoncpp-1.9.3.tar.gz
-    URL https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
-    URL_HASH SHA256=8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d
-    CMAKE_COMMAND ${JSONCPP_CMAKE_COMMAND}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-               -DCMAKE_INSTALL_LIBDIR=lib
-               # Build static lib but suitable to be included in a shared lib.
-               -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
-               -DJSONCPP_WITH_EXAMPLE=OFF
-               -DJSONCPP_WITH_TESTS=OFF
-               -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
-               -DCMAKE_CXX_FLAGS=${JSONCPP_CXX_FLAGS}
-               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-               ${JSONCPP_CMAKE_ARGS}
-    ${byproducts}
-)
-
-# Create jsoncpp imported library
-add_library(jsoncpp STATIC IMPORTED)
-file(MAKE_DIRECTORY ${JSONCPP_INCLUDE_DIR})  # Must exist.
-set_property(TARGET jsoncpp PROPERTY IMPORTED_LOCATION ${JSONCPP_LIBRARY})
-set_property(TARGET jsoncpp PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${JSONCPP_INCLUDE_DIR})
-set_property(TARGET jsoncpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JSONCPP_INCLUDE_DIR})
-add_dependencies(jsoncpp jsoncpp-project)
diff --git a/cmake/range-v3.cmake b/cmake/range-v3.cmake
deleted file mode 100644
index d2f54452b319..000000000000
--- a/cmake/range-v3.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-include(ExternalProject)
-
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
-    set(RANGE_V3_CMAKE_COMMAND emcmake cmake)
-else()
-    set(RANGE_V3_CMAKE_COMMAND ${CMAKE_COMMAND})
-endif()
-
-set(prefix "${PROJECT_BINARY_DIR}/deps")
-set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
-
-ExternalProject_Add(range-v3-project
-    PREFIX "${prefix}"
-    DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
-    DOWNLOAD_NAME range-v3-0.12.0.tar.gz
-    URL https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
-    URL_HASH SHA256=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb
-    CMAKE_COMMAND ${RANGE_V3_CMAKE_COMMAND}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-               -DBUILD_TESTING=OFF
-               -DRANGES_CXX_STD=${CMAKE_CXX_STANDARD}
-               -DRANGE_V3_DOCS=OFF
-               -DRANGE_V3_EXAMPLES=OFF
-               -DRANGE_V3_TESTS=OFF
-               -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
-               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    BUILD_BYPRODUCTS "${RANGE_V3_INCLUDE_DIR}/range/v3/all.hpp"
-)
-
-# Create range-v3 imported library
-add_library(range-v3 INTERFACE IMPORTED)
-file(MAKE_DIRECTORY ${RANGE_V3_INCLUDE_DIR})  # Must exist.
-set_target_properties(range-v3 PROPERTIES
-    INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->"
-    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR}
-    INTERFACE_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR})
-add_dependencies(range-v3 range-v3-project)
diff --git a/cmake/scripts/buildinfo.cmake b/cmake/scripts/buildinfo.cmake
deleted file mode 100644
index 3fb6beb2b787..000000000000
--- a/cmake/scripts/buildinfo.cmake
+++ /dev/null
@@ -1,74 +0,0 @@
-# generates BuildInfo.h
-#
-# this module expects
-# ETH_SOURCE_DIR - main CMAKE_SOURCE_DIR
-# ETH_DST_DIR - main CMAKE_BINARY_DIR
-# ETH_BUILD_TYPE
-# ETH_BUILD_PLATFORM
-#
-# example usage:
-# cmake -DETH_SOURCE_DIR=. -DETH_DST_DIR=build -DETH_BUILD_TYPE=Debug -DETH_BUILD_PLATFORM=Darwin.appleclang -P scripts/buildinfo.cmake
-#
-# Its main output variables are SOL_VERSION_BUILDINFO and SOL_VERSION_PRERELEASE
-
-if (NOT ETH_BUILD_TYPE)
-	set(ETH_BUILD_TYPE "unknown")
-endif()
-
-if (NOT ETH_BUILD_PLATFORM)
-	set(ETH_BUILD_PLATFORM "unknown")
-endif()
-
-# Logic here: If prerelease.txt exists but is empty, it is a non-pre release.
-# If it does not exist, create our own prerelease string
-if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt)
-	file(READ ${ETH_SOURCE_DIR}/prerelease.txt SOL_VERSION_PRERELEASE)
-	string(STRIP "${SOL_VERSION_PRERELEASE}" SOL_VERSION_PRERELEASE)
-else()
-	string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC)
-	string(REPLACE .0 . SOL_VERSION_PRERELEASE "${SOL_VERSION_PRERELEASE}")
-endif()
-
-if (EXISTS ${ETH_SOURCE_DIR}/commit_hash.txt)
-	file(READ ${ETH_SOURCE_DIR}/commit_hash.txt SOL_COMMIT_HASH)
-	string(STRIP ${SOL_COMMIT_HASH} SOL_COMMIT_HASH)
-else()
-	execute_process(
-		COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} rev-parse --short=8 HEAD
-		OUTPUT_VARIABLE SOL_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-	)
-	execute_process(
-		COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} diff HEAD --shortstat
-		OUTPUT_VARIABLE SOL_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-	)
-endif()
-
-if (SOL_COMMIT_HASH)
-	string(STRIP ${SOL_COMMIT_HASH} SOL_COMMIT_HASH)
-	string(SUBSTRING ${SOL_COMMIT_HASH} 0 8 SOL_COMMIT_HASH)
-endif()
-
-if (NOT SOL_COMMIT_HASH)
-	message(FATAL_ERROR "Unable to determine commit hash. Either compile from within git repository or "
-		"supply a file called commit_hash.txt")
-endif()
-if (NOT SOL_COMMIT_HASH MATCHES [a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9])
-    message(FATAL_ERROR "Malformed commit hash \"${SOL_COMMIT_HASH}\". It has to consist of exactly 8 hex digits.")
-endif()
-
-if (SOL_COMMIT_HASH AND SOL_LOCAL_CHANGES)
-	set(SOL_COMMIT_HASH "${SOL_COMMIT_HASH}.mod")
-endif()
-
-set(SOL_VERSION_COMMIT "commit.${SOL_COMMIT_HASH}")
-set(SOl_VERSION_PLATFORM ETH_BUILD_PLATFORM)
-set(SOL_VERSION_BUILDINFO "commit.${SOL_COMMIT_HASH}.${ETH_BUILD_PLATFORM}")
-
-set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp")
-set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")
-
-configure_file("${ETH_BUILDINFO_IN}" "${TMPFILE}")
-
-include("${ETH_CMAKE_DIR}/EthUtils.cmake")
-replace_if_different("${TMPFILE}" "${OUTFILE}" CREATE)
-
diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in
deleted file mode 100644
index 9c295a85f0c7..000000000000
--- a/cmake/templates/BuildInfo.h.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#define ETH_PROJECT_VERSION "@PROJECT_VERSION@"
-#define ETH_PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
-#define ETH_PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
-#define ETH_PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@
-#define SOL_COMMIT_HASH "@SOL_COMMIT_HASH@"
-#define ETH_BUILD_TYPE "@ETH_BUILD_TYPE@"
-#define ETH_BUILD_OS "@ETH_BUILD_OS@"
-#define ETH_BUILD_COMPILER "@ETH_BUILD_COMPILER@"
-#define ETH_BUILD_PLATFORM "@ETH_BUILD_PLATFORM@"
-#define SOL_VERSION_PRERELEASE "@SOL_VERSION_PRERELEASE@"
-#define SOL_VERSION_BUILDINFO "@SOL_VERSION_BUILDINFO@"
-#define SOL_VERSION_COMMIT "@SOL_VERSION_COMMIT@"
-#define SOL_VERSION_PLATFORM "@SOL_VERSION_PLATFORM@"
diff --git a/cmake/templates/license.h.in b/cmake/templates/license.h.in
deleted file mode 100644
index 2d7f2691a81c..000000000000
--- a/cmake/templates/license.h.in
+++ /dev/null
@@ -1,177 +0,0 @@
-#pragma once
-
-#include <string>
-
-static std::string const otherLicenses{R"(Most of the code is licensed under GPLv3 (see below), the license for individual
-parts are as follows:
-
-libkeccak-tiny:
-  The file libsolutil/Keccak256.cpp incorporates libkeccak-tiny.
-
-  A single-file implementation of SHA-3 and SHAKE implemented by David Leon Gil
-  License: CC0, attribution kindly requested. Blame taken too, but not liability.
-
-picosha2:
-  The file libsolutil/picosha2.h is imported.
-
-  Copyright (C) 2017 okdshin
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-jsoncpp:
-  The JsonCpp library's source code, including accompanying documentation,
-  tests and demonstration applications, are licensed under the following
-  conditions...
-
-  The JsonCpp Authors explicitly disclaim copyright in all
-  jurisdictions which recognize such a disclaimer. In such jurisdictions,
-  this software is released into the Public Domain.
-
-  In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-  2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
-  released under the terms of the MIT License (see below).
-
-  In jurisdictions which recognize Public Domain property, the user of this
-  software may choose to accept it either as 1) Public Domain, 2) under the
-  conditions of the MIT License (see below), or 3) under the terms of dual
-  Public Domain/MIT License conditions described here, as they choose.
-
-  The MIT License is about as close to Public Domain as a license can get, and is
-  described in clear, concise terms at:
-
-	 http://en.wikipedia.org/wiki/MIT_License
-
-  The full text of the MIT License follows:
-
-  ========================================================================
-  Copyright (c) 2007-2010 The JsonCpp Authors
-
-  Permission is hereby granted, free of charge, to any person
-  obtaining a copy of this software and associated documentation
-  files (the "Software"), to deal in the Software without
-  restriction, including without limitation the rights to use, copy,
-  modify, merge, publish, distribute, sublicense, and/or sell copies
-  of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-  ========================================================================
-  (END LICENSE TEXT)
-
-  The MIT license is compatible with both the GPL and commercial
-  software, affording one all of the rights of Public Domain with the
-  minor nuisance of being required to keep the above copyright notice
-  and license text in the source code. Note also that by accepting the
-  Public Domain "license" you can re-license your copy using whatever
-  license you like.
-
-scanner/token:
-  The liblangutil/{CharStream,Scanner,Token}.{h,cpp} files are derived from
-  code originating from the V8 project licensed under the following terms:
-
-  Copyright 2006-2012, the V8 project authors. All rights reserved.
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above
-        copyright notice, this list of conditions and the following
-        disclaimer in the documentation and/or other materials provided
-        with the distribution.
-      * Neither the name of Google Inc. nor the names of its
-        contributors may be used to endorse or promote products derived
-        from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-evmc:
-  The code in test/evmc is licensed under the Apache License version 2:
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-mini-lz4:
-  The file scripts/ci/mini-lz4.js is derived from the emscripten adaptation of
-  node-lz4 and licensed under the following terms:
-
-  Copyright (c) 2012 Pierre Curto
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-base64:
-  The file scripts/ci/base64DecToArr.js is derived from a code example
-  in the MDN Web Docs, which permits use under CC0 terms:
-
-  Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/
-
-
-All other code is licensed under GPL version 3:
-
-)"};
-
-static char const licenseText[] = {
-	@LICENSE_TEXT@, 0
-};
diff --git a/cmake/toolchains/default.cmake b/cmake/toolchains/default.cmake
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/cmake/toolchains/libfuzzer.cmake b/cmake/toolchains/libfuzzer.cmake
deleted file mode 100644
index a734df975ec4..000000000000
--- a/cmake/toolchains/libfuzzer.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# Inherit default options
-include("${CMAKE_CURRENT_LIST_DIR}/default.cmake")
-# Enable Z3, disable CVC4
-set(USE_Z3 ON CACHE BOOL "Enable Z3" FORCE)
-set(USE_CVC4 OFF CACHE BOOL "Disable CVC4" FORCE)
-# Build fuzzing binaries
-set(OSSFUZZ ON CACHE BOOL "Enable fuzzer build" FORCE)
-# Use libfuzzer as the fuzzing back-end
-set(LIB_FUZZING_ENGINE "-fsanitize=fuzzer" CACHE STRING "Use libfuzzer back-end" FORCE)
-# clang/libfuzzer specific flags for UBSan instrumentation
-set(CMAKE_CXX_FLAGS "-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -I /usr/local/include/c++/v1 -fsanitize=undefined -fsanitize=fuzzer-no-link -stdlib=libc++" CACHE STRING "Custom compilation flags" FORCE)
-# Link statically against boost libraries
-set(BOOST_FOUND ON CACHE BOOL "" FORCE)
-set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Link against static Boost libraries" FORCE)
-set(Boost_USE_STATIC_RUNTIME ON CACHE BOOL "Link against static Boost runtime library" FORCE)
diff --git a/cmake/toolchains/ossfuzz.cmake b/cmake/toolchains/ossfuzz.cmake
deleted file mode 100644
index fb7b8d0b36cb..000000000000
--- a/cmake/toolchains/ossfuzz.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-# Inherit default options
-include("${CMAKE_CURRENT_LIST_DIR}/default.cmake")
-# Disable CVC4 and Z3.
-set(USE_CVC4 OFF CACHE BOOL "Disable CVC4" FORCE)
-set(USE_Z3 OFF CACHE BOOL "Disable Z3" FORCE)
-# Enable fuzzers
-set(OSSFUZZ ON CACHE BOOL "Enable fuzzer build" FORCE)
-set(LIB_FUZZING_ENGINE $ENV{LIB_FUZZING_ENGINE} CACHE STRING "Use fuzzer back-end defined by environment variable" FORCE)
-# Link statically against boost libraries
-set(BOOST_FOUND ON CACHE BOOL "" FORCE)
-set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Link against static Boost libraries" FORCE)
-set(Boost_USE_STATIC_RUNTIME ON CACHE BOOL "Link against static Boost runtime library" FORCE)
diff --git a/codecov.yml b/codecov.yml
deleted file mode 100644
index c0b72761e411..000000000000
--- a/codecov.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-codecov:
-  branch: develop
-coverage:
-  range: 70...100
-  status:
-    patch:
-      default:
-        target: "50%"
-        paths: "!test/"
-    project:
-      default:
-        target: auto
-        paths: "!test/"
-      syntax:
-        target: auto
-        paths: "libsolidity/analysis"
-        flags: syntax
-      tests:
-        target: auto
-        paths: "test/"
-comment:
-  layout: "reach, diff, flags"
diff --git a/docs/050-breaking-changes.rst b/docs/050-breaking-changes.rst
index a40bbcf6e9d8..e79aba14fd88 100644
--- a/docs/050-breaking-changes.rst
+++ b/docs/050-breaking-changes.rst
@@ -1,152 +1,142 @@
 ********************************
-Solidity v0.5.0 Breaking Changes
+Solidity v0.5.0 �破性�化
 ********************************
 
-This section highlights the main breaking changes introduced in Solidity
-version 0.5.0, along with the reasoning behind the changes and how to update
-affected code.
-For the full list check
-`the release changelog <https://github.com/ethereum/solidity/releases/tag/v0.5.0>`_.
+本节强调了 Solidity 0.5.0 版本中引入的主��破性�化，
+以�这些�化背�的原因和如何更新�影�的代�。
+对于完整的列表，请查看 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.5.0>`_。
 
 .. note::
-   Contracts compiled with Solidity v0.5.0 can still interface with contracts
-   and even libraries compiled with older versions without recompiling or
-   redeploying them.  Changing the interfaces to include data locations and
-   visibility and mutability specifiers suffices. See the
-   :ref:`Interoperability With Older Contracts <interoperability>` section below.
+   用 Solidity v0.5.0 编译的�约�然�以与�约甚至用旧版本编译的库对接，
+   而无需�新编译或�新部署。
+   将接�更改为包�数��置，��性和��性说明符就足够了。
+   ��下�的 :ref:`与旧�约的互�作性 <interoperability>` 部分。
 
-Semantic Only Changes
+仅有语义上的�化
 =====================
 
-This section lists the changes that are semantic-only, thus potentially
-hiding new and different behavior in existing code.
+本节仅列出了语义的�化，因此有�能在现有代�中��新的且��的行为。
 
-* Signed right shift now uses proper arithmetic shift, i.e. rounding towards
-  negative infinity, instead of rounding towards zero.  Signed and unsigned
-  shift will have dedicated opcodes in Constantinople, and are emulated by
-  Solidity for the moment.
+* 有符�的�移现在使用正确的算术移�，��负无穷大�整，而�是�零�整。
+  有符�和无符�移�在 �士��堡（Constantinople）版本将有专门的�作�，
+  目�由Solidity模拟。
 
-* The ``continue`` statement in a ``do...while`` loop now jumps to the
-  condition, which is the common behavior in such cases. It used to jump to the
-  loop body. Thus, if the condition is false, the loop terminates.
+* 在 ``do...while`` 循环中的 ``continue`` 语�现在跳转到�件，这是在这�情况下的常�行为。
+  以�是跳到循环主体。因此，如果�件是�的，循环就终止了。
 
-* The functions ``.call()``, ``.delegatecall()`` and ``.staticcall()`` do not
-  pad anymore when given a single ``bytes`` parameter.
+* 函数 ``.call()``， ``.delegatecall()`` 和 ``.staticcall()`` 在给定一个 ``bytes`` �数时，
+  ��进行填充。
 
-* Pure and view functions are now called using the opcode ``STATICCALL``
-  instead of ``CALL`` if the EVM version is Byzantium or later. This
-  disallows state changes on the EVM level.
+* 如果EVM的版本是 拜�庭（Byzantium） 或更高版本，
+  现在调用 pure 和 view 函数时使用�作� ``STATICCALL`` 而�是 ``CALL``。
+  这��许在EVM层�上改�状�。
 
-* The ABI encoder now properly pads byte arrays and strings from calldata
-  (``msg.data`` and external function parameters) when used in external
-  function calls and in ``abi.encode``. For unpadded encoding, use
-  ``abi.encodePacked``.
+* 当在外部函数调用和 ``abi.encode`` 中使用时，
+  ABI编�器现在�以正确地对�自 calldata（ ``msg.data`` 和外部函数�数）的字节数组和字符串进行填充。
+  对于未填充的编�，请使用 ``abi.encodePacked``。
 
-* The ABI decoder reverts in the beginning of functions and in
-  ``abi.decode()`` if passed calldata is too short or points out of bounds.
-  Note that dirty higher order bits are still simply ignored.
+* 如果传入的 calldata 太短或指�界外，ABI解�器会在函数的开头和 ``abi.decode()`` 中回退。
+  注�，�的高阶��然会被忽略。
 
-* Forward all available gas with external function calls starting from
-  Tangerine Whistle.
+* 从蜜桔�哨（Tangerine Whistle）开始，用外部功能调用转�所有�用气体。
 
-Semantic and Syntactic Changes
+语义和语法的�化
 ==============================
 
-This section highlights changes that affect syntax and semantics.
-
-* The functions ``.call()``, ``.delegatecall()``, ``staticcall()``,
-  ``keccak256()``, ``sha256()`` and ``ripemd160()`` now accept only a single
-  ``bytes`` argument. Moreover, the argument is not padded. This was changed to
-  make more explicit and clear how the arguments are concatenated. Change every
-  ``.call()`` (and family) to a ``.call("")`` and every ``.call(signature, a,
-  b, c)`` to use ``.call(abi.encodeWithSignature(signature, a, b, c))`` (the
-  last one only works for value types).  Change every ``keccak256(a, b, c)`` to
-  ``keccak256(abi.encodePacked(a, b, c))``. Even though it is not a breaking
-  change, it is suggested that developers change
-  ``x.call(bytes4(keccak256("f(uint256)")), a, b)`` to
-  ``x.call(abi.encodeWithSignature("f(uint256)", a, b))``.
-
-* Functions ``.call()``, ``.delegatecall()`` and ``.staticcall()`` now return
-  ``(bool, bytes memory)`` to provide access to the return data.  Change
-  ``bool success = otherContract.call("f")`` to ``(bool success, bytes memory
-  data) = otherContract.call("f")``.
-
-* Solidity now implements C99-style scoping rules for function local
-  variables, that is, variables can only be used after they have been
-  declared and only in the same or nested scopes. Variables declared in the
-  initialization block of a ``for`` loop are valid at any point inside the
-  loop.
-
-Explicitness Requirements
-=========================
+本节�点介�影�语法和语义的�化。
+
+* 函数 ``.call()``， ``.delegatecall()``， ``staticcall()``， ``keccak256()``， ``sha256()``
+  和 ``ripemd160()`` 现在�接�一个 ``bytes`` �数。此外，该�数没有被填充。
+  这样�是为了使�数的连接方�更加明确和清晰。
+  将�个 ``.call()`` (和家�)改为 ``.call("")``，
+  将�个 ``.call(signature, a,b, c)`` 改为 ``.call(abi.encodeWithSignature(signature, a, b, c))``
+  （最�一项�对值类型有效）。
+  将�个 ``keccak256(a, b, c)`` 改为 ``keccak256(abi.encodePacked(a, b, c))``。
+  尽管这�是一个�破性的改�，建议开�者将 ``x.call(bytes4(keccak256("f(uint256)")), a, b)``
+  改为 ``x.call(abi.encodeWithSignature("f(uint256)", a, b))``。
+
+* 函数 ``.call()``， ``.delegatecall()`` 和 ``.staticcall()``
+  现在返回 ``(bool, bytes memory)`` 以�供对返回数�的访问。
+  将 ``bool success = otherContract.call("f")`` 改为
+  ``(bool success, bytes memory data) = otherContract.call("f")``。
 
-This section lists changes where the code now needs to be more explicit.
-For most of the topics the compiler will provide suggestions.
-
-* Explicit function visibility is now mandatory.  Add ``public`` to every
-  function and constructor, and ``external`` to every fallback or interface
-  function that does not specify its visibility already.
-
-* Explicit data location for all variables of struct, array or mapping types is
-  now mandatory. This is also applied to function parameters and return
-  variables.  For example, change ``uint[] x = z`` to ``uint[] storage x =
-  z``, and ``function f(uint[][] x)`` to ``function f(uint[][] memory x)``
-  where ``memory`` is the data location and might be replaced by ``storage`` or
-  ``calldata`` accordingly.  Note that ``external`` functions require
-  parameters with a data location of ``calldata``.
-
-* Contract types do not include ``address`` members anymore in
-  order to separate the namespaces.  Therefore, it is now necessary to
-  explicitly convert values of contract type to addresses before using an
-  ``address`` member.  Example: if ``c`` is a contract, change
-  ``c.transfer(...)`` to ``address(c).transfer(...)``,
-  and ``c.balance`` to ``address(c).balance``.
-
-* Explicit conversions between unrelated contract types are now disallowed. You can only
-  convert from a contract type to one of its base or ancestor types. If you are sure that
-  a contract is compatible with the contract type you want to convert to, although it does not
-  inherit from it, you can work around this by converting to ``address`` first.
-  Example: if ``A`` and ``B`` are contract types, ``B`` does not inherit from ``A`` and
-  ``b`` is a contract of type ``B``, you can still convert ``b`` to type ``A`` using ``A(address(b))``.
-  Note that you still need to watch out for matching payable fallback functions, as explained below.
-
-* The ``address`` type  was split into ``address`` and ``address payable``,
-  where only ``address payable`` provides the ``transfer`` function.  An
-  ``address payable`` can be directly converted to an ``address``, but the
-  other way around is not allowed. Converting ``address`` to ``address
-  payable`` is possible via conversion through ``uint160``. If ``c`` is a
-  contract, ``address(c)`` results in ``address payable`` only if ``c`` has a
-  payable fallback function. If you use the :ref:`withdraw pattern<withdrawal_pattern>`,
-  you most likely do not have to change your code because ``transfer``
-  is only used on ``msg.sender`` instead of stored addresses and ``msg.sender``
-  is an ``address payable``.
-
-* Conversions between ``bytesX`` and ``uintY`` of different size are now
-  disallowed due to ``bytesX`` padding on the right and ``uintY`` padding on
-  the left which may cause unexpected conversion results.  The size must now be
-  adjusted within the type before the conversion.  For example, you can convert
-  a ``bytes4`` (4 bytes) to a ``uint64`` (8 bytes) by first converting the
-  ``bytes4`` variable to ``bytes8`` and then to ``uint64``. You get the
-  opposite padding when converting through ``uint32``. Before v0.5.0 any
-  conversion between ``bytesX`` and ``uintY`` would go through ``uint8X``. For
-  example ``uint8(bytes3(0x291807))`` would be converted to ``uint8(uint24(bytes3(0x291807)))``
-  (the result is ``0x07``).
-
-* Using ``msg.value`` in non-payable functions (or introducing it via a
-  modifier) is disallowed as a security feature. Turn the function into
-  ``payable`` or create a new internal function for the program logic that
-  uses ``msg.value``.
+* Solidity 现在为函数局部��实现了C99风格的范围规则，
+  也就是说，���能在它们被声明�使用，并且�能在相�或嵌套的范围内使用。
+  在 ``for`` 循环的�始化�中声明的��在循环内部的任何一点都是有效的。
 
+明确性�求
+=========================
+
+本节列出了现在的代�需�更加明确的�化。
+对于大多数的主题，编译器会�供建议。
+
+* 明确的函数��性现在是强制性的。 在�个函数和构造函数中添加 ``public``，
+  在�个未指定��性的回退或接�函数中添加 ``external``。
+
+* 所有结构，数组或映射类型的��的明确数��置现在是强制性的。
+  这也适用于函数�数和返回��。 例如，将 ``uint[] x = z`` 改为 ``uint[] storage x = z``，
+  将 ``function f(uint[] [] x)`` 改为 ``function f(uint[] [] memory x)``，
+  其中 ``memory`` 是数��置，�以相应地替�为 ``storage`` 或 ``calldata``。
+  注�， ``external`` 函数�求�数的数��置为 ``calldata``。
+
+* �约类型��包括 ``address`` �员，以便分离命�空间。
+  因此，现在有必�在使用 ``address`` �员之�，明确地将�约类型的值转�为地�。
+  例如：如果 ``c`` 是一个�约，把 ``c.transfer(...)`` 改为 ``address(c).transfer(...)``，
+  把  ``c.balance`` 改为 ``address(c).balance``。
+
+* 现在��许在�相关的�约类型之间进行显�的转�。您�能从一个�约类型转�到它的一个基础或祖先类型。
+  如果您确定一个�约与您想转�的�约类型是兼容的，尽管它没有继承它，
+  您�以通过先转�为 ``address`` �解决这个问题。
+  例如：如果 ``A`` 和 ``B`` 是�约类型， ``B`` �继承 ``A``，而 ``b`` 是 ``B`` 类型的�约，
+  您�然�以用 ``A(address(b))`` 将 ``b`` 转�� ``A`` 类型。
+  请注�，您�然需�注�匹�的payable修饰的回退函数，如下文所述。
+
+* ``address`` 类型被分� ``address`` 和 ``address payable``，
+  其中�有 ``address payable`` �供 ``transfer`` 功能。
+  一个 ``address payable`` �以直接转�为 ``address``，
+  但��许以其他方�转�。将 ``address`` 转�为 ``address payable`` 是�以通过 ``uint160`` 转�的。
+  如果 ``c`` 是一个�约， �有当 ``c`` 有一个 payable 修饰的回退函数时，
+  ``address(c)`` 的结果是 ``address payable``。
+  如果您使用 :ref:`�回模� <withdrawal_pattern>`，您很�能�必改�您的代�，
+  因为 ``transfer`` �用于 ``msg.sender`` 而�是存储地�，
+  而且 ``msg.sender`` 是一个 ``address payable`` 类型。
+
+* 现在��许���数的 ``bytesX`` 和 ``uintY`` 之间的转�了，
+  因为 ``bytesX`` 会在�侧填充， ``uintY`` 会在左侧填充，这�能导致�外的转�结果。
+  现在在转��必须在类型内调整�数。 例如，
+  您想�将 ``bytes4`` （4字节）转�为 ``uint64`` （8字节），
+  首先将 ``bytes4`` ��转�为 ``bytes8``，然��转�为 ``uint64``。
+  当通过 ``uint32`` 转�时，您会得到相�的填充结果。
+  在v0.5.0之�，任何 ``bytesX`` 和 ``uintY`` 之间的转�都�通过 ``uint8X``。
+  例如， ``uint8(bytes3(0x291807))`` 将被转�为 ``uint8(uint24(bytes3(0x291807)))``
+  （结果是 ``0x07``）。
+
+* 在�payable函数中使用 ``msg.value`` （或通过修改器引入）是��许的，因为这是一个安全特性。
+  将该函数�� ``payable``，或为程�逻辑创建一个新的内部函数，使用 ``msg.value``。
+
+<<<<<<< HEAD
+* 为了清晰起�，如果使用标准输入作为�，命令行界�现在需� ``-``。
+=======
 * For clarity reasons, the command-line interface now requires ``-`` if the
   standard input is used as source.
+>>>>>>> english/develop
 
-Deprecated Elements
+废弃的元素
 ===================
 
-This section lists changes that deprecate prior features or syntax.  Note that
-many of these changes were already enabled in the experimental mode
-``v0.5.0``.
+这一节列出了废弃以�的功能或语法的�化。 请注�，其中许多�化已�在实验模� ``v0.5.0`` 中�用。
 
+<<<<<<< HEAD
+命令行和JSON接�
+--------------------------------
+
+* 命令行选项 ``--formal`` （用于生�Why3输出以进一步形�化验�）已被废弃，现在已被删除。
+  一个新的形�化验�模�，SMTChecker，�以通过 ``pragma experimental SMTChecker;`` �用。
+
+* 由于中间语言 ``Julia`` 更�为 ``Yul``，命令行选项 ``--julia`` 被更�为 ``--yul``。
+
+* 删除了 ``--clone-bin`` 和 ``--combined-json clone-bin`` 命令行选项。
+=======
 Command-line and JSON Interfaces
 --------------------------------
 
@@ -160,145 +150,126 @@ Command-line and JSON Interfaces
 
 * The ``--clone-bin`` and ``--combined-json clone-bin`` command-line options
   were removed.
+>>>>>>> english/develop
 
-* Remappings with empty prefix are disallowed.
+* ��许使用空�缀的�映射。
 
-* The JSON AST fields ``constant`` and ``payable`` were removed. The
-  information is now present in the ``stateMutability`` field.
+* JSON AST字段 ``constant`` 和 ``payable`` 被删除。
+  这些信�现在出现在 ``stateMutability`` 字段中。
 
-* The JSON AST field ``isConstructor`` of the ``FunctionDefinition``
-  node was replaced by a field called ``kind`` which can have the
-  value ``"constructor"``, ``"fallback"`` or ``"function"``.
+* ``FunctionDefinition`` 节点的JSON AST字段 ``isConstructor`` 被一个�为 ``kind`` 的字段�代，
+  该字段的值�以是  ``"constructor"``， ``"fallback"`` 或 ``"function"``。
 
-* In unlinked binary hex files, library address placeholders are now
-  the first 36 hex characters of the keccak256 hash of the fully qualified
-  library name, surrounded by ``$...$``. Previously,
-  just the fully qualified library name was used.
-  This reduces the chances of collisions, especially when long paths are used.
-  Binary files now also contain a list of mappings from these placeholders
-  to the fully qualified names.
+* 在�链接的二进制�六进制文件中，库地���符现在是完全等�的库�的keccak256哈希值的�36个�六进制字符，
+  用 ``$...$`` 包围。以�，�使用完全等�的库�。这�少了碰撞的机会，特别是在使用长路径的时候。
+  二进制文件现在也包�一个从这些��符到完全等��称的映射列表。
 
-Constructors
+构造函数
 ------------
 
-* Constructors must now be defined using the ``constructor`` keyword.
+* 现在必须使用 ``constructor`` 关键字�定义构造函数。
 
-* Calling base constructors without parentheses is now disallowed.
+* 现在��许在没有括�的情况下调用基本构造函数。
 
-* Specifying base constructor arguments multiple times in the same inheritance
-  hierarchy is now disallowed.
+* 现在��许在�一继承层次中多次指定基本构造函数�数。
 
-* Calling a constructor with arguments but with wrong argument count is now
-  disallowed.  If you only want to specify an inheritance relation without
-  giving arguments, do not provide parentheses at all.
+* 现在��许调用有�数但�数个数错误的构造函数。
+  如果您�是想指定一个继承关系而�是给�数，完全���供括�。
 
-Functions
+函数
 ---------
 
-* Function ``callcode`` is now disallowed (in favor of ``delegatecall``). It
-  is still possible to use it via inline assembly.
+* 函数 ``callcode`` 现在被�止使用（改用 ``delegatecall``）。
+  但�然�以通过内�汇编使用它。
 
-* ``suicide`` is now disallowed (in favor of ``selfdestruct``).
+* 现在��许使用 ``suicide`` （改用 ``selfdestruct``）。
 
-* ``sha3`` is now disallowed (in favor of ``keccak256``).
+* 现在��许使用 ``sha3`` （改用 ``keccak256``）。
 
-* ``throw`` is now disallowed (in favor of ``revert``, ``require`` and
-  ``assert``).
+* 现在��许使用 ``throw`` （改用 ``revert``， ``require`` 和 ``assert``）。
 
-Conversions
+转�
 -----------
 
-* Explicit and implicit conversions from decimal literals to ``bytesXX`` types
-  is now disallowed.
+* 现在��许从数字到 ``bytesXX`` 类型的显性和�性转�。
 
-* Explicit and implicit conversions from hex literals to ``bytesXX`` types
-  of different size is now disallowed.
+* 现在��许从�六进制字数到��大�的 ``bytesXX`` 类型的显性和�性转�。
 
-Literals and Suffixes
+字�常�和�缀
 ---------------------
 
-* The unit denomination ``years`` is now disallowed due to complications and
-  confusions about leap years.
+* 由于闰年的��性和混乱性，现在��许使用���称 ``years``。
 
-* Trailing dots that are not followed by a number are now disallowed.
+* 现在��许出现��没有数字的尾部圆点。
 
-* Combining hex numbers with unit denominations (e.g. ``0x1e wei``) is now
-  disallowed.
+* 现在��许将�六进制数字与��值相结�（例如： ``0x1e wei``）。
 
-* The prefix ``0X`` for hex numbers is disallowed, only ``0x`` is possible.
+* �六进制数字的�缀 ``0X`` 是��许的，�能是 ``0x``。
 
-Variables
+��
 ---------
 
-* Declaring empty structs is now disallowed for clarity.
+* 为了清晰起�，现在��许声明空结构。
 
-* The ``var`` keyword is now disallowed to favor explicitness.
+* 现在��许使用 ``var`` 关键字，以利于明确性。
 
-* Assignments between tuples with different number of components is now
-  disallowed.
+* 现在��许在具有��组件数�的元组之间进行分�。
 
-* Values for constants that are not compile-time constants are disallowed.
+* ��许使用�属于编译时常�的常�值。
 
-* Multi-variable declarations with mismatching number of values are now
-  disallowed.
+* 现在��许出现数值�匹�的多��声明。
 
-* Uninitialized storage variables are now disallowed.
+* 现在��许出现未�始化的存储��。
 
-* Empty tuple components are now disallowed.
+* 现在��许使用空元组。
 
-* Detecting cyclic dependencies in variables and structs is limited in
-  recursion to 256.
+* 检测��和结构中的循环�赖关系，在递归中被�制为256个。
 
-* Fixed-size arrays with a length of zero are now disallowed.
+* 现在��许长度为零的固定长度数组。
 
-Syntax
+语法
 ------
 
-* Using ``constant`` as function state mutability modifier is now disallowed.
+* 现在��许使用 ``constant`` 作为函数状�的��性修饰符。
 
-* Boolean expressions cannot use arithmetic operations.
+* 布尔表达��能使用算术�算。
 
-* The unary ``+`` operator is now disallowed.
+* 现在��许使用�数的 ``+`` �作符。
 
-* Literals cannot anymore be used with ``abi.encodePacked`` without prior
-  conversion to an explicit type.
+* 如果没有事先转�为明确的类型，字���能�使用 ``abi.encodePacked``。
 
-* Empty return statements for functions with one or more return values are now
-  disallowed.
+* 现在��许有一个或多个返回值的函数的空返回语�。
 
-* The "loose assembly" syntax is now disallowed entirely, that is, jump labels,
-  jumps and non-functional instructions cannot be used anymore. Use the new
-  ``while``, ``switch`` and ``if`` constructs instead.
+* 现在完全��许使用 "�散汇编" 语法，也就是说，
+  �能�使用跳转标签，跳转和�功能指令。使用新的 ``while``， ``switch`` 和 ``if`` 结构代替。
 
-* Functions without implementation cannot use modifiers anymore.
+* 没有实现的函数�能�使用修改器。
 
-* Function types with named return values are now disallowed.
+* 现在��许具有命�返回值的函数类型。
 
-* Single statement variable declarations inside if/while/for bodies that are
-  not blocks are now disallowed.
+* 现在��许在�是程��的 if/while/for 语�体中进行�语���声明。
 
-* New keywords: ``calldata`` and ``constructor``.
+* 新的关键字： ``calldata`` 和 ``constructor``。
 
-* New reserved keywords: ``alias``, ``apply``, ``auto``, ``copyof``,
-  ``define``, ``immutable``, ``implements``, ``macro``, ``mutable``,
-  ``override``, ``partial``, ``promise``, ``reference``, ``sealed``,
-  ``sizeof``, ``supports``, ``typedef`` and ``unchecked``.
+* 新的�留关键字： ``alias``， ``apply``， ``auto``， ``copyof``，
+  ``define``， ``immutable``， ``implements``， ``macro``， ``mutable``，
+  ``override``， ``partial``， ``promise``， ``reference``， ``sealed``，
+  ``sizeof``， ``supports``， ``typedef`` 和 ``unchecked``。
 
 .. _interoperability:
 
-Interoperability With Older Contracts
+与旧�约的互�作性
 =====================================
 
-It is still possible to interface with contracts written for Solidity versions prior to
-v0.5.0 (or the other way around) by defining interfaces for them.
-Consider you have the following pre-0.5.0 contract already deployed:
+通过为它们定义接�，�然�以与为0.5.0之�的Solidity版本编写的�于对接（或者�过�）。
+考虑到您已�部署了以下0.5.0之�的�约：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.4.25;
-    // This will report a warning until version 0.4.25 of the compiler
-    // This will not compile after 0.5.0
+    // 在0.4.25版本的编译器之�，这将报告一个警告
+    // 这在0.5.0之�将无法编译。
     contract OldContract {
         function someOldFunction(uint8 a) {
             //...
@@ -309,7 +280,7 @@ Consider you have the following pre-0.5.0 contract already deployed:
         // ...
     }
 
-This will no longer compile with Solidity v0.5.0. However, you can define a compatible interface for it:
+这将��在Solidity 0.5.0版本中进行编译。然而，您�以为它定义一个兼容的接�：
 
 .. code-block:: solidity
 
@@ -320,14 +291,14 @@ This will no longer compile with Solidity v0.5.0. However, you can define a comp
         function anotherOldFunction() external returns (bool);
     }
 
-Note that we did not declare ``anotherOldFunction`` to be ``view``, despite it being declared ``constant`` in the original
-contract. This is due to the fact that starting with Solidity v0.5.0 ``staticcall`` is used to call ``view`` functions.
-Prior to v0.5.0 the ``constant`` keyword was not enforced, so calling a function declared ``constant`` with ``staticcall``
-may still revert, since the ``constant`` function may still attempt to modify storage. Consequently, when defining an
-interface for older contracts, you should only use ``view`` in place of ``constant`` in case you are absolutely sure that
-the function will work with ``staticcall``.
+请注�，我们没有声明 ``anotherOldFunction`` 是 ``view``，尽管它在原始�约中被声明为 ``constant``。
+这是由于从Solidity 0.5.0版本开始，``staticcall`` 被用�调用 ``view`` 函数。
+在 0.5.0 版本之�， ``constant`` 关键字没有被强制执行，
+所以用 ``staticcall`` 调用一个被声明为 ``constant`` 的函数�然�能被还原，
+因为 ``constant`` 函数�然�能试图修改存储。因此，当为旧�约定义接�时，
+您应该�使用 ``view`` �代替 ``constant``，以防您�对确定该函数能与 ``staticcall`` 一起工作。
 
-Given the interface defined above, you can now easily use the already deployed pre-0.5.0 contract:
+有了上�定义的接�，您现在�以很容易地使用已�部署的 0.5.0 之�的�约：
 
 .. code-block:: solidity
 
@@ -346,13 +317,13 @@ Given the interface defined above, you can now easily use the already deployed p
         }
     }
 
-Similarly, pre-0.5.0 libraries can be used by defining the functions of the library without implementation and
-supplying the address of the pre-0.5.0 library during linking (see :ref:`commandline-compiler` for how to use the
-commandline compiler for linking):
+�样，0.5.0以�的库�以通过定义库的功能而�需�实现，
+并在连接时�供0.5.0以�的库的地��使用
+（关于如何使用命令行编译器进行连接，请�� :ref:`commandline-compiler`）。
 
 .. code-block:: solidity
 
-    // This will not compile after 0.6.0
+    // 这在0.6.0版本之�将无法编译。
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.5.0;
 
@@ -367,11 +338,10 @@ commandline compiler for linking):
     }
 
 
-Example
+示例
 =======
 
-The following example shows a contract and its updated version for Solidity
-v0.5.0 with some of the changes listed in this section.
+下�的例�显示了Solidity 0.5.0 版本的�约�其更新版本，其中包括本节中列出的一些�化。
 
 Old version:
 
@@ -379,7 +349,7 @@ Old version:
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.4.25;
-    // This will not compile after 0.5.0
+    // 这在0.5.0版本之�将无法编译。
 
     contract OtherContract {
         uint x;
@@ -393,56 +363,56 @@ Old version:
         OtherContract other;
         uint myNumber;
 
-        // Function mutability not provided, not an error.
+        // 没有�供函数的��性，�是错误。
         function someInteger() internal returns (uint) { return 2; }
 
-        // Function visibility not provided, not an error.
-        // Function mutability not provided, not an error.
+        // 没有�供函数的��性，�是错误。
+        // 没有�供函数的��性，�是错误。
         function f(uint x) returns (bytes) {
-            // Var is fine in this version.
+            // 在这个版本中，var是�以使用的。
             var z = someInteger();
             x += z;
-            // Throw is fine in this version.
+            // 在这个版本中，throw是�以使用的。
             if (x > 100)
                 throw;
             bytes memory b = new bytes(x);
             y = -3 >> 1;
-            // y == -1 (wrong, should be -2)
+            // y == -1（错，应该是-2）。
             do {
                 x += 1;
                 if (x > 10) continue;
-                // 'Continue' causes an infinite loop.
+                // 'Continue' 会导致无�循环。
             } while (x < 11);
-            // Call returns only a Bool.
+            // 调用�返回一个布尔值。
             bool success = address(other).call("f");
             if (!success)
                 revert();
             else {
-                // Local variables could be declared after their use.
+                // 局部���以在其使用�声明。
                 int y;
             }
             return b;
         }
 
-        // No need for an explicit data location for 'arr'
+        //�需�为'arr'设置明确的数��置
         function g(uint[] arr, bytes8 x, OtherContract otherContract) public {
             otherContract.transfer(1 ether);
 
-            // Since uint32 (4 bytes) is smaller than bytes8 (8 bytes),
-            // the first 4 bytes of x will be lost. This might lead to
-            // unexpected behavior since bytesX are right padded.
+            // 由于uint32（4个字节）�于byte8（8个字节），
+            // x的�4个字节将被丢失。
+            // 这�能会导致�想�到的行为，因为bytesX是��填充的。
             uint32 y = uint32(x);
             myNumber += y + msg.value;
         }
     }
 
-New version:
+新版本：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.5.0;
-    // This will not compile after 0.6.0
+    // 这在0.6.0版本之�将无法编译。
 
     contract OtherContract {
         uint x;
@@ -456,27 +426,27 @@ New version:
         OtherContract other;
         uint myNumber;
 
-        // Function mutability must be specified.
+        // 必须指定函数的��性。
         function someInteger() internal pure returns (uint) { return 2; }
 
-        // Function visibility must be specified.
-        // Function mutability must be specified.
+        // 必须指定函数的��性。
+        // 必须指定函数的��性。
         function f(uint x) public returns (bytes memory) {
-            // The type must now be explicitly given.
+            // 现在必须明确地给出类型。
             uint z = someInteger();
             x += z;
-            // Throw is now disallowed.
+            // 现在��许使用throw。
             require(x <= 100);
             int y = -3 >> 1;
             require(y == -2);
             do {
                 x += 1;
                 if (x > 10) continue;
-                // 'Continue' jumps to the condition below.
+                // 'Continue'跳转到下�的�件。
             } while (x < 11);
 
-            // Call returns (bool, bytes).
-            // Data location must be specified.
+            // call返回值为(bool, bytes).
+            // 必须指定数��置。
             (bool success, bytes memory data) = address(other).call("f");
             if (!success)
                 revert();
@@ -484,38 +454,35 @@ New version:
         }
 
         using AddressMakePayable for address;
-        // Data location for 'arr' must be specified
+        // 必须指定'arr'的数��置
         function g(uint[] memory /* arr */, bytes8 x, OtherContract otherContract, address unknownContract) public payable {
-            // 'otherContract.transfer' is not provided.
-            // Since the code of 'OtherContract' is known and has the fallback
-            // function, address(otherContract) has type 'address payable'.
+            // 没有�供'otherContract.transfer'。
+            // 由于'OtherContract'的代�是已知的，并且具有回退功能，
+            // address(otherContract)具有'address payable'类型。
             address(otherContract).transfer(1 ether);
 
-            // 'unknownContract.transfer' is not provided.
-            // 'address(unknownContract).transfer' is not provided
-            // since 'address(unknownContract)' is not 'address payable'.
-            // If the function takes an 'address' which you want to send
-            // funds to, you can convert it to 'address payable' via 'uint160'.
-            // Note: This is not recommended and the explicit type
-            // 'address payable' should be used whenever possible.
-            // To increase clarity, we suggest the use of a library for
-            // the conversion (provided after the contract in this example).
+            // 没有�供'unknownContract.transfer'。
+            // 没有�供'address(unknownContract).transfer'
+            // 因为'address(unknownContract)'�是'address payable'类型。
+            // 如果该函数需�一个您想��资金的'address'类型，
+            // 您�以通过'uint160'将其转�为'address payable'类型。
+            // 注�：�建议这样�，应尽�能使用明确的'address payable'类型。
+            // 为了�高明确性，我们建议使用一个库�进行转�（在这个例�中的�����供）。
             address payable addr = unknownContract.makePayable();
             require(addr.send(1 ether));
 
-            // Since uint32 (4 bytes) is smaller than bytes8 (8 bytes),
-            // the conversion is not allowed.
-            // We need to convert to a common size first:
+            // 由于uint32（4字节）�于bytes8（8字节），
+            // 所以��许进行转�。
+            // 我们需�先转�到一个通用的大�：
             bytes4 x4 = bytes4(x); // Padding happens on the right
             uint32 y = uint32(x4); // Conversion is consistent
-            // 'msg.value' cannot be used in a 'non-payable' function.
-            // We need to make the function payable
+            // 'msg.value'�能用在'�payable'类型的函数中。
+            // 我们需�把函数��payable类型
             myNumber += y + msg.value;
         }
     }
 
-    // We can define a library for explicitly converting ``address``
-    // to ``address payable`` as a workaround.
+    // 我们�以定义一个库，将 ``address`` 类型明确转�为 ``address payable`` 类型，作为一��通方法。
     library AddressMakePayable {
         function makePayable(address x) internal pure returns (address payable) {
             return address(uint160(x));
diff --git a/docs/060-breaking-changes.rst b/docs/060-breaking-changes.rst
index e7c93057f62a..ee29e1cca9db 100644
--- a/docs/060-breaking-changes.rst
+++ b/docs/060-breaking-changes.rst
@@ -1,181 +1,188 @@
 ********************************
-Solidity v0.6.0 Breaking Changes
+Solidity 0.6.0 版本�破性�化
 ********************************
 
-This section highlights the main breaking changes introduced in Solidity
-version 0.6.0, along with the reasoning behind the changes and how to update
-affected code.
-For the full list check
-`the release changelog <https://github.com/ethereum/solidity/releases/tag/v0.6.0>`_.
+本节强调了 Solidity 0.6.0 版本中引入的主��破性�化，以�这些�化背�的原因和如何更新�影�的代�。
+对于完整的列表，请查看 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.6.0>`_。
 
 
-Changes the Compiler Might not Warn About
+编译器�能�会�出警告的�化
 =========================================
 
+<<<<<<< HEAD
+本节列出了一些�化，在这些�化中，您的代�的行为�能会�生�化，而编译器�会告诉您。
+=======
 This section lists changes where the behavior of your code might
 change without the compiler telling you about it.
+>>>>>>> english/develop
 
-* The resulting type of an exponentiation is the type of the base. It used to be the smallest type
-  that can hold both the type of the base and the type of the exponent, as with symmetric
-  operations. Additionally, signed types are allowed for the base of the exponentiation.
+* 指数�算的结果类型是基数的类型。
+  就�对称�算一样，它曾�是�以�时容纳基数类型和指数类型的最�类型。
+  此外，指数化的基数�许是有符�的类型。
 
-
-Explicitness Requirements
+显性�求
 =========================
 
-This section lists changes where the code now needs to be more explicit,
-but the semantics do not change.
-For most of the topics the compiler will provide suggestions.
+这一节列出了代�现在需�更显�的更改，但是语义没有改�。
+对于大多数主题，编译器会�供建议。
 
-* Functions can now only be overridden when they are either marked with the
-  ``virtual`` keyword or defined in an interface. Functions without
-  implementation outside an interface have to be marked ``virtual``.
-  When overriding a function or modifier, the new keyword ``override``
-  must be used. When overriding a function or modifier defined in multiple
-  parallel bases, all bases must be listed in parentheses after the keyword
-  like so: ``override(Base1, Base2)``.
+* 现在，�有当函数被标记为 ``virtual`` 关键字或被定义在一个接�中时，�能被�载。
+  在接�之外没有实现的函数必须被标记为 ``virtual``。
+  当�载一个函数或修改器时，必须使用新的关键字 ``override``。
+  当�载一个定义在多个并行基类的函数或修改器时，所有基必须在关键字��的括�中列出，
+  �这样： ``override(Base1, Base2)``。
 
-* Member-access to ``length`` of arrays is now always read-only, even for storage arrays. It is no
-  longer possible to resize storage arrays by assigning a new value to their length. Use ``push()``,
-  ``push(value)`` or ``pop()`` instead, or assign a full array, which will of course overwrite the existing content.
-  The reason behind this is to prevent storage collisions of gigantic
-  storage arrays.
+* �员对数组的 ``length`` 的访问现在总是�读的，�使是存储数组。
+  ���能通过给存储数组的长度分�一个新值�调整其大�。
+  使用 ``push()``， ``push(value)`` 或 ``pop()`` 代替，
+  或者分�一个完整的数组，当然这将覆盖现有内容。
+  这背�的原因是为了防止巨大的存储阵列的存储碰撞。
 
-* The new keyword ``abstract`` can be used to mark contracts as abstract. It has to be used
-  if a contract does not implement all its functions. Abstract contracts cannot be created using the ``new`` operator,
-  and it is not possible to generate bytecode for them during compilation.
+* 新的关键字 ``abstract`` �以用�标记�约为抽象的。
+  如果一个�约没有实现它的所有功能，就必须使用这个关键字。抽象�约�能用 ``new`` �作符创建，
+  在编译过程中也��能为其生�字节�。
 
-* Libraries have to implement all their functions, not only the internal ones.
+* 库�约必须实现其所有功能，而�仅仅是内部功能。
 
-* The names of variables declared in inline assembly may no longer end in ``_slot`` or ``_offset``.
+* 在内�汇编中声明的���称�能�以 ``_slot`` 或 ``_offset`` 结尾。
 
-* Variable declarations in inline assembly may no longer shadow any declaration outside the inline assembly block.
-  If the name contains a dot, its prefix up to the dot may not conflict with any declaration outside the inline
-  assembly block.
+* 内�汇编中的��声明�能�影射内�汇编�外的任何声明。
+  如果���称中包�一个点，那么它的�缀到点的部分�能与内�汇编�外的任何声明冲�。
 
-* In inline assembly, opcodes that do not take arguments are now represented as "built-in functions" instead of standalone identifiers. So ``gas`` is now ``gas()``.
+* 在内�汇编中，�带�数的�作�现在表示为“内置函数�而�是独立标识符。所以 ``gas`` 现在是 ``gas()``。
 
-* State variable shadowing is now disallowed.  A derived contract can only
-  declare a state variable ``x``, if there is no visible state variable with
-  the same name in any of its bases.
+* 现在��许影�状���。 一个派生�约�能声明一个状��� ``x``，
+  如果在它的任何基类�约中都没有��的��状���。
 
 
-Semantic and Syntactic Changes
+语义和语法�化
 ==============================
 
-This section lists changes where you have to modify your code
-and it does something else afterwards.
+这一部分列出了您必须修改您的代�，而之�它��了一些别的事情的�化。
 
-* Conversions from external function types to ``address`` are now disallowed. Instead external
-  function types have a member called ``address``, similar to the existing ``selector`` member.
+* 现在��许从外部函数类型转�为 ``address`` 类型。
+  相�，外部函数类型有一个�� ``address`` 的�员，类似于现有的 ``selector`` �员。
 
-* The function ``push(value)`` for dynamic storage arrays does not return the new length anymore (it returns nothing).
+* 动�存储数组的函数 ``push(value)`` ��返回新的长度（它什么也�返回）。
 
-* The unnamed function commonly referred to as "fallback function" was split up into a new
-  fallback function that is defined using the ``fallback`` keyword and a receive ether function
-  defined using the ``receive`` keyword.
+* 通常被称为 "回退函数" 的无�函数被拆分为一个新的回退函数，该函数使用 ``fallback`` 关键字定义，
+  并使用 ``receive`` 关键字定义一个接收以太的函数。
 
-  * If present, the receive ether function is called whenever the call data is empty (whether
-    or not ether is received). This function is implicitly ``payable``.
+  * 如果存在，�当调用数�为空时（无论是�收到以太），
+    都会调用接收以太函数 receive。此函数是��的 ``payable``。
 
-  * The new fallback function is called when no other function matches (if the receive ether
-    function does not exist then this includes calls with empty call data).
-    You can make this function ``payable`` or not. If it is not ``payable`` then transactions
-    not matching any other function which send value will revert. You should only need to
-    implement the new fallback function if you are following an upgrade or proxy pattern.
+  * 当没有其他函数匹�时，就会调用新的回退函数（如果接收以太的函数receive�存在，则包括调用数�为空的调用）。
+    您�以让这个函数是 ``payable`` 函数或�是。如果它�是 ``payable`` 函数，
+    那么�匹�任何其他��价值的函数的交易将��。
+    �有在采用�级或代�模�时，�需�实现新的回退函数。
 
 
-New Features
+新功能
 ============
 
-This section lists things that were not possible prior to Solidity 0.6.0
-or were more difficult to achieve.
+本节列出了在Solidity 0.6.0之���能实现或很难实现的事情。
 
-* The :ref:`try/catch statement <try-catch>` allows you to react on failed external calls.
-* ``struct`` and ``enum`` types can be declared at file level.
-* Array slices can be used for calldata arrays, for example ``abi.decode(msg.data[4:], (uint, uint))``
-  is a low-level way to decode the function call payload.
-* Natspec supports multiple return parameters in developer documentation, enforcing the same naming check as ``@param``.
-* Yul and Inline Assembly have a new statement called ``leave`` that exits the current function.
-* Conversions from ``address`` to ``address payable`` are now possible via ``payable(x)``, where
-  ``x`` must be of type ``address``.
+* :ref:`try/catch语� <try-catch>` �许您对失败的外部调用�出�应。
+* ``struct`` 和 ``enum`` 类型�以在文件级别声明。
+* 数组切片�以用于calldata数组，例如 ``abi.decode(msg.data[4:], (uint, uint))``
+  是对函数调用有效负载进行解�的低级方法。
+* Natspec在开�者文档中支�多个返回�数，执行与 ``@param`` 相�的命�检查。
+* Yul 和内�汇编有一个新的语�，�� ``leave``，�以退出当�函数。
+* 现在�以通过 ``payable(x)`` 将 ``address`` 转�为 ``address payable``，
+  其中 ``x`` 必须是 ``address`` 类型。
 
 
-Interface Changes
+接��化
 =================
 
+<<<<<<< HEAD
+本节列出与语言本身无关但对编译器接�有影�的更改。
+这些�能会改�您在命令行上使用编译器的方�，例如，您如何使用它的�编程接�，
+或者您如何分�它产生的输出。
+=======
 This section lists changes that are unrelated to the language itself, but that have an effect on the interfaces of
 the compiler. These may change the way how you use the compiler on the command-line, how you use its programmable
 interface, or how you analyze the output produced by it.
+>>>>>>> english/develop
 
-New Error Reporter
+新的错误报告器
 ~~~~~~~~~~~~~~~~~~
 
+<<<<<<< HEAD
+引入一个新的错误报告器，其目的是在命令行上产生更易访问的错误消�。
+它在默认情况下是�用的，但是通过 ``--old-reporter`` �以返回到弃用的旧错误报告器。
+=======
 A new error reporter was introduced, which aims at producing more accessible error messages on the command-line.
 It is enabled by default, but passing ``--old-reporter`` falls back to the deprecated old error reporter.
+>>>>>>> english/develop
 
-Metadata Hash Options
+元数�哈希选项
 ~~~~~~~~~~~~~~~~~~~~~
 
+<<<<<<< HEAD
+编译器现在默认将元数�文件的 `IPFS <https://ipfs.io/>`_ 哈希值附加到字节�的末尾
+（详� :doc:`�约元数� <metadata>` ） 文档。在0.6.0之�，
+编译器默认附加了 `Swarm <https://ethersphere.github.io/swarm-home/>`_ 哈希值，
+为了�然支�这�行为，引入了新的命令行选项 ``--metadata-hash``。
+它�许您通过传递 ``--metadata-hash`` 命令行选项的 ``ipfs`` 或 ``swarm`` 值�选择�产生和附加的哈希。
+传递 ``none`` 则�以完全删除哈希。
+=======
 The compiler now appends the `IPFS <https://ipfs.io/>`_ hash of the metadata file to the end of the bytecode by default
 (for details, see documentation on :doc:`contract metadata <metadata>`). Before 0.6.0, the compiler appended the
 `Swarm <https://ethersphere.github.io/swarm-home/>`_ hash by default, and in order to still support this behavior,
 the new command-line option ``--metadata-hash`` was introduced. It allows you to select the hash to be produced and
 appended, by passing either ``ipfs`` or ``swarm`` as value to the ``--metadata-hash`` command-line option.
 Passing the value ``none`` completely removes the hash.
+>>>>>>> english/develop
 
-These changes can also be used via the :ref:`Standard JSON Interface<compiler-api>` and effect the metadata JSON generated by the compiler.
+这些�化也�以通过 :ref:`标准JSON接� <compiler-api>` 使用，并影�编译器生�的元数�JSON。
 
-The recommended way to read the metadata is to read the last two bytes to determine the length of the CBOR encoding
-and perform a proper decoding on that data block as explained in the :ref:`metadata section<encoding-of-the-metadata-hash-in-the-bytecode>`.
+读�元数�的推�方法是读�最�两个字节，以确定CBOR编�的长度，并对该数��进行适当的解�，
+这在 :ref:`元数�部分 <encoding-of-the-metadata-hash-in-the-bytecode>` 中有所解释。
 
-Yul Optimizer
+Yul 优化器
 ~~~~~~~~~~~~~
 
-Together with the legacy bytecode optimizer, the :doc:`Yul <yul>` optimizer is now enabled by default when you call the compiler
-with ``--optimize``. It can be disabled by calling the compiler with ``--no-optimize-yul``.
-This mostly affects code that uses ABI coder v2.
+与传统的字节�优化器一起，:doc:`Yul <yul>` 优化器现在在用 ``--optimize`` �数调用编译器时默认�用。
+�以通过 ``--no-optimize-yul`` �数在调用编译器时�用它。这主�影�到使用ABI coder v2的代�。
 
-C API Changes
+C API �化
 ~~~~~~~~~~~~~
 
-The client code that uses the C API of ``libsolc`` is now in control of the memory used by the compiler. To make
-this change consistent, ``solidity_free`` was renamed to ``solidity_reset``, the functions ``solidity_alloc`` and
-``solidity_free`` were added and ``solidity_compile`` now returns a string that must be explicitly freed via
-``solidity_free()``.
+使用 ``libsolc`` 的C API的客户端代�现在�以控制编译器使用的内存。
+为了使这一�化��一致， ``solidity_free`` 被�新命�为 ``solidity_reset``，
+增加了函数 ``solidity_alloc`` 和 ``solidity_free``，
+``solidity_compile`` 现在返回一个必须通过 ``solidity_free()`` 显�释放的字符串。
 
 
-How to update your code
+如何更新您的代�
 =======================
 
-This section gives detailed instructions on how to update prior code for every breaking change.
+本节详细说明了如何为�一个�破性�化更新先�的代�。
 
-* Change ``address(f)`` to ``f.address`` for ``f`` being of external function type.
+* 将 ``address(f)``  改为 ``f.address``，因为 ``f`` 是外部函数类型。
 
-* Replace ``function () external [payable] { ... }`` by either ``receive() external payable { ... }``,
-  ``fallback() external [payable] { ... }`` or both. Prefer
-  using a ``receive`` function only, whenever possible.
+* 用 ``receive() external payable { ... }``， ``fallback() external [payable] { ... }``
+  或这两个函数一起�替� ``function () external [payable] { ... }``。
+  ��有�能，最好�使用 ``receive`` 函数。
 
-* Change ``uint length = array.push(value)`` to ``array.push(value);``. The new length can be
-  accessed via ``array.length``.
+* 将 ``uint length = array.push(value)`` 改为 ``array.push(value);``。
+  新的长度�以通过 ``array.length`` 访问。
 
-* Change ``array.length++`` to ``array.push()`` to increase, and use ``pop()`` to decrease
-  the length of a storage array.
+* 将 ``array.length++`` 改为 ``array.push()`` �增加数组长度，使用 ``pop()`` ��少存储数组的长度。
 
-* For every named return parameter in a function's ``@dev`` documentation define a ``@return``
-  entry which contains the parameter's name as the first word. E.g. if you have function ``f()`` defined
-  like ``function f() public returns (uint value)`` and a ``@dev`` annotating it, document its return
-  parameters like so: ``@return value The return value.``. You can mix named and un-named return parameters
-  documentation so long as the notices are in the order they appear in the tuple return type.
+* 在一个函数的 ``@dev`` 文档中，为�个命�的返回�数定义一个 ``@return`` �目，
+  将�数的�称作为第一个�。例如，
+  如果您有定义为 ``function f() public returns (uint value)`` 的函数 ``f()``，
+  并且有 ``@dev`` 注释，那么记录它的返回�数如下： ``@return value The return value.``。
+  您�以混�使用命�的和未命�的返回�数文档，��这些声明是按照它们在元组返回类型中出现的顺���。
 
-* Choose unique identifiers for variable declarations in inline assembly that do not conflict
-  with declarations outside the inline assembly block.
+* 为内�汇编中的��声明选择唯一的标识符，�与内�汇编�外的声明冲�。
 
-* Add ``virtual`` to every non-interface function you intend to override. Add ``virtual``
-  to all functions without implementation outside interfaces. For single inheritance, add
-  ``override`` to every overriding function. For multiple inheritance, add ``override(A, B, ..)``,
-  where you list all contracts that define the overridden function in the parentheses. When
-  multiple bases define the same function, the inheriting contract must override all conflicting functions.
+* 在�一个您打算�载的�接�函数上添加 ``virtual``。
+  在所有没有具体实现的接�之外的函数上添加 ``virtual``。
+  对于�继承，在�个�载的函数上添加 ``override``。对于多�继承，添加 ``override(A, B, ..)``，
+  在括�中列出所有定义了�载函数的�约。当多个基类定义�一个函数时，继承的�约必须�载所有冲�的函数。
 
-* In inline assembly, add ``()`` to all opcodes that do not otherwise accept an argument.
-  For example, change ``pc`` to ``pc()``, and ``gas`` to ``gas()``.
+* 在内�汇编中，将 ``()`` 添加到所有�接��数的�作��。
+  例如，将 ``pc`` 更改为 ``pc()``，将 ``gas`` 更改为 ``gas()``。
diff --git a/docs/070-breaking-changes.rst b/docs/070-breaking-changes.rst
index 05e98a4dcc21..de984c4f33f5 100644
--- a/docs/070-breaking-changes.rst
+++ b/docs/070-breaking-changes.rst
@@ -1,133 +1,118 @@
 ********************************
-Solidity v0.7.0 Breaking Changes
+Solidity v0.7.0 �破性�化
 ********************************
 
-This section highlights the main breaking changes introduced in Solidity
-version 0.7.0, along with the reasoning behind the changes and how to update
-affected code.
-For the full list check
-`the release changelog <https://github.com/ethereum/solidity/releases/tag/v0.7.0>`_.
+本节强调了 Solidity 0.7.0 版本中引入的主��破性�化，
+以�这些�化背�的原因和如何更新�影�的代�。
+对于完整的列表，请查看 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.7.0>`_。
 
 
-Silent Changes of the Semantics
+语义的微��化
 ===============================
 
-* Exponentiation and shifts of literals by non-literals (e.g. ``1 << x`` or ``2 ** x``)
-  will always use either the type ``uint256`` (for non-negative literals) or
-  ``int256`` (for negative literals) to perform the operation.
-  Previously, the operation was performed in the type of the shift amount / the
-  exponent which can be misleading.
+* 用�字符�进行指数和移�（例如： ``1 << x`` 或 ``2 ** x``）
+  将总是使用 ``uint256`` 类型（对于�负数）或
+  ``int256`` 类型（对于负数）�执行�作。
+  在此之�，该�作是在移��/指数的类型中进行的，这�能会产生误导。
 
 
-Changes to the Syntax
+语法的�化
 =====================
 
-* In external function and contract creation calls, Ether and gas is now specified using a new syntax:
-  ``x.f{gas: 10000, value: 2 ether}(arg1, arg2)``.
-  The old syntax -- ``x.f.gas(10000).value(2 ether)(arg1, arg2)`` -- will cause an error.
+* 在外部函数和�约创建调用中，现在使用新的语法指定以太和gas： ``x.f{gas: 10000, value: 2 ether}(arg1, arg2)``。
+  旧的语法 -- ``x.f.gas(10000).value(2 ether)(arg1, arg2)`` -- 会导致错误。
 
-* The global variable ``now`` is deprecated, ``block.timestamp`` should be used instead.
-  The single identifier ``now`` is too generic for a global variable and could give the impression
-  that it changes during transaction processing, whereas ``block.timestamp`` correctly
-  reflects the fact that it is just a property of the block.
+* 全局�� ``now`` 已被弃用， 应该使用 ``block.timestamp`` �替�。
+  对于一个全局���说，�一的标识符 ``now`` 太通用了，�能会让人觉得它在事务处�过程中�生�化，
+  而 ``block.timestamp`` 正确地�映了它�是�的一个属性。
 
-* NatSpec comments on variables are only allowed for public state variables and not
-  for local or internal variables.
+* 对��的NatSpec注释��许用于公共状���，而��许用于本地或内部��。
 
-* The token ``gwei`` is a keyword now (used to specify, e.g. ``2 gwei`` as a number)
-  and cannot be used as an identifier.
+* 代� ``gwei`` 现在是一个关键�（用于指定，例如 ``2 gwei`` 作为一个数字），�能作为一个标识符使用。
 
-* String literals now can only contain printable ASCII characters and this also includes a variety of
-  escape sequences, such as hexadecimal (``\xff``) and unicode escapes (``\u20ac``).
+* 字符串现在�能包��打�的ASCII字符，这也包括��转义�列，
+  如�六进制（ ``\xff``）和unicode转义（ ``\u20ac``）。
 
-* Unicode string literals are supported now to accommodate valid UTF-8 sequences. They are identified
-  with the ``unicode`` prefix: ``unicode"Hello 😃"``.
+* 现在支�Unicode字符串文本�容纳有效的UTF-8�列。
+  它们用 ``unicode`` �缀�标识： ``unicode"Hello 😃"``。
 
-* State Mutability: The state mutability of functions can now be restricted during inheritance:
-  Functions with default state mutability can be overridden by ``pure`` and ``view`` functions
-  while ``view`` functions can be overridden by ``pure`` functions.
-  At the same time, public state variables are considered ``view`` and even ``pure``
-  if they are constants.
+* 状���性：现在�以在继承过程中�制函数的状���性。
+  具有默认状���性的函数�以被 ``pure`` 和 ``view`` 函数所覆盖，
+  而 ``view`` 函数�以被 ``pure`` 函数所覆盖。
+  �时，公共状���被认为是 ``view``，甚至是 ``pure``，如果它们是常�。
 
 
 
-Inline Assembly
+内�汇编
 ---------------
 
-* Disallow ``.`` in user-defined function and variable names in inline assembly.
-  It is still valid if you use Solidity in Yul-only mode.
+* 在用户定义的函数和���称中，��许在内�汇编中使用 ``.``。
+  如果您在“仅Yul�模�下使用Solidity，它�然有效。
 
-* Slot and offset of storage pointer variable ``x`` are accessed via ``x.slot``
-  and ``x.offset`` instead of ``x_slot`` and ``x_offset``.
+* 存储指针�� ``x`` 的槽和�移�通过 ``x.slot`` 和 ``x.offset`` 访问，
+  而�是 ``x_slot`` 和 ``x_offset``。
 
-Removal of Unused or Unsafe Features
+移除未使用或�安全的功能
 ====================================
 
-Mappings outside Storage
+存储之外的映射关系
 ------------------------
 
-* If a struct or array contains a mapping, it can only be used in storage.
-  Previously, mapping members were silently skipped in memory, which
-  is confusing and error-prone.
+* 如果一个结构或数组包�一个映射，它�能在存储中使用。
+  以�，映射�员在内存中被默默地跳过，这让人困惑，也容易出错。
 
-* Assignments to structs or arrays in storage does not work if they contain
-  mappings.
-  Previously, mappings were silently skipped during the copy operation, which
-  is misleading and error-prone.
+* 如果存储中的结构或数组包�映射，则对其进行赋值是��行的。
+  以�，在�制�作过程中，映射会被默默地跳过，这是一�误导，而且容易出错。
 
-Functions and Events
+函数和事件
 --------------------
 
-* Visibility (``public`` / ``internal``) is not needed for constructors anymore:
-  To prevent a contract from being created, it can be marked ``abstract``.
-  This makes the visibility concept for constructors obsolete.
+* 构造函数��需���性（ ``public`` / ``internal``）了。
+  为了防止�约被创建，�以将其标记为 ``abstract``。
+  这使得构造函数的��性概念�得过时了。
 
-* Type Checker: Disallow ``virtual`` for library functions:
-  Since libraries cannot be inherited from, library functions should not be virtual.
+* 类型检查器：��许库函数为 ``virtual``：
+  由于库�约�能被继承，库函数�应该被标记为 virtual。
 
-* Multiple events with the same name and parameter types in the same
-  inheritance hierarchy are disallowed.
+* ��许在�一继承层次中具有相��称和�数类型的多个事件。
 
-* ``using A for B`` only affects the contract it is mentioned in.
-  Previously, the effect was inherited. Now, you have to repeat the ``using``
-  statement in all derived contracts that make use of the feature.
+* ``using A for B`` �影�到它所�到的�约。以�，这�影�是继承的。
+  现在，您必须在所有使用该特性的派生�约中�� ``using`` 语�。
 
-Expressions
+表达�
 -----------
 
-* Shifts by signed types are disallowed.
-  Previously, shifts by negative amounts were allowed, but reverted at runtime.
+* 有符�类型的移�是��许的。以�，�许负数的移�，但它在�行时会被还原。
 
-* The ``finney`` and ``szabo`` denominations are removed.
-  They are rarely used and do not make the actual amount readily visible. Instead, explicit
-  values like ``1e20`` or the very common ``gwei`` can be used.
+* ``finney`` 和 ``szabo`` 的��被删除。它们很少被使用，并且�能使实际的金�清晰��。
+  相�，�以使用明确的数值，如 ``1e20`` 或�常常�的 ``gwei``。
 
-Declarations
+声明
 ------------
 
-* The keyword ``var`` cannot be used anymore.
-  Previously, this keyword would parse but result in a type error and
-  a suggestion about which type to use. Now, it results in a parser error.
+* 关键字 ``var`` �能�使用了。
+  以�，这个关键��以解�，但会导致一个类型错误，
+  并建议使用哪�类型。现在，它导致一个解�器错误。
 
-Interface Changes
+接��化
 =================
 
-* JSON AST: Mark hex string literals with ``kind: "hexString"``.
-* JSON AST: Members with value ``null`` are removed from JSON output.
-* NatSpec: Constructors and functions have consistent userdoc output.
+* JSON AST：用 ``kind: "hexString"`` �标记�六进制字符串文本。
+* JSON AST：值为 ``null`` 的�员将从JSON输出中删除。
+* NatSpec：构造器和函数有一致的用户文档输出。
 
 
-How to update your code
+如何更新您的代�
 =======================
 
-This section gives detailed instructions on how to update prior code for every breaking change.
-
-* Change ``x.f.value(...)()`` to ``x.f{value: ...}()``. Similarly ``(new C).value(...)()`` to
-  ``new C{value: ...}()`` and ``x.f.gas(...).value(...)()`` to ``x.f{gas: ..., value: ...}()``.
-* Change ``now`` to ``block.timestamp``.
-* Change types of right operand in shift operators to unsigned types. For example change ``x >> (256 - y)`` to
-  ``x >> uint(256 - y)``.
-* Repeat the ``using A for B`` statements in all derived contracts if needed.
-* Remove the ``public`` keyword from every constructor.
-* Remove the ``internal`` keyword from every constructor and add ``abstract`` to the contract (if not already present).
-* Change ``_slot`` and ``_offset`` suffixes in inline assembly to ``.slot`` and ``.offset``, respectively.
+本节详细说明了如何为�一个�破性�化更新先�的代�。
+
+* 将 ``x.f.value(...)()`` 改为 ``x.f{value: ...}()``。类似地， ``(new C).value(...)()`` 改为
+  ``new C{value: ...}()``， ``x.f.gas(...).value(...)()`` 改为 ``x.f{gas: ..., value: ...}()``。
+* 将 ``now`` 改为 ``block.timestamp``.
+* 将移��算符中的��作数的类型改为无符�类型。
+  例如，将 ``x >> (256 - y)`` 改为 ``x >> uint(256 - y)``。
+* 如果需�，在所有派生�约中�� ``using A for B`` 的语�。
+* 从�个构造函数中删除 ``public`` 关键字。
+* 从�个构造函数中删除 ``internal`` 关键字，并在�约中添加 ``abstract`` （如果还没有存在）。
+* 将内�汇编中的 ``_slot`` 和 ``_offset`` �缀分别改为 ``.slot`` 和 ``.offset``。
diff --git a/docs/080-breaking-changes.rst b/docs/080-breaking-changes.rst
index 524d12ac3b58..a546e91074f3 100644
--- a/docs/080-breaking-changes.rst
+++ b/docs/080-breaking-changes.rst
@@ -1,176 +1,178 @@
 ********************************
-Solidity v0.8.0 Breaking Changes
+Solidity v0.8.0 �破性�化
 ********************************
 
-This section highlights the main breaking changes introduced in Solidity
-version 0.8.0.
-For the full list check
-`the release changelog <https://github.com/ethereum/solidity/releases/tag/v0.8.0>`_.
+本节强调了 Solidity 0.8.0 版本中引入的主��破性�化。对于完整的列表，请查看
+`版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.8.0>`_。
 
-Silent Changes of the Semantics
+语义的微��化
 ===============================
 
+<<<<<<< HEAD
+本节列出了现有代�在编译器没有通知您的情况下改�其行为的更改。
+
+* 算术�作在下溢和溢出时都会��。您�以使用 ``unchecked { ... }`` �使用以�的包装行为。
+=======
 This section lists changes where existing code changes its behavior without
 the compiler notifying you about it.
 
 * Arithmetic operations revert on underflow and overflow. You can use ``unchecked { ... }`` to use
   the previous wrapping behavior.
+>>>>>>> english/develop
 
-  Checks for overflow are very common, so we made them the default to increase readability of code,
-  even if it comes at a slight increase of gas costs.
+  溢出的检查是�常普�的，所以我们把它作为默认的检查，
+  以增加代�的�读性，�使它是以略微增加gas�本为代价的。
 
-* ABI coder v2 is activated by default.
+* ABI编�器v2默认是激活的。
 
+<<<<<<< HEAD
+  您�以使用 ``pragma abicoder v1;`` �选择使用旧的行为。
+  语� ``pragma experimental ABIEncoderV2;`` �然有效，但它已被废弃，没有效果。
+  如果您想显示使用，请使用 ``pragma abicoder v2;`` 代替。
+=======
   You can choose to use the old behavior using ``pragma abicoder v1;``.
   The pragma ``pragma experimental ABIEncoderV2;`` is still valid, but it is deprecated and has no effect.
   If you want to be explicit, please use ``pragma abicoder v2;`` instead.
+>>>>>>> english/develop
 
-  Note that ABI coder v2 supports more types than v1 and performs more sanity checks on the inputs.
-  ABI coder v2 makes some function calls more expensive and it can also make contract calls
-  revert that did not revert with ABI coder v1 when they contain data that does not conform to the
-  parameter types.
+  请注�，ABI coder v2比v1支�更多的类型，并对输入进行更多的��性检查。
+  ABI coder v2使一些函数调用更加昂贵，而且当�约中包��符��数类型的数�时，它还会使�约调用回退，
+  而在ABI coder v1中则没有回退。
 
-* Exponentiation is right associative, i.e., the expression ``a**b**c`` is parsed as ``a**(b**c)``.
-  Before 0.8.0, it was parsed as ``(a**b)**c``.
+* 指数是��的，也就是说，表达� ``a**b**c`` 被解�为 ``a**（b**c）``。
+  在0.8.0之�，它被解�为 ``(a**b)**c``。
 
-  This is the common way to parse the exponentiation operator.
+  这是解�指数�算符的常用方法。
 
-* Failing assertions and other internal checks like division by zero or arithmetic overflow do
-  not use the invalid opcode but instead the revert opcode.
-  More specifically, they will use error data equal to a function call to ``Panic(uint256)`` with an error code specific
-  to the circumstances.
+* 失败的断言和其他内部检查，如除以零或算术溢出，�使用无效的�作�，而是使用���作�。
+  更具体地说，它们将使用等于对 ``Panic(uint256)`` 的函数调用的错误数�，其错误代�是针对具体情况的。
 
-  This will save gas on errors while it still allows static analysis tools to distinguish
-  these situations from a revert on invalid input, like a failing ``require``.
+  这将节�错误的gas，�时它�然�许��分�工具将这些情况与无效输入的��区分开�，
+  比如一个失败的 ``require``。
 
-* If a byte array in storage is accessed whose length is encoded incorrectly, a panic is caused.
-  A contract cannot get into this situation unless inline assembly is used to modify the raw representation of storage byte arrays.
+* 如果访问存储中的一个字节数组，其长度被错误地编�，就会引起panic错误。
+  �约�会出现这�情况，除�使用内�汇编�修改存储字节数组的原始表示。
 
-* If constants are used in array length expressions, previous versions of Solidity would use arbitrary precision
-  in all branches of the evaluation tree. Now, if constant variables are used as intermediate expressions,
-  their values will be properly rounded in the same way as when they are used in run-time expressions.
+* 如果常数被用于数组长度表达�中，Solidity 的先�版本将在评估树的所有分支中使用任�精度。
+  现在，如果常���被用作中间表达�，它们的值将以与它们在�行时表达�中使用时相�的方�被正确�入。
 
-* The type ``byte`` has been removed. It was an alias of ``bytes1``.
+* 类型 ``byte`` 已�被删除。它是 ``bytes1`` 的别�。
 
-New Restrictions
+新的�制�件
 ================
 
-This section lists changes that might cause existing contracts to not compile anymore.
+本节列出了�能导致现有�约��编译的�化。
 
+<<<<<<< HEAD
+* 有一些与字�常�的显�转�有关的新�制。以�在以下情况下的行为�能是模糊的：
+=======
 * There are new restrictions related to explicit conversions of literals. The previous behavior in
   the following cases was likely ambiguous:
-
-  1. Explicit conversions from negative literals and literals larger than ``type(uint160).max`` to
-     ``address`` are disallowed.
-  2. Explicit conversions between literals and an integer type ``T`` are only allowed if the literal
-     lies between ``type(T).min`` and ``type(T).max``. In particular, replace usages of ``uint(-1)``
-     with ``type(uint).max``.
-  3. Explicit conversions between literals and enums are only allowed if the literal can
-     represent a value in the enum.
-  4. Explicit conversions between literals and ``address`` type (e.g. ``address(literal)``) have the
-     type ``address`` instead of ``address payable``. One can get a payable address type by using an
-     explicit conversion, i.e., ``payable(literal)``.
-
-* :ref:`Address literals<address_literals>` have the type ``address`` instead of ``address
-  payable``. They can be converted to ``address payable`` by using an explicit conversion, e.g.
-  ``payable(0xdCad3a6d3569DF655070DEd06cb7A1b2Ccd1D3AF)``.
-
-* There are new restrictions on explicit type conversions. The conversion is only allowed when there
-  is at most one change in sign, width or type-category (``int``, ``address``, ``bytesNN``, etc.).
-  To perform multiple changes, use multiple conversions.
-
-  Let us use the notation ``T(S)`` to denote the explicit conversion ``T(x)``, where, ``T`` and
-  ``S`` are types, and ``x`` is any arbitrary variable of type ``S``. An example of such a
-  disallowed conversion would be ``uint16(int8)`` since it changes both width (8 bits to 16 bits)
-  and sign (signed integer to unsigned integer). In order to do the conversion, one has to go
-  through an intermediate type. In the previous example, this would be ``uint16(uint8(int8))`` or
-  ``uint16(int16(int8))``. Note that the two ways to convert will produce different results e.g.,
-  for ``-1``. The following are some examples of conversions that are disallowed by this rule.
-
-  - ``address(uint)`` and ``uint(address)``: converting both type-category and width. Replace this by
-    ``address(uint160(uint))`` and ``uint(uint160(address))`` respectively.
-  - ``payable(uint160)``, ``payable(bytes20)`` and ``payable(integer-literal)``: converting both
-    type-category and state-mutability. Replace this by ``payable(address(uint160))``,
-    ``payable(address(bytes20))`` and ``payable(address(integer-literal))`` respectively. Note that
-    ``payable(0)`` is valid and is an exception to the rule.
-  - ``int80(bytes10)`` and ``bytes10(int80)``: converting both type-category and sign. Replace this by
-    ``int80(uint80(bytes10))`` and ``bytes10(uint80(int80)`` respectively.
-  - ``Contract(uint)``: converting both type-category and width. Replace this by
-    ``Contract(address(uint160(uint)))``.
-
-  These conversions were disallowed to avoid ambiguity. For example, in the expression ``uint16 x =
-  uint16(int8(-1))``, the value of ``x`` would depend on whether the sign or the width conversion
-  was applied first.
-
-* Function call options can only be given once, i.e. ``c.f{gas: 10000}{value: 1}()`` is invalid and has to be changed to ``c.f{gas: 10000, value: 1}()``.
-
-* The global functions ``log0``, ``log1``, ``log2``, ``log3`` and ``log4`` have been removed.
-
+>>>>>>> english/develop
+
+  1. ��许从负数字段和大于 ``type(uint160).max`` 的字段显�转�为 ``address``。
+  2. �有当字�常��于 ``type(T).min`` 和 ``type(T).max`` 之间时，
+     ��许字�常�与整数类型 ``T`` 之间的明确转�。
+     特别的是，用 ``type(uint).max`` 代替 ``uint(-1)`` 的使用。
+  3. �有当字�常�能够代表枚举中的一个值时，��许字�常�和枚举之间的显�转�。
+  4. 字�常�和 ``address`` 类型之间的显�转�（例如， ``address(literal)``）是 ``address`` 类型，
+     而�是 ``address payable`` 类型。通过使用显�转�，� ``payable(literal)``，
+     �以得到一个payable类型的地�类型。
+
+* :ref:`地�字�常� <address_literals>` 的类型是 ``address``，而�是 ``address payable``。
+  它们�以通过显�的转�转�为 ``address payable`` 类型，
+  例如： ``payable(0xdCad3a6d3569DF655070DEd06cb7A1b2Ccd1D3AF)``。
+
+* 对显�类型转�有新的�制。�有当符�，宽度或类型类别（ ``int``， ``address``， ``bytesNN`` 等）
+  有最多一次�化时，��许进行转�。�执行多个�化，请使用多个转�。
+
+  让我们使用符� ``T(S)`` �表示显�转� ``T(x)``，其中， ``T`` 和 ``S`` 是类型，
+  ``x`` 是 ``S`` 类型的任何任���。这���许的转�的例�是 ``uint16(int8)``，
+  因为它�时改�了宽度（8�到16�）和符�（有符�整数到无符�整数）。为了进行转�，我们必须通过一个中间类型。
+  在��的例�中，这将是 ``uint16(uint8(int8))`` 或者 ``uint16(int16(int8))``。
+  请注�，这两�转�方�将产生��的结果，例如，对于 ``-1``。下�是这个规则��许的一些转�的例�。
+
+  - ``address(uint)`` 和 ``uint(address)``：�时转�类型和宽度。
+    分别用 ``address(uint160(uint))`` 和 ``uint(uint160(address))`` 代替。
+  - ``payable(uint160)``， ``payable(bytes20)`` 和 ``payable(integer-literal)``： �时转�了类型和状���性。
+    分别用 ``payable(address(uint160))``， ``payable(address(bytes20))`` 和
+    ``payable(address(integer-literal))`` 代替。请注�， ``payable(0)`` 是有效的，是规则的例外。
+  - ``int80(bytes10)`` 和 ``bytes10(int80)``：�时转�了类型和符�。
+    分别用 ``int80(uint80(bytes10))`` 和 ``bytes10(uint80(int80))`` 代替。
+  - ``Contract(uint)``: �时转�类型和宽度。用 ``Contract(address(uint160(uint)))`` 代替。
+
+  这些转�是��许的，以��歧义。例如，在表达� ``uint16 x = uint16(int8(-1))`` 中，
+  ``x`` 的值�决于是先应用符�还是宽度转�。
+
+* 函数调用选项�能给出一次，� ``c.f{gas: 10000}{value: 1}()`` 是无效的，
+  必须改� ``c.f{gas: 10000, value: 1}()``。
+
+* 全局函数 ``log0``， ``log1``， ``log2``， ``log3`` 和 ``log4`` 已被删除。
+
+<<<<<<< HEAD
+  这些都是低级别的函数，基本上没有被使用过。它们的行为�以通过内�汇编访问。
+=======
   These are low-level functions that were largely unused. Their behavior can be accessed from inline assembly.
+>>>>>>> english/develop
 
-* ``enum`` definitions cannot contain more than 256 members.
+* ``enum`` 定义包�的�员�能超过256个。
 
-  This will make it safe to assume that the underlying type in the ABI is always ``uint8``.
+  这将使我们�以安全地�设ABI中的底层类型总是 ``uint8``。
 
-* Declarations with the name ``this``, ``super`` and ``_`` are disallowed, with the exception of
-  public functions and events. The exception is to make it possible to declare interfaces of contracts
-  implemented in languages other than Solidity that do permit such function names.
+* 除了公共函数和事件之外，��许使用 ``this``， ``super`` 和 ``_`` 的�称进行声明。
+  这个例外是为了使声明用Solidity以外的语言实现的�约的接��为�能，这些语言确实�许这�函数�称。
 
-* Remove support for the ``\b``, ``\f``, and ``\v`` escape sequences in code.
-  They can still be inserted via hexadecimal escapes, e.g. ``\x08``, ``\x0c``, and ``\x0b``, respectively.
+* 移除对代�中的 ``\b``， ``\f`` 和 ``\v`` 转义�列的支�。
+  它们�然�以通过�六进制转义�入，例如：分别是 ``\x08``， ``\x0c``， 和 ``\x0b``。
 
-* The global variables ``tx.origin`` and ``msg.sender`` have the type ``address`` instead of
-  ``address payable``. One can convert them into ``address payable`` by using an explicit
-  conversion, i.e., ``payable(tx.origin)`` or ``payable(msg.sender)``.
+* 全局�� ``tx.origin`` 和 ``msg.sender`` 的类型是 ``address`` 而�是 ``address payable``。
+  我们�以通过显�转�将它们转�为 ``address payable`` 类型，
+  � ``payable(tx.origin)`` 或 ``payable(msg.sender)``。
 
-  This change was done since the compiler cannot determine whether or not these addresses
-  are payable or not, so it now requires an explicit conversion to make this requirement visible.
+  �这个改�是因为编译器�能确定这些地�是��以支付，所以现在需�一个明确的转��使这个�求��。
 
-* Explicit conversion into ``address`` type always returns a non-payable ``address`` type. In
-  particular, the following explicit conversions have the type ``address`` instead of ``address
-  payable``:
+* 显�转�为 ``address`` 类型总是返回一个�-payable类型的 ``address``。
+  特别是，以下显�转�的类型是 ``address`` 而�是 ``address payable``：
 
-  - ``address(u)`` where ``u`` is a variable of type ``uint160``. One can convert ``u``
-    into the type ``address payable`` by using two explicit conversions, i.e.,
-    ``payable(address(u))``.
-  - ``address(b)`` where ``b`` is a variable of type ``bytes20``. One can convert ``b``
-    into the type ``address payable`` by using two explicit conversions, i.e.,
-    ``payable(address(b))``.
-  - ``address(c)`` where ``c`` is a contract. Previously, the return type of this
-    conversion depended on whether the contract can receive Ether (either by having a receive
-    function or a payable fallback function). The conversion ``payable(c)`` has the type ``address
-    payable`` and is only allowed when the contract ``c`` can receive Ether. In general, one can
-    always convert ``c`` into the type ``address payable`` by using the following explicit
-    conversion: ``payable(address(c))``. Note that ``address(this)`` falls under the same category
-    as ``address(c)`` and the same rules apply for it.
+  - ``address(u)`` 其中 ``u`` 是一个 ``uint160`` 类型的��。
+    我们�以通过两个显�转�将 ``u`` 转�为 ``address payable`` 类型，� ``payable(address(u))``。
+  - ``address(b)`` 其中 ``b`` 是一个 ``bytes20`` 类型的��。
+    我们�以通过两个显�转�将 ``b`` 转�为 ``address payable`` 类型，� ``payable(address(b))``。
+  - ``address(c)`` 其中 ``c`` 是一个�约。以�，这�转�的返回类型�决于�约是��以接收以太
+    （�么有一个receive函数，�么有一个payable类型的fallback函数）。
+    转� ``payable(c)`` 的类型为 ``address payable``，�有当�约 ``c`` �以接收以太时��许。
+    一般�说，人们总是�以通过使用以下显�转�将 ``c`` 转�为 ``address payable`` 的类型：
+    ``payable(address(c))``。请注�， ``address(this)`` 与 ``address(c)`` 属于�一类别，
+    �样的规则也适用于它。
 
-* The ``chainid`` builtin in inline assembly is now considered ``view`` instead of ``pure``.
+* 内�汇编中的 ``chainid`` 现在被认为是 ``view`` 而�是 ``pure``。
 
-* Unary negation cannot be used on unsigned integers anymore, only on signed integers.
+* 一元求��能�用于无符�整数，�能用于有符�整数。
 
-Interface Changes
+接��化
 =================
 
-* The output of ``--combined-json`` has changed: JSON fields ``abi``, ``devdoc``, ``userdoc`` and
-  ``storage-layout`` are sub-objects now. Before 0.8.0 they used to be serialised as strings.
+* ``--combined-json`` 的输出已�改�。JSON字段 ``abi``, ``devdoc``, ``userdoc`` 和
+  ``storage-layout`` 现在是�对象。在0.8.0之�，它们曾被�列化为字符串。
 
-* The "legacy AST" has been removed (``--ast-json`` on the commandline interface and ``legacyAST`` for standard JSON).
-  Use the "compact AST" (``--ast-compact--json`` resp. ``AST``) as replacement.
+* “传统AST“ 已被删除（ ``--ast-json`` 在命令行界�， ``legacyAST`` 用于标准JSON）。
+  使用 “紧凑型AST�（ ``--ast-compact-json`` �数. ``AST``）作为替代。
 
-* The old error reporter (``--old-reporter``) has been removed.
+* 旧的错误报告器（ ``--old-reporter`` ）已�被删除。
 
 
-How to update your code
+如何更新您的代�
 =======================
 
-- If you rely on wrapping arithmetic, surround each operation with ``unchecked { ... }``.
-- Optional: If you use SafeMath or a similar library, change ``x.add(y)`` to ``x + y``, ``x.mul(y)`` to ``x * y`` etc.
-- Add ``pragma abicoder v1;`` if you want to stay with the old ABI coder.
-- Optionally remove ``pragma experimental ABIEncoderV2`` or ``pragma abicoder v2`` since it is redundant.
-- Change ``byte`` to ``bytes1``.
-- Add intermediate explicit type conversions if required.
-- Combine ``c.f{gas: 10000}{value: 1}()`` to ``c.f{gas: 10000, value: 1}()``.
-- Change ``msg.sender.transfer(x)`` to ``payable(msg.sender).transfer(x)`` or use a stored variable of ``address payable`` type.
-- Change ``x**y**z`` to ``(x**y)**z``.
+- 如果您�赖包装算术，请用 ``unchecked { ... }`` 包裹�个�作。
+- �选：如果您使用SafeMath或类似的库，将 ``x.add(y)``  改为 ``x + y``， ``x.mul(y)`` 改为 ``x * y`` 等等。
+- 如果您想继续使用旧的ABI编�器，请添加 ``pragma abicoder v1;``。
+- �以选择删除 ``pragma experimental ABIEncoderV2`` 或 ``pragma abicoder v2`` 因为它是多余的。
+- 将 ``byte`` 改为 ``bytes1``。
+- 如果需�的�，添加中间显�类型转�。
+- 将 ``c.f{gas: 10000}{value: 1}()`` �并为 ``c.f{gas: 10000, value: 1}()``。
+- 将 ``msg.sender.transfer(x)`` 改为 ``payable(msg.sender).transfer(x)``
+  或者使用 ``address payable`` 类型的存储��。
+- 将 ``x**y**z`` 改为 ``(x**y)**z``。
 - Use inline assembly as a replacement for ``log0``, ..., ``log4``.
-- Negate unsigned integers by subtracting them from the maximum value of the type and adding 1 (e.g. ``type(uint256).max - x + 1``, while ensuring that ``x`` is not zero)
+- 将无符�整数��的方法是从该类型的最大值中�去该整数，并加上1（例如， ``type(uint256).max - x + 1``，�时确� `x` �为零）
diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 41967dd46d6b..9e9a894b0a1c 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -3,241 +3,227 @@
 .. _ABI:
 
 **************************
-Contract ABI Specification
+�约ABI规范
 **************************
 
-Basic Design
+基本设计
 ============
 
-The Contract Application Binary Interface (ABI) is the standard way to interact with contracts in the Ethereum ecosystem, both
-from outside the blockchain and for contract-to-contract interaction. Data is encoded according to its type,
-as described in this specification. The encoding is not self describing and thus requires a schema in order to decode.
+�约应用二进制接�（ABI）是在以太�生�系统中与�约交互的标准方�，
+包括从区�链外部和�约间的交互。数�根�其类型进行编�，如本规范中所述。
+编��是自�述的，因此需�一�特定的概�（schema）�进行解�。
 
-We assume that the interface functions of a contract are strongly typed, known at compilation time and static.
-We assume that all contracts will have the interface definitions of any contracts they call available at compile-time.
+我们�设�约的接�函数是强类型的，在编译时就知�，并且是��的。
+我们�设所有�约在编译时都有它们所调用的任何�约的接�定义。
 
-This specification does not address contracts whose interface is dynamic or otherwise known only at run-time.
+本规范�涉�其接�是动�的或其他�有在�行时�知�的�约。
 
 .. _abi_function_selector:
 .. index:: ! selector; of a function
 
-Function Selector
+函数选择器
 =================
 
-The first four bytes of the call data for a function call specifies the function to be called. It is the
-first (left, high-order in big-endian) four bytes of the Keccak-256 hash of the signature of
-the function. The signature is defined as the canonical expression of the basic prototype without data
-location specifier, i.e.
-the function name with the parenthesised list of parameter types. Parameter types are split by a single
-comma — no spaces are used.
+一个函数调用数�的�四个字节指定了�调用的函数。
+它是函数签�的 Keccak-256 哈希值的�4字节（高�在左的大端�）。
+签�被定义为基本原型的典型表达，没有数��置的指定，
+也就是带有括�的�数类型列表的函数�。�数类型由一个逗�分割 - �使用空格。
 
 .. note::
-    The return type of a function is not part of this signature. In
-    :ref:`Solidity's function overloading <overload-function>` return types are not considered.
-    The reason is to keep function call resolution context-independent.
-    The :ref:`JSON description of the ABI<abi_json>` however contains both inputs and outputs.
+    一个函数的返回类型�是这个签�的一部分。在 :ref:`Solidity的函数�载 <overload-function>` 中，
+    返回类型�被考虑。原因是为了��函数调用解�与上下文无关。
+    然而 :ref:`JSON�述的ABI <abi_json>` ��时包�了输入和输出。
 
-Argument Encoding
+�数编�
 =================
 
-Starting from the fifth byte, the encoded arguments follow. This encoding is also used in
-other places, e.g. the return values and also event arguments are encoded in the same way,
-without the four bytes specifying the function.
+从第5字节开始是被编�的�数。这�编�也被用在其他地方，
+比如，返回值和事件的�数也会被用�样的方�进行编�，
+而用�指定函数的4个字节则�需��进行编�。
 
-Types
+类型
 =====
 
-The following elementary types exist:
+以下是基础类型：
 
-- ``uint<M>``: unsigned integer type of ``M`` bits, ``0 < M <= 256``, ``M % 8 == 0``. e.g. ``uint32``, ``uint8``, ``uint256``.
+- ``uint<M>``： ``M`` �的无符�整数， ``0 < M <= 256``， ``M % 8 == 0``。例如： ``uint32``， ``uint8``， ``uint256``。
 
-- ``int<M>``: two's complement signed integer type of ``M`` bits, ``0 < M <= 256``, ``M % 8 == 0``.
+- ``int<M>``： 以 2 的补�作为符�的 ``M`` �整数， ``0 < M <= 256``， ``M % 8 == 0``。
 
-- ``address``: equivalent to ``uint160``, except for the assumed interpretation and language typing.
-  For computing the function selector, ``address`` is used.
+- ``address``： 除了字�上的��和语言类型的区别以外，等价于 ``uint160``，
+  在计算和函数选择器中，通常使用 ``address``。
 
-- ``uint``, ``int``: synonyms for ``uint256``, ``int256`` respectively. For computing the function
-  selector, ``uint256`` and ``int256`` have to be used.
+- ``uint``， ``int``： ``uint256``， ``int256`` �自的�义�.
+  在计算和函数选择器中，通常使用 ``uint256`` 和 ``int256``。
 
-- ``bool``: equivalent to ``uint8`` restricted to the values 0 and 1. For computing the function selector, ``bool`` is used.
+- ``bool``： 等价于 ``uint8``，�值�定为 0 或 1。在计算和函数选择器中，通常使用 ``bool``。
 
-- ``fixed<M>x<N>``: signed fixed-point decimal number of ``M`` bits, ``8 <= M <= 256``,
-  ``M % 8 == 0``, and ``0 < N <= 80``, which denotes the value ``v`` as ``v / (10 ** N)``.
+- ``fixed<M>x<N>``： ``M`` �的有符�的固定�数�的�进制数字， ``8 <= M <= 256``，
+  ``M % 8 == 0``， 且 ``0 < N <= 80``， 其中值 ``v`` 是 ``v / (10 ** N)``。
 
-- ``ufixed<M>x<N>``: unsigned variant of ``fixed<M>x<N>``.
+- ``ufixed<M>x<N>``： 无符�的 ``fixed<M>x<N>``.
 
-- ``fixed``, ``ufixed``: synonyms for ``fixed128x18``, ``ufixed128x18`` respectively. For
-  computing the function selector, ``fixed128x18`` and ``ufixed128x18`` have to be used.
+- ``fixed``， ``ufixed``：  ``fixed128x18``， ``ufixed128x18`` �自的�义�。
+  在计算和函数选择器中，通常使用 ``fixed128x18`` 和 ``ufixed128x18``。
 
-- ``bytes<M>``: binary type of ``M`` bytes, ``0 < M <= 32``.
+- ``bytes<M>``： ``M`` 字节的二进制类型， ``0 < M <= 32``。
 
-- ``function``: an address (20 bytes) followed by a function selector (4 bytes). Encoded identical to ``bytes24``.
+- ``function``： 一个地�（20 字节）之�紧跟一个函数选择器 （4 字节）。编�之�等价于 ``bytes24``。
 
-The following (fixed-size) array type exists:
+以下是定长数组类型：
 
-- ``<type>[M]``: a fixed-length array of ``M`` elements, ``M >= 0``, of the given type.
+- ``<type>[M]``： 有 ``M`` 个元素的定长数组， ``M >= 0``，数组元素为给定类型。
 
   .. note::
 
-      While this ABI specification can express fixed-length arrays with zero elements, they're not supported by the compiler.
+      虽然这个ABI规范�以表达零元素的固定长度数组，但编译器�支�它们。
 
-The following non-fixed-size types exist:
+以下是�定长类型：
 
-- ``bytes``: dynamic sized byte sequence.
+- ``bytes``： 动�大�的字节�列。
 
-- ``string``: dynamic sized unicode string assumed to be UTF-8 encoded.
+- ``string``： 动�大�的 unicode 字符串，通常呈现为 UTF-8 编�。
 
-- ``<type>[]``: a variable-length array of elements of the given type.
+- ``<type>[]``： 元素为给定类型的�长数组。
 
-Types can be combined to a tuple by enclosing them inside parentheses, separated by commas:
+�以将若干类型放到一对括�中，用逗�分隔开，以此�构�一个元组（tuple）：
 
-- ``(T1,T2,...,Tn)``: tuple consisting of the types ``T1``, ..., ``Tn``, ``n >= 0``
+- ``(T1,T2,...,Tn)``： 由 ``T1``，...， ``Tn``， ``n >= 0`` 构�的 元组
 
-It is possible to form tuples of tuples, arrays of tuples and so on. It is also possible to form zero-tuples (where ``n == 0``).
+用元组构�元组，用元组构�数组等等也是�能的。�外也�以构�零元组（当 ``n == 0`` 时）。
 
-Mapping Solidity to ABI types
+将Solidity映射到ABI类型
 -----------------------------
 
-Solidity supports all the types presented above with the same names with the
-exception of tuples. On the other hand, some Solidity types are not supported
-by the ABI. The following table shows on the left column Solidity types that
-are not part of the ABI, and on the right column the ABI types that represent
-them.
-
-+-------------------------------+-----------------------------------------------------------------------------+
-|      Solidity                 |                                           ABI                               |
-+===============================+=============================================================================+
-|:ref:`address payable<address>`|``address``                                                                  |
-+-------------------------------+-----------------------------------------------------------------------------+
-|:ref:`contract<contracts>`     |``address``                                                                  |
-+-------------------------------+-----------------------------------------------------------------------------+
-|:ref:`enum<enums>`             |``uint8``                                                                    |
-+-------------------------------+-----------------------------------------------------------------------------+
-|:ref:`user defined value types |its underlying value type                                                    |
-|<user-defined-value-types>`    |                                                                             |
-+-------------------------------+-----------------------------------------------------------------------------+
-|:ref:`struct<structs>`         |``tuple``                                                                    |
-+-------------------------------+-----------------------------------------------------------------------------+
+Solidity 支�上�介�的除了元祖之外的所有��类型。
+�一方�，一些 Solidity 类型�被 ABI 支�。
+下表在左�显示了�属于ABI的Solidity类型，在��显示了代表它们的ABI类型。
+
++---------------------------------+-------------------+
+|            Solidity             |        ABI        |
++=================================+===================+
+| :ref:`address payable<address>` | ``address``       |
++---------------------------------+-------------------+
+| :ref:`�约<contracts>`          | ``address``       |
++---------------------------------+-------------------+
+| :ref:`枚举<enums>`              | ``uint8``         |
++---------------------------------+-------------------+
+| :ref:`用户自定义类型            | 其基本值类型      |
+| <user-defined-value-types>`     |                   |
++---------------------------------+-------------------+
+| :ref:`结构体 <structs>`         | ``元组（tuple）`` |
++---------------------------------+-------------------+
 
 .. warning::
-    Before version ``0.8.0`` enums could have more than 256 members and were represented by the
-    smallest integer type just big enough to hold the value of any member.
+    在 ``0.8.0`` 版本之�，枚举�以有超过256个�员，并由最�的整数类型表示，其大�刚好�以容纳任何�员的值。
 
-Design Criteria for the Encoding
+编�的设计标准
 ================================
 
-The encoding is designed to have the following properties, which are especially useful if some arguments are nested arrays:
+编�被设计为具有以下属性，如果一些�数是嵌套的数组，这些属性特别有用：
 
-1. The number of reads necessary to access a value is at most the depth of the value
-   inside the argument array structure, i.e. four reads are needed to retrieve ``a_i[k][l][r]``. In a
-   previous version of the ABI, the number of reads scaled linearly with the total number of dynamic
-   parameters in the worst case.
+1. 访问一个值所需的读�次数最多是�数数组结构内的值的深度，
+   �需�四次读�次数�检索 ``a_i[k][l][r]``。
+   在ABI的�一个版本中，在最�的情况下，读�次数的数�与动��数的总数�线性比例。
 
-2. The data of a variable or an array element is not interleaved with other data and it is
-   relocatable, i.e. it only uses relative "addresses".
+2. ��或数组元素的数��与其他数�交错，它是��定�的，�它�使用相对的 “地��。
 
 
-Formal Specification of the Encoding
+编�的形�化规范
 ====================================
 
-We distinguish static and dynamic types. Static types are encoded in-place and dynamic types are
-encoded at a separately allocated location after the current block.
+我们区分了��和动�类型。��类型是直接编�的，
+而动�类型是在当��之�的一个�独分�的�置进行编�。
 
-**Definition:** The following types are called "dynamic":
+**定义：** 以下类型被称为“动��：
 
 * ``bytes``
 * ``string``
-* ``T[]`` for any ``T``
-* ``T[k]`` for any dynamic ``T`` and any ``k >= 0``
-* ``(T1,...,Tk)`` if ``Ti`` is dynamic for some ``1 <= i <= k``
+* 任�类型 ``T`` 的数组 ``T[]``
+* 任�动�类型 ``T`` 的定长数组 ``T[k]``，其中 ``k >= 0``
+* 由动�的 ``Ti`` （ ``1 <= i <= k`` ）构�的元组 ``(T1,...,Tk)``
 
-All other types are called "static".
+所有其他类型都被称为“���。
 
-**Definition:** ``len(a)`` is the number of bytes in a binary string ``a``.
-The type of ``len(a)`` is assumed to be ``uint256``.
+**定义：** ``len(a)`` 是一个二进制字符串 ``a`` 的字节长度。
+``len(a)`` 的类型被呈现为 ``uint256``。
 
-We define ``enc``, the actual encoding, as a mapping of values of the ABI types to binary strings such
-that ``len(enc(X))`` depends on the value of ``X`` if and only if the type of ``X`` is dynamic.
+我们把实际的编� ``enc`` 定义为一个由ABI类型到二进制字符串的值的映射，
+因而，当且仅当 ``X`` 的类型是动�的， ``len(enc(X))`` �会�赖于 ``X`` 的值。
 
-**Definition:** For any ABI value ``X``, we recursively define ``enc(X)``, depending
-on the type of ``X`` being
+**定义：** 对任�ABI值 ``X``，我们根� ``X`` 的实际类型递归地定义 ``enc(X)``。
 
-- ``(T1,...,Tk)`` for ``k >= 0`` and any types ``T1``, ..., ``Tk``
+- ``(T1,...,Tk)`` 对于 ``k >= 0`` 且任�类型 ``T1``， ...， ``Tk``
 
   ``enc(X) = head(X(1)) ... head(X(k)) tail(X(1)) ... tail(X(k))``
 
-  where ``X = (X(1), ..., X(k))`` and
-  ``head`` and ``tail`` are defined for ``Ti`` as follows:
+  这里， ``X = (X(1), ..., X(k))`` 并且
+  ``head`` 和 ``tail`` 被定义为如下 ``Ti`` ：
 
-  if ``Ti`` is static:
+  如果 ``Ti`` 是��类型：
 
-    ``head(X(i)) = enc(X(i))`` and ``tail(X(i)) = ""`` (the empty string)
+    ``head(X(i)) = enc(X(i))`` 和 ``tail(X(i)) = ""`` （空字符串）
 
-  otherwise, i.e. if ``Ti`` is dynamic:
+  �则，� ``Ti`` 是动�类型时，它们被定义为：
 
     ``head(X(i)) = enc(len( head(X(1)) ... head(X(k)) tail(X(1)) ... tail(X(i-1)) ))``
     ``tail(X(i)) = enc(X(i))``
 
-  Note that in the dynamic case, ``head(X(i))`` is well-defined since the lengths of
-  the head parts only depend on the types and not the values. The value of ``head(X(i))`` is the offset
-  of the beginning of ``tail(X(i))`` relative to the start of ``enc(X)``.
+  注�，在动�类型的情况下，由于 head 部分的长度仅�决于类型而�值，所以 ``head(X(i))`` 是定义明确的。
+  它的值是从 ``enc(X)`` 的开始算起的， ``tail(X(i))`` 的起始�在 ``head(X(i))`` 中的�移�。
 
-- ``T[k]`` for any ``T`` and ``k``:
+- ``T[k]`` 对于任� ``T`` 和 ``k``：
 
   ``enc(X) = enc((X[0], ..., X[k-1]))``
 
-  i.e. it is encoded as if it were a tuple with ``k`` elements
-  of the same type.
+  �，它就�是个由相�类型的 ``k`` 个元素组�的元组那样被编�的。
 
-- ``T[]`` where ``X`` has ``k`` elements (``k`` is assumed to be of type ``uint256``):
+- ``T[]`` 当 ``X`` 有 ``k`` 个元素 （ ``k`` 的类型为 ``uint256``）：
 
   ``enc(X) = enc(k) enc((X[0], ..., X[k-1]))``
 
-  i.e. it is encoded as if it were a tuple with ``k`` elements of the same type (resp. an array of static size ``k``), prefixed with
-  the number of elements.
+  也就是说，它被编�为具有相�类型的 ``k`` 元素的元组（���大�为 ``k`` 的数组），�缀为元素的数�。
 
-- ``bytes``, of length ``k`` (which is assumed to be of type ``uint256``):
+- 具有 ``k`` 字节长度的 ``bytes``， （�设其类型为 ``uint256``）：
 
-  ``enc(X) = enc(k) pad_right(X)``, i.e. the number of bytes is encoded as a
-  ``uint256`` followed by the actual value of ``X`` as a byte sequence, followed by
-  the minimum number of zero-bytes such that ``len(enc(X))`` is a multiple of 32.
+  ``enc(X) = enc(k) pad_right(X)``，�，字节数被编�为 ``uint256``，紧跟�实际的 ``X`` 的字节��列，
+  �在�边（左边）补上�以使 ``len(enc(X))`` �为 32 的�数的最少数�的 0 值字节数�。
 
-- ``string``:
+- ``string``：
 
-  ``enc(X) = enc(enc_utf8(X))``, i.e. ``X`` is UTF-8 encoded and this value is interpreted
-  as of ``bytes`` type and encoded further. Note that the length used in this subsequent
-  encoding is the number of bytes of the UTF-8 encoded string, not its number of characters.
+  ``enc(X) = enc(enc_utf8(X))``， � ``X`` 被 UTF-8 编�，且在�续编�中将这个值解释为 ``bytes`` 类型。
+  注�，在��的编�中使用的长度是其 UTF-8 编�的字符串的字节数，而�是其字符数。
 
-- ``uint<M>``: ``enc(X)`` is the big-endian encoding of ``X``, padded on the higher-order
-  (left) side with zero-bytes such that the length is 32 bytes.
-- ``address``: as in the ``uint160`` case
-- ``int<M>``: ``enc(X)`` is the big-endian two's complement encoding of ``X``, padded on the higher-order (left) side with ``0xff`` bytes for negative ``X`` and with zero-bytes for non-negative ``X`` such that the length is 32 bytes.
-- ``bool``: as in the ``uint8`` case, where ``1`` is used for ``true`` and ``0`` for ``false``
-- ``fixed<M>x<N>``: ``enc(X)`` is ``enc(X * 10**N)`` where ``X * 10**N`` is interpreted as a ``int256``.
-- ``fixed``: as in the ``fixed128x18`` case
-- ``ufixed<M>x<N>``: ``enc(X)`` is ``enc(X * 10**N)`` where ``X * 10**N`` is interpreted as a ``uint256``.
-- ``ufixed``: as in the ``ufixed128x18`` case
-- ``bytes<M>``: ``enc(X)`` is the sequence of bytes in ``X`` padded with trailing zero-bytes to a length of 32 bytes.
+- ``uint<M>``： ``enc(X)`` 是在 ``X`` 的大端�编�的高�（左侧）补充若干 0 值字节以使其长度�为 32 字节。
+- ``address``： 与 ``uint160`` 的情况相�。
+- ``int<M>``： ``enc(X)`` 是在 ``X`` 的大端�的 2 的补�编�的高�（左侧）添加若干字节数�以使其长度�为 32 字节；
+  对于负数，添加值为 ``0xff`` 的字节数�，对于正数，添加 0 值字节数�。
+- ``bool``： 与 ``uint8`` 的情况相�， ``1`` 用�表示 ``true``， ``0`` 表示 ``false``。
+- ``fixed<M>x<N>``： ``enc(X)`` 就是 ``enc(X * 10**N)``，其中 ``X * 10**N`` �以�解为 ``int256``。
+- ``fixed``： 与 ``fixed128x18`` 的情况相�。
+- ``ufixed<M>x<N>``： ``enc(X)`` 就是 ``enc(X * 10**N)`` ，其中 ``X * 10**N`` �以�解为 ``uint256``。
+- ``ufixed``： 与 ``ufixed128x18`` 的情况相�。
+- ``bytes<M>``： ``enc(X)`` 就是 ``X`` 的字节�列加上为使长度�为 32 字节而添加的若干 0 值字节。
 
-Note that for any ``X``, ``len(enc(X))`` is a multiple of 32.
+注�，对于任�的 ``X``， ``len(enc(X))`` 都是 32 的�数。
 
-Function Selector and Argument Encoding
+函数选择器和�数编�
 =======================================
 
-All in all, a call to the function ``f`` with parameters ``a_1, ..., a_n`` is encoded as
+总而言之，对带有�数 ``a_1, ..., a_n`` 的函数 ``f`` 的调用被编�为：
 
   ``function_selector(f) enc((a_1, ..., a_n))``
 
-and the return values ``v_1, ..., v_k`` of ``f`` are encoded as
+``f`` 的返回值 ``v_1, ..., v_k`` 会被编�为：
 
   ``enc((v_1, ..., v_k))``
 
-i.e. the values are combined into a tuple and encoded.
+也就是说，返回值会被组�为一个元组（tuple）进行编�。
 
-Examples
+示例
 ========
 
-Given the contract:
+给定一个�约：
 
 .. code-block:: solidity
     :force:
@@ -252,88 +238,112 @@ Given the contract:
     }
 
 
-Thus, for our ``Foo`` example if we wanted to call ``baz`` with the parameters ``69`` and
-``true``, we would pass 68 bytes total, which can be broken down into:
+<<<<<<< HEAD
+因此，对于我们的例� ``Foo``，如果我们想用 ``69`` 和 ``true`` ��数调用 ``baz``，
+我们总共需�传� 68 字节，�以分解为：
+=======
+Thus, for our ``Foo`` example, if we wanted to call ``bar`` with the argument ``["abc", "def"]``, we would pass 68 bytes total, broken down into:
 
-- ``0xcdcd77c0``: the Method ID. This is derived as the first 4 bytes of the Keccak hash of
-  the ASCII form of the signature ``baz(uint32,bool)``.
-- ``0x0000000000000000000000000000000000000000000000000000000000000045``: the first parameter,
-  a uint32 value ``69`` padded to 32 bytes
-- ``0x0000000000000000000000000000000000000000000000000000000000000001``: the second parameter - boolean
-  ``true``, padded to 32 bytes
+- ``0xfce353f6``: the Method ID. This is derived from the signature ``bar(bytes3[2])``.
+- ``0x6162630000000000000000000000000000000000000000000000000000000000``: the first part of the first
+  parameter, a ``bytes3`` value ``"abc"`` (left-aligned).
+- ``0x6465660000000000000000000000000000000000000000000000000000000000``: the second part of the first
+  parameter, a ``bytes3`` value ``"def"`` (left-aligned).
 
 In total:
 
+.. code-block:: none
+
+    0xfce353f661626300000000000000000000000000000000000000000000000000000000006465660000000000000000000000000000000000000000000000000000000000
+
+If we wanted to call ``baz`` with the parameters ``69`` and
+``true``, we would pass 68 bytes total, which can be broken down into:
+>>>>>>> english/develop
+
+- ``0xcdcd77c0``： 方法ID。这�自ASCII格�的 ``baz(uint32,bool)`` 签�的 Keccak 哈希的� 4 字节。
+- ``0x0000000000000000000000000000000000000000000000000000000000000045``： 第一个�数，
+  一个被用 0 值字节补充到 32 字节的 uint32 值 ``69``。
+- ``0x0000000000000000000000000000000000000000000000000000000000000001``： 第二个�数，
+  一个被用 0 值字节补充到 32 字节的 boolean 值 ``true``。
+
+�起�就是:
+
 .. code-block:: none
 
     0xcdcd77c000000000000000000000000000000000000000000000000000000000000000450000000000000000000000000000000000000000000000000000000000000001
 
-It returns a single ``bool``. If, for example, it were to return ``false``, its output would be
-the single byte array ``0x0000000000000000000000000000000000000000000000000000000000000000``, a single bool.
+它返回一个 ``bool``。比如它返回 ``false``，
+那么它的输出将是一个字节数组 ``0x0000000000000000000000000000000000000000000000000000000000000000``，
+一个 ``bool`` 值。
 
-If we wanted to call ``bar`` with the argument ``["abc", "def"]``, we would pass 68 bytes total, broken down into:
+<<<<<<< HEAD
+如果我们想用 ``["abc", "def"]`` ��数调用 ``bar``，我们总共需�传� 68 字节，�以分解为：
 
-- ``0xfce353f6``: the Method ID. This is derived from the signature ``bar(bytes3[2])``.
-- ``0x6162630000000000000000000000000000000000000000000000000000000000``: the first part of the first
-  parameter, a ``bytes3`` value ``"abc"`` (left-aligned).
-- ``0x6465660000000000000000000000000000000000000000000000000000000000``: the second part of the first
-  parameter, a ``bytes3`` value ``"def"`` (left-aligned).
+- ``0xfce353f6``： 方法ID。�自 ``bar(bytes3[2])`` 的签�。
+- ``0x6162630000000000000000000000000000000000000000000000000000000000``： 第一个�数的第一部分，
+  一个 ``bytes3`` 值 ``"abc"`` （左对�）。
+- ``0x6465660000000000000000000000000000000000000000000000000000000000``： 第一个�数的第二部分，
+  一个 ``bytes3`` 值 ``"def"`` （左对�）。
 
-In total:
+�起�就是:
 
 .. code-block:: none
 
     0xfce353f661626300000000000000000000000000000000000000000000000000000000006465660000000000000000000000000000000000000000000000000000000000
 
+如果我们想用 ``"dave"``， ``true`` 和 ``[1,2,3]`` 作为�数调用 ``sam``，
+我们总共需�传� 292 字节，�以分解为：
+=======
 If we wanted to call ``sam`` with the arguments ``"dave"``, ``true`` and ``[1,2,3]``, we would
 pass 292 bytes total, broken down into:
+>>>>>>> english/develop
 
-- ``0xa5643bf2``: the Method ID. This is derived from the signature ``sam(bytes,bool,uint256[])``. Note that ``uint`` is replaced with its canonical representation ``uint256``.
-- ``0x0000000000000000000000000000000000000000000000000000000000000060``: the location of the data part of the first parameter (dynamic type), measured in bytes from the start of the arguments block. In this case, ``0x60``.
-- ``0x0000000000000000000000000000000000000000000000000000000000000001``: the second parameter: boolean true.
-- ``0x00000000000000000000000000000000000000000000000000000000000000a0``: the location of the data part of the third parameter (dynamic type), measured in bytes. In this case, ``0xa0``.
-- ``0x0000000000000000000000000000000000000000000000000000000000000004``: the data part of the first argument, it starts with the length of the byte array in elements, in this case, 4.
-- ``0x6461766500000000000000000000000000000000000000000000000000000000``: the contents of the first argument: the UTF-8 (equal to ASCII in this case) encoding of ``"dave"``, padded on the right to 32 bytes.
-- ``0x0000000000000000000000000000000000000000000000000000000000000003``: the data part of the third argument, it starts with the length of the array in elements, in this case, 3.
-- ``0x0000000000000000000000000000000000000000000000000000000000000001``: the first entry of the third parameter.
-- ``0x0000000000000000000000000000000000000000000000000000000000000002``: the second entry of the third parameter.
-- ``0x0000000000000000000000000000000000000000000000000000000000000003``: the third entry of the third parameter.
+- ``0xa5643bf2``： 方法ID。这是从签� ``sam(bytes,bool,uint256[])`` 中导出的。注�， ``uint`` 被替�为其典型代表 ``uint256``。
+- ``0x0000000000000000000000000000000000000000000000000000000000000060``： 第一个�数（动�类型）的数�部分的�置，�从�数编��开始�置算起的字节数。在这里，是 ``0x60`` 。
+- ``0x0000000000000000000000000000000000000000000000000000000000000001``： 第二个�数：boolean 的 true。
+- ``0x00000000000000000000000000000000000000000000000000000000000000a0``： 第三个�数（动�类型）的数�部分的�置，由字节数计�。在这里，是 ``0xa0``。
+- ``0x0000000000000000000000000000000000000000000000000000000000000004``： 第一个�数的数�部分，以字节数组的元素个数作为开始，在这里，是 4。
+- ``0x6461766500000000000000000000000000000000000000000000000000000000``： 第一个�数的内容： ``"dave"`` 的 UTF-8 编�（在这里等�于 ASCII 编�），并在�侧（低�）用 0 值字节补充到 32 字节。
+- ``0x0000000000000000000000000000000000000000000000000000000000000003``： 第三个�数的数�部分，以数组的元素个数作为开始，在这里，是 3。
+- ``0x0000000000000000000000000000000000000000000000000000000000000001``： 第三个�数的第一个数组元素。
+- ``0x0000000000000000000000000000000000000000000000000000000000000002``： 第三个�数的第二个数组元素。
+- ``0x0000000000000000000000000000000000000000000000000000000000000003``： 第三个�数的第三个数组元素。
 
-In total:
+�起�就是:
 
 .. code-block:: none
 
     0xa5643bf20000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000464617665000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003
 
-Use of Dynamic Types
+动�类型的使用
 ====================
 
-A call to a function with the signature ``f(uint256,uint32[],bytes10,bytes)`` with values
-``(0x123, [0x456, 0x789], "1234567890", "Hello, world!")`` is encoded in the following way:
+用值为 ``(0x123, [0x456, 0x789], "1234567890", "Hello, world!")`` 的签��数调用
+函数 ``f(uint256,uint32[],bytes10,bytes)``，其的编�方�如下：
 
-We take the first four bytes of ``keccak("f(uint256,uint32[],bytes10,bytes)")``, i.e. ``0x8be65246``.
-Then we encode the head parts of all four arguments. For the static types ``uint256`` and ``bytes10``,
-these are directly the values we want to pass, whereas for the dynamic types ``uint32[]`` and ``bytes``,
-we use the offset in bytes to the start of their data area, measured from the start of the value
-encoding (i.e. not counting the first four bytes containing the hash of the function signature). These are:
+我们� ``keccak("f(uint256,uint32[],bytes10,bytes)")`` 的�四个字节，� ``0x8be65246``。
+然�我们对所有四个�数的头部部分进行编�。对��类型 ``uint256`` 和 ``bytes10``，
+这些是我们�直接传递的值，而对于动�类型 ``uint32[]`` 和 ``bytes``，
+我们使用其数�区开始的�移�，从需编�的值的开始�置算起
+（��计算包�函数签�哈希值的�四个字节）。也就是：
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000123`` (``0x123`` padded to 32 bytes)
-- ``0x0000000000000000000000000000000000000000000000000000000000000080`` (offset to start of data part of second parameter, 4*32 bytes, exactly the size of the head part)
-- ``0x3132333435363738393000000000000000000000000000000000000000000000`` (``"1234567890"`` padded to 32 bytes on the right)
-- ``0x00000000000000000000000000000000000000000000000000000000000000e0`` (offset to start of data part of fourth parameter = offset to start of data part of first dynamic parameter + size of data part of first dynamic parameter = 4\*32 + 3\*32 (see below))
+- ``0x0000000000000000000000000000000000000000000000000000000000000123`` （ ``0x123`` 补充到 32 字节）
+- ``0x0000000000000000000000000000000000000000000000000000000000000080`` （第二个�数的数�部分起始�置的�移�，4*32 字节，正好是头部的大�）
+- ``0x3132333435363738393000000000000000000000000000000000000000000000`` （ ``"1234567890"`` 从�边补充到 32 字节）
+- ``0x00000000000000000000000000000000000000000000000000000000000000e0`` （第四个�数的数�部分起始�置的�移� = 第一个动��数的数�部分起始�置的�移� + 第一个动��数的数�部分的长度 = 4\*32 + 3\*32，�考�文）
 
-After this, the data part of the first dynamic argument, ``[0x456, 0x789]`` follows:
+在此之�，跟�第一个动��数的数�部分， ``[0x456, 0x789]`` ：
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000002`` (number of elements of the array, 2)
-- ``0x0000000000000000000000000000000000000000000000000000000000000456`` (first element)
-- ``0x0000000000000000000000000000000000000000000000000000000000000789`` (second element)
+- ``0x0000000000000000000000000000000000000000000000000000000000000002`` （数组元素个数，2）
+- ``0x0000000000000000000000000000000000000000000000000000000000000456`` （第一个数组元素）
+- ``0x0000000000000000000000000000000000000000000000000000000000000789`` （第二个数组元素）
 
-Finally, we encode the data part of the second dynamic argument, ``"Hello, world!"``:
+最�，我们将第二个动��数的数�部分 ``"Hello, world!"`` 进行编�：
 
-- ``0x000000000000000000000000000000000000000000000000000000000000000d`` (number of elements (bytes in this case): 13)
-- ``0x48656c6c6f2c20776f726c642100000000000000000000000000000000000000`` (``"Hello, world!"`` padded to 32 bytes on the right)
+- ``0x000000000000000000000000000000000000000000000000000000000000000d`` （元素个数，在这里是字节数：13）
+- ``0x48656c6c6f2c20776f726c642100000000000000000000000000000000000000`` （ ``"Hello, world!"`` 从�边补充到 32 字节）
 
-All together, the encoding is (newline after function selector and each 32-bytes for clarity):
+最�，�并到一起的编�就是（为了清晰，在函数选择器和� 32 字节之�加了�行）：
 
 .. code-block:: none
 
@@ -348,173 +358,163 @@ All together, the encoding is (newline after function selector and each 32-bytes
       000000000000000000000000000000000000000000000000000000000000000d
       48656c6c6f2c20776f726c642100000000000000000000000000000000000000
 
-Let us apply the same principle to encode the data for a function with a signature ``g(uint256[][],string[])``
-with values ``([[1, 2], [3]], ["one", "two", "three"])`` but start from the most atomic parts of the encoding:
+让我们使用相�的原��对一个签�为 ``g(uint256[][],string[])`` ，�数值为
+``([[1, 2], [3]], ["one", "two", "three"])`` 的函数�进行编�；但从最原�的部分开始：
 
-First we encode the length and data of the first embedded dynamic array ``[1, 2]`` of the first root array ``[[1, 2], [3]]``:
+首先我们将第一个根数组 ``[[1, 2], [3]]`` 的第一个嵌入的动�数组 ``[1, 2]`` 的长度和数�进行编�：
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000002`` (number of elements in the first array, 2; the elements themselves are ``1`` and ``2``)
-- ``0x0000000000000000000000000000000000000000000000000000000000000001`` (first element)
-- ``0x0000000000000000000000000000000000000000000000000000000000000002`` (second element)
+- ``0x0000000000000000000000000000000000000000000000000000000000000002``  (第一个数组中的元素数� 2；元素本身是 ``1`` 和 ``2``)
+- ``0x0000000000000000000000000000000000000000000000000000000000000001``  (第一个元素)
+- ``0x0000000000000000000000000000000000000000000000000000000000000002``  (第二个元素)
 
-Then we encode the length and data of the second embedded dynamic array ``[3]`` of the first root array ``[[1, 2], [3]]``:
+然�我们对第一个根数组 ``[[1, 2], [3]]`` 的第二个嵌入�动�数组 ``[3]`` 的长度和数�进行编�：
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000001`` (number of elements in the second array, 1; the element is ``3``)
-- ``0x0000000000000000000000000000000000000000000000000000000000000003`` (first element)
+- ``0x0000000000000000000000000000000000000000000000000000000000000001`` (第二个数组中的元素数� 1；元素数�是 ``3``)
+- ``0x0000000000000000000000000000000000000000000000000000000000000003``  (第一个元素)
 
-Then we need to find the offsets ``a`` and ``b`` for their respective dynamic arrays ``[1, 2]`` and ``[3]``.
-To calculate the offsets we can take a look at the encoded data of the first root array ``[[1, 2], [3]]``
-enumerating each line in the encoding:
+然�我们需�为�自的动�数组 ``[1, 2]`` 和 ``[3]`` 找到�移� ``a`` 和 ``b``。
+为了计算�移�，我们�以看一下第一个根数组的编�数� ``[[1, 2], [3]]`` 在编�中枚举�一行。
 
 .. code-block:: none
 
-    0 - a                                                                - offset of [1, 2]
-    1 - b                                                                - offset of [3]
-    2 - 0000000000000000000000000000000000000000000000000000000000000002 - count for [1, 2]
-    3 - 0000000000000000000000000000000000000000000000000000000000000001 - encoding of 1
-    4 - 0000000000000000000000000000000000000000000000000000000000000002 - encoding of 2
-    5 - 0000000000000000000000000000000000000000000000000000000000000001 - count for [3]
-    6 - 0000000000000000000000000000000000000000000000000000000000000003 - encoding of 3
+    0 - a                                                                - [1, 2] 的�移�
+    1 - b                                                                - [3] 的�移�
+    2 - 0000000000000000000000000000000000000000000000000000000000000002 - [1, 2] 数组的计数
+    3 - 0000000000000000000000000000000000000000000000000000000000000001 - 1 çš„ç¼–ç �
+    4 - 0000000000000000000000000000000000000000000000000000000000000002 - 2 çš„ç¼–ç �
+    5 - 0000000000000000000000000000000000000000000000000000000000000001 - [3] 数组的计数
+    6 - 0000000000000000000000000000000000000000000000000000000000000003 - 3 çš„ç¼–ç �
+
+�移� ``a`` 指�数组 ``[1, 2]`` 内容的开始�置，�第 2 行的开始（64 字节）；
+所以 ``a = 0x0000000000000000000000000000000000000000000000000000000000000040``。
 
-Offset ``a`` points to the start of the content of the array ``[1, 2]`` which is line
-2 (64 bytes); thus ``a = 0x0000000000000000000000000000000000000000000000000000000000000040``.
+�移� ``b`` 指�数组 ``[3]`` 内容的开始�置，�第 5 行的开始（160 字节）；
+所以 ``b = 0x00000000000000000000000000000000000000000000000000000000000000a0``。
 
-Offset ``b`` points to the start of the content of the array ``[3]`` which is line 5 (160 bytes);
-thus ``b = 0x00000000000000000000000000000000000000000000000000000000000000a0``.
 
+然�我们对第二个根数组的嵌入字符串进行编�：
 
-Then we encode the embedded strings of the second root array:
+- ``0x0000000000000000000000000000000000000000000000000000000000000003`` (�� ``"one"`` 中的字符个数)
+- ``0x6f6e650000000000000000000000000000000000000000000000000000000000`` (�� ``"one"`` 的 utf8 编�)
+- ``0x0000000000000000000000000000000000000000000000000000000000000003`` (�� ``"two"`` 中的字符个数)
+- ``0x74776f0000000000000000000000000000000000000000000000000000000000`` (�� ``"two"`` 的 utf8 编�)
+- ``0x0000000000000000000000000000000000000000000000000000000000000005`` (�� ``"three"`` 中的字符个数)
+- ``0x7468726565000000000000000000000000000000000000000000000000000000`` (�� ``"three"`` 的 utf8 编�)
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000003`` (number of characters in word ``"one"``)
-- ``0x6f6e650000000000000000000000000000000000000000000000000000000000`` (utf8 representation of word ``"one"``)
-- ``0x0000000000000000000000000000000000000000000000000000000000000003`` (number of characters in word ``"two"``)
-- ``0x74776f0000000000000000000000000000000000000000000000000000000000`` (utf8 representation of word ``"two"``)
-- ``0x0000000000000000000000000000000000000000000000000000000000000005`` (number of characters in word ``"three"``)
-- ``0x7468726565000000000000000000000000000000000000000000000000000000`` (utf8 representation of word ``"three"``)
+作为与第一个根数组的并列，因为字符串也属于动�元素，我们也需�找到它们的�移� ``c``, ``d`` 和 ``e``：
 
-In parallel to the first root array, since strings are dynamic elements we need to find their offsets ``c``, ``d`` and ``e``:
 
 .. code-block:: none
 
-    0 - c                                                                - offset for "one"
-    1 - d                                                                - offset for "two"
-    2 - e                                                                - offset for "three"
-    3 - 0000000000000000000000000000000000000000000000000000000000000003 - count for "one"
-    4 - 6f6e650000000000000000000000000000000000000000000000000000000000 - encoding of "one"
-    5 - 0000000000000000000000000000000000000000000000000000000000000003 - count for "two"
-    6 - 74776f0000000000000000000000000000000000000000000000000000000000 - encoding of "two"
-    7 - 0000000000000000000000000000000000000000000000000000000000000005 - count for "three"
-    8 - 7468726565000000000000000000000000000000000000000000000000000000 - encoding of "three"
+    0 - c                                                                - "one" 的�移�
+    1 - d                                                                - "two" 的�移�
+    2 - e                                                                - "three" 的�移�
+    3 - 0000000000000000000000000000000000000000000000000000000000000003 - "one" 的字符计数
+    4 - 6f6e650000000000000000000000000000000000000000000000000000000000 - "one" çš„ç¼–ç �
+    5 - 0000000000000000000000000000000000000000000000000000000000000003 - "two" 的字符计数
+    6 - 74776f0000000000000000000000000000000000000000000000000000000000 - "two" çš„ç¼–ç �
+    7 - 0000000000000000000000000000000000000000000000000000000000000005 - "three" 的字符计数
+    8 - 7468726565000000000000000000000000000000000000000000000000000000 - "three" çš„ç¼–ç �
 
-Offset ``c`` points to the start of the content of the string ``"one"`` which is line 3 (96 bytes);
-thus ``c = 0x0000000000000000000000000000000000000000000000000000000000000060``.
+�移� ``c`` 指�字符串 ``"one"`` 内容的开始�置，�第 3 行的开始（96 字节）；
+所以 ``c = 0x0000000000000000000000000000000000000000000000000000000000000060``。
 
-Offset ``d`` points to the start of the content of the string ``"two"`` which is line 5 (160 bytes);
-thus ``d = 0x00000000000000000000000000000000000000000000000000000000000000a0``.
+�移� ``d`` 指�字符串 ``"two"`` 内容的开始�置，�第 5 行的开始（160 字节）；
+所以 ``d = 0x00000000000000000000000000000000000000000000000000000000000000a0``。
 
-Offset ``e`` points to the start of the content of the string ``"three"`` which is line 7 (224 bytes);
-thus ``e = 0x00000000000000000000000000000000000000000000000000000000000000e0``.
+�移� ``e`` 指�字符串 ``"three"`` 内容的开始�置，�第 7 行的开始（224 字节）；
+所以 ``e = 0x00000000000000000000000000000000000000000000000000000000000000e0``。
 
 
-Note that the encodings of the embedded elements of the root arrays are not dependent on each other
-and have the same encodings for a function with a signature ``g(string[],uint256[][])``.
+注�，根数组的嵌入元素的编�并�互相�赖，且具有对于函数签� ``g(string[],uint256[][])`` 所相�的编�。
 
-Then we encode the length of the first root array:
+然�我们对第一个根数组的长度进行编�：
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000002`` (number of elements in the first root array, 2; the elements themselves are ``[1, 2]``  and ``[3]``)
+- ``0x0000000000000000000000000000000000000000000000000000000000000002`` (第一个根数组的元素数� 2；这些元素本身是 ``[1, 2]`` 和 ``[3]``)
 
-Then we encode the length of the second root array:
+而�我们对第二个根数组的长度进行编�：
 
-- ``0x0000000000000000000000000000000000000000000000000000000000000003`` (number of strings in the second root array, 3; the strings themselves are ``"one"``, ``"two"`` and ``"three"``)
+- ``0x0000000000000000000000000000000000000000000000000000000000000003``  (第二个根数组的元素数� 3；这些字符串本身是 ``"one"``， ``"two"`` 和 ``"three"``)
 
-Finally we find the offsets ``f`` and ``g`` for their respective root dynamic arrays ``[[1, 2], [3]]`` and
-``["one", "two", "three"]``, and assemble parts in the correct order:
+最�，我们找到根动�数组元素 ``[[1, 2], [3]]`` 和 ``["one", "two", "three"]`` 的�移� ``f`` 和 ``g``。
+汇编数�的正确顺�如下：
 
 .. code-block:: none
 
-    0x2289b18c                                                            - function signature
-     0 - f                                                                - offset of [[1, 2], [3]]
-     1 - g                                                                - offset of ["one", "two", "three"]
-     2 - 0000000000000000000000000000000000000000000000000000000000000002 - count for [[1, 2], [3]]
-     3 - 0000000000000000000000000000000000000000000000000000000000000040 - offset of [1, 2]
-     4 - 00000000000000000000000000000000000000000000000000000000000000a0 - offset of [3]
-     5 - 0000000000000000000000000000000000000000000000000000000000000002 - count for [1, 2]
-     6 - 0000000000000000000000000000000000000000000000000000000000000001 - encoding of 1
-     7 - 0000000000000000000000000000000000000000000000000000000000000002 - encoding of 2
-     8 - 0000000000000000000000000000000000000000000000000000000000000001 - count for [3]
-     9 - 0000000000000000000000000000000000000000000000000000000000000003 - encoding of 3
-    10 - 0000000000000000000000000000000000000000000000000000000000000003 - count for ["one", "two", "three"]
-    11 - 0000000000000000000000000000000000000000000000000000000000000060 - offset for "one"
-    12 - 00000000000000000000000000000000000000000000000000000000000000a0 - offset for "two"
-    13 - 00000000000000000000000000000000000000000000000000000000000000e0 - offset for "three"
-    14 - 0000000000000000000000000000000000000000000000000000000000000003 - count for "one"
-    15 - 6f6e650000000000000000000000000000000000000000000000000000000000 - encoding of "one"
-    16 - 0000000000000000000000000000000000000000000000000000000000000003 - count for "two"
-    17 - 74776f0000000000000000000000000000000000000000000000000000000000 - encoding of "two"
-    18 - 0000000000000000000000000000000000000000000000000000000000000005 - count for "three"
-    19 - 7468726565000000000000000000000000000000000000000000000000000000 - encoding of "three"
-
-Offset ``f`` points to the start of the content of the array ``[[1, 2], [3]]`` which is line 2 (64 bytes);
-thus ``f = 0x0000000000000000000000000000000000000000000000000000000000000040``.
-
-Offset ``g`` points to the start of the content of the array ``["one", "two", "three"]`` which is line 10 (320 bytes);
-thus ``g = 0x0000000000000000000000000000000000000000000000000000000000000140``.
+    0x2289b18c                                                            - 函数签�
+     0 - f                                                                - [[1, 2], [3]] 的�移�
+     1 - g                                                                - ["one", "two", "three"] 的�移�
+     2 - 0000000000000000000000000000000000000000000000000000000000000002 - [[1, 2], [3]] 的元素计数
+     3 - 0000000000000000000000000000000000000000000000000000000000000040 - [1, 2] 的�移�
+     4 - 00000000000000000000000000000000000000000000000000000000000000a0 - [3] 的�移�
+     5 - 0000000000000000000000000000000000000000000000000000000000000002 - [1, 2] 的元素计数
+     6 - 0000000000000000000000000000000000000000000000000000000000000001 - 1 çš„ç¼–ç �
+     7 - 0000000000000000000000000000000000000000000000000000000000000002 - 2 çš„ç¼–ç �
+     8 - 0000000000000000000000000000000000000000000000000000000000000001 - [3] 的元素计数
+     9 - 0000000000000000000000000000000000000000000000000000000000000003 - 3 çš„ç¼–ç �
+    10 - 0000000000000000000000000000000000000000000000000000000000000003 - ["one", "two", "three"] 的元素计数
+    11 - 0000000000000000000000000000000000000000000000000000000000000060 - 的�移�"one"
+    12 - 00000000000000000000000000000000000000000000000000000000000000a0 - 的�移�"two"
+    13 - 00000000000000000000000000000000000000000000000000000000000000e0 - 的�移�"three"
+    14 - 0000000000000000000000000000000000000000000000000000000000000003 - "one" 的字符计数
+    15 - 6f6e650000000000000000000000000000000000000000000000000000000000 - "one" çš„ç¼–ç �
+    16 - 0000000000000000000000000000000000000000000000000000000000000003 - "two" 的字符计数
+    17 - 74776f0000000000000000000000000000000000000000000000000000000000 - "two" çš„ç¼–ç �
+    18 - 0000000000000000000000000000000000000000000000000000000000000005 - "three" 的字符计数
+    19 - 7468726565000000000000000000000000000000000000000000000000000000 - "three" çš„ç¼–ç �
+
+�移� ``f`` 指�数组 ``[[1, 2], [3]]`` 内容的开始�置，�第 2 行的开始（64 字节）；
+所以 ``f = 0x0000000000000000000000000000000000000000000000000000000000000040``。
+
+�移� ``g`` 指�数组 ``["one", "two", "three"]`` 内容的开始�置，�第 10 行的开始（320 字节）；
+所以 ``g = 0x0000000000000000000000000000000000000000000000000000000000000140``。
 
 .. _abi_events:
 
-Events
+事件
 ======
 
-Events are an abstraction of the Ethereum logging/event-watching protocol. Log entries provide the contract's
-address, a series of up to four topics and some arbitrary length binary data. Events leverage the existing function
-ABI in order to interpret this (together with an interface spec) as a properly typed structure.
-
-Given an event name and series of event parameters, we split them into two sub-series: those which are indexed and
-those which are not.
-Those which are indexed, which may number up to 3 (for non-anonymous events) or 4 (for anonymous ones), are used
-alongside the Keccak hash of the event signature to form the topics of the log entry.
-Those which are not indexed form the byte array of the event.
-
-In effect, a log entry using this ABI is described as:
-
-- ``address``: the address of the contract (intrinsically provided by Ethereum);
-- ``topics[0]``: ``keccak(EVENT_NAME+"("+EVENT_ARGS.map(canonical_type_of).join(",")+")")`` (``canonical_type_of``
-  is a function that simply returns the canonical type of a given argument, e.g. for ``uint indexed foo``, it would
-  return ``uint256``). This value is only present in ``topics[0]`` if the event is not declared as ``anonymous``;
-- ``topics[n]``: ``abi_encode(EVENT_INDEXED_ARGS[n - 1])`` if the event is not declared as ``anonymous``
-  or ``abi_encode(EVENT_INDEXED_ARGS[n])`` if it is (``EVENT_INDEXED_ARGS`` is the series of ``EVENT_ARGS`` that
-  are indexed);
-- ``data``: ABI encoding of ``EVENT_NON_INDEXED_ARGS`` (``EVENT_NON_INDEXED_ARGS`` is the series of ``EVENT_ARGS``
-  that are not indexed, ``abi_encode`` is the ABI encoding function used for returning a series of typed values
-  from a function, as described above).
-
-For all types of length at most 32 bytes, the ``EVENT_INDEXED_ARGS`` array contains
-the value directly, padded or sign-extended (for signed integers) to 32 bytes, just as for regular ABI encoding.
-However, for all "complex" types or types of dynamic length, including all arrays, ``string``, ``bytes`` and structs,
-``EVENT_INDEXED_ARGS`` will contain the *Keccak hash* of a special in-place encoded value
-(see :ref:`indexed_event_encoding`), rather than the encoded value directly.
-This allows applications to efficiently query for values of dynamic-length types
-(by setting the hash of the encoded value as the topic), but leaves applications unable
-to decode indexed values they have not queried for. For dynamic-length types,
-application developers face a trade-off between fast search for predetermined values
-(if the argument is indexed) and legibility of arbitrary values (which requires that
-the arguments not be indexed). Developers may overcome this tradeoff and achieve both
-efficient search and arbitrary legibility by defining events with two arguments — one
-indexed, one not — intended to hold the same value.
+事件是Ethereum日志/事件观察�议的一个抽象。日志�目�供了�约的地�，
+一系列最多四个主题和一些任�长度的二进制数�。
+事件利用现有的函数ABI，以便将其（连�接�规范）解释为一个正确的类型化结构。
+
+给定一个事件�称和一系列的事件�数，我们把它们分�两个�系列：那些有索引的和那些没有索引的。
+那些被索引的�数，�能多达3个（对于�匿�事件）或4个（对于匿�事件），
+与事件签�的Keccak散列一起使用，形�日志�目的主题。
+那些没有索引的则构�事件的字节数组。
+
+实际上，使用该ABI的日志�目被�述为:
+
+- ``address``： �约的地�（由以太�真正�供）;
+- ``topics[0]``： ``keccak(EVENT_NAME+"("+EVENT_ARGS.map(canonical_type_of).join(",")+")")``
+  ``canonical_type_of`` 是一个�以返回给定�数的��类型的函数，例如，对 ``uint indexed foo`` 它会返回 ``uint256``）。
+  如果事件被声明为 ``anonymous``，那么 ``topics[0]`` �会被生�；
+- ``topics[n]``： 如果事件没有被声明为 ``anonymous``， 则为 ``abi_encode(EVENT_INDEXED_ARGS[n - 1])``
+  或者如果它被声明为该类型，则为 ``abi_encode(EVENT_INDEXED_ARGS[n])``
+  （ ``EVENT_INDEXED_ARGS`` 是被索引的 ``EVENT_ARGS`` 的系列）;
+- ``data``： ``EVENT_NON_INDEXED_ARGS`` 的ABI编�
+  （ ``EVENT_NON_INDEXED_ARGS`` 是一系列没有索引的 ``EVENT_ARGS``， ``abi_encode`` 是ABI编�函数，
+  用于从一个函数返回一系列类型的值，如上所述）。
+
+对于所有长度�超过32字节的类型， ``EVENT_INDEXED_ARGS`` 数组直接包�数值，填充或符�扩展（对于有符�整数）到32字节，
+就�常规ABI编�一样。然而，对于所有 “��� 类型或动�长度的类型，包括所有数组， ``string``， ``bytes`` 和结构，
+``EVENT_INDEXED_ARGS`` 将包� *Keccak散列* 的特殊就地编�值（� :ref:`indexed_event_encoding`），
+而�是直接编�的值。这�许应用程�有效地查询动�长度类型的值（通过设置编�值的哈希值作为主题），
+但使应用程�无法解�他们没有查询到的索引值。对于动�长度类型，
+应用程�开�人员�临�对预定值的快速�索（如果�数有索引）和任�值的�读性之间的�衡（这�求�数�被索引）。
+开�者�以通过定义具有两个�数的事件 -- 一个是索引的，一个是�索引的 -- �克�这��衡，实现高效�索和任��读性。
 
 .. _abi_errors:
 .. index:: error, selector; of an error
 
-Errors
+错误
 ======
 
-In case of a failure inside a contract, the contract can use a special opcode to abort execution and revert
-all state changes. In addition to these effects, descriptive data can be returned to the caller.
-This descriptive data is the encoding of an error and its arguments in the same way as data for a function
-call.
+在�约内部�生故障的情况下，�约�以使用一个特殊的�作��中止执行，并��所有的状��化。
+除了这些效果之外，�述性数��以返回给调用者。
+这��述性数�是对一个错误�其�数的编�，其方�与函数调用的数�相�。
 
-As an example, let us consider the following contract whose ``transfer`` function always
-reverts with a custom error of "insufficient balance":
+作为一个例�，让我们考虑以下�约，它的 ``transfer`` 函数总是以 "余��足" 的自定义错误返回。
 
 .. code-block:: solidity
 
@@ -528,82 +528,82 @@ reverts with a custom error of "insufficient balance":
         }
     }
 
-The return data would be encoded in the same way as the function call
-``InsufficientBalance(0, amount)`` to the function ``InsufficientBalance(uint256,uint256)``,
-i.e. ``0xcf479181``, ``uint256(0)``, ``uint256(amount)``.
+返回数�的编�方�与函数 ``InsufficientBalance(0, amount)``
+对函数 ``InsufficientBalance(uint256,uint256)`` 的调用方�相�。
+� ``0xcf479181``， ``uint256(0)``， ``uint256(amount)``。
 
-The error selectors ``0x00000000`` and ``0xffffffff`` are reserved for future use.
+错误选择器 ``0x00000000`` 和 ``0xffffffff`` 是�留给将�使用的。
 
 .. warning::
-    Never trust error data.
-    The error data by default bubbles up through the chain of external calls, which
-    means that a contract may receive an error not defined in any of the contracts
-    it calls directly.
-    Furthermore, any contract can fake any error by returning data that matches
-    an error signature, even if the error is not defined anywhere.
+    永远��相信错误数�。
+    默认情况下，错误数�通过外部调用在链�上冒泡产生，
+    这�味�一个�约�能会收到一个它直接调用的任何�约中没有定义的错误。
+    此外，任何�约都�以通过返回与错误签�相匹�的数��伪造任何错误，�使该错误没有在任何地方定义。
 
 .. _abi_json:
 
 JSON
 ====
 
-The JSON format for a contract's interface is given by an array of function, event and error descriptions.
-A function description is a JSON object with the fields:
+�约接�的JSON格�是由一个函数，事件和错误�述的数组给出的。
+一个函数�述是一个带有字段的JSON对象：
 
-- ``type``: ``"function"``, ``"constructor"``, ``"receive"`` (the :ref:`"receive Ether" function <receive-ether-function>`) or ``"fallback"`` (the :ref:`"default" function <fallback-function>`);
-- ``name``: the name of the function;
-- ``inputs``: an array of objects, each of which contains:
+- ``type``： ``"function"``， ``"constructor"``， ``"receive"`` （ :ref:`"接收以太�" 函数 <receive-ether-function>` ） 或者 ``"fallback"`` （ :ref:`"默认" 函数 <fallback-function>`）；
+- ``name``： 函数�称；
+- ``inputs``： 数组对象，�个数组对象会包�：
 
-  * ``name``: the name of the parameter.
-  * ``type``: the canonical type of the parameter (more below).
-  * ``components``: used for tuple types (more below).
+  * ``name``： �数�称；
+  * ``type``： �数的��类型（详�下文）
+  * ``components``： 供元组（tuple） 类型使用（详�下文）
 
-- ``outputs``: an array of objects similar to ``inputs``.
-- ``stateMutability``: a string with one of the following values: ``pure`` (:ref:`specified to not read
-  blockchain state <pure-functions>`), ``view`` (:ref:`specified to not modify the blockchain
-  state <view-functions>`), ``nonpayable`` (function does not accept Ether - the default) and ``payable`` (function accepts Ether).
+- ``outputs``： 一个类似于 ``inputs`` 的数组对象。
+- ``stateMutability``： 为下列值之一： ``pure`` （:ref:`指定为�读�区�链状� <pure-functions>`），
+  ``view`` （:ref:`指定为�修改区�链状� <view-functions>`），
+  ``nonpayable`` （函数�接�以太� - 默认选项） 和 ``payable`` （函数�接收以太�）。
 
+<<<<<<< HEAD
+构造函数（constructor）， receive 函数 和 fallback 函数没有 ``name`` 或 ``outputs`` 属性。
+receive 函数 和 fallback 函数也没有 ``inputs`` 属性。
+=======
 Constructor, receive, and fallback never have ``name`` or ``outputs``. Receive and fallback do not have ``inputs`` either.
+>>>>>>> english/develop
 
 .. note::
-    Sending non-zero Ether to non-payable function will revert the transaction.
+    ��接收以太�函数���零的以太�将使交易回滚。
 
 .. note::
-    The state mutability ``nonpayable`` is reflected in Solidity by not specifying
-    a state mutability modifier at all.
+    在Solidity中，状���性 ``��支付`` 是完全�指定状���性时的修饰语。
 
-An event description is a JSON object with fairly similar fields:
+一个事件�述是一个有�其相似字段的 JSON 对象：
 
-- ``type``: always ``"event"``
-- ``name``: the name of the event.
-- ``inputs``: an array of objects, each of which contains:
+- ``type``： 总是 ``"event"``
+- ``name``： 事件�称；
+- ``inputs``： 对象数组，�个数组对象会包�：
 
-  * ``name``: the name of the parameter.
-  * ``type``: the canonical type of the parameter (more below).
-  * ``components``: used for tuple types (more below).
-  * ``indexed``: ``true`` if the field is part of the log's topics, ``false`` if it is one of the log's data segments.
+  * ``name``： �数�称。
+  * ``type``： �数的规范类型（详�下文）。
+  * ``components``： 供元组（tuple） 类型使用（详�下文）
+  * ``indexed``： 如果该字段是日志主题的一部分，则为 ``true``，如果它是日志数�段之一，则为 ``false``。
 
-- ``anonymous``: ``true`` if the event was declared as ``anonymous``.
+- ``anonymous``： 如果事件被声明为 ``anonymous``，则为 ``true``。
 
-Errors look as follows:
+错误消�如下：
 
-- ``type``: always ``"error"``
-- ``name``: the name of the error.
-- ``inputs``: an array of objects, each of which contains:
+- ``type``： 总是 ``"error"``
+- ``name``： 错误�称；
+- ``inputs``： 对象数组，�个数组对象会包�：
 
-  * ``name``: the name of the parameter.
-  * ``type``: the canonical type of the parameter (more below).
-  * ``components``: used for tuple types (more below).
+  * ``name``： �数�称。
+  * ``type``： �数的��类型（相�下文）。
+  * ``components``： 供元组（tuple） 类型使用（详�下文）。
 
 .. note::
-  There can be multiple errors with the same name and even with identical signature
-  in the JSON array; for example, if the errors originate from different
-  files in the smart contract or are referenced from another smart contract.
-  For the ABI, only the name of the error itself is relevant and not where it is
-  defined.
+  在 JSON 数组中�能有多个具有相��称的错误，甚至具有相�的签�；
+  例如，如果错误�自�约中的��文件或从�一个�约引用。
+  对于ABI�说，�有错误本身的�称是相关的，而�是它的定义�置。
 
 
-For example,
+例如，
 
 .. code-block:: solidity
 
@@ -620,7 +620,7 @@ For example,
         bytes32 b;
     }
 
-would result in the JSON:
+�由如下 JSON �表示：
 
 .. code-block:: json
 
@@ -643,21 +643,19 @@ would result in the JSON:
     "outputs": []
     }]
 
-Handling tuple types
+处�元组类型
 --------------------
 
-Despite the fact that names are intentionally not part of the ABI encoding, they do make a lot of sense to be included
-in the JSON to enable displaying it to the end user. The structure is nested in the following way:
+尽管�称被有�地�作为 ABI 编�的一部分，但将它们包�进 JSON �显示给最终用户是�常��的。
+其结构会按下列方�进行嵌套：
 
-An object with members ``name``, ``type`` and potentially ``components`` describes a typed variable.
-The canonical type is determined until a tuple type is reached and the string description up
-to that point is stored in ``type`` prefix with the word ``tuple``, i.e. it will be ``tuple`` followed by
-a sequence of ``[]`` and ``[k]`` with
-integers ``k``. The components of the tuple are then stored in the member ``components``,
-which is of an array type and has the same structure as the top-level object except that
-``indexed`` is not allowed there.
+一个拥有 ``name``， ``type`` 和潜在的 ``components`` �员的对象�述了��类型的��。
+直至到达一个元组（tuple） 类型且到那点的存储在 ``type`` 属性中的字符串以 ``tuple`` 为�缀，
+也就是说，在 ``tuple`` 之�紧跟一个 ``[]`` 或有整数 ``k`` 的 ``[k]``，�
+能确定一个元组。 元组的组件元素会被存储在�员 ``components`` 中，
+它是一个数组类型，且与顶级对象具有�样的结构，�是在这里��许 ``已索引的（indexed）`` 数组元素。
 
-As an example, the code
+示例代�：
 
 .. code-block:: solidity
 
@@ -672,7 +670,7 @@ As an example, the code
         function g() public pure returns (S memory, T memory, uint) {}
     }
 
-would result in the JSON:
+�由如下 JSON �表示：
 
 .. code-block:: json
 
@@ -734,29 +732,29 @@ would result in the JSON:
 
 .. _abi_packed_mode:
 
-Strict Encoding Mode
+严格的编�模�
 ====================
 
-Strict encoding mode is the mode that leads to exactly the same encoding as defined in the formal specification above.
-This means that offsets have to be as small as possible while still not creating overlaps in the data areas, and thus no gaps are
-allowed.
+严格的编�模�是指导致与上述正�规范中定义的编�完全相�的模�。
+这�味��移�必须尽�能�，�时还�能在数�区域产生��，
+因此��许有间隙。
 
-Usually, ABI decoders are written in a straightforward way by just following offset pointers, but some decoders
-might enforce strict mode. The Solidity ABI decoder currently does not enforce strict mode, but the encoder
-always creates data in strict mode.
+通常，ABI 解�器是通过�循�移指针以简�的方�编写的，
+但有些解�器�能会强制执行严格模�。
+Solidity ABI 解�器目�并�强制执行严格模�，但编�器总是以严格模�创建数�。
 
-Non-standard Packed Mode
+�标准打包模�
 ========================
 
-Through ``abi.encodePacked()``, Solidity supports a non-standard packed mode where:
+通过 ``abi.encodePacked()``，Solidity支�一��标准的打包模�，其中：
 
-- types shorter than 32 bytes are concatenated directly, without padding or sign extension
-- dynamic types are encoded in-place and without the length.
-- array elements are padded, but still encoded in-place
+- 短于32字节的类型直接连接，没有填充或符�扩展。
+- 动�类型是直接编�的，没有长度。
+- 数组元素被填充，但�被是直接编�
 
-Furthermore, structs as well as nested arrays are not supported.
+此外，�支�结构以�嵌套数组。
 
-As an example, the encoding of ``int16(-1), bytes1(0x42), uint16(0x03), string("Hello, world!")`` results in:
+例如，对 ``int16(-1), bytes1(0x42), uint16(0x03), string("Hello, world!")`` 进行编�将生�如下结果
 
 .. code-block:: none
 
@@ -764,63 +762,51 @@ As an example, the encoding of ``int16(-1), bytes1(0x42), uint16(0x03), string("
       ^^^^                                 int16(-1)
           ^^                               bytes1(0x42)
             ^^^^                           uint16(0x03)
-                ^^^^^^^^^^^^^^^^^^^^^^^^^^ string("Hello, world!") without a length field
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^ 字符串（"Hello, world!"） 没有长度字段
 
-More specifically:
+更具体地说：
 
-- During the encoding, everything is encoded in-place. This means that there is
-  no distinction between head and tail, as in the ABI encoding, and the length
-  of an array is not encoded.
-- The direct arguments of ``abi.encodePacked`` are encoded without padding,
-  as long as they are not arrays (or ``string`` or ``bytes``).
-- The encoding of an array is the concatenation of the
-  encoding of its elements **with** padding.
-- Dynamically-sized types like ``string``, ``bytes`` or ``uint[]`` are encoded
-  without their length field.
-- The encoding of ``string`` or ``bytes`` does not apply padding at the end,
-  unless it is part of an array or struct (then it is padded to a multiple of
-  32 bytes).
+- 在编�过程中，所有东西都是直接编�的。这�味�没有�ABI编�那样区分头和尾，也没有对数组的长度进行编�。
+- ``abi.encodePacked`` 的直接�数被编�，
+  ���是数组（或 ``string`` 或 ``bytes`` ），就�需�填充。
+- 一个数组的编�是其元素的编� **与** 填充的连接。
+- 动�大�的类型，如 ``string``， ``bytes`` 或 ``uint[]``，在编�时没有长度字段。
+- ``string`` 或 ``bytes`` 的编��会在末尾应用填充，
+  除�它是数组或结构体的一部分（然�它被填充为32字节的�数）。
 
-In general, the encoding is ambiguous as soon as there are two dynamically-sized elements,
-because of the missing length field.
+一般�说，��有两个动�大�的元素，编�就会模糊�清，因为缺少长度字段。
 
-If padding is needed, explicit type conversions can be used: ``abi.encodePacked(uint16(0x12)) == hex"0012"``.
+如果需�填充，�以使用明确的类型转�： ``abi.encodePacked(uint16(0x12)) == hex"0012"``。
 
-Since packed encoding is not used when calling functions, there is no special support
-for prepending a function selector. Since the encoding is ambiguous, there is no decoding function.
+由于在调用函数时�使用打包编�，所以没有特别支�预留函数选择器。
+由于编�是模糊的，所以没有解�功能。
 
 .. warning::
 
-    If you use ``keccak256(abi.encodePacked(a, b))`` and both ``a`` and ``b`` are dynamic types,
-    it is easy to craft collisions in the hash value by moving parts of ``a`` into ``b`` and
-    vice-versa. More specifically, ``abi.encodePacked("a", "bc") == abi.encodePacked("ab", "c")``.
-    If you use ``abi.encodePacked`` for signatures, authentication or data integrity, make
-    sure to always use the same types and check that at most one of them is dynamic.
-    Unless there is a compelling reason, ``abi.encode`` should be preferred.
+    如果使用 ``keccak256(abi.encodePacked(a，b))`` 并且 ``a`` 和 ``b`` 都是动�类型，
+    那么通过将 ``a`` 的部分移动到 ``b`` 中，很容易在哈希值中产生冲�，�之亦然。
+    更具体地说， ``abi.encodePacked("a", "bc") == abi.encodePacked("ab", "c")``。
+    如果你使用 ``abi.encodePacked`` 进行签��认�或数�完整性，确�总是使用相�的类型，
+    并检查其中最多一个是动�的。除�有令人信�的�由，�则应首选 ``abi.encode``。
 
 
 .. _indexed_event_encoding:
 
-Encoding of Indexed Event Parameters
+索引事件�数的编�
 ====================================
 
-Indexed event parameters that are not value types, i.e. arrays and structs are not
-stored directly but instead a Keccak-256 hash of an encoding is stored. This encoding
-is defined as follows:
+�属于值类型的索引事件�数，�数组和结构，�直接存储，
+而是存储一个编�的 Keccak-256 哈希值。这个编�的定义如下：
 
-- the encoding of a ``bytes`` and ``string`` value is just the string contents
-  without any padding or length prefix.
-- the encoding of a struct is the concatenation of the encoding of its members,
-  always padded to a multiple of 32 bytes (even ``bytes`` and ``string``).
-- the encoding of an array (both dynamically- and statically-sized) is
-  the concatenation of the encoding of its elements, always padded to a multiple
-  of 32 bytes (even ``bytes`` and ``string``) and without any length prefix
+- ``bytes`` 和 ``string`` 值的编��是字符串的内容，没有任何填充或长度�缀。
+- 结构的编�是其�员编�的串�，总是填充为32字节的�数（甚至是 ``bytes`` 和 ``string``）。
+- 数组的编�（包括动�和��大�）是其元素编�的连接，
+  总是填充为32字节的�数（甚至是 ``bytes`` 和 ``string``），没有任何长度�缀。
 
-In the above, as usual, a negative number is padded by sign extension and not zero padded.
-``bytesNN`` types are padded on the right while ``uintNN`` / ``intNN`` are padded on the left.
+在上�，�往常一样，一个负数被填充符�扩展，而�是零填充。
+``bytesNN`` 类型被填充在�边，而 ``uintNN`` / ``intNN`` 被填充在左边。
 
 .. warning::
 
-    The encoding of a struct is ambiguous if it contains more than one dynamically-sized
-    array. Because of that, always re-check the event data and do not rely on the search result
-    based on the indexed parameters alone.
+    如果一个结构包�一个以上的动�大�的数组，那么它的编�是�明确的。
+    正因为如此，��常�新检查事件数�，����赖基于索引�数的�索结果。
diff --git a/docs/analysing-compilation-output.rst b/docs/analysing-compilation-output.rst
index 183f773223d5..c8212210b38c 100644
--- a/docs/analysing-compilation-output.rst
+++ b/docs/analysing-compilation-output.rst
@@ -1,15 +1,15 @@
 .. index:: analyse, asm
 
 #############################
-Analysing the Compiler Output
+分�编译器的输出结果
 #############################
 
-It is often useful to look at the assembly code generated by the compiler. The generated binary,
-i.e., the output of ``solc --bin contract.sol``, is generally difficult to read. It is recommended
-to use the flag ``--asm`` to analyse the assembly output. Even for large contracts, looking at a
-visual diff of the assembly before and after a change is often very enlightening.
+看一下编译器生�的汇编代�往往是有用的。生�的二进制文件，
+� ``solc --bin contract.sol`` 的输出，通常很难阅读。
+建议使用标志 ``--asm`` �分�汇编输出。
+�使是很大的�约，看一下改���的汇编结果的差异，往往是很有��的。
 
-Consider the following contract (named, say ``contract.sol``):
+以下�约（命�为 ``contract.sol`` ）为例：
 
 .. code-block:: solidity
 
@@ -21,7 +21,7 @@ Consider the following contract (named, say ``contract.sol``):
         }
     }
 
-The following would be the output of ``solc --asm contract.sol``
+以下是 ``solc --asm contract.sol`` 的输出
 
 .. code-block:: none
 
@@ -169,24 +169,20 @@ The following would be the output of ``solc --asm contract.sol``
         auxdata: 0xa2646970667358221220a5874f19737ddd4c5d77ace1619e5160c67b3d4bedac75fce908fed32d98899864736f6c637827302e382e342d646576656c6f702e323032312e332e33302b636f6d6d69742e65613065363933380058
     }
 
-Alternatively, the above output can also be obtained from `Remix <https://remix.ethereum.org/>`_,
-under the option "Compilation Details" after compiling a contract.
+�外，上述输出也�以从 `Remix <https://remix.ethereum.org/>`_ ，
+在编译�约�的 "编译细节" 选项下获得。
 
-Notice that the ``asm`` output starts with the creation / constructor code. The deploy code is
-provided as part of the sub object (in the above example, it is part of the sub-object ``sub_0``).
-The ``auxdata`` field corresponds to the contract :ref:`metadata
-<encoding-of-the-metadata-hash-in-the-bytecode>`. The comments in the assembly output point to the
-source location. Note that ``#utility.yul`` is an internally generated file of utility functions
-that can be obtained using the flags ``--combined-json
-generated-sources,generated-sources-runtime``.
+请注�， ``asm`` 输出以创建/构造器代�开始。
+部署代�是作为�对象的一部分�供的（在上�的例�中，它是�对象 ``sub_0`` 的一部分）。
+``auxdata`` 字段对应于�约 :ref:`元数� <encoding-of-the-metadata-hash-in-the-bytecode>` 。
+汇编输出中的注释指��文件的�置。注� ``#utility.yul`` 是一个内部生�的实用函数文件，
+�以使用标志 ``--combined-json generated-sources,generated-sources-runtime`` 获得。
 
-Similarly, the optimized assembly can be obtained with the command: ``solc --optimize --asm
-contract.sol``. Often times, it is interesting to see if two different sources in Solidity result in
-the same optimized code. For example, to see if the expressions ``(a * b) / c``, ``a * b / c``
-generates the same bytecode. This can be easily done by taking a ``diff`` of the corresponding
-assembly output, after potentially stripping comments that reference the source locations.
+类似地，�以通过 ``solc --optimize --asm contract.sol`` 命令获得优化�的程�集。
+通常情况下，观察两个��的Solidity�是�会产生相�的优化代�是很有趣的。
+例如，查看表达� ``(a * b) / c``， ``a * b / c`` 是�生�相�的字节�。
+在�能的�，在剥离引用��置的注释之�，通过获�相应程�集输出的 ``diff`` 很容易�到这一点。
 
 .. note::
 
-   The ``--asm`` output is not designed to be machine readable. Therefore, there may be breaking
-   changes on the output between minor versions of solc.
+   ``--asm`` 的输出�是设计�机器�读的。因此，在solc的�个�版本之间，输出�能会有�大的�化。
diff --git a/docs/assembly.rst b/docs/assembly.rst
index e08ff9f627c8..480f539f375b 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -1,43 +1,39 @@
 .. _inline-assembly:
 
 ###############
-Inline Assembly
+内�汇编
 ###############
 
 .. index:: ! assembly, ! asm, ! evmasm
 
 
-You can interleave Solidity statements with inline assembly in a language close
-to the one of the Ethereum Virtual Machine. This gives you more fine-grained control,
-which is especially useful when you are enhancing the language by writing libraries.
+您�以用接近Ethereum虚拟机的语言，将Solidity语�与内�汇编交错使用。
+这给了您更精细的控制，这在您通过编写库�增强语言时特别有用。
 
-The language used for inline assembly in Solidity is called :ref:`Yul <yul>`
-and it is documented in its own section. This section will only cover
-how the inline assembly code can interface with the surrounding Solidity code.
+在 Solidity 中用于内�汇编的语言被称为 :ref:`Yul <yul>`，它在自己的章节中被记录。
+本节将�涉�内�汇编代�如何在 Solidity 代�内交互。
 
 
 .. warning::
-    Inline assembly is a way to access the Ethereum Virtual Machine
-    at a low level. This bypasses several important safety
-    features and checks of Solidity. You should only use it for
-    tasks that need it, and only if you are confident with using it.
+    内�汇编是一�在低等级上访问Ethereum虚拟机的方�。
+    这绕过了Solidity的几个��安全功能和检查。
+    您应该�在需�它的任务中使用它，而且�有在您对使用它有信心的情况下。
 
 
-An inline assembly block is marked by ``assembly { ... }``, where the code inside
-the curly braces is code in the :ref:`Yul <yul>` language.
+一个内�汇编�由 ``assembly { ... }`` 标记的，其中大括�内的代�是 :ref:`Yul <yul>` 语言中的代�。
 
-The inline assembly code can access local Solidity variables as explained below.
+内�汇编代��以访问本地 Solidity ��，如下所述。
 
-Different inline assembly blocks share no namespace, i.e. it is not possible
-to call a Yul function or access a Yul variable defined in a different inline assembly block.
+��的内�汇编��共享�称空间，
+��能调用或访问一个在��内�汇编�中定义的Yul函数或��。
 
-Example
+例�
 -------
 
-The following example provides library code to access the code of another contract and
-load it into a ``bytes`` variable. This is possible with "plain Solidity" too, by using
-``<address>.code``. But the point here is that reusable assembly libraries can enhance the
-Solidity language without a compiler change.
+下�例�展示了一个库�约的代�，它�以�得�一个�约的代�，
+并将其加载到一个 ``bytes`` ��中。 通过使用 ``<address>.code``，
+这在 "普通Solidity" 中也是�能的。但这里的�点是，��用的汇编库�以增强 Solidity 语言，
+而�需�改�编译器。
 
 .. code-block:: solidity
 
@@ -47,23 +43,22 @@ Solidity language without a compiler change.
     library GetCode {
         function at(address addr) public view returns (bytes memory code) {
             assembly {
-                // retrieve the size of the code, this needs assembly
+                // 获�代�大�，这需�汇编语言
                 let size := extcodesize(addr)
-                // allocate output byte array - this could also be done without assembly
-                // by using code = new bytes(size)
+                // 分�输出字节数组 – 这也�以�用汇编语言�实现
+                // 通过使用 code = new bytes(size)
                 code := mload(0x40)
-                // new "memory end" including padding
+                // 包括补�在内新的 “memory end�
                 mstore(0x40, add(code, and(add(add(size, 0x20), 0x1f), not(0x1f))))
-                // store length in memory
+                // 把长度�存到内存中
                 mstore(code, size)
-                // actually retrieve the code, this needs assembly
+                // 实际获�代�，这需�汇编语言
                 extcodecopy(addr, add(code, 0x20), 0, size)
             }
         }
     }
 
-Inline assembly is also beneficial in cases where the optimizer fails to produce
-efficient code, for example:
+在优化器�能产生高效代�的情况下，内�汇编也是有益的，例如：
 
 .. code-block:: solidity
 
@@ -72,16 +67,16 @@ efficient code, for example:
 
 
     library VectorSum {
-        // This function is less efficient because the optimizer currently fails to
-        // remove the bounds checks in array access.
+        // 这个函数的执行效率比较低，
+        // 因为优化器当�无法删除数组访问中的边界检查。
         function sumSolidity(uint[] memory data) public pure returns (uint sum) {
             for (uint i = 0; i < data.length; ++i)
                 sum += data[i];
         }
 
-        // We know that we only access the array in bounds, so we can avoid the check.
-        // 0x20 needs to be added to an array because the first slot contains the
-        // array length.
+        // 我们知�我们�能在数组范围内访问数组元素，所以我们�以��检查。
+        // 由于 ABI 编�中数组数�的第一个字（32 字节）的�置�存的是数组长度，
+        // 所以我们在访问数组元素时需�加入 0x20 作为�移�。
         function sumAsm(uint[] memory data) public pure returns (uint sum) {
             for (uint i = 0; i < data.length; ++i) {
                 assembly {
@@ -90,21 +85,20 @@ efficient code, for example:
             }
         }
 
-        // Same as above, but accomplish the entire code within inline assembly.
+        // 和上�一样，但在内�汇编内完�整个代�。
         function sumPureAsm(uint[] memory data) public pure returns (uint sum) {
             assembly {
-                // Load the length (first 32 bytes)
+                // 加载数组长度（� 32 字节）
                 let len := mload(data)
 
-                // Skip over the length field.
+                // 略过长度字段。
                 //
-                // Keep temporary variable so it can be incremented in place.
+                // ��临时��以便它�以在原地增加。
                 //
-                // NOTE: incrementing data would result in an unusable
-                //       data variable after this assembly block
+                // 注�：递增data会导致在这个汇编�之�出现一个无法使用的data��。
                 let dataElementLocation := add(data, 0x20)
 
-                // Iterate until the bound is not met.
+                // 迭代到数组数�结�。
                 for
                     { let end := add(dataElementLocation, mul(len, 0x20)) }
                     lt(dataElementLocation, end)
@@ -118,28 +112,24 @@ efficient code, for example:
 
 .. index:: selector; of a function
 
-Access to External Variables, Functions and Libraries
+访问外部���函数和库
 -----------------------------------------------------
 
-You can access Solidity variables and other identifiers by using their name.
+您�以通过使用其�称�访问 Solidity ��和其他标识符。
 
-Local variables of value type are directly usable in inline assembly.
-They can both be read and assigned to.
+值类型的局部���以直接用于内�汇编。它们既�以被读�也�以被赋值。
 
-Local variables that refer to memory evaluate to the address of the variable in memory, not the value itself.
-Such variables can also be assigned to, but note that an assignment will only change the pointer and not the data
-and that it is your responsibility to respect Solidity's memory management.
-See :ref:`Conventions in Solidity <conventions-in-solidity>`.
+指�内存的局部��是指内存中��的地�，而�是值本身。
+这样的��也�以被赋值，但请注�，赋值�会改�指针而�是数�，
+尊� Solidity 的内存管�是您的责任。
+�� :ref:`Solidity的惯例 <conventions-in-solidity>`。
 
-Similarly, local variables that refer to statically-sized calldata arrays or calldata structs
-evaluate to the address of the variable in calldata, not the value itself.
-The variable can also be assigned a new offset, but note that no validation is performed to ensure that
-the variable will not point beyond ``calldatasize()``.
+�样地，引用��大�的calldata数组或calldata结构的局部��会指�calldata中��的地�，
+而�是值本身。��也�以被分�一个新的�移�，但是请注�，
+没有进行验�以确����会指�超过 ``calldatasize()`` 的地方。
 
-For external function pointers the address and the function selector can be
-accessed using ``x.address`` and ``x.selector``.
-The selector consists of four right-aligned bytes.
-Both values can be assigned to. For example:
+对于外部函数指针，地�和函数选择器�以用 ``x.address`` 和 ``x.selector`` �访问。
+选择器由四个�对�的字节组�。两个值都�以被赋值。比如说：
 
 .. code-block:: solidity
     :force:
@@ -148,7 +138,7 @@ Both values can be assigned to. For example:
     pragma solidity >=0.8.10 <0.9.0;
 
     contract C {
-        // Assigns a new selector and address to the return variable @fun
+        // 将一个新的选择器和地�分�给返回�� @fun
         function combineToFunctionPointer(address newAddress, uint newSelector) public pure returns (function() external fun) {
             assembly {
                 fun.selector := newSelector
@@ -157,24 +147,20 @@ Both values can be assigned to. For example:
         }
     }
 
-For dynamic calldata arrays, you can access
-their calldata offset (in bytes) and length (number of elements) using ``x.offset`` and ``x.length``.
-Both expressions can also be assigned to, but as for the static case, no validation will be performed
-to ensure that the resulting data area is within the bounds of ``calldatasize()``.
+对于动�的calldata数组，您�以使用 ``x.offset`` 和 ``x.length`` 访问它们的calldata�移�（字节）和长度（元素数）。
+这两个表达�也�以被赋值，但是和��情况一样，�会进行验�以确�产生的数�区域在 ``calldatasize()`` 的范围内。
 
-For local storage variables or state variables, a single Yul identifier
-is not sufficient, since they do not necessarily occupy a single full storage slot.
-Therefore, their "address" is composed of a slot and a byte-offset
-inside that slot. To retrieve the slot pointed to by the variable ``x``, you
-use ``x.slot``, and to retrieve the byte-offset you use ``x.offset``.
-Using ``x`` itself will result in an error.
 
-You can also assign to the ``.slot`` part of a local storage variable pointer.
-For these (structs, arrays or mappings), the ``.offset`` part is always zero.
-It is not possible to assign to the ``.slot`` or ``.offset`` part of a state variable,
-though.
+对于本地存储��或状���，一个Yul标识符是�够的，因为它们�一定��一个完整的存储槽。
+因此，它们的 "地�" 是由一个槽和槽内的字节�移�组�。�检索�� ``x`` 所指�的槽，
+您�以使用 ``x.slot``，�检索字节�移�，您�以使用 ``x.offset`` 。
+使用 ``x`` 本身会导致错误。
 
-Local Solidity variables are available for assignments, for example:
+您也�以分�给本地存储��指针的 ``.slot`` 部分。
+对于这些（结构�数组或映射）， ``.offset`` 部分总是零。
+但��能分�给状���的 ``.slot`` 或 ``.offset`` 部分。
+
+本地 Solidity ���用于赋值，例如：
 
 .. code-block:: solidity
     :force:
@@ -186,74 +172,60 @@ Local Solidity variables are available for assignments, for example:
         uint b;
         function f(uint x) public view returns (uint r) {
             assembly {
-                // We ignore the storage slot offset, we know it is zero
-                // in this special case.
+                // 我们忽略了存储槽的�移�，我们知�在这�特殊情况下它是零。
                 r := mul(x, sload(b.slot))
             }
         }
     }
 
 .. warning::
-    If you access variables of a type that spans less than 256 bits
-    (for example ``uint64``, ``address``, or ``bytes16``),
-    you cannot make any assumptions about bits not part of the
-    encoding of the type. Especially, do not assume them to be zero.
-    To be safe, always clear the data properly before you use it
-    in a context where this is important:
-    ``uint32 x = f(); assembly { x := and(x, 0xffffffff) /* now use x */ }``
-    To clean signed types, you can use the ``signextend`` opcode:
+    如果您访问一个跨度�于256�的类型的��（例如 ``uint64``， ``address``，或 ``bytes16``），
+    您�能对�属于该类型的编�的��任何�设。特别是，���设它们是零。
+    为了安全起�，在使用�一定�适当清除数�，因为这一点很��：
+    ``uint32 x = f(); assembly { x := and(x, 0xffffff) /* 现在使用 x */ }``
+    为了清除有符�的类型，您�以使用 ``signextend`` �作�。
     ``assembly { signextend(<num_bytes_of_x_minus_one>, x) }``
 
 
-Since Solidity 0.6.0, the name of a inline assembly variable may not
-shadow any declaration visible in the scope of the inline assembly block
-(including variable, contract and function declarations).
+自Solidity 0.6.0以�，内�汇编��的�称�能影射内�汇编�范围内��的任何声明
+（包括����约和函数声明）。
 
-Since Solidity 0.7.0, variables and functions declared inside the
-inline assembly block may not contain ``.``, but using ``.`` is
-valid to access Solidity variables from outside the inline assembly block.
+自Solidity 0.7.0以�，在内�程��内声明的��和函数�能包� ``.``，
+但使用 ``.`` �以有效地从内�程��外访问Solidity��。
 
-Things to Avoid
+需���的事情
 ---------------
 
-Inline assembly might have a quite high-level look, but it actually is extremely
-low-level. Function calls, loops, ifs and switches are converted by simple
-rewriting rules and after that, the only thing the assembler does for you is re-arranging
-functional-style opcodes, counting stack height for
-variable access and removing stack slots for assembly-local variables when the end
-of their block is reached.
+内�汇编�能有一个相当高级的外观，但它实际上是�常低级的。
+函数调用�循环�if�件和switch�件都�以通过简�的改写规则进行转�，
+之�，汇编器为您�的唯一事情就是�新安排函数�的�作�，
+为��访问计算堆栈高度，并在达到汇编局部���的末端时移除堆栈槽。
 
 .. _conventions-in-solidity:
 
-Conventions in Solidity
+Solidity的的惯例
 -----------------------
 
 .. _assembly-typed-variables:
 
-Values of Typed Variables
+类型化��的值
 =========================
 
-In contrast to EVM assembly, Solidity has types which are narrower than 256 bits,
-e.g. ``uint24``. For efficiency, most arithmetic operations ignore the fact that
-types can be shorter than 256
-bits, and the higher-order bits are cleaned when necessary,
-i.e., shortly before they are written to memory or before comparisons are performed.
-This means that if you access such a variable
-from within inline assembly, you might have to manually clean the higher-order bits
-first.
+与EVM汇编相�，Solidity有比256�更窄的类型，例如： ``uint24``。
+为了�高效率，大多数算术�算忽略了类型�以短于256�的事实，高阶�在必�时被清�，
+例如，在它们被写入内存��久或在执行比较之�。
+这�味�，如果您从内�汇编中访问这样的��，您�能�得�先手动清�高阶�。
 
 .. _assembly-memory-management:
 
-Memory Management
+内存管�
 =================
 
-Solidity manages memory in the following way. There is a "free memory pointer"
-at position ``0x40`` in memory. If you want to allocate memory, use the memory
-starting from where this pointer points at and update it.
-There is no guarantee that the memory has not been used before and thus
-you cannot assume that its contents are zero bytes.
-There is no built-in mechanism to release or free allocated memory.
-Here is an assembly snippet you can use for allocating memory that follows the process outlined above:
+Solidity以下列方�管�内存。在内存中 ``0x40`` 的�置有一个 "空闲内存指针"。
+如果您想分�内存，从这个指针指�的地方开始使用内存，并更新它。
+�能��该内存以�没有被使用过，因此您�能�设其内容为零字节。
+没有内置的机制�释放或释放分�的内存。下�是一段汇编代�，
+您�以用它�分�内存，它�循上述的过程：
 
 .. code-block:: yul
 
@@ -262,38 +234,34 @@ Here is an assembly snippet you can use for allocating memory that follows the p
       mstore(0x40, add(pos, length))
     }
 
-The first 64 bytes of memory can be used as "scratch space" for short-term
-allocation. The 32 bytes after the free memory pointer (i.e., starting at ``0x60``)
-are meant to be zero permanently and is used as the initial value for
-empty dynamic memory arrays.
-This means that the allocatable memory starts at ``0x80``, which is the initial value
-of the free memory pointer.
+�64字节的内存�以作为短期分�的 "划痕空间（scratch space）"。
+空闲内存指针之�的32字节（�从 ``0x60`` 开始）是指永久为零，
+并作为空的动�内存数组的�始值使用。
+这�味��分�的内存从 ``0x80`` 开始，也就是空闲内存指针的�始值。
+
+Solidity中内存数组中的元素总是��32字节的�数
+（对于 ``bytes1[]`` �说也是如此，但对于 ``bytes`` 和 ``string`` �说�是这样）。
+多维内存数组是指�内存数组的指针。一个动�数组的长度被存储在数组的第一个槽里，��是数组元素。
 
-Elements in memory arrays in Solidity always occupy multiples of 32 bytes (this is
-even true for ``bytes1[]``, but not for ``bytes`` and ``string``). Multi-dimensional memory
-arrays are pointers to memory arrays. The length of a dynamic array is stored at the
-first slot of the array and followed by the array elements.
 
 .. warning::
-    Statically-sized memory arrays do not have a length field, but it might be added later
-    to allow better convertibility between statically and dynamically-sized arrays; so,
-    do not rely on this.
 
-Memory Safety
+    ��大�的内存数组没有长度字段，但以��能会加入长度字段，
+    以便在��大�的数组和动�大�的数组之间有更好的转�性；所以，���赖这个特性。
+
+内存安全
 =============
 
-Without the use of inline assembly, the compiler can rely on memory to remain in a well-defined
-state at all times. This is especially relevant for :ref:`the new code generation pipeline via Yul IR <ir-breaking-changes>`:
-this code generation path can move local variables from stack to memory to avoid stack-too-deep errors and
-perform additional memory optimizations, if it can rely on certain assumptions about memory use.
+在�使用内�汇编的情况下，编译器�以��内存在任何时候都��一个良好的定义状�。
+这对于 :ref:`通过 Yul IR 的新代�生�管� <ir-breaking-changes>` �说尤其��：
+这个代�生�路径�以将局部��从堆栈转移到内存，以��堆栈过深的错误，并执行�外的内存优化，
+如果它�以�赖于对内存使用的�些�设的�。
 
-While we recommend to always respect Solidity's memory model, inline assembly allows you to use memory
-in an incompatible way. Therefore, moving stack variables to memory and additional memory optimizations are,
-by default, globally disabled in the presence of any inline assembly block that contains a memory operation
-or assigns to Solidity variables in memory.
+虽然我们建议始终尊� Solidity 的内存模型，但内�汇编�许您以�兼容的方�使用内存。
+因此，在任何包�内存�作或在内存中分�给 Solidity ��的内�汇编�存在的情况下，
+将堆栈��移动到内存和�外的内存优化默认为全局�用。
 
-However, you can specifically annotate an assembly block to indicate that it in fact respects Solidity's memory
-model as follows:
+然而，您�以特别注释一个汇编�，以表明它实际上是�循 Solidity 内存模型的，如下所示：
 
 .. code-block:: solidity
 
@@ -301,20 +269,19 @@ model as follows:
         ...
     }
 
-In particular, a memory-safe assembly block may only access the following memory ranges:
+特别的是，一个内存安全的汇编��能访问以下内存范围：
 
-- Memory allocated by yourself using a mechanism like the ``allocate`` function described above.
-- Memory allocated by Solidity, e.g. memory within the bounds of a memory array you reference.
-- The scratch space between memory offset 0 and 64 mentioned above.
-- Temporary memory that is located *after* the value of the free memory pointer at the beginning of the assembly block,
-  i.e. memory that is "allocated" at the free memory pointer without updating the free memory pointer.
+- 通过上述 ``allocate`` 函数这样的机制由自己分�的内存。
+- 由 Solidity 分�的内存，例如，在您引用的内存数组的范围内的内存。
+- 上��到的内存�移�0和64之间的划痕空间。
+- �于汇编�开始时的空闲内存指针值 *之�* 的临时内存，
+  �在空闲内存指针上 “分�� 而�更新空闲内存指针的内存。
 
-Furthermore, if the assembly block assigns to Solidity variables in memory, you need to assure that accesses to
-the Solidity variables only access these memory ranges.
+此外，如果汇编�分�给内存中的 Solidity ��，则需�确�对 Solidity ��的访问�访问这些内存范围。
 
-Since this is mainly about the optimizer, these restrictions still need to be followed, even if the assembly block
-reverts or terminates. As an example, the following assembly snippet is not memory safe, because the value of
-``returndatasize()`` may exceed the 64 byte scratch space:
+由于这主�是关于优化器的，所以这些�制�然需�被�守，�使汇编�回退或终止。
+举个例�，下�的汇编片段�是内存安全的，
+因为 ``returndatasize()`` 的值�能会超过64字节的划痕空间。
 
 .. code-block:: solidity
 
@@ -323,8 +290,8 @@ reverts or terminates. As an example, the following assembly snippet is not memo
       revert(0, returndatasize())
     }
 
-On the other hand, the following code *is* memory safe, because memory beyond the location pointed to by the
-free memory pointer can safely be used as temporary scratch space:
+�一方�，下�的代� *是* 内存安全的，
+因为超出空闲内存指针所指�的�置的内存�以安全地用作临时划痕空间：
 
 .. code-block:: solidity
 
@@ -334,10 +301,10 @@ free memory pointer can safely be used as temporary scratch space:
       revert(p, returndatasize())
     }
 
-Note that you do not need to update the free memory pointer if there is no following allocation,
-but you can only use memory starting from the current offset given by the free memory pointer.
+注�，如果没有�续分�，则�需�更新空闲内存指针，
+但�能使用从空闲内存指针给出的当��移�开始的内存。
 
-If the memory operations use a length of zero, it is also fine to just use any offset (not only if it falls into the scratch space):
+如果内存�作使用的长度为0，那么也�以使用任��移�（�仅仅是�在了划痕空间中）；
 
 .. code-block:: solidity
 
@@ -345,8 +312,8 @@ If the memory operations use a length of zero, it is also fine to just use any o
       revert(0, 0)
     }
 
-Note that not only memory operations in inline assembly itself can be memory-unsafe, but also assignments to
-Solidity variables of reference type in memory. For example the following is not memory-safe:
+请注�，�仅内�汇编中的内存�作本身�以是内存�安全的，
+而且对内存中引用类型的 Solidity ��的赋值也是如此。例如，以下内容就�是内存安全的：
 
 .. code-block:: solidity
 
@@ -356,16 +323,22 @@ Solidity variables of reference type in memory. For example the following is not
     }
     x[0x20] = 0x42;
 
-Inline assembly that neither involves any operations that access memory nor assigns to any Solidity variables
-in memory is automatically considered memory-safe and does not need to be annotated.
+既�涉�访问内存的任何�作，也�对内存中的任何 Solidity ��进行赋值的内�汇编，
+自动被认为是内存安全的，�需�被注释。
 
 .. warning::
+<<<<<<< HEAD
+    确�汇编�程�实际满足内存模型是您的责任。
+    如果您将一个汇编�注释为内存安全的，但���了其中一个内存�设，
+    那么这 **将** 导致�正确的和未定义的行为，而这些行为�容易通过测试�现。
+=======
     It is your responsibility to make sure that the assembly actually satisfies the memory model. If you annotate
     an assembly block as memory-safe, but violate one of the memory assumptions, this **will** lead to incorrect and
     undefined behavior that cannot easily be discovered by testing.
+>>>>>>> english/develop
 
-In case you are developing a library that is meant to be compatible across multiple versions
-of Solidity, you can use a special comment to annotate an assembly block as memory-safe:
+如果您正在开�一个�在多个 Solidity 版本之间兼容的库，
+您�以使用一个特殊的注释将一个汇编�注释为内存安全的：
 
 .. code-block:: solidity
 
@@ -374,5 +347,10 @@ of Solidity, you can use a special comment to annotate an assembly block as memo
         ...
     }
 
+<<<<<<< HEAD
+请注�，我们将在未�的�破性版本中��许通过注释的方�进行注解；
+因此，如果您�关心与旧编译器版本的��兼容问题，最好使用这�写法的代�字符串形�。
+=======
 Note that we will disallow the annotation via comment in a future breaking release; so, if you are not concerned with
 backward-compatibility with older compiler versions, prefer using the dialect string.
+>>>>>>> english/develop
diff --git a/docs/brand-guide.rst b/docs/brand-guide.rst
index cf471c5e3c5c..8628265f7d46 100644
--- a/docs/brand-guide.rst
+++ b/docs/brand-guide.rst
@@ -1,86 +1,75 @@
 ####################
-Solidity Brand Guide
+Solidity �牌指�
 ####################
 
-This brand guide features information on Solidity's brand policy and
-logo usage guidelines.
+该�牌指�的特点是关于Solidity的�牌政策和标志使用指�的信�。
 
-The Solidity Brand
+Solidity�牌
 ==================
 
-The Solidity programming language is an open-source, community project
-governed by a core team. The core team is sponsored by the `Ethereum
-Foundation <https://ethereum.foundation/>`_.
+Solidity编程语言是一个开�的社区项目，由一个核心团队管�。
+该核心团队由 `以太�基金会 <https://ethereum.foundation/>`_ 赞助。
 
-This document aims to provide information about how to best use the
-Solidity brand name and logo.
+本文件旨在�供有关如何最好地使用 Solidity �牌�称和标识的信�。
 
-We encourage you to read this document carefully before using the
-brand name or the logo. Your cooperation is highly appreciated!
+我们鼓励您在使用该�牌�称或标志之�仔细阅读本文件。我们�常感谢您的�作!
 
-Solidity Brand Name
+Solidity �牌�称
 ===================
 
-"Solidity" should be used to refer to the Solidity programming language
-solely.
+“Solidity� 应该�用�指Solidity编程语言。
 
-Please do not use "Solidity":
+请��按以下方�使用 “Solidity�：
 
-- To refer to any other programming language.
+- 指的是任何其他编程语言。
 
-- In a way that is misleading or may imply association of unrelated
-  modules, tools, documentation, or other resources with the Solidity
-  programming language.
+- 以一�误导性的方�，或�能暗示�相关的模�，工具，文档
+  或其他资�与 Solidity 编程语言的关�。
 
-- In ways that confuse the community as to whether the Solidity
-  programming language is open-source and free to use.
+- 在方�上，混淆了社区对Solidity编程语言是�开�和�费使用的看法。
 
-Solidity Logo License
+Solidity标志许�
 =====================
 
 .. image:: https://i.creativecommons.org/l/by/4.0/88x31.png
   :width: 88
   :alt: Creative Commons License
 
-The Solidity logo is distributed and licensed under a `Creative Commons
-Attribution 4.0 International License <https://creativecommons.org/licenses/by/4.0/>`_.
+Solidity标志是在
+`创�共享署�4.0国际许��议 <https://creativecommons.org/licenses/by/4.0/>`_ 下�布和许�的。
 
-This is the most permissive Creative Commons license and allows reuse
-and modifications for any purpose.
+这是最宽�的知识共享�议，�许为任何目的进行�利用和修改。
 
-You are free to:
+您�以自由选择以下方�：
 
-- **Share** — Copy and redistribute the material in any medium or format.
+- **分享** - 以任何媒介或形��制和�新分��料。
 
-- **Adapt** — Remix, transform, and build upon the material for any
-  purpose, even commercially.
+- **修改** - 为任何目的，甚至为商业目的，对�料进行混音，改造和构建。
 
-Under the following terms:
+根�以下�款：
 
-- **Attribution** — You must give appropriate credit, provide a link to
-  the license, and indicate if changes were made. You may do so in any
-  reasonable manner, but not in any way that suggests that the Solidity
-  core team endorses you or your use.
+- **署�** - 您必须给予适当的信用，�供到许��的链接，并说明是�进行了修改。
+  您�以以任何��的方�这样�，但�能以任何方�暗示 Solidity 核心团队认�您或您的使用。
 
-When using the Solidity logo, please respect the Solidity logo guidelines.
+在使用Solidity标识时，请尊�Solidity标识指�。
 
-Solidity Logo Guidelines
+Solidity标志指�
 ========================
 
 .. image:: solidity_logo.svg
   :width: 256
 
-*(Right click on the logo to download it.)*
+*（�键点击标识��下载。）*
 
-Please do not:
+请��这样�：
 
-- Change the ratio of the logo (do not stretch it or cut it).
+- 改�标志的比例（��拉伸或切割）。
 
-- Change the colors of the logo, unless it is absolutely necessary.
+- 改�标志的颜色，除�是�对必�。
 
-Credits
+信用
 =======
 
-This document was, in parts, derived from the `Python Software
-Foundation Trademark Usage Policy <https://www.python.org/psf/trademarks/>`_
-and the `Rust Media Guide <https://www.rust-lang.org/policies/media-guide>`_.
+本文件部分内容�自于
+`Python软件基金会商标使用政策 <https://www.python.org/psf/trademarks/>`_
+和 `Rust媒介指� <https://www.rust-lang.org/policies/media-guide>`_ 。
diff --git a/docs/bugs.json b/docs/bugs.json
index 6245bdeda5af..c853f95eddea 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,14 @@
 [
+    {
+        "uid": "SOL-2023-3",
+        "name": "VerbatimInvalidDeduplication",
+        "summary": "All ``verbatim`` blocks are considered identical by deduplicator and can incorrectly be unified when surrounded by identical opcodes.",
+        "description": "The block deduplicator is a step of the opcode-based optimizer which identifies equivalent assembly blocks and merges them into a single one. However, when blocks contained ``verbatim``, their comparison was performed incorrectly, leading to the collapse of assembly blocks which are identical except for the contents of the ``verbatim`` items. Since ``verbatim`` is only available in Yul, compilation of Solidity sources is not affected.",
+        "link": "https://blog.soliditylang.org/2023/11/08/verbatim-invalid-deduplication-bug/",
+        "introduced": "0.8.5",
+        "fixed": "0.8.23",
+        "severity": "low"
+    },
     {
         "uid": "SOL-2023-2",
         "name": "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
diff --git a/docs/bugs.rst b/docs/bugs.rst
index 350b1e7a48e8..75c527de4401 100644
--- a/docs/bugs.rst
+++ b/docs/bugs.rst
@@ -3,82 +3,72 @@
 .. _known_bugs:
 
 ##################
-List of Known Bugs
+已知bug列表
 ##################
 
+<<<<<<< HEAD
+下�，您�以找到一个JSON格�的列表，其中包括Solidity编译器中一些已知的与安全有关的错误。
+该文件本身托管在 `Github 仓库 <https://github.com/ethereum/solidity/blob/develop/docs/bugs.json>`_。
+该列表最早�以追溯到0.3.0版本，�有在此之�的版本中已知的错误没有列出。
+=======
 Below, you can find a JSON-formatted list of some of the known security-relevant bugs in the
-Solidity compiler. The file itself is hosted in the `Github repository
+Solidity compiler. The file itself is hosted in the `GitHub repository
 <https://github.com/ethereum/solidity/blob/develop/docs/bugs.json>`_.
 The list stretches back as far as version 0.3.0, bugs known to be present only
 in versions preceding that are not listed.
+>>>>>>> english/develop
 
-There is another file called `bugs_by_version.json
-<https://github.com/ethereum/solidity/blob/develop/docs/bugs_by_version.json>`_,
-which can be used to check which bugs affect a specific version of the compiler.
+还有一个文件�
+`bugs_by_version.json <https://github.com/ethereum/solidity/blob/develop/docs bugs_by_version.json>`_，
+它�以用�检查哪些bug影�到特定版本的编译器。
 
-Contract source verification tools and also other tools interacting with
-contracts should consult this list according to the following criteria:
+�约��验�工具以�其他与�约交互的工具应根�以下标准查阅此列表：
 
-- It is mildly suspicious if a contract was compiled with a nightly
-  compiler version instead of a released version. This list does not keep
-  track of unreleased or nightly versions.
-- It is also mildly suspicious if a contract was compiled with a version that was
-  not the most recent at the time the contract was created. For contracts
-  created from other contracts, you have to follow the creation chain
-  back to a transaction and use the date of that transaction as creation date.
-- It is highly suspicious if a contract was compiled with a compiler that
-  contains a known bug and the contract was created at a time where a newer
-  compiler version containing a fix was already released.
+- 如果�约是用夜间编译器版本而�是�布版本编译的，那就有点�疑了。
+  此列表�跟踪未�布或夜间版本。
+- 如果�约的编译版本�是�约创建时的最新版本，则也有点�疑。
+  对于从其他�约创建的�约，您必须按照创建链返回到事务，并使用该事务的日期作为创建日期。
+- 如果�约是用包�已知bug的编译器编译的，并且�约是在已�布包�修�程�的较新编译器版本时创建的，
+  则这是高度�疑的。
 
-The JSON file of known bugs below is an array of objects, one for each bug,
-with the following keys:
+下�的已知错误的JSON文件是一个对象数组，�个错误都有一个对象，其键值如下：
 
 uid
-    Unique identifier given to the bug in the form of ``SOL-<year>-<number>``.
-    It is possible that multiple entries exists with the same uid. This means
-    multiple version ranges are affected by the same bug.
+    以 ``SOL-<year>-<number>`` 的形�给予该错误的唯一标识符。
+    有�能存在多个具有相�uid的�目。
+    这�味�多个版本范围�到�一错误的影�。
 name
-    Unique name given to the bug
+    给予该错误的唯一�称
 summary
-    Short description of the bug
+    对该错误的简短�述
 description
-    Detailed description of the bug
+    该错误的详细�述
 link
-    URL of a website with more detailed information, optional
+    有更多详细信�的网站的URL，�选
 introduced
-    The first published compiler version that contained the bug, optional
+    第一个包�该错误的�布的编译器版本，�选
 fixed
-    The first published compiler version that did not contain the bug anymore
+    第一个��包�该错误的�布的编译器版本
 publish
-    The date at which the bug became known publicly, optional
+    bug公开的日期，�选
 severity
-    Severity of the bug: very low, low, medium, high. Takes into account
-    discoverability in contract tests, likelihood of occurrence and
-    potential damage by exploits.
+    bug的严�程度：�常低，低，中，高。
+    考虑�约测试中的��现性，�生的�能性和错误造�的潜在�害。
 conditions
-    Conditions that have to be met to trigger the bug. The following
-    keys can be used:
-    ``optimizer``, Boolean value which
-    means that the optimizer has to be switched on to enable the bug.
-    ``evmVersion``, a string that indicates which EVM version compiler
-    settings trigger the bug. The string can contain comparison
-    operators. For example, ``">=constantinople"`` means that the bug
-    is present when the EVM version is set to ``constantinople`` or
-    later.
-    If no conditions are given, assume that the bug is present.
+    必须满足的�件�能触�该错误。�以使用以下键：
+    ``optimizer``, 布尔值，表示优化器必须打开�会出现该错误。
+    ``evmVersion``, 一个字符串，表示哪个EVM版本的编译器设置触�了该错误。
+    这个字符串�以包�比较�算符。例如， ``">=constantinople"`` 表示
+    当EVM版本设置为 ``constantinople`` 或更高时，该错误就会出现。
+    如果没有给出�件，则�定该错误存在。
 check
-    This field contains different checks that report whether the smart contract
-    contains the bug or not. The first type of check are JavaScript regular
-    expressions that are to be matched against the source code ("source-regex")
-    if the bug is present.  If there is no match, then the bug is very likely
-    not present. If there is a match, the bug might be present.  For improved
-    accuracy, the checks should be applied to the source code after stripping
-    comments.
-    The second type of check are patterns to be checked on the compact AST of
-    the Solidity program ("ast-compact-json-path"). The specified search query
-    is a `JsonPath <https://github.com/json-path/JsonPath>`_ expression.
-    If at least one path of the Solidity AST matches the query, the bug is
-    likely present.
+    这个字段包���的检查，报告智能�约是�包�错误。
+    第一�类型的检查是JavaScript正则表达�，如果存在该错误，将与�代�（“source-regex�）进行匹�。
+    如果没有匹�，那么该�洞很�能�存在。如果有一个匹�，则该错误�能存在。
+    为了�高准确性，检查应该在剥离注释�应用于�代�。
+    第二�类型的检查是在Solidity程�的紧凑AST上检查的模�（“ast-compact-json path�）。
+    指定的�索查询是一个 `JsonPath <https://github.com/json-path/JsonPath>`_ 表达�。
+    如果Solidity AST中至少有一个路径与该查询相匹�，则�能存在错误。
 
 .. literalinclude:: bugs.json
    :language: js
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index d15c72a65424..676fe6c9665e 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1743,6 +1743,7 @@
     },
     "0.8.10": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1754,6 +1755,7 @@
     },
     "0.8.11": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1766,6 +1768,7 @@
     },
     "0.8.12": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1778,6 +1781,7 @@
     },
     "0.8.13": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
@@ -1791,6 +1795,7 @@
     },
     "0.8.14": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
@@ -1802,6 +1807,7 @@
     },
     "0.8.15": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
@@ -1811,6 +1817,7 @@
     },
     "0.8.16": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination"
@@ -1819,6 +1826,7 @@
     },
     "0.8.17": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
@@ -1826,6 +1834,7 @@
     },
     "0.8.18": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
@@ -1833,6 +1842,7 @@
     },
     "0.8.19": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
@@ -1854,15 +1864,32 @@
     },
     "0.8.20": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
         "released": "2023-05-10"
     },
     "0.8.21": {
-        "bugs": [],
+        "bugs": [
+            "VerbatimInvalidDeduplication"
+        ],
         "released": "2023-07-19"
     },
+    "0.8.22": {
+        "bugs": [
+            "VerbatimInvalidDeduplication"
+        ],
+        "released": "2023-10-25"
+    },
+    "0.8.23": {
+        "bugs": [],
+        "released": "2023-11-08"
+    },
+    "0.8.24": {
+        "bugs": [],
+        "released": "2024-01-25"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
@@ -1890,6 +1917,7 @@
     },
     "0.8.5": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1902,6 +1930,7 @@
     },
     "0.8.6": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1914,6 +1943,7 @@
     },
     "0.8.7": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1926,6 +1956,7 @@
     },
     "0.8.8": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1939,6 +1970,7 @@
     },
     "0.8.9": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1948,4 +1980,4 @@
         ],
         "released": "2021-09-29"
     }
-}
\ No newline at end of file
+}
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index a60d3b50f526..3eaca0508b55 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -1,63 +1,97 @@
 **********
-Cheatsheet
+速查表
 **********
 
 .. index:: operator;precedence
 
-Order of Precedence of Operators
+�作符的优先顺�
 ================================
 
 .. include:: types/operator-precedence-table.rst
 
 .. index:: abi;decode, abi;encode, abi;encodePacked, abi;encodeWithSelector, abi;encodeCall, abi;encodeWithSignature
 
-ABI Encoding and Decoding Functions
-===================================
-
-- ``abi.decode(bytes memory encodedData, (...)) returns (...)``: :ref:`ABI <ABI>`-decodes
-  the provided data. The types are given in parentheses as second argument.
-  Example: ``(uint a, uint[2] memory b, bytes memory c) = abi.decode(data, (uint, uint[2], bytes))``
-- ``abi.encode(...) returns (bytes memory)``: :ref:`ABI <ABI>`-encodes the given arguments
-- ``abi.encodePacked(...) returns (bytes memory)``: Performs :ref:`packed encoding <abi_packed_mode>` of
-  the given arguments. Note that this encoding can be ambiguous!
-- ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: :ref:`ABI <ABI>`-encodes
-  the given arguments starting from the second and prepends the given four-byte selector
-- ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``: ABI-encodes a call to ``functionPointer`` with the arguments found in the
-  tuple. Performs a full type-check, ensuring the types match the function signature. Result equals ``abi.encodeWithSelector(functionPointer.selector, (...))``
-- ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent
-  to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
+ABI 编�和解�函数
+===================
+
+- ``abi.decode(bytes memory encodedData, (...)) returns (...)``: :ref:`ABI <ABI>` - 对�供的数�进行解�。类型在括�中作为第二个�数给出。
+  示例： ``(uint a, uint[2] memory b, bytes memory c) = abi.decode(data, (uint, uint[2], bytes))``
+- ``abi.encode(...) returns (bytes memory)``: :ref:`ABI <ABI>` -  对给定的�数进行编�。
+- ``abi.encodePacked(...) returns (bytes memory)``: 对给定的�数执行 :ref:`紧密打包 <abi_packed_mode>`。
+  请注�，这�编��能是�明确的!
+- ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: :ref:`ABI <ABI>` - 对给定�数进行编�，
+  并以给定的函数选择器作为起始的 4 字节数�一起返回
+- ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``: 对 ``functionPointer`` 的调用进行ABI编�，
+  �数在元组中找到。执行全�的类型检查，确�类型与函数签�相符。结果等于 ``abi.encodeWithSelector(functionPointer.selector(..))``。
+- ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: 等价于
+  ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
 
 .. index:: bytes;concat, string;concat
 
-Members of ``bytes`` and  ``string``
+``bytes`` 和  ``string`` 类型的属性
 ====================================
 
-- ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of
-  arguments to one byte array<bytes-concat>`
+- ``bytes.concat(...) returns (bytes memory)``: :ref:`将��数�的�数连接�一个字节数组 <bytes-concat>`
 
-- ``string.concat(...) returns (string memory)``: :ref:`Concatenates variable number of
-  arguments to one string array<string-concat>`
+- ``string.concat(...) returns (string memory)``: :ref:`将��数�的�数连接�一个字符串数组 <string-concat>`
 
 .. index:: address;balance, address;codehash, address;send, address;code, address;transfer
 
-Members of ``address``
+``address`` 类型的属性
 ======================
 
+<<<<<<< HEAD
+- ``<address>.balance`` (``uint256``): :ref:`address` 的余�，以 Wei 为��
+- ``<address>.code`` (``bytes memory``): 在 :ref:`address` 的代�（�以是空的）
+- ``<address>.codehash`` (``bytes32``): :ref:`address` 的代�哈希值
+- ``<address payable>.send(uint256 amount) returns (bool)``: � :ref:`address` ��给定数�的 Wei，
+  失败时返回 ``false``
+- ``<address payable>.transfer(uint256 amount)``: � :ref:`address` ��给定数�的 Wei，失败时会抛出错误
+=======
 - ``<address>.balance`` (``uint256``): balance of the :ref:`address` in Wei
 - ``<address>.code`` (``bytes memory``): code at the :ref:`address` (can be empty)
 - ``<address>.codehash`` (``bytes32``): the codehash of the :ref:`address`
+- ``<address>.call(bytes memory) returns (bool, bytes memory)``: issue low-level ``CALL`` with the given payload,
+  returns success condition and return data
+- ``<address>.delegatecall(bytes memory) returns (bool, bytes memory)``: issue low-level ``DELEGATECALL`` with the given payload,
+  returns success condition and return data
+- ``<address>.staticcall(bytes memory) returns (bool, bytes memory)``: issue low-level ``STATICCALL`` with the given payload,
+  returns success condition and return data
 - ``<address payable>.send(uint256 amount) returns (bool)``: send given amount of Wei to :ref:`address`,
   returns ``false`` on failure
 - ``<address payable>.transfer(uint256 amount)``: send given amount of Wei to :ref:`address`, throws on failure
+>>>>>>> english/develop
 
-.. index:: blockhash, block, block;basefree, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
+.. index:: blockhash, blobhash, block, block;basefee, block;blobbasefee, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
 .. index:: gasleft, msg;data, msg;sender, msg;sig, msg;value, tx;gasprice, tx;origin
 
-Block and Transaction Properties
-================================
-
+区�和交易属性
+====================
+
+<<<<<<< HEAD
+- ``blockhash(uint blockNumber) returns (bytes32)``: 给定区�的哈希值 - �对最近的256个区�有效
+- ``block.basefee`` (``uint``): 当�区�的基本费用 （ `EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ 和 `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_ ）
+- ``block.chainid`` (``uint``): 当�链的ID
+- ``block.coinbase`` (``address payable``): 当�区�矿工的地�
+- ``block.difficulty`` (``uint``): 当�区�的难度值（ ``EVM < Paris`` ）。对于其他EVM版本，它是 ``block.prevrandao`` 的一个废弃的别�，将在下一个�大改�版本中被删除。
+- ``block.gaslimit`` (``uint``): 当�区�的 gas 上�
+- ``block.number`` (``uint``): 当�区�的区��
+- ``block.prevrandao`` (``uint``): 由信标链�供的�机数（ ``EVM >= Paris`` ）（� `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ ）。
+- ``block.timestamp`` (``uint``): 当�区�的时间戳，自Unix epoch以�的秒数
+- ``gasleft() returns (uint256)``: 剩余gas
+- ``msg.data`` (``bytes``): 完整的调用数�
+- ``msg.sender`` (``address``): 消���方（当�调用）
+- ``msg.sig`` (``bytes4``): Calldata的�四个字节（�函数标识符）。
+- ``msg.value`` (``uint``): �消���的 wei 的数�
+- ``tx.gasprice`` (``uint``): 交易的 gas 价格
+- ``tx.origin`` (``address``): 交易��方（完整调用链上的原始��方）
+=======
 - ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block - only works for 256 most recent blocks
+- ``blobhash(uint index) returns (bytes32)``: versioned hash of the ``index``-th blob associated with the current transaction.
+  A versioned hash consists of a single byte representing the version (currently ``0x01``), followed by the last 31 bytes
+  of the SHA256 hash of the KZG commitment (`EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
+- ``block.blobbasefee`` (``uint``): current block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
 - ``block.difficulty`` (``uint``): current block difficulty (``EVM < Paris``). For other EVM versions it behaves as a deprecated alias for ``block.prevrandao`` that will be removed in the next breaking release
@@ -72,60 +106,66 @@ Block and Transaction Properties
 - ``msg.value`` (``uint``): number of wei sent with the message
 - ``tx.gasprice`` (``uint``): gas price of the transaction
 - ``tx.origin`` (``address``): sender of the transaction (full call chain)
+>>>>>>> english/develop
 
 .. index:: assert, require, revert
 
-Validations and Assertions
-==========================
+验�和断言
+===========
 
-- ``assert(bool condition)``: abort execution and revert state changes if condition is ``false`` (use for internal error)
-- ``require(bool condition)``: abort execution and revert state changes if condition is ``false`` (use
-  for malformed input or error in external component)
-- ``require(bool condition, string memory message)``: abort execution and revert state changes if
-  condition is ``false`` (use for malformed input or error in external component). Also provide error message.
-- ``revert()``: abort execution and revert state changes
-- ``revert(string memory message)``: abort execution and revert state changes providing an explanatory string
+- ``assert(bool condition)``: 如果�件为 ``false``，则中止执行并��状��化（用于内部错误）
+- ``require(bool condition)``: 如果�件为 ``false``，则中止执行并��状��化（用于错误的输入或外部组件的错误）
+- ``require(bool condition, string memory message)``: 如果�件为 ``false``，
+  则中止执行并��状��化（用于错误的输入或外部组件的错误）。�时�供错误信�。
+- ``revert()``: 中止执行并��状��化
+- ``revert(string memory message)``: 中止执行并��状��化，�供一个解释性的字符串
 
 .. index:: cryptography, keccak256, sha256, ripemd160, ecrecover, addmod, mulmod
 
-Mathematical and Cryptographic Functions
-========================================
+数学和加密函数
+===============
 
-- ``keccak256(bytes memory) returns (bytes32)``: compute the Keccak-256 hash of the input
-- ``sha256(bytes memory) returns (bytes32)``: compute the SHA-256 hash of the input
-- ``ripemd160(bytes memory) returns (bytes20)``: compute the RIPEMD-160 hash of the input
-- ``ecrecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) returns (address)``: recover address associated with
-  the public key from elliptic curve signature, return zero on error
-- ``addmod(uint x, uint y, uint k) returns (uint)``: compute ``(x + y) % k`` where the addition is performed with
-  arbitrary precision and does not wrap around at ``2**256``. Assert that ``k != 0`` starting from version 0.5.0.
-- ``mulmod(uint x, uint y, uint k) returns (uint)``: compute ``(x * y) % k`` where the multiplication is performed
-  with arbitrary precision and does not wrap around at ``2**256``. Assert that ``k != 0`` starting from version 0.5.0.
+- ``keccak256(bytes memory) returns (bytes32)``: 计算输入的Keccak-256哈希值
+- ``sha256(bytes memory) returns (bytes32)``: 计算输入的SHA-256哈希值
+- ``ripemd160(bytes memory) returns (bytes20)``: 计算输入的RIPEMD-160的哈希值
+- ``ecrecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) returns (address)``: 从椭圆曲线签�中��与公钥相关的地�，
+  错误时返回0
+- ``addmod(uint x, uint y, uint k) returns (uint)``: 计算 ``(x + y) % k`` 的值，
+  其中加法的结果�使超过 ``2**256`` 也�会被截�。从 0.5.0 版本开始会加入对 ``k != 0`` 的 assert（�会在此函数开头执行 ``assert(k != 0);`` 作为�数检查，译者注）。
+- ``mulmod(uint x, uint y, uint k) returns (uint)``: 计算 ``(x * y) % k`` 的值，
+  其中乘法的结果�使超过 ``2**256`` 也�会被截�。从 0.5.0 版本开始会加入对 ``k != 0`` 的 assert（�会在此函数开头执行 ``assert(k != 0);`` 作为�数检查，译者注）。
 
 .. index:: this, super, selfdestruct
 
-Contract-related
+�约相关函数
 ================
 
+<<<<<<< HEAD
+- ``this`` （当��约的类型）： 当��约，�明确转�为 ``address`` 或 ``address payable``
+- ``super``: 继承层次中高一级的�约
+- ``selfdestruct(address payable recipient)``: 销�当��约，将其资金��到给定的地�
+=======
 - ``this`` (current contract's type): the current contract, explicitly convertible to ``address`` or ``address payable``
 - ``super``: a contract one level higher in the inheritance hierarchy
-- ``selfdestruct(address payable recipient)``: destroy the current contract, sending its funds to the given address
+- ``selfdestruct(address payable recipient)``: send all funds to the given address and (only on EVMs before Cancun or when invoked within the transaction creating the contract) destroy the contract.
+>>>>>>> english/develop
 
 .. index:: type;name, type;creationCode, type;runtimeCode, type;interfaceId, type;min, type;max
 
-Type Information
+类型属性
 ================
 
-- ``type(C).name`` (``string``): the name of the contract
-- ``type(C).creationCode`` (``bytes memory``): creation bytecode of the given contract, see :ref:`Type Information<meta-type>`.
-- ``type(C).runtimeCode`` (``bytes memory``): runtime bytecode of the given contract, see :ref:`Type Information<meta-type>`.
-- ``type(I).interfaceId`` (``bytes4``): value containing the EIP-165 interface identifier of the given interface, see :ref:`Type Information<meta-type>`.
-- ``type(T).min`` (``T``): the minimum value representable by the integer type ``T``, see :ref:`Type Information<meta-type>`.
-- ``type(T).max`` (``T``): the maximum value representable by the integer type ``T``, see :ref:`Type Information<meta-type>`.
+- ``type(C).name`` (``string``): �约的�称
+- ``type(C).creationCode`` (``bytes memory``): 给定�约的创建字节�，�� :ref:`类型信� <meta-type>`。
+- ``type(C).runtimeCode`` (``bytes memory``): 给定�约的�行时字节�，�� :ref:`类型信� <meta-type>`。
+- ``type(I).interfaceId`` (``bytes4``): 包�给定接�的EIP-165接�标识符的值，�� :ref:`类型信� <meta-type>`。
+- ``type(T).min`` (``T``): 整数类型 ``T`` 所能代表的最�值，�� :ref:`类型信� <meta-type>`。
+- ``type(T).max`` (``T``): 整数类型 ``T`` 所能代表的最大值，�� :ref:`类型信� <meta-type>`。
 
 
 .. index:: visibility, public, private, external, internal
 
-Function Visibility Specifiers
+函数��性说明符
 ==============================
 
 .. code-block:: solidity
@@ -135,21 +175,32 @@ Function Visibility Specifiers
         return true;
     }
 
-- ``public``: visible externally and internally (creates a :ref:`getter function<getter-functions>` for storage/state variables)
-- ``private``: only visible in the current contract
-- ``external``: only visible externally (only for functions) - i.e. can only be message-called (via ``this.func``)
-- ``internal``: only visible internally
+- ``public``： 内部�外部���（�考为存储/状���创建 :ref:`getter function<getter-functions>` 函数）
+- ``private``： 仅在当��约内��
+- ``external``： 仅在外部��（仅�修饰函数）——就是说，仅�用于消�调用（�使在�约内调用，也�能通过 ``this.func`` 的方�）
+- ``internal``： 仅在内部��（也就是在当� Solidity �代�文件内���，�仅�于当��约内，译者注）
 
 
 .. index:: modifiers, pure, view, payable, constant, anonymous, indexed
 
-Modifiers
+修改器
 =========
 
+<<<<<<< HEAD
+- ``pure`` 修饰函数时：��许修改或访问状�。
+- ``view`` 修饰函数时：��许修改状�。
+- ``payable`` 修饰函数时：�许从调用中接收以太�。
+- ``constant`` 修饰状���时：��许赋值（除�始化以外），�会�� 存储�槽（storage slot）。
+- ``immutable`` 修饰状���时：在构造时�许有一个确切的赋值，之�是�定的。被存储在代�中。
+- ``anonymous`` 修饰事件时：�把事件签�作为 topic 存储。
+- ``indexed`` 修饰事件�数时：将�数作为 topic 存储。
+- ``virtual`` 修饰函数和修改时：�许在派生�约中改�函数或修改器的行为。
+- ``override`` 表示该函数�修改器或公共状���改�了基类�约中的函数或修改器的行为。
+=======
 - ``pure`` for functions: Disallows modification or access of state.
 - ``view`` for functions: Disallows modification of state.
 - ``payable`` for functions: Allows them to receive Ether together with a call.
-- ``constant`` for state variables: Disallows assignment (except initialisation), does not occupy storage slot.
+- ``constant`` for state variables: Disallows assignment (except initialization), does not occupy storage slot.
 - ``immutable`` for state variables: Allows assignment at construction time and is constant when deployed. Is stored in code.
 - ``anonymous`` for events: Does not store event signature as topic.
 - ``indexed`` for event parameters: Stores the parameter as topic.
@@ -157,4 +208,5 @@ Modifiers
   behavior to be changed in derived contracts.
 - ``override``: States that this function, modifier or public state variable changes
   the behavior of a function or modifier in a base contract.
+>>>>>>> english/develop
 
diff --git a/docs/common-patterns.rst b/docs/common-patterns.rst
index cbc219b53b5a..2aabed6ad232 100644
--- a/docs/common-patterns.rst
+++ b/docs/common-patterns.rst
@@ -1,5 +1,5 @@
 ###############
-Common Patterns
+通用模�
 ###############
 
 .. index:: withdrawal
@@ -7,23 +7,25 @@ Common Patterns
 .. _withdrawal_pattern:
 
 *************************
-Withdrawal from Contracts
+从�约中�款
 *************************
 
-The recommended method of sending funds after an effect
-is using the withdrawal pattern. Although the most intuitive
-method of sending Ether, as a result of an effect, is a
-direct ``transfer`` call, this is not recommended as it
-introduces a potential security risk. You may read
-more about this on the :ref:`security_considerations` page.
+在�个�作之���资金的推�方�是使用�回（withdrawal）模�。
+尽管在�个�作之�，最直接地��以太�方法是一个 ``transfer`` 调用，
+但这并�推�,因为这会引入一个潜在的安全风险。
+您�能需��考 :ref:`security_considerations` �获�更多信�。
 
+<<<<<<< HEAD
+下�是一个�约中实际�款模�的例�，其目标是��约��最多的钱，
+以�为 “首富�，其�感�自于 `King of the Ether <https://www.kingoftheether.com/>`_。
+=======
 The following is an example of the withdrawal pattern in practice in
 a contract where the goal is to send the most of some compensation, e.g. Ether, to the
 contract in order to become the "richest", inspired by
 `King of the Ether <https://www.kingoftheether.com/>`_.
+>>>>>>> english/develop
 
-In the following contract, if you are no longer the richest,
-you receive the funds of the person who is now the richest.
+在下�的�约中，如果您��是最富有的人，您将收到�代您�为“最富有�的人��到�约的资金。
 
 .. code-block:: solidity
 
@@ -36,8 +38,7 @@ you receive the funds of the person who is now the richest.
 
         mapping(address => uint) pendingWithdrawals;
 
-        /// The amount of Ether sent was not higher than
-        /// the currently highest amount.
+        /// ��的以太数��高于目�的最高�。
         error NotEnoughEther();
 
         constructor() payable {
@@ -54,14 +55,14 @@ you receive the funds of the person who is now the richest.
 
         function withdraw() public {
             uint amount = pendingWithdrawals[msg.sender];
-            // Remember to zero the pending refund before
-            // sending to prevent reentrancy attacks
+            // 记得在���将待处�的退款归零，
+            // 以防止�入攻击
             pendingWithdrawals[msg.sender] = 0;
             payable(msg.sender).transfer(amount);
         }
     }
 
-This is as opposed to the more intuitive sending pattern:
+下�是一个相�的直接使用��模�的例�：
 
 .. code-block:: solidity
 
@@ -72,8 +73,7 @@ This is as opposed to the more intuitive sending pattern:
         address payable public richest;
         uint public mostSent;
 
-        /// The amount of Ether sent was not higher than
-        /// the currently highest amount.
+        /// ��的以太数��高于目�的最高�。
         error NotEnoughEther();
 
         constructor() payable {
@@ -83,51 +83,41 @@ This is as opposed to the more intuitive sending pattern:
 
         function becomeRichest() public payable {
             if (msg.value <= mostSent) revert NotEnoughEther();
-            // This line can cause problems (explained below).
+            // 这一行会导致问题（详�下文）
             richest.transfer(msg.value);
             richest = payable(msg.sender);
             mostSent = msg.value;
         }
     }
 
-Notice that, in this example, an attacker could trap the
-contract into an unusable state by causing ``richest`` to be
-the address of a contract that has a receive or fallback function
-which fails (e.g. by using ``revert()`` or by just
-consuming more than the 2300 gas stipend transferred to them). That way,
-whenever ``transfer`` is called to deliver funds to the
-"poisoned" contract, it will fail and thus also ``becomeRichest``
-will fail, with the contract being stuck forever.
+请注�，在这个例�中，攻击者�以通过使 ``richest`` �为一个有 receive 或 fallback 函数的�约的地�
+而使�约陷入无法使用的状�（例如，通过使用 ``revert()`` 或�是消耗超过转给他们的2300 gas 津贴）。
+这样，�当调用 ``transfer`` � “中毒� 的�约交付资金时，它就会失败，
+因此 ``becomeRichest`` 也会失败，�约会永远被��。
 
-In contrast, if you use the "withdraw" pattern from the first example,
-the attacker can only cause his or her own withdraw to fail and not the
-rest of the contract's workings.
+相�，如果您使用第一个例�中的 “�回（withdraw）�模�，
+那么攻击者�能使他/她自己的“�回�失败，并�会导致整个�约无法�作。
 
 .. index:: access;restricting
 
 ******************
-Restricting Access
+�制访问
 ******************
 
-Restricting access is a common pattern for contracts.
-Note that you can never restrict any human or computer
-from reading the content of your transactions or
-your contract's state. You can make it a bit harder
-by using encryption, but if your contract is supposed
-to read the data, so will everyone else.
+�制访问是�约的一个常�模�。
+请注�，您永远无法�制任何人类或机器阅读您的交易内容或您的�约状�。
+您�以通过使用加密�增加一点难度，
+但如果您想让您的�约读�这些数�，那么其他人也将�以�到。
 
-You can restrict read access to your contract's state
-by **other contracts**. That is actually the default
-unless you declare your state variables ``public``.
+您�以�制 **其他�约** 对您的�约状�的读���。
+这实际上是默认的，除�您声明您的状���为 ``public``。
 
-Furthermore, you can restrict who can make modifications
-to your contract's state or call your contract's
-functions and this is what this section is about.
+此外，您�以�制��以对您的�约的状�进行修改或调用您的�约的功能，
+这就是本节的内容。
 
 .. index:: function;modifier
 
-The use of **function modifiers** makes these
-restrictions highly readable.
+使用 **函数修饰符** 使这些�制�得�常明确。
 
 .. code-block:: solidity
     :force:
@@ -136,45 +126,41 @@ restrictions highly readable.
     pragma solidity ^0.8.4;
 
     contract AccessRestriction {
-        // These will be assigned at the construction
-        // phase, where `msg.sender` is the account
-        // creating this contract.
+        // 这些将在构造阶段被赋值
+        // 其中，`msg.sender` 是
+        // 创建这个�约的账户。
         address public owner = msg.sender;
         uint public creationTime = block.timestamp;
 
-        // Now follows a list of errors that
-        // this contract can generate together
-        // with a textual explanation in special
-        // comments.
+        // 现在列出了该�约�能产生的错误，
+        // 并在特别注释中作了文字解释。
 
-        /// Sender not authorized for this
-        /// operation.
+        /// 调用者未被授�进行此�作。
         error Unauthorized();
 
-        /// Function called too early.
+        /// 函数调用过早。
         error TooEarly();
 
-        /// Not enough Ether sent with function call.
+        /// 函数调用时没有��足够的以太。
         error NotEnoughEther();
 
-        // Modifiers can be used to change
-        // the body of a function.
-        // If this modifier is used, it will
-        // prepend a check that only passes
-        // if the function is called from
-        // a certain address.
+        // 修饰器�以用�更改
+        // 一个函数的函数体。
+        // 如果使用这个修饰器，
+        // 它会预置一个检查，仅�许
+        // �自特定地�的
+        // 函数调用。
         modifier onlyBy(address account)
         {
             if (msg.sender != account)
                 revert Unauthorized();
-            // Do not forget the "_;"! It will
-            // be replaced by the actual function
-            // body when the modifier is used.
+            // ��忘记写 “_;��
+            // 它会被实际使用这个修饰器的
+            // 函数体所替代。
             _;
         }
 
-        /// Make `newOwner` the new owner of this
-        /// contract.
+        /// 使 `newOwner` �为这个�约的新所有者。
         function changeOwner(address newOwner)
             public
             onlyBy(owner)
@@ -188,9 +174,9 @@ restrictions highly readable.
             _;
         }
 
-        /// Erase ownership information.
-        /// May only be called 6 weeks after
-        /// the contract has been created.
+        /// 抹掉所有者信�。
+        /// 仅�许在�约创建�功 6 周以�
+        /// 的时间被调用。
         function disown()
             public
             onlyBy(owner)
@@ -199,12 +185,12 @@ restrictions highly readable.
             delete owner;
         }
 
-        // This modifier requires a certain
-        // fee being associated with a function call.
-        // If the caller sent too much, he or she is
-        // refunded, but only after the function body.
-        // This was dangerous before Solidity version 0.4.0,
-        // where it was possible to skip the part after `_;`.
+        // 这个修饰器�求对函数调用
+        // 绑定一定的费用。
+        // 如果调用方��了过多的费用，
+        // 他/她会得到退款，但需�先执行函数体。
+        // 这在 0.4.0 版本以�的 Solidity 中很�险，
+        // 因为很�能会跳过 `_;` 之�的代�。
         modifier costs(uint amount) {
             if (msg.value < amount)
                 revert NotEnoughEther();
@@ -220,78 +206,61 @@ restrictions highly readable.
             costs(200 ether)
         {
             owner = newOwner;
-            // just some example condition
+            // 这�是示例�件
             if (uint160(owner) & 0 == 1)
-                // This did not refund for Solidity
-                // before version 0.4.0.
+                // 这无法在 0.4.0 版本之�的
+                // Solidity 上进行退还。
                 return;
-            // refund overpaid fees
+            // 退还多付的费用
         }
     }
 
-A more specialised way in which access to function
-calls can be restricted will be discussed
-in the next example.
+在下一个例�中，将讨论一�更专业的�制函数调用访问的方�。
 
 .. index:: state machine
 
 *************
-State Machine
+状�机
 *************
 
-Contracts often act as a state machine, which means
-that they have certain **stages** in which they behave
-differently or in which different functions can
-be called. A function call often ends a stage
-and transitions the contract into the next stage
-(especially if the contract models **interaction**).
-It is also common that some stages are automatically
-reached at a certain point in **time**.
+�约通常会�状�机那样�作，这�味�它们有特定的 **阶段**，
+使它们有��的表现或者仅�许特定的��函数被调用。
+一个函数调用通常会结�一个阶段，
+并将�约转�到下一个阶段（特别是如果一个�约是以 **交互** �建模的时候）。
+通过达到特定的 **时间** 点�达到�些阶段也是很常�的。
 
-An example for this is a blind auction contract which
-starts in the stage "accepting blinded bids", then
-transitions to "revealing bids" which is ended by
-"determine auction outcome".
+一个典型的例�是盲�（blind auction）�约，
+它起始于“接�盲目出价�，
+然�转�到“公示出价�，
+最�结�于“确定��结果�。
 
 .. index:: function;modifier
 
-Function modifiers can be used in this situation
-to model the states and guard against
-incorrect usage of the contract.
+函数修饰器�以用在这�情况下�对状�进行建模，
+并确��约被正常的使用。
 
-Example
+示例
 =======
 
-In the following example,
-the modifier ``atStage`` ensures that the function can
-only be called at a certain stage.
+在下边的示例中， 修饰器 ``atStage`` 确�了函数仅在特定的阶段��以被调用。
 
-Automatic timed transitions
-are handled by the modifier ``timedTransitions``, which
-should be used for all functions.
+自动定时过渡是由修饰器 ``timedTransitions`` 处�的，它应该用于所有函数。
 
 .. note::
-    **Modifier Order Matters**.
-    If atStage is combined
-    with timedTransitions, make sure that you mention
-    it after the latter, so that the new stage is
-    taken into account.
+    **修饰器的顺��常��**.
+    如果 atStage 和 timedTransitions �一起使用，
+    请确�在 timedTransitions 之�声明 atStage，
+    以便新的状��以 首先被�映到账户中。
 
-Finally, the modifier ``transitionNext`` can be used
-to automatically go to the next stage when the
-function finishes.
+最�， 修饰器 ``transitionNext`` 能够用�在函数执行结�时自动转�到下一个阶段。
 
 .. note::
-    **Modifier May be Skipped**.
-    This only applies to Solidity before version 0.4.0:
-    Since modifiers are applied by simply replacing
-    code and not by using a function call,
-    the code in the transitionNext modifier
-    can be skipped if the function itself uses
-    return. If you want to do that, make sure
-    to call nextStage manually from those functions.
-    Starting with version 0.4.0, modifier code
-    will run even if the function explicitly returns.
+    **修饰器�以被忽略**.
+    这�适用于0.4.0版本之�的Solidity：
+    由于修饰器是通过简�地替�代�而�是使用函数调用�应用的，
+    如果函数本身使用 return，�以跳过 transitionNext 修饰器中的代�。
+    如果您想这样�，请确�从这些函数中手动调用 nextStage。
+    从0.4.0版本开始，�使函数明确返回，修饰器代�也会�行。
 
 .. code-block:: solidity
     :force:
@@ -307,10 +276,10 @@ function finishes.
             AreWeDoneYet,
             Finished
         }
-        /// Function cannot be called at this time.
+        /// 此阶段�能调用该函数。
         error FunctionInvalidAtThisStage();
 
-        // This is the current stage.
+        // 这是当�阶段。
         Stages public stage = Stages.AcceptingBlindedBids;
 
         uint public creationTime = block.timestamp;
@@ -325,9 +294,9 @@ function finishes.
             stage = Stages(uint(stage) + 1);
         }
 
-        // Perform timed transitions. Be sure to mention
-        // this modifier first, otherwise the guards
-        // will not take the new stage into account.
+        // 执行基于时间的阶段转�。
+        // 请确�首先声明这个修饰器，
+        // �则新阶段�会被带入账户。
         modifier timedTransitions() {
             if (stage == Stages.AcceptingBlindedBids &&
                         block.timestamp >= creationTime + 10 days)
@@ -335,18 +304,18 @@ function finishes.
             if (stage == Stages.RevealBids &&
                     block.timestamp >= creationTime + 12 days)
                 nextStage();
-            // The other stages transition by transaction
+            // 由交易触�的其他阶段转�
             _;
         }
 
-        // Order of the modifiers matters here!
+        // 这里的修饰器顺��常���
         function bid()
             public
             payable
             timedTransitions
             atStage(Stages.AcceptingBlindedBids)
         {
-            // We will not implement that here
+            // 我们�会在这里实现实际功能（因为这仅是个代�示例，译者注）
         }
 
         function reveal()
@@ -356,8 +325,8 @@ function finishes.
         {
         }
 
-        // This modifier goes to the next stage
-        // after the function is done.
+        // 这个修饰器在函数执行结�之�
+        // 使�约进入下一个阶段。
         modifier transitionNext()
         {
             _;
diff --git a/docs/conf.py b/docs/conf.py
index ddc3ee81bbdc..5f096a97eab6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -85,7 +85,7 @@ def setup(sphinx):
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+language = "zh_CN"
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/docs/contracts.rst b/docs/contracts.rst
index aee26c95afd8..e40856c8cc01 100644
--- a/docs/contracts.rst
+++ b/docs/contracts.rst
@@ -3,16 +3,15 @@
 .. _contracts:
 
 ##########
-Contracts
+�约
 ##########
 
-Contracts in Solidity are similar to classes in object-oriented languages. They
-contain persistent data in state variables, and functions that can modify these
-variables. Calling a function on a different contract (instance) will perform
-an EVM function call and thus switch the context such that state variables
-in the calling contract are
-inaccessible. A contract and its functions need to be called for anything to happen.
-There is no "cron" concept in Ethereum to call a function at a particular event automatically.
+Solidity中的�约类似于��对象语言中的类。
+它们在状���中包��久的数�，以��以修改这些��的函数。
+在��的�约（实例）上调用一个函数将执行一个EVM函数调用，
+从而切�上下文，使调用�约中的状���无法访问。
+一个�约和它的函数需�被调用�会�生。
+在以太�中没有 "cron" 的概念，在特定的事件中自动调用一个函数。
 
 .. include:: contracts/creating-contracts.rst
 
@@ -33,4 +32,4 @@ There is no "cron" concept in Ethereum to call a function at a particular event
 
 .. include:: contracts/libraries.rst
 
-.. include:: contracts/using-for.rst
\ No newline at end of file
+.. include:: contracts/using-for.rst
diff --git a/docs/contracts/abstract-contracts.rst b/docs/contracts/abstract-contracts.rst
index fb1beb2dab5f..13b42265f054 100644
--- a/docs/contracts/abstract-contracts.rst
+++ b/docs/contracts/abstract-contracts.rst
@@ -3,18 +3,19 @@
 .. _abstract-contract:
 
 ******************
-Abstract Contracts
+抽象�约
 ******************
 
-Contracts must be marked as abstract when at least one of their functions is not implemented or when
-they do not provide arguments for all of their base contract constructors.
-Even if this is not the case, a contract may still be marked abstract, such as when you do not intend
-for the contract to be created directly. Abstract contracts are similar to :ref:`interfaces` but an
-interface is more limited in what it can declare.
+当�约中至少有一个函数没有被实现，或者�约没有为其所有的基本�约构造函数�供�数时，
+�约必须被标记为 abstract。
+�使�是这�情况，�约�然�以被标记为 abstract，
+例如，当您�打算直接创建�约时。
+抽象（abstract）�约类似于 :ref:`interfaces`，
+但是接�（interface）�约�以声明的内容更加有�。
 
-An abstract contract is declared using the ``abstract`` keyword as shown in the following example.
-Note that this contract needs to be defined as abstract, because the function ``utterance()`` is declared,
-but no implementation was provided (no implementation body ``{ }`` was given).
+如下例所示，使用 ``abstract`` 关键字�声明一个抽象�约。
+注�，这个�约需�被定义为 abstract，因为函数 ``utterance()`` 被声明了，
+但没有�供实现（没有给出实现体 ``{ }``）。
 
 .. code-block:: solidity
 
@@ -25,8 +26,8 @@ but no implementation was provided (no implementation body ``{ }`` was given).
         function utterance() public virtual returns (bytes32);
     }
 
-Such abstract contracts can not be instantiated directly. This is also true, if an abstract contract itself does implement
-all defined functions. The usage of an abstract contract as a base class is shown in the following example:
+这样的抽象�约�能被直接实例化。如果一个抽象�约本身实现了所有定义的功能，这也是�以的。
+抽象�约作为基类的用法在下�的例�中显示：
 
 .. code-block:: solidity
 
@@ -41,32 +42,28 @@ all defined functions. The usage of an abstract contract as a base class is show
         function utterance() public pure override returns (bytes32) { return "miaow"; }
     }
 
-If a contract inherits from an abstract contract and does not implement all non-implemented
-functions by overriding, it needs to be marked as abstract as well.
+如果一个�约继承自一个抽象�约，并且没有通过�写实现所有未实现的函数，那么它也需�被标记为抽象的。
 
-Note that a function without implementation is different from
-a :ref:`Function Type <function_types>` even though their syntax looks very similar.
+注�，没有实现的函数与 :ref:`函数类型 <function_types>` ��，尽管它们的语法看起��常相似。
 
-Example of function without implementation (a function declaration):
+没有实现内容的函数的例�（一个函数声明）：
 
 .. code-block:: solidity
 
     function foo(address) external returns (address);
 
-Example of a declaration of a variable whose type is a function type:
+类型为函数类型的��的声明实例：
 
 .. code-block:: solidity
 
     function(address) external returns (address) foo;
 
-Abstract contracts decouple the definition of a contract from its
-implementation providing better extensibility and self-documentation and
-facilitating patterns like the `Template method <https://en.wikipedia.org/wiki/Template_method_pattern>`_ and removing code duplication.
-Abstract contracts are useful in the same way that defining methods
-in an interface is useful. It is a way for the designer of the
-abstract contract to say "any child of mine must implement this method".
+抽象�约将�约的定义与它的实现解耦，�供了更好的�扩展性和自我记录，
+促进了� `模�方法 <https://en.wikipedia.org/wiki/Template_method_pattern>`_ 这样的模�，
+并消除了代�的��。抽象�约的作用与在接�中定义方法的作用相�。
+它是抽象�约的设计者说 "我的任何孩�都必须实现这个方法" 的一�方�。
+
 
 .. note::
 
-  Abstract contracts cannot override an implemented virtual function with an
-  unimplemented one.
+  抽象�约�能用一个未实现的virtual函数��载一个已实现的virtual函数。
diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index a1bc24f50c64..dfbd2388c4c4 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -3,29 +3,25 @@
 .. _constants:
 
 **************************************
-Constant and Immutable State Variables
+Constant 和 Immutable 状���
 **************************************
 
-State variables can be declared as ``constant`` or ``immutable``.
-In both cases, the variables cannot be modified after the contract has been constructed.
-For ``constant`` variables, the value has to be fixed at compile-time, while
-for ``immutable``, it can still be assigned at construction time.
+状����以被声明为 ``constant`` 或 ``immutable``。
+在这两�情况下，��在�约构建完���能被修改。
+对于 ``constant`` ��，其值必须在编译时固定，
+而对于 ``immutable`` ��，�然�以在构造时分�。
 
-It is also possible to define ``constant`` variables at the file level.
+也�以在文件级别定义 ``constant`` ��。
 
-The compiler does not reserve a storage slot for these variables, and every occurrence is
-replaced by the respective value.
+编译器并没有为这些��预留存储，它们的�次出现都会被替�为相应的常�表达�。
 
-Compared to regular state variables, the gas costs of constant and immutable variables
-are much lower. For a constant variable, the expression assigned to it is copied to
-all the places where it is accessed and also re-evaluated each time. This allows for local
-optimizations. Immutable variables are evaluated once at construction time and their value
-is copied to all the places in the code where they are accessed. For these values,
-32 bytes are reserved, even if they would fit in fewer bytes. Due to this, constant values
-can sometimes be cheaper than immutable values.
+与普通的状���相比，常���（constant）和��改�的��（immutable）的气体�本�低得多。
+对于常���，分�给它的表达�被�制到所有访问它的地方，并且�次都��新评估，
+这使得局部优化�为�能。���的��在构造时被评估一次，其值被�制到代�中所有被访问的地方。
+对于这些值，��留32个字节，�使它们�以装入更少的字节。由于这个原因，常�值有时会比���的值更便宜。
 
-Not all types for constants and immutables are implemented at this time. The only supported types are
-:ref:`strings <strings>` (only for constants) and :ref:`value types <value-types>`.
+目�，并�所有的常�和����的类型都已实现。
+唯一支�的类型是 :ref:`字符串类型 <strings>` （仅用于常�）和 :ref:`值类型 <value-types>`。
 
 .. code-block:: solidity
 
@@ -42,12 +38,17 @@ Not all types for constants and immutables are implemented at this time. The onl
         address immutable owner = msg.sender;
 
         constructor(uint decimals_, address ref) {
+<<<<<<< HEAD
+            decimals = decimals_;
+            // 对����的赋值甚至�以访问一些全局属性。
+=======
             if (decimals_ != 0)
                 // Immutables are only immutable when deployed.
                 // At construction time they can be assigned to any number of times.
                 decimals = decimals_;
 
             // Assignments to immutables can even access the environment.
+>>>>>>> english/develop
             maxBalance = ref.balance;
         }
 
@@ -60,23 +61,36 @@ Not all types for constants and immutables are implemented at this time. The onl
 Constant
 ========
 
-For ``constant`` variables, the value has to be a constant at compile time and it has to be
-assigned where the variable is declared. Any expression
-that accesses storage, blockchain data (e.g. ``block.timestamp``, ``address(this).balance`` or
-``block.number``) or
-execution data (``msg.value`` or ``gasleft()``) or makes calls to external contracts is disallowed. Expressions
-that might have a side-effect on memory allocation are allowed, but those that
-might have a side-effect on other memory objects are not. The built-in functions
-``keccak256``, ``sha256``, ``ripemd160``, ``ecrecover``, ``addmod`` and ``mulmod``
-are allowed (even though, with the exception of ``keccak256``, they do call external contracts).
+对于 ``constant`` ��，其值在编译时必须是一个常�，并且必须在��声明的地方分�。
+任何访问存储�区�链数�（例如： ``block.timestamp``, ``address(this).balance`` 或 ``block.number``）
+或执行数�（ ``msg.value`` 或 ``gasleft()``）或者调用外部�约的表达�都是��许的。
+但�能对内存分�产生副作用的表达�是�许的，但那些�能对其他内存对象产生副作用的表达�是��许的。
+内置函数 ``keccak256``， ``sha256``， ``ripemd160``， ``ecrecover``， ``addmod`` 和 ``mulmod``
+是�许的（尽管除了 ``keccak256``，它们确实调用了外部�约）。
 
-The reason behind allowing side-effects on the memory allocator is that it
-should be possible to construct complex objects like e.g. lookup-tables.
-This feature is not yet fully usable.
+�许在内存分�器上产生副作用的原因是，
+它应该�以构建��的对象，比如说查找表。
+这个功能现在还�能完全使用。
 
 Immutable
 =========
 
+<<<<<<< HEAD
+声明为 ``immutable`` 的��比声明为 ``constant`` 的���到的�制�少一些。
+���的���以在�约的构造函数中或在声明时被分�一个任�的值。
+它们�能被分�一次，并且从那时起，�使在构造时间内也�以被读�。
+
+编译器生�的�约创建代�将在其返回之�修改�约的�行时代�，
+用分�给它们的值替�所有对����的引用。
+当您将编译器生�的�行时代�与实际存储在区�链中的代�进行比较时，这一点很��。
+
+.. note::
+  在声明时被分�的�����有在�约的构造函数执行时�会被视为�始化。
+  这�味�您�能在内�中用一个�赖于�一个����的值��始化����。
+  然而，您�以在�约的构造函数中这样�。
+
+  这是对状����始化和构造函数执行顺�的��解释的一��障，特别是在继承方�。
+=======
 Variables declared as ``immutable`` are a bit less restricted than those
 declared as ``constant``: Immutable variables can be assigned a
 value at construction time.
@@ -109,3 +123,4 @@ you are comparing the
 runtime code generated by the compiler with the one actually stored in the
 blockchain. The compiler outputs where these immutables are located in the deployed bytecode
 in the ``immutableReferences`` field of the :ref:`compiler JSON standard output <compiler-api>`.
+>>>>>>> english/develop
diff --git a/docs/contracts/creating-contracts.rst b/docs/contracts/creating-contracts.rst
index 8eb4e5f56c28..4c7a69a82450 100644
--- a/docs/contracts/creating-contracts.rst
+++ b/docs/contracts/creating-contracts.rst
@@ -1,36 +1,33 @@
 .. index:: ! contract;creation, constructor
 
 ******************
-Creating Contracts
+创建�约
 ******************
 
-Contracts can be created "from outside" via Ethereum transactions or from within Solidity contracts.
+�以通过以太�交易 “从外部� 或从 Solidity �约内部创建�约。
 
-IDEs, such as `Remix <https://remix.ethereum.org/>`_, make the creation process seamless using UI elements.
+集�开�环境，如 `Remix <https://remix.ethereum.org/>`_，使用UI元素使创建过程无�化。
 
-One way to create contracts programmatically on Ethereum is via the JavaScript API `web3.js <https://github.com/web3/web3.js>`_.
-It has a function called `web3.eth.Contract <https://web3js.readthedocs.io/en/1.0/web3-eth-contract.html#new-contract>`_
-to facilitate contract creation.
+在以太�上以编程方�创建�约的一�方法是通过JavaScript API `web3.js <https://github.com/web3/web3.js>`_。
+它有一个�为 `web3.eth.Contract <https://web3js.readthedocs.io/en/1.0/web3-eth-contract.html#new-contract>`_ 的函数，
+以方便创建�约。
 
-When a contract is created, its :ref:`constructor <constructor>` (a function declared with
-the ``constructor`` keyword) is executed once.
+当一个�约被创建时，它的 :ref:`构造函数（constructor） <constructor>`
+（一个用 ``constructor`` 关键字声明的函数）被执行一次。
 
-A constructor is optional. Only one constructor is allowed, which means
-overloading is not supported.
+构造函数是�选的。但是��许有一个构造函数，这�味��支��载。
 
-After the constructor has executed, the final code of the contract is stored on the
-blockchain. This code includes all public and external functions and all functions
-that are reachable from there through function calls. The deployed code does not
-include the constructor code or internal functions only called from the constructor.
+构造函数执行完毕�，�约的最终代�被存储在区�链上。
+这段代�包括所有公开和外部函数，以�所有通过函数调用�从那里到达的函数。
+部署的代��包括构造函数代�或�从构造函数调用的内部函数。
 
 .. index:: constructor;arguments
 
-Internally, constructor arguments are passed :ref:`ABI encoded <ABI>` after the code of
-the contract itself, but you do not have to care about this if you use ``web3.js``.
+在内部，构造函数�数在�约代�之�通过 :ref:`ABI编� <ABI>` 传递，
+但是如果您使用 ``web3.js`` 则�必关心这个问题。
 
-If a contract wants to create another contract, the source code
-(and the binary) of the created contract has to be known to the creator.
-This means that cyclic creation dependencies are impossible.
+如果一个�约想创建�一个�约，创建者必须知�所创建�约的�代�（和二进制）。
+这�味�，循环的创建�赖是��能的。
 
 .. code-block:: solidity
 
@@ -39,53 +36,47 @@ This means that cyclic creation dependencies are impossible.
 
 
     contract OwnedToken {
-        // `TokenCreator` is a contract type that is defined below.
-        // It is fine to reference it as long as it is not used
-        // to create a new contract.
+        // `TokenCreator` 是如下定义的�约类型。
+        // �创建新�约的�，也�以引用它。
         TokenCreator creator;
         address owner;
         bytes32 name;
 
-        // This is the constructor which registers the
-        // creator and the assigned name.
+        // 这是注册 creator 和设置�称的构造函数。
         constructor(bytes32 name_) {
-            // State variables are accessed via their name
-            // and not via e.g. `this.owner`. Functions can
-            // be accessed directly or through `this.f`,
-            // but the latter provides an external view
-            // to the function. Especially in the constructor,
-            // you should not access functions externally,
-            // because the function does not exist yet.
-            // See the next section for details.
+            // 状���通过其�称访问，
+            // 而�是通过例如 `this.owner` 的方�访问。
+            // 函数�以直接或通过 `this.f` 访问。
+            // 但�者�供了一个对函数的外部�视方法。
+            // 特别是在构造函数中，您�应该从外部访问函数，
+            // 因为该函数还�存在。
+            // 详�下一节。
             owner = msg.sender;
 
-            // We perform an explicit type conversion from `address`
-            // to `TokenCreator` and assume that the type of
-            // the calling contract is `TokenCreator`, there is
-            // no real way to verify that.
-            // This does not create a new contract.
+            // 我们进行了从 `address` 到 `TokenCreator` 的显�类型转�，
+            // 并�定调用�约的类型是 `TokenCreator`，
+            // 没有真正的方法�验�，
+            // 这并没有创建一个新的�约。
             creator = TokenCreator(msg.sender);
             name = name_;
         }
 
         function changeName(bytes32 newName) public {
-            // Only the creator can alter the name.
-            // We compare the contract based on its
-            // address which can be retrieved by
-            // explicit conversion to address.
+            // �有创建者�以改��称。
+            // 我们根��约的地�进行比较，
+            // 它�以通过显�转�为地��检索。
             if (msg.sender == address(creator))
                 name = newName;
         }
 
         function transfer(address newOwner) public {
-            // Only the current owner can transfer the token.
+            // �有当�所有者�能�� token。
             if (msg.sender != owner) return;
 
-            // We ask the creator contract if the transfer
-            // should proceed by using a function of the
-            // `TokenCreator` contract defined below. If
-            // the call fails (e.g. due to out-of-gas),
-            // the execution also fails here.
+            // 我们通过使用下�定义的 `TokenCreator` �约的一个函数
+            // �询问创建者�约是�应该进行转移。
+            // 如果调用失败（例如由于气体值耗尽），
+            // 这里的执行也会失败。
             if (creator.isTokenTransferOK(owner, newOwner))
                 owner = newOwner;
         }
@@ -97,27 +88,25 @@ This means that cyclic creation dependencies are impossible.
             public
             returns (OwnedToken tokenAddress)
         {
-            // Create a new `Token` contract and return its address.
-            // From the JavaScript side, the return type
-            // of this function is `address`, as this is
-            // the closest type available in the ABI.
+            // 创建一个新的 `Token` �约并返回其地�。
+            // 从JavaScript方��看，
+            // 这个函数的返回类型是 `address`，
+            // 因为这是ABI中最接近的类型。
             return new OwnedToken(name);
         }
 
         function changeName(OwnedToken tokenAddress, bytes32 name) public {
-            // Again, the external type of `tokenAddress` is
-            // simply `address`.
+            // �样，`tokenAddress` 的外部类型是简�的 `address`。
             tokenAddress.changeName(name);
         }
 
-        // Perform checks to determine if transferring a token to the
-        // `OwnedToken` contract should proceed
+        // 执行检查，以确定是�应该将代�转移到 `OwnedToken` �约上。
         function isTokenTransferOK(address currentOwner, address newOwner)
             public
             pure
             returns (bool ok)
         {
-            // Check an arbitrary condition to see if transfer should proceed
+            // 检查一个任�的�件，看是�应该进行转移。
             return keccak256(abi.encodePacked(currentOwner, newOwner))[0] == 0x7f;
         }
     }
diff --git a/docs/contracts/errors.rst b/docs/contracts/errors.rst
index 19577a3872ba..c7ba3355d2f1 100644
--- a/docs/contracts/errors.rst
+++ b/docs/contracts/errors.rst
@@ -2,26 +2,23 @@
 .. _errors:
 
 *******************************
-Errors and the Revert Statement
+错误和��语�
 *******************************
 
-Errors in Solidity provide a convenient and gas-efficient way to explain to the
-user why an operation failed. They can be defined inside and outside of contracts (including interfaces and libraries).
+Solidity 中的错误�供了一�方便且�gas的方���用户解释为什么一个�作会失败。
+它们�以被定义在�约内部和外部（包括接��约和库�约）。
 
-They have to be used together with the :ref:`revert statement <revert-statement>`
-which causes
-all changes in the current call to be reverted and passes the error data back to the
-caller.
+它们必须与 :ref:`��语� <revert-statement>` 一起使用，
+它导致当�调用中的所有�化被��，并将错误数�传回给调用者。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.8.4;
 
-    /// Insufficient balance for transfer. Needed `required` but only
-    /// `available` available.
-    /// @param available balance available.
-    /// @param required requested amount to transfer.
+    /// 转账的余��足。需� `required` 数�但�有 `available` 数��用。
+    /// @param �用的余�。
+    /// @param 需��求的转�金�。
     error InsufficientBalance(uint256 available, uint256 required);
 
     contract TestToken {
@@ -38,49 +35,43 @@ caller.
         // ...
     }
 
-Errors cannot be overloaded or overridden but are inherited.
-The same error can be defined in multiple places as long as the scopes are distinct.
-Instances of errors can only be created using ``revert`` statements.
+错误�能被�载或覆盖，但是�以被继承。
+��作用域��，�一个错误�以在多个地方定义。
+错误的实例�能使用 ``revert`` 语�创建。
 
-The error creates data that is then passed to the caller with the revert operation
-to either return to the off-chain component or catch it in a :ref:`try/catch statement <try-catch>`.
-Note that an error can only be caught when coming from an external call,
-reverts happening in internal calls or inside the same function cannot be caught.
+错误会创建数�，然�通过还原�作传递给调用者，
+使其返回到链下组件或在 :ref:`try/catch 语� <try-catch>` 中�获它。
+需�注�的是，一个错误�能在�自外部调用时被�获，
+�生在内部调用或�一函数内的还原�能被�获。
 
-If you do not provide any parameters, the error only needs four bytes of
-data and you can use :ref:`NatSpec <natspec>` as above
-to further explain the reasons behind the error, which is not stored on chain.
-This makes this a very cheap and convenient error-reporting feature at the same time.
+如果您��供任何�数，错误�需�四个字节的数�，
+您�以�上�一样使用 :ref:`NatSpec 语法 <natspec>` �进一步解释错误背�的原因，
+这并�存储在链上。这使得这�时也是一个�常便宜和方便的错误报告功能。
 
-More specifically, an error instance is ABI-encoded in the same way as
-a function call to a function of the same name and types would be
-and then used as the return data in the ``revert`` opcode.
-This means that the data consists of a 4-byte selector followed by :ref:`ABI-encoded<abi>` data.
-The selector consists of the first four bytes of the keccak256-hash of the signature of the error type.
+更具体地说，一个错误实例在被ABI编�时，
+其方�与对相��称和类型的函数的调用相�，
+然�作为 ``revert`` �作�的返回数�。
+这�味�数�由一个4字节的选择器和 :ref:`ABI编� <abi>` 数�组�。
+选择器由错误类型的签�的keccak256-hash的�四个字节组�。
 
 .. note::
-    It is possible for a contract to revert
-    with different errors of the same name or even with errors defined in different places
-    that are indistinguishable by the caller. For the outside, i.e. the ABI,
-    only the name of the error is relevant, not the contract or file where it is defined.
+    一个�约有�能因为��的��错误而��，
+    甚至因为在��地方定义的错误而使调用者无法区分。
+    对于外部�说，�ABI，�有错误的�称是相关的，而�是定义它的�约或文件。
 
-The statement ``require(condition, "description");`` would be equivalent to
-``if (!condition) revert Error("description")`` if you could define
-``error Error(string)``.
-Note, however, that ``Error`` is a built-in type and cannot be defined in user-supplied code.
+如果您能定义 ``error Error(string)``，
+那么语� ``require(condition, "description");``
+将等�于 ``if (!condition) revert Error("description")``。
+但是请注�， ``Error`` 是一个内置类型，�能在用户�供的代�中定义。
 
-Similarly, a failing ``assert`` or similar conditions will revert with an error
-of the built-in type ``Panic(uint256)``.
+�样，一个失败的 ``assert`` 或类似的�件将以一个内置的 ``Panic(uint256)`` 类型的错误���。
 
 .. note::
-    Error data should only be used to give an indication of failure, but
-    not as a means for control-flow. The reason is that the revert data
-    of inner calls is propagated back through the chain of external calls
-    by default. This means that an inner call
-    can "forge" revert data that looks like it could have come from the
-    contract that called it.
-
-Members of Errors
+    错误数�应该�被用�指示失败，而�是作为控制�的手段。
+    原因是内部调用的��数�默认是通过外部调用链传播回�的。
+    这�味�内部调用�以 �伪造� ��数�，使它看起��是�自调用它的�约。
+
+错误类型的�员
 =================
 
-- ``error.selector``: A ``bytes4`` value containing the error selector.
+- ``error.selector``： 一个包�错误类型的选择器的 ``bytes4`` 值。
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index 8c73c31603ae..690dafcf1fc9 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -3,12 +3,19 @@
 .. _events:
 
 ******
-Events
+事件
 ******
 
-Solidity events give an abstraction on top of the EVM's logging functionality.
-Applications can subscribe and listen to these events through the RPC interface of an Ethereum client.
+Solidity事件在EVM的日志功能之上给出了一个抽象。
+应用程��以通过Ethereum客户端的RPC接�订阅和监�这些事件。
 
+<<<<<<< HEAD
+事件是�约的�继承�员。当您调用它们时，
+它们会导致�数被存储在交易的日志中--区�链中的一个特殊数�结构。
+这些日志与�约的地�相关�，被纳入区�链，
+��有区��以访问，就会留在那里（目�是永远，但这�能会��Serenity�级而改�）。
+日志�其事件数��能从�约内部访问（甚至�能从创建它们的�约访问）。
+=======
 Events can be defined at file level or as inheritable members of contracts (including interfaces and libraries).
 When you call them, they cause the
 arguments to be stored in the transaction's log - a special data structure
@@ -17,29 +24,25 @@ are incorporated into the blockchain, and stay there as long as a block is
 accessible (forever as of now, but this might
 change in the future). The Log and its event data is not accessible from within
 contracts (not even from the contract that created them).
+>>>>>>> english/develop
 
-It is possible to request a Merkle proof for logs, so if
-an external entity supplies a contract with such a proof, it can check
-that the log actually exists inside the blockchain. You have to supply block headers
-because the contract can only see the last 256 block hashes.
+有�能�求为日志�供Merkle�明，
+所以如果外部实体��约�供这样的�明，它�以检查日志是�真的存在于区�链中。
+由于�约中仅能访问最近的 256 个区�哈希，所以还需��供区�头信�。
 
-You can add the attribute ``indexed`` to up to three parameters which adds them
-to a special data structure known as :ref:`"topics" <abi_events>` instead of
-the data part of the log.
-A topic can only hold a single word (32 bytes) so if you use a :ref:`reference type
-<reference-types>` for an indexed argument, the Keccak-256 hash of the value is stored
-as a topic instead.
+您�以最多给三个�数添加 ``indexed`` 属性，将它们添加到一个特殊的数�结构中，
+称为 :ref:`"topics" <abi_events>`，而�是日志的数�部分。
+一个topic�能容纳一个字（32字节），所以如果您为一个索引�数使用 :ref:`引用类型 <reference-types>`，
+该值的Keccak-256哈希值将被存储为一个topic中。
 
-All parameters without the ``indexed`` attribute are :ref:`ABI-encoded <ABI>`
-into the data part of the log.
+所有没有 ``indexed`` 属性的�数都会被 :ref:`ABI 编� <ABI>` 到日志的数�部分。
 
-Topics allow you to search for events, for example when filtering a sequence of
-blocks for certain events. You can also filter events by the address of the
-contract that emitted the event.
+Topics�许您用��索事件，例如为特定的事件�过滤一系列的区�。
+您用�也�以通过�出事件的�约的地��过滤事件。
 
-For example, the code below uses the web3.js ``subscribe("logs")``
-`method <https://web3js.readthedocs.io/en/1.0/web3-eth-subscribe.html#subscribe-logs>`_ to filter
-logs that match a topic with a certain address value:
+例如，下�的代�使用web3.js ``subscribe("logs")``
+`方法 <https://web3js.readthedocs.io/en/1.0/web3-eth-subscribe.html#subscribe-logs>`_
+�过滤与�一地�值相匹�的日志：
 
 .. code-block:: javascript
 
@@ -59,31 +62,26 @@ logs that match a topic with a certain address value:
     });
 
 
-The hash of the signature of the event is one of the topics, except if you
-declared the event with the ``anonymous`` specifier. This means that it is
-not possible to filter for specific anonymous events by name, you can
-only filter by the contract address. The advantage of anonymous events
-is that they are cheaper to deploy and call. It also allows you to declare
-four indexed arguments rather than three.
+除�您用 ``anonymous`` 指定符声明事件，�则事件的签�的哈希值是topic之一。
+这�味���能通过�字�过滤特定的匿�事件，
+您�能通过�约地��过滤。匿�事件的优点是，它们的部署和调用都比较便宜。
+它还�许您声明四个索引�数，而�是三个。
+
 
 .. note::
-    Since the transaction log only stores the event data and not the type,
-    you have to know the type of the event, including which parameter is
-    indexed and if the event is anonymous in order to correctly interpret
-    the data.
-    In particular, it is possible to "fake" the signature of another event
-    using an anonymous event.
+    由于交易日志�存储事件数�而�存储类型，因此您必须知�事件的类型，
+    包括哪个�数被索引以�事件是�是匿�的，以便正确解�数�。
+    特别的是，有�能用一个匿�事件 “伪造“ �一个事件的签�。
 
 .. index:: ! selector; of an event
 
-Members of Events
-=================
-
-- ``event.selector``: For non-anonymous events, this is a ``bytes32`` value
-  containing the ``keccak256`` hash of the event signature, as used in the default topic.
+事件类型的�员方法
+===================
 
+- ``event.selector``： 对于�匿�事件，这是一个 ``bytes32`` 值，
+  包�事件签�的 ``keccak256`` 哈希值，在默认topic中使用。
 
-Example
+示例
 =======
 
 .. code-block:: solidity
@@ -99,41 +97,38 @@ Example
         );
 
         function deposit(bytes32 id) public payable {
-            // Events are emitted using `emit`, followed by
-            // the name of the event and the arguments
-            // (if any) in parentheses. Any such invocation
-            // (even deeply nested) can be detected from
-            // the JavaScript API by filtering for `Deposit`.
+            // 事件是用 `emit` �出的，��是事件的�称和括�里的�数（如果有）。
+            // 任何这样的调用（甚至是深度嵌套）都�以通过过滤 `Deposit`
+            // 从JavaScript API中检测出�。
             emit Deposit(msg.sender, id, msg.value);
         }
     }
 
-The use in the JavaScript API is as follows:
+在JavaScript API中的使用方�如下：
 
 .. code-block:: javascript
 
-    var abi = /* abi as generated by the compiler */;
+    var abi = /* 由编译器产生的abi */;
     var ClientReceipt = web3.eth.contract(abi);
-    var clientReceipt = ClientReceipt.at("0x1234...ab67" /* address */);
+    var clientReceipt = ClientReceipt.at("0x1234...ab67" /* 地� */);
 
     var depositEvent = clientReceipt.Deposit();
 
-    // watch for changes
+    // 监视�化
     depositEvent.watch(function(error, result){
-        // result contains non-indexed arguments and topics
-        // given to the `Deposit` call.
+        // 结果包��索引的�数和给 `Deposit` 调用的 topics。
         if (!error)
             console.log(result);
     });
 
 
-    // Or pass a callback to start watching immediately
+    // 或者通过回调立�开始监视
     var depositEvent = clientReceipt.Deposit(function(error, result) {
         if (!error)
             console.log(result);
     });
 
-The output of the above looks like the following (trimmed):
+上�的输出看起��下�这样（�过修剪）:
 
 .. code-block:: json
 
@@ -149,9 +144,9 @@ The output of the above looks like the following (trimmed):
        }
     }
 
-Additional Resources for Understanding Events
-=============================================
+了解事件类型的其他资料
+======================
 
-- `JavaScript documentation <https://github.com/web3/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
-- `Example usage of events <https://github.com/ethchange/smart-exchange/blob/master/lib/contracts/SmartExchange.sol>`_
-- `How to access them in js <https://github.com/ethchange/smart-exchange/blob/master/lib/exchange_transactions.js>`_
+- `JavaScript 文档 <https://github.com/web3/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
+- `事件的使用实例 <https://github.com/ethchange/smart-exchange/blob/master/lib/contracts/SmartExchange.sol>`_
+- `如何在js中访问它们 <https://github.com/ethchange/smart-exchange/blob/master/lib/exchange_transactions.js>`_
diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index 454e12ab65cf..ee400726f581 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -3,35 +3,40 @@
 .. _modifiers:
 
 ******************
-Function Modifiers
+函数修饰器
 ******************
 
+<<<<<<< HEAD
+函数修饰器�以用�以声明的方�改�函数的行为。
+例如，您�以使用修饰器在执行函数之�自动检查一个�件。
+=======
 Modifiers can be used to change the behavior of functions in a declarative way.
 For example,
 you can use a modifier to automatically check a condition prior to executing the function.
+>>>>>>> english/develop
 
-Modifiers are
-inheritable properties of contracts and may be overridden by derived contracts, but only
-if they are marked ``virtual``. For details, please see
-:ref:`Modifier Overriding <modifier-overriding>`.
+修饰器是�约的�继承属性，�以被派生�约�载，
+但�有当它们被标记为 ``virtual`` 时，�能被�载。
+详情请� :ref:`修饰器�载 <modifier-overriding>`。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.1 <0.9.0;
-    // This will report a warning due to deprecated selfdestruct
+<<<<<<< HEAD
+    // 这将报告一个由于废弃的 selfdestruct 而产生的警告
+=======
+>>>>>>> english/develop
 
     contract owned {
         constructor() { owner = payable(msg.sender); }
         address payable owner;
 
-        // This contract only defines a modifier but does not use
-        // it: it will be used in derived contracts.
-        // The function body is inserted where the special symbol
-        // `_;` in the definition of a modifier appears.
-        // This means that if the owner calls this function, the
-        // function is executed and otherwise, an exception is
-        // thrown.
+        // 这个�约�定义了一个修饰器，但没有使用它：
+        // 它将在派生�约中使用。
+        // 修饰器所修饰的函数体会被�入到特殊符� `_;` 的�置。
+        // 这�味�，如果所有者调用这个函数，这个函数就会被执行，
+        // �则就会抛出一个异常。
         modifier onlyOwner {
             require(
                 msg.sender == owner,
@@ -41,18 +46,20 @@ if they are marked ``virtual``. For details, please see
         }
     }
 
+<<<<<<< HEAD
     contract destructible is owned {
-        // This contract inherits the `onlyOwner` modifier from
-        // `owned` and applies it to the `destroy` function, which
-        // causes that calls to `destroy` only have an effect if
-        // they are made by the stored owner.
+        // 这个�约从 `owned` �约继承了 `onlyOwner` 修饰器，
+        // 并将其应用于 `destroy` 函数，
+        // �有在�约里�存的 owner 调用 `destroy` 函数，�会生效。
         function destroy() public onlyOwner {
             selfdestruct(owner);
         }
     }
 
+=======
+>>>>>>> english/develop
     contract priced {
-        // Modifiers can receive arguments:
+        // 修饰器�以接��数：
         modifier costs(uint price) {
             if (msg.value >= price) {
                 _;
@@ -60,19 +67,21 @@ if they are marked ``virtual``. For details, please see
         }
     }
 
-    contract Register is priced, destructible {
+    contract Register is priced, owned {
         mapping(address => bool) registeredAddresses;
         uint price;
 
         constructor(uint initialPrice) { price = initialPrice; }
 
-        // It is important to also provide the
-        // `payable` keyword here, otherwise the function will
-        // automatically reject all Ether sent to it.
+        // 在这里也使用关键字 `payable` �常��，
+        // �则函数会自动拒�所有��给它的以太�。
         function register() public payable costs(price) {
             registeredAddresses[msg.sender] = true;
         }
 
+        // This contract inherits the `onlyOwner` modifier from
+        // the `owned` contract. As a result, calls to `changePrice` will
+        // only take effect if they are made by the stored owner.
         function changePrice(uint price_) public onlyOwner {
             price = price_;
         }
@@ -90,10 +99,8 @@ if they are marked ``virtual``. For details, please see
             locked = false;
         }
 
-        /// This function is protected by a mutex, which means that
-        /// reentrant calls from within `msg.sender.call` cannot call `f` again.
-        /// The `return 7` statement assigns 7 to the return value but still
-        /// executes the statement `locked = false` in the modifier.
+        /// 这个函数�互斥��护，这�味� `msg.sender.call` 中的�入调用�能�次调用  `f`。
+        /// `return 7` 语�指定返回值为 7，但修饰器中的语� `locked = false` �会执行。
         function f() public noReentrancy returns (uint) {
             (bool success,) = msg.sender.call("");
             require(success);
@@ -101,40 +108,37 @@ if they are marked ``virtual``. For details, please see
         }
     }
 
-If you want to access a modifier ``m`` defined in a contract ``C``, you can use ``C.m`` to
-reference it without virtual lookup. It is only possible to use modifiers defined in the current
-contract or its base contracts. Modifiers can also be defined in libraries but their use is
-limited to functions of the same library.
+如果您想访问定义在�约 ``C`` 中的修饰器 ``m``，
+您�以使用 ``C.m`` �引用它而�需�虚拟查询。
+�能使用定义在当��约或其基础�约中的修饰器。
+修饰器也�以定义在库�约中，但其使用仅�于�一库�约的函数。
 
-Multiple modifiers are applied to a function by specifying them in a
-whitespace-separated list and are evaluated in the order presented.
+如果�一个函数有多个修饰器，它们之间以空格隔开，并按照所呈现的顺�进行评估�算。
 
-Modifiers cannot implicitly access or change the arguments and return values of functions they modify.
-Their values can only be passed to them explicitly at the point of invocation.
+修饰器�能��地访问或改�它们所修改的函数的�数和返回值。
+它们的值�能在调用的时候明确地传递给它们。
 
-In function modifiers, it is necessary to specify when you want the function to which the modifier is
-applied to be run. The placeholder statement (denoted by a single underscore character ``_``) is used to
-denote where the body of the function being modified should be inserted. Note that the
-placeholder operator is different from using underscores as leading or trailing characters in variable
-names, which is a stylistic choice.
+在函数修改器中，有必�指定何时�行应用修改器的函数。
+��符语�（用�个下划线字符 ``_`` 表示）用于表示被修改的函数主体应该�入的�置。
+请注�，��符�作符与在���中使用下划线作为�导或尾�字符��，
+�者是一�风格上的选择。
 
-Explicit returns from a modifier or function body only leave the current
-modifier or function body. Return variables are assigned and
-control flow continues after the ``_`` in the preceding modifier.
+修饰器或函数体的显�返回�离开当�修饰器或函数体。
+返回��会被赋值，但整个执行逻辑会从�一个修饰器中定义的 ``_`` 之�继续执行。
 
 .. warning::
-    In an earlier version of Solidity, ``return`` statements in functions
-    having modifiers behaved differently.
+    在Solidity的早期版本中，具有修饰器的函数中的 ``return`` 语�会表现的��。
 
-An explicit return from a modifier with ``return;`` does not affect the values returned by the function.
-The modifier can, however, choose not to execute the function body at all and in that case the return
-variables are set to their :ref:`default values<default-value>` just as if the function had an empty
-body.
+用 ``return;`` 从修饰器显�返回并�影�函数返回的值。
+然而，修饰器�以选择完全�执行函数主体，在这�情况下，
+返回��被设置为 :ref:`默认值 <default-value>`，就�函数有一个空主体一样。
 
+<<<<<<< HEAD
+``_`` 符��以在修饰器中多次出现。�次出现都会被替��函数体。
+=======
 The ``_`` symbol can appear in the modifier multiple times. Each occurrence is replaced with
 the function body, and the function returns the return value of the final occurrence.
+>>>>>>> english/develop
 
-Arbitrary expressions are allowed for modifier arguments and in this context,
-all symbols visible from the function are visible in the modifier. Symbols
-introduced in the modifier are not visible in the function (as they might
-change by overriding).
+�许修饰器�数使用任�表达�，在这�情况下，所有从函数中��的符�在修饰器中都是��的。
+修饰器中引入的符�在函数中是���的（因为它们�能因�载而改�）。
diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 5b82a93bcc73..ed1017acbfb9 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -3,14 +3,13 @@
 .. _functions:
 
 *********
-Functions
+函数
 *********
 
-Functions can be defined inside and outside of contracts.
+�以在�约内部和外部定义函数。
 
-Functions outside of a contract, also called "free functions", always have implicit ``internal``
-:ref:`visibility<visibility-and-getters>`. Their code is included in all contracts
-that call them, similar to internal library functions.
+�约之外的函数，也称为 "自由函数"，总是��� ``internal`` 的 :ref:`��性 <visibility-and-getters>`。
+它们的代�包�在所有调用它们的�约中，类似于内部库函数。
 
 .. code-block:: solidity
 
@@ -25,8 +24,8 @@ that call them, similar to internal library functions.
     contract ArrayExample {
         bool found;
         function f(uint[] memory arr) public {
-            // This calls the free function internally.
-            // The compiler will add its code to the contract.
+            // 这在内部调用自由函数。
+            // 编译器会将其代�添加到�约中。
             uint s = sum(arr);
             require(s >= 10);
             found = true;
@@ -34,29 +33,24 @@ that call them, similar to internal library functions.
     }
 
 .. note::
-    Functions defined outside a contract are still always executed
-    in the context of a contract.
-    They still can call other contracts, send them Ether and destroy the contract that called them,
-    among other things. The main difference to functions defined inside a contract
-    is that free functions do not have direct access to the variable ``this``, storage variables and functions
-    not in their scope.
+    在�约之外定义的函数�然总是在�约的范围内执行。
+    它们�然�以调用其他�约，�它们��以太，并销�调用它们的�约，以�其他一些事情。
+    与�约内定义的函数的主�区别是，自由函数�能直接访问�� ``this``，存储��和�在其范围内的函数。
 
 .. _function-parameters-return-variables:
 
-Function Parameters and Return Variables
-========================================
+函数�数和返回��
+====================
 
-Functions take typed parameters as input and may, unlike in many other
-languages, also return an arbitrary number of values as output.
+与许多其他语言��, 函数接�类型化的�数作为输入，
+也�以返回任�数�的值作为输出。
 
-Function Parameters
+函数�数
 -------------------
 
-Function parameters are declared the same way as variables, and the name of
-unused parameters can be omitted.
+函数�数的声明方�与��相�，未使用的�数�称�以�略。
 
-For example, if you want your contract to accept one kind of external call
-with two integers, you would use something like the following:
+例如，如果您想让您的�约接�一�带有两个整数的外部调用，您�以使用类似以下的方�：
 
 .. code-block:: solidity
 
@@ -70,18 +64,16 @@ with two integers, you would use something like the following:
         }
     }
 
-Function parameters can be used as any other local variable and they can also be assigned to.
+函数�数�以�任何其他局部��一样使用，它们也�以被赋值。
 
 .. index:: return array, return string, array, string, array of strings, dynamic array, variably sized array, return struct, struct
 
-Return Variables
+返回的��
 ----------------
 
-Function return variables are declared with the same syntax after the
-``returns`` keyword.
+函数的返回��在 ``returns`` 关键字之�用�样的语法声明。
 
-For example, suppose you want to return two results: the sum and the product of
-two integers passed as function parameters, then you use something like:
+例如，�设您想返回两个结果：作为函数�数传递的两个整数的总和和乘积，那么您就使用类似的方法：
 
 .. code-block:: solidity
 
@@ -99,16 +91,12 @@ two integers passed as function parameters, then you use something like:
         }
     }
 
-The names of return variables can be omitted.
-Return variables can be used as any other local variable and they
-are initialized with their :ref:`default value <default-value>` and have that
-value until they are (re-)assigned.
+返回��的�字�以被�略。返回���以�其他本地��一样使用，
+它们被�始化为相应的 :ref:`默认值 <default-value>`，
+并且在它们被（�新）赋值之�拥有这个值。
 
-You can either explicitly assign to return variables and
-then leave the function as above,
-or you can provide return values
-(either a single or :ref:`multiple ones<multi-return>`) directly with the ``return``
-statement:
+您�以明确地赋值给返回��，然��上�那样结�函数，
+或者您�以用 ``return`` 语�直接�供返回值（�个或 :ref:`多个返回值 <multi-return>`）。
 
 .. code-block:: solidity
 
@@ -125,63 +113,62 @@ statement:
         }
     }
 
-If you use an early ``return`` to leave a function that has return variables,
-you must provide return values together with the return statement.
+如果您过早使用 ``return`` �结�一个有返回��的函数，您必须在返回语�中�时�供返回值。
 
 .. note::
-    You cannot return some types from non-internal functions.
-    This includes the types listed below and any composite types that recursively contain them:
+    您�能从�内部函数返回�些类型。
+    这包括下�列出的类型和任何递归地包�它们的��类型：
 
-    - mappings,
-    - internal function types,
-    - reference types with location set to ``storage``,
-    - multi-dimensional arrays (applies only to :ref:`ABI coder v1 <abi_coder>`),
-    - structs (applies only to :ref:`ABI coder v1 <abi_coder>`).
+    - 映射，
+    - 内部函数类型，
+    - �考类型，�置设置为 ``storage``，
+    - 多维数组（仅适用于 :ref:`ABI coder v1 <abi_coder>`），
+    - 结构体（仅适用于 :ref:`ABI coder v1 <abi_coder>`）。
 
-    This restriction does not apply to library functions because of their different :ref:`internal ABI <library-selectors>`.
+    这个�制�适用于库函数，因为它们有��的 :ref:`内部 ABI <library-selectors>`。
 
 .. _multi-return:
 
-Returning Multiple Values
+返回多个值
 -------------------------
 
-When a function has multiple return types, the statement ``return (v0, v1, ..., vn)`` can be used to return multiple values.
-The number of components must be the same as the number of return variables
-and their types have to match, potentially after an :ref:`implicit conversion <types-conversion-elementary-types>`.
+当一个函数有多个返回类型时，语� ``return (v0, v1, ..., vn)`` �以用�返回多个值。
+声明的数�必须与返回��的数�相�，并且它们的类型必须匹�，
+有�能是�过 :ref:`��转� <types-conversion-elementary-types>`。
 
 .. _state-mutability:
 
-State Mutability
+状���性
 ================
 
 .. index:: ! view function, function;view
 
 .. _view-functions:
 
-View Functions
+View 函数
 --------------
 
-Functions can be declared ``view`` in which case they promise not to modify the state.
+函数�以被声明为 ``view``，在这�情况下，它们承诺�修改状�。
 
 .. note::
-  If the compiler's EVM target is Byzantium or newer (default) the opcode
-  ``STATICCALL`` is used when ``view`` functions are called, which enforces the state
-  to stay unmodified as part of the EVM execution. For library ``view`` functions
-  ``DELEGATECALL`` is used, because there is no combined ``DELEGATECALL`` and ``STATICCALL``.
-  This means library ``view`` functions do not have run-time checks that prevent state
-  modifications. This should not impact security negatively because library code is
-  usually known at compile-time and the static checker performs compile-time checks.
-
-The following statements are considered modifying the state:
-
-#. Writing to state variables.
-#. :ref:`Emitting events <events>`.
-#. :ref:`Creating other contracts <creating-contracts>`.
-#. Using ``selfdestruct``.
-#. Sending Ether via calls.
-#. Calling any function not marked ``view`` or ``pure``.
-#. Using low-level calls.
-#. Using inline assembly that contains certain opcodes.
+  如果编译器的EVM版本是Byzantium或更新的（默认），
+  当调用 ``view`` 函数时，会使用�作� ``STATICCALL``，这使得状�作为EVM执行的一部分���被修改。
+  对于库�约的 ``view`` 函数，会使用 ``DELEGATECALL``，
+  因为没有组�的 ``DELEGATECALL`` 和 ``STATICCALL``。
+  这�味�库�约中的 ``view`` 函数没有防止状�修改的�行时的检查。
+  这应该�会对安全产生负�影�，因为库�约的代�通常在编译时就知�了，
+  而且��检查器也会进行编译时检查。
+
+以下声明被认为是修改状�：
+
+#. 修改状���。
+#. :ref:`产生事件 <events>`。
+#. :ref:`创建其它�约 <creating-contracts>`。
+#. 使用 ``selfdestruct``。
+#. 通过调用��以太�。
+#. 调用任何没有标记为 ``view`` 或者 ``pure`` 的函数。
+#. 使用低级调用。
+#. 使用包�特定�作�的内�汇编。
 
 .. code-block:: solidity
 
@@ -195,42 +182,38 @@ The following statements are considered modifying the state:
     }
 
 .. note::
-  ``constant`` on functions used to be an alias to ``view``, but this was dropped in version 0.5.0.
+  函数上的 ``constant`` 曾�是 ``view`` 的别�，但在0.5.0版本中被�消。
 
 .. note::
-  Getter methods are automatically marked ``view``.
+  Getter方法被自动标记为 ``view``。
 
 .. note::
-  Prior to version 0.5.0, the compiler did not use the ``STATICCALL`` opcode
-  for ``view`` functions.
-  This enabled state modifications in ``view`` functions through the use of
-  invalid explicit type conversions.
-  By using  ``STATICCALL`` for ``view`` functions, modifications to the
-  state are prevented on the level of the EVM.
+  在0.5.0版本之�，编译器没有为 ``view`` 函数使用 ``STATICCALL`` �作�。
+  这使得 ``view`` 函数通过使用无效的显�类型转�进行状�修改。
+  通过对 ``view`` 函数使用 ``STATICCALL``，在EVM层�上防止了对状�的修改。
 
 .. index:: ! pure function, function;pure
 
 .. _pure-functions:
 
-Pure Functions
+Pure 函数
 --------------
 
-Functions can be declared ``pure`` in which case they promise not to read from or modify the state.
-In particular, it should be possible to evaluate a ``pure`` function at compile-time given
-only its inputs and ``msg.data``, but without any knowledge of the current blockchain state.
-This means that reading from ``immutable`` variables can be a non-pure operation.
+函数�以被声明为 ``pure``，在这�情况下，它们承诺�读�或修改状�。
+特别是，应该�以在编译时评估一个 ``pure`` 函数，�给它的输入和 ``msg.data``，
+但�知�当�区�链状�。这�味�读� ``immutable`` 的���以是一个�标准pure的�作。
 
 .. note::
-  If the compiler's EVM target is Byzantium or newer (default) the opcode ``STATICCALL`` is used,
-  which does not guarantee that the state is not read, but at least that it is not modified.
+  如果编译器的EVM版本是Byzantium或更新的（默认），则使用�作� ``STATICCALL``，
+  这并�能���读�状�，但至少�能修改。
 
-In addition to the list of state modifying statements explained above, the following are considered reading from the state:
+除了上�解释的状�修改语�列表外，以下内容被认为是从状�中读�的：
 
-#. Reading from state variables.
-#. Accessing ``address(this).balance`` or ``<address>.balance``.
-#. Accessing any of the members of ``block``, ``tx``, ``msg`` (with the exception of ``msg.sig`` and ``msg.data``).
-#. Calling any function not marked ``pure``.
-#. Using inline assembly that contains certain opcodes.
+#. 读�状���。
+#. 访问 ``address(this).balance`` 或者 ``<address>.balance``。
+#. 访问 ``block``， ``tx``， ``msg`` 中任��员 （除 ``msg.sig`` 和 ``msg.data`` 之外）。
+#. 调用任何未标记为 ``pure`` 的函数。
+#. 使用包��些�作�的内�汇编。
 
 .. code-block:: solidity
 
@@ -243,105 +226,92 @@ In addition to the list of state modifying statements explained above, the follo
         }
     }
 
-Pure functions are able to use the ``revert()`` and ``require()`` functions to revert
-potential state changes when an :ref:`error occurs <assert-and-require>`.
+当一个 :ref:`错误�生 <assert-and-require>` 时，
+Pure 函数能够使用 ``revert()`` 和 ``require()`` 函数���潜在的状��化。
 
-Reverting a state change is not considered a "state modification", as only changes to the
-state made previously in code that did not have the ``view`` or ``pure`` restriction
-are reverted and that code has the option to catch the ``revert`` and not pass it on.
+��一个状��化�被认为是 "状�修改"，
+因为�有之�在没有 ``view`` 或 ``pure`` �制的代�中对状�的改��会被��，
+并且该代��以选择�� ``revert`` 而�传递给它。
 
+<<<<<<< HEAD
+这�行为也与 ``STATICCALL`` �作�一致。
+=======
 This behavior is also in line with the ``STATICCALL`` opcode.
+>>>>>>> english/develop
 
 .. warning::
-  It is not possible to prevent functions from reading the state at the level
-  of the EVM, it is only possible to prevent them from writing to the state
-  (i.e. only ``view`` can be enforced at the EVM level, ``pure`` can not).
+  在EVM层���能阻止函数读�状�，��能阻止它们写入状�
+  （��有 ``view`` �以在EVM层�执行， ``pure`` ��以）。
 
 .. note::
-  Prior to version 0.5.0, the compiler did not use the ``STATICCALL`` opcode
-  for ``pure`` functions.
-  This enabled state modifications in ``pure`` functions through the use of
-  invalid explicit type conversions.
-  By using  ``STATICCALL`` for ``pure`` functions, modifications to the
-  state are prevented on the level of the EVM.
+  在0.5.0版本之�，编译器没有为 ``pure`` 函数使用 ``STATICCALL`` �作�。
+  这使得在 ``pure`` 函数中通过使用无效的显�类型转�进行状�修改。
+  通过对 ``pure`` 函数使用 ``STATICCALL``，在EVM层�防止了对状�的修改。
 
 .. note::
-  Prior to version 0.4.17 the compiler did not enforce that ``pure`` is not reading the state.
-  It is a compile-time type check, which can be circumvented doing invalid explicit conversions
-  between contract types, because the compiler can verify that the type of the contract does
-  not do state-changing operations, but it cannot check that the contract that will be called
-  at runtime is actually of that type.
+  在0.4.17版本之�，编译器并没有强制�求 ``pure`` �读�状�。
+  这是一个编译时的类型检查，�以规�在�约类型之间�无效的显�转�，
+  因为编译器�以验��约的类型��改�状�的�作，
+  但它�能检查将在�行时被调用的�约是�真的属于该类型。
 
 .. _special-functions:
 
-Special Functions
+特殊的函数
 =================
 
 .. index:: ! receive ether function, function;receive, ! receive
 
 .. _receive-ether-function:
 
-Receive Ether Function
+接收以太的函数
 ----------------------
 
-A contract can have at most one ``receive`` function, declared using
-``receive() external payable { ... }``
-(without the ``function`` keyword).
-This function cannot have arguments, cannot return anything and must have
-``external`` visibility and ``payable`` state mutability.
-It can be virtual, can override and can have modifiers.
-
-The receive function is executed on a
-call to the contract with empty calldata. This is the function that is executed
-on plain Ether transfers (e.g. via ``.send()`` or ``.transfer()``). If no such
-function exists, but a payable :ref:`fallback function <fallback-function>`
-exists, the fallback function will be called on a plain Ether transfer. If
-neither a receive Ether nor a payable fallback function is present, the
-contract cannot receive Ether through a transaction that does not represent a payable function call and throws an
-exception.
-
-In the worst case, the ``receive`` function can only rely on 2300 gas being
-available (for example when ``send`` or ``transfer`` is used), leaving little
-room to perform other operations except basic logging. The following operations
-will consume more gas than the 2300 gas stipend:
-
-- Writing to storage
-- Creating a contract
-- Calling an external function which consumes a large amount of gas
-- Sending Ether
+一个�约最多�以有一个 ``receive`` 函数，
+使用 ``receive() external payable { ... }`` �声明。（没有  ``function`` 关键字）。
+这个函数�能有�数，�能返回任何东西，必须具有 ``external`` 的��性和 ``payable`` 的状���性。
+它�以是虚拟的，�以�载，也�以有修饰器。
+
+receive 函数是在调用�约时执行的，并带有空的 calldata。
+这是在纯以太传输（例如通过 ``.send()`` 或 ``.transfer()`` ）时执行的函数。
+如果�存在这样的函数，但存在一个 payable 类型的 :ref:`fallback函数 <fallback-function>`，
+这个 fallback 函数将在纯以太传输时被调用。
+如果既没有直接接收以太（receive函数），也没有 payable 类型的 fallback 函数，
+那么�约就�能通过�代表支付函数调用的交易接收以太�，还会抛出一个异常。
+
+在最�的情况下， ``receive`` 函数�有2300个气体�用（例如当使用 ``send`` 或 ``transfer`` 时），
+除了基本的记录外，几乎没有空间�执行其他�作。以下�作的消耗气体将超过2300气体的规定：
+
+- 写入存储
+- 创建�约
+- 调用消耗大� gas 的外部函数
+- ��以太�
 
 .. warning::
-    When Ether is sent directly to a contract (without a function call, i.e. sender uses ``send`` or ``transfer``)
-    but the receiving contract does not define a receive Ether function or a payable fallback function,
-    an exception will be thrown, sending back the Ether (this was different
-    before Solidity v0.4.0). If you want your contract to receive Ether,
-    you have to implement a receive Ether function (using payable fallback functions for receiving Ether is
-    not recommended, since the fallback is invoked and would not fail for interface confusions
-    on the part of the sender).
+    当以太被直接��到一个�约（没有使用函数调用，���者使用 ``send`` 或 ``transfer``），
+    但接收�约没有定义一个接收以太的函数或一个 payable 类型的 fallback 函数，会抛出一个异常，
+    将以太�回（这在Solidity v0.4.0之�是��的）。因此，如果您想让您的�约接收以太，
+    您必须实现一个 receive 函数（�建议使用 payable 类型的 fallback 函数�接收以太，
+    因为它�会因为接�混乱而失败）。
 
 
 .. warning::
-    A contract without a receive Ether function can receive Ether as a
-    recipient of a *coinbase transaction* (aka *miner block reward*)
-    or as a destination of a ``selfdestruct``.
+    没有接收以太�功能的�约�以作为 *coinbase交易*（�称 *矿工区�奖励*）的接收者
+    或作为 ``selfdestruct`` 的目的地接收以太�。
 
-    A contract cannot react to such Ether transfers and thus also
-    cannot reject them. This is a design choice of the EVM and
-    Solidity cannot work around it.
+    �约�能对这样的以太�转移�出�应，因此也�能拒�它们。
+    这是EVM的一个设计选择，Solidity无法绕过它。
 
-    It also means that ``address(this).balance`` can be higher
-    than the sum of some manual accounting implemented in a
-    contract (i.e. having a counter updated in the receive Ether function).
+    这也�味� ``address(this).balance`` �以高于�约中
+    实现的一些手工记�的总和（�在接收以太函数中更新的累加器）。
 
-Below you can see an example of a Sink contract that uses function ``receive``.
+下�您�以看到一个使用 ``receive`` 函数的Sink�约的例�。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.6.0 <0.9.0;
 
-    // This contract keeps all Ether sent to it with no way
-    // to get it back.
+    // 这个�约会�留所有��给它的以太�，没有办法返还。
     contract Sink {
         event Received(address, uint);
         receive() external payable {
@@ -353,48 +323,40 @@ Below you can see an example of a Sink contract that uses function ``receive``.
 
 .. _fallback-function:
 
-Fallback Function
+Fallback 函数
 -----------------
 
-A contract can have at most one ``fallback`` function, declared using either ``fallback () external [payable]``
-or ``fallback (bytes calldata input) external [payable] returns (bytes memory output)``
-(both without the ``function`` keyword).
-This function must have ``external`` visibility. A fallback function can be virtual, can override
-and can have modifiers.
+一个�约最多�以有一个 ``fallback`` 函数，使用 ``fallback () external [payable]``
+或 ``fallback (bytes calldata input) external [payable] returns (bytes memory output)``
+�声明（都没有 ``function`` 关键字）。
+这个函数必须具有 ``external`` 的函数��性。
+一个 fallback 函数�以被标记为 virtual，�以标记为 override，也�以有修饰器。
 
-The fallback function is executed on a call to the contract if none of the other
-functions match the given function signature, or if no data was supplied at
-all and there is no :ref:`receive Ether function <receive-ether-function>`.
-The fallback function always receives data, but in order to also receive Ether
-it must be marked ``payable``.
+如果其他函数都�符�给定的函数签�，或者根本没有�供数�，
+也没有 :ref:`接收以太的函数 <receive-ether-function>`，那么fallback函数将在调用�约时执行。
+fallback函数总是接收数�，但为了�时接收以太，它必须被标记为 ``payable``。
 
-If the version with parameters is used, ``input`` will contain the full data sent to the contract
-(equal to ``msg.data``) and can return data in ``output``. The returned data will not be
-ABI-encoded. Instead it will be returned without modifications (not even padding).
+如果使用带�数的版本， ``input``  将包���给�约的全部数�（等于 ``msg.data``），
+并�以在 ``output`` 中返回数�。返回的数�将�会被ABI编�。
+相�，它将在没有修改的情况下返回（甚至没有填充）。
 
-In the worst case, if a payable fallback function is also used in
-place of a receive function, it can only rely on 2300 gas being
-available (see :ref:`receive Ether function <receive-ether-function>`
-for a brief description of the implications of this).
+在最�的情况下，如果一个�接收以太的fallback函数也被用�代替接收功能，
+那么它�有2300气体是�用的
+（�� :ref:`接收以太函数 <receive-ether-function>` 对这一�义的简��述）。
 
-Like any function, the fallback function can execute complex
-operations as long as there is enough gas passed on to it.
+�任何函数一样，��有足够的气体传递给它，fallback函数就�以执行��的�作。
 
 .. warning::
-    A ``payable`` fallback function is also executed for
-    plain Ether transfers, if no :ref:`receive Ether function <receive-ether-function>`
-    is present. It is recommended to always define a receive Ether
-    function as well, if you define a payable fallback function
-    to distinguish Ether transfers from interface confusions.
+    如果没有 :ref:`receive 函数 <receive-ether-function>` 的存在，
+    一个标记为 ``payable`` 的 fallback 函数也会在普通的以太传输时执行。
+    如果您已�定义了一个 payable 类型的 fallback 函数，
+    我们�建议您也定义一个 receive 函数接收以太，以区分以太传输和接�混淆的情况。
 
 .. note::
-    If you want to decode the input data, you can check the first four bytes
-    for the function selector and then
-    you can use ``abi.decode`` together with the array slice syntax to
-    decode ABI-encoded data:
+    如果您想对输入数�进行解�，您�以检查�四个字节的函数选择器，
+    然�您�以使用 ``abi.decode`` 与数组切片语法一起对ABI编�的数�进行解�：
     ``(c, d) = abi.decode(input[4:], (uint256, uint256));``
-    Note that this should only be used as a last resort and
-    proper functions should be used instead.
+    注�，这�能作为最�的手段，应该使用适当的函数�代替。
 
 
 .. code-block:: solidity
@@ -404,26 +366,22 @@ operations as long as there is enough gas passed on to it.
 
     contract Test {
         uint x;
-        // This function is called for all messages sent to
-        // this contract (there is no other function).
-        // Sending Ether to this contract will cause an exception,
-        // because the fallback function does not have the `payable`
-        // modifier.
+        // 所有��到此�约的消�都会调用此函数（没有其他函数）。
+        // �该�约��以太�将引起异常，
+        // 因为fallback函数没有 `payable` 修饰器。
         fallback() external { x = 1; }
     }
 
     contract TestPayable {
         uint x;
         uint y;
-        // This function is called for all messages sent to
-        // this contract, except plain Ether transfers
-        // (there is no other function except the receive function).
-        // Any call with non-empty calldata to this contract will execute
-        // the fallback function (even if Ether is sent along with the call).
+        // 所有��到此�约的消�都会调用这个函数，
+        // 除了普通的以太传输（除了receive函数，没有其他函数）。
+        // 任何对该�约的�空的调用都将执行fallback函数（�使以太与调用一起被��）。
         fallback() external payable { x = 1; y = msg.value; }
 
-        // This function is called for plain Ether transfers, i.e.
-        // for every call with empty calldata.
+        // 这个函数是为纯以太传输而调用的，
+        // �为�一个带有空calldata的调用。
         receive() external payable { x = 2; y = msg.value; }
     }
 
@@ -431,32 +389,31 @@ operations as long as there is enough gas passed on to it.
         function callTest(Test test) public returns (bool) {
             (bool success,) = address(test).call(abi.encodeWithSignature("nonExistingFunction()"));
             require(success);
-            // results in test.x becoming == 1.
+            // 结果是 test.x 等于 1。
 
-            // address(test) will not allow to call ``send`` directly, since ``test`` has no payable
-            // fallback function.
-            // It has to be converted to the ``address payable`` type to even allow calling ``send`` on it.
+            // address(test)将��许直接调用 ``send``，
+            // 因为 ``test`` 没有�接收以太的fallback函数。
+            // 它必须被转�为 ``address payable`` 类型，��许调用 ``send``。
             address payable testPayable = payable(address(test));
 
-            // If someone sends Ether to that contract,
-            // the transfer will fail, i.e. this returns false here.
+            // 如果有人�该�约��以太�，转账将失败，�这里返回false。
             return testPayable.send(2 ether);
         }
 
         function callTestPayable(TestPayable test) public returns (bool) {
             (bool success,) = address(test).call(abi.encodeWithSignature("nonExistingFunction()"));
             require(success);
-            // results in test.x becoming == 1 and test.y becoming 0.
+            // 结果是 test.x 等于 1，test.y 等于 0。
             (success,) = address(test).call{value: 1}(abi.encodeWithSignature("nonExistingFunction()"));
             require(success);
-            // results in test.x becoming == 1 and test.y becoming 1.
+            // 结果是 test.x 等于 1，test.y 等于 1。
 
-            // If someone sends Ether to that contract, the receive function in TestPayable will be called.
-            // Since that function writes to storage, it takes more gas than is available with a
-            // simple ``send`` or ``transfer``. Because of that, we have to use a low-level call.
+            // 如果有人�该�约��以太�，TestPayable的receive函数将被调用。
+            // 由于该函数会写入存储空间，它需�的气体比简�的 ``send`` 或 ``transfer`` �多。
+            // 由于这个原因，我们必须�使用一个低级别的调用。
             (success,) = address(test).call{value: 2 ether}("");
             require(success);
-            // results in test.x becoming == 2 and test.y becoming 2 ether.
+            // 结果是 test.x 等于 1，test.y 等于 2 个以太。
 
             return true;
         }
@@ -466,14 +423,12 @@ operations as long as there is enough gas passed on to it.
 
 .. _overload-function:
 
-Function Overloading
+函数�载
 ====================
 
-A contract can have multiple functions of the same name but with different parameter
-types.
-This process is called "overloading" and also applies to inherited functions.
-The following example shows overloading of the function
-``f`` in the scope of contract ``A``.
+一个�约�以有多个��的，但�数类型��的函数。
+这个过程被称为 "�载"，也适用于继承的函数。
+下�的例�显示了在�约 ``A`` 范围内对函数 ``f`` 的�载。
 
 .. code-block:: solidity
 
@@ -491,15 +446,14 @@ The following example shows overloading of the function
         }
     }
 
-Overloaded functions are also present in the external interface. It is an error if two
-externally visible functions differ by their Solidity types but not by their external types.
+�载函数也存在于外部接�中。如果两个外部��函数仅区别于 Solidity 内的类型而�是它们的外部类型则会导致错误。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.4.16 <0.9.0;
 
-    // This will not compile
+    // 这段代��会编译
     contract A {
         function f(B value) public pure returns (B out) {
             out = value;
@@ -514,19 +468,17 @@ externally visible functions differ by their Solidity types but not by their ext
     }
 
 
-Both ``f`` function overloads above end up accepting the address type for the ABI although
-they are considered different inside Solidity.
+以上两个 ``f`` 函数�载最终都接�ABI的地�类型，尽管它们在Solidity中被认为是��的。
 
-Overload resolution and Argument matching
+�载解�和�数匹�
 -----------------------------------------
 
-Overloaded functions are selected by matching the function declarations in the current scope
-to the arguments supplied in the function call. Functions are selected as overload candidates
-if all arguments can be implicitly converted to the expected types. If there is not exactly one
-candidate, resolution fails.
+通过将当�范围内的函数声明与函数调用中�供的�数相匹�，�以选择�载函数。
+如果所有�数都�以��地转�为预期类型，则选择函数作为�载候选项。
+如果一个候选都没有，解�失败。
 
 .. note::
-    Return parameters are not taken into account for overload resolution.
+    返回�数�作为�载解�的��。
 
 .. code-block:: solidity
 
@@ -543,6 +495,6 @@ candidate, resolution fails.
         }
     }
 
-Calling ``f(50)`` would create a type error since ``50`` can be implicitly converted both to ``uint8``
-and ``uint256`` types. On another hand ``f(256)`` would resolve to ``f(uint256)`` overload as ``256`` cannot be implicitly
-converted to ``uint8``.
+调用 ``f(50)`` 会导致类型错误，因为 ``50`` 既�以被��转�为 ``uint8``
+也�以被��转�为 ``uint256``。 �一方�，调用 ``f(256)`` 则会解�为 ``f(uint256)`` �载，
+因为 ``256`` �能��转�为 ``uint8``。
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index c787c5af6a90..4cd34dfc1ee8 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -1,221 +1,352 @@
 .. index:: ! inheritance, ! base class, ! contract;base, ! deriving
 
 ***********
-Inheritance
+继承
 ***********
 
-Solidity supports multiple inheritance including polymorphism.
+Solidity支�多�继承，包括多�性。
 
-Polymorphism means that a function call (internal and external)
-always executes the function of the same name (and parameter types)
-in the most derived contract in the inheritance hierarchy.
-This has to be explicitly enabled on each function in the
-hierarchy using the ``virtual`` and ``override`` keywords.
-See :ref:`Function Overriding <function-overriding>` for more details.
+多�性�味�函数调用（内部和外部）总是执行继承层次结构中最新继承的�约中的��函数（和�数类型）。
+但必须使用 ``virtual`` 和 ``override`` 关键字在层次结构中的�个函数上明确�用。
+�� :ref:`函数�载 <function-overriding>` 以了解更多细节。
 
-It is possible to call functions further up in the inheritance
-hierarchy internally by explicitly specifying the contract
-using ``ContractName.functionName()`` or using ``super.functionName()``
-if you want to call the function one level higher up in
-the flattened inheritance hierarchy (see below).
+通过使用 ``ContractName.functionName()`` 明确指定�约，
+�以在内部调用继承层次结构中更高的函数。
+或者如果您想在�平化的继承层次中调用高一级的函数（�下文），
+�以使用 ``super.functionName()``。
 
-When a contract inherits from other contracts, only a single
-contract is created on the blockchain, and the code from all the base contracts
-is compiled into the created contract. This means that all internal calls
-to functions of base contracts also just use internal function calls
-(``super.f(..)`` will use JUMP and not a message call).
+当一个�约继承自其他�约时，在区�链上�创建一个�一的�约，
+所有基础�约的代�被编译到创建的�约中。
+这�味�对基础�约的所有内部函数的调用也�是使用内部函数调用
+（ ``super.f(..)`` 将使用 JUMP 而�是消�调用）。
 
-State variable shadowing is considered as an error.  A derived contract can
-only declare a state variable ``x``, if there is no visible state variable
-with the same name in any of its bases.
+状���的阴影被认为是一个错误。
+一个派生�约�能声明一个状��� ``x``，
+如果在它的任何基类中没有相��称的��状���。
 
-The general inheritance system is very similar to
-`Python's <https://docs.python.org/3/tutorial/classes.html#inheritance>`_,
-especially concerning multiple inheritance, but there are also
-some :ref:`differences <multi-inheritance>`.
+总的�说，Solidity 的继承系统与 `Python的继承系统 <https://docs.python.org/3/tutorial/classes.html#inheritance>`_
+�常相似，特别是关于多�继承方�，但也有一些 :ref:`��之处 <multi-inheritance>`。
 
-Details are given in the following example.
+详细情况�下�的例�。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // This will report a warning due to deprecated selfdestruct
+<<<<<<< HEAD
+    // 这将报告一个由于废弃的 selfdestruct 而产生的警告
+
+=======
+>>>>>>> english/develop
 
     contract Owned {
-        constructor() { owner = payable(msg.sender); }
         address payable owner;
+        constructor() { owner = payable(msg.sender); }
+    }
+
+<<<<<<< HEAD
+
+    // 使用 `is` 从�一个�约派生。派生�约�以访问所有��有�员，
+    // 包括内部函数和状���，但无法通过 `this` �外部访问。
+    contract Destructible is Owned {
+        // 关键字 `virtual` �味�该函数�以在派生类中改�其行为（"�载"）。
+        function destroy() virtual public {
+            if (msg.sender == owner) selfdestruct(owner);
+        }
     }
 
 
+    // 这些抽象�约仅用于给编译器�供接�。
+    // 注�函数没有函数体。
+    // 如果一个�约没有实现所有函数，则�能用作接�。
+=======
     // Use `is` to derive from another contract. Derived
     // contracts can access all non-private members including
     // internal functions and state variables. These cannot be
     // accessed externally via `this`, though.
-    contract Destructible is Owned {
+    contract Emittable is Owned {
+        event Emitted();
+
         // The keyword `virtual` means that the function can change
         // its behavior in derived classes ("overriding").
-        function destroy() virtual public {
-            if (msg.sender == owner) selfdestruct(owner);
+        function emitEvent() virtual public {
+            if (msg.sender == owner)
+                emit Emitted();
         }
     }
 
-
     // These abstract contracts are only provided to make the
     // interface known to the compiler. Note the function
     // without body. If a contract does not implement all
     // functions it can only be used as an interface.
+>>>>>>> english/develop
     abstract contract Config {
         function lookup(uint id) public virtual returns (address adr);
     }
 
-
     abstract contract NameReg {
         function register(bytes32 name) public virtual;
         function unregister() public virtual;
     }
 
+<<<<<<< HEAD
 
+    // 多�继承是�能的。请注�， `Owned` 也是 `Destructible` 的基类，
+    // 但�有一个 `Owned` 实例（就� C++ 中的虚拟继承）。
+    contract Named is Owned, Destructible {
+=======
     // Multiple inheritance is possible. Note that `Owned` is
-    // also a base class of `Destructible`, yet there is only a single
+    // also a base class of `Emittable`, yet there is only a single
     // instance of `Owned` (as for virtual inheritance in C++).
-    contract Named is Owned, Destructible {
+    contract Named is Owned, Emittable {
+>>>>>>> english/develop
         constructor(bytes32 name) {
             Config config = Config(0xD5f9D8D94886E70b06E474c3fB14Fd43E2f23970);
             NameReg(config.lookup(1)).register(name);
         }
 
+<<<<<<< HEAD
+        // 函数�以被�一个具有相��称和相�数�/类型输入的函数�载。
+        // 如果�载函数有��类型的输出�数，会导致错误。
+        // 本地和基于消�的函数调用都会考虑这些�载。
+        // 如果您想�载这个函数，您需�使用 `override` 关键字。
+        // 如果您想让这个函数�次被�载，您需��指定 `virtual` 关键字。
+        function destroy() public virtual override {
+            if (msg.sender == owner) {
+                Config config = Config(0xD5f9D8D94886E70b06E474c3fB14Fd43E2f23970);
+                NameReg(config.lookup(1)).unregister();
+                // �然�以调用特定的�载函数。
+                Destructible.destroy();
+=======
         // Functions can be overridden by another function with the same name and
-        // the same number/types of inputs.  If the overriding function has different
+        // the same number/types of inputs. If the overriding function has different
         // types of output parameters, that causes an error.
         // Both local and message-based function calls take these overrides
         // into account.
         // If you want the function to override, you need to use the
         // `override` keyword. You need to specify the `virtual` keyword again
         // if you want this function to be overridden again.
-        function destroy() public virtual override {
+        function emitEvent() public virtual override {
             if (msg.sender == owner) {
                 Config config = Config(0xD5f9D8D94886E70b06E474c3fB14Fd43E2f23970);
                 NameReg(config.lookup(1)).unregister();
                 // It is still possible to call a specific
                 // overridden function.
-                Destructible.destroy();
+                Emittable.emitEvent();
+>>>>>>> english/develop
             }
         }
     }
 
 
+<<<<<<< HEAD
+    // 如果构造函数接��数，
+    // 则需�在声明（�约的构造函数）时�供，
+    // 或在派生�约的构造函数�置以修饰器调用风格�供（�下文）。
+    contract PriceFeed is Owned, Destructible, Named("GoldFeed") {
+=======
     // If a constructor takes an argument, it needs to be
     // provided in the header or modifier-invocation-style at
     // the constructor of the derived contract (see below).
-    contract PriceFeed is Owned, Destructible, Named("GoldFeed") {
+    contract PriceFeed is Owned, Emittable, Named("GoldFeed") {
+        uint info;
+
+>>>>>>> english/develop
         function updateInfo(uint newInfo) public {
             if (msg.sender == owner) info = newInfo;
         }
 
+<<<<<<< HEAD
+        // 在这里，我们�指定了 `override` 而没有 `virtual`。
+        // 这�味�从 `PriceFeed` 派生出�的�约�能�改� `destroy` 的行为。
+        function destroy() public override(Destructible, Named) { Named.destroy(); }
+=======
         // Here, we only specify `override` and not `virtual`.
         // This means that contracts deriving from `PriceFeed`
-        // cannot change the behavior of `destroy` anymore.
-        function destroy() public override(Destructible, Named) { Named.destroy(); }
+        // cannot change the behavior of `emitEvent` anymore.
+        function emitEvent() public override(Emittable, Named) { Named.emitEvent(); }
+>>>>>>> english/develop
         function get() public view returns(uint r) { return info; }
-
-        uint info;
     }
 
-Note that above, we call ``Destructible.destroy()`` to "forward" the
-destruction request. The way this is done is problematic, as
+<<<<<<< HEAD
+注�，在上�，我们调用 ``Destructible.destroy()`` � "转�" 销�请求。
+这样�的方�是有问题的，从下�的例�中�以看出：
+=======
+Note that above, we call ``Emittable.emitEvent()`` to "forward" the
+emit event request. The way this is done is problematic, as
 seen in the following example:
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // This will report a warning due to deprecated selfdestruct
+<<<<<<< HEAD
+    // 这将报告一个由于废弃的 selfdestruct 而产生的警告
+=======
+>>>>>>> english/develop
 
-    contract owned {
-        constructor() { owner = payable(msg.sender); }
+    contract Owned {
         address payable owner;
+        constructor() { owner = payable(msg.sender); }
     }
 
-    contract Destructible is owned {
-        function destroy() public virtual {
-            if (msg.sender == owner) selfdestruct(owner);
+    contract Emittable is Owned {
+        event Emitted();
+
+        function emitEvent() virtual public {
+            if (msg.sender == owner) {
+                emit Emitted();
+            }
         }
     }
 
+<<<<<<< HEAD
     contract Base1 is Destructible {
-        function destroy() public virtual override { /* do cleanup 1 */ Destructible.destroy(); }
+        function destroy() public virtual override { /* 清除�作 1 */ Destructible.destroy(); }
     }
 
     contract Base2 is Destructible {
-        function destroy() public virtual override { /* do cleanup 2 */ Destructible.destroy(); }
+        function destroy() public virtual override { /* 清除�作 2 */ Destructible.destroy(); }
+=======
+    contract Base1 is Emittable {
+        event Base1Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base1 logic */
+            emit Base1Emitted();
+            Emittable.emitEvent();
+        }
+    }
+
+    contract Base2 is Emittable {
+        event Base2Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base2 logic */
+            emit Base2Emitted();
+            Emittable.emitEvent();
+        }
+>>>>>>> english/develop
     }
 
     contract Final is Base1, Base2 {
-        function destroy() public override(Base1, Base2) { Base2.destroy(); }
+        event FinalEmitted();
+        function emitEvent() public override(Base1, Base2) {
+            /* Here, we emit an event to simulate some Final logic */
+            emit FinalEmitted();
+            Base2.emitEvent();
+        }
     }
 
-A call to ``Final.destroy()`` will call ``Base2.destroy`` because we specify it
+<<<<<<< HEAD
+调用 ``Final.destroy()`` 时会调用最�的派生�载函数 ``Base2.destroy``，
+但是会绕过 ``Base1.destroy``， 解决这个问题的方法是使用 ``super``：
+=======
+A call to ``Final.emitEvent()`` will call ``Base2.emitEvent`` because we specify it
 explicitly in the final override, but this function will bypass
-``Base1.destroy``. The way around this is to use ``super``:
+``Base1.emitEvent``, resulting in the following sequence of events:
+``FinalEmitted -> Base2Emitted -> Emitted``, instead of the expected sequence:
+``FinalEmitted -> Base2Emitted -> Base1Emitted -> Emitted``.
+The way around this is to use ``super``:
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // This will report a warning due to deprecated selfdestruct
+<<<<<<< HEAD
+    // 这将报告一个由于废弃的 selfdestruct 而产生的警告
+=======
+>>>>>>> english/develop
 
-    contract owned {
-        constructor() { owner = payable(msg.sender); }
+    contract Owned {
         address payable owner;
+        constructor() { owner = payable(msg.sender); }
     }
 
-    contract Destructible is owned {
-        function destroy() virtual public {
-            if (msg.sender == owner) selfdestruct(owner);
+    contract Emittable is Owned {
+        event Emitted();
+
+        function emitEvent() virtual public {
+            if (msg.sender == owner) {
+                emit Emitted();
+            }
         }
     }
 
+<<<<<<< HEAD
     contract Base1 is Destructible {
-        function destroy() public virtual override { /* do cleanup 1 */ super.destroy(); }
+        function destroy() public virtual override { /* 清除�作 1 */ super.destroy(); }
     }
 
 
     contract Base2 is Destructible {
-        function destroy() public virtual override { /* do cleanup 2 */ super.destroy(); }
+        function destroy() public virtual override { /* 清除�作 2 */ super.destroy(); }
+=======
+    contract Base1 is Emittable {
+        event Base1Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base1 logic */
+            emit Base1Emitted();
+            super.emitEvent();
+        }
+    }
+
+
+    contract Base2 is Emittable {
+        event Base2Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base2 logic */
+            emit Base2Emitted();
+            super.emitEvent();
+        }
+>>>>>>> english/develop
     }
 
     contract Final is Base1, Base2 {
-        function destroy() public override(Base1, Base2) { super.destroy(); }
+        event FinalEmitted();
+        function emitEvent() public override(Base1, Base2) {
+            /* Here, we emit an event to simulate some Final logic */
+            emit FinalEmitted();
+            super.emitEvent();
+        }
     }
 
-If ``Base2`` calls a function of ``super``, it does not simply
+<<<<<<< HEAD
+如果 ``Base2`` 调用 ``super`` 的函数，它�会简�在其基类�约上调用该函数。
+相�，它在最终的继承关系图谱的上一个基类�约中调用这个函数，
+所以它会调用 ``Base1.destroy()``
+（注�最终的继承�列是——从最远派生�约开始：Final, Base2, Base1, Destructible, ownerd）。
+在类中使用 super 调用的实际函数在当�类的上下文中是未知的，尽管它的类型是已知的。
+这与普通的虚拟方法查找类似。
+=======
+If ``Final`` calls a function of ``super``, it does not simply
 call this function on one of its base contracts.  Rather, it
 calls this function on the next base contract in the final
-inheritance graph, so it will call ``Base1.destroy()`` (note that
+inheritance graph, so it will call ``Base1.emitEvent()`` (note that
 the final inheritance sequence is -- starting with the most
-derived contract: Final, Base2, Base1, Destructible, owned).
+derived contract: Final, Base2, Base1, Emittable, Owned).
 The actual function that is called when using super is
 not known in the context of the class where it is used,
 although its type is known. This is similar for ordinary
 virtual method lookup.
+>>>>>>> english/develop
 
 .. index:: ! overriding;function
 
 .. _function-overriding:
 
-Function Overriding
+函数�载
 ===================
 
-Base functions can be overridden by inheriting contracts to change their
-behavior if they are marked as ``virtual``. The overriding function must then
-use the ``override`` keyword in the function header.
-The overriding function may only change the visibility of the overridden function from ``external`` to ``public``.
-The mutability may be changed to a more strict one following the order:
-``nonpayable`` can be overridden by ``view`` and ``pure``. ``view`` can be overridden by ``pure``.
-``payable`` is an exception and cannot be changed to any other mutability.
+如果基函数被标记为 ``virtual``，则�以通过继承�约�改�其行为。
+被�载的函数必须在函数头中使用 ``override`` 关键字。
+�载函数�能将被�载函数的��性从 ``external`` 改为 ``public``。
+��性�以按照以下顺�改�为更严格的��性。
+``nonpayable`` �以被 ``view`` 和 ``pure`` �载。
+``view`` �以被 ``pure`` �写。 ``payable`` 是一个例外，�能被改�为任何其他��性。
 
-The following example demonstrates changing mutability and visibility:
+下�的例�演示了改�函数��性和��性：
 
 .. code-block:: solidity
 
@@ -234,12 +365,10 @@ The following example demonstrates changing mutability and visibility:
         function foo() override public pure {}
     }
 
-For multiple inheritance, the most derived base contracts that define the same
-function must be specified explicitly after the ``override`` keyword.
-In other words, you have to specify all base contracts that define the same function
-and have not yet been overridden by another base contract (on some path through the inheritance graph).
-Additionally, if a contract inherits the same function from multiple (unrelated)
-bases, it has to explicitly override it:
+对于多�继承，必须在 ``override`` 关键字�明确指定定义�一函数的最多派生基类�约。
+���说，您必须指定所有定义�一函数的基类�约，
+并且还没有被�一个基类�约�载（在继承图的�个路径上）。
+此外，如果一个�约从多个（�相关的）基类�约上继承了�一个函数，必须明确地�载它。
 
 .. code-block:: solidity
 
@@ -258,15 +387,14 @@ bases, it has to explicitly override it:
 
     contract Inherited is Base1, Base2
     {
-        // Derives from multiple bases defining foo(), so we must explicitly
-        // override it
+        // 派生自多个定义 foo() 函数的基类�约，
+        // 所以我们必须明确地�载它
         function foo() public override(Base1, Base2) {}
     }
 
-An explicit override specifier is not required if
-the function is defined in a common base contract
-or if there is a unique function in a common base contract
-that already overrides all other functions.
+如果函数被定义在一个共�的基类�约中，
+或者在一个共�的基类�约中有一个独特的函数已��载了所有其他的函数，
+则�需�明确的函数�载指定符。
 
 .. code-block:: solidity
 
@@ -276,45 +404,41 @@ that already overrides all other functions.
     contract A { function f() public pure{} }
     contract B is A {}
     contract C is A {}
-    // No explicit override required
+    // 无需明确的�载
     contract D is B, C {}
 
-More formally, it is not required to override a function (directly or
-indirectly) inherited from multiple bases if there is a base contract
-that is part of all override paths for the signature, and (1) that
-base implements the function and no paths from the current contract
-to the base mentions a function with that signature or (2) that base
-does not implement the function and there is at most one mention of
-the function in all paths from the current contract to that base.
+更准确地说，如果有一个基类�约是该签�的所有�载路径的一部分，
+并且（1）该基类�约实现了该函数，并且从当��约到该基类�约的任何路径都没有�到具有该签�的函数，
+或者（2）该基类�约没有实现该函数，并且从当��约到该基类�约的所有路径中最多�有一个�到该函数，
+那么就�需��载从多个基类�约继承的函数（直接或间接）。
 
-In this sense, an override path for a signature is a path through
-the inheritance graph that starts at the contract under consideration
-and ends at a contract mentioning a function with that signature
-that does not override.
+在这个�义上，一个签�的�载路径是一�继承图的路径，
+它从所考虑的�约开始，到�到具有该签�的函数的�约结�，
+而该签�没有�载。
 
+<<<<<<< HEAD
+如果您�把一个�载的函数标记为 ``virtual``，派生�约就�能�改�该函数的行为。
+=======
 If you do not mark a function that overrides as ``virtual``, derived
 contracts can no longer change the behavior of that function.
+>>>>>>> english/develop
 
 .. note::
 
-  Functions with the ``private`` visibility cannot be ``virtual``.
+  具有 ``private`` ��性的函数�能是 ``virtual``。
 
 .. note::
 
-  Functions without implementation have to be marked ``virtual``
-  outside of interfaces. In interfaces, all functions are
-  automatically considered ``virtual``.
+  在接��约之外，没有实现的函数必须被标记为 ``virtual``。
+  在接��约中，所有的函数都被自动视为 ``virtual``。
 
 .. note::
 
-  Starting from Solidity 0.8.8, the ``override`` keyword is not
-  required when overriding an interface function, except for the
-  case where the function is defined in multiple bases.
+  从Solidity 0.8.8开始，当�载一个接�函数时，
+  �需� ``override`` 关键字，除�该函数被定义在多个基础上。
 
 
-Public state variables can override external functions if the
-parameter and return types of the function matches the getter function
-of the variable:
+如果函数的�数和返回类型与��的getter函数匹�，公共状����以�载为外部函数。
 
 .. code-block:: solidity
 
@@ -333,20 +457,18 @@ of the variable:
 
 .. note::
 
-  While public state variables can override external functions, they themselves cannot
-  be overridden.
+  虽然公共状����以�载外部函数，但它们本身�能被�载。
 
 .. index:: ! overriding;modifier
 
 .. _modifier-overriding:
 
-Modifier Overriding
+修饰器�载
 ===================
 
-Function modifiers can override each other. This works in the same way as
-:ref:`function overriding <function-overriding>` (except that there is no overloading for modifiers). The
-``virtual`` keyword must be used on the overridden modifier
-and the ``override`` keyword must be used in the overriding modifier:
+函数修改器�以相互�载。
+这与 :ref:`函数�载 <function-overriding>` 的工作方�相�（除了对修改器没有�载）。
+``virtual`` 关键字必须用在被�载的修改器上， ``override`` 关键字必须用在�载的修改器上：
 
 .. code-block:: solidity
 
@@ -364,8 +486,7 @@ and the ``override`` keyword must be used in the overriding modifier:
     }
 
 
-In case of multiple inheritance, all direct base contracts must be specified
-explicitly:
+在多�继承的情况下，必须明确指定所有的直接基类�约。
 
 .. code-block:: solidity
 
@@ -393,27 +514,28 @@ explicitly:
 
 .. _constructor:
 
-Constructors
+构造函数
 ============
 
+<<<<<<< HEAD
+构造函数是一个用 ``constructor`` 关键字声明的�选函数，
+它在�约创建时被执行，您�以在这里�行�约�始化代�。
+=======
 A constructor is an optional function declared with the ``constructor`` keyword
 which is executed upon contract creation, and where you can run contract
-initialisation code.
+initialization code.
+>>>>>>> english/develop
 
-Before the constructor code is executed, state variables are initialised to
-their specified value if you initialise them inline, or their :ref:`default value<default-value>` if you do not.
+在构造函数代�执行之�，如果您用内�编程的方��始化状���，则将其�始化为指定的值；
+如果您�用内�编程的方���始化，则将其�始化为 :ref:`默认值 <default-value>`。
 
-After the constructor has run, the final code of the contract is deployed
-to the blockchain. The deployment of
-the code costs additional gas linear to the length of the code.
-This code includes all functions that are part of the public interface
-and all functions that are reachable from there through function calls.
-It does not include the constructor code or internal functions that are
-only called from the constructor.
+构造函数�行�，�约的最终代�被部署到区�链上。
+部署代�的gas花费与代�长度�线性关系。
+这段代�包括属于公共接�的所有函数，以�所有通过函数调用�以到达的函数。
+但�包括构造函数代�或�从构造函数中调用的内部函数。
 
-If there is no
-constructor, the contract will assume the default constructor, which is
-equivalent to ``constructor() {}``. For example:
+如果没有构造函数，�约将�定默认的构造函数，
+相当于 ``constructor() {}``。比如说：
 
 .. code-block:: solidity
 
@@ -432,27 +554,27 @@ equivalent to ``constructor() {}``. For example:
         constructor() {}
     }
 
-You can use internal parameters in a constructor (for example storage pointers). In this case,
-the contract has to be marked :ref:`abstract <abstract-contract>`, because these parameters
-cannot be assigned valid values from outside but only through the constructors of derived contracts.
+您�以在构造函数中使用内部�数（例如，存储指针）。
+在这�情况下，�约必须被标记为 :ref:`abstract <abstract-contract>`，
+因为这些�数�能从外部分�有效的值，�能通过派生�约的构造函数�赋值。
+
 
 .. warning::
-    Prior to version 0.4.22, constructors were defined as functions with the same name as the contract.
-    This syntax was deprecated and is not allowed anymore in version 0.5.0.
+    在0.4.22版本之�，构造函数被定义为与�约��的函数。
+    这�语法已被废弃，在0.5.0版本中���许。
 
 .. warning::
-    Prior to version 0.7.0, you had to specify the visibility of constructors as either
-    ``internal`` or ``public``.
+    在0.7.0版本之�，您必须指定构造函数的��性为 ``internal`` 或 ``public``。
 
 
 .. index:: ! base;constructor, inheritance list, contract;abstract, abstract contract
 
-Arguments for Base Constructors
+基本构造函数的�数
 ===============================
 
-The constructors of all the base contracts will be called following the
-linearization rules explained below. If the base constructors have arguments,
-derived contracts need to specify all of them. This can be done in two ways:
+所有基类�约的构造函数将按照下�解释的线性化规则被调用。
+如果基类�约构造函数有�数，派生�约需�指定所有的�数。
+这�以通过两�方�实现：
 
 .. code-block:: solidity
 
@@ -464,25 +586,33 @@ derived contracts need to specify all of them. This can be done in two ways:
         constructor(uint x_) { x = x_; }
     }
 
-    // Either directly specify in the inheritance list...
+    // �么直接在继承列表中指定...
     contract Derived1 is Base(7) {
         constructor() {}
     }
 
-    // or through a "modifier" of the derived constructor...
+    // 或者通过派生构造函数的一个 "修改器"……
     contract Derived2 is Base {
         constructor(uint y) Base(y * y) {}
     }
 
-    // or declare abstract...
+    // 或者将�约声明为abstract类型……
     abstract contract Derived3 is Base {
     }
 
-    // and have the next concrete derived contract initialize it.
+    // 并让下一个具体的派生�约对其进行�始化。
     contract DerivedFromDerived is Derived3 {
         constructor() Base(10 + 10) {}
     }
 
+<<<<<<< HEAD
+一�方�是直接在继承列表中给出（ ``is Base(7)`` ）。
+�一�是通过修改器作为派生构造函数的一部分被调用的方�（ ``Base(_y * _y)`` ）。
+如果构造函数�数是一个常�，并且定义了�约的行为或�述了它，那么第一�方�更方便。
+如果基类�约的构造函数�数�赖于派生�约的�数，则必须使用第二�方�。
+�数必须在继承列表中或在派生构造函数中以修饰器的形�给出。
+在两个地方都指定�数是一个错误。
+=======
 One way is directly in the inheritance list (``is Base(7)``).  The other is in
 the way a modifier is invoked as part of
 the derived constructor (``Base(y * y)``). The first way to
@@ -493,40 +623,34 @@ constructor arguments of the base depend on those of the
 derived contract. Arguments have to be given either in the
 inheritance list or in modifier-style in the derived constructor.
 Specifying arguments in both places is an error.
+>>>>>>> english/develop
 
-If a derived contract does not specify the arguments to all of its base
-contracts' constructors, it must be declared abstract. In that case, when
-another contract derives from it, that other contract's inheritance list
-or constructor must provide the necessary parameters
-for all base classes that haven't had their parameters specified (otherwise,
-that other contract must be declared abstract as well). For example, in the above
-code snippet, see ``Derived3`` and ``DerivedFromDerived``.
+如果一个派生�约没有指定其所有基类�约的构造函数的�数，那么它必须被声明为 abstract 类型。在这�情况下，
+当�一个�约从它派生时，其他�约的继承列表或构造函数必须为所有没有指定�数的基类�约�供必�的�数
+（�则，其他�约也必须被声明为 abstract 类型）。例如，在上�的代�片段中，
+�以查看�约 ``Derived3`` 和 ``DerivedFromDerived``。
 
 .. index:: ! inheritance;multiple, ! linearization, ! C3 linearization
 
 .. _multi-inheritance:
 
-Multiple Inheritance and Linearization
+多�继承与线性化
 ======================================
 
-Languages that allow multiple inheritance have to deal with
-several problems.  One is the `Diamond Problem <https://en.wikipedia.org/wiki/Multiple_inheritance#The_diamond_problem>`_.
-Solidity is similar to Python in that it uses "`C3 Linearization <https://en.wikipedia.org/wiki/C3_linearization>`_"
-to force a specific order in the directed acyclic graph (DAG) of base classes. This
-results in the desirable property of monotonicity but
-disallows some inheritance graphs. Especially, the order in
-which the base classes are given in the ``is`` directive is
-important: You have to list the direct base contracts
-in the order from "most base-like" to "most derived".
-Note that this order is the reverse of the one used in Python.
-
-Another simplifying way to explain this is that when a function is called that
-is defined multiple times in different contracts, the given bases
-are searched from right to left (left to right in Python) in a depth-first manner,
-stopping at the first match. If a base contract has already been searched, it is skipped.
-
-In the following code, Solidity will give the
-error "Linearization of inheritance graph impossible".
+编程语言实现多�继承需�解决几个问题。
+一个问题是 `钻石问题 <https://en.wikipedia.org/wiki/Multiple_inheritance#The_diamond_problem>`_ 。
+Solidity 借鉴了 Python 的方�并且使用 "`C3 线性化 <https://en.wikipedia.org/wiki/C3_linearization>`_"
+强制一个由基类构�的 DAG（有�无环图）��一个特定的顺�。
+这最终实现我们所希望的唯一化的结果，但也使�些继承方��为无效。
+尤其是，基类在 ``is`` ��的顺�很��。 在下�的代�中，
+您必须按照从 “最接近的基类�（most base-like）到 “最远的继承�（most derived）的顺��指定所有的基类。
+注�，这个顺�与Python中使用的顺�相�。
+
+�一�简化的解释方�是，当一个函数被调用时，
+它在��的�约中被多次定义，给定的基类以深度优先的方�从�到左（Python中从左到�）进行�索，
+在第一个匹�处�止。如果一个基类�约已�被�索过了，它就被跳过。
+
+在下�的代�中，Solidity 会给出 “Linearization of inheritance graph impossible� 这样的错误。
 
 .. code-block:: solidity
 
@@ -535,19 +659,18 @@ error "Linearization of inheritance graph impossible".
 
     contract X {}
     contract A is X {}
-    // This will not compile
+    // 这段代��会编译
     contract C is A, X {}
 
-The reason for this is that ``C`` requests ``X`` to override ``A``
-(by specifying ``A, X`` in this order), but ``A`` itself
-requests to override ``X``, which is a contradiction that
-cannot be resolved.
+代�编译出错的原因是 ``C`` �求 ``X`` �写 ``A``
+（因为定义的顺�是 ``A, X`` ）， 但是 ``A`` 本身�求�写 ``X``，
+这是一�无法解决的冲�。
 
-Due to the fact that you have to explicitly override a function
-that is inherited from multiple bases without a unique override,
-C3 linearization is not too important in practice.
+由于您必须明确地�载一个从多个基类�约继承的函数，
+而没有唯一的�载，C3线性化在实践中�是太��。
 
-One area where inheritance linearization is especially important and perhaps not as clear is when there are multiple constructors in the inheritance hierarchy. The constructors will always be executed in the linearized order, regardless of the order in which their arguments are provided in the inheriting contract's constructor.  For example:
+继承的线性化特别��的一个领域是，当继承层次中存在多个构造函数时，也许�那么清楚。
+构造函数将总是按照线性化的顺�执行，而�管它们的�数在继承�约的构造函数中是以何�顺��供的。 比如说：
 
 .. code-block:: solidity
 
@@ -562,7 +685,7 @@ One area where inheritance linearization is especially important and perhaps not
         constructor() {}
     }
 
-    // Constructors are executed in the following order:
+    // 构造函数按以下顺�执行：
     //  1 - Base1
     //  2 - Base2
     //  3 - Derived1
@@ -570,7 +693,7 @@ One area where inheritance linearization is especially important and perhaps not
         constructor() Base1() Base2() {}
     }
 
-    // Constructors are executed in the following order:
+    // 构造函数按以下顺�执行：
     //  1 - Base2
     //  2 - Base1
     //  3 - Derived2
@@ -578,7 +701,7 @@ One area where inheritance linearization is especially important and perhaps not
         constructor() Base2() Base1() {}
     }
 
-    // Constructors are still executed in the following order:
+    // 构造函数�按以下顺�执行：
     //  1 - Base2
     //  2 - Base1
     //  3 - Derived3
@@ -587,9 +710,17 @@ One area where inheritance linearization is especially important and perhaps not
     }
 
 
-Inheriting Different Kinds of Members of the Same Name
+继承有相��字的��类型�员
 ======================================================
 
+<<<<<<< HEAD
+由于继承的原因，当�约有以下任何一对具有相�的�称时，这是一个错误：
+  - 函数和修饰器
+  - 函数和事件
+  - 事件和修饰器
+
+有一�例外情况，状���的 getter �以�载一个外部函数。
+=======
 The only situations where, due to inheritance, a contract may contain multiple definitions sharing
 the same name are:
 
@@ -598,3 +729,4 @@ the same name are:
 - Overriding of external virtual functions by state variable getters.
 - Overriding of virtual modifiers.
 - Overloading of events.
+>>>>>>> english/develop
diff --git a/docs/contracts/interfaces.rst b/docs/contracts/interfaces.rst
index a3085667b7f4..472be69f72a7 100644
--- a/docs/contracts/interfaces.rst
+++ b/docs/contracts/interfaces.rst
@@ -2,25 +2,24 @@
 
 .. _interfaces:
 
-**********
-Interfaces
-**********
+**********************
+接�（interface）�约
+**********************
 
-Interfaces are similar to abstract contracts, but they cannot have any functions implemented.
-There are further restrictions:
+接�（interface）�约类似于抽象（abstract）�约，但是它们�能实现任何函数。并且还有进一步的�制：
 
-- They cannot inherit from other contracts, but they can inherit from other interfaces.
-- All declared functions must be external in the interface, even if they are public in the contract.
-- They cannot declare a constructor.
-- They cannot declare state variables.
-- They cannot declare modifiers.
+- 它们�能继承其他�约，但是它们�以继承其他接��约。
+- 在接��约中所有声明的函数必须是 external 类型的，�使它们在�约中是 public 类型的。
+- 它们�能声明构造函数。
+- 它们�能声明状���。
+- 它们�能声明修饰器。
 
-Some of these restrictions might be lifted in the future.
+将��能会解除这些里的�些�制。
 
-Interfaces are basically limited to what the Contract ABI can represent, and the conversion between the ABI and
-an interface should be possible without any information loss.
+接��约基本上仅�于�约 ABI �以表示的内容，
+并且 ABI 和接��约之间的转�应该�会丢失任何信�。
 
-Interfaces are denoted by their own keyword:
+接��约由它们自己的关键字表示：
 
 .. code-block:: solidity
 
@@ -33,15 +32,13 @@ Interfaces are denoted by their own keyword:
         function transfer(address recipient, uint amount) external;
     }
 
-Contracts can inherit interfaces as they would inherit other contracts.
+就�继承其他�约一样，�约�以继承接��约。
 
-All functions declared in interfaces are implicitly ``virtual`` and any
-functions that override them do not need the ``override`` keyword.
-This does not automatically mean that an overriding function can be overridden again -
-this is only possible if the overriding function is marked ``virtual``.
+所有在接��约中声明的函数都是��的 ``virtual`` 的类型，
+任何�载它们的函数都�需� ``override`` 关键字。
+这并�自动�味�一个�载的函数�以被�次�载--这�有在�载的函数被标记为 ``virtual`` 时��能。
 
-Interfaces can inherit from other interfaces. This has the same rules as normal
-inheritance.
+接��约�以从其他接��约继承。这与普通的继承有�相�的规则。
 
 .. code-block:: solidity
 
@@ -57,15 +54,17 @@ inheritance.
     }
 
     interface SubInterface is ParentA, ParentB {
-        // Must redefine test in order to assert that the parent
-        // meanings are compatible.
+        // 必须�新定义test，以便断言父类的�义是兼容的。
         function test() external override(ParentA, ParentB) returns (uint256);
     }
 
-Types defined inside interfaces and other contract-like structures
-can be accessed from other contracts: ``Token.TokenType`` or ``Token.Coin``.
+在接��约和其他类似�约的结构中定义的类型�以从其他�约中访问： ``Token.TokenType`` 或 ``Token.Coin``。
 
+<<<<<<< HEAD
+.. 警告:
+=======
 .. warning::
+>>>>>>> english/develop
 
-    Interfaces have supported ``enum`` types since :doc:`Solidity version 0.5.0 <050-breaking-changes>`, make
-    sure the pragma version specifies this version as a minimum.
+    接��约从 :doc:`Solidity 0.5.0 <050-breaking-changes>` 开始支� ``enum`` 类型，
+    请确�pragma版本至少指定这个版本。
diff --git a/docs/contracts/libraries.rst b/docs/contracts/libraries.rst
index 7256ebe0315a..46def7309022 100644
--- a/docs/contracts/libraries.rst
+++ b/docs/contracts/libraries.rst
@@ -3,53 +3,40 @@
 .. _libraries:
 
 *********
-Libraries
+库�约
 *********
 
-Libraries are similar to contracts, but their purpose is that they are deployed
-only once at a specific address and their code is reused using the ``DELEGATECALL``
-(``CALLCODE`` until Homestead)
-feature of the EVM. This means that if library functions are called, their code
-is executed in the context of the calling contract, i.e. ``this`` points to the
-calling contract, and especially the storage from the calling contract can be
-accessed. As a library is an isolated piece of source code, it can only access
-state variables of the calling contract if they are explicitly supplied (it
-would have no way to name them, otherwise). Library functions can only be
-called directly (i.e. without the use of ``DELEGATECALL``) if they do not modify
-the state (i.e. if they are ``view`` or ``pure`` functions),
-because libraries are assumed to be stateless. In particular, it is
-not possible to destroy a library.
+库�约与普通�约类似，但是它们�需�在特定的地�部署一次，
+并且它们的代��以通过 EVM 的 ``DELEGATECALL`` (Homestead 之�使用 ``CALLCODE`` 关键字)特性进行�用。
+这�味�如果库函数被调用，它的代�在调用�约的上下文中执行，
+� ``this`` 指�调用�约，特别是�以访问调用�约的存储。
+因为�个库�约都是一段独立的代�，所以它仅能访问调用�约明确�供的状���（�则它就无法通过�字访问这些��）。
+如果库函数�修改状�（也就是说，如果它们是 ``view`` 或者 ``pure`` 函数），
+它们�以通过直接调用�使用（��使用 ``DELEGATECALL`` 关键字），
+这是因为我们�定库�约是无状�的。
+特别的是，销�一个库�约是��能的。
 
 .. note::
-    Until version 0.4.20, it was possible to destroy libraries by
-    circumventing Solidity's type system. Starting from that version,
-    libraries contain a :ref:`mechanism<call-protection>` that
-    disallows state-modifying functions
-    to be called directly (i.e. without ``DELEGATECALL``).
-
-Libraries can be seen as implicit base contracts of the contracts that use them.
-They will not be explicitly visible in the inheritance hierarchy, but calls
-to library functions look just like calls to functions of explicit base
-contracts (using qualified access like ``L.f()``).
-Of course, calls to internal functions
-use the internal calling convention, which means that all internal types
-can be passed and types :ref:`stored in memory <data-location>` will be passed by reference and not copied.
-To realize this in the EVM, the code of internal library functions
-that are called from a contract
-and all functions called from therein will at compile time be included in the calling
-contract, and a regular ``JUMP`` call will be used instead of a ``DELEGATECALL``.
+    在0.4.20版本之�，有�能通过规�Solidity的类型系统�破�库�约。
+    从该版本开始，库�约包�一个 :ref:`�护机制 <call-protection>`，
+    ��许直接调用修改状�的函数（�没有 ``DELEGATECALL`` ）。
+
+库�约�以看作是使用他们的�约的��的基类�约。
+虽然它们在继承关系中�会显���，但调用库函数与调用显�的基类�约�分类似
+（如果 ``L`` 是库�约的�，�以使用 ``L.f()`` 调用库函数）。
+当然，需�使用内部调用约定�调用内部函数，这�味�所有的内部类型都�以被传递，
+类型 :ref:`存储在内存 <data-location>` 将被引用传递而�是�制。
+为了在EVM中实现这一点，从�约中调用的内部库函数的代�和其中调用的所有函数将在编译时包�在调用�约中，
+并使用常规的 ``JUMP`` 调用，而�是 ``DELEGATECALL``。
 
 .. note::
-    The inheritance analogy breaks down when it comes to public functions.
-    Calling a public library function with ``L.f()`` results in an external call (``DELEGATECALL``
-    to be precise).
-    In contrast, ``A.f()`` is an internal call when ``A`` is a base contract of the current contract.
+    当涉�到公共函数时，继承的类比就失效了。
+    用 ``L.f()`` 调用公共库函数的结果是一个外部调用（准确地说，是 ``DELEGATECALL`` ）。
+    相�，当 ``A.f()`` 是当��约的基类�约时， ``A.f()`` 是一个内部调用。
 
 .. index:: using for, set
 
-The following example illustrates how to use libraries (but using a manual method,
-be sure to check out :ref:`using for <using-for>` for a
-more advanced example to implement a set).
+下�的示例说明如何使用库（但也请务必看看 :ref:`using for <using-for>` 有一个实现 set 更好的例�）。
 
 .. code-block:: solidity
 
@@ -57,25 +44,22 @@ more advanced example to implement a set).
     pragma solidity >=0.6.0 <0.9.0;
 
 
-    // We define a new struct datatype that will be used to
-    // hold its data in the calling contract.
+    // 我们定义了一个新的结构体数�类型，用于在调用�约中�存数�。
     struct Data {
         mapping(uint => bool) flags;
     }
 
     library Set {
-        // Note that the first parameter is of type "storage
-        // reference" and thus only its storage address and not
-        // its contents is passed as part of the call.  This is a
-        // special feature of library functions.  It is idiomatic
-        // to call the first parameter `self`, if the function can
-        // be seen as a method of that object.
+        // 注�第一个�数是 “storage reference�类型，
+        // 因此在调用中�数传递的�是它的存储地�而�是内容。
+        // 这是库函数的一个特性。如果该函数�以被视为对象的方法，
+        // 则习惯称第一个�数为 `self` 。
         function insert(Data storage self, uint value)
             public
             returns (bool)
         {
             if (self.flags[value])
-                return false; // already there
+                return false; // 已�存在
             self.flags[value] = true;
             return true;
         }
@@ -85,7 +69,7 @@ more advanced example to implement a set).
             returns (bool)
         {
             if (!self.flags[value])
-                return false; // not there
+                return false; // �存在
             self.flags[value] = false;
             return true;
         }
@@ -104,31 +88,23 @@ more advanced example to implement a set).
         Data knownValues;
 
         function register(uint value) public {
-            // The library functions can be called without a
-            // specific instance of the library, since the
-            // "instance" will be the current contract.
+            // �需�库的特定实例就�以调用库函数，
+            // 因为当��约就是 “instance�。
             require(Set.insert(knownValues, value));
         }
-        // In this contract, we can also directly access knownValues.flags, if we want.
+        // 如果我们愿�，我们也�以在这个�约中直接访问 knownValues.flags。
     }
 
-Of course, you do not have to follow this way to use
-libraries: they can also be used without defining struct
-data types. Functions also work without any storage
-reference parameters, and they can have multiple storage reference
-parameters and in any position.
+当然，您�必按照这�方�去使用库：它们也�以在�定义结构数�类型的情况下使用。
+函数也�需�任何存储引用�数，库�以出现在任何�置并且�以有多个存储引用�数。
 
-The calls to ``Set.contains``, ``Set.insert`` and ``Set.remove``
-are all compiled as calls (``DELEGATECALL``) to an external
-contract/library. If you use libraries, be aware that an
-actual external function call is performed.
-``msg.sender``, ``msg.value`` and ``this`` will retain their values
-in this call, though (prior to Homestead, because of the use of ``CALLCODE``, ``msg.sender`` and
-``msg.value`` changed, though).
+调用 ``Set.contains``， ``Set.insert`` 和 ``Set.remove`` 都被编译为对外部�约/库的调用（ ``DELEGATECALL`` ）。
+如果使用库，请注�实际执行的是外部函数调用。
+``msg.sender``， ``msg.value`` 和 ``this`` 在调用中将�留它们的值，
+（在 Homestead 之�，因为使用了 ``CALLCODE`` ，改�了 ``msg.sender`` 和 ``msg.value``)。
 
-The following example shows how to use :ref:`types stored in memory <data-location>` and
-internal functions in libraries in order to implement
-custom types without the overhead of external function calls:
+下�的例�显示了如何使用 :ref:`存储在内存中的类型 <data-location>` 和库�约中的内部函数，
+以实现自定义类型，而没有外部函数调用的开销：
 
 .. code-block:: solidity
     :force:
@@ -162,7 +138,7 @@ custom types without the overhead of external function calls:
                 }
             }
             if (carry > 0) {
-                // too bad, we have to add a limb
+                // 太差了，我们需�增加一个 limb
                 uint[] memory newLimbs = new uint[](r.limbs.length + 1);
                 uint i;
                 for (i = 0; i < r.limbs.length; ++i)
@@ -192,56 +168,52 @@ custom types without the overhead of external function calls:
         }
     }
 
-It is possible to obtain the address of a library by converting
-the library type to the ``address`` type, i.e. using ``address(LibraryName)``.
+通过将库�约的类型转�为 ``address`` 类型，�使用 ``address(LibraryName)``，�以获得一个库的地�。
 
-As the compiler does not know the address where the library will be deployed, the compiled hex code
-will contain placeholders of the form ``__$30bbc0abd4d6364515865950d3e0d10953$__``. The placeholder
-is a 34 character prefix of the hex encoding of the keccak256 hash of the fully qualified library
-name, which would be for example ``libraries/bigint.sol:BigInt`` if the library was stored in a file
-called ``bigint.sol`` in a ``libraries/`` directory. Such bytecode is incomplete and should not be
-deployed. Placeholders need to be replaced with actual addresses. You can do that by either passing
-them to the compiler when the library is being compiled or by using the linker to update an already
-compiled binary. See :ref:`library-linking` for information on how to use the commandline compiler
-for linking.
+由于编译器�知�库�约的部署地�，
+编译�的�六进制代�将包� ``__$30bbc0abd4d6364515865950d3e0d10953$__`` 形�的��符。
+��符是完全等�于库�约�的keccak256哈希值的34个字符的�缀，例如 ``libraries/bigint.sol:BigInt``，
+如果该库存储在 ``libraries/`` 目录下一个�为 ``bigint.sol`` 的文件中。
+这样的字节�是�完整的，�应该被部署。��符需�被替��实际地�。
+您�以在编译库的时候把它们传递给编译器，或者用链接器�更新已�编译好的二进制文件。
+�� :ref:`library-linking`，了解如何使用命令行编译器进行链接。
 
-In comparison to contracts, libraries are restricted in the following ways:
+与�约相比，库在以下方��到�制：
 
-- they cannot have state variables
-- they cannot inherit nor be inherited
-- they cannot receive Ether
-- they cannot be destroyed
+- 它们�能有状���
+- 它们�能继承，也�能被继承
+- 它们�能接收以太
+- 它们�能被销�
 
-(These might be lifted at a later point.)
+(这些�能会在以�的时间里被解除)。
 
 .. _library-selectors:
 .. index:: ! selector; of a library function
 
-Function Signatures and Selectors in Libraries
+库�约中的函数签�和选择器
 ==============================================
 
-While external calls to public or external library functions are possible, the calling convention for such calls
-is considered to be internal to Solidity and not the same as specified for the regular :ref:`contract ABI<ABI>`.
-External library functions support more argument types than external contract functions, for example recursive structs
-and storage pointers. For that reason, the function signatures used to compute the 4-byte selector are computed
-following an internal naming schema and arguments of types not supported in the contract ABI use an internal encoding.
+虽然对公共或外部库函数的外部调用是�能的，但这�调用的调用惯例被认为是 Solidity 内部的，
+与常规 :ref:`�约 ABI <ABI>` 所指定的�一样。
+外部库函数比外部�约函数支�更多的�数类型，例如递归结构和存储指针。
+由于这个原因，用于计算4字节选择器的函数签�是按照内部命�模�计算的，
+�约ABI中�支�的类型的�数使用内部编�。
 
-The following identifiers are used for the types in the signatures:
+签�中的类型使用了以下标识符：
 
-- Value types, non-storage ``string`` and non-storage ``bytes`` use the same identifiers as in the contract ABI.
-- Non-storage array types follow the same convention as in the contract ABI, i.e. ``<type>[]`` for dynamic arrays and
-  ``<type>[M]`` for fixed-size arrays of ``M`` elements.
-- Non-storage structs are referred to by their fully qualified name, i.e. ``C.S`` for ``contract C { struct S { ... } }``.
-- Storage pointer mappings use ``mapping(<keyType> => <valueType>) storage`` where ``<keyType>`` and ``<valueType>`` are
-  the identifiers for the key and value types of the mapping, respectively.
-- Other storage pointer types use the type identifier of their corresponding non-storage type, but append a single space
-  followed by ``storage`` to it.
+- 值类型��存储的 ``string`` 和�存储的 ``bytes`` 使用与�约ABI中相�的标识符。
+- �存储数组类型�循与�约ABI中相�的惯例，� ``<type>[]`` 用于动�数组，
+  ``<type>[M]`` 用于 ``M`` 元素的固定大�数组。
+- �存储结构体用其完全等�于的�称�指代，� ``C.S`` 代表 ``contract C { struct S { ... } }``。
+- 存储指针映射使用 ``mapping(<keyType> => <valueType>) storage``，
+  其中 ``<keyType>`` 和 ``<valueType>`` 分别是映射的键和值类型的标识。
+- 其他存储指针类型使用其对应的�存储类型的类型标识符，但在其��附加一个空格，� ``storage``。
 
-The argument encoding is the same as for the regular contract ABI, except for storage pointers, which are encoded as a
-``uint256`` value referring to the storage slot to which they point.
+�数的编�与普通�约ABI相�，除了存储指针，
+它被编�为一个 ``uint256`` 值，指的是它们所指�的存储槽。
 
-Similarly to the contract ABI, the selector consists of the first four bytes of the Keccak256-hash of the signature.
-Its value can be obtained from Solidity using the ``.selector`` member as follows:
+与�约ABI类似，选择器由签�的Keccak256-hash的�四个字节组�。
+它的值�以通过使用 ``.selector`` �员从 Solidity 获得，如下：
 
 .. code-block:: solidity
 
@@ -262,30 +234,21 @@ Its value can be obtained from Solidity using the ``.selector`` member as follow
 
 .. _call-protection:
 
-Call Protection For Libraries
+库的调用�护
 =============================
 
-As mentioned in the introduction, if a library's code is executed
-using a ``CALL`` instead of a ``DELEGATECALL`` or ``CALLCODE``,
-it will revert unless a ``view`` or ``pure`` function is called.
-
-The EVM does not provide a direct way for a contract to detect
-whether it was called using ``CALL`` or not, but a contract
-can use the ``ADDRESS`` opcode to find out "where" it is
-currently running. The generated code compares this address
-to the address used at construction time to determine the mode
-of calling.
-
-More specifically, the runtime code of a library always starts
-with a push instruction, which is a zero of 20 bytes at
-compilation time. When the deploy code runs, this constant
-is replaced in memory by the current address and this
-modified code is stored in the contract. At runtime,
-this causes the deploy time address to be the first
-constant to be pushed onto the stack and the dispatcher
-code compares the current address against this constant
-for any non-view and non-pure function.
-
-This means that the actual code stored on chain for a library
-is different from the code reported by the compiler as
-``deployedBytecode``.
+正如介�中�到的那样，如果库的代�是通过 ``CALL`` �执行，
+而�是 ``DELEGATECALL`` 或者 ``CALLCODE``，
+那么执行的结果会被��， 除�是对 ``view`` 或者 ``pure`` 函数的调用。
+
+EVM没有�供一个直接的方法让�约检测它是�被使用 ``CALL`` 调用，
+但是�约�以使用 ``ADDRESS`` �作��找出它当��行的 "�置"。
+生�的代�将这个地�与构造时使用的地�进行比较，以确定调用的模�。
+
+更具体地说，一个库�约的�行时代�总是以 push 指令开始，
+在编译时它是一个20字节的零。
+当部署代��行时，这个常数在内存中被当�地�所�代，这个修改�的代�被存储在�约中。
+在�行时，这导致部署时的地��为第一个被推入堆栈的常数，
+对于任何 �-view 和 �-pure 函数，调度器代�会将当�地�与这个常数进行比较。
+
+这�味�一个存储在链上的库�约的实际代�，与编译器报告的 ``deployedBytecode`` 的代���。
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index a05cb277c6d9..a17d2487f1e4 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -6,48 +6,43 @@
 Using For
 *********
 
-The directive ``using A for B`` can be used to attach
-functions (``A``) as operators to user-defined value types
-or as member functions to any type (``B``).
-The member functions receive the object they are called on
-as their first parameter (like the ``self`` variable in Python).
-The operator functions receive operands as parameters.
-
-It is valid either at file level or inside a contract,
-at contract level.
-
-The first part, ``A``, can be one of:
-
-- A list of functions, optionally with an operator name assigned (e.g.
-  ``using {f, g as +, h, L.t} for uint``).
-  If no operator is specified, the function can be either a library function or a free function and
-  is attached to the type as a member function.
-  Otherwise it must be a free function and it becomes the definition of that operator on the type.
-- The name of a library (e.g. ``using L for uint``) -
-  all non-private functions of the library are attached to the type
-  as member functions
-
-At file level, the second part, ``B``, has to be an explicit type (without data location specifier).
-Inside contracts, you can also use ``*`` in place of the type (e.g. ``using L for *;``),
-which has the effect that all functions of the library ``L``
-are attached to *all* types.
-
-If you specify a library, *all* non-private functions in the library get attached,
-even those where the type of the first parameter does not
-match the type of the object. The type is checked at the
-point the function is called and function overload
-resolution is performed.
-
-If you use a list of functions (e.g. ``using {f, g, h, L.t} for uint``),
-then the type (``uint``) has to be implicitly convertible to the
-first parameter of each of these functions. This check is
-performed even if none of these functions are called.
-Note that private library functions can only be specified when ``using for`` is inside a library.
-
-If you define an operator (e.g. ``using {f as +} for T``), then the type (``T``) must be a
-:ref:`user-defined value type <user-defined-value-types>` and the definition must be a ``pure`` function.
-Operator definitions must be global.
-The following operators can be defined this way:
+指令 ``using A for B`` �用于将函数（ ``A``）
+作为�算符附加到用户定义的值类型
+或作为�员函数附加到任何类型（ ``B``）。
+�员函数将调用它们的对象作为第一个�数
+（类似于 Python 中的 ``self`` ��）。
+�算符函数将接收�作数作为�数。
+
+它�以在文件级别或者在�约级别的�约内部有效。
+
+第一部分， ``A``，�以是以下之一：
+
+- 一个函数列表，�选择分��算符�称
+  （例如 ``using {f, g as +, h, L.t} for uint``）。
+  如果未指定�算符，则该函数�以是库函数或自由函数，
+  并将其作为�员函数附加到类型。
+  �则，它必须是一个自由函数，并�为该类型上该�算符的定义。
+- 一个库�约的�称（例如 ``using L for uint``）-
+  该库�约的所有��有函数都作为�员函数附加到该类型上。
+
+在文件级别中，第二部分， ``B``，必须是一个明确的类型（没有数��置指定）。
+在�约内部，您也�以用 ``*`` 代替类型（例如 ``using L for *;`` ），
+这样�的效果是，库�约 ``L`` 中所有的函数都会被附加到 *所有* 类型上。
+
+如果您指定了一个库�约，那么该库�约中的 *所有* ��有函数都会被附加到该类型上，
+�使是那些第一个�数的类型与对象的类型�匹�的函数。
+类型会在函数被调用的时候检查，
+并执行函数�载解�。
+
+如果您使用一个函数列表（例如 ``using {f, g, h, L.t} for uint`` ），
+那么类型（ ``uint`` ）必须�以��地转�为这些函数的第一个�数。
+�使这些函数都没有被调用，也�进行这�检查。
+请注�，�有当 ``using for`` �于库�约内时，�能指定�有库函数。
+
+如果您定义了一个�作符（例如 ``using {f as +} for T``），那么类型（ ``T``）必须是一个
+:ref:`用户定义的值类型 <user-defined-value-types>`，并且定义必须是一个 ``pure`` 函数。
+�作符定义必须是全局的。
+以下�作符�以用这�方�定义：
 
 +------------+----------+---------------------------------------------+
 | Category   | Operator | Possible signatures                         |
@@ -85,24 +80,18 @@ The following operators can be defined this way:
 |            | ``>=``   | ``function (T, T) pure returns (bool)``     |
 +------------+----------+---------------------------------------------+
 
-Note that unary and binary ``-`` need separate definitions.
-The compiler will choose the right definition based on how the operator is invoked.
+注�，一元和二元的 ``-`` 需��独定义。
+编译器会根��作符的调用方�选择正确的定义。
 
-The ``using A for B;`` directive is active only within the current
-scope (either the contract or the current module/source unit),
-including within all of its functions, and has no effect
-outside of the contract or module in which it is used.
+``using A for B;`` 指令�在当�作用域（�约或当�模�/��元）内有效，
+包括其中所有的函数，在使用它的�约或模�之外没有任何效果。
 
-When the directive is used at file level and applied to a
-user-defined type which was defined at file level in the same file,
-the word ``global`` can be added at the end. This will have the
-effect that the functions and operators are attached to the type everywhere
-the type is available (including other files), not only in the
-scope of the using statement.
+当在文件级别使用该指令并应用于在�一文件中用户定义类型时，
+�以在末尾添加 ``global`` 关键字。
+这将使函数和�作符附加到该类型的任何�用�置（包括其他文件），
+而�仅仅是在 using 语�的范围内。
 
-Let us rewrite the set example from the
-:ref:`libraries` section in this way, using file-level functions
-instead of library functions.
+下�我们将使用文件级函数��写 :ref:`libraries` 部分中的 set 示例。
 
 .. code-block:: solidity
 
@@ -110,10 +99,10 @@ instead of library functions.
     pragma solidity ^0.8.13;
 
     struct Data { mapping(uint => bool) flags; }
-    // Now we attach functions to the type.
-    // The attached functions can be used throughout the rest of the module.
-    // If you import the module, you have to
-    // repeat the using directive there, for example as
+    // 现在我们给这个类型附加上函数。
+    // 附加的函数�以在模�的其他部分使用。
+    // 如果您导入了该模�，
+    // 您必须在那里��using指令，例如
     //   import "flags.sol" as Flags;
     //   using {Flags.insert, Flags.remove, Flags.contains}
     //     for Flags.Data;
@@ -123,7 +112,7 @@ instead of library functions.
         returns (bool)
     {
         if (self.flags[value])
-            return false; // already there
+            return false; // 已�存在
         self.flags[value] = true;
         return true;
     }
@@ -132,7 +121,7 @@ instead of library functions.
         returns (bool)
     {
         if (!self.flags[value])
-            return false; // not there
+            return false; // �存在
         self.flags[value] = false;
         return true;
     }
@@ -149,16 +138,14 @@ instead of library functions.
         Data knownValues;
 
         function register(uint value) public {
-            // Here, all variables of type Data have
-            // corresponding member functions.
-            // The following function call is identical to
-            // `Set.insert(knownValues, value)`
+            // 这里， Data 类型的所有��都有与之相对应的�员函数。
+            // 下�的函数调用和 `Set.insert(knownValues, value)` 的效果完全相�。
             require(knownValues.insert(value));
         }
     }
 
-It is also possible to extend built-in types in that way.
-In this example, we will use a library.
+也�以通过这�方��扩展内置类型。
+在这个例�中，我们将使用一个库�约。
 
 .. code-block:: solidity
 
@@ -186,7 +173,7 @@ In this example, we will use a library.
         }
 
         function replace(uint from, uint to) public {
-            // This performs the library function call
+            // 这将执行库�约中的函数调用
             uint index = data.indexOf(from);
             if (index == type(uint).max)
                 data.push(to);
@@ -195,13 +182,11 @@ In this example, we will use a library.
         }
     }
 
-Note that all external library calls are actual EVM function calls. This means that
-if you pass memory or value types, a copy will be performed, even in case of the
-``self`` variable. The only situation where no copy will be performed
-is when storage reference variables are used or when internal library
-functions are called.
+注�，所有的外部库调用实际都是EVM函数调用。
+这�味�，如果传递内存或值类型，�使是 ``self`` ��，也会执行�制。
+�有在使用存储引用��或调用内部库函数时，��会执行�制。
 
-Another example shows how to define a custom operator for a user-defined type:
+�一个展示了如何为用户定义的类型定义自定义�作符的示例：
 
 .. code-block:: solidity
 
diff --git a/docs/contracts/visibility-and-getters.rst b/docs/contracts/visibility-and-getters.rst
index 5bf46dea551b..6cbf3eee7940 100644
--- a/docs/contracts/visibility-and-getters.rst
+++ b/docs/contracts/visibility-and-getters.rst
@@ -1,67 +1,60 @@
 .. index:: ! visibility, external, public, private, internal
 
-.. |visibility-caveat| replace:: Making something ``private`` or ``internal`` only prevents other contracts from reading or modifying the information, but it will still be visible to the whole world outside of the blockchain.
+.. |visibility-caveat| replace:: 标记一些��为 ``private`` 或 ``internal``，�能防止其他�约读�或修改信�，但它�然会被区�链之外的整个世界看到。
 
 .. _visibility-and-getters:
 
 **********************
-Visibility and Getters
+��性和 getter 函数
 **********************
 
-State Variable Visibility
-=========================
+状���的��性
+=================
 
 ``public``
-    Public state variables differ from internal ones only in that the compiler automatically generates
-    :ref:`getter functions<getter-functions>` for them, which allows other contracts to read their values.
-    When used within the same contract, the external access (e.g. ``this.x``) invokes the getter
-    while internal access (e.g. ``x``) gets the variable value directly from storage.
-    Setter functions are not generated so other contracts cannot directly modify their values.
+    公开状���与内部��的��之处在于，编译器会自动为它们生� :ref:`getter函数 <getter-functions>`，
+    从而�许其他�约读�它们的值。当在�一个�约中使用时，外部访问（例如 ``this.x``）会调用getter，
+    而内部访问（例如 ``x``）会直接从存储中获���值。
+    Setter函数没有被生�，所以其他�约�能直接修改其值。
 
 ``internal``
-    Internal state variables can only be accessed from within the contract they are defined in
-    and in derived contracts.
-    They cannot be accessed externally.
-    This is the default visibility level for state variables.
+    内部状����能从它们所定义的�约和派生�约中访问。
+    它们�能被外部访问。
+    这是状���的默认��性。
 
 ``private``
-    Private state variables are like internal ones but they are not visible in derived contracts.
+    �有状���就�内部��一样，但它们在派生�约中是���的。
 
 .. warning::
     |visibility-caveat|
 
-Function Visibility
+函数的��性
 ===================
 
-Solidity knows two kinds of function calls: external ones that do create an actual EVM message call and internal ones that do not.
-Furthermore, internal functions can be made inaccessible to derived contracts.
-This gives rise to four types of visibility for functions.
+Solidity 有两�函数调用：确实创建了实际 EVM 消�调用的外部函数和�创建 EVM 消�调用的内部函数。
+此外，派生�约�能无法访问内部函数。
+这就产生了四�类型的函数的��性。
 
 ``external``
-    External functions are part of the contract interface,
-    which means they can be called from other contracts and
-    via transactions. An external function ``f`` cannot be called
-    internally (i.e. ``f()`` does not work, but ``this.f()`` works).
+    外部函数作为�约接�的一部分，�味�我们�以从其他�约和交易中调用。
+    一个外部函数 ``f`` �能从内部调用
+    （� ``f()`` �起作用，但 ``this.f()`` �以）。
 
 ``public``
-    Public functions are part of the contract interface
-    and can be either called internally or via message calls.
+    公开函数是�约接�的一部分，�以在内部或通过消�调用。
 
 ``internal``
-    Internal functions can only be accessed from within the current contract
-    or contracts deriving from it.
-    They cannot be accessed externally.
-    Since they are not exposed to the outside through the contract's ABI, they can take parameters of internal types like mappings or storage references.
+    内部函数�能从当�的�约或从它派生出�的�约中访问。
+    它们�能被外部访问。
+    由于它们没有通过�约的ABI暴露在外部，它们�以接�内部类型的�数，如映射或存储引用。
 
 ``private``
-    Private functions are like internal ones but they are not visible in derived contracts.
+    �有函数和内部函数一样，但它们在派生�约中是���的。
 
 .. warning::
     |visibility-caveat|
 
-The visibility specifier is given after the type for
-state variables and between parameter list and
-return parameter list for functions.
+在状���的类型之�，以�在函数的�数列表和返回�数列表之间，都会给出��性指定符。
 
 .. code-block:: solidity
 
@@ -74,9 +67,8 @@ return parameter list for functions.
         uint public data;
     }
 
-In the following example, ``D``, can call ``c.getData()`` to retrieve the value of
-``data`` in state storage, but is not able to call ``f``. Contract ``E`` is derived from
-``C`` and, thus, can call ``compute``.
+在下�的例�中，�约 ``D``, �以调用 ``c.getData()`` �检索状�存储中 ``data`` 的值，
+但�能调用 ``f``。 �约 ``E`` 是从�约 ``C`` 派生出�的，因此�以调用 ``compute``。
 
 .. code-block:: solidity
 
@@ -92,36 +84,34 @@ In the following example, ``D``, can call ``c.getData()`` to retrieve the value
         function compute(uint a, uint b) internal pure returns (uint) { return a + b; }
     }
 
-    // This will not compile
+    // 这将�会编译
     contract D {
         function readData() public {
             C c = new C();
-            uint local = c.f(7); // error: member `f` is not visible
+            uint local = c.f(7); // 错误：�员 `f` ���
             c.setData(3);
             local = c.getData();
-            local = c.compute(3, 5); // error: member `compute` is not visible
+            local = c.compute(3, 5); // 错误：�员 `compute` ���
         }
     }
 
     contract E is C {
         function g() public {
             C c = new C();
-            uint val = compute(3, 5); // access to internal member (from derived to parent contract)
+            uint val = compute(3, 5); // 访问内部�员（从继承�约访问父�约�员）
         }
     }
 
 .. index:: ! getter;function, ! function;getter
 .. _getter-functions:
 
-Getter Functions
+Getter 函数
 ================
 
-The compiler automatically creates getter functions for
-all **public** state variables. For the contract given below, the compiler will
-generate a function called ``data`` that does not take any
-arguments and returns a ``uint``, the value of the state
-variable ``data``. State variables can be initialized
-when they are declared.
+编译器会自动为所有 **公开** 状���创建getter函数。
+对于下�给出的�约，编译器将生�一个�为 ``data`` 的函数，
+它没有任何输入�数，并返回一个 ``uint``，
+�状��� ``data`` 的值。状���在声明时�以被�始化。
 
 .. code-block:: solidity
 
@@ -139,10 +129,9 @@ when they are declared.
         }
     }
 
-The getter functions have external visibility. If the
-symbol is accessed internally (i.e. without ``this.``),
-it evaluates to a state variable.  If it is accessed externally
-(i.e. with ``this.``), it evaluates to a function.
+getter函数具有外部��性。
+如果该符�被内部访问（�没有 ``this.``），它被评估为一个状���。
+如果它被外部访问（�有 ``this.``），它将被评价为一个函数。
 
 .. code-block:: solidity
 
@@ -152,17 +141,16 @@ it evaluates to a state variable.  If it is accessed externally
     contract C {
         uint public data;
         function x() public returns (uint) {
-            data = 3; // internal access
-            return this.data(); // external access
+            data = 3; // 内部访问
+            return this.data(); // 外部访问
         }
     }
 
-If you have a ``public`` state variable of array type, then you can only retrieve
-single elements of the array via the generated getter function. This mechanism
-exists to avoid high gas costs when returning an entire array. You can use
-arguments to specify which individual element to return, for example
-``myArray(0)``. If you want to return an entire array in one call, then you need
-to write a function, for example:
+如果您有一个数组类型的 ``public`` 状���，
+那么您�能通过生�的getter函数检索数组的�个元素。
+这�机制的存在是为了��在返回整个数组时产生高�的气体�本。
+您�以使用�数�指定�返回的�个元素，例如 ``myArray(0)``。
+如果您想在一次调用中返回整个数组，那么您需�写一个函数，例如：
 
 .. code-block:: solidity
 
@@ -170,26 +158,26 @@ to write a function, for example:
     pragma solidity >=0.4.16 <0.9.0;
 
     contract arrayExample {
-        // public state variable
+        // 公开状���
         uint[] public myArray;
 
-        // Getter function generated by the compiler
+        // 编译器生�的getter函数
         /*
         function myArray(uint i) public view returns (uint) {
             return myArray[i];
         }
         */
 
-        // function that returns entire array
+        // 返回整个数组的函数
         function getArray() public view returns (uint[] memory) {
             return myArray;
         }
     }
 
-Now you can use ``getArray()`` to retrieve the entire array, instead of
-``myArray(i)``, which returns a single element per call.
+现在您�以使用 ``getArray()`` �检索整个数组，
+而�是使用 ``myArray(i)``，它�次调用�返回一个元素。
 
-The next example is more complex:
+下一个例��微��一些：
 
 .. code-block:: solidity
 
@@ -208,9 +196,8 @@ The next example is more complex:
         mapping(uint => mapping(bool => Data[])) public data;
     }
 
-It generates a function of the following form. The mapping and arrays (with the
-exception of byte arrays) in the struct are omitted because there is no good way
-to select individual struct members or provide a key for the mapping:
+它生�了一个如下形�的函数。结构中的映射和数组（字节数组除外）被�略了，
+因为没有好的方法�选择�个结构�员或为映射�供一个键：
 
 .. code-block:: solidity
 
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 7f444871d546..07dc14a69a31 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -1,195 +1,216 @@
 ############
-Contributing
+贡献方�
 ############
 
-Help is always welcome and there are plenty of options to contribute to Solidity.
+对于大家的帮助，我们一如既往地欢迎。而且有很多选择�以为 Solidity �出贡献。
 
-In particular, we appreciate support in the following areas:
+特别是，我们感谢在以下领域的支�:
 
-* Reporting issues.
-* Fixing and responding to `Solidity's GitHub issues
-  <https://github.com/ethereum/solidity/issues>`_, especially those tagged as
-  `"good first issue" <https://github.com/ethereum/solidity/labels/good%20first%20issue>`_ which are
-  meant as introductory issues for external contributors.
-* Improving the documentation.
-* `Translating <https://github.com/solidity-docs>`_ the documentation into more languages.
-* Responding to questions from other users on `StackExchange
-  <https://ethereum.stackexchange.com>`_ and the `Solidity Gitter Chat
-  <https://gitter.im/ethereum/solidity>`_.
-* Getting involved in the language design process by proposing language changes or new features in the `Solidity forum <https://forum.soliditylang.org/>`_ and providing feedback.
+* 报告问题。
+* 修�和�应 `Solidity 的 GitHub 问题
+  <https://github.com/ethereum/solidity/issues>`_，特别是那些被标记为
+  `"很好的第一个问题" <https://github.com/ethereum/solidity/labels/good%20first%20issue>`_，这是
+  作为外部贡献者的介�性问题。
+* 完善文档。
+* 将文档 `翻译 <https://github.com/solidity-docs>`_ �更多的语言。
+* 在 `StackExchange <https://ethereum.stackexchange.com>`_ 和
+  `Solidity Gitter Chat <https://gitter.im/ethereum/solidity>`_ 上回答其他用户的问题。
+* 通过在 `Solidity论� <https://forum.soliditylang.org/>`_ 上�出语言改进或新功能，并�供�馈��与语言设计的过程。
 
-To get started, you can try :ref:`building-from-source` in order to familiarize
-yourself with the components of Solidity and the build process. Also, it may be
-useful to become well-versed at writing smart-contracts in Solidity.
+为了开始�与，您�以�试 :ref:`building-from-source`，以熟悉 Solidity 的组件和构建过程。
+此外，精通在 Solidity 中编写智能�约�能是有用的。
 
-Please note that this project is released with a `Contributor Code of Conduct <https://raw.githubusercontent.com/ethereum/solidity/develop/CODE_OF_CONDUCT.md>`_. By participating in this project — in the issues, pull requests, or Gitter channels — you agree to abide by its terms.
+请注�，本项目�布时有一个 `贡献者行为准则 <https://raw.githubusercontent.com/ethereum/solidity/develop/CODE_OF_CONDUCT.md>`_。�与此项目 - 在 issues，pull requests 或 Gitter channels 中 - �表示您���守其�款。
 
-Team Calls
-==========
+团队电�会议
+============
 
-If you have issues or pull requests to discuss, or are interested in hearing what
-the team and contributors are working on, you can join our public team call:
+如果您有问题或拉动请求�讨论，或有兴趣��团队和贡献者正在�什么，您�以加入我们的公共团队电�会议：
 
-- Wednesdays at 3PM CET/CEST.
+- �周三下�3点，中欧标准时间/中欧�令时间。
 
-The call takes place on `Jitsi <https://meet.soliditylang.org/>`_.
+<<<<<<< HEAD
+会议在 `Jitsi <https://meet.soliditylang.org/>`_ 举行。
+=======
+The call takes place on `Jitsi <https://meet.ethereum.org/solidity>`_.
+>>>>>>> english/develop
 
-How to Report Issues
+如何报告问题
 ====================
 
-To report an issue, please use the
-`GitHub issues tracker <https://github.com/ethereum/solidity/issues>`_. When
-reporting issues, please mention the following details:
-
+�报告一个问题，请使用
+`GitHub问题跟踪器 <https://github.com/ethereum/solidity/issues>`_。
+当报告问题时，请��以下细节：
+
+<<<<<<< HEAD
+* Solidity版本。
+* �代�（如果�以的�）。
+* �作系统。
+* �现该问题的步骤。
+* 实际行为与预期行为。
+=======
 * Solidity version.
 * Source code (if applicable).
 * Operating system.
 * Steps to reproduce the issue.
 * Actual vs. expected behavior.
+>>>>>>> english/develop
 
-Reducing the source code that caused the issue to a bare minimum is always
-very helpful, and sometimes even clarifies a misunderstanding.
+将导致问题的�代��少到最低�度总是�常有帮助的，有时甚至�以澄清一个误解。
 
-For technical discussions about language design, a post in the
-`Solidity forum <https://forum.soliditylang.org/>`_ is the correct place (see :ref:`solidity_language_design`).
+关于语言设计的技术讨论，去
+`Solidity 论� <https://forum.soliditylang.org/>`_ �是正确的选择（� :ref:`solidity_language_design`）。
 
-Workflow for Pull Requests
+拉�请求的工作�程
 ==========================
 
-In order to contribute, please fork off of the ``develop`` branch and make your
-changes there. Your commit messages should detail *why* you made your change
-in addition to *what* you did (unless it is a tiny change).
+为了进行贡献，请 fork 一个 ``develop`` 分支并在那里进行修改。
+除了您 *�了什么* 之外，您还需�在�交信�中说明，
+您 *为什么* �这些修改（除��是个微�的改动）。
 
-If you need to pull in any changes from ``develop`` after making your fork (for
-example, to resolve potential merge conflicts), please avoid using ``git merge``
-and instead, ``git rebase`` your branch. This will help us review your change
-more easily.
+在进行了 fork 之�，如果您还需�从 ``develop`` 分支 pull 任何�更的�
+（例如，为了解决潜在的�并冲�），请��使用 ``git rebase`` ，
+而是用 ``git rebase`` 您的分支。
 
-Additionally, if you are writing a new feature, please ensure you add appropriate
-test cases under ``test/`` (see below).
+此外，如果您正在编写一个新的功能，请确�您在 ``test/`` 下添加适当的测试案例（�下文）。
 
-However, if you are making a larger change, please consult with the `Solidity Development Gitter channel
-<https://gitter.im/ethereum/solidity-dev>`_ (different from the one mentioned above — this one is
-focused on compiler and language development instead of language usage) first.
+但是，如果您在进行一个更大的�更，请先与
+`Solidity Development Gitter channel <https://gitter.im/ethereum/solidity-dev>`_
+（与上文�到的�� - 这个�更侧�于编译器和编程语言开�，而�是编程语言的使用）进行咨询。
 
-New features and bugfixes should be added to the ``Changelog.md`` file: please
-follow the style of previous entries, when applicable.
+新的特性和 bug 修�会被添加到 ``Changelog.md`` 文件中：使用的时候请�循上述方�。
 
-Finally, please make sure you respect the `coding style
-<https://github.com/ethereum/solidity/blob/develop/CODING_STYLE.md>`_
-for this project. Also, even though we do CI testing, please test your code and
-ensure that it builds locally before submitting a pull request.
+最�，请确�您�守了这个项目的 `编�风格 <https://github.com/ethereum/solidity/blob/develop/CODING_STYLE.md>`_ 。
+还有，虽然我们采用了�续集�测试，但是在�交 pull request 之�，请测试您的代�并确�它能在本地进行编译。
 
-We highly recommend going through our `review checklist <https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md>`_ before submitting the pull request.
-We thoroughly review every PR and will help you get it right, but there are many common problems that can be easily avoided, making the review much smoother.
+我们强烈建议在�交拉动请求之�，先看一下我们的 `审查清� <https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md>`_。
+我们会彻底审查�一个PR，并会帮助您把它弄好，但有许多常�问题�以很容易地��，使审查更加顺利。
 
-Thank you for your help!
+感谢您的帮助�
 
-Running the Compiler Tests
+�行编译器测试
 ==========================
 
-Prerequisites
+先决�件
 -------------
 
+<<<<<<< HEAD
+为了�行所有的编译器测试，您�能想选择性地安装一些�赖项
+（ `evmone <https://github.com/ethereum/evmone/releases>`_，
+`libz3 <https://github.com/Z3Prover/z3>`_， 和
+`libhera <https://github.com/ewasm/hera>`_）。
+=======
 For running all compiler tests you may want to optionally install a few
 dependencies (`evmone <https://github.com/ethereum/evmone/releases>`_,
 `libz3 <https://github.com/Z3Prover/z3>`_).
+>>>>>>> english/develop
 
-On macOS systems, some of the testing scripts expect GNU coreutils to be installed.
-This can be easiest accomplished using Homebrew: ``brew install coreutils``.
+在 macOS 系统上，一些测试脚本需�安装 GNU 核心工具。
+�以使用 Homebrew 很简�地完�安装： ``brew install coreutils``。
 
-On Windows systems, make sure that you have a privilege to create symlinks,
-otherwise several tests may fail.
-Administrators should have that privilege, but you may also
-`grant it to other users <https://learn.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links#policy-management>`_
-or
-`enable Developer Mode <https://learn.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development>`_.
+在 Windows 系统上，确�您有创建符�链接的��，
+�则一些测试�能会失败。
+管�员应该有这个��，但您也�以
+`将其授予其他用户 <https://learn.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links#policy-management>`_
+或 `�用开�者模� <https://learn.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development>`_。
 
-Running the Tests
+�行测试
 -----------------
 
-Solidity includes different types of tests, most of them bundled into the
-`Boost C++ Test Framework <https://www.boost.org/doc/libs/release/libs/test/doc/html/index.html>`_ application ``soltest``.
-Running ``build/test/soltest`` or its wrapper ``scripts/soltest.sh`` is sufficient for most changes.
+Solidity包括��类型的测试，其中大部分�绑在
+`Boost C++测试框架 <https://www.boost.org/doc/libs/release/libs/test/doc/html/index.html>`_ 应用程� ``soltest``。
+�行 ``build/test/soltest`` 或其包装器 ``scripts/soltest.sh`` 对大多数�化�说是足够的。
 
+<<<<<<< HEAD
+``./scripts/tests.sh`` 脚本自动执行大多数Solidity测试，
+包括那些�绑在 `Boost C++测试框架 <https://www.boost.org/doc/libs/release/libs/test/doc/html/index.html>`_ 应用程� ``soltest``
+（或其包装器 ``scripts/soltest.sh``）中的测试，以�命令行测试和编译测试。
+=======
 The ``./scripts/tests.sh`` script executes most Solidity tests automatically,
 including those bundled into the `Boost C++ Test Framework <https://www.boost.org/doc/libs/release/libs/test/doc/html/index.html>`_
 application ``soltest`` (or its wrapper ``scripts/soltest.sh``), as well as command-line tests and
 compilation tests.
+>>>>>>> english/develop
+
+测试系统会自动�试�现 `evmone <https://github.com/ethereum/evmone/releases>`_ 的�置，以�行语义测试。
 
-The test system automatically tries to discover the location of
-the `evmone <https://github.com/ethereum/evmone/releases>`_ for running the semantic tests.
+``evmone`` 库必须�于当�工作目录相对的 ``deps`` 或 ``deps/lib`` 目录，
+其父级目录或其父级目录的父级目录中。�外，
+�以通过 ``ETH_EVMONE`` 环境��指定 ``evmone`` 共享对象的显��置。
 
-The ``evmone`` library must be located in the ``deps`` or ``deps/lib`` directory relative to the
-current working directory, to its parent or its parent's parent. Alternatively, an explicit location
-for the ``evmone`` shared object can be specified via the ``ETH_EVMONE`` environment variable.
+``evmone`` 主�用于�行语义和gas测试。
+如果您没有安装它，您�以通过� ``scripts/soltest.sh`` 传递 ``--no-semantic-tests`` 标志�跳过这些测试。
 
-``evmone`` is needed mainly for running semantic and gas tests.
-If you do not have it installed, you can skip these tests by passing the ``--no-semantic-tests``
-flag to ``scripts/soltest.sh``.
+<<<<<<< HEAD
+�行Ewasm测试默认是�用的，�以通过 ``./scripts/soltest.sh --ewasm`` 明确�用，
+�求 `hera <https://github.com/ewasm/hera>`_ 被 ``soltest`` 找到。
+定� ``hera`` 库的机制与 ``evmone`` 相�，�是用于指定明确�置的��被称为 ``ETH_HERA``。
 
-The ``evmone`` library should both end with the file name
+``evmone`` 和 ``hera`` 库的文件��缀都应该
+是Linux上的 ``.so``，Windows系统上的 ``.dll``，MacOS上的 ``.dylib``。
+=======
+The ``evmone`` library should end with the file name
 extension ``.so`` on Linux, ``.dll`` on Windows systems and ``.dylib`` on macOS.
+>>>>>>> english/develop
 
-For running SMT tests, the ``libz3`` library must be installed and locatable
-by ``cmake`` during compiler configure stage.
+为了�行SMT测试， ``libz3`` 库必须被安装，并在编译器�置阶段被 ``cmake`` �以找到。
 
-If the ``libz3`` library is not installed on your system, you should disable the
-SMT tests by exporting ``SMT_FLAGS=--no-smt`` before running ``./scripts/tests.sh`` or
-running ``./scripts/soltest.sh --no-smt``.
-These tests are ``libsolidity/smtCheckerTests`` and ``libsolidity/smtCheckerTestsJSON``.
+如果您的系统没有安装 ``libz3`` 库，您应该在�行 ``./scripts/tests.sh`` 或 ``./scripts/soltest.sh --no-smt`` 之�，
+通过导出 ``SMT_FLAGS=--no-smt`` ��用SMT测试。
+这些测试是 ``libsolidity/smtCheckerTests`` 和 ``libsolidity/smtCheckerTestsJSON``。
 
 .. note::
 
-    To get a list of all unit tests run by Soltest, run ``./build/test/soltest --list_content=HRF``.
+    �获得Soltest�行的所有�元测试的列表，请�行 ``./build/test/soltest --list_content=HRF``。
 
-For quicker results you can run a subset of, or specific tests.
+为了获得更快的结果，您�以�行一个�集，或特定的测试。
 
-To run a subset of tests, you can use filters:
+��行测试的一个�集，�以使用过滤器：
 ``./scripts/soltest.sh -t TestSuite/TestName``,
-where ``TestName`` can be a wildcard ``*``.
+其中 ``TestName`` �以是通�符 ``*``。
 
-Or, for example, to run all the tests for the yul disambiguator:
-``./scripts/soltest.sh -t "yulOptimizerTests/disambiguator/*" --no-smt``.
+或者，举例�说，�行yul 消歧义器的所有测试：
+``./scripts/soltest.sh -t "yulOptimizerTests/disambiguator/*" --no-smt``。
 
-``./build/test/soltest --help`` has extensive help on all of the options available.
+``./build/test/soltest --help`` 有关于所有�用选项的广泛帮助。
 
-See especially:
+尤其是�以查看：
 
-- `show_progress (-p) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/show_progress.html>`_ to show test completion,
-- `run_test (-t) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/run_test.html>`_ to run specific tests cases, and
-- `report-level (-r) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/report_level.html>`_ give a more detailed report.
+- `show_progress (-p) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/show_progress.html>`_ �显示测试完�。
+- `run_test (-t) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/run_test.html>`_ ��行特定的测试案例，以�
+- `report-level (-r) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/report_level.html>`_ 给出一个更详细的报告。
 
 .. note::
 
-    Those working in a Windows environment wanting to run the above basic sets
-    without libz3. Using Git Bash, you use: ``./build/test/Release/soltest.exe -- --no-smt``.
-    If you are running this in plain Command Prompt, use ``.\build\test\Release\soltest.exe -- --no-smt``.
+    那些在Windows环境下使用的人，想在没有libz3的情况下�行上述基本集，�以使用Git Bash，
+    使用命令为： ``./build/test/Release/soltest.exe -- --no-smt``。
+    如果您在普通的命令�示符下�行，使用 ``.\build\test\Release\soltest.exe -- --no-smt``。
+
+如果您想使用GDB进行调试，确�您的构建方�与 “通常� ��。
+例如，您�以在您的 ``build`` 文件夹中�行以下命令：
 
-If you want to debug using GDB, make sure you build differently than the "usual".
-For example, you could run the following command in your ``build`` folder:
+如果您想使用 GDB 进行调试，请确�您的构建方�与“通常�的构建方���。
+例如，您�以在 ``build`` 文件夹中�行以下命令：
 
 .. code-block:: bash
 
    cmake -DCMAKE_BUILD_TYPE=Debug ..
    make
 
-This creates symbols so that when you debug a test using the ``--debug`` flag,
-you have access to functions and variables in which you can break or print with.
+这会创建了一些符�，所以当您使用 ``--debug`` 标志调试测试时，
+您�以访问其中的函数和��，您�以用它�中断或打�。
 
-The CI runs additional tests (including ``solc-js`` and testing third party Solidity
-frameworks) that require compiling the Emscripten target.
+CI�行�外的测试（包括 ``solc-js`` 和测试第三方Solidity框架），需�编译 Emscripten 目标。
 
-Writing and Running Syntax Tests
+编写和�行语法测试
 --------------------------------
 
-Syntax tests check that the compiler generates the correct error messages for invalid code
-and properly accepts valid code.
-They are stored in individual files inside the ``tests/libsolidity/syntaxTests`` folder.
-These files must contain annotations, stating the expected result(s) of the respective test.
-The test suite compiles and checks them against the given expectations.
+语法测试检查编译器是�对无效的代�产生正确的错误信�，并正确接�有效的代�。
+它们被�存在 ``tests/libsolidity/syntaxTests`` 文件夹下的�个文件中。
+这些文件必须包�注释，说明�自测试的预期结果。
+测试套件会根�给定的期望值进行编译和检查。
 
-For example: ``./test/libsolidity/syntaxTests/double_stateVariable_declaration.sol``
+例如： ``./test/libsolidity/syntaxTests/double_stateVariable_declaration.sol``
 
 .. code-block:: solidity
 
@@ -198,17 +219,18 @@ For example: ``./test/libsolidity/syntaxTests/double_stateVariable_declaration.s
         uint128 variable;
     }
     // ----
-    // DeclarationError: (36-52): Identifier already declared.
+    // 声明错误：（36-52）。标识符已被声明。
 
-A syntax test must contain at least the contract under test itself, followed by the separator ``// ----``. The comments that follow the separator are used to describe the
-expected compiler errors or warnings. The number range denotes the location in the source where the error occurred.
-If you want the contract to compile without any errors or warning you can leave
-out the separator and the comments that follow it.
+语法测试必须至少包�被测�约本身，��是分隔符 ``//----``。
+分隔符��的注释是用��述预期的编译器错误或警告的。
+数字范围表示错误�生在�代�中的�置。
+如果您希望�约在编译时没有任何错误或警告，您�以�使用分隔符和��的注释。
 
-In the above example, the state variable ``variable`` was declared twice, which is not allowed. This results in a ``DeclarationError`` stating that the identifier was already declared.
+在上�的例�中，状��� ``variable`` 被声明了两次，这是��许的。这导致了一个 ``声明错误``，说明标识符已�被声明。
 
-The ``isoltest`` tool is used for these tests and you can find it under ``./build/test/tools/``. It is an interactive tool which allows
-editing of failing contracts using your preferred text editor. Let's try to break this test by removing the second declaration of ``variable``:
+用�进行那些测试的工具�� ``isoltest``，�以在 ``./build/test/tools/`` 下找到。
+它是一个交互工具，�许您使用您喜欢的文本编辑器编辑失败的�约。
+让我们把第二个 ``variable`` 的声明去掉�使测试失败：
 
 .. code-block:: solidity
 
@@ -216,9 +238,9 @@ editing of failing contracts using your preferred text editor. Let's try to brea
         uint256 variable;
     }
     // ----
-    // DeclarationError: (36-52): Identifier already declared.
+    // 声明错误：（36-52）。标识符已被声明。
 
-Running ``./build/test/tools/isoltest`` again results in a test failure:
+�次�行 ``./build/test/tools/isoltest`` 就会得到一个失败的测试：
 
 .. code-block:: text
 
@@ -234,19 +256,26 @@ Running ``./build/test/tools/isoltest`` again results in a test failure:
             Success
 
 
-``isoltest`` prints the expected result next to the obtained result, and also
-provides a way to edit, update or skip the current contract file, or quit the application.
+``isoltest`` 在获得的结果�边打�出预期的结果，
+还�供了一个编辑，更新，跳过当��约文件或退出应用程�的办法。
 
-It offers several options for failing tests:
+它为失败的测试�供了几�选择：
 
+<<<<<<< HEAD
+- ``edit``：  ``isoltest`` 试图在一个编辑器中打开�约，以便您�以调整它。它或者使用命令行上给出的编辑器（如 ``isoltest --editor /path/to/editor``），或者在环境�� ``EDITOR`` 中，或者�是 ``/usr/bin/editor`` （按这个顺�）。
+- ``update``： 更新测试中的�约。这将会移除包�了�匹�异常的注解，或者增加缺失的预想结果。然�测试会�新开始。
+- ``skip``： 跳过这一特定测试的执行。
+- ``quit``： 退出 ``isoltest``。
+=======
 - ``edit``: ``isoltest`` tries to open the contract in an editor so you can adjust it. It either uses the editor given on the command-line (as ``isoltest --editor /path/to/editor``), in the environment variable ``EDITOR`` or just ``/usr/bin/editor`` (in that order).
 - ``update``: Updates the expectations for contract under test. This updates the annotations by removing unmet expectations and adding missing expectations. The test is then run again.
 - ``skip``: Skips the execution of this particular test.
 - ``quit``: Quits ``isoltest``.
+>>>>>>> english/develop
 
-All of these options apply to the current contract, except ``quit`` which stops the entire testing process.
+所有这些选项都适用于当�的�约，除了 ``quit``，它�以�止整个测试过程。
 
-Automatically updating the test above changes it to
+在上边的情况自动更新�约会把它�为
 
 .. code-block:: solidity
 
@@ -255,7 +284,7 @@ Automatically updating the test above changes it to
     }
     // ----
 
-and re-run the test. It now passes again:
+并�新�行测试。它将会通过：
 
 .. code-block:: text
 
@@ -265,9 +294,9 @@ and re-run the test. It now passes again:
 
 .. note::
 
-    Choose a name for the contract file that explains what it tests, e.g. ``double_variable_declaration.sol``.
-    Do not put more than one contract into a single file, unless you are testing inheritance or cross-contract calls.
-    Each file should test one aspect of your new feature.
+    为�约文件选择一个能解释其测试内容的�字，例如： ``double_variable_declaration.sol``。
+    ��把一个以上的�约放在一个文件中，除�您在测试继承或跨�约的调用。
+    �个文件应该测试您的新功能的一个方�。
 
 Command-line Tests
 ------------------
@@ -326,28 +355,27 @@ There are several kinds of command-line tests:
     - ``test.*``: a single script to run, usually ``test.sh`` or ``test.py``.
       The script must be executable.
 
-Running the Fuzzer via AFL
+通过 AFL �行 Fuzzer
 ==========================
 
-Fuzzing is a technique that runs programs on more or less random inputs to find exceptional execution
-states (segmentation faults, exceptions, etc). Modern fuzzers are clever and run a directed search
-inside the input. We have a specialized binary called ``solfuzzer`` which takes source code as input
-and fails whenever it encounters an internal compiler error, segmentation fault or similar, but
-does not fail if e.g., the code contains an error. This way, fuzzing tools can find internal problems in the compiler.
+Fuzzing 是一�测试技术，它�以通过�行多少�等的�机输入�找出异常的执行状�（片段故障�异常等等）。
+现代的 fuzzer 已��以很�明地在输入中进行直接的查询。
+我们有一个专门的程��� ``solfuzzer``，它�以将�代�作为输入，
+当�生一个内部编译错误，片段故障或者类似的错误时失败，但当代�包�错误的时候则�会失败。
+通过这�方法，fuzzing 工具�以找到那些编译级别的内部错误。
 
-We mainly use `AFL <https://lcamtuf.coredump.cx/afl/>`_ for fuzzing. You need to download and
-install the AFL packages from your repositories (afl, afl-clang) or build them manually.
-Next, build Solidity (or just the ``solfuzzer`` binary) with AFL as your compiler:
+我们主�使用 `AFL <https://lcamtuf.coredump.cx/afl/>`_ �进行 fuzzing 测试。
+您需�手工下载和构建 AFL。然�用 AFL 作为编译器�构建 Solidity（或�是 ``solfuzzer`` 二进制文件）：
 
 .. code-block:: bash
 
     cd build
-    # if needed
+    # 如果需�的�
     make clean
     cmake .. -DCMAKE_C_COMPILER=path/to/afl-gcc -DCMAKE_CXX_COMPILER=path/to/afl-g++
     make solfuzzer
 
-At this stage, you should be able to see a message similar to the following:
+在这个阶段，您应该能够看到类似以下的信�：
 
 .. code-block:: text
 
@@ -358,16 +386,16 @@ At this stage, you should be able to see a message similar to the following:
     [+] Instrumented 1949 locations (64-bit, non-hardened mode, ratio 100%).
     [100%] Linking CXX executable solfuzzer
 
-If the instrumentation messages did not appear, try switching the cmake flags pointing to AFL's clang binaries:
+如果指示信�没有出现，�试切�指�AFL的clang二进制文件的cmake标志：
 
 .. code-block:: bash
 
-    # if previously failed
+    # 如果之�失败了
     make clean
     cmake .. -DCMAKE_C_COMPILER=path/to/afl-clang -DCMAKE_CXX_COMPILER=path/to/afl-clang++
     make solfuzzer
 
-Otherwise, upon execution the fuzzer halts with an error saying binary is not instrumented:
+�则，在执行时，fuzzer 就会�止，并出现错误，说二进制没有被检测到。
 
 .. code-block:: text
 
@@ -389,174 +417,178 @@ Otherwise, upon execution the fuzzer halts with an error saying binary is not in
              Location : check_binary(), afl-fuzz.c:6920
 
 
-Next, you need some example source files. This makes it much easier for the fuzzer
-to find errors. You can either copy some files from the syntax tests or extract test files
-from the documentation or the other tests:
+接下�，您需�一些示例�文件。这使得 fuzzer 更容易�现错误。
+您�以从语法测试中�制一些文件，或者从文档或其他测试中��测试文件。
 
 .. code-block:: bash
 
     mkdir /tmp/test_cases
     cd /tmp/test_cases
-    # extract from tests:
+    # 从测试中��：
     path/to/solidity/scripts/isolate_tests.py path/to/solidity/test/libsolidity/SolidityEndToEndTest.cpp
-    # extract from documentation:
+    # 从文件中摘录：
     path/to/solidity/scripts/isolate_tests.py path/to/solidity/docs
 
+<<<<<<< HEAD
+AFL 的文档指出，账册（�始的输入文件）�应该太大。
+�个文件本身�应该超过 1 kB，并且�个功能最多�能有一个输入文件；
+所以最好从少�的输入文件开始。
+此外还有一个�� ``afl-cmin`` 的工具，
+�以将输入文件整�为�以具有近似行为的二进制代�。
+=======
 The AFL documentation states that the corpus (the initial input files) should not be
 too large. The files themselves should not be larger than 1 kB and there should be
 at most one input file per functionality, so better start with a small number of.
 There is also a tool called ``afl-cmin`` that can trim input files
 that result in similar behavior of the binary.
+>>>>>>> english/develop
 
-Now run the fuzzer (the ``-m`` extends the size of memory to 60 MB):
+现在�行 fuzzer（ ``-m`` �数将使用的内存大�扩展为 60 MB）：
 
 .. code-block:: bash
 
     afl-fuzz -m 60 -i /tmp/test_cases -o /tmp/fuzzer_reports -- /path/to/solfuzzer
 
-The fuzzer creates source files that lead to failures in ``/tmp/fuzzer_reports``.
-Often it finds many similar source files that produce the same error. You can
-use the tool ``scripts/uniqueErrors.sh`` to filter out the unique errors.
+fuzzer 会将导致失败的�文件创建在 ``/tmp/fuzzer_reports`` 中。
+通常它会找到产生相似错误的类似的�文件。
+您�以使用 ``scripts/uniqueErrors.sh`` 工具�那些独特的错误。
 
-Whiskers
-========
+Whiskers 系统
+=============
 
-*Whiskers* is a string templating system similar to `Mustache <https://mustache.github.io>`_. It is used by the
-compiler in various places to aid readability, and thus maintainability and verifiability, of the code.
+*Whiskers* 是一个类似于 `Mustache <https://mustache.github.io>`_ 的字符串模�化系统。
+它被编译器用在��的地方，以帮助代�的�读性，从而帮助代�的�维护性和�验�性。
 
-The syntax comes with a substantial difference to Mustache. The template markers ``{{`` and ``}}`` are
-replaced by ``<`` and ``>`` in order to aid parsing and avoid conflicts with :ref:`yul`
-(The symbols ``<`` and ``>`` are invalid in inline assembly, while ``{`` and ``}`` are used to delimit blocks).
-Another limitation is that lists are only resolved one depth and they do not recurse. This may change in the future.
+该语法与Mustache有很大区别。模�标记 ``{{`` 和 ``}}`` 被 ``<`` 和 ``>`` �代，
+以帮助解�并��与 :ref:`yul` 的冲�
+（符� ``<`` 和 ``>`` 在内�汇编中是无效的，而 ``{`` 和 ``}`` 是用��定�的）。
+�一个�制是，列表�能解决一个深度的问题，而且它们�会递归。这在将��能会改�。
 
-A rough specification is the following:
+下�是一个粗略的说明：
 
-Any occurrence of ``<name>`` is replaced by the string-value of the supplied variable ``name`` without any
-escaping and without iterated replacements. An area can be delimited by ``<#name>...</name>``. It is replaced
-by as many concatenations of its contents as there were sets of variables supplied to the template system,
-each time replacing any ``<inner>`` items by their respective value. Top-level variables can also be used
-inside such areas.
+任何出现的 ``<name>`` 的地方都会被�供的�� ``name`` 的字符串值替�，没有任何转义，也没有迭代替�。
+�以用 ``<#name>...</name>`` �划定一个区域。
+该区域中的内容将进行多次拼接，�次拼接会使用相应��集中的值替�区域中的 ``<inner>`` 项，
+模�系统中�供了多少组��集，就会进行多少次拼接。顶层��也�以在这�区域内使用。
 
-There are also conditionals of the form ``<?name>...<!name>...</name>``, where template replacements
-continue recursively either in the first or the second segment depending on the value of the boolean
-parameter ``name``. If ``<?+name>...<!+name>...</+name>`` is used, then the check is whether
-the string parameter ``name`` is non-empty.
+还有一些判断�件的表达� ``<?name <!name>...</name>``，
+根�布尔�数 ``name`` 的值，会在第一段或第二段继续递归地替�模�。
+如果使用 ``<?+name>...<!+name>...</+name>`` 这�表达�，那么检查的是字符串�数 ``name`` 是�为�空。
 
 .. _documentation-style:
 
-Documentation Style Guide
+文档风格指�
 =========================
 
-In the following section you find style recommendations specifically focusing on documentation
-contributions to Solidity.
+在下�的部分，您�以找到专门针对 Solidity 文档贡献的风格建议。
 
-English Language
+英语
 ----------------
 
-Use International English, unless using project or brand names. Try to reduce the usage of
-local slang and references, making your language as clear to all readers as possible.
-Below are some references to help:
+使用国际英语，除�使用项目或�牌�称。
+尽��少使用当地的俚语和�考文化，尽�使您的语言对所有的读者都尽�能清晰。
+以下是一些�考资料，希望对大家有所帮助：
 
-* `Simplified technical English <https://en.wikipedia.org/wiki/Simplified_Technical_English>`_
-* `International English <https://en.wikipedia.org/wiki/International_English>`_
+* `简化技术英语 <https://en.wikipedia.org/wiki/Simplified_Technical_English>`_
+* `国际英语 <https://en.wikipedia.org/wiki/International_English>`_
 
 .. note::
 
-    While the official Solidity documentation is written in English, there are community contributed :ref:`translations`
-    in other languages available. Please refer to the `translation guide <https://github.com/solidity-docs#solidity-documentation-translation-guide>`_
-    for information on how to contribute to the community translations.
+    虽然官方的 Solidity 文档是用英语写的，但也有社区贡献的其他语言的 :ref:`translations` �用。
+    请�考 `翻译指� <https://github.com/solidity-docs#solidity-documentation-translation-guide>`_ 
+    以了解如何为社区翻译作出贡献。
 
-Title Case for Headings
+标题的大�写
 -----------------------
 
-Use `title case <https://titlecase.com>`_ for headings. This means capitalise all principal words in
-titles, but not articles, conjunctions, and prepositions unless they start the
-title.
+在标题中使用 `标题大�写 <https://titlecase.com>`_。
+这�味�标题中的所有主�都�大写，但�包括冠�，连接�和介�，除�它们是标题的开头。
 
-For example, the following are all correct:
+例如，下列�项都是正确的：
 
 * Title Case for Headings.
 * For Headings Use Title Case.
 * Local and State Variable Names.
 * Order of Layout.
 
-Expand Contractions
+扩写缩写
 -------------------
 
-Use expanded contractions for words, for example:
+使用扩展的缩略语�表达��，例如：
 
-* "Do not" instead of "Don't".
-* "Can not" instead of "Can't".
+* "Do not" 替代 "Don't"。
+* "Can not" 替代 "Can't"。
 
-Active and Passive Voice
+主动和被动语�
 ------------------------
 
-Active voice is typically recommended for tutorial style documentation as it
-helps the reader understand who or what is performing a task. However, as the
-Solidity documentation is a mixture of tutorials and reference content, passive
-voice is sometimes more applicable.
+主动语�通常被推�用于教程风格的文档，因为它有助于读者�解�或什么在执行一项任务。
+然而，由于 Solidity 文档是教程和�考内容的混�物，被动语�有时更适用。
 
-As a summary:
+综上所述：
 
-* Use passive voice for technical reference, for example language definition and internals of the Ethereum VM.
-* Use active voice when describing recommendations on how to apply an aspect of Solidity.
+* 在技术�考方�使用被动语�，例如语言定义和Ethereum虚拟机的内部情况。
+* 在�述关于如何应用 Solidity �方�的建议时，使用主动语�。
 
-For example, the below is in passive voice as it specifies an aspect of Solidity:
+例如，下�的内容是被动语�，因为它指定了 Solidity 的一个方�：
 
-  Functions can be declared ``pure`` in which case they promise not to read
-  from or modify the state.
+    函数�以被声明为 ``pure``，在这�情况下，它们承诺�读�或修改状�。
 
-For example, the below is in active voice as it discusses an application of Solidity:
+例如，下�是主动语�，因为它讨论了Solidity的一个应用：
 
-  When invoking the compiler, you can specify how to discover the first element
-  of a path, and also path prefix remappings.
+    在调用编译器时，您�以指定如何�现一个路径的第一个元素，也�以指定路径�缀的�映射。
 
-Common Terms
+常用术语
 ------------
 
-* "Function parameters" and "return variables", not input and output parameters.
+* “函数�数“ 和 “返回��“，而�是输入和输出�数。
 
-Code Examples
+代�示例
 -------------
 
-A CI process tests all code block formatted code examples that begin with ``pragma solidity``, ``contract``, ``library``
-or ``interface`` using the ``./test/cmdlineTests.sh`` script when you create a PR. If you are adding new code examples,
-ensure they work and pass tests before creating the PR.
+CI进程在您创建PR时，使用 ``./test/cmdlineTests.sh`` 脚本测试所有
+以 ``pragma solidity``， ``contract``， ``library`` 或 ``interface`` 开头的代��格�的示例代�。
+如果您正在添加新的代�实例，在创建PR之�确�它们能够工作并通过测试。
 
-Ensure that all code examples begin with a ``pragma`` version that spans the largest where the contract code is valid.
-For example ``pragma solidity >=0.4.0 <0.9.0;``.
+确�所有的代�实例以 ``pragma`` 版本开始，跨越�约代�有效的最大范围。
+例如 ``pragma solidity >=0.4.0 <0.9.0;``。
 
-Running Documentation Tests
+�行文档测试
 ---------------------------
 
-Make sure your contributions pass our documentation tests by running ``./docs/docs.sh`` that installs dependencies
-needed for documentation and checks for any problems such as broken links or syntax issues.
+通过�行 ``./scripts/docs.sh`` �确�您的贡献通过我们的文档测试，
+它安装了文档所需的�赖，并检查是�存在问题，如无效的链接或语法问题。
 
 .. _solidity_language_design:
 
-Solidity Language Design
+Solidity语言设计
 ========================
 
-To actively get involved in the language design process and to share your ideas concerning the future of Solidity,
-please join the `Solidity forum <https://forum.soliditylang.org/>`_.
+为了积��与语言设计过程，并分享您关于 Solidity 未�的想法，请加入 `Solidity 论� <https://forum.soliditylang.org/>`_。
 
-The Solidity forum serves as the place to propose and discuss new language features and their implementation in
-the early stages of ideation or modifications of existing features.
+Solidity论�作为�出和讨论新的语言功能�其在早期构�阶段的实现或现有功能的修改的一个地方。
 
-As soon as proposals get more tangible, their
-implementation will also be discussed in the `Solidity GitHub repository <https://github.com/ethereum/solidity>`_
-in the form of issues.
+一旦�案�得更加具体，
+它们的实施也将在 `Solidity GitHub仓库 <https://github.com/ethereum/solidity>`_ 中以问题的形�讨论。
 
-In addition to the forum and issue discussions, we regularly host language design discussion calls in which selected
-topics, issues or feature implementations are debated in detail. The invitation to those calls is shared via the forum.
+除了论�和问题讨论之外，我们还定期举办语言设计讨论会议，对选定的主题，问题或功能实现进行详细的辩论。
+这些会议的邀请函通过论�共享。
 
-We are also sharing feedback surveys and other content that is relevant to language design in the forum.
+我们也在论�中分享�馈调查和其他与语言设计相关的内容。
 
-If you want to know where the team is standing in terms or implementing new features, you can follow the implementation status in the `Solidity Github project <https://github.com/ethereum/solidity/projects/43>`_.
+<<<<<<< HEAD
+如果您想知�团队在实施新功能方�的情况，
+您�以在 `Solidity Github项目 <https://github.com/ethereum/solidity/projects/43>`_ 中关注实施状况。
+设计积压中的问题需�进一步规范，将在语言设计电�会议或常规团队电�会议中讨论。
+您�以通过从默认分支（ `develop` ）到 `breaking 分支 <https://github.com/ethereum/solidity/tree/breaking>`_
+�查看下一个�破性版本�将�生的�化。
+=======
+If you want to know where the team is standing in terms or implementing new features, you can follow the implementation status in the `Solidity GitHub project <https://github.com/ethereum/solidity/projects/43>`_.
 Issues in the design backlog need further specification and will either be discussed in a language design call or in a regular team call. You can
 see the upcoming changes for the next breaking release by changing from the default branch (`develop`) to the `breaking branch <https://github.com/ethereum/solidity/tree/breaking>`_.
+>>>>>>> english/develop
 
-For ad-hoc cases and questions, you can reach out to us via the `Solidity-dev Gitter channel <https://gitter.im/ethereum/solidity-dev>`_ — a
-dedicated chatroom for conversations around the Solidity compiler and language development.
+对于特殊情况和问题，您�以通过 `Solidity-dev Gitter 频� <https://gitter.im/ethereum/solidity-dev>`_ 与我们�系，
+- 这是一个专门用于围绕 Solidity 编译器和语言开�的�天室。
 
-We are happy to hear your thoughts on how we can improve the language design process to be even more collaborative and transparent.
+我们很高兴�到您对我们如何改进语言设计过程，使之更加�作和�明的想法。
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index ea8a9c569de1..2711e4c4cc38 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -1,89 +1,81 @@
-##################################
-Expressions and Control Structures
-##################################
+###################
+表达�和控制结构
+###################
 
 .. index:: ! parameter, parameter;input, parameter;output, function parameter, parameter;function, return variable, variable;return, return
 
 
 .. index:: if, else, while, do/while, for, break, continue, return, switch, goto
 
-Control Structures
+控制结构
 ===================
 
-Most of the control structures known from curly-braces languages are available in Solidity:
+大多数从大括�语言中知�的控制结构都�以在Solidity中使用：
 
-There is: ``if``, ``else``, ``while``, ``do``, ``for``, ``break``, ``continue``, ``return``, with
-the usual semantics known from C or JavaScript.
+有： ``if``， ``else``，  ``while``， ``do``， ``for``， ``break``， ``continue``， ``return``，
+这些在 C 或者 JavaScript 中表达相�语义的关键�。
 
-Solidity also supports exception handling in the form of ``try``/``catch``-statements,
-but only for :ref:`external function calls <external-function-calls>` and
-contract creation calls. Errors can be created using the :ref:`revert statement <revert-statement>`.
+Solidity也支� ``try`` / ``catch`` 形�的语�的异常处�，
+但�适用于 :ref:`外部函数调用 <external-function-calls>` 和�约创建调用。
+�以使用 :ref:`��状� <revert-statement>` �创建错误。
 
-Parentheses can *not* be omitted for conditionals, but curly braces can be omitted
-around single-statement bodies.
+�件� *�能* �略括�，但��体周围�以�略大括�。
 
-Note that there is no type conversion from non-boolean to boolean types as
-there is in C and JavaScript, so ``if (1) { ... }`` is *not* valid
-Solidity.
+请注�，没有�C和JavaScript那样从�布尔类型到布尔类型的类型转�，
+所以 ``if (1) { ... }`` 在Solidity *�是* 有效的。
 
 .. index:: ! function;call, function;internal, function;external
 
 .. _function-calls:
 
-Function Calls
-==============
+函数调用
+=========
 
 .. _internal-function-calls:
 
-Internal Function Calls
------------------------
+内部函数调用
+--------------
 
-Functions of the current contract can be called directly ("internally"), also recursively, as seen in
-this nonsensical example:
+当��约中的函数�以直接（“从内部�）调用，也�以递归调用，就�下边这个�谬的例�一样：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.4.22 <0.9.0;
 
-    // This will report a warning
+    // 这会有一个警告
     contract C {
         function g(uint a) public pure returns (uint ret) { return a + f(); }
         function f() internal pure returns (uint ret) { return g(7) + f(); }
     }
 
-These function calls are translated into simple jumps inside the EVM. This has
-the effect that the current memory is not cleared, i.e. passing memory references
-to internally-called functions is very efficient. Only functions of the same
-contract instance can be called internally.
+这些函数调用在EVM内部被转化为简�的跳转。
+这样�的效果是，当�的内存�会被清空，也就是说，
+将内存引用传递给内部调用的函数是�常有效的。
+但�有�一�约实例的函数�以被内部调用。
 
-You should still avoid excessive recursion, as every internal function call
-uses up at least one stack slot and there are only 1024 slots available.
+您还是应该��过度的递归调用，因为�个内部函数的调用都会�用至少一个堆栈槽，而�用的堆栈槽�有1024个。
 
 .. _external-function-calls:
 
-External Function Calls
------------------------
+外部函数调用
+-------------
 
-Functions can also be called using the ``this.g(8);`` and ``c.g(2);`` notation, where
-``c`` is a contract instance and ``g`` is a function belonging to ``c``.
-Calling the function ``g`` via either way results in it being called "externally", using a
-message call and not directly via jumps.
-Please note that function calls on ``this`` cannot be used in the constructor,
-as the actual contract has not been created yet.
+函数也�以使用 ``this.g(8);`` 和 ``c.g(2);`` 符��调用，
+其中 ``c`` 是一个�约实例， ``g`` 是属于 ``c`` 的函数。
+通过这两�方�调用函数 ``g`` 会导致它被 “外部� 调用，
+使用消�调用而�是直接通过跳转。
+请注�，对 ``this`` 的函数调用�能在构造函数中使用，因为实际的�约还没有被创建。
 
-Functions of other contracts have to be called externally. For an external call,
-all function arguments have to be copied to memory.
+其他�约的函数必须被外部调用。对于一个外部调用，
+所有的函数�数都必须被拷�到内存中。
 
 .. note::
-    A function call from one contract to another does not create its own transaction,
-    it is a message call as part of the overall transaction.
+    从一个�约到�一个�约的函数调用并�创建自己的交易，它是作为整个交易的一部分的消�调用。
 
-When calling functions of other contracts, you can specify the amount of Wei or
-gas sent with the call with the special options ``{value: 10, gas: 10000}``.
-Note that it is discouraged to specify gas values explicitly, since the gas costs
-of opcodes can change in the future. Any Wei you send to the contract is added
-to the total balance of that contract:
+当调用其他�约的函数时，您�以用特殊的选项 ``{value: 10, gas: 10000}`` 指定�调用��的Wei或气体（gas）数�。
+请注�，�鼓励明确指定气体值，因为�作�的气体�本�能在未��生�化。
+您��给�约的任何Wei都会被添加到该�约的总余�中：
 
 .. code-block:: solidity
 
@@ -100,63 +92,53 @@ to the total balance of that contract:
         function callFeed() public { feed.info{value: 10, gas: 800}(); }
     }
 
-You need to use the modifier ``payable`` with the ``info`` function because
-otherwise, the ``value`` option would not be available.
+您需�对 ``info`` 函数使用修饰符 ``payable``，
+因为�这样的�， ``value`` 选项则��用。
 
 .. warning::
-  Be careful that ``feed.info{value: 10, gas: 800}`` only locally sets the
-  ``value`` and amount of ``gas`` sent with the function call, and the
-  parentheses at the end perform the actual call. So
-  ``feed.info{value: 10, gas: 800}`` does not call the function and
-  the ``value`` and ``gas`` settings are lost, only
-  ``feed.info{value: 10, gas: 800}()`` performs the function call.
-
-Due to the fact that the EVM considers a call to a non-existing contract to
-always succeed, Solidity uses the ``extcodesize`` opcode to check that
-the contract that is about to be called actually exists (it contains code)
-and causes an exception if it does not. This check is skipped if the return
-data will be decoded after the call and thus the ABI decoder will catch the
-case of a non-existing contract.
-
-Note that this check is not performed in case of :ref:`low-level calls <address_related>` which
-operate on addresses rather than contract instances.
+  注� ``feed.info{value: 10, gas: 800}`` �在本地设置 ``value`` 和�函数调用��的 ``gas`` 数�，
+  最�的括�执行实际调用。所以 ``feed.info{value: 10, gas: 800}`` �会调用函数，
+  ``value`` 和 ``gas`` 的设置也会丢失，
+  �有 ``feed.info{value: 10, gas: 800}()`` 执行了函数调用。
+
+由于EVM认为对一个�存在的�约的调用总是�功的，
+Solidity使用 ``extcodesize`` �作��检查�将被调用的�约是�真的存在（它包�代�），
+如果�存在就会引起异常。如果返回数�将在调用�被解�，
+则跳过该检查，因此ABI解�器将�获�存在的�约的情况。
+
+请注�，这个检查在 :ref:`低级调用 <address_related>` 的情况下�执行，
+这些调用是对地�而�是�约实例进行�作。
 
 .. note::
-    Be careful when using high-level calls to
-    :ref:`precompiled contracts <precompiledContracts>`,
-    since the compiler considers them non-existing according to the
-    above logic even though they execute code and can return data.
+    在对 :ref:`预编译�约 <precompiledContracts>` 使用高级调用时��心，
+    因为根�上述逻辑，编译器认为它们�存在，�使它们执行代�并�以返回数�。
 
-Function calls also cause exceptions if the called contract itself
-throws an exception or goes out of gas.
+如果被调用的�约本身抛出异常或超出了gas值，函数调用也会引起异常。
 
 .. warning::
-    Any interaction with another contract imposes a potential danger, especially
-    if the source code of the contract is not known in advance. The
-    current contract hands over control to the called contract and that may potentially
-    do just about anything. Even if the called contract inherits from a known parent contract,
-    the inheriting contract is only required to have a correct interface. The
-    implementation of the contract, however, can be completely arbitrary and thus,
-    pose a danger. In addition, be prepared in case it calls into other contracts of
-    your system or even back into the calling contract before the first
-    call returns. This means
-    that the called contract can change state variables of the calling contract
-    via its functions. Write your functions in a way that, for example, calls to
-    external functions happen after any changes to state variables in your contract
-    so your contract is not vulnerable to a reentrancy exploit.
+    与�一个�约的任何互动都会带�潜在的�险，
+    特别是当�约的�代�事先�知�的时候。
+    当�的�约将控制�交给了被调用的�约，而这有�能�任何事情。
+    �使被调用的�约继承自一个已知的父�约，
+    继承的�约也�需�有一个正确的接�。
+    然而，�约的实现完全�以是任�的，因此这会带��险。
+    此外，��好准备，以防它调用到您系统中的其他�约，
+    甚至在第一次调用返回之�就回到调用�约中。
+    这�味�被调用的�约�以通过这个函数改�调用�约的状���。
+    编写您的函数时，例如，对外部函数的调用�生在对您的�约中的状���的任何改�之�，
+    这样您的�约就�会�到�入性�洞的攻击。
 
 .. note::
-    Before Solidity 0.6.2, the recommended way to specify the value and gas was to
-    use ``f.value(x).gas(g)()``. This was deprecated in Solidity 0.6.2 and is no
-    longer possible since Solidity 0.7.0.
+    在 Solidity 0.6.2 之�，指定以太值和气体值的推�方法是
+    使用 ``f.value(x).gas(g)()``。这在Solidity 0.6.2中被废弃，
+    并且从Solidity 0.7.0开始��支�。
 
-Function Calls with Named Parameters
-------------------------------------
+带命��数的函数调用
+----------------------
 
-Function call arguments can be given by name, in any order,
-if they are enclosed in ``{ }`` as can be seen in the following
-example. The argument list has to coincide by name with the list of
-parameters from the function declaration, but can be in arbitrary order.
+函数调用�数�以用�字�表示，如果用 ``{ }`` 括起�的�，
+�以用任何顺�，如下�的例�所示。
+�数列表在�称上必须与函数声明中的�数列表相一致，但�以有任�的顺�。
 
 .. code-block:: solidity
 
@@ -175,13 +157,12 @@ parameters from the function declaration, but can be in arbitrary order.
         }
     }
 
-Omitted Names in Function Definitions
--------------------------------------
+函数定义中�略的�称
+--------------------
 
-The names of parameters and return values in the function declaration can be omitted.
-Those items with omitted names will still be present on the stack, but they are
-inaccessible by name. An omitted return value name
-can still return a value to the caller by use of the ``return`` statement.
+函数声明中的�数和返回值的�称�以�略。
+那些�字被�略的�数�然会出现在堆栈中，但是无法通过�字访问。
+�略的返回值�称�然�以通过使用 ``return`` 语��调用者返回一个值。
 
 .. code-block:: solidity
 
@@ -189,7 +170,7 @@ can still return a value to the caller by use of the ``return`` statement.
     pragma solidity >=0.4.22 <0.9.0;
 
     contract C {
-        // omitted name for parameter
+        // �略�数�称
         function func(uint k, uint) public pure returns(uint) {
             return k;
         }
@@ -200,12 +181,12 @@ can still return a value to the caller by use of the ``return`` statement.
 
 .. _creating-contracts:
 
-Creating Contracts via ``new``
-==============================
+通过 ``new`` 创建�约
+========================
 
-A contract can create other contracts using the ``new`` keyword. The full
-code of the contract being created has to be known when the creating contract
-is compiled so recursive creation-dependencies are not possible.
+一个�约�以使用 ``new`` 关键字创建其他�约。
+待创建�约的完整代�必须在创建的�约被编译时知�，
+所以递归的创建�赖是��能的。
 
 .. code-block:: solidity
 
@@ -219,7 +200,7 @@ is compiled so recursive creation-dependencies are not possible.
     }
 
     contract C {
-        D d = new D(4); // will be executed as part of C's constructor
+        D d = new D(4); // 将作为�约 C 构造函数的一部分执行
 
         function createD(uint arg) public {
             D newD = new D(arg);
@@ -227,40 +208,33 @@ is compiled so recursive creation-dependencies are not possible.
         }
 
         function createAndEndowD(uint arg, uint amount) public payable {
-            // Send ether along with the creation
+            // ��约的创建�� ether
             D newD = new D{value: amount}(arg);
             newD.x();
         }
     }
 
-As seen in the example, it is possible to send Ether while creating
-an instance of ``D`` using the ``value`` option, but it is not possible
-to limit the amount of gas.
-If the creation fails (due to out-of-stack, not enough balance or other problems),
-an exception is thrown.
+正如在例�中所看到的，在使用 ``value`` 选项创建 ``D`` 的实例时，
+�以��以太，但��能�制气体的数�。
+如果创建失败（由于堆栈耗尽，没有足够的余�或其他问题），会抛出一个异常。
 
-Salted contract creations / create2
+加��约创建 / create2
 -----------------------------------
 
-When creating a contract, the address of the contract is computed from
-the address of the creating contract and a counter that is increased with
-each contract creation.
+当创建一个�约时，�约的地�是由创建�约的地�和一个计数器计算出�的，
+这个计数器在�次创建�约时都会增加。
 
-If you specify the option ``salt`` (a bytes32 value), then contract creation will
-use a different mechanism to come up with the address of the new contract:
+如果您指定了选项 ``salt`` （一个32字节的值），
+那么�约的创建将使用一���的机制�得出新�约的地�。
 
-It will compute the address from the address of the creating contract,
-the given salt value, the (creation) bytecode of the created contract and the constructor
-arguments.
+它将从创建�约的地��给定的�值�创建�约的（创建）字节�和构造函数�数中计算出地�。
 
-In particular, the counter ("nonce") is not used. This allows for more flexibility
-in creating contracts: You are able to derive the address of the
-new contract before it is created. Furthermore, you can rely on this address
-also in case the creating
-contracts creates other contracts in the meantime.
+特别的是，计数器（“nonce�）没有被使用。这使得创建�约时有更多的�活性。
+您能够在新�约创建之�得出它的地�。此外，在创建�约的�时创建其他�约的情况下，
+您也�以�赖这个地�。
 
-The main use-case here is contracts that act as judges for off-chain interactions,
-which only need to be created if there is a dispute.
+这里的主�用例是�为链外互动的评判的�约，
+�有在有争议的时候�需�创建。
 
 .. code-block:: solidity
 
@@ -275,9 +249,9 @@ which only need to be created if there is a dispute.
 
     contract C {
         function createDSalted(bytes32 salt, uint arg) public {
-            // This complicated expression just tells you how the address
-            // can be pre-computed. It is just there for illustration.
-            // You actually only need ``new D{salt: salt}(arg)``.
+            // 这个��的表达��是告诉您如何预先计算出地�。
+            // 它�是用于说明问题。
+            // 实际上您�需� ``new D{salt: salt}(arg)``。
             address predictedAddress = address(uint160(uint(keccak256(abi.encodePacked(
                 bytes1(0xff),
                 address(this),
@@ -294,42 +268,35 @@ which only need to be created if there is a dispute.
     }
 
 .. warning::
-    There are some peculiarities in relation to salted creation. A contract can be
-    re-created at the same address after having been destroyed. Yet, it is possible
-    for that newly created contract to have a different deployed bytecode even
-    though the creation bytecode has been the same (which is a requirement because
-    otherwise the address would change). This is due to the fact that the constructor
-    can query external state that might have changed between the two creations
-    and incorporate that into the deployed bytecode before it is stored.
+    在用加�方�创建�约时，有一些特殊性。一个�约�以在被销��在�一地��新创建。
+    然而，新创建的�约有�能具有��的部署字节�，
+    �使创建字节�是相�的（这是一个�求，�则地�会改�）。
+    这是由于构造函数�以查询在两次创建之间�能�生�化的外部状�，
+    并在存储之�将其纳入部署字节�。
 
 
-Order of Evaluation of Expressions
-==================================
+表达�计算顺�
+================
 
-The evaluation order of expressions is not specified (more formally, the order
-in which the children of one node in the expression tree are evaluated is not
-specified, but they are of course evaluated before the node itself). It is only
-guaranteed that statements are executed in order and short-circuiting for
-boolean expressions is done.
+表达�的计算顺��是特定的（更准确地说，
+表达�树中�节点的�节点间的计算顺��是特定的，但它们的结算肯定会在节点自己的结算之�）。
+该规则�能��语�按顺�执行，并对布尔表达�进行短路处�。
 
 .. index:: ! assignment
 
-Assignment
-==========
+赋值
+======
 
 .. index:: ! assignment;destructuring
 
-Destructuring Assignments and Returning Multiple Values
--------------------------------------------------------
+解构赋值和返回多个值
+---------------------
 
-Solidity internally allows tuple types, i.e. a list of objects
-of potentially different types whose number is a constant at
-compile-time. Those tuples can be used to return multiple values at the same time.
-These can then either be assigned to newly declared variables
-or to pre-existing variables (or LValues in general).
+Solidity 内部�许元组 (tuple) 类型，也就是一个在编译时元素数�固定的对象列表，
+列表中的元素�以是��类型的对象。这些元组�以用��时返回多个数值，
+也�以用它们��时赋值给多个新声明的��或者既存的��（或通常的 LValues）：
 
-Tuples are not proper types in Solidity, they can only be used to form syntactic
-groupings of expressions.
+在Solidity中，元组�是适当的类型，它们�能被用�构建表达�的语法分组。
 
 .. code-block:: solidity
 
@@ -344,38 +311,47 @@ groupings of expressions.
         }
 
         function g() public {
-            // Variables declared with type and assigned from the returned tuple,
-            // not all elements have to be specified (but the number must match).
+            // 用类型声明的��，并从返回的元组中分�，
+            // �是所有的元素都必须被指定（但数�必须匹�）。
             (uint x, , uint y) = f();
-            // Common trick to swap values -- does not work for non-value storage types.
+            // 交�数值的常�技巧 -- 对�数值存储类型�起作用。
             (x, y) = (y, x);
-            // Components can be left out (also for variable declarations).
-            (index, , ) = f(); // Sets the index to 7
+            // 元素�以�使用（也适用于��声明）。
+            (index, , ) = f(); // 将index设置为 7
         }
     }
 
-It is not possible to mix variable declarations and non-declaration assignments,
-i.e. the following is not valid: ``(x, uint y) = (1, 2);``
+��能混�使用声明和�声明��赋值。
+例如，下�的方法是无效的。 ``(x, uint y) = (1, 2);``。
 
 .. note::
-    Prior to version 0.5.0 it was possible to assign to tuples of smaller size, either
-    filling up on the left or on the right side (which ever was empty). This is
-    now disallowed, so both sides have to have the same number of components.
+    在0.5.0版本之�，给具有更少元素数的元组赋值都是�能的，
+    �么在左边填充，�么在�边填充（无论哪个是空的）。
+    现在这是��许的，所以两边必须有相�数�的元素。
 
 .. warning::
+<<<<<<< HEAD
+    当涉�到引用类型时，在�时�多个��赋值时��心，因为这�能导致�外的�制行为。
+=======
     Be careful when assigning to multiple variables at the same time when
     reference types are involved, because it could lead to unexpected
     copying behavior.
+>>>>>>> english/develop
 
-Complications for Arrays and Structs
-------------------------------------
+数组和结构体的��情况
+----------------------
 
+<<<<<<< HEAD
+对于�数组和结构体这样的�值类型，包括 ``bytes`` 和 ``string``，赋值的语义更为��，
+详� :ref:`数��置和赋值行为 <data-location-assignment>`。
+=======
 The semantics of assignments are more complicated for non-value types like arrays and structs,
 including ``bytes`` and ``string``, see :ref:`Data location and assignment behavior <data-location-assignment>` for details.
+>>>>>>> english/develop
 
-In the example below the call to ``g(x)`` has no effect on ``x`` because it creates
-an independent copy of the storage value in memory. However, ``h(x)`` successfully modifies ``x``
-because only a reference and not a copy is passed.
+在下�的例�中，调用 ``g(x)`` 对 ``x`` 没有影�，
+因为它在内存中创建了一个独立的存储值的副本。然而， ``h(x)`` �功地修改了 ``x``，
+因为传递了一个引用而�是一个拷�。
 
 .. code-block:: solidity
 
@@ -403,38 +379,31 @@ because only a reference and not a copy is passed.
 
 .. _default-value:
 
-Scoping and Declarations
-========================
+作用域和声明
+==============
+
+一个被声明的��将有一个�始默认值，其字节表示为所有的零。
+��的 "默认值" 是任何类型的典型 "零状�"。
+例如， ``bool`` 的默认值是 ``false``。
+``uint`` 或 ``int`` 类型的默认值是 ``0``。
+对于��大�的数组和 ``bytes1`` 到 ``bytes32``，
+�个�独的元素将被�始化为与其类型相应的默认值。
+对于动�大�的数组， ``bytes`` 和 ``string``，默认值是一个空数组或字符串。
+对于 ``enum`` 类型，默认值是其第一个�员。
+
+Solidity 中的作用域规则�循了 C99（与其他很多语言一样）：
+��将会从它们被声明之���，直到一对 ``{ }`` �的结�。
+这一规则有个例外，在 for 循环语�中�始化的��，其��性仅维�到 for 循环的结�。
+
+类似于�数的��（函数�数�修改器�数��获（catch）�数......）
+在��的代��中是��的--对于函数和修改器�数，在函数/修改器的主体中，
+对于�获�数，在�获�中。
+
+在代��之外声明的��，例如函数��约�用户定义的类型等，
+甚至在声明之�就已���。
+这�味�您�以在声明之�使用状���，并递归地调用函数。
 
-A variable which is declared will have an initial default
-value whose byte-representation is all zeros.
-The "default values" of variables are the typical "zero-state"
-of whatever the type is. For example, the default value for a ``bool``
-is ``false``. The default value for the ``uint`` or ``int``
-types is ``0``. For statically-sized arrays and ``bytes1`` to
-``bytes32``, each individual
-element will be initialized to the default value corresponding
-to its type. For dynamically-sized arrays, ``bytes``
-and ``string``, the default value is an empty array or string.
-For the ``enum`` type, the default value is its first member.
-
-Scoping in Solidity follows the widespread scoping rules of C99
-(and many other languages): Variables are visible from the point right after their declaration
-until the end of the smallest ``{ }``-block that contains the declaration.
-As an exception to this rule, variables declared in the
-initialization part of a for-loop are only visible until the end of the for-loop.
-
-Variables that are parameter-like (function parameters, modifier parameters,
-catch parameters, ...) are visible inside the code block that follows -
-the body of the function/modifier for a function and modifier parameter and the catch block
-for a catch parameter.
-
-Variables and other items declared outside of a code block, for example functions, contracts,
-user-defined types, etc., are visible even before they were declared. This means you can
-use state variables before they are declared and call functions recursively.
-
-As a consequence, the following examples will compile without warnings, since
-the two variables have the same name but disjoint scopes.
+因此，下�的例�在编译时�会出现警告，因为这两个��的�字虽然相�，但作用域��。
 
 .. code-block:: solidity
 
@@ -454,15 +423,15 @@ the two variables have the same name but disjoint scopes.
         }
     }
 
-As a special example of the C99 scoping rules, note that in the following,
-the first assignment to ``x`` will actually assign the outer and not the inner variable.
-In any case, you will get a warning about the outer variable being shadowed.
+作为 C99 作用域规则的特例，请注�在下边的例�里，
+第一次对 ``x`` 的赋值实际上将赋给外层��而�是内层��。
+在任何情况下，您都会得到一个关于外部��被影射（译者注：就是说被在内部作用域中由一个����所替代）的警告。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.5.0 <0.9.0;
-    // This will report a warning
+    // 这将报告一个警告信�
     contract C {
         function f() pure public returns (uint) {
             uint x = 1;
@@ -475,16 +444,15 @@ In any case, you will get a warning about the outer variable being shadowed.
     }
 
 .. warning::
-    Before version 0.5.0 Solidity followed the same scoping rules as
-    JavaScript, that is, a variable declared anywhere within a function would be in scope
-    for the entire function, regardless where it was declared. The following example shows a code snippet that used
-    to compile but leads to an error starting from version 0.5.0.
+    在0.5.0版本之�，Solidity�循与JavaScript相�的作用域规则，
+    也就是说，在一个函数中的任何地方声明的��都会在整个函数的作用域中，�管它是在哪里声明。
+    下�的例�显示了一个曾��以编译的代�片段，但从0.5.0版本开始导致了一个错误。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.5.0 <0.9.0;
-    // This will not compile
+    // 这将无法编译
     contract C {
         function f() pure public returns (uint) {
             x = 2;
@@ -497,20 +465,22 @@ In any case, you will get a warning about the outer variable being shadowed.
 .. index:: ! safe math, safemath, checked, unchecked
 .. _unchecked:
 
-Checked or Unchecked Arithmetic
-===============================
+检查或�检查的算术
+==================
 
-An overflow or underflow is the situation where the resulting value of an arithmetic operation,
-when executed on an unrestricted integer, falls outside the range of the result type.
+上溢或下溢是指算术�算的结果值，当对一个���制的整数执行时，超出了结果类型的范围。
 
-Prior to Solidity 0.8.0, arithmetic operations would always wrap in case of
-under- or overflow leading to widespread use of libraries that introduce
-additional checks.
+在Solidity 0.8.0之�，算术�算总是在下溢或上溢的情况下被包起�，
+这导致广泛使用引入�外检查的库。
 
-Since Solidity 0.8.0, all arithmetic operations revert on over- and underflow by default,
-thus making the use of these libraries unnecessary.
+从Solidity 0.8.0开始，在默认情况下所有的算术�算都会在上溢和下溢时还原，
+从而使这些库的使用�得没有必�。
 
+<<<<<<< HEAD
+为了获得以�的行为，�以使用一个 ``未检查（unchecked）`` 区�。
+=======
 To obtain the previous behavior, an ``unchecked`` block can be used:
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
@@ -518,159 +488,137 @@ To obtain the previous behavior, an ``unchecked`` block can be used:
     pragma solidity ^0.8.0;
     contract C {
         function f(uint a, uint b) pure public returns (uint) {
-            // This subtraction will wrap on underflow.
+            // 这个�法将在下溢时被包起�。
             unchecked { return a - b; }
         }
         function g(uint a, uint b) pure public returns (uint) {
-            // This subtraction will revert on underflow.
+            // 这个�法在下溢时将被还原。
             return a - b;
         }
     }
 
-The call to ``f(2, 3)`` will return ``2**256-1``, while ``g(2, 3)`` will cause
-a failing assertion.
+调用 ``f(2, 3)`` 将返回 ``2**256-1``，而 ``g(2, 3)`` 将导致一个失败的断言。
 
-The ``unchecked`` block can be used everywhere inside a block, but not as a replacement
-for a block. It also cannot be nested.
+``unchecked`` 代���以在代��内的任何地方使用，但�能替代代��。
+它也�能被嵌套。
 
-The setting only affects the statements that are syntactically inside the block.
-Functions called from within an ``unchecked`` block do not inherit the property.
+该设置�影�到在语法上�于代��内的语�。
+从 ``unchecked`` 代��内调用的函数�继承该属性。
 
 .. note::
-    To avoid ambiguity, you cannot use ``_;`` inside an ``unchecked`` block.
+    为了��歧义，您�能在一个 ``unchecked`` 代��内使用 ``_;``。
 
-The following operators will cause a failing assertion on overflow or underflow
-and will wrap without an error if used inside an unchecked block:
+以下�算符在上溢或下溢时将导致一个失败的断言，
+如果在一个未检查的代��内使用，将被包裹而�会出现错误。
 
-``++``, ``--``, ``+``, binary ``-``, unary ``-``, ``*``, ``/``, ``%``, ``**``
+``++``， ``--``， ``+``， 二进制 ``-``， �进制 ``-``， ``*``， ``/``， ``%``， ``**``
 
-``+=``, ``-=``, ``*=``, ``/=``, ``%=``
+``+=``， ``-=``， ``*=``， ``/=``， ``%=``
 
 .. warning::
-    It is not possible to disable the check for division by zero
-    or modulo by zero using the ``unchecked`` block.
+    �能使用 ``unchecked`` 代����止检查除以0或对0�余数。
 
 .. note::
-   Bitwise operators do not perform overflow or underflow checks.
-   This is particularly visible when using bitwise shifts (``<<``, ``>>``, ``<<=``, ``>>=``) in
-   place of integer division and multiplication by a power of 2.
-   For example ``type(uint256).max << 3`` does not revert even though ``type(uint256).max * 8`` would.
+   ��作符�执行上溢或下溢检查。
+   这在使用��作符移�（ ``<<`` ， ``>>``， ``<<=``， ``>>=``）�代替整数除法和2的幂次方时尤其明显。
+   例如 ``type(uint256).max << 3`` �会���作，尽管 ``type(uint256).max * 8`` 会���作。
 
 .. note::
-    The second statement in ``int x = type(int).min; -x;`` will result in an overflow
-    because the negative range can hold one more value than the positive range.
+    ``int x = type(int).min; -x;`` 中的第二�语�将导致溢出，
+    因为负数范围�以比正数范围多容纳一个值。
 
-Explicit type conversions will always truncate and never cause a failing assertion
-with the exception of a conversion from an integer to an enum type.
+明确的类型转�将总是截断，并且永远�会导致失败的断言，但从整数到枚举类型的转�除外。
 
 .. index:: ! exception, ! throw, ! assert, ! require, ! revert, ! errors
 
 .. _assert-and-require:
 
-Error handling: Assert, Require, Revert and Exceptions
+错误处�：Assert, Require, Revert and Exceptions
 ======================================================
 
-Solidity uses state-reverting exceptions to handle errors.
-Such an exception undoes all changes made to the
-state in the current call (and all its sub-calls) and
-flags an error to the caller.
+Solidity 使用状���异常�处�错误。
+这�异常将撤消对当�调用（�其所有�调用）中的状�所�的所有更改，
+并且还�调用者标记错误。
 
-When exceptions happen in a sub-call, they "bubble up" (i.e.,
-exceptions are rethrown) automatically unless they are caught in
-a ``try/catch`` statement. Exceptions to this rule are ``send``
-and the low-level functions ``call``, ``delegatecall`` and
-``staticcall``: they return ``false`` as their first return value in case
-of an exception instead of "bubbling up".
+当异常�生在�调用中时，它们会自动 "冒泡"（也就是说，异常被�新抛出），
+除�它们被 ``try/catch`` 语��获。这个规则的例外是 ``send``
+和低级函数 ``call``， ``delegatecall`` 和 ``staticcall``：
+它们在�生异常时返回 ``false`` 作为第一个返回值而�是 "冒泡"。
 
 .. warning::
-    The low-level functions ``call``, ``delegatecall`` and
-    ``staticcall`` return ``true`` as their first return value
-    if the account called is non-existent, as part of the design
-    of the EVM. Account existence must be checked prior to calling if needed.
-
-Exceptions can contain error data that is passed back to the caller
-in the form of :ref:`error instances <errors>`.
-The built-in errors ``Error(string)`` and ``Panic(uint256)`` are
-used by special functions, as explained below. ``Error`` is used for "regular" error conditions
-while ``Panic`` is used for errors that should not be present in bug-free code.
-
-Panic via ``assert`` and Error via ``require``
-----------------------------------------------
-
-The convenience functions ``assert`` and ``require`` can be used to check for conditions and throw an exception
-if the condition is not met.
-
-The ``assert`` function creates an error of type ``Panic(uint256)``.
-The same error is created by the compiler in certain situations as listed below.
-
-Assert should only be used to test for internal
-errors, and to check invariants. Properly functioning code should
-never create a Panic, not even on invalid external input.
-If this happens, then there
-is a bug in your contract which you should fix. Language analysis
-tools can evaluate your contract to identify the conditions and
-function calls which will cause a Panic.
-
-A Panic exception is generated in the following situations.
-The error code supplied with the error data indicates the kind of panic.
-
-#. 0x00: Used for generic compiler inserted panics.
-#. 0x01: If you call ``assert`` with an argument that evaluates to false.
-#. 0x11: If an arithmetic operation results in underflow or overflow outside of an ``unchecked { ... }`` block.
-#. 0x12; If you divide or modulo by zero (e.g. ``5 / 0`` or ``23 % 0``).
-#. 0x21: If you convert a value that is too big or negative into an enum type.
-#. 0x22: If you access a storage byte array that is incorrectly encoded.
-#. 0x31: If you call ``.pop()`` on an empty array.
-#. 0x32: If you access an array, ``bytesN`` or an array slice at an out-of-bounds or negative index (i.e. ``x[i]`` where ``i >= x.length`` or ``i < 0``).
-#. 0x41: If you allocate too much memory or create an array that is too large.
-#. 0x51: If you call a zero-initialized variable of internal function type.
-
-The ``require`` function either creates an error without any data or
-an error of type ``Error(string)``. It
-should be used to ensure valid conditions
-that cannot be detected until execution time.
-This includes conditions on inputs
-or return values from calls to external contracts.
+    如果被调用的账户�存在，低级函数 ``call``， ``delegatecall`` 和 ``staticcall``
+    的第一个返回值为 ``true``，这是EVM设计的一部分。
+    如果需�的�，必须在调用之�检查账户是�存在。
+
+异常�以包�错误数�，以 :ref:`错误实例 <errors>` 的形�传回给调用者。
+内置的错误 ``Error(string)`` 和 ``Panic(uint256)`` 被特殊函数使用，
+解释如下。 ``Error`` 用于 "常规" 错误�件，而 ``Panic`` 用于在无错误代�中�应该出现的错误。
+
+通过 ``assert`` 引起Panic异常和通过 ``require`` 引起Error异常
+-------------------------------------------------------------
+
+快�函数 ``assert`` 和 ``require`` �以用�检查�件，如果�符��件就抛出一个异常。
+
+``assert`` 函数创建了一个 ``Panic(uint256)`` 类型的错误。
+在�些情况下，编译器也会产生�样的错误，如下所述。
+
+Assert应该�用于测试内部错误，以�检查���。
+正确�行的代��应该创建一个Panic异常，甚至在无效的外部输入时也�应该。
+如果�生这�情况，那么您的�约中就有一个错误，您应该修�它。
+语言分�工具�以评估您的�约，以确定会导致Panic异常的�件和函数调用。
+
+在下列情况下会产生一个Panic异常。
+与错误数�一起�供的错误代�表明Panic异常的�类。
+
+#. 0x00： 用于一般的编译器�入Panic异常的情况。
+#. 0x01： 如果您带�数调用 ``assert`` 时结果是false。
+#. 0x11： 如果一个算术�算在一个 ``unchecked { ... }`` 代��之外导致下溢或上溢。
+#. 0x12： 如果您对0�除法或者�余（例如 ``5 / 0`` 或者 ``23 % 0`` ）。
+#. 0x21： 如果您把一个太大的或负数的值转��一个枚举类型。
+#. 0x22： 如果您访问一个编��正确的存储字节数组。
+#. 0x31： 如果您在一个空数组上调用 ``.pop()``。
+#. 0x32： 如果您访问一个数组， ``bytesN`` 或一个数组切片索引超出数组长度或负索引（� ``x[i]``，其中 ``i >= x.length`` 或 ``i < 0`` ）。
+#. 0x41： 如果您分�了太多的内存空间或创建了一个太大的数组。
+#. 0x51： 如果您调用一个零�始化的内部函数类型的��。
+
+``require`` 函数�么创造一个没有任何数�的错误，
+�么创造一个 ``Error(string)`` 类型的错误。
+它应该被用�确�在执行之�无法检测到的有效�件。
+这包括对输入的�件或调用外部�约的返回值。
 
 .. note::
 
-    It is currently not possible to use custom errors in combination
-    with ``require``. Please use ``if (!condition) revert CustomError();`` instead.
+    目��能将自定义错误与 ``require`` 结�使用。
+    请使用 ``if (!condition) revert CustomError();`` 代替。
 
-An ``Error(string)`` exception (or an exception without data) is generated
-by the compiler
-in the following situations:
+在下列情况下，编译器会产生一个 ``Error(string)`` 异常（或者没有数�的异常）。
 
-#. Calling ``require(x)`` where ``x`` evaluates to ``false``.
-#. If you use ``revert()`` or ``revert("description")``.
-#. If you perform an external function call targeting a contract that contains no code.
-#. If your contract receives Ether via a public function without
-   ``payable`` modifier (including the constructor and the fallback function).
-#. If your contract receives Ether via a public getter function.
+#. 调用 ``require(x)``，其中 ``x`` 的值为 ``false``。
+#. 如果您使用 ``revert()`` 或 ``revert("错误�述")``。
+#. 如果您执行一个外部函数调用，目标是一个�包�代�的�约。
+#. 如果您的�约通过一个没有 ``payable`` 修饰符的公开函数（包括构造函数和备用函数）接收以太。
+#. 如果您的�约通过一个公共的getter函数接收以太。
 
-For the following cases, the error data from the external call
-(if provided) is forwarded. This means that it can either cause
-an ``Error`` or a ``Panic`` (or whatever else was given):
+对于以下情况，�自外部调用的错误数�（如果�供的�）会被转�。
+这�味�它既�以引起 ``Error`` 异常，也�以引起 ``Panic`` 异常（或�供的其他什么错误）。
 
-#. If a ``.transfer()`` fails.
-#. If you call a function via a message call but it does not finish
-   properly (i.e., it runs out of gas, has no matching function, or
-   throws an exception itself), except when a low level operation
-   ``call``, ``send``, ``delegatecall``, ``callcode`` or ``staticcall``
-   is used. The low level operations never throw exceptions but
-   indicate failures by returning ``false``.
-#. If you create a contract using the ``new`` keyword but the contract
-   creation :ref:`does not finish properly<creating-contracts>`.
+#. 如果 ``.transfer()`` 失败。
+#. 如果您通过消�调用一个函数，但它�能正常完�
+   （�，耗尽了气体，没有匹�的函数，或自己抛出一个异常），
+   除�使用低级�作 ``call``， ``send``， ``delegatecall``， ``callcode``
+   或 ``staticcall``。低级�作从�抛出异常，但通过返回 ``false`` 表示失败。
+#. 如果您使用 ``new`` 关键字创建一个�约，
+   但�约创建 :ref:`没有正常完� <creating-contracts>`。
 
-You can optionally provide a message string for ``require``, but not for ``assert``.
+您�以选择为 ``require`` �供一个信�字符串，但�能为 ``assert`` �供。
 
 .. note::
-    If you do not provide a string argument to ``require``, it will revert
-    with empty error data, not even including the error selector.
+    如果您没有给 ``require`` �供一个字符串�数，它将以空的错误数�进行还原，
+    甚至�包括错误选择器。
 
 
-The following example shows how you can use ``require`` to check conditions on inputs
-and ``assert`` for internal error checking.
+下�的例�显示了如何使用 ``require`` �检查输入的�件
+和 ``assert`` 进行内部错误检查。
 
 .. code-block:: solidity
     :force:
@@ -683,59 +631,65 @@ and ``assert`` for internal error checking.
             require(msg.value % 2 == 0, "Even value required.");
             uint balanceBeforeTransfer = address(this).balance;
             addr.transfer(msg.value / 2);
+<<<<<<< HEAD
+            // 由于转账失败�抛出异常并且�能在这里回调，
+            // 因此我们应该没有办法�然有一�的钱。
+=======
             // Since transfer throws an exception on failure and
             // cannot call back here, there should be no way for us to
             // still have half of the Ether.
+>>>>>>> english/develop
             assert(address(this).balance == balanceBeforeTransfer - msg.value / 2);
             return address(this).balance;
         }
     }
 
-Internally, Solidity performs a revert operation (instruction
-``0xfd``). This causes
-the EVM to revert all changes made to the state. The reason for reverting
-is that there is no safe way to continue execution, because an expected effect
-did not occur. Because we want to keep the atomicity of transactions, the
-safest action is to revert all changes and make the whole transaction
-(or at least call) without effect.
+在内部， Solidity 会执行���作（指令 ``0xfd`` ）。
+这会导致 EVM ��对状�所�的所有更改。��的原因是�能继续安全地执行，
+因为没有实现预期的效果，还因为我们想�留交易的原�性，
+所以最安全的�法是��所有更改并使整个交易（或至少是调用）�产生效果。
 
-In both cases, the caller can react on such failures using ``try``/``catch``, but
-the changes in the callee will always be reverted.
+在这两�情况下，调用者�以使用 ``try``/ ``catch`` 对这�失败�出处�，
+但被调用者的�化将总是被��。
 
 .. note::
 
-    Panic exceptions used to use the ``invalid`` opcode before Solidity 0.8.0,
-    which consumed all gas available to the call.
-    Exceptions that use ``require`` used to consume all gas until before the Metropolis release.
+    在Solidity 0.8.0之�，Panic异常曾使用 ``invalid`` �作�，
+    它消耗了所有�用于调用的气体。在Metropolis�布之�，
+    使用 ``require`` 的异常会消耗所有气体。
 
 .. _revert-statement:
 
 ``revert``
 ----------
 
-A direct revert can be triggered using the ``revert`` statement and the ``revert`` function.
+�以使用 ``revert`` 语�和 ``revert`` 函数�触�直接��。
 
-The ``revert`` statement takes a custom error as direct argument without parentheses:
+``revert`` 语�将一个自定义的错误作为直接�数，没有括�：
 
     revert CustomError(arg1, arg2);
 
+<<<<<<< HEAD
+出于��兼容的原因，还有一个 ``revert()`` 函数，
+它使用圆括�并接�一个字符串：
+=======
 For backward-compatibility reasons, there is also the ``revert()`` function, which uses parentheses
 and accepts a string:
+>>>>>>> english/develop
 
     revert();
     revert("description");
 
-The error data will be passed back to the caller and can be caught there.
-Using ``revert()`` causes a revert without any error data while ``revert("description")``
-will create an ``Error(string)`` error.
+错误数�将被传回给调用者，�以在那里�获。
+使用 ``revert()`` 会导致没有任何错误数�的还原，
+而 ``revert("description")`` 将创建一个 ``Error(string)`` 错误。
 
-Using a custom error instance will usually be much cheaper than a string description,
-because you can use the name of the error to describe it, which is encoded in only
-four bytes. A longer description can be supplied via NatSpec which does not incur
-any costs.
+使用一个自定义的错误实例通常会比字符串�述便宜得多，
+因为您�以使用错误的�称��述它，它的编��有四个字节。
+�以通过NatSpec�供更长的�述，这�会产生任何费用。
 
-The following example shows how to use an error string and a custom error instance
-together with ``revert`` and the equivalent ``require``:
+下�的例�显示了如何将一个错误字符串和一个自定义的错误实例
+与 ``revert`` 和相应的 ``require`` 一起使用。
 
 .. code-block:: solidity
 
@@ -748,12 +702,12 @@ together with ``revert`` and the equivalent ``require``:
         function buy(uint amount) public payable {
             if (amount > msg.value / 2 ether)
                 revert("Not enough Ether provided.");
-            // Alternative way to do it:
+            // �一�方法：
             require(
                 amount <= msg.value / 2 ether,
                 "Not enough Ether provided."
             );
-            // Perform the purchase.
+            // 执行购买。
         }
         function withdraw() public {
             if (msg.sender != owner)
@@ -763,39 +717,37 @@ together with ``revert`` and the equivalent ``require``:
         }
     }
 
-The two ways ``if (!condition) revert(...);`` and ``require(condition, ...);`` are
-equivalent as long as the arguments to ``revert`` and ``require`` do not have side-effects,
-for example if they are just strings.
+``if (!condition) revert(...);`` 和 ``require(condition, ...);`` 这两�方�是等价的，
+�� ``revert`` 和 ``require`` 的�数没有副作用，比如说它们�是字符串。
 
 .. note::
-    The ``require`` function is evaluated just as any other function.
-    This means that all arguments are evaluated before the function itself is executed.
-    In particular, in ``require(condition, f())`` the function ``f`` is executed even if
-    ``condition`` is true.
+    ``require`` 函数和其他函数一样。这�味�在执行函数本身之�，所有�数都会被评估。
+    特别是，在 ``require(condition, f())`` 中，�使 ``condition`` 为真，
+    函数 ``f`` 也被执行。
 
-The provided string is :ref:`abi-encoded <ABI>` as if it were a call to a function ``Error(string)``.
-In the above example, ``revert("Not enough Ether provided.");`` returns the following hexadecimal as error return data:
+�供的字符串是 :ref:`ABI编� <ABI>` 之�的，就�调用一个函数 ``Error(string)`` 一样。
+在上�的例�中， ``revert("Not enough Ether provided.");`` 返回以下�六进制作为错误返回数�：
 
 .. code::
 
-    0x08c379a0                                                         // Function selector for Error(string)
-    0x0000000000000000000000000000000000000000000000000000000000000020 // Data offset
-    0x000000000000000000000000000000000000000000000000000000000000001a // String length
-    0x4e6f7420656e6f7567682045746865722070726f76696465642e000000000000 // String data
+    0x08c379a0                                                         // Error(string) 的函数选择器
+    0x0000000000000000000000000000000000000000000000000000000000000020 // 数�的�移�（32）
+    0x000000000000000000000000000000000000000000000000000000000000001a // 字符串长度（26）
+    0x4e6f7420656e6f7567682045746865722070726f76696465642e000000000000 // 字符串数�（"Not enough Ether provided." 的 ASCII 编�，26字节）
 
-The provided message can be retrieved by the caller using ``try``/``catch`` as shown below.
+调用者�以使用 ``try`` / ``catch`` 检索所�供的消�，如下所示。
 
 .. note::
-    There used to be a keyword called ``throw`` with the same semantics as ``revert()`` which
-    was deprecated in version 0.4.13 and removed in version 0.5.0.
+    以�有一个� ``throw`` 的关键字，其语义与 ``revert()`` 相�，
+    在0.4.13版本中被弃用，在0.5.0版本中被删除。
 
 
 .. _try-catch:
 
-``try``/``catch``
------------------
+``try`` / ``catch``
+---------------------
 
-A failure in an external call can be caught using a try/catch statement, as follows:
+外部调用的失败�以用 try/catch 语���获，如下所示：
 
 .. code-block:: solidity
 
@@ -808,94 +760,77 @@ A failure in an external call can be caught using a try/catch statement, as foll
         DataFeed feed;
         uint errorCount;
         function rate(address token) public returns (uint value, bool success) {
-            // Permanently disable the mechanism if there are
-            // more than 10 errors.
+            // 如果有10个以上的错误，就永久�用该机制。
             require(errorCount < 10);
             try feed.getData(token) returns (uint v) {
                 return (v, true);
             } catch Error(string memory /*reason*/) {
-                // This is executed in case
-                // revert was called inside getData
-                // and a reason string was provided.
+                // 如果在getData中调用revert，
+                // 并且�供了一个原因字符串，
+                // 则执行该命令。
                 errorCount++;
                 return (0, false);
             } catch Panic(uint /*errorCode*/) {
-                // This is executed in case of a panic,
-                // i.e. a serious error like division by zero
-                // or overflow. The error code can be used
-                // to determine the kind of error.
+                // 在�生Panic异常的情况下执行，
+                // �出现严�的错误，如除以零或溢出。
+                // 错误代��以用�确定错误的�类。
                 errorCount++;
                 return (0, false);
             } catch (bytes memory /*lowLevelData*/) {
-                // This is executed in case revert() was used.
+                // 在使用revert()的情况下，会执行这个命令。
                 errorCount++;
                 return (0, false);
             }
         }
     }
 
-The ``try`` keyword has to be followed by an expression representing an external function call
-or a contract creation (``new ContractName()``).
-Errors inside the expression are not caught (for example if it is a complex expression
-that also involves internal function calls), only a revert happening inside the external
-call itself. The ``returns`` part (which is optional) that follows declares return variables
-matching the types returned by the external call. In case there was no error,
-these variables are assigned and the contract's execution continues inside the
-first success block. If the end of the success block is reached, execution continues after the ``catch`` blocks.
+``try`` 关键字��必须有一个表达�，代表外部函数调用或�约建（ ``new ContractName()`` ）。
+表达�中的错误�会被�获（例如，如果它是一个��的表达�，也涉�到内部函数调用），
+�有外部调用本身�生��。
+接下�的 ``returns`` 部分（是�选的）声明了与外部调用返回的类型相匹�的返回��。
+如果没有错误，这些��将被分�，�约执行将在第一个�功代��内继续。
+如果到达�功代��的末端，则在 ``catch`` �之�继续执行。
 
-Solidity supports different kinds of catch blocks depending on the
-type of error:
+Solidity 根�错误的类型，支����类的�获�：
 
-- ``catch Error(string memory reason) { ... }``: This catch clause is executed if the error was caused by ``revert("reasonString")`` or
-  ``require(false, "reasonString")`` (or an internal error that causes such an
-  exception).
+- ``catch Error(string memory reason) { ... }``： 这个catch��会被执行，
+  如果错误是由 ``revert("reasonString")`` 或 ``require(false, "reasonString")`` 造�的
+  （或内部错误造�的）。
 
-- ``catch Panic(uint errorCode) { ... }``: If the error was caused by a panic, i.e. by a failing ``assert``, division by zero,
-  invalid array access, arithmetic overflow and others, this catch clause will be run.
+- ``catch Panic(uint errorCode) { ... }``： 如果错误是由Panic异常引起的，
+  例如由失败的 ``assert``�除以0�无效的数组访问�算术溢出和其他原因引起的，这个catch��将被�行。
 
-- ``catch (bytes memory lowLevelData) { ... }``: This clause is executed if the error signature
-  does not match any other clause, if there was an error while decoding the error
-  message, or
-  if no error data was provided with the exception.
-  The declared variable provides access to the low-level error data in that case.
+- ``catch (bytes memory lowLevelData) { ... }``： 如果错误签�与其他���匹�，
+  或者在解�错误信�时出现了错误，或者没有与异常一起�供错误数�，
+  那么这个��就会被执行。在这�情况下，声明的���供了对低级错误数�的访问。
 
-- ``catch { ... }``: If you are not interested in the error data, you can just use
-  ``catch { ... }`` (even as the only catch clause) instead of the previous clause.
+- ``catch { ... }``： 如果您对错误数��感兴趣，您�以直接使用
+  ``catch { ... }`` （甚至作为唯一的catch��）�代替��的��。
 
 
-It is planned to support other types of error data in the future.
-The strings ``Error`` and ``Panic`` are currently parsed as is and are not treated as identifiers.
+计划在未�支�其他类型的错误数�。字符串 ``Error`` 和 ``Panic`` 目�是按原样解�的，�作为标识符处�。
 
-In order to catch all error cases, you have to have at least the clause
-``catch { ...}`` or the clause ``catch (bytes memory lowLevelData) { ... }``.
+为了��所有的错误情况，您至少�有 ``catch { ...}`` 或 ``catch (bytes memory lowLevelData) { ... }`` ��。
 
-The variables declared in the ``returns`` and the ``catch`` clause are only
-in scope in the block that follows.
+在 ``returns`` 和 ``catch`` ��中声明的���在��的代��中有作用域。
 
 .. note::
 
-    If an error happens during the decoding of the return data
-    inside a try/catch-statement, this causes an exception in the currently
-    executing contract and because of that, it is not caught in the catch clause.
-    If there is an error during decoding of ``catch Error(string memory reason)``
-    and there is a low-level catch clause, this error is caught there.
+    如果在 try/catch 语�内部的返回数�解�过程中�生错误，
+    这将导致当�执行的�约出现异常，正因为如此，它�会在catch��中被�获。
+    如果在 ``catch Error(string memory reason)`` 的解�过程中出现错误，
+    并且有一个低级的catch��，那么这个错误就会在那里被�获。
 
 .. note::
 
-    If execution reaches a catch-block, then the state-changing effects of
-    the external call have been reverted. If execution reaches
-    the success block, the effects were not reverted.
-    If the effects have been reverted, then execution either continues
-    in a catch block or the execution of the try/catch statement itself
-    reverts (for example due to decoding failures as noted above or
-    due to not providing a low-level catch clause).
+    如果执行到一个catch代��，那么外部调用的状�改�效果已�被��。
+    如果执行到了�功代��，那么这些影�就没有被还原。
+    如果影�已�被还原，那么执行�么在catch代��中继续，
+    �么try/catch语�的执行本身被还原（例如由于上��到的解�失败或者由于没有�供低级别的catch��）。
 
 .. note::
-    The reason behind a failed call can be manifold. Do not assume that
-    the error message is coming directly from the called contract:
-    The error might have happened deeper down in the call chain and the
-    called contract just forwarded it. Also, it could be due to an
-    out-of-gas situation and not a deliberate error condition:
-    The caller always retains at least 1/64th of the gas in a call and thus
-    even if the called contract goes out of gas, the caller still
-    has some gas left.
+    调用失败背�的原因�能是多方�的。��认为错误信�是直接�自被调用的�约：
+    错误�能�生在调用链的更深处，被调用的�约�是转�了它。
+    �外，这�能是由于消耗完气体值的情况，而�是故�的错误状况。
+    调用方总是�留调用中至少1/64的气体值，
+    因此，�使被调用�约没有气体了，调用方�然有一些气体。
diff --git a/docs/examples/blind-auction.rst b/docs/examples/blind-auction.rst
index 47e19033f9ae..24a588e8cf9b 100644
--- a/docs/examples/blind-auction.rst
+++ b/docs/examples/blind-auction.rst
@@ -1,72 +1,74 @@
 .. index:: auction;blind, auction;open, blind auction, open auction
 
-*************
-Blind Auction
-*************
+****************
+盲�（秘密竞价）
+****************
 
-In this section, we will show how easy it is to create a completely blind
-auction contract on Ethereum.  We will start with an open auction where
-everyone can see the bids that are made and then extend this contract into a
-blind auction where it is not possible to see the actual bid until the bidding
-period ends.
+在本节中，我们将展示如何轻�地在以太�上创建一个盲�的�约。
+我们将从一个公开��开始，�个人都�以看到出价，
+然�将此�约扩展到盲��约， 在竞标期结�之�无法看到实际出价。
 
 .. _simple_auction:
 
-Simple Open Auction
+简�的公开��
 ===================
 
+<<<<<<< HEAD
+下�这个简�的���约的总体�路是，�个人都�以在竞标期间��他们的竞标。
+竞标已�包括��资金/以太�，以便将竞标者与他们的竞标绑定。
+如果最高出价被�高，之�的最高出价者就会拿回他们的钱。
+竞价期结��，�益人需�手动调用�约，�能收到他们的钱 - �约�能自己激活接收。
+=======
 The general idea of the following simple auction contract is that everyone can
 send their bids during a bidding period. The bids already include sending some compensation,
 e.g. Ether, in order to bind the bidders to their bid. If the highest bid is
 raised, the previous highest bidder gets their Ether back.  After the end of
 the bidding period, the contract has to be called manually for the beneficiary
 to receive their Ether - contracts cannot activate themselves.
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.8.4;
     contract SimpleAuction {
-        // Parameters of the auction. Times are either
-        // absolute unix timestamps (seconds since 1970-01-01)
-        // or time periods in seconds.
+        // ��的�数。
+        // 时间是 unix 的�对时间戳（自1970-01-01以�的秒数）
+        // 或以秒为��的时间段。
         address payable public beneficiary;
         uint public auctionEndTime;
 
-        // Current state of the auction.
+        // ��的当�状�。
         address public highestBidder;
         uint public highestBid;
 
-        // Allowed withdrawals of previous bids
+        // �许�回以�的竞标。
         mapping(address => uint) pendingReturns;
 
-        // Set to true at the end, disallows any change.
-        // By default initialized to `false`.
+        // ��结��设为 `true`，将�止所有的�更
+        // 默认�始化为 `false`。
         bool ended;
 
-        // Events that will be emitted on changes.
+        // �化时将会�出的事件。
         event HighestBidIncreased(address bidder, uint amount);
         event AuctionEnded(address winner, uint amount);
 
-        // Errors that describe failures.
+        // �述失败的错误信�。
 
-        // The triple-slash comments are so-called natspec
-        // comments. They will be shown when the user
-        // is asked to confirm a transaction or
-        // when an error is displayed.
+        // 三斜线的注释是所谓的 natspec 注释。
+        // 当用户被�求确认一个交易或显示一个错误时，它们将被显示。
 
-        /// The auction has already ended.
+        /// 竞�已�结�。
         error AuctionAlreadyEnded();
-        /// There is already a higher or equal bid.
+        /// 已�有一个更高的或相等的出价。
         error BidNotHighEnough(uint highestBid);
-        /// The auction has not ended yet.
+        /// 竞�还没有结�。
         error AuctionNotYetEnded();
-        /// The function auctionEnd has already been called.
+        /// 函数 auctionEnd 已�被调用。
         error AuctionEndAlreadyCalled();
 
-        /// Create a simple auction with `biddingTime`
-        /// seconds bidding time on behalf of the
-        /// beneficiary address `beneficiaryAddress`.
+        /// 以�益者地� `beneficiaryAddress` 创建一个简�的��，
+        /// ��时长为 `_biddingTime`。
         constructor(
             uint biddingTime,
             address payable beneficiaryAddress
@@ -75,36 +77,43 @@ to receive their Ether - contracts cannot activate themselves.
             auctionEndTime = block.timestamp + biddingTime;
         }
 
-        /// Bid on the auction with the value sent
-        /// together with this transaction.
-        /// The value will only be refunded if the
-        /// auction is not won.
+        /// 对��进行出价，具体的出价�交易一起��。
+        /// 如果没有在��中胜出，则返还出价。
         function bid() external payable {
-            // No arguments are necessary, all
-            // information is already part of
-            // the transaction. The keyword payable
-            // is required for the function to
-            // be able to receive Ether.
-
-            // Revert the call if the bidding
-            // period is over.
+            // �数�是必�的。因为所有的信�已�包�在了交易中。
+            // 关键字 `payable` 是函数能够接收以太�的必��件。
+
+            // 如果��已结�，撤销函数的调用。
             if (block.timestamp > auctionEndTime)
                 revert AuctionAlreadyEnded();
 
+<<<<<<< HEAD
+            // 如果出价�高，就把钱�回去
+            //（revert语�将��这个函数执行中的所有�化，
+            // 包括它已�收到钱）。
+=======
             // If the bid is not higher, send the
             // Ether back (the revert statement
             // will revert all changes in this
             // function execution including
             // it having received the Ether).
+>>>>>>> english/develop
             if (msg.value <= highestBid)
                 revert BidNotHighEnough(highestBid);
 
             if (highestBid != 0) {
+<<<<<<< HEAD
+                // 简�地使用 highestBidder.send(highestBid)
+                // 返还出价时，是有安全风险的，
+                // 因为它�能执行一个��信任的�约。
+                // 让接收方自己�钱总是比较安全的。
+=======
                 // Sending back the Ether by simply using
                 // highestBidder.send(highestBid) is a security risk
                 // because it could execute an untrusted contract.
                 // It is always safer to let the recipients
                 // withdraw their Ether themselves.
+>>>>>>> english/develop
                 pendingReturns[highestBidder] += highestBid;
             }
             highestBidder = msg.sender;
@@ -112,20 +121,20 @@ to receive their Ether - contracts cannot activate themselves.
             emit HighestBidIncreased(msg.sender, msg.value);
         }
 
-        /// Withdraw a bid that was overbid.
+        /// 撤回出价过高的竞标。
         function withdraw() external returns (bool) {
             uint amount = pendingReturns[msg.sender];
             if (amount > 0) {
-                // It is important to set this to zero because the recipient
-                // can call this function again as part of the receiving call
-                // before `send` returns.
+                // 将其设置为0是很��的，
+                // 因为接收者�以在 `send` 返回之��次调用这个函数
+                // 作为接收调用的一部分。
                 pendingReturns[msg.sender] = 0;
 
-                // msg.sender is not of type `address payable` and must be
-                // explicitly converted using `payable(msg.sender)` in order
-                // use the member function `send()`.
+                // msg.sender �属于 `address payable` 类型，
+                // 必须使用 `payable(msg.sender)` 明确转�，
+                // 以便使用�员函数 `send()`。
                 if (!payable(msg.sender).send(amount)) {
-                    // No need to call throw here, just reset the amount owing
+                    // 这里�需抛出异常，�需�置未付款
                     pendingReturns[msg.sender] = amount;
                     return false;
                 }
@@ -133,54 +142,51 @@ to receive their Ether - contracts cannot activate themselves.
             return true;
         }
 
-        /// End the auction and send the highest bid
-        /// to the beneficiary.
+        /// 结���，并把最高的出价��给�益人。
         function auctionEnd() external {
-            // It is a good guideline to structure functions that interact
-            // with other contracts (i.e. they call functions or send Ether)
-            // into three phases:
-            // 1. checking conditions
-            // 2. performing actions (potentially changing conditions)
-            // 3. interacting with other contracts
-            // If these phases are mixed up, the other contract could call
-            // back into the current contract and modify the state or cause
-            // effects (ether payout) to be performed multiple times.
-            // If functions called internally include interaction with external
-            // contracts, they also have to be considered interaction with
-            // external contracts.
-
-            // 1. Conditions
+            // 对于�与其他�约交互的函数（�味�它会调用其他函数或��以太�），
+            // 一个好的指导方针是将其结构分为三个阶段：
+            // 1. 检查�件
+            // 2. 执行动作 (�能会改��件)
+            // 3. 与其他�约交互
+            // 如果这些阶段相混�，其他的�约�能会回调当��约并修改状�，
+            // 或者导致�些效果（比如支付以太�）多次生效。
+            // 如果�约内调用的函数包�了与外部�约的交互，
+            // 则它也会被认为是与外部�约有交互的。
+
+            // 1. �件
             if (block.timestamp < auctionEndTime)
                 revert AuctionNotYetEnded();
             if (ended)
                 revert AuctionEndAlreadyCalled();
 
-            // 2. Effects
+            // 2. 影�
             ended = true;
             emit AuctionEnded(highestBidder, highestBid);
 
-            // 3. Interaction
+            // 3. 交互
             beneficiary.transfer(highestBid);
         }
     }
 
-Blind Auction
-=============
+盲�（秘密竞�）
+================
 
-The previous open auction is extended to a blind auction in the following. The
-advantage of a blind auction is that there is no time pressure towards the end
-of the bidding period. Creating a blind auction on a transparent computing
-platform might sound like a contradiction, but cryptography comes to the
-rescue.
+之�的公开��接下�将被扩展为盲目��。
+盲�的好处是，在竞价期�将结�时没有时间压力。
+在一个�明的计算平�上创建一个盲��能�起�是一个矛盾，但加密技术�以实现它。
 
-During the **bidding period**, a bidder does not actually send their bid, but
-only a hashed version of it.  Since it is currently considered practically
-impossible to find two (sufficiently long) values whose hash values are equal,
-the bidder commits to the bid by that.  After the end of the bidding period,
-the bidders have to reveal their bids: They send their values unencrypted, and
-the contract checks that the hash value is the same as the one provided during
-the bidding period.
+在 **竞标期间**，竞标者实际上并没有��他们的出价，
+而�是��一个哈希版本的出价。 由于目�几乎��能找到两个（足够长的）值，
+其哈希值是相等的，因此竞标者�通过该方��交报价。 在竞标结��，
+竞标者必须公开他们的出价：他们��未加密的值，
+�约检查出价的哈希值是�与竞标期间�供的值相�。
 
+<<<<<<< HEAD
+�一个挑战是如何使���时�到 **绑定和秘密** ：
+唯一能阻止竞标者在赢得����付款的方�是，让他们将钱和竞标一起�出。
+但由于资金转移在以太�中�能被��，因此任何人都�以看到转移的资金。
+=======
 Another challenge is how to make the auction **binding and blind** at the same
 time: The only way to prevent the bidder from just not sending the Ether after
 they won the auction is to make them send it together with the bid. Since value
@@ -192,7 +198,12 @@ the reveal phase, some bids might be **invalid**, and this is on purpose (it
 even provides an explicit flag to place invalid bids with high-value
 transfers): Bidders can confuse competition by placing several high or low
 invalid bids.
+>>>>>>> english/develop
 
+下�的�约通过接�任何大于最高出价的值�解决这个问题。
+当然，因为这�能在�示阶段进行检查，有些出价�能是 **无效** 的，
+而这是有目的的（它甚至�供了一个明确的标志，以便在高价值的转移中进行无效的出价）：
+竞标者�以通过设置几个或高或低的无效出价�迷惑竞争对手。
 
 .. code-block:: solidity
     :force:
@@ -215,26 +226,25 @@ invalid bids.
         address public highestBidder;
         uint public highestBid;
 
-        // Allowed withdrawals of previous bids
+        // �许�回以�的竞标。
         mapping(address => uint) pendingReturns;
 
         event AuctionEnded(address winner, uint highestBid);
 
-        // Errors that describe failures.
+        // �述失败的错误信�。
 
-        /// The function has been called too early.
-        /// Try again at `time`.
+        /// 该函数被过早调用。
+        /// 在 `time` 时间�试一次。
         error TooEarly(uint time);
-        /// The function has been called too late.
-        /// It cannot be called after `time`.
+        /// 该函数被过晚调用。
+        /// 它�能在 `time` 时间之�被调用。
         error TooLate(uint time);
-        /// The function auctionEnd has already been called.
+        /// 函数 auctionEnd 已�被调用。
         error AuctionEndAlreadyCalled();
 
-        // Modifiers are a convenient way to validate inputs to
-        // functions. `onlyBefore` is applied to `bid` below:
-        // The new function body is the modifier's body where
-        // `_` is replaced by the old function body.
+        // 使用 修饰符（modifier） �以更便�的校验函数的入�。
+        // `onlyBefore` 会被用于��的 `bid` 函数：
+        // 新的函数体是由 modifier 本身的函数体，其中`_`被旧的函数体所�代。
         modifier onlyBefore(uint time) {
             if (block.timestamp >= time) revert TooLate(time);
             _;
@@ -254,15 +264,13 @@ invalid bids.
             revealEnd = biddingEnd + revealTime;
         }
 
-        /// Place a blinded bid with `blindedBid` =
-        /// keccak256(abi.encodePacked(value, fake, secret)).
-        /// The sent ether is only refunded if the bid is correctly
-        /// revealed in the revealing phase. The bid is valid if the
-        /// ether sent together with the bid is at least "value" and
-        /// "fake" is not true. Setting "fake" to true and sending
-        /// not the exact amount are ways to hide the real bid but
-        /// still make the required deposit. The same address can
-        /// place multiple bids.
+        /// �以通过 `_blindedBid` = keccak256(value, fake, secret)
+        /// 设置一个盲�。
+        /// �有在出价披露阶段被正确披露，已��的以太��会被退还。
+        /// 如果与出价一起��的以太�至少为 "value" 且 "fake" �为真，则出价有效。
+        /// 将 "fake" 设置为 true ，
+        /// 然���满足订金金�但��与出价相�的金�是��实际出价的方法。
+        /// �一个地��以放置多个出价。
         function bid(bytes32 blindedBid)
             external
             payable
@@ -274,9 +282,8 @@ invalid bids.
             }));
         }
 
-        /// Reveal your blinded bids. You will get a refund for all
-        /// correctly blinded invalid bids and for all bids except for
-        /// the totally highest.
+        /// 披露你的盲�出价。
+        /// 对于所有正确披露的无效出价以�除最高出价以外的所有出价，您都将获得退款。
         function reveal(
             uint[] calldata values,
             bool[] calldata fakes,
@@ -297,8 +304,8 @@ invalid bids.
                 (uint value, bool fake, bytes32 secret) =
                         (values[i], fakes[i], secrets[i]);
                 if (bidToCheck.blindedBid != keccak256(abi.encodePacked(value, fake, secret))) {
-                    // Bid was not actually revealed.
-                    // Do not refund deposit.
+                    // 出价未能正确披露。
+                    // �返还订金。
                     continue;
                 }
                 refund += bidToCheck.deposit;
@@ -306,29 +313,27 @@ invalid bids.
                     if (placeBid(msg.sender, value))
                         refund -= value;
                 }
-                // Make it impossible for the sender to re-claim
-                // the same deposit.
+                // 使��者��能�次认领�一笔订金。
                 bidToCheck.blindedBid = bytes32(0);
             }
             payable(msg.sender).transfer(refund);
         }
 
-        /// Withdraw a bid that was overbid.
+        /// 撤回出价过高的竞标。
         function withdraw() external {
             uint amount = pendingReturns[msg.sender];
             if (amount > 0) {
-                // It is important to set this to zero because the recipient
-                // can call this function again as part of the receiving call
-                // before `transfer` returns (see the remark above about
-                // conditions -> effects -> interaction).
+                // 这里很��，首先�设零值。
+                // 因为，作为接收调用的一部分，
+                // 接收者�以在 `transfer` 返回之��新调用该函数。
+                //（�查看上�关于 �件 -> 影� -> 交互 的标注）
                 pendingReturns[msg.sender] = 0;
 
                 payable(msg.sender).transfer(amount);
             }
         }
 
-        /// End the auction and send the highest bid
-        /// to the beneficiary.
+        /// 结���，并把最高的出价��给�益人。
         function auctionEnd()
             external
             onlyAfter(revealEnd)
@@ -339,9 +344,8 @@ invalid bids.
             beneficiary.transfer(highestBid);
         }
 
-        // This is an "internal" function which means that it
-        // can only be called from the contract itself (or from
-        // derived contracts).
+        // 这是一个 "internal" 函数，
+        // �味�它�能在本�约（或继承�约）内被调用。
         function placeBid(address bidder, uint value) internal
                 returns (bool success)
         {
@@ -349,7 +353,7 @@ invalid bids.
                 return false;
             }
             if (highestBidder != address(0)) {
-                // Refund the previously highest bidder.
+                // 返还之�的最高出价
                 pendingReturns[highestBidder] += highestBid;
             }
             highestBid = value;
diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index 50f28005bfd6..b3777dca80fe 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -1,84 +1,92 @@
-********************
-Micropayment Channel
-********************
+**********
+微支付通�
+**********
 
-In this section, we will learn how to build an example implementation
-of a payment channel. It uses cryptographic signatures to make
-repeated transfers of Ether between the same parties secure, instantaneous, and
-without transaction fees. For the example, we need to understand how to
-sign and verify signatures, and setup the payment channel.
+在这一节中，我们将学习如何建立一个支付通�的实施实例。
+它使用加密签�，使以太�在�一当事人之间的��转移�得安全��时，并且没有交易费用。
+对于这个例�，我们需�了解如何签�和验�签�，并设置支付通�。
 
-Creating and verifying signatures
-=================================
+创建和验�签�
+==============
 
-Imagine Alice wants to send some Ether to Bob, i.e.
-Alice is the sender and Bob is the recipient.
+想象一下，Alice想��一些以太给Bob，
+�Alice是��方，Bob是接收方。
 
-Alice only needs to send cryptographically signed messages off-chain
-(e.g. via email) to Bob and it is similar to writing checks.
+Alice �需�在链下���过加密签�的信�
+(例如通过电�邮件)给Bob，它类似于写支票。
 
-Alice and Bob use signatures to authorize transactions, which is possible with smart contracts on Ethereum.
-Alice will build a simple smart contract that lets her transmit Ether, but instead of calling a function herself
-to initiate a payment, she will let Bob do that, and therefore pay the transaction fee.
+Alice和Bob使用签��授�交易，这在以太�的智能�约中是�以实现的。
+Alice将建立一个简�的智能�约，让她传输以太�，但她�会自己调用一个函数��动付款，
+而是让Bob��，从而支付交易费用。
 
-The contract will work as follows:
+该�约将按以下方��作：
 
-    1. Alice deploys the ``ReceiverPays`` contract, attaching enough Ether to cover the payments that will be made.
-    2. Alice authorizes a payment by signing a message with her private key.
-    3. Alice sends the cryptographically signed message to Bob. The message does not need to be kept secret
-       (explained later), and the mechanism for sending it does not matter.
-    4. Bob claims his payment by presenting the signed message to the smart contract, it verifies the
-       authenticity of the message and then releases the funds.
+    1. Alice部署了 ``ReceiverPays`` �约，附加了足够的以太��支付将�进行的付款。
+    2. Alice通过用她的�钥签署一个消��授�付款。
+    3. Alice将�过加密签�的信���给Bob。该信��需��密（��会解释），而且��机制也���。
+    4. Bob通过�智能�约��签�的信��索�他的付款，�约验�了信�的真实性，然�释放资金。
 
-Creating the signature
-----------------------
+创建签�
+--------
 
-Alice does not need to interact with the Ethereum network
-to sign the transaction, the process is completely offline.
-In this tutorial, we will sign messages in the browser
-using `web3.js <https://github.com/web3/web3.js>`_ and
-`MetaMask <https://metamask.io>`_, using the method described in `EIP-712 <https://github.com/ethereum/EIPs/pull/712>`_,
-as it provides a number of other security benefits.
+Alice�需�与以太�网络交互�签署交易，这个过程是完全离线的。
+在本教程中，我们将使用 `web3.js <https://github.com/web3/web3.js>`_ 和
+`MetaMask <https://metamask.io>`_ 在�览器中签署信�。
+使用 `EIP-712 <https://github.com/ethereum/EIPs/pull/712>`_ 中�述的方法，
+因为它�供了许多其他安全优势。
 
 .. code-block:: javascript
 
-    /// Hashing first makes things easier
+    /// 先进行哈希�算使事情�得更容易
     var hash = web3.utils.sha3("message to sign");
     web3.eth.personal.sign(hash, web3.eth.defaultAccount, function () { console.log("Signed"); });
 
 .. note::
-  The ``web3.eth.personal.sign`` prepends the length of the
-  message to the signed data. Since we hash first, the message
-  will always be exactly 32 bytes long, and thus this length
-  prefix is always the same.
+  ``web3.eth.personal.sign`` 把信�的长度加到签�数�中。
+  由于我们先进行哈希�算，消�的长度总是正好是32字节，
+  因此这个长度�缀总是相�的。
 
-What to Sign
+签署内容
 ------------
 
-For a contract that fulfils payments, the signed message must include:
-
-    1. The recipient's address.
-    2. The amount to be transferred.
-    3. Protection against replay attacks.
-
-A replay attack is when a signed message is reused to claim
-authorization for a second action. To avoid replay attacks
-we use the same technique as in Ethereum transactions themselves,
-a so-called nonce, which is the number of transactions sent by
-an account. The smart contract checks if a nonce is used multiple times.
-
-Another type of replay attack can occur when the owner
-deploys a ``ReceiverPays`` smart contract, makes some
-payments, and then destroys the contract. Later, they decide
-to deploy the ``RecipientPays`` smart contract again, but the
-new contract does not know the nonces used in the previous
-deployment, so the attacker can use the old messages again.
-
-Alice can protect against this attack by including the
-contract's address in the message, and only messages containing
-the contract's address itself will be accepted. You can find
-an example of this in the first two lines of the ``claimPayment()``
-function of the full contract at the end of this section.
+<<<<<<< HEAD
+对于履行付款的��，签署的信�必须包括：
+=======
+For a contract that fulfills payments, the signed message must include:
+>>>>>>> english/develop
+
+    1. 收件人的钱包地�。
+    2. �转移的金�。
+    3. �放攻击的�护。
+
+�放攻击是指一个已签署的信�被��使用，以获得对第二次交易的授�。
+为了���放攻击，我们使用与以太�交易本身相�的技术，
+�所谓的nonce，它是一个账户��的交易数�。
+智能�约会检查一个nonce是�被多次使用。
+
+�一�类型的�放攻击�能�生在所有者部署 ``ReceiverPays`` �约时，
+先进行了一些支付，然�销�该�约。��，
+他们决定�次部署 ``RecipientPays`` �约，
+但新的�约�知�以��约中使用的nonces，所以攻击者�以�次使用旧的信�。
+
+Alice�以通过在消�中包��约的地��防止这�攻击，
+并且�有包��约地�本身的消��会被接�。
+您�以在本节末尾的完整�约的 ``claimPayment()`` 函数的�两行找到这个例�。
+
+<<<<<<< HEAD
+组装�数
+---------
+
+既然我们已�确定了�在签�信�中包�哪些信�，
+我们准备把信�放在一起，进行哈希�算，然�签�。
+简�起�，我们把数�连接起�。
+`ethereumjs-abi <https://github.com/ethereumjs/ethereumjs-abi>`_ 库�供了一个�为 ``soliditySHA3`` 的函数，
+模仿Solidity的 ``keccak256`` 函数应用于使用 ``abi.encodePacked`` 编�的�数的行为。
+这里有一个JavaScript函数，为 ``ReceiverPays`` 的例�创建了适当的签�。
+=======
+Furthermore, instead of destroying the contract by calling ``selfdestruct``,
+which is currently deprecated, we will disable the contract's functionalities by freezing it,
+resulting in the reversion of any call after it being frozen.
 
 Packing arguments
 -----------------
@@ -89,13 +97,14 @@ we concatenate the data. The `ethereumjs-abi <https://github.com/ethereumjs/ethe
 library provides a function called ``soliditySHA3`` that mimics the behavior of
 Solidity's ``keccak256`` function applied to arguments encoded using ``abi.encodePacked``.
 Here is a JavaScript function that creates the proper signature for the ``ReceiverPays`` example:
+>>>>>>> english/develop
 
 .. code-block:: javascript
 
-    // recipient is the address that should be paid.
-    // amount, in wei, specifies how much ether should be sent.
-    // nonce can be any unique number to prevent replay attacks
-    // contractAddress is used to prevent cross-contract replay attacks
+    // recipient， 是应该被支付的地�。
+    // amount，��是 wei, 指定应该��多少ether。
+    // nonce， �以是任何唯一的数字，以防止�放攻击。
+    // contractAddress， 用于防止跨�约的�放攻击。
     function signPayment(recipient, amount, nonce, contractAddress, callback) {
         var hash = "0x" + abi.soliditySHA3(
             ["address", "uint256", "uint256", "address"],
@@ -105,72 +114,104 @@ Here is a JavaScript function that creates the proper signature for the ``Receiv
         web3.eth.personal.sign(hash, web3.eth.defaultAccount, callback);
     }
 
-Recovering the Message Signer in Solidity
------------------------------------------
-
-In general, ECDSA signatures consist of two parameters,
-``r`` and ``s``. Signatures in Ethereum include a third
-parameter called ``v``, that you can use to verify which
-account's private key was used to sign the message, and
-the transaction's sender. Solidity provides a built-in
-function :ref:`ecrecover <mathematical-and-cryptographic-functions>` that
-accepts a message along with the ``r``, ``s`` and ``v`` parameters
-and returns the address that was used to sign the message.
-
-Extracting the Signature Parameters
------------------------------------
-
-Signatures produced by web3.js are the concatenation of ``r``,
-``s`` and ``v``, so the first step is to split these parameters
-apart. You can do this on the client-side, but doing it inside
-the smart contract means you only need to send one signature
-parameter rather than three. Splitting apart a byte array into
-its constituent parts is a mess, so we use
-:doc:`inline assembly <assembly>` to do the job in the ``splitSignature``
-function (the third function in the full contract at the end of this section).
-
-Computing the Message Hash
+在Solidity中��信�签�者
 --------------------------
 
-The smart contract needs to know exactly what parameters were signed, and so it
-must recreate the message from the parameters and use that for signature verification.
-The functions ``prefixed`` and ``recoverSigner`` do this in the ``claimPayment`` function.
+一般�说，ECDSA的签�由两个�数组�， ``r`` 和 ``s``。
+以太�的签�包括第三个�数 ``v`` ，您�以用它�验�是哪个账户的�钥被用�签署信�，
+以�作为交易的��者。Solidity �供了一个内置函数
+:ref:`ecrecover <mathematical-and-cryptographic-functions>`，
+它接�一个消�以� ``r``, ``s`` 和 ``v`` �数，然�返回用于签署该消�的地�。
+
+��签��数
+------------
+
+web3.js 产生的签�是 ``r``, ``s`` 和 ``v`` 的拼接的，
+所以第一步是把这些�数分开。您�以在客户端这样�，
+但在智能�约内这样��味�你�需���一个签��数而�是三个。
+将一个字节数组分割�它的组�部分是很麻烦的，
+所以我们在 ``splitSignature`` 函数中使用
+:doc:`inline assembly <assembly>` 完�这项工作（本节末尾的完整�约中的第三个函数）。
 
-The full contract
------------------
+
+计算信�哈希值
+--------------
+
+智能�约需�确切地知�哪些�数用于签�，
+因此它必须通过�数�新创建消�，并使用该消�进行签�验�。
+在 ``claimPayment`` 函数中，函数 ``prefixed`` 和 ``recoverSigner`` �了这件事。
+
+
+完整的�约
+----------
 
 .. code-block:: solidity
     :force:
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // This will report a warning due to deprecated selfdestruct
+<<<<<<< HEAD
+    // 这将报告一个由于废弃的 selfdestruct 而产生的警告
     contract ReceiverPays {
         address owner = msg.sender;
+=======
+>>>>>>> english/develop
+
+    contract Owned {
+        address payable owner;
+        constructor() {
+            owner = payable(msg.sender);
+        }
+    }
 
+    contract Freezable is Owned {
+        bool private _frozen = false;
+
+        modifier notFrozen() {
+            require(!_frozen, "Inactive Contract.");
+            _;
+        }
+
+        function freeze() internal {
+            if (msg.sender == owner)
+                _frozen = true;
+        }
+    }
+
+    contract ReceiverPays is Freezable {
         mapping(uint256 => bool) usedNonces;
 
         constructor() payable {}
 
-        function claimPayment(uint256 amount, uint256 nonce, bytes memory signature) external {
+        function claimPayment(uint256 amount, uint256 nonce, bytes memory signature)
+            external
+            notFrozen
+        {
             require(!usedNonces[nonce]);
             usedNonces[nonce] = true;
 
-            // this recreates the message that was signed on the client
+            // 这将�新创建在客户端上签�的信�。
             bytes32 message = prefixed(keccak256(abi.encodePacked(msg.sender, amount, nonce, this)));
-
             require(recoverSigner(message, signature) == owner);
-
             payable(msg.sender).transfer(amount);
         }
 
-        /// destroy the contract and reclaim the leftover funds.
+<<<<<<< HEAD
+        /// 销��约并收回剩余的资金。
         function shutdown() external {
+=======
+        /// freeze the contract and reclaim the leftover funds.
+        function shutdown()
+            external
+            notFrozen
+        {
+>>>>>>> english/develop
             require(msg.sender == owner);
-            selfdestruct(payable(msg.sender));
+            freeze();
+            payable(msg.sender).transfer(address(this).balance);
         }
 
-        /// signature methods.
+        /// 签�方法。
         function splitSignature(bytes memory sig)
             internal
             pure
@@ -179,11 +220,11 @@ The full contract
             require(sig.length == 65);
 
             assembly {
-                // first 32 bytes, after the length prefix.
+                // �32个字节，在长度�缀之�。
                 r := mload(add(sig, 32))
-                // second 32 bytes.
+                // 第二个32字节。
                 s := mload(add(sig, 64))
-                // final byte (first byte of the next 32 bytes).
+                // 最�一个字节（下一个32字节的第一个字节）。
                 v := byte(0, mload(add(sig, 96)))
             }
 
@@ -196,82 +237,75 @@ The full contract
             returns (address)
         {
             (uint8 v, bytes32 r, bytes32 s) = splitSignature(sig);
-
             return ecrecover(message, v, r, s);
         }
 
-        /// builds a prefixed hash to mimic the behavior of eth_sign.
+        /// 构建一个�缀哈希值，以模仿 eth_sign 的行为。
         function prefixed(bytes32 hash) internal pure returns (bytes32) {
             return keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", hash));
         }
     }
 
 
-Writing a Simple Payment Channel
-================================
+编写一个简�的支付通��约
+============================
 
-Alice now builds a simple but complete implementation of a payment
-channel. Payment channels use cryptographic signatures to make
-repeated transfers of Ether securely, instantaneously, and without transaction fees.
+Alice现在建立了一个简�但完整的支付通�的实现。
+支付通�使用加密签��安全��时地��转移以太�，
+并且没有交易费用。
 
-What is a Payment Channel?
---------------------------
+什么是支付通�？
+----------------
 
-Payment channels allow participants to make repeated transfers of Ether
-without using transactions. This means that you can avoid the delays and
-fees associated with transactions. We are going to explore a simple
-unidirectional payment channel between two parties (Alice and Bob). It involves three steps:
+支付通��许�与者在�使用交易的情况下��转移以太�。
+这�味�，你�以��与交易相关的延迟和费用。
+我们将探讨两方（Alice和Bob）之间一个简�的��支付通�。它涉�三个步骤：
 
-    1. Alice funds a smart contract with Ether. This "opens" the payment channel.
-    2. Alice signs messages that specify how much of that Ether is owed to the recipient. This step is repeated for each payment.
-    3. Bob "closes" the payment channel, withdrawing his portion of the Ether and sending the remainder back to the sender.
+    1. Alice用以太�为智能�约�供资金。这就 "打开" 了支付通�。
+    2. Alice签署信�，说明欠接收者多少以太�。这个步骤对�一笔付款都���进行。
+    3. Bob "关闭" 支付通�，�出他的那部分以太�，并将剩余部分�回给��方。
 
 .. note::
-  Only steps 1 and 3 require Ethereum transactions, step 2 means that the sender
-  transmits a cryptographically signed message to the recipient via off chain
-  methods (e.g. email). This means only two transactions are required to support
-  any number of transfers.
-
-Bob is guaranteed to receive his funds because the smart contract escrows the
-Ether and honours a valid signed message. The smart contract also enforces a
-timeout, so Alice is guaranteed to eventually recover her funds even if the
-recipient refuses to close the channel. It is up to the participants in a payment
-channel to decide how long to keep it open. For a short-lived transaction,
-such as paying an internet café for each minute of network access, the payment
-channel may be kept open for a limited duration. On the other hand, for a
-recurring payment, such as paying an employee an hourly wage, the payment channel
-may be kept open for several months or years.
-
-Opening the Payment Channel
----------------------------
-
-To open the payment channel, Alice deploys the smart contract, attaching
-the Ether to be escrowed and specifying the intended recipient and a
-maximum duration for the channel to exist. This is the function
-``SimplePaymentChannel`` in the contract, at the end of this section.
-
-Making Payments
+  �有步骤1和3需�以太�交易，�味�步骤2中��方�以通过链下方法（如电�邮件）
+  �接收方��加密签�的信�。这�味��需�两个交易就�以支�任何数�的转移。
+
+Bob��会收到他的资金，因为智能�约托管了以太�，
+并兑现了一个有效的签�信�。智能�约也强制执行超时，
+所以�使接收者拒�关闭通�，Alice也能��最终收回她的资金。
+由支付通�的�与者决定��通�的开放时间。对于一个短暂的交易，
+如�网�支付�分钟的网络访问费，支付通��以��有�的开放时间。
+�一方�，对于�常性的支付，如�雇员支付��时的工资，
+支付渠��能会��开放几个月或几年。
+
+开通支付渠�
+------------
+
+为了开通支付通�，Alice部署了智能�约，
+添加了�托管的以太�，并指定了预期接收者和通�存在的最长时间。
+这就是本节末尾��中的函数 ``SimplePaymentChannel``。
+
+进行支付
 ---------------
 
-Alice makes payments by sending signed messages to Bob.
-This step is performed entirely outside of the Ethereum network.
-Messages are cryptographically signed by the sender and then transmitted directly to the recipient.
+Alice通过�Bob��签�信�进行支付。
+这一步骤完全在以太�网络之外进行。
+消�由��方加密签�，然�直接传�给接收方。
+
+��信�包括以下信�：
 
-Each message includes the following information:
+    * 智能�约的地�，用于防止跨�约�放攻击。
+    * 到目�为止，欠接收方的以太�的总金�。
 
-    * The smart contract's address, used to prevent cross-contract replay attacks.
-    * The total amount of Ether that is owed to the recipient so far.
+一个支付通��关闭一次，就是在一系列转账结��。
+正因为如此，所��的签�信�中�有一个能被赎回。
+这就是为什么��签�信�都指定了一个累计的以太�欠款总�，
+而�是�个��支付的金�。接收方自然会选择最新的签�信��赎回，
+因为那是总�最高的签�信�。�个签�信�的nonce��需�了，
+因为智能�约�兑现一个签�信�。
+智能�约的地��然被用�防止一个支付渠�的签�信�被用于�一个渠�。
 
-A payment channel is closed just once, at the end of a series of transfers.
-Because of this, only one of the messages sent is redeemed. This is why
-each message specifies a cumulative total amount of Ether owed, rather than the
-amount of the individual micropayment. The recipient will naturally choose to
-redeem the most recent message because that is the one with the highest total.
-The nonce per-message is not needed anymore, because the smart contract only
-honours a single message. The address of the smart contract is still used
-to prevent a message intended for one payment channel from being used for a different channel.
+下�是�过修改的JavaScript代�，用于对上一节中的信�进行加密签�：
 
-Here is the modified JavaScript code to cryptographically sign a message from the previous section:
 
 .. code-block:: javascript
 
@@ -290,8 +324,8 @@ Here is the modified JavaScript code to cryptographically sign a message from th
         );
     }
 
-    // contractAddress is used to prevent cross-contract replay attacks.
-    // amount, in wei, specifies how much Ether should be sent.
+    // contractAddress， 是用�防止跨��的�放攻击。
+    // amount，��是wei，指定了应该��多少以太。
 
     function signPayment(contractAddress, amount, callback) {
         var message = constructPaymentMessage(contractAddress, amount);
@@ -299,42 +333,57 @@ Here is the modified JavaScript code to cryptographically sign a message from th
     }
 
 
-Closing the Payment Channel
----------------------------
+关闭支付通�
+------------
 
+<<<<<<< HEAD
+当Bob准备好接收他的资金时，
+是时候通过调用智能�约上的 ``close`` 函数关闭支付通�了。
+关闭通�会�接收者支付欠他们的以太�，并销��约，
+将任何剩余的以太��回给Alice。
+为了关闭通�，Bob需��供一个由Alice签�的信�。
+=======
 When Bob is ready to receive his funds, it is time to
 close the payment channel by calling a ``close`` function on the smart contract.
 Closing the channel pays the recipient the Ether they are owed and
-destroys the contract, sending any remaining Ether back to Alice. To
+deactivates the contract by freezing it, sending any remaining Ether back to Alice. To
 close the channel, Bob needs to provide a message signed by Alice.
-
-The smart contract must verify that the message contains a valid signature from the sender.
-The process for doing this verification is the same as the process the recipient uses.
-The Solidity functions ``isValidSignature`` and ``recoverSigner`` work just like their
-JavaScript counterparts in the previous section, with the latter function borrowed from the ``ReceiverPays`` contract.
-
-Only the payment channel recipient can call the ``close`` function,
-who naturally passes the most recent payment message because that message
-carries the highest total owed. If the sender were allowed to call this function,
-they could provide a message with a lower amount and cheat the recipient out of what they are owed.
-
+>>>>>>> english/develop
+
+智能�约必须验�该消�是�包���者的有效签�。
+进行这�验�的过程与接收者使用签�的过程相�。
+Solidity函数 ``isValidSignature`` 和 ``recoverSigner`` 的工作方�
+与上一节中的JavaScript对应函数一样，而�者的函数是从 ``ReceiverPays`` �约中借用的。
+
+�有支付通�的接收者�以调用 ``close`` 函数，
+他们自然会传递最新的支付信�，因为该信�带有最高的欠款总�。
+如果�许��者调用这个函数，他们�以�供一个金�较低的签�消�，
+骗�接收者的欠款。
+
+<<<<<<< HEAD
+该函数会验�签�的信�与给定的�数是�相符。
+如果一切正常，接收者就会收到他们的那部分以太�，
+而剩下的以太�将通过 ``selfdestruct`` ��给��者。
+您�以在完整的�约中看到 ``close`` 函数。
+=======
 The function verifies the signed message matches the given parameters.
 If everything checks out, the recipient is sent their portion of the Ether,
-and the sender is sent the rest via a ``selfdestruct``.
+and the sender is sent the remaining funds via a ``transfer``.
 You can see the ``close`` function in the full contract.
+>>>>>>> english/develop
 
-Channel Expiration
--------------------
+通�到期
+--------
 
-Bob can close the payment channel at any time, but if they fail to do so,
-Alice needs a way to recover her escrowed funds. An *expiration* time was set
-at the time of contract deployment. Once that time is reached, Alice can call
-``claimTimeout`` to recover her funds. You can see the ``claimTimeout`` function in the full contract.
+Bob�以在任何时候关闭支付通�，但如果他们没有这样�，
+Alice需�一个方法�收回她的托管资金。在��部署的时候，设置了一个 *到期时间*。
+一旦达到这个时间，Alice�以调用 ``claimTimeout`` �收回她的资金。
+您�以在完整的�约中看到 ``claimTimeout`` 函数。
 
-After this function is called, Bob can no longer receive any Ether,
-so it is important that Bob closes the channel before the expiration is reached.
+在这个函数被调用�，Bob�能�接收任何以太。
+所以Bob必须在过期�关闭通�，这一点很��。
 
-The full contract
+完整的�约
 -----------------
 
 .. code-block:: solidity
@@ -342,11 +391,32 @@ The full contract
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // This will report a warning due to deprecated selfdestruct
+<<<<<<< HEAD
+    // 这将报告一个由于废弃的 selfdestruct 而产生的警告
     contract SimplePaymentChannel {
-        address payable public sender;      // The account sending payments.
-        address payable public recipient;   // The account receiving the payments.
-        uint256 public expiration;  // Timeout in case the recipient never closes.
+        address payable public sender;      // ��付款的账户。
+        address payable public recipient;   // 接收付款的账户。
+        uint256 public expiration;  // 超时时间，以防接收者永�关闭支付通�。
+=======
+
+    contract Frozeable {
+        bool private _frozen = false;
+
+        modifier notFrozen() {
+            require(!_frozen, "Inactive Contract.");
+            _;
+        }
+
+        function freeze() internal {
+            _frozen = true;
+        }
+    }
+
+    contract SimplePaymentChannel is Frozeable {
+        address payable public sender;    // The account sending payments.
+        address payable public recipient; // The account receiving the payments.
+        uint256 public expiration;        // Timeout in case the recipient never closes.
+>>>>>>> english/develop
 
         constructor (address payable recipientAddress, uint256 duration)
             payable
@@ -356,30 +426,58 @@ The full contract
             expiration = block.timestamp + duration;
         }
 
+<<<<<<< HEAD
+        /// 接收者�以在任何时候通过�供��者签�的金��关闭通�，
+        /// 接收者将获得该金�，其余部分将返回��者。
+        function close(uint256 amount, bytes memory signature) external {
+=======
         /// the recipient can close the channel at any time by presenting a
         /// signed amount from the sender. the recipient will be sent that amount,
         /// and the remainder will go back to the sender
-        function close(uint256 amount, bytes memory signature) external {
+        function close(uint256 amount, bytes memory signature)
+            external
+            notFrozen
+        {
+>>>>>>> english/develop
             require(msg.sender == recipient);
             require(isValidSignature(amount, signature));
 
             recipient.transfer(amount);
-            selfdestruct(sender);
+            freeze();
+            sender.transfer(address(this).balance);
         }
 
-        /// the sender can extend the expiration at any time
+<<<<<<< HEAD
+        /// ��者�以在任何时候延长到期时间。
         function extend(uint256 newExpiration) external {
+=======
+        /// the sender can extend the expiration at any time
+        function extend(uint256 newExpiration)
+            external
+            notFrozen
+        {
+>>>>>>> english/develop
             require(msg.sender == sender);
             require(newExpiration > expiration);
 
             expiration = newExpiration;
         }
 
+<<<<<<< HEAD
+        /// 如果达到超时时间而接收者没有关闭通�，
+        /// 那么以太就会被释放回给��者。
+        function claimTimeout() external {
+=======
         /// if the timeout is reached without the recipient closing the channel,
         /// then the Ether is released back to the sender.
-        function claimTimeout() external {
+        function claimTimeout()
+            external
+            notFrozen
+        {
+>>>>>>> english/develop
             require(block.timestamp >= expiration);
-            selfdestruct(sender);
+            freeze();
+            sender.transfer(address(this).balance);
         }
 
         function isValidSignature(uint256 amount, bytes memory signature)
@@ -388,14 +486,22 @@ The full contract
             returns (bool)
         {
             bytes32 message = prefixed(keccak256(abi.encodePacked(this, amount)));
+<<<<<<< HEAD
 
+            // 检查签�是��自付款方。
+            return recoverSigner(message, signature) == sender;
+        }
+
+        /// 下�的所有功能是�自 '创建和验�签�' 的章节。
+
+=======
             // check that the signature is from the payment sender
             return recoverSigner(message, signature) == sender;
         }
 
         /// All functions below this are just taken from the chapter
         /// 'creating and verifying signatures' chapter.
-
+>>>>>>> english/develop
         function splitSignature(bytes memory sig)
             internal
             pure
@@ -404,14 +510,13 @@ The full contract
             require(sig.length == 65);
 
             assembly {
-                // first 32 bytes, after the length prefix
+                // �32个字节，在长度�缀之�。
                 r := mload(add(sig, 32))
-                // second 32 bytes
+                // 第二个32字节。
                 s := mload(add(sig, 64))
-                // final byte (first byte of the next 32 bytes)
+                // 最�一个字节（下一个32字节的第一个字节）。
                 v := byte(0, mload(add(sig, 96)))
             }
-
             return (v, r, s);
         }
 
@@ -421,11 +526,10 @@ The full contract
             returns (address)
         {
             (uint8 v, bytes32 r, bytes32 s) = splitSignature(sig);
-
             return ecrecover(message, v, r, s);
         }
 
-        /// builds a prefixed hash to mimic the behavior of eth_sign.
+        /// 构建一个�缀哈希值，以模仿eth_sign的行为。
         function prefixed(bytes32 hash) internal pure returns (bytes32) {
             return keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", hash));
         }
@@ -433,34 +537,33 @@ The full contract
 
 
 .. note::
-  The function ``splitSignature`` does not use all security
-  checks. A real implementation should use a more rigorously tested library,
-  such as openzepplin's `version  <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/ECDSA.sol>`_ of this code.
+  函数 ``splitSignature`` 并没有使用所有的安全检查。
+  真正的实现应该使用更严格的测试库，例如openzepplin的
+  `这个版本 <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/ECDSA.sol>`_
+  的这个代�。
 
-Verifying Payments
-------------------
+验�付款
+--------
 
-Unlike in the previous section, messages in a payment channel aren't
-redeemed right away. The recipient keeps track of the latest message and
-redeems it when it's time to close the payment channel. This means it's
-critical that the recipient perform their own verification of each message.
-Otherwise there is no guarantee that the recipient will be able to get paid
-in the end.
+��与上一节，支付通�中的信��会马上被兑�。
+接收者会跟踪最新的信�，并在关闭支付通�的时候赎回它。
+这�味�接收者对��信�进行自行验�是至关��的。
+�则就�能��接收者最终能够得到付款。
 
-The recipient should verify each message using the following process:
+接收者应使用以下程�验���信�：
 
-    1. Verify that the contract address in the message matches the payment channel.
-    2. Verify that the new total is the expected amount.
-    3. Verify that the new total does not exceed the amount of Ether escrowed.
-    4. Verify that the signature is valid and comes from the payment channel sender.
+    1. 验�签�信�中的�约地�是�与支付通�相符。
+    2. 验�新的总�是�为预期的数�。
+    3. 确认新的总��超过代管的以太�数�。
+    4. 验�签�是�有效，是��自于支付通�的��方。
 
-We'll use the `ethereumjs-util <https://github.com/ethereumjs/ethereumjs-util>`_
-library to write this verification. The final step can be done a number of ways,
-and we use JavaScript. The following code borrows the ``constructPaymentMessage`` function from the signing **JavaScript code** above:
+我们将使用 `ethereumjs-util <https://github.com/ethereumjs/ethereumjs-util>`_
+库�编写这个验�。最�一步�以用多�方�完�，我们使用JavaScript。
+下�的代�借用了上� **JavaScript代�** 中加密签�的 ``constructPaymentMessage`` 函数。
 
 .. code-block:: javascript
 
-    // this mimics the prefixing behavior of the eth_sign JSON-RPC method.
+    // 这模拟了eth_sign 的JSON-RPC构建�缀的方法。
     function prefixed(hash) {
         return ethereumjs.ABI.soliditySHA3(
             ["string", "bytes32"],
diff --git a/docs/examples/modular.rst b/docs/examples/modular.rst
index 9ae2849cb4d8..0abcdf63e368 100644
--- a/docs/examples/modular.rst
+++ b/docs/examples/modular.rst
@@ -1,9 +1,20 @@
 .. index:: contract;modular, modular contract
 
-*****************
-Modular Contracts
-*****************
+***********
+模�化�约
+***********
 
+<<<<<<< HEAD
+用模�化的方法�构建您的�约，�以帮助�少��性，�高�读性，
+这将有助于在开�和代�审查中�现错误和�洞。
+如果您�独指定且控制�个模�的行为，您必须考虑的相互作用�是模�之间的相互作用，
+而�是�约的其他�个�活模�函数。
+在下�的例�中，�约使用 ``Balances`` :ref:`库 <libraries>` 的 ``move`` 方法
+�检查地�之间��的余�是�符�您的期望。通过这�方�， ``Balances`` 库�供了一个独立的组件，
+�以正确地跟踪账户的余�。
+很容易验� ``Balances`` 库永远�会产生负的余�或溢出，
+所有余�的总和在�约的有效期内是一个��的�。
+=======
 A modular approach to building your contracts helps you reduce the complexity
 and improve the readability which will help to identify bugs and vulnerabilities
 during development and code review.
@@ -16,6 +27,7 @@ addresses match what you expect. In this way, the ``Balances`` library
 provides an isolated component that properly tracks balances of accounts.
 It is easy to verify that the ``Balances`` library never produces negative balances or overflows
 and the sum of all balances is an invariant across the lifetime of the contract.
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
diff --git a/docs/examples/safe-remote.rst b/docs/examples/safe-remote.rst
index a2651af23882..aea51f1e4a99 100644
--- a/docs/examples/safe-remote.rst
+++ b/docs/examples/safe-remote.rst
@@ -1,9 +1,20 @@
 .. index:: purchase, remote purchase, escrow
 
 ********************
-Safe Remote Purchase
+安全的远程购买
 ********************
 
+<<<<<<< HEAD
+目�，远程购买商�需�多方相互信任。最简�的关系涉�一个�家和一个买家。
+买方希望从�方那里收到一件物�，�方希望得到金钱（或等价物）作为回报。
+这里�有问题的部分是的�输。没有办法确定物�是�到达买方手中。
+
+有多�方法�解决这个问题，但都有这样或那样的�足之处。
+在下�的例�中，�方都�把两�价值于物�的资金放入�约中作为托管。
+���生这�情况，钱就会一直�在��里�，直到买方确认收到物�。
+之�，买方会得到退回的资金（他们押金的一�），�方得到三�的资金（他们的押金加上物�的价值）。
+这背�的想法是，�方都有动力去解决这个问题，�则他们的钱就会被永远�定。
+=======
 Purchasing goods remotely currently requires multiple parties that need to trust each other.
 The simplest configuration involves a seller and a buyer. The buyer would like to receive
 an item from the seller and the seller would like to get some compensation, e.g. Ether,
@@ -18,9 +29,9 @@ the buyer is returned the value (half of their deposit) and the seller gets thre
 times the value (their deposit plus the value). The idea behind
 this is that both parties have an incentive to resolve the situation or otherwise
 their Ether is locked forever.
+>>>>>>> english/develop
 
-This contract of course does not solve the problem, but gives an overview of how
-you can use state machine-like constructs inside a contract.
+这个�约当然�能解决问题，但它概述了如何在�约内使用类似状�机的构造。
 
 
 .. code-block:: solidity
@@ -33,7 +44,7 @@ you can use state machine-like constructs inside a contract.
         address payable public buyer;
 
         enum State { Created, Locked, Release, Inactive }
-        // The state variable has a default value of the first member, `State.created`
+        // 状���的默认值是第一个�员，`State.created`。
         State public state;
 
         modifier condition(bool condition_) {
@@ -41,13 +52,13 @@ you can use state machine-like constructs inside a contract.
             _;
         }
 
-        /// Only the buyer can call this function.
+        /// �有买方�以调用这个函数。
         error OnlyBuyer();
-        /// Only the seller can call this function.
+        /// �有�方�以调用这个函数。
         error OnlySeller();
-        /// The function cannot be called at the current state.
+        /// 在当�状�下�能调用该函数。
         error InvalidState();
-        /// The provided value has to be even.
+        /// �供的值必须是�数。
         error ValueNotEven();
 
         modifier onlyBuyer() {
@@ -73,9 +84,9 @@ you can use state machine-like constructs inside a contract.
         event ItemReceived();
         event SellerRefunded();
 
-        // Ensure that `msg.value` is an even number.
-        // Division will truncate if it is an odd number.
-        // Check via multiplication that it wasn't an odd number.
+        // 确� `msg.value` 是一个�数。
+        // 如果是奇数，除法会截断。
+        // 通过乘法检查它�是一个奇数。
         constructor() payable {
             seller = payable(msg.sender);
             value = msg.value / 2;
@@ -83,9 +94,8 @@ you can use state machine-like constructs inside a contract.
                 revert ValueNotEven();
         }
 
-        /// Abort the purchase and reclaim the ether.
-        /// Can only be called by the seller before
-        /// the contract is locked.
+        /// 终止购买并收回 ether。
+        /// �能由�方在���定�能调用。
         function abort()
             external
             onlySeller
@@ -93,17 +103,16 @@ you can use state machine-like constructs inside a contract.
         {
             emit Aborted();
             state = State.Inactive;
-            // We use transfer here directly. It is
-            // reentrancy-safe, because it is the
-            // last call in this function and we
-            // already changed the state.
+            // 我们在这里直接使用 `transfer`。
+            // 它�以安全地�入。
+            // 因为它是这个函数中的最�一次调用，
+            // 而且我们已�改�了状�。
             seller.transfer(address(this).balance);
         }
 
-        /// Confirm the purchase as buyer.
-        /// Transaction has to include `2 * value` ether.
-        /// The ether will be locked until confirmReceived
-        /// is called.
+        /// 买方确认购买。
+        /// 交易必须包括 `2 * value` ether。
+        /// Ether 将被��，直到调用 confirmReceived。
         function confirmPurchase()
             external
             inState(State.Created)
@@ -115,33 +124,31 @@ you can use state machine-like constructs inside a contract.
             state = State.Locked;
         }
 
-        /// Confirm that you (the buyer) received the item.
-        /// This will release the locked ether.
+        /// 确认您（买方）已�收到了该物�。
+        /// 这将释放�定的 ether。
         function confirmReceived()
             external
             onlyBuyer
             inState(State.Locked)
         {
             emit ItemReceived();
-            // It is important to change the state first because
-            // otherwise, the contracts called using `send` below
-            // can call in again here.
+            // 首先改�状�是很��的，�则的�，
+            // 下�使用 `send` 调用的�约�以在这里�次调用。
             state = State.Release;
 
             buyer.transfer(value);
         }
 
-        /// This function refunds the seller, i.e.
-        /// pays back the locked funds of the seller.
+        /// 该功能为�家退款，
+        /// �退还�家�定的资金。
         function refundSeller()
             external
             onlySeller
             inState(State.Release)
         {
             emit SellerRefunded();
-            // It is important to change the state first because
-            // otherwise, the contracts called using `send` below
-            // can call in again here.
+            // 首先改�状�是很��的，�则的�，
+            // 下�使用 `send` 调用的�约�以在这里�次调用。
             state = State.Inactive;
 
             seller.transfer(3 * value);
diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index de899da7abcf..dd747e5d9ebb 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -2,77 +2,63 @@
 
 .. _voting:
 
-******
-Voting
-******
-
-The following contract is quite complex, but showcases
-a lot of Solidity's features. It implements a voting
-contract. Of course, the main problems of electronic
-voting is how to assign voting rights to the correct
-persons and how to prevent manipulation. We will not
-solve all problems here, but at least we will show
-how delegated voting can be done so that vote counting
-is **automatic and completely transparent** at the
-same time.
-
-The idea is to create one contract per ballot,
-providing a short name for each option.
-Then the creator of the contract who serves as
-chairperson will give the right to vote to each
-address individually.
-
-The persons behind the addresses can then choose
-to either vote themselves or to delegate their
-vote to a person they trust.
-
-At the end of the voting time, ``winningProposal()``
-will return the proposal with the largest number
-of votes.
+********
+投票�约
+********
+
+下�的�约相当��，但展示了Solidity的很多特性。
+它实现了一个投票�约。当然，
+电�投票的主�问题是如何将投票�分�给正确的人以�如何防止人为�纵。
+我们�会在这里解决所有的问题，但至少我们会展示如何进行委托投票，
+与此�时，使计票是 **自动且完全�明的。**
+
+我们的想法是为�张选票创建一份�约，
+为�个选项�供一个简称。
+然�，作为�约的创造者——�主席，
+将给予�个地��独的投票�。
+
+地���的人�以选择自己投票，或者委托给他们信任的人�投票。
+
+在投票时间结�时， ``winningProposal()`` 将返回拥有最大票数的�案。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    /// @title Voting with delegation.
+    /// @title 委托投票
     contract Ballot {
-        // This declares a new complex type which will
-        // be used for variables later.
-        // It will represent a single voter.
+        // 这声明了一个新的��类型，用于����。
+        // 它用�表示一个选民。
         struct Voter {
-            uint weight; // weight is accumulated by delegation
-            bool voted;  // if true, that person already voted
-            address delegate; // person delegated to
-            uint vote;   // index of the voted proposal
+            uint weight; // 计票的��
+            bool voted;  // 若为真，代表该人已投票
+            address delegate; // 被委托人
+            uint vote;   // 投票�案的索引
         }
 
-        // This is a type for a single proposal.
+        // �案的类型
         struct Proposal {
-            bytes32 name;   // short name (up to 32 bytes)
-            uint voteCount; // number of accumulated votes
+            bytes32 name;   // 简称（最长32个字节）
+            uint voteCount; // 得票数
         }
 
         address public chairperson;
-
-        // This declares a state variable that
-        // stores a `Voter` struct for each possible address.
+        // 这声明了一个状���，为�个�能的地�存储一个 `Voter`。
         mapping(address => Voter) public voters;
 
-        // A dynamically-sized array of `Proposal` structs.
+        // 一个 `Proposal` 结构类型的动�数组。
         Proposal[] public proposals;
 
-        /// Create a new ballot to choose one of `proposalNames`.
+        /// 为 `proposalNames` 中的�个�案，创建一个新的（投票）表决
         constructor(bytes32[] memory proposalNames) {
             chairperson = msg.sender;
             voters[chairperson].weight = 1;
 
-            // For each of the provided proposal names,
-            // create a new proposal object and add it
-            // to the end of the array.
+            // 对于�供的�个�案�称，
+            // 创建一个新的 Proposal 对象并把它添加到数组的末尾。
             for (uint i = 0; i < proposalNames.length; i++) {
-                // `Proposal({...})` creates a temporary
-                // Proposal object and `proposals.push(...)`
-                // appends it to the end of `proposals`.
+                // `Proposal({...})` 创建一个临时 Proposal 对象
+                // `proposals.push(...)` 将其添加到 `proposals` 的末尾
                 proposals.push(Proposal({
                     name: proposalNames[i],
                     voteCount: 0
@@ -80,19 +66,14 @@ of votes.
             }
         }
 
-        // Give `voter` the right to vote on this ballot.
-        // May only be called by `chairperson`.
+        // 给予 `voter` 在这张选票上投票的�利。
+        // �有 `chairperson` �以调用该函数。
         function giveRightToVote(address voter) external {
-            // If the first argument of `require` evaluates
-            // to `false`, execution terminates and all
-            // changes to the state and to Ether balances
-            // are reverted.
-            // This used to consume all gas in old EVM versions, but
-            // not anymore.
-            // It is often a good idea to use `require` to check if
-            // functions are called correctly.
-            // As a second argument, you can also provide an
-            // explanation about what went wrong.
+            // 若 `require` 的第一个�数的计算结果为 `false`，
+            // 则终止执行，撤销所有对状�和以太�余�的改动。
+            // 在旧版的 EVM 中这曾�会消耗所有 gas，但现在�会了。
+            // 使用 `require` �检查函数是�被正确地调用，通常是个好主�。
+            // 您也�以在 `require` 的第二个�数中�供一个对错误情况的解释。
             require(
                 msg.sender == chairperson,
                 "Only chairperson can give right to vote."
@@ -105,53 +86,48 @@ of votes.
             voters[voter].weight = 1;
         }
 
-        /// Delegate your vote to the voter `to`.
+        /// 把您的投票委托给投票者 `to`。
         function delegate(address to) external {
-            // assigns reference
+            // 指定引用
             Voter storage sender = voters[msg.sender];
             require(sender.weight != 0, "You have no right to vote");
             require(!sender.voted, "You already voted.");
 
             require(to != msg.sender, "Self-delegation is disallowed.");
 
-            // Forward the delegation as long as
-            // `to` also delegated.
-            // In general, such loops are very dangerous,
-            // because if they run too long, they might
-            // need more gas than is available in a block.
-            // In this case, the delegation will not be executed,
-            // but in other situations, such loops might
-            // cause a contract to get "stuck" completely.
+            // 委托是�以传递的，��被委托者 `to` 也设置了委托。
+            // 一般�说，这样的循环委托是�常�险的，因为如果传递的链�太长，
+            // �能需�消耗的gas就会超过一个区�中的�用数�。
+            // 这�情况下，委托�会被执行。
+            // 但在其他情况下，如果形�闭环，则会导致�约完全被 "��"。
             while (voters[to].delegate != address(0)) {
                 to = voters[to].delegate;
 
-                // We found a loop in the delegation, not allowed.
+                // ��许闭环委托
                 require(to != msg.sender, "Found loop in delegation.");
             }
 
             Voter storage delegate_ = voters[to];
 
-            // Voters cannot delegate to accounts that cannot vote.
+            // 投票者�能将投票�委托给�能投票的账户。
             require(delegate_.weight >= 1);
 
-            // Since `sender` is a reference, this
-            // modifies `voters[msg.sender]`.
+            // 由于 `sender` 是一个引用，
+            // 因此这会修改 `voters[msg.sender]`。
             sender.voted = true;
             sender.delegate = to;
 
             if (delegate_.voted) {
-                // If the delegate already voted,
-                // directly add to the number of votes
+                // 若被委托者已�投过票了，直接增加得票数。
                 proposals[delegate_.vote].voteCount += sender.weight;
             } else {
-                // If the delegate did not vote yet,
-                // add to her weight.
+                // 若被委托者还没投票，增加委托者的��。
                 delegate_.weight += sender.weight;
             }
         }
 
-        /// Give your vote (including votes delegated to you)
-        /// to proposal `proposals[proposal].name`.
+        /// 把您的票(包括委托给您的票)，
+        /// 投给�案 `proposals[proposal].name`。
         function vote(uint proposal) external {
             Voter storage sender = voters[msg.sender];
             require(sender.weight != 0, "Has no right to vote");
@@ -159,14 +135,12 @@ of votes.
             sender.voted = true;
             sender.vote = proposal;
 
-            // If `proposal` is out of the range of the array,
-            // this will throw automatically and revert all
-            // changes.
+            // 如果 `proposal` 超过了数组的范围，
+            // 则会自动抛出异常，并��所有的改动。
             proposals[proposal].voteCount += sender.weight;
         }
 
-        /// @dev Computes the winning proposal taking all
-        /// previous votes into account.
+        /// @dev 结�之�所有投票的情况下，计算出获胜的�案。
         function winningProposal() public view
                 returns (uint winningProposal_)
         {
@@ -179,9 +153,8 @@ of votes.
             }
         }
 
-        // Calls winningProposal() function to get the index
-        // of the winner contained in the proposals array and then
-        // returns the name of the winner
+        // 调用 `winningProposal()` 函数以获��案数组中获胜者的索引，
+        // 并以此返回获胜者的�称。
         function winnerName() external view
                 returns (bytes32 winnerName_)
         {
@@ -190,11 +163,9 @@ of votes.
     }
 
 
-Possible Improvements
+�能的优化
 =====================
 
-Currently, many transactions are needed to
-assign the rights to vote to all participants.
-Moreover, if two or more proposals have the same
-number of votes, ``winningProposal()`` is not able
-to register a tie. Can you think of a way to fix these issues?
\ No newline at end of file
+当�，为了把投票�分�给所有�与者，需�执行很多交易。
+此外，如果两个或更多的�案有相�的票数， ``winningProposal()`` 无法登记平局。
+您能想出一个办法�解决这些问题�？
diff --git a/docs/ext/remix_code_links.py b/docs/ext/remix_code_links.py
index 31a5667689b8..55fc0ef5c26f 100644
--- a/docs/ext/remix_code_links.py
+++ b/docs/ext/remix_code_links.py
@@ -27,10 +27,10 @@ def remix_code_url(source_code, language, solidity_version):
 
 def build_remix_link_node(url):
     reference_node = docutils.nodes.reference('', 'open in Remix', internal=False, refuri=url, target='_blank')
-    reference_node.set_class('remix-link')
+    reference_node['classes'].append('remix-link')
 
     paragraph_node = docutils.nodes.paragraph()
-    paragraph_node.set_class('remix-link-container')
+    paragraph_node['classes'].append('remix-link-container')
     paragraph_node.append(reference_node)
     return paragraph_node
 
diff --git a/docs/grammar.rst b/docs/grammar.rst
index 788b6d69504b..eba4f817eccc 100644
--- a/docs/grammar.rst
+++ b/docs/grammar.rst
@@ -1,5 +1,5 @@
 ****************
-Language Grammar
+语法
 ****************
 
 .. a4:autogrammar:: SolidityParser
@@ -10,4 +10,4 @@ Language Grammar
 .. a4:autogrammar:: SolidityLexer
    :only-reachable-from: SolidityParser.sourceUnit
    :fragments:
-   :cc-to-dash:
\ No newline at end of file
+   :cc-to-dash:
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 0452f9fa0bb6..1633bc01dc26 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -1,7 +1,7 @@
 lexer grammar SolidityLexer;
 
 /**
- * Keywords reserved for future use in Solidity.
+ * 为将�在Solidity中使用�留的关键字。
  */
 ReservedKeywords:
 	'after' | 'alias' | 'apply' | 'auto' | 'byte' | 'case' | 'copyof' | 'default' | 'define' | 'final'
@@ -28,14 +28,14 @@ Do: 'do';
 Else: 'else';
 Emit: 'emit';
 Enum: 'enum';
-Error: 'error'; // not a real keyword
+Error: 'error'; // �是真正的关键字
 Event: 'event';
 External: 'external';
 Fallback: 'fallback';
 False: 'false';
 Fixed: 'fixed' | ('fixed' [1-9][0-9]* 'x' [1-9][0-9]*);
 /**
- * Bytes types of fixed length.
+ * 固定长度的字节类型。
  */
 FixedBytes:
 	'bytes1' | 'bytes2' | 'bytes3' | 'bytes4' | 'bytes5' | 'bytes6' | 'bytes7' | 'bytes8' |
@@ -60,7 +60,7 @@ Memory: 'memory';
 Modifier: 'modifier';
 New: 'new';
 /**
- * Unit denomination for numbers.
+ * 数字的��计价。
  */
 SubDenomination: 'wei' | 'gwei' | 'ether' | 'seconds' | 'minutes' | 'hours' | 'days' | 'weeks' | 'years';
 Override: 'override';
@@ -74,8 +74,8 @@ Return: 'return';
 Returns: 'returns';
 Revert: 'revert'; // not a real keyword
 /**
- * Sized signed integer types.
- * int is an alias of int256.
+ * 有符�的整数类型。
+ * int是int256的一个别�。
  */
 SignedIntegerType:
 	'int' | 'int8' | 'int16' | 'int24' | 'int32' | 'int40' | 'int48' | 'int56' | 'int64' |
@@ -92,8 +92,8 @@ Ufixed: 'ufixed' | ('ufixed' [1-9][0-9]+ 'x' [1-9][0-9]+);
 Unchecked: 'unchecked';
 Unicode: 'unicode';
 /**
- * Sized unsigned integer types.
- * uint is an alias of uint256.
+ * 无符�整数类型。
+ * uint是uint256的一个别�。
  */
 UnsignedIntegerType:
 	'uint' | 'uint8' | 'uint16' | 'uint24' | 'uint32' | 'uint40' | 'uint48' | 'uint56' | 'uint64' |
@@ -163,32 +163,32 @@ DoubleQuote: '"';
 SingleQuote: '\'';
 
 /**
- * A non-empty quoted string literal restricted to printable characters.
+ * 一个�空的带引�的字符串字��，�制为�打�的字符。
  */
 NonEmptyStringLiteral: '"' DoubleQuotedStringCharacter+ '"' | '\'' SingleQuotedStringCharacter+ '\'';
 /**
- * An empty string literal
+ * 一个空的字符串字��
  */
 EmptyStringLiteral: '"' '"' | '\'' '\'';
 
-// Note that this will also be used for Yul string literals.
+// 请注�，这也将被用于Yul字符串字��。
 //@doc:inline
 fragment DoubleQuotedStringCharacter: DoubleQuotedPrintable | EscapeSequence;
-// Note that this will also be used for Yul string literals.
+// 请注�，这也将被用于Yul字符串字��。
 //@doc:inline
 fragment SingleQuotedStringCharacter: SingleQuotedPrintable | EscapeSequence;
 /**
- * Any printable character except single quote or back slash.
+ * 除�引�或�斜线外的任何�打�字符。
  */
 fragment SingleQuotedPrintable: [\u0020-\u0026\u0028-\u005B\u005D-\u007E];
 /**
- * Any printable character except double quote or back slash.
+ * 除�引�或�斜线外的任何�打�的字符。
  */
 fragment DoubleQuotedPrintable: [\u0020-\u0021\u0023-\u005B\u005D-\u007E];
 /**
-  * Escape sequence.
-  * Apart from common single character escape sequences, line breaks can be escaped
-  * as well as four hex digit unicode escapes \\uXXXX and two digit hex escape sequences \\xXX are allowed.
+  * 转义�列。
+  * 除了常�的�字符转义�列外，还�以转义�行，
+  * 以��许四个�六进制数字的unicode转义\\uXXXX和两个�六进制数字的转义�列\\xXX。
   */
 fragment EscapeSequence:
 	'\\' (
@@ -197,7 +197,7 @@ fragment EscapeSequence:
 		| 'x' HexCharacter HexCharacter
 	);
 /**
- * A single quoted string literal allowing arbitrary unicode characters.
+ * �引�字符串字��，�许任�的unicode字符。
  */
 UnicodeStringLiteral: 'unicode' (('"' DoubleQuotedUnicodeStringCharacter* '"') | ('\'' SingleQuotedUnicodeStringCharacter* '\''));
 //@doc:inline
@@ -205,13 +205,13 @@ fragment DoubleQuotedUnicodeStringCharacter: ~["\r\n\\] | EscapeSequence;
 //@doc:inline
 fragment SingleQuotedUnicodeStringCharacter: ~['\r\n\\] | EscapeSequence;
 
-// Note that this will also be used for Yul hex string literals.
+// 注�，这也将用于Yul�六进制字符串字��。
 /**
- * Hex strings need to consist of an even number of hex digits that may be grouped using underscores.
+ * �六进制字符串需�包��数个�六进制数字，�以使用下划线分组。
  */
 HexString: 'hex' (('"' EvenHexDigits? '"') | ('\'' EvenHexDigits? '\''));
 /**
- * Hex numbers consist of a prefix and an arbitrary number of hex digits that may be delimited by underscores.
+ * �六进制数字由�缀和�以用下划线分隔的任�数�的�六进制数字组�。
  */
 HexNumber: '0' 'x' HexDigits;
 //@doc:inline
@@ -222,17 +222,16 @@ fragment EvenHexDigits: HexCharacter HexCharacter ('_'? HexCharacter HexCharacte
 fragment HexCharacter: [0-9A-Fa-f];
 
 /**
- * Scanned but not used by any rule, i.e, disallowed.
- * solc parser considers number starting with '0', not immediately followed by '.' or 'x' as
- * octal, even if non octal digits '8' and '9' are present.
+ * 已扫�，但未被任何规则使用，���许。
+ * solc 解�器认为以'0'开头，��没有紧跟'.'或'x'的数字为八进制数
+ * �使存在�八进制数字'8'和'9'。
  */
 OctalNumber: '0' DecimalDigits ('.' DecimalDigits)?;
 
 
 /**
- * A decimal number literal consists of decimal digits that may be delimited by underscores and
- * an optional positive or negative exponent.
- * If the digits contain a decimal point, the literal has fixed point type.
+ * 一个�进制数字的字��由�进制数字组�，�以用下划线和一个�选的正负指数�分隔。
+ * 如果这些数字包�一个�数点，则该数字具有定点类型。
  */
 DecimalNumber: (DecimalDigits | (DecimalDigits? '.' DecimalDigits)) ([eE] '-'? DecimalDigits)?;
 //@doc:inline
@@ -240,14 +239,14 @@ fragment DecimalDigits: [0-9] ('_'? [0-9])* ;
 
 
 /**
- * This is needed to avoid successfully parsing a number followed by a string with no whitespace between.
+ * 需�这样�是为了���功解�一个数字��的字符串，而字符串之间没有空白。
  */
 DecimalNumberFollowedByIdentifier: DecimalNumber Identifier;
 
 
 /**
- * An identifier in solidity has to start with a letter, a dollar-sign or an underscore and
- * may additionally contain numbers after the first symbol.
+ * solidity中的标识符必须以字�，美元符�或下划线开头，
+ * 并且�以在第一个符�之��包�数字。
  */
 Identifier: IdentifierStart IdentifierPart*;
 //@doc:inline
@@ -292,20 +291,20 @@ YulTrue: 'true';
 YulHex: 'hex';
 
 /**
- * Builtin functions in the EVM Yul dialect.
+ * EVM Yul语言的内置函数。
  */
 YulEVMBuiltin:
 	'stop' | 'add' | 'sub' | 'mul' | 'div' | 'sdiv' | 'mod' | 'smod' | 'exp' | 'not'
 	| 'lt' | 'gt' | 'slt' | 'sgt' | 'eq' | 'iszero' | 'and' | 'or' | 'xor' | 'byte'
 	| 'shl' | 'shr' | 'sar' | 'addmod' | 'mulmod' | 'signextend' | 'keccak256'
-	| 'pop' | 'mload' | 'mstore' | 'mstore8' | 'sload' | 'sstore' | 'msize' | 'gas'
+	| 'pop' | 'mload' | 'mstore' | 'mstore8' | 'sload' | 'sstore' | 'tload' | 'tstore'| 'msize' | 'gas'
 	| 'address' | 'balance' | 'selfbalance' | 'caller' | 'callvalue' | 'calldataload'
 	| 'calldatasize' | 'calldatacopy' | 'extcodesize' | 'extcodecopy' | 'returndatasize'
-	| 'returndatacopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
+	| 'returndatacopy' | 'mcopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
 	| 'delegatecall' | 'staticcall' | 'return' | 'revert' | 'selfdestruct' | 'invalid'
 	| 'log0' | 'log1' | 'log2' | 'log3' | 'log4' | 'chainid' | 'origin' | 'gasprice'
-	| 'blockhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty' | 'prevrandao'
-	| 'gaslimit' | 'basefee';
+	| 'blockhash' | 'blobhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty'
+	| 'prevrandao' | 'gaslimit' | 'basefee' | 'blobbasefee';
 
 YulLBrace: '{' -> pushMode(YulMode);
 YulRBrace: '}' -> popMode;
@@ -317,9 +316,8 @@ YulComma: ',';
 YulArrow: '->';
 
 /**
- * Yul identifiers consist of letters, dollar signs, underscores and numbers, but may not start with a number.
- * In inline assembly there cannot be dots in user-defined identifiers. Instead see yulPath for expressions
- * consisting of identifiers with dots.
+ * Yul标识符由字�，美元符�，下划线和数字组�，但�能以数字开头。
+ * 在内�程�中，用户定义的标识符中�能有圆点。相�，对于由带点的标识符组�的表达�，请�阅yulPath。
  */
 YulIdentifier: YulIdentifierStart YulIdentifierPart*;
 //@doc:inline
@@ -327,17 +325,17 @@ fragment YulIdentifierStart: [a-zA-Z$_];
 //@doc:inline
 fragment YulIdentifierPart: [a-zA-Z0-9$_];
 /**
- * Hex literals in Yul consist of a prefix and one or more hexadecimal digits.
+ * Yul中的�六进制字由一个�缀和一个或多个�六进制数字组�。
  */
 YulHexNumber: '0' 'x' [0-9a-fA-F]+;
 /**
- * Decimal literals in Yul may be zero or any sequence of decimal digits without leading zeroes.
+ * Yul中的�数字���以是零或任何���导零的�数��列。
  */
 YulDecimalNumber: '0' | ([1-9] [0-9]*);
 /**
- * String literals in Yul consist of one or more double-quoted or single-quoted strings
- * that may contain escape sequences and printable characters except unescaped line breaks or
- * unescaped double-quotes or single-quotes, respectively.
+ * Yul中的字符串字��由一个或多个�引�或�引�字符串组�，
+ * 这些字符串�能包�转义�列和�打�字符
+ * 未转义的�行符或未转义的�引�或�引�除外。
  */
 YulStringLiteral:
 	'"' DoubleQuotedStringCharacter* '"'
@@ -352,8 +350,8 @@ YulLINE_COMMENT: '//' ~[\r\n]* -> channel(HIDDEN) ;
 mode PragmaMode;
 
 /**
- * Pragma token. Can contain any kind of symbol except a semicolon.
- * Note that currently the solidity parser only allows a subset of this.
+ * 编译指示令牌。�以包�除分�以外的任何类型的符�。
+ * 注�，目�solidity解�器��许它的一个�集。
  */
 //@doc:name pragma-token
 //@doc:no-diagram
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 4a756029c2ef..47c6c559c6cf 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -1,13 +1,13 @@
 /**
- * Solidity is a statically typed, contract-oriented, high-level language for implementing smart contracts on the Ethereum platform.
+ * Solidity是一���类型的，���约的高级语言，用于在Ethereum平�上实现智能�约。
  */
 parser grammar SolidityParser;
 
 options { tokenVocab=SolidityLexer; }
 
 /**
- * On top level, Solidity allows pragmas, import directives, and
- * definitions of contracts, interfaces, libraries, structs, enums and constants.
+ * 在顶层，Solidity�许pragmas，导入语�，
+ * 以��约，接�，库，结构，枚举和常�的定义。
  */
 sourceUnit: (
 	pragmaDirective
@@ -29,7 +29,7 @@ sourceUnit: (
 pragmaDirective: Pragma PragmaToken+ PragmaSemicolon;
 
 /**
- * Import directives import identifiers from different files.
+ * 导入指令 从��的文件中导入标识符。
  */
 importDirective:
 	Import (
@@ -41,30 +41,30 @@ importDirective:
 //@doc:name aliases
 importAliases: symbol=identifier (As alias=identifier)?;
 /**
- * Path of a file to be imported.
+ * �导入的文件的路径。
  */
 path: NonEmptyStringLiteral;
 /**
- * List of aliases for symbols to be imported.
+ * �导入的符�的别�列表。
  */
 symbolAliases: LBrace aliases+=importAliases (Comma aliases+=importAliases)* RBrace;
 
 /**
- * Top-level definition of a contract.
+ * �约的顶层定义。
  */
 contractDefinition:
 	Abstract? Contract name=identifier
 	inheritanceSpecifierList?
 	LBrace contractBodyElement* RBrace;
 /**
- * Top-level definition of an interface.
+ * 接�的顶层定义。
  */
 interfaceDefinition:
 	Interface name=identifier
 	inheritanceSpecifierList?
 	LBrace contractBodyElement* RBrace;
 /**
- * Top-level definition of a library.
+ * 一个库�约的顶层定义。
  */
 libraryDefinition: Library name=identifier LBrace contractBodyElement* RBrace;
 
@@ -73,16 +73,16 @@ inheritanceSpecifierList:
 	Is inheritanceSpecifiers+=inheritanceSpecifier
 	(Comma inheritanceSpecifiers+=inheritanceSpecifier)*?;
 /**
- * Inheritance specifier for contracts and interfaces.
- * Can optionally supply base constructor arguments.
+ * �约和接�的继承指定器。
+ * �以有选择地�供基本构造函数�数。
  */
 inheritanceSpecifier: name=identifierPath arguments=callArgumentList?;
 
 /**
- * Declarations that can be used in contracts, interfaces and libraries.
+ * �以在�约，接�和库中使用的声明。
  *
- * Note that interfaces and libraries may not contain constructors, interfaces may not contain state variables
- * and libraries may not contain fallback, receive functions nor non-constant state variables.
+ * 注�，接�和库�能包�构造函数，接��能包�状���，
+ * 库�能包�fallback，receive函数和��定状���。
  */
 contractBodyElement:
 	constructorDefinition
@@ -100,34 +100,33 @@ contractBodyElement:
 //@doc:inline
 namedArgument: name=identifier Colon value=expression;
 /**
- * Arguments when calling a function or a similar callable object.
- * The arguments are either given as comma separated list or as map of named arguments.
+ * 调用一个函数或类似的�调用对象时的�数。
+ * �数�么以逗�分隔的列表形�给出，�么以命��数的映射形�给出。
  */
 callArgumentList: LParen ((expression (Comma expression)*)? | LBrace (namedArgument (Comma namedArgument)*)? RBrace) RParen;
 /**
- * Qualified name.
+ * �格的�称。
  */
 identifierPath: identifier (Period identifier)*;
 
 /**
- * Call to a modifier. If the modifier takes no arguments, the argument list can be skipped entirely
- * (including opening and closing parentheses).
+ * 对一个修改器的调用。如果修改器�需��数，�数列表�以完全跳过（包括开头和结尾的括�）。
  */
 modifierInvocation: identifierPath callArgumentList?;
 /**
- * Visibility for functions and function types.
+ * 函数和函数类型的��性。
  */
 visibility: Internal | External | Private | Public;
 /**
- * A list of parameters, such as function arguments or return values.
+ * 一个�数的列表，如函数�数或返回值。
  */
 parameterList: parameters+=parameterDeclaration (Comma parameters+=parameterDeclaration)*;
 //@doc:inline
 parameterDeclaration: type=typeName location=dataLocation? name=identifier?;
 /**
- * Definition of a constructor.
- * Must always supply an implementation.
- * Note that specifying internal or public visibility is deprecated.
+ * 一个构造函数的定义。
+ * 必须始终�供一个实现。
+ * 请注�，指定内部或公共��性已被废弃。
  */
 constructorDefinition
 locals[boolean payableSet = false, boolean visibilitySet = false]
@@ -142,20 +141,26 @@ locals[boolean payableSet = false, boolean visibilitySet = false]
 	body=block;
 
 /**
- * State mutability for function types.
- * The default mutability 'non-payable' is assumed if no mutability is specified.
+ * 函数类型的状���性。
+ * 如果没有指定��性，则�定默认的��性为 “�payable“。
  */
 stateMutability: Pure | View | Payable;
 /**
- * An override specifier used for functions, modifiers or state variables.
- * In cases where there are ambiguous declarations in several base contracts being overridden,
- * a complete list of base contracts has to be given.
+ *一个用于函数，修改器或状���的�载指定符。
+ * 如果在被�载的几个基础�约中存在�明确的声明，
+ * 必须给出一个完整的基础�约清�。
  */
 overrideSpecifier: Override (LParen overrides+=identifierPath (Comma overrides+=identifierPath)* RParen)?;
 /**
+<<<<<<< HEAD
+ * �约，库和接�功能的定义。
+ * 根�定义函数的上下文，�能会有进一步的�制。
+ * 例如，接�中的函数必须是未实现的，也就是说，�能包�主体�。
+=======
  * The definition of contract, library, interface or free functions.
  * Depending on the context in which the function is defined, further restrictions may apply,
  * e.g. functions in interfaces have to be unimplemented, i.e. may not contain a body block.
+>>>>>>> english/develop
  */
 functionDefinition
 locals[
@@ -178,9 +183,25 @@ locals[
 	(Semicolon | body=block);
 
 /**
+<<<<<<< HEAD
+ * 自由函数的定义。
+ */
+ freeFunctionDefinition:
+ 	Function (identifier | Fallback | Receive)
+ 	LParen (arguments=parameterList)? RParen
+ 	stateMutability?
+ 	(Returns LParen returnParameters=parameterList RParen)?
+ 	(Semicolon | body=block);
+
+/**
+ * 修改器的定义。
+ * 注�，在修改器的主体�中，下划线�能作为标识符使用，
+ * 而是作为��符语�，用于修改器所应用的函数主体。
+=======
  * The definition of a modifier.
  * Note that within the body block of a modifier, the underscore cannot be used as identifier,
  * but is used as placeholder statement for the body of a function to which the modifier is applied.
+>>>>>>> english/develop
  */
 modifierDefinition
 locals[
@@ -197,7 +218,7 @@ locals[
 	(Semicolon | body=block);
 
 /**
- * Definition of the special fallback function.
+ * 特殊的fallback函数的定义。
  */
 fallbackFunctionDefinition
 locals[
@@ -220,7 +241,7 @@ locals[
 	(Semicolon | body=block);
 
 /**
- * Definition of the special receive function.
+ * 特殊的receive函数的定义。
  */
 receiveFunctionDefinition
 locals[
@@ -241,25 +262,25 @@ locals[
 	(Semicolon | body=block);
 
 /**
- * Definition of a struct. Can occur at top-level within a source unit or within a contract, library or interface.
+ * 结构体的定义。�以出现在�代��元的顶层，也�以出现在�约，库或接�中。
  */
 structDefinition: Struct name=identifier LBrace members=structMember+ RBrace;
 /**
- * The declaration of a named struct member.
+ * 一个命�的结构体�员的声明。
  */
 structMember: type=typeName name=identifier Semicolon;
 /**
- * Definition of an enum. Can occur at top-level within a source unit or within a contract, library or interface.
+ * 一个枚举的定义。�以出现在�代��元的顶层，也�以出现在�约，库或接�中。
  */
 enumDefinition:	Enum name=identifier LBrace enumValues+=identifier (Comma enumValues+=identifier)* RBrace;
 /**
- * Definition of a user defined value type. Can occur at top-level within a source unit or within a contract, library or interface.
+ * 用户自定义的值类型的定义。�以出现在�代��元的顶层，也�以出现在�约，库或接�中。
  */
 userDefinedValueTypeDefinition:
 	Type name=identifier Is elementaryTypeName[true] Semicolon;
 
 /**
- * The declaration of a state variable.
+ * 一个状���的声明。
  */
 stateVariableDeclaration
 locals [boolean constantnessSet = false, boolean visibilitySet = false, boolean overrideSpecifierSet = false]
@@ -278,7 +299,7 @@ locals [boolean constantnessSet = false, boolean visibilitySet = false, boolean
 	Semicolon;
 
 /**
- * The declaration of a constant variable.
+ * 一个常���的声明。
  */
 constantVariableDeclaration
 :
@@ -289,11 +310,11 @@ constantVariableDeclaration
 	Semicolon;
 
 /**
- * Parameter of an event.
+ * 一个事件类型的�数。
  */
 eventParameter: type=typeName Indexed? name=identifier?;
 /**
- * Definition of an event. Can occur in contracts, libraries or interfaces.
+ * 一个事件类型的定义。�以�生在�约，库或接�中。
  */
 eventDefinition:
 	Event name=identifier
@@ -302,11 +323,11 @@ eventDefinition:
 	Semicolon;
 
 /**
- * Parameter of an error.
+ * 一个错误类型的�数。
  */
 errorParameter: type=typeName name=identifier?;
 /**
- * Definition of an error.
+ * 错误类型定义。
  */
 errorDefinition:
 	Error name=identifier
@@ -314,7 +335,7 @@ errorDefinition:
 	Semicolon;
 
 /**
- * Operators that users are allowed to implement for some types with `using for`.
+ * �许用户使用 `using for` 为�些类型实现的�算符。
  */
 userDefinableOperator:
 	BitAnd
@@ -334,13 +355,20 @@ userDefinableOperator:
 	| NotEqual;
 
 /**
- * Using directive to attach library functions and free functions to types.
- * Can occur within contracts and libraries and at the file level.
+ * 使用指令将库函数和自由函数附加到类型上。
+ * �以在�约和库中以�文件层�中出现。
  */
-usingDirective: Using (identifierPath | (LBrace identifierPath (As userDefinableOperator)? (Comma identifierPath (As userDefinableOperator)?)* RBrace)) For (Mul | typeName) Global? Semicolon;
+usingDirective:
+  Using (
+    identifierPath
+    | (LBrace usingAliases (Comma usingAliases)* RBrace)
+  ) For (Mul | typeName) Global? Semicolon;
+
+usingAliases: identifierPath (As userDefinableOperator)?;
+
 /**
- * A type name can be an elementary type, a function type, a mapping type, a user-defined type
- * (e.g. a contract or struct) or an array type.
+ * 一个类型�称�以是一个基本类型，一个函数类型，一个映射类型，
+ * 一个用户定义的类型（如�约类型或结构体类型）或一个数组类型。
  */
 typeName: elementaryTypeName[true] | functionTypeName | mappingType | identifierPath | typeName LBrack expression? RBrack;
 elementaryTypeName[boolean allowAddressPayable]: Address | {$allowAddressPayable}? Address Payable | Bool | String | Bytes | SignedIntegerType | UnsignedIntegerType | FixedBytes | Fixed | Ufixed;
@@ -355,17 +383,17 @@ locals [boolean visibilitySet = false, boolean mutabilitySet = false]
 	(Returns LParen returnParameters=parameterList RParen)?;
 
 /**
- * The declaration of a single variable.
+ * �一��的声明。
  */
 variableDeclaration: type=typeName location=dataLocation? name=identifier;
 dataLocation: Memory | Storage | Calldata;
 
 /**
- * Complex expression.
- * Can be an index access, an index range access, a member access, a function call (with optional function call options),
- * a type conversion, an unary or binary expression, a comparison or assignment, a ternary expression,
- * a new-expression (i.e. a contract creation or the allocation of a dynamic memory array),
- * a tuple, an inline array or a primary expression (i.e. an identifier, literal or type name).
+ * ��的表达�。
+ * �以是一个索引访问，一个索引范围访问，一个�员访问，一个函数调用（有�选的函数调用选项），
+ * 一个类型转�，一个�数或�数表达�，一个比较或赋值，一个三元表达�，
+ * 一个新的表达�（�一个�约的创建或动�内存数组的分�），
+ * 一个元组，一个内�数组或一个主�表达�（�一个标识符，字���或类型�）。
  */
 expression:
 	expression LBrack index=expression? RBrack # IndexAccess
@@ -405,12 +433,12 @@ expression:
 assignOp: Assign | AssignBitOr | AssignBitXor | AssignBitAnd | AssignShl | AssignSar | AssignShr | AssignAdd | AssignSub | AssignMul | AssignDiv | AssignMod;
 tupleExpression: LParen (expression? ( Comma expression?)* ) RParen;
 /**
- * An inline array expression denotes a statically sized array of the common type of the contained expressions.
+ * 内�数组表达�表示一个��大�的数组，它是所�表达�的共�类型。
  */
 inlineArrayExpression: LBrack (expression ( Comma expression)* ) RBrack;
 
 /**
- * Besides regular non-keyword Identifiers, some keywords like 'from' and 'error' can also be used as identifiers.
+ * 除了常规的�关键字标识符，一些关键字如 ‘from‘ 和 ‘error‘ 也�以作为标识符。
  */
 identifier: Identifier | From | Error | Revert | Global;
 
@@ -420,25 +448,25 @@ literalWithSubDenomination: numberLiteral SubDenomination;
 
 booleanLiteral: True | False;
 /**
- * A full string literal consists of either one or several consecutive quoted strings.
+ * 一个完整的字符串字��由一个或几个连续的引�字符串组�。
  */
 stringLiteral: (NonEmptyStringLiteral | EmptyStringLiteral)+;
 /**
- * A full hex string literal that consists of either one or several consecutive hex strings.
+ * 一个完整的�六进制字符串字��由一个或几个连续的�六进制字符串组�。
  */
 hexStringLiteral: HexString+;
 /**
- * A full unicode string literal that consists of either one or several consecutive unicode strings.
+ * 一个完整的unicode字符串字��由一个或几个连续的unicode字符串组�。
  */
 unicodeStringLiteral: UnicodeStringLiteral+;
 
 /**
- * Number literals can be decimal or hexadecimal numbers with an optional unit.
+ * 数字字���以是带�选��的�进制或�六进制数字。
  */
 numberLiteral: DecimalNumber | HexNumber;
 
 /**
- * A curly-braced block of statements. Opens its own scope.
+ * 带花括�的语��。�以打开自己的作用域。
  */
 block:
 	LBrace ( statement | uncheckedBlock )* RBrace;
@@ -464,59 +492,58 @@ statement:
 //@doc:inline
 simpleStatement: variableDeclarationStatement | expressionStatement;
 /**
- * If statement with optional else part.
+ * 带有�选的else部分的If语�。
  */
 ifStatement: If LParen expression RParen statement (Else statement)?;
 /**
- * For statement with optional init, condition and post-loop part.
+ * 带有�选的�始值，循环�件和循环语�部分的For语�。
  */
 forStatement: For LParen (simpleStatement | Semicolon) (expressionStatement | Semicolon) expression? RParen statement;
 whileStatement: While LParen expression RParen statement;
 doWhileStatement: Do statement While LParen expression RParen Semicolon;
 /**
- * A continue statement. Only allowed inside for, while or do-while loops.
+ * 一个continue语�。��许在for�while或do-while循环中使用。
  */
 continueStatement: Continue Semicolon;
 /**
- * A break statement. Only allowed inside for, while or do-while loops.
+ * 一个break语�。��许在for，while或do-while循环中使用。
  */
 breakStatement: Break Semicolon;
 /**
- * A try statement. The contained expression needs to be an external function call or a contract creation.
+ * 一个try语�。包�的表达�需�是一个外部函数调用或�约创建。
  */
 tryStatement: Try expression (Returns LParen returnParameters=parameterList RParen)? block catchClause+;
 /**
- * The catch clause of a try statement.
+ * Try语�的catch��。
  */
 catchClause: Catch (identifier? LParen (arguments=parameterList) RParen)? block;
 
 returnStatement: Return expression? Semicolon;
 /**
- * An emit statement. The contained expression needs to refer to an event.
+ * 一个�射语�。包�的表达�需�引用一个事件。
  */
 emitStatement: Emit expression callArgumentList Semicolon;
 /**
- * A revert statement. The contained expression needs to refer to an error.
+ * 一个��语�。包�的表达�需�指�一个错误。
  */
 revertStatement: Revert expression callArgumentList Semicolon;
 /**
- * An inline assembly block.
- * The contents of an inline assembly block use a separate scanner/lexer, i.e. the set of keywords and
- * allowed identifiers is different inside an inline assembly block.
+ * 一个内�汇编代��。
+ * 内�汇编�的内容使用一个�独的扫�器/读�器，也就是说，内�汇编�内的关键字和�许的标识符集是��的。
  */
 assemblyStatement: Assembly AssemblyDialect? assemblyFlags? AssemblyLBrace yulStatement* YulRBrace;
 
 /**
- * Assembly flags.
- * Comma-separated list of double-quoted strings as flags.
+ * 内�标志。
+ * 逗�分隔的�引�字符串列表作为标志。
  */
 assemblyFlags: AssemblyBlockLParen AssemblyFlagString (AssemblyBlockComma AssemblyFlagString)* AssemblyBlockRParen;
 
 //@doc:inline
 variableDeclarationList: variableDeclarations+=variableDeclaration (Comma variableDeclarations+=variableDeclaration)*;
 /**
- * A tuple of variable names to be used in variable declarations.
- * May contain empty fields.
+ * 在��声明中使用的���元组。
+ * �能包�空字段。
  */
 variableDeclarationTuple:
 	LParen
@@ -524,23 +551,22 @@ variableDeclarationTuple:
 		(Comma (variableDeclarations+=variableDeclaration)?)*
 	RParen;
 /**
- * A variable declaration statement.
- * A single variable may be declared without initial value, whereas a tuple of variables can only be
- * declared with initial value.
+ * 一个��的声明语�。
+ * �个���以�带�始值声明，而��的元组�能用�始值声明。
  */
 variableDeclarationStatement: ((variableDeclaration (Assign expression)?) | (variableDeclarationTuple Assign expression)) Semicolon;
 expressionStatement: expression Semicolon;
 
 mappingType: Mapping LParen key=mappingKeyType name=identifier? DoubleArrow value=typeName name=identifier? RParen;
 /**
- * Only elementary types or user defined types are viable as mapping keys.
+ * �有基本类型或用户定义的类型�以作为映射类型的键值。
  */
 mappingKeyType: elementaryTypeName[false] | identifierPath;
 
 /**
- * A Yul statement within an inline assembly block.
- * continue and break statements are only valid within for loops.
- * leave statements are only valid within function bodies.
+ * 内�汇编�中的Yul语�。
+ * continue 和 break 语��在for循环中有效。
+ * 离开语��在函数体内有效。
  */
 yulStatement:
 	yulBlock
@@ -558,16 +584,16 @@ yulStatement:
 yulBlock: YulLBrace yulStatement* YulRBrace;
 
 /**
- * The declaration of one or more Yul variables with optional initial value.
- * If multiple variables are declared, only a function call is a valid initial value.
+ * 声明一个或多个具有�选的�始值的Yul��。
+ * 如果声明了多个��，�有一个函数调用是有效的�始值。
  */
 yulVariableDeclaration:
 	(YulLet variables+=YulIdentifier (YulAssign yulExpression)?)
 	| (YulLet variables+=YulIdentifier (YulComma variables+=YulIdentifier)* (YulAssign yulFunctionCall)?);
 
 /**
- * Any expression can be assigned to a single Yul variable, whereas
- * multi-assignments require a function call on the right-hand side.
+ * 任何表达�都�以分�给一个Yul��，
+ * 而多分�则需�在�侧调用一个函数。
  */
 yulAssignment: yulPath YulAssign yulExpression | (yulPath (YulComma yulPath)+) YulAssign yulFunctionCall;
 
@@ -578,8 +604,8 @@ yulForStatement: YulFor init=yulBlock cond=yulExpression post=yulBlock body=yulB
 //@doc:inline
 yulSwitchCase: YulCase yulLiteral yulBlock;
 /**
- * A Yul switch statement can consist of only a default-case (deprecated) or
- * one or more non-default cases optionally followed by a default-case.
+ * Yul switch语��以�包括一个默认情况（已废弃）
+ * 或一个或多个�默认情况，�选择紧跟一个默认情况。
  */
 yulSwitchStatement:
 	YulSwitch yulExpression
@@ -595,13 +621,12 @@ yulFunctionDefinition:
 	body=yulBlock;
 
 /**
- * While only identifiers without dots can be declared within inline assembly,
- * paths containing dots can refer to declarations outside the inline assembly block.
+ * 虽然�有�带点的标识符�以在内�汇编中声明，
+ * 但�有点的路径�以指内�汇编�之外的声明。
  */
 yulPath: YulIdentifier (YulPeriod (YulIdentifier | YulEVMBuiltin))*;
 /**
- * A call to a function with return values can only occur as right-hand side of an assignment or
- * a variable declaration.
+ * 对带有返回值的函数的调用�能作为赋值或��声明的�侧出现。
  */
 yulFunctionCall: (YulIdentifier | YulEVMBuiltin) YulLParen (yulExpression (YulComma yulExpression)*)? YulRParen;
 yulBoolean: YulTrue | YulFalse;
diff --git a/docs/index.rst b/docs/index.rst
index 600173d65452..47878df3cb44 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,118 +1,132 @@
 Solidity
 ========
 
-Solidity is an object-oriented, high-level language for implementing smart contracts.
-Smart contracts are programs that govern the behavior of accounts within the Ethereum state.
+.. warning::
+
+  You are reading a community translation of the Solidity documentation. The Solidity team
+  can give no guarantees on the quality and accuracy of the translations provided.
+  The English reference version is and will remain the only officially supported version
+  by the Solidity team and will always be the most accurate and most up-to-date one.
+  When in doubt, please always refer to the `English (original) documentation <https://docs.soliditylang.org/en/latest/>`_.
+
+Solidity是一门为实现智能�约而创建的��对象的高级编程语言。
+智能�约是管�以太�中账户行为的程�。
 
-Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_ designed to target the Ethereum Virtual Machine (EVM).
-It is influenced by C++, Python, and JavaScript.
-You can find more details about which languages Solidity has been inspired by in the :doc:`language influences <language-influences>` section.
+Solidity 是一���以太�虚拟机 (EVM) 的 `带花括�的语言 <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_。
+它� C++，Python， 和 JavaScript 的影�。
+您�以在 :doc:`语言的影�因素 <language-influences>` 部分中找到更多有关 Solidity �哪些语言��的细节。
 
-Solidity is statically typed, supports inheritance, libraries, and complex user-defined types, among other features.
+Solidity 是��类型语言，支�继承，库和��的用户自定义的类型以�其他特性。
 
-With Solidity, you can create contracts for uses such as voting, crowdfunding, blind auctions, and multi-signature wallets.
+使用 Solidity，您�以创建用于投票�众筹�秘密竞价（盲�）以�多�签�钱包等用途的�约。
 
-When deploying contracts, you should use the latest released version of Solidity.
-Apart from exceptional cases, only the latest version receives
-`security fixes <https://github.com/ethereum/solidity/security/policy#supported-versions>`_.
-Furthermore, breaking changes, as well as new features, are introduced regularly.
-We currently use a 0.y.z version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
+当开�智能�约时，您应该使用最新版本的 Solidity。
+除�些特殊情况之外，�有最新版本�会收到
+`安全修� <https://github.com/ethereum/solidity/security/policy#supported-versions>`_。
+此外，�破性的�化以�新功能会定期引入。
+目�，我们使用 0.y.z 版本� `�表明这�快速的�化 <https://semver.org/#spec-item-4>`_。
 
 .. warning::
 
-  Solidity recently released the 0.8.x version that introduced a lot of breaking changes.
-  Make sure you read :doc:`the full list <080-breaking-changes>`.
+  Solidity 最近�布了 0.8.x 版本，该版本引入了许多�大更新。 
+  请务必阅读 :doc:`完整列表 <080-breaking-changes>`。
 
-Ideas for improving Solidity or this documentation are always welcome,
-read our :doc:`contributors guide <contributing>` for more details.
+始终欢迎改进 Solidity 或此文档的想法,
+请阅读我们的 :doc:`贡献者指� <contributing>` 以了解更多细节。
 
 .. Hint::
 
-  You can download this documentation as PDF, HTML or Epub
-  by clicking on the versions flyout menu in the bottom-left corner and selecting the preferred download format.
+  您�以通过点击左下角的版本�弹出的���选择首选的下载格�
+  �下载该文档的 PDF，HTML 或 Epub 格�。
 
 
-Getting Started
+入门指�
 ---------------
 
-**1. Understand the Smart Contract Basics**
+**1. 了解智能�约基础知识**
 
-If you are new to the concept of smart contracts, we recommend you to get started by digging into the "Introduction to Smart Contracts" section, which covers the following:
+如果您是智能�约概念的新手，我们建议您从深入了解 “智能�约介�� 部分开始，包括以下内容：
 
-* :ref:`A simple example smart contract <simple-smart-contract>` written in Solidity.
-* :ref:`Blockchain Basics <blockchain-basics>`.
-* :ref:`The Ethereum Virtual Machine <the-ethereum-virtual-machine>`.
+* 用 Solidity 编写的 :ref:`一个简�的智能�约例� <simple-smart-contract>`。
+* :ref:`区�链基础知识 <blockchain-basics>`.
+* :ref:`以太�虚拟机 <the-ethereum-virtual-machine>`.
 
-**2. Get to Know Solidity**
+**2. 了解 Solidity**
 
-Once you are accustomed to the basics, we recommend you read the :doc:`"Solidity by Example" <solidity-by-example>`
-and “Language Description� sections to understand the core concepts of the language.
+一旦您熟悉了基础知识，我们建议您阅读 :doc:`"Solidity 示例" <solidity-by-example>`
+和 “语言�述� 部分，以了解该语言的核心概念。
 
-**3. Install the Solidity Compiler**
+**3.安装 Solidity 编译器**
 
-There are various ways to install the Solidity compiler,
-simply choose your preferred option and follow the steps outlined on the :ref:`installation page <installing-solidity>`.
+有多�方法�以安装 Solidity 编译器，
+�需选择您喜欢的选项，并按照 :ref:`安装页� <installing-solidity>` 上�供的步骤�作��。
 
 .. hint::
-  You can try out code examples directly in your browser with the
-  `Remix IDE <https://remix.ethereum.org>`_.
-  Remix is a web browser-based IDE that allows you to write, deploy and administer Solidity smart contracts,
-  without the need to install Solidity locally.
+  您�以通过 `Remix IDE <https://remix.ethereum.org>`_ 
+  在�览器中直接�试代�示例。
+  Remix 是一个基于网络�览器的IDE，�许您编写，部署和管�Solidity智能�约，
+  无需在本地安装 Solidity。
 
 .. warning::
-    As humans write software, it can have bugs.
-    Therefore, you should follow established software development best practices when writing your smart contracts.
-    This includes code review, testing, audits, and correctness proofs.
-    Smart contract users are sometimes more confident with code than their authors,
-    and blockchains and smart contracts have their own unique issues to watch out for,
-    so before working on production code, make sure you read the :ref:`security_considerations` section.
-
-**4. Learn More**
-
-If you want to learn more about building decentralized applications on Ethereum,
-the `Ethereum Developer Resources <https://ethereum.org/en/developers/>`_ can help you with further general documentation around Ethereum,
-and a wide selection of tutorials, tools, and development frameworks.
-
+    由于人类编写的软件�能会存在错误，
+    因此在编写智能�约时应�循软件开�的最佳实践。
+    这包括代�审查，测试，审计和正确性�明。
+    智能�约用户有时对代�的信心甚至超过了作者，
+    区�链和智能�约也有其独特的问题需�注�，
+    因此在开始编写生产代�之�，请确�您已阅读
+    :ref:`security_considerations` 部分。
+
+**4. 了解更多**
+
+如果您想更深入了解如何在以太�上构建去中心化应用，
+`以太�开�者资� <https://ethereum.org/en/developers/>`_ �以为您�供有关以太�的更多文档，
+以���教程�工具和开�框架。
+
+<<<<<<< HEAD
+如果您有任何问题，�以在 `以太� StackExchange <https://ethereum.stackexchange.com/>`_ 上，
+或者在我们的 `Gitter 频� <https://gitter.im/ethereum/solidity/>`_ 上�索答案或�问。
+=======
 If you have any questions, you can try searching for answers or asking on the
 `Ethereum StackExchange <https://ethereum.stackexchange.com/>`_,
 or our `Gitter channel <https://gitter.im/ethereum/solidity>`_.
+>>>>>>> english/develop
 
 .. _translations:
 
-Translations
+翻译
 ------------
 
-Community contributors help translate this documentation into several languages.
-Note that they have varying degrees of completeness and up-to-dateness.
-The English version stands as a reference.
+社区贡献者帮助将本文档翻译�多�语言。
+请注�，这些翻译的完整度和�时性��相�。
+因此英文版�是�考的标准。
 
-You can switch between languages by clicking on the flyout menu in the bottom-left corner
-and selecting the preferred language.
+您�以通过点击左下角的语言切�器�切�语言。
+在弹出的��中，选择您需�的语言��切�。
 
-* `Chinese <https://docs.soliditylang.org/zh/latest/>`_
-* `French <https://docs.soliditylang.org/fr/latest/>`_
-* `Indonesian <https://github.com/solidity-docs/id-indonesian>`_
-* `Japanese <https://github.com/solidity-docs/ja-japanese>`_
-* `Korean <https://github.com/solidity-docs/ko-korean>`_
-* `Persian <https://github.com/solidity-docs/fa-persian>`_
-* `Russian <https://github.com/solidity-docs/ru-russian>`_
-* `Spanish <https://github.com/solidity-docs/es-spanish>`_
-* `Turkish <https://docs.soliditylang.org/tr/latest/>`_
+* `简体中文 <https://docs.soliditylang.org/zh/latest/>`_
+* `法语 <https://docs.soliditylang.org/fr/latest/>`_
+* `�度尼西亚语 <https://github.com/solidity-docs/id-indonesian>`_
+* `日语 <https://github.com/solidity-docs/ja-japanese>`_
+* `韩语 <https://github.com/solidity-docs/ko-korean>`_
+* `波斯语 <https://github.com/solidity-docs/fa-persian>`_
+* `俄语 <https://github.com/solidity-docs/ru-russian>`_
+* `西�牙语 <https://github.com/solidity-docs/es-spanish>`_
+* `土耳其语 <https://docs.soliditylang.org/tr/latest/>`_
 
 .. note::
 
-   We set up a GitHub organization and translation workflow to help streamline the community efforts.
-   Please refer to the translation guide in the `solidity-docs org <https://github.com/solidity-docs>`_
-   for information on how to start a new language or contribute to the community translations.
+   我们建立了一个 GitHub 组织和翻译工作�程，以帮助简化社区的工作。
+   请�考 `solidity-文档 组织 <https://github.com/solidity-docs>`_ 中的翻译指�，
+   了解如何开�新的语言翻译或为社区翻译�出贡献。
 
-Contents
+目录
 ========
 
-:ref:`Keyword Index <genindex>`, :ref:`Search Page <search>`
+:ref:`关键字索引 <genindex>`, :ref:`�索页� <search>`
 
 .. toctree::
    :maxdepth: 2
-   :caption: Basics
+   :caption: 基础知识
 
    introduction-to-smart-contracts.rst
    solidity-by-example.rst
@@ -120,7 +134,7 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Language Description
+   :caption: 语言�述
 
    layout-of-source-files.rst
    structure-of-a-contract.rst
@@ -134,7 +148,7 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Compiler
+   :caption: 编译器
 
    using-the-compiler.rst
    analysing-compilation-output.rst
@@ -142,7 +156,7 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Internals
+   :caption: 内部说明
 
    internals/layout_in_storage.rst
    internals/layout_in_memory.rst
@@ -155,7 +169,7 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Advisory content
+   :caption: 建议内容
 
    security-considerations.rst
    bugs.rst
@@ -166,7 +180,7 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Additional Material
+   :caption: 补充�料
 
    natspec-format.rst
    smtchecker.rst
@@ -175,7 +189,7 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Resources
+   :caption: 资�
 
    style-guide.rst
    common-patterns.rst
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index abafd0ad3810..9e345e9e990b 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -3,12 +3,24 @@
 .. _installing-solidity:
 
 ################################
-Installing the Solidity Compiler
+安装 Solidity 编译器
 ################################
 
-Versioning
+版本
 ==========
 
+<<<<<<< HEAD
+Solidity 的版本�循 `语义化版本原则 <https://semver.org>`_。此外，
+主版本（例如：0.x.y）的补�级版本的�布�会包��大更改。这�味�用 0.x.y 版本
+编译的代��望用 0.x.z 版本编译，其中 z > y。
+
+除了�行版本外，我们还�供 **�日开�构建版本 （nightly development builds）** ，
+目的是使开�人员能够轻�地试用�将推出的功能并�供早期�馈。然而，请注�，
+虽然�日开�构建版本通常是很稳定的，但它们包�了�自开�分支的�沿代�，
+并���总是有效的。尽管我们尽了最大努力，
+它们��能�有未记录的或�大的修改，这些修改�会�为实际�布版本的一部分。
+它们也�会用于生产。
+=======
 Solidity versions follow `Semantic Versioning <https://semver.org>`_. In
 addition, patch-level releases with major release 0 (i.e. 0.x.y) will not
 contain breaking changes. That means code that compiles with version 0.x.y
@@ -21,16 +33,27 @@ very stable, they contain bleeding-edge code from the development branch and are
 not guaranteed to be always working. Despite our best efforts, they might
 contain undocumented and/or broken changes that will not become a part of an
 actual release. They are not meant for production use.
+>>>>>>> english/develop
 
-When deploying contracts, you should use the latest released version of Solidity. This
-is because breaking changes, as well as new features and bug fixes are introduced regularly.
-We currently use a 0.x version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
+当开�智能�约时，您应该使用最新版本的 Solidity。这是因为�大的改�，
+以�新的特性和错误修�是定期引入的。
+我们目�使用 0.x 版本� `�表示这�快速的�化的 <https://semver.org/#spec-item-4>`_。
 
 Remix
 =====
 
-*We recommend Remix for small contracts and for quickly learning Solidity.*
+*我们推�使用 Remix �开�简��约和快速学习 Solidity。*
 
+<<<<<<< HEAD
+`Remix �以在线使用 <https://remix.ethereum.org/>`_，而无需安装任何东西。
+如果您想离线使用，�按 https://github.com/ethereum/remix-live/tree/gh-pages
+的页�说明下载 ``.zip`` 文件�使用。 Remix 也是一个方便的选择，
+�以在�安装多个 Solidity 版本的情况下测试�日开�构建版本。
+
+本页的进一步选项详细说明了在您的计算机上安装 Solidity 命令行编译器。
+如果您刚好�处�大型�约，或者需�更多的编译选项，
+那么您应该选择使用一个命令行编译器。
+=======
 `Access Remix online <https://remix.ethereum.org/>`_, you do not need to install anything.
 If you want to use it without connection to the Internet, go to
 https://github.com/ethereum/remix-live/tree/gh-pages#readme and follow the instructions on that page.
@@ -40,23 +63,29 @@ without installing multiple Solidity versions.
 Further options on this page detail installing command-line Solidity compiler software
 on your computer. Choose a command-line compiler if you are working on a larger contract
 or if you require more compilation options.
+>>>>>>> english/develop
 
 .. _solcjs:
 
 npm / Node.js
 =============
 
-Use ``npm`` for a convenient and portable way to install ``solcjs``, a Solidity compiler. The
-`solcjs` program has fewer features than the ways to access the compiler described
-further down this page. The
-:ref:`commandline-compiler` documentation assumes you are using
-the full-featured compiler, ``solc``. The usage of ``solcjs`` is documented inside its own
-`repository <https://github.com/ethereum/solc-js>`_.
+使用 ``npm`` �以便�地安装 ``solcjs`` ，它一个 Solidity 编译器。
+但该 `solcjs` 程�的功能比本页下��述的访问编译器的方法�少。
+在 :ref:`commandline-compiler` 一章中，我们�定您使用的是全功能的编译器: ``solc``。
+``solcjs`` 的用法在它自己的 `代�仓库 <https://github.com/ethereum/solc-js>`_ 中记录。
+
+注�: `solc-js` 项目是通过使用 Emscripten 从 C++ 版的 `solc` �生出�的，
+这�味�两者使用相�的编译器�代�。
+因此， `solc-js` �以直接用于JavaScript项目（如 Remix） 具体介�请�考 `solc-js` 代�库。
 
+<<<<<<< HEAD
+=======
 Note: The solc-js project is derived from the C++
 `solc` by using Emscripten, which means that both use the same compiler source code.
 `solc-js` can be used in JavaScript projects directly (such as Remix).
 Please refer to the solc-js repository for instructions.
+>>>>>>> english/develop
 
 .. code-block:: bash
 
@@ -64,55 +93,91 @@ Please refer to the solc-js repository for instructions.
 
 .. note::
 
+<<<<<<< HEAD
+    在命令行中，�执行文件被命�为 ``solcjs``。
+
+    ``solcjs`` 的命令行选项与 ``solc`` 和一些工具（如 ``geth``）是�兼容的，
+    因此��期望 ``solcjs`` 能� ``solc`` 一样工作。
+=======
     The command-line executable is named ``solcjs``.
 
     The command-line options of ``solcjs`` are not compatible with ``solc`` and tools (such as ``geth``)
     expecting the behavior of ``solc`` will not work with ``solcjs``.
+>>>>>>> english/develop
 
 Docker
 ======
 
+<<<<<<< HEAD
+Solidity构建的Docker镜��以使用从 ``ethereum`` 组织获得的 ``solc`` 镜�。
+使用 ``stable`` 标签获�最新�布的版本，使用 ``nightly`` 标签获�开�分支中潜在的�稳定�更的版本。
+
+Docker镜�会�行编译器�执行文件，所以您�以把所有的编译器�数传给它。
+例如，下�的命令��了稳定版的 ``solc`` 镜�（如果您还没有），
+并在一个新的容器中�行它，�时传递 ``--help`` �数。
+=======
 Docker images of Solidity builds are available using the ``solc`` image from the ``ethereum`` organization.
-Use the ``stable`` tag for the latest released version, and ``nightly`` for potentially unstable changes in the develop branch.
+Use the ``stable`` tag for the latest released version, and ``nightly`` for potentially unstable changes in the ``develop`` branch.
 
 The Docker image runs the compiler executable so that you can pass all compiler arguments to it.
 For example, the command below pulls the stable version of the ``solc`` image (if you do not have it already),
 and runs it in a new container, passing the ``--help`` argument.
+>>>>>>> english/develop
 
 .. code-block:: bash
 
     docker run ethereum/solc:stable --help
 
-For example, You can specify release build versions in the tag for the 0.5.4 release.
+<<<<<<< HEAD
+您也�以在标签中指定�行的版本，例如，0.5.4版本。
+=======
+You can specify release build versions in the tag. For example:
+>>>>>>> english/develop
 
 .. code-block:: bash
 
-    docker run ethereum/solc:0.5.4 --help
+    docker run ethereum/solc:stable --help
+
+<<<<<<< HEAD
+�使用 Docker 镜��编译主机上的 Solidity 文件，请安装一个本地文件夹
+用于输入和输出，并指定�编译的�约。例如：
+=======
+Note
+
+Specific compiler versions are supported as the Docker image tag such as `ethereum/solc:0.8.23`. We will be passing the
+`stable` tag here instead of specific version tag to ensure that users get the latest version by default and avoid the issue of
+an out-of-date version.
 
 To use the Docker image to compile Solidity files on the host machine, mount a
-local folder for input and output, and specify the contract to compile. For example.
+local folder for input and output, and specify the contract to compile. For example:
+>>>>>>> english/develop
 
 .. code-block:: bash
 
     docker run -v /local/path:/sources ethereum/solc:stable -o /sources/output --abi --bin /sources/Contract.sol
 
+<<<<<<< HEAD
+您也�以使用标准的JSON接�（当使用工具化的编译器时建议使用这�方�）。
+当使用这个接�时，�需�装载任何目录，��输入的 JSON 是自�一体的
+（�它没有引用任何外部文件，而这些文件必须�被
+:ref:`由导入回调 <initial-vfs-content-standard-json-with-import-callback>`)。
+=======
 You can also use the standard JSON interface (which is recommended when using the compiler with tooling).
 When using this interface, it is not necessary to mount any directories as long as the JSON input is
 self-contained (i.e. it does not refer to any external files that would have to be
 :ref:`loaded by the import callback <initial-vfs-content-standard-json-with-import-callback>`).
+>>>>>>> english/develop
 
 .. code-block:: bash
 
     docker run ethereum/solc:stable --standard-json < input.json > output.json
 
-Linux Packages
+Linux 包
 ==============
 
-Binary packages of Solidity are available at
-`solidity/releases <https://github.com/ethereum/solidity/releases>`_.
+Solidity 的二进制安装包�在 `solidity/releases <https://github.com/ethereum/solidity/releases>`_ 找到。
 
-We also have PPAs for Ubuntu, you can get the latest stable
-version using the following commands:
+对于 Ubuntu ，我们也�供 PPAs 。通过以下命令，�获�最新的稳定版本：
 
 .. code-block:: bash
 
@@ -120,7 +185,7 @@ version using the following commands:
     sudo apt-get update
     sudo apt-get install solc
 
-The nightly version can be installed using these commands:
+您也�以使用以下命令安装�日开�构建版本：
 
 .. code-block:: bash
 
@@ -129,27 +194,33 @@ The nightly version can be installed using these commands:
     sudo apt-get update
     sudo apt-get install solc
 
+<<<<<<< HEAD
+此外，一些 Linux �行版�供了他们自己的软件包。这些软件包�是由我们直接维护的，
+而通常由�自的软件包维护者��最新。
+
+例如，Arch Linux 也有最新开�版本的软件包。
+=======
 Furthermore, some Linux distributions provide their own packages. These packages are not directly
 maintained by us but usually kept up-to-date by the respective package maintainers.
 
 For example, Arch Linux has packages for the latest development version as AUR packages: `solidity <https://aur.archlinux.org/packages/solidity>`_
 and `solidity-bin <https://aur.archlinux.org/packages/solidity-bin>`_.
+>>>>>>> english/develop
 
 .. note::
 
     Please be aware that `AUR <https://wiki.archlinux.org/title/Arch_User_Repository>`_ packages
     are user-produced content and unofficial packages. Exercise caution when using them.
 
-There is also a `snap package <https://snapcraft.io/solc>`_, however, it is **currently unmaintained**.
-It is installable in all the `supported Linux distros <https://snapcraft.io/docs/core/install>`_. To
-install the latest stable version of solc:
+还有一个 `snap包 <https://snapcraft.io/solc>`_，然而，它 **目�没有维护** 。
+它�以安装在所有 `支�的Linux�行版 <https://snapcraft.io/docs/core/install>`_ 。通过以下命令，
+安装最新的稳定版本的 solc：
 
 .. code-block:: bash
 
     sudo snap install solc
 
-If you want to help testing the latest development version of Solidity
-with the most recent changes, please use the following:
+如果您想测试 develop 分支下的最新�更，请使用以下方�：
 
 .. code-block:: bash
 
@@ -157,17 +228,14 @@ with the most recent changes, please use the following:
 
 .. note::
 
-    The ``solc`` snap uses strict confinement. This is the most secure mode for snap packages
-    but it comes with limitations, like accessing only the files in your ``/home`` and ``/media`` directories.
-    For more information, go to `Demystifying Snap Confinement <https://snapcraft.io/blog/demystifying-snap-confinement>`_.
-
+    ``solc`` snap 使用严格的�制。这对 snap 包�说是最安全的模�
+    但它也有一些�制，比如�能访问 ``/home`` 和 ``/media`` 目录下的文件。
+    欲了解更多信�，请访问 `Demystifying Snap Confinement <https://snapcraft.io/blog/demystifying-snap-confinement>`_。
 
 macOS Packages
 ==============
 
-We distribute the Solidity compiler through Homebrew
-as a build-from-source version. Pre-built bottles are
-currently not supported.
+我们通过 Homebrew 作为从�头建立的版本, �布 Solidity 编译器，。目��支�预构建。
 
 .. code-block:: bash
 
@@ -176,16 +244,20 @@ currently not supported.
     brew tap ethereum/ethereum
     brew install solidity
 
-To install the most recent 0.4.x / 0.5.x version of Solidity you can also use ``brew install solidity@4``
-and ``brew install solidity@5``, respectively.
+�安装最新的 0.4.x/0.5.x 版本的 Solidity，您也�以分别使用 ``brew install solidity@4``
+和 ``brew install solidity@5``。
 
-If you need a specific version of Solidity you can install a
-Homebrew formula directly from Github.
+如果您需�特定版本的 Solidity，您�以直接从 Github 上安装一个 Homebrew 列表。
 
+<<<<<<< HEAD
+��
+`solidity.rb 在 Github 上的�交情况 <https://github.com/ethereum/homebrew-ethereum/commits/master/solidity.rb>`_.
+=======
 View
-`solidity.rb commits on Github <https://github.com/ethereum/homebrew-ethereum/commits/master/solidity.rb>`_.
+`solidity.rb commits on GitHub <https://github.com/ethereum/homebrew-ethereum/commits/master/solidity.rb>`_.
+>>>>>>> english/develop
 
-Copy the commit hash of the version you want and check it out on your machine.
+�制您想�的版本的�交哈希值，然�在您的机器上检出该分支。
 
 .. code-block:: bash
 
@@ -193,23 +265,44 @@ Copy the commit hash of the version you want and check it out on your machine.
     cd homebrew-ethereum
     git checkout <your-hash-goes-here>
 
-Install it using ``brew``:
+使用 ``brew`` 安装:
 
 .. code-block:: bash
 
     brew unlink solidity
-    # eg. Install 0.4.8
+    # 例如，安装 0.4.8
     brew install solidity.rb
 
-Static Binaries
+��二进制文件
 ===============
 
-We maintain a repository containing static builds of past and current compiler versions for all
-supported platforms at `solc-bin`_. This is also the location where you can find the nightly builds.
-
-The repository is not only a quick and easy way for end users to get binaries ready to be used
-out-of-the-box but it is also meant to be friendly to third-party tools:
-
+我们在 `solc-bin`_ 上维护了一个包�过去和现在编译器版本的��构建的资�库，用于所有支�的平�。
+您也�以找到�日开�构建版本。
+
+该资�库�仅是一个快速且简�的方法，让终端用户获得�以开箱�用的二进制文件，
+而且它对第三方工具也很�好：
+
+<<<<<<< HEAD
+- 这些内容被镜�到 https://binaries.soliditylang.org，在那里�以很容易地通过 HTTPS 下载，
+  没有任何认��速率或需�使用git的�制。
+- �供的内容具有正确的 `Content-Type` 请求头和宽�的 CORS �置，
+  因此它�以被�行在�览器中的工具直接加载。
+- 二进制文件�需�安装或解包（与必�的 DLLs �绑在一起的旧版 Windows 除外）。
+- 我们努力争�高水平的��兼容性。文件一旦被添加，在没有�供旧�置的链接/�定�的情况下，�会被删除或移动。
+  它们也�会被修改，而且应始终与原始校验相匹�。唯一的例外是破�或无法使用的文件，
+  如果��原样，有�能造�更大的伤害。
+- 文件是通过 HTTP 和 HTTPS �供的。��您以安全的方�获得文件列表
+  （通过 git�HTTPS�IPFS 或者�是在本地的缓存），并在下载�验�二进制文件的哈希值，
+  您就�必通过HTTPS获得二进制文件。
+
+在大多数情况下，�样的二进制文件�以在 `Github 上的 Solidity �布页 <https://github.com/ethereum/solidity/releases>`_ 中找到。
+��的是，我们一般�更新Github已�布的旧版本。这�味�如果命�规则改�，我们�会�新命�，
+也�会为�布时�支�的平�添加构建。这��生在 ``solc-bin`` 资�库里。
+
+``solc-bin`` 资�库包�几个顶级目录，�个目录代表一个平�。
+�个目录都包�一个 ``list.json`` 文件，列出�用的二进制文件。
+例如，在 ``emscripten-wasm32/list.json`` 中您会�现以下关于 0.7.4 版本的信�。
+=======
 - The content is mirrored to https://binaries.soliditylang.org where it can be easily downloaded over
   HTTPS without any authentication, rate limiting or the need to use git.
 - Content is served with correct `Content-Type` headers and lenient CORS configuration so that it
@@ -224,14 +317,15 @@ out-of-the-box but it is also meant to be friendly to third-party tools:
   (via git, HTTPS, IPFS or just have it cached locally) and verify hashes of the binaries
   after downloading them, you do not have to use HTTPS for the binaries themselves.
 
-The same binaries are in most cases available on the `Solidity release page on Github`_. The
-difference is that we do not generally update old releases on the Github release page. This means
+The same binaries are in most cases available on the `Solidity release page on GitHub`_. The
+difference is that we do not generally update old releases on the GitHub release page. This means
 that we do not rename them if the naming convention changes and we do not add builds for platforms
 that were not supported at the time of release. This only happens in ``solc-bin``.
 
 The ``solc-bin`` repository contains several top-level directories, each representing a single platform.
 Each one includes a ``list.json`` file listing the available binaries. For example in
 ``emscripten-wasm32/list.json`` you will find the following information about version 0.7.4:
+>>>>>>> english/develop
 
 .. code-block:: json
 
@@ -248,10 +342,24 @@ Each one includes a ``list.json`` file listing the available binaries. For examp
       ]
     }
 
-This means that:
+这�味�：
 
-- You can find the binary in the same directory under the name
+- 您�以在�一目录下找到二进制文件，�称为
   `solc-emscripten-wasm32-v0.7.4+commit.3f05b770.js <https://github.com/ethereum/solc-bin/blob/gh-pages/emscripten-wasm32/solc-emscripten-wasm32-v0.7.4+commit.3f05b770.js>`_.
+<<<<<<< HEAD
+  注�，该文件�能是一个软链接，如果您没有使用 git 下载，或者您的文件系统�支�软链接，您需�自己解决。
+- 该二进制文件也被镜�在 https://binaries.soliditylang.org/emscripten-wasm32/solc-emscripten-wasm32-v0.7.4+commit.3f05b770.js.
+  在这�情况下，�需� git，软链接的解决方�是显而易�的，�么�供一个文件的副本，�么返回一个 HTTP �定�。
+- 该文件也�在 IPFS上 找到，地�是 `QmTLs5MuLEWXQkths41HiACoXDiH8zxyqBHGFDRSzVE5CS`_.
+- 该文件将��能会存储在 Swarm 上，
+  地�是 `16c5f09109c793db99fe35f037c6092b061bd39260ee7a677c8a97f18c955ab1`_.
+- 您�以通过比较其keccak256哈希值�验�二进制文件的完整性
+  ``0x300330ecd127756b824aa13e843cb1f43c473cb22eaf3750d5fb9c99279af8c3``。哈希值�以在命令行上
+  使用 `sha3sum`_ �供的 ``keccak256sum`` 工具
+  或在 JavaScript 中使用 `ethereumjs-util 的 keccak256() 函数。`
+- 您也�以通过比较二进制文件的sha256哈希值�验�它的完整性
+  ``0x2b55ed5fec4d9625b6c7b3ab1abd2b7fb7dd2a9c68543bf0323db2c7e2d55af2``。
+=======
   Note that the file might be a symlink, and you will need to resolve it yourself if you are not using
   git to download it or your file system does not support symlinks.
 - The binary is also mirrored at https://binaries.soliditylang.org/emscripten-wasm32/solc-emscripten-wasm32-v0.7.4+commit.3f05b770.js.
@@ -265,43 +373,38 @@ This means that:
   from ethereumjs-util`_ in JavaScript.
 - You can also verify the integrity of the binary by comparing its sha256 hash to
   ``0x2b55ed5fec4d9625b6c7b3ab1abd2b7fb7dd2a9c68543bf0323db2c7e2d55af2``.
+>>>>>>> english/develop
 
 .. warning::
 
-   Due to the strong backwards compatibility requirement the repository contains some legacy elements
-   but you should avoid using them when writing new tools:
-
-   - Use ``emscripten-wasm32/`` (with a fallback to ``emscripten-asmjs/``) instead of ``bin/`` if
-     you want the best performance. Until version 0.6.1 we only provided asm.js binaries.
-     Starting with 0.6.2 we switched to `WebAssembly builds`_ with much better performance. We have
-     rebuilt the older versions for wasm but the original asm.js files remain in ``bin/``.
-     The new ones had to be placed in a separate directory to avoid name clashes.
-   - Use ``emscripten-asmjs/`` and ``emscripten-wasm32/`` instead of ``bin/`` and ``wasm/`` directories
-     if you want to be sure whether you are downloading a wasm or an asm.js binary.
-   - Use ``list.json`` instead of ``list.js`` and ``list.txt``. The JSON list format contains all
-     the information from the old ones and more.
-   - Use https://binaries.soliditylang.org instead of https://solc-bin.ethereum.org. To keep things
-     simple we moved almost everything related to the compiler under the new ``soliditylang.org``
-     domain and this applies to ``solc-bin`` too. While the new domain is recommended, the old one
-     is still fully supported and guaranteed to point at the same location.
+   由于高度的��兼容性�求，版本库包�一些�留元素，但您在编写新工具时应��使用它们：
+
+   - 如果您想获得最佳的性能，请使用 ``emscripten-wasm32/`` （有回退功能的 ``emscripten-asmjs/``）而�是 ``bin/``。
+     在 0.6.1 版本之�，我们��供 asm.js 二进制文件。从 0.6.2 开始，我们改用 `WebAssembly builds`_，性能好得多。
+     我们已�为wasm�建了旧版本，但原�的asm.js文件�然在 ``bin/`` 下。
+     新的文件必须放在一个�独的目录中，以���称冲�。
+   - 如果您想确定下载的是 wasm 还是 asm.js 二进制文件，请使用 ``emscripten-asmjs/`` 和 ``emscripten-wasm32/``
+     而�是 ``bin/`` 和 ``wasm/`` 目录。
+   - 使用 ``list.json`` 代替 ``list.js`` 和 ``list.txt``。JSON列表格�包�了旧列表的所有信�。
+   - 使用 https://binaries.soliditylang.org，而�是 https://solc-bin.ethereum.org。
+     为了使事情简�化，我们把几乎所有与编译器有关的东西都移到了新的域� ``soliditylang.org`` 下，
+     这也适用于 ``solc-bin``。虽然推�使用新的域�，但旧的域��然被完全支�，并��指��一�置。
 
 .. warning::
 
-    The binaries are also available at https://ethereum.github.io/solc-bin/ but this page
-    stopped being updated just after the release of version 0.7.2, will not receive any new releases
-    or nightly builds for any platform and does not serve the new directory structure, including
-    non-emscripten builds.
+    二进制文件也�以在 https://ethereum.github.io/solc-bin/ 找到，
+    但这个页�在 0.7.2 版本�布�就�止了更新，�会收到任何平�的新版本或�日开�构建版本，
+    也��供新的目录结构，包括� emscripten 的构建。
 
-    If you are using it, please switch to https://binaries.soliditylang.org, which is a drop-in
-    replacement. This allows us to make changes to the underlying hosting in a transparent way and
-    minimize disruption. Unlike the ``ethereum.github.io`` domain, which we do not have any control
-    over, ``binaries.soliditylang.org`` is guaranteed to work and maintain the same URL structure
-    in the long-term.
+    如果您正在使用它，请切�到 https://binaries.soliditylang.org，它是一个直接的替代。
+    这使我们能够以�明的方�对底层主机进行更改，并尽��少干扰。
+    与我们无法控制的 ``ethereum.github.io`` 域���，
+    ``binaries.soliditylang.org`` �以��长期�行并��相�的URL结构。
 
 .. _IPFS: https://ipfs.io
 .. _Swarm: https://swarm-gateways.net/bzz:/swarm.eth
 .. _solc-bin: https://github.com/ethereum/solc-bin/
-.. _Solidity release page on github: https://github.com/ethereum/solidity/releases
+.. _Solidity release page on GitHub: https://github.com/ethereum/solidity/releases
 .. _sha3sum: https://github.com/maandree/sha3sum
 .. _keccak256() function from ethereumjs-util: https://github.com/ethereumjs/ethereumjs-util/blob/master/docs/modules/_hash_.md#const-keccak256
 .. _WebAssembly builds: https://emscripten.org/docs/compiling/WebAssembly.html
@@ -310,13 +413,36 @@ This means that:
 
 .. _building-from-source:
 
-Building from Source
+从�代�编译
 ====================
+<<<<<<< HEAD
+
+先决�件 - 所有�作系统
+=======
 Prerequisites - All Operating Systems
+>>>>>>> english/develop
 -------------------------------------
 
-The following are dependencies for all builds of Solidity:
-
+以下是 Solidity 构建的所有�赖性：
+
+<<<<<<< HEAD
+
++------------------------------------------+------------------------------+
+|                   软件                   |             备注             |
++==========================================+==============================+
+| `CMake`_ （在Windows上为3.21.3以上版本， | 跨平�构建文件生�器。       |
+| 其他为3.13以上版）                       |                              |
++------------------------------------------+------------------------------+
+| `Boost`_ （Windows系统为 1.77 版本，     | C++ 库。                     |
+| 其他系统1.65以上版）                     |                              |
++------------------------------------------+------------------------------+
+| `Git`_                                   | 用于获��代�的命令行工具。 |
++------------------------------------------+------------------------------+
+| `z3`_ （4.8.16 以上版本, �选）          | 与SMT检查器一起使用。        |
++------------------------------------------+------------------------------+
+| `cvc4`_ （�选）                         | 与SMT检查器一起使用。        |
++------------------------------------------+------------------------------+
+=======
 +-----------------------------------+-------------------------------------------------------+
 | Software                          | Notes                                                 |
 +===================================+=======================================================+
@@ -332,6 +458,7 @@ The following are dependencies for all builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | `cvc4`_ (Optional)                | For use with SMT checker.                             |
 +-----------------------------------+-------------------------------------------------------+
+>>>>>>> english/develop
 
 .. _cvc4: https://cvc4.cs.stanford.edu/web/
 .. _Git: https://git-scm.com/download
@@ -340,45 +467,53 @@ The following are dependencies for all builds of Solidity:
 .. _z3: https://github.com/Z3Prover/z3
 
 .. note::
+<<<<<<< HEAD
+    0.5.10 之�的 Solidity 版本�能无法与 Boost 1.70 以上版本正确链接。
+    一个�能的解决方法是，在�行 cmake 命令�置 Solidity 之�，暂时�命� ``<Boost install path>/lib/cmake/Boost-1.70.0``。
+=======
     Solidity versions prior to 0.5.10 can fail to correctly link against Boost versions 1.70+.
     A possible workaround is to temporarily rename ``<Boost install path>/lib/cmake/Boost-1.70.0``
     prior to running the cmake command to configure Solidity.
+>>>>>>> english/develop
 
-    Starting from 0.5.10 linking against Boost 1.70+ should work without manual intervention.
+    从 0.5.10 开始，针对 Boost 1.70 以上版本的链接应该无需人工干预。
 
 .. note::
-    The default build configuration requires a specific Z3 version (the latest one at the time the
-    code was last updated). Changes introduced between Z3 releases often result in slightly different
-    (but still valid) results being returned. Our SMT tests do not account for these differences and
-    will likely fail with a different version than the one they were written for. This does not mean
-    that a build using a different version is faulty. If you pass ``-DSTRICT_Z3_VERSION=OFF`` option
-    to CMake, you can build with any version that satisfies the requirement given in the table above.
-    If you do this, however, please remember to pass the ``--no-smt`` option to ``scripts/tests.sh``
-    to skip the SMT tests.
+    默认的构建�置需�一个特定的 Z3 版本（在代�最�更新时的最新版本）。
+    Z3 版本之间的�化常常导致返回的结果略有��（但�然有效）。
+    我们的SMT测试没有考虑到这些差异，很�能会在��的版本中失败，而�是为其编写的版本。
+    这并��味�使用��版本的构建是有问题的。如果将 ``-DSTRICT_Z3_VERSION=OFF`` 选项传递给CMake，
+    您�以使用任何满足上表�求的版本进行构建。
+    然而，如果您这样�，请记得在 ``scripts/tests.sh`` 中传递 ``--no-smt`` 选项以跳过SMT测试。
 
 .. note::
-    By default the build is performed in *pedantic mode*, which enables extra warnings and tells the
-    compiler to treat all warnings as errors.
-    This forces developers to fix warnings as they arise, so they do not accumulate "to be fixed later".
-    If you are only interested in creating a release build and do not intend to modify the source code
-    to deal with such warnings, you can pass ``-DPEDANTIC=OFF`` option to CMake to disable this mode.
-    Doing this is not recommended for general use but may be necessary when using a toolchain we are
-    not testing with or trying to build an older version with newer tools.
-    If you encounter such warnings, please consider
-    `reporting them <https://github.com/ethereum/solidity/issues/new>`_.
-
-Minimum Compiler Versions
+    默认情况下，编译是以 *语义模�* 进行的，这将�用�外的警告，并告诉编译器将所有警告视为错误。
+    这迫使开�人员在警告出现时进行修�，因此它们�会累积到“以��修��。
+    如果您�对创建�布版本感兴趣，�打算修改�代��处�这些警告，
+    您�以�CMake传递 ``-DPEDANTIC=OFF`` 选项��用这�模�。
+    一般情况下�建议这样�，但在使用我们没有测试过的工具链或试图用较新的工具构建旧版本时，
+    �能需�这样�。
+    如果您�到这�警告，请考虑 `报告它们 <https://github.com/ethereum/solidity/issues/new>`_。
+
+最�编译器版本
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The following C++ compilers and their minimum versions can build the Solidity codebase:
+以下C++编译器�其最�版本�构建 Solidity 代�库：
 
-- `GCC <https://gcc.gnu.org>`_, version 8+
-- `Clang <https://clang.llvm.org/>`_, version 7+
-- `MSVC <https://visualstudio.microsoft.com/vs/>`_, version 2019+
+- `GCC <https://gcc.gnu.org>`_, 8以上版本
+- `Clang <https://clang.llvm.org/>`_, 7以上版本
+- `MSVC <https://visualstudio.microsoft.com/vs/>`_, 2019以上版本
 
-Prerequisites - macOS
+先决�件 - macOS
 ---------------------
 
+<<<<<<< HEAD
+对于 macOS 的构建，确�最新版本的 `Xcode 已安装 <https://developer.apple.com/xcode/download/>`_。
+这包�了 `Clang C++ 编译器 <https://en.wikipedia.org/wiki/Clang>`_，
+`Xcode IDE <https://en.wikipedia.org/wiki/Clang>`_ 和其他苹果公�的开�工具，
+这些工具是在 OS X 上构建 C++ 应用程�所必须的。
+如果您是第一次安装 Xcode，或者刚刚安装了一个新的版本，那么您在使用命令行构建�，需��使用�议：
+=======
 For macOS builds, ensure that you have the latest version of
 `Xcode installed <https://developer.apple.com/xcode/resources/>`_.
 This contains the `Clang C++ compiler <https://en.wikipedia.org/wiki/Clang>`_, the
@@ -387,22 +522,34 @@ tools that are required for building C++ applications on OS X.
 If you are installing Xcode for the first time, or have just installed a new
 version then you will need to agree to the license before you can do
 command-line builds:
+>>>>>>> english/develop
 
 .. code-block:: bash
 
     sudo xcodebuild -license accept
 
-Our OS X build script uses `the Homebrew <https://brew.sh>`_
-package manager for installing external dependencies.
-Here's how to `uninstall Homebrew
-<https://docs.brew.sh/FAQ#how-do-i-uninstall-homebrew>`_,
-if you ever want to start again from scratch.
+我们的 OS X 构建脚本使用 `the Homebrew <https://brew.sh>`_
+软件包管�器�安装外部�赖。
+如果您想从头开始的�，以下是如何 `�载Homebrew
+<https://docs.brew.sh/FAQ#how-do-i-uninstall-homebrew>`_。
 
-Prerequisites - Windows
------------------------
 
-You need to install the following dependencies for Windows builds of Solidity:
+先决�件 - Windows
+-----------------------
 
+您需�为 Solidity 的 Windows 版本安装以下�赖软件包:
+
+<<<<<<< HEAD
++-----------------------------------+------------------------+
+|               软件                |          备注          |
++===================================+========================+
+| `Visual Studio 2019 Build Tools`_ | C++ 编译器             |
++-----------------------------------+------------------------+
+| `Visual Studio 2019`_  （�选）   | C++ 编译器和开�环境。 |
++-----------------------------------+------------------------+
+| `Boost`_ （1.77版本）             | C++ 库文件。           |
++-----------------------------------+------------------------+
+=======
 +-----------------------------------+-------------------------------------------------------+
 | Software                          | Notes                                                 |
 +===================================+=======================================================+
@@ -412,16 +559,15 @@ You need to install the following dependencies for Windows builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | `Boost`_ (version 1.77+)          | C++ libraries.                                        |
 +-----------------------------------+-------------------------------------------------------+
+>>>>>>> english/develop
 
-If you already have one IDE and only need the compiler and libraries,
-you could install Visual Studio 2019 Build Tools.
+如果您已�有一个 IDE 并且�需�编译器和库文件。您�以安装 Visual Studio 2019 构建工具。
 
-Visual Studio 2019 provides both IDE and necessary compiler and libraries.
-So if you have not got an IDE and prefer to develop Solidity, Visual Studio 2019
-may be a choice for you to get everything setup easily.
+Visual Studio 2019 �时�供IDE和必�的编译器和库。
+所以，如果您没有一个 IDE，并且想�开� Solidity，
+那么 Visual Studio 2019 将是一个�以使您轻�获得一切设置的选择。
 
-Here is the list of components that should be installed
-in Visual Studio 2019 Build Tools or Visual Studio 2019:
+以下是应在 Visual Studio 2019 构建工具或 Visual Studio 2019 中安装的组件列表：
 
 * Visual Studio C++ core features
 * VC++ 2019 v141 toolset (x86,x64)
@@ -432,50 +578,63 @@ in Visual Studio 2019 Build Tools or Visual Studio 2019:
 .. _Visual Studio 2019: https://www.visualstudio.com/vs/
 .. _Visual Studio 2019 Build Tools: https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2019-and-other-products
 
-We have a helper script which you can use to install all required external dependencies:
+我们有一个辅助脚本，您�以用它�安装所有需�的外部�赖：
 
 .. code-block:: bat
 
     scripts\install_deps.ps1
 
-This will install ``boost`` and ``cmake`` to the ``deps`` subdirectory.
+这将安装 ``boost`` 和 ``cmake`` 到 ``deps`` �目录。
 
-Clone the Repository
+克隆代�库
 --------------------
 
-To clone the source code, execute the following command:
+执行以下命令，克隆�代�：
 
 .. code-block:: bash
 
     git clone --recursive https://github.com/ethereum/solidity.git
     cd solidity
 
+<<<<<<< HEAD
+如果您想帮助开� Solidity，
+您�以分� Solidity，然�将您个人的分�库作为第二远程�添加。
+=======
 If you want to help develop Solidity,
 you should fork Solidity and add your personal fork as a second remote:
+>>>>>>> english/develop
 
 .. code-block:: bash
 
     git remote add personal git@github.com:[username]/solidity.git
 
 .. note::
+<<<<<<< HEAD
+    这�方法将导致一个预�布的构建，例如，在这�编译器产生的�个字节�中设置一个标志。
+    如果您想�新构建一个已�布的 Solidity 编译器，那么请使用 github �布页上的�压缩包：
+
+    https://github.com/ethereum/solidity/releases/download/v0.X.Y/solidity_0.X.Y.tar.gz
+
+    (而�是由 github �供的 "�代�")。
+=======
     This method will result in a pre-release build leading to e.g. a flag
     being set in each bytecode produced by such a compiler.
     If you want to re-build a released Solidity compiler, then
-    please use the source tarball on the github release page:
+    please use the source tarball on the GitHub release page:
 
     https://github.com/ethereum/solidity/releases/download/v0.X.Y/solidity_0.X.Y.tar.gz
 
-    (not the "Source code" provided by github).
+    (not the "Source code" provided by GitHub).
+>>>>>>> english/develop
 
-Command-Line Build
+命令行构建
 ------------------
 
-**Be sure to install External Dependencies (see above) before build.**
+**请确�在构建�安装外部�赖项（�上文）。**
 
-Solidity project uses CMake to configure the build.
-You might want to install `ccache`_ to speed up repeated builds.
-CMake will pick it up automatically.
-Building Solidity is quite similar on Linux, macOS and other Unices:
+Solidity 项目使用 CMake ��置构建。
+您�能想安装 `ccache`_ 以加快��构建的速度。CMake 会自动使用它。
+在 Linux�macOS 和其他 Unix 系统上构建 Solidity 方�都差�多：
 
 .. _ccache: https://ccache.dev/
 
@@ -485,18 +644,18 @@ Building Solidity is quite similar on Linux, macOS and other Unices:
     cd build
     cmake .. && make
 
-or even easier on Linux and macOS, you can run:
+或者在 Linux 和 macOS 上有更简�的方�，您�以�行：
 
 .. code-block:: bash
 
-    #note: this will install binaries solc and soltest at usr/local/bin
+    #注�：这将在 usr/local/bin 安装 solc 和 soltest 的二进制文件。
     ./scripts/build.sh
 
 .. warning::
 
-    BSD builds should work, but are untested by the Solidity team.
+    BSD 构建应该也�以工作，但是 Solidity 团队没有测试过。
 
-And for Windows:
+对于 Windows 执行：
 
 .. code-block:: bash
 
@@ -504,81 +663,85 @@ And for Windows:
     cd build
     cmake -G "Visual Studio 16 2019" ..
 
-In case you want to use the version of boost installed by ``scripts\install_deps.ps1``, you will
-additionally need to pass ``-DBoost_DIR="deps\boost\lib\cmake\Boost-*"`` and ``-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded``
-as arguments to the call to ``cmake``.
+如果您想使用由 ``scripts\install_deps.ps1`` 安装的 boost 版本，
+您需��外传递 ``-DBoost_DIR="deps\boost\lib\cmake\Boost-*"`` 和 ``-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded``
+作为�数给 ``cmake`` 调用。
 
-This should result in the creation of **solidity.sln** in that build directory.
-Double-clicking on that file should result in Visual Studio firing up.  We suggest building
-**Release** configuration, but all others work.
+这将会导致在构建目录中创建 **solidity.sln** 文件。
+�击该文件，Visual Studio 就会�动。
+我们建议创建 **Release** �置，但其他的�置也�以。
 
-Alternatively, you can build for Windows on the command-line, like so:
+或者，您�以在命令行上为 Windows 构建，�这样：
 
 .. code-block:: bash
 
     cmake --build . --config Release
 
-CMake Options
+CMake 选项
 =============
 
-If you are interested what CMake options are available run ``cmake .. -LH``.
+如果您对CMake的�选项感兴趣，�以�行 ``cmake ... -LH``。
 
 .. _smt_solvers_build:
 
-SMT Solvers
+SMT 解算器
 -----------
-Solidity can be built against SMT solvers and will do so by default if
-they are found in the system. Each solver can be disabled by a ``cmake`` option.
+Solidity �以针对 SMT 解算器进行构建，如果它们在系统中被�现，
+将默认为是这样�的。�个解算器都�以通过 ``cmake`` 选项�用。
 
-*Note: In some cases, this can also be a potential workaround for build failures.*
+*注�：在�些情况下，这也�以是构建失败�，�能的�通方法。*
 
 
-Inside the build folder you can disable them, since they are enabled by default:
+在构建文件夹内，您�以�用它们，因为它们是默认�用的:
 
 .. code-block:: bash
 
-    # disables only Z3 SMT Solver.
+    # ��用Z3 SMT解算器。
     cmake .. -DUSE_Z3=OFF
 
-    # disables only CVC4 SMT Solver.
+    # ��用CVC4 SMT解算器。
     cmake .. -DUSE_CVC4=OFF
 
-    # disables both Z3 and CVC4
+    # �时�用Z3和CVC4
     cmake .. -DUSE_CVC4=OFF -DUSE_Z3=OFF
 
-The Version String in Detail
+版本�字符串详解
 ============================
 
-The Solidity version string contains four parts:
+Solidity 版本�包�四部分：
 
-- the version number
-- pre-release tag, usually set to ``develop.YYYY.MM.DD`` or ``nightly.YYYY.MM.DD``
-- commit in the format of ``commit.GITHASH``
-- platform, which has an arbitrary number of items, containing details about the platform and compiler
+- 版本�
+- 预�布版本标签，通常为 ``develop.YYYY.MM.DD`` 或者 ``nightly.YYYY.MM.DD``
+- 以 ``commit.GITHASH`` 格�展示的�交�
+- 由若干�平��编译器详细信�构�的平�标识
 
-If there are local modifications, the commit will be postfixed with ``.mod``.
+如果有本地修改，�交将会有�缀 ``.mod``。
 
-These parts are combined as required by SemVer, where the Solidity pre-release tag equals to the SemVer pre-release
-and the Solidity commit and platform combined make up the SemVer build metadata.
+这些部分按照 Semver 的�求�组�， 其中 Solidity 预�布版标签等价于 Semver 预�布版标签，
+而 Solidity �交�和平�标识则组�Semver的构建元数�。
 
-A release example: ``0.4.8+commit.60cc1668.Emscripten.clang``.
+�布版样例: ``0.4.8+commit.60cc1668.Emscripten.clang``。
 
-A pre-release example: ``0.4.9-nightly.2017.1.17+commit.6ecb4aa3.Emscripten.clang``
+预�布版样例: ``0.4.9-nightly.2017.1.17+commit.6ecb4aa3.Emscripten.clang``。
 
-Important Information About Versioning
+关于版本管�的��信�
 ======================================
 
-After a release is made, the patch version level is bumped, because we assume that only
-patch level changes follow. When changes are merged, the version should be bumped according
-to SemVer and the severity of the change. Finally, a release is always made with the version
-of the current nightly build, but without the ``prerelease`` specifier.
+在版本�布之�，补�版本�会增加，因为我们�定接下��有补�级别的�更。
+当�更被�并�，版本应该根� Semver 和�更的��程度���。
+最�，�行版本总是与当��日开�构建版本本的版本�一致，但没有 ``prerelease`` 指示符。
+
 
-Example:
+示例:
 
-1. The 0.4.0 release is made.
-2. The nightly build has a version of 0.4.1 from now on.
-3. Non-breaking changes are introduced --> no change in version.
-4. A breaking change is introduced --> version is bumped to 0.5.0.
-5. The 0.5.0 release is made.
+<<<<<<< HEAD
+1. 0.4.0 版本�布。
+2. 从现在开始，�晚构建一个 0.4.1 版本。
+3. 引入��大�更 —— �改�版本�。
+4. 引入�大�更 —— 版本���到 0.5.0。
+5. 0.5.0 版本�布。
 
+该方�与 :ref:`version pragma <version_pragma>` 一起�行良好。
+=======
 This behavior works well with the  :ref:`version pragma <version_pragma>`.
+>>>>>>> english/develop
diff --git a/docs/internals/layout_in_calldata.rst b/docs/internals/layout_in_calldata.rst
index aef27b1531c3..4239ce3b95a8 100644
--- a/docs/internals/layout_in_calldata.rst
+++ b/docs/internals/layout_in_calldata.rst
@@ -1,16 +1,13 @@
 
 .. index: calldata layout
 
-*******************
-Layout of Call Data
-*******************
+***********************
+调用数�的存储结构
+***********************
 
-The input data for a function call is assumed to be in the format defined by the :ref:`ABI
-specification <ABI>`. Among others, the ABI specification requires arguments to be padded to multiples of 32
-bytes. The internal function calls use a different convention.
-
-Arguments for the constructor of a contract are directly appended at the end of the
-contract's code, also in ABI encoding. The constructor will access them through a hard-coded offset, and
-not by using the ``codesize`` opcode, since this of course changes when appending
-data to the code.
+一个函数调用的输入数�的格�被认为会�循 :ref:`ABI规范 <ABI>` 所定义的格�。
+其中，ABI规范�求�数被填充为32字节的�数。而内部函数调用会使用��规则。
 
+�约的构造函数的�数直接附加在�约的字节�末尾，
+也是ABI编�的。构造函数将通过一个硬编�的�移��访问它们，
+而�是通过使用 ``codesize`` �作�，因为在�代�追加数�时它会�生改�。
diff --git a/docs/internals/layout_in_memory.rst b/docs/internals/layout_in_memory.rst
index 8c20b625284e..a138215d7e19 100644
--- a/docs/internals/layout_in_memory.rst
+++ b/docs/internals/layout_in_memory.rst
@@ -2,52 +2,47 @@
 .. index: memory layout
 
 ****************
-Layout in Memory
+内存中的存储结构
 ****************
 
-Solidity reserves four 32-byte slots, with specific byte ranges (inclusive of endpoints) being used as follows:
+Solidity�留了四个32字节的�槽，具体的字节范围（包括端点）使用如下：
 
-- ``0x00`` - ``0x3f`` (64 bytes): scratch space for hashing methods
-- ``0x40`` - ``0x5f`` (32 bytes): currently allocated memory size (aka. free memory pointer)
-- ``0x60`` - ``0x7f`` (32 bytes): zero slot
+- ``0x00`` - ``0x3f`` （64字节）： 用于哈希方法的临时空间
+- ``0x40`` - ``0x5f`` （32字节）： 当�分�的内存大�（�称空闲内存指针）。
+- ``0x60`` - ``0x7f`` （32字节）： 0 值�槽
 
-Scratch space can be used between statements (i.e. within inline assembly). The zero slot
-is used as initial value for dynamic memory arrays and should never be written to
-(the free memory pointer points to ``0x80`` initially).
+临时空间�以在语�之间使用（�在内�汇编之中）。
+0 值�槽则用�对动�内存数组进行�始化，且永远�会写入数�
+（因而�用的�始内存指针为 ``0x80``）。
 
-Solidity always places new objects at the free memory pointer and
-memory is never freed (this might change in the future).
+Solidity 总会把新对象�存在空闲内存指针的�置，
+所以这段内存实际上从��会空闲（在未��能会修改这个机制）。
 
-Elements in memory arrays in Solidity always occupy multiples of 32 bytes (this
-is even true for ``bytes1[]``, but not for ``bytes`` and ``string``).
-Multi-dimensional memory arrays are pointers to memory arrays. The length of a
-dynamic array is stored at the first slot of the array and followed by the array
-elements.
+Solidity中内存数组中的元素总是��32字节的�数
+（对于 ``bytes1[]`` �说也是如此，但对于 ``bytes`` 和 ``string`` �说�是这样）。
+多维内存数组是指�内存数组的指针. 一个动�数组的长度被存储在数组的第一个槽里，��是数组元素。
 
 .. warning::
-  There are some operations in Solidity that need a temporary memory area
-  larger than 64 bytes and therefore will not fit into the scratch space.
-  They will be placed where the free memory points to, but given their
-  short lifetime, the pointer is not updated. The memory may or may not
-  be zeroed out. Because of this, one should not expect the free memory
-  to point to zeroed out memory.
+  在Solidity中，有一些�作需�一个大于64字节的临时内存区域，
+  因此将�适�放在默认的临时空间中。它们将被放置在空闲内存指�的�置，
+  但由于这�数�的生命周期较短，这个指针�会�时更新。
+  这部分内存�能会被清零也�能�会。
+  所以我们�应该期望这些所谓的空闲内存总会被清零。
 
-  While it may seem like a good idea to use ``msize`` to arrive at a
-  definitely zeroed out memory area, using such a pointer non-temporarily
-  without updating the free memory pointer can have unexpected results.
+  虽然使用 ``msize`` �到达一个�对清零的内存区域似乎是个好主�，
+  但在�更新空闲内存指针的情况下，�临时性地使用这样的指针会产生�想�到的结果。
 
 
-Differences to Layout in Storage
+与存储结构的区别
 ================================
 
-As described above the layout in memory is different from the layout in
-:ref:`storage<storage-inplace-encoding>`. Below there are some examples.
+如上所述，内存中的存储结构与 :ref:`存储（storage） <storage-inplace-encoding>` 中的存储结构是��的。
+下�是一些例�。
 
-Example for Difference in Arrays
+在数组中的差异的例�
 --------------------------------
 
-The following array occupies 32 bytes (1 slot) in storage, but 128
-bytes (4 items with 32 bytes each) in memory.
+下�的数组在存储中�用32字节（1个槽），但在内存中�用128字节（4项，�个32字节）。
 
 .. code-block:: solidity
 
@@ -55,11 +50,11 @@ bytes (4 items with 32 bytes each) in memory.
 
 
 
-Example for Difference in Struct Layout
+在结构体中存储结构差异的例�
 ---------------------------------------
 
-The following struct occupies 96 bytes (3 slots of 32 bytes) in storage,
-but 128 bytes (4 items with 32 bytes each) in memory.
+以下结构体在存储中�用96字节（3个32字节的槽），
+但在内存中�用128字节（4项，�个32字节）。
 
 
 .. code-block:: solidity
diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index 7afcfc2ac5c0..4159f4c07779 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -1,103 +1,92 @@
 .. index:: storage, state variable, mapping
 
 ************************************
-Layout of State Variables in Storage
+存储中的状���储存结构
 ************************************
 
 .. _storage-inplace-encoding:
 
-State variables of contracts are stored in storage in a compact way such
-that multiple values sometimes use the same storage slot.
-Except for dynamically-sized arrays and mappings (see below), data is stored
-contiguously item after item starting with the first state variable,
-which is stored in slot ``0``. For each variable,
-a size in bytes is determined according to its type.
-Multiple, contiguous items that need less than 32 bytes are packed into a single
-storage slot if possible, according to the following rules:
+�约的状���以一�紧凑的方�存储，
+这样多个值有时会使用�一个存储槽。
+除了动�大�的数组和映射（�下文）之外，
+数�是被�项存储的，从第一个状���开始，
+它被存储在槽 ``0`` 中。对于�个��，
+根�它的类型确定一个字节的大�。如果�能的�，需�少于32字节的多个连续项目被打包到一个存储槽中，
+根�以下规则：
 
-- The first item in a storage slot is stored lower-order aligned.
-- Value types use only as many bytes as are necessary to store them.
-- If a value type does not fit the remaining part of a storage slot, it is stored in the next storage slot.
-- Structs and array data always start a new slot and their items are packed tightly according to these rules.
-- Items following struct or array data always start a new storage slot.
+- 存储�槽的第一项会以低�对�（��对�）的方�储存。
+- 值类型�使用存储它们所需的字节数。
+- 如果一个值类型�适�一个存储槽的剩余部分，它将被存储在下一个存储槽。
+- 结构和数组数�总是从一个新的存储槽开始，它们的项根�这些规则被紧密地打包。
+- 结构或数组数�之�的��总是开辟一个新的存储槽。
 
-For contracts that use inheritance, the ordering of state variables is determined by the
-C3-linearized order of contracts starting with the most base-ward contract. If allowed
-by the above rules, state variables from different contracts do share the same storage slot.
+对于使用继承的�约，状���的排�是从最基础的�约开始，由�约的C3线性化顺�决定的。
+如果上述规则�许，�自���约的状���确实共享�一个存储槽。
 
-The elements of structs and arrays are stored after each other, just as if they were given
-as individual values.
+结构体和数组中的元素都是顺�存储的，就�它们被明确给定的那样。
 
 .. warning::
-    When using elements that are smaller than 32 bytes, your contract's gas usage may be higher.
-    This is because the EVM operates on 32 bytes at a time. Therefore, if the element is smaller
-    than that, the EVM must use more operations in order to reduce the size of the element from 32
-    bytes to the desired size.
-
-    It might be beneficial to use reduced-size types if you are dealing with storage values
-    because the compiler will pack multiple elements into one storage slot, and thus, combine
-    multiple reads or writes into a single operation.
-    If you are not reading or writing all the values in a slot at the same time, this can
-    have the opposite effect, though: When one value is written to a multi-value storage
-    slot, the storage slot has to be read first and then
-    combined with the new value such that other data in the same slot is not destroyed.
-
-    When dealing with function arguments or memory
-    values, there is no inherent benefit because the compiler does not pack these values.
-
-    Finally, in order to allow the EVM to optimize for this, ensure that you try to order your
-    storage variables and ``struct`` members such that they can be packed tightly. For example,
-    declaring your storage variables in the order of ``uint128, uint128, uint256`` instead of
-    ``uint128, uint256, uint128``, as the former will only take up two slots of storage whereas the
-    latter will take up three.
+    当使用�于32字节的元素时，您的�约的气体用��能会更高。
+    这是因为EVM�次对32字节进行�作。因此，如果元素�于这个大�，
+    EVM必须使用更多的�作，以便将元素的大�从32字节�少到所需的大�。
+
+    如果您处�的是存储值，使用缩�尺寸的类型�能是有益的，
+    因为编译器会将多个元素打包到一个存储槽中，
+    从而将多个读或写�并到一个�作中。
+    如果您�是在�一时间读�或写入一个槽中的所有值，
+    这�能会产生相�的效果，虽然。当一个值被写入一个多值存储槽时，
+    该存储槽必须先被读�，
+    然�与新值结�，这样�一槽中的其他数�就�会被破�。
+
+    在处�函数�数或内存值时，因为编译器�会打包这些值，所以没有什么好处，
+
+    最�，为了让EVM对此进行优化，
+    确�您的存储��和 ``struct`` �员的顺�，使它们能够被紧密地包装起�。
+    例如，按照 ``uint128, uint128, uint256`` 的顺�声明您的存储��，
+    而�是 ``uint128, uint256, uint128``，因为�者��用两个存储槽，
+    而�者则�用三个存储槽。
 
 .. note::
-     The layout of state variables in storage is considered to be part of the external interface
-     of Solidity due to the fact that storage pointers can be passed to libraries. This means that
-     any change to the rules outlined in this section is considered a breaking change
-     of the language and due to its critical nature should be considered very carefully before
-     being executed. In the event of such a breaking change, we would want to release a
-     compatibility mode in which the compiler would generate bytecode supporting the old layout.
+     由于存储指针�以传递给库，存储中的状���的结构被认为是 Solidity 外部接�的一部分。
+     这�味�对这一节中概述的规则的任何改�都被认为是对语言的�大改�，
+     由于它的关键性质，在执行之�应该�常仔细地考虑。
+     在�生这��大�化的情况下，我们希望�布一�兼容模�，
+     在这�模�下，编译器将生�支�旧结构的字节�。
 
 
-Mappings and Dynamic Arrays
+映射和动�数组
 ===========================
 
 .. _storage-hashed-encoding:
 
-Due to their unpredictable size, mappings and dynamically-sized array types cannot be stored
-"in between" the state variables preceding and following them.
-Instead, they are considered to occupy only 32 bytes with regards to the
-:ref:`rules above <storage-inplace-encoding>` and the elements they contain are stored starting at a different
-storage slot that is computed using a Keccak-256 hash.
+由于映射和动�数组的大�是��预知的，他们�能被存储在其��的状���之间。
+相�，它们被认为��用32个字节， 与 :ref:`上述规则 <storage-inplace-encoding>` 有关，
+它们所包�的元素被存储在一个��的存储槽，该存储槽是用Keccak-256哈希计算的。
 
-Assume the storage location of the mapping or array ends up being a slot ``p``
-after applying :ref:`the storage layout rules <storage-inplace-encoding>`.
-For dynamic arrays,
-this slot stores the number of elements in the array (byte arrays and
-strings are an exception, see :ref:`below <bytes-and-string>`).
-For mappings, the slot stays empty, but it is still needed to ensure that even if there are
-two mappings next to each other, their content ends up at different storage locations.
+�设映射或数组的存储�置在适应了 :ref:`存储结构规则 <storage-inplace-encoding>` �，最终�于一个槽 ``p``。
+对于动�数组，这个槽存储了数组中的元素数�
+（字节数组和字符串是一个例外，�� :ref:`下文 <bytes-and-string>`）。
+对于映射�说，这个槽��空的状�，
+但是�然需�它�确��使有两个映射相邻，它们的内容最终也是在��的存储�置。
 
-Array data is located starting at ``keccak256(p)`` and it is laid out in the same way as
-statically-sized array data would: One element after the other, potentially sharing
-storage slots if the elements are not longer than 16 bytes. Dynamic arrays of dynamic arrays apply this
-rule recursively. The location of element ``x[i][j]``, where the type of ``x`` is ``uint24[][]``, is
-computed as follows (again, assuming ``x`` itself is stored at slot ``p``):
-The slot is ``keccak256(keccak256(p) + i) + floor(j / floor(256 / 24))`` and
-the element can be obtained from the slot data ``v`` using ``(v >> ((j % floor(256 / 24)) * 24)) & type(uint24).max``.
+数组数�从 ``keccak256(p)`` 开始，它的排列方�与��大�的阵列数�相�：
+一个元素接�一个元素，如果元素的长度�超过16字节，
+就有�能共享存储槽。包�动�数组的动�数组递归地应用这一规则。
+元素 ``x[i][j]`` 的�置为，其中 ``x`` 的类型是 ``uint24[][]`` ，
+计算方法如下（�样，�设 ``x`` 本身存储在槽 ``p``）：
+槽是 ``keccak256(keccak256(p)+i)+ floor(j / floor(256 / 24))``，
+元素�以从槽数� ``v`` 得到，使用 ``(v >> ((j % floor(256 / 24)) * 24)) & type(uint24).max``。
 
-The value corresponding to a mapping key ``k`` is located at ``keccak256(h(k) . p)``
-where ``.`` is concatenation and ``h`` is a function that is applied to the key depending on its type:
+对应于映射键 ``k`` 的值�于 ``keccak256(h(k) . p)``，
+其中 ``.`` 是连接符， ``h`` 是一个函数，根�键的类型应用于键。
 
-- for value types, ``h`` pads the value to 32 bytes in the same way as when storing the value in memory.
-- for strings and byte arrays, ``h(k)`` is just the unpadded data.
+- 对于值类型， 函数 ``h`` 将与在内存中存储值的相�方��将值填充为32字节。
+- 对于字符串和字节数组， ``h(k)`` �是未填充的数�。
 
-If the mapping value is a
-non-value type, the computed slot marks the start of the data. If the value is of struct type,
-for example, you have to add an offset corresponding to the struct member to reach the member.
+如果映射类型的值是一个�值类型，则计算的槽会标记为数�的开始�置。
+例如，如果值是结构体类型，您必须添加一个与结构体�员相对应的�移��能访问到该�员。
 
-As an example, consider the following contract:
+作为示例，�考以下�约：
 
 .. code-block:: solidity
 
@@ -111,46 +100,44 @@ As an example, consider the following contract:
         mapping(uint => mapping(uint => S)) data;
     }
 
-Let us compute the storage location of ``data[4][9].c``.
-The position of the mapping itself is ``1`` (the variable ``x`` with 32 bytes precedes it).
-This means ``data[4]`` is stored at ``keccak256(uint256(4) . uint256(1))``. The type of ``data[4]`` is
-again a mapping and the data for ``data[4][9]`` starts at slot
-``keccak256(uint256(9) . keccak256(uint256(4) . uint256(1)))``.
-The slot offset of the member ``c`` inside the struct ``S`` is ``1`` because ``a`` and ``b`` are packed
-in a single slot. This means the slot for
-``data[4][9].c`` is ``keccak256(uint256(9) . keccak256(uint256(4) . uint256(1))) + 1``.
-The type of the value is ``uint256``, so it uses a single slot.
+让我们计算一下 ``data[4][9].c`` 的存储�置。
+映射本身的�置是 ``1`` （�� ``x`` ��有32字节）。
+这�味� ``data[4]`` 存储在 ``keccak256(uint256(4) . uint256(1))``。
+``data[4]`` 的类型还是一个映射，
+``data[4][9]`` 的数�从 ``keccak256(uint256(9) . keccak256(uint256(4) . uint256(1)))`` 槽开始。
+�员 ``c`` 在结构 ``S`` 中的槽��移是 ``1``，因为 ``a`` 和 ``b`` 被装在一个槽�中。
+这�味� ``data[4][9].c`` 的�槽是 ``keccak256(uint256(9) . keccak256(uint256(4) . uint256(1))) + 1``。
+该值的类型是 ``uint256``，所以它�用一个槽。
 
 
 .. _bytes-and-string:
 
-``bytes`` and ``string``
+``bytes`` 和 ``string``
 ------------------------
 
-``bytes`` and ``string`` are encoded identically.
-In general, the encoding is similar to ``bytes1[]``, in the sense that there is a slot for the array itself and
-a data area that is computed using a ``keccak256`` hash of that slot's position.
-However, for short values (shorter than 32 bytes) the array elements are stored together with the length in the same slot.
+``bytes`` 和 ``string`` 的编�是相�的。
+一般�说，编�与 ``bytes1[]`` 类似，�有一个槽用于存放数组本身和一个数�区，
+这个数�区是用该槽的�置的 ``keccak256`` 哈希值计算的。
+然而，对于较短的值（短于32字节），数组元素与长度一起存储在�一个槽中。
 
-In particular: if the data is at most ``31`` bytes long, the elements are stored
-in the higher-order bytes (left aligned) and the lowest-order byte stores the value ``length * 2``.
-For byte arrays that store data which is ``32`` or more bytes long, the main slot ``p`` stores ``length * 2 + 1`` and the data is
-stored as usual in ``keccak256(p)``. This means that you can distinguish a short array from a long array
-by checking if the lowest bit is set: short (not set) and long (set).
+特别是：如果数�最多�有 ``31`` 字节长，
+元素被存储在高阶字节中（左对�），最低阶字节存储值 ``length * 2``。
+对于存储数�长度为 ``32`` 或更多字节的字节数，主槽 ``p`` 存储 ``length * 2 + 1``，
+数�照常存储在 ``keccak256(p)``。这�味�您�以通过检查最低�是�被设置�区分短数组和长数组：
+短数组（未设置）和长数组（设置）。
 
 .. note::
-  Handling invalidly encoded slots is currently not supported but may be added in the future.
-  If you are compiling via IR, reading an invalidly encoded slot results in a ``Panic(0x22)`` error.
+  目��支�处�无效编�的槽，但将��能会加入。
+  如果您通过 IR 进行编译，读�一个无效编�的槽会导致 ``Panic(0x22)`` 错误。
 
-JSON Output
+JSON输出
 ===========
 
 .. _storage-layout-top-level:
 
-The storage layout of a contract can be requested via
-the :ref:`standard JSON interface <compiler-api>`.  The output is a JSON object containing two keys,
-``storage`` and ``types``.  The ``storage`` object is an array where each
-element has the following form:
+�约的存储结构�以通过 :ref:`标准的JSON接� <compiler-api>` 请求获得。
+输出的是一个JSON对象，包�两个键， ``storage`` 和 ``types``。
+``storage`` 对象是一个数组，�个元素都有以下形�：
 
 
 .. code-block:: json
@@ -165,20 +152,16 @@ element has the following form:
         "type": "t_uint256"
     }
 
-The example above is the storage layout of ``contract A { uint x; }`` from source unit ``fileA``
-and
+上�的例��自�于项目 ``fileA`` 的 ``contract A { uint x; }`` 的存储结构，并且
 
-- ``astId`` is the id of the AST node of the state variable's declaration
-- ``contract`` is the name of the contract including its path as prefix
-- ``label`` is the name of the state variable
-- ``offset`` is the offset in bytes within the storage slot according to the encoding
-- ``slot`` is the storage slot where the state variable resides or starts. This
-  number may be very large and therefore its JSON value is represented as a
-  string.
-- ``type`` is an identifier used as key to the variable's type information (described in the following)
+- ``astId`` 是状���声明的AST节点的ID
+- ``contract`` 是�约的�称，包括其路径作为�缀
+- ``label`` 是状���的�称
+- ``offset`` 是根�编�在存储槽中的字节�移�
+- ``slot`` 是状���所在或开始的存储槽。这个数字�能�常大，因此它的JSON值被表示为一个字符串
+- ``type`` 是一个标识符，作为��类型信�的关键（如下所述）
 
-The given ``type``, in this case ``t_uint256`` represents an element in
-``types``, which has the form:
+给定的 ``type``，在这里是 ``t_uint256``，代表 ``types`` 中的一个元素，它的形�是：
 
 
 .. code-block:: json
@@ -189,31 +172,29 @@ The given ``type``, in this case ``t_uint256`` represents an element in
         "numberOfBytes": "32",
     }
 
-where
+这里
 
-- ``encoding`` how the data is encoded in storage, where the possible values are:
+- ``encoding`` 数�在存储中是如何编�的，�能的值是：
 
-  - ``inplace``: data is laid out contiguously in storage (see :ref:`above <storage-inplace-encoding>`).
-  - ``mapping``: Keccak-256 hash-based method (see :ref:`above <storage-hashed-encoding>`).
-  - ``dynamic_array``: Keccak-256 hash-based method (see :ref:`above <storage-hashed-encoding>`).
-  - ``bytes``: single slot or Keccak-256 hash-based depending on the data size (see :ref:`above <bytes-and-string>`).
+  - ``inplace``： 数�在存储中是连续布置的（�� :ref:`上文 <storage-inplace-encoding>`）。
+  - ``mapping``： 基于Keccak-256的哈希方法（�� :ref:`上文 <storage-hashed-encoding>`）。
+  - ``dynamic_array``： 基于Keccak-256的哈希方法（�� :ref:`上文 <storage-hashed-encoding>`）。
+  - ``bytes``： �槽或基于Keccak-256哈希值，�决于数�大�（�� :ref:`上文 <bytes-and-string>`）。
 
-- ``label`` is the canonical type name.
-- ``numberOfBytes`` is the number of used bytes (as a decimal string).
-  Note that if ``numberOfBytes > 32`` this means that more than one slot is used.
+- ``label`` 是典型的类型�称。
+- ``numberOfBytes`` 是使用的字节数（�进制字符串）。
+  注�，如果 ``numberOfBytes > 32`` 这�味�使用了一个以上的槽。
 
-Some types have extra information besides the four above. Mappings contain
-its ``key`` and ``value`` types (again referencing an entry in this mapping
-of types), arrays have its ``base`` type, and structs list their ``members`` in
-the same format as the top-level ``storage`` (see :ref:`above
-<storage-layout-top-level>`).
+除了上述四�类型外，有些类型还有�外的信�。
+映射包�它的 ``key`` 和 ``value`` 类型（�次引用这个类型映射中的一个项），
+数组有它的 ``base`` 类型，结构体会列出它们的 ``�员``，
+其格�与高层次的 ``storage`` 相�（�� :ref:`上文 <storage-layout-top-level>`）。
 
 .. note::
-  The JSON output format of a contract's storage layout is still considered experimental
-  and is subject to change in non-breaking releases of Solidity.
+  �约的存储结构的 JSON 输出格��被认为是实验性的，
+  并且在 Solidity 的��大版本中会有�化。
 
-The following example shows a contract and its storage layout, containing
-value and reference types, types that are encoded packed, and nested types.
+下�的例�显示了一个�约�其存储结构，包�值类型和引用类型，被编�打包的类型，以�嵌套的类型。
 
 
 .. code-block:: solidity
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index b3e144e94744..1f878ccccbe3 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -2,23 +2,52 @@
 .. _optimizer:
 
 *************
-The Optimizer
+优化器
 *************
 
-The Solidity compiler uses two different optimizer modules: The "old" optimizer
-that operates at the opcode level and the "new" optimizer that operates on Yul IR code.
+<<<<<<< HEAD
+Solidity编译器使用两���的优化器模�。在�作�水平上�作的 "旧" 优化器
+和在 Yul IR 代�上�作的 “新� 优化器。
+=======
+The Solidity compiler involves optimizations at three different levels (in order of execution):
+
+- Optimizations during code generation based on a direct analysis of Solidity code.
+- Optimizing transformations on the Yul IR code.
+- Optimizations at the opcode level.
+>>>>>>> english/develop
+
+基于�作�的优化器对�作�应用一套 `简化规则 <https://github.com/ethereum/solidity/blob/develop/libevmasm/RuleList.h>`_。
+它还结�了相等的代�集并删除了未使用的代�。
+
+基于Yul的优化器�强大得多，因为它�以跨函数调用工作。
+例如，任�跳转在Yul中是��能的，
+所以有�能计算�个函数的副作用。�设有两个函数调用，
+其中第一个�修改存储，第二个修改存储。
+如果它们的�数和返回值�相互�赖，我们就�以对函数调用�新排�。
+�样地，如果一个函数是没有副作用的，而且其结果是乘以0的，就�以完全删除该函数调用。
+
+<<<<<<< HEAD
+目�，�数 ``--optimize`` 会为生�的字节�激活基于�作�的优化器，
+并为内部生�的 Yul 代�激活 Yul 优化器，例如当使用 ABI coder v2 时。
+您�以使用 ``solc --ir optimized --optimize`` �为 Solidity ��产生一个优化的 Yul IR。
+�样地，您�以使用 ``solc --strict-assembly --optimize`` �产生一个独立的 Yul 模�。
 
-The opcode-based optimizer applies a set of `simplification rules <https://github.com/ethereum/solidity/blob/develop/libevmasm/RuleList.h>`_
-to opcodes. It also combines equal code sets and removes unused code.
-
-The Yul-based optimizer is much more powerful, because it can work across function
-calls. For example, arbitrary jumps are not possible in Yul, so it is
-possible to compute the side-effects of each function. Consider two function calls,
-where the first does not modify storage and the second does modify storage.
-If their arguments and return values do not depend on each other, we can reorder
-the function calls. Similarly, if a function is
-side-effect free and its result is multiplied by zero, you can remove the function
-call completely.
+.. note::
+    `窥视孔（peephole）优化器 <https://en.wikipedia.org/wiki/Peephole_optimization>`_
+    和内�器总是默认�用的，�能通过 :ref:`标准 JSON 文件�置 <compiler-api>` 关闭。
+
+您�以在下�找到关于这两个优化器模��其优化步骤的更多细节。
+=======
+The codegen-based optimizer affects the initial low-level code produced from the Solidity input.
+In the legacy pipeline, the bytecode is generated immediately and most of the optimizations of this
+kind are implicit and not configurable, the only exception being an optimization which changes the
+order of literals in binary operations.
+The IR-based pipeline takes a different approach and produces Yul IR closely matching the structure
+of the Solidity code, with nearly all optimizations deferred to the Yul optimizer module.
+In that case codegen-level optimization is done only in very limited cases which are difficult to
+handle in Yul IR, but are straightforward with the high-level information from analysis phase at hand.
+An example of such an optimization is the bypass of checked arithmetic when incrementing the counter
+in certain idiomatic ``for`` loops.
 
 Currently, the parameter ``--optimize`` activates the opcode-based optimizer for the
 generated bytecode and the Yul optimizer for the Yul code generated internally, for example for ABI coder v2.
@@ -27,71 +56,69 @@ optimized Yul IR for a Solidity source. Similarly, one can use ``solc --strict-a
 for a stand-alone Yul mode.
 
 .. note::
-    The `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_ is always
+    Some optimizer steps, such as, for example, the `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_
+    and the :ref:`unchecked loop increment optimizer <unchecked-loop-optimizer>` are always
     enabled by default and can only be turned off via the :ref:`Standard JSON <compiler-api>`.
 
+.. note::
+    An empty optimizer sequence is accepted even without ``--optimize`` in order to fully disable
+    the user-supplied portion of the Yul :ref:`optimizer sequence <selecting-optimizations>`, as by default,
+    even when the optimizer is not turned on, the :ref:`unused pruner <unused-pruner>` step will be run.
+
 You can find more details on both optimizer modules and their optimization steps below.
+>>>>>>> english/develop
 
-Benefits of Optimizing Solidity Code
+优化Solidity代�的好处
 ====================================
 
-Overall, the optimizer tries to simplify complicated expressions, which reduces both code
-size and execution cost, i.e., it can reduce gas needed for contract deployment as well as for external calls made to the contract.
-It also specializes or inlines functions. Especially
-function inlining is an operation that can cause much bigger code, but it is
-often done because it results in opportunities for more simplifications.
-
+总的�说，优化器试图简化��的表达�，从而�少代�大�和执行�本，
+也就是说，它�以�少部署�约以�对�约进行外部调用所需的气体。
+它还会对函数进行专业化或内�化优化。特别是当函数内�一个�能导致更大的代��作时，
+它�常这样�，因为这导致了更多简化的机会。
 
-Differences between Optimized and Non-Optimized Code
+优化和�优化代�之间的差异
 ====================================================
 
-Generally, the most visible difference is that constant expressions are evaluated at compile time.
-When it comes to the ASM output, one can also notice a reduction of equivalent or duplicate
-code blocks (compare the output of the flags ``--asm`` and ``--asm --optimize``). However,
-when it comes to the Yul/intermediate-representation, there can be significant
-differences, for example, functions may be inlined, combined, or rewritten to eliminate
-redundancies, etc. (compare the output between the flags ``--ir`` and
-``--optimize --ir-optimized``).
+一般�说，最明显的区别是常�表达�在编译时被评估。
+当涉�到ASM输出时，人们也�以注�到等价或��的代��的�少（比较 ``--asm`` 和 ``--asm --optimize`` 标志的输出）。
+然而，当涉�到Yul/中间代表时，�能会有明显的差异，
+例如，函数�能被内�，�并或�写以消除冗余等等（比较带有 ``--ir`` 和 ``--optimize --ir-optimized`` 标志的输出）。
 
 .. _optimizer-parameter-runs:
 
-Optimizer Parameter Runs
+优化器�数�行
 ========================
 
-The number of runs (``--optimize-runs``) specifies roughly how often each opcode of the
-deployed code will be executed across the life-time of the contract. This means it is a
-trade-off parameter between code size (deploy cost) and code execution cost (cost after deployment).
-A "runs" parameter of "1" will produce short but expensive code. In contrast, a larger "runs"
-parameter will produce longer but more gas efficient code. The maximum value of the parameter
-is ``2**32-1``.
+�行次数（ ``--optimize-runs`` ）大致规定了在�约有效期内，
+所部署的代�的�个�作�被执行的频率。
+这�味�它是代�大�（部署�本）和代�执行�本（部署�的�本）之间的一个折衷�数。
+一个 “�行� �数为 “1� 将产生简短的�约但昂贵的执行代�。相�，
+一个较大的 “�行� �数将产生较大的�约但更�气体的执行代�。
+该�数的最大值为 ``2**32-1``。
 
 .. note::
 
-    A common misconception is that this parameter specifies the number of iterations of the optimizer.
-    This is not true: The optimizer will always run as many times as it can still improve the code.
+    一个常�的误解是，这个�数指定了优化器的迭代次数。这是�正确的。
+    优化器将始终�行尽�能多的次数�改进代�。
 
-Opcode-Based Optimizer Module
+基于�作�的优化器模�
 =============================
 
-The opcode-based optimizer module operates on assembly code. It splits the
-sequence of instructions into basic blocks at ``JUMPs`` and ``JUMPDESTs``.
-Inside these blocks, the optimizer analyzes the instructions and records every modification to the stack,
-memory, or storage as an expression which consists of an instruction and
-a list of arguments which are pointers to other expressions.
-
-Additionally, the opcode-based optimizer
-uses a component called "CommonSubexpressionEliminator" that, amongst other
-tasks, finds expressions that are always equal (on every input) and combines
-them into an expression class. It first tries to find each new
-expression in a list of already known expressions. If no such matches are found,
-it simplifies the expression according to rules like
-``constant + constant = sum_of_constants`` or ``X * 1 = X``. Since this is
-a recursive process, we can also apply the latter rule if the second factor
-is a more complex expression which we know always evaluates to one.
-
-Certain optimizer steps symbolically track the storage and memory locations. For example, this
-information is used to compute Keccak-256 hashes that can be evaluated during compile time. Consider
-the sequence:
+基于�作�的优化器模�对汇编代�进行�作。
+它在 ``JUMPs`` 和 ``JUMPDESTs`` 之间将指令�列分�基本�。
+在这些�中，优化器分�指令，并将对堆栈�内存或存储的�一次修改记录为一个表达�，
+该表达�由一�指令和一列�数组�，这些�数是指�其他表达�的指针。
+
+此外，基于�作�的优化器使用了一个�为 “通用�表达�消除器� 的组件，
+它除其他任务外，还能找到总是相等的表达�（在�个输入上），
+并将它们�并为一个表达�类。它首先�试在一个已�知�的表达�列表中找到�个新的表达�。
+如果没有找到这样的匹�，
+它就根� ``constant + constant = sum_of_constants`` 或 ``X * 1 = X`` 这样的规则简化表达�。
+由于这是一个递归过程，如果第二个因素是一个更��的表达�，并且知�这个表达�的值总是为1，我们也�以应用�一个规则。
+
+�些优化器步骤象�性地跟踪存储和内存�置。例如，
+这些信�被用�计算Keccak-256哈希值，�以在编译时进行评估。
+考虑一下这个�列：
 
 .. code-block:: none
 
@@ -103,7 +130,7 @@ the sequence:
     MSTORE
     KECCAK256
 
-or the equivalent Yul
+或�等�于Yul为
 
 .. code-block:: yul
 
@@ -111,107 +138,96 @@ or the equivalent Yul
     mstore(x, 100)
     let value := keccak256(x, 32)
 
-In this case, the optimizer tracks the value at a memory location ``calldataload(0)`` and then
-realizes that the Keccak-256 hash can be evaluated at compile time. This only works if there is no
-other instruction that modifies memory between the ``mstore`` and ``keccak256``. So if there is an
-instruction that writes to memory (or storage), then we need to erase the knowledge of the current
-memory (or storage). There is, however, an exception to this erasing, when we can easily see that
-the instruction doesn't write to a certain location.
+在这�情况下，优化器跟踪�于内存�置 ``calldataload(0)`` 的值，
+然��识到Keccak-256哈希值�以在编译时被评估。
+这�有在 ``mstore`` 和 ``keccak256`` 之间没有其他指令修改内存时�有效。
+因此，如果有一�指令写到内存（或存储），那么我们需�擦除对当�内存（或存储）的记忆。
+然而，这�擦除有一个例外，当我们�以很容易地看到指令没有写到�个�置。
 
-For example,
+示例，
 
 .. code-block:: yul
 
     let x := calldataload(0)
     mstore(x, 100)
-    // Current knowledge memory location x -> 100
+    // 已知当�内存�置x -> 100
     let y := add(x, 32)
-    // Does not clear the knowledge that x -> 100, since y does not write to [x, x + 32)
+    // 没有清除 x -> 100 的记忆，因为y并没有写到[x，x+32）。
     mstore(y, 200)
-    // This Keccak-256 can now be evaluated
+    // 现在�以对这个Keccak-256进行计算了
     let value := keccak256(x, 32)
 
-Therefore, modifications to storage and memory locations, of say location ``l``, must erase
-knowledge about storage or memory locations which may be equal to ``l``. More specifically, for
-storage, the optimizer has to erase all knowledge of symbolic locations, that may be equal to ``l``
-and for memory, the optimizer has to erase all knowledge of symbolic locations that may not be at
-least 32 bytes away. If ``m`` denotes an arbitrary location, then this decision on erasure is done
-by computing the value ``sub(l, m)``. For storage, if this value evaluates to a literal that is
-non-zero, then the knowledge about ``m`` will be kept. For memory, if the value evaluates to a
-literal that is between ``32`` and ``2**256 - 32``, then the knowledge about ``m`` will be kept. In
-all other cases, the knowledge about ``m`` will be erased.
-
-After this process, we know which expressions have to be on the stack at
-the end, and have a list of modifications to memory and storage. This information
-is stored together with the basic blocks and is used to link them. Furthermore,
-knowledge about the stack, storage and memory configuration is forwarded to
-the next block(s).
-
-If we know the targets of all ``JUMP`` and ``JUMPI`` instructions,
-we can build a complete control flow graph of the program. If there is only
-one target we do not know (this can happen as in principle, jump targets can
-be computed from inputs), we have to erase all knowledge about the input state
-of a block as it can be the target of the unknown ``JUMP``. If the opcode-based
-optimizer module finds a ``JUMPI`` whose condition evaluates to a constant, it transforms it
-to an unconditional jump.
-
-As the last step, the code in each block is re-generated. The optimizer creates
-a dependency graph from the expressions on the stack at the end of the block,
-and it drops every operation that is not part of this graph. It generates code
-that applies the modifications to memory and storage in the order they were
-made in the original code (dropping modifications which were found not to be
-needed). Finally, it generates all values that are required to be on the
-stack in the correct place.
-
-These steps are applied to each basic block and the newly generated code
-is used as replacement if it is smaller. If a basic block is split at a
-``JUMPI`` and during the analysis, the condition evaluates to a constant,
-the ``JUMPI`` is replaced based on the value of the constant. Thus code like
+因此，对存储和内存�置的修改，比如说�置 ``l``，
+必须擦除关于�能等于 ``l`` 的存储或内存�置的记忆。更具体地说，
+对于存储，优化器必须删除所有�能等于 ``l`` 的符��置的记忆，
+对于内存，优化器必须删除所有�能�超过32字节的符��置的记忆。
+如果 ``m`` 表示一个任�的�置，那么这个擦除的决定是通过计算 ``sub(l, m)`` 的值�完�。
+对于存储，如果这个值被评估为一个�零的值，那么关于 ``m`` 的记忆将被�留。
+对于内存，如果这个值被评估为一个介于 ``32`` 和 ``2**256 - 32`` 之间的值，那么关于 ``m`` 的记忆将被�留。
+在所有其他情况下，关于 ``m`` 的记忆将被删除。
+
+并且有一个对内存和存储的修改列表。
+这些信�与基本代��一起存储并用�链接它们。此外，
+关于堆栈�存储和内存�置的记忆被转�给下一个（几个）�。
+
+如果我们知�所有 ``JUMP`` 和 ``JUMPI`` 指令的目标，
+我们就�以构建一个完整的程��程图。
+如果�有一个我们�知�的目标（原则上�能�生，跳转目标�以基于输入�计算），
+我们必须消除关于代��输入状�的所有信�，因为它�能是未知的 ``JUMP`` 目标。
+如果一个 ``JUMPI`` 的�件等于一个常�，它将被转�为无�件跳转。
+
+作为最�一步，�个�中的代�都会被完全�新生�。
+然�优化器会从代��的结尾处在栈上的表达�开始创建�赖关系图，
+且�是该图组�部分的�个�作都会被丢弃。
+这样生�的代�将按照原始代�中的顺�对内存和存储进行修改（�弃�需�的修改）。
+最�，它生�了所有需�在堆栈中的正确�置的值。
+
+这些步骤适用于�个基本代��，如果代��较�，则新生�的代�将用作替�。
+如果一个基本代��在 ``JUMPI`` 处被分割，且在分�过程中被评估为一个常数，
+则会根�常�的值�替� ``JUMPI``，因此，类似于
 
 .. code-block:: solidity
 
     uint x = 7;
     data[7] = 9;
-    if (data[x] != x + 2) // this condition is never true
+    if (data[x] != x + 2) // 这个�件永远�会是真的
       return 2;
     else
       return 1;
 
-simplifies to this:
+简化为这样：
 
 .. code-block:: solidity
 
     data[7] = 9;
     return 1;
 
-Simple Inlining
+简�内�
 ---------------
 
-Since Solidity version 0.8.2, there is another optimizer step that replaces certain
-jumps to blocks containing "simple" instructions ending with a "jump" by a copy of these instructions.
-This corresponds to inlining of simple, small Solidity or Yul functions. In particular, the sequence
-``PUSHTAG(tag) JUMP`` may be replaced, whenever the ``JUMP`` is marked as jump "into" a
-function and behind ``tag`` there is a basic block (as described above for the
-"CommonSubexpressionEliminator") that ends in another ``JUMP`` which is marked as a jump
-"out of" a function.
+从Solidity 0.8.2版本开始，有�一个优化步骤，
+它用这些指令的拷��替��些包�以 “跳转� 结�的 “简�� 指令的�的跳转。
+这相当于对简�的��的Solidity或Yul函数进行内�。特别是，
+``PUSHTAG(tag) JUMP`` �列�以被替�，�� ``JUMP`` 被标记为 "进入" 一个函数的跳转，
+并且在 ``tag`` ��有一个基本�（如上��述的 “通用�表达�消除器�），
+它以�一个 ``JUMP`` 结�，被标记为 “离开� 一个函数的跳转。
+
 
-In particular, consider the following prototypical example of assembly generated for a
-call to an internal Solidity function:
+特别是，考虑以下为调用内部Solidity函数而生�的汇编的原型例�:
 
 .. code-block:: text
 
       tag_return
       tag_f
-      jump      // in
+      jump      // 从此进入
     tag_return:
       ...opcodes after call to f...
 
     tag_f:
       ...body of function f...
-      jump      // out
+      jump      // 从此退出
 
-As long as the body of the function is a continuous basic block, the "Inliner" can replace ``tag_f jump`` by
-the block at ``tag_f`` resulting in:
+��函数的主体是一个连续的基本�，“内�� 就�以用�于 ``tag_f`` 处的��代替 ``tag_f jump`` ，结果是：
 
 .. code-block:: text
 
@@ -223,10 +239,9 @@ the block at ``tag_f`` resulting in:
 
     tag_f:
       ...body of function f...
-      jump      // out
+      jump      // 从此退出
 
-Now ideally, the other optimizer steps described above will result in the return tag push being moved
-towards the remaining jump resulting in:
+现在，�想情况下，上述的其他优化器步骤将导致返回标签的推�被移�剩余的跳转，从而导致：
 
 .. code-block:: text
 
@@ -238,59 +253,63 @@ towards the remaining jump resulting in:
 
     tag_f:
       ...body of function f...
-      jump      // out
+      jump      // 从此退出
 
-In this situation the "PeepholeOptimizer" will remove the return jump. Ideally, all of this can be done
-for all references to ``tag_f`` leaving it unused, s.t. it can be removed, yielding:
+在这�情况下，“窥视孔优化器（PeepholeOptimizer）� 将删除返回跳转。�想情况下，
+所有对 ``tag_f`` 的引用都�以这样�，而�使用它，特别处�的�，它也�以被移除：
 
 .. code-block:: text
 
     ...body of function f...
     ...opcodes after call to f...
 
-So the call to function ``f`` is inlined and the original definition of ``f`` can be removed.
+因此，对函数 ``f`` 的调用是内�的，�以删除 ``f`` 的原始定义。
 
-Inlining like this is attempted, whenever a heuristics suggests that inlining is cheaper over the lifetime of a
-contract than not inlining. This heuristics depends on the size of the function body, the
-number of other references to its tag (approximating the number of calls to the function) and
-the expected number of executions of the contract (the global optimizer parameter "runs").
+无论何时，�����算法表明，在��的生命周期内，内�比�内�更便宜，就会�试这样的内�。
+这����方法�决于函数体的大��对其标记的其他引用的数�（近似于函数调用的数�）
+以��约的预期执行次数（全局优化器�数 "runs"）。
 
 
-Yul-Based Optimizer Module
+基于Yul的优化器模�
 ==========================
 
-The Yul-based optimizer consists of several stages and components that all transform
-the AST in a semantically equivalent way. The goal is to end up either with code
-that is shorter or at least only marginally longer but will allow further
-optimization steps.
+基于Yul的优化器由几个阶段和组件组�，它们都以语义等效的方�转�AST。
+我们的目标是，最终的代��么更短，�么至少略长，但�许进一步的优化步骤。
 
 .. warning::
 
-    Since the optimizer is under heavy development, the information here might be outdated.
-    If you rely on a certain functionality, please reach out to the team directly.
+    由于优化器正在进行大�开�，这里的信��能已�过时。
+    如果您�赖�项功能，请直接�系团队。
 
-The optimizer currently follows a purely greedy strategy and does not do any
-backtracking.
+优化器目��循的是一�纯粹的贪婪策略，��任何回溯。
 
-All components of the Yul-based optimizer module are explained below.
-The following transformation steps are the main components:
+下�将解释基于Yul的优化器模�的所有组件。
+以下的转�步骤是主�的组�部分：
 
+<<<<<<< HEAD
+- SSA转�
+- 通用�表达�消除器
+- 表达�简化器
+- 冗余赋值消除器
+- 完全内�
+=======
 - SSA Transform
 - Common Subexpression Eliminator
 - Expression Simplifier
-- Redundant Assign Eliminator
+- Unused Assign Eliminator
 - Full Inliner
+>>>>>>> english/develop
 
 .. _optimizer-steps:
 
-Optimizer Steps
+优化器的步骤
 ---------------
 
-This is a list of all steps the Yul-based optimizer sorted alphabetically. You can find more information
-on the individual steps and their sequence below.
+这是按字�顺�排列的基于Yul的优化器的所有步骤的列表。
+您�以在下�找到更多关于�个步骤和它们的顺�的信�。
 
 ============ ===============================
-Abbreviation Full name
+缩略语        全称  
 ============ ===============================
 ``f``        :ref:`block-flattener`
 ``l``        :ref:`circular-reference-pruner`
@@ -315,109 +334,118 @@ Abbreviation Full name
 ``T``        :ref:`literal-rematerialiser`
 ``L``        :ref:`load-resolver`
 ``M``        :ref:`loop-invariant-code-motion`
+<<<<<<< HEAD
 ``r``        :ref:`redundant-assign-eliminator`
+``R``        :ref:`reasoning-based-simplifier` - 高度实验性
+=======
+>>>>>>> english/develop
 ``m``        :ref:`rematerialiser`
 ``V``        :ref:`SSA-reverser`
 ``a``        :ref:`SSA-transform`
 ``t``        :ref:`structural-simplifier`
+``r``        :ref:`unused-assign-eliminator`
 ``p``        :ref:`unused-function-parameter-pruner`
 ``S``        :ref:`unused-store-eliminator`
 ``u``        :ref:`unused-pruner`
 ``d``        :ref:`var-decl-initializer`
 ============ ===============================
 
-Some steps depend on properties ensured by ``BlockFlattener``, ``FunctionGrouper``, ``ForLoopInitRewriter``.
-For this reason the Yul optimizer always applies them before applying any steps supplied by the user.
+一些步骤�赖于 ``BlockFlattener``， ``FunctionGrouper``， ``ForLoopInitRewriter`` 所��的属性。
+由于这个原因，Yul 优化器总是在应用用户�供的任何步骤之�应用它们。
 
+<<<<<<< HEAD
+基于推�的简化器（ReasoningBasedSimplifier）是一个优化器步骤，
+目�在默认步骤集中没有�用。它使用一个 SMT 求解器�简化算术表达�和布尔�件。
+此外，它还没有得到彻底的测试或验�，�能会产生���现的结果，所以请谨慎使用!
+=======
+.. _selecting-optimizations:
+>>>>>>> english/develop
 
-Selecting Optimizations
+选择优化方案
 -----------------------
 
-By default the optimizer applies its predefined sequence of optimization steps to the generated assembly.
-You can override this sequence and supply your own using the ``--yul-optimizations`` option:
+默认情况下，优化器将其预定义的优化步骤�列应用于生�的程�集。
+您�以使用 ``--yul-optimizations`` 选项�覆盖这个�列并�供您自己的�列：
 
 .. code-block:: bash
 
     solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOcmu'
 
-The order of steps is significant and affects the quality of the output.
-Moreover, applying a step may uncover new optimization opportunities for others that were already applied,
-so repeating steps is often beneficial.
+步骤的顺�很��，会影�到输出的质�。
+此外，应用一个步骤�能为其他已�应用的步骤�现新的优化机会。因此，��步骤往往是有益的。
 
-The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
-remains unchanged or until the maximum number of rounds (currently 12) has been reached.
-Brackets (``[]``) may be used multiple times in a sequence, but can not be nested.
+``[...]`` 里�的�列将在一个循环中多次应用，
+直到 Yul 代�����或达到最大轮数（目�是12）。
+方括�（ ``[]`` ）�以在一个�列中多次使用，但�能嵌套。
 
-An important thing to note, is that there are some hardcoded steps that are always run before and after the
-user-supplied sequence, or the default sequence if one was not supplied by the user.
+需�注�的一件事是，有一些硬编�的步骤总是在用户�供的�列之�和之��行，
+如果用户没有�供�列，则是默认�列。
 
-The cleanup sequence delimiter ``:`` is optional, and is used to supply a custom cleanup sequence
-in order to replace the default one. If omitted, the optimizer will simply apply the default cleanup
-sequence. In addition, the delimiter may be placed at the beginning of the user-supplied sequence,
-which will result in the optimization sequence being empty, whereas conversely, if placed at the end of
-the sequence, will be treated as an empty cleanup sequence.
+清��列分界符 ``:`` 是�选的，用于�供一个自定义的清��列，
+以�代默认�列。如果�略，优化器将简�地应用默认的清��列。
+此外，定界符�以放在用户�供的�列的开头，
+这将导致优化�列为空，�之，如果放在�列的末尾，
+将被视为一个空的清��列。
 
-Preprocessing
+预处�
 -------------
 
-The preprocessing components perform transformations to get the program
-into a certain normal form that is easier to work with. This normal
-form is kept during the rest of the optimization process.
+预处�组件进行转�，使程�����更容易�作的正常形�。
+这�正常形�在剩下的优化过程中被�留。
 
 .. _disambiguator:
 
-Disambiguator
+消歧器
 ^^^^^^^^^^^^^
 
-The disambiguator takes an AST and returns a fresh copy where all identifiers have
-unique names in the input AST. This is a prerequisite for all other optimizer stages.
-One of the benefits is that identifier lookup does not need to take scopes into account
-which simplifies the analysis needed for other steps.
+消歧器获�AST并返回一个新拷�，其中所有标识符在输入AST中都有唯一的�称。
+这是所有其他优化器阶段的先决�件。
+其中一个好处是，标识符查找�需�考虑作用域，
+这简化了其他步骤所需的分�。
 
-All subsequent stages have the property that all names stay unique. This means if
-a new identifier needs to be introduced, a new unique name is generated.
+所有�续阶段都有一个属性，�所有的�字都��唯一。
+这�味�如果需�引入一个新的标识符，就会产生一个新的唯一�称。
 
 .. _function-hoister:
 
-FunctionHoister
+函数��器
 ^^^^^^^^^^^^^^^
 
-The function hoister moves all function definitions to the end of the topmost block. This is
-a semantically equivalent transformation as long as it is performed after the
-disambiguation stage. The reason is that moving a definition to a higher-level block cannot decrease
-its visibility and it is impossible to reference variables defined in a different function.
+函数��器将所有的函数定义移到最上�的�的末尾。
+��在消歧义阶段之�进行，这就是一个语义上的等价转�。
+原因是，将一个定义移到更高层次的�中�能�低其��性，
+而且��能引用在��函数中定义的��。
 
-The benefit of this stage is that function definitions can be looked up more easily
-and functions can be optimized in isolation without having to traverse the AST completely.
+这个阶段的好处是，�以更容易地查找函数定义，
+并且�以孤立地优化函数，而�必完全�历AST。
 
 .. _function-grouper:
 
-FunctionGrouper
+函数分组器
 ^^^^^^^^^^^^^^^
 
-The function grouper has to be applied after the disambiguator and the function hoister.
-Its effect is that all topmost elements that are not function definitions are moved
-into a single block which is the first statement of the root block.
+函数分组器必须在消歧义器和函数��器之�应用。
+它的作用是将所有�是函数定义的最上�的元素移到一个�一的�中，
+这个�是根�的第一个语�。
 
-After this step, a program has the following normal form:
+在这一步之�，一个程�具有以下正常形�：
 
 .. code-block:: text
 
     { I F... }
 
-Where ``I`` is a (potentially empty) block that does not contain any function definitions (not even recursively)
-and ``F`` is a list of function definitions such that no function contains a function definition.
+其中 ``I`` 是一个（�能是空的）区�，�包�任何函数定义（甚至是递归的），
+``F`` 是一个函数定义的列表，使得没有一个函数包�函数定义。
 
-The benefit of this stage is that we always know where the list of function begins.
+这个阶段的好处是，我们总是知�功能列表的开始�置。
 
 .. _for-loop-condition-into-body:
 
-ForLoopConditionIntoBody
+循环�件进入正文
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-This transformation moves the loop-iteration condition of a for-loop into loop body.
-We need this transformation because :ref:`expression-splitter` will not
-apply to iteration condition expressions (the ``C`` in the following example).
+这�转�将for循环的循环迭代�件移动到循环体中。
+我们需�这�转�，因为 :ref:`expression-splitter` 将�适用于迭代�件表达�（以下示例中的 ``C``）。
 
 .. code-block:: text
 
@@ -425,7 +453,7 @@ apply to iteration condition expressions (the ``C`` in the following example).
         Body...
     }
 
-is transformed to
+被转化为
 
 .. code-block:: text
 
@@ -434,16 +462,15 @@ is transformed to
         Body...
     }
 
-This transformation can also be useful when paired with ``LoopInvariantCodeMotion``, since
-invariants in the loop-invariant conditions can then be taken outside the loop.
+当与 ``循环��代�模�`` ��时，这�转�也是有用的，因为循环���件中的����以在循环之外进行。
+
 
 .. _for-loop-init-rewriter:
 
-ForLoopInitRewriter
+循环�始�写器
 ^^^^^^^^^^^^^^^^^^^
 
-This transformation moves the initialization part of a for-loop to before
-the loop:
+这�转�将for-loop的�始化部分移到循环之�：
 
 .. code-block:: text
 
@@ -451,7 +478,7 @@ the loop:
         Body...
     }
 
-is transformed to
+被转化为
 
 .. code-block:: text
 
@@ -460,31 +487,35 @@ is transformed to
         Body...
     }
 
+<<<<<<< HEAD
+这简化了其余的优化过程，
+因为我们�以忽略for循环�始化�的��范围规则。
+=======
 This eases the rest of the optimization process because we can ignore
-the complicated scoping rules of the for loop initialisation block.
+the complicated scoping rules of the for loop initialization block.
+>>>>>>> english/develop
 
 .. _var-decl-initializer:
 
-VarDeclInitializer
+�始化程�
 ^^^^^^^^^^^^^^^^^^
-This step rewrites variable declarations so that all of them are initialized.
-Declarations like ``let x, y`` are split into multiple declaration statements.
+这一步�写了��声明，使所有的��都被�始化。
+� ``let x, y`` 这样的声明被分割�多个声明语�。
 
-Only supports initializing with the zero literal for now.
+目��支�用零值�始化。
 
-Pseudo-SSA Transformation
+伪SSA转�
 -------------------------
 
-The purpose of this components is to get the program into a longer form,
-so that other components can more easily work with it. The final representation
-will be similar to a static-single-assignment (SSA) form, with the difference
-that it does not make use of explicit "phi" functions which combines the values
-from different branches of control flow because such a feature does not exist
-in the Yul language. Instead, when control flow merges, if a variable is re-assigned
-in one of the branches, a new SSA variable is declared to hold its current value,
-so that the following expressions still only need to reference SSA variables.
+这个组件的目的是让程���一个较长的形�，
+以便其他组件能够更容易地与之��。
+最终的表现形�将类似于���一赋值（SSA）的形�，��的是，
+它�使用明确的 "phi" 函数��并�自控制���分支的值，
+因为Yul语言中�存在这样的功能。相�，当控制��并时，
+如果一个��在其中一个分支中被�新赋值，就会声明一个新的SSA�����它的当�值，
+这样，下�的表达��然�需�引用SSA��。
 
-An example transformation is the following:
+下�是一个转�的例�：
 
 .. code-block:: yul
 
@@ -499,8 +530,7 @@ An example transformation is the following:
     }
 
 
-When all the following transformation steps are applied, the program will look
-as follows:
+应用以下所有转�步骤�，程�将如下所示：
 
 .. code-block:: yul
 
@@ -527,30 +557,27 @@ as follows:
         sstore(a_13, _8)
     }
 
-Note that the only variable that is re-assigned in this snippet is ``b``.
-This re-assignment cannot be avoided because ``b`` has different values
-depending on the control flow. All other variables never change their
-value once they are defined. The advantage of this property is that
-variables can be freely moved around and references to them
-can be exchanged by their initial value (and vice-versa),
-as long as these values are still valid in the new context.
+请注�，此代�段中唯一�新分�的��是 ``b``。
+无法��这��新分�，因为根�控制�， ``b`` 具有��的值。
+所有其他��在定义�都�会改�其值。
+该属性的优点是，���以自由移动，
+对它们的引用�以通过它们的�始值进行交�（�之亦然），
+��这些值在新上下文中�然有效。
 
-Of course, the code here is far from being optimized. To the contrary, it is much
-longer. The hope is that this code will be easier to work with and furthermore,
-there are optimizer steps that undo these changes and make the code more
-compact again at the end.
+当然，这里的代�远远没有得到优化。相�，它�长得多。
+我们希望这段代�更容易使用，此外，还有一些优化器步骤�以撤销这些更改，
+并在最�使代�更加紧凑。
 
 .. _expression-splitter:
 
-ExpressionSplitter
+表达�拆分器
 ^^^^^^^^^^^^^^^^^^
 
-The expression splitter turns expressions like ``add(mload(0x123), mul(mload(0x456), 0x20))``
-into a sequence of declarations of unique variables that are assigned sub-expressions
-of that expression so that each function call has only variables
-as arguments.
+表达�拆分器将诸如 ``add(mload(0x123), mul(mload(0x456), 0x20))``
+这样的表达���一连串独特��的声明，这些��被分�给该表达�的�表达�，
+这样�个函数调用�有��作为�数。
 
-The above would be transformed into
+上述内容将被转化为
 
 .. code-block:: yul
 
@@ -564,33 +591,34 @@ The above would be transformed into
         let z := add(_6, _4)
     }
 
-Note that this transformation does not change the order of opcodes or function calls.
+请注�，这�转�并�改��作�或函数调用的顺�。
 
-It is not applied to loop iteration-condition, because the loop control flow does not allow
-this "outlining" of the inner expressions in all cases. We can sidestep this limitation by applying
-:ref:`for-loop-condition-into-body` to move the iteration condition into loop body.
+它�适用于循环迭代�件，因为循环控制���许在所有情况下 “概述� 内部表达�。
+我们�以通过应用 :ref:`for-loop-condition-into-body` 将迭代�件移动到循环体中，从而�开这个�制。
 
+<<<<<<< HEAD
+最�一个程�的形�应确�（循环�件除外）函数调用�会嵌套在表达�中，
+所有函数调用�数都必须是��。
+=======
 The final program should be in an *expression-split form*, where (with the exception of loop conditions)
 function calls cannot appear nested inside expressions
 and all function call arguments have to be variables.
+>>>>>>> english/develop
 
-The benefits of this form are that it is much easier to re-order the sequence of opcodes
-and it is also easier to perform function call inlining. Furthermore, it is simpler
-to replace individual parts of expressions or re-organize the "expression tree".
-The drawback is that such code is much harder to read for humans.
+这�形�的好处是，更容易�新排列�作��列，
+也更容易执行函数调用内�。此外，
+也更简�地替�表达�的�个部分或�新组织 “表达�树�。
+缺点是这样的代�对我们�说更难阅读。
 
 .. _SSA-transform:
 
-SSATransform
+SSA转�
 ^^^^^^^^^^^^
 
-This stage tries to replace repeated assignments to
-existing variables by declarations of new variables as much as
-possible.
-The reassignments are still there, but all references to the
-reassigned variables are replaced by the newly declared variables.
+这个阶段尽�能地用新��的声明��代对现有��的��赋值。
+�新赋值�然存在，但是所有对�新赋值的��的引用都被新声明的��所�代。
 
-Example:
+示例：
 
 .. code-block:: yul
 
@@ -600,7 +628,7 @@ Example:
         a := 3
     }
 
-is transformed to
+被转化为
 
 .. code-block:: yul
 
@@ -612,40 +640,43 @@ is transformed to
         a := a_3
     }
 
-Exact semantics:
+精确语义：
 
-For any variable ``a`` that is assigned to somewhere in the code
-(variables that are declared with value and never re-assigned
-are not modified) perform the following transforms:
+对于任何在代�中被分�到�处的�� ``a``
+（带值声明且从未�新分�的���被修改），执行以下转�:
 
-- replace ``let a := v`` by ``let a_i := v   let a := a_i``
-- replace ``a := v`` by ``let a_i := v   a := a_i`` where ``i`` is a number such that ``a_i`` is yet unused.
+- 将 ``let a := v`` 替�为 ``let a_i := v   let a := a_i``
+- 将 ``a := v`` 替�为 ``let a_i := v   a := a_i``, 其中 ``i`` 是一个数字，使得 ``a_i`` 尚未使用。
 
-Furthermore, always record the current value of ``i`` used for ``a`` and replace each
-reference to ``a`` by ``a_i``.
-The current value mapping is cleared for a variable ``a`` at the end of each block
-in which it was assigned to and at the end of the for loop init block if it is assigned
-inside the for loop body or post block.
-If a variable's value is cleared according to the rule above and the variable is declared outside
-the block, a new SSA variable will be created at the location where control flow joins,
-this includes the beginning of loop post/body block and the location right after
-If/Switch/ForLoop/Block statement.
+此外，总是记录用于 ``a`` 的 ``i`` 的当�值，并用 ``a_i`` 替�对 ``a`` 的�次引用。
+�� ``a`` 的当�值映射在�个分�给它的�结�时被清除，
+如果它被分�在for循环体或post�内，则在for循环�始�结�时被清除。
+如果一个��的值根�上�的规则被清除，并且该��被声明在�之外，
+一个新的SSA��将在控制�加入的�置被创建，这包括循环�/体�的开始和If/Switch/ForLoop/Block语�之�的�置。
 
-After this stage, the Redundant Assign Eliminator is recommended to remove the unnecessary
+<<<<<<< HEAD
+在此阶段之�，建议使用冗余赋值消除器删除�必�的中间分�。
+=======
+After this stage, the Unused Assign Eliminator is recommended to remove the unnecessary
 intermediate assignments.
+>>>>>>> english/develop
 
-This stage provides best results if the Expression Splitter and the Common Subexpression Eliminator
-are run right before it, because then it does not generate excessive amounts of variables.
-On the other hand, the Common Subexpression Eliminator could be more efficient if run after the
-SSA transform.
+如果在这个阶段之��行表达�拆分器和通用�表达�消除器，
+那么这个阶段会�供最好的结果，因为这样就�会产生过多的��。
+�一方�，如果在SSA转�之��行通用�表达�消除器，则效率更高。
 
-.. _redundant-assign-eliminator:
+.. _unused-assign-eliminator:
 
-RedundantAssignEliminator
+<<<<<<< HEAD
+冗余赋值消除器
 ^^^^^^^^^^^^^^^^^^^^^^^^^
+=======
+UnusedAssignEliminator
+^^^^^^^^^^^^^^^^^^^^^^
+>>>>>>> english/develop
 
-The SSA transform always generates an assignment of the form ``a := a_i``, even though
-these might be unnecessary in many cases, like the following example:
+SSA转�总是生� ``a := a_i`` 形�的赋值，
+尽管这些赋值在许多情况下�能是�必�的，比如下�的例�：
 
 .. code-block:: yul
 
@@ -656,7 +687,7 @@ these might be unnecessary in many cases, like the following example:
         sstore(a, 1)
     }
 
-The SSA transform converts this snippet to the following:
+SSA转�将这个片段转�为以下内容:
 
 .. code-block:: yul
 
@@ -670,9 +701,14 @@ The SSA transform converts this snippet to the following:
         sstore(a_3, 1)
     }
 
-The Redundant Assign Eliminator removes all the three assignments to ``a``, because
+<<<<<<< HEAD
+冗余赋值消除器将删除对 ``a`` 的所有三个赋值，因为未使用 ``a`` 的值，
+因此将此代�段转�为严格的SSA形�为：
+=======
+The Unused Assign Eliminator removes all the three assignments to ``a``, because
 the value of ``a`` is not used and thus turn this
 snippet into strict SSA form:
+>>>>>>> english/develop
 
 .. code-block:: yul
 
@@ -683,327 +719,320 @@ snippet into strict SSA form:
         sstore(a_3, 1)
     }
 
-Of course the intricate parts of determining whether an assignment is redundant or not
+<<<<<<< HEAD
+当然，确定分�是�多余的错综��的部分与加入控制�有关。
+=======
+Of course the intricate parts of determining whether an assignment is unused or not
 are connected to joining control flow.
+>>>>>>> english/develop
 
-The component works as follows in detail:
+该组件的详细工作情况如下：
 
-The AST is traversed twice: in an information gathering step and in the
-actual removal step. During information gathering, we maintain a
-mapping from assignment statements to the three states
-"unused", "undecided" and "used" which signifies whether the assigned
-value will be used later by a reference to the variable.
+AST被�历了两次：分别在在信�收集步骤和实际删除步骤中。
+在信�收集过程中，我们维护了一个从赋值语�到 “未使用（unused）�，“未决定（undecided）� 和 “已使用（used）� 三�状�的映射，
+这标志�分�的值是�会在以�被��的引用使用。
 
-When an assignment is visited, it is added to the mapping in the "undecided" state
-(see remark about for loops below) and every other assignment to the same variable
-that is still in the "undecided" state is changed to "unused".
-When a variable is referenced, the state of any assignment to that variable still
-in the "undecided" state is changed to "used".
+当一个赋值被访问时，它被添加到处于 “未决定� 状�的映射中
+（�下�关于for循环的注释），而其他�个�处于 “未决定� 状�的对�一��的赋值被改为 “未使用�。
+当一个��被引用时，任何对该��的赋值�处于 “未决定� 状�，其状�被改�为 “已使用�。
 
-At points where control flow splits, a copy
-of the mapping is handed over to each branch. At points where control flow
-joins, the two mappings coming from the two branches are combined in the following way:
-Statements that are only in one mapping or have the same state are used unchanged.
-Conflicting values are resolved in the following way:
+在控制�分�的地方，映射的拷�被移交给�个分支。
+在控制�汇�的地方，�自两个分支的两个映射以下列方��并：
+�在一个映射中的语�或具有相�状�的语��作改动地使用。
+冲�的值以如下方�解决：
 
-- "unused", "undecided" -> "undecided"
-- "unused", "used" -> "used"
-- "undecided", "used" -> "used"
+- “未使用�， “未决定� -> “未决定�
+- “未使用�， “已使用� -> “已使用�
+- “未决定�， “已使用� -> “已使用�
 
-For for-loops, the condition, body and post-part are visited twice, taking
-the joining control-flow at the condition into account.
-In other words, we create three control flow paths: Zero runs of the loop,
-one run and two runs and then combine them at the end.
+对于For循环，考虑到�件下的连接控制�，将对�件�主体和�部进行两次访问。
+���说，我们创建了三�控制�路径：循环的零次�行�一次�行和两次�行，然�在最��并它们。
 
-Simulating a third run or even more is unnecessary, which can be seen as follows:
+�需�模拟第三次甚至更多的�行，这�以如下所示：
 
-A state of an assignment at the beginning of the iteration will deterministically
-result in a state of that assignment at the end of the iteration. Let this
-state mapping function be called ``f``. The combination of the three different
-states ``unused``, ``undecided`` and ``used`` as explained above is the ``max``
-operation where ``unused = 0``, ``undecided = 1`` and ``used = 2``.
+迭代开始时的赋值状�将决定性地导致该赋值在迭代结�时的状�。
+�如这个状�映射函数被称为 ``f``。如上所述，
+三���状� ``unused（未使用）``， ``undecided（未决定）`` 和 ``used（已使用）`` 的组�是 ``最多（max）`` �作，
+其中 ``unused = 0``， ``undecided = 1``， ``used = 2``。
 
-The proper way would be to compute
+正确的方法是计算
 
 .. code-block:: none
 
     max(s, f(s), f(f(s)), f(f(f(s))), ...)
 
-as state after the loop. Since ``f`` just has a range of three different values,
-iterating it has to reach a cycle after at most three iterations,
-and thus ``f(f(f(s)))`` has to equal one of ``s``, ``f(s)``, or ``f(f(s))``
-and thus
+作为循环�的状�。因为 ``f`` �是有三个��的值的范围，
+迭代它必须在最多三个迭代�达到一个循环，
+因此 ``f(f(f(s)))`` 必须等于 ``s``, ``f(s)`` 或 ``f(f(s))`` 其中之一，
+å› æ­¤
 
 .. code-block:: none
 
     max(s, f(s), f(f(s))) = max(s, f(s), f(f(s)), f(f(f(s))), ...).
 
-In summary, running the loop at most twice is enough because there are only three
-different states.
+总之，最多�行两次循环就足够了，因为�有三���的状�。
 
-For switch statements that have a "default"-case, there is no control-flow
-part that skips the switch.
+对于有 "默认" 情况的switch语�，没有跳过switch的控制�部分。
 
-When a variable goes out of scope, all statements still in the "undecided"
-state are changed to "unused", unless the variable is the return
-parameter of a function - there, the state changes to "used".
+当一个��超出范围时，所有�处于 "未决定" 状�的语�都被改为 "未使用"，
+除�该��是一个函数的返回�数--如何是这样，状��为 "已使用"。
 
-In the second traversal, all assignments that are in the "unused" state are removed.
+在第二次�历中，所有处于 "未使用" 状�的赋值都被删除。
 
-This step is usually run right after the SSA transform to complete
-the generation of the pseudo-SSA.
+这一步通常是在SSA转�之�立��行，以完�伪SSA的生�。
 
-Tools
+工具
 -----
 
-Movability
+�移动性
 ^^^^^^^^^^
 
-Movability is a property of an expression. It roughly means that the expression
-is side-effect free and its evaluation only depends on the values of variables
-and the call-constant state of the environment. Most expressions are movable.
-The following parts make an expression non-movable:
+�移动性是表达�的一个属性。它大致上�味�表达�是没有副作用的，
+它的评估��决于��的值和环境的调用常数状�。
+大多数表达�都是�移动的。以下部分使表达���移动:
 
-- function calls (might be relaxed in the future if all statements in the function are movable)
-- opcodes that (can) have side-effects (like ``call`` or ``selfdestruct``)
-- opcodes that read or write memory, storage or external state information
-- opcodes that depend on the current PC, memory size or returndata size
+- 函数调用（如果函数中的所有语�都是�移动的，未��能会放宽）
+- 有副作用的�作�（如 ``call`` 或 ``selfdestruct``）
+- 读�或写入内存, 存储或外部状�信�的�作�
+- �决于当�PC�内存大�或返回数�大�的�作�
 
-DataflowAnalyzer
+数��分�器
 ^^^^^^^^^^^^^^^^
 
-The Dataflow Analyzer is not an optimizer step itself but is used as a tool
-by other components. While traversing the AST, it tracks the current value of
-each variable, as long as that value is a movable expression.
-It records the variables that are part of the expression
-that is currently assigned to each other variable. Upon each assignment to
-a variable ``a``, the current stored value of ``a`` is updated and
-all stored values of all variables ``b`` are cleared whenever ``a`` is part
-of the currently stored expression for ``b``.
-
-At control-flow joins, knowledge about variables is cleared if they have or would be assigned
-in any of the control-flow paths. For instance, upon entering a
-for loop, all variables are cleared that will be assigned during the
-body or the post block.
-
-Expression-Scale Simplifications
+数��分�器本身�是一个优化步骤，而是被其他组件作为工具使用。
+在�历AST时，它跟踪�个��的当�值，
+��该值是一个�移动的表达�。
+它记录了作为表达�一部分的��，
+这些表达�目�被分�给其他�个��。在�次对�� ``a`` 的赋值时，
+``a`` 的当�存储值被更新，�� ``a`` 是 ``b`` 当�存储表达�的一部分，
+�� ``b`` 的所有存储值都被清除。
+
+在控制�连接处，如果��在任何控制�路径中已�或将�被分�，
+那么关于这些��的记忆就会被清除。例如，在进入for循环时，所有将在主体或��中分�的��都被清除。
+
+表达�的简化
 --------------------------------
 
-These simplification passes change expressions and replace them by equivalent
-and hopefully simpler expressions.
+这些简化过程会改�表达�，并用等效的�希望更简�的表达�替�它们。
 
 .. _common-subexpression-eliminator:
 
-CommonSubexpressionEliminator
+通用�表达�消除器
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This step uses the Dataflow Analyzer and replaces subexpressions that
-syntactically match the current value of a variable by a reference to
-that variable. This is an equivalence transform because such subexpressions have
-to be movable.
+这一步使用数��分�器，用对�一��的引用�替�语法上与该��当�值相匹�的�表达�。
+这是一个等价转�，因为这��表达�必须是�移动的。
 
-All subexpressions that are identifiers themselves are replaced by their
-current value if the value is an identifier.
+如果值是一个标识符，所有本身是标识符的�表达�都被其当�值替�。
 
+<<<<<<< HEAD
+上述两�规则的结��许计算出一个局部值的编�，
+这�味�如果两个��有相�的值，其中一个将永远是未使用的。
+然�，未使用过的处�器或冗余赋值消除器将能够完全消除此类��。
+=======
 The combination of the two rules above allow to compute a local value
 numbering, which means that if two variables have the same
 value, one of them will always be unused. The Unused Pruner or the
-Redundant Assign Eliminator will then be able to fully eliminate such
+Unused Assign Eliminator will then be able to fully eliminate such
 variables.
+>>>>>>> english/develop
 
-This step is especially efficient if the expression splitter is run
-before. If the code is in pseudo-SSA form,
-the values of variables are available for a longer time and thus we
-have a higher chance of expressions to be replaceable.
+如果之��行过表达�拆分器，则此步骤尤其有效。
+如果代�是伪SSA形�，那么��值的�用时间更长，因此我们有更高的机会替�表达�。
 
-The expression simplifier will be able to perform better replacements
-if the common subexpression eliminator was run right before it.
+如果通用�表达�消除器在它之��行，
+表达�简化器将能够进行更好的替�。
 
 .. _expression-simplifier:
 
-ExpressionSimplifier
-^^^^^^^^^^^^^^^^^^^^
+表达�简化器
+^^^^^^^^^^^^
 
-The ExpressionSimplifier uses the Dataflow Analyzer and makes use
-of a list of equivalence transforms on expressions like ``X + 0 -> X``
-to simplify the code.
+表达�简化器使用数��分�器，
+并利用表达�的等价��列表，如 ``X + 0 -> X`` �简化代�。
 
-It tries to match patterns like ``X + 0`` on each subexpression.
-During the matching procedure, it resolves variables to their currently
-assigned expressions to be able to match more deeply nested patterns
-even when the code is in pseudo-SSA form.
+它试图在�个�表达�上匹�诸如 ``X + 0`` 的模�。
+在匹�过程中，它将��解�为当�分�的表达�，
+以便能够匹�更深入的嵌套模�，
+�使代�是伪SSA形�。
 
-Some of the patterns like ``X - X -> 0`` can only be applied as long
-as the expression ``X`` is movable, because otherwise it would remove its potential side-effects.
-Since variable references are always movable, even if their current
-value might not be, the Expression Simplifier is again more powerful
-in split or pseudo-SSA form.
+一些模�如 ``X - X -> 0`` �能在表达� ``X`` 是�移动的情况下应用，
+�则会删除其潜在的副作用。
+由于��引用总是�移动的，�使它们的当�值�能�是，
+表达�简化器在拆分或伪SSA形�下�更加强大。
 
 .. _literal-rematerialiser:
 
-LiteralRematerialiser
-^^^^^^^^^^^^^^^^^^^^^
+字��义上的�物质化器（LiteralRematerialiser）
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To be documented.
+有待记录。
 
 .. _load-resolver:
 
-LoadResolver
+负载解�器
 ^^^^^^^^^^^^
 
-Optimisation stage that replaces expressions of type ``sload(x)`` and ``mload(x)`` by the value
-currently stored in storage resp. memory, if known.
+优化阶段，分别将 ``sload(x)`` 和 ``mload(x)`` 类型的表达�替�为当�存储和内存中的值，如果已知的�。
+
+如果代�是SSA形�的，效果最好。
+
+先决�件：消歧器，循环�始�写器。
+
+<<<<<<< HEAD
+.. _reasoning-based-simplifier:
+
+基于推�的简化器
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+这个优化器使用SMT求解器�检查 ``if`` �件是�为常数。
+
+- 如果 ``�制�件和�件`` 是�满足的（UNSAT），那么�件永远�会是真的，整个主体�以被删除。
+- 如果 ``�制�件和��制�件`` 是�满足的（UNSAT），那么�件永远是真的，�以用 ``1`` 代替。
 
-Works best if the code is in SSA form.
+�有在�件是�移动的情况下，上�的简化�能适用。
 
-Prerequisite: Disambiguator, ForLoopInitRewriter.
+它�对EVM语言有效，但在其他语言上使用是安全的。
 
+先决�件：消歧器，SSA转�。
+
+声明规模的简化
+=======
 Statement-Scale Simplifications
+>>>>>>> english/develop
 -------------------------------
 
 .. _circular-reference-pruner:
 
-CircularReferencesPruner
+循环引用程�
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-This stage removes functions that call each other but are
-neither externally referenced nor referenced from the outermost context.
+这个阶段删除了那些互相调用但既没有外部引用也没有从最外层上下文中引用的函数。
 
 .. _conditional-simplifier:
 
-ConditionalSimplifier
+�件简化器
 ^^^^^^^^^^^^^^^^^^^^^
 
-The Conditional Simplifier inserts assignments to condition variables if the value can be determined
-from the control-flow.
+如果�以从控制�中确定数值，�件简化器就会�入对�件��的赋值。
 
-Destroys SSA form.
+销�SSA表格。
 
-Currently, this tool is very limited, mostly because we do not yet have support
-for boolean types. Since conditions only check for expressions being nonzero,
-we cannot assign a specific value.
+目�，这个工具是�常有�的，主�是因为我们还没有支�布尔类型。
+由于�件�检查表达�是�为�零，我们�能指定一个特定的值。
 
-Current features:
+当�的特性：
 
-- switch cases: insert "<condition> := <caseLabel>"
-- after if statement with terminating control-flow, insert "<condition> := 0"
+- 切��件：�入 “<�件> := <�件标签>�
+- 在带有终止控制�的if语��，�入“<�件> : =0�
 
-Future features:
+未�的特性：
 
-- allow replacements by "1"
-- take termination of user-defined functions into account
+- �许用 "1" 替�
+- 考虑到用户定义的终止函数
 
-Works best with SSA form and if dead code removal has run before.
+如果之�已��行过死代�的删除，那么使用SSA表�效果最好。
 
-Prerequisite: Disambiguator.
+先决�件：消歧器。
 
 .. _conditional-unsimplifier:
 
-ConditionalUnsimplifier
+有�件的�对称性放大器
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-Reverse of Conditional Simplifier.
+�件简化器的��。
 
 .. _control-flow-simplifier:
 
-ControlFlowSimplifier
+控制�简化器
 ^^^^^^^^^^^^^^^^^^^^^
 
-Simplifies several control-flow structures:
+简化了几个控制�结构：
 
-- replace if with empty body with pop(condition)
-- remove empty default switch case
-- remove empty switch case if no default case exists
-- replace switch with no cases with pop(expression)
-- turn switch with single case into if
-- replace switch with only default case with pop(expression) and body
-- replace switch with const expr with matching case body
-- replace ``for`` with terminating control flow and without other break/continue by ``if``
-- remove ``leave`` at the end of a function.
+- 用pop（�件）代替if，用空的程�体代替if
+- 移除空的默认switch情况
+- 如果�存在默认情况，则删除空的switch情况
+- 用pop（表达�）代替没有�件的switch
+- 把�例的switch��if
+- 用pop（表达�）和程�体代替switch，�用默认情况
+- 用匹�的�件程�体的常�表达�替�switch
+- 将 ``for`` 替�为终止控制�，在没有其他 break/continue 的情况下替�为 ``if``
+- 移除函数末尾的 ``leave``
 
-None of these operations depend on the data flow. The StructuralSimplifier
-performs similar tasks that do depend on data flow.
+这些�作都��赖于数��。然而结构简化器执行类似的任务，确实�赖于数��。
 
-The ControlFlowSimplifier does record the presence or absence of ``break``
-and ``continue`` statements during its traversal.
+控制�简化器在其�历过程中确实记录了是�存在 ``break`` 和 ``continue`` 语�。
 
-Prerequisite: Disambiguator, FunctionHoister, ForLoopInitRewriter.
-Important: Introduces EVM opcodes and thus can only be used on EVM code for now.
+先决�件：消歧器，函数��器， 循环�始�写器。
+���示：引入了EVM�作代�，因此目��能用于EVM代�。
 
 .. _dead-code-eliminator:
 
-DeadCodeEliminator
+死代�消除器
 ^^^^^^^^^^^^^^^^^^
 
-This optimization stage removes unreachable code.
+这个优化阶段删除了��到达的代�。
 
-Unreachable code is any code within a block which is preceded by a
-leave, return, invalid, break, continue, selfdestruct, revert or by a call to a user-defined function that recurses infinitely.
+无法访问的代�是指在一个区�内的任何代�，
+其��有 leave，return，invalid，break，continue，selfdestruct，revert 或调用用户定义的函数，并无�地递归。
 
-Function definitions are retained as they might be called by earlier
-code and thus are considered reachable.
+函数定义被�留下�，因为它们�能被早期的代�调用，因此被认为是�访问的。
 
-Because variables declared in a for loop's init block have their scope extended to the loop body,
-we require ForLoopInitRewriter to run before this step.
+因为在for循环的init�中声明的��，其范围会扩展到循环体，
+所以我们�求 循环�始�写器 在此步骤之��行。
 
-Prerequisite: ForLoopInitRewriter, Function Hoister, Function Grouper
+先决�件： 循环�始�写器, 函数��器, 函数分组器
 
 .. _equal-store-eliminator:
 
-EqualStoreEliminator
+等价的存储清除器
 ^^^^^^^^^^^^^^^^^^^^
 
-This steps removes ``mstore(k, v)`` and ``sstore(k, v)`` calls if
-there was a previous call to ``mstore(k, v)`` / ``sstore(k, v)``,
-no other store in between and the values of ``k`` and ``v`` did not change.
+如果之�有对 ``mstore(k, v)`` / ``sstore(k, v)`` 的调用，
+但中间没有其他存储，并且 ``k`` 和 ``v`` 的值没有�化，
+则该步骤将删除 ``mstore(k, v)`` 和 ``sstore(k, v)`` 的调用。
 
-This simple step is effective if run after the SSA transform and the
-Common Subexpression Eliminator, because SSA will make sure that the variables
-will not change and the Common Subexpression Eliminator re-uses exactly the same
-variable if the value is known to be the same.
+如果在SSA转�和通用�表达�消除器之��行，这个简�的步骤是有效的，
+因为SSA将确����会改�，而通用�表达�消除器在已知值相�的情况下会�新使用完全相�的��。
 
-Prerequisites: Disambiguator, ForLoopInitRewriter
+先决�件： 消歧器, 循环�始�写器
 
 .. _unused-pruner:
 
-UnusedPruner
-^^^^^^^^^^^^
+未使用过的处�器
+^^^^^^^^^^^^^^^^
 
-This step removes the definitions of all functions that are never referenced.
+这一步删除了所有从未被引用的函数的定义。
 
-It also removes the declaration of variables that are never referenced.
-If the declaration assigns a value that is not movable, the expression is retained,
-but its value is discarded.
+它还删除了从未被引用的��的声明。如果声明指定了一个��移动的值，
+表达�将被�留，但其值将被丢弃。
 
-All movable expression statements (expressions that are not assigned) are removed.
+所有�移动的表达�语�（未被赋值的表达�）都被删除。
 
 .. _structural-simplifier:
 
-StructuralSimplifier
+结构简化器
 ^^^^^^^^^^^^^^^^^^^^
 
-This is a general step that performs various kinds of simplifications on
-a structural level:
+这是一个一般的步骤，在结构层�上进行��简化：
 
-- replace if statement with empty body by ``pop(condition)``
-- replace if statement with true condition by its body
-- remove if statement with false condition
-- turn switch with single case into if
-- replace switch with only default case by ``pop(expression)`` and body
-- replace switch with literal expression by matching case body
-- replace for loop with false condition by its initialization part
+- 用 ``pop(�件)`` 代替 if 语�的空程�体。
+- 用其主体替�带有真实�件的if语�
+- 删除带有错误�件的if语�
+- 把�例的switch��if
+- 用 ``pop(表达�)`` 和程�体代替switch，�用默认情况
+- 通过匹�的�件程�体，用字�表达�替�switch
+- 用其�始化部分�代带有错误�件的for循环
 
-This component uses the Dataflow Analyzer.
+该组件使用数��分�器。
 
 .. _block-flattener:
 
-BlockFlattener
+�展平器
 ^^^^^^^^^^^^^^
 
-This stage eliminates nested blocks by inserting the statement in the
-inner block at the appropriate place in the outer block. It depends on the
-FunctionGrouper and does not flatten the outermost block to keep the form
-produced by the FunctionGrouper.
+这个阶段通过在外部�的适当�置�入内部�的语��消除嵌套�。
+它�赖于函数分组器，并�对最外层的�进行展平，以��函数分组器产生的形�。
 
 .. code-block:: yul
 
@@ -1017,7 +1046,7 @@ produced by the FunctionGrouper.
         }
     }
 
-is transformed to
+被转化为
 
 .. code-block:: yul
 
@@ -1029,37 +1058,36 @@ is transformed to
         }
     }
 
-As long as the code is disambiguated, this does not cause a problem because
-the scopes of variables can only grow.
+��代�没有歧义，这就�会造�问题，因为��的作用域�能增长。
 
 .. _loop-invariant-code-motion:
 
-LoopInvariantCodeMotion
+循环��代�模�
 ^^^^^^^^^^^^^^^^^^^^^^^
-This optimization moves movable SSA variable declarations outside the loop.
+这�优化将�移动的SSA��声明移到循环之外。
 
-Only statements at the top level in a loop's body or post block are considered, i.e variable
-declarations inside conditional branches will not be moved out of the loop.
+�有在循环体或��中的最高级别的语�被考虑，
+��件分支内的��声明�会被移出循环。
 
-Requirements:
+�求：
 
-- The Disambiguator, ForLoopInitRewriter and FunctionHoister must be run upfront.
-- Expression splitter and SSA transform should be run upfront to obtain better result.
+- 消歧器, 循环�始�写器和函数��器必须���行。
+- 表达�拆分器和SSA转�应在�期�行以获得更好的结果。
 
 
-Function-Level Optimizations
+函数级的优化
 ----------------------------
 
 .. _function-specializer:
 
-FunctionSpecializer
+函数特殊化器
 ^^^^^^^^^^^^^^^^^^^
 
-This step specializes the function with its literal arguments.
+这一步是用字��数�实现函数的专业化。
 
-If a function, say, ``function f(a, b) { sstore (a, b) }``, is called with literal arguments, for
-example, ``f(x, 5)``, where ``x`` is an identifier, it could be specialized by creating a new
-function ``f_1`` that takes only one argument, i.e.,
+如果一个函数，例如， ``function f(a, b) { sstore (a, b) }``，被调用时有字��数，
+例如， ``f(x, 5)``，其中 ``x`` 是一个标识符，�以通过创建一个新函数 ``f_1`` �专门化，
+该函数�需�一个�数，�：
 
 .. code-block:: yul
 
@@ -1068,54 +1096,53 @@ function ``f_1`` that takes only one argument, i.e.,
         sstore(a_1, b_1)
     }
 
-Other optimization steps will be able to make more simplifications to the function. The
-optimization step is mainly useful for functions that would not be inlined.
+其他优化步骤将能够对函数进行更多的简化。
+优化步骤主�对那些�会被内�的函数有用。
 
-Prerequisites: Disambiguator, FunctionHoister
+先决�件： 消歧器， 函数��器
 
-LiteralRematerialiser is recommended as a prerequisite, even though it's not required for
-correctness.
+建议将字��义上的�物质化器（LiteralRematerialiser）作为先决�件，尽管它�是正确性的必��件。
 
 .. _unused-function-parameter-pruner:
 
-UnusedFunctionParameterPruner
+未使用的函数�数管�器
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This step removes unused parameters in a function.
+这一步是删除一个函数中未使用的�数。
 
-If a parameter is unused, like ``c`` and ``y`` in, ``function f(a,b,c) -> x, y { x := div(a,b) }``, we
-remove the parameter and create a new "linking" function as follows:
+如果一个�数没有使用，
+比如在 ``function f(a,b,c) -> x, y { x := div(a,b) }`` 中的 ``c`` 和 ``y``，
+我们删除该�数并创建一个新的 "连接" 函数，如下所示：
 
 .. code-block:: yul
 
     function f(a,b) -> x { x := div(a,b) }
     function f2(a,b,c) -> x, y { x := f(a,b) }
 
-and replace all references to ``f`` by ``f2``.
-The inliner should be run afterwards to make sure that all references to ``f2`` are replaced by
-``f``.
+并将所有对 ``f`` 的引用替�为 ``f2``。
+之�应该�行内�，以确�所有对 ``f2`` 的引用都被 ``f`` 替�。
 
-Prerequisites: Disambiguator, FunctionHoister, LiteralRematerialiser.
+先决�件： 消歧器， 函数��器， 字��义上的�物质化器
 
-The step LiteralRematerialiser is not required for correctness. It helps deal with cases such as:
-``function f(x) -> y { revert(y, y} }`` where the literal ``y`` will be replaced by its value ``0``,
-allowing us to rewrite the function.
+字��义上的�物质化器这个步骤对于正确性�说�是必需的。
+它有助于处�诸如以下情况：
+``function f(x) -> y { revert(y, y} }`` 其中字��� ``y``  将被其值 ``0`` �代，
+使我们能够�写该函数。
 
 .. index:: ! unused store eliminator
 .. _unused-store-eliminator:
 
-UnusedStoreEliminator
+未使用的存储清除器
 ^^^^^^^^^^^^^^^^^^^^^
 
-Optimizer component that removes redundant ``sstore`` and memory store statements.
-In case of an ``sstore``, if all outgoing code paths revert (due to an explicit ``revert()``, ``invalid()``, or infinite recursion) or
-lead to another ``sstore`` for which the optimizer can tell that it will overwrite the first store, the statement will be removed.
-However, if there is a read operation between the initial ``sstore`` and the revert, or the overwriting ``sstore``, the statement
-will not be removed.
-Such read operations include: external calls, user-defined functions with any storage access, and ``sload`` of a slot that cannot be
-proven to differ from the slot written by the initial ``sstore``.
+优化器组件，删除多余的 ``sstore`` 和内存存储语�。
+对于一个 ``sstore``，如果所有传出的代�路径都��了（由于显�的的 ``revert()``, ``invalid()``, 或无�递归）
+或导致�一个 ``sstore``，优化器�以知�它将覆写第一个存储，该语�将被删除。
+然而，如果在�始 ``sstore`` 和��之间有读�作，或者覆写的 ``sstore``，
+该语�将�会被删除。
+这样的读�作包括：外部调用，有任何存储访问的用户定义的函数，以��能�明与�始 ``sstore`` 写的槽��的 ``sload``。
 
-For example, the following code
+例如，下�的代�
 
 .. code-block:: yul
 
@@ -1128,7 +1155,7 @@ For example, the following code
         sstore(c, 3)
     }
 
-will be transformed into the code below after the Unused Store Eliminator step is run
+在�行未使用的存储消除器步骤�，将被转化为以下代�
 
 .. code-block:: yul
 
@@ -1138,144 +1165,148 @@ will be transformed into the code below after the Unused Store Eliminator step i
         sstore(c, 3)
     }
 
-For memory store operations, things are generally simpler, at least in the outermost yul block as all such
-statements will be removed if they are never read from in any code path.
-At function analysis level, however, the approach is similar to ``sstore``, as we do not know whether the memory location will
-be read once we leave the function's scope, so the statement will be removed only if all code paths lead to a memory overwrite.
+对于内存存储�作，事情一般比较简�，至少在最外层的yul�中是这样，
+因为如果在任何代�路径中从未被读�，所有这样的语�都将被删除。
+然而，在函数分�层�，其方法与 ``sstore`` 类似，因为我们�知�一旦离开函数的范围，内存�置是�会被读�，
+所以�有当所有的代�路径都导致内存被覆写时，语��会被删除。
 
-Best run in SSA form.
+最好以SSA形��行。
 
-Prerequisites: Disambiguator, ForLoopInitRewriter.
+先决�件： Disambiguator, ForLoopInitRewriter.
 
 .. _equivalent-function-combiner:
 
-EquivalentFunctionCombiner
+等价函数组�器
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If two functions are syntactically equivalent, while allowing variable
-renaming but not any re-ordering, then any reference to one of the
-functions is replaced by the other.
+如果两个函数在语法上是等价的，
+�时�许���命�，但��许任何�新排�，
+那么对其中一个函数的任何引用都会被�一个函数�代。
 
-The actual removal of the function is performed by the Unused Pruner.
+实际删除的功能是由未使用过的处�器执行的。
 
 
-Function Inlining
+函数内�
 -----------------
 
 .. _expression-inliner:
 
-ExpressionInliner
+表达�内�
 ^^^^^^^^^^^^^^^^^
 
-This component of the optimizer performs restricted function inlining by inlining functions that can be
-inlined inside functional expressions, i.e. functions that:
+优化器的这个组件通过内��以在函数表达�中内�的函数�执行�制性的函数内�，函数为：
 
-- return a single value.
-- have a body like ``r := <functional expression>``.
-- neither reference themselves nor ``r`` in the right hand side.
+- 返回一个�一的值。
+- 有一个� ``r := <函数表达�>`` 的主体。
+- 既没有�到自己，也没有�到�边的 ``r``。
 
-Furthermore, for all parameters, all of the following need to be true:
+此外，对于所有的�数，以下�项都需�为真：
 
-- The argument is movable.
-- The parameter is either referenced less than twice in the function body, or the argument is rather cheap
-  ("cost" of at most 1, like a constant up to 0xff).
+- �数是�移动的。
+- 该�数在函数体中被引用�到两次，或者该�数相当便宜
+  （ "�本" 最多为1，就�一个0xff以下的常数）。
 
-Example: The function to be inlined has the form of ``function f(...) -> r { r := E }`` where
-``E`` is an expression that does not reference ``r`` and all arguments in the function call are movable expressions.
+例如：�被内�的函数的形�是： ``function f(...) -> r { r := E }``
+其中 ``E`` 是一个�引用 ``r`` 的表达�，函数调用中的所有�数都是�移动表达�。
 
-The result of this inlining is always a single expression.
+这�内�的结果总是一个�一的表达�。
 
-This component can only be used on sources with unique names.
+该组件�能用于具有唯一�称的��。
 
 .. _full-inliner:
 
-FullInliner
+完全内�
 ^^^^^^^^^^^
 
+<<<<<<< HEAD
+完全内�用函数的主体�代了�些函数的调用。
+这在大多数情况下是没有什么帮助的，因为它�是增加了代�的大�，但并没有什么好处。
+此外，代�通常是�常昂贵的，我们往往�愿�更短的代�而�是更有效的代�。
+�过，在相�的情况下，内�一个函数�以对�续的优化步骤产生积�的影�。
+例如，如果一个函数�数是一个常数，就会出现这�情况。
+=======
 The FullInliner replaces certain calls of certain functions
 by the function's body. This is not very helpful in most cases, because
 it just increases the code size but does not have a benefit. Furthermore,
 code is usually very expensive and we would often rather have shorter
-code than more efficient code. In same cases, though, inlining a function
+code than more efficient code. In some cases, though, inlining a function
 can have positive effects on subsequent optimizer steps. This is the case
 if one of the function arguments is a constant, for example.
+>>>>>>> english/develop
 
-During inlining, a heuristic is used to tell if the function call
-should be inlined or not.
-The current heuristic does not inline into "large" functions unless
-the called function is tiny. Functions that are only used once
-are inlined, as well as medium-sized functions, while function
-calls with constant arguments allow slightly larger functions.
+在内�过程中，一个���方法被用�判断函数调用是�应该被内�。
+目�的���方法是�内�到 "大" 函数，除�被调用的函数很�。
+�使用一次的函数以�中等大�的函数被内�，而带有常数�数的函数调用�许�大的函数。
 
 
-In the future, we may include a backtracking component
-that, instead of inlining a function right away, only specializes it,
-which means that a copy of the function is generated where
-a certain parameter is always replaced by a constant. After that,
-we can run the optimizer on this specialized function. If it
-results in heavy gains, the specialized function is kept,
-otherwise the original function is used instead.
+在未�，我们�能会加入一个回溯组件，
+它�会立�对一个函数进行内�，而�是对其进行专业化处�，
+这�味�会生�一个函数的拷�，其中�个�数总是被一个常数�代。
+之�，我们�以在这个专用函数上�行优化器。
+如果结果有很大的收益，那么这个专门化的函数就被�留下�，�则就用原�的函数代替。
 
+<<<<<<< HEAD
+清�
+=======
 FunctionHoister and ExpressionSplitter are recommended as prerequisites since they make the step
 more efficient, but are not required for correctness.
 In particular, function calls with other function calls as arguments are not inlined, but running
 ExpressionSplitter beforehand ensures that there are no such calls in the input.
 
 Cleanup
+>>>>>>> english/develop
 -------
 
-The cleanup is performed at the end of the optimizer run. It tries
-to combine split expressions into deeply nested ones again and also
-improves the "compilability" for stack machines by eliminating
-variables as much as possible.
+清�工作是在优化器�行结�时进行的。
+它试图将分割的表达��次组��深度嵌套的表达�，
+并且通过尽�能地消除����高堆栈机的 "�编译性"。
 
 .. _expression-joiner:
 
-ExpressionJoiner
+表达�连接器
 ^^^^^^^^^^^^^^^^
 
-This is the opposite operation of the expression splitter. It turns a sequence of
-variable declarations that have exactly one reference into a complex expression.
-This stage fully preserves the order of function calls and opcode executions.
-It does not make use of any information concerning the commutativity of the opcodes;
-if moving the value of a variable to its place of use would change the order
-of any function call or opcode execution, the transformation is not performed.
+这是与表达�分割器相�的�作。它把正好有一个引用的��声明�列��一个��的表达�。
+这个阶段完全�留了函数调用和�作�执行的顺�。它�使用任何关于�作�的互�性的信�；
+如果将一个��的值移到它的使用�置会改�任何函数调用或�作�执行的顺�，则�执行转�。
 
-Note that the component will not move the assigned value of a variable assignment
-or a variable that is referenced more than once.
+注�，组件�会移动��赋值或被多次引用的��的赋值。
 
-The snippet ``let x := add(0, 2) let y := mul(x, mload(2))`` is not transformed,
-because it would cause the order of the call to the opcodes ``add`` and
-``mload`` to be swapped - even though this would not make a difference
-because ``add`` is movable.
+片段 ``let x := add(0, 2) let y := mul(x, mload(2))`` �能转�，
+因为它将导致调用�作� ``add`` 和 ``mload`` 的顺�被调�--尽管这�会有什么影�，
+因为 ``add`` 是�移动的。
 
-When reordering opcodes like that, variable references and literals are ignored.
-Because of that, the snippet ``let x := add(0, 2) let y := mul(x, 3)`` is
-transformed to ``let y := mul(add(0, 2), 3)``, even though the ``add`` opcode
-would be executed after the evaluation of the literal ``3``.
+当�这样�排�作�时，��引用和字��义被忽略了。
+因此，片段 ``let x := add(0, 2) let y := mul(x, 3)`` 被转�为
+``let y := mul(add(0, 2), 3)``，尽管 ``add`` �作�将在计算字��义 ``3`` �执行。
 
 .. _SSA-reverser:
 
-SSAReverser
+SSA�转器
 ^^^^^^^^^^^
 
-This is a tiny step that helps in reversing the effects of the SSA transform
-if it is combined with the Common Subexpression Eliminator and the
-Unused Pruner.
+这是一个微�的步骤，如果它与通用�表达�消除器和未使用过的处�器相结�，
+则有助于扭转SSA转�的影�。
 
+<<<<<<< HEAD
+我们生�的SSA形�对EVM和WebAssembly的代�生�是�利的，
+因为它生�了许多局部��。最好的办法是用赋值�新使用现有的��，
+而�是用新的��声明。
+=======
 The SSA form we generate is detrimental to code generation
 because it produces many local variables. It would
 be better to just re-use existing variables with assignments instead of
 fresh variable declarations.
+>>>>>>> english/develop
 
-The SSA transform rewrites
+SSA转�改写
 
 .. code-block:: yul
 
     let a := calldataload(0)
     mstore(a, 1)
 
-to
+为
 
 .. code-block:: yul
 
@@ -1285,10 +1316,9 @@ to
     let a_2 := calldataload(0x20)
     a := a_2
 
-The problem is that instead of ``a``, the variable ``a_1`` is used
-whenever ``a`` was referenced. The SSA transform changes statements
-of this form by just swapping out the declaration and the assignment. The above
-snippet is turned into
+问题是在引用 ``a`` 时使用了�� ``a_1``，而�是 ``a``。
+SSA转�改�了这�形�的语�，�需将声明和赋值互�。
+上�的片段被转化为
 
 .. code-block:: yul
 
@@ -1298,56 +1328,51 @@ snippet is turned into
     a := calldataload(0x20)
     let a_2 := a
 
-This is a very simple equivalence transform, but when we now run the
-Common Subexpression Eliminator, it will replace all occurrences of ``a_1``
-by ``a`` (until ``a`` is re-assigned). The Unused Pruner will then
-eliminate the variable ``a_1`` altogether and thus fully reverse the
-SSA transform.
+这是一个�常简�的等价转�，但是当我们现在�行通用�表达�消除器时，
+它将用 ``a`` 替�所有出现的 ``a_1`` （直到 ``a`` 被�新赋值）。
+然�，未使用过的处�器将完全消除�� ``a_1``，从而完全逆转SSA的转�。
 
 .. _stack-compressor:
 
-StackCompressor
+堆栈压缩器
 ^^^^^^^^^^^^^^^
 
-One problem that makes code generation for the Ethereum Virtual Machine
-hard is the fact that there is a hard limit of 16 slots for reaching
-down the expression stack. This more or less translates to a limit
-of 16 local variables. The stack compressor takes Yul code and
-compiles it to EVM bytecode. Whenever the stack difference is too
-large, it records the function this happened in.
+让以太�虚拟机的代�生��得困难的一个问题是，
+在表达�堆栈中，有16个�槽的硬性�制，�以�下延伸。
+这或多或少转化为16个局部��的�制。
+堆栈压缩器采用Yul代�并将其编译为EVM字节�。
+�当堆栈差异过大时，它就会记录�生在哪个函数中。
 
-For each function that caused such a problem, the Rematerialiser
-is called with a special request to aggressively eliminate specific
-variables sorted by the cost of their values.
+对于�一个造�这�问题的函数，�物质化都会被调用，
+并�出特殊�求，以积�消除按其值的�本排�的特定��。
 
-On failure, this procedure is repeated multiple times.
+一旦失败，这个程�会��多次。
 
 .. _rematerialiser:
 
-Rematerialiser
+�物质化
 ^^^^^^^^^^^^^^
 
-The rematerialisation stage tries to replace variable references by the expression that
-was last assigned to the variable. This is of course only beneficial if this expression
-is comparatively cheap to evaluate. Furthermore, it is only semantically equivalent if
-the value of the expression did not change between the point of assignment and the
-point of use. The main benefit of this stage is that it can save stack slots if it
-leads to a variable being eliminated completely (see below), but it can also
-save a DUP opcode on the EVM if the expression is very cheap.
+�物质化阶段试图用最�分�给��的表达��替���引用。
+当然，这�有在这个表达�的评估费用相对较低的情况下�是有益的。
+此外，�有当表达�的值在赋值点和使用点之间没有�化时，
+它�具有语义上的等�性。这个阶段的主�好处是，
+如果它导致一个��被完全消除，它�以节�堆栈槽（�下文），
+但是如果表达��常便宜，它也�以在EVM上节�一个DUP�作�。
 
-The Rematerialiser uses the Dataflow Analyzer to track the current values of variables,
-which are always movable.
-If the value is very cheap or the variable was explicitly requested to be eliminated,
-the variable reference is replaced by its current value.
+�物质化使用数��分�器�跟踪��的当�值，
+这些��总是�移动的。
+如果数值�常便宜或者��被明确�求消除，
+那么��的引用就会被其当�值所�代。
 
 .. _for-loop-condition-out-of-body:
 
-ForLoopConditionOutOfBody
+体外循环�件
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Reverses the transformation of ForLoopConditionIntoBody.
+逆转体外循环�件的转�。
 
-For any movable ``c``, it turns
+对于任何�移动的 ``c``，它转�
 
 .. code-block:: none
 
@@ -1356,7 +1381,7 @@ For any movable ``c``, it turns
     ...
     }
 
-into
+为
 
 .. code-block:: none
 
@@ -1364,7 +1389,7 @@ into
     ...
     }
 
-and it turns
+而它�转�
 
 .. code-block:: none
 
@@ -1373,7 +1398,7 @@ and it turns
     ...
     }
 
-into
+为
 
 .. code-block:: none
 
@@ -1381,4 +1406,76 @@ into
     ...
     }
 
-The LiteralRematerialiser should be run before this step.
+字��义上的�物质化器应在此步骤之��行。
+
+Codegen-Based Optimizer Module
+==============================
+
+<<<<<<< HEAD
+特定的WebAssembly
+--------------------
+
+主�功能
+^^^^^^^^^^^^
+
+将最上�的�改�为一个具有特定�称（“main�）的函数，它没有输入和输出。
+
+�决于函数分组器。
+=======
+Currently, the codegen-based optimizer module provides two optimizations.
+
+The first one, available in the legacy code generator, moves literals to the right side of
+commutative binary operators, which helps exploit their associativity.
+
+The other one, available in the IR-based code generator, enables the use of unchecked arithmetic
+when generating code for incrementing the counter variable of certain idiomatic ``for`` loops.
+This avoids wasting gas by identifying some conditions that guarantee that the counter variable
+cannot overflow.
+This eliminates the need to use a verbose unchecked arithmetic block inside the loop body to
+increment the counter variable.
+
+.. _unchecked-loop-optimizer:
+
+Unchecked Loop Increment
+------------------------
+
+Introduced in Solidity ``0.8.22``, the overflow check optimization step is concerned with identifying
+the conditions under which the ``for`` loop counter can be safely incremented
+without overflow checks.
+
+This optimization is **only** applied to ``for`` loops of the general form:
+
+.. code-block:: solidity
+
+    for (uint i = X; i < Y; ++i) {
+        // variable i is not modified in the loop body
+    }
+
+The condition and the fact that the counter variable is only ever incremented
+guarantee that it never overflows.
+The precise requirements for the loop to be eligible for the optimization are as follows:
+
+- The loop condition is a comparison of the form ``i < Y``, for a local counter variable ``i``
+  (called the "loop counter" hereon) and an expression ``Y``.
+- The built-in operator ``<`` is necessarily used in the loop condition and is the only operator
+  that triggers the optimization. ``<=`` and the like are intentionally excluded. Additionally,
+  user-defined operators are **not** eligible.
+- The loop expression is a prefix or postfix increment of the counter variable, i.e, ``i++`` or ``++i``.
+- The loop counter is a local variable of a built-in integer type.
+- The loop counter is **not** modified by the loop body or by the expression used as the loop condition.
+- The comparison is performed on the same type as the loop counter, meaning that the type of the
+  right-hand-side expression is implicitly convertible to the type of the counter, such that the latter
+  is not implicitly widened before the comparison.
+
+To clarify the last condition, consider the following example:
+
+.. code-block:: solidity
+
+    for (uint8 i = 0; i < uint16(1000); i++) {
+        // ...
+    }
+
+In this case, the counter ``i`` has its type implicitly converted from ``uint8``
+to ``uint16`` before the comparison and the condition is in fact never false, so
+the overflow check for the increment cannot be removed.
+>>>>>>> english/develop
diff --git a/docs/internals/source_mappings.rst b/docs/internals/source_mappings.rst
index 68c29d955e34..6c25b05f4f19 100644
--- a/docs/internals/source_mappings.rst
+++ b/docs/internals/source_mappings.rst
@@ -1,70 +1,53 @@
 .. index:: source mappings
 
 ***************
-Source Mappings
+�代�映射
 ***************
 
-As part of the AST output, the compiler provides the range of the source
-code that is represented by the respective node in the AST. This can be
-used for various purposes ranging from static analysis tools that report
-errors based on the AST and debugging tools that highlight local variables
-and their uses.
+作为AST输出的一部分，编译器�供了AST中相应节点所代表的�代�的范围。
+这�以用于��目的，包括基于AST报告错误的��分�工具和�出局部���其用途的调试工具。
 
-Furthermore, the compiler can also generate a mapping from the bytecode
-to the range in the source code that generated the instruction. This is again
-important for static analysis tools that operate on bytecode level and
-for displaying the current position in the source code inside a debugger
-or for breakpoint handling. This mapping also contains other information,
-like the jump type and the modifier depth (see below).
+此外，编译器还�以生�从字节�到生�该指令的�代�范围的映射。
+这对于在字节�层次上�作的��分�工具和在调试器中显示�代�中的当��置或断点处��说，
+也是很��的。这个映射还包�其他信�，如跳转类型和修改器深度（�下文）。
 
-Both kinds of source mappings use integer identifiers to refer to source files.
-The identifier of a source file is stored in
-``output['sources'][sourceName]['id']`` where ``output`` is the output of the
-standard-json compiler interface parsed as JSON.
-For some utility routines, the compiler generates "internal" source files
-that are not part of the original input but are referenced from the source
-mappings. These source files together with their identifiers can be
-obtained via ``output['contracts'][sourceName][contractName]['evm']['bytecode']['generatedSources']``.
+这两���映射都使用整数标识符�指代��文件。�文件的标识符存储在 ``output['sources'][sourceName]['id']`` 中，
+其中 ``output`` 是标准json编译器接�的输出，被解��JSON。
+对于一些实用程�，编译器会生� "内部" �文件，
+这些文件�是原始输入的一部分，而是从�映射中引用的。
+这些�文件�其标识符�以通过 ``output['contracts'][sourceName][contractName]['evm']['bytecode']['generatedSources']`` 获得。
 
 .. note::
-    In the case of instructions that are not associated with any particular source file,
-    the source mapping assigns an integer identifier of ``-1``. This may happen for
-    bytecode sections stemming from compiler-generated inline assembly statements.
+    如果指令没有与任何特定的�文件相关�，
+    �映射将分�一个整数标识符 ``-1``。
+    这�能�生在编译器生�的内�汇编语�所产生的字节�部分。
 
-The source mappings inside the AST use the following
-notation:
+AST内部的�映射使用以下符�：
 
 ``s:l:f``
 
-Where ``s`` is the byte-offset to the start of the range in the source file,
-``l`` is the length of the source range in bytes and ``f`` is the source
-index mentioned above.
+其中， ``s`` 是�代�文件中范围起始处的字节�移�，
+``l`` 是以字节为��的�代�范围的长度， ``f`` 是上述�代�索引。
 
-The encoding in the source mapping for the bytecode is more complicated:
-It is a list of ``s:l:f:j:m`` separated by ``;``. Each of these
-elements corresponds to an instruction, i.e. you cannot use the byte offset
-but have to use the instruction offset (push instructions are longer than a single byte).
-The fields ``s``, ``l`` and ``f`` are as above. ``j`` can be either
-``i``, ``o`` or ``-`` signifying whether a jump instruction goes into a
-function, returns from a function or is a regular jump as part of e.g. a loop.
-The last field, ``m``, is an integer that denotes the "modifier depth". This depth
-is increased whenever the placeholder statement (``_``) is entered in a modifier
-and decreased when it is left again. This allows debuggers to track tricky cases
-like the same modifier being used twice or multiple placeholder statements being
-used in a single modifier.
+��映射中的字节�的编�更为��。它是一个由 ``s:l:f:j:m`` 组�的列表，用 ``;`` 分隔。
+这些元素中的�一个都对应�一�指令，也就是说，您�能使用字节�移�，
+而必须使用指令�移�（推�指令比�个字节长）。字段  ``s`` ， ``l`` 和 ``f`` �上。
+``j`` �以是 ``i``,  ``o`` 或 ``-``，表示跳转指令是进入一个函数，
+从一个函数返回，还是作为一个循环的一部分的普通跳转。
+最�一个字段， ``m``，是一个整数，表示 "修改器深度"。
+当��符语�( ``_`` )进入修改器时，这个深度会增加，当它�次离开时，深度会�少。
+这使得调试器�以跟踪一些棘手的情况，如�一个修改器被使用两次，或在一个修改器中使用多个��符语�。
 
-In order to compress these source mappings especially for bytecode, the
-following rules are used:
+为了压缩这些��映射，特别是字节�的��映射，使用了以下规则：
 
-- If a field is empty, the value of the preceding element is used.
-- If a ``:`` is missing, all following fields are considered empty.
+- 如果一个字段为空，则使用�一个元素的值。
+- 如果缺少 ``:`` ，以下所有字段都被认为是空的。
 
-This means the following source mappings represent the same information:
+这�味�下�的��映射代表了相�的信�：
 
 ``1:2:1;1:9:1;2:1:2;2:1:2;2:1:2``
 
 ``1:2:1;:9;2:1:2;;``
 
-Important to note is that when the :ref:`verbatim <yul-verbatim>` builtin is used,
-the source mappings will be invalid: The builtin is considered a single
-instruction instead of potentially multiple.
+需�注�的是，当使用 :ref:`�字（verbatim） <yul-verbatim>` 内建程�时，
+��映射将是无效的。内建程�被认为是一�指令，而�是潜在的多�指令。
diff --git a/docs/internals/variable_cleanup.rst b/docs/internals/variable_cleanup.rst
index bab3c8bef2ef..14f3ccf6dcc7 100644
--- a/docs/internals/variable_cleanup.rst
+++ b/docs/internals/variable_cleanup.rst
@@ -1,61 +1,47 @@
 .. index: variable cleanup
 
 *********************
-Cleaning Up Variables
+清���
 *********************
 
-Ultimately, all values in the EVM are stored in 256 bit words.
-Thus, in some cases, when the type of a value has less than 256 bits,
-it is necessary to clean the remaining bits.
-The Solidity compiler is designed to do such cleaning before any operations
-that might be adversely affected by the potential garbage in the remaining bits.
-For example, before writing a value to  memory, the remaining bits need
-to be cleared because the memory contents can be used for computing
-hashes or sent as the data of a message call.  Similarly, before
-storing a value in the storage, the remaining bits need to be cleaned
-because otherwise the garbled value can be observed.
-
-Note that access via inline assembly is not considered such an operation:
-If you use inline assembly to access Solidity variables
-shorter than 256 bits, the compiler does not guarantee that
-the value is properly cleaned up.
-
-Moreover, we do not clean the bits if the immediately
-following operation is not affected.  For instance, since any non-zero
-value is considered ``true`` by ``JUMPI`` instruction, we do not clean
-the boolean values before they are used as the condition for
-``JUMPI``.
-
-In addition to the design principle above, the Solidity compiler
-cleans input data when it is loaded onto the stack.
-
-The following table describes the cleaning rules applied to different types,
-where ``higher bits`` refers to the remaining bits in case the type has less than 256 bits.
-
-+---------------+---------------+-------------------------+
-|Type           |Valid Values   |Cleanup of Invalid Values|
-+===============+===============+=========================+
-|enum of n      |0 until n - 1  |throws exception         |
-|members        |               |                         |
-+---------------+---------------+-------------------------+
-|bool           |0 or 1         |results in 1             |
-+---------------+---------------+-------------------------+
-|signed integers|higher bits    |currently silently       |
-|               |set to the     |signextends to a valid   |
-|               |sign bit       |value, i.e. all higher   |
-|               |               |bits are set to the sign |
-|               |               |bit; may throw an        |
-|               |               |exception in the future  |
-+---------------+---------------+-------------------------+
-|unsigned       |higher bits    |currently silently masks |
-|integers       |zeroed         |to a valid value, i.e.   |
-|               |               |all higher bits are set  |
-|               |               |to zero; may throw an    |
-|               |               |exception in the future  |
-+---------------+---------------+-------------------------+
-
-Note that valid and invalid values are dependent on their type size.
-Consider ``uint8``, the unsigned 8-bit type, which has the following valid values:
+最终，EVM中的所有数值都被存储在256�的字中。
+因此，在�些情况下，当一个值的类型少于256比特时，
+有必�清�剩余的比特�。
+Solidity 编译器被设计为在任何�能�到剩余�中潜在垃圾的�利影�的�作之�执行这样的清�。
+例如，在将一个值写入内存之�，剩余的�需�被清除，
+因为内存的内容�以被用�计算哈希值或作为消�调用的数���。
+�样地，在将一个值存储到存储器中之�，剩余的�需�被清�，
+�则就会看到被混淆的数值。
+
+注�，通过内�汇编的访问�被认为是这��作。
+如果您使用内�汇编�访问短于256�的Solidity��，编译器���该值被正确清�。
+
+此外，如果接下�的�作��影�，我们就�清�这些�。
+例如，由于任何�零值都被 ``JUMPI`` 指令认为是 ``true``，
+所以在布尔值被用作 ``JUMPI`` 的�件之�，我们�对它们进行清�。
+
+除了上�的设计原则外，Solidity编译器在输入数�被加载到堆栈时也会对其进行清�。
+
+下表�述了适用于��类型的清�规则，其中 ``高�`` 指的是在类型少于256�的情况下的剩余�。
+
++----------------+------------------+--------------------------------+
+|      类型      |     有效的值     |           清�无效值           |
++================+==================+================================+
+| n 个�员的枚举 | 0，直到n - 1     | 抛出异常                       |
++----------------+------------------+--------------------------------+
+| 布尔           | 0 或 1           | 结果为1                        |
++----------------+------------------+--------------------------------+
+| 有符�整数     | 高�设置为符�� | 目�默许符�化扩展到一个有效值 |
+|                |                  | �所有高�被设置为符��；     |
+|                |                  | 将��能会抛出一个异常。       |
++----------------+------------------+--------------------------------+
+| 无符�整数     | 高�被清零       | 目�默许为有效值，             |
+|                |                  | �所有高�被设置为零；         |
+|                |                  | 将��能会抛出一个异常。       |
++----------------+------------------+--------------------------------+
+
+请注�，有效和无效的值�决于其类型大�。
+�设类型为 ``uint8``，�无符�的8�类型，它有以下有效值：
 
 .. code-block:: none
 
@@ -65,16 +51,16 @@ Consider ``uint8``, the unsigned 8-bit type, which has the following valid value
     ....
     0000...0000 1111 1111
 
-Any invalid value will have the higher bits set to zero:
+任何无效的值都将把高�设置为零：
 
 .. code-block:: none
 
-    0101...1101 0010 1010   invalid value
-    0000...0000 0010 1010   cleaned value
+    0101...1101 0010 1010   无效的值
+    0000...0000 0010 1010   清�过的值
 
-For ``int8``, the signed 8-bit type, the valid values are:
+对于 ``int8``，�有符�的8�类型，有效值是：
 
-Negative
+è´Ÿæ•°
 
 .. code-block:: none
 
@@ -83,7 +69,7 @@ Negative
     ....
     1111...1111 1000 0000
 
-Positive
+正数
 
 .. code-block:: none
 
@@ -93,19 +79,18 @@ Positive
     ....
     0000...0000 1111 1111
 
-The compiler will ``signextend`` the sign bit, which is 1 for negative and 0 for
-positive values, overwriting the higher bits:
+编译器将 ``符�化扩展（signextend）`` 符��，�负值为1，正值为0，覆盖高�：
 
-Negative
+è´Ÿæ•°
 
 .. code-block:: none
 
-    0010...1010 1111 1111   invalid value
-    1111...1111 1111 1111   cleaned value
+    0010...1010 1111 1111   无效的值
+    1111...1111 1111 1111   清�过的值
 
-Positive
+正数
 
 .. code-block:: none
 
-    1101...0101 0000 0100   invalid value
-    0000...0000 0000 0100   cleaned value
+    1101...0101 0000 0100   无效的值
+    0000...0000 0000 0100   清�过的值
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index c4cc1201b02a..7e02a2b04d8e 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -1,18 +1,17 @@
 ###############################
-Introduction to Smart Contracts
+智能�约概述
 ###############################
 
 .. _simple-smart-contract:
 
 ***********************
-A Simple Smart Contract
+简�的智能�约
 ***********************
 
-Let us begin with a basic example that sets the value of a variable and exposes
-it for other contracts to access. It is fine if you do not understand
-everything right now, we will go into more details later.
+让我们从一个基本的例�开始，这个例�设置了一个��的值，并将其暴露给其他�约�访问。
+如果您现在��解这些东西也没关系，我们��会讨论更多细节。
 
-Storage Example
+存储�约示例
 ===============
 
 .. code-block:: solidity
@@ -32,55 +31,49 @@ Storage Example
         }
     }
 
-The first line tells you that the source code is licensed under the
-GPL version 3.0. Machine-readable license specifiers are important
-in a setting where publishing the source code is the default.
-
-The next line specifies that the source code is written for
-Solidity version 0.4.16, or a newer version of the language up to, but not including version 0.9.0.
-This is to ensure that the contract is not compilable with a new (breaking) compiler version, where it could behave differently.
-:ref:`Pragmas<pragma>` are common instructions for compilers about how to treat the
-source code (e.g. `pragma once <https://en.wikipedia.org/wiki/Pragma_once>`_).
-
-A contract in the sense of Solidity is a collection of code (its *functions*) and
-data (its *state*) that resides at a specific address on the Ethereum
-blockchain. The line ``uint storedData;`` declares a state variable called ``storedData`` of
-type ``uint`` (*u*\nsigned *int*\eger of *256* bits). You can think of it as a single slot
-in a database that you can query and alter by calling functions of the
-code that manages the database. In this example, the contract defines the
-functions ``set`` and ``get`` that can be used to modify
-or retrieve the value of the variable.
-
-To access a member (like a state variable) of the current contract, you do not typically add the ``this.`` prefix,
-you just access it directly via its name.
-Unlike in some other languages, omitting it is not just a matter of style,
-it results in a completely different way to access the member, but more on this later.
-
-This contract does not do much yet apart from (due to the infrastructure
-built by Ethereum) allowing anyone to store a single number that is accessible by
-anyone in the world without a (feasible) way to prevent you from publishing
-this number. Anyone could call ``set`` again with a different value
-and overwrite your number, but the number is still stored in the history
-of the blockchain. Later, you will see how you can impose access restrictions
-so that only you can alter the number.
+第一行告诉您，�代�是根�GPL3.0版本授�的。
+在�布�代�是默认的情况下，机器�读的许��说明是很��的。
+
+下一行指定�代�是为Solidity 0.4.16版本编写的，或该语言的较新版本，直到但�包括0.9.0版本。
+这是为了确��约�能被新的（有�大改�的）编译器版本编译，在那里它�能会有��的表现。
+:ref:`Pragmas <pragma>` 是编译器关于如何处��代�的常用指令
+（例如， `pragma once <https://en.wikipedia.org/wiki/Pragma_once>`_ ）。
+
+Solidity�义上的�约是代�（其 *函数*）和数�（其 *状�*）的集�，
+驻留在以太�区�链的一个特定地�。
+这一行 ``uint storedData;`` 声明了一个�为 ``storedData`` 的状���，
+类型为 ``uint`` （ *u*\nsigned *int*\eger，共 *256* �）。
+您�以把它看作是数�库中的一个槽，您�以通过调用管�数�库的代�函数�查询和改�它。
+在这个例�中，�约定义了�以用�修改或检索��值的函数 ``set`` 和 ``get``。
+
+�访问当��约的一个�员（如状���），通常�需�添加 ``this.`` �缀，
+�需�通过它的�字直接访问它。
+与其他一些语言��的是，�略它�仅仅是一个风格问题，
+它导致了一�完全��的访问�员的方�，但��会有更多关于这个问题。
+
+该�约能完�的事情并�多（由于以太�构建的基础架构的原因），
+它能�许任何人在�约中存储一个�独的数字，并且这个数字�以被世界上任何人访问，
+且没有�行的办法阻止您�布这个数字。
+当然，任何人都�以�次调用 ``set`` ，传入��的值，覆盖您的数字，
+但是这个数字�会被存储在区�链的历�记录中。
+��，我们会看到怎样施加访问�制，以确��有您�能改�这个数字。
 
 .. warning::
-    Be careful with using Unicode text, as similar looking (or even identical) characters can
-    have different code points and as such are encoded as a different byte array.
+    �心使用Unicode文本，因为有些字符虽然长得相似（甚至一样），
+    但其字符�是��的，其编��的字符数组也会�一样。
 
 .. note::
-    All identifiers (contract names, function names and variable names) are restricted to
-    the ASCII character set. It is possible to store UTF-8 encoded data in string variables.
+    所有的标识符（�约�称，函数�称和���称）都�能使用ASCII字符集。
+    UTF-8编�的数��以用字符串��的形�存储。
 
 .. index:: ! subcurrency
 
-Subcurrency Example
-===================
+�货�（Subcurrency）例�
+===========================
 
-The following contract implements the simplest form of a
-cryptocurrency. The contract allows only its creator to create new coins (different issuance schemes are possible).
-Anyone can send coins to each other without a need for
-registering with a username and password, all you need is an Ethereum keypair.
+下�的�约实现了一个最简�的加密货�。
+这里，�确实�以无中生有地产生，但是�有创建�约的人�能�到（实现一个��的�行计划也�难）。
+而且，任何人都�以给其他人转�，�需�注册用户�和密�，所需�的�是以太�密钥对。
 
 .. code-block:: solidity
 
@@ -88,35 +81,30 @@ registering with a username and password, all you need is an Ethereum keypair.
     pragma solidity ^0.8.4;
 
     contract Coin {
-        // The keyword "public" makes variables
-        // accessible from other contracts
+        // 关键字 "public" 使���以从其他�约中访问。
         address public minter;
         mapping(address => uint) public balances;
 
-        // Events allow clients to react to specific
-        // contract changes you declare
+        // 事件�许客户端对您声明的特定�约�化�出�应
         event Sent(address from, address to, uint amount);
 
-        // Constructor code is only run when the contract
-        // is created
+        // 构造函数代��有在�约创建时�行
         constructor() {
             minter = msg.sender;
         }
 
-        // Sends an amount of newly created coins to an address
-        // Can only be called by the contract creator
+        // �一个地���一定数�的新创建的代�
+        // 但�能由�约创建者调用
         function mint(address receiver, uint amount) public {
             require(msg.sender == minter);
             balances[receiver] += amount;
         }
 
-        // Errors allow you to provide information about
-        // why an operation failed. They are returned
-        // to the caller of the function.
+        // 错误类型���许您�供关于�作失败原因的信�。
+        // 它们会返回给函数的调用者。
         error InsufficientBalance(uint requested, uint available);
 
-        // Sends an amount of existing coins
-        // from any caller to an address
+        // 从任何调用者那里��一定数�的代�到一个地�
         function send(address receiver, uint amount) public {
             if (amount > balances[msg.sender])
                 revert InsufficientBalance({
@@ -130,41 +118,46 @@ registering with a username and password, all you need is an Ethereum keypair.
         }
     }
 
-This contract introduces some new concepts, let us go through them one by one.
+这个�约引入了一些新的概念，让我们�一解读。
 
-The line ``address public minter;`` declares a state variable of type :ref:`address<address>`.
-The ``address`` type is a 160-bit value that does not allow any arithmetic operations.
-It is suitable for storing addresses of contracts, or a hash of the public half
-of a keypair belonging to :ref:`external accounts<accounts>`.
+``address public minter;`` 这一行声明了一个�以被公开访问的 :ref:`address<address>` 类型的状���。
+``address`` 类型是一个160�的值，且��许任何算数�作。
+这�类型适�存储�约地�或 :ref:`外部账户 <accounts>` 的密钥对。
 
-The keyword ``public`` automatically generates a function that allows you to access the current value of the state
-variable from outside of the contract. Without this keyword, other contracts have no way to access the variable.
-The code of the function generated by the compiler is equivalent
-to the following (ignore ``external`` and ``view`` for now):
+关键字 ``public`` 自动生�一个函数，�许您在这个�约之外访问这个状���的当�值。
+如果没有这个关键字，其他的�约没有办法访问这个��。
+由编译器生�的函数的代�大致如下所示（暂时忽略 ``external`` 和 ``view``）：
 
 .. code-block:: solidity
 
     function minter() external view returns (address) { return minter; }
 
-You could add a function like the above yourself, but you would have a function and state variable with the same name.
-You do not need to do this, the compiler figures it out for you.
+您�以自己添加一个类似上述的函数，但您会有��的一个函数和一个��。
+您�需�这样�，编译器会帮您解决这个问题。
 
 .. index:: mapping
 
-The next line, ``mapping(address => uint) public balances;`` also
-creates a public state variable, but it is a more complex datatype.
-The :ref:`mapping <mapping-types>` type maps addresses to :ref:`unsigned integers <integers>`.
-
+下一行， ``mapping(address => uint) public balances;`` 也创建了一个公共状���，
+但它是一个更��的数�类型。
+:ref:`映射 <mapping-types>` 类型将地�映射到 :ref:`无符�整数 <integers>`。
+
+<<<<<<< HEAD
+映射�以被看作是 `哈希表 <https://en.wikipedia.org/wiki/Hash_table>`_，
+它实际上是被�始化的，因此�一个�能的键从一开始就存在，并被映射到一个值，其字节表示为全零的值。
+然而，它既��能获得一个映射的所有键的列表，也��能获得所有值的列表。
+因此，�么记�您添加到映射中的内容，�么在�需�的情况下使用它。
+甚至更好的是，�留一个列表，或者使用一个更�适的数�类型。
+=======
 Mappings can be seen as `hash tables <https://en.wikipedia.org/wiki/Hash_table>`_ which are
-virtually initialised such that every possible key exists from the start and is mapped to a
+virtually initialized such that every possible key exists from the start and is mapped to a
 value whose byte-representation is all zeros. However, it is neither possible to obtain a list of all keys of
 a mapping, nor a list of all values. Record what you
 added to the mapping, or use it in a context where this is not needed. Or
 even better, keep a list, or use a more suitable data type.
+>>>>>>> english/develop
 
-The :ref:`getter function<getter-functions>` created by the ``public`` keyword
-is more complex in the case of a mapping. It looks like the
-following:
+而由 ``public`` 关键字创建的 :ref:`getter 函数 <getter-functions>` 则是更��一些的情况，
+它大致如下所示：
 
 .. code-block:: solidity
 
@@ -172,21 +165,17 @@ following:
         return balances[account];
     }
 
-You can use this function to query the balance of a single account.
+您�以用这个函数�查询�个账户的余�。
 
 .. index:: event
 
-The line ``event Sent(address from, address to, uint amount);`` declares
-an :ref:`"event" <events>`, which is emitted in the last line of the function
-``send``. Ethereum clients such as web applications can
-listen for these events emitted on the blockchain without much
-cost. As soon as it is emitted, the listener receives the
-arguments ``from``, ``to`` and ``amount``, which makes it possible to track
-transactions.
+这一行 ``event Sent(address from, address to, uint amount);`` 声明了一个 :ref:`"事件" <events>`，
+它是在函数 ``send`` 的最�一行�出的。以太�客户端，如网络应用，�以监�区�链上�出的这些事件，而�需�太多的�本。
+一旦�出，监�器就会收到�数 ``from``， ``to`` 和 ``amount``，这使得跟踪交易�为�能。
 
-To listen for this event, you could use the following
-JavaScript code, which uses `web3.js <https://github.com/web3/web3.js/>`_ to create the ``Coin`` contract object,
-and any user interface calls the automatically generated ``balances`` function from above:
+为了监�这个事件，您�以使用以下方法 JavaScript 代�，
+使用 `web3.js <https://github.com/web3/web3.js/>`_ �创建 ``Coin`` �约对象，
+然�在任何用户界�调用上�自动生�的 ``balances`` 函数：
 
 .. code-block:: javascript
 
@@ -203,400 +192,365 @@ and any user interface calls the automatically generated ``balances`` function f
 
 .. index:: coin
 
-The :ref:`constructor<constructor>` is a special function that is executed during the creation of the contract and
-cannot be called afterwards. In this case, it permanently stores the address of the person creating the
-contract. The ``msg`` variable (together with ``tx`` and ``block``) is a
-:ref:`special global variable <special-variables-functions>` that
-contains properties which allow access to the blockchain. ``msg.sender`` is
-always the address where the current (external) function call came from.
-
-The functions that make up the contract, and that users and contracts can call are ``mint`` and ``send``.
-
-The ``mint`` function sends an amount of newly created coins to another address. The :ref:`require
-<assert-and-require>` function call defines conditions that reverts all changes if not met. In this
-example, ``require(msg.sender == minter);`` ensures that only the creator of the contract can call
-``mint``. In general, the creator can mint as many tokens as they like, but at some point, this will
-lead to a phenomenon called "overflow". Note that because of the default :ref:`Checked arithmetic
-<unchecked>`, the transaction would revert if the expression ``balances[receiver] += amount;``
-overflows, i.e., when ``balances[receiver] + amount`` in arbitrary precision arithmetic is larger
-than the maximum value of ``uint`` (``2**256 - 1``). This is also true for the statement
-``balances[receiver] += amount;`` in the function ``send``.
-
-:ref:`Errors <errors>` allow you to provide more information to the caller about
-why a condition or operation failed. Errors are used together with the
-:ref:`revert statement <revert-statement>`. The ``revert`` statement unconditionally
-aborts and reverts all changes similar to the ``require`` function, but it also
-allows you to provide the name of an error and additional data which will be supplied to the caller
-(and eventually to the front-end application or block explorer) so that
-a failure can more easily be debugged or reacted upon.
-
-The ``send`` function can be used by anyone (who already
-has some of these coins) to send coins to anyone else. If the sender does not have
-enough coins to send, the ``if`` condition evaluates to true. As a result, the ``revert`` will cause the operation to fail
-while providing the sender with error details using the ``InsufficientBalance`` error.
+:ref:`constructor <constructor>` 是一个特殊的函数，�在创建�约的过程中执行，事��能�被调用。
+在这�情况下，它永久地存储了创建�约的人的地�。
+``msg`` ��（与 ``tx`` 和 ``block`` 一起）是一个 :ref:`特殊全局�� <special-variables-functions>`，
+其中包��许访问区�链的属性。 ``msg.sender`` 总是当�（外部）函数调用的地�。
+
+最�，真正被用户或其他�约所调用的，以完�本�约功能的方法是 ``mint`` 和 ``send``。
+
+``mint`` 函数��一定数�的新创建的代�到�一个地�。
+:ref:`require <assert-and-require>` 函数调用定义了一些�件，如果�满足这些�件就会��所有的�化。
+在这个例�中， ``require(msg.sender == minter);`` 确��有�约的创建者�以调用 ``mint``。
+一般�说，创建者�以�心所欲地铸造代�，但在�些时候，这将导致一��� "溢出" 的现象。
+请注�，由于默认的 :ref:`检查过的算术 <unchecked>`，如果表达� ``balances[receiver] += amount;`` 溢出，
+�当任�精度算术中的 ``balances[receiver] + amount`` 大于 ``uint`` 的最大值（ ``2**256 - 1``）时，
+交易将被��。对于函数 ``send`` 中的语� ``balances[receiver] += amount;`` 也是如此。
+
+:ref:`错误（Errors） <errors>` �许您�调用者�供更多关于一个�件或�作失败原因的信�。
+错误与 :ref:`��状� <revert-statement>` 一起使用。 ``revert`` 语�无�件地中止和��所有的�化，
+类似于 ``require`` 函数，但它也�许您�供错误的�称和�外的数�，
+这些数�将�供给调用者（并最终�供给�端应用程�或区�资�管�器），以便更容易调试失败或�出�应。
+
+任何人（已�拥有一些这样的代�）都�以使用 ``send`` 函数���代�给其他任何人。
+如果��者没有足够的代��以��， 那么 ``if`` �件就会为真。
+因此， ``revert`` 将导致�作失败，�时使用 ``InsufficientBalance`` 错误���者�供错误细节。
 
 .. note::
-    If you use
-    this contract to send coins to an address, you will not see anything when you
-    look at that address on a blockchain explorer, because the record that you sent
-    coins and the changed balances are only stored in the data storage of this
-    particular coin contract. By using events, you can create
-    a "blockchain explorer" that tracks transactions and balances of your new coin,
-    but you have to inspect the coin contract address and not the addresses of the
-    coin owners.
+    如果您用这个�约�一个地���代�，当您在区�链�览器上查看该地�时，
+    您�会看到任何东西，因为您��代�的记录和�化的余��存储在这个特定的代��约的数�存储中。
+    通过使用事件，您�以创建一个 "区�链�览器"，跟踪您的新�的交易和余�，
+    但您必须检查��约地�，而�是�主的地�。
 
 .. _blockchain-basics:
 
 *****************
-Blockchain Basics
+区�链基础
 *****************
 
-Blockchains as a concept are not too hard to understand for programmers. The reason is that
-most of the complications (mining, `hashing <https://en.wikipedia.org/wiki/Cryptographic_hash_function>`_,
-`elliptic-curve cryptography <https://en.wikipedia.org/wiki/Elliptic_curve_cryptography>`_,
-`peer-to-peer networks <https://en.wikipedia.org/wiki/Peer-to-peer>`_, etc.)
-are just there to provide a certain set of features and promises for the platform. Once you accept these
-features as given, you do not have to worry about the underlying technology - or do you have
-to know how Amazon's AWS works internally in order to use it?
+对于程�员�说，区�链这个概念并�难�解，这是因为大多数难懂的东西
+（挖矿, `哈希 <https://en.wikipedia.org/wiki/Cryptographic_hash_function>`_ ，
+`椭圆曲线密�学 <https://en.wikipedia.org/wiki/Elliptic_curve_cryptography>`_，
+`点对点网络（P2P） <https://en.wikipedia.org/wiki/Peer-to-peer>`_ 等）
+都�是用于�供特定的功能和承诺。
+您�需接�这些既有的特性功能，�必关心底层技术，
+比如，难�您必须知�亚马逊的 AWS 内部原�，您�能使用它�？
 
 .. index:: transaction
 
-Transactions
+交易/事务
 ============
 
-A blockchain is a globally shared, transactional database.
-This means that everyone can read entries in the database just by participating in the network.
-If you want to change something in the database, you have to create a so-called transaction
-which has to be accepted by all others.
-The word transaction implies that the change you want to make (assume you want to change
-two values at the same time) is either not done at all or completely applied. Furthermore,
-while your transaction is being applied to the database, no other transaction can alter it.
-
-As an example, imagine a table that lists the balances of all accounts in an
-electronic currency. If a transfer from one account to another is requested,
-the transactional nature of the database ensures that if the amount is
-subtracted from one account, it is always added to the other account. If due
-to whatever reason, adding the amount to the target account is not possible,
-the source account is also not modified.
-
+区�链是全�共享的事务性数�库，这�味��个人都�加入网络�阅读数�库中的记录。
+如果您想改�数�库中的�些东西，您必须创建一个被所有其他人所接�的事务。
+事务一��味�您想�的（�设您想��时更改两个值），�么一点没�，�么全部完�。
+此外，当您的事务被应用到数�库时，其他事务�能修改数�库。
+
+举个例�，设想一张表，列出电�货�中所有账户的余�。
+如果请求从一个账户转移到�一个账户，
+数�库的事务特性确�了如果从一个账户扣除金�，它总被添加到�一个账户。
+如果由于�些原因，无法添加金�到目标账户时，�账户也�会�生任何�化。
+
+<<<<<<< HEAD
+此外，交易总是由��人（创建者）签�。
+这样，就��常简�地为数�库的特定修改增加访问�护机制。
+在电�货�的例�中，一个简�的检查�以确��有�有账户密钥的人�能从中转账。
+=======
 Furthermore, a transaction is always cryptographically signed by the sender (creator).
 This makes it straightforward to guard access to specific modifications of the
 database. In the example of the electronic currency, a simple check ensures that
 only the person holding the keys to the account can transfer some compensation, e.g. Ether, from it.
+>>>>>>> english/develop
 
 .. index:: ! block
 
-Blocks
+区�
 ======
 
-One major obstacle to overcome is what (in Bitcoin terms) is called a "double-spend attack":
-What happens if two transactions exist in the network that both want to empty an account?
-Only one of the transactions can be valid, typically the one that is accepted first.
-The problem is that "first" is not an objective term in a peer-to-peer network.
-
-The abstract answer to this is that you do not have to care. A globally accepted order of the transactions
-will be selected for you, solving the conflict. The transactions will be bundled into what is called a "block"
-and then they will be executed and distributed among all participating nodes.
-If two transactions contradict each other, the one that ends up being second will
-be rejected and not become part of the block.
-
-These blocks form a linear sequence in time, and that is where the word "blockchain" derives from.
-Blocks are added to the chain at regular intervals, although these intervals may be subject to change in the future.
-For the most up-to-date information, it is recommended to monitor the network, for example, on `Etherscan <https://etherscan.io/chart/blocktime>`_.
-
-As part of the "order selection mechanism" (which is called "mining") it may happen that
+�克�的一个主�障�是（用比特�的术语）所谓的 “�花攻击 (double-spend attack)�：
+如果网络中存在两个交易，都想清空一个账户，会�生什么？
+�有其中一个交易是有效的，通常是最先被接�的那个。
+问题是，在点对点的网络中，"第一" �是一个客观的术语。
+
+对此，抽象的答案是，您�必在�。一个全�公认的交易顺�将为您选择，
+解决这样的冲�。这些交易将被�绑�所谓的 "区�"，
+然�它们将在所有�与节点中执行和分�。
+如果两个交易相互矛盾，最终排在第二�的那个交易将被拒�，�会�为区�的一部分。
+
+这些区�按时间形�了一个线性�列，这就是 “区�链� 一�的由�。
+区��隔一段时间就会被添加到链上，但这些时间间隔在未��能会�生�化。
+如需了解最新信�，建议在 `Etherscan <https://etherscan.io/chart/blocktime>`_ 等网站上对网络进行监控。
+
+<<<<<<< HEAD
+作为 “顺�选择机制�（也就是所谓的“挖矿�）的一部分，
+�能有时会�生�（blocks）被回滚的情况，但仅在链的“末端�。
+末端增加的�越多，其�生回滚的概率越�。
+因此您的交易被回滚甚至从区�链中抹除，这是�能的，
+但等待的时间越长，这�情况�生的概率就越�。
+=======
+As part of the "order selection mechanism", which is called `attestation <https://ethereum.org/en/developers/docs/consensus-mechanisms/pos/attestations/>`_, it may happen that
 blocks are reverted from time to time, but only at the "tip" of the chain. The more
 blocks are added on top of a particular block, the less likely this block will be reverted. So it might be that your transactions
 are reverted and even removed from the blockchain, but the longer you wait, the less
 likely it will be.
+>>>>>>> english/develop
 
 .. note::
-    Transactions are not guaranteed to be included in the next block or any specific future block,
-    since it is not up to the submitter of a transaction, but up to the miners to determine in which block the transaction is included.
+    交易���被包括在下一个区�或任何特定的未�区�中，
+    因为这�是由交易的�交者决定的，而是由矿工�决定交易被包括在哪个区�中。
 
-    If you want to schedule future calls of your contract, you can use
-    a smart contract automation tool or an oracle service.
+    如果您想安排您的�约的未�调用，您�以使用智能�约自动化工具或oracle�务。
 
 .. _the-ethereum-virtual-machine:
 
 .. index:: !evm, ! ethereum virtual machine
 
 ****************************
-The Ethereum Virtual Machine
+以太�虚拟机
 ****************************
 
-Overview
+概述
 ========
 
-The Ethereum Virtual Machine or EVM is the runtime environment
-for smart contracts in Ethereum. It is not only sandboxed but
-actually completely isolated, which means that code running
-inside the EVM has no access to network, filesystem or other processes.
-Smart contracts even have limited access to other smart contracts.
+以太�虚拟机或EVM是以太�智能�约的�行环境。
+它�仅是沙盒�装的，而且实际上是完全隔离的，
+这�味�在EVM内�行的代��能访问网络，文件系统或其他进程。
+甚至智能�约之间的访问也是��的。
 
 .. index:: ! account, address, storage, balance
 
 .. _accounts:
 
-Accounts
+账户
 ========
 
-There are two kinds of accounts in Ethereum which share the same
-address space: **External accounts** that are controlled by
-public-private key pairs (i.e. humans) and **contract accounts** which are
-controlled by the code stored together with the account.
+在以太�有两�共享�一地�空间的账户：
+**外部账户**，由公钥-�钥对（也就是人）控制；
+**�约账户**，由与账户一起存储的代�控制。
 
-The address of an external account is determined from
-the public key while the address of a contract is
-determined at the time the contract is created
-(it is derived from the creator address and the number
-of transactions sent from that address, the so-called "nonce").
+外部账户的地�是由公钥确定的，
+而�约的地�是在�约创建时确定的
+（它是由创建者地�和从该地��出的交易数�得出的，�所谓的 "nonce"）。
 
-Regardless of whether or not the account stores code, the two types are
-treated equally by the EVM.
+无论账户是�存储代�，这两�类型都被EVM平等对待。
 
-Every account has a persistent key-value store mapping 256-bit words to 256-bit
-words called **storage**.
+�个账户都有一个�久的键值存储，将256�的字映射到256�的字，称为 **存储**。
 
-Furthermore, every account has a **balance** in
-Ether (in "Wei" to be exact, ``1 ether`` is ``10**18 wei``) which can be modified by sending transactions that
-include Ether.
+此外，�个账户有一个以太 **余�** （ balance ）（��是“Wei�， ``1 ether`` 是 ``10**18 wei``），
+余�会因为��包�以太�的交易而改�。
 
 .. index:: ! transaction
 
-Transactions
+交易
 ============
 
-A transaction is a message that is sent from one account to another
-account (which might be the same or empty, see below).
-It can include binary data (which is called "payload") and Ether.
-
-If the target account contains code, that code is executed and
-the payload is provided as input data.
-
-If the target account is not set (the transaction does not have
-a recipient or the recipient is set to ``null``), the transaction
-creates a **new contract**.
-As already mentioned, the address of that contract is not
-the zero address but an address derived from the sender and
-its number of transactions sent (the "nonce"). The payload
-of such a contract creation transaction is taken to be
-EVM bytecode and executed. The output data of this execution is
-permanently stored as the code of the contract.
-This means that in order to create a contract, you do not
-send the actual code of the contract, but in fact code that
-returns that code when executed.
+交易�以看作是从一个�户��到�一个�户的消�
+（这里的账户，�能是相�的或特殊的零�户，请�阅下文）。
+它能包�一个二进制数�（被称为“�约负载�）和以太。
+
+如果目标账户�有代�，此代�会被执行，并以�约负载（二进制数�） 作为入�。
+
+如果目标账户没有设置（交易没有接收者或接收者被设置为 ``null``），
+交易会创建一个 **新�约**。
+正如已��到的，该�约的地��是零地�，
+而是从��者和其��的交易数�（“nonce�）中得出的地�。
+这��约创建交易的有效负载被认为是EVM字节�并被执行。
+该执行的输出数�被永久地存储为�约的代�。
+这�味�，为创建一个�约，您�需���实际的�约代�，而是��能够产生�约代�的代�。
 
 .. note::
-  While a contract is being created, its code is still empty.
-  Because of that, you should not call back into the
-  contract under construction until its constructor has
-  finished executing.
+  在�约创建的过程中，它的代�还是空的。
+  所以直到构造函数执行结�，您都�应该在其中调用�约自己函数。
 
 .. index:: ! gas, ! gas price
 
 Gas
 ===
 
-Upon creation, each transaction is charged with a certain amount of **gas**
-that has to be paid for by the originator of the transaction (``tx.origin``).
-While the EVM executes the
-transaction, the gas is gradually depleted according to specific rules.
-If the gas is used up at any point (i.e. it would be negative),
-an out-of-gas exception is triggered, which ends execution and reverts all modifications
-made to the state in the current call frame.
+一�创建，�笔交易都会被收�一定数�的 **gas**，
+这些 gas 必须由交易的�起人 （ ``tx.origin``）支付。
+在 EVM 执行交易时，gas 根�特定规则��耗尽。
+如果 gas 在�一点被用完（�它会为负），
+将触�一个 gas 耗尽异常，
+这将结�执行并撤销当�调用栈中对状�所�的所有修改。
 
-This mechanism incentivizes economical use of EVM execution time
-and also compensates EVM executors (i.e. miners / stakers) for their work.
-Since each block has a maximum amount of gas, it also limits the amount
-of work needed to validate a block.
+此机制激励了对 EVM 执行时间的�济利用，
+并为 EVM 执行器（�矿工/��者）的工作�供补�。
+由于�个区�都有最大 gas �，因此还�制了验��所需的工作�。
 
-The **gas price** is a value set by the originator of the transaction, who
-has to pay ``gas_price * gas`` up front to the EVM executor.
-If some gas is left after execution, it is refunded to the transaction originator.
-In case of an exception that reverts changes, already used up gas is not refunded.
+**gas price** 是交易�起人设定的值，
+他必须��� EVM 执行器支付 ``gas_price * gas``。
+如果执行�还剩下一些 gas，则退还给交易�起人。
+如果�生撤销更改的异常，已�使用的 gas �会退还。
 
-Since EVM executors can choose to include a transaction or not,
-transaction senders cannot abuse the system by setting a low gas price.
+由于 EVM 执行器�以选择包�一笔交易，
+因此交易��者无法通过设置低 gas 价格滥用系统。
 
 .. index:: ! storage, ! memory, ! stack
 
-Storage, Memory and the Stack
+存储，内存和栈
 =============================
 
-The Ethereum Virtual Machine has three areas where it can store data:
-storage, memory and the stack.
-
-Each account has a data area called **storage**, which is persistent between function calls
-and transactions.
-Storage is a key-value store that maps 256-bit words to 256-bit words.
-It is not possible to enumerate storage from within a contract, it is
-comparatively costly to read, and even more to initialise and modify storage. Because of this cost,
-you should minimize what you store in persistent storage to what the contract needs to run.
-Store data like derived calculations, caching, and aggregates outside of the contract.
-A contract can neither read nor write to any storage apart from its own.
-
-The second data area is called **memory**, of which a contract obtains
-a freshly cleared instance for each message call. Memory is linear and can be
-addressed at byte level, but reads are limited to a width of 256 bits, while writes
-can be either 8 bits or 256 bits wide. Memory is expanded by a word (256-bit), when
-accessing (either reading or writing) a previously untouched memory word (i.e. any offset
-within a word). At the time of expansion, the cost in gas must be paid. Memory is more
-costly the larger it grows (it scales quadratically).
-
-The EVM is not a register machine but a stack machine, so all
-computations are performed on a data area called the **stack**. It has a maximum size of
-1024 elements and contains words of 256 bits. Access to the stack is
-limited to the top end in the following way:
-It is possible to copy one of
-the topmost 16 elements to the top of the stack or swap the
-topmost element with one of the 16 elements below it.
-All other operations take the topmost two (or one, or more, depending on
-the operation) elements from the stack and push the result onto the stack.
-Of course it is possible to move stack elements to storage or memory
-in order to get deeper access to the stack,
-but it is not possible to just access arbitrary elements deeper in the stack
-without first removing the top of the stack.
+以太�虚拟机有三个存储数�的区域：存储器，内存和堆栈。
+
+�个账户都有一个称为 **存储** 的数�区，在函数调用和交易之间是�久的。
+存储是一个键值存储，将256�的字映射到256�的字。
+在�约中枚举存储是��能的，读�的�本相对较高，�始化和修改存储的�本更高。
+由于这��本，您应该把您存储在�久性存储中的内容�少到�约�行所需的程度。
+在�约之外存储�派生计算，缓存和��的数�。�约既�能读也�能写到除其自身以外的任何存储。
+
+第二个数�区被称为 **内存**，�约在�次消�调用时都会获得一个新清除的实例。
+内存是线性的，�以在字节级寻�，但读的宽度�制在256�，
+而写的宽度�以是8�或256�。当访问（无论是读还是写）一个先�未触�的内存字（�一个字内的任何�移）时，
+内存被扩展一个字（256�）。在扩展的时候，必须支付gas�本。
+内存越大，�本就越高（它以平方级别扩展）。
+
+EVM �是基于寄存器的，而是基于栈的，因此所有的计算都在一个被称为 **栈（stack）** 的区域执行。
+栈最大有1024个元素，�个元素长度是一个字（256�）。对栈的访问��于其顶端，�制方�为：
+�许拷�最顶端的16个元素中的一个到栈顶，或者是交�栈顶元素和下�16个元素中的一个。
+所有其他�作都�能�最顶的两个（或一个，或更多，�决于具体的�作）元素，
+�算�，把结果压入栈顶。当然�以把栈上的元素放到存储或内存中。
+但是无法�访问栈上指定深度的那个元素，除�先从栈顶移除其他元素。
 
 .. index:: ! instruction
 
-Instruction Set
+指令集
 ===============
 
-The instruction set of the EVM is kept minimal in order to avoid
-incorrect or inconsistent implementations which could cause consensus problems.
-All instructions operate on the basic data type, 256-bit words or on slices of memory
-(or other byte arrays).
-The usual arithmetic, bit, logical and comparison operations are present.
-Conditional and unconditional jumps are possible. Furthermore,
-contracts can access relevant properties of the current block
-like its number and timestamp.
+EVM的指令集应尽���最�，以���正确或�一致的实现，这�能导致共识问题。
+所有的指令都是在基本的数�类型上�作的，256�的字或内存的片断（或其他字节数组）。
+具备常用的算术，�，逻辑和比较�作。也�以�到有�件和无�件跳转。
+此外，�约�以访问当�区�的相关属性，比如它的编�和时间戳。
 
-For a complete list, please see the :ref:`list of opcodes <opcodes>` as part of the inline
-assembly documentation.
+关于完整的列表，请�� :ref:`�作�列表 <opcodes>`，它是内�汇编文档的一部分。
 
 .. index:: ! message call, function;call
 
-Message Calls
+消�调用
 =============
 
-Contracts can call other contracts or send Ether to non-contract
-accounts by the means of message calls. Message calls are similar
-to transactions, in that they have a source, a target, data payload,
-Ether, gas and return data. In fact, every transaction consists of
-a top-level message call which in turn can create further message calls.
-
-A contract can decide how much of its remaining **gas** should be sent
-with the inner message call and how much it wants to retain.
-If an out-of-gas exception happens in the inner call (or any
-other exception), this will be signaled by an error value put onto the stack.
-In this case, only the gas sent together with the call is used up.
-In Solidity, the calling contract causes a manual exception by default in
-such situations, so that exceptions "bubble up" the call stack.
-
-As already said, the called contract (which can be the same as the caller)
-will receive a freshly cleared instance of memory and has access to the
-call payload - which will be provided in a separate area called the **calldata**.
-After it has finished execution, it can return data which will be stored at
-a location in the caller's memory preallocated by the caller.
-All such calls are fully synchronous.
-
-Calls are **limited** to a depth of 1024, which means that for more complex
-operations, loops should be preferred over recursive calls. Furthermore,
-only 63/64th of the gas can be forwarded in a message call, which causes a
-depth limit of a little less than 1000 in practice.
+�约�以通过消�调用的方��调用其它�约或者��以太�到��约账户。
+消�调用和交易�常类似，它们都有一个�，目标，数�，以太�，gas和返回数�。
+事实上�个交易都由一个顶层消�调用组�，这个消�调用��创建更多的消�调用。
+
+�约�以决定它剩余的 **gas** 有多少应该�内部消�调用一起��，有多少它想�留。
+如果在内部调用中�生了out-of-gas的异常（或任何其他异常），这将由一个被压入栈顶的错误值�表示。
+在这�情况下，�有与调用一起��的gas被用完。
+在Solidity中，在这�情况下，�起调用的�约默认会引起一个手动异常，
+所以异常会在调用栈上 "冒泡出�"。
+
+如�文所述，被调用的�约（�以与调用者是�一个�约）将收到一个新清空的内存实例，
+并�以访问调用的有效负载-由被称为 **calldata** 的独立区域所�供的数�。
+在它执行完毕�，它�以返回数�，这些数�将被存储在调用者内存中由调用者预先分�的�置。
+所有这样的调用都是完全�步的。
+
+调用被 **�制** 在1024的深度，这�味�对于更��的�作，循环应优先于递归调用。
+此外，在一个消�调用中，�有63/64的gas�以被转�，这导致在实践中，深度�制略低于1000。
 
 .. index:: delegatecall, library
 
-Delegatecall and Libraries
+委托调用和库
 ==========================
 
-There exists a special variant of a message call, named **delegatecall**
-which is identical to a message call apart from the fact that
-the code at the target address is executed in the context (i.e. at the address) of the calling
-contract and ``msg.sender`` and ``msg.value`` do not change their values.
+存在一�特殊的消�调用，被称为 **委托调用（delegatecall）**，
+除了目标地�的代�是在调用�约的上下文（�地�）中执行，
+``msg.sender`` 和 ``msg.value`` 的值�会更改之外，其他与消�调用相�。
 
-This means that a contract can dynamically load code from a different
-address at runtime. Storage, current address and balance still
-refer to the calling contract, only the code is taken from the called address.
+这�味��约�以在�行时动�地从��的地�加载代�。
+存储，当�地�和余��然指的是调用�约，�是代��自被调用的地�。
 
-This makes it possible to implement the "library" feature in Solidity:
-Reusable library code that can be applied to a contract's storage, e.g. in
-order to implement a complex data structure.
+这使得在Solidity中实现 “库� 的功能�为�能：
+���使用的库代�，�以放在一个�约的存储上，例如，用�实现��的数�结构的库。
 
 .. index:: log
 
-Logs
+日志
 ====
 
-It is possible to store data in a specially indexed data structure
-that maps all the way up to the block level. This feature called **logs**
-is used by Solidity in order to implement :ref:`events <events>`.
-Contracts cannot access log data after it has been created, but they
-can be efficiently accessed from outside the blockchain.
-Since some part of the log data is stored in `bloom filters <https://en.wikipedia.org/wiki/Bloom_filter>`_, it is
-possible to search for this data in an efficient and cryptographically
-secure way, so network peers that do not download the whole blockchain
-(so-called "light clients") can still find these logs.
+有一�特殊的�索引的数�结构，其存储的数��以一路映射直到区�层级。
+这个特性被称为 **日志（logs）** ，Solidity用它�实现 :ref:`事件 <events>`。
+�约创建之�就无法访问日志数�，但是这些数��以从区�链外高效的访问。
+因为部分日志数�被存储在 `布隆过滤器（bloom filter） <https://en.wikipedia.org/wiki/Bloom_filter>`_ 中，
+我们�以高效并且加密安全地�索日志，所以那些没有下载整个区�链的网络节点（轻客户端）也�以找到这些日志。
 
 .. index:: contract creation
 
-Create
+创建
 ======
 
-Contracts can even create other contracts using a special opcode (i.e.
-they do not simply call the zero address as a transaction would). The only difference between
-these **create calls** and normal message calls is that the payload data is
-executed and the result stored as code and the caller / creator
-receives the address of the new contract on the stack.
+�约甚至�以通过一个特殊的指令�创建其他�约（�是简�的调用零地�）。
+创建�约的调用 **create calls** 和普通消�调用的唯一区别在于，负载会被执行，
+执行的结果被存储为�约代�，调用者/创建者在栈上得到新�约的地�。
 
 .. index:: ! selfdestruct, deactivate
 
-Deactivate and Self-destruct
+�用和自�
 ============================
 
-The only way to remove code from the blockchain is when a contract at that
-address performs the ``selfdestruct`` operation. The remaining Ether stored
-at that address is sent to a designated target and then the storage and code
-is removed from the state. Removing the contract in theory sounds like a good
-idea, but it is potentially dangerous, as if someone sends Ether to removed
-contracts, the Ether is forever lost.
+从区�链上删除代�的唯一方法是当该地�的�约执行 ``selfdestruct`` �作。
+存储在该地�的剩余以太�被��到一个指定的目标，然�存储和代�被从状�中删除。
+删除�约在�论上�起�是个好主�，但它有潜在的�险性，
+因为如果有人�被删除的�约��以太�，以太�就会永远丢失。
 
 .. warning::
-    From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
-    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behavior
-    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+<<<<<<< HEAD
+    从0.8.18�更高版本开始，在 Solidity 和 Yul 中使用 ``selfdestruct`` 将触�弃用警告，
+    因为 ``SELFDESTRUCT`` �作�最终将�历 `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_ 
+    中所述的行为的�大�化。
+=======
+    From ``EVM >= Cancun`` onwards, ``selfdestruct`` will **only** send all Ether in the account to the given recipient and not destroy the contract.
+    However, when ``selfdestruct`` is called in the same transaction that creates the contract calling it,
+    the behaviour of ``selfdestruct`` before Cancun hardfork (i.e., ``EVM <= Shanghai``) is preserved and will destroy the current contract,
+    deleting any data, including storage keys, code and the account itself.
+    See `EIP-6780 <https://eips.ethereum.org/EIPS/eip-6780>`_ for more details.
+
+    The new behaviour is the result of a network-wide change that affects all contracts present on
+    the Ethereum mainnet and testnets.
+    It is important to note that this change is dependent on the EVM version of the chain on which
+    the contract is deployed.
+    The ``--evm-version`` setting used when compiling the contract has no bearing on it.
+
+    Also, note that the ``selfdestruct`` opcode has been deprecated in Solidity version 0.8.18,
+    as recommended by `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+    The deprecation is still in effect and the compiler will still emit warnings on its use.
+    Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account.
+    Future changes to the EVM might further reduce the functionality of the opcode.
+>>>>>>> english/develop
 
 .. warning::
-    Even if a contract is removed by ``selfdestruct``, it is still part of the
-    history of the blockchain and probably retained by most Ethereum nodes.
-    So using ``selfdestruct`` is not the same as deleting data from a hard disk.
+    �使一个�约通过 ``selfdestruct`` 删除，它�然是区�链历�的一部分，
+    �能被大多数以太�节点�留。
+    因此，使用 ``selfdestruct`` 与从硬盘上删除数��一样。
 
 .. note::
-    Even if a contract's code does not contain a call to ``selfdestruct``,
-    it can still perform that operation using ``delegatecall`` or ``callcode``.
+    尽管一个�约的代�中没有显�地调用 ``selfdestruct`` ，
+    它�然有�能通过 ``delegatecall`` 或  ``callcode`` 执行自��作。
 
-If you want to deactivate your contracts, you should instead **disable** them
-by changing some internal state which causes all functions to revert. This
-makes it impossible to use the contract, as it returns Ether immediately.
+如果您想�用您的�约，您�以通过改�一些内部状�� **�用** 它们，
+从而使�次调用所有的功能都会被��。这样就无法使用�约了，因为它立�返回以太。
 
 
 .. index:: ! precompiled contracts, ! precompiles, ! contract;precompiled
 
 .. _precompiledContracts:
 
-Precompiled Contracts
+预编译�约
 =====================
 
+<<<<<<< HEAD
+有一�群�约地�是特殊的。 ``1`` 和（包括） ``8`` 之间的地�范围包� “预编译�约“，
+�以�其他�约一样被调用，但它们的行为（和它们的gas消耗）
+�是由存储在该地�的EVM代�定义的（它们�包�代�），
+而是由EVM执行环境本身实现。
+=======
 There is a small set of contract addresses that are special:
 The address range between ``1`` and (including) ``8`` contains
 "precompiled contracts" that can be called as any other contract
 but their behavior (and their gas consumption) is not defined
 by EVM code stored at that address (they do not contain code)
 but instead is implemented in the EVM execution environment itself.
+>>>>>>> english/develop
 
-Different EVM-compatible chains might use a different set of
-precompiled contracts. It might also be possible that new
-precompiled contracts are added to the Ethereum main chain in the future,
-but you can reasonably expect them to always be in the range between
-``1`` and ``0xffff`` (inclusive).
+��的EVM兼容链�能使用��的预编译�约集。
+未�也有�能在以太�主链上添加新的预编译�约，
+但您�以��地预期它们总是在 ``1`` 和 ``0xffff`` （包括）之间。
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 4917cfc7158d..952632f5b14b 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -3,18 +3,26 @@
 
 .. _ir-breaking-changes:
 
-*********************************
-Solidity IR-based Codegen Changes
-*********************************
-
-Solidity can generate EVM bytecode in two different ways:
-Either directly from Solidity to EVM opcodes ("old codegen") or through
-an intermediate representation ("IR") in Yul ("new codegen" or "IR-based codegen").
-
-The IR-based code generator was introduced with an aim to not only allow
-code generation to be more transparent and auditable but also
-to enable more powerful optimization passes that span across functions.
-
+*************************************
+基于 Solidity 中间表�的 Codegen �化
+*************************************
+
+Solidity �以通过两���的方�生� EVM 字节�：
+�么直接从 Solidity 到 EVM �作�（“旧编��），
+�么通过在 Yul 中的中间表示法（“IR�）（“新编�� 或 “基于IR的编��）。
+
+引入基于 IR 的代�生�器的目的是，�仅使代�生�更加�明和�审计，
+而且能够实现更强大的跨函数的优化通�。
+
+<<<<<<< HEAD
+您�以在命令行中使用 ``--via-ir``
+或在 standard-json 中使用 ``{"viaIR": true}`` 选项��用它，
+我们鼓励大家�试一下�
+
+由于一些原因，旧的和基于 IR 的代�生�器之间存在�微�的语义差异，
+主�是在那些我们无论如何也�会期望人们�赖这�行为的领域。
+本节强调了旧的和基于IR的代�生�器之间的主�区别。
+=======
 You can enable it on the command-line using ``--via-ir``
 or with the option ``{"viaIR": true}`` in standard-json and we
 encourage everyone to try it out!
@@ -23,35 +31,38 @@ For several reasons, there are tiny semantic differences between the old
 and the IR-based code generator, mostly in areas where we would not
 expect people to rely on this behavior anyway.
 This section highlights the main differences between the old and the IR-based codegen.
+>>>>>>> english/develop
 
-Semantic Only Changes
+仅有语义上的�化
 =====================
 
-This section lists the changes that are semantic-only, thus potentially
-hiding new and different behavior in existing code.
+本节列出了仅有语义的�化，从而有�能在现有的代�中��新的和��的行为。
 
+<<<<<<< HEAD
+- 在继承的情况下，状����始化的顺�已�改�。
+=======
 .. _state-variable-initialization-order:
 
 - The order of state variable initialization has changed in case of inheritance.
+>>>>>>> english/develop
 
-  The order used to be:
+  以�的顺�是：
 
-  - All state variables are zero-initialized at the beginning.
-  - Evaluate base constructor arguments from most derived to most base contract.
-  - Initialize all state variables in the whole inheritance hierarchy from most base to most derived.
-  - Run the constructor, if present, for all contracts in the linearized hierarchy from most base to most derived.
+  - 所有的状���在开始时都被零�始化。
+  - 从最终派生�约到最基础的�约评估基础构造函数�数。
+  - 从最基础的继承关系到最终派生的继承关系�始化整个继承层次结构中的所有状���。
+  - 如果存在，在线性化层次结构中从最基础的�约到最终派生的�约�次�行构造函数。
 
-  New order:
+  新的顺�：
 
-  - All state variables are zero-initialized at the beginning.
-  - Evaluate base constructor arguments from most derived to most base contract.
-  - For every contract in order from most base to most derived in the linearized hierarchy:
+  - 所有的状���在开始时都被零�始化。
+  - 从最终派生�约到最基础的�约评估基础构造函数�数。
+  - 对于�一个�约，按照从最基础到最终派生的�约的线性化层次结构的顺�执行：
 
-      1. Initialize state variables.
-      2. Run the constructor (if present).
+    1. �始化状���。
+    2. �行构造函数（如果存在）。
 
-  This causes differences in contracts where the initial value of a state
-  variable relies on the result of the constructor in another contract:
+  这导致了�约中的差异，�一个状���的�始值�赖于�一个�约中构造函数的结果：
 
   .. code-block:: solidity
 
@@ -71,16 +82,13 @@ hiding new and different behavior in existing code.
           uint public y = f();
       }
 
-  Previously, ``y`` would be set to 0. This is due to the fact that we would first initialize state variables: First, ``x`` is set to 0, and when initializing ``y``, ``f()`` would return 0 causing ``y`` to be 0 as well.
-  With the new rules, ``y`` will be set to 42. We first initialize ``x`` to 0, then call A's constructor which sets ``x`` to 42. Finally, when initializing ``y``, ``f()`` returns 42 causing ``y`` to be 42.
+  以�， ``y`` 会被设置为0。这是由于我们会先�始化状���：首先， ``x`` 被设置为0，当�始化 ``y`` 时， ``f()`` 将返回0，导致 ``y`` 也为0。
+  在新的规则下， ``y`` 将被设置为42。我们首先将 ``x`` �始化为0，然�调用 A 的构造函数，将 ``x`` 设置为42。最�，在�始化 ``y`` 时， ``f()`` 返回42，导致 ``y`` 为42。
 
-- When storage structs are deleted, every storage slot that contains
-  a member of the struct is set to zero entirely. Formerly, padding space
-  was left untouched.
-  Consequently, if the padding space within a struct is used to store data
-  (e.g. in the context of a contract upgrade), you have to be aware that
-  ``delete`` will now also clear the added member (while it wouldn't
-  have been cleared in the past).
+- 当存储结构被删除时，包�该结构�员的�个存储槽都被完全设置为零。
+  以�，填充空间是�被触动的。
+  因此，如果结构中的填充空间被用�存储数�（例如在�约�级的背景下），
+  您必须注�， ``delete`` 现在也会清除添加的�员（而在过去�会被清除）。
 
   .. code-block:: solidity
 
@@ -96,22 +104,21 @@ hiding new and different behavior in existing code.
           function f() public {
               // ...
               delete s;
-              // s occupies only first 16 bytes of the 32 bytes slot
-              // delete will write zero to the full slot
+              // s��用了32个字节槽的�16个字节
+              // delete 将把零写到完整的�槽中
           }
       }
 
-  We have the same behavior for implicit delete, for example when array of structs is shortened.
+  我们对��删除也有�样的行为，例如当结构体的数组被缩短时。
 
-- Function modifiers are implemented in a slightly different way regarding function parameters and return variables.
-  This especially has an effect if the placeholder ``_;`` is evaluated multiple times in a modifier.
-  In the old code generator, each function parameter and return variable has a fixed slot on the stack.
-  If the function is run multiple times because ``_;`` is used multiple times or used in a loop, then a
-  change to the function parameter's or return variable's value is visible in the next execution of the function.
-  The new code generator implements modifiers using actual functions and passes function parameters on.
-  This means that multiple evaluations of a function's body will get the same values for the parameters,
-  and the effect on return variables is that they are reset to their default (zero) value for each
-  execution.
+- 关于函数�数和返回��，函数修改器的实现方�略有��。
+  如果��符 ``_;`` 在一个修饰符中被多次使用，这尤其有影�。
+  在旧的代�生�器中，�个函数�数和返回��在堆栈中都有一个固定的槽。
+  如果因为多次使用 ``_;`` 而使函数�行多次，或者在一个循环中使用，
+  那么函数�数或返回��的值的�化在函数的下一次执行中是��的。
+  新的代�生�器使用实际的函数�实现修改器，并将函数�数传递下去。
+  这�味�对一个函数主体的多次使用将得到相�的�数值，而对返回��的影�是，
+  它们在�次执行时都被�置为其默认值（零）。
 
   .. code-block:: solidity
 
@@ -124,8 +131,8 @@ hiding new and different behavior in existing code.
           modifier mod() { _; _; }
       }
 
-  If you execute ``f(0)`` in the old code generator, it will return ``1``, while
-  it will return ``0`` when using the new code generator.
+  如果您在旧的代�生�器中执行 ``f(0)``，它将返回 ``1``，
+  而在使用新的代�生�器时，它将返回 ``0``。
 
   .. code-block:: solidity
 
@@ -143,26 +150,24 @@ hiding new and different behavior in existing code.
           function foo() external mod() returns (uint ret)
           {
               if (active)
-                  ret = 1; // Same as ``return 1``
+                  ret = 1; // 与 ``return 1`` 相�
           }
       }
 
-  The function ``C.foo()`` returns the following values:
+  函数 ``C.foo()`` 返回以下值：
 
-  - Old code generator: ``1`` as the return variable is initialized to ``0`` only once before the first ``_;``
-    evaluation and then overwritten by the ``return 1;``. It is not initialized again for the second ``_;``
-    evaluation and ``foo()`` does not explicitly assign it either (due to ``active == false``), thus it keeps
-    its first value.
-  - New code generator: ``0`` as all parameters, including return parameters, will be re-initialized before
-    each ``_;`` evaluation.
+  - 旧的代�生�器： ``1`` 作为返回��在第一次 ``_;`` 使用��被�始化为 ``0``，
+    然�被 ``return 1;`` 覆盖。在第二次 ``_;`` 使用时，它没有被�次�始化，
+    而且 ``foo()`` 也没有明确地分�给它（由于 ``active == false``），因此它��了它的第一个值。
+  - 新的代�生�器： ``0`` 作为所有�数，包括返回�数，将在�次 ``_;`` 使用�被�新�始化。
 
   .. index:: ! evaluation order; expression
 
-- For the old code generator, the evaluation order of expressions is unspecified.
-  For the new code generator, we try to evaluate in source order (left to right), but do not guarantee it.
-  This can lead to semantic differences.
+- 对于旧的代�生�器，表达�的评估顺�是没有规定的。
+  对于新的代�生�器，我们试图按照�顺�（从左到�）进行评估，但并���这一点。
+  这�能会导致语义上的差异。
 
-  For example:
+  例如：
 
   .. code-block:: solidity
 
@@ -174,16 +179,15 @@ hiding new and different behavior in existing code.
           }
       }
 
-  The function ``preincr_u8(1)`` returns the following values:
+  函数 ``preincr_u8(1)`` 返回以下值：
 
-  - Old code generator: ``3`` (``1 + 2``) but the return value is unspecified in general
-  - New code generator: ``4`` (``2 + 2``) but the return value is not guaranteed
+  - 旧的代�生�器： ``3`` ( ``1 + 2`` )，但一般情况下返回值是�指定的
+  - 新的代�生�器： ``4`` ( ``2 + 2`` )，但�能��返回值
 
   .. index:: ! evaluation order; function arguments
 
-  On the other hand, function argument expressions are evaluated in the same order
-  by both code generators with the exception of the global functions ``addmod`` and ``mulmod``.
-  For example:
+  �一方�，除了全局函数 ``addmod`` 和 ``mulmod`` 外，两个代�生�器对函数�数表达�的评估顺�是一样的。
+  例如：
 
   .. code-block:: solidity
 
@@ -198,14 +202,13 @@ hiding new and different behavior in existing code.
           }
       }
 
-  The function ``g(1, 2)`` returns the following values:
+  函数 ``g(1, 2)`` 返回以下值：
 
-  - Old code generator: ``10`` (``add(2 + 3, 2 + 3)``) but the return value is unspecified in general
-  - New code generator: ``10`` but the return value is not guaranteed
+  - 旧的代�生�器： ``10`` ( ``add(2+3, 2+3)`` )，但返回值一般�指定。
+  - 新的代�生�器： ``10``，但�能��返回值
 
-  The arguments to the global functions ``addmod`` and ``mulmod`` are evaluated right-to-left by the old code generator
-  and left-to-right by the new code generator.
-  For example:
+  全局函数 ``addmod`` 和 ``mulmod`` 的�数由旧代�生�器从��左评估，新代�生�器从左��评估。
+  例如：
 
   .. code-block:: solidity
 
@@ -214,24 +217,23 @@ hiding new and different behavior in existing code.
       contract C {
           function f() public pure returns (uint256 aMod, uint256 mMod) {
               uint256 x = 3;
-              // Old code gen: add/mulmod(5, 4, 3)
-              // New code gen: add/mulmod(4, 5, 5)
+              // 旧的代�生�器： add/mulmod(5, 4, 3)
+              // 新的代�生�器： add/mulmod(4, 5, 5)
               aMod = addmod(++x, ++x, x);
               mMod = mulmod(++x, ++x, x);
           }
       }
 
-  The function ``f()`` returns the following values:
+  函数 ``f()`` 返回以下值：
 
-  - Old code generator: ``aMod = 0`` and ``mMod = 2``
-  - New code generator: ``aMod = 4`` and ``mMod = 0``
+  - 旧的代�生�器： ``aMod = 0`` 和 ``mMod = 2``
+  - 新的代�生�器： ``aMod = 4`` 和 ``mMod = 0``
 
-- The new code generator imposes a hard limit of ``type(uint64).max``
-  (``0xffffffffffffffff``) for the free memory pointer. Allocations that would
-  increase its value beyond this limit revert. The old code generator does not
-  have this limit.
+- 新的代�生�器对自由内存指针施加了一个硬性�制 ``type(uint64).max``
+  （ ``0xffffffffffffffff``）。其增加值超过这个�制的分�会被��。
+  旧的代�生�器没有这个�制。
 
-  For example:
+  例如：
 
   .. code-block:: solidity
       :force:
@@ -241,51 +243,51 @@ hiding new and different behavior in existing code.
       contract C {
           function f() public {
               uint[] memory arr;
-              // allocation size: 576460752303423481
-              // assumes freeMemPtr points to 0x80 initially
+              // 分�空间： 576460752303423481
+              // �设freeMemPtr最�指�0x80
               uint solYulMaxAllocationBeforeMemPtrOverflow = (type(uint64).max - 0x80 - 31) / 32;
-              // freeMemPtr overflows UINT64_MAX
+              // freeMemPtr 因 UINT64_MAX �制溢出
               arr = new uint[](solYulMaxAllocationBeforeMemPtrOverflow);
           }
       }
 
-  The function ``f()`` behaves as follows:
+  函数 ``f()`` 的作用如下：
 
-  - Old code generator: runs out of gas while zeroing the array contents after the large memory allocation
-  - New code generator: reverts due to free memory pointer overflow (does not run out of gas)
+  - 旧的代�生�器：在大内存分��对数组内容进行清零时耗尽了gas
+  - 新的代�生�器：由于自由内存指针溢出而还原（�会耗尽gas）。
 
 
-Internals
+内部结构
 =========
 
-Internal function pointers
+内部函数指针
 --------------------------
 
 .. index:: function pointers
 
-The old code generator uses code offsets or tags for values of internal function pointers. This is especially complicated since
-these offsets are different at construction time and after deployment and the values can cross this border via storage.
-Because of that, both offsets are encoded at construction time into the same value (into different bytes).
+旧的代�生�器对内部函数指针的值使用代��移�或标签。
+这一点特别��，因为这些�移�在构造时和部署�是��的，而且这些值�以通过存储跨越这个边界。
+正因为如此，这两个�移�在构造时被编�为�一个值（进入��的字节）。
 
-In the new code generator, function pointers use internal IDs that are allocated in sequence. Since calls via jumps are not possible,
-calls through function pointers always have to use an internal dispatch function that uses the ``switch`` statement to select
-the right function.
+在新的代�生�器中，函数指针使用�次分�的内部ID。
+由于通过跳转的调用是��能的，通过函数指针的调用总是�使用内部调度函数，
+使用 ``switch`` 语��选择正确的函数。
 
-The ID ``0`` is reserved for uninitialized function pointers which then cause a panic in the dispatch function when called.
+ID ``0`` 是为未�始化的函数指针�留的，这些指针在被调用时，会引起调度函数的panic错误。
 
-In the old code generator, internal function pointers are initialized with a special function that always causes a panic.
-This causes a storage write at construction time for internal function pointers in storage.
+在旧的代�生�器中，内部函数指针是用一个特殊的函数�始化的，它总是引起panic错误。
+这导致在构造时对存储中的内部函数指针进行存储写入。
 
-Cleanup
+清�
 -------
 
 .. index:: cleanup, dirty bits
 
-The old code generator only performs cleanup before an operation whose result could be affected by the values of the dirty bits.
-The new code generator performs cleanup after any operation that can result in dirty bits.
-The hope is that the optimizer will be powerful enough to eliminate redundant cleanup operations.
+旧的代�生�器�在�作�执行清�，而�作的结果�能会�到��值的影�。
+新的代�生�器在任何�能导致��的�作之�执行清�。
+我们希望优化器能够强大到足以消除多余的清��作。
 
-For example:
+例如：
 
 .. code-block:: solidity
     :force:
@@ -303,11 +305,11 @@ For example:
         }
     }
 
-The function ``f(1)`` returns the following values:
+函数 ``f(1)`` 返回以下值：
 
-- Old code generator: (``fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe``, ``00000000000000000000000000000000000000000000000000000000000000fe``)
-- New code generator: (``00000000000000000000000000000000000000000000000000000000000000fe``, ``00000000000000000000000000000000000000000000000000000000000000fe``)
+- 旧的代�生�器：（ ``fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe``, ``00000000000000000000000000000000000000000000000000000000000000fe``）
+- 新的代�生�器：（ ``00000000000000000000000000000000000000000000000000000000000000fe``, ``00000000000000000000000000000000000000000000000000000000000000fe``）
 
-Note that, unlike the new code generator, the old code generator does not perform a cleanup after the bit-not assignment (``a = ~a``).
-This results in different values being assigned (within the inline assembly block) to return value ``r1`` between the old and new code generators.
-However, both code generators perform a cleanup before the new value of ``a`` is assigned to ``r2``.
+请注�，与新的代�生�器��，旧的代�生�器在���赋值（ ``a = ~a`` ）�没有进行清�。
+这导致新旧代�生�器之间对返回值 ``r1`` 的赋值（在内�汇编�内）��。
+然而，两个代�生�器在 ``a`` 的新值被分�到 ``r2`` 之�都进行了清�。
diff --git a/docs/language-influences.rst b/docs/language-influences.rst
index e4f0ab69023b..9e6bf59b29ac 100644
--- a/docs/language-influences.rst
+++ b/docs/language-influences.rst
@@ -1,25 +1,20 @@
 ###################
-Language Influences
+语言的影�因素
 ###################
 
-Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_
-that has been influenced and inspired by several well-known programming languages.
+Solidity是一� `花括�语言 <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_，
+�到几�著�编程语言的影�和��。
 
-Solidity is most profoundly influenced by C++, but also borrowed concepts from languages like
-Python, JavaScript, and others.
+Solidity�C++的影�最深，但也借用了Python，JavaScript等语言的概念。
 
-The influence from C++ can be seen in the syntax for variable declarations, for loops, the concept
-of overloading functions, implicit and explicit type conversions and many other details.
+从��声明的语法，for循环，�载函数的概念，��和显�类型转�以�许多其他细节中�以看出C++的影�。
 
-In the early days of the language, Solidity used to be partly influenced by JavaScript.
-This was due to function-level scoping of variables and the use of the keyword ``var``.
-The JavaScript influence was reduced starting from version 0.4.0.
-Now, the main remaining similarity to JavaScript is that functions are defined using the keyword
-``function``. Solidity also supports import syntax and semantics that
-are similar to those available in JavaScript. Besides those points, Solidity looks like
-most other curly-bracket languages and has no major JavaScript influence anymore.
+这是由于��的函数级范围和关键字 ``var`` 的使用。
+从0.4.0版本开始，JavaScript的影�已��少。
+现在，剩下的与JavaScript的主�相似之处是，使用关键字 ``function`` �定义函数。
+Solidity还支�导入语法和语义，这些都与JavaScript中的相似。
+除了这些点，Solidity看起�和其他大多数花括�语言一样，��有主�的JavaScript影�。
 
-Another influence to Solidity was Python. Solidity's modifiers were added trying to model
-Python's decorators with a much more restricted functionality. Furthermore, multiple inheritance, C3 linearization,
-and the ``super`` keyword are taken from Python as well as the general assignment and copy semantics of value
-and reference types.
+对Solidity的�一个影�是Python。
+Solidity的修改器是为了模拟Python的装饰器而添加的，但其功能�到很大�制。
+此外，多�继承，C3线性化和 ``super`` 关键字以�值和引用类型的一般赋值和�制语义都�自Python。
diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index 600f2ed0f453..b094b78eb154 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -1,223 +1,215 @@
-********************************
-Layout of a Solidity Source File
-********************************
+**********************
+Solidity �文件结构
+**********************
 
-Source files can contain an arbitrary number of
-:ref:`contract definitions<contract_structure>`, import_ ,
-:ref:`pragma<pragma>` and :ref:`using for<using-for>` directives and
-:ref:`struct<structs>`, :ref:`enum<enums>`, :ref:`function<functions>`, :ref:`error<errors>`
-and :ref:`constant variable<constants>` definitions.
+�文件�以包�任�数�的
+:ref:`contract 定义<contract_structure>`, import_ 指令,
+:ref:`pragma <pragma>` 指令和 :ref:`using for<using-for>` 指令
+和 :ref:`struct<structs>`, :ref:`enum<enums>`, :ref:`function<functions>`, :ref:`error<errors>`
+以� :ref:`constant ��<constants>` 的定义。
 
 .. index:: ! license, spdx
 
-SPDX License Identifier
+SPDX 许�标识符
 =======================
 
-Trust in smart contracts can be better established if their source code
-is available. Since making source code available always touches on legal problems
-with regards to copyright, the Solidity compiler encourages the use
-of machine-readable `SPDX license identifiers <https://spdx.org>`_.
-Every source file should start with a comment indicating its license:
+如果智能�约的�代�是公开的，就�以更好地建立对智能�约的信任。
+由于�供�代�总是涉�到版�方�的法律问题，
+Solidity 编译器鼓励使用机器�读的 `SPDX 许�标识符 <https://spdx.org>`_ 。
+�个�文件都应该以一个注释开始，表明其许��
 
 ``// SPDX-License-Identifier: MIT``
 
-The compiler does not validate that the license is part of the
-`list allowed by SPDX <https://spdx.org/licenses/>`_, but
-it does include the supplied string in the :ref:`bytecode metadata <metadata>`.
+编译器�会验�许��是�属于 `SPDX许�的列表 <https://spdx.org/licenses/>`_，
+但它确实包括在 :ref:`字节�元数�（bytecode metadata） <metadata>` �供的字符串中。
 
-If you do not want to specify a license or if the source code is
-not open-source, please use the special value ``UNLICENSED``.
-Note that ``UNLICENSED`` (no usage allowed, not present in SPDX license list)
-is different from ``UNLICENSE`` (grants all rights to everyone).
-Solidity follows `the npm recommendation <https://docs.npmjs.com/cli/v7/configuring-npm/package-json#license>`_.
+如果您�想指定一个许�，或者�代��是开�的，
+请使用特殊值 ``UNLICENSED``。请注�， ``UNLICENSED`` （��许使用，
+�存在于SPDX许��列表中）与 ``UNLICENSE`` （授予所有人所有�利）��。
+Solidity �循 `npm 的推� <https://docs.npmjs.com/cli/v7/configuring-npm/package-json#license>`_。
 
-Supplying this comment of course does not free you from other
-obligations related to licensing like having to mention
-a specific license header in each source file or the
-original copyright holder.
+�供这个注释并�能使您摆脱与许�有关的其他义务，
+如必须在�个�文件中�到特定的许�头或原始版�人。
 
-The comment is recognized by the compiler anywhere in the file at the
-file level, but it is recommended to put it at the top of the file.
+编译器�以在文件的任何�置识别该注释，
+但建议把它放在文件的顶部。
 
+<<<<<<< HEAD
+关于如何使用 SPDX 许��标识的更多信��以在 `SPDX 网站 <https://spdx.org/ids-how>`_ 中找到。
+=======
 More information about how to use SPDX license identifiers
 can be found at the `SPDX website <https://spdx.dev/learn/handling-license-info/#how>`_.
+>>>>>>> english/develop
 
 
 .. index:: ! pragma
 
 .. _pragma:
 
-Pragmas
-=======
+编译指示
+==========
 
-The ``pragma`` keyword is used to enable certain compiler features
-or checks. A pragma directive is always local to a source file, so
-you have to add the pragma to all your files if you want to enable it
-in your whole project. If you :ref:`import<import>` another file, the pragma
-from that file does *not* automatically apply to the importing file.
+``pragma`` 关键字用于�用�些编译器特性或检查。
+一个 pragma 指令始终是�文件的本地指令，
+所以如果您想在整个项目中使用 pragma 指令，
+您必须在您的所有文件中添加这个指令。
+如果您 :ref:`import<import>` �一个文件，
+该文件的 pragma 指令 *�会* 自动应用于导入文件。
 
 .. index:: ! pragma;version
 
 .. _version_pragma:
 
-Version Pragma
+版本编译指示
 --------------
 
-Source files can (and should) be annotated with a version pragma to reject
-compilation with future compiler versions that might introduce incompatible
-changes. We try to keep these to an absolute minimum and
-introduce them in a way that changes in semantics also require changes
-in the syntax, but this is not always possible. Because of this, it is always
-a good idea to read through the changelog at least for releases that contain
-breaking changes. These releases always have versions of the form
-``0.x.0`` or ``x.0.0``.
+�文件�以（而且应该）用版本 pragma 指令�注释，
+以拒�用未�的编译器版本进行编译，因为这�能会引入�兼容的�化。
+我们力图把这类�更�到尽�能�，
+我们需�以一�当修改语义时必须�步修改语法的方�引入�更，
+当然这有时候也难以�到。正因为如此，
+至少在包��大�化的版本中，通读一下更新日志总是一个好主�。
+这些版本总是有 ``0.x.0`` 或 ``x.0.0`` 形�的版本。
 
-The version pragma is used as follows: ``pragma solidity ^0.5.2;``
+版本编译指示使用如下： ``pragma solidity ^0.5.2;``
 
-A source file with the line above does not compile with a compiler earlier than version 0.5.2,
-and it also does not work on a compiler starting from version 0.6.0 (this
-second condition is added by using ``^``). Because
-there will be no breaking changes until version ``0.6.0``, you can
-be sure that your code compiles the way you intended. The exact version of the
-compiler is not fixed, so that bugfix releases are still possible.
+带有上述代�的�文件在 0.5.2 版本之�的编译器上�能编译，
+在 0.6.0 版本之�的编译器上也�能工作（这第二个�件是通过使用 ``^`` 添加的）。
+因为在 ``0.6.0`` 版本之��会有任何�大的�化，
+所以您�以确信您的代�是按照您的预期编译的。
+上�例�中�固定编译器的具体版本�，因此编译器的补�版也�以使用。
 
-It is possible to specify more complex rules for the compiler version,
-these follow the same syntax used by `npm <https://docs.npmjs.com/cli/v6/using-npm/semver>`_.
+�以为编译器版本指定更��的规则，
+这些规则与 `npm <https://docs.npmjs.com/cli/v6/using-npm/semver>`_ 使用相�的语法。
 
 .. note::
-  Using the version pragma *does not* change the version of the compiler.
-  It also *does not* enable or disable features of the compiler. It just
-  instructs the compiler to check whether its version matches the one
-  required by the pragma. If it does not match, the compiler issues
-  an error.
+  使用版本 pragma 指令 *�会* 改�编译器的版本。
+  它也 *�会* �用或�用编译器的功能。
+  它�是指示编译器检查它的版本是�与编译指示所�求的版本一致。
+  如果�匹�，编译器会�出一个错误。
 
 .. index:: ! ABI coder, ! pragma; abicoder, pragma; ABIEncoderV2
 .. _abi_coder:
 
-ABI Coder Pragma
+ABI编�编译指示
 ----------------
 
-By using ``pragma abicoder v1`` or ``pragma abicoder v2`` you can
-select between the two implementations of the ABI encoder and decoder.
+通过使用 ``pragma abicoder v1`` 或 ``pragma abicoder v2`` ，
+您�以选择ABI编�器和解�器的两�实现。
 
-The new ABI coder (v2) is able to encode and decode arbitrarily nested
-arrays and structs. Apart from supporting more types, it involves more extensive
-validation and safety checks, which may result in higher gas costs, but also heightened
-security. It is considered
-non-experimental as of Solidity 0.6.0 and it is enabled by default starting
-with Solidity 0.8.0. The old ABI coder can still be selected using ``pragma abicoder v1;``.
+新的 ABI 编�器（v2）能够对任�嵌套的数组和结构进行编�和解�。
+除了支�更多的类型外，它还涉�更广泛的验�和安全检查，
+这�能导致更高的气体�本，但也�高了安全性。
+从 Solidity 0.6.0 开始，它被认为是�实验性的，
+并且从 Solidity 0.8.0 开始，它被默认�用。
+旧的 ABI 编�器�然�以使用 ``pragma abicoder v1;`` �选择。
 
-The set of types supported by the new encoder is a strict superset of
-the ones supported by the old one. Contracts that use it can interact with ones
-that do not without limitations. The reverse is possible only as long as the
-non-``abicoder v2`` contract does not try to make calls that would require
-decoding types only supported by the new encoder. The compiler can detect this
-and will issue an error. Simply enabling ``abicoder v2`` for your contract is
-enough to make the error go away.
+新编�器所支�的类型集是旧编�器所支�的类型的一个严格超集。
+使用新编�器的�约�以与�使用新编�器的�约进行交互，没有任何�制。
+�有当� ``abicoder v2`` 的�约�试图进行需�解�新编�器支�的类型的调用时，
+�有�能出现相�的情况。
+编译器�以检测到这一点，并会�出一个错误。
+��为您的���用 ``abicoder v2`` ，就足以使错误消失。
 
 .. note::
-  This pragma applies to all the code defined in the file where it is activated,
-  regardless of where that code ends up eventually. This means that a contract
-  whose source file is selected to compile with ABI coder v1
-  can still contain code that uses the new encoder
-  by inheriting it from another contract. This is allowed if the new types are only
-  used internally and not in external function signatures.
+  这个编译指示适用于激活它的文件中定义的所有代�，
+  无论这些代�最终在哪里结�。这�味�，
+  一个�约的�文件被选择用 ABI 编�器v1编译，
+  它�然�以包�通过从�一个�约继承�使用新编�器的代�。
+  如果新类型�在内部使用，而�是在外部函数签�中使用，
+  这是被�许的。
 
 .. note::
-  Up to Solidity 0.7.4, it was possible to select the ABI coder v2
-  by using ``pragma experimental ABIEncoderV2``, but it was not possible
-  to explicitly select coder v1 because it was the default.
+  到 Solidity 0.7.4 为止，�以通过使用 ``pragma experimental ABIEncoderV2``
+  �选择 ABI 编�器v2，但��能明确选择编�器v1，因为它是默认的。
 
 .. index:: ! pragma; experimental
 .. _experimental_pragma:
 
-Experimental Pragma
+实验性编译指示
 -------------------
 
-The second pragma is the experimental pragma. It can be used to enable
-features of the compiler or language that are not yet enabled by default.
-The following experimental pragmas are currently supported:
+第二个编译指示是实验性的编译指示。
+它�以用��用编译器或语言中尚未默认�用的功能。
+目�支�以下实验性编译指示：
 
 .. index:: ! pragma; ABIEncoderV2
 
-ABIEncoderV2
-~~~~~~~~~~~~
+ABI 编�器 V2
+~~~~~~~~~~~~~
 
-Because the ABI coder v2 is not considered experimental anymore,
-it can be selected via ``pragma abicoder v2`` (please see above)
-since Solidity 0.7.4.
+因为 ABI 编�器v2��被认为是实验性的，
+它�以通过 ``pragma abicoder v2`` （请�上文）从 Solidity 0.7.4 开始选择。
 
 .. index:: ! pragma; SMTChecker
 .. _smt_checker:
 
-SMTChecker
+SMT检查器
 ~~~~~~~~~~
 
-This component has to be enabled when the Solidity compiler is built
-and therefore it is not available in all Solidity binaries.
-The :ref:`build instructions<smt_solvers_build>` explain how to activate this option.
-It is activated for the Ubuntu PPA releases in most versions,
-but not for the Docker images, Windows binaries or the
-statically-built Linux binaries. It can be activated for solc-js via the
-`smtCallback <https://github.com/ethereum/solc-js#example-usage-with-smtsolver-callback>`_ if you have an SMT solver
-installed locally and run solc-js via node (not via the browser).
-
-If you use ``pragma experimental SMTChecker;``, then you get additional
-:ref:`safety warnings<formal_verification>` which are obtained by querying an
-SMT solver.
-The component does not yet support all features of the Solidity language and
-likely outputs many warnings. In case it reports unsupported features, the
-analysis may not be fully sound.
+这个组件必须在构建 Solidity 编译器时被�用，
+因此它�是在所有 Solidity 二进制文件中都�用。
+:ref:`构建说明<smt_solvers_build>` 解释了如何激活这个选项。
+它在大多数版本中为 Ubuntu PPA 版本激活，
+但�用于 Docker 镜��Windows 二进制文件或��构建的 Linux 二进制文件。
+如果您在本地安装了SMT检查器并通过节点（而�是通过�览器）�行 solc-js，
+�以通过 `smtCallback <https://github.com/ethereum/solc-js#example-usage with-smtsolver-callback>`_
+为 solc-js 激活它。
+
+如果您使用 ``pragma experimental SMTChecker;``，
+那么您会得到�外的 :ref:`安全警告<formal_verification>`。
+这些警告是通过查询SMT求解器获得的。
+该组件还�支� Solidity 语言的所有功能，�能会输出许多警告。
+如果它报告�支�的功能，那么分��能�完全正确。
 
 .. index:: source file, ! import, module, source unit
 
 .. _import:
 
-Importing other Source Files
-============================
+导入其他�文件
+==============
 
-Syntax and Semantics
---------------------
+语法与语义
+----------
 
-Solidity supports import statements to help modularise your code that
-are similar to those available in JavaScript
-(from ES6 on). However, Solidity does not support the concept of
-a `default export <https://developer.mozilla.org/en-US/docs/web/javascript/reference/statements/export#description>`_.
+Solidity 支�导入语�，以帮助模�化您的代�，
+这些语�与 JavaScript 中�用的语�相似(从ES6开始)。
+然而，Solidity 并�支� `默认导出 <https://developer.mozilla.org/en-US/docs/web/javascript/reference/statements/export#description>`_
+的概念。
 
-At a global level, you can use import statements of the following form:
+在全局层�，您�以使用以下形�的导入语�：
 
 .. code-block:: solidity
 
     import "filename";
 
-The ``filename`` part is called an *import path*.
-This statement imports all global symbols from "filename" (and symbols imported there) into the
-current global scope (different than in ES6 but backwards-compatible for Solidity).
-This form is not recommended for use, because it unpredictably pollutes the namespace.
-If you add new top-level items inside "filename", they automatically
-appear in all files that import like this from "filename". It is better to import specific
-symbols explicitly.
+``filename`` 部分被称为 *导入路径*。
+该语�将所有�自 “filename� 的全局符�（以�在那里导入的符�）
+导入到当�的全局范围（与ES6中��，但对Solidity�说是��兼容的）。
+这�形��建议使用，因为它��预测地污染了命�空间。
+如果您在 “filename� 里�添加新的顶层项目，
+它们会自动出现在所有�这样从 “filename� 导入的文件中。
+最好是明确地导入特定的符�。
 
-The following example creates a new global symbol ``symbolName`` whose members are all
-the global symbols from ``"filename"``:
+下�的例�创建了一个新的全局符� ``symbolName``，其�员��自 ``"filename"`` 中全局符�；
 
 .. code-block:: solidity
 
     import * as symbolName from "filename";
 
-which results in all global symbols being available in the format ``symbolName.symbol``.
+这�味�所有全局符�以 ``symbolName.symbol`` 的格��供。
 
-A variant of this syntax that is not part of ES6, but possibly useful is:
+�一�语法�属于 ES6，但�能是有用的：
 
 .. code-block:: solidity
 
   import "filename" as symbolName;
 
-which is equivalent to ``import * as symbolName from "filename";``.
+这�语�等�于 ``import * as symbolName from "filename";``。
 
-If there is a naming collision, you can rename symbols while importing. For example,
-the code below creates new global symbols ``alias`` and ``symbol2`` which reference
-``symbol1`` and ``symbol2`` from inside ``"filename"``, respectively.
+如果有命�冲�，您�以在导入的�时�命�符�。
+例如，下�的代�创建了新的全局符� ``alias`` 和 ``symbol2``，
+它们分别从 ``"filename"`` 里�引用 ``symbol1`` 和 ``symbol2``。
 
 .. code-block:: solidity
 
@@ -225,56 +217,50 @@ the code below creates new global symbols ``alias`` and ``symbol2`` which refere
 
 .. index:: virtual filesystem, source unit name, import; path, filesystem path, import callback, Remix IDE
 
-Import Paths
-------------
-
-In order to be able to support reproducible builds on all platforms, the Solidity compiler has to
-abstract away the details of the filesystem where source files are stored.
-For this reason import paths do not refer directly to files in the host filesystem.
-Instead the compiler maintains an internal database (*virtual filesystem* or *VFS* for short) where
-each source unit is assigned a unique *source unit name* which is an opaque and unstructured identifier.
-The import path specified in an import statement is translated into a source unit name and used to
-find the corresponding source unit in this database.
-
-Using the :ref:`Standard JSON <compiler-api>` API it is possible to directly provide the names and
-content of all the source files as a part of the compiler input.
-In this case source unit names are truly arbitrary.
-If, however, you want the compiler to automatically find and load source code into the VFS, your
-source unit names need to be structured in a way that makes it possible for an :ref:`import callback
-<import-callback>` to locate them.
-When using the command-line compiler the default import callback supports only loading source code
-from the host filesystem, which means that your source unit names must be paths.
-Some environments provide custom callbacks that are more versatile.
-For example the `Remix IDE <https://remix.ethereum.org/>`_ provides one that
-lets you `import files from HTTP, IPFS and Swarm URLs or refer directly to packages in NPM registry
-<https://remix-ide.readthedocs.io/en/latest/import.html>`_.
-
-For a complete description of the virtual filesystem and the path resolution logic used by the
-compiler see :ref:`Path Resolution <path-resolution>`.
+导入路径
+---------
+
+为了能够在所有平�上支����的构建，
+Solidity 编译器必须抽象出存储�文件的文件系统的细节。
+由于这个原因，导入路径并�直接指�主机文件系统中的文件。
+相�，编译器维护一个内部数�库（ *虚拟文件系统* 或简称 *VFS* ），
+�个��元被分�一个唯一的 *��元�称*，
+这是一个��明的��结构化的标识。
+在导入语�中指定的导入路径被转译���元�称，并用于在这个数�库中找到相应的��元。
+
+使用 :ref:`标准 JSON <compiler-api>` API，
+�以直接�供所有�文件的�称和内容作为编译器输入的一部分。
+在这�情况下，��元的�称确实是任�的。
+然而，如果您想让编译器自动查找并将�代�加载到VFS中，
+您的��元�称需�以一�结构化的方�，使 :ref:`回调引用 <import-callback>` 能够定�它们。
+当使用命令行编译器时，默认的回调引用�支�从主机文件系统加载�代�，
+这�味�您的��元�称必须是路径。一些环境�供了自定义的回调，其用途更广。
+例如， `Remix IDE <https://remix.ethereum.org/>`_ �供了一个�以让您
+`从HTTP�IPFS和Swarm URL导入文件，或者直接引用NPM注册表中的包 <https://remix-ide.readthedocs.io/en/latest/import.html>`_。
+
+关于虚拟文件系统和编译器使用的路径解�逻辑的完整�述，请�� :ref:`路径解� <path-resolution>`。
 
 .. index:: ! comment, natspec
 
-Comments
+注释
 ========
 
-Single-line comments (``//``) and multi-line comments (``/*...*/``) are possible.
+�以使用�行注释（ ``//`` ）和多行注释（ ``/*...*/`` ）
 
 .. code-block:: solidity
 
-    // This is a single-line comment.
+    // 这是一个�行注释。
 
     /*
-    This is a
-    multi-line comment.
+    这是一个
+    多行注释。
     */
 
 .. note::
-  A single-line comment is terminated by any unicode line terminator
-  (LF, VF, FF, CR, NEL, LS or PS) in UTF-8 encoding. The terminator is still part of
-  the source code after the comment, so if it is not an ASCII symbol
-  (these are NEL, LS and PS), it will lead to a parser error.
-
-Additionally, there is another type of comment called a NatSpec comment,
-which is detailed in the :ref:`style guide<style_guide_natspec>`. They are written with a
-triple slash (``///``) or a double asterisk block (``/** ... */``) and
-they should be used directly above function declarations or statements.
+  �行注释由 UTF-8 编�中的任何��行结�符（LF�VF�FF�CR�NEL�LS 或 PS）结�。
+  终结符在注释之��然是�代�的一部分，
+  所以如果它�是一个 ASCII 符�（这些是 NEL�LS 和 PS），将导致解�器错误。
+
+此外，还有一�注释�� NatSpec 注释，在 :ref:`格�指�<style_guide_natspec>` 中详细说明。
+它们用三斜线（ ``///`` ）或�星��（ ``/** ... */`` ）�写，
+它们应该直接用在函数声明或语�的上方。
diff --git a/docs/metadata.rst b/docs/metadata.rst
index ede16a73fd8e..f4a5474d8fcc 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -1,63 +1,59 @@
 .. _metadata:
 
 #################
-Contract Metadata
+�约的元数�
 #################
 
 .. index:: metadata, contract verification
 
-The Solidity compiler automatically generates a JSON file.
-The file contains two kinds of information about the compiled contract:
+Solidity 编译器自动生�一个 JSON 文件。
+该文件包�两�有关已编译�约的信�：
 
-- How to interact with the contract: ABI, and NatSpec documentation.
-- How to reproduce the compilation and verify a deployed contract:
-  compiler version, compiler settings, and source files used.
+- 如何与�约交互：ABI 和 NatSpec 文档。
+- 如何�现编译并验�已部署的�约：
+  编译器版本�编译器设置和使用的�文件。
 
-The compiler appends by default the IPFS hash of the metadata file to the end
-of the runtime bytecode (not necessarily the creation bytecode) of each contract,
-so that, if published, you can retrieve the file in an authenticated way without
-having to resort to a centralized data provider. The other available options are
-the Swarm hash and not appending the metadata hash to the bytecode. These can be
-configured via the :ref:`Standard JSON Interface<compiler-api>`.
+默认情况下，编译器会将元数�文件的 IPFS 哈希值附加到
+�个�约的�行时字节�（�一定是创建字节�）末尾，
+这样，如果�布了该文件，就�以通过验�的方�检索该文件，而无需求助于集中�数��供者。
+其他�用选项包括 Swarm 哈希值和�在字节�中附加元数�哈希值。
+这些选项�通过 :ref:`标准 JSON 接� <compiler-api>` 进行�置。
 
-You have to publish the metadata file to IPFS, Swarm, or another service so
-that others can access it. You create the file by using the ``solc --metadata``
-command together with the ``--output-dir`` parameter. Without the parameter,
-the metadata will be written to standard output.
-The metadata contains IPFS and Swarm references to the source code, so you have to
-upload all source files in addition to the metadata file. For IPFS, the hash contained
-in the CID returned by ``ipfs add`` (not the direct sha2-256 hash of the file)
-shall match with the one contained in the bytecode.
+您必须将元数�文件�布到IPFS，Swarm或其他�务，
+以便其他人�以访问它。您�以通过使用 ``solc --metadata`` 命令
+和 ``--output-dir`` �数�创建该文件。如果没有这个�数，
+元数�将被写到标准输出。
+元数�包� IPFS 和 Swarm 对�代�的引用，
+所以除了元数�文件外，您还必须上传所有的�文件。
+对于IPFS， ``ipfs add`` 返回的 CID 中包�的哈希值（�是文件的直接sha2-256哈希值）
+应与字节�中包�的哈希值相匹�。
 
-The metadata file has the following format. The example below is presented in a
-human-readable way. Properly formatted metadata should use quotes correctly,
-reduce whitespace to a minimum, and sort the keys of all objects in alphabetical order
-to arrive at a canonical formatting. Comments are not permitted and are used here only for
-explanatory purposes.
+元数�文件的格�如下。下�的示例是以人类�读的方�呈现的。
+正确格�化的元数�应正确使用引�，
+尽��少空白，并按字�顺�对所有对象的键值进行排�，以形�规范格�。
+��许使用注释，此处注释仅用于解释目的。
 
 .. code-block:: javascript
 
     {
-      // Required: Details about the compiler, contents are specific
-      // to the language.
+      // 必选：编译器的详情，内容视语言而定。
       "compiler": {
-        // Optional: Hash of the compiler binary which produced this output
+        // �选：生�此输出的编译器二进制文件的哈希值
         "keccak256": "0x123...",
-        // Required for Solidity: Version of the compiler
+        // 对 Solidity �说是必选的：编译器的版本
         "version": "0.8.2+commit.661d1103"
       },
-      // Required: Source code language, basically selects a "sub-version"
-      // of the specification
+      // 必选：�代�的编程语言，一般会选择规范的“�版本�
       "language": "Solidity",
-      // Required: Generated information about the contract.
+      // 必选：�约的生�信�
       "output": {
-        // Required: ABI definition of the contract. See "Contract ABI Specification"
+        // 必选：�约的 ABI 定义，� “�约 ABI 规范�
         "abi": [/* ... */],
-        // Required: NatSpec developer documentation of the contract. See https://docs.soliditylang.org/en/latest/natspec-format.html for details.
+        // 必选：�约的开�者 NatSpec 文档，详� https://docs.soliditylang.org/en/latest/natspec-format.html
         "devdoc": {
-          // Contents of the @author NatSpec field of the contract
+          // �约 @author NatSpec字段的内容
           "author": "John Doe",
-          // Contents of the @dev NatSpec field of the contract
+          // �约中 @dev NatSpec 字段的内容
           "details": "Interface of the ERC20 standard as defined in the EIP. See https://eips.ethereum.org/EIPS/eip-20 for details",
           "errors": {
             "MintToZeroAddress()" : {
@@ -77,31 +73,31 @@ explanatory purposes.
           "kind": "dev",
           "methods": {
             "transfer(address,uint256)": {
-              // Contents of the @dev NatSpec field of the method
+              // 方法的 @dev NatSpec 字段的内容
               "details": "Returns a boolean value indicating whether the operation succeeded. Must be called by the token holder address",
-              // Contents of the @param NatSpec fields of the method
+              // 方法的 @param NatSpec 字段的内容
               "params": {
                 "_value": "The amount tokens to be transferred",
                 "_to": "The receiver address"
               },
-              // Contents of the @return NatSpec field.
+              // @return NatSpec 字段的内容。
               "returns": {
-                // Return var name (here "success") if exists. "_0" as key if return var is unnamed
+                // 如果存在，返回var�称（这里是 “success�）。如果返回的var是未命�的，“_0� 作为键。
                 "success": "a boolean value indicating whether the operation succeeded"
               }
             }
           },
           "stateVariables": {
             "owner": {
-              // Contents of the @dev NatSpec field of the state variable
+              // 状���的 @dev NatSpec 字段的内容
               "details": "Must be set during contract creation. Can then only be changed by the owner"
             }
           },
-          // Contents of the @title NatSpec field of the contract
+          // �约中 @title NatSpec 字段的内容
           "title": "MyERC20: an example ERC20",
-          "version": 1 // NatSpec version
+          "version": 1 // NatSpec 版本
         },
-        // Required: NatSpec user documentation of the contract. See "NatSpec Format"
+        // 必选：�约的用户 NatSpec 文档。请�阅“NatSpec 格��
         "userdoc": {
           "errors": {
             "ApprovalCallerNotOwnerNorApproved()": [
@@ -121,47 +117,56 @@ explanatory purposes.
               "notice": "Transfers `_value` tokens to address `_to`"
             }
           },
-          "version": 1 // NatSpec version
+          "version": 1 // NatSpec 版本
         }
       },
-      // Required: Compiler settings. Reflects the settings in the JSON input during compilation.
-      // Check the documentation of standard JSON input's "settings" field
+      // 必选： 编译器设置。�映编译时 JSON 输入的设置。
+      // 查看标准 JSON 输入的 “setting� 字段文档
       "settings": {
-        // Required for Solidity: File path and the name of the contract or library this
-        // metadata is created for.
+        // 对 Solidity �说是必选的： 文件路径以�为其创建的�约或库的�称。
         "compilationTarget": {
           "myDirectory/myFile.sol": "MyContract"
         },
-        // Required for Solidity.
+        // 对 Solidity �说是必选的。
         "evmVersion": "london",
-        // Required for Solidity: Addresses for libraries used.
+        // 对 Solidity �说是必选的： 使用的库�约地�。
         "libraries": {
           "MyLib": "0x123123..."
         },
         "metadata": {
-          // Reflects the setting used in the input json, defaults to "true"
+          // �映输入 json 中使用的设置，默认为“true�
           "appendCBOR": true,
-          // Reflects the setting used in the input json, defaults to "ipfs"
+          // �映输入 json 中使用的设置，默认为“ipfs�
           "bytecodeHash": "ipfs",
-          // Reflects the setting used in the input json, defaults to "false"
+          // �映输入 json 中使用的设置，默认为“false�
           "useLiteralContent": true
         },
+<<<<<<< HEAD
+        // �选：优化设置。“enabled� 和 “runs� 字段已弃用，仅用于��兼容。
+=======
         // Optional: Optimizer settings. The fields "enabled" and "runs" are deprecated
         // and are only given for backward-compatibility.
+>>>>>>> english/develop
         "optimizer": {
           "details": {
             "constantOptimizer": false,
             "cse": false,
             "deduplicate": false,
+<<<<<<< HEAD
+            // inliner 默认为“true�
+            "inliner": true,
+            // jumpdestRemover 默认为“true�
+=======
             // inliner defaults to "false"
             "inliner": false,
             // jumpdestRemover defaults to "true"
+>>>>>>> english/develop
             "jumpdestRemover": true,
             "orderLiterals": false,
-            // peephole defaults to "true"
+            // peephole 默认为“true�
             "peephole": true,
             "yul": true,
-            // Optional: Only present if "yul" is "true"
+            // �选：仅当 “yul� 为 “true� 时�出现
             "yulDetails": {
               "optimizerSteps": "dhfoDgvulfnTUtnIf...",
               "stackAllocation": false
@@ -170,123 +175,126 @@ explanatory purposes.
           "enabled": true,
           "runs": 500
         },
-        // Required for Solidity: Sorted list of import remappings.
+        // 对 Solidity �说是必选的：导入�新映射的排�列表。
         "remappings": [ ":g=/dir" ]
       },
-      // Required: Compilation source files/source units, keys are file paths
+      // 必选：编译�文件/��元，键为文件路径
       "sources": {
+<<<<<<< HEAD
         "destructible": {
-          // Required (unless "url" is used): literal contents of the source file
+          // 必选（除�使用了 “url�）：�文件的字�内容
           "content": "contract destructible is owned { function destroy() { if (msg.sender == owner) selfdestruct(owner); } }",
+          // 必选：�文件的 keccak256 哈希值
+=======
+        "settable": {
+          // Required (unless "url" is used): literal contents of the source file
+          "content": "contract settable is owned { uint256 private x = 0; function set(uint256 _x) public { if (msg.sender == owner) x = _x; } }",
           // Required: keccak256 hash of the source file
+>>>>>>> english/develop
           "keccak256": "0x234..."
         },
         "myDirectory/myFile.sol": {
-          // Required: keccak256 hash of the source file
+          // 必选：�文件的 keccak256 哈希值
           "keccak256": "0x123...",
-          // Optional: SPDX license identifier as given in the source file
+          // �选：�文件中给出的 SPDX 许��标识符
           "license": "MIT",
-          // Required (unless "content" is used, see above): Sorted URL(s)
-          // to the source file, protocol is more or less arbitrary, but an
-          // IPFS URL is recommended
+          // 必选（除�使用了 “content�，�上文）：指��文件的排� URL，
+          // �议�任�选择，但建议使用 IPFS URL
           "urls": [ "bzz-raw://7d7a...", "dweb:/ipfs/QmN..." ]
         }
       },
-      // Required: The version of the metadata format
+      // 必选：元数�格�的版本
       "version": 1
     }
 
 .. warning::
-  Since the bytecode of the resulting contract contains the metadata hash by default, any
-  change to the metadata might result in a change of the bytecode. This includes
-  changes to a filename or path, and since the metadata includes a hash of all the
-  sources used, a single whitespace change results in different metadata, and
-  different bytecode.
+  由于产生的�约的字节�默认包�元数�哈希值，
+  对元数�的任何改�都�能导致字节�的改�。
+  这包括对文件�或路径的改�，而且由于元数�包括所有使用的�的哈希值，
+  一个空白的改�就会导致��的元数�和��的字节�。
 
 .. note::
-    The ABI definition above has no fixed order. It can change with compiler versions.
-    Starting from Solidity version 0.5.12, though, the array maintains a certain
-    order.
+    上�的ABI定义没有固定的顺�。它�以��编译器的版本而改�。
+    �过，从Solidity 0.5.12版本开始，该数组��一定的顺�。
 
 .. _encoding-of-the-metadata-hash-in-the-bytecode:
 
-Encoding of the Metadata Hash in the Bytecode
+在字节�中对元数�哈希值进行编�
 =============================================
 
-The compiler currently by default appends the
-`IPFS hash (in CID v0) <https://docs.ipfs.tech/concepts/content-addressing/#version-0-v0>`_
-of the canonical metadata file and the compiler version to the end of the bytecode.
-Optionally, a Swarm hash instead of the IPFS, or an experimental flag is used.
-Below are all the possible fields:
+编译器目�默认将规范元数�文件的 
+`IPFS 哈希（in CID v0） <https://docs.ipfs.tech/concepts/content-addressing/#version-0-v0>`_ 
+和编译器版本附加到字节�末尾。
+也�选择使用 Swarm 哈希值代替 IPFS，或使用实验标志。
+以下是所有�能的字段：
 
 .. code-block:: javascript
 
     {
       "ipfs": "<metadata hash>",
-      // If "bytecodeHash" was "bzzr1" in compiler settings not "ipfs" but "bzzr1"
+      // 如果编译器设置中的“bytecodeHash�为“bzzr1�，此处�是“ipfs�而是“bzzr1�
       "bzzr1": "<metadata hash>",
-      // Previous versions were using "bzzr0" instead of "bzzr1"
+      // 以�的版本使用“bzzr0�而�是“bzzr1�
       "bzzr0": "<metadata hash>",
-      // If any experimental features that affect code generation are used
+      // 如果使用任何影�代�生�的实验性功能
       "experimental": true,
       "solc": "<compiler version>"
     }
 
-Because we might support other ways to retrieve the
-metadata file in the future, this information is stored
-`CBOR <https://tools.ietf.org/html/rfc7049>`_-encoded. The last two bytes in the bytecode
-indicate the length of the CBOR encoded information. By looking at this length, the
-relevant part of the bytecode can be decoded with a CBOR decoder.
+因为我们将��能会支�以其他方�检索元数�文件，
+因此这些信�被存储为 `CBOR <https://tools.ietf.org/html/rfc7049>`__ - 编�。
+字节�中的最�两个字节表示 CBOR 编�信�的长度。通过查看这个长度，
+�以用 CBOR 解�器对字节�的相关部分进行解�。
 
-Check the `Metadata Playground <https://playground.sourcify.dev/>`_ to see it in action.
+请访问 `Metadata Playground <https://playground.sourcify.dev/>`_ 查看实际�作。
 
+<<<<<<< HEAD
+SOLC的�布版本使用如上所示的3个字节的版本编�
+（主��次�和补�版本��一个字节），
+而预�布版本将使用一个完整的版本字符串，包括�交哈希和构建日期。
+=======
 Whereas release builds of solc use a 3 byte encoding of the version as shown
 above (one byte each for major, minor and patch version number), pre-release builds
 will instead use a complete version string including commit hash and build date.
+>>>>>>> english/develop
 
-The commandline flag ``--no-cbor-metadata`` can be used to skip metadata
-from getting appended at the end of the deployed bytecode. Equivalently, the
-boolean field ``settings.metadata.appendCBOR`` in Standard JSON input can be set to false.
+命令行标志 ``--no-cbor-metadata`` �以用�跳过元数�在部署的字节�末端的附加。
+�样地，标准JSON输入中的布尔字段 ``settings.metadata.appendCBOR`` �以设置为false。
 
 .. note::
-  The CBOR mapping can also contain other keys, so it is better to fully
-  decode the data by looking at the end of the bytecode for the CBOR length,
-  and to use a proper CBOR parser. Do not rely on it starting with ``0xa264``
-  or ``0xa2 0x64 'i' 'p' 'f' 's'``.
+  CBOR 映射也�能包�其他键，
+  因此最好通过查看字节�末尾的 CBOR 长度�完全解�数�，
+  并使用适当的 CBOR 分�器。���赖以 ``0xa264``
+  或 ``0xa2 0x64 'i' 'p' 'f' 's'`` 开头的数�。
 
-Usage for Automatic Interface Generation and NatSpec
+自动化接�生�和NatSpec 的使用方法
 ====================================================
 
-The metadata is used in the following way: A component that wants to interact
-with a contract (e.g. a wallet) retrieves the code of the contract.
-It decodes the CBOR encoded section containing the IPFS/Swarm hash of the
-metadata file. With that hash, the metadata file is retrieved. That file
-is JSON-decoded into a structure like above.
+元数�的使用方�如下：一个想�与�约交互的组件
+（例如钱包）会检索�约的代�。
+它对包�元数�文件的 IPFS/Swarm 哈希的 CBOR 编�部分进行解�。
+通过该哈希值，元数�文件被检索出�。该文件被 JSON 解��一个类似于上述的结构。
 
-The component can then use the ABI to automatically generate a rudimentary
-user interface for the contract.
+然�，该组件�以使用ABI为�约自动生�一个基本的用户界�。
 
-Furthermore, the wallet can use the NatSpec user documentation to display a
-human-readable confirmation message to the user whenever they interact with
-the contract, together with requesting authorization for the transaction signature.
+此外，钱包还�以使用 NatSpec 用户文档，在用户与�约进行交互时，
+�用户显示一��读的确认信�，�时请求交易签�进行授�。
 
-For additional information, read :doc:`Ethereum Natural Language Specification (NatSpec) format <natspec-format>`.
+有关其他信�，请阅读 :doc:`以太�自然语言规范（NatSpec）格� <natspec-format>`。
 
-Usage for Source Code Verification
+�代�验�的用法
 ==================================
 
-If pinned/published, it is possible to retrieve the metadata of the contract from IPFS/Swarm.
-The metadata file also contains the URLs or the IPFS hashes of the source files, as well as
-the compilation settings, i.e. everything needed to reproduce a compilation.
+如果已固定/�布，则�以从 IPFS/Swarm 获��约的元数�。
+元数�文件还包��文件的 URL 或 IPFS 哈希值，以�编译设置，
+��现编译所需的一切信�。
 
-With this information it is then possible to verify the source code of a contract by
-reproducing the compilation, and comparing the bytecode from the compilation with
-the bytecode of the deployed contract.
+有了这些信�，就�以通过�现编译�验��约的�代�，
+并将编译的字节�与已部署�约的字节�进行比较。
 
-This automatically verifies the metadata since its hash is part of the bytecode, as well
-as the source codes, because their hashes are part of the metadata. Any change in the files
-or settings would result in a different metadata hash. The metadata here serves
-as a fingerprint of the whole compilation.
+由于元数�和�代�的哈希值都是字节�的一部分，因此�以自动验�元数�和�代�。
+文件或设置的任何更改都会导致��的元数�哈希值。
+这里的元数�是整个编译过程的指纹。
 
-`Sourcify <https://sourcify.dev>`_ makes use of this feature for "full/perfect verification",
-as well as pinning the files publicly on IPFS to be accessed with the metadata hash.
+`Sourcify <https://sourcify.dev>`_ 利用这一特性进行 “完全/完美验��，
+并将文件公开固定在 IPFS 上，以便使用元数�哈希值进行访问。
diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index 0265fef3e689..4fea39019c37 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -1,84 +1,76 @@
 .. _natspec:
 
 ##############
-NatSpec Format
+风格指�
 ##############
 
-Solidity contracts can use a special form of comments to provide rich
-documentation for functions, return variables and more. This special form is
-named the Ethereum Natural Language Specification Format (NatSpec).
+Solidity�约�以使用一�特殊形�的注释�为函数，返回��等�供丰富的文档。
+这�特殊形�被命�为Ethereum自然语言规范格�（NatSpec）。
 
 .. note::
 
-  NatSpec was inspired by `Doxygen <https://en.wikipedia.org/wiki/Doxygen>`_.
-  While it uses Doxygen-style comments and tags, there is no intention to keep
-  strict compatibility with Doxygen. Please carefully examine the supported tags
-  listed below.
+  NatSpec是� `Doxygen <https://en.wikipedia.org/wiki/Doxygen>`_ 的��。
+  虽然它使用Doxygen风格的注释和标签，但并�打算与Doxygen��严格的兼容性。
+  请仔细检查下�列出的支�的标签。
 
-This documentation is segmented into developer-focused messages and end-user-facing
-messages. These messages may be shown to the end user (the human) at the
-time that they will interact with the contract (i.e. sign a transaction).
+该文件被划分为以开�人员为中心的信�和��最终用户的信�。
+这些信��以在终端用户（人类）与�约交互（�签署交易）时显示给他们。
 
-It is recommended that Solidity contracts are fully annotated using NatSpec for
-all public interfaces (everything in the ABI).
+建议 Solidity �约使用 NatSpec 对所有公共接�（ABI中的一切）进行完全地注释。
 
-NatSpec includes the formatting for comments that the smart contract author will
-use, and which are understood by the Solidity compiler. Also detailed below is
-output of the Solidity compiler, which extracts these comments into a machine-readable
-format.
+NatSpec 包括智能�约作者将使用的注释的格�，
+这些注释�被 Solidity 编译器�解。
+下�还详细介�了 Solidity 编译器的输出，
+它将这些注释��为机器�读的格�。
 
-NatSpec may also include annotations used by third-party tools. These are most likely
-accomplished via the ``@custom:<name>`` tag, and a good use case is analysis and verification
-tools.
+NatSpec 也�以包括第三方工具使用的注释。
+这些最�能是通过 ``@custom:<name>`` 标签完�的，
+一个好的用例是分�和验�工具就是如此。
 
 .. _header-doc-example:
 
-Documentation Example
+文档示例
 =====================
 
-Documentation is inserted above each ``contract``, ``interface``, ``library``,
-``function``, and ``event`` using the Doxygen notation format.
-A ``public`` state variable is equivalent to a ``function``
-for the purposes of NatSpec.
+文档�以通过使用 Doxygen 符�格��嵌入到�个 ``contract``， ``interface``， ``library``，
+``function`` 和 ``event`` 之上。在 NatSpec 中， ``public`` 状���等�于 ``function``。
 
--  For Solidity you may choose ``///`` for single or multi-line
-   comments, or ``/**`` and ending with ``*/``.
+-  对于Solidity，您�以选择 ``///`` 用于�行注释
+   或以 ``/**`` 开始，并以 ``*/`` 结�的符�用于多行注释
 
--  For Vyper, use ``"""`` indented to the inner contents with bare
-   comments. See the `Vyper
-   documentation <https://docs.vyperlang.org/en/latest/natspec.html>`__.
+-  对于Vyper�说，使用 ``""""`` 缩进到内部内容�裸注释（译者注：无标记符�注释）。
+   �� `Vyper 文档 <https://docs.vyperlang.org/en/latest/natspec.html>`__。
 
-The following example shows a contract and a function using all available tags.
+下�的例�显示了一个�约和一个使用所有�用标记的函数。
 
 .. note::
 
-  The Solidity compiler only interprets tags if they are external or
-  public. You are welcome to use similar comments for your internal and
-  private functions, but those will not be parsed.
+  Solidity 编译器�在标签是外部或公共的情况下�进行解�。
+  但也欢迎您为您的内部和�有函数使用类似的注释，�过这些�会被解�。
 
-  This may change in the future.
+  这在未��能会�生�化。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.2 < 0.9.0;
 
-    /// @title A simulator for trees
+    /// @title 树的模拟器
     /// @author Larry A. Gardner
-    /// @notice You can use this contract for only the most basic simulation
-    /// @dev All function calls are currently implemented without side effects
-    /// @custom:experimental This is an experimental contract.
+    /// @notice 您�能将此�约用于最基本的模拟。
+    /// @dev 目�所有的函数调用都是在没有副作用的情况下实现的
+    /// @custom:experimental 这是一个实验性的�约。
     contract Tree {
-        /// @notice Calculate tree age in years, rounded up, for live trees
-        /// @dev The Alexandr N. Tetearing algorithm could increase precision
-        /// @param rings The number of rings from dendrochronological sample
-        /// @return Age in years, rounded up for partial years
+        /// @notice 计算活体树木的树龄，按四�五入计算
+        /// @dev Alexandr N. Tetearing 算法�以�高精确度
+        /// @param rings 树龄学样本的环数
+        /// @return 树龄（�），部分年份四�五入
         function age(uint256 rings) external virtual pure returns (uint256) {
             return rings + 1;
         }
 
-        /// @notice Returns the amount of leaves the tree has.
-        /// @dev Returns only a fixed number.
+        /// @notice 返回该树的��数�。
+        /// @dev 在此�是返回了一个固定的数字。
         function leaves() external virtual pure returns(uint256) {
             return 2;
         }
@@ -95,8 +87,8 @@ The following example shows a contract and a function using all available tags.
             return rings + 2;
         }
 
-        /// Return the amount of leaves that this specific kind of tree has
-        /// @inheritdoc Tree
+        /// 返回这�特定类型的树的��数�。
+        /// @inheritdoc Tree �约
         function leaves() external override(Tree, Plant) pure returns(uint256) {
             return 3;
         }
@@ -104,99 +96,103 @@ The following example shows a contract and a function using all available tags.
 
 .. _header-tags:
 
-Tags
+标签
 ====
 
-All tags are optional. The following table explains the purpose of each
-NatSpec tag and where it may be used. As a special case, if no tags are
-used then the Solidity compiler will interpret a ``///`` or ``/**`` comment
-in the same way as if it were tagged with ``@notice``.
+所有标签都是�选的。下表解释了�个 NatSpec 标签的目的和它�能被使用的地方。
+有一�特殊情况，如果没有使用标签，那么 Solidity 编译器将以�样的方�进行 ``///`` 或 ``/**`` 注释，
+如�它被标记为 ``@notice``。
 
 =============== ====================================================================================== =============================
-Tag                                                                                                    Context
+标签                                                                                                    应用于
 =============== ====================================================================================== =============================
-``@title``      A title that should describe the contract/interface                                    contract, library, interface
-``@author``     The name of the author                                                                 contract, library, interface
-``@notice``     Explain to an end user what this does                                                  contract, library, interface, function, public state variable, event
-``@dev``        Explain to a developer any extra details                                               contract, library, interface, function, state variable, event
+<<<<<<< HEAD
+``@title``      一个应该�述�约/接�的标题                                                                contract, library, interface
+``@author``     作者的�字                                                                              contract, library, interface
+``@notice``     �终端用户解释这个东西的作用                                                               contract, library, interface, function, public state variable, event
+``@dev``        �开�人员解释任何�外的细节                                                               contract, library, interface, function, state variable, event
+``@param``      就�在Doxygen中一样记录一个�数（必须在�数�之�）                                           function, event
+``@return``     记录一个�约的函数的返回��                                                                function, public state variable
+``@inheritdoc`` 从基本函数中�制所有缺失的标签（必须在�约�称之�）                                            function, public state variable
+``@custom:...`` 自定义标签，语义由应用程�定义                                                              everywhere
+=======
+``@title``      A title that should describe the contract/interface                                    contract, library, interface, struct, enum
+``@author``     The name of the author                                                                 contract, library, interface, struct, enum
+``@notice``     Explain to an end user what this does                                                  contract, library, interface, function, public state variable, event, struct, enum
+``@dev``        Explain to a developer any extra details                                               contract, library, interface, function, state variable, event, struct, enum
 ``@param``      Documents a parameter just like in Doxygen (must be followed by parameter name)        function, event
 ``@return``     Documents the return variables of a contract's function                                function, public state variable
 ``@inheritdoc`` Copies all missing tags from the base function (must be followed by the contract name) function, public state variable
 ``@custom:...`` Custom tag, semantics is application-defined                                           everywhere
+>>>>>>> english/develop
 =============== ====================================================================================== =============================
 
-If your function returns multiple values, like ``(int quotient, int remainder)``
-then use multiple ``@return`` statements in the same format as the ``@param`` statements.
+如果您的函数返回多个值，如 ``(int quotient, int remainder)``
+那么使用多个 ``@return`` 语�，格�与 ``@param`` 语�相�。
 
-Custom tags start with ``@custom:`` and must be followed by one or more lowercase letters or hyphens.
-It cannot start with a hyphen however. They can be used everywhere and are part of the developer documentation.
+自定义标签以 ``@custom:`` 开头，��必须有一个或多个�写字�或连字符。
+然而，它�能以连字符开始。它们�以在任何地方使用，是开�者文档的一部分。
 
 .. _header-dynamic:
 
-Dynamic expressions
+动�表达方�
 -------------------
 
-The Solidity compiler will pass through NatSpec documentation from your Solidity
-source code to the JSON output as described in this guide. The consumer of this
-JSON output, for example the end-user client software, may present this to the end-user directly or it may apply some pre-processing.
+Solidity 编译器将通过 NatSpec 文档从您的 Solidity �代�传递到本指�所述的 JSON 输出。
+此 JSON 输出的使用者，例如最终用户的客户端软件，�以直接将其呈现给最终用户，或者它�以应用一些预处�。
 
-For example, some client software will render:
+例如，一些客户端软件会呈现为：
 
 .. code:: Solidity
 
-   /// @notice This function will multiply `a` by 7
+   /// @notice 这个函数将使 `a` 乘以7
 
-to the end-user as:
+对终端用户�说，是：
 
 .. code:: text
 
-    This function will multiply 10 by 7
+    这个函数将10乘以7
 
-if a function is being called and the input ``a`` is assigned a value of 10.
+如果一个函数被调用，并且输入的 ``a`` 被赋值为10。
 
 .. _header-inheritance:
 
-Inheritance Notes
+继承说明
 -----------------
 
-Functions without NatSpec will automatically inherit the documentation of their
-base function. Exceptions to this are:
+没有NatSpec的函数将自动继承其基函数的文档。这方�的例外情况是：
 
-* When the parameter names are different.
-* When there is more than one base function.
-* When there is an explicit ``@inheritdoc`` tag which specifies which contract should be used to inherit.
+* 当�数�称��时。
+* 当有�止一个的基础函数时。
+* 当有一个明确的 ``@inheritdoc`` 标签，指定了应该使用哪个�约�继承。
 
 .. _header-output:
 
-Documentation Output
+文件输出
 ====================
 
-When parsed by the compiler, documentation such as the one from the
-above example will produce two different JSON files. One is meant to be
-consumed by the end user as a notice when a function is executed and the
-other to be used by the developer.
+当被编译器解�时，�上�例�中的文档将产生两个��的JSON文件。
+一个是为了让终端用户在执行函数时作为通知使用，�一个是为了让开�人员使用。
 
-If the above contract is saved as ``ex1.sol`` then you can generate the
-documentation using:
+如果上述�约被�存为 ``ex1.sol``，那么您�以用以下方法生�文档：
 
 .. code-block:: shell
 
    solc --userdoc --devdoc ex1.sol
 
-And the output is below.
+输出如下。
 
 .. note::
-    Starting Solidity version 0.6.11 the NatSpec output also contains a ``version`` and a ``kind`` field.
-    Currently the ``version`` is set to ``1`` and ``kind`` must be one of ``user`` or ``dev``.
-    In the future it is possible that new versions will be introduced, deprecating older ones.
+    从Solidity 0.6.11版开始，NatSpec输出也包�一个 ``version（版本�）`` 和一个 ``kind（�类）`` 字段。
+    目�， ``version`` 被设置为 ``1``， ``kind`` 必须是 ``user（用户）`` 或 ``dev（开�者）`` 之一。
+    在未�，有�能会引入新的版本，淘汰旧的版本。
 
 .. _header-user-doc:
 
-User Documentation
+用户文档
 ------------------
 
-The above documentation will produce the following user documentation
-JSON file as output:
+上述文档将产生以下用户文档 JSON 文件作为输出：
 
 .. code-block:: json
 
@@ -207,24 +203,21 @@ JSON file as output:
       {
         "age(uint256)" :
         {
-          "notice" : "Calculate tree age in years, rounded up, for live trees"
+          "notice" : "计算活体树木的树龄，按四�五入计算"
         }
       },
-      "notice" : "You can use this contract for only the most basic simulation"
+      "notice" : "您�能将此�约用于最基本的模拟。"
     }
 
-Note that the key by which to find the methods is the function's
-canonical signature as defined in the :ref:`Contract
-ABI <abi_function_selector>` and not simply the function's
-name.
+请注�，找到方法的关键是 :ref:`�约 ABI <abi_function_selector>` 中定义的函数的标准签�，
+而�是简�的函数�称。
 
 .. _header-developer-doc:
 
-Developer Documentation
+开�者文档
 -----------------------
 
-Apart from the user documentation file, a developer documentation JSON
-file should also be produced and should look like this:
+除了用户文档文件，还应该产生一个开�者文档的JSON文件，看起�应该是这样的：
 
 .. code-block:: json
 
@@ -232,19 +225,19 @@ file should also be produced and should look like this:
       "version" : 1,
       "kind" : "dev",
       "author" : "Larry A. Gardner",
-      "details" : "All function calls are currently implemented without side effects",
-      "custom:experimental" : "This is an experimental contract.",
+      "details" : "目�所有的函数调用都是在没有副作用的情况下实现的",
+      "custom:experimental" : "这是一个实验性的�约。",
       "methods" :
       {
         "age(uint256)" :
         {
-          "details" : "The Alexandr N. Tetearing algorithm could increase precision",
+          "details" : "Alexandr N. Tetearing 算法�以�高精确度",
           "params" :
           {
-            "rings" : "The number of rings from dendrochronological sample"
+            "rings" : "树龄学样本的环数"
           },
-          "return" : "age in years, rounded up for partial years"
+          "return" : "树龄（�），部分年份四�五入"
         }
       },
-      "title" : "A simulator for trees"
+      "title" : "树的模拟器"
     }
diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index 666d9b8dc9ca..700d170988b5 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -1,91 +1,95 @@
 .. _path-resolution:
 
 **********************
-Import Path Resolution
+导入路径解�
 **********************
 
-In order to be able to support reproducible builds on all platforms, the Solidity compiler has to
-abstract away the details of the filesystem where source files are stored.
-Paths used in imports must work the same way everywhere while the command-line interface must be
-able to work with platform-specific paths to provide good user experience.
-This section aims to explain in detail how Solidity reconciles these requirements.
+为了能够在所有平�上支����的构建，Solidity 编译器必须抽象出存储�文件的文件系统的细节。
+在导入中使用的路径必须在任何地方以�样的方�工作，而命令行界�必须能够与平�特定的路径一起工作，
+以�供良好的用户体验。
+本节旨在详细解释 Solidity 是如何�调这些�求的。
 
 .. index:: ! virtual filesystem, ! VFS, ! source unit name
 .. _virtual-filesystem:
 
-Virtual Filesystem
+虚拟文件系统
 ==================
 
-The compiler maintains an internal database (*virtual filesystem* or *VFS* for short) where each
-source unit is assigned a unique *source unit name* which is an opaque and unstructured identifier.
-When you use the :ref:`import statement <import>`, you specify an *import path* that references a
-source unit name.
+编译器维护一个内部数�库（ *虚拟文件系统* 或简称 *VFS* ），
+�个��元被分�一个唯一的 *��元�称*，这是一个��明的�结构化的标识符。
+当您使用 :ref:`import 语� <import>` 时，
+您指定了引用��元�称的 *导入路径*。
 
 .. index:: ! import callback, ! Host Filesystem Loader, ! --no-import-callback
 .. _import-callback:
 
-Import Callback
+导入回调
 ---------------
 
-The VFS is initially populated only with files the compiler has received as input.
-Additional files can be loaded during compilation using an *import callback*, which is different
-depending on the type of compiler you use (see below).
-If the compiler does not find any source unit name matching the import path in the VFS, it invokes
-the callback, which is responsible for obtaining the source code to be placed under that name.
-An import callback is free to interpret source unit names in an arbitrary way, not just as paths.
-If there is no callback available when one is needed or if it fails to locate the source code,
-compilation fails.
-
+VFS最��填充了编译器收到的输入文件。
+在编译过程中�以使用 *import 回调* 加载其他文件，
+但这�决于您使用的编译器的类型（�下文）。
+如果编译器在VFS中没有找到任何与导入路径相匹�的��元�称，
+它就会调用回调，负责获��放在该�称下的�代�。
+一个导入回调�以自由地以任�方�解释��元�称，而�仅仅是作为路径。
+如果在需�回调时没有�用的回调，或者无法找到�代�，编译就会失败。
+
+<<<<<<< HEAD
+命令行编译器�供了 *主机文件系统加载器* -- 一个基本的回调，
+它将��元�称解释为本地文件系统中的一个路径。
+`JavaScript接� <https://github.com/ethereum/solc-js>`_ 默认��供任何接�，
+但�以由用户�供一个。
+这个机制�以用�从本地文件系统以外的地方获得�代�
+（本地文件系统甚至�能无法访问，例如当编译器在�览器中�行时）。
+例如， `Remix IDE <https://remix.ethereum.org/>`_ �供了一个多功能的回调，
+让您 `从HTTP�IPFS和Swarm URL导入文件，或直接引用NPM注册表中的包 <https://remix-ide.readthedocs.io/en/latest/import.html>`_。
+=======
 By default, the command-line compiler provides the *Host Filesystem Loader* - a rudimentary callback
 that interprets a source unit name as a path in the local filesystem.
 This callback can be disabled using the ``--no-import-callback`` command-line option.
 The `JavaScript interface <https://github.com/ethereum/solc-js>`_ does not provide any by default,
 but one can be provided by the user.
-This mechanism can be used to obtain source code from locations other then the local filesystem
+This mechanism can be used to obtain source code from locations other than the local filesystem
 (which may not even be accessible, e.g. when the compiler is running in a browser).
 For example the `Remix IDE <https://remix.ethereum.org/>`_ provides a versatile callback that
 lets you `import files from HTTP, IPFS and Swarm URLs or refer directly to packages in NPM registry
 <https://remix-ide.readthedocs.io/en/latest/import.html>`_.
+>>>>>>> english/develop
 
 .. note::
 
-    Host Filesystem Loader's file lookup is platform-dependent.
-    For example backslashes in a source unit name can be interpreted as directory separators or not
-    and the lookup can be case-sensitive or not, depending on the underlying platform.
+    主机文件系统加载器的文件查找是�赖于平�的。
+    例如，��元�称中的�斜线�以被解释为目录分隔符，也�以�被解释为目录分隔符，
+    查找时�以区分大�写，这�决于底层平�。
 
-    For portability it is recommended to avoid using import paths that will work correctly only
-    with a specific import callback or only on one platform.
-    For example you should always use forward slashes since they work as path separators also on
-    platforms that support backslashes.
+    为了实现�移�性，我们建议��使用�有在特定的导入回调中�能正常工作的导入路径，
+    或者�在一个平�上使用。
+    例如，您应该总是使用正斜线，因为它们在支��斜线的平�上也能作为路径分隔符使用。
 
-Initial Content of the Virtual Filesystem
+虚拟文件系统的�始内容
 -----------------------------------------
 
-The initial content of the VFS depends on how you invoke the compiler:
+VFS的�始内容�决于您如何调用编译器：
 
-#. **solc / command-line interface**
+#. **solc / 命令行界�**
 
-   When you compile a file using the command-line interface of the compiler, you provide one or
-   more paths to files containing Solidity code:
+   当您使用编译器的命令行界�编译一个文件时，您�供一个或多个包�Solidity代�的文件的路径：
 
    .. code-block:: bash
 
        solc contract.sol /usr/local/dapp-bin/token.sol
 
-   The source unit name of a file loaded this way is constructed by converting its path to a
-   canonical form and, if possible, making it relative to either the base path or one of the
-   include paths.
-   See :ref:`CLI Path Normalization and Stripping <cli-path-normalization-and-stripping>` for
-   a detailed description of this process.
+   以这�方�加载的文件的��元�称是通过将其路径转�为规范的形��构建的，
+   如果�能的�，使其与基本路径或其中一个包�路径相对。
+   �� :ref:`CLI路径规范化和剥离 <cli-path-normalization-and-stripping>` 以了解这一过程的详细�述。
 
    .. index:: standard JSON
 
-#. **Standard JSON**
+#. **标准JSON**
 
-   When using the :ref:`Standard JSON <compiler-api>` API (via either the `JavaScript interface
-   <https://github.com/ethereum/solc-js>`_ or the ``--standard-json`` command-line option)
-   you provide input in JSON format, containing, among other things, the content of all your source
-   files:
+   当使用 :ref:`标准JSON <compiler-api>` API时
+   通过 `JavaScript接� <https://github.com/ethereum/solc-js>`_ 或
+   `--standard-json` 命令行选项），您需�供JSON格�的输入，其中包�您所有�文件的内容。
 
    .. code-block:: json
 
@@ -105,15 +109,13 @@ The initial content of the VFS depends on how you invoke the compiler:
            "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
        }
 
-   The ``sources`` dictionary becomes the initial content of the virtual filesystem and its keys
-   are used as source unit names.
+   上�的 ``sources`` 字典结构�为虚拟文件系统的�始内容，它的键被用作��元�称。
 
    .. _initial-vfs-content-standard-json-with-import-callback:
 
-#. **Standard JSON (via import callback)**
+#. **标准JSON（通过导入回调）**
 
-   With Standard JSON it is also possible to tell the compiler to use the import callback to obtain
-   the source code:
+   通过标准JSON，也�以告诉编译器使用导入回调�获得�代�：
 
    .. code-block:: json
 
@@ -130,40 +132,41 @@ The initial content of the VFS depends on how you invoke the compiler:
            "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
        }
 
-   If an import callback is available, the compiler will give it the strings specified in
-   ``urls`` one by one, until one is loaded successfully or the end of the list is reached.
+   如果导入回调是�用的，编译器将一个一个地给它 ``urls`` 中指定的字符串，直到有一个被�功加载或到达列表的末尾。
 
-   The source unit names are determined the same way as when using ``content`` - they are keys of
-   the ``sources`` dictionary and the content of ``urls`` does not affect them in any way.
+   ��元�称的确定方�与使用 ``content`` 时相� - 它们是 ``sources`` 字典结构的键，
+   ``urls`` 的内容�会以任何方�影�它们。
 
    .. index:: standard input, stdin, <stdin>
 
-#. **Standard input**
+#. **标准输入**
 
+<<<<<<< HEAD
+   在命令行中，也�以通过将�代���到编译器的标准输入��供�代�:
+=======
    On the command-line it is also possible to provide the source by sending it to compiler's
    standard input:
+>>>>>>> english/develop
 
    .. code-block:: bash
 
        echo 'import "./util.sol"; contract C {}' | solc -
 
-   ``-`` used as one of the arguments instructs the compiler to place the content of the standard
-   input in the virtual filesystem under a special source unit name: ``<stdin>``.
+   ``-`` 作为�数之一，指示编译器将标准输入的内容放在虚拟文件系统中的一个特殊的��元�下： ``<stdin>``。
 
-Once the VFS is initialized, additional files can still be added to it only through the import
-callback.
+�始化VFS之�，�然�以�它添加其他文件，但�能通过导入回调的方�。
 
 .. index:: ! import; path
 
-Imports
+导入
 =======
 
-The import statement specifies an *import path*.
-Based on how the import path is specified, we can divide imports into two categories:
+导入语�指定了一个 *导入路径*。
+根�导入路径的指定方�，我们�以将导入分为两类：
 
-- :ref:`Direct imports <direct-imports>`, where you specify the full source unit name directly.
-- :ref:`Relative imports <relative-imports>`, where you specify a path starting with ``./`` or ``../``
-  to be combined with the source unit name of the importing file.
+- :ref:`直接导入 <direct-imports>`，直接指定完整的��元�称。
+- :ref:`相对导入 <relative-imports>`，指定一个以 ``./`` 或 ``../`` 开头的路径，
+  与导入文件的��元�称相结�。
 
 
 .. code-block:: solidity
@@ -172,143 +175,129 @@ Based on how the import path is specified, we can divide imports into two catego
     import "./math/math.sol";
     import "contracts/tokens/token.sol";
 
-In the above ``./math/math.sol`` and ``contracts/tokens/token.sol`` are import paths while the
-source unit names they translate to are ``contracts/math/math.sol`` and ``contracts/tokens/token.sol``
-respectively.
+在上�的 ``./math/math.sol`` 和 ``contracts/tokens/token.sol`` 都是导入路径，
+然而它们转译�的��元�分别是 ``contracts/math/math.sol`` 和 ``contracts/tokens/token.sol``。
 
 .. index:: ! direct import, import; direct
 .. _direct-imports:
 
-Direct Imports
+直接导入
 --------------
 
-An import that does not start with ``./`` or ``../`` is a *direct import*.
+�以 ``./`` 或 ``../`` 开头的导入是 *直接导入*。
 
 .. code-block:: solidity
 
-    import "/project/lib/util.sol";         // source unit name: /project/lib/util.sol
-    import "lib/util.sol";                  // source unit name: lib/util.sol
-    import "@openzeppelin/address.sol";     // source unit name: @openzeppelin/address.sol
-    import "https://example.com/token.sol"; // source unit name: https://example.com/token.sol
+    import "/project/lib/util.sol";         // ��元�称： /project/lib/util.sol
+    import "lib/util.sol";                  // ��元�称： lib/util.sol
+    import "@openzeppelin/address.sol";     // ��元�称： @openzeppelin/address.sol
+    import "https://example.com/token.sol"; // ��元�称： https://example.com/token.sol
 
-After applying any :ref:`import remappings <import-remapping>` the import path simply becomes the
-source unit name.
+在应用任何 :ref:`导入�映射 <import-remapping>` 之�，导入路径简�地�为��元�称。
 
 .. note::
 
-    A source unit name is just an identifier and even if its value happens to look like a path, it
-    is not subject to the normalization rules you would typically expect in a shell.
-    Any ``/./`` or ``/../`` segments or sequences of multiple slashes remain a part of it.
-    When the source is provided via Standard JSON interface it is entirely possible to associate
-    different content with source unit names that would refer to the same file on disk.
+    一个��元的�字�是一个标识符，�使它的值碰巧看起��一个路径，
+    它也��您在shell中通常期望的规范化规则的约�。
+    任何 ``/./`` 或 ``/../`` 的注释段或多个斜线的�列都是它的一部分。
+    当�是通过标准JSON接��供的时候，完全有�能将��的内容与��元的�称�系起�，
+    这些�称将指代�盘上的�一个文件。
 
-When the source is not available in the virtual filesystem, the compiler passes the source unit name
-to the import callback.
-The Host Filesystem Loader will attempt to use it as a path and look up the file on disk.
-At this point the platform-specific normalization rules kick in and names that were considered
-different in the VFS may actually result in the same file being loaded.
-For example ``/project/lib/math.sol`` and ``/project/lib/../lib///math.sol`` are considered
-completely different in the VFS even though they refer to the same file on disk.
+当�文件在虚拟文件系统中��用时，编译器会将��元�称传递给导入回调。
+主机文件系统加载器将�试使用它作为路径并在�盘上查找文件。
+在这一点上，平�特定的规范化规则开始�挥作用，在VFS中被认为是��的�字实际上�能导致�一个文件被加载。
+例如， ``/project/lib/math.sol`` 和 ``/project/lib/../lib///math.sol``
+在VFS中被认为是完全��的，但它们在�盘上指�的是�一个文件。
 
 .. note::
 
-    Even if an import callback ends up loading source code for two different source unit names from
-    the same file on disk, the compiler will still see them as separate source units.
-    It is the source unit name that matters, not the physical location of the code.
+    �使一个导入回调最终从�盘上的�一个文件中加载了两个��的��元�称的�代�，
+    编译器�然会将它们视为独立的��元。
+    ��的是��元�称，而�是代�的物��置。
 
 .. index:: ! relative import, ! import; relative
 .. _relative-imports:
 
-Relative Imports
+相对导入
 ----------------
 
-An import starting with ``./`` or ``../`` is a *relative import*.
-Such imports specify a path relative to the source unit name of the importing source unit:
+以 ``./`` 或 ``./`` 开头的导入是一个 *相对导入*。
+这�导入指定了一个相对于导入��元的��元�称的路径。
 
 .. code-block:: solidity
     :caption: /project/lib/math.sol
 
-    import "./util.sol" as util;    // source unit name: /project/lib/util.sol
-    import "../token.sol" as token; // source unit name: /project/token.sol
+    import "./util.sol" as util;    // ��元�称： /project/lib/util.sol
+    import "../token.sol" as token; // ��元�称： /project/token.sol
 
 .. code-block:: solidity
     :caption: lib/math.sol
 
-    import "./util.sol" as util;    // source unit name: lib/util.sol
-    import "../token.sol" as token; // source unit name: token.sol
+    import "./util.sol" as util;    // ��元�称： lib/util.sol
+    import "../token.sol" as token; // ��元�称： token.sol
 
 .. note::
 
-    Relative imports **always** start with ``./`` or ``../`` so ``import "util.sol"``, unlike
-    ``import "./util.sol"``, is a direct import.
-    While both paths would be considered relative in the host filesystem, ``util.sol`` is actually
-    absolute in the VFS.
+    相对导入 **总是** 以 ``./`` 或 ``./`` 开始，
+    所以与 ``import "./util.sol"`` ��， ``import "util.sol"`` 是一个直接导入。
+    虽然这两个路径在主机文件系统中被认为是相对的，但 ``util.sol`` 在VFS中实际上是�对的。
 
-Let us define a *path segment* as any non-empty part of the path that does not contain a separator
-and is bounded by two path separators.
-A separator is a forward slash or the beginning/end of the string.
-For example in ``./abc/..//`` there are three path segments: ``.``, ``abc`` and ``..``.
+让我们把 *路径段* 定义为路径中�包�分隔符的任何�空部分，并以两个路径分隔符为界。
+分隔符是一个正斜�或字符串的开头/结尾。
+例如，在 ``./abc/...//`` 中，有三个路径段。 ``.``, ``abc`` 和 ``..``。
 
-The compiler resolves the import into a source unit name based on the import path, in the following way:
+编译器根�导入路径将导入解�为一个��元�称，方法如下：
 
-#. We start with the source unit name of the importing source unit.
-#. The last path segment with preceding slashes is removed from the resolved name.
-#. Then, for every segment in the import path, starting from the leftmost one:
+#. 我们从导入��元的��元�称开始。
+#. 最�一个带有斜线的路径段将从解�的�称中删除。
+#. 然�，对于导入路径中的�一段，从最左边的一段开始：
 
-    - If the segment is ``.``, it is skipped.
-    - If the segment is ``..``, the last path segment with preceding slashes is removed from the resolved name.
-    - Otherwise, the segment (preceded by a single slash if the resolved name is not empty), is appended to the resolved name.
+    - 如果该段是 ``.``，则跳过。
+    - 如果该段是 ``..``，最�一个带有斜线的路径段将从解�的�称中删除。
+    - �则，该段（如果解�的�称�是空的，��有一个�斜线）被附加到解�的�称上。
 
-The removal of the last path segment with preceding slashes is understood to
-work as follows:
+删除��有斜线的最�一个路径段，�以�解为工作原�如下：
 
-1. Everything past the last slash is removed (i.e. ``a/b//c.sol`` becomes ``a/b//``).
-2. All trailing slashes are removed (i.e. ``a/b//`` becomes ``a/b``).
+1. 超过最�一个斜线的所有内容都被删除（� ``a/b//c.sol`` �� ``a/b//``）。
+2. 所有的尾部斜线被删除（� ``a/b//`` �� ``a/b``）。
 
-Note that the process normalizes the part of the resolved source unit name that comes from the import path according
-to the usual rules for UNIX paths, i.e. all ``.`` and ``..`` are removed and multiple slashes are
-squashed into a single one.
-On the other hand, the part that comes from the source unit name of the importing module remains unnormalized.
-This ensures that the ``protocol://`` part does not turn into ``protocol:/`` if the importing file
-is identified with a URL.
+请注�，该过程根� UNIX 路径的通常规则对解�的��元�称中�自导入路径的部分进行了规范化处�，
+�所有的 ``.`` 和 ``..`` 被删除，多个斜线被压�一个。
+�一方�，�自导入模�的��元�称的部分�未被规范化。
+这确�了在导入文件被识别为URL时， ``protocol://`` 部分�会�� ``protocol:/``。
 
-If your import paths are already normalized, you can expect the above algorithm to produce very
-intuitive results.
-Here are some examples of what you can expect if they are not:
+如果导入路径已�规范化，则�以期望上述算法产生�常直观的结果。
+下�是一些例�，告诉您如果�是的�会�生什么：
 
 .. code-block:: solidity
     :caption: lib/src/../contract.sol
 
-    import "./util/./util.sol";         // source unit name: lib/src/../util/util.sol
-    import "./util//util.sol";          // source unit name: lib/src/../util/util.sol
-    import "../util/../array/util.sol"; // source unit name: lib/src/array/util.sol
-    import "../.././../util.sol";       // source unit name: util.sol
-    import "../../.././../util.sol";    // source unit name: util.sol
+    import "./util/./util.sol";         // ��元�称： lib/src/../util/util.sol
+    import "./util//util.sol";          // ��元�称： lib/src/../util/util.sol
+    import "../util/../array/util.sol"; // ��元�称： lib/src/array/util.sol
+    import "../.././../util.sol";       // ��元�称： util.sol
+    import "../../.././../util.sol";    // ��元�称： util.sol
 
 .. note::
 
-    The use of relative imports containing leading ``..`` segments is not recommended.
-    The same effect can be achieved in a more reliable way by using direct imports with
-    :ref:`base path and include paths <base-and-include-paths>`.
+    �建议使用使用包��缀 ``..`` 的路径段。
+    通过使用带有 :ref:`基本路径和包�路径 <base-and-include-paths>` 的直接导入，
+    �以以更��的方�实现�样的效果。
 
 .. index:: ! base path, ! --base-path, ! include paths, ! --include-path
 .. _base-and-include-paths:
 
-Base Path and Include Paths
+基本路径和包�路径
 ===========================
 
-The base path and include paths represent directories that the Host Filesystem Loader will load files from.
-When a source unit name is passed to the loader, it prepends the base path to it and performs a
-filesystem lookup.
-If the lookup does not succeed, the same is done with all directories on the include path list.
+基本路径和包�路径表示主机文件系统加载器将加载文件的目录。
+当一个��元的�字被传递给加载器时，它把基本路径加到它的��，并执行一个文件系统查找。
+如果查找��功，也会对包�路径列表中的所有目录进行�样的处�。
 
-It is recommended to set the base path to the root directory of your project and use include paths to
-specify additional locations that may contain libraries your project depends on.
-This lets you import from these libraries in a uniform way, no matter where they are located in the
-filesystem relative to your project.
-For example, if you use npm to install packages and your contract imports
-``@openzeppelin/contracts/utils/Strings.sol``, you can use these options to tell the compiler that
-the library can be found in one of the npm package directories:
+建议将基本路径设置为您项目的根目录，并使用包�路径�指定�能包�您项目所�赖的库的其他�置。
+这�以让您以统一的方�从这些库中导入，无论它们在文件系统中相对于您的项目�于何处。
+例如，如果您使用npm安装包，而您的�约导入了 ``@openzeppelin/contracts/utils/Strings.sol``，
+您�以使用这些选项�告诉编译器，该库�以在npm包目录中找到。
 
 .. code-block:: bash
 
@@ -317,35 +306,38 @@ the library can be found in one of the npm package directories:
         --include-path node_modules/ \
         --include-path /usr/local/lib/node_modules/
 
-Your contract will compile (with the same exact metadata) no matter whether you install the library
-in the local or global package directory or even directly under your project root.
+无论您是把库安装在本地还是全局包目录下，甚至直接安装在您的项目根目录下，
+您的�约都会被编译（具有完全相�的元数�）。
 
-By default the base path is empty, which leaves the source unit name unchanged.
-When the source unit name is a relative path, this results in the file being looked up in the
-directory the compiler has been invoked from.
-It is also the only value that results in absolute paths in source unit names being actually
-interpreted as absolute paths on disk.
-If the base path itself is relative, it is interpreted as relative to the current working directory
-of the compiler.
+默认情况下，基本路径是空的，这使得��元的�称没有�化。
+当��元�称是一个相对路径时，这将导致文件在编译器被调用的目录中被查找。
+这也是唯一能使��元�称中的�对路径被实际解释为�盘上的�对路径的值。
+如果基本路径本身是相对的，则它被解释为相对于编译器的当�工作目录。
 
 .. note::
 
-    Include paths cannot have empty values and must be used together with a non-empty base path.
+    包�路径�能有空值，必须与�空的基本路径一起使用。
 
 .. note::
 
-    Include paths and base path can overlap as long as it does not make import resolution ambiguous.
-    For example, you can specify a directory inside base path as an include directory or have an
-    include directory that is a subdirectory of another include directory.
-    The compiler will only issue an error if the source unit name passed to the Host Filesystem
-    Loader represents an existing path when combined with multiple include paths or an include path
-    and base path.
+    ���使导入解�产生歧义，包�路径和基本路径�以��。
+    例如，您�以在基本路径内指定一个目录作为包�目录，或者有一个包�目录是�一个包�目录的�目录。
+    �有传递给主机文件系统加载器的��元�称在与多个包�路径或包�路径和基本路径结�代表一个现有路径时，
+    编译器�会�出错误。
 
 .. _cli-path-normalization-and-stripping:
 
-CLI Path Normalization and Stripping
+CLI路径规范化和剥离
 ------------------------------------
 
+<<<<<<< HEAD
+在命令行中，编译器的行为就�您对其他程�的期望一样：
+它接�平�的本地格�的路径，相对路径是相对于当�工作目录的。
+然而，分�给在命令行上指定了路径的文件的��元�称，�应该因为项目在��的平�上被编译，
+或者因为编译器碰巧从��的目录被调用而改�。
+为了达到这个目的，�自命令行的�文件的路径必须被转�为规范的形�，
+如果�能的�，应使其与基本路径或包�路径之一相对。
+=======
 On the command-line the compiler behaves just as you would expect from any other program:
 it accepts paths in a format native to the platform and relative paths are relative to the current
 working directory.
@@ -354,51 +346,47 @@ should not change just because the project is being compiled on a different plat
 compiler happens to have been invoked from a different directory.
 To achieve this, paths to source files coming from the command-line must be converted to a canonical
 form, and, if possible, made relative to the base path or one of the include paths.
+>>>>>>> english/develop
 
-The normalization rules are as follows:
+规范化规则如下：
 
-- If a path is relative, it is made absolute by prepending the current working directory to it.
-- Internal ``.`` and ``..`` segments are collapsed.
-- Platform-specific path separators are replaced with forward slashes.
-- Sequences of multiple consecutive path separators are squashed into a single separator (unless
-  they are the leading slashes of an `UNC path <https://en.wikipedia.org/wiki/Path_(computing)#UNC>`_).
-- If the path includes a root name (e.g. a drive letter on Windows) and the root is the same as the
-  root of the current working directory, the root is replaced with ``/``.
-- Symbolic links in the path are **not** resolved.
+- 如果一个路径是相对路径，则通过在其��加上当�工作目录使其�为�对路径。
+- 内部的 ``.`` 和 ``..`` 段被折�起�。
+- 平�特定的路径分隔符被替�为正斜�。
+- 多个连续路径分隔符的�列被压缩�一个分隔符
+  （除�它们是 `UNC路径 <https://en.wikipedia.org/wiki/Path_(computing)#UNC>`_ 的�导斜�）。
+- 如果路径中包�一个根�（例如Windows系统中的一个盘符），并且该根�与当�工作目录的根�相�，
+  则根�将被替�为 ``/``。
+- 路径中的符�链接 **没有** 解�。
 
-  - The only exception is the path to the current working directory prepended to relative paths in
-    the process of making them absolute.
-    On some platforms the working directory is reported always with symbolic links resolved so for
-    consistency the compiler resolves them everywhere.
+  - 唯一的例外是在使相对路径�为�对路径的过程中，对当�工作目录的路径进行了预处�。
+    在一些平�上，工作目录总是用带有符�链接的解��声明，
+    所以为了��一致性，编译器在任何地方都会解�它们。
 
-- The original case of the path is preserved even if the filesystem is case-insensitive but
-  `case-preserving <https://en.wikipedia.org/wiki/Case_preservation>`_ and the actual case on
-  disk is different.
+- �使文件系统对大�写��感，
+  但 `�留大�写 <https://en.wikipedia.org/wiki/Case_preservation>`_
+  和�盘上的实际大�写��，是会�留路径的原始大�写。
 
 .. note::
 
-    There are situations where paths cannot be made platform-independent.
-    For example on Windows the compiler can avoid using drive letters by referring to the root
-    directory of the current drive as ``/`` but drive letters are still necessary for paths leading
-    to other drives.
-    You can avoid such situations by ensuring that all the files are available within a single
-    directory tree on the same drive.
-
-After normalization the compiler attempts to make the source file path relative.
-It tries the base path first and then the include paths in the order they were given.
-If the base path is empty or not specified, it is treated as if it was equal to the path to the
-current working directory (with all symbolic links resolved).
-The result is accepted only if the normalized directory path is the exact prefix of the normalized
-file path.
-Otherwise the file path remains absolute.
-This makes the conversion unambiguous and ensures that the relative path does not start with ``../``.
-The resulting file path becomes the source unit name.
+    有些情况下，路径�能独立于平�。
+    例如，在Windows下，编译器�以通过将当�驱动器的根目录称为 ``/`` ���使用驱动器字�，
+    但对于通往其他驱动器的路径�说，驱动器字��然是必�的。
+    您�以通过确�所有的文件都在�一驱动器上的�一目录树内，���这�情况。
+
+在规范化之�，编译器试图使�文件的路径��相对的。
+它首先�试基本路径，然�按照给出的顺��试包�路径。
+如果基本路径是空的或者没有指定，它将被视为等�于当�工作目录的路径（解决了所有符�链接）。
+�有当规范化的目录路径是规范化的文件路径的确切�缀时，�会接�这个结果。
+�则，文件路径�然是�对的。
+这使得转�毫��糊，并确�相对路径�以 ``.../`` 开头。
+产生的文件路径�为��元�称。
 
 .. note::
 
-    The relative path produced by stripping must remain unique within the base path and include paths.
-    For example the compiler will issue an error for the following command if both
-    ``/project/contract.sol`` and ``/lib/contract.sol`` exist:
+    剥离�产生的相对路径必须在基本路径和包�路径中��唯一。
+    例如，如果 ``/project/contract.sol`` 和  ``/lib/contract.sol`` �时存在，
+    编译器将对以下命令�出错误：
 
     .. code-block:: bash
 
@@ -406,34 +394,45 @@ The resulting file path becomes the source unit name.
 
 .. note::
 
+<<<<<<< HEAD
+    在0.8.8版本之�，CLI路径剥离�被执行，唯一应用的规范化是路径分隔符的转�。
+    当使用旧版本的编译器时，建议从基本路径调用编译器，在命令行上�使用相对路径。
+=======
     Prior to version 0.8.8, CLI path stripping was not performed and the only normalization applied
     was the conversion of path separators.
     When working with older versions of the compiler it is recommended to invoke the compiler from
     the base path and to only use relative paths on the command-line.
+>>>>>>> english/develop
 
 .. index:: ! allowed paths, ! --allow-paths, remapping; target
 .. _allowed-paths:
 
-Allowed Paths
+�许的路径
 =============
 
-As a security measure, the Host Filesystem Loader will refuse to load files from outside of a few
-locations that are considered safe by default:
+作为一项安全措施，主机文件系统加载器将拒�从默认认为安全的几个�置之外的地方加载文件：
 
-- Outside of Standard JSON mode:
+- 标准JSON模�之外：
 
+<<<<<<< HEAD
+  - �有命令行上所列输入文件的目录。
+  - 作为 :ref:`�映射 <import-remapping>` 目标使用的目录。
+    如果目标�是一个目录（��以 ``/``， ``/.`` 或 ``/.`` 结尾），则使用包�该目标的目录。
+  - 基本路径和包�路径。
+=======
   - The directories containing input files listed on the command-line.
   - The directories used as :ref:`remapping <import-remapping>` targets.
     If the target is not a directory (i.e does not end with ``/``, ``/.`` or ``/..``) the directory
     containing the target is used instead.
   - Base path and include paths.
+>>>>>>> english/develop
 
-- In Standard JSON mode:
+- 在标准JSON模�下：
 
-  - Base path and include paths.
+  - 基本路径和包�路径。
 
-Additional directories can be whitelisted using the ``--allow-paths`` option.
-The option accepts a comma-separated list of paths:
+�以使用 ``--allow-paths`` 选项将其他目录列入白��。
+该选项接�一个用逗�分隔的路径列表：
 
 .. code-block:: bash
 
@@ -444,103 +443,98 @@ The option accepts a comma-separated list of paths:
         --include-path=/lib/ \
         --allow-paths=../utils/,/tmp/libraries
 
-When the compiler is invoked with the command shown above, the Host Filesystem Loader will allow
-importing files from the following directories:
+当用上�的命令调用编译器时，主机文件系统加载器将�许从以下目录导入文件：
 
-- ``/home/user/project/token/`` (because ``token/`` contains the input file and also because it is
-  the base path),
-- ``/lib/`` (because ``/lib/`` is one of the include paths),
-- ``/home/user/project/libs/`` (because ``libs/`` is a directory containing a remapping target),
-- ``/home/user/utils/`` (because of ``../utils/`` passed to ``--allow-paths``),
-- ``/tmp/libraries/`` (because of ``/tmp/libraries`` passed to ``--allow-paths``),
+- ``/home/user/project/token/`` （因为 ``token/`` 包�输入文件，也因为它是基本路径），
+- ``/lib/`` （因为 ``/lib/`` 是包�路径之一），
+- ``/home/user/project/libs/`` （因为 ``libs/`` 是一个包��映射目标的目录），
+- ``/home/user/utils/`` （因为 ``.../utils/`` 传给了 ``-allow-paths`` ），
+- ``/tmp/libraries/`` （因为 ``/tmp/libraries`` 被传递到 ``/tmp/libraries``），
 
 .. note::
 
-    The working directory of the compiler is one of the paths allowed by default only if it
-    happens to be the base path (or the base path is not specified or has an empty value).
+    编译器的工作目录是默认�许的路径之一，��是它�好是基本路径时（或者基本路径没有被指定或有一个空值）。
 
 .. note::
 
-    The compiler does not check if allowed paths actually exist and whether they are directories.
-    Non-existent or empty paths are simply ignored.
-    If an allowed path matches a file rather than a directory, the file is considered whitelisted, too.
+    编译器�检查�许的路径是�真实存在以�它们是�是目录。
+    �存在的或空的路径会被简�地忽略掉。
+    如果一个被�许的路径与一个文件而�是一个目录相匹�，该文件也被视为白��。
 
 .. note::
 
-    Allowed paths are case-sensitive even if the filesystem is not.
-    The case must exactly match the one used in your imports.
-    For example ``--allow-paths tokens`` will not match ``import "Tokens/IERC20.sol"``.
+    �许的路径是区分大�写的，�使文件系统�是这样的。
+    大�写必须与您的导入中使用的大�写完全一致。
+    例如 ``--allow-paths tokens`` �会匹� ``import "Tokens/IERC20.sol"``。
 
 .. warning::
 
-    Files and directories only reachable through symbolic links from allowed directories are not
-    automatically whitelisted.
-    For example if ``token/contract.sol`` in the example above was actually a symlink pointing at
-    ``/etc/passwd`` the compiler would refuse to load it unless ``/etc/`` was one of the allowed
-    paths too.
+    �有通过�许的目录的符�链接�能到达的文件和目录�会被自动列入白��。
+    例如，如果上�的例�中的 ``token/contract.sol`` 实际上是一个指�
+    ``/etc/passwd`` 的符�链接，编译器将拒�加载它，除� ``/etc/`` 也是�许的路径之一。
 
 .. index:: ! remapping; import, ! import; remapping, ! remapping; context, ! remapping; prefix, ! remapping; target
 .. _import-remapping:
 
-Import Remapping
+导入�映射
 ================
 
-Import remapping allows you to redirect imports to a different location in the virtual filesystem.
-The mechanism works by changing the translation between import paths and source unit names.
-For example you can set up a remapping so that any import from the virtual directory
-``github.com/ethereum/dapp-bin/library/`` would be seen as an import from ``dapp-bin/library/`` instead.
+导入�映射�许您将导入�定�到虚拟文件系统的���置。
+该机制通过改�导入路径和��元�称之间的转��工作。
+例如，您�以设置一个�映射，使任何从虚拟目录 ``github.com/ethereum/dapp-bin/library/``
+的导入被视为从 ``dapp-bin/library/`` 导入。
 
-You can limit the scope of a remapping by specifying a *context*.
-This allows creating remappings that apply only to imports located in a specific library or a specific file.
-Without a context a remapping is applied to every matching import in all the files in the virtual
-filesystem.
+您�以通过指定 *context* ��制�映射的范围。
+这�许创建仅适用于特定库或特定文件中的导入的�映射。
+如果没有context关键字指定，�映射将应用于虚拟文件系统中所有文件中的�个匹�的导入。
 
-Import remappings have the form of ``context:prefix=target``:
+导入�映射的形�为 ``context:prefix=target``：
 
-- ``context`` must match the beginning of the source unit name of the file containing the import.
-- ``prefix`` must match the beginning of the source unit name resulting from the import.
-- ``target`` is the value the prefix is replaced with.
+- ``context`` 必须与包�导入文件的��元�称的开头相匹�。
+- ``prefix``  必须与导入的��元�称的开头相匹�。
+- ``target`` 是�缀被替�的值。
 
-For example, if you clone https://github.com/ethereum/dapp-bin/ locally to ``/project/dapp-bin``
-and run the compiler with:
+例如，如果您在本地克隆 https://github.com/ethereum/dapp-bin/ 到 ``/project/dapp-bin``，
+并用以下命令�行编译器：
 
 .. code-block:: bash
 
     solc github.com/ethereum/dapp-bin/=dapp-bin/ --base-path /project source.sol
 
-you can use the following in your source file:
+您�以在您的�文件中使用以下内容：
 
 .. code-block:: solidity
 
-    import "github.com/ethereum/dapp-bin/library/math.sol"; // source unit name: dapp-bin/library/math.sol
+    import "github.com/ethereum/dapp-bin/library/math.sol"; // ��元�称： dapp-bin/library/math.sol
 
+<<<<<<< HEAD
+编译器将在VFS的 ``dapp bin/library/math.sol`` 下寻找该文件。
+如果那里没有该文件，��元�称将被传递给主机文件系统加载器，
+然�它将在 ``/project/dapp-bin/library/iterable_mapping.sol`` 中寻找。
+=======
 The compiler will look for the file in the VFS under ``dapp-bin/library/math.sol``.
 If the file is not available there, the source unit name will be passed to the Host Filesystem
 Loader, which will then look in ``/project/dapp-bin/library/math.sol``.
+>>>>>>> english/develop
 
 .. warning::
 
-    Information about remappings is stored in contract metadata.
-    Since the binary produced by the compiler has a hash of the metadata embedded in it, any
-    modification to the remappings will result in different bytecode.
+    关于�映射的信�被存储在�约元数�中。
+    由于编译器产生的二进制文件中嵌入了元数�的哈希值，对�映射的任何修改都会导致��的字节�。
 
-    For this reason you should be careful not to include any local information in remapping targets.
-    For example if your library is located in ``/home/user/packages/mymath/math.sol``, a remapping
-    like ``@math/=/home/user/packages/mymath/`` would result in your home directory being included in
-    the metadata.
-    To be able to reproduce the same bytecode with such a remapping on a different machine, you
-    would need to recreate parts of your local directory structure in the VFS and (if you rely on
-    Host Filesystem Loader) also in the host filesystem.
+    由于这个原因，您应该注���在�映射目标中包�任何本地信�。
+    例如，如果您的库�于 ``/home/user/packages/mymath/math.sol``，
+    � ``@math/=/home/user/packages/mymath/`` 这样的�映射会导致您的主目录被包�在元数�中。
+    为了能够在��的机器上用这样的�映射�现相�的字节�，
+    您需�在VFS和（如果您�赖主机文件系统加载器）主机文件系统中�新创建您的本地目录结构。
 
-    To avoid having your local directory structure embedded in the metadata, it is recommended to
-    designate the directories containing libraries as *include paths* instead.
-    For example, in the example above ``--include-path /home/user/packages/`` would let you use
-    imports starting with ``mymath/``.
-    Unlike remapping, the option on its own will not make ``mymath`` appear as ``@math`` but this
-    can be achieved by creating a symbolic link or renaming the package subdirectory.
+    为了��元数�中嵌入您的本地目录结构，建议将包�库的目录指定为 *include paths*。
+    例如，在上�的例�中， ``--include-path /home/user/packages/`` 会让您使用以 ``mymath/`` 开始的导入。
+    与�映射��，该选项本身�会使 ``mymath`` 显示为 ``@math``，
+    但这�以通过创建符�链接或�命�软件包�目录�实现。
 
-As a more complex example, suppose you rely on a module that uses an old version of dapp-bin that
-you checked out to ``/project/dapp-bin_old``, then you can run:
+作为一个更��的例�，�设您�赖一个使用旧版dapp-bin的模�，
+您把它签出到 ``/project/dapp-bin_old``，那么您�以�行：
 
 .. code-block:: bash
 
@@ -549,112 +543,107 @@ you checked out to ``/project/dapp-bin_old``, then you can run:
          --base-path /project \
          source.sol
 
-This means that all imports in ``module2`` point to the old version but imports in ``module1``
-point to the new version.
+这�味� ``module2`` 的所有导入都指�旧版本，但 ``module1`` 的导入则指�新版本。
 
+<<<<<<< HEAD
+以下是关于�映射行为的详细规则：
+=======
 Here are the detailed rules governing the behavior of remappings:
+>>>>>>> english/develop
 
-#. **Remappings only affect the translation between import paths and source unit names.**
+#. **�新映射�影�导入路径和��元�称之间的转�。**
 
-   Source unit names added to the VFS in any other way cannot be remapped.
-   For example the paths you specify on the command-line and the ones in ``sources.urls`` in
-   Standard JSON are not affected.
+   以任何其他方�添加到VFS的��元�称�能被�新映射。
+   例如，您在命令行上指定的路径和标准JSON中 ``sources.urls`` 中的路径��影�。
 
    .. code-block:: bash
 
-       solc /project/=/contracts/ /project/contract.sol # source unit name: /project/contract.sol
+       solc /project/=/contracts/ /project/contract.sol # ��元�称： /project/contract.sol
 
-   In the example above the compiler will load the source code from ``/project/contract.sol`` and
-   place it under that exact source unit name in the VFS, not under ``/contract/contract.sol``.
+   在上�的例�中，编译器将从 ``/project/contract.sol`` 中加载�代�，
+   并将其放在VFS中那个确切的�代��元�下，而�是放在 ``/contract/contract.sol`` 中。
 
-#. **Context and prefix must match source unit names, not import paths.**
+#. **上下文和�缀必须与��元�称相匹�，而�是导入路径。**
 
-   - This means that you cannot remap ``./`` or ``../`` directly since they are replaced during
-     the translation to source unit name but you can remap the part of the name they are replaced
-     with:
+   - 这�味�您�能直接�新映射 ``./`` 或 ``./``，因为它们在转译���元�称时被替�了，
+     但您�以�新映射它们被替�的那部分�称：
 
      .. code-block:: bash
 
-         solc ./=a/ /project/=b/ /project/contract.sol # source unit name: /project/contract.sol
+         solc ./=a/ /project/=b/ /project/contract.sol # ��元�称： /project/contract.sol
 
      .. code-block:: solidity
          :caption: /project/contract.sol
 
-         import "./util.sol" as util; // source unit name: b/util.sol
+         import "./util.sol" as util; // ��元�称： b/util.sol
 
-   - You cannot remap base path or any other part of the path that is only added internally by an
-     import callback:
+   - 您�能�新映射基本路径或仅由导入回调内部添加的任何其他部分的路径。
 
      .. code-block:: bash
 
-         solc /project/=/contracts/ /project/contract.sol --base-path /project # source unit name: contract.sol
+         solc /project/=/contracts/ /project/contract.sol --base-path /project # ��元�称： contract.sol
 
      .. code-block:: solidity
          :caption: /project/contract.sol
 
-         import "util.sol" as util; // source unit name: util.sol
+         import "util.sol" as util; // ��元�称： util.sol
 
-#. **Target is inserted directly into the source unit name and does not necessarily have to be a valid path.**
+#. **目标直接�入��元�称中，�一定是有效的路径。**
 
-   - It can be anything as long as the import callback can handle it.
-     In case of the Host Filesystem Loader this includes also relative paths.
-     When using the JavaScript interface you can even use URLs and abstract identifiers if
-     your callback can handle them.
+   - ��导入回调能够处�它，它�以是任何东西。
+     在主机文件系统加载器的情况下，这也包括相对路径。
+     当使用JavaScript接�时，您甚至�以使用URL和抽象标识符，
+     如果您的回调能够处�它们。
 
-   - Remapping happens after relative imports have already been resolved into source unit names.
-     This means that targets starting with ``./`` and ``../`` have no special meaning and are
-     relative to the base path rather than to the location of the source file.
+   - �映射�生在相对导入已�被解�为��元�称之�。
+     这�味�以 ``./`` 和 ``./`` 开头的目标没有特殊�义，是相对于基本路径而�是�文件的�置。
 
-   - Remapping targets are not normalized so ``@root/=./a/b//`` will remap ``@root/contract.sol``
-     to ``./a/b//contract.sol`` and not ``a/b/contract.sol``.
+   - �映射目标没有被规范化，所以 ``@root/=./a/b//`` 将�映射
+     ``@root/contract.sol`` 到 ``./a/b/contract.sol`` 而�是 ``a/b/contract.sol``。
 
-   - If the target does not end with a slash, the compiler will not add one automatically:
+   - 如果目标�以斜线结尾，编译器将�会自动添加一个斜线:
 
      .. code-block:: bash
 
-         solc /project/=/contracts /project/contract.sol # source unit name: /project/contract.sol
+         solc /project/=/contracts /project/contract.sol # ��元�称： /project/contract.sol
 
      .. code-block:: solidity
          :caption: /project/contract.sol
 
-         import "/project/util.sol" as util; // source unit name: /contractsutil.sol
+         import "/project/util.sol" as util; // ��元�称： /contractsutil.sol
 
-#. **Context and prefix are patterns and matches must be exact.**
+#. **上下文和�缀是匹�模�，匹�必须是精确的。**
 
-   - ``a//b=c`` will not match ``a/b``.
-   - source unit names are not normalized so ``a/b=c`` will not match ``a//b`` either.
-   - Parts of file and directory names can match as well.
-     ``/newProject/con:/new=old`` will match ``/newProject/contract.sol`` and remap it to
-     ``oldProject/contract.sol``.
+   - ``a//b=c`` �会匹� ``a/b``。
+   - ��元�称没有被规范化，所以 ``a/b=c`` 也�会匹� ``a//b``。
+   - 文件和目录的部分�称是�以匹�。
+     ``/newProject/con:/new=old`` 将匹� ``/newProject/contract.sol``
+     并将其�新映射到 ``oldProject/contract.sol``。
 
-#. **At most one remapping is applied to a single import.**
+#. **最多�有一个�映射被应用于�个导入。**
 
-   - If multiple remappings match the same source unit name, the one with the longest matching
-     prefix is chosen.
-   - If prefixes are identical, the one specified last wins.
-   - Remappings do not work on other remappings. For example ``a=b b=c c=d`` will not result in ``a``
-     being remapped to ``d``.
+   - 如果多个�映射与�一个��元�称相匹�，则选择具有最长匹��缀的那个。
+   - 如果�缀相�，则选择最�指定的那个。
+   - �映射对其他�映射�起作用。例如 ``a=b b=c c=d`` �会导致 ``a`` 被�映射到 ``d``。
 
-#. **Prefix cannot be empty but context and target are optional.**
+#. **prefix�能为空，但context和target是�选的。**
 
-   - If ``target`` is the empty string, ``prefix`` is simply removed from import paths.
-   - Empty ``context`` means that the remapping applies to all imports in all source units.
+   - 如果 ``target`` 是空字符串， ``prefix`` 将从导入路径中删除。
+   - 空的 ``context`` �味��新映射适用于所有��元中的所有导入。
 
 .. index:: Remix IDE, file://
 
-Using URLs in imports
+在导入中使用url
 =====================
 
-Most URL prefixes such as ``https://`` or ``data://`` have no special meaning in import paths.
-The only exception is ``file://`` which is stripped from source unit names by the Host Filesystem
-Loader.
+大多数URL�缀，如 ``https://`` 或 ``data://`` 在导入路径中没有特殊�义。
+唯一的例外是 ``file://``，它被主机文件系统加载器从��元�称中剥离出�。
 
-When compiling locally you can use import remapping to replace the protocol and domain part with a
-local path:
+在本地编译时，您�以使用导入�映射，用本地路径替��议和域�部分：
 
 .. code-block:: bash
 
     solc :https://github.com/ethereum/dapp-bin=/usr/local/dapp-bin contract.sol
 
-Note the leading ``:``, which is necessary when the remapping context is empty.
-Otherwise the ``https:`` part would be interpreted by the compiler as the context.
+注���的 ``:``，当�映射上下文为空时，这是必�的。
+�则， ``https:`` 部分将被编译器解释为上下文。
diff --git a/docs/resources.rst b/docs/resources.rst
index 84df74fb73cb..82f043585c1e 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -1,150 +1,165 @@
 #########
-Resources
+资�
 #########
 
-General Resources
+一般资�
 =================
 
-* `Ethereum.org Developer Portal <https://ethereum.org/en/developers/>`_
+* `Ethereum.org开�者门户网站 <https://ethereum.org/en/developers/>`_
 * `Ethereum StackExchange <https://ethereum.stackexchange.com/>`_
-* `Solidity Portal <https://soliditylang.org/>`_
-* `Solidity Changelog <https://github.com/ethereum/solidity/blob/develop/Changelog.md>`_
-* `Solidity Source Code on GitHub <https://github.com/ethereum/solidity/>`_
-* `Solidity Language Users Chat <https://matrix.to/#/#ethereum_solidity:gitter.im>`_
-* `Solidity Compiler Developers Chat <https://matrix.to/#/#ethereum_solidity-dev:gitter.im>`_
-* `Awesome Solidity <https://github.com/bkrem/awesome-solidity>`_
-* `Solidity by Example <https://solidity-by-example.org/>`_
-* `Solidity Documentation Community Translations <https://github.com/solidity-docs>`_
-
-Integrated (Ethereum) Development Environments
+* `Solidity门户网站  <https://soliditylang.org/>`_
+* `Solidity�更日志 <https://github.com/ethereum/solidity/blob/develop/Changelog.md>`_
+* `GitHub上的Solidity�代� <https://github.com/ethereum/solidity/>`_
+* `Solidity语言用户�天室 <https://matrix.to/#/#ethereum_solidity:gitter.im>`_
+* `Solidity编译器开�人员�天室 <https://matrix.to/#/#ethereum_solidity-dev:gitter.im>`_
+* `很棒的Solidity <https://github.com/bkrem/awesome-solidity>`_
+* `通过实例学Solidity <https://solidity-by-example.org/>`_
+* `Solidity文档社区翻译 <https://github.com/solidity-docs>`_
+
+集�（以太�）开�环境
 ==============================================
 
     * `Brownie <https://eth-brownie.readthedocs.io/en/stable/>`_
-        Python-based development and testing framework for smart contracts targeting the Ethereum Virtual Machine.
+        ��以太�虚拟机的基于Python的智能�约开�和测试框架。
 
     * `Dapp <https://dapp.tools/>`_
-        Tool for building, testing and deploying smart contracts from the command-line.
+<<<<<<< HEAD
+        用于从命令行构建，测试和部署智能�约的工具。
 
     * `Embark <https://framework.embarklabs.io/>`_
-        Developer platform for building and deploying decentralized applications.
+        构建和部署去中心化应用程�的开�者平�。
+=======
+        Tool for building, testing and deploying smart contracts from the command-line.
+>>>>>>> english/develop
 
     * `Foundry <https://github.com/foundry-rs/foundry>`_
-        Fast, portable and modular toolkit for Ethereum application development written in Rust.
+        用Rust编写的用于Ethereum应用开�的快速，�移�和模�化的工具包。
 
     * `Hardhat <https://hardhat.org/>`_
-        Ethereum development environment with local Ethereum network, debugging features and plugin ecosystem.
+        以太�开�环境具有本地以太�网络，调试功能和�件生�系统。
 
     * `Remix <https://remix.ethereum.org/>`_
-        Browser-based IDE with integrated compiler and Solidity runtime environment without server-side components.
+        基于�览器的IDE，具有集�的编译器和Solidity�行环境，没有�务器端组件。
 
     * `Truffle <https://trufflesuite.com/truffle/>`_
-        Ethereum development framework.
+        以太�开�框架。
 
-Editor Integrations
+编辑器集�
 ===================
 
 * Emacs
 
     * `Emacs Solidity <https://github.com/ethereum/emacs-solidity/>`_
-        Plugin for the Emacs editor providing syntax highlighting and compilation error reporting.
+        Emacs编辑器的�件，�供语法高亮和编译错误报告。
 
 * IntelliJ
 
-    * `IntelliJ IDEA plugin <https://plugins.jetbrains.com/plugin/9475-solidity/>`_
-        Solidity plugin for IntelliJ IDEA (and all other JetBrains IDEs).
+    * `IntelliJ IDEA �件 <https://plugins.jetbrains.com/plugin/9475-solidity/>`_
+        IntelliJ IDEA（和所有其他JetBrains IDEs）的Solidity�件
 
 * Sublime Text
 
-    * `Package for SublimeText - Solidity language syntax <https://packagecontrol.io/packages/Ethereum/>`_
-        Solidity syntax highlighting for SublimeText editor.
+    * `SublimeText的软件包 - Solidity语言语法 <https://packagecontrol.io/packages/Ethereum/>`_
+        用于 SublimeText 编辑器的 Solidity 语法高亮。
 
 * Vim
 
-    * `Vim Solidity by Thesis <https://github.com/thesis/vim-solidity/>`_
-        Syntax highlighting for Solidity in Vim.
+    * `Thesis çš„ Vim Solidity <https://github.com/thesis/vim-solidity/>`_
+        Vim 中 Solidity 的语法高亮。
 
-    * `Vim Solidity by TovarishFin <https://github.com/TovarishFin/vim-solidity>`_
-        Vim syntax file for Solidity.
+    * `TovarishFin çš„ Vim Solidity <https://github.com/TovarishFin/vim-solidity>`_
+        Solidity 的 Vim 语法文件。
 
     * `Vim Syntastic <https://github.com/vim-syntastic/syntastic>`_
-        Plugin for the Vim editor providing compile checking.
+        为Vim编辑器�供编译检查的�件。
 
 * Visual Studio Code (VS Code)
 
+<<<<<<< HEAD
+    * `以太� Remix 的 Visual Studio 代�扩展包 <https://marketplace.visualstudio.com/items?itemName=RemixProject.ethereum-remix>`_
+        VS Code 的以太� Remix 扩展包
+=======
     * `Ethereum Remix Visual Studio Code extension <https://github.com/ethereum/remix-vscode>`_
         Ethereum Remix extension pack for VS Code
+>>>>>>> english/develop
 
-    * `Solidity Visual Studio Code extension, by Juan Blanco <https://juan.blanco.ws/solidity-contracts-in-visual-studio-code/>`_
-        Solidity plugin for Microsoft Visual Studio Code that includes syntax highlighting and the Solidity compiler.
+    * `Juan Blanco 的 Solidity Visual Studio 代�扩展包 <https://juan.blanco.ws/solidity-contracts-in-visual-studio-code/>`_
+        Microsoft Visual Studio Code 的 Solidity �件，包括语法高亮和 Solidity 编译器。
 
-    * `Solidity Visual Studio Code extension, by Nomic Foundation <https://marketplace.visualstudio.com/items?itemName=NomicFoundation.hardhat-solidity>`_
-        Solidity and Hardhat support by the Hardhat team, including: syntax highlighting, jump to definition, renames, quick fixes and inline solc warnings and errors.
+    * `Nomic Foundation 的 Solidity Visual Studio 代�扩展包 <https://marketplace.visualstudio.com/items?itemName=NomicFoundation.hardhat-solidity>`_
+        由Hardhat团队�供的Solidity和Hardhat支�，包括：语法高亮，跳转到定义，�命�，快速修�和内�solc警告和错误。
 
-    * `Solidity Visual Auditor extension <https://marketplace.visualstudio.com/items?itemName=tintinweb.solidity-visual-auditor>`_
-        Adds security centric syntax and semantic highlighting to Visual Studio Code.
+    * `Solidity �视化审计扩展 <https://marketplace.visualstudio.com/items?itemName=tintinweb.solidity-visual-auditor>`_
+        在Visual Studio Code中增加了以安全为中心的语法和语义�出显示。
 
-    * `Truffle for VS Code <https://marketplace.visualstudio.com/items?itemName=trufflesuite-csi.truffle-vscode>`_
-        Build, debug and deploy smart contracts on Ethereum and EVM-compatible blockchains.
+    * `用于 VS Code 的 Truffle <https://marketplace.visualstudio.com/items?itemName=trufflesuite-csi.truffle-vscode>`_
+        在Ethereum和EVM兼容的区�链上构建，调试和部署智能�约。
 
-Solidity Tools
+Solidity 工具
 ==============
 
-* `ABI to Solidity interface converter <https://gist.github.com/chriseth/8f533d133fa0c15b0d6eaf3ec502c82b>`_
-    A script for generating contract interfaces from the ABI of a smart contract.
+* `ABI到Solidity接�转�器  <https://gist.github.com/chriseth/8f533d133fa0c15b0d6eaf3ec502c82b>`_
+    一个用于从智能�约的ABI生��约接�的脚本。
 
 * `abi-to-sol <https://github.com/gnidan/abi-to-sol>`_
-    Tool to generate Solidity interface source from a given ABI JSON.
+    从一个给定的ABI JSON生�Solidity接��的工具。
 
 * `Doxity <https://github.com/DigixGlobal/doxity>`_
-    Documentation Generator for Solidity.
+    Solidity的文档生�器。
 
 * `Ethlint <https://github.com/duaraghav8/Ethlint>`_
-    Linter to identify and fix style and security issues in Solidity.
+    识别和修�Solidity中的风格和安全问题的语法检查器。
 
 * `evmdis <https://github.com/Arachnid/evmdis>`_
-    EVM Disassembler that performs static analysis on the bytecode to provide a higher level of abstraction than raw EVM operations.
+    EVM�汇编程�，对字节�进行��分�，�供比原始EVM�作更高的抽象水平。
 
 * `EVM Lab <https://github.com/ethereum/evmlab/>`_
-    Rich tool package to interact with the EVM. Includes a VM, Etherchain API, and a trace-viewer with gas cost display.
+    丰富的工具包，与EVM互动。包括一个虚拟机�以太链API，以�一个带有gas�本显示的跟踪查看器。
 
 * `hevm <https://github.com/dapphub/dapptools/tree/master/src/hevm#readme>`_
-    EVM debugger and symbolic execution engine.
+    EVM调试器和符�执行引擎。
 
 * `leafleth <https://github.com/clemlak/leafleth>`_
-    A documentation generator for Solidity smart-contracts.
+    Solidity智能�约的文档生�器。
+
+<<<<<<< HEAD
+* `PIET <https://piet.slock.it/>`_
+    一个通过简�图形界�开�，审计和使用Solidity智能�约的工具。
 
+=======
+>>>>>>> english/develop
 * `Scaffold-ETH <https://github.com/scaffold-eth/scaffold-eth>`_
-    Forkable Ethereum development stack focused on fast product iterations.
+    专注于产�快速迭代的�分�的以太�开�堆栈。
 
 * `sol2uml <https://www.npmjs.com/package/sol2uml>`_
-    Unified Modeling Language (UML) class diagram generator for Solidity contracts.
+    Solidity�约的统一建模语言（UML）类图生�器。
 
 * `solc-select <https://github.com/crytic/solc-select>`_
-    A script to quickly switch between Solidity compiler versions.
+    一个在 Solidity 编译器版本之间快速切�的脚本。
 
-* `Solidity prettier plugin <https://github.com/prettier-solidity/prettier-plugin-solidity>`_
-    A Prettier Plugin for Solidity.
+* `优化Solidity语言格��件 <https://github.com/prettier-solidity/prettier-plugin-solidity>`_
+    Solidity格�美化�件。
 
 * `Solidity REPL <https://github.com/raineorshine/solidity-repl>`_
-    Try Solidity instantly with a command-line Solidity console.
+    使用命令行solidity控制�立��试solidity。
 
 * `solgraph <https://github.com/raineorshine/solgraph>`_
-    Visualize Solidity control flow and highlight potential security vulnerabilities.
+    �视化Solidity控制�并�出潜在的安全�洞。
 
 * `Solhint <https://github.com/protofire/solhint>`_
-    Solidity linter that provides security, style guide and best practice rules for smart contract validation.
+    Solidity语法检查器，为智能�约的验��供安全，风格指�和最佳实践规则。
 
 * `Sourcify <https://sourcify.dev/>`_
-    Decentralized automated contract verification service and public repository of contract metadata.
+    去中心化的自动�约验��务和�约元数�的公共存储库。
 
 * `SÅ«rya <https://github.com/ConsenSys/surya/>`_
-    Utility tool for smart contract systems, offering a number of visual outputs and information about the contracts' structure. Also supports querying the function call graph.
+    智能�约系统的实用工具，�供一些�视化输出和关于�约结构的信�。还支�查询函数调用图。
 
 * `Universal Mutator <https://github.com/agroce/universalmutator>`_
-    A tool for mutation generation, with configurable rules and support for Solidity and Vyper.
+    一个用于��生�的工具，具有��置的规则并支�Solidity和Vyper。
 
-Third-Party Solidity Parsers and Grammars
+第三方Solidity解�器和语法
 =========================================
 
-* `Solidity Parser for JavaScript <https://github.com/solidity-parser/parser>`_
-    A Solidity parser for JS built on top of a robust ANTLR4 grammar.
+* `用于JavaScript的Solidity解�器 <https://github.com/solidity-parser/parser>`_
+    一个建立在强大的ANTLR4语法之上的JS Solidity解�器。
diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 92d601043dd7..838ed376f405 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -1,93 +1,93 @@
 .. _security_considerations:
 
 #######################
-Security Considerations
+安全考虑
 #######################
 
-While it is usually quite easy to build software that works as expected,
-it is much harder to check that nobody can use it in a way that was **not** anticipated.
+虽然通常很容易建立起按预期工作的软件，但�检查没有人能够以 **�** 预期的方�使用它，就难得多了。
 
-In Solidity, this is even more important because you can use smart contracts to handle tokens or,
-possibly, even more valuable things.
-Furthermore, every execution of a smart contract happens in public and,
-in addition to that, the source code is often available.
+在 Solidity 中，这一点更加��，因为您�以使用智能�约�处�代�，
+甚至�能是更有价值的东西。
+此外，智能�约的�一次执行都是公开的，
+除此之外，�代�也通常是容易获得的。
 
-Of course, you always have to consider how much is at stake:
-You can compare a smart contract with a web service that is open to the public
-(and thus, also to malicious actors) and perhaps even open-source.
-If you only store your grocery list on that web service, you might not have to take too much care,
-but if you manage your bank account using that web service, you should be more careful.
+当然，您总是�考虑有多大的风险：
+您�以将智能�约与一个对公众开放
+（因此也对��行为者开放），甚至�能是开�的网络�务进行比较。
+如果您�在该网络�务上存储您的�货清�，您�能�必太过�心，
+但如果您使用该网络�务管�您的银行账户，您就应该更加�心。
 
-This section will list some pitfalls and general security recommendations
-but can, of course, never be complete.
-Also, keep in mind that even if your smart contract code is bug-free,
-the compiler or the platform itself might have a bug.
-A list of some publicly known security-relevant bugs of the compiler can be found
-in the :ref:`list of known bugs<known_bugs>`, which is also machine-readable.
-Note that there is a `Bug Bounty Program <https://ethereum.org/en/bug-bounty/>`_
-that covers the code generator of the Solidity compiler.
+本节将列出一些陷阱和一般安全建议，
+但当然，这��能是完整的。
+此外，请记�，�使您的智能�约代�没有错误，
+编译器或平�本身也�能有一个错误。
+编译器的一些公开的，与安全有关的错误列表�以
+在 :ref:`已知错误列表 <known_bugs>` 中找到，它也是机器�读的。
+请注�，有一个涵盖 Solidity 编译器的代�生�器的
+`错误�金计划 <https://ethereum.org/en/bug-bounty/>`_。
 
-As always, with open-source documentation,
-please help us extend this section (especially, some examples would not hurt)!
+�往常一样，对于开�文档，
+请帮助我们扩展这部分内容（尤其是，一些例��会有什么影�）�
 
-NOTE: In addition to the list below, you can find more security recommendations and best practices
-`in Guy Lando's knowledge list <https://github.com/guylando/KnowledgeLists/blob/master/EthereumSmartContracts.md>`_ and
-`the Consensys GitHub repo <https://consensys.github.io/smart-contract-best-practices/>`_.
+注�：除了下�的列表，您也�以在
+`Guy Lando 的知识列表 <https://github.com/guylando/KnowledgeLists/blob/master/EthereumSmartContracts.md>`_
+和 `Consensys GitHub 代�仓库 <https://consensys.github.io/smart-contract-best-practices/>`_
+中找到更多的安全建议和最佳实践。
 
 ********
-Pitfalls
+陷阱
 ********
 
-Private Information and Randomness
+��信�和�机性
 ==================================
 
-Everything you use in a smart contract is publicly visible,
-even local variables and state variables marked ``private``.
+您在智能�约中使用的所有东西都是公开��的，
+�使是标记为 ``private`` 的局部��和状���。
 
-Using random numbers in smart contracts is quite tricky if you do not want block builders to be able to cheat.
+如果你�希望区�构造者能够作弊，在智能�约中使用�机数是相当棘手的。
 
-Reentrancy
-==========
+�入
+===========
 
-Any interaction from a contract (A) with another contract (B)
-and any transfer of Ether hands over control to that contract (B).
-This makes it possible for B to call back into A before this interaction is completed.
-To give an example, the following code contains a bug (it is just a snippet and not a complete contract):
+一个�约（A）与�一个�约（B）的任何交互
+和任何以太�的转移都会将控制�交给该�约（B）。
+这使得 B 有�能在这个交互完�之�回调回 A。
+举个例�，下�的代�包�了一个错误（这�是一个片段，而�是一个完整的�约）：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.6.0 <0.9.0;
 
-    // THIS CONTRACT CONTAINS A BUG - DO NOT USE
+    // 此�约包�一个错误 - 请勿使用
     contract Fund {
-        /// @dev Mapping of ether shares of the contract.
+        /// @dev �约的以太�份�的映射。
         mapping(address => uint) shares;
-        /// Withdraw your share.
+        /// ��您的份�。
         function withdraw() public {
             if (payable(msg.sender).send(shares[msg.sender]))
                 shares[msg.sender] = 0;
         }
     }
 
-The problem is not too serious here because of the limited gas as part of ``send``,
-but it still exposes a weakness:
-Ether transfer can always include code execution,
-so the recipient could be a contract that calls back into ``withdraw``.
-This would let it get multiple refunds and, basically, retrieve all the Ether in the contract.
-In particular, the following contract will allow an attacker to refund multiple times
-as it uses ``call`` which forwards all remaining gas by default:
+这里的问题�是太严�，因为作为 ``send`` 的一部分，gas 有�，
+但它�然暴露了一个弱点: 
+以太�的转移总是�以包括代�的执行，
+所以接收者�以是一个回调到 ``withdraw`` 的�约。
+这将让它获得多次退款，并基本上�回�约中的所有以太。
+特别的是，下�的�约将�许攻击者多次退款，
+因为它使用了 ``call``，它会默认转�所有剩余 gas。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.6.2 <0.9.0;
 
-    // THIS CONTRACT CONTAINS A BUG - DO NOT USE
+    //此�约包�一个错误 - 请勿使用
     contract Fund {
-        /// @dev Mapping of ether shares of the contract.
+        /// @dev �约的以太�份�的映射。
         mapping(address => uint) shares;
-        /// Withdraw your share.
+        /// ��您的份�。
         function withdraw() public {
             (bool success,) = msg.sender.call{value: shares[msg.sender]}("");
             if (success)
@@ -95,7 +95,7 @@ as it uses ``call`` which forwards all remaining gas by default:
         }
     }
 
-To avoid reentrancy, you can use the Checks-Effects-Interactions pattern as demonstrated below:
+为了���入，您�以使用如下所示的 检查-生效-交互（Checks-Effects-Interactions）模�：
 
 .. code-block:: solidity
 
@@ -103,9 +103,9 @@ To avoid reentrancy, you can use the Checks-Effects-Interactions pattern as demo
     pragma solidity >=0.6.0 <0.9.0;
 
     contract Fund {
-        /// @dev Mapping of ether shares of the contract.
+        /// @dev �约的以太�份�的映射。
         mapping(address => uint) shares;
-        /// Withdraw your share.
+        /// ��您的份�。
         function withdraw() public {
             uint share = shares[msg.sender];
             shares[msg.sender] = 0;
@@ -113,103 +113,96 @@ To avoid reentrancy, you can use the Checks-Effects-Interactions pattern as demo
         }
     }
 
-The Checks-Effects-Interactions pattern ensures that all code paths through a contract
-complete all required checks of the supplied parameters before modifying the contract's state (Checks);
-only then it makes any changes to the state (Effects);
-it may make calls to functions in other contracts
-*after* all planned state changes have been written to storage (Interactions).
-This is a common foolproof way to prevent *reentrancy attacks*,
-where an externally called malicious contract can double-spend an allowance,
-double-withdraw a balance, among other things,
-by using logic that calls back into the original contract before it has finalized its transaction.
-
-Note that reentrancy is not only an effect of Ether transfer
-but of any function call on another contract.
-Furthermore, you also have to take multi-contract situations into account.
-A called contract could modify the state of another contract you depend on.
-
-Gas Limit and Loops
+检查-生效-交互模�确�所有通过�约的代�路径
+在修改�约的状�（检查）之�完�对所�供的�数的所有必�检查；
+�有这样它�会对状�进行任何改�（生效）；
+*之�* 所有计划的状�改�被写入存储（交互）。
+这是一�常�的防止 *�入性攻击* 的万无一失的方法，
+在这�情况下，外部调用的���约能够
+通过使用在原始�约最终完�交易之�回调原始�约的逻辑
+���花费授��度，����余�，以�其他事情。
+
+请注�，�入�仅是对以太�转移的影�，
+也是对�一个�约的任何函数调用的影�。
+此外，您还必须考虑到多�约的情况。
+一个被调用的�约�以修改您所�赖的�一个�约的状�。
+
+gas �制和循环
 ===================
 
-Loops that do not have a fixed number of iterations, for example,
-loops that depend on storage values, have to be used carefully:
-Due to the block gas limit, transactions can only consume a certain amount of gas.
-Either explicitly or just due to normal operation,
-the number of iterations in a loop can grow beyond the block gas limit
-which can cause the complete contract to be stalled at a certain point.
-This may not apply to ``view`` functions that are only executed to read data from the blockchain.
-Still, such functions may be called by other contracts as part of on-chain operations and stall those.
-Please be explicit about such cases in the documentation of your contracts.
-
-Sending and Receiving Ether
+对于没有固定迭代次数的循环，例如，
+�赖于存储值的循环，必须谨慎使用：
+由于� gas 的�制，事务�能消耗一定�的 gas。
+无论是明确的还是仅仅由于正常的�作，
+循环中的迭代次数�以增长到超过� gas �制，
+这�能导致完整的�约在�一点上�滞。
+这�能�适用于�为从区�链上读�数�而执行的 ``view`` 函数。
+但是，这样的函数�能会被其他�约调用，作为链上�作的一部分，并使其�滞。
+请在您的�约文档中明确说明这�情况。
+
+��和接收以太�
 ===========================
 
-- Neither contracts nor "external accounts" are currently able to prevent someone from sending them Ether.
-  Contracts can react on and reject a regular transfer, but there are ways to move Ether without creating a message call.
-  One way is to simply "mine to" the contract address and the second way is using ``selfdestruct(x)``.
-
-- If a contract receives Ether (without a function being called), either the :ref:`receive Ether <receive-ether-function>`
-  or the :ref:`fallback <fallback-function>` function is executed.
-  If it does not have a ``receive`` nor a ``fallback`` function, the Ether will be rejected (by throwing an exception).
-  During the execution of one of these functions, the contract can only rely on the "gas stipend" it is passed (2300 gas)
-  being available to it at that time.
-  This stipend is not enough to modify storage (do not take this for granted though, the stipend might change with future hard forks).
-  To be sure that your contract can receive Ether in that way, check the gas requirements of the receive and fallback functions
-  (for example in the "details" section in Remix).
-
-- There is a way to forward more gas to the receiving contract using ``addr.call{value: x}("")``.
-  This is essentially the same as ``addr.transfer(x)``, only that it forwards all remaining gas
-  and opens up the ability for the recipient to perform more expensive actions
-  (and it returns a failure code instead of automatically propagating the error).
-  This might include calling back into the sending contract or other state changes you might not have thought of.
-  So it allows for great flexibility for honest users but also for malicious actors.
-
-- Use the most precise units to represent the Wei amount as possible, as you lose any that is rounded due to a lack of precision.
-
-- If you want to send Ether using ``address.transfer``, there are certain details to be aware of:
-
-  1. If the recipient is a contract, it causes its receive or fallback function
-     to be executed which can, in turn, call back the sending contract.
-  2. Sending Ether can fail due to the call depth going above 1024. Since the
-     caller is in total control of the call depth, they can force the
-     transfer to fail; take this possibility into account or use ``send`` and
-     make sure to always check its return value. Better yet, write your
-     contract using a pattern where the recipient can withdraw Ether instead.
-  3. Sending Ether can also fail because the execution of the recipient
-     contract requires more than the allotted amount of gas (explicitly by
-     using :ref:`require <assert-and-require>`, :ref:`assert <assert-and-require>`,
-     :ref:`revert <assert-and-require>` or because the
-     operation is too expensive) - it "runs out of gas" (OOG).  If you
-     use ``transfer`` or ``send`` with a return value check, this might
-     provide a means for the recipient to block progress in the sending
-     contract. Again, the best practice here is to use a :ref:`"withdraw"
-     pattern instead of a "send" pattern <withdrawal_pattern>`.
-
-Call Stack Depth
+- 无论是�约还是 “外部账户�，目�都无法阻止有人�他们��以太�。
+  �约�以对普通的转账�出�应并拒�，但有一些方法�以在�创建消�调用的情况下转移以太�。
+  一�方法是简�地��约地�“挖矿�，第二�方法是使用 ``selfdestruct(x)``。
+
+- 如果一个�约收到了以太（没有函数被调用），�么是执行 :ref:`receive 方法 <receive-ether-function>`，
+  �么执行 :ref:`fallback <fallback-function>` 函数。
+  如果它没有 ``receive`` 也没有 ``fallback`` 函数，
+  那么该以太将被拒�（抛出一个异常）。
+  在这些函数的执行过程中，�约�能��此时它所传递的 “gas津贴�（2300 gas）�用。
+  但这个津贴�足以修改存储（但��认为这是�所当然的，这个津贴�能会��未�的硬分�而改�）。
+  为了确�您的�约能够以这�方�接收以太，请检查 receive 和 fallback 函数的 gas �求
+  （在 Remix 的“详细�章节会举例说明）。
+
+- 有一�方法�以使用 ``addr.call{value: x}("")`` 将更多的 gas 转�给接收�约。
+  这与 ``addr.transfer(x)`` 本质上是一样的，�是它转�了所有剩余的 gas，
+  并为接收方�供了执行更昂贵的�作的能力
+  （而且它返回一个失败代�，而�是自动传播错误）。
+  这�能包括回调到���约或其他您�能没有想到的状��化。
+  因此，这�方法无论是给诚实用户还是��行为者都�供了�大的�活性。
+
+- 尽�能使用最精确的���表示 wei 的数�，因为您会因为缺�精确性而失去任何四�五入的结果。
+
+- 如果您想用 ``address.transfer`` ���以太，有一些细节需�注�：
+
+  1. 如果接收者是一个�约，它会导致其 receive 或 fallback 函数被执行，
+     而该函数��以回调��以太的�约。
+  2. ��以太�能由于调用深度超过1024而失败。由于调用者完全控制�调用深度，他们�以迫使传输失败；
+     考虑到这��能性，或者使用 ``send``，并确�总是检查其返回值。
+     更好的办法是，使用接收者�以��以太�的模��编写您的�约。
+  3. ��以太也�能失败，因为接收�约的执行需�超过分�的 gas 值
+     （确切地说，是使用了 :ref:`require <assert-and-require>`， :ref:`assert <assert-and-require>`，
+     :ref:`revert <assert-and-require>` 或者因为�作太昂贵）- 它 “耗尽了 gas�（OOG）。
+     如果您使用 ``transfer`` 或 ``send``，并带有返回值检查，这�能为接收者�供一�手段�阻止���约的进展。
+     �样，这里的最佳�法是使用 :ref:`"�款" 模�而�是 "��"模� <withdrawal_pattern>`。
+
+调用栈深度
 ================
 
-External function calls can fail at any time
-because they exceed the maximum call stack size limit of 1024.
-In such situations, Solidity throws an exception.
-Malicious actors might be able to force the call stack to a high value
-before they interact with your contract.
-Note that, since `Tangerine Whistle <https://eips.ethereum.org/EIPS/eip-608>`_ hardfork,
-the `63/64 rule <https://eips.ethereum.org/EIPS/eip-150>`_ makes call stack depth attack impractical.
-Also note that the call stack and the expression stack are unrelated,
-even though both have a size limit of 1024 stack slots.
-
-Note that ``.send()`` does **not** throw an exception if the call stack is depleted
-but rather returns ``false`` in that case.
-The low-level functions ``.call()``, ``.delegatecall()`` and ``.staticcall()`` behave in the same way.
-
-Authorized Proxies
+外部函数调用�时都�能失败，
+因为它们超过了最大调用堆栈大�1024的�制。
+在这�情况下，Solidity 会抛出一个异常。
+��的行为者�能会在与您的�约交互之�，
+将调用堆栈逼到一个高值。
+请注�，由于 `桔�哨�（Tangerine Whistle） <https://eips.ethereum.org/EIPS/eip-608>`_ 硬分�，
+`63/64规则 <https://eips.ethereum.org/EIPS/eip-150>`_ 使得调用栈深度攻击�切实际。
+还�注�的是，调用栈和表达�栈是�相关的，
+尽管两者都有1024个栈槽的大��制。
+
+注� ``.send()`` 在调用栈被耗尽的情况下 **�会** 抛出异常，
+而是会返回 ``false``。
+低级函数 ``.call()``， ``.delegatecall()`` 和 ``.staticcall()`` 也都是这样的。
+
+授�的代�
 ==================
 
-If your contract can act as a proxy, i.e. if it can call arbitrary contracts with user-supplied data,
-then the user can essentially assume the identity of the proxy contract.
-Even if you have other protective measures in place, it is best to build your contract system such
-that the proxy does not have any permissions (not even for itself).
-If needed, you can accomplish that using a second proxy:
+如果您的�约�以作为一个代�，也就是说，如果它�以用用户�供的数�调用任�的�约，
+那么用户基本上�以承担代��约的身份。
+�使您有其他的�护措施，最好是建立您的�约系统，
+使代�没有任何��（甚至对自己也没有）。
+如果需�，您�以使用第二个代��完�：
 
 .. code-block:: solidity
 
@@ -222,11 +215,10 @@ If needed, you can accomplish that using a second proxy:
                 returns (bool, bytes memory) {
             return proxy.callOther(addr, payload);
         }
-        // Other functions and other functionality
+        // 其他函数和其他功能
     }
 
-    // This is the full contract, it has no other functionality and
-    // requires no privileges to work.
+    // 这是完整的�约，它没有其他功能，�需�任何��就�以工作。
     contract PermissionlessProxy {
         function callOther(address addr, bytes memory payload) public
                 returns (bool, bytes memory) {
@@ -237,14 +229,14 @@ If needed, you can accomplish that using a second proxy:
 tx.origin
 =========
 
-Never use ``tx.origin`` for authorization.
-Let's say you have a wallet contract like this:
+永远��使用 ``tx.origin`` �身份认�。
+�设您有一个这样的钱包�约：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // THIS CONTRACT CONTAINS A BUG - DO NOT USE
+    // 本�约包�一个错误 - 请勿使用
     contract TxUserWallet {
         address owner;
 
@@ -253,13 +245,13 @@ Let's say you have a wallet contract like this:
         }
 
         function transferTo(address payable dest, uint amount) public {
-            // THE BUG IS RIGHT HERE, you must use msg.sender instead of tx.origin
+            // 错误就在这里，您必须使用 msg.sender 而�是 tx.origin。
             require(tx.origin == owner);
             dest.transfer(amount);
         }
     }
 
-Now someone tricks you into sending Ether to the address of this attack wallet:
+现在有人欺骗您，让您�这个攻击钱包的地���以太�：
 
 .. code-block:: solidity
 
@@ -281,22 +273,21 @@ Now someone tricks you into sending Ether to the address of this attack wallet:
         }
     }
 
-If your wallet had checked ``msg.sender`` for authorization, it would get the address of the attack wallet,
-instead of the owner's address.
-But by checking ``tx.origin``, it gets the original address that kicked off the transaction,
-which is still the owner's address.
-The attack wallet instantly drains all your funds.
+如果您的钱包检查了 ``msg.sender`` 的授�，它将得到攻击钱包的地�，
+而�是所有者地�。
+但是通过检查 ``tx.origin``，它得到的是�动交易的原始地�，
+这�然是所有者地�。
+攻击钱包会立�耗尽您的所有资金。
 
 .. _underflow-overflow:
 
-Two's Complement / Underflows / Overflows
+二进制补� / 下溢 / 上溢
 =========================================
 
-As in many programming languages, Solidity's integer types are not actually integers.
-They resemble integers when the values are small, but cannot represent arbitrarily large numbers.
+正如在许多编程语言中，Solidity 的整数类型实际上�是整数。
+当数值较�时，它们类似于整数，但也�能表示任�大的数字。
 
-The following code causes an overflow because the result of the addition is too large
-to be stored in the type ``uint8``:
+下�的代�会导致溢出，因为加法的结果太大，�能存储在 ``uint8`` 类型中：
 
 .. code-block:: solidity
 
@@ -304,35 +295,34 @@ to be stored in the type ``uint8``:
   uint8 y = 1;
   return x + y;
 
-Solidity has two modes in which it deals with these overflows: Checked and Unchecked or "wrapping" mode.
+Solidity 有两�模��处�这些溢出。检查和�检查或 “包装� 模�。
 
-The default checked mode will detect overflows and cause a failing assertion. You can disable this check
-using ``unchecked { ... }``, causing the overflow to be silently ignored. The above code would return
-``0`` if wrapped in ``unchecked { ... }``.
+默认的检查模�将检测到溢出并导致一个失败的断言。
+您�以使用 ``unchecked { ... }``，使溢出被无声地忽略。
+上�的代�如果用 ``unchecked { ... }`` 包装，将返回 ``0``。
 
-Even in checked mode, do not assume you are protected from overflow bugs.
-In this mode, overflows will always revert. If it is not possible to avoid the
-overflow, this can lead to a smart contract being stuck in a certain state.
+�使在检查模�下，也��认为您�到了�护，�会出现溢出错误。
+在这�模�下，溢出总是会被还原。如果无法��溢出，这�能导致智能�约被�在�个状�。
 
-In general, read about the limits of two's complement representation, which even has some
-more special edge cases for signed numbers.
+一般�说，请阅读关于二进制补�表示法的�制，它甚至对有符�的数字有一些更特殊的边缘情况。
 
-Try to use ``require`` to limit the size of inputs to a reasonable range and use the
-:ref:`SMT checker<smt_checker>` to find potential overflows.
+�试使用 ``require`` 将输入的大��制在一个��的范围内，
+并使用 :ref:`SMT 检查器 <smt_checker>` ��现潜在的溢出。
 
 .. _clearing-mappings:
 
-Clearing Mappings
+清除映射
 =================
 
-The Solidity type ``mapping`` (see :ref:`mapping-types`) is a storage-only key-value data structure
-that does not keep track of the keys that were assigned a non-zero value.
-Because of that, cleaning a mapping without extra information about the written keys is not possible.
-If a ``mapping`` is used as the base type of a dynamic storage array,
-deleting or popping the array will have no effect over the ``mapping`` elements.
-The same happens, for example, if a ``mapping`` is used as the type of a member field of a ``struct``
-that is the base type of a dynamic storage array.
-The ``mapping`` is also ignored in assignments of structs or arrays containing a ``mapping``.
+Solidity ``mapping`` 类型（�� :ref:`mapping-types`）是一个仅有存储空间的键值数�结构，
+它�跟踪被分��零值的键。
+正因为如此，清�映射时��能有关于写入键的�外信�。
+如果 ``mapping`` 被用作动�存储数组的基本类型，
+删除或弹出数组将�会对 ``mapping`` 元素产生影�。
+例如，如果一个 ``mapping`` 被用作一个 ``struct`` 的�员字段的类型，
+而该结构是一个动�存储阵列的基本类型，�样的情况也会�生。
+``mapping`` 在包� ``mapping`` 的结构或数组的分�中也会被忽略。
+
 
 .. code-block:: solidity
 
@@ -360,99 +350,106 @@ The ``mapping`` is also ignored in assignments of structs or arrays containing a
         }
     }
 
-Consider the example above and the following sequence of calls: ``allocate(10)``, ``writeMap(4, 128, 256)``.
-At this point, calling ``readMap(4, 128)`` returns 256.
-If we call ``eraseMaps``, the length of the state variable ``array`` is zeroed,
-but since its ``mapping`` elements cannot be zeroed, their information stays alive in the contract's storage.
-After deleting ``array``, calling ``allocate(5)`` allows us to access ``array[4]`` again,
-and calling ``readMap(4, 128)`` returns 256 even without another call to ``writeMap``.
+考虑一下上�的例�和下�的调用�列： ``allocate(10)``， ``writeMap(4, 128, 256)``。
+此时，调用 ``readMap(4, 128)`` 返回256。
+如果我们调用 ``eraseMaps``，状��� ``array`` 的长度被清零，
+但由于它的 ``mapping`` 元素�能被清零，它们的信�在�约的存储中�然存在。
+删除 ``array`` �，调用 ``allocate(5)`` �许我们�次访问 ``array[4]``，
+调用 ``readMap(4, 128)`` 则返回256，�使没有�次调用 ``writeMap``。
 
-If your ``mapping`` information must be deleted, consider using a library similar to
-`iterable mapping <https://github.com/ethereum/dapp-bin/blob/master/library/iterable_mapping.sol>`_,
-allowing you to traverse the keys and delete their values in the appropriate ``mapping``.
+如果您的 ``mapping`` 信�必须被删除，�以考虑使用类似于
+`�迭代的映射 <https://github.com/ethereum/dapp bin/blob/master/library/iterable_mapping.sol>`_ 的库，
+它�许您在适当的 ``mapping`` 中�历键并删除其值。
 
-Minor Details
+细�末节
 =============
 
-- Types that do not occupy the full 32 bytes might contain "dirty higher order bits".
-  This is especially important if you access ``msg.data`` - it poses a malleability risk:
-  You can craft transactions that call a function ``f(uint8 x)``
-  with a raw byte argument of ``0xff000001`` and with ``0x00000001``.
-  Both are fed to the contract and both will look like the number ``1`` as far as ``x`` is concerned,
-  but ``msg.data`` will be different, so if you use ``keccak256(msg.data)`` for anything,
-  you will get different results.
+- 没有�满32字节的类型�能包� “�高��。
+  这在当您访问 ``msg.data`` 的时候尤为�� —— 它带�了延展性风险：
+  您既�以用原始字节 ``0xff000001``，也�以用 ``0x00000001`` 作为�数�调用
+  函数 ``f(uint8 x)``  以构造交易。
+  这两个�数都会被正常�供给�约，就 ``x``  而言，两者看起�都是数字 ``1``， 
+  但 ``msg.data`` 将是��的，所以如果您无论怎么使用 ``keccak256(msg.data)``，
+  您都会得到��的结果。
+
 
 ***************
-Recommendations
+推��法
 ***************
 
-Take Warnings Seriously
+认真对待警告
 =======================
 
-If the compiler warns you about something, you should change it.
-Even if you do not think that this particular warning has security implications,
-there might be another issue buried beneath it.
-Any compiler warning we issue can be silenced by slight changes to the code.
+如果编译器警告您一些事情，您应该改�它。
+�使您�认为这个特定的警告有安全问题，
+但也�能在它下�埋���一个问题。
+我们�出的任何编译器警告都�以通过对代�的轻微修改�消除。
 
-Always use the latest version of the compiler to be notified about all recently introduced warnings.
+始终使用最新版本的编译器，以获知所有最近引入的警告。
 
-Messages of type ``info``, issued by the compiler, are not dangerous
-and simply represent extra suggestions and optional information
-that the compiler thinks might be useful to the user.
+编译器�出的 ``info`` 类型的信�并��险，
+�是代表编译器认为�能对用户有用的�外建议和�选信�。
 
-Restrict the Amount of Ether
+�制以太�的数�
 ============================
 
-Restrict the amount of Ether (or other tokens) that can be stored in a smart contract.
-If your source code, the compiler or the platform has a bug, these funds may be lost.
-If you want to limit your loss, limit the amount of Ether.
+�制智能�约中�存储的以太�（或其他代�）的数�。
+如果您的�代�，编译器或平�有错误，这些资金�能会丢失。
+如果您想�制您的�失，就�制以太�的数�。
 
-Keep it Small and Modular
+���约简练且模�化
 =========================
 
-Keep your contracts small and easily understandable.
-Single out unrelated functionality in other contracts or into libraries.
-General recommendations about the source code quality of course apply:
-Limit the amount of local variables, the length of functions and so on.
-Document your functions so that others can see what your intention was
-and whether it is different than what the code does.
+��您的�约短�而容易�解。
+把�相关的功能�独放在其他�约中或放在库�约中。
+关于�代�质�的一般建议当然也适用：
+�制局部��的数�和函数的长度，等等。
+给您的函数添加注释，这样别人就�以看到您的�图是什么，
+并判断它是�与代�的作用��。
 
-Use the Checks-Effects-Interactions Pattern
-===========================================
+使用“检查-生效-交互�（Checks-Effects-Interactions）模�
+=======================================================
 
-Most functions will first perform some checks and they should be done first
-(who called the function, are the arguments in range, did they send enough Ether,
-does the person have tokens, etc.).
+大多数函数会首先进行一些检查，并且应该首先完�这些检查
+（�调用了这个函数，�数是�在范围内，他们是���了足够的以太，
+这个人是�有代�，等等）。
 
-As the second step, if all checks passed, effects to the state variables of the current contract should be made.
-Interaction with other contracts should be the very last step in any function.
+第二步，如果所有的检查都通过了，就应该对当��约的状���进行影�。
+与其他�约的交互应该是任何函数的最�一步。
 
-Early contracts delayed some effects and waited for external function calls to return in a non-error state.
-This is often a serious mistake because of the reentrancy problem explained above.
+早期的�约延迟了一些效果，等待外部函数调用在�错误状�下返回。
+这往往是一个严�的错误，因为上�解释了�入问题。
 
-Note that, also, calls to known contracts might in turn cause calls to
-unknown contracts, so it is probably better to just always apply this pattern.
+请注�，对已知�约的调用也�能�过�导致对未知�约的调用，因此，最好总是应用这�模�。
 
-Include a Fail-Safe Mode
-========================
+包�故障-安全（Fail-Safe）模�
+==============================
 
-While making your system fully decentralized will remove any intermediary,
-it might be a good idea, especially for new code, to include some kind of fail-safe mechanism:
+尽管将系统完全去中心化�以�去许多中间环节，
+但包���故障-安全模��然是好的�法，
+尤其是对于新的代��说：
 
-You can add a function in your smart contract that performs some self-checks like "Has any Ether leaked?",
-"Is the sum of the tokens equal to the balance of the contract?" or similar things.
-Keep in mind that you cannot use too much gas for that,
-so help through off-chain computations might be needed there.
+您�以在您的智能�约中添加一个功能，执行一些自我检查，如 “是�有任何以太�泄�？�，
+“代�的总和是�等于�约的余�？� 或类似的事情。
+请记�，您�能为此使用太多的 gas，
+所以�能需�通过链外计算的帮助。
 
+<<<<<<< HEAD
+如果自我检查失败，�约会自动切�到�� “故障安全� 模�，
+例如，�用大部分功能，
+将控制�移交给一个固定的，�信赖的第三方，
+或者�是将�约转�为一个简�的 “退回我的钱� 的�约。
+=======
 If the self-check fails, the contract automatically switches into some kind of "failsafe" mode,
 which, for example, disables most of the features,
 hands over control to a fixed and trusted third party
 or just converts the contract into a simple "give me back my Ether" contract.
+>>>>>>> english/develop
 
-Ask for Peer Review
+请求�行评审
 ===================
 
-The more people examine a piece of code, the more issues are found.
-Asking people to review your code also helps as a cross-check to find out
-whether your code is easy to understand -
-a very important criterion for good smart contracts.
+检查一段代�的人越多，�现的问题就越多。
+�求其他人审查您的代�也有助于作为交�检查，
+找出您的代�是�容易�解 - 
+这是好的智能�约的一个�常��的标准。
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index f8085b63de6f..bd2d6d1e1e26 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -1,76 +1,65 @@
 .. _formal_verification:
 
 ##################################
-SMTChecker and Formal Verification
+SMT检查器和形�化验�
 ##################################
 
-Using formal verification it is possible to perform an automated mathematical
-proof that your source code fulfills a certain formal specification.
-The specification is still formal (just as the source code), but usually much
-simpler.
+使用形�化验�，有�能进行自动数学�明，
+�明您的�代�符���形�化规范。
+该规范�然是正�的（就��代�一样），但通常�简�得多。
 
-Note that formal verification itself can only help you understand the
-difference between what you did (the specification) and how you did it
-(the actual implementation). You still need to check whether the specification
-is what you wanted and that you did not miss any unintended effects of it.
+请注�，形�化验�本身�能帮助您�解您所�的（规范）和您如何�的（实际实现）之间的区别。
+您�然需�检查规范是�是您想�的，以�您没有��任何�想�到的效果。
 
-Solidity implements a formal verification approach based on
-`SMT (Satisfiability Modulo Theories) <https://en.wikipedia.org/wiki/Satisfiability_modulo_theories>`_ and
-`Horn <https://en.wikipedia.org/wiki/Horn-satisfiability>`_ solving.
-The SMTChecker module automatically tries to prove that the code satisfies the
-specification given by ``require`` and ``assert`` statements. That is, it considers
-``require`` statements as assumptions and tries to prove that the conditions
-inside ``assert`` statements are always true.  If an assertion failure is
-found, a counterexample may be given to the user showing how the assertion can
-be violated. If no warning is given by the SMTChecker for a property,
-it means that the property is safe.
+Solidity 实现了基于 `SMT（�满足性模型�论（Satisfiability Modulo Theories） <https://en.wikipedia.org/wiki/Satisfiability_modulo_theoris>`_
+和 `Horn <https://en.wikipedia.org/wiki/Horn-satisfiability>`_ 解决的形�验�方法。
+SMT检查器模�自动�试�明代�满足由 ``require`` 和 ``assert`` 语�给出的规范。
+也就是说，它把 ``require`` 语�视为�设，并试图�明 ``assert`` 语�中的�件总是真的。
+如果�现断言失败，则�以�用户�供一个�例，说明断言是如何被��的。
+如果 SMT 检查器对�一属性没有给出警告，这�味�该属性是安全的。
 
-The other verification targets that the SMTChecker checks at compile time are:
+SMT 检查器在编译时检查的其他验�目标有：
 
-- Arithmetic underflow and overflow.
-- Division by zero.
-- Trivial conditions and unreachable code.
-- Popping an empty array.
-- Out of bounds index access.
-- Insufficient funds for a transfer.
+- 算术上的下溢和溢出。
+- 除以0的除法。
+- 无用的�件和无法访问的代�。
+- 弹出一个空数组。
+- 超出界�的索引访问。
+- 转账资金�足。
 
-All the targets above are automatically checked by default if all engines are
-enabled, except underflow and overflow for Solidity >=0.8.7.
+如果所有检查引擎都被�用，上述所有目标都被默认为自动检查，
+除了 Solidity >=0.8.7 的下溢和溢出。
 
-The potential warnings that the SMTChecker reports are:
+SMT 检查器所报告的潜在警告是：
 
-- ``<failing  property> happens here.``. This means that the SMTChecker proved that a certain property fails. A counterexample may be given, however in complex situations it may also not show a counterexample. This result may also be a false positive in certain cases, when the SMT encoding adds abstractions for Solidity code that is either hard or impossible to express.
-- ``<failing property> might happen here``. This means that the solver could not prove either case within the given timeout. Since the result is unknown, the SMTChecker reports the potential failure for soundness. This may be solved by increasing the query timeout, but the problem might also simply be too hard for the engine to solve.
+- ``<失败的属性> �生在这里``。这�味� SMT 检查器�明了�一属性失败。�能会给出一个�例，但是在��的情况下，也�能�会显示�例。在�些情况下，当 SMT 编�为 Solidity 代�添加了难以表达或无法表达的抽象时，这个结果也�能是一个�阳性。
+- ``<失败的属性> �能�生在这里``。这�味�求解器无法在给定的超时时间内�明两�情况。由于结果是未知的，SMT 检查器会报告潜在的�全性失败。这�以通过增加查询超时时间�解决，但问题也�能�是对引擎�说太难解决。
 
-To enable the SMTChecker, you must select :ref:`which engine should run<smtchecker_engines>`,
-where the default is no engine. Selecting the engine enables the SMTChecker on all files.
+��用SMT检查器，您必须选择 :ref:`应该�行哪一个引擎 <smtchecker_engines>`，
+其中默认的是没有引擎。选择引擎�以在所有文件上�用SMT检查器。
 
 .. note::
 
-    Prior to Solidity 0.8.4, the default way to enable the SMTChecker was via
-    ``pragma experimental SMTChecker;`` and only the contracts containing the
-    pragma would be analyzed. That pragma has been deprecated, and although it
-    still enables the SMTChecker for backwards compatibility, it will be removed
-    in Solidity 0.9.0. Note also that now using the pragma even in a single file
-    enables the SMTChecker for all files.
+    在 Solidity 0.8.4 之�，�用SMT检查器的默认方�是通过 ``pragma experimental SMTChecker;``
+    并且�有包� pragma 的�约�会被分�。该 pragma 已被弃用，
+    尽管它�能使SMT检查器��兼容，但它将在 Solidity 0.9.0 中被移除。
+    还�注�的是，现在�使在一个文件中使用 pragma，也会对所有文件�用SMT检查器。
 
 .. note::
 
-    The lack of warnings for a verification target represents an undisputed
-    mathematical proof of correctness, assuming no bugs in the SMTChecker and
-    the underlying solver. Keep in mind that these problems are
-    *very hard* and sometimes *impossible* to solve automatically in the
-    general case.  Therefore, several properties might not be solved or might
-    lead to false positives for large contracts. Every proven property should
-    be seen as an important achievement. For advanced users, see :ref:`SMTChecker Tuning <smtchecker_options>`
-    to learn a few options that might help proving more complex
-    properties.
+    �设SMT检查器和底层求解器中没有错误，
+    那么验�目标没有警告就代表了一个无�争议的正确性数学�明。
+    请记�，这些问题在一般情况下是 *很难* 的，有时是 *��能* 自动解决的。
+    因此，有几个属性�能无法解决，或者�能导致大型�约的�阳性。
+    �一个被�明的属性都应该被看作是一个��的�就。
+    对于高级用户，请�阅 :ref:`SMT检查器 调优 <smtchecker_options>`
+    �了解一些�能有助于�明更��属性的选项。
 
 ********
-Tutorial
+教程
 ********
 
-Overflow
+溢出
 ========
 
 .. code-block:: solidity
@@ -95,12 +84,20 @@ Overflow
         }
     }
 
+<<<<<<< HEAD
+上�的�约显示了一个溢出检查的例�。
+对于 Solidity >=0.8.7，SMT检查器默认�检查下溢和溢出，
+所以我们需�使用命令行选项 ``--model-checker-targets "underflow,overflow"``
+或者JSON选项 ``settings.modelChecker.targets = ["underflow", "overflow"]``。
+�� :ref:`本节的目标�置 <smtchecker_targets>`。此处，它报告如下：
+=======
 The contract above shows an overflow check example.
 The SMTChecker does not check underflow and overflow by default for Solidity >=0.8.7,
 so we need to use the command-line option ``--model-checker-targets "underflow,overflow"``
 or the JSON option ``settings.modelChecker.targets = ["underflow", "overflow"]``.
 See :ref:`this section for targets configuration<smtchecker_targets>`.
 Here, it reports the following:
+>>>>>>> english/develop
 
 .. code-block:: text
 
@@ -119,8 +116,8 @@ Here, it reports the following:
     9 |             return x_ + y_;
       |                    ^^^^^^^
 
-If we add ``require`` statements that filter out overflow cases,
-the SMTChecker proves that no overflow is reachable (by not reporting warnings):
+如果我们添加了过滤掉溢出情况的 ``require`` 语�，
+SMT检查器就会�明没有溢出是�以达到的（会通过�报告警告表现出�）。
 
 .. code-block:: solidity
 
@@ -147,18 +144,17 @@ the SMTChecker proves that no overflow is reachable (by not reporting warnings):
     }
 
 
-Assert
+断言
 ======
 
-An assertion represents an invariant in your code: a property that must be true
-*for all transactions, including all input and storage values*, otherwise there is a bug.
+断言表示代�中的一个���： *对于所有的事务，包括所有的输入和存储值*，
+一个属性必须为真，�则就会出现错误。
 
-The code below defines a function ``f`` that guarantees no overflow.
-Function ``inv`` defines the specification that ``f`` is monotonically increasing:
-for every possible pair ``(a, b)``, if ``b > a`` then ``f(b) > f(a)``.
-Since ``f`` is indeed monotonically increasing, the SMTChecker proves that our
-property is correct. You are encouraged to play with the property and the function
-definition to see what results come out!
+下�的代�定义了一个��没有溢出的函数 ``f``。
+函数 ``inv`` 定义了 ``f`` 是�调递增的规范：
+对于�个�能的数值对 ``(a, b)``，如果 ``b > a``，那么 ``f(b) > f(a)``。
+由于 ``f`` 确实是�调增长的，SMT检查器�明了我们的属性是正确的。
+我们鼓励您试试这个属性和函数定义，看看会有什么样的结果!
 
 .. code-block:: solidity
 
@@ -177,10 +173,9 @@ definition to see what results come out!
         }
     }
 
-We can also add assertions inside loops to verify more complicated properties.
-The following code searches for the maximum element of an unrestricted array of
-numbers, and asserts the property that the found element must be greater or
-equal every element in the array.
+我们还�以在循环中添加断言，以验�更多的��的属性。
+下�的代��索一个���制的数字数组的最大元素，
+并断言找到的元素必须大于或等于数组中的�个元素的属性。
 
 .. code-block:: solidity
 
@@ -201,20 +196,18 @@ equal every element in the array.
         }
     }
 
-Note that in this example the SMTChecker will automatically try to prove three properties:
+注�，在这个例�中，SMT检查器将自动�试�明三个属性：
 
-1. ``++i`` in the first loop does not overflow.
-2. ``++i`` in the second loop does not overflow.
-3. The assertion is always true.
+1. 第一个循环中的 ``++i`` �会溢出。
+2. 第二个循环中的 ``++i`` �会溢出。
+3. 该断言始终是正确的。
 
 .. note::
 
-    The properties involve loops, which makes it *much much* harder than the previous
-    examples, so beware of loops!
+    这些属性涉�到循环，这使得它比��的例� *更加* 难了，所以�当心循环的问题�
 
-All the properties are correctly proven safe. Feel free to change the
-properties and/or add restrictions on the array to see different results.
-For example, changing the code to
+所有的属性都被正确�明是安全的。
+�以��改�属性和/或在数组上添加�制，以看到��的结果。例如，将代�改为
 
 .. code-block:: solidity
 
@@ -236,7 +229,7 @@ For example, changing the code to
         }
     }
 
-gives us:
+我们得到的结果：
 
 .. code-block:: text
 
@@ -254,19 +247,17 @@ gives us:
     14 |            assert(m > a[i]);
 
 
-State Properties
+状�属性
 ================
 
-So far the examples only demonstrated the use of the SMTChecker over pure code,
-proving properties about specific operations or algorithms.
-A common type of properties in smart contracts are properties that involve the
-state of the contract. Multiple transactions might be needed to make an assertion
-fail for such a property.
+到目�为止，这些例��展示了SMT检查器在纯代�上的使用，
+�明了关于特定�作或算法的属性。
+智能�约中常�的属性类型是涉��约状�的属性。
+对于这样的属性，�能需�多个交易�使断言失效。
 
-As an example, consider a 2D grid where both axis have coordinates in the range (-2^128, 2^128 - 1).
-Let us place a robot at position (0, 0). The robot can only move diagonally, one step at a time,
-and cannot move outside the grid. The robot's state machine can be represented by the smart contract
-below.
+举一个例�，考虑一个二维网格，其中两个轴的�标都在（-2^128, 2^128 - 1）范围内。
+让我们在�置（0，0）放置一个机器人。该机器人�能在对角线上移动，一次�能走一步，
+�能在网格外移动。机器人的状�机�以用下�的智能�约�表示。
 
 .. code-block:: solidity
 
@@ -308,16 +299,13 @@ below.
         }
     }
 
-Function ``inv`` represents an invariant of the state machine that ``x + y``
-must be even.
-The SMTChecker manages to prove that regardless how many commands we give the
-robot, even if infinitely many, the invariant can *never* fail. The interested
-reader may want to prove that fact manually as well.  Hint: this invariant is
-inductive.
+函数 ``inv`` 代表状�机的一个���，� ``x + y`` 必须是�数。
+SMT检查器设法�明，无论我们给机器人多少�命令，
+�使是无�多的命令，这个���都 *�会* 失败。
+有兴趣的读者�能也想手动�明这个事实。 �示：这个���是归纳性的。
 
-We can also trick the SMTChecker into giving us a path to a certain position we
-think might be reachable.  We can add the property that (2, 4) is *not*
-reachable, by adding the following function.
+我们也�以欺骗SMT检查器，让它给我们�供一�通往�个我们认为�能是�访问的�置的路径。
+我们�以通过添加以下函数，�增加(2, 4)是 *�* �访问的属性。
 
 .. code-block:: solidity
 
@@ -325,8 +313,8 @@ reachable, by adding the following function.
         assert(!(x == 2 && y == 4));
     }
 
-This property is false, and while proving that the property is false,
-the SMTChecker tells us exactly *how* to reach (2, 4):
+这个属性是�的，在�明这个属性是�的�时，
+SMT检查器准确地告诉我们 *如何* 访问到(2, 4)。
 
 .. code-block:: text
 
@@ -351,22 +339,20 @@ the SMTChecker tells us exactly *how* to reach (2, 4):
     35 |            assert(!(x == 2 && y == 4));
        |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Note that the path above is not necessarily deterministic, as there are
-other paths that could reach (2, 4). The choice of which path is shown
-might change depending on the used solver, its version, or just randomly.
+请注�，上�的路径�一定是确定的，
+因为还有其他路径�以访问（2，4）。
+选择哪�路径�能会根�所使用的解算器，其使用版本，或者�是�机地改�。
 
-External Calls and Reentrancy
+外部调用和�入
 =============================
 
-Every external call is treated as a call to unknown code by the SMTChecker.
-The reasoning behind that is that even if the code of the called contract is
-available at compile time, there is no guarantee that the deployed contract
-will indeed be the same as the contract where the interface came from at
-compile time.
+�个外部调用都被SMT检查器视为对未知代�的调用。
+这背�的原因是，�使被调用�约的代�在编译时是�用的，
+也�能��部署的�约确实与编译时接�所在的�约相�。
 
-In some cases, it is possible to automatically infer properties over state
-variables that are still true even if the externally called code can do
-anything, including reenter the caller contract.
+在�些情况下，有�能在状���上自动推断出属性，
+�使外部调用的代��以�任何事情，包括�新进入调用者�约，
+这些属性�然是真的。
 
 .. code-block:: solidity
 
@@ -406,14 +392,18 @@ anything, including reenter the caller contract.
         }
     }
 
-The example above shows a contract that uses a mutex flag to forbid reentrancy.
-The solver is able to infer that when ``unknown.run()`` is called, the contract
-is already "locked", so it would not be possible to change the value of ``x``,
-regardless of what the unknown called code does.
+上�的例�显示了一个使用互斥标志��止�入的�约。
+解算器能够推断出，当 ``unknown.run()`` 被调用时，�约已�被 “�定�，
+所以无论未知的调用代��什么，都��能改� ``x`` 的值。
 
+<<<<<<< HEAD
+如果我们 “忘记� 在函数 ``set`` 上使用 ``mutex`` 修饰符，
+SMT检查器就能��外部调用代�的行为，从而使断言失败。
+=======
 If we "forget" to use the ``mutex`` modifier on function ``set``, the
 SMTChecker is able to synthesize the behavior of the externally called code so
 that the assertion fails:
+>>>>>>> english/develop
 
 .. code-block:: text
 
@@ -436,105 +426,97 @@ that the assertion fails:
 .. _smtchecker_options:
 
 *****************************
-SMTChecker Options and Tuning
+SMT检查器选项和调试
 *****************************
 
-Timeout
+超时
 =======
 
-The SMTChecker uses a hardcoded resource limit (``rlimit``) chosen per solver,
-which is not precisely related to time. We chose the ``rlimit`` option as the default
-because it gives more determinism guarantees than time inside the solver.
+SMT检查器使用了一个硬编�的资��制（ ``rlimit`` ），
+这个�制是根��个求解器选择的，与时间没有确切的关系。
+我们选择 ``rlimit`` 选项作为默认值，因为它比求解器内部的时间�供了更多的确定性��。
 
-This options translates roughly to "a few seconds timeout" per query. Of course many properties
-are very complex and need a lot of time to be solved, where determinism does not matter.
-If the SMTChecker does not manage to solve the contract properties with the default ``rlimit``,
-a timeout can be given in milliseconds via the CLI option ``--model-checker-timeout <time>`` or
-the JSON option ``settings.modelChecker.timeout=<time>``, where 0 means no timeout.
+这个选项大致转化为�个查询 “几秒钟超时�。
+当然，许多属性�常��，需�大�的时间�解决，而决定并���。
+如果SMT检查器�能用默认的 ``rlimit`` 选项处��约属性，
+则�以通过命令行界�（CLI）选项 ``--model-checker-timeout <time>`` 或
+JSON选项 ``settings.modelChecker.timeout=<time>`` 给出以毫秒为��的超时。
+其中0表示�超时。
 
 .. _smtchecker_targets:
 
-Verification Targets
+验�目标
 ====================
 
-The types of verification targets created by the SMTChecker can also be
-customized via the CLI option ``--model-checker-target <targets>`` or the JSON
-option ``settings.modelChecker.targets=<targets>``.
-In the CLI case, ``<targets>`` is a no-space-comma-separated list of one or
-more verification targets, and an array of one or more targets as strings in
-the JSON input.
-The keywords that represent the targets are:
-
-- Assertions: ``assert``.
-- Arithmetic underflow: ``underflow``.
-- Arithmetic overflow: ``overflow``.
-- Division by zero: ``divByZero``.
-- Trivial conditions and unreachable code: ``constantCondition``.
-- Popping an empty array: ``popEmptyArray``.
-- Out of bounds array/fixed bytes index access: ``outOfBounds``.
-- Insufficient funds for a transfer: ``balance``.
-- All of the above: ``default`` (CLI only).
-
-A common subset of targets might be, for example:
-``--model-checker-targets assert,overflow``.
-
-All targets are checked by default, except underflow and overflow for Solidity >=0.8.7.
-
-There is no precise heuristic on how and when to split verification targets,
-but it can be useful especially when dealing with large contracts.
-
-Proved Targets
-==============
+SMT检查器创建的验�目标的类型也�以通过命令行界�选项 ``--model-checker-target <targets>``
+或JSON选项 ``settings.modelChecker.targets=<targets>`` �定制。
+在命令行界�情况下， ``<targets>`` 是一个没有空格的逗�分隔的一个或多个验�目标的列表，
+在JSON输入中是一个或多个作为字符串的目标数组。
+代表目标的关键�是：
 
-If there are any proved targets, the SMTChecker issues one warning per engine stating
-how many targets were proved. If the user wishes to see all the specific
-proved targets, the CLI option ``--model-checker-show-proved`` and
-the JSON option ``settings.modelChecker.showProved = true`` can be used.
+- 断言： ``assert``。
+- 算术下溢： ``underflow``。
+- 算术溢出： ``overflow``。
+- 除以零： ``divByZero``。
+- 无用的�件和无法访问的代�： ``constantCondition``。
+- 弹出一个空数组： ``popEmptyArray``。
+- 越界的数组/固定字节索引访问： ``outOfBounds``。
+- 转账资金�足： ``balance``。
+- 以上都是： ``default`` （仅适用命令行界�）。
 
-Unproved Targets
-================
+一个常�的目标�集�能是，例如： ``--model-checker-targets assert,overflow``。
 
-If there are any unproved targets, the SMTChecker issues one warning stating
-how many unproved targets there are. If the user wishes to see all the specific
-unproved targets, the CLI option ``--model-checker-show-unproved`` and
-the JSON option ``settings.modelChecker.showUnproved = true`` can be used.
+所有目标都被默认检查，除了Solidity >=0.8.7的下溢和溢出。
 
-Unsupported Language Features
-=============================
+关于如何以�何时分割验�目标，没有精确的指导方法。
+但在处�大型�约时，它�能是有用的。
+
+验�的目标
+==============
 
-Certain Solidity language features are not completely supported by the SMT
-encoding that the SMTChecker applies, for example assembly blocks.
-The unsupported construct is abstracted via overapproximation to preserve
-soundness, meaning any properties reported safe are safe even though this
-feature is unsupported.
-However such abstraction may cause false positives when the target properties
-depend on the precise behavior of the unsupported feature.
-If the encoder encounters such cases it will by default report a generic warning
-stating how many unsupported features it has seen.
-If the user wishes to see all the specific unsupported features, the CLI option
-``--model-checker-show-unsupported`` and the JSON option
-``settings.modelChecker.showUnsupported = true`` can be used, where their default
-value is ``false``.
-
-Verified Contracts
+如果有任何已�明的目标，SMT检查器会��个引擎�出一个警告，
+说明有多少目标已�明。如果用户希望查看所有已�明的具体目标，
+�使用命令行选项 ``--model-checker-show-proved`` 和 
+JSON 选项 ``settings.modelChecker.showProved = true``。
+
+未验�的目标
+================
+
+如果有任何未验�的目标，SMT检查器会�出一个警告，
+说明有多少个未验�的目标。如果用户希望看到所有具体的未验�的目标，
+�以使用命令行界�选项 ``--model-checker-show-unproved``
+和JSON选项 ``settings.modelChecker.showUnproved = true``。
+
+�支�的语言功能
+=================
+
+SMT检查器应用的 SMT 编��完全支��些 Solidity 语言特性，
+例如汇编�。
+�支�的构造通过过度近似进行抽象以���全性，
+这�味��使�支�该特性，任何报告为安全的属性也是安全的。
+但是，当目标属性�赖于�支�特�的精确行为时，这�抽象�能会导致误报。
+如果编�器�到这�情况，默认情况下会报告一个通用警告，
+说明它看到了多少�支�的特性。
+如果用户希望查看所有特定的�支�特性，�以使用命令行界�选项
+``--model-checker-show-unsupported`` 和 JSON 选项 
+``settings.modelChecker.showUnsupported = true``，
+它们的默认值是 ``false``。
+
+已验�过的�约
 ==================
 
-By default all the deployable contracts in the given sources are analyzed separately as
-the one that will be deployed. This means that if a contract has many direct
-and indirect inheritance parents, all of them will be analyzed on their own,
-even though only the most derived will be accessed directly on the blockchain.
-This causes an unnecessary burden on the SMTChecker and the solver.  To aid
-cases like this, users can specify which contracts should be analyzed as the
-deployed one. The parent contracts are of course still analyzed, but only in
-the context of the most derived contract, reducing the complexity of the
-encoding and generated queries. Note that abstract contracts are by default
-not analyzed as the most derived by the SMTChecker.
-
-The chosen contracts can be given via a comma-separated list (whitespace is not
-allowed) of <source>:<contract> pairs in the CLI:
-``--model-checker-contracts "<source1.sol:contract1>,<source2.sol:contract2>,<source2.sol:contract3>"``,
-and via the object ``settings.modelChecker.contracts`` in the :ref:`JSON input<compiler-api>`,
-which has the following form:
+默认情况下，给定��中的所有�部署�约都会被�独分�，正如将被部署的那一个�约一样。
+这�味�，如果一个�约有许多直接和间接的继承父类，所有这些都将被�独分�，
+尽管�有最终派生的�约�以在区�链上被直接访问。
+这给SMT检查器和求解器造�了�必�的负担。
+为了帮助缓解这样的情况，用户�以指定哪些�约应该作为部署的�约进行分�。
+当然，基类�约�然被分�，但�是在分�最终派生的�约的情况下�进行，
+这�以�少编�和生�查询的��性。
+请注�，抽象�约在默认情况下�会被SMT检查器分�为最终派生的�约。
+
+选择的�约�以通过命令行界�，用 <source>:<contract> 形�的键值对，以逗�分隔的列表（��许有空格）给出：
+``--model-checker-contracts "<source1.sol:contract1>,<source2.sol:contract2>,<source2.sol:contract3>"``，
+以�通过 :ref:`JSON 输入<compiler-api>` 中的对象 ``settings.modelChecker.contracts``，它有如下格�：
 
 .. code-block:: json
 
@@ -543,12 +525,11 @@ which has the following form:
         "source2.sol": ["contract2", "contract3"]
     }
 
-Trusted External Calls
-======================
+�信的外部调用
+===============
 
-By default, the SMTChecker does not assume that compile-time available code
-is the same as the runtime code for external calls. Take the following contracts
-as an example:
+默认情况下，SMT检查器�会�定编译时�用代�与外部调用的�行时代�相�。
+以下�的�约为例：
 
 .. code-block:: solidity
 
@@ -566,28 +547,25 @@ as an example:
         }
     }
 
-When ``MyContract.callExt`` is called, an address is given as the argument.
-At deployment time, we cannot know for sure that address ``_e`` actually
-contains a deployment of contract ``Ext``.
-Therefore, the SMTChecker will warn that the assertion above can be violated,
-which is true, if ``_e`` contains another contract than ``Ext``.
-
-However, it can be useful to treat these external calls as trusted, for example,
-to test that different implementations of an interface conform to the same property.
-This means assuming that address ``_e`` indeed was deployed as contract ``Ext``.
-This mode can be enabled via the CLI option ``--model-checker-ext-calls=trusted``
-or the JSON field ``settings.modelChecker.extCalls: "trusted"``.
-
-Please be aware that enabling this mode can make the SMTChecker analysis much more
-computationally costly.
-
-An important part of this mode is that it is applied to contract types and high
-level external calls to contracts, and not low level calls such as ``call`` and
-``delegatecall``. The storage of an address is stored per contract type, and
-the SMTChecker assumes that an externally called contract has the type of the
-caller expression.  Therefore, casting an ``address`` or a contract to
-different contract types will yield different storage values and can give
-unsound results if the assumptions are inconsistent, such as the example below:
+当调用 ``MyContract.callExt`` 时，�数是一个地�。
+在部署时，我们无法确定地� ``_e`` 是�确实包��约 ``Ext`` 的部署。
+因此，如果 ``_e`` 包�除 ``Ext`` 以外的其他�约，
+SMT检查器就会�出警告，称上述断言�能被��。
+
+�过，将这些外部调用视为�信调用�能很有用，例如，
+�以测试接�的��实现是�符�约相�属性。
+这�味��设地� ``_e`` 确实是作为�约 ``Ext`` 部署的。
+这�模��以通过命令行界�选项 ``--model-checker-ext-calls=trusted`` 
+或 JSON 字段 ``settings.modelChecker.extCalls： "trusted"`` ��用。
+
+请注�，�用该模�会使SMT检查器分�的计算�本大大增加。
+
+该模�的一个��部分是，它适用于�约类型和对�约的高级外部调用，
+而�是诸如 ``call`` 和 ``delegatecall`` 之类的低级调用。
+地�的存储是按�约类型存储的，
+SMT检查器�定外部调用的�约具有调用者表达�的类型。
+因此，将 ``address`` 或�约转�为��的�约类型会产生��的存储值，
+如果�设�一致，�能会产生�正确的结果，例如下�的示例：
 
 .. code-block:: solidity
 
@@ -610,31 +588,29 @@ unsound results if the assumptions are inconsistent, such as the example below:
         function f() public {
             address d = address(new D(42));
 
-            // `d` was deployed as `D`, so its `x` should be 42 now.
-            assert(D(d).x() == 42); // should hold
-            assert(D(d).x() == 43); // should fail
+            // `d` 是被部署的�约 `D`，因此其 `x` 现在应为 42。
+            assert(D(d).x() == 42); // 应该�立
+            assert(D(d).x() == 43); // 应该��立
 
-            // E and D have the same interface, so the following
-            // call would also work at runtime.
-            // However, the change to `E(d)` is not reflected in `D(d)`.
+            // �约 E 和 �约 D 具有相�的接�，因此
+            // 下�的调用在�行时也会有效。
+            // 然而，`E(d)` 的�化并没有�映在 `D(d)` 中。
             E(d).setX(1024);
 
-            // Reading from `D(d)` now will show old values.
-            // The assertion below should fail at runtime,
-            // but succeeds in this mode's analysis (unsound).
+            // 现在从 `D(d)` 读�将显示旧值。
+            // 下�的断言本应在�行时失败，
+            // 但在此模�的分�中��功了（��全）。
             assert(D(d).x() == 42);
-            // The assertion below should succeed at runtime,
-            // but fails in this mode's analysis (false positive).
+            // 下�的断言在�行时应该�功，
+            // 但在此模�的分�中�失败了（�阳性）。
             assert(D(d).x() == 1024);
         }
     }
 
-Due to the above, make sure that the trusted external calls to a certain
-variable of ``address`` or ``contract`` type always have the same caller
-expression type.
+由于上述原因，请确�对�个 ``address`` 或 ``contract`` 类型��的
+�信外部调用始终具有相�的调用表达�类型。
 
-It is also helpful to cast the called contract's variable as the type of the
-most derived type in case of inheritance.
+在继承的情况下，将被调用�约的��转�为最派生类型的类型也很有帮助。
 
 .. code-block:: solidity
 
@@ -680,22 +656,17 @@ most derived type in case of inheritance.
         }
     }
 
-Note that in function ``property_transfer``, the external calls are
-performed on variable ``t``.
-
-Another caveat of this mode are calls to state variables of contract type
-outside the analyzed contract. In the code below, even though ``B`` deploys
-``A``, it is also possible for the address stored in ``B.a`` to be called by
-anyone outside of ``B`` in between transactions to ``B`` itself. To reflect the
-possible changes to ``B.a``, the encoding allows an unbounded number of calls
-to be made to ``B.a`` externally. The encoding will keep track of ``B.a``'s
-storage, therefore assertion (2) should hold. However, currently the encoding
-allows such calls to be made from ``B`` conceptually, therefore assertion (3)
-fails.  Making the encoding stronger logically is an extension of the trusted
-mode and is under development. Note that the encoding does not keep track of
-storage for ``address`` variables, therefore if ``B.a`` had type ``address``
-the encoding would assume that its storage does not change in between
-transactions to ``B``.
+请注�，在函数 ``property_transfer`` 中，外部调用是对�� ``t`` 执行的。
+
+这�模�的�一个注�事项是调用被分��约之外的�约类型的状���。
+在下�的代�中，�使 ``B`` 部署了 ``A``，存储在 ``B.a`` 中的地�也有�能在事务之间
+被 ``B`` 以外的任何人调用到 ``B`` 本身。
+为了�映 ``B.a`` �能�生的�化，编��许从外部对 ``B.a`` 进行次数��的调用。
+编�会跟踪 ``B.a`` 的存储情况，因此断言 (2) 应该�立。然而，
+目�的编��许从概念上对 ``B`` 进行这�调用，因此断言 (3) ��立。 
+使编�在逻辑上更强大是�信模�的扩展，目�正在开�中。
+请注�，编�并�跟踪 ``address`` ��的存储，因此，
+如果 ``B.a`` 的类型是 ``address``，编�会�定它的存储在到 ``B`` 的事务之间�会改�。
 
 .. code-block:: solidity
 
@@ -718,34 +689,45 @@ transactions to ``B``.
         A a;
         constructor() {
             a = new A();
-            assert(a.x() == 0); // (1) should hold
+            assert(a.x() == 0); // (1) 应该�立
         }
         function g() public view {
-            assert(a.owner() == address(this)); // (2) should hold
-            assert(a.x() == 0); // (3) should hold, but fails due to a false positive
+            assert(a.owner() == address(this)); // (2) 应该�立
+            assert(a.x() == 0); // (3) 应该�立, 但失败了，由于�阳性
         }
     }
 
-Reported Inferred Inductive Invariants
-======================================
+报告推断的归纳��
+==================
 
-For properties that were proved safe with the CHC engine,
-the SMTChecker can retrieve inductive invariants that were inferred by the Horn
-solver as part of the proof.
-Currently only two types of invariants can be reported to the user:
+对于用 CHC 引擎�明安全的属性，
+SMT检查器�以检索由 Horn 求解器推断出的归纳���，
+作为�明的一部分。
+目��能�用户报告两�类型的���：
 
-- Contract Invariants: these are properties over the contract's state variables
-  that are true before and after every possible transaction that the contract may ever run. For example, ``x >= y``, where ``x`` and ``y`` are a contract's state variables.
-- Reentrancy Properties: they represent the behavior of the contract
-  in the presence of external calls to unknown code. These properties can express a relation
-  between the value of the state variables before and after the external call, where the external call is free to do anything, including making reentrant calls to the analyzed contract. Primed variables represent the state variables' values after said external call. Example: ``lock -> x = x'``.
+- �约���：这些是�约的状���的属性，在�约�能�行的�一个�能的事务之�和之�都是真的。
+  例如， ``x >= y``，其中 ``x`` 和 ``y`` 是一个�约的状���。
+- ��入性属性：它们代表了�约在存在对未知代�的外部调用时的行为。
+  这些属性�以表达外部调用��状���的值之间的关系，
+  其中外部调用�以自由地�任何事情，包括对分�的�约进行��入调用。
+  导数��代表所述外部调用�的状���的值。例如： ``lock -> x = x'``。
 
-The user can choose the type of invariants to be reported using the CLI option ``--model-checker-invariants "contract,reentrancy"`` or as an array in the field ``settings.modelChecker.invariants`` in the :ref:`JSON input<compiler-api>`.
-By default the SMTChecker does not report invariants.
+用户�以使用命令行界�选项 ``--model-checker-invariants "contract,reentrancy"`` �选择�报告的���类型，
+或者在 :ref:`JSON 输入<compiler-api>` 中的字段 ``settings.modelChecker.invariants`` 中作为数组。
+默认情况下，SMT检查器�报告���。
 
-Division and Modulo With Slack Variables
+有�弛��的除法和模数�算
 ========================================
 
+<<<<<<< HEAD
+Spacer是SMT检查器使用的默认Horn求解器，它通常�喜欢Horn规则中的除法和模数�作。
+正因为如此，默认情况下，Solidity的除法和模�算是用约��件 ``a = b * d + m`` �编�的，
+其中 ``d = a / b`` 和 ``m = a % b``。
+然而，对于其他求解器，如Eldarica，更喜欢语法上的精确�作。
+命令行标志 ``--model-checker-div-mod-no-slacks`` 和
+JSON选项 ``settings.modelChecker.divModNoSlacks`` �以用�切�编�，
+这�决于所用求解器的�好。
+=======
 Spacer, the default Horn solver used by the SMTChecker, often dislikes division
 and modulo operations inside Horn rules. Because of that, by default the
 Solidity division and modulo operations are encoded using the constraint
@@ -754,162 +736,179 @@ However, other solvers, such as Eldarica, prefer the syntactically precise opera
 The command-line flag ``--model-checker-div-mod-no-slacks`` and the JSON option
 ``settings.modelChecker.divModNoSlacks`` can be used to toggle the encoding
 depending on the used solver preferences.
+>>>>>>> english/develop
 
-Natspec Function Abstraction
+Natspec标签函数抽象化
 ============================
 
-Certain functions including common math methods such as ``pow``
-and ``sqrt`` may be too complex to be analyzed in a fully automated way.
-These functions can be annotated with Natspec tags that indicate to the
-SMTChecker that these functions should be abstracted. This means that the
-body of the function is not used, and when called, the function will:
+�些函数包括常�的数学方法，如 ``pow`` 和 ``sqrt``，
+�能它们过于��，无法用完全自动化的方�进行分�。
+这些函数�以用Natspec标签进行注释，�SMT检查器表明这些函数应该被抽象化。
+这�味�在调用此函数时，�会使用函数的主体，函数将：
 
-- Return a nondeterministic value, and either keep the state variables unchanged if the abstracted function is view/pure, or also set the state variables to nondeterministic values otherwise. This can be used via the annotation ``/// @custom:smtchecker abstract-function-nondet``.
-- Act as an uninterpreted function. This means that the semantics of the function (given by the body) are ignored, and the only property this function has is that given the same input it guarantees the same output. This is currently under development and will be available via the annotation ``/// @custom:smtchecker abstract-function-uf``.
+- 返回一个�决定性的值，如果抽象函数是 view/pure 类型的，则��状�����，
+  �则会将状���设置为�决定性的值。
+  �以通过注解 ``//@custom:smtchecker abstract-function-nondet`` �使用。
+- 作为一个未被解释的函数。这�味�函数的语义（由主体给出）会被忽略，
+  这个函数的唯一属性是，给定相�的输入，它��有相�的输出。
+  这一点目�正在开�中，并将通过注解 ``//@custom:smtchecker abstract-function-uf`` �使用。
 
 .. _smtchecker_engines:
 
-Model Checking Engines
+模型检查引擎
 ======================
 
-The SMTChecker module implements two different reasoning engines, a Bounded
-Model Checker (BMC) and a system of Constrained Horn Clauses (CHC).  Both
-engines are currently under development, and have different characteristics.
-The engines are independent and every property warning states from which engine
-it came. Note that all the examples above with counterexamples were
-reported by CHC, the more powerful engine.
+SMT检查器模�实现了两个��的推�引擎，一个是有界模型检查器（Bounded Model Checker， BMC），
+一个是约�角�款（Constrained Horn Clauses， CHC）系统。
+这两个引擎目�都在开�中，并且有��的特点。
+这两个引擎是独立的，�一个属性警告都说明它�自哪个引擎。
+请注�，上�所有带有�例的例�都是由CHC这个更强大的引擎报告的。
 
-By default both engines are used, where CHC runs first, and every property that
-was not proven is passed over to BMC. You can choose a specific engine via the CLI
-option ``--model-checker-engine {all,bmc,chc,none}`` or the JSON option
-``settings.modelChecker.engine={all,bmc,chc,none}``.
+默认情况下，两个引擎都会被使用，其中首先�行CHC，
+�一个没有被�明的属性都被传递给BMC。
+您�以通过命令行界�选项 ``--model-checker-engine {all,bmc,chc,none}`` 或
+JSON选项 ``settings.modelChecker.engine {all,bmc,chc,none}`` �选择一个特定的引擎。
 
-Bounded Model Checker (BMC)
+有界模型检查器 （BMC）
 ---------------------------
 
-The BMC engine analyzes functions in isolation, that is, it does not take the
-overall behavior of the contract over multiple transactions into account when
-analyzing each function.  Loops are also ignored in this engine at the moment.
-Internal function calls are inlined as long as they are not recursive, directly
-or indirectly. External function calls are inlined if possible. Knowledge
-that is potentially affected by reentrancy is erased.
+BMC引擎�独地分�函数，也就是说，它在分��个函数时�会考虑�约在多个交易中的整体行为。
+目�在这个引擎中循环也会被忽略了。
+���是直接或间接的递归，内部函数调用是内�的。
+如果�能的�，外部函数调用是内�的。
+有�能��入影�的�论在此被忽略。
 
-The characteristics above make BMC prone to reporting false positives,
-but it is also lightweight and should be able to quickly find small local bugs.
+上述特点使BMC容易报告�阳性，
+但它也是轻�级的，应该能够快速找到�的局部bug。
 
-Constrained Horn Clauses (CHC)
-------------------------------
+�约�的角�款（Constrained Horn Clauses， CHC）
+------------------------------------------------
 
-A contract's Control Flow Graph (CFG) is modelled as a system of
-Horn clauses, where the life cycle of the contract is represented by a loop
-that can visit every public/external function non-deterministically. This way,
-the behavior of the entire contract over an unbounded number of transactions
-is taken into account when analyzing any function. Loops are fully supported
-by this engine. Internal function calls are supported, and external function
-calls assume the called code is unknown and can do anything.
+�约的控制�程图（CFG）被建模为一个Horn�款系统，
+其中�约的生命周期由一个�以�确定性地访问�个公共/外部函数的循环表示。
+这样，在分�任何函数时都会考虑到整个�约在无�制数�的事务中的行为。
+这个引擎完全支�循环。
+支�内部函数调用，而外部函数调用�定被调用的代�是未知的，�以�任何事情。
 
-The CHC engine is much more powerful than BMC in terms of what it can prove,
-and might require more computing resources.
+在能够�明的内容方�，CHC引擎�比BMC强大得多，但�能需�更多的计算资�。
 
-SMT and Horn solvers
+SMT和Horn求解器
 ====================
 
-The two engines detailed above use automated theorem provers as their logical
-backends.  BMC uses an SMT solver, whereas CHC uses a Horn solver. Often the
-same tool can act as both, as seen in `z3 <https://github.com/Z3Prover/z3>`_,
-which is primarily an SMT solver and makes `Spacer
-<https://spacer.bitbucket.io/>`_ available as a Horn solver, and `Eldarica
-<https://github.com/uuverifiers/eldarica>`_ which does both.
-
-The user can choose which solvers should be used, if available, via the CLI
-option ``--model-checker-solvers {all,cvc4,eld,smtlib2,z3}`` or the JSON option
-``settings.modelChecker.solvers=[smtlib2,z3]``, where:
-
-- ``cvc4`` is only available if the ``solc`` binary is compiled with it. Only BMC uses ``cvc4``.
-- ``eld`` is used via its binary which must be installed in the system. Only CHC uses ``eld``, and only if ``z3`` is not enabled.
-- ``smtlib2`` outputs SMT/Horn queries in the `smtlib2 <http://smtlib.cs.uiowa.edu/>`_ format.
-  These can be used together with the compiler's `callback mechanism <https://github.com/ethereum/solc-js>`_ so that
-  any solver binary from the system can be employed to synchronously return the results of the queries to the compiler.
-  This can be used by both BMC and CHC depending on which solvers are called.
-- ``z3`` is available
-
-  - if ``solc`` is compiled with it;
-  - if a dynamic ``z3`` library of version >=4.8.x is installed in a Linux system (from Solidity 0.7.6);
-  - statically in ``soljson.js`` (from Solidity 0.6.9), that is, the JavaScript binary of the compiler.
+上�详述的两个引擎使用自动定��明器作为其逻辑�端。
+BMC使用一个SMT求解器，而CHC使用一个Horn求解器。
+通常�一个工具�以�时充当这两�工具，如 `z3 <https://github.com/Z3Prover/z3>`_，
+它主�是一个SMT求解器，并将 `Spacer <https://spacer.bitbucket.io/>`_
+作为一个Horn求解器使用，而 `Eldarica <https://github.com/uuverifiers/eldarica>`_
+则�时�这两�工作。
+
+如果求解器�用的�，用户�以通过命令行界�选项 ``--model-checker-solvers {all,cvc4,eld,smtlib2,z3}``
+或JSON选项 ``settings.modelChecker.solvers=[smtlib2,z3]`` �选择应该使用哪个求解器，
+其中：
+
+- ``cvc4`` 仅在使用 ``solc`` 编译二进制文件时�用。并且�有BMC使用 ``cvc4``。
+- ``eld`` 是通过其二进制文件使用的，必须安装在系统中。�有CHC使用了 ``eld``，并且是在�有 ``z3`` 没有被�用的情况下。
+- ``smtlib2`` 以 `smtlib2 <http://smtlib.cs.uiowa.edu/>`_ 格�输出 SMT/Horn 查询。
+  这些�以和编译器的 `回调机制 <https://github.com/ethereum/solc-js>`_ 一起使用，
+  这样就�以采用系统中的任何求解器二进制��步返回查询的结果给编译器。
+  根�调用哪个求解器，BMC和CHC都�以使用此方法。
+- ``z3`` 是�用的情况
+
+  - 如果 ``solc`` 与它一起被编译的�；
+  - 如果Linux系统中安装了4.8.x�其以上版本的动� ``z3`` 库（从Solidity 0.7.6开始）；
+  - 在 ``soljson.js`` （从Solidity 0.6.9开始）中��的，也就是编译器的JavaScript二进制。
 
 .. note::
-  z3 version 4.8.16 broke ABI compatibility with previous versions and cannot
-  be used with solc <=0.8.13. If you are using z3 >=4.8.16 please use solc
-  >=0.8.14, and conversely, only use older z3 with older solc releases.
-  We also recommend using the latest z3 release which is what SMTChecker also does.
+  z3 4.8.16 版本破�了与以�版本的 ABI 兼容性，
+  �能与 solc <=0.8.13 版本一起使用。如果您正在使用 z3 >=4.8.16 的版本，
+  请使用 solc >=0.8.14 的版本。�之，�使用旧的z3与旧的solc版本。
+  我们也建议使用最新的z3版本，这也是SMT检查器的作用。
 
-Since both BMC and CHC use ``z3``, and ``z3`` is available in a greater variety
-of environments, including in the browser, most users will almost never need to be
-concerned about this option. More advanced users might apply this option to try
-alternative solvers on more complex problems.
+由于 BMC 和 CHC 都使用 ``z3``，而且 ``z3`` �以在更多的环境中使用，包括在�览器中，
+大多数用户几乎�需�关心这个选项。更高级的用户�能会应用这个选项，在更��的问题上�试其他求解器。
 
-Please note that certain combinations of chosen engine and solver will lead to
-the SMTChecker doing nothing, for example choosing CHC and ``cvc4``.
+请注�，所选择的引擎和求解器的�些组�将导致SMT检查器��任何事情，例如选择CHC和 ``cvc4``。
 
 *******************************
-Abstraction and False Positives
+抽象和�阳性结果
 *******************************
 
-The SMTChecker implements abstractions in an incomplete and sound way: If a bug
-is reported, it might be a false positive introduced by abstractions (due to
-erasing knowledge or using a non-precise type). If it determines that a
-verification target is safe, it is indeed safe, that is, there are no false
-negatives (unless there is a bug in the SMTChecker).
+SMT检查器以一��完整但�全的方�实现了抽象：
+如果报告了一个bug，它�能是由抽象引入的�阳性（由于删除了知识或使用了�精确类型）。
+如果它确定一个验�目标是安全的，那么它确实是安全的，也就是说，
+�存在�阴性（除�SMT检查器中存在一个bug）。
 
-If a target cannot be proven you can try to help the solver by using the tuning
-options in the previous section.
-If you are sure of a false positive, adding ``require`` statements in the code
-with more information may also give some more power to the solver.
+如果一个目标�能被�明，您�以�试通过使用上一节中的调整选项�帮助求解器。
+如果您确定是�阳性，在代�中加入有更多信�的 ``require`` 语�也�能给求解器带�一些更多的帮助。
 
-SMT Encoding and Types
+SMT的编�和类型
 ======================
 
-The SMTChecker encoding tries to be as precise as possible, mapping Solidity types
-and expressions to their closest `SMT-LIB <http://smtlib.cs.uiowa.edu/>`_
-representation, as shown in the table below.
-
-+-----------------------+--------------------------------+-----------------------------+
-|Solidity type          |SMT sort                        |Theories                     |
-+=======================+================================+=============================+
-|Boolean                |Bool                            |Bool                         |
-+-----------------------+--------------------------------+-----------------------------+
-|intN, uintN, address,  |Integer                         |LIA, NIA                     |
-|bytesN, enum, contract |                                |                             |
-+-----------------------+--------------------------------+-----------------------------+
-|array, mapping, bytes, |Tuple                           |Datatypes, Arrays, LIA       |
-|string                 |(Array elements, Integer length)|                             |
-+-----------------------+--------------------------------+-----------------------------+
-|struct                 |Tuple                           |Datatypes                    |
-+-----------------------+--------------------------------+-----------------------------+
-|other types            |Integer                         |LIA                          |
-+-----------------------+--------------------------------+-----------------------------+
-
-Types that are not yet supported are abstracted by a single 256-bit unsigned
-integer, where their unsupported operations are ignored.
-
-For more details on how the SMT encoding works internally, see the paper
-`SMT-based Verification of Solidity Smart Contracts <https://github.com/chriseth/solidity_isola/blob/master/main.pdf>`_.
-
-Function Calls
-==============
+SMT检查器编�试图尽�能精确，
+将Solidity类型和表达�映射到它们最接近的 `SMT-LIB <http://smtlib.cs.uiowa.edu/>`_ 表示法上，
+正如下表所示。
 
-In the BMC engine, function calls to the same contract (or base contracts) are
-inlined when possible, that is, when their implementation is available.  Calls
-to functions in other contracts are not inlined even if their code is
-available, since we cannot guarantee that the actual deployed code is the same.
 
-The CHC engine creates nonlinear Horn clauses that use summaries of the called
-functions to support internal function calls. External function calls are treated
-as calls to unknown code, including potential reentrant calls.
 
-Complex pure functions are abstracted by an uninterpreted function (UF) over
-the arguments.
+关于 SMT 编�内部如何工作的更多细节，请�阅论文
+`基于 SMT 的 Solidity 智能�约验� <https://github.com/chriseth/solidity_isola/blob/master/main.pdf>`_。
 
+尚�支�的类型由一个256�无符�整数抽象出�，其�支�的�作被忽略。
+
+关于SMT编�的内部工作方�的更多细节，请��论文
+`基于SMT的Solidity智能�约验� <https://github.com/leonardoalt/text/blob/master/solidity_isola_2018/main.pdf>`_。
+
+函数调用
+==============
+
+在BMC引擎中，当�能时，�当它们的实现�用时，对相��约（或基础�约）的函数调用被内�。
+对其他�约中的函数的调用�被内�，�使它们的代�是�用的，因为我们�能��实际部署的代�是相�的。
+
+CHC引擎创建了�线性的Horn选项，使用被调用函数的摘��支�内部函数调用。
+外部函数调用被视为对未知代�的调用，包括潜在的��入调用。
+
+��的纯函数是由�数上的未转译函数（UF）抽象出�的。
+
+<<<<<<< HEAD
++------------------------------------+------------------------------------------+
+|                方法                |             BMC/CHC �行方�             |
++====================================+==========================================+
+| ``assert``                         | 验�目标。                               |
++------------------------------------+------------------------------------------+
+| ``require``                        | �设。                                   |
++------------------------------------+------------------------------------------+
+| 内部调用                           | BMC: 内�函数调用。                      |
+|                                    | CHC：函数摘�。                          |
++------------------------------------+------------------------------------------+
+| 对已知代�的外部调用               | BMC: 内�函数调用或                      |
+|                                    | 抹去关于状���的记忆                   |
+|                                    | 和本地存储引用。                         |
+|                                    | CHC: �设被调用的代�是未知的。          |
+|                                    | 试图推断出在调用返回��然�立的��性。 |
++------------------------------------+------------------------------------------+
+| 存储数组的压栈和出栈               | 精确地支�                               |
+|                                    | 检查是�从一个空数组弹出。               |
++------------------------------------+------------------------------------------+
+| ABI 函数                           | 用UF函数进行抽象                         |
++------------------------------------+------------------------------------------+
+| ``addmod``, ``mulmod``             | 精确地支�                               |
++------------------------------------+------------------------------------------+
+| ``gasleft``, ``blockhash``,        | 用UF函数进行抽象                         |
+| ``keccak256``, ``ecrecover``       |                                          |
+| ``ripemd160``                      |                                          |
++------------------------------------+------------------------------------------+
+| 无执行动作的纯函数（外部或��）。 | 用UF函数进行抽象                         |
++------------------------------------+------------------------------------------+
+| 无执行动作的外部函数               | BMC：擦除状�记忆并�定结果是�确定的。  |
+|                                    | CHC：�确定的摘�。                      |
+|                                    | 试图推断出在调用返回��然�立的��性。 |
++------------------------------------+------------------------------------------+
+| transfer                           | BMC：检查�约的余�是�足够。            |
+|                                    | CHC：还�执行检查。                      |
++------------------------------------+------------------------------------------+
+| 其他调用                           | 目��支�                               |
++------------------------------------+------------------------------------------+
+=======
 +-----------------------------------+--------------------------------------+
 |Functions                          |BMC/CHC behavior                      |
 +===================================+======================================+
@@ -944,7 +943,7 @@ the arguments.
 |complex)                           |                                      |
 +-----------------------------------+--------------------------------------+
 |external functions without         |BMC: Erase state knowledge and assume |
-|implementation                     |result is nondeterminisc.             |
+|implementation                     |result is nondeterministic.           |
 |                                   |CHC: Nondeterministic summary.        |
 |                                   |Try to infer invariants that hold     |
 |                                   |after the call returns.               |
@@ -955,9 +954,9 @@ the arguments.
 +-----------------------------------+--------------------------------------+
 |others                             |Currently unsupported                 |
 +-----------------------------------+--------------------------------------+
+>>>>>>> english/develop
 
-Using abstraction means loss of precise knowledge, but in many cases it does
-not mean loss of proving power.
+使用抽象�味�失去精确的知识，但在许多情况下，这并��味�失去�明力。
 
 .. code-block:: solidity
 
@@ -982,29 +981,24 @@ not mean loss of proving power.
         }
     }
 
-In the example above, the SMTChecker is not expressive enough to actually
-compute ``ecrecover``, but by modelling the function calls as uninterpreted
-functions we know that the return value is the same when called on equivalent
-parameters. This is enough to prove that the assertion above is always true.
+在上�的例�中，SMT检查器的表达能力�足以实际计算 ``ecrecover``，
+但通过将函数调用建模为未转译的函数，我们知�在�等�数上调用时返回值是相�的。
+这就足以�明上�的断言总是正确的。
 
-Abstracting a function call with an UF can be done for functions known to be
-deterministic, and can be easily done for pure functions.  It is however
-difficult to do this with general external functions, since they might depend
-on state variables.
+对于已知是确定性的函数，�以用UF�抽象一个函数调用，
+对于纯函数也很容易�到。
+然而，对于一般的外部函数�说，这是很难�到的，
+因为它们�能�赖于状���。
 
-Reference Types and Aliasing
+引用类型和别�
 ============================
 
-Solidity implements aliasing for reference types with the same :ref:`data
-location<data-location>`.
-That means one variable may be modified through a reference to the same data
-area.
-The SMTChecker does not keep track of which references refer to the same data.
-This implies that whenever a local reference or state variable of reference
-type is assigned, all knowledge regarding variables of the same type and data
-location is erased.
-If the type is nested, the knowledge removal also includes all the prefix base
-types.
+Solidity 为具有相� :ref:`数��置 <data-location>` 的引用类型实现了别�。
+这�味��以通过对�一数�区域的引用�修改一个��。
+SMT检查器并�跟踪哪些引用是指�相�的数�。
+这�味��当分�一个局部引用或引用类型的状���时，
+所有关于相�类型和数��置的��的知识都会被抹去。
+如果类型是嵌套的，知识删除也包括所有的�缀基础类型。
 
 .. code-block:: solidity
 
@@ -1025,17 +1019,15 @@ types.
             a[0] = 2;
             c[0][0] = 2;
             b[0] = 1;
-            // Erasing knowledge about memory references should not
-            // erase knowledge about state variables.
+            // 删除关于内存引用的记忆�应该删除关于状���的记忆。
             assert(array1[0] == 42);
-            // However, an assignment to a storage reference will erase
-            // storage knowledge accordingly.
+            // 但是，对存储引用的赋值将相应地删除存储记忆。
             d[0] = 2;
-            // Fails as false positive because of the assignment above.
+            // 由于上�的分�，失败为�阳性。
             assert(array1[0] == 42);
-            // Fails because `a == b` is possible.
+            // 失败，因为 `a == b` 是�能的。
             assert(a[0] == 2);
-            // Fails because `c[i] == b` is possible.
+            // 失败，因为 `c[i] == b` 是�能的。
             assert(c[0][0] == 2);
             assert(d[0] == 2);
             assert(b[0] == 1);
@@ -1050,48 +1042,37 @@ types.
         }
     }
 
-After the assignment to ``b[0]``, we need to clear knowledge about ``a`` since
-it has the same type (``uint[]``) and data location (memory).  We also need to
-clear knowledge about ``c``, since its base type is also a ``uint[]`` located
-in memory. This implies that some ``c[i]`` could refer to the same data as
-``b`` or ``a``.
+在对 ``b[0]`` 进行赋值�，我们需�清除关于 ``a`` 的知识，
+因为它有相�的类型（ ``uint[]`` ）和数��置（内存）。
+我们还需�清除关于 ``c`` 的知识，因为它的基本类型也是一个�于内存中的 ``uint[]``。
+这�味�一些 ``c[i]`` �能与 ``b`` 或 ``a`` 指的是�一个数�。
 
-Notice that we do not clear knowledge about ``array`` and ``d`` because they
-are located in storage, even though they also have type ``uint[]``.  However,
-if ``d`` was assigned, we would need to clear knowledge about ``array`` and
-vice-versa.
+注�，我们没有清除关于 ``array`` 和 ``d`` 的知识，
+因为它们�于存储区，尽管它们也有 ``uint[]`` 类型。
+然而，如果 ``d`` 被分�，我们就需�清除关于 ``array`` 的知识，�之亦然。
 
-Contract Balance
+�约余�
 ================
 
-A contract may be deployed with funds sent to it, if ``msg.value`` > 0 in the
-deployment transaction.
-However, the contract's address may already have funds before deployment,
-which are kept by the contract.
-Therefore, the SMTChecker assumes that ``address(this).balance >= msg.value``
-in the constructor in order to be consistent with the EVM rules.
-The contract's balance may also increase without triggering any calls to the
-contract, if
+如果在部署交易中 ``msg.value`` > 0，则�约�能在部署时被��资金。
+然而，�约的地�在部署��能已�有了资金，
+这些资金由�约�存。
+因此，SMT检查器在构造函数中�定 ``address(this).balance >= msg.value``，
+以便与EVM规则一致。�约的余�也�能在�触�任何对�约的调用的情况下增加，如果
 
-- ``selfdestruct`` is executed by another contract with the analyzed contract
-  as the target of the remaining funds,
-- the contract is the coinbase (i.e., ``block.coinbase``) of some block.
+- ``selfdestruct`` 是由�一个�约执行的，被分�的�约是剩余资金的接收目标。
+- 该�约是�个区�的coinbase（� ``block.coinbase``）。
 
-To model this properly, the SMTChecker assumes that at every new transaction
-the contract's balance may grow by at least ``msg.value``.
+为了正确建模，SMT检查器�设在�一笔新的交易中，�约的余��能至少增长 ``msg.value`` 的值。
 
 **********************
-Real World Assumptions
+现实世界的�设
 **********************
 
-Some scenarios can be expressed in Solidity and the EVM, but are expected to
-never occur in practice.
-One of such cases is the length of a dynamic storage array overflowing during a
-push: If the ``push`` operation is applied to an array of length 2^256 - 1, its
-length silently overflows.
-However, this is unlikely to happen in practice, since the operations required
-to grow the array to that point would take billions of years to execute.
-Another similar assumption taken by the SMTChecker is that an address' balance
-can never overflow.
-
-A similar idea was presented in `EIP-1985 <https://eips.ethereum.org/EIPS/eip-1985>`_.
+有些情况�以在Solidity和EVM中�以表达出，但�能在实践中�会�生。
+其中一�情况是动�存储数组的长度在压栈过程中溢出：
+如果 ``push`` �作被应用于一个长度为 2^256 - 1的数组，它的长度会悄悄溢出。
+然而，这在实践中�太�能�生，因为将数组增长到这一点所需的�作需�数�亿年的时间�执行。
+SMT检查器采�的�一个类似的�设是，一个地�的余�永远�会溢出。
+
+类似的想法在 `EIP-1985 <https://eips.ethereum.org/EIPS/eip-1985>`_ 中�出过。
diff --git a/docs/solidity-by-example.rst b/docs/solidity-by-example.rst
index 4b0f3e13f291..392d35be6d5d 100644
--- a/docs/solidity-by-example.rst
+++ b/docs/solidity-by-example.rst
@@ -1,5 +1,5 @@
 ###################
-Solidity by Example
+Solidity �约示例
 ###################
 
 .. include:: examples/voting.rst
@@ -10,4 +10,4 @@ Solidity by Example
 
 .. include:: examples/micropayment.rst
 
-.. include:: examples/modular.rst
\ No newline at end of file
+.. include:: examples/modular.rst
diff --git a/docs/structure-of-a-contract.rst b/docs/structure-of-a-contract.rst
index 51d99a803602..baaa501a304d 100644
--- a/docs/structure-of-a-contract.rst
+++ b/docs/structure-of-a-contract.rst
@@ -2,27 +2,26 @@
 
 .. _contract_structure:
 
-***********************
-Structure of a Contract
-***********************
+*********
+�约结构
+*********
 
-Contracts in Solidity are similar to classes in object-oriented languages.
-Each contract can contain declarations of :ref:`structure-state-variables`, :ref:`structure-functions`,
-:ref:`structure-function-modifiers`, :ref:`structure-events`, :ref:`structure-errors`, :ref:`structure-struct-types` and :ref:`structure-enum-types`.
-Furthermore, contracts can inherit from other contracts.
+在 Solidity 中，�约类似于��对象编程语言中的类。
+�个�约中�以包� :ref:`structure-state-variables`， :ref:`structure-functions`，
+:ref:`structure-function-modifiers`， :ref:`structure-events`，
+:ref:`structure-errors`， :ref:`structure-struct-types`
+和 :ref:`structure-enum-types` 的声明，且�约�以从其他�约继承。
 
-There are also special kinds of contracts called :ref:`libraries<libraries>` and :ref:`interfaces<interfaces>`.
+还有一些特殊�类的��，�� :ref:`库�约 <libraries>` 和 :ref:`接��约 <interfaces>`。
 
-The section about :ref:`contracts<contracts>` contains more details than this section,
-which serves to provide a quick overview.
+在关于 :ref:`�约 <contracts>` 的部分包�比本节更多的细节，它的作用是�供一个快速的概述。
 
 .. _structure-state-variables:
 
-State Variables
-===============
+状���
+==========
 
-State variables are variables whose values are permanently stored in contract
-storage.
+状���是指其值被永久地存储在�约存储中的��。
 
 .. code-block:: solidity
 
@@ -30,22 +29,20 @@ storage.
     pragma solidity >=0.4.0 <0.9.0;
 
     contract SimpleStorage {
-        uint storedData; // State variable
+        uint storedData; // 状���
         // ...
     }
 
-See the :ref:`types` section for valid state variable types and
-:ref:`visibility-and-getters` for possible choices for
-visibility.
+有效的状���类型请�阅 :ref:`types` 章节，
+对状�����性的�能选择请�阅 :ref:`visibility-and-getters`。
 
 .. _structure-functions:
 
-Functions
-=========
+函数
+======
 
-Functions are the executable units of code. Functions are usually
-defined inside a contract, but they can also be defined outside of
-contracts.
+函数是代�的�执行��。
+通常在�约内定义函数，但它们也�以被定义在�约之外。
 
 .. code-block:: solidity
 
@@ -53,33 +50,30 @@ contracts.
     pragma solidity >=0.7.1 <0.9.0;
 
     contract SimpleAuction {
-        function bid() public payable { // Function
+        function bid() public payable { // 函数
             // ...
         }
     }
 
-    // Helper function defined outside of a contract
+    // 定义在�约之外的辅助函数
     function helper(uint x) pure returns (uint) {
         return x * 2;
     }
 
-:ref:`function-calls` can happen internally or externally
-and have different levels of :ref:`visibility<visibility-and-getters>`
-towards other contracts. :ref:`Functions<functions>` accept :ref:`parameters and return variables<function-parameters-return-variables>` to pass parameters
-and values between them.
+:ref:`function-calls` �以�生在内部或外部，
+并且对其他�约有��程度的 :ref:`��性 <visibility-and-getters>`。
+:ref:`函数 <functions>` 接��数并返回��，以便在它们之间传递�数和值。
 
 .. _structure-function-modifiers:
 
-Function Modifiers
-==================
+函数修饰器
+===========
 
-Function modifiers can be used to amend the semantics of functions in a declarative way
-(see :ref:`modifiers` in the contracts section).
+函数修饰器�以被用�以声明的方�修改函数的语义(��约部分的 :ref:`modifiers`)。
 
-Overloading, that is, having the same modifier name with different parameters,
-is not possible.
+�载，也就是具有�一个修饰器的�字但有��的�数，是��能的。
 
-Like functions, modifiers can be :ref:`overridden <modifier-overriding>`.
+与函数一样，修饰器也�以被 :ref:`�载 <modifier-overriding>`。
 
 .. code-block:: solidity
 
@@ -89,7 +83,7 @@ Like functions, modifiers can be :ref:`overridden <modifier-overriding>`.
     contract Purchase {
         address public seller;
 
-        modifier onlySeller() { // Modifier
+        modifier onlySeller() { // 修饰器
             require(
                 msg.sender == seller,
                 "Only seller can call this."
@@ -97,17 +91,17 @@ Like functions, modifiers can be :ref:`overridden <modifier-overriding>`.
             _;
         }
 
-        function abort() public view onlySeller { // Modifier usage
+        function abort() public view onlySeller { // 修饰器的使用
             // ...
         }
     }
 
 .. _structure-events:
 
-Events
+事件
 ======
 
-Events are convenience interfaces with the EVM logging facilities.
+事件是能方便地调用以太�虚拟机日志功能的接�。
 
 .. code-block:: solidity
 
@@ -117,33 +111,36 @@ Events are convenience interfaces with the EVM logging facilities.
     event HighestBidIncreased(address bidder, uint amount); // Event
 
     contract SimpleAuction {
+<<<<<<< HEAD
+        event HighestBidIncreased(address bidder, uint amount); // 事件
+
+=======
+>>>>>>> english/develop
         function bid() public payable {
             // ...
-            emit HighestBidIncreased(msg.sender, msg.value); // Triggering event
+            emit HighestBidIncreased(msg.sender, msg.value); // 触�事件
         }
     }
 
-See :ref:`events` in contracts section for information on how events are declared
-and can be used from within a dapp.
+有关如何声明事件和如何在 dapp 中使用事件的信�，�阅�约章节中的 :ref:`events`。
 
 .. _structure-errors:
 
-Errors
+错误
 ======
 
-Errors allow you to define descriptive names and data for failure situations.
-Errors can be used in :ref:`revert statements <revert-statement>`.
-In comparison to string descriptions, errors are much cheaper and allow you
-to encode additional data. You can use NatSpec to describe the error to
-the user.
+错误(类型)�许您为失败情况定义�述性的�称和数�。
+错误(类型)�以在 :ref:`回滚声明 <revert-statement>` 中使用。
+与字符串�述相比，错误(类型)�便宜得多，并�许您对�外的数�进行编�。
+您�以使用 NatSpec 格���用户�述错误。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.8.4;
 
-    /// Not enough funds for transfer. Requested `requested`,
-    /// but only `available` available.
+    /// 没有足够的资金用于转账。�求 `requested`。
+    /// 但�有 `available` �用。
     error NotEnoughFunds(uint requested, uint available);
 
     contract Token {
@@ -158,15 +155,14 @@ the user.
         }
     }
 
-See :ref:`errors` in the contracts section for more information.
+更多信�请�阅�约章节中的 :ref:`errors`。
 
 .. _structure-struct-types:
 
-Struct Types
-=============
+结构类型
+==========
 
-Structs are custom defined types that can group several variables (see
-:ref:`structs` in types section).
+结构类型是�以将几个��分组的自定义类型（�阅类型章节中的 :ref:`structs`）。
 
 .. code-block:: solidity
 
@@ -174,7 +170,7 @@ Structs are custom defined types that can group several variables (see
     pragma solidity >=0.4.0 <0.9.0;
 
     contract Ballot {
-        struct Voter { // Struct
+        struct Voter { // 结构
             uint weight;
             bool voted;
             address delegate;
@@ -184,11 +180,10 @@ Structs are custom defined types that can group several variables (see
 
 .. _structure-enum-types:
 
-Enum Types
+枚举类型
 ==========
 
-Enums can be used to create custom types with a finite set of 'constant values' (see
-:ref:`enums` in types section).
+枚举�用�创建由一定数�的'常�值'构�的自定义类型（�阅类型章节中的 :ref:`enums`）。
 
 .. code-block:: solidity
 
@@ -196,5 +191,5 @@ Enums can be used to create custom types with a finite set of 'constant values'
     pragma solidity >=0.4.0 <0.9.0;
 
     contract Purchase {
-        enum State { Created, Locked, Inactive } // Enum
+        enum State { Created, Locked, Inactive } // 枚举
     }
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 427ede5ee3da..1acc7880b69d 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1,59 +1,63 @@
 .. index:: style, coding style
 
 #############
-Style Guide
+风格指�
 #############
 
 ************
-Introduction
+概述
 ************
 
-This guide is intended to provide coding conventions for writing Solidity code.
-This guide should be thought of as an evolving document that will change over
-time as useful conventions are found and old conventions are rendered obsolete.
+本指�旨在为编写 Solidity 代��供编�规范。
+这个指�应该被认为是一个�断�展的文件，��有用的约定被�现和旧的约定被淘汰，它将��时间而改�。
 
-Many projects will implement their own style guides.  In the event of
-conflicts, project specific style guides take precedence.
+许多项目会实施他们自己的编�风格指�。如�冲�，应优先使用具体项目的风格指�。
 
-The structure and many of the recommendations within this style guide were
-taken from Python's
-`pep8 style guide <https://peps.python.org/pep-0008/>`_.
+本风格指�中的结构和许多建议是�自 Python 的
+`pep8 风格指� <https://peps.python.org/pep-0008/>`_ 。
 
-The goal of this guide is *not* to be the right way or the best way to write
-Solidity code.  The goal of this guide is *consistency*.  A quote from Python's
-`pep8 <https://peps.python.org/pep-0008/#a-foolish-consistency-is-the-hobgoblin-of-little-minds>`_
-captures this concept well.
+本指�并 *�是* 以指导正确或最佳的 solidity 编�方�为目的。
+本指�的目的是��代�的 *一致性* 。
+�自 Python 的�考文档 `pep8 <https://peps.python.org/pep-0008/#a-foolish-consistency-is-the-hobgoblin-of-little-minds>`_，
+很好地�述了这个概念。
 
 .. note::
 
+<<<<<<< HEAD
+    风格指�是关于一致性的。��的是与此风格指���一致，但项目中的一致性更��。
+    一个模�或功能内的一致性是最��的。
+=======
     A style guide is about consistency. Consistency with this style guide is important. Consistency within a project is more important. Consistency within one module or function is most important.
 
     But most importantly: **know when to be inconsistent** -- sometimes the style guide just doesn't apply. When in doubt, use your best judgment. Look at other examples and decide what looks best. And do not hesitate to ask!
+>>>>>>> english/develop
 
+    但最��的是：**知�什么时候�一致** —— 有时风格指��适用。如有疑问，请自行判断。
+    看看其他例�，并决定什么看起�最好，并应毫�犹豫地询问他人�
 
 ***********
-Code Layout
+代�结构
 ***********
 
 
-Indentation
+缩进
 ===========
 
-Use 4 spaces per indentation level.
+�个缩进级别使用4个空格。
 
-Tabs or Spaces
+制表符或空格
 ==============
 
-Spaces are the preferred indentation method.
+空格是首选的缩进方法。
 
-Mixing tabs and spaces should be avoided.
+应该��混�使用制表符和空格。
 
-Blank Lines
+空行
 ===========
 
-Surround top level declarations in Solidity source with two blank lines.
+在 solidity ��中�约声明之间留出两个空行。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -74,7 +78,7 @@ Yes:
         // ...
     }
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -92,11 +96,11 @@ No:
         // ...
     }
 
-Within a contract surround function declarations with a single blank line.
+在一个�约中的函数声明之间留有一个空行。
 
-Blank lines may be omitted between groups of related one-liners (such as stub functions for an abstract contract)
+在相关�的�组�行语�之间�以�略空行。（例如抽象�约的 stub 函数）。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -119,7 +123,7 @@ Yes:
         }
     }
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -143,21 +147,21 @@ No:
 
 .. _maximum_line_length:
 
-Maximum Line Length
+代�行的最大长度
 ===================
 
-Maximum suggested line length is 120 characters.
+最大建议行长度为120个字符。
 
-Wrapped lines should conform to the following guidelines.
+折行时应该�从以下指引。
 
-1. The first argument should not be attached to the opening parenthesis.
-2. One, and only one, indent should be used.
-3. Each argument should fall on its own line.
-4. The terminating element, :code:`);`, should be placed on the final line by itself.
+1. 第一个�数�应该紧跟在左括��边
+2. 用一个，且�用一个缩进
+3. �个函数应该�起一行
+4. 结�符� :code:`);` 应该�独放在最�一行
 
-Function Calls
+函数调用
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -167,7 +171,7 @@ Yes:
         longArgument3
     );
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -197,9 +201,9 @@ No:
         longArgument2,
         longArgument3);
 
-Assignment Statements
+赋值语�
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -210,7 +214,7 @@ Yes:
         argument4
     );
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -219,9 +223,9 @@ No:
                                                                        argument3,
                                                                        argument4);
 
-Event Definitions and Event Emitters
+事件定义和事件�生
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -241,7 +245,7 @@ Yes:
         options
     );
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -257,17 +261,17 @@ No:
                       amount,
                       options);
 
-Source File Encoding
+�文件编�格�
 ====================
 
-UTF-8 or ASCII encoding is preferred.
+首选 UTF-8 或 ASCII 编�。
 
-Imports
-=======
+Imports 规范
+==============
 
-Import statements should always be placed at the top of the file.
+Import 语�应始终放在文件的顶部。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -285,7 +289,7 @@ Yes:
         // ...
     }
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -304,24 +308,24 @@ No:
         // ...
     }
 
-Order of Functions
+函数顺�
 ==================
 
-Ordering helps readers identify which functions they can call and to find the constructor and fallback definitions easier.
+排�有助于读者识别他们�以调用哪些函数，并更容易地找到构造函数和 fallback 函数的定义。
 
-Functions should be grouped according to their visibility and ordered:
+函数应根�其��性和顺�进行分组：
 
-- constructor
-- receive function (if exists)
-- fallback function (if exists)
-- external
-- public
-- internal
-- private
+- 构造函数
+- receive 函数（如果存在）
+- fallback 函数（如果存在）
+- 外部函数
+- 公共函数
+- 内部函数
+- �有函数
 
-Within a grouping, place the ``view`` and ``pure`` functions last.
+在一个分组中，把 ``view`` 和 ``pure`` 函数放在最�。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -340,26 +344,26 @@ Yes:
             // ...
         }
 
-        // External functions
+        // 外部函数
         // ...
 
-        // External functions that are view
+        // 是 view 修饰的外部函数
         // ...
 
-        // External functions that are pure
+        // 是 pure 修饰的外部函数
         // ...
 
-        // Public functions
+        // 公共函数
         // ...
 
-        // Internal functions
+        // 内部函数
         // ...
 
-        // Private functions
+        // �有函数
         // ...
     }
 
-No:
+错误写法：
 
 .. code-block:: solidity
 
@@ -367,7 +371,7 @@ No:
     pragma solidity >=0.7.0 <0.9.0;
     contract A {
 
-        // External functions
+        // 外部函数
         // ...
 
         fallback() external {
@@ -377,62 +381,62 @@ No:
             // ...
         }
 
-        // Private functions
+        // �有函数
         // ...
 
-        // Public functions
+        // 公共函数
         // ...
 
         constructor() {
             // ...
         }
 
-        // Internal functions
+        // 内部函数
         // ...
     }
 
-Whitespace in Expressions
+表达�中的空格
 =========================
 
-Avoid extraneous whitespace in the following  situations:
+在以下情况下��无关的空格：
 
-Immediately inside parenthesis, brackets or braces, with the exception of single line function declarations.
+除�行函数声明外，紧接��括�，中括�或者大括�的内容应该��使用空格。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
     spam(ham[1], Coin({name: "ham"}));
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
     spam( ham[ 1 ], Coin( { name: "ham" } ) );
 
-Exception:
+除外：
 
 .. code-block:: solidity
 
     function singleLine() public { spam(); }
 
-Immediately before a comma, semicolon:
+紧接在逗�，分�之�：
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
     function spam(uint i, Coin coin) public;
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
     function spam(uint i , Coin coin) public ;
 
-More than one space around an assignment or other operator to align with another:
+赋值或其他�作符两边多于一个的空格：
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -440,7 +444,7 @@ Yes:
     y = 2;
     longVariable = 3;
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -448,9 +452,13 @@ No:
     y            = 2;
     longVariable = 3;
 
+<<<<<<< HEAD
+在receive和fallback函数中��包�空格：
+=======
 Do not include a whitespace in the receive and fallback functions:
+>>>>>>> english/develop
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -462,7 +470,7 @@ Yes:
         ...
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -475,18 +483,16 @@ No:
     }
 
 
-Control Structures
+控制结构
 ==================
 
-The braces denoting the body of a contract, library, functions and structs
-should:
+用大括�表示一个�约，库，函数和结构。 应该为：
 
-* open on the same line as the declaration
-* close on their own line at the same indentation level as the beginning of the
-  declaration.
-* The opening brace should be preceded by a single space.
+* 开括�与声明应在�一行。
+* 闭括�在与之�函数声明对应的开括����一缩进级别上�起一行。
+* 开括��应该有一个空格。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -500,7 +506,7 @@ Yes:
         }
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -515,15 +521,13 @@ No:
         }
     }
 
-The same recommendations apply to the control structures ``if``, ``else``, ``while``,
-and ``for``.
+对于控制结构  ``if``， ``else``， ``while``， 和 ``for`` 的实施建议与以上相�。
 
-Additionally there should be a single space between the control structures
-``if``, ``while``, and ``for`` and the parenthetic block representing the
-conditional, as well as a single space between the conditional parenthetic
-block and the opening brace.
+�外，诸如 ``if``， ``else``， ``while``， 和 ``for`` 这类的控制结构
+和�件表达�的�之间应该有一个�独的空格，
+�样的，�件表达�的�和开括�之间也应该有一个空格。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -535,7 +539,7 @@ Yes:
         ...
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -550,17 +554,16 @@ No:
     for (...) {
         ...;}
 
-For control structures whose body contains a single statement, omitting the
-braces is ok *if* the statement is contained on a single line.
+对于控制结构， *如果* 其主体内容�包�一行，则�以�略括�。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
     if (x < 10)
         x += 1;
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -570,11 +573,11 @@ No:
             value: 42
         }));
 
-For ``if`` blocks which have an ``else`` or ``else if`` clause, the ``else`` should be
-placed on the same line as the ``if``'s closing brace. This is an exception compared
-to the rules of other block-like structures.
+对于具有 ``else`` 或 ``else if`` ��的 ``if`` �，
+``else`` 应该是与 ``if`` 的闭大括�放在�一行上。
+这一规则区别于其他�状结构。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -592,7 +595,7 @@ Yes:
     else
         x -= 1;
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -603,18 +606,16 @@ No:
         x -= 1;
     }
 
-Function Declaration
+函数声明
 ====================
 
-For short function declarations, it is recommended for the opening brace of the
-function body to be kept on the same line as the function declaration.
+对于简短的函数声明，建议函数体的开括�与函数声明��在�一行。
 
-The closing brace should be at the same indentation level as the function
-declaration.
+闭大括�应该与函数声明的缩进级别相�。
 
-The opening brace should be preceded by a single space.
+开大括�之�应该有一个空格。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -626,7 +627,7 @@ Yes:
         return x + 1;
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -646,15 +647,15 @@ No:
     function increment(uint x) public pure returns (uint) {
         return x + 1;}
 
-The modifier order for a function should be:
+一个函数的修饰符顺�应该是：
 
-1. Visibility
-2. Mutability
-3. Virtual
-4. Override
-5. Custom modifiers
+1. ��性
+2. ��性
+3. 虚拟性
+4. 覆盖性
+5. 自定义修饰符
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -662,11 +663,16 @@ Yes:
         return balanceOf[from];
     }
 
-    function shutdown() public onlyOwner {
-        selfdestruct(owner);
+    function increment(uint x) public onlyOwner pure returns (uint) {
+        return x + 1;
     }
 
+<<<<<<< HEAD
+错误写法:
+=======
+
 No:
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
@@ -674,16 +680,14 @@ No:
         return balanceOf[from];
     }
 
-    function shutdown() onlyOwner public {
-        selfdestruct(owner);
+    function increment(uint x) onlyOwner public pure returns (uint) {
+        return x + 1;
     }
 
-For long function declarations, it is recommended to drop each argument onto
-its own line at the same indentation level as the function body.  The closing
-parenthesis and opening bracket should be placed on their own line as well at
-the same indentation level as the function declaration.
+对于长的函数声明，建议将�个�数放在自己的行中，与函数主体的缩进程度相�。
+闭�括�和开括�也应该放在自己的行中，与函数声明的缩进程度相�。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -700,7 +704,7 @@ Yes:
         doSomething();
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -728,10 +732,9 @@ No:
         doSomething();
     }
 
-If a long function declaration has modifiers, then each modifier should be
-dropped to its own line.
+如果一个长函数声明有修饰符，那么�个修饰符都应该被丢到独立的一行。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -757,7 +760,7 @@ Yes:
         doSomething();
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -783,9 +786,9 @@ No:
         doSomething();
     }
 
-Multiline output parameters and return statements should follow the same style recommended for wrapping long lines found in the :ref:`Maximum Line Length <maximum_line_length>` section.
+多行输出�数和返回值语�应该�从 :ref:`代�行的最大长度 <maximum_line_length>` 一节的说明。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -810,7 +813,7 @@ Yes:
         );
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -831,17 +834,16 @@ No:
                 veryLongReturnArg1);
     }
 
-For constructor functions on inherited contracts whose bases require arguments,
-it is recommended to drop the base constructors onto new lines in the same
-manner as modifiers if the function declaration is long or hard to read.
+对于继承�约中需��数的构造函数，如果函数声明很长或难以阅读，
+建议将基础构造函数�多个修饰符的风格那样，�个下沉到一个新行上书写。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-    // Base contracts just to make this compile
+    // 基础�约，为了使这段代�能被编译
     contract B {
         constructor(uint) {
         }
@@ -868,19 +870,19 @@ Yes:
             C(param2, param3)
             D(param4)
         {
-            // do something with param5
+            // 用�数 param5 �一些事情
             x = param5;
         }
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
 
-    // Base contracts just to make this compile
+    // 基础�约，为了使这段代�能被编译
     contract B {
         constructor(uint) {
         }
@@ -923,26 +925,24 @@ No:
     }
 
 
-When declaring short functions with a single statement, it is permissible to do it on a single line.
+当用�个语�声明简短函数时，�许在一行中完�。
 
-Permissible:
+�许：
 
 .. code-block:: solidity
 
     function shortFunction() public { doSomething(); }
 
-These guidelines for function declarations are intended to improve readability.
-Authors should use their best judgment as this guide does not try to cover all
-possible permutations for function declarations.
+这些函数声明的准则旨在�高�读性。
+因为本指��会涵盖所有内容，作者应该自行作出最佳判断。
 
-Mappings
+映射
 ========
 
-In variable declarations, do not separate the keyword ``mapping`` from its
-type by a space. Do not separate any nested ``mapping`` keyword from its type by
-whitespace.
+在��声明中，��用空格将关键字 ``mapping`` 和其类型分开。
+��用空格分隔任何嵌套的 ``mapping`` 关键�和其类型。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -951,7 +951,7 @@ Yes:
     mapping(uint => mapping(bool => Data[])) public data;
     mapping(uint => mapping(uint => s)) data;
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -960,47 +960,46 @@ No:
     mapping (uint => mapping (bool => Data[])) public data;
     mapping(uint => mapping (uint => s)) data;
 
-Variable Declarations
+��声明
 =====================
 
-Declarations of array variables should not have a space between the type and
-the brackets.
+数组��的声明在��类型和括�之间�应该有空格。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
     uint[] x;
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
     uint [] x;
 
 
-Other Recommendations
+其他建议
 =====================
 
-* Strings should be quoted with double-quotes instead of single-quotes.
+* 字符串应该用�引�而�是�引�。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
     str = "foo";
     str = "Hamlet says, 'To be or not to be...'";
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
     str = 'bar';
     str = '"Be yourself; everyone else is already taken." -Oscar Wilde';
 
-* Surround operators with a single space on either side.
+* �作符两边应该�有一个空格。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
     :force:
@@ -1010,7 +1009,7 @@ Yes:
     x += 3 + 4;
     x |= y && z;
 
-No:
+错误写法:
 
 .. code-block:: solidity
     :force:
@@ -1020,12 +1019,11 @@ No:
     x += 3+4;
     x |= y&&z;
 
-* Operators with a higher priority than others can exclude surrounding
-  whitespace in order to denote precedence.  This is meant to allow for
-  improved readability for complex statements. You should always use the same
-  amount of whitespace on either side of an operator:
+* 为了表示优先级，高优先级�作符两边�以�略空格。
+  这样�以�高��语�的�读性。
+  您应该在�作符两边总是使用相�的空格数：
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -1033,7 +1031,7 @@ Yes:
     x = 2*y + 3*z;
     x = (a+b) * (a-b);
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -1042,9 +1040,18 @@ No:
     x +=1;
 
 ***************
-Order of Layout
+布局顺�
 ***************
 
+<<<<<<< HEAD
+按以下顺�布置�约的元素：
+
+1. Pragma 语�
+2. 导入语�
+3. 接�
+4. 库
+5. �约
+=======
 Contract elements should be laid out in the following order:
 
 1. Pragma statements
@@ -1054,22 +1061,22 @@ Contract elements should be laid out in the following order:
 5. Interfaces
 6. Libraries
 7. Contracts
+>>>>>>> english/develop
 
-Inside each contract, library or interface, use the following order:
+在�个�约，库或接�内，使用以下顺�：
 
-1. Type declarations
-2. State variables
-3. Events
-4. Errors
-5. Modifiers
-6. Functions
+1. 类型声明
+2. 状���
+3. 事件
+4. 错误
+5. 修饰符
+6. 函数
 
 .. note::
 
-    It might be clearer to declare types close to their use in events or state
-    variables.
+    在接近事件或状���的使用时，声明类型�能会更清楚。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -1081,7 +1088,7 @@ Yes:
         function divide(int256 numerator, int256 denominator) public virtual returns (uint256);
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -1095,59 +1102,59 @@ No:
 
 
 ******************
-Naming Conventions
+命�规范
 ******************
 
-Naming conventions are powerful when adopted and used broadly.  The use of
-different conventions can convey significant *meta* information that would
-otherwise not be immediately available.
+当完全采纳和使用命�规范时会产生强大的作用。
+当使用��的规范时，则�会立�获�代�中传达的�� *元* 信�。
 
-The naming recommendations given here are intended to improve the readability,
-and thus they are not rules, but rather guidelines to try and help convey the
-most information through the names of things.
+这里给出的命�建议旨在�高�读性，
+因此它们�是规则，而是�过�称��试和帮助传达最多的信�。
 
-Lastly, consistency within a codebase should always supersede any conventions
-outlined in this document.
+最�，基于代�库中的一致性，本文档中的任何规范总是�以被（代�库中的规范）�代。
 
 
-Naming Styles
+命�方�
 =============
 
-To avoid confusion, the following names will be used to refer to different
-naming styles.
+为了��混淆，下�的�字用�指明��的命�方�。
 
-* ``b`` (single lowercase letter)
-* ``B`` (single uppercase letter)
-* ``lowercase``
-* ``UPPERCASE``
-* ``UPPER_CASE_WITH_UNDERSCORES``
-* ``CapitalizedWords`` (or CapWords)
-* ``mixedCase`` (differs from CapitalizedWords by initial lowercase character!)
+* ``b`` （�个�写字�）
+* ``B`` （�个大写字�）
+* ``lowercase`` （�写）
+* ``UPPERCASE`` （大写）
+* ``UPPER_CASE_WITH_UNDERSCORES`` （大写和下划线）
+* ``CapitalizedWords`` （驼峰�，首字�大写）
+* ``mixedCase``  （混��，与驼峰�的区别在于首字��写�）
 
-.. note:: When using initialisms in CapWords, capitalize all the letters of the initialisms. Thus HTTPServerError is better than HttpServerError. When using initialisms in mixedCase, capitalize all the letters of the initialisms, except keep the first one lower case if it is the beginning of the name. Thus xmlHTTPRequest is better than XMLHTTPRequest.
+.. note::
 
+    当在驼峰�命�中使用缩写时，应该将缩写中的所有字�都大写。 因此 HTTPServerError 比 HttpServerError 好。
+    当在混��命�中使用缩写时，除了第一个缩写中的字��写（如果它是整个�称的开头的�）以外，
+    其他缩写中的字��大写。 因此 xmlHTTPRequest 比 XMLHTTPRequest 更好。
 
-Names to Avoid
+
+应��的�称
 ==============
 
-* ``l`` - Lowercase letter el
-* ``O`` - Uppercase letter oh
-* ``I`` - Uppercase letter eye
+* ``l`` - el的�写方�
+* ``O`` - oh的大写方�
+* ``I`` - eye的大写方�
 
-Never use any of these for single letter variable names.  They are often
-indistinguishable from the numerals one and zero.
+切勿将任何这些用于�个字�的���称。 他们�常难以与数字 1 和 0 区分开。
 
 
-Contract and Library Names
+�约和库�称
 ==========================
 
-* Contracts and libraries should be named using the CapWords style. Examples: ``SimpleToken``, ``SmartBank``, ``CertificateHashRepository``, ``Player``, ``Congress``, ``Owned``.
-* Contract and library names should also match their filenames.
-* If a contract file includes multiple contracts and/or libraries, then the filename should match the *core contract*. This is not recommended however if it can be avoided.
+* �约和库�称应该使用驼峰�风格。比如： ``SimpleToken``， ``SmartBank``， ``CertificateHashRepository``， ``Player``， ``Congress``， ``Owned``.。
+* �约和库的�称也应与它们的文件�相符。
+* 如果一个�约文件包括多个�约和/或库，那么文件�应该与 *核心�约* 相匹�。但是，如果�以��的�，�建议这样�。
 
-As shown in the example below, if the contract name is ``Congress`` and the library name is ``Owned``, then their associated filenames should be ``Congress.sol`` and ``Owned.sol``.
+如下�的例�所示，如果�约�称是 ``Congress``，库�称是 ``Owned``，
+那么它们的相关文件�应该是 ``Congress.sol`` 和 ``Owned.sol``。
 
-Yes:
+正确写法：
 
 .. code-block:: solidity
 
@@ -1172,7 +1179,7 @@ Yes:
         }
     }
 
-and in ``Congress.sol``:
+在 ``Congress.sol`` �约里：
 
 .. code-block:: solidity
 
@@ -1186,7 +1193,7 @@ and in ``Congress.sol``:
         //...
     }
 
-No:
+错误写法:
 
 .. code-block:: solidity
 
@@ -1211,7 +1218,7 @@ No:
         }
     }
 
-and in ``Congress.sol``:
+在 ``Congress.sol`` �约里：
 
 .. code-block:: solidity
 
@@ -1226,80 +1233,80 @@ and in ``Congress.sol``:
         //...
     }
 
-Struct Names
+结构体�称
 ==========================
 
-Structs should be named using the CapWords style. Examples: ``MyCoin``, ``Position``, ``PositionXY``.
-
+结构体�称应该使用驼峰�风格。比如： ``MyCoin``， ``Position``， ``PositionXY``。
 
-Event Names
+事件�称
 ===========
 
-Events should be named using the CapWords style. Examples: ``Deposit``, ``Transfer``, ``Approval``, ``BeforeTransfer``, ``AfterTransfer``.
+事件�称应该使用驼峰�风格。
+比如： ``Deposit``， ``Transfer``， ``Approval``， ``BeforeTransfer``， ``AfterTransfer``。
 
-
-Function Names
+函数�称
 ==============
 
-Functions should use mixedCase. Examples: ``getBalance``, ``transfer``, ``verifyOwner``, ``addMember``, ``changeOwner``.
+函数�称应该使用混��命�风格。
+比如： ``getBalance``， ``transfer``， ``verifyOwner``， ``addMember``， ``changeOwner``。
 
 
-Function Argument Names
+函数�数命�
 =======================
 
-Function arguments should use mixedCase. Examples: ``initialSupply``, ``account``, ``recipientAddress``, ``senderAddress``, ``newOwner``.
+函数�数命�应该使用混��命�风格。
+比如： ``initialSupply``， ``account``， ``recipientAddress``， ``senderAddress``， ``newOwner``。
 
-When writing library functions that operate on a custom struct, the struct
-should be the first argument and should always be named ``self``.
+在编写�作自定义结构的库函数时，
+这个结构体应该作为函数的第一个�数，并且应该始终命�为 ``self``。
 
 
-Local and State Variable Names
+局部��和状����称
 ==============================
 
-Use mixedCase. Examples: ``totalSupply``, ``remainingSupply``, ``balancesOf``, ``creatorAddress``, ``isPreSale``, ``tokenExchangeRate``.
+使用混��命�风格。
+比如： ``totalSupply``， ``remainingSupply``， ``balancesOf``， ``creatorAddress``， ``isPreSale``， ``tokenExchangeRate``。
 
 
-Constants
+常�命�
 =========
 
-Constants should be named with all capital letters with underscores separating
-words. Examples: ``MAX_BLOCKS``, ``TOKEN_NAME``, ``TOKEN_TICKER``, ``CONTRACT_VERSION``.
+常�应该全都使用大写字�书写，并用下划线分割��。
+比如： ``MAX_BLOCKS``， ``TOKEN_NAME``， ``TOKEN_TICKER``， ``CONTRACT_VERSION``。
 
 
-Modifier Names
+修饰符命�
 ==============
 
-Use mixedCase. Examples: ``onlyBy``, ``onlyAfter``, ``onlyDuringThePreSale``.
-
+使用混��命�风格。比如： ``onlyBy``， ``onlyAfter``， ``onlyDuringThePreSale``。
 
-Enums
-=====
 
-Enums, in the style of simple type declarations, should be named using the CapWords style. Examples: ``TokenGroup``, ``Frame``, ``HashStyle``, ``CharacterLocation``.
+枚举��命�
+============
 
+在声明简�类型时，枚举应该使用驼峰�风格。
+比如： ``TokenGroup``， ``Frame``， ``HashStyle``， ``CharacterLocation``。
 
-Avoiding Naming Collisions
+��命�冲�
 ==========================
 
 * ``singleTrailingUnderscore_``
 
-This convention is suggested when the desired name collides with that of
-an existing state variable, function, built-in or otherwise reserved name.
+当所需的�称与现有状���，函数，内置或其他�留关键字�称冲�时，建议使用此约定。
 
-Underscore Prefix for Non-external Functions and Variables
-==========================================================
+�外部函数和��的下划线�缀
+============================
 
 * ``_singleLeadingUnderscore``
 
-This convention is suggested for non-external functions and state variables (``private`` or ``internal``). State variables without a specified visibility are ``internal`` by default.
+建议对�外部函数和状���（ ``private`` 或 ``internal``）使用此约定。默认情况下，没有指定��性的状���是 ``internal``。
 
-When designing a smart contract, the public-facing API (functions that can be called by any account)
-is an important consideration.
-Leading underscores allow you to immediately recognize the intent of such functions,
-but more importantly, if you change a function from non-external to external (including ``public``)
-and rename it accordingly, this forces you to review every call site while renaming.
-This can be an important manual check against unintended external functions
-and a common source of security vulnerabilities (avoid find-replace-all tooling for this change).
+在设计智能�约时，��公众的API（任何账户都�以调用的函数）是一个��的考虑因素。
+�导下划线�许您立�识别此类函数的�图，
+但更��的是，如果您将函数从�外部函数更改为外部函数（包括 ``public``）
+并相应地�命�，这将迫使您在�命�时审查�个调用栈。
+这�能是针对�预期外部函数的��手动检查，
+也是安全�洞的常���（��使用查找-替�-全部工具�进行此更改）。
 
 .. _style_guide_natspec:
 
@@ -1307,38 +1314,37 @@ and a common source of security vulnerabilities (avoid find-replace-all tooling
 NatSpec
 *******
 
-Solidity contracts can also contain NatSpec comments. They are written with a
-triple slash (``///``) or a double asterisk block (``/** ... */``) and
-they should be used directly above function declarations or statements.
+Solidity�约也�以包�NatSpec注释。
+它们用三�斜线（ ``///``）或�星��（ ``/** ... */``）�写，
+它们应该直接用在函数声明或语�之上。
 
-For example, the contract from :ref:`a simple smart contract <simple-smart-contract>` with the comments
-added looks like the one below:
+例如，�自 :ref:`一个简�的智能�约 <simple-smart-contract>` 的�约在添加了注释�看起�就�下�这个：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.4.16 <0.9.0;
 
-    /// @author The Solidity Team
-    /// @title A simple storage example
+    /// @author Solidity团队
+    /// @title 一个简�的存储例�
     contract SimpleStorage {
         uint storedData;
 
-        /// Store `x`.
-        /// @param x the new value to store
-        /// @dev stores the number in the state variable `storedData`
+        /// 存储 `x`。
+        /// @param x �存储的新值
+        /// @dev 将数字存储在状��� `storedData` 中
         function set(uint x) public {
             storedData = x;
         }
 
-        /// Return the stored value.
-        /// @dev retrieves the value of the state variable `storedData`
-        /// @return the stored value
+        /// 返回存储的值。
+        /// @dev 检索状��� `storedData` 的值
+        /// @return 存储的值
         function get() public view returns (uint) {
             return storedData;
         }
     }
 
-It is recommended that Solidity contracts are fully annotated using :ref:`NatSpec <natspec>` for all public interfaces (everything in the ABI).
+建议 Solidity �约使用 :ref:`NatSpec <natspec>` 对所有公共接�（ABI 中的一切）进行完全注释。
 
-Please see the section about :ref:`NatSpec <natspec>` for a detailed explanation.
+请�阅关于 :ref:`NatSpec <natspec>` 的部分，以获得详细解释。
diff --git a/docs/types.rst b/docs/types.rst
index d929a274f202..547372aacc62 100644
--- a/docs/types.rst
+++ b/docs/types.rst
@@ -3,20 +3,20 @@
 .. _types:
 
 *****
-Types
+类型
 *****
 
-Solidity is a statically typed language, which means that the type of each
-variable (state and local) needs to be specified.
-Solidity provides several elementary types which can be combined to form complex types.
+Solidity 是一���类型语言，这�味��个��（状���和局部��）都需�被指定类型。
+Solidity �供了几�基本类型，�以用�组�出��类型。
 
-In addition, types can interact with each other in expressions containing
-operators. For a quick reference of the various operators, see :ref:`order`.
+除此之外，�个类型之间�以在包��算符�的表达�中进行交互。
+关于���算符的快速�考，�以�考 :ref:`order`。
+
+Solidity中�存在"未定义"或"空"值的概念，
+但新声明的��总是有一个�决于其类型的 :ref:`默认值 <default-value>`。
+为了处�任何�外的值，您应该使用 :ref:`revert 函数 <assert-and-require>` ���整个事务，
+或者返回一个带有第二个 ``bool`` 值的元组�表示�功。
 
-The concept of "undefined" or "null" values does not exist in Solidity, but newly
-declared variables always have a :ref:`default value<default-value>` dependent
-on its type. To handle any unexpected values, you should use the :ref:`revert function<assert-and-require>` to revert the whole transaction, or return a
-tuple with a second ``bool`` value denoting success.
 
 .. include:: types/value-types.rst
 
diff --git a/docs/types/conversion.rst b/docs/types/conversion.rst
index dafb336bd01e..2e2520ce0db0 100644
--- a/docs/types/conversion.rst
+++ b/docs/types/conversion.rst
@@ -2,35 +2,30 @@
 
 .. _types-conversion-elementary-types:
 
-Conversions between Elementary Types
-====================================
+基本类型之间的转�
+==================
 
-Implicit Conversions
---------------------
+��转�
+-----------
 
-An implicit type conversion is automatically applied by the compiler in some cases
-during assignments, when passing arguments to functions and when applying operators.
-In general, an implicit conversion between value-types is possible if it makes
-sense semantically and no information is lost.
+在�些情况下，在赋值过程中，在�函数传递�数和应用�算符时，
+编译器会自动应用��类型转�。一般�说，如果在语义上有�义，
+并且�会丢失信�，那么值-类型之间的��转�是�能的。
 
-For example, ``uint8`` is convertible to
-``uint16`` and ``int128`` to ``int256``, but ``int8`` is not convertible to ``uint256``,
-because ``uint256`` cannot hold values such as ``-1``.
+例如， ``uint8`` �以转�为 ``uint16``， ``int128`` �以转�为 ``int256``，
+但是 ``int8`` �能转�为 ``uint256``，因为 ``uint256`` �能容纳 ``-1`` 这样的值。
 
-If an operator is applied to different types, the compiler tries to implicitly
-convert one of the operands to the type of the other (the same is true for assignments).
-This means that operations are always performed in the type of one of the operands.
+如果一个�算符被应用于��的类型，
+编译器会�试将其中一个�作数��地转�为�一个的类型（对于赋值也是如此）。
+这�味��作总是以其中一个�作数的类型进行。
 
-For more details about which implicit conversions are possible,
-please consult the sections about the types themselves.
+关于哪些��转�是�能的，请�考关于类型本身的章节。
 
-In the example below, ``y`` and ``z``, the operands of the addition,
-do not have the same type, but ``uint8`` can
-be implicitly converted to ``uint16`` and not vice-versa. Because of that,
-``y`` is converted to the type of ``z`` before the addition is performed
-in the ``uint16`` type. The resulting type of the expression ``y + z`` is ``uint16``.
-Because it is assigned to a variable of type ``uint32`` another implicit conversion
-is performed after the addition.
+在下�的例�中， ``y`` 和 ``z``，�加法的�作数，没有相�的类型，
+但是 ``uint8`` �以��转�为 ``uint16``，�之则�行。正因为如此，
+``y`` 被转�为 ``z`` 的类型，然�在 ``uint16`` 类型中进行加法。
+结果表达� ``y + z`` 的类型是 ``uint16``。
+因为它被分�到一个 ``uint32`` 类型的��中，所以在加法��进行了一次��转�。
 
 .. code-block:: solidity
 
@@ -39,79 +34,81 @@ is performed after the addition.
     uint32 x = y + z;
 
 
-Explicit Conversions
---------------------
+显�转�
+---------
 
+<<<<<<< HEAD
+如果编译器��许��转�，但您确信转�会�功，
+有时�以进行显�类型转�。
+这�能会导致�想�到的行为，并使您绕过编译器的一些安全特性，
+所以一定�测试结果是�是您想�的和期望的!
+=======
 If the compiler does not allow implicit conversion but you are confident a conversion will work,
 an explicit type conversion is sometimes possible. This may
 result in unexpected behavior and allows you to bypass some security
 features of the compiler, so be sure to test that the
 result is what you want and expect!
+>>>>>>> english/develop
 
-Take the following example that converts a negative ``int`` to a ``uint``:
+以下�的例�为例，将一个负的 ``int`` 转�为 ``uint``：
 
 .. code-block:: solidity
 
     int  y = -3;
     uint x = uint(y);
 
-At the end of this code snippet, ``x`` will have the value ``0xfffff..fd`` (64 hex
-characters), which is -3 in the two's complement representation of 256 bits.
+在这个代�片断的最�， ``x`` �� ``0xfffff..fd`` 的值（64个�六进制字符），
+这在256�的二进制补�中表示是-3。
 
-If an integer is explicitly converted to a smaller type, higher-order bits are
-cut off:
+如果一个整数被明确地转�为一个较�的类型，高阶�就会被切断：
 
 .. code-block:: solidity
 
     uint32 a = 0x12345678;
-    uint16 b = uint16(a); // b will be 0x5678 now
+    uint16 b = uint16(a); // b 现在会是 0x5678
 
-If an integer is explicitly converted to a larger type, it is padded on the left (i.e., at the higher order end).
-The result of the conversion will compare equal to the original integer:
+如果一个整数被明确地转�为一个更大的类型，它将在左边被填充（�在高阶的一端）。
+转�的结果将与原整数比较相等：
 
 .. code-block:: solidity
 
     uint16 a = 0x1234;
-    uint32 b = uint32(a); // b will be 0x00001234 now
+    uint32 b = uint32(a); // b 现在会是 0x00001234
     assert(a == b);
 
-Fixed-size bytes types behave differently during conversions. They can be thought of as
-sequences of individual bytes and converting to a smaller type will cut off the
-sequence:
+固定大�的字节类型在转�过程中的行为是��的。
+它们�以被认为是�个字节的�列，转�到一个较�的类型将切断�列：
 
 .. code-block:: solidity
 
     bytes2 a = 0x1234;
-    bytes1 b = bytes1(a); // b will be 0x12
+    bytes1 b = bytes1(a); // b 现在会是 0x12
 
-If a fixed-size bytes type is explicitly converted to a larger type, it is padded on
-the right. Accessing the byte at a fixed index will result in the same value before and
-after the conversion (if the index is still in range):
+如果一个固定大�的字节类型被明确地转�为一个更大的类型，它将在�边被填充。
+访问固定索引的字节将导致转���的数值相�（如果索引�在范围内）：
 
 .. code-block:: solidity
 
     bytes2 a = 0x1234;
-    bytes4 b = bytes4(a); // b will be 0x12340000
+    bytes4 b = bytes4(a); // b 现在会是 0x12340000
     assert(a[0] == b[0]);
     assert(a[1] == b[1]);
 
-Since integers and fixed-size byte arrays behave differently when truncating or
-padding, explicit conversions between integers and fixed-size byte arrays are only allowed,
-if both have the same size. If you want to convert between integers and fixed-size byte arrays of
-different size, you have to use intermediate conversions that make the desired truncation and padding
-rules explicit:
+于整数和固定大�的字节数组在截断或填充时表现��，
+�有在整数和固定大�的字节数组具有相�大�的情况下，��许在两者之间进行显�转�。
+如果您想在��大�的整数和固定大�的字节数组之间进行转�，您必须使用中间转�，
+使所需的截断和填充规则明确：
 
 .. code-block:: solidity
 
     bytes2 a = 0x1234;
-    uint32 b = uint16(a); // b will be 0x00001234
-    uint32 c = uint32(bytes4(a)); // c will be 0x12340000
-    uint8 d = uint8(uint16(a)); // d will be 0x34
-    uint8 e = uint8(bytes1(a)); // e will be 0x12
+    uint32 b = uint16(a); // b 将会是 0x00001234
+    uint32 c = uint32(bytes4(a)); // c 将会是 0x12340000
+    uint8 d = uint8(uint16(a)); // d 将会是 0x34
+    uint8 e = uint8(bytes1(a)); // e 将会是 0x12
 
-``bytes`` arrays and ``bytes`` calldata slices can be converted explicitly to fixed bytes types (``bytes1``/.../``bytes32``).
-In case the array is longer than the target fixed bytes type, truncation at the end will happen.
-If the array is shorter than the target type, it will be padded with zeros at the end.
+``bytes`` 数组和 ``bytes`` calldata 切片�以明确转�为固定字节类型（ ``bytes1`` /.../ ``bytes32``）。
+如果数组比目标的固定字节类型长，在末端会�生截断的情况。如果数组比目标类型短，它将在末尾被填充零。
 
 .. code-block:: solidity
 
@@ -122,10 +119,10 @@ If the array is shorter than the target type, it will be padded with zeros at th
         bytes s = "abcdefgh";
         function f(bytes calldata c, bytes memory m) public view returns (bytes16, bytes3) {
             require(c.length == 16, "");
-            bytes16 b = bytes16(m);  // if length of m is greater than 16, truncation will happen
-            b = bytes16(s);  // padded on the right, so result is "abcdefgh\0\0\0\0\0\0\0\0"
-            bytes3 b1 = bytes3(s); // truncated, b1 equals to "abc"
-            b = bytes16(c[:8]);  // also padded with zeros
+            bytes16 b = bytes16(m);  // 如果m的长度大于16，将�生截断。
+            b = bytes16(s);  // �边进行填充，所以结果是 "abcdefgh\0\0\0\0\0\0\0\0"
+            bytes3 b1 = bytes3(s); // �生截断, b1 相当于 "abc"
+            b = bytes16(c[:8]);  // �样用0进行填充
             return (b, b1);
         }
     }
@@ -133,70 +130,67 @@ If the array is shorter than the target type, it will be padded with zeros at th
 .. index:: ! literal;conversion, literal;rational, literal;hexadecimal number
 .. _types-conversion-literals:
 
-Conversions between Literals and Elementary Types
-=================================================
+字�常数和基本类型之间的转�
+============================
 
-Integer Types
+整数类型
 -------------
 
-Decimal and hexadecimal number literals can be implicitly converted to any integer type
-that is large enough to represent it without truncation:
+�进制和�六进制的数字字�常数�以��地转�为任何足够大的整数类型去表示它而�被截断：
 
 .. code-block:: solidity
 
-    uint8 a = 12; // fine
-    uint32 b = 1234; // fine
-    uint16 c = 0x123456; // fails, since it would have to truncate to 0x3456
+    uint8 a = 12; // �行
+    uint32 b = 1234; // �行
+    uint16 c = 0x123456; // 报错, 因为这将会截断� 0x3456
 
 .. note::
-    Prior to version 0.8.0, any decimal or hexadecimal number literals could be explicitly
-    converted to an integer type. From 0.8.0, such explicit conversions are as strict as implicit
-    conversions, i.e., they are only allowed if the literal fits in the resulting range.
+    在0.8.0版本之�，任何�进制或�六进制的数字字�常数都�以显�转�为整数类型。
+    从0.8.0开始，这�显�转�和��转�一样严格，也就是说，�有当字��义符�所产生的范围时，��许转�。
 
 .. index:: literal;string, literal;hexadecimal
 
-Fixed-Size Byte Arrays
+固定大�的字节数组
 ----------------------
 
-Decimal number literals cannot be implicitly converted to fixed-size byte arrays. Hexadecimal
-number literals can be, but only if the number of hex digits exactly fits the size of the bytes
-type. As an exception both decimal and hexadecimal literals which have a value of zero can be
-converted to any fixed-size bytes type:
+�进制数字字�常数�能被��地转�为固定大�的字节数组。
+�六进制数字字�常数是�以的，但�有当�六进制数字的数�正好符�字节类型的大�时��以。
+但是有一个例外，数值为0的�进制和�六进制数字字�常数都�以被转�为任何固定大�的字节类型：
 
 .. code-block:: solidity
 
-    bytes2 a = 54321; // not allowed
-    bytes2 b = 0x12; // not allowed
-    bytes2 c = 0x123; // not allowed
-    bytes2 d = 0x1234; // fine
-    bytes2 e = 0x0012; // fine
-    bytes4 f = 0; // fine
-    bytes4 g = 0x0; // fine
+    bytes2 a = 54321; // ��许
+    bytes2 b = 0x12; // ��许
+    bytes2 c = 0x123; // ��许
+    bytes2 d = 0x1234; // �行
+    bytes2 e = 0x0012; // �行
+    bytes4 f = 0; // �行
+    bytes4 g = 0x0; // �行
 
-String literals and hex string literals can be implicitly converted to fixed-size byte arrays,
-if their number of characters matches the size of the bytes type:
+字符串和�六进制字符串字�常数�以被��地转�为固定大�的字节数组，
+如果它们的字符数与字节类型的大�相匹�：
 
 .. code-block:: solidity
 
-    bytes2 a = hex"1234"; // fine
-    bytes2 b = "xy"; // fine
-    bytes2 c = hex"12"; // not allowed
-    bytes2 d = hex"123"; // not allowed
-    bytes2 e = "x"; // not allowed
-    bytes2 f = "xyz"; // not allowed
+    bytes2 a = hex"1234"; // �行
+    bytes2 b = "xy"; // �行
+    bytes2 c = hex"12"; // ��许
+    bytes2 d = hex"123"; // ��许
+    bytes2 e = "x"; // ��许
+    bytes2 f = "xyz"; // ��许
 
 .. index:: literal;address
 
-Addresses
+地�类型
 ---------
 
-As described in :ref:`address_literals`, hex literals of the correct size that pass the checksum
-test are of ``address`` type. No other literals can be implicitly converted to the ``address`` type.
+正如在 :ref:`address_literals` 中所�述的那样，正确大�并通过校验测试的�六进制字是 ``address`` 类型。
+其他字�常数�能��地转�为 ``address`` 类型。
 
-Explicit conversions to ``address`` are allowed only from ``bytes20`` and ``uint160``.
+��许从 ``bytes20`` 和 ``uint160`` 显�转�到 ``address``。
 
-An ``address a`` can be converted explicitly to ``address payable`` via ``payable(a)``.
+``address a`` �以通过 ``payable(a)`` 显�转�为 ``address payable``。
 
 .. note::
-    Prior to version 0.8.0, it was possible to explicitly convert from any integer type (of any size, signed or unsigned) to  ``address`` or ``address payable``.
-    Starting with in 0.8.0 only conversion from ``uint160`` is allowed.
\ No newline at end of file
+    在 0.8.0 版本之�，�以显�地从任何整数类型（任何大�，有符�或无符�）转�为 ``address`` 或 ``address payable`` 类型。
+    从 0.8.0 开始，��许从 ``uint160`` 转�。
diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index 454caaf05d6e..7a793e4bae23 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -1,47 +1,41 @@
 .. index:: !mapping
 .. _mapping-types:
 
-Mapping Types
+映射类型
 =============
 
-Mapping types use the syntax ``mapping(KeyType KeyName? => ValueType ValueName?)`` and variables of
-mapping type are declared using the syntax ``mapping(KeyType KeyName? => ValueType ValueName?)
-VariableName``. The ``KeyType`` can be any built-in value type, ``bytes``, ``string``, or any
-contract or enum type. Other user-defined or complex types, such as mappings, structs or array types
-are not allowed. ``ValueType`` can be any type, including mappings, arrays and structs. ``KeyName``
-and ``ValueName`` are optional (so ``mapping(KeyType => ValueType)`` works as well) and can be any
-valid identifier that is not a type.
-
-You can think of mappings as `hash tables <https://en.wikipedia.org/wiki/Hash_table>`_, which are virtually initialised
-such that every possible key exists and is mapped to a value whose
-byte-representation is all zeros, a type's :ref:`default value <default-value>`.
-The similarity ends there, the key data is not stored in a
-mapping, only its ``keccak256`` hash is used to look up the value.
-
-Because of this, mappings do not have a length or a concept of a key or
-value being set, and therefore cannot be erased without extra information
-regarding the assigned keys (see :ref:`clearing-mappings`).
-
-Mappings can only have a data location of ``storage`` and thus
-are allowed for state variables, as storage reference types
-in functions, or as parameters for library functions.
-They cannot be used as parameters or return parameters
-of contract functions that are publicly visible.
-These restrictions are also true for arrays and structs that contain mappings.
-
-You can mark state variables of mapping type as ``public`` and Solidity creates a
-:ref:`getter <visibility-and-getters>` for you. The ``KeyType`` becomes a parameter
-with name ``KeyName`` (if specified) for the getter.
-If ``ValueType`` is a value type or a struct, the getter returns ``ValueType`` with
-name ``ValueName`` (if specified).
-If ``ValueType`` is an array or a mapping, the getter has one parameter for
-each ``KeyType``, recursively.
-
-In the example below, the ``MappingExample`` contract defines a public ``balances``
-mapping, with the key type an ``address``, and a value type a ``uint``, mapping
-an Ethereum address to an unsigned integer value. As ``uint`` is a value type, the getter
-returns a value that matches the type, which you can see in the ``MappingUser``
-contract that returns the value at the specified address.
+映射类型使用语法 ``mapping(KeyType KeyName? => ValueType ValueName?)``，
+映射类型的��使用语法 ``mapping(KeyType KeyName? => ValueType ValueName?) VariableName`` 声明。
+``KeyType`` �以是任何内置的值类型， ``bytes``， ``string``，或任何�约或枚举类型。
+其他用户定义的或��的类型，如映射，结构体或数组类型是��许的。
+``ValueType`` �以是任何类型，包括映射，数组和结构体。
+``KeyName`` 和 ``ValueName`` 是�选的（所以 ``mapping(KeyType => ValueType)`` 也�以使用），
+�以是任何有效的标识符，而�是一个类型。
+
+您�以把映射想象� `哈希表 <https://en.wikipedia.org/wiki/Hash_table>`_，
+它实际上被�始化了，使�一个�能的键都存在，
+并将其映射到字节形�全是零的值，一个类型的 :ref:`默认值 <default-value>`。
+相似性到此为止，键数��存储在映射中，而是它的 ``keccak256`` 哈希值被用�查询。
+
+正因为如此，映射没有长度，也没有被设置的键或值的概念，
+因此，如果没有关于分�的键的�外信�，就�能被删除（� :ref:`clearing-mappings`）。
+
+映射�能有一个 ``storage`` 的数��置，因此�许用于状���，
+�作为函数中的存储引用类型，或作为库函数的�数。
+但它们�能被用作公开��的�约函数的�数或返回�数。
+这些�制对于包�映射的数组和结构也是如此。
+
+您�以把映射类型的状���标记为 ``public``，
+Solidity 会为您创建一个 :ref:`getter <visibility-and-getters>` 函数。
+``KeyType`` �为 getter 函数的�数，�称为 ``KeyName`` （如果指定）。
+如果 ``ValueType`` 是一个值类型或一个结构，getter 返回 ``ValueType``，
+�称为 ``ValueName`` （如果指定）。
+如果 ``ValueType`` 是一个数组或映射，getter 对�个 ``KeyType`` 递归出一个�数。
+
+在下�的例�中， ``MappingExample`` �约定义了一个公共的 ``balances`` 映射，
+键类型是 ``address``，值类型是 ``uint``，将一个Ethereum地�映射到一个无符�整数值。
+由于 ``uint`` 是一个值类型，getter 返回一个与该类型相匹�的值，
+您�以在 ``MappingUser`` �约中看到它返回指定地�对应的值。
 
 .. code-block:: solidity
 
@@ -64,13 +58,13 @@ contract that returns the value at the specified address.
         }
     }
 
-The example below is a simplified version of an
-`ERC20 token <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol>`_.
-``_allowances`` is an example of a mapping type inside another mapping type.
+下�的例�是一个简化版本的
+`ERC20 代� <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol>`_。
+``_allowances`` 是一个映射类型在�一个映射类型中的例�。
 
-In the example below, the optional ``KeyName`` and ``ValueName`` are provided for the mapping.
-It does not affect any contract functionality or bytecode, it only sets the ``name`` field
-for the inputs and outputs in the ABI for the mapping's getter.
+在下�的例�中，为映射�供了�选的 ``KeyName`` 和 ``ValueName``。
+它�影�任何�约的功能或字节�，
+它�是为映射的 getter 在 ABI 中设置输入和输出的 ``name`` 字段。
 
 .. code-block:: solidity
 
@@ -86,7 +80,7 @@ for the inputs and outputs in the ABI for the mapping's getter.
     }
 
 
-The example below uses ``_allowances`` to record the amount someone else is allowed to withdraw from your account.
+下�的例�使用 ``_allowances`` �记录其他人�以从你的账户中��的金�。
 
 .. code-block:: solidity
 
@@ -135,14 +129,13 @@ The example below uses ``_allowances`` to record the amount someone else is allo
 .. index:: !iterable mappings
 .. _iterable-mappings:
 
-Iterable Mappings
+递归映射
 -----------------
 
-You cannot iterate over mappings, i.e. you cannot enumerate their keys.
-It is possible, though, to implement a data structure on
-top of them and iterate over that. For example, the code below implements an
-``IterableMapping`` library that the ``User`` contract then adds data to, and
-the ``sum`` function iterates over to sum all the values.
+您�能对映射进行递归调用，也就是说，您�能列举它们的键。
+�过，�以在它们上层实现一个数�结构，并对其进行递归。例如，
+下�的代�实现了一个 ``IterableMapping`` 库， 然� ``User`` �约将数�添加到该库中，
+``sum`` 函数对所有的值进行递归调用去累加这些值。
 
 .. code-block:: solidity
     :force:
@@ -215,23 +208,23 @@ the ``sum`` function iterates over to sum all the values.
         }
     }
 
-    // How to use it
+    // 如何使用
     contract User {
-        // Just a struct holding our data.
+        // �是一个�存我们数�的结构体。
         itmap data;
-        // Apply library functions to the data type.
+        // 对数�类型应用库函数。
         using IterableMapping for itmap;
 
-        // Insert something
+        // �入一些数�
         function insert(uint k, uint v) public returns (uint size) {
-            // This calls IterableMapping.insert(data, k, v)
+            // 这将调用 IterableMapping.insert(data, k, v)
             data.insert(k, v);
-            // We can still access members of the struct,
-            // but we should take care not to mess with them.
+            // 我们�然�以访问结构中的�员，
+            // 但我们应该注���乱动他们。
             return data.size;
         }
 
-        // Computes the sum of all stored data.
+        // 计算所有存储数�的总和。
         function sum() public view returns (uint s) {
             for (
                 Iterator i = data.iterateStart();
diff --git a/docs/types/operator-precedence-table.rst b/docs/types/operator-precedence-table.rst
index 65034045bb54..2e81eaf4ce39 100644
--- a/docs/types/operator-precedence-table.rst
+++ b/docs/types/operator-precedence-table.rst
@@ -1,57 +1,55 @@
-The following is the order of precedence for operators, listed in order of evaluation.
+以下是按评估顺�列出的�作符优先级。
 
-+------------+-------------------------------------+--------------------------------------------+
-| Precedence | Description                         | Operator                                   |
-+============+=====================================+============================================+
-| *1*        | Postfix increment and decrement     | ``++``, ``--``                             |
-+            +-------------------------------------+--------------------------------------------+
-|            | New expression                      | ``new <typename>``                         |
-+            +-------------------------------------+--------------------------------------------+
-|            | Array subscripting                  | ``<array>[<index>]``                       |
-+            +-------------------------------------+--------------------------------------------+
-|            | Member access                       | ``<object>.<member>``                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Function-like call                  | ``<func>(<args...>)``                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Parentheses                         | ``(<statement>)``                          |
-+------------+-------------------------------------+--------------------------------------------+
-| *2*        | Prefix increment and decrement      | ``++``, ``--``                             |
-+            +-------------------------------------+--------------------------------------------+
-|            | Unary minus                         | ``-``                                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Unary operations                    | ``delete``                                 |
-+            +-------------------------------------+--------------------------------------------+
-|            | Logical NOT                         | ``!``                                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Bitwise NOT                         | ``~``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *3*        | Exponentiation                      | ``**``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *4*        | Multiplication, division and modulo | ``*``, ``/``, ``%``                        |
-+------------+-------------------------------------+--------------------------------------------+
-| *5*        | Addition and subtraction            | ``+``, ``-``                               |
-+------------+-------------------------------------+--------------------------------------------+
-| *6*        | Bitwise shift operators             | ``<<``, ``>>``                             |
-+------------+-------------------------------------+--------------------------------------------+
-| *7*        | Bitwise AND                         | ``&``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *8*        | Bitwise XOR                         | ``^``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *9*        | Bitwise OR                          | ``|``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *10*       | Inequality operators                | ``<``, ``>``, ``<=``, ``>=``               |
-+------------+-------------------------------------+--------------------------------------------+
-| *11*       | Equality operators                  | ``==``, ``!=``                             |
-+------------+-------------------------------------+--------------------------------------------+
-| *12*       | Logical AND                         | ``&&``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *13*       | Logical OR                          | ``||``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *14*       | Ternary operator                    | ``<conditional> ? <if-true> : <if-false>`` |
-+            +-------------------------------------+--------------------------------------------+
-|            | Assignment operators                | ``=``, ``|=``, ``^=``, ``&=``, ``<<=``,    |
-|            |                                     | ``>>=``, ``+=``, ``-=``, ``*=``, ``/=``,   |
-|            |                                     | ``%=``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *15*       | Comma operator                      | ``,``                                      |
-+------------+-------------------------------------+--------------------------------------------+
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| 优先级 |      �述      |                                              �作符                                               |
++========+================+===================================================================================================+
+| *1*    | �置自增和自� | ``++``， ``--``                                                                                   |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 创建类型实例   | ``new <类型�>``                                                                                  |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 数组元素       | ``<数组>[<索引>]``                                                                                |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 访问�员       | ``<对象>.<�员�>``                                                                               |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 函数调用       | ``<函数>(<�数...>)``                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | �括�         | ``(<表达�>)``                                                                                    |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *2*    | �置自增和自� | ``++``， ``--``                                                                                   |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 一元�算�     | ``-``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 一元�作符     | ``delete``                                                                                        |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 逻辑�         | ``!``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 按��         | ``~``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *3*    | 乘方           | ``**``                                                                                            |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *4*    | 乘�除和模�算 | ``*``， ``/``， ``%``                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *5*    | 算术加和�     | ``+``， ``-``                                                                                     |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *6*    | 移��作符     | ``<<``， ``>>``                                                                                   |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *7*    | 按�与         | ``&``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *8*    | 按�异或       | ``^``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *9*    | 按�或         | ``|``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *10*   | �等�作符     | ``<``， ``>``， ``<=``， ``>=``                                                                   |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *11*   | 等于�作符     | ``==``， ``!=``                                                                                   |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *12*   | 逻辑与         | ``&&``                                                                                            |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *13*   | 逻辑或         | ``==``                                                                                            |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *14*   | 三元�作符     | ``<判断�件> ? <如果为真时执行的表达�> : <如果为�时执行的表达�>``                              |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+|        | 赋值�作符     | ``=``， ``|=``， ``^=``， ``&=``， ``<<=``， ``>>=``， ``+=``， ``-=``， ``*=``， ``/=``， ``%=`` |
++--------+----------------+---------------------------------------------------------------------------------------------------+
+| *15*   | 逗�           | ``,``                                                                                             |
++--------+----------------+---------------------------------------------------------------------------------------------------+
diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index 1d71352d6019..f35f7b52a2ea 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -1,93 +1,82 @@
 .. index:: ! operator
 
-Operators
+�算符
 =========
 
-Arithmetic and bit operators can be applied even if the two operands do not have the same type.
-For example, you can compute ``y = x + z``, where ``x`` is a ``uint8`` and ``z`` has
-the type ``uint32``. In these cases, the following mechanism will be used to determine
-the type in which the operation is computed (this is important in case of overflow)
-and the type of the operator's result:
+�使两个�作数的类型�一样，也�以应用算术和��作数。
+例如，您�以计算 ``y = x + z``，其中 ``x`` 是 ``uint8``， ``z`` 的类型为 ``int32``。
+在这�情况下，下�的机制将被用�确定计算�作的类型（这在溢出的情况下很��）和�作结果的类型：
 
-1. If the type of the right operand can be implicitly converted to the type of the left
-   operand, use the type of the left operand,
-2. if the type of the left operand can be implicitly converted to the type of the right
-   operand, use the type of the right operand,
-3. otherwise, the operation is not allowed.
+1. 如果��作数的类型�以��转�为左�作数的类型，则使用左�作数的类型，
+2. 如果左�作数的类型�以��转�为��作数的类型，则使用��作数的类型，
+3. �则的�，该�作�被�许。
 
-In case one of the operands is a :ref:`literal number <rational_literals>` it is first converted to its
-"mobile type", which is the smallest type that can hold the value
-(unsigned types of the same bit-width are considered "smaller" than the signed types).
-If both are literal numbers, the operation is computed with effectively unlimited precision in
-that the expression is evaluated to whatever precision is necessary so that none is lost
-when the result is used with a non-literal type.
+如果其中一个�作数是 :ref:`字�常数 <rational_literals>`，
+它首先被转�为其 “移动类型（mobile type）�，也就是能容纳该值的最�类型
+（相��宽的无符�类型被认为比有符�类型 “��）。
+如果两者都是字�常数，那么�算的精度实际上是无�的，
+因为表达�被转�到任何必�的精度，所以当结果被用于�字�类型时，没有任何�失。
 
-The operator's result type is the same as the type the operation is performed in,
-except for comparison operators where the result is always ``bool``.
+�作符的结果类型与�作的类型相�，除了比较�作符，其结果总是 ``bool``。
 
-The operators ``**`` (exponentiation), ``<<``  and ``>>`` use the type of the
-left operand for the operation and the result.
+�算符 ``**`` （幂�算）， ``<<`` 和 ``>>`` 使用左边�作数的类型进行�算和以其作为结果。
 
-Ternary Operator
+三元�算符
 ----------------
-The ternary operator is used in expressions of the form ``<expression> ? <trueExpression> : <falseExpression>``.
-It evaluates one of the latter two given expressions depending upon the result of the evaluation of the main ``<expression>``.
-If ``<expression>`` evaluates to ``true``, then ``<trueExpression>`` will be evaluated, otherwise ``<falseExpression>`` is evaluated.
+三元�算符用于形�为 ``<�件表达�> ? <true�件表达�> : <false�件表达�>``。
+它根�主�的 ``<�件表达�>`` 的评估结果，计算�两个给定表达�中的一个。
+如果 ``<�件表达�>`` 评估为 ``true``，那么 ``<true�件表达�>`` 将被计算，�则 ``<false�件表达�>`` 被被计算。
 
-The result of the ternary operator does not have a rational number type, even if all of its operands are rational number literals.
-The result type is determined from the types of the two operands in the same way as above, converting to their mobile type first if required.
+三元�算符的结果没有有�数类型，�使它的�作数都是有�数字。
+结果类型是由两个�作数的类型决定的，方法�上，如果需�的�，首先转�为它们的�移动计算的类型。
 
-As a consequence, ``255 + (true ? 1 : 0)`` will revert due to arithmetic overflow.
-The reason is that ``(true ? 1 : 0)`` is of ``uint8`` type, which forces the addition to be performed in ``uint8`` as well,
-and 256 exceeds the range allowed for this type.
+因此， ``255 + (true ? 1 : 0)`` 将由于算术溢出而��计算。
+原因是 ``(true ? 1 : 0)`` 是 ``uint8`` 类型，这迫使加法也在 ``uint8`` 中进行，
+而256超出了这个类型�许的范围。
 
-Another consequence is that an expression like ``1.5 + 1.5`` is valid but ``1.5 + (true ? 1.5 : 2.5)`` is not.
-This is because the former is a rational expression evaluated in unlimited precision and only its final value matters.
-The latter involves a conversion of a fractional rational number to an integer, which is currently disallowed.
+�一个结果是，� ``1.5 + 1.5`` 这样的表达�是有效的，但 ``1.5 + (true ? 1.5 : 2.5)`` �无效。
+这是因为�者是一个以无�精度计算的有�表达�，�有它的最终值�是��的。
+�者涉�到将�数有�数转�为整数，这在目�是��许的。
 
 .. index:: assignment, lvalue, ! compound operators
 
-Compound and Increment/Decrement Operators
-------------------------------------------
+�数和增�/���算符
+----------------------
 
-If ``a`` is an LValue (i.e. a variable or something that can be assigned to), the
-following operators are available as shorthands:
+如果 ``a`` 是一个LValue（�是一个��或者是�以被分�的东西），
+下列�算符�以作为速记：
 
-``a += e`` is equivalent to ``a = a + e``. The operators ``-=``, ``*=``, ``/=``, ``%=``,
-``|=``, ``&=``, ``^=``, ``<<=`` and ``>>=`` are defined accordingly. ``a++`` and ``a--`` are equivalent
-to ``a += 1`` / ``a -= 1`` but the expression itself still has the previous value
-of ``a``. In contrast, ``--a`` and ``++a`` have the same effect on ``a`` but
-return the value after the change.
+``a += e`` 相当于 ``a = a + e``，�算符 ``-=``， ``*=``， ``/=``， ``%=``，
+``|=``， ``&=``， ``^=``， ``<<=`` 和 ``>>=`` 都有相应的定义。
+``a++`` 和 ``a--`` 相当于 ``a += 1`` / ``a -= 1`` 但是表达�本身�然是以�的值 ``a``。
+相比之下， ``--a`` 和 ``++a`` 对 ``a`` 有�样的作用，但返回改��的值。
 
 .. index:: !delete
 
 .. _delete:
 
-delete
+删除
 ------
 
-``delete a`` assigns the initial value for the type to ``a``. I.e. for integers it is
-equivalent to ``a = 0``, but it can also be used on arrays, where it assigns a dynamic
-array of length zero or a static array of the same length with all elements set to their
-initial value. ``delete a[x]`` deletes the item at index ``x`` of the array and leaves
-all other elements and the length of the array untouched. This especially means that it leaves
-a gap in the array. If you plan to remove items, a :ref:`mapping <mapping-types>` is probably a better choice.
-
-For structs, it assigns a struct with all members reset. In other words,
-the value of ``a`` after ``delete a`` is the same as if ``a`` would be declared
-without assignment, with the following caveat:
-
-``delete`` has no effect on mappings (as the keys of mappings may be arbitrary and
-are generally unknown). So if you delete a struct, it will reset all members that
-are not mappings and also recurse into the members unless they are mappings.
-However, individual keys and what they map to can be deleted: If ``a`` is a
-mapping, then ``delete a[x]`` will delete the value stored at ``x``.
-
-It is important to note that ``delete a`` really behaves like an
-assignment to ``a``, i.e. it stores a new object in ``a``.
-This distinction is visible when ``a`` is reference variable: It
-will only reset ``a`` itself, not the
-value it referred to previously.
+``delete a`` 为该类型分��始值 ``a``。例如，对于整数�说，它相当于 ``a = 0``，
+但是它也�以用于数组，它指定一个长度为0的动�数组或者一个相�长度的��数组，
+所有元素都设置为�始值。 ``delete a[x]`` 删除数组中索引为 ``x`` 的元素，
+并�留所有其他元素和数组的长度�动。这特别�味�它在数组中留下一个缺�。
+如果您打算删除项目，一个 :ref:`映射类型 <mapping-types>` �能是一个更好的选择。
+
+对于结构体，则将结构体中的所有属性�置。���说，在 ``delete a`` 之�，
+``a`` 的值与 ``a`` 在没有赋值的情况下被声明是一样的，但有以下注�事项：
+
+``delete`` 对映射类型没有影�（因为映射的键�能是任�的，通常是未知的）。
+因此，如果您删除一个结构体，它将�置所有�是映射类型的�员，
+�时也会递归到这些�员，除�它们是映射。
+然而，�个键和它们所映射的内容�以被删除。
+如果 ``a`` 是一个映射，那么 ``delete a[x]`` 将删除存储在 ``x`` 的值。
+
+值得注�的是， ``delete a`` 的行为实际上是对 ``a`` 的赋值，
+也就是说，它在 ``a`` 中存储了一个新的对象。
+当 ``a`` 是引用��时，这�区别是明显的。
+它�会�置 ``a`` 本身，而�是它之�引用的值。
 
 .. code-block:: solidity
 
@@ -100,13 +89,12 @@ value it referred to previously.
 
         function f() public {
             uint x = data;
-            delete x; // sets x to 0, does not affect data
-            delete data; // sets data to 0, does not affect x
+            delete x; // 将 x 设为 0，并�影�data��
+            delete data; // 将 data 设为 0，并�影� x
             uint[] storage y = dataArray;
-            delete dataArray; // this sets dataArray.length to zero, but as uint[] is a complex object, also
-            // y is affected which is an alias to the storage object
-            // On the other hand: "delete y" is not valid, as assignments to local variables
-            // referencing storage objects can only be made from existing storage objects.
+            delete dataArray; // 将 dataArray.length 设为 0，但由于 uint[] 是一个��的对象，
+            // y 也将�到影�，它是一个存储�置是 storage 的对象的别�。
+            // �一方�："delete y" 是�法的，引用了 storage 对象的局部���能由已有的 storage 对象赋值。
             assert(y.length == 0);
         }
     }
@@ -114,7 +102,7 @@ value it referred to previously.
 .. index:: ! operator; precedence
 .. _order:
 
-Order of Precedence of Operators
+�算符的优先顺�
 --------------------------------
 
 .. include:: types/operator-precedence-table.rst
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index d2e9300e64a4..641af72ecc8b 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -2,67 +2,62 @@
 
 .. _reference-types:
 
-Reference Types
-===============
-
-Values of reference type can be modified through multiple different names.
-Contrast this with value types where you get an independent copy whenever
-a variable of value type is used. Because of that, reference types have to be handled
-more carefully than value types. Currently, reference types comprise structs,
-arrays and mappings. If you use a reference type, you always have to explicitly
-provide the data area where the type is stored: ``memory`` (whose lifetime is limited
-to an external function call), ``storage`` (the location where the state variables
-are stored, where the lifetime is limited to the lifetime of a contract)
-or ``calldata`` (special data location that contains the function arguments).
-
-An assignment or type conversion that changes the data location will always incur an automatic copy operation,
-while assignments inside the same data location only copy in some cases for storage types.
+引用类型
+==========
+
+引用类型的值�以通过多个��的�称进行修改。
+这与值类型形�鲜明对比，在值类型的��被使用时，您会得到一个独立的副本。
+正因为如此，对引用类型的处��比对值类型的处�更加谨慎。目�，
+引用类型包括结构�数组和映射。如果您使用一个引用类型，
+您必须明确地�供存储该类型的数�区域。 ``memory`` （其寿命�于外部函数调用），
+``storage`` （存储状���的�置，其寿命�于�约的寿命）
+或 ``calldata`` （包�函数�数的特殊数��置）。
+
+改�数��置的赋值或类型转�将总是导致自动�制�作，
+而�一数��置内的赋值�在�些情况下对存储类型进行�制。
 
 .. _data-location:
 
-Data location
--------------
+数��置
+----------
 
-Every reference type has an additional
-annotation, the "data location", about where it is stored. There are three data locations:
-``memory``, ``storage`` and ``calldata``. Calldata is a non-modifiable,
-non-persistent area where function arguments are stored, and behaves mostly like memory.
+�个引用类型都有一个�外的属性，� "数��置"，
+关于它的存储�置。有三个数��置。 ``memory``, ``storage`` 和 ``calldata``。
+Calldata是一个��修改的���久性的区域，用于存储函数�数，其行为主�类似于memory。
 
 .. note::
-    If you can, try to use ``calldata`` as data location because it will avoid copies and
-    also makes sure that the data cannot be modified. Arrays and structs with ``calldata``
-    data location can also be returned from functions, but it is not possible to
-    allocate such types.
+    如果�以的�，尽�使用 ``calldata`` 作为数��置，因为这样�以���制，
+    也�以确�数��能被修改。使用 ``calldata`` 数��置的数组和结构也�以从函数中返回，
+    但��能分�这�类型。
 
 .. note::
-    Prior to version 0.6.9 data location for reference-type arguments was limited to
-    ``calldata`` in external functions, ``memory`` in public functions and either
-    ``memory`` or ``storage`` in internal and private ones.
-    Now ``memory`` and ``calldata`` are allowed in all functions regardless of their visibility.
+    在0.6.9版本之�，引用型�数的数��置被�制在外部函数中的 ``calldata``，
+    公开函数中的 ``memory``，以�内部和�有函数中的 ``memory`` 或 ``storage``。
+    现在 ``memory`` 和 ``calldata`` 在所有函数中都被�许使用，无论其��性如何。
 
 .. note::
-    Prior to version 0.5.0 the data location could be omitted, and would default to different locations
-    depending on the kind of variable, function type, etc., but all complex types must now give an explicit
-    data location.
+    在0.5.0版本之�，数��置�以�略，并且会根���的�类�函数类型等默认为��的�置，
+    但现在所有的��类型都必须给出一个明确的数��置。
 
 .. _data-location-assignment:
 
+<<<<<<< HEAD
+数��置和分�行为
+^^^^^^^^^^^^^^^^^^
+=======
 Data location and assignment behavior
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>>>>>>> english/develop
 
-Data locations are not only relevant for persistency of data, but also for the semantics of assignments:
+数��置�仅与数�的�久性有关，而且也与分�的语义有关：
 
-* Assignments between ``storage`` and ``memory`` (or from ``calldata``)
-  always create an independent copy.
-* Assignments from ``memory`` to ``memory`` only create references. This means
-  that changes to one memory variable are also visible in all other memory
-  variables that refer to the same data.
-* Assignments from ``storage`` to a **local** storage variable also only
-  assign a reference.
-* All other assignments to ``storage`` always copy. Examples for this
-  case are assignments to state variables or to members of local
-  variables of storage struct type, even if the local variable
-  itself is just a reference.
+* 在 ``storage`` 和 ``memory`` 之间的分�（或从 ``calldata`` 中分�） 总是创建一个独立的拷�。
+* 从 ``memory`` 到 ``memory`` 的赋值�创建引用。
+  这�味�对一个内存��的改�在所有其他引用相�数�的内存��中也是��的。
+* 从  ``storage`` 到 **local** 存储��的赋值也�赋值一个引用。
+* 所有其他对 ``storage`` 的赋值总是拷�的。
+  这�情况的例�是对状���或存储结构类型的局部���员的赋值，
+  �使局部��本身�是一个引用。
 
 .. code-block:: solidity
 
@@ -70,28 +65,27 @@ Data locations are not only relevant for persistency of data, but also for the s
     pragma solidity >=0.5.0 <0.9.0;
 
     contract C {
-        // The data location of x is storage.
-        // This is the only place where the
-        // data location can be omitted.
+        // x 的数�存储�置是 storage。
+        // 这是唯一�以�略数��置的地方。
         uint[] x;
 
-        // The data location of memoryArray is memory.
+        // memoryArray 的数�存储�置是 memory。
         function f(uint[] memory memoryArray) public {
-            x = memoryArray; // works, copies the whole array to storage
-            uint[] storage y = x; // works, assigns a pointer, data location of y is storage
-            y[7]; // fine, returns the 8th element
-            y.pop(); // fine, modifies x through y
-            delete x; // fine, clears the array, also modifies y
-            // The following does not work; it would need to create a new temporary /
-            // unnamed array in storage, but storage is "statically" allocated:
+            x = memoryArray; // 将整个数组拷�到 storage 中，�行
+            uint[] storage y = x; // 分�一个指针，其中 y 的数�存储�置是 storage，�行
+            y[7]; // 返回第 8 个元素，�行
+            y.pop(); // 通过y修改x，�行
+            delete x; // 清除数组，�时修改 y，�行
+            // 下�的就��行了；需�在 storage 中创建新的未命�的临时数组，/
+            // 但 storage 是“���分�的：
             // y = memoryArray;
-            // Similarly, "delete y" is not valid, as assignments to local variables
-            // referencing storage objects can only be made from existing storage objects.
-            // It would "reset" the pointer, but there is no sensible location it could point to.
-            // For more details see the documentation of the "delete" operator.
+            // �样， "delete y" 也是无效的，
+            // 因为对引用存储对象的局部��的赋值�能从现有的存储对象中进行。
+            // 它将 “�置� 指针，但没有任何��的�置�以指�它。
+            // 更多细节� "delete" �作符的文档。
             // delete y;
-            g(x); // calls g, handing over a reference to x
-            h(x); // calls h and creates an independent, temporary copy in memory
+            g(x); // 调用 g 函数，�时移交对 x 的引用
+            h(x); // 调用 h 函数，�时在 memory 中创建一个独立的临时拷�
         }
 
         function g(uint[] storage) internal pure {}
@@ -102,43 +96,39 @@ Data locations are not only relevant for persistency of data, but also for the s
 
 .. _arrays:
 
-Arrays
+数组
 ------
 
-Arrays can have a compile-time fixed size, or they can have a dynamic size.
+数组�以在声明时指定长度，也�以动�调整大�。
 
-The type of an array of fixed size ``k`` and element type ``T`` is written as ``T[k]``,
-and an array of dynamic size as ``T[]``.
+一个元素类型为 ``T``，固定长度为 ``k`` 的数组�以声明为 ``T[k]``，
+而动�数组声明为 ``T[]``。
 
-For example, an array of 5 dynamic arrays of ``uint`` is written as
-``uint[][5]``. The notation is reversed compared to some other languages. In
-Solidity, ``X[3]`` is always an array containing three elements of type ``X``,
-even if ``X`` is itself an array. This is not the case in other languages such
-as C.
+例如，一个由5个 ``uint`` 的动�数组组�的数组被写� ``uint[][5]``。
+与其他一些语言相比, 这�记法是相�的。
+在Solidity中, ``X[3]`` 总是一个包�三个 ``X`` 类型元素的数组，
+�使 ``X`` 本身是一个数组。 这在其他语言中是�存在的，如C语言。
 
-Indices are zero-based, and access is in the opposite direction of the
-declaration.
+索引是基于零的，访问方�与声明相�。
 
-For example, if you have a variable ``uint[][5] memory x``, you access the
-seventh ``uint`` in the third dynamic array using ``x[2][6]``, and to access the
-third dynamic array, use ``x[2]``. Again,
-if you have an array ``T[5] a`` for a type ``T`` that can also be an array,
-then ``a[2]`` always has type ``T``.
+例如，如果您有一个�� ``uint[][5] memory x``，您用 ``x[2][6]`` 访问第三个动�数组中的第七个 ``uint``，
+�访问第三个动�数组，用 ``x[2]``。�样，如果您有一个数组 ``T[5] a`` 的类型 ``T``，
+也�以是一个数组，那么 ``a[2]`` 总是有类型 ``T``。
 
-Array elements can be of any type, including mapping or struct. The general
-restrictions for types apply, in that mappings can only be stored in the
-``storage`` data location and publicly-visible functions need parameters that are :ref:`ABI types <ABI>`.
+数组元素�以是任何类型，包括映射或结构体。
+并适用于类型的一般�制，映射�能存储在 ``storage`` 数��置，
+公开��的函数需��数是 :ref:`ABI类型<ABI>`。
 
-It is possible to mark state variable arrays ``public`` and have Solidity create a :ref:`getter <visibility-and-getters>`.
-The numeric index becomes a required parameter for the getter.
+�以将状���数组标记为 ``public``，
+并让Solidity创建一个 :ref:`getter <visibility-and-getters>` 函数。数字索引�为该函数的一个必��数。
 
-Accessing an array past its end causes a failing assertion. Methods ``.push()`` and ``.push(value)`` can be used
-to append a new element at the end of a dynamically-sized array, where ``.push()`` appends a zero-initialized element and returns
-a reference to it.
+访问一个超过它的末端的数组会导致一个失败的断言。
+方法 ``.push()`` 和 ``.push(value)`` �以用�在动�大�的数组末端追加一个新的元素，
+其中 ``.push()`` 追加一个零�始化的元素并返回它的引用。
 
 .. note::
-    Dynamically-sized arrays can only be resized in storage.
-    In memory, such arrays can be of arbitrary size but the size cannot be changed once an array is allocated.
+    动�大�的数组�能在存储中调整大�。
+    在内存中，这样的数组�以是任�大�的，但是一旦分�了数组，就�能改�数组的大�。
 
 .. index:: ! string, ! bytes
 
@@ -146,47 +136,44 @@ a reference to it.
 
 .. _bytes:
 
-``bytes`` and ``string`` as Arrays
+``bytes`` 和 ``string`` 类型的数组
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Variables of type ``bytes`` and ``string`` are special arrays. The ``bytes`` type is similar to ``bytes1[]``,
-but it is packed tightly in calldata and memory. ``string`` is equal to ``bytes`` but does not allow
-length or index access.
+``bytes`` 和 ``string`` 类型的��是特殊的数组。 ``bytes`` 类似于 ``bytes1[]``，
+但它在 calldata 中会被“紧打包�（译者注：将元素连续地存在一起，�会按� 32 字节一�元的方��存放）。
+``string`` 与 ``bytes`` 相�，但��许用长度或索引�访问。
 
-Solidity does not have string manipulation functions, but there are
-third-party string libraries. You can also compare two strings by their keccak256-hash using
-``keccak256(abi.encodePacked(s1)) == keccak256(abi.encodePacked(s2))`` and
-concatenate two strings using ``string.concat(s1, s2)``.
+Solidity没有字符串�作函数，但有第三方的字符串库。
+您也�以用 ``keccak256(abi.encodePacked(s1)) == keccak256(abi.encodePacked(s2))``
+�比较两个字符串的keccak256-hash，用 ``string.concat(s1, s2)`` �连接两个字符串。
 
-You should use ``bytes`` over ``bytes1[]`` because it is cheaper,
-since using ``bytes1[]`` in ``memory`` adds 31 padding bytes between the elements. Note that in ``storage``, the
-padding is absent due to tight packing, see :ref:`bytes and string <bytes-and-string>`. As a general rule,
-use ``bytes`` for arbitrary-length raw byte data and ``string`` for arbitrary-length
-string (UTF-8) data. If you can limit the length to a certain number of bytes,
-always use one of the value types ``bytes1`` to ``bytes32`` because they are much cheaper.
+您应该使用 ``bytes`` 而�是 ``bytes1[]``，因为它更便宜，
+因为在 ``memory`` 中使用 ``bytes1[]`` 会在元素之间增加31个填充字节。
+请注�，在 ``storage`` 中，由于紧打包，没有填充，�� :ref:`字节和字符串 <bytes-and-string>`。
+一般�说，对于任�长度的原始字节数�使用 ``bytes``，对于任�长度的字符串（UTF-8）数�使用 ``string``。
+如果您能将长度�制在一定的字节数，总是使用 ``bytes1`` 到 ``bytes32`` 中的一�值类型，因为它们更便宜。
 
 .. note::
-    If you want to access the byte-representation of a string ``s``, use
-    ``bytes(s).length`` / ``bytes(s)[7] = 'x';``. Keep in mind
-    that you are accessing the low-level bytes of the UTF-8 representation,
-    and not the individual characters.
+    如果想�访问以字节表示的字符串 ``s``，
+    请使用 ``bytes(s).length`` / ``bytes(s)[7] = 'x';``。
+    注�这时您访问的是 UTF-8 形�的低级 bytes 类型，而�是�个的字符。
 
 .. index:: ! bytes-concat, ! string-concat
 
 .. _bytes-concat:
 .. _string-concat:
 
-The functions ``bytes.concat`` and ``string.concat``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can concatenate an arbitrary number of ``string`` values using ``string.concat``.
-The function returns a single ``string memory`` array that contains the contents of the arguments without padding.
-If you want to use parameters of other types that are not implicitly convertible to ``string``, you need to convert them to ``string`` first.
+函数 ``bytes.concat`` 和 ``string.concat``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Analogously, the ``bytes.concat`` function can concatenate an arbitrary number of ``bytes`` or ``bytes1 ... bytes32`` values.
-The function returns a single ``bytes memory`` array that contains the contents of the arguments without padding.
-If you want to use string parameters or other types that are not implicitly convertible to ``bytes``, you need to convert them to ``bytes`` or ``bytes1``/.../``bytes32`` first.
+您�以使用 ``string.concat`` 连接任�数�的 ``string`` 值。
+该函数返回一个�一的 ``string memory`` 数组，其中包�没有填充的�数内容。
+如果您想使用�能��转�为 ``string`` 的其他类型的�数，您需�先将它们转�为 ``string``。
 
+�样， ``bytes.concat`` 函数�以连接任�数�的 ``bytes`` 或 ``bytes1 ... bytes32`` 值。
+该函数返回一个�一的 ``bytes memory`` 数组，其中包�没有填充的�数内容。
+如果您想使用字符串�数或其他�能��转�为 ``bytes`` 的类型，
+您需�先将它们转�为 ``bytes`` 或 ``bytes1`` /.../ ``bytes32``。
 
 .. code-block:: solidity
 
@@ -204,21 +191,18 @@ If you want to use string parameters or other types that are not implicitly conv
         }
     }
 
-If you call ``string.concat`` or ``bytes.concat`` without arguments they return an empty array.
+如果您�带�数调用 ``string.concat`` 或 ``bytes.concat``，它们会返回一个空数组。
 
 .. index:: ! array;allocating, new
 
-Allocating Memory Arrays
-^^^^^^^^^^^^^^^^^^^^^^^^
+创建内存数组
+^^^^^^^^^^^^^
 
-Memory arrays with dynamic length can be created using the ``new`` operator.
-As opposed to storage arrays, it is **not** possible to resize memory arrays (e.g.
-the ``.push`` member functions are not available).
-You either have to calculate the required size in advance
-or create a new memory array and copy every element.
+具有动�长度的内存数组�以使用 ``new`` �作符创建。
+与存储数组��的是，**��能** 调整内存数组的大�（例如， ``.push`` �员函数��用）。
+您必须事先计算出所需的大�，或者创建一个新的内存数组并�制�个元素。
 
-As all variables in Solidity, the elements of newly allocated arrays are always initialized
-with the :ref:`default value<default-value>`.
+正如Solidity中的所有��一样，新分�的数组元素总是以 :ref:`默认值 <default-value>` 进行�始化。
 
 .. code-block:: solidity
 
@@ -237,27 +221,22 @@ with the :ref:`default value<default-value>`.
 
 .. index:: ! literal;array, ! inline;arrays
 
-Array Literals
+数组字�常数
 ^^^^^^^^^^^^^^
 
-An array literal is a comma-separated list of one or more expressions, enclosed
-in square brackets (``[...]``). For example ``[1, a, f(3)]``. The type of the
-array literal is determined as follows:
+数组字�常数表达�是一个逗�分隔的一个或多个表达�的列表，用方括�（ ``[...]`` ）括起�。
+例如， ``[1, a, f(3)]``。数组字�常数的类型确定如下：
 
-It is always a statically-sized memory array whose length is the
-number of expressions.
+它总是一个��大�的内存数组，其长度是表达�的数�。
 
-The base type of the array is the type of the first expression on the list such that all
-other expressions can be implicitly converted to it. It is a type error
-if this is not possible.
+数组的基本类型是列表上第一个表达�的类型，这样所有其他表达�都�以��地转�为它。
+如果�能�到这一点，则会有一个类型错误。
 
-It is not enough that there is a type all the elements can be converted to. One of the elements
-has to be of that type.
+仅仅存在一个所有元素都�以转�的类型是�够的。其中一个元素必须是该类型的。
 
-In the example below, the type of ``[1, 2, 3]`` is
-``uint8[3] memory``, because the type of each of these constants is ``uint8``. If
-you want the result to be a ``uint[3] memory`` type, you need to convert
-the first element to ``uint``.
+在下�的例�中， ``[1, 2, 3]`` 的类型是 ``uint8[3] memory``，
+因为这些常�的类型都是 ``uint8``。如果您想让结果是 ``uint[3] memory`` 类型，
+您需�把第一个元素转�为 ``uint``。
 
 .. code-block:: solidity
 
@@ -273,13 +252,12 @@ the first element to ``uint``.
         }
     }
 
-The array literal ``[1, -1]`` is invalid because the type of the first expression
-is ``uint8`` while the type of the second is ``int8`` and they cannot be implicitly
-converted to each other. To make it work, you can use ``[int8(1), -1]``, for example.
+数组表达� ``[1, -1]`` 是无效的，因为第一个表达�的类型是 ``uint8``，
+而第二个表达�的类型是 ``int8``，它们�能相互��转�。为了使其有效，
+例如，您�以使用 ``[int8(1), -1]``。
 
-Since fixed-size memory arrays of different type cannot be converted into each other
-(even if the base types can), you always have to specify a common base type explicitly
-if you want to use two-dimensional array literals:
+由于��类型的固定大�的内存数组�能相互转�（�使基类�以），
+如果您想使用二维数组字�常数，您必须总是明确指定一个共�的基类：
 
 .. code-block:: solidity
 
@@ -289,34 +267,30 @@ if you want to use two-dimensional array literals:
     contract C {
         function f() public pure returns (uint24[2][4] memory) {
             uint24[2][4] memory x = [[uint24(0x1), 1], [0xffffff, 2], [uint24(0xff), 3], [uint24(0xffff), 4]];
-            // The following does not work, because some of the inner arrays are not of the right type.
+            // 下�的方法�会起作用，因为一些内部数组的类型�对。
             // uint[2][4] memory x = [[0x1, 1], [0xffffff, 2], [0xff, 3], [0xffff, 4]];
             return x;
         }
     }
 
-Fixed size memory arrays cannot be assigned to dynamically-sized
-memory arrays, i.e. the following is not possible:
+固定大�的内存数组�能分�给动�大�的内存数组，也就是说，以下情况是��能的：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.4.0 <0.9.0;
 
-    // This will not compile.
+    // 这�会被编译。
     contract C {
         function f() public {
-            // The next line creates a type error because uint[3] memory
-            // cannot be converted to uint[] memory.
+            // 下一行会产生一个类型错误，因为uint[3]内存�能被转�为uint[]内存。
             uint[] memory x = [uint(1), 3, 4];
         }
     }
 
-It is planned to remove this restriction in the future, but it creates some
-complications because of how arrays are passed in the ABI.
+计划在将��消这一�制，但由于ABI中数组的传递方�，它产生了一些��的问题。
 
-If you want to initialize dynamically-sized arrays, you have to assign the
-individual elements:
+如果您想�始化动�大�的数组，您必须分��个元素：
 
 .. code-block:: solidity
 
@@ -336,45 +310,44 @@ individual elements:
 
 .. _array-members:
 
-Array Members
-^^^^^^^^^^^^^
+数组�员
+^^^^^^^^^^
 
 **length**:
-    Arrays have a ``length`` member that contains their number of elements.
-    The length of memory arrays is fixed (but dynamic, i.e. it can depend on
-    runtime parameters) once they are created.
+    数组有 ``length`` �员��表示当�数组的长度。一�创建，
+    内存memory数组的大�就是固定的（但�是动�的，也就是说，它�赖于�行时的�数）。
 **push()**:
-     Dynamic storage arrays and ``bytes`` (not ``string``) have a member function
-     called ``push()`` that you can use to append a zero-initialised element at the end of the array.
-     It returns a reference to the element, so that it can be used like
-     ``x.push().t = 2`` or ``x.push() = b``.
+    动�存储数组和 ``bytes`` （�是 ``string`` ）有一个� ``push()`` 的�员函数，
+    您�以用它在数组的末尾追加一个零�始化的元素。它返回一个元素的引用，
+    因此�以� ``x.push().t = 2`` 或 ``x.push() = b`` 那样使用。
 **push(x)**:
-     Dynamic storage arrays and ``bytes`` (not ``string``) have a member function
-     called ``push(x)`` that you can use to append a given element at the end of the array.
-     The function returns nothing.
+    动�存储数组和 ``bytes`` （�是 ``string`` ）有一个� ``push(x)`` 的�员函数，
+    您�以用它在数组的末端追加一个指定的元素。该函数�返回任何东西。
 **pop()**:
-     Dynamic storage arrays and ``bytes`` (not ``string``) have a member
-     function called ``pop()`` that you can use to remove an element from the
-     end of the array. This also implicitly calls :ref:`delete<delete>` on the removed element. The function returns nothing.
+    动�存储数组和 ``bytes`` （�是 ``string`` ）有一个� ``pop()`` 的�员函数，
+    您�以用它�从数组的末端移除一个元素。
+    这也��地在被删除的元素上调用 :ref:`delete <delete>`。该函数�返回任何东西。
 
 .. note::
-    Increasing the length of a storage array by calling ``push()``
-    has constant gas costs because storage is zero-initialised,
-    while decreasing the length by calling ``pop()`` has a
-    cost that depends on the "size" of the element being removed.
-    If that element is an array, it can be very costly, because
-    it includes explicitly clearing the removed
-    elements similar to calling :ref:`delete<delete>` on them.
+    通过调用 ``push()`` 增加存储数组的长度有�定的气体�本，因为存储是零�始化的，
+    而通过调用 ``pop()`` �少长度的�本�决于被移除元素的 "大�"。
+    如果该元素是一个数组，它的�本�能�常高，
+    因为它包括明确地清除被移除的元素，类似于对它们调用 :ref:`delete <delete>`。
 
 .. note::
-    To use arrays of arrays in external (instead of public) functions, you need to
-    activate ABI coder v2.
+    �在外部（而�是公开）函数中使用数组的数组，
+    您需�激活ABI coder v2。
 
 .. note::
+<<<<<<< HEAD
+    在Byzantium之�的EVM版本中，��能访问从函数调用返回的动�数组。
+    如果您调用返回动�数组的函数，请确�使用设置为Byzantium模�的EVM。
+=======
     In EVM versions before Byzantium, it was not possible to access
     dynamic arrays returned from function calls. If you call functions
     that return dynamic arrays, make sure to use an EVM that is set to
     Byzantium mode.
+>>>>>>> english/develop
 
 .. code-block:: solidity
 
@@ -383,20 +356,19 @@ Array Members
 
     contract ArrayContract {
         uint[2**20] aLotOfIntegers;
-        // Note that the following is not a pair of dynamic arrays but a
-        // dynamic array of pairs (i.e. of fixed size arrays of length two).
-        // In Solidity, T[k] and T[] are always arrays with elements of type T,
-        // even if T itself is an array.
-        // Because of that, bool[2][] is a dynamic array of elements
-        // that are bool[2]. This is different from other languages, like C.
-        // Data location for all state variables is storage.
+        // 请注�，下��是一对动�数组，
+        // 而是一个动�数组对（�长度为2的固定大�数组）。
+        // 在 Solidity 中，T[k]和T[]总是具有T类型元素的数组，
+        // �使T本身是一个数组。
+        // 正因为如此，bool[2][]是一个动�数组对，其元素是bool[2]。
+        // 这与其他语言��，比如C，
+        // 所有状���的数��置都是存储。
         bool[2][] pairsOfFlags;
 
-        // newPairs is stored in memory - the only possibility
-        // for public contract function arguments
+        // newPairs被存储在memory中--这是公开�约函数�数的唯一�能性。
         function setAllFlagPairs(bool[2][] memory newPairs) public {
-            // assignment to a storage array performs a copy of ``newPairs`` and
-            // replaces the complete array ``pairsOfFlags``.
+            // 赋值到一个存储数组会执行 ``newPairs`` 的拷�，
+            // 并替�完整的数组 ``pairsOfFlags``。
             pairsOfFlags = newPairs;
         }
 
@@ -407,25 +379,23 @@ Array Members
         StructType s;
 
         function f(uint[] memory c) public {
-            // stores a reference to ``s`` in ``g``
+            // 在 ``g`` 中存储一个对 ``s`` 的引用。
             StructType storage g = s;
-            // also changes ``s.moreInfo``.
+            // 也改�了 ``s.moreInfo``.
             g.moreInfo = 2;
-            // assigns a copy because ``g.contents``
-            // is not a local variable, but a member of
-            // a local variable.
+            // 指定一个拷�，因为 ``g.contents`` �是一个局部��，
+            // 而是一个局部��的�员。
             g.contents = c;
         }
 
         function setFlagPair(uint index, bool flagA, bool flagB) public {
-            // access to a non-existing index will throw an exception
+            // 访问一个�存在的数组索引会引�一个异常
             pairsOfFlags[index][0] = flagA;
             pairsOfFlags[index][1] = flagB;
         }
 
         function changeFlagArraySize(uint newSize) public {
-            // using push and pop is the only way to change the
-            // length of an array
+            // 使用push和pop是改�数组长度的唯一方法。
             if (newSize < pairsOfFlags.length) {
                 while (pairsOfFlags.length > newSize)
                     pairsOfFlags.pop();
@@ -436,18 +406,18 @@ Array Members
         }
 
         function clear() public {
-            // these clear the arrays completely
+            // 这些完全清除了数组
             delete pairsOfFlags;
             delete aLotOfIntegers;
-            // identical effect here
+            // 这里有相�的效果
             pairsOfFlags = new bool[2][](0);
         }
 
         bytes byteData;
 
         function byteArrays(bytes memory data) public {
-            // byte arrays ("bytes") are different as they are stored without padding,
-            // but can be treated identical to "uint8[]"
+            // 字节数组（"byte"）是��的，因为它们的存储没有填充，
+            // 但�以与 "uint8[]"相�。
             byteData = data;
             for (uint i = 0; i < 7; i++)
                 byteData.push();
@@ -461,14 +431,13 @@ Array Members
         }
 
         function createMemoryArray(uint size) public pure returns (bytes memory) {
-            // Dynamic memory arrays are created using `new`:
+            // 使用 `new` 创建动� memory 数组：
             uint[2][] memory arrayOfPairs = new uint[2][](size);
 
-            // Inline arrays are always statically-sized and if you only
-            // use literals, you have to provide at least one type.
+            // 内�数组总是��大�的，如果您�使用字�常数表达�，您必须至少�供一�类型。
             arrayOfPairs[0] = [uint(1), 2];
 
-            // Create a dynamic byte array:
+            // 创建一个动�字节数组：
             bytes memory b = new bytes(200);
             for (uint i = 0; i < b.length; i++)
                 b[i] = bytes1(uint8(i));
@@ -478,13 +447,13 @@ Array Members
 
 .. index:: ! array;dangling storage references
 
-Dangling References to Storage Array Elements
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+对存储数组元素的悬空引用（Dangling References）
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-When working with storage arrays, you need to take care to avoid dangling references.
-A dangling reference is a reference that points to something that no longer exists or has been
-moved without updating the reference. A dangling reference can for example occur, if you store a
-reference to an array element in a local variable and then ``.pop()`` from the containing array:
+当使用存储数组时，您需�注���悬空引用。
+悬空引用是指一个指���存在的或已�被移动而未更新引用的内容的引用。
+例如，如果您将一个数组元素的引用存储在一个局部��中，
+然�从包�数组中使用 ``.pop()``，就�能�生悬空引用：
 
 .. code-block:: solidity
 
@@ -495,28 +464,28 @@ reference to an array element in a local variable and then ``.pop()`` from the c
         uint[][] s;
 
         function f() public {
-            // Stores a pointer to the last array element of s.
+            // 存储一个指�s的最�一个数组元素的指针。
             uint[] storage ptr = s[s.length - 1];
-            // Removes the last array element of s.
+            // 删除s的最�一个数组元素。
             s.pop();
-            // Writes to the array element that is no longer within the array.
+            // 写入已�在数组内的数组元素。
             ptr.push(0x42);
-            // Adding a new element to ``s`` now will not add an empty array, but
-            // will result in an array of length 1 with ``0x42`` as element.
+            // 现在� ``s`` 添加一个新元素�会添加一个空数组，
+            // 而是会产生一个长度为1的数组，元素为 ``0x42``。
             s.push();
             assert(s[s.length - 1][0] == 0x42);
         }
     }
 
-The write in ``ptr.push(0x42)`` will **not** revert, despite the fact that ``ptr`` no
-longer refers to a valid element of ``s``. Since the compiler assumes that unused storage
-is always zeroed, a subsequent ``s.push()`` will not explicitly write zeroes to storage,
-so the last element of ``s`` after that ``push()`` will have length ``1`` and contain
-``0x42`` as its first element.
+``ptr.push(0x42)`` 中的写法 **�会** ���作，尽管 ``ptr`` ��指� ``s`` 的一个有效元素。
+由于编译器�定未使用的存储空间总是被清零，
+��的 ``s.push()`` �会明确地将零写入存储空间，
+所以在 ``push()`` 之�， ``s`` 的最�一个元素的长度是 ``1``，
+并且包� ``0x42`` 作为其第一个元素。
 
-Note that Solidity does not allow to declare references to value types in storage. These kinds
-of explicit dangling references are restricted to nested reference types. However, dangling references
-can also occur temporarily when using complex expressions in tuple assignments:
+注�，Solidity ��许在存储中声明对值类型的引用。
+这类显�的悬空引用被�制在嵌套引用类型中。然而，
+当在数组赋值中使用��表达�时，悬空引用也会短暂�生：
 
 .. code-block:: solidity
 
@@ -527,7 +496,7 @@ can also occur temporarily when using complex expressions in tuple assignments:
         uint[] s;
         uint[] t;
         constructor() {
-            // Push some initial values to the storage arrays.
+            // �存储数组推�一些�始值。
             s.push(0x07);
             t.push(0x03);
         }
@@ -538,32 +507,29 @@ can also occur temporarily when using complex expressions in tuple assignments:
         }
 
         function f() public returns (uint[] memory) {
-            // The following will first evaluate ``s.push()`` to a reference to a new element
-            // at index 1. Afterwards, the call to ``g`` pops this new element, resulting in
-            // the left-most tuple element to become a dangling reference. The assignment still
-            // takes place and will write outside the data area of ``s``.
+            // 下�将首先评估 ``s.push()` 到一个索引为1的新元素的引用。
+            // 之�，调用 ``g`` 弹出这个新元素，
+            // 导致最左边的元组元素�为一个悬空的引用。
+            // 赋值�然�生，并将写入 ``s`` 的数�区域之外。
             (s.push(), g()[0]) = (0x42, 0x17);
-            // A subsequent push to ``s`` will reveal the value written by the previous
-            // statement, i.e. the last element of ``s`` at the end of this function will have
-            // the value ``0x42``.
+            // ��对 ``s`` 的推�将显示�一个语�写入的值，
+            // �在这个函数结�时 ``s`` 的最�一个元素将有 ``0x42`` 的值。
             s.push();
             return s;
         }
     }
 
-It is always safer to only assign to storage once per statement and to avoid
-complex expressions on the left-hand-side of an assignment.
+��语��对存储进行一次赋值，并��在赋值的左侧使用��的表达�，这样�总是比较安全的。
 
-You need to take particular care when dealing with references to elements of
-``bytes`` arrays, since a ``.push()`` on a bytes array may switch :ref:`from short
-to long layout in storage<bytes-and-string>`.
+您需�特别�心处�对 ``bytes`` 数组元素的引用，
+因为 bytes 数组的  ``.push()`` �作�能会 :ref:`在存储中从短布局切�到长布局 <bytes-and-string>`。
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0 <0.9.0;
 
-    // This will report a warning
+    // 这将报告一个警告
     contract C {
         bytes x = "012345678901234567890123456789";
 
@@ -573,75 +539,80 @@ to long layout in storage<bytes-and-string>`.
         }
     }
 
-Here, when the first ``x.push()`` is evaluated, ``x`` is still stored in short
-layout, thereby ``x.push()`` returns a reference to an element in the first storage slot of
-``x``. However, the second ``x.push()`` switches the bytes array to large layout.
-Now the element that ``x.push()`` referred to is in the data area of the array while
-the reference still points at its original location, which is now a part of the length field
-and the assignment will effectively garble the length of ``x``.
-To be safe, only enlarge bytes arrays by at most one element during a single
-assignment and do not simultaneously index-access the array in the same statement.
-
+这里，当第一个 ``x.push()`` 被�算时， ``x`` �然被存储在短布局中，
+因此 ``x.push()`` 返回对 ``x`` 的第一个存储槽中元素的引用。
+然而，第二个 ``x.push()`` 将字节数组切�为长布局。
+现在 ``x.push()`` 所指的元素在数组的数�区，
+而引用�然指�它原�的�置，现在它是长度字段的一部分，
+赋值将有效地扰乱 ``x`` 的长度。
+为了安全起�，在一次赋值中最多�放大字节数组中的一个元素，
+��在�一语�中�时对数组进行索引存�。
+
+<<<<<<< HEAD
+虽然上��述了当�版本的编译器中悬空存储引用的行为，
+但任何带有悬空引用的代�都应被视为具有 *未定义行为*。
+特别的是，这�味�任何未�版本的编译器都�能改�涉�悬空引用的代�的行为。
+=======
 While the above describes the behavior of dangling storage references in the
 current version of the compiler, any code with dangling references should be
 considered to have *undefined behavior*. In particular, this means that
 any future version of the compiler may change the behavior of code that
 involves dangling references.
+>>>>>>> english/develop
 
-Be sure to avoid dangling references in your code!
+请确���在您的代�中出现悬空引用。
 
 .. index:: ! array;slice
 
 .. _array-slices:
 
-Array Slices
+数组切片
 ------------
 
 
-Array slices are a view on a contiguous portion of an array.
-They are written as ``x[start:end]``, where ``start`` and
-``end`` are expressions resulting in a uint256 type (or
-implicitly convertible to it). The first element of the
-slice is ``x[start]`` and the last element is ``x[end - 1]``.
+数组切片是对一个数组的连续部分的预览。
+它们被写� ``x[start:end]``，其中 ``start`` 和 ``end`` 是表达�，
+结果是uint256类型（或��的�转�类型）。分片的第一个元素是 ``x[start]``，
+最�一个元素是 ``x[end - 1]``。
 
-If ``start`` is greater than ``end`` or if ``end`` is greater
-than the length of the array, an exception is thrown.
+如果 ``start`` 大于 ``end``，或者 ``end`` 大于数组的长度，
+就会出现异常。
 
-Both ``start`` and ``end`` are optional: ``start`` defaults
-to ``0`` and ``end`` defaults to the length of the array.
+``start`` 和 ``end`` 都是�选的： ``start`` 默认为 ``0``，
+``end`` 默认为数组的长度。
 
-Array slices do not have any members. They are implicitly
-convertible to arrays of their underlying type
-and support index access. Index access is not absolute
-in the underlying array, but relative to the start of
-the slice.
+数组切片没有任何�员。它们�以��地转�为其底层类型的数组并支�索引访问。
+索引访问在底层数组中�是�对的，而是相对于分片的开始。
 
-Array slices do not have a type name which means
-no variable can have an array slices as type,
-they only exist in intermediate expressions.
+数组切片没有类型�，这�味�任何��都�能以数组切片为类型，
+它们�存在于中间表达�中。
 
 .. note::
-    As of now, array slices are only implemented for calldata arrays.
+    到现在为止，数组切片�有calldata数组�以实现。
 
-Array slices are useful to ABI-decode secondary data passed in function parameters:
+数组切片对于ABI解�在函数�数中传递的二级数�很有用：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.5 <0.9.0;
     contract Proxy {
-        /// @dev Address of the client contract managed by proxy i.e., this contract
+        /// @dev 由代�管�的客户�约的地�，�本�约的地�
         address client;
 
         constructor(address client_) {
             client = client_;
         }
 
-        /// Forward call to "setOwner(address)" that is implemented by client
-        /// after doing basic validation on the address argument.
+        /// 转�对 "setOwner(address)" 的调用，
+        /// 该调用在对地��数进行基本验��由客户端执行。
         function forward(bytes calldata payload) external {
             bytes4 sig = bytes4(payload[:4]);
+<<<<<<< HEAD
+            // 由于截断行为，bytes4(payload)的表现是相�的。
+=======
             // Due to truncating behavior, bytes4(payload) performs identically.
+>>>>>>> english/develop
             // bytes4 sig = bytes4(payload);
             if (sig == bytes4(keccak256("setOwner(address)"))) {
                 address owner = abi.decode(payload[4:], (address));
@@ -658,29 +629,27 @@ Array slices are useful to ABI-decode secondary data passed in function paramete
 
 .. _structs:
 
-Structs
+结构体
 -------
 
-Solidity provides a way to define new types in the form of structs, which is
-shown in the following example:
+Solidity �供了一�以结构形�定义新类型的方法，以下是一个结构体使用的示例：
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.6.0 <0.9.0;
 
-    // Defines a new type with two fields.
-    // Declaring a struct outside of a contract allows
-    // it to be shared by multiple contracts.
-    // Here, this is not really needed.
+    // 定义一个包�两个属性的新类型。
+    // 在�约之外声明一个结构，
+    // �以让它被多个�约所共享。
+    // 在这里，这并�是真的需�。
     struct Funder {
         address addr;
         uint amount;
     }
 
     contract CrowdFunding {
-        // Structs can also be defined inside contracts, which makes them
-        // visible only there and in derived contracts.
+        // 结构体也�以被定义在�约内部，这使得它们�在本�约和派生�约中��。
         struct Campaign {
             address payable beneficiary;
             uint fundingGoal;
@@ -693,9 +662,9 @@ shown in the following example:
         mapping(uint => Campaign) campaigns;
 
         function newCampaign(address payable beneficiary, uint goal) public returns (uint campaignID) {
-            campaignID = numCampaigns++; // campaignID is return variable
-            // We cannot use "campaigns[campaignID] = Campaign(beneficiary, goal, 0, 0)"
-            // because the right hand side creates a memory-struct "Campaign" that contains a mapping.
+            campaignID = numCampaigns++; // campaignID 作为一个��返回
+            // 我们�能使用 "campaigns[campaignID] = Campaign(beneficiary, goal, 0, 0)"
+            // 因为�侧创建了一个内存结构 "Campaign"，其中包�一个映射。
             Campaign storage c = campaigns[campaignID];
             c.beneficiary = beneficiary;
             c.fundingGoal = goal;
@@ -703,9 +672,9 @@ shown in the following example:
 
         function contribute(uint campaignID) public payable {
             Campaign storage c = campaigns[campaignID];
-            // Creates a new temporary memory struct, initialised with the given values
-            // and copies it over to storage.
-            // Note that you can also use Funder(msg.sender, msg.value) to initialise.
+            // 以给定的值�始化，创建一个新的临时 memory 结构体，
+            // 并将其拷�到 storage 中。
+            // 注�您也�以使用 Funder(msg.sender, msg.value) ��始化。
             c.funders[c.numFunders++] = Funder({addr: msg.sender, amount: msg.value});
             c.amount += msg.value;
         }
@@ -721,26 +690,23 @@ shown in the following example:
         }
     }
 
-The contract does not provide the full functionality of a crowdfunding
-contract, but it contains the basic concepts necessary to understand structs.
-Struct types can be used inside mappings and arrays and they can themselves
-contain mappings and arrays.
+上�的�约并没有�供众筹�约的全部功能，
+但它包�了�解结构体所需的基本概念。
+结构类型�以在映射和数组内使用，
+它们本身�以包�映射和数组。
 
-It is not possible for a struct to contain a member of its own type,
-although the struct itself can be the value type of a mapping member
-or it can contain a dynamically-sized array of its type.
-This restriction is necessary, as the size of the struct has to be finite.
+结构体��能包�其自身类型的�员，尽管结构本身�以是映射�员的值类型，
+或者它�以包�其类型的动�大�的数组。
+这一�制是必�的，因为结构的大�必须是有�的。
 
-Note how in all the functions, a struct type is assigned to a local variable
-with data location ``storage``.
-This does not copy the struct but only stores a reference so that assignments to
-members of the local variable actually write to the state.
+注�在所有的函数中，结构类型被分�到数��置为 ``storage`` 的局部��。
+这并�是拷�结构体，而�是存储一个引用，
+因此对本地���员的赋值实际上是写入状�。
 
-Of course, you can also directly access the members of the struct without
-assigning it to a local variable, as in
-``campaigns[campaignID].amount = 0``.
+当然，您也�以直接访问该结构的�员，
+而�把它分�给本地��，如 ``campaigns[campaignID].amount = 0``。
 
 .. note::
-    Until Solidity 0.7.0, memory-structs containing members of storage-only types (e.g. mappings)
-    were allowed and assignments like ``campaigns[campaignID] = Campaign(beneficiary, goal, 0, 0)``
-    in the example above would work and just silently skip those members.
+    在 Solidity 0.7.0 之�，包�仅有存储类型（例如映射）的�员的内存结构是�许的，
+    �上�例�中的 ``campaigns[campaignID] = Campaign(beneficiary, goal, 0, 0)`` 这样的赋值是�以的，
+    �是会默默地跳过这些�员。
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 9fcb49b2131a..22571b26d4e5 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -1,131 +1,128 @@
 .. index:: ! value type, ! type;value
 .. _value-types:
 
-Value Types
-===========
+值类型
+========
 
-The following are called value types because their variables will always be passed by value, i.e. they are always copied when they
-are used as function arguments or in assignments.
+以下被称为值类型，因为它们的��总是按值传递，
+也就是说，当这些��被用作函数�数或者用在赋值语�中时，总会进行值拷�。
 
 .. index:: ! bool, ! true, ! false
 
-Booleans
+布尔类型
 --------
 
-``bool``: The possible values are constants ``true`` and ``false``.
+``bool`` ：�能的�值为常数值 ``true`` 和 ``false``。
 
-Operators:
+�算符：
 
-*  ``!`` (logical negation)
-*  ``&&`` (logical conjunction, "and")
-*  ``||`` (logical disjunction, "or")
-*  ``==`` (equality)
-*  ``!=`` (inequality)
+*  ``!`` (逻辑�)
+*  ``&&`` (逻辑与, "and")
+*  ``||`` (逻辑或, "or")
+*  ``==`` (等于)
+*  ``!=`` (�等于)
 
-The operators ``||`` and ``&&`` apply the common short-circuiting rules. This means that in the expression ``f(x) || g(y)``, if ``f(x)`` evaluates to ``true``, ``g(y)`` will not be evaluated even if it may have side-effects.
+�算符 ``||`` 和 ``&&`` 都�循�样的短路（ short-circuiting ）规则。
+就是说在表达� ``f(x) || g(y)`` 中， 如果 ``f(x)`` 的值为 ``true`` ，
+那么 ``g(y)`` 就�会被执行，�使会出现一些副作用。
 
 .. index:: ! uint, ! int, ! integer
 .. _integers:
 
-Integers
---------
+æ•´åž‹
+------
 
-``int`` / ``uint``: Signed and unsigned integers of various sizes. Keywords ``uint8`` to ``uint256`` in steps of ``8`` (unsigned of 8 up to 256 bits) and ``int8`` to ``int256``. ``uint`` and ``int`` are aliases for ``uint256`` and ``int256``, respectively.
+``int`` / ``uint``: 分别表示有符�和无符�的���数的整型��。
+关键字 ``uint8`` 到 ``uint256`` （无符�整型，从 8 �到 256 �）以� ``int8`` 到 ``int256``，
+以 8 �为步长递增。 ``uint`` 和 ``int`` 分别是 ``uint256`` 和 ``int256`` 的别�。
 
-Operators:
+�算符：
 
-* Comparisons: ``<=``, ``<``, ``==``, ``!=``, ``>=``, ``>`` (evaluate to ``bool``)
-* Bit operators: ``&``, ``|``, ``^`` (bitwise exclusive or), ``~`` (bitwise negation)
-* Shift operators: ``<<`` (left shift), ``>>`` (right shift)
-* Arithmetic operators: ``+``, ``-``, unary ``-`` (only for signed integers), ``*``, ``/``, ``%`` (modulo), ``**`` (exponentiation)
+* 比较�算符： ``<=``， ``<``， ``==``， ``!=``， ``>=``， ``>`` （返回布尔值）
+* ��算符： ``&``， ``|``， ``^`` (异或)， ``~`` (���)
+* 移��算符： ``<<`` （左移）， ``>>`` （�移）
+* 算数�算符： ``+``， ``-``， 一元�算 ``-`` （�适用于有符�的整数）， ``*``， ``/``， ``%`` (�余)， ``**`` (幂)
 
-For an integer type ``X``, you can use ``type(X).min`` and ``type(X).max`` to
-access the minimum and maximum value representable by the type.
+对于一个整数类型 ``X``，您�以使用 ``type(X).min`` 和 ``type(X).max`` �访问该类型代表的最�值和最大值。
 
 .. warning::
 
-  Integers in Solidity are restricted to a certain range. For example, with ``uint32``, this is ``0`` up to ``2**32 - 1``.
-  There are two modes in which arithmetic is performed on these types: The "wrapping" or "unchecked" mode and the "checked" mode.
-  By default, arithmetic is always "checked", meaning that if an operation's result falls outside the value range
-  of the type, the call is reverted through a :ref:`failing assertion<assert-and-require>`. You can switch to "unchecked" mode
-  using ``unchecked { ... }``. More details can be found in the section about :ref:`unchecked <unchecked>`.
+  Solidity 中的整数被�制在一个特定的范围内。例如，对于 ``uint32``，这是 ``0`` 到 ``2**32 - 1``。
+  有两�模�在这些类型上进行算术。“包装� 或 “�检查� 模�和 “检查� 模�。
+  默认情况下，算术总是 “检查� 模�的，这�味�如果一个�作的结果超出了该类型的值范围，
+  调用将通过一个 :ref:`失败的断言 <assert-and-require>` 而被��。
+  您�以用 ``unchecked { ... }`` 切�到 “�检查� 模�。更多的细节�以在关于 :ref:`�检查 <unchecked>` 的章节中找到。
 
-Comparisons
+比较�算
 ^^^^^^^^^^^
 
-The value of a comparison is the one obtained by comparing the integer value.
+比较的值是通过比较整数值得到的值。
 
-Bit operations
+��算
 ^^^^^^^^^^^^^^
 
-Bit operations are performed on the two's complement representation of the number.
-This means that, for example ``~int256(0) == int256(-1)``.
+��作是在数字的二进制补�表示上进行的。
+这�味�，例如 ``~int256(0) == int256(-1)``。
 
-Shifts
-^^^^^^
+移��算
+^^^^^^^^^^^
 
-The result of a shift operation has the type of the left operand, truncating the result to match the type.
-The right operand must be of unsigned type, trying to shift by a signed type will produce a compilation error.
+移��作的结果具有左�作数的类型，将结果截断以符�类型。
+��作数必须是无符�类型，试图对有符�类型进行移�会产生一个编译错误。
 
-Shifts can be "simulated" using multiplication by powers of two in the following way. Note that the truncation
-to the type of the left operand is always performed at the end, but not mentioned explicitly.
+移��以通过以下方�用2的幂的乘法� "模拟"。
+请注�，对左边�作数类型的截断总是在最�进行，但没有明确��。
 
-- ``x << y`` is equivalent to the mathematical expression ``x * 2**y``.
-- ``x >> y`` is equivalent to the mathematical expression ``x / 2**y``, rounded towards negative infinity.
+- ``x << y`` 等�于数学表达� ``x * 2**y``。
+- ``x >> y`` 等�于数学表达� ``x / 2**y``，�负无穷远的方��整。
 
 .. warning::
-    Before version ``0.5.0`` a right shift ``x >> y`` for negative ``x`` was equivalent to
-    the mathematical expression ``x / 2**y`` rounded towards zero,
-    i.e., right shifts used rounding up (towards zero) instead of rounding down (towards negative infinity).
+    在 ``0.5.0`` 版本之�，负数 ``x`` 的�移 ``x >> y`` 相当于数学表达� ``x / 2**y`` �零�入，
+    ��移使用�上�入（�零�入）而�是�下�入（�负无穷大）。
 
 .. note::
-    Overflow checks are never performed for shift operations as they are done for arithmetic operations.
-    Instead, the result is always truncated.
+    就�对算术�作那样，对移��作从�进行溢出检查。相�，结果总是被截断的。
 
-Addition, Subtraction and Multiplication
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+加法��法和乘法
+^^^^^^^^^^^^^^^^^^
 
-Addition, subtraction and multiplication have the usual semantics, with two different
-modes in regard to over- and underflow:
+加法��法和乘法具有通常的语义，在上溢和下溢方�有两���的模�：
 
-By default, all arithmetic is checked for under- or overflow, but this can be disabled
-using the :ref:`unchecked block<unchecked>`, resulting in wrapping arithmetic. More details
-can be found in that section.
+默认情况下，所有的算术都会被检查是�有下溢或上溢，但这�以用 :ref:`�检查�制 <unchecked>` ��用。
+这会导致包装的算术。更多细节�以在那一节中找到。
 
-The expression ``-x`` is equivalent to ``(T(0) - x)`` where
-``T`` is the type of ``x``. It can only be applied to signed types.
-The value of ``-x`` can be
-positive if ``x`` is negative. There is another caveat also resulting
-from two's complement representation:
+表达� ``-x`` 等�于 ``(T(0) - x)``，其中
+``T`` 是 ``x`` 的类型。它�能用于有符�的类型。
+如果 ``x`` 是负的， ``-x`` 的值就是正的。
+还有一个注�事项也是由二进制补�表示产生的：
 
-If you have ``int x = type(int).min;``, then ``-x`` does not fit the positive range.
-This means that ``unchecked { assert(-x == x); }`` works, and the expression ``-x``
-when used in checked mode will result in a failing assertion.
+如果您有（这样的表达�） ``int x = type(int).min;``，那么 ``-x`` 就�符�正数范围。
+这�味� ``unchecked { assert(-x == x); }`` �以工作，
+而表达� ``-x`` 在检查模�下使用时将导致断言失败。
 
-Division
+除法
 ^^^^^^^^
 
-Since the type of the result of an operation is always the type of one of
-the operands, division on integers always results in an integer.
-In Solidity, division rounds towards zero. This means that ``int256(-5) / int256(2) == int256(-2)``.
+由于�算结果的类型总是�作数之一的类型，整数除法的结果总是一个整数。
+在 Solidity 中，除法是�零进�的。这�味� ``int256(-5) / int256(2) == int256(-2)``。
 
-Note that in contrast, division on :ref:`literals<rational_literals>` results in fractional values
-of arbitrary precision.
+请注�，与此相�，在 :ref:`字�上 <rational_literals>` 的除法会产生任�精度的分数值。
 
 .. note::
-  Division by zero causes a :ref:`Panic error<assert-and-require>`. This check can **not** be disabled through ``unchecked { ... }``.
+  除以0会导致 :ref:`异常 <assert-and-require>`。这个检查 **�能** 通过 ``unchecked { ... }`` �用。
 
 .. note::
-  The expression ``type(int).min / (-1)`` is the only case where division causes an overflow.
-  In checked arithmetic mode, this will cause a failing assertion, while in wrapping
-  mode, the value will be ``type(int).min``.
+  表达� ``type(int).min / (-1)`` 是除法导致溢出的唯一情况。
+  在检查算术模�下，这将导致一个失败的断言，
+  而在包装模�下，值将是 ``type(int).min``。
 
-Modulo
+�余
 ^^^^^^
 
-The modulo operation ``a % n`` yields the remainder ``r`` after the division of the operand ``a``
-by the operand ``n``, where ``q = int(a / n)`` and ``r = a - (n * q)``. This means that modulo
-results in the same sign as its left operand (or zero) and ``a % n == -(-a % n)`` holds for negative ``a``:
+模数�算 ``a % n`` 是�作数 ``a`` 除以�作数 ``n`` �产生余数 ``r``，
+其中 ``q = int(a / n)`` 和 ``r = a - (n * q)``。
+这�味�模数�算结果与它的左边�作数（或零）拥有相�的符�，
+``a % n == -(-a % n)`` 对负的 ``a`` �说�立。
 
 * ``int256(5) % int256(2) == int256(1)``
 * ``int256(5) % int256(-2) == int256(1)``
@@ -133,113 +130,115 @@ results in the same sign as its left operand (or zero) and ``a % n == -(-a % n)`
 * ``int256(-5) % int256(-2) == int256(-1)``
 
 .. note::
-  Modulo with zero causes a :ref:`Panic error<assert-and-require>`. This check can **not** be disabled through ``unchecked { ... }``.
+  对0�余会导致 :ref:`异常 <assert-and-require>`。这个检查 **�能** 通过 ``unchecked { ... }`` �用。
 
-Exponentiation
-^^^^^^^^^^^^^^
+幂�算
+^^^^^^
 
+<<<<<<< HEAD
+幂�算�适用于指数中的无符�类型。幂�算的结果类型总是等于基数的类型。
+请注�，它�足够大以容纳结果，并为潜在的断言失败或包装行为�好准备。
+=======
 Exponentiation is only available for unsigned types in the exponent. The resulting type
 of an exponentiation is always equal to the type of the base. Please take care that it is
 large enough to hold the result and prepare for potential assertion failures or wrapping behavior.
+>>>>>>> english/develop
 
 .. note::
-  In checked mode, exponentiation only uses the comparatively cheap ``exp`` opcode for small bases.
-  For the cases of ``x**3``, the expression ``x*x*x`` might be cheaper.
-  In any case, gas cost tests and the use of the optimizer are advisable.
+  在检查模�下，幂�算�对�基数使用相对便宜的 ``exp`` �作�。
+  对于 ``x**3`` 的情况，表达� ``x*x*x`` �能更便宜。
+  在任何情况下，气体�本测试和使用优化器都是��的。
 
 .. note::
-  Note that ``0**0`` is defined by the EVM as ``1``.
+  请注�， ``0**0`` 被EVM定义为 ``1``。
 
 .. index:: ! ufixed, ! fixed, ! fixed point number
 
-Fixed Point Numbers
--------------------
+定长浮点型
+------------
 
 .. warning::
-    Fixed point numbers are not fully supported by Solidity yet. They can be declared, but
-    cannot be assigned to or from.
+    Solidity 还没有完全支�定长浮点型。�以声明定长浮点型的��，
+    但�能给它们赋值或把它们赋值给其他��。
 
-``fixed`` / ``ufixed``: Signed and unsigned fixed point number of various sizes. Keywords ``ufixedMxN`` and ``fixedMxN``, where ``M`` represents the number of bits taken by
-the type and ``N`` represents how many decimal points are available. ``M`` must be divisible by 8 and goes from 8 to 256 bits. ``N`` must be between 0 and 80, inclusive.
-``ufixed`` and ``fixed`` are aliases for ``ufixed128x18`` and ``fixed128x18``, respectively.
+``fixed`` / ``ufixed``：表示��大�的有符�和无符�的定长浮点型。
+在关键字 ``ufixedMxN`` 和 ``fixedMxN`` 中， ``M`` 表示该类型�用的�数，
+``N`` 表示�用的�数�数。 ``M`` 必须能整除 8，� 8 到 256 �。
+``N`` 则�以是从 0 到 80 之间的任�数。 ``ufixed`` 和 ``fixed`` 分别是 ``ufixed128x18`` 和 ``fixed128x18`` 的别�。
 
-Operators:
+�算符：
 
-* Comparisons: ``<=``, ``<``, ``==``, ``!=``, ``>=``, ``>`` (evaluate to ``bool``)
-* Arithmetic operators: ``+``, ``-``, unary ``-``, ``*``, ``/``, ``%`` (modulo)
+* 比较�算符： ``<=``， ``<``， ``==``， ``!=``， ``>=``， ``>`` （返回值是布尔型）
+* 算术�算符： ``+``， ``-``， 一元�算 ``-``， ``*``， ``/``， ``%`` (�余数)
 
 .. note::
-    The main difference between floating point (``float`` and ``double`` in many languages, more precisely IEEE 754 numbers) and fixed point numbers is
-    that the number of bits used for the integer and the fractional part (the part after the decimal dot) is flexible in the former, while it is strictly
-    defined in the latter. Generally, in floating point almost the entire space is used to represent the number, while only a small number of bits define
-    where the decimal point is.
+    浮点型（在许多语言中的 ``float`` 和 ``double`` ，更准确地说是 IEEE 754 类型）和定长浮点型之间最大的��点是，
+    在�者中整数部分和�数部分（�数点�的部分）需�的�数是�活��的，而�者中这两部分的长度�到严格的规定。
+    一般�说，在浮点型中，几乎整个空间都用�表示数字，但�有少数的��表示�数点的�置。
 
 .. index:: address, balance, send, call, delegatecall, staticcall, transfer
 
 .. _address:
 
-Address
--------
+地�类型
+---------
 
-The address type comes in two largely identical flavors:
+地�类型有两�基本相�的类型：
 
-- ``address``: Holds a 20 byte value (size of an Ethereum address).
-- ``address payable``: Same as ``address``, but with the additional members ``transfer`` and ``send``.
+- ``address``: �存一个20字节的值（一个以太�地�的大�）。
+- ``address payable``: 与 ``address`` 类型相�，但有�外的方法 ``transfer`` 和 ``send``。
 
-The idea behind this distinction is that ``address payable`` is an address you can send Ether to,
-while you are not supposed to send Ether to a plain ``address``, for example because it might be a smart contract
-that was not built to accept Ether.
+这�区别背�的想法是， ``address payable`` 是一个您�以��以太�的地�，
+而您�应该��以太�给一个普通的 ``address``，例如，因为它�能是一个智能�约，
+而这个�约�是为接�以太�而建立的。
 
-Type conversions:
+类型转�：
 
-Implicit conversions from ``address payable`` to ``address`` are allowed, whereas conversions from ``address`` to ``address payable``
-must be explicit via ``payable(<address>)``.
+�许从 ``address payable`` 到 ``address`` 的��转�，
+而从 ``address`` 到 ``address payable`` 的转�必须通过 ``payable(<address>)`` �明确。
 
-Explicit conversions to and from ``address`` are allowed for ``uint160``, integer literals,
-``bytes20`` and contract types.
+对于 ``uint160``�整数� ``bytes20`` 和�约类型，�许对 ``address`` 进行明确的转�和输出。
 
-Only expressions of type ``address`` and contract-type can be converted to the type ``address
-payable`` via the explicit conversion ``payable(...)``. For contract-type, this conversion is only
-allowed if the contract can receive Ether, i.e., the contract either has a :ref:`receive
-<receive-ether-function>` or a payable fallback function. Note that ``payable(0)`` is valid and is
-an exception to this rule.
+�有 ``address`` 类型和�约类型的表达��以通过 ``payable(...)`` 显�转�为 ``address payable`` 类型。
+对于�约类型，�有在�约�以接收以太的情况下��许这�转�，也就是说，
+�约�么有一个 :ref:`receive <receive-ether-function>` 函数，�么有一个 payable 类型的 fallback 的函数。
+请注�， ``payable(0)`` 是有效的，是这个规则的例外。
 
 .. note::
-    If you need a variable of type ``address`` and plan to send Ether to it, then
-    declare its type as ``address payable`` to make this requirement visible. Also,
-    try to make this distinction or conversion as early as possible.
+    如果您需�一个 ``address`` 类型的��，并计划�其��以太，那么就将其类型声明为 ``address payable``，
+    以使这一�求�行。�外，尽�尽早地进行这�区分或转�。
 
-    The distinction between ``address`` and ``address payable`` was introduced with version 0.5.0.
-    Also starting from that version, contracts are not implicitly convertible to the ``address`` type, but can still be explicitly converted to
-    ``address`` or to ``address payable``, if they have a receive or payable fallback function.
+    ``address`` 和 ``address payable`` 之间的区别是从 0.5.0 版本开始的。
+    �样从该版本开始，�约�能��地转�为 ``address`` 类型，但�然�以显�地转�为
+    ``address`` 或 ``address payable``，如果它们有一个 receive 或 payable 类型的 fallback 函数的�。
 
 
-Operators:
+�算符：
 
-* ``<=``, ``<``, ``==``, ``!=``, ``>=`` and ``>``
+* ``<=``, ``<``, ``==``, ``!=``, ``>=`` 和 ``>``
 
 .. warning::
-    If you convert a type that uses a larger byte size to an ``address``, for example ``bytes32``, then the ``address`` is truncated.
-    To reduce conversion ambiguity, starting with version 0.4.24, the compiler will force you to make the truncation explicit in the conversion.
-    Take for example the 32-byte value ``0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFFCCCC``.
+    如果您使用较大字节的类型转�为 ``address``，例如 ``bytes32``，那么 ``address`` 就被截断了。
+    为了�少转�的模糊性，从 0.4.24 版本开始，编译器将强迫您在转�中明确地进行截断处�。以32字节的值
+    ``0x111122333344556677888899AAAABBBBCCCCDDDDEEFFFFCCCC`` 为例。
 
-    You can use ``address(uint160(bytes20(b)))``, which results in ``0x111122223333444455556666777788889999aAaa``,
-    or you can use ``address(uint160(uint256(b)))``, which results in ``0x777788889999AaAAbBbbCcccddDdeeeEfFFfCcCc``.
+    您�以使用 ``address(uint160(bytes20(b)))``，结果是 ``0x111122223333444455556666777788889999aAaa``，
+    或者您�以使用 ``address(uint160(uint256(b)))``，结果是 ``0x777788889999AaAAbBbbCcccddDdeeeEfFFfCcCc``。
 
 .. note::
-    Mixed-case hexadecimal numbers conforming to `EIP-55 <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md>`_ are automatically treated as literals of the ``address`` type. See :ref:`Address Literals<address_literals>`.
+    符� `EIP-55 <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md>`_ 的混�大�写�六进制数字会自动被视为 ``address`` 类型的字�数字。�� :ref:`地�字�类型 <address_literals>`。
 
 .. _members-of-addresses:
 
-Members of Addresses
+地�类型�员��
 ^^^^^^^^^^^^^^^^^^^^
 
-For a quick reference of all members of address, see :ref:`address_related`.
+快速�考，请� :ref:`address_related`。
 
-* ``balance`` and ``transfer``
+* ``balance`` 和 ``transfer``
 
-It is possible to query the balance of an address using the property ``balance``
-and to send Ether (in units of wei) to a payable address using the ``transfer`` function:
+�以使用 ``balance`` 属性�查询一个地�的以太�余�，
+也�以使用 ``transfer`` 函数�一个地���以太�（以 wei 为��）：
 
 .. code-block:: solidity
     :force:
@@ -248,35 +247,41 @@ and to send Ether (in units of wei) to a payable address using the ``transfer``
     address myAddress = address(this);
     if (x.balance < 10 && myAddress.balance >= 10) x.transfer(10);
 
-The ``transfer`` function fails if the balance of the current contract is not large enough
-or if the Ether transfer is rejected by the receiving account. The ``transfer`` function
-reverts on failure.
+如果当��约的余��足，或者以太�转账被接收账户拒收，那么 ``transfer`` 功能就会失败。
+``transfer`` 功能在失败�会被还原。
 
 .. note::
-    If ``x`` is a contract address, its code (more specifically: its :ref:`receive-ether-function`, if present, or otherwise its :ref:`fallback-function`, if present) will be executed together with the ``transfer`` call (this is a feature of the EVM and cannot be prevented). If that execution runs out of gas or fails in any way, the Ether transfer will be reverted and the current contract will stop with an exception.
+    如果 ``x`` 是一个�约地�，它的代�（更具体地说：它的 :ref:`receive-ether-function`，如果有的�，
+    或者它的 :ref:`fallback-function`，如果有的�）将与 ``transfer`` 调用一起执行（这是EVM的一个特性，无法阻止）。
+    如果执行过程中耗尽了气体或出现了任何故障，以太�的转移将被还原，当�的�约将以异常的方��止。
 
 * ``send``
 
-``send`` is the low-level counterpart of ``transfer``. If the execution fails, the current contract will not stop with an exception, but ``send`` will return ``false``.
+``send`` 是 ``transfer`` 的低级对应部分。如果执行失败，当�的�约�会因异常而�止，但 ``send`` 会返回 ``false``。
 
 .. warning::
+<<<<<<< HEAD
+    使用 ``send`` 有一些�险：如果调用堆栈深度为1024，传输就会失败（这�以由调用者强制执行），
+    如果接收者的气体耗尽，也会失败。因此，为了安全地进行以太�转账，
+    一定�检查 ``send`` 的返回值，或者使用 ``transfer``，甚至使用更好的方�：
+    使用收款人�款的模�。
+=======
     There are some dangers in using ``send``: The transfer fails if the call stack depth is at 1024
     (this can always be forced by the caller) and it also fails if the recipient runs out of gas. So in order
     to make safe Ether transfers, always check the return value of ``send``, use ``transfer`` or even better:
     use a pattern where the recipient withdraws the Ether.
+>>>>>>> english/develop
 
-* ``call``, ``delegatecall`` and ``staticcall``
+* ``call``, ``delegatecall`` 和 ``staticcall``
 
-In order to interface with contracts that do not adhere to the ABI,
-or to get more direct control over the encoding,
-the functions ``call``, ``delegatecall`` and ``staticcall`` are provided.
-They all take a single ``bytes memory`` parameter and
-return the success condition (as a ``bool``) and the returned data
-(``bytes memory``).
-The functions ``abi.encode``, ``abi.encodePacked``, ``abi.encodeWithSelector``
-and ``abi.encodeWithSignature`` can be used to encode structured data.
+为了与��守ABI的�约对接，或者为了更直接地控制编�，
+我们�供了 ``call``, ``delegatecall`` 和 ``staticcall`` 函数。
+它们都接�一个 ``bytes memory`` �数，并返回�功�件（作为一个 ``bool``）
+和返回的数�（ ``bytes memory``）。
+函数 ``abi.encode``, ``abi.encodePacked``, ``abi.encodeWithSelector``
+和 ``abi.encodeWithSignature`` �以用�编�结构化的数�。
 
-Example:
+示例：
 
 .. code-block:: solidity
 
@@ -285,232 +290,216 @@ Example:
     require(success);
 
 .. warning::
-    All these functions are low-level functions and should be used with care.
-    Specifically, any unknown contract might be malicious and if you call it, you
-    hand over control to that contract which could in turn call back into
-    your contract, so be prepared for changes to your state variables
-    when the call returns. The regular way to interact with other contracts
-    is to call a function on a contract object (``x.f()``).
+    所有这些函数都是低级别的函数，应该谨慎使用。
+    具体�说，任何未知的�约都�能是��的，如果您调用它，
+    您就把控制�交给了该�约，而该�约��能回调到您的�约中，
+    所以�准备好在调用返回时改�您�约的状���。
+    与其他�约互动的常规方法是在�约对象上调用一个函数（ ``x.f()``）。
 
 .. note::
-    Previous versions of Solidity allowed these functions to receive
-    arbitrary arguments and would also handle a first argument of type
-    ``bytes4`` differently. These edge cases were removed in version 0.5.0.
+    以�的 Solidity 版本�许这些函数接收任�的�数，
+    并且也会以��的方�处� ``bytes4`` 类型的第一个�数。
+    这些边缘情况在0.5.0版本中被移除。
 
-It is possible to adjust the supplied gas with the ``gas`` modifier:
+�以用 ``gas`` 修饰器�调整所�供的气体：
 
 .. code-block:: solidity
 
     address(nameReg).call{gas: 1000000}(abi.encodeWithSignature("register(string)", "MyName"));
 
-Similarly, the supplied Ether value can be controlled too:
+�样，所�供的以太值也�以被控制：
 
 .. code-block:: solidity
 
     address(nameReg).call{value: 1 ether}(abi.encodeWithSignature("register(string)", "MyName"));
 
-Lastly, these modifiers can be combined. Their order does not matter:
+最�，这些修饰器�以�并。它们的顺�并���：
 
 .. code-block:: solidity
 
     address(nameReg).call{gas: 1000000, value: 1 ether}(abi.encodeWithSignature("register(string)", "MyName"));
 
-In a similar way, the function ``delegatecall`` can be used: the difference is that only the code of the given address is used, all other aspects (storage, balance, ...) are taken from the current contract. The purpose of ``delegatecall`` is to use library code which is stored in another contract. The user has to ensure that the layout of storage in both contracts is suitable for delegatecall to be used.
+以类似的方�，�以使用函数 ``delegatecall``：��的是，它�使用给定地�的代�，
+所有其他方�（存储，余�，...）都�自当�的�约。
+``delegatecall`` 的目的是为了使用存储在�一个�约中的库代�。
+用户必须确�两个�约中的存储结构都适�使用delegatecall。
 
 .. note::
-    Prior to homestead, only a limited variant called ``callcode`` was available that did not provide access to the original ``msg.sender`` and ``msg.value`` values. This function was removed in version 0.5.0.
+    在 homestead 版本之�，�有一个功能类似但作用有�的 ``callcode`` 的函数�用，
+    但它�能获�委托方的 ``msg.sender`` 和 ``msg.value``。这个功能在 0.5.0 版本中被移除。
 
-Since byzantium ``staticcall`` can be used as well. This is basically the same as ``call``, but will revert if the called function modifies the state in any way.
+从 byzantium 开始，也�以使用 ``staticcall``。这基本上与 ``call`` 相�，
+但如果被调用的函数以任何方�修改了状�，则会��。
 
-All three functions ``call``, ``delegatecall`` and ``staticcall`` are very low-level functions and should only be used as a *last resort* as they break the type-safety of Solidity.
+这三个函数 ``call``， ``delegatecall`` 和 ``staticcall`` 都是�常低级的函数，
+�应该作为 *最�的手段* �使用，因为它们破�了Solidity的类型安全。
 
-The ``gas`` option is available on all three methods, while the ``value`` option is only available
-on ``call``.
+``gas`` 选项在所有三�方法中都�用，而 ``value`` 选项�在 ``call`` 中�用。
 
 .. note::
-    It is best to avoid relying on hardcoded gas values in your smart contract code,
-    regardless of whether state is read from or written to, as this can have many pitfalls.
-    Also, access to gas might change in the future.
+    最好��在您的智能�约代�中�赖硬编�的气体值，无论状�是读出还是写入，
+    因为这�能有很多�患。�外，对气体的访问在未��能会改�。
 
-* ``code`` and ``codehash``
+* ``code`` 和 ``codehash``
 
-You can query the deployed code for any smart contract. Use ``.code`` to get the EVM bytecode as a
-``bytes memory``, which might be empty. Use ``.codehash`` to get the Keccak-256 hash of that code
-(as a ``bytes32``). Note that ``addr.codehash`` is cheaper than using ``keccak256(addr.code)``.
+您�以查询任何智能�约的部署代�。使用 ``.code`` 获得作为 ``bytes memory`` 的EVM字节�，
+这�能是空的。使用 ``.codehash`` 获得该代�的Keccak-256哈希值（作为 ``bytes32``）。
+注�，使用 ``addr.codehash`` 比 ``keccak256(addr.code)`` 更便宜。
 
 .. note::
-    All contracts can be converted to ``address`` type, so it is possible to query the balance of the
-    current contract using ``address(this).balance``.
+    所有的�约都�以转�为 ``address`` 类型，所以�以用 ``address(this).balance`` 查询当��约的余�。
 
 .. index:: ! contract type, ! type; contract
 
 .. _contract_types:
 
-Contract Types
---------------
+�约类型
+---------
 
-Every :ref:`contract<contracts>` defines its own type.
-You can implicitly convert contracts to contracts they inherit from.
-Contracts can be explicitly converted to and from the ``address`` type.
+�个 :ref:`�约 <contracts>` 都定义了自己的类型。
+您�以��地将一个�约转�为它们所继承的�一个�约。
+�约�以显�地转�为 ``address`` 类型，也�以从 ``address`` 类型中转�。
 
-Explicit conversion to and from the ``address payable`` type is only possible
-if the contract type has a receive or payable fallback function.  The conversion is still
-performed using ``address(x)``. If the contract type does not have a receive or payable
-fallback function, the conversion to ``address payable`` can be done using
-``payable(address(x))``.
-You can find more information in the section about
-the :ref:`address type<address>`.
+�有在�约类型具有 receive 或 payable 类型的 fallback 函数的情况下，
+�有�能明确转�为 ``address payable`` 类型和从该类型转�。
+这�转��然使用 ``address(x)`` 进行转�。如果�约类型没有一个 receive 或 payable 类型的 fallback 函数，
+�以使用 ``payable(address(x))`` �转�为 ``address payable`` 。
+您�以在 :ref:`地�类型 <address>` 一节中找到更多信�。
 
 .. note::
-    Before version 0.5.0, contracts directly derived from the address type
-    and there was no distinction between ``address`` and ``address payable``.
+    在 0.5.0 版本之�，�约直接从地�类型派生出�，
+    并且在 ``address`` 和 ``address payable`` 之间没有区别。
 
-If you declare a local variable of contract type (``MyContract c``), you can call
-functions on that contract. Take care to assign it from somewhere that is the
-same contract type.
+如果您声明了一个本地类型的��（ ``MyContract c`` ），您�以调用该�约上的函数。
+注��从相��约类型的地方将其赋值。
 
-You can also instantiate contracts (which means they are newly created). You
-can find more details in the :ref:`'Contracts via new'<creating-contracts>`
-section.
+您也�以实例化�约（这�味�它们是新创建的）。
+您�以在 :ref:`'通过关键字new创建�约' <creating-contracts>` 部分找到更多细节。
 
-The data representation of a contract is identical to that of the ``address``
-type and this type is also used in the :ref:`ABI<ABI>`.
+�约的数�表示与 ``address`` 类型相�，该类型也用于 :ref:`ABI<ABI>`。
 
-Contracts do not support any operators.
+�约�支�任何�算符。
 
-The members of contract types are the external functions of the contract
-including any state variables marked as ``public``.
+�约类型的�员是�约的外部函数，包括任何标记为 ``public`` 的状���。
 
-For a contract ``C`` you can use ``type(C)`` to access
-:ref:`type information<meta-type>` about the contract.
+对于一个�约 ``C``，您�以使用 ``type(C)`` �访问
+关于该�约的 :ref:`类型信� <meta-type>` 。
 
 .. index:: byte array, bytes32
 
-Fixed-size byte arrays
-----------------------
+定长字节数组
+------------
+
+值类型 ``bytes1``, ``bytes2``, ``bytes3``, ..., ``bytes32`` 代表从1到32的字节�列。
 
-The value types ``bytes1``, ``bytes2``, ``bytes3``, ..., ``bytes32``
-hold a sequence of bytes from one to up to 32.
+�算符：
 
-Operators:
+比较�算符：<=， <， ==， !=， >=， > （返回布尔型）
 
-* Comparisons: ``<=``, ``<``, ``==``, ``!=``, ``>=``, ``>`` (evaluate to ``bool``)
-* Bit operators: ``&``, ``|``, ``^`` (bitwise exclusive or), ``~`` (bitwise negation)
-* Shift operators: ``<<`` (left shift), ``>>`` (right shift)
-* Index access: If ``x`` is of type ``bytesI``, then ``x[k]`` for ``0 <= k < I`` returns the ``k`` th byte (read-only).
+* 比较�算符： ``<=``， ``<``， ``==``， ``!=``， ``>=``， ``>`` (返回 ``bool``)
+* ��算符： ``&``， ``|``， ``^`` （按�异或）， ``~`` （按���）
+* 移��算符： ``<<`` （左移�）， ``>>`` （�移�）
+* 索引访问： 如果 ``x`` 是 ``bytesI`` 类型，那么当 ``0 <= k < I`` 时， ``x[k]`` 返回第 ``k`` 个字节（�读）。
 
-The shifting operator works with unsigned integer type as right operand (but
-returns the type of the left operand), which denotes the number of bits to shift by.
-Shifting by a signed type will produce a compilation error.
+移��算符以无符�的整数类型作为��作数（但返回左�作数的类型），
+它表示�移�的�数。有符�类型的移�将产生一个编译错误。
 
-Members:
+�员��：
 
-* ``.length`` yields the fixed length of the byte array (read-only).
+* ``.length`` 表示这个字节数组的长度（�读）.
 
 .. note::
-    The type ``bytes1[]`` is an array of bytes, but due to padding rules, it wastes
-    31 bytes of space for each element (except in storage). It is better to use the ``bytes``
-    type instead.
+    类型 ``bytes1[]`` 是一个字节数组，但是由于填充规则，它为�个元素浪费了31个字节的空间（在存储中除外）。
+    因此最好使用 ``bytes`` 类型�代替。
 
 .. note::
-    Prior to version 0.8.0, ``byte`` used to be an alias for ``bytes1``.
+    在 0.8.0 版本之�， ``byte`` 曾�是 ``bytes1`` 的别�。
 
-Dynamically-sized byte array
-----------------------------
+<<<<<<< HEAD
+�长字节数组
+------------
 
 ``bytes``:
-    Dynamically-sized byte array, see :ref:`arrays`. Not a value-type!
+    �长字节数组，�� :ref:`arrays`。它并�是值类型�
 ``string``:
-    Dynamically-sized UTF-8-encoded string, see :ref:`arrays`. Not a value-type!
+    �长 UTF-8 编�字符串类型，�� :ref:`arrays`。并�是值类型�
 
+=======
+>>>>>>> english/develop
 .. index:: address, ! literal;address
 
 .. _address_literals:
 
-Address Literals
-----------------
+地�字�常数（Address Literals）
+---------------------------------
 
-Hexadecimal literals that pass the address checksum test, for example
-``0xdCad3a6d3569DF655070DEd06cb7A1b2Ccd1D3AF`` are of ``address`` type.
-Hexadecimal literals that are between 39 and 41 digits
-long and do not pass the checksum test produce
-an error. You can prepend (for integer types) or append (for bytesNN types) zeros to remove the error.
+比如� ``0xdCad3a6d3569DF655070DEd06cb7A1b2Ccd1D3AF`` 这样的
+通过了地�校验测试的�六进制字属于 ``address`` 类型。
+�六进制字数在39到41�之间，并且没有通过校验测试，会产生一个错误。
+您�以预加（对于整数类型）或附加（对于bytesNN类型）零�消除该错误。
 
 .. note::
-    The mixed-case address checksum format is defined in `EIP-55 <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md>`_.
+    混�大�写的地�校验和格�定义在 `EIP-55 <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md>`_。
 
 .. index:: integer, rational number, ! literal;rational
 
 .. _rational_literals:
 
-Rational and Integer Literals
+有�数和整数字�常数
 -----------------------------
 
-Integer literals are formed from a sequence of digits in the range 0-9.
-They are interpreted as decimals. For example, ``69`` means sixty nine.
-Octal literals do not exist in Solidity and leading zeros are invalid.
+整数字�常数由范围在 0-9 的一串数字组�，表现��进制。
+例如， ``69`` 表示�进制数字 69。 Solidity 中是没有八进制的，因此�置 0 是无效的。
 
-Decimal fractional literals are formed by a ``.`` with at least one number after the decimal point.
-Examples include ``.1`` and ``1.3`` (but not ``1.``).
+�数字�常数由 ``.`` 和�数点�的至少一个数字组�。例如， ``.1`` 和 ``1.3``（但�是 ``1.``）。
 
-Scientific notation in the form of ``2e10`` is also supported, where the
-mantissa can be fractional but the exponent has to be an integer.
-The literal ``MeE`` is equivalent to ``M * 10**E``.
-Examples include ``2e10``, ``-2e10``, ``2e-10``, ``2.5e1``.
+也支� ``2e10`` 形�的科学符�，其中尾数�以是�数，但指数必须是一个整数。
+字�的 ``MeE`` 相当于 ``M * 10**E``。
+例�包括 ``2e10``, ``-2e10``, ``2e-10``, ``2.5e1``。
 
-Underscores can be used to separate the digits of a numeric literal to aid readability.
-For example, decimal ``123_000``, hexadecimal ``0x2eff_abde``, scientific decimal notation ``1_2e345_678`` are all valid.
-Underscores are only allowed between two digits and only one consecutive underscore is allowed.
-There is no additional semantic meaning added to a number literal containing underscores,
-the underscores are ignored.
+下划线�以用�分隔数字字�的数字，以帮助阅读。
+例如，�进制 ``123_000``，�六进制 ``0x2eff_abde``，科学�进制 ``1_2e345_678`` 都是有效的。
+下划线��许在两个数字之间，并且��许一个连续的下划线。
+�有下划线的数字字�没有�外的语义，下划线被忽略。
 
-Number literal expressions retain arbitrary precision until they are converted to a non-literal type (i.e. by
-using them together with anything other than a number literal expression (like boolean literals) or by explicit conversion).
-This means that computations do not overflow and divisions do not truncate
-in number literal expressions.
+数值字�常数表达��留任�精度，直到它们被转�为�字�常数类型
+（�通过与数字字�常数表达�以外的任何东西一起使用（如布尔字�常数）或通过显�转�）。
+这�味�在数值常�表达�中，计算�会溢出，除法�会截断。
 
-For example, ``(2**800 + 1) - 2**800`` results in the constant ``1`` (of type ``uint8``)
-although intermediate results would not even fit the machine word size. Furthermore, ``.5 * 8`` results
-in the integer ``4`` (although non-integers were used in between).
+例如， ``(2**800 + 1) - 2**800`` 的结果是常数 ``1`` （类型 ``uint8``），
+尽管中间的结果甚至�符�机器字的大�。此外， ``.5 * 8`` 的结果是整数 ``4`` （尽管中间使用了�整数）。
 
 .. warning::
-    While most operators produce a literal expression when applied to literals, there are certain operators that do not follow this pattern:
+    虽然大多数�算符在应用于字�常数时都会产生一个字�常数表达�，但有一些�算符并��循这�模�：
 
-    - Ternary operator (``... ? ... : ...``),
-    - Array subscript (``<array>[<index>]``).
+    - 三元�算符（ ``...？ ...：...``）。
+    - 数组下标（ ``<array>[<index>]``）。
 
-    You might expect expressions like ``255 + (true ? 1 : 0)`` or ``255 + [1, 2, 3][0]`` to be equivalent to using the literal 256
-    directly, but in fact they are computed within the type ``uint8`` and can overflow.
+    您�能期望� ``255 + (true ? 1 : 0)`` 或 ``255 + [1, 2, 3][0]`` 这样的表达�等�于直接使用字�常数256，
+    但实际上它们是在 ``uint8`` 类型中计算的，�能会溢出。
 
-Any operator that can be applied to integers can also be applied to number literal expressions as
-long as the operands are integers. If any of the two is fractional, bit operations are disallowed
-and exponentiation is disallowed if the exponent is fractional (because that might result in
-a non-rational number).
+���作数是整数，任何�以应用于整数的�作数也�以应用于数值字�常数表达�。
+如果两者中的任何一个是�数，则��许进行��作，
+如果指数是�数，则��许进行幂�算（因为这�能导致无�数）。
 
-Shifts and exponentiation with literal numbers as left (or base) operand and integer types
-as the right (exponent) operand are always performed
-in the ``uint256`` (for non-negative literals) or ``int256`` (for a negative literals) type,
-regardless of the type of the right (exponent) operand.
+以数值字�常数表达�为左（或基数）�作数，以整数类型为�（指数）�作数的移�和幂�算，
+总是在 ``uint256`` （�负数数值字�常数）或 ``int256`` （负数数值字�常数）类型中进行。
+无论�（指数）�作数的类型如何。
 
 .. warning::
-    Division on integer literals used to truncate in Solidity prior to version 0.4.0, but it now converts into a rational number, i.e. ``5 / 2`` is not equal to ``2``, but to ``2.5``.
+    在 0.4.0 版本之�，Solidity 中整数字的除法会被截断，但现在它转�为一个有�数，� ``5 / 2`` �等于 ``2``，而是 ``2.5``。
 
 .. note::
-    Solidity has a number literal type for each rational number.
-    Integer literals and rational number literals belong to number literal types.
-    Moreover, all number literal expressions (i.e. the expressions that
-    contain only number literals and operators) belong to number literal
-    types.  So the number literal expressions ``1 + 2`` and ``2 + 1`` both
-    belong to the same number literal type for the rational number three.
-
+    Solidity 对�个有�数都有对应的数值字�常数类型。
+    整数字�常数和有�数字�常数都属于数值字�常数类型。
+    除此之外，所有的数值字�常数表达�（��包�数值字�常数和�算符的表达�）都属于数值字�常数类型。
+    因此数值字�常数表达� ``1 + 2`` 和 ``2 + 1`` 的结果跟有�数3的数值字�常数类型相�。
 
 .. note::
-    Number literal expressions are converted into a non-literal type as soon as they are used with non-literal
-    expressions. Disregarding types, the value of the expression assigned to ``b``
-    below evaluates to an integer. Because ``a`` is of type ``uint128``, the
-    expression ``2.5 + a`` has to have a proper type, though. Since there is no common type
-    for the type of ``2.5`` and ``uint128``, the Solidity compiler does not accept
-    this code.
+    数字字�表达�一旦与�字�表达�一起使用，就会被转�为�字�类型。
+    �考虑类型，下�分�给 ``b`` 的表达�的值被评估为一个整数。
+    因为 ``a`` 的类型是 ``uint128``，所以表达� ``2.5 + a`` 必须有一个�适的类型。
+    由于 ``2.5`` 和 ``uint128`` 的类型没有共�的类型，Solidity编译器�接�这段代�。
 
 .. code-block:: solidity
 
@@ -520,40 +509,44 @@ regardless of the type of the right (exponent) operand.
 .. index:: ! literal;string, string
 .. _string_literals:
 
-String Literals and Types
+字符串字�常数和类型
 -------------------------
 
-String literals are written with either double or single-quotes (``"foo"`` or ``'bar'``), and they can also be split into multiple consecutive parts (``"foo" "bar"`` is equivalent to ``"foobar"``) which can be helpful when dealing with long strings.  They do not imply trailing zeroes as in C; ``"foo"`` represents three bytes, not four.  As with integer literals, their type can vary, but they are implicitly convertible to ``bytes1``, ..., ``bytes32``, if they fit, to ``bytes`` and to ``string``.
+字符串字�常数是指由�引�或�引�引起�的字符串（ ``"foo"`` 或者 ``'bar'``）。
+它们也�以分�多个连续部分（ ``"foo" "bar"`` 相当于 ``"foobar"`` ），这在处�长字符串时很有帮助。
+它们��在 C 语言中那样带有结�符； ``"foo"`` 相当于3个字节而�是4个。
+和整数字�常数一样，字符串字�常数的类型也�以�生改�，
+但它们�以��地转�� ``bytes1``，……， ``bytes32``，如果�适的�，还�以转�� ``bytes`` 以� ``string``。
 
-For example, with ``bytes32 samevar = "stringliteral"`` the string literal is interpreted in its raw byte form when assigned to a ``bytes32`` type.
+例如，使用 ``bytes32 samevar = "stringliteral"``，
+当分�给 ``bytes32`` 类型时，字符串字�常数被解释�原始字节形�。
 
-String literals can only contain printable ASCII characters, which means the characters between and including 0x20 .. 0x7E.
+字符串字�常数�能包��打�的ASCII字符，也就是0x20 ... 0x7E之间的字符。
 
-Additionally, string literals also support the following escape characters:
+此外，字符串字元还支�以下转义字符：
 
-- ``\<newline>`` (escapes an actual newline)
-- ``\\`` (backslash)
-- ``\'`` (single quote)
-- ``\"`` (double quote)
-- ``\n`` (newline)
-- ``\r`` (carriage return)
-- ``\t`` (tab)
-- ``\xNN`` (hex escape, see below)
-- ``\uNNNN`` (unicode escape, see below)
+- ``\<newline>`` （转义一个实际的�行）
+- ``\\`` （�斜�）
+- ``\'`` （�引�）
+- ``\"`` （�引�）
+- ``\n`` （�行）
+- ``\r`` （回车键）
+- ``\t`` （制表）
+- ``\xNN`` （�六进制转义，�下文）
+- ``\uNNNN`` （unicode转义，�下文）
 
-``\xNN`` takes a hex value and inserts the appropriate byte, while ``\uNNNN`` takes a Unicode codepoint and inserts an UTF-8 sequence.
+``\xNN`` 接收一个�六进制值并�入相应的字节，而 ``\uNNNN`` 接收一个Unicode编�点并�入一个UTF-8�列。
 
 .. note::
 
-    Until version 0.8.0 there were three additional escape sequences: ``\b``, ``\f`` and ``\v``.
-    They are commonly available in other languages but rarely needed in practice.
-    If you do need them, they can still be inserted via hexadecimal escapes, i.e. ``\x08``, ``\x0c``
-    and ``\x0b``, respectively, just as any other ASCII character.
+    在 0.8.0 版本之�，有三个�外的转义�列。 ``\b``， ``\f`` 和 ``v``。
+    它们在其他语言中通常是�用的，但在实践中很少需�。
+    如果您确实需�它们，�然�以通过�六进制转义�入，
+    �分别为 ``\x08``， ``x0c`` 和 ``\x0b``，就�其他ASCII字符一样。
 
-The string in the following example has a length of ten bytes.
-It starts with a newline byte, followed by a double quote, a single
-quote a backslash character and then (without separator) the
-character sequence ``abcdef``.
+下�例�中的字符串的长度为10个字节。
+它以一个�行字节开始，接�是一个�引�，一个�引�，一个�斜�字符，
+然�（没有分隔符）是字符�列 ``abcdef``。
 
 .. code-block:: solidity
     :force:
@@ -561,16 +554,16 @@ character sequence ``abcdef``.
     "\n\"\'\\abc\
     def"
 
-Any Unicode line terminator which is not a newline (i.e. LF, VF, FF, CR, NEL, LS, PS) is considered to
-terminate the string literal. Newline only terminates the string literal if it is not preceded by a ``\``.
+任何��行的 Unicode 行结�符（�LF, VF, FF, CR, NEL, LS, PS）都被认为是字符串字�的结�。
+�行�在字符串字�内容��没有 ``\`` 的情况下终止。
 
 .. index:: ! literal;unicode
 
-Unicode Literals
+Unicode 字��
 ----------------
 
-While regular string literals can only contain ASCII, Unicode literals – prefixed with the keyword ``unicode`` – can contain any valid UTF-8 sequence.
-They also support the very same escape sequences as regular string literals.
+普通字符串字�常数�能包�ASCII�，而 Unicode 字�常数 - 以关键字 ``unicode`` 为�缀 - �以包�任何有效的UTF-8�列。
+它们也支�与普通字符串字��义相�的转义�列。
 
 .. code-block:: solidity
 
@@ -578,41 +571,37 @@ They also support the very same escape sequences as regular string literals.
 
 .. index:: ! literal;hexadecimal, bytes
 
-Hexadecimal Literals
+�六进制字�常数
 --------------------
 
-Hexadecimal literals are prefixed with the keyword ``hex`` and are enclosed in double
-or single-quotes (``hex"001122FF"``, ``hex'0011_22_FF'``). Their content must be
-hexadecimal digits which can optionally use a single underscore as separator between
-byte boundaries. The value of the literal will be the binary representation
-of the hexadecimal sequence.
+�六进制字�常数以关键字 ``hex`` 打头，
+��紧跟�用�引�或�引�引起�的字符串（ ``hex"001122FF"``, ``hex'0011_22_FF'``）。
+它们的内容必须是�六进制的数字，�以选择使用一个下划线作为字节边界之间的分隔符。
+字�的值将是�六进制�列的二进制表示。
 
-Multiple hexadecimal literals separated by whitespace are concatenated into a single literal:
-``hex"00112233" hex"44556677"`` is equivalent to ``hex"0011223344556677"``
+由空格分隔的多个�六进制字�常数被串��一个字�常数：
+``hex"00112233" hex"44556677"`` 相当于 ``hex"0011223344556677"``。
 
-Hexadecimal literals in some ways behave like :ref:`string literals <string_literals>` but are not
-implicitly convertible to the ``string`` type.
+�六进制字�常数的行为与 :ref:`字符串字�常数 <string_literals>` 类似，
+但是�能��转�为 ``string`` 类型。
 
 .. index:: enum
 
 .. _enums:
 
-Enums
------
-
-Enums are one way to create a user-defined type in Solidity. They are explicitly convertible
-to and from all integer types but implicit conversion is not allowed.  The explicit conversion
-from integer checks at runtime that the value lies inside the range of the enum and causes a
-:ref:`Panic error<assert-and-require>` otherwise.
-Enums require at least one member, and its default value when declared is the first member.
-Enums cannot have more than 256 members.
+枚举类型
+---------
 
-The data representation is the same as for enums in C: The options are represented by
-subsequent unsigned integer values starting from ``0``.
+枚举是在 Solidity 中创建用户定义类型的一�方�。
+它们�以显�地转�为所有整数类型，和从整数类型�转�，但��许��转�。
+从整数的显�转�在�行时检查该值是�在枚举的范围内，�则会导致 :ref:`异常<assert-and-require>`。
+枚举�求至少有一个�员，其声明时的默认值是第一个�员。
+枚举�能有超过256个�员。
 
-Using ``type(NameOfEnum).min`` and ``type(NameOfEnum).max`` you can get the
-smallest and respectively largest value of the given enum.
+数�表示与 C 语言中的枚举相�。选项由�续的从 ``0`` 开始无符�整数值表示。
 
+使用 ``type(NameOfEnum).min`` 和 ``type(NameOfEnum).max``
+您�以得到给定枚举的最�值和最大值。
 
 .. code-block:: solidity
 
@@ -628,9 +617,8 @@ smallest and respectively largest value of the given enum.
             choice = ActionChoices.GoStraight;
         }
 
-        // Since enum types are not part of the ABI, the signature of "getChoice"
-        // will automatically be changed to "getChoice() returns (uint8)"
-        // for all matters external to Solidity.
+        // 由于枚举类型�属于ABI的一部分，因此对于所有�自 Solidity 外部的调用，
+        // "getChoice" 的签�会自动被改� "getChoice() returns (uint8)"。
         function getChoice() public view returns (ActionChoices) {
             return choice;
         }
@@ -649,32 +637,30 @@ smallest and respectively largest value of the given enum.
     }
 
 .. note::
-    Enums can also be declared on the file level, outside of contract or library definitions.
+    枚举也�以在文件级别上声明，在�约或库定义之外。
 
 .. index:: ! user defined value type, custom type
 
 .. _user-defined-value-types:
 
-User-defined Value Types
-------------------------
+用户定义的值类型
+-----------------
 
-A user-defined value type allows creating a zero cost abstraction over an elementary value type.
-This is similar to an alias, but with stricter type requirements.
+一个用户定义的值类型�许在一个基本的值类型上创建一个零�本的抽象。
+这类似于一个别�，但有更严格的类型�求。
 
-A user-defined value type is defined using ``type C is V``, where ``C`` is the name of the newly
-introduced type and ``V`` has to be a built-in value type (the "underlying type"). The function
-``C.wrap`` is used to convert from the underlying type to the custom type. Similarly, the
-function ``C.unwrap`` is used to convert from the custom type to the underlying type.
+一个用户定义的值类型是用 ``type C is V`` 定义的，其中 ``C`` 是新引入的类型的�称，
+``V`` 必须是一个内置的值类型（“底层类型�）。
+函数 ``C.wrap`` 被用�从底层类型转�到自定义类型。�样地，
+函数 ``C.unwrap`` 被用�从自定义类型转�到底层类型。
 
-The type ``C`` does not have any operators or attached member functions. In particular, even the
-operator ``==`` is not defined. Explicit and implicit conversions to and from other types are
-disallowed.
+类型 ``C`` 没有任何�算符或附加�员函数。特别是，甚至�算符 ``==`` 也没有定义。
+��许对其他类型进行显�和��转�。
 
-The data-representation of values of such types are inherited from the underlying type
-and the underlying type is also used in the ABI.
+这�类型的值的数�表示是从底层类型中继承的，底层类型也被用于ABI中。
 
-The following example illustrates a custom type ``UFixed256x18`` representing a decimal fixed point
-type with 18 decimals and a minimal library to do arithmetic operations on the type.
+下�的例�说明了一个自定义类型 ``UFixed256x18``，
+代表一个有18��数的�进制定点类型和一个最�的库�对该类型�算术�算。
 
 
 .. code-block:: solidity
@@ -682,157 +668,150 @@ type with 18 decimals and a minimal library to do arithmetic operations on the t
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.8.8;
 
-    // Represent a 18 decimal, 256 bit wide fixed point type using a user-defined value type.
+    // 使用用户定义的值类型表示一个18��数，256�宽的定点类型。
     type UFixed256x18 is uint256;
 
-    /// A minimal library to do fixed point operations on UFixed256x18.
+    /// 一个在UFixed256x18上进行定点�作的最�库。
     library FixedMath {
         uint constant multiplier = 10**18;
 
-        /// Adds two UFixed256x18 numbers. Reverts on overflow, relying on checked
-        /// arithmetic on uint256.
+        /// 将两个UFixed256x18的数字相加。溢出时将返回，��uint256的算术检查。
         function add(UFixed256x18 a, UFixed256x18 b) internal pure returns (UFixed256x18) {
             return UFixed256x18.wrap(UFixed256x18.unwrap(a) + UFixed256x18.unwrap(b));
         }
-        /// Multiplies UFixed256x18 and uint256. Reverts on overflow, relying on checked
-        /// arithmetic on uint256.
+        /// 将UFixed256x18和uint256相乘。溢出时将返回，��uint256的算术检查。
         function mul(UFixed256x18 a, uint256 b) internal pure returns (UFixed256x18) {
             return UFixed256x18.wrap(UFixed256x18.unwrap(a) * b);
         }
-        /// Take the floor of a UFixed256x18 number.
-        /// @return the largest integer that does not exceed `a`.
+        /// 对一个UFixed256x18类型的数字相下�整。
+        /// @return �超过 `a` 的最大整数。
         function floor(UFixed256x18 a) internal pure returns (uint256) {
             return UFixed256x18.unwrap(a) / multiplier;
         }
-        /// Turns a uint256 into a UFixed256x18 of the same value.
-        /// Reverts if the integer is too large.
+        /// 将一个uint256转化为相�值的UFixed256x18。
+        /// 如果整数太大，则��计算。
         function toUFixed256x18(uint256 a) internal pure returns (UFixed256x18) {
             return UFixed256x18.wrap(a * multiplier);
         }
     }
 
-Notice how ``UFixed256x18.wrap`` and ``FixedMath.toUFixed256x18`` have the same signature but
-perform two very different operations: The ``UFixed256x18.wrap`` function returns a ``UFixed256x18``
-that has the same data representation as the input, whereas ``toUFixed256x18`` returns a
-``UFixed256x18`` that has the same numerical value.
+注� ``UFixed256x18.wrap`` 和 ``FixedMath.toUFixed256x18`` 有相�的签�，
+但执行两个�常��的�作。 ``UFixed256x18.wrap`` 函数返回一个与输入的数�表示相�的 ``UFixed256x18``，
+而 ``toUFixed256x18`` 则返回一个具有相�数值的 ``UFixed256x18``。
 
 .. index:: ! function type, ! type; function
 
 .. _function_types:
 
-Function Types
---------------
+函数类型
+----------
 
-Function types are the types of functions. Variables of function type
-can be assigned from functions and function parameters of function type
-can be used to pass functions to and return functions from function calls.
-Function types come in two flavours - *internal* and *external* functions:
+函数类型是一�表示函数的类型。�以将一个函数赋值给�一个函数类型的��，
+也�以将一个函数作为�数进行传递，还能在函数调用中返回函数类型��。
+函数类型有两类：- *内部（internal）* 函数和 *外部（external）* 函数：
 
-Internal functions can only be called inside the current contract (more specifically,
-inside the current code unit, which also includes internal library functions
-and inherited functions) because they cannot be executed outside of the
-context of the current contract. Calling an internal function is realized
-by jumping to its entry label, just like when calling a function of the current
-contract internally.
+内部函数�能在当��约内被调用（更具体�说，
+在当�代��内，包括内部库函数和继承的函数中），
+因为它们�能在当��约上下文的外部被执行。
+调用一个内部函数是通过跳转到它的入�标签�实现的，
+就�在当��约的内部调用一个函数。
 
-External functions consist of an address and a function signature and they can
-be passed via and returned from external function calls.
+外部函数由一个地�和一个函数签�组�，�以通过外部函数调用传递或者返回。
 
-Function types are notated as follows:
+函数类型表示�如下的形�：
 
 .. code-block:: solidity
     :force:
 
     function (<parameter types>) {internal|external} [pure|view|payable] [returns (<return types>)]
 
-In contrast to the parameter types, the return types cannot be empty - if the
-function type should not return anything, the whole ``returns (<return types>)``
-part has to be omitted.
-
-By default, function types are internal, so the ``internal`` keyword can be
-omitted. Note that this only applies to function types. Visibility has
-to be specified explicitly for functions defined in contracts, they
-do not have a default.
-
-Conversions:
-
-A function type ``A`` is implicitly convertible to a function type ``B`` if and only if
-their parameter types are identical, their return types are identical,
-their internal/external property is identical and the state mutability of ``A``
-is more restrictive than the state mutability of ``B``. In particular:
-
-- ``pure`` functions can be converted to ``view`` and ``non-payable`` functions
-- ``view`` functions can be converted to ``non-payable`` functions
-- ``payable`` functions can be converted to ``non-payable`` functions
-
-No other conversions between function types are possible.
-
-The rule about ``payable`` and ``non-payable`` might be a little
-confusing, but in essence, if a function is ``payable``, this means that it
-also accepts a payment of zero Ether, so it also is ``non-payable``.
-On the other hand, a ``non-payable`` function will reject Ether sent to it,
-so ``non-payable`` functions cannot be converted to ``payable`` functions.
-To clarify, rejecting ether is more restrictive than not rejecting ether.
-This means you can override a payable function with a non-payable but not the
-other way around.
-
-Additionally, When you define a ``non-payable`` function pointer,
-the compiler does not enforce that the pointed function will actually reject ether.
-Instead, it enforces that the function pointer is never used to send ether.
-Which makes it possible to assign a ``payable`` function pointer to a ``non-payable``
-function pointer ensuring both types behave the same way, i.e, both cannot be used
-to send ether.
-
-If a function type variable is not initialised, calling it results
-in a :ref:`Panic error<assert-and-require>`. The same happens if you call a function after using ``delete``
-on it.
-
-If external function types are used outside of the context of Solidity,
-they are treated as the ``function`` type, which encodes the address
-followed by the function identifier together in a single ``bytes24`` type.
-
-Note that public functions of the current contract can be used both as an
-internal and as an external function. To use ``f`` as an internal function,
-just use ``f``, if you want to use its external form, use ``this.f``.
-
-A function of an internal type can be assigned to a variable of an internal function type regardless
-of where it is defined.
-This includes private, internal and public functions of both contracts and libraries as well as free
-functions.
-External function types, on the other hand, are only compatible with public and external contract
-functions.
+与�数类型相�，返回类型�能为空 —— 如果函数类型�需�返回，
+则需�删除整个 ``returns (<return types>)`` 部分。
+
+默认情况下，函数类型是内部函数，所以�以�略 ``internal`` 关键字。
+注�，这�适用于函数类型。对于�约中定义的函数，
+必须明确指定其��性，它们没有默认类型。
+
+转�：
+
+当且仅当它们的�数类型相�，它们的返回类型相�，它们的内部/外部属性相�，
+并且 ``A`` 的状���性比 ``B`` 的状���性更具�制性时，
+一个函数类型 ``A`` 就�以��转�为一个函数类型 ``B``。特别是：
+
+- ``pure`` 函数�以转�为 ``view`` 和 ``� payable`` 函数
+- ``view`` 函数�以转�为 ``� payable`` 函数
+- ``payable`` 函数�以转�为 ``� payable`` 函数
+
+其他函数类型之间的转�是��能的。
+
+关于 ``payable`` 和 ``� payable`` 的规则�能有点混乱，
+但实质上，如果一个函数是 ``payable``，这�味�
+它也接�零以太的支付，所以它也是 ``� payable``。
+�一方�，一个 ``� payable`` 的函数将拒收��给它的以太，
+所以 ``� payable`` 的函数�能被转�为 ``payable`` 的函数。
+声明一下，拒收以太比�拒收以太更有�制性。
+这�味�您�以用一个��支付的函数覆写一个�支付的函数，但�能�过�。
+
+此外，当您定义一个 ``� payable`` 的函数指针时，
+编译器并�强制�求被指�的函数实际拒收以太。
+相�，它强制�求该函数指针永远�会被用���以太。
+这使得我们有�能将一个 ``payable`` 的函数指针分�给一个 ``� payable`` 的函数指针，
+以确�这两�类型的函数表现相�，�都�能用���以太。
+
+如果一个函数类型的��没有被�始化，调用它将导致
+会出现 :ref:`异常<assert-and-require>`。如果您在一个函数上使用了 ``delete`` 之��调用它，
+也会�生�样的情况。
+
+如果外部函数类型在 Solidity 的上下文中被使用，
+它们将被视为 ``function`` 类型，它将地�和函数标识符一起编�为一个 ``bytes24`` 类型。
+
+请注�，当��约的公共函数既�以被当作内部函数也�以被当作外部函数使用。
+如果想将一个函数当作内部函数使用，就用 ``f`` 调用，
+如果想将其当作外部函数，使用 ``this.f`` 。
+
+一个内部类型的函数�以被分�给一个内部函数类型的��，无论它在哪里被定义。
+这包括�约和库的�有，内部和公共函数，以�自由函数。
+�一方�，外部函数类型�与公共和外部�约函数兼容。
 
 .. note::
-    External functions with ``calldata`` parameters are incompatible with external function types with ``calldata`` parameters.
-    They are compatible with the corresponding types with ``memory`` parameters instead.
-    For example, there is no function that can be pointed at by a value of type ``function (string calldata) external`` while
-    ``function (string memory) external`` can point at both ``function f(string memory) external {}`` and
-    ``function g(string calldata) external {}``.
-    This is because for both locations the arguments are passed to the function in the same way.
-    The caller cannot pass its calldata directly to an external function and always ABI-encodes the arguments into memory.
-    Marking the parameters as ``calldata`` only affects the implementation of the external function and is
-    meaningless in a function pointer on the caller's side.
+    带有 ``calldata`` �数的外部函数与带有 ``calldata`` �数的外部函数类型�兼容。
+    它们与相应的带有 ``memory`` �数的类型兼容。
+    例如，没有一个函数�以被 ``function (string calldata) external`` 类型的值所指�，
+    而 ``function (string memory) external`` �以�时指� ``function f(string memory) external {}``
+    和 ``function g(string calldata) external {}``。
+    这是因为对于这两个�置，�数是以�样的方�传递给函数的。
+    调用者�能直接将其calldata传递给外部函数，总是ABI将�数编�到内存中。
+    将�数标记为 ``calldata`` �影�到外部函数的实现，在调用者一方的函数指针中是没有�义的。
+
+<<<<<<< HEAD
+库�约被排除在外，因为它们需� ``delegatecall``，
+并且 :ref:`对它们的选择器使用��的 ABI 约定 <library-selectors>`。
+接�中声明的函数没有定义，所以指�它们也没有�义。
+=======
+.. warning::
+    Comparison of internal function pointers can have unexpected results in the legacy pipeline with the optimizer enabled,
+    as it can collapse identical functions into one, which will then lead to said function pointers comparing as equal instead of not.
+    Such comparisons are not advised, and will lead to the compiler issuing a warning, until the next breaking release (0.9.0),
+    when the warning will be upgraded to an error, thereby making such comparisons disallowed.
 
 Libraries are excluded because they require a ``delegatecall`` and use :ref:`a different ABI
 convention for their selectors <library-selectors>`.
 Functions declared in interfaces do not have definitions so pointing at them does not make sense either.
+>>>>>>> english/develop
 
-Members:
-
-External (or public) functions have the following members:
+�员：
+外部（或公共）函数有以下�员：
 
-* ``.address`` returns the address of the contract of the function.
-* ``.selector`` returns the :ref:`ABI function selector <abi_function_selector>`
+* ``.address`` 返回该函数的�约地�。
+* ``.selector`` 返回 :ref:`ABI 函数选择器 <abi_function_selector>`
 
 .. note::
-  External (or public) functions used to have the additional members
-  ``.gas(uint)`` and ``.value(uint)``. These were deprecated in Solidity 0.6.2
-  and removed in Solidity 0.7.0. Instead use ``{gas: ...}`` and ``{value: ...}``
-  to specify the amount of gas or the amount of wei sent to a function,
-  respectively. See :ref:`External Function Calls <external-function-calls>` for
-  more information.
+  外部（或公共）函数曾�有�外的�员 ``.gas(uint)`` 和 ``.value(uint)``。
+  这些在 Solidity 0.6.2 中被废弃，并在 Solidity 0.7.0 中被移除。�而代之的是
+  使用 ``{gas: ...}`` 和 ``{value: ...}`` �分别指定��到函数的气体�或以太（wei为��）�。
+  �� :ref:`外部函数调用 <external-function-calls>` 以获得更多信�。
 
-Example that shows how to use the members:
+以下例�展示如何使用这些�员：
 
 .. code-block:: solidity
 
@@ -850,7 +829,7 @@ Example that shows how to use the members:
         }
     }
 
-Example that shows how to use internal function types:
+以下例�展示如何使用内部函数类型：
 
 .. code-block:: solidity
 
@@ -858,8 +837,7 @@ Example that shows how to use internal function types:
     pragma solidity >=0.4.16 <0.9.0;
 
     library ArrayUtils {
-        // internal functions can be used in internal library functions because
-        // they will be part of the same code context
+        // 内部函数�以在内部库函数中使用，因为它们将是�一代�上下文的一部分
         function map(uint[] memory self, function (uint) pure returns (uint) f)
             internal
             pure
@@ -910,7 +888,7 @@ Example that shows how to use internal function types:
         }
     }
 
-Another example that uses external function types:
+�一个使用外部函数类型的例�：
 
 .. code-block:: solidity
 
@@ -933,14 +911,14 @@ Another example that uses external function types:
         }
 
         function reply(uint requestID, uint response) public {
-            // Here goes the check that the reply comes from a trusted source
+            // 这里�检查的是调用返回是��自�信的��
             requests[requestID].callback(response);
         }
     }
 
 
     contract OracleUser {
-        Oracle constant private ORACLE_CONST = Oracle(address(0x00000000219ab540356cBB839Cbe05303d7705Fa)); // known contract
+        Oracle constant private ORACLE_CONST = Oracle(address(0x00000000219ab540356cBB839Cbe05303d7705Fa)); // 已知的�约
         uint private exchangeRate;
 
         function buySomething() public {
@@ -957,4 +935,4 @@ Another example that uses external function types:
     }
 
 .. note::
-    Lambda or inline functions are planned but not yet supported.
+    Lambda 或内�函数是计划中的，但还�支�。
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index d2256884eb48..958364a28b9f 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -1,15 +1,16 @@
 .. index:: ! denomination
 
-**************************************
-Units and Globally Available Variables
-**************************************
+******************
+��和全局�用��
+******************
 
 .. index:: ! wei, ! finney, ! szabo, ! gwei, ! ether, ! denomination;ether
 
-Ether Units
-===========
+以太�（Ether） ��
+======================
 
-A literal number can take a suffix of ``wei``, ``gwei`` or ``ether`` to specify a subdenomination of Ether, where Ether numbers without a postfix are assumed to be Wei.
+一个字�常数�以带一个�缀 ``wei``， ``gwei`` 或 ``ether`` �指定一个以太�的数�，
+其中没有�缀的以太数字被认为��是wei。
 
 .. code-block:: solidity
     :force:
@@ -18,19 +19,18 @@ A literal number can take a suffix of ``wei``, ``gwei`` or ``ether`` to specify
     assert(1 gwei == 1e9);
     assert(1 ether == 1e18);
 
-The only effect of the subdenomination suffix is a multiplication by a power of ten.
+���缀的唯一作用是乘以10的幂次方。
 
 .. note::
-    The denominations ``finney`` and ``szabo`` have been removed in version 0.7.0.
+    0.7.0 版本中删除了 ``finney`` 和 ``szabo`` 这两个��。
 
 .. index:: ! seconds, ! minutes, ! hours, ! days, ! weeks, ! years, ! denomination;time
 
-Time Units
+时间��
 ==========
 
-Suffixes like ``seconds``, ``minutes``, ``hours``, ``days`` and ``weeks``
-after literal numbers can be used to specify units of time where seconds are the base
-unit and units are considered naively in the following way:
+诸如 ``seconds``， ``minutes``， ``hours``， ``days`` 和 ``weeks`` 等
+�缀在字�常数��，�以用�指定时间��，其中秒是基本��，��的考虑方�很直白：
 
 * ``1 == 1 seconds``
 * ``1 minutes == 60 seconds``
@@ -38,17 +38,15 @@ unit and units are considered naively in the following way:
 * ``1 days == 24 hours``
 * ``1 weeks == 7 days``
 
-Take care if you perform calendar calculations using these units, because
-not every year equals 365 days and not even every day has 24 hours
-because of `leap seconds <https://en.wikipedia.org/wiki/Leap_second>`_.
-Due to the fact that leap seconds cannot be predicted, an exact calendar
-library has to be updated by an external oracle.
+如果您使用这些��进行日历计算，请注�，由于 `闰秒 <https://en.wikipedia.org/wiki/Leap_second>`_
+会造��是�一年都等于365天，甚至�是�一天都有24�时，而且因为闰秒是无法预测的，
+所以需�借助外部的预言机（oracle，是一�链外数��务，译者注）�对一个确定的日期代�库进行时间矫正。
 
 .. note::
-    The suffix ``years`` has been removed in version 0.5.0 due to the reasons above.
+    由于上述原因，在 0.5.0 版本中删除了�缀 ``years``。
 
-These suffixes cannot be applied to variables. For example, if you want to
-interpret a function parameter in days, you can in the following way:
+这些�缀���能应用于��。例如，
+如果您想用时间��（例如 days）�将输入���算为时间，您�以用以下方�：
 
 .. code-block:: solidity
 
@@ -60,21 +58,40 @@ interpret a function parameter in days, you can in the following way:
 
 .. _special-variables-functions:
 
-Special Variables and Functions
-===============================
-
-There are special variables and functions which always exist in the global
-namespace and are mainly used to provide information about the blockchain
-or are general-use utility functions.
-
-.. index:: abi, block, coinbase, difficulty, prevrandao, encode, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin
-
-
-Block and Transaction Properties
---------------------------------
-
+特殊��和函数
+===============
+
+有一些特殊的��和函数总是存在于全局命�空间，主�用于�供区�链的信�，或者是通用的工具函数。
+
+.. index:: abi, block, coinbase, difficulty, prevrandao, encode, number, block;number, timestamp, block;timestamp, block;basefee, block;blobbasefee, msg, data, gas, sender, value, gas price, origin
+
+
+区�和交易属性
+---------------
+
+<<<<<<< HEAD
+- ``blockhash(uint blockNumber) returns (bytes32)``: 当 ``blocknumber`` 是最近的256个区�之一时，给定区�的哈希值；�则返回0。
+- ``block.basefee`` （ ``uint``）： 当�区�的基本费用 （ `EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ 和 `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_）
+- ``block.chainid`` （ ``uint``）： 当�链的ID
+- ``block.coinbase`` （ ``address payable``）： 挖出当�区�的矿工地�
+- ``block.difficulty`` （ ``uint``）： 当��的难度（ ``EVM < Paris`` ）。对于其他EVM版本，它是为 ``block.prevrandao`` 的已废弃别� （`EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ ）
+- ``block.gaslimit`` （ ``uint``）： 当�区� gas ��
+- ``block.number`` （ ``uint``）： 当�区��
+- ``block.timestamp`` （ ``uint``）： 自 unix epoch 起始到当�区�以秒计的时间戳
+- ``gasleft() returns (uint256)``： 剩余的 gas
+- ``msg.data`` （ ``bytes calldata``）： 完整的  calldata
+- ``msg.sender`` （ ``address``）： 消���者（当�调用）
+- ``msg.sig`` （ ``bytes4``）： calldata 的� 4 字节（也就是函数标识符）
+- ``msg.value`` （ ``uint``）： �消���的 wei 的数�
+- ``tx.gasprice`` （ ``uint``）： �消���的 wei 的数�
+- ``tx.origin`` （ ``address``）： 交易�起者（完全的调用链）
+=======
 - ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block when ``blocknumber`` is one of the 256 most recent blocks; otherwise returns zero
+- ``blobhash(uint index) returns (bytes32)``: versioned hash of the ``index``-th blob associated with the current transaction.
+  A versioned hash consists of a single byte representing the version (currently ``0x01``), followed by the last 31 bytes
+  of the SHA256 hash of the KZG commitment (`EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
+- ``block.blobbasefee`` (``uint``): current block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
 - ``block.difficulty`` (``uint``): current block difficulty (``EVM < Paris``). For other EVM versions it behaves as a deprecated alias for ``block.prevrandao`` (`EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ )
@@ -89,317 +106,343 @@ Block and Transaction Properties
 - ``msg.value`` (``uint``): number of wei sent with the message
 - ``tx.gasprice`` (``uint``): gas price of the transaction
 - ``tx.origin`` (``address``): sender of the transaction (full call chain)
+>>>>>>> english/develop
 
 .. note::
-    The values of all members of ``msg``, including ``msg.sender`` and
-    ``msg.value`` can change for every **external** function call.
-    This includes calls to library functions.
+    对于�一个 **外部（external）** 函数调用，
+    包括 ``msg.sender`` 和 ``msg.value`` 在内所有 ``msg`` �员的值都会�化。
+    这里包括对库函数的调用。
 
 .. note::
-    When contracts are evaluated off-chain rather than in context of a transaction included in a
-    block, you should not assume that ``block.*`` and ``tx.*`` refer to values from any specific
-    block or transaction. These values are provided by the EVM implementation that executes the
-    contract and can be arbitrary.
+    当�约在链下而�是在区�中包�的交易的背景下计算时，
+    您�应该认为 ``block.*`` 和 ``tx.*`` 是指任何特定区�或交易的值。
+    这些值是由执行�约的EVM实现�供的，�以是任�的。
 
 .. note::
-    Do not rely on ``block.timestamp`` or ``blockhash`` as a source of randomness,
-    unless you know what you are doing.
+    ���赖 ``block.timestamp`` 和 ``blockhash`` 产生�机数，除�您知�自己在�什么。
 
+<<<<<<< HEAD
+    时间戳和区�哈希在一定程度上都�能�到挖矿矿工影�。
+    例如，挖矿社区中的��矿工�以用�个给定的哈希��行赌场�约的 payout 函数，
+    而如果他们没收到钱，还�以用一个��的哈希�新�试。
+=======
     Both the timestamp and the block hash can be influenced by miners to some degree.
     Bad actors in the mining community can for example run a casino payout function on a chosen hash
     and just retry a different hash if they did not receive any compensation, e.g. Ether.
+>>>>>>> english/develop
 
-    The current block timestamp must be strictly larger than the timestamp of the last block,
-    but the only guarantee is that it will be somewhere between the timestamps of two
-    consecutive blocks in the canonical chain.
+    当�区�的时间戳必须严格大于最�一个区�的时间戳，
+    但这里唯一能确�的�是它会是在��链上的两个连续区�的时间戳之间的数值。
 
 .. note::
-    The block hashes are not available for all blocks for scalability reasons.
-    You can only access the hashes of the most recent 256 blocks, all other
-    values will be zero.
+    基于�扩展因素，区�哈希�是对所有区�都有效。
+    您仅仅�以访问最近 256 个区�的哈希，其余的哈希�为零。
 
 .. note::
-    The function ``blockhash`` was previously known as ``block.blockhash``, which was deprecated in
-    version 0.4.22 and removed in version 0.5.0.
+    函数 ``blockhash`` 以�被称为 ``block.blockhash``，
+    在 0.4.22 版本中被废弃，在 0.5.0 版本中被删除。
 
 .. note::
-    The function ``gasleft`` was previously known as ``msg.gas``, which was deprecated in
-    version 0.4.21 and removed in version 0.5.0.
+    函数 ``gasleft`` 的�身是 ``msg.gas``，
+    在 0.4.21 版本中被弃用，在 0.5.0 版本中被删除。
 
 .. note::
-    In version 0.7.0, the alias ``now`` (for ``block.timestamp``) was removed.
+    在 0.7.0 版本中，删除了别� ``now``（用于 ``block.timestamp``）。
 
 .. index:: abi, encoding, packed
 
-ABI Encoding and Decoding Functions
------------------------------------
+ABI编�和解�函数
+-------------------
 
-- ``abi.decode(bytes memory encodedData, (...)) returns (...)``: ABI-decodes the given data, while the types are given in parentheses as second argument. Example: ``(uint a, uint[2] memory b, bytes memory c) = abi.decode(data, (uint, uint[2], bytes))``
-- ``abi.encode(...) returns (bytes memory)``: ABI-encodes the given arguments
-- ``abi.encodePacked(...) returns (bytes memory)``: Performs :ref:`packed encoding <abi_packed_mode>` of the given arguments. Note that packed encoding can be ambiguous!
-- ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: ABI-encodes the given arguments starting from the second and prepends the given four-byte selector
-- ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
-- ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``: ABI-encodes a call to ``functionPointer`` with the arguments found in the tuple. Performs a full type-check, ensuring the types match the function signature. Result equals ``abi.encodeWithSelector(functionPointer.selector, (...))``
+- ``abi.decode(bytes memory encodedData, (...)) returns (...)``: ABI-解�给定的数�，而类型在括�中作为第二个�数给出。例如： ``(uint a, uint[2] memory b, bytes memory c) = abi.decode(data, (uint, uint[2], bytes))``
+- ``abi.encode(...) returns (bytes memory)``： 对给定的�数进行ABI编�
+- ``abi.encodePacked(...) returns (bytes memory)``： 对给定�数执行 :ref:`紧打包编� <abi_packed_mode>`。 请注�，打包编��能会有歧义!
+- ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``： ABI-对给定�数进行编�，并以给定的函数选择器作为起始的4字节数�一起返回
+- ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``： 相当于 ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
+- ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``： 对 ``函数指针`` 的调用进行ABI编�，�数在元组中找到。执行全�的类型检查，确�类型与函数签�相符。结果相当于 ``abi.encodeWithSelector(functionPointer.selector, (...))``。
 
 .. note::
-    These encoding functions can be used to craft data for external function calls without actually
-    calling an external function. Furthermore, ``keccak256(abi.encodePacked(a, b))`` is a way
-    to compute the hash of structured data (although be aware that it is possible to
-    craft a "hash collision" using different function parameter types).
+    这些编�函数�用于制作外部函数调用的数�，而无需实际调用外部函数。
+    此外， ``keccak256(abi.encodePacked(a, b))`` 是一�计算结构化数�的哈希值的方法
+    （但是�注�有�能使用��的函数�数类型会制作出一个 "哈希碰撞"）。
 
-See the documentation about the :ref:`ABI <ABI>` and the
-:ref:`tightly packed encoding <abi_packed_mode>` for details about the encoding.
+更多详情请�考 :ref:`ABI <ABI>` 和 :ref:`紧打包编� <abi_packed_mode>`。
 
 .. index:: bytes members
 
-Members of bytes
+字节类型的�员
 ----------------
 
-- ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of bytes and bytes1, ..., bytes32 arguments to one byte array<bytes-concat>`
+- ``bytes.concat(...) returns (bytes memory)``: :ref:`将��数�的字节和byte1, ..., byte32�数串��一个字节数组 <bytes-concat>`
 
 .. index:: string members
 
-Members of string
+字符串的�员
 -----------------
 
-- ``string.concat(...) returns (string memory)``: :ref:`Concatenates variable number of string arguments to one string array<string-concat>`
+- ``string.concat(...) returns (string memory)``: :ref:`将��数�的字符串�数串��一个字符串数组 <string-concat>`
 
 
 .. index:: assert, revert, require
 
-Error Handling
+错误处�
 --------------
 
-See the dedicated section on :ref:`assert and require<assert-and-require>` for
-more details on error handling and when to use which function.
+关于错误处�和何时使用哪个函数的更多细节，
+请�� :ref:`assert 和 require <assert-and-require>` 的专门章节。
 
 ``assert(bool condition)``
-    causes a Panic error and thus state change reversion if the condition is not met - to be used for internal errors.
+    如果�件�满足，会导致异常，因此，状��化会被�� - 用于内部错误。
 
 ``require(bool condition)``
-    reverts if the condition is not met - to be used for errors in inputs or external components.
+    如果�件�满足，则��状�更改 - 用于输入或外部组件的错误。
 
 ``require(bool condition, string memory message)``
-    reverts if the condition is not met - to be used for errors in inputs or external components. Also provides an error message.
+    如果�件�满足，则��状�更改 - 用于输入或外部组件的错误，�以�时�供一个错误消�。
 
 ``revert()``
-    abort execution and revert state changes
+    终止�行并��状�更改。
 
 ``revert(string memory reason)``
-    abort execution and revert state changes, providing an explanatory string
+    终止�行并��状�更改，�以�时�供一个解释性的字符串。
 
 .. index:: keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography,
 
 .. _mathematical-and-cryptographic-functions:
 
-Mathematical and Cryptographic Functions
-----------------------------------------
+数学和密�学函数
+-------------------
 
 ``addmod(uint x, uint y, uint k) returns (uint)``
-    compute ``(x + y) % k`` where the addition is performed with arbitrary precision and does not wrap around at ``2**256``. Assert that ``k != 0`` starting from version 0.5.0.
+    计算 ``(x + y) % k``，加法会在任�精度下执行，并且加法的结果�使超过 ``2**256`` 也�会被截�。从 0.5.0 版本的编译器开始会加入对 ``k != 0`` 的校验（assert）。
 
 ``mulmod(uint x, uint y, uint k) returns (uint)``
-    compute ``(x * y) % k`` where the multiplication is performed with arbitrary precision and does not wrap around at ``2**256``. Assert that ``k != 0`` starting from version 0.5.0.
+    计算 ``(x * y) % k``，乘法会在任�精度下执行，并且乘法的结果�使超过 ``2**256`` 也�会被截�。从 0.5.0 版本的编译器开始会加入对 ``k != 0`` 的校验（assert）。
 
 ``keccak256(bytes memory) returns (bytes32)``
-    compute the Keccak-256 hash of the input
+    计算输入的 Keccak-256 哈希值。
 
 .. note::
 
-    There used to be an alias for ``keccak256`` called ``sha3``, which was removed in version 0.5.0.
+    以� ``keccak256`` 的别�� ``sha3`` ，在 0.5.0 版本中被删除。
 
 ``sha256(bytes memory) returns (bytes32)``
-    compute the SHA-256 hash of the input
+    计算输入的 SHA-256 哈希值。
 
 ``ripemd160(bytes memory) returns (bytes20)``
-    compute RIPEMD-160 hash of the input
+    计算输入的 RIPEMD-160 哈希值。
 
 ``ecrecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) returns (address)``
-    recover the address associated with the public key from elliptic curve signature or return zero on error.
-    The function parameters correspond to ECDSA values of the signature:
+    利用椭圆曲线签���与公钥相关的地�，错误返回零值。
+    函数�数对应于签�的 ECDSA 值：
 
-    * ``r`` = first 32 bytes of signature
-    * ``s`` = second 32 bytes of signature
-    * ``v`` = final 1 byte of signature
+    * ``r`` = 签�的�32字节
+    * ``s`` = 签�的第二个32字节
+    * ``v`` = 签�的最�1个字节
 
-    ``ecrecover`` returns an ``address``, and not an ``address payable``. See :ref:`address payable<address>` for
-    conversion, in case you need to transfer funds to the recovered address.
+    ``ecrecover`` 返回一个 ``address``，而�是 ``address payable``。
+    �� :ref:`地�类型 <address>` 进行转�，以备您需����的地�转移资金。
 
-    For further details, read `example usage <https://ethereum.stackexchange.com/questions/1777/workflow-on-signing-a-string-with-private-key-followed-by-signature-verificatio>`_.
+    更多细节，请阅读 `使用示例 <https://ethereum.stackexchange.com/questions/1777/workflow-on-signing-a-string-with-private-key-followed-by-signature-verificatio>`_.
 
 .. warning::
 
-    If you use ``ecrecover``, be aware that a valid signature can be turned into a different valid signature without
-    requiring knowledge of the corresponding private key. In the Homestead hard fork, this issue was fixed
-    for _transaction_ signatures (see `EIP-2 <https://eips.ethereum.org/EIPS/eip-2#specification>`_), but
-    the ecrecover function remained unchanged.
+    如果您使用 ``ecrecover``，请注�，一个有效的签��以���一个有效的签�，而�需�知�相应的�钥。
+    在 Homestead 硬分�中，这个问题对 _transaction_ 签�进行了修�
+    （� `EIP-2 <https://eips.ethereum.org/EIPS/eip-2#specification>`_），
+    但 ecrecover 函数�然没有改�。
 
+<<<<<<< HEAD
+    这通常�是一个问题，除�您�求签�是唯一的，或者用它们�识别个体。
+    OpenZeppelin 有一个 `ECDSA 辅助库 <https://docs.openzeppelin.com/contracts/4.x/api/utils#ECDSA>`_，
+    您�以用它作为 ``ecrecover`` 的包装，那样就没有这个问题。
+=======
     This is usually not a problem unless you require signatures to be unique or use them to identify items.
     OpenZeppelin has an `ECDSA helper library <https://docs.openzeppelin.com/contracts/4.x/api/utils#ECDSA>`_ that you can use as a wrapper for ``ecrecover`` without this issue.
+>>>>>>> english/develop
 
 .. note::
 
-    When running ``sha256``, ``ripemd160`` or ``ecrecover`` on a *private blockchain*, you might encounter Out-of-Gas. This is because these functions are implemented as "precompiled contracts" and only really exist after they receive the first message (although their contract code is hardcoded). Messages to non-existing contracts are more expensive and thus the execution might run into an Out-of-Gas error. A workaround for this problem is to first send Wei (1 for example) to each of the contracts before you use them in your actual contracts. This is not an issue on the main or test net.
+    当在 *�有区�链* 上�行 ``sha256``， ``ripemd160`` 或 ``ecrecover`` 时，您�能会�到超出 gas（Out-of-Gas）的错误。这是因为这些功能是作为 “预编译�约� 实现的，�有在它们收到第一个消���真正存在（尽管它们的�约代�是硬编�的）。��存在的�约��消�的�本较高，因此执行时�能会�到 Out-of-Gas 错误。这个问题的一个�通方法是，在您的实际�约中使用它们之�，先��个�约�� Wei（例如1）。这在主网和测试网上都没有问题。
 
 .. index:: balance, codehash, send, transfer, call, callcode, delegatecall, staticcall
 
 .. _address_related:
 
-Members of Address Types
-------------------------
+地�类型的�员
+---------------
 
-``<address>.balance`` (``uint256``)
-    balance of the :ref:`address` in Wei
+``<address>.balance`` （ ``uint256`` ）
+    以 Wei 为��的 :ref:`address` 的余�。
 
-``<address>.code`` (``bytes memory``)
-    code at the :ref:`address` (can be empty)
+``<address>.code`` （ ``bytes memory`` ）
+    在 :ref:`address` 的代�（�以是空的）。
 
-``<address>.codehash`` (``bytes32``)
-    the codehash of the :ref:`address`
+``<address>.codehash`` （ ``bytes32`` ）
+    :ref:`address` 的代�哈希值
 
 ``<address payable>.transfer(uint256 amount)``
-    send given amount of Wei to :ref:`address`, reverts on failure, forwards 2300 gas stipend, not adjustable
+    � :ref:`address` ��数�为 amount 的 Wei，失败时抛出异常，�� 2300 gas 的矿工费，��调节。
 
 ``<address payable>.send(uint256 amount) returns (bool)``
-    send given amount of Wei to :ref:`address`, returns ``false`` on failure, forwards 2300 gas stipend, not adjustable
+    � :ref:`address` ��数�为 amount 的 Wei，失败时返回 ``false`` 2300 gas 的矿工费用，��调节。
 
 ``<address>.call(bytes memory) returns (bool, bytes memory)``
-    issue low-level ``CALL`` with the given payload, returns success condition and return data, forwards all available gas, adjustable
+    用给定的数��出低级别的 ``CALL``，返回是��功的结果和数�，��所有�用 gas，�调节。
 
 ``<address>.delegatecall(bytes memory) returns (bool, bytes memory)``
-    issue low-level ``DELEGATECALL`` with the given payload, returns success condition and return data, forwards all available gas, adjustable
+    用给定的数��出低级别的 ``DELEGATECALL``，返回是��功的结果和数�，��所有�用 gas，�调节。
 
 ``<address>.staticcall(bytes memory) returns (bool, bytes memory)``
-    issue low-level ``STATICCALL`` with the given payload, returns success condition and return data, forwards all available gas, adjustable
+    用给定的数��出低级别的 ``STATICCALL``，返回是��功的结果和数�，��所有�用 gas，�调节。
 
-For more information, see the section on :ref:`address`.
+更多信�，请�� :ref:`address` 一节。
 
 .. warning::
-    You should avoid using ``.call()`` whenever possible when executing another contract function as it bypasses type checking,
-    function existence check, and argument packing.
+    您应该尽�能��在执行�一个�约函数时使用 ``.call()``，因为它绕过了类型检查�函数存在性检查和�数打包。
 
 .. warning::
+<<<<<<< HEAD
+    使用 ``send`` 有很多�险：如果调用栈深度已�达到 1024（这总是�以由调用者所强制指定），
+    转账会失败；并且如果接收者用光了 gas，转账�样会失败。为了��以太�转账安全，
+    总是检查 ``send`` 的返回值，使用 ``transfer`` 或者下�更好的方�： 用接收者�款的模�。
+=======
     There are some dangers in using ``send``: The transfer fails if the call stack depth is at 1024
     (this can always be forced by the caller) and it also fails if the recipient runs out of gas. So in order
     to make safe Ether transfers, always check the return value of ``send``, use ``transfer`` or even better:
     Use a pattern where the recipient withdraws the Ether.
+>>>>>>> english/develop
 
 .. warning::
-    Due to the fact that the EVM considers a call to a non-existing contract to always succeed,
-    Solidity includes an extra check using the ``extcodesize`` opcode when performing external calls.
-    This ensures that the contract that is about to be called either actually exists (it contains code)
-    or an exception is raised.
+    由于 EVM 认为对一个�存在的�约的调用总是�功的，
+    Solidity 在执行外部调用时使用 ``extcodesize`` �作�进行�外的检查。
+    这确�了�将被调用的�约�么实际存在（它包�代�），�么就会产生一个异常。
 
-    The low-level calls which operate on addresses rather than contract instances (i.e. ``.call()``,
-    ``.delegatecall()``, ``.staticcall()``, ``.send()`` and ``.transfer()``) **do not** include this
-    check, which makes them cheaper in terms of gas but also less safe.
+    对地�而�是�约实例进行低级调用
+    （� ``.call()``, ``.delegatecall()``, ``.staticcall()``, ``.send()`` 和 ``.transfer()``）
+    **�包括** 这�检查，这使得它们在gas方�更便宜，但也更�安全。
 
 .. note::
-   Prior to version 0.5.0, Solidity allowed address members to be accessed by a contract instance, for example ``this.balance``.
-   This is now forbidden and an explicit conversion to address must be done: ``address(this).balance``.
+   在 0.5.0 版本之�，Solidity �许地��员被�约实例访问，例如 ``this.balance``。
+   现在这被�止了，必须�一个明确的地�转�。 ``address(this).balance``。
 
 .. note::
-   If state variables are accessed via a low-level delegatecall, the storage layout of the two contracts
-   must align in order for the called contract to correctly access the storage variables of the calling contract by name.
-   This is of course not the case if storage pointers are passed as function arguments as in the case for
-   the high-level libraries.
+   如果状���是通过低级别的委托调用�访问的，那么两个�约的存储布局必须一致，
+   以便被调用的�约能够正确地通过�称�访问调用�约的存储��。
+   当然，如果存储指针作为函数�数被传递的�，情况就�是这样了，就�高层库的情况一样。
 
 .. note::
-    Prior to version 0.5.0, ``.call``, ``.delegatecall`` and ``.staticcall`` only returned the
-    success condition and not the return data.
+    在 0.5.0 版本之�， ``.call``, ``.delegatecall`` 和 ``.staticcall`` �返回�功状况，
+    �返回数�。
 
 .. note::
-    Prior to version 0.5.0, there was a member called ``callcode`` with similar but slightly different
-    semantics than ``delegatecall``.
+    在 0.5.0 版本之�，有一个�为 ``callcode`` 的�员，其语义与 ``delegatecall`` 相似但略有��。
 
 
 .. index:: this, selfdestruct, super
 
-Contract-related
-----------------
+�约相关
+----------
 
-``this`` (current contract's type)
-    The current contract, explicitly convertible to :ref:`address`
+``this`` （当��约类型）
+    当��约，�以明确转�为 :ref:`address`
 
 ``super``
-    A contract one level higher in the inheritance hierarchy
+    继承层次结构中更高一级的�约
 
 ``selfdestruct(address payable recipient)``
-    Destroy the current contract, sending its funds to the given :ref:`address`
-    and end execution.
-    Note that ``selfdestruct`` has some peculiarities inherited from the EVM:
+    销�当��约，将其资金��到给定的 :ref:`address` 并结�执行。
+    注�， ``selfdestruct`` 有一些从EVM继承的特殊性：
 
-    - the receiving contract's receive function is not executed.
-    - the contract is only really destroyed at the end of the transaction and ``revert`` s might "undo" the destruction.
+    - 接收�约的接收函数�会被执行。
+    - �约�有在交易结�时�真正被销�， 任何一个 ``revert`` �能会 "��" 销�。
 
-Furthermore, all functions of the current contract are callable directly including the current function.
+此外，当��约的所有函数都�以直接调用，包括当�函数。
 
 .. warning::
-    From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
-    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behavior
-    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+<<<<<<< HEAD
+    从 0.8.18 �以上版本开始，在 Solidity 和 Yul 中使用 ``selfdestruct`` 将触�一个已废弃警告，
+    因为 ``SELFDESTRUCT`` �作�最终会�生如 `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_ 中所述的行为上的�大�化。
+=======
+    From ``EVM >= Cancun`` onwards, ``selfdestruct`` will **only** send all Ether in the account to the given recipient and not destroy the contract.
+    However, when ``selfdestruct`` is called in the same transaction that creates the contract calling it,
+    the behaviour of ``selfdestruct`` before Cancun hardfork (i.e., ``EVM <= Shanghai``) is preserved and will destroy the current contract,
+    deleting any data, including storage keys, code and the account itself.
+    See `EIP-6780 <https://eips.ethereum.org/EIPS/eip-6780>`_ for more details.
+
+    The new behaviour is the result of a network-wide change that affects all contracts present on
+    the Ethereum mainnet and testnets.
+    It is important to note that this change is dependent on the EVM version of the chain on which
+    the contract is deployed.
+    The ``--evm-version`` setting used when compiling the contract has no bearing on it.
+
+    Also, note that the ``selfdestruct`` opcode has been deprecated in Solidity version 0.8.18,
+    as recommended by `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+    The deprecation is still in effect and the compiler will still emit warnings on its use.
+    Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account.
+    Future changes to the EVM might further reduce the functionality of the opcode.
+>>>>>>> english/develop
 
 .. note::
-    Prior to version 0.5.0, there was a function called ``suicide`` with the same
-    semantics as ``selfdestruct``.
+    在 0.5.0 版本之�，有一个�� ``suicide`` 的函数，其语义与 ``selfdestruct`` 相�。
 
 .. index:: type, creationCode, runtimeCode
 
 .. _meta-type:
 
-Type Information
-----------------
+类型信�
+----------
 
-The expression ``type(X)`` can be used to retrieve information about the type
-``X``. Currently, there is limited support for this feature (``X`` can be either
-a contract or an integer type) but it might be expanded in the future.
+表达� ``type(X)`` �以用�检索关于 ``X`` 类型的信�。
+目�，对这一功能的支�是有�的（ ``X`` �以是�约类型或整数型），但在未��能会扩展。
 
-The following properties are available for a contract type ``C``:
+以下是�约类型 ``C`` 的�用属性：
 
 ``type(C).name``
-    The name of the contract.
+    �约的�称。
 
 ``type(C).creationCode``
-    Memory byte array that contains the creation bytecode of the contract.
-    This can be used in inline assembly to build custom creation routines,
-    especially by using the ``create2`` opcode.
-    This property can **not** be accessed in the contract itself or any
-    derived contract. It causes the bytecode to be included in the bytecode
-    of the call site and thus circular references like that are not possible.
+    内存字节数组，包��约的创建字节�。
+    �以在内�程�中用�建立自定义的创建程�，
+    特别是通过使用 ``create2`` �作�。
+    这个属性 **�能** 在�约本身或任何派生�约中被访问。
+    它会导致字节�被包�在调用站点的字节�中，因此�这样的循环引用是��能的。
 
 ``type(C).runtimeCode``
-    Memory byte array that contains the runtime bytecode of the contract.
-    This is the code that is usually deployed by the constructor of ``C``.
-    If ``C`` has a constructor that uses inline assembly, this might be
-    different from the actually deployed bytecode. Also note that libraries
-    modify their runtime bytecode at time of deployment to guard against
-    regular calls.
-    The same restrictions as with ``.creationCode`` also apply for this
-    property.
-
-In addition to the properties above, the following properties are available
-for an interface type ``I``:
-
+    内存字节数组，包��约�行时的字节�。
+    通常是由 ``C`` 的构造函数部署的代�。
+    如果 ``C`` 有一个使用内�汇编的构造函数，这�能与实际部署的字节���。
+    还�注�的是，库�约在部署时修改其�行时字节�，以防止常规调用。
+    与 ``.creationCode`` 相�的�制也适用于这个属性。
+
+除了上述属性外，以下属性对接�类型 ``I`` �用：
+
+<<<<<<< HEAD
+``type(I).interfaceId``:
+    一个 ``bytes4`` 值，是包�给定接� ``I`` 的 `EIP-165 <https://eips.ethereum.org/EIPS/eip-165>`_ 接�标识符。
+    这个标识符被定义为接�本身定义的所有函数选择器的 ``XOR``，�包括所有继承的函数。
+=======
 ``type(I).interfaceId``
     A ``bytes4`` value containing the `EIP-165 <https://eips.ethereum.org/EIPS/eip-165>`_
     interface identifier of the given interface ``I``. This identifier is defined as the ``XOR`` of all
     function selectors defined within the interface itself - excluding all inherited functions.
+>>>>>>> english/develop
 
-The following properties are available for an integer type ``T``:
+以下属性�用于整数类型 ``T``：
 
 ``type(T).min``
-    The smallest value representable by type ``T``.
+    类型 ``T`` 所能代表的最�值。
 
 ``type(T).max``
-    The largest value representable by type ``T``.
+    类型 ``T`` 所能代表的最大值。
 
-Reserved Keywords
+�留关键�
 =================
 
-These keywords are reserved in Solidity. They might become part of the syntax in the future:
+这些关键字在 Solidity 中是�留的。它们在将��能�为语法的一部分：
 
-``after``, ``alias``, ``apply``, ``auto``, ``byte``, ``case``, ``copyof``, ``default``,
-``define``, ``final``, ``implements``, ``in``, ``inline``, ``let``, ``macro``, ``match``,
-``mutable``, ``null``, ``of``, ``partial``, ``promise``, ``reference``, ``relocatable``,
-``sealed``, ``sizeof``, ``static``, ``supports``, ``switch``, ``typedef``, ``typeof``,
-``var``.
+``after``， ``alias``， ``apply``， ``auto``， ``byte``， ``case``， ``copyof``， ``default``，
+``define``， ``final``， ``implements``， ``in``， ``inline``， ``let``， ``macro``， ``match``，
+``mutable``， ``null``， ``of``， ``partial``， ``promise``， ``reference``， ``relocatable``，
+``sealed``， ``sizeof``， ``static``， ``supports``， ``switch``， ``typedef``， ``typeof``，
+``var``。
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 0adcbf4132bb..c5c5d2f63adc 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -1,58 +1,66 @@
 ******************
-Using the Compiler
+使用编译器
 ******************
 
 .. index:: ! commandline compiler, compiler;commandline, ! solc
 
 .. _commandline-compiler:
 
-Using the Commandline Compiler
+使用命令行编译器
 ******************************
 
 .. note::
-    This section does not apply to :ref:`solcjs <solcjs>`, not even if it is used in commandline mode.
+    这一节并�适用于 :ref:`solcjs <solcjs>`， �使在命令行模�下使用也�行。
 
-Basic Usage
+基本用法
 -----------
 
-One of the build targets of the Solidity repository is ``solc``, the Solidity commandline compiler.
-Using ``solc --help`` provides you with an explanation of all options. The compiler can produce various outputs, ranging from simple binaries and assembly over an abstract syntax tree (parse tree) to estimations of gas usage.
-If you only want to compile a single file, you run it as ``solc --bin sourceFile.sol`` and it will print the binary. If you want to get some of the more advanced output variants of ``solc``, it is probably better to tell it to output everything to separate files using ``solc -o outputDirectory --bin --ast-compact-json --asm sourceFile.sol``.
+``solc`` 是 Solidity 仓库的构建目标之一, 它是 Solidity 命令行编译器。
+使用 ``solc --help`` �以为您�供所有选项的解释。编译器�以产生��输出，
+从简�的二进制文件和抽象语法树（解�树）上的汇编到gas使用�的估计。
+如果您�想编译一个文件，您�以�行 ``solc --bin sourceFile.sol`` �生�二进制文件。
+如果您想通过 ``solc`` 获得一些更高级的输出信�，
+�以通过 ``solc -o outputDirectory --bin --ast-compact-json --asm sourceFile.sol`` 命令
+将所有的输出都�存到�独的文件中。
 
-Optimizer Options
+优化器选项
 -----------------
 
-Before you deploy your contract, activate the optimizer when compiling using ``solc --optimize --bin sourceFile.sol``.
-By default, the optimizer will optimize the contract assuming it is called 200 times across its lifetime
-(more specifically, it assumes each opcode is executed around 200 times).
-If you want the initial contract deployment to be cheaper and the later function executions to be more expensive,
-set it to ``--optimize-runs=1``. If you expect many transactions and do not care for higher deployment cost and
-output size, set ``--optimize-runs`` to a high number.
-This parameter has effects on the following (this might change in the future):
+在您部署�约之�，在编译时使用 ``solc --optimize --bin sourceFile.sol`` 激活优化器。
+默认情况下，优化器将�设�约在其生命周期内被调用200次（更确切地说，它�设�个�作�被执行200次左�）。
+如果您想让最�的�约部署更便宜，而��的函数执行更昂贵，请设置为 ``--optimize-runs=1``。
+如果您期望有很多交易，并且�在乎更高的部署�本和输出大�，那么把 ``--optimize-runs`` 设置�一个高的数字。
+这个�数对以下方�有影�（将��能会改�）：
 
-- the size of the binary search in the function dispatch routine
-- the way constants like large numbers or strings are stored
+- 函数调度程�中二进制�索的大�
+- �大数字或字符串等常�的存储方�
 
 .. index:: allowed paths, --allow-paths, base path, --base-path, include paths, --include-path
 
-Base Path and Import Remapping
+基本路径和导入�映射
 ------------------------------
 
-The commandline compiler will automatically read imported files from the filesystem, but
-it is also possible to provide :ref:`path redirects <import-remapping>` using ``prefix=path`` in the following way:
+命令行编译器将自动从文件系统中读�导入的文件，但�时，
+它也支�通过如下方�，用 ``prefix=path`` 选项将 :ref:`路径�定� <import-remapping>`：
 
 .. code-block:: bash
 
     solc github.com/ethereum/dapp-bin/=/usr/local/lib/dapp-bin/ file.sol
 
-This essentially instructs the compiler to search for anything starting with
-``github.com/ethereum/dapp-bin/`` under ``/usr/local/lib/dapp-bin``.
+这实质上是指示编译器在 ``/usr/local/lib/dapp-bin`` 下�索
+所有以 ``github.com/ethereum/dapp-bin/`` 开头的文件。
 
-When accessing the filesystem to search for imports, :ref:`paths that do not start with ./
-or ../ <direct-imports>` are treated as relative to the directories specified using
-``--base-path`` and ``--include-path`` options (or the current working directory if base path is not specified).
-Furthermore, the part of the path added via these options will not appear in the contract metadata.
+当访问文件系统�索导入文件时，:ref:`�以./或../开头的路径 <direct-imports>` 被视为
+相对于使用 ``--base-path`` 和 ``--include-path`` 选项指定的目录（如果没有指定基本路径，则是当�工作目录）。
+此外，通过这些选项添加的路径部分将�会出现在�约元数�中。
 
+<<<<<<< HEAD
+出于安全考虑，编译器 :ref:`对它�以访问的目录有一些�制 <allowed-paths>`。
+在命令行中指定的�文件的目录和�映射的目标路径被自动�许被文件阅读器访问，
+但其他的都是默认为拒�的。
+通过 ``--allow-paths /sample/path,/another/sample/path`` 语��以�许�外的路径（和它们的�目录）。
+通过 ``--base-path`` 指定的路径内的所有内容都是�许的。
+=======
 For security reasons the compiler has :ref:`restrictions on what directories it can access <allowed-paths>`.
 Directories of source files specified on the command-line and target paths of
 remappings are automatically allowed to be accessed by the file reader, but everything
@@ -60,59 +68,73 @@ else is rejected by default.
 Additional paths (and their subdirectories) can be allowed via the
 ``--allow-paths /sample/path,/another/sample/path`` switch.
 Everything inside the path specified via ``--base-path`` is always allowed.
+>>>>>>> english/develop
 
-The above is only a simplification of how the compiler handles import paths.
-For a detailed explanation with examples and discussion of corner cases please refer to the section on
-:ref:`path resolution <path-resolution>`.
+以上�是对编译器如何处�导入路径的一个简化。
+关于详细的解释，包括例�和边缘情况的讨论，请�考 :ref:`路径解� <path-resolution>` 一节。
 
 .. index:: ! linker, ! --link, ! --libraries
 .. _library-linking:
 
-Library Linking
+库链接
 ---------------
 
-If your contracts use :ref:`libraries <libraries>`, you will notice that the bytecode contains substrings of the form ``__$53aea86b7d70b31448b230b20ae141a537$__``. These are placeholders for the actual library addresses.
-The placeholder is a 34 character prefix of the hex encoding of the keccak256 hash of the fully qualified library name.
-The bytecode file will also contain lines of the form ``// <placeholder> -> <fq library name>`` at the end to help
-identify which libraries the placeholders represent. Note that the fully qualified library name
-is the path of its source file and the library name separated by ``:``.
-You can use ``solc`` as a linker meaning that it will insert the library addresses for you at those points:
+如果您的�约使用 :ref:`库�约 <libraries>`，
+您会注�到字节�中�有 ``__$53aea86b7d70b31448b230b20ae141a537$__`` 形�的字符串。
+这些是实际库的地�的��符。此��符是完全�定库�的keccak256散列的�六进制编�的34个字符�缀。
+字节�文件也将包�形�为 ``// <placeholder> -> <fq library name>`` 的代�行，以帮助识别��符代表的库。
+注�，完全�定的库�是其�文件的路径和用 ``:`` 分隔的库�。
+您�以使用 ``solc`` 作为链接器，�味�您将在这些地方�入库的地�：
 
-Either add ``--libraries "file.sol:Math=0x1234567890123456789012345678901234567890 file.sol:Heap=0xabCD567890123456789012345678901234567890"`` to your command to provide an address for each library (use commas or spaces as separators) or store the string in a file (one library per line) and run ``solc`` using ``--libraries fileName``.
+�么在您的命令中加入
+``--libraries "file.sol:Math=0x1234567890123456789012345678901234567890 file.sol:Heap=0xabCD567890123456789012345678901234567890"``，
+为�个库�供一个地�（用逗�或空格作为分隔符），�么将字符串存储在一个文件中（�行一个库），
+用 ``-libraries fileName`` �行 ``solc``。
 
 .. note::
-    Starting Solidity 0.8.1 accepts ``=`` as separator between library and address, and ``:`` as a separator is deprecated. It will be removed in the future. Currently ``--libraries "file.sol:Math:0x1234567890123456789012345678901234567890 file.sol:Heap:0xabCD567890123456789012345678901234567890"`` will work too.
+    从Solidity 0.8.1 开始，接� ``=`` 作为库和地�之间的分隔符，而 ``:`` 作为分隔符已被废弃。
+    它将在未�被删除。目� ``--libraries "file.sol:Math:0x1234567890123456789012345678901234567890 file.sol:Heap:0xabCD56789012345678901234567890"`` 也�以工作。
 
 .. index:: --standard-json, --base-path
 
-If ``solc`` is called with the option ``--standard-json``, it will expect a JSON input (as explained below) on the standard input, and return a JSON output on the standard output. This is the recommended interface for more complex and especially automated uses. The process will always terminate in a "success" state and report any errors via the JSON output.
-The option ``--base-path`` is also processed in standard-json mode.
+如果调用 ``solc`` 时有 ``--standard-json`` 选项，它将在标准输入中期待一个JSON输入（如下所述），
+并在标准输出中返回一个JSON输出。这是对更��的，特别是自动化使用时的推�接�。
+该进程将始终以 “�功� 状�终止，并通过JSON输出�报告任何错误。
+选项 ``--base-path`` 也以标准JSON模�处�。
 
-If ``solc`` is called with the option ``--link``, all input files are interpreted to be unlinked binaries (hex-encoded) in the ``__$53aea86b7d70b31448b230b20ae141a537$__``-format given above and are linked in-place (if the input is read from stdin, it is written to stdout). All options except ``--libraries`` are ignored (including ``-o``) in this case.
+如果调用 ``solc`` 时带有 ``--link`` 选项，所有输入文件都被编译�格�为 ``__$53aea86b7d70b31448b230b20ae141a537$__``
+形�的未链接的二进制文件（�六进制编�），并被本地链接（如果从标准输入（stdin）读�输入，则被写到标准输出（stdout））。
+在这�情况下，除了 ``--libraries`` 以外的所有选项都被忽略（包括 ``-o`` ）。
 
 .. warning::
-    Manually linking libraries on the generated bytecode is discouraged because it does not update
-    contract metadata. Since metadata contains a list of libraries specified at the time of
-    compilation and bytecode contains a metadata hash, you will get different binaries, depending
-    on when linking is performed.
+    �推�在生�的字节�上手动链接库文件，因为它�会更新�约元数�。
+    由于元数�包�在编译时指定的库的列表，而字节�包�元数�哈希，
+    您将得到��的二进制文件，并且这�决于何时进行链接。
 
-    You should ask the compiler to link the libraries at the time a contract is compiled by either
-    using the ``--libraries`` option of ``solc`` or the ``libraries`` key if you use the
-    standard-JSON interface to the compiler.
+    您应该在编译�约时请求编译器链接库文件，方法是使用 ``solc`` 的 ``--libraries`` 选项
+    或 ``libraries`` 键（如果您使用编译器的标准JSON接�）。
 
 .. note::
-    The library placeholder used to be the fully qualified name of the library itself
-    instead of the hash of it. This format is still supported by ``solc --link`` but
-    the compiler will no longer output it. This change was made to reduce
-    the likelihood of a collision between libraries, since only the first 36 characters
-    of the fully qualified library name could be used.
+    库的��符曾�是库本身的完全�定�称，而�是它的哈希值。
+    这�格��然被 ``solc --link`` 支�，但编译器将��输出它。
+    这一改�是为了�少库之间�生碰撞的�能性，因为�有完全�定的库�的�36个字符�以被使用。
 
 .. _evm-version:
 .. index:: ! EVM version, compile target
 
-Setting the EVM Version to Target
+将EVM版本设置为目标版本
 *********************************
 
+<<<<<<< HEAD
+当您编译您的�约代�时，您�以指定以太�虚拟机版本�编译，以��特定的功能或行为。
+
+.. warning::
+
+   在错误的EVM版本进行编译会导致错误，奇怪和失败的行为。
+   请确�，特别是在�行一个�有链的情况下，您使用匹�的EVM版本。
+
+在命令行中，您�以选择EVM的版本，如下所示：
+=======
 When you compile your contract code you can specify the Ethereum virtual machine
 version to compile for to avoid particular features or behaviors.
 
@@ -123,13 +145,13 @@ version to compile for to avoid particular features or behaviors.
    use matching EVM versions.
 
 On the command-line, you can select the EVM version as follows:
+>>>>>>> english/develop
 
 .. code-block:: shell
 
   solc --evm-version <VERSION> contract.sol
 
-In the :ref:`standard JSON interface <compiler-api>`, use the ``"evmVersion"``
-key in the ``"settings"`` field:
+在 :ref:`标准 JSON 接� <compiler-api>` 中，使用 ``"settings"`` 字段中的键 ``"evmVersion"``。
 
 .. code-block:: javascript
 
@@ -141,12 +163,26 @@ key in the ``"settings"`` field:
       }
     }
 
-Target Options
+EVM版本选项
 --------------
 
-Below is a list of target EVM versions and the compiler-relevant changes introduced
-at each version. Backward compatibility is not guaranteed between each version.
-
+以下是一个EVM版本的列表，以��个版本中引入的编译器相关�化。
+�个版本之间�����兼容。
+
+<<<<<<< HEAD
+- ``homestead``
+   - （最�的版本）
+- ``tangerineWhistle``
+   - 访问其他账户的gas�本增加，与gas估算和优化器有关。
+   - 对于外部调用，所有gas都是默认��的，以�必须�留一定的数�。
+- ``spuriousDragon``
+   - ``exp`` �作�的gas�本增加，与gas估计和优化器有关。
+- ``byzantium``
+   - 在汇编中�使用�作� ``returndatacopy``， ``returndatasize`` 和 ``staticcall``。
+   - ``staticcall`` �作�在调用�库�约 view 或 pure 函数时使用，它�以防止函数在EVM级别修改状�，也就是说，甚至适用于您使用无效的类型转�时。
+   - �以访问从函数调用返回的动�数�。
+   - 引入了 ``revert`` �作�，这�味� ``revert`` 将�会浪费gas。
+=======
 - ``homestead`` (*support deprecated*)
    - (oldest version)
 - ``tangerineWhistle`` (*support deprecated*)
@@ -159,14 +195,26 @@ at each version. Backward compatibility is not guaranteed between each version.
    - The ``staticcall`` opcode is used when calling non-library view or pure functions, which prevents the functions from modifying state at the EVM level, i.e., even applies when you use invalid type conversions.
    - It is possible to access dynamic data returned from function calls.
    - ``revert`` opcode introduced, which means that ``revert()`` will not waste gas.
+>>>>>>> english/develop
 - ``constantinople``
-   - Opcodes ``create2``, ``extcodehash``, ``shl``, ``shr`` and ``sar`` are available in assembly.
-   - Shifting operators use shifting opcodes and thus need less gas.
+   - 在汇编中�使用�作� ``create2``, ``extcodehash``, ``shl``, ``shr`` 和 ``sar``。
+   - 移��算符使用移��算�，因此需�的gas较少。
 - ``petersburg``
-   - The compiler behaves the same way as with constantinople.
+   - 编译器的行为与 constantinople 版本的行为相�。
 - ``istanbul``
-   - Opcodes ``chainid`` and ``selfbalance`` are available in assembly.
+   - 在汇编中�使用�作� ``chainid`` 和 ``selfbalance``。
 - ``berlin``
+<<<<<<< HEAD
+   - ``SLOAD``， ``*CALL``， ``BALANCE``， ``EXT*`` 和 ``SELFDESTRUCT`` 的gas�本增加。
+     编译器�设这类�作的gas�本是固定的。这与gas估计和优化器有关。
+- ``london`` 
+   - 区�的基本费用（ `EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ 和 `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_ ）
+     �以通过全局的 ``block.basefee`` 或内�汇编中的 ``basefee()`` 访问。
+- ``paris`` 
+   - 引入了 ``prevrandao()`` 和 ``block.prevrandao``，并改�了现在已�废弃的 ``block.difficulty`` 的语义，��许在内�汇编中使用 ``difficulty()`` （� `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ ）。
+- ``shanghai`` （ **默认项** ）
+  - 由于引入了 ``push0``，代�尺寸更�，并且节�了gas（�� `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_）。
+=======
    - Gas costs for ``SLOAD``, ``*CALL``, ``BALANCE``, ``EXT*`` and ``SELFDESTRUCT`` increased. The
      compiler assumes cold gas costs for such operations. This is relevant for gas estimation and
      the optimizer.
@@ -174,119 +222,174 @@ at each version. Backward compatibility is not guaranteed between each version.
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
 - ``paris``
    - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
-- ``shanghai`` (**default**)
+- ``shanghai``
    - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
+- ``cancun`` (**default**)
+   - The block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_) can be accessed via the global ``block.blobbasefee`` or ``blobbasefee()`` in inline assembly.
+   - Introduces ``blobhash()`` in inline assembly and a corresponding global function to retrieve versioned hashes of blobs associated with the transaction (see `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
+   - Opcode ``mcopy`` is available in assembly (see `EIP-5656 <https://eips.ethereum.org/EIPS/eip-5656>`_).
+   - Opcodes ``tstore`` and ``tload`` are available in assembly (see `EIP-1153 <https://eips.ethereum.org/EIPS/eip-1153>`_).
+>>>>>>> english/develop
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
 
-Compiler Input and Output JSON Description
+编译器输入和输出JSON说明
 ******************************************
 
-The recommended way to interface with the Solidity compiler especially for
-more complex and automated setups is the so-called JSON-input-output interface.
-The same interface is provided by all distributions of the compiler.
+推�的与Solidity编译器连接的方�，特别是对于更��和自动化的设置，是所谓的JSON输入输出接�。
+编译器的所有�行版都�供相�的接�。
 
-The fields are generally subject to change,
-some are optional (as noted), but we try to only make backwards compatible changes.
+这些字段一般都会有�化，有些是�选的（如�所述），但我们尽�����兼容的改动。
 
-The compiler API expects a JSON formatted input and outputs the compilation result in a JSON formatted output.
-The standard error output is not used and the process will always terminate in a "success" state, even
-if there were errors. Errors are always reported as part of the JSON output.
+编译器API期望JSON格�的输入，并将编译结果输出为JSON格�的输出。
+�使用标准错误输出，进程将始终以 “�功� 状�终止，�使存在错误。错误总是作为JSON输出的一部分报告。
 
-The following subsections describe the format through an example.
-Comments are of course not permitted and used here only for explanatory purposes.
+以下��节通过一个例���述该格�。
+当然，注释是��许的，在此仅用于解释。
 
-Input Description
+输入说明
 -----------------
 
 .. code-block:: javascript
 
     {
-      // Required: Source code language. Currently supported are "Solidity", "Yul" and "SolidityAST" (experimental).
+<<<<<<< HEAD
+      // 必选：�代�语言。目�支�的是 “Solidity“，“Yul“ 和 “SolidityAST� （实验性的）。
+=======
+      // Required: Source code language. Currently supported are "Solidity", "Yul", "SolidityAST" (experimental), "EVMAssembly" (experimental).
+>>>>>>> english/develop
       "language": "Solidity",
-      // Required
+      // 必选
       "sources":
       {
-        // The keys here are the "global" names of the source files,
-        // imports can use other files via remappings (see below).
+        // 这里的键值是�文件的 “全局“ �称，
+        // 导入文件�以通过�映射使用其他文件（�下文）。
         "myFile.sol":
         {
-          // Optional: keccak256 hash of the source file
-          // It is used to verify the retrieved content if imported via URLs.
+          // �选： �文件的kaccak256哈希值
+          // 如果通过URL导入，它用于验�检索的内容。
           "keccak256": "0x123...",
-          // Required (unless "content" is used, see below): URL(s) to the source file.
-          // URL(s) should be imported in this order and the result checked against the
-          // keccak256 hash (if available). If the hash doesn't match or none of the
-          // URL(s) result in success, an error should be raised.
-          // Using the commandline interface only filesystem paths are supported.
-          // With the JavaScript interface the URL will be passed to the user-supplied
-          // read callback, so any URL supported by the callback can be used.
+          // 必选（除�声明了 "content" 字段，��下文）: 指��文件的URL。
+          // 应按此顺�导入URL，并根�keccak256哈希值检查结果（如果有的�）。
+          // 如果哈希值�匹�，或者没有一个URL(s)的结果是�功的，就应该产生一个错误。
+          // 使用命令行界��支�文件系统路径。
+          // 通过JavaScript接�，URL将被传递给用户�供的读�回调，因此�以使用回调支�的任何URL。
           "urls":
           [
             "bzzr://56ab...",
             "ipfs://Qma...",
             "/tmp/path/to/file.sol"
+<<<<<<< HEAD
+            // 如果使用文件，其目录应通过 `--allow-paths <path>` 添加到命令行中。
+          ]
+          // 如果语言设置为 “SolidityAST�，则需�在 “ast� 字段下�供 AST。
+          // 请注�，ASTs 的导入是试验性的，尤其是：
+          // - 导入无效的 ASTs 会产生未定义的结果，并且
+          // - 对无效的 ASTs ��供适当的错误报告。
+          // 此外，请注� AST 导入�消耗编译器在 “stopAfter�（�止�）模�下生�的 AST 字段： 
+          // “parsing� 模�下生�的 AST 字段，然��新执行分�，
+          // 因此 AST 中任何基于分�的注释在导入时都会被忽略。
+          "ast": { ... } // 格�化为 json ast 请求的 ``ast`` 输出选择。
+=======
             // If files are used, their directories should be added to the command-line via
             // `--allow-paths <path>`.
           ]
-          // If language is set to "SolidityAST", an AST needs to be supplied under the "ast" key.
+        },
+        "settable":
+        {
+          // Optional: keccak256 hash of the source file
+          "keccak256": "0x234...",
+          // Required (unless "urls" is used): literal contents of the source file
+          "content": "contract settable is owned { uint256 private x = 0; function set(uint256 _x) public { if (msg.sender == owner) x = _x; } }"
+        },
+        "myFile.sol_json.ast":
+        {
+          // If language is set to "SolidityAST", an AST needs to be supplied under the "ast" key
+          // and there can be only one source file present.
+          // The format is the same as used by the `ast` output.
           // Note that importing ASTs is experimental and in particular that:
           // - importing invalid ASTs can produce undefined results and
           // - no proper error reporting is available on invalid ASTs.
           // Furthermore, note that the AST import only consumes the fields of the AST as
           // produced by the compiler in "stopAfter": "parsing" mode and then re-performs
           // analysis, so any analysis-based annotations of the AST are ignored upon import.
-          "ast": { ... } // formatted as the json ast requested with the ``ast`` output selection.
+          "ast": { ... }
+>>>>>>> english/develop
         },
-        "destructible":
+        "myFile_evm.json":
         {
-          // Optional: keccak256 hash of the source file
+<<<<<<< HEAD
+          // �选：�文件的keccak256哈希值
           "keccak256": "0x234...",
-          // Required (unless "urls" is used): literal contents of the source file
+          // 必选：（除�使用 “urls“）：�文件的字�内容
           "content": "contract destructible is owned { function shutdown() { if (msg.sender == owner) selfdestruct(owner); } }"
+=======
+          // If language is set to "EVMAssembly", an EVM Assembly JSON object needs to be supplied
+          // under the "assemblyJson" key and there can be only one source file present.
+          // The format is the same as used by the `evm.legacyAssembly` output or `--asm-json`
+          // output on the command line.
+          // Note that importing EVM assembly is experimental.
+          "assemblyJson":
+          {
+            ".code": [ ... ],
+            ".data": { ... }, // optional
+            "sourceList": [ ... ] // optional (if no `source` node was defined in any `.code` object)
+          }
+>>>>>>> english/develop
         }
       },
-      // Optional
+      // �选
       "settings":
       {
-        // Optional: Stop compilation after the given stage. Currently only "parsing" is valid here
+        // �选： 在给定的阶段��止编译。目�这里�有 “parsing� 有效。
         "stopAfter": "parsing",
-        // Optional: Sorted list of remappings
+        // �选： �过排�的�映射列表
         "remappings": [ ":g=/dir" ],
-        // Optional: Optimizer settings
+        // �选： 优化器设置
         "optimizer": {
-          // Disabled by default.
-          // NOTE: enabled=false still leaves some optimizations on. See comments below.
-          // WARNING: Before version 0.8.6 omitting the 'enabled' key was not equivalent to setting
-          // it to false and would actually disable all the optimizations.
+          // 默认情况下是�用的。
+          // 注�：enabled=false �然�留了一些优化功能。�下�的注解。
+          // 警告：在0.8.6版本之�，�略 “enabled“ 键并�等�于将其设置为false，
+          // 实际上会�用所有优化。
           "enabled": true,
-          // Optimize for how many times you intend to run the code.
-          // Lower values will optimize more for initial deployment cost, higher
-          // values will optimize more for high-frequency usage.
+          // 根�您打算�行代�的次数进行优化。
+          // 较低的值将更多地针对�始部署�本进行优化，
+          // 较高的值将更多地针对高频使用进行优化。
           "runs": 200,
-          // Switch optimizer components on or off in detail.
-          // The "enabled" switch above provides two defaults which can be
-          // tweaked here. If "details" is given, "enabled" can be omitted.
+          // 打开或关闭优化器组件的细节。
+          // 上�的 “enabled“ 开关�供了两个默认值，
+          // �以在这里进行调整。如果给出了 “details“，“enabled“ �以�略。
           "details": {
-            // The peephole optimizer is always on if no details are given,
-            // use details to switch it off.
+            // 如果没有给出 details，窥视孔优化器总是打开的，使用 details �关闭它。
             "peephole": true,
+<<<<<<< HEAD
+            // 如果没有给出 details，内�器总是打开的，
+            // 使用 details�关闭它。
+            "inliner": true,
+            // 如果没有给出 details，未使用的跳�移除器总是打开的，
+            // 使用 details�关闭它。
+=======
             // The inliner is always off if no details are given,
             // use details to switch it on.
             "inliner": false,
             // The unused jumpdest remover is always on if no details are given,
             // use details to switch it off.
+>>>>>>> english/develop
             "jumpdestRemover": true,
-            // Sometimes re-orders literals in commutative operations.
+            // 在�元�算中，有时会对字��新排�。
             "orderLiterals": false,
-            // Removes duplicate code blocks
+            // 移除��的代��
             "deduplicate": false,
-            // Common subexpression elimination, this is the most complicated step but
-            // can also provide the largest gain.
+            // 常�的�表达�消除，这是最��的步骤，但也能�供最大的收益。
             "cse": false,
-            // Optimize representation of literal numbers and strings in code.
+            // 优化代�中字�数字和字符串的表示。
             "constantOptimizer": false,
+<<<<<<< HEAD
+            // 新的Yul优化器。主�在ABI coder v2 和 内�汇编的代�上�行。
+            // 它与全局优化器设置一起被激活，并且�以在这里�用。
+            // 在 Solidity 0.6.0 之�，它必须通过这个开关激活。
+=======
             // Use unchecked arithmetic when incrementing the counter of for loops
             // under certain circumstances. It is always on if no details are given.
             "simpleCounterForLoopUncheckedIncrement": true,
@@ -295,12 +398,25 @@ Input Description
             // It is activated together with the global optimizer setting
             // and can be deactivated here.
             // Before Solidity 0.6.0 it had to be activated through this switch.
+>>>>>>> english/develop
             "yul": false,
-            // Tuning options for the Yul optimizer.
+            // Yul优化器的调优选项。
             "yulDetails": {
-              // Improve allocation of stack slots for variables, can free up stack slots early.
-              // Activated by default if the Yul optimizer is activated.
+              // 改善��的堆栈槽的分�，�以��释放堆栈槽。
+              // 如果Yul优化器被激活，则默认激活。
               "stackAllocation": true,
+<<<<<<< HEAD
+              // 选择�应用的优化步骤。
+              // 也�以�时修改优化�列和清��列。
+              // �个�列的指令用 “:� 分隔，该值以 优化-�列:清�-�列 的形��供。
+              // 更多信�� “优化器 > 选择优化�。
+              // 这个字段是�选的，如果��供，优化和清�的默认�列都会使用。
+              // 如果��供了其中一个选项，�一个将�会被�行。
+              // 如果��供分隔符 “:�，
+              // 那么优化和清��列都�会被�行。
+              // 如果设置为空值，则�使用默认的清��列，
+              // �应用任何优化步骤。
+=======
               // Select optimization steps to be applied. It is also possible to modify both the
               // optimization sequence and the clean-up sequence. Instructions for each sequence
               // are separated with the ":" delimiter and the values are provided in the form of
@@ -313,83 +429,120 @@ Input Description
               // sequence will be run.
               // If set to an empty value, only the default clean-up sequence is used and
               // no optimization steps are applied.
+>>>>>>> english/develop
               "optimizerSteps": "dhfoDgvulfnTUtnIf..."
             }
           }
         },
+<<<<<<< HEAD
+        // 编译EVM的版本。
+        // 影�到类型检查和代�生�。版本�以是 homestead,
+        // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul, berlin, london or paris
+        "evmVersion": "byzantium",
+        // �选：改�编译管�以通过Yul的中间表示法。
+        // 这在默认情况下是�的。
+=======
         // Version of the EVM to compile for.
         // Affects type checking and code generation. Can be homestead,
         // tangerineWhistle, spuriousDragon, byzantium, constantinople,
-        // petersburg, istanbul, berlin, london, paris or shanghai (default)
-        "evmVersion": "shanghai",
+        // petersburg, istanbul, berlin, london, paris, shanghai or cancun (default)
+        "evmVersion": "cancun",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.
+>>>>>>> english/develop
         "viaIR": true,
-        // Optional: Debugging settings
+        // �选： 调试设置
         "debug": {
-          // How to treat revert (and require) reason strings. Settings are
-          // "default", "strip", "debug" and "verboseDebug".
-          // "default" does not inject compiler-generated revert strings and keeps user-supplied ones.
-          // "strip" removes all revert strings (if possible, i.e. if literals are used) keeping side-effects
-          // "debug" injects strings for compiler-generated internal reverts, implemented for ABI encoders V1 and V2 for now.
-          // "verboseDebug" even appends further information to user-supplied revert strings (not yet implemented)
+          // 如何处� revert（和require）的原因字符串。设置是
+          // "default", "strip", "debug" 和 "verboseDebug"。
+          // "default" �注入编译器生�的revert字符串，而是�留用户�供的字符串。
+          // "strip" 删除所有的revert字符串（如果�能的�，�如果使用了字��义），以��副作用。
+          // "debug" 为编译器生�的内部revert注入字符串，目�为ABI编�器V1和V2实现。
+          // "verboseDebug" 甚至将进一步的信�附加到用户�供的revert字符串中（尚未实现）。
           "revertStrings": "default",
-          // Optional: How much extra debug information to include in comments in the produced EVM
-          // assembly and Yul code. Available components are:
-          // - `location`: Annotations of the form `@src <index>:<start>:<end>` indicating the
-          //    location of the corresponding element in the original Solidity file, where:
-          //     - `<index>` is the file index matching the `@use-src` annotation,
-          //     - `<start>` is the index of the first byte at that location,
-          //     - `<end>` is the index of the first byte after that location.
-          // - `snippet`: A single-line code snippet from the location indicated by `@src`.
-          //     The snippet is quoted and follows the corresponding `@src` annotation.
-          // - `*`: Wildcard value that can be used to request everything.
+          // �选：在产生的EVM汇编和Yul代�的注释中包括多少�外的调试信�。�用的组件是：
+          // - `location`: `@src <index>:<start>:<end>` 形�的注解，
+          //   表明原始 Solidity 文件中相应元素的�置，其中：
+          //     - `<index>` 是与 `@us-src` 注释相匹�的文件索引。
+          //     - `<start>` 是该�置的第一个字节的索引。
+          //     - `<end>` 是该�置�第一个字节的索引。
+          // - `snippet`: �自 `@src` 所示�置的�行代�片断。
+          //     该片段有引�，并跟�相应的 `@src` 注释。
+          // - `*`: 通�符值，�用于请求所有的东西。
           "debugInfo": ["location", "snippet"]
         },
-        // Metadata settings (optional)
+        // 元数�设置 (�选)
         "metadata": {
-          // The CBOR metadata is appended at the end of the bytecode by default.
-          // Setting this to false omits the metadata from the runtime and deploy time code.
+          // CBOR元数�默认是附加在字节�的最�。
+          // 将此设置为false，会从�行时和部署时代�中�略元数�。
           "appendCBOR": true,
-          // Use only literal content and not URLs (false by default)
+          // �使用字�内容，�使用URL（默认为false）
           "useLiteralContent": true,
-          // Use the given hash method for the metadata hash that is appended to the bytecode.
-          // The metadata hash can be removed from the bytecode via option "none".
-          // The other options are "ipfs" and "bzzr1".
-          // If the option is omitted, "ipfs" is used by default.
+          // 对附加在字节�上的元数�哈希值使用给定的哈希值方法。
+          // 元数�哈希�以通过选项 "none "从字节�中删除。
+          // 其他选项是 "ipfs" 和 "bzzr1"。
+          // 如果�略该选项，默认使用 "ipfs"。
           "bytecodeHash": "ipfs"
         },
-        // Addresses of the libraries. If not all libraries are given here,
-        // it can result in unlinked objects whose output data is different.
+        // 库的地�。如果这里没有给出所有的库，
+        // �能会导致未链接的对象，其输出数�是��的。
         "libraries": {
+<<<<<<< HEAD
+          // 顶层键是使用该库的�文件的�称。
+          // 如果使用了�映射，这个�文件应该与应用�映射�的全局路径一致。
+          // 如果这个键是一个空字符串，那就是指一个全局水平。
+=======
           // The top level key is the name of the source file where the library is used.
           // If remappings are used, this source file should match the global path
           // after remappings were applied.
           // If this key is an empty string, that refers to a global level.
+>>>>>>> english/develop
           "myFile.sol": {
             "MyLib": "0x123123..."
           }
         },
-        // The following can be used to select desired outputs based
-        // on file and contract names.
-        // If this field is omitted, then the compiler loads and does type checking,
-        // but will not generate any outputs apart from errors.
-        // The first level key is the file name and the second level key is the contract name.
-        // An empty contract name is used for outputs that are not tied to a contract
-        // but to the whole source file like the AST.
-        // A star as contract name refers to all contracts in the file.
-        // Similarly, a star as a file name matches all files.
-        // To select all outputs the compiler can possibly generate, use
-        // "outputSelection: { "*": { "*": [ "*" ], "": [ "*" ] } }"
-        // but note that this might slow down the compilation process needlessly.
+        // 以下�用于根�文件和�约�称选择所需的输出。
+        // 如果这个字段被�略，那么编译器就会加载并进行类型检查，但除了错误之外�会产生任何输出。
+        // 第一层键是文件�，第二层键是�约�。
+        // 一个空的�约�称用于�与�约绑定而是与整个�文件绑定的输出，如AST。
+        // 以星�作为�约�称是指文件中的所有�约。
+        // �样地，以星形作为文件��以匹�所有文件。
+        // �选择编译器�能产生的所有输出，
+        // 使用 "outputSelection"。{ "*": { "*": [ "*" ], "": [ "*" ] } }"，
+        // 但�注�，这�能会�必�地�慢编译过程。
         //
-        // The available output types are as follows:
+        // �用的输出类型如下：
         //
-        // File level (needs empty string as contract name):
-        //   ast - AST of all source files
+        // 文件级别（需�空字符串作为�约�称）：
+        //   ast - 所有�文件的AST
         //
-        // Contract level (needs the contract name or "*"):
+        // �约级别（需��约�称或 "*"）：
         //   abi - ABI
+<<<<<<< HEAD
+        //   devdoc - 开�者文档（Natspec格�）
+        //   userdoc - 用户文档（Natspec格�）
+        //   metadata - 元数�
+        //   ir - 优化代��的Yul中间表示法
+        //   irOptimized - 优化�的中间表现
+        //   storageLayout - �约的状���的槽���移�和类型
+        //   evm.assembly - 新的汇编格�
+        //   evm.legacyAssembly - JSON中的旧�汇编格�
+        //   evm.bytecode.functionDebugData - 在函数层�的调试信�
+        //   evm.bytecode.object - 字节�对象
+        //   evm.bytecode.opcodes - �作�列表
+        //   evm.bytecode.sourceMap - ��映射（对调试有用）
+        //   evm.bytecode.linkReferences - 链接引用（如果是未链接的对象）
+        //   evm.bytecode.generatedSources - 由编译器生�的��
+        //   evm.deployedBytecode* - 部署的字节�（拥有evm.bytecode的所有选项）。
+        //   evm.deployedBytecode.immutableReferences - 从AST id到引用���的字节�范围的映射
+        //   evm.methodIdentifiers - 函数哈希值的列表
+        //   evm.gasEstimates - 函数gas估计
+        //   ewasm.wast - WebAssembly S-expressions格�的Ewasm
+        //   ewasm.wasm - WebAssembly二进制格�的Ewasm
+        //
+        // 注�，使用 `evm`， `evm.bytecode`， `ewasm` 等将选择该输出的�个目标部分。
+        // 此外，`*` �以作为通�符�请求所有东西。
+=======
         //   devdoc - Developer documentation (natspec)
         //   userdoc - User documentation (natspec)
         //   metadata - Metadata
@@ -413,87 +566,84 @@ Input Description
         //
         // Note that using `evm`, `evm.bytecode`, etc. will select every
         // target part of that output. Additionally, `*` can be used as a wildcard to request everything.
+>>>>>>> english/develop
         //
         "outputSelection": {
           "*": {
             "*": [
-              "metadata", "evm.bytecode" // Enable the metadata and bytecode outputs of every single contract.
-              , "evm.bytecode.sourceMap" // Enable the source map output of every single contract.
+              "metadata", "evm.bytecode" // �用�个�约的元数�和字节�输出。
+              , "evm.bytecode.sourceMap" // �用�个�约的��映射输出。
             ],
             "": [
-              "ast" // Enable the AST output of every single file.
+              "ast" // �用�个文件的AST输出。
             ]
           },
-          // Enable the abi and opcodes output of MyContract defined in file def.
+          // �用文件def中定义的MyContract的abi和opcodes输出。
           "def": {
             "MyContract": [ "abi", "evm.bytecode.opcodes" ]
           }
         },
-        // The modelChecker object is experimental and subject to changes.
+        // modelChecker对象是实验性的，�能会有�化。
         "modelChecker":
         {
-          // Chose which contracts should be analyzed as the deployed one.
+          // 选择哪些�约应作为部署的�约进行分�。
           "contracts":
           {
             "source1.sol": ["contract1"],
             "source2.sol": ["contract2", "contract3"]
           },
-          // Choose how division and modulo operations should be encoded.
-          // When using `false` they are replaced by multiplication with slack
-          // variables. This is the default.
-          // Using `true` here is recommended if you are using the CHC engine
-          // and not using Spacer as the Horn solver (using Eldarica, for example).
-          // See the Formal Verification section for a more detailed explanation of this option.
-          "divModNoSlacks": false,
-          // Choose which model checker engine to use: all (default), bmc, chc, none.
+          // 选择除法和模数�算的编�方�。
+          // 当使用 `false` 时，它们被替�为与�弛��的乘法。这是默认的。
+          // 如果您使用CHC引擎而�使用Spacer作为Horn求解器（例如使用Eldarica），
+          // 建议在这里使用 `true`。
+          // 关于这个选项的更详细的解释，请��形�验�部分。
+          "divModWithSlacks": false,
+          // 选择�使用的模型检查器引擎：所有（默认）， bmc， chc， 无。
           "engine": "chc",
-          // Choose whether external calls should be considered trusted in case the
-          // code of the called function is available at compile-time.
-          // For details see the SMTChecker section.
+          // 选择在编译时�获得被调用函数代�的情况下，
+          // 外部调用是�应被视为�信。
+          // 详情请�阅SMT检查器部分。
           "extCalls": "trusted",
-          // Choose which types of invariants should be reported to the user: contract, reentrancy.
+          // 选择哪些类型的��性应该报告给用户：�约，�入。
           "invariants": ["contract", "reentrancy"],
-          // Choose whether to output all proved targets. The default is `false`.
+          // 选择是�输出所有验�过的目标。默认为 `false`。
           "showProved": true,
-          // Choose whether to output all unproved targets. The default is `false`.
+          // 选择是�输出所有未验�的目标。默认为 `false`。
           "showUnproved": true,
-          // Choose whether to output all unsupported language features. The default is `false`.
+          // 选择是�输出所有�支�的语言功能。默认为 `false`。
           "showUnsupported": true,
-          // Choose which solvers should be used, if available.
-          // See the Formal Verification section for the solvers description.
+          // 如果有的�，选择应该使用哪些求解器。
+          // 关于求解器的�述，�形�验�部分。
           "solvers": ["cvc4", "smtlib2", "z3"],
-          // Choose which targets should be checked: constantCondition,
-          // underflow, overflow, divByZero, balance, assert, popEmptyArray, outOfBounds.
-          // If the option is not given all targets are checked by default,
-          // except underflow/overflow for Solidity >=0.8.7.
-          // See the Formal Verification section for the targets description.
+          // 选择哪些目标应该被检查：常数�件，下溢，溢出，除以零，余�，断言，弹出空数组，界外。
+          // 如果没有给出该选项，所有目标都被默认检查，除了 Solidity >=0.8.7 的下溢/溢出。
+          // 目标�述�形�化验�部分。
           "targets": ["underflow", "overflow", "assert"],
-          // Timeout for each SMT query in milliseconds.
-          // If this option is not given, the SMTChecker will use a deterministic
-          // resource limit by default.
-          // A given timeout of 0 means no resource/time restrictions for any query.
+          // �个SMT查询的超时时间，以毫秒为��。
+          // 如果没有给出这个选项，SMTChecker将默认使用确定性的资��制。
+          // 给定超时为0�味�任何查询都没有资�/时间�制。
           "timeout": 20000
         }
       }
     }
 
 
-Output Description
+输出�述
 ------------------
 
 .. code-block:: javascript
 
     {
-      // Optional: not present if no errors/warnings/infos were encountered
+      // �选：如果没有�到错误/警告/消�，则�存在。
       "errors": [
         {
-          // Optional: Location within the source file.
+          // �选：在�文件中的�置。
           "sourceLocation": {
             "file": "sourceFile.sol",
             "start": 0,
             "end": 100
           },
-          // Optional: Further locations (e.g. places of conflicting declarations)
+          // �选：更多的�置（如有冲�的声明的地方）。
           "secondarySourceLocations": [
             {
               "file": "sourceFile.sol",
@@ -502,46 +652,55 @@ Output Description
               "message": "Other declaration is here:"
             }
           ],
-          // Mandatory: Error type, such as "TypeError", "InternalCompilerError", "Exception", etc.
-          // See below for complete list of types.
+          // 强制：错误类型，如 “TypeError“， “InternalCompilerError“， “Exception� 等等。
+          // 完整的类型清��下文。
           "type": "TypeError",
+<<<<<<< HEAD
+          // 强制：�生错误的组件，例如“general�，“ewasm�等
+=======
           // Mandatory: Component where the error originated, such as "general" etc.
+>>>>>>> english/develop
           "component": "general",
-          // Mandatory ("error", "warning" or "info", but please note that this may be extended in the future)
+          // 强制：错误的严�级别（“error�，“warning� 或 “info�，但请注�，这�能在未�被扩展。）
           "severity": "error",
-          // Optional: unique code for the cause of the error
+          // �选：错误原因的唯一代�
           "errorCode": "3141",
-          // Mandatory
+          // 强制
           "message": "Invalid keyword",
-          // Optional: the message formatted with source location
+          // �选：带错误��置的格�化消�
           "formattedMessage": "sourceFile.sol:100: Invalid keyword"
         }
       ],
-      // This contains the file-level outputs.
-      // It can be limited/filtered by the outputSelection settings.
+      // 这包�文件级的输出。
+      // 它�以通过outputSelection设置进行�制/过滤。
       "sources": {
         "sourceFile.sol": {
-          // Identifier of the source (used in source maps)
+          // 标识符（用于��映射）
           "id": 1,
-          // The AST object
+          // AST对象
           "ast": {}
         }
       },
-      // This contains the contract-level outputs.
-      // It can be limited/filtered by the outputSelection settings.
+      // 这里包�了�约级别的输出。
+      // 它�以通过outputSelection设置进行�制/过滤。
       "contracts": {
         "sourceFile.sol": {
-          // If the language used has no contract names, this field should equal to an empty string.
+          // 如果使用的语言没有�约�称，则该字段应该留空。
           "ContractName": {
-            // The Ethereum Contract ABI. If empty, it is represented as an empty array.
-            // See https://docs.soliditylang.org/en/develop/abi-spec.html
+            // 以太��约的应用二进制接�（ABI）。如果为空，则表示为空数组。
+            // 请�阅 https://docs.soliditylang.org/en/develop/abi-spec.html
             "abi": [],
-            // See the Metadata Output documentation (serialised JSON string)
+            // 请�阅元数�输出文档（�列化的JSON字符串）
             "metadata": "{/* ... */}",
-            // User documentation (natspec)
+            // 用户文档（natspec）
             "userdoc": {},
-            // Developer documentation (natspec)
+            // 开�人员文档（natspec）
             "devdoc": {},
+<<<<<<< HEAD
+            // 中间表示形� (string)
+            "ir": "",
+            // 请�阅 "存储布局" 文档。
+=======
             // Intermediate representation before optimization (string)
             "ir": "",
             // AST of intermediate representation before optimization
@@ -551,49 +710,49 @@ Output Description
             // AST of intermediate representation after optimization
             "irOptimizedAst": {/* ... */},
             // See the Storage Layout documentation.
+>>>>>>> english/develop
             "storageLayout": {"storage": [/* ... */], "types": {/* ... */} },
-            // EVM-related outputs
+            // EVM相关输出
             "evm": {
-              // Assembly (string)
+              // 汇编 (string)
               "assembly": "",
-              // Old-style assembly (object)
+              // 旧风格的汇编 (object)
               "legacyAssembly": {},
-              // Bytecode and related details.
+              // 字节�和相关细节
               "bytecode": {
-                // Debugging data at the level of functions.
+                // 在函数层�上调试数�。
                 "functionDebugData": {
-                  // Now follows a set of functions including compiler-internal and
-                  // user-defined function. The set does not have to be complete.
-                  "@mint_13": { // Internal name of the function
-                    "entryPoint": 128, // Byte offset into the bytecode where the function starts (optional)
-                    "id": 13, // AST ID of the function definition or null for compiler-internal functions (optional)
-                    "parameterSlots": 2, // Number of EVM stack slots for the function parameters (optional)
-                    "returnSlots": 1 // Number of EVM stack slots for the return values (optional)
+                  // 接下�是一组函数，包括编译器内部的和用户定义的函数。
+                  // 这组函数�一定是完整的。
+                  "@mint_13": { // 函数的内部�称
+                    "entryPoint": 128, // 函数开始所在字节�的字节�移�（�选）
+                    "id": 13, // 函数定义的AST ID，或者对于编译器内部的函数为空（�选）
+                    "parameterSlots": 2, // 函数�数的EVM堆栈槽的数�（�选）
+                    "returnSlots": 1 // 返回值的EVM堆栈槽的数�（�选）
                   }
                 },
-                // The bytecode as a hex string.
+                // 作为�六进制字符串的字节�。
                 "object": "00fe",
-                // Opcodes list (string)
+                // �作�列表（字符串）
                 "opcodes": "",
-                // The source mapping as a string. See the source mapping definition.
+                // 作为一个字符串的�映射。���映射的定义。
                 "sourceMap": "",
-                // Array of sources generated by the compiler. Currently only
-                // contains a single Yul file.
+                // 由编译器生�的�文件的数组。目��包�一个Yul文件。
                 "generatedSources": [{
                   // Yul AST
                   "ast": {/* ... */},
-                  // Source file in its text form (may contain comments)
+                  // 文本形�的�文件（�能包�注释）。
                   "contents":"{ function abi_decode(start, end) -> data { data := calldataload(start) } }",
-                  // Source file ID, used for source references, same "namespace" as the Solidity source files
+                  // �文件ID，用于�引用，与Solidity�文件相�的 "命�空间"。
                   "id": 2,
                   "language": "Yul",
                   "name": "#utility.yul"
                 }],
-                // If given, this is an unlinked object.
+                // 如果给定，这就是一个�链接的对象。
                 "linkReferences": {
                   "libraryFile.sol": {
-                    // Byte offsets into the bytecode.
-                    // Linking replaces the 20 bytes located there.
+                    // 在字节�中的字节�移�。
+                    // 链接�代了�于那里的20个字节。
                     "Library1": [
                       { "start": 0, "length": 20 },
                       { "start": 200, "length": 20 }
@@ -602,18 +761,18 @@ Output Description
                 }
               },
               "deployedBytecode": {
-                /* ..., */ // The same layout as above.
+                /* ..., */ // 与上述布局相�。
                 "immutableReferences": {
-                  // There are two references to the immutable with AST ID 3, both 32 bytes long. One is
-                  // at bytecode offset 42, the other at bytecode offset 80.
+                  // 有两个对AST ID为3的���的引用，都是32字节长。
+                  // 一个在字节��移�42，�一个在字节��移�80。
                   "3": [{ "start": 42, "length": 32 }, { "start": 80, "length": 32 }]
                 }
               },
-              // The list of function hashes
+              // 函数哈希值的列表
               "methodIdentifiers": {
                 "delegate(address)": "5c19a95c"
               },
-              // Function gas estimates
+              // 函数gas估计
               "gasEstimates": {
                 "creation": {
                   "codeDepositCost": "420000",
@@ -627,6 +786,16 @@ Output Description
                   "heavyLifting()": "infinite"
                 }
               }
+<<<<<<< HEAD
+            },
+            // Ewasm相关的输出
+            "ewasm": {
+              // S-expressions格�
+              "wast": "",
+              // 二进制格�（�六进制字符串）
+              "wasm": ""
+=======
+>>>>>>> english/develop
             }
           }
         }
@@ -634,9 +803,26 @@ Output Description
     }
 
 
-Error Types
+错误类型
 ~~~~~~~~~~~
 
+<<<<<<< HEAD
+1. ``JSONError``： JSON输入�符�所需格�，例如，输入�是JSON对象，�支�的语言等。
+2. ``IOError``： IO和导入处�错误，例如，在�供的�里包�无法解�的URL或哈希值�匹�。
+3. ``ParserError``： �代��符�语言规则。
+4. ``DocstringParsingError``： 注释�中的NatSpec标签无法解�。
+5. ``SyntaxError``： 语法错误，例如 ``continue`` 在 ``for`` 循环外部使用。
+6. ``DeclarationError``： 无效的，无法解�的或冲�的标识符�称 比如 ``Identifier not found``
+7. ``TypeError``： 类型系统内的错误，例如无效类型转�，无效赋值等。
+8. ``UnimplementedFeatureError``： 当�编译器�支�该功能，但预计将在未�的版本中支�。
+9. ``InternalCompilerError``： 在编译器中触�的内部错误 — 应将此报告为一个issue。
+10. ``Exception``： 编译期间的未知失败 — 应将此报告为一个issue。
+11. ``CompilerError``： 编译器堆栈的无效使用 — 应将此报告为一个issue。
+12. ``FatalError``： 未正确处�致命错误 — 应将此报告为一个issue。
+13. ``YulException``： 在Yul代�生�过程中出现错误 - 这应该作为一个issue报告。
+14. ``Warning``： 警告，�会�止编译，但应尽�能处�。
+15. ``Info``： 编译器认为用户�能会在其中�现有用的信�，并��险，也�一定需�处�。
+=======
 1. ``JSONError``: JSON input doesn't conform to the required format, e.g. input is not a JSON object, the language is not supported, etc.
 2. ``IOError``: IO and import processing errors, such as unresolvable URL or hash mismatch in supplied sources.
 3. ``ParserError``: Source code doesn't conform to the language rules.
@@ -652,3 +838,4 @@ Error Types
 13. ``YulException``: Error during Yul code generation - this should be reported as an issue.
 14. ``Warning``: A warning, which didn't stop the compilation, but should be addressed if possible.
 15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
+>>>>>>> english/develop
diff --git a/docs/yul.rst b/docs/yul.rst
index cf47c1e877fc..5aa7e988f09e 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -6,65 +6,55 @@ Yul
 
 .. index:: ! assembly, ! asm, ! evmasm, ! yul, julia, iulia
 
-Yul (previously also called JULIA or IULIA) is an intermediate language that can be
-compiled to bytecode for different backends.
+Yul（先�被也被称为 JULIA 或 IULIA）是一��以编译到�����端的中间语言。
 
-It can be used in stand-alone mode and for "inline assembly" inside Solidity.
-The compiler uses Yul as an intermediate language in the IR-based code generator ("new codegen" or "IR-based codegen").
-Yul is a good target for high-level optimisation stages that can benefit all target platforms equally.
+它�以在独立模�下使用，也�以在Solidity内部用于 “内�汇编�。
+编译器在基于IR的代�生�器（“新代�生�器� 或 “基于IR的代�生�器�）中使用Yul作为一�中间语言。
+Yul是高级优化阶段的一个很好的目标，�以使所有的目标平��样�益。
 
-Motivation and High-level Description
+动机和高级别�述
 =====================================
 
-The design of Yul tries to achieve several goals:
-
-1. Programs written in Yul should be readable, even if the code is generated by a compiler from Solidity or another high-level language.
-2. Control flow should be easy to understand to help in manual inspection, formal verification and optimization.
-3. The translation from Yul to bytecode should be as straightforward as possible.
-4. Yul should be suitable for whole-program optimization.
-
-In order to achieve the first and second goal, Yul provides high-level constructs
-like ``for`` loops, ``if`` and ``switch`` statements and function calls. These should
-be sufficient for adequately representing the control flow for assembly programs.
-Therefore, no explicit statements for ``SWAP``, ``DUP``, ``JUMPDEST``, ``JUMP`` and ``JUMPI``
-are provided, because the first two obfuscate the data flow
-and the last two obfuscate control flow. Furthermore, functional statements of
-the form ``mul(add(x, y), 7)`` are preferred over pure opcode statements like
-``7 y x add mul`` because in the first form, it is much easier to see which
-operand is used for which opcode.
-
-Even though it was designed for stack machines, Yul does not expose the complexity of the stack itself.
-The programmer or auditor should not have to worry about the stack.
-
-The third goal is achieved by compiling the
-higher level constructs to bytecode in a very regular way.
-The only non-local operation performed
-by the assembler is name lookup of user-defined identifiers (functions, variables, ...)
-and cleanup of local variables from the stack.
-
-To avoid confusions between concepts like values and references,
-Yul is statically typed. At the same time, there is a default type
-(usually the integer word of the target machine) that can always
-be omitted to help readability.
-
-To keep the language simple and flexible, Yul does not have
-any built-in operations, functions or types in its pure form.
-These are added together with their semantics when specifying a dialect of Yul,
-which allows specializing Yul to the requirements of different
-target platforms and feature sets.
-
-Currently, there is only one specified dialect of Yul. This dialect uses
-the EVM opcodes as builtin functions
-(see below) and defines only the type ``u256``, which is the native 256-bit
-type of the EVM. Because of that, we will not provide types in the examples below.
-
-
-Simple Example
+Yul 的设计试图实现几个目标：
+
+1. 用Yul编写的程�应该是�读的，�使代�是由Solidity或其他高级语言的编译器生�的。
+2. 控制�应易于�解，以帮助人工检查�形�化验�和优化。
+3. 从Yul到字节�的翻译应该尽�能的简�明了。
+4. Yul应该适用于整个程�的优化。
+
+为了实现第一个和第二个目标，Yul�供了高级别的结构，如 ``for`` 循环， ``if`` 和 ``switch`` 语�和函数调用。
+这些应该足以充分代表汇编程�的控制�。
+因此，没有�供 ``SWAP``， ``DUP``， ``JUMPDEST``， ``JUMP`` 和 ``JUMPI`` 的明确语�，
+因为�两者混淆了数��，�两者混淆了控制�。此外，
+``mul(add(x, y), 7)`` 形�的函数语�比 ``7 y x add mul`` 这样的纯�作�语�更�欢迎，
+因为在第一�形�中，更容易看到哪个�作数用于哪个�作�。
+
+尽管它是为堆栈机设计的，但Yul并没有暴露堆栈本身的��性。
+程�员或审计师�应该担心堆栈的问题。
+
+第三个目标是通过以一��常有规律的方�将高层结构编译�字节��实现的。
+汇编器执行的唯一�本地�作是用户定义的标识符（函数���......）的�称查找和清�堆栈中的本地��。
+
+为了��值和引用等概念之间的混淆，
+Yul是��类型的。�时，
+有一个默认的类型（通常是目标机的整数字），
+�以�时�略以帮助增加�读性。
+
+为了��语言的简�和�活，
+Yul在其纯粹的形�下没有任何内置的�作，函数或类型。
+在指定Yul的语言时，这些�作和语义被添加到一起，
+这使得Yul�以根���的目标平�和功能集的�求进行专业化。
+
+目�，�有一�指定的Yul语言。这个语言使用EVM的�作�作为内建函数（�下文），
+并且�定义了 ``u256`` 类型，这是EVM的本地256�类型。正因为如此，我们将�在下�的例�中�供类型。
+
+
+简�的例�
 ==============
 
-The following example program is written in the EVM dialect and computes exponentiation.
-It can be compiled using ``solc --strict-assembly``. The builtin functions
-``mul`` and ``div`` compute product and division, respectively.
+下�的例�程�是用EVM语言编写的，用�计算指数。
+它�以用 ``solc --strict-assembly`` 指令编译。
+内置函数 ``mul`` 和 ``div`` 分别计算乘法和除法。
 
 .. code-block:: yul
 
@@ -83,8 +73,8 @@ It can be compiled using ``solc --strict-assembly``. The builtin functions
         }
     }
 
-It is also possible to implement the same function using a for-loop
-instead of with recursion. Here, ``lt(a, b)`` computes whether ``a`` is less than ``b``.
+也�以用for循环而�是递归�实现�样的函数。
+这里， ``lt(a, b)`` 计算 ``a`` 是��于 ``b``。
 
 .. code-block:: yul
 
@@ -99,18 +89,16 @@ instead of with recursion. Here, ``lt(a, b)`` computes whether ``a`` is less tha
         }
     }
 
-At the :ref:`end of the section <erc20yul>`, a complete implementation of
-the ERC-20 standard can be found.
+在 :ref:`本节的末尾 <erc20yul>` ，�以找到ERC-20标准的完整实现。
 
 
 
-Stand-Alone Usage
+�独使用
 =================
 
-You can use Yul in its stand-alone form in the EVM dialect using the Solidity compiler.
-This will use the :ref:`Yul object notation <yul-object>` so that it is possible to refer
-to code as data to deploy contracts. This Yul mode is available for the commandline compiler
-(use ``--strict-assembly``) and for the :ref:`standard-json interface <compiler-api>`:
+您�以使用Solidity编译器在EVM语言中以独立的形�使用Yul。
+这将使用 :ref:`Yul 对象符� <yul-object>`，这样就有�能将代�作为数�引用到部署�约中。
+这�Yul模��用于命令行编译器（使用 ``--strict-assembly``）和 :ref:`标准-json接� <compiler-api>`。
 
 .. code-block:: json
 
@@ -125,150 +113,128 @@ to code as data to deploy contracts. This Yul mode is available for the commandl
 
 .. warning::
 
-    Yul is in active development and bytecode generation is only fully implemented for the EVM dialect of Yul
-    with EVM 1.0 as target.
+    Yul正在积�开�中，�有以EVM 1.0为目标，Yul的EVM语言�能完全实现字节�生�。
 
 
-Informal Description of Yul
+对Yul的�正��述
 ===========================
 
-In the following, we will talk about each individual aspect
-of the Yul language. In examples, we will use the default EVM dialect.
+在下文中，我们将谈论Yul语言的�个�独方�。在例�中，我们将使用默认的EVM语言。
 
-Syntax
+语法
 ------
 
-Yul parses comments, literals and identifiers in the same way as Solidity,
-so you can e.g. use ``//`` and ``/* */`` to denote comments.
-There is one exception: Identifiers in Yul can contain dots: ``.``.
-
-Yul can specify "objects" that consist of code, data and sub-objects.
-Please see :ref:`Yul Objects <yul-object>` below for details on that.
-In this section, we are only concerned with the code part of such an object.
-This code part always consists of a curly-braces
-delimited block. Most tools support specifying just a code block
-where an object is expected.
-
-Inside a code block, the following elements can be used
-(see the later sections for more details):
-
-- literals, e.g. ``0x123``, ``42`` or ``"abc"`` (strings up to 32 characters)
-- calls to builtin functions, e.g. ``add(1, mload(0))``
-- variable declarations, e.g. ``let x := 7``, ``let x := add(y, 3)`` or ``let x`` (initial value of 0 is assigned)
-- identifiers (variables), e.g. ``add(3, x)``
-- assignments, e.g. ``x := add(y, 3)``
-- blocks where local variables are scoped inside, e.g. ``{ let x := 3 { let y := add(x, 1) } }``
-- if statements, e.g. ``if lt(a, b) { sstore(0, 1) }``
-- switch statements, e.g. ``switch mload(0) case 0 { revert() } default { mstore(0, 1) }``
-- for loops, e.g. ``for { let i := 0} lt(i, 10) { i := add(i, 1) } { mstore(i, 7) }``
-- function definitions, e.g. ``function f(a, b) -> c { c := add(a, b) }``
-
-Multiple syntactical elements can follow each other simply separated by
-whitespace, i.e. there is no terminating ``;`` or newline required.
+Yul使用与Solidity相�的方�解�注释，字�和标识符，
+所以您�以使用 ``//`` 和 ``/* */`` �表示注释。
+但是有一个例外，Yul中的标识符�以包�圆点： ``.``。
+
+Yul�以指定由代�，数�和�对象组�的 “对象�。
+请�阅 :ref:`Yul 对象 <yul-object>` 以了解这方�的详情。
+在本节中，我们�关注这样一个对象的代�部分。
+这个代�部分总是由一个大括��定的�组�。
+大多数工具都支��指定一个预期对象的代��。
+
+在一个代��内，�以使用以下元素（更多细节���章节）：
+
+- 字�，� ``0x123``， ``42`` 或 ``"abc"`` （最多32个字符的字符串）。
+- 对内置函数的调用，例如 ``add(1, mload(0))``
+- ��声明，例如 ``let x := 7``， ``let x := add(y, 3)`` 或 ``let x`` （�始值为0）
+- 标识符（��），例如： ``add(3, x)``
+- 赋值，例如： ``x := add(y, 3)``
+- 局部��的作用域所在的代��，例如 ``{ let x := 3 { let y := add(x, 1) } }``
+- if 语�，例如 ``if lt(a, b) { sstore(0, 1) }``
+- switch 语�，例如 ``switch mload(0) case 0 { revert() } default { mstore(0, 1) }``
+- for 循环，例如 ``for { let i := 0} lt(i, 10) { i := add(i, 1) } { mstore(i, 7) }``
+- 函数的定义，例如 ``function f(a, b) -> c { c := add(a, b) }``
+
+多个语法元素之间�以简�地用空格隔开，��需�结尾的 ``;`` 或�行。
 
 .. index:: ! literal;in Yul
 
-Literals
+字��
 --------
 
-As literals, you can use:
+作为字��，您�以使用。
 
-- Integer constants in decimal or hexadecimal notation.
+- 以�进制或�六进制符�表示的整数常数。
 
-- ASCII strings (e.g. ``"abc"``), which may contain hex escapes ``\xNN`` and Unicode escapes ``\uNNNN`` where ``N`` are hexadecimal digits.
+- ASCII字符串（例如 ``"abc"``），�能包��六进制转义 ``\xNN`` 和 Unicode转义 ``\uNNNN``，其中 ``N`` 是�六进制数字。
 
-- Hex strings (e.g. ``hex"616263"``).
+- �六进制字符串（例如： ``hex"616263"``）。
 
-In the EVM dialect of Yul, literals represent 256-bit words as follows:
+在Yul的EVM语言中，字��表示256�的��，如下所示：
 
-- Decimal or hexadecimal constants must be less than ``2**256``.
-  They represent the 256-bit word with that value as an unsigned integer in big endian encoding.
+- �进制或�六进制的常�必须�于 ``2**256``。
+  它们以大端编�的无符�整数形�表示具有该值的256�字。
 
-- An ASCII string is first viewed as a byte sequence, by viewing
-  a non-escape ASCII character as a single byte whose value is the ASCII code,
-  an escape ``\xNN`` as single byte with that value, and
-  an escape ``\uNNNN`` as the UTF-8 sequence of bytes for that code point.
-  The byte sequence must not exceed 32 bytes.
-  The byte sequence is padded with zeros on the right to reach 32 bytes in length;
-  in other words, the string is stored left-aligned.
-  The padded byte sequence represents a 256-bit word whose most significant 8 bits are the ones from the first byte,
-  i.e. the bytes are interpreted in big endian form.
+- 一个ASCII字符串首先被看作是一个字节�列，
+  通过将�转义ASCII字符看作是一个�字节，其值是ASCII代�，
+  转义 ``\xNN`` 是具有该值的�字节，
+  转义 ``\uNNNN`` 是该代�点的UTF-8字节�列。
+  字节�列�得超过32字节。
+  字节�列在�边用零填充，以达到32个字节的长度；
+  ���说，字符串是以左对�的方�存储。
+  填充�的字节�列代表一个256�的字，其最有�义的8�是第一个字节的1，
+  也就是说，字节被解释为大端形�。
 
-- A hex string is first viewed as a byte sequence, by viewing
-  each pair of contiguous hex digits as a byte.
-  The byte sequence must not exceed 32 bytes (i.e. 64 hex digits), and is treated as above.
+- �六进制字符串首先被视为一个字节�列，
+  将�一对连续的�六进制数字视为一个字节。
+  字节�列�得超过32个字节（�64个�六进制数字），并按上述方法处�。
 
-When compiling for the EVM, this will be translated into an
-appropriate ``PUSHi`` instruction. In the following example,
-``3`` and ``2`` are added resulting in 5 and then the
-bitwise ``and`` with the string "abc" is computed.
-The final value is assigned to a local variable called ``x``.
+当为EVM编译时，这将被翻译�一个适当的 ``PUSHi`` 指令。
+在下�的例�中， ``3`` 和 ``2`` 相加的结果是 5，
+然�计算与字符串 “abc� 的按� ``与（and）``。
+最�的数值被分�到一个�� ``x`` 的局部��。
 
-The 32-byte limit above does not apply to string literals passed to builtin functions that require
-literal arguments (e.g. ``setimmutable`` or ``loadimmutable``). Those strings never end up in the
-generated bytecode.
+上述32字节的�制并�适用于传递给需�字��数的内置函数的字符串（例如， ``setimmutable`` 或 ``loadimmutable``）。
+这些字符串最终�会出现在生�的字节�中。
 
 .. code-block:: yul
 
     let x := and("abc", add(3, 2))
 
-Unless it is the default type, the type of a literal
-has to be specified after a colon:
+除�是默认类型，�则字�的类型必须在冒��指定：
 
 .. code-block:: yul
 
-    // This will not compile (u32 and u256 type not implemented yet)
+    // 这将�会被编译（u32和u256类型尚未实现）。
     let x := and("abc":u32, add(3:u256, 2:u256))
 
 
-Function Calls
+函数调用
 --------------
 
-Both built-in and user-defined functions (see below) can be called
-in the same way as shown in the previous example.
-If the function returns a single value, it can be directly used
-inside an expression again. If it returns multiple values,
-they have to be assigned to local variables.
+内置函数和用户定义的函数（�下文）都�以用��例�中的相�方�调用。
+如果函数返回一个�一的值，它�以直接在一个表达�中�次使用。
+如果它返回多个值，则必须将它们分�给局部��。
 
 .. code-block:: yul
 
     function f(x, y) -> a, b { /* ... */ }
     mstore(0x80, add(mload(0x80), 3))
-    // Here, the user-defined function `f` returns two values.
+    // 此处，用户定义的函数 `f` 返回两个值。
     let x, y := f(1, mload(0))
 
-For built-in functions of the EVM, functional expressions
-can be directly translated to a stream of opcodes:
-You just read the expression from right to left to obtain the
-opcodes. In the case of the second line in the example, this
-is ``PUSH1 3 PUSH1 0x80 MLOAD ADD PUSH1 0x80 MSTORE``.
+对于 EVM 的内置函数，函数表达��以直接转�为一系列�作�：
+您�需从�到左读�表达�，就�以得到�作�。
+在例�中的第二行，是 ``PUSH1 3 PUSH1 0x80 MLOAD ADD PUSH1 0x80 MSTORE``。
 
-For calls to user-defined functions, the arguments are also
-put on the stack from right to left and this is the order
-in which argument lists are evaluated. The return values,
-though, are expected on the stack from left to right,
-i.e. in this example, ``y`` is on top of the stack and ``x``
-is below it.
+对于调用用户定义的函数，�数也从�到左放在堆栈中，这是�数列表被评估的顺�。
+然而，返回值是在堆栈中从左到�，�在这个例�中， ``y`` 在堆栈的顶部， ``x`` 在其下方。
 
-Variable Declarations
+��声明
 ---------------------
 
-You can use the ``let`` keyword to declare variables.
-A variable is only visible inside the
-``{...}``-block it was defined in. When compiling to the EVM,
-a new stack slot is created that is reserved
-for the variable and automatically removed again when the end of the block
-is reached. You can provide an initial value for the variable.
-If you do not provide a value, the variable will be initialized to zero.
+您�以使用 ``let`` 关键字�声明��。���在它所定义的 ``{...}`` �内��。
+当编译到EVM时，会创建一个新的堆栈槽，为该���留，并在到达�的末端时自动移除。
+您�以为该���供一个�始值。如果您��供一个值，该��将被�始化为零。
 
-Since variables are stored on the stack, they do not directly
-influence memory or storage, but they can be used as pointers
-to memory or storage locations in the built-in functions
-``mstore``, ``mload``, ``sstore`` and ``sload``.
-Future dialects might introduce specific types for such pointers.
+由于��存储在堆栈中，它们�直接影�内存或存储，
+但它们�以在内置函数 ``mstore``， ``mload``， ``sstore`` 和 ``sload`` 中作为内存或存储�置的指针使用。
+未�的语言�能会为这�指针引入特定的类型。
 
-When a variable is referenced, its current value is copied.
-For the EVM, this translates to a ``DUP`` instruction.
+当一个��被引用时，其当�值被�制。
+对于EVM�说，这相当于一个 ``DUP`` 指令。
 
 .. code-block:: yul
 
@@ -278,75 +244,63 @@ For the EVM, this translates to a ``DUP`` instruction.
         {
             let y := add(sload(v), 1)
             v := y
-        } // y is "deallocated" here
+        } // y在这里被 “删除� 了
         sstore(v, zero)
-    } // v and zero are "deallocated" here
+    } // v和zero在这里被 “删除�。
 
 
-If the declared variable should have a type different from the default type,
-you denote that following a colon. You can also declare multiple
-variables in one statement when you assign from a function call
-that returns multiple values.
+如果声明的��应该有一个与默认类型��的类型，您�以用冒�表示。
+当您从一个返回多个值的函数调用中赋值时，您也�以在一�语�中声明多个��。
 
 .. code-block:: yul
 
-    // This will not compile (u32 and u256 type not implemented yet)
+    // 这将�会被编译（u32和u256类型尚未实现）。
     {
         let zero:u32 := 0:u32
         let v:u256, t:u32 := f()
         let x, y := g()
     }
 
-Depending on the optimiser settings, the compiler can free the stack slots
-already after the variable has been used for
-the last time, even though it is still in scope.
+根�优化器的设置，编译器�以在��被最�一次使用�释放堆栈槽，�使它�然在范围内。
 
 
-Assignments
+赋值
 -----------
 
-Variables can be assigned to after their definition using the
-``:=`` operator. It is possible to assign multiple
-variables at the same time. For this, the number and types of the
-values have to match.
-If you want to assign the values returned from a function that has
-multiple return parameters, you have to provide multiple variables.
-The same variable may not occur multiple times on the left-hand side of
-an assignment, e.g. ``x, x := f()`` is invalid.
+���以在其定义�使用 ``:=`` �作符进行赋值。�以在�一时间对多个��进行赋值。
+为此，数值的数�和类型必须匹�。如果您想对一个有多个返回�数的函数进行赋值，
+您必须�供多个��。�一���能多次出现在赋值的左侧，例如： ``x, x := f()`` 是无效的。
 
 .. code-block:: yul
 
     let v := 0
-    // re-assign v
+    // �新对v赋值
     v := 2
     let t := add(v, 2)
     function f() -> a, b { }
-    // assign multiple values
+    // 赋予多个值
     v, t := f()
 
 
 If
 --
 
-The if statement can be used for conditionally executing code.
-No "else" block can be defined. Consider using "switch" instead (see below) if
-you need multiple alternatives.
+if语��用于有�件地执行代�。�能定义 “else� �。
+如果您需�多�选择�件，�以考虑使用 “switch� �代替（�下文）。
 
 .. code-block:: yul
 
     if lt(calldatasize(), 4) { revert(0, 0) }
 
-The curly braces for the body are required.
+代��的大括�是必需的。
 
 Switch
 ------
 
-You can use a switch statement as an extended version of the if statement.
-It takes the value of an expression and compares it to several literal constants.
-The branch corresponding to the matching constant is taken.
-Contrary to other programming languages, for safety reasons, control flow does
-not continue from one case to the next. There can be a fallback or default
-case called ``default`` which is taken if none of the literal constants matches.
+您�以使用switch语�作为if语�的扩展版本。
+它获�一个表达�的值，并将其与几个字�常�进行比较，与匹�的常�相对应的分支被选中。
+与其他编程语言��的是，出于安全考虑，控制��会从一个�件延续到下一个�件。
+�以有一个� ``default`` 的回退或默认情况，如果没有一个字�常数匹�，就会采�这�情况。
 
 .. code-block:: yul
 
@@ -362,23 +316,18 @@ case called ``default`` which is taken if none of the literal constants matches.
         sstore(0, div(x, 2))
     }
 
-The list of cases is not enclosed by curly braces, but the body of a
-case does require them.
+�件的列表没有用大括�括起�，但�件的主体确实需�大括�。
 
-Loops
+循环
 -----
 
-Yul supports for-loops which consist of
-a header containing an initializing part, a condition, a post-iteration
-part and a body. The condition has to be an expression, while
-the other three are blocks. If the initializing part
-declares any variables at the top level, the scope of these variables extends to all other
-parts of the loop.
+Yul支�for循环，它由一个包��始化部分的头，一个�件，一个�迭代部分和一个主体组�。
+�件必须是一个表达�，而其他三个是代��。
+如果�始化部分在顶层声明了任何��，这些��的范围将延伸到循环的所有其他部分。
 
-The ``break`` and ``continue`` statements can be used in the body to exit the loop
-or skip to the post-part, respectively.
+``break`` 和 ``continue`` 语��以在主体中使用，分别用于退出循环或跳到�部分。
 
-The following example computes the sum of an area in memory.
+下�的例�是计算内存中一个代�区域的总和。
 
 .. code-block:: yul
 
@@ -389,8 +338,9 @@ The following example computes the sum of an area in memory.
         }
     }
 
-For loops can also be used as a replacement for while loops:
-Simply leave the initialization and post-iteration parts empty.
+For循环也�以作为while循环的替代：
+�需将�始化和�迭代部分留为空��。
+
 
 .. code-block:: yul
 
@@ -403,37 +353,32 @@ Simply leave the initialization and post-iteration parts empty.
         }
     }
 
-Function Declarations
+函数声明
 ---------------------
 
-Yul allows the definition of functions. These should not be confused with functions
-in Solidity since they are never part of an external interface of a contract and
-are part of a namespace separate from the one for Solidity functions.
+Yul�许定义函数。这些�应该与 Solidity 中的函数相混淆，因为它们从��是一个�约的外部接�的一部分，
+而是一个独立于 Solidity 函数的命�空间的一部分。
 
-For the EVM, Yul functions take their
-arguments (and a return PC) from the stack and also put the results onto the
-stack. User-defined functions and built-in functions are called in exactly the same way.
+对于EVM�说，Yul函数从堆栈中获�它们的�数（和一个返回的PC），
+�时也将结果放到堆栈中。用户定义的函数和内置函数的调用方�完全相�。
 
-Functions can be defined anywhere and are visible in the block they are
-declared in. Inside a function, you cannot access local variables
-defined outside of that function.
+函数�以在任何地方定义，并且在它们所声明的�中是��的。
+在一个函数中，您�能访问在该函数之外定义的局部��。
 
-Functions declare parameters and return variables, similar to Solidity.
-To return a value, you assign it to the return variable(s).
+函数声明�数和返回��，与Solidity类似。
+为了返回一个值，您�以把它分�给返回��。
 
-If you call a function that returns multiple values, you have to assign
-them to multiple variables using ``a, b := f(x)`` or ``let a, b := f(x)``.
+如果您调用一个返回多个值的函数，
+您必须用 ``a, b := f(x)`` 或 ``let a, b := f(x)`` 将它们分�给多个��。
 
-The ``leave`` statement can be used to exit the current function. It
-works like the ``return`` statement in other languages just that it does
-not take a value to return, it just exits the functions and the function
-will return whatever values are currently assigned to the return variable(s).
+``leave`` 语��以用�退出当�函数。它的工作原�类似于其他语言中的 ``return`` 语�，
+�是它�需�返回值，它�是退出函数，
+函数将返回当�分�给返回��的任何值。
 
-Note that the EVM dialect has a built-in function called ``return`` that
-quits the full execution context (internal message call) and not just
-the current yul function.
+注�，EVM语言有一个内置的函数� ``return``，
+它�以退出整个执行环境（内部消�调用），而�仅仅是当�的yul函数。
 
-The following example implements the power function by square-and-multiply.
+下�的例�通过平方和乘法实现了幂函数。
 
 .. code-block:: yul
 
@@ -450,106 +395,93 @@ The following example implements the power function by square-and-multiply.
         }
     }
 
-Specification of Yul
+Yul形�规范
 ====================
 
-This chapter describes Yul code formally. Yul code is usually placed inside Yul objects,
-which are explained in their own chapter.
+本章正��述Yul代�。Yul代�通常放置在Yul对象内，
+Yul对象将在它们自己的章节中解释。
 
 .. code-block:: none
 
-    Block = '{' Statement* '}'
-    Statement =
-        Block |
-        FunctionDefinition |
-        VariableDeclaration |
-        Assignment |
+    代�� = '{' 语�* '}'
+    语� =
+        代�� |
+        函数定义 |
+        ��声明 |
+        赋值 |
         If |
-        Expression |
+        表达� |
         Switch |
-        ForLoop |
-        BreakContinue |
-        Leave
-    FunctionDefinition =
-        'function' Identifier '(' TypedIdentifierList? ')'
-        ( '->' TypedIdentifierList )? Block
-    VariableDeclaration =
-        'let' TypedIdentifierList ( ':=' Expression )?
-    Assignment =
-        IdentifierList ':=' Expression
-    Expression =
-        FunctionCall | Identifier | Literal
-    If =
-        'if' Expression Block
-    Switch =
-        'switch' Expression ( Case+ Default? | Default )
+        For 循环 |
+        循环中断 |
+        退出
+    函数定义 =
+        'function' 标识符 '(' 带类型的标识符列表? ')'
+        ( '->' 带类型的标识符列表 )? 代��
+    ��声明 =
+        'let' 带类型的标识符列表 ( ':=' 表达� )?
+    赋值 =
+        标识符列表 ':=' 表达�
+    表达� =
+        函数调用 | 标识符 | 字��
+    If �件语� =
+        'if' 表达� 代��
+    Switch �件语� =
+        'switch' 表达� ( Case+ Default? | Default )
     Case =
-        'case' Literal Block
+        'case' 字�� 代��
     Default =
-        'default' Block
-    ForLoop =
-        'for' Block Expression Block Block
-    BreakContinue =
+        'default' 代��
+    For 循环 =
+        'for' 代�� 表达� 代�� 代��
+    循环中断 =
         'break' | 'continue'
-    Leave = 'leave'
-    FunctionCall =
-        Identifier '(' ( Expression ( ',' Expression )* )? ')'
-    Identifier = [a-zA-Z_$] [a-zA-Z_$0-9.]*
-    IdentifierList = Identifier ( ',' Identifier)*
-    TypeName = Identifier
-    TypedIdentifierList = Identifier ( ':' TypeName )? ( ',' Identifier ( ':' TypeName )? )*
-    Literal =
-        (NumberLiteral | StringLiteral | TrueLiteral | FalseLiteral) ( ':' TypeName )?
-    NumberLiteral = HexNumber | DecimalNumber
-    StringLiteral = '"' ([^"\r\n\\] | '\\' .)* '"'
-    TrueLiteral = 'true'
-    FalseLiteral = 'false'
-    HexNumber = '0x' [0-9a-fA-F]+
-    DecimalNumber = [0-9]+
-
-
-Restrictions on the Grammar
+    退出 = 'leave'
+    函数调用 =
+        标识符 '(' ( 表达� ( ',' 表达� )* )? ')'
+    标识符 = [a-zA-Z_$] [a-zA-Z_$0-9.]*
+    标识符列表 = 标识符 ( ',' 标识符)*
+    类型� = 标识符
+    带类型的标识符列表 = 标识符 ( ':' 类型� )? ( ',' 标识符 ( ':' 类型� )? )*
+    字�� =
+        (数字字�� | 字符串字�� | True字�� | False字��) ( ':' 类型� )?
+    数字字�� = �六进制数字 | �进制数字
+    字符串字�� = '"' ([^"\r\n\\] | '\\' .)* '"'
+    True字�� = 'true'
+    False字�� = 'false'
+    �六进制数字 = '0x' [0-9a-fA-F]+
+    �进制数字 = [0-9]+
+
+
+语法层�的�制
 ---------------------------
 
-Apart from those directly imposed by the grammar, the following
-restrictions apply:
-
-Switches must have at least one case (including the default case).
-All case values need to have the same type and distinct values.
-If all possible values of the expression type are covered, a default case is
-not allowed (i.e. a switch with a ``bool`` expression that has both a
-true and a false case do not allow a default case).
-
-Every expression evaluates to zero or more values. Identifiers and Literals
-evaluate to exactly
-one value and function calls evaluate to a number of values equal to the
-number of return variables of the function called.
-
-In variable declarations and assignments, the right-hand-side expression
-(if present) has to evaluate to a number of values equal to the number of
-variables on the left-hand-side.
-This is the only situation where an expression evaluating
-to more than one value is allowed.
-The same variable name cannot occur more than once in the left-hand-side of
-an assignment or variable declaration.
-
-Expressions that are also statements (i.e. at the block level) have to
-evaluate to zero values.
-
-In all other situations, expressions have to evaluate to exactly one value.
-
-A ``continue`` or ``break`` statement can only be used inside the body of a for-loop, as follows.
-Consider the innermost loop that contains the statement.
-The loop and the statement must be in the same function, or both must be at the top level.
-The statement must be in the loop's body block;
-it cannot be in the loop's initialization block or update block.
-It is worth emphasizing that this restriction applies just
-to the innermost loop that contains the ``continue`` or ``break`` statement:
-this innermost loop, and therefore the ``continue`` or ``break`` statement,
-may appear anywhere in an outer loop, possibly in an outer loop's initialization block or update block.
-For example, the following is legal,
-because the ``break`` occurs in the body block of the inner loop,
-despite also occurring in the update block of the outer loop:
+除语法直接规定的�制外，还适用以下�制：
+
+Switch 语�必须至少有一个判断�件（包括默认�件）。
+所有情况下的值都需�有相�的类型和��的值。
+如果表达�类型的所有�能值都被覆盖，则��许有默认情况
+（例如，一个带有 ``bool`` 表达�的Switch 语�，如果有一个真和一个�的情况，则��许有默认情况）。
+
+�个表达�都评估为零或多个值。
+标识符和字��精确地评估为一个值，
+而函数调用求值为所调用函数的返回值。
+
+在��声明和赋值中，�边的表达�（如果存在的�）必须求值到与左边的��数�相等的数值。
+这是唯一�许对一个以上的值进行评估的表达�的情况。
+在赋值或��声明的左侧，�一个���称�能出现多次。
+
+也是语�的表达�（�在�级）必须评估为零值。
+
+在所有其他情况下，表达�必须精确评估为一个值。
+
+``continue`` 或 ``break`` 语��能在for循环的主体内使用，如下所示。
+考虑包�该语�的最内部循环。循环和语�必须在�一个函数中，或者两者必须在最高层。
+该语�必须在循环的主体�中；�能在循环的�始化�或更新�中。
+值得强调的是，这个�制�适用于包� ``continue`` 或 ``break`` 语�的最内层循环：
+这个最内层循环，以� ``continue`` 或 ``break`` 语�，
+�以出现在外层循环的任何地方，�能是外层循环的�始化�或更新�中。
+例如，下�的例�是�法的，因为 ``break`` 出现在内循环的主体�中，尽管也出现在外循环的更新�中。
 
 .. code-block:: yul
 
@@ -557,83 +489,66 @@ despite also occurring in the update block of the outer loop:
     {
     }
 
-The condition part of the for-loop has to evaluate to exactly one value.
+for循环的�件部分必须精确评估为一个值。
 
-The ``leave`` statement can only be used inside a function.
+``leave`` 语��能在一个函数内使用。
 
-Functions cannot be defined anywhere inside for loop init blocks.
+函数�能在for循环�始化�的任何地方定义。
 
-Literals cannot be larger than their type. The largest type defined is 256-bit wide.
+字����以大于它们本身的类型。已定义的最大类型宽度为 256 比特。
 
-During assignments and function calls, the types of the respective values have to match.
-There is no implicit type conversion. Type conversion in general can only be achieved
-if the dialect provides an appropriate built-in function that takes a value of one
-type and returns a value of a different type.
+在赋值和函数调用过程中，�个值的类型必须匹�。
+没有��的类型转�。一般�说，�有当EVM语言�供一个适当的内置函数，
+接收一个类型的值并返回一个��类型的值时，�能实现类型转�。
 
-Scoping Rules
+作用域规则
 -------------
 
-Scopes in Yul are tied to Blocks (exceptions are functions and the for loop
-as explained below) and all declarations
-(``FunctionDefinition``, ``VariableDeclaration``)
-introduce new identifiers into these scopes.
+Yul中的作用域是与��系在一起的（函数和for循环是例外，下�会解释），
+所有的声明（ ``函数定义（FunctionDefinition）``，  ``��声明（VariableDeclaration）``）
+都将新的标识符引入这些作用域。
 
-Identifiers are visible in
-the block they are defined in (including all sub-nodes and sub-blocks):
-Functions are visible in the whole block (even before their definitions) while
-variables are only visible starting from the statement after the ``VariableDeclaration``.
+标识符在其定义的�中是��的（包括所有�节点和��）。
+函数在整个�中是��的（甚至在其定义之�），
+而���在 ``��声明`` 之�的语�中��。
 
-In particular,
-variables cannot be referenced in the right hand side of their own variable
-declaration.
-Functions can be referenced already before their declaration (if they are visible).
+特别是，���能在其自身��声明的�侧被引用。
+函数�以在其声明之�就被引用（如果它们是��的）。
 
-As an exception to the general scoping rule, the scope of the "init" part of the for-loop
-(the first block) extends across all other parts of the for loop.
-This means that variables (and functions) declared in the init part (but not inside a
-block inside the init part) are visible in all other parts of the for-loop.
+作为一般范围规则的一个例外，for 循环的 “init� 部分（第一个�）的范围延伸到for 循环的所有其他部分。
+这�味�在init部分声明的��（和函数）（但�在init部分的�内）在for循环的所有其他部分都是��的。
 
-Identifiers declared in the other parts of the for loop respect the regular
-syntactical scoping rules.
+在for循环的其他部分声明的标识符��守常规的�法范围规则。
 
-This means a for-loop of the form ``for { I... } C { P... } { B... }`` is equivalent
-to ``{ I... for {} C { P... } { B... } }``.
+这�味�一个for循环的形� ``for { I... } C { P... } { B... }`` 等�于
+``{ I... for {}. C { P... } { B...  }``.
 
-The parameters and return parameters of functions are visible in the
-function body and their names have to be distinct.
+函数的�数和返回�数在函数体中是��的，其�称必须是��的。
 
-Inside functions, it is not possible to reference a variable that was declared
-outside of that function.
+在函数内部，��能引用一个在该函数之外声明的��。
 
-Shadowing is disallowed, i.e. you cannot declare an identifier at a point
-where another identifier with the same name is also visible, even if it is
-not possible to reference it because it was declared outside the current function.
+影���是��许的，也就是说，您�能在�一个��的标识符也��的地方声明一个标识符，
+�使因为它是在当�函数之外声明的而��能引用它。
 
-Formal Specification
+形�规范
 --------------------
 
-We formally specify Yul by providing an evaluation function E overloaded
-on the various nodes of the AST. As builtin functions can have side effects,
-E takes two state objects and the AST node and returns two new
-state objects and a variable number of other values.
-The two state objects are the global state object
-(which in the context of the EVM is the memory, storage and state of the
-blockchain) and the local state object (the state of local variables, i.e. a
-segment of the stack in the EVM).
+我们通过�供一个在AST的�个节点上�载的评估函数E�正�指定Yul。
+由于内置函数�能有副作用，E接收两个状�对象和AST节点，并返回两个新的状�对象和数��定的其他值。
+这两个状�对象是全局状�对象（在EVM的背景下，它是区�链的内存�存储和状�）
+和本地状�对象（本地��的状�，�EVM中堆栈的一段）。
 
-If the AST node is a statement, E returns the two state objects and a "mode",
-which is used for the ``break``, ``continue`` and ``leave`` statements.
-If the AST node is an expression, E returns the two state objects and
-as many values as the expression evaluates to.
+如果AST节点是一个语�，E返回两个状�对象和一个 “mode�，
+该mode用于 ``break``， ``continue`` 和 ``leave`` 语�。
+如果AST节点是一个表达�，E返回两个状�对象和表达�所评估的数值。
 
 
-The exact nature of the global state is unspecified for this high level
-description. The local state ``L`` is a mapping of identifiers ``i`` to values ``v``,
-denoted as ``L[i] = v``.
+全局状�的确切性质在这个高层次的�述中没有明确说明。
+本地状� ``L`` 是标识符 ``i`` 到值 ``v`` 的映射，表示为 ``L[i] = v``。
 
-For an identifier ``v``, let ``$v`` be the name of the identifier.
+对于标识符 ``v``, 我们用 ``$v`` 作为标识符的�字。
 
-We will use a destructuring notation for the AST nodes.
+我们将为 AST 节点使用解构符�。
 
 .. code-block:: none
 
@@ -664,7 +579,7 @@ We will use a destructuring notation for the AST nodes.
     E(G, L, <for { i1, ..., in } condition post body>: ForLoop) =
         if n >= 1:
             let G1, L1, mode = E(G, L, i1, ..., in)
-            // mode has to be regular or leave due to the syntactic restrictions
+            // 由于语法�制，mode 必须是规则的
             if mode is leave then
                 G1, L1 restricted to variables of L, leave
             otherwise
@@ -703,7 +618,7 @@ We will use a destructuring notation for the AST nodes.
     E(G, L, <switch condition case l1:t1 st1 ... case ln:tn stn default st'>: Switch) =
         let G0, L0, v = E(G, L, condition)
         // i = 1 .. n
-        // Evaluate literals, context doesn't matter
+        // 对字��求值，上下文无关
         let _, _, v1 = E(G0, L0, l1)
         ...
         let _, _, vn = E(G0, L0, ln)
@@ -737,31 +652,219 @@ We will use a destructuring notation for the AST nodes.
 
 .. _opcodes:
 
-EVM Dialect
+EVM语言
 -----------
 
+<<<<<<< HEAD
+目�Yul的默认语言是当�选择的EVM版本的EVM语言，与EVM的一个版本。
+该语言中唯一�用的类型是 ``u256``，�Ethereum虚拟机的256�本地类型。
+因为它是该语言的默认类型，所以�以�略。
+=======
 The default dialect of Yul currently is the EVM dialect for the currently selected version of the EVM.
 The only type available in this dialect
 is ``u256``, the 256-bit native type of the Ethereum Virtual Machine.
 Since it is the default type of this dialect, it can be omitted.
+>>>>>>> english/develop
+
+下表列出了所有内置函数（�决于EVM版本），并�供了函数/�作�的语义的简短�述。
+本文件并�想�为以太�虚拟机的完整�述。如果您对精确的语义感兴趣，请�考�一份文件。
 
-The following table lists all builtin functions
-(depending on the EVM version) and provides a short description of the
-semantics of the function / opcode.
-This document does not want to be a full description of the Ethereum virtual machine.
-Please refer to a different document if you are interested in the precise semantics.
+<<<<<<< HEAD
+标有 ``-`` 的�作��返回结果，所有其他�作�正好返回一个值。
+标有 ``F``， ``H``， ``B``， ``C``， ``I``， ``L``和 ``P`` 的�作�分别
+是从Frontier，Homestead，Byzantium，Constantinople，Istanbul，London 或 Paris 版本出现的。
 
+在下文中， ``mem[a...b)`` 表示从�置 ``a`` 开始到�包括�置 ``b`` 的内存字节，
+``storage[p]`` 表示�槽 ``p`` 的存储内容。
+=======
 Opcodes marked with ``-`` do not return a result and all others return exactly one value.
-Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L`` and ``P`` are present since Frontier,
-Homestead, Byzantium, Constantinople, Istanbul, London or Paris respectively.
+Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L``, ``P`` and ``N`` are present since Frontier,
+Homestead, Byzantium, Constantinople, Istanbul, London, Paris or Cancun respectively.
 
 In the following, ``mem[a...b)`` signifies the bytes of memory starting at position ``a`` up to
-but not including position ``b`` and ``storage[p]`` signifies the storage contents at slot ``p``.
-
-Since Yul manages local variables and control-flow,
-opcodes that interfere with these features are not available. This includes
-the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels and the ``push`` instructions.
-
+but not including position ``b``, ``storage[p]`` signifies the storage contents at slot ``p``, and
+similarly, ``transientStorage[p]`` signifies the transient storage contents at slot ``p``.
+>>>>>>> english/develop
+
+由于Yul管��局部��和控制�，所以�能使用干扰这些功能的�作�。
+这包括 ``dup`` 和 ``swap`` 指令，以� ``jump`` 指令，标签和 ``push`` 指令。
+
+<<<<<<< HEAD
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+|          指令           |     |     |                                    解释                                     |
++=========================+=====+=====+=============================================================================+
+| stop()                  | `-` | F   | �止执行，与return(0, 0)相�                                                |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| add(x, y)               |     | F   | x + y                                                                       |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| sub(x, y)               |     | F   | x - y                                                                       |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| mul(x, y)               |     | F   | x * y                                                                       |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| div(x, y)               |     | F   | x / y 或 如果 y == 0，则为 0                                                |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| sdiv(x, y)              |     | F   | x / y，对于有符�的二进制补数，如果 y == 0，则为 0                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| mod(x, y)               |     | F   | x % y, 如果 y == 0，则为 0                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| smod(x, y)              |     | F   | x % y, 对于有符�的二进制补数, 如果 y == 0，则为 0                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| exp(x, y)               |     | F   | x的y次方                                                                    |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| not(x)                  |     | F   | x的� "�"（x的�一个�都��）                                             |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| lt(x, y)                |     | F   | 如果 x < y，则为1，�则为0                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| gt(x, y)                |     | F   | 如果 x > y，则为1，�则为0                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| slt(x, y)               |     | F   | 如果 x < y，则为1，�则为0，适用于有符�的二进制数                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| sgt(x, y)               |     | F   | 如果 x > y，则为1，�则为0，适用于有符�的二进制补数                        |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| eq(x, y)                |     | F   | 如果 x == y，则为1，�则为0                                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| iszero(x)               |     | F   | 如果 x == 0，则为1，�则为0                                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| and(x, y)               |     | F   | x 和 y 的按� "与"                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| or(x, y)                |     | F   | x 和 y 的按� "或"                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| xor(x, y)               |     | F   | x 和 y 的按� "异或"                                                        |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| byte(n, x)              |     | F   | x的第n个字节，其中最��的字节是第0个字节                                   |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| shl(x, y)               |     | C   | 将 y 逻辑左移 x �                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| shr(x, y)               |     | C   | 将 y 逻辑�移 x �                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| sar(x, y)               |     | C   | 将 y 算术�移 x �                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| addmod(x, y, m)         |     | F   | (x + y) % m，采用任�精度算术，如果m == 0则为0                              |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| mulmod(x, y, m)         |     | F   | (x * y) % m，采用任�精度算术，如果m == 0则为0                              |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| signextend(i, x)        |     | F   | 从第 (i*8+7) �开始进行符�扩展，从最低符��开始计算                       |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| keccak256(p, n)         |     | F   | keccak(mem[p...(p+n)))                                                      |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| pc()                    |     | F   | 代�中的当��置                                                            |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| pop(x)                  | `-` | F   | 丢弃值 x                                                                    |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| mload(p)                |     | F   | mem[p...(p+32))                                                             |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| mstore(p, v)            | `-` | F   | mem[p...(p+32)) := v                                                        |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| mstore8(p, v)           | `-` | F   | mem[p] := v & 0xff （(�修改了一个字节)）                                   |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| sload(p)                |     | F   | storage[p]                                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| sstore(p, v)            | `-` | F   | storage[p] := v                                                             |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| msize()                 |     | F   | 内存的大�，�最大的访问内存索引                                            |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| gas()                   |     | F   | ��以执行的气体值                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| address()               |     | F   | 当��约/执行环境的地�                                                     |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| balance(a)              |     | F   | 地�为A的余�，以wei为��                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| selfbalance()           |     | I   | 相当于balance(address())，但更便宜                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| caller()                |     | F   | 消�调用者（�包括 ``delegatecall`` 调用）。                                |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| callvalue()             |     | F   | 与当�调用一起��的wei的数�                                               |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| calldataload(p)         |     | F   | 从�置p开始的调用数�（32字节）                                             |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| calldatasize()          |     | F   | 调用数�的大�，以字节为��                                                |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| calldatacopy(t, f, s)   | `-` | F   | 从�置f的calldata�制s字节到�置t的内存中                                   |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| codesize()              |     | F   | 当��约/执行环境的代�大�                                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| codecopy(t, f, s)       | `-` | F   | 从�置f的code中�制s字节到�置t的内存中                                     |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| extcodesize(a)          |     | F   | 地�为a的代�的大�                                                         |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| extcodecopy(a, t, f, s) | `-` | F   | �codecopy(t, f, s)一样，但在地�a处�代�                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| returndatasize()        |     | B   | 最�返回数�的大�                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| returndatacopy(t, f, s) | `-` | B   | 从�置f的returndata�制s字节到�置t的内存中                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| extcodehash(a)          |     | C   | 地�a的代�哈希值                                                           |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| create(v, p, n)         |     | F   | 用代�mem[p...(p+n))创建新的�约，��v数�的wei并返回新地�；              |
+|                         |     |     | 错误时返回0                                                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| create2(v, p, n, s)     |     | C   | 在keccak256(0xff . this . s . keccak256(mem[p...(p+n)))地�处               |
+|                         |     |     | 创建代�为mem[p...(p+n)]的新�约                                            |
+|                         |     |     | 并��v 数�个wei和返回新地�， 其中 ``0xff`` 是一个1字节的值，             |
+|                         |     |     | ``this`` 是当��约的地�，                                                 |
+|                         |     |     | 是一个20字节的值， ``s`` 是一个256�的大端的值;                             |
+|                         |     |     | 错误时返回0                                                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| call(g, a, v, in,       |     | F   | 调用地� a 上的�约，以 mem[in..(in+insize)) 作为输入                       |
+| insize, out, outsize)   |     |     | 一并�� g 数�的 gas 和 v 数�的 wei，                                     |
+|                         |     |     | 以 mem[out..(out+outsize)) 作为输出空间。 若错误，返回 0 （比如，gas 用光） |
+|                         |     |     | 若�功，返回 1                                                              |
+|                         |     |     | :ref:`查看更多 <yul-call-return-area>`                                      |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| callcode(g, a, v, in,   |     | F   | 相当于 ``call``  但仅仅使用地� a 上的代�，                                |
+| insize, out, outsize)   |     |     | 执行时留在当��约的上下文当中                                              |
+|                         |     |     | :ref:`查看更多 <yul-call-return-area>`                                      |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| delegatecall(g, a, in,  |     | H   | 相当于 ``callcode``, 但�时�留 ``caller``                                  |
+| insize, out, outsize)   |     |     | 和 ``callvalue``                                                            |
+|                         |     |     | :ref:`查看更多 <yul-call-return-area>`                                      |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| staticcall(g, a, in,    |     | B   | 相当于 ``call(g, a, 0, in, insize, out, outsize)``                          |
+| insize, out, outsize)   |     |     | 但��许状���的修改                                                      |
+|                         |     |     | :ref:`查看更多 <yul-call-return-area>`                                      |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| return(p, s)            | `-` | F   | 终止执行，返回 mem[p..(p+s)) 上的数�                                       |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| revert(p, s)            | `-` | B   | 终止执行，��状��更，返回 mem[p..(p+s)) 上的数�                         |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| selfdestruct(a)         | `-` | F   | 终止执行，销�当��约，并且将余���到地� a （已废弃）                   |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| invalid()               | `-` | F   | 以无效指令终止执行                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| log0(p, s)              | `-` | F   | 用 mem[p..(p+s)] 上的数�产生日志                                           |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| log1(p, s, t1)          | `-` | F   | 用 mem[p..(p+s)] 上的数�和 topic t1 产生日志                               |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| log2(p, s, t1, t2)      | `-` | F   | 用 mem[p..(p+s)] 上的数�和 topic t1，t2 产生日志                           |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| log3(p, s, t1, t2, t3)  | `-` | F   | 用 mem[p..(p+s)] 上的数�和 topic t1，t2，t3 产生日志                       |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| log4(p, s, t1, t2, t3,  | `-` | F   | 用 mem[p..(p+s)] 上的数�和 topic t1，t2，t3，t4 产生日志                   |
+| t4)                     |     |     |                                                                             |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| chainid()               |     | I   | 执行链的ID（EIP-1344）                                                      |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| basefee()               |     | L   | 当�区�的基本费用（EIP-3198和EIP-1559）                                    |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| origin()                |     | F   | 交易��者                                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| gasprice()              |     | F   | 交易的气体价格                                                              |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| blockhash(b)            |     | F   | 区�编�b的哈希值--�针对最近的256个区�，�包括当�区�。                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| coinbase()              |     | F   | 目�的挖矿的�益者                                                          |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| timestamp()             |     | F   | 自 epoch 开始的，当��的时间戳，以秒为��                                 |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| number()                |     | F   | 当�区��                                                                  |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| difficulty()            |     | F   | 当�区�的难度（�下�的注释）                                              |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| prevrandao()            |     | P   | 由信标链�供的�机性（�下�的注释）                                        |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+| gaslimit()              |     | F   | 当�区�的区� gas �制                                                     |
++-------------------------+-----+-----+-----------------------------------------------------------------------------+
+=======
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | Instruction             |     |   | Explanation                                                     |
 +=========================+=====+===+=================================================================+
@@ -833,6 +936,10 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | sstore(p, v)            | `-` | F | storage[p] := v                                                 |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| tload(p)                |     | N | transientStorage[p]                                             |
++-------------------------+-----+---+-----------------------------------------------------------------+
+| tstore(p, v)            | `-` | N | transientStorage[p] := v                                        |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | msize()                 |     | F | size of memory, i.e. largest accessed memory index              |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | gas()                   |     | F | gas still available to execution                                |
@@ -865,6 +972,8 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | returndatacopy(t, f, s) | `-` | B | copy s bytes from returndata at position f to mem at position t |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| mcopy(t, f, s)          | `-` | N | copy s bytes from mem at position f to mem at position t        |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | extcodehash(a)          |     | C | code hash of address a                                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | create(v, p, n)         |     | F | create new contract with code mem[p...(p+n)) and send v wei     |
@@ -919,12 +1028,16 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | basefee()               |     | L | current block's base fee (EIP-3198 and EIP-1559)                |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| blobbasefee()           |     | N | current block's blob base fee (EIP-7516 and EIP-4844)           |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | origin()                |     | F | transaction sender                                              |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | gasprice()              |     | F | gas price of the transaction                                    |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | blockhash(b)            |     | F | hash of block nr b - only for last 256 blocks excluding current |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| blobhash(i)             |     | N | versioned hash of transaction's i-th blob                       |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | coinbase()              |     | F | current mining beneficiary                                      |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | timestamp()             |     | F | timestamp of the current block in seconds since the epoch       |
@@ -937,58 +1050,69 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | gaslimit()              |     | F | block gas limit of the current block                            |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+>>>>>>> english/develop
 
 .. _yul-call-return-area:
 
 .. note::
-  The ``call*`` instructions use the ``out`` and ``outsize`` parameters to define an area in memory where
-  the return or failure data is placed. This area is written to depending on how many bytes the called contract returns.
-  If it returns more data, only the first ``outsize`` bytes are written. You can access the rest of the data
-  using the ``returndatacopy`` opcode. If it returns less data, then the remaining bytes are not touched at all.
-  You need to use the ``returndatasize`` opcode to check which part of this memory area contains the return data.
-  The remaining bytes will retain their values as of before the call.
+  ``call*`` 指令使用 ``out`` 和 ``outsize`` �数�在内存中定义的一个区域，
+  用于放置返回或失败数�。这个区域的写入�决于被调用的�约返回多少字节。
+  如果它返回更多的数�，�有第一个 ``outsize`` 字节被写入。您�以使用 ``returndatacopy`` �作�访问其余的数�。
+  如果它返回较少的数�，那么剩下的字节根本�被触�。
+  您需�使用 ``returndatacopy`` �作��检查这个内存区域的哪一部分包�返回数�。
+  剩下的字节将�留调用�的值。
 
 .. note::
-  The ``difficulty()`` instruction is disallowed in EVM version >= Paris.
-  With the Paris network upgrade the semantics of the instruction that was previously called
-  ``difficulty`` have been changed and the instruction was renamed to ``prevrandao``.
-  It can now return arbitrary values in the full 256-bit range, whereas the highest recorded
-  difficulty value within Ethash was ~54 bits.
-  This change is described in `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_.
-  Please note that irrelevant to which EVM version is selected in the compiler, the semantics of
-  instructions depend on the final chain of deployment.
+  ``difficulty()`` 指令在 EVM >= Paris 版本中是��许的。
+  �� Paris 网络的�级，以�被称为 ``difficulty`` 的指令的语义已�改�，
+  该指令被�新命�为 ``prevrandao``。
+  它现在�以返回全256�范围内的任�值，
+  而Ethash内部记录的最高难度值是~54�。
+  这一�化在 `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ 中有所�述。
+  请注�，与在编译器中选择哪个EVM版本无关，指令的语义�决于最终的部署链。
 
 .. warning::
+<<<<<<< HEAD
+    从0.8.18�更高版本开始，在 Solidity 和 Yul 中使用 ``selfdestruct`` 将触�弃用警告，
+    因为 ``SELFDESTRUCT`` �作�最终将�历 `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_ 
+    中所述的行为的�大�化。
+=======
     From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
     deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behavior
     as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+>>>>>>> english/develop
 
-In some internal dialects, there are additional functions:
+在一些内部语言中，还有一些�外的函数：
 
 datasize, dataoffset, datacopy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The functions ``datasize(x)``, ``dataoffset(x)`` and ``datacopy(t, f, l)``
-are used to access other parts of a Yul object.
+函数 ``datasize(x)``， ``dataoffset(x)`` 和 ``datacopy(t, f, l)`` 用�访问Yul对象的其他部分。
 
-``datasize`` and ``dataoffset`` can only take string literals (the names of other objects)
-as arguments and return the size and offset in the data area, respectively.
-For the EVM, the ``datacopy`` function is equivalent to ``codecopy``.
+``datasize`` 和 ``dataoffset`` �能接�字符串字��（其他对象的�称）作为�数，
+并分别返回数�区的大�和�移�。
+对于EVM， ``datacopy`` 函数等�于 ``codecopy``。
 
 
 setimmutable, loadimmutable
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The functions ``setimmutable(offset, "name", value)`` and ``loadimmutable("name")`` are
-used for the immutable mechanism in Solidity and do not nicely map to pure Yul.
-The call to ``setimmutable(offset, "name", value)`` assumes that the runtime code of the contract
-containing the given named immutable was copied to memory at offset ``offset`` and will write ``value`` to all
-positions in memory (relative to ``offset``) that contain the placeholder that was generated for calls
-to ``loadimmutable("name")`` in the runtime code.
+函数 ``setimmutable(offset, "name", value)`` 和 ``loadimmutable("name")`` 用于Solidity中的���机制，
+�能很好地映射到纯Yul。
+对 ``setimmutable(offset, "name", value)`` 的调用�定包�给定���的命�的�约的�行时代�
+在�移� ``offset`` 处被�制到内存中，并将把 ``value`` 写到内存中的所有�置（相对于 ``offset``），
+这些�置包�在�行时代�中为调用 ``loadimmutable("name")`` 产生的��符。
 
 
 linkersymbol
 ^^^^^^^^^^^^
+<<<<<<< HEAD
+函数 ``linkersymbol("library_id")`` 是一个��符，用�表示被链接器替�的地�字头。
+它的第一个也是唯一的�数必须是一个字符串字��，并且唯一地代表��入的地�。
+标识符�以是任�的，但是当编译器从Solidity�产生Yul代�时，它使用一个库�，
+并以定义该库的��元的�称作为�定。
+�用一个特定的库地�链接代�，必须在命令行上的 ``--libraries`` 选项中�供相�的标识符。
+=======
 The function ``linkersymbol("library_id")`` is a placeholder for an address literal to be substituted
 by the linker.
 Its first and only argument must be a string literal and uniquely represents the address to be inserted.
@@ -996,43 +1120,39 @@ Identifiers can be arbitrary but when the compiler produces Yul code from Solidi
 it uses a library name qualified with the name of the source unit that defines that library.
 To link the code with a particular library address, the same identifier must be provided to the
 ``--libraries`` option on the command-line.
+>>>>>>> english/develop
 
-For example this code
+例如，这段代�
 
 .. code-block:: yul
 
     let a := linkersymbol("file.sol:Math")
 
-is equivalent to
+相当于
 
 .. code-block:: yul
 
     let a := 0x1234567890123456789012345678901234567890
 
-when the linker is invoked with ``--libraries "file.sol:Math=0x1234567890123456789012345678901234567890``
-option.
+当使用 ``--libraries "file.sol:Math=0x1234567890123456789012345678901234567890`` 选项调用链接器时。
 
-See :ref:`Using the Commandline Compiler <commandline-compiler>` for details about the Solidity linker.
+请�阅 :ref:`使用命令行编译器 <commandline-compiler>` 以了解有关 Solidity 链接器的详情。
 
 memoryguard
 ^^^^^^^^^^^
 
-This function is available in the EVM dialect with objects. The caller of
-``let ptr := memoryguard(size)`` (where ``size`` has to be a literal number)
-promises that they only use memory in either the range ``[0, size)`` or the
-unbounded range starting at ``ptr``.
+调用 ``let ptr := memoryguard(size)`` 的调用者（其中 ``size`` 必须是一个数字字��）
+承诺他们�使用 ``[0, size]`` 范围内的内存，或者从 ``ptr`` 开始的无界范围。
 
-Since the presence of a ``memoryguard`` call indicates that all memory access
-adheres to this restriction, it allows the optimizer to perform additional
-optimization steps, for example the stack limit evader, which attempts to move
-stack variables that would otherwise be unreachable to memory.
+由于 ``memoryguard`` 调用的存在表明所有的内存访问都�守这一�制，
+它�许优化器执行�外的优化步骤，
+例如堆栈�制规�器，它试图将原本无法到达的堆栈��转移到内存中。
 
-The Yul optimizer promises to only use the memory range ``[size, ptr)`` for its purposes.
-If the optimizer does not need to reserve any memory, it holds that ``ptr == size``.
+Yul优化器承诺�使用内存范围 ``[size, ptr)`` �实现其目的。
+如果优化器�需��留任何内存，它认为 ``ptr == size``。
 
-``memoryguard`` can be called multiple times, but needs to have the same literal as argument
-within one Yul subobject. If at least one ``memoryguard`` call is found in a subobject,
-the additional optimiser steps will be run on it.
+``memoryguard`` �以被多次调用，但是需�在一个Yul�对象内有相�的字样作为�数。
+如果在一个�对象中�现至少一个 ``memoryguard`` 的调用，�外的优化步骤将在它身上�行。
 
 
 .. _yul-verbatim:
@@ -1040,37 +1160,40 @@ the additional optimiser steps will be run on it.
 verbatim
 ^^^^^^^^
 
-The set of ``verbatim...`` builtin functions lets you create bytecode for opcodes
-that are not known to the Yul compiler. It also allows you to create
-bytecode sequences that will not be modified by the optimizer.
+一组 ``verbatim...`` 内置函数�以让您为Yul编译器�知�的�作�创建字节�。
+它还�许您创建�会被优化器修改的字节��列。
+
 
-The functions are ``verbatim_<n>i_<m>o("<data>", ...)``, where
+这些函数是 ``verbatim_<n>i_<m>o("<data>", ...)``，其中
 
-- ``n`` is a decimal between 0 and 99 that specifies the number of input stack slots / variables
-- ``m`` is a decimal between 0 and 99 that specifies the number of output stack slots / variables
-- ``data`` is a string literal that contains the sequence of bytes
+- ``n`` 是一个介于0和99之间的�数，指定输入栈槽/��的数�
+- ``m`` 是一个介于0和99之间的�数，指定输出栈槽/��的数�
+- ``data`` 是一个字符串字��，包�字节的�列
 
-If you for example want to define a function that multiplies the input
-by two, without the optimizer touching the constant two, you can use
+例如，如果您想定义一个函数，将输入值乘以2，而�需�优化器触�常数2，您�以使用
 
 .. code-block:: yul
 
     let x := calldataload(0)
     let double := verbatim_1i_1o(hex"600202", x)
 
-This code will result in a ``dup1`` opcode to retrieve ``x``
-(the optimizer might directly re-use result of the
-``calldataload`` opcode, though)
-directly followed by ``600202``. The code is assumed to
-consume the copied value of ``x`` and produce the result
-on the top of the stack. The compiler then generates code
-to allocate a stack slot for ``double`` and store the result there.
+这段代�将产生一个 ``dup1`` �作��检索 ``x``
+（尽管优化器�能直接�新使用 ``calldataload`` �作�的结果），
+��直接是 ``600202``。该代�被�定为消耗 ``x`` 的�制值，并在堆栈顶部产生结果。
+然�编译器生�代�，为 ``double`` 分�一个堆栈槽，并将结果存储在那里。
+
+与所有的�作�一样，�数被安排在堆栈中，最左边的�数在最上�，
+而返回值则被�定是以最�边的��在栈顶的方�排列的。
 
-As with all opcodes, the arguments are arranged on the stack
-with the leftmost argument on the top, while the return values
-are assumed to be laid out such that the rightmost variable is
-at the top of the stack.
+<<<<<<< HEAD
+由于 ``verbatim`` �以用�生�任�的�作�，甚至是Solidity编译器�知�的�作�，
+在与优化器一起使用 ``verbatim`` 时，必须�心。
+�使优化器被关闭，代�生�器也必须确定堆栈布局，这�味�，例如，
+使用 ``verbatim`` �修改堆栈高度会导致未定义行为。
 
+下�是一个�完全的列表，列出了对�字字节�的�制，
+这些�制�被编译器检查。��这些�制会导致未定义的行为。
+=======
 Since ``verbatim`` can be used to generate arbitrary opcodes
 or even opcodes unknown to the Solidity compiler, care has to be taken
 when using ``verbatim`` together with the optimizer. Even when the
@@ -1082,119 +1205,114 @@ The following is a non-exhaustive list of restrictions on
 verbatim bytecode that are not checked by
 the compiler. Violations of these restrictions can result in
 undefined behavior.
+>>>>>>> english/develop
 
-- Control-flow should not jump into or out of verbatim blocks,
-  but it can jump within the same verbatim block.
-- Stack contents apart from the input and output parameters
-  should not be accessed.
-- The stack height difference should be exactly ``m - n``
-  (output slots minus input slots).
-- Verbatim bytecode cannot make any assumptions about the
-  surrounding bytecode. All required parameters have to be
-  passed in as stack variables.
+- 控制��应该跳入或跳出 verbatim �，但它�以在�一个 verbatim �内跳入。
+- 除了输入和输出�数外，堆栈内容�应该被访问。
+- 堆栈的高度差应该正好是 ``m - n`` （输出槽�去输入槽）。
+- Verbatim字节��能对周围的字节��任何�设。
+  所有需�的�数都必须作为堆栈��传入。
 
-The optimizer does not analyze verbatim bytecode and always
-assumes that it modifies all aspects of state and thus can only
-do very few optimizations across ``verbatim`` function calls.
+优化器�分� verbatim 字节�，总是�设它修改了状�的所有方�，
+因此�能在 ``verbatim`` 函数调用中�很少的优化。
 
-The optimizer treats verbatim bytecode as an opaque block of code.
-It will not split it but might move, duplicate
-or combine it with identical verbatim bytecode blocks.
-If a verbatim bytecode block is unreachable by the control-flow,
-it can be removed.
+优化器将 verbatim 字节�视为一个��明的代��。它�会分割它，
+但�能会移动���或与相�的 verbatim 字节��结�。
+如果一个 verbatim 的字节���能被控制�所触�。
+它�以被删除。
 
 
 .. warning::
 
-    During discussions about whether or not EVM improvements
-    might break existing smart contracts, features inside ``verbatim``
-    cannot receive the same consideration as those used by the Solidity
-    compiler itself.
+    在讨论EVM的改进是�会破�现有的智能�约时，
+    ``verbatim`` 内部的功能�能得到与Solidity编译器本身使用的功能一样的考虑。
 
 .. note::
 
-    To avoid confusion, all identifiers starting with the string ``verbatim`` are reserved
-    and cannot be used for user-defined identifiers.
+    为了��混淆，所有以字符串 ``verbatim`` 开头的标识符都被�留，
+    �能用于用户定义的标识符。
 
 .. _yul-object:
 
-Specification of Yul Object
+Yul对象的规范
 ===========================
 
-Yul objects are used to group named code and data sections.
-The functions ``datasize``, ``dataoffset`` and ``datacopy``
-can be used to access these sections from within code.
-Hex strings can be used to specify data in hex encoding,
-regular strings in native encoding. For code,
-``datacopy`` will access its assembled binary representation.
+Yul对象被用�分组命�代�和数�部分。
+函数 ``datasize``， ``dataoffset`` 和 ``datacopy`` �以用�从代�中访问这些部分。
+�六进制字符串�用于指定�六进制编�的数�，
+普通字符串为本地编�。对于代�，
+``datacopy`` 将访问其组装的二进制所表示的数�。
 
 .. code-block:: none
 
-    Object = 'object' StringLiteral '{' Code ( Object | Data )* '}'
-    Code = 'code' Block
-    Data = 'data' StringLiteral ( HexLiteral | StringLiteral )
-    HexLiteral = 'hex' ('"' ([0-9a-fA-F]{2})* '"' | '\'' ([0-9a-fA-F]{2})* '\'')
-    StringLiteral = '"' ([^"\r\n\\] | '\\' .)* '"'
+    对象 = 'object' 字�� '{' 代� ( 对象 | 数� )* '}'
+    代� = 'code' �
+    数� = 'data' 字�� ( �六进制字�� | 字�� )
+    �六进制字�� = 'hex' ('"' ([0-9a-fA-F]{2})* '"' | '\'' ([0-9a-fA-F]{2})* '\'')
+    字�� = '"' ([^"\r\n\\] | '\\' .)* '"'
 
-Above, ``Block`` refers to ``Block`` in the Yul code grammar explained in the previous chapter.
+对于上�的 ``Block``，指的是�一章解释的Yul代�语法中的 ``Block``。
 
 .. note::
 
-    An object with a name that ends in ``_deployed`` is treated as deployed code by the Yul optimizer.
-    The only consequence of this is a different gas cost heuristic in the optimizer.
+    当一个对象的�称以 ``_deployed`` 结尾时，Yul 优化器将其视为部署的代�。
+    这样�的唯一�果是优化器中的�� gas �本���算法。
 
 .. note::
 
-    Data objects or sub-objects whose names contain a ``.`` can be defined
-    but it is not possible to access them through ``datasize``,
-    ``dataoffset`` or ``datacopy`` because ``.`` is used as a separator
-    to access objects inside another object.
+    �以定义�称中包� ``.`` 的数�对象或�对象，
+    但��能通过 ``datasize``， ``dataoffset`` 或 ``datacopy`` 访问它们，
+    因为 ``.`` 是作为分隔符用�访问�一个对象内的对象。
 
 .. note::
 
-    The data object called ``".metadata"`` has a special meaning:
-    It cannot be accessed from code and is always appended to the very end of the
-    bytecode, regardless of its position in the object.
+    被称为 ``".metadata"`` 的数�对象有特殊�义：
+    它�能从代�中访问，并且总是被附加到字节�的最末端，
+    无论它在对象中的�置如何。
 
-    Other data objects with special significance might be added in the
-    future, but their names will always start with a ``.``.
+    其他具有特殊�义的数�对象在未��能会被添加，
+    但它们的�字总是以 ``.`` 开头。
 
 
-An example Yul Object is shown below:
+下�是一个Yul对象的例�：
 
 .. code-block:: yul
 
-    // A contract consists of a single object with sub-objects representing
-    // the code to be deployed or other contracts it can create.
-    // The single "code" node is the executable code of the object.
-    // Every (other) named object or data section is serialized and
-    // made accessible to the special built-in functions datacopy / dataoffset / datasize
-    // The current object, sub-objects and data items inside the current object
-    // are in scope.
+    // 一个�约由一个�一的对象组�，
+    // 其�对象代表�部署的代�或它�以创建的其他�约。
+    // �个 “代�� 节点是该对象的�执行代�。
+    // �一个（其他）命�的对象或数�部分都被�列化，
+    // 并被特殊的内置函数 datacopy / dataoffset / datasize 所访问
+    // 当�对象��对象和当�对象内的数�项都在范围内。
     object "Contract1" {
-        // This is the constructor code of the contract.
+        // 这是�约的构造函数代�。
         code {
             function allocate(size) -> ptr {
                 ptr := mload(0x40)
-                // Note that Solidity generated IR code reserves memory offset ``0x60`` as well, but a pure Yul object is free to use memory as it chooses.
+                // 请注�，Solidity 生�的 IR 代�也�留了内存�移� ``0x60``，但一个纯 Yul 对象�以自由地使用内存。
                 if iszero(ptr) { ptr := 0x60 }
                 mstore(0x40, add(ptr, size))
             }
 
-            // first create "Contract2"
+            // 首先创建 “Contract2�
             let size := datasize("Contract2")
             let offset := allocate(size)
-            // This will turn into codecopy for EVM
+            // 这将转化为EVM的代�拷�。
             datacopy(offset, dataoffset("Contract2"), size)
-            // constructor parameter is a single number 0x1234
+            // 构造函数�数是一个�一的数字 0x1234
             mstore(add(offset, size), 0x1234)
             pop(create(0, offset, add(size, 32)))
 
-            // now return the runtime object (the currently
-            // executing code is the constructor code)
+            // 现在返回�行时对象
+            // 当�执行的代�是构造函数代�）。
             size := datasize("Contract1_deployed")
             offset := allocate(size)
+<<<<<<< HEAD
+            // 这将�� Ewasm 的 内存->内存 �制
+            // 和 EVM 的代��制。
+=======
             // This will turn into a codecopy for EVM
+>>>>>>> english/develop
             datacopy(offset, dataoffset("Contract1_deployed"), size)
             return(offset, size)
         }
@@ -1205,28 +1323,28 @@ An example Yul Object is shown below:
             code {
                 function allocate(size) -> ptr {
                     ptr := mload(0x40)
-                    // Note that Solidity generated IR code reserves memory offset ``0x60`` as well, but a pure Yul object is free to use memory as it chooses.
+                    // 请注�，Solidity 生�的 IR 代�也�留了内存�移� ``0x60``，但一个纯 Yul 对象�以自由地使用内存。
                     if iszero(ptr) { ptr := 0x60 }
                     mstore(0x40, add(ptr, size))
                 }
 
-                // runtime code
+                // �行时代�
 
                 mstore(0, "Hello, World!")
                 return(0, 0x20)
             }
         }
 
-        // Embedded object. Use case is that the outside is a factory contract,
-        // and Contract2 is the code to be created by the factory
+        // 嵌入对象。使用情况是，外�是一个工厂�约，
+        // 而 Contract2 是由工厂创建的代�。
         object "Contract2" {
             code {
-                // code here ...
+                // 此处是代� ...
             }
 
             object "Contract2_deployed" {
                 code {
-                    // code here ...
+                    // 此处是代� ...
                 }
             }
 
@@ -1234,55 +1352,56 @@ An example Yul Object is shown below:
         }
     }
 
-Yul Optimizer
+Yul 优化器
 =============
 
-The Yul optimizer operates on Yul code and uses the same language for input, output and
-intermediate states. This allows for easy debugging and verification of the optimizer.
+Yul优化器对Yul代�进行�作，并对输入�输出和中间状�使用相�的语言。这使得优化器的调试和验��得容易。
 
-Please refer to the general :ref:`optimizer documentation <optimizer>`
-for more details about the different optimization stages and how to use the optimizer.
+请�考一般的 :ref:`优化器文档 <optimizer>`，以了解关于��优化阶段和如何使用优化器的更多细节。
 
-If you want to use Solidity in stand-alone Yul mode, you activate the optimizer using ``--optimize``
-and optionally specify the :ref:`expected number of contract executions <optimizer-parameter-runs>` with
-``--optimize-runs``:
+如果您想在独立的Yul模�下使用Solidity，您�以用 ``--optimize`` 激活优化器，
+并�选择用 ``--optimize-runs`` 指定 :ref:`预期�约执行次数 <optimizer-parameter-runs>`：
 
 .. code-block:: sh
 
     solc --strict-assembly --optimize --optimize-runs 200
 
-In Solidity mode, the Yul optimizer is activated together with the regular optimizer.
+在Solidity模�下，Yul优化器与常规优化器一起被激活。
 
 .. _optimization-step-sequence:
 
-Optimization Step Sequence
+优化步骤顺�
 --------------------------
 
-Detailed information regrading the optimization sequence as well a list of abbreviations is
+<<<<<<< HEAD
+有关优化顺�的详细信�以�缩写列表�在 :ref:`优化器文档 <optimizer-steps>` 中找到。
+=======
+Detailed information regarding the optimization sequence as well as a list of abbreviations is
 available in the :ref:`optimizer docs <optimizer-steps>`.
+>>>>>>> english/develop
 
 .. _erc20yul:
 
-Complete ERC20 Example
-======================
+完整的ERC20示例（基于yul）
+==========================
 
 .. code-block:: yul
 
     object "Token" {
         code {
-            // Store the creator in slot zero.
+            // 将创建者存储在零�槽中。
             sstore(0, caller())
 
-            // Deploy the contract
+            // 部署�约
             datacopy(0, dataoffset("runtime"), datasize("runtime"))
             return(0, datasize("runtime"))
         }
         object "runtime" {
             code {
-                // Protection against sending Ether
+                // 防止��以太的�护措施
                 require(iszero(callvalue()))
 
-                // Dispatcher
+                // 调度器
                 switch selector()
                 case 0x70a08231 /* "balanceOf(address)" */ {
                     returnUint(balanceOf(decodeAsAddress(0)))
@@ -1341,7 +1460,7 @@ Complete ERC20 Example
                 }
 
 
-                /* ---------- calldata decoding functions ----------- */
+                /* ---------- calldata 解�函数 ----------- */
                 function selector() -> s {
                     s := div(calldataload(0), 0x100000000000000000000000000000000000000000000000000000000)
                 }
@@ -1359,7 +1478,7 @@ Complete ERC20 Example
                     }
                     v := calldataload(pos)
                 }
-                /* ---------- calldata encoding functions ---------- */
+                /* ---------- calldata 编�函数 ---------- */
                 function returnUint(v) {
                     mstore(0, v)
                     return(0, 0x20)
@@ -1368,7 +1487,7 @@ Complete ERC20 Example
                     returnUint(1)
                 }
 
-                /* -------- events ---------- */
+                /* -------- 事件 ---------- */
                 function emitTransfer(from, to, amount) {
                     let signatureHash := 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef
                     emitEvent(signatureHash, from, to, amount)
@@ -1382,7 +1501,7 @@ Complete ERC20 Example
                     log3(0, 0x20, signatureHash, indexed1, indexed2)
                 }
 
-                /* -------- storage layout ---------- */
+                /* -------- 存储布局 ---------- */
                 function ownerPos() -> p { p := 0 }
                 function totalSupplyPos() -> p { p := 1 }
                 function accountToStorageOffset(account) -> offset {
@@ -1395,7 +1514,7 @@ Complete ERC20 Example
                     offset := keccak256(0, 0x40)
                 }
 
-                /* -------- storage access ---------- */
+                /* -------- 存储访问 ---------- */
                 function owner() -> o {
                     o := sload(ownerPos())
                 }
@@ -1431,7 +1550,7 @@ Complete ERC20 Example
                     sstore(offset, sub(currentAllowance, amount))
                 }
 
-                /* ---------- utility functions ---------- */
+                /* ---------- 工具函数 ---------- */
                 function lte(a, b) -> r {
                     r := iszero(gt(a, b))
                 }
diff --git a/libevmasm/AbstractAssemblyStack.h b/libevmasm/AbstractAssemblyStack.h
deleted file mode 100644
index 6be78cbc7cac..000000000000
--- a/libevmasm/AbstractAssemblyStack.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libevmasm/LinkerObject.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/JSON.h>
-
-#include <string>
-#include <vector>
-
-namespace solidity::evmasm
-{
-
-class AbstractAssemblyStack
-{
-public:
-	virtual ~AbstractAssemblyStack() {}
-
-	virtual LinkerObject const& object(std::string const& _contractName) const = 0;
-	virtual LinkerObject const& runtimeObject(std::string const& _contractName) const = 0;
-
-	virtual std::string const* sourceMapping(std::string const& _contractName) const = 0;
-	virtual std::string const* runtimeSourceMapping(std::string const& _contractName) const = 0;
-
-	virtual Json::Value assemblyJSON(std::string const& _contractName) const = 0;
-	virtual std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const = 0;
-
-	virtual std::string const filesystemFriendlyName(std::string const& _contractName) const = 0;
-
-	virtual std::vector<std::string> contractNames() const = 0;
-	virtual std::vector<std::string> sourceNames() const = 0;
-
-	virtual bool compilationSuccessful() const = 0;
-};
-
-} // namespace solidity::evmasm
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
deleted file mode 100644
index b6e4d0006c57..000000000000
--- a/libevmasm/Assembly.cpp
+++ /dev/null
@@ -1,1182 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Assembly.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include <libevmasm/Assembly.h>
-
-#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmasm/ControlFlowGraph.h>
-#include <libevmasm/PeepholeOptimiser.h>
-#include <libevmasm/Inliner.h>
-#include <libevmasm/JumpdestRemover.h>
-#include <libevmasm/BlockDeduplicator.h>
-#include <libevmasm/ConstantOptimiser.h>
-#include <libevmasm/GasMeter.h>
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/JSON.h>
-#include <libsolutil/StringUtils.h>
-
-#include <fmt/format.h>
-
-#include <range/v3/algorithm/any_of.hpp>
-#include <range/v3/view/drop_exactly.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/map.hpp>
-
-#include <fstream>
-#include <limits>
-#include <iterator>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-using namespace solidity::util;
-
-std::map<std::string, std::shared_ptr<std::string const>> Assembly::s_sharedSourceNames;
-
-AssemblyItem const& Assembly::append(AssemblyItem _i)
-{
-	assertThrow(m_deposit >= 0, AssemblyException, "Stack underflow.");
-	m_deposit += static_cast<int>(_i.deposit());
-	m_items.emplace_back(std::move(_i));
-	if (!m_items.back().location().isValid() && m_currentSourceLocation.isValid())
-		m_items.back().setLocation(m_currentSourceLocation);
-	m_items.back().m_modifierDepth = m_currentModifierDepth;
-	return m_items.back();
-}
-
-unsigned Assembly::codeSize(unsigned subTagSize) const
-{
-	for (unsigned tagSize = subTagSize; true; ++tagSize)
-	{
-		size_t ret = 1;
-		for (auto const& i: m_data)
-			ret += i.second.size();
-
-		for (AssemblyItem const& i: m_items)
-			ret += i.bytesRequired(tagSize, Precision::Approximate);
-		if (numberEncodingSize(ret) <= tagSize)
-			return static_cast<unsigned>(ret);
-	}
-}
-
-void Assembly::importAssemblyItemsFromJSON(Json::Value const& _code, std::vector<std::string> const& _sourceList)
-{
-	solAssert(m_items.empty());
-	solRequire(_code.isArray(), AssemblyImportException, "Supplied JSON is not an array.");
-	for (auto jsonItemIter = std::begin(_code); jsonItemIter != std::end(_code); ++jsonItemIter)
-	{
-		AssemblyItem const& newItem = m_items.emplace_back(createAssemblyItemFromJSON(*jsonItemIter, _sourceList));
-		if (newItem == Instruction::JUMPDEST)
-			solThrow(AssemblyImportException, "JUMPDEST instruction without a tag");
-		else if (newItem.type() == AssemblyItemType::Tag)
-		{
-			++jsonItemIter;
-			if (jsonItemIter != std::end(_code) && createAssemblyItemFromJSON(*jsonItemIter, _sourceList) != Instruction::JUMPDEST)
-				solThrow(AssemblyImportException, "JUMPDEST expected after tag.");
-		}
-	}
-}
-
-AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList)
-{
-	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
-	static std::set<std::string> const validMembers{"name", "begin", "end", "source", "value", "modifierDepth", "jumpType"};
-	for (std::string const& member: _json.getMemberNames())
-		solRequire(
-			validMembers.count(member),
-			AssemblyImportException,
-			fmt::format(
-				"Unknown member '{}'. Valid members are: {}.",
-				member,
-				solidity::util::joinHumanReadable(validMembers, ", ")
-			)
-		);
-	solRequire(isOfType<std::string>(_json["name"]), AssemblyImportException, "Member 'name' missing or not of type string.");
-	solRequire(isOfTypeIfExists<int>(_json, "begin"), AssemblyImportException, "Optional member 'begin' not of type int.");
-	solRequire(isOfTypeIfExists<int>(_json, "end"), AssemblyImportException, "Optional member 'end' not of type int.");
-	solRequire(isOfTypeIfExists<int>(_json, "source"), AssemblyImportException, "Optional member 'source' not of type int.");
-	solRequire(isOfTypeIfExists<std::string>(_json, "value"), AssemblyImportException, "Optional member 'value' not of type string.");
-	solRequire(isOfTypeIfExists<int>(_json, "modifierDepth"), AssemblyImportException, "Optional member 'modifierDepth' not of type int.");
-	solRequire(isOfTypeIfExists<std::string>(_json, "jumpType"), AssemblyImportException, "Optional member 'jumpType' not of type string.");
-
-	std::string name = get<std::string>(_json["name"]);
-	solRequire(!name.empty(), AssemblyImportException, "Member 'name' is empty.");
-
-	SourceLocation location;
-	location.start = get<int>(_json["begin"]);
-	location.end = get<int>(_json["end"]);
-	int srcIndex = getOrDefault<int>(_json["source"], -1);
-	size_t modifierDepth = static_cast<size_t>(getOrDefault<int>(_json["modifierDepth"], 0));
-	std::string value = getOrDefault<std::string>(_json["value"], "");
-	std::string jumpType = getOrDefault<std::string>(_json["jumpType"], "");
-
-	auto updateUsedTags = [&](u256 const& data)
-	{
-		m_usedTags = std::max(m_usedTags, static_cast<unsigned>(data) + 1);
-		return data;
-	};
-
-	auto storeImmutableHash = [&](std::string const& _immutableName) -> h256
-	{
-		h256 hash(util::keccak256(_immutableName));
-		solAssert(m_immutables.count(hash) == 0 || m_immutables[hash] == _immutableName);
-		m_immutables[hash] = _immutableName;
-		return hash;
-	};
-
-	auto storeLibraryHash = [&](std::string const& _libraryName) -> h256
-	{
-		h256 hash(util::keccak256(_libraryName));
-		solAssert(m_libraries.count(hash) == 0 || m_libraries[hash] == _libraryName);
-		m_libraries[hash] = _libraryName;
-		return hash;
-	};
-
-	auto requireValueDefinedForInstruction = [&](std::string const& _name, std::string const& _value)
-	{
-		solRequire(
-			!_value.empty(),
-			AssemblyImportException,
-			"Member 'value' is missing for instruction '" + _name + "', but the instruction needs a value."
-		);
-	};
-
-	auto requireValueUndefinedForInstruction = [&](std::string const& _name, std::string const& _value)
-	{
-		solRequire(
-			_value.empty(),
-			AssemblyImportException,
-			"Member 'value' defined for instruction '" + _name + "', but the instruction does not need a value."
-		);
-	};
-
-	solRequire(srcIndex >= -1 && srcIndex < static_cast<int>(_sourceList.size()), AssemblyImportException, "Source index out of bounds.");
-	if (srcIndex != -1)
-		location.sourceName = sharedSourceName(_sourceList[static_cast<size_t>(srcIndex)]);
-
-	AssemblyItem result(0);
-
-	if (c_instructions.count(name))
-	{
-		AssemblyItem item{c_instructions.at(name), location};
-		if (!jumpType.empty())
-		{
-			if (item.instruction() == Instruction::JUMP || item.instruction() == Instruction::JUMPI)
-			{
-				std::optional<AssemblyItem::JumpType> parsedJumpType = AssemblyItem::parseJumpType(jumpType);
-				if (!parsedJumpType.has_value())
-					solThrow(AssemblyImportException, "Invalid jump type.");
-				item.setJumpType(parsedJumpType.value());
-			}
-			else
-				solThrow(
-					AssemblyImportException,
-					"Member 'jumpType' set on instruction different from JUMP or JUMPI (was set on instruction '" + name + "')"
-				);
-		}
-		requireValueUndefinedForInstruction(name, value);
-		result = item;
-	}
-	else
-	{
-		solRequire(
-			jumpType.empty(),
-			AssemblyImportException,
-			"Member 'jumpType' set on instruction different from JUMP or JUMPI (was set on instruction '" + name + "')"
-		);
-		if (name == "PUSH")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::Push, u256("0x" + value)};
-		}
-		else if (name == "PUSH [ErrorTag]")
-		{
-			requireValueUndefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushTag, 0};
-		}
-		else if (name == "PUSH [tag]")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushTag, updateUsedTags(u256(value))};
-		}
-		else if (name == "PUSH [$]")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushSub, u256("0x" + value)};
-		}
-		else if (name == "PUSH #[$]")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushSubSize, u256("0x" + value)};
-		}
-		else if (name == "PUSHSIZE")
-		{
-			requireValueUndefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushProgramSize, 0};
-		}
-		else if (name == "PUSHLIB")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushLibraryAddress, storeLibraryHash(value)};
-		}
-		else if (name == "PUSHDEPLOYADDRESS")
-		{
-			requireValueUndefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushDeployTimeAddress, 0};
-		}
-		else if (name == "PUSHIMMUTABLE")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushImmutable, storeImmutableHash(value)};
-		}
-		else if (name == "ASSIGNIMMUTABLE")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::AssignImmutable, storeImmutableHash(value)};
-		}
-		else if (name == "tag")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::Tag, updateUsedTags(u256(value))};
-		}
-		else if (name == "PUSH data")
-		{
-			requireValueDefinedForInstruction(name, value);
-			result = {AssemblyItemType::PushData, u256("0x" + value)};
-		}
-		else if (name == "VERBATIM")
-		{
-			requireValueDefinedForInstruction(name, value);
-			AssemblyItem item(fromHex(value), 0, 0);
-			result = item;
-		}
-		else
-			solThrow(InvalidOpcode, "Invalid opcode: " + name);
-	}
-	result.setLocation(location);
-	result.m_modifierDepth = modifierDepth;
-	return result;
-}
-
-namespace
-{
-
-std::string locationFromSources(StringMap const& _sourceCodes, SourceLocation const& _location)
-{
-	if (!_location.hasText() || _sourceCodes.empty())
-		return {};
-
-	auto it = _sourceCodes.find(*_location.sourceName);
-	if (it == _sourceCodes.end())
-		return {};
-
-	return CharStream::singleLineSnippet(it->second, _location);
-}
-
-class Functionalizer
-{
-public:
-	Functionalizer (std::ostream& _out, std::string const& _prefix, StringMap const& _sourceCodes, Assembly const& _assembly):
-		m_out(_out), m_prefix(_prefix), m_sourceCodes(_sourceCodes), m_assembly(_assembly)
-	{}
-
-	void feed(AssemblyItem const& _item, DebugInfoSelection const& _debugInfoSelection)
-	{
-		if (_item.location().isValid() && _item.location() != m_location)
-		{
-			flush();
-			m_location = _item.location();
-			printLocation(_debugInfoSelection);
-		}
-
-		std::string expression = _item.toAssemblyText(m_assembly);
-
-		if (!(
-			_item.canBeFunctional() &&
-			_item.returnValues() <= 1 &&
-			_item.arguments() <= m_pending.size()
-		))
-		{
-			flush();
-			m_out << m_prefix << (_item.type() == Tag ? "" : "  ") << expression << std::endl;
-			return;
-		}
-		if (_item.arguments() > 0)
-		{
-			expression += "(";
-			for (size_t i = 0; i < _item.arguments(); ++i)
-			{
-				expression += m_pending.back();
-				m_pending.pop_back();
-				if (i + 1 < _item.arguments())
-					expression += ", ";
-			}
-			expression += ")";
-		}
-
-		m_pending.push_back(expression);
-		if (_item.returnValues() != 1)
-			flush();
-	}
-
-	void flush()
-	{
-		for (std::string const& expression: m_pending)
-			m_out << m_prefix << "  " << expression << std::endl;
-		m_pending.clear();
-	}
-
-	void printLocation(DebugInfoSelection const& _debugInfoSelection)
-	{
-		if (!m_location.isValid() || (!_debugInfoSelection.location && !_debugInfoSelection.snippet))
-			return;
-
-		m_out << m_prefix << "    /*";
-
-		if (_debugInfoSelection.location)
-		{
-			if (m_location.sourceName)
-				m_out << " " + escapeAndQuoteString(*m_location.sourceName);
-			if (m_location.hasText())
-				m_out << ":" << std::to_string(m_location.start) + ":" + std::to_string(m_location.end);
-		}
-
-		if (_debugInfoSelection.snippet)
-		{
-			if (_debugInfoSelection.location)
-				m_out << "  ";
-
-			m_out << locationFromSources(m_sourceCodes, m_location);
-		}
-
-		m_out << " */" << std::endl;
-	}
-
-private:
-	strings m_pending;
-	SourceLocation m_location;
-
-	std::ostream& m_out;
-	std::string const& m_prefix;
-	StringMap const& m_sourceCodes;
-	Assembly const& m_assembly;
-};
-
-}
-
-void Assembly::assemblyStream(
-	std::ostream& _out,
-	DebugInfoSelection const& _debugInfoSelection,
-	std::string const& _prefix,
-	StringMap const& _sourceCodes
-) const
-{
-	Functionalizer f(_out, _prefix, _sourceCodes, *this);
-
-	for (auto const& i: m_items)
-		f.feed(i, _debugInfoSelection);
-	f.flush();
-
-	if (!m_data.empty() || !m_subs.empty())
-	{
-		_out << _prefix << "stop" << std::endl;
-		for (auto const& i: m_data)
-			if (u256(i.first) >= m_subs.size())
-				_out << _prefix << "data_" << toHex(u256(i.first)) << " " << util::toHex(i.second) << std::endl;
-
-		for (size_t i = 0; i < m_subs.size(); ++i)
-		{
-			_out << std::endl << _prefix << "sub_" << i << ": assembly {\n";
-			m_subs[i]->assemblyStream(_out, _debugInfoSelection, _prefix + "    ", _sourceCodes);
-			_out << _prefix << "}" << std::endl;
-		}
-	}
-
-	if (m_auxiliaryData.size() > 0)
-		_out << std::endl << _prefix << "auxdata: 0x" << util::toHex(m_auxiliaryData) << std::endl;
-}
-
-std::string Assembly::assemblyString(
-	DebugInfoSelection const& _debugInfoSelection,
-	StringMap const& _sourceCodes
-) const
-{
-	std::ostringstream tmp;
-	assemblyStream(tmp, _debugInfoSelection, "", _sourceCodes);
-	return tmp.str();
-}
-
-Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList) const
-{
-	Json::Value root;
-	root[".code"] = Json::arrayValue;
-	Json::Value& code = root[".code"];
-	for (AssemblyItem const& item: m_items)
-	{
-		int sourceIndex = -1;
-		if (item.location().sourceName)
-		{
-			auto iter = _sourceIndices.find(*item.location().sourceName);
-			if (iter != _sourceIndices.end())
-				sourceIndex = static_cast<int>(iter->second);
-		}
-
-		auto [name, data] = item.nameAndData(m_evmVersion);
-		Json::Value jsonItem;
-		jsonItem["name"] = name;
-		jsonItem["begin"] = item.location().start;
-		jsonItem["end"] = item.location().end;
-		if (item.m_modifierDepth != 0)
-			jsonItem["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
-		std::string jumpType = item.getJumpTypeAsString();
-		if (!jumpType.empty())
-			jsonItem["jumpType"] = jumpType;
-		if (name == "PUSHLIB")
-			data = m_libraries.at(h256(data));
-		else if (name == "PUSHIMMUTABLE" || name == "ASSIGNIMMUTABLE")
-			data = m_immutables.at(h256(data));
-		if (!data.empty())
-			jsonItem["value"] = data;
-		jsonItem["source"] = sourceIndex;
-		code.append(std::move(jsonItem));
-
-		if (item.type() == AssemblyItemType::Tag)
-		{
-			Json::Value jumpdest;
-			jumpdest["name"] = "JUMPDEST";
-			jumpdest["begin"] = item.location().start;
-			jumpdest["end"] = item.location().end;
-			jumpdest["source"] = sourceIndex;
-			if (item.m_modifierDepth != 0)
-				jumpdest["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
-			code.append(std::move(jumpdest));
-		}
-	}
-	if (_includeSourceList)
-	{
-		root["sourceList"] = Json::arrayValue;
-		Json::Value& jsonSourceList = root["sourceList"];
-		for (auto const& [name, index]: _sourceIndices)
-			jsonSourceList[index] = name;
-	}
-
-	if (!m_data.empty() || !m_subs.empty())
-	{
-		root[".data"] = Json::objectValue;
-		Json::Value& data = root[".data"];
-		for (auto const& i: m_data)
-			if (u256(i.first) >= m_subs.size())
-				data[util::toHex(toBigEndian((u256)i.first), util::HexPrefix::DontAdd, util::HexCase::Upper)] = util::toHex(i.second);
-
-		for (size_t i = 0; i < m_subs.size(); ++i)
-		{
-			std::stringstream hexStr;
-			hexStr << std::hex << i;
-			data[hexStr.str()] = m_subs[i]->assemblyJSON(_sourceIndices, /*_includeSourceList = */false);
-		}
-	}
-
-	if (!m_auxiliaryData.empty())
-		root[".auxdata"] = util::toHex(m_auxiliaryData);
-
-	return root;
-}
-
-std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(
-	Json::Value const& _json,
-	std::vector<std::string> const& _sourceList,
-	size_t _level
-)
-{
-	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
-	static std::set<std::string> const validMembers{".code", ".data", ".auxdata", "sourceList"};
-	for (std::string const& attribute: _json.getMemberNames())
-		solRequire(validMembers.count(attribute), AssemblyImportException, "Unknown attribute '" + attribute + "'.");
-
-	if (_level == 0)
-	{
-		if (_json.isMember("sourceList"))
-		{
-			solRequire(_json["sourceList"].isArray(), AssemblyImportException, "Optional member 'sourceList' is not an array.");
-			for (Json::Value const& sourceName: _json["sourceList"])
-				solRequire(sourceName.isString(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
-		}
-	}
-	else
-		solRequire(
-			!_json.isMember("sourceList"),
-			AssemblyImportException,
-			"Member 'sourceList' may only be present in the root JSON object."
-		);
-
-	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, "" /* _name */);
-	std::vector<std::string> parsedSourceList;
-	if (_json.isMember("sourceList"))
-	{
-		solAssert(_level == 0);
-		solAssert(_sourceList.empty());
-		for (Json::Value const& sourceName: _json["sourceList"])
-		{
-			solRequire(
-				std::find(parsedSourceList.begin(), parsedSourceList.end(), sourceName.asString()) == parsedSourceList.end(),
-				AssemblyImportException,
-				"Items in 'sourceList' array are not unique."
-			);
-			parsedSourceList.emplace_back(sourceName.asString());
-		}
-	}
-
-	solRequire(_json.isMember(".code"), AssemblyImportException, "Member '.code' is missing.");
-	solRequire(_json[".code"].isArray(), AssemblyImportException, "Member '.code' is not an array.");
-	for (Json::Value const& codeItem: _json[".code"])
-		solRequire(codeItem.isObject(), AssemblyImportException, "The '.code' array contains an item that is not an object.");
-
-	result->importAssemblyItemsFromJSON(_json[".code"], _level == 0 ? parsedSourceList : _sourceList);
-
-	if (_json[".auxdata"])
-	{
-		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
-		result->m_auxiliaryData = fromHex(_json[".auxdata"].asString());
-		solRequire(!result->m_auxiliaryData.empty(), AssemblyImportException, "Optional member '.auxdata' is not a valid hexadecimal string.");
-	}
-
-	if (_json.isMember(".data"))
-	{
-		solRequire(_json[".data"].isObject(), AssemblyImportException, "Optional member '.data' is not an object.");
-		Json::Value const& data = _json[".data"];
-		std::map<size_t, std::shared_ptr<Assembly>> subAssemblies;
-		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
-		{
-			solAssert(dataIter.key().isString());
-			std::string dataItemID = dataIter.key().asString();
-			Json::Value const& dataItem = data[dataItemID];
-			if (dataItem.isString())
-			{
-				solRequire(
-					dataItem.asString().empty() || !fromHex(dataItem.asString()).empty(),
-					AssemblyImportException,
-					"The value for key '" + dataItemID + "' inside '.data' is not a valid hexadecimal string."
-				);
-				result->m_data[h256(fromHex(dataItemID))] = fromHex(dataItem.asString());
-			}
-			else if (dataItem.isObject())
-			{
-				size_t index{};
-				try
-				{
-					// Using signed variant because stoul() still accepts negative numbers and
-					// just lets them wrap around.
-					int parsedDataItemID = std::stoi(dataItemID, nullptr, 16);
-					solRequire(parsedDataItemID >= 0, AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is out of the supported integer range.");
-					index = static_cast<size_t>(parsedDataItemID);
-				}
-				catch (std::invalid_argument const&)
-				{
-					solThrow(AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is not an integer.");
-				}
-				catch (std::out_of_range const&)
-				{
-					solThrow(AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is out of the supported integer range.");
-				}
-
-				auto [subAssembly, emptySourceList] = Assembly::fromJSON(dataItem, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
-				solAssert(subAssembly);
-				solAssert(emptySourceList.empty());
-				solAssert(subAssemblies.count(index) == 0);
-				subAssemblies[index] = subAssembly;
-			}
-			else
-				solThrow(AssemblyImportException, "The value of key '" + dataItemID + "' inside '.data' is neither a hex string nor an object.");
-		}
-
-		if (!subAssemblies.empty())
-			solRequire(
-				ranges::max(subAssemblies | ranges::views::keys) == subAssemblies.size() - 1,
-				AssemblyImportException,
-				fmt::format(
-					"Invalid subassembly indices in '.data'. Not all numbers between 0 and {} are present.",
-					subAssemblies.size() - 1
-				)
-			);
-
-		result->m_subs = subAssemblies | ranges::views::values | ranges::to<std::vector>;
-	}
-
-	if (_level == 0)
-		result->encodeAllPossibleSubPathsInAssemblyTree();
-
-	return std::make_pair(result, _level == 0 ? parsedSourceList : std::vector<std::string>{});
-}
-
-void Assembly::encodeAllPossibleSubPathsInAssemblyTree(std::vector<size_t> _pathFromRoot, std::vector<Assembly*> _assembliesOnPath)
-{
-	_assembliesOnPath.push_back(this);
-	for (_pathFromRoot.push_back(0); _pathFromRoot.back() < m_subs.size(); ++_pathFromRoot.back())
-	{
-		for (size_t distanceFromRoot = 0; distanceFromRoot < _assembliesOnPath.size(); ++distanceFromRoot)
-			_assembliesOnPath[distanceFromRoot]->encodeSubPath(
-				_pathFromRoot | ranges::views::drop_exactly(distanceFromRoot) | ranges::to<std::vector>
-			);
-
-		m_subs[_pathFromRoot.back()]->encodeAllPossibleSubPathsInAssemblyTree(_pathFromRoot, _assembliesOnPath);
-	}
-}
-
-std::shared_ptr<std::string const> Assembly::sharedSourceName(std::string const& _name) const
-{
-	if (s_sharedSourceNames.find(_name) == s_sharedSourceNames.end())
-		s_sharedSourceNames[_name] = std::make_shared<std::string>(_name);
-
-	return s_sharedSourceNames[_name];
-}
-
-AssemblyItem Assembly::namedTag(std::string const& _name, size_t _params, size_t _returns, std::optional<uint64_t> _sourceID)
-{
-	assertThrow(!_name.empty(), AssemblyException, "Empty named tag.");
-	if (m_namedTags.count(_name))
-	{
-		assertThrow(m_namedTags.at(_name).params == _params, AssemblyException, "");
-		assertThrow(m_namedTags.at(_name).returns == _returns, AssemblyException, "");
-		assertThrow(m_namedTags.at(_name).sourceID == _sourceID, AssemblyException, "");
-	}
-	else
-		m_namedTags[_name] = {static_cast<size_t>(newTag().data()), _sourceID, _params, _returns};
-	return AssemblyItem{Tag, m_namedTags.at(_name).id};
-}
-
-AssemblyItem Assembly::newPushLibraryAddress(std::string const& _identifier)
-{
-	h256 h(util::keccak256(_identifier));
-	m_libraries[h] = _identifier;
-	return AssemblyItem{PushLibraryAddress, h};
-}
-
-AssemblyItem Assembly::newPushImmutable(std::string const& _identifier)
-{
-	h256 h(util::keccak256(_identifier));
-	m_immutables[h] = _identifier;
-	return AssemblyItem{PushImmutable, h};
-}
-
-AssemblyItem Assembly::newImmutableAssignment(std::string const& _identifier)
-{
-	h256 h(util::keccak256(_identifier));
-	m_immutables[h] = _identifier;
-	return AssemblyItem{AssignImmutable, h};
-}
-
-Assembly& Assembly::optimise(OptimiserSettings const& _settings)
-{
-	optimiseInternal(_settings, {});
-	return *this;
-}
-
-std::map<u256, u256> const& Assembly::optimiseInternal(
-	OptimiserSettings const& _settings,
-	std::set<size_t> _tagsReferencedFromOutside
-)
-{
-	if (m_tagReplacements)
-		return *m_tagReplacements;
-
-	// Run optimisation for sub-assemblies.
-	for (size_t subId = 0; subId < m_subs.size(); ++subId)
-	{
-		OptimiserSettings settings = _settings;
-		Assembly& sub = *m_subs[subId];
-		std::map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
-			settings,
-			JumpdestRemover::referencedTags(m_items, subId)
-		);
-		// Apply the replacements (can be empty).
-		BlockDeduplicator::applyTagReplacement(m_items, subTagReplacements, subId);
-	}
-
-	std::map<u256, u256> tagReplacements;
-	// Iterate until no new optimisation possibilities are found.
-	for (unsigned count = 1; count > 0;)
-	{
-		count = 0;
-
-		if (_settings.runInliner)
-			Inliner{
-				m_items,
-				_tagsReferencedFromOutside,
-				_settings.expectedExecutionsPerDeployment,
-				isCreation(),
-				_settings.evmVersion
-			}.optimise();
-
-		if (_settings.runJumpdestRemover)
-		{
-			JumpdestRemover jumpdestOpt{m_items};
-			if (jumpdestOpt.optimise(_tagsReferencedFromOutside))
-				count++;
-		}
-
-		if (_settings.runPeephole)
-		{
-			PeepholeOptimiser peepOpt{m_items};
-			while (peepOpt.optimise())
-			{
-				count++;
-				assertThrow(count < 64000, OptimizerException, "Peephole optimizer seems to be stuck.");
-			}
-		}
-
-		// This only modifies PushTags, we have to run again to actually remove code.
-		if (_settings.runDeduplicate)
-		{
-			BlockDeduplicator deduplicator{m_items};
-			if (deduplicator.deduplicate())
-			{
-				for (auto const& replacement: deduplicator.replacedTags())
-				{
-					assertThrow(
-						replacement.first <= std::numeric_limits<size_t>::max() && replacement.second <= std::numeric_limits<size_t>::max(),
-						OptimizerException,
-						"Invalid tag replacement."
-					);
-					assertThrow(
-						!tagReplacements.count(replacement.first),
-						OptimizerException,
-						"Replacement already known."
-					);
-					tagReplacements[replacement.first] = replacement.second;
-					if (_tagsReferencedFromOutside.erase(static_cast<size_t>(replacement.first)))
-						_tagsReferencedFromOutside.insert(static_cast<size_t>(replacement.second));
-				}
-				count++;
-			}
-		}
-
-		if (_settings.runCSE)
-		{
-			// Control flow graph optimization has been here before but is disabled because it
-			// assumes we only jump to tags that are pushed. This is not the case anymore with
-			// function types that can be stored in storage.
-			AssemblyItems optimisedItems;
-
-			bool usesMSize = ranges::any_of(m_items, [](AssemblyItem const& _i) {
-				return _i == AssemblyItem{Instruction::MSIZE} || _i.type() == VerbatimBytecode;
-			});
-
-			auto iter = m_items.begin();
-			while (iter != m_items.end())
-			{
-				KnownState emptyState;
-				CommonSubexpressionEliminator eliminator{emptyState};
-				auto orig = iter;
-				iter = eliminator.feedItems(iter, m_items.end(), usesMSize);
-				bool shouldReplace = false;
-				AssemblyItems optimisedChunk;
-				try
-				{
-					optimisedChunk = eliminator.getOptimizedItems();
-					shouldReplace = (optimisedChunk.size() < static_cast<size_t>(iter - orig));
-				}
-				catch (StackTooDeepException const&)
-				{
-					// This might happen if the opcode reconstruction is not as efficient
-					// as the hand-crafted code.
-				}
-				catch (ItemNotAvailableException const&)
-				{
-					// This might happen if e.g. associativity and commutativity rules
-					// reorganise the expression tree, but not all leaves are available.
-				}
-
-				if (shouldReplace)
-				{
-					count++;
-					optimisedItems += optimisedChunk;
-				}
-				else
-					copy(orig, iter, back_inserter(optimisedItems));
-			}
-			if (optimisedItems.size() < m_items.size())
-			{
-				m_items = std::move(optimisedItems);
-				count++;
-			}
-		}
-	}
-
-	if (_settings.runConstantOptimiser)
-		ConstantOptimisationMethod::optimiseConstants(
-			isCreation(),
-			isCreation() ? 1 : _settings.expectedExecutionsPerDeployment,
-			_settings.evmVersion,
-			*this
-		);
-
-	m_tagReplacements = std::move(tagReplacements);
-	return *m_tagReplacements;
-}
-
-LinkerObject const& Assembly::assemble() const
-{
-	assertThrow(!m_invalid, AssemblyException, "Attempted to assemble invalid Assembly object.");
-	// Return the already assembled object, if present.
-	if (!m_assembledObject.bytecode.empty())
-		return m_assembledObject;
-	// Otherwise ensure the object is actually clear.
-	assertThrow(m_assembledObject.linkReferences.empty(), AssemblyException, "Unexpected link references.");
-
-	LinkerObject& ret = m_assembledObject;
-
-	size_t subTagSize = 1;
-	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferencesBySub;
-	for (auto const& sub: m_subs)
-	{
-		auto const& linkerObject = sub->assemble();
-		if (!linkerObject.immutableReferences.empty())
-		{
-			assertThrow(
-				immutableReferencesBySub.empty(),
-				AssemblyException,
-				"More than one sub-assembly references immutables."
-			);
-			immutableReferencesBySub = linkerObject.immutableReferences;
-		}
-		for (size_t tagPos: sub->m_tagPositionsInBytecode)
-			if (tagPos != std::numeric_limits<size_t>::max() && tagPos > subTagSize)
-				subTagSize = tagPos;
-	}
-
-	bool setsImmutables = false;
-	bool pushesImmutables = false;
-
-	for (auto const& i: m_items)
-		if (i.type() == AssignImmutable)
-		{
-			i.setImmutableOccurrences(immutableReferencesBySub[i.data()].second.size());
-			setsImmutables = true;
-		}
-		else if (i.type() == PushImmutable)
-			pushesImmutables = true;
-	if (setsImmutables || pushesImmutables)
-		assertThrow(
-			setsImmutables != pushesImmutables,
-			AssemblyException,
-			"Cannot push and assign immutables in the same assembly subroutine."
-		);
-
-	unsigned bytesRequiredForCode = codeSize(static_cast<unsigned>(subTagSize));
-	m_tagPositionsInBytecode = std::vector<size_t>(m_usedTags, std::numeric_limits<size_t>::max());
-	std::map<size_t, std::pair<size_t, size_t>> tagRef;
-	std::multimap<h256, unsigned> dataRef;
-	std::multimap<size_t, size_t> subRef;
-	std::vector<unsigned> sizeRef; ///< Pointers to code locations where the size of the program is inserted
-	unsigned bytesPerTag = numberEncodingSize(bytesRequiredForCode);
-	uint8_t tagPush = static_cast<uint8_t>(pushInstruction(bytesPerTag));
-
-	unsigned bytesRequiredIncludingData = bytesRequiredForCode + 1 + static_cast<unsigned>(m_auxiliaryData.size());
-	for (auto const& sub: m_subs)
-		bytesRequiredIncludingData += static_cast<unsigned>(sub->assemble().bytecode.size());
-
-	unsigned bytesPerDataRef = numberEncodingSize(bytesRequiredIncludingData);
-	uint8_t dataRefPush = static_cast<uint8_t>(pushInstruction(bytesPerDataRef));
-	ret.bytecode.reserve(bytesRequiredIncludingData);
-
-	for (AssemblyItem const& i: m_items)
-	{
-		// store position of the invalid jump destination
-		if (i.type() != Tag && m_tagPositionsInBytecode[0] == std::numeric_limits<size_t>::max())
-			m_tagPositionsInBytecode[0] = ret.bytecode.size();
-
-		switch (i.type())
-		{
-		case Operation:
-			ret.bytecode.push_back(static_cast<uint8_t>(i.instruction()));
-			break;
-		case Push:
-		{
-			unsigned b = numberEncodingSize(i.data());
-			if (b == 0 && !m_evmVersion.hasPush0())
-			{
-				b = 1;
-			}
-			ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(b)));
-			if (b > 0)
-			{
-				ret.bytecode.resize(ret.bytecode.size() + b);
-				bytesRef byr(&ret.bytecode.back() + 1 - b, b);
-				toBigEndian(i.data(), byr);
-			}
-			break;
-		}
-		case PushTag:
-		{
-			ret.bytecode.push_back(tagPush);
-			tagRef[ret.bytecode.size()] = i.splitForeignPushTag();
-			ret.bytecode.resize(ret.bytecode.size() + bytesPerTag);
-			break;
-		}
-		case PushData:
-			ret.bytecode.push_back(dataRefPush);
-			dataRef.insert(std::make_pair(h256(i.data()), ret.bytecode.size()));
-			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
-			break;
-		case PushSub:
-			assertThrow(i.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
-			ret.bytecode.push_back(dataRefPush);
-			subRef.insert(std::make_pair(static_cast<size_t>(i.data()), ret.bytecode.size()));
-			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
-			break;
-		case PushSubSize:
-		{
-			assertThrow(i.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
-			auto s = subAssemblyById(static_cast<size_t>(i.data()))->assemble().bytecode.size();
-			i.setPushedValue(u256(s));
-			unsigned b = std::max<unsigned>(1, numberEncodingSize(s));
-			ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(b)));
-			ret.bytecode.resize(ret.bytecode.size() + b);
-			bytesRef byr(&ret.bytecode.back() + 1 - b, b);
-			toBigEndian(s, byr);
-			break;
-		}
-		case PushProgramSize:
-		{
-			ret.bytecode.push_back(dataRefPush);
-			sizeRef.push_back(static_cast<unsigned>(ret.bytecode.size()));
-			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
-			break;
-		}
-		case PushLibraryAddress:
-			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-			ret.linkReferences[ret.bytecode.size()] = m_libraries.at(i.data());
-			ret.bytecode.resize(ret.bytecode.size() + 20);
-			break;
-		case PushImmutable:
-			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH32));
-			// Maps keccak back to the "identifier" std::string of that immutable.
-			ret.immutableReferences[i.data()].first = m_immutables.at(i.data());
-			// Record the bytecode offset of the PUSH32 argument.
-			ret.immutableReferences[i.data()].second.emplace_back(ret.bytecode.size());
-			// Advance bytecode by 32 bytes (default initialized).
-			ret.bytecode.resize(ret.bytecode.size() + 32);
-			break;
-		case VerbatimBytecode:
-			ret.bytecode += i.verbatimData();
-			break;
-		case AssignImmutable:
-		{
-			// Expect 2 elements on stack (source, dest_base)
-			auto const& offsets = immutableReferencesBySub[i.data()].second;
-			for (size_t i = 0; i < offsets.size(); ++i)
-			{
-				if (i != offsets.size() - 1)
-				{
-					ret.bytecode.push_back(uint8_t(Instruction::DUP2));
-					ret.bytecode.push_back(uint8_t(Instruction::DUP2));
-				}
-				// TODO: should we make use of the constant optimizer methods for pushing the offsets?
-				bytes offsetBytes = toCompactBigEndian(u256(offsets[i]));
-				ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(static_cast<unsigned>(offsetBytes.size()))));
-				ret.bytecode += offsetBytes;
-				ret.bytecode.push_back(uint8_t(Instruction::ADD));
-				ret.bytecode.push_back(uint8_t(Instruction::MSTORE));
-			}
-			if (offsets.empty())
-			{
-				ret.bytecode.push_back(uint8_t(Instruction::POP));
-				ret.bytecode.push_back(uint8_t(Instruction::POP));
-			}
-			immutableReferencesBySub.erase(i.data());
-			break;
-		}
-		case PushDeployTimeAddress:
-			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-			ret.bytecode.resize(ret.bytecode.size() + 20);
-			break;
-		case Tag:
-		{
-			assertThrow(i.data() != 0, AssemblyException, "Invalid tag position.");
-			assertThrow(i.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
-			size_t tagId = static_cast<size_t>(i.data());
-			assertThrow(ret.bytecode.size() < 0xffffffffL, AssemblyException, "Tag too large.");
-			assertThrow(m_tagPositionsInBytecode[tagId] == std::numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
-			m_tagPositionsInBytecode[tagId] = ret.bytecode.size();
-			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::JUMPDEST));
-			break;
-		}
-		default:
-			assertThrow(false, InvalidOpcode, "Unexpected opcode while assembling.");
-		}
-	}
-
-	if (!immutableReferencesBySub.empty())
-		throw
-			langutil::Error(
-				1284_error,
-				langutil::Error::Type::CodeGenerationError,
-				"Some immutables were read from but never assigned, possibly because of optimization."
-			);
-
-	if (!m_subs.empty() || !m_data.empty() || !m_auxiliaryData.empty())
-		// Append an INVALID here to help tests find miscompilation.
-		ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
-
-	std::map<LinkerObject, size_t> subAssemblyOffsets;
-	for (auto const& [subIdPath, bytecodeOffset]: subRef)
-	{
-		LinkerObject subObject = subAssemblyById(subIdPath)->assemble();
-		bytesRef r(ret.bytecode.data() + bytecodeOffset, bytesPerDataRef);
-
-		// In order for de-duplication to kick in, not only must the bytecode be identical, but
-		// link and immutables references as well.
-		if (size_t* subAssemblyOffset = util::valueOrNullptr(subAssemblyOffsets, subObject))
-			toBigEndian(*subAssemblyOffset, r);
-		else
-		{
-			toBigEndian(ret.bytecode.size(), r);
-			subAssemblyOffsets[subObject] = ret.bytecode.size();
-			ret.bytecode += subObject.bytecode;
-		}
-		for (auto const& ref: subObject.linkReferences)
-			ret.linkReferences[ref.first + subAssemblyOffsets[subObject]] = ref.second;
-	}
-	for (auto const& i: tagRef)
-	{
-		size_t subId;
-		size_t tagId;
-		std::tie(subId, tagId) = i.second;
-		assertThrow(subId == std::numeric_limits<size_t>::max() || subId < m_subs.size(), AssemblyException, "Invalid sub id");
-		std::vector<size_t> const& tagPositions =
-			subId == std::numeric_limits<size_t>::max() ?
-			m_tagPositionsInBytecode :
-			m_subs[subId]->m_tagPositionsInBytecode;
-		assertThrow(tagId < tagPositions.size(), AssemblyException, "Reference to non-existing tag.");
-		size_t pos = tagPositions[tagId];
-		assertThrow(pos != std::numeric_limits<size_t>::max(), AssemblyException, "Reference to tag without position.");
-		assertThrow(numberEncodingSize(pos) <= bytesPerTag, AssemblyException, "Tag too large for reserved space.");
-		bytesRef r(ret.bytecode.data() + i.first, bytesPerTag);
-		toBigEndian(pos, r);
-	}
-	for (auto const& [name, tagInfo]: m_namedTags)
-	{
-		size_t position = m_tagPositionsInBytecode.at(tagInfo.id);
-		std::optional<size_t> tagIndex;
-		for (auto&& [index, item]: m_items | ranges::views::enumerate)
-			if (item.type() == Tag && static_cast<size_t>(item.data()) == tagInfo.id)
-			{
-				tagIndex = index;
-				break;
-			}
-		ret.functionDebugData[name] = {
-			position == std::numeric_limits<size_t>::max() ? std::nullopt : std::optional<size_t>{position},
-			tagIndex,
-			tagInfo.sourceID,
-			tagInfo.params,
-			tagInfo.returns
-		};
-	}
-
-	for (auto const& dataItem: m_data)
-	{
-		auto references = dataRef.equal_range(dataItem.first);
-		if (references.first == references.second)
-			continue;
-		for (auto ref = references.first; ref != references.second; ++ref)
-		{
-			bytesRef r(ret.bytecode.data() + ref->second, bytesPerDataRef);
-			toBigEndian(ret.bytecode.size(), r);
-		}
-		ret.bytecode += dataItem.second;
-	}
-
-	ret.bytecode += m_auxiliaryData;
-
-	for (unsigned pos: sizeRef)
-	{
-		bytesRef r(ret.bytecode.data() + pos, bytesPerDataRef);
-		toBigEndian(ret.bytecode.size(), r);
-	}
-	return ret;
-}
-
-std::vector<size_t> Assembly::decodeSubPath(size_t _subObjectId) const
-{
-	if (_subObjectId < m_subs.size())
-		return {_subObjectId};
-
-	auto subIdPathIt = find_if(
-		m_subPaths.begin(),
-		m_subPaths.end(),
-		[_subObjectId](auto const& subId) { return subId.second == _subObjectId; }
-	);
-
-	assertThrow(subIdPathIt != m_subPaths.end(), AssemblyException, "");
-	return subIdPathIt->first;
-}
-
-size_t Assembly::encodeSubPath(std::vector<size_t> const& _subPath)
-{
-	assertThrow(!_subPath.empty(), AssemblyException, "");
-	if (_subPath.size() == 1)
-	{
-		assertThrow(_subPath[0] < m_subs.size(), AssemblyException, "");
-		return _subPath[0];
-	}
-
-	if (m_subPaths.find(_subPath) == m_subPaths.end())
-	{
-		size_t objectId = std::numeric_limits<size_t>::max() - m_subPaths.size();
-		assertThrow(objectId >= m_subs.size(), AssemblyException, "");
-		m_subPaths[_subPath] = objectId;
-	}
-
-	return m_subPaths[_subPath];
-}
-
-Assembly const* Assembly::subAssemblyById(size_t _subId) const
-{
-	std::vector<size_t> subIds = decodeSubPath(_subId);
-	Assembly const* currentAssembly = this;
-	for (size_t currentSubId: subIds)
-	{
-		currentAssembly = currentAssembly->m_subs.at(currentSubId).get();
-		assertThrow(currentAssembly, AssemblyException, "");
-	}
-
-	assertThrow(currentAssembly != this, AssemblyException, "");
-	return currentAssembly;
-}
-
-Assembly::OptimiserSettings Assembly::OptimiserSettings::translateSettings(frontend::OptimiserSettings const& _settings, langutil::EVMVersion const& _evmVersion)
-{
-	// Constructing it this way so that we notice changes in the fields.
-	evmasm::Assembly::OptimiserSettings asmSettings{false,  false, false, false, false, false, _evmVersion, 0};
-	asmSettings.runInliner = _settings.runInliner;
-	asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
-	asmSettings.runPeephole = _settings.runPeephole;
-	asmSettings.runDeduplicate = _settings.runDeduplicate;
-	asmSettings.runCSE = _settings.runCSE;
-	asmSettings.runConstantOptimiser = _settings.runConstantOptimiser;
-	asmSettings.expectedExecutionsPerDeployment = _settings.expectedExecutionsPerDeployment;
-	asmSettings.evmVersion = _evmVersion;
-	return asmSettings;
-}
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
deleted file mode 100644
index 6e900282569b..000000000000
--- a/libevmasm/Assembly.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libevmasm/Instruction.h>
-#include <liblangutil/SourceLocation.h>
-#include <libevmasm/AssemblyItem.h>
-#include <libevmasm/LinkerObject.h>
-#include <libevmasm/Exceptions.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Assertions.h>
-#include <libsolutil/Keccak256.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <json/json.h>
-
-#include <iostream>
-#include <sstream>
-#include <memory>
-#include <map>
-#include <utility>
-
-namespace solidity::evmasm
-{
-
-using AssemblyPointer = std::shared_ptr<Assembly>;
-
-class Assembly
-{
-public:
-	Assembly(langutil::EVMVersion _evmVersion, bool _creation, std::string _name): m_evmVersion(_evmVersion), m_creation(_creation), m_name(std::move(_name)) { }
-
-	AssemblyItem newTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(Tag, m_usedTags++); }
-	AssemblyItem newPushTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(PushTag, m_usedTags++); }
-	/// Returns a tag identified by the given name. Creates it if it does not yet exist.
-	AssemblyItem namedTag(std::string const& _name, size_t _params, size_t _returns, std::optional<uint64_t> _sourceID);
-	AssemblyItem newData(bytes const& _data) { util::h256 h(util::keccak256(util::asString(_data))); m_data[h] = _data; return AssemblyItem(PushData, h); }
-	bytes const& data(util::h256 const& _i) const { return m_data.at(_i); }
-	AssemblyItem newSub(AssemblyPointer const& _sub) { m_subs.push_back(_sub); return AssemblyItem(PushSub, m_subs.size() - 1); }
-	Assembly const& sub(size_t _sub) const { return *m_subs.at(_sub); }
-	Assembly& sub(size_t _sub) { return *m_subs.at(_sub); }
-	size_t numSubs() const { return m_subs.size(); }
-	AssemblyItem newPushSubSize(u256 const& _subId) { return AssemblyItem(PushSubSize, _subId); }
-	AssemblyItem newPushLibraryAddress(std::string const& _identifier);
-	AssemblyItem newPushImmutable(std::string const& _identifier);
-	AssemblyItem newImmutableAssignment(std::string const& _identifier);
-
-	AssemblyItem const& append(AssemblyItem _i);
-	AssemblyItem const& append(bytes const& _data) { return append(newData(_data)); }
-
-	template <class T> Assembly& operator<<(T const& _d) { append(_d); return *this; }
-
-	/// Pushes the final size of the current assembly itself. Use this when the code is modified
-	/// after compilation and CODESIZE is not an option.
-	void appendProgramSize() { append(AssemblyItem(PushProgramSize)); }
-	void appendLibraryAddress(std::string const& _identifier) { append(newPushLibraryAddress(_identifier)); }
-	void appendImmutable(std::string const& _identifier) { append(newPushImmutable(_identifier)); }
-	void appendImmutableAssignment(std::string const& _identifier) { append(newImmutableAssignment(_identifier)); }
-
-	void appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables)
-	{
-		append(AssemblyItem(std::move(_data), _arguments, _returnVariables));
-	}
-
-	AssemblyItem appendJump() { auto ret = append(newPushTag()); append(Instruction::JUMP); return ret; }
-	AssemblyItem appendJumpI() { auto ret = append(newPushTag()); append(Instruction::JUMPI); return ret; }
-	AssemblyItem appendJump(AssemblyItem const& _tag) { auto ret = append(_tag.pushTag()); append(Instruction::JUMP); return ret; }
-	AssemblyItem appendJumpI(AssemblyItem const& _tag) { auto ret = append(_tag.pushTag()); append(Instruction::JUMPI); return ret; }
-
-	/// Adds a subroutine to the code (in the data section) and pushes its size (via a tag)
-	/// on the stack. @returns the pushsub assembly item.
-	AssemblyItem appendSubroutine(AssemblyPointer const& _assembly) { auto sub = newSub(_assembly); append(newPushSubSize(size_t(sub.data()))); return sub; }
-	void pushSubroutineSize(size_t _subRoutine) { append(newPushSubSize(_subRoutine)); }
-	/// Pushes the offset of the subroutine.
-	void pushSubroutineOffset(size_t _subRoutine) { append(AssemblyItem(PushSub, _subRoutine)); }
-
-	/// Appends @a _data literally to the very end of the bytecode.
-	void appendToAuxiliaryData(bytes const& _data) { m_auxiliaryData += _data; }
-
-	/// Returns the assembly items.
-	AssemblyItems const& items() const { return m_items; }
-
-	/// Returns the mutable assembly items. Use with care!
-	AssemblyItems& items() { return m_items; }
-
-	int deposit() const { return m_deposit; }
-	void adjustDeposit(int _adjustment) { m_deposit += _adjustment; assertThrow(m_deposit >= 0, InvalidDeposit, ""); }
-	void setDeposit(int _deposit) { m_deposit = _deposit; assertThrow(m_deposit >= 0, InvalidDeposit, ""); }
-	std::string const& name() const { return m_name; }
-
-	/// Changes the source location used for each appended item.
-	void setSourceLocation(langutil::SourceLocation const& _location) { m_currentSourceLocation = _location; }
-	langutil::SourceLocation const& currentSourceLocation() const { return m_currentSourceLocation; }
-	langutil::EVMVersion const& evmVersion() const { return m_evmVersion; }
-
-	/// Assembles the assembly into bytecode. The assembly should not be modified after this call, since the assembled version is cached.
-	LinkerObject const& assemble() const;
-
-	struct OptimiserSettings
-	{
-		bool runInliner = false;
-		bool runJumpdestRemover = false;
-		bool runPeephole = false;
-		bool runDeduplicate = false;
-		bool runCSE = false;
-		bool runConstantOptimiser = false;
-		langutil::EVMVersion evmVersion;
-		/// This specifies an estimate on how often each opcode in this assembly will be executed,
-		/// i.e. use a small value to optimise for size and a large value to optimise for runtime gas usage.
-		size_t expectedExecutionsPerDeployment = frontend::OptimiserSettings{}.expectedExecutionsPerDeployment;
-
-		static OptimiserSettings translateSettings(frontend::OptimiserSettings const& _settings, langutil::EVMVersion const& _evmVersion);
-	};
-
-	/// Modify and return the current assembly such that creation and execution gas usage
-	/// is optimised according to the settings in @a _settings.
-	Assembly& optimise(OptimiserSettings const& _settings);
-
-	/// Create a text representation of the assembly.
-	std::string assemblyString(
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		StringMap const& _sourceCodes = StringMap()
-	) const;
-	void assemblyStream(
-		std::ostream& _out,
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		std::string const& _prefix = "",
-		StringMap const& _sourceCodes = StringMap()
-	) const;
-
-	/// Create a JSON representation of the assembly.
-	Json::Value assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList = true) const;
-
-	/// Constructs an @a Assembly from the serialized JSON representation.
-	/// @param _json JSON object containing assembly in the format produced by assemblyJSON().
-	/// @param _sourceList List of source files the assembly was built from. When the JSON represents
-	///     the root assembly, the function will read it from the 'sourceList' field and the parameter
-	///     must be empty. It is only used to pass the list down to recursive calls.
-	/// @param _level Nesting level of the current assembly in the assembly tree. The root is
-	///     at level 0 and the value increases down the tree. Necessary to distinguish between creation
-	///     and deployed objects.
-	/// @returns Created @a Assembly and the source list read from the 'sourceList' field of the root
-	///     assembly or an empty list (in recursive calls).
-	static std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> fromJSON(
-		Json::Value const& _json,
-		std::vector<std::string> const& _sourceList = {},
-		size_t _level = 0
-	);
-
-	/// Mark this assembly as invalid. Calling ``assemble`` on it will throw.
-	void markAsInvalid() { m_invalid = true; }
-
-	std::vector<size_t> decodeSubPath(size_t _subObjectId) const;
-	size_t encodeSubPath(std::vector<size_t> const& _subPath);
-
-	bool isCreation() const { return m_creation; }
-
-protected:
-	/// Does the same operations as @a optimise, but should only be applied to a sub and
-	/// returns the replaced tags. Also takes an argument containing the tags of this assembly
-	/// that are referenced in a super-assembly.
-	std::map<u256, u256> const& optimiseInternal(OptimiserSettings const& _settings, std::set<size_t> _tagsReferencedFromOutside);
-
-	unsigned codeSize(unsigned subTagSize) const;
-
-	/// Add all assembly items from given JSON array. This function imports the items by iterating through
-	/// the code array. This method only works on clean Assembly objects that don't have any items defined yet.
-	/// @param _json JSON array that contains assembly items (e.g. json['.code'])
-	/// @param _sourceList List of source names.
-	void importAssemblyItemsFromJSON(Json::Value const& _code, std::vector<std::string> const& _sourceList);
-
-	/// Creates an AssemblyItem from a given JSON representation.
-	/// @param _json JSON object that consists a single assembly item
-	/// @param _sourceList List of source names.
-	/// @returns AssemblyItem of _json argument.
-	AssemblyItem createAssemblyItemFromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList);
-
-private:
-	bool m_invalid = false;
-
-	Assembly const* subAssemblyById(size_t _subId) const;
-
-	void encodeAllPossibleSubPathsInAssemblyTree(std::vector<size_t> _pathFromRoot = {}, std::vector<Assembly*> _assembliesOnPath = {});
-
-	std::shared_ptr<std::string const> sharedSourceName(std::string const& _name) const;
-
-protected:
-	/// 0 is reserved for exception
-	unsigned m_usedTags = 1;
-
-	struct NamedTagInfo
-	{
-		size_t id;
-		std::optional<size_t> sourceID;
-		size_t params;
-		size_t returns;
-	};
-
-	std::map<std::string, NamedTagInfo> m_namedTags;
-	AssemblyItems m_items;
-	std::map<util::h256, bytes> m_data;
-	/// Data that is appended to the very end of the contract.
-	bytes m_auxiliaryData;
-	std::vector<std::shared_ptr<Assembly>> m_subs;
-	std::map<util::h256, std::string> m_strings;
-	std::map<util::h256, std::string> m_libraries; ///< Identifiers of libraries to be linked.
-	std::map<util::h256, std::string> m_immutables; ///< Identifiers of immutables.
-
-	/// Map from a vector representing a path to a particular sub assembly to sub assembly id.
-	/// This map is used only for sub-assemblies which are not direct sub-assemblies (where path is having more than one value).
-	std::map<std::vector<size_t>, size_t> m_subPaths;
-
-	/// Contains the tag replacements relevant for super-assemblies.
-	/// If set, it means the optimizer has run and we will not run it again.
-	std::optional<std::map<u256, u256>> m_tagReplacements;
-
-	mutable LinkerObject m_assembledObject;
-	mutable std::vector<size_t> m_tagPositionsInBytecode;
-
-	langutil::EVMVersion m_evmVersion;
-
-	int m_deposit = 0;
-	/// True, if the assembly contains contract creation code.
-	bool const m_creation = false;
-	/// Internal name of the assembly object, only used with the Yul backend
-	/// currently
-	std::string m_name;
-	langutil::SourceLocation m_currentSourceLocation;
-
-	// FIXME: This being static means that the strings won't be freed when they're no longer needed
-	static std::map<std::string, std::shared_ptr<std::string const>> s_sharedSourceNames;
-
-public:
-	size_t m_currentModifierDepth = 0;
-};
-
-inline std::ostream& operator<<(std::ostream& _out, Assembly const& _a)
-{
-	_a.assemblyStream(_out);
-	return _out;
-}
-
-}
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
deleted file mode 100644
index 2adaa023a13e..000000000000
--- a/libevmasm/AssemblyItem.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libevmasm/AssemblyItem.h>
-
-#include <libevmasm/Assembly.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Numeric.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/FixedHash.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <fstream>
-#include <limits>
-
-using namespace std::literals;
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-static_assert(sizeof(size_t) <= 8, "size_t must be at most 64-bits wide");
-
-namespace
-{
-
-std::string toStringInHex(u256 _value)
-{
-	std::stringstream hexStr;
-	hexStr << std::uppercase << std::hex << _value;
-	return hexStr.str();
-}
-
-}
-
-AssemblyItem AssemblyItem::toSubAssemblyTag(size_t _subId) const
-{
-	assertThrow(data() < (u256(1) << 64), util::Exception, "Tag already has subassembly set.");
-	assertThrow(m_type == PushTag || m_type == Tag, util::Exception, "");
-	auto tag = static_cast<size_t>(u256(data()) & 0xffffffffffffffffULL);
-	AssemblyItem r = *this;
-	r.m_type = PushTag;
-	r.setPushTagSubIdAndTag(_subId, tag);
-	return r;
-}
-
-std::pair<size_t, size_t> AssemblyItem::splitForeignPushTag() const
-{
-	assertThrow(m_type == PushTag || m_type == Tag, util::Exception, "");
-	u256 combined = u256(data());
-	size_t subId = static_cast<size_t>((combined >> 64) - 1);
-	size_t tag = static_cast<size_t>(combined & 0xffffffffffffffffULL);
-	return std::make_pair(subId, tag);
-}
-
-std::pair<std::string, std::string> AssemblyItem::nameAndData(langutil::EVMVersion _evmVersion) const
-{
-	switch (type())
-	{
-	case Operation:
-		return {instructionInfo(instruction(), _evmVersion).name, m_data != nullptr ? toStringInHex(*m_data) : ""};
-	case Push:
-		return {"PUSH", toStringInHex(data())};
-	case PushTag:
-		if (data() == 0)
-			return {"PUSH [ErrorTag]", ""};
-		else
-			return {"PUSH [tag]", util::toString(data())};
-	case PushSub:
-		return {"PUSH [$]", toString(util::h256(data()))};
-	case PushSubSize:
-		return {"PUSH #[$]", toString(util::h256(data()))};
-	case PushProgramSize:
-		return {"PUSHSIZE", ""};
-	case PushLibraryAddress:
-		return {"PUSHLIB", toString(util::h256(data()))};
-	case PushDeployTimeAddress:
-		return {"PUSHDEPLOYADDRESS", ""};
-	case PushImmutable:
-		return {"PUSHIMMUTABLE", toString(util::h256(data()))};
-	case AssignImmutable:
-		return {"ASSIGNIMMUTABLE", toString(util::h256(data()))};
-	case Tag:
-		return {"tag", util::toString(data())};
-	case PushData:
-		return {"PUSH data", toStringInHex(data())};
-	case VerbatimBytecode:
-		return {"VERBATIM", util::toHex(verbatimData())};
-	default:
-		assertThrow(false, InvalidOpcode, "");
-	}
-}
-
-void AssemblyItem::setPushTagSubIdAndTag(size_t _subId, size_t _tag)
-{
-	assertThrow(m_type == PushTag || m_type == Tag, util::Exception, "");
-	u256 data = _tag;
-	if (_subId != std::numeric_limits<size_t>::max())
-		data |= (u256(_subId) + 1) << 64;
-	setData(data);
-}
-
-size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision) const
-{
-	switch (m_type)
-	{
-	case Operation:
-	case Tag: // 1 byte for the JUMPDEST
-		return 1;
-	case Push:
-		return 1 + std::max<size_t>(1, numberEncodingSize(data()));
-	case PushSubSize:
-	case PushProgramSize:
-		return 1 + 4;		// worst case: a 16MB program
-	case PushTag:
-	case PushData:
-	case PushSub:
-		return 1 + _addressLength;
-	case PushLibraryAddress:
-	case PushDeployTimeAddress:
-		return 1 + 20;
-	case PushImmutable:
-		return 1 + 32;
-	case AssignImmutable:
-	{
-		unsigned long immutableOccurrences = 0;
-
-		// Skip exact immutables count if no precise count was requested
-		if (_precision == Precision::Approximate)
-			immutableOccurrences = 1; // Assume one immut. ref.
-		else
-		{
-			solAssert(m_immutableOccurrences, "No immutable references. `bytesRequired()` called before assembly()?");
-			immutableOccurrences = m_immutableOccurrences.value();
-		}
-
-		if (immutableOccurrences != 0)
-			// (DUP DUP PUSH <n> ADD MSTORE)* (PUSH <n> ADD MSTORE)
-			return (immutableOccurrences - 1) * (5 + 32) + (3 + 32);
-		else
-			// POP POP
-			return 2;
-	}
-	case VerbatimBytecode:
-		return std::get<2>(*m_verbatimBytecode).size();
-	default:
-		break;
-	}
-	assertThrow(false, InvalidOpcode, "");
-}
-
-size_t AssemblyItem::arguments() const
-{
-	if (type() == Operation)
-		// The latest EVMVersion is used here, since the InstructionInfo is assumed to be
-		// the same across all EVM versions except for the instruction name.
-		return static_cast<size_t>(instructionInfo(instruction(), EVMVersion()).args);
-	else if (type() == VerbatimBytecode)
-		return std::get<0>(*m_verbatimBytecode);
-	else if (type() == AssignImmutable)
-		return 2;
-	else
-		return 0;
-}
-
-size_t AssemblyItem::returnValues() const
-{
-	switch (m_type)
-	{
-	case Operation:
-		// The latest EVMVersion is used here, since the InstructionInfo is assumed to be
-		// the same across all EVM versions except for the instruction name.
-		return static_cast<size_t>(instructionInfo(instruction(), EVMVersion()).ret);
-	case Push:
-	case PushTag:
-	case PushData:
-	case PushSub:
-	case PushSubSize:
-	case PushProgramSize:
-	case PushLibraryAddress:
-	case PushImmutable:
-	case PushDeployTimeAddress:
-		return 1;
-	case Tag:
-		return 0;
-	case VerbatimBytecode:
-		return std::get<1>(*m_verbatimBytecode);
-	default:
-		break;
-	}
-	return 0;
-}
-
-bool AssemblyItem::canBeFunctional() const
-{
-	if (m_jumpType != JumpType::Ordinary)
-		return false;
-	switch (m_type)
-	{
-	case Operation:
-		return !isDupInstruction(instruction()) && !isSwapInstruction(instruction());
-	case Push:
-	case PushTag:
-	case PushData:
-	case PushSub:
-	case PushSubSize:
-	case PushProgramSize:
-	case PushLibraryAddress:
-	case PushDeployTimeAddress:
-	case PushImmutable:
-		return true;
-	case Tag:
-		return false;
-	default:
-		break;
-	}
-	return false;
-}
-
-std::string AssemblyItem::getJumpTypeAsString() const
-{
-	switch (m_jumpType)
-	{
-	case JumpType::IntoFunction:
-		return "[in]";
-	case JumpType::OutOfFunction:
-		return "[out]";
-	case JumpType::Ordinary:
-	default:
-		return "";
-	}
-}
-
-std::optional<AssemblyItem::JumpType> AssemblyItem::parseJumpType(std::string const& _jumpType)
-{
-	if (_jumpType == "[in]")
-		return JumpType::IntoFunction;
-	else if (_jumpType == "[out]")
-		return JumpType::OutOfFunction;
-	else if (_jumpType.empty())
-		return JumpType::Ordinary;
-
-	return std::nullopt;
-}
-
-std::string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
-{
-	std::string text;
-	switch (type())
-	{
-	case Operation:
-	{
-		assertThrow(isValidInstruction(instruction()), AssemblyException, "Invalid instruction.");
-		text = util::toLower(instructionInfo(instruction(), _assembly.evmVersion()).name);
-		break;
-	}
-	case Push:
-		text = toHex(toCompactBigEndian(data(), 1), util::HexPrefix::Add);
-		break;
-	case PushTag:
-	{
-		size_t sub{0};
-		size_t tag{0};
-		std::tie(sub, tag) = splitForeignPushTag();
-		if (sub == std::numeric_limits<size_t>::max())
-			text = std::string("tag_") + std::to_string(tag);
-		else
-			text = std::string("tag_") + std::to_string(sub) + "_" + std::to_string(tag);
-		break;
-	}
-	case Tag:
-		assertThrow(data() < 0x10000, AssemblyException, "Declaration of sub-assembly tag.");
-		text = std::string("tag_") + std::to_string(static_cast<size_t>(data())) + ":";
-		break;
-	case PushData:
-		text = std::string("data_") + toHex(data());
-		break;
-	case PushSub:
-	case PushSubSize:
-	{
-		std::vector<std::string> subPathComponents;
-		for (size_t subPathComponentId: _assembly.decodeSubPath(static_cast<size_t>(data())))
-			subPathComponents.emplace_back("sub_" + std::to_string(subPathComponentId));
-		text =
-			(type() == PushSub ? "dataOffset"s : "dataSize"s) +
-			"(" +
-			solidity::util::joinHumanReadable(subPathComponents, ".") +
-			")";
-		break;
-	}
-	case PushProgramSize:
-		text = std::string("bytecodeSize");
-		break;
-	case PushLibraryAddress:
-		text = std::string("linkerSymbol(\"") + toHex(data()) + std::string("\")");
-		break;
-	case PushDeployTimeAddress:
-		text = std::string("deployTimeAddress()");
-		break;
-	case PushImmutable:
-		text = std::string("immutable(\"") + "0x" + util::toHex(toCompactBigEndian(data(), 1)) + "\")";
-		break;
-	case AssignImmutable:
-		text = std::string("assignImmutable(\"") + "0x" + util::toHex(toCompactBigEndian(data(), 1)) + "\")";
-		break;
-	case UndefinedItem:
-		assertThrow(false, AssemblyException, "Invalid assembly item.");
-		break;
-	case VerbatimBytecode:
-		text = std::string("verbatimbytecode_") + util::toHex(std::get<2>(*m_verbatimBytecode));
-		break;
-	default:
-		assertThrow(false, InvalidOpcode, "");
-	}
-	if (m_jumpType == JumpType::IntoFunction || m_jumpType == JumpType::OutOfFunction)
-	{
-		text += "\t//";
-		if (m_jumpType == JumpType::IntoFunction)
-			text += " in";
-		else
-			text += " out";
-	}
-	return text;
-}
-
-// Note: This method is exclusively used for debugging.
-std::ostream& solidity::evmasm::operator<<(std::ostream& _out, AssemblyItem const& _item)
-{
-	switch (_item.type())
-	{
-	case Operation:
-		_out << " " << instructionInfo(_item.instruction(), EVMVersion()).name;
-		if (_item.instruction() == Instruction::JUMP || _item.instruction() == Instruction::JUMPI)
-			_out << "\t" << _item.getJumpTypeAsString();
-		break;
-	case Push:
-		_out << " PUSH " << std::hex << _item.data() <<  std::dec;
-		break;
-	case PushTag:
-	{
-		size_t subId = _item.splitForeignPushTag().first;
-		if (subId == std::numeric_limits<size_t>::max())
-			_out << " PushTag " << _item.splitForeignPushTag().second;
-		else
-			_out << " PushTag " << subId << ":" << _item.splitForeignPushTag().second;
-		break;
-	}
-	case Tag:
-		_out << " Tag " << _item.data();
-		break;
-	case PushData:
-		_out << " PushData " << std::hex << static_cast<unsigned>(_item.data()) <<  std::dec;
-		break;
-	case PushSub:
-		_out << " PushSub " << std::hex << static_cast<size_t>(_item.data()) <<  std::dec;
-		break;
-	case PushSubSize:
-		_out << " PushSubSize " << std::hex << static_cast<size_t>(_item.data()) <<  std::dec;
-		break;
-	case PushProgramSize:
-		_out << " PushProgramSize";
-		break;
-	case PushLibraryAddress:
-	{
-		std::string hash(util::h256((_item.data())).hex());
-		_out << " PushLibraryAddress " << hash.substr(0, 8) + "..." + hash.substr(hash.length() - 8);
-		break;
-	}
-	case PushDeployTimeAddress:
-		_out << " PushDeployTimeAddress";
-		break;
-	case PushImmutable:
-		_out << " PushImmutable";
-		break;
-	case AssignImmutable:
-		_out << " AssignImmutable";
-		break;
-	case VerbatimBytecode:
-		_out << " Verbatim " << util::toHex(_item.verbatimData());
-		break;
-	case UndefinedItem:
-		_out << " ???";
-		break;
-	default:
-		assertThrow(false, InvalidOpcode, "");
-	}
-	return _out;
-}
-
-size_t AssemblyItem::opcodeCount() const noexcept
-{
-	switch (m_type)
-	{
-		case AssemblyItemType::AssignImmutable:
-			// Append empty items if this AssignImmutable was referenced more than once.
-			// For n immutable occurrences the first (n - 1) occurrences will
-			// generate 5 opcodes and the last will generate 3 opcodes,
-			// because it is reusing the 2 top-most elements on the stack.
-			solAssert(m_immutableOccurrences, "");
-
-			if (m_immutableOccurrences.value() != 0)
-				return (*m_immutableOccurrences - 1) * 5 + 3;
-			else
-				return 2; // two POP's
-		default:
-			return 1;
-	}
-}
-
-std::string AssemblyItem::computeSourceMapping(
-	AssemblyItems const& _items,
-	std::map<std::string, unsigned> const& _sourceIndicesMap
-)
-{
-	std::string ret;
-
-	int prevStart = -1;
-	int prevLength = -1;
-	int prevSourceIndex = -1;
-	int prevModifierDepth = -1;
-	char prevJump = 0;
-
-	for (auto const& item: _items)
-	{
-		if (!ret.empty())
-			ret += ";";
-
-		SourceLocation const& location = item.location();
-		int length = location.start != -1 && location.end != -1 ? location.end - location.start : -1;
-		int sourceIndex =
-			(location.sourceName && _sourceIndicesMap.count(*location.sourceName)) ?
-			static_cast<int>(_sourceIndicesMap.at(*location.sourceName)) :
-			-1;
-		char jump = '-';
-		if (item.getJumpType() == evmasm::AssemblyItem::JumpType::IntoFunction)
-			jump = 'i';
-		else if (item.getJumpType() == evmasm::AssemblyItem::JumpType::OutOfFunction)
-			jump = 'o';
-		int modifierDepth = static_cast<int>(item.m_modifierDepth);
-
-		unsigned components = 5;
-		if (modifierDepth == prevModifierDepth)
-		{
-			components--;
-			if (jump == prevJump)
-			{
-				components--;
-				if (sourceIndex == prevSourceIndex)
-				{
-					components--;
-					if (length == prevLength)
-					{
-						components--;
-						if (location.start == prevStart)
-							components--;
-					}
-				}
-			}
-		}
-
-		if (components-- > 0)
-		{
-			if (location.start != prevStart)
-				ret += std::to_string(location.start);
-			if (components-- > 0)
-			{
-				ret += ':';
-				if (length != prevLength)
-					ret += std::to_string(length);
-				if (components-- > 0)
-				{
-					ret += ':';
-					if (sourceIndex != prevSourceIndex)
-						ret += std::to_string(sourceIndex);
-					if (components-- > 0)
-					{
-						ret += ':';
-						if (jump != prevJump)
-							ret += jump;
-						if (components-- > 0)
-						{
-							ret += ':';
-							if (modifierDepth != prevModifierDepth)
-								ret += std::to_string(modifierDepth);
-						}
-					}
-				}
-			}
-		}
-
-		if (item.opcodeCount() > 1)
-			ret += std::string(item.opcodeCount() - 1, ';');
-
-		prevStart = location.start;
-		prevLength = length;
-		prevSourceIndex = sourceIndex;
-		prevJump = jump;
-		prevModifierDepth = modifierDepth;
-	}
-	return ret;
-}
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
deleted file mode 100644
index 40f98dae875c..000000000000
--- a/libevmasm/AssemblyItem.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file AssemblyItem.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#pragma once
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/Exceptions.h>
-#include <liblangutil/SourceLocation.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-#include <libsolutil/Assertions.h>
-#include <optional>
-#include <iostream>
-#include <sstream>
-
-namespace solidity::evmasm
-{
-
-enum AssemblyItemType
-{
-	UndefinedItem,
-	Operation,
-	Push,
-	PushTag,
-	PushSub,
-	PushSubSize,
-	PushProgramSize,
-	Tag,
-	PushData,
-	PushLibraryAddress, ///< Push a currently unknown address of another (library) contract.
-	PushDeployTimeAddress, ///< Push an address to be filled at deploy time. Should not be touched by the optimizer.
-	PushImmutable, ///< Push the currently unknown value of an immutable variable. The actual value will be filled in by the constructor.
-	AssignImmutable, ///< Assigns the current value on the stack to an immutable variable. Only valid during creation code.
-	VerbatimBytecode ///< Contains data that is inserted into the bytecode code section without modification.
-};
-
-enum class Precision { Precise , Approximate };
-
-class Assembly;
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-
-class AssemblyItem
-{
-public:
-	enum class JumpType { Ordinary, IntoFunction, OutOfFunction };
-
-	AssemblyItem(u256 _push, langutil::SourceLocation _location = langutil::SourceLocation()):
-		AssemblyItem(Push, std::move(_push), std::move(_location)) { }
-	AssemblyItem(Instruction _i, langutil::SourceLocation _location = langutil::SourceLocation()):
-		m_type(Operation),
-		m_instruction(_i),
-		m_location(std::move(_location))
-	{}
-	AssemblyItem(AssemblyItemType _type, u256 _data = 0, langutil::SourceLocation _location = langutil::SourceLocation()):
-		m_type(_type),
-		m_location(std::move(_location))
-	{
-		if (m_type == Operation)
-			m_instruction = Instruction(uint8_t(_data));
-		else
-			m_data = std::make_shared<u256>(std::move(_data));
-	}
-	explicit AssemblyItem(bytes _verbatimData, size_t _arguments, size_t _returnVariables):
-		m_type(VerbatimBytecode),
-		m_instruction{},
-		m_verbatimBytecode{{_arguments, _returnVariables, std::move(_verbatimData)}}
-	{}
-
-	AssemblyItem(AssemblyItem const&) = default;
-	AssemblyItem(AssemblyItem&&) = default;
-	AssemblyItem& operator=(AssemblyItem const&) = default;
-	AssemblyItem& operator=(AssemblyItem&&) = default;
-
-	AssemblyItem tag() const { assertThrow(m_type == PushTag || m_type == Tag, util::Exception, ""); return AssemblyItem(Tag, data()); }
-	AssemblyItem pushTag() const { assertThrow(m_type == PushTag || m_type == Tag, util::Exception, ""); return AssemblyItem(PushTag, data()); }
-	/// Converts the tag to a subassembly tag. This has to be called in order to move a tag across assemblies.
-	/// @param _subId the identifier of the subassembly the tag is taken from.
-	AssemblyItem toSubAssemblyTag(size_t _subId) const;
-	/// @returns splits the data of the push tag into sub assembly id and actual tag id.
-	/// The sub assembly id of non-foreign push tags is -1.
-	std::pair<size_t, size_t> splitForeignPushTag() const;
-	/// Sets sub-assembly part and tag for a push tag.
-	void setPushTagSubIdAndTag(size_t _subId, size_t _tag);
-
-	AssemblyItemType type() const { return m_type; }
-	u256 const& data() const { assertThrow(m_type != Operation, util::Exception, ""); return *m_data; }
-	void setData(u256 const& _data) { assertThrow(m_type != Operation, util::Exception, ""); m_data = std::make_shared<u256>(_data); }
-
-	/// This function is used in `Assembly::assemblyJSON`.
-	/// It returns the name & data of the current assembly item.
-	/// @param _evmVersion the EVM version.
-	/// @returns a pair, where the first element is the json-assembly
-	/// item name, where second element is the string representation
-	/// of it's data.
-	std::pair<std::string, std::string> nameAndData(langutil::EVMVersion _evmVersion) const;
-
-	bytes const& verbatimData() const { assertThrow(m_type == VerbatimBytecode, util::Exception, ""); return std::get<2>(*m_verbatimBytecode); }
-
-	/// @returns the instruction of this item (only valid if type() == Operation)
-	Instruction instruction() const { assertThrow(m_type == Operation, util::Exception, ""); return m_instruction; }
-
-	/// @returns true if the type and data of the items are equal.
-	bool operator==(AssemblyItem const& _other) const
-	{
-		if (type() != _other.type())
-			return false;
-		if (type() == Operation)
-			return instruction() == _other.instruction();
-		else if (type() == VerbatimBytecode)
-			return *m_verbatimBytecode == *_other.m_verbatimBytecode;
-		else
-			return data() == _other.data();
-	}
-	bool operator!=(AssemblyItem const& _other) const { return !operator==(_other); }
-	/// Less-than operator compatible with operator==.
-	bool operator<(AssemblyItem const& _other) const
-	{
-		if (type() != _other.type())
-			return type() < _other.type();
-		else if (type() == Operation)
-			return instruction() < _other.instruction();
-		else if (type() == VerbatimBytecode)
-			return *m_verbatimBytecode == *_other.m_verbatimBytecode;
-		else
-			return data() < _other.data();
-	}
-
-	/// Shortcut that avoids constructing an AssemblyItem just to perform the comparison.
-	bool operator==(Instruction _instr) const
-	{
-		return type() == Operation && instruction() == _instr;
-	}
-	bool operator!=(Instruction _instr) const { return !operator==(_instr); }
-
-	static std::string computeSourceMapping(
-		AssemblyItems const& _items,
-		std::map<std::string, unsigned> const& _sourceIndicesMap
-	);
-
-	/// @returns an upper bound for the number of bytes required by this item, assuming that
-	/// the value of a jump tag takes @a _addressLength bytes.
-	/// @param _precision Whether to return a precise count (which involves
-	///                   counting immutable references which are only set after
-	///                   a call to `assemble()`) or an approx. count.
-	size_t bytesRequired(size_t _addressLength, Precision _precision = Precision::Precise) const;
-	size_t arguments() const;
-	size_t returnValues() const;
-	size_t deposit() const { return returnValues() - arguments(); }
-
-	/// @returns true if the assembly item can be used in a functional context.
-	bool canBeFunctional() const;
-
-	void setLocation(langutil::SourceLocation const& _location) { m_location = _location; }
-	langutil::SourceLocation const& location() const { return m_location; }
-
-	void setJumpType(JumpType _jumpType) { m_jumpType = _jumpType; }
-	static std::optional<JumpType> parseJumpType(std::string const& _jumpType);
-	JumpType getJumpType() const { return m_jumpType; }
-	std::string getJumpTypeAsString() const;
-
-	void setPushedValue(u256 const& _value) const { m_pushedValue = std::make_shared<u256>(_value); }
-	u256 const* pushedValue() const { return m_pushedValue.get(); }
-
-	std::string toAssemblyText(Assembly const& _assembly) const;
-
-	size_t m_modifierDepth = 0;
-
-	void setImmutableOccurrences(size_t _n) const { m_immutableOccurrences = _n; }
-
-private:
-	size_t opcodeCount() const noexcept;
-
-	AssemblyItemType m_type;
-	Instruction m_instruction; ///< Only valid if m_type == Operation
-	std::shared_ptr<u256> m_data; ///< Only valid if m_type != Operation
-	/// If m_type == VerbatimBytecode, this holds number of arguments, number of
-	/// return variables and verbatim bytecode.
-	std::optional<std::tuple<size_t, size_t, bytes>> m_verbatimBytecode;
-	langutil::SourceLocation m_location;
-	JumpType m_jumpType = JumpType::Ordinary;
-	/// Pushed value for operations with data to be determined during assembly stage,
-	/// e.g. PushSubSize, PushTag, PushSub, etc.
-	mutable std::shared_ptr<u256> m_pushedValue;
-	/// Number of PushImmutable's with the same hash. Only used for AssignImmutable.
-	mutable std::optional<size_t> m_immutableOccurrences;
-};
-
-inline size_t bytesRequired(AssemblyItems const& _items, size_t _addressLength,  Precision _precision = Precision::Precise)
-{
-	size_t size = 0;
-	for (AssemblyItem const& item: _items)
-		size += item.bytesRequired(_addressLength, _precision);
-	return size;
-}
-
-std::ostream& operator<<(std::ostream& _out, AssemblyItem const& _item);
-inline std::ostream& operator<<(std::ostream& _out, AssemblyItems const& _items)
-{
-	for (AssemblyItem const& item: _items)
-		_out << item;
-	return _out;
-}
-
-}
diff --git a/libevmasm/BlockDeduplicator.cpp b/libevmasm/BlockDeduplicator.cpp
deleted file mode 100644
index c978bae2bb39..000000000000
--- a/libevmasm/BlockDeduplicator.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file BlockDeduplicator.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Unifies basic blocks that share content.
- */
-
-#include <libevmasm/BlockDeduplicator.h>
-
-#include <libevmasm/AssemblyItem.h>
-#include <libevmasm/SemanticInformation.h>
-
-#include <functional>
-#include <set>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-
-bool BlockDeduplicator::deduplicate()
-{
-	// Compares indices based on the suffix that starts there, ignoring tags and stopping at
-	// opcodes that stop the control flow.
-
-	// Virtual tag that signifies "the current block" and which is used to optimise loops.
-	// We abort if this virtual tag actually exists.
-	AssemblyItem pushSelf{PushTag, u256(-4)};
-	if (
-		std::count(m_items.cbegin(), m_items.cend(), pushSelf.tag()) ||
-		std::count(m_items.cbegin(), m_items.cend(), pushSelf.pushTag())
-	)
-		return false;
-
-	std::function<bool(size_t, size_t)> comparator = [&](size_t _i, size_t _j)
-	{
-		if (_i == _j)
-			return false;
-
-		// To compare recursive loops, we have to already unify PushTag opcodes of the
-		// block's own tag.
-		AssemblyItem pushFirstTag{pushSelf};
-		AssemblyItem pushSecondTag{pushSelf};
-
-		if (_i < m_items.size() && m_items.at(_i).type() == Tag)
-			pushFirstTag = m_items.at(_i).pushTag();
-		if (_j < m_items.size() && m_items.at(_j).type() == Tag)
-			pushSecondTag = m_items.at(_j).pushTag();
-
-		using diff_type = BlockIterator::difference_type;
-		BlockIterator first{m_items.begin() + diff_type(_i), m_items.end(), &pushFirstTag, &pushSelf};
-		BlockIterator second{m_items.begin() + diff_type(_j), m_items.end(), &pushSecondTag, &pushSelf};
-		BlockIterator end{m_items.end(), m_items.end()};
-
-		if (first != end && (*first).type() == Tag)
-			++first;
-		if (second != end && (*second).type() == Tag)
-			++second;
-
-		return std::lexicographical_compare(first, end, second, end);
-	};
-
-	size_t iterations = 0;
-	for (; ; ++iterations)
-	{
-		//@todo this should probably be optimized.
-		std::set<size_t, std::function<bool(size_t, size_t)>> blocksSeen(comparator);
-		for (size_t i = 0; i < m_items.size(); ++i)
-		{
-			if (m_items.at(i).type() != Tag)
-				continue;
-			auto it = blocksSeen.find(i);
-			if (it == blocksSeen.end())
-				blocksSeen.insert(i);
-			else
-				m_replacedTags[m_items.at(i).data()] = m_items.at(*it).data();
-		}
-
-		if (!applyTagReplacement(m_items, m_replacedTags))
-			break;
-	}
-	return iterations > 0;
-}
-
-bool BlockDeduplicator::applyTagReplacement(
-	AssemblyItems& _items,
-	std::map<u256, u256> const& _replacements,
-	size_t _subId
-)
-{
-	bool changed = false;
-	for (AssemblyItem& item: _items)
-		if (item.type() == PushTag)
-		{
-			size_t subId;
-			size_t tagId;
-			std::tie(subId, tagId) = item.splitForeignPushTag();
-			if (subId != _subId)
-				continue;
-			auto it = _replacements.find(tagId);
-			// Recursively look for the element replaced by tagId
-			for (auto _it = it; _it != _replacements.end(); _it = _replacements.find(_it->second))
-				it = _it;
-
-			if (it != _replacements.end())
-			{
-				changed = true;
-				item.setPushTagSubIdAndTag(subId, static_cast<size_t>(it->second));
-			}
-		}
-	return changed;
-}
-
-BlockDeduplicator::BlockIterator& BlockDeduplicator::BlockIterator::operator++()
-{
-	if (it == end)
-		return *this;
-	if (SemanticInformation::altersControlFlow(*it) && *it != AssemblyItem{Instruction::JUMPI})
-		it = end;
-	else
-	{
-		++it;
-		while (it != end && it->type() == Tag)
-			++it;
-	}
-	return *this;
-}
-
-AssemblyItem const& BlockDeduplicator::BlockIterator::operator*() const
-{
-	if (replaceItem && replaceWith && *it == *replaceItem)
-		return *replaceWith;
-	else
-		return *it;
-}
diff --git a/libevmasm/BlockDeduplicator.h b/libevmasm/BlockDeduplicator.h
deleted file mode 100644
index fb83b317e0a1..000000000000
--- a/libevmasm/BlockDeduplicator.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file BlockDeduplicator.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Unifies basic blocks that share content.
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-
-
-#include <cstddef>
-#include <vector>
-#include <functional>
-#include <map>
-
-namespace solidity::evmasm
-{
-
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-
-/**
- * Optimizer class to be used to unify blocks that share content.
- * Modifies the passed vector in place.
- */
-class BlockDeduplicator
-{
-public:
-	explicit BlockDeduplicator(AssemblyItems& _items): m_items(_items) {}
-	/// @returns true if something was changed
-	bool deduplicate();
-	/// @returns the tags that were replaced.
-	std::map<u256, u256> const& replacedTags() const { return m_replacedTags; }
-
-	/// Replaces all PushTag operations insied @a _items that match a key in
-	/// @a _replacements by the respective value. If @a _subID is not -1, only
-	/// apply the replacement for foreign tags from this sub id.
-	/// @returns true iff a replacement was performed.
-	static bool applyTagReplacement(
-		AssemblyItems& _items,
-		std::map<u256, u256> const& _replacements,
-		size_t _subID = size_t(-1)
-	);
-
-private:
-	/// Iterator that skips tags and skips to the end if (all branches of) the control
-	/// flow does not continue to the next instruction.
-	/// If the arguments are supplied to the constructor, replaces items on the fly.
-	struct BlockIterator
-	{
-	public:
-		using iterator_category = std::forward_iterator_tag;
-		using value_type = AssemblyItem const;
-		using difference_type = std::ptrdiff_t;
-		using pointer = AssemblyItem const*;
-		using reference = AssemblyItem const&;
-		BlockIterator(
-			AssemblyItems::const_iterator _it,
-			AssemblyItems::const_iterator _end,
-			AssemblyItem const* _replaceItem = nullptr,
-			AssemblyItem const* _replaceWith = nullptr
-		):
-			it(_it), end(_end), replaceItem(_replaceItem), replaceWith(_replaceWith) {}
-		BlockIterator& operator++();
-		bool operator==(BlockIterator const& _other) const { return it == _other.it; }
-		bool operator!=(BlockIterator const& _other) const { return it != _other.it; }
-		AssemblyItem const& operator*() const;
-		AssemblyItems::const_iterator it;
-		AssemblyItems::const_iterator end;
-		AssemblyItem const* replaceItem;
-		AssemblyItem const* replaceWith;
-	};
-
-	std::map<u256, u256> m_replacedTags;
-	AssemblyItems& m_items;
-};
-
-}
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
deleted file mode 100644
index c1918540e625..000000000000
--- a/libevmasm/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-set(sources
-	AbstractAssemblyStack.h
-	Assembly.cpp
-	Assembly.h
-	AssemblyItem.cpp
-	AssemblyItem.h
-	EVMAssemblyStack.cpp
-	EVMAssemblyStack.h
-	BlockDeduplicator.cpp
-	BlockDeduplicator.h
-	CommonSubexpressionEliminator.cpp
-	CommonSubexpressionEliminator.h
-	ConstantOptimiser.cpp
-	ConstantOptimiser.h
-	ControlFlowGraph.cpp
-	ControlFlowGraph.h
-	Disassemble.cpp
-	Disassemble.h
-	Exceptions.h
-	ExpressionClasses.cpp
-	ExpressionClasses.h
-	GasMeter.cpp
-	GasMeter.h
-	Inliner.cpp
-	Inliner.h
-	Instruction.cpp
-	Instruction.h
-	JumpdestRemover.cpp
-	JumpdestRemover.h
-	KnownState.cpp
-	KnownState.h
-	LinkerObject.cpp
-	LinkerObject.h
-	PathGasMeter.cpp
-	PathGasMeter.h
-	PeepholeOptimiser.cpp
-	PeepholeOptimiser.h
-	SemanticInformation.cpp
-	SemanticInformation.h
-	SimplificationRule.h
-	SimplificationRules.cpp
-	SimplificationRules.h
-)
-
-add_library(evmasm ${sources})
-target_link_libraries(evmasm PUBLIC solutil fmt::fmt-header-only)
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
deleted file mode 100644
index de1e5a364aca..000000000000
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file CommonSubexpressionEliminator.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Optimizer step for common subexpression elimination and stack reorganisation.
- */
-
-#include <functional>
-#include <libsolutil/Keccak256.h>
-#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmasm/AssemblyItem.h>
-#include <libsolutil/StackTooDeepString.h>
-
-#include <range/v3/view/reverse.hpp>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-std::vector<AssemblyItem> CommonSubexpressionEliminator::getOptimizedItems()
-{
-	optimizeBreakingItem();
-
-	KnownState nextInitialState = m_state;
-	if (m_breakingItem)
-		nextInitialState.feedItem(*m_breakingItem);
-	KnownState nextState = nextInitialState;
-
-	ScopeGuard reset([&]()
-	{
-		m_breakingItem = nullptr;
-		m_storeOperations.clear();
-		m_initialState = std::move(nextInitialState);
-		m_state = std::move(nextState);
-	});
-
-	std::map<int, Id> initialStackContents;
-	std::map<int, Id> targetStackContents;
-	int minHeight = m_state.stackHeight() + 1;
-	if (!m_state.stackElements().empty())
-		minHeight = std::min(minHeight, m_state.stackElements().begin()->first);
-	for (int height = minHeight; height <= m_initialState.stackHeight(); ++height)
-		initialStackContents[height] = m_initialState.stackElement(height, SourceLocation());
-	for (int height = minHeight; height <= m_state.stackHeight(); ++height)
-		targetStackContents[height] = m_state.stackElement(height, SourceLocation());
-
-	AssemblyItems items = CSECodeGenerator(m_state.expressionClasses(), m_storeOperations).generateCode(
-		m_initialState.sequenceNumber(),
-		m_initialState.stackHeight(),
-		initialStackContents,
-		targetStackContents
-	);
-	if (m_breakingItem)
-		items.push_back(*m_breakingItem);
-
-	return items;
-}
-
-void CommonSubexpressionEliminator::feedItem(AssemblyItem const& _item, bool _copyItem)
-{
-	StoreOperation op = m_state.feedItem(_item, _copyItem);
-	if (op.isValid())
-		m_storeOperations.push_back(op);
-}
-
-void CommonSubexpressionEliminator::optimizeBreakingItem()
-{
-	if (!m_breakingItem)
-		return;
-
-	ExpressionClasses& classes = m_state.expressionClasses();
-	SourceLocation const& itemLocation = m_breakingItem->location();
-	if (*m_breakingItem == AssemblyItem(Instruction::JUMPI))
-	{
-		AssemblyItem::JumpType jumpType = m_breakingItem->getJumpType();
-
-		Id condition = m_state.stackElement(m_state.stackHeight() - 1, itemLocation);
-		if (classes.knownNonZero(condition))
-		{
-			feedItem(AssemblyItem(Instruction::SWAP1, itemLocation), true);
-			feedItem(AssemblyItem(Instruction::POP, itemLocation), true);
-
-			AssemblyItem item(Instruction::JUMP, itemLocation);
-			item.setJumpType(jumpType);
-			m_breakingItem = classes.storeItem(item);
-		}
-		else if (classes.knownZero(condition))
-		{
-			AssemblyItem it(Instruction::POP, itemLocation);
-			feedItem(it, true);
-			feedItem(it, true);
-			m_breakingItem = nullptr;
-		}
-	}
-	else if (*m_breakingItem == AssemblyItem(Instruction::RETURN))
-	{
-		Id size = m_state.stackElement(m_state.stackHeight() - 1, itemLocation);
-		if (classes.knownZero(size))
-		{
-			feedItem(AssemblyItem(Instruction::POP, itemLocation), true);
-			feedItem(AssemblyItem(Instruction::POP, itemLocation), true);
-			AssemblyItem item(Instruction::STOP, itemLocation);
-			m_breakingItem = classes.storeItem(item);
-		}
-	}
-}
-
-CSECodeGenerator::CSECodeGenerator(
-	ExpressionClasses& _expressionClasses,
-	std::vector<CSECodeGenerator::StoreOperation> const& _storeOperations
-):
-	m_expressionClasses(_expressionClasses)
-{
-	for (auto const& store: _storeOperations)
-		m_storeOperations[std::make_pair(store.target, store.slot)].push_back(store);
-}
-
-AssemblyItems CSECodeGenerator::generateCode(
-	unsigned _initialSequenceNumber,
-	int _initialStackHeight,
-	std::map<int, Id> const& _initialStack,
-	std::map<int, Id> const& _targetStackContents
-)
-{
-	m_stackHeight = _initialStackHeight;
-	m_stack = _initialStack;
-	m_targetStack = _targetStackContents;
-	for (auto const& item: m_stack)
-		m_classPositions[item.second].insert(item.first);
-
-	// generate the dependency graph starting from final storage and memory writes and target stack contents
-	for (auto const& p: m_storeOperations)
-		addDependencies(p.second.back().expression);
-	for (auto const& targetItem: m_targetStack)
-	{
-		m_finalClasses.insert(targetItem.second);
-		addDependencies(targetItem.second);
-	}
-
-	// store all needed sequenced expressions
-	std::set<std::pair<unsigned, Id>> sequencedExpressions;
-	for (auto const& p: m_neededBy)
-		for (auto id: {p.first, p.second})
-			if (unsigned seqNr = m_expressionClasses.representative(id).sequenceNumber)
-			{
-				// Invalid sequenced operation.
-				// @todo quick fix for now. Proper fix needs to choose representative with higher
-				// sequence number during dependency analysis.
-				assertThrow(seqNr >= _initialSequenceNumber, StackTooDeepException, util::stackTooDeepString);
-				sequencedExpressions.insert(std::make_pair(seqNr, id));
-			}
-
-	// Perform all operations on storage and memory in order, if they are needed.
-	for (auto const& seqAndId: sequencedExpressions)
-		if (!m_classPositions.count(seqAndId.second))
-			generateClassElement(seqAndId.second, true);
-
-	// generate the target stack elements
-	for (auto const& targetItem: m_targetStack)
-	{
-		if (m_stack.count(targetItem.first) && m_stack.at(targetItem.first) == targetItem.second)
-			continue; // already there
-		generateClassElement(targetItem.second);
-		assertThrow(!m_classPositions[targetItem.second].empty(), OptimizerException, "");
-		if (m_classPositions[targetItem.second].count(targetItem.first))
-			continue;
-		SourceLocation sourceLocation;
-		if (m_expressionClasses.representative(targetItem.second).item)
-			sourceLocation = m_expressionClasses.representative(targetItem.second).item->location();
-		int position = classElementPosition(targetItem.second);
-		if (position < targetItem.first)
-			// it is already at its target, we need another copy
-			appendDup(position, sourceLocation);
-		else
-			appendOrRemoveSwap(position, sourceLocation);
-		appendOrRemoveSwap(targetItem.first, sourceLocation);
-	}
-
-	// remove surplus elements
-	while (removeStackTopIfPossible())
-	{
-		// no-op
-	}
-
-	// check validity
-	int finalHeight = 0;
-	if (!m_targetStack.empty())
-		// have target stack, so its height should be the final height
-		finalHeight = (--m_targetStack.end())->first;
-	else if (!_initialStack.empty())
-		// no target stack, only erase the initial stack
-		finalHeight = _initialStack.begin()->first - 1;
-	else
-		// neither initial no target stack, no change in height
-		finalHeight = _initialStackHeight;
-	assertThrow(finalHeight == m_stackHeight, OptimizerException, "Incorrect final stack height.");
-
-	return m_generatedItems;
-}
-
-void CSECodeGenerator::addDependencies(Id _c)
-{
-	if (m_classPositions.count(_c))
-		return; // it is already on the stack
-	if (m_neededBy.find(_c) != m_neededBy.end())
-		return; // we already computed the dependencies for _c
-	ExpressionClasses::Expression expr = m_expressionClasses.representative(_c);
-	assertThrow(expr.item, OptimizerException, "");
-	// If this exception happens, we need to find a different way to generate the
-	// compound expression.
-	assertThrow(expr.item->type() != UndefinedItem, ItemNotAvailableException, "Undefined item requested but not available.");
-	for (Id argument: expr.arguments)
-	{
-		addDependencies(argument);
-		m_neededBy.insert(std::make_pair(argument, _c));
-	}
-	if (expr.item && expr.item->type() == Operation && (
-		expr.item->instruction() == Instruction::SLOAD ||
-		expr.item->instruction() == Instruction::MLOAD ||
-		expr.item->instruction() == Instruction::KECCAK256
-	))
-	{
-		// this loads an unknown value from storage or memory and thus, in addition to its
-		// arguments, depends on all store operations to addresses where we do not know that
-		// they are different that occur before this load
-		StoreOperation::Target target = expr.item->instruction() == Instruction::SLOAD ?
-			StoreOperation::Storage : StoreOperation::Memory;
-		Id slotToLoadFrom = expr.arguments.at(0);
-		for (auto const& p: m_storeOperations)
-		{
-			if (p.first.first != target)
-				continue;
-			Id slot = p.first.second;
-			StoreOperations const& storeOps = p.second;
-			if (storeOps.front().sequenceNumber > expr.sequenceNumber)
-				continue;
-			bool knownToBeIndependent = false;
-			switch (expr.item->instruction())
-			{
-			case Instruction::SLOAD:
-				knownToBeIndependent = m_expressionClasses.knownToBeDifferent(slot, slotToLoadFrom);
-				break;
-			case Instruction::MLOAD:
-				knownToBeIndependent = m_expressionClasses.knownToBeDifferentBy32(slot, slotToLoadFrom);
-				break;
-			case Instruction::KECCAK256:
-			{
-				Id length = expr.arguments.at(1);
-				AssemblyItem offsetInstr(Instruction::SUB, expr.item->location());
-				Id offsetToStart = m_expressionClasses.find(offsetInstr, {slot, slotToLoadFrom});
-				u256 const* o = m_expressionClasses.knownConstant(offsetToStart);
-				u256 const* l = m_expressionClasses.knownConstant(length);
-				if (l && *l == 0)
-					knownToBeIndependent = true;
-				else if (o)
-				{
-					// We could get problems here if both *o and *l are larger than 2**254
-					// but it is probably ok for the optimizer to produce wrong code for such cases
-					// which cannot be executed anyway because of the non-payable price.
-					if (u2s(*o) <= -32)
-						knownToBeIndependent = true;
-					else if (l && u2s(*o) >= 0 && *o >= *l)
-						knownToBeIndependent = true;
-				}
-				break;
-			}
-			default:
-				break;
-			}
-			if (knownToBeIndependent)
-				continue;
-
-			// note that store and load never have the same sequence number
-			Id latestStore = storeOps.front().expression;
-			for (auto it = ++storeOps.begin(); it != storeOps.end(); ++it)
-				if (it->sequenceNumber < expr.sequenceNumber)
-					latestStore = it->expression;
-			addDependencies(latestStore);
-			m_neededBy.insert(std::make_pair(latestStore, _c));
-		}
-	}
-}
-
-void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
-{
-	for (auto const& it: m_classPositions)
-		for (int p: it.second)
-			if (p > m_stackHeight)
-			{
-				assertThrow(false, OptimizerException, "");
-			}
-	// do some cleanup
-	removeStackTopIfPossible();
-
-	if (m_classPositions.count(_c))
-	{
-		assertThrow(
-			!m_classPositions[_c].empty(),
-			OptimizerException,
-			"Element already removed but still needed."
-		);
-		return;
-	}
-	ExpressionClasses::Expression const& expr = m_expressionClasses.representative(_c);
-	assertThrow(
-		_allowSequenced || expr.sequenceNumber == 0,
-		OptimizerException,
-		"Sequence constrained operation requested out of sequence."
-	);
-	assertThrow(expr.item, OptimizerException, "Non-generated expression without item.");
-	assertThrow(
-		expr.item->type() != UndefinedItem,
-		OptimizerException,
-		"Undefined item requested but not available."
-	);
-	std::vector<Id> const& arguments = expr.arguments;
-	for (Id arg: arguments | ranges::views::reverse)
-		generateClassElement(arg);
-
-	SourceLocation const& itemLocation = expr.item->location();
-	// The arguments are somewhere on the stack now, so it remains to move them at the correct place.
-	// This is quite difficult as sometimes, the values also have to removed in this process
-	// (if canBeRemoved() returns true) and the two arguments can be equal. For now, this is
-	// implemented for every single case for combinations of up to two arguments manually.
-	if (arguments.size() == 1)
-	{
-		if (canBeRemoved(arguments[0], _c))
-			appendOrRemoveSwap(classElementPosition(arguments[0]), itemLocation);
-		else
-			appendDup(classElementPosition(arguments[0]), itemLocation);
-	}
-	else if (arguments.size() == 2)
-	{
-		if (canBeRemoved(arguments[1], _c))
-		{
-			appendOrRemoveSwap(classElementPosition(arguments[1]), itemLocation);
-			if (arguments[0] == arguments[1])
-				appendDup(m_stackHeight, itemLocation);
-			else if (canBeRemoved(arguments[0], _c))
-			{
-				appendOrRemoveSwap(m_stackHeight - 1, itemLocation);
-				appendOrRemoveSwap(classElementPosition(arguments[0]), itemLocation);
-			}
-			else
-				appendDup(classElementPosition(arguments[0]), itemLocation);
-		}
-		else
-		{
-			if (arguments[0] == arguments[1])
-			{
-				appendDup(classElementPosition(arguments[0]), itemLocation);
-				appendDup(m_stackHeight, itemLocation);
-			}
-			else if (canBeRemoved(arguments[0], _c))
-			{
-				appendOrRemoveSwap(classElementPosition(arguments[0]), itemLocation);
-				appendDup(classElementPosition(arguments[1]), itemLocation);
-				appendOrRemoveSwap(m_stackHeight - 1, itemLocation);
-			}
-			else
-			{
-				appendDup(classElementPosition(arguments[1]), itemLocation);
-				appendDup(classElementPosition(arguments[0]), itemLocation);
-			}
-		}
-	}
-	else
-		assertThrow(
-			arguments.size() <= 2,
-			OptimizerException,
-			"Opcodes with more than two arguments not implemented yet."
-		);
-	for (size_t i = 0; i < arguments.size(); ++i)
-		assertThrow(
-			m_stack[m_stackHeight - static_cast<int>(i)] == arguments[i],
-			OptimizerException,
-			"Expected arguments not present."
-		);
-
-	while (SemanticInformation::isCommutativeOperation(*expr.item) &&
-			!m_generatedItems.empty() &&
-			m_generatedItems.back() == AssemblyItem(Instruction::SWAP1))
-		// this will not append a swap but remove the one that is already there
-		appendOrRemoveSwap(m_stackHeight - 1, itemLocation);
-	for (size_t i = 0; i < arguments.size(); ++i)
-	{
-		m_classPositions[m_stack[m_stackHeight - static_cast<int>(i)]].erase(m_stackHeight - static_cast<int>(i));
-		m_stack.erase(m_stackHeight - static_cast<int>(i));
-	}
-	appendItem(*expr.item);
-	if (expr.item->type() != Operation || instructionInfo(expr.item->instruction(), EVMVersion()).ret == 1)
-	{
-		m_stack[m_stackHeight] = _c;
-		m_classPositions[_c].insert(m_stackHeight);
-	}
-	else
-	{
-		assertThrow(
-			instructionInfo(expr.item->instruction(), EVMVersion()).ret == 0,
-			OptimizerException,
-			"Invalid number of return values."
-		);
-		m_classPositions[_c]; // ensure it is created to mark the expression as generated
-	}
-}
-
-int CSECodeGenerator::classElementPosition(Id _id) const
-{
-	assertThrow(
-		m_classPositions.count(_id) && !m_classPositions.at(_id).empty(),
-		OptimizerException,
-		"Element requested but is not present."
-	);
-	return *max_element(m_classPositions.at(_id).begin(), m_classPositions.at(_id).end());
-}
-
-bool CSECodeGenerator::canBeRemoved(Id _element, Id _result, int _fromPosition)
-{
-	// Default for _fromPosition is the canonical position of the element.
-	if (_fromPosition == c_invalidPosition)
-		_fromPosition = classElementPosition(_element);
-
-	bool haveCopy = m_classPositions.at(_element).size() > 1;
-	if (m_finalClasses.count(_element))
-		// It is part of the target stack. It can be removed if it is a copy that is not in the target position.
-		return haveCopy && (!m_targetStack.count(_fromPosition) || m_targetStack[_fromPosition] != _element);
-	else if (!haveCopy)
-	{
-		// Can be removed unless it is needed by a class that has not been computed yet.
-		// Note that m_classPositions also includes classes that were deleted in the meantime.
-		auto range = m_neededBy.equal_range(_element);
-		for (auto it = range.first; it != range.second; ++it)
-			if (it->second != _result && !m_classPositions.count(it->second))
-				return false;
-	}
-	return true;
-}
-
-bool CSECodeGenerator::removeStackTopIfPossible()
-{
-	if (m_stack.empty())
-		return false;
-	assertThrow(m_stack.count(m_stackHeight) > 0, OptimizerException, "");
-	Id top = m_stack[m_stackHeight];
-	if (!canBeRemoved(top, Id(-1), m_stackHeight))
-		return false;
-	m_classPositions[m_stack[m_stackHeight]].erase(m_stackHeight);
-	m_stack.erase(m_stackHeight);
-	appendItem(AssemblyItem(Instruction::POP));
-	return true;
-}
-
-void CSECodeGenerator::appendDup(int _fromPosition, SourceLocation const& _location)
-{
-	assertThrow(_fromPosition != c_invalidPosition, OptimizerException, "");
-	int instructionNum = 1 + m_stackHeight - _fromPosition;
-	assertThrow(instructionNum <= 16, StackTooDeepException, util::stackTooDeepString);
-	assertThrow(1 <= instructionNum, OptimizerException, "Invalid stack access.");
-	appendItem(AssemblyItem(dupInstruction(static_cast<unsigned>(instructionNum)), _location));
-	m_stack[m_stackHeight] = m_stack[_fromPosition];
-	m_classPositions[m_stack[m_stackHeight]].insert(m_stackHeight);
-}
-
-void CSECodeGenerator::appendOrRemoveSwap(int _fromPosition, SourceLocation const& _location)
-{
-	assertThrow(_fromPosition != c_invalidPosition, OptimizerException, "");
-	if (_fromPosition == m_stackHeight)
-		return;
-	int instructionNum = m_stackHeight - _fromPosition;
-	assertThrow(instructionNum <= 16, StackTooDeepException, util::stackTooDeepString);
-	assertThrow(1 <= instructionNum, OptimizerException, "Invalid stack access.");
-	appendItem(AssemblyItem(swapInstruction(static_cast<unsigned>(instructionNum)), _location));
-
-	if (m_stack[m_stackHeight] != m_stack[_fromPosition])
-	{
-		m_classPositions[m_stack[m_stackHeight]].erase(m_stackHeight);
-		m_classPositions[m_stack[m_stackHeight]].insert(_fromPosition);
-		m_classPositions[m_stack[_fromPosition]].erase(_fromPosition);
-		m_classPositions[m_stack[_fromPosition]].insert(m_stackHeight);
-		std::swap(m_stack[m_stackHeight], m_stack[_fromPosition]);
-	}
-	if (m_generatedItems.size() >= 2 &&
-		SemanticInformation::isSwapInstruction(m_generatedItems.back()) &&
-		*(m_generatedItems.end() - 2) == m_generatedItems.back())
-	{
-		m_generatedItems.pop_back();
-		m_generatedItems.pop_back();
-	}
-}
-
-void CSECodeGenerator::appendItem(AssemblyItem const& _item)
-{
-	m_generatedItems.push_back(_item);
-	m_stackHeight += static_cast<int>(_item.deposit());
-}
diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
deleted file mode 100644
index b0810a9a1dd0..000000000000
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file CommonSubexpressionEliminator.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Optimizer step for common subexpression elimination and stack reorganisation.
- */
-
-#pragma once
-
-#include <map>
-#include <ostream>
-#include <set>
-#include <tuple>
-#include <unordered_map>
-#include <vector>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-#include <libevmasm/ExpressionClasses.h>
-#include <libevmasm/SemanticInformation.h>
-#include <libevmasm/KnownState.h>
-
-namespace langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::evmasm
-{
-
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-
-/**
- * Optimizer step that performs common subexpression elimination and stack reorganisation,
- * i.e. it tries to infer equality among expressions and compute the values of two expressions
- * known to be equal only once.
- *
- * The general workings are that for each assembly item that is fed into the eliminator, an
- * equivalence class is derived from the operation and the equivalence class of its arguments.
- * DUPi, SWAPi and some arithmetic instructions are used to infer equivalences while these
- * classes are determined.
- *
- * When the list of optimized items is requested, they are generated in a bottom-up fashion,
- * adding code for equivalence classes that were not yet computed.
- */
-class CommonSubexpressionEliminator
-{
-public:
-	using Id = ExpressionClasses::Id;
-	using StoreOperation = KnownState::StoreOperation;
-
-	explicit CommonSubexpressionEliminator(KnownState const& _state): m_initialState(_state), m_state(_state) {}
-
-	/// Feeds AssemblyItems into the eliminator and @returns the iterator pointing at the first
-	/// item that must be fed into a new instance of the eliminator.
-	/// @param _msizeImportant if false, do not consider modification of MSIZE a side-effect
-	template <class AssemblyItemIterator>
-	AssemblyItemIterator feedItems(AssemblyItemIterator _iterator, AssemblyItemIterator _end, bool _msizeImportant);
-
-	/// @returns the resulting items after optimization.
-	AssemblyItems getOptimizedItems();
-
-private:
-	/// Feeds the item into the system for analysis.
-	void feedItem(AssemblyItem const& _item, bool _copyItem = false);
-
-	/// Tries to optimize the item that breaks the basic block at the end.
-	void optimizeBreakingItem();
-
-	KnownState m_initialState;
-	KnownState m_state;
-	/// Keeps information about which storage or memory slots were written to at which sequence
-	/// number with what instruction.
-	std::vector<StoreOperation> m_storeOperations;
-
-	/// The item that breaks the basic block, can be nullptr.
-	/// It is usually appended to the block but can be optimized in some cases.
-	AssemblyItem const* m_breakingItem = nullptr;
-};
-
-/**
- * Unit that generates code from current stack layout, target stack layout and information about
- * the equivalence classes.
- */
-class CSECodeGenerator
-{
-public:
-	using StoreOperation = CommonSubexpressionEliminator::StoreOperation;
-	using StoreOperations = std::vector<StoreOperation>;
-	using Id = ExpressionClasses::Id;
-
-	/// Initializes the code generator with the given classes and store operations.
-	/// The store operations have to be sorted by sequence number in ascending order.
-	CSECodeGenerator(ExpressionClasses& _expressionClasses, StoreOperations const& _storeOperations);
-
-	/// @returns the assembly items generated from the given requirements
-	/// @param _initialSequenceNumber starting sequence number, do not generate sequenced operations
-	/// before this number.
-	/// @param _initialStack current contents of the stack (up to stack height of zero)
-	/// @param _targetStackContents final contents of the stack, by stack height relative to initial
-	/// @note should only be called once on each object.
-	AssemblyItems generateCode(
-		unsigned _initialSequenceNumber,
-		int _initialStackHeight,
-		std::map<int, Id> const& _initialStack,
-		std::map<int, Id> const& _targetStackContents
-	);
-
-private:
-	/// Recursively discovers all dependencies to @a m_requests.
-	void addDependencies(Id _c);
-
-	/// Produce code that generates the given element if it is not yet present.
-	/// @param _allowSequenced indicates that sequence-constrained operations are allowed
-	void generateClassElement(Id _c, bool _allowSequenced = false);
-	/// @returns the position of the representative of the given id on the stack.
-	/// @note throws an exception if it is not on the stack.
-	int classElementPosition(Id _id) const;
-
-	/// @returns true if the copy of @a _element can be removed from stack position _fromPosition
-	/// - in general or, if given, while computing @a _result.
-	bool canBeRemoved(Id _element, Id _result = Id(-1), int _fromPosition = c_invalidPosition);
-
-	/// Appends code to remove the topmost stack element if it can be removed.
-	bool removeStackTopIfPossible();
-
-	/// Appends a dup instruction to m_generatedItems to retrieve the element at the given stack position.
-	void appendDup(int _fromPosition, langutil::SourceLocation const& _location);
-	/// Appends a swap instruction to m_generatedItems to retrieve the element at the given stack position.
-	/// @note this might also remove the last item if it exactly the same swap instruction.
-	void appendOrRemoveSwap(int _fromPosition, langutil::SourceLocation const& _location);
-	/// Appends the given assembly item.
-	void appendItem(AssemblyItem const& _item);
-
-	static int const c_invalidPosition = -0x7fffffff;
-
-	AssemblyItems m_generatedItems;
-	/// Current height of the stack relative to the start.
-	int m_stackHeight = 0;
-	/// If (b, a) is in m_requests then b is needed to compute a.
-	std::unordered_multimap<Id, Id> m_neededBy;
-	/// Current content of the stack.
-	std::map<int, Id> m_stack;
-	/// Current positions of equivalence classes, equal to the empty set if already deleted.
-	std::unordered_map<Id, std::set<int>> m_classPositions;
-
-	/// The actual equivalence class items and how to compute them.
-	ExpressionClasses& m_expressionClasses;
-	/// Keeps information about which storage or memory slots were written to by which operations.
-	/// The operations are sorted ascendingly by sequence number.
-	std::map<std::pair<StoreOperation::Target, Id>, StoreOperations> m_storeOperations;
-	/// The set of equivalence classes that should be present on the stack at the end.
-	std::set<Id> m_finalClasses;
-	std::map<int, Id> m_targetStack;
-};
-
-template <class AssemblyItemIterator>
-AssemblyItemIterator CommonSubexpressionEliminator::feedItems(
-	AssemblyItemIterator _iterator,
-	AssemblyItemIterator _end,
-	bool _msizeImportant
-)
-{
-	assertThrow(!m_breakingItem, OptimizerException, "Invalid use of CommonSubexpressionEliminator.");
-	unsigned const maxChunkSize = 2000;
-	unsigned chunkSize = 0;
-	for (
-		;
-		_iterator != _end && !SemanticInformation::breaksCSEAnalysisBlock(*_iterator, _msizeImportant) && chunkSize < maxChunkSize;
-		++_iterator, ++chunkSize
-	)
-		feedItem(*_iterator);
-	if (_iterator != _end && chunkSize < maxChunkSize)
-		m_breakingItem = &(*_iterator++);
-	return _iterator;
-}
-
-}
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
deleted file mode 100644
index 62dbc803bbc2..000000000000
--- a/libevmasm/ConstantOptimiser.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file ConstantOptimiser.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- */
-
-#include <libevmasm/ConstantOptimiser.h>
-#include <libevmasm/Assembly.h>
-#include <libevmasm/GasMeter.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-unsigned ConstantOptimisationMethod::optimiseConstants(
-	bool _isCreation,
-	size_t _runs,
-	langutil::EVMVersion _evmVersion,
-	Assembly& _assembly
-)
-{
-	// TODO: design the optimiser in a way this is not needed
-	AssemblyItems& _items = _assembly.items();
-
-	unsigned optimisations = 0;
-	std::map<AssemblyItem, size_t> pushes;
-	for (AssemblyItem const& item: _items)
-		if (item.type() == Push)
-			pushes[item]++;
-	std::map<u256, AssemblyItems> pendingReplacements;
-	for (auto it: pushes)
-	{
-		AssemblyItem const& item = it.first;
-		if (item.data() < 0x100)
-			continue;
-		Params params;
-		params.multiplicity = it.second;
-		params.isCreation = _isCreation;
-		params.runs = _runs;
-		params.evmVersion = _evmVersion;
-		LiteralMethod lit(params, item.data());
-		bigint literalGas = lit.gasNeeded();
-		CodeCopyMethod copy(params, item.data());
-		bigint copyGas = copy.gasNeeded();
-		ComputeMethod compute(params, item.data());
-		bigint computeGas = compute.gasNeeded();
-		AssemblyItems replacement;
-		if (copyGas < literalGas && copyGas < computeGas)
-		{
-			replacement = copy.execute(_assembly);
-			optimisations++;
-		}
-		else if (computeGas < literalGas && computeGas <= copyGas)
-		{
-			replacement = compute.execute(_assembly);
-			optimisations++;
-		}
-		if (!replacement.empty())
-			pendingReplacements[item.data()] = replacement;
-	}
-	if (!pendingReplacements.empty())
-		replaceConstants(_items, pendingReplacements);
-	return optimisations;
-}
-
-bigint ConstantOptimisationMethod::simpleRunGas(AssemblyItems const& _items, langutil::EVMVersion _evmVersion)
-{
-	bigint gas = 0;
-	for (AssemblyItem const& item: _items)
-		if (item.type() == Push)
-			gas += GasMeter::runGas(Instruction::PUSH1, _evmVersion);
-		else if (item.type() == Operation)
-		{
-			if (item.instruction() == Instruction::EXP)
-				gas += GasCosts::expGas;
-			else
-				gas += GasMeter::runGas(item.instruction(), _evmVersion);
-		}
-	return gas;
-}
-
-bigint ConstantOptimisationMethod::dataGas(bytes const& _data) const
-{
-	assertThrow(_data.size() > 0, OptimizerException, "Empty bytecode generated.");
-	return bigint(GasMeter::dataGas(_data, m_params.isCreation, m_params.evmVersion));
-}
-
-size_t ConstantOptimisationMethod::bytesRequired(AssemblyItems const& _items)
-{
-	return evmasm::bytesRequired(_items, 3, Precision::Approximate); // assume 3 byte addresses
-}
-
-void ConstantOptimisationMethod::replaceConstants(
-	AssemblyItems& _items,
-	std::map<u256, AssemblyItems> const& _replacements
-)
-{
-	AssemblyItems replaced;
-	for (AssemblyItem const& item: _items)
-	{
-		if (item.type() == Push)
-		{
-			auto it = _replacements.find(item.data());
-			if (it != _replacements.end())
-			{
-				replaced += it->second;
-				continue;
-			}
-		}
-		replaced.push_back(item);
-	}
-	_items = std::move(replaced);
-}
-
-bigint LiteralMethod::gasNeeded() const
-{
-	return combineGas(
-		simpleRunGas({Instruction::PUSH1}, m_params.evmVersion),
-		// PUSHX plus data
-		(m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas) + dataGas(toCompactBigEndian(m_value, 1)),
-		0
-	);
-}
-
-bigint CodeCopyMethod::gasNeeded() const
-{
-	return combineGas(
-		// Run gas: we ignore memory increase costs
-		simpleRunGas(copyRoutine(), m_params.evmVersion) + GasCosts::copyGas,
-		// Data gas for copy routines: Some bytes are zero, but we ignore them.
-		bytesRequired(copyRoutine()) * (m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas),
-		// Data gas for data itself
-		dataGas(toBigEndian(m_value))
-	);
-}
-
-AssemblyItems CodeCopyMethod::execute(Assembly& _assembly) const
-{
-	bytes data = toBigEndian(m_value);
-	assertThrow(data.size() == 32, OptimizerException, "Invalid number encoding.");
-	AssemblyItems actualCopyRoutine = copyRoutine();
-	actualCopyRoutine[4] = _assembly.newData(data);
-	return actualCopyRoutine;
-}
-
-AssemblyItems const& CodeCopyMethod::copyRoutine()
-{
-	AssemblyItems static copyRoutine{
-		// constant to be reused 3+ times
-		u256(0),
-
-		// back up memory
-		// mload(0)
-		Instruction::DUP1,
-		Instruction::MLOAD,
-
-		// codecopy(0, <offset>, 32)
-		u256(32),
-		AssemblyItem(PushData, u256(1) << 16), // replaced above in actualCopyRoutine[4]
-		Instruction::DUP4,
-		Instruction::CODECOPY,
-
-		// mload(0)
-		Instruction::DUP2,
-		Instruction::MLOAD,
-
-		// restore original memory
-		Instruction::SWAP2,
-		Instruction::MSTORE
-	};
-	return copyRoutine;
-}
-
-AssemblyItems ComputeMethod::findRepresentation(u256 const& _value)
-{
-	if (_value < 0x10000)
-		// Very small value, not worth computing
-		return AssemblyItems{_value};
-	else if (numberEncodingSize(~_value) < numberEncodingSize(_value))
-		// Negated is shorter to represent
-		return findRepresentation(~_value) + AssemblyItems{Instruction::NOT};
-	else
-	{
-		// Decompose value into a * 2**k + b where abs(b) << 2**k
-		// Is not always better, try literal and decomposition method.
-		AssemblyItems routine{u256(_value)};
-		bigint bestGas = gasNeeded(routine);
-		for (unsigned bits = 255; bits > 8 && m_maxSteps > 0; --bits)
-		{
-			unsigned gapDetector = unsigned((_value >> (bits - 8)) & 0x1ff);
-			if (gapDetector != 0xff && gapDetector != 0x100)
-				continue;
-
-			u256 powerOfTwo = u256(1) << bits;
-			u256 upperPart = _value >> bits;
-			bigint lowerPart = _value & (powerOfTwo - 1);
-			if ((powerOfTwo - lowerPart) < lowerPart)
-			{
-				lowerPart = lowerPart - powerOfTwo; // make it negative
-				upperPart++;
-			}
-			if (upperPart == 0)
-				continue;
-			if (abs(lowerPart) >= (powerOfTwo >> 8))
-				continue;
-
-			AssemblyItems newRoutine;
-			if (lowerPart != 0)
-				newRoutine += findRepresentation(u256(abs(lowerPart)));
-			if (m_params.evmVersion.hasBitwiseShifting())
-			{
-				newRoutine += findRepresentation(upperPart);
-				newRoutine += AssemblyItems{u256(bits), Instruction::SHL};
-			}
-			else
-			{
-				newRoutine += AssemblyItems{u256(bits), u256(2), Instruction::EXP};
-				if (upperPart != 1)
-					newRoutine += findRepresentation(upperPart) + AssemblyItems{Instruction::MUL};
-			}
-			if (lowerPart > 0)
-				newRoutine += AssemblyItems{Instruction::ADD};
-			else if (lowerPart < 0)
-				newRoutine.push_back(Instruction::SUB);
-
-			if (m_maxSteps > 0)
-				m_maxSteps--;
-			bigint newGas = gasNeeded(newRoutine);
-			if (newGas < bestGas)
-			{
-				bestGas = std::move(newGas);
-				routine = std::move(newRoutine);
-			}
-		}
-		return routine;
-	}
-}
-
-bool ComputeMethod::checkRepresentation(u256 const& _value, AssemblyItems const& _routine) const
-{
-	// This is a tiny EVM that can only evaluate some instructions.
-	std::vector<u256> stack;
-	for (AssemblyItem const& item: _routine)
-	{
-		switch (item.type())
-		{
-		case Operation:
-		{
-			if (stack.size() < item.arguments())
-				return false;
-			u256* sp = &stack.back();
-			switch (item.instruction())
-			{
-			case Instruction::MUL:
-				sp[-1] = sp[0] * sp[-1];
-				break;
-			case Instruction::EXP:
-				if (sp[-1] > 0xff)
-					return false;
-				sp[-1] = boost::multiprecision::pow(sp[0], unsigned(sp[-1]));
-				break;
-			case Instruction::ADD:
-				sp[-1] = sp[0] + sp[-1];
-				break;
-			case Instruction::SUB:
-				sp[-1] = sp[0] - sp[-1];
-				break;
-			case Instruction::NOT:
-				sp[0] = ~sp[0];
-				break;
-			case Instruction::SHL:
-				assertThrow(
-					m_params.evmVersion.hasBitwiseShifting(),
-					OptimizerException,
-					"Shift generated for invalid EVM version."
-				);
-				assertThrow(sp[0] <= u256(255), OptimizerException, "Invalid shift generated.");
-				sp[-1] = u256(bigint(sp[-1]) << unsigned(sp[0]));
-				break;
-			case Instruction::SHR:
-				assertThrow(
-					m_params.evmVersion.hasBitwiseShifting(),
-					OptimizerException,
-					"Shift generated for invalid EVM version."
-				);
-				assertThrow(sp[0] <= u256(255), OptimizerException, "Invalid shift generated.");
-				sp[-1] = sp[-1] >> unsigned(sp[0]);
-				break;
-			default:
-				return false;
-			}
-			stack.resize(stack.size() + item.deposit());
-			break;
-		}
-		case Push:
-			stack.push_back(item.data());
-			break;
-		default:
-			return false;
-		}
-	}
-	return stack.size() == 1 && stack.front() == _value;
-}
-
-bigint ComputeMethod::gasNeeded(AssemblyItems const& _routine) const
-{
-	auto numExps = static_cast<size_t>(count(_routine.begin(), _routine.end(), Instruction::EXP));
-	return combineGas(
-		simpleRunGas(_routine, m_params.evmVersion) + numExps * (GasCosts::expGas + GasCosts::expByteGas(m_params.evmVersion)),
-		// Data gas for routine: Some bytes are zero, but we ignore them.
-		bytesRequired(_routine) * (m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas),
-		0
-	);
-}
diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
deleted file mode 100644
index b491fb00422f..000000000000
--- a/libevmasm/ConstantOptimiser.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file ConstantOptimiser.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- */
-
-#pragma once
-
-#include <libevmasm/Exceptions.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/Numeric.h>
-#include <libsolutil/Assertions.h>
-
-#include <vector>
-
-namespace solidity::evmasm
-{
-
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-class Assembly;
-
-/**
- * Abstract base class for one way to change how constants are represented in the code.
- */
-class ConstantOptimisationMethod
-{
-public:
-	/// Tries to optimised how constants are represented in the source code and modifies
-	/// @a _assembly.
-	/// @returns zero if no optimisations could be performed.
-	static unsigned optimiseConstants(
-		bool _isCreation,
-		size_t _runs,
-		langutil::EVMVersion _evmVersion,
-		Assembly& _assembly
-	);
-
-protected:
-	/// This is the public API for the optimiser methods, but it doesn't need to be exposed to the caller.
-
-	struct Params
-	{
-		bool isCreation; ///< Whether this is called during contract creation or runtime.
-		size_t runs; ///< Estimated number of calls per opcode oven the lifetime of the contract.
-		size_t multiplicity; ///< Number of times the constant appears in the code.
-		langutil::EVMVersion evmVersion; ///< Version of the EVM
-	};
-
-	explicit ConstantOptimisationMethod(Params const& _params, u256 const& _value):
-		m_params(_params), m_value(_value) {}
-	virtual ~ConstantOptimisationMethod() = default;
-	virtual bigint gasNeeded() const = 0;
-	/// Executes the method, potentially appending to the assembly and returns a vector of
-	/// assembly items the constant should be relpaced with in one sweep.
-	/// If the vector is empty, the constants will not be deleted.
-	virtual AssemblyItems execute(Assembly& _assembly) const = 0;
-
-protected:
-	/// @returns the run gas for the given items ignoring special gas costs
-	static bigint simpleRunGas(AssemblyItems const& _items, langutil::EVMVersion _evmVersion);
-	/// @returns the gas needed to store the given data literally
-	bigint dataGas(bytes const& _data) const;
-	static size_t bytesRequired(AssemblyItems const& _items);
-	/// @returns the combined estimated gas usage taking @a m_params into account.
-	bigint combineGas(
-		bigint const& _runGas,
-		bigint const& _repeatedDataGas,
-		bigint const& _uniqueDataGas
-	) const
-	{
-		// _runGas is not multiplied by _multiplicity because the runs are "per opcode"
-		return m_params.runs * _runGas + m_params.multiplicity * _repeatedDataGas + _uniqueDataGas;
-	}
-
-	/// Replaces all constants i by the code given in @a _replacement[i].
-	static void replaceConstants(AssemblyItems& _items, std::map<u256, AssemblyItems> const& _replacements);
-
-	Params m_params;
-	u256 const& m_value;
-};
-
-/**
- * Optimisation method that pushes the constant to the stack literally. This is the default method,
- * i.e. executing it does not alter the Assembly.
- */
-class LiteralMethod: public ConstantOptimisationMethod
-{
-public:
-	explicit LiteralMethod(Params const& _params, u256 const& _value):
-		ConstantOptimisationMethod(_params, _value) {}
-	bigint gasNeeded() const override;
-	AssemblyItems execute(Assembly&) const override { return AssemblyItems{}; }
-};
-
-/**
- * Method that stores the data in the .data section of the code and copies it to the stack.
- */
-class CodeCopyMethod: public ConstantOptimisationMethod
-{
-public:
-	explicit CodeCopyMethod(Params const& _params, u256 const& _value):
-		ConstantOptimisationMethod(_params, _value) {}
-	bigint gasNeeded() const override;
-	AssemblyItems execute(Assembly& _assembly) const override;
-
-protected:
-	static AssemblyItems const& copyRoutine();
-};
-
-/**
- * Method that tries to compute the constant.
- */
-class ComputeMethod: public ConstantOptimisationMethod
-{
-public:
-	explicit ComputeMethod(Params const& _params, u256 const& _value):
-		ConstantOptimisationMethod(_params, _value)
-	{
-		m_routine = findRepresentation(m_value);
-		assertThrow(
-			checkRepresentation(m_value, m_routine),
-			OptimizerException,
-			"Invalid constant expression created."
-		);
-	}
-
-	bigint gasNeeded() const override { return gasNeeded(m_routine); }
-	AssemblyItems execute(Assembly&) const override
-	{
-		return m_routine;
-	}
-
-protected:
-	/// Tries to recursively find a way to compute @a _value.
-	AssemblyItems findRepresentation(u256 const& _value);
-	/// Recomputes the value from the calculated representation and checks for correctness.
-	bool checkRepresentation(u256 const& _value, AssemblyItems const& _routine) const;
-	bigint gasNeeded(AssemblyItems const& _routine) const;
-
-	/// Counter for the complexity of optimization, will stop when it reaches zero.
-	size_t m_maxSteps = 10000;
-	AssemblyItems m_routine;
-};
-
-}
diff --git a/libevmasm/ControlFlowGraph.cpp b/libevmasm/ControlFlowGraph.cpp
deleted file mode 100644
index 9d2927ed9ca4..000000000000
--- a/libevmasm/ControlFlowGraph.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file ControlFlowGraph.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Control flow analysis for the optimizer.
- */
-
-#include <libevmasm/ControlFlowGraph.h>
-#include <map>
-#include <memory>
-#include <algorithm>
-#include <libevmasm/Exceptions.h>
-#include <libevmasm/AssemblyItem.h>
-#include <libevmasm/SemanticInformation.h>
-#include <libevmasm/KnownState.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-BlockId::BlockId(u256 const& _id):
-	m_id(unsigned(_id))
-{
-	assertThrow( _id < initial().m_id, OptimizerException, "Tag number too large.");
-}
-
-BasicBlocks ControlFlowGraph::optimisedBlocks()
-{
-	if (m_items.empty())
-		return BasicBlocks();
-
-	findLargestTag();
-	splitBlocks();
-	resolveNextLinks();
-	removeUnusedBlocks();
-	setPrevLinks();
-	gatherKnowledge();
-
-	return rebuildCode();
-}
-
-void ControlFlowGraph::findLargestTag()
-{
-	m_lastUsedId = 0;
-	for (auto const& item: m_items)
-		if (item.type() == Tag || item.type() == PushTag)
-		{
-			// Assert that it can be converted.
-			BlockId(item.data());
-			m_lastUsedId = std::max(unsigned(item.data()), m_lastUsedId);
-		}
-}
-
-void ControlFlowGraph::splitBlocks()
-{
-	m_blocks.clear();
-	BlockId id = BlockId::initial();
-	m_blocks[id].begin = 0;
-	for (size_t index = 0; index < m_items.size(); ++index)
-	{
-		AssemblyItem const& item = m_items.at(index);
-		if (item.type() == Tag)
-		{
-			if (id)
-				m_blocks[id].end = static_cast<unsigned>(index);
-			id = BlockId::invalid();
-		}
-		if (!id)
-		{
-			id = item.type() == Tag ? BlockId(item.data()) : generateNewId();
-			m_blocks[id].begin = static_cast<unsigned>(index);
-		}
-		if (item.type() == PushTag)
-			m_blocks[id].pushedTags.emplace_back(item.data());
-		if (SemanticInformation::altersControlFlow(item))
-		{
-			m_blocks[id].end = static_cast<unsigned>(index + 1);
-			if (item == Instruction::JUMP)
-				m_blocks[id].endType = BasicBlock::EndType::JUMP;
-			else if (item == Instruction::JUMPI)
-				m_blocks[id].endType = BasicBlock::EndType::JUMPI;
-			else
-				m_blocks[id].endType = BasicBlock::EndType::STOP;
-			id = BlockId::invalid();
-		}
-	}
-	if (id)
-	{
-		m_blocks[id].end = static_cast<unsigned>(m_items.size());
-		if (m_blocks[id].endType == BasicBlock::EndType::HANDOVER)
-			m_blocks[id].endType = BasicBlock::EndType::STOP;
-	}
-}
-
-void ControlFlowGraph::resolveNextLinks()
-{
-	std::map<unsigned, BlockId> blockByBeginPos;
-	for (auto const& idAndBlock: m_blocks)
-		if (idAndBlock.second.begin != idAndBlock.second.end)
-			blockByBeginPos[idAndBlock.second.begin] = idAndBlock.first;
-
-	for (auto& idAndBlock: m_blocks)
-	{
-		BasicBlock& block = idAndBlock.second;
-		switch (block.endType)
-		{
-		case BasicBlock::EndType::JUMPI:
-		case BasicBlock::EndType::HANDOVER:
-			assertThrow(
-				blockByBeginPos.count(block.end),
-				OptimizerException,
-				"Successor block not found."
-			);
-			block.next = blockByBeginPos.at(block.end);
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-void ControlFlowGraph::removeUnusedBlocks()
-{
-	std::vector<BlockId> blocksToProcess{BlockId::initial()};
-	std::set<BlockId> neededBlocks{BlockId::initial()};
-	while (!blocksToProcess.empty())
-	{
-		BasicBlock const& block = m_blocks.at(blocksToProcess.back());
-		blocksToProcess.pop_back();
-		for (BlockId tag: block.pushedTags)
-			if (!neededBlocks.count(tag) && m_blocks.count(tag))
-			{
-				neededBlocks.insert(tag);
-				blocksToProcess.push_back(tag);
-			}
-		if (block.next && !neededBlocks.count(block.next))
-		{
-			neededBlocks.insert(block.next);
-			blocksToProcess.push_back(block.next);
-		}
-	}
-	for (auto it = m_blocks.begin(); it != m_blocks.end();)
-		if (neededBlocks.count(it->first))
-			++it;
-		else
-			m_blocks.erase(it++);
-}
-
-void ControlFlowGraph::setPrevLinks()
-{
-	for (auto& idAndBlock: m_blocks)
-	{
-		BasicBlock& block = idAndBlock.second;
-		switch (block.endType)
-		{
-		case BasicBlock::EndType::JUMPI:
-		case BasicBlock::EndType::HANDOVER:
-			assertThrow(
-				!m_blocks.at(block.next).prev,
-				OptimizerException,
-				"Successor already has predecessor."
-			);
-			m_blocks[block.next].prev = idAndBlock.first;
-			break;
-		default:
-			break;
-		}
-	}
-	// If block ends with jump to not yet linked block, link them removing the jump
-	for (auto& idAndBlock: m_blocks)
-	{
-		BlockId blockId = idAndBlock.first;
-		BasicBlock& block = idAndBlock.second;
-		if (block.endType != BasicBlock::EndType::JUMP || block.end - block.begin < 2)
-			continue;
-		AssemblyItem const& push = m_items.at(block.end - 2);
-		if (push.type() != PushTag)
-			continue;
-		BlockId nextId(push.data());
-		if (m_blocks.count(nextId) && m_blocks.at(nextId).prev)
-			continue;
-		bool hasLoop = false;
-		for (BlockId id = nextId; id && m_blocks.count(id) && !hasLoop; id = m_blocks.at(id).next)
-			hasLoop = (id == blockId);
-		if (hasLoop || !m_blocks.count(nextId))
-			continue;
-
-		m_blocks[nextId].prev = blockId;
-		block.next = nextId;
-		block.end -= 2;
-		assertThrow(
-			!block.pushedTags.empty() && block.pushedTags.back() == nextId,
-			OptimizerException,
-			"Last pushed tag not at end of pushed list."
-		);
-		block.pushedTags.pop_back();
-		block.endType = BasicBlock::EndType::HANDOVER;
-	}
-}
-
-void ControlFlowGraph::gatherKnowledge()
-{
-	// @todo actually we know that memory is filled with zeros at the beginning,
-	// we could make use of that.
-	KnownStatePointer emptyState = std::make_shared<KnownState>();
-	bool unknownJumpEncountered = false;
-
-	struct WorkQueueItem {
-		BlockId blockId;
-		KnownStatePointer state;
-		std::set<BlockId> blocksSeen;
-	};
-
-	std::vector<WorkQueueItem> workQueue{WorkQueueItem{BlockId::initial(), emptyState->copy(), std::set<BlockId>()}};
-	auto addWorkQueueItem = [&](WorkQueueItem const& _currentItem, BlockId _to, KnownStatePointer const& _state)
-	{
-		WorkQueueItem item;
-		item.blockId = _to;
-		item.state = _state->copy();
-		item.blocksSeen = _currentItem.blocksSeen;
-		item.blocksSeen.insert(_currentItem.blockId);
-		workQueue.push_back(std::move(item));
-	};
-
-	while (!workQueue.empty())
-	{
-		WorkQueueItem item = std::move(workQueue.back());
-		workQueue.pop_back();
-		//@todo we might have to do something like incrementing the sequence number for each JUMPDEST
-		assertThrow(!!item.blockId, OptimizerException, "");
-		if (!m_blocks.count(item.blockId))
-			continue; // too bad, we do not know the tag, probably an invalid jump
-		BasicBlock& block = m_blocks.at(item.blockId);
-		KnownStatePointer state = item.state;
-		if (block.startState)
-		{
-			// We call reduceToCommonKnowledge even in the non-join setting to get the correct
-			// sequence number
-			if (!m_joinKnowledge)
-				state->reset();
-			state->reduceToCommonKnowledge(*block.startState, !item.blocksSeen.count(item.blockId));
-			if (*state == *block.startState)
-				continue;
-		}
-
-		block.startState = state->copy();
-
-		// Feed all items except for the final jump yet because it will erase the target tag.
-		unsigned pc = block.begin;
-		while (pc < block.end && !SemanticInformation::altersControlFlow(m_items.at(pc)))
-			state->feedItem(m_items.at(pc++));
-
-		if (
-			block.endType == BasicBlock::EndType::JUMP ||
-			block.endType == BasicBlock::EndType::JUMPI
-		)
-		{
-			assertThrow(block.begin <= pc && pc == block.end - 1, OptimizerException, "");
-			//@todo in the case of JUMPI, add knowledge about the condition to the state
-			// (for both values of the condition)
-			std::set<u256> tags = state->tagsInExpression(
-				state->stackElement(state->stackHeight(), langutil::SourceLocation{})
-			);
-			state->feedItem(m_items.at(pc++));
-
-			if (tags.empty())
-			{
-				if (!unknownJumpEncountered)
-				{
-					// We do not know the target of this jump, so we have to reset the states of all
-					// JUMPDESTs.
-					unknownJumpEncountered = true;
-					for (auto const& it: m_blocks)
-						if (it.second.begin < it.second.end && m_items[it.second.begin].type() == Tag)
-							workQueue.push_back(WorkQueueItem{it.first, emptyState->copy(), std::set<BlockId>()});
-				}
-			}
-			else
-				for (auto tag: tags)
-					addWorkQueueItem(item, BlockId(tag), state);
-		}
-		else if (block.begin <= pc && pc < block.end)
-			state->feedItem(m_items.at(pc++));
-		assertThrow(block.end <= block.begin || pc == block.end, OptimizerException, "");
-
-		block.endState = state;
-
-		if (
-			block.endType == BasicBlock::EndType::HANDOVER ||
-			block.endType == BasicBlock::EndType::JUMPI
-		)
-			addWorkQueueItem(item, block.next, state);
-	}
-
-	// Remove all blocks we never visited here. This might happen because a tag is pushed but
-	// never used for a JUMP.
-	// Note that this invalidates some contents of pushedTags
-	for (auto it = m_blocks.begin(); it != m_blocks.end();)
-		if (!it->second.startState)
-			it = m_blocks.erase(it);
-		else
-			it++;
-}
-
-BasicBlocks ControlFlowGraph::rebuildCode()
-{
-	std::map<BlockId, unsigned> pushes;
-	for (auto& idAndBlock: m_blocks)
-		for (BlockId ref: idAndBlock.second.pushedTags)
-			if (m_blocks.count(ref))
-				pushes[ref]++;
-
-	std::set<BlockId> blocksToAdd;
-	for (auto it: m_blocks)
-		blocksToAdd.insert(it.first);
-	std::set<BlockId> blocksAdded;
-	BasicBlocks blocks;
-
-	for (
-		BlockId blockId = BlockId::initial();
-		blockId;
-		blockId = blocksToAdd.empty() ? BlockId::invalid() : *blocksToAdd.begin()
-	)
-	{
-		bool previousHandedOver = (blockId == BlockId::initial());
-		while (m_blocks.at(blockId).prev)
-			blockId = m_blocks.at(blockId).prev;
-		for (; blockId; blockId = m_blocks.at(blockId).next)
-		{
-			BasicBlock& block = m_blocks.at(blockId);
-			blocksToAdd.erase(blockId);
-			blocksAdded.insert(blockId);
-
-			if (block.begin == block.end)
-				continue;
-			// If block starts with unused tag, skip it.
-			if (previousHandedOver && !pushes[blockId] && m_items[block.begin].type() == Tag)
-				++block.begin;
-			if (block.begin < block.end)
-			{
-				blocks.push_back(block);
-				blocks.back().startState->clearTagUnions();
-				blocks.back().endState->clearTagUnions();
-			}
-			previousHandedOver = (block.endType == BasicBlock::EndType::HANDOVER);
-		}
-	}
-
-	return blocks;
-}
-
-BlockId ControlFlowGraph::generateNewId()
-{
-	BlockId id = BlockId(++m_lastUsedId);
-	assertThrow(id < BlockId::initial(), OptimizerException, "Out of block IDs.");
-	return id;
-}
diff --git a/libevmasm/ControlFlowGraph.h b/libevmasm/ControlFlowGraph.h
deleted file mode 100644
index ef6dd2f888e9..000000000000
--- a/libevmasm/ControlFlowGraph.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file ControlFlowGraph.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Control flow analysis for the optimizer.
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Assertions.h>
-#include <libevmasm/ExpressionClasses.h>
-
-#include <vector>
-#include <memory>
-#include <limits>
-
-namespace solidity::evmasm
-{
-
-class KnownState;
-using KnownStatePointer = std::shared_ptr<KnownState>;
-
-/**
- * Identifier for a block, coincides with the tag number of an AssemblyItem but adds a special
- * ID for the initial block.
- */
-class BlockId
-{
-public:
-	BlockId() { *this = invalid(); }
-	explicit BlockId(unsigned _id): m_id(_id) {}
-	explicit BlockId(u256 const& _id);
-	static BlockId initial() { return BlockId(std::numeric_limits<unsigned>::max() - 1); }
-	static BlockId invalid() { return BlockId(std::numeric_limits<unsigned>::max()); }
-
-	bool operator==(BlockId const& _other) const { return m_id == _other.m_id; }
-	bool operator!=(BlockId const& _other) const { return m_id != _other.m_id; }
-	bool operator<(BlockId const& _other) const { return m_id < _other.m_id; }
-	explicit operator bool() const { return *this != invalid(); }
-
-private:
-	unsigned m_id;
-};
-
-/**
- * Control flow block inside which instruction counter is always incremented by one
- * (except for possibly the last instruction).
- */
-struct BasicBlock
-{
-	/// Start index into assembly item list.
-	unsigned begin = 0;
-	/// End index (excluded) inte assembly item list.
-	unsigned end = 0;
-	/// Tags pushed inside this block, with multiplicity.
-	std::vector<BlockId> pushedTags;
-	/// ID of the block that always follows this one (either non-branching part of JUMPI or flow
-	/// into new block), or BlockId::invalid() otherwise
-	BlockId next = BlockId::invalid();
-	/// ID of the block that has to precede this one (because control flows into it).
-	BlockId prev = BlockId::invalid();
-
-	enum class EndType { JUMP, JUMPI, STOP, HANDOVER };
-	EndType endType = EndType::HANDOVER;
-
-	/// Knowledge about the state when this block is entered. Intersection of all possible ways
-	/// to enter this block.
-	KnownStatePointer startState;
-	/// Knowledge about the state at the end of this block.
-	KnownStatePointer endState;
-};
-
-using BasicBlocks = std::vector<BasicBlock>;
-
-/**
- * Control flow graph optimizer.
- * ASSUMES THAT WE ONLY JUMP TO TAGS THAT WERE PREVIOUSLY PUSHED. THIS IS NOT TRUE ANYMORE
- * NOW THAT FUNCTION TAGS CAN BE STORED IN STORAGE.
- */
-class ControlFlowGraph
-{
-public:
-	/// Initializes the control flow graph.
-	/// @a _items has to persist across the usage of this class.
-	/// @a _joinKnowledge if true, reduces state knowledge to common base at the join of two paths
-	explicit ControlFlowGraph(AssemblyItems const& _items, bool _joinKnowledge = true):
-		m_items(_items),
-		m_joinKnowledge(_joinKnowledge)
-	{}
-	/// @returns vector of basic blocks in the order they should be used in the final code.
-	/// Should be called only once.
-	BasicBlocks optimisedBlocks();
-
-private:
-	void findLargestTag();
-	void splitBlocks();
-	void resolveNextLinks();
-	void removeUnusedBlocks();
-	void gatherKnowledge();
-	void setPrevLinks();
-	BasicBlocks rebuildCode();
-
-	BlockId generateNewId();
-
-	unsigned m_lastUsedId = 0;
-	AssemblyItems const& m_items;
-	bool m_joinKnowledge = true;
-	std::map<BlockId, BasicBlock> m_blocks;
-};
-
-
-}
diff --git a/libevmasm/Disassemble.cpp b/libevmasm/Disassemble.cpp
deleted file mode 100644
index 27e860661d63..000000000000
--- a/libevmasm/Disassemble.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libevmasm/Disassemble.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonIO.h>
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-
-
-void solidity::evmasm::eachInstruction(
-	bytes const& _mem,
-	langutil::EVMVersion _evmVersion,
-	std::function<void(Instruction,u256 const&)> const& _onInstruction
-)
-{
-	for (auto it = _mem.begin(); it < _mem.end(); ++it)
-	{
-		Instruction const instr{*it};
-		int additional = 0;
-		if (isValidInstruction(instr))
-			additional = instructionInfo(instr, _evmVersion).additional;
-
-		u256 data{};
-
-		// fill the data with the additional data bytes from the instruction stream
-		while (additional > 0 && std::next(it) < _mem.end())
-		{
-			data <<= 8;
-			data |= *++it;
-			--additional;
-		}
-
-		// pad the remaining number of additional octets with zeros
-		data <<= 8 * additional;
-
-		_onInstruction(instr, data);
-	}
-}
-
-std::string solidity::evmasm::disassemble(bytes const& _mem, langutil::EVMVersion _evmVersion, std::string const& _delimiter)
-{
-	std::stringstream ret;
-	eachInstruction(_mem, _evmVersion, [&](Instruction _instr, u256 const& _data) {
-		if (!isValidInstruction(_instr))
-			ret << "0x" << std::uppercase << std::hex << static_cast<int>(_instr) << _delimiter;
-		else
-		{
-			InstructionInfo info = instructionInfo(_instr, _evmVersion);
-			ret << info.name;
-			if (info.additional)
-				ret << " 0x" << std::uppercase << std::hex << _data;
-			ret << _delimiter;
-		}
-	});
-	return ret.str();
-}
diff --git a/libevmasm/Disassemble.h b/libevmasm/Disassemble.h
deleted file mode 100644
index 2e03a5d35c28..000000000000
--- a/libevmasm/Disassemble.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <functional>
-#include <string>
-
-namespace solidity::evmasm
-{
-
-/// Iterate through EVM code and call a function on each instruction.
-void eachInstruction(bytes const& _mem, langutil::EVMVersion _evmVersion, std::function<void(Instruction, u256 const&)> const& _onInstruction);
-
-/// Convert from EVM code to simple EVM assembly language.
-std::string disassemble(bytes const& _mem, langutil::EVMVersion _evmVersion, std::string const& _delimiter = " ");
-
-}
diff --git a/libevmasm/EVMAssemblyStack.cpp b/libevmasm/EVMAssemblyStack.cpp
deleted file mode 100644
index 68f60808c9d5..000000000000
--- a/libevmasm/EVMAssemblyStack.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libevmasm/EVMAssemblyStack.h>
-
-#include <libsolutil/JSON.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolidity/codegen/CompilerContext.h>
-
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <tuple>
-
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace solidity::evmasm
-{
-
-void EVMAssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
-{
-	solAssert(!m_evmAssembly);
-	m_name = _sourceName;
-	Json::Value assemblyJson;
-	solRequire(jsonParseStrict(_source, assemblyJson), AssemblyImportException, "Could not parse JSON file.");
-	std::tie(m_evmAssembly, m_sourceList) = evmasm::Assembly::fromJSON(assemblyJson);
-	solRequire(m_evmAssembly != nullptr, AssemblyImportException, "Could not create evm assembly object.");
-}
-
-void EVMAssemblyStack::assemble()
-{
-	solAssert(m_evmAssembly);
-	solAssert(m_evmAssembly->isCreation());
-	solAssert(!m_evmRuntimeAssembly);
-
-	m_object = m_evmAssembly->assemble();
-	m_sourceMapping = AssemblyItem::computeSourceMapping(m_evmAssembly->items(), sourceIndices());
-	if (m_evmAssembly->numSubs() > 0)
-	{
-		m_evmRuntimeAssembly = std::make_shared<evmasm::Assembly>(m_evmAssembly->sub(0));
-		solAssert(m_evmRuntimeAssembly && !m_evmRuntimeAssembly->isCreation());
-		m_runtimeSourceMapping = AssemblyItem::computeSourceMapping(m_evmRuntimeAssembly->items(), sourceIndices());
-		m_runtimeObject = m_evmRuntimeAssembly->assemble();
-	}
-}
-
-LinkerObject const& EVMAssemblyStack::object(std::string const& _contractName) const
-{
-	solAssert(_contractName == m_name);
-	return m_object;
-}
-
-LinkerObject const& EVMAssemblyStack::runtimeObject(std::string const& _contractName) const
-{
-	solAssert(_contractName == m_name);
-	return m_runtimeObject;
-}
-
-std::map<std::string, unsigned> EVMAssemblyStack::sourceIndices() const
-{
-	solAssert(m_evmAssembly);
-	return m_sourceList
-		| ranges::views::enumerate
-		| ranges::views::transform([](auto const& _source) { return std::make_pair(_source.second, _source.first); })
-		| ranges::to<std::map<std::string, unsigned>>;
-}
-
-std::string const* EVMAssemblyStack::sourceMapping(std::string const& _contractName) const
-{
-	solAssert(_contractName == m_name);
-	return &m_sourceMapping;
-}
-
-std::string const* EVMAssemblyStack::runtimeSourceMapping(std::string const& _contractName) const
-{
-	solAssert(_contractName == m_name);
-	return &m_runtimeSourceMapping;
-}
-
-Json::Value EVMAssemblyStack::assemblyJSON(std::string const& _contractName) const
-{
-	solAssert(_contractName == m_name);
-	solAssert(m_evmAssembly);
-	return m_evmAssembly->assemblyJSON(sourceIndices());
-}
-
-std::string EVMAssemblyStack::assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const
-{
-	solAssert(_contractName == m_name);
-	solAssert(m_evmAssembly);
-	return m_evmAssembly->assemblyString(m_debugInfoSelection, _sourceCodes);
-}
-
-std::string const EVMAssemblyStack::filesystemFriendlyName(std::string const& _contractName) const
-{
-	solAssert(_contractName == m_name);
-	return m_name;
-}
-
-std::vector<std::string> EVMAssemblyStack::sourceNames() const
-{
-	return m_sourceList;
-}
-
-} // namespace solidity::evmasm
diff --git a/libevmasm/EVMAssemblyStack.h b/libevmasm/EVMAssemblyStack.h
deleted file mode 100644
index cf02cec52f2c..000000000000
--- a/libevmasm/EVMAssemblyStack.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libevmasm/AbstractAssemblyStack.h>
-#include <libevmasm/Assembly.h>
-#include <libevmasm/LinkerObject.h>
-
-#include <libsolutil/JSON.h>
-
-#include <map>
-#include <string>
-
-namespace solidity::evmasm
-{
-
-class EVMAssemblyStack: public AbstractAssemblyStack
-{
-public:
-	explicit EVMAssemblyStack(langutil::EVMVersion _evmVersion): m_evmVersion(_evmVersion) {}
-
-	/// Runs parsing and analysis steps.
-	/// Multiple calls overwrite the previous state.
-	/// @throws AssemblyImportException, if JSON could not be validated.
-	void parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
-
-	void assemble();
-
-	std::string const& name() const { return m_name; }
-
-	virtual LinkerObject const& object(std::string const& _contractName) const override;
-	virtual LinkerObject const& runtimeObject(std::string const& _contractName) const override;
-
-	std::shared_ptr<evmasm::Assembly> const& evmAssembly() const { return m_evmAssembly; }
-	std::shared_ptr<evmasm::Assembly> const& evmRuntimeAssembly() const { return m_evmRuntimeAssembly; }
-
-	virtual std::string const* sourceMapping(std::string const& _contractName) const override;
-	virtual std::string const* runtimeSourceMapping(std::string const& _contractName) const override;
-
-	virtual Json::Value assemblyJSON(std::string const& _contractName) const override;
-	virtual std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const override;
-
-	virtual std::string const filesystemFriendlyName(std::string const& _contractName) const override;
-
-	virtual std::vector<std::string> contractNames() const override { return {m_name}; }
-	virtual std::vector<std::string> sourceNames() const override;
-	std::map<std::string, unsigned> sourceIndices() const;
-
-	virtual bool compilationSuccessful() const override { return m_evmAssembly != nullptr; }
-
-	void selectDebugInfo(langutil::DebugInfoSelection _debugInfoSelection)
-	{
-		m_debugInfoSelection = _debugInfoSelection;
-	}
-
-private:
-	langutil::EVMVersion m_evmVersion;
-	std::string m_name;
-	std::shared_ptr<evmasm::Assembly> m_evmAssembly;
-	std::shared_ptr<evmasm::Assembly> m_evmRuntimeAssembly;
-	evmasm::LinkerObject m_object; ///< Deployment object (includes the runtime sub-object).
-	evmasm::LinkerObject m_runtimeObject; ///< Runtime object.
-	std::vector<std::string> m_sourceList;
-	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();
-	std::string m_sourceMapping;
-	std::string m_runtimeSourceMapping;
-};
-
-} // namespace solidity::evmasm
diff --git a/libevmasm/Exceptions.h b/libevmasm/Exceptions.h
deleted file mode 100644
index ae6d1bf9c617..000000000000
--- a/libevmasm/Exceptions.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Exceptions.h
- * @author Christian <c@ethdev.com>
- * @date 2014
- */
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-
-namespace solidity::evmasm
-{
-
-struct AssemblyException: virtual util::Exception {};
-struct AssemblyImportException: virtual AssemblyException {};
-struct OptimizerException: virtual AssemblyException {};
-struct StackTooDeepException: virtual OptimizerException {};
-struct ItemNotAvailableException: virtual OptimizerException {};
-
-DEV_SIMPLE_EXCEPTION(InvalidDeposit);
-DEV_SIMPLE_EXCEPTION(InvalidOpcode);
-
-}
diff --git a/libevmasm/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
deleted file mode 100644
index dd66eea32840..000000000000
--- a/libevmasm/ExpressionClasses.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file ExpressionClasses.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Container for equivalence classes of expressions for use in common subexpression elimination.
- */
-
-#include <libevmasm/ExpressionClasses.h>
-
-#include <libevmasm/Assembly.h>
-#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmasm/SimplificationRules.h>
-
-#include <boost/container_hash/hash.hpp>
-
-#include <functional>
-#include <limits>
-#include <tuple>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-bool ExpressionClasses::Expression::operator==(ExpressionClasses::Expression const& _other) const
-{
-	assertThrow(!!item && !!_other.item, OptimizerException, "");
-	auto type = item->type();
-	auto otherType = _other.item->type();
-	if (type != otherType)
-		return false;
-	else if (type == Operation)
-	{
-		auto instr = item->instruction();
-		auto otherInstr = _other.item->instruction();
-		return std::tie(instr, arguments, sequenceNumber) ==
-			std::tie(otherInstr, _other.arguments, _other.sequenceNumber);
-	}
-	else
-		return std::tie(item->data(), arguments, sequenceNumber) ==
-			std::tie(_other.item->data(), _other.arguments, _other.sequenceNumber);
-}
-
-size_t ExpressionClasses::Expression::ExpressionHash::operator()(Expression const& _expression) const
-{
-	assertThrow(!!_expression.item, OptimizerException, "");
-	size_t seed = 0;
-	auto type = _expression.item->type();
-	boost::hash_combine(seed, type);
-
-	if (type == Operation)
-		boost::hash_combine(seed, _expression.item->instruction());
-	else
-		boost::hash_combine(seed, _expression.item->data());
-
-	boost::hash_range(seed, _expression.arguments.begin(), _expression.arguments.end());
-	boost::hash_combine(seed, _expression.sequenceNumber);
-
-	return seed;
-}
-
-ExpressionClasses::Id ExpressionClasses::find(
-	AssemblyItem const& _item,
-	Ids const& _arguments,
-	bool _copyItem,
-	unsigned _sequenceNumber
-)
-{
-	Expression exp;
-	exp.id = Id(-1);
-	exp.item = &_item;
-	exp.arguments = _arguments;
-	exp.sequenceNumber = _sequenceNumber;
-
-	if (SemanticInformation::isCommutativeOperation(_item))
-		sort(exp.arguments.begin(), exp.arguments.end());
-
-	if (SemanticInformation::isDeterministic(_item))
-	{
-		auto it = m_expressions.find(exp);
-		if (it != m_expressions.end())
-			return it->id;
-	}
-
-	if (_copyItem)
-		exp.item = storeItem(_item);
-
-	ExpressionClasses::Id id = tryToSimplify(exp);
-	if (id < m_representatives.size())
-		exp.id = id;
-	else
-	{
-		exp.id = static_cast<Id>(m_representatives.size());
-		m_representatives.push_back(exp);
-	}
-	m_expressions.insert(exp);
-	return exp.id;
-}
-
-void ExpressionClasses::forceEqual(
-	ExpressionClasses::Id _id,
-	AssemblyItem const& _item,
-	ExpressionClasses::Ids const& _arguments,
-	bool _copyItem
-)
-{
-	Expression exp;
-	exp.id = _id;
-	exp.item = &_item;
-	exp.arguments = _arguments;
-
-	if (SemanticInformation::isCommutativeOperation(_item))
-		sort(exp.arguments.begin(), exp.arguments.end());
-
-	if (_copyItem)
-		exp.item = storeItem(_item);
-
-	m_expressions.insert(exp);
-}
-
-ExpressionClasses::Id ExpressionClasses::newClass(SourceLocation const& _location)
-{
-	Expression exp;
-	exp.id = static_cast<Id>(m_representatives.size());
-	exp.item = storeItem(AssemblyItem(UndefinedItem, (u256(1) << 255) + exp.id, _location));
-	m_representatives.push_back(exp);
-	m_expressions.insert(exp);
-	return exp.id;
-}
-
-bool ExpressionClasses::knownToBeDifferent(ExpressionClasses::Id _a, ExpressionClasses::Id _b)
-{
-	// Try to simplify "_a - _b" and return true iff the value is a non-zero constant.
-	return knownNonZero(find(Instruction::SUB, {_a, _b}));
-}
-
-bool ExpressionClasses::knownToBeDifferentBy32(ExpressionClasses::Id _a, ExpressionClasses::Id _b)
-{
-	// Try to simplify "_a - _b" and return true iff the value is at least 32 away from zero.
-	u256 const* v = knownConstant(find(Instruction::SUB, {_a, _b}));
-	// forbidden interval is ["-31", 31]
-	return v && *v + 31 > u256(62);
-}
-
-bool ExpressionClasses::knownZero(Id _c)
-{
-	return Pattern(u256(0)).matches(representative(_c), *this);
-}
-
-bool ExpressionClasses::knownNonZero(Id _c)
-{
-	return Pattern(u256(0)).matches(representative(find(Instruction::ISZERO, {_c})), *this);
-}
-
-u256 const* ExpressionClasses::knownConstant(Id _c)
-{
-	std::map<unsigned, Expression const*> matchGroups;
-	Pattern constant(Push);
-	constant.setMatchGroup(1, matchGroups);
-	if (!constant.matches(representative(_c), *this))
-		return nullptr;
-	return &constant.d();
-}
-
-AssemblyItem const* ExpressionClasses::storeItem(AssemblyItem const& _item)
-{
-	m_spareAssemblyItems.push_back(std::make_shared<AssemblyItem>(_item));
-	return m_spareAssemblyItems.back().get();
-}
-
-std::string ExpressionClasses::fullDAGToString(ExpressionClasses::Id _id) const
-{
-	Expression const& expr = representative(_id);
-	std::stringstream str;
-	str << std::dec << expr.id << ":";
-	if (expr.item)
-	{
-		str << *expr.item << "(";
-		for (Id arg: expr.arguments)
-			str << fullDAGToString(arg) << ",";
-		str << ")";
-	}
-	else
-		str << " UNIQUE";
-	return str.str();
-}
-
-ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr)
-{
-	static Rules rules;
-	assertThrow(rules.isInitialized(), OptimizerException, "Rule list not properly initialized.");
-
-	if (
-		!_expr.item ||
-		_expr.item->type() != Operation ||
-		!SemanticInformation::isDeterministic(*_expr.item)
-	)
-		return std::numeric_limits<unsigned>::max();
-
-	if (auto match = rules.findFirstMatch(_expr, *this))
-	{
-		// Debug info
-		if (false)
-		{
-			std::cout << "Simplifying " << *_expr.item << "(";
-			for (Id arg: _expr.arguments)
-				std::cout << fullDAGToString(arg) << ", ";
-			std::cout << ")" << std::endl;
-			std::cout << "with rule " << match->pattern.toString() << std::endl;
-			std::cout << "to " << match->action().toString() << std::endl;
-		}
-
-		return rebuildExpression(ExpressionTemplate(match->action(), _expr.item->location()));
-	}
-
-	return std::numeric_limits<unsigned>::max();
-}
-
-ExpressionClasses::Id ExpressionClasses::rebuildExpression(ExpressionTemplate const& _template)
-{
-	if (_template.hasId)
-		return _template.id;
-
-	Ids arguments;
-	for (ExpressionTemplate const& t: _template.arguments)
-		arguments.push_back(rebuildExpression(t));
-	return find(_template.item, arguments);
-}
diff --git a/libevmasm/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
deleted file mode 100644
index 8d4159fc7be1..000000000000
--- a/libevmasm/ExpressionClasses.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file ExpressionClasses.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Container for equivalence classes of expressions for use in common subexpression elimination.
- */
-
-#pragma once
-
-#include <libevmasm/AssemblyItem.h>
-
-#include <libsolutil/Common.h>
-
-#include <memory>
-#include <unordered_set>
-#include <vector>
-
-namespace solidity::langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::evmasm
-{
-
-class Pattern;
-struct ExpressionTemplate;
-
-/**
- * Collection of classes of equivalent expressions that can also determine the class of an expression.
- * Identifiers are contiguously assigned to new classes starting from zero.
- */
-class ExpressionClasses
-{
-public:
-	using Id = unsigned;
-	using Ids = std::vector<Id>;
-
-	struct Expression
-	{
-		Id id;
-		AssemblyItem const* item = nullptr;
-		Ids arguments;
-		/// Storage modification sequence, only used for storage and memory operations.
-		unsigned sequenceNumber = 0;
-		/// Behaves as if this was a tuple of (item->type(), item->data(), arguments, sequenceNumber).
-		bool operator==(Expression const& _other) const;
-
-		struct ExpressionHash
-		{
-			std::size_t operator()(Expression const& _expression) const;
-		};
-	};
-
-
-	/// Retrieves the id of the expression equivalence class resulting from the given item applied to the
-	/// given classes, might also create a new one.
-	/// @param _copyItem if true, copies the assembly item to an internal storage instead of just
-	/// keeping a pointer.
-	/// The @a _sequenceNumber indicates the current storage or memory access sequence.
-	Id find(
-		AssemblyItem const& _item,
-		Ids const& _arguments = {},
-		bool _copyItem = true,
-		unsigned _sequenceNumber = 0
-	);
-	/// @returns the canonical representative of an expression class.
-	Expression const& representative(Id _id) const { return m_representatives.at(_id); }
-	/// @returns the number of classes.
-	size_t size() const { return m_representatives.size(); }
-
-	/// Forces the given @a _item with @a _arguments to the class @a _id. This can be used to
-	/// add prior knowledge e.g. about CALLDATA, but has to be used with caution. Will not work as
-	/// expected if @a _item applied to @a _arguments already exists.
-	void forceEqual(Id _id, AssemblyItem const& _item, Ids const& _arguments, bool _copyItem = true);
-
-	/// @returns the id of a new class which is different to all other classes.
-	Id newClass(langutil::SourceLocation const& _location);
-
-	/// @returns true if the values of the given classes are known to be different (on every input).
-	/// @note that this function might still return false for some different inputs.
-	bool knownToBeDifferent(Id _a, Id _b);
-	/// Similar to @a knownToBeDifferent but require that abs(_a - b) >= 32.
-	bool knownToBeDifferentBy32(Id _a, Id _b);
-	/// @returns true if the value of the given class is known to be zero.
-	/// @note that this is not the negation of knownNonZero
-	bool knownZero(Id _c);
-	/// @returns true if the value of the given class is known to be nonzero.
-	/// @note that this is not the negation of knownZero
-	bool knownNonZero(Id _c);
-	/// @returns a pointer to the value if the given class is known to be a constant,
-	/// and a nullptr otherwise.
-	u256 const* knownConstant(Id _c);
-
-	/// Stores a copy of the given AssemblyItem and returns a pointer to the copy that is valid for
-	/// the lifetime of the ExpressionClasses object.
-	AssemblyItem const* storeItem(AssemblyItem const& _item);
-
-	std::string fullDAGToString(Id _id) const;
-
-private:
-	/// Tries to simplify the given expression.
-	/// @returns its class if it possible or Id(-1) otherwise.
-	Id tryToSimplify(Expression const& _expr);
-
-	/// Rebuilds an expression from a (matched) pattern.
-	Id rebuildExpression(ExpressionTemplate const& _template);
-
-	std::vector<std::pair<Pattern, std::function<Pattern()>>> createRules() const;
-
-	/// Expression equivalence class representatives - we only store one item of an equivalence.
-	std::vector<Expression> m_representatives;
-	/// All expression ever encountered.
-	std::unordered_set<Expression, Expression::ExpressionHash> m_expressions;
-	std::vector<std::shared_ptr<AssemblyItem>> m_spareAssemblyItems;
-};
-
-}
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
deleted file mode 100644
index 271a6ce2de3c..000000000000
--- a/libevmasm/GasMeter.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libevmasm/GasMeter.h>
-
-#include <libevmasm/KnownState.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-
-GasMeter::GasConsumption& GasMeter::GasConsumption::operator+=(GasConsumption const& _other)
-{
-	if (_other.isInfinite && !isInfinite)
-		*this = infinite();
-	if (isInfinite)
-		return *this;
-	bigint v = bigint(value) + _other.value;
-	if (v > std::numeric_limits<u256>::max())
-		*this = infinite();
-	else
-		value = u256(v);
-	return *this;
-}
-
-GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _includeExternalCosts)
-{
-	GasConsumption gas;
-	switch (_item.type())
-	{
-	case Push:
-		if (m_evmVersion.hasPush0() && _item.data() == 0)
-		{
-			gas = runGas(Instruction::PUSH0, m_evmVersion);
-			break;
-		}
-		[[fallthrough]];
-	case PushTag:
-	case PushData:
-	case PushSub:
-	case PushSubSize:
-	case PushProgramSize:
-	case PushLibraryAddress:
-	case PushDeployTimeAddress:
-		gas = runGas(Instruction::PUSH1, m_evmVersion);
-		break;
-	case Tag:
-		gas = runGas(Instruction::JUMPDEST, m_evmVersion);
-		break;
-	case Operation:
-	{
-		ExpressionClasses& classes = m_state->expressionClasses();
-		switch (_item.instruction())
-		{
-		case Instruction::SSTORE:
-		{
-			ExpressionClasses::Id slot = m_state->relativeStackElement(0);
-			ExpressionClasses::Id value = m_state->relativeStackElement(-1);
-			if (classes.knownZero(value) || (
-				m_state->storageContent().count(slot) &&
-				classes.knownNonZero(m_state->storageContent().at(slot))
-			))
-				gas = GasCosts::totalSstoreResetGas(m_evmVersion); //@todo take refunds into account
-			else
-				gas = GasCosts::totalSstoreSetGas(m_evmVersion);
-			break;
-		}
-		case Instruction::SLOAD:
-			gas = GasCosts::sloadGas(m_evmVersion);
-			break;
-		case Instruction::RETURN:
-		case Instruction::REVERT:
-			gas = runGas(_item.instruction(), m_evmVersion);
-			gas += memoryGas(0, -1);
-			break;
-		case Instruction::MLOAD:
-		case Instruction::MSTORE:
-			gas = runGas(_item.instruction(), m_evmVersion);
-			gas += memoryGas(classes.find(Instruction::ADD, {
-				m_state->relativeStackElement(0),
-				classes.find(AssemblyItem(32))
-			}));
-			break;
-		case Instruction::MSTORE8:
-			gas = runGas(_item.instruction(), m_evmVersion);
-			gas += memoryGas(classes.find(Instruction::ADD, {
-				m_state->relativeStackElement(0),
-				classes.find(AssemblyItem(1))
-			}));
-			break;
-		case Instruction::KECCAK256:
-			gas = GasCosts::keccak256Gas;
-			gas += memoryGas(0, -1);
-			gas += wordGas(GasCosts::keccak256WordGas, m_state->relativeStackElement(-1));
-			break;
-		case Instruction::CALLDATACOPY:
-		case Instruction::CODECOPY:
-		case Instruction::RETURNDATACOPY:
-			gas = runGas(_item.instruction(), m_evmVersion);
-			gas += memoryGas(0, -2);
-			gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-2));
-			break;
-		case Instruction::EXTCODESIZE:
-			gas = GasCosts::extCodeGas(m_evmVersion);
-			break;
-		case Instruction::EXTCODEHASH:
-			gas = GasCosts::balanceGas(m_evmVersion);
-			break;
-		case Instruction::EXTCODECOPY:
-			gas = GasCosts::extCodeGas(m_evmVersion);
-			gas += memoryGas(-1, -3);
-			gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-3));
-			break;
-		case Instruction::LOG0:
-		case Instruction::LOG1:
-		case Instruction::LOG2:
-		case Instruction::LOG3:
-		case Instruction::LOG4:
-		{
-			gas = GasCosts::logGas + GasCosts::logTopicGas * getLogNumber(_item.instruction());
-			gas += memoryGas(0, -1);
-			if (u256 const* value = classes.knownConstant(m_state->relativeStackElement(-1)))
-				gas += GasCosts::logDataGas * (*value);
-			else
-				gas = GasConsumption::infinite();
-			break;
-		}
-		case Instruction::CALL:
-		case Instruction::CALLCODE:
-		case Instruction::DELEGATECALL:
-		case Instruction::STATICCALL:
-		{
-			if (_includeExternalCosts)
-				// We assume that we do not know the target contract and thus, the consumption is infinite.
-				gas = GasConsumption::infinite();
-			else
-			{
-				gas = GasCosts::callGas(m_evmVersion);
-				if (u256 const* value = classes.knownConstant(m_state->relativeStackElement(0)))
-					gas += (*value);
-				else
-					gas = GasConsumption::infinite();
-				if (_item.instruction() == Instruction::CALL)
-					gas += GasCosts::callNewAccountGas; // We very rarely know whether the address exists.
-				int valueSize = 1;
-				if (_item.instruction() == Instruction::DELEGATECALL || _item.instruction() == Instruction::STATICCALL)
-					valueSize = 0;
-				else if (!classes.knownZero(m_state->relativeStackElement(-1 - valueSize)))
-					gas += GasCosts::callValueTransferGas;
-				gas += memoryGas(-2 - valueSize, -3 - valueSize);
-				gas += memoryGas(-4 - valueSize, -5 - valueSize);
-			}
-			break;
-		}
-		case Instruction::SELFDESTRUCT:
-			gas = GasCosts::selfdestructGas(m_evmVersion);
-			gas += GasCosts::callNewAccountGas; // We very rarely know whether the address exists.
-			break;
-		case Instruction::CREATE:
-		case Instruction::CREATE2:
-			if (_includeExternalCosts)
-				// We assume that we do not know the target contract and thus, the consumption is infinite.
-				gas = GasConsumption::infinite();
-			else
-			{
-				gas = GasCosts::createGas;
-				gas += memoryGas(-1, -2);
-			}
-			break;
-		case Instruction::EXP:
-			gas = GasCosts::expGas;
-			if (u256 const* value = classes.knownConstant(m_state->relativeStackElement(-1)))
-			{
-				if (*value)
-				{
-					// Note: msb() counts from 0 and throws on 0 as input.
-					unsigned const significantByteCount  = (static_cast<unsigned>(boost::multiprecision::msb(*value)) + 1u + 7u) / 8u;
-					gas += GasCosts::expByteGas(m_evmVersion) * significantByteCount;
-				}
-			}
-			else
-				gas += GasCosts::expByteGas(m_evmVersion) * 32;
-			break;
-		case Instruction::BALANCE:
-			gas = GasCosts::balanceGas(m_evmVersion);
-			break;
-		case Instruction::CHAINID:
-			gas = runGas(Instruction::CHAINID, m_evmVersion);
-			break;
-		case Instruction::SELFBALANCE:
-			gas = runGas(Instruction::SELFBALANCE, m_evmVersion);
-			break;
-		default:
-			gas = runGas(_item.instruction(), m_evmVersion);
-			break;
-		}
-		break;
-	}
-	default:
-		gas = GasConsumption::infinite();
-		break;
-	}
-
-	m_state->feedItem(_item);
-	return gas;
-}
-
-GasMeter::GasConsumption GasMeter::wordGas(u256 const& _multiplier, ExpressionClasses::Id _value)
-{
-	u256 const* value = m_state->expressionClasses().knownConstant(_value);
-	if (!value)
-		return GasConsumption::infinite();
-	return GasConsumption(_multiplier * ((*value + 31) / 32));
-}
-
-GasMeter::GasConsumption GasMeter::memoryGas(ExpressionClasses::Id _position)
-{
-	u256 const* value = m_state->expressionClasses().knownConstant(_position);
-	if (!value)
-		return GasConsumption::infinite();
-	if (*value < m_largestMemoryAccess)
-		return GasConsumption(0);
-	u256 previous = m_largestMemoryAccess;
-	m_largestMemoryAccess = *value;
-	auto memGas = [=](u256 const& pos) -> u256
-	{
-		u256 size = (pos + 31) / 32;
-		return GasCosts::memoryGas * size + size * size / GasCosts::quadCoeffDiv;
-	};
-	return memGas(*value) - memGas(previous);
-}
-
-GasMeter::GasConsumption GasMeter::memoryGas(int _stackPosOffset, int _stackPosSize)
-{
-	ExpressionClasses& classes = m_state->expressionClasses();
-	if (classes.knownZero(m_state->relativeStackElement(_stackPosSize)))
-		return GasConsumption(0);
-	else
-		return memoryGas(classes.find(Instruction::ADD, {
-			m_state->relativeStackElement(_stackPosOffset),
-			m_state->relativeStackElement(_stackPosSize)
-		}));
-}
-
-unsigned GasMeter::runGas(Instruction _instruction, langutil::EVMVersion _evmVersion)
-{
-	if (_instruction == Instruction::JUMPDEST)
-		return 1;
-
-	switch (instructionInfo(_instruction, _evmVersion).gasPriceTier)
-	{
-	case Tier::Zero:    return GasCosts::tier0Gas;
-	case Tier::Base:    return GasCosts::tier1Gas;
-	case Tier::VeryLow: return GasCosts::tier2Gas;
-	case Tier::Low:     return GasCosts::tier3Gas;
-	case Tier::Mid:     return GasCosts::tier4Gas;
-	case Tier::High:    return GasCosts::tier5Gas;
-	case Tier::Ext:     return GasCosts::tier6Gas;
-	default: break;
-	}
-	assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
-	return 0;
-}
-
-u256 GasMeter::dataGas(bytes const& _data, bool _inCreation, langutil::EVMVersion _evmVersion)
-{
-	bigint gas = 0;
-	if (_inCreation)
-	{
-		for (auto b: _data)
-			gas += (b != 0) ? GasCosts::txDataNonZeroGas(_evmVersion) : GasCosts::txDataZeroGas;
-	}
-	else
-		gas = bigint(GasCosts::createDataGas) * _data.size();
-	assertThrow(gas < bigint(u256(-1)), OptimizerException, "Gas cost exceeds 256 bits.");
-	return u256(gas);
-}
-
-
-u256 GasMeter::dataGas(uint64_t _length, bool _inCreation, langutil::EVMVersion _evmVersion)
-{
-	bigint gas = bigint(_length) * (_inCreation ? GasCosts::txDataNonZeroGas(_evmVersion) : GasCosts::createDataGas);
-	assertThrow(gas < bigint(u256(-1)), OptimizerException, "Gas cost exceeds 256 bits.");
-	return u256(gas);
-}
diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h
deleted file mode 100644
index ec1946644787..000000000000
--- a/libevmasm/GasMeter.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file GasMeter.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- *
- * Utilities for tracking gas costs.
- *
- * With respect to EIP-2929, we do not track warm accounts or storage slots and they are always
- * charged the worst-case, i.e., cold-access.
- */
-
-#pragma once
-
-#include <libevmasm/ExpressionClasses.h>
-#include <libevmasm/AssemblyItem.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <ostream>
-#include <tuple>
-#include <utility>
-
-namespace solidity::evmasm
-{
-
-class KnownState;
-
-namespace GasCosts
-{
-	static unsigned const stackLimit = 1024;
-	static unsigned const tier0Gas = 0;
-	static unsigned const tier1Gas = 2;
-	static unsigned const tier2Gas = 3;
-	static unsigned const tier3Gas = 5;
-	static unsigned const tier4Gas = 8;
-	static unsigned const tier5Gas = 10;
-	static unsigned const tier6Gas = 20;
-	static unsigned const tier7Gas = 0;
-	static unsigned const expGas = 10;
-	inline unsigned expByteGas(langutil::EVMVersion _evmVersion)
-	{
-		return _evmVersion >= langutil::EVMVersion::spuriousDragon() ? 50 : 10;
-	}
-	static unsigned const keccak256Gas = 30;
-	static unsigned const keccak256WordGas = 6;
-	/// Corresponds to ACCESS_LIST_ADDRESS_COST from EIP-2930
-	static unsigned const accessListAddressCost = 2400;
-	/// Corresponds to ACCESS_LIST_STORAGE_COST from EIP-2930
-	static unsigned const accessListStorageKeyCost = 1900;
-	/// Corresponds to COLD_SLOAD_COST from EIP-2929
-	static unsigned const coldSloadCost = 2100;
-	/// Corresponds to COLD_ACCOUNT_ACCESS_COST from EIP-2929
-	static unsigned const coldAccountAccessCost = 2600;
-	/// Corresponds to WARM_STORAGE_READ_COST from EIP-2929
-	static unsigned const warmStorageReadCost = 100;
-	inline unsigned sloadGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return coldSloadCost;
-		else if (_evmVersion >= langutil::EVMVersion::istanbul())
-			return 800;
-		else if (_evmVersion >= langutil::EVMVersion::tangerineWhistle())
-			return 200;
-		else
-			return 50;
-	}
-	/// Corresponds to SSTORE_SET_GAS
-	static unsigned const sstoreSetGas = 20000;
-	/// Corresponds to SSTORE_RESET_GAS from EIP-2929
-	static unsigned const sstoreResetGas = 5000 - coldSloadCost;
-	/// Corresponds to SSTORE_CLEARS_SCHEDULE from EIP-2200
-	inline static unsigned sstoreClearsSchedule(langutil::EVMVersion _evmVersion)
-	{
-		// Changes from EIP-3529
-		if (_evmVersion >= langutil::EVMVersion::london())
-			return sstoreResetGas + accessListStorageKeyCost;
-		else
-			return 15000;
-	}
-	inline static unsigned totalSstoreSetGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return sstoreSetGas + coldSloadCost;
-		else
-			return sstoreSetGas;
-	}
-	/// Corresponds to SSTORE_RESET_GAS from EIP-2929
-	/// For Berlin, the maximum is SSTORE_RESET_GAS + COLD_SLOAD_COST = 5000
-	/// For previous versions, it's a fixed 5000
-	inline unsigned totalSstoreResetGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return sstoreResetGas + coldSloadCost;
-		else
-			return 5000;
-	}
-	inline unsigned extCodeGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return coldAccountAccessCost;
-		else if (_evmVersion >= langutil::EVMVersion::tangerineWhistle())
-			return 700;
-		else
-			return 20;
-	}
-	inline unsigned balanceGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return coldAccountAccessCost;
-		else if (_evmVersion >= langutil::EVMVersion::istanbul())
-			return 700;
-		else if (_evmVersion >= langutil::EVMVersion::tangerineWhistle())
-			return 400;
-		else
-			return 20;
-	}
-	static unsigned const jumpdestGas = 1;
-	static unsigned const logGas = 375;
-	static unsigned const logDataGas = 8;
-	static unsigned const logTopicGas = 375;
-	static unsigned const createGas = 32000;
-	inline unsigned callGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return coldAccountAccessCost;
-		else if (_evmVersion >= langutil::EVMVersion::tangerineWhistle())
-			return 700;
-		else
-			return 40;
-	}
-	static unsigned const callStipend = 2300;
-	static unsigned const callValueTransferGas = 9000;
-	static unsigned const callNewAccountGas = 25000;
-	inline unsigned selfdestructGas(langutil::EVMVersion _evmVersion)
-	{
-		if (_evmVersion >= langutil::EVMVersion::berlin())
-			return coldAccountAccessCost;
-		else if (_evmVersion >= langutil::EVMVersion::tangerineWhistle())
-			return 5000;
-		else
-			return 0;
-	}
-	inline unsigned selfdestructRefundGas(langutil::EVMVersion _evmVersion)
-	{
-		// Changes from EIP-3529
-		if (_evmVersion >= langutil::EVMVersion::london())
-			return 0;
-		else
-			return 24000;
-	}
-	static unsigned const memoryGas = 3;
-	static unsigned const quadCoeffDiv = 512;
-	static unsigned const createDataGas = 200;
-	static unsigned const txGas = 21000;
-	static unsigned const txCreateGas = 53000;
-	static unsigned const txDataZeroGas = 4;
-	inline unsigned txDataNonZeroGas(langutil::EVMVersion _evmVersion)
-	{
-		return _evmVersion >= langutil::EVMVersion::istanbul() ? 16 : 68;
-	}
-	static unsigned const copyGas = 3;
-}
-
-/**
- * Class that helps computing the maximum gas consumption for instructions.
- * Has to be initialized with a certain known state that will be automatically updated for
- * each call to estimateMax. These calls have to supply strictly subsequent AssemblyItems.
- * A new gas meter has to be constructed (with a new state) for control flow changes.
- */
-class GasMeter
-{
-public:
-	struct GasConsumption
-	{
-		GasConsumption(unsigned _value = 0, bool _infinite = false): value(_value), isInfinite(_infinite) {}
-		GasConsumption(u256 _value, bool _infinite = false): value(std::move(_value)), isInfinite(_infinite) {}
-		static GasConsumption infinite() { return GasConsumption(0, true); }
-
-		GasConsumption& operator+=(GasConsumption const& _other);
-		GasConsumption operator+(GasConsumption const& _other) const
-		{
-			GasConsumption result = *this;
-			result += _other;
-			return result;
-		}
-		bool operator<(GasConsumption const& _other) const
-		{
-			return std::make_pair(isInfinite, value) < std::make_pair(_other.isInfinite, _other.value);
-		}
-
-		u256 value;
-		bool isInfinite;
-	};
-
-	/// Constructs a new gas meter given the current state.
-	GasMeter(std::shared_ptr<KnownState>  _state, langutil::EVMVersion _evmVersion, u256  _largestMemoryAccess = 0):
-		m_state(std::move(_state)), m_evmVersion(_evmVersion), m_largestMemoryAccess(std::move(_largestMemoryAccess)) {}
-
-	/// @returns an upper bound on the gas consumed by the given instruction and updates
-	/// the state.
-	/// @param _inculdeExternalCosts if true, include costs caused by other contracts in calls.
-	GasConsumption estimateMax(AssemblyItem const& _item, bool _includeExternalCosts = true);
-
-	u256 const& largestMemoryAccess() const { return m_largestMemoryAccess; }
-
-	/// @returns gas costs for simple instructions with constant gas costs (that do not
-	/// change with EVM versions)
-	static unsigned runGas(Instruction _instruction, langutil::EVMVersion _evmVersion);
-
-	/// @returns the gas cost of the supplied data, depending whether it is in creation code, or not.
-	/// In case of @a _inCreation, the data is only sent as a transaction and is not stored, whereas
-	/// otherwise code will be stored and have to pay "createDataGas" cost.
-	static u256 dataGas(bytes const& _data, bool _inCreation, langutil::EVMVersion _evmVersion);
-
-	/// @returns the gas cost of non-zero data of the supplied length, depending whether it is in creation code, or not.
-	/// In case of @a _inCreation, the data is only sent as a transaction and is not stored, whereas
-	/// otherwise code will be stored and have to pay "createDataGas" cost.
-	static u256 dataGas(uint64_t _length, bool _inCreation, langutil::EVMVersion _evmVersion);
-
-private:
-	/// @returns _multiplier * (_value + 31) / 32, if _value is a known constant and infinite otherwise.
-	GasConsumption wordGas(u256 const& _multiplier, ExpressionClasses::Id _value);
-	/// @returns the gas needed to access the given memory position.
-	/// @todo this assumes that memory was never accessed before and thus over-estimates gas usage.
-	GasConsumption memoryGas(ExpressionClasses::Id _position);
-	/// @returns the memory gas for accessing the memory at a specific offset for a number of bytes
-	/// given as values on the stack at the given relative positions.
-	GasConsumption memoryGas(int _stackPosOffset, int _stackPosSize);
-
-	std::shared_ptr<KnownState> m_state;
-	langutil::EVMVersion m_evmVersion;
-	/// Largest point where memory was accessed since the creation of this object.
-	u256 m_largestMemoryAccess;
-};
-
-inline std::ostream& operator<<(std::ostream& _str, GasMeter::GasConsumption const& _consumption)
-{
-	if (_consumption.isInfinite)
-		return _str << "[???]";
-	else
-		return _str << std::dec << _consumption.value;
-}
-
-}
diff --git a/libevmasm/Inliner.cpp b/libevmasm/Inliner.cpp
deleted file mode 100644
index ded5172ddc3a..000000000000
--- a/libevmasm/Inliner.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file Inliner.cpp
- * Inlines small code snippets by replacing JUMP with a copy of the code jumped to.
- */
-
-#include <libevmasm/Inliner.h>
-
-#include <libevmasm/AssemblyItem.h>
-#include <libevmasm/GasMeter.h>
-#include <libevmasm/KnownState.h>
-#include <libevmasm/SemanticInformation.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/numeric/accumulate.hpp>
-#include <range/v3/view/drop_last.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/slice.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <optional>
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-
-namespace
-{
-/// @returns an estimation of the runtime gas cost of the AsssemblyItems in @a _itemRange.
-template<typename RangeType>
-u256 executionCost(RangeType const& _itemRange, langutil::EVMVersion _evmVersion)
-{
-	GasMeter gasMeter{std::make_shared<KnownState>(), _evmVersion};
-	auto gasConsumption = ranges::accumulate(_itemRange | ranges::views::transform(
-		[&gasMeter](auto const& _item) { return gasMeter.estimateMax(_item, false); }
-	), GasMeter::GasConsumption());
-	if (gasConsumption.isInfinite)
-		return std::numeric_limits<u256>::max();
-	else
-		return gasConsumption.value;
-}
-/// @returns an estimation of the code size in bytes needed for the AssemblyItems in @a _itemRange.
-template<typename RangeType>
-uint64_t codeSize(RangeType const& _itemRange)
-{
-	return ranges::accumulate(_itemRange | ranges::views::transform(
-		[](auto const& _item) { return _item.bytesRequired(2, Precision::Approximate); }
-	), 0u);
-}
-/// @returns the tag id, if @a _item is a PushTag or Tag into the current subassembly, std::nullopt otherwise.
-std::optional<size_t> getLocalTag(AssemblyItem const& _item)
-{
-	if (_item.type() != PushTag && _item.type() != Tag)
-		return std::nullopt;
-	auto [subId, tag] = _item.splitForeignPushTag();
-	if (subId != std::numeric_limits<size_t>::max())
-		return std::nullopt;
-	return tag;
-}
-}
-
-bool Inliner::isInlineCandidate(size_t _tag, ranges::span<AssemblyItem const> _items) const
-{
-	assertThrow(_items.size() > 0, OptimizerException, "");
-
-	if (_items.back().type() != Operation)
-		return false;
-	if (
-		_items.back() != Instruction::JUMP &&
-		!SemanticInformation::terminatesControlFlow(_items.back().instruction())
-	)
-		return false;
-
-	// Never inline tags that reference themselves.
-	for (AssemblyItem const& item: _items)
-		if (item.type() == PushTag)
-			if (getLocalTag(item) == _tag)
-					return false;
-
-	return true;
-}
-
-std::map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(AssemblyItems const& _items) const
-{
-	std::map<size_t, ranges::span<AssemblyItem const>> inlinableBlockItems;
-	std::map<size_t, uint64_t> numPushTags;
-	std::optional<size_t> lastTag;
-	for (auto&& [index, item]: _items | ranges::views::enumerate)
-	{
-		// The number of PushTags approximates the number of calls to a block.
-		if (item.type() == PushTag)
-			if (std::optional<size_t> tag = getLocalTag(item))
-				++numPushTags[*tag];
-
-		// We can only inline blocks with straight control flow that end in a jump.
-		// Using breaksCSEAnalysisBlock will hopefully allow the return jump to be optimized after inlining.
-		if (lastTag && SemanticInformation::breaksCSEAnalysisBlock(item, false))
-		{
-			ranges::span<AssemblyItem const> block = _items | ranges::views::slice(*lastTag + 1, index + 1);
-			if (std::optional<size_t> tag = getLocalTag(_items[*lastTag]))
-				if (isInlineCandidate(*tag, block))
-					inlinableBlockItems[*tag] = block;
-			lastTag.reset();
-		}
-
-		if (item.type() == Tag)
-		{
-			assertThrow(getLocalTag(item), OptimizerException, "");
-			lastTag = index;
-		}
-	}
-
-	// Store the number of PushTags alongside the assembly items and discard tags that are never pushed.
-	std::map<size_t, InlinableBlock> result;
-	for (auto&& [tag, items]: inlinableBlockItems)
-		if (uint64_t const* numPushes = util::valueOrNullptr(numPushTags, tag))
-			result.emplace(tag, InlinableBlock{items, *numPushes});
-	return result;
-}
-
-bool Inliner::shouldInlineFullFunctionBody(size_t _tag, ranges::span<AssemblyItem const> _block, uint64_t _pushTagCount) const
-{
-	// Accumulate size of the inline candidate block in bytes (without the return jump).
-	uint64_t functionBodySize = codeSize(ranges::views::drop_last(_block, 1));
-
-	// Use the number of push tags as approximation of the average number of calls to the function per run.
-	uint64_t numberOfCalls = _pushTagCount;
-	// Also use the number of push tags as approximation of the number of call sites to the function.
-	uint64_t numberOfCallSites = _pushTagCount;
-
-	static AssemblyItems const uninlinedCallSitePattern = {
-		AssemblyItem{PushTag},
-		AssemblyItem{PushTag},
-		AssemblyItem{Instruction::JUMP},
-		AssemblyItem{Tag}
-	};
-	static AssemblyItems const uninlinedFunctionPattern = {
-		AssemblyItem{Tag},
-		// Actual function body of size functionBodySize. Handled separately below.
-		AssemblyItem{Instruction::JUMP}
-	};
-
-	// Both the call site and jump site pattern is executed for each call.
-	// Since the function body has to be executed equally often both with and without inlining,
-	// it can be ignored.
-	bigint uninlinedExecutionCost = numberOfCalls * (
-		executionCost(uninlinedCallSitePattern, m_evmVersion) +
-		executionCost(uninlinedFunctionPattern, m_evmVersion)
-	);
-	// Each call site deposits the call site pattern, whereas the jump site pattern and the function itself are deposited once.
-	bigint uninlinedDepositCost = GasMeter::dataGas(
-		numberOfCallSites * codeSize(uninlinedCallSitePattern) +
-		codeSize(uninlinedFunctionPattern) +
-		functionBodySize,
-		m_isCreation,
-		m_evmVersion
-	);
-	// When inlining the execution cost beyond the actual function execution is zero,
-	// but for each call site a copy of the function is deposited.
-	bigint inlinedDepositCost = GasMeter::dataGas(
-		numberOfCallSites * functionBodySize,
-		m_isCreation,
-		m_evmVersion
-	);
-	// If the block is referenced from outside the current subassembly, the original function cannot be removed.
-	// Note that the function also cannot always be removed, if it is not referenced from outside, but in that case
-	// the heuristics is optimistic.
-	if (m_tagsReferencedFromOutside.count(_tag))
-		inlinedDepositCost += GasMeter::dataGas(
-			codeSize(uninlinedFunctionPattern) + functionBodySize,
-			m_isCreation,
-			m_evmVersion
-		);
-
-	// If the estimated runtime cost over the lifetime of the contract plus the deposit cost in the uninlined case
-	// exceed the inlined deposit costs, it is beneficial to inline.
-	if (bigint(m_runs) * uninlinedExecutionCost + uninlinedDepositCost > inlinedDepositCost)
-		return true;
-
-	return false;
-}
-
-std::optional<AssemblyItem> Inliner::shouldInline(size_t _tag, AssemblyItem const& _jump, InlinableBlock const& _block) const
-{
-	assertThrow(_jump == Instruction::JUMP, OptimizerException, "");
-	AssemblyItem blockExit = _block.items.back();
-
-	if (
-		_jump.getJumpType() == AssemblyItem::JumpType::IntoFunction &&
-		blockExit == Instruction::JUMP &&
-		blockExit.getJumpType() == AssemblyItem::JumpType::OutOfFunction &&
-		shouldInlineFullFunctionBody(_tag, _block.items, _block.pushTagCount)
-	)
-	{
-		blockExit.setJumpType(AssemblyItem::JumpType::Ordinary);
-		return blockExit;
-	}
-
-	// Inline small blocks, if the jump to it is ordinary or the blockExit is a terminating instruction.
-	if (
-		_jump.getJumpType() == AssemblyItem::JumpType::Ordinary ||
-		SemanticInformation::terminatesControlFlow(blockExit.instruction())
-	)
-	{
-		static AssemblyItems const jumpPattern = {
-			AssemblyItem{PushTag},
-			AssemblyItem{Instruction::JUMP},
-		};
-		if (
-			GasMeter::dataGas(codeSize(_block.items), m_isCreation, m_evmVersion) <=
-			GasMeter::dataGas(codeSize(jumpPattern), m_isCreation, m_evmVersion)
-		)
-			return blockExit;
-	}
-
-	return std::nullopt;
-}
-
-
-void Inliner::optimise()
-{
-	std::map<size_t, InlinableBlock> inlinableBlocks = determineInlinableBlocks(m_items);
-
-	if (inlinableBlocks.empty())
-		return;
-
-	AssemblyItems newItems;
-	for (auto it = m_items.begin(); it != m_items.end(); ++it)
-	{
-		AssemblyItem const& item = *it;
-		if (next(it) != m_items.end())
-		{
-			AssemblyItem const& nextItem = *next(it);
-			if (item.type() == PushTag && nextItem == Instruction::JUMP)
-			{
-				if (std::optional<size_t> tag = getLocalTag(item))
-					if (auto* inlinableBlock = util::valueOrNullptr(inlinableBlocks, *tag))
-						if (auto exitItem = shouldInline(*tag, nextItem, *inlinableBlock))
-						{
-							newItems += inlinableBlock->items | ranges::views::drop_last(1);
-							newItems.emplace_back(std::move(*exitItem));
-
-							// We are removing one push tag to the block we inline.
-							--inlinableBlock->pushTagCount;
-							// We might increase the number of push tags to other blocks.
-							for (AssemblyItem const& inlinedItem: inlinableBlock->items)
-								if (inlinedItem.type() == PushTag)
-									if (std::optional<size_t> duplicatedTag = getLocalTag(inlinedItem))
-										if (auto* block = util::valueOrNullptr(inlinableBlocks, *duplicatedTag))
-											++block->pushTagCount;
-
-							// Skip the original jump to the inlined tag and continue.
-							++it;
-							continue;
-						}
-			}
-		}
-		newItems.emplace_back(item);
-	}
-
-	m_items = std::move(newItems);
-}
diff --git a/libevmasm/Inliner.h b/libevmasm/Inliner.h
deleted file mode 100644
index 8744723518ce..000000000000
--- a/libevmasm/Inliner.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file Inliner.h
- * Inlines small code snippets by replacing JUMP with a copy of the code jumped to.
- */
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libevmasm/Assembly.h>
-#include <libevmasm/AssemblyItem.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <range/v3/view/span.hpp>
-#include <map>
-#include <set>
-#include <vector>
-
-namespace solidity::evmasm
-{
-
-class Inliner
-{
-public:
-	explicit Inliner(
-		AssemblyItems& _items,
-		std::set<size_t> const& _tagsReferencedFromOutside,
-		size_t _runs,
-		bool _isCreation,
-		langutil::EVMVersion _evmVersion
-	):
-	m_items(_items),
-	m_tagsReferencedFromOutside(_tagsReferencedFromOutside),
-	m_runs(_runs),
-	m_isCreation(_isCreation),
-	m_evmVersion(_evmVersion)
-	{
-	}
-	virtual ~Inliner() = default;
-
-	void optimise();
-
-private:
-	struct InlinableBlock
-	{
-		ranges::span<AssemblyItem const> items;
-		uint64_t pushTagCount = 0;
-	};
-
-	/// @returns the exit item for the block to be inlined, if a particular jump to it should be inlined, otherwise nullopt.
-	std::optional<AssemblyItem> shouldInline(size_t _tag, AssemblyItem const& _jump, InlinableBlock const& _block) const;
-	/// @returns true, if the full function at tag @a _tag with body @a _block that is referenced @a _pushTagCount times
-	/// should be inlined, false otherwise. @a _block should start at the first instruction after the function entry tag
-	/// up to and including the return jump.
-	bool shouldInlineFullFunctionBody(size_t _tag, ranges::span<AssemblyItem const> _block, uint64_t _pushTagCount) const;
-	/// @returns true, if the @a _items at @a _tag are a potential candidate for inlining.
-	bool isInlineCandidate(size_t _tag, ranges::span<AssemblyItem const> _items) const;
-	/// @returns a map from tags that can potentially be inlined to the inlinable item range behind that tag and the
-	/// number of times the tag in question was referenced.
-	std::map<size_t, InlinableBlock> determineInlinableBlocks(AssemblyItems const& _items) const;
-
-	AssemblyItems& m_items;
-	std::set<size_t> const& m_tagsReferencedFromOutside;
-	size_t const m_runs = Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment;
-	bool const m_isCreation = false;
-	langutil::EVMVersion const m_evmVersion;
-};
-
-}
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
deleted file mode 100644
index 174d12b5e355..000000000000
--- a/libevmasm/Instruction.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Instruction.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include <libevmasm/Instruction.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-
-std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
-{
-	{ "STOP", Instruction::STOP },
-	{ "ADD", Instruction::ADD },
-	{ "SUB", Instruction::SUB },
-	{ "MUL", Instruction::MUL },
-	{ "DIV", Instruction::DIV },
-	{ "SDIV", Instruction::SDIV },
-	{ "MOD", Instruction::MOD },
-	{ "SMOD", Instruction::SMOD },
-	{ "EXP", Instruction::EXP },
-	{ "NOT", Instruction::NOT },
-	{ "LT", Instruction::LT },
-	{ "GT", Instruction::GT },
-	{ "SLT", Instruction::SLT },
-	{ "SGT", Instruction::SGT },
-	{ "EQ", Instruction::EQ },
-	{ "ISZERO", Instruction::ISZERO },
-	{ "AND", Instruction::AND },
-	{ "OR", Instruction::OR },
-	{ "XOR", Instruction::XOR },
-	{ "BYTE", Instruction::BYTE },
-	{ "SHL", Instruction::SHL },
-	{ "SHR", Instruction::SHR },
-	{ "SAR", Instruction::SAR },
-	{ "ADDMOD", Instruction::ADDMOD },
-	{ "MULMOD", Instruction::MULMOD },
-	{ "SIGNEXTEND", Instruction::SIGNEXTEND },
-	{ "KECCAK256", Instruction::KECCAK256 },
-	{ "ADDRESS", Instruction::ADDRESS },
-	{ "BALANCE", Instruction::BALANCE },
-	{ "ORIGIN", Instruction::ORIGIN },
-	{ "CALLER", Instruction::CALLER },
-	{ "CALLVALUE", Instruction::CALLVALUE },
-	{ "CALLDATALOAD", Instruction::CALLDATALOAD },
-	{ "CALLDATASIZE", Instruction::CALLDATASIZE },
-	{ "CALLDATACOPY", Instruction::CALLDATACOPY },
-	{ "CODESIZE", Instruction::CODESIZE },
-	{ "CODECOPY", Instruction::CODECOPY },
-	{ "GASPRICE", Instruction::GASPRICE },
-	{ "EXTCODESIZE", Instruction::EXTCODESIZE },
-	{ "EXTCODECOPY", Instruction::EXTCODECOPY },
-	{ "RETURNDATASIZE", Instruction::RETURNDATASIZE },
-	{ "RETURNDATACOPY", Instruction::RETURNDATACOPY },
-	{ "EXTCODEHASH", Instruction::EXTCODEHASH },
-	{ "BLOCKHASH", Instruction::BLOCKHASH },
-	{ "COINBASE", Instruction::COINBASE },
-	{ "TIMESTAMP", Instruction::TIMESTAMP },
-	{ "NUMBER", Instruction::NUMBER },
-	{ "DIFFICULTY", Instruction::PREVRANDAO },
-	{ "PREVRANDAO", Instruction::PREVRANDAO },
-	{ "GASLIMIT", Instruction::GASLIMIT },
-	{ "CHAINID", Instruction::CHAINID },
-	{ "SELFBALANCE", Instruction::SELFBALANCE },
-	{ "BASEFEE", Instruction::BASEFEE },
-	{ "POP", Instruction::POP },
-	{ "MLOAD", Instruction::MLOAD },
-	{ "MSTORE", Instruction::MSTORE },
-	{ "MSTORE8", Instruction::MSTORE8 },
-	{ "SLOAD", Instruction::SLOAD },
-	{ "SSTORE", Instruction::SSTORE },
-	{ "JUMP", Instruction::JUMP },
-	{ "JUMPI", Instruction::JUMPI },
-	{ "PC", Instruction::PC },
-	{ "MSIZE", Instruction::MSIZE },
-	{ "GAS", Instruction::GAS },
-	{ "JUMPDEST", Instruction::JUMPDEST },
-	{ "PUSH0", Instruction::PUSH0 },
-	{ "PUSH1", Instruction::PUSH1 },
-	{ "PUSH2", Instruction::PUSH2 },
-	{ "PUSH3", Instruction::PUSH3 },
-	{ "PUSH4", Instruction::PUSH4 },
-	{ "PUSH5", Instruction::PUSH5 },
-	{ "PUSH6", Instruction::PUSH6 },
-	{ "PUSH7", Instruction::PUSH7 },
-	{ "PUSH8", Instruction::PUSH8 },
-	{ "PUSH9", Instruction::PUSH9 },
-	{ "PUSH10", Instruction::PUSH10 },
-	{ "PUSH11", Instruction::PUSH11 },
-	{ "PUSH12", Instruction::PUSH12 },
-	{ "PUSH13", Instruction::PUSH13 },
-	{ "PUSH14", Instruction::PUSH14 },
-	{ "PUSH15", Instruction::PUSH15 },
-	{ "PUSH16", Instruction::PUSH16 },
-	{ "PUSH17", Instruction::PUSH17 },
-	{ "PUSH18", Instruction::PUSH18 },
-	{ "PUSH19", Instruction::PUSH19 },
-	{ "PUSH20", Instruction::PUSH20 },
-	{ "PUSH21", Instruction::PUSH21 },
-	{ "PUSH22", Instruction::PUSH22 },
-	{ "PUSH23", Instruction::PUSH23 },
-	{ "PUSH24", Instruction::PUSH24 },
-	{ "PUSH25", Instruction::PUSH25 },
-	{ "PUSH26", Instruction::PUSH26 },
-	{ "PUSH27", Instruction::PUSH27 },
-	{ "PUSH28", Instruction::PUSH28 },
-	{ "PUSH29", Instruction::PUSH29 },
-	{ "PUSH30", Instruction::PUSH30 },
-	{ "PUSH31", Instruction::PUSH31 },
-	{ "PUSH32", Instruction::PUSH32 },
-	{ "DUP1", Instruction::DUP1 },
-	{ "DUP2", Instruction::DUP2 },
-	{ "DUP3", Instruction::DUP3 },
-	{ "DUP4", Instruction::DUP4 },
-	{ "DUP5", Instruction::DUP5 },
-	{ "DUP6", Instruction::DUP6 },
-	{ "DUP7", Instruction::DUP7 },
-	{ "DUP8", Instruction::DUP8 },
-	{ "DUP9", Instruction::DUP9 },
-	{ "DUP10", Instruction::DUP10 },
-	{ "DUP11", Instruction::DUP11 },
-	{ "DUP12", Instruction::DUP12 },
-	{ "DUP13", Instruction::DUP13 },
-	{ "DUP14", Instruction::DUP14 },
-	{ "DUP15", Instruction::DUP15 },
-	{ "DUP16", Instruction::DUP16 },
-	{ "SWAP1", Instruction::SWAP1 },
-	{ "SWAP2", Instruction::SWAP2 },
-	{ "SWAP3", Instruction::SWAP3 },
-	{ "SWAP4", Instruction::SWAP4 },
-	{ "SWAP5", Instruction::SWAP5 },
-	{ "SWAP6", Instruction::SWAP6 },
-	{ "SWAP7", Instruction::SWAP7 },
-	{ "SWAP8", Instruction::SWAP8 },
-	{ "SWAP9", Instruction::SWAP9 },
-	{ "SWAP10", Instruction::SWAP10 },
-	{ "SWAP11", Instruction::SWAP11 },
-	{ "SWAP12", Instruction::SWAP12 },
-	{ "SWAP13", Instruction::SWAP13 },
-	{ "SWAP14", Instruction::SWAP14 },
-	{ "SWAP15", Instruction::SWAP15 },
-	{ "SWAP16", Instruction::SWAP16 },
-	{ "LOG0", Instruction::LOG0 },
-	{ "LOG1", Instruction::LOG1 },
-	{ "LOG2", Instruction::LOG2 },
-	{ "LOG3", Instruction::LOG3 },
-	{ "LOG4", Instruction::LOG4 },
-	{ "CREATE", Instruction::CREATE },
-	{ "CALL", Instruction::CALL },
-	{ "CALLCODE", Instruction::CALLCODE },
-	{ "STATICCALL", Instruction::STATICCALL },
-	{ "RETURN", Instruction::RETURN },
-	{ "DELEGATECALL", Instruction::DELEGATECALL },
-	{ "CREATE2", Instruction::CREATE2 },
-	{ "REVERT", Instruction::REVERT },
-	{ "INVALID", Instruction::INVALID },
-	{ "SELFDESTRUCT", Instruction::SELFDESTRUCT }
-};
-
-/// @note InstructionInfo is assumed to be the same across all EVM versions except for the instruction name.
-static std::map<Instruction, InstructionInfo> const c_instructionInfo =
-{ //												Add, Args, Ret, SideEffects, GasPriceTier
-	{ Instruction::STOP,		{ "STOP",			0, 0, 0, true,  Tier::Zero } },
-	{ Instruction::ADD,			{ "ADD",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SUB,			{ "SUB",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::MUL,			{ "MUL",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::DIV,			{ "DIV",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::SDIV,		{ "SDIV",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::MOD,			{ "MOD",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::SMOD,		{ "SMOD",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::EXP,			{ "EXP",			0, 2, 1, false, Tier::Special } },
-	{ Instruction::NOT,			{ "NOT",			0, 1, 1, false, Tier::VeryLow } },
-	{ Instruction::LT,			{ "LT",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::GT,			{ "GT",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SLT,			{ "SLT",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SGT,			{ "SGT",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::EQ,			{ "EQ",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::ISZERO,		{ "ISZERO",			0, 1, 1, false, Tier::VeryLow } },
-	{ Instruction::AND,			{ "AND",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::OR,			{ "OR",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::XOR,			{ "XOR",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::BYTE,		{ "BYTE",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SHL,		{ "SHL",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SHR,		{ "SHR",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SAR,		{ "SAR",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::ADDMOD,		{ "ADDMOD",			0, 3, 1, false, Tier::Mid } },
-	{ Instruction::MULMOD,		{ "MULMOD",			0, 3, 1, false, Tier::Mid } },
-	{ Instruction::SIGNEXTEND,	{ "SIGNEXTEND",		0, 2, 1, false, Tier::Low } },
-	{ Instruction::KECCAK256,	{ "KECCAK256",			0, 2, 1, true, Tier::Special } },
-	{ Instruction::ADDRESS,		{ "ADDRESS",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::BALANCE,		{ "BALANCE",		0, 1, 1, false, Tier::Balance } },
-	{ Instruction::ORIGIN,		{ "ORIGIN",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLER,		{ "CALLER",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLVALUE,	{ "CALLVALUE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLDATALOAD,{ "CALLDATALOAD",	0, 1, 1, false, Tier::VeryLow } },
-	{ Instruction::CALLDATASIZE,{ "CALLDATASIZE",	0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLDATACOPY,{ "CALLDATACOPY",	0, 3, 0, true, Tier::VeryLow } },
-	{ Instruction::CODESIZE,	{ "CODESIZE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::CODECOPY,	{ "CODECOPY",		0, 3, 0, true, Tier::VeryLow } },
-	{ Instruction::GASPRICE,	{ "GASPRICE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::EXTCODESIZE,	{ "EXTCODESIZE",	0, 1, 1, false, Tier::ExtCode } },
-	{ Instruction::EXTCODECOPY,	{ "EXTCODECOPY",	0, 4, 0, true, Tier::ExtCode } },
-	{ Instruction::RETURNDATASIZE,	{"RETURNDATASIZE",	0, 0, 1, false, Tier::Base } },
-	{ Instruction::RETURNDATACOPY,	{"RETURNDATACOPY",	0, 3, 0, true, Tier::VeryLow } },
-	{ Instruction::EXTCODEHASH,	{ "EXTCODEHASH",	0, 1, 1, false, Tier::Balance } },
-	{ Instruction::BLOCKHASH,	{ "BLOCKHASH",		0, 1, 1, false, Tier::Ext } },
-	{ Instruction::COINBASE,	{ "COINBASE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::TIMESTAMP,	{ "TIMESTAMP",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::NUMBER,		{ "NUMBER",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::PREVRANDAO,	{ "PREVRANDAO",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::GASLIMIT,	{ "GASLIMIT",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::CHAINID,		{ "CHAINID",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::SELFBALANCE,	{ "SELFBALANCE",	0, 0, 1, false, Tier::Low } },
-	{ Instruction::BASEFEE,     { "BASEFEE",        0, 0, 1, false, Tier::Base } },
-	{ Instruction::POP,			{ "POP",			0, 1, 0, false, Tier::Base } },
-	{ Instruction::MLOAD,		{ "MLOAD",			0, 1, 1, true, Tier::VeryLow } },
-	{ Instruction::MSTORE,		{ "MSTORE",			0, 2, 0, true, Tier::VeryLow } },
-	{ Instruction::MSTORE8,		{ "MSTORE8",		0, 2, 0, true, Tier::VeryLow } },
-	{ Instruction::SLOAD,		{ "SLOAD",			0, 1, 1, false, Tier::Special } },
-	{ Instruction::SSTORE,		{ "SSTORE",			0, 2, 0, true, Tier::Special } },
-	{ Instruction::JUMP,		{ "JUMP",			0, 1, 0, true, Tier::Mid } },
-	{ Instruction::JUMPI,		{ "JUMPI",			0, 2, 0, true, Tier::High } },
-	{ Instruction::PC,			{ "PC",				0, 0, 1, false, Tier::Base } },
-	{ Instruction::MSIZE,		{ "MSIZE",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::GAS,			{ "GAS",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::JUMPDEST,	{ "JUMPDEST",		0, 0, 0, true, Tier::Special } },
-	{ Instruction::PUSH0,		{ "PUSH0",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::PUSH1,		{ "PUSH1",			1, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH2,		{ "PUSH2",			2, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH3,		{ "PUSH3",			3, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH4,		{ "PUSH4",			4, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH5,		{ "PUSH5",			5, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH6,		{ "PUSH6",			6, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH7,		{ "PUSH7",			7, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH8,		{ "PUSH8",			8, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH9,		{ "PUSH9",			9, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH10,		{ "PUSH10",			10, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH11,		{ "PUSH11",			11, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH12,		{ "PUSH12",			12, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH13,		{ "PUSH13",			13, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH14,		{ "PUSH14",			14, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH15,		{ "PUSH15",			15, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH16,		{ "PUSH16",			16, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH17,		{ "PUSH17",			17, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH18,		{ "PUSH18",			18, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH19,		{ "PUSH19",			19, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH20,		{ "PUSH20",			20, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH21,		{ "PUSH21",			21, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH22,		{ "PUSH22",			22, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH23,		{ "PUSH23",			23, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH24,		{ "PUSH24",			24, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH25,		{ "PUSH25",			25, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH26,		{ "PUSH26",			26, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH27,		{ "PUSH27",			27, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH28,		{ "PUSH28",			28, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH29,		{ "PUSH29",			29, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH30,		{ "PUSH30",			30, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH31,		{ "PUSH31",			31, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH32,		{ "PUSH32",			32, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::DUP1,		{ "DUP1",			0, 1, 2, false, Tier::VeryLow } },
-	{ Instruction::DUP2,		{ "DUP2",			0, 2, 3, false, Tier::VeryLow } },
-	{ Instruction::DUP3,		{ "DUP3",			0, 3, 4, false, Tier::VeryLow } },
-	{ Instruction::DUP4,		{ "DUP4",			0, 4, 5, false, Tier::VeryLow } },
-	{ Instruction::DUP5,		{ "DUP5",			0, 5, 6, false, Tier::VeryLow } },
-	{ Instruction::DUP6,		{ "DUP6",			0, 6, 7, false, Tier::VeryLow } },
-	{ Instruction::DUP7,		{ "DUP7",			0, 7, 8, false, Tier::VeryLow } },
-	{ Instruction::DUP8,		{ "DUP8",			0, 8, 9, false, Tier::VeryLow } },
-	{ Instruction::DUP9,		{ "DUP9",			0, 9, 10, false, Tier::VeryLow } },
-	{ Instruction::DUP10,		{ "DUP10",			0, 10, 11, false, Tier::VeryLow } },
-	{ Instruction::DUP11,		{ "DUP11",			0, 11, 12, false, Tier::VeryLow } },
-	{ Instruction::DUP12,		{ "DUP12",			0, 12, 13, false, Tier::VeryLow } },
-	{ Instruction::DUP13,		{ "DUP13",			0, 13, 14, false, Tier::VeryLow } },
-	{ Instruction::DUP14,		{ "DUP14",			0, 14, 15, false, Tier::VeryLow } },
-	{ Instruction::DUP15,		{ "DUP15",			0, 15, 16, false, Tier::VeryLow } },
-	{ Instruction::DUP16,		{ "DUP16",			0, 16, 17, false, Tier::VeryLow } },
-	{ Instruction::SWAP1,		{ "SWAP1",			0, 2, 2, false, Tier::VeryLow } },
-	{ Instruction::SWAP2,		{ "SWAP2",			0, 3, 3, false, Tier::VeryLow } },
-	{ Instruction::SWAP3,		{ "SWAP3",			0, 4, 4, false, Tier::VeryLow } },
-	{ Instruction::SWAP4,		{ "SWAP4",			0, 5, 5, false, Tier::VeryLow } },
-	{ Instruction::SWAP5,		{ "SWAP5",			0, 6, 6, false, Tier::VeryLow } },
-	{ Instruction::SWAP6,		{ "SWAP6",			0, 7, 7, false, Tier::VeryLow } },
-	{ Instruction::SWAP7,		{ "SWAP7",			0, 8, 8, false, Tier::VeryLow } },
-	{ Instruction::SWAP8,		{ "SWAP8",			0, 9, 9, false, Tier::VeryLow } },
-	{ Instruction::SWAP9,		{ "SWAP9",			0, 10, 10, false, Tier::VeryLow } },
-	{ Instruction::SWAP10,		{ "SWAP10",			0, 11, 11, false, Tier::VeryLow } },
-	{ Instruction::SWAP11,		{ "SWAP11",			0, 12, 12, false, Tier::VeryLow } },
-	{ Instruction::SWAP12,		{ "SWAP12",			0, 13, 13, false, Tier::VeryLow } },
-	{ Instruction::SWAP13,		{ "SWAP13",			0, 14, 14, false, Tier::VeryLow } },
-	{ Instruction::SWAP14,		{ "SWAP14",			0, 15, 15, false, Tier::VeryLow } },
-	{ Instruction::SWAP15,		{ "SWAP15",			0, 16, 16, false, Tier::VeryLow } },
-	{ Instruction::SWAP16,		{ "SWAP16",			0, 17, 17, false, Tier::VeryLow } },
-	{ Instruction::LOG0,		{ "LOG0",			0, 2, 0, true, Tier::Special } },
-	{ Instruction::LOG1,		{ "LOG1",			0, 3, 0, true, Tier::Special } },
-	{ Instruction::LOG2,		{ "LOG2",			0, 4, 0, true, Tier::Special } },
-	{ Instruction::LOG3,		{ "LOG3",			0, 5, 0, true, Tier::Special } },
-	{ Instruction::LOG4,		{ "LOG4",			0, 6, 0, true, Tier::Special } },
-	{ Instruction::CREATE,		{ "CREATE",			0, 3, 1, true, Tier::Special } },
-	{ Instruction::CALL,		{ "CALL",			0, 7, 1, true, Tier::Special } },
-	{ Instruction::CALLCODE,	{ "CALLCODE",		0, 7, 1, true, Tier::Special } },
-	{ Instruction::RETURN,		{ "RETURN",			0, 2, 0, true, Tier::Zero } },
-	{ Instruction::DELEGATECALL,	{ "DELEGATECALL",	0, 6, 1, true, Tier::Special } },
-	{ Instruction::STATICCALL,	{ "STATICCALL",		0, 6, 1, true, Tier::Special } },
-	{ Instruction::CREATE2,		{ "CREATE2",		0, 4, 1, true, Tier::Special } },
-	{ Instruction::REVERT,		{ "REVERT",		0, 2, 0, true, Tier::Zero } },
-	{ Instruction::INVALID,		{ "INVALID",		0, 0, 0, true, Tier::Zero } },
-	{ Instruction::SELFDESTRUCT,	{ "SELFDESTRUCT",		0, 1, 0, true, Tier::Special } }
-};
-
-InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst, langutil::EVMVersion _evmVersion)
-{
-	try
-	{
-		if (_inst == Instruction::PREVRANDAO && _evmVersion < langutil::EVMVersion::paris())
-			return InstructionInfo({ "DIFFICULTY", 0, 0, 1, false, Tier::Base });
-		return c_instructionInfo.at(_inst);
-	}
-	catch (...)
-	{
-		return InstructionInfo({"<INVALID_INSTRUCTION: " + std::to_string(static_cast<unsigned>(_inst)) + ">", 0, 0, 0, false, Tier::Invalid});
-	}
-}
-
-bool solidity::evmasm::isValidInstruction(Instruction _inst)
-{
-	return !!c_instructionInfo.count(_inst);
-}
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
deleted file mode 100644
index 2fddb11d80ea..000000000000
--- a/libevmasm/Instruction.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Instruction.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#pragma once
-
-#include <libevmasm/Exceptions.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/Assertions.h>
-#include <liblangutil/EVMVersion.h>
-
-namespace solidity::evmasm
-{
-
-/// Virtual machine bytecode instruction.
-enum class Instruction: uint8_t
-{
-	STOP = 0x00,		///< halts execution
-	ADD,				///< addition operation
-	MUL,				///< multiplication operation
-	SUB,				///< subtraction operation
-	DIV,				///< integer division operation
-	SDIV,				///< signed integer division operation
-	MOD,				///< modulo remainder operation
-	SMOD,				///< signed modulo remainder operation
-	ADDMOD,				///< unsigned modular addition
-	MULMOD,				///< unsigned modular multiplication
-	EXP,				///< exponential operation
-	SIGNEXTEND,			///< extend length of signed integer
-
-	LT = 0x10,			///< less-than comparison
-	GT,					///< greater-than comparison
-	SLT,				///< signed less-than comparison
-	SGT,				///< signed greater-than comparison
-	EQ,					///< equality comparison
-	ISZERO,				///< simple not operator
-	AND,				///< bitwise AND operation
-	OR,					///< bitwise OR operation
-	XOR,				///< bitwise XOR operation
-	NOT,				///< bitwise NOT operation
-	BYTE,				///< retrieve single byte from word
-	SHL,				///< bitwise SHL operation
-	SHR,				///< bitwise SHR operation
-	SAR,				///< bitwise SAR operation
-
-	KECCAK256 = 0x20,		///< compute KECCAK-256 hash
-
-	ADDRESS = 0x30,		///< get address of currently executing account
-	BALANCE,			///< get balance of the given account
-	ORIGIN,				///< get execution origination address
-	CALLER,				///< get caller address
-	CALLVALUE,			///< get deposited value by the instruction/transaction responsible for this execution
-	CALLDATALOAD,		///< get input data of current environment
-	CALLDATASIZE,		///< get size of input data in current environment
-	CALLDATACOPY,		///< copy input data in current environment to memory
-	CODESIZE,			///< get size of code running in current environment
-	CODECOPY,			///< copy code running in current environment to memory
-	GASPRICE,			///< get price of gas in current environment
-	EXTCODESIZE,		///< get external code size (from another contract)
-	EXTCODECOPY,		///< copy external code (from another contract)
-	RETURNDATASIZE = 0x3d,	///< get size of return data buffer
-	RETURNDATACOPY = 0x3e,	///< copy return data in current environment to memory
-	EXTCODEHASH = 0x3f,	///< get external code hash (from another contract)
-
-	BLOCKHASH = 0x40,	///< get hash of most recent complete block
-	COINBASE,			///< get the block's coinbase address
-	TIMESTAMP,			///< get the block's timestamp
-	NUMBER,				///< get the block's number
-	PREVRANDAO,			///< get randomness provided by the beacon chain
-	GASLIMIT,			///< get the block's gas limit
-	CHAINID,			///< get the config's chainid param
-	SELFBALANCE,		///< get balance of the current account
-	BASEFEE,            ///< get the block's basefee
-
-	POP = 0x50,			///< remove item from stack
-	MLOAD,				///< load word from memory
-	MSTORE,				///< save word to memory
-	MSTORE8,			///< save byte to memory
-	SLOAD,				///< load word from storage
-	SSTORE,				///< save word to storage
-	JUMP,				///< alter the program counter
-	JUMPI,				///< conditionally alter the program counter
-	PC,					///< get the program counter
-	MSIZE,				///< get the size of active memory
-	GAS,				///< get the amount of available gas
-	JUMPDEST,			///< set a potential jump destination
-
-	PUSH0 = 0x5f,       ///< place the value 0 on stack
-	PUSH1 = 0x60,		///< place 1 byte item on stack
-	PUSH2,				///< place 2 byte item on stack
-	PUSH3,				///< place 3 byte item on stack
-	PUSH4,				///< place 4 byte item on stack
-	PUSH5,				///< place 5 byte item on stack
-	PUSH6,				///< place 6 byte item on stack
-	PUSH7,				///< place 7 byte item on stack
-	PUSH8,				///< place 8 byte item on stack
-	PUSH9,				///< place 9 byte item on stack
-	PUSH10,				///< place 10 byte item on stack
-	PUSH11,				///< place 11 byte item on stack
-	PUSH12,				///< place 12 byte item on stack
-	PUSH13,				///< place 13 byte item on stack
-	PUSH14,				///< place 14 byte item on stack
-	PUSH15,				///< place 15 byte item on stack
-	PUSH16,				///< place 16 byte item on stack
-	PUSH17,				///< place 17 byte item on stack
-	PUSH18,				///< place 18 byte item on stack
-	PUSH19,				///< place 19 byte item on stack
-	PUSH20,				///< place 20 byte item on stack
-	PUSH21,				///< place 21 byte item on stack
-	PUSH22,				///< place 22 byte item on stack
-	PUSH23,				///< place 23 byte item on stack
-	PUSH24,				///< place 24 byte item on stack
-	PUSH25,				///< place 25 byte item on stack
-	PUSH26,				///< place 26 byte item on stack
-	PUSH27,				///< place 27 byte item on stack
-	PUSH28,				///< place 28 byte item on stack
-	PUSH29,				///< place 29 byte item on stack
-	PUSH30,				///< place 30 byte item on stack
-	PUSH31,				///< place 31 byte item on stack
-	PUSH32,				///< place 32 byte item on stack
-
-	DUP1 = 0x80,		///< copies the highest item in the stack to the top of the stack
-	DUP2,				///< copies the second highest item in the stack to the top of the stack
-	DUP3,				///< copies the third highest item in the stack to the top of the stack
-	DUP4,				///< copies the 4th highest item in the stack to the top of the stack
-	DUP5,				///< copies the 5th highest item in the stack to the top of the stack
-	DUP6,				///< copies the 6th highest item in the stack to the top of the stack
-	DUP7,				///< copies the 7th highest item in the stack to the top of the stack
-	DUP8,				///< copies the 8th highest item in the stack to the top of the stack
-	DUP9,				///< copies the 9th highest item in the stack to the top of the stack
-	DUP10,				///< copies the 10th highest item in the stack to the top of the stack
-	DUP11,				///< copies the 11th highest item in the stack to the top of the stack
-	DUP12,				///< copies the 12th highest item in the stack to the top of the stack
-	DUP13,				///< copies the 13th highest item in the stack to the top of the stack
-	DUP14,				///< copies the 14th highest item in the stack to the top of the stack
-	DUP15,				///< copies the 15th highest item in the stack to the top of the stack
-	DUP16,				///< copies the 16th highest item in the stack to the top of the stack
-
-	SWAP1 = 0x90,		///< swaps the highest and second highest value on the stack
-	SWAP2,				///< swaps the highest and third highest value on the stack
-	SWAP3,				///< swaps the highest and 4th highest value on the stack
-	SWAP4,				///< swaps the highest and 5th highest value on the stack
-	SWAP5,				///< swaps the highest and 6th highest value on the stack
-	SWAP6,				///< swaps the highest and 7th highest value on the stack
-	SWAP7,				///< swaps the highest and 8th highest value on the stack
-	SWAP8,				///< swaps the highest and 9th highest value on the stack
-	SWAP9,				///< swaps the highest and 10th highest value on the stack
-	SWAP10,				///< swaps the highest and 11th highest value on the stack
-	SWAP11,				///< swaps the highest and 12th highest value on the stack
-	SWAP12,				///< swaps the highest and 13th highest value on the stack
-	SWAP13,				///< swaps the highest and 14th highest value on the stack
-	SWAP14,				///< swaps the highest and 15th highest value on the stack
-	SWAP15,				///< swaps the highest and 16th highest value on the stack
-	SWAP16,				///< swaps the highest and 17th highest value on the stack
-
-	LOG0 = 0xa0,		///< Makes a log entry; no topics.
-	LOG1,				///< Makes a log entry; 1 topic.
-	LOG2,				///< Makes a log entry; 2 topics.
-	LOG3,				///< Makes a log entry; 3 topics.
-	LOG4,				///< Makes a log entry; 4 topics.
-
-	CREATE = 0xf0,		///< create a new account with associated code
-	CALL,				///< message-call into an account
-	CALLCODE,			///< message-call with another account's code only
-	RETURN,				///< halt execution returning output data
-	DELEGATECALL,		///< like CALLCODE but keeps caller's value and sender
-	CREATE2 = 0xf5,		///< create new account with associated code at address `sha3(0xff + sender + salt + init code) % 2**160`
-	STATICCALL = 0xfa,	///< like CALL but disallow state modifications
-
-	REVERT = 0xfd,		///< halt execution, revert state and return output data
-	INVALID = 0xfe,		///< invalid instruction for expressing runtime errors (e.g., division-by-zero)
-	SELFDESTRUCT = 0xff	///< halt execution and register account for later deletion
-};
-
-/// @returns true if the instruction is of the CALL opcode family
-constexpr bool isCallInstruction(Instruction _inst) noexcept
-{
-	switch (_inst)
-	{
-		case Instruction::CALL:
-		case Instruction::CALLCODE:
-		case Instruction::DELEGATECALL:
-		case Instruction::STATICCALL:
-			return true;
-		default:
-			return false;
-	}
-}
-
-/// @returns true if the instruction is a PUSH
-inline bool isPushInstruction(Instruction _inst)
-{
-	return Instruction::PUSH0 <= _inst && _inst <= Instruction::PUSH32;
-}
-
-/// @returns true if the instruction is a DUP
-inline bool isDupInstruction(Instruction _inst)
-{
-	return Instruction::DUP1 <= _inst && _inst <= Instruction::DUP16;
-}
-
-/// @returns true if the instruction is a SWAP
-inline bool isSwapInstruction(Instruction _inst)
-{
-	return Instruction::SWAP1 <= _inst && _inst <= Instruction::SWAP16;
-}
-
-/// @returns true if the instruction is a LOG
-inline bool isLogInstruction(Instruction _inst)
-{
-	return Instruction::LOG0 <= _inst && _inst <= Instruction::LOG4;
-}
-
-/// @returns the number of PUSH Instruction _inst
-inline unsigned getPushNumber(Instruction _inst)
-{
-	return static_cast<uint8_t>(_inst) - unsigned(Instruction::PUSH0);
-}
-
-/// @returns the number of DUP Instruction _inst
-inline unsigned getDupNumber(Instruction _inst)
-{
-	return static_cast<uint8_t>(_inst) - unsigned(Instruction::DUP1) + 1;
-}
-
-/// @returns the number of SWAP Instruction _inst
-inline unsigned getSwapNumber(Instruction _inst)
-{
-	return static_cast<uint8_t>(_inst) - unsigned(Instruction::SWAP1) + 1;
-}
-
-/// @returns the number of LOG Instruction _inst
-inline unsigned getLogNumber(Instruction _inst)
-{
-	return static_cast<uint8_t>(_inst) - unsigned(Instruction::LOG0);
-}
-
-/// @returns the PUSH<_number> instruction
-inline Instruction pushInstruction(unsigned _number)
-{
-	assertThrow(_number <= 32, InvalidOpcode, std::string("Invalid PUSH instruction requested (") + std::to_string(_number) + ").");
-	return Instruction(unsigned(Instruction::PUSH0) + _number);
-}
-
-/// @returns the DUP<_number> instruction
-inline Instruction dupInstruction(unsigned _number)
-{
-	assertThrow(1 <= _number && _number <= 16, InvalidOpcode, std::string("Invalid DUP instruction requested (") + std::to_string(_number) + ").");
-	return Instruction(unsigned(Instruction::DUP1) + _number - 1);
-}
-
-/// @returns the SWAP<_number> instruction
-inline Instruction swapInstruction(unsigned _number)
-{
-	assertThrow(1 <= _number && _number <= 16, InvalidOpcode, std::string("Invalid SWAP instruction requested (") + std::to_string(_number) + ").");
-	return Instruction(unsigned(Instruction::SWAP1) + _number - 1);
-}
-
-/// @returns the LOG<_number> instruction
-inline Instruction logInstruction(unsigned _number)
-{
-	assertThrow(_number <= 4, InvalidOpcode, std::string("Invalid LOG instruction requested (") + std::to_string(_number) + ").");
-	return Instruction(unsigned(Instruction::LOG0) + _number);
-}
-
-enum class Tier
-{
-	Zero = 0,	// 0, Zero
-	Base,		// 2, Quick
-	VeryLow,	// 3, Fastest
-	Low,		// 5, Fast
-	Mid,		// 8, Mid
-	High,		// 10, Slow
-	Ext,		// 20, Ext
-	ExtCode,	// 700, Extcode
-	Balance,	// 400, Balance
-	Special,	// multiparam or otherwise special
-	Invalid		// Invalid.
-};
-
-/// Information structure for a particular instruction.
-struct InstructionInfo
-{
-	std::string name;	///< The name of the instruction.
-	int additional;		///< Additional items required in memory for this instructions (only for PUSH).
-	int args;			///< Number of items required on the stack for this instruction (and, for the purposes of ret, the number taken from the stack).
-	int ret;			///< Number of items placed (back) on the stack by this instruction, assuming args items were removed.
-	bool sideEffects;	///< false if the only effect on the execution environment (apart from gas usage) is a change to a topmost segment of the stack
-	Tier gasPriceTier;	///< Tier for gas pricing.
-};
-
-/// Information on all the instructions.
-InstructionInfo instructionInfo(Instruction _inst, langutil::EVMVersion _evmVersion);
-
-/// check whether instructions exists.
-bool isValidInstruction(Instruction _inst);
-
-/// Convert from string mnemonic to Instruction type.
-extern const std::map<std::string, Instruction> c_instructions;
-
-}
diff --git a/libevmasm/JumpdestRemover.cpp b/libevmasm/JumpdestRemover.cpp
deleted file mode 100644
index 7afa715a88df..000000000000
--- a/libevmasm/JumpdestRemover.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * Removes unused JUMPDESTs.
- */
-
-#include <libevmasm/JumpdestRemover.h>
-
-#include <libevmasm/AssemblyItem.h>
-
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-
-bool JumpdestRemover::optimise(std::set<size_t> const& _tagsReferencedFromOutside)
-{
-	std::set<size_t> references{referencedTags(m_items, std::numeric_limits<size_t>::max())};
-	references.insert(_tagsReferencedFromOutside.begin(), _tagsReferencedFromOutside.end());
-
-	size_t initialSize = m_items.size();
-	/// Remove tags which are never referenced.
-	auto pend = remove_if(
-		m_items.begin(),
-		m_items.end(),
-		[&](AssemblyItem const& _item)
-		{
-			if (_item.type() != Tag)
-				return false;
-			auto asmIdAndTag = _item.splitForeignPushTag();
-			assertThrow(asmIdAndTag.first == std::numeric_limits<size_t>::max(), OptimizerException, "Sub-assembly tag used as label.");
-			size_t tag = asmIdAndTag.second;
-			return !references.count(tag);
-		}
-	);
-	m_items.erase(pend, m_items.end());
-	return m_items.size() != initialSize;
-}
-
-std::set<size_t> JumpdestRemover::referencedTags(AssemblyItems const& _items, size_t _subId)
-{
-	std::set<size_t> ret;
-	for (auto const& item: _items)
-		if (item.type() == PushTag)
-		{
-			auto subAndTag = item.splitForeignPushTag();
-			if (subAndTag.first == _subId)
-				ret.insert(subAndTag.second);
-		}
-	return ret;
-}
diff --git a/libevmasm/JumpdestRemover.h b/libevmasm/JumpdestRemover.h
deleted file mode 100644
index e07550e2dd40..000000000000
--- a/libevmasm/JumpdestRemover.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * Removes unused JUMPDESTs.
- */
-#pragma once
-
-#include <vector>
-#include <cstddef>
-#include <set>
-
-namespace solidity::evmasm
-{
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-
-class JumpdestRemover
-{
-public:
-	explicit JumpdestRemover(AssemblyItems& _items): m_items(_items) {}
-
-	bool optimise(std::set<size_t> const& _tagsReferencedFromOutside);
-
-	/// @returns a set of all tags from the given sub-assembly that are referenced
-	/// from the given list of items.
-	static std::set<size_t> referencedTags(AssemblyItems const& _items, size_t _subId);
-
-private:
-	AssemblyItems& m_items;
-};
-
-}
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
deleted file mode 100644
index 91f798bf3890..000000000000
--- a/libevmasm/KnownState.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file KnownState.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Contains knowledge about the state of the virtual machine at a specific instruction.
- */
-
-#include <libevmasm/KnownState.h>
-#include <libevmasm/AssemblyItem.h>
-#include <libsolutil/Keccak256.h>
-
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-std::ostream& KnownState::stream(std::ostream& _out) const
-{
-	auto streamExpressionClass = [this](std::ostream& _out, Id _id)
-	{
-		auto const& expr = m_expressionClasses->representative(_id);
-		_out << "  " << std::dec << _id << ": ";
-		if (!expr.item)
-			_out << " no item";
-		else if (expr.item->type() == UndefinedItem)
-			_out << " unknown " << static_cast<int>(expr.item->data());
-		else
-			_out << *expr.item;
-		if (expr.sequenceNumber)
-			_out << "@" << std::dec << expr.sequenceNumber;
-		_out << "(";
-		for (Id arg: expr.arguments)
-			_out << std::dec << arg << ",";
-		_out << ")" << std::endl;
-	};
-
-	_out << "=== State ===" << std::endl;
-	_out << "Stack height: " << std::dec << m_stackHeight << std::endl;
-	_out << "Equivalence classes:" << std::endl;
-	for (Id eqClass = 0; eqClass < m_expressionClasses->size(); ++eqClass)
-		streamExpressionClass(_out, eqClass);
-
-	_out << "Stack:" << std::endl;
-	for (auto const& it: m_stackElements)
-	{
-		_out << "  " << std::dec << it.first << ": ";
-		streamExpressionClass(_out, it.second);
-	}
-	_out << "Storage:" << std::endl;
-	for (auto const& it: m_storageContent)
-	{
-		_out << "  ";
-		streamExpressionClass(_out, it.first);
-		_out << ": ";
-		streamExpressionClass(_out, it.second);
-	}
-	_out << "Memory:" << std::endl;
-	for (auto const& it: m_memoryContent)
-	{
-		_out << "  ";
-		streamExpressionClass(_out, it.first);
-		_out << ": ";
-		streamExpressionClass(_out, it.second);
-	}
-
-	return _out;
-}
-
-KnownState::StoreOperation KnownState::feedItem(AssemblyItem const& _item, bool _copyItem)
-{
-	StoreOperation op;
-	if (_item.type() == Tag)
-	{
-		// can be ignored
-	}
-	else if (_item.type() == AssignImmutable)
-	{
-		// Since AssignImmutable breaks blocks, it should be fine to only consider its changes to the stack, which
-		// is the same as two POPs.
-		// Note that the StoreOperation for POP is generic and _copyItem is ignored.
-		feedItem(AssemblyItem(Instruction::POP), _copyItem);
-		return feedItem(AssemblyItem(Instruction::POP), _copyItem);
-	}
-	else if (_item.type() == VerbatimBytecode)
-	{
-		m_sequenceNumber += 2;
-		resetMemory();
-		resetKnownKeccak256Hashes();
-		resetStorage();
-		// Consume all arguments and place unknown return values on the stack.
-		m_stackElements.erase(
-			m_stackElements.upper_bound(m_stackHeight - static_cast<int>(_item.arguments())),
-			m_stackElements.end()
-		);
-		m_stackHeight += static_cast<int>(_item.deposit());
-		for (size_t i = 0; i < _item.returnValues(); ++i)
-			setStackElement(
-				m_stackHeight - static_cast<int>(i),
-				m_expressionClasses->newClass(_item.location())
-			);
-	}
-	else if (_item.type() != Operation)
-	{
-		assertThrow(_item.deposit() == 1, InvalidDeposit, "");
-		if (_item.pushedValue())
-			// only available after assembly stage, should not be used for optimisation
-			setStackElement(++m_stackHeight, m_expressionClasses->find(*_item.pushedValue()));
-		else
-			setStackElement(++m_stackHeight, m_expressionClasses->find(_item, {}, _copyItem));
-	}
-	else
-	{
-		Instruction instruction = _item.instruction();
-		// The latest EVMVersion is used here, since the InstructionInfo is assumed to be
-		// the same across all EVM versions except for the instruction name.
-		InstructionInfo info = instructionInfo(instruction, EVMVersion());
-		if (SemanticInformation::isDupInstruction(_item))
-			setStackElement(
-				m_stackHeight + 1,
-				stackElement(
-					m_stackHeight - static_cast<int>(instruction) + static_cast<int>(Instruction::DUP1),
-					_item.location()
-				)
-			);
-		else if (SemanticInformation::isSwapInstruction(_item))
-			swapStackElements(
-				m_stackHeight,
-				m_stackHeight - 1 - static_cast<int>(instruction) + static_cast<int>(Instruction::SWAP1),
-				_item.location()
-			);
-		else if (instruction != Instruction::POP)
-		{
-			std::vector<Id> arguments(static_cast<size_t>(info.args));
-			for (size_t i = 0; i < static_cast<size_t>(info.args); ++i)
-				arguments[i] = stackElement(m_stackHeight - static_cast<int>(i), _item.location());
-			switch (_item.instruction())
-			{
-			case Instruction::SSTORE:
-				op = storeInStorage(arguments[0], arguments[1], _item.location());
-				break;
-			case Instruction::SLOAD:
-				setStackElement(
-					m_stackHeight + static_cast<int>(_item.deposit()),
-					loadFromStorage(arguments[0], _item.location())
-				);
-				break;
-			case Instruction::MSTORE:
-				op = storeInMemory(arguments[0], arguments[1], _item.location());
-				break;
-			case Instruction::MLOAD:
-				setStackElement(
-					m_stackHeight + static_cast<int>(_item.deposit()),
-					loadFromMemory(arguments[0], _item.location())
-				);
-				break;
-			case Instruction::KECCAK256:
-				setStackElement(
-					m_stackHeight + static_cast<int>(_item.deposit()),
-					applyKeccak256(arguments.at(0), arguments.at(1), _item.location())
-				);
-				break;
-			default:
-				bool invMem =
-					SemanticInformation::memory(_item.instruction()) == SemanticInformation::Write;
-				bool invStor =
-					SemanticInformation::storage(_item.instruction()) == SemanticInformation::Write;
-				// We could be a bit more fine-grained here (CALL only invalidates part of
-				// memory, etc), but we do not for now.
-				if (invMem)
-				{
-					resetMemory();
-					resetKnownKeccak256Hashes();
-				}
-				if (invStor)
-					resetStorage();
-				if (invMem || invStor)
-					m_sequenceNumber += 2; // Increment by two because it can read and write
-				assertThrow(info.ret <= 1, InvalidDeposit, "");
-				if (info.ret == 1)
-					setStackElement(
-						m_stackHeight + static_cast<int>(_item.deposit()),
-						m_expressionClasses->find(_item, arguments, _copyItem)
-					);
-			}
-		}
-		m_stackElements.erase(
-			m_stackElements.upper_bound(m_stackHeight + static_cast<int>(_item.deposit())),
-			m_stackElements.end()
-		);
-		m_stackHeight += static_cast<int>(_item.deposit());
-	}
-	return op;
-}
-
-/// Helper function for KnownState::reduceToCommonKnowledge, removes everything from
-/// _this which is not in or not equal to the value in _other.
-template <class Mapping> void intersect(Mapping& _this, Mapping const& _other)
-{
-	for (auto it = _this.begin(); it != _this.end();)
-		if (_other.count(it->first) && _other.at(it->first) == it->second)
-			++it;
-		else
-			it = _this.erase(it);
-}
-
-void KnownState::reduceToCommonKnowledge(KnownState const& _other, bool _combineSequenceNumbers)
-{
-	int stackDiff = m_stackHeight - _other.m_stackHeight;
-	for (auto it = m_stackElements.begin(); it != m_stackElements.end();)
-		if (_other.m_stackElements.count(it->first - stackDiff))
-		{
-			Id other = _other.m_stackElements.at(it->first - stackDiff);
-			if (it->second == other)
-				++it;
-			else
-			{
-				std::set<u256> theseTags = tagsInExpression(it->second);
-				std::set<u256> otherTags = tagsInExpression(other);
-				if (!theseTags.empty() && !otherTags.empty())
-				{
-					theseTags.insert(otherTags.begin(), otherTags.end());
-					it->second = tagUnion(theseTags);
-					++it;
-				}
-				else
-					it = m_stackElements.erase(it);
-			}
-		}
-		else
-			it = m_stackElements.erase(it);
-
-	// Use the smaller stack height. Essential to terminate in case of loops.
-	if (m_stackHeight > _other.m_stackHeight)
-	{
-		std::map<int, Id> shiftedStack;
-		for (auto const& stackElement: m_stackElements)
-			shiftedStack[stackElement.first - stackDiff] = stackElement.second;
-		m_stackElements = std::move(shiftedStack);
-		m_stackHeight = _other.m_stackHeight;
-	}
-
-	intersect(m_storageContent, _other.m_storageContent);
-	intersect(m_memoryContent, _other.m_memoryContent);
-	if (_combineSequenceNumbers)
-		m_sequenceNumber = std::max(m_sequenceNumber, _other.m_sequenceNumber);
-}
-
-bool KnownState::operator==(KnownState const& _other) const
-{
-	if (m_storageContent != _other.m_storageContent || m_memoryContent != _other.m_memoryContent)
-		return false;
-	int stackDiff = m_stackHeight - _other.m_stackHeight;
-	auto thisIt = m_stackElements.cbegin();
-	auto otherIt = _other.m_stackElements.cbegin();
-	for (; thisIt != m_stackElements.cend() && otherIt != _other.m_stackElements.cend(); ++thisIt, ++otherIt)
-		if (thisIt->first - stackDiff != otherIt->first || thisIt->second != otherIt->second)
-			return false;
-	return (thisIt == m_stackElements.cend() && otherIt == _other.m_stackElements.cend());
-}
-
-ExpressionClasses::Id KnownState::stackElement(int _stackHeight, SourceLocation const& _location)
-{
-	if (m_stackElements.count(_stackHeight))
-		return m_stackElements.at(_stackHeight);
-	// Stack element not found (not assigned yet), create new unknown equivalence class.
-	return m_stackElements[_stackHeight] =
-			m_expressionClasses->find(AssemblyItem(UndefinedItem, _stackHeight, _location));
-}
-
-KnownState::Id KnownState::relativeStackElement(int _stackOffset, SourceLocation const& _location)
-{
-	return stackElement(m_stackHeight + _stackOffset, _location);
-}
-
-void KnownState::clearTagUnions()
-{
-	for (auto it = m_stackElements.begin(); it != m_stackElements.end();)
-		if (m_tagUnions.left.count(it->second))
-			it = m_stackElements.erase(it);
-		else
-			++it;
-}
-
-void KnownState::setStackElement(int _stackHeight, Id _class)
-{
-	m_stackElements[_stackHeight] = _class;
-}
-
-void KnownState::swapStackElements(
-	int _stackHeightA,
-	int _stackHeightB,
-	SourceLocation const& _location
-)
-{
-	assertThrow(_stackHeightA != _stackHeightB, OptimizerException, "Swap on same stack elements.");
-	// ensure they are created
-	stackElement(_stackHeightA, _location);
-	stackElement(_stackHeightB, _location);
-
-	std::swap(m_stackElements[_stackHeightA], m_stackElements[_stackHeightB]);
-}
-
-KnownState::StoreOperation KnownState::storeInStorage(
-	Id _slot,
-	Id _value,
-	SourceLocation const& _location)
-{
-	if (m_storageContent.count(_slot) && m_storageContent[_slot] == _value)
-		// do not execute the storage if we know that the value is already there
-		return StoreOperation();
-	m_sequenceNumber++;
-	decltype(m_storageContent) storageContents;
-	// Copy over all values (i.e. retain knowledge about them) where we know that this store
-	// operation will not destroy the knowledge. Specifically, we copy storage locations we know
-	// are different from _slot or locations where we know that the stored value is equal to _value.
-	for (auto const& storageItem: m_storageContent)
-		if (m_expressionClasses->knownToBeDifferent(storageItem.first, _slot) || storageItem.second == _value)
-			storageContents.insert(storageItem);
-	m_storageContent = std::move(storageContents);
-
-	AssemblyItem item(Instruction::SSTORE, _location);
-	Id id = m_expressionClasses->find(item, {_slot, _value}, true, m_sequenceNumber);
-	StoreOperation operation{StoreOperation::Storage, _slot, m_sequenceNumber, id};
-	m_storageContent[_slot] = _value;
-	// increment a second time so that we get unique sequence numbers for writes
-	m_sequenceNumber++;
-
-	return operation;
-}
-
-ExpressionClasses::Id KnownState::loadFromStorage(Id _slot, SourceLocation const& _location)
-{
-	if (m_storageContent.count(_slot))
-		return m_storageContent.at(_slot);
-
-	AssemblyItem item(Instruction::SLOAD, _location);
-	return m_storageContent[_slot] = m_expressionClasses->find(item, {_slot}, true, m_sequenceNumber);
-}
-
-KnownState::StoreOperation KnownState::storeInMemory(Id _slot, Id _value, SourceLocation const& _location)
-{
-	if (m_memoryContent.count(_slot) && m_memoryContent[_slot] == _value)
-		// do not execute the store if we know that the value is already there
-		return StoreOperation();
-	m_sequenceNumber++;
-	decltype(m_memoryContent) memoryContents;
-	// copy over values at points where we know that they are different from _slot by at least 32
-	for (auto const& memoryItem: m_memoryContent)
-		if (m_expressionClasses->knownToBeDifferentBy32(memoryItem.first, _slot))
-			memoryContents.insert(memoryItem);
-	m_memoryContent = std::move(memoryContents);
-
-	AssemblyItem item(Instruction::MSTORE, _location);
-	Id id = m_expressionClasses->find(item, {_slot, _value}, true, m_sequenceNumber);
-	StoreOperation operation{StoreOperation::Memory, _slot, m_sequenceNumber, id};
-	m_memoryContent[_slot] = _value;
-	// increment a second time so that we get unique sequence numbers for writes
-	m_sequenceNumber++;
-	return operation;
-}
-
-ExpressionClasses::Id KnownState::loadFromMemory(Id _slot, SourceLocation const& _location)
-{
-	if (m_memoryContent.count(_slot))
-		return m_memoryContent.at(_slot);
-
-	AssemblyItem item(Instruction::MLOAD, _location);
-	return m_memoryContent[_slot] = m_expressionClasses->find(item, {_slot}, true, m_sequenceNumber);
-}
-
-KnownState::Id KnownState::applyKeccak256(
-	Id _start,
-	Id _length,
-	SourceLocation const& _location
-)
-{
-	AssemblyItem keccak256Item(Instruction::KECCAK256, _location);
-	// Special logic if length is a short constant, otherwise we cannot tell.
-	u256 const* l = m_expressionClasses->knownConstant(_length);
-	// unknown or too large length
-	if (!l || *l > 128)
-		return m_expressionClasses->find(keccak256Item, {_start, _length}, true, m_sequenceNumber);
-	unsigned length = unsigned(*l);
-	std::vector<Id> arguments;
-	for (unsigned i = 0; i < length; i += 32)
-	{
-		Id slot = m_expressionClasses->find(
-			AssemblyItem(Instruction::ADD, _location),
-			{_start, m_expressionClasses->find(u256(i))}
-		);
-		arguments.push_back(loadFromMemory(slot, _location));
-	}
-	if (m_knownKeccak256Hashes.count({arguments, length}))
-		return m_knownKeccak256Hashes.at({arguments, length});
-	Id v;
-	// If all arguments are known constants, compute the Keccak-256 here
-	if (all_of(arguments.begin(), arguments.end(), [this](Id _a) { return !!m_expressionClasses->knownConstant(_a); }))
-	{
-		bytes data;
-		for (Id a: arguments)
-			data += toBigEndian(*m_expressionClasses->knownConstant(a));
-		data.resize(length);
-		v = m_expressionClasses->find(AssemblyItem(u256(util::keccak256(data)), _location));
-	}
-	else
-		v = m_expressionClasses->find(keccak256Item, {_start, _length}, true, m_sequenceNumber);
-	return m_knownKeccak256Hashes[{arguments, length}] = v;
-}
-
-std::set<u256> KnownState::tagsInExpression(KnownState::Id _expressionId)
-{
-	if (m_tagUnions.left.count(_expressionId))
-		return m_tagUnions.left.at(_expressionId);
-	// Might be a tag, then return the set of itself.
-	ExpressionClasses::Expression expr = m_expressionClasses->representative(_expressionId);
-	if (expr.item && expr.item->type() == PushTag)
-		return std::set<u256>({expr.item->data()});
-	else
-		return std::set<u256>();
-}
-
-KnownState::Id KnownState::tagUnion(std::set<u256> _tags)
-{
-	if (m_tagUnions.right.count(_tags))
-		return m_tagUnions.right.at(_tags);
-	else
-	{
-		Id id = m_expressionClasses->newClass(SourceLocation());
-		m_tagUnions.right.insert(make_pair(_tags, id));
-		return id;
-	}
-}
diff --git a/libevmasm/KnownState.h b/libevmasm/KnownState.h
deleted file mode 100644
index 9cc22710fabe..000000000000
--- a/libevmasm/KnownState.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file KnownState.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Contains knowledge about the state of the virtual machine at a specific instruction.
- */
-
-#pragma once
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wredeclared-class-member"
-#endif // defined(__clang__)
-
-// Disable warning about nodiscard. Could be a compiler bug, might be removed in the future.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable: 4834)
-#endif
-
-#include <boost/bimap.hpp>
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // defined(__clang__)
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-#include <libevmasm/ExpressionClasses.h>
-#include <libevmasm/SemanticInformation.h>
-
-#include <limits>
-#include <utility>
-#include <vector>
-#include <map>
-#include <set>
-#include <tuple>
-#include <memory>
-#include <ostream>
-
-namespace solidity::langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::evmasm
-{
-
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-
-/**
- * Class to infer and store knowledge about the state of the virtual machine at a specific
- * instruction.
- *
- * The general workings are that for each assembly item that is fed, an equivalence class is
- * derived from the operation and the equivalence class of its arguments. DUPi, SWAPi and some
- * arithmetic instructions are used to infer equivalences while these classes are determined.
- */
-class KnownState
-{
-public:
-	using Id = ExpressionClasses::Id;
-	struct StoreOperation
-	{
-		enum Target { Invalid, Memory, Storage };
-
-		bool isValid() const { return target != Invalid; }
-
-		Target target{Invalid};
-		Id slot{std::numeric_limits<Id>::max()};
-		unsigned sequenceNumber{std::numeric_limits<unsigned>::max()};
-		Id expression{std::numeric_limits<Id>::max()};
-	};
-
-	explicit KnownState(
-		std::shared_ptr<ExpressionClasses> _expressionClasses = std::make_shared<ExpressionClasses>()
-	): m_expressionClasses(std::move(_expressionClasses))
-	{
-	}
-
-	/// Streams debugging information to @a _out.
-	std::ostream& stream(std::ostream& _out) const;
-
-	/// Feeds the item into the system for analysis.
-	/// @returns a possible store operation
-	StoreOperation feedItem(AssemblyItem const& _item, bool _copyItem = false);
-
-	/// Resets any knowledge about storage.
-	void resetStorage() { m_storageContent.clear(); }
-	/// Resets any knowledge about memory.
-	void resetMemory() { m_memoryContent.clear(); }
-	/// Resets known Keccak-256 hashes
-	void resetKnownKeccak256Hashes() { m_knownKeccak256Hashes.clear(); }
-	/// Resets any knowledge about the current stack.
-	void resetStack() { m_stackElements.clear(); m_stackHeight = 0; }
-	/// Resets any knowledge.
-	void reset() { resetStorage(); resetMemory(); resetKnownKeccak256Hashes(); resetStack(); }
-
-	unsigned sequenceNumber() const { return m_sequenceNumber; }
-
-	/// Replaces the state by the intersection with _other, i.e. only equal knowledge is retained.
-	/// If the stack heighht is different, the smaller one is used and the stack is compared
-	/// relatively.
-	/// @param _combineSequenceNumbers if true, sets the sequence number to the maximum of both
-	void reduceToCommonKnowledge(KnownState const& _other, bool _combineSequenceNumbers);
-
-	/// @returns a shared pointer to a copy of this state.
-	std::shared_ptr<KnownState> copy() const { return std::make_shared<KnownState>(*this); }
-
-	/// @returns true if the knowledge about the state of both objects is (known to be) equal.
-	bool operator==(KnownState const& _other) const;
-
-	/// Retrieves the current equivalence class for the given stack element (or generates a new
-	/// one if it does not exist yet).
-	Id stackElement(int _stackHeight, langutil::SourceLocation const& _location);
-	/// @returns the stackElement relative to the current stack height.
-	Id relativeStackElement(int _stackOffset, langutil::SourceLocation const& _location = {});
-
-	/// @returns its set of tags if the given expression class is a known tag union; returns a set
-	/// containing the tag if it is a PushTag expression and the empty set otherwise.
-	std::set<u256> tagsInExpression(Id _expressionId);
-	/// During analysis, different tags on the stack are partially treated as the same class.
-	/// This removes such classes not to confuse later analyzers.
-	void clearTagUnions();
-
-	int stackHeight() const { return m_stackHeight; }
-	std::map<int, Id> const& stackElements() const { return m_stackElements; }
-	ExpressionClasses& expressionClasses() const { return *m_expressionClasses; }
-
-	std::map<Id, Id> const& storageContent() const { return m_storageContent; }
-
-private:
-	/// Assigns a new equivalence class to the next sequence number of the given stack element.
-	void setStackElement(int _stackHeight, Id _class);
-	/// Swaps the given stack elements in their next sequence number.
-	void swapStackElements(int _stackHeightA, int _stackHeightB, langutil::SourceLocation const& _location);
-
-	/// Increments the sequence number, deletes all storage information that might be overwritten
-	/// and stores the new value at the given slot.
-	/// @returns the store operation, which might be invalid if storage was not modified
-	StoreOperation storeInStorage(Id _slot, Id _value, langutil::SourceLocation const& _location);
-	/// Retrieves the current value at the given slot in storage or creates a new special sload class.
-	Id loadFromStorage(Id _slot, langutil::SourceLocation const& _location);
-	/// Increments the sequence number, deletes all memory information that might be overwritten
-	/// and stores the new value at the given slot.
-	/// @returns the store operation, which might be invalid if memory was not modified
-	StoreOperation storeInMemory(Id _slot, Id _value, langutil::SourceLocation const& _location);
-	/// Retrieves the current value at the given slot in memory or creates a new special mload class.
-	Id loadFromMemory(Id _slot, langutil::SourceLocation const& _location);
-	/// Finds or creates a new expression that applies the Keccak-256 hash function to the contents in memory.
-	Id applyKeccak256(Id _start, Id _length, langutil::SourceLocation const& _location);
-
-	/// @returns a new or already used Id representing the given set of tags.
-	Id tagUnion(std::set<u256> _tags);
-
-	/// Current stack height, can be negative.
-	int m_stackHeight = 0;
-	/// Current stack layout, mapping stack height -> equivalence class
-	std::map<int, Id> m_stackElements;
-	/// Current sequence number, this is incremented with each modification to storage or memory.
-	unsigned m_sequenceNumber = 1;
-	/// Knowledge about storage content.
-	std::map<Id, Id> m_storageContent;
-	/// Knowledge about memory content. Keys are memory addresses, note that the values overlap
-	/// and are not contained here if they are not completely known.
-	std::map<Id, Id> m_memoryContent;
-	/// Keeps record of all Keccak-256 hashes that are computed. The first parameter in the
-	/// std::pair corresponds to memory content and the second parameter corresponds to the length
-	/// that is accessed.
-	std::map<std::pair<std::vector<Id>, unsigned>, Id> m_knownKeccak256Hashes;
-	/// Structure containing the classes of equivalent expressions.
-	std::shared_ptr<ExpressionClasses> m_expressionClasses;
-	/// Container for unions of tags stored on the stack.
-	boost::bimap<Id, std::set<u256>> m_tagUnions;
-};
-
-}
diff --git a/libevmasm/LinkerObject.cpp b/libevmasm/LinkerObject.cpp
deleted file mode 100644
index 1b09f4ced0ae..000000000000
--- a/libevmasm/LinkerObject.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file LinkerObject.cpp
- * @author Christian R <c@ethdev.com>
- * @date 2015
- */
-
-#include <libevmasm/LinkerObject.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Keccak256.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-
-void LinkerObject::append(LinkerObject const& _other)
-{
-	for (auto const& ref: _other.linkReferences)
-		linkReferences[ref.first + bytecode.size()] = ref.second;
-	bytecode += _other.bytecode;
-}
-
-void LinkerObject::link(std::map<std::string, h160> const& _libraryAddresses)
-{
-	std::map<size_t, std::string> remainingRefs;
-	for (auto const& linkRef: linkReferences)
-		if (h160 const* address = matchLibrary(linkRef.second, _libraryAddresses))
-			copy(address->data(), address->data() + 20, bytecode.begin() + std::vector<uint8_t>::difference_type(linkRef.first));
-		else
-			remainingRefs.insert(linkRef);
-	linkReferences.swap(remainingRefs);
-}
-
-std::string LinkerObject::toHex() const
-{
-	std::string hex = solidity::util::toHex(bytecode);
-	for (auto const& ref: linkReferences)
-	{
-		size_t pos = ref.first * 2;
-		std::string hash = libraryPlaceholder(ref.second);
-		hex[pos] = hex[pos + 1] = hex[pos + 38] = hex[pos + 39] = '_';
-		for (size_t i = 0; i < 36; ++i)
-			hex[pos + 2 + i] = hash.at(i);
-	}
-	return hex;
-}
-
-std::string LinkerObject::libraryPlaceholder(std::string const& _libraryName)
-{
-	return "$" + keccak256(_libraryName).hex().substr(0, 34) + "$";
-}
-
-h160 const*
-LinkerObject::matchLibrary(
-	std::string const& _linkRefName,
-	std::map<std::string, h160> const& _libraryAddresses
-)
-{
-	auto it = _libraryAddresses.find(_linkRefName);
-	if (it != _libraryAddresses.end())
-		return &it->second;
-	return nullptr;
-}
-
-bool LinkerObject::operator<(LinkerObject const& _other) const
-{
-	return tie(this->bytecode, this->linkReferences, this->immutableReferences) <
-			tie(_other.bytecode, _other.linkReferences, _other.immutableReferences);
-}
diff --git a/libevmasm/LinkerObject.h b/libevmasm/LinkerObject.h
deleted file mode 100644
index 90b519e3af25..000000000000
--- a/libevmasm/LinkerObject.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Assembly.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libsolutil/FixedHash.h>
-
-namespace solidity::evmasm
-{
-
-/**
- * Binary object that potentially still needs to be linked (i.e. addresses of other contracts
- * need to be filled in).
- */
-struct LinkerObject
-{
-	/// The bytecode.
-	bytes bytecode;
-
-	/// Map from offsets in bytecode to library identifiers. The addresses starting at those offsets
-	/// need to be replaced by the actual addresses by the linker.
-	std::map<size_t, std::string> linkReferences;
-
-	/// Map from hashes of the identifiers of immutable variables to the full identifier of the immutable and
-	/// to a list of offsets into the bytecode that refer to their values.
-	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferences;
-
-	struct FunctionDebugData
-	{
-		std::optional<size_t> bytecodeOffset;
-		std::optional<size_t> instructionIndex;
-		std::optional<size_t> sourceID;
-		size_t params = {};
-		size_t returns = {};
-	};
-
-	/// Bytecode offsets of named tags like function entry points.
-	std::map<std::string, FunctionDebugData> functionDebugData;
-
-	/// Appends the bytecode of @a _other and incorporates its link references.
-	void append(LinkerObject const& _other);
-
-	/// Links the given libraries by replacing their uses in the code and removes them from the references.
-	void link(std::map<std::string, util::h160> const& _libraryAddresses);
-
-	/// @returns a hex representation of the bytecode of the given object, replacing unlinked
-	/// addresses by placeholders. This output is lowercase.
-	std::string toHex() const;
-
-	/// @returns a 36 character string that is used as a placeholder for the library
-	/// address (enclosed by `__` on both sides). The placeholder is the hex representation
-	/// of the first 18 bytes of the keccak-256 hash of @a _libraryName.
-	static std::string libraryPlaceholder(std::string const& _libraryName);
-
-	bool operator<(LinkerObject const& _other) const;
-
-private:
-	static util::h160 const* matchLibrary(
-		std::string const& _linkRefName,
-		std::map<std::string, util::h160> const& _libraryAddresses
-	);
-};
-
-}
diff --git a/libevmasm/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp
deleted file mode 100644
index 2acafea22cd4..000000000000
--- a/libevmasm/PathGasMeter.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file PathGasMeter.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- */
-
-#include <libevmasm/PathGasMeter.h>
-#include <libevmasm/KnownState.h>
-#include <libevmasm/SemanticInformation.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-PathGasMeter::PathGasMeter(AssemblyItems const& _items, langutil::EVMVersion _evmVersion):
-	m_items(_items), m_evmVersion(_evmVersion)
-{
-	for (size_t i = 0; i < m_items.size(); ++i)
-		if (m_items[i].type() == Tag)
-			m_tagPositions[m_items[i].data()] = i;
-}
-
-GasMeter::GasConsumption PathGasMeter::estimateMax(
-	size_t _startIndex,
-	std::shared_ptr<KnownState> const& _state
-)
-{
-	auto path = std::make_unique<GasPath>();
-	path->index = _startIndex;
-	path->state = _state->copy();
-	queue(std::move(path));
-
-	GasMeter::GasConsumption gas;
-	while (!m_queue.empty() && !gas.isInfinite)
-		gas = std::max(gas, handleQueueItem());
-	return gas;
-}
-
-void PathGasMeter::queue(std::unique_ptr<GasPath>&& _newPath)
-{
-	if (
-		m_highestGasUsagePerJumpdest.count(_newPath->index) &&
-		_newPath->gas < m_highestGasUsagePerJumpdest.at(_newPath->index)
-	)
-		return;
-	m_highestGasUsagePerJumpdest[_newPath->index] = _newPath->gas;
-	m_queue[_newPath->index] = std::move(_newPath);
-}
-
-GasMeter::GasConsumption PathGasMeter::handleQueueItem()
-{
-	assertThrow(!m_queue.empty(), OptimizerException, "");
-
-	std::unique_ptr<GasPath> path = std::move(m_queue.rbegin()->second);
-	m_queue.erase(--m_queue.end());
-
-	std::shared_ptr<KnownState> state = path->state;
-	GasMeter meter(state, m_evmVersion, path->largestMemoryAccess);
-	ExpressionClasses& classes = state->expressionClasses();
-	GasMeter::GasConsumption gas = path->gas;
-	size_t index = path->index;
-
-	if (index >= m_items.size() || (index > 0 && m_items.at(index).type() != Tag))
-		// Invalid jump usually provokes an out-of-gas exception, but we want to give an upper
-		// bound on the gas that is needed without changing the behaviour, so it is fine to
-		// return the current gas value.
-		return gas;
-
-	std::set<u256> jumpTags;
-	for (; index < m_items.size() && !gas.isInfinite; ++index)
-	{
-		bool branchStops = false;
-		jumpTags.clear();
-		AssemblyItem const& item = m_items.at(index);
-		if (item.type() == Tag || item == AssemblyItem(Instruction::JUMPDEST))
-		{
-			// Do not allow any backwards jump. This is quite restrictive but should work for
-			// the simplest things.
-			if (path->visitedJumpdests.count(index))
-				return GasMeter::GasConsumption::infinite();
-			path->visitedJumpdests.insert(index);
-		}
-		else if (item == AssemblyItem(Instruction::JUMP))
-		{
-			branchStops = true;
-			jumpTags = state->tagsInExpression(state->relativeStackElement(0));
-			if (jumpTags.empty()) // unknown jump destination
-				return GasMeter::GasConsumption::infinite();
-		}
-		else if (item == AssemblyItem(Instruction::JUMPI))
-		{
-			ExpressionClasses::Id condition = state->relativeStackElement(-1);
-			if (classes.knownNonZero(condition) || !classes.knownZero(condition))
-			{
-				jumpTags = state->tagsInExpression(state->relativeStackElement(0));
-				if (jumpTags.empty()) // unknown jump destination
-					return GasMeter::GasConsumption::infinite();
-			}
-			branchStops = classes.knownNonZero(condition);
-		}
-		else if (SemanticInformation::altersControlFlow(item))
-			branchStops = true;
-
-		gas += meter.estimateMax(item);
-
-		for (u256 const& tag: jumpTags)
-		{
-			auto newPath = std::make_unique<GasPath>();
-			newPath->index = m_items.size();
-			if (m_tagPositions.count(tag))
-				newPath->index = m_tagPositions.at(tag);
-			newPath->gas = gas;
-			newPath->largestMemoryAccess = meter.largestMemoryAccess();
-			newPath->state = state->copy();
-			newPath->visitedJumpdests = path->visitedJumpdests;
-			queue(std::move(newPath));
-		}
-
-		if (branchStops)
-			break;
-	}
-
-	return gas;
-}
diff --git a/libevmasm/PathGasMeter.h b/libevmasm/PathGasMeter.h
deleted file mode 100644
index ecac17cac2f8..000000000000
--- a/libevmasm/PathGasMeter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file PathGasMeter.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- */
-
-#pragma once
-
-#include <libevmasm/GasMeter.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <set>
-#include <vector>
-#include <memory>
-
-namespace solidity::evmasm
-{
-
-class KnownState;
-
-struct GasPath
-{
-	size_t index = 0;
-	std::shared_ptr<KnownState> state;
-	u256 largestMemoryAccess;
-	GasMeter::GasConsumption gas;
-	std::set<size_t> visitedJumpdests;
-};
-
-/**
- * Computes an upper bound on the gas usage of a computation starting at a certain position in
- * a list of AssemblyItems in a given state until the computation stops.
- * Can be used to estimate the gas usage of functions on any given input.
- */
-class PathGasMeter
-{
-public:
-	explicit PathGasMeter(AssemblyItems const& _items, langutil::EVMVersion _evmVersion);
-
-	GasMeter::GasConsumption estimateMax(size_t _startIndex, std::shared_ptr<KnownState> const& _state);
-
-	static GasMeter::GasConsumption estimateMax(
-		AssemblyItems const& _items,
-		langutil::EVMVersion _evmVersion,
-		size_t _startIndex,
-		std::shared_ptr<KnownState> const& _state
-	)
-	{
-		return PathGasMeter(_items, _evmVersion).estimateMax(_startIndex, _state);
-	}
-
-private:
-	/// Adds a new path item to the queue, but only if we do not already have
-	/// a higher gas usage at that point.
-	/// This is not exact as different state might influence higher gas costs at a later
-	/// point in time, but it greatly reduces computational overhead.
-	void queue(std::unique_ptr<GasPath>&& _newPath);
-	GasMeter::GasConsumption handleQueueItem();
-
-	/// Map of jumpdest -> gas path, so not really a queue. We only have one queued up
-	/// item per jumpdest, because of the behaviour of `queue` above.
-	std::map<size_t, std::unique_ptr<GasPath>> m_queue;
-	std::map<size_t, GasMeter::GasConsumption> m_highestGasUsagePerJumpdest;
-	std::map<u256, size_t> m_tagPositions;
-	AssemblyItems const& m_items;
-	langutil::EVMVersion m_evmVersion;
-};
-
-}
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
deleted file mode 100644
index e9231c0a56b0..000000000000
--- a/libevmasm/PeepholeOptimiser.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file PeepholeOptimiser.cpp
- * Performs local optimising code changes to assembly.
- */
-
-#include <libevmasm/PeepholeOptimiser.h>
-
-#include <libevmasm/AssemblyItem.h>
-#include <libevmasm/SemanticInformation.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-// TODO: Extend this to use the tools from ExpressionClasses.cpp
-
-namespace
-{
-
-struct OptimiserState
-{
-	AssemblyItems const& items;
-	size_t i;
-	std::back_insert_iterator<AssemblyItems> out;
-};
-
-template<typename FunctionType>
-struct FunctionParameterCount;
-template<typename R, typename... Args>
-struct FunctionParameterCount<R(Args...)>
-{
-	static constexpr auto value = sizeof...(Args);
-};
-
-template <class Method>
-struct SimplePeepholeOptimizerMethod
-{
-	template <size_t... Indices>
-	static bool applyRule(
-		AssemblyItems::const_iterator _in,
-		std::back_insert_iterator<AssemblyItems> _out,
-		std::index_sequence<Indices...>
-	)
-	{
-		return Method::applySimple(_in[Indices]..., _out);
-	}
-	static bool apply(OptimiserState& _state)
-	{
-		static constexpr size_t WindowSize = FunctionParameterCount<decltype(Method::applySimple)>::value - 1;
-		if (
-			_state.i + WindowSize <= _state.items.size() &&
-			applyRule(_state.items.begin() + static_cast<ptrdiff_t>(_state.i), _state.out, std::make_index_sequence<WindowSize>{})
-		)
-		{
-			_state.i += WindowSize;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct Identity: SimplePeepholeOptimizerMethod<Identity>
-{
-	static bool applySimple(
-		AssemblyItem const& _item,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		*_out = _item;
-		return true;
-	}
-};
-
-struct PushPop: SimplePeepholeOptimizerMethod<PushPop>
-{
-	static bool applySimple(
-		AssemblyItem const& _push,
-		AssemblyItem const& _pop,
-		std::back_insert_iterator<AssemblyItems>
-	)
-	{
-		auto t = _push.type();
-		return _pop == Instruction::POP && (
-			SemanticInformation::isDupInstruction(_push) ||
-			t == Push || t == PushTag || t == PushSub ||
-			t == PushSubSize || t == PushProgramSize || t == PushData || t == PushLibraryAddress
-		);
-	}
-};
-
-struct OpPop: SimplePeepholeOptimizerMethod<OpPop>
-{
-	static bool applySimple(
-		AssemblyItem const& _op,
-		AssemblyItem const& _pop,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (_pop == Instruction::POP && _op.type() == Operation)
-		{
-			Instruction instr = _op.instruction();
-			if (instructionInfo(instr, langutil::EVMVersion()).ret == 1 && !instructionInfo(instr, langutil::EVMVersion()).sideEffects)
-			{
-				for (int j = 0; j < instructionInfo(instr, langutil::EVMVersion()).args; j++)
-					*_out = {Instruction::POP, _op.location()};
-				return true;
-			}
-		}
-		return false;
-	}
-};
-
-struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
-{
-	static bool applySimple(
-		AssemblyItem const& _op,
-		AssemblyItem const& _stop,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (_stop == Instruction::STOP)
-		{
-			if (_op.type() == Operation)
-			{
-				Instruction instr = _op.instruction();
-				if (!instructionInfo(instr, langutil::EVMVersion()).sideEffects)
-				{
-					*_out = {Instruction::STOP, _op.location()};
-					return true;
-				}
-			}
-			else if (_op.type() == Push)
-			{
-				*_out = {Instruction::STOP, _op.location()};
-				return true;
-			}
-		}
-		return false;
-	}
-};
-
-struct OpReturnRevert: SimplePeepholeOptimizerMethod<OpReturnRevert>
-{
-	static bool applySimple(
-		AssemblyItem const& _op,
-		AssemblyItem const& _push,
-		AssemblyItem const& _pushOrDup,
-		AssemblyItem const& _returnRevert,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (
-			(_returnRevert == Instruction::RETURN || _returnRevert == Instruction::REVERT) &&
-			_push.type() == Push &&
-			(_pushOrDup.type() == Push || _pushOrDup == dupInstruction(1))
-		)
-			if (
-				(_op.type() == Operation && !instructionInfo(_op.instruction(), langutil::EVMVersion()).sideEffects) ||
-				_op.type() == Push
-			)
-			{
-					*_out = _push;
-					*_out = _pushOrDup;
-					*_out = _returnRevert;
-					return true;
-			}
-		return false;
-	}
-};
-
-struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
-{
-	static size_t applySimple(
-		AssemblyItem const& _s1,
-		AssemblyItem const& _s2,
-		std::back_insert_iterator<AssemblyItems>
-	)
-	{
-		return _s1 == _s2 && SemanticInformation::isSwapInstruction(_s1);
-	}
-};
-
-struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
-{
-	static bool applySimple(
-		AssemblyItem const& _push1,
-		AssemblyItem const& _push2,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (_push1.type() == Push && _push2.type() == Push && _push1.data() == _push2.data())
-		{
-			*_out = _push1;
-			*_out = {Instruction::DUP1, _push2.location()};
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap>
-{
-	static bool applySimple(
-		AssemblyItem const& _swap,
-		AssemblyItem const& _op,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		// Remove SWAP1 if following instruction is commutative
-		if (
-			_swap == Instruction::SWAP1 &&
-			SemanticInformation::isCommutativeOperation(_op)
-		)
-		{
-			*_out = _op;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct SwapComparison: SimplePeepholeOptimizerMethod<SwapComparison>
-{
-	static bool applySimple(
-		AssemblyItem const& _swap,
-		AssemblyItem const& _op,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		static std::map<Instruction, Instruction> const swappableOps{
-			{ Instruction::LT, Instruction::GT },
-			{ Instruction::GT, Instruction::LT },
-			{ Instruction::SLT, Instruction::SGT },
-			{ Instruction::SGT, Instruction::SLT }
-		};
-
-		if (
-			_swap == Instruction::SWAP1 &&
-			_op.type() == Operation &&
-			swappableOps.count(_op.instruction())
-		)
-		{
-			*_out = swappableOps.at(_op.instruction());
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-/// Remove swapN after dupN
-struct DupSwap: SimplePeepholeOptimizerMethod<DupSwap>
-{
-	static size_t applySimple(
-		AssemblyItem const& _dupN,
-		AssemblyItem const& _swapN,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (
-			SemanticInformation::isDupInstruction(_dupN) &&
-			SemanticInformation::isSwapInstruction(_swapN) &&
-			getDupNumber(_dupN.instruction()) == getSwapNumber(_swapN.instruction())
-		)
-		{
-			*_out = _dupN;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-
-struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI>
-{
-	static size_t applySimple(
-		AssemblyItem const& _iszero1,
-		AssemblyItem const& _iszero2,
-		AssemblyItem const& _pushTag,
-		AssemblyItem const& _jumpi,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (
-			_iszero1 == Instruction::ISZERO &&
-			_iszero2 == Instruction::ISZERO &&
-			_pushTag.type() == PushTag &&
-			_jumpi == Instruction::JUMPI
-		)
-		{
-			*_out = _pushTag;
-			*_out = _jumpi;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod<EqIsZeroJumpI>
-{
-	static size_t applySimple(
-		AssemblyItem const& _eq,
-		AssemblyItem const& _iszero,
-		AssemblyItem const& _pushTag,
-		AssemblyItem const& _jumpi,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (
-			_eq == Instruction::EQ &&
-			_iszero == Instruction::ISZERO &&
-			_pushTag.type() == PushTag &&
-			_jumpi == Instruction::JUMPI
-		)
-		{
-			*_out = AssemblyItem(Instruction::SUB, _eq.location());
-			*_out = _pushTag;
-			*_out = _jumpi;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-// push_tag_1 jumpi push_tag_2 jump tag_1: -> iszero push_tag_2 jumpi tag_1:
-struct DoubleJump: SimplePeepholeOptimizerMethod<DoubleJump>
-{
-	static size_t applySimple(
-		AssemblyItem const& _pushTag1,
-		AssemblyItem const& _jumpi,
-		AssemblyItem const& _pushTag2,
-		AssemblyItem const& _jump,
-		AssemblyItem const& _tag1,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (
-			_pushTag1.type() == PushTag &&
-			_jumpi == Instruction::JUMPI &&
-			_pushTag2.type() == PushTag &&
-			_jump == Instruction::JUMP &&
-			_tag1.type() == Tag &&
-			_pushTag1.data() == _tag1.data()
-		)
-		{
-			*_out = AssemblyItem(Instruction::ISZERO, _jumpi.location());
-			*_out = _pushTag2;
-			*_out = _jumpi;
-			*_out = _tag1;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext>
-{
-	static size_t applySimple(
-		AssemblyItem const& _pushTag,
-		AssemblyItem const& _jump,
-		AssemblyItem const& _tag,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (
-			_pushTag.type() == PushTag &&
-			(_jump == Instruction::JUMP || _jump == Instruction::JUMPI) &&
-			_tag.type() == Tag &&
-			_pushTag.data() == _tag.data()
-		)
-		{
-			if (_jump == Instruction::JUMPI)
-				*_out = AssemblyItem(Instruction::POP, _jump.location());
-			*_out = _tag;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct TagConjunctions: SimplePeepholeOptimizerMethod<TagConjunctions>
-{
-	static bool applySimple(
-		AssemblyItem const& _pushTag,
-		AssemblyItem const& _pushConstant,
-		AssemblyItem const& _and,
-		std::back_insert_iterator<AssemblyItems> _out
-	)
-	{
-		if (_and != Instruction::AND)
-			return false;
-		if (
-			_pushTag.type() == PushTag &&
-			_pushConstant.type() == Push &&
-			(_pushConstant.data() & u256(0xFFFFFFFF)) == u256(0xFFFFFFFF)
-		)
-		{
-			*_out = _pushTag;
-			return true;
-		}
-		else if (
-			// tag and constant are swapped
-			_pushConstant.type() == PushTag &&
-			_pushTag.type() == Push &&
-			(_pushTag.data() & u256(0xFFFFFFFF)) == u256(0xFFFFFFFF)
-		)
-		{
-			*_out = _pushConstant;
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-struct TruthyAnd: SimplePeepholeOptimizerMethod<TruthyAnd>
-{
-	static bool applySimple(
-		AssemblyItem const& _push,
-		AssemblyItem const& _not,
-		AssemblyItem const& _and,
-		std::back_insert_iterator<AssemblyItems>
-	)
-	{
-		return (
-			_push.type() == Push && _push.data() == 0 &&
-			_not == Instruction::NOT &&
-			_and == Instruction::AND
-		);
-	}
-};
-
-/// Removes everything after a JUMP (or similar) until the next JUMPDEST.
-struct UnreachableCode
-{
-	static bool apply(OptimiserState& _state)
-	{
-		auto it = _state.items.begin() + static_cast<ptrdiff_t>(_state.i);
-		auto end = _state.items.end();
-		if (it == end)
-			return false;
-		if (
-			it[0] != Instruction::JUMP &&
-			it[0] != Instruction::RETURN &&
-			it[0] != Instruction::STOP &&
-			it[0] != Instruction::INVALID &&
-			it[0] != Instruction::SELFDESTRUCT &&
-			it[0] != Instruction::REVERT
-		)
-			return false;
-
-		ptrdiff_t i = 1;
-		while (it + i != end && it[i].type() != Tag)
-			i++;
-		if (i > 1)
-		{
-			*_state.out = it[0];
-			_state.i += static_cast<size_t>(i);
-			return true;
-		}
-		else
-			return false;
-	}
-};
-
-void applyMethods(OptimiserState&)
-{
-	assertThrow(false, OptimizerException, "Peephole optimizer failed to apply identity.");
-}
-
-template <typename Method, typename... OtherMethods>
-void applyMethods(OptimiserState& _state, Method, OtherMethods... _other)
-{
-	if (!Method::apply(_state))
-		applyMethods(_state, _other...);
-}
-
-size_t numberOfPops(AssemblyItems const& _items)
-{
-	return static_cast<size_t>(std::count(_items.begin(), _items.end(), Instruction::POP));
-}
-
-}
-
-bool PeepholeOptimiser::optimise()
-{
-	// Avoid referencing immutables too early by using approx. counting in bytesRequired()
-	auto const approx = evmasm::Precision::Approximate;
-	OptimiserState state {m_items, 0, back_inserter(m_optimisedItems)};
-	while (state.i < m_items.size())
-		applyMethods(
-			state,
-			PushPop(), OpPop(), OpStop(), OpReturnRevert(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
-			DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(),
-			TagConjunctions(), TruthyAnd(), Identity()
-		);
-	if (m_optimisedItems.size() < m_items.size() || (
-		m_optimisedItems.size() == m_items.size() && (
-			evmasm::bytesRequired(m_optimisedItems, 3, approx) < evmasm::bytesRequired(m_items, 3, approx) ||
-			numberOfPops(m_optimisedItems) > numberOfPops(m_items)
-		)
-	))
-	{
-		m_items = std::move(m_optimisedItems);
-		return true;
-	}
-	else
-		return false;
-}
diff --git a/libevmasm/PeepholeOptimiser.h b/libevmasm/PeepholeOptimiser.h
deleted file mode 100644
index 64ad5227fae1..000000000000
--- a/libevmasm/PeepholeOptimiser.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file PeepholeOptimiser.h
- * Performs local optimising code changes to assembly.
- */
-#pragma once
-
-#include <vector>
-#include <cstddef>
-#include <iterator>
-
-namespace solidity::evmasm
-{
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-
-class PeepholeOptimisationMethod
-{
-public:
-	virtual ~PeepholeOptimisationMethod() = default;
-	virtual size_t windowSize() const;
-	virtual bool apply(AssemblyItems::const_iterator _in, std::back_insert_iterator<AssemblyItems> _out);
-};
-
-class PeepholeOptimiser
-{
-public:
-	explicit PeepholeOptimiser(AssemblyItems& _items): m_items(_items) {}
-	virtual ~PeepholeOptimiser() = default;
-
-	bool optimise();
-
-private:
-	AssemblyItems& m_items;
-	AssemblyItems m_optimisedItems;
-};
-
-}
diff --git a/libevmasm/RuleList.h b/libevmasm/RuleList.h
deleted file mode 100644
index 34fe4992db61..000000000000
--- a/libevmasm/RuleList.h
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2018
- * Templatized list of simplification rules.
- */
-
-#pragma once
-
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/SimplificationRule.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <boost/multiprecision/detail/min_max.hpp>
-
-#include <libyul/Dialect.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <vector>
-#include <functional>
-
-namespace solidity::evmasm
-{
-
-template <class S> S divWorkaround(S const& _a, S const& _b)
-{
-	return (S)(bigint(_a) / bigint(_b));
-}
-
-template <class S> S modWorkaround(S const& _a, S const& _b)
-{
-	return (S)(bigint(_a) % bigint(_b));
-}
-
-// This works around a bug fixed with Boost 1.64.
-// https://www.boost.org/doc/libs/release/libs/multiprecision/doc/html/boost_multiprecision/map/hist.html#boost_multiprecision.map.hist.multiprecision_2_3_1_boost_1_64
-template <class S> S shlWorkaround(S const& _x, unsigned _amount)
-{
-	return u256((bigint(_x) << _amount) & u256(-1));
-}
-
-/// @returns k if _x == 2**k, nullopt otherwise
-inline std::optional<size_t> binaryLogarithm(u256 const& _x)
-{
-	if (_x == 0)
-		return std::nullopt;
-	size_t msb = boost::multiprecision::msb(_x);
-	return (u256(1) << msb) == _x ? std::make_optional(msb) : std::nullopt;
-}
-
-// simplificationRuleList below was split up into parts to prevent
-// stack overflows in the JavaScript optimizer for emscripten builds
-// that affected certain browser versions.
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart1(
-	Pattern A,
-	Pattern B,
-	Pattern C,
-	Pattern,
-	Pattern
-)
-{
-	using Word = typename Pattern::Word;
-	using Builtins = typename Pattern::Builtins;
-	return std::vector<SimplificationRule<Pattern>>{
-		// arithmetic on constants
-		{Builtins::ADD(A, B), [=]{ return A.d() + B.d(); }},
-		{Builtins::MUL(A, B), [=]{ return A.d() * B.d(); }},
-		{Builtins::SUB(A, B), [=]{ return A.d() - B.d(); }},
-		{Builtins::DIV(A, B), [=]{ return B.d() == 0 ? 0 : divWorkaround(A.d(), B.d()); }},
-		{Builtins::SDIV(A, B), [=]{ return B.d() == 0 ? 0 : s2u(divWorkaround(u2s(A.d()), u2s(B.d()))); }},
-		{Builtins::MOD(A, B), [=]{ return B.d() == 0 ? 0 : modWorkaround(A.d(), B.d()); }},
-		{Builtins::SMOD(A, B), [=]{ return B.d() == 0 ? 0 : s2u(modWorkaround(u2s(A.d()), u2s(B.d()))); }},
-		{Builtins::EXP(A, B), [=]{ return Word(boost::multiprecision::powm(bigint(A.d()), bigint(B.d()), bigint(1) << Pattern::WordSize)); }},
-		{Builtins::NOT(A), [=]{ return ~A.d(); }},
-		{Builtins::LT(A, B), [=]() -> Word { return A.d() < B.d() ? 1 : 0; }},
-		{Builtins::GT(A, B), [=]() -> Word { return A.d() > B.d() ? 1 : 0; }},
-		{Builtins::SLT(A, B), [=]() -> Word { return u2s(A.d()) < u2s(B.d()) ? 1 : 0; }},
-		{Builtins::SGT(A, B), [=]() -> Word { return u2s(A.d()) > u2s(B.d()) ? 1 : 0; }},
-		{Builtins::EQ(A, B), [=]() -> Word { return A.d() == B.d() ? 1 : 0; }},
-		{Builtins::ISZERO(A), [=]() -> Word { return A.d() == 0 ? 1 : 0; }},
-		{Builtins::AND(A, B), [=]{ return A.d() & B.d(); }},
-		{Builtins::OR(A, B), [=]{ return A.d() | B.d(); }},
-		{Builtins::XOR(A, B), [=]{ return A.d() ^ B.d(); }},
-		{Builtins::BYTE(A, B), [=]{
-			return
-				A.d() >= Pattern::WordSize / 8 ?
-				0 :
-				(B.d() >> unsigned(8 * (Pattern::WordSize / 8 - 1 - A.d()))) & 0xff;
-		}},
-		{Builtins::ADDMOD(A, B, C), [=]{ return C.d() == 0 ? 0 : Word((bigint(A.d()) + bigint(B.d())) % C.d()); }},
-		{Builtins::MULMOD(A, B, C), [=]{ return C.d() == 0 ? 0 : Word((bigint(A.d()) * bigint(B.d())) % C.d()); }},
-		{Builtins::SIGNEXTEND(A, B), [=]() -> Word {
-			if (A.d() >= Pattern::WordSize / 8 - 1)
-				return B.d();
-			unsigned testBit = unsigned(A.d()) * 8 + 7;
-			Word mask = (Word(1) << testBit) - 1;
-			return boost::multiprecision::bit_test(B.d(), testBit) ? B.d() | ~mask : B.d() & mask;
-		}},
-		{Builtins::SHL(A, B), [=]{
-			if (A.d() >= Pattern::WordSize)
-				return Word(0);
-			return shlWorkaround(B.d(), unsigned(A.d()));
-		}},
-		{Builtins::SHR(A, B), [=]{
-			if (A.d() >= Pattern::WordSize)
-				return Word(0);
-			return B.d() >> unsigned(A.d());
-		}}
-	};
-}
-
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart2(
-	Pattern,
-	Pattern,
-	Pattern,
-	Pattern X,
-	Pattern Y
-)
-{
-	using Word = typename Pattern::Word;
-	using Builtins = typename Pattern::Builtins;
-	return std::vector<SimplificationRule<Pattern>> {
-		// invariants involving known constants
-		{Builtins::ADD(X, 0), [=]{ return X; }},
-		{Builtins::ADD(0, X), [=]{ return X; }},
-		{Builtins::SUB(X, 0), [=]{ return X; }},
-		{Builtins::SUB(~Word(0), X), [=]() -> Pattern { return Builtins::NOT(X); }},
-		{Builtins::MUL(X, 0), [=]{ return Word(0); }},
-		{Builtins::MUL(0, X), [=]{ return Word(0); }},
-		{Builtins::MUL(X, 1), [=]{ return X; }},
-		{Builtins::MUL(1, X), [=]{ return X; }},
-		{Builtins::MUL(X, Word(-1)), [=]() -> Pattern { return Builtins::SUB(0, X); }},
-		{Builtins::MUL(Word(-1), X), [=]() -> Pattern { return Builtins::SUB(0, X); }},
-		{Builtins::DIV(X, 0), [=]{ return Word(0); }},
-		{Builtins::DIV(0, X), [=]{ return Word(0); }},
-		{Builtins::DIV(X, 1), [=]{ return X; }},
-		{Builtins::SDIV(X, 0), [=]{ return Word(0); }},
-		{Builtins::SDIV(0, X), [=]{ return Word(0); }},
-		{Builtins::SDIV(X, 1), [=]{ return X; }},
-		{Builtins::AND(X, ~Word(0)), [=]{ return X; }},
-		{Builtins::AND(~Word(0), X), [=]{ return X; }},
-		{Builtins::AND(X, 0), [=]{ return Word(0); }},
-		{Builtins::AND(0, X), [=]{ return Word(0); }},
-		{Builtins::OR(X, 0), [=]{ return X; }},
-		{Builtins::OR(0, X), [=]{ return X; }},
-		{Builtins::OR(X, ~Word(0)), [=]{ return ~Word(0); }},
-		{Builtins::OR(~Word(0), X), [=]{ return ~Word(0); }},
-		{Builtins::XOR(X, 0), [=]{ return X; }},
-		{Builtins::XOR(0, X), [=]{ return X; }},
-		{Builtins::MOD(X, 0), [=]{ return Word(0); }},
-		{Builtins::MOD(0, X), [=]{ return Word(0); }},
-		{Builtins::EQ(X, 0), [=]() -> Pattern { return Builtins::ISZERO(X); },},
-		{Builtins::EQ(0, X), [=]() -> Pattern { return Builtins::ISZERO(X); },},
-		{Builtins::SHL(0, X), [=]{ return X; }},
-		{Builtins::SHR(0, X), [=]{ return X; }},
-		{Builtins::SHL(X, 0), [=]{ return Word(0); }},
-		{Builtins::SHR(X, 0), [=]{ return Word(0); }},
-		{Builtins::GT(X, 0), [=]() -> Pattern { return Builtins::ISZERO(Builtins::ISZERO(X)); }},
-		{Builtins::LT(0, X), [=]() -> Pattern { return Builtins::ISZERO(Builtins::ISZERO(X)); }},
-		{Builtins::GT(X, ~Word(0)), [=]{ return Word(0); }},
-		{Builtins::LT(~Word(0), X), [=]{ return Word(0); }},
-		{Builtins::GT(0, X), [=]{ return Word(0); }},
-		{Builtins::LT(X, 0), [=]{ return Word(0); }},
-		{Builtins::AND(Builtins::BYTE(X, Y), Word(0xff)), [=]() -> Pattern { return Builtins::BYTE(X, Y); }},
-		{Builtins::BYTE(Word(Pattern::WordSize / 8 - 1), X), [=]() -> Pattern { return Builtins::AND(X, Word(0xff)); }},
-	};
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart3(
-	Pattern,
-	Pattern,
-	Pattern,
-	Pattern X,
-	Pattern
-)
-{
-	using Word = typename Pattern::Word;
-	using Builtins = typename Pattern::Builtins;
-	return std::vector<SimplificationRule<Pattern>> {
-		// operations involving an expression and itself
-		{Builtins::AND(X, X), [=]{ return X; }},
-		{Builtins::OR(X, X), [=]{ return X; }},
-		{Builtins::XOR(X, X), [=]{ return Word(0); }},
-		{Builtins::SUB(X, X), [=]{ return Word(0); }},
-		{Builtins::EQ(X, X), [=]{ return Word(1); }},
-		{Builtins::LT(X, X), [=]{ return Word(0); }},
-		{Builtins::SLT(X, X), [=]{ return Word(0); }},
-		{Builtins::GT(X, X), [=]{ return Word(0); }},
-		{Builtins::SGT(X, X), [=]{ return Word(0); }},
-		{Builtins::MOD(X, X), [=]{ return Word(0); }}
-	};
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart4(
-	Pattern,
-	Pattern,
-	Pattern,
-	Pattern X,
-	Pattern Y
-)
-{
-	using Word = typename Pattern::Word;
-	using Builtins = typename Pattern::Builtins;
-	return std::vector<SimplificationRule<Pattern>> {
-		// logical instruction combinations
-		{Builtins::NOT(Builtins::NOT(X)), [=]{ return X; }},
-		{Builtins::XOR(X, Builtins::XOR(X, Y)), [=]{ return Y; }},
-		{Builtins::XOR(X, Builtins::XOR(Y, X)), [=]{ return Y; }},
-		{Builtins::XOR(Builtins::XOR(X, Y), X), [=]{ return Y; }},
-		{Builtins::XOR(Builtins::XOR(Y, X), X), [=]{ return Y; }},
-		{Builtins::OR(X, Builtins::AND(X, Y)), [=]{ return X; }},
-		{Builtins::OR(X, Builtins::AND(Y, X)), [=]{ return X; }},
-		{Builtins::OR(Builtins::AND(X, Y), X), [=]{ return X; }},
-		{Builtins::OR(Builtins::AND(Y, X), X), [=]{ return X; }},
-		{Builtins::AND(X, Builtins::OR(X, Y)), [=]{ return X; }},
-		{Builtins::AND(X, Builtins::OR(Y, X)), [=]{ return X; }},
-		{Builtins::AND(Builtins::OR(X, Y), X), [=]{ return X; }},
-		{Builtins::AND(Builtins::OR(Y, X), X), [=]{ return X; }},
-		{Builtins::AND(X, Builtins::NOT(X)), [=]{ return Word(0); }},
-		{Builtins::AND(Builtins::NOT(X), X), [=]{ return Word(0); }},
-		{Builtins::OR(X, Builtins::NOT(X)), [=]{ return ~Word(0); }},
-		{Builtins::OR(Builtins::NOT(X), X), [=]{ return ~Word(0); }},
-	};
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart4_5(
-	Pattern A,
-	Pattern B,
-	Pattern,
-	Pattern X,
-	Pattern Y
-)
-{
-	using Builtins = typename Pattern::Builtins;
-	return std::vector<SimplificationRule<Pattern>>{
-		// idempotent operations
-		{Builtins::AND(Builtins::AND(X, Y), Y), [=]{ return Builtins::AND(X, Y); }},
-		{Builtins::AND(Y, Builtins::AND(X, Y)), [=]{ return Builtins::AND(X, Y); }},
-		{Builtins::AND(Builtins::AND(Y, X), Y), [=]{ return Builtins::AND(Y, X); }},
-		{Builtins::AND(Y, Builtins::AND(Y, X)), [=]{ return Builtins::AND(Y, X); }},
-		{Builtins::OR(Builtins::OR(X, Y), Y), [=]{ return Builtins::OR(X, Y); }},
-		{Builtins::OR(Y, Builtins::OR(X, Y)), [=]{ return Builtins::OR(X, Y); }},
-		{Builtins::OR(Builtins::OR(Y, X), Y), [=]{ return Builtins::OR(Y, X); }},
-		{Builtins::OR(Y, Builtins::OR(Y, X)), [=]{ return Builtins::OR(Y, X); }},
-		{Builtins::SIGNEXTEND(X, Builtins::SIGNEXTEND(X, Y)), [=]() { return Builtins::SIGNEXTEND(X, Y); }},
-		{Builtins::SIGNEXTEND(A, Builtins::SIGNEXTEND(B, X)), [=]() {
-			return Builtins::SIGNEXTEND(A.d() < B.d() ? A.d() : B.d(), X);
-		}},
-	};
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
-	bool _forYulOptimizer,
-	Pattern A,
-	Pattern B,
-	Pattern,
-	Pattern X,
-	Pattern Y
-)
-{
-	using Word = typename Pattern::Word;
-	using Builtins = typename Pattern::Builtins;
-
-	std::vector<SimplificationRule<Pattern>> rules;
-
-	// The libevmasm optimizer does not support rules resulting in opcodes with more than two arguments.
-	if (_forYulOptimizer)
-	{
-		// Replace MOD(MUL(X, Y), A) with MULMOD(X, Y, A) iff A=2**N
-		rules.push_back({
-			Builtins::MOD(Builtins::MUL(X, Y), A),
-			[=]() -> Pattern { return Builtins::MULMOD(X, Y, A); },
-			[=] {
-				return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
-			}
-		});
-
-		// Replace MOD(ADD(X, Y), A) with ADDMOD(X, Y, A) iff A=2**N
-		rules.push_back({
-			Builtins::MOD(Builtins::ADD(X, Y), A),
-			[=]() -> Pattern { return Builtins::ADDMOD(X, Y, A); },
-			[=] {
-				return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
-			}
-		});
-	}
-
-	// Replace MOD X, <power-of-two> with AND X, <power-of-two> - 1
-	for (size_t i = 0; i < Pattern::WordSize; ++i)
-	{
-		Word value = Word(1) << i;
-		rules.push_back({
-			Builtins::MOD(X, value),
-			[=]() -> Pattern { return Builtins::AND(X, value - 1); }
-		});
-	}
-
-	// Replace SHL >=256, X with 0
-	rules.push_back({
-		Builtins::SHL(A, X),
-		[=]() -> Pattern { return Word(0); },
-		[=]() { return A.d() >= Pattern::WordSize; }
-	});
-
-	// Replace SHR >=256, X with 0
-	rules.push_back({
-		Builtins::SHR(A, X),
-		[=]() -> Pattern { return Word(0); },
-		[=]() { return A.d() >= Pattern::WordSize; }
-	});
-
-	// Replace BYTE(A, X), A >= 32 with 0
-	rules.push_back({
-		Builtins::BYTE(A, X),
-		[=]() -> Pattern { return Word(0); },
-		[=]() { return A.d() >= Pattern::WordSize / 8; }
-	});
-
-	// Replace SIGNEXTEND(A, X), A >= 31 with ID
-	rules.push_back({
-		Builtins::SIGNEXTEND(A, X),
-		[=]() -> Pattern { return X; },
-		[=]() { return A.d() >= Pattern::WordSize / 8 - 1; }
-	});
-	rules.push_back({
-		Builtins::AND(A, Builtins::SIGNEXTEND(B, X)),
-		[=]() -> Pattern { return Builtins::AND(A, X); },
-		[=]() {
-			return
-				B.d() < Pattern::WordSize / 8 - 1 &&
-				(A.d() & ((u256(1) << static_cast<size_t>((B.d() + 1) * 8)) - 1)) == A.d();
-		}
-	});
-	rules.push_back({
-		Builtins::AND(Builtins::SIGNEXTEND(B, X), A),
-		[=]() -> Pattern { return Builtins::AND(A, X); },
-		[=]() {
-			return
-				B.d() < Pattern::WordSize / 8 - 1 &&
-				(A.d() & ((u256(1) << static_cast<size_t>((B.d() + 1) * 8)) - 1)) == A.d();
-		}
-	});
-
-	for (auto instr: {
-		Instruction::ADDRESS,
-		Instruction::CALLER,
-		Instruction::ORIGIN,
-		Instruction::COINBASE
-	})
-	{
-		assertThrow(Pattern::WordSize > 160, OptimizerException, "");
-		Word const mask = (Word(1) << 160) - 1;
-		rules.push_back({
-			Builtins::AND(Pattern{instr}, mask),
-			[=]() -> Pattern { return {instr}; }
-		});
-		rules.push_back({
-			Builtins::AND(mask, Pattern{instr}),
-			[=]() -> Pattern { return {instr}; }
-		});
-	}
-
-	return rules;
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart6(
-	Pattern,
-	Pattern,
-	Pattern,
-	Pattern X,
-	Pattern Y
-)
-{
-	using Builtins = typename Pattern::Builtins;
-
-	std::vector<SimplificationRule<Pattern>> rules;
-	// Double negation of opcodes with boolean result
-	for (auto instr: {
-		Instruction::EQ,
-		Instruction::LT,
-		Instruction::SLT,
-		Instruction::GT,
-		Instruction::SGT
-	})
-	{
-		typename Builtins::PatternGeneratorInstance op{instr};
-		rules.push_back({
-			Builtins::ISZERO(Builtins::ISZERO(op(X, Y))),
-			[=]() -> Pattern { return op(X, Y); }
-		});
-	}
-
-	rules.push_back({
-		Builtins::ISZERO(Builtins::ISZERO(Builtins::ISZERO(X))),
-		[=]() -> Pattern { return Builtins::ISZERO(X); }
-	});
-
-	rules.push_back({
-		Builtins::ISZERO(Builtins::XOR(X, Y)),
-		[=]() -> Pattern { return Builtins::EQ(X, Y); }
-	});
-
-	rules.push_back({
-		Builtins::ISZERO(Builtins::SUB(X, Y)),
-		[=]() -> Pattern { return Builtins::EQ(X, Y); }
-	});
-
-	return rules;
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart7(
-	Pattern A,
-	Pattern B,
-	Pattern,
-	Pattern X,
-	Pattern Y,
-	Pattern Z
-)
-{
-	using Word = typename Pattern::Word;
-	using Builtins = typename Pattern::Builtins;
-
-	std::vector<SimplificationRule<Pattern>> rules;
-	// Associative operations
-	for (auto&& instrAndFunc: std::vector<std::pair<Instruction, std::function<Word(Word, Word)>>>{
-		{Instruction::ADD, std::plus<Word>()},
-		{Instruction::MUL, std::multiplies<Word>()},
-		{Instruction::AND, std::bit_and<Word>()},
-		{Instruction::OR, std::bit_or<Word>()},
-		{Instruction::XOR, std::bit_xor<Word>()}
-	})
-	{
-		typename Builtins::PatternGeneratorInstance op{instrAndFunc.first};
-		std::function<Word(Word, Word)> fun = instrAndFunc.second;
-		// Moving constants to the outside, order matters here - we first add rules
-		// for constants and then for non-constants.
-		// xa can be (X, A) or (A, X)
-		for (auto const& opXA: {op(X, A), op(A, X)})
-		{
-			rules += std::vector<SimplificationRule<Pattern>>{{
-				// (X+A)+B -> X+(A+B)
-				op(opXA, B),
-				[=]() -> Pattern { return op(X, fun(A.d(), B.d())); }
-			}, {
-				// (X+A)+Y -> (X+Y)+A
-				op(opXA, Y),
-				[=]() -> Pattern { return op(op(X, Y), A); }
-			}, {
-				// B+(X+A) -> X+(A+B)
-				op(B, opXA),
-				[=]() -> Pattern { return op(X, fun(A.d(), B.d())); }
-			}, {
-				// Y+(X+A) -> (Y+X)+A
-				op(Y, opXA),
-				[=]() -> Pattern { return op(op(Y, X), A); }
-			}};
-		}
-	}
-
-	// Combine two SHL by constant
-	rules.push_back({
-		// SHL(B, SHL(A, X)) -> SHL(min(A+B, 256), X)
-		Builtins::SHL(B, Builtins::SHL(A, X)),
-		[=]() -> Pattern {
-			bigint sum = bigint(A.d()) + B.d();
-			if (sum >= Pattern::WordSize)
-				return Builtins::AND(X, Word(0));
-			else
-				return Builtins::SHL(Word(sum), X);
-		}
-	});
-
-	// Combine two SHR by constant
-	rules.push_back({
-		// SHR(B, SHR(A, X)) -> SHR(min(A+B, 256), X)
-		Builtins::SHR(B, Builtins::SHR(A, X)),
-		[=]() -> Pattern {
-			bigint sum = bigint(A.d()) + B.d();
-			if (sum >= Pattern::WordSize)
-				return Builtins::AND(X, Word(0));
-			else
-				return Builtins::SHR(Word(sum), X);
-		}
-	});
-
-	// Combine SHL-SHR by constant
-	rules.push_back({
-		// SHR(B, SHL(A, X)) -> AND(SH[L/R]([B - A / A - B], X), Mask)
-		Builtins::SHR(B, Builtins::SHL(A, X)),
-		[=]() -> Pattern {
-			Word mask = shlWorkaround(~Word(0), unsigned(A.d())) >> unsigned(B.d());
-
-			if (A.d() > B.d())
-				return Builtins::AND(Builtins::SHL(A.d() - B.d(), X), mask);
-			else if (B.d() > A.d())
-				return Builtins::AND(Builtins::SHR(B.d() - A.d(), X), mask);
-			else
-				return Builtins::AND(X, mask);
-		},
-		[=] { return A.d() < Pattern::WordSize && B.d() < Pattern::WordSize; }
-	});
-
-	// Combine SHR-SHL by constant
-	rules.push_back({
-		// SHL(B, SHR(A, X)) -> AND(SH[L/R]([B - A / A - B], X), Mask)
-		Builtins::SHL(B, Builtins::SHR(A, X)),
-		[=]() -> Pattern {
-			Word mask = shlWorkaround((~Word(0)) >> unsigned(A.d()), unsigned(B.d()));
-
-			if (A.d() > B.d())
-				return Builtins::AND(Builtins::SHR(A.d() - B.d(), X), mask);
-			else if (B.d() > A.d())
-				return Builtins::AND(Builtins::SHL(B.d() - A.d(), X), mask);
-			else
-				return Builtins::AND(X, mask);
-		},
-		[=] { return A.d() < Pattern::WordSize && B.d() < Pattern::WordSize; }
-	});
-
-	// Move AND with constant across SHL and SHR by constant
-	for (auto instr: {Instruction::SHL, Instruction::SHR})
-	{
-		typename Builtins::PatternGeneratorInstance shiftOp{instr};
-		auto replacement = [=]() -> Pattern {
-			Word mask =
-				instr == Instruction::SHL ?
-				shlWorkaround(A.d(), unsigned(B.d())) :
-				A.d() >> unsigned(B.d());
-			return Builtins::AND(shiftOp(B.d(), X), std::move(mask));
-		};
-		rules.push_back({
-			// SH[L/R](B, AND(X, A)) -> AND(SH[L/R](B, X), [ A << B / A >> B ])
-			shiftOp(B, Builtins::AND(X, A)),
-			replacement,
-			[=] { return B.d() < Pattern::WordSize; }
-		});
-		rules.push_back({
-			// SH[L/R](B, AND(A, X)) -> AND(SH[L/R](B, X), [ A << B / A >> B ])
-			shiftOp(B, Builtins::AND(A, X)),
-			replacement,
-			[=] { return B.d() < Pattern::WordSize; }
-		});
-	}
-
-	// Combine alternating AND/OR/AND with constant,
-	// AND(OR(AND(X, A), Y), B) -> OR(AND(X, A & B), AND(Y, B))
-	// Many versions due to commutativity.
-	for (auto const& inner: {Builtins::AND(X, A), Builtins::AND(A, X)})
-		for (auto const& second: {Builtins::OR(inner, Y), Builtins::OR(Y, inner)})
-		{
-			// We might swap X and Y but this is not an issue anymore.
-			rules.push_back({
-				Builtins::AND(second, B),
-				[=]() -> Pattern { return Builtins::OR(Builtins::AND(X, A.d() & B.d()), Builtins::AND(Y, B)); }
-			});
-			rules.push_back({
-				Builtins::AND(B, second),
-				[=]() -> Pattern { return Builtins::OR(Builtins::AND(X, A.d() & B.d()), Builtins::AND(Y, B)); }
-			});
-		}
-
-	rules.push_back({
-		// MUL(X, SHL(Y, 1)) -> SHL(Y, X)
-		Builtins::MUL(X, Builtins::SHL(Y, Word(1))),
-		[=]() -> Pattern {
-			return Builtins::SHL(Y, X);
-		}
-	});
-	rules.push_back({
-		// MUL(SHL(X, 1), Y) -> SHL(X, Y)
-		Builtins::MUL(Builtins::SHL(X, Word(1)), Y),
-		[=]() -> Pattern {
-			return Builtins::SHL(X, Y);
-		}
-	});
-
-	rules.push_back({
-		// DIV(X, SHL(Y, 1)) -> SHR(Y, X)
-		Builtins::DIV(X, Builtins::SHL(Y, Word(1))),
-		[=]() -> Pattern {
-			return Builtins::SHR(Y, X);
-		}
-	});
-
-	std::function<bool()> feasibilityFunction = [=]() {
-		if (B.d() > Pattern::WordSize)
-			return false;
-		unsigned bAsUint = static_cast<unsigned>(B.d());
-		return (A.d() & ((~Word(0)) >> bAsUint)) == ((~Word(0)) >> bAsUint);
-	};
-
-	rules.push_back({
-		// AND(A, SHR(B, X)) -> A & ((2^256-1) >> B) == ((2^256-1) >> B)
-		Builtins::AND(A, Builtins::SHR(B, X)),
-		[=]() -> Pattern { return Builtins::SHR(B, X); },
-		feasibilityFunction
-	});
-
-	rules.push_back({
-		// AND(SHR(B, X), A) -> ((2^256-1) >> B) & A == ((2^256-1) >> B)
-		Builtins::AND(Builtins::SHR(B, X), A),
-		[=]() -> Pattern { return Builtins::SHR(B, X); },
-		feasibilityFunction
-	});
-
-	rules.push_back({
-		// AND(SHL(Z, X), SHL(Z, Y)) -> SHL(Z, AND(X, Y))
-		Builtins::AND(Builtins::SHL(Z, X), Builtins::SHL(Z, Y)),
-		[=]() -> Pattern { return Builtins::SHL(Z, Builtins::AND(X, Y)); }
-	});
-
-	rules.push_back({
-		Builtins::BYTE(A, Builtins::SHL(B, X)),
-		[=]() -> Pattern { return Builtins::BYTE(A.d() + B.d() / 8, X); },
-		[=] { return B.d() % 8 == 0 && A.d() <= 32 && B.d() <= 256; }
-	});
-
-	rules.push_back({
-		Builtins::BYTE(A, Builtins::SHR(B, X)),
-		[=]() -> Pattern { return Word(0); },
-		[=] { return A.d() < B.d() / 8; }
-	});
-
-	rules.push_back({
-		Builtins::BYTE(A, Builtins::SHR(B, X)),
-		[=]() -> Pattern { return Builtins::BYTE(A.d() - B.d() / 8, X); },
-		[=] {
-			return B.d() % 8 == 0 && A.d() < Pattern::WordSize / 8 && B.d() <= Pattern::WordSize && A.d() >= B.d() / 8;
-		}
-	});
-
-	rules.push_back({
-		Builtins::SHL(A, Builtins::SIGNEXTEND(B, X)),
-		[=]() -> Pattern { return Builtins::SIGNEXTEND((A.d() >> 3) + B.d(), Builtins::SHL(A, X)); },
-		[=] { return (A.d() & 7) == 0 && A.d() <= Pattern::WordSize && B.d() <= Pattern::WordSize / 8; }
-	});
-
-	rules.push_back({
-		Builtins::SIGNEXTEND(A, Builtins::SHR(B, X)),
-		[=]() -> Pattern { return Builtins::SAR(B, X); },
-		[=] {
-			return
-				B.d() % 8 == 0 &&
-				B.d() <= Pattern::WordSize &&
-				A.d() <= Pattern::WordSize &&
-				(Pattern::WordSize - B.d()) / 8 == A.d() + 1;
-		}
-	});
-
-	return rules;
-}
-
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleListPart8(
-	Pattern A,
-	Pattern,
-	Pattern,
-	Pattern X,
-	Pattern Y
-)
-{
-	using Builtins = typename Pattern::Builtins;
-	std::vector<SimplificationRule<Pattern>> rules;
-
-	// move constants across subtractions
-	rules += std::vector<SimplificationRule<Pattern>>{
-		{
-			// X - A -> X + (-A)
-			Builtins::SUB(X, A),
-			[=]() -> Pattern { return Builtins::ADD(X, 0 - A.d()); }
-		}, {
-			// (X + A) - Y -> (X - Y) + A
-			Builtins::SUB(Builtins::ADD(X, A), Y),
-			[=]() -> Pattern { return Builtins::ADD(Builtins::SUB(X, Y), A); }
-		}, {
-			// (A + X) - Y -> (X - Y) + A
-			Builtins::SUB(Builtins::ADD(A, X), Y),
-			[=]() -> Pattern { return Builtins::ADD(Builtins::SUB(X, Y), A); }
-		}, {
-			// X - (Y + A) -> (X - Y) + (-A)
-			Builtins::SUB(X, Builtins::ADD(Y, A)),
-			[=]() -> Pattern { return Builtins::ADD(Builtins::SUB(X, Y), 0 - A.d()); }
-		}, {
-			// X - (A + Y) -> (X - Y) + (-A)
-			Builtins::SUB(X, Builtins::ADD(A, Y)),
-			[=]() -> Pattern { return Builtins::ADD(Builtins::SUB(X, Y), 0 - A.d()); }
-		}, {
-			// (X - A) - Y -> (X - Y) - A
-			Builtins::SUB(Builtins::SUB(X, A), Y),
-			[=]() -> Pattern { return Builtins::SUB(Builtins::SUB(X, Y), A); }
-		}, {
-			// (A - X) - Y -> A - (X + Y)
-			Builtins::SUB(Builtins::SUB(A, X), Y),
-			[=]() -> Pattern { return Builtins::SUB(A, Builtins::ADD(X, Y)); }
-		}, {
-			// X - (Y - A) -> (X - Y) + A
-			Builtins::SUB(X, Builtins::SUB(Y, A)),
-			[=]() -> Pattern { return Builtins::ADD(Builtins::SUB(X, Y), A.d()); }
-		}, {
-			// X - (A - Y) -> (X + Y) + (-A)
-			Builtins::SUB(X, Builtins::SUB(A, Y)),
-			[=]() -> Pattern { return Builtins::ADD(Builtins::ADD(X, Y), 0 - A.d()); }
-		}
-	};
-	return rules;
-}
-
-template<class Pattern>
-std::vector<SimplificationRule<Pattern>> evmRuleList(
-	langutil::EVMVersion _evmVersion,
-	Pattern A,
-	Pattern,
-	Pattern,
-	Pattern,
-	Pattern X,
-	Pattern,
-	Pattern
-)
-{
-	using Builtins = typename Pattern::Builtins;
-	using Word = typename Pattern::Word;
-	std::vector<SimplificationRule<Pattern>> rules;
-
-	if (_evmVersion.hasSelfBalance())
-		rules.push_back({
-			Builtins::BALANCE(Instruction::ADDRESS),
-			[]() -> Pattern { return Instruction::SELFBALANCE; }
-		});
-
-	rules.emplace_back(
-		Builtins::EXP(0, X),
-		[=]() -> Pattern { return Builtins::ISZERO(X); }
-	);
-	rules.emplace_back(
-		Builtins::EXP(1, X),
-		[=]() -> Pattern { return Word(1); }
-	);
-	if (_evmVersion.hasBitwiseShifting())
-	{
-		rules.emplace_back(
-			Builtins::EXP(2, X),
-			[=]() -> Pattern { return Builtins::SHL(X, 1); }
-		);
-		rules.emplace_back(
-			Builtins::MUL(A, X),
-			[=]() -> Pattern { return Builtins::SHL(u256(*binaryLogarithm(A.d())), X); },
-			[=] { return binaryLogarithm(A.d()).has_value(); }
-		);
-		rules.emplace_back(
-			Builtins::MUL(X, A),
-			[=]() -> Pattern { return Builtins::SHL(u256(*binaryLogarithm(A.d())), X); },
-			[=] { return binaryLogarithm(A.d()).has_value(); }
-		);
-		rules.emplace_back(
-			Builtins::DIV(X, A),
-			[=]() -> Pattern { return Builtins::SHR(u256(*binaryLogarithm(A.d())), X); },
-			[=] { return binaryLogarithm(A.d()).has_value(); }
-		);
-	}
-	rules.emplace_back(
-		Builtins::EXP(Word(-1), X),
-		[=]() -> Pattern
-		{
-			return Builtins::SUB(
-				Builtins::ISZERO(Builtins::AND(X, Word(1))),
-				Builtins::AND(X, Word(1))
-			);
-		}
-	);
-
-	return rules;
-}
-
-/// @returns a list of simplification rules given certain match placeholders.
-/// A, B and C should represent constants, W, X, Y, and Z arbitrary expressions.
-/// The simplifications should never change the order of evaluation of
-/// arbitrary operations.
-template <class Pattern>
-std::vector<SimplificationRule<Pattern>> simplificationRuleList(
-	std::optional<langutil::EVMVersion> _evmVersion,
-	Pattern A,
-	Pattern B,
-	Pattern C,
-	Pattern W,
-	Pattern X,
-	Pattern Y,
-	Pattern Z
-)
-{
-	using Word = typename Pattern::Word;
-	// Some sanity checks
-	assertThrow(Pattern::WordSize % 8 == 0, OptimizerException, "");
-	assertThrow(Pattern::WordSize >= 8, OptimizerException, "");
-	assertThrow(Pattern::WordSize <= 256, OptimizerException, "");
-	assertThrow(Word(-1) == ~Word(0), OptimizerException, "");
-	assertThrow(Word(-1) + 1 == Word(0), OptimizerException, "");
-
-	std::vector<SimplificationRule<Pattern>> rules;
-	rules += simplificationRuleListPart1(A, B, C, W, X);
-	rules += simplificationRuleListPart2(A, B, C, W, X);
-	rules += simplificationRuleListPart3(A, B, C, W, X);
-	rules += simplificationRuleListPart4(A, B, C, W, X);
-	rules += simplificationRuleListPart4_5(A, B, C, W, X);
-	rules += simplificationRuleListPart5(_evmVersion.has_value(), A, B, C, W, X);
-	rules += simplificationRuleListPart6(A, B, C, W, X);
-	rules += simplificationRuleListPart7(A, B, C, W, X, Y);
-	rules += simplificationRuleListPart8(A, B, C, W, X);
-
-	if (_evmVersion.has_value())
-		rules += evmRuleList(*_evmVersion, A, B, C, W, X, Y, Z);
-
-	return rules;
-}
-
-}
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
deleted file mode 100644
index 1971d9d45bb8..000000000000
--- a/libevmasm/SemanticInformation.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file SemanticInformation.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Helper to provide semantic information about assembly items.
- */
-
-#include <libevmasm/SemanticInformation.h>
-#include <libevmasm/AssemblyItem.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-
-std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::SSTORE:
-	case Instruction::SLOAD:
-	{
-		assertThrow(memory(_instruction) == Effect::None, OptimizerException, "");
-		assertThrow(storage(_instruction) != Effect::None, OptimizerException, "");
-		Operation op;
-		op.effect = storage(_instruction);
-		op.location = Location::Storage;
-		op.startParameter = 0;
-		// We know that exactly one slot is affected.
-		op.lengthConstant = 1;
-		return {op};
-	}
-	case Instruction::MSTORE:
-	case Instruction::MSTORE8:
-	case Instruction::MLOAD:
-	{
-		assertThrow(memory(_instruction) != Effect::None, OptimizerException, "");
-		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
-		Operation op;
-		op.effect = memory(_instruction);
-		op.location = Location::Memory;
-		op.startParameter = 0;
-		if (_instruction == Instruction::MSTORE || _instruction == Instruction::MLOAD)
-			op.lengthConstant = 32;
-		else if (_instruction == Instruction::MSTORE8)
-			op.lengthConstant = 1;
-
-		return {op};
-	}
-	case Instruction::REVERT:
-	case Instruction::RETURN:
-	case Instruction::KECCAK256:
-	case Instruction::LOG0:
-	case Instruction::LOG1:
-	case Instruction::LOG2:
-	case Instruction::LOG3:
-	case Instruction::LOG4:
-	{
-		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
-		assertThrow(memory(_instruction) == Effect::Read, OptimizerException, "");
-		Operation op;
-		op.effect = memory(_instruction);
-		op.location = Location::Memory;
-		op.startParameter = 0;
-		op.lengthParameter = 1;
-		return {op};
-	}
-	case Instruction::EXTCODECOPY:
-	{
-		assertThrow(memory(_instruction) == Effect::Write, OptimizerException, "");
-		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
-		Operation op;
-		op.effect = memory(_instruction);
-		op.location = Location::Memory;
-		op.startParameter = 1;
-		op.lengthParameter = 3;
-		return {op};
-	}
-	case Instruction::CODECOPY:
-	case Instruction::CALLDATACOPY:
-	case Instruction::RETURNDATACOPY:
-	{
-		assertThrow(memory(_instruction) == Effect::Write, OptimizerException, "");
-		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
-		Operation op;
-		op.effect = memory(_instruction);
-		op.location = Location::Memory;
-		op.startParameter = 0;
-		op.lengthParameter = 2;
-		return {op};
-	}
-	case Instruction::STATICCALL:
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	{
-		size_t paramCount = static_cast<size_t>(instructionInfo(_instruction, langutil::EVMVersion()).args);
-		std::vector<Operation> operations{
-			Operation{Location::Memory, Effect::Read, paramCount - 4, paramCount - 3, {}},
-			Operation{Location::Storage, Effect::Read, {}, {}, {}}
-		};
-		if (_instruction != Instruction::STATICCALL)
-			operations.emplace_back(Operation{Location::Storage, Effect::Write, {}, {}, {}});
-		operations.emplace_back(Operation{
-			Location::Memory,
-			Effect::Write,
-			paramCount - 2,
-			// Length is in paramCount - 1, but it is only a max length,
-			// there is no guarantee that the full area is written to.
-			{},
-			{}
-		});
-		return operations;
-	}
-	case Instruction::CREATE:
-	case Instruction::CREATE2:
-		return std::vector<Operation>{
-			Operation{
-				Location::Memory,
-				Effect::Read,
-				1,
-				2,
-				{}
-			},
-			Operation{Location::Storage, Effect::Read, {}, {}, {}},
-			Operation{Location::Storage, Effect::Write, {}, {}, {}}
-		};
-	case Instruction::MSIZE:
-		// This is just to satisfy the assert below.
-		return std::vector<Operation>{};
-	default:
-		assertThrow(storage(_instruction) == None && memory(_instruction) == None, AssemblyException, "");
-	}
-	return {};
-}
-
-bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool _msizeImportant)
-{
-	switch (_item.type())
-	{
-	default:
-	case UndefinedItem:
-	case Tag:
-	case PushDeployTimeAddress:
-	case AssignImmutable:
-	case VerbatimBytecode:
-		return true;
-	case Push:
-	case PushTag:
-	case PushSub:
-	case PushSubSize:
-	case PushProgramSize:
-	case PushData:
-	case PushLibraryAddress:
-	case PushImmutable:
-		return false;
-	case evmasm::Operation:
-	{
-		if (isSwapInstruction(_item) || isDupInstruction(_item))
-			return false;
-		if (_item.instruction() == Instruction::GAS || _item.instruction() == Instruction::PC)
-			return true; // GAS and PC assume a specific order of opcodes
-		if (_item.instruction() == Instruction::MSIZE)
-			return true; // msize is modified already by memory access, avoid that for now
-		InstructionInfo info = instructionInfo(_item.instruction(), langutil::EVMVersion());
-		if (_item.instruction() == Instruction::SSTORE)
-			return false;
-		if (_item.instruction() == Instruction::MSTORE)
-			return false;
-		if (!_msizeImportant && (
-			_item.instruction() == Instruction::MLOAD ||
-			_item.instruction() == Instruction::KECCAK256
-		))
-			return false;
-		//@todo: We do not handle the following memory instructions for now:
-		// calldatacopy, codecopy, extcodecopy, mstore8,
-		// msize (note that msize also depends on memory read access)
-
-		// the second requirement will be lifted once it is implemented
-		return info.sideEffects || info.args > 2;
-	}
-	}
-}
-
-bool SemanticInformation::isCommutativeOperation(AssemblyItem const& _item)
-{
-	if (_item.type() != evmasm::Operation)
-		return false;
-	switch (_item.instruction())
-	{
-	case Instruction::ADD:
-	case Instruction::MUL:
-	case Instruction::EQ:
-	case Instruction::AND:
-	case Instruction::OR:
-	case Instruction::XOR:
-		return true;
-	default:
-		return false;
-	}
-}
-
-bool SemanticInformation::isDupInstruction(AssemblyItem const& _item)
-{
-	if (_item.type() != evmasm::Operation)
-		return false;
-	return evmasm::isDupInstruction(_item.instruction());
-}
-
-bool SemanticInformation::isSwapInstruction(AssemblyItem const& _item)
-{
-	if (_item.type() != evmasm::Operation)
-		return false;
-	return evmasm::isSwapInstruction(_item.instruction());
-}
-
-bool SemanticInformation::isJumpInstruction(AssemblyItem const& _item)
-{
-	return _item == Instruction::JUMP || _item == Instruction::JUMPI;
-}
-
-bool SemanticInformation::altersControlFlow(AssemblyItem const& _item)
-{
-	if (_item.type() != evmasm::Operation)
-		return false;
-	switch (_item.instruction())
-	{
-	// note that CALL, CALLCODE and CREATE do not really alter the control flow, because we
-	// continue on the next instruction
-	case Instruction::JUMP:
-	case Instruction::JUMPI:
-	case Instruction::RETURN:
-	case Instruction::SELFDESTRUCT:
-	case Instruction::STOP:
-	case Instruction::INVALID:
-	case Instruction::REVERT:
-		return true;
-	default:
-		return false;
-	}
-}
-
-bool SemanticInformation::terminatesControlFlow(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::RETURN:
-	case Instruction::SELFDESTRUCT:
-	case Instruction::STOP:
-	case Instruction::INVALID:
-	case Instruction::REVERT:
-		return true;
-	default:
-		return false;
-	}
-}
-
-bool SemanticInformation::reverts(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-		case Instruction::INVALID:
-		case Instruction::REVERT:
-			return true;
-		default:
-			return false;
-	}
-}
-
-bool SemanticInformation::isDeterministic(AssemblyItem const& _item)
-{
-	assertThrow(_item.type() != VerbatimBytecode, AssemblyException, "");
-
-	if (_item.type() != evmasm::Operation)
-		return true;
-
-	switch (_item.instruction())
-	{
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	case Instruction::STATICCALL:
-	case Instruction::CREATE:
-	case Instruction::CREATE2:
-	case Instruction::GAS:
-	case Instruction::PC:
-	case Instruction::MSIZE: // depends on previous writes and reads, not only on content
-	case Instruction::BALANCE: // depends on previous calls
-	case Instruction::SELFBALANCE: // depends on previous calls
-	case Instruction::EXTCODESIZE:
-	case Instruction::EXTCODEHASH:
-	case Instruction::RETURNDATACOPY: // depends on previous calls
-	case Instruction::RETURNDATASIZE:
-		return false;
-	default:
-		return true;
-	}
-}
-
-bool SemanticInformation::movable(Instruction _instruction)
-{
-	// These are not really functional.
-	if (isDupInstruction(_instruction) || isSwapInstruction(_instruction))
-		return false;
-	InstructionInfo info = instructionInfo(_instruction, langutil::EVMVersion());
-	if (info.sideEffects)
-		return false;
-	switch (_instruction)
-	{
-	case Instruction::KECCAK256:
-	case Instruction::BALANCE:
-	case Instruction::SELFBALANCE:
-	case Instruction::EXTCODESIZE:
-	case Instruction::EXTCODEHASH:
-	case Instruction::RETURNDATASIZE:
-	case Instruction::SLOAD:
-	case Instruction::PC:
-	case Instruction::MSIZE:
-	case Instruction::GAS:
-		return false;
-	default:
-		return true;
-	}
-	return true;
-}
-
-bool SemanticInformation::canBeRemoved(Instruction _instruction)
-{
-	// These are not really functional.
-	assertThrow(!isDupInstruction(_instruction) && !isSwapInstruction(_instruction), AssemblyException, "");
-
-	return !instructionInfo(_instruction, langutil::EVMVersion()).sideEffects;
-}
-
-bool SemanticInformation::canBeRemovedIfNoMSize(Instruction _instruction)
-{
-	if (_instruction == Instruction::KECCAK256 || _instruction == Instruction::MLOAD)
-		return true;
-	else
-		return canBeRemoved(_instruction);
-}
-
-SemanticInformation::Effect SemanticInformation::memory(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::CALLDATACOPY:
-	case Instruction::CODECOPY:
-	case Instruction::EXTCODECOPY:
-	case Instruction::RETURNDATACOPY:
-	case Instruction::MSTORE:
-	case Instruction::MSTORE8:
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	case Instruction::STATICCALL:
-		return SemanticInformation::Write;
-
-	case Instruction::CREATE:
-	case Instruction::CREATE2:
-	case Instruction::KECCAK256:
-	case Instruction::MLOAD:
-	case Instruction::MSIZE:
-	case Instruction::RETURN:
-	case Instruction::REVERT:
-	case Instruction::LOG0:
-	case Instruction::LOG1:
-	case Instruction::LOG2:
-	case Instruction::LOG3:
-	case Instruction::LOG4:
-		return SemanticInformation::Read;
-
-	default:
-		return SemanticInformation::None;
-	}
-}
-
-bool SemanticInformation::movableApartFromEffects(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::EXTCODEHASH:
-	case Instruction::EXTCODESIZE:
-	case Instruction::RETURNDATASIZE:
-	case Instruction::BALANCE:
-	case Instruction::SELFBALANCE:
-	case Instruction::SLOAD:
-	case Instruction::KECCAK256:
-	case Instruction::MLOAD:
-		return true;
-
-	default:
-		return movable(_instruction);
-	}
-}
-
-SemanticInformation::Effect SemanticInformation::storage(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	case Instruction::CREATE:
-	case Instruction::CREATE2:
-	case Instruction::SSTORE:
-		return SemanticInformation::Write;
-
-	case Instruction::SLOAD:
-	case Instruction::STATICCALL:
-		return SemanticInformation::Read;
-
-	default:
-		return SemanticInformation::None;
-	}
-}
-
-SemanticInformation::Effect SemanticInformation::otherState(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	case Instruction::CREATE:
-	case Instruction::CREATE2:
-	case Instruction::SELFDESTRUCT:
-	case Instruction::STATICCALL: // because it can affect returndatasize
-		// Strictly speaking, log0, .., log4 writes to the state, but the EVM cannot read it, so they
-		// are just marked as having 'other side effects.'
-		return SemanticInformation::Write;
-
-	case Instruction::EXTCODESIZE:
-	case Instruction::EXTCODEHASH:
-	case Instruction::RETURNDATASIZE:
-	case Instruction::BALANCE:
-	case Instruction::SELFBALANCE:
-	case Instruction::RETURNDATACOPY:
-	case Instruction::EXTCODECOPY:
-		// PC and GAS are specifically excluded here. Instructions such as CALLER, CALLVALUE,
-		// ADDRESS are excluded because they cannot change during execution.
-		return SemanticInformation::Read;
-
-	default:
-		return SemanticInformation::None;
-	}
-}
-
-bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::ADDRESS:
-	case Instruction::SELFBALANCE:
-	case Instruction::BALANCE:
-	case Instruction::ORIGIN:
-	case Instruction::CALLER:
-	case Instruction::CALLVALUE:
-	case Instruction::CHAINID:
-	case Instruction::BASEFEE:
-	case Instruction::GAS:
-	case Instruction::GASPRICE:
-	case Instruction::EXTCODESIZE:
-	case Instruction::EXTCODECOPY:
-	case Instruction::EXTCODEHASH:
-	case Instruction::BLOCKHASH:
-	case Instruction::COINBASE:
-	case Instruction::TIMESTAMP:
-	case Instruction::NUMBER:
-	case Instruction::PREVRANDAO:
-	case Instruction::GASLIMIT:
-	case Instruction::STATICCALL:
-	case Instruction::SLOAD:
-		return true;
-	default:
-		break;
-	}
-	return invalidInViewFunctions(_instruction);
-}
-
-bool SemanticInformation::invalidInViewFunctions(Instruction _instruction)
-{
-	switch (_instruction)
-	{
-	case Instruction::SSTORE:
-	case Instruction::JUMP:
-	case Instruction::JUMPI:
-	case Instruction::LOG0:
-	case Instruction::LOG1:
-	case Instruction::LOG2:
-	case Instruction::LOG3:
-	case Instruction::LOG4:
-	case Instruction::CREATE:
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	case Instruction::CREATE2:
-	case Instruction::SELFDESTRUCT:
-		return true;
-	default:
-		break;
-	}
-	return false;
-}
diff --git a/libevmasm/SemanticInformation.h b/libevmasm/SemanticInformation.h
deleted file mode 100644
index 36aabd55f9f6..000000000000
--- a/libevmasm/SemanticInformation.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file SemanticInformation.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Helper to provide semantic information about assembly items.
- */
-
-#pragma once
-
-#include <libevmasm/Instruction.h>
-
-#include <optional>
-#include <vector>
-
-namespace solidity::evmasm
-{
-
-class AssemblyItem;
-
-/**
- * Helper functions to provide context-independent information about assembly items.
- */
-struct SemanticInformation
-{
-	/// Corresponds to the effect that a YUL-builtin has on a generic data location (storage, memory
-	/// and other blockchain state).
-	enum Effect
-	{
-		None,
-		Read,
-		Write
-	};
-
-	enum class Location { Storage, Memory };
-
-	/**
-	 * Represents a read or write operation from or to one of the data locations.
-	 */
-	struct Operation
-	{
-		Location location;
-		Effect effect;
-		/// Start of affected area as an index into the parameters.
-		/// Unknown if not provided.
-		std::optional<size_t> startParameter;
-		/// Length of the affected area as an index into the parameters (if this is an opcode).
-		/// Unknown if neither this nor lengthConstant is provided.
-		std::optional<size_t> lengthParameter;
-		/// Length as a constant.
-		/// Unknown if neither this nor lengthArgument is provided.
-		std::optional<size_t> lengthConstant;
-	};
-
-	/// @returns the sequence of read write operations performed by the instruction.
-	/// Order matters.
-	/// For external calls, there is just one unknown read and one unknown write operation,
-	/// event though there might be multiple.
-	static std::vector<Operation> readWriteOperations(Instruction _instruction);
-
-	/// @returns true if the given items starts a new block for common subexpression analysis.
-	/// @param _msizeImportant if false, consider an operation non-breaking if its only side-effect is that it modifies msize.
-	static bool breaksCSEAnalysisBlock(AssemblyItem const& _item, bool _msizeImportant);
-	/// @returns true if the item is a two-argument operation whose value does not depend on the
-	/// order of its arguments.
-	static bool isCommutativeOperation(AssemblyItem const& _item);
-	static bool isDupInstruction(AssemblyItem const& _item);
-	static bool isSwapInstruction(AssemblyItem const& _item);
-	static bool isJumpInstruction(AssemblyItem const& _item);
-	static bool altersControlFlow(AssemblyItem const& _item);
-	static bool terminatesControlFlow(Instruction _instruction);
-	static bool reverts(Instruction _instruction);
-	/// @returns false if the value put on the stack by _item depends on anything else than
-	/// the information in the current block header, memory, storage or stack.
-	static bool isDeterministic(AssemblyItem const& _item);
-	/// @returns true if the instruction can be moved or copied (together with its arguments)
-	/// without altering the semantics. This means it cannot depend on storage or memory,
-	/// cannot have any side-effects, but it can depend on a call-constant state of the blockchain.
-	static bool movable(Instruction _instruction);
-	/// If true, the expressions in this code can be moved or copied (together with their arguments)
-	/// across control flow branches and instructions as long as these instructions' 'effects' do
-	/// not influence the 'effects' of the aforementioned expressions.
-	static bool movableApartFromEffects(Instruction _instruction);
-	/// @returns true if the instruction can be removed without changing the semantics.
-	/// This does not mean that it has to be deterministic or retrieve information from
-	/// somewhere else than purely the values of its arguments.
-	static bool canBeRemoved(Instruction _instruction);
-	/// @returns true if the instruction can be removed without changing the semantics.
-	/// This does not mean that it has to be deterministic or retrieve information from
-	/// somewhere else than purely the values of its arguments.
-	/// If true, the instruction is still allowed to influence the value returned by the
-	/// msize instruction.
-	static bool canBeRemovedIfNoMSize(Instruction _instruction);
-	static Effect memory(Instruction _instruction);
-	static Effect storage(Instruction _instruction);
-	static Effect otherState(Instruction _instruction);
-	static bool invalidInPureFunctions(Instruction _instruction);
-	static bool invalidInViewFunctions(Instruction _instruction);
-};
-
-}
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
deleted file mode 100644
index e970068fbd7e..000000000000
--- a/libevmasm/SimplificationRule.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Expression simplification pattern.
- */
-
-#pragma once
-
-#include <libevmasm/Instruction.h>
-#include <libsolutil/CommonData.h>
-#include <functional>
-
-namespace solidity::evmasm
-{
-
-/**
- * Rule that contains a pattern, an action that can be applied
- * after the pattern has matched and optional condition to check if the
- * action should be applied.
- */
-template <class Pattern>
-struct SimplificationRule
-{
-	SimplificationRule(
-		Pattern _pattern,
-		std::function<Pattern()> _action,
-		std::function<bool()> _feasible = {}
-	):
-		pattern(std::move(_pattern)),
-		action(std::move(_action)),
-		feasible(std::move(_feasible))
-	{}
-
-	Pattern pattern;
-	std::function<Pattern()> action;
-	std::function<bool()> feasible;
-};
-
-template <typename Pattern>
-struct EVMBuiltins
-{
-	using InstrType = Instruction;
-
-	template<Instruction inst>
-	struct PatternGenerator
-	{
-		template<typename... Args> constexpr Pattern operator()(Args&&... _args) const
-		{
-			return {inst, {std::forward<Args>(_args)...}};
-		}
-	};
-
-	struct PatternGeneratorInstance
-	{
-		Instruction instruction;
-		template<typename... Args> constexpr Pattern operator()(Args&&... _args) const
-		{
-			return {instruction, {std::forward<Args>(_args)...}};
-		}
-	};
-
-
-	static auto constexpr STOP = PatternGenerator<Instruction::STOP>{};
-	static auto constexpr ADD = PatternGenerator<Instruction::ADD>{};
-	static auto constexpr SUB = PatternGenerator<Instruction::SUB>{};
-	static auto constexpr MUL = PatternGenerator<Instruction::MUL>{};
-	static auto constexpr DIV = PatternGenerator<Instruction::DIV>{};
-	static auto constexpr SDIV = PatternGenerator<Instruction::SDIV>{};
-	static auto constexpr MOD = PatternGenerator<Instruction::MOD>{};
-	static auto constexpr SMOD = PatternGenerator<Instruction::SMOD>{};
-	static auto constexpr EXP = PatternGenerator<Instruction::EXP>{};
-	static auto constexpr NOT = PatternGenerator<Instruction::NOT>{};
-	static auto constexpr LT = PatternGenerator<Instruction::LT>{};
-	static auto constexpr GT = PatternGenerator<Instruction::GT>{};
-	static auto constexpr SLT = PatternGenerator<Instruction::SLT>{};
-	static auto constexpr SGT = PatternGenerator<Instruction::SGT>{};
-	static auto constexpr EQ = PatternGenerator<Instruction::EQ>{};
-	static auto constexpr ISZERO = PatternGenerator<Instruction::ISZERO>{};
-	static auto constexpr AND = PatternGenerator<Instruction::AND>{};
-	static auto constexpr OR = PatternGenerator<Instruction::OR>{};
-	static auto constexpr XOR = PatternGenerator<Instruction::XOR>{};
-	static auto constexpr BYTE = PatternGenerator<Instruction::BYTE>{};
-	static auto constexpr SHL = PatternGenerator<Instruction::SHL>{};
-	static auto constexpr SHR = PatternGenerator<Instruction::SHR>{};
-	static auto constexpr SAR = PatternGenerator<Instruction::SAR>{};
-	static auto constexpr ADDMOD = PatternGenerator<Instruction::ADDMOD>{};
-	static auto constexpr MULMOD = PatternGenerator<Instruction::MULMOD>{};
-	static auto constexpr SIGNEXTEND = PatternGenerator<Instruction::SIGNEXTEND>{};
-	static auto constexpr KECCAK256 = PatternGenerator<Instruction::KECCAK256>{};
-	static auto constexpr ADDRESS = PatternGenerator<Instruction::ADDRESS>{};
-	static auto constexpr BALANCE = PatternGenerator<Instruction::BALANCE>{};
-	static auto constexpr ORIGIN = PatternGenerator<Instruction::ORIGIN>{};
-	static auto constexpr CALLER = PatternGenerator<Instruction::CALLER>{};
-	static auto constexpr CALLVALUE = PatternGenerator<Instruction::CALLVALUE>{};
-	static auto constexpr CALLDATALOAD = PatternGenerator<Instruction::CALLDATALOAD>{};
-	static auto constexpr CALLDATASIZE = PatternGenerator<Instruction::CALLDATASIZE>{};
-	static auto constexpr CALLDATACOPY = PatternGenerator<Instruction::CALLDATACOPY>{};
-	static auto constexpr CODESIZE = PatternGenerator<Instruction::CODESIZE>{};
-	static auto constexpr CODECOPY = PatternGenerator<Instruction::CODECOPY>{};
-	static auto constexpr GASPRICE = PatternGenerator<Instruction::GASPRICE>{};
-	static auto constexpr EXTCODESIZE = PatternGenerator<Instruction::EXTCODESIZE>{};
-	static auto constexpr EXTCODECOPY = PatternGenerator<Instruction::EXTCODECOPY>{};
-	static auto constexpr RETURNDATASIZE = PatternGenerator<Instruction::RETURNDATASIZE>{};
-	static auto constexpr RETURNDATACOPY = PatternGenerator<Instruction::RETURNDATACOPY>{};
-	static auto constexpr EXTCODEHASH = PatternGenerator<Instruction::EXTCODEHASH>{};
-	static auto constexpr BLOCKHASH = PatternGenerator<Instruction::BLOCKHASH>{};
-	static auto constexpr COINBASE = PatternGenerator<Instruction::COINBASE>{};
-	static auto constexpr TIMESTAMP = PatternGenerator<Instruction::TIMESTAMP>{};
-	static auto constexpr NUMBER = PatternGenerator<Instruction::NUMBER>{};
-	static auto constexpr PREVRANDAO = PatternGenerator<Instruction::PREVRANDAO>{};
-	static auto constexpr GASLIMIT = PatternGenerator<Instruction::GASLIMIT>{};
-	static auto constexpr CHAINID = PatternGenerator<Instruction::CHAINID>{};
-	static auto constexpr SELFBALANCE = PatternGenerator<Instruction::SELFBALANCE>{};
-	static auto constexpr BASEFEE = PatternGenerator<Instruction::BASEFEE>{};
-	static auto constexpr POP = PatternGenerator<Instruction::POP>{};
-	static auto constexpr MLOAD = PatternGenerator<Instruction::MLOAD>{};
-	static auto constexpr MSTORE = PatternGenerator<Instruction::MSTORE>{};
-	static auto constexpr MSTORE8 = PatternGenerator<Instruction::MSTORE8>{};
-	static auto constexpr SLOAD = PatternGenerator<Instruction::SLOAD>{};
-	static auto constexpr SSTORE = PatternGenerator<Instruction::SSTORE>{};
-	static auto constexpr PC = PatternGenerator<Instruction::PC>{};
-	static auto constexpr MSIZE = PatternGenerator<Instruction::MSIZE>{};
-	static auto constexpr GAS = PatternGenerator<Instruction::GAS>{};
-	static auto constexpr LOG0 = PatternGenerator<Instruction::LOG0>{};
-	static auto constexpr LOG1 = PatternGenerator<Instruction::LOG1>{};
-	static auto constexpr LOG2 = PatternGenerator<Instruction::LOG2>{};
-	static auto constexpr LOG3 = PatternGenerator<Instruction::LOG3>{};
-	static auto constexpr LOG4 = PatternGenerator<Instruction::LOG4>{};
-	static auto constexpr CREATE = PatternGenerator<Instruction::CREATE>{};
-	static auto constexpr CALL = PatternGenerator<Instruction::CALL>{};
-	static auto constexpr CALLCODE = PatternGenerator<Instruction::CALLCODE>{};
-	static auto constexpr STATICCALL = PatternGenerator<Instruction::STATICCALL>{};
-	static auto constexpr RETURN = PatternGenerator<Instruction::RETURN>{};
-	static auto constexpr DELEGATECALL = PatternGenerator<Instruction::DELEGATECALL>{};
-	static auto constexpr CREATE2 = PatternGenerator<Instruction::CREATE2>{};
-	static auto constexpr REVERT = PatternGenerator<Instruction::REVERT>{};
-	static auto constexpr INVALID = PatternGenerator<Instruction::INVALID>{};
-	static auto constexpr SELFDESTRUCT = PatternGenerator<Instruction::SELFDESTRUCT>{};
-};
-
-}
diff --git a/libevmasm/SimplificationRules.cpp b/libevmasm/SimplificationRules.cpp
deleted file mode 100644
index ef2d68c7fdaa..000000000000
--- a/libevmasm/SimplificationRules.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file ExpressionClasses.cpp
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Container for equivalence classes of expressions for use in common subexpression elimination.
- */
-
-#include <libevmasm/SimplificationRules.h>
-
-#include <libevmasm/ExpressionClasses.h>
-#include <libevmasm/Assembly.h>
-#include <libevmasm/RuleList.h>
-#include <libsolutil/Assertions.h>
-
-#include <utility>
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-SimplificationRule<Pattern> const* Rules::findFirstMatch(
-	Expression const& _expr,
-	ExpressionClasses const& _classes
-)
-{
-	resetMatchGroups();
-
-	assertThrow(_expr.item, OptimizerException, "");
-	for (auto const& rule: m_rules[uint8_t(_expr.item->instruction())])
-	{
-		if (rule.pattern.matches(_expr, _classes))
-			if (!rule.feasible || rule.feasible())
-				return &rule;
-
-		resetMatchGroups();
-	}
-	return nullptr;
-}
-
-bool Rules::isInitialized() const
-{
-	return !m_rules[uint8_t(Instruction::ADD)].empty();
-}
-
-void Rules::addRules(std::vector<SimplificationRule<Pattern>> const& _rules)
-{
-	for (auto const& r: _rules)
-		addRule(r);
-}
-
-void Rules::addRule(SimplificationRule<Pattern> const& _rule)
-{
-	m_rules[uint8_t(_rule.pattern.instruction())].push_back(_rule);
-}
-
-Rules::Rules()
-{
-	// Multiple occurrences of one of these inside one rule must match the same equivalence class.
-	// Constants.
-	Pattern A(Push);
-	Pattern B(Push);
-	Pattern C(Push);
-	// Anything.
-	Pattern W;
-	Pattern X;
-	Pattern Y;
-	Pattern Z;
-	A.setMatchGroup(1, m_matchGroups);
-	B.setMatchGroup(2, m_matchGroups);
-	C.setMatchGroup(3, m_matchGroups);
-	W.setMatchGroup(4, m_matchGroups);
-	X.setMatchGroup(5, m_matchGroups);
-	Y.setMatchGroup(6, m_matchGroups);
-	Z.setMatchGroup(7, m_matchGroups);
-
-	addRules(simplificationRuleList(std::nullopt, A, B, C, W, X, Y, Z));
-	assertThrow(isInitialized(), OptimizerException, "Rule list not properly initialized.");
-}
-
-Pattern::Pattern(Instruction _instruction, std::initializer_list<Pattern> _arguments):
-	m_type(Operation),
-	m_instruction(_instruction),
-	m_arguments(_arguments)
-{
-}
-
-void Pattern::setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups)
-{
-	m_matchGroup = _group;
-	m_matchGroups = &_matchGroups;
-}
-
-bool Pattern::matches(Expression const& _expr, ExpressionClasses const& _classes) const
-{
-	if (!matchesBaseItem(_expr.item))
-		return false;
-	if (m_matchGroup)
-	{
-		if (!m_matchGroups->count(m_matchGroup))
-			(*m_matchGroups)[m_matchGroup] = &_expr;
-		else if ((*m_matchGroups)[m_matchGroup]->id != _expr.id)
-			return false;
-	}
-	assertThrow(m_arguments.size() == 0 || _expr.arguments.size() == m_arguments.size(), OptimizerException, "");
-	for (size_t i = 0; i < m_arguments.size(); ++i)
-		if (!m_arguments[i].matches(_classes.representative(_expr.arguments[i]), _classes))
-			return false;
-	return true;
-}
-
-AssemblyItem Pattern::toAssemblyItem(SourceLocation const& _location) const
-{
-	if (m_type == Operation)
-		return AssemblyItem(m_instruction, _location);
-	else
-		return AssemblyItem(m_type, data(), _location);
-}
-
-std::string Pattern::toString() const
-{
-	std::stringstream s;
-	switch (m_type)
-	{
-	case Operation:
-		// Note: This function is exclusively used for debugging.
-		s << instructionInfo(m_instruction, EVMVersion()).name;
-		break;
-	case Push:
-		if (m_data)
-			s << "PUSH " << std::hex << data();
-		else
-			s << "PUSH ";
-		break;
-	case UndefinedItem:
-		s << "ANY";
-		break;
-	default:
-		if (m_data)
-			s << "t=" << std::dec << m_type << " d=" << std::hex << data();
-		else
-			s << "t=" << std::dec << m_type << " d: nullptr";
-		break;
-	}
-	if (!m_requireDataMatch)
-		s << " ~";
-	if (m_matchGroup)
-		s << "[" << std::dec << m_matchGroup << "]";
-	s << "(";
-	for (Pattern const& p: m_arguments)
-		s << p.toString() << ", ";
-	s << ")";
-	return s.str();
-}
-
-bool Pattern::matchesBaseItem(AssemblyItem const* _item) const
-{
-	if (m_type == UndefinedItem)
-		return true;
-	if (!_item)
-		return false;
-	if (m_type != _item->type())
-		return false;
-	else if (m_type == Operation)
-		return m_instruction == _item->instruction();
-	else if (m_requireDataMatch)
-		return data() == _item->data();
-	return true;
-}
-
-Pattern::Expression const& Pattern::matchGroupValue() const
-{
-	assertThrow(m_matchGroup > 0, OptimizerException, "");
-	assertThrow(!!m_matchGroups, OptimizerException, "");
-	assertThrow((*m_matchGroups)[m_matchGroup], OptimizerException, "");
-	return *(*m_matchGroups)[m_matchGroup];
-}
-
-u256 const& Pattern::data() const
-{
-	assertThrow(m_data, OptimizerException, "");
-	return *m_data;
-}
-
-ExpressionTemplate::ExpressionTemplate(Pattern const& _pattern, SourceLocation const& _location)
-{
-	if (_pattern.matchGroup())
-	{
-		hasId = true;
-		id = _pattern.id();
-	}
-	else
-	{
-		hasId = false;
-		item = _pattern.toAssemblyItem(_location);
-	}
-	for (auto const& arg: _pattern.arguments())
-		arguments.emplace_back(arg, _location);
-}
-
-std::string ExpressionTemplate::toString() const
-{
-	std::stringstream s;
-	if (hasId)
-		s << id;
-	else
-		s << item;
-	s << "(";
-	for (auto const& arg: arguments)
-		s << arg.toString();
-	s << ")";
-	return s.str();
-}
diff --git a/libevmasm/SimplificationRules.h b/libevmasm/SimplificationRules.h
deleted file mode 100644
index b3f8da3c7f7c..000000000000
--- a/libevmasm/SimplificationRules.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file SimplificationRules
- * @author Christian <chris@ethereum.org>
- * @date 2017
- * Module for applying replacement rules against Expressions.
- */
-
-#pragma once
-
-#include <libevmasm/ExpressionClasses.h>
-#include <libevmasm/SimplificationRule.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <functional>
-#include <vector>
-
-namespace solidity::langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::evmasm
-{
-
-class Pattern;
-
-/**
- * Container for all simplification rules.
- */
-class Rules
-{
-public:
-	/// Noncopyable.
-	Rules(Rules const&) = delete;
-	Rules& operator=(Rules const&) = delete;
-
-	using Expression = ExpressionClasses::Expression;
-
-	Rules();
-
-	/// @returns a pointer to the first matching pattern and sets the match
-	/// groups accordingly.
-	SimplificationRule<Pattern> const* findFirstMatch(
-		Expression const& _expr,
-		ExpressionClasses const& _classes
-	);
-
-	/// Checks whether the rulelist is non-empty. This is usually enforced
-	/// by the constructor, but we had some issues with static initialization.
-	bool isInitialized() const;
-
-private:
-	void addRules(std::vector<SimplificationRule<Pattern>> const& _rules);
-	void addRule(SimplificationRule<Pattern> const& _rule);
-
-	void resetMatchGroups() { m_matchGroups.clear(); }
-
-	std::map<unsigned, Expression const*> m_matchGroups;
-	/// Pattern to match, replacement to be applied and flag indicating whether
-	/// the replacement might remove some elements (except constants).
-	std::vector<SimplificationRule<Pattern>> m_rules[256];
-};
-
-/**
- * Pattern to match against an expression.
- * Also stores matched expressions to retrieve them later, for constructing new expressions using
- * ExpressionTemplate.
- */
-class Pattern
-{
-public:
-	using Expression = ExpressionClasses::Expression;
-	using Id = ExpressionClasses::Id;
-
-	using Builtins = evmasm::EVMBuiltins<Pattern>;
-	static constexpr size_t WordSize = 256;
-	using Word = u256;
-
-	// Matches a specific constant value.
-	Pattern(unsigned _value): Pattern(u256(_value)) {}
-	Pattern(int _value): Pattern(u256(_value)) {}
-	Pattern(long unsigned _value): Pattern(u256(_value)) {}
-	// Matches a specific constant value.
-	Pattern(u256 const& _value): m_type(Push), m_requireDataMatch(true), m_data(std::make_shared<u256>(_value)) {}
-	// Matches a specific assembly item type or anything if not given.
-	Pattern(AssemblyItemType _type = UndefinedItem): m_type(_type) {}
-	// Matches a given instruction with given arguments
-	Pattern(Instruction _instruction, std::initializer_list<Pattern> _arguments = {});
-	/// Sets this pattern to be part of the match group with the identifier @a _group.
-	/// Inside one rule, all patterns in the same match group have to match expressions from the
-	/// same expression equivalence class.
-	void setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups);
-	unsigned matchGroup() const { return m_matchGroup; }
-	bool matches(Expression const& _expr, ExpressionClasses const& _classes) const;
-
-	AssemblyItem toAssemblyItem(langutil::SourceLocation const& _location) const;
-	std::vector<Pattern> arguments() const { return m_arguments; }
-
-	/// @returns the id of the matched expression if this pattern is part of a match group.
-	Id id() const { return matchGroupValue().id; }
-	/// @returns the data of the matched expression if this pattern is part of a match group.
-	u256 const& d() const { return matchGroupValue().item->data(); }
-
-	std::string toString() const;
-
-	AssemblyItemType type() const { return m_type; }
-	Instruction instruction() const
-	{
-		assertThrow(type() == Operation, OptimizerException, "");
-		return m_instruction;
-	}
-
-private:
-	bool matchesBaseItem(AssemblyItem const* _item) const;
-	Expression const& matchGroupValue() const;
-	u256 const& data() const;
-
-	AssemblyItemType m_type;
-	bool m_requireDataMatch = false;
-	Instruction m_instruction; ///< Only valid if m_type is Operation
-	std::shared_ptr<u256> m_data; ///< Only valid if m_type is not Operation
-	std::vector<Pattern> m_arguments;
-	unsigned m_matchGroup = 0;
-	std::map<unsigned, Expression const*>* m_matchGroups = nullptr;
-};
-
-/**
- * Template for a new expression that can be built from matched patterns.
- */
-struct ExpressionTemplate
-{
-	using Expression = ExpressionClasses::Expression;
-	using Id = ExpressionClasses::Id;
-	explicit ExpressionTemplate(Pattern const& _pattern, langutil::SourceLocation const& _location);
-	std::string toString() const;
-	bool hasId = false;
-	/// Id of the matched expression, if available.
-	Id id = Id(-1);
-	// Otherwise, assembly item.
-	AssemblyItem item = UndefinedItem;
-	std::vector<ExpressionTemplate> arguments;
-};
-
-}
diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt
deleted file mode 100644
index 53be57e79d58..000000000000
--- a/liblangutil/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# Solidity Commons Library (Solidity related sharing bits between libsolidity and libyul)
-set(sources
-	Common.h
-	CharStream.cpp
-	CharStream.h
-	DebugInfoSelection.cpp
-	DebugInfoSelection.h
-	ErrorReporter.cpp
-	ErrorReporter.h
-	EVMVersion.h
-	EVMVersion.cpp
-	Exceptions.cpp
-	Exceptions.h
-	ParserBase.cpp
-	ParserBase.h
-	Scanner.cpp
-	Scanner.h
-	CharStreamProvider.h
-	SemVerHandler.cpp
-	SemVerHandler.h
-	SourceLocation.h
-	SourceLocation.cpp
-	SourceReferenceExtractor.cpp
-	SourceReferenceExtractor.h
-	SourceReferenceFormatter.cpp
-	SourceReferenceFormatter.h
-	Token.cpp
-	Token.h
-	UniqueErrorReporter.h
-)
-
-add_library(langutil ${sources})
-target_link_libraries(langutil PUBLIC solutil fmt::fmt-header-only)
diff --git a/liblangutil/CharStream.cpp b/liblangutil/CharStream.cpp
deleted file mode 100644
index c6b58ef64790..000000000000
--- a/liblangutil/CharStream.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * This file is part of solidity.
- *
- * solidity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * solidity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is derived from the file "scanner.cc", which was part of the
- * V8 project. The original copyright header follows:
- *
- * Copyright 2006-2012, the V8 project authors. All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- * * Neither the name of Google Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/**
- * Character stream / input file.
- */
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/Exceptions.h>
-
-using namespace solidity;
-using namespace solidity::langutil;
-
-char CharStream::advanceAndGet(size_t _chars)
-{
-	if (isPastEndOfInput())
-		return 0;
-	m_position += _chars;
-	if (isPastEndOfInput())
-		return 0;
-	return m_source[m_position];
-}
-
-char CharStream::rollback(size_t _amount)
-{
-	solAssert(m_position >= _amount, "");
-	m_position -= _amount;
-	return get();
-}
-
-char CharStream::setPosition(size_t _location)
-{
-	solAssert(_location <= m_source.size(), "Attempting to set position past end of source.");
-	m_position = _location;
-	return get();
-}
-
-std::string CharStream::lineAtPosition(int _position) const
-{
-	// if _position points to \n, it returns the line before the \n
-	using size_type = std::string::size_type;
-	size_type searchStart = std::min<size_type>(m_source.size(), size_type(_position));
-	if (searchStart > 0)
-		searchStart--;
-	size_type lineStart = m_source.rfind('\n', searchStart);
-	if (lineStart == std::string::npos)
-		lineStart = 0;
-	else
-		lineStart++;
-	std::string line = m_source.substr(
-		lineStart,
-		std::min(m_source.find('\n', lineStart), m_source.size()) - lineStart
-	);
-	if (!line.empty() && line.back() == '\r')
-		line.pop_back();
-	return line;
-}
-
-LineColumn CharStream::translatePositionToLineColumn(int _position) const
-{
-	using size_type = std::string::size_type;
-	using diff_type = std::string::difference_type;
-	size_type searchPosition = std::min<size_type>(m_source.size(), size_type(_position));
-	int lineNumber = static_cast<int>(count(m_source.begin(), m_source.begin() + diff_type(searchPosition), '\n'));
-	size_type lineStart;
-	if (searchPosition == 0)
-		lineStart = 0;
-	else
-	{
-		lineStart = m_source.rfind('\n', searchPosition - 1);
-		lineStart = lineStart == std::string::npos ? 0 : lineStart + 1;
-	}
-	return LineColumn{lineNumber, static_cast<int>(searchPosition - lineStart)};
-}
-
-std::string_view CharStream::text(SourceLocation const& _location) const
-{
-	if (!_location.hasText())
-		return {};
-	solAssert(_location.sourceName && *_location.sourceName == m_name, "");
-	solAssert(static_cast<size_t>(_location.end) <= m_source.size(), "");
-	return std::string_view{m_source}.substr(
-		static_cast<size_t>(_location.start),
-		static_cast<size_t>(_location.end - _location.start)
-	);
-}
-
-std::string CharStream::singleLineSnippet(std::string const& _sourceCode, SourceLocation const& _location)
-{
-	if (!_location.hasText())
-		return {};
-
-	if (static_cast<size_t>(_location.start) >= _sourceCode.size())
-		return {};
-
-	std::string cut = _sourceCode.substr(static_cast<size_t>(_location.start), static_cast<size_t>(_location.end - _location.start));
-	auto newLinePos = cut.find_first_of("\n\r");
-	if (newLinePos != std::string::npos)
-		cut = cut.substr(0, newLinePos) + "...";
-
-	return cut;
-}
-
-std::optional<int> CharStream::translateLineColumnToPosition(LineColumn const& _lineColumn) const
-{
-	return translateLineColumnToPosition(m_source, _lineColumn);
-}
-
-std::optional<int> CharStream::translateLineColumnToPosition(std::string const& _text, LineColumn const& _input)
-{
-	if (_input.line < 0)
-		return std::nullopt;
-
-	size_t offset = 0;
-	for (int i = 0; i < _input.line; i++)
-	{
-		offset = _text.find('\n', offset);
-		if (offset == _text.npos)
-			return std::nullopt;
-		offset++; // Skip linefeed.
-	}
-
-	size_t endOfLine = _text.find('\n', offset);
-	if (endOfLine == std::string::npos)
-		endOfLine = _text.size();
-
-	if (offset + static_cast<size_t>(_input.column) > endOfLine)
-		return std::nullopt;
-	return offset + static_cast<size_t>(_input.column);
-}
-
diff --git a/liblangutil/CharStream.h b/liblangutil/CharStream.h
deleted file mode 100644
index 59ddf22d929c..000000000000
--- a/liblangutil/CharStream.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This file is part of solidity.
- *
- * solidity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * solidity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is derived from the file "scanner.h", which was part of the
- * V8 project. The original copyright header follows:
- *
- * Copyright 2006-2012, the V8 project authors. All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- * * Neither the name of Google Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/**
- * Character stream / input file.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <tuple>
-#include <utility>
-
-namespace solidity::langutil
-{
-
-struct SourceLocation;
-struct LineColumn;
-
-/**
- * Bidirectional stream of characters.
- *
- * This CharStream is used by lexical analyzers as the source.
- */
-class CharStream
-{
-public:
-	CharStream() = default;
-	CharStream(std::string _source, std::string _name):
-		m_source(std::move(_source)), m_name(std::move(_name)) {}
-	CharStream(std::string _source, std::string _name, bool _importedFromAST):
-		m_source(std::move(_source)),
-		m_name(std::move(_name)),
-		m_importedFromAST(_importedFromAST)
-	{ }
-
-	size_t position() const { return m_position; }
-	bool isPastEndOfInput(size_t _charsForward = 0) const { return (m_position + _charsForward) >= m_source.size(); }
-	bool isImportedFromAST() const { return m_importedFromAST; }
-
-	char get(size_t _charsForward = 0) const { return m_source[m_position + _charsForward]; }
-	char advanceAndGet(size_t _chars = 1);
-	/// Sets scanner position to @ _amount characters backwards in source text.
-	/// @returns The character of the current location after update is returned.
-	char rollback(size_t _amount);
-	/// Sets scanner position to @ _location if it refers a valid offset in m_source.
-	/// If not, nothing is done.
-	/// @returns The character of the current location after update is returned.
-	char setPosition(size_t _location);
-
-	void reset() { m_position = 0; }
-
-	std::string const& source() const noexcept { return m_source; }
-	std::string const& name() const noexcept { return m_name; }
-
-	size_t size() const { return m_source.size(); }
-
-	///@{
-	///@name Error printing helper functions
-	/// Functions that help pretty-printing parse errors
-	/// Do only use in error cases, they are quite expensive.
-	std::string lineAtPosition(int _position) const;
-	LineColumn translatePositionToLineColumn(int _position) const;
-	///@}
-
-	/// Translates a line:column to the absolute position.
-	std::optional<int> translateLineColumnToPosition(LineColumn const& _lineColumn) const;
-
-	/// Translates a line:column to the absolute position for the given input text.
-	static std::optional<int> translateLineColumnToPosition(std::string const& _text, LineColumn const& _input);
-
-	/// Tests whether or not given octet sequence is present at the current position in stream.
-	/// @returns true if the sequence could be found, false otherwise.
-	bool prefixMatch(std::string_view _sequence)
-	{
-		if (isPastEndOfInput(_sequence.size()))
-			return false;
-
-		for (size_t i = 0; i < _sequence.size(); ++i)
-			if (_sequence[i] != get(i))
-				return false;
-
-		return true;
-	}
-
-	/// @returns the substring of the source that the source location references.
-	/// Returns an empty string view if the source location does not `hasText()`.
-	std::string_view text(SourceLocation const& _location) const;
-
-	/// @returns the first line of the referenced source fragment. If the fragment is longer than
-	/// one line, appends an ellipsis to indicate that.
-	std::string singleLineSnippet(SourceLocation const& _location) const
-	{
-		return singleLineSnippet(m_source, _location);
-	}
-
-	static std::string singleLineSnippet(std::string const& _sourceCode, SourceLocation const& _location);
-
-private:
-	std::string m_source;
-	std::string m_name;
-	bool m_importedFromAST{false};
-	size_t m_position{0};
-};
-
-}
diff --git a/liblangutil/CharStreamProvider.h b/liblangutil/CharStreamProvider.h
deleted file mode 100644
index 1f645f7efe85..000000000000
--- a/liblangutil/CharStreamProvider.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Interface to retrieve the character stream by a source name.
- */
-
-#pragma once
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/Exceptions.h>
-
-#include <string>
-
-namespace solidity::langutil
-{
-
-/**
- * Interface to retrieve a CharStream (source) from a source name.
- * Used especially for printing error information.
- */
-class CharStreamProvider
-{
-public:
-	virtual ~CharStreamProvider() = default;
-	virtual CharStream const& charStream(std::string const& _sourceName) const = 0;
-};
-
-class SingletonCharStreamProvider: public CharStreamProvider
-{
-public:
-	explicit SingletonCharStreamProvider(CharStream const& _charStream):
-		m_charStream(_charStream) {}
-	CharStream const& charStream(std::string const& _sourceName) const override
-	{
-		solAssert(m_charStream.name() == _sourceName, "");
-		return m_charStream;
-	}
-private:
-	CharStream const& m_charStream;
-};
-
-}
diff --git a/liblangutil/Common.h b/liblangutil/Common.h
deleted file mode 100644
index d0f68a941805..000000000000
--- a/liblangutil/Common.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-namespace solidity::langutil
-{
-
-inline bool isDecimalDigit(char c)
-{
-	return '0' <= c && c <= '9';
-}
-
-inline bool isHexDigit(char c)
-{
-	return
-		isDecimalDigit(c) ||
-		('a' <= c && c <= 'f') ||
-		('A' <= c && c <= 'F');
-}
-
-inline bool isWhiteSpace(char c)
-{
-	return c == ' ' || c == '\n' || c == '\t' || c == '\r';
-}
-
-inline bool isIdentifierStart(char c)
-{
-	return c == '_' || c == '$' || ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
-}
-
-inline bool isIdentifierPart(char c)
-{
-	return isIdentifierStart(c) || isDecimalDigit(c);
-}
-
-inline int hexValue(char c)
-{
-	if (c >= '0' && c <= '9')
-		return c - '0';
-	else if (c >= 'a' && c <= 'f')
-		return c - 'a' + 10;
-	else if (c >= 'A' && c <= 'F')
-		return c - 'A' + 10;
-	else return -1;
-}
-}
diff --git a/liblangutil/DebugInfoSelection.cpp b/liblangutil/DebugInfoSelection.cpp
deleted file mode 100644
index 88e09cdb7aa0..000000000000
--- a/liblangutil/DebugInfoSelection.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <liblangutil/DebugInfoSelection.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string/trim.hpp>
-
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/split.hpp>
-
-#include <vector>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-
-DebugInfoSelection const DebugInfoSelection::All(bool _value) noexcept
-{
-	DebugInfoSelection result;
-	for (bool DebugInfoSelection::* member: componentMap() | ranges::views::values)
-		result.*member = _value;
-	return result;
-}
-
-DebugInfoSelection const DebugInfoSelection::Only(bool DebugInfoSelection::* _member) noexcept
-{
-	DebugInfoSelection result{};
-	result.*_member = true;
-	return result;
-}
-
-std::optional<DebugInfoSelection> DebugInfoSelection::fromString(std::string_view _input)
-{
-	// TODO: Make more stuff constexpr and make it a static_assert().
-	solAssert(componentMap().count("all") == 0, "");
-	solAssert(componentMap().count("none") == 0, "");
-
-	if (_input == "all")
-		return All();
-	if (_input == "none")
-		return None();
-
-	return fromComponents(_input | ranges::views::split(',') | ranges::to<std::vector<std::string>>);
-}
-
-std::optional<DebugInfoSelection> DebugInfoSelection::fromComponents(
-	std::vector<std::string> const& _componentNames,
-	bool _acceptWildcards
-)
-{
-	solAssert(componentMap().count("*") == 0, "");
-
-	DebugInfoSelection selection;
-	for (auto const& component: _componentNames)
-	{
-		if (component == "*")
-			return (_acceptWildcards ? std::make_optional(DebugInfoSelection::All()) : std::nullopt);
-
-		if (!selection.enable(component))
-			return std::nullopt;
-	}
-
-	return selection;
-}
-
-bool DebugInfoSelection::enable(std::string _component)
-{
-	auto memberIt = componentMap().find(boost::trim_copy(_component));
-	if (memberIt == componentMap().end())
-		return false;
-
-	this->*(memberIt->second) = true;
-	return true;
-}
-
-bool DebugInfoSelection::any() const noexcept
-{
-	for (bool DebugInfoSelection::* member: componentMap() | ranges::views::values)
-		if (this->*member)
-			return true;
-
-	return false;
-}
-
-bool DebugInfoSelection::all() const noexcept
-{
-	for (bool DebugInfoSelection::* member: componentMap() | ranges::views::values)
-		if (!(this->*member))
-			return false;
-
-	return true;
-}
-
-DebugInfoSelection& DebugInfoSelection::operator&=(DebugInfoSelection const& _other)
-{
-	for (bool DebugInfoSelection::* member: componentMap() | ranges::views::values)
-		this->*member &= _other.*member;
-	return *this;
-}
-
-DebugInfoSelection& DebugInfoSelection::operator|=(DebugInfoSelection const& _other)
-{
-	for (bool DebugInfoSelection::* member: componentMap() | ranges::views::values)
-		this->*member |= _other.*member;
-	return *this;
-}
-
-DebugInfoSelection DebugInfoSelection::operator&(DebugInfoSelection _other) const noexcept
-{
-	_other &= *this;
-	return _other;
-}
-
-DebugInfoSelection DebugInfoSelection::operator|(DebugInfoSelection _other) const noexcept
-{
-	_other |= *this;
-	return _other;
-}
-
-bool DebugInfoSelection::operator==(DebugInfoSelection const& _other) const noexcept
-{
-	for (bool DebugInfoSelection::* member: componentMap() | ranges::views::values)
-		if (this->*member != _other.*member)
-			return false;
-	return true;
-}
-
-std::ostream& langutil::operator<<(std::ostream& _stream, DebugInfoSelection const& _selection)
-{
-	std::vector<std::string> selectedComponentNames;
-	for (auto const& [name, member]: _selection.componentMap())
-		if (_selection.*member)
-			selectedComponentNames.push_back(name);
-
-	return _stream << joinHumanReadable(selectedComponentNames, ",");
-}
diff --git a/liblangutil/DebugInfoSelection.h b/liblangutil/DebugInfoSelection.h
deleted file mode 100644
index 40ba3d6b2573..000000000000
--- a/liblangutil/DebugInfoSelection.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Handles selections of debug info components.
- */
-
-#pragma once
-
-#include <map>
-#include <optional>
-#include <ostream>
-#include <string>
-#include <string_view>
-#include <vector>
-
-namespace solidity::langutil
-{
-
-/**
- * Represents a set of flags corresponding to components of debug info selected for some purpose.
- *
- * Provides extra functionality for enumerating the components and serializing/deserializing the
- * selection to/from a comma-separated string.
- */
-struct DebugInfoSelection
-{
-	static DebugInfoSelection const All(bool _value = true) noexcept;
-	static DebugInfoSelection const None() noexcept { return All(false); }
-	static DebugInfoSelection const Only(bool DebugInfoSelection::* _member) noexcept;
-	static DebugInfoSelection const Default() noexcept { return All(); }
-
-	static std::optional<DebugInfoSelection> fromString(std::string_view _input);
-	static std::optional<DebugInfoSelection> fromComponents(
-		std::vector<std::string> const& _componentNames,
-		bool _acceptWildcards = false
-	);
-	bool enable(std::string _component);
-
-	bool all() const noexcept;
-	bool any() const noexcept;
-	bool none() const noexcept { return !any(); }
-	bool only(bool DebugInfoSelection::* _member) const noexcept { return *this == Only(_member); }
-
-	DebugInfoSelection& operator&=(DebugInfoSelection const& _other);
-	DebugInfoSelection& operator|=(DebugInfoSelection const& _other);
-	DebugInfoSelection operator&(DebugInfoSelection _other) const noexcept;
-	DebugInfoSelection operator|(DebugInfoSelection _other) const noexcept;
-
-	bool operator!=(DebugInfoSelection const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(DebugInfoSelection const& _other) const noexcept;
-
-	friend std::ostream& operator<<(std::ostream& _stream, DebugInfoSelection const& _selection);
-
-	static auto const& componentMap()
-	{
-		static std::map<std::string, bool DebugInfoSelection::*> const components = {
-			{"location", &DebugInfoSelection::location},
-			{"snippet", &DebugInfoSelection::snippet},
-			{"ast-id", &DebugInfoSelection::astID},
-		};
-		return components;
-	}
-
-	bool location = false; ///< Include source location. E.g. `@src 3:50:100`
-	bool snippet = false;  ///< Include source code snippet next to location. E.g. `@src 3:50:100 "contract C {..."`
-	bool astID = false;    ///< Include ID of the Solidity AST node. E.g. `@ast-id 15`
-};
-
-std::ostream& operator<<(std::ostream& _stream, DebugInfoSelection const& _selection);
-
-}
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
deleted file mode 100644
index 24ef0673d8b9..000000000000
--- a/liblangutil/EVMVersion.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * EVM versioning.
- */
-
-#include <liblangutil/EVMVersion.h>
-#include <libevmasm/Instruction.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-bool EVMVersion::hasOpcode(Instruction _opcode) const
-{
-	switch (_opcode)
-	{
-	case Instruction::RETURNDATACOPY:
-	case Instruction::RETURNDATASIZE:
-		return supportsReturndata();
-	case Instruction::STATICCALL:
-		return hasStaticCall();
-	case Instruction::SHL:
-	case Instruction::SHR:
-	case Instruction::SAR:
-		return hasBitwiseShifting();
-	case Instruction::CREATE2:
-		return hasCreate2();
-	case Instruction::EXTCODEHASH:
-		return hasExtCodeHash();
-	case Instruction::CHAINID:
-		return hasChainID();
-	case Instruction::SELFBALANCE:
-		return hasSelfBalance();
-	case Instruction::BASEFEE:
-		return hasBaseFee();
-	default:
-		return true;
-	}
-}
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
deleted file mode 100644
index 9f0239624dba..000000000000
--- a/liblangutil/EVMVersion.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * EVM versioning.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <optional>
-#include <string>
-
-#include <boost/operators.hpp>
-
-
-namespace solidity::evmasm
-{
-/// Virtual machine bytecode instruction. Forward declared from libevmasm/Instruction.h
-enum class Instruction: uint8_t;
-}
-
-namespace solidity::langutil
-{
-
-/**
- * A version specifier of the EVM we want to compile to.
- * Defaults to the latest version deployed on Ethereum Mainnet at the time of compiler release.
- */
-class EVMVersion:
-	boost::less_than_comparable<EVMVersion>,
-	boost::equality_comparable<EVMVersion>
-{
-public:
-	EVMVersion() = default;
-
-	static EVMVersion homestead() { return {Version::Homestead}; }
-	static EVMVersion tangerineWhistle() { return {Version::TangerineWhistle}; }
-	static EVMVersion spuriousDragon() { return {Version::SpuriousDragon}; }
-	static EVMVersion byzantium() { return {Version::Byzantium}; }
-	static EVMVersion constantinople() { return {Version::Constantinople}; }
-	static EVMVersion petersburg() { return {Version::Petersburg}; }
-	static EVMVersion istanbul() { return {Version::Istanbul}; }
-	static EVMVersion berlin() { return {Version::Berlin}; }
-	static EVMVersion london() { return {Version::London}; }
-	static EVMVersion paris() { return {Version::Paris}; }
-	static EVMVersion shanghai() { return {Version::Shanghai}; }
-
-	static std::optional<EVMVersion> fromString(std::string const& _version)
-	{
-		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris(), shanghai()})
-			if (_version == v.name())
-				return v;
-		return std::nullopt;
-	}
-
-	bool operator==(EVMVersion const& _other) const { return m_version == _other.m_version; }
-	bool operator<(EVMVersion const& _other) const { return m_version < _other.m_version; }
-
-	std::string name() const
-	{
-		switch (m_version)
-		{
-		case Version::Homestead: return "homestead";
-		case Version::TangerineWhistle: return "tangerineWhistle";
-		case Version::SpuriousDragon: return "spuriousDragon";
-		case Version::Byzantium: return "byzantium";
-		case Version::Constantinople: return "constantinople";
-		case Version::Petersburg: return "petersburg";
-		case Version::Istanbul: return "istanbul";
-		case Version::Berlin: return "berlin";
-		case Version::London: return "london";
-		case Version::Paris: return "paris";
-		case Version::Shanghai: return "shanghai";
-		}
-		return "INVALID";
-	}
-
-	/// Has the RETURNDATACOPY and RETURNDATASIZE opcodes.
-	bool supportsReturndata() const { return *this >= byzantium(); }
-	bool hasStaticCall() const { return *this >= byzantium(); }
-	bool hasBitwiseShifting() const { return *this >= constantinople(); }
-	bool hasCreate2() const { return *this >= constantinople(); }
-	bool hasExtCodeHash() const { return *this >= constantinople(); }
-	bool hasChainID() const { return *this >= istanbul(); }
-	bool hasSelfBalance() const { return *this >= istanbul(); }
-	bool hasBaseFee() const { return *this >= london(); }
-	bool hasPrevRandao() const { return *this >= paris(); }
-	bool hasPush0() const { return *this >= shanghai(); }
-
-	bool hasOpcode(evmasm::Instruction _opcode) const;
-
-	/// Whether we have to retain the costs for the call opcode itself (false),
-	/// or whether we can just forward easily all remaining gas (true).
-	bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
-
-private:
-	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris, Shanghai };
-
-	EVMVersion(Version _version): m_version(_version) {}
-
-	Version m_version = Version::Shanghai;
-};
-
-}
diff --git a/liblangutil/ErrorReporter.cpp b/liblangutil/ErrorReporter.cpp
deleted file mode 100644
index 298e4f630f10..000000000000
--- a/liblangutil/ErrorReporter.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Rhett <roadriverrail@gmail.com>
- * @date 2017
- * Error helper class.
- */
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/SourceLocation.h>
-#include <memory>
-
-using namespace solidity;
-using namespace solidity::langutil;
-
-ErrorReporter& ErrorReporter::operator=(ErrorReporter const& _errorReporter)
-{
-	if (&_errorReporter == this)
-		return *this;
-	m_errorList = _errorReporter.m_errorList;
-	return *this;
-}
-
-void ErrorReporter::warning(ErrorId _error, std::string const& _description)
-{
-	error(_error, Error::Type::Warning, SourceLocation(), _description);
-}
-
-void ErrorReporter::warning(
-	ErrorId _error,
-	SourceLocation const& _location,
-	std::string const& _description
-)
-{
-	error(_error, Error::Type::Warning, _location, _description);
-}
-
-void ErrorReporter::warning(
-	ErrorId _error,
-	SourceLocation const& _location,
-	std::string const& _description,
-	SecondarySourceLocation const& _secondaryLocation
-)
-{
-	error(_error, Error::Type::Warning, _location, _secondaryLocation, _description);
-}
-
-void ErrorReporter::error(ErrorId _errorId, Error::Type _type, SourceLocation const& _location, std::string const& _description)
-{
-	if (checkForExcessiveErrors(_type))
-		return;
-
-	m_errorList.push_back(std::make_shared<Error>(_errorId, _type, _description, _location));
-}
-
-void ErrorReporter::error(ErrorId _errorId, Error::Type _type, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
-{
-	if (checkForExcessiveErrors(_type))
-		return;
-
-	m_errorList.push_back(std::make_shared<Error>(_errorId, _type, _description, _location, _secondaryLocation));
-}
-
-bool ErrorReporter::hasExcessiveErrors() const
-{
-	return m_errorCount > c_maxErrorsAllowed;
-}
-
-bool ErrorReporter::checkForExcessiveErrors(Error::Type _type)
-{
-	if (_type == Error::Type::Warning)
-	{
-		m_warningCount++;
-
-		if (m_warningCount == c_maxWarningsAllowed)
-			m_errorList.push_back(std::make_shared<Error>(4591_error, Error::Type::Warning, "There are more than 256 warnings. Ignoring the rest."));
-
-		if (m_warningCount >= c_maxWarningsAllowed)
-			return true;
-	}
-	else if (_type == Error::Type::Info)
-	{
-		m_infoCount++;
-
-		if (m_infoCount == c_maxInfosAllowed)
-			m_errorList.push_back(std::make_shared<Error>(2833_error, Error::Type::Info, "There are more than 256 infos. Ignoring the rest."));
-
-		if (m_infoCount >= c_maxInfosAllowed)
-			return true;
-	}
-	else
-	{
-		m_errorCount++;
-
-		if (m_errorCount > c_maxErrorsAllowed)
-		{
-			m_errorList.push_back(std::make_shared<Error>(4013_error, Error::Type::Warning, "There are more than 256 errors. Aborting."));
-			BOOST_THROW_EXCEPTION(FatalError());
-		}
-	}
-
-	return false;
-}
-
-void ErrorReporter::fatalError(ErrorId _error, Error::Type _type, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
-{
-	error(_error, _type, _location, _secondaryLocation, _description);
-	BOOST_THROW_EXCEPTION(FatalError());
-}
-
-void ErrorReporter::fatalError(ErrorId _error, Error::Type _type, SourceLocation const& _location, std::string const& _description)
-{
-	error(_error, _type, _location, _description);
-	BOOST_THROW_EXCEPTION(FatalError());
-}
-
-ErrorList const& ErrorReporter::errors() const
-{
-	return m_errorList;
-}
-
-void ErrorReporter::clear()
-{
-	m_errorList.clear();
-}
-
-void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::DeclarationError,
-		_location,
-		_secondaryLocation,
-		_description
-	);
-}
-
-void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::DeclarationError,
-		_location,
-		_description
-	);
-}
-
-void ErrorReporter::fatalDeclarationError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	fatalError(
-		_error,
-		Error::Type::DeclarationError,
-		_location,
-		_description);
-}
-
-void ErrorReporter::parserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::ParserError,
-		_location,
-		_description
-	);
-}
-
-void ErrorReporter::fatalParserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	fatalError(
-		_error,
-		Error::Type::ParserError,
-		_location,
-		_description
-	);
-}
-
-void ErrorReporter::syntaxError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::SyntaxError,
-		_location,
-		_description
-	);
-}
-
-void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::TypeError,
-		_location,
-		_secondaryLocation,
-		_description
-	);
-}
-
-void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::TypeError,
-		_location,
-		_description
-	);
-}
-
-
-void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
-{
-	fatalError(
-		_error,
-		Error::Type::TypeError,
-		_location,
-		_secondaryLocation,
-		_description
-	);
-}
-
-void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	fatalError(
-		_error,
-		Error::Type::TypeError,
-		_location,
-		_description
-	);
-}
-
-void ErrorReporter::docstringParsingError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	error(
-		_error,
-		Error::Type::DocstringParsingError,
-		_location,
-		_description
-	);
-}
-
-void ErrorReporter::info(
-	ErrorId _error,
-	SourceLocation const& _location,
-	std::string const& _description
-)
-{
-	error(_error, Error::Type::Info, _location, _description);
-}
-
-void ErrorReporter::info(ErrorId _error, std::string const& _description)
-{
-	error(_error, Error::Type::Info, SourceLocation(), _description);
-}
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
deleted file mode 100644
index 6901e87b94f8..000000000000
--- a/liblangutil/ErrorReporter.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Rhett <roadriverrail@gmail.com>
- * @date 2017
- * Error reporting helper class.
- */
-
-#pragma once
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Exceptions.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceLocation.h>
-#include <libsolutil/StringUtils.h>
-
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/filter.hpp>
-
-namespace solidity::langutil
-{
-
-class ErrorReporter
-{
-public:
-
-	explicit ErrorReporter(ErrorList& _errors):
-		m_errorList(_errors) { }
-
-	ErrorReporter(ErrorReporter const& _errorReporter) noexcept:
-		m_errorList(_errorReporter.m_errorList) { }
-
-	ErrorReporter& operator=(ErrorReporter const& _errorReporter);
-
-	void append(ErrorList const& _errorList)
-	{
-		m_errorList += _errorList;
-	}
-
-	void warning(ErrorId _error, std::string const& _description);
-
-	void warning(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void warning(
-		ErrorId _error,
-		SourceLocation const& _location,
-		std::string const& _description,
-		SecondarySourceLocation const& _secondaryLocation
-	);
-
-	void info(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void error(
-		ErrorId _error,
-		Error::Type _type,
-		SourceLocation const& _location,
-		std::string const& _description
-	);
-
-	void info(ErrorId _error, std::string const& _description);
-
-	void declarationError(
-		ErrorId _error,
-		SourceLocation const& _location,
-		SecondarySourceLocation const& _secondaryLocation,
-		std::string const& _description
-	);
-
-	void declarationError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void fatalDeclarationError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void parserError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void fatalParserError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void syntaxError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	void typeError(
-		ErrorId _error,
-		SourceLocation const& _location,
-		SecondarySourceLocation const& _secondaryLocation = SecondarySourceLocation(),
-		std::string const& _description = std::string()
-	);
-
-	void typeError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	template <typename... Strings>
-	void typeErrorConcatenateDescriptions(ErrorId _error, SourceLocation const& _location, Strings const&... _descriptions)
-	{
-		std::initializer_list<std::string> const descs = { _descriptions... };
-		solAssert(descs.size() > 0, "Need error descriptions!");
-
-		auto nonEmpty = [](std::string const& _s) { return !_s.empty(); };
-		std::string errorStr = util::joinHumanReadable(descs | ranges::views::filter(nonEmpty) | ranges::to_vector, " ");
-
-		error(_error, Error::Type::TypeError, _location, errorStr);
-	}
-
-	void fatalTypeError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-	void fatalTypeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondLocation, std::string const& _description);
-
-	void docstringParsingError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	ErrorList const& errors() const;
-
-	void clear();
-
-	/// @returns true iff there is any error (ignores warnings and infos).
-	bool hasErrors() const
-	{
-		return m_errorCount > 0;
-	}
-
-	/// @returns the number of errors (ignores warnings and infos).
-	unsigned errorCount() const
-	{
-		return m_errorCount;
-	}
-
-	// @returns true if the maximum error count has been reached.
-	bool hasExcessiveErrors() const;
-
-	class ErrorWatcher
-	{
-	public:
-		ErrorWatcher(ErrorReporter const& _errorReporter):
-			m_errorReporter(_errorReporter),
-			m_initialErrorCount(_errorReporter.errorCount())
-		{}
-		bool ok() const
-		{
-			solAssert(m_initialErrorCount <= m_errorReporter.errorCount(), "Unexpected error count.");
-			return m_initialErrorCount == m_errorReporter.errorCount();
-		}
-	private:
-		ErrorReporter const& m_errorReporter;
-		unsigned const m_initialErrorCount;
-	};
-
-	ErrorWatcher errorWatcher() const
-	{
-		return ErrorWatcher(*this);
-	}
-
-private:
-	void error(
-		ErrorId _error,
-		Error::Type _type,
-		SourceLocation const& _location,
-		SecondarySourceLocation const& _secondaryLocation,
-		std::string const& _description = std::string());
-
-	void fatalError(
-		ErrorId _error,
-		Error::Type _type,
-		SourceLocation const& _location,
-		SecondarySourceLocation const& _secondaryLocation,
-		std::string const& _description = std::string());
-
-	void fatalError(
-		ErrorId _error,
-		Error::Type _type,
-		SourceLocation const& _location = SourceLocation(),
-		std::string const& _description = std::string());
-
-	// @returns true if error shouldn't be stored
-	bool checkForExcessiveErrors(Error::Type _type);
-
-	ErrorList& m_errorList;
-
-	unsigned m_errorCount = 0;
-	unsigned m_warningCount = 0;
-	unsigned m_infoCount = 0;
-
-	unsigned const c_maxWarningsAllowed = 256;
-	unsigned const c_maxErrorsAllowed = 256;
-	unsigned const c_maxInfosAllowed = 256;
-};
-
-}
diff --git a/liblangutil/Exceptions.cpp b/liblangutil/Exceptions.cpp
deleted file mode 100644
index 108acd1216ee..000000000000
--- a/liblangutil/Exceptions.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Liana <liana@ethdev.com>
- * @date 2015
- * Solidity exception hierarchy.
- */
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/algorithm/string/trim.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-
-std::map<Error::Type, std::string> const Error::m_errorTypeNames = {
-	{Error::Type::IOError, "IOError"},
-	{Error::Type::FatalError, "FatalError"},
-	{Error::Type::JSONError, "JSONError"},
-	{Error::Type::InternalCompilerError, "InternalCompilerError"},
-	{Error::Type::CompilerError, "CompilerError"},
-	{Error::Type::Exception, "Exception"},
-	{Error::Type::CodeGenerationError, "CodeGenerationError"},
-	{Error::Type::DeclarationError, "DeclarationError"},
-	{Error::Type::DocstringParsingError, "DocstringParsingError"},
-	{Error::Type::ParserError, "ParserError"},
-	{Error::Type::SyntaxError, "SyntaxError"},
-	{Error::Type::TypeError, "TypeError"},
-	{Error::Type::UnimplementedFeatureError, "UnimplementedFeatureError"},
-	{Error::Type::YulException, "YulException"},
-	{Error::Type::SMTLogicException, "SMTLogicException"},
-	{Error::Type::Warning, "Warning"},
-	{Error::Type::Info, "Info"},
-};
-
-Error::Error(
-	ErrorId _errorId, Error::Type _type,
-	std::string const& _description,
-	SourceLocation const& _location,
-	SecondarySourceLocation const& _secondaryLocation
-):
-	m_errorId(_errorId),
-	m_type(_type)
-{
-	if (_location.isValid())
-		*this << errinfo_sourceLocation(_location);
-	if (!_secondaryLocation.infos.empty())
-		*this << errinfo_secondarySourceLocation(_secondaryLocation);
-	if (!_description.empty())
-		*this << util::errinfo_comment(_description);
-}
-
-SourceLocation const* Error::sourceLocation() const noexcept
-{
-	return boost::get_error_info<errinfo_sourceLocation>(*this);
-}
-
-SecondarySourceLocation const* Error::secondarySourceLocation() const noexcept
-{
-	return boost::get_error_info<errinfo_secondarySourceLocation>(*this);
-}
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
deleted file mode 100644
index b0701f99938e..000000000000
--- a/liblangutil/Exceptions.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity exception hierarchy.
- */
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/Assertions.h>
-#include <libsolutil/CommonData.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/facilities/overload.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
-
-#include <optional>
-#include <string>
-#include <utility>
-#include <variant>
-#include <vector>
-
-namespace solidity::langutil
-{
-class Error;
-using ErrorList = std::vector<std::shared_ptr<Error const>>;
-
-struct CompilerError: virtual util::Exception {};
-struct StackTooDeepError: virtual CompilerError {};
-struct InternalCompilerError: virtual util::Exception {};
-struct FatalError: virtual util::Exception {};
-struct UnimplementedFeatureError: virtual util::Exception {};
-struct InvalidAstError: virtual util::Exception {};
-
-
-/// Assertion that throws an InternalCompilerError containing the given description if it is not met.
-#if !BOOST_PP_VARIADICS_MSVC
-#define solAssert(...) BOOST_PP_OVERLOAD(solAssert_,__VA_ARGS__)(__VA_ARGS__)
-#else
-#define solAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(solAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
-#endif
-
-#define solAssert_1(CONDITION) \
-	solAssert_2((CONDITION), "")
-
-#define solAssert_2(CONDITION, DESCRIPTION) \
-	assertThrowWithDefaultDescription( \
-		(CONDITION), \
-		::solidity::langutil::InternalCompilerError, \
-		(DESCRIPTION), \
-		"Solidity assertion failed" \
-	)
-
-
-/// Assertion that throws an UnimplementedFeatureError containing the given description if it is not met.
-#if !BOOST_PP_VARIADICS_MSVC
-#define solUnimplementedAssert(...) BOOST_PP_OVERLOAD(solUnimplementedAssert_,__VA_ARGS__)(__VA_ARGS__)
-#else
-#define solUnimplementedAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(solUnimplementedAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
-#endif
-
-#define solUnimplementedAssert_1(CONDITION) \
-	solUnimplementedAssert_2((CONDITION), "")
-
-#define solUnimplementedAssert_2(CONDITION, DESCRIPTION) \
-	assertThrowWithDefaultDescription( \
-		(CONDITION), \
-		::solidity::langutil::UnimplementedFeatureError, \
-		(DESCRIPTION), \
-		"Unimplemented feature" \
-	)
-
-
-/// Helper that unconditionally reports an unimplemented feature.
-#define solUnimplemented(DESCRIPTION) \
-	solUnimplementedAssert(false, DESCRIPTION)
-
-
-/// Assertion that throws an InvalidAstError containing the given description if it is not met.
-#if !BOOST_PP_VARIADICS_MSVC
-#define astAssert(...) BOOST_PP_OVERLOAD(astAssert_,__VA_ARGS__)(__VA_ARGS__)
-#else
-#define astAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(astAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
-#endif
-
-#define astAssert_1(CONDITION) \
-	astAssert_2(CONDITION, "")
-
-#define astAssert_2(CONDITION, DESCRIPTION) \
-	assertThrowWithDefaultDescription( \
-		(CONDITION), \
-		::solidity::langutil::InvalidAstError, \
-		(DESCRIPTION), \
-		"AST assertion failed" \
-	)
-
-
-using errorSourceLocationInfo = std::pair<std::string, SourceLocation>;
-
-class SecondarySourceLocation
-{
-public:
-	SecondarySourceLocation& append(std::string const& _errMsg, SourceLocation const& _sourceLocation)
-	{
-		infos.emplace_back(_errMsg, _sourceLocation);
-		return *this;
-	}
-	SecondarySourceLocation& append(SecondarySourceLocation&& _other)
-	{
-		infos += std::move(_other.infos);
-		return *this;
-	}
-
-	/// Limits the number of secondary source locations to 32 and appends a notice to the
-	/// error message.
-	void limitSize(std::string& _message)
-	{
-		size_t occurrences = infos.size();
-		if (occurrences > 32)
-		{
-			infos.resize(32);
-			_message += " Truncated from " + std::to_string(occurrences) + " to the first 32 occurrences.";
-		}
-	}
-
-	std::vector<errorSourceLocationInfo> infos;
-};
-
-using errinfo_sourceLocation = boost::error_info<struct tag_sourceLocation, SourceLocation>;
-using errinfo_secondarySourceLocation = boost::error_info<struct tag_secondarySourceLocation, SecondarySourceLocation>;
-
-/**
- * Unique identifiers are used to tag and track individual error cases.
- * They are passed as the first parameter of error reporting functions.
- * Suffix _error helps to find them in the sources.
- * The struct ErrorId prevents incidental calls like typeError(3141) instead of typeError(3141_error).
- * To create a new ID, one can add 0000_error and then run "python ./scripts/error_codes.py --fix"
- * from the root of the repo.
- */
-struct ErrorId
-{
-	unsigned long long error = 0;
-	bool operator==(ErrorId const& _rhs) const { return error == _rhs.error; }
-	bool operator!=(ErrorId const& _rhs) const { return !(*this == _rhs); }
-	bool operator<(ErrorId const& _rhs) const { return error < _rhs.error; }
-};
-constexpr ErrorId operator"" _error(unsigned long long _error) { return ErrorId{ _error }; }
-
-class Error: virtual public util::Exception
-{
-public:
-	enum class Type
-	{
-		Info,
-		Warning,
-		CodeGenerationError,
-		DeclarationError,
-		DocstringParsingError,
-		ParserError,
-		TypeError,
-		SyntaxError,
-		IOError,
-		FatalError,
-		JSONError,
-		InternalCompilerError,
-		CompilerError,
-		Exception,
-		UnimplementedFeatureError,
-		YulException,
-		SMTLogicException,
-	};
-
-	enum class Severity
-	{
-		// NOTE: We rely on these being ordered from least to most severe.
-		Info,
-		Warning,
-		Error,
-	};
-
-	Error(
-		ErrorId _errorId,
-		Type _type,
-		std::string const& _description,
-		SourceLocation const& _location = SourceLocation(),
-		SecondarySourceLocation const& _secondaryLocation = SecondarySourceLocation()
-	);
-
-	ErrorId errorId() const { return m_errorId; }
-	Type type() const { return m_type; }
-	Severity severity() const { return errorSeverity(m_type); }
-
-	SourceLocation const* sourceLocation() const noexcept;
-	SecondarySourceLocation const* secondarySourceLocation() const noexcept;
-
-	/// helper functions
-	static Error const* containsErrorOfType(ErrorList const& _list, Error::Type _type)
-	{
-		for (auto e: _list)
-			if (e->type() == _type)
-				return e.get();
-		return nullptr;
-	}
-
-	static constexpr Severity errorSeverity(Type _type)
-	{
-		switch (_type)
-		{
-			case Type::Info: return Severity::Info;
-			case Type::Warning: return Severity::Warning;
-			default: return Severity::Error;
-		}
-	}
-
-	static constexpr Severity errorSeverityOrType(std::variant<Error::Type, Error::Severity> _typeOrSeverity)
-	{
-		if (std::holds_alternative<Error::Type>(_typeOrSeverity))
-			return errorSeverity(std::get<Error::Type>(_typeOrSeverity));
-		return std::get<Error::Severity>(_typeOrSeverity);
-	}
-
-	static bool isError(Severity _severity)
-	{
-		return _severity == Severity::Error;
-	}
-
-	static bool isError(Type _type)
-	{
-		return isError(errorSeverity(_type));
-	}
-
-	static bool containsErrors(ErrorList const& _list)
-	{
-		for (auto e: _list)
-			if (isError(e->type()))
-				return true;
-		return false;
-	}
-
-	static std::string formatErrorSeverity(Severity _severity)
-	{
-		switch (_severity)
-		{
-		case Severity::Info: return "Info";
-		case Severity::Warning: return "Warning";
-		case Severity::Error: return "Error";
-		}
-		util::unreachable();
-	}
-
-	static std::string formatErrorType(Type _type)
-	{
-		return m_errorTypeNames.at(_type);
-	}
-
-	static std::optional<Type> parseErrorType(std::string _name)
-	{
-		static std::map<std::string, Error::Type> const m_errorTypesByName = util::invertMap(m_errorTypeNames);
-
-		if (m_errorTypesByName.count(_name) == 0)
-			return std::nullopt;
-
-		return m_errorTypesByName.at(_name);
-	}
-
-	static std::string formatTypeOrSeverity(std::variant<Error::Type, Error::Severity> _typeOrSeverity)
-	{
-		if (std::holds_alternative<Error::Type>(_typeOrSeverity))
-			return formatErrorType(std::get<Error::Type>(_typeOrSeverity));
-		return formatErrorSeverity(std::get<Error::Severity>(_typeOrSeverity));
-	}
-
-	static std::string formatErrorSeverityLowercase(Severity _severity)
-	{
-		std::string severityValue = formatErrorSeverity(_severity);
-		boost::algorithm::to_lower(severityValue);
-		return severityValue;
-	}
-
-private:
-	ErrorId m_errorId;
-	Type m_type;
-
-	static std::map<Type, std::string> const m_errorTypeNames;
-};
-
-}
diff --git a/liblangutil/ParserBase.cpp b/liblangutil/ParserBase.cpp
deleted file mode 100644
index fde0f27ecc5a..000000000000
--- a/liblangutil/ParserBase.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Solidity parser shared functionality.
- */
-
-#include <liblangutil/ParserBase.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/ErrorReporter.h>
-
-using namespace solidity;
-using namespace solidity::langutil;
-
-SourceLocation ParserBase::currentLocation() const
-{
-	return m_scanner->currentLocation();
-}
-
-Token ParserBase::currentToken() const
-{
-	return m_scanner->currentToken();
-}
-
-Token ParserBase::peekNextToken() const
-{
-	return m_scanner->peekNextToken();
-}
-
-std::string ParserBase::currentLiteral() const
-{
-	return m_scanner->currentLiteral();
-}
-
-Token ParserBase::advance()
-{
-	return m_scanner->next();
-}
-
-std::string ParserBase::tokenName(Token _token)
-{
-	if (_token == Token::Identifier)
-		return "identifier";
-	else if (_token == Token::EOS)
-		return "end of source";
-	else if (TokenTraits::isReservedKeyword(_token))
-		return "reserved keyword '" + TokenTraits::friendlyName(_token) + "'";
-	else if (TokenTraits::isElementaryTypeName(_token)) //for the sake of accuracy in reporting
-	{
-		ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
-		return "'" + elemTypeName.toString() + "'";
-	}
-	else
-		return "'" + TokenTraits::friendlyName(_token) + "'";
-}
-
-void ParserBase::expectToken(Token _value, bool _advance)
-{
-	Token tok = m_scanner->currentToken();
-	if (tok != _value)
-		fatalParserError(
-			2314_error,
-			"Expected " + ParserBase::tokenName(_value) + " but got " + tokenName(tok)
-		);
-	if (_advance)
-		advance();
-}
-
-void ParserBase::increaseRecursionDepth()
-{
-	m_recursionDepth++;
-	if (m_recursionDepth >= 1200)
-		fatalParserError(7319_error, "Maximum recursion depth reached during parsing.");
-}
-
-void ParserBase::decreaseRecursionDepth()
-{
-	solAssert(m_recursionDepth > 0, "");
-	m_recursionDepth--;
-}
-
-void ParserBase::parserWarning(ErrorId _error, std::string const& _description)
-{
-	m_errorReporter.warning(_error, currentLocation(), _description);
-}
-
-void ParserBase::parserWarning(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	m_errorReporter.warning(_error, _location, _description);
-}
-
-void ParserBase::parserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	m_errorReporter.parserError(_error, _location, _description);
-}
-
-void ParserBase::parserError(ErrorId _error, std::string const& _description)
-{
-	parserError(_error, currentLocation(), _description);
-}
-
-void ParserBase::fatalParserError(ErrorId _error, std::string const& _description)
-{
-	fatalParserError(_error, currentLocation(), _description);
-}
-
-void ParserBase::fatalParserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-{
-	m_errorReporter.fatalParserError(_error, _location, _description);
-}
diff --git a/liblangutil/ParserBase.h b/liblangutil/ParserBase.h
deleted file mode 100644
index 88fc76a9c307..000000000000
--- a/liblangutil/ParserBase.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Solidity parser shared functionality.
- */
-
-#pragma once
-
-#include <liblangutil/Token.h>
-#include <memory>
-#include <string>
-
-namespace solidity::langutil
-{
-
-class ErrorReporter;
-class Scanner;
-struct SourceLocation;
-struct ErrorId;
-
-class ParserBase
-{
-public:
-	explicit ParserBase(ErrorReporter& errorReporter):
-		m_errorReporter(errorReporter)
-	{}
-
-	virtual ~ParserBase() = default;
-
-protected:
-	/// Utility class that creates an error and throws an exception if the
-	/// recursion depth is too deep.
-	class RecursionGuard
-	{
-	public:
-		explicit RecursionGuard(ParserBase& _parser): m_parser(_parser)
-		{
-			m_parser.increaseRecursionDepth();
-		}
-		~RecursionGuard() { m_parser.decreaseRecursionDepth(); }
-	private:
-		ParserBase& m_parser;
-	};
-
-	/// Location of the current token
-	virtual SourceLocation currentLocation() const;
-
-	///@{
-	///@name Helper functions
-	/// If current token value is not @a _value, throw exception otherwise advance token
-	//  if @a _advance is true
-	void expectToken(Token _value, bool _advance = true);
-
-	Token currentToken() const;
-	Token peekNextToken() const;
-	std::string tokenName(Token _token);
-	std::string currentLiteral() const;
-	virtual Token advance();
-	///@}
-
-	/// Increases the recursion depth and throws an exception if it is too deep.
-	void increaseRecursionDepth();
-	void decreaseRecursionDepth();
-
-	/// Creates a @ref ParserError and annotates it with the current position and the
-	/// given @a _description.
-	void parserError(ErrorId _error, std::string const& _description);
-	void parserError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	/// Creates a @ref ParserWarning and annotates it with the current position and the
-	/// given @a _description.
-	void parserWarning(ErrorId _error, std::string const& _description);
-	void parserWarning(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	/// Creates a @ref ParserError and annotates it with the current position and the
-	/// given @a _description. Throws the FatalError.
-	void fatalParserError(ErrorId _error, std::string const& _description);
-	void fatalParserError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
-
-	std::shared_ptr<Scanner> m_scanner;
-	/// The reference to the list of errors, warnings and infos to add errors/warnings/infos during parsing
-	ErrorReporter& m_errorReporter;
-	/// Current recursion depth during parsing.
-	size_t m_recursionDepth = 0;
-};
-
-}
diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
deleted file mode 100644
index 3db3f29d5d23..000000000000
--- a/liblangutil/Scanner.cpp
+++ /dev/null
@@ -1,1048 +0,0 @@
-/*
- * This file is part of solidity.
- *
- * solidity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * solidity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is derived from the file "scanner.cc", which was part of the
- * V8 project. The original copyright header follows:
- *
- * Copyright 2006-2012, the V8 project authors. All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- * * Neither the name of Google Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity scanner.
- */
-
-#include <liblangutil/Common.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/Scanner.h>
-
-#include <boost/algorithm/string/classification.hpp>
-
-#include <optional>
-#include <string_view>
-#include <tuple>
-#include <array>
-
-
-namespace solidity::langutil
-{
-
-std::string to_string(ScannerError _errorCode)
-{
-	switch (_errorCode)
-	{
-		case ScannerError::NoError: return "No error.";
-		case ScannerError::IllegalToken: return "Invalid token.";
-		case ScannerError::IllegalHexString: return "Expected even number of hex-nibbles.";
-		case ScannerError::IllegalHexDigit: return "Hexadecimal digit missing or invalid.";
-		case ScannerError::IllegalCommentTerminator: return "Expected multi-line comment-terminator.";
-		case ScannerError::IllegalEscapeSequence: return "Invalid escape sequence.";
-		case ScannerError::UnicodeCharacterInNonUnicodeString: return "Invalid character in string. If you are trying to use Unicode characters, use a unicode\"...\" string literal.";
-		case ScannerError::IllegalCharacterInString: return "Invalid character in string.";
-		case ScannerError::IllegalStringEndQuote: return "Expected string end-quote.";
-		case ScannerError::IllegalNumberSeparator: return "Invalid use of number separator '_'.";
-		case ScannerError::IllegalExponent: return "Invalid exponent.";
-		case ScannerError::IllegalNumberEnd: return "Identifier-start is not allowed at end of a number.";
-		case ScannerError::OctalNotAllowed: return "Octal numbers not allowed.";
-		case ScannerError::DirectionalOverrideUnderflow: return "Unicode direction override underflow in comment or string literal.";
-		case ScannerError::DirectionalOverrideMismatch: return "Mismatching directional override markers in comment or string literal.";
-		default:
-			solAssert(false, "Unhandled case in to_string(ScannerError)");
-			return "";
-	}
-}
-
-
-std::ostream& operator<<(std::ostream& os, ScannerError _errorCode)
-{
-	return os << to_string(_errorCode);
-}
-
-/// Scoped helper for literal recording. Automatically drops the literal
-/// if aborting the scanning before it's complete.
-enum LiteralType
-{
-	LITERAL_TYPE_STRING,
-	LITERAL_TYPE_NUMBER, // not really different from string type in behaviour
-	LITERAL_TYPE_COMMENT
-};
-
-class LiteralScope
-{
-public:
-	explicit LiteralScope(Scanner* _self, enum LiteralType _type):
-		m_type(_type),
-		m_scanner(_self),
-		m_complete(false)
-	{
-		if (_type == LITERAL_TYPE_COMMENT)
-			m_scanner->m_skippedComments[Scanner::NextNext].literal.clear();
-		else
-			m_scanner->m_tokens[Scanner::NextNext].literal.clear();
-	}
-	~LiteralScope()
-	{
-		if (!m_complete)
-		{
-			if (m_type == LITERAL_TYPE_COMMENT)
-				m_scanner->m_skippedComments[Scanner::NextNext].literal.clear();
-			else
-				m_scanner->m_tokens[Scanner::NextNext].literal.clear();
-		}
-	}
-	void complete() { m_complete = true; }
-
-private:
-	enum LiteralType m_type;
-	Scanner* m_scanner;
-	bool m_complete;
-};
-
-void Scanner::reset()
-{
-	m_source.reset();
-	m_kind = ScannerKind::Solidity;
-	m_char = m_source.get();
-	skipWhitespace();
-	next();
-	next();
-	next();
-}
-
-void Scanner::setPosition(size_t _offset)
-{
-	m_char = m_source.setPosition(_offset);
-	scanToken();
-	next();
-	next();
-}
-
-bool Scanner::scanHexByte(char& o_scannedByte)
-{
-	char x = 0;
-	for (size_t i = 0; i < 2; i++)
-	{
-		int d = hexValue(m_char);
-		if (d < 0)
-		{
-			rollback(i);
-			return false;
-		}
-		x = static_cast<char>(x * 16 + d);
-		advance();
-	}
-	o_scannedByte = x;
-	return true;
-}
-
-std::optional<unsigned> Scanner::scanUnicode()
-{
-	unsigned x = 0;
-	for (size_t i = 0; i < 4; i++)
-	{
-		int d = hexValue(m_char);
-		if (d < 0)
-		{
-			rollback(i);
-			return {};
-		}
-		x = x * 16 + static_cast<unsigned>(d);
-		advance();
-	}
-	return x;
-}
-
-// This supports codepoints between 0000 and FFFF.
-void Scanner::addUnicodeAsUTF8(unsigned codepoint)
-{
-	if (codepoint <= 0x7f)
-		addLiteralChar(char(codepoint));
-	else if (codepoint <= 0x7ff)
-	{
-		addLiteralChar(char(0xc0u | (codepoint >> 6u)));
-		addLiteralChar(char(0x80u | (codepoint & 0x3fu)));
-	}
-	else
-	{
-		addLiteralChar(char(0xe0u | (codepoint >> 12u)));
-		addLiteralChar(char(0x80u | ((codepoint >> 6u) & 0x3fu)));
-		addLiteralChar(char(0x80u | (codepoint & 0x3fu)));
-	}
-}
-
-void Scanner::rescan()
-{
-	size_t rollbackTo = 0;
-	if (m_skippedComments[Current].literal.empty())
-		rollbackTo = static_cast<size_t>(m_tokens[Current].location.start);
-	else
-		rollbackTo = static_cast<size_t>(m_skippedComments[Current].location.start);
-	m_char = m_source.rollback(m_source.position() - rollbackTo);
-	next();
-	next();
-	next();
-}
-
-// Ensure that tokens can be stored in a byte.
-BOOST_STATIC_ASSERT(TokenTraits::count() <= 0x100);
-
-Token Scanner::next()
-{
-	m_tokens[Current] = std::move(m_tokens[Next]);
-	m_tokens[Next] = std::move(m_tokens[NextNext]);
-	m_skippedComments[Current] = std::move(m_skippedComments[Next]);
-	m_skippedComments[Next] = std::move(m_skippedComments[NextNext]);
-
-	scanToken();
-
-	return m_tokens[Current].token;
-}
-
-Token Scanner::selectToken(char _next, Token _then, Token _else)
-{
-	advance();
-	if (m_char == _next)
-		return selectToken(_then);
-	else
-		return _else;
-}
-
-bool Scanner::skipWhitespace()
-{
-	size_t const startPosition = sourcePos();
-	while (isWhiteSpace(m_char))
-		advance();
-	// Return whether or not we skipped any characters.
-	return sourcePos() != startPosition;
-}
-
-bool Scanner::skipWhitespaceExceptUnicodeLinebreak()
-{
-	size_t const startPosition = sourcePos();
-	while (isWhiteSpace(m_char) && !isUnicodeLinebreak())
-		advance();
-	// Return whether or not we skipped any characters.
-	return sourcePos() != startPosition;
-}
-
-
-namespace
-{
-
-/// Tries to scan for an RLO/LRO/RLE/LRE/PDF and keeps track of script writing direction override depth.
-///
-/// @returns ScannerError::NoError in case of successful parsing and directional encodings are paired
-///          and error code in case the input's lexical parser state is invalid and this error should be reported
-///          to the user.
-static ScannerError validateBiDiMarkup(CharStream& _stream, size_t _startPosition)
-{
-	static std::array<std::pair<std::string_view, int>, 5> constexpr directionalSequences{
-		std::pair<std::string_view, int>{"\xE2\x80\xAD", 1}, // U+202D (LRO - Left-to-Right Override)
-		std::pair<std::string_view, int>{"\xE2\x80\xAE", 1}, // U+202E (RLO - Right-to-Left Override)
-		std::pair<std::string_view, int>{"\xE2\x80\xAA", 1}, // U+202A (LRE - Left-to-Right Embedding)
-		std::pair<std::string_view, int>{"\xE2\x80\xAB", 1}, // U+202B (RLE - Right-to-Left Embedding)
-		std::pair<std::string_view, int>{"\xE2\x80\xAC", -1} // U+202C (PDF - Pop Directional Formatting
-	};
-
-	size_t endPosition = _stream.position();
-	_stream.setPosition(_startPosition);
-
-	int directionOverrideDepth = 0;
-
-	for (size_t currentPos = _startPosition; currentPos < endPosition; ++currentPos)
-	{
-		_stream.setPosition(currentPos);
-
-		for (auto const& [sequence, depthChange]: directionalSequences)
-			if (_stream.prefixMatch(sequence))
-				directionOverrideDepth += depthChange;
-
-		if (directionOverrideDepth < 0)
-			return ScannerError::DirectionalOverrideUnderflow;
-	}
-
-	_stream.setPosition(endPosition);
-
-	return directionOverrideDepth > 0 ? ScannerError::DirectionalOverrideMismatch : ScannerError::NoError;
-}
-
-}
-
-Token Scanner::skipSingleLineComment()
-{
-	// Line terminator is not part of the comment. If it is a
-	// non-ascii line terminator, it will result in a parser error.
-	size_t startPosition = m_source.position();
-	while (!isUnicodeLinebreak())
-		if (!advance())
-			break;
-
-	ScannerError unicodeDirectionError = validateBiDiMarkup(m_source, startPosition);
-	if (unicodeDirectionError != ScannerError::NoError)
-		return setError(unicodeDirectionError);
-
-	return Token::Whitespace;
-}
-
-bool Scanner::atEndOfLine() const
-{
-	return m_char == '\n' || m_char == '\r';
-}
-
-bool Scanner::tryScanEndOfLine()
-{
-	if (m_char == '\n')
-	{
-		advance();
-		return true;
-	}
-
-	if (m_char == '\r')
-	{
-		if (advance() && m_char == '\n')
-			advance();
-		return true;
-	}
-
-	return false;
-}
-
-size_t Scanner::scanSingleLineDocComment()
-{
-	LiteralScope literal(this, LITERAL_TYPE_COMMENT);
-	size_t endPosition = m_source.position();
-
-	skipWhitespaceExceptUnicodeLinebreak();
-
-	while (!isSourcePastEndOfInput())
-	{
-		endPosition = m_source.position();
-		if (tryScanEndOfLine())
-		{
-			// Check if next line is also a single-line comment.
-			// If any whitespaces were skipped, use source position before.
-			if (!skipWhitespaceExceptUnicodeLinebreak())
-				endPosition = m_source.position();
-
-			if (!m_source.isPastEndOfInput(3) &&
-				m_source.get(0) == '/' &&
-				m_source.get(1) == '/' &&
-				m_source.get(2) == '/')
-			{
-				if (!m_source.isPastEndOfInput(4) && m_source.get(3) == '/')
-					break; // "////" is not a documentation comment
-				m_char = m_source.advanceAndGet(3);
-				if (atEndOfLine())
-					continue;
-				addCommentLiteralChar('\n');
-			}
-			else
-				break; // next line is not a documentation comment, we are done
-		}
-		else if (isUnicodeLinebreak())
-			// Any line terminator that is not '\n' is considered to end the
-			// comment.
-			break;
-		addCommentLiteralChar(m_char);
-		advance();
-	}
-	literal.complete();
-	return endPosition;
-}
-
-Token Scanner::skipMultiLineComment()
-{
-	size_t startPosition = m_source.position();
-	while (!isSourcePastEndOfInput())
-	{
-		char prevChar = m_char;
-		advance();
-
-		// If we have reached the end of the multi-line comment, we
-		// consume the '/' and insert a whitespace. This way all
-		// multi-line comments are treated as whitespace.
-		if (prevChar == '*' && m_char == '/')
-		{
-			ScannerError unicodeDirectionError = validateBiDiMarkup(m_source, startPosition);
-			if (unicodeDirectionError != ScannerError::NoError)
-				return setError(unicodeDirectionError);
-
-			m_char = ' ';
-			return Token::Whitespace;
-		}
-	}
-	// Unterminated multi-line comment.
-	return setError(ScannerError::IllegalCommentTerminator);
-}
-
-Token Scanner::scanMultiLineDocComment()
-{
-	LiteralScope literal(this, LITERAL_TYPE_COMMENT);
-	bool endFound = false;
-	bool charsAdded = false;
-
-	while (isWhiteSpace(m_char) && !atEndOfLine())
-		advance();
-
-	while (!isSourcePastEndOfInput())
-	{
-		// handle newlines in multiline comments
-		if (atEndOfLine())
-		{
-			skipWhitespace();
-			if (!m_source.isPastEndOfInput(1) && m_source.get(0) == '*' && m_source.get(1) == '*')
-			{ // it is unknown if this leads to the end of the comment
-				addCommentLiteralChar('*');
-				advance();
-			}
-			else if (!m_source.isPastEndOfInput(1) && m_source.get(0) == '*' && m_source.get(1) != '/')
-			{ // skip first '*' in subsequent lines
-				m_char = m_source.advanceAndGet(1);
-				if (atEndOfLine()) // ignores empty lines
-					continue;
-				if (charsAdded)
-					addCommentLiteralChar('\n'); // corresponds to the end of previous line
-			}
-			else if (!m_source.isPastEndOfInput(1) && m_source.get(0) == '*' && m_source.get(1) == '/')
-			{ // if after newline the comment ends, don't insert the newline
-				m_char = m_source.advanceAndGet(2);
-				endFound = true;
-				break;
-			}
-			else if (charsAdded)
-				addCommentLiteralChar('\n');
-		}
-
-		if (!m_source.isPastEndOfInput(1) && m_source.get(0) == '*' && m_source.get(1) == '/')
-		{
-			m_char = m_source.advanceAndGet(2);
-			endFound = true;
-			break;
-		}
-		addCommentLiteralChar(m_char);
-		charsAdded = true;
-		advance();
-	}
-	literal.complete();
-	if (!endFound)
-		return setError(ScannerError::IllegalCommentTerminator);
-	else
-		return Token::CommentLiteral;
-}
-
-Token Scanner::scanSlash()
-{
-	int firstSlashPosition = static_cast<int>(sourcePos());
-	advance();
-	if (m_char == '/')
-	{
-		if (!advance()) /* double slash comment directly before EOS */
-			return Token::Whitespace;
-		else if (m_char == '/')
-		{
-			advance(); //consume the last '/' at ///
-
-			// "////"
-			if (m_char == '/')
-				return skipSingleLineComment();
-			// doxygen style /// comment
-			m_skippedComments[NextNext].location.start = firstSlashPosition;
-			m_skippedComments[NextNext].location.sourceName = m_sourceName;
-			m_skippedComments[NextNext].token = Token::CommentLiteral;
-			m_skippedComments[NextNext].location.end = static_cast<int>(scanSingleLineDocComment());
-			return Token::Whitespace;
-		}
-		else
-			return skipSingleLineComment();
-	}
-	else if (m_char == '*')
-	{
-		// doxygen style /** natspec comment
-		if (!advance()) /* slash star comment before EOS */
-			return setError(ScannerError::IllegalCommentTerminator);
-		else if (m_char == '*')
-		{
-			advance(); //consume the last '*' at /**
-
-			// "/**/"
-			if (m_char == '/')
-			{
-				advance(); //skip the closing slash
-				return Token::Whitespace;
-			}
-			// "/***"
-			if (m_char == '*')
-				// "/***/" may be interpreted as empty natspec or skipped; skipping is simpler
-				return skipMultiLineComment();
-			// we actually have a multiline documentation comment
-			m_skippedComments[NextNext].location.start = firstSlashPosition;
-			m_skippedComments[NextNext].location.sourceName = m_sourceName;
-			Token comment = scanMultiLineDocComment();
-			m_skippedComments[NextNext].location.end = static_cast<int>(sourcePos());
-			m_skippedComments[NextNext].token = comment;
-			if (comment == Token::Illegal)
-				return Token::Illegal; // error already set
-			else
-				return Token::Whitespace;
-		}
-		else
-			return skipMultiLineComment();
-	}
-	else if (m_char == '=')
-		return selectToken(Token::AssignDiv);
-	else
-		return Token::Div;
-}
-
-void Scanner::scanToken()
-{
-	m_tokens[NextNext] = {};
-	m_skippedComments[NextNext] = {};
-
-	Token token;
-	// M and N are for the purposes of grabbing different type sizes
-	unsigned m = 0;
-	unsigned n = 0;
-	do
-	{
-		// Remember the position of the next token
-		m_tokens[NextNext].location.start = static_cast<int>(sourcePos());
-		switch (m_char)
-		{
-		case '"':
-		case '\'':
-			token = scanString(false);
-			break;
-		case '<':
-			// < <= << <<=
-			advance();
-			if (m_char == '=')
-				token = selectToken(Token::LessThanOrEqual);
-			else if (m_char == '<')
-				token = selectToken('=', Token::AssignShl, Token::SHL);
-			else
-				token = Token::LessThan;
-			break;
-		case '>':
-			// > >= >> >>= >>> >>>=
-			advance();
-			if (m_char == '=')
-				token = selectToken(Token::GreaterThanOrEqual);
-			else if (m_char == '>')
-			{
-				// >> >>= >>> >>>=
-				advance();
-				if (m_char == '=')
-					token = selectToken(Token::AssignSar);
-				else if (m_char == '>')
-					token = selectToken('=', Token::AssignShr, Token::SHR);
-				else
-					token = Token::SAR;
-			}
-			else
-				token = Token::GreaterThan;
-			break;
-		case '=':
-			// = == =>
-			advance();
-			if (m_char == '=')
-				token = selectToken(Token::Equal);
-			else if (m_char == '>')
-				token = selectToken(Token::DoubleArrow);
-			else
-				token = Token::Assign;
-			break;
-		case '!':
-			// ! !=
-			advance();
-			if (m_char == '=')
-				token = selectToken(Token::NotEqual);
-			else
-				token = Token::Not;
-			break;
-		case '+':
-			// + ++ +=
-			advance();
-			if (m_char == '+')
-				token = selectToken(Token::Inc);
-			else if (m_char == '=')
-				token = selectToken(Token::AssignAdd);
-			else
-				token = Token::Add;
-			break;
-		case '-':
-			// - -- -= ->
-			advance();
-			if (m_char == '-')
-				token = selectToken(Token::Dec);
-			else if (m_char == '=')
-				token = selectToken(Token::AssignSub);
-			else if (m_char == '>')
-				token = selectToken(Token::RightArrow);
-			else
-				token = Token::Sub;
-			break;
-		case '*':
-			// * ** *=
-			advance();
-			if (m_char == '*')
-				token = selectToken(Token::Exp);
-			else if (m_char == '=')
-				token = selectToken(Token::AssignMul);
-			else
-				token = Token::Mul;
-			break;
-		case '%':
-			// % %=
-			token = selectToken('=', Token::AssignMod, Token::Mod);
-			break;
-		case '/':
-			// /  // /* /=
-			token = scanSlash();
-			break;
-		case '&':
-			// & && &=
-			advance();
-			if (m_char == '&')
-				token = selectToken(Token::And);
-			else if (m_char == '=')
-				token = selectToken(Token::AssignBitAnd);
-			else
-				token = Token::BitAnd;
-			break;
-		case '|':
-			// | || |=
-			advance();
-			if (m_char == '|')
-				token = selectToken(Token::Or);
-			else if (m_char == '=')
-				token = selectToken(Token::AssignBitOr);
-			else
-				token = Token::BitOr;
-			break;
-		case '^':
-			// ^ ^=
-			token = selectToken('=', Token::AssignBitXor, Token::BitXor);
-			break;
-		case '.':
-			// . Number
-			advance();
-			if (isDecimalDigit(m_char))
-				token = scanNumber('.');
-			else
-				token = Token::Period;
-			break;
-		case ':':
-			// : :=
-			advance();
-			if (m_char == '=')
-				token = selectToken(Token::AssemblyAssign);
-			else
-				token = Token::Colon;
-			break;
-		case ';':
-			token = selectToken(Token::Semicolon);
-			break;
-		case ',':
-			token = selectToken(Token::Comma);
-			break;
-		case '(':
-			token = selectToken(Token::LParen);
-			break;
-		case ')':
-			token = selectToken(Token::RParen);
-			break;
-		case '[':
-			token = selectToken(Token::LBrack);
-			break;
-		case ']':
-			token = selectToken(Token::RBrack);
-			break;
-		case '{':
-			token = selectToken(Token::LBrace);
-			break;
-		case '}':
-			token = selectToken(Token::RBrace);
-			break;
-		case '?':
-			token = selectToken(Token::Conditional);
-			break;
-		case '~':
-			token = selectToken(Token::BitNot);
-			break;
-		default:
-			if (isIdentifierStart(m_char))
-			{
-				std::tie(token, m, n) = scanIdentifierOrKeyword();
-
-				// Special case for hexadecimal literals
-				if (token == Token::Hex)
-				{
-					// reset
-					m = 0;
-					n = 0;
-
-					// Special quoted hex string must follow
-					if (m_char == '"' || m_char == '\'')
-						token = scanHexString();
-					else
-						token = setError(ScannerError::IllegalToken);
-				}
-				else if (token == Token::Unicode && m_kind != ScannerKind::Yul)
-				{
-					// reset
-					m = 0;
-					n = 0;
-
-					// Special quoted hex string must follow
-					if (m_char == '"' || m_char == '\'')
-						token = scanString(true);
-					else
-						token = setError(ScannerError::IllegalToken);
-				}
-			}
-			else if (isDecimalDigit(m_char))
-				token = scanNumber();
-			else if (skipWhitespace())
-				token = Token::Whitespace;
-			else if (isSourcePastEndOfInput())
-				token = Token::EOS;
-			else
-				token = selectErrorToken(ScannerError::IllegalToken);
-			break;
-		}
-		// Continue scanning for tokens as long as we're just skipping
-		// whitespace.
-	}
-	while (token == Token::Whitespace);
-	m_tokens[NextNext].location.end = static_cast<int>(sourcePos());
-	m_tokens[NextNext].location.sourceName = m_sourceName;
-	m_tokens[NextNext].token = token;
-	m_tokens[NextNext].extendedTokenInfo = std::make_tuple(m, n);
-}
-
-bool Scanner::scanEscape()
-{
-	char c = m_char;
-
-	// Skip escaped newlines.
-	if (tryScanEndOfLine())
-		return true;
-	advance();
-
-	switch (c)
-	{
-	case '\'':  // fall through
-	case '"':  // fall through
-	case '\\':
-		break;
-	case 'n':
-		c = '\n';
-		break;
-	case 'r':
-		c = '\r';
-		break;
-	case 't':
-		c = '\t';
-		break;
-	case 'u':
-	{
-		if (auto const codepoint = scanUnicode(); codepoint.has_value())
-			addUnicodeAsUTF8(*codepoint);
-		else
-			return false;
-		return true;
-	}
-	case 'x':
-		if (!scanHexByte(c))
-			return false;
-		break;
-	default:
-		return false;
-	}
-
-	addLiteralChar(c);
-	return true;
-}
-
-bool Scanner::isUnicodeLinebreak()
-{
-	if (0x0a <= m_char && m_char <= 0x0d)
-		// line feed, vertical tab, form feed, carriage return
-		return true;
-	if (!m_source.isPastEndOfInput(1) && uint8_t(m_source.get(0)) == 0xc2 && uint8_t(m_source.get(1)) == 0x85)
-		// NEL - U+0085, C2 85 in utf8
-		return true;
-	if (!m_source.isPastEndOfInput(2) && uint8_t(m_source.get(0)) == 0xe2 && uint8_t(m_source.get(1)) == 0x80 && (
-		uint8_t(m_source.get(2)) == 0xa8 || uint8_t(m_source.get(2)) == 0xa9
-	))
-		// LS - U+2028, E2 80 A8  in utf8
-		// PS - U+2029, E2 80 A9  in utf8
-		return true;
-	return false;
-}
-
-Token Scanner::scanString(bool const _isUnicode)
-{
-	size_t startPosition = m_source.position();
-	char const quote = m_char;
-	advance();  // consume quote
-	LiteralScope literal(this, LITERAL_TYPE_STRING);
-	while (m_char != quote && !isSourcePastEndOfInput() && !isUnicodeLinebreak())
-	{
-		char c = m_char;
-		advance();
-		if (c == '\\')
-		{
-			if (isSourcePastEndOfInput() || !scanEscape())
-				return setError(ScannerError::IllegalEscapeSequence);
-		}
-		else
-		{
-			// Report error on non-printable characters in string literals, however
-			// allow anything for unicode string literals, because their validity will
-			// be verified later (in the syntax checker).
-			//
-			// We are using a manual range and not isprint() to avoid
-			// any potential complications with locale.
-			if (!_isUnicode && (static_cast<unsigned>(c) <= 0x1f || static_cast<unsigned>(c) >= 0x7f))
-			{
-				if (m_kind == ScannerKind::Yul)
-					return setError(ScannerError::IllegalCharacterInString);
-				return setError(ScannerError::UnicodeCharacterInNonUnicodeString);
-			}
-			addLiteralChar(c);
-		}
-	}
-	if (m_char != quote)
-		return setError(ScannerError::IllegalStringEndQuote);
-
-	if (_isUnicode)
-	{
-		ScannerError unicodeDirectionError = validateBiDiMarkup(m_source, startPosition);
-		if (unicodeDirectionError != ScannerError::NoError)
-			return setError(unicodeDirectionError);
-	}
-
-	literal.complete();
-	advance();  // consume quote
-	return _isUnicode ? Token::UnicodeStringLiteral : Token::StringLiteral;
-}
-
-Token Scanner::scanHexString()
-{
-	char const quote = m_char;
-	advance();  // consume quote
-	LiteralScope literal(this, LITERAL_TYPE_STRING);
-	bool allowUnderscore = false;
-	while (m_char != quote && !isSourcePastEndOfInput())
-	{
-		char c = m_char;
-
-		if (scanHexByte(c))
-		{
-			addLiteralChar(c);
-			allowUnderscore = true;
-		}
-		else if (c == '_')
-		{
-			advance();
-			if (!allowUnderscore || m_char == quote)
-				return setError(ScannerError::IllegalNumberSeparator);
-			allowUnderscore = false;
-		}
-		else
-			return setError(ScannerError::IllegalHexString);
-	}
-
-	if (m_char != quote)
-		return setError(ScannerError::IllegalStringEndQuote);
-
-	literal.complete();
-	advance();  // consume quote
-	return Token::HexStringLiteral;
-}
-
-// Parse for regex [:digit:]+(_[:digit:]+)*
-void Scanner::scanDecimalDigits()
-{
-	// MUST begin with a decimal digit.
-	if (!isDecimalDigit(m_char))
-		return;
-
-	// May continue with decimal digit or underscore for grouping.
-	do
-		addLiteralCharAndAdvance();
-	while (!m_source.isPastEndOfInput() && (isDecimalDigit(m_char) || m_char == '_'));
-
-	// Defer further validation of underscore to SyntaxChecker.
-}
-
-Token Scanner::scanNumber(char _charSeen)
-{
-	enum { DECIMAL, HEX, BINARY } kind = DECIMAL;
-	LiteralScope literal(this, LITERAL_TYPE_NUMBER);
-	if (_charSeen == '.')
-	{
-		// we have already seen a decimal point of the float
-		addLiteralChar('.');
-		if (m_char == '_')
-			return setError(ScannerError::IllegalToken);
-		scanDecimalDigits();  // we know we have at least one digit
-	}
-	else
-	{
-		solAssert(_charSeen == 0, "");
-		// if the first character is '0' we must check for octals and hex
-		if (m_char == '0')
-		{
-			addLiteralCharAndAdvance();
-			// either 0, 0exxx, 0Exxx, 0.xxx or a hex number
-			if (m_char == 'x')
-			{
-				// hex number
-				kind = HEX;
-				addLiteralCharAndAdvance();
-				if (!isHexDigit(m_char))
-					return setError(ScannerError::IllegalHexDigit); // we must have at least one hex digit after 'x'
-
-				while (isHexDigit(m_char) || m_char == '_') // We keep the underscores for later validation
-					addLiteralCharAndAdvance();
-			}
-			else if (isDecimalDigit(m_char))
-				// We do not allow octal numbers
-				return setError(ScannerError::OctalNotAllowed);
-		}
-		// Parse decimal digits and allow trailing fractional part.
-		if (kind == DECIMAL)
-		{
-			scanDecimalDigits();  // optional
-			if (m_char == '.')
-			{
-				if (!m_source.isPastEndOfInput(1) && m_source.get(1) == '_')
-				{
-					// Assume the input may be a floating point number with leading '_' in fraction part.
-					// Recover by consuming it all but returning `Illegal` right away.
-					addLiteralCharAndAdvance(); // '.'
-					addLiteralCharAndAdvance(); // '_'
-					scanDecimalDigits();
-				}
-				if (m_source.isPastEndOfInput() || !isDecimalDigit(m_source.get(1)))
-				{
-					// A '.' has to be followed by a number.
-					literal.complete();
-					return Token::Number;
-				}
-				addLiteralCharAndAdvance();
-				scanDecimalDigits();
-			}
-		}
-	}
-	// scan exponent, if any
-	if (m_char == 'e' || m_char == 'E')
-	{
-		solAssert(kind != HEX, "'e'/'E' must be scanned as part of the hex number");
-		if (kind != DECIMAL)
-			return setError(ScannerError::IllegalExponent);
-		else if (!m_source.isPastEndOfInput(1) && m_source.get(1) == '_')
-		{
-			// Recover from wrongly placed underscore as delimiter in literal with scientific
-			// notation by consuming until the end.
-			addLiteralCharAndAdvance(); // 'e'
-			addLiteralCharAndAdvance(); // '_'
-			scanDecimalDigits();
-			literal.complete();
-			return Token::Number;
-		}
-		// scan exponent
-		addLiteralCharAndAdvance(); // 'e' | 'E'
-		if (m_char == '+' || m_char == '-')
-			addLiteralCharAndAdvance();
-		if (!isDecimalDigit(m_char)) // we must have at least one decimal digit after 'e'/'E'
-			return setError(ScannerError::IllegalExponent);
-		scanDecimalDigits();
-	}
-	// The source character immediately following a numeric literal must
-	// not be an identifier start or a decimal digit; see ECMA-262
-	// section 7.8.3, page 17 (note that we read only one decimal digit
-	// if the value is 0).
-	if (isDecimalDigit(m_char) || isIdentifierStart(m_char))
-		return setError(ScannerError::IllegalNumberEnd);
-	literal.complete();
-	return Token::Number;
-}
-
-std::tuple<Token, unsigned, unsigned> Scanner::scanIdentifierOrKeyword()
-{
-	solAssert(isIdentifierStart(m_char), "");
-	LiteralScope literal(this, LITERAL_TYPE_STRING);
-	addLiteralCharAndAdvance();
-	// Scan the rest of the identifier characters.
-	while (isIdentifierPart(m_char) || (m_char == '.' && m_kind == ScannerKind::Yul))
-		addLiteralCharAndAdvance();
-	literal.complete();
-
-	auto const token = TokenTraits::fromIdentifierOrKeyword(m_tokens[NextNext].literal);
-	switch (m_kind)
-	{
-	case ScannerKind::Solidity:
-		// Turn experimental Solidity keywords that are not keywords in legacy Solidity into identifiers.
-		if (TokenTraits::isExperimentalSolidityOnlyKeyword(std::get<0>(token)))
-			return std::make_tuple(Token::Identifier, 0, 0);
-		break;
-	case ScannerKind::Yul:
-		// Turn Solidity identifier into a Yul keyword
-		if (m_tokens[NextNext].literal == "leave")
-			return std::make_tuple(Token::Leave, 0, 0);
-		// Turn non-Yul keywords into identifiers.
-		if (!TokenTraits::isYulKeyword(std::get<0>(token)))
-			return std::make_tuple(Token::Identifier, 0, 0);
-		break;
-	case ScannerKind::ExperimentalSolidity:
-		// Turn legacy Solidity keywords that are not keywords in experimental Solidity into identifiers.
-		if (!TokenTraits::isExperimentalSolidityKeyword(std::get<0>(token)))
-			return std::make_tuple(Token::Identifier, 0, 0);
-		break;
-	}
-	return token;
-}
-
-} // namespace solidity::langutil
diff --git a/liblangutil/Scanner.h b/liblangutil/Scanner.h
deleted file mode 100644
index eaa2b3b54d1e..000000000000
--- a/liblangutil/Scanner.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * This file is part of solidity.
- *
- * solidity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * solidity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is derived from the file "scanner.h", which was part of the
- * V8 project. The original copyright header follows:
- *
- * Copyright 2006-2012, the V8 project authors. All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- * * Neither the name of Google Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity scanner.
- */
-
-#pragma once
-
-#include <liblangutil/Token.h>
-#include <liblangutil/CharStream.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <optional>
-#include <iosfwd>
-
-namespace solidity::langutil
-{
-
-class AstRawString;
-class AstValueFactory;
-class ParserRecorder;
-
-enum class ScannerKind
-{
-	Solidity,
-	Yul,
-	ExperimentalSolidity
-};
-
-enum class ScannerError
-{
-	NoError,
-
-	IllegalToken,
-	IllegalHexString,
-	IllegalHexDigit,
-	IllegalCommentTerminator,
-	IllegalEscapeSequence,
-	UnicodeCharacterInNonUnicodeString,
-	IllegalCharacterInString,
-	IllegalStringEndQuote,
-	IllegalNumberSeparator,
-	IllegalExponent,
-	IllegalNumberEnd,
-
-	DirectionalOverrideUnderflow,
-	DirectionalOverrideMismatch,
-
-	OctalNotAllowed,
-};
-
-std::string to_string(ScannerError _errorCode);
-std::ostream& operator<<(std::ostream& os, ScannerError _errorCode);
-
-class Scanner
-{
-	friend class LiteralScope;
-public:
-	explicit Scanner(CharStream& _source):
-		m_source(_source),
-		m_sourceName{std::make_shared<std::string>(_source.name())}
-	{
-		reset();
-	}
-
-	/// Resets scanner to the start of input.
-	void reset();
-
-	/// Changes the scanner mode.
-	void setScannerMode(ScannerKind _kind)
-	{
-		m_kind = _kind;
-
-		// Invalidate lookahead buffer.
-		rescan();
-	}
-
-	CharStream const& charStream() const noexcept { return m_source; }
-
-	/// @returns the next token and advances input
-	Token next();
-
-	/// Set scanner to a specific offset. This is used in error recovery.
-	void setPosition(size_t _offset);
-
-	///@{
-	///@name Information about the current token
-
-	/// @returns the current token
-	Token currentToken() const
-	{
-		return m_tokens[Current].token;
-	}
-	ElementaryTypeNameToken currentElementaryTypeNameToken() const
-	{
-		unsigned firstSize;
-		unsigned secondSize;
-		std::tie(firstSize, secondSize) = m_tokens[Current].extendedTokenInfo;
-		return ElementaryTypeNameToken(m_tokens[Current].token, firstSize, secondSize);
-	}
-
-	SourceLocation currentLocation() const { return m_tokens[Current].location; }
-	std::string const& currentLiteral() const { return m_tokens[Current].literal; }
-	std::tuple<unsigned, unsigned> const& currentTokenInfo() const { return m_tokens[Current].extendedTokenInfo; }
-
-	/// Retrieves the last error that occurred during lexical analysis.
-	/// @note If no error occurred, the value is undefined.
-	ScannerError currentError() const noexcept { return m_tokens[Current].error; }
-	///@}
-
-	///@{
-	///@name Information about the current comment token
-
-	SourceLocation currentCommentLocation() const { return m_skippedComments[Current].location; }
-	std::string const& currentCommentLiteral() const { return m_skippedComments[Current].literal; }
-	/// Called by the parser during FunctionDefinition parsing to clear the current comment
-	void clearCurrentCommentLiteral() { m_skippedComments[Current].literal.clear(); }
-
-	ScannerKind scannerKind() const { return m_kind; }
-
-	///@}
-
-	///@{
-	///@name Information about the next token
-
-	/// @returns the next token without advancing input.
-	Token peekNextToken() const { return m_tokens[Next].token; }
-	SourceLocation peekLocation() const { return m_tokens[Next].location; }
-	std::string const& peekLiteral() const { return m_tokens[Next].literal; }
-
-	Token peekNextNextToken() const { return m_tokens[NextNext].token; }
-	///@}
-
-private:
-
-	inline Token setError(ScannerError _error) noexcept
-	{
-		m_tokens[NextNext].error = _error;
-		return Token::Illegal;
-	}
-
-	/// Used for the current and look-ahead token and comments
-	struct TokenDesc
-	{
-		Token token;
-		SourceLocation location;
-		std::string literal;
-		ScannerError error = ScannerError::NoError;
-		std::tuple<unsigned, unsigned> extendedTokenInfo;
-	};
-
-	///@{
-	///@name Literal buffer support
-	inline void addLiteralChar(char c) { m_tokens[NextNext].literal.push_back(c); }
-	inline void addCommentLiteralChar(char c) { m_skippedComments[NextNext].literal.push_back(c); }
-	inline void addLiteralCharAndAdvance() { addLiteralChar(m_char); advance(); }
-	void addUnicodeAsUTF8(unsigned codepoint);
-	///@}
-
-	bool advance() { m_char = m_source.advanceAndGet(); return !m_source.isPastEndOfInput(); }
-	void rollback(size_t _amount) { m_char = m_source.rollback(_amount); }
-	/// Rolls back to the start of the current token and re-runs the scanner.
-	void rescan();
-
-	inline Token selectErrorToken(ScannerError _err) { advance(); return setError(_err); }
-	inline Token selectToken(Token _tok) { advance(); return _tok; }
-	/// If the next character is _next, advance and return _then, otherwise return _else.
-	inline Token selectToken(char _next, Token _then, Token _else);
-
-	bool scanHexByte(char& o_scannedByte);
-	std::optional<unsigned> scanUnicode();
-
-	/// Scans a single Solidity token.
-	void scanToken();
-
-	/// Skips all whitespace and @returns true if something was skipped.
-	bool skipWhitespace();
-	/// Skips all whitespace that are neither '\r' nor '\n'.
-	bool skipWhitespaceExceptUnicodeLinebreak();
-	Token skipSingleLineComment();
-	Token skipMultiLineComment();
-
-	/// Tests if current source position is CR, LF or CRLF.
-	bool atEndOfLine() const;
-
-	/// Tries to consume CR, LF or CRLF line terminators and returns success or failure.
-	bool tryScanEndOfLine();
-
-	void scanDecimalDigits();
-	Token scanNumber(char _charSeen = 0);
-	std::tuple<Token, unsigned, unsigned> scanIdentifierOrKeyword();
-
-	Token scanString(bool const _isUnicode);
-	Token scanHexString();
-	/// Scans a single line comment and returns its corrected end position.
-	size_t scanSingleLineDocComment();
-	Token scanMultiLineDocComment();
-	/// Scans a slash '/' and depending on the characters returns the appropriate token
-	Token scanSlash();
-
-	/// Scans an escape-sequence which is part of a string and adds the
-	/// decoded character to the current literal. Returns true if a pattern
-	/// is scanned.
-	bool scanEscape();
-
-	/// @returns true iff we are currently positioned at a unicode line break.
-	bool isUnicodeLinebreak();
-
-	/// Return the current source position.
-	size_t sourcePos() const { return m_source.position(); }
-	bool isSourcePastEndOfInput() const { return m_source.isPastEndOfInput(); }
-
-	enum TokenIndex { Current, Next, NextNext };
-
-	TokenDesc m_skippedComments[3] = {}; // desc for the current, next and nextnext skipped comment
-	TokenDesc m_tokens[3] = {}; // desc for the current, next and nextnext token
-
-	CharStream& m_source;
-	std::shared_ptr<std::string const> m_sourceName;
-
-	ScannerKind m_kind = ScannerKind::Solidity;
-
-	/// one character look-ahead, equals 0 at end of input
-	char m_char;
-};
-
-}
diff --git a/liblangutil/SemVerHandler.cpp b/liblangutil/SemVerHandler.cpp
deleted file mode 100644
index 2358eec5ef0d..000000000000
--- a/liblangutil/SemVerHandler.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <chris@ethereum.org>
- * @date 2016
- * Utilities to handle semantic versioning.
- */
-
-#include <liblangutil/SemVerHandler.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <functional>
-#include <limits>
-#include <fmt/format.h>
-
-using namespace std::string_literals;
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-
-SemVerMatchExpressionParser::SemVerMatchExpressionParser(std::vector<Token> _tokens, std::vector<std::string> _literals):
-	m_tokens(std::move(_tokens)), m_literals(std::move(_literals))
-{
-	solAssert(m_tokens.size() == m_literals.size(), "");
-}
-
-SemVerVersion::SemVerVersion(std::string const& _versionString)
-{
-	auto i = _versionString.begin();
-	auto end = _versionString.end();
-
-	for (unsigned level = 0; level < 3; ++level)
-	{
-		unsigned v = 0;
-		for (; i != end && '0' <= *i && *i <= '9'; ++i)
-			v = v * 10 + unsigned(*i - '0');
-		numbers[level] = v;
-		if (level < 2)
-		{
-			if (i == end || *i != '.')
-				solThrow(SemVerError, "Invalid versionString: "s + _versionString);
-			else
-				++i;
-		}
-	}
-	if (i != end && *i == '-')
-	{
-		auto prereleaseStart = ++i;
-		while (i != end && *i != '+') ++i;
-		prerelease = std::string(prereleaseStart, i);
-	}
-	if (i != end && *i == '+')
-	{
-		auto buildStart = ++i;
-		while (i != end) ++i;
-		build = std::string(buildStart, i);
-	}
-	if (i != end)
-		solThrow(SemVerError, "Invalid versionString "s + _versionString);
-}
-
-bool SemVerMatchExpression::MatchComponent::matches(SemVerVersion const& _version) const
-{
-	if (prefix == Token::BitNot)
-	{
-		MatchComponent comp = *this;
-
-		comp.prefix = Token::GreaterThanOrEqual;
-		if (!comp.matches(_version))
-			return false;
-
-		if (levelsPresent >= 2)
-			comp.levelsPresent = 2;
-		else
-			comp.levelsPresent = 1;
-		comp.prefix = Token::LessThanOrEqual;
-		return comp.matches(_version);
-	}
-	else if (prefix == Token::BitXor)
-	{
-		MatchComponent comp = *this;
-
-		comp.prefix = Token::GreaterThanOrEqual;
-		if (!comp.matches(_version))
-			return false;
-
-		if (comp.version.numbers[0] == 0 && comp.levelsPresent != 1)
-			comp.levelsPresent = 2;
-		else
-			comp.levelsPresent = 1;
-		comp.prefix = Token::LessThanOrEqual;
-		return comp.matches(_version);
-	}
-	else
-	{
-		int cmp = 0;
-		bool didCompare = false;
-		for (unsigned i = 0; i < levelsPresent && cmp == 0; i++)
-			if (version.numbers[i] != std::numeric_limits<unsigned>::max())
-			{
-				didCompare = true;
-				cmp = static_cast<int>(_version.numbers[i] - version.numbers[i]);
-			}
-
-		if (cmp == 0 && !_version.prerelease.empty() && didCompare)
-			cmp = -1;
-
-		switch (prefix)
-		{
-		case Token::Assign:
-			return cmp == 0;
-		case Token::LessThan:
-			return cmp < 0;
-		case Token::LessThanOrEqual:
-			return cmp <= 0;
-		case Token::GreaterThan:
-			return cmp > 0;
-		case Token::GreaterThanOrEqual:
-			return cmp >= 0;
-		default:
-			solAssert(false, "Invalid SemVer expression");
-		}
-		return false;
-	}
-}
-
-bool SemVerMatchExpression::Conjunction::matches(SemVerVersion const& _version) const
-{
-	for (auto const& component: components)
-		if (!component.matches(_version))
-			return false;
-	return true;
-}
-
-bool SemVerMatchExpression::matches(SemVerVersion const& _version) const
-{
-	if (!isValid())
-		return false;
-	for (auto const& range: m_disjunction)
-		if (range.matches(_version))
-			return true;
-	return false;
-}
-
-SemVerMatchExpression SemVerMatchExpressionParser::parse()
-{
-	reset();
-
-	if (m_tokens.empty())
-		solThrow(SemVerError, "Empty version pragma.");
-
-	try
-	{
-		while (true)
-		{
-			parseMatchExpression();
-			if (m_pos >= m_tokens.size())
-				break;
-			if (currentToken() != Token::Or)
-			{
-				solThrow(
-					SemVerError,
-					"You can only combine version ranges using the || operator."
-				);
-			}
-			nextToken();
-		}
-	}
-	catch (SemVerError const& e)
-	{
-		reset();
-		throw e;
-	}
-
-	return m_expression;
-}
-
-
-void SemVerMatchExpressionParser::reset()
-{
-	m_expression = SemVerMatchExpression();
-	m_pos = 0;
-	m_posInside = 0;
-}
-
-void SemVerMatchExpressionParser::parseMatchExpression()
-{
-	// component - component (range)
-	// or component component* (conjunction)
-
-	SemVerMatchExpression::Conjunction range;
-	range.components.push_back(parseMatchComponent());
-	if (currentToken() == Token::Sub)
-	{
-		range.components[0].prefix = Token::GreaterThanOrEqual;
-		nextToken();
-		range.components.push_back(parseMatchComponent());
-		range.components[1].prefix = Token::LessThanOrEqual;
-	}
-	else
-		while (currentToken() != Token::Or && currentToken() != Token::Illegal)
-			range.components.push_back(parseMatchComponent());
-	m_expression.m_disjunction.push_back(range);
-}
-
-SemVerMatchExpression::MatchComponent SemVerMatchExpressionParser::parseMatchComponent()
-{
-	SemVerMatchExpression::MatchComponent component;
-	Token token = currentToken();
-
-	switch (token)
-	{
-	case Token::BitXor:
-	case Token::BitNot:
-	case Token::LessThan:
-	case Token::LessThanOrEqual:
-	case Token::GreaterThan:
-	case Token::GreaterThanOrEqual:
-	case Token::Assign:
-		component.prefix = token;
-		nextToken();
-		break;
-	default:
-		component.prefix = Token::Assign;
-	}
-
-	component.levelsPresent = 0;
-	while (component.levelsPresent < 3)
-	{
-		component.version.numbers[component.levelsPresent] = parseVersionPart();
-		component.levelsPresent++;
-		if (currentChar() == '.')
-			nextChar();
-		else
-			break;
-	}
-	// TODO we do not support pre and build version qualifiers for now in match expressions
-	// (but we do support them in the actual versions)
-	return component;
-}
-
-unsigned SemVerMatchExpressionParser::parseVersionPart()
-{
-	auto startPos = m_pos;
-	char c = currentChar();
-	nextChar();
-	if (c == 'x' || c == 'X' || c == '*')
-		return unsigned(-1);
-	else if (c == '0')
-		return 0;
-	else if ('1' <= c && c <= '9')
-	{
-		auto v = static_cast<unsigned>(c - '0');
-		// If we skip to the next token, the current number is terminated.
-		while (m_pos == startPos && '0' <= currentChar() && currentChar() <= '9')
-		{
-			c = currentChar();
-			if (v * 10 < v || v * 10 + static_cast<unsigned>(c - '0') < v * 10)
-				solThrow(SemVerError, "Integer too large to be used in a version number.");
-			v = v * 10 + static_cast<unsigned>(c - '0');
-			nextChar();
-		}
-		return v;
-	}
-	else if (c == char(-1))
-		solThrow(SemVerError, "Expected version number but reached end of pragma.");
-	else
-		solThrow(
-			SemVerError, fmt::format(
-				"Expected the start of a version number but instead found character '{}'. "
-				"Version number is invalid or the pragma is not terminated with a semicolon.",
-				c
-			)
-		);
-}
-
-char SemVerMatchExpressionParser::currentChar() const
-{
-	if (m_pos >= m_literals.size())
-		return char(-1);
-	if (m_posInside >= m_literals[m_pos].size())
-		return char(-1);
-	return m_literals[m_pos][m_posInside];
-}
-
-char SemVerMatchExpressionParser::nextChar()
-{
-	if (m_pos < m_literals.size())
-	{
-		if (m_posInside + 1 >= m_literals[m_pos].size())
-			nextToken();
-		else
-			++m_posInside;
-	}
-	return currentChar();
-}
-
-Token SemVerMatchExpressionParser::currentToken() const
-{
-	if (m_pos < m_tokens.size())
-		return m_tokens[m_pos];
-	else
-		return Token::Illegal;
-}
-
-void SemVerMatchExpressionParser::nextToken()
-{
-	++m_pos;
-	m_posInside = 0;
-}
diff --git a/liblangutil/SemVerHandler.h b/liblangutil/SemVerHandler.h
deleted file mode 100644
index cf344502eaf1..000000000000
--- a/liblangutil/SemVerHandler.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <chris@ethereum.org>
- * @date 2016
- * Utilities to handle semantic versioning.
- */
-
-#pragma once
-
-#include <liblangutil/Token.h>
-#include <libsolutil/Assertions.h>
-#include <liblangutil/Exceptions.h>
-
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace solidity::langutil
-{
-
-struct SemVerError: public util::Exception
-{
-
-};
-
-#undef major
-#undef minor
-
-struct SemVerVersion
-{
-	unsigned numbers[3];
-	std::string prerelease;
-	std::string build;
-
-	unsigned major() const { return numbers[0]; }
-	unsigned minor() const { return numbers[1]; }
-	unsigned patch() const { return numbers[2]; }
-
-	bool isPrerelease() const { return !prerelease.empty(); }
-
-	explicit SemVerVersion(std::string const& _versionString = "0.0.0");
-};
-
-struct SemVerMatchExpression
-{
-	bool matches(SemVerVersion const& _version) const;
-
-	bool isValid() const { return !m_disjunction.empty(); }
-
-	struct MatchComponent
-	{
-		/// Prefix from < > <= >= ~ ^
-		Token prefix = Token::Illegal;
-		/// Version, where unsigned(-1) in major, minor or patch denotes '*', 'x' or 'X'
-		SemVerVersion version;
-		/// Whether we have 1, 1.2 or 1.2.4
-		unsigned levelsPresent = 1;
-		bool matches(SemVerVersion const& _version) const;
-	};
-
-	struct Conjunction
-	{
-		std::vector<MatchComponent> components;
-		bool matches(SemVerVersion const& _version) const;
-	};
-
-	std::vector<Conjunction> m_disjunction;
-};
-
-class SemVerMatchExpressionParser
-{
-public:
-	SemVerMatchExpressionParser(std::vector<Token> _tokens, std::vector<std::string> _literals);
-
-	/// Returns an expression if it was parsable, or throws a SemVerError otherwise.
-	SemVerMatchExpression parse();
-
-private:
-	void reset();
-
-	void parseMatchExpression();
-	SemVerMatchExpression::MatchComponent parseMatchComponent();
-	unsigned parseVersionPart();
-
-	char currentChar() const;
-	char nextChar();
-	Token currentToken() const;
-	void nextToken();
-
-	std::vector<Token> m_tokens;
-	std::vector<std::string> m_literals;
-
-	unsigned m_pos = 0;
-	unsigned m_posInside = 0;
-
-	SemVerMatchExpression m_expression;
-};
-
-}
diff --git a/liblangutil/SourceLocation.cpp b/liblangutil/SourceLocation.cpp
deleted file mode 100644
index 61fe40f92627..000000000000
--- a/liblangutil/SourceLocation.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <iostream>
-
-using namespace solidity;
-using namespace solidity::langutil;
-
-SourceLocation solidity::langutil::parseSourceLocation(std::string const& _input, std::vector<std::shared_ptr<std::string const>> const& _sourceNames)
-{
-	// Expected input: "start:length:sourceindex"
-	enum SrcElem: size_t { Start, Length, Index };
-
-	std::vector<std::string> pos;
-
-	boost::algorithm::split(pos, _input, boost::is_any_of(":"));
-
-	solAssert(pos.size() == 3, "SourceLocation string must have 3 colon separated numeric fields.");
-	auto const sourceIndex = stoi(pos[Index]);
-
-	astAssert(
-		sourceIndex == -1 || (0 <= sourceIndex && static_cast<size_t>(sourceIndex) < _sourceNames.size()),
-		"'src'-field ill-formatted or src-index too high"
-	);
-
-	int start = stoi(pos[Start]);
-	int end = start + stoi(pos[Length]);
-
-	SourceLocation result{start, end, {}};
-	if (sourceIndex != -1)
-		result.sourceName = _sourceNames.at(static_cast<size_t>(sourceIndex));
-	return result;
-}
-
-std::ostream& solidity::langutil::operator<<(std::ostream& _out, SourceLocation const& _location)
-{
-	if (!_location.isValid())
-		return _out << "NO_LOCATION_SPECIFIED";
-
-	if (_location.sourceName)
-		_out << *_location.sourceName;
-
-	_out << "[" << _location.start << "," << _location.end << "]";
-
-	return _out;
-}
diff --git a/liblangutil/SourceLocation.h b/liblangutil/SourceLocation.h
deleted file mode 100644
index ddb457535676..000000000000
--- a/liblangutil/SourceLocation.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris Karapetsas <lefteris@ethdev.com>
- * @date 2015
- * Represents a location in a source file
- */
-
-#pragma once
-
-#include <iosfwd>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <vector>
-
-namespace solidity::langutil
-{
-
-/**
- * Representation of an interval of source positions.
- * The interval includes start and excludes end.
- */
-struct SourceLocation
-{
-	bool operator==(SourceLocation const& _other) const
-	{
-		return start == _other.start && end == _other.end && equalSources(_other);
-	}
-	bool operator!=(SourceLocation const& _other) const { return !operator==(_other); }
-
-	bool operator<(SourceLocation const& _other) const
-	{
-		if (!sourceName || !_other.sourceName)
-			return std::make_tuple(int(!!sourceName), start, end) < std::make_tuple(int(!!_other.sourceName), _other.start, _other.end);
-		else
-			return std::make_tuple(*sourceName, start, end) < std::make_tuple(*_other.sourceName, _other.start, _other.end);
-	}
-
-	bool contains(SourceLocation const& _other) const
-	{
-		if (!hasText() || !_other.hasText() || !equalSources(_other))
-			return false;
-		return start <= _other.start && _other.end <= end;
-	}
-
-	bool containsOffset(int _pos) const
-	{
-		if (!hasText() || _pos < 0)
-			return false;
-		return start <= _pos && _pos < end;
-	}
-
-	bool intersects(SourceLocation const& _other) const
-	{
-		if (!hasText() || !_other.hasText() || !equalSources(_other))
-			return false;
-		return _other.start < end && start < _other.end;
-	}
-
-	bool equalSources(SourceLocation const& _other) const
-	{
-		if (!!sourceName != !!_other.sourceName)
-			return false;
-		if (sourceName && *sourceName != *_other.sourceName)
-			return false;
-		return true;
-	}
-
-	bool isValid() const { return sourceName || start != -1 || end != -1; }
-
-	bool hasText() const { return sourceName && 0 <= start && start <= end; }
-
-	/// @returns the smallest SourceLocation that contains both @param _a and @param _b.
-	/// Assumes that @param _a and @param _b refer to the same source (exception: if the source of either one
-	/// is unset, the source of the other will be used for the result, even if that is unset as well).
-	/// Invalid start and end positions (with value of -1) are ignored (if start or end are -1 for both @param _a and
-	/// @param _b, then start resp. end of the result will be -1 as well).
-	static SourceLocation smallestCovering(SourceLocation _a, SourceLocation const& _b)
-	{
-		if (!_a.sourceName)
-			_a.sourceName = _b.sourceName;
-
-		if (_a.start < 0)
-			_a.start = _b.start;
-		else if (_b.start >= 0 && _b.start < _a.start)
-			_a.start = _b.start;
-		if (_b.end > _a.end)
-			_a.end = _b.end;
-
-		return _a;
-	}
-
-	int start = -1;
-	int end = -1;
-	std::shared_ptr<std::string const> sourceName;
-};
-
-SourceLocation parseSourceLocation(
-	std::string const& _input,
-	std::vector<std::shared_ptr<std::string const>> const& _sourceNames
-);
-
-/// Stream output for Location (used e.g. in boost exceptions).
-std::ostream& operator<<(std::ostream& _out, SourceLocation const& _location);
-
-
-/**
- * Alternative, line-column-based representation for source locations.
- * Both line and column are zero-based.
- * If used as a range, the second location is considered exclusive.
- * Negative values are invalid.
- */
-struct LineColumn
-{
-	/// Line value, can be between zero and number of `\n` characters in the source file.
-	int line = -1;
-	/// Column value, can be between zero and number of characters in the line (inclusive).
-	int column = -1;
-
-	LineColumn() = default;
-	explicit LineColumn(int _line, int _column): line(_line), column(_column) {}
-};
-
-
-}
diff --git a/liblangutil/SourceReferenceExtractor.cpp b/liblangutil/SourceReferenceExtractor.cpp
deleted file mode 100644
index 9389a77aa695..000000000000
--- a/liblangutil/SourceReferenceExtractor.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <liblangutil/SourceReferenceExtractor.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/CharStream.h>
-
-#include <algorithm>
-#include <cmath>
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::langutil;
-
-SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
-	CharStreamProvider const& _charStreamProvider,
-	util::Exception const& _exception,
-	std::variant<Error::Type, Error::Severity> _typeOrSeverity
-)
-{
-	SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(_exception);
-
-	std::string const* message = boost::get_error_info<util::errinfo_comment>(_exception);
-	SourceReference primary = extract(_charStreamProvider, location, message ? *message : "");
-
-	std::vector<SourceReference> secondary;
-	auto secondaryLocation = boost::get_error_info<errinfo_secondarySourceLocation>(_exception);
-	if (secondaryLocation && !secondaryLocation->infos.empty())
-		for (auto const& info: secondaryLocation->infos)
-			secondary.emplace_back(extract(_charStreamProvider, &info.second, info.first));
-
-	return Message{std::move(primary), _typeOrSeverity, std::move(secondary), std::nullopt};
-}
-
-SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
-	CharStreamProvider const& _charStreamProvider,
-	Error const& _error,
-	std::variant<Error::Type, Error::Severity> _typeOrSeverity
-)
-{
-	Message message = extract(_charStreamProvider, static_cast<util::Exception>(_error), _typeOrSeverity);
-	message.errorId = _error.errorId();
-	return message;
-}
-
-SourceReference SourceReferenceExtractor::extract(
-	CharStreamProvider const& _charStreamProvider,
-	SourceLocation const* _location,
-	std::string message
-)
-{
-	if (!_location || !_location->sourceName) // Nothing we can extract here
-		return SourceReference::MessageOnly(std::move(message));
-
-	if (!_location->hasText()) // No source text, so we can only extract the source name
-		return SourceReference::MessageOnly(std::move(message), *_location->sourceName);
-
-	CharStream const& charStream = _charStreamProvider.charStream(*_location->sourceName);
-
-	LineColumn const interest = charStream.translatePositionToLineColumn(_location->start);
-	LineColumn start = interest;
-	LineColumn end = charStream.translatePositionToLineColumn(_location->end);
-	bool const isMultiline = start.line != end.line;
-
-	std::string line = charStream.lineAtPosition(_location->start);
-
-	int locationLength =
-		isMultiline ?
-			int(line.length()) - start.column :
-			end.column - start.column;
-
-	if (locationLength > 150)
-	{
-		auto const lhs = static_cast<size_t>(start.column) + 35;
-		std::string::size_type const rhs = (isMultiline ? line.length() : static_cast<size_t>(end.column)) - 35;
-		line = line.substr(0, lhs) + " ... " + line.substr(rhs);
-		end.column = start.column + 75;
-		locationLength = 75;
-	}
-
-	if (line.length() > 150)
-	{
-		int const len = static_cast<int>(line.length());
-		line = line.substr(
-			static_cast<size_t>(std::max(0, start.column - 35)),
-			static_cast<size_t>(std::min(start.column, 35)) + static_cast<size_t>(
-				std::min(locationLength + 35, len - start.column)
-			)
-		);
-		if (start.column + locationLength + 35 < len)
-			line += " ...";
-		if (start.column > 35)
-		{
-			line = " ... " + line;
-			start.column = 40;
-		}
-		end.column = start.column + static_cast<int>(locationLength);
-	}
-
-	return SourceReference{
-		std::move(message),
-		*_location->sourceName,
-		interest,
-		isMultiline,
-		line,
-		std::min(start.column, static_cast<int>(line.length())),
-		std::min(end.column, static_cast<int>(line.length()))
-	};
-}
diff --git a/liblangutil/SourceReferenceExtractor.h b/liblangutil/SourceReferenceExtractor.h
deleted file mode 100644
index 3f7751f0b570..000000000000
--- a/liblangutil/SourceReferenceExtractor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-
-#include <iosfwd>
-#include <optional>
-#include <string>
-#include <tuple>
-#include <vector>
-#include <variant>
-
-namespace solidity::langutil
-{
-
-class CharStreamProvider;
-
-struct SourceReference
-{
-	std::string message;      ///< A message that relates to this source reference (such as a warning, info or an error message).
-	std::string sourceName;   ///< Underlying source name (for example the filename).
-	LineColumn position;      ///< Actual (error) position this source reference is surrounding.
-	bool multiline = {false}; ///< Indicates whether the actual SourceReference is truncated to one line.
-	std::string text;         ///< Extracted source code text (potentially truncated if multiline or too long).
-	int startColumn = {-1};   ///< Highlighting range-start of text field.
-	int endColumn = {-1};     ///< Highlighting range-end of text field.
-
-	/// Constructs a SourceReference containing a message only.
-	static SourceReference MessageOnly(std::string _msg, std::string _sourceName = {})
-	{
-		SourceReference sref;
-		sref.message = std::move(_msg);
-		sref.sourceName = std::move(_sourceName);
-		return sref;
-	}
-};
-
-namespace SourceReferenceExtractor
-{
-	struct Message
-	{
-		SourceReference primary;
-		std::variant<Error::Type, Error::Severity> _typeOrSeverity;
-		std::vector<SourceReference> secondary;
-		std::optional<ErrorId> errorId;
-	};
-
-	Message extract(
-		CharStreamProvider const& _charStreamProvider,
-		util::Exception const& _exception,
-		std::variant<Error::Type, Error::Severity> _typeOrSeverity
-	);
-	Message extract(
-		CharStreamProvider const& _charStreamProvider,
-		Error const& _error,
-		std::variant<Error::Type, Error::Severity> _typeOrSeverity
-	);
-	Message extract(CharStreamProvider const& _charStreamProvider, Error const& _error);
-	SourceReference extract(CharStreamProvider const& _charStreamProvider, SourceLocation const* _location, std::string message = "");
-}
-
-}
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
deleted file mode 100644
index c48cb328d5f9..000000000000
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Formatting functions for errors referencing positions and locations in the source.
- */
-
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/CharStream.h>
-#include <liblangutil/CharStreamProvider.h>
-#include <libsolutil/UTF8.h>
-#include <iomanip>
-#include <string_view>
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::util::formatting;
-
-namespace
-{
-
-std::string replaceNonTabs(std::string_view _utf8Input, char _filler)
-{
-	std::string output;
-	for (char const c: _utf8Input)
-		if ((c & 0xc0) != 0x80)
-			output.push_back(c == '\t' ? '\t' : _filler);
-	return output;
-}
-
-}
-
-std::string SourceReferenceFormatter::formatErrorInformation(Error const& _error, CharStream const& _charStream)
-{
-	return formatErrorInformation(
-		_error,
-		SingletonCharStreamProvider(_charStream)
-	);
-}
-
-char const* SourceReferenceFormatter::errorTextColor(Error::Severity _severity)
-{
-	switch (_severity)
-	{
-	case Error::Severity::Error: return RED;
-	case Error::Severity::Warning: return YELLOW;
-	case Error::Severity::Info: return WHITE;
-	}
-	util::unreachable();
-}
-
-char const* SourceReferenceFormatter::errorHighlightColor(Error::Severity _severity)
-{
-	switch (_severity)
-	{
-	case Error::Severity::Error: return RED_BACKGROUND;
-	case Error::Severity::Warning: return ORANGE_BACKGROUND_256;
-	case Error::Severity::Info: return GRAY_BACKGROUND;
-	}
-	util::unreachable();
-}
-
-AnsiColorized SourceReferenceFormatter::normalColored() const
-{
-	return AnsiColorized(m_stream, m_colored, {WHITE});
-}
-
-AnsiColorized SourceReferenceFormatter::frameColored() const
-{
-	return AnsiColorized(m_stream, m_colored, {BOLD, BLUE});
-}
-
-AnsiColorized SourceReferenceFormatter::errorColored(std::ostream& _stream, bool _colored, Error::Severity _severity)
-{
-	return AnsiColorized(_stream, _colored, {BOLD, errorTextColor(_severity)});
-}
-
-AnsiColorized SourceReferenceFormatter::messageColored(std::ostream& _stream, bool _colored)
-{
-	return AnsiColorized(_stream, _colored, {BOLD, WHITE});
-}
-
-AnsiColorized SourceReferenceFormatter::secondaryColored() const
-{
-	return AnsiColorized(m_stream, m_colored, {BOLD, CYAN});
-}
-
-AnsiColorized SourceReferenceFormatter::highlightColored() const
-{
-	return AnsiColorized(m_stream, m_colored, {YELLOW});
-}
-
-AnsiColorized SourceReferenceFormatter::diagColored() const
-{
-	return AnsiColorized(m_stream, m_colored, {BOLD, YELLOW});
-}
-
-void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
-{
-	if (_ref.sourceName.empty())
-		return; // Nothing we can print here
-
-	if (_ref.position.line < 0)
-	{
-		frameColored() << "-->";
-		m_stream << ' ' << _ref.sourceName << '\n';
-		return; // No line available, nothing else to print
-	}
-
-	std::string line = std::to_string(_ref.position.line + 1); // one-based line number as string
-	std::string leftpad = std::string(line.size(), ' ');
-
-	// line 0: source name
-	m_stream << leftpad;
-	frameColored() << "-->";
-	m_stream << ' ' << _ref.sourceName << ':' << line << ':' << (_ref.position.column + 1) << ":\n";
-
-	std::string_view text = _ref.text;
-
-	if (m_charStreamProvider.charStream(_ref.sourceName).isImportedFromAST())
-		return;
-
-	if (!_ref.multiline)
-	{
-		size_t const locationLength = static_cast<size_t>(_ref.endColumn - _ref.startColumn);
-
-		// line 1:
-		m_stream << leftpad << ' ';
-		frameColored() << '|';
-		m_stream << '\n';
-
-		// line 2:
-		frameColored() << line << " |";
-
-		m_stream << ' ' << text.substr(0, static_cast<size_t>(_ref.startColumn));
-		highlightColored() << text.substr(static_cast<size_t>(_ref.startColumn), locationLength);
-		m_stream << text.substr(static_cast<size_t>(_ref.endColumn)) << '\n';
-
-		// line 3:
-		m_stream << leftpad << ' ';
-		frameColored() << '|';
-
-		m_stream << ' ' << replaceNonTabs(text.substr(0, static_cast<size_t>(_ref.startColumn)), ' ');
-		diagColored() << (
-			locationLength == 0 ?
-			"^" :
-			replaceNonTabs(text.substr(static_cast<size_t>(_ref.startColumn), locationLength), '^')
-		);
-		m_stream << '\n';
-	}
-	else
-	{
-		// line 1:
-		m_stream << leftpad << ' ';
-		frameColored() << '|';
-		m_stream << '\n';
-
-		// line 2:
-		frameColored() << line << " |";
-		m_stream << ' ' << text.substr(0, static_cast<size_t>(_ref.startColumn));
-		highlightColored() << text.substr(static_cast<size_t>(_ref.startColumn)) << '\n';
-
-		// line 3:
-		m_stream << leftpad << ' ';
-		frameColored() << '|';
-		m_stream << ' ' << replaceNonTabs(text.substr(0, static_cast<size_t>(_ref.startColumn)), ' ');
-		diagColored() << "^ (Relevant source part starts here and spans across multiple lines).";
-		m_stream << '\n';
-	}
-}
-
-void SourceReferenceFormatter::printPrimaryMessage(
-	std::ostream& _stream,
-	std::string _message,
-	std::variant<Error::Type, Error::Severity> _typeOrSeverity,
-	std::optional<ErrorId> _errorId,
-	bool _colored,
-	bool _withErrorIds
-)
-{
-	errorColored(_stream, _colored, Error::errorSeverityOrType(_typeOrSeverity)) << Error::formatTypeOrSeverity(_typeOrSeverity);
-
-	if (_withErrorIds && _errorId.has_value())
-		errorColored(_stream, _colored, Error::errorSeverityOrType(_typeOrSeverity)) << " (" << _errorId.value().error << ")";
-
-	messageColored(_stream, _colored) << ": " << _message << '\n';
-}
-
-void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg)
-{
-	printPrimaryMessage(m_stream, _msg.primary.message, _msg._typeOrSeverity, _msg.errorId, m_colored, m_withErrorIds);
-	printSourceLocation(_msg.primary);
-
-	for (auto const& secondary: _msg.secondary)
-	{
-		secondaryColored() << "Note";
-		messageColored() << ":" << (secondary.message.empty() ? "" : (" " + secondary.message)) << '\n';
-		printSourceLocation(secondary);
-	}
-
-	m_stream << '\n';
-}
-
-void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, Error::Type _type)
-{
-	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _type));
-}
-
-void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, Error::Severity _severity)
-{
-	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _severity));
-}
-
-void SourceReferenceFormatter::printErrorInformation(ErrorList const& _errors)
-{
-	for (auto const& error: _errors)
-		printErrorInformation(*error);
-}
-
-void SourceReferenceFormatter::printErrorInformation(Error const& _error)
-{
-	SourceReferenceExtractor::Message message =
-		SourceReferenceExtractor::extract(
-			m_charStreamProvider,
-			_error,
-			Error::errorSeverity(_error.type())
-		);
-	printExceptionInformation(message);
-}
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
deleted file mode 100644
index 7163199deea1..000000000000
--- a/liblangutil/SourceReferenceFormatter.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Formatting functions for errors referencing positions and locations in the source.
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceReferenceExtractor.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <ostream>
-#include <sstream>
-#include <functional>
-
-namespace solidity::langutil
-{
-
-class CharStream;
-class CharStreamProvider;
-struct SourceLocation;
-
-class SourceReferenceFormatter
-{
-public:
-	SourceReferenceFormatter(
-		std::ostream& _stream,
-		CharStreamProvider const& _charStreamProvider,
-		bool _colored,
-		bool _withErrorIds
-	):
-		m_stream(_stream),
-		m_charStreamProvider(_charStreamProvider),
-		m_colored(_colored),
-		m_withErrorIds(_withErrorIds)
-	{}
-
-	// WARNING: Use the xyzErrorInformation() variants over xyzExceptionInformation() when you
-	// do have access to an Error instance. Error is implicitly convertible to util::Exception
-	// but the conversion loses the error ID.
-
-	/// Prints source location if it is given.
-	void printSourceLocation(SourceReference const& _ref);
-	void printExceptionInformation(SourceReferenceExtractor::Message const& _msg);
-	void printExceptionInformation(util::Exception const& _exception, Error::Type _type);
-	void printExceptionInformation(util::Exception const& _exception, Error::Severity _severity);
-	void printErrorInformation(langutil::ErrorList const& _errors);
-	void printErrorInformation(Error const& _error);
-
-	static std::string formatExceptionInformation(
-		util::Exception const& _exception,
-		Error::Type _type,
-		CharStreamProvider const& _charStreamProvider,
-		bool _colored = false
-	)
-	{
-		std::ostringstream errorOutput;
-		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, false /* _withErrorIds */);
-		formatter.printExceptionInformation(_exception, _type);
-		return errorOutput.str();
-	}
-
-	static std::string formatExceptionInformation(
-		util::Exception const& _exception,
-		Error::Severity _severity,
-		CharStreamProvider const& _charStreamProvider,
-		bool _colored = false
-	)
-	{
-		std::ostringstream errorOutput;
-		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, false /* _withErrorIds */);
-		formatter.printExceptionInformation(_exception, _severity);
-		return errorOutput.str();
-	}
-
-	static std::string formatErrorInformation(
-		Error const& _error,
-		CharStreamProvider const& _charStreamProvider,
-		bool _colored = false,
-		bool _withErrorIds = false
-	)
-	{
-		std::ostringstream errorOutput;
-		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
-		formatter.printErrorInformation(_error);
-		return errorOutput.str();
-	}
-
-	static std::string formatErrorInformation(
-		langutil::ErrorList const& _errors,
-		CharStreamProvider const& _charStreamProvider,
-		bool _colored = false,
-		bool _withErrorIds = false
-	)
-	{
-		std::ostringstream errorOutput;
-		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
-		formatter.printErrorInformation(_errors);
-		return errorOutput.str();
-	}
-
-	static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream);
-
-	static void printPrimaryMessage(
-		std::ostream& _stream,
-		std::string _message,
-		std::variant<Error::Type, Error::Severity> _typeOrSeverity,
-		std::optional<ErrorId> _errorId = std::nullopt,
-		bool _colored = false,
-		bool _withErrorIds = false
-	);
-
-	/// The default text color for printing error messages of a given severity in the terminal.
-	/// Assumes a dark background color.
-	static char const* errorTextColor(Error::Severity _severity);
-
-	/// The default background color for highlighting source fragments corresponding to an error
-	/// of a given severity in the terminal. Assumes a light text color.
-	/// @note This is *not* meant to be used for the same text in combination with @a errorTextColor().
-	///       It's an alternative way to highlight it, while preserving the original text color.
-	static char const* errorHighlightColor(Error::Severity _severity);
-
-private:
-	util::AnsiColorized normalColored() const;
-	util::AnsiColorized frameColored() const;
-	util::AnsiColorized errorColored(Error::Severity _severity) const { return errorColored(m_stream, m_colored, _severity); }
-	util::AnsiColorized messageColored() const { return messageColored(m_stream, m_colored); }
-	util::AnsiColorized secondaryColored() const;
-	util::AnsiColorized highlightColored() const;
-	util::AnsiColorized diagColored() const;
-
-	static util::AnsiColorized errorColored(std::ostream& _stream, bool _colored, langutil::Error::Severity _severity);
-	static util::AnsiColorized messageColored(std::ostream& _stream, bool _colored);
-
-private:
-	std::ostream& m_stream;
-	CharStreamProvider const& m_charStreamProvider;
-	bool m_colored;
-	bool m_withErrorIds;
-};
-
-}
diff --git a/liblangutil/Token.cpp b/liblangutil/Token.cpp
deleted file mode 100644
index 8a860791fa45..000000000000
--- a/liblangutil/Token.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2006-2012, the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-//      copyright notice, this list of conditions and the following
-//      disclaimer in the documentation and/or other materials provided
-//      with the distribution.
-//    * Neither the name of Google Inc. nor the names of its
-//      contributors may be used to endorse or promote products derived
-//      from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Modifications as part of solidity under the following license:
-//
-// solidity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// solidity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/Token.h>
-#include <libsolutil/StringUtils.h>
-
-#include <map>
-
-namespace solidity::langutil
-{
-
-Token TokenTraits::AssignmentToBinaryOp(Token op)
-{
-	solAssert(isAssignmentOp(op) && op != Token::Assign, "");
-	return static_cast<Token>(static_cast<int>(op) + (static_cast<int>(Token::BitOr) - static_cast<int>(Token::AssignBitOr)));
-}
-
-std::string ElementaryTypeNameToken::toString(bool const& tokenValue) const
-{
-	std::string name = TokenTraits::toString(m_token);
-	if (tokenValue || (firstNumber() == 0 && secondNumber() == 0))
-		return name;
-	solAssert(name.size() >= 3, "Token name size should be greater than 3. Should not reach here.");
-	if (m_token == Token::FixedMxN || m_token == Token::UFixedMxN)
-		return name.substr(0, name.size() - 3) + std::to_string(m_firstNumber) + "x" + std::to_string(m_secondNumber);
-	else
-		return name.substr(0, name.size() - 1) + std::to_string(m_firstNumber);
-}
-
-void ElementaryTypeNameToken::assertDetails(Token _baseType, unsigned const& _first, unsigned const& _second)
-{
-	solAssert(TokenTraits::isElementaryTypeName(_baseType), "Expected elementary type name: " + std::string(TokenTraits::toString(_baseType)));
-	if (_baseType == Token::BytesM)
-	{
-		solAssert(_second == 0, "There should not be a second size argument to type bytesM.");
-		solAssert(_first <= 32, "No elementary type bytes" + std::to_string(_first) + ".");
-	}
-	else if (_baseType == Token::UIntM || _baseType == Token::IntM)
-	{
-		solAssert(_second == 0, "There should not be a second size argument to type " + std::string(TokenTraits::toString(_baseType)) + ".");
-		solAssert(
-			_first <= 256 && _first % 8 == 0,
-			"No elementary type " + std::string(TokenTraits::toString(_baseType)) + std::to_string(_first) + "."
-		);
-	}
-	else if (_baseType == Token::UFixedMxN || _baseType == Token::FixedMxN)
-	{
-		solAssert(
-			_first >= 8 && _first <= 256 && _first % 8 == 0 && _second <= 80,
-			"No elementary type " + std::string(TokenTraits::toString(_baseType)) + std::to_string(_first) + "x" + std::to_string(_second) + "."
-		);
-	}
-	else
-		solAssert(_first == 0 && _second == 0, "Unexpected size arguments");
-
-	m_token = _baseType;
-	m_firstNumber = _first;
-	m_secondNumber = _second;
-}
-
-namespace TokenTraits
-{
-char const* toString(Token tok)
-{
-	switch (tok)
-	{
-#define T(name, string, precedence) case Token::name: return string;
-		TOKEN_LIST(T, T)
-#undef T
-		default: // Token::NUM_TOKENS:
-			return "";
-	}
-}
-
-char const* name(Token tok)
-{
-#define T(name, string, precedence) #name,
-	static char const* const names[TokenTraits::count()] = { TOKEN_LIST(T, T) };
-#undef T
-
-	solAssert(static_cast<size_t>(tok) < TokenTraits::count(), "");
-	return names[static_cast<size_t>(tok)];
-}
-
-std::string friendlyName(Token tok)
-{
-	char const* ret = toString(tok);
-	if (ret)
-		return std::string(ret);
-
-	ret = name(tok);
-	solAssert(ret != nullptr, "");
-	return std::string(ret);
-}
-
-
-static Token keywordByName(std::string const& _name)
-{
-	// The following macros are used inside TOKEN_LIST and cause non-keyword tokens to be ignored
-	// and keywords to be put inside the keywords variable.
-#define KEYWORD(name, string, precedence) {string, Token::name},
-#define TOKEN(name, string, precedence)
-	static std::map<std::string, Token> const keywords({TOKEN_LIST(TOKEN, KEYWORD)});
-#undef KEYWORD
-#undef TOKEN
-	auto it = keywords.find(_name);
-	return it == keywords.end() ? Token::Identifier : it->second;
-}
-
-bool isYulKeyword(std::string const& _literal)
-{
-	return _literal == "leave" || isYulKeyword(keywordByName(_literal));
-}
-
-std::tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(std::string const& _literal)
-{
-	// Used for `bytesM`, `uintM`, `intM`, `fixedMxN`, `ufixedMxN`.
-	// M/N must be shortest representation. M can never be 0. N can be zero.
-	auto parseSize = [](std::string::const_iterator _begin, std::string::const_iterator _end) -> int
-	{
-		// No number.
-		if (distance(_begin, _end) == 0)
-			return -1;
-
-		// Disallow leading zero.
-		if (distance(_begin, _end) > 1 && *_begin == '0')
-			return -1;
-
-		int ret = 0;
-		for (auto it = _begin; it != _end; it++)
-		{
-			if (*it < '0' || *it > '9')
-				return -1;
-			//  Overflow check. The largest acceptable value is 256 in the callers.
-			if (ret >= 256)
-				return -1;
-			ret *= 10;
-			ret += *it - '0';
-		}
-		return ret;
-	};
-
-	auto positionM = find_if(_literal.begin(), _literal.end(), util::isDigit);
-	if (positionM != _literal.end())
-	{
-		std::string baseType(_literal.begin(), positionM);
-		auto positionX = find_if_not(positionM, _literal.end(), util::isDigit);
-		int m = parseSize(positionM, positionX);
-		Token keyword = keywordByName(baseType);
-		if (keyword == Token::Bytes)
-		{
-			if (0 < m && m <= 32 && positionX == _literal.end())
-				return std::make_tuple(Token::BytesM, m, 0);
-		}
-		else if (keyword == Token::UInt || keyword == Token::Int)
-		{
-			if (0 < m && m <= 256 && m % 8 == 0 && positionX == _literal.end())
-			{
-				if (keyword == Token::UInt)
-					return std::make_tuple(Token::UIntM, m, 0);
-				else
-					return std::make_tuple(Token::IntM, m, 0);
-			}
-		}
-		else if (keyword == Token::UFixed || keyword == Token::Fixed)
-		{
-			if (
-				positionM < positionX &&
-				positionX < _literal.end() &&
-				*positionX == 'x' &&
-				all_of(positionX + 1, _literal.end(), util::isDigit)
-			) {
-				int n = parseSize(positionX + 1, _literal.end());
-				if (
-					8 <= m && m <= 256 && m % 8 == 0 &&
-					0 <= n && n <= 80
-				) {
-					if (keyword == Token::UFixed)
-						return std::make_tuple(Token::UFixedMxN, m, n);
-					else
-						return std::make_tuple(Token::FixedMxN, m, n);
-				}
-			}
-		}
-		return std::make_tuple(Token::Identifier, 0, 0);
-	}
-
-	return std::make_tuple(keywordByName(_literal), 0, 0);
-}
-
-}
-}
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
deleted file mode 100644
index d79c7f193e64..000000000000
--- a/liblangutil/Token.h
+++ /dev/null
@@ -1,433 +0,0 @@
-// Copyright 2006-2012, the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-//      copyright notice, this list of conditions and the following
-//      disclaimer in the documentation and/or other materials provided
-//      with the distribution.
-//    * Neither the name of Google Inc. nor the names of its
-//      contributors may be used to endorse or promote products derived
-//      from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Modifications as part of solidity under the following license:
-//
-// solidity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// solidity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-
-#pragma once
-
-#include <iosfwd>
-#include <string>
-#include <tuple>
-
-namespace solidity::langutil
-{
-
-// TOKEN_LIST takes a list of 3 macros M, all of which satisfy the
-// same signature M(name, string, precedence), where name is the
-// symbolic token name, string is the corresponding syntactic symbol
-// (or nullptr, for literals), and precedence is the precedence (or 0).
-// The parameters are invoked for token categories as follows:
-//
-//   T: Non-keyword tokens
-//   K: Keyword tokens
-
-// IGNORE_TOKEN is a convenience macro that can be supplied as
-// an argument (at any position) for a TOKEN_LIST call. It does
-// nothing with tokens belonging to the respective category.
-
-#define IGNORE_TOKEN(name, string, precedence)
-
-#define TOKEN_LIST(T, K)												\
-	/* End of source indicator. */										\
-	T(EOS, "EOS", 0)													\
-																		\
-	/* Punctuators (ECMA-262, section 7.7, page 15). */				\
-	T(LParen, "(", 0)                                                   \
-	T(RParen, ")", 0)                                                   \
-	T(LBrack, "[", 0)                                                   \
-	T(RBrack, "]", 0)                                                   \
-	T(LBrace, "{", 0)                                                   \
-	T(RBrace, "}", 0)                                                   \
-	T(Colon, ":", 0)                                                    \
-	T(Semicolon, ";", 0)                                                \
-	T(Period, ".", 0)                                                   \
-	T(Conditional, "?", 3)                                              \
-	T(DoubleArrow, "=>", 0)                                             \
-	T(RightArrow, "->", 0)                                              \
-	\
-	/* Assignment operators. */										\
-	/* IsAssignmentOp() relies on this block of enum values being */	\
-	/* contiguous and sorted in the same order!*/						\
-	T(Assign, "=", 2)                                                   \
-	/* The following have to be in exactly the same order as the simple binary operators*/ \
-	T(AssignBitOr, "|=", 2)                                           \
-	T(AssignBitXor, "^=", 2)                                          \
-	T(AssignBitAnd, "&=", 2)                                          \
-	T(AssignShl, "<<=", 2)                                            \
-	T(AssignSar, ">>=", 2)                                            \
-	T(AssignShr, ">>>=", 2)                                           \
-	T(AssignAdd, "+=", 2)                                             \
-	T(AssignSub, "-=", 2)                                             \
-	T(AssignMul, "*=", 2)                                             \
-	T(AssignDiv, "/=", 2)                                             \
-	T(AssignMod, "%=", 2)                                             \
-	\
-	/* Binary operators sorted by precedence. */                       \
-	/* IsBinaryOp() relies on this block of enum values */             \
-	/* being contiguous and sorted in the same order! */               \
-	T(Comma, ",", 1)                                                   \
-	T(Or, "||", 4)                                                     \
-	T(And, "&&", 5)                                                    \
-	T(BitOr, "|", 8)                                                   \
-	T(BitXor, "^", 9)                                                  \
-	T(BitAnd, "&", 10)                                                 \
-	T(SHL, "<<", 11)                                                   \
-	T(SAR, ">>", 11)                                                   \
-	T(SHR, ">>>", 11)                                                  \
-	T(Add, "+", 12)                                                    \
-	T(Sub, "-", 12)                                                    \
-	T(Mul, "*", 13)                                                    \
-	T(Div, "/", 13)                                                    \
-	T(Mod, "%", 13)                                                    \
-	T(Exp, "**", 14)                                                   \
-	\
-	/* Compare operators sorted by precedence. */                      \
-	/* IsCompareOp() relies on this block of enum values */            \
-	/* being contiguous and sorted in the same order! */               \
-	T(Equal, "==", 6)                                                  \
-	T(NotEqual, "!=", 6)                                               \
-	T(LessThan, "<", 7)                                                \
-	T(GreaterThan, ">", 7)                                             \
-	T(LessThanOrEqual, "<=", 7)                                        \
-	T(GreaterThanOrEqual, ">=", 7)                                     \
-	\
-	/* Unary operators. */                                             \
-	/* IsUnaryOp() relies on this block of enum values */              \
-	/* being contiguous and sorted in the same order! */               \
-	T(Not, "!", 0)                                                     \
-	T(BitNot, "~", 0)                                                  \
-	T(Inc, "++", 0)                                                    \
-	T(Dec, "--", 0)                                                    \
-	K(Delete, "delete", 0)                                             \
-	\
-	/* Inline Assembly Operators */                                    \
-	T(AssemblyAssign, ":=", 2)                                         \
-	/* Keywords */                                                     \
-	K(Abstract, "abstract", 0)                                         \
-	K(Anonymous, "anonymous", 0)                                       \
-	K(As, "as", 0)                                                     \
-	K(Assembly, "assembly", 0)                                         \
-	K(Break, "break", 0)                                               \
-	K(Catch, "catch", 0)                                               \
-	K(Constant, "constant", 0)                                         \
-	K(Constructor, "constructor", 0)                                   \
-	K(Continue, "continue", 0)                                         \
-	K(Contract, "contract", 0)                                         \
-	K(Do, "do", 0)                                                     \
-	K(Else, "else", 0)                                                 \
-	K(Enum, "enum", 0)                                                 \
-	K(Emit, "emit", 0)                                                 \
-	K(Event, "event", 0)                                               \
-	K(External, "external", 0)                                         \
-	K(Fallback, "fallback", 0)                                         \
-	K(For, "for", 0)                                                   \
-	K(Function, "function", 0)                                         \
-	K(Hex, "hex", 0)                                                   \
-	K(If, "if", 0)                                                     \
-	K(Indexed, "indexed", 0)                                           \
-	K(Interface, "interface", 0)                                       \
-	K(Internal, "internal", 0)                                         \
-	K(Immutable, "immutable", 0)                                       \
-	K(Import, "import", 0)                                             \
-	K(Is, "is", 0)                                                     \
-	K(Library, "library", 0)                                           \
-	K(Mapping, "mapping", 0)                                           \
-	K(Memory, "memory", 0)                                             \
-	K(Modifier, "modifier", 0)                                         \
-	K(New, "new", 0)                                                   \
-	K(Override, "override", 0)                                         \
-	K(Payable, "payable", 0)                                           \
-	K(Public, "public", 0)                                             \
-	K(Pragma, "pragma", 0)                                             \
-	K(Private, "private", 0)                                           \
-	K(Pure, "pure", 0)                                                 \
-	K(Receive, "receive", 0)                                           \
-	K(Return, "return", 0)                                             \
-	K(Returns, "returns", 0)                                           \
-	K(Storage, "storage", 0)                                           \
-	K(CallData, "calldata", 0)                                         \
-	K(Struct, "struct", 0)                                             \
-	K(Throw, "throw", 0)                                               \
-	K(Try, "try", 0)                                                   \
-	K(Type, "type", 0)                                                 \
-	K(Unchecked, "unchecked", 0)                                       \
-	K(Unicode, "unicode", 0)                                           \
-	K(Using, "using", 0)                                               \
-	K(View, "view", 0)                                                 \
-	K(Virtual, "virtual", 0)                                           \
-	K(While, "while", 0)                                               \
-	\
-	/* Ether subdenominations */                                       \
-	K(SubWei, "wei", 0)                                                \
-	K(SubGwei, "gwei", 0)                                              \
-	K(SubEther, "ether", 0)                                            \
-	K(SubSecond, "seconds", 0)                                         \
-	K(SubMinute, "minutes", 0)                                         \
-	K(SubHour, "hours", 0)                                             \
-	K(SubDay, "days", 0)                                               \
-	K(SubWeek, "weeks", 0)                                             \
-	K(SubYear, "years", 0)                                             \
-	/* type keywords*/                                                 \
-	K(Int, "int", 0)                                                   \
-	K(UInt, "uint", 0)                                                 \
-	K(Bytes, "bytes", 0)                                               \
-	K(String, "string", 0)                                             \
-	K(Address, "address", 0)                                           \
-	K(Bool, "bool", 0)                                                 \
-	K(Fixed, "fixed", 0)                                               \
-	K(UFixed, "ufixed", 0)                                             \
-	T(IntM, "intM", 0)                                                 \
-	T(UIntM, "uintM", 0)                                               \
-	T(BytesM, "bytesM", 0)                                             \
-	T(FixedMxN, "fixedMxN", 0)                                         \
-	T(UFixedMxN, "ufixedMxN", 0)                                       \
-	T(TypesEnd, nullptr, 0) /* used as type enum end marker */         \
-	\
-	/* Literals */                                                     \
-	K(TrueLiteral, "true", 0)                                          \
-	K(FalseLiteral, "false", 0)                                        \
-	T(Number, nullptr, 0)                                              \
-	T(StringLiteral, nullptr, 0)                                       \
-	T(UnicodeStringLiteral, nullptr, 0)                                \
-	T(HexStringLiteral, nullptr, 0)                                    \
-	T(CommentLiteral, nullptr, 0)                                      \
-	\
-	/* Identifiers (not keywords or future reserved words). */         \
-	T(Identifier, nullptr, 0)                                          \
-	\
-	/* Keywords reserved for future use. */                            \
-	K(After, "after", 0)                                               \
-	K(Alias, "alias", 0)                                               \
-	K(Apply, "apply", 0)                                               \
-	K(Auto, "auto", 0)                                                 \
-	K(Byte, "byte", 0)                                                 \
-	K(Case, "case", 0)                                                 \
-	K(CopyOf, "copyof", 0)                                             \
-	K(Default, "default", 0)                                           \
-	K(Define, "define", 0)                                             \
-	K(Final, "final", 0)                                               \
-	K(Implements, "implements", 0)                                     \
-	K(In, "in", 0)                                                     \
-	K(Inline, "inline", 0)                                             \
-	K(Let, "let", 0)                                                   \
-	K(Macro, "macro", 0)                                               \
-	K(Match, "match", 0)                                               \
-	K(Mutable, "mutable", 0)                                           \
-	K(NullLiteral, "null", 0)                                          \
-	K(Of, "of", 0)                                                     \
-	K(Partial, "partial", 0)                                           \
-	K(Promise, "promise", 0)                                           \
-	K(Reference, "reference", 0)                                       \
-	K(Relocatable, "relocatable", 0)                                   \
-	K(Sealed, "sealed", 0)                                             \
-	K(Sizeof, "sizeof", 0)                                             \
-	K(Static, "static", 0)                                             \
-	K(Supports, "supports", 0)                                         \
-	K(Switch, "switch", 0)                                             \
-	K(Typedef, "typedef", 0)                                           \
-	K(TypeOf, "typeof", 0)                                             \
-	K(Var, "var", 0)                                                   \
-	\
-	/* Yul-specific tokens, but not keywords. */                       \
-	T(Leave, "leave", 0)                                               \
-	\
-	T(NonExperimentalEnd, nullptr, 0) /* used as non-experimental enum end marker */ \
-	T(ExperimentalEnd, nullptr, 0) /* used as experimental enum end marker */ \
-	/* Illegal token - not able to scan. */                            \
-	T(Illegal, "ILLEGAL", 0)                                           \
-	\
-	/* Scanner-internal use only. */                                   \
-	T(Whitespace, nullptr, 0)
-
-// All token values.
-// attention! msvc issue:
-// http://stackoverflow.com/questions/9567868/compile-errors-after-adding-v8-to-my-project-c2143-c2059
-// @todo: avoid TOKEN_LIST macro
-enum class Token : unsigned int {
-#define T(name, string, precedence) name,
-	TOKEN_LIST(T, T)
-	NUM_TOKENS
-#undef T
-};
-
-namespace TokenTraits
-{
-	constexpr size_t count() { return static_cast<size_t>(Token::NUM_TOKENS); }
-
-	// Predicates
-	constexpr bool isElementaryTypeName(Token tok) { return Token::Int <= tok && tok < Token::TypesEnd; }
-	constexpr bool isAssignmentOp(Token tok) { return Token::Assign <= tok && tok <= Token::AssignMod; }
-	constexpr bool isBinaryOp(Token op) { return Token::Comma <= op && op <= Token::Exp; }
-	constexpr bool isCommutativeOp(Token op) { return op == Token::BitOr || op == Token::BitXor || op == Token::BitAnd ||
-		op == Token::Add || op == Token::Mul || op == Token::Equal || op == Token::NotEqual; }
-	constexpr bool isArithmeticOp(Token op) { return Token::Add <= op && op <= Token::Exp; }
-	constexpr bool isCompareOp(Token op) { return Token::Equal <= op && op <= Token::GreaterThanOrEqual; }
-
-	constexpr bool isBitOp(Token op) { return (Token::BitOr <= op && op <= Token::BitAnd) || op == Token::BitNot; }
-	constexpr bool isBooleanOp(Token op) { return (Token::Or <= op && op <= Token::And) || op == Token::Not; }
-	constexpr bool isUnaryOp(Token op) { return (Token::Not <= op && op <= Token::Delete) || op == Token::Sub; }
-	constexpr bool isCountOp(Token op) { return op == Token::Inc || op == Token::Dec; }
-	constexpr bool isShiftOp(Token op) { return (Token::SHL <= op) && (op <= Token::SHR); }
-	constexpr bool isVariableVisibilitySpecifier(Token op) { return op == Token::Public || op == Token::Private || op == Token::Internal; }
-	constexpr bool isVisibilitySpecifier(Token op) { return isVariableVisibilitySpecifier(op) || op == Token::External; }
-	constexpr bool isLocationSpecifier(Token op) { return op == Token::Memory || op == Token::Storage || op == Token::CallData; }
-
-	constexpr bool isStateMutabilitySpecifier(Token op)
-	{
-		return op == Token::Pure || op == Token::View || op == Token::Payable;
-	}
-
-	constexpr bool isEtherSubdenomination(Token op) { return op >= Token::SubWei && op <= Token::SubEther; }
-	constexpr bool isTimeSubdenomination(Token op) { return op == Token::SubSecond || op == Token::SubMinute || op == Token::SubHour || op == Token::SubDay || op == Token::SubWeek || op == Token::SubYear; }
-	constexpr bool isReservedKeyword(Token op) { return (Token::After <= op && op <= Token::Var); }
-
-	constexpr bool isYulKeyword(Token tok)
-	{
-		return tok == Token::Function || tok == Token::Let || tok == Token::If || tok == Token::Switch || tok == Token::Case ||
-			tok == Token::Default || tok == Token::For || tok == Token::Break || tok == Token::Continue || tok == Token::Leave ||
-			tok == Token::TrueLiteral || tok == Token::FalseLiteral || tok == Token::HexStringLiteral || tok == Token::Hex;
-	}
-
-	constexpr bool isExperimentalSolidityKeyword(Token token)
-	{
-		return
-			token == Token::Assembly ||
-			token == Token::Contract ||
-			token == Token::External ||
-			token == Token::Fallback ||
-			token == Token::Pragma ||
-			token == Token::Import ||
-			token == Token::As ||
-			token == Token::Function ||
-			token == Token::Let ||
-			token == Token::Return ||
-			token == Token::Type ||
-			token == Token::If ||
-			token == Token::Else ||
-			token == Token::Do ||
-			token == Token::While ||
-			token == Token::For ||
-			token == Token::Continue ||
-			token == Token::Break;
-			// TODO: see isExperimentalSolidityKeyword below
-			// || (token > Token::NonExperimentalEnd && token < Token::ExperimentalEnd);
-	}
-
-	constexpr bool isExperimentalSolidityOnlyKeyword(Token)
-	{
-		// TODO: use token > Token::NonExperimentalEnd && token < Token::ExperimentalEnd
-		// as soon as other experimental tokens are added. For now the comparison generates
-		// a warning from clang because it is always false.
-		return false;
-	}
-
-	bool isYulKeyword(std::string const& _literal);
-
-	Token AssignmentToBinaryOp(Token op);
-
-	// @returns the precedence > 0 for binary and compare
-	// operators; returns 0 otherwise.
-	constexpr int precedence(Token tok)
-	{
-		int8_t constexpr precs[TokenTraits::count()] =
-		{
-			#define T(name, string, precedence) precedence,
-			TOKEN_LIST(T, T)
-			#undef T
-		};
-		return precs[static_cast<size_t>(tok)];
-	}
-
-	constexpr bool hasExpHighestPrecedence()
-	{
-		constexpr int expPrecedence = TokenTraits::precedence(Token::Exp);
-		static_assert(expPrecedence == 14, "Exp precedence changed.");
-
-		#define T(name, string, precedence) ((Token::name == Token::Exp) || precedence < expPrecedence) &&
-		return
-			TOKEN_LIST(T, T)
-			true;
-		#undef T
-	}
-
-	std::tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(std::string const& _literal);
-
-	// @returns a string corresponding to the C++ token name
-	// (e.g. "LT" for the token LT).
-	char const* name(Token tok);
-
-	// @returns a string corresponding to the JS token string
-	// (.e., "<" for the token LT) or nullptr if the token doesn't
-	// have a (unique) string (e.g. an IDENTIFIER).
-	char const* toString(Token tok);
-
-	std::string friendlyName(Token tok);
-}
-
-inline std::ostream& operator<<(std::ostream& os, Token token)
-{
-	os << TokenTraits::friendlyName(token);
-	return os;
-}
-
-class ElementaryTypeNameToken
-{
-public:
-	ElementaryTypeNameToken(Token _token, unsigned const& _firstNumber, unsigned const& _secondNumber)
-	{
-		assertDetails(_token, _firstNumber, _secondNumber);
-	}
-
-	unsigned int firstNumber() const { return m_firstNumber; }
-	unsigned int secondNumber() const { return m_secondNumber; }
-	Token token() const { return m_token; }
-
-	///if tokValue is set to true, then returns the actual token type name, otherwise, returns full type
-	std::string toString(bool const& tokenValue = false) const;
-
-private:
-	Token m_token;
-	unsigned int m_firstNumber;
-	unsigned int m_secondNumber;
-	/// throws if type is not properly sized
-	void assertDetails(Token _baseType, unsigned const& _first, unsigned const& _second);
-};
-
-}
diff --git a/liblangutil/UniqueErrorReporter.h b/liblangutil/UniqueErrorReporter.h
deleted file mode 100644
index 902068b8ffef..000000000000
--- a/liblangutil/UniqueErrorReporter.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Exceptions.h>
-
-namespace solidity::langutil
-{
-
-/*
- * Wrapper for ErrorReporter that removes duplicates.
- * Two errors are considered the same if their error ID and location are the same.
- */
-class UniqueErrorReporter
-{
-public:
-	UniqueErrorReporter(): m_errorReporter(m_uniqueErrors) {}
-
-	void append(UniqueErrorReporter const& _other)
-	{
-		m_errorReporter.append(_other.m_errorReporter.errors());
-	}
-
-	void warning(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-	{
-		if (!seen(_error, _location, _description))
-		{
-			m_errorReporter.warning(_error, _location, _description);
-			markAsSeen(_error, _location, _description);
-		}
-	}
-
-	void warning(
-		ErrorId _error,
-		SourceLocation const& _location,
-		std::string const& _description,
-		SecondarySourceLocation const& _secondaryLocation
-	)
-	{
-		if (!seen(_error, _location, _description))
-		{
-			m_errorReporter.warning(_error, _location, _description, _secondaryLocation);
-			markAsSeen(_error, _location, _description);
-		}
-	}
-
-	void warning(ErrorId _error, std::string const& _description)
-	{
-		m_errorReporter.warning(_error, _description);
-	}
-
-	void info(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-	{
-		if (!seen(_error, _location, _description))
-		{
-			m_errorReporter.info(_error, _location, _description);
-			markAsSeen(_error, _location, _description);
-		}
-	}
-
-	void info(ErrorId _error, std::string const& _description)
-	{
-		m_errorReporter.info(_error, _description);
-	}
-
-	bool seen(ErrorId _error, SourceLocation const& _location, std::string const& _description) const
-	{
-		if (m_seenErrors.count({_error, _location}))
-		{
-			solAssert(m_seenErrors.at({_error, _location}) == _description, "");
-			return true;
-		}
-		return false;
-	}
-
-	void markAsSeen(ErrorId _error, SourceLocation const& _location, std::string const& _description)
-	{
-		if (_location != SourceLocation{})
-			m_seenErrors[{_error, _location}] = _description;
-	}
-
-	ErrorList const& errors() const { return m_errorReporter.errors(); }
-
-	void clear() { m_errorReporter.clear(); }
-
-private:
-	ErrorList m_uniqueErrors;
-	ErrorReporter m_errorReporter;
-	std::map<std::pair<ErrorId, SourceLocation>, std::string> m_seenErrors;
-};
-
-}
diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
deleted file mode 100644
index ef7c56ac0c06..000000000000
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/CHCSmtLib2Interface.h>
-
-#include <libsolutil/Keccak256.h>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <range/v3/view.hpp>
-
-#include <array>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::smtutil;
-
-CHCSmtLib2Interface::CHCSmtLib2Interface(
-	std::map<h256, std::string> const& _queryResponses,
-	ReadCallback::Callback _smtCallback,
-	SMTSolverChoice _enabledSolvers,
-	std::optional<unsigned> _queryTimeout
-):
-	CHCSolverInterface(_queryTimeout),
-	m_smtlib2(std::make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
-	m_queryResponses(std::move(_queryResponses)),
-	m_smtCallback(_smtCallback),
-	m_enabledSolvers(_enabledSolvers)
-{
-	reset();
-}
-
-void CHCSmtLib2Interface::reset()
-{
-	m_accumulatedOutput.clear();
-	m_variables.clear();
-	m_unhandledQueries.clear();
-	m_sortNames.clear();
-}
-
-void CHCSmtLib2Interface::registerRelation(Expression const& _expr)
-{
-	smtAssert(_expr.sort);
-	smtAssert(_expr.sort->kind == Kind::Function);
-	if (!m_variables.count(_expr.name))
-	{
-		auto fSort = std::dynamic_pointer_cast<FunctionSort>(_expr.sort);
-		std::string domain = toSmtLibSort(fSort->domain);
-		// Relations are predicates which have implicit codomain Bool.
-		m_variables.insert(_expr.name);
-		write(
-			"(declare-fun |" +
-			_expr.name +
-			"| " +
-			domain +
-			" Bool)"
-		);
-	}
-}
-
-void CHCSmtLib2Interface::addRule(Expression const& _expr, std::string const& /*_name*/)
-{
-	write(
-		"(assert\n(forall " + forall() + "\n" +
-		m_smtlib2->toSExpr(_expr) +
-		"))\n\n"
-	);
-}
-
-std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
-{
-	std::string query = dumpQuery(_block);
-	std::string response = querySolver(query);
-
-	CheckResult result;
-	// TODO proper parsing
-	if (boost::starts_with(response, "sat"))
-		result = CheckResult::UNSATISFIABLE;
-	else if (boost::starts_with(response, "unsat"))
-		result = CheckResult::SATISFIABLE;
-	else if (boost::starts_with(response, "unknown"))
-		result = CheckResult::UNKNOWN;
-	else
-		result = CheckResult::ERROR;
-
-	return {result, Expression(true), {}};
-}
-
-void CHCSmtLib2Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort);
-	if (_sort->kind == Kind::Function)
-		declareFunction(_name, _sort);
-	else if (!m_variables.count(_name))
-	{
-		m_variables.insert(_name);
-		write("(declare-var |" + _name + "| " + toSmtLibSort(*_sort) + ')');
-	}
-}
-
-std::string CHCSmtLib2Interface::toSmtLibSort(Sort const& _sort)
-{
-	if (!m_sortNames.count(&_sort))
-		m_sortNames[&_sort] = m_smtlib2->toSmtLibSort(_sort);
-	return m_sortNames.at(&_sort);
-}
-
-std::string CHCSmtLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
-{
-	std::string ssort("(");
-	for (auto const& sort: _sorts)
-		ssort += toSmtLibSort(*sort) + " ";
-	ssort += ")";
-	return ssort;
-}
-
-std::string CHCSmtLib2Interface::forall()
-{
-	std::string vars("(");
-	for (auto const& [name, sort]: m_smtlib2->variables())
-	{
-		solAssert(sort, "");
-		if (sort->kind != Kind::Function)
-			vars += " (" + name + " " + toSmtLibSort(*sort) + ")";
-	}
-	vars += ")";
-	return vars;
-}
-
-void CHCSmtLib2Interface::declareFunction(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort);
-	smtAssert(_sort->kind == Kind::Function);
-	// TODO Use domain and codomain as key as well
-	if (!m_variables.count(_name))
-	{
-		auto fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
-		smtAssert(fSort->codomain);
-		std::string domain = toSmtLibSort(fSort->domain);
-		std::string codomain = toSmtLibSort(*fSort->codomain);
-		m_variables.insert(_name);
-		write(
-			"(declare-fun |" +
-			_name +
-			"| " +
-			domain +
-			" " +
-			codomain +
-			")"
-		);
-	}
-}
-
-void CHCSmtLib2Interface::write(std::string _data)
-{
-	m_accumulatedOutput += std::move(_data) + "\n";
-}
-
-std::string CHCSmtLib2Interface::querySolver(std::string const& _input)
-{
-	util::h256 inputHash = util::keccak256(_input);
-	if (m_queryResponses.count(inputHash))
-		return m_queryResponses.at(inputHash);
-
-	smtAssert(m_enabledSolvers.smtlib2 || m_enabledSolvers.eld);
-	if (m_smtCallback)
-	{
-		auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
-		if (result.success)
-			return result.responseOrErrorMessage;
-	}
-
-	m_unhandledQueries.push_back(_input);
-	return "unknown\n";
-}
-
-std::string CHCSmtLib2Interface::dumpQuery(Expression const& _expr)
-{
-	std::stringstream s;
-
-	s
-		<< createHeaderAndDeclarations()
-		<< m_accumulatedOutput << std::endl
-		<< createQueryAssertion(_expr.name) << std::endl
-		<< "(check-sat)" << std::endl;
-
-	return s.str();
-}
-
-std::string CHCSmtLib2Interface::createHeaderAndDeclarations() {
-	std::stringstream s;
-	if (m_queryTimeout)
-		s << "(set-option :timeout " + std::to_string(*m_queryTimeout) + ")\n";
-	s << "(set-logic HORN)" << std::endl;
-
-	for (auto const& decl: m_smtlib2->userSorts() | ranges::views::values)
-		s << decl << std::endl;
-
-	return s.str();
-}
-
-std::string CHCSmtLib2Interface::createQueryAssertion(std::string name) {
-	return "(assert\n(forall " + forall() + "\n" +	"(=> " + name + " false)))";
-}
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
deleted file mode 100644
index 0f3a68ee405d..000000000000
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/**
- * Interface for solving Horn systems via smtlib2.
- */
-
-#pragma once
-
-#include <libsmtutil/CHCSolverInterface.h>
-
-#include <libsmtutil/SMTLib2Interface.h>
-
-namespace solidity::smtutil
-{
-
-class CHCSmtLib2Interface: public CHCSolverInterface
-{
-public:
-	explicit CHCSmtLib2Interface(
-		std::map<util::h256, std::string> const& _queryResponses = {},
-		frontend::ReadCallback::Callback _smtCallback = {},
-		SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
-		std::optional<unsigned> _queryTimeout = {}
-	);
-
-	void reset();
-
-	void registerRelation(Expression const& _expr) override;
-
-	void addRule(Expression const& _expr, std::string const& _name) override;
-
-	/// Takes a function application _expr and checks for reachability.
-	/// @returns solving result, an invariant, and counterexample graph, if possible.
-	std::tuple<CheckResult, Expression, CexGraph> query(Expression const& _expr) override;
-
-	void declareVariable(std::string const& _name, SortPointer const& _sort) override;
-
-	std::string dumpQuery(Expression const& _expr);
-
-	std::vector<std::string> unhandledQueries() const { return m_unhandledQueries; }
-
-	SMTLib2Interface* smtlib2Interface() const { return m_smtlib2.get(); }
-
-private:
-	std::string toSmtLibSort(Sort const& _sort);
-	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
-
-	void writeHeader();
-	std::string forall();
-
-	void declareFunction(std::string const& _name, SortPointer const& _sort);
-
-	void write(std::string _data);
-
-	std::string createQueryAssertion(std::string name);
-	std::string createHeaderAndDeclarations();
-
-	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
-	std::string querySolver(std::string const& _input);
-
-	/// Used to access toSmtLibSort, SExpr, and handle variables.
-	std::unique_ptr<SMTLib2Interface> m_smtlib2;
-
-	std::string m_accumulatedOutput;
-	std::set<std::string> m_variables;
-
-	std::map<util::h256, std::string> const& m_queryResponses;
-	std::vector<std::string> m_unhandledQueries;
-
-	frontend::ReadCallback::Callback m_smtCallback;
-	SMTSolverChoice m_enabledSolvers;
-
-	std::map<Sort const*, std::string> m_sortNames;
-};
-
-}
diff --git a/libsmtutil/CHCSolverInterface.h b/libsmtutil/CHCSolverInterface.h
deleted file mode 100644
index 8385c1c4016e..000000000000
--- a/libsmtutil/CHCSolverInterface.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/**
- * Interface for constrained Horn solvers.
- */
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <map>
-#include <vector>
-
-namespace solidity::smtutil
-{
-
-class CHCSolverInterface
-{
-public:
-	CHCSolverInterface(std::optional<unsigned> _queryTimeout = {}): m_queryTimeout(_queryTimeout) {}
-
-	virtual ~CHCSolverInterface() = default;
-
-	virtual void declareVariable(std::string const& _name, SortPointer const& _sort) = 0;
-
-	/// Takes a function declaration as a relation.
-	virtual void registerRelation(Expression const& _expr) = 0;
-
-	/// Takes an implication and adds as rule.
-	/// Needs to bound all vars as universally quantified.
-	virtual void addRule(Expression const& _expr, std::string const& _name) = 0;
-
-	using CexNode = Expression;
-	struct CexGraph
-	{
-		std::map<unsigned, CexNode> nodes;
-		std::map<unsigned, std::vector<unsigned>> edges;
-	};
-
-	/// Takes a function application _expr and checks for reachability.
-	/// @returns solving result, an invariant, and counterexample graph, if possible.
-	virtual std::tuple<CheckResult, Expression, CexGraph> query(
-		Expression const& _expr
-	) = 0;
-
-protected:
-	std::optional<unsigned> m_queryTimeout;
-};
-
-}
diff --git a/libsmtutil/CMakeLists.txt b/libsmtutil/CMakeLists.txt
deleted file mode 100644
index af7f47b60c04..000000000000
--- a/libsmtutil/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-set(sources
-	CHCSmtLib2Interface.cpp
-	CHCSmtLib2Interface.h
-	Exceptions.h
-	SMTLib2Interface.cpp
-	SMTLib2Interface.h
-	SMTPortfolio.cpp
-	SMTPortfolio.h
-	SolverInterface.h
-	Sorts.cpp
-	Sorts.h
-	Helpers.h
-)
-
-if (${Z3_FOUND})
-  set(z3_SRCS Z3Interface.cpp Z3Interface.h Z3CHCInterface.cpp Z3CHCInterface.h)
-else()
-  set(z3_SRCS)
-endif()
-
-if (${CVC4_FOUND})
-  set(cvc4_SRCS CVC4Interface.cpp CVC4Interface.h)
-else()
-  set(cvc4_SRCS)
-endif()
-
-if (${USE_Z3_DLOPEN})
-  file(GLOB Z3_HEADERS ${Z3_HEADER_PATH}/z3*.h)
-  set(Z3_WRAPPER ${CMAKE_CURRENT_BINARY_DIR}/z3wrapper.cpp)
-  add_custom_command(
-    OUTPUT ${Z3_WRAPPER}
-    COMMAND ${Python3_EXECUTABLE} genz3wrapper.py ${Z3_HEADERS} > ${Z3_WRAPPER}
-    DEPENDS ${Z3_HEADERS} genz3wrapper.py
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  )
-  set(z3_SRCS ${z3_SRCS} ${Z3_WRAPPER} Z3Loader.cpp Z3Loader.h)
-endif()
-
-add_library(smtutil ${sources} ${z3_SRCS} ${cvc4_SRCS})
-target_link_libraries(smtutil PUBLIC solutil Boost::boost)
-
-if (${USE_Z3_DLOPEN})
-  target_include_directories(smtutil PUBLIC ${Z3_HEADER_PATH})
-  target_link_libraries(smtutil PUBLIC ${CMAKE_DL_LIBS})
-elseif (${Z3_FOUND})
-  target_link_libraries(smtutil PUBLIC z3::libz3)
-endif()
-
-if (${CVC4_FOUND})
-  target_link_libraries(smtutil PUBLIC CVC4::CVC4)
-endif()
diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
deleted file mode 100644
index f53c92ab5705..000000000000
--- a/libsmtutil/CVC4Interface.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/CVC4Interface.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-
-#include <cvc4/util/bitvector.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::smtutil;
-
-CVC4Interface::CVC4Interface(std::optional<unsigned> _queryTimeout):
-	SolverInterface(_queryTimeout),
-	m_solver(&m_context)
-{
-	reset();
-}
-
-void CVC4Interface::reset()
-{
-	m_variables.clear();
-	m_solver.reset();
-	m_solver.setOption("produce-models", true);
-	if (m_queryTimeout)
-		m_solver.setTimeLimit(*m_queryTimeout);
-	else
-		m_solver.setResourceLimit(resourceLimit);
-}
-
-void CVC4Interface::push()
-{
-	m_solver.push();
-}
-
-void CVC4Interface::pop()
-{
-	m_solver.pop();
-}
-
-void CVC4Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	m_variables[_name] = m_context.mkVar(_name.c_str(), cvc4Sort(*_sort));
-}
-
-void CVC4Interface::addAssertion(Expression const& _expr)
-{
-	try
-	{
-		m_solver.assertFormula(toCVC4Expr(_expr));
-	}
-	catch (CVC4::TypeCheckingException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::LogicException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::UnsafeInterruptException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::Exception const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-}
-
-std::pair<CheckResult, std::vector<std::string>> CVC4Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	CheckResult result;
-	std::vector<std::string> values;
-	try
-	{
-		switch (m_solver.checkSat().isSat())
-		{
-		case CVC4::Result::SAT:
-			result = CheckResult::SATISFIABLE;
-			break;
-		case CVC4::Result::UNSAT:
-			result = CheckResult::UNSATISFIABLE;
-			break;
-		case CVC4::Result::SAT_UNKNOWN:
-			result = CheckResult::UNKNOWN;
-			break;
-		default:
-			smtAssert(false, "");
-		}
-
-		if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
-		{
-			for (Expression const& e: _expressionsToEvaluate)
-				values.push_back(toString(m_solver.getValue(toCVC4Expr(e))));
-		}
-	}
-	catch (CVC4::Exception const&)
-	{
-		result = CheckResult::ERROR;
-		values.clear();
-	}
-
-	return std::make_pair(result, values);
-}
-
-CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
-{
-	// Variable
-	if (_expr.arguments.empty() && m_variables.count(_expr.name))
-		return m_variables.at(_expr.name);
-
-	std::vector<CVC4::Expr> arguments;
-	for (auto const& arg: _expr.arguments)
-		arguments.push_back(toCVC4Expr(arg));
-
-	try
-	{
-		std::string const& n = _expr.name;
-		// Function application
-		if (!arguments.empty() && m_variables.count(_expr.name))
-			return m_context.mkExpr(CVC4::kind::APPLY_UF, m_variables.at(n), arguments);
-		// Literal
-		else if (arguments.empty())
-		{
-			if (n == "true")
-				return m_context.mkConst(true);
-			else if (n == "false")
-				return m_context.mkConst(false);
-			else if (auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.sort))
-				return m_context.mkVar(n, cvc4Sort(*sortSort->inner));
-			else
-				try
-				{
-					return m_context.mkConst(CVC4::Rational(n));
-				}
-				catch (CVC4::TypeCheckingException const& _e)
-				{
-					smtAssert(false, _e.what());
-				}
-				catch (CVC4::Exception const& _e)
-				{
-					smtAssert(false, _e.what());
-				}
-		}
-
-		smtAssert(_expr.hasCorrectArity(), "");
-		if (n == "ite")
-			return arguments[0].iteExpr(arguments[1], arguments[2]);
-		else if (n == "not")
-			return arguments[0].notExpr();
-		else if (n == "and")
-			return arguments[0].andExpr(arguments[1]);
-		else if (n == "or")
-			return arguments[0].orExpr(arguments[1]);
-		else if (n == "=>")
-			return m_context.mkExpr(CVC4::kind::IMPLIES, arguments[0], arguments[1]);
-		else if (n == "=")
-			return m_context.mkExpr(CVC4::kind::EQUAL, arguments[0], arguments[1]);
-		else if (n == "<")
-			return m_context.mkExpr(CVC4::kind::LT, arguments[0], arguments[1]);
-		else if (n == "<=")
-			return m_context.mkExpr(CVC4::kind::LEQ, arguments[0], arguments[1]);
-		else if (n == ">")
-			return m_context.mkExpr(CVC4::kind::GT, arguments[0], arguments[1]);
-		else if (n == ">=")
-			return m_context.mkExpr(CVC4::kind::GEQ, arguments[0], arguments[1]);
-		else if (n == "+")
-			return m_context.mkExpr(CVC4::kind::PLUS, arguments[0], arguments[1]);
-		else if (n == "-")
-			return m_context.mkExpr(CVC4::kind::MINUS, arguments[0], arguments[1]);
-		else if (n == "*")
-			return m_context.mkExpr(CVC4::kind::MULT, arguments[0], arguments[1]);
-		else if (n == "div")
-			return m_context.mkExpr(CVC4::kind::INTS_DIVISION_TOTAL, arguments[0], arguments[1]);
-		else if (n == "mod")
-			return m_context.mkExpr(CVC4::kind::INTS_MODULUS, arguments[0], arguments[1]);
-		else if (n == "bvnot")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_NOT, arguments[0]);
-		else if (n == "bvand")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_AND, arguments[0], arguments[1]);
-		else if (n == "bvor")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_OR, arguments[0], arguments[1]);
-		else if (n == "bvxor")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_XOR, arguments[0], arguments[1]);
-		else if (n == "bvshl")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_SHL, arguments[0], arguments[1]);
-		else if (n == "bvlshr")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_LSHR, arguments[0], arguments[1]);
-		else if (n == "bvashr")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_ASHR, arguments[0], arguments[1]);
-		else if (n == "int2bv")
-		{
-			size_t size = std::stoul(_expr.arguments[1].name);
-			auto i2bvOp = m_context.mkConst(CVC4::IntToBitVector(static_cast<unsigned>(size)));
-			// CVC4 treats all BVs as unsigned, so we need to manually apply 2's complement if needed.
-			return m_context.mkExpr(
-				CVC4::kind::ITE,
-				m_context.mkExpr(CVC4::kind::GEQ, arguments[0], m_context.mkConst(CVC4::Rational(0))),
-				m_context.mkExpr(CVC4::kind::INT_TO_BITVECTOR, i2bvOp, arguments[0]),
-				m_context.mkExpr(
-					CVC4::kind::BITVECTOR_NEG,
-					m_context.mkExpr(CVC4::kind::INT_TO_BITVECTOR, i2bvOp, m_context.mkExpr(CVC4::kind::UMINUS, arguments[0]))
-				)
-			);
-		}
-		else if (n == "bv2int")
-		{
-			auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
-			smtAssert(intSort, "");
-			auto nat = m_context.mkExpr(CVC4::kind::BITVECTOR_TO_NAT, arguments[0]);
-			if (!intSort->isSigned)
-				return nat;
-
-			auto type = arguments[0].getType();
-			smtAssert(type.isBitVector(), "");
-			auto size = CVC4::BitVectorType(type).getSize();
-			// CVC4 treats all BVs as unsigned, so we need to manually apply 2's complement if needed.
-			auto extractOp = m_context.mkConst(CVC4::BitVectorExtract(size - 1, size - 1));
-			return m_context.mkExpr(CVC4::kind::ITE,
-				m_context.mkExpr(
-					CVC4::kind::EQUAL,
-					m_context.mkExpr(CVC4::kind::BITVECTOR_EXTRACT, extractOp, arguments[0]),
-					m_context.mkConst(CVC4::BitVector(1, uint64_t{0}))
-				),
-				nat,
-				m_context.mkExpr(
-					CVC4::kind::UMINUS,
-					m_context.mkExpr(CVC4::kind::BITVECTOR_TO_NAT, m_context.mkExpr(CVC4::kind::BITVECTOR_NEG, arguments[0]))
-				)
-			);
-		}
-		else if (n == "select")
-			return m_context.mkExpr(CVC4::kind::SELECT, arguments[0], arguments[1]);
-		else if (n == "store")
-			return m_context.mkExpr(CVC4::kind::STORE, arguments[0], arguments[1], arguments[2]);
-		else if (n == "const_array")
-		{
-			std::shared_ptr<SortSort> sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments[0].sort);
-			smtAssert(sortSort, "");
-			return m_context.mkConst(CVC4::ArrayStoreAll(cvc4Sort(*sortSort->inner), arguments[1]));
-		}
-		else if (n == "tuple_get")
-		{
-			std::shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.arguments[0].sort);
-			smtAssert(tupleSort, "");
-			CVC4::DatatypeType tt = m_context.mkTupleType(cvc4Sort(tupleSort->components));
-			CVC4::Datatype const& dt = tt.getDatatype();
-			size_t index = std::stoul(_expr.arguments[1].name);
-			CVC4::Expr s = dt[0][index].getSelector();
-			return m_context.mkExpr(CVC4::kind::APPLY_SELECTOR, s, arguments[0]);
-		}
-		else if (n == "tuple_constructor")
-		{
-			std::shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
-			smtAssert(tupleSort, "");
-			CVC4::DatatypeType tt = m_context.mkTupleType(cvc4Sort(tupleSort->components));
-			CVC4::Datatype const& dt = tt.getDatatype();
-			CVC4::Expr c = dt[0].getConstructor();
-			return m_context.mkExpr(CVC4::kind::APPLY_CONSTRUCTOR, c, arguments);
-		}
-
-		smtAssert(false);
-	}
-	catch (CVC4::TypeCheckingException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::Exception const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-
-	smtAssert(false);
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)
-{
-	switch (_sort.kind)
-	{
-	case Kind::Bool:
-		return m_context.booleanType();
-	case Kind::Int:
-		return m_context.integerType();
-	case Kind::BitVector:
-		return m_context.mkBitVectorType(dynamic_cast<BitVectorSort const&>(_sort).size);
-	case Kind::Function:
-	{
-		FunctionSort const& fSort = dynamic_cast<FunctionSort const&>(_sort);
-		return m_context.mkFunctionType(cvc4Sort(fSort.domain), cvc4Sort(*fSort.codomain));
-	}
-	case Kind::Array:
-	{
-		auto const& arraySort = dynamic_cast<ArraySort const&>(_sort);
-		return m_context.mkArrayType(cvc4Sort(*arraySort.domain), cvc4Sort(*arraySort.range));
-	}
-	case Kind::Tuple:
-	{
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
-		return m_context.mkTupleType(cvc4Sort(tupleSort.components));
-	}
-	default:
-		break;
-	}
-	smtAssert(false, "");
-	// Cannot be reached.
-	return m_context.integerType();
-}
-
-std::vector<CVC4::Type> CVC4Interface::cvc4Sort(std::vector<SortPointer> const& _sorts)
-{
-	std::vector<CVC4::Type> cvc4Sorts;
-	for (auto const& _sort: _sorts)
-		cvc4Sorts.push_back(cvc4Sort(*_sort));
-	return cvc4Sorts;
-}
diff --git a/libsmtutil/CVC4Interface.h b/libsmtutil/CVC4Interface.h
deleted file mode 100644
index cc3c0577ce45..000000000000
--- a/libsmtutil/CVC4Interface.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-
-#if defined(__GLIBC__)
-// The CVC4 headers includes the deprecated system headers <ext/hash_map>
-// and <ext/hash_set>. These headers cause a warning that will break the
-// build, unless _GLIBCXX_PERMIT_BACKWARD_HASH is set.
-#define _GLIBCXX_PERMIT_BACKWARD_HASH
-#endif
-
-#include <cvc4/cvc4.h>
-
-#if defined(__GLIBC__)
-#undef _GLIBCXX_PERMIT_BACKWARD_HASH
-#endif
-
-namespace solidity::smtutil
-{
-
-class CVC4Interface: public SolverInterface
-{
-public:
-	/// Noncopyable.
-	CVC4Interface(CVC4Interface const&) = delete;
-	CVC4Interface& operator=(CVC4Interface const&) = delete;
-
-	CVC4Interface(std::optional<unsigned> _queryTimeout = {});
-
-	void reset() override;
-
-	void push() override;
-	void pop() override;
-
-	void declareVariable(std::string const&, SortPointer const&) override;
-
-	void addAssertion(Expression const& _expr) override;
-	std::pair<CheckResult, std::vector<std::string>> check(std::vector<Expression> const& _expressionsToEvaluate) override;
-
-private:
-	CVC4::Expr toCVC4Expr(Expression const& _expr);
-	CVC4::Type cvc4Sort(Sort const& _sort);
-	std::vector<CVC4::Type> cvc4Sort(std::vector<SortPointer> const& _sorts);
-
-	CVC4::ExprManager m_context;
-	CVC4::SmtEngine m_solver;
-	std::map<std::string, CVC4::Expr> m_variables;
-
-	// CVC4 "basic resources" limit.
-	// This is used to make the runs more deterministic and platform/machine independent.
-	// The tests start failing for CVC4 with less than 6000,
-	// so using double that.
-	static int const resourceLimit = 12000;
-};
-
-}
diff --git a/libsmtutil/Exceptions.h b/libsmtutil/Exceptions.h
deleted file mode 100644
index 2a32c4fcda63..000000000000
--- a/libsmtutil/Exceptions.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Assertions.h>
-#include <libsolutil/Exceptions.h>
-
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/facilities/overload.hpp>
-
-namespace solidity::smtutil
-{
-
-struct SMTLogicError: virtual util::Exception {};
-
-/// Assertion that throws an SMTLogicError containing the given description if it is not met.
-#if !BOOST_PP_VARIADICS_MSVC
-#define smtAssert(...) BOOST_PP_OVERLOAD(smtAssert_,__VA_ARGS__)(__VA_ARGS__)
-#else
-#define smtAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(smtAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
-#endif
-
-#define smtAssert_1(CONDITION) \
-	smtAssert_2((CONDITION), "")
-
-#define smtAssert_2(CONDITION, DESCRIPTION) \
-	assertThrowWithDefaultDescription( \
-		(CONDITION), \
-		::solidity::smtutil::SMTLogicError, \
-		(DESCRIPTION), \
-		"SMT assertion failed" \
-	)
-
-}
diff --git a/libsmtutil/Helpers.h b/libsmtutil/Helpers.h
deleted file mode 100644
index feeb9a7d583c..000000000000
--- a/libsmtutil/Helpers.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-
-namespace solidity::smtutil
-{
-
-/// Signed division in SMTLIB2 rounds differently than EVM.
-/// This does not check for division by zero!
-inline Expression signedDivisionEVM(Expression _left, Expression _right)
-{
-	return Expression::ite(
-		_left >= 0,
-		Expression::ite(_right >= 0, _left / _right, 0 - (_left / (0 - _right))),
-		Expression::ite(_right >= 0, 0 - ((0 - _left) / _right), (0 - _left) / (0 - _right))
-	);
-}
-
-inline Expression abs(Expression _value)
-{
-	return Expression::ite(_value >= 0, _value, 0 - _value);
-}
-
-/// Signed modulo in SMTLIB2 behaves differently with regards
-/// to the sign than EVM.
-/// This does not check for modulo by zero!
-inline Expression signedModuloEVM(Expression _left, Expression _right)
-{
-	return Expression::ite(
-		_left >= 0,
-		_left % _right,
-		Expression::ite(
-			(_left % _right) == 0,
-			0,
-			(_left % _right) - abs(_right)
-		)
-	);
-}
-
-}
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
deleted file mode 100644
index ac5645bf121b..000000000000
--- a/libsmtutil/SMTLib2Interface.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/SMTLib2Interface.h>
-
-#include <libsolutil/Keccak256.h>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <range/v3/algorithm/find_if.hpp>
-
-#include <array>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::smtutil;
-
-SMTLib2Interface::SMTLib2Interface(
-	std::map<h256, std::string> _queryResponses,
-	ReadCallback::Callback _smtCallback,
-	std::optional<unsigned> _queryTimeout
-):
-	SolverInterface(_queryTimeout),
-	m_queryResponses(std::move(_queryResponses)),
-	m_smtCallback(std::move(_smtCallback))
-{
-	reset();
-}
-
-void SMTLib2Interface::reset()
-{
-	m_accumulatedOutput.clear();
-	m_accumulatedOutput.emplace_back();
-	m_variables.clear();
-	m_userSorts.clear();
-	write("(set-option :produce-models true)");
-	if (m_queryTimeout)
-		write("(set-option :timeout " + std::to_string(*m_queryTimeout) + ")");
-	write("(set-logic ALL)");
-}
-
-void SMTLib2Interface::push()
-{
-	m_accumulatedOutput.emplace_back();
-}
-
-void SMTLib2Interface::pop()
-{
-	smtAssert(!m_accumulatedOutput.empty(), "");
-	m_accumulatedOutput.pop_back();
-}
-
-void SMTLib2Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	if (_sort->kind == Kind::Function)
-		declareFunction(_name, _sort);
-	else if (!m_variables.count(_name))
-	{
-		m_variables.emplace(_name, _sort);
-		write("(declare-fun |" + _name + "| () " + toSmtLibSort(*_sort) + ')');
-	}
-}
-
-void SMTLib2Interface::declareFunction(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	smtAssert(_sort->kind == Kind::Function, "");
-	// TODO Use domain and codomain as key as well
-	if (!m_variables.count(_name))
-	{
-		auto const& fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
-		std::string domain = toSmtLibSort(fSort->domain);
-		std::string codomain = toSmtLibSort(*fSort->codomain);
-		m_variables.emplace(_name, _sort);
-		write(
-			"(declare-fun |" +
-			_name +
-			"| " +
-			domain +
-			" " +
-			codomain +
-			")"
-		);
-	}
-}
-
-void SMTLib2Interface::addAssertion(Expression const& _expr)
-{
-	write("(assert " + toSExpr(_expr) + ")");
-}
-
-std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	std::string response = querySolver(
-		boost::algorithm::join(m_accumulatedOutput, "\n") +
-		checkSatAndGetValuesCommand(_expressionsToEvaluate)
-	);
-
-	CheckResult result;
-	// TODO proper parsing
-	if (boost::starts_with(response, "sat\n"))
-		result = CheckResult::SATISFIABLE;
-	else if (boost::starts_with(response, "unsat\n"))
-		result = CheckResult::UNSATISFIABLE;
-	else if (boost::starts_with(response, "unknown\n"))
-		result = CheckResult::UNKNOWN;
-	else
-		result = CheckResult::ERROR;
-
-	std::vector<std::string> values;
-	if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
-		values = parseValues(find(response.cbegin(), response.cend(), '\n'), response.cend());
-	return std::make_pair(result, values);
-}
-
-std::string SMTLib2Interface::toSExpr(Expression const& _expr)
-{
-	if (_expr.arguments.empty())
-		return _expr.name;
-
-	std::string sexpr = "(";
-	if (_expr.name == "int2bv")
-	{
-		size_t size = std::stoul(_expr.arguments[1].name);
-		auto arg = toSExpr(_expr.arguments.front());
-		auto int2bv = "(_ int2bv " + std::to_string(size) + ")";
-		// Some solvers treat all BVs as unsigned, so we need to manually apply 2's complement if needed.
-		sexpr += std::string("ite ") +
-			"(>= " + arg + " 0) " +
-			"(" + int2bv + " " + arg + ") " +
-			"(bvneg (" + int2bv + " (- " + arg + ")))";
-	}
-	else if (_expr.name == "bv2int")
-	{
-		auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
-		smtAssert(intSort, "");
-
-		auto arg = toSExpr(_expr.arguments.front());
-		auto nat = "(bv2nat " + arg + ")";
-
-		if (!intSort->isSigned)
-			return nat;
-
-		auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(_expr.arguments.front().sort);
-		smtAssert(bvSort, "");
-		auto size = std::to_string(bvSort->size);
-		auto pos = std::to_string(bvSort->size - 1);
-
-		// Some solvers treat all BVs as unsigned, so we need to manually apply 2's complement if needed.
-		sexpr += std::string("ite ") +
-			"(= ((_ extract " + pos + " " + pos + ")" + arg + ") #b0) " +
-			nat + " " +
-			"(- (bv2nat (bvneg " + arg + ")))";
-	}
-	else if (_expr.name == "const_array")
-	{
-		smtAssert(_expr.arguments.size() == 2, "");
-		auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments.at(0).sort);
-		smtAssert(sortSort, "");
-		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
-		smtAssert(arraySort, "");
-		sexpr += "(as const " + toSmtLibSort(*arraySort) + ") ";
-		sexpr += toSExpr(_expr.arguments.at(1));
-	}
-	else if (_expr.name == "tuple_get")
-	{
-		smtAssert(_expr.arguments.size() == 2, "");
-		auto tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.arguments.at(0).sort);
-		size_t index = std::stoul(_expr.arguments.at(1).name);
-		smtAssert(index < tupleSort->members.size(), "");
-		sexpr += "|" + tupleSort->members.at(index) + "| " + toSExpr(_expr.arguments.at(0));
-	}
-	else if (_expr.name == "tuple_constructor")
-	{
-		auto tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
-		smtAssert(tupleSort, "");
-		sexpr += "|" + tupleSort->name + "|";
-		for (auto const& arg: _expr.arguments)
-			sexpr += " " + toSExpr(arg);
-	}
-	else
-	{
-		sexpr += _expr.name;
-		for (auto const& arg: _expr.arguments)
-			sexpr += " " + toSExpr(arg);
-	}
-	sexpr += ")";
-	return sexpr;
-}
-
-std::string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
-{
-	switch (_sort.kind)
-	{
-	case Kind::Int:
-		return "Int";
-	case Kind::Bool:
-		return "Bool";
-	case Kind::BitVector:
-		return "(_ BitVec " + std::to_string(dynamic_cast<BitVectorSort const&>(_sort).size) + ")";
-	case Kind::Array:
-	{
-		auto const& arraySort = dynamic_cast<ArraySort const&>(_sort);
-		smtAssert(arraySort.domain && arraySort.range, "");
-		return "(Array " + toSmtLibSort(*arraySort.domain) + ' ' + toSmtLibSort(*arraySort.range) + ')';
-	}
-	case Kind::Tuple:
-	{
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
-		std::string tupleName = "|" + tupleSort.name + "|";
-		auto isName = [&](auto entry) { return entry.first == tupleName; };
-		if (ranges::find_if(m_userSorts, isName) == m_userSorts.end())
-		{
-			std::string decl("(declare-datatypes ((" + tupleName + " 0)) (((" + tupleName);
-			smtAssert(tupleSort.members.size() == tupleSort.components.size(), "");
-			for (unsigned i = 0; i < tupleSort.members.size(); ++i)
-				decl += " (|" + tupleSort.members.at(i) + "| " + toSmtLibSort(*tupleSort.components.at(i)) + ")";
-			decl += "))))";
-			m_userSorts.emplace_back(tupleName, decl);
-			write(decl);
-		}
-
-		return tupleName;
-	}
-	default:
-		smtAssert(false, "Invalid SMT sort");
-	}
-}
-
-std::string SMTLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
-{
-	std::string ssort("(");
-	for (auto const& sort: _sorts)
-		ssort += toSmtLibSort(*sort) + " ";
-	ssort += ")";
-	return ssort;
-}
-
-void SMTLib2Interface::write(std::string _data)
-{
-	smtAssert(!m_accumulatedOutput.empty(), "");
-	m_accumulatedOutput.back() += std::move(_data) + "\n";
-}
-
-std::string SMTLib2Interface::checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	std::string command;
-	if (_expressionsToEvaluate.empty())
-		command = "(check-sat)\n";
-	else
-	{
-		// TODO make sure these are unique
-		for (size_t i = 0; i < _expressionsToEvaluate.size(); i++)
-		{
-			auto const& e = _expressionsToEvaluate.at(i);
-			smtAssert(e.sort->kind == Kind::Int || e.sort->kind == Kind::Bool, "Invalid sort for expression to evaluate.");
-			command += "(declare-const |EVALEXPR_" + std::to_string(i) + "| " + (e.sort->kind == Kind::Int ? "Int" : "Bool") + ")\n";
-			command += "(assert (= |EVALEXPR_" + std::to_string(i) + "| " + toSExpr(e) + "))\n";
-		}
-		command += "(check-sat)\n";
-		command += "(get-value (";
-		for (size_t i = 0; i < _expressionsToEvaluate.size(); i++)
-			command += "|EVALEXPR_" + std::to_string(i) + "| ";
-		command += "))\n";
-	}
-
-	return command;
-}
-
-std::vector<std::string> SMTLib2Interface::parseValues(std::string::const_iterator _start, std::string::const_iterator _end)
-{
-	std::vector<std::string> values;
-	while (_start < _end)
-	{
-		auto valStart = find(_start, _end, ' ');
-		if (valStart < _end)
-			++valStart;
-		auto valEnd = find(valStart, _end, ')');
-		values.emplace_back(valStart, valEnd);
-		_start = find(valEnd, _end, '(');
-	}
-
-	return values;
-}
-
-std::string SMTLib2Interface::querySolver(std::string const& _input)
-{
-	h256 inputHash = keccak256(_input);
-	if (m_queryResponses.count(inputHash))
-		return m_queryResponses.at(inputHash);
-	if (m_smtCallback)
-	{
-		auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
-		if (result.success)
-			return result.responseOrErrorMessage;
-	}
-	m_unhandledQueries.push_back(_input);
-	return "unknown\n";
-}
-
-std::string SMTLib2Interface::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	return boost::algorithm::join(m_accumulatedOutput, "\n") +
-		checkSatAndGetValuesCommand(_expressionsToEvaluate);
-}
diff --git a/libsmtutil/SMTLib2Interface.h b/libsmtutil/SMTLib2Interface.h
deleted file mode 100644
index 9ef8e94a8c0a..000000000000
--- a/libsmtutil/SMTLib2Interface.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <libsolidity/interface/ReadFile.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/FixedHash.h>
-
-#include <cstdio>
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
-
-namespace solidity::smtutil
-{
-
-class SMTLib2Interface: public SolverInterface
-{
-public:
-	/// Noncopyable.
-	SMTLib2Interface(SMTLib2Interface const&) = delete;
-	SMTLib2Interface& operator=(SMTLib2Interface const&) = delete;
-
-	explicit SMTLib2Interface(
-		std::map<util::h256, std::string> _queryResponses = {},
-		frontend::ReadCallback::Callback _smtCallback = {},
-		std::optional<unsigned> _queryTimeout = {}
-	);
-
-	void reset() override;
-
-	void push() override;
-	void pop() override;
-
-	void declareVariable(std::string const&, SortPointer const&) override;
-
-	void addAssertion(Expression const& _expr) override;
-	std::pair<CheckResult, std::vector<std::string>> check(std::vector<Expression> const& _expressionsToEvaluate) override;
-
-	std::vector<std::string> unhandledQueries() override { return m_unhandledQueries; }
-
-	// Used by CHCSmtLib2Interface
-	std::string toSExpr(Expression const& _expr);
-	std::string toSmtLibSort(Sort const& _sort);
-	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
-
-	std::map<std::string, SortPointer> variables() { return m_variables; }
-
-	std::vector<std::pair<std::string, std::string>> const& userSorts() const { return m_userSorts; }
-
-	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
-
-private:
-	void declareFunction(std::string const& _name, SortPointer const& _sort);
-
-	void write(std::string _data);
-
-	std::string checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate);
-	std::vector<std::string> parseValues(std::string::const_iterator _start, std::string::const_iterator _end);
-
-	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
-	std::string querySolver(std::string const& _input);
-
-	std::vector<std::string> m_accumulatedOutput;
-	std::map<std::string, SortPointer> m_variables;
-
-	/// Each pair in this vector represents an SMTChecker created
-	/// sort (a user sort), and the smtlib2 declaration of that sort.
-	/// It needs to be a vector so that the declaration order is kept,
-	/// otherwise solvers cannot parse the queries.
-	std::vector<std::pair<std::string, std::string>> m_userSorts;
-
-	std::map<util::h256, std::string> m_queryResponses;
-	std::vector<std::string> m_unhandledQueries;
-
-	frontend::ReadCallback::Callback m_smtCallback;
-};
-
-}
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
deleted file mode 100644
index 76c69d0180a3..000000000000
--- a/libsmtutil/SMTPortfolio.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/SMTPortfolio.h>
-
-#ifdef HAVE_Z3
-#include <libsmtutil/Z3Interface.h>
-#endif
-#ifdef HAVE_CVC4
-#include <libsmtutil/CVC4Interface.h>
-#endif
-#include <libsmtutil/SMTLib2Interface.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::smtutil;
-
-SMTPortfolio::SMTPortfolio(
-	std::map<h256, std::string> _smtlib2Responses,
-	frontend::ReadCallback::Callback _smtCallback,
-	[[maybe_unused]] SMTSolverChoice _enabledSolvers,
-	std::optional<unsigned> _queryTimeout,
-	bool _printQuery
-):
-	SolverInterface(_queryTimeout)
-{
-	solAssert(!_printQuery || _enabledSolvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
-	if (_enabledSolvers.smtlib2)
-		m_solvers.emplace_back(std::make_unique<SMTLib2Interface>(std::move(_smtlib2Responses), std::move(_smtCallback), m_queryTimeout));
-#ifdef HAVE_Z3
-	if (_enabledSolvers.z3 && Z3Interface::available())
-		m_solvers.emplace_back(std::make_unique<Z3Interface>(m_queryTimeout));
-#endif
-#ifdef HAVE_CVC4
-	if (_enabledSolvers.cvc4)
-		m_solvers.emplace_back(std::make_unique<CVC4Interface>(m_queryTimeout));
-#endif
-}
-
-void SMTPortfolio::reset()
-{
-	for (auto const& s: m_solvers)
-		s->reset();
-}
-
-void SMTPortfolio::push()
-{
-	for (auto const& s: m_solvers)
-		s->push();
-}
-
-void SMTPortfolio::pop()
-{
-	for (auto const& s: m_solvers)
-		s->pop();
-}
-
-void SMTPortfolio::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	for (auto const& s: m_solvers)
-		s->declareVariable(_name, _sort);
-}
-
-void SMTPortfolio::addAssertion(Expression const& _expr)
-{
-	for (auto const& s: m_solvers)
-		s->addAssertion(_expr);
-}
-
-/*
- * Broadcasts the SMT query to all solvers and returns a single result.
- * This comment explains how this result is decided.
- *
- * When a solver is queried, there are four possible answers:
- *   SATISFIABLE (SAT), UNSATISFIABLE (UNSAT), UNKNOWN, CONFLICTING, ERROR
- * We say that a solver _answered_ the query if it returns either:
- *   SAT or UNSAT
- * A solver did not answer the query if it returns either:
- *   UNKNOWN (it tried but couldn't solve it) or ERROR (crash, internal error, API error, etc).
- *
- * Ideally all solvers answer the query and agree on what the answer is
- * (all say SAT or all say UNSAT).
- *
- * The actual logic as as follows:
- * 1) If at least one solver answers the query, all the non-answer results are ignored.
- *   Here SAT/UNSAT is preferred over UNKNOWN since it's an actual answer, and over ERROR
- *   because one buggy solver/integration shouldn't break the portfolio.
- *
- * 2) If at least one solver answers SAT and at least one answers UNSAT, at least one of them is buggy
- * and the result is CONFLICTING.
- *   In the future if we have more than 2 solvers enabled we could go with the majority.
- *
- * 3) If NO solver answers the query:
- *   If at least one solver returned UNKNOWN (where the rest returned ERROR), the result is UNKNOWN.
- *   This is preferred over ERROR since the SMTChecker might decide to abstract the query
- *   when it is told that this is a hard query to solve.
- *
- *   If all solvers return ERROR, the result is ERROR.
-*/
-std::pair<CheckResult, std::vector<std::string>> SMTPortfolio::check(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	CheckResult lastResult = CheckResult::ERROR;
-	std::vector<std::string> finalValues;
-	for (auto const& s: m_solvers)
-	{
-		CheckResult result;
-		std::vector<std::string> values;
-		tie(result, values) = s->check(_expressionsToEvaluate);
-		if (solverAnswered(result))
-		{
-			if (!solverAnswered(lastResult))
-			{
-				lastResult = result;
-				finalValues = std::move(values);
-			}
-			else if (lastResult != result)
-			{
-				lastResult = CheckResult::CONFLICTING;
-				break;
-			}
-		}
-		else if (result == CheckResult::UNKNOWN && lastResult == CheckResult::ERROR)
-			lastResult = result;
-	}
-	return std::make_pair(lastResult, finalValues);
-}
-
-std::vector<std::string> SMTPortfolio::unhandledQueries()
-{
-	// This code assumes that the constructor guarantees that
-	// SmtLib2Interface is in position 0, if enabled.
-	if (!m_solvers.empty())
-		if (auto smtlib2 = dynamic_cast<SMTLib2Interface*>(m_solvers.front().get()))
-			return smtlib2->unhandledQueries();
-	return {};
-}
-
-bool SMTPortfolio::solverAnswered(CheckResult result)
-{
-	return result == CheckResult::SATISFIABLE || result == CheckResult::UNSATISFIABLE;
-}
-
-std::string SMTPortfolio::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	// This code assumes that the constructor guarantees that
-	// SmtLib2Interface is in position 0, if enabled.
-	auto smtlib2 = dynamic_cast<SMTLib2Interface*>(m_solvers.front().get());
-	solAssert(smtlib2, "Must use SMTLib2 solver to dump queries");
-	return smtlib2->dumpQuery(_expressionsToEvaluate);
-}
diff --git a/libsmtutil/SMTPortfolio.h b/libsmtutil/SMTPortfolio.h
deleted file mode 100644
index cdb33368e80a..000000000000
--- a/libsmtutil/SMTPortfolio.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-
-#include <libsmtutil/SolverInterface.h>
-#include <libsolidity/interface/ReadFile.h>
-#include <libsolutil/FixedHash.h>
-
-#include <map>
-#include <vector>
-
-namespace solidity::smtutil
-{
-
-/**
- * The SMTPortfolio wraps all available solvers within a single interface,
- * propagating the functionalities to all solvers.
- * It also checks whether different solvers give conflicting answers
- * to SMT queries.
- */
-class SMTPortfolio: public SolverInterface
-{
-public:
-	/// Noncopyable.
-	SMTPortfolio(SMTPortfolio const&) = delete;
-	SMTPortfolio& operator=(SMTPortfolio const&) = delete;
-
-	SMTPortfolio(
-		std::map<util::h256, std::string> _smtlib2Responses = {},
-		frontend::ReadCallback::Callback _smtCallback = {},
-		SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
-		std::optional<unsigned> _queryTimeout = {},
-		bool _printQuery = false
-	);
-
-	void reset() override;
-
-	void push() override;
-	void pop() override;
-
-	void declareVariable(std::string const&, SortPointer const&) override;
-
-	void addAssertion(Expression const& _expr) override;
-
-	std::pair<CheckResult, std::vector<std::string>> check(std::vector<Expression> const& _expressionsToEvaluate) override;
-
-	std::vector<std::string> unhandledQueries() override;
-	size_t solvers() override { return m_solvers.size(); }
-
-	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
-
-private:
-	static bool solverAnswered(CheckResult result);
-
-	std::vector<std::unique_ptr<SolverInterface>> m_solvers;
-
-	std::vector<Expression> m_assertions;
-};
-
-}
diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
deleted file mode 100644
index 4a21f18410b8..000000000000
--- a/libsmtutil/SolverInterface.h
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/Exceptions.h>
-#include <libsmtutil/Sorts.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-#include <range/v3/view.hpp>
-
-#include <cstdio>
-#include <map>
-#include <memory>
-#include <optional>
-#include <set>
-#include <string>
-#include <vector>
-
-namespace solidity::smtutil
-{
-
-struct SMTSolverChoice
-{
-	bool cvc4 = false;
-	bool eld = false;
-	bool smtlib2 = false;
-	bool z3 = false;
-
-	static constexpr SMTSolverChoice All() noexcept { return {true, true, true, true}; }
-	static constexpr SMTSolverChoice CVC4() noexcept { return {true, false, false, false}; }
-	static constexpr SMTSolverChoice ELD() noexcept { return {false, true, false, false}; }
-	static constexpr SMTSolverChoice SMTLIB2() noexcept { return {false, false, true, false}; }
-	static constexpr SMTSolverChoice Z3() noexcept { return {false, false, false, true}; }
-	static constexpr SMTSolverChoice None() noexcept { return {false, false, false, false}; }
-
-	static std::optional<SMTSolverChoice> fromString(std::string const& _solvers)
-	{
-		SMTSolverChoice solvers;
-		for (auto&& s: _solvers | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
-			if (!solvers.setSolver(s))
-				return {};
-
-		return solvers;
-	}
-
-	SMTSolverChoice& operator&=(SMTSolverChoice const& _other)
-	{
-		cvc4 &= _other.cvc4;
-		eld &= _other.eld;
-		smtlib2 &= _other.smtlib2;
-		z3 &= _other.z3;
-		return *this;
-	}
-
-	SMTSolverChoice operator&(SMTSolverChoice _other) const noexcept
-	{
-		_other &= *this;
-		return _other;
-	}
-
-	bool operator!=(SMTSolverChoice const& _other) const noexcept { return !(*this == _other); }
-
-	bool operator==(SMTSolverChoice const& _other) const noexcept
-	{
-		return cvc4 == _other.cvc4 &&
-			eld == _other.eld &&
-			smtlib2 == _other.smtlib2 &&
-			z3 == _other.z3;
-	}
-
-	bool setSolver(std::string const& _solver)
-	{
-		static std::set<std::string> const solvers{"cvc4", "eld", "smtlib2", "z3"};
-		if (!solvers.count(_solver))
-			return false;
-		if (_solver == "cvc4")
-			cvc4 = true;
-		if (_solver == "eld")
-			eld = true;
-		else if (_solver == "smtlib2")
-			smtlib2 = true;
-		else if (_solver == "z3")
-			z3 = true;
-		return true;
-	}
-
-	bool none() const noexcept { return !some(); }
-	bool some() const noexcept { return cvc4 || eld || smtlib2 || z3; }
-	bool all() const noexcept { return cvc4 && eld && smtlib2 && z3; }
-};
-
-enum class CheckResult
-{
-	SATISFIABLE, UNSATISFIABLE, UNKNOWN, CONFLICTING, ERROR
-};
-
-/// C++ representation of an SMTLIB2 expression.
-class Expression
-{
-	friend class SolverInterface;
-public:
-	explicit Expression(bool _v): Expression(_v ? "true" : "false", Kind::Bool) {}
-	explicit Expression(std::shared_ptr<SortSort> _sort, std::string _name = ""): Expression(std::move(_name), {}, _sort) {}
-	explicit Expression(std::string _name, std::vector<Expression> _arguments, SortPointer _sort):
-		name(std::move(_name)), arguments(std::move(_arguments)), sort(std::move(_sort)) {}
-	Expression(size_t _number): Expression(std::to_string(_number), {}, SortProvider::uintSort) {}
-	Expression(u256 const& _number): Expression(_number.str(), {}, SortProvider::sintSort) {}
-	Expression(s256 const& _number): Expression(
-		_number >= 0 ? _number.str() : "-",
-		_number >= 0 ?
-			std::vector<Expression>{} :
-			std::vector<Expression>{Expression(size_t(0)), bigint(-_number)},
-		SortProvider::sintSort
-	) {}
-	Expression(bigint const& _number): Expression(
-		_number >= 0 ? _number.str() : "-",
-		_number >= 0 ?
-			std::vector<Expression>{} :
-			std::vector<Expression>{Expression(size_t(0)), bigint(-_number)},
-		SortProvider::sintSort
-	) {}
-
-	Expression(Expression const&) = default;
-	Expression(Expression&&) = default;
-	Expression& operator=(Expression const&) = default;
-	Expression& operator=(Expression&&) = default;
-
-	bool hasCorrectArity() const
-	{
-		if (name == "tuple_constructor")
-		{
-			auto tupleSort = std::dynamic_pointer_cast<TupleSort>(sort);
-			smtAssert(tupleSort, "");
-			return arguments.size() == tupleSort->components.size();
-		}
-
-		static std::map<std::string, unsigned> const operatorsArity{
-			{"ite", 3},
-			{"not", 1},
-			{"and", 2},
-			{"or", 2},
-			{"=>", 2},
-			{"=", 2},
-			{"<", 2},
-			{"<=", 2},
-			{">", 2},
-			{">=", 2},
-			{"+", 2},
-			{"-", 2},
-			{"*", 2},
-			{"div", 2},
-			{"mod", 2},
-			{"bvnot", 1},
-			{"bvand", 2},
-			{"bvor", 2},
-			{"bvxor", 2},
-			{"bvshl", 2},
-			{"bvlshr", 2},
-			{"bvashr", 2},
-			{"int2bv", 2},
-			{"bv2int", 1},
-			{"select", 2},
-			{"store", 3},
-			{"const_array", 2},
-			{"tuple_get", 2}
-		};
-		return operatorsArity.count(name) && operatorsArity.at(name) == arguments.size();
-	}
-
-	static Expression ite(Expression _condition, Expression _trueValue, Expression _falseValue)
-	{
-		if (_trueValue.sort->kind == Kind::Int)
-			smtAssert(_trueValue.sort->kind == _falseValue.sort->kind, "");
-		else
-			smtAssert(*_trueValue.sort == *_falseValue.sort, "");
-		SortPointer sort = _trueValue.sort;
-		return Expression("ite", std::vector<Expression>{
-			std::move(_condition), std::move(_trueValue), std::move(_falseValue)
-		}, std::move(sort));
-	}
-
-	static Expression implies(Expression _a, Expression _b)
-	{
-		return Expression(
-			"=>",
-			std::move(_a),
-			std::move(_b),
-			Kind::Bool
-		);
-	}
-
-	/// select is the SMT representation of an array index access.
-	static Expression select(Expression _array, Expression _index)
-	{
-		smtAssert(_array.sort->kind == Kind::Array, "");
-		std::shared_ptr<ArraySort> arraySort = std::dynamic_pointer_cast<ArraySort>(_array.sort);
-		smtAssert(arraySort, "");
-		smtAssert(_index.sort, "");
-		if (arraySort->domain->kind == Kind::Int)
-			smtAssert(arraySort->domain->kind == _index.sort->kind, "");
-		else
-			smtAssert(*arraySort->domain == *_index.sort, "");
-		return Expression(
-			"select",
-			std::vector<Expression>{std::move(_array), std::move(_index)},
-			arraySort->range
-		);
-	}
-
-	/// store is the SMT representation of an assignment to array index.
-	/// The function is pure and returns the modified array.
-	static Expression store(Expression _array, Expression _index, Expression _element)
-	{
-		auto arraySort = std::dynamic_pointer_cast<ArraySort>(_array.sort);
-		smtAssert(arraySort, "");
-		smtAssert(_index.sort, "");
-		smtAssert(_element.sort, "");
-		smtAssert(*arraySort->domain == *_index.sort, "");
-		if (arraySort->domain->kind == Kind::Int)
-			smtAssert(arraySort->range->kind == _element.sort->kind, "");
-		else
-			smtAssert(*arraySort->range == *_element.sort, "");
-		return Expression(
-			"store",
-			std::vector<Expression>{std::move(_array), std::move(_index), std::move(_element)},
-			arraySort
-		);
-	}
-
-	static Expression const_array(Expression _sort, Expression _value)
-	{
-		smtAssert(_sort.sort->kind == Kind::Sort, "");
-		auto sortSort = std::dynamic_pointer_cast<SortSort>(_sort.sort);
-		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
-		smtAssert(sortSort && arraySort, "");
-		smtAssert(_value.sort, "");
-		if (arraySort->domain->kind == Kind::Int)
-			smtAssert(arraySort->range->kind == _value.sort->kind, "");
-		else
-			smtAssert(*arraySort->range == *_value.sort, "");
-		return Expression(
-			"const_array",
-			std::vector<Expression>{std::move(_sort), std::move(_value)},
-			arraySort
-		);
-	}
-
-	static Expression tuple_get(Expression _tuple, size_t _index)
-	{
-		smtAssert(_tuple.sort->kind == Kind::Tuple, "");
-		std::shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_tuple.sort);
-		smtAssert(tupleSort, "");
-		smtAssert(_index < tupleSort->components.size(), "");
-		return Expression(
-			"tuple_get",
-			std::vector<Expression>{std::move(_tuple), Expression(_index)},
-			tupleSort->components.at(_index)
-		);
-	}
-
-	static Expression tuple_constructor(Expression _tuple, std::vector<Expression> _arguments)
-	{
-		smtAssert(_tuple.sort->kind == Kind::Sort, "");
-		auto sortSort = std::dynamic_pointer_cast<SortSort>(_tuple.sort);
-		auto tupleSort = std::dynamic_pointer_cast<TupleSort>(sortSort->inner);
-		smtAssert(tupleSort, "");
-		smtAssert(_arguments.size() == tupleSort->components.size(), "");
-		return Expression(
-			"tuple_constructor",
-			std::move(_arguments),
-			tupleSort
-		);
-	}
-
-	static Expression int2bv(Expression _n, size_t _size)
-	{
-		smtAssert(_n.sort->kind == Kind::Int, "");
-		std::shared_ptr<IntSort> intSort = std::dynamic_pointer_cast<IntSort>(_n.sort);
-		smtAssert(intSort, "");
-		smtAssert(_size <= 256, "");
-		return Expression(
-			"int2bv",
-			std::vector<Expression>{std::move(_n), Expression(_size)},
-			std::make_shared<BitVectorSort>(_size)
-		);
-	}
-
-	static Expression bv2int(Expression _bv, bool _signed = false)
-	{
-		smtAssert(_bv.sort->kind == Kind::BitVector, "");
-		std::shared_ptr<BitVectorSort> bvSort = std::dynamic_pointer_cast<BitVectorSort>(_bv.sort);
-		smtAssert(bvSort, "");
-		smtAssert(bvSort->size <= 256, "");
-		return Expression(
-			"bv2int",
-			std::vector<Expression>{std::move(_bv)},
-			SortProvider::intSort(_signed)
-		);
-	}
-
-	static bool sameSort(std::vector<Expression> const& _args)
-	{
-		if (_args.empty())
-			return true;
-
-		auto sort = _args.front().sort;
-		return ranges::all_of(
-			_args,
-			[&](auto const& _expr){ return _expr.sort->kind == sort->kind; }
-		);
-	}
-
-	static Expression mkAnd(std::vector<Expression> _args)
-	{
-		smtAssert(!_args.empty(), "");
-		smtAssert(sameSort(_args), "");
-
-		auto sort = _args.front().sort;
-		if (sort->kind == Kind::BitVector)
-			return Expression("bvand", std::move(_args), sort);
-
-		smtAssert(sort->kind == Kind::Bool, "");
-		return Expression("and", std::move(_args), Kind::Bool);
-	}
-
-	static Expression mkOr(std::vector<Expression> _args)
-	{
-		smtAssert(!_args.empty(), "");
-		smtAssert(sameSort(_args), "");
-
-		auto sort = _args.front().sort;
-		if (sort->kind == Kind::BitVector)
-			return Expression("bvor", std::move(_args), sort);
-
-		smtAssert(sort->kind == Kind::Bool, "");
-		return Expression("or", std::move(_args), Kind::Bool);
-	}
-
-	static Expression mkPlus(std::vector<Expression> _args)
-	{
-		smtAssert(!_args.empty(), "");
-		smtAssert(sameSort(_args), "");
-
-		auto sort = _args.front().sort;
-		smtAssert(sort->kind == Kind::BitVector || sort->kind == Kind::Int, "");
-		return Expression("+", std::move(_args), sort);
-	}
-
-	static Expression mkMul(std::vector<Expression> _args)
-	{
-		smtAssert(!_args.empty(), "");
-		smtAssert(sameSort(_args), "");
-
-		auto sort = _args.front().sort;
-		smtAssert(sort->kind == Kind::BitVector || sort->kind == Kind::Int, "");
-		return Expression("*", std::move(_args), sort);
-	}
-
-	friend Expression operator!(Expression _a)
-	{
-		if (_a.sort->kind == Kind::BitVector)
-			return ~_a;
-		return Expression("not", std::move(_a), Kind::Bool);
-	}
-	friend Expression operator&&(Expression _a, Expression _b)
-	{
-		if (_a.sort->kind == Kind::BitVector)
-		{
-			smtAssert(_b.sort->kind == Kind::BitVector, "");
-			return _a & _b;
-		}
-		return Expression("and", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator||(Expression _a, Expression _b)
-	{
-		if (_a.sort->kind == Kind::BitVector)
-		{
-			smtAssert(_b.sort->kind == Kind::BitVector, "");
-			return _a | _b;
-		}
-		return Expression("or", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator==(Expression _a, Expression _b)
-	{
-		smtAssert(_a.sort->kind == _b.sort->kind, "Trying to create an 'equal' expression with different sorts");
-		return Expression("=", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator!=(Expression _a, Expression _b)
-	{
-		return !(std::move(_a) == std::move(_b));
-	}
-	friend Expression operator<(Expression _a, Expression _b)
-	{
-		return Expression("<", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator<=(Expression _a, Expression _b)
-	{
-		return Expression("<=", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator>(Expression _a, Expression _b)
-	{
-		return Expression(">", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator>=(Expression _a, Expression _b)
-	{
-		return Expression(">=", std::move(_a), std::move(_b), Kind::Bool);
-	}
-	friend Expression operator+(Expression _a, Expression _b)
-	{
-		auto intSort = _a.sort;
-		return Expression("+", {std::move(_a), std::move(_b)}, intSort);
-	}
-	friend Expression operator-(Expression _a, Expression _b)
-	{
-		auto intSort = _a.sort;
-		return Expression("-", {std::move(_a), std::move(_b)}, intSort);
-	}
-	friend Expression operator*(Expression _a, Expression _b)
-	{
-		auto intSort = _a.sort;
-		return Expression("*", {std::move(_a), std::move(_b)}, intSort);
-	}
-	friend Expression operator/(Expression _a, Expression _b)
-	{
-		auto intSort = _a.sort;
-		return Expression("div", {std::move(_a), std::move(_b)}, intSort);
-	}
-	friend Expression operator%(Expression _a, Expression _b)
-	{
-		auto intSort = _a.sort;
-		return Expression("mod", {std::move(_a), std::move(_b)}, intSort);
-	}
-	friend Expression operator~(Expression _a)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvnot", {std::move(_a)}, bvSort);
-	}
-	friend Expression operator&(Expression _a, Expression _b)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvand", {std::move(_a), std::move(_b)}, bvSort);
-	}
-	friend Expression operator|(Expression _a, Expression _b)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvor", {std::move(_a), std::move(_b)}, bvSort);
-	}
-	friend Expression operator^(Expression _a, Expression _b)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvxor", {std::move(_a), std::move(_b)}, bvSort);
-	}
-	friend Expression operator<<(Expression _a, Expression _b)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvshl", {std::move(_a), std::move(_b)}, bvSort);
-	}
-	friend Expression operator>>(Expression _a, Expression _b)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvlshr", {std::move(_a), std::move(_b)}, bvSort);
-	}
-	static Expression ashr(Expression _a, Expression _b)
-	{
-		auto bvSort = _a.sort;
-		return Expression("bvashr", {std::move(_a), std::move(_b)}, bvSort);
-	}
-	Expression operator()(std::vector<Expression> _arguments) const
-	{
-		smtAssert(
-			sort->kind == Kind::Function,
-			"Attempted function application to non-function."
-		);
-		auto fSort = dynamic_cast<FunctionSort const*>(sort.get());
-		smtAssert(fSort, "");
-		return Expression(name, std::move(_arguments), fSort->codomain);
-	}
-
-	std::string name;
-	std::vector<Expression> arguments;
-	SortPointer sort;
-
-private:
-	/// Manual constructors, should only be used by SolverInterface and this class itself.
-	Expression(std::string _name, std::vector<Expression> _arguments, Kind _kind):
-		Expression(std::move(_name), std::move(_arguments), std::make_shared<Sort>(_kind)) {}
-
-	explicit Expression(std::string _name, Kind _kind):
-		Expression(std::move(_name), std::vector<Expression>{}, _kind) {}
-	Expression(std::string _name, Expression _arg, Kind _kind):
-		Expression(std::move(_name), std::vector<Expression>{std::move(_arg)}, _kind) {}
-	Expression(std::string _name, Expression _arg1, Expression _arg2, Kind _kind):
-		Expression(std::move(_name), std::vector<Expression>{std::move(_arg1), std::move(_arg2)}, _kind) {}
-};
-
-DEV_SIMPLE_EXCEPTION(SolverError);
-
-class SolverInterface
-{
-public:
-	SolverInterface(std::optional<unsigned> _queryTimeout = {}): m_queryTimeout(_queryTimeout) {}
-
-	virtual ~SolverInterface() = default;
-	virtual void reset() = 0;
-
-	virtual void push() = 0;
-	virtual void pop() = 0;
-
-	virtual void declareVariable(std::string const& _name, SortPointer const& _sort) = 0;
-	Expression newVariable(std::string _name, SortPointer const& _sort)
-	{
-		// Subclasses should do something here
-		smtAssert(_sort, "");
-		declareVariable(_name, _sort);
-		return Expression(std::move(_name), {}, _sort);
-	}
-
-	virtual void addAssertion(Expression const& _expr) = 0;
-
-	/// Checks for satisfiability, evaluates the expressions if a model
-	/// is available. Throws SMTSolverError on error.
-	virtual std::pair<CheckResult, std::vector<std::string>>
-	check(std::vector<Expression> const& _expressionsToEvaluate) = 0;
-
-	/// @returns a list of queries that the system was not able to respond to.
-	virtual std::vector<std::string> unhandledQueries() { return {}; }
-
-	/// @returns how many SMT solvers this interface has.
-	virtual size_t solvers() { return 1; }
-
-protected:
-	std::optional<unsigned> m_queryTimeout;
-};
-
-}
diff --git a/libsmtutil/Sorts.cpp b/libsmtutil/Sorts.cpp
deleted file mode 100644
index b45bb303c892..000000000000
--- a/libsmtutil/Sorts.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-
-#include <libsmtutil/Sorts.h>
-
-namespace solidity::smtutil
-{
-
-std::shared_ptr<Sort> const SortProvider::boolSort{std::make_shared<Sort>(Kind::Bool)};
-std::shared_ptr<IntSort> const SortProvider::uintSort{std::make_shared<IntSort>(false)};
-std::shared_ptr<IntSort> const SortProvider::sintSort{std::make_shared<IntSort>(true)};
-
-std::shared_ptr<IntSort> SortProvider::intSort(bool _signed)
-{
-	if (_signed)
-		return sintSort;
-	return uintSort;
-}
-
-std::shared_ptr<BitVectorSort> const SortProvider::bitVectorSort{std::make_shared<BitVectorSort>(256)};
-
-}
diff --git a/libsmtutil/Sorts.h b/libsmtutil/Sorts.h
deleted file mode 100644
index 419ee9dc5a25..000000000000
--- a/libsmtutil/Sorts.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/Exceptions.h>
-
-#include <libsolutil/Common.h>
-
-#include <memory>
-#include <vector>
-
-namespace solidity::smtutil
-{
-
-enum class Kind
-{
-	Int,
-	Bool,
-	BitVector,
-	Function,
-	Array,
-	Sort,
-	Tuple
-};
-
-struct Sort
-{
-	Sort(Kind _kind):
-		kind(_kind) {}
-	virtual ~Sort() = default;
-	virtual bool operator==(Sort const& _other) const { return kind == _other.kind; }
-
-	Kind const kind;
-};
-using SortPointer = std::shared_ptr<Sort>;
-
-struct IntSort: public Sort
-{
-	IntSort(bool _signed):
-		Sort(Kind::Int),
-		isSigned(_signed)
-	{}
-
-	bool operator==(Sort const& _other) const override
-	{
-		if (!Sort::operator==(_other))
-			return false;
-
-		auto otherIntSort = dynamic_cast<IntSort const*>(&_other);
-		smtAssert(otherIntSort);
-		return isSigned == otherIntSort->isSigned;
-	}
-
-	bool isSigned;
-};
-
-struct BitVectorSort: public Sort
-{
-	BitVectorSort(unsigned _size):
-		Sort(Kind::BitVector),
-		size(_size)
-	{}
-
-	bool operator==(Sort const& _other) const override
-	{
-		if (!Sort::operator==(_other))
-			return false;
-
-		auto otherBitVectorSort = dynamic_cast<BitVectorSort const*>(&_other);
-		smtAssert(otherBitVectorSort);
-		return size == otherBitVectorSort->size;
-	}
-
-	unsigned size;
-};
-
-struct FunctionSort: public Sort
-{
-	FunctionSort(std::vector<SortPointer> _domain, SortPointer _codomain):
-		Sort(Kind::Function), domain(std::move(_domain)), codomain(std::move(_codomain)) {}
-	bool operator==(Sort const& _other) const override
-	{
-		if (!Sort::operator==(_other))
-			return false;
-		auto _otherFunction = dynamic_cast<FunctionSort const*>(&_other);
-		smtAssert(_otherFunction, "");
-		if (domain.size() != _otherFunction->domain.size())
-			return false;
-		if (!std::equal(
-			domain.begin(),
-			domain.end(),
-			_otherFunction->domain.begin(),
-			[&](SortPointer _a, SortPointer _b) { return *_a == *_b; }
-		))
-			return false;
-		smtAssert(codomain, "");
-		smtAssert(_otherFunction->codomain, "");
-		return *codomain == *_otherFunction->codomain;
-	}
-
-	std::vector<SortPointer> domain;
-	SortPointer codomain;
-};
-
-struct ArraySort: public Sort
-{
-	/// _domain is the sort of the indices
-	/// _range is the sort of the values
-	ArraySort(SortPointer _domain, SortPointer _range):
-		Sort(Kind::Array), domain(std::move(_domain)), range(std::move(_range)) {}
-	bool operator==(Sort const& _other) const override
-	{
-		if (!Sort::operator==(_other))
-			return false;
-		auto _otherArray = dynamic_cast<ArraySort const*>(&_other);
-		smtAssert(_otherArray, "");
-		smtAssert(_otherArray->domain, "");
-		smtAssert(_otherArray->range, "");
-		smtAssert(domain, "");
-		smtAssert(range, "");
-		return *domain == *_otherArray->domain && *range == *_otherArray->range;
-	}
-
-	SortPointer domain;
-	SortPointer range;
-};
-
-struct SortSort: public Sort
-{
-	SortSort(SortPointer _inner): Sort(Kind::Sort), inner(std::move(_inner)) {}
-	bool operator==(Sort const& _other) const override
-	{
-		if (!Sort::operator==(_other))
-			return false;
-		auto _otherSort = dynamic_cast<SortSort const*>(&_other);
-		smtAssert(_otherSort, "");
-		smtAssert(_otherSort->inner, "");
-		smtAssert(inner, "");
-		return *inner == *_otherSort->inner;
-	}
-
-	SortPointer inner;
-};
-
-struct TupleSort: public Sort
-{
-	TupleSort(
-		std::string _name,
-		std::vector<std::string> _members,
-		std::vector<SortPointer> _components
-	):
-		Sort(Kind::Tuple),
-		name(std::move(_name)),
-		members(std::move(_members)),
-		components(std::move(_components))
-	{
-		for (size_t i = 0; i < members.size(); ++i)
-			memberToIndex[members.at(i)] = i;
-	}
-
-	SortPointer memberSort(std::string const& _member)
-	{
-		return components.at(memberToIndex.at(_member));
-	}
-
-	bool operator==(Sort const& _other) const override
-	{
-		if (!Sort::operator==(_other))
-			return false;
-		auto _otherTuple = dynamic_cast<TupleSort const*>(&_other);
-		smtAssert(_otherTuple, "");
-		if (name != _otherTuple->name)
-			return false;
-		if (members != _otherTuple->members)
-			return false;
-		if (components.size() != _otherTuple->components.size())
-			return false;
-		if (!std::equal(
-			components.begin(),
-			components.end(),
-			_otherTuple->components.begin(),
-			[&](SortPointer _a, SortPointer _b) { return *_a == *_b; }
-		))
-			return false;
-		return true;
-	}
-
-	std::string const name;
-	std::vector<std::string> const members;
-	std::vector<SortPointer> const components;
-	std::map<std::string, size_t> memberToIndex;
-};
-
-
-/** Frequently used sorts.*/
-struct SortProvider
-{
-	static std::shared_ptr<Sort> const boolSort;
-	static std::shared_ptr<IntSort> const uintSort;
-	static std::shared_ptr<IntSort> const sintSort;
-	static std::shared_ptr<IntSort> intSort(bool _signed = false);
-	static std::shared_ptr<BitVectorSort> const bitVectorSort;
-};
-
-}
diff --git a/libsmtutil/Z3CHCInterface.cpp b/libsmtutil/Z3CHCInterface.cpp
deleted file mode 100644
index a25890e8d10a..000000000000
--- a/libsmtutil/Z3CHCInterface.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/Z3CHCInterface.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <set>
-#include <stack>
-
-using namespace solidity;
-using namespace solidity::smtutil;
-
-Z3CHCInterface::Z3CHCInterface(std::optional<unsigned> _queryTimeout):
-	CHCSolverInterface(_queryTimeout),
-	m_z3Interface(std::make_unique<Z3Interface>(m_queryTimeout)),
-	m_context(m_z3Interface->context()),
-	m_solver(*m_context)
-{
-	Z3_get_version(
-		&std::get<0>(m_version),
-		&std::get<1>(m_version),
-		&std::get<2>(m_version),
-		&std::get<3>(m_version)
-	);
-
-	// These need to be set globally.
-	z3::set_param("rewriter.pull_cheap_ite", true);
-
-	if (m_queryTimeout)
-		m_context->set("timeout", int(*m_queryTimeout));
-	else
-		z3::set_param("rlimit", Z3Interface::resourceLimit);
-
-	setSpacerOptions();
-}
-
-void Z3CHCInterface::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	m_z3Interface->declareVariable(_name, _sort);
-}
-
-void Z3CHCInterface::registerRelation(Expression const& _expr)
-{
-	m_solver.register_relation(m_z3Interface->functions().at(_expr.name));
-}
-
-void Z3CHCInterface::addRule(Expression const& _expr, std::string const& _name)
-{
-	z3::expr rule = m_z3Interface->toZ3Expr(_expr);
-	if (m_z3Interface->constants().empty())
-		m_solver.add_rule(rule, m_context->str_symbol(_name.c_str()));
-	else
-	{
-		z3::expr_vector variables(*m_context);
-		for (auto const& var: m_z3Interface->constants())
-			variables.push_back(var.second);
-		z3::expr boundRule = z3::forall(variables, rule);
-		m_solver.add_rule(boundRule, m_context->str_symbol(_name.c_str()));
-	}
-}
-
-std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression const& _expr)
-{
-	CheckResult result;
-	try
-	{
-		z3::expr z3Expr = m_z3Interface->toZ3Expr(_expr);
-		switch (m_solver.query(z3Expr))
-		{
-		case z3::check_result::sat:
-		{
-			result = CheckResult::SATISFIABLE;
-			// z3 version 4.8.8 modified Spacer to also return
-			// proofs containing nonlinear clauses.
-			if (m_version >= std::tuple(4, 8, 8, 0))
-			{
-				auto proof = m_solver.get_answer();
-				return {result, Expression(true), cexGraph(proof)};
-			}
-			break;
-		}
-		case z3::check_result::unsat:
-		{
-			result = CheckResult::UNSATISFIABLE;
-			auto invariants = m_z3Interface->fromZ3Expr(m_solver.get_answer());
-			return {result, std::move(invariants), {}};
-		}
-		case z3::check_result::unknown:
-		{
-			result = CheckResult::UNKNOWN;
-			break;
-		}
-		}
-		// TODO retrieve model / invariants
-	}
-	catch (z3::exception const& _err)
-	{
-		std::set<std::string> msgs{
-			/// Resource limit (rlimit) exhausted.
-			"max. resource limit exceeded",
-			/// User given timeout exhausted.
-			"canceled"
-		};
-		if (msgs.count(_err.msg()))
-			result = CheckResult::UNKNOWN;
-		else
-			result = CheckResult::ERROR;
-	}
-
-	return {result, Expression(true), {}};
-}
-
-void Z3CHCInterface::setSpacerOptions(bool _preProcessing)
-{
-	// Spacer options.
-	// These needs to be set in the solver.
-	// https://github.com/Z3Prover/z3/blob/master/src/muz/base/fp_params.pyg
-	z3::params p(*m_context);
-	// These are useful for solving problems with arrays and loops.
-	// Use quantified lemma generalizer.
-	p.set("fp.spacer.q3.use_qgen", true);
-	p.set("fp.spacer.mbqi", false);
-	// Ground pobs by using values from a model.
-	p.set("fp.spacer.ground_pobs", false);
-
-	// Spacer optimization should be
-	// - enabled for better solving (default)
-	// - disable for counterexample generation
-	p.set("fp.xform.slice", _preProcessing);
-	p.set("fp.xform.inline_linear", _preProcessing);
-	p.set("fp.xform.inline_eager", _preProcessing);
-
-	m_solver.set(p);
-}
-
-/**
-Convert a ground refutation into a linear or nonlinear counterexample.
-The counterexample is given as an implication graph of the form
-`premises => conclusion` where `premises` are the predicates
-from the body of nonlinear clauses, representing the proof graph.
-
-This function is based on and similar to
-https://github.com/Z3Prover/z3/blob/z3-4.8.8/src/muz/spacer/spacer_context.cpp#L2919
-(spacer::context::get_ground_sat_answer)
-which generates linear counterexamples.
-It is modified here to accept nonlinear CHCs as well, generating a DAG
-instead of a path.
-*/
-CHCSolverInterface::CexGraph Z3CHCInterface::cexGraph(z3::expr const& _proof)
-{
-	/// The root fact of the refutation proof is `false`.
-	/// The node itself is not a hyper resolution, so we need to
-	/// extract the `query` hyper resolution node from the
-	/// `false` node (the first child).
-	/// The proof has the shape above for z3 >=4.8.8.
-	/// If an older version is used, this check will fail and no
-	/// counterexample will be generated.
-	if (!_proof.is_app() || fact(_proof).decl().decl_kind() != Z3_OP_FALSE)
-		return {};
-
-	CexGraph graph;
-
-	std::stack<z3::expr> proofStack;
-	proofStack.push(_proof.arg(0));
-
-	auto const& root = proofStack.top();
-	graph.nodes.emplace(root.id(), m_z3Interface->fromZ3Expr(fact(root)));
-
-	std::set<unsigned> visited;
-	visited.insert(root.id());
-
-	while (!proofStack.empty())
-	{
-		z3::expr proofNode = proofStack.top();
-		smtAssert(graph.nodes.count(proofNode.id()), "");
-		proofStack.pop();
-
-		if (proofNode.is_app() && proofNode.decl().decl_kind() == Z3_OP_PR_HYPER_RESOLVE)
-		{
-			smtAssert(proofNode.num_args() > 0, "");
-			for (unsigned i = 1; i < proofNode.num_args() - 1; ++i)
-			{
-				z3::expr child = proofNode.arg(i);
-				if (!visited.count(child.id()))
-				{
-					visited.insert(child.id());
-					proofStack.push(child);
-				}
-
-				if (!graph.nodes.count(child.id()))
-				{
-					graph.nodes.emplace(child.id(), m_z3Interface->fromZ3Expr(fact(child)));
-					graph.edges[child.id()] = {};
-				}
-
-				graph.edges[proofNode.id()].push_back(child.id());
-			}
-		}
-	}
-
-	return graph;
-}
-
-z3::expr Z3CHCInterface::fact(z3::expr const& _node)
-{
-	smtAssert(_node.is_app(), "");
-	if (_node.num_args() == 0)
-		return _node;
-	return _node.arg(_node.num_args() - 1);
-}
-
-std::string Z3CHCInterface::name(z3::expr const& _predicate)
-{
-	smtAssert(_predicate.is_app(), "");
-	return _predicate.decl().name().str();
-}
-
-std::vector<std::string> Z3CHCInterface::arguments(z3::expr const& _predicate)
-{
-	smtAssert(_predicate.is_app(), "");
-	std::vector<std::string> args;
-	for (unsigned i = 0; i < _predicate.num_args(); ++i)
-		args.emplace_back(_predicate.arg(i).to_string());
-	return args;
-}
diff --git a/libsmtutil/Z3CHCInterface.h b/libsmtutil/Z3CHCInterface.h
deleted file mode 100644
index 5a768f65cb8f..000000000000
--- a/libsmtutil/Z3CHCInterface.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/**
- * Z3 specific Horn solver interface.
- */
-
-#pragma once
-
-#include <libsmtutil/CHCSolverInterface.h>
-#include <libsmtutil/Z3Interface.h>
-
-#include <tuple>
-#include <vector>
-
-namespace solidity::smtutil
-{
-
-class Z3CHCInterface: public CHCSolverInterface
-{
-public:
-	Z3CHCInterface(std::optional<unsigned> _queryTimeout = {});
-
-	/// Forwards variable declaration to Z3Interface.
-	void declareVariable(std::string const& _name, SortPointer const& _sort) override;
-
-	void registerRelation(Expression const& _expr) override;
-
-	void addRule(Expression const& _expr, std::string const& _name) override;
-
-	std::tuple<CheckResult, Expression, CexGraph> query(Expression const& _expr) override;
-
-	Z3Interface* z3Interface() const { return m_z3Interface.get(); }
-
-	void setSpacerOptions(bool _preProcessing = true);
-
-private:
-	/// Constructs a nonlinear counterexample graph from the refutation.
-	CHCSolverInterface::CexGraph cexGraph(z3::expr const& _proof);
-	/// @returns the fact from a proof node.
-	z3::expr fact(z3::expr const& _node);
-	/// @returns @a _predicate's name.
-	std::string name(z3::expr const& _predicate);
-	/// @returns the arguments of @a _predicate.
-	std::vector<std::string> arguments(z3::expr const& _predicate);
-
-	// Used to handle variables.
-	std::unique_ptr<Z3Interface> m_z3Interface;
-
-	z3::context* m_context;
-	// Horn solver.
-	z3::fixedpoint m_solver;
-
-	std::tuple<unsigned, unsigned, unsigned, unsigned> m_version = std::tuple(0, 0, 0, 0);
-};
-
-}
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
deleted file mode 100644
index a16e75668e40..000000000000
--- a/libsmtutil/Z3Interface.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/Z3Interface.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-
-#ifdef HAVE_Z3_DLOPEN
-#include <libsmtutil/Z3Loader.h>
-#endif
-
-using namespace solidity::smtutil;
-using namespace solidity::util;
-
-bool Z3Interface::available()
-{
-#ifdef HAVE_Z3_DLOPEN
-	return Z3Loader::get().available();
-#else
-	return true;
-#endif
-}
-
-Z3Interface::Z3Interface(std::optional<unsigned> _queryTimeout):
-	SolverInterface(_queryTimeout),
-	m_solver(m_context)
-{
-	// These need to be set globally.
-	z3::set_param("rewriter.pull_cheap_ite", true);
-
-	if (m_queryTimeout)
-		m_context.set("timeout", int(*m_queryTimeout));
-	else
-		z3::set_param("rlimit", resourceLimit);
-}
-
-void Z3Interface::reset()
-{
-	m_constants.clear();
-	m_functions.clear();
-	m_solver.reset();
-}
-
-void Z3Interface::push()
-{
-	m_solver.push();
-}
-
-void Z3Interface::pop()
-{
-	m_solver.pop();
-}
-
-void Z3Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	if (_sort->kind == Kind::Function)
-		declareFunction(_name, *_sort);
-	else if (m_constants.count(_name))
-		m_constants.at(_name) = m_context.constant(_name.c_str(), z3Sort(*_sort));
-	else
-		m_constants.emplace(_name, m_context.constant(_name.c_str(), z3Sort(*_sort)));
-}
-
-void Z3Interface::declareFunction(std::string const& _name, Sort const& _sort)
-{
-	smtAssert(_sort.kind == Kind::Function, "");
-	FunctionSort fSort = dynamic_cast<FunctionSort const&>(_sort);
-	if (m_functions.count(_name))
-		m_functions.at(_name) = m_context.function(_name.c_str(), z3Sort(fSort.domain), z3Sort(*fSort.codomain));
-	else
-		m_functions.emplace(_name, m_context.function(_name.c_str(), z3Sort(fSort.domain), z3Sort(*fSort.codomain)));
-}
-
-void Z3Interface::addAssertion(Expression const& _expr)
-{
-	m_solver.add(toZ3Expr(_expr));
-}
-
-std::pair<CheckResult, std::vector<std::string>> Z3Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	CheckResult result;
-	std::vector<std::string> values;
-	try
-	{
-		switch (m_solver.check())
-		{
-		case z3::check_result::sat:
-			result = CheckResult::SATISFIABLE;
-			break;
-		case z3::check_result::unsat:
-			result = CheckResult::UNSATISFIABLE;
-			break;
-		case z3::check_result::unknown:
-			result = CheckResult::UNKNOWN;
-			break;
-		}
-
-		if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
-		{
-			z3::model m = m_solver.get_model();
-			for (Expression const& e: _expressionsToEvaluate)
-				values.push_back(util::toString(m.eval(toZ3Expr(e))));
-		}
-	}
-	catch (z3::exception const& _err)
-	{
-		std::set<std::string> msgs{
-			/// Resource limit (rlimit) exhausted.
-			"max. resource limit exceeded",
-			/// User given timeout exhausted.
-			"canceled"
-		};
-
-		if (msgs.count(_err.msg()))
-			result = CheckResult::UNKNOWN;
-		else
-			result = CheckResult::ERROR;
-		values.clear();
-	}
-
-	return std::make_pair(result, values);
-}
-
-z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
-{
-	if (_expr.arguments.empty() && m_constants.count(_expr.name))
-		return m_constants.at(_expr.name);
-	z3::expr_vector arguments(m_context);
-	for (auto const& arg: _expr.arguments)
-		arguments.push_back(toZ3Expr(arg));
-
-	try
-	{
-		std::string const& n = _expr.name;
-		if (m_functions.count(n))
-			return m_functions.at(n)(arguments);
-		else if (m_constants.count(n))
-		{
-			smtAssert(arguments.empty(), "");
-			return m_constants.at(n);
-		}
-		else if (arguments.empty())
-		{
-			if (n == "true")
-				return m_context.bool_val(true);
-			else if (n == "false")
-				return m_context.bool_val(false);
-			else if (_expr.sort->kind == Kind::Sort)
-			{
-				auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.sort);
-				smtAssert(sortSort, "");
-				return m_context.constant(n.c_str(), z3Sort(*sortSort->inner));
-			}
-			else
-				try
-				{
-					return m_context.int_val(n.c_str());
-				}
-				catch (z3::exception const& _e)
-				{
-					smtAssert(false, _e.msg());
-				}
-		}
-
-		smtAssert(_expr.hasCorrectArity(), "");
-		if (n == "ite")
-			return z3::ite(arguments[0], arguments[1], arguments[2]);
-		else if (n == "not")
-			return !arguments[0];
-		else if (n == "and")
-			return arguments[0] && arguments[1];
-		else if (n == "or")
-			return arguments[0] || arguments[1];
-		else if (n == "=>")
-			return z3::implies(arguments[0], arguments[1]);
-		else if (n == "=")
-			return arguments[0] == arguments[1];
-		else if (n == "<")
-			return arguments[0] < arguments[1];
-		else if (n == "<=")
-			return arguments[0] <= arguments[1];
-		else if (n == ">")
-			return arguments[0] > arguments[1];
-		else if (n == ">=")
-			return arguments[0] >= arguments[1];
-		else if (n == "+")
-			return arguments[0] + arguments[1];
-		else if (n == "-")
-			return arguments[0] - arguments[1];
-		else if (n == "*")
-			return arguments[0] * arguments[1];
-		else if (n == "div")
-			return arguments[0] / arguments[1];
-		else if (n == "mod")
-			return z3::mod(arguments[0], arguments[1]);
-		else if (n == "bvnot")
-			return ~arguments[0];
-		else if (n == "bvand")
-			return arguments[0] & arguments[1];
-		else if (n == "bvor")
-			return arguments[0] | arguments[1];
-		else if (n == "bvxor")
-			return arguments[0] ^ arguments[1];
-		else if (n == "bvshl")
-			return z3::shl(arguments[0], arguments[1]);
-		else if (n == "bvlshr")
-			return z3::lshr(arguments[0], arguments[1]);
-		else if (n == "bvashr")
-			return z3::ashr(arguments[0], arguments[1]);
-		else if (n == "int2bv")
-		{
-			size_t size = std::stoul(_expr.arguments[1].name);
-			return z3::int2bv(static_cast<unsigned>(size), arguments[0]);
-		}
-		else if (n == "bv2int")
-		{
-			auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
-			smtAssert(intSort, "");
-			return z3::bv2int(arguments[0], intSort->isSigned);
-		}
-		else if (n == "select")
-			return z3::select(arguments[0], arguments[1]);
-		else if (n == "store")
-			return z3::store(arguments[0], arguments[1], arguments[2]);
-		else if (n == "const_array")
-		{
-			std::shared_ptr<SortSort> sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments[0].sort);
-			smtAssert(sortSort, "");
-			auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
-			smtAssert(arraySort && arraySort->domain, "");
-			return z3::const_array(z3Sort(*arraySort->domain), arguments[1]);
-		}
-		else if (n == "tuple_get")
-		{
-			size_t index = stoul(_expr.arguments[1].name);
-			return z3::func_decl(m_context, Z3_get_tuple_sort_field_decl(m_context, z3Sort(*_expr.arguments[0].sort), static_cast<unsigned>(index)))(arguments[0]);
-		}
-		else if (n == "tuple_constructor")
-		{
-			auto constructor = z3::func_decl(m_context, Z3_get_tuple_sort_mk_decl(m_context, z3Sort(*_expr.sort)));
-			smtAssert(constructor.arity() == arguments.size(), "");
-			z3::expr_vector args(m_context);
-			for (auto const& arg: arguments)
-				args.push_back(arg);
-			return constructor(args);
-		}
-
-		smtAssert(false);
-	}
-	catch (z3::exception const& _e)
-	{
-		smtAssert(false, _e.msg());
-	}
-
-	smtAssert(false);
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
-{
-	auto sort = fromZ3Sort(_expr.get_sort());
-	if (_expr.is_const() || _expr.is_var())
-		return Expression(_expr.to_string(), {}, sort);
-
-	if (_expr.is_quantifier())
-	{
-		std::string quantifierName;
-		if (_expr.is_exists())
-			quantifierName = "exists";
-		else if (_expr.is_forall())
-			quantifierName = "forall";
-		else if (_expr.is_lambda())
-			quantifierName = "lambda";
-		else
-			smtAssert(false, "");
-		return Expression(quantifierName, {fromZ3Expr(_expr.body())}, sort);
-	}
-	smtAssert(_expr.is_app(), "");
-	std::vector<Expression> arguments;
-	for (unsigned i = 0; i < _expr.num_args(); ++i)
-		arguments.push_back(fromZ3Expr(_expr.arg(i)));
-
-	auto kind = _expr.decl().decl_kind();
-
-	if (_expr.is_ite())
-		return Expression::ite(arguments[0], arguments[1], arguments[2]);
-	else if (_expr.is_not())
-		return !arguments[0];
-	else if (_expr.is_and())
-		return Expression::mkAnd(arguments);
-	else if (_expr.is_or())
-		return Expression::mkOr(arguments);
-	else if (_expr.is_implies())
-		return Expression::implies(arguments[0], arguments[1]);
-	else if (_expr.is_eq())
-	{
-		smtAssert(arguments.size() == 2, "");
-		return arguments[0] == arguments[1];
-	}
-	else if (kind == Z3_OP_ULT || kind == Z3_OP_SLT)
-		return arguments[0] < arguments[1];
-	else if (kind == Z3_OP_LE || kind == Z3_OP_ULEQ || kind == Z3_OP_SLEQ)
-		return arguments[0] <= arguments[1];
-	else if (kind == Z3_OP_GT || kind == Z3_OP_SGT)
-		return arguments[0] > arguments[1];
-	else if (kind == Z3_OP_GE || kind == Z3_OP_UGEQ || kind == Z3_OP_SGEQ)
-		return arguments[0] >= arguments[1];
-	else if (kind == Z3_OP_ADD)
-		return Expression::mkPlus(arguments);
-	else if (kind == Z3_OP_SUB)
-	{
-		smtAssert(arguments.size() == 2, "");
-		return arguments[0] - arguments[1];
-	}
-	else if (kind == Z3_OP_MUL)
-		return Expression::mkMul(arguments);
-	else if (kind == Z3_OP_DIV)
-	{
-		smtAssert(arguments.size() == 2, "");
-		return arguments[0] / arguments[1];
-	}
-	else if (kind == Z3_OP_MOD)
-		return arguments[0] % arguments[1];
-	else if (kind == Z3_OP_XOR)
-		return arguments[0] ^ arguments[1];
-	else if (kind == Z3_OP_BOR)
-		return arguments[0] | arguments[1];
-	else if (kind == Z3_OP_BAND)
-		return arguments[0] & arguments[1];
-	else if (kind == Z3_OP_BXOR)
-		return arguments[0] ^ arguments[1];
-	else if (kind == Z3_OP_BNOT)
-		return !arguments[0];
-	else if (kind == Z3_OP_BSHL)
-		return arguments[0] << arguments[1];
-	else if (kind == Z3_OP_BLSHR)
-		return arguments[0] >> arguments[1];
-	else if (kind == Z3_OP_BASHR)
-		return Expression::ashr(arguments[0], arguments[1]);
-	else if (kind == Z3_OP_INT2BV)
-		return Expression::int2bv(arguments[0], _expr.get_sort().bv_size());
-	else if (kind == Z3_OP_BV2INT)
-		return Expression::bv2int(arguments[0]);
-	else if (kind == Z3_OP_EXTRACT)
-		return Expression("extract", arguments, sort);
-	else if (kind == Z3_OP_SELECT)
-		return Expression::select(arguments[0], arguments[1]);
-	else if (kind == Z3_OP_STORE)
-		return Expression::store(arguments[0], arguments[1], arguments[2]);
-	else if (kind == Z3_OP_CONST_ARRAY)
-	{
-		auto sortSort = std::make_shared<SortSort>(fromZ3Sort(_expr.get_sort()));
-		return Expression::const_array(Expression(sortSort), arguments[0]);
-	}
-	else if (kind == Z3_OP_DT_CONSTRUCTOR)
-	{
-		auto sortSort = std::make_shared<SortSort>(fromZ3Sort(_expr.get_sort()));
-		return Expression::tuple_constructor(Expression(sortSort), arguments);
-	}
-	else if (kind == Z3_OP_DT_ACCESSOR)
-		return Expression("dt_accessor_" + _expr.decl().name().str(), arguments, sort);
-	else if (kind == Z3_OP_DT_IS)
-		return Expression("dt_is", {arguments.at(0)}, sort);
-	else if (
-		kind == Z3_OP_UNINTERPRETED ||
-		kind == Z3_OP_RECURSIVE
-	)
-		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
-
-	smtAssert(false);
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-z3::sort Z3Interface::z3Sort(Sort const& _sort)
-{
-	switch (_sort.kind)
-	{
-	case Kind::Bool:
-		return m_context.bool_sort();
-	case Kind::Int:
-		return m_context.int_sort();
-	case Kind::BitVector:
-		return m_context.bv_sort(dynamic_cast<BitVectorSort const&>(_sort).size);
-	case Kind::Array:
-	{
-		auto const& arraySort = dynamic_cast<ArraySort const&>(_sort);
-		return m_context.array_sort(z3Sort(*arraySort.domain), z3Sort(*arraySort.range));
-	}
-	case Kind::Tuple:
-	{
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
-		std::vector<char const*> cMembers;
-		for (auto const& member: tupleSort.members)
-			cMembers.emplace_back(member.c_str());
-		/// Using this instead of the function below because with that one
-		/// we can't use `&sorts[0]` here.
-		std::vector<z3::sort> sorts;
-		for (auto const& sort: tupleSort.components)
-			sorts.push_back(z3Sort(*sort));
-		z3::func_decl_vector projs(m_context);
-		z3::func_decl tupleConstructor = m_context.tuple_sort(
-			tupleSort.name.c_str(),
-			static_cast<unsigned>(tupleSort.members.size()),
-			cMembers.data(),
-			sorts.data(),
-			projs
-		);
-		return tupleConstructor.range();
-	}
-
-	default:
-		break;
-	}
-	smtAssert(false, "");
-	// Cannot be reached.
-	return m_context.int_sort();
-}
-
-z3::sort_vector Z3Interface::z3Sort(std::vector<SortPointer> const& _sorts)
-{
-	z3::sort_vector z3Sorts(m_context);
-	for (auto const& _sort: _sorts)
-		z3Sorts.push_back(z3Sort(*_sort));
-	return z3Sorts;
-}
-
-SortPointer Z3Interface::fromZ3Sort(z3::sort const& _sort)
-{
-	if (_sort.is_bool())
-		return SortProvider::boolSort;
-	if (_sort.is_int())
-		return SortProvider::sintSort;
-	if (_sort.is_bv())
-		return std::make_shared<BitVectorSort>(_sort.bv_size());
-	if (_sort.is_array())
-		return std::make_shared<ArraySort>(fromZ3Sort(_sort.array_domain()), fromZ3Sort(_sort.array_range()));
-	if (_sort.is_datatype())
-	{
-		auto name = _sort.name().str();
-		auto constructor = z3::func_decl(m_context, Z3_get_tuple_sort_mk_decl(m_context, _sort));
-		std::vector<std::string> memberNames;
-		std::vector<SortPointer> memberSorts;
-		for (unsigned i = 0; i < constructor.arity(); ++i)
-		{
-			auto accessor = z3::func_decl(m_context, Z3_get_tuple_sort_field_decl(m_context, _sort, i));
-			memberNames.push_back(accessor.name().str());
-			memberSorts.push_back(fromZ3Sort(accessor.range()));
-		}
-		return std::make_shared<TupleSort>(name, memberNames, memberSorts);
-	}
-	smtAssert(false, "");
-}
-
-std::vector<SortPointer> Z3Interface::fromZ3Sort(z3::sort_vector const& _sorts)
-{
-	return applyMap(_sorts, [this](auto const& sort) { return fromZ3Sort(sort); });
-}
diff --git a/libsmtutil/Z3Interface.h b/libsmtutil/Z3Interface.h
deleted file mode 100644
index ee268ac41d65..000000000000
--- a/libsmtutil/Z3Interface.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-#include <z3++.h>
-
-namespace solidity::smtutil
-{
-
-class Z3Interface: public SolverInterface
-{
-public:
-	/// Noncopyable.
-	Z3Interface(Z3Interface const&) = delete;
-	Z3Interface& operator=(Z3Interface const&) = delete;
-
-	Z3Interface(std::optional<unsigned> _queryTimeout = {});
-
-	static bool available();
-
-	void reset() override;
-
-	void push() override;
-	void pop() override;
-
-	void declareVariable(std::string const& _name, SortPointer const& _sort) override;
-
-	void addAssertion(Expression const& _expr) override;
-	std::pair<CheckResult, std::vector<std::string>> check(std::vector<Expression> const& _expressionsToEvaluate) override;
-
-	z3::expr toZ3Expr(Expression const& _expr);
-	smtutil::Expression fromZ3Expr(z3::expr const& _expr);
-
-	std::map<std::string, z3::expr> constants() const { return m_constants; }
-	std::map<std::string, z3::func_decl> functions() const { return m_functions; }
-
-	z3::context* context() { return &m_context; }
-
-	// Z3 "basic resources" limit.
-	// This is used to make the runs more deterministic and platform/machine independent.
-	static int const resourceLimit = 1000000;
-
-private:
-	void declareFunction(std::string const& _name, Sort const& _sort);
-
-	z3::sort z3Sort(Sort const& _sort);
-	z3::sort_vector z3Sort(std::vector<SortPointer> const& _sorts);
-	smtutil::SortPointer fromZ3Sort(z3::sort const& _sort);
-	std::vector<smtutil::SortPointer> fromZ3Sort(z3::sort_vector const& _sorts);
-
-	z3::context m_context;
-	z3::solver m_solver;
-
-	std::map<std::string, z3::expr> m_constants;
-	std::map<std::string, z3::func_decl> m_functions;
-};
-
-}
diff --git a/libsmtutil/Z3Loader.cpp b/libsmtutil/Z3Loader.cpp
deleted file mode 100644
index 0211f600d9f1..000000000000
--- a/libsmtutil/Z3Loader.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsmtutil/Z3Loader.h>
-#include <libsmtutil/Exceptions.h>
-#include <z3.h>
-#include <z3_version.h>
-#include <vector>
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <dlfcn.h>
-
-using namespace solidity;
-using namespace solidity::smtutil;
-
-Z3Loader const& Z3Loader::get()
-{
-	static Z3Loader z3;
-	return z3;
-}
-
-void* Z3Loader::loadSymbol(char const* _name) const
-{
-	smtAssert(m_handle, "Attempted to use dynamically loaded Z3, even though it is not available.");
-	void* sym = dlsym(m_handle, _name);
-	smtAssert(sym, std::string("Symbol \"") + _name + "\" not found in libz3.so");
-	return sym;
-}
-
-bool Z3Loader::available() const
-{
-	if (m_handle == nullptr)
-		return false;
-	unsigned major = 0;
-	unsigned minor = 0;
-	unsigned build = 0;
-	unsigned rev = 0;
-	Z3_get_version(&major, &minor, &build, &rev);
-	return major == Z3_MAJOR_VERSION && minor == Z3_MINOR_VERSION;
-}
-
-Z3Loader::Z3Loader()
-{
-	std::string libname{"libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION)};
-	m_handle = dlmopen(LM_ID_NEWLM, libname.c_str(), RTLD_NOW);
-}
-
-Z3Loader::~Z3Loader()
-{
-	if (m_handle)
-		dlclose(m_handle);
-}
diff --git a/libsmtutil/Z3Loader.h b/libsmtutil/Z3Loader.h
deleted file mode 100644
index 5e755cb24b0a..000000000000
--- a/libsmtutil/Z3Loader.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-namespace solidity::smtutil
-{
-
-class Z3Loader
-{
-public:
-	Z3Loader(Z3Loader const&) = delete;
-	Z3Loader& operator=(Z3Loader const&) = delete;
-	static Z3Loader const& get();
-	void* loadSymbol(char const* _name) const;
-	bool available() const;
-private:
-	Z3Loader();
-	~Z3Loader();
-	void* m_handle = nullptr;
-};
-
-}
\ No newline at end of file
diff --git a/libsmtutil/genz3wrapper.py b/libsmtutil/genz3wrapper.py
deleted file mode 100755
index 9b24b32dbfe1..000000000000
--- a/libsmtutil/genz3wrapper.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env python3
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#------------------------------------------------------------------------------
-#
-# Script that generates a dlsym-wrapper for Z3 from the header files.
-# Expects all Z3 headers as arguments and outputs the wrapper code to stdout.
-
-import sys
-import re
-
-# Patterns to match Z3 API entry point definitions.
-def_pat = re.compile(" *def_API(.*)")
-extradef_pat = re.compile(" *extra_API(.*)")
-# Pattern to extract name and arguments from the above.
-def_args_pat = re.compile("\('([^']*)'[^\(\)]*\((.*)\)\s*\)")
-# Pattern to extract a list of arguments from the above.
-arg_list_pat = re.compile("[^\(]*\([^\)]*\)[, ]*")
-
-def generateEntryPoint(line, args):
-    m = def_args_pat.match(args)
-    if not m:
-        raise Exception('Could not parse entry point definition: ' + line)
-    name = m.group(1)
-    num_args = len(arg_list_pat.findall(m.group(2)))
-    arglist = ', '.join(f"_{i}" for i in range(num_args))
-    paramlist = ', '.join(f"ArgType<&{name}, {i}> _{i}" for i in range(num_args))
-    print(f'ResultType<&{name}> Z3_API {name}({paramlist})')
-    print('{')
-    print(f'\tstatic auto sym = reinterpret_cast<decltype(&{name})>(Z3Loader::get().loadSymbol(\"{name}\"));')
-    print(f'\treturn sym({arglist});')
-    print('}')
-
-
-print(r"""// This file is auto-generated from genz3wrapper.py
-#include <libsmtutil/Z3Loader.h>
-#include <tuple>
-#include <z3.h>
-
-namespace
-{
-
-template<typename T>
-struct FunctionTrait;
-
-template<typename R, typename... Args>
-struct FunctionTrait<R(*)(Args...)>
-{
-    using ResultType = R;
-    template<unsigned N>
-    using ArgType = std::tuple_element_t<N, std::tuple<Args...>>;
-};
-
-template<auto F>
-using ResultType = typename FunctionTrait<decltype(F)>::ResultType;
-
-template<auto F, unsigned N>
-using ArgType = typename FunctionTrait<decltype(F)>::template ArgType<N>;
-
-}
-
-using namespace solidity;
-using namespace solidity::smtutil;
-
-extern "C"
-{
-
-void Z3_API Z3_set_error_handler(Z3_context c, Z3_error_handler h)
-{
-    static auto sym = reinterpret_cast<decltype(&Z3_set_error_handler)>(Z3Loader::get().loadSymbol("Z3_set_error_handler"));
-    sym(c, h);
-}
-""")
-
-for header in sys.argv[1:]:
-    with open(header, 'r') as f:
-        for line in f:
-            line = line.strip('\r\n\t ')
-            m = def_pat.match(line)
-            if m:
-                generateEntryPoint(line, m.group(1).strip('\r\n\t '))
-            m = extradef_pat.match(line)
-            if m:
-                generateEntryPoint(line, m.group(1).strip('\r\n\t '))
-
-print('}')
diff --git a/libsolc/CMakeLists.txt b/libsolc/CMakeLists.txt
deleted file mode 100644
index fce54dd24bb6..000000000000
--- a/libsolc/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-if (EMSCRIPTEN)
-	CreateExportedFunctionsForEMSDK(
-		ExportedFunctions
-		solidity_license
-		solidity_version
-		solidity_compile
-		solidity_alloc
-		solidity_free
-		solidity_reset
-	)
-	# Specify which functions to export in soljson.js.
-	# Note that additional Emscripten-generated methods needed by solc-js are
-	# defined to be exported in cmake/EthCompilerSettings.cmake.
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_FUNCTIONS='${ExportedFunctions}'")
-	add_executable(soljson libsolc.cpp libsolc.h)
-	target_link_libraries(soljson PRIVATE solidity)
-else()
-	add_library(libsolc libsolc.cpp libsolc.h)
-	set_target_properties(libsolc PROPERTIES OUTPUT_NAME solc)
-	target_link_libraries(libsolc PRIVATE solidity)
-endif()
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
deleted file mode 100644
index 105949253260..000000000000
--- a/libsolc/libsolc.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Public compiler API.
- */
-
-#include <libsolc/libsolc.h>
-#include <libsolidity/interface/StandardCompiler.h>
-#include <libsolidity/interface/Version.h>
-#include <libyul/YulString.h>
-
-#include <cstdlib>
-#include <list>
-#include <string>
-
-#include "license.h"
-
-using namespace solidity;
-using namespace solidity::util;
-
-using solidity::frontend::ReadCallback;
-using solidity::frontend::StandardCompiler;
-
-namespace
-{
-
-// The std::strings in this list must not be resized after they have been added here (via solidity_alloc()), because
-// this may potentially change the pointer that was passed to the caller from solidity_alloc().
-static std::list<std::string> solidityAllocations;
-
-/// Find the equivalent to @p _data in the list of allocations of solidity_alloc(),
-/// removes it from the list and returns its value.
-///
-/// If any invalid argument is being passed, it is considered a programming error
-/// on the caller-side and hence, will call abort() then.
-std::string takeOverAllocation(char const* _data)
-{
-	for (auto iter = begin(solidityAllocations); iter != end(solidityAllocations); ++iter)
-		if (iter->data() == _data)
-		{
-			std::string chunk = std::move(*iter);
-			solidityAllocations.erase(iter);
-			return chunk;
-		}
-
-	abort();
-}
-
-/// Resizes a std::std::string to the proper length based on the occurrence of a zero terminator.
-void truncateCString(std::string& _data)
-{
-	size_t pos = _data.find('\0');
-	if (pos != std::string::npos)
-		_data.resize(pos);
-}
-
-ReadCallback::Callback wrapReadCallback(CStyleReadFileCallback _readCallback, void* _readContext)
-{
-	ReadCallback::Callback readCallback;
-	if (_readCallback)
-	{
-		readCallback = [=](std::string const& _kind, std::string const& _data)
-		{
-			char* contents_c = nullptr;
-			char* error_c = nullptr;
-			_readCallback(_readContext, _kind.data(), _data.data(), &contents_c, &error_c);
-			ReadCallback::Result result;
-			result.success = true;
-			if (!contents_c && !error_c)
-			{
-				result.success = false;
-				result.responseOrErrorMessage = "Callback not supported.";
-			}
-			if (contents_c)
-			{
-				result.success = true;
-				result.responseOrErrorMessage = takeOverAllocation(contents_c);
-			}
-			if (error_c)
-			{
-				result.success = false;
-				result.responseOrErrorMessage = takeOverAllocation(error_c);
-			}
-			truncateCString(result.responseOrErrorMessage);
-			return result;
-		};
-	}
-	return readCallback;
-}
-
-std::string compile(std::string _input, CStyleReadFileCallback _readCallback, void* _readContext)
-{
-	StandardCompiler compiler(wrapReadCallback(_readCallback, _readContext));
-	return compiler.compile(std::move(_input));
-}
-
-}
-
-extern "C"
-{
-extern char const* solidity_license() noexcept
-{
-	static std::string fullLicenseText = otherLicenses + licenseText;
-	return fullLicenseText.c_str();
-}
-
-extern char const* solidity_version() noexcept
-{
-	return frontend::VersionString.c_str();
-}
-
-extern char* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback, void* _readContext) noexcept
-{
-	return solidityAllocations.emplace_back(compile(_input, _readCallback, _readContext)).data();
-}
-
-extern char* solidity_alloc(size_t _size) noexcept
-{
-	try
-	{
-		return solidityAllocations.emplace_back(_size, '\0').data();
-	}
-	catch (...)
-	{
-		// most likely a std::bad_alloc(), if at all.
-		return nullptr;
-	}
-}
-
-extern void solidity_free(char* _data) noexcept
-{
-	takeOverAllocation(_data);
-}
-
-extern void solidity_reset() noexcept
-{
-	// This is called right before each compilation, but not at the end, so additional memory
-	// can be freed here.
-	yul::YulStringRepository::reset();
-	solidityAllocations.clear();
-}
-}
diff --git a/libsolc/libsolc.h b/libsolc/libsolc.h
deleted file mode 100644
index c5b3b3db732b..000000000000
--- a/libsolc/libsolc.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Public compiler API.
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-#define SOLC_NOEXCEPT noexcept
-#else
-#define SOLC_NOEXCEPT
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/// Callback used to retrieve additional source files or data.
-///
-/// @param _context The readContext passed to solidity_compile. Can be NULL.
-/// @param _kind The kind of callback (a string).
-/// @param _data The data for the callback (a string).
-/// @param o_contents A pointer to the contents of the file, if found. Allocated via solidity_alloc().
-/// @param o_error A pointer to an error message, if there is one.
-///
-/// The file (as well as error) contents that is to be allocated by the callback
-/// implementor must use the solidity_alloc() API to allocate its underlying
-/// storage. Ownership is then transferred to the compiler which will take care
-/// of the deallocation.
-///
-/// If the callback is not supported, *o_contents and *o_error must be set to NULL.
-typedef void (*CStyleReadFileCallback)(void* _context, char const* _kind, char const* _data, char** o_contents, char** o_error);
-
-/// Returns the complete license document.
-///
-/// The pointer returned must NOT be freed by the caller.
-char const* solidity_license() SOLC_NOEXCEPT;
-
-/// Returns the compiler version.
-///
-/// The pointer returned must NOT be freed by the caller.
-char const* solidity_version() SOLC_NOEXCEPT;
-
-/// Allocates a chunk of memory of @p _size bytes.
-///
-/// Use this function inside callbacks to allocate data that is to be passed to
-/// the compiler. You may use solidity_free() or solidity_reset() to free this
-/// memory again but it is not required as the compiler takes ownership for any
-/// data passed to it via callbacks.
-///
-/// This function will return NULL if the requested memory region could not be allocated.
-char* solidity_alloc(size_t _size) SOLC_NOEXCEPT;
-
-/// Explicitly frees the memory (@p _data) that was being allocated with solidity_alloc()
-/// or returned by a call to solidity_compile().
-///
-/// Important, this call will abort() in case of any invalid argument being passed to this call.
-void solidity_free(char* _data) SOLC_NOEXCEPT;
-
-/// Takes a "Standard Input JSON" and an optional callback (can be set to null). Returns
-/// a "Standard Output JSON". Both are to be UTF-8 encoded.
-///
-/// @param _input The input JSON to process.
-/// @param _readCallback The optional callback pointer. Can be NULL, but if not NULL,
-///                      it can be called by the compiler to request additional input.
-///                      Please see the documentation of the type for details.
-/// @param _readContext An optional context pointer passed to _readCallback. Can be NULL.
-///
-/// @returns A pointer to the result. The pointer returned must be freed by the caller using solidity_free() or solidity_reset().
-char* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback, void* _readContext) SOLC_NOEXCEPT;
-
-/// Frees up any allocated memory.
-///
-/// NOTE: the pointer returned by solidity_compile as well as any other pointer retrieved via solidity_alloc()
-/// is invalid after calling this!
-void solidity_reset() SOLC_NOEXCEPT;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
deleted file mode 100644
index 0a8c90f36bbb..000000000000
--- a/libsolidity/CMakeLists.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-# Until we have a clear separation, libyul has to be included here
-set(sources
-	analysis/ConstantEvaluator.cpp
-	analysis/ConstantEvaluator.h
-	analysis/ContractLevelChecker.cpp
-	analysis/ContractLevelChecker.h
-	analysis/ControlFlowAnalyzer.cpp
-	analysis/ControlFlowAnalyzer.h
-	analysis/ControlFlowBuilder.cpp
-	analysis/ControlFlowBuilder.h
-	analysis/ControlFlowGraph.cpp
-	analysis/ControlFlowGraph.h
-	analysis/ControlFlowRevertPruner.cpp
-	analysis/ControlFlowRevertPruner.h
-	analysis/DeclarationContainer.cpp
-	analysis/DeclarationContainer.h
-	analysis/DeclarationTypeChecker.cpp
-	analysis/DeclarationTypeChecker.h
-	analysis/DocStringAnalyser.cpp
-	analysis/DocStringAnalyser.h
-	analysis/DocStringTagParser.cpp
-	analysis/DocStringTagParser.h
-	analysis/FunctionCallGraph.cpp
-	analysis/FunctionCallGraph.h
-	analysis/ImmutableValidator.cpp
-	analysis/ImmutableValidator.h
-	analysis/GlobalContext.cpp
-	analysis/GlobalContext.h
-	analysis/NameAndTypeResolver.cpp
-	analysis/NameAndTypeResolver.h
-	analysis/OverrideChecker.cpp
-	analysis/OverrideChecker.h
-	analysis/PostTypeChecker.cpp
-	analysis/PostTypeChecker.h
-	analysis/PostTypeContractLevelChecker.cpp
-	analysis/PostTypeContractLevelChecker.h
-	analysis/ReferencesResolver.cpp
-	analysis/ReferencesResolver.h
-	analysis/Scoper.cpp
-	analysis/Scoper.h
-	analysis/StaticAnalyzer.cpp
-	analysis/StaticAnalyzer.h
-	analysis/SyntaxChecker.cpp
-	analysis/SyntaxChecker.h
-	analysis/TypeChecker.cpp
-	analysis/TypeChecker.h
-	analysis/ViewPureChecker.cpp
-	analysis/ViewPureChecker.h
-	ast/AST.cpp
-	ast/AST.h
-	ast/AST_accept.h
-	ast/ASTAnnotations.cpp
-	ast/ASTAnnotations.h
-	ast/ASTEnums.h
-	ast/ASTForward.h
-	ast/ASTJsonExporter.cpp
-	ast/ASTJsonExporter.h
-	ast/ASTUtils.cpp
-	ast/ASTUtils.h
-	ast/ASTJsonImporter.cpp
-	ast/ASTJsonImporter.h
-	ast/ASTVisitor.h
-	ast/CallGraph.cpp
-	ast/CallGraph.h
-	ast/ExperimentalFeatures.h
-	ast/UserDefinableOperators.h
-	ast/Types.cpp
-	ast/Types.h
-	ast/TypeProvider.cpp
-	ast/TypeProvider.h
-	codegen/ABIFunctions.cpp
-	codegen/ABIFunctions.h
-	codegen/ArrayUtils.cpp
-	codegen/ArrayUtils.h
-	codegen/Compiler.cpp
-	codegen/Compiler.h
-	codegen/CompilerContext.cpp
-	codegen/CompilerContext.h
-	codegen/CompilerUtils.cpp
-	codegen/CompilerUtils.h
-	codegen/ContractCompiler.cpp
-	codegen/ContractCompiler.h
-	codegen/ExpressionCompiler.cpp
-	codegen/ExpressionCompiler.h
-	codegen/LValue.cpp
-	codegen/LValue.h
-	codegen/MultiUseYulFunctionCollector.h
-	codegen/MultiUseYulFunctionCollector.cpp
-	codegen/ReturnInfo.h
-	codegen/ReturnInfo.cpp
-	codegen/YulUtilFunctions.h
-	codegen/YulUtilFunctions.cpp
-	codegen/ir/Common.cpp
-	codegen/ir/Common.h
-	codegen/ir/IRGenerator.cpp
-	codegen/ir/IRGenerator.h
-	codegen/ir/IRGeneratorForStatements.cpp
-	codegen/ir/IRGeneratorForStatements.h
-	codegen/ir/IRGenerationContext.cpp
-	codegen/ir/IRGenerationContext.h
-	codegen/ir/IRLValue.h
-	codegen/ir/IRVariable.cpp
-	codegen/ir/IRVariable.h
-	experimental/analysis/Analysis.cpp
-	experimental/analysis/Analysis.h
-	formal/ArraySlicePredicate.cpp
-	formal/ArraySlicePredicate.h
-	formal/BMC.cpp
-	formal/BMC.h
-	formal/CHC.cpp
-	formal/CHC.h
-	formal/EncodingContext.cpp
-	formal/EncodingContext.h
-	formal/ExpressionFormatter.cpp
-	formal/ExpressionFormatter.h
-	formal/Invariants.cpp
-	formal/Invariants.h
-	formal/ModelChecker.cpp
-	formal/ModelChecker.h
-	formal/ModelCheckerSettings.cpp
-	formal/ModelCheckerSettings.h
-	formal/Predicate.cpp
-	formal/Predicate.h
-	formal/PredicateInstance.cpp
-	formal/PredicateInstance.h
-	formal/PredicateSort.cpp
-	formal/PredicateSort.h
-	formal/SMTEncoder.cpp
-	formal/SMTEncoder.h
-	formal/SSAVariable.cpp
-	formal/SSAVariable.h
-	formal/SymbolicState.cpp
-	formal/SymbolicState.h
-	formal/SymbolicTypes.cpp
-	formal/SymbolicTypes.h
-	formal/SymbolicVariables.cpp
-	formal/SymbolicVariables.h
-	formal/VariableUsage.cpp
-	formal/VariableUsage.h
-	interface/ABI.cpp
-	interface/ABI.h
-	interface/CompilerStack.cpp
-	interface/CompilerStack.h
-	interface/DebugSettings.h
-	interface/FileReader.cpp
-	interface/FileReader.h
-	interface/ImportRemapper.cpp
-	interface/ImportRemapper.h
-	interface/GasEstimator.cpp
-	interface/GasEstimator.h
-	interface/Natspec.cpp
-	interface/Natspec.h
-	interface/OptimiserSettings.h
-	interface/ReadFile.h
-	interface/SMTSolverCommand.cpp
-	interface/SMTSolverCommand.h
-	interface/StandardCompiler.cpp
-	interface/StandardCompiler.h
-	interface/StorageLayout.cpp
-	interface/StorageLayout.h
-	interface/UniversalCallback.h
-	interface/Version.cpp
-	interface/Version.h
-	lsp/DocumentHoverHandler.cpp
-	lsp/DocumentHoverHandler.h
-	lsp/FileRepository.cpp
-	lsp/FileRepository.h
-	lsp/GotoDefinition.cpp
-	lsp/GotoDefinition.h
-	lsp/RenameSymbol.cpp
-	lsp/RenameSymbol.h
-	lsp/HandlerBase.cpp
-	lsp/HandlerBase.h
-	lsp/LanguageServer.cpp
-	lsp/LanguageServer.h
-	lsp/SemanticTokensBuilder.cpp
-	lsp/SemanticTokensBuilder.h
-	lsp/Transport.cpp
-	lsp/Transport.h
-	lsp/Utils.cpp
-	lsp/Utils.h
-	parsing/DocStringParser.cpp
-	parsing/DocStringParser.h
-	parsing/Parser.cpp
-	parsing/Parser.h
-	parsing/Token.h
-)
-
-add_library(solidity ${sources})
-target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only Threads::Threads)
diff --git a/libsolidity/analysis/ConstantEvaluator.cpp b/libsolidity/analysis/ConstantEvaluator.cpp
deleted file mode 100644
index 8e18183a81f9..000000000000
--- a/libsolidity/analysis/ConstantEvaluator.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Evaluator for types of constant expressions.
- */
-
-#include <libsolidity/analysis/ConstantEvaluator.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <liblangutil/ErrorReporter.h>
-
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-using TypedRational = ConstantEvaluator::TypedRational;
-
-namespace
-{
-
-/// Check whether (_base ** _exp) fits into 4096 bits.
-bool fitsPrecisionExp(bigint const& _base, bigint const& _exp)
-{
-	if (_base == 0)
-		return true;
-
-	solAssert(_base > 0, "");
-
-	std::size_t const bitsMax = 4096;
-
-	std::size_t mostSignificantBaseBit = static_cast<std::size_t>(boost::multiprecision::msb(_base));
-	if (mostSignificantBaseBit == 0) // _base == 1
-		return true;
-	if (mostSignificantBaseBit > bitsMax) // _base >= 2 ^ 4096
-		return false;
-
-	bigint bitsNeeded = _exp * (mostSignificantBaseBit + 1);
-
-	return bitsNeeded <= bitsMax;
-}
-
-/// Checks whether _mantissa * (2 ** _expBase10) fits into 4096 bits.
-bool fitsPrecisionBase2(bigint const& _mantissa, uint32_t _expBase2)
-{
-	return fitsPrecisionBaseX(_mantissa, 1.0, _expBase2);
-}
-
-}
-
-std::optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, rational const& _left, rational const& _right)
-{
-	bool fractional = _left.denominator() != 1 || _right.denominator() != 1;
-	switch (_operator)
-	{
-	//bit operations will only be enabled for integers and fixed types that resemble integers
-	case Token::BitOr:
-		if (fractional)
-			return std::nullopt;
-		else
-			return _left.numerator() | _right.numerator();
-	case Token::BitXor:
-		if (fractional)
-			return std::nullopt;
-		else
-			return _left.numerator() ^ _right.numerator();
-	case Token::BitAnd:
-		if (fractional)
-			return std::nullopt;
-		else
-			return _left.numerator() & _right.numerator();
-	case Token::Add: return _left + _right;
-	case Token::Sub: return _left - _right;
-	case Token::Mul: return _left * _right;
-	case Token::Div:
-		if (_right == rational(0))
-			return std::nullopt;
-		else
-			return _left / _right;
-	case Token::Mod:
-		if (_right == rational(0))
-			return std::nullopt;
-		else if (fractional)
-		{
-			rational tempValue = _left / _right;
-			return _left - (tempValue.numerator() / tempValue.denominator()) * _right;
-		}
-		else
-			return _left.numerator() % _right.numerator();
-		break;
-	case Token::Exp:
-	{
-		if (_right.denominator() != 1)
-			return std::nullopt;
-		bigint const& exp = _right.numerator();
-
-		// x ** 0 = 1
-		// for 0, 1 and -1 the size of the exponent doesn't have to be restricted
-		if (exp == 0)
-			return 1;
-		else if (_left == 0 || _left == 1)
-			return _left;
-		else if (_left == -1)
-		{
-			bigint isOdd = abs(exp) & bigint(1);
-			return 1 - 2 * isOdd.convert_to<int>();
-		}
-		else
-		{
-			if (abs(exp) > std::numeric_limits<uint32_t>::max())
-				return std::nullopt; // This will need too much memory to represent.
-
-			uint32_t absExp = bigint(abs(exp)).convert_to<uint32_t>();
-
-			if (!fitsPrecisionExp(abs(_left.numerator()), absExp) || !fitsPrecisionExp(abs(_left.denominator()), absExp))
-				return std::nullopt;
-
-			static auto const optimizedPow = [](bigint const& _base, uint32_t _exponent) -> bigint {
-				if (_base == 1)
-					return 1;
-				else if (_base == -1)
-					return 1 - 2 * static_cast<int>(_exponent & 1);
-				else
-					return boost::multiprecision::pow(_base, _exponent);
-			};
-
-			bigint numerator = optimizedPow(_left.numerator(), absExp);
-			bigint denominator = optimizedPow(_left.denominator(), absExp);
-
-			if (exp >= 0)
-				return makeRational(numerator, denominator);
-			else
-				// invert
-				return makeRational(denominator, numerator);
-		}
-		break;
-	}
-	case Token::SHL:
-	{
-		if (fractional)
-			return std::nullopt;
-		else if (_right < 0)
-			return std::nullopt;
-		else if (_right > std::numeric_limits<uint32_t>::max())
-			return std::nullopt;
-		if (_left.numerator() == 0)
-			return 0;
-		else
-		{
-			uint32_t exponent = _right.numerator().convert_to<uint32_t>();
-			if (!fitsPrecisionBase2(abs(_left.numerator()), exponent))
-				return std::nullopt;
-			return _left.numerator() * boost::multiprecision::pow(bigint(2), exponent);
-		}
-		break;
-	}
-	// NOTE: we're using >> (SAR) to denote right shifting. The type of the LValue
-	//       determines the resulting type and the type of shift (SAR or SHR).
-	case Token::SAR:
-	{
-		if (fractional)
-			return std::nullopt;
-		else if (_right < 0)
-			return std::nullopt;
-		else if (_right > std::numeric_limits<uint32_t>::max())
-			return std::nullopt;
-		if (_left.numerator() == 0)
-			return 0;
-		else
-		{
-			uint32_t exponent = _right.numerator().convert_to<uint32_t>();
-			if (exponent > boost::multiprecision::msb(boost::multiprecision::abs(_left.numerator())))
-				return _left.numerator() < 0 ? -1 : 0;
-			else
-			{
-				if (_left.numerator() < 0)
-					// Add 1 to the negative value before dividing to get a result that is strictly too large,
-					// then subtract 1 afterwards to round towards negative infinity.
-					// This is the same algorithm as used in ExpressionCompiler::appendShiftOperatorCode(...).
-					// To see this note that for negative x, xor(x,all_ones) = (-x-1) and
-					// therefore xor(div(xor(x,all_ones), exp(2, shift_amount)), all_ones) is
-					// -(-x - 1) / 2^shift_amount - 1, which is the same as
-					// (x + 1) / 2^shift_amount - 1.
-					return rational((_left.numerator() + 1) / boost::multiprecision::pow(bigint(2), exponent) - bigint(1), 1);
-				else
-					return rational(_left.numerator() / boost::multiprecision::pow(bigint(2), exponent), 1);
-			}
-		}
-		break;
-	}
-	default:
-		return std::nullopt;
-	}
-}
-
-std::optional<rational> ConstantEvaluator::evaluateUnaryOperator(Token _operator, rational const& _input)
-{
-	switch (_operator)
-	{
-	case Token::BitNot:
-		if (_input.denominator() != 1)
-			return std::nullopt;
-		else
-			return ~_input.numerator();
-	case Token::Sub:
-		return -_input;
-	default:
-		return std::nullopt;
-	}
-}
-
-namespace
-{
-
-std::optional<TypedRational> convertType(rational const& _value, Type const& _type)
-{
-	if (_type.category() == Type::Category::RationalNumber)
-		return TypedRational{TypeProvider::rationalNumber(_value), _value};
-	else if (auto const* integerType = dynamic_cast<IntegerType const*>(&_type))
-	{
-		if (_value > integerType->maxValue() || _value < integerType->minValue())
-			return std::nullopt;
-		else
-			return TypedRational{&_type, _value.numerator() / _value.denominator()};
-	}
-	else
-		return std::nullopt;
-}
-
-std::optional<TypedRational> convertType(std::optional<TypedRational> const& _value, Type const& _type)
-{
-	return _value ? convertType(_value->value, _type) : std::nullopt;
-}
-
-std::optional<TypedRational> constantToTypedValue(Type const& _type)
-{
-	if (_type.category() == Type::Category::RationalNumber)
-		return TypedRational{&_type, dynamic_cast<RationalNumberType const&>(_type).value()};
-	else
-		return std::nullopt;
-}
-
-}
-
-std::optional<TypedRational> ConstantEvaluator::evaluate(
-	langutil::ErrorReporter& _errorReporter,
-	Expression const& _expr
-)
-{
-	return ConstantEvaluator{_errorReporter}.evaluate(_expr);
-}
-
-
-std::optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
-{
-	if (!m_values.count(&_node))
-	{
-		if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(&_node))
-		{
-			solAssert(varDecl->isConstant(), "");
-			// In some circumstances, we do not yet have a type for the variable.
-			if (!varDecl->value() || !varDecl->type())
-				m_values[&_node] = std::nullopt;
-			else
-			{
-				m_depth++;
-				if (m_depth > 32)
-					m_errorReporter.fatalTypeError(
-						5210_error,
-						varDecl->location(),
-						"Cyclic constant definition (or maximum recursion depth exhausted)."
-					);
-				m_values[&_node] = convertType(evaluate(*varDecl->value()), *varDecl->type());
-				m_depth--;
-			}
-		}
-		else if (auto const* expression = dynamic_cast<Expression const*>(&_node))
-		{
-			expression->accept(*this);
-			if (!m_values.count(&_node))
-				m_values[&_node] = std::nullopt;
-		}
-	}
-	return m_values.at(&_node);
-}
-
-void ConstantEvaluator::endVisit(UnaryOperation const& _operation)
-{
-	std::optional<TypedRational> value = evaluate(_operation.subExpression());
-	if (!value)
-		return;
-
-	Type const* resultType = value->type->unaryOperatorResult(_operation.getOperator());
-	if (!resultType)
-		return;
-	value = convertType(value, *resultType);
-	if (!value)
-		return;
-
-	if (std::optional<rational> result = evaluateUnaryOperator(_operation.getOperator(), value->value))
-	{
-		std::optional<TypedRational> convertedValue = convertType(*result, *resultType);
-		if (!convertedValue)
-			m_errorReporter.fatalTypeError(
-				3667_error,
-				_operation.location(),
-				"Arithmetic error when computing constant value."
-			);
-		m_values[&_operation] = convertedValue;
-	}
-}
-
-void ConstantEvaluator::endVisit(BinaryOperation const& _operation)
-{
-	std::optional<TypedRational> left = evaluate(_operation.leftExpression());
-	std::optional<TypedRational> right = evaluate(_operation.rightExpression());
-	if (!left || !right)
-		return;
-
-	// If this is implemented in the future: Comparison operators have a "binaryOperatorResult"
-	// that is non-bool, but the result has to be bool.
-	if (TokenTraits::isCompareOp(_operation.getOperator()))
-		return;
-
-	Type const* resultType = left->type->binaryOperatorResult(_operation.getOperator(), right->type);
-	if (!resultType)
-	{
-		m_errorReporter.fatalTypeError(
-			6020_error,
-			_operation.location(),
-			"Operator " +
-			std::string(TokenTraits::toString(_operation.getOperator())) +
-			" not compatible with types " +
-			left->type->toString() +
-			" and " +
-			right->type->toString()
-			);
-		return;
-	}
-
-	left = convertType(left, *resultType);
-	right = convertType(right, *resultType);
-	if (!left || !right)
-		return;
-
-	if (std::optional<rational> value = evaluateBinaryOperator(_operation.getOperator(), left->value, right->value))
-	{
-		std::optional<TypedRational> convertedValue = convertType(*value, *resultType);
-		if (!convertedValue)
-			m_errorReporter.fatalTypeError(
-				2643_error,
-				_operation.location(),
-				"Arithmetic error when computing constant value."
-			);
-		m_values[&_operation] = convertedValue;
-	}
-}
-
-void ConstantEvaluator::endVisit(Literal const& _literal)
-{
-	if (Type const* literalType = TypeProvider::forLiteral(_literal))
-		m_values[&_literal] = constantToTypedValue(*literalType);
-}
-
-void ConstantEvaluator::endVisit(Identifier const& _identifier)
-{
-	VariableDeclaration const* variableDeclaration = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration);
-	if (variableDeclaration && variableDeclaration->isConstant())
-		m_values[&_identifier] = evaluate(*variableDeclaration);
-}
-
-void ConstantEvaluator::endVisit(TupleExpression const& _tuple)
-{
-	if (!_tuple.isInlineArray() && _tuple.components().size() == 1)
-		m_values[&_tuple] = evaluate(*_tuple.components().front());
-}
diff --git a/libsolidity/analysis/ConstantEvaluator.h b/libsolidity/analysis/ConstantEvaluator.h
deleted file mode 100644
index 5b4b3460446b..000000000000
--- a/libsolidity/analysis/ConstantEvaluator.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Evaluator for types of constant expressions.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-
-#include <utility>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-class TypeChecker;
-
-/**
- * Small drop-in replacement for TypeChecker to evaluate simple expressions of integer constants.
- *
- * Note: This always use "checked arithmetic" in the sense that any over- or underflow
- * results in "unknown" value.
- */
-class ConstantEvaluator: private ASTConstVisitor
-{
-public:
-	struct TypedRational
-	{
-		Type const* type;
-		rational value;
-	};
-
-	static std::optional<TypedRational> evaluate(
-		langutil::ErrorReporter& _errorReporter,
-		Expression const& _expr
-	);
-
-	/// Performs arbitrary-precision evaluation of a binary operator. Returns nullopt on cases like
-	/// division by zero or e.g. bit operators applied to fractional values.
-	static std::optional<rational> evaluateBinaryOperator(Token _operator, rational const& _left, rational const&  _right);
-
-	/// Performs arbitrary-precision evaluation of a unary operator. Returns nullopt on cases like
-	/// bit operators applied to fractional values.
-	static std::optional<rational> evaluateUnaryOperator(Token _operator, rational const& _input);
-
-private:
-	explicit ConstantEvaluator(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter) {}
-
-	std::optional<TypedRational> evaluate(ASTNode const& _node);
-
-	void endVisit(BinaryOperation const& _operation) override;
-	void endVisit(UnaryOperation const& _operation) override;
-	void endVisit(Literal const& _literal) override;
-	void endVisit(Identifier const& _identifier) override;
-	void endVisit(TupleExpression const& _tuple) override;
-
-	langutil::ErrorReporter& m_errorReporter;
-	/// Current recursion depth.
-	size_t m_depth = 0;
-	/// Values of sub-expressions and variable declarations.
-	std::map<ASTNode const*, std::optional<TypedRational>> m_values;
-};
-
-}
diff --git a/libsolidity/analysis/ContractLevelChecker.cpp b/libsolidity/analysis/ContractLevelChecker.cpp
deleted file mode 100644
index eaeaf4851710..000000000000
--- a/libsolidity/analysis/ContractLevelChecker.cpp
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that verifies overloads, abstract contracts, function clashes and others
- * checks at contract or function level.
- */
-
-#include <libsolidity/analysis/ContractLevelChecker.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolutil/FunctionSelector.h>
-#include <liblangutil/ErrorReporter.h>
-
-#include <fmt/format.h>
-
-#include <range/v3/view/reverse.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-
-template <class T, class B>
-bool hasEqualExternalCallableParameters(T const& _a, B const& _b)
-{
-	return FunctionType(_a).asExternallyCallableFunction(false)->hasEqualParameterTypes(
-		*FunctionType(_b).asExternallyCallableFunction(false)
-	);
-}
-
-template<typename T>
-std::map<ASTString, std::vector<T const*>> filterDeclarations(
-	std::map<ASTString, std::vector<Declaration const*>> const& _declarations)
-{
-	std::map<ASTString, std::vector<T const*>> filteredDeclarations;
-	for (auto const& [name, overloads]: _declarations)
-		for (auto const* declaration: overloads)
-			if (auto typedDeclaration = dynamic_cast<T const*>(declaration))
-				filteredDeclarations[name].push_back(typedDeclaration);
-	return filteredDeclarations;
-}
-
-}
-
-bool ContractLevelChecker::check(SourceUnit const& _sourceUnit)
-{
-	bool noErrors = true;
-	findDuplicateDefinitions(
-		filterDeclarations<FunctionDefinition>(*_sourceUnit.annotation().exportedSymbols)
-	);
-	// This check flags duplicate free events when free events become
-	// a Solidity feature
-	findDuplicateDefinitions(
-		filterDeclarations<EventDefinition>(*_sourceUnit.annotation().exportedSymbols)
-	);
-	if (Error::containsErrors(m_errorReporter.errors()))
-		noErrors = false;
-	for (ASTPointer<ASTNode> const& node: _sourceUnit.nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-			if (!check(*contract))
-				noErrors = false;
-	return noErrors;
-}
-
-bool ContractLevelChecker::check(ContractDefinition const& _contract)
-{
-	_contract.annotation().unimplementedDeclarations = std::vector<Declaration const*>();
-
-	checkDuplicateFunctions(_contract);
-	checkDuplicateEvents(_contract);
-	checkReceiveFunction(_contract);
-	m_overrideChecker.check(_contract);
-	checkBaseConstructorArguments(_contract);
-	checkAbstractDefinitions(_contract);
-	checkExternalTypeClashes(_contract);
-	checkHashCollisions(_contract);
-	checkLibraryRequirements(_contract);
-	checkBaseABICompatibility(_contract);
-	checkPayableFallbackWithoutReceive(_contract);
-	checkStorageSize(_contract);
-
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-void ContractLevelChecker::checkDuplicateFunctions(ContractDefinition const& _contract)
-{
-	/// Checks that two functions with the same name defined in this contract have different
-	/// argument types and that there is at most one constructor.
-	std::map<std::string, std::vector<FunctionDefinition const*>> functions;
-	FunctionDefinition const* constructor = nullptr;
-	FunctionDefinition const* fallback = nullptr;
-	FunctionDefinition const* receive = nullptr;
-	for (FunctionDefinition const* function: _contract.definedFunctions())
-		if (function->isConstructor())
-		{
-			if (constructor)
-				m_errorReporter.declarationError(
-					7997_error,
-					function->location(),
-					SecondarySourceLocation().append("Another declaration is here:", constructor->location()),
-					"More than one constructor defined."
-				);
-			constructor = function;
-		}
-		else if (function->isFallback())
-		{
-			if (fallback)
-				m_errorReporter.declarationError(
-					7301_error,
-					function->location(),
-					SecondarySourceLocation().append("Another declaration is here:", fallback->location()),
-					"Only one fallback function is allowed."
-				);
-			fallback = function;
-		}
-		else if (function->isReceive())
-		{
-			if (receive)
-				m_errorReporter.declarationError(
-					4046_error,
-					function->location(),
-					SecondarySourceLocation().append("Another declaration is here:", receive->location()),
-					"Only one receive function is allowed."
-				);
-			receive = function;
-		}
-		else
-		{
-			solAssert(!function->name().empty(), "");
-			functions[function->name()].push_back(function);
-		}
-
-	findDuplicateDefinitions(functions);
-}
-
-void ContractLevelChecker::checkDuplicateEvents(ContractDefinition const& _contract)
-{
-	/// Checks that two events with the same name defined in this contract have different
-	/// argument types
-	std::map<std::string, std::vector<EventDefinition const*>> events;
-	for (auto const* contract: _contract.annotation().linearizedBaseContracts)
-		for (EventDefinition const* event: contract->events())
-			events[event->name()].push_back(event);
-
-	findDuplicateDefinitions(events);
-}
-
-void ContractLevelChecker::checkReceiveFunction(ContractDefinition const& _contract)
-{
-	for (FunctionDefinition const* function: _contract.definedFunctions())
-	{
-		solAssert(function, "");
-		if (function->isReceive())
-		{
-			if (function->libraryFunction())
-				m_errorReporter.declarationError(4549_error, function->location(), "Libraries cannot have receive ether functions.");
-
-			if (function->stateMutability() != StateMutability::Payable)
-				m_errorReporter.declarationError(
-					7793_error,
-					function->location(),
-					"Receive ether function must be payable, but is \"" +
-					stateMutabilityToString(function->stateMutability()) +
-					"\"."
-				);
-			if (function->visibility() != Visibility::External)
-				m_errorReporter.declarationError(4095_error, function->location(), "Receive ether function must be defined as \"external\".");
-
-			if (!function->returnParameters().empty())
-				m_errorReporter.fatalDeclarationError(6899_error, function->returnParameterList()->location(), "Receive ether function cannot return values.");
-			if (!function->parameters().empty())
-				m_errorReporter.fatalDeclarationError(6857_error, function->parameterList().location(), "Receive ether function cannot take parameters.");
-		}
-	}
-}
-
-template <class T>
-void ContractLevelChecker::findDuplicateDefinitions(std::map<std::string, std::vector<T>> const& _definitions)
-{
-	for (auto const& it: _definitions)
-	{
-		std::vector<T> const& overloads = it.second;
-		std::set<size_t> reported;
-		for (size_t i = 0; i < overloads.size() && !reported.count(i); ++i)
-		{
-			SecondarySourceLocation ssl;
-
-			for (size_t j = i + 1; j < overloads.size(); ++j)
-				if (hasEqualExternalCallableParameters(*overloads[i], *overloads[j]))
-				{
-					solAssert(
-						(
-							dynamic_cast<ContractDefinition const*>(overloads[i]->scope()) &&
-							dynamic_cast<ContractDefinition const*>(overloads[j]->scope()) &&
-							overloads[i]->name() == overloads[j]->name()
-						) ||
-						(
-							dynamic_cast<SourceUnit const*>(overloads[i]->scope()) &&
-							dynamic_cast<SourceUnit const*>(overloads[j]->scope())
-						),
-						"Override is neither a namesake function/event in contract scope nor "
-						"a free function/event (alias)."
-					);
-					ssl.append("Other declaration is here:", overloads[j]->location());
-					reported.insert(j);
-				}
-
-			if (ssl.infos.size() > 0)
-			{
-				ErrorId error;
-				std::string message;
-				if constexpr (std::is_same_v<T, FunctionDefinition const*>)
-				{
-					error = 1686_error;
-					message = "Function with same name and parameter types defined twice.";
-				}
-				else
-				{
-					static_assert(std::is_same_v<T, EventDefinition const*>, "Expected \"FunctionDefinition const*\" or \"EventDefinition const*\"");
-					error = 5883_error;
-					message = "Event with same name and parameter types defined twice.";
-				}
-
-				ssl.limitSize(message);
-
-				m_errorReporter.declarationError(
-					error,
-					overloads[i]->location(),
-					ssl,
-					message
-				);
-			}
-		}
-	}
-}
-
-void ContractLevelChecker::checkAbstractDefinitions(ContractDefinition const& _contract)
-{
-	// Collects functions, static variable getters and modifiers. If they
-	// override (unimplemented) base class ones, they are replaced.
-	std::set<OverrideProxy, OverrideProxy::CompareBySignature> proxies;
-
-	auto registerProxy = [&proxies](OverrideProxy const& _overrideProxy)
-	{
-		// Overwrite an existing proxy, if it exists.
-		if (!_overrideProxy.unimplemented())
-			proxies.erase(_overrideProxy);
-
-		proxies.insert(_overrideProxy);
-	};
-
-	// Search from base to derived, collect all functions and modifiers and
-	// update proxies.
-	for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-	{
-		for (VariableDeclaration const* v: contract->stateVariables())
-			if (v->isPartOfExternalInterface())
-				registerProxy(OverrideProxy(v));
-
-		for (FunctionDefinition const* function: contract->definedFunctions())
-			if (!function->isConstructor())
-				registerProxy(OverrideProxy(function));
-
-		for (ModifierDefinition const* modifier: contract->functionModifiers())
-			registerProxy(OverrideProxy(modifier));
-	}
-
-	// Set to not fully implemented if at least one flag is false.
-	for (auto const& proxy: proxies)
-		if (proxy.unimplemented())
-			_contract.annotation().unimplementedDeclarations->push_back(proxy.declaration());
-
-	if (_contract.abstract())
-	{
-		if (_contract.contractKind() == ContractKind::Interface)
-			m_errorReporter.typeError(9348_error, _contract.location(), "Interfaces do not need the \"abstract\" keyword, they are abstract implicitly.");
-		else if (_contract.contractKind() == ContractKind::Library)
-			m_errorReporter.typeError(9571_error, _contract.location(), "Libraries cannot be abstract.");
-		else
-			solAssert(_contract.contractKind() == ContractKind::Contract, "");
-	}
-
-	// For libraries, we emit errors on function-level, so this is fine as long as we do
-	// not have inheritance for libraries.
-	if (
-		_contract.contractKind() == ContractKind::Contract &&
-		!_contract.abstract() &&
-		!_contract.annotation().unimplementedDeclarations->empty()
-	)
-	{
-		SecondarySourceLocation ssl;
-		for (auto declaration: *_contract.annotation().unimplementedDeclarations)
-			ssl.append("Missing implementation: ", declaration->location());
-		m_errorReporter.typeError(
-			3656_error,
-			_contract.location(),
-			ssl,
-			"Contract \"" + *_contract.annotation().canonicalName + "\" should be marked as abstract."
-		);
-	}
-}
-
-
-void ContractLevelChecker::checkBaseConstructorArguments(ContractDefinition const& _contract)
-{
-	std::vector<ContractDefinition const*> const& bases = _contract.annotation().linearizedBaseContracts;
-
-	// Determine the arguments that are used for the base constructors.
-	for (ContractDefinition const* contract: bases)
-	{
-		if (FunctionDefinition const* constructor = contract->constructor())
-			for (auto const& modifier: constructor->modifiers())
-				if (auto baseContract = dynamic_cast<ContractDefinition const*>(
-					modifier->name().annotation().referencedDeclaration
-				))
-				{
-					if (modifier->arguments())
-					{
-						if (baseContract->constructor())
-							annotateBaseConstructorArguments(_contract, baseContract->constructor(), modifier.get());
-					}
-					else
-						m_errorReporter.declarationError(
-							1563_error,
-							modifier->location(),
-							"Modifier-style base constructor call without arguments."
-						);
-				}
-
-		for (ASTPointer<InheritanceSpecifier> const& base: contract->baseContracts())
-		{
-			ContractDefinition const* baseContract = dynamic_cast<ContractDefinition const*>(
-				base->name().annotation().referencedDeclaration
-			);
-			solAssert(baseContract, "");
-
-			if (baseContract->constructor() && base->arguments() && !base->arguments()->empty())
-				annotateBaseConstructorArguments(_contract, baseContract->constructor(), base.get());
-		}
-	}
-
-	// check that we get arguments for all base constructors that need it.
-	// If not mark the contract as abstract (not fully implemented)
-	if (_contract.contractKind() == ContractKind::Contract && !_contract.abstract())
-		for (ContractDefinition const* baseContract: bases)
-			if (FunctionDefinition const* baseConstructor = baseContract->constructor())
-				if (
-					baseContract != &_contract &&
-					!baseConstructor->parameters().empty() &&
-					_contract.annotation().baseConstructorArguments.count(baseConstructor) == 0
-				)
-					m_errorReporter.typeError(
-						3415_error,
-						_contract.location(),
-						SecondarySourceLocation{}.append(
-							"Base constructor parameters:",
-							baseConstructor->parameterList().location()
-						),
-						fmt::format(
-							"No arguments passed to the base constructor. "
-							"Specify the arguments or mark \"{}\" as abstract.",
-							*_contract.annotation().canonicalName
-						)
-					);
-}
-
-void ContractLevelChecker::annotateBaseConstructorArguments(
-	ContractDefinition const& _currentContract,
-	FunctionDefinition const* _baseConstructor,
-	ASTNode const* _argumentNode
-)
-{
-	solAssert(_baseConstructor, "");
-	solAssert(_argumentNode, "");
-
-	auto insertionResult = _currentContract.annotation().baseConstructorArguments.insert(
-		std::make_pair(_baseConstructor, _argumentNode)
-	);
-	if (!insertionResult.second)
-	{
-		ASTNode const* previousNode = insertionResult.first->second;
-
-		SourceLocation const* mainLocation = nullptr;
-		SecondarySourceLocation ssl;
-
-		if (
-			_currentContract.location().contains(previousNode->location()) ||
-			_currentContract.location().contains(_argumentNode->location())
-		)
-		{
-			mainLocation = &previousNode->location();
-			ssl.append("Second constructor call is here:", _argumentNode->location());
-		}
-		else
-		{
-			mainLocation = &_currentContract.location();
-			ssl.append("First constructor call is here:", _argumentNode->location());
-			ssl.append("Second constructor call is here:", previousNode->location());
-		}
-
-		m_errorReporter.declarationError(
-			3364_error,
-			*mainLocation,
-			ssl,
-			"Base constructor arguments given twice."
-		);
-	}
-
-}
-
-void ContractLevelChecker::checkExternalTypeClashes(ContractDefinition const& _contract)
-{
-	std::map<std::string, std::vector<std::pair<Declaration const*, FunctionTypePointer>>> externalDeclarations;
-	for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts)
-	{
-		for (FunctionDefinition const* f: contract->definedFunctions())
-			if (f->isPartOfExternalInterface())
-			{
-				auto functionType = TypeProvider::function(*f);
-				// under non error circumstances this should be true
-				if (functionType->interfaceFunctionType())
-					externalDeclarations[functionType->externalSignature()].emplace_back(
-						f, functionType->asExternallyCallableFunction(false)
-					);
-			}
-		for (VariableDeclaration const* v: contract->stateVariables())
-			if (v->isPartOfExternalInterface())
-			{
-				auto functionType = TypeProvider::function(*v);
-				// under non error circumstances this should be true
-				if (functionType->interfaceFunctionType())
-					externalDeclarations[functionType->externalSignature()].emplace_back(
-						v, functionType->asExternallyCallableFunction(false)
-					);
-			}
-	}
-	for (auto const& it: externalDeclarations)
-		for (size_t i = 0; i < it.second.size(); ++i)
-			for (size_t j = i + 1; j < it.second.size(); ++j)
-				if (!it.second[i].second->hasEqualParameterTypes(*it.second[j].second))
-					m_errorReporter.typeError(
-						9914_error,
-						it.second[j].first->location(),
-						"Function overload clash during conversion to external types for arguments."
-					);
-}
-
-void ContractLevelChecker::checkHashCollisions(ContractDefinition const& _contract)
-{
-	std::set<util::FixedHash<4>> hashes;
-	for (auto const& it: _contract.interfaceFunctionList())
-	{
-		util::FixedHash<4> const& hash = it.first;
-		if (hashes.count(hash))
-			m_errorReporter.fatalTypeError(
-				1860_error,
-				_contract.location(),
-				std::string("Function signature hash collision for ") + it.second->externalSignature()
-			);
-		hashes.insert(hash);
-	}
-}
-
-void ContractLevelChecker::checkLibraryRequirements(ContractDefinition const& _contract)
-{
-	if (!_contract.isLibrary())
-		return;
-
-	if (!_contract.baseContracts().empty())
-		m_errorReporter.typeError(9469_error, _contract.location(), "Library is not allowed to inherit.");
-
-	for (auto const& var: _contract.stateVariables())
-		if (!var->isConstant())
-			m_errorReporter.typeError(9957_error, var->location(), "Library cannot have non-constant state variables");
-}
-
-void ContractLevelChecker::checkBaseABICompatibility(ContractDefinition const& _contract)
-{
-	if (*_contract.sourceUnit().annotation().useABICoderV2)
-		return;
-
-	if (_contract.isLibrary())
-	{
-		solAssert(
-			_contract.baseContracts().empty() || m_errorReporter.hasErrors(),
-			"Library is not allowed to inherit"
-		);
-		return;
-	}
-
-	SecondarySourceLocation errors;
-
-	// interfaceFunctionList contains all inherited functions as well
-	for (auto const& func: _contract.interfaceFunctionList())
-	{
-		solAssert(func.second->hasDeclaration(), "Function has no declaration?!");
-
-		if (!*func.second->declaration().sourceUnit().annotation().useABICoderV2)
-			continue;
-
-		auto const& currentLoc = func.second->declaration().location();
-
-		for (Type const* paramType: func.second->parameterTypes() + func.second->returnParameterTypes())
-			if (!TypeChecker::typeSupportedByOldABIEncoder(*paramType, false))
-			{
-				errors.append("Type only supported by ABIEncoderV2", currentLoc);
-				break;
-			}
-	}
-
-	if (!errors.infos.empty())
-		m_errorReporter.fatalTypeError(
-			6594_error,
-			_contract.location(),
-			errors,
-			std::string("Contract \"") +
-			_contract.name() +
-			"\" does not use ABI coder v2 but wants to inherit from a contract " +
-			"which uses types that require it. " +
-			"Use \"pragma abicoder v2;\" for the inheriting contract as well to enable the feature."
-		);
-
-}
-
-void ContractLevelChecker::checkPayableFallbackWithoutReceive(ContractDefinition const& _contract)
-{
-	if (auto const* fallback = _contract.fallbackFunction())
-		if (fallback->isPayable() && !_contract.interfaceFunctionList().empty() && !_contract.receiveFunction())
-			m_errorReporter.warning(
-				3628_error,
-				_contract.location(),
-				"This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.",
-				SecondarySourceLocation{}.append("The payable fallback function is defined here.", fallback->location())
-			);
-}
-
-void ContractLevelChecker::checkStorageSize(ContractDefinition const& _contract)
-{
-	bigint size = 0;
-	for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-		for (VariableDeclaration const* variable: contract->stateVariables())
-			if (!(variable->isConstant() || variable->immutable()))
-			{
-				size += variable->annotation().type->storageSizeUpperBound();
-				if (size >= bigint(1) << 256)
-				{
-					m_errorReporter.typeError(7676_error, _contract.location(), "Contract requires too much storage.");
-					break;
-				}
-			}
-}
diff --git a/libsolidity/analysis/ContractLevelChecker.h b/libsolidity/analysis/ContractLevelChecker.h
deleted file mode 100644
index 1f5826fdc059..000000000000
--- a/libsolidity/analysis/ContractLevelChecker.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that verifies overloads, abstract contracts, function clashes and others
- * checks at contract or function level.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/analysis/OverrideChecker.h>
-#include <liblangutil/SourceLocation.h>
-#include <map>
-#include <functional>
-#include <set>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Component that verifies overloads, abstract contracts, function clashes and others
- * checks at file, contract, or function level.
- */
-class ContractLevelChecker
-{
-public:
-
-	/// @param _errorReporter provides the error logging functionality.
-	explicit ContractLevelChecker(langutil::ErrorReporter& _errorReporter):
-		m_overrideChecker{_errorReporter},
-		m_errorReporter(_errorReporter)
-	{}
-
-	/// Performs checks on the given source ast.
-	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
-	bool check(SourceUnit const& _sourceUnit);
-
-private:
-	/// Performs checks on the given contract.
-	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
-	bool check(ContractDefinition const& _contract);
-	/// Checks that two functions defined in this contract with the same name have different
-	/// arguments and that there is at most one constructor.
-	void checkDuplicateFunctions(ContractDefinition const& _contract);
-	void checkDuplicateEvents(ContractDefinition const& _contract);
-	void checkReceiveFunction(ContractDefinition const& _contract);
-	template <class T>
-	void findDuplicateDefinitions(std::map<std::string, std::vector<T>> const& _definitions);
-	/// Checks for unimplemented functions and modifiers.
-	void checkAbstractDefinitions(ContractDefinition const& _contract);
-	/// Checks that the base constructor arguments are properly provided.
-	/// Fills the list of unimplemented functions in _contract's annotations.
-	void checkBaseConstructorArguments(ContractDefinition const& _contract);
-	void annotateBaseConstructorArguments(
-		ContractDefinition const& _currentContract,
-		FunctionDefinition const* _baseConstructor,
-		ASTNode const* _argumentNode
-	);
-	/// Checks that different functions with external visibility end up having different
-	/// external argument types (i.e. different signature).
-	void checkExternalTypeClashes(ContractDefinition const& _contract);
-	/// Checks for hash collisions in external function signatures.
-	void checkHashCollisions(ContractDefinition const& _contract);
-	/// Checks that all requirements for a library are fulfilled if this is a library.
-	void checkLibraryRequirements(ContractDefinition const& _contract);
-	/// Checks base contracts for ABI compatibility
-	void checkBaseABICompatibility(ContractDefinition const& _contract);
-
-	/// Warns if the contract has a payable fallback, but no receive ether function.
-	void checkPayableFallbackWithoutReceive(ContractDefinition const& _contract);
-	/// Error if the contract requires too much storage
-	void checkStorageSize(ContractDefinition const& _contract);
-
-	OverrideChecker m_overrideChecker;
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/analysis/ControlFlowAnalyzer.cpp b/libsolidity/analysis/ControlFlowAnalyzer.cpp
deleted file mode 100644
index 7ae1aa76e2b9..000000000000
--- a/libsolidity/analysis/ControlFlowAnalyzer.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/ControlFlowAnalyzer.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <libsolutil/Algorithms.h>
-
-#include <range/v3/algorithm/sort.hpp>
-
-#include <functional>
-
-using namespace std::placeholders;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-
-bool ControlFlowAnalyzer::run()
-{
-	for (auto& [pair, flow]: m_cfg.allFunctionFlows())
-		analyze(*pair.function, pair.contract, *flow);
-
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-void ControlFlowAnalyzer::analyze(FunctionDefinition const& _function, ContractDefinition const* _contract, FunctionFlow const& _flow)
-{
-	if (!_function.isImplemented())
-		return;
-
-	std::optional<std::string> mostDerivedContractName;
-
-	// The name of the most derived contract only required if it differs from
-	// the functions contract
-	if (_contract && _contract != _function.annotation().contract)
-		mostDerivedContractName = _contract->name();
-
-	checkUninitializedAccess(
-		_flow.entry,
-		_flow.exit,
-		_function.body().statements().empty(),
-		mostDerivedContractName
-	);
-	checkUnreachable(_flow.entry, _flow.exit, _flow.revert, _flow.transactionReturn);
-}
-
-
-void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNode const* _exit, bool _emptyBody, std::optional<std::string> _contractName)
-{
-	struct NodeInfo
-	{
-		std::set<VariableDeclaration const*> unassignedVariablesAtEntry;
-		std::set<VariableDeclaration const*> unassignedVariablesAtExit;
-		std::set<VariableOccurrence const*> uninitializedVariableAccesses;
-		/// Propagate the information from another node to this node.
-		/// To be used to propagate information from a node to its exit nodes.
-		/// Returns true, if new variables were added and thus the current node has
-		/// to be traversed again.
-		bool propagateFrom(NodeInfo const& _entryNode)
-		{
-			size_t previousUnassignedVariablesAtEntry = unassignedVariablesAtEntry.size();
-			size_t previousUninitializedVariableAccessess = uninitializedVariableAccesses.size();
-			unassignedVariablesAtEntry += _entryNode.unassignedVariablesAtExit;
-			uninitializedVariableAccesses += _entryNode.uninitializedVariableAccesses;
-			return
-				unassignedVariablesAtEntry.size() > previousUnassignedVariablesAtEntry ||
-				uninitializedVariableAccesses.size() > previousUninitializedVariableAccessess
-			;
-		}
-	};
-	std::map<CFGNode const*, NodeInfo> nodeInfos;
-	std::set<CFGNode const*> nodesToTraverse;
-	nodesToTraverse.insert(_entry);
-
-	// Walk all paths starting from the nodes in ``nodesToTraverse`` until ``NodeInfo::propagateFrom``
-	// returns false for all exits, i.e. until all paths have been walked with maximal sets of unassigned
-	// variables and accesses.
-	while (!nodesToTraverse.empty())
-	{
-		CFGNode const* currentNode = *nodesToTraverse.begin();
-		nodesToTraverse.erase(nodesToTraverse.begin());
-
-		auto& nodeInfo = nodeInfos[currentNode];
-		auto unassignedVariables = nodeInfo.unassignedVariablesAtEntry;
-		for (auto const& variableOccurrence: currentNode->variableOccurrences)
-		{
-			switch (variableOccurrence.kind())
-			{
-				case VariableOccurrence::Kind::Assignment:
-					unassignedVariables.erase(&variableOccurrence.declaration());
-					break;
-				case VariableOccurrence::Kind::InlineAssembly:
-					// We consider all variables referenced in inline assembly as accessed.
-					// So far any reference is enough, but we might want to actually analyze
-					// the control flow in the assembly at some point.
-				case VariableOccurrence::Kind::Access:
-				case VariableOccurrence::Kind::Return:
-					if (unassignedVariables.count(&variableOccurrence.declaration()))
-					{
-						// Merely store the unassigned access. We do not generate an error right away, since this
-						// path might still always revert. It is only an error if this is propagated to the exit
-						// node of the function (i.e. there is a path with an uninitialized access).
-						nodeInfo.uninitializedVariableAccesses.insert(&variableOccurrence);
-					}
-					break;
-				case VariableOccurrence::Kind::Declaration:
-					unassignedVariables.insert(&variableOccurrence.declaration());
-					break;
-			}
-		}
-		nodeInfo.unassignedVariablesAtExit = std::move(unassignedVariables);
-
-		// Propagate changes to all exits and queue them for traversal, if needed.
-		for (auto const& exit: currentNode->exits)
-			if (
-				auto exists = util::valueOrNullptr(nodeInfos, exit);
-				nodeInfos[exit].propagateFrom(nodeInfo) || !exists
-			)
-				nodesToTraverse.insert(exit);
-	}
-
-	auto const& exitInfo = nodeInfos[_exit];
-	if (!exitInfo.uninitializedVariableAccesses.empty())
-	{
-		std::vector<VariableOccurrence const*> uninitializedAccessesOrdered(
-			exitInfo.uninitializedVariableAccesses.begin(),
-			exitInfo.uninitializedVariableAccesses.end()
-		);
-		ranges::sort(
-			uninitializedAccessesOrdered,
-			[](VariableOccurrence const* lhs, VariableOccurrence const* rhs) -> bool
-			{
-				return *lhs < *rhs;
-			}
-		);
-
-		for (auto const* variableOccurrence: uninitializedAccessesOrdered)
-		{
-			VariableDeclaration const& varDecl = variableOccurrence->declaration();
-
-			SecondarySourceLocation ssl;
-			if (variableOccurrence->occurrence())
-				ssl.append("The variable was declared here.", varDecl.location());
-
-			bool isStorage = varDecl.type()->dataStoredIn(DataLocation::Storage);
-			bool isCalldata = varDecl.type()->dataStoredIn(DataLocation::CallData);
-			if (isStorage || isCalldata)
-				m_errorReporter.typeError(
-					3464_error,
-					variableOccurrence->occurrence() ?
-						*variableOccurrence->occurrence() :
-						varDecl.location(),
-					ssl,
-					"This variable is of " +
-					std::string(isStorage ? "storage" : "calldata") +
-					" pointer type and can be " +
-					(variableOccurrence->kind() == VariableOccurrence::Kind::Return ? "returned" : "accessed") +
-					" without prior assignment, which would lead to undefined behaviour."
-				);
-			else if (!_emptyBody && varDecl.name().empty())
-			{
-				if (!m_unassignedReturnVarsAlreadyWarnedFor.emplace(&varDecl).second)
-					continue;
-
-				m_errorReporter.warning(
-					6321_error,
-					varDecl.location(),
-					"Unnamed return variable can remain unassigned" +
-					(
-						_contractName.has_value() ?
-						" when the function is called when \"" + _contractName.value() + "\" is the most derived contract." :
-						"."
-					) +
-					" Add an explicit return with value to all non-reverting code paths or name the variable."
-				);
-			}
-		}
-	}
-}
-
-void ControlFlowAnalyzer::checkUnreachable(CFGNode const* _entry, CFGNode const* _exit, CFGNode const* _revert, CFGNode const* _transactionReturn)
-{
-	// collect all nodes reachable from the entry point
-	std::set<CFGNode const*> reachable = util::BreadthFirstSearch<CFGNode const*>{{_entry}}.run(
-		[](CFGNode const* _node, auto&& _addChild) {
-			for (CFGNode const* exit: _node->exits)
-				_addChild(exit);
-		}
-	).visited;
-
-	// traverse all paths backwards from exit, revert and transaction return
-	// and extract (valid) source locations of unreachable nodes into sorted set
-	std::set<SourceLocation> unreachable;
-	util::BreadthFirstSearch<CFGNode const*>{{_exit, _revert, _transactionReturn}}.run(
-		[&](CFGNode const* _node, auto&& _addChild) {
-			if (!reachable.count(_node) && _node->location.isValid())
-				unreachable.insert(_node->location);
-			for (CFGNode const* entry: _node->entries)
-				_addChild(entry);
-		}
-	);
-
-	for (auto it = unreachable.begin(); it != unreachable.end();)
-	{
-		SourceLocation location = *it++;
-		// Extend the location, as long as the next location overlaps (unreachable is sorted).
-		for (; it != unreachable.end() && it->start <= location.end; ++it)
-			location.end = std::max(location.end, it->end);
-
-		if (m_unreachableLocationsAlreadyWarnedFor.emplace(location).second)
-			m_errorReporter.warning(5740_error, location, "Unreachable code.");
-	}
-}
diff --git a/libsolidity/analysis/ControlFlowAnalyzer.h b/libsolidity/analysis/ControlFlowAnalyzer.h
deleted file mode 100644
index b0d609d7265d..000000000000
--- a/libsolidity/analysis/ControlFlowAnalyzer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/analysis/ControlFlowGraph.h>
-#include <liblangutil/ErrorReporter.h>
-#include <set>
-
-namespace solidity::frontend
-{
-
-class ControlFlowAnalyzer
-{
-public:
-	explicit ControlFlowAnalyzer(CFG const& _cfg, langutil::ErrorReporter& _errorReporter):
-		m_cfg(_cfg), m_errorReporter(_errorReporter) {}
-
-	bool run();
-
-private:
-	void analyze(FunctionDefinition const& _function, ContractDefinition const* _contract, FunctionFlow const& _flow);
-	/// Checks for uninitialized variable accesses in the control flow between @param _entry and @param _exit.
-	/// @param _entry entry node
-	/// @param _exit exit node
-	/// @param _emptyBody whether the body of the function is empty (true) or not (false)
-	/// @param _contractName name of the most derived contract, should be empty
-	///        if the function is also defined in it
-	void checkUninitializedAccess(CFGNode const* _entry, CFGNode const* _exit, bool _emptyBody, std::optional<std::string> _contractName = {});
-	/// Checks for unreachable code, i.e. code ending in @param _exit, @param _revert or @param _transactionReturn
-	/// that can not be reached from @param _entry.
-	void checkUnreachable(CFGNode const* _entry, CFGNode const* _exit, CFGNode const* _revert, CFGNode const* _transactionReturn);
-
-	CFG const& m_cfg;
-	langutil::ErrorReporter& m_errorReporter;
-
-	std::set<langutil::SourceLocation> m_unreachableLocationsAlreadyWarnedFor;
-	std::set<VariableDeclaration const*> m_unassignedReturnVarsAlreadyWarnedFor;
-};
-
-}
diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
deleted file mode 100644
index c20968a14d79..000000000000
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/ControlFlowBuilder.h>
-#include <libsolidity/ast/ASTUtils.h>
-#include <libyul/AST.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-ControlFlowBuilder::ControlFlowBuilder(CFG::NodeContainer& _nodeContainer, FunctionFlow const& _functionFlow, ContractDefinition const* _contract):
-	m_nodeContainer(_nodeContainer),
-	m_currentNode(_functionFlow.entry),
-	m_returnNode(_functionFlow.exit),
-	m_revertNode(_functionFlow.revert),
-	m_transactionReturnNode(_functionFlow.transactionReturn),
-	m_contract(_contract)
-{
-}
-
-
-std::unique_ptr<FunctionFlow> ControlFlowBuilder::createFunctionFlow(
-	CFG::NodeContainer& _nodeContainer,
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract
-)
-{
-	auto functionFlow = std::make_unique<FunctionFlow>();
-	functionFlow->entry = _nodeContainer.newNode();
-	functionFlow->exit = _nodeContainer.newNode();
-	functionFlow->revert = _nodeContainer.newNode();
-	functionFlow->transactionReturn = _nodeContainer.newNode();
-	ControlFlowBuilder builder(_nodeContainer, *functionFlow, _contract);
-	builder.appendControlFlow(_function);
-
-	return functionFlow;
-}
-
-bool ControlFlowBuilder::visit(BinaryOperation const& _operation)
-{
-	solAssert(!!m_currentNode, "");
-
-	switch (_operation.getOperator())
-	{
-		case Token::Or:
-		case Token::And:
-		{
-			visitNode(_operation);
-			solAssert(*_operation.annotation().userDefinedFunction == nullptr);
-			appendControlFlow(_operation.leftExpression());
-
-			auto nodes = splitFlow<2>();
-			nodes[0] = createFlow(nodes[0], _operation.rightExpression());
-			mergeFlow(nodes, nodes[1]);
-			return false;
-		}
-		default:
-		{
-			if (*_operation.annotation().userDefinedFunction != nullptr)
-			{
-				visitNode(_operation);
-				_operation.leftExpression().accept(*this);
-				_operation.rightExpression().accept(*this);
-
-				m_currentNode->functionDefinition = *_operation.annotation().userDefinedFunction;
-
-				auto nextNode = newLabel();
-
-				connect(m_currentNode, nextNode);
-				m_currentNode = nextNode;
-				return false;
-			}
-		}
-	}
-	return ASTConstVisitor::visit(_operation);
-}
-
-bool ControlFlowBuilder::visit(UnaryOperation const& _operation)
-{
-	solAssert(!!m_currentNode);
-
-	if (*_operation.annotation().userDefinedFunction != nullptr)
-	{
-		visitNode(_operation);
-		_operation.subExpression().accept(*this);
-		m_currentNode->functionDefinition = *_operation.annotation().userDefinedFunction;
-
-		auto nextNode = newLabel();
-
-		connect(m_currentNode, nextNode);
-		m_currentNode = nextNode;
-		return false;
-	}
-
-	return ASTConstVisitor::visit(_operation);
-}
-
-bool ControlFlowBuilder::visit(Conditional const& _conditional)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_conditional);
-
-	_conditional.condition().accept(*this);
-
-	auto nodes = splitFlow<2>();
-
-	nodes[0] = createFlow(nodes[0], _conditional.trueExpression());
-	nodes[1] = createFlow(nodes[1], _conditional.falseExpression());
-
-	mergeFlow(nodes);
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(TryStatement const& _tryStatement)
-{
-	appendControlFlow(_tryStatement.externalCall());
-
-	auto nodes = splitFlow(_tryStatement.clauses().size());
-	for (size_t i = 0; i < _tryStatement.clauses().size(); ++i)
-		nodes[i] = createFlow(nodes[i], _tryStatement.clauses()[i]->block());
-	mergeFlow(nodes);
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(IfStatement const& _ifStatement)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_ifStatement);
-
-	_ifStatement.condition().accept(*this);
-
-	auto nodes = splitFlow<2>();
-	nodes[0] = createFlow(nodes[0], _ifStatement.trueStatement());
-
-	if (_ifStatement.falseStatement())
-	{
-		nodes[1] = createFlow(nodes[1], *_ifStatement.falseStatement());
-		mergeFlow(nodes);
-	}
-	else
-		mergeFlow(nodes, nodes[1]);
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(ForStatement const& _forStatement)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_forStatement);
-
-	if (_forStatement.initializationExpression())
-		_forStatement.initializationExpression()->accept(*this);
-
-	auto condition = createLabelHere();
-
-	if (_forStatement.condition())
-		appendControlFlow(*_forStatement.condition());
-
-	auto postPart = newLabel();
-	auto nodes = splitFlow<2>();
-	auto afterFor = nodes[1];
-	m_currentNode = nodes[0];
-
-	{
-		BreakContinueScope scope(*this, afterFor, postPart);
-		appendControlFlow(_forStatement.body());
-	}
-
-	placeAndConnectLabel(postPart);
-
-	if (auto expression = _forStatement.loopExpression())
-		appendControlFlow(*expression);
-
-	connect(m_currentNode, condition);
-	m_currentNode = afterFor;
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(WhileStatement const& _whileStatement)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_whileStatement);
-
-	if (_whileStatement.isDoWhile())
-	{
-		auto afterWhile = newLabel();
-		auto whileBody = createLabelHere();
-		auto condition = newLabel();
-
-		{
-			BreakContinueScope scope(*this, afterWhile, condition);
-			appendControlFlow(_whileStatement.body());
-		}
-
-		placeAndConnectLabel(condition);
-		appendControlFlow(_whileStatement.condition());
-
-		connect(m_currentNode, whileBody);
-		placeAndConnectLabel(afterWhile);
-	}
-	else
-	{
-		auto whileCondition = createLabelHere();
-
-		appendControlFlow(_whileStatement.condition());
-
-		auto nodes = splitFlow<2>();
-
-		auto whileBody = nodes[0];
-		auto afterWhile = nodes[1];
-
-		m_currentNode = whileBody;
-		{
-			BreakContinueScope scope(*this, afterWhile, whileCondition);
-			appendControlFlow(_whileStatement.body());
-		}
-
-		connect(m_currentNode, whileCondition);
-
-		m_currentNode = afterWhile;
-	}
-
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(Break const& _break)
-{
-	solAssert(!!m_currentNode, "");
-	solAssert(!!m_breakJump, "");
-	visitNode(_break);
-	connect(m_currentNode, m_breakJump);
-	m_currentNode = newLabel();
-	return false;
-}
-
-bool ControlFlowBuilder::visit(Continue const& _continue)
-{
-	solAssert(!!m_currentNode, "");
-	solAssert(!!m_continueJump, "");
-	visitNode(_continue);
-	connect(m_currentNode, m_continueJump);
-	m_currentNode = newLabel();
-	return false;
-}
-
-bool ControlFlowBuilder::visit(Throw const& _throw)
-{
-	solAssert(!!m_currentNode, "");
-	solAssert(!!m_revertNode, "");
-	visitNode(_throw);
-	connect(m_currentNode, m_revertNode);
-	m_currentNode = newLabel();
-	return false;
-}
-
-bool ControlFlowBuilder::visit(RevertStatement const& _revert)
-{
-	solAssert(!!m_currentNode, "");
-	solAssert(!!m_revertNode, "");
-	visitNode(_revert);
-	connect(m_currentNode, m_revertNode);
-	m_currentNode = newLabel();
-	return false;
-}
-
-bool ControlFlowBuilder::visit(PlaceholderStatement const&)
-{
-	solAssert(!!m_currentNode, "");
-	solAssert(!!m_placeholderEntry, "");
-	solAssert(!!m_placeholderExit, "");
-
-	connect(m_currentNode, m_placeholderEntry);
-	m_currentNode = newLabel();
-	connect(m_placeholderExit, m_currentNode);
-	return false;
-}
-
-bool ControlFlowBuilder::visit(FunctionCall const& _functionCall)
-{
-	solAssert(!!m_revertNode, "");
-	solAssert(!!m_currentNode, "");
-	solAssert(!!_functionCall.expression().annotation().type, "");
-
-	if (auto functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type))
-		switch (functionType->kind())
-		{
-			case FunctionType::Kind::Revert:
-				visitNode(_functionCall);
-				_functionCall.expression().accept(*this);
-				ASTNode::listAccept(_functionCall.arguments(), *this);
-
-				connect(m_currentNode, m_revertNode);
-
-				m_currentNode = newLabel();
-				return false;
-			case FunctionType::Kind::Require:
-			case FunctionType::Kind::Assert:
-			{
-				visitNode(_functionCall);
-				_functionCall.expression().accept(*this);
-				ASTNode::listAccept(_functionCall.arguments(), *this);
-
-				connect(m_currentNode, m_revertNode);
-
-				auto nextNode = newLabel();
-
-				connect(m_currentNode, nextNode);
-				m_currentNode = nextNode;
-				return false;
-			}
-			case FunctionType::Kind::Internal:
-			{
-				visitNode(_functionCall);
-				_functionCall.expression().accept(*this);
-				ASTNode::listAccept(_functionCall.arguments(), *this);
-
-				m_currentNode->functionDefinition = ASTNode::resolveFunctionCall(_functionCall, m_contract);
-
-				auto nextNode = newLabel();
-
-				connect(m_currentNode, nextNode);
-				m_currentNode = nextNode;
-
-				return false;
-			}
-			default:
-				break;
-		}
-	return ASTConstVisitor::visit(_functionCall);
-}
-
-bool ControlFlowBuilder::visit(ModifierInvocation const& _modifierInvocation)
-{
-	solAssert(m_contract, "Free functions cannot have modifiers");
-
-	if (auto arguments = _modifierInvocation.arguments())
-		for (auto& argument: *arguments)
-			appendControlFlow(*argument);
-
-	auto modifierDefinition = dynamic_cast<ModifierDefinition const*>(
-		_modifierInvocation.name().annotation().referencedDeclaration
-	);
-
-	if (!modifierDefinition)
-		return false;
-
-	VirtualLookup const& requiredLookup = *_modifierInvocation.name().annotation().requiredLookup;
-
-	if (requiredLookup == VirtualLookup::Virtual)
-		modifierDefinition = &modifierDefinition->resolveVirtual(*m_contract);
-	else
-		solAssert(requiredLookup == VirtualLookup::Static);
-
-	if (!modifierDefinition->isImplemented())
-		return false;
-
-	solAssert(!!m_returnNode, "");
-
-	m_placeholderEntry = newLabel();
-	m_placeholderExit = newLabel();
-
-	appendControlFlow(*modifierDefinition);
-	connect(m_currentNode, m_returnNode);
-
-	m_currentNode = m_placeholderEntry;
-	m_returnNode = m_placeholderExit;
-
-	m_placeholderEntry = nullptr;
-	m_placeholderExit = nullptr;
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(FunctionDefinition const& _functionDefinition)
-{
-	for (auto const& parameter: _functionDefinition.parameters())
-		appendControlFlow(*parameter);
-
-	for (auto const& returnParameter: _functionDefinition.returnParameters())
-	{
-		appendControlFlow(*returnParameter);
-		m_returnNode->variableOccurrences.emplace_back(
-			*returnParameter,
-			VariableOccurrence::Kind::Return
-		);
-
-	}
-
-	for (auto const& modifierInvocation: _functionDefinition.modifiers())
-		appendControlFlow(*modifierInvocation);
-
-	appendControlFlow(_functionDefinition.body());
-
-	connect(m_currentNode, m_returnNode);
-	m_currentNode = nullptr;
-
-	return false;
-}
-
-bool ControlFlowBuilder::visit(Return const& _return)
-{
-	solAssert(!!m_currentNode, "");
-	solAssert(!!m_returnNode, "");
-	visitNode(_return);
-	if (_return.expression())
-	{
-		appendControlFlow(*_return.expression());
-		// Returns with return expression are considered to be assignments to the return parameters.
-		for (auto returnParameter: _return.annotation().functionReturnParameters->parameters())
-			m_currentNode->variableOccurrences.emplace_back(
-				*returnParameter,
-				VariableOccurrence::Kind::Assignment,
-				_return.location()
-			);
-	}
-	connect(m_currentNode, m_returnNode);
-	m_currentNode = newLabel();
-	return false;
-}
-
-bool ControlFlowBuilder::visit(FunctionTypeName const& _functionTypeName)
-{
-	visitNode(_functionTypeName);
-	// Do not visit the parameters and return values of a function type name.
-	// We do not want to consider them as variable declarations for the control flow graph.
-	return false;
-}
-
-bool ControlFlowBuilder::visit(InlineAssembly const& _inlineAssembly)
-{
-	solAssert(!!m_currentNode && !m_inlineAssembly, "");
-
-	m_inlineAssembly = &_inlineAssembly;
-	(*this)(_inlineAssembly.operations());
-	m_inlineAssembly = nullptr;
-
-	return false;
-}
-
-void ControlFlowBuilder::visit(yul::Statement const& _statement)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	solAssert(nativeLocationOf(_statement) == originLocationOf(_statement), "");
-	m_currentNode->location = langutil::SourceLocation::smallestCovering(m_currentNode->location, nativeLocationOf(_statement));
-	ASTWalker::visit(_statement);
-}
-
-void ControlFlowBuilder::operator()(yul::If const& _if)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	visit(*_if.condition);
-
-	auto nodes = splitFlow<2>();
-	m_currentNode = nodes[0];
-	(*this)(_if.body);
-	nodes[0] = m_currentNode;
-	mergeFlow(nodes, nodes[1]);
-}
-
-void ControlFlowBuilder::operator()(yul::Switch const& _switch)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	visit(*_switch.expression);
-
-	auto beforeSwitch = m_currentNode;
-
-	auto nodes = splitFlow(_switch.cases.size());
-	for (size_t i = 0u; i < _switch.cases.size(); ++i)
-	{
-		m_currentNode = nodes[i];
-		(*this)(_switch.cases[i].body);
-		nodes[i] = m_currentNode;
-	}
-	mergeFlow(nodes);
-
-	if (!hasDefaultCase(_switch))
-		connect(beforeSwitch, m_currentNode);
-}
-
-void ControlFlowBuilder::operator()(yul::ForLoop const& _forLoop)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-
-	(*this)(_forLoop.pre);
-
-	auto condition = createLabelHere();
-
-	if (_forLoop.condition)
-		visit(*_forLoop.condition);
-
-	auto loopExpression = newLabel();
-	auto nodes = splitFlow<2>();
-	auto afterFor = nodes[1];
-	m_currentNode = nodes[0];
-
-	{
-		BreakContinueScope scope(*this, afterFor, loopExpression);
-		(*this)(_forLoop.body);
-	}
-
-	placeAndConnectLabel(loopExpression);
-
-	(*this)(_forLoop.post);
-
-	connect(m_currentNode, condition);
-	m_currentNode = afterFor;
-}
-
-void ControlFlowBuilder::operator()(yul::Break const&)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	solAssert(m_breakJump, "");
-	connect(m_currentNode, m_breakJump);
-	m_currentNode = newLabel();
-}
-
-void ControlFlowBuilder::operator()(yul::Continue const&)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	solAssert(m_continueJump, "");
-	connect(m_currentNode, m_continueJump);
-	m_currentNode = newLabel();
-}
-
-void ControlFlowBuilder::operator()(yul::Identifier const& _identifier)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	auto const& externalReferences = m_inlineAssembly->annotation().externalReferences;
-	if (externalReferences.count(&_identifier))
-		if (auto const* declaration = dynamic_cast<VariableDeclaration const*>(externalReferences.at(&_identifier).declaration))
-		{
-			solAssert(nativeLocationOf(_identifier) == originLocationOf(_identifier), "");
-			m_currentNode->variableOccurrences.emplace_back(
-				*declaration,
-				VariableOccurrence::Kind::Access,
-				nativeLocationOf(_identifier)
-			);
-		}
-}
-
-void ControlFlowBuilder::operator()(yul::Assignment const& _assignment)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	visit(*_assignment.value);
-	auto const& externalReferences = m_inlineAssembly->annotation().externalReferences;
-	for (auto const& variable: _assignment.variableNames)
-		if (externalReferences.count(&variable))
-			if (auto const* declaration = dynamic_cast<VariableDeclaration const*>(externalReferences.at(&variable).declaration))
-			{
-				solAssert(nativeLocationOf(variable) == originLocationOf(variable), "");
-				m_currentNode->variableOccurrences.emplace_back(
-					*declaration,
-					VariableOccurrence::Kind::Assignment,
-					nativeLocationOf(variable)
-				);
-			}
-}
-
-void ControlFlowBuilder::operator()(yul::FunctionCall const& _functionCall)
-{
-	using namespace yul;
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	yul::ASTWalker::operator()(_functionCall);
-
-	if (auto const *builtinFunction = m_inlineAssembly->dialect().builtin(_functionCall.functionName.name))
-	{
-		if (builtinFunction->controlFlowSideEffects.canTerminate)
-			connect(m_currentNode, m_transactionReturnNode);
-		if (builtinFunction->controlFlowSideEffects.canRevert)
-			connect(m_currentNode, m_revertNode);
-		if (!builtinFunction->controlFlowSideEffects.canContinue)
-			m_currentNode = newLabel();
-	}
-}
-
-void ControlFlowBuilder::operator()(yul::FunctionDefinition const&)
-{
-	solAssert(m_currentNode && m_inlineAssembly, "");
-	// External references cannot be accessed from within functions, so we can ignore their control flow.
-	// TODO: we might still want to track if they always revert or return, though.
-}
-
-void ControlFlowBuilder::operator()(yul::Leave const&)
-{
-	// This has to be implemented, if we ever decide to visit functions.
-	solUnimplemented("");
-}
-
-bool ControlFlowBuilder::visit(VariableDeclaration const& _variableDeclaration)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_variableDeclaration);
-
-	m_currentNode->variableOccurrences.emplace_back(
-		_variableDeclaration,
-		VariableOccurrence::Kind::Declaration
-	);
-
-	// Handle declaration with immediate assignment.
-	if (_variableDeclaration.value())
-		m_currentNode->variableOccurrences.emplace_back(
-			_variableDeclaration,
-			VariableOccurrence::Kind::Assignment,
-			_variableDeclaration.value()->location()
-		);
-	// Function arguments are considered to be immediately assigned as well (they are "externally assigned").
-	else if (_variableDeclaration.isCallableOrCatchParameter() && !_variableDeclaration.isReturnParameter())
-		m_currentNode->variableOccurrences.emplace_back(
-			_variableDeclaration,
-			VariableOccurrence::Kind::Assignment
-		);
-	return true;
-}
-
-bool ControlFlowBuilder::visit(VariableDeclarationStatement const& _variableDeclarationStatement)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_variableDeclarationStatement);
-
-	for (auto const& var: _variableDeclarationStatement.declarations())
-		if (var)
-			var->accept(*this);
-	if (_variableDeclarationStatement.initialValue())
-	{
-		_variableDeclarationStatement.initialValue()->accept(*this);
-		for (size_t i = 0; i < _variableDeclarationStatement.declarations().size(); i++)
-			if (auto const& var = _variableDeclarationStatement.declarations()[i])
-			{
-				auto expression = _variableDeclarationStatement.initialValue();
-				if (auto tupleExpression = dynamic_cast<TupleExpression const*>(expression))
-					if (tupleExpression->components().size() > 1)
-					{
-						solAssert(tupleExpression->components().size() > i, "");
-						expression = tupleExpression->components()[i].get();
-					}
-				expression = resolveOuterUnaryTuples(expression);
-				m_currentNode->variableOccurrences.emplace_back(
-					*var,
-					VariableOccurrence::Kind::Assignment,
-					expression ? std::make_optional(expression->location()) : std::optional<langutil::SourceLocation>{}
-				);
-			}
-	}
-	return false;
-}
-
-bool ControlFlowBuilder::visit(Identifier const& _identifier)
-{
-	solAssert(!!m_currentNode, "");
-	visitNode(_identifier);
-
-	if (auto const* variableDeclaration = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-		m_currentNode->variableOccurrences.emplace_back(
-			*variableDeclaration,
-			static_cast<Expression const&>(_identifier).annotation().willBeWrittenTo ?
-			VariableOccurrence::Kind::Assignment :
-			VariableOccurrence::Kind::Access,
-			_identifier.location()
-		);
-
-	return true;
-}
-
-bool ControlFlowBuilder::visitNode(ASTNode const& _node)
-{
-	solAssert(!!m_currentNode, "");
-	m_currentNode->location = langutil::SourceLocation::smallestCovering(m_currentNode->location, _node.location());
-	return true;
-}
-
-void ControlFlowBuilder::appendControlFlow(ASTNode const& _node)
-{
-	_node.accept(*this);
-}
-
-CFGNode* ControlFlowBuilder::createFlow(CFGNode* _entry, ASTNode const& _node)
-{
-	auto oldCurrentNode = m_currentNode;
-	m_currentNode = _entry;
-	appendControlFlow(_node);
-	auto endNode = m_currentNode;
-	m_currentNode = oldCurrentNode;
-	return endNode;
-}
-
-void ControlFlowBuilder::connect(CFGNode* _from, CFGNode* _to)
-{
-	solAssert(_from, "");
-	solAssert(_to, "");
-	_from->exits.push_back(_to);
-	_to->entries.push_back(_from);
-}
-
-CFGNode* ControlFlowBuilder::newLabel()
-{
-	return m_nodeContainer.newNode();
-}
-
-CFGNode* ControlFlowBuilder::createLabelHere()
-{
-	auto label = m_nodeContainer.newNode();
-	connect(m_currentNode, label);
-	m_currentNode = label;
-	return label;
-}
-
-void ControlFlowBuilder::placeAndConnectLabel(CFGNode* _node)
-{
-	connect(m_currentNode, _node);
-	m_currentNode = _node;
-}
-
-ControlFlowBuilder::BreakContinueScope::BreakContinueScope(
-	ControlFlowBuilder& _parser,
-	CFGNode* _breakJump,
-	CFGNode* _continueJump
-): m_parser(_parser), m_origBreakJump(_parser.m_breakJump), m_origContinueJump(_parser.m_continueJump)
-{
-	m_parser.m_breakJump = _breakJump;
-	m_parser.m_continueJump = _continueJump;
-}
-
-ControlFlowBuilder::BreakContinueScope::~BreakContinueScope()
-{
-	m_parser.m_breakJump = m_origBreakJump;
-	m_parser.m_continueJump = m_origContinueJump;
-}
diff --git a/libsolidity/analysis/ControlFlowBuilder.h b/libsolidity/analysis/ControlFlowBuilder.h
deleted file mode 100644
index 93bc52bd6936..000000000000
--- a/libsolidity/analysis/ControlFlowBuilder.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/analysis/ControlFlowGraph.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <array>
-#include <memory>
-
-namespace solidity::frontend
-{
-
-/**
- * Helper class that builds the control flow of a function or modifier.
- */
-class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker
-{
-public:
-	static std::unique_ptr<FunctionFlow> createFunctionFlow(
-		CFG::NodeContainer& _nodeContainer,
-		FunctionDefinition const& _function,
-		ContractDefinition const* _contract
-	);
-
-private:
-	explicit ControlFlowBuilder(
-		CFG::NodeContainer& _nodeContainer,
-		FunctionFlow const& _functionFlow,
-		ContractDefinition const* _contract
-	);
-
-	// Visits for constructing the control flow.
-	bool visit(BinaryOperation const& _operation) override;
-	bool visit(UnaryOperation const& _operation) override;
-	bool visit(Conditional const& _conditional) override;
-	bool visit(TryStatement const& _tryStatement) override;
-	bool visit(IfStatement const& _ifStatement) override;
-	bool visit(ForStatement const& _forStatement) override;
-	bool visit(WhileStatement const& _whileStatement) override;
-	bool visit(Break const&) override;
-	bool visit(Continue const&) override;
-	bool visit(Throw const&) override;
-	bool visit(RevertStatement const&) override;
-	bool visit(PlaceholderStatement const&) override;
-	bool visit(FunctionCall const& _functionCall) override;
-	bool visit(ModifierInvocation const& _modifierInvocation) override;
-
-	// Visits for constructing the control flow as well as filling variable occurrences.
-	bool visit(FunctionDefinition const& _functionDefinition) override;
-	bool visit(Return const& _return) override;
-
-	// Visits for filling variable occurrences.
-	bool visit(FunctionTypeName const& _functionTypeName) override;
-	bool visit(InlineAssembly const& _inlineAssembly) override;
-	void visit(yul::Statement const& _statement) override;
-	void operator()(yul::If const& _if) override;
-	void operator()(yul::Switch const& _switch) override;
-	void operator()(yul::ForLoop const& _for) override;
-	void operator()(yul::Break const&) override;
-	void operator()(yul::Continue const&) override;
-	void operator()(yul::Identifier const& _identifier) override;
-	void operator()(yul::Assignment const& _assignment) override;
-	void operator()(yul::FunctionCall const& _functionCall) override;
-	void operator()(yul::FunctionDefinition const& _functionDefinition) override;
-	void operator()(yul::Leave const& _leaveStatement) override;
-	bool visit(VariableDeclaration const& _variableDeclaration) override;
-	bool visit(VariableDeclarationStatement const& _variableDeclarationStatement) override;
-	bool visit(Identifier const& _identifier) override;
-
-protected:
-	bool visitNode(ASTNode const&) override;
-
-private:
-	using ASTConstVisitor::visit;
-	using yul::ASTWalker::visit;
-	using yul::ASTWalker::operator();
-
-	/// Appends the control flow of @a _node to the current control flow.
-	void appendControlFlow(ASTNode const& _node);
-
-	/// Starts at @a _entry and parses the control flow of @a _node.
-	/// @returns The node at which the parsed control flow ends.
-	/// m_currentNode is not affected (it is saved and restored).
-	CFGNode* createFlow(CFGNode* _entry, ASTNode const& _node);
-
-	/// Creates an arc from @a _from to @a _to.
-	static void connect(CFGNode* _from, CFGNode* _to);
-
-	/// Splits the control flow starting at the current node into n paths.
-	/// m_currentNode is set to nullptr and has to be set manually or
-	/// using mergeFlow later.
-	template<size_t n>
-	std::array<CFGNode*, n> splitFlow()
-	{
-		std::array<CFGNode*, n> result;
-		for (auto& node: result)
-		{
-			node = m_nodeContainer.newNode();
-			connect(m_currentNode, node);
-		}
-		m_currentNode = nullptr;
-		return result;
-	}
-
-	/// Splits the control flow starting at the current node into @a _n paths.
-	/// m_currentNode is set to nullptr and has to be set manually or
-	/// using mergeFlow later.
-	std::vector<CFGNode*> splitFlow(size_t n)
-	{
-		std::vector<CFGNode*> result(n);
-		for (auto& node: result)
-		{
-			node = m_nodeContainer.newNode();
-			connect(m_currentNode, node);
-		}
-		m_currentNode = nullptr;
-		return result;
-	}
-
-	/// Merges the control flow of @a _nodes to @a _endNode.
-	/// If @a _endNode is nullptr, a new node is creates and used as end node.
-	/// Sets the merge destination as current node.
-	/// Note: @a _endNode may be one of the nodes in @a _nodes.
-	template<typename C>
-	void mergeFlow(C const& _nodes, CFGNode* _endNode = nullptr)
-	{
-		CFGNode* mergeDestination = (_endNode == nullptr) ? m_nodeContainer.newNode() : _endNode;
-		for (auto& node: _nodes)
-			if (node != mergeDestination)
-				connect(node, mergeDestination);
-		m_currentNode = mergeDestination;
-	}
-
-	CFGNode* newLabel();
-	CFGNode* createLabelHere();
-	void placeAndConnectLabel(CFGNode *_node);
-
-	CFG::NodeContainer& m_nodeContainer;
-
-	CFGNode* m_currentNode = nullptr;
-	CFGNode* m_returnNode = nullptr;
-	CFGNode* m_revertNode = nullptr;
-	CFGNode* m_transactionReturnNode = nullptr;
-
-	ContractDefinition const* m_contract = nullptr;
-
-	/// The current jump destination of break Statements.
-	CFGNode* m_breakJump = nullptr;
-	/// The current jump destination of continue Statements.
-	CFGNode* m_continueJump = nullptr;
-
-	CFGNode* m_placeholderEntry = nullptr;
-	CFGNode* m_placeholderExit = nullptr;
-
-	InlineAssembly const* m_inlineAssembly = nullptr;
-
-	/// Helper class that replaces the break and continue jump destinations for the
-	/// current scope and restores the originals at the end of the scope.
-	class BreakContinueScope
-	{
-	public:
-		BreakContinueScope(ControlFlowBuilder& _parser, CFGNode* _breakJump, CFGNode* _continueJump);
-		~BreakContinueScope();
-	private:
-		ControlFlowBuilder& m_parser;
-		CFGNode* m_origBreakJump;
-		CFGNode* m_origContinueJump;
-	};
-};
-
-}
diff --git a/libsolidity/analysis/ControlFlowGraph.cpp b/libsolidity/analysis/ControlFlowGraph.cpp
deleted file mode 100644
index 518743ef1993..000000000000
--- a/libsolidity/analysis/ControlFlowGraph.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/ControlFlowGraph.h>
-
-#include <libsolidity/analysis/ControlFlowBuilder.h>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-bool CFG::constructFlow(ASTNode const& _astRoot)
-{
-	_astRoot.accept(*this);
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-
-bool CFG::visit(FunctionDefinition const& _function)
-{
-	if (_function.isImplemented() && _function.isFree())
-		m_functionControlFlow[{nullptr, &_function}] = ControlFlowBuilder::createFunctionFlow(
-			m_nodeContainer,
-			_function,
-			nullptr /* _contract */
-		);
-	return false;
-}
-
-bool CFG::visit(ContractDefinition const& _contract)
-{
-	for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts)
-		for (FunctionDefinition const* function: contract->definedFunctions())
-			if (function->isImplemented())
-				m_functionControlFlow[{&_contract, function}] =
-					ControlFlowBuilder::createFunctionFlow(m_nodeContainer, *function, &_contract);
-
-	return true;
-}
-
-FunctionFlow const& CFG::functionFlow(FunctionDefinition const& _function, ContractDefinition const* _contract) const
-{
-	return *m_functionControlFlow.at({_contract, &_function});
-}
-
-CFGNode* CFG::NodeContainer::newNode()
-{
-	m_nodes.emplace_back(std::make_unique<CFGNode>());
-	return m_nodes.back().get();
-}
diff --git a/libsolidity/analysis/ControlFlowGraph.h b/libsolidity/analysis/ControlFlowGraph.h
deleted file mode 100644
index 4ded67268068..000000000000
--- a/libsolidity/analysis/ControlFlowGraph.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <map>
-#include <memory>
-#include <stack>
-#include <utility>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-/**
- * Occurrence of a variable in a block of control flow.
- * Stores the declaration of the referenced variable, the
- * kind of the occurrence and possibly the source location
- * at which it occurred.
- */
-class VariableOccurrence
-{
-public:
-	enum class Kind
-	{
-		Declaration,
-		Access,
-		Return,
-		Assignment,
-		InlineAssembly
-	};
-	VariableOccurrence(VariableDeclaration const& _declaration, Kind _kind, std::optional<langutil::SourceLocation>  _occurrence = {}):
-		m_declaration(_declaration), m_occurrenceKind(_kind), m_occurrence(std::move(_occurrence))
-	{
-	}
-
-	/// Defines a deterministic order on variable occurrences.
-	bool operator<(VariableOccurrence const& _rhs) const
-	{
-		if (m_occurrence && _rhs.m_occurrence)
-		{
-			if (*m_occurrence < *_rhs.m_occurrence) return true;
-			if (*_rhs.m_occurrence < *m_occurrence) return false;
-		}
-		else if (_rhs.m_occurrence)
-			return true;
-		else if (m_occurrence)
-			return false;
-
-		using KindCompareType = std::underlying_type<VariableOccurrence::Kind>::type;
-		return
-			std::make_pair(m_declaration.id(), static_cast<KindCompareType>(m_occurrenceKind)) <
-			std::make_pair(_rhs.m_declaration.id(), static_cast<KindCompareType>(_rhs.m_occurrenceKind));
-	}
-
-	VariableDeclaration const& declaration() const { return m_declaration; }
-	Kind kind() const { return m_occurrenceKind; }
-	std::optional<langutil::SourceLocation> const& occurrence() const { return m_occurrence; }
-private:
-	/// Declaration of the occurring variable.
-	VariableDeclaration const& m_declaration;
-	/// Kind of occurrence.
-	Kind m_occurrenceKind = Kind::Access;
-	/// Source location at which the variable occurred, if available (may be nullptr).
-	std::optional<langutil::SourceLocation> m_occurrence;
-};
-
-/**
- * Node of the Control Flow Graph.
- * The control flow is a directed graph connecting control flow blocks.
- * An arc between two nodes indicates that the control flow can possibly
- * move from its start node to its end node during execution.
- */
-struct CFGNode
-{
-	/// Entry nodes. All CFG nodes from which control flow may move into this node.
-	std::vector<CFGNode*> entries;
-	/// Exit nodes. All CFG nodes to which control flow may continue after this node.
-	std::vector<CFGNode*> exits;
-	/// Resolved definition of the function called by this node
-	FunctionDefinition const* functionDefinition = nullptr;
-	/// Variable occurrences in the node.
-	std::vector<VariableOccurrence> variableOccurrences;
-	// Source location of this control flow block.
-	langutil::SourceLocation location;
-};
-
-/** Describes the control flow of a function. */
-struct FunctionFlow
-{
-	virtual ~FunctionFlow() = default;
-
-	/// Entry node. Control flow of the function starts here.
-	/// This node is empty and does not have any entries.
-	CFGNode* entry = nullptr;
-	/// Exit node. All non-reverting control flow of the function ends here.
-	/// This node is empty and does not have any exits, but may have multiple entries
-	/// (e.g. all return statements of the function).
-	CFGNode* exit = nullptr;
-	/// Revert node. Control flow of the function in case of revert.
-	/// This node is empty and does not have any exits, but may have multiple entries
-	/// (e.g. all assert, require, revert and throw statements).
-	CFGNode* revert = nullptr;
-	/// Transaction return node. Destination node for inline assembly "return" calls.
-	/// This node is empty and does not have any exits, but may have multiple entries
-	/// (e.g. all inline assembly return calls).
-	CFGNode* transactionReturn = nullptr;
-};
-
-class CFG: private ASTConstVisitor
-{
-public:
-	struct FunctionContractTuple
-	{
-		ContractDefinition const* contract = nullptr;
-		FunctionDefinition const* function = nullptr;
-
-		// Use AST ids for comparison to keep a deterministic order in the
-		// containers using this struct
-		bool operator<(FunctionContractTuple const& _other) const
-		{
-			return
-				std::make_pair(contract ? contract->id() : -1, function->id()) <
-				std::make_pair(_other.contract ? _other.contract->id() : -1, _other.function->id());
-		}
-	};
-	explicit CFG(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter) {}
-
-	bool constructFlow(ASTNode const& _astRoot);
-
-	bool visit(FunctionDefinition const& _function) override;
-	bool visit(ContractDefinition const& _contract) override;
-
-	/// Get the function flow for the given function, using `_contract` as the
-	/// most derived contract
-	/// @param _function function to find the function flow for
-	/// @param _contract most derived contract or nullptr for free functions
-	FunctionFlow const& functionFlow(FunctionDefinition const& _function, ContractDefinition const* _contract = nullptr) const;
-
-	std::map<FunctionContractTuple, std::unique_ptr<FunctionFlow>> const& allFunctionFlows() const
-	{
-		return m_functionControlFlow;
-	}
-
-	class NodeContainer
-	{
-	public:
-		CFGNode* newNode();
-	private:
-		std::vector<std::unique_ptr<CFGNode>> m_nodes;
-	};
-private:
-	langutil::ErrorReporter& m_errorReporter;
-
-	/// Node container.
-	/// All nodes allocated during the construction of the control flow graph
-	/// are owned by the CFG class and stored in this container.
-	NodeContainer m_nodeContainer;
-
-	std::map<FunctionContractTuple, std::unique_ptr<FunctionFlow>> m_functionControlFlow;
-};
-
-}
diff --git a/libsolidity/analysis/ControlFlowRevertPruner.cpp b/libsolidity/analysis/ControlFlowRevertPruner.cpp
deleted file mode 100644
index c96ad2b032a7..000000000000
--- a/libsolidity/analysis/ControlFlowRevertPruner.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/ControlFlowRevertPruner.h>
-
-#include <libsolutil/Algorithms.h>
-
-#include <range/v3/algorithm/remove.hpp>
-
-
-namespace solidity::frontend
-{
-
-namespace
-{
-
-/// Find the right scope for the called function: When calling a base function,
-/// we keep the most derived, but we use the called contract in case it is a
-/// library function or nullptr for a free function.
-ContractDefinition const* findScopeContract(FunctionDefinition const& _function, ContractDefinition const* _callingContract)
-{
-	if (auto const* functionContract = _function.annotation().contract)
-	{
-		if (_callingContract && _callingContract->derivesFrom(*functionContract))
-			return _callingContract;
-		else
-			return functionContract;
-	}
-
-	return nullptr;
-}
-}
-
-void ControlFlowRevertPruner::run()
-{
-	for (auto& [pair, flow]: m_cfg.allFunctionFlows())
-		m_functions[pair] = RevertState::Unknown;
-
-	findRevertStates();
-	modifyFunctionFlows();
-}
-
-void ControlFlowRevertPruner::findRevertStates()
-{
-	std::set<CFG::FunctionContractTuple> pendingFunctions = util::keys(m_functions);
-	// We interrupt the search whenever we encounter a call to a function with (yet) unknown
-	// revert behaviour. The ``wakeUp`` data structure contains information about which
-	// searches to restart once we know about the behaviour.
-	std::map<CFG::FunctionContractTuple, std::set<CFG::FunctionContractTuple>> wakeUp;
-
-	while (!pendingFunctions.empty())
-	{
-		CFG::FunctionContractTuple item = *pendingFunctions.begin();
-		pendingFunctions.erase(pendingFunctions.begin());
-
-		if (m_functions[item] != RevertState::Unknown)
-			continue;
-
-		bool foundExit = false;
-		bool foundUnknown = false;
-
-		FunctionFlow const& functionFlow = m_cfg.functionFlow(*item.function, item.contract);
-
-		solidity::util::BreadthFirstSearch<CFGNode*>{{functionFlow.entry}}.run(
-			[&](CFGNode* _node, auto&& _addChild) {
-				if (_node == functionFlow.exit)
-					foundExit = true;
-
-				auto const* resolvedFunction = _node->functionDefinition;
-				if (resolvedFunction && resolvedFunction->isImplemented())
-				{
-					CFG::FunctionContractTuple calledFunctionTuple{
-						findScopeContract(*resolvedFunction, item.contract),
-						resolvedFunction
-					};
-					switch (m_functions.at(calledFunctionTuple))
-					{
-						case RevertState::Unknown:
-							wakeUp[calledFunctionTuple].insert(item);
-							foundUnknown = true;
-							return;
-						case RevertState::AllPathsRevert:
-							return;
-						case RevertState::HasNonRevertingPath:
-							break;
-					}
-				}
-
-				for (CFGNode* exit: _node->exits)
-					_addChild(exit);
-			}
-		);
-
-		auto& revertState = m_functions[item];
-
-		if (foundExit)
-			revertState = RevertState::HasNonRevertingPath;
-		else if (!foundUnknown)
-			revertState = RevertState::AllPathsRevert;
-
-		if (revertState != RevertState::Unknown && wakeUp.count(item))
-		{
-			// Restart all searches blocked by this function.
-			for (CFG::FunctionContractTuple const& nextItem: wakeUp[item])
-				if (m_functions.at(nextItem) == RevertState::Unknown)
-					pendingFunctions.insert(nextItem);
-			wakeUp.erase(item);
-		}
-	}
-}
-
-void ControlFlowRevertPruner::modifyFunctionFlows()
-{
-	for (auto& item: m_functions)
-	{
-		FunctionFlow const& functionFlow = m_cfg.functionFlow(*item.first.function, item.first.contract);
-		solidity::util::BreadthFirstSearch<CFGNode*>{{functionFlow.entry}}.run(
-			[&](CFGNode* _node, auto&& _addChild) {
-				auto const* resolvedFunction = _node->functionDefinition;
-				if (resolvedFunction && resolvedFunction->isImplemented())
-					switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction}))
-					{
-						case RevertState::Unknown:
-							[[fallthrough]];
-						case RevertState::AllPathsRevert:
-							// If the revert states of the functions do not
-							// change anymore, we treat all "unknown" states as
-							// "reverting", since they can only be caused by
-							// recursion.
-							for (CFGNode * node: _node->exits)
-								ranges::remove(node->entries, _node);
-
-							_node->exits = {functionFlow.revert};
-							functionFlow.revert->entries.push_back(_node);
-							return;
-						default:
-							break;
-					}
-
-				for (CFGNode* exit: _node->exits)
-					_addChild(exit);
-		});
-	}
-}
-
-}
diff --git a/libsolidity/analysis/ControlFlowRevertPruner.h b/libsolidity/analysis/ControlFlowRevertPruner.h
deleted file mode 100644
index 9702ddfb7bea..000000000000
--- a/libsolidity/analysis/ControlFlowRevertPruner.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/analysis/ControlFlowGraph.h>
-
-#include <libsolutil/Algorithms.h>
-
-namespace solidity::frontend
-{
-
-/**
- * Analyses all function flows and recursively removes all exit edges from CFG
- * nodes that make function calls that will always revert.
- */
-class ControlFlowRevertPruner
-{
-public:
-	ControlFlowRevertPruner(CFG& _cfg): m_cfg(_cfg) {}
-
-	void run();
-private:
-	/// Possible revert states of a function call
-	enum class RevertState
-	{
-		AllPathsRevert,
-		HasNonRevertingPath,
-		Unknown,
-	};
-
-	/// Identify revert states of all function flows
-	void findRevertStates();
-
-	/// Modify function flows so that edges with reverting function calls are removed
-	void modifyFunctionFlows();
-
-	/// Control Flow Graph object.
-	CFG& m_cfg;
-
-	/// function/contract pairs mapped to their according revert state
-	std::map<CFG::FunctionContractTuple, RevertState> m_functions;
-
-	std::map<
-		std::tuple<FunctionCall const*, ContractDefinition const*>,
-		FunctionDefinition const*
-	> m_resolveCache;
-
-};
-}
diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
deleted file mode 100644
index df6e664baca1..000000000000
--- a/libsolidity/analysis/DeclarationContainer.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Scope - object that holds declaration of names.
- */
-
-#include <libsolidity/analysis/DeclarationContainer.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolutil/StringUtils.h>
-
-#include <range/v3/view/filter.hpp>
-#include <range/v3/range/conversion.hpp>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-Declaration const* DeclarationContainer::conflictingDeclaration(
-	Declaration const& _declaration,
-	ASTString const* _name
-) const
-{
-	if (!_name)
-		_name = &_declaration.name();
-	solAssert(!_name->empty(), "");
-	std::vector<Declaration const*> declarations;
-	if (m_declarations.count(*_name))
-		declarations += m_declarations.at(*_name);
-	if (m_invisibleDeclarations.count(*_name))
-		declarations += m_invisibleDeclarations.at(*_name);
-
-	if (
-		dynamic_cast<FunctionDefinition const*>(&_declaration) ||
-		dynamic_cast<EventDefinition const*>(&_declaration) ||
-		dynamic_cast<MagicVariableDeclaration const*>(&_declaration)
-	)
-	{
-		// check that all other declarations are of the same kind (in which
-		// case the type checker will ensure that the signatures are different)
-		for (Declaration const* declaration: declarations)
-		{
-			if (
-				dynamic_cast<FunctionDefinition const*>(&_declaration) &&
-				!dynamic_cast<FunctionDefinition const*>(declaration)
-			)
-				return declaration;
-			if (
-				dynamic_cast<EventDefinition const*>(&_declaration) &&
-				!dynamic_cast<EventDefinition const*>(declaration)
-			)
-				return declaration;
-			if (
-				dynamic_cast<MagicVariableDeclaration const*>(&_declaration) &&
-				!dynamic_cast<MagicVariableDeclaration const*>(declaration)
-			)
-				return declaration;
-			// Or, continue.
-		}
-	}
-	else if (declarations.size() == 1 && declarations.front() == &_declaration)
-		return nullptr;
-	else if (!declarations.empty())
-		return declarations.front();
-
-	return nullptr;
-}
-
-void DeclarationContainer::activateVariable(ASTString const& _name)
-{
-	solAssert(
-		m_invisibleDeclarations.count(_name) && m_invisibleDeclarations.at(_name).size() == 1,
-		"Tried to activate a non-inactive variable or multiple inactive variables with the same name."
-	);
-	solAssert(m_declarations.count(_name) == 0 || m_declarations.at(_name).empty(), "");
-	m_declarations[_name].emplace_back(m_invisibleDeclarations.at(_name).front());
-	m_invisibleDeclarations.erase(_name);
-}
-
-bool DeclarationContainer::isInvisible(ASTString const& _name) const
-{
-	return m_invisibleDeclarations.count(_name);
-}
-
-bool DeclarationContainer::registerDeclaration(
-	Declaration const& _declaration,
-	ASTString const* _name,
-	langutil::SourceLocation const* _location,
-	bool _invisible,
-	bool _update
-)
-{
-	if (!_name)
-		_name = &_declaration.name();
-	if (_name->empty())
-		return true;
-
-	if (_update)
-	{
-		solAssert(!dynamic_cast<FunctionDefinition const*>(&_declaration), "Attempt to update function definition.");
-		m_declarations.erase(*_name);
-		m_invisibleDeclarations.erase(*_name);
-	}
-	else
-	{
-		if (conflictingDeclaration(_declaration, _name))
-			return false;
-
-		if (m_enclosingContainer && _declaration.isVisibleAsUnqualifiedName())
-			m_homonymCandidates.emplace_back(*_name, _location ? _location : &_declaration.location());
-	}
-
-	std::vector<Declaration const*>& decls = _invisible ? m_invisibleDeclarations[*_name] : m_declarations[*_name];
-	if (!util::contains(decls, &_declaration))
-		decls.push_back(&_declaration);
-	return true;
-}
-
-bool DeclarationContainer::registerDeclaration(
-	Declaration const& _declaration,
-	bool _invisible,
-	bool _update
-)
-{
-	return registerDeclaration(_declaration, nullptr, nullptr, _invisible, _update);
-}
-
-std::vector<Declaration const*> DeclarationContainer::resolveName(
-	ASTString const& _name,
-	ResolvingSettings _settings
-) const
-{
-	solAssert(!_name.empty(), "Attempt to resolve empty name.");
-	std::vector<Declaration const*> result;
-
-	if (m_declarations.count(_name))
-	{
-		if (_settings.onlyVisibleAsUnqualifiedNames)
-			result += m_declarations.at(_name) | ranges::views::filter(&Declaration::isVisibleAsUnqualifiedName) | ranges::to_vector;
-		else
-			result += m_declarations.at(_name);
-	}
-
-	if (_settings.alsoInvisible && m_invisibleDeclarations.count(_name))
-	{
-		if (_settings.onlyVisibleAsUnqualifiedNames)
-			result += m_invisibleDeclarations.at(_name) | ranges::views::filter(&Declaration::isVisibleAsUnqualifiedName) | ranges::to_vector;
-		else
-			result += m_invisibleDeclarations.at(_name);
-	}
-
-	if (result.empty() && _settings.recursive && m_enclosingContainer)
-		result = m_enclosingContainer->resolveName(_name, _settings);
-
-	return result;
-}
-
-std::vector<ASTString> DeclarationContainer::similarNames(ASTString const& _name) const
-{
-
-	// because the function below has quadratic runtime - it will not magically improve once a better algorithm is discovered ;)
-	// since 80 is the suggested line length limit, we use 80^2 as length threshold
-	static size_t const MAXIMUM_LENGTH_THRESHOLD = 80 * 80;
-
-	std::vector<ASTString> similar;
-	size_t maximumEditDistance = _name.size() > 3 ? 2 : _name.size() / 2;
-	for (auto const& declaration: m_declarations)
-	{
-		std::string const& declarationName = declaration.first;
-		if (util::stringWithinDistance(_name, declarationName, maximumEditDistance, MAXIMUM_LENGTH_THRESHOLD))
-			similar.push_back(declarationName);
-	}
-	for (auto const& declaration: m_invisibleDeclarations)
-	{
-		std::string const& declarationName = declaration.first;
-		if (util::stringWithinDistance(_name, declarationName, maximumEditDistance, MAXIMUM_LENGTH_THRESHOLD))
-			similar.push_back(declarationName);
-	}
-
-	if (m_enclosingContainer)
-		similar += m_enclosingContainer->similarNames(_name);
-
-	return similar;
-}
-
-void DeclarationContainer::populateHomonyms(std::back_insert_iterator<Homonyms> _it) const
-{
-	for (DeclarationContainer const* innerContainer: m_innerContainers)
-		innerContainer->populateHomonyms(_it);
-
-	for (auto [name, location]: m_homonymCandidates)
-	{
-		ResolvingSettings settings;
-		settings.recursive = true;
-		settings.alsoInvisible = true;
-		std::vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, std::move(settings));
-		if (!declarations.empty())
-			_it = make_pair(location, declarations);
-	}
-}
diff --git a/libsolidity/analysis/DeclarationContainer.h b/libsolidity/analysis/DeclarationContainer.h
deleted file mode 100644
index 279ee180697b..000000000000
--- a/libsolidity/analysis/DeclarationContainer.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Scope - object that holds declaration of names.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <memory>
-
-namespace solidity::frontend
-{
-
-/**
- * Settings for how the function DeclarationContainer::resolveName operates.
- */
-struct ResolvingSettings
-{
-	/// if true and there are no matching declarations in the current container,
-	/// recursively searches the enclosing containers as well.
-	bool recursive = false;
-	/// if true, include invisible declaration in the results.
-	bool alsoInvisible = false;
-	/// if true, do not include declarations which can never actually be referenced using their
-	/// name alone (without being qualified with the name of scope in which they are declared).
-	bool onlyVisibleAsUnqualifiedNames = false;
-};
-
-
-/**
- * Container that stores mappings between names and declarations. It also contains a link to the
- * enclosing scope.
- */
-class DeclarationContainer
-{
-public:
-	using Homonyms = std::vector<std::pair<langutil::SourceLocation const*, std::vector<Declaration const*>>>;
-
-	DeclarationContainer() = default;
-	explicit DeclarationContainer(ASTNode const* _enclosingNode, DeclarationContainer* _enclosingContainer):
-		m_enclosingNode(_enclosingNode),
-		m_enclosingContainer(_enclosingContainer)
-	{
-		if (_enclosingContainer)
-			_enclosingContainer->m_innerContainers.emplace_back(this);
-	}
-	/// Registers the declaration in the scope unless its name is already declared or the name is empty.
-	/// @param _name the name to register, if nullptr the intrinsic name of @a _declaration is used.
-	/// @param _location alternative location, used to point at homonymous declarations.
-	/// @param _invisible if true, registers the declaration, reports name clashes but does not return it in @a resolveName.
-	/// @param _update if true, replaces a potential declaration that is already present.
-	/// @returns false if the name was already declared.
-	bool registerDeclaration(Declaration const& _declaration, ASTString const* _name, langutil::SourceLocation const* _location, bool _invisible, bool _update);
-	bool registerDeclaration(Declaration const& _declaration, bool _invisible, bool _update);
-
-	/// Finds all declarations that in the current scope can be referred to using specified name.
-	/// @param _name the name to look for.
-	/// @param _settings see ResolvingSettings
-	std::vector<Declaration const*> resolveName(ASTString const& _name, ResolvingSettings _settings = ResolvingSettings{}) const;
-	ASTNode const* enclosingNode() const { return m_enclosingNode; }
-	DeclarationContainer const* enclosingContainer() const { return m_enclosingContainer; }
-	std::map<ASTString, std::vector<Declaration const*>> const& declarations() const { return m_declarations; }
-	/// @returns whether declaration is valid, and if not also returns previous declaration.
-	Declaration const* conflictingDeclaration(Declaration const& _declaration, ASTString const* _name = nullptr) const;
-
-	/// Activates a previously inactive (invisible) variable. To be used in C99 scoping for
-	/// VariableDeclarationStatements.
-	void activateVariable(ASTString const& _name);
-
-	/// @returns true if declaration is currently invisible.
-	bool isInvisible(ASTString const& _name) const;
-
-	/// @returns existing declaration names similar to @a _name.
-	/// Searches this and all parent containers.
-	std::vector<ASTString> similarNames(ASTString const& _name) const;
-
-	/// Populates a vector of (location, declaration) pairs, where location is a location of an inner-scope declaration,
-	/// and declaration is the corresponding homonymous outer-scope declaration.
-	void populateHomonyms(std::back_insert_iterator<Homonyms> _it) const;
-
-private:
-	ASTNode const* m_enclosingNode = nullptr;
-	DeclarationContainer const* m_enclosingContainer = nullptr;
-	std::vector<DeclarationContainer const*> m_innerContainers;
-	std::map<ASTString, std::vector<Declaration const*>> m_declarations;
-	std::map<ASTString, std::vector<Declaration const*>> m_invisibleDeclarations;
-	/// List of declarations (name and location) to check later for homonymity.
-	std::vector<std::pair<std::string, langutil::SourceLocation const*>> m_homonymCandidates;
-};
-
-}
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
deleted file mode 100644
index 28c051c0a000..000000000000
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/DeclarationTypeChecker.h>
-
-#include <libsolidity/analysis/ConstantEvaluator.h>
-
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/view/transform.hpp>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-bool DeclarationTypeChecker::visit(ElementaryTypeName const& _typeName)
-{
-	if (_typeName.annotation().type)
-		return false;
-
-	_typeName.annotation().type = TypeProvider::fromElementaryTypeName(_typeName.typeName());
-	if (_typeName.stateMutability().has_value())
-	{
-		// for non-address types this was already caught by the parser
-		solAssert(_typeName.annotation().type->category() == Type::Category::Address, "");
-		switch (*_typeName.stateMutability())
-		{
-			case StateMutability::Payable:
-				_typeName.annotation().type = TypeProvider::payableAddress();
-				break;
-			case StateMutability::NonPayable:
-				_typeName.annotation().type = TypeProvider::address();
-				break;
-			default:
-				m_errorReporter.typeError(
-					2311_error,
-					_typeName.location(),
-					"Address types can only be payable or non-payable."
-				);
-				break;
-		}
-	}
-	return true;
-}
-
-bool DeclarationTypeChecker::visit(EnumDefinition const& _enum)
-{
-	if (_enum.members().size() > 256)
-		m_errorReporter.declarationError(
-			1611_error,
-			_enum.location(),
-			"Enum with more than 256 members is not allowed."
-		);
-
-	return false;
-}
-
-bool DeclarationTypeChecker::visit(StructDefinition const& _struct)
-{
-	if (_struct.annotation().recursive.has_value())
-	{
-		if (!m_currentStructsSeen.empty() && *_struct.annotation().recursive)
-			m_recursiveStructSeen = true;
-		return false;
-	}
-
-	if (m_currentStructsSeen.count(&_struct))
-	{
-		_struct.annotation().recursive = true;
-		m_recursiveStructSeen = true;
-		return false;
-	}
-
-	bool previousRecursiveStructSeen = m_recursiveStructSeen;
-	bool hasRecursiveChild = false;
-
-	m_currentStructsSeen.insert(&_struct);
-
-	for (auto const& member: _struct.members())
-	{
-		m_recursiveStructSeen = false;
-		member->accept(*this);
-		solAssert(member->annotation().type, "");
-		if (m_recursiveStructSeen)
-			hasRecursiveChild = true;
-	}
-
-	if (!_struct.annotation().recursive.has_value())
-		_struct.annotation().recursive = hasRecursiveChild;
-	m_recursiveStructSeen = previousRecursiveStructSeen || *_struct.annotation().recursive;
-	m_currentStructsSeen.erase(&_struct);
-	if (m_currentStructsSeen.empty())
-		m_recursiveStructSeen = false;
-
-	// Check direct recursion, fatal error if detected.
-	auto visitor = [&](StructDefinition const& _struct, auto& _cycleDetector, size_t _depth)
-	{
-		if (_depth >= 256)
-			m_errorReporter.fatalDeclarationError(
-				5651_error,
-				_struct.location(),
-				"Struct definition exhausts cyclic dependency validator."
-			);
-
-		for (ASTPointer<VariableDeclaration> const& member: _struct.members())
-		{
-			Type const* memberType = member->annotation().type;
-
-			if (auto arrayType = dynamic_cast<ArrayType const*>(memberType))
-				memberType = arrayType->finalBaseType(true);
-
-			if (auto structType = dynamic_cast<StructType const*>(memberType))
-				if (_cycleDetector.run(structType->structDefinition()))
-					return;
-		}
-	};
-	if (util::CycleDetector<StructDefinition>(visitor).run(_struct))
-		m_errorReporter.fatalTypeError(2046_error, _struct.location(), "Recursive struct definition.");
-
-	return false;
-}
-
-void DeclarationTypeChecker::endVisit(UserDefinedValueTypeDefinition const& _userDefined)
-{
-	TypeName const* typeName = _userDefined.underlyingType();
-	solAssert(typeName, "");
-	if (!dynamic_cast<ElementaryTypeName const*>(typeName))
-		m_errorReporter.fatalTypeError(
-			8657_error,
-			typeName->location(),
-			"The underlying type for a user defined value type has to be an elementary value type."
-		);
-
-	Type const* type = typeName->annotation().type;
-	solAssert(type, "");
-	solAssert(!dynamic_cast<UserDefinedValueType const*>(type), "");
-	if (!type->isValueType())
-		m_errorReporter.typeError(
-			8129_error,
-			_userDefined.location(),
-			"The underlying type of the user defined value type \"" +
-			_userDefined.name() +
-			"\" is not a value type."
-		);
-}
-
-void DeclarationTypeChecker::endVisit(UserDefinedTypeName const& _typeName)
-{
-	if (_typeName.annotation().type)
-		return;
-
-	Declaration const* declaration = _typeName.pathNode().annotation().referencedDeclaration;
-	solAssert(declaration, "");
-
-	if (StructDefinition const* structDef = dynamic_cast<StructDefinition const*>(declaration))
-	{
-		if (!m_insideFunctionType && !m_currentStructsSeen.empty())
-			structDef->accept(*this);
-		_typeName.annotation().type = TypeProvider::structType(*structDef, DataLocation::Storage);
-	}
-	else if (EnumDefinition const* enumDef = dynamic_cast<EnumDefinition const*>(declaration))
-		_typeName.annotation().type = TypeProvider::enumType(*enumDef);
-	else if (ContractDefinition const* contract = dynamic_cast<ContractDefinition const*>(declaration))
-		_typeName.annotation().type = TypeProvider::contract(*contract);
-	else if (auto userDefinedValueType = dynamic_cast<UserDefinedValueTypeDefinition const*>(declaration))
-		_typeName.annotation().type = TypeProvider::userDefinedValueType(*userDefinedValueType);
-	else
-	{
-		_typeName.annotation().type = TypeProvider::emptyTuple();
-		m_errorReporter.fatalTypeError(
-			5172_error,
-			_typeName.location(),
-			"Name has to refer to a user-defined type."
-		);
-	}
-}
-
-void DeclarationTypeChecker::endVisit(IdentifierPath const& _path)
-{
-	Declaration const* declaration = _path.annotation().referencedDeclaration;
-	solAssert(declaration, "");
-
-	if (ContractDefinition const* contract = dynamic_cast<ContractDefinition const*>(declaration))
-		if (contract->isLibrary())
-			m_errorReporter.typeError(1130_error, _path.location(), "Invalid use of a library name.");
-}
-
-bool DeclarationTypeChecker::visit(FunctionTypeName const& _typeName)
-{
-	if (_typeName.annotation().type)
-		return false;
-
-	bool previousInsideFunctionType = m_insideFunctionType;
-	m_insideFunctionType = true;
-	_typeName.parameterTypeList()->accept(*this);
-	_typeName.returnParameterTypeList()->accept(*this);
-	m_insideFunctionType = previousInsideFunctionType;
-
-	switch (_typeName.visibility())
-	{
-		case Visibility::Internal:
-		case Visibility::External:
-			break;
-		default:
-			m_errorReporter.fatalTypeError(
-				6012_error,
-				_typeName.location(),
-				"Invalid visibility, can only be \"external\" or \"internal\"."
-			);
-			return false;
-	}
-
-	if (_typeName.isPayable() && _typeName.visibility() != Visibility::External)
-	{
-		m_errorReporter.fatalTypeError(
-			7415_error,
-			_typeName.location(),
-			"Only external function types can be payable."
-		);
-		return false;
-	}
-	_typeName.annotation().type = TypeProvider::function(_typeName);
-	return false;
-}
-
-void DeclarationTypeChecker::endVisit(Mapping const& _mapping)
-{
-	if (_mapping.annotation().type)
-		return;
-
-	if (auto const* typeName = dynamic_cast<UserDefinedTypeName const*>(&_mapping.keyType()))
-		switch (typeName->annotation().type->category())
-		{
-			case Type::Category::Enum:
-			case Type::Category::Contract:
-			case Type::Category::UserDefinedValueType:
-				break;
-			default:
-				m_errorReporter.fatalTypeError(
-					7804_error,
-					typeName->location(),
-					"Only elementary types, user defined value types, contract types or enums are allowed as mapping keys."
-				);
-				break;
-		}
-	else
-		solAssert(dynamic_cast<ElementaryTypeName const*>(&_mapping.keyType()), "");
-
-	Type const* keyType = _mapping.keyType().annotation().type;
-	ASTString keyName = _mapping.keyName();
-
-	Type const* valueType = _mapping.valueType().annotation().type;
-	ASTString valueName = _mapping.valueName();
-
-	// Convert key type to memory.
-	keyType = TypeProvider::withLocationIfReference(DataLocation::Memory, keyType);
-
-	// Convert value type to storage reference.
-	valueType = TypeProvider::withLocationIfReference(DataLocation::Storage, valueType);
-	_mapping.annotation().type = TypeProvider::mapping(keyType, keyName, valueType, valueName);
-
-	// Check if parameter names are conflicting.
-	if (!keyName.empty())
-	{
-		auto childMappingType = dynamic_cast<MappingType const*>(valueType);
-		ASTString currentValueName = valueName;
-		bool loop = true;
-		while (loop)
-		{
-			bool isError = false;
-			// Value type is a mapping.
-			if (childMappingType)
-			{
-				// Compare top mapping's key name with child mapping's key name.
-				ASTString childKeyName = childMappingType->keyName();
-				if (keyName == childKeyName)
-					isError = true;
-
-				auto valueType = childMappingType->valueType();
-				currentValueName = childMappingType->valueName();
-				childMappingType = dynamic_cast<MappingType const*>(valueType);
-			}
-			else
-			{
-				// Compare top mapping's key name with the value name.
-				if (keyName == currentValueName)
-					isError = true;
-
-				loop = false; // We arrived at the end of mapping recursion.
-			}
-
-			// Report error.
-			if (isError)
-			{
-				m_errorReporter.declarationError(
-					1809_error,
-					_mapping.location(),
-					"Conflicting parameter name \"" + keyName + "\" in mapping."
-				);
-			}
-		}
-	}
-}
-
-void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
-{
-	if (_typeName.annotation().type)
-		return;
-
-	Type const* baseType = _typeName.baseType().annotation().type;
-	if (!baseType)
-	{
-		solAssert(!m_errorReporter.errors().empty(), "");
-		return;
-	}
-
-	if (Expression const* length = _typeName.length())
-	{
-		std::optional<rational> lengthValue;
-		if (length->annotation().type && length->annotation().type->category() == Type::Category::RationalNumber)
-			lengthValue = dynamic_cast<RationalNumberType const&>(*length->annotation().type).value();
-		else if (std::optional<ConstantEvaluator::TypedRational> value = ConstantEvaluator::evaluate(m_errorReporter, *length))
-			lengthValue = value->value;
-
-		if (!lengthValue)
-			m_errorReporter.typeError(
-				5462_error,
-				length->location(),
-				"Invalid array length, expected integer literal or constant expression."
-			);
-		else if (*lengthValue == 0)
-			m_errorReporter.typeError(1406_error, length->location(), "Array with zero length specified.");
-		else if (lengthValue->denominator() != 1)
-			m_errorReporter.typeError(3208_error, length->location(), "Array with fractional length specified.");
-		else if (*lengthValue < 0)
-			m_errorReporter.typeError(3658_error, length->location(), "Array with negative length specified.");
-		else if (lengthValue > TypeProvider::uint256()->max())
-			m_errorReporter.typeError(
-				1847_error,
-				length->location(),
-				"Array length too large, maximum is 2**256 - 1."
-			);
-
-		_typeName.annotation().type = TypeProvider::array(
-			DataLocation::Storage,
-			baseType,
-			lengthValue ? u256(lengthValue->numerator()) : u256(0)
-		);
-	}
-	else
-		_typeName.annotation().type = TypeProvider::array(DataLocation::Storage, baseType);
-}
-
-void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
-{
-	if (_variable.annotation().type)
-		return;
-
-	if (_variable.isFileLevelVariable() && !_variable.isConstant())
-		m_errorReporter.declarationError(
-			8342_error,
-			_variable.location(),
-			"Only constant variables are allowed at file level."
-		);
-	if (_variable.isConstant() && (!_variable.isStateVariable() && !_variable.isFileLevelVariable()))
-		m_errorReporter.declarationError(
-			1788_error,
-			_variable.location(),
-			"The \"constant\" keyword can only be used for state variables or variables at file level."
-		);
-	if (_variable.immutable() && !_variable.isStateVariable())
-		m_errorReporter.declarationError(
-			8297_error,
-			_variable.location(),
-			"The \"immutable\" keyword can only be used for state variables."
-		);
-
-	using Location = VariableDeclaration::Location;
-	Location varLoc = _variable.referenceLocation();
-	DataLocation typeLoc = DataLocation::Memory;
-
-	std::set<Location> allowedDataLocations = _variable.allowedDataLocations();
-	if (!allowedDataLocations.count(varLoc))
-	{
-		auto locationToString = [](VariableDeclaration::Location _location) -> std::string
-		{
-			switch (_location)
-			{
-				case Location::Memory: return "\"memory\"";
-				case Location::Storage: return "\"storage\"";
-				case Location::CallData: return "\"calldata\"";
-				case Location::Unspecified: return "none";
-			}
-			return {};
-		};
-
-		std::string errorString;
-		if (!_variable.hasReferenceOrMappingType())
-			errorString = "Data location can only be specified for array, struct or mapping types";
-		else
-		{
-			errorString = "Data location must be " +
-				util::joinHumanReadable(
-					allowedDataLocations | ranges::views::transform(locationToString),
-					", ",
-					" or "
-				);
-			if (_variable.isConstructorParameter())
-				errorString += " for constructor parameter";
-			else if (_variable.isCallableOrCatchParameter())
-				errorString +=
-					" for " +
-					std::string(_variable.isReturnParameter() ? "return " : "") +
-					"parameter in" +
-					std::string(_variable.isExternalCallableParameter() ? " external" : "") +
-					" function";
-			else
-				errorString += " for variable";
-		}
-		errorString += ", but " + locationToString(varLoc) + " was given.";
-		m_errorReporter.typeError(6651_error, _variable.location(), errorString);
-
-		solAssert(!allowedDataLocations.empty(), "");
-		varLoc = *allowedDataLocations.begin();
-	}
-
-	// Find correct data location.
-	if (_variable.isEventOrErrorParameter())
-	{
-		solAssert(varLoc == Location::Unspecified, "");
-		typeLoc = DataLocation::Memory;
-	}
-	else if (_variable.isFileLevelVariable())
-	{
-		solAssert(varLoc == Location::Unspecified, "");
-		typeLoc = DataLocation::Memory;
-	}
-	else if (_variable.isStateVariable())
-	{
-		solAssert(varLoc == Location::Unspecified, "");
-		typeLoc = (_variable.isConstant() || _variable.immutable()) ? DataLocation::Memory : DataLocation::Storage;
-	}
-	else if (
-		dynamic_cast<StructDefinition const*>(_variable.scope()) ||
-		dynamic_cast<EnumDefinition const*>(_variable.scope())
-	)
-		// The actual location will later be changed depending on how the type is used.
-		typeLoc = DataLocation::Storage;
-	else
-		switch (varLoc)
-		{
-			case Location::Memory:
-				typeLoc = DataLocation::Memory;
-				break;
-			case Location::Storage:
-				typeLoc = DataLocation::Storage;
-				break;
-			case Location::CallData:
-				typeLoc = DataLocation::CallData;
-				break;
-			case Location::Unspecified:
-				solAssert(!_variable.hasReferenceOrMappingType(), "Data location not properly set.");
-		}
-
-	Type const* type = _variable.typeName().annotation().type;
-	if (auto ref = dynamic_cast<ReferenceType const*>(type))
-	{
-		bool isPointer = !_variable.isStateVariable();
-		type = TypeProvider::withLocation(ref, typeLoc, isPointer);
-	}
-
-	if (_variable.isConstant() && !type->isValueType())
-	{
-		bool allowed = false;
-		if (auto arrayType = dynamic_cast<ArrayType const*>(type))
-			allowed = arrayType->isByteArrayOrString();
-		if (!allowed)
-			m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Only constants of value type and byte array type are implemented.");
-	}
-
-	_variable.annotation().type = type;
-}
-
-bool DeclarationTypeChecker::visit(UsingForDirective const& _usingFor)
-{
-	if (_usingFor.usesBraces())
-	{
-		for (ASTPointer<IdentifierPath> const& function: _usingFor.functionsOrLibrary())
-			if (auto functionDefinition = dynamic_cast<FunctionDefinition const*>(function->annotation().referencedDeclaration))
-			{
-				if (!functionDefinition->isFree() && !(
-					dynamic_cast<ContractDefinition const*>(functionDefinition->scope()) &&
-					dynamic_cast<ContractDefinition const*>(functionDefinition->scope())->isLibrary()
-				))
-					m_errorReporter.typeError(
-						4167_error,
-						function->location(),
-						"Only file-level functions and library functions can be attached to a type in a \"using\" statement"
-					);
-			}
-			else
-				m_errorReporter.fatalTypeError(8187_error, function->location(), "Expected function name." );
-	}
-	else
-	{
-		ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(
-			_usingFor.functionsOrLibrary().front()->annotation().referencedDeclaration
-		);
-		if (!library || !library->isLibrary())
-			m_errorReporter.fatalTypeError(
-				4357_error,
-				_usingFor.functionsOrLibrary().front()->location(),
-				"Library name expected. If you want to attach a function, use '{...}'."
-			);
-	}
-
-	// We do not visit _usingFor.functions() because it will lead to an error since
-	// library names cannot be mentioned stand-alone.
-
-	if (_usingFor.typeName())
-		_usingFor.typeName()->accept(*this);
-
-	return false;
-}
-
-bool DeclarationTypeChecker::visit(InheritanceSpecifier const& _inheritanceSpecifier)
-{
-	auto const* contract = dynamic_cast<ContractDefinition const*>(_inheritanceSpecifier.name().annotation().referencedDeclaration);
-	solAssert(contract, "");
-	if (contract->isLibrary())
-	{
-		m_errorReporter.typeError(
-			2571_error,
-			_inheritanceSpecifier.name().location(),
-			"Libraries cannot be inherited from."
-		);
-		return false;
-	}
-	return true;
-}
-
-bool DeclarationTypeChecker::check(ASTNode const& _node)
-{
-	auto watcher = m_errorReporter.errorWatcher();
-	_node.accept(*this);
-	return watcher.ok();
-}
diff --git a/libsolidity/analysis/DeclarationTypeChecker.h b/libsolidity/analysis/DeclarationTypeChecker.h
deleted file mode 100644
index cb887c845a9c..000000000000
--- a/libsolidity/analysis/DeclarationTypeChecker.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <list>
-#include <map>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Assigns types to declarations.
- */
-class DeclarationTypeChecker: private ASTConstVisitor
-{
-public:
-	DeclarationTypeChecker(
-		langutil::ErrorReporter& _errorReporter,
-		langutil::EVMVersion _evmVersion
-	):
-		m_errorReporter(_errorReporter),
-		m_evmVersion(_evmVersion)
-	{}
-
-	bool check(ASTNode const& _contract);
-
-private:
-
-	bool visit(ElementaryTypeName const& _typeName) override;
-	void endVisit(UserDefinedTypeName const& _typeName) override;
-	void endVisit(IdentifierPath const& _identifierPath) override;
-	bool visit(FunctionTypeName const& _typeName) override;
-	void endVisit(Mapping const& _mapping) override;
-	void endVisit(ArrayTypeName const& _typeName) override;
-	void endVisit(VariableDeclaration const& _variable) override;
-	bool visit(EnumDefinition const& _enum) override;
-	bool visit(StructDefinition const& _struct) override;
-	void endVisit(UserDefinedValueTypeDefinition const& _userDefined) override;
-	bool visit(UsingForDirective const& _usingForDirective) override;
-	bool visit(InheritanceSpecifier const& _inheritanceSpecifier) override;
-
-	langutil::ErrorReporter& m_errorReporter;
-	langutil::EVMVersion m_evmVersion;
-	bool m_insideFunctionType = false;
-	bool m_recursiveStructSeen = false;
-	std::set<StructDefinition const*> m_currentStructsSeen;
-};
-
-}
diff --git a/libsolidity/analysis/DocStringAnalyser.cpp b/libsolidity/analysis/DocStringAnalyser.cpp
deleted file mode 100644
index d4afadf26f5d..000000000000
--- a/libsolidity/analysis/DocStringAnalyser.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Parses and analyses the doc strings.
- * Stores the parsing results in the AST annotations and reports errors.
- */
-
-#include <libsolidity/analysis/DocStringAnalyser.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <liblangutil/ErrorReporter.h>
-
-#include <boost/algorithm/string.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-
-void copyMissingTags(std::set<CallableDeclaration const*> const& _baseFunctions, StructurallyDocumentedAnnotation& _target, FunctionType const* _functionType = nullptr)
-{
-	// Only copy if there is exactly one direct base function.
-	if (_baseFunctions.size() != 1)
-		return;
-
-	CallableDeclaration const& baseFunction = **_baseFunctions.begin();
-
-	auto& sourceDoc = dynamic_cast<StructurallyDocumentedAnnotation const&>(baseFunction.annotation());
-
-	for (auto it = sourceDoc.docTags.begin(); it != sourceDoc.docTags.end();)
-	{
-		std::string const& tag = it->first;
-		// Don't copy tag "inheritdoc", custom tags or already existing tags
-		if (tag == "inheritdoc" || _target.docTags.count(tag) || boost::starts_with(tag, "custom"))
-		{
-			it++;
-			continue;
-		}
-
-		size_t n = 0;
-		// Iterate over all values of the current tag (it's a multimap)
-		for (auto next = sourceDoc.docTags.upper_bound(tag); it != next; it++, n++)
-		{
-			DocTag content = it->second;
-
-			// Update the parameter name for @return tags
-			if (_functionType && tag == "return")
-			{
-				size_t docParaNameEndPos = content.content.find_first_of(" \t");
-				std::string const docParameterName = content.content.substr(0, docParaNameEndPos);
-
-				if (
-					_functionType->returnParameterNames().size() > n &&
-					docParameterName != _functionType->returnParameterNames().at(n)
-				)
-				{
-					bool baseHasNoName =
-						baseFunction.returnParameterList() &&
-						baseFunction.returnParameters().size() > n &&
-						baseFunction.returnParameters().at(n)->name().empty();
-
-					std::string paramName = _functionType->returnParameterNames().at(n);
-					content.content =
-						(paramName.empty() ? "" : std::move(paramName) + " ") + (
-							std::string::npos == docParaNameEndPos || baseHasNoName ?
-							content.content :
-							content.content.substr(docParaNameEndPos + 1)
-						);
-				}
-			}
-
-			_target.docTags.emplace(tag, content);
-		}
-	}
-}
-
-CallableDeclaration const* findBaseCallable(std::set<CallableDeclaration const*> const& _baseFunctions, int64_t _contractId)
-{
-	for (CallableDeclaration const* baseFuncCandidate: _baseFunctions)
-		if (baseFuncCandidate->annotation().contract->id() == _contractId)
-			return baseFuncCandidate;
-		else if (auto callable = findBaseCallable(baseFuncCandidate->annotation().baseFunctions, _contractId))
-			return callable;
-
-	return nullptr;
-}
-
-bool parameterNamesEqual(CallableDeclaration const& _a, CallableDeclaration const& _b)
-{
-	return boost::range::equal(_a.parameters(), _b.parameters(), [](auto const& pa, auto const& pb) { return pa->name() == pb->name(); });
-}
-
-}
-
-bool DocStringAnalyser::analyseDocStrings(SourceUnit const& _sourceUnit)
-{
-	auto errorWatcher = m_errorReporter.errorWatcher();
-	_sourceUnit.accept(*this);
-	return errorWatcher.ok();
-}
-
-bool DocStringAnalyser::visit(FunctionDefinition const& _function)
-{
-	if (!_function.isConstructor())
-		handleCallable(_function, _function, _function.annotation(), TypeProvider::function(_function));
-	return true;
-}
-
-bool DocStringAnalyser::visit(VariableDeclaration const& _variable)
-{
-	if (!_variable.isStateVariable() && !_variable.isFileLevelVariable())
-		return false;
-
-	auto const* getterType = TypeProvider::function(_variable);
-
-	if (CallableDeclaration const* baseFunction = resolveInheritDoc(_variable.annotation().baseFunctions, _variable, _variable.annotation()))
-		copyMissingTags({baseFunction}, _variable.annotation(), getterType);
-	else if (_variable.annotation().docTags.empty())
-		copyMissingTags(_variable.annotation().baseFunctions, _variable.annotation(), getterType);
-
-	return false;
-}
-
-bool DocStringAnalyser::visit(ModifierDefinition const& _modifier)
-{
-	handleCallable(_modifier, _modifier, _modifier.annotation());
-
-	return true;
-}
-
-bool DocStringAnalyser::visit(EventDefinition const& _event)
-{
-	handleCallable(_event, _event, _event.annotation());
-
-	return true;
-}
-
-bool DocStringAnalyser::visit(ErrorDefinition const& _error)
-{
-	handleCallable(_error, _error, _error.annotation());
-
-	return true;
-}
-
-void DocStringAnalyser::handleCallable(
-	CallableDeclaration const& _callable,
-	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation,
-	FunctionType const* _functionType
-)
-{
-	if (CallableDeclaration const* baseFunction = resolveInheritDoc(_callable.annotation().baseFunctions, _node, _annotation))
-		copyMissingTags({baseFunction}, _annotation, _functionType);
-	else if (
-		_annotation.docTags.empty() &&
-		_callable.annotation().baseFunctions.size() == 1 &&
-		parameterNamesEqual(_callable, **_callable.annotation().baseFunctions.begin())
-	)
-		copyMissingTags(_callable.annotation().baseFunctions, _annotation, _functionType);
-}
-
-CallableDeclaration const* DocStringAnalyser::resolveInheritDoc(
-	std::set<CallableDeclaration const*> const& _baseFuncs,
-	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation
-)
-{
-	if (_annotation.inheritdocReference == nullptr)
-		return nullptr;
-
-	if (auto const callable = findBaseCallable(_baseFuncs, _annotation.inheritdocReference->id()))
-		return callable;
-
-	m_errorReporter.docstringParsingError(
-		4682_error,
-		_node.documentation()->location(),
-		"Documentation tag @inheritdoc references contract \"" +
-		_annotation.inheritdocReference->name() +
-		"\", but the contract does not contain a function that is overridden by this function."
-	);
-
-	return nullptr;
-}
diff --git a/libsolidity/analysis/DocStringAnalyser.h b/libsolidity/analysis/DocStringAnalyser.h
deleted file mode 100644
index d9cd6f09dc21..000000000000
--- a/libsolidity/analysis/DocStringAnalyser.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Analyses and validates the doc strings.
- * Stores the parsing results in the AST annotations and reports errors.
- */
-class DocStringAnalyser: private ASTConstVisitor
-{
-public:
-	DocStringAnalyser(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter) {}
-	bool analyseDocStrings(SourceUnit const& _sourceUnit);
-
-private:
-	bool visit(FunctionDefinition const& _function) override;
-	bool visit(VariableDeclaration const& _variable) override;
-	bool visit(ModifierDefinition const& _modifier) override;
-	bool visit(EventDefinition const& _event) override;
-	bool visit(ErrorDefinition const& _error) override;
-
-	CallableDeclaration const* resolveInheritDoc(
-		std::set<CallableDeclaration const*> const& _baseFunctions,
-		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation
-	);
-
-	void handleCallable(
-		CallableDeclaration const& _callable,
-		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation,
-		FunctionType const* _functionType = nullptr
-	);
-
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/analysis/DocStringTagParser.cpp b/libsolidity/analysis/DocStringTagParser.cpp
deleted file mode 100644
index 5d95f42e902c..000000000000
--- a/libsolidity/analysis/DocStringTagParser.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Parses and analyses the doc strings.
- * Stores the parsing results in the AST annotations and reports errors.
- */
-
-#include <libsolidity/analysis/DocStringTagParser.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/parsing/DocStringParser.h>
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Common.h>
-
-#include <range/v3/algorithm/any_of.hpp>
-#include <range/v3/view/filter.hpp>
-
-#include <boost/algorithm/string.hpp>
-
-#include <regex>
-#include <string_view>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-bool DocStringTagParser::parseDocStrings(SourceUnit const& _sourceUnit)
-{
-	auto errorWatcher = m_errorReporter.errorWatcher();
-	_sourceUnit.accept(*this);
-	return errorWatcher.ok();
-}
-
-bool DocStringTagParser::validateDocStringsUsingTypes(SourceUnit const& _sourceUnit)
-{
-	ErrorReporter::ErrorWatcher errorWatcher = m_errorReporter.errorWatcher();
-
-	SimpleASTVisitor visitReturns(
-		[](ASTNode const&) { return true; },
-		[&](ASTNode const& _node)
-		{
-			if (auto const* annotation = dynamic_cast<StructurallyDocumentedAnnotation const*>(&_node.annotation()))
-			{
-				auto const& documentationNode = dynamic_cast<StructurallyDocumented const&>(_node);
-
-				size_t returnTagsVisited = 0;
-
-				for (auto const& [tagName, tagValue]: annotation->docTags)
-					if (tagName == "return")
-					{
-						returnTagsVisited++;
-						std::vector<std::string> returnParameterNames;
-
-						if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(&_node))
-						{
-							if (!varDecl->isPublic())
-								continue;
-
-							// FunctionType() requires the DeclarationTypeChecker to have run.
-							returnParameterNames = FunctionType(*varDecl).returnParameterNames();
-						}
-						else if (auto const* function = dynamic_cast<FunctionDefinition const*>(&_node))
-							returnParameterNames = FunctionType(*function).returnParameterNames();
-						else
-							continue;
-
-						std::string content = tagValue.content;
-						std::string firstWord = content.substr(0, content.find_first_of(" \t"));
-
-						if (returnTagsVisited > returnParameterNames.size())
-							m_errorReporter.docstringParsingError(
-								2604_error,
-								documentationNode.documentation()->location(),
-								"Documentation tag \"@" + tagName + " " + content + "\"" +
-								" exceeds the number of return parameters."
-							);
-						else
-						{
-							std::string const& parameter = returnParameterNames.at(returnTagsVisited - 1);
-							if (!parameter.empty() && parameter != firstWord)
-								m_errorReporter.docstringParsingError(
-									5856_error,
-									documentationNode.documentation()->location(),
-									"Documentation tag \"@" + tagName + " " + content + "\"" +
-									" does not contain the name of its return parameter."
-								);
-						}
-					}
-			}
-	});
-
-	_sourceUnit.accept(visitReturns);
-	return errorWatcher.ok();
-}
-
-bool DocStringTagParser::visit(ContractDefinition const& _contract)
-{
-	static std::set<std::string> const validTags = std::set<std::string>{"author", "title", "dev", "notice"};
-	parseDocStrings(_contract, _contract.annotation(), validTags, "contracts");
-
-	return true;
-}
-
-bool DocStringTagParser::visit(FunctionDefinition const& _function)
-{
-	if (_function.isConstructor())
-		handleConstructor(_function, _function, _function.annotation());
-	else
-		handleCallable(_function, _function, _function.annotation());
-	return true;
-}
-
-bool DocStringTagParser::visit(VariableDeclaration const& _variable)
-{
-	if (_variable.isStateVariable())
-	{
-		if (_variable.isPublic())
-			parseDocStrings(_variable, _variable.annotation(), {"dev", "notice", "return", "inheritdoc"}, "public state variables");
-		else
-			parseDocStrings(_variable, _variable.annotation(), {"dev", "notice", "inheritdoc"}, "non-public state variables");
-	}
-	else if (_variable.isFileLevelVariable())
-		parseDocStrings(_variable, _variable.annotation(), {"dev"}, "file-level variables");
-	return false;
-}
-
-bool DocStringTagParser::visit(ModifierDefinition const& _modifier)
-{
-	handleCallable(_modifier, _modifier, _modifier.annotation());
-
-	return true;
-}
-
-bool DocStringTagParser::visit(EventDefinition const& _event)
-{
-	handleCallable(_event, _event, _event.annotation());
-
-	return true;
-}
-
-bool DocStringTagParser::visit(ErrorDefinition const& _error)
-{
-	handleCallable(_error, _error, _error.annotation());
-
-	return true;
-}
-
-bool DocStringTagParser::visit(InlineAssembly const& _assembly)
-{
-	if (!_assembly.documentation())
-		return true;
-	StructuredDocumentation documentation{-1, _assembly.location(), _assembly.documentation()};
-	ErrorList errors;
-	ErrorReporter errorReporter{errors};
-	auto docTags = DocStringParser{documentation, errorReporter}.parse();
-
-	if (!errors.empty())
-	{
-		SecondarySourceLocation ssl;
-		for (auto const& error: errors)
-			if (error->comment())
-				ssl.append(
-					*error->comment(),
-					_assembly.location()
-				);
-		m_errorReporter.warning(
-			7828_error,
-			_assembly.location(),
-			"Inline assembly has invalid NatSpec documentation.",
-			ssl
-		);
-	}
-
-	for (auto const& [tagName, tagValue]: docTags)
-	{
-		if (tagName == "solidity")
-		{
-			std::vector<std::string> values;
-			boost::split(values, tagValue.content, isWhiteSpace);
-
-			std::set<std::string> valuesSeen;
-			std::set<std::string> duplicates;
-			for (auto const& value: values | ranges::views::filter(not_fn(&std::string::empty)))
-				if (valuesSeen.insert(value).second)
-				{
-					if (value == "memory-safe-assembly")
-					{
-						if (_assembly.annotation().markedMemorySafe)
-							m_errorReporter.warning(
-								8544_error,
-								_assembly.location(),
-								"Inline assembly marked as memory safe using both a NatSpec tag and an assembly flag. "
-								"If you are not concerned with backwards compatibility, only use the assembly flag, "
-								"otherwise only use the NatSpec tag."
-							);
-						_assembly.annotation().markedMemorySafe = true;
-					}
-					else
-						m_errorReporter.warning(
-							8787_error,
-							_assembly.location(),
-							"Unexpected value for @solidity tag in inline assembly: " + value
-						);
-				}
-				else if (duplicates.insert(value).second)
-					m_errorReporter.warning(
-						4377_error,
-						_assembly.location(),
-						"Value for @solidity tag in inline assembly specified multiple times: " + value
-					);
-		}
-		else
-			m_errorReporter.warning(
-				6269_error,
-				_assembly.location(),
-				"Unexpected NatSpec tag \"" + tagName + "\" with value \"" + tagValue.content + "\" in inline assembly."
-			);
-	}
-
-	return true;
-}
-
-void DocStringTagParser::checkParameters(
-	CallableDeclaration const& _callable,
-	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation
-)
-{
-	std::set<std::string> validParams;
-	for (auto const& p: _callable.parameters())
-		validParams.insert(p->name());
-	if (_callable.returnParameterList())
-		for (auto const& p: _callable.returnParameterList()->parameters())
-			validParams.insert(p->name());
-	auto paramRange = _annotation.docTags.equal_range("param");
-	for (auto i = paramRange.first; i != paramRange.second; ++i)
-		if (!validParams.count(i->second.paramName))
-			m_errorReporter.docstringParsingError(
-				3881_error,
-				_node.documentation()->location(),
-				"Documented parameter \"" +
-				i->second.paramName +
-				"\" not found in the parameter list of the function."
-			);
-}
-
-void DocStringTagParser::handleConstructor(
-	CallableDeclaration const& _callable,
-	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation
-)
-{
-	static std::set<std::string> const validTags = std::set<std::string>{"author", "dev", "notice", "param"};
-	parseDocStrings(_node, _annotation, validTags, "constructor");
-	checkParameters(_callable, _node, _annotation);
-}
-
-void DocStringTagParser::handleCallable(
-	CallableDeclaration const& _callable,
-	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation
-)
-{
-	static std::set<std::string> const validEventTags = std::set<std::string>{"dev", "notice", "return", "param"};
-	static std::set<std::string> const validErrorTags = std::set<std::string>{"dev", "notice", "param"};
-	static std::set<std::string> const validModifierTags = std::set<std::string>{"dev", "notice", "param", "inheritdoc"};
-	static std::set<std::string> const validTags = std::set<std::string>{"dev", "notice", "return", "param", "inheritdoc"};
-
-	if (dynamic_cast<EventDefinition const*>(&_callable))
-		parseDocStrings(_node, _annotation, validEventTags, "events");
-	else if (dynamic_cast<ErrorDefinition const*>(&_callable))
-		parseDocStrings(_node, _annotation, validErrorTags, "errors");
-	else if (dynamic_cast<ModifierDefinition const*>(&_callable))
-		parseDocStrings(_node, _annotation, validModifierTags, "modifiers");
-	else
-		parseDocStrings(_node, _annotation, validTags, "functions");
-
-	checkParameters(_callable, _node, _annotation);
-}
-
-void DocStringTagParser::parseDocStrings(
-	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation,
-	std::set<std::string> const& _validTags,
-	std::string const& _nodeName
-)
-{
-	if (!_node.documentation())
-		return;
-
-	_annotation.docTags = DocStringParser{*_node.documentation(), m_errorReporter}.parse();
-
-	for (auto const& [tagName, tagValue]: _annotation.docTags)
-	{
-		std::string_view static constexpr customPrefix("custom:");
-		if (tagName == "custom" || tagName == "custom:")
-			m_errorReporter.docstringParsingError(
-				6564_error,
-				_node.documentation()->location(),
-				"Custom documentation tag must contain a chosen name, i.e. @custom:mytag."
-			);
-		else if (boost::starts_with(tagName, customPrefix) && tagName.size() > customPrefix.size())
-		{
-			std::regex static const customRegex("^custom:[a-z][a-z-]*$");
-			if (!regex_match(tagName, customRegex))
-				m_errorReporter.docstringParsingError(
-					2968_error,
-					_node.documentation()->location(),
-					"Invalid character in custom tag @" + tagName + ". Only lowercase letters and \"-\" are permitted."
-				);
-			continue;
-		}
-		else if (!_validTags.count(tagName))
-			m_errorReporter.docstringParsingError(
-				6546_error,
-				_node.documentation()->location(),
-				"Documentation tag @" + tagName + " not valid for " + _nodeName + "."
-			);
-	}
-}
-
diff --git a/libsolidity/analysis/DocStringTagParser.h b/libsolidity/analysis/DocStringTagParser.h
deleted file mode 100644
index 248befcb82b6..000000000000
--- a/libsolidity/analysis/DocStringTagParser.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Parses the doc tags and does basic validity checks.
- * Stores the parsing results in the AST annotations and reports errors.
- */
-class DocStringTagParser: private ASTConstVisitor
-{
-public:
-	explicit DocStringTagParser(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter) {}
-	bool parseDocStrings(SourceUnit const& _sourceUnit);
-	/// Validate the parsed doc strings, requires parseDocStrings() and the
-	/// DeclarationTypeChecker to have run.
-	bool validateDocStringsUsingTypes(SourceUnit const& _sourceUnit);
-
-private:
-	bool visit(ContractDefinition const& _contract) override;
-	bool visit(FunctionDefinition const& _function) override;
-	bool visit(VariableDeclaration const& _variable) override;
-	bool visit(ModifierDefinition const& _modifier) override;
-	bool visit(EventDefinition const& _event) override;
-	bool visit(ErrorDefinition const& _error) override;
-	bool visit(InlineAssembly const& _assembly) override;
-
-	void checkParameters(
-		CallableDeclaration const& _callable,
-		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation
-	);
-
-	void handleConstructor(
-		CallableDeclaration const& _callable,
-		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation
-	);
-
-	void handleCallable(
-		CallableDeclaration const& _callable,
-		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation
-	);
-
-	void parseDocStrings(
-		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation,
-		std::set<std::string> const& _validTags,
-		std::string const& _nodeName
-	);
-
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/analysis/FunctionCallGraph.cpp b/libsolidity/analysis/FunctionCallGraph.cpp
deleted file mode 100644
index 1d01f1a6bced..000000000000
--- a/libsolidity/analysis/FunctionCallGraph.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/FunctionCallGraph.h>
-
-#include <libsolutil/StringUtils.h>
-
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/transform.hpp>
-
-using namespace solidity::frontend;
-using namespace solidity::util;
-
-CallGraph FunctionCallGraphBuilder::buildCreationGraph(ContractDefinition const& _contract)
-{
-	FunctionCallGraphBuilder builder(_contract);
-	solAssert(builder.m_currentNode == CallGraph::Node(CallGraph::SpecialNode::Entry), "");
-
-	// Create graph for constructor, state vars, etc
-	for (ContractDefinition const* base: _contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-	{
-		// The constructor and functions called in state variable initial assignments should have
-		// an edge from Entry
-		builder.m_currentNode = CallGraph::SpecialNode::Entry;
-		for (auto const* stateVar: base->stateVariables())
-			if (!stateVar->isConstant())
-				stateVar->accept(builder);
-
-		if (base->constructor())
-		{
-			builder.functionReferenced(*base->constructor());
-
-			// Constructors and functions called in state variable initializers have an edge either from
-			// the previous class in linearized order or from Entry if there's no class before.
-			builder.m_currentNode = base->constructor();
-		}
-
-		// Functions called from the inheritance specifier should have an edge from the constructor
-		// for consistency with functions called from constructor modifiers.
-		for (auto const& inheritanceSpecifier: base->baseContracts())
-			inheritanceSpecifier->accept(builder);
-	}
-
-	builder.m_currentNode = CallGraph::SpecialNode::Entry;
-	builder.processQueue();
-
-	return std::move(builder.m_graph);
-}
-
-CallGraph FunctionCallGraphBuilder::buildDeployedGraph(
-	ContractDefinition const& _contract,
-	CallGraph const& _creationGraph
-)
-{
-	FunctionCallGraphBuilder builder(_contract);
-	solAssert(builder.m_currentNode == CallGraph::Node(CallGraph::SpecialNode::Entry), "");
-
-	auto getSecondElement = [](auto const& _tuple){ return std::get<1>(_tuple); };
-
-	// Create graph for all publicly reachable functions
-	for (FunctionTypePointer functionType: _contract.interfaceFunctionList() | ranges::views::transform(getSecondElement))
-	{
-		auto const* function = dynamic_cast<FunctionDefinition const*>(&functionType->declaration());
-		auto const* variable = dynamic_cast<VariableDeclaration const*>(&functionType->declaration());
-
-		if (function)
-			builder.functionReferenced(*function);
-		else
-			// If it's not a function, it must be a getter of a public variable; we ignore those
-			solAssert(variable, "");
-	}
-
-	if (_contract.fallbackFunction())
-		builder.functionReferenced(*_contract.fallbackFunction());
-
-	if (_contract.receiveFunction())
-		builder.functionReferenced(*_contract.receiveFunction());
-
-	// All functions present in internal dispatch at creation time could potentially be pointers
-	// assigned to state variables and as such may be reachable after deployment as well.
-	builder.m_currentNode = CallGraph::SpecialNode::InternalDispatch;
-	std::set<CallGraph::Node, CallGraph::CompareByID> defaultNode;
-	for (CallGraph::Node const& dispatchTarget: util::valueOrDefault(_creationGraph.edges, CallGraph::SpecialNode::InternalDispatch, defaultNode))
-	{
-		solAssert(!std::holds_alternative<CallGraph::SpecialNode>(dispatchTarget), "");
-		solAssert(std::get<CallableDeclaration const*>(dispatchTarget) != nullptr, "");
-
-		// Visit the callable to add not only it but also everything it calls too
-		builder.functionReferenced(*std::get<CallableDeclaration const*>(dispatchTarget), false);
-	}
-
-	builder.m_currentNode = CallGraph::SpecialNode::Entry;
-	builder.processQueue();
-
-	return std::move(builder.m_graph);
-}
-
-bool FunctionCallGraphBuilder::visit(FunctionCall const& _functionCall)
-{
-	if (*_functionCall.annotation().kind != FunctionCallKind::FunctionCall)
-		return true;
-
-	auto const* functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type);
-	solAssert(functionType, "");
-
-	if (functionType->kind() == FunctionType::Kind::Internal && !_functionCall.expression().annotation().calledDirectly)
-		// If it's not a direct call, we don't really know which function will be called (it may even
-		// change at runtime). All we can do is to add an edge to the dispatch which in turn has
-		// edges to all functions could possibly be called.
-		add(m_currentNode, CallGraph::SpecialNode::InternalDispatch);
-	else if (functionType->kind() == FunctionType::Kind::Error)
-		m_graph.usedErrors.insert(&dynamic_cast<ErrorDefinition const&>(functionType->declaration()));
-
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(EmitStatement const& _emitStatement)
-{
-	auto const* functionType = dynamic_cast<FunctionType const*>(_emitStatement.eventCall().expression().annotation().type);
-	solAssert(functionType, "");
-
-	m_graph.emittedEvents.insert(&dynamic_cast<EventDefinition const&>(functionType->declaration()));
-
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(Identifier const& _identifier)
-{
-	if (auto const* variable = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-	{
-		if (variable->isConstant())
-		{
-			solAssert(variable->isStateVariable() || variable->isFileLevelVariable(), "");
-			variable->accept(*this);
-		}
-	}
-	else if (auto const* callable = dynamic_cast<CallableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-	{
-		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, "");
-
-		auto funType = dynamic_cast<FunctionType const*>(_identifier.annotation().type);
-
-		// For events kind() == Event, so we have an extra check here
-		if (funType && funType->kind() == FunctionType::Kind::Internal)
-			functionReferenced(callable->resolveVirtual(m_contract), _identifier.annotation().calledDirectly);
-	}
-
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(MemberAccess const& _memberAccess)
-{
-	Type const* exprType = _memberAccess.expression().annotation().type;
-	ASTString const& memberName = _memberAccess.memberName();
-
-	if (auto magicType = dynamic_cast<MagicType const*>(exprType))
-		if (magicType->kind() == MagicType::Kind::MetaType && (
-			memberName == "creationCode" || memberName == "runtimeCode"
-		))
-		{
-			ContractType const& accessedContractType = dynamic_cast<ContractType const&>(*magicType->typeArgument());
-			m_graph.bytecodeDependency.emplace(&accessedContractType.contractDefinition(), &_memberAccess);
-		}
-
-	auto functionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
-	auto functionDef = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration);
-	if (!functionType || !functionDef || functionType->kind() != FunctionType::Kind::Internal)
-		return true;
-
-	// Super functions
-	if (*_memberAccess.annotation().requiredLookup == VirtualLookup::Super)
-	{
-		if (auto const* typeType = dynamic_cast<TypeType const*>(exprType))
-			if (auto const contractType = dynamic_cast<ContractType const*>(typeType->actualType()))
-			{
-				solAssert(contractType->isSuper(), "");
-				functionDef = &functionDef->resolveVirtual(
-					m_contract,
-					contractType->contractDefinition().superContract(m_contract)
-				);
-			}
-	}
-	else
-		solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-
-	functionReferenced(*functionDef, _memberAccess.annotation().calledDirectly);
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(BinaryOperation const& _binaryOperation)
-{
-	if (*_binaryOperation.annotation().userDefinedFunction != nullptr)
-		functionReferenced(**_binaryOperation.annotation().userDefinedFunction, true /* called directly */);
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(UnaryOperation const& _unaryOperation)
-{
-	if (*_unaryOperation.annotation().userDefinedFunction != nullptr)
-		functionReferenced(**_unaryOperation.annotation().userDefinedFunction, true /* called directly */);
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(ModifierInvocation const& _modifierInvocation)
-{
-	if (auto const* modifier = dynamic_cast<ModifierDefinition const*>(_modifierInvocation.name().annotation().referencedDeclaration))
-	{
-		VirtualLookup const& requiredLookup = *_modifierInvocation.name().annotation().requiredLookup;
-
-		if (requiredLookup == VirtualLookup::Virtual)
-			functionReferenced(modifier->resolveVirtual(m_contract));
-		else
-		{
-			solAssert(requiredLookup == VirtualLookup::Static, "");
-			functionReferenced(*modifier);
-		}
-	}
-
-	return true;
-}
-
-bool FunctionCallGraphBuilder::visit(NewExpression const& _newExpression)
-{
-	if (ContractType const* contractType = dynamic_cast<ContractType const*>(_newExpression.typeName().annotation().type))
-		m_graph.bytecodeDependency.emplace(&contractType->contractDefinition(), &_newExpression);
-
-	return true;
-}
-
-void FunctionCallGraphBuilder::enqueueCallable(CallableDeclaration const& _callable)
-{
-	if (!m_graph.edges.count(&_callable))
-	{
-		m_visitQueue.push_back(&_callable);
-
-		// Insert the callable to the graph (with no edges coming out of it) to mark it as visited.
-		m_graph.edges.insert({CallGraph::Node(&_callable), {}});
-	}
-}
-
-void FunctionCallGraphBuilder::processQueue()
-{
-	solAssert(m_currentNode == CallGraph::Node(CallGraph::SpecialNode::Entry), "Visit queue is already being processed.");
-
-	while (!m_visitQueue.empty())
-	{
-		m_currentNode = m_visitQueue.front();
-		solAssert(std::holds_alternative<CallableDeclaration const*>(m_currentNode), "");
-
-		m_visitQueue.pop_front();
-		std::get<CallableDeclaration const*>(m_currentNode)->accept(*this);
-	}
-
-	m_currentNode = CallGraph::SpecialNode::Entry;
-}
-
-void FunctionCallGraphBuilder::add(CallGraph::Node _caller, CallGraph::Node _callee)
-{
-	m_graph.edges[_caller].insert(_callee);
-}
-
-void FunctionCallGraphBuilder::functionReferenced(CallableDeclaration const& _callable, bool _calledDirectly)
-{
-	if (_calledDirectly)
-	{
-		solAssert(
-			std::holds_alternative<CallGraph::SpecialNode>(m_currentNode) || m_graph.edges.count(m_currentNode) > 0,
-			"Adding an edge from a node that has not been visited yet."
-		);
-
-		add(m_currentNode, &_callable);
-	}
-	else
-		add(CallGraph::SpecialNode::InternalDispatch, &_callable);
-
-	enqueueCallable(_callable);
-}
-
-std::ostream& solidity::frontend::operator<<(std::ostream& _out, CallGraph::Node const& _node)
-{
-	if (std::holds_alternative<CallGraph::SpecialNode>(_node))
-		switch (std::get<CallGraph::SpecialNode>(_node))
-		{
-		case CallGraph::SpecialNode::InternalDispatch:
-			_out << "InternalDispatch";
-			break;
-		case CallGraph::SpecialNode::Entry:
-			_out << "Entry";
-			break;
-		default:
-			solAssert(false, "Invalid SpecialNode type");
-		}
-	else
-	{
-		solAssert(std::holds_alternative<CallableDeclaration const*>(_node), "");
-
-		auto const* callableDeclaration = std::get<CallableDeclaration const*>(_node);
-		solAssert(callableDeclaration, "");
-
-		auto const* function = dynamic_cast<FunctionDefinition const *>(callableDeclaration);
-		auto const* event = dynamic_cast<EventDefinition const *>(callableDeclaration);
-		auto const* modifier = dynamic_cast<ModifierDefinition const *>(callableDeclaration);
-
-		auto typeToString = [](auto const& _var) -> std::string { return _var->type()->toString(true); };
-		std::vector<std::string> parameters = callableDeclaration->parameters() | ranges::views::transform(typeToString) | ranges::to<std::vector<std::string>>();
-
-		std::string scopeName;
-		if (!function || !function->isFree())
-		{
-			solAssert(callableDeclaration->annotation().scope, "");
-			auto const* parentContract = dynamic_cast<ContractDefinition const*>(callableDeclaration->annotation().scope);
-			solAssert(parentContract, "");
-			scopeName = parentContract->name();
-		}
-
-		if (function && function->isFree())
-			_out << "function " << function->name() << "(" << joinHumanReadable(parameters, ",") << ")";
-		else if (function && function->isConstructor())
-			_out << "constructor of " << scopeName;
-		else if (function && function->isFallback())
-			_out << "fallback of " << scopeName;
-		else if (function && function->isReceive())
-			_out << "receive of " << scopeName;
-		else if (function)
-			_out << "function " << scopeName << "." << function->name() << "(" << joinHumanReadable(parameters, ",") << ")";
-		else if (event)
-			_out << "event " << scopeName << "." << event->name() << "(" << joinHumanReadable(parameters, ",") << ")";
-		else if (modifier)
-			_out << "modifier " << scopeName << "." << modifier->name();
-		else
-			solAssert(false, "Unexpected AST node type in function call graph");
-	}
-
-	return _out;
-}
diff --git a/libsolidity/analysis/FunctionCallGraph.h b/libsolidity/analysis/FunctionCallGraph.h
deleted file mode 100644
index a4e5787a259e..000000000000
--- a/libsolidity/analysis/FunctionCallGraph.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/ast/CallGraph.h>
-
-#include <deque>
-#include <ostream>
-
-namespace solidity::frontend
-{
-
-/**
- * Creates a function call graph for a contract at the granularity of Solidity functions and modifiers.
- * or after deployment. The graph does not preserve temporal relations between calls - edges
- * coming out of the same node show which calls were performed but not in what order.
- *
- * Includes the following special nodes:
- *  - Entry: represents a call from the outside of the contract.
- *    After deployment this is the node that connects to all the functions exposed through the
- *    external interface. At contract creation it connects to the constructors and variable
- *    initializers, which are not explicitly called from within another function.
- *  - InternalDispatch: Represents the internal dispatch function, which calls internal functions
- *    determined at runtime by values of variables and expressions. Functions that are not called
- *    right away get an edge from this node.
- *
- *  Nodes are a variant of either the enum SpecialNode or a CallableDeclaration which currently
- *  can be a function or a modifier. There are no nodes representing event calls. Instead all
- *  emitted events and created contracts are gathered in separate sets included in the graph just
- *  for that purpose.
- *
- *  Auto-generated getter functions for public state variables are ignored, but function calls
- *  inside initial assignments are included in the creation graph.
- *
- *  Only calls reachable from an Entry node are included in the graph. The map representing edges
- *  is also guaranteed to contain keys representing all the reachable functions and modifiers, even
- *  if they have no outgoing edges.
- */
-class FunctionCallGraphBuilder: private ASTConstVisitor
-{
-public:
-	static CallGraph buildCreationGraph(ContractDefinition const& _contract);
-	static CallGraph buildDeployedGraph(
-		ContractDefinition const& _contract,
-		CallGraph const& _creationGraph
-	);
-
-private:
-	FunctionCallGraphBuilder(ContractDefinition const& _contract):
-		m_contract(_contract)
-	{}
-
-	bool visit(FunctionCall const& _functionCall) override;
-	bool visit(EmitStatement const& _emitStatement) override;
-	bool visit(Identifier const& _identifier) override;
-	bool visit(MemberAccess const& _memberAccess) override;
-	bool visit(BinaryOperation const& _binaryOperation) override;
-	bool visit(UnaryOperation const& _unaryOperation) override;
-	bool visit(ModifierInvocation const& _modifierInvocation) override;
-	bool visit(NewExpression const& _newExpression) override;
-
-	void enqueueCallable(CallableDeclaration const& _callable);
-	void processQueue();
-
-	void add(CallGraph::Node _caller, CallGraph::Node _callee);
-	void functionReferenced(CallableDeclaration const& _callable, bool _calledDirectly = true);
-
-	CallGraph::Node m_currentNode = CallGraph::SpecialNode::Entry;
-	ContractDefinition const& m_contract;
-	CallGraph m_graph;
-	std::deque<CallableDeclaration const*> m_visitQueue;
-};
-
-std::ostream& operator<<(std::ostream& _out, CallGraph::Node const& _node);
-
-}
diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
deleted file mode 100644
index 8f0ce963499b..000000000000
--- a/libsolidity/analysis/GlobalContext.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @author Gav Wood <g@ethdev.com>
- * @date 2014
- * Container of the (implicit and explicit) global objects.
- */
-
-#include <libsolidity/analysis/GlobalContext.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/ast/Types.h>
-#include <memory>
-
-namespace solidity::frontend
-{
-
-namespace
-{
-/// Magic variables get negative ids for easy differentiation
-int magicVariableToID(std::string const& _name)
-{
-	if (_name == "abi") return -1;
-	else if (_name == "addmod") return -2;
-	else if (_name == "assert") return -3;
-	else if (_name == "block") return -4;
-	else if (_name == "blockhash") return -5;
-	else if (_name == "ecrecover") return -6;
-	else if (_name == "gasleft") return -7;
-	else if (_name == "keccak256") return -8;
-	else if (_name == "msg") return -15;
-	else if (_name == "mulmod") return -16;
-	else if (_name == "now") return -17;
-	else if (_name == "require") return -18;
-	else if (_name == "revert") return -19;
-	else if (_name == "ripemd160") return -20;
-	else if (_name == "selfdestruct") return -21;
-	else if (_name == "sha256") return -22;
-	else if (_name == "sha3") return -23;
-	else if (_name == "suicide") return -24;
-	else if (_name == "super") return -25;
-	else if (_name == "tx") return -26;
-	else if (_name == "type") return -27;
-	else if (_name == "this") return -28;
-	else
-		solAssert(false, "Unknown magic variable: \"" + _name + "\".");
-}
-
-inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables()
-{
-	static auto const magicVarDecl = [](std::string const& _name, Type const* _type) {
-		return std::make_shared<MagicVariableDeclaration>(magicVariableToID(_name), _name, _type);
-	};
-
-	return {
-		magicVarDecl("abi", TypeProvider::magic(MagicType::Kind::ABI)),
-		magicVarDecl("addmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::AddMod, StateMutability::Pure)),
-		magicVarDecl("assert", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Assert, StateMutability::Pure)),
-		magicVarDecl("block", TypeProvider::magic(MagicType::Kind::Block)),
-		magicVarDecl("blockhash", TypeProvider::function(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, StateMutability::View)),
-		magicVarDecl("ecrecover", TypeProvider::function(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Kind::ECRecover, StateMutability::Pure)),
-		magicVarDecl("gasleft", TypeProvider::function(strings(), strings{"uint256"}, FunctionType::Kind::GasLeft, StateMutability::View)),
-		magicVarDecl("keccak256", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, StateMutability::Pure)),
-		magicVarDecl("msg", TypeProvider::magic(MagicType::Kind::Message)),
-		magicVarDecl("mulmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::MulMod, StateMutability::Pure)),
-		magicVarDecl("now", TypeProvider::uint256()),
-		magicVarDecl("require", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Require, StateMutability::Pure)),
-		magicVarDecl("require", TypeProvider::function(strings{"bool", "string memory"}, strings{}, FunctionType::Kind::Require, StateMutability::Pure)),
-		magicVarDecl("revert", TypeProvider::function(strings(), strings(), FunctionType::Kind::Revert, StateMutability::Pure)),
-		magicVarDecl("revert", TypeProvider::function(strings{"string memory"}, strings(), FunctionType::Kind::Revert, StateMutability::Pure)),
-		magicVarDecl("ripemd160", TypeProvider::function(strings{"bytes memory"}, strings{"bytes20"}, FunctionType::Kind::RIPEMD160, StateMutability::Pure)),
-		magicVarDecl("selfdestruct", TypeProvider::function(strings{"address payable"}, strings{}, FunctionType::Kind::Selfdestruct)),
-		magicVarDecl("sha256", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::SHA256, StateMutability::Pure)),
-		magicVarDecl("sha3", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, StateMutability::Pure)),
-		magicVarDecl("suicide", TypeProvider::function(strings{"address payable"}, strings{}, FunctionType::Kind::Selfdestruct)),
-		magicVarDecl("tx", TypeProvider::magic(MagicType::Kind::Transaction)),
-		// Accepts a MagicType that can be any contract type or an Integer type and returns a
-		// MagicType. The TypeChecker handles the correctness of the input and output types.
-		magicVarDecl("type", TypeProvider::function(
-			strings{},
-			strings{},
-			FunctionType::Kind::MetaType,
-			StateMutability::Pure,
-			FunctionType::Options::withArbitraryParameters()
-		)),
-	};
-}
-
-}
-
-GlobalContext::GlobalContext(): m_magicVariables{constructMagicVariables()}
-{
-}
-
-void GlobalContext::setCurrentContract(ContractDefinition const& _contract)
-{
-	m_currentContract = &_contract;
-}
-
-std::vector<Declaration const*> GlobalContext::declarations() const
-{
-	std::vector<Declaration const*> declarations;
-	declarations.reserve(m_magicVariables.size());
-	for (ASTPointer<MagicVariableDeclaration const> const& variable: m_magicVariables)
-		declarations.push_back(variable.get());
-	return declarations;
-}
-
-MagicVariableDeclaration const* GlobalContext::currentThis() const
-{
-	if (!m_thisPointer[m_currentContract])
-	{
-		Type const* type = TypeProvider::emptyTuple();
-		if (m_currentContract)
-			type = TypeProvider::contract(*m_currentContract);
-		m_thisPointer[m_currentContract] =
-			std::make_shared<MagicVariableDeclaration>(magicVariableToID("this"), "this", type);
-	}
-	return m_thisPointer[m_currentContract].get();
-}
-
-MagicVariableDeclaration const* GlobalContext::currentSuper() const
-{
-	if (!m_superPointer[m_currentContract])
-	{
-		Type const* type = TypeProvider::emptyTuple();
-		if (m_currentContract)
-			type = TypeProvider::typeType(TypeProvider::contract(*m_currentContract, true));
-		m_superPointer[m_currentContract] =
-			std::make_shared<MagicVariableDeclaration>(magicVariableToID("super"), "super", type);
-	}
-	return m_superPointer[m_currentContract].get();
-}
-
-}
diff --git a/libsolidity/analysis/GlobalContext.h b/libsolidity/analysis/GlobalContext.h
deleted file mode 100644
index 69344537cae7..000000000000
--- a/libsolidity/analysis/GlobalContext.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Container of the (implicit and explicit) global objects.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-class Type; // forward
-
-/**
- * Container for all global objects which look like AST nodes, but are not part of the AST
- * that is currently being compiled.
- * @note must not be destroyed or moved during compilation as its objects can be referenced from
- * other objects.
- */
-class GlobalContext
-{
-public:
-	/// Noncopyable.
-	GlobalContext(GlobalContext const&) = delete;
-	GlobalContext& operator=(GlobalContext const&) = delete;
-
-	GlobalContext();
-	void setCurrentContract(ContractDefinition const& _contract);
-	void resetCurrentContract() { m_currentContract = nullptr; }
-	MagicVariableDeclaration const* currentThis() const;
-	MagicVariableDeclaration const* currentSuper() const;
-
-	/// @returns a vector of all implicit global declarations excluding "this".
-	std::vector<Declaration const*> declarations() const;
-
-private:
-	std::vector<std::shared_ptr<MagicVariableDeclaration const>> m_magicVariables;
-	ContractDefinition const* m_currentContract = nullptr;
-	std::map<ContractDefinition const*, std::shared_ptr<MagicVariableDeclaration const>> mutable m_thisPointer;
-	std::map<ContractDefinition const*, std::shared_ptr<MagicVariableDeclaration const>> mutable m_superPointer;
-};
-
-}
diff --git a/libsolidity/analysis/ImmutableValidator.cpp b/libsolidity/analysis/ImmutableValidator.cpp
deleted file mode 100644
index 0f5a2ee2e0e6..000000000000
--- a/libsolidity/analysis/ImmutableValidator.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/ImmutableValidator.h>
-
-#include <range/v3/view/reverse.hpp>
-
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-void ImmutableValidator::analyze()
-{
-	auto linearizedContracts = m_mostDerivedContract.annotation().linearizedBaseContracts | ranges::views::reverse;
-
-	for (ContractDefinition const* contract: linearizedContracts)
-	{
-		for (FunctionDefinition const* function: contract->definedFunctions())
-			function->accept(*this);
-
-		for (ModifierDefinition const* modifier: contract->functionModifiers())
-			modifier->accept(*this);
-	}
-}
-
-bool ImmutableValidator::visit(FunctionDefinition const& _functionDefinition)
-{
-	return !_functionDefinition.isConstructor();
-}
-
-void ImmutableValidator::endVisit(MemberAccess const& _memberAccess)
-{
-	analyseVariableReference(_memberAccess.annotation().referencedDeclaration, _memberAccess);
-}
-
-void ImmutableValidator::endVisit(Identifier const& _identifier)
-{
-	analyseVariableReference(_identifier.annotation().referencedDeclaration, _identifier);
-}
-
-void ImmutableValidator::analyseVariableReference(Declaration const* _reference, Expression const& _expression)
-{
-	auto const* variable = dynamic_cast<VariableDeclaration const*>(_reference);
-	if (!variable || !variable->isStateVariable() || !variable->immutable())
-		return;
-
-	// If this is not an ordinary assignment, we write and read at the same time.
-	if (_expression.annotation().willBeWrittenTo)
-		m_errorReporter.typeError(
-			1581_error,
-			_expression.location(),
-			"Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor."
-		);
-}
diff --git a/libsolidity/analysis/ImmutableValidator.h b/libsolidity/analysis/ImmutableValidator.h
deleted file mode 100644
index 78d85a61ce0f..000000000000
--- a/libsolidity/analysis/ImmutableValidator.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <liblangutil/ErrorReporter.h>
-
-namespace solidity::frontend
-{
-
-/**
- * Validates access and initialization of immutable variables:
- * must be directly initialized in a c'tor or inline
-*/
-class ImmutableValidator: private ASTConstVisitor
-{
-public:
-	ImmutableValidator(langutil::ErrorReporter& _errorReporter, ContractDefinition const& _contractDefinition):
-		m_mostDerivedContract(_contractDefinition),
-		m_errorReporter(_errorReporter)
-	{ }
-
-	void analyze();
-
-private:
-	bool visit(FunctionDefinition const& _functionDefinition);
-	void endVisit(MemberAccess const& _memberAccess);
-	void endVisit(Identifier const& _identifier);
-
-	void analyseVariableReference(Declaration const* _variableReference, Expression const& _expression);
-
-	ContractDefinition const& m_mostDerivedContract;
-
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
deleted file mode 100644
index d6ff63dbf34f..000000000000
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Parser part that determines the declarations corresponding to names and the types of expressions.
- */
-
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/ast/AST.h>
-#include <liblangutil/ErrorReporter.h>
-#include <libsolutil/StringUtils.h>
-#include <boost/algorithm/string.hpp>
-#include <unordered_set>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend
-{
-
-NameAndTypeResolver::NameAndTypeResolver(
-	GlobalContext& _globalContext,
-	langutil::EVMVersion _evmVersion,
-	ErrorReporter& _errorReporter
-):
-	m_evmVersion(_evmVersion),
-	m_errorReporter(_errorReporter),
-	m_globalContext(_globalContext)
-{
-	m_scopes[nullptr] = std::make_shared<DeclarationContainer>();
-	for (Declaration const* declaration: _globalContext.declarations())
-	{
-		solAssert(m_scopes[nullptr]->registerDeclaration(*declaration, false, false), "Unable to register global declaration.");
-	}
-}
-
-bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit, ASTNode const* _currentScope)
-{
-	// The helper registers all declarations in m_scopes as a side-effect of its construction.
-	try
-	{
-		DeclarationRegistrationHelper registrar(m_scopes, _sourceUnit, m_errorReporter, m_globalContext, _currentScope);
-	}
-	catch (langutil::FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-		return false;
-	}
-	return true;
-}
-
-bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, std::map<std::string, SourceUnit const*> const& _sourceUnits)
-{
-	DeclarationContainer& target = *m_scopes.at(&_sourceUnit);
-	bool error = false;
-	for (auto const& node: _sourceUnit.nodes())
-		if (auto imp = dynamic_cast<ImportDirective const*>(node.get()))
-		{
-			std::string const& path = *imp->annotation().absolutePath;
-			// The import resolution in CompilerStack enforces this.
-			solAssert(_sourceUnits.count(path), "");
-			auto scope = m_scopes.find(_sourceUnits.at(path));
-			solAssert(scope != end(m_scopes), "");
-			if (!imp->symbolAliases().empty())
-				for (auto const& alias: imp->symbolAliases())
-				{
-					auto declarations = scope->second->resolveName(alias.symbol->name());
-					if (declarations.empty())
-					{
-						m_errorReporter.declarationError(
-							2904_error,
-							imp->location(),
-							"Declaration \"" +
-							alias.symbol->name() +
-							"\" not found in \"" +
-							path +
-							"\" (referenced as \"" +
-							imp->path() +
-							"\")."
-						);
-						error = true;
-					}
-					else
-						for (Declaration const* declaration: declarations)
-							if (!DeclarationRegistrationHelper::registerDeclaration(
-								target,
-								*declaration,
-								alias.alias ? alias.alias.get() : &alias.symbol->name(),
-								&alias.location,
-								false,
-								m_errorReporter
-							))
-								error = true;
-				}
-			else if (imp->name().empty())
-				for (auto const& nameAndDeclaration: scope->second->declarations())
-					for (auto const& declaration: nameAndDeclaration.second)
-						if (!DeclarationRegistrationHelper::registerDeclaration(
-							target, *declaration, &nameAndDeclaration.first, &imp->location(), false, m_errorReporter
-						))
-							error =  true;
-		}
-	_sourceUnit.annotation().exportedSymbols = m_scopes[&_sourceUnit]->declarations();
-	return !error;
-}
-
-bool NameAndTypeResolver::resolveNamesAndTypes(SourceUnit& _source)
-{
-	try
-	{
-		for (std::shared_ptr<ASTNode> const& node: _source.nodes())
-		{
-			setScope(&_source);
-			if (!resolveNamesAndTypesInternal(*node, true))
-				return false;
-		}
-	}
-	catch (langutil::FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-		return false;
-	}
-	return true;
-}
-
-bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration)
-{
-	try
-	{
-		m_scopes[nullptr]->registerDeclaration(_declaration, false, true);
-		solAssert(_declaration.scope() == nullptr, "Updated declaration outside global scope.");
-	}
-	catch (langutil::FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-		return false;
-	}
-	return true;
-}
-
-void NameAndTypeResolver::activateVariable(std::string const& _name)
-{
-	solAssert(m_currentScope, "");
-	// Scoped local variables are invisible before activation.
-	// When a local variable is activated, its name is removed
-	// from a scope's invisible variables.
-	// This is used to avoid activation of variables of same name
-	// in the same scope (an error is returned).
-	if (m_currentScope->isInvisible(_name))
-		m_currentScope->activateVariable(_name);
-}
-
-std::vector<Declaration const*> NameAndTypeResolver::resolveName(ASTString const& _name, ASTNode const* _scope) const
-{
-	auto iterator = m_scopes.find(_scope);
-	if (iterator == end(m_scopes))
-		return std::vector<Declaration const*>({});
-	return iterator->second->resolveName(_name);
-}
-
-std::vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString const& _name, bool _includeInvisibles) const
-{
-	ResolvingSettings settings;
-	settings.recursive = true;
-	settings.alsoInvisible = _includeInvisibles;
-	return m_currentScope->resolveName(_name, std::move(settings));
-}
-
-Declaration const* NameAndTypeResolver::pathFromCurrentScope(std::vector<ASTString> const& _path) const
-{
-	if (auto declarations = pathFromCurrentScopeWithAllDeclarations(_path); !declarations.empty())
-		return declarations.back();
-
-	return nullptr;
-}
-
-std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAllDeclarations(
-	std::vector<ASTString> const& _path,
-	bool _includeInvisibles
-) const
-{
-	solAssert(!_path.empty(), "");
-	std::vector<Declaration const*> pathDeclarations;
-
-	ResolvingSettings settings;
-	settings.recursive = true;
-	settings.alsoInvisible = _includeInvisibles;
-	settings.onlyVisibleAsUnqualifiedNames = true;
-	std::vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), settings);
-
-	// inside the loop, use default settings, except for alsoInvisible
-	settings.recursive = false;
-	settings.onlyVisibleAsUnqualifiedNames = false;
-
-	for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++)
-	{
-		if (!m_scopes.count(candidates.front()))
-			return {};
-
-		pathDeclarations.push_back(candidates.front());
-
-		candidates = m_scopes.at(candidates.front())->resolveName(_path[i], settings);
-	}
-	if (candidates.size() == 1)
-	{
-		pathDeclarations.push_back(candidates.front());
-		return pathDeclarations;
-	}
-	else
-		return {};
-}
-
-void NameAndTypeResolver::warnHomonymDeclarations() const
-{
-	DeclarationContainer::Homonyms homonyms;
-	m_scopes.at(nullptr)->populateHomonyms(back_inserter(homonyms));
-
-	for (auto [innerLocation, outerDeclarations]: homonyms)
-	{
-		solAssert(innerLocation && !outerDeclarations.empty(), "");
-
-		bool magicShadowed = false;
-		SecondarySourceLocation homonymousLocations;
-		SecondarySourceLocation shadowedLocations;
-		for (Declaration const* outerDeclaration: outerDeclarations)
-		{
-			solAssert(outerDeclaration, "");
-			if (dynamic_cast<MagicVariableDeclaration const*>(outerDeclaration))
-				magicShadowed = true;
-			else if (!outerDeclaration->isVisibleInContract())
-				homonymousLocations.append("The other declaration is here:", outerDeclaration->location());
-			else
-				shadowedLocations.append("The shadowed declaration is here:", outerDeclaration->location());
-		}
-
-		if (magicShadowed)
-			m_errorReporter.warning(
-				2319_error,
-				*innerLocation,
-				"This declaration shadows a builtin symbol."
-			);
-		if (!homonymousLocations.infos.empty())
-			m_errorReporter.warning(
-				8760_error,
-				*innerLocation,
-				"This declaration has the same name as another declaration.",
-				homonymousLocations
-			);
-		if (!shadowedLocations.infos.empty())
-			m_errorReporter.warning(
-				2519_error,
-				*innerLocation,
-				"This declaration shadows an existing declaration.",
-				shadowedLocations
-			);
-	}
-}
-
-void NameAndTypeResolver::setScope(ASTNode const* _node)
-{
-	m_currentScope = m_scopes[_node].get();
-}
-
-bool NameAndTypeResolver::resolveNamesAndTypesInternal(ASTNode& _node, bool _resolveInsideCode)
-{
-	if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(&_node))
-	{
-		bool success = true;
-		setScope(contract->scope());
-		solAssert(!!m_currentScope, "");
-		solAssert(_resolveInsideCode, "");
-
-		m_globalContext.setCurrentContract(*contract);
-		if (!contract->isLibrary())
-			updateDeclaration(*m_globalContext.currentSuper());
-		updateDeclaration(*m_globalContext.currentThis());
-
-		for (ASTPointer<InheritanceSpecifier> const& baseContract: contract->baseContracts())
-			if (!resolveNamesAndTypesInternal(*baseContract, true))
-				success = false;
-
-		setScope(contract);
-
-		if (success)
-		{
-			linearizeBaseContracts(*contract);
-			std::vector<ContractDefinition const*> properBases(
-				++contract->annotation().linearizedBaseContracts.begin(),
-				contract->annotation().linearizedBaseContracts.end()
-			);
-
-			for (ContractDefinition const* base: properBases)
-				importInheritedScope(*base);
-		}
-
-		// these can contain code, only resolve parameters for now
-		for (ASTPointer<ASTNode> const& node: contract->subNodes())
-		{
-			setScope(contract);
-			if (!resolveNamesAndTypesInternal(*node, false))
-				success = false;
-		}
-
-		if (!success)
-			return false;
-
-		setScope(contract);
-
-		// now resolve references inside the code
-		for (ASTPointer<ASTNode> const& node: contract->subNodes())
-		{
-			setScope(contract);
-			if (!resolveNamesAndTypesInternal(*node, true))
-				success = false;
-		}
-
-		// make "this" and "super" invisible.
-		m_scopes[nullptr]->registerDeclaration(*m_globalContext.currentThis(), true, true);
-		m_scopes[nullptr]->registerDeclaration(*m_globalContext.currentSuper(), true, true);
-		m_globalContext.resetCurrentContract();
-
-		return success;
-	}
-	else
-	{
-		if (m_scopes.count(&_node))
-			setScope(&_node);
-		return ReferencesResolver(m_errorReporter, *this, m_evmVersion, _resolveInsideCode).resolve(_node);
-	}
-}
-
-void NameAndTypeResolver::importInheritedScope(ContractDefinition const& _base)
-{
-	auto iterator = m_scopes.find(&_base);
-	solAssert(iterator != end(m_scopes), "");
-	for (auto const& nameAndDeclaration: iterator->second->declarations())
-		for (auto const& declaration: nameAndDeclaration.second)
-			// Import if it was declared in the base, is not the constructor and is visible in derived classes
-			if (declaration->scope() == &_base && declaration->isVisibleInDerivedContracts())
-				if (!m_currentScope->registerDeclaration(*declaration, false, false))
-				{
-					SourceLocation firstDeclarationLocation;
-					SourceLocation secondDeclarationLocation;
-					Declaration const* conflictingDeclaration = m_currentScope->conflictingDeclaration(*declaration);
-					solAssert(conflictingDeclaration, "");
-
-					// Usual shadowing is not an error
-					if (
-						dynamic_cast<ModifierDefinition const*>(declaration) &&
-						dynamic_cast<ModifierDefinition const*>(conflictingDeclaration)
-					)
-						continue;
-
-					// Public state variable can override functions
-					if (auto varDecl = dynamic_cast<VariableDeclaration const*>(conflictingDeclaration))
-						if (
-							dynamic_cast<FunctionDefinition const*>(declaration) &&
-							varDecl->isStateVariable() &&
-							varDecl->isPublic()
-						)
-							continue;
-
-					if (declaration->location().start < conflictingDeclaration->location().start)
-					{
-						firstDeclarationLocation = declaration->location();
-						secondDeclarationLocation = conflictingDeclaration->location();
-					}
-					else
-					{
-						firstDeclarationLocation = conflictingDeclaration->location();
-						secondDeclarationLocation = declaration->location();
-					}
-
-					m_errorReporter.declarationError(
-						9097_error,
-						secondDeclarationLocation,
-						SecondarySourceLocation().append("The previous declaration is here:", firstDeclarationLocation),
-						"Identifier already declared."
-					);
-				}
-}
-
-void NameAndTypeResolver::linearizeBaseContracts(ContractDefinition& _contract)
-{
-	// order in the lists is from derived to base
-	// list of lists to linearize, the last element is the list of direct bases
-	std::list<std::list<ContractDefinition const*>> input(1, std::list<ContractDefinition const*>{});
-	for (ASTPointer<InheritanceSpecifier> const& baseSpecifier: _contract.baseContracts())
-	{
-		IdentifierPath const& baseName = baseSpecifier->name();
-		auto base = dynamic_cast<ContractDefinition const*>(baseName.annotation().referencedDeclaration);
-		if (!base)
-			m_errorReporter.fatalTypeError(8758_error, baseName.location(), "Contract expected.");
-		// "push_front" has the effect that bases mentioned later can overwrite members of bases
-		// mentioned earlier
-		input.back().push_front(base);
-		std::vector<ContractDefinition const*> const& basesBases = base->annotation().linearizedBaseContracts;
-		if (basesBases.empty())
-			m_errorReporter.fatalTypeError(2449_error, baseName.location(), "Definition of base has to precede definition of derived contract");
-		input.push_front(std::list<ContractDefinition const*>(basesBases.begin(), basesBases.end()));
-	}
-	input.back().push_front(&_contract);
-	std::vector<ContractDefinition const*> result = cThreeMerge(input);
-	if (result.empty())
-		m_errorReporter.fatalTypeError(5005_error, _contract.location(), "Linearization of inheritance graph impossible");
-	_contract.annotation().linearizedBaseContracts = result;
-}
-
-template <class T>
-std::vector<T const*> NameAndTypeResolver::cThreeMerge(std::list<std::list<T const*>>& _toMerge)
-{
-	// returns true iff _candidate appears only as last element of the lists
-	auto appearsOnlyAtHead = [&](T const* _candidate) -> bool
-	{
-		for (std::list<T const*> const& bases: _toMerge)
-		{
-			solAssert(!bases.empty(), "");
-			if (find(++bases.begin(), bases.end(), _candidate) != bases.end())
-				return false;
-		}
-		return true;
-	};
-	// returns the next candidate to append to the linearized list or nullptr on failure
-	auto nextCandidate = [&]() -> T const*
-	{
-		for (std::list<T const*> const& bases: _toMerge)
-		{
-			solAssert(!bases.empty(), "");
-			if (appearsOnlyAtHead(bases.front()))
-				return bases.front();
-		}
-		return nullptr;
-	};
-	// removes the given contract from all lists
-	auto removeCandidate = [&](T const* _candidate)
-	{
-		for (auto it = _toMerge.begin(); it != _toMerge.end();)
-		{
-			it->remove(_candidate);
-			if (it->empty())
-				it = _toMerge.erase(it);
-			else
-				++it;
-		}
-	};
-
-	_toMerge.remove_if([](std::list<T const*> const& _bases) { return _bases.empty(); });
-	std::vector<T const*> result;
-	while (!_toMerge.empty())
-	{
-		T const* candidate = nextCandidate();
-		if (!candidate)
-			return std::vector<T const*>();
-		result.push_back(candidate);
-		removeCandidate(candidate);
-	}
-	return result;
-}
-
-	std::string NameAndTypeResolver::similarNameSuggestions(ASTString const& _name) const
-{
-	return util::quotedAlternativesList(m_currentScope->similarNames(_name));
-}
-
-DeclarationRegistrationHelper::DeclarationRegistrationHelper(
-	std::map<ASTNode const*, std::shared_ptr<DeclarationContainer>>& _scopes,
-	ASTNode& _astRoot,
-	ErrorReporter& _errorReporter,
-	GlobalContext& _globalContext,
-	ASTNode const* _currentScope
-):
-	m_scopes(_scopes),
-	m_currentScope(_currentScope),
-	m_errorReporter(_errorReporter),
-	m_globalContext(_globalContext)
-{
-	_astRoot.accept(*this);
-	solAssert(m_currentScope == _currentScope, "Scopes not correctly closed.");
-}
-
-bool DeclarationRegistrationHelper::registerDeclaration(
-	DeclarationContainer& _container,
-	Declaration const& _declaration,
-	std::string const* _name,
-	SourceLocation const* _errorLocation,
-	bool _inactive,
-	ErrorReporter& _errorReporter
-)
-{
-	if (!_errorLocation)
-		_errorLocation = &_declaration.location();
-
-	std::string name = _name ? *_name : _declaration.name();
-
-	// We use "invisible" for both inactive variables in blocks and for members invisible in contracts.
-	// They cannot both be true at the same time.
-	solAssert(!(_inactive && !_declaration.isVisibleInContract()), "");
-
-	static std::set<std::string> illegalNames{"_", "super", "this"};
-
-	if (illegalNames.count(name))
-	{
-		auto isPublicFunctionOrEvent = [](Declaration const* _d) -> bool
-		{
-			if (auto functionDefinition = dynamic_cast<FunctionDefinition const*>(_d))
-			{
-				if (!functionDefinition->isFree() && functionDefinition->isPublic())
-					return true;
-			}
-			else if (dynamic_cast<EventDefinition const*>(_d))
-				return true;
-
-			return false;
-		};
-
-		// We allow an exception for public functions or events.
-		if (!isPublicFunctionOrEvent(&_declaration))
-			_errorReporter.declarationError(
-				3726_error,
-				*_errorLocation,
-				"The name \"" + name + "\" is reserved."
-			);
-	}
-
-	if (!_container.registerDeclaration(_declaration, _name, _errorLocation, !_declaration.isVisibleInContract() || _inactive, false))
-	{
-		SourceLocation firstDeclarationLocation;
-		SourceLocation secondDeclarationLocation;
-		Declaration const* conflictingDeclaration = _container.conflictingDeclaration(_declaration, _name);
-		solAssert(conflictingDeclaration, "");
-		bool const comparable =
-			_errorLocation->sourceName &&
-			conflictingDeclaration->location().sourceName &&
-			*_errorLocation->sourceName == *conflictingDeclaration->location().sourceName;
-		if (comparable && _errorLocation->start < conflictingDeclaration->location().start)
-		{
-			firstDeclarationLocation = *_errorLocation;
-			secondDeclarationLocation = conflictingDeclaration->location();
-		}
-		else
-		{
-			firstDeclarationLocation = conflictingDeclaration->location();
-			secondDeclarationLocation = *_errorLocation;
-		}
-
-		_errorReporter.declarationError(
-			2333_error,
-			secondDeclarationLocation,
-			SecondarySourceLocation().append("The previous declaration is here:", firstDeclarationLocation),
-			"Identifier already declared."
-		);
-		return false;
-	}
-
-	return true;
-}
-
-bool DeclarationRegistrationHelper::visit(SourceUnit& _sourceUnit)
-{
-	if (!m_scopes[&_sourceUnit])
-		// By importing, it is possible that the container already exists.
-		m_scopes[&_sourceUnit] = std::make_shared<DeclarationContainer>(m_currentScope, m_scopes[m_currentScope].get());
-	return ASTVisitor::visit(_sourceUnit);
-}
-
-void DeclarationRegistrationHelper::endVisit(SourceUnit& _sourceUnit)
-{
-	ASTVisitor::endVisit(_sourceUnit);
-}
-
-bool DeclarationRegistrationHelper::visit(ImportDirective& _import)
-{
-	SourceUnit const* importee = _import.annotation().sourceUnit;
-	solAssert(!!importee, "");
-	if (!m_scopes[importee])
-		m_scopes[importee] = std::make_shared<DeclarationContainer>(nullptr, m_scopes[nullptr].get());
-	m_scopes[&_import] = m_scopes[importee];
-	ASTVisitor::visit(_import);
-	return false; // Do not recurse into child nodes (Identifier for symbolAliases)
-}
-
-bool DeclarationRegistrationHelper::visit(ContractDefinition& _contract)
-{
-	m_globalContext.setCurrentContract(_contract);
-	m_scopes[nullptr]->registerDeclaration(*m_globalContext.currentThis(), false, true);
-	m_scopes[nullptr]->registerDeclaration(*m_globalContext.currentSuper(), false, true);
-	m_currentContract = &_contract;
-
-	return ASTVisitor::visit(_contract);
-}
-
-void DeclarationRegistrationHelper::endVisit(ContractDefinition& _contract)
-{
-	// make "this" and "super" invisible.
-	m_scopes[nullptr]->registerDeclaration(*m_globalContext.currentThis(), true, true);
-	m_scopes[nullptr]->registerDeclaration(*m_globalContext.currentSuper(), true, true);
-	m_globalContext.resetCurrentContract();
-	m_currentContract = nullptr;
-	ASTVisitor::endVisit(_contract);
-}
-
-void DeclarationRegistrationHelper::endVisit(VariableDeclarationStatement& _variableDeclarationStatement)
-{
-	// Register the local variables with the function
-	// This does not fit here perfectly, but it saves us another AST visit.
-	solAssert(m_currentFunction, "Variable declaration without function.");
-	for (ASTPointer<VariableDeclaration> const& var: _variableDeclarationStatement.declarations())
-		if (var)
-			m_currentFunction->addLocalVariable(*var);
-	ASTVisitor::endVisit(_variableDeclarationStatement);
-}
-
-bool DeclarationRegistrationHelper::visitNode(ASTNode& _node)
-{
-	if (auto const* scopable = dynamic_cast<Scopable const*>(&_node))
-		solAssert(scopable->annotation().scope == m_currentScope, "");
-
-	if (auto* declaration = dynamic_cast<Declaration*>(&_node))
-		registerDeclaration(*declaration);
-
-	if (auto* annotation = dynamic_cast<TypeDeclarationAnnotation*>(&_node.annotation()))
-	{
-		std::string canonicalName = dynamic_cast<Declaration const&>(_node).name();
-		solAssert(!canonicalName.empty(), "");
-
-		for (
-			ASTNode const* scope = m_currentScope;
-			scope != nullptr;
-			scope = m_scopes[scope]->enclosingNode()
-		)
-			if (auto decl = dynamic_cast<Declaration const*>(scope))
-			{
-				solAssert(!decl->name().empty(), "");
-				canonicalName = decl->name() + "." + canonicalName;
-			}
-
-		annotation->canonicalName = canonicalName;
-	}
-
-	if (dynamic_cast<ScopeOpener const*>(&_node))
-		enterNewSubScope(_node);
-
-	if (auto* variableScope = dynamic_cast<VariableScope*>(&_node))
-		m_currentFunction = variableScope;
-
-	return true;
-}
-
-void DeclarationRegistrationHelper::endVisitNode(ASTNode& _node)
-{
-	if (dynamic_cast<ScopeOpener const*>(&_node))
-		closeCurrentScope();
-	if (dynamic_cast<VariableScope*>(&_node))
-		m_currentFunction = nullptr;
-}
-
-void DeclarationRegistrationHelper::enterNewSubScope(ASTNode& _subScope)
-{
-	if (m_scopes.count(&_subScope))
-		// Source units are the only AST nodes for which containers can be created from multiple places due to imports.
-		solAssert(dynamic_cast<SourceUnit const*>(&_subScope), "Unexpected scope type.");
-	else
-	{
-		bool newlyAdded = m_scopes.emplace(
-			&_subScope,
-			std::make_shared<DeclarationContainer>(m_currentScope, m_scopes[m_currentScope].get())
-		).second;
-		solAssert(newlyAdded, "Unable to add new scope.");
-	}
-	m_currentScope = &_subScope;
-}
-
-void DeclarationRegistrationHelper::closeCurrentScope()
-{
-	solAssert(m_currentScope && m_scopes.count(m_currentScope), "Closed non-existing scope.");
-	m_currentScope = m_scopes[m_currentScope]->enclosingNode();
-}
-
-void DeclarationRegistrationHelper::registerDeclaration(Declaration& _declaration)
-{
-	solAssert(m_currentScope && m_scopes.count(m_currentScope), "No current scope.");
-	solAssert(m_currentScope == _declaration.scope(), "Unexpected current scope.");
-
-	// Register declaration as inactive if we are in block scope.
-	bool inactive =
-		(dynamic_cast<Block const*>(m_currentScope) || dynamic_cast<ForStatement const*>(m_currentScope));
-
-	registerDeclaration(*m_scopes[m_currentScope], _declaration, nullptr, nullptr, inactive, m_errorReporter);
-
-	solAssert(_declaration.annotation().scope == m_currentScope, "");
-	solAssert(_declaration.annotation().contract == m_currentContract, "");
-}
-
-}
diff --git a/libsolidity/analysis/NameAndTypeResolver.h b/libsolidity/analysis/NameAndTypeResolver.h
deleted file mode 100644
index 6ba591e8ad16..000000000000
--- a/libsolidity/analysis/NameAndTypeResolver.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Parser part that determines the declarations corresponding to names and the types of expressions.
- */
-
-#pragma once
-
-#include <libsolidity/analysis/DeclarationContainer.h>
-#include <libsolidity/analysis/GlobalContext.h>
-#include <libsolidity/analysis/ReferencesResolver.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <list>
-#include <map>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Resolves name references, typenames and sets the (explicitly given) types for all variable
- * declarations.
- */
-class NameAndTypeResolver
-{
-public:
-	/// Noncopyable.
-	NameAndTypeResolver(NameAndTypeResolver const&) = delete;
-	NameAndTypeResolver& operator=(NameAndTypeResolver const&) = delete;
-
-	/// Creates the resolver with the given declarations added to the global scope.
-	/// @param _scopes mapping of scopes to be used (usually default constructed), these
-	/// are filled during the lifetime of this object.
-	NameAndTypeResolver(
-		GlobalContext& _globalContext,
-		langutil::EVMVersion _evmVersion,
-		langutil::ErrorReporter& _errorReporter
-	);
-	/// Registers all declarations found in the AST node, usually a source unit.
-	/// @returns false in case of error.
-	/// @param _currentScope should be nullptr but can be used to inject new declarations into
-	/// existing scopes, used by the snippets feature.
-	bool registerDeclarations(SourceUnit& _sourceUnit, ASTNode const* _currentScope = nullptr);
-	/// Applies the effect of import directives.
-	bool performImports(SourceUnit& _sourceUnit, std::map<std::string, SourceUnit const*> const& _sourceUnits);
-	/// Resolves all names and types referenced from the given Source Node.
-	/// @returns false in case of error.
-	bool resolveNamesAndTypes(SourceUnit& _source);
-	/// Updates the given global declaration (used for "this"). Not to be used with declarations
-	/// that create their own scope.
-	/// @returns false in case of error.
-	bool updateDeclaration(Declaration const& _declaration);
-	/// Activates a previously inactive (invisible) variable. To be used in C99 scoping for
-	/// VariableDeclarationStatements.
-	void activateVariable(std::string const& _name);
-
-	/// Resolves the given @a _name inside the scope @a _scope. If @a _scope is omitted,
-	/// the global scope is used (i.e. the one containing only the pre-defined global variables).
-	/// @returns a pointer to the declaration on success or nullptr on failure.
-	/// SHOULD only be used for testing.
-	std::vector<Declaration const*> resolveName(ASTString const& _name, ASTNode const* _scope = nullptr) const;
-
-	/// Resolves a name in the "current" scope, but also searches parent scopes.
-	/// Should only be called during the initial resolving phase.
-	std::vector<Declaration const*> nameFromCurrentScope(ASTString const& _name, bool _includeInvisibles = false) const;
-
-	/// Resolves a path starting from the "current" scope, but also searches parent scopes.
-	/// Should only be called during the initial resolving phase.
-	/// @note Returns a null pointer if any component in the path was not unique or not found.
-	Declaration const* pathFromCurrentScope(std::vector<ASTString> const& _path) const;
-	/// Resolves a path starting from the "current" scope, but also searches parent scopes.
-	/// Should only be called during the initial resolving phase.
-	/// @note Returns an empty vector if any component in the path was non-unique or not found. Otherwise, all declarations along the path are returned.
-	std::vector<Declaration const*> pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path, bool _includeInvisibles = false) const;
-
-	/// Generate and store warnings about declarations with the same name.
-	void warnHomonymDeclarations() const;
-
-	/// @returns a list of similar identifiers in the current and enclosing scopes. May return empty string if no suggestions.
-	std::string similarNameSuggestions(ASTString const& _name) const;
-
-	/// Sets the current scope.
-	void setScope(ASTNode const* _node);
-
-private:
-	/// Internal version of @a resolveNamesAndTypes (called from there) throws exceptions on fatal errors.
-	bool resolveNamesAndTypesInternal(ASTNode& _node, bool _resolveInsideCode = true);
-
-	/// Imports all members declared directly in the given contract (i.e. does not import inherited members)
-	/// into the current scope if they are not present already.
-	void importInheritedScope(ContractDefinition const& _base);
-
-	/// Computes "C3-Linearization" of base contracts and stores it inside the contract. Reports errors if any
-	void linearizeBaseContracts(ContractDefinition& _contract);
-	/// Computes the C3-merge of the given list of lists of bases.
-	/// @returns the linearized vector or an empty vector if linearization is not possible.
-	template <class T>
-	static std::vector<T const*> cThreeMerge(std::list<std::list<T const*>>& _toMerge);
-
-	/// Maps nodes declaring a scope to scopes, i.e. ContractDefinition and FunctionDeclaration,
-	/// where nullptr denotes the global scope. Note that structs are not scope since they do
-	/// not contain code.
-	/// Aliases (for example `import "x" as y;`) create multiple pointers to the same scope.
-	std::map<ASTNode const*, std::shared_ptr<DeclarationContainer>> m_scopes;
-
-	langutil::EVMVersion m_evmVersion;
-	DeclarationContainer* m_currentScope = nullptr;
-	langutil::ErrorReporter& m_errorReporter;
-	GlobalContext& m_globalContext;
-};
-
-/**
- * Traverses the given AST upon construction and fills _scopes with all declarations inside the
- * AST.
- */
-class DeclarationRegistrationHelper: private ASTVisitor
-{
-public:
-	/// Registers declarations in their scopes and creates new scopes as a side-effect
-	/// of construction.
-	/// @param _currentScope should be nullptr if we start at SourceUnit, but can be different
-	/// to inject new declarations into an existing scope, used by snippets.
-	DeclarationRegistrationHelper(
-		std::map<ASTNode const*, std::shared_ptr<DeclarationContainer>>& _scopes,
-		ASTNode& _astRoot,
-		langutil::ErrorReporter& _errorReporter,
-		GlobalContext& _globalContext,
-		ASTNode const* _currentScope = nullptr
-	);
-
-	static bool registerDeclaration(
-		DeclarationContainer& _container,
-		Declaration const& _declaration,
-		std::string const* _name,
-		langutil::SourceLocation const* _errorLocation,
-		bool _inactive,
-		langutil::ErrorReporter& _errorReporter
-	);
-
-private:
-	bool visit(SourceUnit& _sourceUnit) override;
-	void endVisit(SourceUnit& _sourceUnit) override;
-	bool visit(ImportDirective& _import) override;
-	bool visit(ContractDefinition& _contract) override;
-	void endVisit(ContractDefinition& _contract) override;
-	void endVisit(VariableDeclarationStatement& _variableDeclarationStatement) override;
-
-	bool visitNode(ASTNode& _node) override;
-	void endVisitNode(ASTNode& _node) override;
-
-
-	void enterNewSubScope(ASTNode& _subScope);
-	void closeCurrentScope();
-	void registerDeclaration(Declaration& _declaration);
-
-	static bool isOverloadedFunction(Declaration const& _declaration1, Declaration const& _declaration2);
-
-	std::map<ASTNode const*, std::shared_ptr<DeclarationContainer>>& m_scopes;
-	ASTNode const* m_currentScope = nullptr;
-	VariableScope* m_currentFunction = nullptr;
-	ContractDefinition const* m_currentContract = nullptr;
-	langutil::ErrorReporter& m_errorReporter;
-	GlobalContext& m_globalContext;
-};
-
-}
diff --git a/libsolidity/analysis/OverrideChecker.cpp b/libsolidity/analysis/OverrideChecker.cpp
deleted file mode 100644
index f2a99340deee..000000000000
--- a/libsolidity/analysis/OverrideChecker.cpp
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that verifies overloads, abstract contracts, function clashes and others
- * checks at contract or function level.
- */
-
-#include <libsolidity/analysis/OverrideChecker.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/analysis/TypeChecker.h>
-#include <liblangutil/ErrorReporter.h>
-#include <libsolutil/Visitor.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-using solidity::util::GenericVisitor;
-using solidity::util::contains_if;
-using solidity::util::joinHumanReadable;
-
-namespace
-{
-
-// Helper struct to do a search by name
-struct MatchByName
-{
-	std::string const& m_name;
-	bool operator()(OverrideProxy const& _item)
-	{
-		return _item.name() == m_name;
-	}
-};
-
-/**
- * Construct the override graph for this signature.
- * Reserve node 0 for the current contract and node
- * 1 for an artificial top node to which all override paths
- * connect at the end.
- */
-struct OverrideGraph
-{
-	OverrideGraph(std::set<OverrideProxy> const& _baseCallables)
-	{
-		for (auto const& baseFunction: _baseCallables)
-			addEdge(0, visit(baseFunction));
-	}
-	std::map<OverrideProxy, int> nodes;
-	std::map<int, OverrideProxy> nodeInv;
-	std::map<int, std::set<int>> edges;
-	size_t numNodes = 2;
-	void addEdge(int _a, int _b)
-	{
-		edges[_a].insert(_b);
-		edges[_b].insert(_a);
-	}
-private:
-	/// Completes the graph starting from @a _function and
-	/// @returns the node ID.
-	int visit(OverrideProxy const& _function)
-	{
-		auto it = nodes.find(_function);
-		if (it != nodes.end())
-			return it->second;
-		int currentNode = static_cast<int>(numNodes++);
-		nodes[_function] = currentNode;
-		nodeInv[currentNode] = _function;
-
-		if (!_function.baseFunctions().empty())
-			for (auto const& baseFunction: _function.baseFunctions())
-				addEdge(currentNode, visit(baseFunction));
-		else
-			addEdge(currentNode, 1);
-
-		return currentNode;
-	}
-};
-
-/**
- * Detect cut vertices following https://en.wikipedia.org/wiki/Biconnected_component#Pseudocode
- * Can ignore the root node, since it is never a cut vertex in our case.
- */
-struct CutVertexFinder
-{
-	CutVertexFinder(OverrideGraph const& _graph): m_graph(_graph)
-	{
-		run();
-	}
-	std::set<OverrideProxy> const& cutVertices() const { return m_cutVertices; }
-
-private:
-	OverrideGraph const& m_graph;
-
-	std::vector<bool> m_visited = std::vector<bool>(m_graph.numNodes, false);
-	std::vector<int> m_depths = std::vector<int>(m_graph.numNodes, -1);
-	std::vector<int> m_low = std::vector<int>(m_graph.numNodes, -1);
-	std::vector<int> m_parent = std::vector<int>(m_graph.numNodes, -1);
-	std::set<OverrideProxy> m_cutVertices{};
-
-	void run(size_t _u = 0, size_t _depth = 0)
-	{
-		m_visited.at(_u) = true;
-		m_depths.at(_u) = m_low.at(_u) = static_cast<int>(_depth);
-		for (int const v: m_graph.edges.at(static_cast<int>(_u)))
-		{
-			auto const vInd = static_cast<size_t>(v);
-			if (!m_visited.at(vInd))
-			{
-				m_parent[vInd] = static_cast<int>(_u);
-				run(vInd, _depth + 1);
-				if (m_low[vInd] >= m_depths[_u] && m_parent[_u] != -1)
-					m_cutVertices.insert(m_graph.nodeInv.at(static_cast<int>(_u)));
-				m_low[_u] = std::min(m_low[_u], m_low[vInd]);
-			}
-			else if (v != m_parent[_u])
-				m_low[_u] = std::min(m_low[_u], m_depths[vInd]);
-		}
-	}
-};
-
-std::vector<ContractDefinition const*> resolveDirectBaseContracts(ContractDefinition const& _contract)
-{
-	std::vector<ContractDefinition const*> resolvedContracts;
-
-	for (ASTPointer<InheritanceSpecifier> const& specifier: _contract.baseContracts())
-	{
-		Declaration const* baseDecl =
-			specifier->name().annotation().referencedDeclaration;
-		auto contract = dynamic_cast<ContractDefinition const*>(baseDecl);
-		if (contract)
-			resolvedContracts.emplace_back(contract);
-	}
-
-	return resolvedContracts;
-}
-
-std::vector<ASTPointer<IdentifierPath>> sortByContract(std::vector<ASTPointer<IdentifierPath>> const& _list)
-{
-	auto sorted = _list;
-
-	stable_sort(sorted.begin(), sorted.end(),
-		[] (ASTPointer<IdentifierPath> _a, ASTPointer<IdentifierPath> _b) {
-			if (!_a || !_b)
-				return _a < _b;
-
-			Declaration const* aDecl = _a->annotation().referencedDeclaration;
-			Declaration const* bDecl = _b->annotation().referencedDeclaration;
-
-			if (!aDecl || !bDecl)
-				return aDecl < bDecl;
-
-			return aDecl->id() < bDecl->id();
-		}
-	);
-
-	return sorted;
-}
-
-OverrideProxy makeOverrideProxy(CallableDeclaration const& _callable)
-{
-	if (auto const* fun = dynamic_cast<FunctionDefinition const*>(&_callable))
-		return OverrideProxy{fun};
-	else if (auto const* mod = dynamic_cast<ModifierDefinition const*>(&_callable))
-		return OverrideProxy{mod};
-	else
-		solAssert(false, "Invalid call to makeOverrideProxy.");
-	return {};
-}
-
-}
-
-bool OverrideProxy::operator<(OverrideProxy const& _other) const
-{
-	return id() < _other.id();
-}
-
-bool OverrideProxy::isVariable() const
-{
-	return std::holds_alternative<VariableDeclaration const*>(m_item);
-}
-
-bool OverrideProxy::isFunction() const
-{
-	return std::holds_alternative<FunctionDefinition const*>(m_item);
-}
-
-bool OverrideProxy::isModifier() const
-{
-	return std::holds_alternative<ModifierDefinition const*>(m_item);
-}
-
-bool OverrideProxy::CompareBySignature::operator()(OverrideProxy const& _a, OverrideProxy const& _b) const
-{
-	return _a.overrideComparator() < _b.overrideComparator();
-}
-
-size_t OverrideProxy::id() const
-{
-	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> size_t { return static_cast<size_t>(_item->id()); }
-	}, m_item);
-}
-
-std::shared_ptr<OverrideSpecifier> OverrideProxy::overrides() const
-{
-	return std::visit(GenericVisitor{
-		[&](auto const* _item) { return _item->overrides(); }
-	}, m_item);
-}
-
-std::set<OverrideProxy> OverrideProxy::baseFunctions() const
-{
-	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> std::set<OverrideProxy> {
-			std::set<OverrideProxy> ret;
-			for (auto const* f: _item->annotation().baseFunctions)
-				ret.insert(makeOverrideProxy(*f));
-			return ret;
-		}
-	}, m_item);
-}
-
-void OverrideProxy::storeBaseFunction(OverrideProxy const& _base) const
-{
-	std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) {
-			_item->annotation().baseFunctions.emplace(std::get<FunctionDefinition const*>(_base.m_item));
-		},
-		[&](ModifierDefinition const* _item) {
-			_item->annotation().baseFunctions.emplace(std::get<ModifierDefinition const*>(_base.m_item));
-		},
-		[&](VariableDeclaration const* _item) {
-			_item->annotation().baseFunctions.emplace(std::get<FunctionDefinition const*>(_base.m_item));
-		}
-	}, m_item);
-}
-
-std::string const& OverrideProxy::name() const
-{
-	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> std::string const& { return _item->name(); }
-	}, m_item);
-}
-
-ContractDefinition const& OverrideProxy::contract() const
-{
-	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> ContractDefinition const& {
-			return dynamic_cast<ContractDefinition const&>(*_item->scope());
-		}
-	}, m_item);
-}
-
-std::string const& OverrideProxy::contractName() const
-{
-	return contract().name();
-}
-
-Visibility OverrideProxy::visibility() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return _item->visibility(); },
-		[&](ModifierDefinition const* _item) { return _item->visibility(); },
-		[&](VariableDeclaration const*) { return Visibility::External; }
-	}, m_item);
-}
-
-StateMutability OverrideProxy::stateMutability() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return _item->stateMutability(); },
-		[&](ModifierDefinition const*) { solAssert(false, "Requested state mutability from modifier."); return StateMutability{}; },
-		[&](VariableDeclaration const* _var) { return _var->isConstant() ? StateMutability::Pure : StateMutability::View; }
-	}, m_item);
-}
-
-bool OverrideProxy::virtualSemantics() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return _item->virtualSemantics(); },
-		[&](ModifierDefinition const* _item) { return _item->virtualSemantics(); },
-		[&](VariableDeclaration const*) { return false; }
-	}, m_item);
-}
-
-Token OverrideProxy::functionKind() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return _item->kind(); },
-		[&](ModifierDefinition const*) { return Token::Function; },
-		[&](VariableDeclaration const*) { return Token::Function; }
-	}, m_item);
-}
-
-FunctionType const* OverrideProxy::externalFunctionType() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return FunctionType(*_item).asExternallyCallableFunction(false); },
-		[&](VariableDeclaration const* _item) { return FunctionType(*_item).asExternallyCallableFunction(false); },
-		[&](ModifierDefinition const*) -> FunctionType const* { solAssert(false, "Requested function type of modifier."); return nullptr; }
-	}, m_item);
-}
-
-FunctionType const* OverrideProxy::originalFunctionType() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return TypeProvider::function(*_item); },
-		[&](VariableDeclaration const*) -> FunctionType const* { solAssert(false, "Requested specific function type of variable."); return nullptr; },
-		[&](ModifierDefinition const*) -> FunctionType const* { solAssert(false, "Requested specific function type of modifier."); return nullptr; }
-	}, m_item);
-}
-
-ModifierType const* OverrideProxy::modifierType() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const*) -> ModifierType const* { solAssert(false, "Requested modifier type of function."); return nullptr; },
-		[&](VariableDeclaration const*) -> ModifierType const* { solAssert(false, "Requested modifier type of variable."); return nullptr; },
-		[&](ModifierDefinition const* _modifier) -> ModifierType const* { return TypeProvider::modifier(*_modifier); }
-	}, m_item);
-}
-
-
-Declaration const* OverrideProxy::declaration() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _function) -> Declaration const* { return _function; },
-		[&](VariableDeclaration const* _variable) -> Declaration const* { return _variable; },
-		[&](ModifierDefinition const* _modifier) -> Declaration const* { return _modifier; }
-	}, m_item);
-}
-
-SourceLocation const& OverrideProxy::location() const
-{
-	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> SourceLocation const& { return _item->location(); }
-	}, m_item);
-}
-
-std::string OverrideProxy::astNodeName() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const*) { return "function"; },
-		[&](ModifierDefinition const*) { return "modifier"; },
-		[&](VariableDeclaration const*) { return "public state variable"; },
-	}, m_item);
-}
-
-std::string OverrideProxy::astNodeNameCapitalized() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const*) { return "Function"; },
-		[&](ModifierDefinition const*) { return "Modifier"; },
-		[&](VariableDeclaration const*) { return "Public state variable"; },
-	}, m_item);
-}
-
-std::string OverrideProxy::distinguishingProperty() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const*) { return "name and parameter types"; },
-		[&](ModifierDefinition const*) { return "name"; },
-		[&](VariableDeclaration const*) { return "name and parameter types"; },
-	}, m_item);
-}
-
-bool OverrideProxy::unimplemented() const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionDefinition const* _item) { return !_item->isImplemented(); },
-		[&](ModifierDefinition const* _item) { return !_item->isImplemented(); },
-		[&](VariableDeclaration const*) { return false; }
-	}, m_item);
-}
-
-bool OverrideProxy::OverrideComparator::operator<(OverrideComparator const& _other) const
-{
-	if (name != _other.name)
-		return name < _other.name;
-
-	if (!functionKind || !_other.functionKind)
-		return false;
-
-	if (functionKind != _other.functionKind)
-		return *functionKind < *_other.functionKind;
-
-	// Parameters do not matter for non-regular functions.
-	if (functionKind != Token::Function)
-		return false;
-
-	if (!parameterTypes || !_other.parameterTypes)
-		return false;
-
-	return boost::lexicographical_compare(*parameterTypes, *_other.parameterTypes);
-}
-
-OverrideProxy::OverrideComparator const& OverrideProxy::overrideComparator() const
-{
-	if (!m_comparator)
-	{
-		m_comparator = std::make_shared<OverrideComparator>(std::visit(GenericVisitor{
-			[&](FunctionDefinition const* _function)
-			{
-				std::vector<std::string> paramTypes;
-				for (Type const* t: externalFunctionType()->parameterTypes())
-					paramTypes.emplace_back(t->richIdentifier());
-				return OverrideComparator{
-					_function->name(),
-					_function->kind(),
-					std::move(paramTypes)
-				};
-			},
-			[&](VariableDeclaration const* _var)
-			{
-				std::vector<std::string> paramTypes;
-				for (Type const* t: externalFunctionType()->parameterTypes())
-					paramTypes.emplace_back(t->richIdentifier());
-				return OverrideComparator{
-					_var->name(),
-					Token::Function,
-					std::move(paramTypes)
-				};
-			},
-			[&](ModifierDefinition const* _mod)
-			{
-				return OverrideComparator{
-					_mod->name(),
-					{},
-					{}
-				};
-			}
-		}, m_item));
-	}
-
-	return *m_comparator;
-}
-
-bool OverrideChecker::CompareByID::operator()(ContractDefinition const* _a, ContractDefinition const* _b) const
-{
-	if (!_a || !_b)
-		return _a < _b;
-
-	return _a->id() < _b->id();
-}
-
-void OverrideChecker::check(ContractDefinition const& _contract)
-{
-	checkIllegalOverrides(_contract);
-	checkAmbiguousOverrides(_contract);
-}
-
-void OverrideChecker::checkIllegalOverrides(ContractDefinition const& _contract)
-{
-	OverrideProxyBySignatureMultiSet const& inheritedFuncs = inheritedFunctions(_contract);
-	OverrideProxyBySignatureMultiSet const& inheritedMods = inheritedModifiers(_contract);
-
-	for (ModifierDefinition const* modifier: _contract.functionModifiers())
-	{
-		if (contains_if(inheritedFuncs, MatchByName{modifier->name()}))
-			m_errorReporter.typeError(
-				5631_error,
-				modifier->location(),
-				"Override changes function or public state variable to modifier."
-			);
-
-		checkOverrideList(OverrideProxy{modifier}, inheritedMods);
-	}
-
-	for (FunctionDefinition const* function: _contract.definedFunctions())
-	{
-		if (function->isConstructor())
-			continue;
-
-		if (contains_if(inheritedMods, MatchByName{function->name()}))
-			m_errorReporter.typeError(1469_error, function->location(), "Override changes modifier to function.");
-
-		checkOverrideList(OverrideProxy{function}, inheritedFuncs);
-	}
-	for (auto const* stateVar: _contract.stateVariables())
-	{
-		if (!stateVar->isPublic())
-		{
-			if (stateVar->overrides())
-				m_errorReporter.typeError(8022_error, stateVar->location(), "Override can only be used with public state variables.");
-
-			continue;
-		}
-
-		if (contains_if(inheritedMods, MatchByName{stateVar->name()}))
-			m_errorReporter.typeError(1456_error, stateVar->location(), "Override changes modifier to public state variable.");
-
-		checkOverrideList(OverrideProxy{stateVar}, inheritedFuncs);
-	}
-
-}
-
-void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverrideProxy const& _super)
-{
-	solAssert(_super.isModifier() == _overriding.isModifier(), "");
-
-	if (_super.isFunction() || _super.isModifier())
-		_overriding.storeBaseFunction(_super);
-
-	if (_overriding.isModifier() && *_overriding.modifierType() != *_super.modifierType())
-		m_errorReporter.typeError(
-			1078_error,
-			_overriding.location(),
-			"Override changes modifier signature."
-		);
-
-	if (!_overriding.overrides() && !(_super.isFunction() && _super.contract().isInterface()))
-		overrideError(
-			_overriding,
-			_super,
-			9456_error,
-			"Overriding " + _overriding.astNodeName() + " is missing \"override\" specifier.",
-			"Overridden " + _overriding.astNodeName() + " is here:"
-		);
-
-	if (_super.isVariable())
-		overrideError(
-			_super,
-			_overriding,
-			1452_error,
-			"Cannot override public state variable.",
-			"Overriding " + _overriding.astNodeName() + " is here:"
-		);
-	else if (!_super.virtualSemantics())
-		overrideError(
-			_super,
-			_overriding,
-			4334_error,
-			"Trying to override non-virtual " + _super.astNodeName() + ". Did you forget to add \"virtual\"?",
-			"Overriding " + _overriding.astNodeName() + " is here:"
-		);
-
-	if (_overriding.isVariable())
-	{
-		if (_super.visibility() != Visibility::External)
-			overrideError(
-				_overriding,
-				_super,
-				5225_error,
-				"Public state variables can only override functions with external visibility.",
-				"Overridden function is here:"
-			);
-		solAssert(_overriding.visibility() == Visibility::External, "");
-	}
-	else if (_overriding.visibility() != _super.visibility())
-	{
-		// Visibility change from external to public is fine.
-		// Any other change is disallowed.
-		if (!(
-			_super.visibility() == Visibility::External &&
-			_overriding.visibility() == Visibility::Public
-		))
-			overrideError(
-				_overriding,
-				_super,
-				9098_error,
-				"Overriding " + _overriding.astNodeName() + " visibility differs.",
-				"Overridden " + _overriding.astNodeName() + " is here:"
-			);
-	}
-
-	if (_overriding.unimplemented() && !_super.unimplemented())
-	{
-		solAssert(!_overriding.isVariable() || !_overriding.unimplemented(), "");
-		overrideError(
-			_overriding,
-			_super,
-			4593_error,
-			"Overriding an implemented " + _super.astNodeName() +
-			" with an unimplemented " + _overriding.astNodeName() +
-			" is not allowed."
-		);
-	}
-
-	if (_super.isFunction())
-	{
-		FunctionType const* functionType = _overriding.externalFunctionType();
-		FunctionType const* superType = _super.externalFunctionType();
-
-		bool returnTypesDifferAlready = false;
-		if (_overriding.functionKind() != Token::Fallback)
-		{
-			solAssert(functionType->hasEqualParameterTypes(*superType), "Override doesn't have equal parameters!");
-
-			if (!functionType->hasEqualReturnTypes(*superType))
-			{
-				returnTypesDifferAlready = true;
-				overrideError(
-					_overriding,
-					_super,
-					4822_error,
-					"Overriding " + _overriding.astNodeName() + " return types differ.",
-					"Overridden " + _overriding.astNodeName() + " is here:"
-				);
-			}
-		}
-
-		// The override proxy considers calldata and memory the same data location.
-		// Here we do a more specific check:
-		// Data locations of parameters and return variables have to match
-		// unless we have a public function overriding an external one.
-		if (
-			_overriding.isFunction() &&
-			!returnTypesDifferAlready &&
-			_super.visibility() != Visibility::External &&
-			_overriding.functionKind() != Token::Fallback
-		)
-		{
-			if (!_overriding.originalFunctionType()->hasEqualParameterTypes(*_super.originalFunctionType()))
-				overrideError(
-					_overriding,
-					_super,
-					7723_error,
-					"Data locations of parameters have to be the same when overriding non-external functions, but they differ.",
-					"Overridden " + _overriding.astNodeName() + " is here:"
-				);
-			if (!_overriding.originalFunctionType()->hasEqualReturnTypes(*_super.originalFunctionType()))
-				overrideError(
-					_overriding,
-					_super,
-					1443_error,
-					"Data locations of return variables have to be the same when overriding non-external functions, but they differ.",
-					"Overridden " + _overriding.astNodeName() + " is here:"
-				);
-		}
-
-		// Stricter mutability is always okay except when super is Payable
-		if (
-			(_overriding.isFunction() || _overriding.isVariable()) &&
-			(
-				_overriding.stateMutability() > _super.stateMutability() ||
-				_super.stateMutability() == StateMutability::Payable
-			) &&
-			_overriding.stateMutability() != _super.stateMutability()
-		)
-			overrideError(
-				_overriding,
-				_super,
-				6959_error,
-				"Overriding " +
-				_overriding.astNodeName() +
-				" changes state mutability from \"" +
-				stateMutabilityToString(_super.stateMutability()) +
-				"\" to \"" +
-				stateMutabilityToString(_overriding.stateMutability()) +
-				"\"."
-			);
-	}
-}
-
-void OverrideChecker::overrideListError(
-	OverrideProxy const& _item,
-	std::set<ContractDefinition const*, CompareByID> _secondary,
-	ErrorId _error,
-	std::string const& _message1,
-	std::string const& _message2
-)
-{
-	// Using a set rather than a vector so the order is always the same
-	std::set<std::string> names;
-	SecondarySourceLocation ssl;
-	for (Declaration const* c: _secondary)
-	{
-		ssl.append("This contract: ", c->location());
-		names.insert("\"" + c->name() + "\"");
-	}
-	std::string contractSingularPlural = "contract ";
-	if (_secondary.size() > 1)
-		contractSingularPlural = "contracts ";
-
-	m_errorReporter.typeError(
-		_error,
-		_item.overrides() ? _item.overrides()->location() : _item.location(),
-		ssl,
-		_message1 +
-		contractSingularPlural +
-		_message2 +
-		joinHumanReadable(names, ", ", " and ") +
-		"."
-	);
-}
-
-void OverrideChecker::overrideError(
-	OverrideProxy const& _overriding,
-	OverrideProxy const& _super,
-	ErrorId _error,
-	std::string const& _message,
-	std::optional<std::string> const& _secondaryMsg
-)
-{
-	m_errorReporter.typeError(
-		_error,
-		_overriding.location(),
-		SecondarySourceLocation().append(
-			_secondaryMsg.value_or("Overridden " + _super.astNodeName() + " is here:"),
-			_super.location()
-		),
-		_message
-	);
-}
-
-void OverrideChecker::checkAmbiguousOverrides(ContractDefinition const& _contract) const
-{
-	{
-		// Fetch inherited functions and sort them by signature.
-		// We get at least one function per signature and direct base contract, which is
-		// enough because we re-construct the inheritance graph later.
-		OverrideProxyBySignatureMultiSet nonOverriddenFunctions = inheritedFunctions(_contract);
-
-		// Remove all functions that match the signature of a function in the current contract.
-		for (FunctionDefinition const* f: _contract.definedFunctions())
-			nonOverriddenFunctions.erase(OverrideProxy{f});
-		for (VariableDeclaration const* v: _contract.stateVariables())
-			if (v->isPublic())
-				nonOverriddenFunctions.erase(OverrideProxy{v});
-
-		// Walk through the set of functions signature by signature.
-		for (auto it = nonOverriddenFunctions.cbegin(); it != nonOverriddenFunctions.cend();)
-		{
-			std::set<OverrideProxy> baseFunctions;
-			for (auto nextSignature = nonOverriddenFunctions.upper_bound(*it); it != nextSignature; ++it)
-				baseFunctions.insert(*it);
-
-			checkAmbiguousOverridesInternal(std::move(baseFunctions), _contract.location());
-		}
-	}
-
-	{
-		OverrideProxyBySignatureMultiSet modifiers = inheritedModifiers(_contract);
-		for (ModifierDefinition const* mod: _contract.functionModifiers())
-			modifiers.erase(OverrideProxy{mod});
-
-		for (auto it = modifiers.cbegin(); it != modifiers.cend();)
-		{
-			std::set<OverrideProxy> baseModifiers;
-			for (auto next = modifiers.upper_bound(*it); it != next; ++it)
-				baseModifiers.insert(*it);
-
-			checkAmbiguousOverridesInternal(std::move(baseModifiers), _contract.location());
-		}
-
-	}
-}
-
-void OverrideChecker::checkAmbiguousOverridesInternal(std::set<OverrideProxy> _baseCallables, SourceLocation const& _location) const
-{
-	if (_baseCallables.size() <= 1)
-		return;
-
-	OverrideGraph overrideGraph(_baseCallables);
-	CutVertexFinder cutVertexFinder{overrideGraph};
-
-	// Remove all base functions overridden by cut vertices (they don't need to be overridden).
-	for (OverrideProxy const& function: cutVertexFinder.cutVertices())
-	{
-		std::set<OverrideProxy> toTraverse = function.baseFunctions();
-		while (!toTraverse.empty())
-		{
-			OverrideProxy base = *toTraverse.begin();
-			toTraverse.erase(toTraverse.begin());
-			_baseCallables.erase(base);
-			for (OverrideProxy const& f: base.baseFunctions())
-				toTraverse.insert(f);
-		}
-		// Remove unimplemented base functions at the cut vertices itself as well.
-		if (function.unimplemented())
-			_baseCallables.erase(function);
-	}
-
-	// If more than one function is left, they have to be overridden.
-	if (_baseCallables.size() <= 1)
-		return;
-
-	SecondarySourceLocation ssl;
-	for (OverrideProxy const& baseFunction: _baseCallables)
-		ssl.append("Definition in \"" + baseFunction.contractName() + "\": ", baseFunction.location());
-
-	std::string callableName = _baseCallables.begin()->astNodeName();
-	if (_baseCallables.begin()->isVariable())
-		callableName = "function";
-	std::string distinguishigProperty = _baseCallables.begin()->distinguishingProperty();
-
-	bool foundVariable = false;
-	for (auto const& base: _baseCallables)
-		if (base.isVariable())
-			foundVariable = true;
-
-	std::string message =
-		"Derived contract must override " + callableName + " \"" +
-		_baseCallables.begin()->name() +
-		"\". Two or more base classes define " + callableName + " with same " + distinguishigProperty + ".";
-
-	if (foundVariable)
-		message +=
-			" Since one of the bases defines a public state variable which cannot be overridden, "
-			"you have to change the inheritance layout or the names of the functions.";
-
-	m_errorReporter.typeError(6480_error, _location, ssl, message);
-}
-
-std::set<ContractDefinition const*, OverrideChecker::CompareByID> OverrideChecker::resolveOverrideList(OverrideSpecifier const& _overrides) const
-{
-	std::set<ContractDefinition const*, CompareByID> resolved;
-
-	for (ASTPointer<IdentifierPath> const& override: _overrides.overrides())
-	{
-		Declaration const* decl  = override->annotation().referencedDeclaration;
-		solAssert(decl, "Expected declaration to be resolved.");
-
-		// If it's not a contract it will be caught
-		// in the reference resolver
-		if (ContractDefinition const* contract = dynamic_cast<decltype(contract)>(decl))
-			resolved.insert(contract);
-	}
-
-	return resolved;
-}
-
-void OverrideChecker::checkOverrideList(OverrideProxy _item, OverrideProxyBySignatureMultiSet const& _inherited)
-{
-	std::set<ContractDefinition const*, CompareByID> specifiedContracts =
-		_item.overrides() ?
-		resolveOverrideList(*_item.overrides()) :
-		decltype(specifiedContracts){};
-
-	// Check for duplicates in override list
-	if (_item.overrides() && specifiedContracts.size() != _item.overrides()->overrides().size())
-	{
-		// Sort by contract id to find duplicate for error reporting
-		std::vector<ASTPointer<IdentifierPath>> list =
-			sortByContract(_item.overrides()->overrides());
-
-		// Find duplicates and output error
-		for (size_t i = 1; i < list.size(); i++)
-		{
-			Declaration const* aDecl = list[i]->annotation().referencedDeclaration;
-			Declaration const* bDecl = list[i-1]->annotation().referencedDeclaration;
-			if (!aDecl || !bDecl)
-				continue;
-
-			if (aDecl->id() == bDecl->id())
-			{
-				SecondarySourceLocation ssl;
-				ssl.append("First occurrence here: ", list[i-1]->location());
-				m_errorReporter.typeError(
-					4520_error,
-					list[i]->location(),
-					ssl,
-					"Duplicate contract \"" +
-					joinHumanReadable(list[i]->path(), ".") +
-					"\" found in override list of \"" +
-					_item.name() +
-					"\"."
-				);
-			}
-		}
-	}
-
-	std::set<ContractDefinition const*, CompareByID> expectedContracts;
-
-	// Build list of expected contracts
-	for (auto [begin, end] = _inherited.equal_range(_item); begin != end; begin++)
-	{
-		// Validate the override
-		checkOverride(_item, *begin);
-
-		expectedContracts.insert(&begin->contract());
-	}
-
-	if (_item.overrides() && expectedContracts.empty())
-		m_errorReporter.typeError(
-			7792_error,
-			_item.overrides()->location(),
-			_item.astNodeNameCapitalized() + " has override specified but does not override anything."
-		);
-
-	std::set<ContractDefinition const*, CompareByID> missingContracts;
-	// If we expect only one contract, no contract needs to be specified
-	if (expectedContracts.size() > 1)
-		missingContracts = expectedContracts - specifiedContracts;
-
-	if (!missingContracts.empty())
-		overrideListError(
-			_item,
-			missingContracts,
-			4327_error,
-			_item.astNodeNameCapitalized() + " needs to specify overridden ",
-			""
-		);
-
-	auto surplusContracts = specifiedContracts - expectedContracts;
-	if (!surplusContracts.empty())
-		overrideListError(
-			_item,
-			surplusContracts,
-			2353_error,
-			"Invalid ",
-			"specified in override list: "
-		);
-}
-
-OverrideChecker::OverrideProxyBySignatureMultiSet const& OverrideChecker::inheritedFunctions(ContractDefinition const& _contract) const
-{
-	if (!m_inheritedFunctions.count(&_contract))
-	{
-		OverrideProxyBySignatureMultiSet result;
-
-		for (auto const* base: resolveDirectBaseContracts(_contract))
-		{
-			std::set<OverrideProxy, OverrideProxy::CompareBySignature> functionsInBase;
-			for (FunctionDefinition const* fun: base->definedFunctions())
-				if (!fun->isConstructor())
-					functionsInBase.emplace(OverrideProxy{fun});
-			for (VariableDeclaration const* var: base->stateVariables())
-				if (var->isPublic())
-					functionsInBase.emplace(OverrideProxy{var});
-
-			result += functionsInBase;
-
-			for (OverrideProxy const& func: inheritedFunctions(*base))
-				if (!functionsInBase.count(func))
-					result.insert(func);
-		}
-
-		m_inheritedFunctions[&_contract] = result;
-	}
-
-	return m_inheritedFunctions[&_contract];
-}
-
-OverrideChecker::OverrideProxyBySignatureMultiSet const& OverrideChecker::inheritedModifiers(ContractDefinition const& _contract) const
-{
-	if (!m_inheritedModifiers.count(&_contract))
-	{
-		OverrideProxyBySignatureMultiSet result;
-
-		for (auto const* base: resolveDirectBaseContracts(_contract))
-		{
-			std::set<OverrideProxy, OverrideProxy::CompareBySignature> modifiersInBase;
-			for (ModifierDefinition const* mod: base->functionModifiers())
-				modifiersInBase.emplace(OverrideProxy{mod});
-
-			for (OverrideProxy const& mod: inheritedModifiers(*base))
-				modifiersInBase.insert(mod);
-
-			result += modifiersInBase;
-		}
-
-		m_inheritedModifiers[&_contract] = result;
-	}
-
-	return m_inheritedModifiers[&_contract];
-}
diff --git a/libsolidity/analysis/OverrideChecker.h b/libsolidity/analysis/OverrideChecker.h
deleted file mode 100644
index 824248325353..000000000000
--- a/libsolidity/analysis/OverrideChecker.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that verifies override properties.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTEnums.h>
-#include <liblangutil/SourceLocation.h>
-#include <map>
-#include <functional>
-#include <set>
-#include <variant>
-#include <optional>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct ErrorId;
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-class FunctionType;
-class ModifierType;
-
-/**
- * Class that represents a function, public state variable or modifier
- * and helps with overload checking.
- * Regular comparison is performed based on AST node, while CompareBySignature
- * results in two elements being equal when they can override each
- * other.
- */
-class OverrideProxy
-{
-public:
-	OverrideProxy() {}
-	explicit OverrideProxy(FunctionDefinition const* _fun): m_item{_fun} {}
-	explicit OverrideProxy(ModifierDefinition const* _mod): m_item{_mod} {}
-	explicit OverrideProxy(VariableDeclaration const* _var): m_item{_var} {}
-
-	bool operator<(OverrideProxy const& _other) const;
-
-	struct CompareBySignature
-	{
-		bool operator()(OverrideProxy const& _a, OverrideProxy const& _b) const;
-	};
-
-	bool isVariable() const;
-	bool isFunction() const;
-	bool isModifier() const;
-
-	size_t id() const;
-	std::shared_ptr<OverrideSpecifier> overrides() const;
-	std::set<OverrideProxy> baseFunctions() const;
-	/// This stores the item in the list of base items.
-	void storeBaseFunction(OverrideProxy const& _base) const;
-
-	std::string const& name() const;
-	ContractDefinition const& contract() const;
-	std::string const& contractName() const;
-	Visibility visibility() const;
-	StateMutability stateMutability() const;
-	bool virtualSemantics() const;
-
-	/// @returns receive / fallback / function (only the latter for modifiers and variables);
-	langutil::Token functionKind() const;
-
-	/// @returns the externally callable function type
-	FunctionType const* externalFunctionType() const;
-	/// @returns the (unmodified) function type
-	FunctionType const* originalFunctionType() const;
-	ModifierType const* modifierType() const;
-
-	Declaration const* declaration() const;
-
-	langutil::SourceLocation const& location() const;
-
-	std::string astNodeName() const;
-	std::string astNodeNameCapitalized() const;
-	std::string distinguishingProperty() const;
-
-	/// @returns true if this AST elements supports the feature of being unimplemented
-	/// and is actually not implemented.
-	bool unimplemented() const;
-
-	/**
-	 * Struct to help comparing override items about whether they override each other.
-	 * Compares functions based on their "externally callable" type.
-	 * Does not produce a total order.
-	 */
-	struct OverrideComparator
-	{
-		std::string name;
-		std::optional<langutil::Token> functionKind;
-		std::optional<std::vector<std::string>> parameterTypes;
-
-		bool operator<(OverrideComparator const& _other) const;
-	};
-
-	/// @returns a structure used to compare override items with regards to whether
-	/// they override each other.
-	OverrideComparator const& overrideComparator() const;
-
-private:
-	std::variant<
-		FunctionDefinition const*,
-		ModifierDefinition const*,
-		VariableDeclaration const*
-	> m_item;
-
-	std::shared_ptr<OverrideComparator> mutable m_comparator;
-};
-
-
-/**
- * Component that verifies override properties.
- */
-class OverrideChecker
-{
-public:
-	using OverrideProxyBySignatureMultiSet = std::multiset<OverrideProxy, OverrideProxy::CompareBySignature>;
-
-	/// @param _errorReporter provides the error logging functionality.
-	explicit OverrideChecker(langutil::ErrorReporter& _errorReporter):
-		m_errorReporter(_errorReporter)
-	{}
-
-	void check(ContractDefinition const& _contract);
-
-	struct CompareByID
-	{
-		bool operator()(ContractDefinition const* _a, ContractDefinition const* _b) const;
-	};
-
-	/// Returns all functions of bases (including public state variables) that have not yet been overwritten.
-	/// May contain the same function multiple times when used with shared bases.
-	OverrideProxyBySignatureMultiSet const& inheritedFunctions(ContractDefinition const& _contract) const;
-	OverrideProxyBySignatureMultiSet const& inheritedModifiers(ContractDefinition const& _contract) const;
-
-private:
-	void checkIllegalOverrides(ContractDefinition const& _contract);
-	/// Performs various checks related to @a _overriding overriding @a _super like
-	/// different return type, invalid visibility change, etc.
-	/// Works on functions, modifiers and public state variables.
-	/// Also stores @a _super as a base function of @a _function in its AST annotations.
-	void checkOverride(OverrideProxy const& _overriding, OverrideProxy const& _super);
-	void overrideListError(
-		OverrideProxy const& _item,
-		std::set<ContractDefinition const*, CompareByID> _secondary,
-		langutil::ErrorId _error,
-		std::string const& _message1,
-		std::string const& _message2
-	);
-	void overrideError(
-		OverrideProxy const& _overriding,
-		OverrideProxy const& _super,
-		langutil::ErrorId _error,
-		std::string const& _message,
-		std::optional<std::string> const& _secondaryMsg = {}
-	);
-	/// Checks for functions in different base contracts which conflict with each
-	/// other and thus need to be overridden explicitly.
-	void checkAmbiguousOverrides(ContractDefinition const& _contract) const;
-	void checkAmbiguousOverridesInternal(std::set<OverrideProxy> _baseCallables, langutil::SourceLocation const& _location) const;
-	/// Resolves an override list of UserDefinedTypeNames to a list of contracts.
-	std::set<ContractDefinition const*, CompareByID> resolveOverrideList(OverrideSpecifier const& _overrides) const;
-
-	void checkOverrideList(OverrideProxy _item, OverrideProxyBySignatureMultiSet const& _inherited);
-
-	langutil::ErrorReporter& m_errorReporter;
-
-	/// Cache for inheritedFunctions().
-	std::map<ContractDefinition const*, OverrideProxyBySignatureMultiSet> mutable m_inheritedFunctions;
-	std::map<ContractDefinition const*, OverrideProxyBySignatureMultiSet> mutable m_inheritedModifiers;
-};
-
-}
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
deleted file mode 100644
index fe3a59d0cc97..000000000000
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/PostTypeChecker.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/Version.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/SemVerHandler.h>
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AST.h>
-
-#include <range/v3/algorithm/any_of.hpp>
-
-#include <memory>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-bool PostTypeChecker::check(ASTNode const& _astRoot)
-{
-	_astRoot.accept(*this);
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-bool PostTypeChecker::finalize()
-{
-	for (auto& checker: m_checkers)
-		checker->finalize();
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-bool PostTypeChecker::visit(ContractDefinition const& _contractDefinition)
-{
-	return callVisit(_contractDefinition);
-}
-
-void PostTypeChecker::endVisit(ContractDefinition const& _contractDefinition)
-{
-	callEndVisit(_contractDefinition);
-}
-
-void PostTypeChecker::endVisit(OverrideSpecifier const& _overrideSpecifier)
-{
-	callEndVisit(_overrideSpecifier);
-}
-
-bool PostTypeChecker::visit(VariableDeclaration const& _variable)
-{
-	return callVisit(_variable);
-}
-
-void PostTypeChecker::endVisit(VariableDeclaration const& _variable)
-{
-	callEndVisit(_variable);
-}
-
-void PostTypeChecker::endVisit(ErrorDefinition const& _error)
-{
-	callEndVisit(_error);
-}
-
-bool PostTypeChecker::visit(EmitStatement const& _emit)
-{
-	return callVisit(_emit);
-}
-
-void PostTypeChecker::endVisit(EmitStatement const& _emit)
-{
-	callEndVisit(_emit);
-}
-
-bool PostTypeChecker::visit(RevertStatement const& _revert)
-{
-	return callVisit(_revert);
-}
-
-void PostTypeChecker::endVisit(RevertStatement const& _revert)
-{
-	callEndVisit(_revert);
-}
-
-bool PostTypeChecker::visit(FunctionCall const& _functionCall)
-{
-	return callVisit(_functionCall);
-}
-
-bool PostTypeChecker::visit(Identifier const& _identifier)
-{
-	return callVisit(_identifier);
-}
-
-bool PostTypeChecker::visit(MemberAccess const& _memberAccess)
-{
-	return callVisit(_memberAccess);
-}
-
-bool PostTypeChecker::visit(StructDefinition const& _struct)
-{
-	return callVisit(_struct);
-}
-
-void PostTypeChecker::endVisit(StructDefinition const& _struct)
-{
-	callEndVisit(_struct);
-}
-
-bool PostTypeChecker::visit(ModifierInvocation const& _modifierInvocation)
-{
-	return callVisit(_modifierInvocation);
-}
-
-void PostTypeChecker::endVisit(ModifierInvocation const& _modifierInvocation)
-{
-	callEndVisit(_modifierInvocation);
-}
-
-
-bool PostTypeChecker::visit(ForStatement const& _forStatement)
-{
-	return callVisit(_forStatement);
-}
-
-void PostTypeChecker::endVisit(ForStatement const& _forStatement)
-{
-	callEndVisit(_forStatement);
-}
-
-namespace
-{
-struct ConstStateVarCircularReferenceChecker: public PostTypeChecker::Checker
-{
-	ConstStateVarCircularReferenceChecker(ErrorReporter& _errorReporter):
-		Checker(_errorReporter) {}
-
-	void finalize() override
-	{
-		solAssert(!m_currentConstVariable, "");
-		for (auto declaration: m_constVariables)
-			if (auto identifier = findCycle(*declaration))
-				m_errorReporter.typeError(
-					6161_error,
-					declaration->location(),
-					"The value of the constant " + declaration->name() +
-					" has a cyclic dependency via " + identifier->name() + "."
-				);
-	}
-
-	bool visit(ContractDefinition const&) override
-	{
-		solAssert(!m_currentConstVariable, "");
-		return true;
-	}
-
-	bool visit(VariableDeclaration const& _variable) override
-	{
-		if (_variable.isConstant())
-		{
-			solAssert(!m_currentConstVariable, "");
-			m_currentConstVariable = &_variable;
-			m_constVariables.push_back(&_variable);
-		}
-		return true;
-	}
-
-	void endVisit(VariableDeclaration const& _variable) override
-	{
-		if (_variable.isConstant())
-		{
-			solAssert(m_currentConstVariable == &_variable, "");
-			m_currentConstVariable = nullptr;
-		}
-	}
-
-	bool visit(Identifier const& _identifier) override
-	{
-		if (m_currentConstVariable)
-			if (auto var = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-				if (var->isConstant())
-					m_constVariableDependencies[m_currentConstVariable].insert(var);
-		return true;
-	}
-
-	bool visit(MemberAccess const& _memberAccess) override
-	{
-		if (m_currentConstVariable)
-			if (auto var = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-				if (var->isConstant())
-					m_constVariableDependencies[m_currentConstVariable].insert(var);
-		return true;
-	}
-
-	VariableDeclaration const* findCycle(VariableDeclaration const& _startingFrom)
-	{
-		auto visitor = [&](VariableDeclaration const& _variable, util::CycleDetector<VariableDeclaration>& _cycleDetector, size_t _depth)
-		{
-			if (_depth >= 256)
-				m_errorReporter.fatalDeclarationError(7380_error, _variable.location(), "Variable definition exhausting cyclic dependency validator.");
-
-			// Iterating through the dependencies needs to be deterministic and thus cannot
-			// depend on the memory layout.
-			// Because of that, we sort by AST node id.
-			std::vector<VariableDeclaration const*> dependencies(
-				m_constVariableDependencies[&_variable].begin(),
-				m_constVariableDependencies[&_variable].end()
-			);
-			sort(dependencies.begin(), dependencies.end(), [](VariableDeclaration const* _a, VariableDeclaration const* _b) -> bool
-			{
-				return _a->id() < _b->id();
-			});
-			for (auto v: dependencies)
-				if (_cycleDetector.run(*v))
-					return;
-		};
-		return util::CycleDetector<VariableDeclaration>(visitor).run(_startingFrom);
-	}
-
-private:
-	VariableDeclaration const* m_currentConstVariable = nullptr;
-	std::map<VariableDeclaration const*, std::set<VariableDeclaration const*>> m_constVariableDependencies;
-	std::vector<VariableDeclaration const*> m_constVariables; ///< Required for determinism.
-};
-
-struct OverrideSpecifierChecker: public PostTypeChecker::Checker
-{
-	OverrideSpecifierChecker(ErrorReporter& _errorReporter):
-		Checker(_errorReporter) {}
-
-	void endVisit(OverrideSpecifier const& _overrideSpecifier) override
-	{
-		for (ASTPointer<IdentifierPath> const& override: _overrideSpecifier.overrides())
-		{
-			Declaration const* decl = override->annotation().referencedDeclaration;
-			solAssert(decl, "Expected declaration to be resolved.");
-
-			if (dynamic_cast<ContractDefinition const*>(decl))
-				continue;
-
-			auto const* typeType = dynamic_cast<TypeType const*>(decl->type());
-			m_errorReporter.typeError(
-				9301_error,
-				override->location(),
-				"Expected contract but got " +
-				(typeType ? typeType->actualType() : decl->type())->toString(true) +
-				"."
-			);
-		}
-	}
-};
-
-struct ModifierContextChecker: public PostTypeChecker::Checker
-{
-	ModifierContextChecker(ErrorReporter& _errorReporter):
-		Checker(_errorReporter) {}
-
-	bool visit(ModifierInvocation const&) override
-	{
-		m_insideModifierInvocation = true;
-
-		return true;
-	}
-
-	void endVisit(ModifierInvocation const&) override
-	{
-		m_insideModifierInvocation = false;
-	}
-
-	bool visit(Identifier const& _identifier) override
-	{
-		if (m_insideModifierInvocation)
-			return true;
-
-		if (ModifierType const* type = dynamic_cast<decltype(type)>(_identifier.annotation().type))
-		{
-			m_errorReporter.typeError(
-				3112_error,
-				_identifier.location(),
-				"Modifier can only be referenced in function headers."
-			);
-		}
-
-		return false;
-	}
-private:
-	/// Flag indicating whether we are currently inside the invocation of a modifier
-	bool m_insideModifierInvocation = false;
-};
-
-struct EventOutsideEmitErrorOutsideRevertChecker: public PostTypeChecker::Checker
-{
-	EventOutsideEmitErrorOutsideRevertChecker(ErrorReporter& _errorReporter):
-		Checker(_errorReporter) {}
-
-	bool visit(EmitStatement const& _emitStatement) override
-	{
-		m_currentStatement = &_emitStatement;
-		return true;
-	}
-
-	void endVisit(EmitStatement const&) override
-	{
-		m_currentStatement = nullptr;
-	}
-
-	bool visit(RevertStatement const& _revertStatement) override
-	{
-		m_currentStatement = &_revertStatement;
-		return true;
-	}
-
-	void endVisit(RevertStatement const&) override
-	{
-		m_currentStatement = nullptr;
-	}
-
-	bool visit(FunctionCall const& _functionCall) override
-	{
-		if (*_functionCall.annotation().kind == FunctionCallKind::FunctionCall)
-			if (auto const* functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type))
-			{
-				// Check for event outside of emit statement
-				if (!dynamic_cast<EmitStatement const*>(m_currentStatement) && functionType->kind() == FunctionType::Kind::Event)
-					m_errorReporter.typeError(
-						3132_error,
-						_functionCall.location(),
-						"Event invocations have to be prefixed by \"emit\"."
-					);
-				else if (!dynamic_cast<RevertStatement const*>(m_currentStatement) && functionType->kind() == FunctionType::Kind::Error)
-					m_errorReporter.typeError(
-						7757_error,
-						_functionCall.location(),
-						"Errors can only be used with revert statements: \"revert MyError();\"."
-					);
-			}
-		m_currentStatement = nullptr;
-
-		return true;
-	}
-
-private:
-	Statement const* m_currentStatement = nullptr;
-};
-
-struct NoVariablesInInterfaceChecker: public PostTypeChecker::Checker
-{
-	NoVariablesInInterfaceChecker(ErrorReporter& _errorReporter):
-		Checker(_errorReporter)
-	{}
-
-	bool visit(VariableDeclaration const& _variable) override
-	{
-		// Forbid any variable declarations inside interfaces unless they are part of
-		// * a function's input/output parameters,
-		// * or inside of a struct definition.
-		if (
-			m_scope && m_scope->isInterface()
-			&& !_variable.isCallableOrCatchParameter()
-			&& !m_insideStruct
-		)
-			m_errorReporter.typeError(8274_error, _variable.location(), "Variables cannot be declared in interfaces.");
-
-		return true;
-	}
-
-	bool visit(ContractDefinition const& _contract) override
-	{
-		m_scope = &_contract;
-		return true;
-	}
-
-	void endVisit(ContractDefinition const&) override
-	{
-		m_scope = nullptr;
-	}
-
-	bool visit(StructDefinition const&) override
-	{
-		solAssert(m_insideStruct >= 0, "");
-		m_insideStruct++;
-		return true;
-	}
-
-	void endVisit(StructDefinition const&) override
-	{
-		m_insideStruct--;
-		solAssert(m_insideStruct >= 0, "");
-	}
-private:
-	ContractDefinition const* m_scope = nullptr;
-	/// Flag indicating whether we are currently inside a StructDefinition.
-	int m_insideStruct = 0;
-};
-
-struct ReservedErrorSelector: public PostTypeChecker::Checker
-{
-	ReservedErrorSelector(ErrorReporter& _errorReporter):
-		Checker(_errorReporter)
-	{}
-
-	void endVisit(ErrorDefinition const& _error) override
-	{
-		if (_error.name() == "Error" || _error.name() == "Panic")
-			m_errorReporter.syntaxError(
-				1855_error,
-				_error.location(),
-				"The built-in errors \"Error\" and \"Panic\" cannot be re-defined."
-			);
-		else
-		{
-			uint32_t selector = util::selectorFromSignatureU32(_error.functionType(true)->externalSignature());
-			if (selector == 0 || ~selector == 0)
-				m_errorReporter.syntaxError(
-					2855_error,
-					_error.location(),
-					"The selector 0x" + util::toHex(toCompactBigEndian(selector, 4)) + " is reserved. Please rename the error to avoid the collision."
-				);
-		}
-	}
-};
-
-class YulLValueChecker : public solidity::yul::ASTWalker
-{
-public:
-	YulLValueChecker(ASTString const& _identifierName): m_identifierName(_identifierName) {}
-	bool willBeWrittenTo() const { return m_willBeWrittenTo; }
-	using solidity::yul::ASTWalker::operator();
-	void operator()(solidity::yul::Assignment const& _assignment) override
-	{
-		if (m_willBeWrittenTo)
-			return;
-
-		if (ranges::any_of(
-			_assignment.variableNames,
-			[&](auto const& yulIdentifier) { return yulIdentifier.name.str() == m_identifierName; }
-		))
-			m_willBeWrittenTo = true;
-	}
-private:
-	ASTString const& m_identifierName;
-	bool m_willBeWrittenTo = false;
-};
-
-class LValueChecker: public ASTConstVisitor
-{
-public:
-	LValueChecker(Identifier const& _identifier):
-		m_declaration(_identifier.annotation().referencedDeclaration)
-	{}
-	bool willBeWrittenTo() const { return m_willBeWrittenTo; }
-	void endVisit(Identifier const& _identifier) override
-	{
-		if (m_willBeWrittenTo)
-			return;
-
-		solAssert(_identifier.annotation().referencedDeclaration);
-		if (
-			*_identifier.annotation().referencedDeclaration == *m_declaration &&
-			_identifier.annotation().willBeWrittenTo
-		)
-			m_willBeWrittenTo = true;
-	}
-	void endVisit(InlineAssembly const& _inlineAssembly) override
-	{
-		if (m_willBeWrittenTo)
-			return;
-
-		YulLValueChecker yulChecker{m_declaration->name()};
-		yulChecker(_inlineAssembly.operations());
-		m_willBeWrittenTo = yulChecker.willBeWrittenTo();
-	}
-private:
-	Declaration const* m_declaration{};
-	bool m_willBeWrittenTo = false;
-};
-
-struct SimpleCounterForLoopChecker: public PostTypeChecker::Checker
-{
-	SimpleCounterForLoopChecker(ErrorReporter& _errorReporter): Checker(_errorReporter) {}
-	bool visit(ForStatement const& _forStatement) override
-	{
-		_forStatement.annotation().isSimpleCounterLoop = isSimpleCounterLoop(_forStatement);
-		return true;
-	}
-	bool isSimpleCounterLoop(ForStatement const& _forStatement) const
-	{
-		auto const* simpleCondition = dynamic_cast<BinaryOperation const*>(_forStatement.condition());
-		if (!simpleCondition || simpleCondition->getOperator() != Token::LessThan || simpleCondition->userDefinedFunctionType())
-			return false;
-		if (!_forStatement.loopExpression())
-			return false;
-
-		auto const* simplePostExpression = dynamic_cast<UnaryOperation const*>(&_forStatement.loopExpression()->expression());
-		// This matches both operators ++i and i++
-		if (!simplePostExpression || simplePostExpression->getOperator() != Token::Inc || simplePostExpression->userDefinedFunctionType())
-			return false;
-
-		auto const* lhsIdentifier = dynamic_cast<Identifier const*>(&simpleCondition->leftExpression());
-		auto const* lhsIntegerType = dynamic_cast<IntegerType const*>(simpleCondition->leftExpression().annotation().type);
-		auto const* commonIntegerType = dynamic_cast<IntegerType const*>(simpleCondition->annotation().commonType);
-
-		if (!lhsIdentifier || !lhsIntegerType || !commonIntegerType || *lhsIntegerType != *commonIntegerType)
-			return false;
-
-		auto const* incExpressionIdentifier = dynamic_cast<Identifier const*>(&simplePostExpression->subExpression());
-		if (
-			!incExpressionIdentifier ||
-			incExpressionIdentifier->annotation().referencedDeclaration != lhsIdentifier->annotation().referencedDeclaration
-		)
-			return false;
-
-		solAssert(incExpressionIdentifier->annotation().referencedDeclaration);
-		if (
-			auto const* incVariableDeclaration = dynamic_cast<VariableDeclaration const*>(
-				incExpressionIdentifier->annotation().referencedDeclaration
-			);
-			incVariableDeclaration &&
-			!incVariableDeclaration->isLocalVariable()
-		)
-			return false;
-
-		solAssert(lhsIdentifier);
-		LValueChecker lValueChecker{*lhsIdentifier};
-		simpleCondition->rightExpression().accept(lValueChecker);
-		if (!lValueChecker.willBeWrittenTo())
-			_forStatement.body().accept(lValueChecker);
-
-		return !lValueChecker.willBeWrittenTo();
-	}
-};
-
-}
-
-
-PostTypeChecker::PostTypeChecker(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter)
-{
-	m_checkers.push_back(std::make_shared<ConstStateVarCircularReferenceChecker>(_errorReporter));
-	m_checkers.push_back(std::make_shared<OverrideSpecifierChecker>(_errorReporter));
-	m_checkers.push_back(std::make_shared<ModifierContextChecker>(_errorReporter));
-	m_checkers.push_back(std::make_shared<EventOutsideEmitErrorOutsideRevertChecker>(_errorReporter));
-	m_checkers.push_back(std::make_shared<NoVariablesInInterfaceChecker>(_errorReporter));
-	m_checkers.push_back(std::make_shared<ReservedErrorSelector>(_errorReporter));
-	m_checkers.push_back(std::make_shared<SimpleCounterForLoopChecker>(_errorReporter));
-}
diff --git a/libsolidity/analysis/PostTypeChecker.h b/libsolidity/analysis/PostTypeChecker.h
deleted file mode 100644
index 178130a35663..000000000000
--- a/libsolidity/analysis/PostTypeChecker.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * This module performs analyses on the AST that are done after type checking and assignments of types:
- *  - whether there are circular references in constant variables
- *  - whether override specifiers are actually contracts
- *  - whether a modifier is in a function header
- *  - whether an event is used outside of an emit statement
- *  - whether a variable is declared in a interface
- *  - whether an error uses a reserved signature
- *
- *  When adding a new checker, make sure a visitor that forwards calls that your
- *  checker uses exists in PostTypeChecker. Add missing ones.
- *
- *  The return value for the visit function of a checker is ignored, all nodes
- *  will always be visited.
- */
-class PostTypeChecker: private ASTConstVisitor
-{
-public:
-	struct Checker: public ASTConstVisitor
-	{
-		Checker(langutil::ErrorReporter& _errorReporter):
-			m_errorReporter(_errorReporter) {}
-
-		/// Called after all source units have been visited.
-		virtual void finalize() {}
-	protected:
-		langutil::ErrorReporter& m_errorReporter;
-	};
-
-	/// @param _errorReporter provides the error logging functionality.
-	PostTypeChecker(langutil::ErrorReporter& _errorReporter);
-
-	bool check(ASTNode const& _astRoot);
-
-	/// Called after all source units have been visited.
-	bool finalize();
-
-private:
-	bool visit(ContractDefinition const& _contract) override;
-	void endVisit(ContractDefinition const& _contract) override;
-	void endVisit(OverrideSpecifier const& _overrideSpecifier) override;
-
-	bool visit(VariableDeclaration const& _variable) override;
-	void endVisit(VariableDeclaration const& _variable) override;
-
-	void endVisit(ErrorDefinition const& _error) override;
-
-	bool visit(EmitStatement const& _emit) override;
-	void endVisit(EmitStatement const& _emit) override;
-
-	bool visit(RevertStatement const& _revert) override;
-	void endVisit(RevertStatement const& _revert) override;
-
-	bool visit(FunctionCall const& _functionCall) override;
-
-	bool visit(Identifier const& _identifier) override;
-	bool visit(MemberAccess const& _identifier) override;
-
-	bool visit(StructDefinition const& _struct) override;
-	void endVisit(StructDefinition const& _struct) override;
-
-	bool visit(ModifierInvocation const& _modifierInvocation) override;
-	void endVisit(ModifierInvocation const& _modifierInvocation) override;
-
-	bool visit(ForStatement const& _forStatement) override;
-	void endVisit(ForStatement const& _forStatement) override;
-
-	template <class T>
-	bool callVisit(T const& _node)
-	{
-		for (auto& checker: m_checkers)
-			checker->visit(_node);
-
-		return true;
-	}
-
-	template <class T>
-	void callEndVisit(T const& _node)
-	{
-		for (auto& checker: m_checkers)
-			checker->endVisit(_node);
-	}
-
-	langutil::ErrorReporter& m_errorReporter;
-
-	std::vector<std::shared_ptr<Checker>> m_checkers;
-};
-
-}
diff --git a/libsolidity/analysis/PostTypeContractLevelChecker.cpp b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
deleted file mode 100644
index 6d8dc416aa00..000000000000
--- a/libsolidity/analysis/PostTypeContractLevelChecker.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that verifies overloads, abstract contracts, function clashes and others
- * checks at contract or function level.
- */
-
-#include <libsolidity/analysis/PostTypeContractLevelChecker.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolutil/FunctionSelector.h>
-#include <liblangutil/ErrorReporter.h>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-bool PostTypeContractLevelChecker::check(SourceUnit const& _sourceUnit)
-{
-	bool noErrors = true;
-	for (auto* contract: ASTNode::filteredNodes<ContractDefinition>(_sourceUnit.nodes()))
-		if (!check(*contract))
-			noErrors = false;
-	return noErrors;
-}
-
-bool PostTypeContractLevelChecker::check(ContractDefinition const& _contract)
-{
-	solAssert(
-		_contract.annotation().creationCallGraph.set() &&
-		_contract.annotation().deployedCallGraph.set(),
-		""
-	);
-
-	std::map<uint32_t, std::map<std::string, SourceLocation>> errorHashes;
-	for (ErrorDefinition const* error: _contract.interfaceErrors())
-	{
-		std::string signature = error->functionType(true)->externalSignature();
-		uint32_t hash = util::selectorFromSignatureU32(signature);
-		// Fail if there is a different signature for the same hash.
-		if (!errorHashes[hash].empty() && !errorHashes[hash].count(signature))
-		{
-			SourceLocation& otherLocation = errorHashes[hash].begin()->second;
-			m_errorReporter.typeError(
-				4883_error,
-				error->nameLocation(),
-				SecondarySourceLocation{}.append("This error has a different signature but the same hash: ", otherLocation),
-				"Error signature hash collision for " + error->functionType(true)->externalSignature()
-			);
-		}
-		else
-			errorHashes[hash][signature] = error->location();
-	}
-
-	return !Error::containsErrors(m_errorReporter.errors());
-}
diff --git a/libsolidity/analysis/PostTypeContractLevelChecker.h b/libsolidity/analysis/PostTypeContractLevelChecker.h
deleted file mode 100644
index e12e37184687..000000000000
--- a/libsolidity/analysis/PostTypeContractLevelChecker.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that verifies properties at contract level, after the type checker has run.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Component that verifies properties at contract level, after the type checker has run.
- */
-class PostTypeContractLevelChecker
-{
-public:
-	explicit PostTypeContractLevelChecker(langutil::ErrorReporter& _errorReporter):
-		m_errorReporter(_errorReporter)
-	{}
-
-	/// Performs checks on the given source ast.
-	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
-	bool check(SourceUnit const& _sourceUnit);
-
-private:
-	/// Performs checks on the given contract.
-	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
-	bool check(ContractDefinition const& _contract);
-
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
deleted file mode 100644
index e680021331a2..000000000000
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Component that resolves type names to types and annotates the AST accordingly.
- */
-
-#include <libsolidity/analysis/ReferencesResolver.h>
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/ast/AST.h>
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AST.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/CommonData.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-
-bool ReferencesResolver::resolve(ASTNode const& _root)
-{
-	auto errorWatcher = m_errorReporter.errorWatcher();
-	_root.accept(*this);
-	return errorWatcher.ok();
-}
-
-bool ReferencesResolver::visit(Block const& _block)
-{
-	if (!m_resolveInsideCode)
-		return false;
-	m_resolver.setScope(&_block);
-	return true;
-}
-
-void ReferencesResolver::endVisit(Block const& _block)
-{
-	if (!m_resolveInsideCode)
-		return;
-
-	m_resolver.setScope(_block.scope());
-}
-
-bool ReferencesResolver::visit(TryCatchClause const& _tryCatchClause)
-{
-	if (!m_resolveInsideCode)
-		return false;
-	m_resolver.setScope(&_tryCatchClause);
-	return true;
-}
-
-void ReferencesResolver::endVisit(TryCatchClause const& _tryCatchClause)
-{
-	if (!m_resolveInsideCode)
-		return;
-
-	m_resolver.setScope(_tryCatchClause.scope());
-}
-
-bool ReferencesResolver::visit(ForStatement const& _for)
-{
-	if (!m_resolveInsideCode)
-		return false;
-	m_resolver.setScope(&_for);
-	return true;
-}
-
-void ReferencesResolver::endVisit(ForStatement const& _for)
-{
-	if (!m_resolveInsideCode)
-		return;
-	m_resolver.setScope(_for.scope());
-}
-
-void ReferencesResolver::endVisit(VariableDeclarationStatement const& _varDeclStatement)
-{
-	if (!m_resolveInsideCode)
-		return;
-	for (auto const& var: _varDeclStatement.declarations())
-		if (var)
-			m_resolver.activateVariable(var->name());
-}
-
-bool ReferencesResolver::visit(VariableDeclaration const& _varDecl)
-{
-	if (_varDecl.documentation())
-		resolveInheritDoc(*_varDecl.documentation(), _varDecl.annotation());
-
-	return true;
-}
-
-bool ReferencesResolver::visit(Identifier const& _identifier)
-{
-	auto declarations = m_resolver.nameFromCurrentScope(_identifier.name());
-	if (declarations.empty())
-	{
-		std::string suggestions = m_resolver.similarNameSuggestions(_identifier.name());
-		std::string errorMessage = "Undeclared identifier.";
-		if (!suggestions.empty())
-		{
-			if ("\"" + _identifier.name() + "\"" == suggestions)
-				errorMessage += " " + std::move(suggestions) + " is not (or not yet) visible at this point.";
-			else
-				errorMessage += " Did you mean " + std::move(suggestions) + "?";
-		}
-		m_errorReporter.declarationError(7576_error, _identifier.location(), errorMessage);
-	}
-	else if (declarations.size() == 1)
-		_identifier.annotation().referencedDeclaration = declarations.front();
-	else
-		_identifier.annotation().candidateDeclarations = declarations;
-	return false;
-}
-
-bool ReferencesResolver::visit(FunctionDefinition const& _functionDefinition)
-{
-	m_returnParameters.push_back(_functionDefinition.returnParameterList().get());
-
-	if (_functionDefinition.documentation())
-		resolveInheritDoc(*_functionDefinition.documentation(), _functionDefinition.annotation());
-
-	return true;
-}
-
-void ReferencesResolver::endVisit(FunctionDefinition const&)
-{
-	solAssert(!m_returnParameters.empty(), "");
-	m_returnParameters.pop_back();
-}
-
-bool ReferencesResolver::visit(ModifierDefinition const& _modifierDefinition)
-{
-	m_returnParameters.push_back(nullptr);
-
-	if (_modifierDefinition.documentation())
-		resolveInheritDoc(*_modifierDefinition.documentation(), _modifierDefinition.annotation());
-
-	return true;
-}
-
-void ReferencesResolver::endVisit(ModifierDefinition const&)
-{
-	solAssert(!m_returnParameters.empty(), "");
-	m_returnParameters.pop_back();
-}
-
-void ReferencesResolver::endVisit(IdentifierPath const& _path)
-{
-	// Note that library/functions names in "using {} for" directive are resolved separately in visit(UsingForDirective)
-	std::vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(_path.path());
-	if (declarations.empty())
-	{
-		m_errorReporter.fatalDeclarationError(7920_error, _path.location(), "Identifier not found or not unique.");
-		return;
-	}
-
-	_path.annotation().referencedDeclaration = declarations.back();
-	_path.annotation().pathDeclarations = std::move(declarations);
-}
-
-bool ReferencesResolver::visit(UsingForDirective const& _usingFor)
-{
-	for (ASTPointer<IdentifierPath> const& path: _usingFor.functionsOrLibrary())
-	{
-		// _includeInvisibles is enabled here because external library functions are marked invisible.
-		// As unintended side-effects other invisible names (eg.: super, this) may be returned as well.
-		// DeclarationTypeChecker should detect and report such situations.
-		std::vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(path->path(), true /* _includeInvisibles */);
-		if (declarations.empty())
-		{
-			std::string libraryOrFunctionNameErrorMessage =
-				_usingFor.usesBraces() ?
-				"Identifier is not a function name or not unique." :
-				"Identifier is not a library name.";
-			m_errorReporter.fatalDeclarationError(
-				9589_error,
-				path->location(),
-				libraryOrFunctionNameErrorMessage
-			);
-			break;
-		}
-
-		path->annotation().referencedDeclaration = declarations.back();
-		path->annotation().pathDeclarations = std::move(declarations);
-	}
-
-	if (_usingFor.typeName())
-		_usingFor.typeName()->accept(*this);
-
-	return false;
-}
-
-bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
-{
-	m_yulAnnotation = &_inlineAssembly.annotation();
-	(*this)(_inlineAssembly.operations());
-	m_yulAnnotation = nullptr;
-
-	return false;
-}
-
-bool ReferencesResolver::visit(Return const& _return)
-{
-	solAssert(!m_returnParameters.empty(), "");
-	_return.annotation().functionReturnParameters = m_returnParameters.back();
-	return true;
-}
-
-void ReferencesResolver::operator()(yul::FunctionDefinition const& _function)
-{
-	solAssert(nativeLocationOf(_function) == originLocationOf(_function), "");
-	validateYulIdentifierName(_function.name, nativeLocationOf(_function));
-	for (yul::TypedName const& varName: _function.parameters + _function.returnVariables)
-	{
-		solAssert(nativeLocationOf(varName) == originLocationOf(varName), "");
-		validateYulIdentifierName(varName.name, nativeLocationOf(varName));
-	}
-
-	bool wasInsideFunction = m_yulInsideFunction;
-	m_yulInsideFunction = true;
-	this->operator()(_function.body);
-	m_yulInsideFunction = wasInsideFunction;
-}
-
-void ReferencesResolver::operator()(yul::Identifier const& _identifier)
-{
-	solAssert(nativeLocationOf(_identifier) == originLocationOf(_identifier), "");
-
-	static std::set<std::string> suffixes{"slot", "offset", "length", "address", "selector"};
-	std::string suffix;
-	for (std::string const& s: suffixes)
-		if (boost::algorithm::ends_with(_identifier.name.str(), "." + s))
-			suffix = s;
-
-	// Could also use `pathFromCurrentScope`, split by '.'.
-	// If we do that, suffix should only be set for when it has a special
-	// meaning, not for normal identifierPaths.
-	auto declarations = m_resolver.nameFromCurrentScope(_identifier.name.str());
-	if (!suffix.empty())
-	{
-		// special mode to access storage variables
-		if (!declarations.empty())
-			// the special identifier exists itself, we should not allow that.
-			return;
-		std::string realName = _identifier.name.str().substr(0, _identifier.name.str().size() - suffix.size() - 1);
-		solAssert(!realName.empty(), "Empty name.");
-		declarations = m_resolver.nameFromCurrentScope(realName);
-		if (!declarations.empty())
-			// To support proper path resolution, we have to use pathFromCurrentScope.
-			solAssert(!util::contains(realName, '.'), "");
-	}
-	if (declarations.size() > 1)
-	{
-		m_errorReporter.declarationError(
-			4718_error,
-			nativeLocationOf(_identifier),
-			"Multiple matching identifiers. Resolving overloaded identifiers is not supported."
-		);
-		return;
-	}
-	else if (declarations.size() == 0)
-	{
-		if (
-			boost::algorithm::ends_with(_identifier.name.str(), "_slot") ||
-			boost::algorithm::ends_with(_identifier.name.str(), "_offset")
-		)
-			m_errorReporter.declarationError(
-				9467_error,
-				nativeLocationOf(_identifier),
-				"Identifier not found. Use \".slot\" and \".offset\" to access storage variables."
-			);
-		return;
-	}
-	if (auto var = dynamic_cast<VariableDeclaration const*>(declarations.front()))
-		if (var->isLocalVariable() && m_yulInsideFunction)
-		{
-			m_errorReporter.declarationError(
-				6578_error,
-				nativeLocationOf(_identifier),
-				"Cannot access local Solidity variables from inside an inline assembly function."
-			);
-			return;
-		}
-
-	m_yulAnnotation->externalReferences[&_identifier].suffix = std::move(suffix);
-	m_yulAnnotation->externalReferences[&_identifier].declaration = declarations.front();
-}
-
-void ReferencesResolver::operator()(yul::VariableDeclaration const& _varDecl)
-{
-	for (auto const& identifier: _varDecl.variables)
-	{
-		solAssert(nativeLocationOf(identifier) == originLocationOf(identifier), "");
-		validateYulIdentifierName(identifier.name, nativeLocationOf(identifier));
-
-		if (
-			auto declarations = m_resolver.nameFromCurrentScope(identifier.name.str());
-			!declarations.empty()
-		)
-		{
-			SecondarySourceLocation ssl;
-			for (auto const* decl: declarations)
-				ssl.append("The shadowed declaration is here:", decl->location());
-			if (!ssl.infos.empty())
-				m_errorReporter.declarationError(
-					3859_error,
-					nativeLocationOf(identifier),
-					ssl,
-					"This declaration shadows a declaration outside the inline assembly block."
-				);
-		}
-	}
-
-	if (_varDecl.value)
-		visit(*_varDecl.value);
-}
-
-void ReferencesResolver::resolveInheritDoc(StructuredDocumentation const& _documentation, StructurallyDocumentedAnnotation& _annotation)
-{
-	switch (_annotation.docTags.count("inheritdoc"))
-	{
-	case 0:
-		break;
-	case 1:
-	{
-		std::string const& name = _annotation.docTags.find("inheritdoc")->second.content;
-		if (name.empty())
-		{
-			m_errorReporter.docstringParsingError(
-				1933_error,
-				_documentation.location(),
-				"Expected contract name following documentation tag @inheritdoc."
-			);
-			return;
-		}
-
-		std::vector<std::string> path;
-		boost::split(path, name, boost::is_any_of("."));
-		if (any_of(path.begin(), path.end(), [](auto& _str) { return _str.empty(); }))
-		{
-			m_errorReporter.docstringParsingError(
-				5967_error,
-				_documentation.location(),
-				"Documentation tag @inheritdoc reference \"" +
-				name +
-				"\" is malformed."
-			);
-			return;
-		}
-		Declaration const* result = m_resolver.pathFromCurrentScope(path);
-
-		if (result == nullptr)
-		{
-			m_errorReporter.docstringParsingError(
-				9397_error,
-				_documentation.location(),
-				"Documentation tag @inheritdoc references inexistent contract \"" +
-				name +
-				"\"."
-			);
-			return;
-		}
-		else
-		{
-			_annotation.inheritdocReference = dynamic_cast<ContractDefinition const*>(result);
-
-			if (!_annotation.inheritdocReference)
-				m_errorReporter.docstringParsingError(
-					1430_error,
-					_documentation.location(),
-					"Documentation tag @inheritdoc reference \"" +
-					name +
-					"\" is not a contract."
-				);
-		}
-		break;
-	}
-	default:
-		m_errorReporter.docstringParsingError(
-			5142_error,
-			_documentation.location(),
-			"Documentation tag @inheritdoc can only be given once."
-		);
-		break;
-	}
-}
-
-void ReferencesResolver::validateYulIdentifierName(yul::YulString _name, SourceLocation const& _location)
-{
-	if (util::contains(_name.str(), '.'))
-		m_errorReporter.declarationError(
-			3927_error,
-			_location,
-			"User-defined identifiers in inline assembly cannot contain '.'."
-		);
-
-	if (std::set<std::string>{"this", "super", "_"}.count(_name.str()))
-		m_errorReporter.declarationError(
-			4113_error,
-			_location,
-			"The identifier name \"" + _name.str() + "\" is reserved."
-		);
-}
diff --git a/libsolidity/analysis/ReferencesResolver.h b/libsolidity/analysis/ReferencesResolver.h
deleted file mode 100644
index 512a681b456b..000000000000
--- a/libsolidity/analysis/ReferencesResolver.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Component that resolves type names to types and annotates the AST accordingly.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <liblangutil/EVMVersion.h>
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <list>
-#include <map>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-
-class NameAndTypeResolver;
-
-/**
- * Resolves references to declarations (of variables and types) and also establishes the link
- * between a return statement and the return parameter list.
- */
-class ReferencesResolver: private ASTConstVisitor, private yul::ASTWalker
-{
-public:
-	ReferencesResolver(
-		langutil::ErrorReporter& _errorReporter,
-		NameAndTypeResolver& _resolver,
-		langutil::EVMVersion _evmVersion,
-		bool _resolveInsideCode = false
-	):
-		m_errorReporter(_errorReporter),
-		m_resolver(_resolver),
-		m_evmVersion(_evmVersion),
-		m_resolveInsideCode(_resolveInsideCode)
-	{}
-
-	/// @returns true if no errors during resolving and throws exceptions on fatal errors.
-	bool resolve(ASTNode const& _root);
-
-private:
-	using yul::ASTWalker::visit;
-	using yul::ASTWalker::operator();
-
-	bool visit(Block const& _block) override;
-	void endVisit(Block const& _block) override;
-	bool visit(TryCatchClause const& _tryCatchClause) override;
-	void endVisit(TryCatchClause const& _tryCatchClause) override;
-	bool visit(ForStatement const& _for) override;
-	void endVisit(ForStatement const& _for) override;
-	void endVisit(VariableDeclarationStatement const& _varDeclStatement) override;
-	bool visit(VariableDeclaration const& _varDecl) override;
-	bool visit(Identifier const& _identifier) override;
-	bool visit(FunctionDefinition const& _functionDefinition) override;
-	void endVisit(FunctionDefinition const& _functionDefinition) override;
-	bool visit(ModifierDefinition const& _modifierDefinition) override;
-	void endVisit(ModifierDefinition const& _modifierDefinition) override;
-	void endVisit(IdentifierPath const& _path) override;
-	bool visit(InlineAssembly const& _inlineAssembly) override;
-	bool visit(Return const& _return) override;
-	bool visit(UsingForDirective const& _usingFor) override;
-
-	void operator()(yul::FunctionDefinition const& _function) override;
-	void operator()(yul::Identifier const& _identifier) override;
-	void operator()(yul::VariableDeclaration const& _varDecl) override;
-
-	void resolveInheritDoc(StructuredDocumentation const& _documentation, StructurallyDocumentedAnnotation& _annotation);
-
-	/// Checks if the name contains a '.'.
-	void validateYulIdentifierName(yul::YulString _name, langutil::SourceLocation const& _location);
-
-	langutil::ErrorReporter& m_errorReporter;
-	NameAndTypeResolver& m_resolver;
-	langutil::EVMVersion m_evmVersion;
-	/// Stack of return parameters.
-	std::vector<ParameterList const*> m_returnParameters;
-	bool const m_resolveInsideCode;
-
-	InlineAssemblyAnnotation* m_yulAnnotation = nullptr;
-	bool m_yulInsideFunction = false;
-};
-
-}
diff --git a/libsolidity/analysis/Scoper.cpp b/libsolidity/analysis/Scoper.cpp
deleted file mode 100644
index a14ca4559751..000000000000
--- a/libsolidity/analysis/Scoper.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/Scoper.h>
-
-#include <libsolidity/ast/AST.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-void Scoper::assignScopes(ASTNode const& _astRoot)
-{
-	Scoper scoper;
-	_astRoot.accept(scoper);
-}
-
-bool Scoper::visit(ContractDefinition const& _contract)
-{
-	solAssert(m_contract == nullptr, "");
-	m_contract = &_contract;
-	return ASTConstVisitor::visit(_contract);
-}
-
-void Scoper::endVisit(ContractDefinition const& _contract)
-{
-	solAssert(m_contract == &_contract, "");
-	m_contract = nullptr;
-	ASTConstVisitor::endVisit(_contract);
-}
-
-bool Scoper::visitNode(ASTNode const& _node)
-{
-	if (auto const* scopable = dynamic_cast<Scopable const*>(&_node))
-	{
-		scopable->annotation().scope = m_scopes.empty() ? nullptr : m_scopes.back();
-		scopable->annotation().contract = m_contract;
-	}
-	if (dynamic_cast<ScopeOpener const*>(&_node))
-		m_scopes.push_back(&_node);
-	return true;
-}
-
-void Scoper::endVisitNode(ASTNode const& _node)
-{
-	if (dynamic_cast<ScopeOpener const*>(&_node))
-		m_scopes.pop_back();
-}
diff --git a/libsolidity/analysis/Scoper.h b/libsolidity/analysis/Scoper.h
deleted file mode 100644
index c55e58040acd..000000000000
--- a/libsolidity/analysis/Scoper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::frontend
-{
-
-/**
- * AST visitor that assigns syntactic scopes.
- */
-class Scoper: private ASTConstVisitor
-{
-public:
-	static void assignScopes(ASTNode const& _astRoot);
-
-private:
-	bool visit(ContractDefinition const& _contract) override;
-	void endVisit(ContractDefinition const& _contract) override;
-	bool visitNode(ASTNode const& _node) override;
-	void endVisitNode(ASTNode const& _node) override;
-
-	ContractDefinition const* m_contract = nullptr;
-	std::vector<ASTNode const*> m_scopes;
-};
-
-}
diff --git a/libsolidity/analysis/StaticAnalyzer.cpp b/libsolidity/analysis/StaticAnalyzer.cpp
deleted file mode 100644
index 10c2c922ca47..000000000000
--- a/libsolidity/analysis/StaticAnalyzer.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Federico Bond <federicobond@gmail.com>
- * @date 2016
- * Static analyzer and checker.
- */
-
-#include <libsolidity/analysis/StaticAnalyzer.h>
-
-#include <libsolidity/analysis/ConstantEvaluator.h>
-#include <libsolidity/ast/AST.h>
-#include <liblangutil/ErrorReporter.h>
-#include <memory>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-/**
- * Helper class that determines whether a contract's constructor uses inline assembly.
- */
-class solidity::frontend::ConstructorUsesAssembly
-{
-public:
-	/// @returns true if and only if the contract's or any of its bases' constructors
-	/// use inline assembly.
-	bool check(ContractDefinition const& _contract)
-	{
-		for (auto const* base: _contract.annotation().linearizedBaseContracts)
-			if (checkInternal(*base))
-				return true;
-		return false;
-	}
-
-
-private:
-	class Checker: public ASTConstVisitor
-	{
-	public:
-		Checker(FunctionDefinition const& _f) { _f.accept(*this); }
-		bool visit(InlineAssembly const&) override { assemblySeen = true; return false; }
-		bool assemblySeen = false;
-	};
-
-	bool checkInternal(ContractDefinition const& _contract)
-	{
-		if (!m_usesAssembly.count(&_contract))
-		{
-			bool usesAssembly = false;
-			if (_contract.constructor())
-				usesAssembly = Checker{*_contract.constructor()}.assemblySeen;
-			m_usesAssembly[&_contract] = usesAssembly;
-		}
-		return m_usesAssembly[&_contract];
-	}
-
-	std::map<ContractDefinition const*, bool> m_usesAssembly;
-};
-
-StaticAnalyzer::StaticAnalyzer(ErrorReporter& _errorReporter):
-	m_errorReporter(_errorReporter)
-{
-}
-
-StaticAnalyzer::~StaticAnalyzer()
-{
-}
-
-bool StaticAnalyzer::analyze(SourceUnit const& _sourceUnit)
-{
-	_sourceUnit.accept(*this);
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-bool StaticAnalyzer::visit(ContractDefinition const& _contract)
-{
-	m_library = _contract.isLibrary();
-	m_currentContract = &_contract;
-	return true;
-}
-
-void StaticAnalyzer::endVisit(ContractDefinition const&)
-{
-	m_library = false;
-	m_currentContract = nullptr;
-}
-
-bool StaticAnalyzer::visit(FunctionDefinition const& _function)
-{
-	if (_function.isImplemented())
-		m_currentFunction = &_function;
-	else
-		solAssert(!m_currentFunction, "");
-	solAssert(m_localVarUseCount.empty(), "");
-	m_constructor = _function.isConstructor();
-	return true;
-}
-
-void StaticAnalyzer::endVisit(FunctionDefinition const&)
-{
-	if (m_currentFunction && !m_currentFunction->body().statements().empty())
-		for (auto const& var: m_localVarUseCount)
-			if (var.second == 0)
-			{
-				if (var.first.second->isCallableOrCatchParameter())
-					m_errorReporter.warning(
-						5667_error,
-						var.first.second->location(),
-						"Unused " +
-						std::string(var.first.second->isTryCatchParameter() ? "try/catch" : "function") +
-						" parameter. Remove or comment out the variable name to silence this warning."
-					);
-				else
-					m_errorReporter.warning(2072_error, var.first.second->location(), "Unused local variable.");
-			}
-	m_localVarUseCount.clear();
-	m_constructor = false;
-	m_currentFunction = nullptr;
-}
-
-bool StaticAnalyzer::visit(Identifier const& _identifier)
-{
-	if (m_currentFunction)
-		if (auto var = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-		{
-			solAssert(!var->name().empty(), "");
-			if (var->isLocalVariable())
-				m_localVarUseCount[std::make_pair(var->id(), var)] += 1;
-		}
-	return true;
-}
-
-bool StaticAnalyzer::visit(VariableDeclaration const& _variable)
-{
-	if (m_currentFunction)
-	{
-		solAssert(_variable.isLocalVariable(), "");
-		if (_variable.name() != "")
-			// This is not a no-op, the entry might pre-exist.
-			m_localVarUseCount[std::make_pair(_variable.id(), &_variable)] += 0;
-	}
-
-	if (_variable.isStateVariable() || _variable.referenceLocation() == VariableDeclaration::Location::Storage)
-		if (auto varType = dynamic_cast<CompositeType const*>(_variable.annotation().type))
-			for (Type const* type: varType->fullDecomposition())
-				if (type->storageSizeUpperBound() >= (bigint(1) << 64))
-				{
-					std::string message = "Type " + type->toString(true) +
-						" covers a large part of storage and thus makes collisions likely."
-						" Either use mappings or dynamic arrays and allow their size to be increased only"
-						" in small quantities per transaction.";
-					m_errorReporter.warning(7325_error, _variable.typeName().location(), message);
-				}
-
-	return true;
-}
-
-bool StaticAnalyzer::visit(Return const& _return)
-{
-	// If the return has an expression, it counts as
-	// a "use" of the return parameters.
-	if (m_currentFunction && _return.expression())
-		for (auto const& var: m_currentFunction->returnParameters())
-			if (!var->name().empty())
-				m_localVarUseCount[std::make_pair(var->id(), var.get())] += 1;
-	return true;
-}
-
-bool StaticAnalyzer::visit(ExpressionStatement const& _statement)
-{
-	if (*_statement.expression().annotation().isPure)
-		m_errorReporter.warning(
-			6133_error,
-			_statement.location(),
-			"Statement has no effect."
-		);
-
-	return true;
-}
-
-bool StaticAnalyzer::visit(MemberAccess const& _memberAccess)
-{
-	if (MagicType const* type = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type))
-	{
-		if (type->kind() == MagicType::Kind::Message && _memberAccess.memberName() == "gas")
-			m_errorReporter.typeError(
-				1400_error,
-				_memberAccess.location(),
-				"\"msg.gas\" has been deprecated in favor of \"gasleft()\""
-			);
-		else if (type->kind() == MagicType::Kind::Block && _memberAccess.memberName() == "blockhash")
-			m_errorReporter.typeError(
-				8113_error,
-				_memberAccess.location(),
-				"\"block.blockhash()\" has been deprecated in favor of \"blockhash()\""
-			);
-		else if (type->kind() == MagicType::Kind::MetaType && _memberAccess.memberName() == "runtimeCode")
-		{
-			if (!m_constructorUsesAssembly)
-				m_constructorUsesAssembly = std::make_unique<ConstructorUsesAssembly>();
-			ContractType const& contract = dynamic_cast<ContractType const&>(*type->typeArgument());
-			if (m_constructorUsesAssembly->check(contract.contractDefinition()))
-				m_errorReporter.warning(
-					6417_error,
-					_memberAccess.location(),
-					"The constructor of the contract (or its base) uses inline assembly. "
-					"Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode."
-				);
-		}
-		else if (
-			m_currentFunction &&
-			m_currentFunction->isReceive() &&
-			type->kind() == MagicType::Kind::Message &&
-			_memberAccess.memberName() == "data"
-		)
-			m_errorReporter.typeError(
-				7139_error,
-				_memberAccess.location(),
-				R"("msg.data" cannot be used inside of "receive" function.)"
-			);
-	}
-
-	if (_memberAccess.memberName() == "callcode")
-		if (auto const* type = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type))
-			if (type->kind() == FunctionType::Kind::BareCallCode)
-				m_errorReporter.typeError(
-					2256_error,
-					_memberAccess.location(),
-					"\"callcode\" has been deprecated in favour of \"delegatecall\"."
-				);
-
-	if (m_constructor)
-	{
-		auto const* expr = &_memberAccess.expression();
-		while (expr)
-		{
-			if (auto id = dynamic_cast<Identifier const*>(expr))
-			{
-				if (id->name() == "this")
-					m_errorReporter.warning(
-						5805_error,
-						id->location(),
-						"\"this\" used in constructor. "
-						"Note that external functions of a contract "
-						"cannot be called while it is being constructed.");
-				break;
-			}
-			else if (auto tuple = dynamic_cast<TupleExpression const*>(expr))
-			{
-				if (tuple->components().size() == 1)
-					expr = tuple->components().front().get();
-				else
-					break;
-			}
-			else
-				break;
-		}
-	}
-
-	return true;
-}
-
-bool StaticAnalyzer::visit(InlineAssembly const& _inlineAssembly)
-{
-	if (!m_currentFunction)
-		return true;
-
-	for (auto const& ref: _inlineAssembly.annotation().externalReferences)
-	{
-		if (auto var = dynamic_cast<VariableDeclaration const*>(ref.second.declaration))
-		{
-			solAssert(!var->name().empty(), "");
-			if (var->isLocalVariable())
-				m_localVarUseCount[std::make_pair(var->id(), var)] += 1;
-		}
-	}
-
-	return true;
-}
-
-bool StaticAnalyzer::visit(BinaryOperation const& _operation)
-{
-	if (
-		*_operation.rightExpression().annotation().isPure &&
-		(_operation.getOperator() == Token::Div || _operation.getOperator() == Token::Mod)
-	)
-		if (auto rhs = ConstantEvaluator::evaluate(m_errorReporter, _operation.rightExpression()))
-			if (rhs->value == 0)
-				m_errorReporter.typeError(
-					1211_error,
-					_operation.location(),
-					(_operation.getOperator() == Token::Div) ? "Division by zero." : "Modulo zero."
-				);
-
-	return true;
-}
-
-bool StaticAnalyzer::visit(FunctionCall const& _functionCall)
-{
-	if (*_functionCall.annotation().kind == FunctionCallKind::FunctionCall)
-	{
-		auto functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type);
-		solAssert(functionType, "");
-		if (functionType->kind() == FunctionType::Kind::AddMod || functionType->kind() == FunctionType::Kind::MulMod)
-		{
-			solAssert(_functionCall.arguments().size() == 3, "");
-			if (*_functionCall.arguments()[2]->annotation().isPure)
-				if (auto lastArg = ConstantEvaluator::evaluate(m_errorReporter, *(_functionCall.arguments())[2]))
-					if (lastArg->value == 0)
-						m_errorReporter.typeError(
-							4195_error,
-							_functionCall.location(),
-							"Arithmetic modulo zero."
-						);
-		}
-		if (
-			m_currentContract &&
-			m_currentContract->isLibrary() &&
-			functionType->kind() == FunctionType::Kind::DelegateCall &&
-			functionType->declaration().scope() == m_currentContract
-		)
-			m_errorReporter.typeError(
-				6700_error,
-				_functionCall.location(),
-				SecondarySourceLocation().append(
-					"The function declaration is here:",
-					functionType->declaration().scope()->location()
-				),
-				"Libraries cannot call their own functions externally."
-			);
-	}
-	return true;
-}
diff --git a/libsolidity/analysis/StaticAnalyzer.h b/libsolidity/analysis/StaticAnalyzer.h
deleted file mode 100644
index dc6263d7e583..000000000000
--- a/libsolidity/analysis/StaticAnalyzer.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Federico Bond <federicobond@gmail.com>
- * @date 2016
- * Static analyzer and checker.
- */
-
-#pragma once
-
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-class ConstructorUsesAssembly;
-
-
-/**
- * The module that performs static analysis on the AST.
- * In this context, static analysis is anything that can produce warnings which can help
- * programmers write cleaner code. For every warning generated here, it has to be possible to write
- * equivalent code that does not generate the warning.
- */
-class StaticAnalyzer: private ASTConstVisitor
-{
-public:
-	/// @param _errorReporter provides the error logging functionality.
-	explicit StaticAnalyzer(langutil::ErrorReporter& _errorReporter);
-	~StaticAnalyzer() override;
-
-	/// Performs static analysis on the given source unit and all of its sub-nodes.
-	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
-	bool analyze(SourceUnit const& _sourceUnit);
-
-private:
-
-	bool visit(ContractDefinition const& _contract) override;
-	void endVisit(ContractDefinition const& _contract) override;
-
-	bool visit(FunctionDefinition const& _function) override;
-	void endVisit(FunctionDefinition const& _function) override;
-
-	bool visit(ExpressionStatement const& _statement) override;
-	bool visit(VariableDeclaration const& _variable) override;
-	bool visit(Identifier const& _identifier) override;
-	bool visit(Return const& _return) override;
-	bool visit(MemberAccess const& _memberAccess) override;
-	bool visit(InlineAssembly const& _inlineAssembly) override;
-	bool visit(BinaryOperation const& _operation) override;
-	bool visit(FunctionCall const& _functionCall) override;
-
-	langutil::ErrorReporter& m_errorReporter;
-
-	/// Flag that indicates whether the current contract definition is a library.
-	bool m_library = false;
-
-	/// Number of uses of each (named) local variable in a function, counter is initialized with zero.
-	/// Pairs of AST ids and pointers are used as keys to ensure a deterministic order
-	/// when traversing.
-	std::map<std::pair<size_t, VariableDeclaration const*>, int> m_localVarUseCount;
-
-	/// Cache that holds information about whether a contract's constructor
-	/// uses inline assembly.
-	std::unique_ptr<ConstructorUsesAssembly> m_constructorUsesAssembly;
-
-	FunctionDefinition const* m_currentFunction = nullptr;
-
-	/// Flag that indicates a constructor.
-	bool m_constructor = false;
-
-	/// Current contract.
-	ContractDefinition const* m_currentContract = nullptr;
-};
-
-}
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
deleted file mode 100644
index b2dd73cc244c..000000000000
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/SyntaxChecker.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ExperimentalFeatures.h>
-#include <libsolidity/interface/Version.h>
-
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/AST.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/SemVerHandler.h>
-
-#include <libsolutil/UTF8.h>
-
-#include <string>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::util;
-
-bool SyntaxChecker::checkSyntax(ASTNode const& _astRoot)
-{
-	_astRoot.accept(*this);
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-bool SyntaxChecker::visit(SourceUnit const& _sourceUnit)
-{
-	m_versionPragmaFound = false;
-	m_sourceUnit = &_sourceUnit;
-	return true;
-}
-
-void SyntaxChecker::endVisit(SourceUnit const& _sourceUnit)
-{
-	if (!m_versionPragmaFound)
-	{
-		std::string errorString("Source file does not specify required compiler version!");
-		SemVerVersion recommendedVersion{std::string(VersionString)};
-		if (!recommendedVersion.isPrerelease())
-			errorString +=
-				" Consider adding \"pragma solidity ^" +
-				std::to_string(recommendedVersion.major()) +
-				std::string(".") +
-				std::to_string(recommendedVersion.minor()) +
-				std::string(".") +
-				std::to_string(recommendedVersion.patch()) +
-				std::string(";\"");
-
-		// when reporting the warning, print the source name only
-		m_errorReporter.warning(3420_error, {-1, -1, _sourceUnit.location().sourceName}, errorString);
-	}
-	if (!m_sourceUnit->annotation().useABICoderV2.set())
-		m_sourceUnit->annotation().useABICoderV2 = true;
-	m_sourceUnit = nullptr;
-}
-
-bool SyntaxChecker::visit(PragmaDirective const& _pragma)
-{
-	solAssert(!_pragma.tokens().empty(), "");
-	solAssert(_pragma.tokens().size() == _pragma.literals().size(), "");
-	if (_pragma.tokens()[0] != Token::Identifier)
-		m_errorReporter.syntaxError(5226_error, _pragma.location(), "Invalid pragma \"" + _pragma.literals()[0] + "\"");
-	else if (_pragma.literals()[0] == "experimental")
-	{
-		solAssert(m_sourceUnit, "");
-		std::vector<std::string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
-		if (literals.empty())
-			m_errorReporter.syntaxError(
-				9679_error,
-				_pragma.location(),
-				"Experimental feature name is missing."
-			);
-		else if (literals.size() > 1)
-			m_errorReporter.syntaxError(
-				6022_error,
-				_pragma.location(),
-				"Stray arguments."
-			);
-		else
-		{
-			std::string const literal = literals[0];
-			if (literal.empty())
-				m_errorReporter.syntaxError(3250_error, _pragma.location(), "Empty experimental feature name is invalid.");
-			else if (!ExperimentalFeatureNames.count(literal))
-				m_errorReporter.syntaxError(8491_error, _pragma.location(), "Unsupported experimental feature name.");
-			else if (m_sourceUnit->annotation().experimentalFeatures.count(ExperimentalFeatureNames.at(literal)))
-				m_errorReporter.syntaxError(1231_error, _pragma.location(), "Duplicate experimental feature name.");
-			else
-			{
-				auto feature = ExperimentalFeatureNames.at(literal);
-				m_sourceUnit->annotation().experimentalFeatures.insert(feature);
-				if (!ExperimentalFeatureWithoutWarning.count(feature))
-					m_errorReporter.warning(2264_error, _pragma.location(), "Experimental features are turned on. Do not use experimental features on live deployments.");
-
-				if (feature == ExperimentalFeature::ABIEncoderV2)
-				{
-					if (m_sourceUnit->annotation().useABICoderV2.set())
-					{
-						if (!*m_sourceUnit->annotation().useABICoderV2)
-							m_errorReporter.syntaxError(
-								8273_error,
-								_pragma.location(),
-								"ABI coder v1 has already been selected through \"pragma abicoder v1\"."
-							);
-					}
-					else
-						m_sourceUnit->annotation().useABICoderV2 = true;
-				}
-			}
-		}
-	}
-	else if (_pragma.literals()[0] == "abicoder")
-	{
-		solAssert(m_sourceUnit, "");
-		if (
-			_pragma.literals().size() != 2 ||
-			!std::set<std::string>{"v1", "v2"}.count(_pragma.literals()[1])
-		)
-			m_errorReporter.syntaxError(
-				2745_error,
-				_pragma.location(),
-				"Expected either \"pragma abicoder v1\" or \"pragma abicoder v2\"."
-			);
-		else if (m_sourceUnit->annotation().useABICoderV2.set())
-			m_errorReporter.syntaxError(
-				3845_error,
-				_pragma.location(),
-				"ABI coder has already been selected for this source unit."
-			);
-		else
-			m_sourceUnit->annotation().useABICoderV2 = (_pragma.literals()[1] == "v2");
-	}
-	else if (_pragma.literals()[0] == "solidity")
-	{
-		try
-		{
-			std::vector<Token> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());
-			std::vector<std::string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
-			SemVerMatchExpressionParser parser(tokens, literals);
-			SemVerMatchExpression matchExpression = parser.parse();
-			static SemVerVersion const currentVersion{std::string(VersionString)};
-			solAssert(matchExpression.matches(currentVersion));
-			m_versionPragmaFound = true;
-		}
-		catch (SemVerError const&)
-		{
-			// An unparsable version pragma is an unrecoverable fatal error in the parser.
-			solAssert(false);
-		}
-	}
-	else
-		m_errorReporter.syntaxError(4936_error, _pragma.location(), "Unknown pragma \"" + _pragma.literals()[0] + "\"");
-
-	return true;
-}
-
-bool SyntaxChecker::visit(ModifierDefinition const&)
-{
-	m_placeholderFound = false;
-	return true;
-}
-
-void SyntaxChecker::endVisit(ModifierDefinition const& _modifier)
-{
-	if (_modifier.isImplemented() && !m_placeholderFound)
-		m_errorReporter.syntaxError(2883_error, _modifier.body().location(), "Modifier body does not contain '_'.");
-	m_placeholderFound = false;
-}
-
-void SyntaxChecker::checkSingleStatementVariableDeclaration(ASTNode const& _statement)
-{
-	auto varDecl = dynamic_cast<VariableDeclarationStatement const*>(&_statement);
-	if (varDecl)
-		m_errorReporter.syntaxError(9079_error, _statement.location(), "Variable declarations can only be used inside blocks.");
-}
-
-bool SyntaxChecker::visit(IfStatement const& _ifStatement)
-{
-	checkSingleStatementVariableDeclaration(_ifStatement.trueStatement());
-	if (Statement const* _statement = _ifStatement.falseStatement())
-		checkSingleStatementVariableDeclaration(*_statement);
-	return true;
-}
-
-bool SyntaxChecker::visit(WhileStatement const& _whileStatement)
-{
-	m_inLoopDepth++;
-	checkSingleStatementVariableDeclaration(_whileStatement.body());
-	return true;
-}
-
-void SyntaxChecker::endVisit(WhileStatement const&)
-{
-	m_inLoopDepth--;
-}
-
-bool SyntaxChecker::visit(ForStatement const& _forStatement)
-{
-	m_inLoopDepth++;
-	checkSingleStatementVariableDeclaration(_forStatement.body());
-	return true;
-}
-
-void SyntaxChecker::endVisit(ForStatement const&)
-{
-	m_inLoopDepth--;
-}
-
-bool SyntaxChecker::visit(Block const& _block)
-{
-	if (_block.unchecked())
-	{
-		if (m_uncheckedArithmetic)
-			m_errorReporter.syntaxError(
-				1941_error,
-				_block.location(),
-				"\"unchecked\" blocks cannot be nested."
-			);
-
-		m_uncheckedArithmetic = true;
-	}
-	return true;
-}
-
-void SyntaxChecker::endVisit(Block const& _block)
-{
-	if (_block.unchecked())
-		m_uncheckedArithmetic = false;
-}
-
-bool SyntaxChecker::visit(Continue const& _continueStatement)
-{
-	if (m_inLoopDepth <= 0)
-		// we're not in a for/while loop, report syntax error
-		m_errorReporter.syntaxError(4123_error, _continueStatement.location(), "\"continue\" has to be in a \"for\" or \"while\" loop.");
-	return true;
-}
-
-bool SyntaxChecker::visit(Break const& _breakStatement)
-{
-	if (m_inLoopDepth <= 0)
-		// we're not in a for/while loop, report syntax error
-		m_errorReporter.syntaxError(6102_error, _breakStatement.location(), "\"break\" has to be in a \"for\" or \"while\" loop.");
-	return true;
-}
-
-bool SyntaxChecker::visit(Throw const& _throwStatement)
-{
-	m_errorReporter.syntaxError(
-		4538_error,
-		_throwStatement.location(),
-		"\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
-	);
-
-	return true;
-}
-
-bool SyntaxChecker::visit(Literal const& _literal)
-{
-	size_t invalidSequence;
-	if ((_literal.token() == Token::UnicodeStringLiteral) && !validateUTF8(_literal.value(), invalidSequence))
-		m_errorReporter.syntaxError(
-			8452_error,
-			_literal.location(),
-			"Contains invalid UTF-8 sequence at position " + toString(invalidSequence) + "."
-		);
-
-	if (_literal.token() != Token::Number)
-		return true;
-
-	ASTString const& value = _literal.value();
-	solAssert(!value.empty(), "");
-
-	// Generic checks no matter what base this number literal is of:
-	if (value.back() == '_')
-	{
-		m_errorReporter.syntaxError(2090_error, _literal.location(), "Invalid use of underscores in number literal. No trailing underscores allowed.");
-		return true;
-	}
-
-	if (value.find("__") != ASTString::npos)
-	{
-		m_errorReporter.syntaxError(2990_error, _literal.location(), "Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.");
-		return true;
-	}
-
-	if (!_literal.isHexNumber()) // decimal literal
-	{
-		if (value.find("._") != ASTString::npos)
-			m_errorReporter.syntaxError(3891_error, _literal.location(), "Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.");
-
-		if (value.find("_.") != ASTString::npos)
-			m_errorReporter.syntaxError(1023_error, _literal.location(), "Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.");
-
-		if (value.find("_e") != ASTString::npos)
-			m_errorReporter.syntaxError(6415_error, _literal.location(), "Invalid use of underscores in number literal. No underscore at the end of the mantissa allowed.");
-
-		if (value.find("e_") != ASTString::npos)
-			m_errorReporter.syntaxError(6165_error, _literal.location(), "Invalid use of underscores in number literal. No underscore in front of exponent allowed.");
-	}
-
-	return true;
-}
-
-bool SyntaxChecker::visit(UnaryOperation const& _operation)
-{
-	solAssert(_operation.getOperator() != Token::Add);
-	return true;
-}
-
-bool SyntaxChecker::visit(InlineAssembly const& _inlineAssembly)
-{
-	if (_inlineAssembly.flags())
-		for (auto flag: *_inlineAssembly.flags())
-		{
-			if (*flag == "memory-safe")
-			{
-				if (_inlineAssembly.annotation().markedMemorySafe)
-					m_errorReporter.syntaxError(
-						7026_error,
-						_inlineAssembly.location(),
-						"Inline assembly marked memory-safe multiple times."
-					);
-				_inlineAssembly.annotation().markedMemorySafe = true;
-			}
-			else
-				m_errorReporter.warning(
-					4430_error,
-					_inlineAssembly.location(),
-					"Unknown inline assembly flag: \"" + *flag + "\""
-				);
-		}
-
-	if (!m_useYulOptimizer)
-		return false;
-
-	if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations()))
-		m_errorReporter.syntaxError(
-			6553_error,
-			_inlineAssembly.location(),
-			"The msize instruction cannot be used when the Yul optimizer is activated because "
-			"it can change its semantics. Either disable the Yul optimizer or do not use the instruction."
-		);
-
-	return false;
-}
-
-bool SyntaxChecker::visit(PlaceholderStatement const& _placeholder)
-{
-	if (m_uncheckedArithmetic)
-		m_errorReporter.syntaxError(
-			2573_error,
-			_placeholder.location(),
-			"The placeholder statement \"_\" cannot be used inside an \"unchecked\" block."
-		);
-
-	m_placeholderFound = true;
-	return true;
-}
-
-bool SyntaxChecker::visit(ContractDefinition const& _contract)
-{
-	m_currentContractKind = _contract.contractKind();
-
-	ASTString const& contractName = _contract.name();
-	for (FunctionDefinition const* function: _contract.definedFunctions())
-		if (function->name() == contractName)
-			m_errorReporter.syntaxError(
-				5796_error,
-				function->location(),
-				"Functions are not allowed to have the same name as the contract. "
-				"If you intend this to be a constructor, use \"constructor(...) { ... }\" to define it."
-			);
-	return true;
-}
-
-void SyntaxChecker::endVisit(ContractDefinition const&)
-{
-	m_currentContractKind = std::nullopt;
-}
-
-bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
-{
-	if (!_usingFor.usesBraces())
-		solAssert(
-			_usingFor.functionsAndOperators().size() == 1 &&
-			!std::get<1>(_usingFor.functionsAndOperators().front())
-		);
-
-	if (!m_currentContractKind && !_usingFor.typeName())
-		m_errorReporter.syntaxError(
-			8118_error,
-			_usingFor.location(),
-			"The type has to be specified explicitly at file level (cannot use '*')."
-		);
-	else if (_usingFor.usesBraces() && !_usingFor.typeName())
-		m_errorReporter.syntaxError(
-			3349_error,
-			_usingFor.location(),
-			"The type has to be specified explicitly when attaching specific functions."
-		);
-	if (_usingFor.global() && !_usingFor.typeName())
-		m_errorReporter.syntaxError(
-			2854_error,
-			_usingFor.location(),
-			"Can only globally attach functions to specific types."
-		);
-	if (_usingFor.global() && m_currentContractKind)
-		m_errorReporter.syntaxError(
-			3367_error,
-			_usingFor.location(),
-			"\"global\" can only be used at file level."
-		);
-	if (m_currentContractKind == ContractKind::Interface)
-		m_errorReporter.syntaxError(
-			9088_error,
-			_usingFor.location(),
-			"The \"using for\" directive is not allowed inside interfaces."
-		);
-
-	return true;
-}
-
-bool SyntaxChecker::visit(FunctionDefinition const& _function)
-{
-	solAssert(_function.isFree() == (m_currentContractKind == std::nullopt), "");
-
-	if (!_function.isFree() && !_function.isConstructor() && _function.noVisibilitySpecified())
-	{
-		std::string suggestedVisibility =
-			_function.isFallback() ||
-			_function.isReceive() ||
-			m_currentContractKind == ContractKind::Interface
-		? "external" : "public";
-		m_errorReporter.syntaxError(
-			4937_error,
-			_function.location(),
-			"No visibility specified. Did you intend to add \"" + suggestedVisibility + "\"?"
-		);
-	}
-	else if (_function.isFree())
-	{
-		if (!_function.noVisibilitySpecified())
-			m_errorReporter.syntaxError(
-				4126_error,
-				_function.location(),
-				"Free functions cannot have visibility."
-			);
-		if (!_function.isImplemented())
-			m_errorReporter.typeError(4668_error, _function.location(), "Free functions must be implemented.");
-	}
-
-	if (m_currentContractKind == ContractKind::Interface && !_function.modifiers().empty())
-		m_errorReporter.syntaxError(5842_error, _function.location(), "Functions in interfaces cannot have modifiers.");
-	else if (!_function.isImplemented() && !_function.modifiers().empty())
-		m_errorReporter.syntaxError(2668_error, _function.location(), "Functions without implementation cannot have modifiers.");
-
-	return true;
-}
-
-bool SyntaxChecker::visit(FunctionTypeName const& _node)
-{
-	for (auto const& decl: _node.parameterTypeList()->parameters())
-		if (!decl->name().empty())
-			m_errorReporter.warning(6162_error, decl->location(), "Naming function type parameters is deprecated.");
-
-	for (auto const& decl: _node.returnParameterTypeList()->parameters())
-		if (!decl->name().empty())
-			m_errorReporter.syntaxError(7304_error, decl->location(), "Return parameters in function types may not be named.");
-
-	return true;
-}
-
-bool SyntaxChecker::visit(StructDefinition const& _struct)
-{
-	if (_struct.members().empty())
-		m_errorReporter.syntaxError(5306_error, _struct.location(), "Defining empty structs is disallowed.");
-
-	return true;
-}
diff --git a/libsolidity/analysis/SyntaxChecker.h b/libsolidity/analysis/SyntaxChecker.h
deleted file mode 100644
index f221df09fcac..000000000000
--- a/libsolidity/analysis/SyntaxChecker.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * The module that performs syntax analysis on the AST:
- *  - whether continue/break is in a for/while loop.
- *  - whether a modifier contains at least one '_'
- *  - issues deprecation warnings for unary '+'
- *  - issues deprecation warning for throw
- *  - whether the msize instruction is used and the Yul optimizer is enabled at the same time.
- *  - selection of the ABI coder through pragmas.
- */
-class SyntaxChecker: private ASTConstVisitor
-{
-public:
-	/// @param _errorReporter provides the error logging functionality.
-	SyntaxChecker(langutil::ErrorReporter& _errorReporter, bool _useYulOptimizer):
-		m_errorReporter(_errorReporter),
-		m_useYulOptimizer(_useYulOptimizer)
-	{}
-
-	bool checkSyntax(ASTNode const& _astRoot);
-
-private:
-
-	bool visit(SourceUnit const& _sourceUnit) override;
-	void endVisit(SourceUnit const& _sourceUnit) override;
-	bool visit(PragmaDirective const& _pragma) override;
-
-	bool visit(ModifierDefinition const& _modifier) override;
-	void endVisit(ModifierDefinition const& _modifier) override;
-
-	/// Reports an error if _statement is a VariableDeclarationStatement.
-	/// Used by if/while/for to check for single statement variable declarations
-	/// without a block.
-	void checkSingleStatementVariableDeclaration(ASTNode const& _statement);
-
-	bool visit(IfStatement const& _ifStatement) override;
-	bool visit(WhileStatement const& _whileStatement) override;
-	void endVisit(WhileStatement const& _whileStatement) override;
-	bool visit(ForStatement const& _forStatement) override;
-	void endVisit(ForStatement const& _forStatement) override;
-
-	bool visit(Block const& _block) override;
-	void endVisit(Block const& _block) override;
-
-	bool visit(Continue const& _continueStatement) override;
-	bool visit(Break const& _breakStatement) override;
-
-	bool visit(Throw const& _throwStatement) override;
-
-	bool visit(UnaryOperation const& _operation) override;
-
-	bool visit(InlineAssembly const& _inlineAssembly) override;
-
-	bool visit(PlaceholderStatement const& _placeholderStatement) override;
-
-	bool visit(ContractDefinition const& _contract) override;
-	void endVisit(ContractDefinition const& _contract) override;
-
-	bool visit(UsingForDirective const& _usingFor) override;
-
-	bool visit(FunctionDefinition const& _function) override;
-	bool visit(FunctionTypeName const& _node) override;
-
-	bool visit(StructDefinition const& _struct) override;
-	bool visit(Literal const& _literal) override;
-
-	langutil::ErrorReporter& m_errorReporter;
-
-	bool m_useYulOptimizer = false;
-
-	/// Flag that indicates whether a function modifier actually contains '_'.
-	bool m_placeholderFound = false;
-
-	/// Flag that indicates whether some version pragma was present.
-	bool m_versionPragmaFound = false;
-
-	/// Flag that indicates whether we are inside an unchecked block.
-	bool m_uncheckedArithmetic = false;
-
-	int m_inLoopDepth = 0;
-	std::optional<ContractKind> m_currentContractKind;
-
-	SourceUnit const* m_sourceUnit = nullptr;
-};
-
-}
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
deleted file mode 100644
index 5c28d3cd2a78..000000000000
--- a/libsolidity/analysis/TypeChecker.cpp
+++ /dev/null
@@ -1,4268 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Type analyzer and checker.
- */
-
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTUtils.h>
-#include <libsolidity/ast/UserDefinableOperators.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AST.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/Views.h>
-#include <libsolutil/Visitor.h>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <fmt/format.h>
-
-#include <range/v3/algorithm/count_if.hpp>
-#include <range/v3/view/drop_exactly.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/zip.hpp>
-
-#include <memory>
-#include <vector>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-bool TypeChecker::typeSupportedByOldABIEncoder(Type const& _type, bool _isLibraryCall)
-{
-	if (_isLibraryCall && _type.dataStoredIn(DataLocation::Storage))
-		return true;
-	if (_type.category() == Type::Category::Struct)
-		return false;
-	if (_type.category() == Type::Category::Array)
-	{
-		auto const& arrayType = dynamic_cast<ArrayType const&>(_type);
-		auto base = arrayType.baseType();
-		if (!typeSupportedByOldABIEncoder(*base, _isLibraryCall) || (base->category() == Type::Category::Array && base->isDynamicallySized()))
-			return false;
-	}
-	return true;
-}
-
-bool TypeChecker::checkTypeRequirements(SourceUnit const& _source)
-{
-	m_currentSourceUnit = &_source;
-	_source.accept(*this);
-	m_currentSourceUnit = nullptr;
-	return !Error::containsErrors(m_errorReporter.errors());
-}
-
-Type const* TypeChecker::type(Expression const& _expression) const
-{
-	solAssert(!!_expression.annotation().type, "Type requested but not present.");
-	return _expression.annotation().type;
-}
-
-Type const* TypeChecker::type(VariableDeclaration const& _variable) const
-{
-	solAssert(!!_variable.annotation().type, "Type requested but not present.");
-	return _variable.annotation().type;
-}
-
-bool TypeChecker::visit(ContractDefinition const& _contract)
-{
-	m_currentContract = &_contract;
-
-	ASTNode::listAccept(_contract.baseContracts(), *this);
-
-	for (auto const& n: _contract.subNodes())
-		n->accept(*this);
-
-	m_currentContract = nullptr;
-
-	return false;
-}
-
-void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
-{
-	size_t storageToStorageCopies = 0;
-	size_t toStorageCopies = 0;
-	size_t storageByteArrayPushes = 0;
-	size_t storageByteAccesses = 0;
-	auto count = [&](TupleExpression const& _lhs, TupleType const& _rhs, auto _recurse) -> void {
-		TupleType const& lhsType = dynamic_cast<TupleType const&>(*type(_lhs));
-		TupleExpression const* lhsResolved = dynamic_cast<TupleExpression const*>(resolveOuterUnaryTuples(&_lhs));
-
-		if (lhsType.components().size() != _rhs.components().size() || lhsResolved->components().size() != _rhs.components().size())
-		{
-			solAssert(m_errorReporter.hasErrors(), "");
-			return;
-		}
-
-		for (auto&& [index, componentType]: lhsType.components() | ranges::views::enumerate)
-		{
-			if (ReferenceType const* ref = dynamic_cast<ReferenceType const*>(componentType))
-			{
-				if (ref && ref->dataStoredIn(DataLocation::Storage) && !ref->isPointer())
-				{
-					toStorageCopies++;
-					if (_rhs.components()[index]->dataStoredIn(DataLocation::Storage))
-						storageToStorageCopies++;
-				}
-			}
-			else if (FixedBytesType const* bytesType = dynamic_cast<FixedBytesType const*>(componentType))
-			{
-				if (bytesType && bytesType->numBytes() == 1)
-				{
-					if (FunctionCall const* lhsCall = dynamic_cast<FunctionCall const*>(resolveOuterUnaryTuples(lhsResolved->components().at(index).get())))
-					{
-						FunctionType const& callType = dynamic_cast<FunctionType const&>(*type(lhsCall->expression()));
-						if (callType.kind() == FunctionType::Kind::ArrayPush)
-						{
-							ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*callType.selfType());
-							if (arrayType.isByteArray() && arrayType.dataStoredIn(DataLocation::Storage))
-							{
-								++storageByteAccesses;
-								++storageByteArrayPushes;
-							}
-						}
-					}
-					else if (IndexAccess const* indexAccess = dynamic_cast<IndexAccess const*>(resolveOuterUnaryTuples(lhsResolved->components().at(index).get())))
-					{
-						if (ArrayType const* arrayType = dynamic_cast<ArrayType const*>(type(indexAccess->baseExpression())))
-							if (arrayType->isByteArray() && arrayType->dataStoredIn(DataLocation::Storage))
-								++storageByteAccesses;
-					}
-				}
-			}
-			else if (TupleType const* tupleType = dynamic_cast<TupleType const*>(componentType))
-				if (auto const* lhsNested = dynamic_cast<TupleExpression const*>(lhsResolved->components().at(index).get()))
-					if (auto const* rhsNestedType = dynamic_cast<TupleType const*>(_rhs.components().at(index)))
-						_recurse(
-							*lhsNested,
-							*rhsNestedType,
-							_recurse
-						);
-		}
-	};
-
-	TupleExpression const* lhsTupleExpression = dynamic_cast<TupleExpression const*>(&_assignment.leftHandSide());
-	if (!lhsTupleExpression)
-	{
-		solAssert(m_errorReporter.hasErrors());
-		return;
-	}
-	count(
-		*lhsTupleExpression,
-		dynamic_cast<TupleType const&>(*type(_assignment.rightHandSide())),
-		count
-	);
-
-	if (storageToStorageCopies >= 1 && toStorageCopies >= 2)
-		m_errorReporter.warning(
-			7238_error,
-			_assignment.location(),
-			"This assignment performs two copies to storage. Since storage copies do not first "
-			"copy to a temporary location, one of them might be overwritten before the second "
-			"is executed and thus may have unexpected effects. It is safer to perform the copies "
-			"separately or assign to storage pointers first."
-		);
-
-	if (storageByteArrayPushes >= 1 && storageByteAccesses >= 2)
-		m_errorReporter.warning(
-			7239_error,
-			_assignment.location(),
-			"This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. "
-			"When a bytes array is enlarged, it may transition from short storage layout to long storage layout, "
-			"which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single "
-			"operation, one element at a time."
-		);
-}
-
-TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall const& _functionCall, bool _abiEncoderV2)
-{
-	std::vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
-	if (arguments.size() != 2)
-		m_errorReporter.typeError(
-			5782_error,
-			_functionCall.location(),
-			"This function takes two arguments, but " +
-			toString(arguments.size()) +
-			" were provided."
-		);
-
-	if (arguments.size() >= 1)
-		if (
-			!type(*arguments.front())->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()) &&
-			!type(*arguments.front())->isImplicitlyConvertibleTo(*TypeProvider::bytesCalldata())
-		)
-			m_errorReporter.typeError(
-				1956_error,
-				arguments.front()->location(),
-				"The first argument to \"abi.decode\" must be implicitly convertible to "
-				"bytes memory or bytes calldata, but is of type " +
-				type(*arguments.front())->humanReadableName() +
-				"."
-			);
-
-	if (arguments.size() < 2)
-		return {};
-
-	// The following is a rather syntactic restriction, but we check it here anyway:
-	// The second argument has to be a tuple expression containing type names.
-	TupleExpression const* tupleExpression = dynamic_cast<TupleExpression const*>(arguments[1].get());
-	if (!tupleExpression)
-	{
-		m_errorReporter.typeError(
-			6444_error,
-			arguments[1]->location(),
-			"The second argument to \"abi.decode\" has to be a tuple of types."
-		);
-		return {};
-	}
-
-	TypePointers components;
-	for (auto const& typeArgument: tupleExpression->components())
-	{
-		solAssert(typeArgument, "");
-		if (TypeType const* argTypeType = dynamic_cast<TypeType const*>(type(*typeArgument)))
-		{
-			Type const* actualType = argTypeType->actualType();
-			solAssert(actualType, "");
-			// We force memory because the parser currently cannot handle
-			// data locations. Furthermore, storage can be a little dangerous and
-			// calldata is not really implemented anyway.
-			actualType = TypeProvider::withLocationIfReference(DataLocation::Memory, actualType);
-			// We force address payable for address types.
-			if (actualType->category() == Type::Category::Address)
-				actualType = TypeProvider::payableAddress();
-			solAssert(
-				!actualType->dataStoredIn(DataLocation::CallData) &&
-				!actualType->dataStoredIn(DataLocation::Storage),
-				""
-			);
-			if (!actualType->fullEncodingType(false, _abiEncoderV2, false))
-				m_errorReporter.typeError(
-					9611_error,
-					typeArgument->location(),
-					"Decoding type " + actualType->humanReadableName() + " not supported."
-				);
-
-			if (auto referenceType = dynamic_cast<ReferenceType const*>(actualType))
-			{
-				auto result = referenceType->validForLocation(referenceType->location());
-				if (!result)
-					m_errorReporter.typeError(
-						6118_error,
-						typeArgument->location(),
-						result.message()
-					);
-			}
-
-			components.push_back(actualType);
-		}
-		else
-		{
-			m_errorReporter.typeError(1039_error, typeArgument->location(), "Argument has to be a type name.");
-			components.push_back(TypeProvider::emptyTuple());
-		}
-	}
-	return components;
-}
-
-TypePointers TypeChecker::typeCheckMetaTypeFunctionAndRetrieveReturnType(FunctionCall const& _functionCall)
-{
-	std::vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
-	if (arguments.size() != 1)
-		m_errorReporter.fatalTypeError(
-			8885_error,
-			_functionCall.location(),
-			"This function takes one argument, but " +
-			toString(arguments.size()) +
-			" were provided."
-		);
-	Type const* firstArgType = type(*arguments.front());
-
-	bool wrongType = false;
-	if (firstArgType->category() == Type::Category::TypeType)
-	{
-		TypeType const* typeTypePtr = dynamic_cast<TypeType const*>(firstArgType);
-		Type::Category typeCategory = typeTypePtr->actualType()->category();
-		if (auto const* contractType = dynamic_cast<ContractType const*>(typeTypePtr->actualType()))
-			wrongType = contractType->isSuper();
-		else if (
-			typeCategory != Type::Category::Integer &&
-			typeCategory != Type::Category::Enum
-		)
-			wrongType = true;
-	}
-	else
-		wrongType = true;
-
-	if (wrongType)
-		m_errorReporter.fatalTypeError(
-			4259_error,
-			arguments.front()->location(),
-			"Invalid type for argument in the function call. "
-			"An enum type, contract type or an integer type is required, but " +
-			type(*arguments.front())->humanReadableName() + " provided."
-		);
-
-	return {TypeProvider::meta(dynamic_cast<TypeType const&>(*firstArgType).actualType())};
-}
-
-bool TypeChecker::visit(ImportDirective const&)
-{
-	return false;
-}
-
-void TypeChecker::endVisit(InheritanceSpecifier const& _inheritance)
-{
-	auto base = dynamic_cast<ContractDefinition const*>(&dereference(_inheritance.name()));
-	solAssert(base, "Base contract not available.");
-	solAssert(m_currentContract, "");
-
-	if (m_currentContract->isInterface() && !base->isInterface())
-		m_errorReporter.typeError(6536_error, _inheritance.location(), "Interfaces can only inherit from other interfaces.");
-
-	auto const& arguments = _inheritance.arguments();
-	TypePointers parameterTypes;
-	if (!base->isInterface())
-		// Interfaces do not have constructors, so there are zero parameters.
-		parameterTypes = ContractType(*base).newExpressionType()->parameterTypes();
-
-	if (arguments)
-	{
-		if (parameterTypes.size() != arguments->size())
-		{
-			m_errorReporter.typeError(
-				7927_error,
-				_inheritance.location(),
-				"Wrong argument count for constructor call: " +
-				toString(arguments->size()) +
-				" arguments given but expected " +
-				toString(parameterTypes.size()) +
-				(arguments->size() == 0 ? ". Remove parentheses if you do not want to provide arguments here." : "")
-			);
-		}
-		for (size_t i = 0; i < std::min(arguments->size(), parameterTypes.size()); ++i)
-		{
-			BoolResult result = type(*(*arguments)[i])->isImplicitlyConvertibleTo(*parameterTypes[i]);
-			if (!result)
-				m_errorReporter.typeErrorConcatenateDescriptions(
-					9827_error,
-					(*arguments)[i]->location(),
-					"Invalid type for argument in constructor call. "
-					"Invalid implicit conversion from " +
-					type(*(*arguments)[i])->humanReadableName() +
-					" to " +
-					parameterTypes[i]->humanReadableName() +
-					" requested.",
-					result.message()
-				);
-		}
-	}
-}
-
-void TypeChecker::endVisit(ModifierDefinition const& _modifier)
-{
-	if (auto const* contractDef = dynamic_cast<ContractDefinition const*>(_modifier.scope()))
-	{
-		if (_modifier.virtualSemantics() && contractDef->isLibrary())
-			m_errorReporter.typeError(
-				3275_error,
-				_modifier.location(),
-				"Modifiers in a library cannot be virtual."
-			);
-
-		if (contractDef->isInterface())
-			m_errorReporter.typeError(
-				6408_error,
-				_modifier.location(),
-				"Modifiers cannot be defined or declared in interfaces."
-			);
-	}
-
-	if (!_modifier.isImplemented() && !_modifier.virtualSemantics())
-		m_errorReporter.typeError(8063_error, _modifier.location(), "Modifiers without implementation must be marked virtual.");
-}
-
-bool TypeChecker::visit(FunctionDefinition const& _function)
-{
-	if (_function.markedVirtual())
-	{
-		if (_function.isFree())
-			m_errorReporter.syntaxError(4493_error, _function.location(), "Free functions cannot be virtual.");
-		else if (_function.isConstructor())
-			m_errorReporter.typeError(7001_error, _function.location(), "Constructors cannot be virtual.");
-		else if (_function.annotation().contract->isInterface())
-			m_errorReporter.warning(5815_error, _function.location(), "Interface functions are implicitly \"virtual\"");
-		else if (_function.visibility() == Visibility::Private)
-			m_errorReporter.typeError(3942_error, _function.location(), "\"virtual\" and \"private\" cannot be used together.");
-		else if (_function.libraryFunction())
-			m_errorReporter.typeError(7801_error, _function.location(), "Library functions cannot be \"virtual\".");
-	}
-	if (_function.overrides() && _function.isFree())
-		m_errorReporter.syntaxError(1750_error, _function.location(), "Free functions cannot override.");
-
-	if (!_function.modifiers().empty() && _function.isFree())
-		m_errorReporter.syntaxError(5811_error, _function.location(), "Free functions cannot have modifiers.");
-
-	if (_function.isPayable())
-	{
-		if (_function.libraryFunction())
-			m_errorReporter.typeError(7708_error, _function.location(), "Library functions cannot be payable.");
-		else if (_function.isFree())
-			m_errorReporter.typeError(9559_error, _function.location(), "Free functions cannot be payable.");
-		else if (_function.isOrdinary() && !_function.isPartOfExternalInterface())
-			m_errorReporter.typeError(5587_error, _function.location(), "\"internal\" and \"private\" functions cannot be payable.");
-	}
-
-	std::vector<VariableDeclaration const*> internalParametersInConstructor;
-
-	auto checkArgumentAndReturnParameter = [&](VariableDeclaration const& _var) {
-		if (type(_var)->containsNestedMapping())
-			if (_var.referenceLocation() == VariableDeclaration::Location::Storage)
-				solAssert(
-					_function.libraryFunction() || _function.isConstructor() || !_function.isPublic(),
-					"Mapping types for parameters or return variables "
-					"can only be used in internal or library functions."
-				);
-		bool functionIsExternallyVisible =
-			(!_function.isConstructor() && _function.isPublic()) ||
-			(_function.isConstructor() && !m_currentContract->abstract());
-		if (
-			_function.isConstructor() &&
-			_var.referenceLocation() == VariableDeclaration::Location::Storage &&
-			!m_currentContract->abstract()
-		)
-			m_errorReporter.fatalTypeError(
-				3644_error,
-				_var.location(),
-				"This parameter has a type that can only be used internally. "
-				"You can make the contract abstract to avoid this problem."
-			);
-		else if (functionIsExternallyVisible)
-		{
-			auto iType = type(_var)->interfaceType(_function.libraryFunction());
-
-			if (!iType)
-			{
-				std::string message = iType.message();
-				solAssert(!message.empty(), "Expected detailed error message!");
-				if (_function.isConstructor())
-					message += " You can make the contract abstract to avoid this problem.";
-				m_errorReporter.fatalTypeError(4103_error, _var.location(), message);
-			}
-			else if (
-				!useABICoderV2() &&
-				!typeSupportedByOldABIEncoder(*type(_var), _function.libraryFunction())
-			)
-			{
-				std::string message =
-					"This type is only supported in ABI coder v2. "
-					"Use \"pragma abicoder v2;\" to enable the feature.";
-				if (_function.isConstructor())
-					message +=
-						" Alternatively, make the contract abstract and supply the "
-						"constructor arguments from a derived contract.";
-				m_errorReporter.typeError(
-					4957_error,
-					_var.location(),
-					message
-				);
-			}
-		}
-	};
-	for (ASTPointer<VariableDeclaration> const& var: _function.parameters())
-	{
-		checkArgumentAndReturnParameter(*var);
-		var->accept(*this);
-	}
-	for (ASTPointer<VariableDeclaration> const& var: _function.returnParameters())
-	{
-		checkArgumentAndReturnParameter(*var);
-		var->accept(*this);
-	}
-
-	std::set<Declaration const*> modifiers;
-	for (ASTPointer<ModifierInvocation> const& modifier: _function.modifiers())
-	{
-		std::vector<ContractDefinition const*> baseContracts;
-		if (auto contract = dynamic_cast<ContractDefinition const*>(_function.scope()))
-		{
-			baseContracts = contract->annotation().linearizedBaseContracts;
-			// Delete first base which is just the main contract itself
-			baseContracts.erase(baseContracts.begin());
-		}
-
-		visitManually(
-			*modifier,
-			_function.isConstructor() ? baseContracts : std::vector<ContractDefinition const*>()
-		);
-		Declaration const* decl = &dereference(modifier->name());
-		if (modifiers.count(decl))
-		{
-			if (dynamic_cast<ContractDefinition const*>(decl))
-				m_errorReporter.declarationError(1697_error, modifier->location(), "Base constructor already provided.");
-		}
-		else
-			modifiers.insert(decl);
-	}
-
-	solAssert(_function.isFree() == !m_currentContract, "");
-	if (!m_currentContract)
-	{
-		solAssert(!_function.isConstructor(), "");
-		solAssert(!_function.isFallback(), "");
-		solAssert(!_function.isReceive(), "");
-	}
-	else if (m_currentContract->isInterface())
-	{
-		if (_function.isImplemented())
-			m_errorReporter.typeError(4726_error, _function.location(), "Functions in interfaces cannot have an implementation.");
-
-		if (_function.isConstructor())
-			m_errorReporter.typeError(6482_error, _function.location(), "Constructor cannot be defined in interfaces.");
-		else if (_function.visibility() != Visibility::External)
-			m_errorReporter.typeError(1560_error, _function.location(), "Functions in interfaces must be declared external.");
-	}
-	else if (m_currentContract->contractKind() == ContractKind::Library)
-		if (_function.isConstructor())
-			m_errorReporter.typeError(7634_error, _function.location(), "Constructor cannot be defined in libraries.");
-
-	if (_function.isImplemented())
-		_function.body().accept(*this);
-	else if (_function.isConstructor())
-		m_errorReporter.typeError(5700_error, _function.location(), "Constructor must be implemented if declared.");
-	else if (_function.libraryFunction())
-		m_errorReporter.typeError(9231_error, _function.location(), "Library functions must be implemented if declared.");
-	else if (!_function.virtualSemantics())
-	{
-		if (_function.isFree())
-			solAssert(m_errorReporter.hasErrors(), "");
-		else
-			m_errorReporter.typeError(5424_error, _function.location(), "Functions without implementation must be marked virtual.");
-	}
-
-
-	if (_function.isFallback())
-		typeCheckFallbackFunction(_function);
-	else if (_function.isConstructor())
-		typeCheckConstructor(_function);
-
-	return false;
-}
-
-bool TypeChecker::visit(VariableDeclaration const& _variable)
-{
-	_variable.typeName().accept(*this);
-
-	// type is filled either by ReferencesResolver directly from the type name or by
-	// TypeChecker at the VariableDeclarationStatement level.
-	Type const* varType = _variable.annotation().type;
-	solAssert(!!varType, "Variable type not provided.");
-
-	if (_variable.value())
-	{
-		if (_variable.isStateVariable() && varType->containsNestedMapping())
-		{
-			m_errorReporter.typeError(
-				6280_error,
-				_variable.location(),
-				"Types in storage containing (nested) mappings cannot be assigned to."
-			);
-			_variable.value()->accept(*this);
-		}
-		else
-			expectType(*_variable.value(), *varType);
-	}
-	if (_variable.isConstant())
-	{
-		if (!_variable.value())
-			m_errorReporter.typeError(4266_error, _variable.location(), "Uninitialized \"constant\" variable.");
-		else if (!*_variable.value()->annotation().isPure)
-			m_errorReporter.typeError(
-				8349_error,
-				_variable.value()->location(),
-				"Initial value for constant variable has to be compile-time constant."
-			);
-	}
-	else if (_variable.immutable())
-	{
-		if (!_variable.type()->isValueType())
-			m_errorReporter.typeError(6377_error, _variable.location(), "Immutable variables cannot have a non-value type.");
-		if (
-			auto const* functionType = dynamic_cast<FunctionType const*>(_variable.type());
-			functionType && functionType->kind() == FunctionType::Kind::External
-		)
-			m_errorReporter.typeError(3366_error, _variable.location(), "Immutable variables of external function type are not yet supported.");
-		solAssert(_variable.type()->sizeOnStack() == 1 || m_errorReporter.hasErrors(), "");
-	}
-
-	if (!_variable.isStateVariable())
-	{
-		if (
-			_variable.referenceLocation() == VariableDeclaration::Location::CallData ||
-			_variable.referenceLocation() == VariableDeclaration::Location::Memory
-		)
-			if (varType->containsNestedMapping())
-				m_errorReporter.fatalTypeError(
-					4061_error,
-					_variable.location(),
-					"Type " + varType->humanReadableName() + " is only valid in storage because it contains a (nested) mapping."
-				);
-	}
-	else if (_variable.visibility() >= Visibility::Public)
-	{
-		FunctionType getter(_variable);
-		if (!useABICoderV2())
-		{
-			std::vector<std::string> unsupportedTypes;
-			for (auto const& param: getter.parameterTypes() + getter.returnParameterTypes())
-				if (!typeSupportedByOldABIEncoder(*param, false /* isLibrary */))
-					unsupportedTypes.emplace_back(param->humanReadableName());
-			if (!unsupportedTypes.empty())
-				m_errorReporter.typeError(
-					2763_error,
-					_variable.location(),
-					"The following types are only supported for getters in ABI coder v2: " +
-					joinHumanReadable(unsupportedTypes) +
-					". Either remove \"public\" or use \"pragma abicoder v2;\" to enable the feature."
-				);
-		}
-		if (!getter.interfaceFunctionType())
-		{
-			solAssert(getter.returnParameterNames().size() == getter.returnParameterTypes().size());
-			solAssert(getter.parameterNames().size() == getter.parameterTypes().size());
-			if (getter.returnParameterTypes().empty() && getter.parameterTypes().empty())
-				m_errorReporter.typeError(5359_error, _variable.location(), "The struct has all its members omitted, therefore the getter cannot return any values.");
-			else
-				m_errorReporter.typeError(6744_error, _variable.location(), "Internal or recursive type is not allowed for public state variables.");
-		}
-	}
-
-	bool isStructMemberDeclaration = dynamic_cast<StructDefinition const*>(_variable.scope()) != nullptr;
-	if (isStructMemberDeclaration)
-		return false;
-
-	if (auto referenceType = dynamic_cast<ReferenceType const*>(varType))
-	{
-		BoolResult result = referenceType->validForLocation(referenceType->location());
-		if (result)
-		{
-			bool isLibraryStorageParameter = (_variable.isLibraryFunctionParameter() && referenceType->location() == DataLocation::Storage);
-			// We skip the calldata check for abstract contract constructors.
-			bool isAbstractConstructorParam = _variable.isConstructorParameter() && m_currentContract && m_currentContract->abstract();
-			bool callDataCheckRequired =
-				!isAbstractConstructorParam &&
-				(_variable.isConstructorParameter() || _variable.isPublicCallableParameter()) &&
-				!isLibraryStorageParameter;
-			if (callDataCheckRequired)
-			{
-				if (!referenceType->interfaceType(false))
-					solAssert(m_errorReporter.hasErrors(), "");
-				else
-					result = referenceType->validForLocation(DataLocation::CallData);
-			}
-		}
-		if (!result)
-		{
-			solAssert(!result.message().empty(), "Expected detailed error message");
-			m_errorReporter.typeError(1534_error, _variable.location(), result.message());
-			return false;
-		}
-	}
-
-	return false;
-}
-
-void TypeChecker::endVisit(StructDefinition const& _struct)
-{
-	for (auto const& member: _struct.members())
-		solAssert(
-			member->annotation().type &&
-			member->annotation().type->canBeStored(),
-			"Type cannot be used in struct."
-		);
-}
-
-void TypeChecker::visitManually(
-	ModifierInvocation const& _modifier,
-	std::vector<ContractDefinition const*> const& _bases
-)
-{
-	std::vector<ASTPointer<Expression>> const& arguments =
-		_modifier.arguments() ? *_modifier.arguments() : std::vector<ASTPointer<Expression>>();
-	for (ASTPointer<Expression> const& argument: arguments)
-		argument->accept(*this);
-
-	_modifier.name().accept(*this);
-
-	auto const* declaration = &dereference(_modifier.name());
-	std::vector<ASTPointer<VariableDeclaration>> emptyParameterList;
-	std::vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
-	if (auto modifierDecl = dynamic_cast<ModifierDefinition const*>(declaration))
-	{
-		parameters = &modifierDecl->parameters();
-		if (auto const* modifierContract = dynamic_cast<ContractDefinition const*>(modifierDecl->scope()))
-			if (m_currentContract)
-			{
-				if (!util::contains(m_currentContract->annotation().linearizedBaseContracts, modifierContract))
-					m_errorReporter.typeError(
-						9428_error,
-						_modifier.location(),
-						"Can only use modifiers defined in the current contract or in base contracts."
-					);
-			}
-		if (
-			*_modifier.name().annotation().requiredLookup == VirtualLookup::Static &&
-			!modifierDecl->isImplemented()
-		)
-			m_errorReporter.typeError(
-				1835_error,
-				_modifier.location(),
-				"Cannot call unimplemented modifier. The modifier has no implementation in the referenced contract. Refer to it by its unqualified name if you want to call the implementation from the most derived contract."
-			);
-	}
-	else
-		// check parameters for Base constructors
-		for (ContractDefinition const* base: _bases)
-			if (declaration == base)
-			{
-				if (auto referencedConstructor = base->constructor())
-					parameters = &referencedConstructor->parameters();
-				else
-					parameters = &emptyParameterList;
-				break;
-			}
-	if (!parameters)
-	{
-		m_errorReporter.typeError(4659_error, _modifier.location(), "Referenced declaration is neither modifier nor base class.");
-		return;
-	}
-	if (parameters->size() != arguments.size())
-	{
-		m_errorReporter.typeError(
-			2973_error,
-			_modifier.location(),
-			"Wrong argument count for modifier invocation: " +
-			toString(arguments.size()) +
-			" arguments given but expected " +
-			toString(parameters->size()) +
-			"."
-		);
-		return;
-	}
-	for (size_t i = 0; i < arguments.size(); ++i)
-	{
-		BoolResult result = type(*arguments[i])->isImplicitlyConvertibleTo(*type(*(*parameters)[i]));
-		if (!result)
-			m_errorReporter.typeErrorConcatenateDescriptions(
-				4649_error,
-				arguments[i]->location(),
-				"Invalid type for argument in modifier invocation. "
-				"Invalid implicit conversion from " +
-				type(*arguments[i])->humanReadableName() +
-				" to " +
-				type(*(*parameters)[i])->humanReadableName() +
-				" requested.",
-				result.message()
-			);
-	}
-}
-
-bool TypeChecker::visit(EventDefinition const& _eventDef)
-{
-	solAssert(_eventDef.visibility() > Visibility::Internal, "");
-	checkErrorAndEventParameters(_eventDef);
-
-	auto numIndexed = ranges::count_if(
-		_eventDef.parameters(),
-		[](ASTPointer<VariableDeclaration> const& var) { return var->isIndexed(); }
-	);
-	if (_eventDef.isAnonymous() && numIndexed > 4)
-		m_errorReporter.typeError(8598_error, _eventDef.location(), "More than 4 indexed arguments for anonymous event.");
-	else if (!_eventDef.isAnonymous() && numIndexed > 3)
-		m_errorReporter.typeError(7249_error, _eventDef.location(), "More than 3 indexed arguments for event.");
-	return true;
-}
-
-bool TypeChecker::visit(ErrorDefinition const& _errorDef)
-{
-	solAssert(_errorDef.visibility() > Visibility::Internal, "");
-	checkErrorAndEventParameters(_errorDef);
-	return true;
-}
-
-void TypeChecker::endVisit(FunctionTypeName const& _funType)
-{
-	FunctionType const& fun = dynamic_cast<FunctionType const&>(*_funType.annotation().type);
-	if (fun.kind() == FunctionType::Kind::External)
-	{
-		for (auto const& t: _funType.parameterTypes() + _funType.returnParameterTypes())
-		{
-			solAssert(t->annotation().type, "Type not set for parameter.");
-			if (!t->annotation().type->interfaceType(false).get())
-				m_errorReporter.fatalTypeError(2582_error, t->location(), "Internal type cannot be used for external function type.");
-		}
-		solAssert(fun.interfaceType(false), "External function type uses internal types.");
-	}
-}
-
-bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
-{
-	bool lvalueAccessToMemoryVariable = false;
-	// External references have already been resolved in a prior stage and stored in the annotation.
-	// We run the resolve step again regardless.
-	yul::ExternalIdentifierAccess::Resolver identifierAccess = [&](
-		yul::Identifier const& _identifier,
-		yul::IdentifierContext _context,
-		bool
-	) -> bool
-	{
-		if (_context == yul::IdentifierContext::NonExternal)
-		{
-			// Hack until we can disallow any shadowing: If we found an internal reference,
-			// clear the external references, so that codegen does not use it.
-			_inlineAssembly.annotation().externalReferences.erase(& _identifier);
-			return false;
-		}
-		auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
-		if (ref == _inlineAssembly.annotation().externalReferences.end())
-			return false;
-		InlineAssemblyAnnotation::ExternalIdentifierInfo& identifierInfo = ref->second;
-		Declaration const* declaration = identifierInfo.declaration;
-		solAssert(!!declaration, "");
-		if (auto var = dynamic_cast<VariableDeclaration const*>(declaration))
-		{
-			solAssert(var->type(), "Expected variable type!");
-			if (_context == yul::IdentifierContext::LValue && var->type()->dataStoredIn(DataLocation::Memory))
-				lvalueAccessToMemoryVariable = true;
-			if (var->immutable())
-			{
-				m_errorReporter.typeError(3773_error, nativeLocationOf(_identifier), "Assembly access to immutable variables is not supported.");
-				return false;
-			}
-			if (var->isConstant())
-			{
-				if (isConstantVariableRecursive(*var))
-				{
-					m_errorReporter.typeError(
-						3558_error,
-						nativeLocationOf(_identifier),
-						"Constant variable is circular."
-					);
-					return false;
-				}
-
-				var = rootConstVariableDeclaration(*var);
-
-				if (var && !var->value())
-				{
-					m_errorReporter.typeError(3224_error, nativeLocationOf(_identifier), "Constant has no value.");
-					return false;
-				}
-				else if (_context == yul::IdentifierContext::LValue)
-				{
-					m_errorReporter.typeError(6252_error, nativeLocationOf(_identifier), "Constant variables cannot be assigned to.");
-					return false;
-				}
-				else if (identifierInfo.suffix == "slot" || identifierInfo.suffix == "offset")
-				{
-					m_errorReporter.typeError(6617_error, nativeLocationOf(_identifier), "The suffixes .offset and .slot can only be used on non-constant storage variables.");
-					return false;
-				}
-				else if (var && var->value() && !var->value()->annotation().type && !dynamic_cast<Literal const*>(var->value().get()))
-				{
-					m_errorReporter.typeError(
-						2249_error,
-						nativeLocationOf(_identifier),
-						"Constant variables with non-literal values cannot be forward referenced from inline assembly."
-					);
-					return false;
-				}
-				else if (!var || !type(*var)->isValueType() || (
-					!dynamic_cast<Literal const*>(var->value().get()) &&
-					type(*var->value())->category() != Type::Category::RationalNumber
-				))
-				{
-					m_errorReporter.typeError(7615_error, nativeLocationOf(_identifier), "Only direct number constants and references to such constants are supported by inline assembly.");
-					return false;
-				}
-			}
-
-			solAssert(!dynamic_cast<FixedPointType const*>(var->type()), "FixedPointType not implemented.");
-
-			if (!identifierInfo.suffix.empty())
-			{
-				std::string const& suffix = identifierInfo.suffix;
-				solAssert((std::set<std::string>{"offset", "slot", "length", "selector", "address"}).count(suffix), "");
-				if (!var->isConstant() && (var->isStateVariable() || var->type()->dataStoredIn(DataLocation::Storage)))
-				{
-					if (suffix != "slot" && suffix != "offset")
-					{
-						m_errorReporter.typeError(4656_error, nativeLocationOf(_identifier), "State variables only support \".slot\" and \".offset\".");
-						return false;
-					}
-					else if (_context == yul::IdentifierContext::LValue)
-					{
-						if (var->isStateVariable())
-						{
-							m_errorReporter.typeError(4713_error, nativeLocationOf(_identifier), "State variables cannot be assigned to - you have to use \"sstore()\".");
-							return false;
-						}
-						else if (suffix != "slot")
-						{
-							m_errorReporter.typeError(9739_error, nativeLocationOf(_identifier), "Only .slot can be assigned to.");
-							return false;
-						}
-					}
-				}
-				else if (
-					auto const* arrayType = dynamic_cast<ArrayType const*>(var->type());
-					arrayType && arrayType->isDynamicallySized() && arrayType->dataStoredIn(DataLocation::CallData)
-				)
-				{
-					if (suffix != "offset" && suffix != "length")
-					{
-						m_errorReporter.typeError(1536_error, nativeLocationOf(_identifier), "Calldata variables only support \".offset\" and \".length\".");
-						return false;
-					}
-				}
-				else if (auto const* fpType = dynamic_cast<FunctionTypePointer>(var->type()))
-				{
-					if (suffix != "selector" && suffix != "address")
-					{
-						m_errorReporter.typeError(9272_error, nativeLocationOf(_identifier), "Variables of type function pointer only support \".selector\" and \".address\".");
-						return false;
-					}
-					if (fpType->kind() != FunctionType::Kind::External)
-					{
-						m_errorReporter.typeError(8533_error, nativeLocationOf(_identifier), "Only Variables of type external function pointer support \".selector\" and \".address\".");
-						return false;
-					}
-				}
-				else
-				{
-					m_errorReporter.typeError(3622_error, nativeLocationOf(_identifier), "The suffix \"." + suffix + "\" is not supported by this variable or type.");
-					return false;
-				}
-			}
-			else if (!var->isConstant() && var->isStateVariable())
-			{
-				m_errorReporter.typeError(
-					1408_error,
-					nativeLocationOf(_identifier),
-					"Only local variables are supported. To access storage variables, use the \".slot\" and \".offset\" suffixes."
-				);
-				return false;
-			}
-			else if (var->type()->dataStoredIn(DataLocation::Storage))
-			{
-				m_errorReporter.typeError(9068_error, nativeLocationOf(_identifier), "You have to use the \".slot\" or \".offset\" suffix to access storage reference variables.");
-				return false;
-			}
-			else if (var->type()->sizeOnStack() != 1)
-			{
-				if (
-					auto const* arrayType = dynamic_cast<ArrayType const*>(var->type());
-					arrayType && arrayType->isDynamicallySized() && arrayType->dataStoredIn(DataLocation::CallData)
-				)
-					m_errorReporter.typeError(1397_error, nativeLocationOf(_identifier), "Call data elements cannot be accessed directly. Use \".offset\" and \".length\" to access the calldata offset and length of this array and then use \"calldatacopy\".");
-				else
-				{
-					solAssert(!var->type()->dataStoredIn(DataLocation::CallData), "");
-					m_errorReporter.typeError(9857_error, nativeLocationOf(_identifier), "Only types that use one stack slot are supported.");
-				}
-				return false;
-			}
-		}
-		else if (!identifierInfo.suffix.empty())
-		{
-			m_errorReporter.typeError(7944_error, nativeLocationOf(_identifier), "The suffixes \".offset\", \".slot\" and \".length\" can only be used with variables.");
-			return false;
-		}
-		else if (_context == yul::IdentifierContext::LValue)
-		{
-			if (dynamic_cast<MagicVariableDeclaration const*>(declaration))
-				return false;
-
-			m_errorReporter.typeError(1990_error, nativeLocationOf(_identifier), "Only local variables can be assigned to in inline assembly.");
-			return false;
-		}
-
-		if (_context == yul::IdentifierContext::RValue)
-		{
-			solAssert(!!declaration->type(), "Type of declaration required but not yet determined.");
-			if (dynamic_cast<FunctionDefinition const*>(declaration))
-			{
-				m_errorReporter.declarationError(2025_error, nativeLocationOf(_identifier), "Access to functions is not allowed in inline assembly.");
-				return false;
-			}
-			else if (dynamic_cast<VariableDeclaration const*>(declaration))
-			{
-			}
-			else if (auto contract = dynamic_cast<ContractDefinition const*>(declaration))
-			{
-				if (!contract->isLibrary())
-				{
-					m_errorReporter.typeError(4977_error, nativeLocationOf(_identifier), "Expected a library.");
-					return false;
-				}
-			}
-			else
-				return false;
-		}
-		identifierInfo.valueSize = 1;
-		return true;
-	};
-	solAssert(!_inlineAssembly.annotation().analysisInfo, "");
-	_inlineAssembly.annotation().analysisInfo = std::make_shared<yul::AsmAnalysisInfo>();
-	yul::AsmAnalyzer analyzer(
-		*_inlineAssembly.annotation().analysisInfo,
-		m_errorReporter,
-		_inlineAssembly.dialect(),
-		identifierAccess
-	);
-	if (!analyzer.analyze(_inlineAssembly.operations()))
-		solAssert(m_errorReporter.hasErrors());
-	_inlineAssembly.annotation().hasMemoryEffects =
-		lvalueAccessToMemoryVariable ||
-		(analyzer.sideEffects().memory != yul::SideEffects::None);
-	return false;
-}
-
-bool TypeChecker::visit(IfStatement const& _ifStatement)
-{
-	expectType(_ifStatement.condition(), *TypeProvider::boolean());
-	_ifStatement.trueStatement().accept(*this);
-	if (_ifStatement.falseStatement())
-		_ifStatement.falseStatement()->accept(*this);
-	return false;
-}
-
-void TypeChecker::endVisit(TryStatement const& _tryStatement)
-{
-	FunctionCall const* externalCall = dynamic_cast<FunctionCall const*>(&_tryStatement.externalCall());
-	if (!externalCall || *externalCall->annotation().kind != FunctionCallKind::FunctionCall)
-	{
-		m_errorReporter.typeError(
-			5347_error,
-			_tryStatement.externalCall().location(),
-			"Try can only be used with external function calls and contract creation calls."
-		);
-		return;
-	}
-
-	FunctionType const& functionType = dynamic_cast<FunctionType const&>(*externalCall->expression().annotation().type);
-	if (
-		functionType.kind() != FunctionType::Kind::External &&
-		functionType.kind() != FunctionType::Kind::Creation &&
-		functionType.kind() != FunctionType::Kind::DelegateCall
-	)
-	{
-		m_errorReporter.typeError(
-			2536_error,
-			_tryStatement.externalCall().location(),
-			"Try can only be used with external function calls and contract creation calls."
-		);
-		return;
-	}
-
-	externalCall->annotation().tryCall = true;
-
-	solAssert(_tryStatement.clauses().size() >= 2, "");
-	solAssert(_tryStatement.clauses().front(), "");
-
-	TryCatchClause const& successClause = *_tryStatement.clauses().front();
-	if (successClause.parameters())
-	{
-		TypePointers returnTypes =
-			m_evmVersion.supportsReturndata() ?
-			functionType.returnParameterTypes() :
-			functionType.returnParameterTypesWithoutDynamicTypes();
-		std::vector<ASTPointer<VariableDeclaration>> const& parameters =
-			successClause.parameters()->parameters();
-		if (returnTypes.size() != parameters.size())
-			m_errorReporter.typeError(
-				2800_error,
-				successClause.location(),
-				"Function returns " +
-				std::to_string(functionType.returnParameterTypes().size()) +
-				" values, but returns clause has " +
-				std::to_string(parameters.size()) +
-				" variables."
-			);
-		for (auto&& [parameter, returnType]: ranges::views::zip(parameters, returnTypes))
-		{
-			solAssert(returnType, "");
-			if (parameter && *parameter->annotation().type != *returnType)
-				m_errorReporter.typeError(
-					6509_error,
-					parameter->location(),
-					"Invalid type, expected " +
-					returnType->humanReadableName() +
-					" but got " +
-					parameter->annotation().type->humanReadableName() +
-					"."
-				);
-		}
-	}
-
-	TryCatchClause const* panicClause = nullptr;
-	TryCatchClause const* errorClause = nullptr;
-	TryCatchClause const* lowLevelClause = nullptr;
-	for (auto const& clause: _tryStatement.clauses() | ranges::views::drop_exactly(1) | views::dereferenceChecked)
-	{
-		if (clause.errorName() == "")
-		{
-			if (lowLevelClause)
-				m_errorReporter.typeError(
-					5320_error,
-					clause.location(),
-					SecondarySourceLocation{}.append("The first clause is here:", lowLevelClause->location()),
-					"This try statement already has a low-level catch clause."
-				);
-			lowLevelClause = &clause;
-			if (clause.parameters() && !clause.parameters()->parameters().empty())
-			{
-				if (
-					clause.parameters()->parameters().size() != 1 ||
-					*clause.parameters()->parameters().front()->type() != *TypeProvider::bytesMemory()
-				)
-					m_errorReporter.typeError(6231_error, clause.location(), "Expected `catch (bytes memory ...) { ... }` or `catch { ... }`.");
-				if (!m_evmVersion.supportsReturndata())
-					m_errorReporter.typeError(
-						9908_error,
-						clause.location(),
-						"This catch clause type cannot be used on the selected EVM version (" +
-						m_evmVersion.name() +
-						"). You need at least a Byzantium-compatible EVM or use `catch { ... }`."
-					);
-			}
-		}
-		else if (clause.errorName() == "Error" || clause.errorName() == "Panic")
-		{
-			if (!m_evmVersion.supportsReturndata())
-				m_errorReporter.typeError(
-					1812_error,
-					clause.location(),
-					"This catch clause type cannot be used on the selected EVM version (" +
-					m_evmVersion.name() +
-					"). You need at least a Byzantium-compatible EVM or use `catch { ... }`."
-				);
-
-			if (clause.errorName() == "Error")
-			{
-				if (errorClause)
-					m_errorReporter.typeError(
-						1036_error,
-						clause.location(),
-						SecondarySourceLocation{}.append("The first clause is here:", errorClause->location()),
-						"This try statement already has an \"Error\" catch clause."
-					);
-				errorClause = &clause;
-				if (
-					!clause.parameters() ||
-					clause.parameters()->parameters().size() != 1 ||
-					*clause.parameters()->parameters().front()->type() != *TypeProvider::stringMemory()
-				)
-					m_errorReporter.typeError(2943_error, clause.location(), "Expected `catch Error(string memory ...) { ... }`.");
-			}
-			else
-			{
-				if (panicClause)
-					m_errorReporter.typeError(
-						6732_error,
-						clause.location(),
-						SecondarySourceLocation{}.append("The first clause is here:", panicClause->location()),
-						"This try statement already has a \"Panic\" catch clause."
-					);
-				panicClause = &clause;
-				if (
-					!clause.parameters() ||
-					clause.parameters()->parameters().size() != 1 ||
-					*clause.parameters()->parameters().front()->type() != *TypeProvider::uint256()
-				)
-					m_errorReporter.typeError(1271_error, clause.location(), "Expected `catch Panic(uint ...) { ... }`.");
-			}
-		}
-		else
-			m_errorReporter.typeError(
-				3542_error,
-				clause.location(),
-				"Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`."
-			);
-	}
-}
-
-bool TypeChecker::visit(WhileStatement const& _whileStatement)
-{
-	expectType(_whileStatement.condition(), *TypeProvider::boolean());
-	_whileStatement.body().accept(*this);
-	return false;
-}
-
-bool TypeChecker::visit(ForStatement const& _forStatement)
-{
-	if (_forStatement.initializationExpression())
-		_forStatement.initializationExpression()->accept(*this);
-	if (_forStatement.condition())
-		expectType(*_forStatement.condition(), *TypeProvider::boolean());
-	if (_forStatement.loopExpression())
-		_forStatement.loopExpression()->accept(*this);
-	_forStatement.body().accept(*this);
-	return false;
-}
-
-void TypeChecker::endVisit(Return const& _return)
-{
-	ParameterList const* params = _return.annotation().functionReturnParameters;
-	if (!_return.expression())
-	{
-		if (params && !params->parameters().empty())
-			m_errorReporter.typeError(6777_error, _return.location(), "Return arguments required.");
-		return;
-	}
-	if (!params)
-	{
-		m_errorReporter.typeError(7552_error, _return.location(), "Return arguments not allowed.");
-		return;
-	}
-	TypePointers returnTypes;
-	for (auto const& var: params->parameters())
-		returnTypes.push_back(type(*var));
-	if (auto tupleType = dynamic_cast<TupleType const*>(type(*_return.expression())))
-	{
-		if (tupleType->components().size() != params->parameters().size())
-			m_errorReporter.typeError(5132_error, _return.location(), "Different number of arguments in return statement than in returns declaration.");
-		else
-		{
-			BoolResult result = tupleType->isImplicitlyConvertibleTo(TupleType(returnTypes));
-			if (!result)
-				m_errorReporter.typeErrorConcatenateDescriptions(
-					5992_error,
-					_return.expression()->location(),
-					"Return argument type " +
-					type(*_return.expression())->humanReadableName() +
-					" is not implicitly convertible to expected type " +
-					TupleType(returnTypes).humanReadableName() + ".",
-					result.message()
-				);
-		}
-	}
-	else if (params->parameters().size() != 1)
-		m_errorReporter.typeError(8863_error, _return.location(), "Different number of arguments in return statement than in returns declaration.");
-	else
-	{
-		Type const* expected = type(*params->parameters().front());
-		BoolResult result = type(*_return.expression())->isImplicitlyConvertibleTo(*expected);
-		if (!result)
-			m_errorReporter.typeErrorConcatenateDescriptions(
-				6359_error,
-				_return.expression()->location(),
-				"Return argument type " +
-				type(*_return.expression())->humanReadableName() +
-				" is not implicitly convertible to expected type (type of first return variable) " +
-				expected->humanReadableName() + ".",
-				result.message()
-			);
-	}
-}
-
-void TypeChecker::endVisit(EmitStatement const& _emit)
-{
-	if (
-		*_emit.eventCall().annotation().kind != FunctionCallKind::FunctionCall ||
-		type(_emit.eventCall().expression())->category() != Type::Category::Function ||
-		dynamic_cast<FunctionType const&>(*type(_emit.eventCall().expression())).kind() != FunctionType::Kind::Event
-	)
-		m_errorReporter.typeError(9292_error, _emit.eventCall().expression().location(), "Expression has to be an event invocation.");
-}
-
-void TypeChecker::endVisit(RevertStatement const& _revert)
-{
-	FunctionCall const& errorCall = _revert.errorCall();
-	if (
-		*errorCall.annotation().kind != FunctionCallKind::FunctionCall ||
-		type(errorCall.expression())->category() != Type::Category::Function ||
-		dynamic_cast<FunctionType const&>(*type(errorCall.expression())).kind() != FunctionType::Kind::Error
-	)
-		m_errorReporter.typeError(1885_error, errorCall.expression().location(), "Expression has to be an error.");
-}
-
-void TypeChecker::endVisit(ArrayTypeName const& _typeName)
-{
-	solAssert(
-		_typeName.baseType().annotation().type &&
-		_typeName.baseType().annotation().type->storageBytes() != 0,
-		"Illegal base type of storage size zero for array."
-	);
-}
-
-bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
-{
-	if (!_statement.initialValue())
-	{
-		// No initial value is only permitted for single variables with specified type.
-		// This usually already results in a parser error.
-		if (_statement.declarations().size() != 1 || !_statement.declarations().front())
-		{
-			solAssert(m_errorReporter.hasErrors(), "");
-
-			// It is okay to return here, as there are no named components on the
-			// left-hand-side that could cause any damage later.
-			return false;
-		}
-
-		VariableDeclaration const& varDecl = *_statement.declarations().front();
-		solAssert(varDecl.annotation().type, "");
-
-		if (dynamic_cast<MappingType const*>(type(varDecl)))
-			m_errorReporter.typeError(
-				4182_error,
-				varDecl.location(),
-				"Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable."
-			);
-		varDecl.accept(*this);
-		return false;
-	}
-
-	// Here we have an initial value and might have to derive some types before we can visit
-	// the variable declaration(s).
-
-	_statement.initialValue()->accept(*this);
-	TypePointers valueTypes;
-	if (auto tupleType = dynamic_cast<TupleType const*>(type(*_statement.initialValue())))
-		valueTypes = tupleType->components();
-	else
-		valueTypes = TypePointers{type(*_statement.initialValue())};
-
-	std::vector<ASTPointer<VariableDeclaration>> const& variables = _statement.declarations();
-	if (variables.empty())
-		// We already have an error for this in the SyntaxChecker.
-		solAssert(m_errorReporter.hasErrors(), "");
-	else if (valueTypes.size() != variables.size())
-		m_errorReporter.typeError(
-			7364_error,
-			_statement.location(),
-			"Different number of components on the left hand side (" +
-			toString(variables.size()) +
-			") than on the right hand side (" +
-			toString(valueTypes.size()) +
-			")."
-		);
-
-	for (size_t i = 0; i < std::min(variables.size(), valueTypes.size()); ++i)
-	{
-		if (!variables[i])
-			continue;
-		VariableDeclaration const& var = *variables[i];
-		solAssert(!var.value(), "Value has to be tied to statement.");
-		Type const* valueComponentType = valueTypes[i];
-		solAssert(!!valueComponentType, "");
-		solAssert(var.annotation().type, "");
-
-		var.accept(*this);
-		BoolResult result = valueComponentType->isImplicitlyConvertibleTo(*var.annotation().type);
-		if (!result)
-		{
-			auto errorMsg = "Type " +
-				valueComponentType->humanReadableName() +
-				" is not implicitly convertible to expected type " +
-				var.annotation().type->humanReadableName();
-			if (
-				valueComponentType->category() == Type::Category::RationalNumber &&
-				dynamic_cast<RationalNumberType const&>(*valueComponentType).isFractional() &&
-				valueComponentType->mobileType()
-			)
-			{
-				if (var.annotation().type->operator==(*valueComponentType->mobileType()))
-					m_errorReporter.typeError(
-						5107_error,
-						_statement.location(),
-						errorMsg + ", but it can be explicitly converted."
-					);
-				else
-					m_errorReporter.typeError(
-						4486_error,
-						_statement.location(),
-						errorMsg +
-						". Try converting to type " +
-						valueComponentType->mobileType()->humanReadableName() +
-						" or use an explicit conversion."
-					);
-			}
-			else
-				m_errorReporter.typeErrorConcatenateDescriptions(
-					9574_error,
-					_statement.location(),
-					errorMsg + ".",
-					result.message()
-				);
-		}
-	}
-
-	if (valueTypes.size() != variables.size())
-	{
-		solAssert(m_errorReporter.hasErrors(), "Should have errors!");
-		for (auto const& var: variables)
-			if (var && !var->annotation().type)
-				BOOST_THROW_EXCEPTION(FatalError());
-	}
-
-	return false;
-}
-
-void TypeChecker::endVisit(ExpressionStatement const& _statement)
-{
-	if (type(_statement.expression())->category() == Type::Category::RationalNumber)
-		if (!dynamic_cast<RationalNumberType const&>(*type(_statement.expression())).mobileType())
-			m_errorReporter.typeError(3757_error, _statement.expression().location(), "Invalid rational number.");
-
-	if (auto call = dynamic_cast<FunctionCall const*>(&_statement.expression()))
-	{
-		if (auto callType = dynamic_cast<FunctionType const*>(type(call->expression())))
-		{
-			auto kind = callType->kind();
-			if (
-				kind == FunctionType::Kind::BareCall ||
-				kind == FunctionType::Kind::BareCallCode ||
-				kind == FunctionType::Kind::BareDelegateCall ||
-				kind == FunctionType::Kind::BareStaticCall
-			)
-				m_errorReporter.warning(9302_error, _statement.location(), "Return value of low-level calls not used.");
-			else if (kind == FunctionType::Kind::Send)
-				m_errorReporter.warning(5878_error, _statement.location(), "Failure condition of 'send' ignored. Consider using 'transfer' instead.");
-		}
-	}
-}
-
-bool TypeChecker::visit(Conditional const& _conditional)
-{
-	expectType(_conditional.condition(), *TypeProvider::boolean());
-
-	_conditional.trueExpression().accept(*this);
-	_conditional.falseExpression().accept(*this);
-
-	Type const* trueType = type(_conditional.trueExpression())->mobileType();
-	Type const* falseType = type(_conditional.falseExpression())->mobileType();
-
-	Type const* commonType = nullptr;
-
-	if (!trueType)
-		m_errorReporter.typeError(9717_error, _conditional.trueExpression().location(), "Invalid mobile type in true expression.");
-	else
-		commonType = trueType;
-
-	if (!falseType)
-		m_errorReporter.typeError(3703_error, _conditional.falseExpression().location(), "Invalid mobile type in false expression.");
-	else
-		commonType = falseType;
-
-	if (!trueType && !falseType)
-		BOOST_THROW_EXCEPTION(FatalError());
-	else if (trueType && falseType)
-	{
-		commonType = Type::commonType(trueType, falseType);
-
-		if (!commonType)
-		{
-			m_errorReporter.typeError(
-					1080_error,
-					_conditional.location(),
-					"True expression's type " +
-					trueType->humanReadableName() +
-					" does not match false expression's type " +
-					falseType->humanReadableName() +
-					"."
-					);
-			// even we can't find a common type, we have to set a type here,
-			// otherwise the upper statement will not be able to check the type.
-			commonType = trueType;
-		}
-	}
-
-	_conditional.annotation().isConstant = false;
-	_conditional.annotation().type = commonType;
-	_conditional.annotation().isPure =
-		*_conditional.condition().annotation().isPure &&
-		*_conditional.trueExpression().annotation().isPure &&
-		*_conditional.falseExpression().annotation().isPure;
-
-	_conditional.annotation().isLValue = false;
-
-	if (_conditional.annotation().willBeWrittenTo)
-		m_errorReporter.typeError(
-			2212_error,
-			_conditional.location(),
-			"Conditional expression as left value is not supported yet."
-		);
-
-	return false;
-}
-
-void TypeChecker::checkExpressionAssignment(Type const& _type, Expression const& _expression)
-{
-	if (auto const* tupleExpression = dynamic_cast<TupleExpression const*>(&_expression))
-	{
-		if (tupleExpression->components().empty())
-			m_errorReporter.typeError(5547_error, _expression.location(), "Empty tuple on the left hand side.");
-
-		auto const* tupleType = dynamic_cast<TupleType const*>(&_type);
-		auto const& types = tupleType && tupleExpression->components().size() != 1 ? tupleType->components() : std::vector<Type const*> { &_type };
-
-		solAssert(
-			tupleExpression->components().size() == types.size() || m_errorReporter.hasErrors(),
-			"Array sizes don't match and no errors generated."
-		);
-
-		for (size_t i = 0; i < std::min(tupleExpression->components().size(), types.size()); i++)
-			if (types[i])
-			{
-				solAssert(!!tupleExpression->components()[i], "");
-				checkExpressionAssignment(*types[i], *tupleExpression->components()[i]);
-			}
-	}
-	else if (_type.nameable() && _type.containsNestedMapping())
-	{
-		bool isLocalOrReturn = false;
-		if (auto const* identifier = dynamic_cast<Identifier const*>(&_expression))
-			if (auto const *variableDeclaration = dynamic_cast<VariableDeclaration const*>(identifier->annotation().referencedDeclaration))
-				if (variableDeclaration->isLocalOrReturn())
-					isLocalOrReturn = true;
-		if (!isLocalOrReturn)
-			m_errorReporter.typeError(9214_error, _expression.location(), "Types in storage containing (nested) mappings cannot be assigned to.");
-	}
-}
-
-bool TypeChecker::visit(Assignment const& _assignment)
-{
-	requireLValue(
-		_assignment.leftHandSide(),
-		_assignment.assignmentOperator() == Token::Assign
-	);
-	Type const* t = type(_assignment.leftHandSide());
-	_assignment.annotation().type = t;
-	_assignment.annotation().isPure = false;
-	_assignment.annotation().isLValue = false;
-	_assignment.annotation().isConstant = false;
-
-	checkExpressionAssignment(*t, _assignment.leftHandSide());
-
-	if (TupleType const* tupleType = dynamic_cast<TupleType const*>(t))
-	{
-		if (_assignment.assignmentOperator() != Token::Assign)
-			m_errorReporter.typeError(
-				4289_error,
-				_assignment.location(),
-				"Compound assignment is not allowed for tuple types."
-			);
-		// Sequenced assignments of tuples is not valid, make the result a "void" type.
-		_assignment.annotation().type = TypeProvider::emptyTuple();
-
-		expectType(_assignment.rightHandSide(), *tupleType);
-
-		// expectType does not cause fatal errors, so we have to check again here.
-		if (dynamic_cast<TupleType const*>(type(_assignment.rightHandSide())))
-			checkDoubleStorageAssignment(_assignment);
-	}
-	else if (_assignment.assignmentOperator() == Token::Assign)
-		expectType(_assignment.rightHandSide(), *t);
-	else
-	{
-		// compound assignment
-		_assignment.rightHandSide().accept(*this);
-		Type const* resultType = t->binaryOperatorResult(
-			TokenTraits::AssignmentToBinaryOp(_assignment.assignmentOperator()),
-			type(_assignment.rightHandSide())
-		);
-		if (!resultType || *resultType != *t)
-			m_errorReporter.typeError(
-				7366_error,
-				_assignment.location(),
-				"Operator " +
-				std::string(TokenTraits::friendlyName(_assignment.assignmentOperator())) +
-				" not compatible with types " +
-				t->humanReadableName() +
-				" and " +
-				type(_assignment.rightHandSide())->humanReadableName() +
-				"."
-			);
-	}
-	return false;
-}
-
-bool TypeChecker::visit(TupleExpression const& _tuple)
-{
-	_tuple.annotation().isConstant = false;
-	std::vector<ASTPointer<Expression>> const& components = _tuple.components();
-	TypePointers types;
-
-	if (_tuple.annotation().willBeWrittenTo)
-	{
-		if (_tuple.isInlineArray())
-			m_errorReporter.fatalTypeError(3025_error, _tuple.location(), "Inline array type cannot be declared as LValue.");
-		for (auto const& component: components)
-			if (component)
-			{
-				requireLValue(
-					*component,
-					_tuple.annotation().lValueOfOrdinaryAssignment
-				);
-				types.push_back(type(*component));
-			}
-			else
-				types.push_back(nullptr);
-		if (components.size() == 1)
-			_tuple.annotation().type = type(*components[0]);
-		else
-			_tuple.annotation().type = TypeProvider::tuple(std::move(types));
-		// If some of the components are not LValues, the error is reported above.
-		_tuple.annotation().isLValue = true;
-		_tuple.annotation().isPure = false;
-	}
-	else
-	{
-		bool isPure = true;
-		Type const* inlineArrayType = nullptr;
-
-		for (size_t i = 0; i < components.size(); ++i)
-		{
-			if (!components[i])
-				m_errorReporter.fatalTypeError(8381_error, _tuple.location(), "Tuple component cannot be empty.");
-
-			components[i]->accept(*this);
-			types.push_back(type(*components[i]));
-
-			if (types[i]->category() == Type::Category::Tuple)
-				if (dynamic_cast<TupleType const&>(*types[i]).components().empty())
-				{
-					if (_tuple.isInlineArray())
-						m_errorReporter.fatalTypeError(5604_error, components[i]->location(), "Array component cannot be empty.");
-					m_errorReporter.typeError(6473_error, components[i]->location(), "Tuple component cannot be empty.");
-				}
-
-			// Note: code generation will visit each of the expression even if they are not assigned from.
-			if (types[i]->category() == Type::Category::RationalNumber && components.size() > 1)
-				if (!dynamic_cast<RationalNumberType const&>(*types[i]).mobileType())
-					m_errorReporter.fatalTypeError(3390_error, components[i]->location(), "Invalid rational number.");
-
-			if (_tuple.isInlineArray())
-			{
-				solAssert(!!types[i], "Inline array cannot have empty components");
-
-				if ((i == 0 || inlineArrayType) && !types[i]->mobileType())
-					m_errorReporter.fatalTypeError(9563_error, components[i]->location(), "Invalid mobile type.");
-
-				if (i == 0)
-					inlineArrayType = types[i]->mobileType();
-				else if (inlineArrayType)
-					inlineArrayType = Type::commonType(inlineArrayType, types[i]);
-			}
-			if (!*components[i]->annotation().isPure)
-				isPure = false;
-		}
-		_tuple.annotation().isPure = isPure;
-		if (_tuple.isInlineArray())
-		{
-			if (!inlineArrayType)
-				m_errorReporter.fatalTypeError(6378_error, _tuple.location(), "Unable to deduce common type for array elements.");
-			else if (!inlineArrayType->nameable())
-				m_errorReporter.fatalTypeError(
-					9656_error,
-					_tuple.location(),
-					"Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element."
-				);
-			else if (inlineArrayType->containsNestedMapping())
-				m_errorReporter.fatalTypeError(
-					1545_error,
-					_tuple.location(),
-					"Type " + inlineArrayType->humanReadableName() + " is only valid in storage."
-				);
-
-			_tuple.annotation().type = TypeProvider::array(DataLocation::Memory, inlineArrayType, types.size());
-		}
-		else
-		{
-			if (components.size() == 1)
-				_tuple.annotation().type = type(*components[0]);
-			else
-				_tuple.annotation().type = TypeProvider::tuple(std::move(types));
-		}
-
-		_tuple.annotation().isLValue = false;
-	}
-	return false;
-}
-
-bool TypeChecker::visit(UnaryOperation const& _operation)
-{
-	// Inc, Dec, Add, Sub, Not, BitNot, Delete
-	Token op = _operation.getOperator();
-	bool const modifying = (op == Token::Inc || op == Token::Dec || op == Token::Delete);
-	if (modifying)
-		requireLValue(_operation.subExpression(), false);
-	else
-		_operation.subExpression().accept(*this);
-	Type const* operandType = type(_operation.subExpression());
-
-	// Check if the operator is built-in or user-defined.
-	TypeResult builtinResult = operandType->unaryOperatorResult(op);
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = operandType->operatorDefinitions(
-		op,
-		*currentDefinitionScope(),
-		true // _unary
-	);
-
-	// Operator can't be both user-defined and built-in at the same time.
-	solAssert(!builtinResult || matchingDefinitions.empty());
-
-	// By default use the type we'd expect from correct code. This way we can continue analysis
-	// of other expressions in a sensible way in case of a non-fatal error.
-	Type const* resultType = operandType;
-
-	FunctionDefinition const* operatorDefinition = nullptr;
-	if (builtinResult)
-		resultType = builtinResult;
-	else if (!matchingDefinitions.empty())
-	{
-		// This is checked along with `using for` directive but the error is not fatal.
-		if (matchingDefinitions.size() != 1)
-			solAssert(m_errorReporter.hasErrors());
-
-		operatorDefinition = *matchingDefinitions.begin();
-	}
-	else
-	{
-		std::string description = fmt::format(
-			"Built-in unary operator {} cannot be applied to type {}.",
-			TokenTraits::friendlyName(op),
-			operandType->humanReadableName()
-		);
-		if (!builtinResult.message().empty())
-			description += " " + builtinResult.message();
-		if (operandType->typeDefinition() && util::contains(userDefinableOperators, op))
-			description += " No matching user-defined operator found.";
-
-		if (modifying)
-			// Cannot just report the error, ignore the unary operator, and continue,
-			// because the sub-expression was already processed with requireLValue()
-			m_errorReporter.fatalTypeError(9767_error, _operation.location(), description);
-		else
-			m_errorReporter.typeError(4907_error, _operation.location(), description);
-	}
-
-	_operation.annotation().userDefinedFunction = operatorDefinition;
-
-	if (operatorDefinition && !_operation.userDefinedFunctionType()->returnParameterTypes().empty())
-		// Use the actual result type from operator definition. Ignore all values but the
-		// first one - in valid code there will be only one anyway.
-		resultType = _operation.userDefinedFunctionType()->returnParameterTypes()[0];
-	_operation.annotation().type = resultType;
-	_operation.annotation().isConstant = false;
-	_operation.annotation().isPure =
-		!modifying &&
-		*_operation.subExpression().annotation().isPure &&
-		(!_operation.userDefinedFunctionType() || _operation.userDefinedFunctionType()->isPure());
-	_operation.annotation().isLValue = false;
-
-	return false;
-}
-
-void TypeChecker::endVisit(BinaryOperation const& _operation)
-{
-	Type const* leftType = type(_operation.leftExpression());
-	Type const* rightType = type(_operation.rightExpression());
-
-	// Check if the operator is built-in or user-defined.
-	TypeResult builtinResult = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = leftType->operatorDefinitions(
-		_operation.getOperator(),
-		*currentDefinitionScope(),
-		false // _unary
-	);
-
-	// Operator can't be both user-defined and built-in at the same time.
-	solAssert(!builtinResult || matchingDefinitions.empty());
-
-	Type const* commonType = nullptr;
-	FunctionDefinition const* operatorDefinition = nullptr;
-	if (builtinResult)
-		commonType = builtinResult.get();
-	else if (!matchingDefinitions.empty())
-	{
-		// This is checked along with `using for` directive but the error is not fatal.
-		if (matchingDefinitions.size() != 1)
-			solAssert(m_errorReporter.hasErrors());
-
-		operatorDefinition = *matchingDefinitions.begin();
-
-		// Set common type to the type used in the `using for` directive.
-		commonType = leftType;
-	}
-	else
-	{
-		std::string description = fmt::format(
-			"Built-in binary operator {} cannot be applied to types {} and {}.",
-			TokenTraits::friendlyName(_operation.getOperator()),
-			leftType->humanReadableName(),
-			rightType->humanReadableName()
-		);
-		if (!builtinResult.message().empty())
-			description += " " + builtinResult.message();
-		if (leftType->typeDefinition() && util::contains(userDefinableOperators, _operation.getOperator()))
-			description += " No matching user-defined operator found.";
-
-		m_errorReporter.typeError(2271_error, _operation.location(), description);
-
-		// Set common type to something we'd expect from correct code just so that we can continue analysis.
-		commonType = leftType;
-	}
-
-	_operation.annotation().commonType = commonType;
-	_operation.annotation().userDefinedFunction = operatorDefinition;
-	FunctionType const* userDefinedFunctionType = _operation.userDefinedFunctionType();
-
-	// By default use the type we'd expect from correct code. This way we can continue analysis
-	// of other expressions in a sensible way in case of a non-fatal error.
-	Type const* resultType =
-		TokenTraits::isCompareOp(_operation.getOperator()) ?
-		TypeProvider::boolean() :
-		commonType;
-
-	if (operatorDefinition)
-	{
-		TypePointers const& parameterTypes = userDefinedFunctionType->parameterTypes();
-		TypePointers const& returnParameterTypes = userDefinedFunctionType->returnParameterTypes();
-
-		// operatorDefinitions() filters out definitions with non-matching first argument.
-		solAssert(parameterTypes.size() == 2);
-		solAssert(parameterTypes[0] && *leftType == *parameterTypes[0]);
-
-		if (*rightType != *parameterTypes[0])
-			m_errorReporter.typeError(
-				5653_error,
-				_operation.location(),
-				fmt::format(
-					"The type of the second operand of this user-defined binary operator {} "
-					"does not match the type of the first operand, which is {}.",
-					TokenTraits::friendlyName(_operation.getOperator()),
-					parameterTypes[0]->humanReadableName()
-				)
-			);
-
-		if (!returnParameterTypes.empty())
-			// Use the actual result type from operator definition. Ignore all values but the
-			// first one - in valid code there will be only one anyway.
-			resultType = returnParameterTypes[0];
-	}
-
-	_operation.annotation().type = resultType;
-	_operation.annotation().isPure =
-		*_operation.leftExpression().annotation().isPure &&
-		*_operation.rightExpression().annotation().isPure &&
-		(!userDefinedFunctionType || userDefinedFunctionType->isPure());
-	_operation.annotation().isLValue = false;
-	_operation.annotation().isConstant = false;
-
-	if (_operation.getOperator() == Token::Exp || _operation.getOperator() == Token::SHL)
-	{
-		std::string operation = _operation.getOperator() == Token::Exp ? "exponentiation" : "shift";
-		if (
-			leftType->category() == Type::Category::RationalNumber &&
-			rightType->category() != Type::Category::RationalNumber
-		)
-		{
-			// These rules are enforced by the binary operator, but assert them here too.
-			if (auto type = dynamic_cast<IntegerType const*>(commonType))
-				solAssert(type->numBits() == 256, "");
-			if (auto type = dynamic_cast<FixedPointType const*>(commonType))
-				solAssert(type->numBits() == 256, "");
-		}
-		if (
-			commonType->category() == Type::Category::Integer &&
-			rightType->category() == Type::Category::Integer &&
-			dynamic_cast<IntegerType const&>(*commonType).numBits() <
-			dynamic_cast<IntegerType const&>(*rightType).numBits()
-		)
-			m_errorReporter.warning(
-				3149_error,
-				_operation.location(),
-				fmt::format(
-					"The result type of the {} operation is equal to the type of the first operand ({}) "
-					"ignoring the (larger) type of the second operand ({}) which might be unexpected. "
-					"Silence this warning by either converting the first or the second operand to the type of the other.",
-					operation,
-					commonType->humanReadableName(),
-					rightType->humanReadableName()
-				)
-			);
-	}
-}
-
-Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
-	FunctionCall const& _functionCall
-)
-{
-	solAssert(*_functionCall.annotation().kind == FunctionCallKind::TypeConversion, "");
-	Type const* expressionType = type(_functionCall.expression());
-
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
-	bool const isPositionalCall = _functionCall.names().empty();
-
-	Type const* resultType = dynamic_cast<TypeType const&>(*expressionType).actualType();
-	if (arguments.size() != 1)
-		m_errorReporter.typeError(
-			2558_error,
-			_functionCall.location(),
-			"Exactly one argument expected for explicit type conversion."
-		);
-	else if (!isPositionalCall)
-		m_errorReporter.typeError(
-			5153_error,
-			_functionCall.location(),
-			"Type conversion cannot allow named arguments."
-		);
-	else
-	{
-		Type const* argType = type(*arguments.front());
-		// Resulting data location is memory unless we are converting from a reference
-		// type with a different data location.
-		// (data location cannot yet be specified for type conversions)
-		DataLocation dataLoc = DataLocation::Memory;
-		if (auto argRefType = dynamic_cast<ReferenceType const*>(argType))
-			dataLoc = argRefType->location();
-		if (auto type = dynamic_cast<ReferenceType const*>(resultType))
-			resultType = TypeProvider::withLocation(type, dataLoc, type->isPointer());
-		BoolResult result = argType->isExplicitlyConvertibleTo(*resultType);
-		if (result)
-		{
-			if (auto argArrayType = dynamic_cast<ArrayType const*>(argType))
-			{
-				if (auto resultArrayType = dynamic_cast<ArrayType const*>(resultType))
-					solAssert(
-						argArrayType->location() != DataLocation::Storage ||
-						(
-							(
-								resultArrayType->isPointer() ||
-								(argArrayType->isByteArrayOrString() && resultArrayType->isByteArrayOrString())
-							) &&
-							resultArrayType->location() == DataLocation::Storage
-						),
-						"Invalid explicit conversion to storage type."
-					);
-				else
-					solAssert(
-						argArrayType->isByteArray() && resultType->category() == Type::Category::FixedBytes,
-						""
-					);
-			}
-		}
-		else
-		{
-			if (
-				resultType->category() == Type::Category::Contract &&
-				argType->category() == Type::Category::Address
-			)
-			{
-				solAssert(dynamic_cast<ContractType const*>(resultType)->isPayable(), "");
-				solAssert(
-					dynamic_cast<AddressType const*>(argType)->stateMutability() <
-						StateMutability::Payable,
-					""
-				);
-				SecondarySourceLocation ssl;
-				if (
-					auto const* identifier = dynamic_cast<Identifier const*>(arguments.front().get())
-				)
-					if (
-						auto const* variableDeclaration = dynamic_cast<VariableDeclaration const*>(
-							identifier->annotation().referencedDeclaration
-						)
-					)
-						ssl.append(
-							"Did you mean to declare this variable as \"address payable\"?",
-							variableDeclaration->location()
-						);
-				m_errorReporter.typeError(
-					7398_error,
-					_functionCall.location(),
-					ssl,
-					"Explicit type conversion not allowed from non-payable \"address\" to \"" +
-					resultType->humanReadableName() +
-					"\", which has a payable fallback function."
-				);
-			}
-			else if (
-				auto const* functionType = dynamic_cast<FunctionType const*>(argType);
-				functionType &&
-				functionType->kind() == FunctionType::Kind::External &&
-				resultType->category() == Type::Category::Address
-			)
-				m_errorReporter.typeError(
-					5030_error,
-					_functionCall.location(),
-					"Explicit type conversion not allowed from \"" +
-					argType->humanReadableName() +
-					"\" to \"" +
-					resultType->humanReadableName() +
-					"\". To obtain the address of the contract of the function, " +
-					"you can use the .address member of the function."
-				);
-			else
-				m_errorReporter.typeErrorConcatenateDescriptions(
-					9640_error,
-					_functionCall.location(),
-					"Explicit type conversion not allowed from \"" +
-					argType->humanReadableName() +
-					"\" to \"" +
-					resultType->humanReadableName() +
-					"\".",
-					result.message()
-				);
-		}
-	}
-	return resultType;
-}
-
-void TypeChecker::typeCheckFunctionCall(
-	FunctionCall const& _functionCall,
-	FunctionTypePointer _functionType
-)
-{
-	// Actual function call or struct constructor call.
-
-	solAssert(!!_functionType, "");
-	solAssert(_functionType->kind() != FunctionType::Kind::ABIDecode, "");
-
-	if (_functionType->kind() == FunctionType::Kind::Declaration)
-	{
-		solAssert(_functionType->declaration().annotation().contract, "");
-		if (
-			m_currentContract &&
-			m_currentContract->derivesFrom(*_functionType->declaration().annotation().contract) &&
-			!dynamic_cast<FunctionDefinition const&>(_functionType->declaration()).isImplemented()
-		)
-			m_errorReporter.typeError(
-				7501_error,
-				_functionCall.location(),
-				"Cannot call unimplemented base function."
-			);
-		else
-			m_errorReporter.typeError(
-				3419_error,
-				_functionCall.location(),
-				"Cannot call function via contract type name."
-			);
-		return;
-	}
-
-	// Check for unsupported use of bare static call
-	if (
-		_functionType->kind() == FunctionType::Kind::BareStaticCall &&
-		!m_evmVersion.hasStaticCall()
-	)
-		m_errorReporter.typeError(
-			5052_error,
-			_functionCall.location(),
-			"\"staticcall\" is not supported by the VM version."
-		);
-
-	// Perform standard function call type checking
-	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
-}
-
-void TypeChecker::typeCheckFallbackFunction(FunctionDefinition const& _function)
-{
-	solAssert(_function.isFallback(), "");
-
-	if (_function.libraryFunction())
-		m_errorReporter.typeError(5982_error, _function.location(), "Libraries cannot have fallback functions.");
-	if (_function.stateMutability() != StateMutability::NonPayable && _function.stateMutability() != StateMutability::Payable)
-		m_errorReporter.typeError(
-			4575_error,
-			_function.location(),
-			"Fallback function must be payable or non-payable, but is \"" +
-			stateMutabilityToString(_function.stateMutability()) +
-			"\"."
-		);
-	if (_function.visibility() != Visibility::External)
-		m_errorReporter.typeError(1159_error, _function.location(), "Fallback function must be defined as \"external\".");
-
-	if (!_function.returnParameters().empty() || !_function.parameters().empty())
-	{
-		if (
-			_function.returnParameters().size() != 1 ||
-			*type(*_function.returnParameters().front()) != *TypeProvider::bytesMemory() ||
-			_function.parameters().size() != 1 ||
-			*type(*_function.parameters().front()) != *TypeProvider::bytesCalldata()
-		)
-			m_errorReporter.typeError(
-				5570_error,
-				_function.returnParameterList()->location(),
-				"Fallback function either has to have the signature \"fallback()\" or \"fallback(bytes calldata) returns (bytes memory)\"."
-			);
-	}
-}
-
-void TypeChecker::typeCheckConstructor(FunctionDefinition const& _function)
-{
-	solAssert(_function.isConstructor(), "");
-	if (_function.overrides())
-		m_errorReporter.typeError(1209_error, _function.location(), "Constructors cannot override.");
-	if (!_function.returnParameters().empty())
-		m_errorReporter.typeError(9712_error, _function.returnParameterList()->location(), "Non-empty \"returns\" directive for constructor.");
-	if (_function.stateMutability() != StateMutability::NonPayable && _function.stateMutability() != StateMutability::Payable)
-		m_errorReporter.typeError(
-			1558_error,
-			_function.location(),
-			"Constructor must be payable or non-payable, but is \"" +
-			stateMutabilityToString(_function.stateMutability()) +
-			"\"."
-		);
-	if (!_function.noVisibilitySpecified())
-	{
-		auto const& contract = dynamic_cast<ContractDefinition const&>(*_function.scope());
-		if (_function.visibility() != Visibility::Public && _function.visibility() != Visibility::Internal)
-			m_errorReporter.typeError(9239_error, _function.location(), "Constructor cannot have visibility.");
-		else if (_function.isPublic() && contract.abstract())
-			m_errorReporter.declarationError(
-				8295_error,
-				_function.location(),
-				"Abstract contracts cannot have public constructors. Remove the \"public\" keyword to fix this."
-			);
-		else if (!_function.isPublic() && !contract.abstract())
-			m_errorReporter.declarationError(
-				1845_error,
-				_function.location(),
-				"Non-abstract contracts cannot have internal constructors. Remove the \"internal\" keyword and make the contract abstract to fix this."
-			);
-		else
-			m_errorReporter.warning(
-				2462_error,
-				_function.location(),
-				"Visibility for constructor is ignored. If you want the contract to be non-deployable, making it \"abstract\" is sufficient."
-			);
-	}
-}
-
-void TypeChecker::typeCheckABIEncodeFunctions(
-	FunctionCall const& _functionCall,
-	FunctionTypePointer _functionType
-)
-{
-	solAssert(!!_functionType, "");
-	solAssert(
-		_functionType->kind() == FunctionType::Kind::ABIEncode ||
-		_functionType->kind() == FunctionType::Kind::ABIEncodePacked ||
-		_functionType->kind() == FunctionType::Kind::ABIEncodeWithSelector ||
-		_functionType->kind() == FunctionType::Kind::ABIEncodeCall ||
-		_functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature,
-		"ABI function has unexpected FunctionType::Kind."
-	);
-	solAssert(_functionType->takesArbitraryParameters(), "ABI functions should be variadic.");
-
-	bool const isPacked = _functionType->kind() == FunctionType::Kind::ABIEncodePacked;
-	solAssert(_functionType->padArguments() != isPacked, "ABI function with unexpected padding");
-
-	bool const abiEncoderV2 = useABICoderV2();
-
-	// Check for named arguments
-	if (!_functionCall.names().empty())
-	{
-		m_errorReporter.typeError(
-			2627_error,
-			_functionCall.location(),
-			"Named arguments cannot be used for functions that take arbitrary parameters."
-		);
-		return;
-	}
-
-	// Perform standard function call type checking
-	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
-
-	// No further generic checks needed as we do a precise check for ABIEncodeCall
-	if (_functionType->kind() == FunctionType::Kind::ABIEncodeCall)
-	{
-		typeCheckABIEncodeCallFunction(_functionCall);
-		return;
-	}
-
-	// Check additional arguments for variadic functions
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
-	for (size_t i = 0; i < arguments.size(); ++i)
-	{
-		auto const& argType = type(*arguments[i]);
-
-		if (argType->category() == Type::Category::RationalNumber)
-		{
-			auto const& rationalType = dynamic_cast<RationalNumberType const&>(*argType);
-			if (rationalType.isFractional())
-			{
-				m_errorReporter.typeError(
-					6090_error,
-					arguments[i]->location(),
-					"Fractional numbers cannot yet be encoded."
-				);
-				continue;
-			}
-			else if (!argType->mobileType())
-			{
-				m_errorReporter.typeError(
-					8009_error,
-					arguments[i]->location(),
-					"Invalid rational number (too large or division by zero)."
-				);
-				continue;
-			}
-			else if (isPacked)
-			{
-				m_errorReporter.typeError(
-					7279_error,
-					arguments[i]->location(),
-					"Cannot perform packed encoding for a literal."
-					" Please convert it to an explicit type first."
-				);
-				continue;
-			}
-		}
-
-		if (isPacked && !typeSupportedByOldABIEncoder(*argType, false /* isLibrary */))
-		{
-			m_errorReporter.typeError(
-				9578_error,
-				arguments[i]->location(),
-				"Type not supported in packed mode."
-			);
-			continue;
-		}
-
-		if (!argType->fullEncodingType(false, abiEncoderV2, !_functionType->padArguments()))
-			m_errorReporter.typeError(
-				2056_error,
-				arguments[i]->location(),
-				"This type cannot be encoded."
-			);
-	}
-}
-
-void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCall)
-{
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
-
-	// Expecting first argument to be the function pointer and second to be a tuple.
-	if (arguments.size() != 2)
-	{
-		m_errorReporter.typeError(
-			6219_error,
-			_functionCall.location(),
-			"Expected two arguments: a function pointer followed by a tuple."
-		);
-		return;
-	}
-
-	FunctionType const* externalFunctionType = nullptr;
-	if (auto const functionPointerType = dynamic_cast<FunctionTypePointer>(type(*arguments.front())))
-	{
-		// this cannot be a library function, that is checked below
-		externalFunctionType = functionPointerType->asExternallyCallableFunction(false);
-		solAssert(externalFunctionType->kind() == functionPointerType->kind());
-	}
-	else
-	{
-		m_errorReporter.typeError(
-			5511_error,
-			arguments.front()->location(),
-			"Expected first argument to be a function pointer, not \"" +
-			type(*arguments.front())->humanReadableName() +
-			"\"."
-		);
-		return;
-	}
-
-	if (
-		externalFunctionType->kind() != FunctionType::Kind::External &&
-		externalFunctionType->kind() != FunctionType::Kind::Declaration
-	)
-	{
-		std::string msg = "Expected regular external function type, or external view on public function.";
-
-		switch (externalFunctionType->kind())
-		{
-			case FunctionType::Kind::Internal:
-				msg += " Provided internal function.";
-				break;
-			case FunctionType::Kind::DelegateCall:
-				msg += " Cannot use library functions for abi.encodeCall.";
-				break;
-			case FunctionType::Kind::Creation:
-				msg += " Provided creation function.";
-				break;
-			case FunctionType::Kind::Event:
-				msg += " Cannot use events for abi.encodeCall.";
-				break;
-			case FunctionType::Kind::Error:
-				msg += " Cannot use errors for abi.encodeCall.";
-				break;
-			default:
-				msg += " Cannot use special function.";
-		}
-
-		SecondarySourceLocation ssl{};
-
-		if (externalFunctionType->hasDeclaration())
-		{
-			ssl.append("Function is declared here:", externalFunctionType->declaration().location());
-			if (
-				externalFunctionType->declaration().visibility() == Visibility::Public &&
-				externalFunctionType->declaration().scope() == m_currentContract
-			)
-				msg += " Did you forget to prefix \"this.\"?";
-			else if (
-				m_currentContract &&
-				externalFunctionType->declaration().scope() != m_currentContract &&
-				util::contains(
-					m_currentContract->annotation().linearizedBaseContracts,
-					externalFunctionType->declaration().scope()
-				)
-			)
-				msg += " Functions from base contracts have to be external.";
-		}
-
-		m_errorReporter.typeError(3509_error, arguments[0]->location(), ssl, msg);
-		return;
-	}
-	solAssert(!externalFunctionType->takesArbitraryParameters(), "Function must have fixed parameters.");
-	// Tuples with only one component become that component
-	std::vector<ASTPointer<Expression const>> callArguments;
-
-	auto const* tupleType = dynamic_cast<TupleType const*>(type(*arguments[1]));
-	if (tupleType)
-	{
-		if (TupleExpression const* argumentTuple = dynamic_cast<TupleExpression const*>(arguments[1].get()))
-			callArguments = decltype(callArguments){argumentTuple->components().begin(), argumentTuple->components().end()};
-		else
-		{
-			m_errorReporter.typeError(
-				9062_error,
-				arguments[1]->location(),
-				"Expected an inline tuple, not an expression of a tuple type."
-			);
-			return;
-		}
-	}
-	else
-		callArguments.push_back(arguments[1]);
-
-	if (externalFunctionType->parameterTypes().size() != callArguments.size())
-	{
-		if (tupleType)
-			m_errorReporter.typeError(
-				7788_error,
-				_functionCall.location(),
-				"Expected " +
-				std::to_string(externalFunctionType->parameterTypes().size()) +
-				" instead of " +
-				std::to_string(callArguments.size()) +
-				" components for the tuple parameter."
-			);
-		else
-			m_errorReporter.typeError(
-				7515_error,
-				_functionCall.location(),
-				"Expected a tuple with " +
-				std::to_string(externalFunctionType->parameterTypes().size()) +
-				" components instead of a single non-tuple parameter."
-			);
-	}
-
-	// Use min() to check as much as we can before failing fatally
-	size_t const numParameters = std::min(callArguments.size(), externalFunctionType->parameterTypes().size());
-
-	for (size_t i = 0; i < numParameters; i++)
-	{
-		Type const& argType = *type(*callArguments[i]);
-		BoolResult result = argType.isImplicitlyConvertibleTo(*externalFunctionType->parameterTypes()[i]);
-		if (!result)
-			m_errorReporter.typeError(
-				5407_error,
-				callArguments[i]->location(),
-				"Cannot implicitly convert component at position " +
-				std::to_string(i) +
-				" from \"" +
-				argType.humanReadableName() +
-				"\" to \"" +
-				externalFunctionType->parameterTypes()[i]->humanReadableName() +
-				"\"" +
-				(result.message().empty() ?  "." : ": " + result.message())
-			);
-	}
-}
-
-
-void TypeChecker::typeCheckStringConcatFunction(
-	FunctionCall const& _functionCall,
-	FunctionType const* _functionType
-)
-{
-	solAssert(_functionType);
-	solAssert(_functionType->kind() == FunctionType::Kind::StringConcat);
-	solAssert(_functionCall.names().empty());
-
-	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
-
-	for (std::shared_ptr<Expression const> const& argument: _functionCall.arguments())
-	{
-		Type const* argumentType = type(*argument);
-		bool notConvertibleToString = !argumentType->isImplicitlyConvertibleTo(*TypeProvider::stringMemory());
-
-		if (notConvertibleToString)
-			m_errorReporter.typeError(
-				9977_error,
-				argument->location(),
-				"Invalid type for argument in the string.concat function call. "
-				"string type is required, but " +
-				argumentType->identifier() + " provided."
-			);
-	}
-}
-
-void TypeChecker::typeCheckBytesConcatFunction(
-	FunctionCall const& _functionCall,
-	FunctionType const* _functionType
-)
-{
-	solAssert(_functionType);
-	solAssert(_functionType->kind() == FunctionType::Kind::BytesConcat);
-	solAssert(_functionCall.names().empty());
-
-	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
-
-	for (std::shared_ptr<Expression const> const& argument: _functionCall.arguments())
-	{
-		Type const* argumentType = type(*argument);
-		bool notConvertibleToBytes =
-			!argumentType->isImplicitlyConvertibleTo(*TypeProvider::fixedBytes(32)) &&
-			!argumentType->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory());
-		bool numberLiteral = (dynamic_cast<RationalNumberType const*>(argumentType) != nullptr);
-
-		if (notConvertibleToBytes || numberLiteral)
-			m_errorReporter.typeError(
-				8015_error,
-				argument->location(),
-				"Invalid type for argument in the bytes.concat function call. "
-				"bytes or fixed bytes type is required, but " +
-				argumentType->humanReadableName() + " provided."
-			);
-	}
-}
-
-void TypeChecker::typeCheckFunctionGeneralChecks(
-	FunctionCall const& _functionCall,
-	FunctionTypePointer _functionType
-)
-{
-	// Actual function call or struct constructor call.
-
-	solAssert(!!_functionType, "");
-	solAssert(_functionType->kind() != FunctionType::Kind::ABIDecode, "");
-
-	bool const isPositionalCall = _functionCall.names().empty();
-	bool const isVariadic = _functionType->takesArbitraryParameters();
-
-	auto functionCallKind = *_functionCall.annotation().kind;
-
-	solAssert(
-		!isVariadic || functionCallKind == FunctionCallKind::FunctionCall,
-		"Struct constructor calls cannot be variadic."
-	);
-
-	TypePointers const& parameterTypes = _functionType->parameterTypes();
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
-	std::vector<ASTPointer<ASTString>> const& argumentNames = _functionCall.names();
-
-	// Check number of passed in arguments
-	if (
-		arguments.size() < parameterTypes.size() ||
-		(!isVariadic && arguments.size() > parameterTypes.size())
-	)
-	{
-		bool const isStructConstructorCall =
-			functionCallKind == FunctionCallKind::StructConstructorCall;
-
-		auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
-			std::string msg = isVariadic ?
-				"Need at least " +
-				toString(parameterTypes.size()) +
-				" arguments for " +
-				std::string(isStructConstructorCall ? "struct constructor" : "function call") +
-				", but provided only " +
-				toString(arguments.size()) +
-				"."
-				:
-				"Wrong argument count for " +
-				std::string(isStructConstructorCall ? "struct constructor" : "function call") +
-				": " +
-				toString(arguments.size()) +
-				" arguments given but " +
-				std::string(isVariadic ? "need at least " : "expected ") +
-				toString(parameterTypes.size()) +
-				".";
-
-			if (isStructConstructorCall)
-			{
-				solAssert(!isVariadic, "");
-				return { 9755_error, msg };
-			}
-			else if (
-				_functionType->kind() == FunctionType::Kind::BareCall ||
-				_functionType->kind() == FunctionType::Kind::BareCallCode ||
-				_functionType->kind() == FunctionType::Kind::BareDelegateCall ||
-				_functionType->kind() == FunctionType::Kind::BareStaticCall
-			)
-			{
-				solAssert(!isVariadic, "");
-				if (arguments.empty())
-					return {
-						6138_error,
-						msg +
-						" This function requires a single bytes argument."
-						" Use \"\" as argument to provide empty calldata."
-					};
-				else
-					return {
-						8922_error,
-						msg +
-						" This function requires a single bytes argument."
-						" If all your arguments are value types, you can use"
-						" abi.encode(...) to properly generate it."
-					};
-			}
-			else if (
-				_functionType->kind() == FunctionType::Kind::KECCAK256 ||
-				_functionType->kind() == FunctionType::Kind::SHA256 ||
-				_functionType->kind() == FunctionType::Kind::RIPEMD160
-			)
-			{
-				solAssert(!isVariadic, "");
-				return {
-					4323_error,
-					msg +
-					" This function requires a single bytes argument."
-					" Use abi.encodePacked(...) to obtain the pre-0.5.0"
-					" behaviour or abi.encode(...) to use ABI encoding."
-				};
-			}
-			else
-				return { isVariadic ? 9308_error : 6160_error, msg };
-		}();
-
-		m_errorReporter.typeError(errorId, _functionCall.location(), description);
-		return;
-	}
-
-	// Parameter to argument map
-	std::vector<Expression const*> paramArgMap(parameterTypes.size());
-
-	// Map parameters to arguments - trivially for positional calls, less so for named calls
-	if (isPositionalCall)
-		for (size_t i = 0; i < paramArgMap.size(); ++i)
-			paramArgMap[i] = arguments[i].get();
-	else
-	{
-		auto const& parameterNames = _functionType->parameterNames();
-
-		solAssert(
-			parameterNames.size() == argumentNames.size(),
-			"Unexpected parameter length mismatch!"
-		);
-
-		// Check for duplicate argument names
-		{
-			bool duplication = false;
-			for (size_t i = 0; i < argumentNames.size(); i++)
-				for (size_t j = i + 1; j < argumentNames.size(); j++)
-					if (*argumentNames[i] == *argumentNames[j])
-					{
-						duplication = true;
-						m_errorReporter.typeError(
-							6995_error,
-							arguments[i]->location(),
-							"Duplicate named argument \"" + *argumentNames[i] + "\"."
-						);
-					}
-			if (duplication)
-				return;
-		}
-
-		// map parameter names to argument names
-		{
-			bool not_all_mapped = false;
-
-			for (size_t i = 0; i < argumentNames.size(); i++)
-			{
-				size_t j;
-				for (j = 0; j < parameterNames.size(); j++)
-					if (parameterNames[j] == *argumentNames[i])
-						break;
-
-				if (j < parameterNames.size())
-					paramArgMap[j] = arguments[i].get();
-				else
-				{
-					not_all_mapped = true;
-					m_errorReporter.typeError(
-						4974_error,
-						_functionCall.location(),
-						"Named argument \"" +
-						*argumentNames[i] +
-						"\" does not match function declaration."
-					);
-				}
-			}
-
-			if (not_all_mapped)
-				return;
-		}
-	}
-
-	// Check for compatible types between arguments and parameters
-	for (size_t i = 0; i < paramArgMap.size(); ++i)
-	{
-		solAssert(!!paramArgMap[i], "unmapped parameter");
-		BoolResult result = type(*paramArgMap[i])->isImplicitlyConvertibleTo(*parameterTypes[i]);
-		if (!result)
-		{
-			auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
-				std::string msg =
-					"Invalid type for argument in function call. "
-					"Invalid implicit conversion from " +
-					type(*paramArgMap[i])->humanReadableName() +
-					" to " +
-					parameterTypes[i]->humanReadableName() +
-					" requested.";
-				if (!result.message().empty())
-					msg += " " + result.message();
-				if (
-					_functionType->kind() == FunctionType::Kind::BareCall ||
-					_functionType->kind() == FunctionType::Kind::BareCallCode ||
-					_functionType->kind() == FunctionType::Kind::BareDelegateCall ||
-					_functionType->kind() == FunctionType::Kind::BareStaticCall
-				)
-					return {
-						8051_error,
-						msg +
-						" This function requires a single bytes argument."
-						" If all your arguments are value types, you can"
-						" use abi.encode(...) to properly generate it."
-					};
-				else if (
-					_functionType->kind() == FunctionType::Kind::KECCAK256 ||
-					_functionType->kind() == FunctionType::Kind::SHA256 ||
-					_functionType->kind() == FunctionType::Kind::RIPEMD160
-				)
-					return {
-						7556_error,
-						msg +
-						" This function requires a single bytes argument."
-						" Use abi.encodePacked(...) to obtain the pre-0.5.0"
-						" behaviour or abi.encode(...) to use ABI encoding."
-					};
-				else
-					return { 9553_error, msg };
-			}();
-			m_errorReporter.typeError(errorId, paramArgMap[i]->location(), description);
-		}
-	}
-
-	TypePointers const& returnParameterTypes = _functionType->returnParameterTypes();
-	bool isLibraryCall = (_functionType->kind() == FunctionType::Kind::DelegateCall);
-	bool callRequiresABIEncoding =
-		// ABIEncode/ABIDecode calls not included because they should have been already validated
-		// at this point and they have variadic arguments so they need special handling.
-		_functionType->kind() == FunctionType::Kind::DelegateCall ||
-		_functionType->kind() == FunctionType::Kind::External ||
-		_functionType->kind() == FunctionType::Kind::Creation ||
-		_functionType->kind() == FunctionType::Kind::Event ||
-		_functionType->kind() == FunctionType::Kind::Error;
-
-	if (callRequiresABIEncoding && !useABICoderV2())
-	{
-		solAssert(!isVariadic, "");
-		solAssert(parameterTypes.size() == arguments.size(), "");
-		solAssert(!_functionType->isBareCall(), "");
-		solAssert(*_functionCall.annotation().kind == FunctionCallKind::FunctionCall, "");
-
-		for (size_t i = 0; i < parameterTypes.size(); ++i)
-		{
-			solAssert(parameterTypes[i], "");
-
-			if (!typeSupportedByOldABIEncoder(*parameterTypes[i], isLibraryCall))
-				m_errorReporter.typeError(
-					2443_error,
-					paramArgMap[i]->location(),
-					"The type of this parameter, " + parameterTypes[i]->humanReadableName() + ", "
-					"is only supported in ABI coder v2. "
-					"Use \"pragma abicoder v2;\" to enable the feature."
-				);
-		}
-
-		for (size_t i = 0; i < returnParameterTypes.size(); ++i)
-		{
-			solAssert(returnParameterTypes[i], "");
-
-			if (!typeSupportedByOldABIEncoder(*returnParameterTypes[i], isLibraryCall))
-				m_errorReporter.typeError(
-					2428_error,
-					_functionCall.location(),
-					"The type of return parameter " + toString(i + 1) + ", " + returnParameterTypes[i]->humanReadableName() + ", "
-					"is only supported in ABI coder v2. "
-					"Use \"pragma abicoder v2;\" to enable the feature."
-				);
-		}
-	}
-}
-
-bool TypeChecker::visit(FunctionCall const& _functionCall)
-{
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
-	bool argumentsArePure = true;
-
-	// We need to check arguments' type first as they will be needed for overload resolution.
-	for (ASTPointer<Expression const> const& argument: arguments)
-	{
-		argument->accept(*this);
-		if (!*argument->annotation().isPure)
-			argumentsArePure = false;
-	}
-
-	// Store argument types - and names if given - for overload resolution
-	{
-		FuncCallArguments funcCallArgs;
-
-		funcCallArgs.names = _functionCall.names();
-
-		for (ASTPointer<Expression const> const& argument: arguments)
-			funcCallArgs.types.push_back(type(*argument));
-
-		_functionCall.expression().annotation().arguments = std::move(funcCallArgs);
-	}
-
-	_functionCall.expression().accept(*this);
-
-	Type const* expressionType = type(_functionCall.expression());
-
-	// Determine function call kind and function type for this FunctionCall node
-	FunctionCallAnnotation& funcCallAnno = _functionCall.annotation();
-	FunctionTypePointer functionType = nullptr;
-	funcCallAnno.isConstant = false;
-
-	bool isLValue = false;
-
-	// Determine and assign function call kind, lvalue, purity and function type for this FunctionCall node
-	switch (expressionType->category())
-	{
-	case Type::Category::Function:
-		functionType = dynamic_cast<FunctionType const*>(expressionType);
-		funcCallAnno.kind = FunctionCallKind::FunctionCall;
-
-		if (auto memberAccess = dynamic_cast<MemberAccess const*>(&_functionCall.expression()))
-		{
-			if (dynamic_cast<FunctionDefinition const*>(memberAccess->annotation().referencedDeclaration))
-				_functionCall.expression().annotation().calledDirectly = true;
-		}
-		else if (auto identifier = dynamic_cast<Identifier const*>(&_functionCall.expression()))
-			if (dynamic_cast<FunctionDefinition const*>(identifier->annotation().referencedDeclaration))
-				_functionCall.expression().annotation().calledDirectly = true;
-
-		// Purity for function calls also depends upon the callee and its FunctionType
-		funcCallAnno.isPure =
-			argumentsArePure &&
-			*_functionCall.expression().annotation().isPure &&
-			functionType->isPure();
-
-		if (functionType->kind() == FunctionType::Kind::ArrayPush)
-			isLValue = functionType->parameterTypes().empty();
-
-		break;
-
-	case Type::Category::TypeType:
-	{
-		// Determine type for type conversion or struct construction expressions
-		Type const* actualType = dynamic_cast<TypeType const&>(*expressionType).actualType();
-		solAssert(!!actualType, "");
-
-		if (actualType->category() == Type::Category::Struct)
-		{
-			if (actualType->containsNestedMapping())
-				m_errorReporter.fatalTypeError(
-					9515_error,
-					_functionCall.location(),
-					"Struct containing a (nested) mapping cannot be constructed."
-				);
-			functionType = dynamic_cast<StructType const&>(*actualType).constructorType();
-			funcCallAnno.kind = FunctionCallKind::StructConstructorCall;
-		}
-		else
-		{
-			if (auto const* contractType = dynamic_cast<ContractType const*>(actualType))
-				if (contractType->isSuper())
-					m_errorReporter.fatalTypeError(
-						1744_error,
-						_functionCall.location(),
-						"Cannot convert to the super type."
-					);
-			funcCallAnno.kind = FunctionCallKind::TypeConversion;
-		}
-
-		funcCallAnno.isPure = argumentsArePure;
-
-		break;
-	}
-
-	default:
-		m_errorReporter.fatalTypeError(5704_error, _functionCall.location(), "This expression is not callable.");
-		// Unreachable, because fatalTypeError throws. We don't set kind, but that's okay because the switch below
-		// is never reached. And, even if it was, SetOnce would trigger an assertion violation and not UB.
-		funcCallAnno.isPure = argumentsArePure;
-		break;
-	}
-
-	funcCallAnno.isLValue = isLValue;
-
-	// Determine return types
-	switch (*funcCallAnno.kind)
-	{
-	case FunctionCallKind::TypeConversion:
-		funcCallAnno.type = typeCheckTypeConversionAndRetrieveReturnType(_functionCall);
-		break;
-
-	case FunctionCallKind::StructConstructorCall: // fall-through
-	case FunctionCallKind::FunctionCall:
-	{
-		TypePointers returnTypes;
-
-		switch (functionType->kind())
-		{
-		case FunctionType::Kind::ABIDecode:
-		{
-			returnTypes = typeCheckABIDecodeAndRetrieveReturnType(
-				_functionCall,
-				useABICoderV2()
-			);
-			break;
-		}
-		case FunctionType::Kind::ABIEncode:
-		case FunctionType::Kind::ABIEncodePacked:
-		case FunctionType::Kind::ABIEncodeWithSelector:
-		case FunctionType::Kind::ABIEncodeWithSignature:
-		case FunctionType::Kind::ABIEncodeCall:
-		{
-			typeCheckABIEncodeFunctions(_functionCall, functionType);
-			returnTypes = functionType->returnParameterTypes();
-			break;
-		}
-		case FunctionType::Kind::MetaType:
-			returnTypes = typeCheckMetaTypeFunctionAndRetrieveReturnType(_functionCall);
-			break;
-		case FunctionType::Kind::BytesConcat:
-		{
-			typeCheckBytesConcatFunction(_functionCall, functionType);
-			returnTypes = functionType->returnParameterTypes();
-			break;
-		}
-		case FunctionType::Kind::StringConcat:
-		{
-			typeCheckStringConcatFunction(_functionCall, functionType);
-			returnTypes = functionType->returnParameterTypes();
-			break;
-		}
-		case FunctionType::Kind::Wrap:
-		case FunctionType::Kind::Unwrap:
-		{
-			typeCheckFunctionGeneralChecks(_functionCall, functionType);
-			returnTypes = functionType->returnParameterTypes();
-			break;
-		}
-		default:
-		{
-			typeCheckFunctionCall(_functionCall, functionType);
-			returnTypes = m_evmVersion.supportsReturndata() ?
-				functionType->returnParameterTypes() :
-				functionType->returnParameterTypesWithoutDynamicTypes();
-			break;
-		}
-		}
-
-		funcCallAnno.type = returnTypes.size() == 1 ?
-			std::move(returnTypes.front()) :
-			TypeProvider::tuple(std::move(returnTypes));
-
-		break;
-	}
-
-	default:
-		// for non-callables, ensure error reported and annotate node to void function
-		solAssert(m_errorReporter.hasErrors(), "");
-		funcCallAnno.kind = FunctionCallKind::FunctionCall;
-		funcCallAnno.type = TypeProvider::emptyTuple();
-		break;
-	}
-
-	return false;
-}
-
-bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
-{
-	solAssert(_functionCallOptions.options().size() == _functionCallOptions.names().size(), "Lengths of name & value arrays differ!");
-
-	_functionCallOptions.expression().annotation().arguments = _functionCallOptions.annotation().arguments;
-
-	_functionCallOptions.expression().accept(*this);
-
-	_functionCallOptions.annotation().isPure = false;
-	_functionCallOptions.annotation().isConstant = false;
-	_functionCallOptions.annotation().isLValue = false;
-
-	auto expressionFunctionType = dynamic_cast<FunctionType const*>(type(_functionCallOptions.expression()));
-	if (!expressionFunctionType)
-	{
-		m_errorReporter.fatalTypeError(2622_error, _functionCallOptions.location(), "Expected callable expression before call options.");
-		return false;
-	}
-
-	bool setSalt = false;
-	bool setValue = false;
-	bool setGas = false;
-
-	FunctionType::Kind kind = expressionFunctionType->kind();
-	if (
-		kind != FunctionType::Kind::Creation &&
-		kind != FunctionType::Kind::External &&
-		kind != FunctionType::Kind::BareCall &&
-		kind != FunctionType::Kind::BareCallCode &&
-		kind != FunctionType::Kind::BareDelegateCall &&
-		kind != FunctionType::Kind::BareStaticCall
-	)
-	{
-		m_errorReporter.fatalTypeError(
-			2193_error,
-			_functionCallOptions.location(),
-			"Function call options can only be set on external function calls or contract creations."
-		);
-		return false;
-	}
-
-	if (
-		expressionFunctionType->valueSet() ||
-		expressionFunctionType->gasSet() ||
-		expressionFunctionType->saltSet()
-	)
-		m_errorReporter.typeError(
-			1645_error,
-			_functionCallOptions.location(),
-			"Function call options have already been set, you have to combine them into a single "
-			"{...}-option."
-		);
-
-	auto setCheckOption = [&](bool& _option, std::string const& _name)
-	{
-		if (_option)
-			m_errorReporter.typeError(
-				9886_error,
-				_functionCallOptions.location(),
-				"Duplicate option \"" + std::move(_name) + "\"."
-			);
-
-		_option = true;
-	};
-
-	for (size_t i = 0; i < _functionCallOptions.names().size(); ++i)
-	{
-		std::string const& name = *(_functionCallOptions.names()[i]);
-		if (name == "salt")
-		{
-			if (kind == FunctionType::Kind::Creation)
-			{
-				setCheckOption(setSalt, "salt");
-				expectType(*_functionCallOptions.options()[i], *TypeProvider::fixedBytes(32));
-			}
-			else
-				m_errorReporter.typeError(
-					2721_error,
-					_functionCallOptions.location(),
-					"Function call option \"salt\" can only be used with \"new\"."
-				);
-		}
-		else if (name == "value")
-		{
-			if (kind == FunctionType::Kind::BareDelegateCall)
-				m_errorReporter.typeError(
-					6189_error,
-					_functionCallOptions.location(),
-					"Cannot set option \"value\" for delegatecall."
-				);
-			else if (kind == FunctionType::Kind::BareStaticCall)
-				m_errorReporter.typeError(
-					2842_error,
-					_functionCallOptions.location(),
-					"Cannot set option \"value\" for staticcall."
-				);
-			else if (!expressionFunctionType->isPayable())
-				m_errorReporter.typeError(
-					7006_error,
-					_functionCallOptions.location(),
-					kind == FunctionType::Kind::Creation ?
-						"Cannot set option \"value\", since the constructor of " +
-						expressionFunctionType->returnParameterTypes().front()->humanReadableName() +
-						" is not payable." :
-						"Cannot set option \"value\" on a non-payable function type."
-				);
-			else
-			{
-				expectType(*_functionCallOptions.options()[i], *TypeProvider::uint256());
-
-				setCheckOption(setValue, "value");
-			}
-		}
-		else if (name == "gas")
-		{
-			if (kind == FunctionType::Kind::Creation)
-				m_errorReporter.typeError(
-					9903_error,
-					_functionCallOptions.location(),
-					"Function call option \"gas\" cannot be used with \"new\"."
-				);
-			else
-			{
-				expectType(*_functionCallOptions.options()[i], *TypeProvider::uint256());
-
-				setCheckOption(setGas, "gas");
-			}
-		}
-		else
-			m_errorReporter.typeError(
-				9318_error,
-				_functionCallOptions.location(),
-				"Unknown call option \"" + name + "\". Valid options are \"salt\", \"value\" and \"gas\"."
-			);
-	}
-
-	if (setSalt && !m_evmVersion.hasCreate2())
-		m_errorReporter.typeError(
-			5189_error,
-			_functionCallOptions.location(),
-			"Unsupported call option \"salt\" (requires Constantinople-compatible VMs)."
-		);
-
-	_functionCallOptions.annotation().type = expressionFunctionType->copyAndSetCallOptions(setGas, setValue, setSalt);
-	return false;
-}
-
-void TypeChecker::endVisit(NewExpression const& _newExpression)
-{
-	Type const* type = _newExpression.typeName().annotation().type;
-	solAssert(!!type, "Type name not resolved.");
-
-	_newExpression.annotation().isConstant = false;
-	_newExpression.annotation().isLValue = false;
-
-	if (auto contractName = dynamic_cast<UserDefinedTypeName const*>(&_newExpression.typeName()))
-	{
-		auto contract = dynamic_cast<ContractDefinition const*>(&dereference(contractName->pathNode()));
-
-		if (!contract)
-			m_errorReporter.fatalTypeError(5540_error, _newExpression.location(), "Identifier is not a contract.");
-		if (contract->isInterface())
-			m_errorReporter.fatalTypeError(2971_error, _newExpression.location(), "Cannot instantiate an interface.");
-		if (contract->abstract())
-			m_errorReporter.typeError(4614_error, _newExpression.location(), "Cannot instantiate an abstract contract.");
-
-		_newExpression.annotation().type = FunctionType::newExpressionType(*contract);
-		_newExpression.annotation().isPure = false;
-	}
-	else if (type->category() == Type::Category::Array)
-	{
-		if (type->containsNestedMapping())
-			m_errorReporter.fatalTypeError(
-				1164_error,
-				_newExpression.typeName().location(),
-				"Array containing a (nested) mapping cannot be constructed in memory."
-			);
-		if (!type->isDynamicallySized())
-			m_errorReporter.typeError(
-				3904_error,
-				_newExpression.typeName().location(),
-				"Length has to be placed in parentheses after the array type for new expression."
-			);
-		type = TypeProvider::withLocationIfReference(DataLocation::Memory, type);
-		_newExpression.annotation().type = TypeProvider::function(
-			TypePointers{TypeProvider::uint256()},
-			TypePointers{type},
-			strings(1, ""),
-			strings(1, ""),
-			FunctionType::Kind::ObjectCreation,
-			StateMutability::Pure
-		);
-		_newExpression.annotation().isPure = true;
-	}
-	else
-	{
-		_newExpression.annotation().isPure = false;
-		m_errorReporter.fatalTypeError(8807_error, _newExpression.location(), "Contract or array type expected.");
-	}
-}
-
-bool TypeChecker::visit(MemberAccess const& _memberAccess)
-{
-	_memberAccess.expression().accept(*this);
-	Type const* exprType = type(_memberAccess.expression());
-	ASTString const& memberName = _memberAccess.memberName();
-
-	auto& annotation = _memberAccess.annotation();
-
-	// Retrieve the types of the arguments if this is used to call a function.
-	auto const& arguments = annotation.arguments;
-	MemberList::MemberMap possibleMembers = exprType->members(currentDefinitionScope()).membersByName(memberName);
-	size_t const initialMemberCount = possibleMembers.size();
-	if (initialMemberCount > 1 && arguments)
-	{
-		// do overload resolution
-		for (auto it = possibleMembers.begin(); it != possibleMembers.end();)
-			if (
-				it->type->category() == Type::Category::Function &&
-				!dynamic_cast<FunctionType const&>(*it->type).canTakeArguments(*arguments, exprType)
-			)
-				it = possibleMembers.erase(it);
-			else
-				++it;
-	}
-
-	annotation.isConstant = false;
-
-	if (possibleMembers.empty())
-	{
-		if (initialMemberCount == 0 && !dynamic_cast<ArraySliceType const*>(exprType))
-		{
-			// Try to see if the member was removed because it is only available for storage types.
-			auto storageType = TypeProvider::withLocationIfReference(
-				DataLocation::Storage,
-				exprType
-			);
-			if (!storageType->members(currentDefinitionScope()).membersByName(memberName).empty())
-				m_errorReporter.fatalTypeError(
-					4994_error,
-					_memberAccess.location(),
-					"Member \"" + memberName + "\" is not available in " +
-					exprType->humanReadableName() +
-					" outside of storage."
-				);
-		}
-
-		auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
-			std::string errorMsg = "Member \"" + memberName + "\" not found or not visible "
-				"after argument-dependent lookup in " + exprType->humanReadableName() + ".";
-
-			if (auto const* funType = dynamic_cast<FunctionType const*>(exprType))
-			{
-				TypePointers const& t = funType->returnParameterTypes();
-
-				if (memberName == "value")
-				{
-					if (funType->kind() == FunctionType::Kind::Creation)
-						return {
-							8827_error,
-							"Constructor for " + t.front()->humanReadableName() + " must be payable for member \"value\" to be available."
-						};
-					else if (
-						funType->kind() == FunctionType::Kind::DelegateCall ||
-						funType->kind() == FunctionType::Kind::BareDelegateCall
-					)
-						return { 8477_error, "Member \"value\" is not allowed in delegated calls due to \"msg.value\" persisting." };
-					else
-						return { 8820_error, "Member \"value\" is only available for payable functions." };
-				}
-				else if (
-					t.size() == 1 && (
-						t.front()->category() == Type::Category::Struct ||
-						t.front()->category() == Type::Category::Contract
-					)
-				)
-					return { 6005_error, errorMsg + " Did you intend to call the function?" };
-			}
-			else if (exprType->category() == Type::Category::Contract)
-			{
-				for (MemberList::Member const& addressMember: TypeProvider::payableAddress()->nativeMembers(nullptr))
-					if (addressMember.name == memberName)
-					{
-						auto const* var = dynamic_cast<Identifier const*>(&_memberAccess.expression());
-						std::string varName = var ? var->name() : "...";
-						errorMsg += " Use \"address(" + varName + ")." + memberName + "\" to access this address member.";
-						return { 3125_error, errorMsg };
-					}
-			}
-			else if (auto const* addressType = dynamic_cast<AddressType const*>(exprType))
-			{
-				// Trigger error when using send or transfer with a non-payable fallback function.
-				if (memberName == "send" || memberName == "transfer")
-				{
-					solAssert(
-						addressType->stateMutability() != StateMutability::Payable,
-						"Expected address not-payable as members were not found"
-					);
-
-					return { 9862_error, "\"send\" and \"transfer\" are only available for objects of type \"address payable\", not \"" + exprType->humanReadableName() + "\"." };
-				}
-			}
-
-			return { 9582_error, errorMsg };
-		}();
-
-		m_errorReporter.fatalTypeError(
-			errorId,
-			_memberAccess.location(),
-			description
-		);
-	}
-	else if (possibleMembers.size() > 1)
-		m_errorReporter.fatalTypeError(
-			6675_error,
-			_memberAccess.location(),
-			"Member \"" + memberName + "\" not unique "
-			"after argument-dependent lookup in " + exprType->humanReadableName() +
-			(memberName == "value" ? " - did you forget the \"payable\" modifier?" : ".")
-		);
-
-	annotation.referencedDeclaration = possibleMembers.front().declaration;
-	annotation.type = possibleMembers.front().type;
-
-	VirtualLookup requiredLookup = VirtualLookup::Static;
-
-	if (auto funType = dynamic_cast<FunctionType const*>(annotation.type))
-	{
-		solAssert(
-			!funType->hasBoundFirstArgument() || exprType->isImplicitlyConvertibleTo(*funType->selfType()),
-			"Function \"" + memberName + "\" cannot be called on an object of type " +
-			exprType->humanReadableName() + " (expected " + funType->selfType()->humanReadableName() + ")."
-		);
-
-		if (
-			dynamic_cast<FunctionType const*>(exprType) &&
-			!annotation.referencedDeclaration &&
-			(memberName == "value" || memberName == "gas")
-		)
-			m_errorReporter.typeError(
-				1621_error,
-				_memberAccess.location(),
-				"Using \"." + memberName + "(...)\" is deprecated. Use \"{" + memberName + ": ...}\" instead."
-			);
-
-		if (
-			funType->kind() == FunctionType::Kind::ArrayPush &&
-			arguments.value().numArguments() != 0 &&
-			exprType->containsNestedMapping()
-		)
-			m_errorReporter.typeError(
-				8871_error,
-				_memberAccess.location(),
-				"Storage arrays with nested mappings do not support .push(<arg>)."
-			);
-
-		if (!funType->hasBoundFirstArgument())
-			if (auto typeType = dynamic_cast<TypeType const*>(exprType))
-			{
-				auto contractType = dynamic_cast<ContractType const*>(typeType->actualType());
-				if (contractType && contractType->isSuper())
-					requiredLookup = VirtualLookup::Super;
-			}
-	}
-
-	annotation.requiredLookup = requiredLookup;
-
-	if (auto const* structType = dynamic_cast<StructType const*>(exprType))
-		annotation.isLValue = !structType->dataStoredIn(DataLocation::CallData);
-	else if (exprType->category() == Type::Category::Array)
-		annotation.isLValue = false;
-	else if (exprType->category() == Type::Category::FixedBytes)
-		annotation.isLValue = false;
-	else if (TypeType const* typeType = dynamic_cast<decltype(typeType)>(exprType))
-	{
-		if (ContractType const* contractType = dynamic_cast<decltype(contractType)>(typeType->actualType()))
-		{
-			annotation.isLValue = annotation.referencedDeclaration->isLValue();
-			if (
-				auto const* functionType = dynamic_cast<FunctionType const*>(annotation.type);
-				functionType &&
-				functionType->kind() == FunctionType::Kind::Declaration
-			)
-				annotation.isPure = *_memberAccess.expression().annotation().isPure;
-		}
-		else
-			annotation.isLValue = false;
-	}
-	else if (exprType->category() == Type::Category::Module)
-	{
-		annotation.isPure = *_memberAccess.expression().annotation().isPure;
-		annotation.isLValue = false;
-	}
-	else
-		annotation.isLValue = false;
-
-	// TODO some members might be pure, but for example `address(0x123).balance` is not pure
-	// although every subexpression is, so leaving this limited for now.
-	if (auto tt = dynamic_cast<TypeType const*>(exprType))
-		if (
-			tt->actualType()->category() == Type::Category::Enum ||
-			tt->actualType()->category() == Type::Category::UserDefinedValueType
-		)
-			annotation.isPure = true;
-	if (
-		auto const* functionType = dynamic_cast<FunctionType const*>(exprType);
-		functionType &&
-		functionType->hasDeclaration() &&
-		dynamic_cast<FunctionDefinition const*>(&functionType->declaration()) &&
-		memberName == "selector"
-	)
-		if (auto const* parentAccess = dynamic_cast<MemberAccess const*>(&_memberAccess.expression()))
-		{
-			bool isPure = *parentAccess->expression().annotation().isPure;
-			if (auto const* exprInt = dynamic_cast<Identifier const*>(&parentAccess->expression()))
-				if (exprInt->name() == "this" || exprInt->name() == "super")
-					isPure = true;
-
-			annotation.isPure = isPure;
-		}
-	if (
-		auto const* varDecl = dynamic_cast<VariableDeclaration const*>(annotation.referencedDeclaration);
-		!annotation.isPure.set() &&
-		varDecl &&
-		varDecl->isConstant()
-	)
-		annotation.isPure = true;
-
-	if (auto magicType = dynamic_cast<MagicType const*>(exprType))
-	{
-		if (magicType->kind() == MagicType::Kind::ABI)
-			annotation.isPure = true;
-		else if (magicType->kind() == MagicType::Kind::MetaType && (
-			memberName == "creationCode" || memberName == "runtimeCode"
-		))
-		{
-			annotation.isPure = true;
-			ContractType const& accessedContractType = dynamic_cast<ContractType const&>(*magicType->typeArgument());
-			solAssert(!accessedContractType.isSuper(), "");
-			if (
-				memberName == "runtimeCode" &&
-				!accessedContractType.immutableVariables().empty()
-			)
-				m_errorReporter.typeError(
-					9274_error,
-					_memberAccess.location(),
-					"\"runtimeCode\" is not available for contracts containing immutable variables."
-				);
-		}
-		else if (magicType->kind() == MagicType::Kind::MetaType && memberName == "name")
-			annotation.isPure = true;
-		else if (magicType->kind() == MagicType::Kind::MetaType && memberName == "interfaceId")
-			annotation.isPure = true;
-		else if (
-			magicType->kind() == MagicType::Kind::MetaType &&
-			(memberName == "min" ||	memberName == "max")
-		)
-			annotation.isPure = true;
-		else if (magicType->kind() == MagicType::Kind::Block)
-		{
-			if (memberName == "chainid" && !m_evmVersion.hasChainID())
-				m_errorReporter.typeError(
-					3081_error,
-					_memberAccess.location(),
-					"\"chainid\" is not supported by the VM version."
-				);
-			else if (memberName == "basefee" && !m_evmVersion.hasBaseFee())
-				m_errorReporter.typeError(
-					5921_error,
-					_memberAccess.location(),
-					"\"basefee\" is not supported by the VM version."
-				);
-			else if (memberName == "prevrandao" && !m_evmVersion.hasPrevRandao())
-				m_errorReporter.warning(
-					9432_error,
-					_memberAccess.location(),
-					"\"prevrandao\" is not supported by the VM version and will be treated as \"difficulty\"."
-				);
-			else if (memberName == "difficulty" && m_evmVersion.hasPrevRandao())
-				m_errorReporter.warning(
-					8417_error,
-					_memberAccess.location(),
-					"Since the VM version paris, \"difficulty\" was replaced by \"prevrandao\", which now returns a random number based on the beacon chain."
-				);
-		}
-	}
-
-	if (
-		_memberAccess.expression().annotation().type->category() == Type::Category::Address &&
-		memberName == "codehash" &&
-		!m_evmVersion.hasExtCodeHash()
-	)
-		m_errorReporter.typeError(
-			7598_error,
-			_memberAccess.location(),
-			"\"codehash\" is not supported by the VM version."
-		);
-
-	if (!annotation.isPure.set())
-		annotation.isPure = false;
-
-	return false;
-}
-
-bool TypeChecker::visit(IndexAccess const& _access)
-{
-	_access.annotation().isConstant = false;
-	_access.baseExpression().accept(*this);
-	Type const* baseType = type(_access.baseExpression());
-	Type const* resultType = nullptr;
-	bool isLValue = false;
-	bool isPure = *_access.baseExpression().annotation().isPure;
-	Expression const* index = _access.indexExpression();
-	switch (baseType->category())
-	{
-	case Type::Category::ArraySlice:
-	{
-		auto const& arrayType = dynamic_cast<ArraySliceType const&>(*baseType).arrayType();
-		if (arrayType.location() != DataLocation::CallData || !arrayType.isDynamicallySized())
-			m_errorReporter.typeError(4802_error, _access.location(), "Index access is only implemented for slices of dynamic calldata arrays.");
-		baseType = &arrayType;
-		[[fallthrough]];
-	}
-	case Type::Category::Array:
-	{
-		ArrayType const& actualType = dynamic_cast<ArrayType const&>(*baseType);
-		if (!index)
-			m_errorReporter.typeError(9689_error, _access.location(), "Index expression cannot be omitted.");
-		else if (actualType.isString())
-		{
-			m_errorReporter.typeError(9961_error, _access.location(), "Index access for string is not possible.");
-			index->accept(*this);
-		}
-		else
-		{
-			expectType(*index, *TypeProvider::uint256());
-			if (!m_errorReporter.hasErrors())
-				if (auto numberType = dynamic_cast<RationalNumberType const*>(type(*index)))
-				{
-					solAssert(!numberType->isFractional(), "");
-					if (!actualType.isDynamicallySized() && actualType.length() <= numberType->literalValue(nullptr))
-						m_errorReporter.typeError(3383_error, _access.location(), "Out of bounds array access.");
-				}
-		}
-		resultType = actualType.baseType();
-		isLValue = actualType.location() != DataLocation::CallData;
-		break;
-	}
-	case Type::Category::Mapping:
-	{
-		MappingType const& actualType = dynamic_cast<MappingType const&>(*baseType);
-		if (!index)
-			m_errorReporter.typeError(1267_error, _access.location(), "Index expression cannot be omitted.");
-		else
-			expectType(*index, *actualType.keyType());
-		resultType = actualType.valueType();
-		isLValue = true;
-		break;
-	}
-	case Type::Category::TypeType:
-	{
-		TypeType const& typeType = dynamic_cast<TypeType const&>(*baseType);
-		if (auto const* contractType = dynamic_cast<ContractType const*>(typeType.actualType()))
-			if (contractType->contractDefinition().isLibrary())
-				m_errorReporter.typeError(2876_error, _access.location(), "Index access for library types and arrays of libraries are not possible.");
-		if (!index)
-			resultType = TypeProvider::typeType(TypeProvider::array(DataLocation::Memory, typeType.actualType()));
-		else
-		{
-			u256 length = 1;
-			if (expectType(*index, *TypeProvider::uint256()))
-			{
-				if (auto indexValue = dynamic_cast<RationalNumberType const*>(type(*index)))
-					length = indexValue->literalValue(nullptr);
-				else
-					m_errorReporter.fatalTypeError(3940_error, index->location(), "Integer constant expected.");
-			}
-			else
-				solAssert(m_errorReporter.hasErrors(), "Expected errors as expectType returned false");
-
-			resultType = TypeProvider::typeType(TypeProvider::array(
-				DataLocation::Memory,
-				typeType.actualType(),
-				length
-			));
-		}
-		break;
-	}
-	case Type::Category::FixedBytes:
-	{
-		FixedBytesType const& bytesType = dynamic_cast<FixedBytesType const&>(*baseType);
-		if (!index)
-			m_errorReporter.typeError(8830_error, _access.location(), "Index expression cannot be omitted.");
-		else
-		{
-			if (!expectType(*index, *TypeProvider::uint256()))
-				m_errorReporter.fatalTypeError(6318_error, _access.location(), "Index expression cannot be represented as an unsigned integer.");
-			if (auto integerType = dynamic_cast<RationalNumberType const*>(type(*index)))
-				if (bytesType.numBytes() <= integerType->literalValue(nullptr))
-					m_errorReporter.typeError(1859_error, _access.location(), "Out of bounds array access.");
-		}
-		resultType = TypeProvider::fixedBytes(1);
-		isLValue = false; // @todo this heavily depends on how it is embedded
-		break;
-	}
-	default:
-		m_errorReporter.fatalTypeError(
-			2614_error,
-			_access.baseExpression().location(),
-			"Indexed expression has to be a type, mapping or array (is " + baseType->humanReadableName() + ")"
-		);
-	}
-	_access.annotation().type = resultType;
-	_access.annotation().isLValue = isLValue;
-	if (index && !*index->annotation().isPure)
-		isPure = false;
-	_access.annotation().isPure = isPure;
-
-	return false;
-}
-
-bool TypeChecker::visit(IndexRangeAccess const& _access)
-{
-	_access.annotation().isConstant = false;
-	_access.baseExpression().accept(*this);
-
-	bool isLValue = false; // TODO: set this correctly when implementing slices for memory and storage arrays
-	bool isPure = *_access.baseExpression().annotation().isPure;
-
-	if (Expression const* start = _access.startExpression())
-	{
-		expectType(*start, *TypeProvider::uint256());
-		if (!*start->annotation().isPure)
-			isPure = false;
-	}
-	if (Expression const* end = _access.endExpression())
-	{
-		expectType(*end, *TypeProvider::uint256());
-		if (!*end->annotation().isPure)
-			isPure = false;
-	}
-
-	_access.annotation().isLValue = isLValue;
-	_access.annotation().isPure = isPure;
-
-	Type const* exprType = type(_access.baseExpression());
-	if (exprType->category() == Type::Category::TypeType)
-	{
-		m_errorReporter.typeError(1760_error, _access.location(), "Types cannot be sliced.");
-		_access.annotation().type = exprType;
-		return false;
-	}
-
-	ArrayType const* arrayType = nullptr;
-	if (auto const* arraySlice = dynamic_cast<ArraySliceType const*>(exprType))
-		arrayType = &arraySlice->arrayType();
-	else if (!(arrayType = dynamic_cast<ArrayType const*>(exprType)))
-		m_errorReporter.fatalTypeError(4781_error, _access.location(), "Index range access is only possible for arrays and array slices.");
-
-	if (arrayType->location() != DataLocation::CallData || !arrayType->isDynamicallySized())
-		m_errorReporter.typeError(1227_error, _access.location(), "Index range access is only supported for dynamic calldata arrays.");
-	else if (arrayType->baseType()->isDynamicallyEncoded())
-		m_errorReporter.typeError(2148_error, _access.location(), "Index range access is not supported for arrays with dynamically encoded base types.");
-	_access.annotation().type = TypeProvider::arraySlice(*arrayType);
-
-	return false;
-}
-
-std::vector<Declaration const*> TypeChecker::cleanOverloadedDeclarations(
-	Identifier const& _identifier,
-	std::vector<Declaration const*> const& _candidates
-)
-{
-	solAssert(_candidates.size() > 1, "");
-	std::vector<Declaration const*> uniqueDeclarations;
-
-	for (Declaration const* declaration: _candidates)
-	{
-		solAssert(declaration, "");
-		// the declaration is functionDefinition, eventDefinition or a VariableDeclaration while declarations > 1
-		solAssert(
-			dynamic_cast<FunctionDefinition const*>(declaration) ||
-			dynamic_cast<EventDefinition const*>(declaration) ||
-			dynamic_cast<VariableDeclaration const*>(declaration) ||
-			dynamic_cast<MagicVariableDeclaration const*>(declaration),
-			"Found overloading involving something not a function, event or a (magic) variable."
-		);
-
-		FunctionTypePointer functionType {declaration->functionType(false)};
-		if (!functionType)
-			functionType = declaration->functionType(true);
-		solAssert(functionType, "Failed to determine the function type of the overloaded.");
-
-		for (Type const* parameter: functionType->parameterTypes() + functionType->returnParameterTypes())
-			if (!parameter)
-				m_errorReporter.fatalDeclarationError(3893_error, _identifier.location(), "Function type can not be used in this context.");
-
-		if (uniqueDeclarations.end() == find_if(
-			uniqueDeclarations.begin(),
-			uniqueDeclarations.end(),
-			[&](Declaration const* d)
-			{
-				FunctionType const* newFunctionType = d->functionType(false);
-				if (!newFunctionType)
-					newFunctionType = d->functionType(true);
-				return newFunctionType && functionType->hasEqualParameterTypes(*newFunctionType);
-			}
-		))
-			uniqueDeclarations.push_back(declaration);
-	}
-	return uniqueDeclarations;
-}
-
-bool TypeChecker::visit(Identifier const& _identifier)
-{
-	IdentifierAnnotation& annotation = _identifier.annotation();
-
-	if (!annotation.referencedDeclaration)
-	{
-		annotation.overloadedDeclarations = cleanOverloadedDeclarations(_identifier, annotation.candidateDeclarations);
-		if (annotation.overloadedDeclarations.empty())
-			m_errorReporter.fatalTypeError(7593_error, _identifier.location(), "No candidates for overload resolution found.");
-		else if (annotation.overloadedDeclarations.size() == 1)
-			annotation.referencedDeclaration = *annotation.overloadedDeclarations.begin();
-		else if (!annotation.arguments)
-		{
-			// The identifier should be a public state variable shadowing other functions
-			std::vector<Declaration const*> candidates;
-
-			for (Declaration const* declaration: annotation.overloadedDeclarations)
-			{
-				if (VariableDeclaration const* variableDeclaration = dynamic_cast<decltype(variableDeclaration)>(declaration))
-					candidates.push_back(declaration);
-			}
-			if (candidates.empty())
-				m_errorReporter.fatalTypeError(2144_error, _identifier.location(), "No matching declaration found after variable lookup.");
-			else if (candidates.size() == 1)
-				annotation.referencedDeclaration = candidates.front();
-			else
-				m_errorReporter.fatalTypeError(7589_error, _identifier.location(), "No unique declaration found after variable lookup.");
-		}
-		else
-		{
-			std::vector<Declaration const*> candidates;
-
-			for (Declaration const* declaration: annotation.overloadedDeclarations)
-			{
-				FunctionTypePointer functionType = declaration->functionType(true);
-				solAssert(!!functionType, "Requested type not present.");
-				if (functionType->canTakeArguments(*annotation.arguments))
-					candidates.push_back(declaration);
-			}
-			if (candidates.size() == 1)
-				annotation.referencedDeclaration = candidates.front();
-			else
-			{
-				SecondarySourceLocation ssl;
-
-				for (Declaration const* declaration: annotation.overloadedDeclarations)
-					if (!declaration->location().isValid())
-					{
-						// Try to re-construct function definition
-						std::string description;
-						for (auto const& param: declaration->functionType(true)->parameterTypes())
-							description += (description.empty() ? "" : ", ") + param->humanReadableName();
-						description = "function " + _identifier.name() + "(" + description + ")";
-
-						ssl.append("Candidate: " + description, declaration->location());
-					}
-					else
-						ssl.append("Candidate:", declaration->location());
-				if (candidates.empty())
-					m_errorReporter.fatalTypeError(9322_error, _identifier.location(), ssl, "No matching declaration found after argument-dependent lookup.");
-				else
-					m_errorReporter.fatalTypeError(4487_error, _identifier.location(), ssl, "No unique declaration found after argument-dependent lookup.");
-			}
-		}
-	}
-	solAssert(
-		!!annotation.referencedDeclaration,
-		"Referenced declaration is null after overload resolution."
-	);
-	bool isConstant = false;
-	annotation.isLValue = annotation.referencedDeclaration->isLValue();
-	annotation.type = annotation.referencedDeclaration->type();
-	solAssert(annotation.type, "Declaration referenced before type could be determined.");
-	if (auto variableDeclaration = dynamic_cast<VariableDeclaration const*>(annotation.referencedDeclaration))
-		annotation.isPure = isConstant = variableDeclaration->isConstant();
-	else if (dynamic_cast<MagicVariableDeclaration const*>(annotation.referencedDeclaration))
-		annotation.isPure = dynamic_cast<FunctionType const*>(annotation.type);
-	else if (dynamic_cast<TypeType const*>(annotation.type))
-		annotation.isPure = true;
-	else if (dynamic_cast<ModuleType const*>(annotation.type))
-		annotation.isPure = true;
-	else
-		annotation.isPure = false;
-
-	annotation.isConstant = isConstant;
-
-	annotation.requiredLookup =
-		dynamic_cast<CallableDeclaration const*>(annotation.referencedDeclaration) ?
-		VirtualLookup::Virtual : VirtualLookup::Static;
-
-	// Check for deprecated function names.
-	// The check is done here for the case without an actual function call.
-	if (FunctionType const* fType = dynamic_cast<FunctionType const*>(_identifier.annotation().type))
-	{
-		if (_identifier.name() == "sha3" && fType->kind() == FunctionType::Kind::KECCAK256)
-			m_errorReporter.typeError(
-				3557_error,
-				_identifier.location(),
-				"\"sha3\" has been deprecated in favour of \"keccak256\"."
-			);
-		else if (_identifier.name() == "suicide" && fType->kind() == FunctionType::Kind::Selfdestruct)
-			m_errorReporter.typeError(
-				8050_error,
-				_identifier.location(),
-				"\"suicide\" has been deprecated in favour of \"selfdestruct\"."
-			);
-		else if (_identifier.name() == "selfdestruct" && fType->kind() == FunctionType::Kind::Selfdestruct)
-			m_errorReporter.warning(
-				5159_error,
-				_identifier.location(),
-				"\"selfdestruct\" has been deprecated. "
-				"The underlying opcode will eventually undergo breaking changes, "
-				"and its use is not recommended."
-			);
-	}
-
-	if (
-		MagicVariableDeclaration const* magicVar =
-		dynamic_cast<MagicVariableDeclaration const*>(annotation.referencedDeclaration)
-	)
-		if (magicVar->type()->category() == Type::Category::Integer)
-		{
-			solAssert(_identifier.name() == "now", "");
-			m_errorReporter.typeError(
-				7359_error,
-				_identifier.location(),
-				"\"now\" has been deprecated. Use \"block.timestamp\" instead."
-			);
-		}
-
-	return false;
-}
-
-void TypeChecker::endVisit(IdentifierPath const& _identifierPath)
-{
-	if (
-		dynamic_cast<CallableDeclaration const*>(_identifierPath.annotation().referencedDeclaration) &&
-		_identifierPath.path().size() == 1
-	)
-		_identifierPath.annotation().requiredLookup = VirtualLookup::Virtual;
-	else
-		_identifierPath.annotation().requiredLookup = VirtualLookup::Static;
-}
-
-void TypeChecker::endVisit(UserDefinedTypeName const& _userDefinedTypeName)
-{
-	if (!_userDefinedTypeName.annotation().type)
-		_userDefinedTypeName.annotation().type = _userDefinedTypeName.pathNode().annotation().referencedDeclaration->type();
-}
-
-void TypeChecker::endVisit(ElementaryTypeNameExpression const& _expr)
-{
-	_expr.annotation().type = TypeProvider::typeType(TypeProvider::fromElementaryTypeName(_expr.type().typeName(), _expr.type().stateMutability()));
-	_expr.annotation().isPure = true;
-	_expr.annotation().isLValue = false;
-	_expr.annotation().isConstant = false;
-}
-
-void TypeChecker::endVisit(Literal const& _literal)
-{
-	if (_literal.looksLikeAddress())
-	{
-		// Assign type here if it even looks like an address. This prevents double errors for invalid addresses
-		_literal.annotation().type = TypeProvider::address();
-
-		std::string msg;
-		if (_literal.valueWithoutUnderscores().length() != 42) // "0x" + 40 hex digits
-			// looksLikeAddress enforces that it is a hex literal starting with "0x"
-			msg =
-				"This looks like an address but is not exactly 40 hex digits. It is " +
-				std::to_string(_literal.valueWithoutUnderscores().length() - 2) +
-				" hex digits.";
-		else if (!_literal.passesAddressChecksum())
-		{
-			msg = "This looks like an address but has an invalid checksum.";
-			if (!_literal.getChecksummedAddress().empty())
-				msg += " Correct checksummed address: \"" + _literal.getChecksummedAddress() + "\".";
-		}
-
-		if (!msg.empty())
-			m_errorReporter.syntaxError(
-				9429_error,
-				_literal.location(),
-				msg +
-				" If this is not used as an address, please prepend '00'. " +
-				"For more information please see https://docs.soliditylang.org/en/develop/types.html#address-literals"
-			);
-	}
-
-	if (_literal.isHexNumber() && _literal.subDenomination() != Literal::SubDenomination::None)
-		m_errorReporter.fatalTypeError(
-			5145_error,
-			_literal.location(),
-			"Hexadecimal numbers cannot be used with unit denominations. "
-			"You can use an expression of the form \"0x1234 * 1 day\" instead."
-		);
-
-	if (_literal.subDenomination() == Literal::SubDenomination::Year)
-		m_errorReporter.typeError(
-			4820_error,
-			_literal.location(),
-			"Using \"years\" as a unit denomination is deprecated."
-		);
-
-	if (!_literal.annotation().type)
-		_literal.annotation().type = TypeProvider::forLiteral(_literal);
-
-	if (!_literal.annotation().type)
-		m_errorReporter.fatalTypeError(2826_error, _literal.location(), "Invalid literal value.");
-
-	_literal.annotation().isPure = true;
-	_literal.annotation().isLValue = false;
-	_literal.annotation().isConstant = false;
-}
-
-void TypeChecker::endVisit(UsingForDirective const& _usingFor)
-{
-	if (_usingFor.global())
-	{
-		if (m_currentContract || !_usingFor.typeName())
-		{
-			solAssert(m_errorReporter.hasErrors());
-			return;
-		}
-		Type const* usingForType = _usingFor.typeName()->annotation().type;
-		solAssert(usingForType);
-		if (Declaration const* typeDefinition = usingForType->typeDefinition())
-		{
-			if (typeDefinition->scope() != m_currentSourceUnit)
-				m_errorReporter.typeError(
-					4117_error,
-					_usingFor.location(),
-					"Can only use \"global\" with types defined in the same source unit at file level."
-				);
-		}
-		else
-			m_errorReporter.typeError(
-				8841_error,
-				_usingFor.location(),
-				"Can only use \"global\" with user-defined types."
-			);
-	}
-
-	if (!_usingFor.usesBraces())
-	{
-		solAssert(_usingFor.functionsOrLibrary().size() == 1);
-		ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(
-			_usingFor.functionsOrLibrary().front()->annotation().referencedDeclaration
-		);
-		solAssert(library && library->isLibrary());
-		// No type checking for libraries
-		return;
-	}
-
-	if (!_usingFor.typeName())
-	{
-		solAssert(m_errorReporter.hasErrors());
-		return;
-	}
-
-	Type const* usingForType = _usingFor.typeName()->annotation().type;
-	solAssert(usingForType);
-
-	Type const* normalizedType = TypeProvider::withLocationIfReference(
-		DataLocation::Storage,
-		usingForType
-	);
-	solAssert(normalizedType);
-
-	for (auto const& [path, operator_]: _usingFor.functionsAndOperators())
-	{
-		solAssert(path->annotation().referencedDeclaration);
-		FunctionDefinition const& functionDefinition =
-			dynamic_cast<FunctionDefinition const&>(*path->annotation().referencedDeclaration);
-
-		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
-			functionDefinition.libraryFunction() ?
-				functionDefinition.typeViaContractName() :
-				functionDefinition.type()
-			);
-
-		solAssert(functionType);
-
-		if (functionDefinition.parameters().empty())
-			m_errorReporter.fatalTypeError(
-				4731_error,
-				path->location(),
-				SecondarySourceLocation().append(
-					"Function defined here:",
-					functionDefinition.location()
-				),
-				fmt::format(
-					"The function \"{}\" does not have any parameters, and therefore cannot be attached to the type \"{}\".",
-					joinHumanReadable(path->path(), "."),
-					normalizedType ? normalizedType->toString(true /* withoutDataLocation */) : "*"
-				)
-			);
-
-		if (
-			functionDefinition.visibility() == Visibility::Private &&
-			functionDefinition.scope() != m_currentContract
-		)
-		{
-			solAssert(functionDefinition.libraryFunction());
-			m_errorReporter.typeError(
-				6772_error,
-				path->location(),
-				SecondarySourceLocation().append(
-					"Function defined here:",
-					functionDefinition.location()
-				),
-				fmt::format(
-					"Function \"{}\" is private and therefore cannot be attached"
-					" to a type outside of the library where it is defined.",
-					joinHumanReadable(path->path(), ".")
-				)
-			);
-		}
-
-		FunctionType const* functionTypeWithBoundFirstArgument = functionType->withBoundFirstArgument();
-		solAssert(functionTypeWithBoundFirstArgument && functionTypeWithBoundFirstArgument->selfType(), "");
-		BoolResult result = normalizedType->isImplicitlyConvertibleTo(
-			*TypeProvider::withLocationIfReference(DataLocation::Storage, functionTypeWithBoundFirstArgument->selfType())
-		);
-		if (!result && !operator_)
-			m_errorReporter.typeError(
-				3100_error,
-				path->location(),
-				SecondarySourceLocation().append(
-					"Function defined here:",
-					functionDefinition.location()
-				),
-				fmt::format(
-					"The function \"{}\" cannot be attached to the type \"{}\" because the type cannot "
-					"be implicitly converted to the first argument of the function (\"{}\"){}",
-					joinHumanReadable(path->path(), "."),
-					usingForType->toString(true /* withoutDataLocation */),
-					functionTypeWithBoundFirstArgument->selfType()->humanReadableName(),
-					result.message().empty() ? "." : ": " +  result.message()
-				)
-			);
-		else if (operator_.has_value())
-		{
-			if (!_usingFor.global())
-				m_errorReporter.typeError(
-					3320_error,
-					path->location(),
-					"Operators can only be defined in a global 'using for' directive."
-				);
-
-			if (
-				functionType->stateMutability() != StateMutability::Pure ||
-				!functionDefinition.isFree()
-			)
-				m_errorReporter.typeError(
-					7775_error,
-					path->location(),
-					SecondarySourceLocation().append(
-						"Function defined as non-pure here:",
-						functionDefinition.location()
-					),
-					"Only pure free functions can be used to define operators."
-				);
-
-			solAssert(!functionType->hasBoundFirstArgument());
-			TypePointers const& parameterTypes = functionType->parameterTypes();
-			size_t const parameterCount = parameterTypes.size();
-			if (usingForType->category() != Type::Category::UserDefinedValueType)
-			{
-				m_errorReporter.typeError(
-					5332_error,
-					path->location(),
-					"Operators can only be implemented for user-defined value types."
-				);
-				continue;
-			}
-			solAssert(usingForType->typeDefinition());
-
-			bool identicalFirstTwoParameters = (parameterCount < 2 || *parameterTypes.at(0) == *parameterTypes.at(1));
-			bool isUnaryOnlyOperator = (!TokenTraits::isBinaryOp(operator_.value()) && TokenTraits::isUnaryOp(operator_.value()));
-			bool isBinaryOnlyOperator = (TokenTraits::isBinaryOp(operator_.value()) && !TokenTraits::isUnaryOp(operator_.value()));
-			bool firstParameterMatchesUsingFor = parameterCount == 0 || *usingForType == *parameterTypes.front();
-
-			std::optional<std::string> wrongParametersMessage;
-			if (isBinaryOnlyOperator && (parameterCount != 2 || !identicalFirstTwoParameters))
-				wrongParametersMessage = fmt::format("two parameters of type {} and the same data location", usingForType->canonicalName());
-			else if (isUnaryOnlyOperator && (parameterCount != 1 || !firstParameterMatchesUsingFor))
-				wrongParametersMessage = fmt::format("exactly one parameter of type {}", usingForType->canonicalName());
-			else if (parameterCount >= 3 || !firstParameterMatchesUsingFor || !identicalFirstTwoParameters)
-				wrongParametersMessage = fmt::format("one or two parameters of type {} and the same data location", usingForType->canonicalName());
-
-			if (wrongParametersMessage.has_value())
-				m_errorReporter.typeError(
-					1884_error,
-					functionDefinition.parameterList().location(),
-					SecondarySourceLocation().append(
-						"Function was used to implement an operator here:",
-						path->location()
-					),
-					fmt::format(
-						"Wrong parameters in operator definition. "
-						"The function \"{}\" needs to have {} to be used for the operator {}.",
-						joinHumanReadable(path->path(), "."),
-						wrongParametersMessage.value(),
-						TokenTraits::friendlyName(operator_.value())
-					)
-				);
-
-			// This case is separately validated for all attached functions and is a fatal error
-			solAssert(parameterCount != 0);
-
-			TypePointers const& returnParameterTypes = functionType->returnParameterTypes();
-			size_t const returnParameterCount = returnParameterTypes.size();
-
-			std::optional<std::string> wrongReturnParametersMessage;
-			if (!TokenTraits::isCompareOp(operator_.value()) && operator_.value() != Token::Not)
-			{
-				if (returnParameterCount != 1 || *usingForType != *returnParameterTypes.front())
-					wrongReturnParametersMessage = "exactly one value of type " + usingForType->canonicalName();
-				else if (*returnParameterTypes.front() != *parameterTypes.front())
-					wrongReturnParametersMessage = "a value of the same type and data location as its parameters";
-			}
-			else if (returnParameterCount != 1 || *returnParameterTypes.front() != *TypeProvider::boolean())
-				wrongReturnParametersMessage = "exactly one value of type bool";
-
-			solAssert(functionDefinition.returnParameterList());
-			if (wrongReturnParametersMessage.has_value())
-				m_errorReporter.typeError(
-					7743_error,
-					functionDefinition.returnParameterList()->location(),
-					SecondarySourceLocation().append(
-						"Function was used to implement an operator here:",
-						path->location()
-					),
-					fmt::format(
-						"Wrong return parameters in operator definition. "
-						"The function \"{}\" needs to return {} to be used for the operator {}.",
-						joinHumanReadable(path->path(), "."),
-						wrongReturnParametersMessage.value(),
-						TokenTraits::friendlyName(operator_.value())
-					)
-				);
-
-			if (parameterCount != 1 && parameterCount != 2)
-				solAssert(m_errorReporter.hasErrors());
-			else
-			{
-				// TODO: This is pretty inefficient. For every operator binding we find, we're
-				// traversing all bindings in all `using for` directives in the current scope.
-				std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = usingForType->operatorDefinitions(
-					operator_.value(),
-					*currentDefinitionScope(),
-					parameterCount == 1 // _unary
-				);
-
-				if (matchingDefinitions.size() >= 2)
-				{
-					// TODO: We should point at other places that bind the operator rather than at
-					// the definitions they bind.
-					SecondarySourceLocation secondaryLocation;
-					for (FunctionDefinition const* definition: matchingDefinitions)
-						if (functionDefinition != *definition)
-						secondaryLocation.append("Conflicting definition:", definition->location());
-
-					m_errorReporter.typeError(
-						4705_error,
-						path->location(),
-						secondaryLocation,
-						fmt::format(
-							"User-defined {} operator {} has more than one definition matching the operand type visible in the current scope.",
-							parameterCount == 1 ? "unary" : "binary",
-							TokenTraits::friendlyName(operator_.value())
-						)
-					);
-				}
-			}
-		}
-	}
-}
-
-void TypeChecker::checkErrorAndEventParameters(CallableDeclaration const& _callable)
-{
-	std::string kind = dynamic_cast<EventDefinition const*>(&_callable) ? "event" : "error";
-	for (ASTPointer<VariableDeclaration> const& var: _callable.parameters())
-	{
-		if (type(*var)->containsNestedMapping())
-			m_errorReporter.fatalTypeError(
-				3448_error,
-				var->location(),
-				"Type containing a (nested) mapping is not allowed as " + kind + " parameter type."
-			);
-		if (!type(*var)->interfaceType(false))
-			m_errorReporter.typeError(3417_error, var->location(), "Internal or recursive type is not allowed as " + kind + " parameter type.");
-		if (
-			!useABICoderV2() &&
-			!typeSupportedByOldABIEncoder(*type(*var), false /* isLibrary */)
-		)
-			m_errorReporter.typeError(
-				3061_error,
-				var->location(),
-				"This type is only supported in ABI coder v2. "
-				"Use \"pragma abicoder v2;\" to enable the feature."
-			);
-	}
-}
-
-Declaration const& TypeChecker::dereference(Identifier const& _identifier) const
-{
-	solAssert(!!_identifier.annotation().referencedDeclaration, "Declaration not stored.");
-	return *_identifier.annotation().referencedDeclaration;
-}
-
-Declaration const& TypeChecker::dereference(IdentifierPath const& _path) const
-{
-	solAssert(!!_path.annotation().referencedDeclaration, "Declaration not stored.");
-	return *_path.annotation().referencedDeclaration;
-}
-
-bool TypeChecker::expectType(Expression const& _expression, Type const& _expectedType)
-{
-	_expression.accept(*this);
-	BoolResult result = type(_expression)->isImplicitlyConvertibleTo(_expectedType);
-	if (!result)
-	{
-		auto errorMsg = "Type " +
-			type(_expression)->humanReadableName() +
-			" is not implicitly convertible to expected type " +
-			_expectedType.humanReadableName();
-		if (
-			type(_expression)->category() == Type::Category::RationalNumber &&
-			dynamic_cast<RationalNumberType const*>(type(_expression))->isFractional() &&
-			type(_expression)->mobileType()
-		)
-		{
-			if (_expectedType.operator==(*type(_expression)->mobileType()))
-				m_errorReporter.typeError(
-					4426_error,
-					_expression.location(),
-					errorMsg + ", but it can be explicitly converted."
-				);
-			else
-				m_errorReporter.typeErrorConcatenateDescriptions(
-					2326_error,
-					_expression.location(),
-					errorMsg +
-					". Try converting to type " +
-					type(_expression)->mobileType()->humanReadableName() +
-					" or use an explicit conversion.",
-					result.message()
-				);
-		}
-		else
-			m_errorReporter.typeErrorConcatenateDescriptions(
-				7407_error,
-				_expression.location(),
-				errorMsg + ".",
-				result.message()
-			);
-		return false;
-	}
-	return true;
-}
-
-void TypeChecker::requireLValue(Expression const& _expression, bool _ordinaryAssignment)
-{
-	_expression.annotation().willBeWrittenTo = true;
-	_expression.annotation().lValueOfOrdinaryAssignment = _ordinaryAssignment;
-	_expression.accept(*this);
-
-	if (*_expression.annotation().isLValue)
-		return;
-
-	auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
-		if (*_expression.annotation().isConstant)
-			return { 6520_error, "Cannot assign to a constant variable." };
-
-		if (auto indexAccess = dynamic_cast<IndexAccess const*>(&_expression))
-		{
-			if (type(indexAccess->baseExpression())->category() == Type::Category::FixedBytes)
-				return { 4360_error, "Single bytes in fixed bytes arrays cannot be modified." };
-			else if (auto arrayType = dynamic_cast<ArrayType const*>(type(indexAccess->baseExpression())))
-				if (arrayType->dataStoredIn(DataLocation::CallData))
-					return { 6182_error, "Calldata arrays are read-only." };
-		}
-
-		if (auto memberAccess = dynamic_cast<MemberAccess const*>(&_expression))
-		{
-			if (auto structType = dynamic_cast<StructType const*>(type(memberAccess->expression())))
-			{
-				if (structType->dataStoredIn(DataLocation::CallData))
-					return { 4156_error, "Calldata structs are read-only." };
-			}
-			else if (dynamic_cast<ArrayType const*>(type(memberAccess->expression())))
-				if (memberAccess->memberName() == "length")
-					return { 7567_error, "Member \"length\" is read-only and cannot be used to resize arrays." };
-		}
-
-		if (auto identifier = dynamic_cast<Identifier const*>(&_expression))
-			if (auto varDecl = dynamic_cast<VariableDeclaration const*>(identifier->annotation().referencedDeclaration))
-				if (varDecl->isExternalCallableParameter() && dynamic_cast<ReferenceType const*>(identifier->annotation().type))
-					return { 7128_error, "External function arguments of reference type are read-only." };
-
-		return { 4247_error, "Expression has to be an lvalue." };
-	}();
-
-	m_errorReporter.typeError(errorId, _expression.location(), description);
-}
-
-bool TypeChecker::useABICoderV2() const
-{
-	solAssert(m_currentSourceUnit, "");
-	if (m_currentContract)
-		solAssert(m_currentSourceUnit == &m_currentContract->sourceUnit(), "");
-	return *m_currentSourceUnit->annotation().useABICoderV2;
-
-}
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
deleted file mode 100644
index 2ef6b818be6e..000000000000
--- a/libsolidity/analysis/TypeChecker.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Type analyzer and checker.
- */
-
-#pragma once
-
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/ast/Types.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * The module that performs type analysis on the AST, checks the applicability of operations on
- * those types and stores errors for invalid operations.
- * Provides a way to retrieve the type of an AST node.
- */
-class TypeChecker: private ASTConstVisitor
-{
-public:
-	/// @param _errorReporter provides the error logging functionality.
-	TypeChecker(langutil::EVMVersion _evmVersion, langutil::ErrorReporter& _errorReporter):
-		m_evmVersion(_evmVersion),
-		m_errorReporter(_errorReporter)
-	{}
-
-	/// Performs type checking on the given source and all of its sub-nodes.
-	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
-	bool checkTypeRequirements(SourceUnit const& _source);
-
-	/// @returns the type of an expression and asserts that it is present.
-	Type const* type(Expression const& _expression) const;
-	/// @returns the type of the given variable and throws if the type is not present
-	/// (this can happen for variables with non-explicit types before their types are resolved)
-	Type const* type(VariableDeclaration const& _variable) const;
-
-	static bool typeSupportedByOldABIEncoder(Type const& _type, bool _isLibraryCall);
-
-private:
-
-	bool visit(ContractDefinition const& _contract) override;
-	/// Checks (and warns) if a tuple assignment might cause unexpected overwrites in storage.
-	/// Should only be called if the left hand side is tuple-typed.
-	void checkDoubleStorageAssignment(Assignment const& _assignment);
-	// Checks whether the expression @arg _expression can be assigned from type @arg _type
-	// and reports an error, if not.
-	void checkExpressionAssignment(Type const& _type, Expression const& _expression);
-
-	/// Performs type checks for ``abi.decode(bytes memory, (...))`` and returns the
-	/// vector of return types (which is basically the second argument) if successful. It returns
-	/// the empty vector on error.
-	TypePointers typeCheckABIDecodeAndRetrieveReturnType(
-		FunctionCall const& _functionCall,
-		bool _abiEncoderV2
-	);
-
-	TypePointers typeCheckMetaTypeFunctionAndRetrieveReturnType(FunctionCall const& _functionCall);
-
-	/// Performs type checks and determines result types for type conversion FunctionCall nodes.
-	Type const* typeCheckTypeConversionAndRetrieveReturnType(
-		FunctionCall const& _functionCall
-	);
-
-	/// Performs type checks on function call and struct ctor FunctionCall nodes (except for kind ABIDecode).
-	void typeCheckFunctionCall(
-		FunctionCall const& _functionCall,
-		FunctionTypePointer _functionType
-	);
-
-	void typeCheckFallbackFunction(FunctionDefinition const& _function);
-	void typeCheckConstructor(FunctionDefinition const& _function);
-
-	/// Performs general number and type checks of arguments against function call and struct ctor FunctionCall node parameters.
-	void typeCheckFunctionGeneralChecks(
-		FunctionCall const& _functionCall,
-		FunctionTypePointer _functionType
-	);
-
-	/// Performs general checks and checks specific to ABI encode functions
-	void typeCheckABIEncodeFunctions(
-		FunctionCall const& _functionCall,
-		FunctionTypePointer _functionType
-	);
-
-	/// Performs checks specific to the ABI encode functions of type ABIEncodeCall
-	void typeCheckABIEncodeCallFunction(FunctionCall const& _functionCall);
-
-	/// Performs general checks and checks specific to string concat function call
-	void typeCheckStringConcatFunction(
-		FunctionCall const& _functionCall,
-		FunctionType const* _functionType
-	);
-
-	/// Performs general checks and checks specific to bytes concat function call
-	void typeCheckBytesConcatFunction(
-		FunctionCall const& _functionCall,
-		FunctionType const* _functionType
-	);
-
-	bool visit(ImportDirective const&) override;
-
-	void endVisit(InheritanceSpecifier const& _inheritance) override;
-	void endVisit(ModifierDefinition const& _modifier) override;
-	bool visit(FunctionDefinition const& _function) override;
-	void endVisit(ArrayTypeName const& _typeName) override;
-	bool visit(VariableDeclaration const& _variable) override;
-	void endVisit(StructDefinition const& _struct) override;
-	/// We need to do this manually because we want to pass the bases of the current contract in
-	/// case this is a base constructor call.
-	void visitManually(ModifierInvocation const& _modifier, std::vector<ContractDefinition const*> const& _bases);
-	bool visit(EventDefinition const& _eventDef) override;
-	bool visit(ErrorDefinition const& _errorDef) override;
-	void endVisit(FunctionTypeName const& _funType) override;
-	bool visit(InlineAssembly const& _inlineAssembly) override;
-	bool visit(IfStatement const& _ifStatement) override;
-	void endVisit(TryStatement const& _tryStatement) override;
-	bool visit(WhileStatement const& _whileStatement) override;
-	bool visit(ForStatement const& _forStatement) override;
-	void endVisit(Return const& _return) override;
-	void endVisit(EmitStatement const& _emit) override;
-	void endVisit(RevertStatement const& _revert) override;
-	bool visit(VariableDeclarationStatement const& _variable) override;
-	void endVisit(ExpressionStatement const& _statement) override;
-	bool visit(Conditional const& _conditional) override;
-	bool visit(Assignment const& _assignment) override;
-	bool visit(TupleExpression const& _tuple) override;
-	void endVisit(BinaryOperation const& _operation) override;
-	bool visit(UnaryOperation const& _operation) override;
-	bool visit(FunctionCall const& _functionCall) override;
-	bool visit(FunctionCallOptions const& _functionCallOptions) override;
-	void endVisit(NewExpression const& _newExpression) override;
-	bool visit(MemberAccess const& _memberAccess) override;
-	bool visit(IndexAccess const& _indexAccess) override;
-	bool visit(IndexRangeAccess const& _indexRangeAccess) override;
-	bool visit(Identifier const& _identifier) override;
-	void endVisit(IdentifierPath const& _identifierPath) override;
-	void endVisit(UserDefinedTypeName const& _userDefinedTypeName) override;
-	void endVisit(ElementaryTypeNameExpression const& _expr) override;
-	void endVisit(Literal const& _literal) override;
-	void endVisit(UsingForDirective const& _usingForDirective) override;
-
-	void checkErrorAndEventParameters(CallableDeclaration const& _callable);
-
-	/// @returns the referenced declaration and throws on error.
-	Declaration const& dereference(Identifier const& _identifier) const;
-	/// @returns the referenced declaration and throws on error.
-	Declaration const& dereference(IdentifierPath const& _path) const;
-
-	std::vector<Declaration const*> cleanOverloadedDeclarations(
-		Identifier const& _reference,
-		std::vector<Declaration const*> const& _candidates
-	);
-
-	/// Runs type checks on @a _expression to infer its type and then checks that it is implicitly
-	/// convertible to @a _expectedType.
-	bool expectType(Expression const& _expression, Type const& _expectedType);
-	/// Runs type checks on @a _expression to infer its type and then checks that it is an LValue.
-	void requireLValue(Expression const& _expression, bool _ordinaryAssignment);
-
-	bool useABICoderV2() const;
-
-	/// @returns the current scope that can have function or type definitions.
-	/// This is either a contract or a source unit.
-	ASTNode const* currentDefinitionScope() const
-	{
-		if (m_currentContract)
-			return m_currentContract;
-		else
-			return m_currentSourceUnit;
-	}
-
-	SourceUnit const* m_currentSourceUnit = nullptr;
-	ContractDefinition const* m_currentContract = nullptr;
-
-	langutil::EVMVersion m_evmVersion;
-
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
deleted file mode 100644
index 3f6b954e75da..000000000000
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/analysis/ViewPureChecker.h>
-#include <libsolidity/ast/ExperimentalFeatures.h>
-#include <libyul/AST.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <liblangutil/ErrorReporter.h>
-#include <libevmasm/SemanticInformation.h>
-
-#include <functional>
-#include <utility>
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-
-class AssemblyViewPureChecker
-{
-public:
-	explicit AssemblyViewPureChecker(
-		yul::Dialect const& _dialect,
-		std::function<void(StateMutability, SourceLocation const&)> _reportMutability
-	):
-		m_dialect(_dialect),
-		m_reportMutability(std::move(_reportMutability)) {}
-
-	void operator()(yul::Literal const&) {}
-	void operator()(yul::Identifier const&) {}
-	void operator()(yul::ExpressionStatement const& _expr)
-	{
-		std::visit(*this, _expr.expression);
-	}
-	void operator()(yul::Assignment const& _assignment)
-	{
-		std::visit(*this, *_assignment.value);
-	}
-	void operator()(yul::VariableDeclaration const& _varDecl)
-	{
-		if (_varDecl.value)
-			std::visit(*this, *_varDecl.value);
-	}
-	void operator()(yul::FunctionDefinition const& _funDef)
-	{
-		(*this)(_funDef.body);
-	}
-	void operator()(yul::FunctionCall const& _funCall)
-	{
-		if (yul::EVMDialect const* dialect = dynamic_cast<decltype(dialect)>(&m_dialect))
-			if (yul::BuiltinFunctionForEVM const* fun = dialect->builtin(_funCall.functionName.name))
-				if (fun->instruction)
-					checkInstruction(nativeLocationOf(_funCall), *fun->instruction);
-
-		for (auto const& arg: _funCall.arguments)
-			std::visit(*this, arg);
-	}
-	void operator()(yul::If const& _if)
-	{
-		std::visit(*this, *_if.condition);
-		(*this)(_if.body);
-	}
-	void operator()(yul::Switch const& _switch)
-	{
-		std::visit(*this, *_switch.expression);
-		for (auto const& _case: _switch.cases)
-		{
-			if (_case.value)
-				(*this)(*_case.value);
-			(*this)(_case.body);
-		}
-	}
-	void operator()(yul::ForLoop const& _for)
-	{
-		(*this)(_for.pre);
-		std::visit(*this, *_for.condition);
-		(*this)(_for.body);
-		(*this)(_for.post);
-	}
-	void operator()(yul::Break const&)
-	{
-	}
-	void operator()(yul::Continue const&)
-	{
-	}
-	void operator()(yul::Leave const&)
-	{
-	}
-	void operator()(yul::Block const& _block)
-	{
-		for (auto const& s: _block.statements)
-			std::visit(*this, s);
-	}
-
-private:
-	void checkInstruction(SourceLocation _location, evmasm::Instruction _instruction)
-	{
-		if (evmasm::SemanticInformation::invalidInViewFunctions(_instruction))
-			m_reportMutability(StateMutability::NonPayable, _location);
-		else if (evmasm::SemanticInformation::invalidInPureFunctions(_instruction))
-			m_reportMutability(StateMutability::View, _location);
-	}
-
-	yul::Dialect const& m_dialect;
-	std::function<void(StateMutability, SourceLocation const&)> m_reportMutability;
-};
-
-}
-
-bool ViewPureChecker::check()
-{
-	for (auto const& source: m_ast)
-		source->accept(*this);
-
-	return !m_errors;
-}
-
-bool ViewPureChecker::visit(ImportDirective const&)
-{
-	return false;
-}
-
-bool ViewPureChecker::visit(FunctionDefinition const& _funDef)
-{
-	solAssert(!m_currentFunction, "");
-	m_currentFunction = &_funDef;
-	m_bestMutabilityAndLocation = {StateMutability::Pure, _funDef.location()};
-	return true;
-}
-
-void ViewPureChecker::endVisit(FunctionDefinition const& _funDef)
-{
-	solAssert(m_currentFunction == &_funDef, "");
-	if (
-		m_bestMutabilityAndLocation.mutability < _funDef.stateMutability() &&
-		_funDef.stateMutability() != StateMutability::Payable &&
-		_funDef.isImplemented() &&
-		!_funDef.body().statements().empty() &&
-		!_funDef.isConstructor() &&
-		!_funDef.isFallback() &&
-		!_funDef.isReceive() &&
-		!_funDef.virtualSemantics()
-	)
-		m_errorReporter.warning(
-			2018_error,
-			_funDef.location(),
-			"Function state mutability can be restricted to " + stateMutabilityToString(m_bestMutabilityAndLocation.mutability)
-		);
-	m_currentFunction = nullptr;
-}
-
-bool ViewPureChecker::visit(ModifierDefinition const& _modifier)
-{
-	solAssert(m_currentFunction == nullptr, "");
-	m_bestMutabilityAndLocation = {StateMutability::Pure, _modifier.location()};
-	return true;
-}
-
-void ViewPureChecker::endVisit(ModifierDefinition const& _modifierDef)
-{
-	solAssert(m_currentFunction == nullptr, "");
-	m_inferredMutability[&_modifierDef] = std::move(m_bestMutabilityAndLocation);
-}
-
-void ViewPureChecker::endVisit(Identifier const& _identifier)
-{
-	Declaration const* declaration = _identifier.annotation().referencedDeclaration;
-	solAssert(declaration, "");
-
-	StateMutability mutability = StateMutability::Pure;
-
-	bool writes = _identifier.annotation().willBeWrittenTo;
-	if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(declaration))
-	{
-		if (varDecl->immutable())
-		{
-			// Immutables that are assigned literals are pure.
-			if (!(varDecl->value() && varDecl->value()->annotation().type->category() == Type::Category::RationalNumber))
-				mutability = StateMutability::View;
-		}
-		else if (varDecl->isStateVariable() && !varDecl->isConstant())
-			mutability = writes ? StateMutability::NonPayable : StateMutability::View;
-	}
-	else if (MagicVariableDeclaration const* magicVar = dynamic_cast<MagicVariableDeclaration const*>(declaration))
-	{
-		switch (magicVar->type()->category())
-		{
-		case Type::Category::Contract:
-			solAssert(_identifier.name() == "this", "");
-			if (dynamic_cast<ContractType const*>(magicVar->type()))
-				// reads the address
-				mutability = StateMutability::View;
-			break;
-		case Type::Category::Integer:
-			solAssert(_identifier.name() == "now", "");
-			mutability = StateMutability::View;
-			break;
-		default:
-			break;
-		}
-	}
-
-	reportMutability(mutability, _identifier.location());
-}
-
-void ViewPureChecker::endVisit(InlineAssembly const& _inlineAssembly)
-{
-	AssemblyViewPureChecker{
-		_inlineAssembly.dialect(),
-		[&](StateMutability _mutability, SourceLocation const& _location) { reportMutability(_mutability, _location); }
-	}(_inlineAssembly.operations());
-}
-
-void ViewPureChecker::reportMutability(
-	StateMutability _mutability,
-	SourceLocation const& _location,
-	std::optional<SourceLocation> const& _nestedLocation
-)
-{
-	if (_mutability > m_bestMutabilityAndLocation.mutability)
-		m_bestMutabilityAndLocation = MutabilityAndLocation{_mutability, _location};
-	if (!m_currentFunction || _mutability <= m_currentFunction->stateMutability())
-		return;
-
-	// Check for payable here, because any occurrence of `msg.value`
-	// will set mutability to payable.
-	if (_mutability == StateMutability::View || (
-		_mutability == StateMutability::Payable &&
-		m_currentFunction->stateMutability() == StateMutability::Pure
-	))
-	{
-		m_errorReporter.typeError(
-			2527_error,
-			_location,
-			"Function declared as pure, but this expression (potentially) reads from the "
-			"environment or state and thus requires \"view\"."
-		);
-		m_errors = true;
-	}
-	else if (_mutability == StateMutability::NonPayable)
-	{
-		m_errorReporter.typeError(
-			8961_error,
-			_location,
-			"Function cannot be declared as " +
-			stateMutabilityToString(m_currentFunction->stateMutability()) +
-			" because this expression (potentially) modifies the state."
-		);
-		m_errors = true;
-	}
-	else if (_mutability == StateMutability::Payable)
-	{
-		// We do not warn for library functions because they cannot be payable anyway.
-		// Also internal functions should be allowed to use `msg.value`.
-		if ((m_currentFunction->isConstructor() || m_currentFunction->isPublic()) && !m_currentFunction->libraryFunction())
-		{
-			if (_nestedLocation)
-				m_errorReporter.typeError(
-					4006_error,
-					_location,
-					SecondarySourceLocation().append("\"msg.value\" or \"callvalue()\" appear here inside the modifier.", *_nestedLocation),
-					m_currentFunction->isConstructor()  ?
-						"This modifier uses \"msg.value\" or \"callvalue()\" and thus the constructor has to be payable."
-						: "This modifier uses \"msg.value\" or \"callvalue()\" and thus the function has to be payable or internal."
-				);
-			else
-				m_errorReporter.typeError(
-					5887_error,
-					_location,
-					m_currentFunction->isConstructor()  ?
-						"\"msg.value\" and \"callvalue()\" can only be used in payable constructors. Make the constructor \"payable\" to avoid this error."
-						: "\"msg.value\" and \"callvalue()\" can only be used in payable public functions. Make the function \"payable\" or use an internal function to avoid this error."
-				);
-			m_errors = true;
-		}
-	}
-	else
-		solAssert(false, "");
-
-	solAssert(
-		m_currentFunction->stateMutability() == StateMutability::View ||
-		m_currentFunction->stateMutability() == StateMutability::Pure ||
-		m_currentFunction->stateMutability() == StateMutability::NonPayable,
-		""
-	);
-}
-
-ViewPureChecker::MutabilityAndLocation const& ViewPureChecker::modifierMutability(
-	ModifierDefinition const& _modifier
-)
-{
-	if (!m_inferredMutability.count(&_modifier))
-	{
-		MutabilityAndLocation bestMutabilityAndLocation{};
-		FunctionDefinition const* currentFunction = nullptr;
-		std::swap(bestMutabilityAndLocation, m_bestMutabilityAndLocation);
-		std::swap(currentFunction, m_currentFunction);
-
-		_modifier.accept(*this);
-
-		std::swap(bestMutabilityAndLocation, m_bestMutabilityAndLocation);
-		std::swap(currentFunction, m_currentFunction);
-	}
-	return m_inferredMutability.at(&_modifier);
-}
-
-void ViewPureChecker::reportFunctionCallMutability(StateMutability _mutability, langutil::SourceLocation const& _location)
-{
-	// We only require "nonpayable" to call a payable function.
-	if (_mutability == StateMutability::Payable)
-		_mutability = StateMutability::NonPayable;
-	reportMutability(_mutability, _location);
-}
-
-void ViewPureChecker::endVisit(BinaryOperation const& _binaryOperation)
-{
-	if (*_binaryOperation.annotation().userDefinedFunction != nullptr)
-		reportFunctionCallMutability((*_binaryOperation.annotation().userDefinedFunction)->stateMutability(), _binaryOperation.location());
-}
-
-void ViewPureChecker::endVisit(UnaryOperation const& _unaryOperation)
-{
-	if (*_unaryOperation.annotation().userDefinedFunction != nullptr)
-		reportFunctionCallMutability((*_unaryOperation.annotation().userDefinedFunction)->stateMutability(), _unaryOperation.location());
-}
-
-void ViewPureChecker::endVisit(FunctionCall const& _functionCall)
-{
-	if (*_functionCall.annotation().kind != FunctionCallKind::FunctionCall)
-		return;
-
-	reportFunctionCallMutability(
-		dynamic_cast<FunctionType const&>(*_functionCall.expression().annotation().type).stateMutability(),
-		_functionCall.location()
-	);
-}
-
-bool ViewPureChecker::visit(MemberAccess const& _memberAccess)
-{
-	// Catch the special case of `this.f.selector` which is a pure expression.
-	ASTString const& member = _memberAccess.memberName();
-	if (
-		_memberAccess.expression().annotation().type->category() == Type::Category::Function &&
-		member == "selector"
-	)
-		if (auto const* expr = dynamic_cast<MemberAccess const*>(&_memberAccess.expression()))
-			if (auto const* exprInt = dynamic_cast<Identifier const*>(&expr->expression()))
-				if (exprInt->name() == "this")
-					// Do not continue visiting.
-					return false;
-	return true;
-}
-
-void ViewPureChecker::endVisit(MemberAccess const& _memberAccess)
-{
-	StateMutability mutability = StateMutability::Pure;
-	bool writes = _memberAccess.annotation().willBeWrittenTo;
-
-	ASTString const& member = _memberAccess.memberName();
-	switch (_memberAccess.expression().annotation().type->category())
-	{
-	case Type::Category::Address:
-		if (member == "balance" || member == "code" || member == "codehash")
-			mutability = StateMutability::View;
-		break;
-	case Type::Category::Magic:
-	{
-		using MagicMember = std::pair<MagicType::Kind, std::string>;
-		std::set<MagicMember> static const pureMembers{
-			{MagicType::Kind::ABI, "decode"},
-			{MagicType::Kind::ABI, "encode"},
-			{MagicType::Kind::ABI, "encodePacked"},
-			{MagicType::Kind::ABI, "encodeWithSelector"},
-			{MagicType::Kind::ABI, "encodeCall"},
-			{MagicType::Kind::ABI, "encodeWithSignature"},
-			{MagicType::Kind::Message, "data"},
-			{MagicType::Kind::Message, "sig"},
-			{MagicType::Kind::MetaType, "creationCode"},
-			{MagicType::Kind::MetaType, "runtimeCode"},
-			{MagicType::Kind::MetaType, "name"},
-			{MagicType::Kind::MetaType, "interfaceId"},
-			{MagicType::Kind::MetaType, "min"},
-			{MagicType::Kind::MetaType, "max"},
-		};
-		std::set<MagicMember> static const payableMembers{
-			{MagicType::Kind::Message, "value"}
-		};
-
-		auto const& type = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type);
-		MagicMember magicMember(type.kind(), member);
-
-		if (!pureMembers.count(magicMember))
-			mutability = StateMutability::View;
-		if (payableMembers.count(magicMember))
-			mutability = StateMutability::Payable;
-		break;
-	}
-	case Type::Category::Struct:
-	{
-		if (_memberAccess.expression().annotation().type->dataStoredIn(DataLocation::Storage))
-			mutability = writes ? StateMutability::NonPayable : StateMutability::View;
-		break;
-	}
-	case Type::Category::Array:
-	{
-		auto const& type = dynamic_cast<ArrayType const&>(*_memberAccess.expression().annotation().type);
-		if (member == "length" && type.isDynamicallySized() && type.dataStoredIn(DataLocation::Storage))
-			mutability = StateMutability::View;
-		break;
-	}
-	default:
-	{
-		if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(
-			_memberAccess.annotation().referencedDeclaration
-		))
-			if (varDecl->isStateVariable() && !varDecl->isConstant())
-				mutability = writes ? StateMutability::NonPayable : StateMutability::View;
-		break;
-	}
-	}
-	reportMutability(mutability, _memberAccess.location());
-}
-
-void ViewPureChecker::endVisit(IndexAccess const& _indexAccess)
-{
-	if (!_indexAccess.indexExpression())
-		solAssert(_indexAccess.annotation().type->category() == Type::Category::TypeType, "");
-	else
-	{
-		bool writes = _indexAccess.annotation().willBeWrittenTo;
-		if (_indexAccess.baseExpression().annotation().type->dataStoredIn(DataLocation::Storage))
-			reportMutability(writes ? StateMutability::NonPayable : StateMutability::View, _indexAccess.location());
-	}
-}
-
-void ViewPureChecker::endVisit(IndexRangeAccess const& _indexRangeAccess)
-{
-	bool writes = _indexRangeAccess.annotation().willBeWrittenTo;
-	if (_indexRangeAccess.baseExpression().annotation().type->dataStoredIn(DataLocation::Storage))
-		reportMutability(writes ? StateMutability::NonPayable : StateMutability::View, _indexRangeAccess.location());
-}
-
-void ViewPureChecker::endVisit(ModifierInvocation const& _modifier)
-{
-	if (ModifierDefinition const* mod = dynamic_cast<decltype(mod)>(_modifier.name().annotation().referencedDeclaration))
-	{
-		MutabilityAndLocation const& mutAndLocation = modifierMutability(*mod);
-		reportMutability(mutAndLocation.mutability, _modifier.location(), mutAndLocation.location);
-	}
-	else
-		solAssert(dynamic_cast<ContractDefinition const*>(_modifier.name().annotation().referencedDeclaration), "");
-}
diff --git a/libsolidity/analysis/ViewPureChecker.h b/libsolidity/analysis/ViewPureChecker.h
deleted file mode 100644
index 0dcfb16d97a4..000000000000
--- a/libsolidity/analysis/ViewPureChecker.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTEnums.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-#include <map>
-#include <memory>
-#include <optional>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-
-class ViewPureChecker: private ASTConstVisitor
-{
-public:
-	ViewPureChecker(std::vector<std::shared_ptr<ASTNode>> const& _ast, langutil::ErrorReporter& _errorReporter):
-		m_ast(_ast), m_errorReporter(_errorReporter) {}
-
-	bool check();
-
-private:
-	struct MutabilityAndLocation
-	{
-		StateMutability mutability;
-		langutil::SourceLocation location;
-	};
-
-	bool visit(ImportDirective const&) override;
-
-	bool visit(FunctionDefinition const& _funDef) override;
-	void endVisit(FunctionDefinition const& _funDef) override;
-	void endVisit(BinaryOperation const& _binaryOperation) override;
-	void endVisit(UnaryOperation const& _unaryOperation) override;
-	bool visit(ModifierDefinition const& _modifierDef) override;
-	void endVisit(ModifierDefinition const& _modifierDef) override;
-	void endVisit(Identifier const& _identifier) override;
-	bool visit(MemberAccess const& _memberAccess) override;
-	void endVisit(MemberAccess const& _memberAccess) override;
-	void endVisit(IndexAccess const& _indexAccess) override;
-	void endVisit(IndexRangeAccess const& _indexAccess) override;
-	void endVisit(ModifierInvocation const& _modifier) override;
-	void endVisit(FunctionCall const& _functionCall) override;
-	void endVisit(InlineAssembly const& _inlineAssembly) override;
-
-	/// Called when an element of mutability @a _mutability is encountered.
-	/// Creates appropriate warnings and errors and sets @a m_currentBestMutability.
-	void reportMutability(
-		StateMutability _mutability,
-		langutil::SourceLocation const& _location,
-		std::optional<langutil::SourceLocation> const& _nestedLocation = {}
-	);
-
-	void reportFunctionCallMutability(StateMutability _mutability, langutil::SourceLocation const& _location);
-
-	/// Determines the mutability of modifier if not already cached.
-	MutabilityAndLocation const& modifierMutability(ModifierDefinition const& _modifier);
-
-	std::vector<std::shared_ptr<ASTNode>> const& m_ast;
-	langutil::ErrorReporter& m_errorReporter;
-
-	bool m_errors = false;
-	MutabilityAndLocation m_bestMutabilityAndLocation = MutabilityAndLocation{StateMutability::Payable, langutil::SourceLocation()};
-	FunctionDefinition const* m_currentFunction = nullptr;
-	std::map<ModifierDefinition const*, MutabilityAndLocation> m_inferredMutability;
-};
-
-}
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
deleted file mode 100644
index c0bf9009186d..000000000000
--- a/libsolidity/ast/AST.cpp
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity abstract syntax tree.
- */
-
-#include <libsolidity/ast/AST.h>
-
-#include <libsolidity/ast/CallGraph.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/ast/AST_accept.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Keccak256.h>
-
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/tail.hpp>
-#include <range/v3/view/zip.hpp>
-
-#include <boost/algorithm/string.hpp>
-
-#include <functional>
-#include <utility>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-namespace
-{
-TryCatchClause const* findClause(std::vector<ASTPointer<TryCatchClause>> const& _clauses, std::optional<std::string> _errorName = {})
-{
-	for (auto const& clause: ranges::views::tail(_clauses))
-		if (_errorName.has_value() ? clause->errorName() == _errorName : clause->errorName().empty())
-			return clause.get();
-	return nullptr;
-}
-}
-
-ASTNode::ASTNode(int64_t _id, SourceLocation _location):
-	m_id(static_cast<size_t>(_id)),
-	m_location(std::move(_location))
-{
-}
-
-Declaration const* ASTNode::referencedDeclaration(Expression const& _expression)
-{
-	if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(&_expression))
-		return memberAccess->annotation().referencedDeclaration;
-	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(&_expression))
-		return identifierPath->annotation().referencedDeclaration;
-	else if (auto const* identifier = dynamic_cast<Identifier const*>(&_expression))
-		return identifier->annotation().referencedDeclaration;
-	else
-		return nullptr;
-}
-
-FunctionDefinition const* ASTNode::resolveFunctionCall(FunctionCall const& _functionCall, ContractDefinition const* _mostDerivedContract)
-{
-	auto const* functionDef = dynamic_cast<FunctionDefinition const*>(
-		ASTNode::referencedDeclaration(_functionCall.expression())
-	);
-
-	if (!functionDef)
-		return nullptr;
-
-	if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(&_functionCall.expression()))
-	{
-		if (*memberAccess->annotation().requiredLookup == VirtualLookup::Super)
-		{
-			if (auto const typeType = dynamic_cast<TypeType const*>(memberAccess->expression().annotation().type))
-				if (auto const contractType = dynamic_cast<ContractType const*>(typeType->actualType()))
-				{
-					solAssert(_mostDerivedContract, "");
-					solAssert(contractType->isSuper(), "");
-					ContractDefinition const* superContract = contractType->contractDefinition().superContract(*_mostDerivedContract);
-
-					return &functionDef->resolveVirtual(
-						*_mostDerivedContract,
-						superContract
-					);
-				}
-		}
-		else
-			solAssert(*memberAccess->annotation().requiredLookup == VirtualLookup::Static, "");
-	}
-	else if (auto const* identifier = dynamic_cast<Identifier const*>(&_functionCall.expression()))
-	{
-		solAssert(*identifier->annotation().requiredLookup == VirtualLookup::Virtual, "");
-		if (functionDef->virtualSemantics())
-		{
-			solAssert(_mostDerivedContract, "");
-			return &functionDef->resolveVirtual(*_mostDerivedContract);
-		}
-	}
-	else
-		solAssert(false, "");
-
-	return functionDef;
-}
-
-ASTAnnotation& ASTNode::annotation() const
-{
-	if (!m_annotation)
-		m_annotation = std::make_unique<ASTAnnotation>();
-	return *m_annotation;
-}
-
-SourceUnitAnnotation& SourceUnit::annotation() const
-{
-	return initAnnotation<SourceUnitAnnotation>();
-}
-
-std::set<SourceUnit const*> SourceUnit::referencedSourceUnits(bool _recurse, std::set<SourceUnit const*> _skipList) const
-{
-	std::set<SourceUnit const*> sourceUnits;
-	for (ImportDirective const* importDirective: filteredNodes<ImportDirective>(nodes()))
-	{
-		auto const& sourceUnit = importDirective->annotation().sourceUnit;
-		if (!_skipList.count(sourceUnit))
-		{
-			_skipList.insert(sourceUnit);
-			sourceUnits.insert(sourceUnit);
-			if (_recurse)
-				sourceUnits += sourceUnit->referencedSourceUnits(true, _skipList);
-		}
-	}
-	return sourceUnits;
-}
-
-ImportAnnotation& ImportDirective::annotation() const
-{
-	return initAnnotation<ImportAnnotation>();
-}
-
-Type const* ImportDirective::type() const
-{
-	solAssert(!!annotation().sourceUnit, "");
-	return TypeProvider::module(*annotation().sourceUnit);
-}
-
-bool ContractDefinition::derivesFrom(ContractDefinition const& _base) const
-{
-	return util::contains(annotation().linearizedBaseContracts, &_base);
-}
-
-std::map<util::FixedHash<4>, FunctionTypePointer> ContractDefinition::interfaceFunctions(bool _includeInheritedFunctions) const
-{
-	auto exportedFunctionList = interfaceFunctionList(_includeInheritedFunctions);
-
-	std::map<util::FixedHash<4>, FunctionTypePointer> exportedFunctions;
-	for (auto const& it: exportedFunctionList)
-		exportedFunctions.insert(it);
-
-	solAssert(
-		exportedFunctionList.size() == exportedFunctions.size(),
-		"Hash collision at Function Definition Hash calculation"
-	);
-
-	return exportedFunctions;
-}
-
-FunctionDefinition const* ContractDefinition::constructor() const
-{
-	for (FunctionDefinition const* f: definedFunctions())
-		if (f->isConstructor())
-			return f;
-	return nullptr;
-}
-
-bool ContractDefinition::canBeDeployed() const
-{
-	return !abstract() && !isInterface();
-}
-
-FunctionDefinition const* ContractDefinition::fallbackFunction() const
-{
-	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
-		for (FunctionDefinition const* f: contract->definedFunctions())
-			if (f->isFallback())
-				return f;
-	return nullptr;
-}
-
-FunctionDefinition const* ContractDefinition::receiveFunction() const
-{
-	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
-		for (FunctionDefinition const* f: contract->definedFunctions())
-			if (f->isReceive())
-				return f;
-	return nullptr;
-}
-
-std::vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents() const
-{
-	return m_interfaceEvents.init([&]{
-		std::set<std::string> eventsSeen;
-		std::vector<EventDefinition const*> interfaceEvents;
-
-		for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
-			for (EventDefinition const* e: contract->events())
-			{
-				/// NOTE: this requires the "internal" version of an Event,
-				///       though here internal strictly refers to visibility,
-				///       and not to function encoding (jump vs. call)
-				FunctionType const* functionType = e->functionType(true);
-				solAssert(functionType, "");
-				std::string eventSignature = functionType->externalSignature();
-				if (eventsSeen.count(eventSignature) == 0)
-				{
-					eventsSeen.insert(eventSignature);
-					interfaceEvents.push_back(e);
-				}
-			}
-		return interfaceEvents;
-	});
-}
-
-std::vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() const
-{
-	solAssert(annotation().creationCallGraph.set(), "");
-
-	return util::convertContainer<std::vector<EventDefinition const*>>(
-		(*annotation().creationCallGraph)->emittedEvents +
-		(*annotation().deployedCallGraph)->emittedEvents
-	);
-}
-
-std::vector<EventDefinition const*> ContractDefinition::interfaceEvents(bool _requireCallGraph) const
-{
-	std::set<EventDefinition const*, CompareByID> result;
-	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
-		result += contract->events();
-	solAssert(annotation().creationCallGraph.set() == annotation().deployedCallGraph.set());
-	if (_requireCallGraph)
-		solAssert(annotation().creationCallGraph.set());
-	if (annotation().creationCallGraph.set())
-		result += usedInterfaceEvents();
-	// We could filter out all events that do not have an external interface
-	// if _requireCallGraph is false.
-	return util::convertContainer<std::vector<EventDefinition const*>>(std::move(result));
-}
-
-std::vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _requireCallGraph) const
-{
-	std::set<ErrorDefinition const*, CompareByID> result;
-	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
-		result += filteredNodes<ErrorDefinition>(contract->m_subNodes);
-	solAssert(annotation().creationCallGraph.set() == annotation().deployedCallGraph.set(), "");
-	if (_requireCallGraph)
-		solAssert(annotation().creationCallGraph.set(), "");
-	if (annotation().creationCallGraph.set())
-		result +=
-			(*annotation().creationCallGraph)->usedErrors +
-			(*annotation().deployedCallGraph)->usedErrors;
-	return util::convertContainer<std::vector<ErrorDefinition const*>>(std::move(result));
-}
-
-std::vector<std::pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::interfaceFunctionList(bool _includeInheritedFunctions) const
-{
-	return m_interfaceFunctionList[_includeInheritedFunctions].init([&]{
-		std::set<std::string> signaturesSeen;
-		std::vector<std::pair<util::FixedHash<4>, FunctionTypePointer>> interfaceFunctionList;
-
-		for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
-		{
-			if (_includeInheritedFunctions == false && contract != this)
-				continue;
-			std::vector<FunctionTypePointer> functions;
-			for (FunctionDefinition const* f: contract->definedFunctions())
-				if (f->isPartOfExternalInterface())
-					functions.push_back(TypeProvider::function(*f, FunctionType::Kind::External));
-			for (VariableDeclaration const* v: contract->stateVariables())
-				if (v->isPartOfExternalInterface())
-					functions.push_back(TypeProvider::function(*v));
-			for (FunctionTypePointer const& fun: functions)
-			{
-				if (!fun->interfaceFunctionType())
-					// Fails hopefully because we already registered the error
-					continue;
-				std::string functionSignature = fun->externalSignature();
-				if (signaturesSeen.count(functionSignature) == 0)
-				{
-					signaturesSeen.insert(functionSignature);
-					interfaceFunctionList.emplace_back(util::selectorFromSignatureH32(functionSignature), fun);
-				}
-			}
-		}
-
-		return interfaceFunctionList;
-	});
-}
-
-uint32_t ContractDefinition::interfaceId() const
-{
-	uint32_t result{0};
-	for (auto const& function: interfaceFunctionList(false))
-		result ^= fromBigEndian<uint32_t>(function.first.ref());
-	return result;
-}
-
-Type const* ContractDefinition::type() const
-{
-	return TypeProvider::typeType(TypeProvider::contract(*this));
-}
-
-ContractDefinitionAnnotation& ContractDefinition::annotation() const
-{
-	return initAnnotation<ContractDefinitionAnnotation>();
-}
-
-ContractDefinition const* ContractDefinition::superContract(ContractDefinition const& _mostDerivedContract) const
-{
-	auto const& hierarchy = _mostDerivedContract.annotation().linearizedBaseContracts;
-	auto it = find(hierarchy.begin(), hierarchy.end(), this);
-	solAssert(it != hierarchy.end(), "Base not found in inheritance hierarchy.");
-	++it;
-	if (it == hierarchy.end())
-		return nullptr;
-	else
-	{
-		solAssert(*it != this, "");
-		return *it;
-	}
-}
-
-FunctionDefinition const* ContractDefinition::nextConstructor(ContractDefinition const& _mostDerivedContract) const
-{
-	ContractDefinition const* next = superContract(_mostDerivedContract);
-	if (next == nullptr)
-		return nullptr;
-	for (ContractDefinition const* c: _mostDerivedContract.annotation().linearizedBaseContracts)
-		if (c == next || next == nullptr)
-		{
-			if (c->constructor())
-				return c->constructor();
-			next = nullptr;
-		}
-
-	return nullptr;
-}
-
-std::multimap<std::string, FunctionDefinition const*> const& ContractDefinition::definedFunctionsByName() const
-{
-	return m_definedFunctionsByName.init([&]{
-		std::multimap<std::string, FunctionDefinition const*> result;
-		for (FunctionDefinition const* fun: filteredNodes<FunctionDefinition>(m_subNodes))
-			result.insert({fun->name(), fun});
-		return result;
-	});
-}
-
-
-TypeNameAnnotation& TypeName::annotation() const
-{
-	return initAnnotation<TypeNameAnnotation>();
-}
-
-Type const* UserDefinedValueTypeDefinition::type() const
-{
-	solAssert(m_underlyingType->annotation().type, "");
-	return TypeProvider::typeType(TypeProvider::userDefinedValueType(*this));
-}
-
-TypeDeclarationAnnotation& UserDefinedValueTypeDefinition::annotation() const
-{
-	return initAnnotation<TypeDeclarationAnnotation>();
-}
-
-std::vector<std::pair<ASTPointer<IdentifierPath>, std::optional<Token>>> UsingForDirective::functionsAndOperators() const
-{
-	return ranges::zip_view(m_functionsOrLibrary, m_operators) | ranges::to<std::vector>;
-}
-
-Type const* StructDefinition::type() const
-{
-	solAssert(annotation().recursive.has_value(), "Requested struct type before DeclarationTypeChecker.");
-	return TypeProvider::typeType(TypeProvider::structType(*this, DataLocation::Storage));
-}
-
-StructDeclarationAnnotation& StructDefinition::annotation() const
-{
-	return initAnnotation<StructDeclarationAnnotation>();
-}
-
-Type const* EnumValue::type() const
-{
-	auto parentDef = dynamic_cast<EnumDefinition const*>(scope());
-	solAssert(parentDef, "Enclosing Scope of EnumValue was not set");
-	return TypeProvider::enumType(*parentDef);
-}
-
-Type const* EnumDefinition::type() const
-{
-	return TypeProvider::typeType(TypeProvider::enumType(*this));
-}
-
-TypeDeclarationAnnotation& EnumDefinition::annotation() const
-{
-	return initAnnotation<TypeDeclarationAnnotation>();
-}
-
-bool FunctionDefinition::libraryFunction() const
-{
-	if (auto const* contractDef = dynamic_cast<ContractDefinition const*>(scope()))
-		return contractDef->isLibrary();
-	return false;
-}
-
-Visibility FunctionDefinition::defaultVisibility() const
-{
-	solAssert(!isConstructor(), "");
-	return isFree() ? Visibility::Internal : Declaration::defaultVisibility();
-}
-
-FunctionTypePointer FunctionDefinition::functionType(bool _internal) const
-{
-	if (_internal)
-	{
-		switch (visibility())
-		{
-		case Visibility::Default:
-			solAssert(false, "visibility() should not return Default");
-		case Visibility::Private:
-		case Visibility::Internal:
-		case Visibility::Public:
-			return TypeProvider::function(*this, FunctionType::Kind::Internal);
-		case Visibility::External:
-			return {};
-		}
-	}
-	else
-	{
-		switch (visibility())
-		{
-		case Visibility::Default:
-			solAssert(false, "visibility() should not return Default");
-		case Visibility::Private:
-		case Visibility::Internal:
-			return {};
-		case Visibility::Public:
-		case Visibility::External:
-			return TypeProvider::function(*this, FunctionType::Kind::External);
-		}
-	}
-
-	// To make the compiler happy
-	return {};
-}
-
-Type const* FunctionDefinition::type() const
-{
-	solAssert(visibility() != Visibility::External, "");
-	return TypeProvider::function(*this, FunctionType::Kind::Internal);
-}
-
-Type const* FunctionDefinition::typeViaContractName() const
-{
-	if (libraryFunction())
-	{
-		if (isPublic())
-			return FunctionType(*this).asExternallyCallableFunction(true);
-		else
-			return TypeProvider::function(*this, FunctionType::Kind::Internal);
-	}
-	else
-		return TypeProvider::function(*this, FunctionType::Kind::Declaration);
-}
-
-std::string FunctionDefinition::externalSignature() const
-{
-	return TypeProvider::function(*this)->externalSignature();
-}
-
-std::string FunctionDefinition::externalIdentifierHex() const
-{
-	return TypeProvider::function(*this)->externalIdentifierHex();
-}
-
-FunctionDefinitionAnnotation& FunctionDefinition::annotation() const
-{
-	return initAnnotation<FunctionDefinitionAnnotation>();
-}
-
-FunctionDefinition const& FunctionDefinition::resolveVirtual(
-	ContractDefinition const& _mostDerivedContract,
-	ContractDefinition const* _searchStart
-) const
-{
-	solAssert(!isConstructor(), "");
-	solAssert(!name().empty(), "");
-
-	// If we are not doing super-lookup and the function is not virtual, we can stop here.
-	if (_searchStart == nullptr && !virtualSemantics())
-		return *this;
-
-	solAssert(!isFree(), "");
-	solAssert(isOrdinary(), "");
-	solAssert(!libraryFunction(), "");
-
-	// We actually do not want the externally callable function here.
-	// This is just to add an assertion since the comparison used to be less strict.
-	FunctionType const* externalFunctionType = TypeProvider::function(*this)->asExternallyCallableFunction(false);
-
-	bool foundSearchStart = (_searchStart == nullptr);
-	for (ContractDefinition const* c: _mostDerivedContract.annotation().linearizedBaseContracts)
-	{
-		if (!foundSearchStart && c != _searchStart)
-			continue;
-		else
-			foundSearchStart = true;
-
-		for (FunctionDefinition const* function: c->definedFunctions(name()))
-			if (
-				// With super lookup analysis guarantees that there is an implemented function in the chain.
-				// With virtual lookup there are valid cases where returning an unimplemented one is fine.
-				(function->isImplemented() || _searchStart == nullptr) &&
-				FunctionType(*function).asExternallyCallableFunction(false)->hasEqualParameterTypes(*externalFunctionType)
-			)
-			{
-				solAssert(FunctionType(*function).hasEqualParameterTypes(*TypeProvider::function(*this)));
-				return *function;
-			}
-	}
-
-	solAssert(false, "Virtual function " + name() + " not found.");
-	return *this; // not reached
-}
-
-Type const* ModifierDefinition::type() const
-{
-	return TypeProvider::modifier(*this);
-}
-
-ModifierDefinitionAnnotation& ModifierDefinition::annotation() const
-{
-	return initAnnotation<ModifierDefinitionAnnotation>();
-}
-
-ModifierDefinition const& ModifierDefinition::resolveVirtual(
-	ContractDefinition const& _mostDerivedContract,
-	ContractDefinition const* _searchStart
-) const
-{
-	// Super is not possible with modifiers
-	solAssert(_searchStart == nullptr, "Used super in connection with modifiers.");
-
-	// The modifier is not virtual, we can stop here.
-	if (!virtualSemantics())
-		return *this;
-
-	solAssert(!dynamic_cast<ContractDefinition const&>(*scope()).isLibrary(), "");
-
-	for (ContractDefinition const* c: _mostDerivedContract.annotation().linearizedBaseContracts)
-		for (ModifierDefinition const* modifier: c->functionModifiers())
-			if (modifier->name() == name())
-				return *modifier;
-
-	solAssert(false, "Virtual modifier " + name() + " not found.");
-	return *this; // not reached
-}
-
-
-Type const* EventDefinition::type() const
-{
-	return TypeProvider::function(*this);
-}
-
-FunctionTypePointer EventDefinition::functionType(bool _internal) const
-{
-	if (_internal)
-		return TypeProvider::function(*this);
-	else
-		return nullptr;
-}
-
-EventDefinitionAnnotation& EventDefinition::annotation() const
-{
-	return initAnnotation<EventDefinitionAnnotation>();
-}
-
-Type const* ErrorDefinition::type() const
-{
-	return TypeProvider::function(*this);
-}
-
-FunctionTypePointer ErrorDefinition::functionType(bool _internal) const
-{
-	if (_internal)
-		return TypeProvider::function(*this);
-	else
-		return nullptr;
-}
-
-ErrorDefinitionAnnotation& ErrorDefinition::annotation() const
-{
-	return initAnnotation<ErrorDefinitionAnnotation>();
-}
-
-SourceUnit const& Scopable::sourceUnit() const
-{
-	ASTNode const* s = scope();
-	solAssert(s, "");
-	// will not always be a declaration
-	while (dynamic_cast<Scopable const*>(s) && dynamic_cast<Scopable const*>(s)->scope())
-		s = dynamic_cast<Scopable const*>(s)->scope();
-	return dynamic_cast<SourceUnit const&>(*s);
-}
-
-CallableDeclaration const* Scopable::functionOrModifierDefinition() const
-{
-	ASTNode const* s = scope();
-	solAssert(s, "");
-	while (dynamic_cast<Scopable const*>(s))
-	{
-		if (auto funDef = dynamic_cast<FunctionDefinition const*>(s))
-			return funDef;
-		if (auto modDef = dynamic_cast<ModifierDefinition const*>(s))
-			return modDef;
-		s = dynamic_cast<Scopable const*>(s)->scope();
-	}
-	return nullptr;
-}
-
-std::string Scopable::sourceUnitName() const
-{
-	return *sourceUnit().annotation().path;
-}
-
-bool Declaration::isEnumValue() const
-{
-	solAssert(scope(), "");
-	return dynamic_cast<EnumDefinition const*>(scope());
-}
-
-bool Declaration::isStructMember() const
-{
-	solAssert(scope(), "");
-	return dynamic_cast<StructDefinition const*>(scope());
-}
-
-bool Declaration::isEventOrErrorParameter() const
-{
-	solAssert(scope(), "");
-	return dynamic_cast<EventDefinition const*>(scope()) || dynamic_cast<ErrorDefinition const*>(scope());
-}
-
-bool Declaration::isVisibleAsUnqualifiedName() const
-{
-	if (!scope())
-		return true;
-	if (isStructMember() || isEnumValue() || isEventOrErrorParameter())
-		return false;
-	if (auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(scope()))
-		if (!functionDefinition->isImplemented())
-			return false; // parameter of a function without body
-	return true;
-}
-
-DeclarationAnnotation& Declaration::annotation() const
-{
-	return initAnnotation<DeclarationAnnotation>();
-}
-
-bool VariableDeclaration::isLValue() const
-{
-	// Constant declared variables are Read-Only
-	return !isConstant();
-}
-
-bool VariableDeclaration::isLocalVariable() const
-{
-	auto s = scope();
-	return
-		dynamic_cast<FunctionTypeName const*>(s) ||
-		dynamic_cast<CallableDeclaration const*>(s) ||
-		dynamic_cast<Block const*>(s) ||
-		dynamic_cast<TryCatchClause const*>(s) ||
-		dynamic_cast<ForStatement const*>(s);
-}
-
-bool VariableDeclaration::isCallableOrCatchParameter() const
-{
-	if (isReturnParameter() || isTryCatchParameter())
-		return true;
-
-	std::vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
-
-	if (auto const* funTypeName = dynamic_cast<FunctionTypeName const*>(scope()))
-		parameters = &funTypeName->parameterTypes();
-	else if (auto const* callable = dynamic_cast<CallableDeclaration const*>(scope()))
-		parameters = &callable->parameters();
-
-	if (parameters)
-		for (auto const& variable: *parameters)
-			if (variable.get() == this)
-				return true;
-	return false;
-}
-
-bool VariableDeclaration::isLocalOrReturn() const
-{
-	return isReturnParameter() || (isLocalVariable() && !isCallableOrCatchParameter());
-}
-
-bool VariableDeclaration::isReturnParameter() const
-{
-	std::vector<ASTPointer<VariableDeclaration>> const* returnParameters = nullptr;
-
-	if (auto const* funTypeName = dynamic_cast<FunctionTypeName const*>(scope()))
-		returnParameters = &funTypeName->returnParameterTypes();
-	else if (auto const* callable = dynamic_cast<CallableDeclaration const*>(scope()))
-		if (callable->returnParameterList())
-			returnParameters = &callable->returnParameterList()->parameters();
-
-	if (returnParameters)
-		for (auto const& variable: *returnParameters)
-			if (variable.get() == this)
-				return true;
-	return false;
-}
-
-bool VariableDeclaration::isTryCatchParameter() const
-{
-	return dynamic_cast<TryCatchClause const*>(scope());
-}
-
-bool VariableDeclaration::isExternalCallableParameter() const
-{
-	if (!isCallableOrCatchParameter())
-		return false;
-
-	if (auto const* callable = dynamic_cast<CallableDeclaration const*>(scope()))
-		if (callable->visibility() == Visibility::External)
-			return !isReturnParameter();
-
-	return false;
-}
-
-bool VariableDeclaration::isPublicCallableParameter() const
-{
-	if (!isCallableOrCatchParameter())
-		return false;
-
-	if (auto const* callable = dynamic_cast<CallableDeclaration const*>(scope()))
-		if (callable->visibility() == Visibility::Public)
-			return !isReturnParameter();
-
-	return false;
-}
-
-bool VariableDeclaration::isInternalCallableParameter() const
-{
-	if (!isCallableOrCatchParameter())
-		return false;
-
-	if (auto const* funTypeName = dynamic_cast<FunctionTypeName const*>(scope()))
-		return funTypeName->visibility() == Visibility::Internal;
-	else if (auto const* callable = dynamic_cast<CallableDeclaration const*>(scope()))
-		return callable->visibility() <= Visibility::Internal;
-	return false;
-}
-
-bool VariableDeclaration::isConstructorParameter() const
-{
-	if (!isCallableOrCatchParameter())
-		return false;
-	if (auto const* function = dynamic_cast<FunctionDefinition const*>(scope()))
-		return function->isConstructor();
-	return false;
-}
-
-bool VariableDeclaration::isLibraryFunctionParameter() const
-{
-	if (!isCallableOrCatchParameter())
-		return false;
-	if (auto const* funDef = dynamic_cast<FunctionDefinition const*>(scope()))
-		return funDef->libraryFunction();
-	return false;
-}
-
-bool VariableDeclaration::hasReferenceOrMappingType() const
-{
-	solAssert(typeName().annotation().type, "Can only be called after reference resolution");
-	Type const* type = typeName().annotation().type;
-	return type->category() == Type::Category::Mapping || dynamic_cast<ReferenceType const*>(type);
-}
-
-bool VariableDeclaration::isStateVariable() const
-{
-	return dynamic_cast<ContractDefinition const*>(scope());
-}
-
-bool VariableDeclaration::isFileLevelVariable() const
-{
-	return dynamic_cast<SourceUnit const*>(scope());
-}
-
-std::set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocations() const
-{
-	using Location = VariableDeclaration::Location;
-
-	if (!hasReferenceOrMappingType() || isStateVariable() || isEventOrErrorParameter())
-		return std::set<Location>{ Location::Unspecified };
-	else if (isCallableOrCatchParameter())
-	{
-		std::set<Location> locations{ Location::Memory };
-		if (
-			isConstructorParameter() ||
-			isInternalCallableParameter() ||
-			isLibraryFunctionParameter()
-		)
-			locations.insert(Location::Storage);
-		if (!isTryCatchParameter() && !isConstructorParameter())
-			locations.insert(Location::CallData);
-
-		return locations;
-	}
-	else if (isLocalVariable())
-		// Further restrictions will be imposed later on.
-		return std::set<Location>{ Location::Memory, Location::Storage, Location::CallData };
-	else
-		// Struct members etc.
-		return std::set<Location>{ Location::Unspecified };
-}
-
-std::string VariableDeclaration::externalIdentifierHex() const
-{
-	solAssert(isStateVariable() && isPublic(), "Can only be called for public state variables");
-	return TypeProvider::function(*this)->externalIdentifierHex();
-}
-
-Type const* VariableDeclaration::type() const
-{
-	return annotation().type;
-}
-
-FunctionTypePointer VariableDeclaration::functionType(bool _internal) const
-{
-	if (_internal)
-		return nullptr;
-	switch (visibility())
-	{
-	case Visibility::Default:
-		solAssert(false, "visibility() should not return Default");
-	case Visibility::Private:
-	case Visibility::Internal:
-		return nullptr;
-	case Visibility::Public:
-	case Visibility::External:
-		return TypeProvider::function(*this);
-	}
-
-	// To make the compiler happy
-	return nullptr;
-}
-
-VariableDeclarationAnnotation& VariableDeclaration::annotation() const
-{
-	return initAnnotation<VariableDeclarationAnnotation>();
-}
-
-StatementAnnotation& Statement::annotation() const
-{
-	return initAnnotation<StatementAnnotation>();
-}
-
-InlineAssemblyAnnotation& InlineAssembly::annotation() const
-{
-	return initAnnotation<InlineAssemblyAnnotation>();
-}
-
-BlockAnnotation& Block::annotation() const
-{
-	return initAnnotation<BlockAnnotation>();
-}
-
-TryCatchClauseAnnotation& TryCatchClause::annotation() const
-{
-	return initAnnotation<TryCatchClauseAnnotation>();
-}
-
-ForStatementAnnotation& ForStatement::annotation() const
-{
-	return initAnnotation<ForStatementAnnotation>();
-}
-
-ReturnAnnotation& Return::annotation() const
-{
-	return initAnnotation<ReturnAnnotation>();
-}
-
-ExpressionAnnotation& Expression::annotation() const
-{
-	return initAnnotation<ExpressionAnnotation>();
-}
-
-MemberAccessAnnotation& MemberAccess::annotation() const
-{
-	return initAnnotation<MemberAccessAnnotation>();
-}
-
-OperationAnnotation& UnaryOperation::annotation() const
-{
-	return initAnnotation<OperationAnnotation>();
-}
-
-FunctionType const* UnaryOperation::userDefinedFunctionType() const
-{
-	if (*annotation().userDefinedFunction == nullptr)
-		return nullptr;
-
-	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
-	return dynamic_cast<FunctionType const*>(
-		userDefinedFunction->libraryFunction() ?
-		userDefinedFunction->typeViaContractName() :
-		userDefinedFunction->type()
-	);
-}
-
-FunctionType const* BinaryOperation::userDefinedFunctionType() const
-{
-	if (*annotation().userDefinedFunction == nullptr)
-		return nullptr;
-
-	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
-	return dynamic_cast<FunctionType const*>(
-		userDefinedFunction->libraryFunction() ?
-		userDefinedFunction->typeViaContractName() :
-		userDefinedFunction->type()
-	);
-}
-
-BinaryOperationAnnotation& BinaryOperation::annotation() const
-{
-	return initAnnotation<BinaryOperationAnnotation>();
-}
-
-FunctionCallAnnotation& FunctionCall::annotation() const
-{
-	return initAnnotation<FunctionCallAnnotation>();
-}
-
-std::vector<ASTPointer<Expression const>> FunctionCall::sortedArguments() const
-{
-	// normal arguments
-	if (m_names.empty())
-		return arguments();
-
-	// named arguments
-	FunctionTypePointer functionType;
-	if (*annotation().kind == FunctionCallKind::StructConstructorCall)
-	{
-		auto const& type = dynamic_cast<TypeType const&>(*m_expression->annotation().type);
-		auto const& structType = dynamic_cast<StructType const&>(*type.actualType());
-		functionType = structType.constructorType();
-	}
-	else
-		functionType = dynamic_cast<FunctionType const*>(m_expression->annotation().type);
-
-	std::vector<ASTPointer<Expression const>> sorted;
-	for (auto const& parameterName: functionType->parameterNames())
-	{
-		bool found = false;
-		for (size_t j = 0; j < m_names.size() && !found; j++)
-			if ((found = (parameterName == *m_names.at(j))))
-				// we found the actual parameter position
-				sorted.push_back(m_arguments.at(j));
-		solAssert(found, "");
-	}
-
-	if (!functionType->takesArbitraryParameters())
-	{
-		solAssert(m_arguments.size() == functionType->parameterTypes().size(), "");
-		solAssert(m_arguments.size() == m_names.size(), "");
-		solAssert(m_arguments.size() == sorted.size(), "");
-	}
-
-	return sorted;
-}
-
-IdentifierAnnotation& Identifier::annotation() const
-{
-	return initAnnotation<IdentifierAnnotation>();
-}
-
-ASTString Literal::valueWithoutUnderscores() const
-{
-	return boost::erase_all_copy(value(), "_");
-}
-
-bool Literal::isHexNumber() const
-{
-	if (token() != Token::Number)
-		return false;
-	return boost::starts_with(value(), "0x");
-}
-
-bool Literal::looksLikeAddress() const
-{
-	if (subDenomination() != SubDenomination::None)
-		return false;
-
-	if (!isHexNumber())
-		return false;
-
-	return abs(int(valueWithoutUnderscores().length()) - 42) <= 1;
-}
-
-bool Literal::passesAddressChecksum() const
-{
-	solAssert(isHexNumber(), "Expected hex number");
-	return util::passesAddressChecksum(valueWithoutUnderscores(), true);
-}
-
-std::string Literal::getChecksummedAddress() const
-{
-	solAssert(isHexNumber(), "Expected hex number");
-	/// Pad literal to be a proper hex address.
-	std::string address = valueWithoutUnderscores().substr(2);
-	if (address.length() > 40)
-		return std::string();
-	address.insert(address.begin(), 40 - address.size(), '0');
-	return util::getChecksummedAddress(address);
-}
-
-TryCatchClause const* TryStatement::successClause() const
-{
-	solAssert(m_clauses.size() > 0, "");
-	return m_clauses[0].get();
-}
-
-TryCatchClause const* TryStatement::panicClause() const {
-	return findClause(m_clauses, "Panic");
-}
-
-TryCatchClause const* TryStatement::errorClause() const {
-	return findClause(m_clauses, "Error");
-}
-
-TryCatchClause const* TryStatement::fallbackClause() const {
-	return findClause(m_clauses);
-}
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
deleted file mode 100644
index ca23b0d61975..000000000000
--- a/libsolidity/ast/AST.h
+++ /dev/null
@@ -1,2452 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity abstract syntax tree.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTEnums.h>
-#include <libsolidity/parsing/Token.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <libevmasm/Instruction.h>
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/LazyInit.h>
-#include <libsolutil/Visitor.h>
-
-#include <json/json.h>
-
-#include <range/v3/view/subrange.hpp>
-#include <range/v3/view/map.hpp>
-
-#include <memory>
-#include <optional>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace solidity::yul
-{
-// Forward-declaration to <yul/AST.h>
-struct Block;
-struct Dialect;
-}
-
-namespace solidity::frontend
-{
-
-class ASTVisitor;
-class ASTConstVisitor;
-
-
-/**
- * The root (abstract) class of the AST inheritance tree.
- * It is possible to traverse all direct and indirect children of an AST node by calling
- * accept, providing an ASTVisitor.
- */
-class ASTNode
-{
-public:
-	/// Noncopyable.
-	ASTNode(ASTNode const&) = delete;
-	ASTNode& operator=(ASTNode const&) = delete;
-
-	using CompareByID = frontend::ASTCompareByID<ASTNode>;
-	using SourceLocation = langutil::SourceLocation;
-
-	explicit ASTNode(int64_t _id, SourceLocation _location);
-	virtual ~ASTNode() {}
-
-	/// @returns an identifier of this AST node that is unique for a single compilation run.
-	int64_t id() const { return int64_t(m_id); }
-
-	virtual void accept(ASTVisitor& _visitor) = 0;
-	virtual void accept(ASTConstVisitor& _visitor) const = 0;
-	template <class T>
-	static void listAccept(std::vector<T> const& _list, ASTVisitor& _visitor)
-	{
-		for (T const& element: _list)
-		{
-			solAssert(element);
-			element->accept(_visitor);
-		}
-	}
-	template <class T>
-	static void listAccept(std::vector<T> const& _list, ASTConstVisitor& _visitor)
-	{
-		for (T const& element: _list)
-		{
-			solAssert(element);
-			element->accept(_visitor);
-		}
-	}
-
-	/// @returns a copy of the vector containing only the nodes which derive from T.
-	template <class T>
-	static std::vector<T const*> filteredNodes(std::vector<ASTPointer<ASTNode>> const& _nodes);
-
-	/// Extracts the referenced declaration from all nodes whose annotations support
-	/// `referencedDeclaration`.
-	static Declaration const* referencedDeclaration(Expression const& _expression);
-	/// Performs potential super or virtual lookup for a function call based on the most derived contract.
-	static FunctionDefinition const* resolveFunctionCall(FunctionCall const& _functionCall, ContractDefinition const* _mostDerivedContract);
-
-	/// Returns the source code location of this node.
-	SourceLocation const& location() const { return m_location; }
-
-	///@todo make this const-safe by providing a different way to access the annotation
-	virtual ASTAnnotation& annotation() const;
-
-	///@{
-	///@name equality operators
-	/// Equality relies on the fact that nodes cannot be copied.
-	bool operator==(ASTNode const& _other) const { return this == &_other; }
-	bool operator!=(ASTNode const& _other) const { return !operator==(_other); }
-	///@}
-
-protected:
-	size_t const m_id = 0;
-
-	template <class T>
-	T& initAnnotation() const
-	{
-		if (!m_annotation)
-			m_annotation = std::make_unique<T>();
-		return dynamic_cast<T&>(*m_annotation);
-	}
-
-private:
-	/// Annotation - is specialised in derived classes, is created upon request (because of polymorphism).
-	mutable std::unique_ptr<ASTAnnotation> m_annotation;
-	SourceLocation m_location;
-};
-
-template <class T>
-std::vector<T const*> ASTNode::filteredNodes(std::vector<ASTPointer<ASTNode>> const& _nodes)
-{
-	std::vector<T const*> ret;
-	for (auto const& n: _nodes)
-		if (auto const* nt = dynamic_cast<T const*>(n.get()))
-			ret.push_back(nt);
-	return ret;
-}
-
-/**
- * Abstract marker class that specifies that this AST node opens a scope.
- */
-class ScopeOpener
-{
-public:
-	virtual ~ScopeOpener() = default;
-};
-
-/**
- * Source unit containing import directives and contract definitions.
- */
-class SourceUnit: public ASTNode, public ScopeOpener
-{
-public:
-	SourceUnit(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::optional<std::string> _licenseString,
-		std::vector<ASTPointer<ASTNode>> _nodes,
-		bool _experimentalSolidity
-	):
-		ASTNode(_id, _location),
-		m_licenseString(std::move(_licenseString)),
-		m_nodes(std::move(_nodes)),
-		m_experimentalSolidity(_experimentalSolidity)
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-	SourceUnitAnnotation& annotation() const override;
-
-	std::optional<std::string> const& licenseString() const { return m_licenseString; }
-	std::vector<ASTPointer<ASTNode>> nodes() const { return m_nodes; }
-
-	/// @returns a set of referenced SourceUnits. Recursively if @a _recurse is true.
-	std::set<SourceUnit const*> referencedSourceUnits(bool _recurse = false, std::set<SourceUnit const*> _skipList = std::set<SourceUnit const*>()) const;
-	bool experimentalSolidity() const { return m_experimentalSolidity; }
-
-private:
-	std::optional<std::string> m_licenseString;
-	std::vector<ASTPointer<ASTNode>> m_nodes;
-	bool m_experimentalSolidity = false;
-};
-
-/**
- * Abstract class that is added to each AST node that is stored inside a scope
- * (including scopes).
- */
-class Scopable
-{
-public:
-	virtual ~Scopable() = default;
-	/// @returns the scope this declaration resides in. Can be nullptr if it is the global scope.
-	/// Available only after name and type resolution step.
-	ASTNode const* scope() const { return annotation().scope; }
-
-	/// @returns the source unit this scopable is present in.
-	SourceUnit const& sourceUnit() const;
-
-	/// @returns the function or modifier definition this scopable is present in or nullptr.
-	CallableDeclaration const* functionOrModifierDefinition() const;
-
-	/// @returns the source name this scopable is present in.
-	/// Can be combined with annotation().canonicalName (if present) to form a globally unique name.
-	std::string sourceUnitName() const;
-
-	virtual ScopableAnnotation& annotation() const = 0;
-};
-
-/**
- * Abstract AST class for a declaration (contract, function, struct, variable, import directive).
- */
-class Declaration: public ASTNode, public Scopable
-{
-public:
-
-	static std::string visibilityToString(Visibility _visibility)
-	{
-		switch (_visibility)
-		{
-		case Visibility::Public:
-			return "public";
-		case Visibility::Internal:
-			return "internal";
-		case Visibility::Private:
-			return "private";
-		case Visibility::External:
-			return "external";
-		default:
-			solAssert(false, "Invalid visibility specifier.");
-		}
-		return std::string();
-	}
-
-	Declaration(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> _name,
-		SourceLocation _nameLocation,
-		Visibility _visibility = Visibility::Default
-	):
-		ASTNode(_id, _location), m_name(std::move(_name)), m_nameLocation(std::move(_nameLocation)), m_visibility(_visibility) {}
-
-	/// @returns the declared name.
-	ASTString const& name() const { return *m_name; }
-
-	/// @returns the location of the declared name itself or empty location if not available or unknown.
-	SourceLocation const& nameLocation() const noexcept { return m_nameLocation; }
-
-	bool noVisibilitySpecified() const { return m_visibility == Visibility::Default; }
-	Visibility visibility() const { return m_visibility == Visibility::Default ? defaultVisibility() : m_visibility; }
-	bool isPublic() const { return visibility() >= Visibility::Public; }
-	virtual bool isVisibleInContract() const { return visibility() != Visibility::External; }
-	virtual bool isVisibleInDerivedContracts() const { return isVisibleInContract() && visibility() >= Visibility::Internal; }
-	bool isVisibleAsLibraryMember() const { return visibility() >= Visibility::Internal; }
-	virtual bool isVisibleViaContractTypeAccess() const { return false; }
-
-	virtual bool isLValue() const { return false; }
-	virtual bool isPartOfExternalInterface() const { return false; }
-
-	/// @returns true if this is a declaration of an enum member.
-	bool isEnumValue() const;
-	/// @returns true if this is a declaration of a struct member.
-	bool isStructMember() const;
-	/// @returns true if this is a declaration of a parameter of an event.
-	bool isEventOrErrorParameter() const;
-
-	/// @returns false if the declaration can never be referenced without being qualified with a scope.
-	/// Usually the name alone can be used to refer to the corresponding entity.
-	/// But, for example, struct member names or enum member names always require a prefix.
-	/// Another example is event parameter names, which do not participate in any proper scope.
-	bool isVisibleAsUnqualifiedName() const;
-
-	/// @returns the type of expressions referencing this declaration.
-	/// This can only be called once types of variable declarations have already been resolved.
-	virtual Type const* type() const = 0;
-
-	/// @returns the type for members of the containing contract type that refer to this declaration.
-	/// This can only be called once types of variable declarations have already been resolved.
-	virtual Type const* typeViaContractName() const { return type(); }
-
-	/// @param _internal false indicates external interface is concerned, true indicates internal interface is concerned.
-	/// @returns null when it is not accessible as a function.
-	virtual FunctionTypePointer functionType(bool /*_internal*/) const { return {}; }
-
-	DeclarationAnnotation& annotation() const override;
-
-protected:
-	virtual Visibility defaultVisibility() const { return Visibility::Public; }
-
-private:
-	ASTPointer<ASTString> m_name;
-	SourceLocation m_nameLocation;
-	Visibility m_visibility;
-};
-
-/**
- * Pragma directive, only version requirements in the form `pragma solidity "^0.4.0";` are
- * supported for now.
- */
-class PragmaDirective: public ASTNode
-{
-public:
-	PragmaDirective(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::vector<Token> _tokens,
-		std::vector<ASTString> _literals
-	): ASTNode(_id, _location), m_tokens(std::move(_tokens)), m_literals(std::move(_literals))
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<Token> const& tokens() const { return m_tokens; }
-	std::vector<ASTString> const& literals() const { return m_literals; }
-
-private:
-
-	/// Sequence of tokens following the "pragma" keyword.
-	std::vector<Token> m_tokens;
-	/// Sequence of literals following the "pragma" keyword.
-	std::vector<ASTString> m_literals;
-};
-
-/**
- * Import directive for referencing other files / source objects.
- * Example: import "abc.sol" // imports all symbols of "abc.sol" into current scope
- * Source objects are identified by a string which can be a file name but does not have to be.
- * Other ways to use it:
- * import "abc" as x; // creates symbol "x" that contains all symbols in "abc"
- * import * as x from "abc"; // same as above
- * import {a as b, c} from "abc"; // creates new symbols "b" and "c" referencing "a" and "c" in "abc", respectively.
- */
-class ImportDirective: public Declaration
-{
-public:
-	struct SymbolAlias
-	{
-		ASTPointer<Identifier> symbol;
-		ASTPointer<ASTString> alias;
-		SourceLocation location;
-	};
-
-	using SymbolAliasList = std::vector<SymbolAlias>;
-
-	ImportDirective(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> _path,
-		ASTPointer<ASTString> const& _unitAlias,
-		SourceLocation _unitAliasLocation,
-		SymbolAliasList _symbolAliases
-	):
-		Declaration(_id, _location, _unitAlias, std::move(_unitAliasLocation)),
-		m_path(std::move(_path)),
-		m_symbolAliases(std::move(_symbolAliases))
-	{ }
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	ASTString const& path() const { return *m_path; }
-	SymbolAliasList const& symbolAliases() const
-	{
-		return m_symbolAliases;
-	}
-	ImportAnnotation& annotation() const override;
-
-	Type const* type() const override;
-
-private:
-	ASTPointer<ASTString> m_path;
-	/// The aliases for the specific symbols to import. If non-empty import the specific symbols.
-	/// If the `alias` component is empty, import the identifier unchanged.
-	/// If both m_unitAlias and m_symbolAlias are empty, import all symbols into the current scope.
-	SymbolAliasList m_symbolAliases;
-};
-
-/**
- * Abstract class that is added to each AST node that can store local variables.
- * Local variables in functions are always added to functions, even though they are not
- * in scope for the whole function.
- */
-class VariableScope
-{
-public:
-	virtual ~VariableScope() = default;
-	void addLocalVariable(VariableDeclaration const& _localVariable) { m_localVariables.push_back(&_localVariable); }
-	std::vector<VariableDeclaration const*> const& localVariables() const { return m_localVariables; }
-
-private:
-	std::vector<VariableDeclaration const*> m_localVariables;
-};
-
-/**
- * The doxygen-style, structured documentation class that represents an AST node.
- */
-class StructuredDocumentation: public ASTNode
-{
-public:
-	StructuredDocumentation(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> _text
-	): ASTNode(_id, _location), m_text(std::move(_text))
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	/// @return A shared pointer of an ASTString.
-	/// Contains doxygen-style, structured documentation that is parsed later on.
-	ASTPointer<ASTString> const& text() const { return m_text; }
-
-private:
-	ASTPointer<ASTString> m_text;
-};
-
-/**
- * Abstract class that is added to each AST node that can receive documentation.
- */
-class Documented
-{
-public:
-	virtual ~Documented() = default;
-	explicit Documented(ASTPointer<ASTString> _documentation): m_documentation(std::move(_documentation)) {}
-
-	/// @return A shared pointer of an ASTString.
-	/// Can contain a nullptr in which case indicates absence of documentation
-	ASTPointer<ASTString> const& documentation() const { return m_documentation; }
-
-protected:
-	ASTPointer<ASTString> m_documentation;
-};
-
-/**
- * Abstract class that is added to each AST node that can receive a structured documentation.
- */
-class StructurallyDocumented
-{
-public:
-	virtual ~StructurallyDocumented() = default;
-	explicit StructurallyDocumented(ASTPointer<StructuredDocumentation> _documentation): m_documentation(std::move(_documentation)) {}
-
-	/// @return A shared pointer of a FormalDocumentation.
-	/// Can contain a nullptr in which case indicates absence of documentation
-	ASTPointer<StructuredDocumentation> const& documentation() const { return m_documentation; }
-
-protected:
-	ASTPointer<StructuredDocumentation> m_documentation;
-};
-
-
-/**
- * Abstract class that is added to AST nodes that can be marked as not being fully implemented
- */
-class ImplementationOptional
-{
-public:
-	virtual ~ImplementationOptional() = default;
-	explicit ImplementationOptional(bool _implemented): m_implemented(_implemented) {}
-
-	/// @return whether this node is fully implemented or not
-	bool isImplemented() const { return m_implemented; }
-
-protected:
-	bool m_implemented;
-};
-
-/// @}
-
-/**
- * Definition of a contract or library. This is the only AST nodes where child nodes are not visited in
- * document order. It first visits all struct declarations, then all variable declarations and
- * finally all function declarations.
- */
-class ContractDefinition: public Declaration, public StructurallyDocumented, public ScopeOpener
-{
-public:
-	ContractDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		ASTPointer<StructuredDocumentation> const& _documentation,
-		std::vector<ASTPointer<InheritanceSpecifier>> _baseContracts,
-		std::vector<ASTPointer<ASTNode>> _subNodes,
-		ContractKind _contractKind = ContractKind::Contract,
-		bool _abstract = false
-	):
-		Declaration(_id, _location, _name, std::move(_nameLocation)),
-		StructurallyDocumented(_documentation),
-		m_baseContracts(std::move(_baseContracts)),
-		m_subNodes(std::move(_subNodes)),
-		m_contractKind(_contractKind),
-		m_abstract(_abstract)
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<InheritanceSpecifier>> const& baseContracts() const { return m_baseContracts; }
-	std::vector<ASTPointer<ASTNode>> const& subNodes() const { return m_subNodes; }
-	std::vector<UsingForDirective const*> usingForDirectives() const { return filteredNodes<UsingForDirective>(m_subNodes); }
-	std::vector<StructDefinition const*> definedStructs() const { return filteredNodes<StructDefinition>(m_subNodes); }
-	std::vector<EnumDefinition const*> definedEnums() const { return filteredNodes<EnumDefinition>(m_subNodes); }
-	std::vector<VariableDeclaration const*> stateVariables() const { return filteredNodes<VariableDeclaration>(m_subNodes); }
-	std::vector<ModifierDefinition const*> functionModifiers() const { return filteredNodes<ModifierDefinition>(m_subNodes); }
-	std::vector<FunctionDefinition const*> definedFunctions() const { return filteredNodes<FunctionDefinition>(m_subNodes); }
-	/// @returns a view<FunctionDefinition const*> of all functions
-	/// defined in this contract of the given name (excluding inherited functions).
-	auto definedFunctions(std::string const& _name) const
-	{
-		auto&& [b, e] = definedFunctionsByName().equal_range(_name);
-		return ranges::subrange<decltype(b)>(b, e) | ranges::views::values;
-	}
-	std::vector<EventDefinition const*> events() const { return filteredNodes<EventDefinition>(m_subNodes); }
-	std::vector<EventDefinition const*> const& definedInterfaceEvents() const;
-	std::vector<EventDefinition const*> const usedInterfaceEvents() const;
-	/// @return all events defined in this contract and its base contracts and all events
-	/// that are emitted during the execution of the contract.
-	/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.
-	std::vector<EventDefinition const*> interfaceEvents(bool _requireCallGraph = true) const;
-	/// @returns all errors defined in this contract or any base contract
-	/// and all errors referenced during execution.
-	/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.
-	std::vector<ErrorDefinition const*> interfaceErrors(bool _requireCallGraph = true) const;
-	bool isInterface() const { return m_contractKind == ContractKind::Interface; }
-	bool isLibrary() const { return m_contractKind == ContractKind::Library; }
-
-	/// @returns true, if the contract derives from @arg _base.
-	bool derivesFrom(ContractDefinition const& _base) const;
-
-	/// @returns a map of canonical function signatures to FunctionDefinitions
-	/// as intended for use by the ABI.
-	std::map<util::FixedHash<4>, FunctionTypePointer> interfaceFunctions(bool _includeInheritedFunctions = true) const;
-	std::vector<std::pair<util::FixedHash<4>, FunctionTypePointer>> const& interfaceFunctionList(bool _includeInheritedFunctions = true) const;
-	/// @returns the EIP-165 compatible interface identifier. This will exclude inherited functions.
-	uint32_t interfaceId() const;
-
-	/// @returns a list of all declarations in this contract
-	std::vector<Declaration const*> declarations() const { return filteredNodes<Declaration>(m_subNodes); }
-
-	/// Returns the constructor or nullptr if no constructor was specified.
-	FunctionDefinition const* constructor() const;
-	/// @returns true iff the contract can be deployed, i.e. is not abstract and has a
-	/// public constructor.
-	/// Should only be called after the type checker has run.
-	bool canBeDeployed() const;
-	/// Returns the fallback function or nullptr if no fallback function was specified.
-	FunctionDefinition const* fallbackFunction() const;
-
-	/// Returns the ether receiver function or nullptr if no receive function was specified.
-	FunctionDefinition const* receiveFunction() const;
-
-	std::string fullyQualifiedName() const { return sourceUnitName() + ":" + name(); }
-
-	Type const* type() const override;
-
-	ContractDefinitionAnnotation& annotation() const override;
-
-	ContractKind contractKind() const { return m_contractKind; }
-
-	bool abstract() const { return m_abstract; }
-
-	ContractDefinition const* superContract(ContractDefinition const& _mostDerivedContract) const;
-	/// @returns the next constructor in the inheritance hierarchy.
-	FunctionDefinition const* nextConstructor(ContractDefinition const& _mostDerivedContract) const;
-
-private:
-	std::multimap<std::string, FunctionDefinition const*> const& definedFunctionsByName() const;
-
-	std::vector<ASTPointer<InheritanceSpecifier>> m_baseContracts;
-	std::vector<ASTPointer<ASTNode>> m_subNodes;
-	ContractKind m_contractKind;
-	bool m_abstract{false};
-
-	util::LazyInit<std::vector<std::pair<util::FixedHash<4>, FunctionTypePointer>>> m_interfaceFunctionList[2];
-	util::LazyInit<std::vector<EventDefinition const*>> m_interfaceEvents;
-	util::LazyInit<std::multimap<std::string, FunctionDefinition const*>> m_definedFunctionsByName;
-};
-
-/**
- * A sequence of identifiers separated by dots used outside the expression context. Inside the expression context, this is a sequence of Identifier and MemberAccess.
- */
-class IdentifierPath: public ASTNode
-{
-public:
-	IdentifierPath(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::vector<ASTString> _path,
-		std::vector<SourceLocation> _pathLocations
-	):
-		ASTNode(_id, _location), m_path(std::move(_path)), m_pathLocations(std::move(_pathLocations))
-	{
-		solAssert(m_pathLocations.size() == m_path.size());
-	}
-
-	std::vector<ASTString> const& path() const { return m_path; }
-	std::vector<SourceLocation > const& pathLocations() const { return m_pathLocations; }
-	IdentifierPathAnnotation& annotation() const override
-	{
-		return initAnnotation<IdentifierPathAnnotation>();
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-private:
-	std::vector<ASTString> m_path;
-	// Corresponding locations for m_path. Array has same length and indices as m_path.
-	std::vector<SourceLocation> m_pathLocations;
-};
-
-class InheritanceSpecifier: public ASTNode
-{
-public:
-	InheritanceSpecifier(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<IdentifierPath> _baseName,
-		std::unique_ptr<std::vector<ASTPointer<Expression>>> _arguments
-	):
-		ASTNode(_id, _location), m_baseName(std::move(_baseName)), m_arguments(std::move(_arguments))
-	{
-		solAssert(m_baseName != nullptr, "Name cannot be null.");
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	IdentifierPath const& name() const { return *m_baseName; }
-	// Returns nullptr if no argument list was given (``C``).
-	// If an argument list is given (``C(...)``), the arguments are returned
-	// as a vector of expressions. Note that this vector can be empty (``C()``).
-	std::vector<ASTPointer<Expression>> const* arguments() const { return m_arguments.get(); }
-
-private:
-	ASTPointer<IdentifierPath> m_baseName;
-	std::unique_ptr<std::vector<ASTPointer<Expression>>> m_arguments;
-};
-
-/**
- * Using for directive:
- *
- * 1. `using LibraryName for T` attaches all functions from the library `LibraryName` to the type `T`.
- * 2. `using LibraryName for *` attaches to all types.
- * 3. `using {f1, f2, ..., fn} for T` attaches the functions `f1`, `f2`, ..., `fn`, respectively to `T`.
- * 4. `using {f1 as op1, f2 as op2, ..., fn as opn} for T` implements operator `opn` for type `T` with function `fn`.
- *
- * For version 3, T has to be implicitly convertible to the first parameter type of
- * all functions, and this is checked at the point of the using statement. For versions 1 and
- * 2, this check is only done when a function is called.
- *
- * For version 4, T has to be user-defined value type and the function must be pure.
- * All parameters and return value of all the functions have to be of type T.
- * This version can be combined with version 3 - a single directive may attach functions to the
- * type and define operators on it at the same time.
- *
- * Finally, `using {f1, f2, ..., fn} for T global` is also valid at file level, as long as T is
- * a user-defined type defined in the same file at file level. In this case, the methods are
- * attached to all objects of that type regardless of scope.
- */
-class UsingForDirective: public ASTNode
-{
-public:
-	UsingForDirective(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::vector<ASTPointer<IdentifierPath>> _functionsOrLibrary,
-		std::vector<std::optional<Token>> _operators,
-		bool _usesBraces,
-		ASTPointer<TypeName> _typeName,
-		bool _global
-	):
-		ASTNode(_id, _location),
-		m_functionsOrLibrary(std::move(_functionsOrLibrary)),
-		m_operators(std::move(_operators)),
-		m_usesBraces(_usesBraces),
-		m_typeName(std::move(_typeName)),
-		m_global{_global}
-	{
-		solAssert(m_functionsOrLibrary.size() == m_operators.size());
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	/// @returns the type name the library is attached to, null for `*`.
-	TypeName const* typeName() const { return m_typeName.get(); }
-
-	/// @returns a list of functions or the single library.
-	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functionsOrLibrary; }
-	std::vector<std::pair<ASTPointer<IdentifierPath>, std::optional<Token>>> functionsAndOperators() const;
-	bool usesBraces() const { return m_usesBraces; }
-	bool global() const { return m_global; }
-
-private:
-	/// Either the single library or a list of functions.
-	std::vector<ASTPointer<IdentifierPath>> m_functionsOrLibrary;
-	/// Operators, the functions from @a m_functionsOrLibrary implement.
-	/// A token if the corresponding element in m_functionsOrLibrary
-	/// defines an operator, nullptr otherwise.
-	/// Note that this vector size must be equal to m_functionsOrLibrary size.
-	std::vector<std::optional<Token>> m_operators;
-	bool m_usesBraces;
-	ASTPointer<TypeName> m_typeName;
-	bool m_global = false;
-};
-
-class StructDefinition: public Declaration, public StructurallyDocumented, public ScopeOpener
-{
-public:
-	StructDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		std::vector<ASTPointer<VariableDeclaration>> _members,
-		ASTPointer<StructuredDocumentation> _documentation
-	):
-		Declaration(_id, _location, _name, std::move(_nameLocation)),
-		StructurallyDocumented(std::move(_documentation)),
-		m_members(std::move(_members))
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<VariableDeclaration>> const& members() const { return m_members; }
-
-	Type const* type() const override;
-
-	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return true; }
-
-	StructDeclarationAnnotation& annotation() const override;
-
-private:
-	std::vector<ASTPointer<VariableDeclaration>> m_members;
-};
-
-class EnumDefinition: public Declaration, public StructurallyDocumented, public ScopeOpener
-{
-public:
-	EnumDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		std::vector<ASTPointer<EnumValue>> _members,
-		ASTPointer<StructuredDocumentation> _documentation
-	):
-		Declaration(_id, _location, _name, std::move(_nameLocation)),
-		StructurallyDocumented(std::move(_documentation)),
-		m_members(std::move(_members))
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return true; }
-
-	std::vector<ASTPointer<EnumValue>> const& members() const { return m_members; }
-
-	Type const* type() const override;
-
-	TypeDeclarationAnnotation& annotation() const override;
-
-private:
-	std::vector<ASTPointer<EnumValue>> m_members;
-};
-
-/**
- * Declaration of an Enum Value
- */
-class EnumValue: public Declaration
-{
-public:
-	EnumValue(int64_t _id, SourceLocation const& _location, ASTPointer<ASTString> const& _name):
-		Declaration(_id, _location, _name, _location) {}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Type const* type() const override;
-};
-
-/**
- * User defined value types, i.e., custom types, for example, `type MyInt is int`. Allows creating a
- * zero cost abstraction over value type with stricter type requirements.
- */
-class UserDefinedValueTypeDefinition: public Declaration
-{
-public:
-	UserDefinedValueTypeDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> _name,
-		SourceLocation _nameLocation,
-		ASTPointer<TypeName> _underlyingType
-	):
-		Declaration(_id, _location, _name, std::move(_nameLocation), Visibility::Default),
-		m_underlyingType(std::move(_underlyingType))
-	{
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Type const* type() const override;
-
-	TypeDeclarationAnnotation& annotation() const override;
-
-	TypeName const* underlyingType() const { return m_underlyingType.get(); }
-	bool isVisibleViaContractTypeAccess() const override { return true; }
-
-private:
-	/// The name of the underlying type
-	ASTPointer<TypeName> m_underlyingType;
-};
-
-/**
- * Parameter list, used as function parameter list, return list and for try and catch.
- * None of the parameters is allowed to contain mappings (not even recursively
- * inside structs).
- */
-class ParameterList: public ASTNode
-{
-public:
-	ParameterList(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::vector<ASTPointer<VariableDeclaration>> _parameters
-	):
-		ASTNode(_id, _location), m_parameters(std::move(_parameters)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<VariableDeclaration>> const& parameters() const { return m_parameters; }
-
-private:
-	std::vector<ASTPointer<VariableDeclaration>> m_parameters;
-};
-
-/**
- * Base class for all nodes that define function-like objects, i.e. FunctionDefinition,
- * EventDefinition, ErrorDefinition and ModifierDefinition.
- */
-class CallableDeclaration: public Declaration, public VariableScope
-{
-public:
-	CallableDeclaration(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		Visibility _visibility,
-		ASTPointer<ParameterList> _parameters,
-		bool _isVirtual = false,
-		ASTPointer<OverrideSpecifier> _overrides = nullptr,
-		ASTPointer<ParameterList> _returnParameters = ASTPointer<ParameterList>()
-	):
-		Declaration(_id, _location, _name, std::move(_nameLocation), _visibility),
-		m_parameters(std::move(_parameters)),
-		m_overrides(std::move(_overrides)),
-		m_returnParameters(std::move(_returnParameters)),
-		m_isVirtual(_isVirtual)
-	{
-	}
-
-	std::vector<ASTPointer<VariableDeclaration>> const& parameters() const { return m_parameters->parameters(); }
-	ASTPointer<OverrideSpecifier> const& overrides() const { return m_overrides; }
-	std::vector<ASTPointer<VariableDeclaration>> const& returnParameters() const { return m_returnParameters->parameters(); }
-	ParameterList const& parameterList() const { return *m_parameters; }
-	ASTPointer<ParameterList> const& returnParameterList() const { return m_returnParameters; }
-	bool markedVirtual() const { return m_isVirtual; }
-	virtual bool virtualSemantics() const { return markedVirtual(); }
-
-	CallableDeclarationAnnotation& annotation() const override = 0;
-
-	/// Performs virtual or super function/modifier lookup:
-	/// If @a _searchStart is nullptr, performs virtual function lookup, i.e.
-	/// searches the inheritance hierarchy of @a _mostDerivedContract towards the base
-	/// and returns the first function/modifier definition that
-	/// is overwritten by this callable.
-	/// If @a _searchStart is non-null, starts searching only from that contract, but
-	/// still in the hierarchy of @a _mostDerivedContract.
-	virtual CallableDeclaration const& resolveVirtual(
-		ContractDefinition const& _mostDerivedContract,
-		ContractDefinition const* _searchStart = nullptr
-	) const = 0;
-
-protected:
-	ASTPointer<ParameterList> m_parameters;
-	ASTPointer<OverrideSpecifier> m_overrides;
-	ASTPointer<ParameterList> m_returnParameters;
-	bool m_isVirtual = false;
-};
-
-/**
- * Function override specifier. Consists of a single override keyword
- * potentially followed by a parenthesized list of base contract names.
- */
-class OverrideSpecifier: public ASTNode
-{
-public:
-	OverrideSpecifier(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::vector<ASTPointer<IdentifierPath>> _overrides
-	):
-		ASTNode(_id, _location),
-		m_overrides(std::move(_overrides))
-	{
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	/// @returns the list of specific overrides, if any
-	std::vector<ASTPointer<IdentifierPath>> const& overrides() const { return m_overrides; }
-
-protected:
-	std::vector<ASTPointer<IdentifierPath>> m_overrides;
-};
-
-class FunctionDefinition: public CallableDeclaration, public StructurallyDocumented, public ImplementationOptional, public ScopeOpener
-{
-public:
-	FunctionDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation const& _nameLocation,
-		Visibility _visibility,
-		StateMutability _stateMutability,
-		bool _free,
-		Token _kind,
-		bool _isVirtual,
-		ASTPointer<OverrideSpecifier> const& _overrides,
-		ASTPointer<StructuredDocumentation> const& _documentation,
-		ASTPointer<ParameterList> const& _parameters,
-		std::vector<ASTPointer<ModifierInvocation>> _modifiers,
-		ASTPointer<ParameterList> const& _returnParameters,
-		ASTPointer<Block> const& _body
-	):
-		CallableDeclaration(_id, _location, _name, _nameLocation, _visibility, _parameters, _isVirtual, _overrides, _returnParameters),
-		StructurallyDocumented(_documentation),
-		ImplementationOptional(_body != nullptr),
-		m_stateMutability(_stateMutability),
-		m_free(_free),
-		m_kind(_kind),
-		m_functionModifiers(std::move(_modifiers)),
-		m_body(_body)
-	{
-		solAssert(_kind == Token::Constructor || _kind == Token::Function || _kind == Token::Fallback || _kind == Token::Receive, "");
-		solAssert(isOrdinary() == !name().empty(), "");
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	StateMutability stateMutability() const { return m_stateMutability; }
-	bool libraryFunction() const;
-	bool isOrdinary() const { return m_kind == Token::Function; }
-	bool isConstructor() const { return m_kind == Token::Constructor; }
-	bool isFallback() const { return m_kind == Token::Fallback; }
-	bool isReceive() const { return m_kind == Token::Receive; }
-	bool isFree() const { return m_free; }
-	Token kind() const { return m_kind; }
-	bool isPayable() const { return m_stateMutability == StateMutability::Payable; }
-	std::vector<ASTPointer<ModifierInvocation>> const& modifiers() const { return m_functionModifiers; }
-	Block const& body() const { solAssert(m_body, ""); return *m_body; }
-	Visibility defaultVisibility() const override;
-	bool isVisibleInContract() const override
-	{
-		return isOrdinary() && Declaration::isVisibleInContract();
-	}
-	bool isVisibleViaContractTypeAccess() const override
-	{
-		solAssert(!isFree(), "");
-		return isOrdinary() && visibility() >= Visibility::Public;
-	}
-	bool isPartOfExternalInterface() const override { return isOrdinary() && isPublic(); }
-
-	/// @returns the external signature of the function
-	/// That consists of the name of the function followed by the types of the
-	/// arguments separated by commas all enclosed in parentheses without any spaces.
-	std::string externalSignature() const;
-
-	/// @returns the external identifier of this function (the hash of the signature) as a hex string.
-	std::string externalIdentifierHex() const;
-
-	Type const* type() const override;
-	Type const* typeViaContractName() const override;
-
-	/// @param _internal false indicates external interface is concerned, true indicates internal interface is concerned.
-	/// @returns null when it is not accessible as a function.
-	FunctionTypePointer functionType(bool /*_internal*/) const override;
-
-	FunctionDefinitionAnnotation& annotation() const override;
-
-	bool virtualSemantics() const override
-	{
-		return
-			CallableDeclaration::virtualSemantics() ||
-			(annotation().contract && annotation().contract->isInterface());
-	}
-
-	FunctionDefinition const& resolveVirtual(
-		ContractDefinition const& _mostDerivedContract,
-		ContractDefinition const* _searchStart = nullptr
-	) const override;
-
-private:
-	StateMutability m_stateMutability;
-	bool m_free;
-	Token const m_kind;
-	std::vector<ASTPointer<ModifierInvocation>> m_functionModifiers;
-	ASTPointer<Block> m_body;
-};
-
-/**
- * Declaration of a variable. This can be used in various places, e.g. in function parameter
- * lists, struct definitions and even function bodies.
- */
-class VariableDeclaration: public Declaration, public StructurallyDocumented
-{
-public:
-	enum Location { Unspecified, Storage, Memory, CallData };
-	enum class Mutability { Mutable, Immutable, Constant };
-	static std::string mutabilityToString(Mutability _mutability)
-	{
-		switch (_mutability)
-		{
-		case Mutability::Mutable: return "mutable";
-		case Mutability::Immutable: return "immutable";
-		case Mutability::Constant: return "constant";
-		}
-		return {};
-	}
-
-	VariableDeclaration(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<TypeName> _type,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		ASTPointer<Expression> _value,
-		Visibility _visibility,
-		ASTPointer<StructuredDocumentation> const _documentation = nullptr,
-		bool _isIndexed = false,
-		Mutability _mutability = Mutability::Mutable,
-		ASTPointer<OverrideSpecifier> _overrides = nullptr,
-		Location _referenceLocation = Location::Unspecified
-	):
-		Declaration(_id, _location, _name, std::move(_nameLocation), _visibility),
-		StructurallyDocumented(std::move(_documentation)),
-		m_typeName(std::move(_type)),
-		m_value(std::move(_value)),
-		m_isIndexed(_isIndexed),
-		m_mutability(_mutability),
-		m_overrides(std::move(_overrides)),
-		m_location(_referenceLocation)
-	{
-		solAssert(m_typeName, "");
-	}
-
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	TypeName const& typeName() const { return *m_typeName; }
-	ASTPointer<Expression> const& value() const { return m_value; }
-
-	bool isLValue() const override;
-	bool isPartOfExternalInterface() const override { return isPublic(); }
-
-	/// @returns true iff this variable is the parameter (or return parameter) of a function
-	/// (or function type name or event) or declared inside a function body.
-	bool isLocalVariable() const;
-	/// @returns true if this variable is a parameter or return parameter of a function.
-	bool isCallableOrCatchParameter() const;
-	/// @returns true if this variable is a return parameter of a function.
-	bool isReturnParameter() const;
-	/// @returns true if this variable is a parameter of the success or failure clausse
-	/// of a try/catch statement.
-	bool isTryCatchParameter() const;
-	/// @returns true if this variable is a local variable or return parameter.
-	bool isLocalOrReturn() const;
-	/// @returns true if this variable is a parameter (not return parameter) of an external function.
-	/// This excludes parameters of external function type names.
-	bool isExternalCallableParameter() const;
-	/// @returns true if this variable is a parameter (not return parameter) of a public function.
-	bool isPublicCallableParameter() const;
-	/// @returns true if this variable is a parameter or return parameter of an internal function
-	/// or a function type of internal visibility.
-	bool isInternalCallableParameter() const;
-	/// @returns true if this variable is the parameter of a constructor.
-	bool isConstructorParameter() const;
-	/// @returns true iff this variable is a parameter(or return parameter of a library function
-	bool isLibraryFunctionParameter() const;
-	/// @returns true if the type of the variable is a reference or mapping type, i.e.
-	/// array, struct or mapping. These types can take a data location (and often require it).
-	/// Can only be called after reference resolution.
-	bool hasReferenceOrMappingType() const;
-	bool isStateVariable() const;
-	bool isFileLevelVariable() const;
-	bool isIndexed() const { return m_isIndexed; }
-	Mutability mutability() const { return m_mutability; }
-	bool isConstant() const { return m_mutability == Mutability::Constant; }
-	bool immutable() const { return m_mutability == Mutability::Immutable; }
-	ASTPointer<OverrideSpecifier> const& overrides() const { return m_overrides; }
-	Location referenceLocation() const { return m_location; }
-	/// @returns a set of allowed storage locations for the variable.
-	std::set<Location> allowedDataLocations() const;
-
-	/// @returns the external identifier of this variable (the hash of the signature) as a hex string (works only for public state variables).
-	std::string externalIdentifierHex() const;
-
-	Type const* type() const override;
-
-	/// @param _internal false indicates external interface is concerned, true indicates internal interface is concerned.
-	/// @returns null when it is not accessible as a function.
-	FunctionTypePointer functionType(bool /*_internal*/) const override;
-
-	VariableDeclarationAnnotation& annotation() const override;
-
-protected:
-	Visibility defaultVisibility() const override { return Visibility::Internal; }
-
-private:
-	ASTPointer<TypeName> m_typeName;
-	/// Initially assigned value, can be missing. For local variables, this is stored inside
-	/// VariableDeclarationStatement and not here.
-	ASTPointer<Expression> m_value;
-	bool m_isIndexed = false; ///< Whether this is an indexed variable (used by events).
-	/// Whether the variable is "constant", "immutable" or non-marked (mutable).
-	Mutability m_mutability = Mutability::Mutable;
-	ASTPointer<OverrideSpecifier> m_overrides; ///< Contains the override specifier node
-	Location m_location = Location::Unspecified; ///< Location of the variable if it is of reference type.
-};
-
-/**
- * Definition of a function modifier.
- */
-class ModifierDefinition: public CallableDeclaration, public StructurallyDocumented, public ImplementationOptional, public ScopeOpener
-{
-public:
-	ModifierDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		ASTPointer<StructuredDocumentation> const& _documentation,
-		ASTPointer<ParameterList> const& _parameters,
-		bool _isVirtual,
-		ASTPointer<OverrideSpecifier> const& _overrides,
-		ASTPointer<Block> const& _body
-	):
-		CallableDeclaration(_id, _location, _name, std::move(_nameLocation), Visibility::Internal, _parameters, _isVirtual, _overrides),
-		StructurallyDocumented(_documentation),
-		ImplementationOptional(_body != nullptr),
-		m_body(_body)
-	{
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Block const& body() const { solAssert(m_body, ""); return *m_body; }
-
-	Type const* type() const override;
-
-	Visibility defaultVisibility() const override { return Visibility::Internal; }
-
-	ModifierDefinitionAnnotation& annotation() const override;
-
-	ModifierDefinition const& resolveVirtual(
-		ContractDefinition const& _mostDerivedContract,
-		ContractDefinition const* _searchStart = nullptr
-	) const override;
-
-
-private:
-	ASTPointer<Block> m_body;
-};
-
-/**
- * Invocation/usage of a modifier in a function header or a base constructor call.
- */
-class ModifierInvocation: public ASTNode
-{
-public:
-	ModifierInvocation(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<IdentifierPath> _name,
-		std::unique_ptr<std::vector<ASTPointer<Expression>>> _arguments
-	):
-		ASTNode(_id, _location), m_modifierName(std::move(_name)), m_arguments(std::move(_arguments))
-	{
-		solAssert(m_modifierName != nullptr, "Name cannot be null.");
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	IdentifierPath& name() const { return *m_modifierName; }
-	// Returns nullptr if no argument list was given (``mod``).
-	// If an argument list is given (``mod(...)``), the arguments are returned
-	// as a vector of expressions. Note that this vector can be empty (``mod()``).
-	std::vector<ASTPointer<Expression>> const* arguments() const { return m_arguments.get(); }
-
-private:
-	ASTPointer<IdentifierPath> m_modifierName;
-	std::unique_ptr<std::vector<ASTPointer<Expression>>> m_arguments;
-};
-
-/**
- * Definition of a (loggable) event.
- */
-class EventDefinition: public CallableDeclaration, public StructurallyDocumented, public ScopeOpener
-{
-public:
-	EventDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		ASTPointer<StructuredDocumentation> const& _documentation,
-		ASTPointer<ParameterList> const& _parameters,
-		bool _anonymous = false
-	):
-		CallableDeclaration(_id, _location, _name, std::move(_nameLocation), Visibility::Default, _parameters),
-		StructurallyDocumented(_documentation),
-		m_anonymous(_anonymous)
-	{
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	bool isAnonymous() const { return m_anonymous; }
-
-	Type const* type() const override;
-	FunctionTypePointer functionType(bool /*_internal*/) const override;
-
-	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return true; }
-
-	EventDefinitionAnnotation& annotation() const override;
-
-	CallableDeclaration const& resolveVirtual(
-		ContractDefinition const&,
-		ContractDefinition const*
-	) const override
-	{
-		return *this;
-	}
-
-private:
-	bool m_anonymous = false;
-};
-
-/**
- * Definition of an error type usable in ``revert(MyError(x))``, ``require(condition, MyError(x))``
- * and ``catch MyError(_x)``.
- */
-class ErrorDefinition: public CallableDeclaration, public StructurallyDocumented, public ScopeOpener
-{
-public:
-	ErrorDefinition(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _name,
-		SourceLocation _nameLocation,
-		ASTPointer<StructuredDocumentation> const& _documentation,
-		ASTPointer<ParameterList> const& _parameters
-	):
-		CallableDeclaration(_id, _location, _name, std::move(_nameLocation), Visibility::Default, _parameters),
-		StructurallyDocumented(_documentation)
-	{
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Type const* type() const override;
-
-	FunctionTypePointer functionType(bool _internal) const override;
-
-	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return true; }
-
-	ErrorDefinitionAnnotation& annotation() const override;
-
-	CallableDeclaration const& resolveVirtual(
-		ContractDefinition const&,
-		ContractDefinition const*
-	) const override
-	{
-		return *this;
-	}
-};
-
-/**
- * Pseudo AST node that is used as declaration for "this", "msg", "tx", "block" and the global
- * functions when such an identifier is encountered. Will never have a valid location in the source code
- */
-class MagicVariableDeclaration: public Declaration
-{
-public:
-	MagicVariableDeclaration(int _id, ASTString const& _name, Type const* _type):
-		Declaration(_id, SourceLocation(), std::make_shared<ASTString>(_name), {}), m_type(_type) { }
-
-	void accept(ASTVisitor&) override
-	{
-		solAssert(false, "MagicVariableDeclaration used inside real AST.");
-	}
-	void accept(ASTConstVisitor&) const override
-	{
-		solAssert(false, "MagicVariableDeclaration used inside real AST.");
-	}
-
-	FunctionType const* functionType(bool) const override
-	{
-		solAssert(m_type->category() == Type::Category::Function, "");
-		return dynamic_cast<FunctionType const*>(m_type);
-	}
-	Type const* type() const override { return m_type; }
-
-private:
-	Type const* m_type;
-};
-
-/// Types
-/// @{
-
-/**
- * Abstract base class of a type name, can be any built-in or user-defined type.
- */
-class TypeName: public ASTNode
-{
-protected:
-	explicit TypeName(int64_t _id, SourceLocation const& _location): ASTNode(_id, _location) {}
-
-public:
-	TypeNameAnnotation& annotation() const override;
-};
-
-/**
- * Any pre-defined type name represented by a single keyword (and possibly a state mutability for address types),
- * i.e. it excludes mappings, contracts, functions, etc.
- */
-class ElementaryTypeName: public TypeName
-{
-public:
-	ElementaryTypeName(
-		int64_t _id,
-		SourceLocation const& _location,
-		ElementaryTypeNameToken const& _elem,
-		std::optional<StateMutability> _stateMutability = {}
-	): TypeName(_id, _location), m_type(_elem), m_stateMutability(_stateMutability)
-	{
-		solAssert(!_stateMutability.has_value() || _elem.token() == Token::Address, "");
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	ElementaryTypeNameToken const& typeName() const { return m_type; }
-
-	std::optional<StateMutability> const& stateMutability() const { return m_stateMutability; }
-
-private:
-	ElementaryTypeNameToken m_type;
-	std::optional<StateMutability> m_stateMutability; ///< state mutability for address type
-};
-
-/**
- * Name referring to a user-defined type (i.e. a struct, contract, etc.).
- */
-class UserDefinedTypeName: public TypeName
-{
-public:
-	UserDefinedTypeName(int64_t _id, SourceLocation const& _location, ASTPointer<IdentifierPath> _namePath):
-		TypeName(_id, _location), m_namePath(std::move(_namePath))
-	{
-		solAssert(m_namePath != nullptr, "Name cannot be null.");
-	}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTString> const& namePath() const { return m_namePath->path(); }
-	IdentifierPath& pathNode() const { return *m_namePath; }
-
-private:
-	ASTPointer<IdentifierPath> m_namePath;
-};
-
-/**
- * A literal function type. Its source form is "function (paramType1, paramType2) internal / external returns (retType1, retType2)"
- */
-class FunctionTypeName: public TypeName, public ScopeOpener
-{
-public:
-	FunctionTypeName(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ParameterList> _parameterTypes,
-		ASTPointer<ParameterList> _returnTypes,
-		Visibility _visibility,
-		StateMutability _stateMutability
-	):
-		TypeName(_id, _location), m_parameterTypes(std::move(_parameterTypes)), m_returnTypes(std::move(_returnTypes)),
-		m_visibility(_visibility), m_stateMutability(_stateMutability)
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<VariableDeclaration>> const& parameterTypes() const { return m_parameterTypes->parameters(); }
-	std::vector<ASTPointer<VariableDeclaration>> const& returnParameterTypes() const { return m_returnTypes->parameters(); }
-	ASTPointer<ParameterList> const& parameterTypeList() const { return m_parameterTypes; }
-	ASTPointer<ParameterList> const& returnParameterTypeList() const { return m_returnTypes; }
-
-	Visibility visibility() const
-	{
-		return m_visibility == Visibility::Default ? Visibility::Internal : m_visibility;
-	}
-	StateMutability stateMutability() const { return m_stateMutability; }
-	bool isPayable() const { return m_stateMutability == StateMutability::Payable; }
-
-private:
-	ASTPointer<ParameterList> m_parameterTypes;
-	ASTPointer<ParameterList> m_returnTypes;
-	Visibility m_visibility;
-	StateMutability m_stateMutability;
-};
-
-/**
- * A mapping type. Its source form is "mapping('keyType' => 'valueType')"
- */
-class Mapping: public TypeName
-{
-public:
-	Mapping(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<TypeName> _keyType,
-		ASTPointer<ASTString> _keyName,
-		SourceLocation _keyNameLocation,
-		ASTPointer<TypeName> _valueType,
-		ASTPointer<ASTString> _valueName,
-		SourceLocation _valueNameLocation
-	):
-		TypeName(_id, _location),
-		m_keyType(std::move(_keyType)),
-		m_keyName(std::move(_keyName)),
-		m_keyNameLocation(std::move(_keyNameLocation)),
-		m_valueType(std::move(_valueType)),
-		m_valueName(std::move(_valueName)),
-		m_valueNameLocation(std::move(_valueNameLocation))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	TypeName const& keyType() const { return *m_keyType; }
-	ASTString keyName() const { return *m_keyName; }
-	SourceLocation keyNameLocation() const { return m_keyNameLocation; }
-	TypeName const& valueType() const { return *m_valueType; }
-	ASTString valueName() const { return *m_valueName; }
-	SourceLocation valueNameLocation() const { return m_valueNameLocation; }
-
-private:
-	ASTPointer<TypeName> m_keyType;
-	ASTPointer<ASTString> m_keyName;
-	SourceLocation m_keyNameLocation;
-	ASTPointer<TypeName> m_valueType;
-	ASTPointer<ASTString> m_valueName;
-	SourceLocation m_valueNameLocation;
-};
-
-/**
- * An array type, can be "typename[]" or "typename[<expression>]".
- */
-class ArrayTypeName: public TypeName
-{
-public:
-	ArrayTypeName(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<TypeName> _baseType,
-		ASTPointer<Expression> _length
-	):
-		TypeName(_id, _location), m_baseType(std::move(_baseType)), m_length(std::move(_length)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	TypeName const& baseType() const { return *m_baseType; }
-	Expression const* length() const { return m_length.get(); }
-
-private:
-	ASTPointer<TypeName> m_baseType;
-	ASTPointer<Expression> m_length; ///< Length of the array, might be empty.
-};
-
-/// @}
-
-/// Statements
-/// @{
-
-
-/**
- * Abstract base class for statements.
- */
-class Statement: public ASTNode, public Documented
-{
-public:
-	explicit Statement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString
-	): ASTNode(_id, _location), Documented(_docString) {}
-
-	StatementAnnotation& annotation() const override;
-};
-
-/**
- * Inline assembly.
- */
-class InlineAssembly: public Statement
-{
-public:
-	InlineAssembly(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		yul::Dialect const& _dialect,
-		ASTPointer<std::vector<ASTPointer<ASTString>>> _flags,
-		std::shared_ptr<yul::Block> _operations
-	):
-		Statement(_id, _location, _docString),
-		m_dialect(_dialect),
-		m_flags(std::move(_flags)),
-		m_operations(std::move(_operations))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	yul::Dialect const& dialect() const { return m_dialect; }
-	yul::Block const& operations() const { return *m_operations; }
-	ASTPointer<std::vector<ASTPointer<ASTString>>> const& flags() const { return m_flags; }
-
-	InlineAssemblyAnnotation& annotation() const override;
-
-private:
-	yul::Dialect const& m_dialect;
-	ASTPointer<std::vector<ASTPointer<ASTString>>> m_flags;
-	std::shared_ptr<yul::Block> m_operations;
-};
-
-/**
- * Brace-enclosed block containing zero or more statements.
- */
-class Block: public Statement, public Scopable, public ScopeOpener
-{
-public:
-	Block(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		bool _unchecked,
-		std::vector<ASTPointer<Statement>> _statements
-	):
-		Statement(_id, _location, _docString),
-		m_statements(std::move(_statements)),
-		m_unchecked(_unchecked)
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<Statement>> const& statements() const { return m_statements; }
-	bool unchecked() const { return m_unchecked; }
-
-	BlockAnnotation& annotation() const override;
-
-private:
-	std::vector<ASTPointer<Statement>> m_statements;
-	bool m_unchecked;
-};
-
-/**
- * Special placeholder statement denoted by "_" used in function modifiers. This is replaced by
- * the original function when the modifier is applied.
- */
-class PlaceholderStatement: public Statement
-{
-public:
-	explicit PlaceholderStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString
-	): Statement(_id, _location, _docString) {}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-};
-
-/**
- * If-statement with an optional "else" part. Note that "else if" is modeled by having a new
- * if-statement as the false (else) body.
- */
-class IfStatement: public Statement
-{
-public:
-	IfStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Expression> _condition,
-		ASTPointer<Statement> _trueBody,
-		ASTPointer<Statement> _falseBody
-	):
-		Statement(_id, _location, _docString),
-		m_condition(std::move(_condition)),
-		m_trueBody(std::move(_trueBody)),
-		m_falseBody(std::move(_falseBody))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& condition() const { return *m_condition; }
-	Statement const& trueStatement() const { return *m_trueBody; }
-	/// @returns the "else" part of the if statement or nullptr if there is no "else" part.
-	Statement const* falseStatement() const { return m_falseBody.get(); }
-
-private:
-	ASTPointer<Expression> m_condition;
-	ASTPointer<Statement> m_trueBody;
-	ASTPointer<Statement> m_falseBody; ///< "else" part, optional
-};
-
-/**
- * Clause of a try-catch block. Includes both the successful case and the
- * unsuccessful cases.
- * Names are only allowed for the unsuccessful cases.
- */
-class TryCatchClause: public ASTNode, public Scopable, public ScopeOpener
-{
-public:
-	TryCatchClause(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> _errorName,
-		ASTPointer<ParameterList> _parameters,
-		ASTPointer<Block> _block
-	):
-		ASTNode(_id, _location),
-		m_errorName(std::move(_errorName)),
-		m_parameters(std::move(_parameters)),
-		m_block(std::move(_block))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	ASTString const& errorName() const { return *m_errorName; }
-	ParameterList const* parameters() const { return m_parameters.get(); }
-	Block const& block() const { return *m_block; }
-
-	TryCatchClauseAnnotation& annotation() const override;
-
-private:
-	ASTPointer<ASTString> m_errorName;
-	ASTPointer<ParameterList> m_parameters;
-	ASTPointer<Block> m_block;
-};
-
-/**
- * Try-statement with a variable number of catch statements.
- * Syntax:
- * try <call> returns (uint x, uint y) {
- *   // success code
- * } catch Panic(uint errorCode) {
- *   // panic
- * } catch Error(string memory cause) {
- *   // error code, reason provided
- * } catch (bytes memory lowLevelData) {
- *   // error code, no reason provided or non-matching error signature.
- * }
- *
- * The last statement given above can also be specified as
- * } catch () {
- */
-class TryStatement: public Statement
-{
-public:
-	TryStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Expression> _externalCall,
-		std::vector<ASTPointer<TryCatchClause>> _clauses
-	):
-		Statement(_id, _location, _docString),
-		m_externalCall(std::move(_externalCall)),
-		m_clauses(std::move(_clauses))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& externalCall() const { return *m_externalCall; }
-	std::vector<ASTPointer<TryCatchClause>> const& clauses() const { return m_clauses; }
-
-	TryCatchClause const* successClause() const;
-	TryCatchClause const* panicClause() const;
-	TryCatchClause const* errorClause() const;
-	TryCatchClause const* fallbackClause() const;
-
-private:
-	ASTPointer<Expression> m_externalCall;
-	std::vector<ASTPointer<TryCatchClause>> m_clauses;
-};
-
-/**
- * Statement in which a break statement is legal (abstract class).
- */
-class BreakableStatement: public Statement
-{
-public:
-	explicit BreakableStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString
-	): Statement(_id, _location, _docString) {}
-};
-
-class WhileStatement: public BreakableStatement
-{
-public:
-	WhileStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Expression> _condition,
-		ASTPointer<Statement> _body,
-		bool _isDoWhile
-	):
-		BreakableStatement(_id, _location, _docString), m_condition(std::move(_condition)), m_body(std::move(_body)),
-		m_isDoWhile(_isDoWhile) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& condition() const { return *m_condition; }
-	Statement const& body() const { return *m_body; }
-	bool isDoWhile() const { return m_isDoWhile; }
-
-private:
-	ASTPointer<Expression> m_condition;
-	ASTPointer<Statement> m_body;
-	bool m_isDoWhile;
-};
-
-/**
- * For loop statement
- */
-class ForStatement: public BreakableStatement, public Scopable, public ScopeOpener
-{
-public:
-	ForStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Statement> _initExpression,
-		ASTPointer<Expression> _conditionExpression,
-		ASTPointer<ExpressionStatement> _loopExpression,
-		ASTPointer<Statement> _body
-	):
-		BreakableStatement(_id, _location, _docString),
-		m_initExpression(std::move(_initExpression)),
-		m_condExpression(std::move(_conditionExpression)),
-		m_loopExpression(std::move(_loopExpression)),
-		m_body(std::move(_body))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Statement const* initializationExpression() const { return m_initExpression.get(); }
-	Expression const* condition() const { return m_condExpression.get(); }
-	ExpressionStatement const* loopExpression() const { return m_loopExpression.get(); }
-	Statement const& body() const { return *m_body; }
-
-	ForStatementAnnotation& annotation() const override;
-
-private:
-	/// For statement's initialization expression. for (XXX; ; ). Can be empty
-	ASTPointer<Statement> m_initExpression;
-	/// For statement's condition expression. for (; XXX ; ). Can be empty
-	ASTPointer<Expression> m_condExpression;
-	/// For statement's loop expression. for (;;XXX). Can be empty
-	ASTPointer<ExpressionStatement> m_loopExpression;
-	/// The body of the loop
-	ASTPointer<Statement> m_body;
-};
-
-class Continue: public Statement
-{
-public:
-	explicit Continue(int64_t _id, SourceLocation const& _location, ASTPointer<ASTString> const& _docString):
-		Statement(_id, _location, _docString) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-};
-
-class Break: public Statement
-{
-public:
-	explicit Break(int64_t _id, SourceLocation const& _location, ASTPointer<ASTString> const& _docString):
-		Statement(_id, _location, _docString) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-};
-
-class Return: public Statement
-{
-public:
-	Return(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Expression> _expression
-	): Statement(_id, _location, _docString), m_expression(std::move(_expression)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const* expression() const { return m_expression.get(); }
-
-	ReturnAnnotation& annotation() const override;
-
-private:
-	ASTPointer<Expression> m_expression; ///< value to return, optional
-};
-
-/**
- * @brief The Throw statement to throw that triggers a solidity exception(jump to ErrorTag)
- */
-class Throw: public Statement
-{
-public:
-	explicit Throw(int64_t _id, SourceLocation const& _location, ASTPointer<ASTString> const& _docString):
-		Statement(_id, _location, _docString) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-};
-
-/**
- * The revert statement is used to revert state changes and return error data.
- */
-class RevertStatement: public Statement
-{
-public:
-	explicit RevertStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<FunctionCall> _functionCall
-	):
-		Statement(_id, _location, _docString), m_errorCall(std::move(_functionCall))
-	{
-		solAssert(m_errorCall, "");
-	}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	FunctionCall const& errorCall() const { return *m_errorCall; }
-
-private:
-	ASTPointer<FunctionCall> m_errorCall;
-};
-
-/**
- * The emit statement is used to emit events: emit EventName(arg1, ..., argn)
- */
-class EmitStatement: public Statement
-{
-public:
-	explicit EmitStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<FunctionCall> _functionCall
-	):
-		Statement(_id, _location, _docString), m_eventCall(std::move(_functionCall)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	FunctionCall const& eventCall() const { return *m_eventCall; }
-
-private:
-	ASTPointer<FunctionCall> m_eventCall;
-};
-
-/**
- * Definition of one or more variables as a statement inside a function.
- * If multiple variables are declared, a value has to be assigned directly.
- * If only a single variable is declared, the value can be missing.
- * Examples:
- * uint[] memory a; uint a = 2;
- * (uint a, bytes32 b, ) = f(); (, uint a, , StructName storage x) = g();
- */
-class VariableDeclarationStatement: public Statement
-{
-public:
-	VariableDeclarationStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		std::vector<ASTPointer<VariableDeclaration>> _variables,
-		ASTPointer<Expression> _initialValue
-	):
-		Statement(_id, _location, _docString), m_variables(std::move(_variables)), m_initialValue(std::move(_initialValue)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<VariableDeclaration>> const& declarations() const { return m_variables; }
-	Expression const* initialValue() const { return m_initialValue.get(); }
-
-private:
-	/// List of variables, some of which can be empty pointers (unnamed components).
-	/// Note that the ``m_value`` member of these is unused. Instead, ``m_initialValue``
-	/// below is used, because the initial value can be a single expression assigned
-	/// to all variables.
-	std::vector<ASTPointer<VariableDeclaration>> m_variables;
-	/// The assigned expression / initial value.
-	ASTPointer<Expression> m_initialValue;
-};
-
-/**
- * A statement that contains only an expression (i.e. an assignment, function call, ...).
- */
-class ExpressionStatement: public Statement
-{
-public:
-	ExpressionStatement(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Expression> _expression
-	):
-		Statement(_id, _location, _docString), m_expression(std::move(_expression)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& expression() const { return *m_expression; }
-
-private:
-	ASTPointer<Expression> m_expression;
-};
-
-/// @}
-
-/// Expressions
-/// @{
-
-/**
- * An expression, i.e. something that has a value (which can also be of type "void" in case
- * of some function calls).
- * @abstract
- */
-class Expression: public ASTNode
-{
-public:
-	explicit Expression(int64_t _id, SourceLocation const& _location): ASTNode(_id, _location) {}
-
-	ExpressionAnnotation& annotation() const override;
-};
-
-class Conditional: public Expression
-{
-public:
-	Conditional(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _condition,
-		ASTPointer<Expression> _trueExpression,
-		ASTPointer<Expression> _falseExpression
-	):
-		Expression(_id, _location),
-		m_condition(std::move(_condition)),
-		m_trueExpression(std::move(_trueExpression)),
-		m_falseExpression(std::move(_falseExpression))
-	{}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& condition() const { return *m_condition; }
-	Expression const& trueExpression() const { return *m_trueExpression; }
-	Expression const& falseExpression() const { return *m_falseExpression; }
-
-private:
-	ASTPointer<Expression> m_condition;
-	ASTPointer<Expression> m_trueExpression;
-	ASTPointer<Expression> m_falseExpression;
-};
-
-/// Assignment, can also be a compound assignment.
-/// Examples: (a = 7 + 8) or (a *= 2)
-class Assignment: public Expression
-{
-public:
-	Assignment(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _leftHandSide,
-		Token _assignmentOperator,
-		ASTPointer<Expression> _rightHandSide
-	):
-		Expression(_id, _location),
-		m_leftHandSide(std::move(_leftHandSide)),
-		m_assigmentOperator(_assignmentOperator),
-		m_rightHandSide(std::move(_rightHandSide))
-	{
-		solAssert(TokenTraits::isAssignmentOp(_assignmentOperator), "");
-	}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& leftHandSide() const { return *m_leftHandSide; }
-	Token assignmentOperator() const { return m_assigmentOperator; }
-	Expression const& rightHandSide() const { return *m_rightHandSide; }
-
-private:
-	ASTPointer<Expression> m_leftHandSide;
-	Token m_assigmentOperator;
-	ASTPointer<Expression> m_rightHandSide;
-};
-
-
-/**
- * Tuple, parenthesized expression, or bracketed expression.
- * Examples: (1, 2), (x,), (x), (), [1, 2],
- * Individual components might be empty shared pointers (as in the second example).
- * The respective types in lvalue context are: 2-tuple, 2-tuple (with wildcard), type of x, 0-tuple
- * Not in lvalue context: 2-tuple, _1_-tuple, type of x, 0-tuple.
- */
-class TupleExpression: public Expression
-{
-public:
-	TupleExpression(
-		int64_t _id,
-		SourceLocation const& _location,
-		std::vector<ASTPointer<Expression>> _components,
-		bool _isArray
-	):
-		Expression(_id, _location),
-		m_components(std::move(_components)),
-		m_isArray(_isArray) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	std::vector<ASTPointer<Expression>> const& components() const { return m_components; }
-	bool isInlineArray() const { return m_isArray; }
-
-private:
-	std::vector<ASTPointer<Expression>> m_components;
-	bool m_isArray;
-};
-
-/**
- * Operation involving a unary operator, pre- or postfix.
- * Examples: ++i, delete x or !true
- */
-class UnaryOperation: public Expression
-{
-public:
-	UnaryOperation(
-		int64_t _id,
-		SourceLocation const& _location,
-		Token _operator,
-		ASTPointer<Expression> _subExpression,
-		bool _isPrefix
-	):
-		Expression(_id, _location),
-		m_operator(_operator),
-		m_subExpression(std::move(_subExpression)),
-		m_isPrefix(_isPrefix)
-	{
-		solAssert(TokenTraits::isUnaryOp(_operator), "");
-	}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Token getOperator() const { return m_operator; }
-	bool isPrefixOperation() const { return m_isPrefix; }
-	Expression const& subExpression() const { return *m_subExpression; }
-
-	FunctionType const* userDefinedFunctionType() const;
-
-	OperationAnnotation& annotation() const override;
-
-private:
-	Token m_operator;
-	ASTPointer<Expression> m_subExpression;
-	bool m_isPrefix;
-};
-
-/**
- * Operation involving a binary operator.
- * Examples: 1 + 2, true && false or 1 <= 4
- */
-class BinaryOperation: public Expression
-{
-public:
-	BinaryOperation(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _left,
-		Token _operator,
-		ASTPointer<Expression> _right
-	):
-		Expression(_id, _location), m_left(std::move(_left)), m_operator(_operator), m_right(std::move(_right))
-	{
-		solAssert(TokenTraits::isBinaryOp(_operator) || TokenTraits::isCompareOp(_operator), "");
-	}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& leftExpression() const { return *m_left; }
-	Expression const& rightExpression() const { return *m_right; }
-	Token getOperator() const { return m_operator; }
-
-	FunctionType const* userDefinedFunctionType() const;
-
-	BinaryOperationAnnotation& annotation() const override;
-
-private:
-	ASTPointer<Expression> m_left;
-	Token m_operator;
-	ASTPointer<Expression> m_right;
-};
-
-/**
- * Can be ordinary function call, type cast or struct construction.
- */
-class FunctionCall: public Expression
-{
-public:
-	FunctionCall(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _expression,
-		std::vector<ASTPointer<Expression>> _arguments,
-		std::vector<ASTPointer<ASTString>> _names,
-		std::vector<SourceLocation> _nameLocations
-	):
-		Expression(_id, _location), m_expression(std::move(_expression)), m_arguments(std::move(_arguments)), m_names(std::move(_names)), m_nameLocations(std::move(_nameLocations))
-	{
-		solAssert(m_nameLocations.size() == m_names.size());
-	}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& expression() const { return *m_expression; }
-	/// @returns the given arguments in the order they were written.
-	std::vector<ASTPointer<Expression const>> arguments() const { return {m_arguments.begin(), m_arguments.end()}; }
-	/// @returns the given arguments sorted by how the called function takes them.
-	std::vector<ASTPointer<Expression const>> sortedArguments() const;
-	/// @returns the list of given argument names if this is a named call,
-	/// in the order they were written.
-	/// If this is not a named call, this is empty.
-	std::vector<ASTPointer<ASTString>> const& names() const { return m_names; }
-	std::vector<SourceLocation> const& nameLocations() const { return m_nameLocations; }
-
-	FunctionCallAnnotation& annotation() const override;
-
-private:
-	ASTPointer<Expression> m_expression;
-	std::vector<ASTPointer<Expression>> m_arguments;
-	std::vector<ASTPointer<ASTString>> m_names;
-	std::vector<SourceLocation> m_nameLocations;
-};
-
-/**
- * Expression that annotates a function call / a new expression with extra
- * options like gas, value, salt: new SomeContract{salt=123}(params)
- */
-class FunctionCallOptions: public Expression
-{
-public:
-	FunctionCallOptions(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _expression,
-		std::vector<ASTPointer<Expression>> _options,
-		std::vector<ASTPointer<ASTString>> _names
-	):
-		Expression(_id, _location), m_expression(std::move(_expression)), m_options(std::move(_options)), m_names(std::move(_names)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& expression() const { return *m_expression; }
-	std::vector<ASTPointer<Expression const>> options() const { return {m_options.begin(), m_options.end()}; }
-	std::vector<ASTPointer<ASTString>> const& names() const { return m_names; }
-
-private:
-	ASTPointer<Expression> m_expression;
-	std::vector<ASTPointer<Expression>> m_options;
-	std::vector<ASTPointer<ASTString>> m_names;
-
-};
-
-/**
- * Expression that creates a new contract or memory-array,
- * e.g. the "new SomeContract" part in "new SomeContract(1, 2)".
- */
-class NewExpression: public Expression
-{
-public:
-	NewExpression(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<TypeName> _typeName
-	):
-		Expression(_id, _location), m_typeName(std::move(_typeName)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	TypeName const& typeName() const { return *m_typeName; }
-
-private:
-	ASTPointer<TypeName> m_typeName;
-};
-
-/**
- * Access to a member of an object. Example: x.name
- */
-class MemberAccess: public Expression
-{
-public:
-	MemberAccess(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _expression,
-		ASTPointer<ASTString> _memberName,
-		SourceLocation _memberLocation
-	):
-		Expression(_id, _location),
-		m_expression(std::move(_expression)),
-		m_memberName(std::move(_memberName)),
-		m_memberLocation(std::move(_memberLocation))
-	{}
-
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-	Expression const& expression() const { return *m_expression; }
-	ASTString const& memberName() const { return *m_memberName; }
-	SourceLocation const& memberLocation() const { return m_memberLocation; }
-
-	MemberAccessAnnotation& annotation() const override;
-
-private:
-	ASTPointer<Expression> m_expression;
-	ASTPointer<ASTString> m_memberName;
-	SourceLocation m_memberLocation;
-};
-
-/**
- * Index access to an array or mapping. Example: a[2]
- */
-class IndexAccess: public Expression
-{
-public:
-	IndexAccess(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _base,
-		ASTPointer<Expression> _index
-	):
-		Expression(_id, _location), m_base(std::move(_base)), m_index(std::move(_index)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& baseExpression() const { return *m_base; }
-	Expression const* indexExpression() const { return m_index.get(); }
-
-private:
-	ASTPointer<Expression> m_base;
-	ASTPointer<Expression> m_index;
-};
-
-/**
- * Index range access to an array. Example: a[2:3]
- */
-class IndexRangeAccess: public Expression
-{
-public:
-	IndexRangeAccess(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<Expression> _base,
-		ASTPointer<Expression> _start,
-		ASTPointer<Expression> _end
-	):
-		Expression(_id, _location), m_base(std::move(_base)), m_start(std::move(_start)), m_end(std::move(_end)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Expression const& baseExpression() const { return *m_base; }
-	Expression const* startExpression() const { return m_start.get(); }
-	Expression const* endExpression() const { return m_end.get(); }
-
-private:
-	ASTPointer<Expression> m_base;
-	ASTPointer<Expression> m_start;
-	ASTPointer<Expression> m_end;
-};
-
-/**
- * Primary expression, i.e. an expression that cannot be divided any further. Examples are literals
- * or variable references.
- */
-class PrimaryExpression: public Expression
-{
-public:
-	PrimaryExpression(int64_t _id, SourceLocation const& _location): Expression(_id, _location) {}
-};
-
-/**
- * An identifier, i.e. a reference to a declaration by name like a variable or function.
- */
-class Identifier: public PrimaryExpression
-{
-public:
-	Identifier(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ASTString> _name
-	):
-		PrimaryExpression(_id, _location), m_name(std::move(_name)) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	ASTString const& name() const { return *m_name; }
-
-	IdentifierAnnotation& annotation() const override;
-
-private:
-	ASTPointer<ASTString> m_name;
-};
-
-/**
- * An elementary type name expression is used in expressions like "a = uint32(2)" to change the
- * type of an expression explicitly. Here, "uint32" is the elementary type name expression and
- * "uint32(2)" is a @ref FunctionCall.
- */
-class ElementaryTypeNameExpression: public PrimaryExpression
-{
-public:
-	ElementaryTypeNameExpression(
-		int64_t _id,
-		SourceLocation const& _location,
-		ASTPointer<ElementaryTypeName> _type
-	):
-		PrimaryExpression(_id, _location),
-		m_type(std::move(_type))
-	{
-	}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	ElementaryTypeName const& type() const { return *m_type; }
-
-private:
-	ASTPointer<ElementaryTypeName> m_type;
-};
-
-/**
- * A literal string or number. @see ExpressionCompiler::endVisit() is used to actually parse its value.
- */
-class Literal: public PrimaryExpression
-{
-public:
-	enum class SubDenomination
-	{
-		None = static_cast<int>(Token::Illegal),
-		Wei = static_cast<int>(Token::SubWei),
-		Gwei = static_cast<int>(Token::SubGwei),
-		Ether = static_cast<int>(Token::SubEther),
-		Second = static_cast<int>(Token::SubSecond),
-		Minute = static_cast<int>(Token::SubMinute),
-		Hour = static_cast<int>(Token::SubHour),
-		Day = static_cast<int>(Token::SubDay),
-		Week = static_cast<int>(Token::SubWeek),
-		Year = static_cast<int>(Token::SubYear)
-	};
-	Literal(
-		int64_t _id,
-		SourceLocation const& _location,
-		Token _token,
-		ASTPointer<ASTString> _value,
-		SubDenomination _sub = SubDenomination::None
-	):
-		PrimaryExpression(_id, _location), m_token(_token), m_value(std::move(_value)), m_subDenomination(_sub) {}
-	void accept(ASTVisitor& _visitor) override;
-	void accept(ASTConstVisitor& _visitor) const override;
-
-	Token token() const { return m_token; }
-	/// @returns the non-parsed value of the literal
-	ASTString const& value() const { return *m_value; }
-
-	ASTString valueWithoutUnderscores() const;
-
-	SubDenomination subDenomination() const { return m_subDenomination; }
-
-	/// @returns true if this is a number with a hex prefix.
-	bool isHexNumber() const;
-
-	/// @returns true if this looks like a checksummed address.
-	bool looksLikeAddress() const;
-	/// @returns true if it passes the address checksum test.
-	bool passesAddressChecksum() const;
-	/// @returns the checksummed version of an address (or empty string if not valid)
-	std::string getChecksummedAddress() const;
-
-private:
-	Token m_token;
-	ASTPointer<ASTString> m_value;
-	SubDenomination m_subDenomination;
-};
-
-/// @}
-
-}
diff --git a/libsolidity/ast/ASTAnnotations.cpp b/libsolidity/ast/ASTAnnotations.cpp
deleted file mode 100644
index 84d49fa2fd37..000000000000
--- a/libsolidity/ast/ASTAnnotations.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Object containing the type and other annotations for the AST nodes.
- */
-
-#include <libsolidity/ast/ASTAnnotations.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
deleted file mode 100644
index 9a19907117eb..000000000000
--- a/libsolidity/ast/ASTAnnotations.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Object containing the type and other annotations for the AST nodes.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/ASTEnums.h>
-#include <libsolidity/ast/ExperimentalFeatures.h>
-
-#include <libsolutil/SetOnce.h>
-
-#include <map>
-#include <memory>
-#include <optional>
-#include <set>
-#include <vector>
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-struct Identifier;
-struct Dialect;
-}
-
-namespace solidity::frontend
-{
-
-class Type;
-class ArrayType;
-
-struct CallGraph;
-
-struct ASTAnnotation
-{
-	ASTAnnotation() = default;
-
-	ASTAnnotation(ASTAnnotation const&) = delete;
-	ASTAnnotation(ASTAnnotation&&) = delete;
-
-	ASTAnnotation& operator=(ASTAnnotation const&) = delete;
-	ASTAnnotation& operator=(ASTAnnotation&&) = delete;
-
-	virtual ~ASTAnnotation() = default;
-};
-
-struct DocTag
-{
-	std::string content;	///< The text content of the tag.
-	std::string paramName;	///< Only used for @param, stores the parameter name.
-};
-
-struct StructurallyDocumentedAnnotation
-{
-	StructurallyDocumentedAnnotation() = default;
-
-	StructurallyDocumentedAnnotation(StructurallyDocumentedAnnotation const&) = delete;
-	StructurallyDocumentedAnnotation(StructurallyDocumentedAnnotation&&) = delete;
-
-	StructurallyDocumentedAnnotation& operator=(StructurallyDocumentedAnnotation const&) = delete;
-	StructurallyDocumentedAnnotation& operator=(StructurallyDocumentedAnnotation&&) = delete;
-
-	virtual ~StructurallyDocumentedAnnotation() = default;
-
-	/// Mapping docstring tag name -> content.
-	std::multimap<std::string, DocTag> docTags;
-	/// contract that @inheritdoc references if it exists
-	ContractDefinition const* inheritdocReference = nullptr;
-};
-
-struct SourceUnitAnnotation: ASTAnnotation
-{
-	/// The "absolute" (in the compiler sense) path of this source unit.
-	util::SetOnce<std::string> path;
-	/// The exported symbols (all global symbols).
-	util::SetOnce<std::map<ASTString, std::vector<Declaration const*>>> exportedSymbols;
-	/// Experimental features.
-	std::set<ExperimentalFeature> experimentalFeatures;
-	/// Using the new ABI coder. Set to `false` if using ABI coder v1.
-	util::SetOnce<bool> useABICoderV2;
-};
-
-struct ScopableAnnotation
-{
-	ScopableAnnotation() = default;
-
-	ScopableAnnotation(ScopableAnnotation const&) = delete;
-	ScopableAnnotation(ScopableAnnotation&&) = delete;
-
-	ScopableAnnotation& operator=(ScopableAnnotation const&) = delete;
-	ScopableAnnotation& operator=(ScopableAnnotation&&) = delete;
-
-	virtual ~ScopableAnnotation() = default;
-
-	/// The scope this declaration resides in. Can be nullptr if it is the global scope.
-	/// Filled by the Scoper.
-	ASTNode const* scope = nullptr;
-	/// Pointer to the contract this declaration resides in. Can be nullptr if the current scope
-	/// is not part of a contract. Filled by the Scoper.
-	ContractDefinition const* contract = nullptr;
-};
-
-struct DeclarationAnnotation: ASTAnnotation, ScopableAnnotation
-{
-};
-
-struct ImportAnnotation: DeclarationAnnotation
-{
-	/// The absolute path of the source unit to import.
-	util::SetOnce<std::string> absolutePath;
-	/// The actual source unit.
-	SourceUnit const* sourceUnit = nullptr;
-};
-
-struct TypeDeclarationAnnotation: DeclarationAnnotation
-{
-	/// The name of this type, prefixed by proper namespaces if globally accessible.
-	util::SetOnce<std::string> canonicalName;
-};
-
-struct StructDeclarationAnnotation: TypeDeclarationAnnotation
-{
-	/// Whether the struct is recursive, i.e. if the struct (recursively) contains a member that involves a struct of the same
-	/// type, either in a dynamic array, as member of another struct or inside a mapping.
-	/// Only cases in which the recursive occurrence is within a dynamic array or a mapping are valid, while direct
-	/// recursion immediately raises an error.
-	/// Will be filled in by the DeclarationTypeChecker.
-	std::optional<bool> recursive;
-	/// Whether the struct contains a mapping type, either directly or, indirectly inside another
-	/// struct or an array.
-	std::optional<bool> containsNestedMapping;
-};
-
-struct ContractDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocumentedAnnotation
-{
-	/// List of functions and modifiers without a body. Can also contain functions from base classes.
-	std::optional<std::vector<Declaration const*>> unimplementedDeclarations;
-	/// List of all (direct and indirect) base contracts in order from derived to
-	/// base, including the contract itself.
-	std::vector<ContractDefinition const*> linearizedBaseContracts;
-	/// Mapping containing the nodes that define the arguments for base constructors.
-	/// These can either be inheritance specifiers or modifier invocations.
-	std::map<FunctionDefinition const*, ASTNode const*> baseConstructorArguments;
-	/// A graph with edges representing calls between functions that may happen during contract construction.
-	util::SetOnce<std::shared_ptr<CallGraph const>> creationCallGraph;
-	/// A graph with edges representing calls between functions that may happen in a deployed contract.
-	util::SetOnce<std::shared_ptr<CallGraph const>> deployedCallGraph;
-
-	/// List of contracts whose bytecode is referenced by this contract, e.g. through "new".
-	/// The Value represents the ast node that referenced the contract.
-	std::map<ContractDefinition const*, ASTNode const*, ASTCompareByID<ContractDefinition>> contractDependencies;
-
-	// Per-contract map from function AST IDs to internal dispatch function IDs.
-	std::map<FunctionDefinition const*, uint64_t> internalFunctionIDs;
-};
-
-struct CallableDeclarationAnnotation: DeclarationAnnotation
-{
-	/// The set of functions/modifiers/events this callable overrides.
-	std::set<CallableDeclaration const*> baseFunctions;
-};
-
-struct FunctionDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
-{
-};
-
-struct EventDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
-{
-};
-
-struct ErrorDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
-{
-};
-
-
-struct ModifierDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
-{
-};
-
-struct VariableDeclarationAnnotation: DeclarationAnnotation, StructurallyDocumentedAnnotation
-{
-	/// Type of variable (type of identifier referencing this variable).
-	Type const* type = nullptr;
-	/// The set of functions this (public state) variable overrides.
-	std::set<CallableDeclaration const*> baseFunctions;
-};
-
-struct StatementAnnotation: ASTAnnotation
-{
-};
-
-struct InlineAssemblyAnnotation: StatementAnnotation
-{
-	struct ExternalIdentifierInfo
-	{
-		Declaration const* declaration = nullptr;
-		/// Suffix used, one of "slot", "offset", "length", "address", "selector" or empty.
-		std::string suffix;
-		size_t valueSize = size_t(-1);
-	};
-
-	/// Mapping containing resolved references to external identifiers and their value size
-	std::map<yul::Identifier const*, ExternalIdentifierInfo> externalReferences;
-	/// Information generated during analysis phase.
-	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
-	/// True, if the assembly block was annotated to be memory-safe.
-	bool markedMemorySafe = false;
-	/// True, if the assembly block involves any memory opcode or assigns to variables in memory.
-	util::SetOnce<bool> hasMemoryEffects;
-};
-
-struct BlockAnnotation: StatementAnnotation, ScopableAnnotation
-{
-};
-
-struct TryCatchClauseAnnotation: ASTAnnotation, ScopableAnnotation
-{
-};
-
-struct ForStatementAnnotation: StatementAnnotation, ScopableAnnotation
-{
-	util::SetOnce<bool> isSimpleCounterLoop;
-};
-
-struct ReturnAnnotation: StatementAnnotation
-{
-	/// Reference to the return parameters of the function.
-	ParameterList const* functionReturnParameters = nullptr;
-};
-
-struct TypeNameAnnotation: ASTAnnotation
-{
-	/// Type declared by this type name, i.e. type of a variable where this type name is used.
-	/// Set during reference resolution stage.
-	Type const* type = nullptr;
-};
-
-struct IdentifierPathAnnotation: ASTAnnotation
-{
-	/// Referenced declaration, set during reference resolution stage.
-	Declaration const* referencedDeclaration = nullptr;
-	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
-	util::SetOnce<VirtualLookup> requiredLookup;
-
-	/// Declaration of each path element.
-	std::vector<Declaration const*> pathDeclarations;
-};
-
-struct ExpressionAnnotation: ASTAnnotation
-{
-	/// Inferred type of the expression.
-	Type const* type = nullptr;
-	/// Whether the expression is a constant variable
-	util::SetOnce<bool> isConstant;
-	/// Whether the expression is pure, i.e. compile-time constant.
-	util::SetOnce<bool> isPure;
-	/// Whether it is an LValue (i.e. something that can be assigned to).
-	util::SetOnce<bool> isLValue;
-	/// Whether the expression is used in a context where the LValue is actually required.
-	bool willBeWrittenTo = false;
-	/// Whether the expression is an lvalue that is only assigned.
-	/// Would be false for --, ++, delete, +=, -=, ....
-	/// Only relevant if isLvalue == true
-	bool lValueOfOrdinaryAssignment = false;
-
-	/// Types and - if given - names of arguments if the expr. is a function
-	/// that is called, used for overload resolution
-	std::optional<FuncCallArguments> arguments;
-
-	/// True if the expression consists solely of the name of the function and the function is called immediately
-	/// instead of being stored or processed. The name may be qualified with the name of a contract, library
-	/// module, etc., that clarifies the scope. For example: `m.L.f()`, where `m` is a module, `L` is a library
-	/// and `f` is a function is a direct call. This means that the function to be called is known at compilation
-	/// time and it's not necessary to rely on any runtime dispatch mechanism to resolve it.
-	/// Note that even the simplest expressions, like `(f)()`, result in an indirect call even if they consist of
-	/// values known at compilation time.
-	bool calledDirectly = false;
-};
-
-struct IdentifierAnnotation: ExpressionAnnotation
-{
-	/// Referenced declaration, set at latest during overload resolution stage.
-	Declaration const* referencedDeclaration = nullptr;
-	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
-	util::SetOnce<VirtualLookup> requiredLookup;
-	/// List of possible declarations it could refer to (can contain duplicates).
-	std::vector<Declaration const*> candidateDeclarations;
-	/// List of possible declarations it could refer to.
-	std::vector<Declaration const*> overloadedDeclarations;
-};
-
-struct MemberAccessAnnotation: ExpressionAnnotation
-{
-	/// Referenced declaration, set at latest during overload resolution stage.
-	Declaration const* referencedDeclaration = nullptr;
-	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
-	util::SetOnce<VirtualLookup> requiredLookup;
-};
-
-struct OperationAnnotation: ExpressionAnnotation
-{
-	util::SetOnce<FunctionDefinition const*> userDefinedFunction;
-};
-
-struct BinaryOperationAnnotation: OperationAnnotation
-{
-	/// The common type that is used for the operation, not necessarily the result type (which
-	/// e.g. for comparisons is bool).
-	Type const* commonType = nullptr;
-};
-
-enum class FunctionCallKind
-{
-	FunctionCall,
-	TypeConversion,
-	StructConstructorCall
-};
-
-struct FunctionCallAnnotation: ExpressionAnnotation
-{
-	util::SetOnce<FunctionCallKind> kind;
-	/// If true, this is the external call of a try statement.
-	bool tryCall = false;
-};
-
-}
diff --git a/libsolidity/ast/ASTEnums.h b/libsolidity/ast/ASTEnums.h
deleted file mode 100644
index 87f9817c3c5b..000000000000
--- a/libsolidity/ast/ASTEnums.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Enums for AST classes.
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-#include <libsolidity/ast/ASTForward.h>
-
-#include <string>
-
-namespace solidity::frontend
-{
-
-/// Possible lookups for function resolving
-enum class VirtualLookup { Static, Virtual, Super };
-
-// How a function can mutate the EVM state.
-enum class StateMutability { Pure, View, NonPayable, Payable };
-
-/// Visibility ordered from restricted to unrestricted.
-enum class Visibility { Default, Private, Internal, Public, External };
-
-enum class Arithmetic { Checked, Wrapping };
-
-inline std::string stateMutabilityToString(StateMutability const& _stateMutability)
-{
-	switch (_stateMutability)
-	{
-	case StateMutability::Pure:
-		return "pure";
-	case StateMutability::View:
-		return "view";
-	case StateMutability::NonPayable:
-		return "nonpayable";
-	case StateMutability::Payable:
-		return "payable";
-	default:
-		solAssert(false, "Unknown state mutability.");
-	}
-}
-
-class Type;
-
-/// Container for function call parameter types & names
-struct FuncCallArguments
-{
-	/// Types of arguments
-	std::vector<Type const*> types;
-	/// Names of the arguments if given, otherwise unset
-	std::vector<ASTPointer<ASTString>> names;
-
-	size_t numArguments() const { return types.size(); }
-	size_t numNames() const { return names.size(); }
-	bool hasNamedArguments() const { return !names.empty(); }
-};
-
-enum class ContractKind { Interface, Contract, Library };
-
-}
diff --git a/libsolidity/ast/ASTForward.h b/libsolidity/ast/ASTForward.h
deleted file mode 100644
index 79e6a4ecf217..000000000000
--- a/libsolidity/ast/ASTForward.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Forward-declarations of AST classes.
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-
-// Forward-declare all AST node types and related enums.
-
-namespace solidity::langutil
-{
-enum class Token : unsigned int;
-}
-
-namespace solidity::frontend
-{
-
-class ASTNode;
-class ScopeOpener;
-class SourceUnit;
-class PragmaDirective;
-class ImportDirective;
-class Declaration;
-class CallableDeclaration;
-class OverrideSpecifier;
-class ContractDefinition;
-class InheritanceSpecifier;
-class UsingForDirective;
-class StructDefinition;
-class EnumDefinition;
-class EnumValue;
-class UserDefinedValueTypeDefinition;
-class ParameterList;
-class FunctionDefinition;
-class VariableDeclaration;
-class ModifierDefinition;
-class ModifierInvocation;
-class EventDefinition;
-class ErrorDefinition;
-class MagicVariableDeclaration;
-class TypeName;
-class ElementaryTypeName;
-class UserDefinedTypeName;
-class FunctionTypeName;
-class Mapping;
-class ArrayTypeName;
-class InlineAssembly;
-class Statement;
-class Block;
-class PlaceholderStatement;
-class IfStatement;
-class TryCatchClause;
-class TryStatement;
-class BreakableStatement;
-class WhileStatement;
-class ForStatement;
-class Continue;
-class Break;
-class Return;
-class Throw;
-class EmitStatement;
-class VariableDeclarationStatement;
-class ExpressionStatement;
-class Expression;
-class Conditional;
-class Assignment;
-class TupleExpression;
-class UnaryOperation;
-class BinaryOperation;
-class FunctionCall;
-class NewExpression;
-class MemberAccess;
-class IndexAccess;
-class PrimaryExpression;
-class Identifier;
-class ElementaryTypeNameExpression;
-class Literal;
-class StructuredDocumentation;
-
-class VariableScope;
-
-template <class T>
-struct ASTCompareByID
-{
-	using is_transparent = void;
-
-	bool operator()(T const* _lhs, T const* _rhs) const
-	{
-		return _lhs->id() < _rhs->id();
-	}
-	bool operator()(T const* _lhs, int64_t _rhs) const
-	{
-		return _lhs->id() < _rhs;
-	}
-	bool operator()(int64_t _lhs, T const* _rhs) const
-	{
-		return _lhs < _rhs->id();
-	}
-};
-
-// Used as pointers to AST nodes, to be replaced by more clever pointers, e.g. pointers which do
-// not do reference counting but point to a special memory area that is completely released
-// explicitly.
-template <class T>
-using ASTPointer = std::shared_ptr<T>;
-
-using ASTString = std::string;
-
-}
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
deleted file mode 100644
index 98a368d1958f..000000000000
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Converts the AST into json format
- */
-
-#include <libsolidity/ast/ASTJsonExporter.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libyul/AsmJsonConverter.h>
-#include <libyul/AST.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libsolutil/JSON.h>
-#include <libsolutil/UTF8.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
-#include <libsolutil/Keccak256.h>
-
-#include <boost/algorithm/string/join.hpp>
-
-#include <utility>
-#include <vector>
-#include <algorithm>
-#include <limits>
-#include <type_traits>
-#include <range/v3/view/map.hpp>
-
-using namespace std::string_literals;
-using namespace solidity::langutil;
-
-namespace
-{
-
-template<typename V, template<typename> typename C>
-void addIfSet(std::vector<std::pair<std::string, Json::Value>>& _attributes, std::string const& _name, C<V> const& _value)
-{
-	if constexpr (std::is_same_v<C<V>, solidity::util::SetOnce<V>>)
-	{
-		if (!_value.set())
-			return;
-	}
-	else if constexpr (std::is_same_v<C<V>, std::optional<V>>)
-	{
-		if (!_value.has_value())
-			return;
-	}
-
-	_attributes.emplace_back(_name, *_value);
-}
-
-}
-
-namespace solidity::frontend
-{
-
-ASTJsonExporter::ASTJsonExporter(CompilerStack::State _stackState, std::map<std::string, unsigned> _sourceIndices):
-	m_stackState(_stackState),
-	m_sourceIndices(std::move(_sourceIndices))
-{
-}
-
-
-void ASTJsonExporter::setJsonNode(
-	ASTNode const& _node,
-	std::string const& _nodeName,
-	std::initializer_list<std::pair<std::string, Json::Value>>&& _attributes
-)
-{
-	ASTJsonExporter::setJsonNode(
-		_node,
-		_nodeName,
-		std::vector<std::pair<std::string, Json::Value>>(std::move(_attributes))
-	);
-}
-
-void ASTJsonExporter::setJsonNode(
-	ASTNode const& _node,
-	std::string const& _nodeType,
-	std::vector<std::pair<std::string, Json::Value>>&& _attributes
-)
-{
-	m_currentValue = Json::objectValue;
-	m_currentValue["id"] = nodeId(_node);
-	m_currentValue["src"] = sourceLocationToString(_node.location());
-	if (auto const* documented = dynamic_cast<Documented const*>(&_node))
-		if (documented->documentation())
-			m_currentValue["documentation"] = *documented->documentation();
-	m_currentValue["nodeType"] = _nodeType;
-	for (auto& e: _attributes)
-		m_currentValue[e.first] = std::move(e.second);
-}
-
-std::optional<size_t> ASTJsonExporter::sourceIndexFromLocation(SourceLocation const& _location) const
-{
-	if (_location.sourceName && m_sourceIndices.count(*_location.sourceName))
-		return m_sourceIndices.at(*_location.sourceName);
-	else
-		return std::nullopt;
-}
-
-std::string ASTJsonExporter::sourceLocationToString(SourceLocation const& _location) const
-{
-	std::optional<size_t> sourceIndexOpt = sourceIndexFromLocation(_location);
-	int length = -1;
-	if (_location.start >= 0 && _location.end >= 0)
-		length = _location.end - _location.start;
-	return std::to_string(_location.start) + ":" + std::to_string(length) + ":" + (sourceIndexOpt.has_value() ? std::to_string(sourceIndexOpt.value()) : "-1");
-}
-
-Json::Value ASTJsonExporter::sourceLocationsToJson(std::vector<SourceLocation> const& _sourceLocations) const
-{
-	Json::Value locations = Json::arrayValue;
-
-	for (SourceLocation const& location: _sourceLocations)
-		locations.append(sourceLocationToString(location));
-
-	return locations;
-}
-
-std::string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
-{
-	return boost::algorithm::join(_namePath, "."s);
-}
-
-Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation)
-{
-	Json::Value typeDescriptions(Json::objectValue);
-	typeDescriptions["typeString"] = _tp ? Json::Value(_tp->toString(_withoutDataLocation)) : Json::nullValue;
-	typeDescriptions["typeIdentifier"] = _tp ? Json::Value(_tp->identifier()) : Json::nullValue;
-	return typeDescriptions;
-
-}
-Json::Value ASTJsonExporter::typePointerToJson(std::optional<FuncCallArguments> const& _tps)
-{
-	if (_tps)
-	{
-		Json::Value arguments(Json::arrayValue);
-		for (auto const& tp: _tps->types)
-			appendMove(arguments, typePointerToJson(tp));
-		return arguments;
-	}
-	else
-		return Json::nullValue;
-}
-
-void ASTJsonExporter::appendExpressionAttributes(
-	std::vector<std::pair<std::string, Json::Value>>& _attributes,
-	ExpressionAnnotation const& _annotation
-)
-{
-	std::vector<std::pair<std::string, Json::Value>> exprAttributes = {
-		std::make_pair("typeDescriptions", typePointerToJson(_annotation.type)),
-		std::make_pair("argumentTypes", typePointerToJson(_annotation.arguments))
-	};
-
-	addIfSet(exprAttributes, "isLValue", _annotation.isLValue);
-	addIfSet(exprAttributes, "isPure", _annotation.isPure);
-	addIfSet(exprAttributes, "isConstant", _annotation.isConstant);
-
-	if (m_stackState > CompilerStack::State::ParsedAndImported)
-		exprAttributes.emplace_back("lValueRequested", _annotation.willBeWrittenTo);
-
-	_attributes += exprAttributes;
-}
-
-Json::Value ASTJsonExporter::inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
-{
-	Json::Value tuple(Json::objectValue);
-	tuple["src"] = sourceLocationToString(nativeLocationOf(*_info.first));
-	tuple["declaration"] = idOrNull(_info.second.declaration);
-	tuple["isSlot"] = Json::Value(_info.second.suffix == "slot");
-	tuple["isOffset"] = Json::Value(_info.second.suffix == "offset");
-
-	if (!_info.second.suffix.empty())
-		tuple["suffix"] = Json::Value(_info.second.suffix);
-
-	tuple["valueSize"] = Json::Value(Json::LargestUInt(_info.second.valueSize));
-
-	return tuple;
-}
-
-void ASTJsonExporter::print(std::ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format)
-{
-	_stream << util::jsonPrint(toJson(_node), _format);
-}
-
-Json::Value ASTJsonExporter::toJson(ASTNode const& _node)
-{
-	_node.accept(*this);
-	return util::removeNullMembers(std::move(m_currentValue));
-}
-
-bool ASTJsonExporter::visit(SourceUnit const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("license", _node.licenseString() ? Json::Value(*_node.licenseString()) : Json::nullValue),
-		std::make_pair("nodes", toJson(_node.nodes())),
-	};
-
-	if (_node.experimentalSolidity())
-		attributes.emplace_back("experimentalSolidity", Json::Value(_node.experimentalSolidity()));
-
-	if (_node.annotation().exportedSymbols.set())
-	{
-		Json::Value exportedSymbols = Json::objectValue;
-		for (auto const& sym: *_node.annotation().exportedSymbols)
-		{
-			exportedSymbols[sym.first] = Json::arrayValue;
-			for (Declaration const* overload: sym.second)
-				exportedSymbols[sym.first].append(nodeId(*overload));
-		}
-
-		attributes.emplace_back("exportedSymbols", exportedSymbols);
-	};
-
-	addIfSet(attributes, "absolutePath", _node.annotation().path);
-
-	setJsonNode(_node, "SourceUnit", std::move(attributes));
-
-	return false;
-}
-
-bool ASTJsonExporter::visit(PragmaDirective const& _node)
-{
-	Json::Value literals(Json::arrayValue);
-	for (auto const& literal: _node.literals())
-		literals.append(literal);
-	setJsonNode(_node, "PragmaDirective", {
-		std::make_pair("literals", std::move(literals))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(ImportDirective const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("file", _node.path()),
-		std::make_pair("sourceUnit", idOrNull(_node.annotation().sourceUnit)),
-		std::make_pair("scope", idOrNull(_node.scope()))
-	};
-
-	addIfSet(attributes, "absolutePath", _node.annotation().absolutePath);
-
-	attributes.emplace_back("unitAlias", _node.name());
-	attributes.emplace_back("nameLocation", Json::Value(sourceLocationToString(_node.nameLocation())));
-
-	Json::Value symbolAliases(Json::arrayValue);
-	for (auto const& symbolAlias: _node.symbolAliases())
-	{
-		Json::Value tuple(Json::objectValue);
-		solAssert(symbolAlias.symbol, "");
-		tuple["foreign"] = toJson(*symbolAlias.symbol);
-		tuple["local"] =  symbolAlias.alias ? Json::Value(*symbolAlias.alias) : Json::nullValue;
-		tuple["nameLocation"] = sourceLocationToString(_node.nameLocation());
-		symbolAliases.append(tuple);
-	}
-	attributes.emplace_back("symbolAliases", std::move(symbolAliases));
-	setJsonNode(_node, "ImportDirective", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(ContractDefinition const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("contractKind", contractKind(_node.contractKind())),
-		std::make_pair("abstract", _node.abstract()),
-		std::make_pair("baseContracts", toJson(_node.baseContracts())),
-		std::make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies | ranges::views::keys)),
-		// Do not require call graph because the AST is also created for incorrect sources.
-		std::make_pair("usedEvents", getContainerIds(_node.interfaceEvents(false))),
-		std::make_pair("usedErrors", getContainerIds(_node.interfaceErrors(false))),
-		std::make_pair("nodes", toJson(_node.subNodes())),
-		std::make_pair("scope", idOrNull(_node.scope()))
-	};
-	addIfSet(attributes, "canonicalName", _node.annotation().canonicalName);
-
-	if (_node.annotation().unimplementedDeclarations.has_value())
-		attributes.emplace_back("fullyImplemented", _node.annotation().unimplementedDeclarations->empty());
-	if (!_node.annotation().linearizedBaseContracts.empty())
-		attributes.emplace_back("linearizedBaseContracts", getContainerIds(_node.annotation().linearizedBaseContracts));
-
-	if (!_node.annotation().internalFunctionIDs.empty())
-	{
-		Json::Value internalFunctionIDs(Json::objectValue);
-		for (auto const& [functionDefinition, internalFunctionID]: _node.annotation().internalFunctionIDs)
-			internalFunctionIDs[std::to_string(functionDefinition->id())] = internalFunctionID;
-		attributes.emplace_back("internalFunctionIDs", std::move(internalFunctionIDs));
-	}
-
-	setJsonNode(_node, "ContractDefinition", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(IdentifierPath const& _node)
-{
-	Json::Value nameLocations = Json::arrayValue;
-
-	for (SourceLocation location: _node.pathLocations())
-		nameLocations.append(sourceLocationToString(location));
-
-	setJsonNode(_node, "IdentifierPath", {
-		std::make_pair("name", namePathToString(_node.path())),
-		std::make_pair("nameLocations", nameLocations),
-		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(InheritanceSpecifier const& _node)
-{
-	setJsonNode(_node, "InheritanceSpecifier", {
-		std::make_pair("baseName", toJson(_node.name())),
-		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(UsingForDirective const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
-	};
-
-	if (_node.usesBraces())
-	{
-		Json::Value functionList;
-		for (auto&& [function, op]: _node.functionsAndOperators())
-		{
-			Json::Value functionNode;
-			if (!op.has_value())
-				functionNode["function"] = toJson(*function);
-			else
-			{
-				functionNode["definition"] = toJson(*function);
-				functionNode["operator"] = std::string(TokenTraits::toString(*op));
-			}
-			functionList.append(std::move(functionNode));
-		}
-		attributes.emplace_back("functionList", std::move(functionList));
-	}
-	else
-	{
-		auto const& functionAndOperators = _node.functionsAndOperators();
-		solAssert(_node.functionsAndOperators().size() == 1);
-		solAssert(!functionAndOperators.front().second.has_value());
-		attributes.emplace_back("libraryName", toJson(*(functionAndOperators.front().first)));
-	}
-	attributes.emplace_back("global", _node.global());
-
-	setJsonNode(_node, "UsingForDirective", std::move(attributes));
-
-	return false;
-}
-
-bool ASTJsonExporter::visit(StructDefinition const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		std::make_pair("members", toJson(_node.members())),
-		std::make_pair("scope", idOrNull(_node.scope()))
-	};
-
-	addIfSet(attributes,"canonicalName", _node.annotation().canonicalName);
-
-	setJsonNode(_node, "StructDefinition", std::move(attributes));
-
-	return false;
-}
-
-bool ASTJsonExporter::visit(EnumDefinition const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("members", toJson(_node.members()))
-	};
-
-	addIfSet(attributes,"canonicalName", _node.annotation().canonicalName);
-
-	setJsonNode(_node, "EnumDefinition", std::move(attributes));
-
-	return false;
-}
-
-bool ASTJsonExporter::visit(EnumValue const& _node)
-{
-	setJsonNode(_node, "EnumValue", {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(UserDefinedValueTypeDefinition const& _node)
-{
-	solAssert(_node.underlyingType(), "");
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("underlyingType", toJson(*_node.underlyingType()))
-	};
-	addIfSet(attributes, "canonicalName", _node.annotation().canonicalName);
-
-	setJsonNode(_node, "UserDefinedValueTypeDefinition", std::move(attributes));
-
-	return false;
-}
-
-bool ASTJsonExporter::visit(ParameterList const& _node)
-{
-	setJsonNode(_node, "ParameterList", {
-		std::make_pair("parameters", toJson(_node.parameters()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(OverrideSpecifier const& _node)
-{
-	setJsonNode(_node, "OverrideSpecifier", {
-		std::make_pair("overrides", toJson(_node.overrides()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(FunctionDefinition const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("kind", _node.isFree() ? "freeFunction" : TokenTraits::toString(_node.kind())),
-		std::make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
-		std::make_pair("virtual", _node.markedVirtual()),
-		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
-		std::make_pair("parameters", toJson(_node.parameterList())),
-		std::make_pair("returnParameters", toJson(*_node.returnParameterList())),
-		std::make_pair("modifiers", toJson(_node.modifiers())),
-		std::make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json::nullValue),
-		std::make_pair("implemented", _node.isImplemented()),
-		std::make_pair("scope", idOrNull(_node.scope()))
-	};
-
-	std::optional<Visibility> visibility;
-	if (_node.isConstructor())
-	{
-		if (_node.annotation().contract)
-			visibility = _node.annotation().contract->abstract() ? Visibility::Internal : Visibility::Public;
-	}
-	else
-		visibility = _node.visibility();
-
-	if (visibility)
-		attributes.emplace_back("visibility", Declaration::visibilityToString(*visibility));
-
-	if (_node.isPartOfExternalInterface() && m_stackState > CompilerStack::State::ParsedAndImported)
-		attributes.emplace_back("functionSelector", _node.externalIdentifierHex());
-	if (!_node.annotation().baseFunctions.empty())
-		attributes.emplace_back(std::make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
-
-	setJsonNode(_node, "FunctionDefinition", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(VariableDeclaration const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("typeName", toJson(_node.typeName())),
-		std::make_pair("constant", _node.isConstant()),
-		std::make_pair("mutability", VariableDeclaration::mutabilityToString(_node.mutability())),
-		std::make_pair("stateVariable", _node.isStateVariable()),
-		std::make_pair("storageLocation", location(_node.referenceLocation())),
-		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
-		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		std::make_pair("value", _node.value() ? toJson(*_node.value()) : Json::nullValue),
-		std::make_pair("scope", idOrNull(_node.scope())),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
-	};
-	if (_node.isStateVariable() && _node.isPublic())
-		attributes.emplace_back("functionSelector", _node.externalIdentifierHex());
-	if (_node.isStateVariable() && _node.documentation())
-		attributes.emplace_back("documentation", toJson(*_node.documentation()));
-	if (m_inEvent)
-		attributes.emplace_back("indexed", _node.isIndexed());
-	if (!_node.annotation().baseFunctions.empty())
-		attributes.emplace_back(std::make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
-	setJsonNode(_node, "VariableDeclaration", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(ModifierDefinition const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		std::make_pair("parameters", toJson(_node.parameterList())),
-		std::make_pair("virtual", _node.markedVirtual()),
-		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
-		std::make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json::nullValue)
-	};
-	if (!_node.annotation().baseFunctions.empty())
-		attributes.emplace_back(std::make_pair("baseModifiers", getContainerIds(_node.annotation().baseFunctions, true)));
-	setJsonNode(_node, "ModifierDefinition", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(ModifierInvocation const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes{
-		std::make_pair("modifierName", toJson(_node.name())),
-		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
-	};
-	if (Declaration const* declaration = _node.name().annotation().referencedDeclaration)
-	{
-		if (dynamic_cast<ModifierDefinition const*>(declaration))
-			attributes.emplace_back("kind", "modifierInvocation");
-		else if (dynamic_cast<ContractDefinition const*>(declaration))
-			attributes.emplace_back("kind", "baseConstructorSpecifier");
-	}
-	setJsonNode(_node, "ModifierInvocation", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(EventDefinition const& _node)
-{
-	m_inEvent = true;
-	std::vector<std::pair<std::string, Json::Value>> _attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("parameters", toJson(_node.parameterList())),
-		std::make_pair("anonymous", _node.isAnonymous())
-	};
-	if (m_stackState >= CompilerStack::State::AnalysisSuccessful)
-			_attributes.emplace_back(
-				std::make_pair(
-					"eventSelector",
-					toHex(u256(util::h256::Arith(util::keccak256(_node.functionType(true)->externalSignature()))))
-				));
-
-	setJsonNode(_node, "EventDefinition", std::move(_attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(ErrorDefinition const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> _attributes = {
-		std::make_pair("name", _node.name()),
-		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		std::make_pair("parameters", toJson(_node.parameterList()))
-	};
-	if (m_stackState >= CompilerStack::State::AnalysisSuccessful)
-		_attributes.emplace_back(std::make_pair("errorSelector", _node.functionType(true)->externalIdentifierHex()));
-
-	setJsonNode(_node, "ErrorDefinition", std::move(_attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(ElementaryTypeName const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("name", _node.typeName().toString()),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
-	};
-
-	if (_node.stateMutability())
-		attributes.emplace_back(std::make_pair("stateMutability", stateMutabilityToString(*_node.stateMutability())));
-
-	setJsonNode(_node, "ElementaryTypeName", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(UserDefinedTypeName const& _node)
-{
-	setJsonNode(_node, "UserDefinedTypeName", {
-		std::make_pair("pathNode", toJson(_node.pathNode())),
-		std::make_pair("referencedDeclaration", idOrNull(_node.pathNode().annotation().referencedDeclaration)),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(FunctionTypeName const& _node)
-{
-	setJsonNode(_node, "FunctionTypeName", {
-		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		std::make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
-		std::make_pair("parameterTypes", toJson(*_node.parameterTypeList())),
-		std::make_pair("returnParameterTypes", toJson(*_node.returnParameterTypeList())),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(Mapping const& _node)
-{
-	setJsonNode(_node, "Mapping", {
-		std::make_pair("keyType", toJson(_node.keyType())),
-		std::make_pair("keyName", _node.keyName()),
-		std::make_pair("keyNameLocation", sourceLocationToString(_node.keyNameLocation())),
-		std::make_pair("valueType", toJson(_node.valueType())),
-		std::make_pair("valueName", _node.valueName()),
-		std::make_pair("valueNameLocation", sourceLocationToString(_node.valueNameLocation())),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(ArrayTypeName const& _node)
-{
-	setJsonNode(_node, "ArrayTypeName", {
-		std::make_pair("baseType", toJson(_node.baseType())),
-		std::make_pair("length", toJsonOrNull(_node.length())),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(InlineAssembly const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> externalReferences;
-
-	for (auto const& it: _node.annotation().externalReferences)
-		if (it.first)
-			externalReferences.emplace_back(std::make_pair(
-				it.first->name.str(),
-				inlineAssemblyIdentifierToJson(it)
-			));
-
-	Json::Value externalReferencesJson = Json::arrayValue;
-
-	std::sort(externalReferences.begin(), externalReferences.end());
-	for (Json::Value& it: externalReferences | ranges::views::values)
-		externalReferencesJson.append(std::move(it));
-
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("AST", Json::Value(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations()))),
-		std::make_pair("externalReferences", std::move(externalReferencesJson)),
-		std::make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
-	};
-
-	if (_node.flags())
-	{
-		Json::Value flags(Json::arrayValue);
-		for (auto const& flag: *_node.flags())
-			if (flag)
-				flags.append(*flag);
-			else
-				flags.append(Json::nullValue);
-		attributes.emplace_back(std::make_pair("flags", std::move(flags)));
-	}
-	setJsonNode(_node, "InlineAssembly", std::move(attributes));
-
-	return false;
-}
-
-bool ASTJsonExporter::visit(Block const& _node)
-{
-	setJsonNode(_node, _node.unchecked() ? "UncheckedBlock" : "Block", {
-		std::make_pair("statements", toJson(_node.statements()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(PlaceholderStatement const& _node)
-{
-	setJsonNode(_node, "PlaceholderStatement", {});
-	return false;
-}
-
-bool ASTJsonExporter::visit(IfStatement const& _node)
-{
-	setJsonNode(_node, "IfStatement", {
-		std::make_pair("condition", toJson(_node.condition())),
-		std::make_pair("trueBody", toJson(_node.trueStatement())),
-		std::make_pair("falseBody", toJsonOrNull(_node.falseStatement()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(TryCatchClause const& _node)
-{
-	setJsonNode(_node, "TryCatchClause", {
-		std::make_pair("errorName", _node.errorName()),
-		std::make_pair("parameters", toJsonOrNull(_node.parameters())),
-		std::make_pair("block", toJson(_node.block()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(TryStatement const& _node)
-{
-	setJsonNode(_node, "TryStatement", {
-		std::make_pair("externalCall", toJson(_node.externalCall())),
-		std::make_pair("clauses", toJson(_node.clauses()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(WhileStatement const& _node)
-{
-	setJsonNode(
-		_node,
-		_node.isDoWhile() ? "DoWhileStatement" : "WhileStatement",
-		{
-			std::make_pair("condition", toJson(_node.condition())),
-			std::make_pair("body", toJson(_node.body()))
-		}
-	);
-	return false;
-}
-
-bool ASTJsonExporter::visit(ForStatement const& _node)
-{
-
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("initializationExpression", toJsonOrNull(_node.initializationExpression())),
-		std::make_pair("condition", toJsonOrNull(_node.condition())),
-		std::make_pair("loopExpression", toJsonOrNull(_node.loopExpression())),
-		std::make_pair("body", toJson(_node.body()))
-	};
-
-	if (_node.annotation().isSimpleCounterLoop.set())
-		attributes.emplace_back("isSimpleCounterLoop", *_node.annotation().isSimpleCounterLoop);
-
-	setJsonNode(_node, "ForStatement", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(Continue const& _node)
-{
-	setJsonNode(_node, "Continue", {});
-	return false;
-}
-
-bool ASTJsonExporter::visit(Break const& _node)
-{
-	setJsonNode(_node, "Break", {});
-	return false;
-}
-
-bool ASTJsonExporter::visit(Return const& _node)
-{
-	setJsonNode(_node, "Return", {
-		std::make_pair("expression", toJsonOrNull(_node.expression())),
-		std::make_pair("functionReturnParameters", idOrNull(_node.annotation().functionReturnParameters))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(Throw const& _node)
-{
-	setJsonNode(_node, "Throw", {});
-	return false;
-}
-
-bool ASTJsonExporter::visit(EmitStatement const& _node)
-{
-	setJsonNode(_node, "EmitStatement", {
-		std::make_pair("eventCall", toJson(_node.eventCall()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(RevertStatement const& _node)
-{
-	setJsonNode(_node, "RevertStatement", {
-		std::make_pair("errorCall", toJson(_node.errorCall()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(VariableDeclarationStatement const& _node)
-{
-	Json::Value varDecs(Json::arrayValue);
-	for (auto const& v: _node.declarations())
-		appendMove(varDecs, idOrNull(v.get()));
-	setJsonNode(_node, "VariableDeclarationStatement", {
-		std::make_pair("assignments", std::move(varDecs)),
-		std::make_pair("declarations", toJson(_node.declarations())),
-		std::make_pair("initialValue", toJsonOrNull(_node.initialValue()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(ExpressionStatement const& _node)
-{
-	setJsonNode(_node, "ExpressionStatement", {
-		std::make_pair("expression", toJson(_node.expression()))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(Conditional const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("condition", toJson(_node.condition())),
-		std::make_pair("trueExpression", toJson(_node.trueExpression())),
-		std::make_pair("falseExpression", toJson(_node.falseExpression()))
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "Conditional", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(Assignment const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("operator", TokenTraits::toString(_node.assignmentOperator())),
-		std::make_pair("leftHandSide", toJson(_node.leftHandSide())),
-		std::make_pair("rightHandSide", toJson(_node.rightHandSide()))
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "Assignment", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(TupleExpression const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("isInlineArray", Json::Value(_node.isInlineArray())),
-		std::make_pair("components", toJson(_node.components())),
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "TupleExpression", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(UnaryOperation const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("prefix", _node.isPrefixOperation()),
-		std::make_pair("operator", TokenTraits::toString(_node.getOperator())),
-		std::make_pair("subExpression", toJson(_node.subExpression()))
-	};
-	// NOTE: This annotation is guaranteed to be set but only if we didn't stop at the parsing stage.
-	if (_node.annotation().userDefinedFunction.set() && *_node.annotation().userDefinedFunction != nullptr)
-		attributes.emplace_back("function", nodeId(**_node.annotation().userDefinedFunction));
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "UnaryOperation", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(BinaryOperation const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("operator", TokenTraits::toString(_node.getOperator())),
-		std::make_pair("leftExpression", toJson(_node.leftExpression())),
-		std::make_pair("rightExpression", toJson(_node.rightExpression())),
-		std::make_pair("commonType", typePointerToJson(_node.annotation().commonType)),
-	};
-	// NOTE: This annotation is guaranteed to be set but only if we didn't stop at the parsing stage.
-	if (_node.annotation().userDefinedFunction.set() && *_node.annotation().userDefinedFunction != nullptr)
-		attributes.emplace_back("function", nodeId(**_node.annotation().userDefinedFunction));
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "BinaryOperation", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(FunctionCall const& _node)
-{
-	Json::Value names(Json::arrayValue);
-	for (auto const& name: _node.names())
-		names.append(Json::Value(*name));
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("expression", toJson(_node.expression())),
-		std::make_pair("names", std::move(names)),
-		std::make_pair("nameLocations", sourceLocationsToJson(_node.nameLocations())),
-		std::make_pair("arguments", toJson(_node.arguments())),
-		std::make_pair("tryCall", _node.annotation().tryCall)
-	};
-
-	if (_node.annotation().kind.set())
-	{
-		FunctionCallKind nodeKind = *_node.annotation().kind;
-		attributes.emplace_back("kind", functionCallKind(nodeKind));
-	}
-
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "FunctionCall", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(FunctionCallOptions const& _node)
-{
-	Json::Value names(Json::arrayValue);
-	for (auto const& name: _node.names())
-		names.append(Json::Value(*name));
-
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("expression", toJson(_node.expression())),
-		std::make_pair("names", std::move(names)),
-		std::make_pair("options", toJson(_node.options())),
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-
-	setJsonNode(_node, "FunctionCallOptions", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(NewExpression const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("typeName", toJson(_node.typeName()))
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "NewExpression", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(MemberAccess const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("memberName", _node.memberName()),
-		std::make_pair("memberLocation", Json::Value(sourceLocationToString(_node.memberLocation()))),
-		std::make_pair("expression", toJson(_node.expression())),
-		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "MemberAccess", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(IndexAccess const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("baseExpression", toJson(_node.baseExpression())),
-		std::make_pair("indexExpression", toJsonOrNull(_node.indexExpression())),
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "IndexAccess", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(IndexRangeAccess const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("baseExpression", toJson(_node.baseExpression())),
-		std::make_pair("startExpression", toJsonOrNull(_node.startExpression())),
-		std::make_pair("endExpression", toJsonOrNull(_node.endExpression())),
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "IndexRangeAccess", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(Identifier const& _node)
-{
-	Json::Value overloads(Json::arrayValue);
-	for (auto const& dec: _node.annotation().overloadedDeclarations)
-		overloads.append(nodeId(*dec));
-	setJsonNode(_node, "Identifier", {
-		std::make_pair("name", _node.name()),
-		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
-		std::make_pair("overloadedDeclarations", overloads),
-		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type)),
-		std::make_pair("argumentTypes", typePointerToJson(_node.annotation().arguments))
-	});
-	return false;
-}
-
-bool ASTJsonExporter::visit(ElementaryTypeNameExpression const& _node)
-{
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("typeName", toJson(_node.type()))
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "ElementaryTypeNameExpression", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(Literal const& _node)
-{
-	Json::Value value{_node.value()};
-	if (!util::validateUTF8(_node.value()))
-		value = Json::nullValue;
-	Token subdenomination = Token(_node.subDenomination());
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("kind", literalTokenKind(_node.token())),
-		std::make_pair("value", value),
-		std::make_pair("hexValue", util::toHex(util::asBytes(_node.value()))),
-		std::make_pair(
-			"subdenomination",
-			subdenomination == Token::Illegal ?
-			Json::nullValue :
-			Json::Value{TokenTraits::toString(subdenomination)}
-		)
-	};
-	appendExpressionAttributes(attributes, _node.annotation());
-	setJsonNode(_node, "Literal", std::move(attributes));
-	return false;
-}
-
-bool ASTJsonExporter::visit(StructuredDocumentation const& _node)
-{
-	Json::Value text{*_node.text()};
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("text", text)
-	};
-	setJsonNode(_node, "StructuredDocumentation", std::move(attributes));
-	return false;
-}
-
-
-
-void ASTJsonExporter::endVisit(EventDefinition const&)
-{
-	m_inEvent = false;
-}
-
-std::string ASTJsonExporter::location(VariableDeclaration::Location _location)
-{
-	switch (_location)
-	{
-	case VariableDeclaration::Location::Unspecified:
-		return "default";
-	case VariableDeclaration::Location::Storage:
-		return "storage";
-	case VariableDeclaration::Location::Memory:
-		return "memory";
-	case VariableDeclaration::Location::CallData:
-		return "calldata";
-	}
-	// To make the compiler happy
-	return {};
-}
-
-std::string ASTJsonExporter::contractKind(ContractKind _kind)
-{
-	switch (_kind)
-	{
-	case ContractKind::Interface:
-		return "interface";
-	case ContractKind::Contract:
-		return "contract";
-	case ContractKind::Library:
-		return "library";
-	}
-
-	// To make the compiler happy
-	return {};
-}
-
-std::string ASTJsonExporter::functionCallKind(FunctionCallKind _kind)
-{
-	switch (_kind)
-	{
-	case FunctionCallKind::FunctionCall:
-		return "functionCall";
-	case FunctionCallKind::TypeConversion:
-		return "typeConversion";
-	case FunctionCallKind::StructConstructorCall:
-		return "structConstructorCall";
-	default:
-		solAssert(false, "Unknown kind of function call.");
-	}
-}
-
-std::string ASTJsonExporter::literalTokenKind(Token _token)
-{
-	switch (_token)
-	{
-	case Token::Number:
-		return "number";
-	case Token::StringLiteral:
-		return "string";
-	case Token::UnicodeStringLiteral:
-		return "unicodeString";
-	case Token::HexStringLiteral:
-		return "hexString";
-	case Token::TrueLiteral:
-	case Token::FalseLiteral:
-		return "bool";
-	default:
-		solAssert(false, "Unknown kind of literal token.");
-	}
-}
-
-std::string ASTJsonExporter::type(Expression const& _expression)
-{
-	return _expression.annotation().type ? _expression.annotation().type->toString() : "Unknown";
-}
-
-std::string ASTJsonExporter::type(VariableDeclaration const& _varDecl)
-{
-	return _varDecl.annotation().type ? _varDecl.annotation().type->toString() : "Unknown";
-}
-
-}
diff --git a/libsolidity/ast/ASTJsonExporter.h b/libsolidity/ast/ASTJsonExporter.h
deleted file mode 100644
index 71d15ce0a5f2..000000000000
--- a/libsolidity/ast/ASTJsonExporter.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris <lefteris@ethdev.com>
- * @date 2015
- * Converts the AST into json format
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <liblangutil/Exceptions.h>
-
-#include <json/json.h>
-#include <libsolutil/JSON.h>
-
-#include <algorithm>
-#include <optional>
-#include <ostream>
-#include <stack>
-#include <vector>
-
-namespace solidity::langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-
-/**
- * Converter of the AST into JSON format
- */
-class ASTJsonExporter: public ASTConstVisitor
-{
-public:
-	/// Create a converter to JSON for the given abstract syntax tree.
-	/// @a _stackState state of the compiler stack to avoid outputting incomplete data
-	/// @a _sourceIndices is used to abbreviate source names in source locations.
-	explicit ASTJsonExporter(
-		CompilerStack::State _stackState,
-		std::map<std::string, unsigned> _sourceIndices = std::map<std::string, unsigned>()
-	);
-	/// Output the json representation of the AST to _stream.
-	void print(std::ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format);
-	Json::Value toJson(ASTNode const& _node);
-	template <class T>
-	Json::Value toJson(std::vector<ASTPointer<T>> const& _nodes)
-	{
-		Json::Value ret(Json::arrayValue);
-		for (auto const& n: _nodes)
-			if (n)
-				appendMove(ret, toJson(*n));
-			else
-				ret.append(Json::nullValue);
-		return ret;
-	}
-	bool visit(SourceUnit const& _node) override;
-	bool visit(PragmaDirective const& _node) override;
-	bool visit(ImportDirective const& _node) override;
-	bool visit(ContractDefinition const& _node) override;
-	bool visit(IdentifierPath const& _node) override;
-	bool visit(InheritanceSpecifier const& _node) override;
-	bool visit(UsingForDirective const& _node) override;
-	bool visit(StructDefinition const& _node) override;
-	bool visit(EnumDefinition const& _node) override;
-	bool visit(EnumValue const& _node) override;
-	bool visit(UserDefinedValueTypeDefinition const& _node) override;
-	bool visit(ParameterList const& _node) override;
-	bool visit(OverrideSpecifier const& _node) override;
-	bool visit(FunctionDefinition const& _node) override;
-	bool visit(VariableDeclaration const& _node) override;
-	bool visit(ModifierDefinition const& _node) override;
-	bool visit(ModifierInvocation const& _node) override;
-	bool visit(EventDefinition const& _node) override;
-	bool visit(ErrorDefinition const& _node) override;
-	bool visit(ElementaryTypeName const& _node) override;
-	bool visit(UserDefinedTypeName const& _node) override;
-	bool visit(FunctionTypeName const& _node) override;
-	bool visit(Mapping const& _node) override;
-	bool visit(ArrayTypeName const& _node) override;
-	bool visit(InlineAssembly const& _node) override;
-	bool visit(Block const& _node) override;
-	bool visit(PlaceholderStatement const& _node) override;
-	bool visit(IfStatement const& _node) override;
-	bool visit(TryCatchClause const& _node) override;
-	bool visit(TryStatement const& _node) override;
-	bool visit(WhileStatement const& _node) override;
-	bool visit(ForStatement const& _node) override;
-	bool visit(Continue const& _node) override;
-	bool visit(Break const& _node) override;
-	bool visit(Return const& _node) override;
-	bool visit(Throw const& _node) override;
-	bool visit(EmitStatement const& _node) override;
-	bool visit(RevertStatement const& _node) override;
-	bool visit(VariableDeclarationStatement const& _node) override;
-	bool visit(ExpressionStatement const& _node) override;
-	bool visit(Conditional const& _node) override;
-	bool visit(Assignment const& _node) override;
-	bool visit(TupleExpression const& _node) override;
-	bool visit(UnaryOperation const& _node) override;
-	bool visit(BinaryOperation const& _node) override;
-	bool visit(FunctionCall const& _node) override;
-	bool visit(FunctionCallOptions const& _node) override;
-	bool visit(NewExpression const& _node) override;
-	bool visit(MemberAccess const& _node) override;
-	bool visit(IndexAccess const& _node) override;
-	bool visit(IndexRangeAccess const& _node) override;
-	bool visit(Identifier const& _node) override;
-	bool visit(ElementaryTypeNameExpression const& _node) override;
-	bool visit(Literal const& _node) override;
-	bool visit(StructuredDocumentation const& _node) override;
-
-	void endVisit(EventDefinition const&) override;
-
-private:
-	void setJsonNode(
-		ASTNode const& _node,
-		std::string const& _nodeName,
-		std::initializer_list<std::pair<std::string, Json::Value>>&& _attributes
-	);
-	void setJsonNode(
-		ASTNode const& _node,
-		std::string const& _nodeName,
-		std::vector<std::pair<std::string, Json::Value>>&& _attributes
-	);
-	/// Maps source location to an index, if source is valid and a mapping does exist, otherwise returns std::nullopt.
-	std::optional<size_t> sourceIndexFromLocation(langutil::SourceLocation const& _location) const;
-	std::string sourceLocationToString(langutil::SourceLocation const& _location) const;
-	Json::Value sourceLocationsToJson(std::vector<langutil::SourceLocation> const& _sourceLocations) const;
-	static std::string namePathToString(std::vector<ASTString> const& _namePath);
-	static Json::Value idOrNull(ASTNode const* _pt)
-	{
-		return _pt ? Json::Value(nodeId(*_pt)) : Json::nullValue;
-	}
-	Json::Value toJsonOrNull(ASTNode const* _node)
-	{
-		return _node ? toJson(*_node) : Json::nullValue;
-	}
-	Json::Value inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const;
-	static std::string location(VariableDeclaration::Location _location);
-	static std::string contractKind(ContractKind _kind);
-	static std::string functionCallKind(FunctionCallKind _kind);
-	static std::string literalTokenKind(Token _token);
-	static std::string type(Expression const& _expression);
-	static std::string type(VariableDeclaration const& _varDecl);
-	static int64_t nodeId(ASTNode const& _node)
-	{
-		return _node.id();
-	}
-	template<class Container>
-	static Json::Value getContainerIds(Container const& _container, bool _order = false)
-	{
-		std::vector<int64_t> tmp;
-
-		for (auto const& element: _container)
-		{
-			solAssert(element, "");
-			tmp.push_back(nodeId(*element));
-		}
-		if (_order)
-			std::sort(tmp.begin(), tmp.end());
-		Json::Value json(Json::arrayValue);
-
-		for (int64_t val: tmp)
-			json.append(val);
-
-		return json;
-	}
-	static Json::Value typePointerToJson(Type const* _tp, bool _withoutDataLocation = false);
-	static Json::Value typePointerToJson(std::optional<FuncCallArguments> const& _tps);
-	void appendExpressionAttributes(
-		std::vector<std::pair<std::string, Json::Value>> &_attributes,
-		ExpressionAnnotation const& _annotation
-	);
-	static void appendMove(Json::Value& _array, Json::Value&& _value)
-	{
-		solAssert(_array.isArray(), "");
-		_array.append(std::move(_value));
-	}
-
-	CompilerStack::State m_stackState = CompilerStack::State::Empty; ///< Used to only access information that already exists
-	bool m_inEvent = false; ///< whether we are currently inside an event or not
-	Json::Value m_currentValue;
-	std::map<std::string, unsigned> m_sourceIndices;
-};
-
-}
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
deleted file mode 100644
index 6e6dd9eb5eeb..000000000000
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author julius <djudju@protonmail.com>
- * @date 2019
- *Component that imports an AST from json format to the internal format
- */
-
-#include <libsolidity/ast/ASTJsonImporter.h>
-#include <libsolidity/ast/UserDefinableOperators.h>
-
-#include <libyul/AsmJsonImporter.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SourceLocation.h>
-#include <liblangutil/Token.h>
-
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string.hpp>
-
-namespace solidity::frontend
-{
-
-using SourceLocation = langutil::SourceLocation;
-
-template<class T>
-ASTPointer<T> ASTJsonImporter::nullOrCast(Json::Value const& _json)
-{
-	if (_json.isNull())
-		return nullptr;
-	else
-		return std::dynamic_pointer_cast<T>(convertJsonToASTNode(_json));
-}
-
-
-// ============ public ===========================
-
-std::map<std::string, ASTPointer<SourceUnit>> ASTJsonImporter::jsonToSourceUnit(std::map<std::string, Json::Value> const& _sourceList)
-{
-	for (auto const& src: _sourceList)
-		m_sourceNames.emplace_back(std::make_shared<std::string const>(src.first));
-	for (auto const& srcPair: _sourceList)
-	{
-		astAssert(!srcPair.second.isNull());
-		astAssert(member(srcPair.second,"nodeType") == "SourceUnit", "The 'nodeType' of the highest node must be 'SourceUnit'.");
-		m_sourceUnits[srcPair.first] = createSourceUnit(srcPair.second, srcPair.first);
-	}
-	return m_sourceUnits;
-}
-
-// ============ private ===========================
-
-// =========== general creation functions ==============
-template <typename T, typename... Args>
-ASTPointer<T> ASTJsonImporter::createASTNode(Json::Value const& _node, Args&&... _args)
-{
-	astAssert(member(_node, "id").isInt64(), "'id'-field must be 64bit integer.");
-
-	int64_t id = _node["id"].asInt64();
-
-	astAssert(m_usedIDs.insert(id).second, "Found duplicate node ID!");
-
-	auto n = std::make_shared<T>(
-		id,
-		createSourceLocation(_node),
-		std::forward<Args>(_args)...
-	);
-	return n;
-}
-
-SourceLocation const ASTJsonImporter::createSourceLocation(Json::Value const& _node)
-{
-	astAssert(member(_node, "src").isString(), "'src' must be a string");
-
-	return solidity::langutil::parseSourceLocation(_node["src"].asString(), m_sourceNames);
-}
-
-std::optional<std::vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json::Value const& _node) const
-{
-	std::vector<SourceLocation> locations;
-
-	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
-	{
-		for (auto const& val: _node["nameLocations"])
-			locations.emplace_back(langutil::parseSourceLocation(val.asString(), m_sourceNames));
-		return locations;
-	}
-
-	return std::nullopt;
-}
-
-SourceLocation ASTJsonImporter::createNameSourceLocation(Json::Value const& _node)
-{
-	astAssert(member(_node, "nameLocation").isString(), "'nameLocation' must be a string");
-
-	return solidity::langutil::parseSourceLocation(_node["nameLocation"].asString(), m_sourceNames);
-}
-
-SourceLocation ASTJsonImporter::createKeyNameSourceLocation(Json::Value const& _node)
-{
-	astAssert(member(_node, "keyNameLocation").isString(), "'keyNameLocation' must be a string");
-
-	return solidity::langutil::parseSourceLocation(_node["keyNameLocation"].asString(), m_sourceNames);
-}
-
-SourceLocation ASTJsonImporter::createValueNameSourceLocation(Json::Value const& _node)
-{
-	astAssert(member(_node, "valueNameLocation").isString(), "'valueNameLocation' must be a string");
-
-	return solidity::langutil::parseSourceLocation(_node["valueNameLocation"].asString(), m_sourceNames);
-}
-
-template<class T>
-ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _node)
-{
-	ASTPointer<T> ret = std::dynamic_pointer_cast<T>(convertJsonToASTNode(_node));
-	astAssert(ret, "cast of converted json-node must not be nullptr");
-	return ret;
-}
-
-
-ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _json)
-{
-	astAssert(_json["nodeType"].isString() && _json.isMember("id"), "JSON-Node needs to have 'nodeType' and 'id' fields.");
-	std::string nodeType = _json["nodeType"].asString();
-	if (nodeType == "PragmaDirective")
-		return createPragmaDirective(_json);
-	if (nodeType == "ImportDirective")
-		return createImportDirective(_json);
-	if (nodeType == "ContractDefinition")
-		return createContractDefinition(_json);
-	if (nodeType == "IdentifierPath")
-		return createIdentifierPath(_json);
-	if (nodeType == "InheritanceSpecifier")
-		return createInheritanceSpecifier(_json);
-	if (nodeType == "UsingForDirective")
-		return createUsingForDirective(_json);
-	if (nodeType == "StructDefinition")
-		return createStructDefinition(_json);
-	if (nodeType == "EnumDefinition")
-		return createEnumDefinition(_json);
-	if (nodeType == "EnumValue")
-		return createEnumValue(_json);
-	if (nodeType == "UserDefinedValueTypeDefinition")
-		return createUserDefinedValueTypeDefinition(_json);
-	if (nodeType == "ParameterList")
-		return createParameterList(_json);
-	if (nodeType == "OverrideSpecifier")
-		return createOverrideSpecifier(_json);
-	if (nodeType == "FunctionDefinition")
-		return createFunctionDefinition(_json);
-	if (nodeType == "VariableDeclaration")
-		return createVariableDeclaration(_json);
-	if (nodeType == "ModifierDefinition")
-		return createModifierDefinition(_json);
-	if (nodeType == "ModifierInvocation")
-		return createModifierInvocation(_json);
-	if (nodeType == "EventDefinition")
-		return createEventDefinition(_json);
-	if (nodeType == "ErrorDefinition")
-		return createErrorDefinition(_json);
-	if (nodeType == "ElementaryTypeName")
-		return createElementaryTypeName(_json);
-	if (nodeType == "UserDefinedTypeName")
-		return createUserDefinedTypeName(_json);
-	if (nodeType == "FunctionTypeName")
-		return createFunctionTypeName(_json);
-	if (nodeType == "Mapping")
-		return createMapping(_json);
-	if (nodeType == "ArrayTypeName")
-		return createArrayTypeName(_json);
-	if (nodeType == "InlineAssembly")
-		return createInlineAssembly(_json);
-	if (nodeType == "Block")
-		return createBlock(_json, false);
-	if (nodeType == "UncheckedBlock")
-		return createBlock(_json, true);
-	if (nodeType == "PlaceholderStatement")
-		return createPlaceholderStatement(_json);
-	if (nodeType == "IfStatement")
-		return createIfStatement(_json);
-	if (nodeType == "TryCatchClause")
-		return createTryCatchClause(_json);
-	if (nodeType == "TryStatement")
-		return createTryStatement(_json);
-	if (nodeType == "WhileStatement")
-		return createWhileStatement(_json, false);
-	if (nodeType == "DoWhileStatement")
-		return createWhileStatement(_json, true);
-	if (nodeType == "ForStatement")
-		return createForStatement(_json);
-	if (nodeType == "Continue")
-		return createContinue(_json);
-	if (nodeType == "Break")
-		return createBreak(_json);
-	if (nodeType == "Return")
-		return createReturn(_json);
-	if (nodeType == "EmitStatement")
-		return createEmitStatement(_json);
-	if (nodeType == "RevertStatement")
-		return createRevertStatement(_json);
-	if (nodeType == "Throw")
-		return createThrow(_json);
-	if (nodeType == "VariableDeclarationStatement")
-		return createVariableDeclarationStatement(_json);
-	if (nodeType == "ExpressionStatement")
-		return createExpressionStatement(_json);
-	if (nodeType == "Conditional")
-		return createConditional(_json);
-	if (nodeType == "Assignment")
-		return createAssignment(_json);
-	if (nodeType == "TupleExpression")
-		return createTupleExpression(_json);
-	if (nodeType == "UnaryOperation")
-		return createUnaryOperation(_json);
-	if (nodeType == "BinaryOperation")
-		return createBinaryOperation(_json);
-	if (nodeType == "FunctionCall")
-		return createFunctionCall(_json);
-	if (nodeType == "FunctionCallOptions")
-		return createFunctionCallOptions(_json);
-	if (nodeType == "NewExpression")
-		return createNewExpression(_json);
-	if (nodeType == "MemberAccess")
-		return createMemberAccess(_json);
-	if (nodeType == "IndexAccess")
-		return createIndexAccess(_json);
-	if (nodeType == "IndexRangeAccess")
-		return createIndexRangeAccess(_json);
-	if (nodeType == "Identifier")
-		return createIdentifier(_json);
-	if (nodeType == "ElementaryTypeNameExpression")
-		return createElementaryTypeNameExpression(_json);
-	if (nodeType == "Literal")
-		return createLiteral(_json);
-	if (nodeType == "StructuredDocumentation")
-		return createDocumentation(_json);
-	else
-		astAssert(false, "Unknown type of ASTNode: " + nodeType);
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-// ============ functions to instantiate the AST-Nodes from Json-Nodes ==============
-
-ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _node, std::string const& _srcName)
-{
-	std::optional<std::string> license;
-	if (_node.isMember("license") && !_node["license"].isNull())
-		license = _node["license"].asString();
-
-	bool experimentalSolidity = false;
-	if (_node.isMember("experimentalSolidity") && !_node["experimentalSolidity"].isNull())
-		experimentalSolidity = _node["experimentalSolidity"].asBool();
-
-	std::vector<ASTPointer<ASTNode>> nodes;
-	for (auto& child: member(_node, "nodes"))
-		nodes.emplace_back(convertJsonToASTNode(child));
-
-	ASTPointer<SourceUnit> tmp = createASTNode<SourceUnit>(_node, license, nodes, experimentalSolidity);
-	tmp->annotation().path = _srcName;
-	return tmp;
-}
-
-ASTPointer<PragmaDirective> ASTJsonImporter::createPragmaDirective(Json::Value const& _node)
-{
-	std::vector<Token> tokens;
-	std::vector<ASTString> literals;
-	for (auto const& lit: member(_node, "literals"))
-	{
-		std::string l = lit.asString();
-		literals.push_back(l);
-		tokens.push_back(scanSingleToken(l));
-	}
-	return createASTNode<PragmaDirective>(_node, tokens, literals);
-}
-
-ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json::Value const& _node)
-{
-	ASTPointer<ASTString> unitAlias = memberAsASTString(_node, "unitAlias");
-	ASTPointer<ASTString> path = memberAsASTString(_node, "file");
-	ImportDirective::SymbolAliasList symbolAliases;
-
-	for (auto& tuple: member(_node, "symbolAliases"))
-	{
-		astAssert(tuple["local"].isNull() || tuple["local"].isString(), "expected 'local' to be a string or null!");
-
-		symbolAliases.push_back({
-			createIdentifier(tuple["foreign"]),
-			tuple["local"].isNull() ? nullptr : std::make_shared<ASTString>(tuple["local"].asString()),
-			createSourceLocation(tuple["foreign"])}
-		);
-	}
-	ASTPointer<ImportDirective> tmp = createASTNode<ImportDirective>(
-		_node,
-		path,
-		unitAlias,
-		createNameSourceLocation(_node),
-		std::move(symbolAliases)
-	);
-
-	astAssert(_node["absolutePath"].isString(), "Expected 'absolutePath' to be a string!");
-
-	tmp->annotation().absolutePath = _node["absolutePath"].asString();
-	return tmp;
-}
-
-ASTPointer<ContractDefinition> ASTJsonImporter::createContractDefinition(Json::Value const& _node)
-{
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
-
-	std::vector<ASTPointer<InheritanceSpecifier>> baseContracts;
-
-	for (auto& base: _node["baseContracts"])
-		baseContracts.push_back(createInheritanceSpecifier(base));
-
-	std::vector<ASTPointer<ASTNode>> subNodes;
-
-	for (auto& subnode: _node["nodes"])
-		subNodes.push_back(convertJsonToASTNode(subnode));
-
-	return createASTNode<ContractDefinition>(
-		_node,
-		std::make_shared<ASTString>(_node["name"].asString()),
-		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		baseContracts,
-		subNodes,
-		contractKind(_node),
-		memberAsBool(_node, "abstract")
-	);
-}
-
-ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value const& _node)
-{
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
-
-	std::vector<ASTString> namePath;
-	std::vector<SourceLocation> namePathLocations;
-	std::vector<std::string> strs;
-	std::string nameString = member(_node, "name").asString();
-	boost::algorithm::split(strs, nameString, boost::is_any_of("."));
-	astAssert(!strs.empty(), "Expected at least one element in IdentifierPath.");
-	for (std::string s: strs)
-	{
-		astAssert(!s.empty(), "Expected non-empty string for IdentifierPath element.");
-		namePath.emplace_back(s);
-	}
-
-	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
-		for (auto const& val: _node["nameLocations"])
-			namePathLocations.emplace_back(langutil::parseSourceLocation(val.asString(), m_sourceNames));
-	else
-		namePathLocations.resize(namePath.size());
-
-	astAssert(
-		namePath.size() == namePathLocations.size(),
-		"SourceLocations don't match name paths."
-	);
-
-	return createASTNode<IdentifierPath>(
-		_node,
-		namePath,
-		namePathLocations
-	);
-}
-
-ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Json::Value const& _node)
-{
-	std::vector<ASTPointer<Expression>> arguments;
-	for (auto& arg: member(_node, "arguments"))
-		arguments.push_back(convertJsonToASTNode<Expression>(arg));
-	return createASTNode<InheritanceSpecifier>(
-		_node,
-		createIdentifierPath(member(_node, "baseName")),
-		member(_node, "arguments").isNull() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
-	);
-}
-
-ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Value const& _node)
-{
-	std::vector<ASTPointer<IdentifierPath>> functions;
-	std::vector<std::optional<Token>> operators;
-	if (_node.isMember("libraryName"))
-	{
-		astAssert(!_node["libraryName"].isArray());
-		astAssert(!_node["libraryName"]["operator"]);
-		functions.emplace_back(createIdentifierPath(_node["libraryName"]));
-		operators.emplace_back(std::nullopt);
-	}
-	else if (_node.isMember("functionList"))
-		for (Json::Value const& function: _node["functionList"])
-		{
-			if (function.isMember("function"))
-			{
-				astAssert(!function.isMember("operator"));
-				astAssert(!function.isMember("definition"));
-
-				functions.emplace_back(createIdentifierPath(function["function"]));
-				operators.emplace_back(std::nullopt);
-			}
-			else
-			{
-				astAssert(function.isMember("operator"));
-				astAssert(function.isMember("definition"));
-
-				Token const operatorName = scanSingleToken(function["operator"]);
-				astAssert(util::contains(frontend::userDefinableOperators, operatorName));
-
-				functions.emplace_back(createIdentifierPath(function["definition"]));
-				operators.emplace_back(operatorName);
-			}
-		}
-
-	return createASTNode<UsingForDirective>(
-		_node,
-		std::move(functions),
-		std::move(operators),
-		!_node.isMember("libraryName"),
-		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"]),
-		memberAsBool(_node, "global")
-	);
-}
-
-ASTPointer<ASTNode> ASTJsonImporter::createStructDefinition(Json::Value const& _node)
-{
-	std::vector<ASTPointer<VariableDeclaration>> members;
-	for (auto& member: _node["members"])
-		members.push_back(createVariableDeclaration(member));
-	return createASTNode<StructDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		members,
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation"))
-	);
-}
-
-ASTPointer<EnumDefinition> ASTJsonImporter::createEnumDefinition(Json::Value const& _node)
-{
-	std::vector<ASTPointer<EnumValue>> members;
-	for (auto& member: _node["members"])
-		members.push_back(createEnumValue(member));
-	return createASTNode<EnumDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		members,
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation"))
-	);
-}
-
-ASTPointer<EnumValue> ASTJsonImporter::createEnumValue(Json::Value const& _node)
-{
-	return createASTNode<EnumValue>(
-		_node,
-		memberAsASTString(_node, "name")
-	);
-}
-
-ASTPointer<UserDefinedValueTypeDefinition> ASTJsonImporter::createUserDefinedValueTypeDefinition(Json::Value const& _node)
-{
-	return createASTNode<UserDefinedValueTypeDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		convertJsonToASTNode<TypeName>(member(_node, "underlyingType"))
-	);
-}
-
-ASTPointer<ParameterList> ASTJsonImporter::createParameterList(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<VariableDeclaration>> parameters;
-	for (auto& param: _node["parameters"])
-		parameters.push_back(createVariableDeclaration(param));
-	return createASTNode<ParameterList>(
-		_node,
-		parameters
-	);
-}
-
-ASTPointer<OverrideSpecifier> ASTJsonImporter::createOverrideSpecifier(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<IdentifierPath>> overrides;
-
-	for (auto& param: _node["overrides"])
-		overrides.push_back(createIdentifierPath(param));
-
-	return createASTNode<OverrideSpecifier>(
-		_node,
-		overrides
-	);
-}
-
-ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::Value const&  _node)
-{
-	astAssert(_node["kind"].isString(), "Expected 'kind' to be a string!");
-
-	Token kind;
-	bool freeFunction = false;
-	std::string kindStr = member(_node, "kind").asString();
-
-	if (kindStr == "constructor")
-		kind = Token::Constructor;
-	else if (kindStr == "function")
-		kind = Token::Function;
-	else if (kindStr == "fallback")
-		kind = Token::Fallback;
-	else if (kindStr == "receive")
-		kind = Token::Receive;
-	else if (kindStr == "freeFunction")
-	{
-		kind = Token::Function;
-		freeFunction = true;
-	}
-	else
-		astAssert(false, "Expected 'kind' to be one of [constructor, function, fallback, receive]");
-
-	std::vector<ASTPointer<ModifierInvocation>> modifiers;
-	for (auto& mod: member(_node, "modifiers"))
-		modifiers.push_back(createModifierInvocation(mod));
-
-	Visibility vis = Visibility::Default;
-	// Ignore public visibility for constructors
-	if (kind == Token::Constructor)
-		vis = (visibility(_node) == Visibility::Public) ? Visibility::Default : visibility(_node);
-	else if (!freeFunction)
-		vis = visibility(_node);
-	return createASTNode<FunctionDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		vis,
-		stateMutability(_node),
-		freeFunction,
-		kind,
-		memberAsBool(_node, "virtual"),
-		_node["overrides"].isNull() ? nullptr : createOverrideSpecifier(member(_node, "overrides")),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		createParameterList(member(_node, "parameters")),
-		modifiers,
-		createParameterList(member(_node, "returnParameters")),
-		memberAsBool(_node, "implemented") ? createBlock(member(_node, "body"), false) : nullptr
-	);
-}
-
-ASTPointer<VariableDeclaration> ASTJsonImporter::createVariableDeclaration(Json::Value const& _node)
-{
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
-
-	VariableDeclaration::Mutability mutability{};
-	astAssert(member(_node, "mutability").isString(), "'mutability' expected to be string.");
-	std::string const mutabilityStr = member(_node, "mutability").asString();
-	if (mutabilityStr == "constant")
-	{
-		mutability = VariableDeclaration::Mutability::Constant;
-		astAssert(memberAsBool(_node, "constant"));
-	}
-	else
-	{
-		astAssert(!memberAsBool(_node, "constant"));
-		if (mutabilityStr == "mutable")
-			mutability = VariableDeclaration::Mutability::Mutable;
-		else if (mutabilityStr == "immutable")
-			mutability = VariableDeclaration::Mutability::Immutable;
-		else
-			astAssert(false);
-	}
-
-	return createASTNode<VariableDeclaration>(
-		_node,
-		nullOrCast<TypeName>(member(_node, "typeName")),
-		std::make_shared<ASTString>(member(_node, "name").asString()),
-		createNameSourceLocation(_node),
-		nullOrCast<Expression>(member(_node, "value")),
-		visibility(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		_node.isMember("indexed") ? memberAsBool(_node, "indexed") : false,
-		mutability,
-		_node["overrides"].isNull() ? nullptr : createOverrideSpecifier(member(_node, "overrides")),
-		location(_node)
-	);
-}
-
-ASTPointer<ModifierDefinition> ASTJsonImporter::createModifierDefinition(Json::Value const&  _node)
-{
-	return createASTNode<ModifierDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		createParameterList(member(_node, "parameters")),
-		memberAsBool(_node, "virtual"),
-		_node["overrides"].isNull() ? nullptr : createOverrideSpecifier(member(_node, "overrides")),
-		_node["body"].isNull() ? nullptr: createBlock(member(_node, "body"), false)
-	);
-}
-
-ASTPointer<ModifierInvocation> ASTJsonImporter::createModifierInvocation(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<Expression>> arguments;
-	for (auto& arg: member(_node, "arguments"))
-		arguments.push_back(convertJsonToASTNode<Expression>(arg));
-	return createASTNode<ModifierInvocation>(
-		_node,
-		createIdentifierPath(member(_node, "modifierName")),
-		member(_node, "arguments").isNull() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
-	);
-}
-
-ASTPointer<EventDefinition> ASTJsonImporter::createEventDefinition(Json::Value const&  _node)
-{
-	return createASTNode<EventDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		createParameterList(member(_node, "parameters")),
-		memberAsBool(_node, "anonymous")
-	);
-}
-
-ASTPointer<ErrorDefinition> ASTJsonImporter::createErrorDefinition(Json::Value const&  _node)
-{
-	return createASTNode<ErrorDefinition>(
-		_node,
-		memberAsASTString(_node, "name"),
-		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		createParameterList(member(_node, "parameters"))
-	);
-}
-
-ASTPointer<ElementaryTypeName> ASTJsonImporter::createElementaryTypeName(Json::Value const& _node)
-{
-	unsigned short firstNum;
-	unsigned short secondNum;
-
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
-
-	std::string name = member(_node, "name").asString();
-	Token token;
-	std::tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(name);
-	ElementaryTypeNameToken elem(token, firstNum,  secondNum);
-
-	std::optional<StateMutability> mutability = {};
-	if (_node.isMember("stateMutability"))
-		mutability = stateMutability(_node);
-
-	return createASTNode<ElementaryTypeName>(_node, elem, mutability);
-}
-
-ASTPointer<UserDefinedTypeName> ASTJsonImporter::createUserDefinedTypeName(Json::Value const& _node)
-{
-	return createASTNode<UserDefinedTypeName>(
-		_node,
-		createIdentifierPath(member(_node, "pathNode"))
-	);
-}
-
-ASTPointer<FunctionTypeName> ASTJsonImporter::createFunctionTypeName(Json::Value const&  _node)
-{
-	return createASTNode<FunctionTypeName>(
-		_node,
-		createParameterList(member(_node, "parameterTypes")),
-		createParameterList(member(_node, "returnParameterTypes")),
-		visibility(_node),
-		stateMutability(_node)
-	);
-}
-
-ASTPointer<Mapping> ASTJsonImporter::createMapping(Json::Value const&  _node)
-{
-	return createASTNode<Mapping>(
-		_node,
-		convertJsonToASTNode<TypeName>(member(_node, "keyType")),
-		memberAsASTString(_node, "keyName"),
-		createKeyNameSourceLocation(_node),
-		convertJsonToASTNode<TypeName>(member(_node, "valueType")),
-		memberAsASTString(_node, "valueName"),
-		createValueNameSourceLocation(_node)
-	);
-}
-
-ASTPointer<ArrayTypeName> ASTJsonImporter::createArrayTypeName(Json::Value const&  _node)
-{
-	return createASTNode<ArrayTypeName>(
-		_node,
-		convertJsonToASTNode<TypeName>(member(_node, "baseType")),
-		nullOrCast<Expression>(member(_node, "length"))
-	);
-}
-
-ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json::Value const& _node)
-{
-	astAssert(_node["evmVersion"].isString(), "Expected evmVersion to be a string!");
-	auto evmVersion = langutil::EVMVersion::fromString(_node["evmVersion"].asString());
-	astAssert(evmVersion.has_value(), "Invalid EVM version!");
-	astAssert(m_evmVersion == evmVersion, "Imported tree evm version differs from configured evm version!");
-
-	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value());
-	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
-	if (_node.isMember("flags"))
-	{
-		flags = std::make_shared<std::vector<ASTPointer<ASTString>>>();
-		Json::Value const& flagsNode = _node["flags"];
-		astAssert(flagsNode.isArray(), "Assembly flags must be an array.");
-		for (Json::ArrayIndex i = 0; i < flagsNode.size(); ++i)
-		{
-			astAssert(flagsNode[i].isString(), "Assembly flag must be a string.");
-			flags->emplace_back(std::make_shared<ASTString>(flagsNode[i].asString()));
-		}
-	}
-	std::shared_ptr<yul::Block> operations = std::make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
-	return createASTNode<InlineAssembly>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		dialect,
-		std::move(flags),
-		operations
-	);
-}
-
-ASTPointer<Block> ASTJsonImporter::createBlock(Json::Value const& _node, bool _unchecked)
-{
-	std::vector<ASTPointer<Statement>> statements;
-	for (auto& stat: member(_node, "statements"))
-		statements.push_back(convertJsonToASTNode<Statement>(stat));
-	return createASTNode<Block>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		_unchecked,
-		statements
-	);
-}
-
-ASTPointer<PlaceholderStatement> ASTJsonImporter::createPlaceholderStatement(Json::Value const&  _node)
-{
-	return createASTNode<PlaceholderStatement>(
-		_node,
-		nullOrASTString(_node, "documentation")
-	);
-}
-
-ASTPointer<IfStatement> ASTJsonImporter::createIfStatement(Json::Value const&  _node)
-{
-	return createASTNode<IfStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		convertJsonToASTNode<Expression>(member(_node, "condition")),
-		convertJsonToASTNode<Statement>(member(_node, "trueBody")),
-		nullOrCast<Statement>(member(_node, "falseBody"))
-	);
-}
-
-ASTPointer<TryCatchClause> ASTJsonImporter::createTryCatchClause(Json::Value const&  _node)
-{
-	return createASTNode<TryCatchClause>(
-		_node,
-		memberAsASTString(_node, "errorName"),
-		nullOrCast<ParameterList>(member(_node, "parameters")),
-		convertJsonToASTNode<Block>(member(_node, "block"))
-	);
-}
-
-ASTPointer<TryStatement> ASTJsonImporter::createTryStatement(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<TryCatchClause>> clauses;
-
-	for (auto& param: _node["clauses"])
-		clauses.emplace_back(createTryCatchClause(param));
-
-	return createASTNode<TryStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		convertJsonToASTNode<Expression>(member(_node, "externalCall")),
-		clauses
-	);
-}
-
-ASTPointer<WhileStatement> ASTJsonImporter::createWhileStatement(Json::Value const&  _node, bool _isDoWhile=false)
-{
-	return createASTNode<WhileStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		convertJsonToASTNode<Expression>(member(_node, "condition")),
-		convertJsonToASTNode<Statement>(member(_node, "body")),
-		_isDoWhile
-	);
-}
-
-ASTPointer<ForStatement> ASTJsonImporter::createForStatement(Json::Value const&  _node)
-{
-	return createASTNode<ForStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		nullOrCast<Statement>(member(_node, "initializationExpression")),
-		nullOrCast<Expression>(member(_node, "condition")),
-		nullOrCast<ExpressionStatement>(member(_node, "loopExpression")),
-		convertJsonToASTNode<Statement>(member(_node, "body"))
-	);
-}
-
-ASTPointer<Continue> ASTJsonImporter::createContinue(Json::Value const&  _node)
-{
-	return createASTNode<Continue>(
-		_node,
-		nullOrASTString(_node, "documentation")
-	);
-}
-
-ASTPointer<Break> ASTJsonImporter::createBreak(Json::Value const&  _node)
-{
-	return createASTNode<Break>(
-		_node,
-		nullOrASTString(_node, "documentation")
-	);
-}
-
-ASTPointer<Return> ASTJsonImporter::createReturn(Json::Value const&  _node)
-{
-	return createASTNode<Return>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		nullOrCast<Expression>(member(_node, "expression"))
-	);
-}
-
-ASTPointer<Throw> ASTJsonImporter::createThrow(Json::Value const&  _node)
-{
-	return createASTNode<Throw>(
-		_node,
-		nullOrASTString(_node, "documentation")
-	);
-}
-
-ASTPointer<EmitStatement> ASTJsonImporter::createEmitStatement(Json::Value const&  _node)
-{
-	return createASTNode<EmitStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		createFunctionCall(member(_node, "eventCall"))
-	);
-}
-
-ASTPointer<RevertStatement> ASTJsonImporter::createRevertStatement(Json::Value const&  _node)
-{
-	return createASTNode<RevertStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		createFunctionCall(member(_node, "errorCall"))
-	);
-}
-
-ASTPointer<VariableDeclarationStatement> ASTJsonImporter::createVariableDeclarationStatement(Json::Value const& _node)
-{
-	std::vector<ASTPointer<VariableDeclaration>> variables;
-	for (auto& var: member(_node, "declarations"))
-		variables.push_back(var.isNull() ? nullptr : createVariableDeclaration(var)); //unnamed components are empty pointers
-	return createASTNode<VariableDeclarationStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		variables,
-		nullOrCast<Expression>(member(_node, "initialValue"))
-	);
-}
-
-ASTPointer<ExpressionStatement> ASTJsonImporter::createExpressionStatement(Json::Value const&  _node)
-{
-	return createASTNode<ExpressionStatement>(
-		_node,
-		nullOrASTString(_node, "documentation"),
-		convertJsonToASTNode<Expression>(member(_node, "expression"))
-	);
-}
-
-ASTPointer<Conditional> ASTJsonImporter::createConditional(Json::Value const&  _node)
-{
-	return createASTNode<Conditional>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "condition")),
-		convertJsonToASTNode<Expression>(member(_node, "trueExpression")),
-		convertJsonToASTNode<Expression>(member(_node, "falseExpression"))
-	);
-}
-
-ASTPointer<Assignment> ASTJsonImporter::createAssignment(Json::Value const&  _node)
-{
-	return createASTNode<Assignment>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "leftHandSide")),
-		scanSingleToken(member(_node, "operator")),
-		convertJsonToASTNode<Expression>(member(_node, "rightHandSide"))
-	);
-}
-
-ASTPointer<TupleExpression> ASTJsonImporter::createTupleExpression(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<Expression>> components;
-	for (auto& comp: member(_node, "components"))
-		components.push_back(nullOrCast<Expression>(comp));
-	return createASTNode<TupleExpression>(
-		_node,
-		components,
-		memberAsBool(_node, "isInlineArray")
-	);
-}
-
-ASTPointer<UnaryOperation> ASTJsonImporter::createUnaryOperation(Json::Value const&  _node)
-{
-	return createASTNode<UnaryOperation>(
-		_node,
-		scanSingleToken(member(_node, "operator")),
-		convertJsonToASTNode<Expression>(member(_node, "subExpression")),
-		memberAsBool(_node, "prefix")
-	);
-}
-
-ASTPointer<BinaryOperation> ASTJsonImporter::createBinaryOperation(Json::Value const&  _node)
-{
-	return createASTNode<BinaryOperation>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "leftExpression")),
-		scanSingleToken(member(_node, "operator")),
-		convertJsonToASTNode<Expression>(member(_node, "rightExpression"))
-	);
-}
-
-ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<Expression>> arguments;
-	for (auto& arg: member(_node, "arguments"))
-		arguments.push_back(convertJsonToASTNode<Expression>(arg));
-	std::vector<ASTPointer<ASTString>> names;
-	for (auto& name: member(_node, "names"))
-	{
-		astAssert(name.isString(), "Expected 'names' members to be strings!");
-		names.push_back(std::make_shared<ASTString>(name.asString()));
-	}
-
-	std::optional<std::vector<SourceLocation>> sourceLocations = createSourceLocations(_node);
-
-	return createASTNode<FunctionCall>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "expression")),
-		arguments,
-		names,
-		sourceLocations ?
-			*sourceLocations :
-			std::vector<SourceLocation>(names.size())
-	);
-}
-
-ASTPointer<FunctionCallOptions> ASTJsonImporter::createFunctionCallOptions(Json::Value const&  _node)
-{
-	std::vector<ASTPointer<Expression>> options;
-	for (auto& option: member(_node, "options"))
-		options.push_back(convertJsonToASTNode<Expression>(option));
-	std::vector<ASTPointer<ASTString>> names;
-	for (auto& name: member(_node, "names"))
-	{
-		astAssert(name.isString(), "Expected 'names' members to be strings!");
-		names.push_back(std::make_shared<ASTString>(name.asString()));
-	}
-
-	return createASTNode<FunctionCallOptions>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "expression")),
-		options,
-		names
-	);
-}
-
-ASTPointer<NewExpression> ASTJsonImporter::createNewExpression(Json::Value const&  _node)
-{
-	return createASTNode<NewExpression>(
-		_node,
-		convertJsonToASTNode<TypeName>(member(_node, "typeName"))
-	);
-}
-
-ASTPointer<MemberAccess> ASTJsonImporter::createMemberAccess(Json::Value const&  _node)
-{
-	SourceLocation memberLocation;
-	if (member(_node, "memberLocation").isString())
-		memberLocation = solidity::langutil::parseSourceLocation(_node["memberLocation"].asString(), m_sourceNames);
-
-	return createASTNode<MemberAccess>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "expression")),
-		memberAsASTString(_node, "memberName"),
-		std::move(memberLocation)
-	);
-}
-
-ASTPointer<IndexAccess> ASTJsonImporter::createIndexAccess(Json::Value const& _node)
-{
-	return createASTNode<IndexAccess>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "baseExpression")),
-		nullOrCast<Expression>(member(_node, "indexExpression"))
-	);
-}
-
-ASTPointer<IndexRangeAccess> ASTJsonImporter::createIndexRangeAccess(Json::Value const& _node)
-{
-	return createASTNode<IndexRangeAccess>(
-		_node,
-		convertJsonToASTNode<Expression>(member(_node, "baseExpression")),
-		nullOrCast<Expression>(member(_node, "startExpression")),
-		nullOrCast<Expression>(member(_node, "endExpression"))
-	);
-}
-
-ASTPointer<Identifier> ASTJsonImporter::createIdentifier(Json::Value const& _node)
-{
-	return createASTNode<Identifier>(_node, memberAsASTString(_node, "name"));
-}
-
-ASTPointer<ElementaryTypeNameExpression> ASTJsonImporter::createElementaryTypeNameExpression(Json::Value const&  _node)
-{
-	return createASTNode<ElementaryTypeNameExpression>(
-		_node,
-		createElementaryTypeName(member(_node, "typeName"))
-	);
-}
-
-ASTPointer<ASTNode> ASTJsonImporter::createLiteral(Json::Value const&  _node)
-{
-	static std::string const valStr = "value";
-	static std::string const hexValStr = "hexValue";
-
-	astAssert(member(_node, valStr).isString() || member(_node, hexValStr).isString(), "Literal-value is unset.");
-
-	ASTPointer<ASTString> value = _node.isMember(hexValStr) ?
-		std::make_shared<ASTString>(util::asString(util::fromHex(_node[hexValStr].asString()))) :
-		std::make_shared<ASTString>(_node[valStr].asString());
-
-	return createASTNode<Literal>(
-		_node,
-		literalTokenKind(_node),
-		value,
-		member(_node, "subdenomination").isNull() ? Literal::SubDenomination::None : subdenomination(_node)
-	);
-}
-
-ASTPointer<StructuredDocumentation> ASTJsonImporter::createDocumentation(Json::Value const&  _node)
-{
-	static std::string const textString = "text";
-
-	astAssert(member(_node, textString).isString(), "'text' must be a string");
-
-	return createASTNode<StructuredDocumentation>(
-		_node,
-		std::make_shared<ASTString>(_node[textString].asString())
-	);
-}
-
-// ===== helper functions ==========
-
-Json::Value ASTJsonImporter::member(Json::Value const& _node, std::string const& _name)
-{
-	if (!_node.isMember(_name))
-		return Json::nullValue;
-	return _node[_name];
-}
-
-Token ASTJsonImporter::scanSingleToken(Json::Value const& _node)
-{
-	langutil::CharStream charStream(_node.asString(), "");
-	langutil::Scanner scanner{charStream};
-	astAssert(scanner.peekNextToken() == Token::EOS, "Token string is too long.");
-	return scanner.currentToken();
-}
-
-ASTPointer<ASTString> ASTJsonImporter::nullOrASTString(Json::Value const& _json, std::string const& _name)
-{
-	return _json[_name].isString() ? memberAsASTString(_json, _name) : nullptr;
-}
-
-ASTPointer<ASTString> ASTJsonImporter::memberAsASTString(Json::Value const& _node, std::string const& _name)
-{
-	Json::Value value = member(_node, _name);
-	astAssert(value.isString(), "field " + _name + " must be of type string.");
-	return std::make_shared<ASTString>(_node[_name].asString());
-}
-
-bool ASTJsonImporter::memberAsBool(Json::Value const& _node, std::string const& _name)
-{
-	Json::Value value = member(_node, _name);
-	astAssert(value.isBool(), "field " + _name + " must be of type boolean.");
-	return _node[_name].asBool();
-}
-
-
-// =========== JSON to definition helpers =======================
-
-ContractKind ASTJsonImporter::contractKind(Json::Value const& _node)
-{
-	ContractKind kind;
-	astAssert(!member(_node, "contractKind").isNull(), "'Contract-kind' can not be null.");
-	if (_node["contractKind"].asString() == "interface")
-		kind = ContractKind::Interface;
-	else if (_node["contractKind"].asString() == "contract")
-		kind = ContractKind::Contract;
-	else if (_node["contractKind"].asString() == "library")
-		kind = ContractKind::Library;
-	else
-		astAssert(false, "Unknown ContractKind");
-	return kind;
-}
-
-Token ASTJsonImporter::literalTokenKind(Json::Value const& _node)
-{
-	astAssert(member(_node, "kind").isString(), "Token-'kind' expected to be a string.");
-	Token tok;
-	if (_node["kind"].asString() == "number")
-		tok = Token::Number;
-	else if (_node["kind"].asString() == "string")
-		tok = Token::StringLiteral;
-	else if (_node["kind"].asString() == "unicodeString")
-		tok = Token::UnicodeStringLiteral;
-	else if (_node["kind"].asString() == "hexString")
-		tok = Token::HexStringLiteral;
-	else if (_node["kind"].asString() == "bool")
-		tok = (member(_node, "value").asString() == "true") ? Token::TrueLiteral : Token::FalseLiteral;
-	else
-		astAssert(false, "Unknown kind of literalString");
-	return tok;
-}
-
-Visibility ASTJsonImporter::visibility(Json::Value const& _node)
-{
-	Json::Value visibility = member(_node, "visibility");
-	astAssert(visibility.isString(), "'visibility' expected to be a string.");
-
-	std::string const visibilityStr = visibility.asString();
-
-	if (visibilityStr == "default")
-		return Visibility::Default;
-	else if (visibilityStr == "private")
-		return Visibility::Private;
-	else if ( visibilityStr == "internal")
-		return Visibility::Internal;
-	else if (visibilityStr == "public")
-		return Visibility::Public;
-	else if (visibilityStr == "external")
-		return Visibility::External;
-	else
-		astAssert(false, "Unknown visibility declaration");
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node)
-{
-	Json::Value storageLoc = member(_node, "storageLocation");
-	astAssert(storageLoc.isString(), "'storageLocation' expected to be a string.");
-
-	std::string const storageLocStr = storageLoc.asString();
-
-	if (storageLocStr == "default")
-		return VariableDeclaration::Location::Unspecified;
-	else if (storageLocStr == "storage")
-		return VariableDeclaration::Location::Storage;
-	else if (storageLocStr == "memory")
-		return VariableDeclaration::Location::Memory;
-	else if (storageLocStr == "calldata")
-		return VariableDeclaration::Location::CallData;
-	else
-		astAssert(false, "Unknown location declaration");
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _node)
-{
-	Json::Value subDen = member(_node, "subdenomination");
-
-	if (subDen.isNull())
-		return Literal::SubDenomination::None;
-
-	astAssert(subDen.isString(), "'subDenomination' expected to be string.");
-
-	std::string const subDenStr = subDen.asString();
-
-	if (subDenStr == "wei")
-		return Literal::SubDenomination::Wei;
-	else if (subDenStr == "gwei")
-		return Literal::SubDenomination::Gwei;
-	else if (subDenStr == "ether")
-		return Literal::SubDenomination::Ether;
-	else if (subDenStr == "seconds")
-		return Literal::SubDenomination::Second;
-	else if (subDenStr == "minutes")
-		return Literal::SubDenomination::Minute;
-	else if (subDenStr == "hours")
-		return Literal::SubDenomination::Hour;
-	else if (subDenStr == "days")
-		return Literal::SubDenomination::Day;
-	else if (subDenStr == "weeks")
-		return Literal::SubDenomination::Week;
-	else if (subDenStr == "years")
-		return Literal::SubDenomination::Year;
-	else
-		astAssert(false, "Unknown subdenomination");
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
-{
-	astAssert(member(_node, "stateMutability").isString(), "StateMutability' expected to be string.");
-	std::string const mutabilityStr = member(_node, "stateMutability").asString();
-
-	if (mutabilityStr == "pure")
-		return StateMutability::Pure;
-	else if (mutabilityStr == "view")
-		return StateMutability::View;
-	else if (mutabilityStr == "nonpayable")
-		return StateMutability::NonPayable;
-	else if (mutabilityStr == "payable")
-		return StateMutability::Payable;
-	else
-		astAssert(false, "Unknown stateMutability");
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-}
diff --git a/libsolidity/ast/ASTJsonImporter.h b/libsolidity/ast/ASTJsonImporter.h
deleted file mode 100644
index b9a4d4950569..000000000000
--- a/libsolidity/ast/ASTJsonImporter.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author julius <djudju@protonmail.com>
- * @date 2019
- * Converts the AST from JSON format to ASTNode
- */
-
-#pragma once
-
-#include <vector>
-#include <libsolidity/ast/AST.h>
-#include <json/json.h>
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceLocation.h>
-
-namespace solidity::frontend
-{
-
-/**
- * Component that imports an AST from json format to the internal format
- */
-class ASTJsonImporter
-{
-public:
-	ASTJsonImporter(langutil::EVMVersion _evmVersion)
-		:m_evmVersion(_evmVersion)
-	{}
-
-	/// Converts the AST from JSON-format to ASTPointer
-	/// @a _sourceList used to provide source names for the ASTs
-	/// @returns map of sourcenames to their respective ASTs
-	std::map<std::string, ASTPointer<SourceUnit>> jsonToSourceUnit(std::map<std::string, Json::Value> const& _sourceList);
-
-private:
-
-	// =========== general creation functions ==============
-
-	/// Sets the source location and nodeID
-	/// @returns the ASTNode Object class of the respective JSON node,
-	template <typename T, typename... Args>
-	ASTPointer<T> createASTNode(Json::Value const& _node, Args&&... _args);
-	/// @returns the sourceLocation-object created from the string in the JSON node
-	langutil::SourceLocation const createSourceLocation(Json::Value const& _node);
-	std::optional<std::vector<langutil::SourceLocation>> createSourceLocations(Json::Value const& _node) const;
-	/// Creates an ASTNode for a given JSON-ast of unknown type
-	/// @returns Pointer to a new created ASTNode
-	ASTPointer<ASTNode> convertJsonToASTNode(Json::Value const& _ast);
-	/// @returns a pointer to the more specific subclass of ASTNode
-	/// as indicated by the nodeType field of the json
-	template<class T>
-	ASTPointer<T> convertJsonToASTNode(Json::Value const& _node);
-
-	langutil::SourceLocation createNameSourceLocation(Json::Value const& _node);
-	/// @returns source location of a mapping key name
-	langutil::SourceLocation createKeyNameSourceLocation(Json::Value const& _node);
-	/// @returns source location of a mapping value name
-	langutil::SourceLocation createValueNameSourceLocation(Json::Value const& _node);
-
-	/// \defgroup nodeCreators JSON to AST-Nodes
-	///@{
-	ASTPointer<SourceUnit> createSourceUnit(Json::Value const& _node, std::string const& _srcName);
-	ASTPointer<PragmaDirective> createPragmaDirective(Json::Value const& _node);
-	ASTPointer<ImportDirective> createImportDirective(Json::Value const& _node);
-	ASTPointer<ContractDefinition> createContractDefinition(Json::Value const& _node);
-	ASTPointer<IdentifierPath> createIdentifierPath(Json::Value const& _node);
-	ASTPointer<InheritanceSpecifier> createInheritanceSpecifier(Json::Value const& _node);
-	ASTPointer<UsingForDirective> createUsingForDirective(Json::Value const& _node);
-	ASTPointer<ASTNode> createStructDefinition(Json::Value const& _node);
-	ASTPointer<EnumDefinition> createEnumDefinition(Json::Value const& _node);
-	ASTPointer<EnumValue> createEnumValue(Json::Value const& _node);
-	ASTPointer<UserDefinedValueTypeDefinition> createUserDefinedValueTypeDefinition(Json::Value const& _node);
-	ASTPointer<ParameterList> createParameterList(Json::Value const& _node);
-	ASTPointer<OverrideSpecifier> createOverrideSpecifier(Json::Value const& _node);
-	ASTPointer<FunctionDefinition> createFunctionDefinition(Json::Value const& _node);
-	ASTPointer<VariableDeclaration> createVariableDeclaration(Json::Value const& _node);
-	ASTPointer<ModifierDefinition> createModifierDefinition(Json::Value const& _node);
-	ASTPointer<ModifierInvocation> createModifierInvocation(Json::Value const& _node);
-	ASTPointer<EventDefinition> createEventDefinition(Json::Value const& _node);
-	ASTPointer<ErrorDefinition> createErrorDefinition(Json::Value const& _node);
-	ASTPointer<ElementaryTypeName> createElementaryTypeName(Json::Value const& _node);
-	ASTPointer<UserDefinedTypeName> createUserDefinedTypeName(Json::Value const& _node);
-	ASTPointer<FunctionTypeName> createFunctionTypeName(Json::Value const& _node);
-	ASTPointer<Mapping> createMapping(Json::Value const& _node);
-	ASTPointer<ArrayTypeName> createArrayTypeName(Json::Value const& _node);
-	ASTPointer<InlineAssembly> createInlineAssembly(Json::Value const& _node);
-	ASTPointer<Block> createBlock(Json::Value const& _node, bool _unchecked);
-	ASTPointer<PlaceholderStatement> createPlaceholderStatement(Json::Value const& _node);
-	ASTPointer<IfStatement> createIfStatement(Json::Value const& _node);
-	ASTPointer<TryCatchClause> createTryCatchClause(Json::Value const& _node);
-	ASTPointer<TryStatement> createTryStatement(Json::Value const& _node);
-	ASTPointer<WhileStatement> createWhileStatement(Json::Value const& _node, bool _isDoWhile);
-	ASTPointer<ForStatement> createForStatement(Json::Value const& _node);
-	ASTPointer<Continue> createContinue(Json::Value const& _node);
-	ASTPointer<Break> createBreak(Json::Value const& _node);
-	ASTPointer<Return> createReturn(Json::Value const& _node);
-	ASTPointer<Throw> createThrow(Json::Value const& _node);
-	ASTPointer<EmitStatement> createEmitStatement(Json::Value const& _node);
-	ASTPointer<RevertStatement> createRevertStatement(Json::Value const& _node);
-	ASTPointer<VariableDeclarationStatement> createVariableDeclarationStatement(Json::Value const& _node);
-	ASTPointer<ExpressionStatement> createExpressionStatement(Json::Value const& _node);
-	ASTPointer<Conditional> createConditional(Json::Value const& _node);
-	ASTPointer<Assignment> createAssignment(Json::Value const& _node);
-	ASTPointer<TupleExpression> createTupleExpression(Json::Value const& _node);
-	ASTPointer<UnaryOperation> createUnaryOperation(Json::Value const& _node);
-	ASTPointer<BinaryOperation> createBinaryOperation(Json::Value const& _node);
-	ASTPointer<FunctionCall> createFunctionCall(Json::Value const& _node);
-	ASTPointer<FunctionCallOptions> createFunctionCallOptions(Json::Value const& _node);
-	ASTPointer<NewExpression> createNewExpression(Json::Value const& _node);
-	ASTPointer<MemberAccess> createMemberAccess(Json::Value const& _node);
-	ASTPointer<IndexAccess> createIndexAccess(Json::Value const& _node);
-	ASTPointer<IndexRangeAccess> createIndexRangeAccess(Json::Value const& _node);
-	ASTPointer<Identifier> createIdentifier(Json::Value const& _node);
-	ASTPointer<ElementaryTypeNameExpression> createElementaryTypeNameExpression(Json::Value const& _node);
-	ASTPointer<ASTNode> createLiteral(Json::Value const& _node);
-	ASTPointer<StructuredDocumentation> createDocumentation(Json::Value const& _node);
-	///@}
-
-	// =============== general helper functions ===================
-	/// @returns the member of a given JSON object, throws if member does not exist
-	Json::Value member(Json::Value const& _node, std::string const& _name);
-	/// @returns the appropriate TokenObject used in parsed Strings (pragma directive or operator)
-	Token scanSingleToken(Json::Value const& _node);
-	template<class T>
-	///@returns nullptr or an ASTPointer cast to a specific Class
-	ASTPointer<T> nullOrCast(Json::Value const& _json);
-	/// @returns nullptr or ASTString, given an JSON string or an empty field
-	ASTPointer<ASTString> nullOrASTString(Json::Value const& _json, std::string const& _name);
-
-	// ============== JSON to definition helpers ===============
-	/// \defgroup typeHelpers Json to ast-datatype helpers
-	/// {@
-	ASTPointer<ASTString> memberAsASTString(Json::Value const& _node, std::string const& _name);
-	bool memberAsBool(Json::Value const& _node, std::string const& _name);
-	Visibility visibility(Json::Value const& _node);
-	StateMutability stateMutability(Json::Value const& _node);
-	VariableDeclaration::Location location(Json::Value const& _node);
-	ContractKind contractKind(Json::Value const& _node);
-	Token literalTokenKind(Json::Value const& _node);
-	Literal::SubDenomination subdenomination(Json::Value const& _node);
-	///@}
-
-	// =========== member variables ===============
-	/// list of source names, order by source index
-	std::vector<std::shared_ptr<std::string const>> m_sourceNames;
-	/// filepath to AST
-	std::map<std::string, ASTPointer<SourceUnit>> m_sourceUnits;
-	/// IDs already used by the nodes
-	std::set<int64_t> m_usedIDs;
-	/// Configured EVM version
-	langutil::EVMVersion m_evmVersion;
-};
-
-}
diff --git a/libsolidity/ast/ASTUtils.cpp b/libsolidity/ast/ASTUtils.cpp
deleted file mode 100644
index 27c0833d26b1..000000000000
--- a/libsolidity/ast/ASTUtils.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTUtils.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-#include <libsolutil/Algorithms.h>
-
-namespace solidity::frontend
-{
-
-ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sourceUnit)
-{
-	ASTNode const* innermostMatch = nullptr;
-	auto locator = SimpleASTVisitor(
-		[&](ASTNode const& _node) -> bool
-		{
-			// In the AST parent location always covers the whole child location.
-			// The parent is visited first so to get the innermost node we simply
-			// take the last one that still contains the offset.
-
-			if (!_node.location().containsOffset(_offsetInFile))
-				return false;
-
-			innermostMatch = &_node;
-			return true;
-		},
-		[](ASTNode const&) {}
-	);
-	_sourceUnit.accept(locator);
-	return innermostMatch;
-}
-
-bool isConstantVariableRecursive(VariableDeclaration const& _varDecl)
-{
-	solAssert(_varDecl.isConstant(), "Constant variable expected");
-
-	auto visitor = [](VariableDeclaration const& _variable, util::CycleDetector<VariableDeclaration>& _cycleDetector, size_t _depth)
-	{
-		solAssert(_depth < 256, "Recursion depth limit reached");
-		if (!_variable.value())
-			// This should result in an error later on.
-			return;
-
-		if (auto referencedVarDecl = dynamic_cast<VariableDeclaration const*>(
-			ASTNode::referencedDeclaration(*_variable.value()))
-		)
-			if (referencedVarDecl->isConstant())
-				_cycleDetector.run(*referencedVarDecl);
-	};
-
-	return util::CycleDetector<VariableDeclaration>(visitor).run(_varDecl) != nullptr;
-}
-
-VariableDeclaration const* rootConstVariableDeclaration(VariableDeclaration const& _varDecl)
-{
-	solAssert(_varDecl.isConstant(), "Constant variable expected");
-	solAssert(!isConstantVariableRecursive(_varDecl), "Recursive declaration");
-
-	VariableDeclaration const* rootDecl = &_varDecl;
-	Identifier const* identifier;
-	while ((identifier = dynamic_cast<Identifier const*>(rootDecl->value().get())))
-	{
-		auto referencedVarDecl = dynamic_cast<VariableDeclaration const*>(identifier->annotation().referencedDeclaration);
-		if (!referencedVarDecl || !referencedVarDecl->isConstant())
-			return nullptr;
-		rootDecl = referencedVarDecl;
-	}
-	return rootDecl;
-}
-
-Expression const* resolveOuterUnaryTuples(Expression const* _expr)
-{
-	while (auto const* tupleExpression = dynamic_cast<TupleExpression const*>(_expr))
-		if (tupleExpression->components().size() == 1)
-			_expr = tupleExpression->components().front().get();
-		else
-			break;
-	return _expr;
-}
-
-}
diff --git a/libsolidity/ast/ASTUtils.h b/libsolidity/ast/ASTUtils.h
deleted file mode 100644
index f6e3f0641dae..000000000000
--- a/libsolidity/ast/ASTUtils.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-namespace solidity::frontend
-{
-
-class ASTNode;
-class Declaration;
-class Expression;
-class SourceUnit;
-class VariableDeclaration;
-
-/// Find the topmost referenced constant variable declaration when the given variable
-/// declaration value is an identifier. Works only for constant variable declarations.
-/// Returns nullptr if an identifier in the chain is not referencing a constant variable declaration.
-VariableDeclaration const* rootConstVariableDeclaration(VariableDeclaration const& _varDecl);
-
-/// Returns true if the constant variable declaration is recursive.
-bool isConstantVariableRecursive(VariableDeclaration const& _varDecl);
-
-/// Returns the innermost AST node that covers the given location or nullptr if not found.
-ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sourceUnit);
-
-/// @returns @a _expr itself, in case it is not a unary tuple expression. Otherwise it descends recursively
-/// into unary tuples and returns the contained expression.
-Expression const* resolveOuterUnaryTuples(Expression const* _expr);
-
-}
diff --git a/libsolidity/ast/ASTVisitor.h b/libsolidity/ast/ASTVisitor.h
deleted file mode 100644
index ef03e6339322..000000000000
--- a/libsolidity/ast/ASTVisitor.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * AST visitor base class.
- */
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-
-#include <functional>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend
-{
-
-/**
- * Visitor interface for the abstract syntax tree. This class is tightly bound to the
- * implementation of @ref ASTNode::accept and its overrides. After a call to
- * @ref ASTNode::accept, the function visit for the appropriate parameter is called and then
- * (if it returns true) this continues recursively for all child nodes in document order
- * (there is an exception for contracts). After all child nodes have been visited, endVisit is
- * called for the node.
- */
-class ASTVisitor
-{
-public:
-	ASTVisitor() = default;
-
-	ASTVisitor(ASTVisitor const&) = delete;
-	ASTVisitor(ASTVisitor&&) = delete;
-
-	ASTVisitor& operator=(ASTVisitor const&) = delete;
-	ASTVisitor& operator=(ASTVisitor&&) = delete;
-
-	virtual ~ASTVisitor() = default;
-
-	virtual bool visit(SourceUnit& _node) { return visitNode(_node); }
-	virtual bool visit(PragmaDirective& _node) { return visitNode(_node); }
-	virtual bool visit(ImportDirective& _node) { return visitNode(_node); }
-	virtual bool visit(ContractDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(IdentifierPath& _node) { return visitNode(_node); }
-	virtual bool visit(InheritanceSpecifier& _node) { return visitNode(_node); }
-	virtual bool visit(UsingForDirective& _node) { return visitNode(_node); }
-	virtual bool visit(UserDefinedValueTypeDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(StructDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(EnumDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(EnumValue& _node) { return visitNode(_node); }
-	virtual bool visit(ParameterList& _node) { return visitNode(_node); }
-	virtual bool visit(OverrideSpecifier& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(VariableDeclaration& _node) { return visitNode(_node); }
-	virtual bool visit(ModifierDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(ModifierInvocation& _node) { return visitNode(_node); }
-	virtual bool visit(EventDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(ErrorDefinition& _node) { return visitNode(_node); }
-	virtual bool visit(ElementaryTypeName& _node) { return visitNode(_node); }
-	virtual bool visit(UserDefinedTypeName& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionTypeName& _node) { return visitNode(_node); }
-	virtual bool visit(Mapping& _node) { return visitNode(_node); }
-	virtual bool visit(ArrayTypeName& _node) { return visitNode(_node); }
-	virtual bool visit(InlineAssembly& _node) { return visitNode(_node); }
-	virtual bool visit(Block& _node) { return visitNode(_node); }
-	virtual bool visit(PlaceholderStatement& _node) { return visitNode(_node); }
-	virtual bool visit(IfStatement& _node) { return visitNode(_node); }
-	virtual bool visit(TryCatchClause& _node) { return visitNode(_node); }
-	virtual bool visit(TryStatement& _node) { return visitNode(_node); }
-	virtual bool visit(WhileStatement& _node) { return visitNode(_node); }
-	virtual bool visit(ForStatement& _node) { return visitNode(_node); }
-	virtual bool visit(Continue& _node) { return visitNode(_node); }
-	virtual bool visit(Break& _node) { return visitNode(_node); }
-	virtual bool visit(Return& _node) { return visitNode(_node); }
-	virtual bool visit(Throw& _node) { return visitNode(_node); }
-	virtual bool visit(EmitStatement& _node) { return visitNode(_node); }
-	virtual bool visit(RevertStatement& _node) { return visitNode(_node); }
-	virtual bool visit(VariableDeclarationStatement& _node) { return visitNode(_node); }
-	virtual bool visit(ExpressionStatement& _node) { return visitNode(_node); }
-	virtual bool visit(Conditional& _node) { return visitNode(_node); }
-	virtual bool visit(Assignment& _node) { return visitNode(_node); }
-	virtual bool visit(TupleExpression& _node) { return visitNode(_node); }
-	virtual bool visit(UnaryOperation& _node) { return visitNode(_node); }
-	virtual bool visit(BinaryOperation& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionCall& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionCallOptions& _node) { return visitNode(_node); }
-	virtual bool visit(NewExpression& _node) { return visitNode(_node); }
-	virtual bool visit(MemberAccess& _node) { return visitNode(_node); }
-	virtual bool visit(IndexAccess& _node) { return visitNode(_node); }
-	virtual bool visit(IndexRangeAccess& _node) { return visitNode(_node); }
-	virtual bool visit(Identifier& _node) { return visitNode(_node); }
-	virtual bool visit(ElementaryTypeNameExpression& _node) { return visitNode(_node); }
-	virtual bool visit(Literal& _node) { return visitNode(_node); }
-	virtual bool visit(StructuredDocumentation& _node) { return visitNode(_node); }
-
-	virtual void endVisit(SourceUnit& _node) { endVisitNode(_node); }
-	virtual void endVisit(PragmaDirective& _node) { endVisitNode(_node); }
-	virtual void endVisit(ImportDirective& _node) { endVisitNode(_node); }
-	virtual void endVisit(ContractDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(IdentifierPath& _node) { endVisitNode(_node); }
-	virtual void endVisit(InheritanceSpecifier& _node) { endVisitNode(_node); }
-	virtual void endVisit(UsingForDirective& _node) { endVisitNode(_node); }
-	virtual void endVisit(UserDefinedValueTypeDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(StructDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(EnumDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(EnumValue& _node) { endVisitNode(_node); }
-	virtual void endVisit(ParameterList& _node) { endVisitNode(_node); }
-	virtual void endVisit(OverrideSpecifier& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(VariableDeclaration& _node) { endVisitNode(_node); }
-	virtual void endVisit(ModifierDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(ModifierInvocation& _node) { endVisitNode(_node); }
-	virtual void endVisit(EventDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(ErrorDefinition& _node) { endVisitNode(_node); }
-	virtual void endVisit(ElementaryTypeName& _node) { endVisitNode(_node); }
-	virtual void endVisit(UserDefinedTypeName& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionTypeName& _node) { endVisitNode(_node); }
-	virtual void endVisit(Mapping& _node) { endVisitNode(_node); }
-	virtual void endVisit(ArrayTypeName& _node) { endVisitNode(_node); }
-	virtual void endVisit(InlineAssembly& _node) { endVisitNode(_node); }
-	virtual void endVisit(Block& _node) { endVisitNode(_node); }
-	virtual void endVisit(PlaceholderStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(IfStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(TryCatchClause& _node) { endVisitNode(_node); }
-	virtual void endVisit(TryStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(WhileStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(ForStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(Continue& _node) { endVisitNode(_node); }
-	virtual void endVisit(Break& _node) { endVisitNode(_node); }
-	virtual void endVisit(Return& _node) { endVisitNode(_node); }
-	virtual void endVisit(Throw& _node) { endVisitNode(_node); }
-	virtual void endVisit(EmitStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(RevertStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(VariableDeclarationStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(ExpressionStatement& _node) { endVisitNode(_node); }
-	virtual void endVisit(Conditional& _node) { endVisitNode(_node); }
-	virtual void endVisit(Assignment& _node) { endVisitNode(_node); }
-	virtual void endVisit(TupleExpression& _node) { endVisitNode(_node); }
-	virtual void endVisit(UnaryOperation& _node) { endVisitNode(_node); }
-	virtual void endVisit(BinaryOperation& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionCall& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionCallOptions& _node) { endVisitNode(_node); }
-	virtual void endVisit(NewExpression& _node) { endVisitNode(_node); }
-	virtual void endVisit(MemberAccess& _node) { endVisitNode(_node); }
-	virtual void endVisit(IndexAccess& _node) { endVisitNode(_node); }
-	virtual void endVisit(IndexRangeAccess& _node) { endVisitNode(_node); }
-	virtual void endVisit(Identifier& _node) { endVisitNode(_node); }
-	virtual void endVisit(ElementaryTypeNameExpression& _node) { endVisitNode(_node); }
-	virtual void endVisit(Literal& _node) { endVisitNode(_node); }
-	virtual void endVisit(StructuredDocumentation& _node) { endVisitNode(_node); }
-
-protected:
-	/// Generic function called by default for each node, to be overridden by derived classes
-	/// if behaviour unspecific to a node type is desired.
-	virtual bool visitNode(ASTNode&) { return true; }
-	/// Generic function called by default for each node, to be overridden by derived classes
-	/// if behaviour unspecific to a node type is desired.
-	virtual void endVisitNode(ASTNode&) { }
-};
-
-class ASTConstVisitor
-{
-public:
-	ASTConstVisitor() = default;
-
-	ASTConstVisitor(ASTConstVisitor const&) = delete;
-	ASTConstVisitor(ASTConstVisitor&&) = delete;
-
-	ASTConstVisitor& operator=(ASTConstVisitor const&) = delete;
-	ASTConstVisitor& operator=(ASTConstVisitor&&) = delete;
-
-	virtual ~ASTConstVisitor() = default;
-
-	virtual bool visit(SourceUnit const& _node) { return visitNode(_node); }
-	virtual bool visit(PragmaDirective const& _node) { return visitNode(_node); }
-	virtual bool visit(ImportDirective const& _node) { return visitNode(_node); }
-	virtual bool visit(ContractDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(IdentifierPath const& _node) { return visitNode(_node); }
-	virtual bool visit(InheritanceSpecifier const& _node) { return visitNode(_node); }
-	virtual bool visit(StructDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(UsingForDirective const& _node) { return visitNode(_node); }
-	virtual bool visit(UserDefinedValueTypeDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(EnumDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(EnumValue const& _node) { return visitNode(_node); }
-	virtual bool visit(ParameterList const& _node) { return visitNode(_node); }
-	virtual bool visit(OverrideSpecifier const& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(VariableDeclaration const& _node) { return visitNode(_node); }
-	virtual bool visit(ModifierDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(ModifierInvocation const& _node) { return visitNode(_node); }
-	virtual bool visit(EventDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(ErrorDefinition const& _node) { return visitNode(_node); }
-	virtual bool visit(ElementaryTypeName const& _node) { return visitNode(_node); }
-	virtual bool visit(UserDefinedTypeName const& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionTypeName const& _node) { return visitNode(_node); }
-	virtual bool visit(Mapping const& _node) { return visitNode(_node); }
-	virtual bool visit(ArrayTypeName const& _node) { return visitNode(_node); }
-	virtual bool visit(Block const& _node) { return visitNode(_node); }
-	virtual bool visit(PlaceholderStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(IfStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(TryCatchClause const& _node) { return visitNode(_node); }
-	virtual bool visit(TryStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(WhileStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(ForStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(Continue const& _node) { return visitNode(_node); }
-	virtual bool visit(InlineAssembly const& _node) { return visitNode(_node); }
-	virtual bool visit(Break const& _node) { return visitNode(_node); }
-	virtual bool visit(Return const& _node) { return visitNode(_node); }
-	virtual bool visit(Throw const& _node) { return visitNode(_node); }
-	virtual bool visit(EmitStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(RevertStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(VariableDeclarationStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(ExpressionStatement const& _node) { return visitNode(_node); }
-	virtual bool visit(Conditional const& _node) { return visitNode(_node); }
-	virtual bool visit(Assignment const& _node) { return visitNode(_node); }
-	virtual bool visit(TupleExpression const& _node) { return visitNode(_node); }
-	virtual bool visit(UnaryOperation const& _node) { return visitNode(_node); }
-	virtual bool visit(BinaryOperation const& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionCall const& _node) { return visitNode(_node); }
-	virtual bool visit(FunctionCallOptions const& _node) { return visitNode(_node); }
-	virtual bool visit(NewExpression const& _node) { return visitNode(_node); }
-	virtual bool visit(MemberAccess const& _node) { return visitNode(_node); }
-	virtual bool visit(IndexAccess const& _node) { return visitNode(_node); }
-	virtual bool visit(IndexRangeAccess const& _node) { return visitNode(_node); }
-	virtual bool visit(Identifier const& _node) { return visitNode(_node); }
-	virtual bool visit(ElementaryTypeNameExpression const& _node) { return visitNode(_node); }
-	virtual bool visit(Literal const& _node) { return visitNode(_node); }
-	virtual bool visit(StructuredDocumentation const& _node) { return visitNode(_node); }
-
-	virtual void endVisit(SourceUnit const& _node) { endVisitNode(_node); }
-	virtual void endVisit(PragmaDirective const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ImportDirective const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ContractDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(IdentifierPath const& _node) { endVisitNode(_node); }
-	virtual void endVisit(InheritanceSpecifier const& _node) { endVisitNode(_node); }
-	virtual void endVisit(UsingForDirective const& _node) { endVisitNode(_node); }
-	virtual void endVisit(UserDefinedValueTypeDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(StructDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(EnumDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(EnumValue const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ParameterList const& _node) { endVisitNode(_node); }
-	virtual void endVisit(OverrideSpecifier const& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(VariableDeclaration const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ModifierDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ModifierInvocation const& _node) { endVisitNode(_node); }
-	virtual void endVisit(EventDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ErrorDefinition const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ElementaryTypeName const& _node) { endVisitNode(_node); }
-	virtual void endVisit(UserDefinedTypeName const& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionTypeName const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Mapping const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ArrayTypeName const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Block const& _node) { endVisitNode(_node); }
-	virtual void endVisit(PlaceholderStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(IfStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(TryCatchClause const& _node) { endVisitNode(_node); }
-	virtual void endVisit(TryStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(WhileStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ForStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Continue const& _node) { endVisitNode(_node); }
-	virtual void endVisit(InlineAssembly const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Break const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Return const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Throw const& _node) { endVisitNode(_node); }
-	virtual void endVisit(EmitStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(RevertStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(VariableDeclarationStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ExpressionStatement const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Conditional const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Assignment const& _node) { endVisitNode(_node); }
-	virtual void endVisit(TupleExpression const& _node) { endVisitNode(_node); }
-	virtual void endVisit(UnaryOperation const& _node) { endVisitNode(_node); }
-	virtual void endVisit(BinaryOperation const& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionCall const& _node) { endVisitNode(_node); }
-	virtual void endVisit(FunctionCallOptions const& _node) { endVisitNode(_node); }
-	virtual void endVisit(NewExpression const& _node) { endVisitNode(_node); }
-	virtual void endVisit(MemberAccess const& _node) { endVisitNode(_node); }
-	virtual void endVisit(IndexAccess const& _node) { endVisitNode(_node); }
-	virtual void endVisit(IndexRangeAccess const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Identifier const& _node) { endVisitNode(_node); }
-	virtual void endVisit(ElementaryTypeNameExpression const& _node) { endVisitNode(_node); }
-	virtual void endVisit(Literal const& _node) { endVisitNode(_node); }
-	virtual void endVisit(StructuredDocumentation const& _node) { endVisitNode(_node); }
-
-protected:
-	/// Generic function called by default for each node, to be overridden by derived classes
-	/// if behaviour unspecific to a node type is desired.
-	virtual bool visitNode(ASTNode const&) { return true; }
-	/// Generic function called by default for each node, to be overridden by derived classes
-	/// if behaviour unspecific to a node type is desired.
-	virtual void endVisitNode(ASTNode const&) { }
-};
-
-/**
- * Utility class that accepts std::functions and calls them for visitNode and endVisitNode.
- */
-class SimpleASTVisitor: public ASTConstVisitor
-{
-public:
-	SimpleASTVisitor(
-		std::function<bool(ASTNode const&)> _onVisit,
-		std::function<void(ASTNode const&)> _onEndVisit
-	): m_onVisit(std::move(_onVisit)), m_onEndVisit(std::move(_onEndVisit)) {}
-
-protected:
-	bool visitNode(ASTNode const& _n) override { return m_onVisit ? m_onVisit(_n) : true; }
-	void endVisitNode(ASTNode const& _n) override { m_onEndVisit(_n); }
-
-private:
-	std::function<bool(ASTNode const&)> m_onVisit;
-	std::function<void(ASTNode const&)> m_onEndVisit;
-};
-
-}
diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h
deleted file mode 100644
index 78dc0e5dddda..000000000000
--- a/libsolidity/ast/AST_accept.h
+++ /dev/null
@@ -1,1027 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Implementation of the accept functions of AST nodes, included by AST.cpp to not clutter that
- * file with these mechanical implementations.
- */
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::frontend
-{
-
-void SourceUnit::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		listAccept(m_nodes, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void SourceUnit::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		listAccept(m_nodes, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void PragmaDirective::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void PragmaDirective::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void ImportDirective::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		for (SymbolAlias const& symbolAlias: symbolAliases())
-			if (symbolAlias.symbol)
-				symbolAlias.symbol->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void ImportDirective::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		for (SymbolAlias const& symbolAlias: symbolAliases())
-			if (symbolAlias.symbol)
-				symbolAlias.symbol->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void StructuredDocumentation::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void StructuredDocumentation::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void ContractDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		listAccept(m_baseContracts, _visitor);
-		listAccept(m_subNodes, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ContractDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		listAccept(m_baseContracts, _visitor);
-		listAccept(m_subNodes, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void IdentifierPath::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void IdentifierPath::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void InheritanceSpecifier::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_baseName->accept(_visitor);
-		if (m_arguments)
-			listAccept(*m_arguments, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void InheritanceSpecifier::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_baseName->accept(_visitor);
-		if (m_arguments)
-			listAccept(*m_arguments, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void EnumDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		listAccept(m_members, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void EnumDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		listAccept(m_members, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void EnumValue::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void EnumValue::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void UserDefinedValueTypeDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_underlyingType)
-			m_underlyingType->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void UserDefinedValueTypeDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_underlyingType)
-			m_underlyingType->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void UsingForDirective::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		listAccept(m_functionsOrLibrary, _visitor);
-		if (m_typeName)
-			m_typeName->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void UsingForDirective::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		listAccept(m_functionsOrLibrary, _visitor);
-		if (m_typeName)
-			m_typeName->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void StructDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		listAccept(m_members, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void StructDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		listAccept(m_members, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void ParameterList::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		listAccept(m_parameters, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void ParameterList::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		listAccept(m_parameters, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void OverrideSpecifier::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		listAccept(m_overrides, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void OverrideSpecifier::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		listAccept(m_overrides, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void FunctionDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		if (m_overrides)
-			m_overrides->accept(_visitor);
-		m_parameters->accept(_visitor);
-		if (m_returnParameters)
-			m_returnParameters->accept(_visitor);
-		listAccept(m_functionModifiers, _visitor);
-		if (m_body)
-			m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void FunctionDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		if (m_overrides)
-			m_overrides->accept(_visitor);
-		m_parameters->accept(_visitor);
-		if (m_returnParameters)
-			m_returnParameters->accept(_visitor);
-		listAccept(m_functionModifiers, _visitor);
-		if (m_body)
-			m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void VariableDeclaration::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_typeName)
-			m_typeName->accept(_visitor);
-		if (m_overrides)
-			m_overrides->accept(_visitor);
-		if (m_value)
-			m_value->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void VariableDeclaration::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_typeName)
-			m_typeName->accept(_visitor);
-		if (m_overrides)
-			m_overrides->accept(_visitor);
-		if (m_value)
-			m_value->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ModifierDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		m_parameters->accept(_visitor);
-		if (m_overrides)
-			m_overrides->accept(_visitor);
-		if (m_body)
-			m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ModifierDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		m_parameters->accept(_visitor);
-		if (m_overrides)
-			m_overrides->accept(_visitor);
-		if (m_body)
-			m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ModifierInvocation::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_modifierName->accept(_visitor);
-		if (m_arguments)
-			listAccept(*m_arguments, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ModifierInvocation::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_modifierName->accept(_visitor);
-		if (m_arguments)
-			listAccept(*m_arguments, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void EventDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		m_parameters->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void EventDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		m_parameters->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ErrorDefinition::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		m_parameters->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ErrorDefinition::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_documentation)
-			m_documentation->accept(_visitor);
-		m_parameters->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ElementaryTypeName::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void ElementaryTypeName::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void UserDefinedTypeName::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		this->pathNode().accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void UserDefinedTypeName::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		this->pathNode().accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void FunctionTypeName::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_parameterTypes->accept(_visitor);
-		m_returnTypes->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void FunctionTypeName::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_parameterTypes->accept(_visitor);
-		m_returnTypes->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Mapping::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_keyType->accept(_visitor);
-		m_valueType->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Mapping::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_keyType->accept(_visitor);
-		m_valueType->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ArrayTypeName::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_baseType->accept(_visitor);
-		if (m_length)
-			m_length->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ArrayTypeName::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_baseType->accept(_visitor);
-		if (m_length)
-			m_length->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void InlineAssembly::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void InlineAssembly::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Block::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		listAccept(m_statements, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void Block::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		listAccept(m_statements, _visitor);
-	_visitor.endVisit(*this);
-}
-
-void PlaceholderStatement::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void PlaceholderStatement::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void IfStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_condition->accept(_visitor);
-		m_trueBody->accept(_visitor);
-		if (m_falseBody)
-			m_falseBody->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void IfStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_condition->accept(_visitor);
-		m_trueBody->accept(_visitor);
-		if (m_falseBody)
-			m_falseBody->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void TryCatchClause::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_parameters)
-			m_parameters->accept(_visitor);
-		m_block->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void TryCatchClause::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_parameters)
-			m_parameters->accept(_visitor);
-		m_block->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void TryStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_externalCall->accept(_visitor);
-		listAccept(m_clauses, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void TryStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_externalCall->accept(_visitor);
-		listAccept(m_clauses, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void WhileStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_condition->accept(_visitor);
-		m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void WhileStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_condition->accept(_visitor);
-		m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ForStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_initExpression)
-			m_initExpression->accept(_visitor);
-		if (m_condExpression)
-			m_condExpression->accept(_visitor);
-		if (m_loopExpression)
-			m_loopExpression->accept(_visitor);
-		m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void ForStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		if (m_initExpression)
-			m_initExpression->accept(_visitor);
-		if (m_condExpression)
-			m_condExpression->accept(_visitor);
-		if (m_loopExpression)
-			m_loopExpression->accept(_visitor);
-		m_body->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Continue::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Continue::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Break::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Break::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Return::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		if (m_expression)
-			m_expression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void Return::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		if (m_expression)
-			m_expression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void Throw::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Throw::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void RevertStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		m_errorCall->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void RevertStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		m_errorCall->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void EmitStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		m_eventCall->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void EmitStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		m_eventCall->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void ExpressionStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		if (m_expression)
-			m_expression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void ExpressionStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		if (m_expression)
-			m_expression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void VariableDeclarationStatement::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		for (ASTPointer<VariableDeclaration> const& var: m_variables)
-			if (var)
-				var->accept(_visitor);
-		if (m_initialValue)
-			m_initialValue->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void VariableDeclarationStatement::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		for (ASTPointer<VariableDeclaration> const& var: m_variables)
-			if (var)
-				var->accept(_visitor);
-		if (m_initialValue)
-			m_initialValue->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Conditional::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_condition->accept(_visitor);
-		m_trueExpression->accept(_visitor);
-		m_falseExpression->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Conditional::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_condition->accept(_visitor);
-		m_trueExpression->accept(_visitor);
-		m_falseExpression->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Assignment::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_leftHandSide->accept(_visitor);
-		m_rightHandSide->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Assignment::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_leftHandSide->accept(_visitor);
-		m_rightHandSide->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void TupleExpression::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		for (auto const& component: m_components)
-			if (component)
-				component->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void TupleExpression::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		for (auto const& component: m_components)
-			if (component)
-				component->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void UnaryOperation::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		m_subExpression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void UnaryOperation::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		m_subExpression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void BinaryOperation::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_left->accept(_visitor);
-		m_right->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void BinaryOperation::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_left->accept(_visitor);
-		m_right->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void FunctionCall::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_expression->accept(_visitor);
-		listAccept(m_arguments, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void FunctionCall::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_expression->accept(_visitor);
-		listAccept(m_arguments, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void FunctionCallOptions::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_expression->accept(_visitor);
-		listAccept(m_options, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void FunctionCallOptions::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_expression->accept(_visitor);
-		listAccept(m_options, _visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void NewExpression::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		m_typeName->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void NewExpression::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		m_typeName->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void MemberAccess::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-		m_expression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void MemberAccess::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-		m_expression->accept(_visitor);
-	_visitor.endVisit(*this);
-}
-
-void IndexAccess::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_base->accept(_visitor);
-		if (m_index)
-			m_index->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void IndexAccess::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_base->accept(_visitor);
-		if (m_index)
-			m_index->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void IndexRangeAccess::accept(ASTVisitor& _visitor)
-{
-	if (_visitor.visit(*this))
-	{
-		m_base->accept(_visitor);
-		if (m_start)
-			m_start->accept(_visitor);
-		if (m_end)
-			m_end->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void IndexRangeAccess::accept(ASTConstVisitor& _visitor) const
-{
-	if (_visitor.visit(*this))
-	{
-		m_base->accept(_visitor);
-		if (m_start)
-			m_start->accept(_visitor);
-		if (m_end)
-			m_end->accept(_visitor);
-	}
-	_visitor.endVisit(*this);
-}
-
-void Identifier::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Identifier::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void ElementaryTypeNameExpression::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void ElementaryTypeNameExpression::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Literal::accept(ASTVisitor& _visitor)
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-void Literal::accept(ASTConstVisitor& _visitor) const
-{
-	_visitor.visit(*this);
-	_visitor.endVisit(*this);
-}
-
-}
diff --git a/libsolidity/ast/CallGraph.cpp b/libsolidity/ast/CallGraph.cpp
deleted file mode 100644
index 04275c374034..000000000000
--- a/libsolidity/ast/CallGraph.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/ast/CallGraph.h>
-
-using namespace solidity::frontend;
-
-bool CallGraph::CompareByID::operator()(Node const& _lhs, Node const& _rhs) const
-{
-	if (_lhs.index() != _rhs.index())
-		return _lhs.index() < _rhs.index();
-
-	if (std::holds_alternative<SpecialNode>(_lhs))
-		return std::get<SpecialNode>(_lhs) < std::get<SpecialNode>(_rhs);
-	return std::get<CallableDeclaration const*>(_lhs)->id() < std::get<CallableDeclaration const*>(_rhs)->id();
-}
-
-bool CallGraph::CompareByID::operator()(Node const& _lhs, int64_t _rhs) const
-{
-	solAssert(!std::holds_alternative<SpecialNode>(_lhs), "");
-
-	return std::get<CallableDeclaration const*>(_lhs)->id() < _rhs;
-}
-
-bool CallGraph::CompareByID::operator()(int64_t _lhs, Node const& _rhs) const
-{
-	solAssert(!std::holds_alternative<SpecialNode>(_rhs), "");
-
-	return _lhs < std::get<CallableDeclaration const*>(_rhs)->id();
-}
diff --git a/libsolidity/ast/CallGraph.h b/libsolidity/ast/CallGraph.h
deleted file mode 100644
index c4b4e957a71d..000000000000
--- a/libsolidity/ast/CallGraph.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Data structure representing a function call graph.
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-
-#include <map>
-#include <set>
-#include <variant>
-
-namespace solidity::frontend
-{
-
-/**
- * Function call graph for a contract at the granularity of Solidity functions and modifiers.
- * The graph can represent the situation either at contract creation or after deployment.
- * The graph does not preserve temporal relations between calls - edges coming out of the same node
- * show which calls were performed but not in what order.
- *
- * Stores also extra information about contracts that can be created and events that can be emitted
- * from any of the functions in it.
- */
-struct CallGraph
-{
-	enum class SpecialNode
-	{
-		InternalDispatch,
-		Entry,
-	};
-
-	using Node = std::variant<CallableDeclaration const*, SpecialNode>;
-
-	struct CompareByID
-	{
-		using is_transparent = void;
-		bool operator()(Node const& _lhs, Node const& _rhs) const;
-		bool operator()(Node const& _lhs, int64_t _rhs) const;
-		bool operator()(int64_t _lhs, Node const& _rhs) const;
-	};
-
-	/// Graph edges. Edges are directed and lead from the caller to the callee.
-	/// The map contains a key for every possible caller, even if does not actually perform
-	/// any calls.
-	std::map<Node, std::set<Node, CompareByID>, CompareByID> edges;
-
-	/// Contracts that need to be compiled before this one can be compiled.
-	/// The value is the ast node that created the dependency.
-	std::map<ContractDefinition const*, ASTNode const*, ASTCompareByID<ContractDefinition>> bytecodeDependency;
-
-	/// Events that may get emitted by functions present in the graph.
-	std::set<EventDefinition const*, ASTNode::CompareByID> emittedEvents;
-
-	/// Errors that are used by functions present in the graph.
-	std::set<ErrorDefinition const*, ASTNode::CompareByID> usedErrors;
-};
-
-}
diff --git a/libsolidity/ast/ExperimentalFeatures.h b/libsolidity/ast/ExperimentalFeatures.h
deleted file mode 100644
index ae2cb14c54c4..000000000000
--- a/libsolidity/ast/ExperimentalFeatures.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * List of experimental features.
- */
-
-#pragma once
-
-#include <map>
-#include <set>
-
-namespace solidity::frontend
-{
-
-enum class ExperimentalFeature
-{
-	ABIEncoderV2, // new ABI encoder that makes use of Yul
-	SMTChecker,
-	Test,
-	TestOnlyAnalysis,
-	Solidity
-};
-
-static std::set<ExperimentalFeature> const ExperimentalFeatureWithoutWarning =
-{
-	ExperimentalFeature::ABIEncoderV2,
-	ExperimentalFeature::SMTChecker,
-	ExperimentalFeature::TestOnlyAnalysis,
-};
-
-static std::map<std::string, ExperimentalFeature> const ExperimentalFeatureNames =
-{
-	{ "ABIEncoderV2", ExperimentalFeature::ABIEncoderV2 },
-	{ "SMTChecker", ExperimentalFeature::SMTChecker },
-	{ "__test", ExperimentalFeature::Test },
-	{ "__testOnlyAnalysis", ExperimentalFeature::TestOnlyAnalysis },
-	{ "solidity", ExperimentalFeature::Solidity }
-};
-
-}
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
deleted file mode 100644
index da508755687b..000000000000
--- a/libsolidity/ast/TypeProvider.cpp
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::util;
-
-BoolType const TypeProvider::m_boolean{};
-InaccessibleDynamicType const TypeProvider::m_inaccessibleDynamic{};
-
-/// The string and bytes unique_ptrs are initialized when they are first used because
-/// they rely on `byte` being available which we cannot guarantee in the static init context.
-std::unique_ptr<ArrayType> TypeProvider::m_bytesStorage;
-std::unique_ptr<ArrayType> TypeProvider::m_bytesMemory;
-std::unique_ptr<ArrayType> TypeProvider::m_bytesCalldata;
-std::unique_ptr<ArrayType> TypeProvider::m_stringStorage;
-std::unique_ptr<ArrayType> TypeProvider::m_stringMemory;
-
-TupleType const TypeProvider::m_emptyTuple{};
-AddressType const TypeProvider::m_payableAddress{StateMutability::Payable};
-AddressType const TypeProvider::m_address{StateMutability::NonPayable};
-
-std::array<std::unique_ptr<IntegerType>, 32> const TypeProvider::m_intM{{
-	{std::make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Signed)},
-	{std::make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Signed)}
-}};
-
-std::array<std::unique_ptr<IntegerType>, 32> const TypeProvider::m_uintM{{
-	{std::make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Unsigned)},
-	{std::make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Unsigned)}
-}};
-
-std::array<std::unique_ptr<FixedBytesType>, 32> const TypeProvider::m_bytesM{{
-	{std::make_unique<FixedBytesType>(1)},
-	{std::make_unique<FixedBytesType>(2)},
-	{std::make_unique<FixedBytesType>(3)},
-	{std::make_unique<FixedBytesType>(4)},
-	{std::make_unique<FixedBytesType>(5)},
-	{std::make_unique<FixedBytesType>(6)},
-	{std::make_unique<FixedBytesType>(7)},
-	{std::make_unique<FixedBytesType>(8)},
-	{std::make_unique<FixedBytesType>(9)},
-	{std::make_unique<FixedBytesType>(10)},
-	{std::make_unique<FixedBytesType>(11)},
-	{std::make_unique<FixedBytesType>(12)},
-	{std::make_unique<FixedBytesType>(13)},
-	{std::make_unique<FixedBytesType>(14)},
-	{std::make_unique<FixedBytesType>(15)},
-	{std::make_unique<FixedBytesType>(16)},
-	{std::make_unique<FixedBytesType>(17)},
-	{std::make_unique<FixedBytesType>(18)},
-	{std::make_unique<FixedBytesType>(19)},
-	{std::make_unique<FixedBytesType>(20)},
-	{std::make_unique<FixedBytesType>(21)},
-	{std::make_unique<FixedBytesType>(22)},
-	{std::make_unique<FixedBytesType>(23)},
-	{std::make_unique<FixedBytesType>(24)},
-	{std::make_unique<FixedBytesType>(25)},
-	{std::make_unique<FixedBytesType>(26)},
-	{std::make_unique<FixedBytesType>(27)},
-	{std::make_unique<FixedBytesType>(28)},
-	{std::make_unique<FixedBytesType>(29)},
-	{std::make_unique<FixedBytesType>(30)},
-	{std::make_unique<FixedBytesType>(31)},
-	{std::make_unique<FixedBytesType>(32)}
-}};
-
-std::array<std::unique_ptr<MagicType>, 4> const TypeProvider::m_magics{{
-	{std::make_unique<MagicType>(MagicType::Kind::Block)},
-	{std::make_unique<MagicType>(MagicType::Kind::Message)},
-	{std::make_unique<MagicType>(MagicType::Kind::Transaction)},
-	{std::make_unique<MagicType>(MagicType::Kind::ABI)}
-	// MetaType is stored separately
-}};
-
-inline void clearCache(Type const& type)
-{
-	type.clearCache();
-}
-
-template <typename T>
-inline void clearCache(std::unique_ptr<T> const& type)
-{
-	// Some lazy-initialized types might not exist yet.
-	if (type)
-		type->clearCache();
-}
-
-template <typename Container>
-inline void clearCaches(Container& container)
-{
-	for (auto const& e: container)
-		clearCache(e);
-}
-
-void TypeProvider::reset()
-{
-	clearCache(m_boolean);
-	clearCache(m_inaccessibleDynamic);
-	clearCache(m_bytesStorage);
-	clearCache(m_bytesMemory);
-	clearCache(m_bytesCalldata);
-	clearCache(m_stringStorage);
-	clearCache(m_stringMemory);
-	clearCache(m_emptyTuple);
-	clearCache(m_payableAddress);
-	clearCache(m_address);
-	clearCaches(instance().m_intM);
-	clearCaches(instance().m_uintM);
-	clearCaches(instance().m_bytesM);
-	clearCaches(instance().m_magics);
-
-	instance().m_generalTypes.clear();
-	instance().m_stringLiteralTypes.clear();
-	instance().m_ufixedMxN.clear();
-	instance().m_fixedMxN.clear();
-}
-
-template <typename T, typename... Args>
-inline T const* TypeProvider::createAndGet(Args&& ... _args)
-{
-	instance().m_generalTypes.emplace_back(std::make_unique<T>(std::forward<Args>(_args)...));
-	return static_cast<T const*>(instance().m_generalTypes.back().get());
-}
-
-Type const* TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken const& _type, std::optional<StateMutability> _stateMutability)
-{
-	solAssert(
-		TokenTraits::isElementaryTypeName(_type.token()),
-		"Expected an elementary type name but got " + _type.toString()
-	);
-
-	unsigned const m = _type.firstNumber();
-	unsigned const n = _type.secondNumber();
-
-	switch (_type.token())
-	{
-	case Token::IntM:
-		return integer(m, IntegerType::Modifier::Signed);
-	case Token::UIntM:
-		return integer(m, IntegerType::Modifier::Unsigned);
-	case Token::Byte:
-		return byte();
-	case Token::BytesM:
-		return fixedBytes(m);
-	case Token::FixedMxN:
-		return fixedPoint(m, n, FixedPointType::Modifier::Signed);
-	case Token::UFixedMxN:
-		return fixedPoint(m, n, FixedPointType::Modifier::Unsigned);
-	case Token::Int:
-		return integer(256, IntegerType::Modifier::Signed);
-	case Token::UInt:
-		return integer(256, IntegerType::Modifier::Unsigned);
-	case Token::Fixed:
-		return fixedPoint(128, 18, FixedPointType::Modifier::Signed);
-	case Token::UFixed:
-		return fixedPoint(128, 18, FixedPointType::Modifier::Unsigned);
-	case Token::Address:
-	{
-		if (_stateMutability)
-		{
-			solAssert(*_stateMutability == StateMutability::Payable, "");
-			return payableAddress();
-		}
-		return address();
-	}
-	case Token::Bool:
-		return boolean();
-	case Token::Bytes:
-		return bytesStorage();
-	case Token::String:
-		return stringStorage();
-	default:
-		solAssert(
-			false,
-			"Unable to convert elementary typename " + _type.toString() + " to type."
-		);
-	}
-}
-
-Type const* TypeProvider::fromElementaryTypeName(std::string const& _name)
-{
-	std::vector<std::string> nameParts;
-	boost::split(nameParts, _name, boost::is_any_of(" "));
-	solAssert(nameParts.size() == 1 || nameParts.size() == 2, "Cannot parse elementary type: " + _name);
-
-	Token token;
-	unsigned short firstNum, secondNum;
-	std::tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(nameParts[0]);
-
-	auto t = fromElementaryTypeName(ElementaryTypeNameToken(token, firstNum, secondNum));
-	if (auto* ref = dynamic_cast<ReferenceType const*>(t))
-	{
-		DataLocation location = DataLocation::Storage;
-		if (nameParts.size() == 2)
-		{
-			if (nameParts[1] == "storage")
-				location = DataLocation::Storage;
-			else if (nameParts[1] == "calldata")
-				location = DataLocation::CallData;
-			else if (nameParts[1] == "memory")
-				location = DataLocation::Memory;
-			else
-				solAssert(false, "Unknown data location: " + nameParts[1]);
-		}
-		return withLocation(ref, location, true);
-	}
-	else if (t->category() == Type::Category::Address)
-	{
-		if (nameParts.size() == 2)
-		{
-			if (nameParts[1] == "payable")
-				return payableAddress();
-			else
-				solAssert(false, "Invalid state mutability for address type: " + nameParts[1]);
-		}
-		return address();
-	}
-	else
-	{
-		solAssert(nameParts.size() == 1, "Storage location suffix only allowed for reference types");
-		return t;
-	}
-}
-
-ArrayType const* TypeProvider::bytesStorage()
-{
-	if (!m_bytesStorage)
-		m_bytesStorage = std::make_unique<ArrayType>(DataLocation::Storage, false);
-	return m_bytesStorage.get();
-}
-
-ArrayType const* TypeProvider::bytesMemory()
-{
-	if (!m_bytesMemory)
-		m_bytesMemory = std::make_unique<ArrayType>(DataLocation::Memory, false);
-	return m_bytesMemory.get();
-}
-
-ArrayType const* TypeProvider::bytesCalldata()
-{
-	if (!m_bytesCalldata)
-		m_bytesCalldata = std::make_unique<ArrayType>(DataLocation::CallData, false);
-	return m_bytesCalldata.get();
-}
-
-ArrayType const* TypeProvider::stringStorage()
-{
-	if (!m_stringStorage)
-		m_stringStorage = std::make_unique<ArrayType>(DataLocation::Storage, true);
-	return m_stringStorage.get();
-}
-
-ArrayType const* TypeProvider::stringMemory()
-{
-	if (!m_stringMemory)
-		m_stringMemory = std::make_unique<ArrayType>(DataLocation::Memory, true);
-	return m_stringMemory.get();
-}
-
-Type const* TypeProvider::forLiteral(Literal const& _literal)
-{
-	switch (_literal.token())
-	{
-	case Token::TrueLiteral:
-	case Token::FalseLiteral:
-		return boolean();
-	case Token::Number:
-		return rationalNumber(_literal);
-	case Token::StringLiteral:
-	case Token::UnicodeStringLiteral:
-	case Token::HexStringLiteral:
-		return stringLiteral(_literal.value());
-	default:
-		return nullptr;
-	}
-}
-
-RationalNumberType const* TypeProvider::rationalNumber(Literal const& _literal)
-{
-	solAssert(_literal.token() == Token::Number, "");
-	std::tuple<bool, rational> validLiteral = RationalNumberType::isValidLiteral(_literal);
-	if (std::get<0>(validLiteral))
-	{
-		Type const* compatibleBytesType = nullptr;
-		if (_literal.isHexNumber())
-		{
-			size_t const digitCount = _literal.valueWithoutUnderscores().length() - 2;
-			if (digitCount % 2 == 0 && (digitCount / 2) <= 32)
-				compatibleBytesType = fixedBytes(static_cast<unsigned>(digitCount / 2));
-		}
-
-		return rationalNumber(std::get<1>(validLiteral), compatibleBytesType);
-	}
-	return nullptr;
-}
-
-StringLiteralType const* TypeProvider::stringLiteral(std::string const& literal)
-{
-	auto i = instance().m_stringLiteralTypes.find(literal);
-	if (i != instance().m_stringLiteralTypes.end())
-		return i->second.get();
-	else
-		return instance().m_stringLiteralTypes.emplace(literal, std::make_unique<StringLiteralType>(literal)).first->second.get();
-}
-
-FixedPointType const* TypeProvider::fixedPoint(unsigned m, unsigned n, FixedPointType::Modifier _modifier)
-{
-	auto& map = _modifier == FixedPointType::Modifier::Unsigned ? instance().m_ufixedMxN : instance().m_fixedMxN;
-
-	auto i = map.find(std::make_pair(m, n));
-	if (i != map.end())
-		return i->second.get();
-
-	return map.emplace(
-		std::make_pair(m, n),
-		std::make_unique<FixedPointType>(m, n, _modifier)
-	).first->second.get();
-}
-
-TupleType const* TypeProvider::tuple(std::vector<Type const*> members)
-{
-	if (members.empty())
-		return &m_emptyTuple;
-
-	return createAndGet<TupleType>(std::move(members));
-}
-
-ReferenceType const* TypeProvider::withLocation(ReferenceType const* _type, DataLocation _location, bool _isPointer)
-{
-	if (_type->location() == _location && _type->isPointer() == _isPointer)
-		return _type;
-
-	instance().m_generalTypes.emplace_back(_type->copyForLocation(_location, _isPointer));
-	return static_cast<ReferenceType const*>(instance().m_generalTypes.back().get());
-}
-
-FunctionType const* TypeProvider::function(FunctionDefinition const& _function, FunctionType::Kind _kind)
-{
-	return createAndGet<FunctionType>(_function, _kind);
-}
-
-FunctionType const* TypeProvider::function(VariableDeclaration const& _varDecl)
-{
-	return createAndGet<FunctionType>(_varDecl);
-}
-
-FunctionType const* TypeProvider::function(EventDefinition const& _def)
-{
-	return createAndGet<FunctionType>(_def);
-}
-
-FunctionType const* TypeProvider::function(ErrorDefinition const& _def)
-{
-	return createAndGet<FunctionType>(_def);
-}
-
-FunctionType const* TypeProvider::function(FunctionTypeName const& _typeName)
-{
-	return createAndGet<FunctionType>(_typeName);
-}
-
-FunctionType const* TypeProvider::function(
-	strings const& _parameterTypes,
-	strings const& _returnParameterTypes,
-	FunctionType::Kind _kind,
-	StateMutability _stateMutability,
-	FunctionType::Options _options
-)
-{
-	// Can only use this constructor for "arbitraryParameters".
-	solAssert(!_options.valueSet && !_options.gasSet && !_options.saltSet && !_options.hasBoundFirstArgument);
-	return createAndGet<FunctionType>(
-		_parameterTypes,
-		_returnParameterTypes,
-		_kind,
-		_stateMutability,
-		std::move(_options)
-	);
-}
-
-FunctionType const* TypeProvider::function(
-	TypePointers const& _parameterTypes,
-	TypePointers const& _returnParameterTypes,
-	strings _parameterNames,
-	strings _returnParameterNames,
-	FunctionType::Kind _kind,
-	StateMutability _stateMutability,
-	Declaration const* _declaration,
-	FunctionType::Options _options
-)
-{
-	return createAndGet<FunctionType>(
-		_parameterTypes,
-		_returnParameterTypes,
-		_parameterNames,
-		_returnParameterNames,
-		_kind,
-		_stateMutability,
-		_declaration,
-		std::move(_options)
-	);
-}
-
-RationalNumberType const* TypeProvider::rationalNumber(rational const& _value, Type const* _compatibleBytesType)
-{
-	return createAndGet<RationalNumberType>(_value, _compatibleBytesType);
-}
-
-ArrayType const* TypeProvider::array(DataLocation _location, bool _isString)
-{
-	if (_isString)
-	{
-		if (_location == DataLocation::Storage)
-			return stringStorage();
-		if (_location == DataLocation::Memory)
-			return stringMemory();
-	}
-	else
-	{
-		if (_location == DataLocation::Storage)
-			return bytesStorage();
-		if (_location == DataLocation::Memory)
-			return bytesMemory();
-	}
-	return createAndGet<ArrayType>(_location, _isString);
-}
-
-ArrayType const* TypeProvider::array(DataLocation _location, Type const* _baseType)
-{
-	return createAndGet<ArrayType>(_location, _baseType);
-}
-
-ArrayType const* TypeProvider::array(DataLocation _location, Type const* _baseType, u256 const& _length)
-{
-	return createAndGet<ArrayType>(_location, _baseType, _length);
-}
-
-ArraySliceType const* TypeProvider::arraySlice(ArrayType const& _arrayType)
-{
-	return createAndGet<ArraySliceType>(_arrayType);
-}
-
-ContractType const* TypeProvider::contract(ContractDefinition const& _contractDef, bool _isSuper)
-{
-	return createAndGet<ContractType>(_contractDef, _isSuper);
-}
-
-EnumType const* TypeProvider::enumType(EnumDefinition const& _enumDef)
-{
-	return createAndGet<EnumType>(_enumDef);
-}
-
-ModuleType const* TypeProvider::module(SourceUnit const& _source)
-{
-	return createAndGet<ModuleType>(_source);
-}
-
-TypeType const* TypeProvider::typeType(Type const* _actualType)
-{
-	return createAndGet<TypeType>(_actualType);
-}
-
-StructType const* TypeProvider::structType(StructDefinition const& _struct, DataLocation _location)
-{
-	return createAndGet<StructType>(_struct, _location);
-}
-
-ModifierType const* TypeProvider::modifier(ModifierDefinition const& _def)
-{
-	return createAndGet<ModifierType>(_def);
-}
-
-MagicType const* TypeProvider::magic(MagicType::Kind _kind)
-{
-	solAssert(_kind != MagicType::Kind::MetaType, "MetaType is handled separately");
-	return m_magics.at(static_cast<size_t>(_kind)).get();
-}
-
-MagicType const* TypeProvider::meta(Type const* _type)
-{
-	solAssert(
-		_type && (
-			_type->category() == Type::Category::Contract ||
-			_type->category() == Type::Category::Integer ||
-			_type->category() == Type::Category::Enum
-		),
-		"Only enum, contracts or integer types supported for now."
-	);
-	return createAndGet<MagicType>(_type);
-}
-
-MappingType const* TypeProvider::mapping(Type const* _keyType, ASTString _keyName, Type const* _valueType, ASTString _valueName)
-{
-	return createAndGet<MappingType>(_keyType, _keyName, _valueType, _valueName);
-}
-
-UserDefinedValueType const* TypeProvider::userDefinedValueType(UserDefinedValueTypeDefinition const& _definition)
-{
-	return createAndGet<UserDefinedValueType>(_definition);
-}
diff --git a/libsolidity/ast/TypeProvider.h b/libsolidity/ast/TypeProvider.h
deleted file mode 100644
index 02b9eb35d2b2..000000000000
--- a/libsolidity/ast/TypeProvider.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/Types.h>
-
-#include <array>
-#include <map>
-#include <memory>
-#include <optional>
-#include <utility>
-
-namespace solidity::frontend
-{
-
-/**
- * API for accessing the Solidity Type System.
- *
- * This is the Solidity Compiler's type provider. Use it to request for types. The caller does
- * <b>not</b> own the types.
- *
- * It is not recommended to explicitly instantiate types unless you really know what and why
- * you are doing it.
- */
-class TypeProvider
-{
-public:
-	TypeProvider() = default;
-	TypeProvider(TypeProvider&&) = default;
-	TypeProvider(TypeProvider const&) = delete;
-	TypeProvider& operator=(TypeProvider&&) = default;
-	TypeProvider& operator=(TypeProvider const&) = delete;
-	~TypeProvider() = default;
-
-	/// Resets state of this TypeProvider to initial state, wiping all mutable types.
-	/// This invalidates all dangling pointers to types provided by this TypeProvider.
-	static void reset();
-
-	/// @name Factory functions
-	/// Factory functions that convert an AST @ref TypeName to a Type.
-	static Type const* fromElementaryTypeName(ElementaryTypeNameToken const& _type, std::optional<StateMutability> _stateMutability = {});
-
-	/// Converts a given elementary type name with optional data location
-	/// suffix " storage", " calldata" or " memory" to a type pointer. If suffix not given, defaults to " storage".
-	static Type const* fromElementaryTypeName(std::string const& _name);
-
-	/// @returns boolean type.
-	static BoolType const* boolean() noexcept { return &m_boolean; }
-
-	static FixedBytesType const* byte() { return fixedBytes(1); }
-	static FixedBytesType const* fixedBytes(unsigned m) { return m_bytesM.at(m - 1).get(); }
-
-	static ArrayType const* bytesStorage();
-	static ArrayType const* bytesMemory();
-	static ArrayType const* bytesCalldata();
-	static ArrayType const* stringStorage();
-	static ArrayType const* stringMemory();
-
-	/// Constructor for a byte array ("bytes") and string.
-	static ArrayType const* array(DataLocation _location, bool _isString = false);
-
-	/// Constructor for a dynamically sized array type ("type[]")
-	static ArrayType const* array(DataLocation _location, Type const* _baseType);
-
-	/// Constructor for a fixed-size array type ("type[20]")
-	static ArrayType const* array(DataLocation _location, Type const* _baseType, u256 const& _length);
-
-	static ArraySliceType const* arraySlice(ArrayType const& _arrayType);
-
-	static AddressType const* payableAddress() noexcept { return &m_payableAddress; }
-	static AddressType const* address() noexcept { return &m_address; }
-
-	static IntegerType const* integer(unsigned _bits, IntegerType::Modifier _modifier)
-	{
-		solAssert((_bits % 8) == 0, "");
-		if (_modifier == IntegerType::Modifier::Unsigned)
-			return m_uintM.at(_bits / 8 - 1).get();
-		else
-			return m_intM.at(_bits / 8 - 1).get();
-	}
-	static IntegerType const* uint(unsigned _bits) { return integer(_bits, IntegerType::Modifier::Unsigned); }
-
-	static IntegerType const* uint256() { return uint(256); }
-	static IntegerType const* int256() { return integer(256, IntegerType::Modifier::Signed); }
-
-	static FixedPointType const* fixedPoint(unsigned m, unsigned n, FixedPointType::Modifier _modifier);
-
-	static StringLiteralType const* stringLiteral(std::string const& literal);
-
-	/// @param members the member types the tuple type must contain. This is passed by value on purspose.
-	/// @returns a tuple type with the given members.
-	static TupleType const* tuple(std::vector<Type const*> members);
-
-	static TupleType const* emptyTuple() noexcept { return &m_emptyTuple; }
-
-	static ReferenceType const* withLocation(ReferenceType const* _type, DataLocation _location, bool _isPointer);
-
-	/// @returns a copy of @a _type having the same location as this (and is not a pointer type)
-	///          if _type is a reference type and an unmodified copy of _type otherwise.
-	///          This function is mostly useful to modify inner types appropriately.
-	static Type const* withLocationIfReference(DataLocation _location, Type const* _type, bool _isPointer = false)
-	{
-		if (auto refType = dynamic_cast<ReferenceType const*>(_type))
-			return withLocation(refType, _location, _isPointer);
-
-		return _type;
-	}
-
-	static bool isReferenceWithLocation(Type const* _type, DataLocation _location)
-	{
-		if (auto const* refType = dynamic_cast<ReferenceType const*>(_type))
-			if (refType->location() == _location)
-				return true;
-		return false;
-	}
-
-	/// @returns the internally-facing or externally-facing type of a function or the type of a function declaration.
-	static FunctionType const* function(FunctionDefinition const& _function, FunctionType::Kind _kind = FunctionType::Kind::Declaration);
-
-	/// @returns the accessor function type of a state variable.
-	static FunctionType const* function(VariableDeclaration const& _varDecl);
-
-	/// @returns the function type of an event.
-	static FunctionType const* function(EventDefinition const& _event);
-
-	static FunctionType const* function(ErrorDefinition const& _error);
-
-	/// @returns the type of a function type name.
-	static FunctionType const* function(FunctionTypeName const& _typeName);
-
-	/// @returns the function type to be used for a plain type (not derived from a declaration).
-	static FunctionType const* function(
-		strings const& _parameterTypes,
-		strings const& _returnParameterTypes,
-		FunctionType::Kind _kind = FunctionType::Kind::Internal,
-		StateMutability _stateMutability = StateMutability::NonPayable,
-		FunctionType::Options _options = {}
-	);
-
-	/// @returns a highly customized FunctionType, use with care.
-	static FunctionType const* function(
-		TypePointers const& _parameterTypes,
-		TypePointers const& _returnParameterTypes,
-		strings _parameterNames = strings{},
-		strings _returnParameterNames = strings{},
-		FunctionType::Kind _kind = FunctionType::Kind::Internal,
-		StateMutability _stateMutability = StateMutability::NonPayable,
-		Declaration const* _declaration = nullptr,
-		FunctionType::Options _options = {}
-	);
-
-	/// Auto-detect the proper type for a literal. @returns an empty pointer if the literal does
-	/// not fit any type.
-	static Type const* forLiteral(Literal const& _literal);
-	static RationalNumberType const* rationalNumber(Literal const& _literal);
-
-	static RationalNumberType const* rationalNumber(
-		rational const& _value,
-		Type const* _compatibleBytesType = nullptr
-	);
-
-	static ContractType const* contract(ContractDefinition const& _contract, bool _isSuper = false);
-
-	static InaccessibleDynamicType const* inaccessibleDynamic() noexcept { return &m_inaccessibleDynamic; }
-
-	/// @returns the type of an enum instance for given definition, there is one distinct type per enum definition.
-	static EnumType const* enumType(EnumDefinition const& _enum);
-
-	/// @returns special type for imported modules. These mainly give access to their scope via members.
-	static ModuleType const* module(SourceUnit const& _source);
-
-	static TypeType const* typeType(Type const* _actualType);
-
-	static StructType const* structType(StructDefinition const& _struct, DataLocation _location);
-
-	static ModifierType const* modifier(ModifierDefinition const& _modifierDef);
-
-	static MagicType const* magic(MagicType::Kind _kind);
-
-	static MagicType const* meta(Type const* _type);
-
-	static MappingType const* mapping(Type const* _keyType, ASTString _keyName, Type const* _valueType, ASTString _valueName);
-
-	static UserDefinedValueType const* userDefinedValueType(UserDefinedValueTypeDefinition const& _definition);
-
-private:
-	/// Global TypeProvider instance.
-	static TypeProvider& instance()
-	{
-		static TypeProvider _provider;
-		return _provider;
-	}
-
-	template <typename T, typename... Args>
-	static inline T const* createAndGet(Args&& ... _args);
-
-	static BoolType const m_boolean;
-	static InaccessibleDynamicType const m_inaccessibleDynamic;
-
-	/// These are lazy-initialized because they depend on `byte` being available.
-	static std::unique_ptr<ArrayType> m_bytesStorage;
-	static std::unique_ptr<ArrayType> m_bytesMemory;
-	static std::unique_ptr<ArrayType> m_bytesCalldata;
-	static std::unique_ptr<ArrayType> m_stringStorage;
-	static std::unique_ptr<ArrayType> m_stringMemory;
-
-	static TupleType const m_emptyTuple;
-	static AddressType const m_payableAddress;
-	static AddressType const m_address;
-	static std::array<std::unique_ptr<IntegerType>, 32> const m_intM;
-	static std::array<std::unique_ptr<IntegerType>, 32> const m_uintM;
-	static std::array<std::unique_ptr<FixedBytesType>, 32> const m_bytesM;
-	static std::array<std::unique_ptr<MagicType>, 4> const m_magics;        ///< MagicType's except MetaType
-
-	std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_ufixedMxN{};
-	std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_fixedMxN{};
-	std::map<std::string, std::unique_ptr<StringLiteralType>> m_stringLiteralTypes{};
-	std::vector<std::unique_ptr<Type>> m_generalTypes{};
-};
-
-}
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
deleted file mode 100644
index 7b3e42143804..000000000000
--- a/libsolidity/ast/Types.cpp
+++ /dev/null
@@ -1,4275 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity data types
- */
-
-#include <libsolidity/ast/Types.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libsolidity/analysis/ConstantEvaluator.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/UTF8.h>
-#include <libsolutil/Visitor.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/tail.hpp>
-#include <range/v3/view/transform.hpp>
-#include <range/v3/view/filter.hpp>
-
-#include <limits>
-#include <unordered_set>
-#include <utility>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-
-/// Checks whether _mantissa * (10 ** _expBase10) fits into 4096 bits.
-bool fitsPrecisionBase10(bigint const& _mantissa, uint32_t _expBase10)
-{
-	double const log2Of10AwayFromZero = 3.3219280948873624;
-	return fitsPrecisionBaseX(_mantissa, log2Of10AwayFromZero, _expBase10);
-}
-
-/// Checks whether _value fits into IntegerType _type.
-BoolResult fitsIntegerType(bigint const& _value, IntegerType const& _type)
-{
-	if (_value < 0 && !_type.isSigned())
-		return BoolResult::err("Cannot implicitly convert signed literal to unsigned type.");
-
-	if (_type.minValue() > _value || _value > _type.maxValue())
-		return BoolResult::err("Literal is too large to fit in " + _type.toString(false) + ".");
-
-	return true;
-}
-
-/// Checks whether _value fits into _bits bits when having 1 bit as the sign bit
-/// if _signed is true.
-bool fitsIntoBits(bigint const& _value, unsigned _bits, bool _signed)
-{
-	return fitsIntegerType(
-		_value,
-		*TypeProvider::integer(
-			_bits,
-			_signed ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned
-		)
-	);
-}
-
-util::Result<TypePointers> transformParametersToExternal(TypePointers const& _parameters, bool _inLibrary)
-{
-	TypePointers transformed;
-
-	for (auto const& type: _parameters)
-	{
-		if (!type)
-			return util::Result<TypePointers>::err("Type information not present.");
-		else if (Type const* ext = type->interfaceType(_inLibrary).get())
-			transformed.push_back(ext);
-		else
-			return util::Result<TypePointers>::err("Parameter should have external type.");
-	}
-
-	return transformed;
-}
-
-std::string toStringInParentheses(TypePointers const& _types, bool _withoutDataLocation)
-{
-	return '(' + util::joinHumanReadable(
-		_types | ranges::views::transform([&](auto const* _type) { return _type->toString(_withoutDataLocation); }),
-		","
-	) + ')';
-}
-
-}
-
-MemberList::Member::Member(Declaration const* _declaration, Type const* _type):
-	Member(_declaration, _type, _declaration->name())
-{}
-
-MemberList::Member::Member(Declaration const* _declaration, Type const* _type, std::string _name):
-	name(std::move(_name)),
-	type(_type),
-	declaration(_declaration)
-{
-}
-
-void Type::clearCache() const
-{
-	m_members.clear();
-	m_stackItems.reset();
-	m_stackSize.reset();
-}
-
-void StorageOffsets::computeOffsets(TypePointers const& _types)
-{
-	bigint slotOffset = 0;
-	unsigned byteOffset = 0;
-	std::map<size_t, std::pair<u256, unsigned>> offsets;
-	for (size_t i = 0; i < _types.size(); ++i)
-	{
-		Type const* type = _types[i];
-		if (!type->canBeStored())
-			continue;
-		if (byteOffset + type->storageBytes() > 32)
-		{
-			// would overflow, go to next slot
-			++slotOffset;
-			byteOffset = 0;
-		}
-		solAssert(slotOffset < bigint(1) << 256 ,"Object too large for storage.");
-		offsets[i] = std::make_pair(u256(slotOffset), byteOffset);
-		solAssert(type->storageSize() >= 1, "Invalid storage size.");
-		if (type->storageSize() == 1 && byteOffset + type->storageBytes() <= 32)
-			byteOffset += type->storageBytes();
-		else
-		{
-			slotOffset += type->storageSize();
-			byteOffset = 0;
-		}
-	}
-	if (byteOffset > 0)
-		++slotOffset;
-	solAssert(slotOffset < bigint(1) << 256, "Object too large for storage.");
-	m_storageSize = u256(slotOffset);
-	swap(m_offsets, offsets);
-}
-
-std::pair<u256, unsigned> const* StorageOffsets::offset(size_t _index) const
-{
-	if (m_offsets.count(_index))
-		return &m_offsets.at(_index);
-	else
-		return nullptr;
-}
-
-void MemberList::combine(MemberList const & _other)
-{
-	m_memberTypes += _other.m_memberTypes;
-}
-
-std::pair<u256, unsigned> const* MemberList::memberStorageOffset(std::string const& _name) const
-{
-	StorageOffsets const& offsets = storageOffsets();
-
-	for (auto&& [index, member]: m_memberTypes | ranges::views::enumerate)
-		if (member.name == _name)
-			return offsets.offset(index);
-	return nullptr;
-}
-
-u256 const& MemberList::storageSize() const
-{
-	return storageOffsets().storageSize();
-}
-
-StorageOffsets const& MemberList::storageOffsets() const {
-	return m_storageOffsets.init([&]{
-		TypePointers memberTypes;
-		memberTypes.reserve(m_memberTypes.size());
-		for (auto const& member: m_memberTypes)
-			memberTypes.push_back(member.type);
-
-		StorageOffsets storageOffsets;
-		storageOffsets.computeOffsets(memberTypes);
-
-		return storageOffsets;
-	});
-}
-
-/// Helper functions for type identifier
-namespace
-{
-
-std::string parenthesizeIdentifier(std::string const& _internal)
-{
-	return "(" + _internal + ")";
-}
-
-template <class Range>
-std::string identifierList(Range const&& _list)
-{
-	return parenthesizeIdentifier(boost::algorithm::join(_list, ","));
-}
-
-std::string richIdentifier(Type const* _type)
-{
-	return _type ? _type->richIdentifier() : "";
-}
-
-std::string identifierList(std::vector<Type const*> const& _list)
-{
-	return identifierList(_list | ranges::views::transform(richIdentifier));
-}
-
-std::string identifierList(Type const* _type)
-{
-	return parenthesizeIdentifier(richIdentifier(_type));
-}
-
-std::string identifierList(Type const* _type1, Type const* _type2)
-{
-	TypePointers list;
-	list.push_back(_type1);
-	list.push_back(_type2);
-	return identifierList(list);
-}
-
-std::string parenthesizeUserIdentifier(std::string const& _internal)
-{
-	return parenthesizeIdentifier(_internal);
-}
-
-}
-
-std::string Type::escapeIdentifier(std::string const& _identifier)
-{
-	std::string ret = _identifier;
-	// FIXME: should be _$$$_
-	boost::algorithm::replace_all(ret, "$", "$$$");
-	boost::algorithm::replace_all(ret, ",", "_$_");
-	boost::algorithm::replace_all(ret, "(", "$_");
-	boost::algorithm::replace_all(ret, ")", "_$");
-	return ret;
-}
-
-std::string Type::identifier() const
-{
-	std::string ret = escapeIdentifier(richIdentifier());
-	solAssert(ret.find_first_of("0123456789") != 0, "Identifier cannot start with a number.");
-	solAssert(
-		ret.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMONPQRSTUVWXYZ_$") == std::string::npos,
-		"Identifier contains invalid characters."
-	);
-	return ret;
-}
-
-Type const* Type::commonType(Type const* _a, Type const* _b)
-{
-	if (!_a || !_b)
-		return nullptr;
-	else if (_a->mobileType() && _b->isImplicitlyConvertibleTo(*_a->mobileType()))
-		return _a->mobileType();
-	else if (_b->mobileType() && _a->isImplicitlyConvertibleTo(*_b->mobileType()))
-		return _b->mobileType();
-	else
-		return nullptr;
-}
-
-MemberList const& Type::members(ASTNode const* _currentScope) const
-{
-	if (!m_members[_currentScope])
-	{
-		solAssert(
-			_currentScope == nullptr ||
-			dynamic_cast<SourceUnit const*>(_currentScope) ||
-			dynamic_cast<ContractDefinition const*>(_currentScope),
-		"");
-		MemberList::MemberMap members = nativeMembers(_currentScope);
-		if (_currentScope)
-			members += attachedFunctions(*this, *_currentScope);
-		m_members[_currentScope] = std::make_unique<MemberList>(std::move(members));
-	}
-	return *m_members[_currentScope];
-}
-
-Type const* Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool) const
-{
-	Type const* encodingType = mobileType();
-	if (encodingType)
-		encodingType = encodingType->interfaceType(_inLibraryCall);
-	if (encodingType)
-		encodingType = encodingType->encodingType();
-	// Structs are fine in the following circumstances:
-	// - ABIv2 or,
-	// - storage struct for a library
-	if (_inLibraryCall && encodingType && encodingType->dataStoredIn(DataLocation::Storage))
-		return encodingType;
-	Type const* baseType = encodingType;
-	while (auto const* arrayType = dynamic_cast<ArrayType const*>(baseType))
-	{
-		baseType = arrayType->baseType();
-
-		auto const* baseArrayType = dynamic_cast<ArrayType const*>(baseType);
-		if (!_encoderV2 && baseArrayType && baseArrayType->isDynamicallySized())
-			return nullptr;
-	}
-	if (!_encoderV2 && dynamic_cast<StructType const*>(baseType))
-		return nullptr;
-
-	return encodingType;
-}
-
-namespace
-{
-
-std::vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, ASTNode const& _scope)
-{
-	std::vector<UsingForDirective const*> usingForDirectives;
-	SourceUnit const* sourceUnit = dynamic_cast<SourceUnit const*>(&_scope);
-	if (auto const* contract = dynamic_cast<ContractDefinition const*>(&_scope))
-	{
-		sourceUnit = &contract->sourceUnit();
-		usingForDirectives += contract->usingForDirectives();
-	}
-	else
-		solAssert(sourceUnit, "");
-	usingForDirectives += ASTNode::filteredNodes<UsingForDirective>(sourceUnit->nodes());
-
-	if (Declaration const* typeDefinition = _type.typeDefinition())
-		if (auto const* sourceUnit = dynamic_cast<SourceUnit const*>(typeDefinition->scope()))
-			for (auto usingFor: ASTNode::filteredNodes<UsingForDirective>(sourceUnit->nodes()))
-				// We do not yet compare the type name because of normalization.
-				if (usingFor->global() && usingFor->typeName())
-					usingForDirectives.emplace_back(usingFor);
-
-	// Normalise data location of type.
-	DataLocation typeLocation = DataLocation::Storage;
-	if (auto refType = dynamic_cast<ReferenceType const*>(&_type))
-		typeLocation = refType->location();
-
-	return usingForDirectives | ranges::views::filter([&](UsingForDirective const* _directive) -> bool {
-		// Convert both types to pointers for comparison to see if the `using for` directive applies.
-		// Note that at this point we don't yet know if the functions are actually usable with the type.
-		// `_type` may not be convertible to the function parameter type.
-		return
-			!_directive->typeName() ||
-			*TypeProvider::withLocationIfReference(typeLocation, &_type, true) ==
-			*TypeProvider::withLocationIfReference(
-				typeLocation,
-				_directive->typeName()->annotation().type,
-				true
-			);
-	}) | ranges::to<std::vector<UsingForDirective const*>>;
-}
-
-}
-
-std::set<FunctionDefinition const*, ASTNode::CompareByID> Type::operatorDefinitions(
-	Token _token,
-	ASTNode const& _scope,
-	bool _unary
-) const
-{
-	if (!typeDefinition())
-		return {};
-
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions;
-	for (UsingForDirective const* directive: usingForDirectivesForType(*this, _scope))
-		for (auto const& [identifierPath, operator_]: directive->functionsAndOperators())
-		{
-			if (operator_ != _token)
-				continue;
-
-			auto const& functionDefinition = dynamic_cast<FunctionDefinition const&>(
-				*identifierPath->annotation().referencedDeclaration
-			);
-			auto const* functionType = dynamic_cast<FunctionType const*>(
-				functionDefinition.libraryFunction() ? functionDefinition.typeViaContractName() : functionDefinition.type()
-			);
-			solAssert(functionType && !functionType->parameterTypes().empty());
-
-			size_t parameterCount = functionDefinition.parameterList().parameters().size();
-			if (*this == *functionType->parameterTypes().front() && (_unary ? parameterCount == 1 : parameterCount == 2))
-				matchingDefinitions.insert(&functionDefinition);
-		}
-
-	return matchingDefinitions;
-}
-
-MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const& _scope)
-{
-	MemberList::MemberMap members;
-
-	std::set<std::pair<std::string, Declaration const*>> seenFunctions;
-	auto addFunction = [&](FunctionDefinition const& _function, std::optional<std::string> _name = {})
-	{
-		if (!_name)
-			_name = _function.name();
-		Type const* functionType =
-			_function.libraryFunction() ? _function.typeViaContractName() : _function.type();
-		solAssert(functionType, "");
-		FunctionType const* withBoundFirstArgument =
-			dynamic_cast<FunctionType const&>(*functionType).withBoundFirstArgument();
-		solAssert(withBoundFirstArgument, "");
-
-		if (_type.isImplicitlyConvertibleTo(*withBoundFirstArgument->selfType()))
-			if (seenFunctions.insert(std::make_pair(*_name, &_function)).second)
-				members.emplace_back(&_function, withBoundFirstArgument, *_name);
-	};
-
-	for (UsingForDirective const* ufd: usingForDirectivesForType(_type, _scope))
-		for (auto const& [identifierPath, operator_]: ufd->functionsAndOperators())
-		{
-			if (operator_.has_value())
-				// Functions used to define operators are not automatically attached to the type.
-				// I.e. `using {f, f as +} for T` allows `T x; x.f()` but `using {f as +} for T` does not.
-				continue;
-
-			solAssert(identifierPath);
-			Declaration const* declaration = identifierPath->annotation().referencedDeclaration;
-			solAssert(declaration);
-
-			if (ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(declaration))
-			{
-				solAssert(library->isLibrary());
-				for (FunctionDefinition const* function: library->definedFunctions())
-				{
-					if (!function->isOrdinary() || !function->isVisibleAsLibraryMember() || function->parameters().empty())
-						continue;
-					addFunction(*function);
-				}
-			}
-			else
-				addFunction(
-					dynamic_cast<FunctionDefinition const&>(*declaration),
-					identifierPath->path().back()
-				);
-		}
-
-	return members;
-}
-
-AddressType::AddressType(StateMutability _stateMutability):
-	m_stateMutability(_stateMutability)
-{
-	solAssert(m_stateMutability == StateMutability::Payable || m_stateMutability == StateMutability::NonPayable, "");
-}
-
-std::string AddressType::richIdentifier() const
-{
-	if (m_stateMutability == StateMutability::Payable)
-		return "t_address_payable";
-	else
-		return "t_address";
-}
-
-BoolResult AddressType::isImplicitlyConvertibleTo(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	AddressType const& other = dynamic_cast<AddressType const&>(_other);
-
-	return other.m_stateMutability <= m_stateMutability;
-}
-
-BoolResult AddressType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if ((_convertTo.category() == category()) || isImplicitlyConvertibleTo(_convertTo))
-		return true;
-	else if (auto const* contractType = dynamic_cast<ContractType const*>(&_convertTo))
-		return (m_stateMutability >= StateMutability::Payable) || !contractType->isPayable();
-	else if (m_stateMutability == StateMutability::NonPayable)
-	{
-		if (auto integerType = dynamic_cast<IntegerType const*>(&_convertTo))
-			return (!integerType->isSigned() && integerType->numBits() == 160);
-		else if (auto fixedBytesType = dynamic_cast<FixedBytesType const*>(&_convertTo))
-			return (fixedBytesType->numBytes() == 20);
-	}
-
-	return false;
-}
-
-std::string AddressType::toString(bool) const
-{
-	if (m_stateMutability == StateMutability::Payable)
-		return "address payable";
-	else
-		return "address";
-}
-
-std::string AddressType::canonicalName() const
-{
-	return "address";
-}
-
-u256 AddressType::literalValue(Literal const* _literal) const
-{
-	solAssert(_literal, "");
-	solAssert(_literal->value().substr(0, 2) == "0x", "");
-	return u256(_literal->valueWithoutUnderscores());
-}
-
-TypeResult AddressType::unaryOperatorResult(Token _operator) const
-{
-	return _operator == Token::Delete ? TypeProvider::emptyTuple() : nullptr;
-}
-
-
-TypeResult AddressType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	if (!TokenTraits::isCompareOp(_operator))
-		return TypeResult::err("Arithmetic operations on addresses are not supported. Convert to integer first before using them.");
-
-	return Type::commonType(this, _other);
-}
-
-bool AddressType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	AddressType const& other = dynamic_cast<AddressType const&>(_other);
-	return other.m_stateMutability == m_stateMutability;
-}
-
-MemberList::MemberMap AddressType::nativeMembers(ASTNode const*) const
-{
-	MemberList::MemberMap members = {
-		{"balance", TypeProvider::uint256()},
-		{"code", TypeProvider::array(DataLocation::Memory)},
-		{"codehash",  TypeProvider::fixedBytes(32)},
-		{"call", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareCall, StateMutability::Payable)},
-		{"callcode", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareCallCode, StateMutability::Payable)},
-		{"delegatecall", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareDelegateCall, StateMutability::NonPayable)},
-		{"staticcall", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareStaticCall, StateMutability::View)}
-	};
-	if (m_stateMutability == StateMutability::Payable)
-	{
-		members.emplace_back(MemberList::Member{"send", TypeProvider::function(strings{"uint"}, strings{"bool"}, FunctionType::Kind::Send, StateMutability::NonPayable)});
-		members.emplace_back(MemberList::Member{"transfer", TypeProvider::function(strings{"uint"}, strings(), FunctionType::Kind::Transfer, StateMutability::NonPayable)});
-	}
-	return members;
-}
-
-namespace
-{
-
-bool isValidShiftAndAmountType(Token _operator, Type const& _shiftAmountType)
-{
-	// Disable >>> here.
-	if (_operator == Token::SHR)
-		return false;
-	else if (IntegerType const* otherInt = dynamic_cast<decltype(otherInt)>(&_shiftAmountType))
-		return !otherInt->isSigned();
-	else if (RationalNumberType const* otherRat = dynamic_cast<decltype(otherRat)>(&_shiftAmountType))
-		return !otherRat->isFractional() && otherRat->integerType() && !otherRat->integerType()->isSigned();
-	else
-		return false;
-}
-
-}
-
-IntegerType::IntegerType(unsigned _bits, IntegerType::Modifier _modifier):
-	m_bits(_bits), m_modifier(_modifier)
-{
-	solAssert(
-		m_bits > 0 && m_bits <= 256 && m_bits % 8 == 0,
-		"Invalid bit number for integer type: " + util::toString(m_bits)
-	);
-}
-
-std::string IntegerType::richIdentifier() const
-{
-	return "t_" + std::string(isSigned() ? "" : "u") + "int" + std::to_string(numBits());
-}
-
-BoolResult IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() == category())
-	{
-		IntegerType const& convertTo = dynamic_cast<IntegerType const&>(_convertTo);
-		// disallowing unsigned to signed conversion of different bits
-		if (isSigned() != convertTo.isSigned())
-			return false;
-		else if (convertTo.m_bits < m_bits)
-			return false;
-		else
-			return true;
-	}
-	else if (_convertTo.category() == Category::FixedPoint)
-	{
-		FixedPointType const& convertTo = dynamic_cast<FixedPointType const&>(_convertTo);
-		return maxValue() <= convertTo.maxIntegerValue() && minValue() >= convertTo.minIntegerValue();
-	}
-	else
-		return false;
-}
-
-BoolResult IntegerType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (isImplicitlyConvertibleTo(_convertTo))
-		return true;
-	else if (auto integerType = dynamic_cast<IntegerType const*>(&_convertTo))
-		return (numBits() == integerType->numBits()) || (isSigned() == integerType->isSigned());
-	else if (auto addressType = dynamic_cast<AddressType const*>(&_convertTo))
-		return
-			(addressType->stateMutability() != StateMutability::Payable) &&
-			!isSigned() &&
-			(numBits() == 160);
-	else if (auto fixedBytesType = dynamic_cast<FixedBytesType const*>(&_convertTo))
-		return (!isSigned() && (numBits() == fixedBytesType->numBytes() * 8));
-	else if (dynamic_cast<EnumType const*>(&_convertTo))
-		return true;
-	else if (auto fixedPointType = dynamic_cast<FixedPointType const*>(&_convertTo))
-		return (isSigned() == fixedPointType->isSigned()) && (numBits() == fixedPointType->numBits());
-
-	return false;
-}
-
-TypeResult IntegerType::unaryOperatorResult(Token _operator) const
-{
-	// "delete" is ok for all integer types
-	if (_operator == Token::Delete)
-		return TypeResult{TypeProvider::emptyTuple()};
-	// unary negation only on signed types
-	else if (_operator == Token::Sub)
-		return isSigned() ? TypeResult{this} : TypeResult::err("Unary negation is only allowed for signed integers.");
-	else if (_operator == Token::Inc || _operator == Token::Dec || _operator == Token::BitNot)
-		return TypeResult{this};
-	else
-		return TypeResult::err("");
-}
-
-bool IntegerType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	IntegerType const& other = dynamic_cast<IntegerType const&>(_other);
-	return other.m_bits == m_bits && other.m_modifier == m_modifier;
-}
-
-std::string IntegerType::toString(bool) const
-{
-	std::string prefix = isSigned() ? "int" : "uint";
-	return prefix + util::toString(m_bits);
-}
-
-u256 IntegerType::min() const
-{
-	if (isSigned())
-		return s2u(s256(minValue()));
-	else
-		return u256(minValue());
-}
-
-u256 IntegerType::max() const
-{
-	if (isSigned())
-		return s2u(s256(maxValue()));
-	else
-		return u256(maxValue());
-}
-
-bigint IntegerType::minValue() const
-{
-	if (isSigned())
-		return -(bigint(1) << (m_bits - 1));
-	else
-		return bigint(0);
-}
-
-bigint IntegerType::maxValue() const
-{
-	if (isSigned())
-		return (bigint(1) << (m_bits - 1)) - 1;
-	else
-		return (bigint(1) << m_bits) - 1;
-}
-
-TypeResult IntegerType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	if (
-		_other->category() != Category::RationalNumber &&
-		_other->category() != Category::FixedPoint &&
-		_other->category() != category()
-	)
-		return nullptr;
-	if (TokenTraits::isShiftOp(_operator))
-	{
-		// Shifts are not symmetric with respect to the type
-		if (isValidShiftAndAmountType(_operator, *_other))
-			return this;
-		else
-			return nullptr;
-	}
-	else if (Token::Exp == _operator)
-	{
-		if (auto otherIntType = dynamic_cast<IntegerType const*>(_other))
-		{
-			if (otherIntType->isSigned())
-				return TypeResult::err("Exponentiation power is not allowed to be a signed integer type.");
-		}
-		else if (dynamic_cast<FixedPointType const*>(_other))
-			return nullptr;
-		else if (auto rationalNumberType = dynamic_cast<RationalNumberType const*>(_other))
-		{
-			if (rationalNumberType->isFractional())
-				return TypeResult::err("Exponent is fractional.");
-			if (!rationalNumberType->integerType())
-				return TypeResult::err("Exponent too large.");
-			if (rationalNumberType->isNegative())
-				return TypeResult::err("Exponentiation power is not allowed to be a negative integer literal.");
-		}
-		return this;
-	}
-
-	auto commonType = Type::commonType(this, _other); //might be an integer or fixed point
-	if (!commonType)
-		return nullptr;
-
-	// All integer types can be compared
-	if (TokenTraits::isCompareOp(_operator))
-		return commonType;
-	if (TokenTraits::isBooleanOp(_operator))
-		return nullptr;
-	return commonType;
-}
-
-FixedPointType::FixedPointType(unsigned _totalBits, unsigned _fractionalDigits, FixedPointType::Modifier _modifier):
-	m_totalBits(_totalBits), m_fractionalDigits(_fractionalDigits), m_modifier(_modifier)
-{
-	solAssert(
-		8 <= m_totalBits && m_totalBits <= 256 && m_totalBits % 8 == 0 && m_fractionalDigits <= 80,
-		"Invalid bit number(s) for fixed type: " +
-		util::toString(_totalBits) + "x" + util::toString(_fractionalDigits)
-	);
-}
-
-std::string FixedPointType::richIdentifier() const
-{
-	return "t_" + std::string(isSigned() ? "" : "u") + "fixed" + std::to_string(m_totalBits) + "x" + std::to_string(m_fractionalDigits);
-}
-
-BoolResult FixedPointType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() == category())
-	{
-		FixedPointType const& convertTo = dynamic_cast<FixedPointType const&>(_convertTo);
-		if (convertTo.fractionalDigits() < m_fractionalDigits)
-			return BoolResult::err("Too many fractional digits.");
-		if (convertTo.numBits() < m_totalBits)
-			return false;
-		else
-			return convertTo.maxIntegerValue() >= maxIntegerValue() && convertTo.minIntegerValue() <= minIntegerValue();
-	}
-	return false;
-}
-
-BoolResult FixedPointType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	return _convertTo.category() == category() || _convertTo.category() == Category::Integer;
-}
-
-TypeResult FixedPointType::unaryOperatorResult(Token _operator) const
-{
-	solAssert(_operator != Token::Add);
-
-	switch (_operator)
-	{
-	case Token::Delete:
-		// "delete" is ok for all fixed types
-		return TypeResult{TypeProvider::emptyTuple()};
-	case Token::Sub:
-	case Token::Inc:
-	case Token::Dec:
-		// for fixed, we allow -, ++ and --
-		return this;
-	default:
-		return nullptr;
-	}
-}
-
-bool FixedPointType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	FixedPointType const& other = dynamic_cast<FixedPointType const&>(_other);
-	return other.m_totalBits == m_totalBits && other.m_fractionalDigits == m_fractionalDigits && other.m_modifier == m_modifier;
-}
-
-std::string FixedPointType::toString(bool) const
-{
-	std::string prefix = isSigned() ? "fixed" : "ufixed";
-	return prefix + util::toString(m_totalBits) + "x" + util::toString(m_fractionalDigits);
-}
-
-bigint FixedPointType::maxIntegerValue() const
-{
-	bigint maxValue = (bigint(1) << (m_totalBits - (isSigned() ? 1 : 0))) - 1;
-	return maxValue / boost::multiprecision::pow(bigint(10), m_fractionalDigits);
-}
-
-bigint FixedPointType::minIntegerValue() const
-{
-	if (isSigned())
-	{
-		bigint minValue = -(bigint(1) << (m_totalBits - (isSigned() ? 1 : 0)));
-		return minValue / boost::multiprecision::pow(bigint(10), m_fractionalDigits);
-	}
-	else
-		return bigint(0);
-}
-
-TypeResult FixedPointType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	auto commonType = Type::commonType(this, _other);
-
-	if (!commonType)
-		return nullptr;
-
-	// All fixed types can be compared
-	if (TokenTraits::isCompareOp(_operator))
-		return commonType;
-	if (TokenTraits::isBitOp(_operator) || TokenTraits::isBooleanOp(_operator) || _operator == Token::Exp)
-		return nullptr;
-	return commonType;
-}
-
-IntegerType const* FixedPointType::asIntegerType() const
-{
-	return TypeProvider::integer(numBits(), isSigned() ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned);
-}
-
-std::tuple<bool, rational> RationalNumberType::parseRational(std::string const& _value)
-{
-	rational value;
-	try
-	{
-		auto radixPoint = find(_value.begin(), _value.end(), '.');
-
-		if (radixPoint != _value.end())
-		{
-			if (
-				!all_of(radixPoint + 1, _value.end(), util::isDigit) ||
-				!all_of(_value.begin(), radixPoint, util::isDigit)
-			)
-				return std::make_tuple(false, rational(0));
-
-			// Only decimal notation allowed here, leading zeros would switch to octal.
-			auto fractionalBegin = find_if_not(
-				radixPoint + 1,
-				_value.end(),
-				[](char const& a) { return a == '0'; }
-			);
-
-			rational numerator;
-			rational denominator(1);
-
-			denominator = bigint(std::string(fractionalBegin, _value.end()));
-			denominator /= boost::multiprecision::pow(
-				bigint(10),
-				static_cast<unsigned>(distance(radixPoint + 1, _value.end()))
-			);
-			numerator = bigint(std::string(_value.begin(), radixPoint));
-			value = numerator + denominator;
-		}
-		else
-			value = bigint(_value);
-		return std::make_tuple(true, value);
-	}
-	catch (...)
-	{
-		return std::make_tuple(false, rational(0));
-	}
-}
-
-std::tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal)
-{
-	rational value;
-	try
-	{
-		ASTString valueString = _literal.valueWithoutUnderscores();
-
-		auto expPoint = find(valueString.begin(), valueString.end(), 'e');
-		if (expPoint == valueString.end())
-			expPoint = find(valueString.begin(), valueString.end(), 'E');
-
-		if (boost::starts_with(valueString, "0x"))
-		{
-			// process as hex
-			value = bigint(valueString);
-		}
-		else if (expPoint != valueString.end())
-		{
-			// Parse mantissa and exponent. Checks numeric limit.
-			std::tuple<bool, rational> mantissa = parseRational(std::string(valueString.begin(), expPoint));
-
-			if (!std::get<0>(mantissa))
-				return std::make_tuple(false, rational(0));
-			value = std::get<1>(mantissa);
-
-			// 0E... is always zero.
-			if (value == 0)
-				return std::make_tuple(true, rational(0));
-
-			bigint exp = bigint(std::string(expPoint + 1, valueString.end()));
-
-			if (exp > std::numeric_limits<int32_t>::max() || exp < std::numeric_limits<int32_t>::min())
-				return std::make_tuple(false, rational(0));
-
-			uint32_t expAbs = bigint(abs(exp)).convert_to<uint32_t>();
-
-			if (exp < 0)
-			{
-				if (!fitsPrecisionBase10(abs(value.denominator()), expAbs))
-					return std::make_tuple(false, rational(0));
-				value /= boost::multiprecision::pow(
-					bigint(10),
-					expAbs
-				);
-			}
-			else if (exp > 0)
-			{
-				if (!fitsPrecisionBase10(abs(value.numerator()), expAbs))
-					return std::make_tuple(false, rational(0));
-				value *= boost::multiprecision::pow(
-					bigint(10),
-					expAbs
-				);
-			}
-		}
-		else
-		{
-			// parse as rational number
-			std::tuple<bool, rational> tmp = parseRational(valueString);
-			if (!std::get<0>(tmp))
-				return tmp;
-			value = std::get<1>(tmp);
-		}
-	}
-	catch (...)
-	{
-		return std::make_tuple(false, rational(0));
-	}
-	switch (_literal.subDenomination())
-	{
-		case Literal::SubDenomination::None:
-		case Literal::SubDenomination::Wei:
-		case Literal::SubDenomination::Second:
-			break;
-		case Literal::SubDenomination::Gwei:
-			value *= bigint("1000000000");
-			break;
-		case Literal::SubDenomination::Ether:
-			value *= bigint("1000000000000000000");
-			break;
-		case Literal::SubDenomination::Minute:
-			value *= bigint("60");
-			break;
-		case Literal::SubDenomination::Hour:
-			value *= bigint("3600");
-			break;
-		case Literal::SubDenomination::Day:
-			value *= bigint("86400");
-			break;
-		case Literal::SubDenomination::Week:
-			value *= bigint("604800");
-			break;
-		case Literal::SubDenomination::Year:
-			value *= bigint("31536000");
-			break;
-	}
-
-
-	return std::make_tuple(true, value);
-}
-
-BoolResult RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	switch (_convertTo.category())
-	{
-	case Category::Integer:
-	{
-		if (isFractional())
-			return false;
-		IntegerType const& targetType = dynamic_cast<IntegerType const&>(_convertTo);
-		return fitsIntegerType(m_value.numerator(), targetType);
-	}
-	case Category::FixedPoint:
-	{
-		FixedPointType const& targetType = dynamic_cast<FixedPointType const&>(_convertTo);
-		// Store a negative number into an unsigned.
-		if (isNegative() && !targetType.isSigned())
-			return false;
-		if (!isFractional())
-			return (targetType.minIntegerValue() <= m_value) && (m_value <= targetType.maxIntegerValue());
-		rational value = m_value * pow(bigint(10), targetType.fractionalDigits());
-		// Need explicit conversion since truncation will occur.
-		if (value.denominator() != 1)
-			return false;
-		return fitsIntoBits(value.numerator(), targetType.numBits(), targetType.isSigned());
-	}
-	case Category::FixedBytes:
-		return (m_value == rational(0)) || (m_compatibleBytesType && *m_compatibleBytesType == _convertTo);
-	default:
-		return false;
-	}
-}
-
-BoolResult RationalNumberType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (isImplicitlyConvertibleTo(_convertTo))
-		return true;
-
-	auto category = _convertTo.category();
-	if (category == Category::FixedBytes)
-		return false;
-	else if (auto addressType = dynamic_cast<AddressType const*>(&_convertTo))
-		return	(m_value == 0) ||
-			((addressType->stateMutability() != StateMutability::Payable) &&
-			!isNegative() &&
-			!isFractional() &&
-			integerType() &&
-			(integerType()->numBits() <= 160));
-	else if (category == Category::Integer)
-		return false;
-	else if (auto enumType = dynamic_cast<EnumType const*>(&_convertTo))
-		if (isNegative() || isFractional() || m_value >= enumType->numberOfMembers())
-			return false;
-
-	Type const* mobType = mobileType();
-	return (mobType && mobType->isExplicitlyConvertibleTo(_convertTo));
-
-}
-
-TypeResult RationalNumberType::unaryOperatorResult(Token _operator) const
-{
-	if (std::optional<rational> value = ConstantEvaluator::evaluateUnaryOperator(_operator, m_value))
-		return TypeResult{TypeProvider::rationalNumber(*value)};
-	else
-		return nullptr;
-}
-
-TypeResult RationalNumberType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	if (_other->category() == Category::Integer || _other->category() == Category::FixedPoint)
-	{
-		if (isFractional())
-			return TypeResult::err("Fractional literals not supported.");
-		else if (!integerType())
-			return TypeResult::err("Literal too large.");
-
-		// Shift and exp are not symmetric, so it does not make sense to swap
-		// the types as below. As an exception, we always use uint here.
-		if (TokenTraits::isShiftOp(_operator))
-		{
-			if (!isValidShiftAndAmountType(_operator, *_other))
-				return nullptr;
-			return isNegative() ? TypeProvider::int256() : TypeProvider::uint256();
-		}
-		else if (Token::Exp == _operator)
-		{
-			if (auto const* otherIntType = dynamic_cast<IntegerType const*>(_other))
-			{
-				if (otherIntType->isSigned())
-					return TypeResult::err("Exponentiation power is not allowed to be a signed integer type.");
-			}
-			else if (dynamic_cast<FixedPointType const*>(_other))
-				return TypeResult::err("Exponent is fractional.");
-
-			return isNegative() ? TypeProvider::int256() : TypeProvider::uint256();
-		}
-		else
-		{
-			auto commonType = Type::commonType(this, _other);
-			if (!commonType)
-				return nullptr;
-			return commonType->binaryOperatorResult(_operator, _other);
-		}
-	}
-	else if (_other->category() != category())
-		return nullptr;
-
-	RationalNumberType const& other = dynamic_cast<RationalNumberType const&>(*_other);
-	if (TokenTraits::isCompareOp(_operator))
-	{
-		// Since we do not have a "BoolConstantType", we have to do the actual comparison
-		// at runtime and convert to mobile typse first. Such a comparison is not a very common
-		// use-case and will be optimized away.
-		Type const* thisMobile = mobileType();
-		Type const* otherMobile = other.mobileType();
-		if (!thisMobile || !otherMobile)
-			return nullptr;
-		return thisMobile->binaryOperatorResult(_operator, otherMobile);
-	}
-	else if (std::optional<rational> value = ConstantEvaluator::evaluateBinaryOperator(_operator, m_value, other.m_value))
-	{
-		// verify that numerator and denominator fit into 4096 bit after every operation
-		if (value->numerator() != 0 && std::max(boost::multiprecision::msb(abs(value->numerator())), boost::multiprecision::msb(abs(value->denominator()))) > 4096)
-			return TypeResult::err("Precision of rational constants is limited to 4096 bits.");
-
-		return TypeResult{TypeProvider::rationalNumber(*value)};
-	}
-	else
-		return nullptr;
-}
-
-std::string RationalNumberType::richIdentifier() const
-{
-	// rational seemingly will put the sign always on the numerator,
-	// but let just make it deterministic here.
-	bigint numerator = abs(m_value.numerator());
-	bigint denominator = abs(m_value.denominator());
-	if (m_value < 0)
-		return "t_rational_minus_" + numerator.str() + "_by_" + denominator.str();
-	else
-		return "t_rational_" + numerator.str() + "_by_" + denominator.str();
-}
-
-bool RationalNumberType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	RationalNumberType const& other = dynamic_cast<RationalNumberType const&>(_other);
-	return m_value == other.m_value;
-}
-
-std::string RationalNumberType::bigintToReadableString(bigint const& _num)
-{
-	std::string str = _num.str();
-	if (str.size() > 32)
-	{
-		size_t omitted = str.size() - 8;
-		str = str.substr(0, 4) + "...(" + std::to_string(omitted) + " digits omitted)..." + str.substr(str.size() - 4, 4);
-	}
-	return str;
-}
-
-std::string RationalNumberType::toString(bool) const
-{
-	if (!isFractional())
-		return "int_const " + bigintToReadableString(m_value.numerator());
-
-	std::string numerator = bigintToReadableString(m_value.numerator());
-	std::string denominator = bigintToReadableString(m_value.denominator());
-	return "rational_const " + numerator + " / " + denominator;
-}
-
-u256 RationalNumberType::literalValue(Literal const*) const
-{
-	// We ignore the literal and hope that the type was correctly determined to represent
-	// its value.
-
-	u256 value;
-	bigint shiftedValue;
-
-	if (!isFractional())
-		shiftedValue = m_value.numerator();
-	else
-	{
-		auto fixed = fixedPointType();
-		solAssert(fixed, "Rational number cannot be represented as fixed point type.");
-		unsigned fractionalDigits = fixed->fractionalDigits();
-		shiftedValue = m_value.numerator() * boost::multiprecision::pow(bigint(10), fractionalDigits) / m_value.denominator();
-	}
-
-	// we ignore the literal and hope that the type was correctly determined
-	solAssert(shiftedValue <= u256(-1), "Number constant too large.");
-	solAssert(shiftedValue >= -(bigint(1) << 255), "Number constant too small.");
-
-	if (m_value >= rational(0))
-		value = u256(shiftedValue);
-	else
-		value = s2u(s256(shiftedValue));
-	return value;
-}
-
-Type const* RationalNumberType::mobileType() const
-{
-	if (!isFractional())
-		return integerType();
-	else
-		return fixedPointType();
-}
-
-IntegerType const* RationalNumberType::integerType() const
-{
-	solAssert(!isFractional(), "integerType() called for fractional number.");
-	bigint value = m_value.numerator();
-	bool negative = (value < 0);
-	if (negative) // convert to positive number of same bit requirements
-		value = ((0 - value) - 1) << 1;
-	if (value > u256(-1))
-		return nullptr;
-	else
-		return TypeProvider::integer(
-			std::max(numberEncodingSize(value), 1u) * 8,
-			negative ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned
-		);
-}
-
-FixedPointType const* RationalNumberType::fixedPointType() const
-{
-	bool negative = (m_value < 0);
-	unsigned fractionalDigits = 0;
-	rational value = abs(m_value); // We care about the sign later.
-	rational maxValue = negative ?
-		rational(bigint(1) << 255, 1):
-		rational((bigint(1) << 256) - 1, 1);
-
-	while (value * 10 <= maxValue && value.denominator() != 1 && fractionalDigits < 80)
-	{
-		value *= 10;
-		fractionalDigits++;
-	}
-
-	if (value > maxValue)
-		return nullptr;
-
-	// This means we round towards zero for positive and negative values.
-	bigint v = value.numerator() / value.denominator();
-
-	if (negative && v != 0)
-		// modify value to satisfy bit requirements for negative numbers:
-		// add one bit for sign and decrement because negative numbers can be larger
-		v = (v - 1) << 1;
-
-	if (v > u256(-1))
-		return nullptr;
-
-	unsigned totalBits = std::max(numberEncodingSize(v), 1u) * 8;
-	solAssert(totalBits <= 256, "");
-
-	return TypeProvider::fixedPoint(
-		totalBits, fractionalDigits,
-		negative ? FixedPointType::Modifier::Signed : FixedPointType::Modifier::Unsigned
-	);
-}
-
-StringLiteralType::StringLiteralType(Literal const& _literal):
-	m_value(_literal.value())
-{
-}
-
-StringLiteralType::StringLiteralType(std::string _value):
-	m_value{std::move(_value)}
-{
-}
-
-BoolResult StringLiteralType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (auto fixedBytes = dynamic_cast<FixedBytesType const*>(&_convertTo))
-	{
-		if (static_cast<size_t>(fixedBytes->numBytes()) < m_value.size())
-			return BoolResult::err("Literal is larger than the type.");
-		return true;
-	}
-	else if (auto arrayType = dynamic_cast<ArrayType const*>(&_convertTo))
-	{
-		size_t invalidSequence;
-		if (arrayType->isString() && !util::validateUTF8(value(), invalidSequence))
-			return BoolResult::err(
-				"Contains invalid UTF-8 sequence at position " +
-				util::toString(invalidSequence) +
-				"."
-			);
-		return
-			arrayType->location() != DataLocation::CallData &&
-			arrayType->isByteArrayOrString() &&
-			!(arrayType->dataStoredIn(DataLocation::Storage) && arrayType->isPointer());
-	}
-	else
-		return false;
-}
-
-std::string StringLiteralType::richIdentifier() const
-{
-	// Since we have to return a valid identifier and the std::string itself may contain
-	// anything, we hash it.
-	return "t_stringliteral_" + util::toHex(util::keccak256(m_value).asBytes());
-}
-
-bool StringLiteralType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	return m_value == dynamic_cast<StringLiteralType const&>(_other).m_value;
-}
-
-std::string StringLiteralType::toString(bool) const
-{
-	auto isPrintableASCII = [](std::string const& s)
-	{
-		for (auto c: s)
-		{
-			if (static_cast<unsigned>(c) <= 0x1f || static_cast<unsigned>(c) >= 0x7f)
-				return false;
-		}
-		return true;
-	};
-
-	return isPrintableASCII(m_value) ?
-		("literal_string \"" + m_value + "\"") :
-		("literal_string hex\"" + util::toHex(util::asBytes(m_value)) + "\"");
-}
-
-Type const* StringLiteralType::mobileType() const
-{
-	return TypeProvider::stringMemory();
-}
-
-FixedBytesType::FixedBytesType(unsigned _bytes): m_bytes(_bytes)
-{
-	solAssert(
-		m_bytes > 0 && m_bytes <= 32,
-		"Invalid byte number for fixed bytes type: " + util::toString(m_bytes)
-	);
-}
-
-BoolResult FixedBytesType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() != category())
-		return false;
-	FixedBytesType const& convertTo = dynamic_cast<FixedBytesType const&>(_convertTo);
-	return convertTo.m_bytes >= m_bytes;
-}
-
-BoolResult FixedBytesType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() == category())
-		return true;
-	else if (auto integerType = dynamic_cast<IntegerType const*>(&_convertTo))
-		return (!integerType->isSigned() && integerType->numBits() == numBytes() * 8);
-	else if (auto addressType = dynamic_cast<AddressType const*>(&_convertTo))
-		return
-			(addressType->stateMutability() != StateMutability::Payable) &&
-			(numBytes() == 20);
-	else if (auto fixedPointType = dynamic_cast<FixedPointType const*>(&_convertTo))
-		return fixedPointType->numBits() == numBytes() * 8;
-
-	return false;
-}
-
-TypeResult FixedBytesType::unaryOperatorResult(Token _operator) const
-{
-	// "delete" and "~" is okay for FixedBytesType
-	if (_operator == Token::Delete)
-		return TypeResult{TypeProvider::emptyTuple()};
-	else if (_operator == Token::BitNot)
-		return this;
-
-	return nullptr;
-}
-
-TypeResult FixedBytesType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	if (TokenTraits::isShiftOp(_operator))
-	{
-		if (isValidShiftAndAmountType(_operator, *_other))
-			return this;
-		else
-			return nullptr;
-	}
-
-	auto commonType = dynamic_cast<FixedBytesType const*>(Type::commonType(this, _other));
-	if (!commonType)
-		return nullptr;
-
-	// FixedBytes can be compared and have bitwise operators applied to them
-	if (TokenTraits::isCompareOp(_operator) || TokenTraits::isBitOp(_operator))
-		return TypeResult(commonType);
-
-	return nullptr;
-}
-
-MemberList::MemberMap FixedBytesType::nativeMembers(ASTNode const*) const
-{
-	return MemberList::MemberMap{MemberList::Member{"length", TypeProvider::uint(8)}};
-}
-
-std::string FixedBytesType::richIdentifier() const
-{
-	return "t_bytes" + std::to_string(m_bytes);
-}
-
-bool FixedBytesType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	FixedBytesType const& other = dynamic_cast<FixedBytesType const&>(_other);
-	return other.m_bytes == m_bytes;
-}
-
-u256 BoolType::literalValue(Literal const* _literal) const
-{
-	solAssert(_literal, "");
-	if (_literal->token() == Token::TrueLiteral)
-		return u256(1);
-	else if (_literal->token() == Token::FalseLiteral)
-		return u256(0);
-	else
-		solAssert(false, "Bool type constructed from non-boolean literal.");
-}
-
-TypeResult BoolType::unaryOperatorResult(Token _operator) const
-{
-	if (_operator == Token::Delete)
-		return TypeProvider::emptyTuple();
-	else if (_operator == Token::Not)
-		return this;
-	else
-		return nullptr;
-}
-
-TypeResult BoolType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	if (category() != _other->category())
-		return nullptr;
-	if (_operator == Token::Equal || _operator == Token::NotEqual || _operator == Token::And || _operator == Token::Or)
-		return _other;
-	else
-		return nullptr;
-}
-
-Type const* ContractType::encodingType() const
-{
-	if (isSuper())
-		return nullptr;
-
-	if (isPayable())
-		return TypeProvider::payableAddress();
-	else
-		return TypeProvider::address();
-}
-
-BoolResult ContractType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (m_super)
-		return false;
-
-	if (*this == _convertTo)
-		return true;
-	if (_convertTo.category() == Category::Contract)
-	{
-		auto const& targetContractType = dynamic_cast<ContractType const&>(_convertTo);
-		if (targetContractType.isSuper())
-			return false;
-
-		auto const& bases = contractDefinition().annotation().linearizedBaseContracts;
-		return find(
-			bases.begin(),
-			bases.end(),
-			&targetContractType.contractDefinition()
-		) != bases.end();
-	}
-	return false;
-}
-
-BoolResult ContractType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (m_super)
-		return false;
-
-	if (auto const* addressType = dynamic_cast<AddressType const*>(&_convertTo))
-		return isPayable() || (addressType->stateMutability() < StateMutability::Payable);
-
-	return isImplicitlyConvertibleTo(_convertTo);
-}
-
-bool ContractType::isPayable() const
-{
-	auto receiveFunction = m_contract.receiveFunction();
-	auto fallbackFunction = m_contract.fallbackFunction();
-	return receiveFunction || (fallbackFunction && fallbackFunction->isPayable());
-}
-
-TypeResult ContractType::unaryOperatorResult(Token _operator) const
-{
-	if (isSuper())
-		return nullptr;
-	else if (_operator == Token::Delete)
-		return TypeProvider::emptyTuple();
-	else
-		return nullptr;
-}
-
-std::vector<Type const*> CompositeType::fullDecomposition() const
-{
-	std::vector<Type const*> res = {this};
-	std::unordered_set<std::string> seen = {richIdentifier()};
-	for (size_t k = 0; k < res.size(); ++k)
-		if (auto composite = dynamic_cast<CompositeType const*>(res[k]))
-			for (Type const* next: composite->decomposition())
-				if (seen.count(next->richIdentifier()) == 0)
-				{
-					seen.insert(next->richIdentifier());
-					res.push_back(next);
-				}
-	return res;
-}
-
-Type const* ReferenceType::withLocation(DataLocation _location, bool _isPointer) const
-{
-	return TypeProvider::withLocation(this, _location, _isPointer);
-}
-
-TypeResult ReferenceType::unaryOperatorResult(Token _operator) const
-{
-	if (_operator != Token::Delete)
-		return nullptr;
-	// delete can be used on everything except calldata references or storage pointers
-	// (storage references are ok)
-	switch (location())
-	{
-	case DataLocation::CallData:
-		return nullptr;
-	case DataLocation::Memory:
-		return TypeProvider::emptyTuple();
-	case DataLocation::Storage:
-		return isPointer() ? nullptr : TypeProvider::emptyTuple();
-	}
-	return nullptr;
-}
-
-bool ReferenceType::isPointer() const
-{
-	if (m_location == DataLocation::Storage)
-		return m_isPointer;
-	else
-		return true;
-}
-
-Type const* ReferenceType::copyForLocationIfReference(Type const* _type) const
-{
-	return TypeProvider::withLocationIfReference(m_location, _type);
-}
-
-std::string ReferenceType::stringForReferencePart() const
-{
-	switch (m_location)
-	{
-	case DataLocation::Storage:
-		return std::string("storage ") + (isPointer() ? "pointer" : "ref");
-	case DataLocation::CallData:
-		return "calldata";
-	case DataLocation::Memory:
-		return "memory";
-	}
-	solAssert(false, "");
-	return "";
-}
-
-std::string ReferenceType::identifierLocationSuffix() const
-{
-	std::string id;
-	switch (location())
-	{
-	case DataLocation::Storage:
-		id += "_storage";
-		break;
-	case DataLocation::Memory:
-		id += "_memory";
-		break;
-	case DataLocation::CallData:
-		id += "_calldata";
-		break;
-	}
-	if (isPointer())
-		id += "_ptr";
-	return id;
-}
-
-ArrayType::ArrayType(DataLocation _location, bool _isString):
-	ReferenceType(_location),
-	m_arrayKind(_isString ? ArrayKind::String : ArrayKind::Bytes),
-	m_baseType{TypeProvider::byte()}
-{
-}
-
-void ArrayType::clearCache() const
-{
-	Type::clearCache();
-
-	m_interfaceType.reset();
-	m_interfaceType_library.reset();
-}
-
-BoolResult ArrayType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() != category())
-		return false;
-	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
-	if (convertTo.isByteArray() != isByteArray() || convertTo.isString() != isString())
-		return false;
-	// memory/calldata to storage can be converted, but only to a direct storage reference
-	if (convertTo.location() == DataLocation::Storage && location() != DataLocation::Storage && convertTo.isPointer())
-		return false;
-	if (convertTo.location() == DataLocation::CallData && location() != convertTo.location())
-		return false;
-	if (convertTo.location() == DataLocation::Storage && !convertTo.isPointer())
-	{
-		// Less restrictive conversion, since we need to copy anyway.
-		if (!baseType()->isImplicitlyConvertibleTo(*convertTo.baseType()))
-			return false;
-		if (convertTo.isDynamicallySized())
-			return true;
-		return !isDynamicallySized() && convertTo.length() >= length();
-	}
-	else
-	{
-		// Conversion to storage pointer or to memory, we de not copy element-for-element here, so
-		// require that the base type is the same, not only convertible.
-		// This disallows assignment of nested dynamic arrays from storage to memory for now.
-		if (
-			*TypeProvider::withLocationIfReference(location(), baseType()) !=
-			*TypeProvider::withLocationIfReference(location(), convertTo.baseType())
-		)
-			return false;
-		if (isDynamicallySized() != convertTo.isDynamicallySized())
-			return false;
-		// We also require that the size is the same.
-		if (!isDynamicallySized() && length() != convertTo.length())
-			return false;
-		return true;
-	}
-}
-
-BoolResult ArrayType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (isImplicitlyConvertibleTo(_convertTo))
-		return true;
-	// allow conversion bytes <-> std::string and bytes -> bytesNN
-	if (_convertTo.category() != category())
-		return isByteArray() && _convertTo.category() == Type::Category::FixedBytes;
-	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
-	if (convertTo.location() != location())
-		return false;
-	if (!isByteArrayOrString() || !convertTo.isByteArrayOrString())
-		return false;
-	return true;
-}
-
-std::string ArrayType::richIdentifier() const
-{
-	std::string id;
-	if (isString())
-		id = "t_string";
-	else if (isByteArrayOrString())
-		id = "t_bytes";
-	else
-	{
-		id = "t_array";
-		id += identifierList(baseType());
-		if (isDynamicallySized())
-			id += "dyn";
-		else
-			id += length().str();
-	}
-	id += identifierLocationSuffix();
-
-	return id;
-}
-
-bool ArrayType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	ArrayType const& other = dynamic_cast<ArrayType const&>(_other);
-	if (
-		!equals(other) ||
-		other.isByteArray() != isByteArray() ||
-		other.isString() != isString() ||
-		other.isDynamicallySized() != isDynamicallySized()
-	)
-		return false;
-	if (*other.baseType() != *baseType())
-		return false;
-	return isDynamicallySized() || length() == other.length();
-}
-
-BoolResult ArrayType::validForLocation(DataLocation _loc) const
-{
-	if (auto arrayBaseType = dynamic_cast<ArrayType const*>(baseType()))
-	{
-		BoolResult result = arrayBaseType->validForLocation(_loc);
-		if (!result)
-			return result;
-	}
-	if (isDynamicallySized())
-		return true;
-	switch (_loc)
-	{
-		case DataLocation::Memory:
-		{
-			bigint size = bigint(length());
-			auto type = m_baseType;
-			while (auto arrayType = dynamic_cast<ArrayType const*>(type))
-			{
-				if (arrayType->isDynamicallySized())
-					break;
-				else
-				{
-					size *= arrayType->length();
-					type = arrayType->baseType();
-				}
-			}
-			if (type->isDynamicallySized())
-				size *= type->memoryHeadSize();
-			else
-				size *= type->memoryDataSize();
-			if (size >= std::numeric_limits<unsigned>::max())
-				return BoolResult::err("Type too large for memory.");
-			break;
-		}
-		case DataLocation::CallData:
-		{
-			if (unlimitedStaticCalldataSize(true) >= std::numeric_limits<unsigned>::max())
-				return BoolResult::err("Type too large for calldata.");
-			break;
-		}
-		case DataLocation::Storage:
-			if (storageSizeUpperBound() >= bigint(1) << 256)
-				return BoolResult::err("Type too large for storage.");
-			break;
-	}
-	return true;
-}
-
-bigint ArrayType::unlimitedStaticCalldataSize(bool _padded) const
-{
-	solAssert(!isDynamicallySized(), "");
-	bigint size = bigint(length()) * calldataStride();
-	if (_padded)
-		size = ((size + 31) / 32) * 32;
-	return size;
-}
-
-unsigned ArrayType::calldataEncodedSize(bool _padded) const
-{
-	solAssert(!isDynamicallyEncoded(), "");
-	bigint size = unlimitedStaticCalldataSize(_padded);
-	solAssert(size <= std::numeric_limits<unsigned>::max(), "Array size does not fit unsigned.");
-	return unsigned(size);
-}
-
-unsigned ArrayType::calldataEncodedTailSize() const
-{
-	solAssert(isDynamicallyEncoded(), "");
-	if (isDynamicallySized())
-		// We do not know the dynamic length itself, but at least the uint256 containing the
-		// length must still be present.
-		return 32;
-	bigint size = unlimitedStaticCalldataSize(false);
-	solAssert(size <= std::numeric_limits<unsigned>::max(), "Array size does not fit unsigned.");
-	return unsigned(size);
-}
-
-bool ArrayType::isDynamicallyEncoded() const
-{
-	return isDynamicallySized() || baseType()->isDynamicallyEncoded();
-}
-
-bigint ArrayType::storageSizeUpperBound() const
-{
-	if (isDynamicallySized())
-		return 1;
-	else
-		return length() * baseType()->storageSizeUpperBound();
-}
-
-u256 ArrayType::storageSize() const
-{
-	if (isDynamicallySized())
-		return 1;
-
-	bigint size;
-	unsigned baseBytes = baseType()->storageBytes();
-	if (baseBytes == 0)
-		size = 1;
-	else if (baseBytes < 32)
-	{
-		unsigned itemsPerSlot = 32 / baseBytes;
-		size = (bigint(length()) + (itemsPerSlot - 1)) / itemsPerSlot;
-	}
-	else
-		size = bigint(length()) * baseType()->storageSize();
-	solAssert(size < bigint(1) << 256, "Array too large for storage.");
-	return std::max<u256>(1, u256(size));
-}
-
-std::vector<std::tuple<std::string, Type const*>> ArrayType::makeStackItems() const
-{
-	switch (m_location)
-	{
-		case DataLocation::CallData:
-			if (isDynamicallySized())
-				return {std::make_tuple("offset", TypeProvider::uint256()), std::make_tuple("length", TypeProvider::uint256())};
-			else
-				return {std::make_tuple("offset", TypeProvider::uint256())};
-		case DataLocation::Memory:
-			return {std::make_tuple("mpos", TypeProvider::uint256())};
-		case DataLocation::Storage:
-			// byte offset inside storage value is omitted
-			return {std::make_tuple("slot", TypeProvider::uint256())};
-	}
-	solAssert(false, "");
-}
-
-std::string ArrayType::toString(bool _withoutDataLocation) const
-{
-	std::string ret;
-	if (isString())
-		ret = "string";
-	else if (isByteArrayOrString())
-		ret = "bytes";
-	else
-	{
-		ret = baseType()->toString(_withoutDataLocation) + "[";
-		if (!isDynamicallySized())
-			ret += length().str();
-		ret += "]";
-	}
-	if (!_withoutDataLocation)
-		ret += " " + stringForReferencePart();
-	return ret;
-}
-
-std::string ArrayType::humanReadableName() const
-{
-	std::string ret;
-	if (isString())
-		ret = "string";
-	else if (isByteArrayOrString())
-		ret = "bytes";
-	else
-	{
-		ret = baseType()->toString(true) + "[";
-		if (!isDynamicallySized())
-			ret += length().str();
-		ret += "]";
-	}
-	ret += " " + stringForReferencePart();
-	return ret;
-}
-
-std::string ArrayType::canonicalName() const
-{
-	std::string ret;
-	if (isString())
-		ret = "string";
-	else if (isByteArrayOrString())
-		ret = "bytes";
-	else
-	{
-		ret = baseType()->canonicalName() + "[";
-		if (!isDynamicallySized())
-			ret += length().str();
-		ret += "]";
-	}
-	return ret;
-}
-
-std::string ArrayType::signatureInExternalFunction(bool _structsByName) const
-{
-	if (isByteArrayOrString())
-		return canonicalName();
-	else
-	{
-		solAssert(baseType(), "");
-		return
-			baseType()->signatureInExternalFunction(_structsByName) +
-			"[" +
-			(isDynamicallySized() ? "" : length().str()) +
-			"]";
-	}
-}
-
-MemberList::MemberMap ArrayType::nativeMembers(ASTNode const*) const
-{
-	MemberList::MemberMap members;
-	if (!isString())
-	{
-		members.emplace_back("length", TypeProvider::uint256());
-		if (isDynamicallySized() && location() == DataLocation::Storage)
-		{
-			Type const* thisAsPointer = TypeProvider::withLocation(this, location(), true);
-			members.emplace_back("push", TypeProvider::function(
-				TypePointers{thisAsPointer},
-				TypePointers{baseType()},
-				strings{std::string()},
-				strings{std::string()},
-				FunctionType::Kind::ArrayPush
-			)->withBoundFirstArgument());
-			members.emplace_back("push", TypeProvider::function(
-				TypePointers{thisAsPointer, baseType()},
-				TypePointers{},
-				strings{std::string(),std::string()},
-				strings{},
-				FunctionType::Kind::ArrayPush
-			)->withBoundFirstArgument());
-			members.emplace_back("pop", TypeProvider::function(
-				TypePointers{thisAsPointer},
-				TypePointers{},
-				strings{std::string()},
-				strings{},
-				FunctionType::Kind::ArrayPop
-			)->withBoundFirstArgument());
-		}
-	}
-	return members;
-}
-
-Type const* ArrayType::encodingType() const
-{
-	if (location() == DataLocation::Storage)
-		return TypeProvider::uint256();
-	else
-		return TypeProvider::withLocation(this, DataLocation::Memory, true);
-}
-
-Type const* ArrayType::decodingType() const
-{
-	if (location() == DataLocation::Storage)
-		return TypeProvider::uint256();
-	else
-		return this;
-}
-
-TypeResult ArrayType::interfaceType(bool _inLibrary) const
-{
-	if (_inLibrary && m_interfaceType_library.has_value())
-		return *m_interfaceType_library;
-
-	if (!_inLibrary && m_interfaceType.has_value())
-		return *m_interfaceType;
-
-	TypeResult result{nullptr};
-	TypeResult baseInterfaceType = m_baseType->interfaceType(_inLibrary);
-
-	if (!baseInterfaceType.get())
-	{
-		solAssert(!baseInterfaceType.message().empty(), "Expected detailed error message!");
-		result = baseInterfaceType;
-	}
-	else if (_inLibrary && location() == DataLocation::Storage)
-		result = this;
-	else if (m_arrayKind != ArrayKind::Ordinary)
-		result = TypeProvider::withLocation(this, DataLocation::Memory, true);
-	else if (isDynamicallySized())
-		result = TypeProvider::array(DataLocation::Memory, baseInterfaceType);
-	else
-		result = TypeProvider::array(DataLocation::Memory, baseInterfaceType, m_length);
-
-	if (_inLibrary)
-		m_interfaceType_library = result;
-	else
-		m_interfaceType = result;
-
-	return result;
-}
-
-Type const* ArrayType::finalBaseType(bool _breakIfDynamicArrayType) const
-{
-	Type const* finalBaseType = this;
-
-	while (auto arrayType = dynamic_cast<ArrayType const*>(finalBaseType))
-	{
-		if (_breakIfDynamicArrayType && arrayType->isDynamicallySized())
-			break;
-		finalBaseType = arrayType->baseType();
-	}
-
-	return finalBaseType;
-}
-
-u256 ArrayType::memoryDataSize() const
-{
-	solAssert(!isDynamicallySized(), "");
-	solAssert(m_location == DataLocation::Memory, "");
-	solAssert(!isByteArrayOrString(), "");
-	bigint size = bigint(m_length) * m_baseType->memoryHeadSize();
-	solAssert(size <= std::numeric_limits<u256>::max(), "Array size does not fit u256.");
-	return u256(size);
-}
-
-std::unique_ptr<ReferenceType> ArrayType::copyForLocation(DataLocation _location, bool _isPointer) const
-{
-	auto copy = std::make_unique<ArrayType>(_location);
-	if (_location == DataLocation::Storage)
-		copy->m_isPointer = _isPointer;
-	copy->m_arrayKind = m_arrayKind;
-	copy->m_baseType = copy->copyForLocationIfReference(m_baseType);
-	copy->m_hasDynamicLength = m_hasDynamicLength;
-	copy->m_length = m_length;
-	return copy;
-}
-
-BoolResult ArraySliceType::isImplicitlyConvertibleTo(Type const& _other) const
-{
-	return
-		(*this) == _other ||
-		(
-			m_arrayType.dataStoredIn(DataLocation::CallData) &&
-			m_arrayType.isDynamicallySized() &&
-			m_arrayType.isImplicitlyConvertibleTo(_other)
-		);
-}
-
-BoolResult ArraySliceType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	return
-		isImplicitlyConvertibleTo(_convertTo) ||
-		m_arrayType.isExplicitlyConvertibleTo(_convertTo);
-}
-
-std::string ArraySliceType::richIdentifier() const
-{
-	return m_arrayType.richIdentifier() + "_slice";
-}
-
-bool ArraySliceType::operator==(Type const& _other) const
-{
-	if (auto const* other = dynamic_cast<ArraySliceType const*>(&_other))
-		return m_arrayType == other->m_arrayType;
-	return false;
-}
-
-std::string ArraySliceType::toString(bool _withoutDataLocation) const
-{
-	return m_arrayType.toString(_withoutDataLocation) + " slice";
-}
-
-std::string ArraySliceType::humanReadableName() const
-{
-	return m_arrayType.humanReadableName() + " slice";
-}
-
-Type const* ArraySliceType::mobileType() const
-{
-	if (
-		m_arrayType.dataStoredIn(DataLocation::CallData) &&
-		m_arrayType.isDynamicallySized() &&
-		!m_arrayType.baseType()->isDynamicallyEncoded()
-	)
-		return &m_arrayType;
-	else
-		return this;
-}
-
-
-std::vector<std::tuple<std::string, Type const*>> ArraySliceType::makeStackItems() const
-{
-	return {{"offset", TypeProvider::uint256()}, {"length", TypeProvider::uint256()}};
-}
-
-std::string ContractType::richIdentifier() const
-{
-	return (m_super ? "t_super" : "t_contract") + parenthesizeUserIdentifier(m_contract.name()) + std::to_string(m_contract.id());
-}
-
-bool ContractType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	ContractType const& other = dynamic_cast<ContractType const&>(_other);
-	return other.m_contract == m_contract && other.m_super == m_super;
-}
-
-std::string ContractType::toString(bool) const
-{
-	return
-		std::string(m_contract.isLibrary() ? "library " : "contract ") +
-		std::string(m_super ? "super " : "") +
-		m_contract.name();
-}
-
-std::string ContractType::canonicalName() const
-{
-	return *m_contract.annotation().canonicalName;
-}
-
-MemberList::MemberMap ContractType::nativeMembers(ASTNode const*) const
-{
-	MemberList::MemberMap members;
-	solAssert(!m_super, "");
-	if (!m_contract.isLibrary())
-		for (auto const& it: m_contract.interfaceFunctions())
-			members.emplace_back(
-				&it.second->declaration(),
-				it.second->asExternallyCallableFunction(m_contract.isLibrary())
-			);
-
-	return members;
-}
-
-FunctionType const* ContractType::newExpressionType() const
-{
-	if (!m_constructorType)
-		m_constructorType = FunctionType::newExpressionType(m_contract);
-	return m_constructorType;
-}
-
-std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables() const
-{
-	std::vector<VariableDeclaration const*> variables;
-	for (ContractDefinition const* contract: m_contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-		for (VariableDeclaration const* variable: contract->stateVariables())
-			if (!(variable->isConstant() || variable->immutable()))
-				variables.push_back(variable);
-	TypePointers types;
-	for (auto variable: variables)
-		types.push_back(variable->annotation().type);
-	StorageOffsets offsets;
-	offsets.computeOffsets(types);
-
-	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> variablesAndOffsets;
-	for (size_t index = 0; index < variables.size(); ++index)
-		if (auto const* offset = offsets.offset(index))
-			variablesAndOffsets.emplace_back(variables[index], offset->first, offset->second);
-	return variablesAndOffsets;
-}
-
-std::vector<VariableDeclaration const*> ContractType::immutableVariables() const
-{
-	std::vector<VariableDeclaration const*> variables;
-	for (ContractDefinition const* contract: m_contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-		for (VariableDeclaration const* variable: contract->stateVariables())
-			if (variable->immutable())
-				variables.push_back(variable);
-	return variables;
-}
-
-std::vector<std::tuple<std::string, Type const*>> ContractType::makeStackItems() const
-{
-	if (m_super)
-		return {};
-	else
-		return {std::make_tuple("address", isPayable() ? TypeProvider::payableAddress() : TypeProvider::address())};
-}
-
-void StructType::clearCache() const
-{
-	Type::clearCache();
-
-	m_interfaceType.reset();
-	m_interfaceType_library.reset();
-}
-
-Type const* StructType::encodingType() const
-{
-	if (location() != DataLocation::Storage)
-		return this;
-
-	return TypeProvider::uint256();
-}
-
-BoolResult StructType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() != category())
-		return false;
-	auto& convertTo = dynamic_cast<StructType const&>(_convertTo);
-	// memory/calldata to storage can be converted, but only to a direct storage reference
-	if (convertTo.location() == DataLocation::Storage && location() != DataLocation::Storage && convertTo.isPointer())
-		return false;
-	if (convertTo.location() == DataLocation::CallData && location() != convertTo.location())
-		return false;
-	return this->m_struct == convertTo.m_struct;
-}
-
-std::string StructType::richIdentifier() const
-{
-	return "t_struct" + parenthesizeUserIdentifier(m_struct.name()) + std::to_string(m_struct.id()) + identifierLocationSuffix();
-}
-
-bool StructType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	StructType const& other = dynamic_cast<StructType const&>(_other);
-	return equals(other) && other.m_struct == m_struct;
-}
-
-
-unsigned StructType::calldataEncodedSize(bool) const
-{
-	solAssert(!isDynamicallyEncoded(), "");
-
-	unsigned size = 0;
-	for (auto const& member: members(nullptr))
-	{
-		solAssert(!member.type->containsNestedMapping(), "");
-		// Struct members are always padded.
-		size += member.type->calldataEncodedSize();
-	}
-	return size;
-}
-
-
-unsigned StructType::calldataEncodedTailSize() const
-{
-	solAssert(isDynamicallyEncoded(), "");
-
-	unsigned size = 0;
-	for (auto const& member: members(nullptr))
-	{
-		solAssert(!member.type->containsNestedMapping(), "");
-		// Struct members are always padded.
-		size += member.type->calldataHeadSize();
-	}
-	return size;
-}
-
-unsigned StructType::calldataOffsetOfMember(std::string const& _member) const
-{
-	unsigned offset = 0;
-	for (auto const& member: members(nullptr))
-	{
-		solAssert(!member.type->containsNestedMapping(), "");
-		if (member.name == _member)
-			return offset;
-		// Struct members are always padded.
-		offset += member.type->calldataHeadSize();
-	}
-	solAssert(false, "Struct member not found.");
-}
-
-bool StructType::isDynamicallyEncoded() const
-{
-	if (recursive())
-		return true;
-	solAssert(interfaceType(false).get(), "");
-	for (auto t: memoryMemberTypes())
-	{
-		solAssert(t, "Parameter should have external type.");
-		t = t->interfaceType(false);
-		if (t->isDynamicallyEncoded())
-			return true;
-	}
-	return false;
-}
-
-u256 StructType::memoryDataSize() const
-{
-	u256 size;
-	for (auto const& t: memoryMemberTypes())
-		size += t->memoryHeadSize();
-	return size;
-}
-
-bigint StructType::storageSizeUpperBound() const
-{
-	bigint size = 1;
-	for (auto const& member: members(nullptr))
-		size += member.type->storageSizeUpperBound();
-	return size;
-}
-
-u256 StructType::storageSize() const
-{
-	return std::max<u256>(1, members(nullptr).storageSize());
-}
-
-bool StructType::containsNestedMapping() const
-{
-	if (!m_struct.annotation().containsNestedMapping.has_value())
-	{
-		bool hasNestedMapping = false;
-
-		util::BreadthFirstSearch<StructDefinition const*> breadthFirstSearch{{&m_struct}};
-
-		breadthFirstSearch.run(
-			[&](StructDefinition const* _struct, auto&& _addChild)
-			{
-				for (auto const& member: _struct->members())
-				{
-					Type const* memberType = member->annotation().type;
-					solAssert(memberType, "");
-
-					if (auto arrayType = dynamic_cast<ArrayType const*>(memberType))
-						memberType = arrayType->finalBaseType(false);
-
-					if (dynamic_cast<MappingType const*>(memberType))
-					{
-						hasNestedMapping = true;
-						breadthFirstSearch.abort();
-					}
-					else if (auto structType = dynamic_cast<StructType const*>(memberType))
-						_addChild(&structType->structDefinition());
-				}
-
-			});
-
-		m_struct.annotation().containsNestedMapping = hasNestedMapping;
-	}
-
-	return m_struct.annotation().containsNestedMapping.value();
-}
-
-std::string StructType::toString(bool _withoutDataLocation) const
-{
-	std::string ret = "struct " + *m_struct.annotation().canonicalName;
-	if (!_withoutDataLocation)
-		ret += " " + stringForReferencePart();
-	return ret;
-}
-
-MemberList::MemberMap StructType::nativeMembers(ASTNode const*) const
-{
-	MemberList::MemberMap members;
-	for (ASTPointer<VariableDeclaration> const& variable: m_struct.members())
-	{
-		Type const* type = variable->annotation().type;
-		solAssert(type, "");
-		solAssert(!(location() != DataLocation::Storage && type->containsNestedMapping()), "");
-		members.emplace_back(
-			variable.get(),
-			copyForLocationIfReference(type)
-		);
-	}
-	return members;
-}
-
-TypeResult StructType::interfaceType(bool _inLibrary) const
-{
-	if (!_inLibrary)
-	{
-		if (!m_interfaceType.has_value())
-		{
-			if (recursive())
-				m_interfaceType = TypeResult::err("Recursive type not allowed for public or external contract functions.");
-			else
-			{
-				TypeResult result{nullptr};
-				for (ASTPointer<VariableDeclaration> const& member: m_struct.members())
-				{
-					if (!member->annotation().type)
-					{
-						result = TypeResult::err("Invalid type!");
-						break;
-					}
-					auto interfaceType = member->annotation().type->interfaceType(false);
-					if (!interfaceType.get())
-					{
-						solAssert(!interfaceType.message().empty(), "Expected detailed error message!");
-						result = interfaceType;
-						break;
-					}
-				}
-				if (result.message().empty())
-					m_interfaceType = TypeProvider::withLocation(this, DataLocation::Memory, true);
-				else
-					m_interfaceType = result;
-			}
-		}
-		return *m_interfaceType;
-	}
-	else if (m_interfaceType_library.has_value())
-		return *m_interfaceType_library;
-
-	TypeResult result{nullptr};
-
-	if (recursive() && !(_inLibrary && location() == DataLocation::Storage))
-		return TypeResult::err(
-			"Recursive structs can only be passed as storage pointers to libraries, "
-			"not as memory objects to contract functions."
-		);
-
-	util::BreadthFirstSearch<StructDefinition const*> breadthFirstSearch{{&m_struct}};
-	breadthFirstSearch.run(
-		[&](StructDefinition const* _struct, auto&& _addChild)
-		{
-			// Check that all members have interface types.
-			// Return an error if at least one struct member does not have a type.
-			// This might happen, for example, if the type of the member does not exist.
-			for (ASTPointer<VariableDeclaration> const& variable: _struct->members())
-			{
-				// If the struct member does not have a type return false.
-				// A TypeError is expected in this case.
-				if (!variable->annotation().type)
-				{
-					result = TypeResult::err("Invalid type!");
-					breadthFirstSearch.abort();
-					return;
-				}
-
-				Type const* memberType = variable->annotation().type;
-
-				while (
-					memberType->category() == Type::Category::Array ||
-					memberType->category() == Type::Category::Mapping
-				)
-				{
-					if (auto arrayType = dynamic_cast<ArrayType const*>(memberType))
-						memberType = arrayType->finalBaseType(false);
-					else if (auto mappingType = dynamic_cast<MappingType const*>(memberType))
-						memberType = mappingType->valueType();
-				}
-
-				if (StructType const* innerStruct = dynamic_cast<StructType const*>(memberType))
-					_addChild(&innerStruct->structDefinition());
-				else
-				{
-					auto iType = memberType->interfaceType(_inLibrary);
-					if (!iType.get())
-					{
-						solAssert(!iType.message().empty(), "Expected detailed error message!");
-						result = iType;
-						breadthFirstSearch.abort();
-						return;
-					}
-				}
-			}
-		}
-	);
-
-	if (!result.message().empty())
-		return result;
-
-	if (location() == DataLocation::Storage)
-		m_interfaceType_library = this;
-	else
-		m_interfaceType_library = TypeProvider::withLocation(this, DataLocation::Memory, true);
-	return *m_interfaceType_library;
-}
-
-Declaration const* StructType::typeDefinition() const
-{
-	return &structDefinition();
-}
-
-BoolResult StructType::validForLocation(DataLocation _loc) const
-{
-	for (auto const& member: m_struct.members())
-		if (auto referenceType = dynamic_cast<ReferenceType const*>(member->annotation().type))
-		{
-			BoolResult result = referenceType->validForLocation(_loc);
-			if (!result)
-				return result;
-		}
-
-	if (
-		_loc == DataLocation::Storage &&
-		storageSizeUpperBound() >= bigint(1) << 256
-	)
-		return BoolResult::err("Type too large for storage.");
-
-	return true;
-}
-
-bool StructType::recursive() const
-{
-	solAssert(m_struct.annotation().recursive.has_value(), "Called StructType::recursive() before DeclarationTypeChecker.");
-	return *m_struct.annotation().recursive;
-}
-
-std::unique_ptr<ReferenceType> StructType::copyForLocation(DataLocation _location, bool _isPointer) const
-{
-	auto copy = std::make_unique<StructType>(m_struct, _location);
-	if (_location == DataLocation::Storage)
-		copy->m_isPointer = _isPointer;
-	return copy;
-}
-
-std::string StructType::signatureInExternalFunction(bool _structsByName) const
-{
-	if (_structsByName)
-		return canonicalName();
-	else
-	{
-		TypePointers memberTypes = memoryMemberTypes();
-		auto memberTypeStrings = memberTypes | ranges::views::transform([&](Type const* _t) -> std::string
-		{
-			solAssert(_t, "Parameter should have external type.");
-			auto t = _t->interfaceType(_structsByName);
-			solAssert(t.get(), "");
-			return t.get()->signatureInExternalFunction(_structsByName);
-		});
-		return "(" + boost::algorithm::join(memberTypeStrings, ",") + ")";
-	}
-}
-
-std::string StructType::canonicalName() const
-{
-	return *m_struct.annotation().canonicalName;
-}
-
-FunctionTypePointer StructType::constructorType() const
-{
-	TypePointers paramTypes;
-	strings paramNames;
-	solAssert(!containsNestedMapping(), "");
-	for (auto const& member: members(nullptr))
-	{
-		paramNames.push_back(member.name);
-		paramTypes.push_back(TypeProvider::withLocationIfReference(DataLocation::Memory, member.type));
-	}
-	return TypeProvider::function(
-		paramTypes,
-		TypePointers{TypeProvider::withLocation(this, DataLocation::Memory, false)},
-		paramNames,
-		strings(1, ""),
-		FunctionType::Kind::Internal
-	);
-}
-
-std::pair<u256, unsigned> const& StructType::storageOffsetsOfMember(std::string const& _name) const
-{
-	auto const* offsets = members(nullptr).memberStorageOffset(_name);
-	solAssert(offsets, "Storage offset of non-existing member requested.");
-	return *offsets;
-}
-
-u256 StructType::memoryOffsetOfMember(std::string const& _name) const
-{
-	u256 offset;
-	for (auto const& member: members(nullptr))
-		if (member.name == _name)
-			return offset;
-		else
-			offset += member.type->memoryHeadSize();
-	solAssert(false, "Member not found in struct.");
-	return 0;
-}
-
-TypePointers StructType::memoryMemberTypes() const
-{
-	solAssert(!containsNestedMapping(), "");
-	TypePointers types;
-	for (ASTPointer<VariableDeclaration> const& variable: m_struct.members())
-		types.push_back(TypeProvider::withLocationIfReference(DataLocation::Memory, variable->annotation().type));
-
-	return types;
-}
-
-std::vector<std::tuple<std::string, Type const*>> StructType::makeStackItems() const
-{
-	switch (m_location)
-	{
-		case DataLocation::CallData:
-			return {std::make_tuple("offset", TypeProvider::uint256())};
-		case DataLocation::Memory:
-			return {std::make_tuple("mpos", TypeProvider::uint256())};
-		case DataLocation::Storage:
-			return {std::make_tuple("slot", TypeProvider::uint256())};
-	}
-	solAssert(false, "");
-}
-
-std::vector<Type const*> StructType::decomposition() const
-{
-	std::vector<Type const*> res;
-	for (MemberList::Member const& member: members(nullptr))
-		res.push_back(member.type);
-	return res;
-}
-
-Type const* EnumType::encodingType() const
-{
-	solAssert(numberOfMembers() <= 256, "");
-	return TypeProvider::uint(8);
-}
-
-Declaration const* EnumType::typeDefinition() const
-{
-	return &enumDefinition();
-}
-
-TypeResult EnumType::unaryOperatorResult(Token _operator) const
-{
-	return _operator == Token::Delete ? TypeProvider::emptyTuple() : nullptr;
-}
-
-std::string EnumType::richIdentifier() const
-{
-	return "t_enum" + parenthesizeUserIdentifier(m_enum.name()) + std::to_string(m_enum.id());
-}
-
-bool EnumType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	EnumType const& other = dynamic_cast<EnumType const&>(_other);
-	return other.m_enum == m_enum;
-}
-
-unsigned EnumType::storageBytes() const
-{
-	solAssert(numberOfMembers() <= 256, "");
-	return 1;
-}
-
-std::string EnumType::toString(bool) const
-{
-	return std::string("enum ") + *m_enum.annotation().canonicalName;
-}
-
-std::string EnumType::canonicalName() const
-{
-	return *m_enum.annotation().canonicalName;
-}
-
-size_t EnumType::numberOfMembers() const
-{
-	return m_enum.members().size();
-}
-
-BoolResult EnumType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo == *this)
-		return true;
-	else if (auto integerType = dynamic_cast<IntegerType const*>(&_convertTo))
-		return !integerType->isSigned();
-	return false;
-}
-
-unsigned EnumType::memberValue(ASTString const& _member) const
-{
-	unsigned index = 0;
-	for (ASTPointer<EnumValue> const& decl: m_enum.members())
-	{
-		if (decl->name() == _member)
-			return index;
-		++index;
-	}
-	solAssert(false, "Requested unknown enum value " + _member);
-}
-
-Type const& UserDefinedValueType::underlyingType() const
-{
-	Type const* type = m_definition.underlyingType()->annotation().type;
-	solAssert(type, "");
-	solAssert(type->category() != Category::UserDefinedValueType, "");
-	return *type;
-}
-
-Declaration const* UserDefinedValueType::typeDefinition() const
-{
-	return &m_definition;
-}
-
-std::string UserDefinedValueType::richIdentifier() const
-{
-	return "t_userDefinedValueType" + parenthesizeIdentifier(m_definition.name()) + std::to_string(m_definition.id());
-}
-
-bool UserDefinedValueType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	UserDefinedValueType const& other = dynamic_cast<UserDefinedValueType const&>(_other);
-	return other.definition() == definition();
-}
-
-std::string UserDefinedValueType::toString(bool /* _withoutDataLocation */) const
-{
-	return *definition().annotation().canonicalName;
-}
-
-std::string UserDefinedValueType::canonicalName() const
-{
-	return *definition().annotation().canonicalName;
-}
-
-std::vector<std::tuple<std::string, Type const*>> UserDefinedValueType::makeStackItems() const
-{
-	return underlyingType().stackItems();
-}
-
-BoolResult TupleType::isImplicitlyConvertibleTo(Type const& _other) const
-{
-	if (auto tupleType = dynamic_cast<TupleType const*>(&_other))
-	{
-		TypePointers const& targets = tupleType->components();
-		if (targets.empty())
-			return components().empty();
-		if (components().size() != targets.size())
-			return false;
-		for (size_t i = 0; i < targets.size(); ++i)
-			if (!components()[i] && targets[i])
-				return false;
-			else if (components()[i] && targets[i] && !components()[i]->isImplicitlyConvertibleTo(*targets[i]))
-				return false;
-		return true;
-	}
-	else
-		return false;
-}
-
-std::string TupleType::richIdentifier() const
-{
-	return "t_tuple" + identifierList(components());
-}
-
-bool TupleType::operator==(Type const& _other) const
-{
-	if (auto tupleType = dynamic_cast<TupleType const*>(&_other))
-		return components() == tupleType->components();
-	else
-		return false;
-}
-
-std::string TupleType::toString(bool _withoutDataLocation) const
-{
-	if (components().empty())
-		return "tuple()";
-	std::string str = "tuple(";
-	for (auto const& t: components())
-		str += (t ? t->toString(_withoutDataLocation) : "") + ",";
-	str.pop_back();
-	return str + ")";
-}
-
-std::string TupleType::humanReadableName() const
-{
-	if (components().empty())
-		return "tuple()";
-	std::string str = "tuple(";
-	for (auto const& t: components())
-		str += (t ? t->humanReadableName() : "") + ",";
-	str.pop_back();
-	return str + ")";
-}
-
-u256 TupleType::storageSize() const
-{
-	solAssert(false, "Storage size of non-storable tuple type requested.");
-}
-
-std::vector<std::tuple<std::string, Type const*>> TupleType::makeStackItems() const
-{
-	std::vector<std::tuple<std::string, Type const*>> slots;
-	unsigned i = 1;
-	for (auto const& t: components())
-	{
-		if (t)
-			slots.emplace_back("component_" + std::to_string(i), t);
-		++i;
-	}
-	return slots;
-}
-
-Type const* TupleType::mobileType() const
-{
-	TypePointers mobiles;
-	for (auto const& c: components())
-	{
-		if (c)
-		{
-			auto mt = c->mobileType();
-			if (!mt)
-				return nullptr;
-			mobiles.push_back(mt);
-		}
-		else
-			mobiles.push_back(nullptr);
-	}
-	return TypeProvider::tuple(std::move(mobiles));
-}
-
-FunctionType::FunctionType(FunctionDefinition const& _function, Kind _kind):
-	m_kind(_kind),
-	m_stateMutability(_function.stateMutability()),
-	m_declaration(&_function)
-{
-	solAssert(
-		_kind == Kind::Internal || _kind == Kind::External || _kind == Kind::Declaration,
-		"Only internal or external function types or function declaration types can be created from function definitions."
-	);
-	if (_kind == Kind::Internal && m_stateMutability == StateMutability::Payable)
-		m_stateMutability = StateMutability::NonPayable;
-
-	for (ASTPointer<VariableDeclaration> const& var: _function.parameters())
-	{
-		solAssert(var->annotation().type, "Parameter type is not yet available in the AST.");
-		m_parameterNames.push_back(var->name());
-		m_parameterTypes.push_back(var->annotation().type);
-	}
-	for (ASTPointer<VariableDeclaration> const& var: _function.returnParameters())
-	{
-		solAssert(var->annotation().type, "Return parameter type is not yet available in the AST.");
-		m_returnParameterNames.push_back(var->name());
-		m_returnParameterTypes.push_back(var->annotation().type);
-	}
-
-	solAssert(
-		m_parameterNames.size() == m_parameterTypes.size(),
-		"Parameter names list must match parameter types list!"
-	);
-
-	solAssert(
-		m_returnParameterNames.size() == m_returnParameterTypes.size(),
-		"Return parameter names list must match return parameter types list!"
-	);
-}
-
-FunctionType::FunctionType(VariableDeclaration const& _varDecl):
-	m_kind(Kind::External),
-	m_stateMutability(StateMutability::View),
-	m_declaration(&_varDecl)
-{
-	auto returnType = _varDecl.annotation().type;
-	ASTString returnName;
-
-	while (true)
-	{
-		if (auto mappingType = dynamic_cast<MappingType const*>(returnType))
-		{
-			m_parameterTypes.push_back(mappingType->keyType());
-			m_parameterNames.push_back(mappingType->keyName());
-			returnType = mappingType->valueType();
-			returnName = mappingType->valueName();
-		}
-		else if (auto arrayType = dynamic_cast<ArrayType const*>(returnType))
-		{
-			if (arrayType->isByteArrayOrString())
-				// Return byte arrays as whole.
-				break;
-			returnType = arrayType->baseType();
-			m_parameterNames.emplace_back("");
-			m_parameterTypes.push_back(TypeProvider::uint256());
-		}
-		else
-			break;
-	}
-
-	if (auto structType = dynamic_cast<StructType const*>(returnType))
-	{
-		for (auto const& member: structType->members(nullptr))
-		{
-			solAssert(member.type, "");
-			if (member.type->category() != Category::Mapping)
-			{
-				if (auto arrayType = dynamic_cast<ArrayType const*>(member.type))
-					if (!arrayType->isByteArrayOrString())
-						continue;
-				m_returnParameterTypes.push_back(TypeProvider::withLocationIfReference(
-					DataLocation::Memory,
-					member.type
-				));
-				m_returnParameterNames.push_back(member.name);
-			}
-		}
-	}
-	else
-	{
-		m_returnParameterTypes.push_back(TypeProvider::withLocationIfReference(
-			DataLocation::Memory,
-			returnType
-		));
-		m_returnParameterNames.emplace_back(returnName);
-	}
-
-	solAssert(
-			m_parameterNames.size() == m_parameterTypes.size(),
-			"Parameter names list must match parameter types list!"
-			);
-	solAssert(
-			m_returnParameterNames.size() == m_returnParameterTypes.size(),
-			"Return parameter names list must match return parameter types list!"
-			);
-}
-
-FunctionType::FunctionType(EventDefinition const& _event):
-	m_kind(Kind::Event),
-	m_stateMutability(StateMutability::NonPayable),
-	m_declaration(&_event)
-{
-	for (ASTPointer<VariableDeclaration> const& var: _event.parameters())
-	{
-		m_parameterNames.push_back(var->name());
-		m_parameterTypes.push_back(var->annotation().type);
-	}
-
-	solAssert(
-		m_parameterNames.size() == m_parameterTypes.size(),
-		"Parameter names list must match parameter types list!"
-	);
-	solAssert(
-		m_returnParameterNames.size() == 0 &&
-		m_returnParameterTypes.size() == 0,
-		""
-	);
-}
-
-FunctionType::FunctionType(ErrorDefinition const& _error):
-	m_kind(Kind::Error),
-	m_stateMutability(StateMutability::Pure),
-	m_declaration(&_error)
-{
-	for (ASTPointer<VariableDeclaration> const& var: _error.parameters())
-	{
-		m_parameterNames.push_back(var->name());
-		m_parameterTypes.push_back(var->annotation().type);
-	}
-
-	solAssert(
-		m_parameterNames.size() == m_parameterTypes.size(),
-		"Parameter names list must match parameter types list!"
-	);
-	solAssert(
-		m_returnParameterNames.size() == 0 &&
-		m_returnParameterTypes.size() == 0,
-		""
-	);
-}
-
-FunctionType::FunctionType(FunctionTypeName const& _typeName):
-	m_parameterNames(_typeName.parameterTypes().size(), ""),
-	m_returnParameterNames(_typeName.returnParameterTypes().size(), ""),
-	m_kind(_typeName.visibility() == Visibility::External ? Kind::External : Kind::Internal),
-	m_stateMutability(_typeName.stateMutability())
-{
-	if (_typeName.isPayable())
-		solAssert(m_kind == Kind::External, "Internal payable function type used.");
-	for (auto const& t: _typeName.parameterTypes())
-	{
-		solAssert(t->annotation().type, "Type not set for parameter.");
-		m_parameterTypes.push_back(t->annotation().type);
-	}
-	for (auto const& t: _typeName.returnParameterTypes())
-	{
-		solAssert(t->annotation().type, "Type not set for return parameter.");
-		m_returnParameterTypes.push_back(t->annotation().type);
-	}
-
-	solAssert(
-			m_parameterNames.size() == m_parameterTypes.size(),
-			"Parameter names list must match parameter types list!"
-			);
-	solAssert(
-			m_returnParameterNames.size() == m_returnParameterTypes.size(),
-			"Return parameter names list must match return parameter types list!"
-			);
-}
-
-FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _contract)
-{
-	FunctionDefinition const* constructor = _contract.constructor();
-	TypePointers parameters;
-	strings parameterNames;
-	StateMutability stateMutability = StateMutability::NonPayable;
-
-	solAssert(!_contract.isInterface(), "");
-
-	if (constructor)
-	{
-		for (ASTPointer<VariableDeclaration> const& var: constructor->parameters())
-		{
-			parameterNames.push_back(var->name());
-			parameters.push_back(var->annotation().type);
-		}
-		if (constructor->isPayable())
-			stateMutability = StateMutability::Payable;
-	}
-
-	return TypeProvider::function(
-		parameters,
-		TypePointers{TypeProvider::contract(_contract)},
-		parameterNames,
-		strings{""},
-		Kind::Creation,
-		stateMutability
-	);
-}
-
-std::vector<std::string> FunctionType::parameterNames() const
-{
-	if (!hasBoundFirstArgument())
-		return m_parameterNames;
-	return std::vector<std::string>(m_parameterNames.cbegin() + 1, m_parameterNames.cend());
-}
-
-TypePointers FunctionType::returnParameterTypesWithoutDynamicTypes() const
-{
-	TypePointers returnParameterTypes = m_returnParameterTypes;
-
-	if (
-		m_kind == Kind::External ||
-		m_kind == Kind::DelegateCall ||
-		m_kind == Kind::BareCall ||
-		m_kind == Kind::BareCallCode ||
-		m_kind == Kind::BareDelegateCall ||
-		m_kind == Kind::BareStaticCall
-	)
-		for (auto& param: returnParameterTypes)
-		{
-			solAssert(param->decodingType(), "");
-			if (param->decodingType()->isDynamicallyEncoded())
-				param = TypeProvider::inaccessibleDynamic();
-		}
-
-	return returnParameterTypes;
-}
-
-TypePointers FunctionType::parameterTypes() const
-{
-	if (!hasBoundFirstArgument())
-		return m_parameterTypes;
-	return TypePointers(m_parameterTypes.cbegin() + 1, m_parameterTypes.cend());
-}
-
-TypePointers const& FunctionType::parameterTypesIncludingSelf() const
-{
-	return m_parameterTypes;
-}
-
-std::string FunctionType::richIdentifier() const
-{
-	std::string id = "t_function_";
-	switch (m_kind)
-	{
-	case Kind::Declaration: id += "declaration"; break;
-	case Kind::Internal: id += "internal"; break;
-	case Kind::External: id += "external"; break;
-	case Kind::DelegateCall: id += "delegatecall"; break;
-	case Kind::BareCall: id += "barecall"; break;
-	case Kind::BareCallCode: id += "barecallcode"; break;
-	case Kind::BareDelegateCall: id += "baredelegatecall"; break;
-	case Kind::BareStaticCall: id += "barestaticcall"; break;
-	case Kind::Creation: id += "creation"; break;
-	case Kind::Send: id += "send"; break;
-	case Kind::Transfer: id += "transfer"; break;
-	case Kind::KECCAK256: id += "keccak256"; break;
-	case Kind::Selfdestruct: id += "selfdestruct"; break;
-	case Kind::Revert: id += "revert"; break;
-	case Kind::ECRecover: id += "ecrecover"; break;
-	case Kind::SHA256: id += "sha256"; break;
-	case Kind::RIPEMD160: id += "ripemd160"; break;
-	case Kind::GasLeft: id += "gasleft"; break;
-	case Kind::Event: id += "event"; break;
-	case Kind::Error: id += "error"; break;
-	case Kind::Wrap: id += "wrap"; break;
-	case Kind::Unwrap: id += "unwrap"; break;
-	case Kind::SetGas: id += "setgas"; break;
-	case Kind::SetValue: id += "setvalue"; break;
-	case Kind::BlockHash: id += "blockhash"; break;
-	case Kind::AddMod: id += "addmod"; break;
-	case Kind::MulMod: id += "mulmod"; break;
-	case Kind::ArrayPush: id += "arraypush"; break;
-	case Kind::ArrayPop: id += "arraypop"; break;
-	case Kind::BytesConcat: id += "bytesconcat"; break;
-	case Kind::StringConcat: id += "stringconcat"; break;
-	case Kind::ObjectCreation: id += "objectcreation"; break;
-	case Kind::Assert: id += "assert"; break;
-	case Kind::Require: id += "require"; break;
-	case Kind::ABIEncode: id += "abiencode"; break;
-	case Kind::ABIEncodePacked: id += "abiencodepacked"; break;
-	case Kind::ABIEncodeWithSelector: id += "abiencodewithselector"; break;
-	case Kind::ABIEncodeCall: id += "abiencodecall"; break;
-	case Kind::ABIEncodeWithSignature: id += "abiencodewithsignature"; break;
-	case Kind::ABIDecode: id += "abidecode"; break;
-	case Kind::MetaType: id += "metatype"; break;
-	}
-	id += "_" + stateMutabilityToString(m_stateMutability);
-	id += identifierList(m_parameterTypes) + "returns" + identifierList(m_returnParameterTypes);
-	if (gasSet())
-		id += "gas";
-	if (valueSet())
-		id += "value";
-	if (saltSet())
-		id += "salt";
-	if (hasBoundFirstArgument())
-		id += "attached_to" + identifierList(selfType());
-	return id;
-}
-
-bool FunctionType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	FunctionType const& other = dynamic_cast<FunctionType const&>(_other);
-	if (!equalExcludingStateMutability(other))
-		return false;
-	if (m_stateMutability != other.stateMutability())
-		return false;
-	return true;
-}
-
-BoolResult FunctionType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() == category())
-	{
-		auto const& convertToType = dynamic_cast<FunctionType const&>(_convertTo);
-		return (m_kind == FunctionType::Kind::Declaration) == (convertToType.kind() == FunctionType::Kind::Declaration);
-	}
-	return false;
-}
-
-BoolResult FunctionType::isImplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (_convertTo.category() != category())
-		return false;
-
-	FunctionType const& convertTo = dynamic_cast<FunctionType const&>(_convertTo);
-
-	// These two checks are duplicated in equalExcludingStateMutability, but are added here for error reporting.
-	if (convertTo.hasBoundFirstArgument() != hasBoundFirstArgument())
-		return BoolResult::err("Attached functions cannot be converted into unattached functions.");
-
-	if (convertTo.kind() != kind())
-		return BoolResult::err("Special functions cannot be converted to function types.");
-
-	if (
-		kind() == FunctionType::Kind::Declaration &&
-		m_declaration != convertTo.m_declaration
-	)
-		return BoolResult::err("Function declaration types referring to different functions cannot be converted to each other.");
-
-	if (!equalExcludingStateMutability(convertTo))
-		return false;
-
-	// non-payable should not be convertible to payable
-	if (m_stateMutability != StateMutability::Payable && convertTo.stateMutability() == StateMutability::Payable)
-		return false;
-
-	// payable should be convertible to non-payable, because you are free to pay 0 ether
-	if (m_stateMutability == StateMutability::Payable && convertTo.stateMutability() == StateMutability::NonPayable)
-		return true;
-
-	// e.g. pure should be convertible to view, but not the other way around.
-	if (m_stateMutability > convertTo.stateMutability())
-		return false;
-
-	return true;
-}
-
-TypeResult FunctionType::unaryOperatorResult(Token _operator) const
-{
-	if (_operator == Token::Delete)
-		return TypeResult(TypeProvider::emptyTuple());
-	return nullptr;
-}
-
-TypeResult FunctionType::binaryOperatorResult(Token _operator, Type const* _other) const
-{
-	if (_other->category() != category() || !(_operator == Token::Equal || _operator == Token::NotEqual))
-		return nullptr;
-	FunctionType const& other = dynamic_cast<FunctionType const&>(*_other);
-	if (kind() == Kind::Internal && sizeOnStack() == 1 && other.kind() == Kind::Internal && other.sizeOnStack() == 1)
-		return commonType(this, _other);
-	else if (
-		kind() == Kind::External &&
-		sizeOnStack() == 2 &&
-		!hasBoundFirstArgument() &&
-		other.kind() == Kind::External &&
-		other.sizeOnStack() == 2 &&
-		!other.hasBoundFirstArgument()
-	)
-		return commonType(this, _other);
-
-	return nullptr;
-}
-
-std::string FunctionType::canonicalName() const
-{
-	solAssert(m_kind == Kind::External, "");
-	return "function";
-}
-
-std::string FunctionType::humanReadableName() const
-{
-	switch (m_kind)
-	{
-	case Kind::Error:
-		return "error " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _withoutDataLocation */ true);
-	case Kind::Event:
-		return "event " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _withoutDataLocation */ true);
-	default:
-		return toString(/* _withoutDataLocation */ false);
-	}
-}
-
-std::string FunctionType::toString(bool _withoutDataLocation) const
-{
-	std::string name = "function ";
-	if (m_kind == Kind::Declaration)
-	{
-		auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration);
-		solAssert(functionDefinition, "");
-		if (auto const* contract = dynamic_cast<ContractDefinition const*>(functionDefinition->scope()))
-			name += *contract->annotation().canonicalName + ".";
-		name += functionDefinition->name();
-	}
-	name += toStringInParentheses(m_parameterTypes, _withoutDataLocation);
-	if (m_stateMutability != StateMutability::NonPayable)
-		name += " " + stateMutabilityToString(m_stateMutability);
-	if (m_kind == Kind::External)
-		name += " external";
-	if (!m_returnParameterTypes.empty())
-	{
-		name += " returns ";
-		name += toStringInParentheses(m_returnParameterTypes, _withoutDataLocation);
-	}
-	return name;
-}
-
-unsigned FunctionType::calldataEncodedSize(bool _padded) const
-{
-	unsigned size = storageBytes();
-	if (_padded)
-		size = ((size + 31) / 32) * 32;
-	return size;
-}
-
-u256 FunctionType::storageSize() const
-{
-	if (m_kind == Kind::External || m_kind == Kind::Internal)
-		return 1;
-	else
-		solAssert(false, "Storage size of non-storable function type requested.");
-}
-
-bool FunctionType::leftAligned() const
-{
-	return m_kind == Kind::External;
-}
-
-unsigned FunctionType::storageBytes() const
-{
-	if (m_kind == Kind::External)
-		return 20 + 4;
-	else if (m_kind == Kind::Internal)
-		return 8; // it should really not be possible to create larger programs
-	else
-		solAssert(false, "Storage size of non-storable function type requested.");
-}
-
-bool FunctionType::nameable() const
-{
-	return
-		(m_kind == Kind::Internal || m_kind == Kind::External) &&
-		!hasBoundFirstArgument() &&
-		!takesArbitraryParameters() &&
-		!gasSet() &&
-		!valueSet() &&
-		!saltSet();
-}
-
-std::vector<std::tuple<std::string, Type const*>> FunctionType::makeStackItems() const
-{
-	std::vector<std::tuple<std::string, Type const*>> slots;
-	Kind kind = m_kind;
-	if (m_kind == Kind::SetGas || m_kind == Kind::SetValue)
-	{
-		solAssert(m_returnParameterTypes.size() == 1, "");
-		kind = dynamic_cast<FunctionType const&>(*m_returnParameterTypes.front()).m_kind;
-	}
-
-	switch (kind)
-	{
-	case Kind::External:
-	case Kind::DelegateCall:
-		slots = {
-			std::make_tuple("address", TypeProvider::address()),
-			std::make_tuple("functionSelector", TypeProvider::uint(32))
-		};
-		break;
-	case Kind::BareCall:
-	case Kind::BareCallCode:
-	case Kind::BareDelegateCall:
-	case Kind::BareStaticCall:
-	case Kind::Transfer:
-	case Kind::Send:
-		slots = {std::make_tuple("address", TypeProvider::address())};
-		break;
-	case Kind::Internal:
-		slots = {std::make_tuple("functionIdentifier", TypeProvider::uint256())};
-		break;
-	case Kind::ArrayPush:
-	case Kind::ArrayPop:
-		solAssert(hasBoundFirstArgument(), "");
-		slots = {};
-		break;
-	default:
-		break;
-	}
-
-	if (gasSet())
-		slots.emplace_back("gas", TypeProvider::uint256());
-	if (valueSet())
-		slots.emplace_back("value", TypeProvider::uint256());
-	if (saltSet())
-		slots.emplace_back("salt", TypeProvider::fixedBytes(32));
-	if (hasBoundFirstArgument())
-		slots.emplace_back("self", m_parameterTypes.front());
-	return slots;
-}
-
-FunctionTypePointer FunctionType::interfaceFunctionType() const
-{
-	// Note that m_declaration might also be a state variable!
-	solAssert(m_declaration, "Declaration needed to determine interface function type.");
-	bool isLibraryFunction = false;
-	if (kind() != Kind::Event && kind() != Kind::Error)
-		if (auto const* contract = dynamic_cast<ContractDefinition const*>(m_declaration->scope()))
-			isLibraryFunction = contract->isLibrary();
-
-	util::Result<TypePointers> paramTypes =
-		transformParametersToExternal(m_parameterTypes, isLibraryFunction);
-
-	if (!paramTypes.message().empty())
-		return FunctionTypePointer();
-
-	util::Result<TypePointers> retParamTypes =
-		transformParametersToExternal(m_returnParameterTypes, isLibraryFunction);
-
-	if (!retParamTypes.message().empty())
-		return FunctionTypePointer();
-
-	auto variable = dynamic_cast<VariableDeclaration const*>(m_declaration);
-	if (variable && retParamTypes.get().empty())
-		return FunctionTypePointer();
-
-	solAssert(!takesArbitraryParameters());
-	return TypeProvider::function(
-		paramTypes,
-		retParamTypes,
-		m_parameterNames,
-		m_returnParameterNames,
-		m_kind,
-		m_stateMutability,
-		m_declaration
-	);
-}
-
-MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
-{
-	switch (m_kind)
-	{
-	case Kind::Declaration:
-		if (declaration().isPartOfExternalInterface())
-			return {{"selector", TypeProvider::fixedBytes(4)}};
-		else
-			return MemberList::MemberMap();
-	case Kind::Internal:
-		if (
-			auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration);
-			functionDefinition &&
-			_scope &&
-			functionDefinition->annotation().contract &&
-			_scope != functionDefinition->annotation().contract &&
-			functionDefinition->isPartOfExternalInterface()
-		)
-		{
-			auto const* contractScope = dynamic_cast<ContractDefinition const*>(_scope);
-			solAssert(contractScope && contractScope->derivesFrom(*functionDefinition->annotation().contract), "");
-			return {{"selector", TypeProvider::fixedBytes(4)}};
-		}
-		else
-			return MemberList::MemberMap();
-	case Kind::External:
-	case Kind::Creation:
-	case Kind::BareCall:
-	case Kind::BareCallCode:
-	case Kind::BareDelegateCall:
-	case Kind::BareStaticCall:
-	{
-		MemberList::MemberMap members;
-		if (m_kind == Kind::External)
-		{
-			members.emplace_back("selector", TypeProvider::fixedBytes(4));
-			members.emplace_back("address", TypeProvider::address());
-		}
-		if (m_kind != Kind::BareDelegateCall)
-		{
-			if (isPayable())
-				members.emplace_back(
-					"value",
-					TypeProvider::function(
-						parseElementaryTypeVector({"uint"}),
-						TypePointers{copyAndSetCallOptions(false, true, false)},
-						strings(1, ""),
-						strings(1, ""),
-						Kind::SetValue,
-						StateMutability::Pure,
-						nullptr,
-						Options::fromFunctionType(*this)
-					)
-				);
-		}
-		if (m_kind != Kind::Creation)
-			members.emplace_back(
-				"gas",
-				TypeProvider::function(
-					parseElementaryTypeVector({"uint"}),
-					TypePointers{copyAndSetCallOptions(true, false, false)},
-					strings(1, ""),
-					strings(1, ""),
-					Kind::SetGas,
-					StateMutability::Pure,
-					nullptr,
-					Options::fromFunctionType(*this)
-				)
-			);
-		return members;
-	}
-	case Kind::DelegateCall:
-	{
-		if (auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration))
-		{
-			solAssert(functionDefinition->visibility() > Visibility::Internal, "");
-			auto const *contract = dynamic_cast<ContractDefinition const*>(m_declaration->scope());
-			solAssert(contract, "");
-			solAssert(contract->isLibrary(), "");
-			return {{"selector", TypeProvider::fixedBytes(4)}};
-		}
-		return {};
-	}
-	case Kind::Error:
-		return {{"selector", TypeProvider::fixedBytes(4)}};
-	case Kind::Event:
-	{
-		if (!(dynamic_cast<EventDefinition const&>(declaration()).isAnonymous()))
-			return {{"selector", TypeProvider::fixedBytes(32)}};
-		return MemberList::MemberMap();
-	}
-	default:
-		return MemberList::MemberMap();
-	}
-}
-
-Type const* FunctionType::encodingType() const
-{
-	if (gasSet() || valueSet())
-		return nullptr;
-	// Only external functions can be encoded, internal functions cannot leave code boundaries.
-	if (m_kind == Kind::External)
-		return this;
-	else
-		return nullptr;
-}
-
-TypeResult FunctionType::interfaceType(bool /*_inLibrary*/) const
-{
-	if (m_kind == Kind::External)
-		return this;
-	else
-		return TypeResult::err("Internal type is not allowed for public or external functions.");
-}
-
-Type const* FunctionType::mobileType() const
-{
-	if (valueSet() || gasSet() || saltSet() || hasBoundFirstArgument())
-		return nullptr;
-
-	// Special function types do not get a mobile type, such that they cannot be used in complex expressions.
-	if (m_kind != FunctionType::Kind::Internal && m_kind != FunctionType::Kind::External && m_kind != FunctionType::Kind::DelegateCall)
-		return nullptr;
-
-	// return function without parameter names and without declaration
-	return TypeProvider::function(
-		m_parameterTypes,
-		m_returnParameterTypes,
-		strings(m_parameterTypes.size()),
-		strings(m_returnParameterNames.size()),
-		m_kind,
-		m_stateMutability,
-		nullptr,
-		Options::fromFunctionType(*this)
-	);
-}
-
-bool FunctionType::canTakeArguments(
-	FuncCallArguments const& _arguments,
-	Type const* _selfType
-) const
-{
-	solAssert(!hasBoundFirstArgument() || _selfType, "");
-	if (hasBoundFirstArgument() && !_selfType->isImplicitlyConvertibleTo(*selfType()))
-		return false;
-	TypePointers paramTypes = parameterTypes();
-	std::vector<std::string> const paramNames = parameterNames();
-
-	if (takesArbitraryParameters())
-		return true;
-	else if (_arguments.numArguments() != paramTypes.size())
-		return false;
-	else if (!_arguments.hasNamedArguments())
-		return equal(
-			_arguments.types.cbegin(),
-			_arguments.types.cend(),
-			paramTypes.cbegin(),
-			[](Type const* argumentType, Type const* parameterType)
-			{
-				return argumentType->isImplicitlyConvertibleTo(*parameterType);
-			}
-		);
-	else if (paramNames.size() != _arguments.numNames())
-		return false;
-	else
-	{
-		solAssert(_arguments.numArguments() == _arguments.numNames(), "Expected equal sized type & name vectors");
-
-		size_t matchedNames = 0;
-
-		for (size_t a = 0; a < _arguments.names.size(); a++)
-			for (size_t p = 0; p < paramNames.size(); p++)
-				if (*_arguments.names[a] == paramNames[p])
-				{
-					matchedNames++;
-					if (!_arguments.types[a]->isImplicitlyConvertibleTo(*paramTypes[p]))
-						return false;
-				}
-
-		if (matchedNames == _arguments.numNames())
-			return true;
-
-		return false;
-	}
-}
-
-bool FunctionType::hasEqualParameterTypes(FunctionType const& _other) const
-{
-	if (m_parameterTypes.size() != _other.m_parameterTypes.size())
-		return false;
-	return equal(
-		m_parameterTypes.cbegin(),
-		m_parameterTypes.cend(),
-		_other.m_parameterTypes.cbegin(),
-		[](Type const* _a, Type const* _b) -> bool { return *_a == *_b; }
-	);
-}
-
-bool FunctionType::hasEqualReturnTypes(FunctionType const& _other) const
-{
-	if (m_returnParameterTypes.size() != _other.m_returnParameterTypes.size())
-		return false;
-	return equal(
-		m_returnParameterTypes.cbegin(),
-		m_returnParameterTypes.cend(),
-		_other.m_returnParameterTypes.cbegin(),
-		[](Type const* _a, Type const* _b) -> bool { return *_a == *_b; }
-	);
-}
-
-bool FunctionType::equalExcludingStateMutability(FunctionType const& _other) const
-{
-	if (m_kind != _other.m_kind)
-		return false;
-
-	if (!hasEqualParameterTypes(_other) || !hasEqualReturnTypes(_other))
-		return false;
-
-	//@todo this is ugly, but cannot be prevented right now
-	if (gasSet() != _other.gasSet() || valueSet() != _other.valueSet() || saltSet() != _other.saltSet())
-		return false;
-
-	if (hasBoundFirstArgument() != _other.hasBoundFirstArgument())
-		return false;
-
-	solAssert(!hasBoundFirstArgument() || *selfType() == *_other.selfType(), "");
-
-	return true;
-}
-
-bool FunctionType::isBareCall() const
-{
-	switch (m_kind)
-	{
-	case Kind::BareCall:
-	case Kind::BareCallCode:
-	case Kind::BareDelegateCall:
-	case Kind::BareStaticCall:
-	case Kind::ECRecover:
-	case Kind::SHA256:
-	case Kind::RIPEMD160:
-		return true;
-	default:
-		return false;
-	}
-}
-
-std::string FunctionType::externalSignature() const
-{
-	solAssert(m_declaration != nullptr, "External signature of function needs declaration");
-	solAssert(!m_declaration->name().empty(), "Fallback function has no signature.");
-	switch (kind())
-	{
-	case Kind::Internal:
-	case Kind::External:
-	case Kind::DelegateCall:
-	case Kind::Event:
-	case Kind::Error:
-	case Kind::Declaration:
-		break;
-	default:
-		solAssert(false, "Invalid function type for requesting external signature.");
-	}
-
-	// "inLibrary" is only relevant if this is neither an event nor an error.
-	bool inLibrary = false;
-	if (kind() != Kind::Event && kind() != Kind::Error)
-		if (auto const* contract = dynamic_cast<ContractDefinition const*>(m_declaration->scope()))
-			inLibrary = contract->isLibrary();
-
-	auto extParams = transformParametersToExternal(m_parameterTypes, inLibrary);
-
-	solAssert(extParams.message().empty(), extParams.message());
-
-	auto typeStrings = extParams.get() | ranges::views::transform([&](Type const* _t) -> std::string
-	{
-		std::string typeName = _t->signatureInExternalFunction(inLibrary);
-
-		if (inLibrary && _t->dataStoredIn(DataLocation::Storage))
-			typeName += " storage";
-		return typeName;
-	});
-	return m_declaration->name() + "(" + boost::algorithm::join(typeStrings, ",") + ")";
-}
-
-u256 FunctionType::externalIdentifier() const
-{
-	return util::selectorFromSignatureU32(externalSignature());
-}
-
-std::string FunctionType::externalIdentifierHex() const
-{
-	return util::selectorFromSignatureH32(externalSignature()).hex();
-}
-
-bool FunctionType::isPure() const
-{
-	// TODO: replace this with m_stateMutability == StateMutability::Pure once
-	//       the callgraph analyzer is in place
-	return
-		m_kind == Kind::KECCAK256 ||
-		m_kind == Kind::ECRecover ||
-		m_kind == Kind::SHA256 ||
-		m_kind == Kind::RIPEMD160 ||
-		m_kind == Kind::AddMod ||
-		m_kind == Kind::MulMod ||
-		m_kind == Kind::ObjectCreation ||
-		m_kind == Kind::ABIEncode ||
-		m_kind == Kind::ABIEncodePacked ||
-		m_kind == Kind::ABIEncodeWithSelector ||
-		m_kind == Kind::ABIEncodeCall ||
-		m_kind == Kind::ABIEncodeWithSignature ||
-		m_kind == Kind::ABIDecode ||
-		m_kind == Kind::MetaType ||
-		m_kind == Kind::Wrap ||
-		m_kind == Kind::Unwrap;
-}
-
-TypePointers FunctionType::parseElementaryTypeVector(strings const& _types)
-{
-	TypePointers pointers;
-	pointers.reserve(_types.size());
-	for (std::string const& type: _types)
-		pointers.push_back(TypeProvider::fromElementaryTypeName(type));
-	return pointers;
-}
-
-Type const* FunctionType::copyAndSetCallOptions(bool _setGas, bool _setValue, bool _setSalt) const
-{
-	solAssert(m_kind != Kind::Declaration, "");
-	Options options = Options::fromFunctionType(*this);
-	if (_setGas) options.gasSet = true;
-	if (_setValue) options.valueSet = true;
-	if (_setSalt) options.saltSet = true;
-	return TypeProvider::function(
-		m_parameterTypes,
-		m_returnParameterTypes,
-		m_parameterNames,
-		m_returnParameterNames,
-		m_kind,
-		m_stateMutability,
-		m_declaration,
-		options
-	);
-}
-
-FunctionTypePointer FunctionType::withBoundFirstArgument() const
-{
-	solAssert(!m_parameterTypes.empty(), "");
-	solAssert(!gasSet(), "");
-	solAssert(!valueSet(), "");
-	solAssert(!saltSet(), "");
-	Options options = Options::fromFunctionType(*this);
-	options.hasBoundFirstArgument = true;
-	return TypeProvider::function(
-		m_parameterTypes,
-		m_returnParameterTypes,
-		m_parameterNames,
-		m_returnParameterNames,
-		m_kind,
-		m_stateMutability,
-		m_declaration,
-		options
-	);
-}
-
-FunctionTypePointer FunctionType::asExternallyCallableFunction(bool _inLibrary) const
-{
-	TypePointers parameterTypes;
-	for (auto const& t: m_parameterTypes)
-		if (TypeProvider::isReferenceWithLocation(t, DataLocation::CallData))
-			parameterTypes.push_back(
-				TypeProvider::withLocationIfReference(DataLocation::Memory, t, true)
-			);
-		else
-			parameterTypes.push_back(t);
-
-	TypePointers returnParameterTypes;
-	for (auto const& returnParamType: m_returnParameterTypes)
-		if (TypeProvider::isReferenceWithLocation(returnParamType, DataLocation::CallData))
-			returnParameterTypes.push_back(
-				TypeProvider::withLocationIfReference(DataLocation::Memory, returnParamType, true)
-			);
-		else
-			returnParameterTypes.push_back(returnParamType);
-
-	Kind kind = m_kind;
-	if (_inLibrary)
-	{
-		solAssert(!!m_declaration, "Declaration has to be available.");
-		solAssert(m_declaration->isPublic(), "");
-		kind = Kind::DelegateCall;
-	}
-
-	return TypeProvider::function(
-		parameterTypes,
-		returnParameterTypes,
-		m_parameterNames,
-		m_returnParameterNames,
-		kind,
-		m_stateMutability,
-		m_declaration,
-		Options::fromFunctionType(*this)
-	);
-}
-
-Type const* FunctionType::selfType() const
-{
-	solAssert(hasBoundFirstArgument(), "Function is not attached to a type.");
-	solAssert(m_parameterTypes.size() > 0, "Function has no self type.");
-	return m_parameterTypes.at(0);
-}
-
-ASTPointer<StructuredDocumentation> FunctionType::documentation() const
-{
-	auto function = dynamic_cast<StructurallyDocumented const*>(m_declaration);
-	if (function)
-		return function->documentation();
-
-	return ASTPointer<StructuredDocumentation>();
-}
-
-bool FunctionType::padArguments() const
-{
-	// No padding only for hash functions, low-level calls and the packed encoding function.
-	switch (m_kind)
-	{
-	case Kind::BareCall:
-	case Kind::BareCallCode:
-	case Kind::BareDelegateCall:
-	case Kind::BareStaticCall:
-	case Kind::SHA256:
-	case Kind::RIPEMD160:
-	case Kind::KECCAK256:
-	case Kind::ABIEncodePacked:
-		return false;
-	default:
-		return true;
-	}
-	return true;
-}
-
-Type const* MappingType::encodingType() const
-{
-	return TypeProvider::integer(256, IntegerType::Modifier::Unsigned);
-}
-
-std::string MappingType::richIdentifier() const
-{
-	return "t_mapping" + identifierList(m_keyType, m_valueType);
-}
-
-bool MappingType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	MappingType const& other = dynamic_cast<MappingType const&>(_other);
-	return *other.m_keyType == *m_keyType && *other.m_valueType == *m_valueType;
-}
-
-std::string MappingType::toString(bool _withoutDataLocation) const
-{
-	return "mapping(" + keyType()->toString(_withoutDataLocation) + " => " + valueType()->toString(_withoutDataLocation) + ")";
-}
-
-std::string MappingType::canonicalName() const
-{
-	return "mapping(" + keyType()->canonicalName() + " => " + valueType()->canonicalName() + ")";
-}
-
-TypeResult MappingType::interfaceType(bool _inLibrary) const
-{
-	solAssert(keyType()->interfaceType(_inLibrary).get(), "Must be an elementary type!");
-
-	if (_inLibrary)
-	{
-		auto iType = valueType()->interfaceType(_inLibrary);
-
-		if (!iType.get())
-		{
-			solAssert(!iType.message().empty(), "Expected detailed error message!");
-			return iType;
-		}
-	}
-	else
-		return TypeResult::err(
-			"Types containing (nested) mappings can only be parameters or "
-			"return variables of internal or library functions."
-		);
-
-	return this;
-}
-
-std::vector<std::tuple<std::string, Type const*>> MappingType::makeStackItems() const
-{
-	return {std::make_tuple("slot", TypeProvider::uint256())};
-}
-
-std::string TypeType::richIdentifier() const
-{
-	return "t_type" + identifierList(actualType());
-}
-
-bool TypeType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	TypeType const& other = dynamic_cast<TypeType const&>(_other);
-	return *actualType() == *other.actualType();
-}
-
-u256 TypeType::storageSize() const
-{
-	solAssert(false, "Storage size of non-storable type type requested.");
-}
-
-std::vector<std::tuple<std::string, Type const*>> TypeType::makeStackItems() const
-{
-	if (auto contractType = dynamic_cast<ContractType const*>(m_actualType))
-		if (contractType->contractDefinition().isLibrary())
-		{
-			solAssert(!contractType->isSuper(), "");
-			return {std::make_tuple("address", TypeProvider::address())};
-		}
-
-	return {};
-}
-
-MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) const
-{
-	MemberList::MemberMap members;
-	if (m_actualType->category() == Category::Contract)
-	{
-		auto contractType = dynamic_cast<ContractType const*>(m_actualType);
-		ContractDefinition const& contract = contractType->contractDefinition();
-		if (contractType->isSuper())
-		{
-			// add the most derived of all functions which are visible in derived contracts
-			auto bases = contract.annotation().linearizedBaseContracts;
-			solAssert(bases.size() >= 1, "linearizedBaseContracts should at least contain the most derived contract.");
-			// `sliced(1, ...)` ignores the most derived contract, which should not be searchable from `super`.
-			for (ContractDefinition const* base: bases | ranges::views::tail)
-				for (FunctionDefinition const* function: base->definedFunctions())
-				{
-					if (!function->isVisibleInDerivedContracts() || !function->isImplemented())
-						continue;
-
-					auto functionType = TypeProvider::function(*function, FunctionType::Kind::Internal);
-					bool functionWithEqualArgumentsFound = false;
-					for (auto const& member: members)
-					{
-						if (member.name != function->name())
-							continue;
-						auto memberType = dynamic_cast<FunctionType const*>(member.type);
-						solAssert(!!memberType, "Override changes type.");
-						if (!memberType->hasEqualParameterTypes(*functionType))
-							continue;
-						functionWithEqualArgumentsFound = true;
-						break;
-					}
-					if (!functionWithEqualArgumentsFound)
-						members.emplace_back(function, functionType);
-				}
-		}
-		else
-		{
-			auto const* contractScope = dynamic_cast<ContractDefinition const*>(_currentScope);
-			bool inDerivingScope = contractScope && contractScope->derivesFrom(contract);
-
-			for (auto const* declaration: contract.declarations())
-			{
-				if (dynamic_cast<ModifierDefinition const*>(declaration))
-					continue;
-				if (declaration->name().empty())
-					continue;
-
-				if (!contract.isLibrary() && inDerivingScope && declaration->isVisibleInDerivedContracts())
-				{
-					if (
-						auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(declaration);
-						functionDefinition && !functionDefinition->isImplemented()
-					)
-						members.emplace_back(declaration, declaration->typeViaContractName());
-					else
-						members.emplace_back(declaration, declaration->type());
-				}
-				else if (
-					(contract.isLibrary() && declaration->isVisibleAsLibraryMember()) ||
-					declaration->isVisibleViaContractTypeAccess()
-				)
-					members.emplace_back(declaration, declaration->typeViaContractName());
-			}
-		}
-	}
-	else if (m_actualType->category() == Category::Enum)
-	{
-		EnumDefinition const& enumDef = dynamic_cast<EnumType const&>(*m_actualType).enumDefinition();
-		auto enumType = TypeProvider::enumType(enumDef);
-		for (ASTPointer<EnumValue> const& enumValue: enumDef.members())
-			members.emplace_back(enumValue.get(), enumType);
-	}
-	else if (m_actualType->category() == Category::UserDefinedValueType)
-	{
-		auto& userDefined = dynamic_cast<UserDefinedValueType const&>(*m_actualType);
-		members.emplace_back(
-			"wrap",
-			TypeProvider::function(
-				TypePointers{&userDefined.underlyingType()},
-				TypePointers{&userDefined},
-				strings{std::string{}},
-				strings{std::string{}},
-				FunctionType::Kind::Wrap,
-				StateMutability::Pure
-			)
-		);
-		members.emplace_back(
-			"unwrap",
-			TypeProvider::function(
-				TypePointers{&userDefined},
-				TypePointers{&userDefined.underlyingType()},
-				strings{std::string{}},
-				strings{std::string{}},
-				FunctionType::Kind::Unwrap,
-				StateMutability::Pure
-			)
-		);
-	}
-	else if (
-		auto const* arrayType = dynamic_cast<ArrayType const*>(m_actualType);
-		arrayType && arrayType->isByteArrayOrString()
-	)
-		members.emplace_back("concat", TypeProvider::function(
-			TypePointers{},
-			TypePointers{arrayType->isString() ? TypeProvider::stringMemory() : TypeProvider::bytesMemory()},
-			strings{},
-			strings{std::string{}},
-			arrayType->isString() ? FunctionType::Kind::StringConcat : FunctionType::Kind::BytesConcat,
-			StateMutability::Pure,
-			nullptr,
-			FunctionType::Options::withArbitraryParameters()
-		));
-	return members;
-}
-
-BoolResult TypeType::isExplicitlyConvertibleTo(Type const& _convertTo) const
-{
-	if (auto const* address = dynamic_cast<AddressType const*>(&_convertTo))
-		if (address->stateMutability() == StateMutability::NonPayable)
-			if (auto const* contractType = dynamic_cast<ContractType const*>(m_actualType))
-				return contractType->contractDefinition().isLibrary();
-	return isImplicitlyConvertibleTo(_convertTo);
-}
-
-ModifierType::ModifierType(ModifierDefinition const& _modifier)
-{
-	TypePointers params;
-	params.reserve(_modifier.parameters().size());
-	for (ASTPointer<VariableDeclaration> const& var: _modifier.parameters())
-		params.push_back(var->annotation().type);
-	swap(params, m_parameterTypes);
-}
-
-u256 ModifierType::storageSize() const
-{
-	solAssert(false, "Storage size of non-storable type type requested.");
-}
-
-std::string ModifierType::richIdentifier() const
-{
-	return "t_modifier" + identifierList(m_parameterTypes);
-}
-
-bool ModifierType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	ModifierType const& other = dynamic_cast<ModifierType const&>(_other);
-
-	if (m_parameterTypes.size() != other.m_parameterTypes.size())
-		return false;
-	auto typeCompare = [](Type const* _a, Type const* _b) -> bool { return *_a == *_b; };
-
-	if (!equal(
-		m_parameterTypes.cbegin(),
-		m_parameterTypes.cend(),
-		other.m_parameterTypes.cbegin(),
-		typeCompare
-	))
-		return false;
-	return true;
-}
-
-std::string ModifierType::toString(bool _withoutDataLocation) const
-{
-	std::string name = "modifier (";
-	for (auto it = m_parameterTypes.begin(); it != m_parameterTypes.end(); ++it)
-		name += (*it)->toString(_withoutDataLocation) + (it + 1 == m_parameterTypes.end() ? "" : ",");
-	return name + ")";
-}
-
-std::string ModuleType::richIdentifier() const
-{
-	return "t_module_" + std::to_string(m_sourceUnit.id());
-}
-
-bool ModuleType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	return &m_sourceUnit == &dynamic_cast<ModuleType const&>(_other).m_sourceUnit;
-}
-
-MemberList::MemberMap ModuleType::nativeMembers(ASTNode const*) const
-{
-	MemberList::MemberMap symbols;
-	for (auto const& [name, declarations]: *m_sourceUnit.annotation().exportedSymbols)
-		for (Declaration const* symbol: declarations)
-			symbols.emplace_back(symbol, symbol->type(), name);
-	return symbols;
-}
-
-std::string ModuleType::toString(bool) const
-{
-	return std::string("module \"") + *m_sourceUnit.annotation().path + std::string("\"");
-}
-
-std::string MagicType::richIdentifier() const
-{
-	switch (m_kind)
-	{
-	case Kind::Block:
-		return "t_magic_block";
-	case Kind::Message:
-		return "t_magic_message";
-	case Kind::Transaction:
-		return "t_magic_transaction";
-	case Kind::ABI:
-		return "t_magic_abi";
-	case Kind::MetaType:
-		solAssert(m_typeArgument, "");
-		return "t_magic_meta_type_" + m_typeArgument->richIdentifier();
-	}
-	return "";
-}
-
-bool MagicType::operator==(Type const& _other) const
-{
-	if (_other.category() != category())
-		return false;
-	MagicType const& other = dynamic_cast<MagicType const&>(_other);
-	return other.m_kind == m_kind;
-}
-
-MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
-{
-	switch (m_kind)
-	{
-	case Kind::Block:
-		return MemberList::MemberMap({
-			{"coinbase", TypeProvider::payableAddress()},
-			{"timestamp", TypeProvider::uint256()},
-			{"blockhash", TypeProvider::function(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, StateMutability::View)},
-			{"difficulty", TypeProvider::uint256()},
-			{"prevrandao", TypeProvider::uint256()},
-			{"number", TypeProvider::uint256()},
-			{"gaslimit", TypeProvider::uint256()},
-			{"chainid", TypeProvider::uint256()},
-			{"basefee", TypeProvider::uint256()}
-		});
-	case Kind::Message:
-		return MemberList::MemberMap({
-			{"sender", TypeProvider::address()},
-			{"gas", TypeProvider::uint256()},
-			{"value", TypeProvider::uint256()},
-			{"data", TypeProvider::array(DataLocation::CallData)},
-			{"sig", TypeProvider::fixedBytes(4)}
-		});
-	case Kind::Transaction:
-		return MemberList::MemberMap({
-			{"origin", TypeProvider::address()},
-			{"gasprice", TypeProvider::uint256()}
-		});
-	case Kind::ABI:
-		return MemberList::MemberMap({
-			{"encode", TypeProvider::function(
-				TypePointers{},
-				TypePointers{TypeProvider::array(DataLocation::Memory)},
-				strings{},
-				strings{1, ""},
-				FunctionType::Kind::ABIEncode,
-				StateMutability::Pure,
-				nullptr,
-				FunctionType::Options::withArbitraryParameters()
-			)},
-			{"encodePacked", TypeProvider::function(
-				TypePointers{},
-				TypePointers{TypeProvider::array(DataLocation::Memory)},
-				strings{},
-				strings{1, ""},
-				FunctionType::Kind::ABIEncodePacked,
-				StateMutability::Pure,
-				nullptr,
-				FunctionType::Options::withArbitraryParameters()
-			)},
-			{"encodeWithSelector", TypeProvider::function(
-				TypePointers{TypeProvider::fixedBytes(4)},
-				TypePointers{TypeProvider::array(DataLocation::Memory)},
-				strings{1, ""},
-				strings{1, ""},
-				FunctionType::Kind::ABIEncodeWithSelector,
-				StateMutability::Pure,
-				nullptr,
-				FunctionType::Options::withArbitraryParameters()
-			)},
-			{"encodeCall", TypeProvider::function(
-				TypePointers{},
-				TypePointers{TypeProvider::array(DataLocation::Memory)},
-				strings{},
-				strings{1, ""},
-				FunctionType::Kind::ABIEncodeCall,
-				StateMutability::Pure,
-				nullptr,
-				FunctionType::Options::withArbitraryParameters()
-			)},
-			{"encodeWithSignature", TypeProvider::function(
-				TypePointers{TypeProvider::array(DataLocation::Memory, true)},
-				TypePointers{TypeProvider::array(DataLocation::Memory)},
-				strings{1, ""},
-				strings{1, ""},
-				FunctionType::Kind::ABIEncodeWithSignature,
-				StateMutability::Pure,
-				nullptr,
-				FunctionType::Options::withArbitraryParameters()
-			)},
-			{"decode", TypeProvider::function(
-				TypePointers(),
-				TypePointers(),
-				strings{},
-				strings{},
-				FunctionType::Kind::ABIDecode,
-				StateMutability::Pure,
-				nullptr,
-				FunctionType::Options::withArbitraryParameters()
-			)}
-		});
-	case Kind::MetaType:
-	{
-		solAssert(
-			m_typeArgument && (
-					m_typeArgument->category() == Type::Category::Contract ||
-					m_typeArgument->category() == Type::Category::Integer ||
-					m_typeArgument->category() == Type::Category::Enum
-			),
-			"Only enums, contracts or integer types supported for now"
-		);
-
-		if (m_typeArgument->category() == Type::Category::Contract)
-		{
-			ContractDefinition const& contract = dynamic_cast<ContractType const&>(*m_typeArgument).contractDefinition();
-			if (contract.canBeDeployed())
-				return MemberList::MemberMap({
-					{"creationCode", TypeProvider::array(DataLocation::Memory)},
-					{"runtimeCode", TypeProvider::array(DataLocation::Memory)},
-					{"name", TypeProvider::stringMemory()},
-				});
-			else
-				return MemberList::MemberMap({
-					{"interfaceId", TypeProvider::fixedBytes(4)},
-					{"name", TypeProvider::stringMemory()},
-				});
-		}
-		else if (m_typeArgument->category() == Type::Category::Integer)
-		{
-			IntegerType const* integerTypePointer = dynamic_cast<IntegerType const*>(m_typeArgument);
-			return MemberList::MemberMap({
-				{"min", integerTypePointer},
-				{"max", integerTypePointer},
-			});
-		}
-		else if (m_typeArgument->category() == Type::Category::Enum)
-		{
-			EnumType const* enumTypePointer = dynamic_cast<EnumType const*>(m_typeArgument);
-			return MemberList::MemberMap({
-				{"min", enumTypePointer},
-				{"max", enumTypePointer},
-			});
-		}
-	}
-	}
-	solAssert(false, "Unknown kind of magic.");
-	return {};
-}
-
-std::string MagicType::toString(bool _withoutDataLocation) const
-{
-	switch (m_kind)
-	{
-	case Kind::Block:
-		return "block";
-	case Kind::Message:
-		return "msg";
-	case Kind::Transaction:
-		return "tx";
-	case Kind::ABI:
-		return "abi";
-	case Kind::MetaType:
-		solAssert(m_typeArgument, "");
-		return "type(" + m_typeArgument->toString(_withoutDataLocation) + ")";
-	}
-	solAssert(false, "Unknown kind of magic.");
-	return {};
-}
-
-Type const* MagicType::typeArgument() const
-{
-	solAssert(m_kind == Kind::MetaType, "");
-	solAssert(m_typeArgument, "");
-	return m_typeArgument;
-}
-
-Type const* InaccessibleDynamicType::decodingType() const
-{
-	return TypeProvider::integer(256, IntegerType::Modifier::Unsigned);
-}
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
deleted file mode 100644
index fd1b6a7d3df3..000000000000
--- a/libsolidity/ast/Types.h
+++ /dev/null
@@ -1,1729 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity data types
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTEnums.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/parsing/Token.h>
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/LazyInit.h>
-#include <libsolutil/Result.h>
-
-#include <boost/rational.hpp>
-
-#include <map>
-#include <memory>
-#include <optional>
-#include <set>
-#include <string>
-#include <utility>
-
-namespace solidity::frontend
-{
-
-class TypeProvider;
-class Type; // forward
-class FunctionType; // forward
-using FunctionTypePointer = FunctionType const*;
-using TypePointers = std::vector<Type const*>;
-using rational = boost::rational<bigint>;
-using TypeResult = util::Result<Type const*>;
-using BoolResult = util::Result<bool>;
-
-}
-
-namespace solidity::frontend
-{
-
-inline rational makeRational(bigint const& _numerator, bigint const& _denominator)
-{
-	solAssert(_denominator != 0, "division by zero");
-	// due to a bug in certain versions of boost the denominator has to be positive
-	if (_denominator < 0)
-		return rational(-_numerator, -_denominator);
-	else
-		return rational(_numerator, _denominator);
-}
-
-enum class DataLocation { Storage, CallData, Memory };
-
-
-/**
- * Helper class to compute storage offsets of members of structs and contracts.
- */
-class StorageOffsets
-{
-public:
-	/// Resets the StorageOffsets objects and determines the position in storage for each
-	/// of the elements of @a _types.
-	void computeOffsets(TypePointers const& _types);
-	/// @returns the offset of the given member, might be null if the member is not part of storage.
-	std::pair<u256, unsigned> const* offset(size_t _index) const;
-	/// @returns the total number of slots occupied by all members.
-	u256 const& storageSize() const { return m_storageSize; }
-
-private:
-	u256 m_storageSize;
-	std::map<size_t, std::pair<u256, unsigned>> m_offsets;
-};
-
-/**
- * List of members of a type.
- */
-class MemberList
-{
-public:
-	struct Member
-	{
-		/// Manual constructor for members that are not taken from a declaration.
-		Member(char const* _name, Type const* _type):
-			name(_name),
-			type(_type),
-			declaration(nullptr)
-		{
-		}
-
-		/// Constructs a Member with the name extracted from @p _declaration's name.
-		Member(Declaration const* _declaration, Type const* _type);
-		Member(Declaration const* _declaration, Type const* _type, std::string _name);
-
-		std::string name;
-		Type const* type = nullptr;
-		Declaration const* declaration = nullptr;
-	};
-
-	using MemberMap = std::vector<Member>;
-
-	explicit MemberList(MemberMap _members): m_memberTypes(std::move(_members)) {}
-
-	void combine(MemberList const& _other);
-	Type const* memberType(std::string const& _name) const
-	{
-		Type const* type = nullptr;
-		for (auto const& it: m_memberTypes)
-			if (it.name == _name)
-			{
-				solAssert(!type, "Requested member type by non-unique name.");
-				type = it.type;
-			}
-		return type;
-	}
-	MemberMap membersByName(std::string const& _name) const
-	{
-		MemberMap members;
-		for (auto const& it: m_memberTypes)
-			if (it.name == _name)
-				members.push_back(it);
-		return members;
-	}
-	/// @returns the offset of the given member in storage slots and bytes inside a slot or
-	/// a nullptr if the member is not part of storage.
-	std::pair<u256, unsigned> const* memberStorageOffset(std::string const& _name) const;
-	/// @returns the number of storage slots occupied by the members.
-	u256 const& storageSize() const;
-
-	MemberMap::const_iterator begin() const { return m_memberTypes.begin(); }
-	MemberMap::const_iterator end() const { return m_memberTypes.end(); }
-
-private:
-	StorageOffsets const& storageOffsets() const;
-
-	MemberMap m_memberTypes;
-	util::LazyInit<StorageOffsets> m_storageOffsets;
-};
-
-static_assert(std::is_nothrow_move_constructible<MemberList>::value, "MemberList should be noexcept move constructible");
-
-/**
- * Abstract base class that forms the root of the type hierarchy.
- */
-class Type
-{
-public:
-	Type() = default;
-	Type(Type const&) = delete;
-	Type(Type&&) = delete;
-	Type& operator=(Type const&) = delete;
-	Type& operator=(Type&&) = delete;
-	virtual ~Type() = default;
-
-	enum class Category
-	{
-		Address,
-		Integer,
-		RationalNumber,
-		StringLiteral,
-		Bool,
-		FixedPoint,
-		Array,
-		ArraySlice,
-		FixedBytes,
-		Contract,
-		Struct,
-		Function,
-		Enum,
-		UserDefinedValueType,
-		Tuple,
-		Mapping,
-		TypeType,
-		Modifier,
-		Magic,
-		Module,
-		InaccessibleDynamic
-	};
-
-	/// @returns a pointer to _a or _b if the other is implicitly convertible to it or nullptr otherwise
-	static Type const* commonType(Type const* _a, Type const* _b);
-
-	virtual Category category() const = 0;
-	/// @returns a valid solidity identifier such that two types should compare equal if and
-	/// only if they have the same identifier.
-	/// The identifier should start with "t_".
-	/// Can contain characters which are invalid in identifiers.
-	virtual std::string richIdentifier() const = 0;
-	/// @returns a valid solidity identifier such that two types should compare equal if and
-	/// only if they have the same identifier.
-	/// The identifier should start with "t_".
-	/// Will not contain any character which would be invalid as an identifier.
-	std::string identifier() const;
-
-	/// More complex identifier strings use "parentheses", where $_ is interpreted as
-	/// "opening parenthesis", _$ as "closing parenthesis", _$_ as "comma" and any $ that
-	/// appears as part of a user-supplied identifier is escaped as _$$$_.
-	/// @returns an escaped identifier (will not contain any parenthesis or commas)
-	static std::string escapeIdentifier(std::string const& _identifier);
-
-	virtual BoolResult isImplicitlyConvertibleTo(Type const& _other) const { return *this == _other; }
-	virtual BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const
-	{
-		return isImplicitlyConvertibleTo(_convertTo);
-	}
-	/// @returns the resulting type of applying the given unary operator or an empty pointer if
-	/// this is not possible.
-	/// The default implementation does not allow any unary operator.
-	virtual TypeResult unaryOperatorResult(Token) const { return nullptr; }
-	/// @returns the resulting type of applying the given binary operator or an empty pointer if
-	/// this is not possible.
-	/// The default implementation allows comparison operators if a common type exists
-	virtual TypeResult binaryOperatorResult(Token _operator, Type const* _other) const
-	{
-		return TokenTraits::isCompareOp(_operator) ? commonType(this, _other) : nullptr;
-	}
-
-	virtual bool operator==(Type const& _other) const { return category() == _other.category(); }
-	virtual bool operator!=(Type const& _other) const { return !this->operator ==(_other); }
-
-	/// @returns number of bytes used by this type when encoded for CALL. Cannot be used for
-	/// dynamically encoded types.
-	/// Always returns a value greater than zero and throws if the type cannot be encoded in calldata
-	/// (or is dynamically encoded).
-	/// If @a _padded then it is assumed that each element is padded to a multiple of 32 bytes.
-	virtual unsigned calldataEncodedSize([[maybe_unused]] bool _padded) const { solAssert(false, ""); }
-	/// Convenience version of @see calldataEncodedSize(bool)
-	unsigned calldataEncodedSize() const { return calldataEncodedSize(true); }
-	/// @returns the distance between two elements of this type in a calldata array, tuple or struct.
-	/// For statically encoded types this is the same as calldataEncodedSize(true).
-	/// For dynamically encoded types this is the distance between two tail pointers, i.e. 32.
-	/// Always returns a value greater than zero and throws if the type cannot be encoded in calldata.
-	unsigned calldataHeadSize() const { return isDynamicallyEncoded() ? 32 : calldataEncodedSize(true); }
-	/// @returns the (minimal) size of the calldata tail for this type. Can only be used for
-	/// dynamically encoded types. For dynamically-sized arrays this is 32 (the size of the length),
-	/// for statically-sized, but dynamically encoded arrays this is 32*length(), for structs
-	/// this is the sum of the calldataHeadSize's of its members.
-	/// Always returns a value greater than zero and throws if the type cannot be encoded in calldata
-	/// (or is not dynamically encoded).
-	virtual unsigned calldataEncodedTailSize() const { solAssert(false, ""); }
-	/// @returns the size of this data type in bytes when stored in memory. For memory-reference
-	/// types, this is the size of the memory pointer.
-	virtual unsigned memoryHeadSize() const { return calldataEncodedSize(); }
-	/// @returns the size of this data type in bytes when stored in memory. For memory-reference
-	/// types, this is the size of the actual data area, if it is statically-sized.
-	virtual u256 memoryDataSize() const { return calldataEncodedSize(); }
-	/// @returns true if the type is a dynamic array
-	virtual bool isDynamicallySized() const { return false; }
-	/// @returns true if the type is dynamically encoded in the ABI
-	virtual bool isDynamicallyEncoded() const { return false; }
-	/// @returns the number of storage slots required to hold this value in storage.
-	/// For dynamically "allocated" types, it returns the size of the statically allocated head,
-	virtual u256 storageSize() const { return 1; }
-	/// @returns an upper bound on the total storage size required by this type, descending
-	/// into structs and statically-sized arrays. This is mainly to ensure that the storage
-	/// slot allocation algorithm does not overflow, it is not a protection against collisions.
-	virtual bigint storageSizeUpperBound() const { return 1; }
-	/// Multiple small types can be packed into a single storage slot. If such a packing is possible
-	/// this function @returns the size in bytes smaller than 32. Data is moved to the next slot if
-	/// it does not fit.
-	/// In order to avoid computation at runtime of whether such moving is necessary, structs and
-	/// array data (not each element) always start a new slot.
-	virtual unsigned storageBytes() const { return 32; }
-	/// Returns true if the type is a value type that is left-aligned on the stack with a size of
-	/// storageBytes() bytes. Returns false if the type is a value type that is right-aligned on
-	/// the stack with a size of storageBytes() bytes. Asserts if it is not a value type or the
-	/// encoding is more complicated.
-	/// Signed integers are not considered "more complicated" even though they need to be
-	/// sign-extended.
-	virtual bool leftAligned() const { solAssert(false, "Alignment property of non-value type requested."); }
-	/// Returns true if the type can be stored in storage.
-	virtual bool canBeStored() const { return true; }
-	/// Returns false if the type cannot live outside the storage, i.e. if it includes some mapping.
-	virtual bool containsNestedMapping() const
-	{
-		solAssert(nameable(), "Called for a non nameable type.");
-		return false;
-	}
-	/// Returns true if the type can be stored as a value (as opposed to a reference) on the stack,
-	/// i.e. it behaves differently in lvalue context and in value context.
-	virtual bool isValueType() const { return false; }
-	/// @returns true if this type can be used for variables. It returns false for
-	/// types like magic types, literals and function types with a kind that is not
-	/// internal or external.
-	virtual bool nameable() const { return false; }
-	/// @returns a list of named and typed stack items that determine the layout of this type on the stack.
-	/// A stack item either has an empty name and type ``nullptr`` referring to a single stack slot, or
-	/// has a non-empty name and a valid type referring to the stack layout of that type.
-	/// The complete layout of a type on the stack can be obtained from its stack items recursively as follows:
-	/// - Each unnamed stack item is untyped (its type is ``nullptr``) and contributes exactly one stack slot.
-	/// - Each named stack item is typed and contributes the stack slots given by the stack items of its type.
-	std::vector<std::tuple<std::string, Type const*>> const& stackItems() const
-	{
-		if (!m_stackItems)
-			m_stackItems = makeStackItems();
-		return *m_stackItems;
-	}
-	/// Total number of stack slots occupied by this type. This is the sum of ``sizeOnStack`` of all ``stackItems()``.
-	// TODO: consider changing the return type to be size_t
-	unsigned sizeOnStack() const
-	{
-		if (!m_stackSize)
-		{
-			size_t sizeOnStack = 0;
-			for (auto const& slot: stackItems())
-				if (std::get<1>(slot))
-					sizeOnStack += std::get<1>(slot)->sizeOnStack();
-				else
-					++sizeOnStack;
-			m_stackSize = sizeOnStack;
-		}
-		return static_cast<unsigned>(*m_stackSize);
-	}
-	/// If it is possible to initialize such a value in memory by just writing zeros
-	/// of the size memoryHeadSize().
-	virtual bool hasSimpleZeroValueInMemory() const { return true; }
-	/// @returns the mobile (in contrast to static) type corresponding to the given type.
-	/// This returns the corresponding IntegerType or FixedPointType for RationalNumberType
-	/// and the pointer type for storage reference types.
-	/// Might return a null pointer if there is no fitting type.
-	virtual Type const* mobileType() const { return this; }
-	/// @returns true if this is a non-value type and the data of this type is stored at the
-	/// given location.
-	virtual bool dataStoredIn(DataLocation) const { return false; }
-
-	/// Returns the list of all members of this type. Default implementation: no members apart from attached functions.
-	/// @param _currentScope scope in which the members are accessed.
-	MemberList const& members(ASTNode const* _currentScope) const;
-	/// Convenience method, returns the type of the given named member or an empty pointer if no such member exists.
-	Type const* memberType(std::string const& _name, ASTNode const* _currentScope = nullptr) const
-	{
-		return members(_currentScope).memberType(_name);
-	}
-
-	virtual std::string toString(bool _withoutDataLocation) const = 0;
-	std::string toString() const { return toString(false); }
-	/// @returns the canonical name of this type for use in library function signatures.
-	virtual std::string canonicalName() const { return toString(true); }
-	virtual std::string humanReadableName() const { return toString(); }
-	/// @returns the signature of this type in external functions, i.e. `uint256` for integers
-	/// or `(uint256,bytes8)[2]` for an array of structs. If @a _structsByName,
-	/// structs are given by canonical name like `ContractName.StructName[2]`.
-	virtual std::string signatureInExternalFunction(bool /*_structsByName*/) const
-	{
-		return canonicalName();
-	}
-	virtual u256 literalValue(Literal const*) const
-	{
-		solAssert(false, "Literal value requested for type without literals: " + toString(false));
-	}
-
-	/// @returns a (simpler) type that is encoded in the same way for external function calls.
-	/// This for example returns address for contract types.
-	/// If there is no such type, returns an empty shared pointer.
-	virtual Type const* encodingType() const { return nullptr; }
-	/// @returns the encoding type used under the given circumstances for the type of an expression
-	/// when used for e.g. abi.encode(...) or the empty pointer if the object
-	/// cannot be encoded.
-	/// This is different from encodingType since it takes implicit conversions into account.
-	Type const* fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool _packed) const;
-	/// @returns a (simpler) type that is used when decoding this type in calldata.
-	virtual Type const* decodingType() const { return encodingType(); }
-	/// @returns a type that will be used outside of Solidity for e.g. function signatures.
-	/// This for example returns address for contract types.
-	/// If there is no such type, returns an empty shared pointer.
-	/// @param _inLibrary if set, returns types as used in a library, e.g. struct and contract types
-	/// are returned without modification.
-	virtual TypeResult interfaceType(bool /*_inLibrary*/) const { return nullptr; }
-
-	/// @returns the declaration of a user defined type (enum, struct, user defined value type).
-	/// Returns nullptr otherwise.
-	virtual Declaration const* typeDefinition() const { return nullptr; }
-
-	/// Clears all internally cached values (if any).
-	virtual void clearCache() const;
-
-	/// Scans all "using for" directives in the @a _scope for functions implementing
-	/// the operator represented by @a _token. Returns the set of all definitions where the type
-	/// of the first argument matches this type object.
-	///
-	/// @note: If the AST has passed analysis without errors,
-	/// the function will find at most one definition for an operator.
-	///
-	/// @param _unary If true, only definitions that accept exactly one argument are included.
-	/// Otherwise only definitions that accept exactly two arguments.
-	std::set<FunctionDefinition const*, ASTCompareByID<ASTNode>> operatorDefinitions(
-		Token _token,
-		ASTNode const& _scope,
-		bool _unary
-	) const;
-
-private:
-	/// @returns a member list containing all members added to this type by `using for` directives.
-	static MemberList::MemberMap attachedFunctions(Type const& _type, ASTNode const& _scope);
-
-protected:
-	/// @returns the members native to this type depending on the given context. This function
-	/// is used (in conjunction with attachedFunctions to fill m_members below.
-	virtual MemberList::MemberMap nativeMembers(ASTNode const* /*_currentScope*/) const
-	{
-		return MemberList::MemberMap();
-	}
-	/// Generates the stack items to be returned by ``stackItems()``. Defaults
-	/// to exactly one unnamed and untyped stack item referring to a single stack slot.
-	virtual std::vector<std::tuple<std::string, Type const*>> makeStackItems() const
-	{
-		return {std::make_tuple(std::string(), nullptr)};
-	}
-
-
-	/// List of member types (parameterised by scape), will be lazy-initialized.
-	mutable std::map<ASTNode const*, std::unique_ptr<MemberList>> m_members;
-	mutable std::optional<std::vector<std::tuple<std::string, Type const*>>> m_stackItems;
-	mutable std::optional<size_t> m_stackSize;
-};
-
-/**
- * Type for addresses.
- */
-class AddressType: public Type
-{
-public:
-	explicit AddressType(StateMutability _stateMutability);
-
-	Category category() const override { return Category::Address; }
-
-	std::string richIdentifier() const override;
-	BoolResult isImplicitlyConvertibleTo(Type const& _other) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token _operator, Type const* _other) const override;
-
-	bool operator==(Type const& _other) const override;
-
-	unsigned calldataEncodedSize(bool _padded = true) const override { return _padded ? 32 : 160 / 8; }
-	unsigned storageBytes() const override { return 160 / 8; }
-	bool leftAligned() const override { return false; }
-	bool isValueType() const override { return true; }
-	bool nameable() const override { return true; }
-
-	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
-
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string canonicalName() const override;
-
-	u256 literalValue(Literal const* _literal) const override;
-
-	Type const* encodingType() const override { return this; }
-	TypeResult interfaceType(bool) const override { return this; }
-
-	StateMutability stateMutability(void) const { return m_stateMutability; }
-
-private:
-	StateMutability m_stateMutability;
-};
-
-/**
- * Any kind of integer type (signed, unsigned).
- */
-class IntegerType: public Type
-{
-public:
-	enum class Modifier
-	{
-		Unsigned, Signed
-	};
-
-	explicit IntegerType(unsigned _bits, Modifier _modifier = Modifier::Unsigned);
-
-	Category category() const override { return Category::Integer; }
-
-	std::string richIdentifier() const override;
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token _operator, Type const* _other) const override;
-
-	bool operator==(Type const& _other) const override;
-
-	unsigned calldataEncodedSize(bool _padded = true) const override { return _padded ? 32 : m_bits / 8; }
-	unsigned storageBytes() const override { return m_bits / 8; }
-	bool leftAligned() const override { return false; }
-	bool isValueType() const override { return true; }
-	bool nameable() const override { return true; }
-
-	std::string toString(bool _withoutDataLocation) const override;
-
-	Type const* encodingType() const override { return this; }
-	TypeResult interfaceType(bool) const override { return this; }
-
-	unsigned numBits() const { return m_bits; }
-	bool isSigned() const { return m_modifier == Modifier::Signed; }
-
-	u256 min() const;
-	u256 max() const;
-
-	bigint minValue() const;
-	bigint maxValue() const;
-
-private:
-	unsigned const m_bits;
-	Modifier const m_modifier;
-};
-
-/**
- * A fixed point type number (signed, unsigned).
- */
-class FixedPointType: public Type
-{
-public:
-	enum class Modifier
-	{
-		Unsigned, Signed
-	};
-
-	explicit FixedPointType(unsigned _totalBits, unsigned _fractionalDigits, Modifier _modifier = Modifier::Unsigned);
-	Category category() const override { return Category::FixedPoint; }
-
-	std::string richIdentifier() const override;
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token _operator, Type const* _other) const override;
-
-	bool operator==(Type const& _other) const override;
-
-	unsigned calldataEncodedSize(bool _padded = true) const override { return _padded ? 32 : m_totalBits / 8; }
-	unsigned storageBytes() const override { return m_totalBits / 8; }
-	bool leftAligned() const override { return false; }
-	bool isValueType() const override { return true; }
-	bool nameable() const override { return true; }
-
-	std::string toString(bool _withoutDataLocation) const override;
-
-	Type const* encodingType() const override { return this; }
-	TypeResult interfaceType(bool) const override { return this; }
-
-	/// Number of bits used for this type in total.
-	unsigned numBits() const { return m_totalBits; }
-	/// Number of decimal digits after the radix point.
-	unsigned fractionalDigits() const { return m_fractionalDigits; }
-	bool isSigned() const { return m_modifier == Modifier::Signed; }
-	/// @returns the largest integer value this type con hold. Note that this is not the
-	/// largest value in general.
-	bigint maxIntegerValue() const;
-	/// @returns the smallest integer value this type can hold. Note hat this is not the
-	/// smallest value in general.
-	bigint minIntegerValue() const;
-
-	/// @returns the smallest integer type that can hold this type with fractional parts shifted to integers.
-	IntegerType const* asIntegerType() const;
-
-private:
-	unsigned m_totalBits;
-	unsigned m_fractionalDigits;
-	Modifier m_modifier;
-};
-
-/**
- * Integer and fixed point constants either literals or computed.
- * Example expressions: 2, 3.14, 2+10.2, ~10.
- * There is one distinct type per value.
- */
-class RationalNumberType: public Type
-{
-public:
-	explicit RationalNumberType(rational _value, Type const* _compatibleBytesType = nullptr):
-		m_value(std::move(_value)), m_compatibleBytesType(_compatibleBytesType)
-	{}
-
-	Category category() const override { return Category::RationalNumber; }
-
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token _operator, Type const* _other) const override;
-
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-
-	bool canBeStored() const override { return false; }
-
-	std::string toString(bool _withoutDataLocation) const override;
-	u256 literalValue(Literal const* _literal) const override;
-	Type const* mobileType() const override;
-
-	/// @returns the underlying raw literal value.
-	///
-	/// @see literalValue(Literal const*))
-	rational const& value() const noexcept { return m_value; }
-
-	/// @returns the smallest integer type that can hold the value or an empty pointer if not possible.
-	IntegerType const* integerType() const;
-	/// @returns the smallest fixed type that can hold the value or incurs the least precision loss,
-	/// unless the value was truncated, then a suitable type will be chosen to indicate such event.
-	/// If the integer part does not fit, returns an empty pointer.
-	FixedPointType const* fixedPointType() const;
-
-	/// @returns true if the value is not an integer.
-	bool isFractional() const { return m_value.denominator() != 1; }
-
-	/// @returns true if the value is negative.
-	bool isNegative() const { return m_value < 0; }
-
-	/// @returns true if the value is zero.
-	bool isZero() const { return m_value == 0; }
-
-	/// @returns true if the literal is a valid integer.
-	static std::tuple<bool, rational> isValidLiteral(Literal const& _literal);
-
-private:
-	rational m_value;
-
-	/// Bytes type to which the rational can be implicitly converted.
-	/// Empty for all rationals that are not directly parsed from hex literals.
-	Type const* m_compatibleBytesType;
-
-	/// @returns true if the literal is a valid rational number.
-	static std::tuple<bool, rational> parseRational(std::string const& _value);
-
-	/// @returns a truncated readable representation of the bigint keeping only
-	/// up to 4 leading and 4 trailing digits.
-	static std::string bigintToReadableString(bigint const& num);
-};
-
-/**
- * Literal string, can be converted to bytes, bytesX or string.
- */
-class StringLiteralType: public Type
-{
-public:
-	explicit StringLiteralType(Literal const& _literal);
-	explicit StringLiteralType(std::string _value);
-
-	Category category() const override { return Category::StringLiteral; }
-
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult binaryOperatorResult(Token, Type const*) const override
-	{
-		return nullptr;
-	}
-
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-
-	bool canBeStored() const override { return false; }
-
-	std::string toString(bool) const override;
-	Type const* mobileType() const override;
-
-	std::string const& value() const { return m_value; }
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
-private:
-	std::string m_value;
-};
-
-/**
- * Bytes type with fixed length of up to 32 bytes.
- */
-class FixedBytesType: public Type
-{
-public:
-	explicit FixedBytesType(unsigned _bytes);
-
-	Category category() const override { return Category::FixedBytes; }
-
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token _operator, Type const* _other) const override;
-
-	unsigned calldataEncodedSize(bool _padded) const override { return _padded && m_bytes > 0 ? 32 : m_bytes; }
-	unsigned storageBytes() const override { return m_bytes; }
-	bool leftAligned() const override { return true; }
-	bool isValueType() const override { return true; }
-	bool nameable() const override { return true; }
-
-	std::string toString(bool) const override { return "bytes" + util::toString(m_bytes); }
-	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
-	Type const* encodingType() const override { return this; }
-	TypeResult interfaceType(bool) const override { return this; }
-
-	unsigned numBytes() const { return m_bytes; }
-
-private:
-	unsigned m_bytes;
-};
-
-/**
- * The boolean type.
- */
-class BoolType: public Type
-{
-public:
-	Category category() const override { return Category::Bool; }
-	std::string richIdentifier() const override { return "t_bool"; }
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token _operator, Type const* _other) const override;
-
-	unsigned calldataEncodedSize(bool _padded) const override{ return _padded ? 32 : 1; }
-	unsigned storageBytes() const override { return 1; }
-	bool leftAligned() const override { return false; }
-	bool isValueType() const override { return true; }
-	bool nameable() const override { return true; }
-
-	std::string toString(bool) const override { return "bool"; }
-	u256 literalValue(Literal const* _literal) const override;
-	Type const* encodingType() const override { return this; }
-	TypeResult interfaceType(bool) const override { return this; }
-};
-
-/**
- * Base class for types which can be thought of as several elements of other types put together.
- * For example a struct is composed of its members, an array is composed of multiple copies of its
- * base element and a mapping is composed of its value type elements (note that keys are not
- * stored anywhere).
- */
-class CompositeType: public Type
-{
-protected:
-	CompositeType() = default;
-
-public:
-	/// @returns a list containing the type itself, elements of its decomposition,
-	/// elements of decomposition of these elements and so on, up to non-composite types.
-	/// Each type is included only once.
-	std::vector<Type const*> fullDecomposition() const;
-
-protected:
-	/// @returns a list of types that together make up the data part of this type.
-	/// Contains all types that will have to be implicitly stored, whenever an object of this type is stored.
-	/// In particular, it returns the base type for arrays and array slices, the member types for structs,
-	/// the component types for tuples and the value type for mappings
-	/// (note that the key type of a mapping is *not* part of the list).
-	virtual std::vector<Type const*> decomposition() const = 0;
-};
-
-/**
- * Base class used by types which are not value types and can be stored either in storage, memory
- * or calldata. This is currently used by arrays and structs.
- */
-class ReferenceType: public CompositeType
-{
-protected:
-	explicit ReferenceType(DataLocation _location): m_location(_location) {}
-
-public:
-	DataLocation location() const { return m_location; }
-
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token, Type const*) const override
-	{
-		return nullptr;
-	}
-	unsigned memoryHeadSize() const override { return 32; }
-	u256 memoryDataSize() const override = 0;
-
-	unsigned calldataEncodedSize(bool) const override = 0;
-	unsigned calldataEncodedTailSize() const override = 0;
-
-	/// @returns a copy of this type with location (recursively) changed to @a _location,
-	/// whereas isPointer is only shallowly changed - the deep copy is always a bound reference.
-	virtual std::unique_ptr<ReferenceType> copyForLocation(DataLocation _location, bool _isPointer) const = 0;
-
-	Type const* mobileType() const override { return withLocation(m_location, true); }
-	bool dataStoredIn(DataLocation _location) const override { return m_location == _location; }
-	bool hasSimpleZeroValueInMemory() const override { return false; }
-
-	/// Storage references can be pointers or bound references. In general, local variables are of
-	/// pointer type, state variables are bound references. Assignments to pointers or deleting
-	/// them will not modify storage (that will only change the pointer). Assignment from
-	/// non-storage objects to a variable of storage pointer type is not possible.
-	/// For anything other than storage, this always returns true because assignments
-	/// never change the contents of the original value.
-	bool isPointer() const;
-
-	/// @returns true if this is valid to be stored in data location _loc
-	/// The function mostly checks sizes. For calldata, this should only be called
-	/// if the type has an interfaceType.
-	virtual BoolResult validForLocation(DataLocation _loc) const = 0;
-
-	bool equals(ReferenceType const& _other) const
-	{
-		return location() == _other.location() && isPointer() == _other.isPointer();
-	}
-
-	Type const* withLocation(DataLocation _location, bool _isPointer) const;
-
-protected:
-	Type const* copyForLocationIfReference(Type const* _type) const;
-	/// @returns a human-readable description of the reference part of the type.
-	std::string stringForReferencePart() const;
-	/// @returns the suffix computed from the reference part to be used by identifier();
-	std::string identifierLocationSuffix() const;
-
-	DataLocation m_location = DataLocation::Storage;
-	bool m_isPointer = true;
-};
-
-/**
- * The type of an array. The flavours are byte array (bytes), statically- (<type>[<length>])
- * and dynamically-sized array (<type>[]).
- * In storage, all arrays are packed tightly (as long as more than one elementary type fits in
- * one slot). Dynamically sized arrays (including byte arrays) start with their size as a uint and
- * thus start on their own slot.
- */
-class ArrayType: public ReferenceType
-{
-public:
-	/// Constructor for a byte array ("bytes") and string.
-	explicit ArrayType(DataLocation _location, bool _isString = false);
-
-	/// Constructor for a dynamically sized array type ("<type>[]")
-	ArrayType(DataLocation _location, Type const* _baseType):
-		ReferenceType(_location),
-		m_baseType(copyForLocationIfReference(_baseType))
-	{
-	}
-
-	/// Constructor for a fixed-size array type ("<type>[<length>]")
-	ArrayType(DataLocation _location, Type const* _baseType, u256 _length):
-		ReferenceType(_location),
-		m_baseType(copyForLocationIfReference(_baseType)),
-		m_hasDynamicLength(false),
-		m_length(std::move(_length))
-	{}
-
-	Category category() const override { return Category::Array; }
-
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	unsigned calldataEncodedSize(bool) const override;
-	unsigned calldataEncodedTailSize() const override;
-	bool isDynamicallySized() const override { return m_hasDynamicLength; }
-	bool isDynamicallyEncoded() const override;
-	bigint storageSizeUpperBound() const override;
-	u256 storageSize() const override;
-	bool containsNestedMapping() const override { return m_baseType->containsNestedMapping(); }
-	bool nameable() const override { return true; }
-
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string humanReadableName() const override;
-	std::string canonicalName() const override;
-	std::string signatureInExternalFunction(bool _structsByName) const override;
-	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
-	Type const* encodingType() const override;
-	Type const* decodingType() const override;
-	TypeResult interfaceType(bool _inLibrary) const override;
-
-	BoolResult validForLocation(DataLocation _loc) const override;
-
-	/// @returns true if this is a byte array.
-	bool isByteArray() const { return m_arrayKind == ArrayKind::Bytes; }
-	/// @returns true if this is a byte array or a string
-	bool isByteArrayOrString() const { return m_arrayKind != ArrayKind::Ordinary; }
-	/// @returns true if this is a string
-	bool isString() const { return m_arrayKind == ArrayKind::String; }
-	Type const* baseType() const { solAssert(!!m_baseType, ""); return m_baseType; }
-	Type const* finalBaseType(bool breakIfDynamicArrayType) const;
-	u256 const& length() const { return m_length; }
-	u256 memoryDataSize() const override;
-
-	std::unique_ptr<ReferenceType> copyForLocation(DataLocation _location, bool _isPointer) const override;
-
-	/// The offset to advance in calldata to move from one array element to the next.
-	unsigned calldataStride() const { return isByteArrayOrString() ? 1 : m_baseType->calldataHeadSize(); }
-	/// The offset to advance in memory to move from one array element to the next.
-	unsigned memoryStride() const { return isByteArrayOrString() ? 1 : m_baseType->memoryHeadSize(); }
-	/// The offset to advance in storage to move from one array element to the next.
-	unsigned storageStride() const { return isByteArrayOrString() ? 1 : m_baseType->storageBytes(); }
-
-	void clearCache() const override;
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-	std::vector<Type const*> decomposition() const override { return {m_baseType}; }
-
-private:
-	enum class ArrayKind { Ordinary, Bytes, String };
-
-	bigint unlimitedStaticCalldataSize(bool _padded) const;
-
-	///< Byte arrays ("bytes") and strings have different semantics from ordinary arrays.
-	ArrayKind m_arrayKind = ArrayKind::Ordinary;
-	Type const* m_baseType;
-	bool m_hasDynamicLength = true;
-	u256 m_length;
-	mutable std::optional<TypeResult> m_interfaceType;
-	mutable std::optional<TypeResult> m_interfaceType_library;
-};
-
-class ArraySliceType: public ReferenceType
-{
-public:
-	explicit ArraySliceType(ArrayType const& _arrayType): ReferenceType(_arrayType.location()), m_arrayType(_arrayType) {}
-	Category category() const override { return Category::ArraySlice; }
-
-	BoolResult isImplicitlyConvertibleTo(Type const& _other) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	unsigned calldataEncodedSize(bool) const override { solAssert(false, ""); }
-	unsigned calldataEncodedTailSize() const override { return 32; }
-	bool isDynamicallySized() const override { return true; }
-	bool isDynamicallyEncoded() const override { return true; }
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string humanReadableName() const override;
-	Type const* mobileType() const override;
-
-	BoolResult validForLocation(DataLocation _loc) const override { return m_arrayType.validForLocation(_loc); }
-
-	ArrayType const& arrayType() const { return m_arrayType; }
-	u256 memoryDataSize() const override { solAssert(false, ""); }
-
-	std::unique_ptr<ReferenceType> copyForLocation(DataLocation, bool) const override { solAssert(false, ""); }
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-	std::vector<Type const*> decomposition() const override { return {m_arrayType.baseType()}; }
-
-private:
-	ArrayType const& m_arrayType;
-};
-
-/**
- * The type of a contract instance or library, there is one distinct type for each contract definition.
- */
-class ContractType: public Type
-{
-public:
-	explicit ContractType(ContractDefinition const& _contract, bool _super = false):
-		m_contract(_contract), m_super(_super) {}
-
-	Category category() const override { return Category::Contract; }
-	/// Contracts can be implicitly converted only to base contracts.
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	/// Contracts can only be explicitly converted to address types and base contracts.
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	unsigned calldataEncodedSize(bool _padded ) const override
-	{
-		solAssert(!isSuper(), "");
-		return encodingType()->calldataEncodedSize(_padded);
-	}
-	unsigned storageBytes() const override { solAssert(!isSuper(), ""); return 20; }
-	bool leftAligned() const override { solAssert(!isSuper(), ""); return false; }
-	bool isValueType() const override { return !isSuper(); }
-	bool nameable() const override { return !isSuper(); }
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string canonicalName() const override;
-
-	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
-
-	Type const* encodingType() const override;
-
-	TypeResult interfaceType(bool _inLibrary) const override
-	{
-		if (isSuper())
-			return nullptr;
-		return _inLibrary ? this : encodingType();
-	}
-
-	/// See documentation of m_super
-	bool isSuper() const { return m_super; }
-
-	// @returns true if and only if the contract has a receive ether function or a payable fallback function, i.e.
-	// if it has code that will be executed on plain ether transfers
-	bool isPayable() const;
-
-	ContractDefinition const& contractDefinition() const { return m_contract; }
-
-	/// Returns the function type of the constructor modified to return an object of the contract's type.
-	FunctionType const* newExpressionType() const;
-
-	/// @returns a list of all state variables (including inherited) of the contract and their
-	/// offsets in storage.
-	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> stateVariables() const;
-	/// @returns a list of all immutable variables (including inherited) of the contract.
-	std::vector<VariableDeclaration const*> immutableVariables() const;
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-private:
-	ContractDefinition const& m_contract;
-	/// If true, this is a special "super" type of m_contract containing only members that m_contract inherited
-	bool m_super = false;
-	/// Type of the constructor, @see constructorType. Lazily initialized.
-	mutable FunctionType const* m_constructorType = nullptr;
-};
-
-/**
- * The type of a struct instance, there is one distinct type per struct definition.
- */
-class StructType: public ReferenceType
-{
-public:
-	explicit StructType(StructDefinition const& _struct, DataLocation _location = DataLocation::Storage):
-		ReferenceType(_location), m_struct(_struct) {}
-
-	Category category() const override { return Category::Struct; }
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	unsigned calldataEncodedSize(bool) const override;
-	unsigned calldataEncodedTailSize() const override;
-	bool isDynamicallyEncoded() const override;
-	u256 memoryDataSize() const override;
-	bigint storageSizeUpperBound() const override;
-	u256 storageSize() const override;
-	bool containsNestedMapping() const override;
-	bool nameable() const override { return true; }
-	std::string toString(bool _withoutDataLocation) const override;
-
-	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
-
-	Type const* encodingType() const override;
-	TypeResult interfaceType(bool _inLibrary) const override;
-
-	Declaration const* typeDefinition() const override;
-
-	BoolResult validForLocation(DataLocation _loc) const override;
-
-	bool recursive() const;
-
-	std::unique_ptr<ReferenceType> copyForLocation(DataLocation _location, bool _isPointer) const override;
-
-	std::string canonicalName() const override;
-	std::string signatureInExternalFunction(bool _structsByName) const override;
-
-	/// @returns a function that performs the type conversion between a list of struct members
-	/// and a memory struct of this type.
-	FunctionType const* constructorType() const;
-
-	std::pair<u256, unsigned> const& storageOffsetsOfMember(std::string const& _name) const;
-	u256 memoryOffsetOfMember(std::string const& _name) const;
-	unsigned calldataOffsetOfMember(std::string const& _name) const;
-
-	StructDefinition const& structDefinition() const { return m_struct; }
-
-	/// @returns the vector of types of members available in memory.
-	TypePointers memoryMemberTypes() const;
-
-	void clearCache() const override;
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-	std::vector<Type const*> decomposition() const override;
-
-private:
-	StructDefinition const& m_struct;
-	// Caches for interfaceType(bool)
-	mutable std::optional<TypeResult> m_interfaceType;
-	mutable std::optional<TypeResult> m_interfaceType_library;
-};
-
-/**
- * The type of an enum instance, there is one distinct type per enum definition.
- */
-class EnumType: public Type
-{
-public:
-	explicit EnumType(EnumDefinition const& _enum): m_enum(_enum) {}
-
-	Category category() const override { return Category::Enum; }
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	unsigned calldataEncodedSize(bool _padded) const override
-	{
-		return encodingType()->calldataEncodedSize(_padded);
-	}
-	unsigned storageBytes() const override;
-	bool leftAligned() const override { return false; }
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string canonicalName() const override;
-	bool isValueType() const override { return true; }
-	bool nameable() const override { return true; }
-
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	Type const* encodingType() const override;
-	TypeResult interfaceType(bool _inLibrary) const override
-	{
-		return _inLibrary ? this : encodingType();
-	}
-
-	Declaration const* typeDefinition() const override;
-
-	EnumDefinition const& enumDefinition() const { return m_enum; }
-	/// @returns the value that the string has in the Enum
-	unsigned int memberValue(ASTString const& _member) const;
-	size_t numberOfMembers() const;
-	unsigned int minValue() const { return 0; }
-	unsigned int maxValue() const
-	{
-		solAssert(numberOfMembers() <= 256, "");
-		return static_cast<unsigned int>(numberOfMembers()) - 1;
-	}
-
-private:
-	EnumDefinition const& m_enum;
-};
-
-/**
- * The type of a UserDefinedValueType.
- */
-class UserDefinedValueType: public Type
-{
-public:
-	explicit UserDefinedValueType(UserDefinedValueTypeDefinition const& _definition):
-		m_definition(_definition)
-	{}
-
-	Category category() const override { return Category::UserDefinedValueType; }
-	Type const& underlyingType() const;
-	UserDefinedValueTypeDefinition const& definition() const { return m_definition; }
-
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	Type const* encodingType() const override { return &underlyingType(); }
-	TypeResult interfaceType(bool /* _inLibrary */) const override {return &underlyingType(); }
-
-	Declaration const* typeDefinition() const override;
-
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-
-	unsigned calldataEncodedSize(bool _padded) const override { return underlyingType().calldataEncodedSize(_padded); }
-
-	bool leftAligned() const override { return underlyingType().leftAligned(); }
-	bool canBeStored() const override { return underlyingType().canBeStored(); }
-	u256 storageSize() const override { return underlyingType().storageSize(); }
-	unsigned storageBytes() const override { return underlyingType().storageBytes(); }
-
-	bool isValueType() const override { return true; }
-	bool nameable() const override
-	{
-		solAssert(underlyingType().nameable(), "");
-		return true;
-	}
-
-	bool containsNestedMapping() const override
-	{
-		solAssert(nameable(), "Called for a non nameable type.");
-		// DeclarationTypeChecker::endVisit(VariableDeclaration const&)
-		// assumes that this will never be true.
-		solAssert(!underlyingType().containsNestedMapping(), "");
-		return false;
-	}
-
-	bool hasSimpleZeroValueInMemory() const override
-	{
-		solAssert(underlyingType().hasSimpleZeroValueInMemory(), "");
-		return true;
-	}
-
-	bool dataStoredIn(DataLocation _loc) const override
-	{
-		solAssert(!underlyingType().dataStoredIn(_loc), "");
-		return false;
-	}
-
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string canonicalName() const override;
-	std::string signatureInExternalFunction(bool) const override { solAssert(false, ""); }
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-
-private:
-	UserDefinedValueTypeDefinition const& m_definition;
-};
-
-/**
- * Type that can hold a finite sequence of values of different types.
- * In some cases, the components are empty pointers (when used as placeholders).
- */
-class TupleType: public CompositeType
-{
-public:
-	explicit TupleType(std::vector<Type const*> _types = {}): m_components(std::move(_types)) {}
-
-	Category category() const override { return Category::Tuple; }
-
-	BoolResult isImplicitlyConvertibleTo(Type const& _other) const override;
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string humanReadableName() const override;
-	bool canBeStored() const override { return false; }
-	u256 storageSize() const override;
-	bool hasSimpleZeroValueInMemory() const override { return false; }
-	Type const* mobileType() const override;
-
-	std::vector<Type const*> const& components() const { return m_components; }
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-	std::vector<Type const*> decomposition() const override
-	{
-		// Currently calling TupleType::decomposition() is not expected, because we cannot declare a variable of a tuple type.
-		// If that changes, before removing the solAssert, make sure the function does the right thing and is used properly.
-		// Note that different tuple members can have different data locations, so using decomposition() to check
-		// the tuple validity for a data location might require special care.
-		solUnimplemented("Tuple decomposition is not expected.");
-		return m_components;
-	}
-
-private:
-	std::vector<Type const*> const m_components;
-};
-
-/**
- * The type of a function, identified by its (return) parameter types.
- * @todo the return parameters should also have names, i.e. return parameters should be a struct
- * type.
- */
-class FunctionType: public Type
-{
-public:
-	/// How this function is invoked on the EVM.
-	enum class Kind
-	{
-		Internal, ///< stack-call using plain JUMP
-		External, ///< external call using CALL
-		DelegateCall, ///< external call using DELEGATECALL, i.e. not exchanging the storage
-		BareCall, ///< CALL without function hash
-		BareCallCode, ///< CALLCODE without function hash
-		BareDelegateCall, ///< DELEGATECALL without function hash
-		BareStaticCall, ///< STATICCALL without function hash
-		Creation, ///< external call using CREATE
-		Send, ///< CALL, but without data and gas
-		Transfer, ///< CALL, but without data and throws on error
-		KECCAK256, ///< KECCAK256
-		Selfdestruct, ///< SELFDESTRUCT
-		Revert, ///< REVERT
-		ECRecover, ///< CALL to special contract for ecrecover
-		SHA256, ///< CALL to special contract for sha256
-		RIPEMD160, ///< CALL to special contract for ripemd160
-		Event, ///< syntactic sugar for LOG*
-		Error, ///< creating an error instance in revert or require
-		Wrap, ///< customType.wrap(...) for user defined value types
-		Unwrap, ///< customType.unwrap(...) for user defined value types
-		SetGas, ///< modify the default gas value for the function call
-		SetValue, ///< modify the default value transfer for the function call
-		BlockHash, ///< BLOCKHASH
-		AddMod, ///< ADDMOD
-		MulMod, ///< MULMOD
-		ArrayPush, ///< .push() to a dynamically sized array in storage
-		ArrayPop, ///< .pop() from a dynamically sized array in storage
-		BytesConcat, ///< .concat() on bytes (type type)
-		StringConcat, ///< .concat() on string (type type)
-		ObjectCreation, ///< array creation using new
-		Assert, ///< assert()
-		Require, ///< require()
-		ABIEncode,
-		ABIEncodePacked,
-		ABIEncodeWithSelector,
-		ABIEncodeCall,
-		ABIEncodeWithSignature,
-		ABIDecode,
-		GasLeft, ///< gasleft()
-		MetaType, ///< type(...)
-		/// Refers to a function declaration without calling context
-		/// (i.e. when accessed directly via the name of the containing contract).
-		/// Cannot be called.
-		Declaration,
-	};
-	struct Options
-	{
-		/// true iff the function takes an arbitrary number of arguments of arbitrary types
-		bool arbitraryParameters = false;
-		/// true iff the gas value to be used is on the stack
-		bool gasSet = false;
-		/// true iff the value to be sent is on the stack
-		bool valueSet = false;
-		/// iff the salt value (for create2) to be used is on the stack
-		bool saltSet = false;
-		/// true iff the function is called as arg1.fun(arg2, ..., argn).
-		/// This is achieved through the "using for" directive.
-		bool hasBoundFirstArgument = false;
-
-		static Options withArbitraryParameters()
-		{
-			Options result;
-			result.arbitraryParameters = true;
-			return result;
-		}
-		static Options fromFunctionType(FunctionType const& _type)
-		{
-			Options result;
-			result.arbitraryParameters = _type.takesArbitraryParameters();
-			result.gasSet = _type.gasSet();
-			result.valueSet = _type.valueSet();
-			result.saltSet = _type.saltSet();
-			result.hasBoundFirstArgument = _type.hasBoundFirstArgument();
-			return result;
-		}
-	};
-
-
-	/// Creates the type of a function.
-	/// @arg _kind must be Kind::Internal, Kind::External or Kind::Declaration.
-	explicit FunctionType(FunctionDefinition const& _function, Kind _kind = Kind::Declaration);
-	/// Creates the accessor function type of a state variable.
-	explicit FunctionType(VariableDeclaration const& _varDecl);
-	/// Creates the function type of an event.
-	explicit FunctionType(EventDefinition const& _event);
-	explicit FunctionType(ErrorDefinition const& _error);
-	/// Creates the type of a function type name.
-	explicit FunctionType(FunctionTypeName const& _typeName);
-	/// Function type constructor to be used for a plain type (not derived from a declaration).
-	FunctionType(
-		strings const& _parameterTypes,
-		strings const& _returnParameterTypes,
-		Kind _kind,
-		StateMutability _stateMutability = StateMutability::NonPayable,
-		Options _options = Options{false, false, false, false, false}
-	): FunctionType(
-		parseElementaryTypeVector(_parameterTypes),
-		parseElementaryTypeVector(_returnParameterTypes),
-		strings(_parameterTypes.size(), ""),
-		strings(_returnParameterTypes.size(), ""),
-		_kind,
-		_stateMutability,
-		nullptr,
-		std::move(_options)
-	)
-	{
-		// In this constructor, only the "arbitrary Parameters" option should be used.
-		solAssert(!hasBoundFirstArgument() && !gasSet() && !valueSet() && !saltSet());
-	}
-
-	/// Detailed constructor, use with care.
-	FunctionType(
-		TypePointers _parameterTypes,
-		TypePointers _returnParameterTypes,
-		strings _parameterNames = strings(),
-		strings _returnParameterNames = strings(),
-		Kind _kind = Kind::Internal,
-		StateMutability _stateMutability = StateMutability::NonPayable,
-		Declaration const* _declaration = nullptr,
-		Options _options = Options{false, false, false, false, false}
-	):
-		m_parameterTypes(std::move(_parameterTypes)),
-		m_returnParameterTypes(std::move(_returnParameterTypes)),
-		m_parameterNames(std::move(_parameterNames)),
-		m_returnParameterNames(std::move(_returnParameterNames)),
-		m_kind(_kind),
-		m_stateMutability(_stateMutability),
-		m_declaration(_declaration),
-		m_options(std::move(_options))
-	{
-		solAssert(
-			m_parameterNames.size() == m_parameterTypes.size(),
-			"Parameter names list must match parameter types list!"
-		);
-		solAssert(
-			m_returnParameterNames.size() == m_returnParameterTypes.size(),
-			"Return parameter names list must match return parameter types list!"
-		);
-		solAssert(
-			!hasBoundFirstArgument() || !m_parameterTypes.empty(),
-			"Attempted construction of attached function without self type"
-		);
-	}
-
-	Category category() const override { return Category::Function; }
-
-	/// @returns the type of the "new Contract" function, i.e. basically the constructor.
-	static FunctionTypePointer newExpressionType(ContractDefinition const& _contract);
-
-	TypePointers parameterTypes() const;
-	TypePointers const& parameterTypesIncludingSelf() const;
-	std::vector<std::string> parameterNames() const;
-	TypePointers const& returnParameterTypes() const { return m_returnParameterTypes; }
-	/// @returns the list of return parameter types. All dynamically-sized types (this excludes
-	/// storage pointers) are replaced by InaccessibleDynamicType instances.
-	TypePointers returnParameterTypesWithoutDynamicTypes() const;
-	std::vector<std::string> const& returnParameterNames() const { return m_returnParameterNames; }
-	/// @returns the "self" parameter type for an attached function
-	Type const* selfType() const;
-
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	BoolResult isImplicitlyConvertibleTo(Type const& _convertTo) const override;
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-	TypeResult unaryOperatorResult(Token _operator) const override;
-	TypeResult binaryOperatorResult(Token, Type const*) const override;
-	std::string canonicalName() const override;
-	std::string humanReadableName() const override;
-	std::string toString(bool _withoutDataLocation) const override;
-	unsigned calldataEncodedSize(bool _padded) const override;
-	bool canBeStored() const override { return m_kind == Kind::Internal || m_kind == Kind::External; }
-	u256 storageSize() const override;
-	bool leftAligned() const override;
-	unsigned storageBytes() const override;
-	bool isValueType() const override { return true; }
-	bool nameable() const override;
-	bool hasSimpleZeroValueInMemory() const override { return false; }
-	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
-	Type const* encodingType() const override;
-	TypeResult interfaceType(bool _inLibrary) const override;
-	Type const* mobileType() const override;
-
-	/// @returns Type const* of a new FunctionType object. All input/return parameters are an
-	/// appropriate external types (i.e. the interfaceType()s) of input/return parameters of
-	/// current function.
-	/// @returns an empty shared pointer if one of the input/return parameters does not have an
-	/// external type.
-	FunctionTypePointer interfaceFunctionType() const;
-
-	/// @returns true if this function can take the given arguments (possibly
-	/// after implicit conversion).
-	/// @param _selfType if the function is attached as a member function, this has to be supplied
-	/// and is the type of the expression the function is called on.
-	bool canTakeArguments(
-		FuncCallArguments const& _arguments,
-		Type const* _selfType = nullptr
-	) const;
-
-	/// @returns true if the types of parameters are equal (does not check return parameter types)
-	bool hasEqualParameterTypes(FunctionType const& _other) const;
-	/// @returns true iff the return types are equal (does not check parameter types)
-	bool hasEqualReturnTypes(FunctionType const& _other) const;
-	/// @returns true iff the function type is equal to the given type, ignoring state mutability differences.
-	bool equalExcludingStateMutability(FunctionType const& _other) const;
-
-	/// @returns true if the ABI is NOT used for this call (only meaningful for external calls)
-	bool isBareCall() const;
-	Kind const& kind() const { return m_kind; }
-	StateMutability stateMutability() const { return m_stateMutability; }
-	/// @returns the external signature of this function type given the function name
-	std::string externalSignature() const;
-	/// @returns the external identifier of this function (the hash of the signature).
-	u256 externalIdentifier() const;
-	/// @returns the external identifier of this function (the hash of the signature) as a hex string.
-	std::string externalIdentifierHex() const;
-	Declaration const& declaration() const
-	{
-		solAssert(m_declaration, "Requested declaration from a FunctionType that has none");
-		return *m_declaration;
-	}
-	bool hasDeclaration() const { return !!m_declaration; }
-	/// @returns true if the result of this function only depends on its arguments,
-	/// does not modify the state and is a compile-time constant.
-	/// Currently, this will only return true for internal functions like keccak and ecrecover.
-	bool isPure() const;
-	bool isPayable() const { return m_stateMutability == StateMutability::Payable; }
-	/// @return A shared pointer of StructuredDocumentation.
-	/// Can contain a nullptr in which case indicates absence of documentation.
-	ASTPointer<StructuredDocumentation> documentation() const;
-
-	/// true iff arguments are to be padded to multiples of 32 bytes for external calls
-	/// The only functions that do not pad are hash functions, the low-level call functions
-	/// and abi.encodePacked.
-	bool padArguments() const;
-	bool takesArbitraryParameters() const { return m_options.arbitraryParameters; }
-	/// true iff the function takes a single bytes parameter and it is passed on without padding.
-	bool takesSinglePackedBytesParameter() const
-	{
-		switch (m_kind)
-		{
-		case FunctionType::Kind::KECCAK256:
-		case FunctionType::Kind::SHA256:
-		case FunctionType::Kind::RIPEMD160:
-		case FunctionType::Kind::BareCall:
-		case FunctionType::Kind::BareCallCode:
-		case FunctionType::Kind::BareDelegateCall:
-		case FunctionType::Kind::BareStaticCall:
-			return true;
-		default:
-			return false;
-		}
-	}
-
-	bool gasSet() const { return m_options.gasSet; }
-	bool valueSet() const { return m_options.valueSet; }
-	bool saltSet() const { return m_options.saltSet; }
-	bool hasBoundFirstArgument() const { return m_options.hasBoundFirstArgument; }
-
-	/// @returns a copy of this type, where gas or value are set manually. This will never set one
-	/// of the parameters to false.
-	Type const* copyAndSetCallOptions(bool _setGas, bool _setValue, bool _setSalt) const;
-
-	/// @returns a copy of this function type with the `hasBoundFirstArgument` flag set to true.
-	/// Should only be called on library functions.
-	FunctionTypePointer withBoundFirstArgument() const;
-
-	/// @returns a copy of this function type where the location of reference types is changed
-	/// from CallData to Memory. This is the type that would be used when the function is
-	/// called externally, as opposed to the parameter types that are available inside the function body.
-	/// Also supports variants to be used for library or attached function calls.
-	/// @param _inLibrary if true, uses DelegateCall as location.
-	FunctionTypePointer asExternallyCallableFunction(bool _inLibrary) const;
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-private:
-	static TypePointers parseElementaryTypeVector(strings const& _types);
-
-	TypePointers m_parameterTypes;
-	TypePointers m_returnParameterTypes;
-	std::vector<std::string> m_parameterNames;
-	std::vector<std::string> m_returnParameterNames;
-	Kind const m_kind;
-	StateMutability m_stateMutability = StateMutability::NonPayable;
-	Declaration const* m_declaration = nullptr;
-	Options const m_options;
-};
-
-/**
- * The type of a mapping, there is one distinct type per key/value type pair.
- * Mappings always occupy their own storage slot, but do not actually use it.
- */
-class MappingType: public CompositeType
-{
-public:
-	MappingType(Type const* _keyType, ASTString _keyName, Type const* _valueType, ASTString _valueName):
-		m_keyType(_keyType), m_keyName(_keyName), m_valueType(_valueType), m_valueName(_valueName) {}
-
-	Category category() const override { return Category::Mapping; }
-
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	std::string toString(bool _withoutDataLocation) const override;
-	std::string canonicalName() const override;
-	bool containsNestedMapping() const override { return true; }
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	Type const* encodingType() const override;
-	TypeResult interfaceType(bool _inLibrary) const override;
-	bool dataStoredIn(DataLocation _location) const override { return _location == DataLocation::Storage; }
-	/// Cannot be stored in memory, but just in case.
-	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	bool nameable() const override { return true; }
-
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-
-	Type const* keyType() const { return m_keyType; }
-	ASTString keyName() const { return m_keyName; }
-	Type const* valueType() const { return m_valueType; }
-	ASTString valueName() const { return m_valueName; }
-
-protected:
-	std::vector<Type const*> decomposition() const override { return {m_valueType}; }
-
-private:
-	Type const* m_keyType;
-	ASTString m_keyName;
-	Type const* m_valueType;
-	ASTString m_valueName;
-};
-
-/**
- * The type of a type reference. The type of "uint32" when used in "a = uint32(2)" is an example
- * of a TypeType.
- * For super contracts or libraries, this has members directly.
- */
-class TypeType: public Type
-{
-public:
-	explicit TypeType(Type const* _actualType): m_actualType(_actualType) {}
-
-	Category category() const override { return Category::TypeType; }
-	Type const* actualType() const { return m_actualType; }
-
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	bool canBeStored() const override { return false; }
-	u256 storageSize() const override;
-	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	std::string toString(bool _withoutDataLocation) const override { return "type(" + m_actualType->toString(_withoutDataLocation) + ")"; }
-	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
-	Type const* mobileType() const override { return nullptr; }
-
-	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
-private:
-	Type const* m_actualType;
-};
-
-
-/**
- * The type of a function modifier. Not used for anything for now.
- */
-class ModifierType: public Type
-{
-public:
-	explicit ModifierType(ModifierDefinition const& _modifier);
-
-	Category category() const override { return Category::Modifier; }
-
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	bool canBeStored() const override { return false; }
-	u256 storageSize() const override;
-	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	std::string toString(bool _withoutDataLocation) const override;
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
-private:
-	TypePointers m_parameterTypes;
-};
-
-
-
-/**
- * Special type for imported modules. These mainly give access to their scope via members.
- */
-class ModuleType: public Type
-{
-public:
-	explicit ModuleType(SourceUnit const& _source): m_sourceUnit(_source) {}
-
-	Category category() const override { return Category::Module; }
-
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	bool canBeStored() const override { return false; }
-	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
-
-	std::string toString(bool _withoutDataLocation) const override;
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
-private:
-	SourceUnit const& m_sourceUnit;
-};
-
-/**
- * Special type for magic variables (block, msg, tx, type(...)), similar to a struct but without any reference.
- */
-class MagicType: public Type
-{
-public:
-	enum class Kind {
-		Block, ///< "block"
-		Message, ///< "msg"
-		Transaction, ///< "tx"
-		ABI, ///< "abi"
-		MetaType ///< "type(...)"
-	};
-
-public:
-	explicit MagicType(Kind _kind): m_kind(_kind) {}
-	explicit MagicType(Type const* _metaTypeArg): m_kind{Kind::MetaType}, m_typeArgument{_metaTypeArg} {}
-
-	Category category() const override { return Category::Magic; }
-
-	TypeResult binaryOperatorResult(Token, Type const*) const override
-	{
-		return nullptr;
-	}
-
-	std::string richIdentifier() const override;
-	bool operator==(Type const& _other) const override;
-	bool canBeStored() const override { return false; }
-	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
-
-	std::string toString(bool _withoutDataLocation) const override;
-
-	Kind kind() const { return m_kind; }
-
-	Type const* typeArgument() const;
-
-	Type const* mobileType() const override { return nullptr; }
-
-protected:
-	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
-private:
-	Kind m_kind;
-	/// Contract type used for contract metadata magic.
-	Type const* m_typeArgument;
-};
-
-/**
- * Special type that is used for dynamic types in returns from external function calls
- * (The EVM currently cannot access dynamically-sized return values).
- */
-class InaccessibleDynamicType: public Type
-{
-public:
-	Category category() const override { return Category::InaccessibleDynamic; }
-
-	std::string richIdentifier() const override { return "t_inaccessible"; }
-	BoolResult isImplicitlyConvertibleTo(Type const&) const override { return false; }
-	BoolResult isExplicitlyConvertibleTo(Type const&) const override { return false; }
-	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	unsigned calldataEncodedSize(bool) const override { return 32; }
-	bool canBeStored() const override { return false; }
-	bool isValueType() const override { return true; }
-	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	std::string toString(bool) const override { return "inaccessible dynamic type"; }
-	Type const* decodingType() const override;
-};
-
-}
diff --git a/libsolidity/ast/UserDefinableOperators.h b/libsolidity/ast/UserDefinableOperators.h
deleted file mode 100644
index 5b98524f503f..000000000000
--- a/libsolidity/ast/UserDefinableOperators.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <liblangutil/Token.h>
-
-#include <vector>
-
-namespace solidity::frontend
-{
-
-std::vector<langutil::Token> const userDefinableOperators = {
-	// Bitwise
-	langutil::Token::BitOr,
-	langutil::Token::BitAnd,
-	langutil::Token::BitXor,
-	langutil::Token::BitNot,
-	// Arithmetic
-	langutil::Token::Add,
-	langutil::Token::Sub,
-	langutil::Token::Mul,
-	langutil::Token::Div,
-	langutil::Token::Mod,
-	// Comparison
-	langutil::Token::Equal,
-	langutil::Token::NotEqual,
-	langutil::Token::LessThan,
-	langutil::Token::GreaterThan,
-	langutil::Token::LessThanOrEqual,
-	langutil::Token::GreaterThanOrEqual,
-};
-
-}
diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
deleted file mode 100644
index bbcdb395b369..000000000000
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ /dev/null
@@ -1,1561 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <chris@ethereum.org>
- * @date 2017
- * Routines that generate Yul code related to ABI encoding, decoding and type conversions.
- */
-
-#include <libsolidity/codegen/ABIFunctions.h>
-
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string/join.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-
-std::string ABIFunctions::tupleEncoder(
-	TypePointers const& _givenTypes,
-	TypePointers _targetTypes,
-	bool _encodeAsLibraryTypes,
-	bool _reversed
-)
-{
-	solAssert(_givenTypes.size() == _targetTypes.size(), "");
-	EncodingOptions options;
-	options.encodeAsLibraryTypes = _encodeAsLibraryTypes;
-	options.encodeFunctionFromStack = true;
-	options.padded = true;
-	options.dynamicInplace = false;
-
-	for (Type const*& t: _targetTypes)
-	{
-		solAssert(t, "");
-		t = t->fullEncodingType(options.encodeAsLibraryTypes, true, !options.padded);
-		solAssert(t, "");
-	}
-
-	std::string functionName = std::string("abi_encode_tuple_");
-	for (auto const& t: _givenTypes)
-		functionName += t->identifier() + "_";
-	functionName += "_to_";
-	for (auto const& t: _targetTypes)
-		functionName += t->identifier() + "_";
-	functionName += options.toFunctionNameSuffix();
-	if (_reversed)
-		functionName += "_reversed";
-
-	return createFunction(functionName, [&]() {
-		// Note that the values are in reverse due to the difference in calling semantics.
-		Whiskers templ(R"(
-			function <functionName>(headStart <valueParams>) -> tail {
-				tail := add(headStart, <headSize>)
-				<encodeElements>
-			}
-		)");
-		templ("functionName", functionName);
-		size_t const headSize_ = headSize(_targetTypes);
-		templ("headSize", std::to_string(headSize_));
-		std::string encodeElements;
-		size_t headPos = 0;
-		size_t stackPos = 0;
-		for (size_t i = 0; i < _givenTypes.size(); ++i)
-		{
-			solAssert(_givenTypes[i], "");
-			solAssert(_targetTypes[i], "");
-			size_t sizeOnStack = _givenTypes[i]->sizeOnStack();
-			bool dynamic = _targetTypes[i]->isDynamicallyEncoded();
-			Whiskers elementTempl(
-				dynamic ?
-				std::string(R"(
-					mstore(add(headStart, <pos>), sub(tail, headStart))
-					tail := <abiEncode>(<values> tail)
-				)") :
-				std::string(R"(
-					<abiEncode>(<values> add(headStart, <pos>))
-				)")
-			);
-			std::string values = suffixedVariableNameList("value", stackPos, stackPos + sizeOnStack);
-			elementTempl("values", values.empty() ? "" : values + ", ");
-			elementTempl("pos", std::to_string(headPos));
-			elementTempl("abiEncode", abiEncodingFunction(*_givenTypes[i], *_targetTypes[i], options));
-			encodeElements += elementTempl.render();
-			headPos += _targetTypes[i]->calldataHeadSize();
-			stackPos += sizeOnStack;
-		}
-		solAssert(headPos == headSize_, "");
-		std::string valueParams =
-			_reversed ?
-			suffixedVariableNameList("value", stackPos, 0) :
-			suffixedVariableNameList("value", 0, stackPos);
-		templ("valueParams", valueParams.empty() ? "" : ", " + valueParams);
-		templ("encodeElements", encodeElements);
-
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::tupleEncoderPacked(
-	TypePointers const& _givenTypes,
-	TypePointers _targetTypes,
-	bool _reversed
-)
-{
-	EncodingOptions options;
-	options.encodeAsLibraryTypes = false;
-	options.encodeFunctionFromStack = true;
-	options.padded = false;
-	options.dynamicInplace = true;
-
-	for (Type const*& t: _targetTypes)
-	{
-		solAssert(t, "");
-		t = t->fullEncodingType(options.encodeAsLibraryTypes, true, !options.padded);
-		solAssert(t, "");
-	}
-
-	std::string functionName = std::string("abi_encode_tuple_packed_");
-	for (auto const& t: _givenTypes)
-		functionName += t->identifier() + "_";
-	functionName += "_to_";
-	for (auto const& t: _targetTypes)
-		functionName += t->identifier() + "_";
-	functionName += options.toFunctionNameSuffix();
-	if (_reversed)
-		functionName += "_reversed";
-
-	return createFunction(functionName, [&]() {
-		// Note that the values are in reverse due to the difference in calling semantics.
-		Whiskers templ(R"(
-			function <functionName>(pos <valueParams>) -> end {
-				<encodeElements>
-				end := pos
-			}
-		)");
-		templ("functionName", functionName);
-		std::string encodeElements;
-		size_t stackPos = 0;
-		for (size_t i = 0; i < _givenTypes.size(); ++i)
-		{
-			solAssert(_givenTypes[i], "");
-			solAssert(_targetTypes[i], "");
-			size_t sizeOnStack = _givenTypes[i]->sizeOnStack();
-			bool dynamic = _targetTypes[i]->isDynamicallyEncoded();
-			Whiskers elementTempl(
-				dynamic ?
-				std::string(R"(
-					pos := <abiEncode>(<values> pos)
-				)") :
-				std::string(R"(
-					<abiEncode>(<values> pos)
-					pos := add(pos, <calldataEncodedSize>)
-				)")
-			);
-			std::string values = suffixedVariableNameList("value", stackPos, stackPos + sizeOnStack);
-			elementTempl("values", values.empty() ? "" : values + ", ");
-			if (!dynamic)
-				elementTempl("calldataEncodedSize", std::to_string(_targetTypes[i]->calldataEncodedSize(false)));
-			elementTempl("abiEncode", abiEncodingFunction(*_givenTypes[i], *_targetTypes[i], options));
-			encodeElements += elementTempl.render();
-			stackPos += sizeOnStack;
-		}
-		std::string valueParams =
-			_reversed ?
-			suffixedVariableNameList("value", stackPos, 0) :
-			suffixedVariableNameList("value", 0, stackPos);
-		templ("valueParams", valueParams.empty() ? "" : ", " + valueParams);
-		templ("encodeElements", encodeElements);
-
-		return templ.render();
-	});
-}
-std::string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
-{
-	std::string functionName = std::string("abi_decode_tuple_");
-	for (auto const& t: _types)
-		functionName += t->identifier();
-	if (_fromMemory)
-		functionName += "_fromMemory";
-
-	return createFunction(functionName, [&]() {
-		TypePointers decodingTypes;
-		for (auto const& t: _types)
-			decodingTypes.emplace_back(t->decodingType());
-
-		Whiskers templ(R"(
-			function <functionName>(headStart, dataEnd) <arrow> <valueReturnParams> {
-				if slt(sub(dataEnd, headStart), <minimumSize>) { <revertString>() }
-				<decodeElements>
-			}
-		)");
-		templ("functionName", functionName);
-		templ("revertString", revertReasonIfDebugFunction("ABI decoding: tuple data too short"));
-		templ("minimumSize", std::to_string(headSize(decodingTypes)));
-
-		std::string decodeElements;
-		std::vector<std::string> valueReturnParams;
-		size_t headPos = 0;
-		size_t stackPos = 0;
-		for (size_t i = 0; i < _types.size(); ++i)
-		{
-			solAssert(_types[i], "");
-			solAssert(decodingTypes[i], "");
-			size_t sizeOnStack = _types[i]->sizeOnStack();
-			solAssert(sizeOnStack == decodingTypes[i]->sizeOnStack(), "");
-			solAssert(sizeOnStack > 0, "");
-			std::vector<std::string> valueNamesLocal;
-			for (size_t j = 0; j < sizeOnStack; j++)
-			{
-				valueNamesLocal.emplace_back("value" + std::to_string(stackPos));
-				valueReturnParams.emplace_back("value" + std::to_string(stackPos));
-				stackPos++;
-			}
-			Whiskers elementTempl(R"(
-				{
-					<?dynamic>
-						let offset := <load>(add(headStart, <pos>))
-						if gt(offset, 0xffffffffffffffff) { <revertString>() }
-					<!dynamic>
-						let offset := <pos>
-					</dynamic>
-					<values> := <abiDecode>(add(headStart, offset), dataEnd)
-				}
-			)");
-			elementTempl("dynamic", decodingTypes[i]->isDynamicallyEncoded());
-			// TODO add test
-			elementTempl("revertString", revertReasonIfDebugFunction("ABI decoding: invalid tuple offset"));
-			elementTempl("load", _fromMemory ? "mload" : "calldataload");
-			elementTempl("values", boost::algorithm::join(valueNamesLocal, ", "));
-			elementTempl("pos", std::to_string(headPos));
-			elementTempl("abiDecode", abiDecodingFunction(*_types[i], _fromMemory, true));
-			decodeElements += elementTempl.render();
-			headPos += decodingTypes[i]->calldataHeadSize();
-		}
-		templ("valueReturnParams", boost::algorithm::join(valueReturnParams, ", "));
-		templ("arrow", valueReturnParams.empty() ? "" : "->");
-		templ("decodeElements", decodeElements);
-
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::EncodingOptions::toFunctionNameSuffix() const
-{
-	std::string suffix;
-	if (!padded)
-		suffix += "_nonPadded";
-	if (dynamicInplace)
-		suffix += "_inplace";
-	if (encodeFunctionFromStack)
-		suffix += "_fromStack";
-	if (encodeAsLibraryTypes)
-		suffix += "_library";
-	return suffix;
-}
-
-std::string ABIFunctions::abiEncodingFunction(
-	Type const& _from,
-	Type const& _to,
-	EncodingOptions const& _options
-)
-{
-	Type const* toInterface = _to.fullEncodingType(_options.encodeAsLibraryTypes, true, false);
-	solUnimplementedAssert(toInterface, "Encoding type \"" + _to.toString() + "\" not yet implemented.");
-	Type const& to = *toInterface;
-
-	if (_from.category() == Type::Category::StringLiteral)
-		return abiEncodingFunctionStringLiteral(_from, to, _options);
-	else if (auto toArray = dynamic_cast<ArrayType const*>(&to))
-	{
-		ArrayType const* fromArray = nullptr;
-		switch (_from.category())
-		{
-			case Type::Category::Array:
-				fromArray = dynamic_cast<ArrayType const*>(&_from);
-				break;
-			case Type::Category::ArraySlice:
-				fromArray = &dynamic_cast<ArraySliceType const*>(&_from)->arrayType();
-				solAssert(
-					fromArray->dataStoredIn(DataLocation::CallData) &&
-					fromArray->isDynamicallySized() &&
-					!fromArray->baseType()->isDynamicallyEncoded(),
-					""
-				);
-				break;
-			default:
-				solAssert(false, "");
-				break;
-		}
-
-		switch (fromArray->location())
-		{
-			case DataLocation::CallData:
-				if (
-					fromArray->isByteArrayOrString() ||
-					*fromArray->baseType() == *TypeProvider::uint256() ||
-					*fromArray->baseType() == FixedBytesType(32)
-				)
-					return abiEncodingFunctionCalldataArrayWithoutCleanup(*fromArray, *toArray, _options);
-				else
-					return abiEncodingFunctionSimpleArray(*fromArray, *toArray, _options);
-			case DataLocation::Memory:
-				if (fromArray->isByteArrayOrString())
-					return abiEncodingFunctionMemoryByteArray(*fromArray, *toArray, _options);
-				else
-					return abiEncodingFunctionSimpleArray(*fromArray, *toArray, _options);
-			case DataLocation::Storage:
-				if (fromArray->baseType()->storageBytes() <= 16)
-					return abiEncodingFunctionCompactStorageArray(*fromArray, *toArray, _options);
-				else
-					return abiEncodingFunctionSimpleArray(*fromArray, *toArray, _options);
-			default:
-				solAssert(false, "");
-		}
-	}
-	else if (auto const* toStruct = dynamic_cast<StructType const*>(&to))
-	{
-		StructType const* fromStruct = dynamic_cast<StructType const*>(&_from);
-		solAssert(fromStruct, "");
-		return abiEncodingFunctionStruct(*fromStruct, *toStruct, _options);
-	}
-	else if (_from.category() == Type::Category::Function)
-		return abiEncodingFunctionFunctionType(
-			dynamic_cast<FunctionType const&>(_from),
-			to,
-			_options
-		);
-
-	solAssert(_from.sizeOnStack() == 1, "");
-	solAssert(to.isValueType(), "");
-	solAssert(to.calldataEncodedSize() == 32, "");
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		to.identifier() +
-		_options.toFunctionNameSuffix();
-	return createFunction(functionName, [&]() {
-		solAssert(!to.isDynamicallyEncoded(), "");
-
-		Whiskers templ(R"(
-			function <functionName>(value, pos) {
-				mstore(pos, <cleanupConvert>)
-			}
-		)");
-		templ("functionName", functionName);
-
-		if (_from.dataStoredIn(DataLocation::Storage))
-		{
-			// special case: convert storage reference type to value type - this is only
-			// possible for library calls where we just forward the storage reference
-			solAssert(_options.encodeAsLibraryTypes, "");
-			solAssert(_options.padded && !_options.dynamicInplace, "Non-padded / inplace encoding for library call requested.");
-			solAssert(to == *TypeProvider::uint256(), "");
-			templ("cleanupConvert", "value");
-		}
-		else
-		{
-			std::string cleanupConvert;
-			if (_from == to)
-				cleanupConvert = m_utils.cleanupFunction(_from) + "(value)";
-			else
-				cleanupConvert = m_utils.conversionFunction(_from, to) + "(value)";
-			if (!_options.padded)
-				cleanupConvert = m_utils.leftAlignFunction(to) + "(" + cleanupConvert + ")";
-			templ("cleanupConvert", cleanupConvert);
-		}
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiEncodeAndReturnUpdatedPosFunction(
-	Type const& _givenType,
-	Type const& _targetType,
-	ABIFunctions::EncodingOptions const& _options
-)
-{
-	std::string functionName =
-		"abi_encodeUpdatedPos_" +
-		_givenType.identifier() +
-		"_to_" +
-		_targetType.identifier() +
-		_options.toFunctionNameSuffix();
-	return createFunction(functionName, [&]() {
-		std::string values = suffixedVariableNameList("value", 0, numVariablesForType(_givenType, _options));
-		std::string encoder = abiEncodingFunction(_givenType, _targetType, _options);
-		Type const* targetEncoding = _targetType.fullEncodingType(_options.encodeAsLibraryTypes, true, false);
-		solAssert(targetEncoding, "");
-		if (targetEncoding->isDynamicallyEncoded())
-			return Whiskers(R"(
-				function <functionName>(<values>, pos) -> updatedPos {
-					updatedPos := <encode>(<values>, pos)
-				}
-			)")
-			("functionName", functionName)
-			("encode", encoder)
-			("values", values)
-			.render();
-		else
-		{
-			unsigned encodedSize = targetEncoding->calldataEncodedSize(_options.padded);
-			solAssert(encodedSize != 0, "Invalid encoded size.");
-			return Whiskers(R"(
-				function <functionName>(<values>, pos) -> updatedPos {
-					<encode>(<values>, pos)
-					updatedPos := add(pos, <encodedSize>)
-				}
-			)")
-			("functionName", functionName)
-			("encode", encoder)
-			("encodedSize", toCompactHexWithPrefix(encodedSize))
-			("values", values)
-			.render();
-		}
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
-	Type const& _from,
-	Type const& _to,
-	EncodingOptions const& _options
-)
-{
-	solAssert(_from.category() == Type::Category::Array, "Unknown dynamic type.");
-	solAssert(_to.category() == Type::Category::Array, "Unknown dynamic type.");
-	auto const& fromArrayType = dynamic_cast<ArrayType const&>(_from);
-	auto const& toArrayType = dynamic_cast<ArrayType const&>(_to);
-
-	solAssert(fromArrayType.location() == DataLocation::CallData, "");
-	solAssert(
-		fromArrayType.isByteArrayOrString() ||
-		*fromArrayType.baseType() == *TypeProvider::uint256() ||
-		*fromArrayType.baseType() == FixedBytesType(32),
-		""
-	);
-	solAssert(fromArrayType.calldataStride() == toArrayType.memoryStride(), "");
-
-	solAssert(
-		*fromArrayType.copyForLocation(DataLocation::Memory, true) ==
-		*toArrayType.copyForLocation(DataLocation::Memory, true),
-		""
-	);
-
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-	return createFunction(functionName, [&]() {
-		bool bytesOrString = fromArrayType.isByteArrayOrString();
-		bool needsPadding = _options.padded && bytesOrString;
-		if (fromArrayType.isDynamicallySized())
-		{
-			Whiskers templ(R"(
-				// <readableTypeNameFrom> -> <readableTypeNameTo>
-				function <functionName>(start, length, pos) -> end {
-					pos := <storeLength>(pos, length)
-					<scaleLengthByStride>
-					<copyFun>(start, pos, length)
-					end := add(pos, <lengthPadded>)
-				}
-			)");
-			templ("storeLength", arrayStoreLengthForEncodingFunction(toArrayType, _options));
-			templ("functionName", functionName);
-			if (fromArrayType.isByteArrayOrString() || fromArrayType.calldataStride() == 1)
-				templ("scaleLengthByStride", "");
-			else
-				templ("scaleLengthByStride",
-					Whiskers(R"(
-						if gt(length, <maxLength>) { <revertString>() }
-						length := mul(length, <stride>)
-					)")
-					("stride", toCompactHexWithPrefix(fromArrayType.calldataStride()))
-					("maxLength", toCompactHexWithPrefix(u256(-1) / fromArrayType.calldataStride()))
-					("revertString", revertReasonIfDebugFunction("ABI encoding: array data too long"))
-					.render()
-					// TODO add revert test
-				);
-			templ("readableTypeNameFrom", _from.toString(true));
-			templ("readableTypeNameTo", _to.toString(true));
-			templ("copyFun", m_utils.copyToMemoryFunction(true, /*cleanup*/bytesOrString));
-			templ("lengthPadded", needsPadding ? m_utils.roundUpFunction() + "(length)" : "length");
-			return templ.render();
-		}
-		else
-		{
-			solAssert(fromArrayType.calldataStride() == 32, "");
-			Whiskers templ(R"(
-				// <readableTypeNameFrom> -> <readableTypeNameTo>
-				function <functionName>(start, pos) {
-					<copyFun>(start, pos, <byteLength>)
-				}
-			)");
-			templ("functionName", functionName);
-			templ("readableTypeNameFrom", _from.toString(true));
-			templ("readableTypeNameTo", _to.toString(true));
-			templ("copyFun", m_utils.copyToMemoryFunction(true, /*cleanup*/bytesOrString));
-			templ("byteLength", toCompactHexWithPrefix(fromArrayType.length() * fromArrayType.calldataStride()));
-			return templ.render();
-		}
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionSimpleArray(
-	ArrayType const& _from,
-	ArrayType const& _to,
-	EncodingOptions const& _options
-)
-{
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-
-	solAssert(_from.isDynamicallySized() == _to.isDynamicallySized(), "");
-	solAssert(_from.length() == _to.length(), "");
-	solAssert(!_from.isByteArrayOrString(), "");
-	if (_from.dataStoredIn(DataLocation::Storage))
-		solAssert(_from.baseType()->storageBytes() > 16, "");
-
-	return createFunction(functionName, [&]() {
-		bool dynamic = _to.isDynamicallyEncoded();
-		bool dynamicBase = _to.baseType()->isDynamicallyEncoded();
-		bool const usesTail = dynamicBase && !_options.dynamicInplace;
-		EncodingOptions subOptions(_options);
-		subOptions.encodeFunctionFromStack = false;
-		subOptions.padded = true;
-		std::string elementValues = suffixedVariableNameList("elementValue", 0, numVariablesForType(*_from.baseType(), subOptions));
-		Whiskers templ(
-			usesTail ?
-			R"(
-				// <readableTypeNameFrom> -> <readableTypeNameTo>
-				function <functionName>(value,<maybeLength> pos) <return> {
-					<declareLength>
-					pos := <storeLength>(pos, length)
-					let headStart := pos
-					let tail := add(pos, mul(length, 0x20))
-					let baseRef := <dataAreaFun>(value)
-					let srcPtr := baseRef
-					for { let i := 0 } lt(i, length) { i := add(i, 1) }
-					{
-						mstore(pos, sub(tail, headStart))
-						let <elementValues> := <arrayElementAccess>
-						tail := <encodeToMemoryFun>(<elementValues>, tail)
-						srcPtr := <nextArrayElement>(srcPtr)
-						pos := add(pos, 0x20)
-					}
-					pos := tail
-					<assignEnd>
-				}
-			)" :
-			R"(
-				// <readableTypeNameFrom> -> <readableTypeNameTo>
-				function <functionName>(value,<maybeLength> pos) <return> {
-					<declareLength>
-					pos := <storeLength>(pos, length)
-					let baseRef := <dataAreaFun>(value)
-					let srcPtr := baseRef
-					for { let i := 0 } lt(i, length) { i := add(i, 1) }
-					{
-						let <elementValues> := <arrayElementAccess>
-						pos := <encodeToMemoryFun>(<elementValues>, pos)
-						srcPtr := <nextArrayElement>(srcPtr)
-					}
-					<assignEnd>
-				}
-			)"
-		);
-		templ("functionName", functionName);
-		templ("elementValues", elementValues);
-		bool lengthAsArgument = _from.dataStoredIn(DataLocation::CallData) && _from.isDynamicallySized();
-		if (lengthAsArgument)
-		{
-			templ("maybeLength", " length,");
-			templ("declareLength", "");
-		}
-		else
-		{
-			templ("maybeLength", "");
-			templ("declareLength", "let length := " + m_utils.arrayLengthFunction(_from) + "(value)");
-		}
-		templ("readableTypeNameFrom", _from.toString(true));
-		templ("readableTypeNameTo", _to.toString(true));
-		templ("return", dynamic ? " -> end " : "");
-		templ("assignEnd", dynamic ? "end := pos" : "");
-		templ("storeLength", arrayStoreLengthForEncodingFunction(_to, _options));
-		templ("dataAreaFun", m_utils.arrayDataAreaFunction(_from));
-
-		templ("encodeToMemoryFun", abiEncodeAndReturnUpdatedPosFunction(*_from.baseType(), *_to.baseType(), subOptions));
-		switch (_from.location())
-		{
-			case DataLocation::Memory:
-				templ("arrayElementAccess", "mload(srcPtr)");
-				break;
-			case DataLocation::Storage:
-				if (_from.baseType()->isValueType())
-					templ("arrayElementAccess", m_utils.readFromStorage(*_from.baseType(), 0, false) + "(srcPtr)");
-				else
-					templ("arrayElementAccess", "srcPtr");
-				break;
-			case DataLocation::CallData:
-				templ("arrayElementAccess", calldataAccessFunction(*_from.baseType()) + "(baseRef, srcPtr)");
-				break;
-			default:
-				solAssert(false, "");
-		}
-		templ("nextArrayElement", m_utils.nextArrayElementFunction(_from));
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionMemoryByteArray(
-	ArrayType const& _from,
-	ArrayType const& _to,
-	EncodingOptions const& _options
-)
-{
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-
-	solAssert(_from.isDynamicallySized() == _to.isDynamicallySized(), "");
-	solAssert(_from.length() == _to.length(), "");
-	solAssert(_from.dataStoredIn(DataLocation::Memory), "");
-	solAssert(_from.isByteArrayOrString(), "");
-
-	return createFunction(functionName, [&]() {
-		solAssert(_to.isByteArrayOrString(), "");
-		Whiskers templ(R"(
-			function <functionName>(value, pos) -> end {
-				let length := <lengthFun>(value)
-				pos := <storeLength>(pos, length)
-				<copyFun>(add(value, 0x20), pos, length)
-				end := add(pos, <lengthPadded>)
-			}
-		)");
-		templ("functionName", functionName);
-		templ("lengthFun", m_utils.arrayLengthFunction(_from));
-		templ("storeLength", arrayStoreLengthForEncodingFunction(_to, _options));
-		templ("copyFun", m_utils.copyToMemoryFunction(false, /*cleanup*/true));
-		templ("lengthPadded", _options.padded ? m_utils.roundUpFunction() + "(length)" : "length");
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionCompactStorageArray(
-	ArrayType const& _from,
-	ArrayType const& _to,
-	EncodingOptions const& _options
-)
-{
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-
-	solAssert(_from.isDynamicallySized() == _to.isDynamicallySized(), "");
-	solAssert(_from.length() == _to.length(), "");
-	solAssert(_from.dataStoredIn(DataLocation::Storage), "");
-
-	return createFunction(functionName, [&]() {
-		if (_from.isByteArrayOrString())
-		{
-			solAssert(_to.isByteArrayOrString(), "");
-			Whiskers templ(R"(
-				// <readableTypeNameFrom> -> <readableTypeNameTo>
-				function <functionName>(value, pos) -> ret {
-					let slotValue := sload(value)
-					let length := <byteArrayLengthFunction>(slotValue)
-					pos := <storeLength>(pos, length)
-					switch and(slotValue, 1)
-					case 0 {
-						// short byte array
-						mstore(pos, and(slotValue, not(0xff)))
-						ret := add(pos, mul(<lengthPaddedShort>, iszero(iszero(length))))
-					}
-					case 1 {
-						// long byte array
-						let dataPos := <arrayDataSlot>(value)
-						let i := 0
-						for { } lt(i, length) { i := add(i, 0x20) } {
-							mstore(add(pos, i), sload(dataPos))
-							dataPos := add(dataPos, 1)
-						}
-						ret := add(pos, <lengthPaddedLong>)
-					}
-				}
-			)");
-			templ("functionName", functionName);
-			templ("readableTypeNameFrom", _from.toString(true));
-			templ("readableTypeNameTo", _to.toString(true));
-			templ("byteArrayLengthFunction", m_utils.extractByteArrayLengthFunction());
-			templ("storeLength", arrayStoreLengthForEncodingFunction(_to, _options));
-			templ("lengthPaddedShort", _options.padded ? "0x20" : "length");
-			templ("lengthPaddedLong", _options.padded ? "i" : "length");
-			templ("arrayDataSlot", m_utils.arrayDataAreaFunction(_from));
-			return templ.render();
-		}
-		else
-		{
-			// Multiple items per slot
-			solAssert(_from.baseType()->storageBytes() <= 16, "");
-			solAssert(!_from.baseType()->isDynamicallyEncoded(), "");
-			solAssert(!_to.baseType()->isDynamicallyEncoded(), "");
-			solAssert(_from.baseType()->isValueType(), "");
-			bool dynamic = _to.isDynamicallyEncoded();
-			size_t storageBytes = _from.baseType()->storageBytes();
-			size_t itemsPerSlot = 32 / storageBytes;
-			solAssert(itemsPerSlot > 0, "");
-			// The number of elements we need to handle manually after the loop.
-			size_t spill = static_cast<size_t>(_from.length() % itemsPerSlot);
-			Whiskers templ(
-				R"(
-					// <readableTypeNameFrom> -> <readableTypeNameTo>
-					function <functionName>(value, pos) <return> {
-						let length := <lengthFun>(value)
-						pos := <storeLength>(pos, length)
-						let originalPos := pos
-						let srcPtr := <dataArea>(value)
-						let itemCounter := 0
-						if <useLoop> {
-							// Run the loop over all full slots
-							for { } lt(add(itemCounter, sub(<itemsPerSlot>, 1)), length)
-										{ itemCounter := add(itemCounter, <itemsPerSlot>) }
-							{
-								let data := sload(srcPtr)
-								<#items>
-									<encodeToMemoryFun>(<extractFromSlot>(data), pos)
-									pos := add(pos, <stride>)
-								</items>
-								srcPtr := add(srcPtr, 1)
-							}
-						}
-						// Handle the last (not necessarily full) slot specially
-						if <useSpill> {
-							let data := sload(srcPtr)
-							<#items>
-								if <inRange> {
-									<encodeToMemoryFun>(<extractFromSlot>(data), pos)
-									pos := add(pos, <stride>)
-									itemCounter := add(itemCounter, 1)
-								}
-							</items>
-						}
-						<assignEnd>
-					}
-				)"
-			);
-			templ("functionName", functionName);
-			templ("readableTypeNameFrom", _from.toString(true));
-			templ("readableTypeNameTo", _to.toString(true));
-			templ("return", dynamic ? " -> end " : "");
-			templ("assignEnd", dynamic ? "end := pos" : "");
-			templ("lengthFun", m_utils.arrayLengthFunction(_from));
-			templ("storeLength", arrayStoreLengthForEncodingFunction(_to, _options));
-			templ("dataArea", m_utils.arrayDataAreaFunction(_from));
-			// We skip the loop for arrays that fit a single slot.
-			if (_from.isDynamicallySized() || _from.length() >= itemsPerSlot)
-				templ("useLoop", "1");
-			else
-				templ("useLoop", "0");
-			if (_from.isDynamicallySized() || spill != 0)
-				templ("useSpill", "1");
-			else
-				templ("useSpill", "0");
-			templ("itemsPerSlot", std::to_string(itemsPerSlot));
-			templ("stride", toCompactHexWithPrefix(_to.calldataStride()));
-
-			EncodingOptions subOptions(_options);
-			subOptions.encodeFunctionFromStack = false;
-			subOptions.padded = true;
-			std::string encodeToMemoryFun = abiEncodingFunction(
-				*_from.baseType(),
-				*_to.baseType(),
-				subOptions
-			);
-			templ("encodeToMemoryFun", encodeToMemoryFun);
-			std::vector<std::map<std::string, std::string>> items(itemsPerSlot);
-			for (size_t i = 0; i < itemsPerSlot; ++i)
-			{
-				if (_from.isDynamicallySized())
-					items[i]["inRange"] = "lt(itemCounter, length)";
-				else if (i < spill)
-					items[i]["inRange"] = "1";
-				else
-					items[i]["inRange"] = "0";
-				items[i]["extractFromSlot"] = m_utils.extractFromStorageValue(*_from.baseType(), i * storageBytes);
-			}
-			templ("items", items);
-			return templ.render();
-		}
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionStruct(
-	StructType const& _from,
-	StructType const& _to,
-	EncodingOptions const& _options
-)
-{
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-
-	solAssert(&_from.structDefinition() == &_to.structDefinition(), "");
-
-	return createFunction(functionName, [&]() {
-		bool dynamic = _to.isDynamicallyEncoded();
-		Whiskers templ(R"(
-			// <readableTypeNameFrom> -> <readableTypeNameTo>
-			function <functionName>(value, pos) <return> {
-				let tail := add(pos, <headSize>)
-				<init>
-				<#members>
-				{
-					// <memberName>
-					<preprocess>
-					let <memberValues> := <retrieveValue>
-					<encode>
-				}
-				</members>
-				<assignEnd>
-			}
-		)");
-		templ("functionName", functionName);
-		templ("readableTypeNameFrom", _from.toString(true));
-		templ("readableTypeNameTo", _to.toString(true));
-		templ("return", dynamic ? " -> end " : "");
-		if (dynamic && _options.dynamicInplace)
-			templ("assignEnd", "end := pos");
-		else if (dynamic && !_options.dynamicInplace)
-			templ("assignEnd", "end := tail");
-		else
-			templ("assignEnd", "");
-		// to avoid multiple loads from the same slot for subsequent members
-		templ("init", _from.dataStoredIn(DataLocation::Storage) ? "let slotValue := 0" : "");
-		u256 previousSlotOffset(-1);
-		u256 encodingOffset = 0;
-		std::vector<std::map<std::string, std::string>> members;
-		for (auto const& member: _to.members(nullptr))
-		{
-			solAssert(member.type, "");
-			solAssert(!member.type->containsNestedMapping(), "");
-			Type const* memberTypeTo = member.type->fullEncodingType(_options.encodeAsLibraryTypes, true, false);
-			solUnimplementedAssert(memberTypeTo, "Encoding type \"" + member.type->toString() + "\" not yet implemented.");
-			auto memberTypeFrom = _from.memberType(member.name);
-			solAssert(memberTypeFrom, "");
-			bool dynamicMember = memberTypeTo->isDynamicallyEncoded();
-			if (dynamicMember)
-				solAssert(dynamic, "");
-
-			members.emplace_back();
-			members.back()["preprocess"] = "";
-
-			switch (_from.location())
-			{
-				case DataLocation::Storage:
-				{
-					solAssert(memberTypeFrom->isValueType() == memberTypeTo->isValueType(), "");
-					u256 storageSlotOffset;
-					size_t intraSlotOffset;
-					std::tie(storageSlotOffset, intraSlotOffset) = _from.storageOffsetsOfMember(member.name);
-					if (memberTypeFrom->isValueType())
-					{
-						if (storageSlotOffset != previousSlotOffset)
-						{
-							members.back()["preprocess"] = "slotValue := sload(add(value, " + toCompactHexWithPrefix(storageSlotOffset) + "))";
-							previousSlotOffset = storageSlotOffset;
-						}
-						members.back()["retrieveValue"] = m_utils.extractFromStorageValue(*memberTypeFrom, intraSlotOffset) + "(slotValue)";
-					}
-					else
-					{
-						solAssert(memberTypeFrom->dataStoredIn(DataLocation::Storage), "");
-						solAssert(intraSlotOffset == 0, "");
-						members.back()["retrieveValue"] = "add(value, " + toCompactHexWithPrefix(storageSlotOffset) + ")";
-					}
-					break;
-				}
-				case DataLocation::Memory:
-				{
-					std::string sourceOffset = toCompactHexWithPrefix(_from.memoryOffsetOfMember(member.name));
-					members.back()["retrieveValue"] = "mload(add(value, " + sourceOffset + "))";
-					break;
-				}
-				case DataLocation::CallData:
-				{
-					std::string sourceOffset = toCompactHexWithPrefix(_from.calldataOffsetOfMember(member.name));
-					members.back()["retrieveValue"] = calldataAccessFunction(*memberTypeFrom) + "(value, add(value, " + sourceOffset + "))";
-					break;
-				}
-				default:
-					solAssert(false, "");
-			}
-
-			EncodingOptions subOptions(_options);
-			subOptions.encodeFunctionFromStack = false;
-			// Like with arrays, struct members are always padded.
-			subOptions.padded = true;
-
-			std::string memberValues = suffixedVariableNameList("memberValue", 0, numVariablesForType(*memberTypeFrom, subOptions));
-			members.back()["memberValues"] = memberValues;
-
-			std::string encode;
-			if (_options.dynamicInplace)
-				encode = Whiskers{"pos := <encode>(<memberValues>, pos)"}
-					("encode", abiEncodeAndReturnUpdatedPosFunction(*memberTypeFrom, *memberTypeTo, subOptions))
-					("memberValues", memberValues)
-					.render();
-			else
-			{
-				Whiskers encodeTempl(
-					dynamicMember ?
-					std::string(R"(
-						mstore(add(pos, <encodingOffset>), sub(tail, pos))
-						tail := <abiEncode>(<memberValues>, tail)
-					)") :
-					"<abiEncode>(<memberValues>, add(pos, <encodingOffset>))"
-				);
-				encodeTempl("memberValues", memberValues);
-				encodeTempl("encodingOffset", toCompactHexWithPrefix(encodingOffset));
-				encodingOffset += memberTypeTo->calldataHeadSize();
-				encodeTempl("abiEncode", abiEncodingFunction(*memberTypeFrom, *memberTypeTo, subOptions));
-				encode = encodeTempl.render();
-			}
-			members.back()["encode"] = encode;
-
-			members.back()["memberName"] = member.name;
-		}
-		templ("members", members);
-		if (_options.dynamicInplace)
-			solAssert(encodingOffset == 0, "In-place encoding should enforce zero head size.");
-		templ("headSize", toCompactHexWithPrefix(encodingOffset));
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionStringLiteral(
-	Type const& _from,
-	Type const& _to,
-	EncodingOptions const& _options
-)
-{
-	solAssert(_from.category() == Type::Category::StringLiteral, "");
-
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-	return createFunction(functionName, [&]() {
-		auto const& strType = dynamic_cast<StringLiteralType const&>(_from);
-		std::string const& value = strType.value();
-		solAssert(_from.sizeOnStack() == 0, "");
-
-		if (_to.isDynamicallySized())
-		{
-			solAssert(_to.category() == Type::Category::Array, "");
-			Whiskers templ(R"(
-				function <functionName>(pos) -> end {
-					pos := <storeLength>(pos, <length>)
-					<storeLiteralInMemory>(pos)
-					end := add(pos, <overallSize>)
-				}
-			)");
-			templ("functionName", functionName);
-
-			// TODO this can make use of CODECOPY for large strings once we have that in Yul
-			templ("length", std::to_string(value.size()));
-			templ("storeLength", arrayStoreLengthForEncodingFunction(dynamic_cast<ArrayType const&>(_to), _options));
-			if (_options.padded)
-				templ("overallSize", std::to_string(((value.size() + 31) / 32) * 32));
-			else
-				templ("overallSize", std::to_string(value.size()));
-			templ("storeLiteralInMemory", m_utils.storeLiteralInMemoryFunction(value));
-			return templ.render();
-		}
-		else
-		{
-			solAssert(_to.category() == Type::Category::FixedBytes, "");
-			solAssert(value.size() <= 32, "");
-			Whiskers templ(R"(
-				function <functionName>(pos) {
-					mstore(pos, <wordValue>)
-				}
-			)");
-			templ("functionName", functionName);
-			templ("wordValue", formatAsStringOrNumber(value));
-			return templ.render();
-		}
-	});
-}
-
-std::string ABIFunctions::abiEncodingFunctionFunctionType(
-	FunctionType const& _from,
-	Type const& _to,
-	EncodingOptions const& _options
-)
-{
-	solAssert(
-		_from.kind() == FunctionType::Kind::External &&
-		_from.isImplicitlyConvertibleTo(_to) &&
-		_from.sizeOnStack() == _to.sizeOnStack(),
-		"Invalid function type conversion requested"
-	);
-
-	std::string functionName =
-		"abi_encode_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier() +
-		_options.toFunctionNameSuffix();
-
-	if (_options.encodeFunctionFromStack)
-		return createFunction(functionName, [&]() {
-			return Whiskers(R"(
-				function <functionName>(addr, function_id, pos) {
-					addr, function_id := <convert>(addr, function_id)
-					mstore(pos, <combineExtFun>(addr, function_id))
-				}
-			)")
-			("functionName", functionName)
-			("combineExtFun", m_utils.combineExternalFunctionIdFunction())
-			("convert", m_utils.conversionFunction(_from, _to))
-			.render();
-		});
-	else
-		return createFunction(functionName, [&]() {
-			return Whiskers(R"(
-				function <functionName>(addr_and_function_id, pos) {
-					mstore(pos, <cleanExtFun>(addr_and_function_id))
-				}
-			)")
-			("functionName", functionName)
-			("cleanExtFun", m_utils.cleanupFunction(_to))
-			.render();
-		});
-}
-
-std::string ABIFunctions::abiDecodingFunction(Type const& _type, bool _fromMemory, bool _forUseOnStack)
-{
-	// The decoding function has to perform bounds checks unless it decodes a value type.
-	// Conversely, bounds checks have to be performed before the decoding function
-	// of a value type is called.
-
-	Type const* decodingType = _type.decodingType();
-	solAssert(decodingType, "");
-
-	if (auto arrayType = dynamic_cast<ArrayType const*>(decodingType))
-	{
-		if (arrayType->dataStoredIn(DataLocation::CallData))
-		{
-			solAssert(!_fromMemory, "");
-			return abiDecodingFunctionCalldataArray(*arrayType);
-		}
-		else
-			return abiDecodingFunctionArray(*arrayType, _fromMemory);
-	}
-	else if (auto const* structType = dynamic_cast<StructType const*>(decodingType))
-	{
-		if (structType->dataStoredIn(DataLocation::CallData))
-		{
-			solAssert(!_fromMemory, "");
-			return abiDecodingFunctionCalldataStruct(*structType);
-		}
-		else
-			return abiDecodingFunctionStruct(*structType, _fromMemory);
-	}
-	else if (auto const* functionType = dynamic_cast<FunctionType const*>(decodingType))
-		return abiDecodingFunctionFunctionType(*functionType, _fromMemory, _forUseOnStack);
-	else
-		return abiDecodingFunctionValueType(_type, _fromMemory);
-}
-
-std::string ABIFunctions::abiDecodingFunctionValueType(Type const& _type, bool _fromMemory)
-{
-	Type const* decodingType = _type.decodingType();
-	solAssert(decodingType, "");
-	solAssert(decodingType->sizeOnStack() == 1, "");
-	solAssert(decodingType->isValueType(), "");
-	solAssert(!decodingType->isDynamicallyEncoded(), "");
-	solAssert(decodingType->calldataEncodedSize() == 32, "");
-
-	std::string functionName =
-		"abi_decode_" +
-		_type.identifier() +
-		(_fromMemory ? "_fromMemory" : "");
-	return createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(offset, end) -> value {
-				value := <load>(offset)
-				<validator>(value)
-			}
-		)");
-		templ("functionName", functionName);
-		templ("load", _fromMemory ? "mload" : "calldataload");
-		// Validation should use the type and not decodingType, because e.g.
-		// the decoding type of an enum is a plain int.
-		templ("validator", m_utils.validatorFunction(_type, true));
-		return templ.render();
-	});
-
-}
-
-std::string ABIFunctions::abiDecodingFunctionArray(ArrayType const& _type, bool _fromMemory)
-{
-	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-
-	std::string functionName =
-		"abi_decode_" +
-		_type.identifier() +
-		(_fromMemory ? "_fromMemory" : "");
-
-	return createFunction(functionName, [&]() {
-		std::string load = _fromMemory ? "mload" : "calldataload";
-		Whiskers templ(
-			R"(
-				// <readableTypeName>
-				function <functionName>(offset, end) -> array {
-					if iszero(slt(add(offset, 0x1f), end)) { <revertString>() }
-					let length := <retrieveLength>
-					array := <abiDecodeAvailableLen>(<offset>, length, end)
-				}
-			)"
-		);
-		// TODO add test
-		templ("revertString", revertReasonIfDebugFunction("ABI decoding: invalid calldata array offset"));
-		templ("functionName", functionName);
-		templ("readableTypeName", _type.toString(true));
-		templ("retrieveLength", _type.isDynamicallySized() ? (load + "(offset)") : toCompactHexWithPrefix(_type.length()));
-		templ("offset", _type.isDynamicallySized() ? "add(offset, 0x20)" : "offset");
-		templ("abiDecodeAvailableLen", abiDecodingFunctionArrayAvailableLength(_type, _fromMemory));
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiDecodingFunctionArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
-{
-	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-	if (_type.isByteArrayOrString())
-		return abiDecodingFunctionByteArrayAvailableLength(_type, _fromMemory);
-	solAssert(_type.calldataStride() > 0, "");
-
-	std::string functionName =
-		"abi_decode_available_length_" +
-		_type.identifier() +
-		(_fromMemory ? "_fromMemory" : "");
-
-	return createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			// <readableTypeName>
-			function <functionName>(offset, length, end) -> array {
-				array := <allocate>(<allocationSize>(length))
-				let dst := array
-				<?dynamic>
-					mstore(array, length)
-					dst := add(array, 0x20)
-				</dynamic>
-				let srcEnd := add(offset, mul(length, <stride>))
-				if gt(srcEnd, end) {
-					<revertInvalidStride>()
-				}
-				for { let src := offset } lt(src, srcEnd) { src := add(src, <stride>) }
-				{
-					<?dynamicBase>
-						let innerOffset := <load>(src)
-						if gt(innerOffset, 0xffffffffffffffff) { <revertStringOffset>() }
-						let elementPos := add(offset, innerOffset)
-					<!dynamicBase>
-						let elementPos := src
-					</dynamicBase>
-					mstore(dst, <decodingFun>(elementPos, end))
-					dst := add(dst, 0x20)
-				}
-			}
-		)");
-		templ("functionName", functionName);
-		templ("readableTypeName", _type.toString(true));
-		templ("allocate", m_utils.allocationFunction());
-		templ("allocationSize", m_utils.arrayAllocationSizeFunction(_type));
-		templ("stride", toCompactHexWithPrefix(_type.calldataStride()));
-		templ("dynamic", _type.isDynamicallySized());
-		templ("load", _fromMemory ? "mload" : "calldataload");
-		templ("dynamicBase", _type.baseType()->isDynamicallyEncoded());
-		templ(
-			"revertInvalidStride",
-			revertReasonIfDebugFunction("ABI decoding: invalid calldata array stride")
-		);
-		templ("revertStringOffset", revertReasonIfDebugFunction("ABI decoding: invalid calldata array offset"));
-		templ("decodingFun", abiDecodingFunction(*_type.baseType(), _fromMemory, false));
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiDecodingFunctionCalldataArray(ArrayType const& _type)
-{
-	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	if (!_type.isDynamicallySized())
-		solAssert(_type.length() < u256("0xffffffffffffffff"), "");
-	solAssert(_type.calldataStride() > 0, "");
-	solAssert(_type.calldataStride() < u256("0xffffffffffffffff"), "");
-
-	std::string functionName =
-		"abi_decode_" +
-		_type.identifier();
-	return createFunction(functionName, [&]() {
-		Whiskers w;
-		if (_type.isDynamicallySized())
-		{
-			w = Whiskers(R"(
-				// <readableTypeName>
-				function <functionName>(offset, end) -> arrayPos, length {
-					if iszero(slt(add(offset, 0x1f), end)) { <revertStringOffset>() }
-					length := calldataload(offset)
-					if gt(length, 0xffffffffffffffff) { <revertStringLength>() }
-					arrayPos := add(offset, 0x20)
-					if gt(add(arrayPos, mul(length, <stride>)), end) { <revertStringPos>() }
-				}
-			)");
-			w("revertStringOffset", revertReasonIfDebugFunction("ABI decoding: invalid calldata array offset"));
-			w("revertStringLength", revertReasonIfDebugFunction("ABI decoding: invalid calldata array length"));
-		}
-		else
-		{
-			w = Whiskers(R"(
-				// <readableTypeName>
-				function <functionName>(offset, end) -> arrayPos {
-					arrayPos := offset
-					if gt(add(arrayPos, mul(<length>, <stride>)), end) { <revertStringPos>() }
-				}
-			)");
-			w("length", toCompactHexWithPrefix(_type.length()));
-		}
-		w("revertStringPos", revertReasonIfDebugFunction("ABI decoding: invalid calldata array stride"));
-		w("functionName", functionName);
-		w("readableTypeName", _type.toString(true));
-		w("stride", toCompactHexWithPrefix(_type.calldataStride()));
-
-		// TODO add test
-		return w.render();
-	});
-}
-
-std::string ABIFunctions::abiDecodingFunctionByteArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
-{
-	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-	solAssert(_type.isByteArrayOrString(), "");
-
-	std::string functionName =
-		"abi_decode_available_length_" +
-		_type.identifier() +
-		(_fromMemory ? "_fromMemory" : "");
-
-	return createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(src, length, end) -> array {
-				array := <allocate>(<allocationSize>(length))
-				mstore(array, length)
-				let dst := add(array, 0x20)
-				if gt(add(src, length), end) { <revertStringLength>() }
-				<copyToMemFun>(src, dst, length)
-			}
-		)");
-		templ("revertStringLength", revertReasonIfDebugFunction("ABI decoding: invalid byte array length"));
-		templ("functionName", functionName);
-		templ("allocate", m_utils.allocationFunction());
-		templ("allocationSize", m_utils.arrayAllocationSizeFunction(_type));
-		templ("copyToMemFun", m_utils.copyToMemoryFunction(!_fromMemory, /*cleanup*/true));
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiDecodingFunctionCalldataStruct(StructType const& _type)
-{
-	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	std::string functionName =
-		"abi_decode_" +
-		_type.identifier();
-
-	return createFunction(functionName, [&]() {
-		Whiskers w{R"(
-				// <readableTypeName>
-				function <functionName>(offset, end) -> value {
-					if slt(sub(end, offset), <minimumSize>) { <revertString>() }
-					value := offset
-				}
-		)"};
-		// TODO add test
-		w("revertString", revertReasonIfDebugFunction("ABI decoding: struct calldata too short"));
-		w("functionName", functionName);
-		w("readableTypeName", _type.toString(true));
-		w("minimumSize", std::to_string(_type.isDynamicallyEncoded() ? _type.calldataEncodedTailSize() : _type.calldataEncodedSize(true)));
-		return w.render();
-	});
-}
-
-std::string ABIFunctions::abiDecodingFunctionStruct(StructType const& _type, bool _fromMemory)
-{
-	solAssert(!_type.dataStoredIn(DataLocation::CallData), "");
-	std::string functionName =
-		"abi_decode_" +
-		_type.identifier() +
-		(_fromMemory ? "_fromMemory" : "");
-
-	return createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			// <readableTypeName>
-			function <functionName>(headStart, end) -> value {
-				if slt(sub(end, headStart), <minimumSize>) { <revertString>() }
-				value := <allocate>(<memorySize>)
-				<#members>
-				{
-					// <memberName>
-					<decode>
-				}
-				</members>
-			}
-		)");
-		// TODO add test
-		templ("revertString", revertReasonIfDebugFunction("ABI decoding: struct data too short"));
-		templ("functionName", functionName);
-		templ("readableTypeName", _type.toString(true));
-		templ("allocate", m_utils.allocationFunction());
-		solAssert(_type.memoryDataSize() < u256("0xffffffffffffffff"), "");
-		templ("memorySize", toCompactHexWithPrefix(_type.memoryDataSize()));
-		size_t headPos = 0;
-		std::vector<std::map<std::string, std::string>> members;
-		for (auto const& member: _type.members(nullptr))
-		{
-			solAssert(member.type, "");
-			solAssert(!member.type->containsNestedMapping(), "");
-			auto decodingType = member.type->decodingType();
-			solAssert(decodingType, "");
-			Whiskers memberTempl(R"(
-				<?dynamic>
-					let offset := <load>(add(headStart, <pos>))
-					if gt(offset, 0xffffffffffffffff) { <revertString>() }
-				<!dynamic>
-					let offset := <pos>
-				</dynamic>
-				mstore(add(value, <memoryOffset>), <abiDecode>(add(headStart, offset), end))
-			)");
-			memberTempl("dynamic", decodingType->isDynamicallyEncoded());
-			// TODO add test
-			memberTempl("revertString", revertReasonIfDebugFunction("ABI decoding: invalid struct offset"));
-			memberTempl("load", _fromMemory ? "mload" : "calldataload");
-			memberTempl("pos", std::to_string(headPos));
-			memberTempl("memoryOffset", toCompactHexWithPrefix(_type.memoryOffsetOfMember(member.name)));
-			memberTempl("abiDecode", abiDecodingFunction(*member.type, _fromMemory, false));
-
-			members.emplace_back();
-			members.back()["decode"] = memberTempl.render();
-			members.back()["memberName"] = member.name;
-			headPos += decodingType->calldataHeadSize();
-		}
-		templ("members", members);
-		templ("minimumSize", toCompactHexWithPrefix(headPos));
-		return templ.render();
-	});
-}
-
-std::string ABIFunctions::abiDecodingFunctionFunctionType(FunctionType const& _type, bool _fromMemory, bool _forUseOnStack)
-{
-	solAssert(_type.kind() == FunctionType::Kind::External, "");
-
-	std::string functionName =
-		"abi_decode_" +
-		_type.identifier() +
-		(_fromMemory ? "_fromMemory" : "") +
-		(_forUseOnStack ? "_onStack" : "");
-
-	return createFunction(functionName, [&]() {
-		if (_forUseOnStack)
-		{
-			return Whiskers(R"(
-				function <functionName>(offset, end) -> addr, function_selector {
-					addr, function_selector := <splitExtFun>(<decodeFun>(offset, end))
-				}
-			)")
-			("functionName", functionName)
-			("decodeFun", abiDecodingFunctionFunctionType(_type, _fromMemory, false))
-			("splitExtFun", m_utils.splitExternalFunctionIdFunction())
-			.render();
-		}
-		else
-		{
-			return Whiskers(R"(
-				function <functionName>(offset, end) -> fun {
-					fun := <load>(offset)
-					<validateExtFun>(fun)
-				}
-			)")
-			("functionName", functionName)
-			("load", _fromMemory ? "mload" : "calldataload")
-			("validateExtFun", m_utils.validatorFunction(_type, true))
-			.render();
-		}
-	});
-}
-
-std::string ABIFunctions::calldataAccessFunction(Type const& _type)
-{
-	solAssert(_type.isValueType() || _type.dataStoredIn(DataLocation::CallData), "");
-	std::string functionName = "calldata_access_" + _type.identifier();
-	return createFunction(functionName, [&]() {
-		if (_type.isDynamicallyEncoded())
-		{
-			unsigned int tailSize = _type.calldataEncodedTailSize();
-			solAssert(tailSize > 1, "");
-			Whiskers w(R"(
-				function <functionName>(base_ref, ptr) -> <return> {
-					let rel_offset_of_tail := calldataload(ptr)
-					if iszero(slt(rel_offset_of_tail, sub(sub(calldatasize(), base_ref), sub(<neededLength>, 1)))) { <revertStringOffset>() }
-					value := add(rel_offset_of_tail, base_ref)
-					<handleLength>
-				}
-			)");
-			if (_type.isDynamicallySized())
-			{
-				auto const* arrayType = dynamic_cast<ArrayType const*>(&_type);
-				solAssert(!!arrayType, "");
-				w("handleLength", Whiskers(R"(
-					length := calldataload(value)
-					value := add(value, 0x20)
-					if gt(length, 0xffffffffffffffff) { <revertStringLength>() }
-					if sgt(value, sub(calldatasize(), mul(length, <calldataStride>))) { <revertStringStride>() }
-				)")
-				("calldataStride", toCompactHexWithPrefix(arrayType->calldataStride()))
-				// TODO add test
-				("revertStringLength", revertReasonIfDebugFunction("Invalid calldata access length"))
-				// TODO add test
-				("revertStringStride", revertReasonIfDebugFunction("Invalid calldata access stride"))
-				.render());
-				w("return", "value, length");
-			}
-			else
-			{
-				w("handleLength", "");
-				w("return", "value");
-			}
-			w("neededLength", toCompactHexWithPrefix(tailSize));
-			w("functionName", functionName);
-			w("revertStringOffset", revertReasonIfDebugFunction("Invalid calldata access offset"));
-			return w.render();
-		}
-		else if (_type.isValueType())
-		{
-			std::string decodingFunction;
-			if (auto const* functionType = dynamic_cast<FunctionType const*>(&_type))
-				decodingFunction = abiDecodingFunctionFunctionType(*functionType, false, false);
-			else
-				decodingFunction = abiDecodingFunctionValueType(_type, false);
-			// Note that the second argument to the decoding function should be discarded after inlining.
-			return Whiskers(R"(
-				function <functionName>(baseRef, ptr) -> value {
-					value := <decodingFunction>(ptr, add(ptr, 32))
-				}
-			)")
-			("functionName", functionName)
-			("decodingFunction", decodingFunction)
-			.render();
-		}
-		else
-		{
-			solAssert(
-				_type.category() == Type::Category::Array ||
-				_type.category() == Type::Category::Struct,
-				""
-			);
-			return Whiskers(R"(
-				function <functionName>(baseRef, ptr) -> value {
-					value := ptr
-				}
-			)")
-			("functionName", functionName)
-			.render();
-		}
-	});
-}
-
-std::string ABIFunctions::arrayStoreLengthForEncodingFunction(ArrayType const& _type, EncodingOptions const& _options)
-{
-	std::string functionName = "array_storeLengthForEncoding_" + _type.identifier() + _options.toFunctionNameSuffix();
-	return createFunction(functionName, [&]() {
-		if (_type.isDynamicallySized() && !_options.dynamicInplace)
-			return Whiskers(R"(
-				function <functionName>(pos, length) -> updated_pos {
-					mstore(pos, length)
-					updated_pos := add(pos, 0x20)
-				}
-			)")
-			("functionName", functionName)
-			.render();
-		else
-			return Whiskers(R"(
-				function <functionName>(pos, length) -> updated_pos {
-					updated_pos := pos
-				}
-			)")
-			("functionName", functionName)
-			.render();
-	});
-}
-
-std::string ABIFunctions::createFunction(std::string const& _name, std::function<std::string ()> const& _creator)
-{
-	return m_functionCollector.createFunction(_name, _creator);
-}
-
-size_t ABIFunctions::headSize(TypePointers const& _targetTypes)
-{
-	size_t headSize = 0;
-	for (auto const& t: _targetTypes)
-		headSize += t->calldataHeadSize();
-
-	return headSize;
-}
-
-size_t ABIFunctions::numVariablesForType(Type const& _type, EncodingOptions const& _options)
-{
-	if (_type.category() == Type::Category::Function && !_options.encodeFunctionFromStack)
-		return 1;
-	else
-		return _type.sizeOnStack();
-}
-
-std::string ABIFunctions::revertReasonIfDebugFunction(std::string const& _message)
-{
-	return m_utils.revertReasonIfDebugFunction(_message);
-}
diff --git a/libsolidity/codegen/ABIFunctions.h b/libsolidity/codegen/ABIFunctions.h
deleted file mode 100644
index b7f7f8ae5735..000000000000
--- a/libsolidity/codegen/ABIFunctions.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <chris@ethereum.org>
- * @date 2017
- * Routines that generate Yul code related to ABI encoding, decoding and type conversions.
- */
-
-#pragma once
-
-#include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
-#include <libsolidity/codegen/YulUtilFunctions.h>
-
-#include <libsolidity/interface/DebugSettings.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <functional>
-#include <map>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-class Type;
-class ArrayType;
-class StructType;
-class FunctionType;
-using TypePointers = std::vector<Type const*>;
-
-/**
- * Class to generate encoding and decoding functions. Also maintains a collection
- * of "functions to be generated" in order to avoid generating the same function
- * multiple times.
- *
- * Make sure to include the result of ``requestedFunctions()`` to a block that
- * is visible from the code that was generated here, or use named labels.
- */
-class ABIFunctions
-{
-public:
-	explicit ABIFunctions(
-		langutil::EVMVersion _evmVersion,
-		RevertStrings _revertStrings,
-		MultiUseYulFunctionCollector& _functionCollector
-	):
-		m_evmVersion(_evmVersion),
-		m_revertStrings(_revertStrings),
-		m_functionCollector(_functionCollector),
-		m_utils(_evmVersion, m_revertStrings, m_functionCollector)
-	{}
-
-	/// @returns name of an assembly function to ABI-encode values of @a _givenTypes
-	/// into memory, converting the types to @a _targetTypes on the fly.
-	/// Parameters are: <headStart> <value_1> ... <value_n>, i.e.
-	/// the layout on the stack is <value_n> ... <value_1> <headStart> with
-	/// the top of the stack on the right.
-	/// The values represent stack slots. If a type occupies more or less than one
-	/// stack slot, it takes exactly that number of values.
-	/// Returns a pointer to the end of the area written in memory.
-	/// Does not allocate memory (does not change the free memory pointer), but writes
-	/// to memory starting at $headStart and an unrestricted amount after that.
-	/// If @reversed is true, the order of the variables after <headStart> is reversed.
-	std::string tupleEncoder(
-		TypePointers const& _givenTypes,
-		TypePointers _targetTypes,
-		bool _encodeAsLibraryTypes = false,
-		bool _reversed = false
-	);
-
-	/// Specialization of tupleEncoder to _reversed = true
-	std::string tupleEncoderReversed(
-		TypePointers const& _givenTypes,
-		TypePointers const& _targetTypes,
-		bool _encodeAsLibraryTypes = false
-	) {
-		return tupleEncoder(_givenTypes, _targetTypes, _encodeAsLibraryTypes, true);
-	}
-
-	/// @returns name of an assembly function to encode values of @a _givenTypes
-	/// with packed encoding into memory, converting the types to @a _targetTypes on the fly.
-	/// Parameters are: <memPos> <value_1> ... <value_n>, i.e.
-	/// the layout on the stack is <value_n> ... <value_1> <memPos> with
-	/// the top of the stack on the right.
-	/// The values represent stack slots. If a type occupies more or less than one
-	/// stack slot, it takes exactly that number of values.
-	/// Returns a pointer to the end of the area written in memory.
-	/// Does not allocate memory (does not change the free memory pointer), but writes
-	/// to memory starting at memPos and an unrestricted amount after that.
-	/// If @reversed is true, the order of the variables after <headStart> is reversed.
-	std::string tupleEncoderPacked(
-		TypePointers const& _givenTypes,
-		TypePointers _targetTypes,
-		bool _reversed = false
-	);
-
-	/// Specialization of tupleEncoderPacked to _reversed = true
-	std::string tupleEncoderPackedReversed(TypePointers const& _givenTypes, TypePointers const& _targetTypes)
-	{
-		return tupleEncoderPacked(_givenTypes, _targetTypes, true);
-	}
-
-	/// @returns name of an assembly function to ABI-decode values of @a _types
-	/// into memory. If @a _fromMemory is true, decodes from memory instead of
-	/// from calldata.
-	/// Can allocate memory.
-	/// Inputs: <source_offset> <source_end> (layout reversed on stack)
-	/// Outputs: <value0> <value1> ... <valuen>
-	/// The values represent stack slots. If a type occupies more or less than one
-	/// stack slot, it takes exactly that number of values.
-	std::string tupleDecoder(TypePointers const& _types, bool _fromMemory = false);
-
-	struct EncodingOptions
-	{
-		/// Pad/signextend value types and bytes/string to multiples of 32 bytes.
-		/// If false, data is always left-aligned.
-		/// Note that this is always re-set to true for the elements of arrays and structs.
-		bool padded = true;
-		/// Store arrays and structs in place without "data pointer" and do not store the length.
-		bool dynamicInplace = false;
-		/// Only for external function types: The value is a pair of address / function id instead
-		/// of a memory pointer to the compression representation.
-		bool encodeFunctionFromStack = false;
-		/// Encode storage pointers as storage pointers (we are targeting a library call).
-		bool encodeAsLibraryTypes = false;
-
-		/// @returns a string to uniquely identify the encoding options for the encoding
-		/// function name. Skips everything that has its default value.
-		std::string toFunctionNameSuffix() const;
-	};
-
-	/// Internal encoding function that is also used by some copying routines.
-	/// @returns the name of the ABI encoding function with the given type
-	/// and queues the generation of the function to the requested functions.
-	/// @param _fromStack if false, the input value was just loaded from storage
-	/// or memory and thus might be compacted into a single slot (depending on the type).
-	std::string abiEncodingFunction(
-		Type const& _givenType,
-		Type const& _targetType,
-		EncodingOptions const& _options
-	);
-	/// Internal encoding function that is also used by some copying routines.
-	/// @returns the name of a function that internally calls `abiEncodingFunction`
-	/// but always returns the updated encoding position, even if the type is
-	/// statically encoded.
-	std::string abiEncodeAndReturnUpdatedPosFunction(
-		Type const& _givenType,
-		Type const& _targetType,
-		EncodingOptions const& _options
-	);
-
-	/// Decodes array in case of dynamic arrays with offset pointing to
-	/// data and length already on stack
-	/// signature: (dataOffset, length, dataEnd) -> decodedArray
-	std::string abiDecodingFunctionArrayAvailableLength(ArrayType const& _type, bool _fromMemory);
-
-	/// Internal decoding function that is also used by some copying routines.
-	/// @returns the name of a function that decodes structs.
-	/// signature: (dataStart, dataEnd) -> decodedStruct
-	std::string abiDecodingFunctionStruct(StructType const& _type, bool _fromMemory);
-
-private:
-	/// Part of @a abiEncodingFunction for array target type and given calldata array.
-	/// Uses calldatacopy and does not perform cleanup or validation and can therefore only
-	/// be used for byte arrays and arrays with the base type uint256 or bytes32.
-	std::string abiEncodingFunctionCalldataArrayWithoutCleanup(
-		Type const& _givenType,
-		Type const& _targetType,
-		EncodingOptions const& _options
-	);
-	/// Part of @a abiEncodingFunction for array target type and given memory array or
-	/// a given storage array with every item occupies one or multiple full slots.
-	std::string abiEncodingFunctionSimpleArray(
-		ArrayType const& _givenType,
-		ArrayType const& _targetType,
-		EncodingOptions const& _options
-	);
-	std::string abiEncodingFunctionMemoryByteArray(
-		ArrayType const& _givenType,
-		ArrayType const& _targetType,
-		EncodingOptions const& _options
-	);
-	/// Part of @a abiEncodingFunction for array target type and given storage array
-	/// where multiple items are packed into the same storage slot.
-	std::string abiEncodingFunctionCompactStorageArray(
-		ArrayType const& _givenType,
-		ArrayType const& _targetType,
-		EncodingOptions const& _options
-	);
-
-	/// Part of @a abiEncodingFunction for struct types.
-	std::string abiEncodingFunctionStruct(
-		StructType const& _givenType,
-		StructType const& _targetType,
-		EncodingOptions const& _options
-	);
-
-	// @returns the name of the ABI encoding function with the given type
-	// and queues the generation of the function to the requested functions.
-	// Case for _givenType being a string literal
-	std::string abiEncodingFunctionStringLiteral(
-		Type const& _givenType,
-		Type const& _targetType,
-		EncodingOptions const& _options
-	);
-
-	std::string abiEncodingFunctionFunctionType(
-		FunctionType const& _from,
-		Type const& _to,
-		EncodingOptions const& _options
-	);
-
-	/// @returns the name of the ABI decoding function for the given type
-	/// and queues the generation of the function to the requested functions.
-	/// The caller has to ensure that no out of bounds access (at least to the static
-	/// part) can happen inside this function.
-	/// @param _fromMemory if decoding from memory instead of from calldata
-	/// @param _forUseOnStack if the decoded value is stored on stack or in memory.
-	std::string abiDecodingFunction(
-		Type const& _type,
-		bool _fromMemory,
-		bool _forUseOnStack
-	);
-
-	/// Part of @a abiDecodingFunction for value types.
-	std::string abiDecodingFunctionValueType(Type const& _type, bool _fromMemory);
-	/// Part of @a abiDecodingFunction for "regular" array types.
-	std::string abiDecodingFunctionArray(ArrayType const& _type, bool _fromMemory);
-	/// Part of @a abiDecodingFunction for calldata array types.
-	std::string abiDecodingFunctionCalldataArray(ArrayType const& _type);
-	/// Part of @a abiDecodingFunctionArrayAvailableLength
-	std::string abiDecodingFunctionByteArrayAvailableLength(ArrayType const& _type, bool _fromMemory);
-	/// Part of @a abiDecodingFunction for calldata struct types.
-	std::string abiDecodingFunctionCalldataStruct(StructType const& _type);
-	/// Part of @a abiDecodingFunction for array types.
-	std::string abiDecodingFunctionFunctionType(FunctionType const& _type, bool _fromMemory, bool _forUseOnStack);
-	/// @returns the name of a function that retrieves an element from calldata.
-	std::string calldataAccessFunction(Type const& _type);
-
-	/// @returns the name of a function used during encoding that stores the length
-	/// if the array is dynamically sized (and the options do not request in-place encoding).
-	/// It returns the new encoding position.
-	/// If the array is not dynamically sized (or in-place encoding was requested),
-	/// does nothing and just returns the position again.
-	std::string arrayStoreLengthForEncodingFunction(ArrayType const& _type, EncodingOptions const& _options);
-
-	/// Helper function that uses @a _creator to create a function and add it to
-	/// @a m_requestedFunctions if it has not been created yet and returns @a _name in both
-	/// cases.
-	std::string createFunction(std::string const& _name, std::function<std::string()> const& _creator);
-
-	/// @returns the size of the static part of the encoding of the given types.
-	static size_t headSize(TypePointers const& _targetTypes);
-
-	/// @returns the number of variables needed to store a type.
-	/// This is one for almost all types. The exception being dynamically sized calldata arrays or
-	/// external function types (if we are encoding from stack, i.e. _options.encodeFunctionFromStack
-	/// is true), for which it is two.
-	static size_t numVariablesForType(Type const& _type, EncodingOptions const& _options);
-
-	/// @returns the name of a function that uses @param _message for revert reason
-	/// if m_revertStrings is debug.
-	std::string revertReasonIfDebugFunction(std::string const& _message = "");
-
-	langutil::EVMVersion m_evmVersion;
-	RevertStrings const m_revertStrings;
-	MultiUseYulFunctionCollector& m_functionCollector;
-	YulUtilFunctions m_utils;
-};
-
-}
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
deleted file mode 100644
index afcc38fe8a11..000000000000
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Code generation utils that handle arrays.
- */
-
-#include <libsolidity/codegen/ArrayUtils.h>
-
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/codegen/LValue.h>
-
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StackTooDeepString.h>
-
-#include <libevmasm/Instruction.h>
-#include <liblangutil/Exceptions.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType const& _sourceType) const
-{
-	// this copies source to target and also clears target if it was larger
-	// need to leave "target_ref target_byte_off" on the stack at the end
-
-	// stack layout: [source_ref] [source length] target_ref (top)
-	solAssert(_targetType.location() == DataLocation::Storage, "");
-
-	Type const* targetBaseType = _targetType.baseType();
-	Type const* sourceBaseType = _sourceType.baseType();
-
-	// TODO unroll loop for small sizes
-
-	bool sourceIsStorage = _sourceType.location() == DataLocation::Storage;
-	bool fromCalldata = _sourceType.location() == DataLocation::CallData;
-	bool directCopy = sourceIsStorage && sourceBaseType->isValueType() && *sourceBaseType == *targetBaseType;
-	bool haveByteOffsetSource = !directCopy && sourceIsStorage && sourceBaseType->storageBytes() <= 16;
-	bool haveByteOffsetTarget = !directCopy && targetBaseType->storageBytes() <= 16;
-	unsigned byteOffsetSize = (haveByteOffsetSource ? 1u : 0u) + (haveByteOffsetTarget ? 1u : 0u);
-
-	// stack: source_ref [source_length] target_ref
-	// store target_ref
-	for (unsigned i = _sourceType.sizeOnStack(); i > 0; --i)
-		m_context << swapInstruction(i);
-	// stack: target_ref source_ref [source_length]
-
-	if (_targetType.isByteArrayOrString())
-	{
-		// stack: target_ref source_ref [source_length]
-		if (fromCalldata && _sourceType.isDynamicallySized())
-		{
-			// stack: target_ref source_ref source_length
-			m_context << Instruction::SWAP1;
-			// stack: target_ref source_length source_ref
-			m_context << Instruction::DUP3;
-			// stack: target_ref source_length source_ref target_ref
-			m_context.callYulFunction(
-				m_context.utilFunctions().copyByteArrayToStorageFunction(_sourceType, _targetType),
-				3,
-				0
-			);
-		}
-		else
-		{
-			// stack: target_ref source_ref
-			m_context << Instruction::DUP2;
-			// stack: target_ref source_ref target_ref
-			m_context.callYulFunction(
-				m_context.utilFunctions().copyByteArrayToStorageFunction(_sourceType, _targetType),
-				2,
-				0
-			);
-		}
-		// stack: target_ref
-		return;
-	}
-
-	// retrieve source length
-	if (_sourceType.location() != DataLocation::CallData || !_sourceType.isDynamicallySized())
-		retrieveLength(_sourceType); // otherwise, length is already there
-	if (_sourceType.location() == DataLocation::Memory && _sourceType.isDynamicallySized())
-	{
-		// increment source pointer to point to data
-		m_context << Instruction::SWAP1 << u256(0x20);
-		m_context << Instruction::ADD << Instruction::SWAP1;
-	}
-
-	// stack: target_ref source_ref source_length
-	Type const* targetType = &_targetType;
-	Type const* sourceType = &_sourceType;
-	m_context.callLowLevelFunction(
-		"$copyArrayToStorage_" + sourceType->identifier() + "_to_" + targetType->identifier(),
-		3,
-		1,
-		[=](CompilerContext& _context)
-		{
-			ArrayUtils utils(_context);
-			ArrayType const& _sourceType = dynamic_cast<ArrayType const&>(*sourceType);
-			ArrayType const& _targetType = dynamic_cast<ArrayType const&>(*targetType);
-			// stack: target_ref source_ref source_length
-			_context << Instruction::DUP3;
-			// stack: target_ref source_ref source_length target_ref
-			utils.retrieveLength(_targetType);
-			// stack: target_ref source_ref source_length target_ref target_length
-			if (_targetType.isDynamicallySized())
-			{
-				// store new target length
-				solAssert(!_targetType.isByteArrayOrString());
-				_context << Instruction::DUP3 << Instruction::DUP3 << Instruction::SSTORE;
-			}
-			if (sourceBaseType->category() == Type::Category::Mapping)
-			{
-				solAssert(targetBaseType->category() == Type::Category::Mapping, "");
-				solAssert(_sourceType.location() == DataLocation::Storage, "");
-				// nothing to copy
-				_context
-					<< Instruction::POP << Instruction::POP
-					<< Instruction::POP << Instruction::POP;
-				return;
-			}
-			// stack: target_ref source_ref source_length target_ref target_length
-			// compute hashes (data positions)
-			_context << Instruction::SWAP1;
-			if (_targetType.isDynamicallySized())
-				CompilerUtils(_context).computeHashStatic();
-			// stack: target_ref source_ref source_length target_length target_data_pos
-			_context << Instruction::SWAP1;
-			utils.convertLengthToSize(_targetType);
-			_context << Instruction::DUP2 << Instruction::ADD;
-			// stack: target_ref source_ref source_length target_data_pos target_data_end
-			_context << Instruction::SWAP3;
-			// stack: target_ref target_data_end source_length target_data_pos source_ref
-
-			evmasm::AssemblyItem copyLoopEndWithoutByteOffset = _context.newTag();
-			solAssert(!_targetType.isByteArrayOrString());
-			// skip copying if source length is zero
-			_context << Instruction::DUP3 << Instruction::ISZERO;
-			_context.appendConditionalJumpTo(copyLoopEndWithoutByteOffset);
-
-			if (_sourceType.location() == DataLocation::Storage && _sourceType.isDynamicallySized())
-				CompilerUtils(_context).computeHashStatic();
-			// stack: target_ref target_data_end source_length target_data_pos source_data_pos
-			_context << Instruction::SWAP2;
-			utils.convertLengthToSize(_sourceType);
-			_context << Instruction::DUP3 << Instruction::ADD;
-			// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end
-			if (haveByteOffsetTarget)
-				_context << u256(0);
-			if (haveByteOffsetSource)
-				_context << u256(0);
-			// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end [target_byte_offset] [source_byte_offset]
-			evmasm::AssemblyItem copyLoopStart = _context.newTag();
-			_context << copyLoopStart;
-			// check for loop condition
-			_context
-				<< dupInstruction(3 + byteOffsetSize) << dupInstruction(2 + byteOffsetSize)
-				<< Instruction::GT << Instruction::ISZERO;
-			evmasm::AssemblyItem copyLoopEnd = _context.appendConditionalJump();
-			// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end [target_byte_offset] [source_byte_offset]
-			// copy
-			if (sourceBaseType->category() == Type::Category::Array)
-			{
-				solAssert(byteOffsetSize == 0, "Byte offset for array as base type.");
-				auto const& sourceBaseArrayType = dynamic_cast<ArrayType const&>(*sourceBaseType);
-
-				solUnimplementedAssert(
-					_sourceType.location() != DataLocation::CallData ||
-					!_sourceType.isDynamicallyEncoded() ||
-					!sourceBaseArrayType.isDynamicallySized(),
-					"Copying nested calldata dynamic arrays to storage is not implemented in the old code generator."
-				);
-				_context << Instruction::DUP3;
-				if (sourceBaseArrayType.location() == DataLocation::Memory)
-					_context << Instruction::MLOAD;
-				_context << Instruction::DUP3;
-				utils.copyArrayToStorage(dynamic_cast<ArrayType const&>(*targetBaseType), sourceBaseArrayType);
-				_context << Instruction::POP;
-			}
-			else if (directCopy)
-			{
-				solAssert(byteOffsetSize == 0, "Byte offset for direct copy.");
-				_context
-					<< Instruction::DUP3 << Instruction::SLOAD
-					<< Instruction::DUP3 << Instruction::SSTORE;
-			}
-			else
-			{
-				// Note that we have to copy each element on its own in case conversion is involved.
-				// We might copy too much if there is padding at the last element, but this way end
-				// checking is easier.
-				// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end [target_byte_offset] [source_byte_offset]
-				_context << dupInstruction(3 + byteOffsetSize);
-				if (_sourceType.location() == DataLocation::Storage)
-				{
-					if (haveByteOffsetSource)
-						_context << Instruction::DUP2;
-					else
-						_context << u256(0);
-					StorageItem(_context, *sourceBaseType).retrieveValue(SourceLocation(), true);
-				}
-				else if (sourceBaseType->isValueType())
-					CompilerUtils(_context).loadFromMemoryDynamic(*sourceBaseType, fromCalldata, true, false);
-				else
-					solUnimplemented("Copying of type " + _sourceType.toString(false) + " to storage not yet supported.");
-				// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end [target_byte_offset] [source_byte_offset] <source_value>...
-				assertThrow(
-					2 + byteOffsetSize + sourceBaseType->sizeOnStack() <= 16,
-					StackTooDeepError,
-					util::stackTooDeepString
-				);
-				// fetch target storage reference
-				_context << dupInstruction(2 + byteOffsetSize + sourceBaseType->sizeOnStack());
-				if (haveByteOffsetTarget)
-					_context << dupInstruction(1 + byteOffsetSize + sourceBaseType->sizeOnStack());
-				else
-					_context << u256(0);
-				StorageItem(_context, *targetBaseType).storeValue(*sourceBaseType, SourceLocation(), true);
-			}
-			// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end [target_byte_offset] [source_byte_offset]
-			// increment source
-			if (haveByteOffsetSource)
-				utils.incrementByteOffset(sourceBaseType->storageBytes(), 1, haveByteOffsetTarget ? 5 : 4);
-			else
-			{
-				_context << swapInstruction(2 + byteOffsetSize);
-				if (sourceIsStorage)
-					_context << sourceBaseType->storageSize();
-				else if (_sourceType.location() == DataLocation::Memory)
-					_context << sourceBaseType->memoryHeadSize();
-				else
-					_context << sourceBaseType->calldataHeadSize();
-				_context
-					<< Instruction::ADD
-					<< swapInstruction(2 + byteOffsetSize);
-			}
-			// increment target
-			if (haveByteOffsetTarget)
-				utils.incrementByteOffset(targetBaseType->storageBytes(), byteOffsetSize, byteOffsetSize + 2);
-			else
-				_context
-					<< swapInstruction(1 + byteOffsetSize)
-					<< targetBaseType->storageSize()
-					<< Instruction::ADD
-					<< swapInstruction(1 + byteOffsetSize);
-			_context.appendJumpTo(copyLoopStart);
-			_context << copyLoopEnd;
-			if (haveByteOffsetTarget)
-			{
-				// clear elements that might be left over in the current slot in target
-				// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end target_byte_offset [source_byte_offset]
-				_context << dupInstruction(byteOffsetSize) << Instruction::ISZERO;
-				evmasm::AssemblyItem copyCleanupLoopEnd = _context.appendConditionalJump();
-				_context << dupInstruction(2 + byteOffsetSize) << dupInstruction(1 + byteOffsetSize);
-				StorageItem(_context, *targetBaseType).setToZero(SourceLocation(), true);
-				utils.incrementByteOffset(targetBaseType->storageBytes(), byteOffsetSize, byteOffsetSize + 2);
-				_context.appendJumpTo(copyLoopEnd);
-
-				_context << copyCleanupLoopEnd;
-				_context << Instruction::POP; // might pop the source, but then target is popped next
-			}
-			if (haveByteOffsetSource)
-				_context << Instruction::POP;
-			_context << copyLoopEndWithoutByteOffset;
-
-			// zero-out leftovers in target
-			// stack: target_ref target_data_end source_data_pos target_data_pos_updated source_data_end
-			_context << Instruction::POP << Instruction::SWAP1 << Instruction::POP;
-			// stack: target_ref target_data_end target_data_pos_updated
-			if (targetBaseType->storageBytes() < 32)
-				utils.clearStorageLoop(TypeProvider::uint256());
-			else
-				utils.clearStorageLoop(targetBaseType);
-			_context << Instruction::POP;
-		}
-	);
-}
-
-void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWordBoundaries) const
-{
-	solUnimplementedAssert(
-		!_sourceType.baseType()->isDynamicallySized(),
-		"Nested dynamic arrays not implemented here."
-	);
-	CompilerUtils utils(m_context);
-
-	if (_sourceType.location() == DataLocation::CallData)
-	{
-		if (!_sourceType.isDynamicallySized())
-			m_context << _sourceType.length();
-		if (!_sourceType.isByteArrayOrString())
-			convertLengthToSize(_sourceType);
-
-		std::string routine = "calldatacopy(target, source, len)\n";
-		if (_padToWordBoundaries)
-			routine += R"(
-				// Set padding suffix to zero
-				mstore(add(target, len), 0)
-				len := and(add(len, 0x1f), not(0x1f))
-			)";
-		routine += "target := add(target, len)\n";
-		m_context.appendInlineAssembly("{" + routine + "}", {"target", "source", "len"});
-		m_context << Instruction::POP << Instruction::POP;
-	}
-	else if (_sourceType.location() == DataLocation::Memory)
-	{
-		retrieveLength(_sourceType);
-		// stack: target source length
-		if (!_sourceType.baseType()->isValueType())
-		{
-			// copy using a loop
-			m_context << u256(0) << Instruction::SWAP3;
-			// stack: counter source length target
-			auto repeat = m_context.newTag();
-			m_context << repeat;
-			m_context << Instruction::DUP2 << Instruction::DUP5;
-			m_context << Instruction::LT << Instruction::ISZERO;
-			auto loopEnd = m_context.appendConditionalJump();
-			m_context << Instruction::DUP3 << Instruction::DUP5;
-			accessIndex(_sourceType, false);
-			MemoryItem(m_context, *_sourceType.baseType(), true).retrieveValue(SourceLocation(), true);
-			if (auto baseArray = dynamic_cast<ArrayType const*>(_sourceType.baseType()))
-				copyArrayToMemory(*baseArray, _padToWordBoundaries);
-			else
-				utils.storeInMemoryDynamic(*_sourceType.baseType());
-			m_context << Instruction::SWAP3 << u256(1) << Instruction::ADD;
-			m_context << Instruction::SWAP3;
-			m_context.appendJumpTo(repeat);
-			m_context << loopEnd;
-			m_context << Instruction::SWAP3;
-			utils.popStackSlots(3);
-			// stack: updated_target_pos
-			return;
-		}
-
-		// memcpy using the built-in contract
-		if (_sourceType.isDynamicallySized())
-		{
-			// change pointer to data part
-			m_context << Instruction::SWAP1 << u256(32) << Instruction::ADD;
-			m_context << Instruction::SWAP1;
-		}
-		if (!_sourceType.isByteArrayOrString())
-			convertLengthToSize(_sourceType);
-		// stack: <target> <source> <size>
-		m_context << Instruction::DUP1 << Instruction::DUP4 << Instruction::DUP4;
-		// We can resort to copying full 32 bytes only if
-		// - the length is known to be a multiple of 32 or
-		// - we will pad to full 32 bytes later anyway.
-		if (!_sourceType.isByteArrayOrString() || _padToWordBoundaries)
-			utils.memoryCopy32();
-		else
-			utils.memoryCopy();
-
-		m_context << Instruction::SWAP1 << Instruction::POP;
-		// stack: <target> <size>
-
-		bool paddingNeeded = _padToWordBoundaries && _sourceType.isByteArrayOrString();
-
-		if (paddingNeeded)
-		{
-			// stack: <target> <size>
-			m_context << Instruction::SWAP1 << Instruction::DUP2 << Instruction::ADD;
-			// stack: <length> <target + size>
-			m_context << Instruction::SWAP1 << u256(31) << Instruction::AND;
-			// stack: <target + size> <remainder = size % 32>
-			evmasm::AssemblyItem skip = m_context.newTag();
-			if (_sourceType.isDynamicallySized())
-			{
-				m_context << Instruction::DUP1 << Instruction::ISZERO;
-				m_context.appendConditionalJumpTo(skip);
-			}
-			// round off, load from there.
-			// stack <target + size> <remainder = size % 32>
-			m_context << Instruction::DUP1 << Instruction::DUP3;
-			m_context << Instruction::SUB;
-			// stack: target+size remainder <target + size - remainder>
-			m_context << Instruction::DUP1 << Instruction::MLOAD;
-			// Now we AND it with ~(2**(8 * (32 - remainder)) - 1)
-			m_context << u256(1);
-			m_context << Instruction::DUP4 << u256(32) << Instruction::SUB;
-			// stack: ...<v> 1 <32 - remainder>
-			m_context << u256(0x100) << Instruction::EXP << Instruction::SUB;
-			m_context << Instruction::NOT << Instruction::AND;
-			// stack: target+size remainder target+size-remainder <v & ...>
-			m_context << Instruction::DUP2 << Instruction::MSTORE;
-			// stack: target+size remainder target+size-remainder
-			m_context << u256(32) << Instruction::ADD;
-			// stack: target+size remainder <new_padded_end>
-			m_context << Instruction::SWAP2 << Instruction::POP;
-
-			if (_sourceType.isDynamicallySized())
-				m_context << skip.tag();
-			// stack <target + "size"> <remainder = size % 32>
-			m_context << Instruction::POP;
-		}
-		else
-			// stack: <target> <size>
-			m_context << Instruction::ADD;
-	}
-	else
-	{
-		solAssert(_sourceType.location() == DataLocation::Storage, "");
-		unsigned storageBytes = _sourceType.baseType()->storageBytes();
-		u256 storageSize = _sourceType.baseType()->storageSize();
-		solAssert(storageSize > 1 || (storageSize == 1 && storageBytes > 0), "");
-
-		retrieveLength(_sourceType);
-		// stack here: memory_offset storage_offset length
-		// jump to end if length is zero
-		m_context << Instruction::DUP1 << Instruction::ISZERO;
-		evmasm::AssemblyItem loopEnd = m_context.appendConditionalJump();
-		// Special case for tightly-stored byte arrays
-		if (_sourceType.isByteArrayOrString())
-		{
-			// stack here: memory_offset storage_offset length
-			m_context << Instruction::DUP1 << u256(31) << Instruction::LT;
-			evmasm::AssemblyItem longByteArray = m_context.appendConditionalJump();
-			// store the short byte array (discard lower-order byte)
-			m_context << u256(0x100) << Instruction::DUP1;
-			m_context << Instruction::DUP4 << Instruction::SLOAD;
-			m_context << Instruction::DIV << Instruction::MUL;
-			m_context << Instruction::DUP4 << Instruction::MSTORE;
-			// stack here: memory_offset storage_offset length
-			// add 32 or length to memory offset
-			m_context << Instruction::SWAP2;
-			if (_padToWordBoundaries)
-				m_context << u256(32);
-			else
-				m_context << Instruction::DUP3;
-			m_context << Instruction::ADD;
-			m_context << Instruction::SWAP2;
-			m_context.appendJumpTo(loopEnd);
-			m_context << longByteArray;
-		}
-		else
-			// convert length to memory size
-			m_context << _sourceType.baseType()->memoryHeadSize() << Instruction::MUL;
-
-		m_context << Instruction::DUP3 << Instruction::ADD << Instruction::SWAP2;
-		if (_sourceType.isDynamicallySized())
-		{
-			// actual array data is stored at KECCAK256(storage_offset)
-			m_context << Instruction::SWAP1;
-			utils.computeHashStatic();
-			m_context << Instruction::SWAP1;
-		}
-
-		// stack here: memory_end_offset storage_data_offset memory_offset
-		bool haveByteOffset = !_sourceType.isByteArrayOrString() && storageBytes <= 16;
-		if (haveByteOffset)
-			m_context << u256(0) << Instruction::SWAP1;
-		// stack here: memory_end_offset storage_data_offset [storage_byte_offset] memory_offset
-		evmasm::AssemblyItem loopStart = m_context.newTag();
-		m_context << loopStart;
-		// load and store
-		if (_sourceType.isByteArrayOrString())
-		{
-			// Packed both in storage and memory.
-			m_context << Instruction::DUP2 << Instruction::SLOAD;
-			m_context << Instruction::DUP2 << Instruction::MSTORE;
-			// increment storage_data_offset by 1
-			m_context << Instruction::SWAP1 << u256(1) << Instruction::ADD;
-			// increment memory offset by 32
-			m_context << Instruction::SWAP1 << u256(32) << Instruction::ADD;
-		}
-		else
-		{
-			// stack here: memory_end_offset storage_data_offset [storage_byte_offset] memory_offset
-			if (haveByteOffset)
-				m_context << Instruction::DUP3 << Instruction::DUP3;
-			else
-				m_context << Instruction::DUP2 << u256(0);
-			StorageItem(m_context, *_sourceType.baseType()).retrieveValue(SourceLocation(), true);
-			if (auto baseArray = dynamic_cast<ArrayType const*>(_sourceType.baseType()))
-				copyArrayToMemory(*baseArray, _padToWordBoundaries);
-			else
-				utils.storeInMemoryDynamic(*_sourceType.baseType());
-			// increment storage_data_offset and byte offset
-			if (haveByteOffset)
-				incrementByteOffset(storageBytes, 2, 3);
-			else
-			{
-				m_context << Instruction::SWAP1;
-				m_context << storageSize << Instruction::ADD;
-				m_context << Instruction::SWAP1;
-			}
-		}
-		// check for loop condition
-		m_context << Instruction::DUP1 << dupInstruction(haveByteOffset ? 5 : 4);
-		m_context << Instruction::GT;
-		m_context.appendConditionalJumpTo(loopStart);
-		// stack here: memory_end_offset storage_data_offset [storage_byte_offset] memory_offset
-		if (haveByteOffset)
-			m_context << Instruction::SWAP1 << Instruction::POP;
-		if (!_sourceType.isByteArrayOrString())
-		{
-			solAssert(_sourceType.calldataStride() % 32 == 0, "");
-			solAssert(_sourceType.memoryStride() % 32 == 0, "");
-		}
-		if (_padToWordBoundaries && _sourceType.isByteArrayOrString())
-		{
-			// memory_end_offset - start is the actual length (we want to compute the ceil of).
-			// memory_offset - start is its next multiple of 32, but it might be off by 32.
-			// so we compute: memory_end_offset += (memory_offset - memory_end_offest) & 31
-			m_context << Instruction::DUP3 << Instruction::SWAP1 << Instruction::SUB;
-			m_context << u256(31) << Instruction::AND;
-			m_context << Instruction::DUP3 << Instruction::ADD;
-			m_context << Instruction::SWAP2;
-		}
-		m_context << loopEnd << Instruction::POP << Instruction::POP;
-	}
-}
-
-void ArrayUtils::clearArray(ArrayType const& _typeIn) const
-{
-	Type const* type = &_typeIn;
-	m_context.callLowLevelFunction(
-		"$clearArray_" + _typeIn.identifier(),
-		2,
-		0,
-		[type](CompilerContext& _context)
-		{
-			ArrayType const& _type = dynamic_cast<ArrayType const&>(*type);
-			unsigned stackHeightStart = _context.stackHeight();
-			solAssert(_type.location() == DataLocation::Storage, "");
-			if (_type.baseType()->storageBytes() < 32)
-			{
-				solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
-				solAssert(_type.baseType()->storageSize() <= 1, "Invalid storage size for type.");
-			}
-			if (_type.baseType()->isValueType())
-				solAssert(_type.baseType()->storageSize() <= 1, "Invalid size for value type.");
-
-			_context << Instruction::POP; // remove byte offset
-			if (_type.isDynamicallySized())
-				ArrayUtils(_context).clearDynamicArray(_type);
-			else if (_type.length() == 0 || _type.baseType()->category() == Type::Category::Mapping)
-				_context << Instruction::POP;
-			else if (_type.baseType()->isValueType() && _type.storageSize() <= 5)
-			{
-				// unroll loop for small arrays @todo choose a good value
-				// Note that we loop over storage slots here, not elements.
-				for (unsigned i = 1; i < _type.storageSize(); ++i)
-					_context
-						<< u256(0) << Instruction::DUP2 << Instruction::SSTORE
-						<< u256(1) << Instruction::ADD;
-				_context << u256(0) << Instruction::SWAP1 << Instruction::SSTORE;
-			}
-			else if (!_type.baseType()->isValueType() && _type.length() <= 4)
-			{
-				// unroll loop for small arrays @todo choose a good value
-				solAssert(_type.baseType()->storageBytes() >= 32, "Invalid storage size.");
-				for (unsigned i = 1; i < _type.length(); ++i)
-				{
-					_context << u256(0);
-					StorageItem(_context, *_type.baseType()).setToZero(SourceLocation(), false);
-					_context
-						<< Instruction::POP
-						<< u256(_type.baseType()->storageSize()) << Instruction::ADD;
-				}
-				_context << u256(0);
-				StorageItem(_context, *_type.baseType()).setToZero(SourceLocation(), true);
-			}
-			else
-			{
-				_context << Instruction::DUP1 << _type.length();
-				ArrayUtils(_context).convertLengthToSize(_type);
-				_context << Instruction::ADD << Instruction::SWAP1;
-				if (_type.baseType()->storageBytes() < 32)
-					ArrayUtils(_context).clearStorageLoop(TypeProvider::uint256());
-				else
-					ArrayUtils(_context).clearStorageLoop(_type.baseType());
-				_context << Instruction::POP;
-			}
-			solAssert(_context.stackHeight() == stackHeightStart - 2, "");
-		}
-	);
-}
-
-void ArrayUtils::clearDynamicArray(ArrayType const& _type) const
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-
-	// fetch length
-	retrieveLength(_type);
-	// set length to zero
-	m_context << u256(0) << Instruction::DUP3 << Instruction::SSTORE;
-	// Special case: short byte arrays are stored togeher with their length
-	evmasm::AssemblyItem endTag = m_context.newTag();
-	if (_type.isByteArrayOrString())
-	{
-		// stack: ref old_length
-		m_context << Instruction::DUP1 << u256(31) << Instruction::LT;
-		evmasm::AssemblyItem longByteArray = m_context.appendConditionalJump();
-		m_context << Instruction::POP;
-		m_context.appendJumpTo(endTag);
-		m_context.adjustStackOffset(1); // needed because of jump
-		m_context << longByteArray;
-	}
-	// stack: ref old_length
-	convertLengthToSize(_type);
-	// compute data positions
-	m_context << Instruction::SWAP1;
-	CompilerUtils(m_context).computeHashStatic();
-	// stack: len data_pos
-	m_context << Instruction::SWAP1 << Instruction::DUP2 << Instruction::ADD
-		<< Instruction::SWAP1;
-	// stack: data_pos_end data_pos
-	if (_type.storageStride() < 32)
-		clearStorageLoop(TypeProvider::uint256());
-	else
-		clearStorageLoop(_type.baseType());
-	// cleanup
-	m_context << endTag;
-	m_context << Instruction::POP;
-}
-
-void ArrayUtils::resizeDynamicArray(ArrayType const& _typeIn) const
-{
-	Type const* type = &_typeIn;
-	m_context.callLowLevelFunction(
-		"$resizeDynamicArray_" + _typeIn.identifier(),
-		2,
-		0,
-		[type](CompilerContext& _context)
-		{
-			ArrayType const& _type = dynamic_cast<ArrayType const&>(*type);
-			solAssert(_type.location() == DataLocation::Storage, "");
-			solAssert(_type.isDynamicallySized(), "");
-			if (!_type.isByteArrayOrString() && _type.baseType()->storageBytes() < 32)
-				solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
-
-			unsigned stackHeightStart = _context.stackHeight();
-			evmasm::AssemblyItem resizeEnd = _context.newTag();
-
-			// stack: ref new_length
-			// fetch old length
-			ArrayUtils(_context).retrieveLength(_type, 1);
-			// stack: ref new_length old_length
-			solAssert(_context.stackHeight() - stackHeightStart == 3 - 2, "2");
-
-			// Special case for short byte arrays, they are stored together with their length
-			if (_type.isByteArrayOrString())
-			{
-				evmasm::AssemblyItem regularPath = _context.newTag();
-				// We start by a large case-distinction about the old and new length of the byte array.
-
-				_context << Instruction::DUP3 << Instruction::SLOAD;
-				// stack: ref new_length current_length ref_value
-
-				solAssert(_context.stackHeight() - stackHeightStart == 4 - 2, "3");
-				_context << Instruction::DUP2 << u256(31) << Instruction::LT;
-				evmasm::AssemblyItem currentIsLong = _context.appendConditionalJump();
-				_context << Instruction::DUP3 << u256(31) << Instruction::LT;
-				evmasm::AssemblyItem newIsLong = _context.appendConditionalJump();
-
-				// Here: short -> short
-
-				// Compute 1 << (256 - 8 * new_size)
-				evmasm::AssemblyItem shortToShort = _context.newTag();
-				_context << shortToShort;
-				_context << Instruction::DUP3 << u256(8) << Instruction::MUL;
-				_context << u256(0x100) << Instruction::SUB;
-				_context << u256(2) << Instruction::EXP;
-				// Divide and multiply by that value, clearing bits.
-				_context << Instruction::DUP1 << Instruction::SWAP2;
-				_context << Instruction::DIV << Instruction::MUL;
-				// Insert 2*length.
-				_context << Instruction::DUP3 << Instruction::DUP1 << Instruction::ADD;
-				_context << Instruction::OR;
-				// Store.
-				_context << Instruction::DUP4 << Instruction::SSTORE;
-				solAssert(_context.stackHeight() - stackHeightStart == 3 - 2, "3");
-				_context.appendJumpTo(resizeEnd);
-
-				_context.adjustStackOffset(1); // we have to do that because of the jumps
-				// Here: short -> long
-
-				_context << newIsLong;
-				// stack: ref new_length current_length ref_value
-				solAssert(_context.stackHeight() - stackHeightStart == 4 - 2, "3");
-				// Zero out lower-order byte.
-				_context << u256(0xff) << Instruction::NOT << Instruction::AND;
-				// Store at data location.
-				_context << Instruction::DUP4;
-				CompilerUtils(_context).computeHashStatic();
-				_context << Instruction::SSTORE;
-				// stack: ref new_length current_length
-				// Store new length: Compule 2*length + 1 and store it.
-				_context << Instruction::DUP2 << Instruction::DUP1 << Instruction::ADD;
-				_context << u256(1) << Instruction::ADD;
-				// stack: ref new_length current_length 2*new_length+1
-				_context << Instruction::DUP4 << Instruction::SSTORE;
-				solAssert(_context.stackHeight() - stackHeightStart == 3 - 2, "3");
-				_context.appendJumpTo(resizeEnd);
-
-				_context.adjustStackOffset(1); // we have to do that because of the jumps
-
-				_context << currentIsLong;
-				_context << Instruction::DUP3 << u256(31) << Instruction::LT;
-				_context.appendConditionalJumpTo(regularPath);
-
-				// Here: long -> short
-				// Read the first word of the data and store it on the stack. Clear the data location and
-				// then jump to the short -> short case.
-
-				// stack: ref new_length current_length ref_value
-				solAssert(_context.stackHeight() - stackHeightStart == 4 - 2, "3");
-				_context << Instruction::POP << Instruction::DUP3;
-				CompilerUtils(_context).computeHashStatic();
-				_context << Instruction::DUP1 << Instruction::SLOAD << Instruction::SWAP1;
-				// stack: ref new_length current_length first_word data_location
-				_context << Instruction::DUP3;
-				ArrayUtils(_context).convertLengthToSize(_type);
-				_context << Instruction::DUP2 << Instruction::ADD << Instruction::SWAP1;
-				// stack: ref new_length current_length first_word data_location_end data_location
-				ArrayUtils(_context).clearStorageLoop(TypeProvider::uint256());
-				_context << Instruction::POP;
-				// stack: ref new_length current_length first_word
-				solAssert(_context.stackHeight() - stackHeightStart == 4 - 2, "3");
-				_context.appendJumpTo(shortToShort);
-
-				_context << regularPath;
-				// stack: ref new_length current_length ref_value
-				_context << Instruction::POP;
-			}
-
-			// Change of length for a regular array (i.e. length at location, data at KECCAK256(location)).
-			// stack: ref new_length old_length
-			// store new length
-			_context << Instruction::DUP2;
-			if (_type.isByteArrayOrString())
-				// For a "long" byte array, store length as 2*length+1
-				_context << Instruction::DUP1 << Instruction::ADD << u256(1) << Instruction::ADD;
-			_context << Instruction::DUP4 << Instruction::SSTORE;
-			// skip if size is not reduced
-			_context << Instruction::DUP2 << Instruction::DUP2
-				<< Instruction::GT << Instruction::ISZERO;
-			_context.appendConditionalJumpTo(resizeEnd);
-
-			// size reduced, clear the end of the array
-			// stack: ref new_length old_length
-			ArrayUtils(_context).convertLengthToSize(_type);
-			_context << Instruction::DUP2;
-			ArrayUtils(_context).convertLengthToSize(_type);
-			// stack: ref new_length old_size new_size
-			// compute data positions
-			_context << Instruction::DUP4;
-			CompilerUtils(_context).computeHashStatic();
-			// stack: ref new_length old_size new_size data_pos
-			_context << Instruction::SWAP2 << Instruction::DUP3 << Instruction::ADD;
-			// stack: ref new_length data_pos new_size delete_end
-			_context << Instruction::SWAP2 << Instruction::ADD;
-			// stack: ref new_length delete_end delete_start
-			if (_type.storageStride() < 32)
-				ArrayUtils(_context).clearStorageLoop(TypeProvider::uint256());
-			else
-				ArrayUtils(_context).clearStorageLoop(_type.baseType());
-
-			_context << resizeEnd;
-			// cleanup
-			_context << Instruction::POP << Instruction::POP << Instruction::POP;
-			solAssert(_context.stackHeight() == stackHeightStart - 2, "");
-		}
-	);
-}
-
-void ArrayUtils::incrementDynamicArraySize(ArrayType const& _type) const
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-	if (!_type.isByteArrayOrString() && _type.baseType()->storageBytes() < 32)
-		solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
-
-	if (_type.isByteArrayOrString())
-	{
-		// We almost always just add 2 (length of byte arrays is shifted left by one)
-		// except for the case where we transition from a short byte array
-		// to a long byte array, there we have to copy.
-		// This happens if the length is exactly 31, which means that the
-		// lowest-order byte (we actually use a mask with fewer bits) must
-		// be (31*2+0) = 62
-
-		m_context << Instruction::DUP1 << Instruction::SLOAD << Instruction::DUP1;
-		m_context.callYulFunction(m_context.utilFunctions().extractByteArrayLengthFunction(), 1, 1);
-		m_context.appendInlineAssembly(R"({
-			// We have to copy if length is exactly 31, because that marks
-			// the transition between in-place and out-of-place storage.
-			switch length
-			case 31
-			{
-				mstore(0, ref)
-				let data_area := keccak256(0, 0x20)
-				sstore(data_area, and(data, not(0xff)))
-				// Set old length in new format (31 * 2 + 1)
-				data := 63
-			}
-			sstore(ref, add(data, 2))
-			// return new length in ref
-			ref := add(length, 1)
-		})", {"ref", "data", "length"});
-		m_context << Instruction::POP << Instruction::POP;
-	}
-	else
-		m_context.appendInlineAssembly(R"({
-			let new_length := add(sload(ref), 1)
-			sstore(ref, new_length)
-			ref := new_length
-		})", {"ref"});
-}
-
-void ArrayUtils::popStorageArrayElement(ArrayType const& _type) const
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-	if (!_type.isByteArrayOrString() && _type.baseType()->storageBytes() < 32)
-		solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
-
-	if (_type.isByteArrayOrString())
-	{
-		m_context << Instruction::DUP1 << Instruction::SLOAD << Instruction::DUP1;
-		m_context.callYulFunction(m_context.utilFunctions().extractByteArrayLengthFunction(), 1, 1);
-		util::Whiskers code(R"({
-			if iszero(length) {
-				mstore(0, <panicSelector>)
-				mstore(4, <emptyArrayPop>)
-				revert(0, 0x24)
-			}
-			switch gt(length, 31)
-			case 0 {
-				// short byte array
-				// Zero-out the suffix including the least significant byte.
-				let mask := sub(exp(0x100, sub(33, length)), 1)
-				length := sub(length, 1)
-				slot_value := or(and(not(mask), slot_value), mul(length, 2))
-			}
-			case 1 {
-				// long byte array
-				mstore(0, ref)
-				let slot := keccak256(0, 0x20)
-				switch length
-				case 32
-				{
-					let data := sload(slot)
-					sstore(slot, 0)
-					data := and(data, not(0xff))
-					slot_value := or(data, 62)
-				}
-				default
-				{
-					let offset_inside_slot := and(sub(length, 1), 0x1f)
-					slot := add(slot, div(sub(length, 1), 32))
-					let data := sload(slot)
-
-					// Zero-out the suffix of the byte array by masking it.
-					// ((1<<(8 * (32 - offset))) - 1)
-					let mask := sub(exp(0x100, sub(32, offset_inside_slot)), 1)
-					data := and(not(mask), data)
-					sstore(slot, data)
-
-					// Reduce the length by 1
-					slot_value := sub(slot_value, 2)
-				}
-			}
-			sstore(ref, slot_value)
-		})");
-		code("panicSelector", util::selectorFromSignatureU256("Panic(uint256)").str());
-		code("emptyArrayPop", std::to_string(unsigned(util::PanicCode::EmptyArrayPop)));
-		m_context.appendInlineAssembly(code.render(), {"ref", "slot_value", "length"});
-		m_context << Instruction::POP << Instruction::POP << Instruction::POP;
-	}
-	else
-	{
-		// stack: ArrayReference
-		retrieveLength(_type);
-		// stack: ArrayReference oldLength
-		m_context << Instruction::DUP1;
-		// stack: ArrayReference oldLength oldLength
-		m_context << Instruction::ISZERO;
-		m_context.appendConditionalPanic(util::PanicCode::EmptyArrayPop);
-
-		// Stack: ArrayReference oldLength
-		m_context << u256(1) << Instruction::SWAP1 << Instruction::SUB;
-		// Stack ArrayReference newLength
-
-		if (_type.baseType()->category() != Type::Category::Mapping)
-		{
-			m_context << Instruction::DUP2 << Instruction::DUP2;
-			// Stack ArrayReference newLength ArrayReference newLength;
-			accessIndex(_type, false);
-			// Stack: ArrayReference newLength storage_slot byte_offset
-			StorageItem(m_context, *_type.baseType()).setToZero(SourceLocation(), true);
-		}
-
-		// Stack: ArrayReference newLength
-		m_context << Instruction::SWAP1 << Instruction::SSTORE;
-	}
-}
-
-void ArrayUtils::clearStorageLoop(Type const* _type) const
-{
-	solAssert(_type->storageBytes() >= 32, "");
-	m_context.callLowLevelFunction(
-		"$clearStorageLoop_" + _type->identifier(),
-		2,
-		1,
-		[_type](CompilerContext& _context)
-		{
-			unsigned stackHeightStart = _context.stackHeight();
-			if (_type->category() == Type::Category::Mapping)
-			{
-				_context << Instruction::POP;
-				return;
-			}
-			// stack: end_pos pos
-
-			evmasm::AssemblyItem loopStart = _context.appendJumpToNew();
-			_context << loopStart;
-			// check for loop condition
-			_context <<
-				Instruction::DUP1 <<
-				Instruction::DUP3 <<
-				Instruction::GT <<
-				Instruction::ISZERO;
-			evmasm::AssemblyItem zeroLoopEnd = _context.newTag();
-			_context.appendConditionalJumpTo(zeroLoopEnd);
-			// delete
-			_context << u256(0);
-			StorageItem(_context, *_type).setToZero(SourceLocation(), false);
-			_context << Instruction::POP;
-			// increment
-			_context << _type->storageSize() << Instruction::ADD;
-			_context.appendJumpTo(loopStart);
-			// cleanup
-			_context << zeroLoopEnd;
-			_context << Instruction::POP;
-
-			solAssert(_context.stackHeight() == stackHeightStart - 1, "");
-		}
-	);
-}
-
-void ArrayUtils::convertLengthToSize(ArrayType const& _arrayType, bool _pad) const
-{
-	if (_arrayType.location() == DataLocation::Storage)
-	{
-		if (_arrayType.baseType()->storageSize() <= 1)
-		{
-			unsigned baseBytes = _arrayType.baseType()->storageBytes();
-			if (baseBytes == 0)
-				m_context << Instruction::POP << u256(1);
-			else if (baseBytes <= 16)
-			{
-				unsigned itemsPerSlot = 32 / baseBytes;
-				m_context
-					<< u256(itemsPerSlot - 1) << Instruction::ADD
-					<< u256(itemsPerSlot) << Instruction::SWAP1 << Instruction::DIV;
-			}
-		}
-		else
-			m_context << _arrayType.baseType()->storageSize() << Instruction::MUL;
-	}
-	else
-	{
-		if (!_arrayType.isByteArrayOrString())
-		{
-			if (_arrayType.location() == DataLocation::Memory)
-				m_context << _arrayType.memoryStride();
-			else
-				m_context << _arrayType.calldataStride();
-			m_context << Instruction::MUL;
-		}
-		else if (_pad)
-			m_context << u256(31) << Instruction::ADD
-				<< u256(32) << Instruction::DUP1
-				<< Instruction::SWAP2 << Instruction::DIV << Instruction::MUL;
-	}
-}
-
-void ArrayUtils::retrieveLength(ArrayType const& _arrayType, unsigned _stackDepth) const
-{
-	if (!_arrayType.isDynamicallySized())
-		m_context << _arrayType.length();
-	else
-	{
-		m_context << dupInstruction(1 + _stackDepth);
-		switch (_arrayType.location())
-		{
-		case DataLocation::CallData:
-			// length is stored on the stack
-			break;
-		case DataLocation::Memory:
-			m_context << Instruction::MLOAD;
-			break;
-		case DataLocation::Storage:
-			m_context << Instruction::SLOAD;
-			if (_arrayType.isByteArrayOrString())
-				m_context.callYulFunction(m_context.utilFunctions().extractByteArrayLengthFunction(), 1, 1);
-			break;
-		}
-	}
-}
-
-void ArrayUtils::accessIndex(ArrayType const& _arrayType, bool _doBoundsCheck, bool _keepReference) const
-{
-	/// Stack: reference [length] index
-	DataLocation location = _arrayType.location();
-
-	if (_doBoundsCheck)
-	{
-		// retrieve length
-		ArrayUtils::retrieveLength(_arrayType, 1);
-		// Stack: ref [length] index length
-		// check out-of-bounds access
-		m_context << Instruction::DUP2 << Instruction::LT << Instruction::ISZERO;
-		// out-of-bounds access throws exception
-		m_context.appendConditionalPanic(util::PanicCode::ArrayOutOfBounds);
-	}
-	if (location == DataLocation::CallData && _arrayType.isDynamicallySized())
-		// remove length if present
-		m_context << Instruction::SWAP1 << Instruction::POP;
-
-	// stack: <base_ref> <index>
-	switch (location)
-	{
-	case DataLocation::Memory:
-		// stack: <base_ref> <index>
-		if (!_arrayType.isByteArrayOrString())
-			m_context << u256(_arrayType.memoryHeadSize()) << Instruction::MUL;
-		if (_arrayType.isDynamicallySized())
-			m_context << u256(32) << Instruction::ADD;
-		if (_keepReference)
-			m_context << Instruction::DUP2;
-		m_context << Instruction::ADD;
-		break;
-	case DataLocation::CallData:
-		if (!_arrayType.isByteArrayOrString())
-		{
-			m_context << _arrayType.calldataStride();
-			m_context << Instruction::MUL;
-		}
-		// stack: <base_ref> <index * size>
-		if (_keepReference)
-			m_context << Instruction::DUP2;
-		m_context << Instruction::ADD;
-		break;
-	case DataLocation::Storage:
-	{
-		if (_keepReference)
-			m_context << Instruction::DUP2;
-		else
-			m_context << Instruction::SWAP1;
-		// stack: [<base_ref>] <index> <base_ref>
-
-		evmasm::AssemblyItem endTag = m_context.newTag();
-		if (_arrayType.isByteArrayOrString())
-		{
-			// Special case of short byte arrays.
-			m_context << Instruction::SWAP1;
-			m_context << Instruction::DUP2 << Instruction::SLOAD;
-			m_context << u256(1) << Instruction::AND << Instruction::ISZERO;
-			// No action needed for short byte arrays.
-			m_context.appendConditionalJumpTo(endTag);
-			m_context << Instruction::SWAP1;
-		}
-		if (_arrayType.isDynamicallySized())
-			CompilerUtils(m_context).computeHashStatic();
-		m_context << Instruction::SWAP1;
-		if (_arrayType.baseType()->storageBytes() <= 16)
-		{
-			// stack: <data_ref> <index>
-			// goal:
-			// <ref> <byte_number> = <base_ref + index / itemsPerSlot> <(index % itemsPerSlot) * byteSize>
-			unsigned byteSize = _arrayType.baseType()->storageBytes();
-			solAssert(byteSize != 0, "");
-			unsigned itemsPerSlot = 32 / byteSize;
-			m_context << u256(itemsPerSlot) << Instruction::SWAP2;
-			// stack: itemsPerSlot index data_ref
-			m_context
-				<< Instruction::DUP3 << Instruction::DUP3
-				<< Instruction::DIV << Instruction::ADD
-			// stack: itemsPerSlot index (data_ref + index / itemsPerSlot)
-				<< Instruction::SWAP2 << Instruction::SWAP1
-				<< Instruction::MOD;
-			if (byteSize != 1)
-				m_context << u256(byteSize) << Instruction::MUL;
-		}
-		else
-		{
-			if (_arrayType.baseType()->storageSize() != 1)
-				m_context << _arrayType.baseType()->storageSize() << Instruction::MUL;
-			m_context << Instruction::ADD << u256(0);
-		}
-		m_context << endTag;
-		break;
-	}
-	}
-}
-
-void ArrayUtils::accessCallDataArrayElement(ArrayType const& _arrayType, bool _doBoundsCheck) const
-{
-	solAssert(_arrayType.location() == DataLocation::CallData, "");
-	if (_arrayType.baseType()->isDynamicallyEncoded())
-	{
-		// stack layout: <base_ref> <length> <index>
-		ArrayUtils(m_context).accessIndex(_arrayType, _doBoundsCheck, true);
-		// stack layout: <base_ref> <ptr_to_tail>
-
-		CompilerUtils(m_context).accessCalldataTail(*_arrayType.baseType());
-		// stack layout: <tail_ref> [length]
-	}
-	else
-	{
-		ArrayUtils(m_context).accessIndex(_arrayType, _doBoundsCheck);
-		if (_arrayType.baseType()->isValueType())
-		{
-			solAssert(_arrayType.baseType()->storageBytes() <= 32, "");
-			if (
-				!_arrayType.isByteArrayOrString() &&
-				_arrayType.baseType()->storageBytes() < 32 &&
-				m_context.useABICoderV2()
-			)
-			{
-				m_context << u256(32);
-				CompilerUtils(m_context).abiDecodeV2({_arrayType.baseType()}, false);
-			}
-			else
-				CompilerUtils(m_context).loadFromMemoryDynamic(
-					*_arrayType.baseType(),
-					true,
-					!_arrayType.isByteArrayOrString(),
-					false
-				);
-		}
-		else
-			solAssert(
-				_arrayType.baseType()->category() == Type::Category::Struct ||
-				_arrayType.baseType()->category() == Type::Category::Array,
-				"Invalid statically sized non-value base type on array access."
-			);
-	}
-}
-
-void ArrayUtils::incrementByteOffset(unsigned _byteSize, unsigned _byteOffsetPosition, unsigned _storageOffsetPosition) const
-{
-	solAssert(_byteSize < 32, "");
-	solAssert(_byteSize != 0, "");
-	// We do the following, but avoiding jumps:
-	// byteOffset += byteSize
-	// if (byteOffset + byteSize > 32)
-	// {
-	//     storageOffset++;
-	//     byteOffset = 0;
-	// }
-	if (_byteOffsetPosition > 1)
-		m_context << swapInstruction(_byteOffsetPosition - 1);
-	m_context << u256(_byteSize) << Instruction::ADD;
-	if (_byteOffsetPosition > 1)
-		m_context << swapInstruction(_byteOffsetPosition - 1);
-	// compute, X := (byteOffset + byteSize - 1) / 32, should be 1 iff byteOffset + bytesize > 32
-	m_context
-		<< u256(32) << dupInstruction(1 + _byteOffsetPosition) << u256(_byteSize - 1)
-		<< Instruction::ADD << Instruction::DIV;
-	// increment storage offset if X == 1 (just add X to it)
-	// stack: X
-	m_context
-		<< swapInstruction(_storageOffsetPosition) << dupInstruction(_storageOffsetPosition + 1)
-		<< Instruction::ADD << swapInstruction(_storageOffsetPosition);
-	// stack: X
-	// set source_byte_offset to zero if X == 1 (using source_byte_offset *= 1 - X)
-	m_context << u256(1) << Instruction::SUB;
-	// stack: 1 - X
-	if (_byteOffsetPosition == 1)
-		m_context << Instruction::MUL;
-	else
-		m_context
-			<< dupInstruction(_byteOffsetPosition + 1) << Instruction::MUL
-			<< swapInstruction(_byteOffsetPosition) << Instruction::POP;
-}
diff --git a/libsolidity/codegen/ArrayUtils.h b/libsolidity/codegen/ArrayUtils.h
deleted file mode 100644
index 7a47efad7b0b..000000000000
--- a/libsolidity/codegen/ArrayUtils.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Code generation utils that handle arrays.
- */
-
-#pragma once
-
-#include <memory>
-
-namespace solidity::frontend
-{
-
-class CompilerContext;
-class Type;
-class ArrayType;
-
-/**
- * Class that provides code generation for handling arrays.
- */
-class ArrayUtils
-{
-public:
-	explicit ArrayUtils(CompilerContext& _context): m_context(_context) {}
-
-	/// Copies an array to an array in storage. The arrays can be of different types only if
-	/// their storage representation is the same.
-	/// Stack pre: source_reference [source_length] target_reference
-	/// Stack post: target_reference
-	void copyArrayToStorage(ArrayType const& _targetType, ArrayType const& _sourceType) const;
-	/// Copies the data part of an array (which cannot be dynamically nested) from anywhere
-	/// to a given position in memory.
-	/// This always copies contained data as is (i.e. structs and fixed-size arrays are copied in
-	/// place as required by the ABI encoding). Use CompilerUtils::convertType if you want real
-	/// memory copies of nested arrays.
-	/// Stack pre: memory_offset source_item
-	/// Stack post: memory_offest + length(padded)
-	void copyArrayToMemory(ArrayType const& _sourceType, bool _padToWordBoundaries = true) const;
-	/// Clears the given dynamic or static array.
-	/// Stack pre: storage_ref storage_byte_offset
-	/// Stack post:
-	void clearArray(ArrayType const& _type) const;
-	/// Clears the length and data elements of the array referenced on the stack.
-	/// Stack pre: reference (excludes byte offset)
-	/// Stack post:
-	void clearDynamicArray(ArrayType const& _type) const;
-	/// Changes the size of a dynamic array and clears the tail if it is shortened.
-	/// Stack pre: reference (excludes byte offset) new_length
-	/// Stack post:
-	void resizeDynamicArray(ArrayType const& _type) const;
-	/// Increments the size of a dynamic array by one.
-	/// Does not touch the new data element. In case of a byte array, this might move the
-	/// data.
-	/// Stack pre: reference (excludes byte offset)
-	/// Stack post: new_length
-	void incrementDynamicArraySize(ArrayType const& _type) const;
-	/// Decrements the size of a dynamic array by one if length is nonzero. Causes a Panic otherwise.
-	/// Clears the removed data element. In case of a byte array, this might move the data.
-	/// Stack pre: reference
-	/// Stack post:
-	void popStorageArrayElement(ArrayType const& _type) const;
-	/// Appends a loop that clears a sequence of storage slots of the given type (excluding end).
-	/// Stack pre: end_ref start_ref
-	/// Stack post: end_ref
-	void clearStorageLoop(Type const* _type) const;
-	/// Converts length to size (number of storage slots or calldata/memory bytes).
-	/// if @a _pad then add padding to multiples of 32 bytes for calldata/memory.
-	/// Stack pre: length
-	/// Stack post: size
-	void convertLengthToSize(ArrayType const& _arrayType, bool _pad = false) const;
-	/// Retrieves the length (number of elements) of the array ref on the stack. This also
-	/// works for statically-sized arrays.
-	/// @param _stackDepth number of stack elements between top of stack and top (!) of reference
-	/// Stack pre: reference (excludes byte offset for dynamic storage arrays)
-	/// Stack post: reference length
-	void retrieveLength(ArrayType const& _arrayType, unsigned _stackDepth = 0) const;
-	/// Stores the length of an array of type @a _arrayType in storage. The length itself is stored
-	/// on the stack at position @a _stackDepthLength and the storage reference at @a _stackDepthRef.
-	/// If @a _arrayType is a byte array, takes tight coding into account.
-	void storeLength(ArrayType const& _arrayType, unsigned _stackDepthLength = 0, unsigned _stackDepthRef = 1) const;
-	/// Checks whether the index is out of range and returns the absolute offset of the element reference[index]
-	/// (i.e. reference + index * size_of_base_type).
-	/// If @a _keepReference is true, the base reference to the beginning of the array is kept on the stack.
-	/// Stack pre: reference [length] index
-	/// Stack post (storage): [reference] storage_slot byte_offset
-	/// Stack post: [reference] memory/calldata_offset
-	void accessIndex(ArrayType const& _arrayType, bool _doBoundsCheck = true, bool _keepReference = false) const;
-	/// Access calldata array's element and put it on stack.
-	/// Stack pre: reference [length] index
-	/// Stack post: value
-	void accessCallDataArrayElement(ArrayType const& _arrayType, bool _doBoundsCheck = true) const;
-
-private:
-	/// Adds the given number of bytes to a storage byte offset counter and also increments
-	/// the storage offset if adding this number again would increase the counter over 32.
-	/// @param byteOffsetPosition the stack offset of the storage byte offset
-	/// @param storageOffsetPosition the stack offset of the storage slot offset
-	void incrementByteOffset(unsigned _byteSize, unsigned _byteOffsetPosition, unsigned _storageOffsetPosition) const;
-
-	CompilerContext& m_context;
-};
-
-}
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp
deleted file mode 100644
index 844de8ba82c6..000000000000
--- a/libsolidity/codegen/Compiler.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity compiler.
- */
-
-#include <libsolidity/codegen/Compiler.h>
-
-#include <libsolidity/codegen/ContractCompiler.h>
-#include <libevmasm/Assembly.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-void Compiler::compileContract(
-	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers,
-	bytes const& _metadata
-)
-{
-	ContractCompiler runtimeCompiler(nullptr, m_runtimeContext, m_optimiserSettings);
-	runtimeCompiler.compileContract(_contract, _otherCompilers);
-	m_runtimeContext.appendToAuxiliaryData(_metadata);
-
-	// This might modify m_runtimeContext because it can access runtime functions at
-	// creation time.
-	OptimiserSettings creationSettings{m_optimiserSettings};
-	// The creation code will be executed at most once, so we modify the optimizer
-	// settings accordingly.
-	creationSettings.expectedExecutionsPerDeployment = 1;
-	ContractCompiler creationCompiler(&runtimeCompiler, m_context, creationSettings);
-	m_runtimeSub = creationCompiler.compileConstructor(_contract, _otherCompilers);
-
-	m_context.optimise(m_optimiserSettings);
-
-	solAssert(m_context.appendYulUtilityFunctionsRan(), "appendYulUtilityFunctions() was not called.");
-	solAssert(m_runtimeContext.appendYulUtilityFunctionsRan(), "appendYulUtilityFunctions() was not called.");
-}
-
-std::shared_ptr<evmasm::Assembly> Compiler::runtimeAssemblyPtr() const
-{
-	solAssert(m_context.runtimeContext(), "");
-	return m_context.runtimeContext()->assemblyPtr();
-}
diff --git a/libsolidity/codegen/Compiler.h b/libsolidity/codegen/Compiler.h
deleted file mode 100644
index 1267c1a2d92c..000000000000
--- a/libsolidity/codegen/Compiler.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity AST to EVM bytecode compiler.
- */
-
-#pragma once
-
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/interface/OptimiserSettings.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <liblangutil/EVMVersion.h>
-#include <libevmasm/Assembly.h>
-#include <functional>
-#include <ostream>
-
-namespace solidity::frontend
-{
-
-class Compiler
-{
-public:
-	Compiler(langutil::EVMVersion _evmVersion, RevertStrings _revertStrings, OptimiserSettings _optimiserSettings):
-		m_optimiserSettings(std::move(_optimiserSettings)),
-		m_runtimeContext(_evmVersion, _revertStrings),
-		m_context(_evmVersion, _revertStrings, &m_runtimeContext)
-	{ }
-
-	/// Compiles a contract.
-	/// @arg _metadata contains the to be injected metadata CBOR
-	void compileContract(
-		ContractDefinition const& _contract,
-		std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers,
-		bytes const& _metadata
-	);
-	/// @returns Entire assembly.
-	evmasm::Assembly const& assembly() const { return m_context.assembly(); }
-	/// @returns Runtime assembly.
-	evmasm::Assembly const& runtimeAssembly() const { return m_context.assembly().sub(m_runtimeSub); }
-	/// @returns Entire assembly as a shared pointer to non-const.
-	std::shared_ptr<evmasm::Assembly> assemblyPtr() const { return m_context.assemblyPtr(); }
-	/// @returns Runtime assembly as a shared pointer.
-	std::shared_ptr<evmasm::Assembly> runtimeAssemblyPtr() const;
-
-	std::string generatedYulUtilityCode() const { return m_context.generatedYulUtilityCode(); }
-	std::string runtimeGeneratedYulUtilityCode() const { return m_runtimeContext.generatedYulUtilityCode(); }
-
-private:
-	OptimiserSettings const m_optimiserSettings;
-	CompilerContext m_runtimeContext;
-	size_t m_runtimeSub = size_t(-1); ///< Identifier of the runtime sub-assembly, if present.
-	CompilerContext m_context;
-};
-
-}
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
deleted file mode 100644
index d9264c6ac5f1..000000000000
--- a/libsolidity/codegen/CompilerContext.cpp
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Utilities for the solidity compiler.
- */
-
-#include <libsolidity/codegen/CompilerContext.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/codegen/Compiler.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/interface/Version.h>
-
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/backends/evm/AsmCodeGen.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/optimiser/Suite.h>
-#include <libyul/Object.h>
-#include <libyul/YulString.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/StackTooDeepString.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <utility>
-
-// Change to "define" to output all intermediate code
-#undef SOL_OUTPUT_ASM
-
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-void CompilerContext::addStateVariable(
-	VariableDeclaration const& _declaration,
-	u256 const& _storageOffset,
-	unsigned _byteOffset
-)
-{
-	m_stateVariables[&_declaration] = std::make_pair(_storageOffset, _byteOffset);
-}
-
-void CompilerContext::addImmutable(VariableDeclaration const& _variable)
-{
-	solAssert(_variable.immutable(), "Attempted to register a non-immutable variable as immutable.");
-	solUnimplementedAssert(_variable.annotation().type->isValueType(), "Only immutable variables of value type are supported.");
-	solAssert(m_runtimeContext, "Attempted to register an immutable variable for runtime code generation.");
-	m_immutableVariables[&_variable] = CompilerUtils::generalPurposeMemoryStart + *m_reservedMemory;
-	solAssert(_variable.annotation().type->memoryHeadSize() == 32, "Memory writes might overlap.");
-	*m_reservedMemory += _variable.annotation().type->memoryHeadSize();
-}
-
-size_t CompilerContext::immutableMemoryOffset(VariableDeclaration const& _variable) const
-{
-	solAssert(m_immutableVariables.count(&_variable), "Memory offset of unknown immutable queried.");
-	solAssert(m_runtimeContext, "Attempted to fetch the memory offset of an immutable variable during runtime code generation.");
-	return m_immutableVariables.at(&_variable);
-}
-
-std::vector<std::string> CompilerContext::immutableVariableSlotNames(VariableDeclaration const& _variable)
-{
-	std::string baseName = std::to_string(_variable.id());
-	solAssert(_variable.annotation().type->sizeOnStack() > 0, "");
-	if (_variable.annotation().type->sizeOnStack() == 1)
-		return {baseName};
-	std::vector<std::string> names;
-	auto collectSlotNames = [&](std::string const& _baseName, Type const* type, auto const& _recurse) -> void {
-		for (auto const& [slot, type]: type->stackItems())
-			if (type)
-				_recurse(_baseName + " " + slot, type, _recurse);
-			else
-				names.emplace_back(_baseName);
-	};
-	collectSlotNames(baseName, _variable.annotation().type, collectSlotNames);
-	return names;
-}
-
-size_t CompilerContext::reservedMemory()
-{
-	solAssert(m_reservedMemory.has_value(), "Reserved memory was used before ");
-	size_t reservedMemory = *m_reservedMemory;
-	m_reservedMemory = std::nullopt;
-	return reservedMemory;
-}
-
-void CompilerContext::startFunction(Declaration const& _function)
-{
-	m_functionCompilationQueue.startFunction(_function);
-	*this << functionEntryLabel(_function);
-}
-
-void CompilerContext::callLowLevelFunction(
-	std::string const& _name,
-	unsigned _inArgs,
-	unsigned _outArgs,
-	std::function<void(CompilerContext&)> const& _generator
-)
-{
-	evmasm::AssemblyItem retTag = pushNewTag();
-	CompilerUtils(*this).moveIntoStack(_inArgs);
-
-	*this << lowLevelFunctionTag(_name, _inArgs, _outArgs, _generator);
-
-	appendJump(evmasm::AssemblyItem::JumpType::IntoFunction);
-	adjustStackOffset(static_cast<int>(_outArgs) - 1 - static_cast<int>(_inArgs));
-	*this << retTag.tag();
-}
-
-void CompilerContext::callYulFunction(
-	std::string const& _name,
-	unsigned _inArgs,
-	unsigned _outArgs
-)
-{
-	m_externallyUsedYulFunctions.insert(_name);
-	auto const retTag = pushNewTag();
-	CompilerUtils(*this).moveIntoStack(_inArgs);
-	appendJumpTo(namedTag(_name, _inArgs, _outArgs, {}), evmasm::AssemblyItem::JumpType::IntoFunction);
-	adjustStackOffset(static_cast<int>(_outArgs) - 1 - static_cast<int>(_inArgs));
-	*this << retTag.tag();
-}
-
-evmasm::AssemblyItem CompilerContext::lowLevelFunctionTag(
-	std::string const& _name,
-	unsigned _inArgs,
-	unsigned _outArgs,
-	std::function<void(CompilerContext&)> const& _generator
-)
-{
-	auto it = m_lowLevelFunctions.find(_name);
-	if (it == m_lowLevelFunctions.end())
-	{
-		evmasm::AssemblyItem tag = newTag().pushTag();
-		m_lowLevelFunctions.insert(make_pair(_name, tag));
-		m_lowLevelFunctionGenerationQueue.push(make_tuple(_name, _inArgs, _outArgs, _generator));
-		return tag;
-	}
-	else
-		return it->second;
-}
-
-void CompilerContext::appendMissingLowLevelFunctions()
-{
-	while (!m_lowLevelFunctionGenerationQueue.empty())
-	{
-		std::string name;
-		unsigned inArgs;
-		unsigned outArgs;
-		std::function<void(CompilerContext&)> generator;
-		tie(name, inArgs, outArgs, generator) = m_lowLevelFunctionGenerationQueue.front();
-		m_lowLevelFunctionGenerationQueue.pop();
-
-		setStackOffset(static_cast<int>(inArgs) + 1);
-		*this << m_lowLevelFunctions.at(name).tag();
-		generator(*this);
-		CompilerUtils(*this).moveToStackTop(outArgs);
-		appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction);
-		solAssert(stackHeight() == outArgs, "Invalid stack height in low-level function " + name + ".");
-	}
-}
-
-void CompilerContext::appendYulUtilityFunctions(OptimiserSettings const& _optimiserSettings)
-{
-	solAssert(!m_appendYulUtilityFunctionsRan, "requestedYulFunctions called more than once.");
-	m_appendYulUtilityFunctionsRan = true;
-
-	std::string code = m_yulFunctionCollector.requestedFunctions();
-	if (!code.empty())
-	{
-		appendInlineAssembly(
-			yul::reindent("{\n" + std::move(code) + "\n}"),
-			{},
-			m_externallyUsedYulFunctions,
-			true,
-			_optimiserSettings,
-			yulUtilityFileName()
-		);
-		solAssert(!m_generatedYulUtilityCode.empty(), "");
-	}
-}
-
-void CompilerContext::addVariable(
-	VariableDeclaration const& _declaration,
-	unsigned _offsetToCurrent
-)
-{
-	solAssert(m_asm->deposit() >= 0 && unsigned(m_asm->deposit()) >= _offsetToCurrent, "");
-	unsigned sizeOnStack = _declaration.annotation().type->sizeOnStack();
-	// Variables should not have stack size other than [1, 2],
-	// but that might change when new types are introduced.
-	solAssert(sizeOnStack == 1 || sizeOnStack == 2, "");
-	m_localVariables[&_declaration].push_back(unsigned(m_asm->deposit()) - _offsetToCurrent);
-}
-
-void CompilerContext::removeVariable(Declaration const& _declaration)
-{
-	solAssert(m_localVariables.count(&_declaration) && !m_localVariables[&_declaration].empty(), "");
-	m_localVariables[&_declaration].pop_back();
-	if (m_localVariables[&_declaration].empty())
-		m_localVariables.erase(&_declaration);
-}
-
-void CompilerContext::removeVariablesAboveStackHeight(unsigned _stackHeight)
-{
-	std::vector<Declaration const*> toRemove;
-	for (auto _var: m_localVariables)
-	{
-		solAssert(!_var.second.empty(), "");
-		solAssert(_var.second.back() <= stackHeight(), "");
-		if (_var.second.back() >= _stackHeight)
-			toRemove.push_back(_var.first);
-	}
-	for (auto _var: toRemove)
-		removeVariable(*_var);
-}
-
-unsigned CompilerContext::numberOfLocalVariables() const
-{
-	return static_cast<unsigned>(m_localVariables.size());
-}
-
-std::shared_ptr<evmasm::Assembly> CompilerContext::compiledContract(ContractDefinition const& _contract) const
-{
-	auto ret = m_otherCompilers.find(&_contract);
-	solAssert(ret != m_otherCompilers.end(), "Compiled contract not found.");
-	return ret->second->assemblyPtr();
-}
-
-std::shared_ptr<evmasm::Assembly> CompilerContext::compiledContractRuntime(ContractDefinition const& _contract) const
-{
-	auto ret = m_otherCompilers.find(&_contract);
-	solAssert(ret != m_otherCompilers.end(), "Compiled contract not found.");
-	return ret->second->runtimeAssemblyPtr();
-}
-
-bool CompilerContext::isLocalVariable(Declaration const* _declaration) const
-{
-	return !!m_localVariables.count(_declaration);
-}
-
-evmasm::AssemblyItem CompilerContext::functionEntryLabel(Declaration const& _declaration)
-{
-	return m_functionCompilationQueue.entryLabel(_declaration, *this);
-}
-
-evmasm::AssemblyItem CompilerContext::functionEntryLabelIfExists(Declaration const& _declaration) const
-{
-	return m_functionCompilationQueue.entryLabelIfExists(_declaration);
-}
-
-FunctionDefinition const& CompilerContext::superFunction(FunctionDefinition const& _function, ContractDefinition const& _base)
-{
-	solAssert(m_mostDerivedContract, "No most derived contract set.");
-	ContractDefinition const* super = _base.superContract(mostDerivedContract());
-	solAssert(super, "Super contract not available.");
-
-	FunctionDefinition const& resolvedFunction = _function.resolveVirtual(mostDerivedContract(), super);
-	solAssert(resolvedFunction.isImplemented(), "");
-
-	return resolvedFunction;
-}
-
-ContractDefinition const& CompilerContext::mostDerivedContract() const
-{
-	solAssert(m_mostDerivedContract, "Most derived contract not set.");
-	return *m_mostDerivedContract;
-}
-
-Declaration const* CompilerContext::nextFunctionToCompile() const
-{
-	return m_functionCompilationQueue.nextFunctionToCompile();
-}
-
-unsigned CompilerContext::baseStackOffsetOfVariable(Declaration const& _declaration) const
-{
-	auto res = m_localVariables.find(&_declaration);
-	solAssert(res != m_localVariables.end(), "Variable not found on stack.");
-	solAssert(!res->second.empty(), "");
-	return res->second.back();
-}
-
-unsigned CompilerContext::baseToCurrentStackOffset(unsigned _baseOffset) const
-{
-	return static_cast<unsigned>(m_asm->deposit()) - _baseOffset - 1;
-}
-
-unsigned CompilerContext::currentToBaseStackOffset(unsigned _offset) const
-{
-	return static_cast<unsigned>(m_asm->deposit()) - _offset - 1;
-}
-
-std::pair<u256, unsigned> CompilerContext::storageLocationOfVariable(Declaration const& _declaration) const
-{
-	auto it = m_stateVariables.find(&_declaration);
-	solAssert(it != m_stateVariables.end(), "Variable not found in storage.");
-	return it->second;
-}
-
-CompilerContext& CompilerContext::appendJump(evmasm::AssemblyItem::JumpType _jumpType)
-{
-	evmasm::AssemblyItem item(Instruction::JUMP);
-	item.setJumpType(_jumpType);
-	return *this << item;
-}
-
-CompilerContext& CompilerContext::appendPanic(util::PanicCode _code)
-{
-	callYulFunction(utilFunctions().panicFunction(_code), 0, 0);
-	return *this;
-}
-
-CompilerContext& CompilerContext::appendConditionalPanic(util::PanicCode _code)
-{
-	*this << Instruction::ISZERO;
-	evmasm::AssemblyItem afterTag = appendConditionalJump();
-	appendPanic(_code);
-	*this << afterTag;
-	return *this;
-}
-
-CompilerContext& CompilerContext::appendRevert(std::string const& _message)
-{
-	appendInlineAssembly("{ " + revertReasonIfDebug(_message) + " }");
-	return *this;
-}
-
-CompilerContext& CompilerContext::appendConditionalRevert(bool _forwardReturnData, std::string const& _message)
-{
-	if (_forwardReturnData && m_evmVersion.supportsReturndata())
-		appendInlineAssembly(R"({
-			if condition {
-				returndatacopy(0, 0, returndatasize())
-				revert(0, returndatasize())
-			}
-		})", {"condition"});
-	else
-		appendInlineAssembly("{ if condition { " + revertReasonIfDebug(_message) + " } }", {"condition"});
-	*this << Instruction::POP;
-	return *this;
-}
-
-void CompilerContext::resetVisitedNodes(ASTNode const* _node)
-{
-	std::stack<ASTNode const*> newStack;
-	newStack.push(_node);
-	std::swap(m_visitedNodes, newStack);
-	updateSourceLocation();
-}
-
-void CompilerContext::appendInlineAssembly(
-	std::string const& _assembly,
-	std::vector<std::string> const& _localVariables,
-	std::set<std::string> const& _externallyUsedFunctions,
-	bool _system,
-	OptimiserSettings const& _optimiserSettings,
-	std::string _sourceName
-)
-{
-	unsigned startStackHeight = stackHeight();
-
-	std::set<yul::YulString> externallyUsedIdentifiers;
-	for (auto const& fun: _externallyUsedFunctions)
-		externallyUsedIdentifiers.insert(yul::YulString(fun));
-	for (auto const& var: _localVariables)
-		externallyUsedIdentifiers.insert(yul::YulString(var));
-
-	yul::ExternalIdentifierAccess identifierAccess;
-	identifierAccess.resolve = [&](
-		yul::Identifier const& _identifier,
-		yul::IdentifierContext,
-		bool _insideFunction
-	) -> bool
-	{
-		if (_insideFunction)
-			return false;
-		return util::contains(_localVariables, _identifier.name.str());
-	};
-	identifierAccess.generateCode = [&](
-		yul::Identifier const& _identifier,
-		yul::IdentifierContext _context,
-		yul::AbstractAssembly& _assembly
-	)
-	{
-		solAssert(_context == yul::IdentifierContext::RValue || _context == yul::IdentifierContext::LValue, "");
-		auto it = std::find(_localVariables.begin(), _localVariables.end(), _identifier.name.str());
-		solAssert(it != _localVariables.end(), "");
-		auto stackDepth = static_cast<size_t>(distance(it, _localVariables.end()));
-		size_t stackDiff = static_cast<size_t>(_assembly.stackHeight()) - startStackHeight + stackDepth;
-		if (_context == yul::IdentifierContext::LValue)
-			stackDiff -= 1;
-		if (stackDiff < 1 || stackDiff > 16)
-			BOOST_THROW_EXCEPTION(
-				StackTooDeepError() <<
-				errinfo_sourceLocation(nativeLocationOf(_identifier)) <<
-				util::errinfo_comment(util::stackTooDeepString)
-			);
-		if (_context == yul::IdentifierContext::RValue)
-			_assembly.appendInstruction(dupInstruction(static_cast<unsigned>(stackDiff)));
-		else
-		{
-			_assembly.appendInstruction(swapInstruction(static_cast<unsigned>(stackDiff)));
-			_assembly.appendInstruction(Instruction::POP);
-		}
-	};
-
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	langutil::CharStream charStream(_assembly, _sourceName);
-	yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
-	std::optional<langutil::SourceLocation> locationOverride;
-	if (!_system)
-		locationOverride = m_asm->currentSourceLocation();
-	std::shared_ptr<yul::Block> parserResult =
-		yul::Parser(errorReporter, dialect, std::move(locationOverride))
-		.parse(charStream);
-#ifdef SOL_OUTPUT_ASM
-	cout << yul::AsmPrinter(&dialect)(*parserResult) << endl;
-#endif
-
-	auto reportError = [&](std::string const& _context)
-	{
-		std::string message =
-			"Error parsing/analyzing inline assembly block:\n" +
-			_context + "\n"
-			"------------------ Input: -----------------\n" +
-			_assembly + "\n"
-			"------------------ Errors: ----------------\n";
-		for (auto const& error: errorReporter.errors())
-			// TODO if we have "locationOverride", it will be the wrong char stream,
-			// but we do not have access to the solidity scanner.
-			message += SourceReferenceFormatter::formatErrorInformation(*error, charStream);
-		message += "-------------------------------------------\n";
-
-		solAssert(false, message);
-	};
-
-	yul::AsmAnalysisInfo analysisInfo;
-	bool analyzerResult = false;
-	if (parserResult)
-		analyzerResult = yul::AsmAnalyzer(
-			analysisInfo,
-			errorReporter,
-			dialect,
-			identifierAccess.resolve
-		).analyze(*parserResult);
-	if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
-		reportError("Invalid assembly generated by code generator.");
-
-	// Several optimizer steps cannot handle externally supplied stack variables,
-	// so we essentially only optimize the ABI functions.
-	if (_optimiserSettings.runYulOptimiser && _localVariables.empty())
-	{
-		yul::Object obj;
-		obj.code = parserResult;
-		obj.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(analysisInfo);
-
-		solAssert(!dialect.providesObjectAccess());
-		optimizeYul(obj, dialect, _optimiserSettings, externallyUsedIdentifiers);
-
-		if (_system)
-		{
-			// Store as generated sources, but first re-parse to update the source references.
-			solAssert(m_generatedYulUtilityCode.empty(), "");
-			m_generatedYulUtilityCode = yul::AsmPrinter(dialect)(*obj.code);
-			std::string code = yul::AsmPrinter{dialect}(*obj.code);
-			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
-			obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
-			*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
-		}
-
-		analysisInfo = std::move(*obj.analysisInfo);
-		parserResult = std::move(obj.code);
-
-#ifdef SOL_OUTPUT_ASM
-		cout << "After optimizer:" << endl;
-		cout << yul::AsmPrinter(&dialect)(*parserResult) << endl;
-#endif
-	}
-	else if (_system)
-	{
-		// Store as generated source.
-		solAssert(m_generatedYulUtilityCode.empty(), "");
-		m_generatedYulUtilityCode = _assembly;
-	}
-
-	if (!errorReporter.errors().empty())
-		reportError("Failed to analyze inline assembly block.");
-
-	solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
-	yul::CodeGenerator::assemble(
-		*parserResult,
-		analysisInfo,
-		*m_asm,
-		m_evmVersion,
-		identifierAccess.generateCode,
-		_system,
-		_optimiserSettings.optimizeStackAllocation
-	);
-
-	// Reset the source location to the one of the node (instead of the CODEGEN source location)
-	updateSourceLocation();
-}
-
-
-void CompilerContext::optimizeYul(yul::Object& _object, yul::EVMDialect const& _dialect, OptimiserSettings const& _optimiserSettings, std::set<yul::YulString> const& _externalIdentifiers)
-{
-#ifdef SOL_OUTPUT_ASM
-	cout << yul::AsmPrinter(*dialect)(*_object.code) << endl;
-#endif
-
-	bool const isCreation = runtimeContext() != nullptr;
-	yul::GasMeter meter(_dialect, isCreation, _optimiserSettings.expectedExecutionsPerDeployment);
-	yul::OptimiserSuite::run(
-		_dialect,
-		&meter,
-		_object,
-		_optimiserSettings.optimizeStackAllocation,
-		_optimiserSettings.yulOptimiserSteps,
-		_optimiserSettings.yulOptimiserCleanupSteps,
-		isCreation? std::nullopt : std::make_optional(_optimiserSettings.expectedExecutionsPerDeployment),
-		_externalIdentifiers
-	);
-
-#ifdef SOL_OUTPUT_ASM
-	cout << "After optimizer:" << endl;
-	cout << yul::AsmPrinter(*dialect)(*object.code) << endl;
-#endif
-}
-
-std::string CompilerContext::revertReasonIfDebug(std::string const& _message)
-{
-	return YulUtilFunctions::revertReasonIfDebugBody(
-		m_revertStrings,
-		"mload(" + std::to_string(CompilerUtils::freeMemoryPointer) + ")",
-		_message
-	);
-}
-
-void CompilerContext::updateSourceLocation()
-{
-	m_asm->setSourceLocation(m_visitedNodes.empty() ? SourceLocation() : m_visitedNodes.top()->location());
-}
-
-evmasm::AssemblyItem CompilerContext::FunctionCompilationQueue::entryLabel(
-	Declaration const& _declaration,
-	CompilerContext& _context
-)
-{
-	auto res = m_entryLabels.find(&_declaration);
-	if (res == m_entryLabels.end())
-	{
-		size_t params = 0;
-		size_t returns = 0;
-		if (auto const* function = dynamic_cast<FunctionDefinition const*>(&_declaration))
-		{
-			FunctionType functionType(*function, FunctionType::Kind::Internal);
-			params = CompilerUtils::sizeOnStack(functionType.parameterTypes());
-			returns = CompilerUtils::sizeOnStack(functionType.returnParameterTypes());
-		}
-
-		// some name that cannot clash with yul function names.
-		std::string labelName = "@" + _declaration.name() + "_" + std::to_string(_declaration.id());
-		evmasm::AssemblyItem tag = _context.namedTag(
-			labelName,
-			params,
-			returns,
-			_declaration.id()
-		);
-		m_entryLabels.insert(std::make_pair(&_declaration, tag));
-		m_functionsToCompile.push(&_declaration);
-		return tag.tag();
-	}
-	else
-		return res->second.tag();
-
-}
-
-evmasm::AssemblyItem CompilerContext::FunctionCompilationQueue::entryLabelIfExists(Declaration const& _declaration) const
-{
-	auto res = m_entryLabels.find(&_declaration);
-	return res == m_entryLabels.end() ? evmasm::AssemblyItem(evmasm::UndefinedItem) : res->second.tag();
-}
-
-Declaration const* CompilerContext::FunctionCompilationQueue::nextFunctionToCompile() const
-{
-	while (!m_functionsToCompile.empty())
-	{
-		if (m_alreadyCompiledFunctions.count(m_functionsToCompile.front()))
-			m_functionsToCompile.pop();
-		else
-			return m_functionsToCompile.front();
-	}
-	return nullptr;
-}
-
-void CompilerContext::FunctionCompilationQueue::startFunction(Declaration const& _function)
-{
-	if (!m_functionsToCompile.empty() && m_functionsToCompile.front() == &_function)
-		m_functionsToCompile.pop();
-	m_alreadyCompiledFunctions.insert(&_function);
-}
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
deleted file mode 100644
index 8eba084eba7b..000000000000
--- a/libsolidity/codegen/CompilerContext.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Utilities for the solidity compiler.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/codegen/ABIFunctions.h>
-
-#include <libsolidity/interface/DebugSettings.h>
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <libevmasm/Assembly.h>
-#include <libevmasm/Instruction.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/EVMVersion.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/ErrorCodes.h>
-
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <functional>
-#include <ostream>
-#include <stack>
-#include <queue>
-#include <utility>
-#include <limits>
-
-namespace solidity::frontend
-{
-
-class Compiler;
-
-/**
- * Context to be shared by all units that compile the same contract.
- * It stores the generated bytecode and the position of identifiers in memory and on the stack.
- */
-class CompilerContext
-{
-public:
-	explicit CompilerContext(
-		langutil::EVMVersion _evmVersion,
-		RevertStrings _revertStrings,
-		CompilerContext* _runtimeContext = nullptr
-	):
-		m_asm(std::make_shared<evmasm::Assembly>(_evmVersion, _runtimeContext != nullptr, std::string{})),
-		m_evmVersion(_evmVersion),
-		m_revertStrings(_revertStrings),
-		m_reservedMemory{0},
-		m_runtimeContext(_runtimeContext),
-		m_abiFunctions(m_evmVersion, m_revertStrings, m_yulFunctionCollector),
-		m_yulUtilFunctions(m_evmVersion, m_revertStrings, m_yulFunctionCollector)
-	{
-		if (m_runtimeContext)
-			m_runtimeSub = size_t(m_asm->newSub(m_runtimeContext->m_asm).data());
-	}
-
-	langutil::EVMVersion const& evmVersion() const { return m_evmVersion; }
-
-	void setUseABICoderV2(bool _value) { m_useABICoderV2 = _value; }
-	bool useABICoderV2() const { return m_useABICoderV2; }
-
-	void addStateVariable(VariableDeclaration const& _declaration, u256 const& _storageOffset, unsigned _byteOffset);
-	void addImmutable(VariableDeclaration const& _declaration);
-
-	/// @returns the reserved memory for storing the value of the immutable @a _variable during contract creation.
-	size_t immutableMemoryOffset(VariableDeclaration const& _variable) const;
-	/// @returns a list of slot names referring to the stack slots of an immutable variable.
-	static std::vector<std::string> immutableVariableSlotNames(VariableDeclaration const& _variable);
-
-	/// @returns the reserved memory and resets it to mark it as used.
-	size_t reservedMemory();
-
-	void addVariable(VariableDeclaration const& _declaration, unsigned _offsetToCurrent = 0);
-	void removeVariable(Declaration const& _declaration);
-	/// Removes all local variables currently allocated above _stackHeight.
-	void removeVariablesAboveStackHeight(unsigned _stackHeight);
-	/// Returns the number of currently allocated local variables.
-	unsigned numberOfLocalVariables() const;
-
-	void setOtherCompilers(std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers) { m_otherCompilers = _otherCompilers; }
-	std::shared_ptr<evmasm::Assembly> compiledContract(ContractDefinition const& _contract) const;
-	std::shared_ptr<evmasm::Assembly> compiledContractRuntime(ContractDefinition const& _contract) const;
-
-	void setStackOffset(int _offset) { m_asm->setDeposit(_offset); }
-	void adjustStackOffset(int _adjustment) { m_asm->adjustDeposit(_adjustment); }
-	unsigned stackHeight() const { solAssert(m_asm->deposit() >= 0, ""); return unsigned(m_asm->deposit()); }
-
-	bool isLocalVariable(Declaration const* _declaration) const;
-	bool isStateVariable(Declaration const* _declaration) const { return m_stateVariables.count(_declaration) != 0; }
-
-	/// @returns the entry label of the given function and creates it if it does not exist yet.
-	evmasm::AssemblyItem functionEntryLabel(Declaration const& _declaration);
-	/// @returns the entry label of the given function. Might return an AssemblyItem of type
-	/// UndefinedItem if it does not exist yet.
-	evmasm::AssemblyItem functionEntryLabelIfExists(Declaration const& _declaration) const;
-	/// @returns the function that overrides the given declaration from the most derived class just
-	/// above _base in the current inheritance hierarchy.
-	FunctionDefinition const& superFunction(FunctionDefinition const& _function, ContractDefinition const& _base);
-	/// Sets the contract currently being compiled - the most derived one.
-	void setMostDerivedContract(ContractDefinition const& _contract) { m_mostDerivedContract = &_contract; }
-	ContractDefinition const& mostDerivedContract() const;
-
-	void setArithmetic(Arithmetic _value) { m_arithmetic = _value; }
-	Arithmetic arithmetic() const { return m_arithmetic; }
-
-	/// @returns the next function in the queue of functions that are still to be compiled
-	/// (i.e. that were referenced during compilation but where we did not yet generate code for).
-	/// Returns nullptr if the queue is empty. Does not remove the function from the queue,
-	/// that will only be done by startFunction below.
-	Declaration const* nextFunctionToCompile() const;
-	/// Resets function specific members, inserts the function entry label and marks the function
-	/// as "having code".
-	void startFunction(Declaration const& _function);
-
-	/// Appends a call to the named low-level function and inserts the generator into the
-	/// list of low-level-functions to be generated, unless it already exists.
-	/// Note that the generator should not assume that objects are still alive when it is called,
-	/// unless they are guaranteed to be alive for the whole run of the compiler (AST nodes, for example).
-	void callLowLevelFunction(
-		std::string const& _name,
-		unsigned _inArgs,
-		unsigned _outArgs,
-		std::function<void(CompilerContext&)> const& _generator
-	);
-
-	/// Appends a call to a yul function and registers the function as externally used.
-	void callYulFunction(
-		std::string const& _name,
-		unsigned _inArgs,
-		unsigned _outArgs
-	);
-
-	/// Returns the tag of the named low-level function and inserts the generator into the
-	/// list of low-level-functions to be generated, unless it already exists.
-	/// Note that the generator should not assume that objects are still alive when it is called,
-	/// unless they are guaranteed to be alive for the whole run of the compiler (AST nodes, for example).
-	evmasm::AssemblyItem lowLevelFunctionTag(
-		std::string const& _name,
-		unsigned _inArgs,
-		unsigned _outArgs,
-		std::function<void(CompilerContext&)> const& _generator
-	);
-	/// Generates the code for missing low-level functions, i.e. calls the generators passed above.
-	void appendMissingLowLevelFunctions();
-	ABIFunctions& abiFunctions() { return m_abiFunctions; }
-	YulUtilFunctions& utilFunctions() { return m_yulUtilFunctions; }
-
-	/// Appends concatenation of all generated Yul functions to the bytecode
-	/// and stores the Yul source code to be returned by @a generatedYulUtilityCode.
-	/// Should be called exactly once on each context.
-	void appendYulUtilityFunctions(OptimiserSettings const& _optimiserSettings);
-	bool appendYulUtilityFunctionsRan() const { return m_appendYulUtilityFunctionsRan; }
-	std::string const& generatedYulUtilityCode() const { return m_generatedYulUtilityCode; }
-	static std::string yulUtilityFileName() { return "#utility.yul"; }
-
-	/// Returns the distance of the given local variable from the bottom of the stack (of the current function).
-	unsigned baseStackOffsetOfVariable(Declaration const& _declaration) const;
-	/// If supplied by a value returned by @ref baseStackOffsetOfVariable(variable), returns
-	/// the distance of that variable from the current top of the stack.
-	unsigned baseToCurrentStackOffset(unsigned _baseOffset) const;
-	/// Converts an offset relative to the current stack height to a value that can be used later
-	/// with baseToCurrentStackOffset to point to the same stack element.
-	unsigned currentToBaseStackOffset(unsigned _offset) const;
-	/// @returns pair of slot and byte offset of the value inside this slot.
-	std::pair<u256, unsigned> storageLocationOfVariable(Declaration const& _declaration) const;
-
-	/// Appends a JUMPI instruction to a new tag and @returns the tag
-	evmasm::AssemblyItem appendConditionalJump() { return m_asm->appendJumpI().tag(); }
-	/// Appends a JUMPI instruction to @a _tag
-	CompilerContext& appendConditionalJumpTo(evmasm::AssemblyItem const& _tag) { m_asm->appendJumpI(_tag); return *this; }
-	/// Appends a JUMP to a new tag and @returns the tag
-	evmasm::AssemblyItem appendJumpToNew() { return m_asm->appendJump().tag(); }
-	/// Appends a JUMP to a tag already on the stack
-	CompilerContext& appendJump(evmasm::AssemblyItem::JumpType _jumpType = evmasm::AssemblyItem::JumpType::Ordinary);
-	/// Appends code to revert with a Panic(uint256) error.
-	CompilerContext& appendPanic(util::PanicCode _code);
-	/// Appends code to revert with a Panic(uint256) error if the topmost stack element is nonzero.
-	CompilerContext& appendConditionalPanic(util::PanicCode _code);
-	/// Appends a REVERT(0, 0) call
-	/// @param _message is an optional revert message used in debug mode
-	CompilerContext& appendRevert(std::string const& _message = "");
-	/// Appends a conditional REVERT-call, either forwarding the RETURNDATA or providing the
-	/// empty string. Consumes the condition.
-	/// If the current EVM version does not support RETURNDATA, uses REVERT but does not forward
-	/// the data.
-	/// @param _message is an optional revert message used in debug mode
-	CompilerContext& appendConditionalRevert(bool _forwardReturnData = false, std::string const& _message = "");
-	/// Appends a JUMP to a specific tag
-	CompilerContext& appendJumpTo(
-		evmasm::AssemblyItem const& _tag,
-		evmasm::AssemblyItem::JumpType _jumpType = evmasm::AssemblyItem::JumpType::Ordinary
-	) { *m_asm << _tag.pushTag(); return appendJump(_jumpType); }
-	/// Appends pushing of a new tag and @returns the new tag.
-	evmasm::AssemblyItem pushNewTag() { return m_asm->append(m_asm->newPushTag()).tag(); }
-	/// @returns a new tag without pushing any opcodes or data
-	evmasm::AssemblyItem newTag() { return m_asm->newTag(); }
-	/// @returns a new tag identified by name.
-	evmasm::AssemblyItem namedTag(std::string const& _name, size_t _params, size_t _returns, std::optional<uint64_t> _sourceID)
-	{
-		return m_asm->namedTag(_name, _params, _returns, _sourceID);
-	}
-	/// Adds a subroutine to the code (in the data section) and pushes its size (via a tag)
-	/// on the stack. @returns the pushsub assembly item.
-	evmasm::AssemblyItem addSubroutine(evmasm::AssemblyPointer const& _assembly) { return m_asm->appendSubroutine(_assembly); }
-	/// Pushes the size of the subroutine.
-	void pushSubroutineSize(size_t _subRoutine) { m_asm->pushSubroutineSize(_subRoutine); }
-	/// Pushes the offset of the subroutine.
-	void pushSubroutineOffset(size_t _subRoutine) { m_asm->pushSubroutineOffset(_subRoutine); }
-	/// Pushes the size of the final program
-	void appendProgramSize() { m_asm->appendProgramSize(); }
-	/// Adds data to the data section, pushes a reference to the stack
-	evmasm::AssemblyItem appendData(bytes const& _data) { return m_asm->append(_data); }
-	/// Appends the address (virtual, will be filled in by linker) of a library.
-	void appendLibraryAddress(std::string const& _identifier) { m_asm->appendLibraryAddress(_identifier); }
-	/// Appends an immutable variable. The value will be filled in by the constructor.
-	void appendImmutable(std::string const& _identifier) { m_asm->appendImmutable(_identifier); }
-	/// Appends an assignment to an immutable variable. Only valid in creation code.
-	void appendImmutableAssignment(std::string const& _identifier) { m_asm->appendImmutableAssignment(_identifier); }
-	/// Appends a zero-address that can be replaced by something else at deploy time (if the
-	/// position in bytecode is known).
-	void appendDeployTimeAddress() { m_asm->append(evmasm::PushDeployTimeAddress); }
-	/// Resets the stack of visited nodes with a new stack having only @c _node
-	void resetVisitedNodes(ASTNode const* _node);
-	/// Pops the stack of visited nodes
-	void popVisitedNodes() { m_visitedNodes.pop(); updateSourceLocation(); }
-	/// Pushes an ASTNode to the stack of visited nodes
-	void pushVisitedNodes(ASTNode const* _node) { m_visitedNodes.push(_node); updateSourceLocation(); }
-
-	/// Append elements to the current instruction list and adjust @a m_stackOffset.
-	CompilerContext& operator<<(evmasm::AssemblyItem const& _item) { m_asm->append(_item); return *this; }
-	CompilerContext& operator<<(evmasm::Instruction _instruction) { m_asm->append(_instruction); return *this; }
-	CompilerContext& operator<<(u256 const& _value) { m_asm->append(_value); return *this; }
-	CompilerContext& operator<<(bytes const& _data) { m_asm->append(_data); return *this; }
-
-	/// Appends inline assembly (strict-EVM dialect for the current version).
-	/// @param _assembly the assembly text, should be a block.
-	/// @param _localVariables assigns stack positions to variables with the last one being the stack top
-	/// @param _externallyUsedFunctions a set of function names that are not to be renamed or removed.
-	/// @param _system if true, this is a "system-level" assembly where all functions use named labels
-	///                and the code is marked to be exported as "compiler-generated assembly utility file".
-	/// @param _optimiserSettings settings for the Yul optimiser, which is run in this function already.
-	/// @param _sourceName the name of the assembly file to be used for source locations
-	void appendInlineAssembly(
-		std::string const& _assembly,
-		std::vector<std::string> const& _localVariables = std::vector<std::string>(),
-		std::set<std::string> const& _externallyUsedFunctions = std::set<std::string>(),
-		bool _system = false,
-		OptimiserSettings const& _optimiserSettings = OptimiserSettings::none(),
-		std::string _sourceName = "--CODEGEN--"
-	);
-
-	/// If m_revertStrings is debug, @returns inline assembly code that
-	/// stores @param _message at the free memory pointer and reverts.
-	/// Otherwise returns "revert(0, 0)".
-	std::string revertReasonIfDebug(std::string const& _message = "");
-
-	void optimizeYul(yul::Object& _object, yul::EVMDialect const& _dialect, OptimiserSettings const& _optimiserSetting, std::set<yul::YulString> const& _externalIdentifiers = {});
-
-	/// Appends arbitrary data to the end of the bytecode.
-	void appendToAuxiliaryData(bytes const& _data) { m_asm->appendToAuxiliaryData(_data); }
-
-	/// Run optimisation step.
-	void optimise(OptimiserSettings const& _settings) { m_asm->optimise(evmasm::Assembly::OptimiserSettings::translateSettings(_settings, m_evmVersion)); }
-
-	/// @returns the runtime context if in creation mode and runtime context is set, nullptr otherwise.
-	CompilerContext* runtimeContext() const { return m_runtimeContext; }
-	/// @returns the identifier of the runtime subroutine.
-	size_t runtimeSub() const { return m_runtimeSub; }
-
-	/// @returns a const reference to the underlying assembly.
-	evmasm::Assembly const& assembly() const { return *m_asm; }
-	/// @returns a shared pointer to the assembly.
-	/// Should be avoided except when adding sub-assemblies.
-	std::shared_ptr<evmasm::Assembly> assemblyPtr() const { return m_asm; }
-
-	/**
-	 * Helper class to pop the visited nodes stack when a scope closes
-	 */
-	class LocationSetter: public ScopeGuard
-	{
-	public:
-		LocationSetter(CompilerContext& _compilerContext, ASTNode const& _node):
-			ScopeGuard([&]{ _compilerContext.popVisitedNodes(); }) { _compilerContext.pushVisitedNodes(&_node); }
-	};
-
-	void setModifierDepth(size_t _modifierDepth) { m_asm->m_currentModifierDepth = _modifierDepth; }
-
-	RevertStrings revertStrings() const { return m_revertStrings; }
-
-private:
-	/// Updates source location set in the assembly.
-	void updateSourceLocation();
-
-	/**
-	 * Helper class that manages function labels and ensures that referenced functions are
-	 * compiled in a specific order.
-	 */
-	struct FunctionCompilationQueue
-	{
-		/// @returns the entry label of the given function and creates it if it does not exist yet.
-		/// @param _context compiler context used to create a new tag if needed
-		evmasm::AssemblyItem entryLabel(Declaration const& _declaration, CompilerContext& _context);
-		/// @returns the entry label of the given function. Might return an AssemblyItem of type
-		/// UndefinedItem if it does not exist yet.
-		evmasm::AssemblyItem entryLabelIfExists(Declaration const& _declaration) const;
-
-		/// @returns the next function in the queue of functions that are still to be compiled
-		/// (i.e. that were referenced during compilation but where we did not yet generate code for).
-		/// Returns nullptr if the queue is empty. Does not remove the function from the queue,
-		/// that will only be done by startFunction below.
-		Declaration const* nextFunctionToCompile() const;
-		/// Informs the queue that we are about to compile the given function, i.e. removes
-		/// the function from the queue of functions to compile.
-		void startFunction(Declaration const& _function);
-
-		/// Labels pointing to the entry points of functions.
-		std::map<Declaration const*, evmasm::AssemblyItem> m_entryLabels;
-		/// Set of functions for which we did not yet generate code.
-		std::set<Declaration const*> m_alreadyCompiledFunctions;
-		/// Queue of functions that still need to be compiled (important to be a queue to maintain
-		/// determinism even in the presence of a non-deterministic allocator).
-		/// Mutable because we will throw out some functions earlier than needed.
-		mutable std::queue<Declaration const*> m_functionsToCompile;
-	} m_functionCompilationQueue;
-
-	evmasm::AssemblyPointer m_asm;
-	/// Version of the EVM to compile against.
-	langutil::EVMVersion m_evmVersion;
-	RevertStrings const m_revertStrings;
-	bool m_useABICoderV2 = false;
-	/// Other already compiled contracts to be used in contract creation calls.
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> m_otherCompilers;
-	/// Storage offsets of state variables
-	std::map<Declaration const*, std::pair<u256, unsigned>> m_stateVariables;
-	/// Memory offsets reserved for the values of immutable variables during contract creation.
-	std::map<VariableDeclaration const*, size_t> m_immutableVariables;
-	/// Total amount of reserved memory. Reserved memory is used to store immutable variables during contract creation.
-	/// This has to be finalized before initialiseFreeMemoryPointer() is called. That function
-	/// will reset the optional to verify that.
-	std::optional<size_t> m_reservedMemory = {0};
-	/// Offsets of local variables on the stack (relative to stack base).
-	/// This needs to be a stack because if a modifier contains a local variable and this
-	/// modifier is applied twice, the position of the variable needs to be restored
-	/// after the nested modifier is left.
-	std::map<Declaration const*, std::vector<unsigned>> m_localVariables;
-	/// The contract currently being compiled. Virtual function lookup starts from this contarct.
-	ContractDefinition const* m_mostDerivedContract = nullptr;
-	/// Whether to use checked arithmetic.
-	Arithmetic m_arithmetic = Arithmetic::Checked;
-	/// Stack of current visited AST nodes, used for location attachment
-	std::stack<ASTNode const*> m_visitedNodes;
-	/// The runtime context if in Creation mode, this is used for generating tags that would be stored into the storage and then used at runtime.
-	CompilerContext *m_runtimeContext;
-	/// The index of the runtime subroutine.
-	size_t m_runtimeSub = std::numeric_limits<size_t>::max();
-	/// An index of low-level function labels by name.
-	std::map<std::string, evmasm::AssemblyItem> m_lowLevelFunctions;
-	/// Collector for yul functions.
-	MultiUseYulFunctionCollector m_yulFunctionCollector;
-	/// Set of externally used yul functions.
-	std::set<std::string> m_externallyUsedYulFunctions;
-	/// Generated Yul code used as utility. Source references from the bytecode can point here.
-	/// Produced from @a m_yulFunctionCollector.
-	std::string m_generatedYulUtilityCode;
-	/// Container for ABI functions to be generated.
-	ABIFunctions m_abiFunctions;
-	/// Container for Yul Util functions to be generated.
-	YulUtilFunctions m_yulUtilFunctions;
-	/// The queue of low-level functions to generate.
-	std::queue<std::tuple<std::string, unsigned, unsigned, std::function<void(CompilerContext&)>>> m_lowLevelFunctionGenerationQueue;
-	/// Flag to check that appendYulUtilityFunctions() was called exactly once
-	bool m_appendYulUtilityFunctionsRan = false;
-};
-
-}
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
deleted file mode 100644
index bf4f25bf289e..000000000000
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ /dev/null
@@ -1,1654 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Routines used by both the compiler and the expression compiler.
- */
-
-#include <libsolidity/codegen/CompilerUtils.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/codegen/ABIFunctions.h>
-#include <libsolidity/codegen/ArrayUtils.h>
-#include <libsolidity/codegen/LValue.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libevmasm/Instruction.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StackTooDeepString.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-using solidity::util::Whiskers;
-using solidity::util::h256;
-using solidity::toCompactHexWithPrefix;
-
-unsigned const CompilerUtils::dataStartOffset = 4;
-size_t const CompilerUtils::freeMemoryPointer = 64;
-size_t const CompilerUtils::zeroPointer = CompilerUtils::freeMemoryPointer + 32;
-size_t const CompilerUtils::generalPurposeMemoryStart = CompilerUtils::zeroPointer + 32;
-
-static_assert(CompilerUtils::freeMemoryPointer >= 64, "Free memory pointer must not overlap with scratch area.");
-static_assert(CompilerUtils::zeroPointer >= CompilerUtils::freeMemoryPointer + 32, "Zero pointer must not overlap with free memory pointer.");
-static_assert(CompilerUtils::generalPurposeMemoryStart >= CompilerUtils::zeroPointer + 32, "General purpose memory must not overlap with zero area.");
-
-void CompilerUtils::initialiseFreeMemoryPointer()
-{
-	size_t reservedMemory = m_context.reservedMemory();
-	solAssert(bigint(generalPurposeMemoryStart) + bigint(reservedMemory) < bigint(1) << 63);
-	m_context << (u256(generalPurposeMemoryStart) + reservedMemory);
-	storeFreeMemoryPointer();
-}
-
-void CompilerUtils::fetchFreeMemoryPointer()
-{
-	m_context << u256(freeMemoryPointer) << Instruction::MLOAD;
-}
-
-void CompilerUtils::storeFreeMemoryPointer()
-{
-	m_context << u256(freeMemoryPointer) << Instruction::MSTORE;
-}
-
-void CompilerUtils::allocateMemory()
-{
-	fetchFreeMemoryPointer();
-	m_context << Instruction::SWAP1 << Instruction::DUP2 << Instruction::ADD;
-	storeFreeMemoryPointer();
-}
-
-void CompilerUtils::allocateMemory(u256 const& size)
-{
-	fetchFreeMemoryPointer();
-	m_context << Instruction::DUP1 << size << Instruction::ADD;
-	storeFreeMemoryPointer();
-}
-
-void CompilerUtils::toSizeAfterFreeMemoryPointer()
-{
-	fetchFreeMemoryPointer();
-	m_context << Instruction::DUP1 << Instruction::SWAP2 << Instruction::SUB;
-	m_context << Instruction::SWAP1;
-}
-
-void CompilerUtils::revertWithStringData(Type const& _argumentType)
-{
-	solAssert(_argumentType.isImplicitlyConvertibleTo(*TypeProvider::fromElementaryTypeName("string memory")));
-	fetchFreeMemoryPointer();
-	m_context << util::selectorFromSignatureU256("Error(string)");
-	m_context << Instruction::DUP2 << Instruction::MSTORE;
-	m_context << u256(4) << Instruction::ADD;
-	// Stack: <string data> <mem pos of encoding start>
-	abiEncode({&_argumentType}, {TypeProvider::array(DataLocation::Memory, true)});
-	toSizeAfterFreeMemoryPointer();
-	m_context << Instruction::REVERT;
-}
-
-void CompilerUtils::revertWithError(
-	std::string const& _signature,
-	std::vector<Type const*> const& _parameterTypes,
-	std::vector<Type const*> const& _argumentTypes
-)
-{
-	fetchFreeMemoryPointer();
-	m_context << util::selectorFromSignatureU256(_signature);
-	m_context << Instruction::DUP2 << Instruction::MSTORE;
-	m_context << u256(4) << Instruction::ADD;
-	// Stack: <arguments...> <mem pos of encoding start>
-	abiEncode(_argumentTypes, _parameterTypes);
-	toSizeAfterFreeMemoryPointer();
-	m_context << Instruction::REVERT;
-}
-
-void CompilerUtils::returnDataToArray()
-{
-	if (m_context.evmVersion().supportsReturndata())
-	{
-		m_context << Instruction::RETURNDATASIZE;
-		m_context.appendInlineAssembly(R"({
-			switch v case 0 {
-				v := 0x60
-			} default {
-				v := mload(0x40)
-				mstore(0x40, add(v, and(add(returndatasize(), 0x3f), not(0x1f))))
-				mstore(v, returndatasize())
-				returndatacopy(add(v, 0x20), 0, returndatasize())
-			}
-		})", {"v"});
-	}
-	else
-		pushZeroPointer();
-}
-
-void CompilerUtils::accessCalldataTail(Type const& _type)
-{
-	m_context << Instruction::SWAP1;
-	m_context.callYulFunction(
-		m_context.utilFunctions().accessCalldataTailFunction(_type),
-		2,
-		_type.isDynamicallySized() ? 2 : 1
-	);
-}
-
-unsigned CompilerUtils::loadFromMemory(
-	unsigned _offset,
-	Type const& _type,
-	bool _fromCalldata,
-	bool _padToWordBoundaries
-)
-{
-	solAssert(_type.category() != Type::Category::Array, "Unable to statically load dynamic type.");
-	m_context << u256(_offset);
-	return loadFromMemoryHelper(_type, _fromCalldata, _padToWordBoundaries);
-}
-
-void CompilerUtils::loadFromMemoryDynamic(
-	Type const& _type,
-	bool _fromCalldata,
-	bool _padToWordBoundaries,
-	bool _keepUpdatedMemoryOffset
-)
-{
-	if (_keepUpdatedMemoryOffset)
-		m_context << Instruction::DUP1;
-
-	if (auto arrayType = dynamic_cast<ArrayType const*>(&_type))
-	{
-		solAssert(!arrayType->isDynamicallySized());
-		solAssert(!_fromCalldata);
-		solAssert(_padToWordBoundaries);
-		if (_keepUpdatedMemoryOffset)
-			m_context << arrayType->memoryDataSize() << Instruction::ADD;
-	}
-	else
-	{
-		unsigned numBytes = loadFromMemoryHelper(_type, _fromCalldata, _padToWordBoundaries);
-		if (_keepUpdatedMemoryOffset)
-		{
-			// update memory counter
-			moveToStackTop(_type.sizeOnStack());
-			m_context << u256(numBytes) << Instruction::ADD;
-		}
-	}
-}
-
-void CompilerUtils::storeInMemory(unsigned _offset)
-{
-	unsigned numBytes = prepareMemoryStore(*TypeProvider::uint256(), true);
-	if (numBytes > 0)
-		m_context << u256(_offset) << Instruction::MSTORE;
-}
-
-void CompilerUtils::storeInMemoryDynamic(Type const& _type, bool _padToWordBoundaries, bool _cleanup)
-{
-	// process special types (Reference, StringLiteral, Function)
-	if (auto ref = dynamic_cast<ReferenceType const*>(&_type))
-	{
-		solUnimplementedAssert(
-			ref->location() == DataLocation::Memory,
-			"Only in-memory reference type can be stored."
-		);
-		storeInMemoryDynamic(*TypeProvider::uint256(), _padToWordBoundaries, _cleanup);
-	}
-	else if (auto str = dynamic_cast<StringLiteralType const*>(&_type))
-	{
-		m_context << Instruction::DUP1;
-		storeStringData(bytesConstRef(str->value()));
-		if (_padToWordBoundaries)
-			m_context << u256(std::max<size_t>(32, ((str->value().size() + 31) / 32) * 32));
-		else
-			m_context << u256(str->value().size());
-		m_context << Instruction::ADD;
-	}
-	else if (
-		_type.category() == Type::Category::Function &&
-		dynamic_cast<FunctionType const&>(_type).kind() == FunctionType::Kind::External
-	)
-	{
-		combineExternalFunctionType(true);
-		m_context << Instruction::DUP2 << Instruction::MSTORE;
-		m_context << u256(_padToWordBoundaries ? 32 : 24) << Instruction::ADD;
-	}
-	else if (_type.isValueType())
-	{
-		unsigned numBytes = prepareMemoryStore(_type, _padToWordBoundaries, _cleanup);
-		m_context << Instruction::DUP2 << Instruction::MSTORE;
-		m_context << u256(numBytes) << Instruction::ADD;
-	}
-	else // Should never happen
-	{
-		solAssert(
-			false,
-			"Memory store of type " + _type.toString(true) + " not allowed."
-		);
-	}
-}
-
-void CompilerUtils::abiDecode(TypePointers const& _typeParameters, bool _fromMemory)
-{
-	/// Stack: <source_offset> <length>
-	if (m_context.useABICoderV2())
-	{
-		// Use the new Yul-based decoding function
-		auto stackHeightBefore = m_context.stackHeight();
-		abiDecodeV2(_typeParameters, _fromMemory);
-		solAssert(m_context.stackHeight() - stackHeightBefore == sizeOnStack(_typeParameters) - 2);
-		return;
-	}
-
-	//@todo this does not yet support nested dynamic arrays
-	size_t encodedSize = 0;
-	for (auto const& t: _typeParameters)
-		encodedSize += t->decodingType()->calldataHeadSize();
-
-	Whiskers templ(R"({
-		if lt(len, <encodedSize>) { <revertString> }
-	})");
-	templ("encodedSize", std::to_string(encodedSize));
-	templ("revertString", m_context.revertReasonIfDebug("Calldata too short"));
-	m_context.appendInlineAssembly(templ.render(), {"len"});
-
-	m_context << Instruction::DUP2 << Instruction::ADD;
-	m_context << Instruction::SWAP1;
-	/// Stack: <input_end> <source_offset>
-
-	// Retain the offset pointer as base_offset, the point from which the data offsets are computed.
-	m_context << Instruction::DUP1;
-	for (Type const* parameterType: _typeParameters)
-	{
-		// stack: v1 v2 ... v(k-1) input_end base_offset current_offset
-		Type const* type = parameterType->decodingType();
-		solUnimplementedAssert(type, "No decoding type found.");
-		if (type->category() == Type::Category::Array)
-		{
-			auto const& arrayType = dynamic_cast<ArrayType const&>(*type);
-			solUnimplementedAssert(!arrayType.baseType()->isDynamicallyEncoded(), "Nested arrays not yet implemented.");
-			if (_fromMemory)
-			{
-				solUnimplementedAssert(
-					arrayType.baseType()->isValueType(),
-					"Nested memory arrays not yet implemented here."
-				);
-				// @todo If base type is an array or struct, it is still calldata-style encoded, so
-				// we would have to convert it like below.
-				solAssert(arrayType.location() == DataLocation::Memory);
-				if (arrayType.isDynamicallySized())
-				{
-					// compute data pointer
-					m_context << Instruction::DUP1 << Instruction::MLOAD;
-					// stack: v1 v2 ... v(k-1) input_end base_offset current_offset data_offset
-
-					fetchFreeMemoryPointer();
-					// stack: v1 v2 ... v(k-1) input_end base_offset current_offset data_offset dstmem
-					moveIntoStack(4);
-					// stack: v1 v2 ... v(k-1) dstmem input_end base_offset current_offset data_offset
-					m_context << Instruction::DUP5;
-					// stack: v1 v2 ... v(k-1) dstmem input_end base_offset current_offset data_offset dstmem
-
-					// Check that the data pointer is valid and that length times
-					// item size is still inside the range.
-					Whiskers templ(R"({
-						if gt(ptr, 0x100000000) { <revertStringPointer> }
-						ptr := add(ptr, base_offset)
-						let array_data_start := add(ptr, 0x20)
-						if gt(array_data_start, input_end) { <revertStringStart> }
-						let array_length := mload(ptr)
-						if or(
-							gt(array_length, 0x100000000),
-							gt(add(array_data_start, mul(array_length, <item_size>)), input_end)
-						) { <revertStringLength> }
-						mstore(dst, array_length)
-						dst := add(dst, 0x20)
-					})");
-					templ("item_size", std::to_string(arrayType.calldataStride()));
-					// TODO add test
-					templ("revertStringPointer", m_context.revertReasonIfDebug("ABI memory decoding: invalid data pointer"));
-					templ("revertStringStart", m_context.revertReasonIfDebug("ABI memory decoding: invalid data start"));
-					templ("revertStringLength", m_context.revertReasonIfDebug("ABI memory decoding: invalid data length"));
-					m_context.appendInlineAssembly(templ.render(), {"input_end", "base_offset", "offset", "ptr", "dst"});
-					// stack: v1 v2 ... v(k-1) dstmem input_end base_offset current_offset data_ptr dstdata
-					m_context << Instruction::SWAP1;
-					// stack: v1 v2 ... v(k-1) dstmem input_end base_offset current_offset dstdata data_ptr
-					ArrayUtils(m_context).copyArrayToMemory(arrayType, true);
-					// stack: v1 v2 ... v(k-1) dstmem input_end base_offset current_offset mem_end
-					storeFreeMemoryPointer();
-					m_context << u256(0x20) << Instruction::ADD;
-				}
-				else
-				{
-					// Size has already been checked for this one.
-					moveIntoStack(2);
-					m_context << Instruction::DUP3;
-					m_context << u256(arrayType.calldataHeadSize()) << Instruction::ADD;
-				}
-			}
-			else
-			{
-				// first load from calldata and potentially convert to memory if arrayType is memory
-				Type const* calldataType = TypeProvider::withLocation(&arrayType, DataLocation::CallData, false);
-				if (calldataType->isDynamicallySized())
-				{
-					// put on stack: data_pointer length
-					loadFromMemoryDynamic(*TypeProvider::uint256(), !_fromMemory);
-					m_context << Instruction::SWAP1;
-					// stack: input_end base_offset next_pointer data_offset
-					m_context.appendInlineAssembly(Whiskers(R"({
-						if gt(data_offset, 0x100000000) { <revertString> }
-					})")
-					// TODO add test
-					("revertString", m_context.revertReasonIfDebug("ABI calldata decoding: invalid data offset"))
-					.render(), {"data_offset"});
-					m_context << Instruction::DUP3 << Instruction::ADD;
-					// stack: input_end base_offset next_pointer array_head_ptr
-					m_context.appendInlineAssembly(Whiskers(R"({
-						if gt(add(array_head_ptr, 0x20), input_end) { <revertString> }
-					})")
-					("revertString", m_context.revertReasonIfDebug("ABI calldata decoding: invalid head pointer"))
-					.render(), {"input_end", "base_offset", "next_ptr", "array_head_ptr"});
-
-					// retrieve length
-					loadFromMemoryDynamic(*TypeProvider::uint256(), !_fromMemory, true);
-					// stack: input_end base_offset next_pointer array_length data_pointer
-					m_context << Instruction::SWAP2;
-					// stack: input_end base_offset data_pointer array_length next_pointer
-					m_context.appendInlineAssembly(Whiskers(R"({
-						if or(
-							gt(array_length, 0x100000000),
-							gt(add(data_ptr, mul(array_length, )" + std::to_string(arrayType.calldataStride()) + R"()), input_end)
-						) { <revertString> }
-					})")
-					("revertString", m_context.revertReasonIfDebug("ABI calldata decoding: invalid data pointer"))
-					.render(), {"input_end", "base_offset", "data_ptr", "array_length", "next_ptr"});
-				}
-				else
-				{
-					// size has already been checked
-					// stack: input_end base_offset data_offset
-					m_context << Instruction::DUP1;
-					m_context << u256(calldataType->calldataHeadSize()) << Instruction::ADD;
-				}
-				if (arrayType.location() == DataLocation::Memory)
-				{
-					// stack: input_end base_offset calldata_ref [length] next_calldata
-					// copy to memory
-					// move calldata type up again
-					moveIntoStack(calldataType->sizeOnStack());
-					convertType(*calldataType, arrayType, false, false, true);
-					// fetch next pointer again
-					moveToStackTop(arrayType.sizeOnStack());
-				}
-				// move input_end up
-				// stack: input_end base_offset calldata_ref [length] next_calldata
-				moveToStackTop(2 + arrayType.sizeOnStack());
-				m_context << Instruction::SWAP1;
-				// stack: base_offset calldata_ref [length] input_end next_calldata
-				moveToStackTop(2 + arrayType.sizeOnStack());
-				m_context << Instruction::SWAP1;
-				// stack: calldata_ref [length] input_end base_offset next_calldata
-			}
-		}
-		else
-		{
-			solAssert(!type->isDynamicallyEncoded(), "Unknown dynamically sized type: " + type->toString());
-			loadFromMemoryDynamic(*type, !_fromMemory, true);
-			// stack: v1 v2 ... v(k-1) input_end base_offset v(k) mem_offset
-			moveToStackTop(1, type->sizeOnStack());
-			moveIntoStack(3, type->sizeOnStack());
-		}
-		// stack: v1 v2 ... v(k-1) v(k) input_end base_offset next_offset
-	}
-	popStackSlots(3);
-}
-
-void CompilerUtils::encodeToMemory(
-	TypePointers const& _givenTypes,
-	TypePointers const& _targetTypes,
-	bool _padToWordBoundaries,
-	bool _copyDynamicDataInPlace,
-	bool _encodeAsLibraryTypes
-)
-{
-	// stack: <v1> <v2> ... <vn> <mem>
-	bool const encoderV2 = m_context.useABICoderV2();
-	TypePointers targetTypes = _targetTypes.empty() ? _givenTypes : _targetTypes;
-	solAssert(targetTypes.size() == _givenTypes.size());
-	for (Type const*& t: targetTypes)
-	{
-		Type const* tEncoding = t->fullEncodingType(_encodeAsLibraryTypes, encoderV2, !_padToWordBoundaries);
-		solUnimplementedAssert(tEncoding, "Encoding type \"" + t->toString() + "\" not yet implemented.");
-		t = std::move(tEncoding);
-	}
-
-	if (_givenTypes.empty())
-		return;
-	if (encoderV2)
-	{
-		// Use the new Yul-based encoding function
-		solAssert(
-			_padToWordBoundaries != _copyDynamicDataInPlace,
-			"Non-padded and in-place encoding can only be combined."
-		);
-		auto stackHeightBefore = m_context.stackHeight();
-		abiEncodeV2(_givenTypes, targetTypes, _encodeAsLibraryTypes, _padToWordBoundaries);
-		solAssert(stackHeightBefore - m_context.stackHeight() == sizeOnStack(_givenTypes));
-		return;
-	}
-
-	// Stack during operation:
-	// <v1> <v2> ... <vn> <mem_start> <dyn_head_1> ... <dyn_head_r> <end_of_mem>
-	// The values dyn_head_n are added during the first loop and they point to the head part
-	// of the nth dynamic parameter, which is filled once the dynamic parts are processed.
-
-	// store memory start pointer
-	m_context << Instruction::DUP1;
-
-	unsigned argSize = CompilerUtils::sizeOnStack(_givenTypes);
-	unsigned stackPos = 0; // advances through the argument values
-	unsigned dynPointers = 0; // number of dynamic head pointers on the stack
-	for (size_t i = 0; i < _givenTypes.size(); ++i)
-	{
-		Type const* targetType = targetTypes[i];
-		solAssert(!!targetType, "Externalable type expected.");
-		if (targetType->isDynamicallySized() && !_copyDynamicDataInPlace)
-		{
-			// leave end_of_mem as dyn head pointer
-			m_context << Instruction::DUP1 << u256(32) << Instruction::ADD;
-			dynPointers++;
-			assertThrow(
-				(argSize + dynPointers) < 16,
-				StackTooDeepError,
-				util::stackTooDeepString
-			);
-		}
-		else
-		{
-			bool needCleanup = true;
-			copyToStackTop(argSize - stackPos + dynPointers + 2, _givenTypes[i]->sizeOnStack());
-			solAssert(!!targetType, "Externalable type expected.");
-			Type const* type = targetType;
-			if (_givenTypes[i]->dataStoredIn(DataLocation::Storage) && targetType->isValueType())
-			{
-				// special case: convert storage reference type to value type - this is only
-				// possible for library calls where we just forward the storage reference
-				solAssert(_encodeAsLibraryTypes);
-				solAssert(_givenTypes[i]->sizeOnStack() == 1);
-			}
-			else if (
-				_givenTypes[i]->dataStoredIn(DataLocation::Storage) ||
-				_givenTypes[i]->dataStoredIn(DataLocation::CallData) ||
-				_givenTypes[i]->category() == Type::Category::StringLiteral ||
-				_givenTypes[i]->category() == Type::Category::Function
-			)
-				type = _givenTypes[i]; // delay conversion
-			else
-			{
-				convertType(*_givenTypes[i], *targetType, true);
-				needCleanup = false;
-			}
-
-			if (auto arrayType = dynamic_cast<ArrayType const*>(type))
-				ArrayUtils(m_context).copyArrayToMemory(*arrayType, _padToWordBoundaries);
-			else if (auto arraySliceType = dynamic_cast<ArraySliceType const*>(type))
-			{
-				solAssert(
-					arraySliceType->dataStoredIn(DataLocation::CallData) &&
-					arraySliceType->isDynamicallySized() &&
-					!arraySliceType->arrayType().baseType()->isDynamicallyEncoded(),
-					""
-				);
-				ArrayUtils(m_context).copyArrayToMemory(arraySliceType->arrayType(), _padToWordBoundaries);
-			}
-			else
-				storeInMemoryDynamic(*type, _padToWordBoundaries, needCleanup);
-		}
-		stackPos += _givenTypes[i]->sizeOnStack();
-	}
-
-	// now copy the dynamic part
-	// Stack: <v1> <v2> ... <vn> <mem_start> <dyn_head_1> ... <dyn_head_r> <end_of_mem>
-	stackPos = 0;
-	unsigned thisDynPointer = 0;
-	for (size_t i = 0; i < _givenTypes.size(); ++i)
-	{
-		Type const* targetType = targetTypes[i];
-		solAssert(!!targetType, "Externalable type expected.");
-		if (targetType->isDynamicallySized() && !_copyDynamicDataInPlace)
-		{
-			// copy tail pointer (=mem_end - mem_start) to memory
-			assertThrow(
-				(2 + dynPointers) <= 16,
-				StackTooDeepError,
-				util::stackTooDeepString
-			);
-			m_context << dupInstruction(2 + dynPointers) << Instruction::DUP2;
-			m_context << Instruction::SUB;
-			m_context << dupInstruction(2 + dynPointers - thisDynPointer);
-			m_context << Instruction::MSTORE;
-			// stack: ... <end_of_mem>
-			if (_givenTypes[i]->category() == Type::Category::StringLiteral)
-			{
-				auto const& strType = dynamic_cast<StringLiteralType const&>(*_givenTypes[i]);
-				auto const size = strType.value().size();
-				m_context << u256(size);
-				storeInMemoryDynamic(*TypeProvider::uint256(), true);
-				// stack: ... <end_of_mem'>
-
-				// Do not output empty padding for zero-length strings.
-				// TODO: handle this in storeInMemoryDynamic
-				if (size != 0)
-					storeInMemoryDynamic(strType, _padToWordBoundaries);
-			}
-			else
-			{
-				ArrayType const* arrayType = nullptr;
-				switch (_givenTypes[i]->category())
-				{
-					case Type::Category::Array:
-						arrayType = dynamic_cast<ArrayType const*>(_givenTypes[i]);
-						break;
-					case Type::Category::ArraySlice:
-						arrayType = &dynamic_cast<ArraySliceType const*>(_givenTypes[i])->arrayType();
-						solAssert(
-							arrayType->isDynamicallySized() &&
-							arrayType->dataStoredIn(DataLocation::CallData) &&
-							!arrayType->baseType()->isDynamicallyEncoded(),
-							""
-						);
-						break;
-					default:
-						solAssert(false, "Unknown dynamic type.");
-						break;
-				}
-				// now copy the array
-				copyToStackTop(argSize - stackPos + dynPointers + 2, arrayType->sizeOnStack());
-				// stack: ... <end_of_mem> <value...>
-				// copy length to memory
-				m_context << dupInstruction(1 + arrayType->sizeOnStack());
-				ArrayUtils(m_context).retrieveLength(*arrayType, 1);
-				// stack: ... <end_of_mem> <value...> <end_of_mem'> <length>
-				storeInMemoryDynamic(*TypeProvider::uint256(), true);
-				// stack: ... <end_of_mem> <value...> <end_of_mem''>
-				// copy the new memory pointer
-				m_context << swapInstruction(arrayType->sizeOnStack() + 1) << Instruction::POP;
-				// stack: ... <end_of_mem''> <value...>
-				// copy data part
-				ArrayUtils(m_context).copyArrayToMemory(*arrayType, _padToWordBoundaries);
-				// stack: ... <end_of_mem'''>
-			}
-
-			thisDynPointer++;
-		}
-		stackPos += _givenTypes[i]->sizeOnStack();
-	}
-
-	// remove unneeded stack elements (and retain memory pointer)
-	m_context << swapInstruction(argSize + dynPointers + 1);
-	popStackSlots(argSize + dynPointers + 1);
-}
-
-void CompilerUtils::abiEncodeV2(
-	TypePointers const& _givenTypes,
-	TypePointers const& _targetTypes,
-	bool _encodeAsLibraryTypes,
-	bool _padToWordBoundaries
-)
-{
-	if (!_padToWordBoundaries)
-		solAssert(!_encodeAsLibraryTypes, "Library calls cannot be packed.");
-
-	// stack: <$value0> <$value1> ... <$value(n-1)> <$headStart>
-
-	std::string encoderName =
-		_padToWordBoundaries ?
-		m_context.abiFunctions().tupleEncoderReversed(_givenTypes, _targetTypes, _encodeAsLibraryTypes) :
-		m_context.abiFunctions().tupleEncoderPackedReversed(_givenTypes, _targetTypes);
-	m_context.callYulFunction(encoderName, sizeOnStack(_givenTypes) + 1, 1);
-}
-
-void CompilerUtils::abiDecodeV2(TypePointers const& _parameterTypes, bool _fromMemory)
-{
-	// stack: <source_offset> <length> [stack top]
-	m_context << Instruction::DUP2 << Instruction::ADD;
-	m_context << Instruction::SWAP1;
-	// stack: <end> <start>
-	std::string decoderName = m_context.abiFunctions().tupleDecoder(_parameterTypes, _fromMemory);
-	m_context.callYulFunction(decoderName, 2, sizeOnStack(_parameterTypes));
-}
-
-void CompilerUtils::zeroInitialiseMemoryArray(ArrayType const& _type)
-{
-	if (_type.baseType()->hasSimpleZeroValueInMemory())
-	{
-		solAssert(_type.baseType()->isValueType());
-		Whiskers templ(R"({
-			let size := mul(length, <element_size>)
-			// cheap way of zero-initializing a memory range
-			calldatacopy(memptr, calldatasize(), size)
-			memptr := add(memptr, size)
-		})");
-		templ("element_size", std::to_string(_type.memoryStride()));
-		m_context.appendInlineAssembly(templ.render(), {"length", "memptr"});
-	}
-	else
-	{
-		auto repeat = m_context.newTag();
-		m_context << repeat;
-		pushZeroValue(*_type.baseType());
-		storeInMemoryDynamic(*_type.baseType());
-		m_context << Instruction::SWAP1 << u256(1) << Instruction::SWAP1;
-		m_context << Instruction::SUB << Instruction::SWAP1;
-		m_context << Instruction::DUP2;
-		m_context.appendConditionalJumpTo(repeat);
-	}
-	m_context << Instruction::SWAP1 << Instruction::POP;
-}
-
-void CompilerUtils::memoryCopy32()
-{
-	// Stack here: size target source
-
-	m_context.appendInlineAssembly(R"(
-		{
-			for { let i := 0 } lt(i, len) { i := add(i, 32) } {
-				mstore(add(dst, i), mload(add(src, i)))
-			}
-		}
-	)",
-		{ "len", "dst", "src" }
-	);
-	m_context << Instruction::POP << Instruction::POP << Instruction::POP;
-}
-
-void CompilerUtils::memoryCopy()
-{
-	// Stack here: size target source
-
-	m_context.appendInlineAssembly(R"(
-		{
-			// copy 32 bytes at once
-			for
-				{}
-				iszero(lt(len, 32))
-				{
-					dst := add(dst, 32)
-					src := add(src, 32)
-					len := sub(len, 32)
-				}
-				{ mstore(dst, mload(src)) }
-
-			// copy the remainder (0 < len < 32)
-			let mask := sub(exp(256, sub(32, len)), 1)
-			let srcpart := and(mload(src), not(mask))
-			let dstpart := and(mload(dst), mask)
-			mstore(dst, or(srcpart, dstpart))
-		}
-	)",
-		{ "len", "dst", "src" }
-	);
-	m_context << Instruction::POP << Instruction::POP << Instruction::POP;
-}
-
-void CompilerUtils::splitExternalFunctionType(bool _leftAligned)
-{
-	// We have to split the left-aligned <address><function identifier> into two stack slots:
-	// address (right aligned), function identifier (right aligned)
-	if (_leftAligned)
-	{
-		m_context << Instruction::DUP1;
-		rightShiftNumberOnStack(64 + 32);
-		// <input> <address>
-		m_context << Instruction::SWAP1;
-		rightShiftNumberOnStack(64);
-	}
-	else
-	{
-		m_context << Instruction::DUP1;
-		rightShiftNumberOnStack(32);
-		m_context << ((u256(1) << 160) - 1) << Instruction::AND << Instruction::SWAP1;
-	}
-	m_context << u256(0xffffffffUL) << Instruction::AND;
-}
-
-void CompilerUtils::combineExternalFunctionType(bool _leftAligned)
-{
-	// <address> <function_id>
-	m_context << u256(0xffffffffUL) << Instruction::AND << Instruction::SWAP1;
-	if (!_leftAligned)
-		m_context << ((u256(1) << 160) - 1) << Instruction::AND;
-	leftShiftNumberOnStack(32);
-	m_context << Instruction::OR;
-	if (_leftAligned)
-		leftShiftNumberOnStack(64);
-}
-
-void CompilerUtils::pushCombinedFunctionEntryLabel(Declaration const& _function, bool _runtimeOnly)
-{
-	m_context << m_context.functionEntryLabel(_function).pushTag();
-	// If there is a runtime context, we have to merge both labels into the same
-	// stack slot in case we store it in storage.
-	if (CompilerContext* rtc = m_context.runtimeContext())
-	{
-		leftShiftNumberOnStack(32);
-		if (_runtimeOnly)
-			m_context <<
-				rtc->functionEntryLabel(_function).toSubAssemblyTag(m_context.runtimeSub()) <<
-				Instruction::OR;
-	}
-}
-
-void CompilerUtils::convertType(
-	Type const& _typeOnStack,
-	Type const& _targetType,
-	bool _cleanupNeeded,
-	bool _chopSignBits,
-	bool _asPartOfArgumentDecoding
-)
-{
-	// For a type extension, we need to remove all higher-order bits that we might have ignored in
-	// previous operations.
-	// @todo: store in the AST whether the operand might have "dirty" higher order bits
-
-	if (_typeOnStack == _targetType && !_cleanupNeeded)
-		return;
-	Type::Category stackTypeCategory = _typeOnStack.category();
-	Type::Category targetTypeCategory = _targetType.category();
-
-	if (stackTypeCategory == Type::Category::UserDefinedValueType)
-	{
-		solAssert(_cleanupNeeded);
-		auto& userDefined = dynamic_cast<UserDefinedValueType const&>(_typeOnStack);
-		solAssert(_typeOnStack == _targetType || _targetType == userDefined.underlyingType());
-		return convertType(
-			userDefined.underlyingType(),
-			_targetType,
-			_cleanupNeeded,
-			_chopSignBits,
-			_asPartOfArgumentDecoding
-		);
-	}
-	if (targetTypeCategory == Type::Category::UserDefinedValueType)
-	{
-		solAssert(_cleanupNeeded);
-		auto& userDefined = dynamic_cast<UserDefinedValueType const&>(_targetType);
-		solAssert(_typeOnStack.isImplicitlyConvertibleTo(userDefined.underlyingType()));
-		return convertType(
-			_typeOnStack,
-			userDefined.underlyingType(),
-			_cleanupNeeded,
-			_chopSignBits,
-			_asPartOfArgumentDecoding
-		);
-	}
-
-	if (auto contrType = dynamic_cast<ContractType const*>(&_typeOnStack))
-		solAssert(!contrType->isSuper(), "Cannot convert magic variable \"super\"");
-
-	bool enumOverflowCheckPending = (targetTypeCategory == Type::Category::Enum || stackTypeCategory == Type::Category::Enum);
-	bool chopSignBitsPending = _chopSignBits && targetTypeCategory == Type::Category::Integer;
-	if (chopSignBitsPending)
-	{
-		IntegerType const& targetIntegerType = dynamic_cast<IntegerType const&>(_targetType);
-		chopSignBitsPending = targetIntegerType.isSigned();
-	}
-
-	if (targetTypeCategory == Type::Category::FixedPoint)
-		solUnimplemented("Not yet implemented - FixedPointType.");
-
-	switch (stackTypeCategory)
-	{
-	case Type::Category::FixedBytes:
-	{
-		FixedBytesType const& typeOnStack = dynamic_cast<FixedBytesType const&>(_typeOnStack);
-		if (targetTypeCategory == Type::Category::Integer)
-		{
-			// conversion from bytes to integer. no need to clean the high bit
-			// only to shift right because of opposite alignment
-			IntegerType const& targetIntegerType = dynamic_cast<IntegerType const&>(_targetType);
-			rightShiftNumberOnStack(256 - typeOnStack.numBytes() * 8);
-			if (targetIntegerType.numBits() < typeOnStack.numBytes() * 8)
-				convertType(IntegerType(typeOnStack.numBytes() * 8), _targetType, _cleanupNeeded);
-		}
-		else if (targetTypeCategory == Type::Category::Address)
-		{
-			solAssert(typeOnStack.numBytes() * 8 == 160);
-			rightShiftNumberOnStack(256 - 160);
-		}
-		else
-		{
-			// clear for conversion to longer bytes
-			solAssert(targetTypeCategory == Type::Category::FixedBytes, "Invalid type conversion requested.");
-			FixedBytesType const& targetType = dynamic_cast<FixedBytesType const&>(_targetType);
-			if (typeOnStack.numBytes() == 0 || targetType.numBytes() == 0)
-				m_context << Instruction::POP << u256(0);
-			else if (targetType.numBytes() > typeOnStack.numBytes() || _cleanupNeeded)
-			{
-				unsigned bytes = std::min(typeOnStack.numBytes(), targetType.numBytes());
-				m_context << ((u256(1) << (256 - bytes * 8)) - 1);
-				m_context << Instruction::NOT << Instruction::AND;
-			}
-		}
-		break;
-	}
-	case Type::Category::Enum:
-		solAssert(_targetType == _typeOnStack || targetTypeCategory == Type::Category::Integer);
-		if (enumOverflowCheckPending)
-		{
-			EnumType const& enumType = dynamic_cast<decltype(enumType)>(_typeOnStack);
-			solAssert(enumType.numberOfMembers() > 0, "empty enum should have caused a parser error.");
-			m_context << u256(enumType.numberOfMembers() - 1) << Instruction::DUP2 << Instruction::GT;
-			if (_asPartOfArgumentDecoding)
-				m_context.appendConditionalRevert(false, "Enum out of range");
-			else
-				m_context.appendConditionalPanic(util::PanicCode::EnumConversionError);
-			enumOverflowCheckPending = false;
-		}
-		break;
-	case Type::Category::FixedPoint:
-		solUnimplemented("Not yet implemented - FixedPointType.");
-	case Type::Category::Address:
-	case Type::Category::Integer:
-	case Type::Category::Contract:
-	case Type::Category::RationalNumber:
-		if (targetTypeCategory == Type::Category::FixedBytes)
-		{
-			solAssert(
-				stackTypeCategory == Type::Category::Address ||
-				stackTypeCategory == Type::Category::Integer ||
-				stackTypeCategory == Type::Category::RationalNumber,
-				"Invalid conversion to FixedBytesType requested."
-			);
-			// conversion from bytes to string. no need to clean the high bit
-			// only to shift left because of opposite alignment
-			FixedBytesType const& targetBytesType = dynamic_cast<FixedBytesType const&>(_targetType);
-			if (auto typeOnStack = dynamic_cast<IntegerType const*>(&_typeOnStack))
-			{
-				if (targetBytesType.numBytes() * 8 > typeOnStack->numBits())
-					cleanHigherOrderBits(*typeOnStack);
-			}
-			else if (stackTypeCategory == Type::Category::Address)
-				solAssert(targetBytesType.numBytes() * 8 == 160);
-			leftShiftNumberOnStack(256 - targetBytesType.numBytes() * 8);
-		}
-		else if (targetTypeCategory == Type::Category::Enum)
-		{
-			solAssert(stackTypeCategory != Type::Category::Address, "Invalid conversion to EnumType requested.");
-			solAssert(_typeOnStack.mobileType());
-			// just clean
-			convertType(_typeOnStack, *_typeOnStack.mobileType(), true);
-			EnumType const& enumType = dynamic_cast<decltype(enumType)>(_targetType);
-			solAssert(enumType.numberOfMembers() > 0, "empty enum should have caused a parser error.");
-			m_context << u256(enumType.numberOfMembers() - 1) << Instruction::DUP2 << Instruction::GT;
-			m_context.appendConditionalPanic(util::PanicCode::EnumConversionError);
-			enumOverflowCheckPending = false;
-		}
-		else if (targetTypeCategory == Type::Category::FixedPoint)
-		{
-			solAssert(
-				stackTypeCategory == Type::Category::Integer ||
-				stackTypeCategory == Type::Category::RationalNumber ||
-				stackTypeCategory == Type::Category::FixedPoint,
-				"Invalid conversion to FixedMxNType requested."
-			);
-			//shift all integer bits onto the left side of the fixed type
-			FixedPointType const& targetFixedPointType = dynamic_cast<FixedPointType const&>(_targetType);
-			if (auto typeOnStack = dynamic_cast<IntegerType const*>(&_typeOnStack))
-				if (targetFixedPointType.numBits() > typeOnStack->numBits())
-					cleanHigherOrderBits(*typeOnStack);
-			solUnimplemented("Not yet implemented - FixedPointType.");
-		}
-		else
-		{
-			solAssert(
-				targetTypeCategory == Type::Category::Integer ||
-				targetTypeCategory == Type::Category::Contract ||
-				targetTypeCategory == Type::Category::Address,
-				""
-			);
-			IntegerType addressType(160);
-			IntegerType const& targetType = targetTypeCategory == Type::Category::Integer
-				? dynamic_cast<IntegerType const&>(_targetType) : addressType;
-			if (stackTypeCategory == Type::Category::RationalNumber)
-			{
-				RationalNumberType const& constType = dynamic_cast<RationalNumberType const&>(_typeOnStack);
-				// We know that the stack is clean, we only have to clean for a narrowing conversion
-				// where cleanup is forced.
-				solUnimplementedAssert(!constType.isFractional(), "Not yet implemented - FixedPointType.");
-				if (targetType.numBits() < constType.integerType()->numBits() && _cleanupNeeded)
-					cleanHigherOrderBits(targetType);
-			}
-			else
-			{
-				IntegerType const& typeOnStack = stackTypeCategory == Type::Category::Integer
-					? dynamic_cast<IntegerType const&>(_typeOnStack) : addressType;
-				// Widening: clean up according to source type width
-				// Non-widening and force: clean up according to target type bits
-				if (targetType.numBits() > typeOnStack.numBits())
-					cleanHigherOrderBits(typeOnStack);
-				else if (_cleanupNeeded)
-					cleanHigherOrderBits(targetType);
-				if (chopSignBitsPending)
-				{
-					if (targetType.numBits() < 256)
-						m_context
-							<< ((u256(1) << targetType.numBits()) - 1)
-							<< Instruction::AND;
-					chopSignBitsPending = false;
-				}
-			}
-		}
-		break;
-	case Type::Category::StringLiteral:
-	{
-		auto const& literalType = dynamic_cast<StringLiteralType const&>(_typeOnStack);
-		std::string const& value = literalType.value();
-		bytesConstRef data(value);
-		if (targetTypeCategory == Type::Category::FixedBytes)
-		{
-			unsigned const numBytes = dynamic_cast<FixedBytesType const&>(_targetType).numBytes();
-			solAssert(data.size() <= 32);
-			m_context << (u256(h256(data, h256::AlignLeft)) & (~(u256(-1) >> (8 * numBytes))));
-		}
-		else if (targetTypeCategory == Type::Category::Array)
-		{
-			auto const& arrayType = dynamic_cast<ArrayType const&>(_targetType);
-			solAssert(arrayType.isByteArrayOrString());
-			size_t storageSize = 32 + ((data.size() + 31) / 32) * 32;
-			allocateMemory(storageSize);
-			// stack: mempos
-			m_context << Instruction::DUP1 << u256(data.size());
-			storeInMemoryDynamic(*TypeProvider::uint256());
-			// stack: mempos datapos
-			storeStringData(data);
-		}
-		else
-			solAssert(
-				false,
-				"Invalid conversion from string literal to " + _targetType.toString(false) + " requested."
-			);
-		break;
-	}
-	case Type::Category::Array:
-	{
-		auto const& typeOnStack = dynamic_cast<ArrayType const&>(_typeOnStack);
-		if (_targetType.category() == Type::Category::FixedBytes)
-		{
-			solAssert(
-				typeOnStack.isByteArray(),
-				"Array types other than bytes not convertible to bytesNN."
-			);
-			solAssert(typeOnStack.isDynamicallySized());
-
-			bool fromCalldata = typeOnStack.dataStoredIn(DataLocation::CallData);
-			solAssert(typeOnStack.sizeOnStack() == (fromCalldata ? 2 : 1));
-			if (fromCalldata)
-				m_context << Instruction::SWAP1;
-
-			m_context.callYulFunction(
-				m_context.utilFunctions().bytesToFixedBytesConversionFunction(
-					typeOnStack,
-					dynamic_cast<FixedBytesType const &>(_targetType)
-				),
-				typeOnStack.sizeOnStack(),
-				1
-			);
-			break;
-		}
-		solAssert(targetTypeCategory == stackTypeCategory);
-		auto const& targetType = dynamic_cast<ArrayType const&>(_targetType);
-		switch (targetType.location())
-		{
-		case DataLocation::Storage:
-			// Other cases are done explicitly in LValue::storeValue, and only possible by assignment.
-			solAssert(
-				(targetType.isPointer() || (typeOnStack.isByteArrayOrString() && targetType.isByteArrayOrString())) &&
-				typeOnStack.location() == DataLocation::Storage,
-				"Invalid conversion to storage type."
-			);
-			break;
-		case DataLocation::Memory:
-		{
-			// Copy the array to a free position in memory, unless it is already in memory.
-			if (typeOnStack.location() != DataLocation::Memory)
-			{
-				if (
-					typeOnStack.dataStoredIn(DataLocation::CallData) &&
-					typeOnStack.baseType()->isDynamicallyEncoded()
-				)
-				{
-					solAssert(m_context.useABICoderV2());
-					// stack: offset length(optional in case of dynamically sized array)
-					solAssert(typeOnStack.sizeOnStack() == (typeOnStack.isDynamicallySized() ? 2 : 1));
-					if (typeOnStack.isDynamicallySized())
-						m_context << Instruction::SWAP1;
-
-					m_context.callYulFunction(
-						m_context.utilFunctions().conversionFunction(typeOnStack, targetType),
-						typeOnStack.isDynamicallySized() ? 2 : 1,
-						1
-					);
-				}
-				else
-				{
-					// stack: <source ref> (variably sized)
-					unsigned stackSize = typeOnStack.sizeOnStack();
-					ArrayUtils(m_context).retrieveLength(typeOnStack);
-
-					// allocate memory
-					// stack: <source ref> (variably sized) <length>
-					m_context << Instruction::DUP1;
-					ArrayUtils(m_context).convertLengthToSize(targetType, true);
-					// stack: <source ref> (variably sized) <length> <size>
-					if (targetType.isDynamicallySized())
-						m_context << u256(0x20) << Instruction::ADD;
-					allocateMemory();
-					// stack: <source ref> (variably sized) <length> <mem start>
-					m_context << Instruction::DUP1;
-					moveIntoStack(2 + stackSize);
-					if (targetType.isDynamicallySized())
-					{
-						m_context << Instruction::DUP2;
-						storeInMemoryDynamic(*TypeProvider::uint256());
-					}
-					// stack: <mem start> <source ref> (variably sized) <length> <mem data pos>
-					if (targetType.baseType()->isValueType())
-					{
-						copyToStackTop(2 + stackSize, stackSize);
-						ArrayUtils(m_context).copyArrayToMemory(typeOnStack);
-					}
-					else
-					{
-						m_context << u256(0) << Instruction::SWAP1;
-						// stack: <mem start> <source ref> (variably sized) <length> <counter> <mem data pos>
-						auto repeat = m_context.newTag();
-						m_context << repeat;
-						m_context << Instruction::DUP3 << Instruction::DUP3;
-						m_context << Instruction::LT << Instruction::ISZERO;
-						auto loopEnd = m_context.appendConditionalJump();
-						copyToStackTop(3 + stackSize, stackSize);
-						copyToStackTop(2 + stackSize, 1);
-						ArrayUtils(m_context).accessIndex(typeOnStack, false);
-						if (typeOnStack.location() == DataLocation::Storage)
-							StorageItem(m_context, *typeOnStack.baseType()).retrieveValue(SourceLocation(), true);
-						convertType(*typeOnStack.baseType(), *targetType.baseType(), _cleanupNeeded);
-						storeInMemoryDynamic(*targetType.baseType(), true);
-						m_context << Instruction::SWAP1 << u256(1) << Instruction::ADD;
-						m_context << Instruction::SWAP1;
-						m_context.appendJumpTo(repeat);
-						m_context << loopEnd;
-						m_context << Instruction::POP;
-					}
-					// stack: <mem start> <source ref> (variably sized) <length> <mem data pos updated>
-					popStackSlots(2 + stackSize);
-					// Stack: <mem start>
-				}
-			}
-			break;
-		}
-		case DataLocation::CallData:
-			solAssert(
-				((targetType.isByteArrayOrString() && typeOnStack.isByteArrayOrString()) || _typeOnStack == _targetType) &&
-				typeOnStack.location() == DataLocation::CallData,
-				"Invalid conversion to calldata type."
-			);
-			break;
-		}
-		break;
-	}
-	case Type::Category::ArraySlice:
-	{
-		auto& typeOnStack = dynamic_cast<ArraySliceType const&>(_typeOnStack);
-		if (_targetType.category() == Type::Category::FixedBytes)
-		{
-			solAssert(
-				typeOnStack.arrayType().isByteArray(),
-				"Array types other than bytes not convertible to bytesNN."
-			);
-			solAssert(typeOnStack.isDynamicallySized());
-			solAssert(typeOnStack.dataStoredIn(DataLocation::CallData));
-			solAssert(typeOnStack.sizeOnStack() == 2);
-
-			m_context << Instruction::SWAP1;
-			m_context.callYulFunction(
-				m_context.utilFunctions().bytesToFixedBytesConversionFunction(
-					typeOnStack.arrayType(),
-					dynamic_cast<FixedBytesType const &>(_targetType)
-				),
-				2,
-				1
-			);
-			break;
-		}
-
-		solAssert(_targetType.category() == Type::Category::Array);
-		auto const& targetArrayType = dynamic_cast<ArrayType const&>(_targetType);
-		solAssert(
-			typeOnStack.arrayType().isImplicitlyConvertibleTo(targetArrayType) ||
-			(typeOnStack.arrayType().isByteArrayOrString() && targetArrayType.isByteArrayOrString())
-		);
-		solAssert(
-			typeOnStack.arrayType().dataStoredIn(DataLocation::CallData) &&
-			typeOnStack.arrayType().isDynamicallySized() &&
-			!typeOnStack.arrayType().baseType()->isDynamicallyEncoded()
-		);
-		if (!_targetType.dataStoredIn(DataLocation::CallData))
-			return convertType(typeOnStack.arrayType(), _targetType);
-		break;
-	}
-	case Type::Category::Struct:
-	{
-		solAssert(targetTypeCategory == stackTypeCategory);
-		auto& targetType = dynamic_cast<StructType const&>(_targetType);
-		auto& typeOnStack = dynamic_cast<StructType const&>(_typeOnStack);
-		switch (targetType.location())
-		{
-		case DataLocation::Storage:
-			// Other cases are done explicitly in LValue::storeValue, and only possible by assignment.
-			solAssert(
-				targetType.isPointer() &&
-				typeOnStack.location() == DataLocation::Storage,
-				"Invalid conversion to storage type."
-			);
-			break;
-		case DataLocation::Memory:
-			// Copy the array to a free position in memory, unless it is already in memory.
-			switch (typeOnStack.location())
-			{
-			case DataLocation::Storage:
-			{
-				auto conversionImpl =
-					[typeOnStack = &typeOnStack, targetType = &targetType](CompilerContext& _context)
-				{
-					CompilerUtils utils(_context);
-					// stack: <source ref>
-					utils.allocateMemory(typeOnStack->memoryDataSize());
-					_context << Instruction::SWAP1 << Instruction::DUP2;
-					// stack: <memory ptr> <source ref> <memory ptr>
-					for (auto const& member: typeOnStack->members(nullptr))
-					{
-						solAssert(!member.type->containsNestedMapping());
-						std::pair<u256, unsigned> const& offsets = typeOnStack->storageOffsetsOfMember(member.name);
-						_context << offsets.first << Instruction::DUP3 << Instruction::ADD;
-						_context << u256(offsets.second);
-						StorageItem(_context, *member.type).retrieveValue(SourceLocation(), true);
-						Type const* targetMemberType = targetType->memberType(member.name);
-						solAssert(!!targetMemberType, "Member not found in target type.");
-						utils.convertType(*member.type, *targetMemberType, true);
-						utils.storeInMemoryDynamic(*targetMemberType, true);
-					}
-					_context << Instruction::POP << Instruction::POP;
-				};
-				if (typeOnStack.recursive())
-					m_context.callLowLevelFunction(
-						"$convertRecursiveArrayStorageToMemory_" + typeOnStack.identifier() + "_to_" + targetType.identifier(),
-						1,
-						1,
-						conversionImpl
-					);
-				else
-					conversionImpl(m_context);
-				break;
-			}
-			case DataLocation::CallData:
-			{
-				if (typeOnStack.isDynamicallyEncoded())
-				{
-					solAssert(m_context.useABICoderV2());
-					m_context.callYulFunction(
-						m_context.utilFunctions().conversionFunction(typeOnStack, targetType),
-						1,
-						1
-					);
-				}
-				else
-				{
-					m_context << Instruction::DUP1;
-					m_context << Instruction::CALLDATASIZE;
-					m_context << Instruction::SUB;
-					abiDecode({&targetType}, false);
-				}
-				break;
-			}
-			case DataLocation::Memory:
-				// nothing to do
-				break;
-			}
-			break;
-		case DataLocation::CallData:
-			solAssert(_typeOnStack == _targetType);
-			// nothing to do
-			break;
-		}
-		break;
-	}
-	case Type::Category::Tuple:
-	{
-		TupleType const& sourceTuple = dynamic_cast<TupleType const&>(_typeOnStack);
-		TupleType const& targetTuple = dynamic_cast<TupleType const&>(_targetType);
-		solAssert(targetTuple.components().size() == sourceTuple.components().size());
-		unsigned depth = sourceTuple.sizeOnStack();
-		for (size_t i = 0; i < sourceTuple.components().size(); ++i)
-		{
-			Type const* sourceType = sourceTuple.components()[i];
-			Type const* targetType = targetTuple.components()[i];
-			if (!sourceType)
-			{
-				solAssert(!targetType);
-				continue;
-			}
-			unsigned sourceSize = sourceType->sizeOnStack();
-			unsigned targetSize = targetType ? targetType->sizeOnStack() : 0;
-			if (!targetType || *sourceType != *targetType || _cleanupNeeded)
-			{
-				if (targetType)
-				{
-					if (sourceSize > 0)
-						copyToStackTop(depth, sourceSize);
-					convertType(*sourceType, *targetType, _cleanupNeeded);
-				}
-				if (sourceSize > 0 || targetSize > 0)
-				{
-					// Move it back into its place.
-					for (unsigned j = 0; j < std::min(sourceSize, targetSize); ++j)
-						m_context <<
-							swapInstruction(depth + targetSize - sourceSize) <<
-							Instruction::POP;
-					// Value shrank
-					for (unsigned j = targetSize; j < sourceSize; ++j)
-					{
-						moveToStackTop(depth + targetSize - sourceSize, 1);
-						m_context << Instruction::POP;
-					}
-					// Value grew
-					if (targetSize > sourceSize)
-						moveIntoStack(depth - sourceSize, targetSize - sourceSize);
-				}
-			}
-			depth -= sourceSize;
-		}
-		break;
-	}
-	case Type::Category::Bool:
-		solAssert(_targetType == _typeOnStack, "Invalid conversion for bool.");
-		if (_cleanupNeeded)
-			m_context << Instruction::ISZERO << Instruction::ISZERO;
-		break;
-	default:
-		// we used to allow conversions from function to address
-		solAssert(!(stackTypeCategory == Type::Category::Function && targetTypeCategory == Type::Category::Address));
-		if (stackTypeCategory == Type::Category::Function && targetTypeCategory == Type::Category::Function)
-		{
-			FunctionType const& typeOnStack = dynamic_cast<FunctionType const&>(_typeOnStack);
-			FunctionType const& targetType = dynamic_cast<FunctionType const&>(_targetType);
-			solAssert(
-				typeOnStack.isImplicitlyConvertibleTo(targetType) &&
-				typeOnStack.sizeOnStack() == targetType.sizeOnStack() &&
-				(typeOnStack.kind() == FunctionType::Kind::Internal || typeOnStack.kind() == FunctionType::Kind::External) &&
-				typeOnStack.kind() == targetType.kind(),
-				"Invalid function type conversion requested."
-			);
-		}
-		else
-			// All other types should not be convertible to non-equal types.
-			solAssert(_typeOnStack == _targetType, "Invalid type conversion requested.");
-
-		if (_cleanupNeeded && _targetType.canBeStored() && _targetType.storageBytes() < 32)
-			m_context
-				<< ((u256(1) << (8 * _targetType.storageBytes())) - 1)
-				<< Instruction::AND;
-		break;
-	}
-
-	solAssert(!enumOverflowCheckPending, "enum overflow checking missing.");
-	solAssert(!chopSignBitsPending, "forgot to chop the sign bits.");
-}
-
-void CompilerUtils::pushZeroValue(Type const& _type)
-{
-	if (auto const* funType = dynamic_cast<FunctionType const*>(&_type))
-	{
-		if (funType->kind() == FunctionType::Kind::Internal)
-		{
-			m_context << m_context.lowLevelFunctionTag("$invalidFunction", 0, 0, [](CompilerContext& _context) {
-				_context.appendPanic(util::PanicCode::InvalidInternalFunction);
-			});
-			if (CompilerContext* runCon = m_context.runtimeContext())
-			{
-				leftShiftNumberOnStack(32);
-				m_context << runCon->lowLevelFunctionTag("$invalidFunction", 0, 0, [](CompilerContext& _context) {
-					_context.appendPanic(util::PanicCode::InvalidInternalFunction);
-				}).toSubAssemblyTag(m_context.runtimeSub());
-				m_context << Instruction::OR;
-			}
-			return;
-		}
-	}
-	auto const* referenceType = dynamic_cast<ReferenceType const*>(&_type);
-	if (!referenceType || referenceType->location() == DataLocation::Storage)
-	{
-		for (size_t i = 0; i < _type.sizeOnStack(); ++i)
-			m_context << u256(0);
-		return;
-	}
-	if (referenceType->location() == DataLocation::CallData)
-	{
-		solAssert(referenceType->sizeOnStack() == 1 || referenceType->sizeOnStack() == 2);
-		m_context << Instruction::CALLDATASIZE;
-		if (referenceType->sizeOnStack() == 2)
-			m_context << 0;
-		return;
-	}
-
-	solAssert(referenceType->location() == DataLocation::Memory);
-	if (auto arrayType = dynamic_cast<ArrayType const*>(&_type))
-		if (arrayType->isDynamicallySized())
-		{
-			// Push a memory location that is (hopefully) always zero.
-			pushZeroPointer();
-			return;
-		}
-
-	Type const* type = &_type;
-	m_context.callLowLevelFunction(
-		"$pushZeroValue_" + referenceType->identifier(),
-		0,
-		1,
-		[type](CompilerContext& _context) {
-			CompilerUtils utils(_context);
-
-			utils.allocateMemory(std::max<u256>(32u, type->memoryDataSize()));
-			_context << Instruction::DUP1;
-
-			if (auto structType = dynamic_cast<StructType const*>(type))
-				for (auto const& member: structType->members(nullptr))
-				{
-					utils.pushZeroValue(*member.type);
-					utils.storeInMemoryDynamic(*member.type);
-				}
-			else if (auto arrayType = dynamic_cast<ArrayType const*>(type))
-			{
-				solAssert(!arrayType->isDynamicallySized());
-				if (arrayType->length() > 0)
-				{
-					_context << arrayType->length() << Instruction::SWAP1;
-					// stack: items_to_do memory_pos
-					utils.zeroInitialiseMemoryArray(*arrayType);
-					// stack: updated_memory_pos
-				}
-			}
-			else
-				solAssert(false, "Requested initialisation for unknown type: " + type->toString());
-
-			// remove the updated memory pointer
-			_context << Instruction::POP;
-		}
-	);
-}
-
-void CompilerUtils::pushZeroPointer()
-{
-	m_context << u256(zeroPointer);
-}
-
-void CompilerUtils::moveToStackVariable(VariableDeclaration const& _variable)
-{
-	unsigned const stackPosition = m_context.baseToCurrentStackOffset(m_context.baseStackOffsetOfVariable(_variable));
-	unsigned const size = _variable.annotation().type->sizeOnStack();
-	solAssert(stackPosition >= size, "Variable size and position mismatch.");
-	// move variable starting from its top end in the stack
-	if (stackPosition - size + 1 > 16)
-		BOOST_THROW_EXCEPTION(
-			StackTooDeepError() <<
-			errinfo_sourceLocation(_variable.location()) <<
-			util::errinfo_comment(util::stackTooDeepString)
-		);
-	for (unsigned i = 0; i < size; ++i)
-		m_context << swapInstruction(stackPosition - size + 1) << Instruction::POP;
-}
-
-void CompilerUtils::copyToStackTop(unsigned _stackDepth, unsigned _itemSize)
-{
-	assertThrow(
-		_stackDepth <= 16,
-		StackTooDeepError,
-		util::stackTooDeepString
-	);
-	for (unsigned i = 0; i < _itemSize; ++i)
-		m_context << dupInstruction(_stackDepth);
-}
-
-void CompilerUtils::moveToStackTop(unsigned _stackDepth, unsigned _itemSize)
-{
-	moveIntoStack(_itemSize, _stackDepth);
-}
-
-void CompilerUtils::moveIntoStack(unsigned _stackDepth, unsigned _itemSize)
-{
-	if (_stackDepth <= _itemSize)
-		for (unsigned i = 0; i < _stackDepth; ++i)
-			rotateStackDown(_stackDepth + _itemSize);
-	else
-		for (unsigned i = 0; i < _itemSize; ++i)
-			rotateStackUp(_stackDepth + _itemSize);
-}
-
-void CompilerUtils::rotateStackUp(unsigned _items)
-{
-	assertThrow(
-		_items - 1 <= 16,
-		StackTooDeepError,
-		util::stackTooDeepString
-	);
-	for (unsigned i = 1; i < _items; ++i)
-		m_context << swapInstruction(_items - i);
-}
-
-void CompilerUtils::rotateStackDown(unsigned _items)
-{
-	assertThrow(
-		_items - 1 <= 16,
-		StackTooDeepError,
-		util::stackTooDeepString
-	);
-	for (unsigned i = 1; i < _items; ++i)
-		m_context << swapInstruction(i);
-}
-
-void CompilerUtils::popStackElement(Type const& _type)
-{
-	popStackSlots(_type.sizeOnStack());
-}
-
-void CompilerUtils::popStackSlots(size_t _amount)
-{
-	for (size_t i = 0; i < _amount; ++i)
-		m_context << Instruction::POP;
-}
-
-void CompilerUtils::popAndJump(unsigned _toHeight, evmasm::AssemblyItem const& _jumpTo)
-{
-	solAssert(m_context.stackHeight() >= _toHeight);
-	unsigned amount = m_context.stackHeight() - _toHeight;
-	popStackSlots(amount);
-	m_context.appendJumpTo(_jumpTo);
-	m_context.adjustStackOffset(static_cast<int>(amount));
-}
-
-unsigned CompilerUtils::sizeOnStack(std::vector<Type const*> const& _variableTypes)
-{
-	unsigned size = 0;
-	for (Type const* type: _variableTypes)
-		size += type->sizeOnStack();
-	return size;
-}
-
-void CompilerUtils::computeHashStatic()
-{
-	storeInMemory(0);
-	m_context << u256(32) << u256(0) << Instruction::KECCAK256;
-}
-
-void CompilerUtils::copyContractCodeToMemory(ContractDefinition const& contract, bool _creation)
-{
-	std::string which = _creation ? "Creation" : "Runtime";
-	m_context.callLowLevelFunction(
-		"$copyContract" + which + "CodeToMemory_" + contract.type()->identifier(),
-		1,
-		1,
-		[&contract, _creation](CompilerContext& _context)
-		{
-			// copy the contract's code into memory
-			std::shared_ptr<evmasm::Assembly> assembly =
-				_creation ?
-				_context.compiledContract(contract) :
-				_context.compiledContractRuntime(contract);
-			// pushes size
-			auto subroutine = _context.addSubroutine(assembly);
-			_context << Instruction::DUP1 << subroutine;
-			_context << Instruction::DUP4 << Instruction::CODECOPY;
-			_context << Instruction::ADD;
-		}
-	);
-}
-
-void CompilerUtils::storeStringData(bytesConstRef _data)
-{
-	//@todo provide both alternatives to the optimiser
-	// stack: mempos
-	if (_data.size() <= 32)
-	{
-		for (unsigned i = 0; i < _data.size(); i += 32)
-		{
-			m_context << u256(h256(_data.cropped(i), h256::AlignLeft));
-			storeInMemoryDynamic(*TypeProvider::uint256());
-		}
-		m_context << Instruction::POP;
-	}
-	else
-	{
-		// stack: mempos mempos_data
-		m_context.appendData(_data.toBytes());
-		m_context << u256(_data.size()) << Instruction::SWAP2;
-		m_context << Instruction::CODECOPY;
-	}
-}
-
-unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWords)
-{
-	solAssert(_type.isValueType());
-	Type const* type = &_type;
-	if (auto const* userDefined = dynamic_cast<UserDefinedValueType const*>(type))
-		type = &userDefined->underlyingType();
-
-	unsigned numBytes = type->calldataEncodedSize(_padToWords);
-	bool isExternalFunctionType = false;
-	if (auto const* funType = dynamic_cast<FunctionType const*>(type))
-		if (funType->kind() == FunctionType::Kind::External)
-			isExternalFunctionType = true;
-	if (numBytes == 0)
-	{
-		m_context << Instruction::POP << u256(0);
-		return numBytes;
-	}
-	solAssert(numBytes <= 32, "Static memory load of more than 32 bytes requested.");
-	m_context << (_fromCalldata ? Instruction::CALLDATALOAD : Instruction::MLOAD);
-	bool cleanupNeeded = true;
-	if (isExternalFunctionType)
-		splitExternalFunctionType(true);
-	else if (numBytes != 32)
-	{
-		// add leading or trailing zeros by dividing/multiplying depending on alignment
-		unsigned shiftFactor = (32 - numBytes) * 8;
-		rightShiftNumberOnStack(shiftFactor);
-		if (type->leftAligned())
-		{
-			leftShiftNumberOnStack(shiftFactor);
-			cleanupNeeded = false;
-		}
-		else if (IntegerType const* intType = dynamic_cast<IntegerType const*>(type))
-			if (!intType->isSigned())
-				cleanupNeeded = false;
-	}
-	if (_fromCalldata)
-		convertType(_type, *type, cleanupNeeded, false, true);
-
-	return numBytes;
-}
-
-void CompilerUtils::cleanHigherOrderBits(IntegerType const& _typeOnStack)
-{
-	if (_typeOnStack.numBits() == 256)
-		return;
-	else if (_typeOnStack.isSigned())
-		m_context << u256(_typeOnStack.numBits() / 8 - 1) << Instruction::SIGNEXTEND;
-	else
-		m_context << ((u256(1) << _typeOnStack.numBits()) - 1) << Instruction::AND;
-}
-
-void CompilerUtils::leftShiftNumberOnStack(unsigned _bits)
-{
-	solAssert(_bits < 256);
-	if (m_context.evmVersion().hasBitwiseShifting())
-		m_context << _bits << Instruction::SHL;
-	else
-		m_context << (u256(1) << _bits) << Instruction::MUL;
-}
-
-void CompilerUtils::rightShiftNumberOnStack(unsigned _bits)
-{
-	solAssert(_bits < 256);
-	// NOTE: If we add signed right shift, SAR rounds differently than SDIV
-	if (m_context.evmVersion().hasBitwiseShifting())
-		m_context << _bits << Instruction::SHR;
-	else
-		m_context << (u256(1) << _bits) << Instruction::SWAP1 << Instruction::DIV;
-}
-
-unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWords, bool _cleanup)
-{
-	solAssert(
-		_type.sizeOnStack() == 1,
-		"Memory store of types with stack size != 1 not allowed (Type: " + _type.toString(true) + ")."
-	);
-
-	solAssert(!_type.isDynamicallyEncoded());
-
-	unsigned numBytes = _type.calldataEncodedSize(_padToWords);
-
-	solAssert(
-		numBytes > 0,
-		"Memory store of 0 bytes requested (Type: " + _type.toString(true) + ")."
-	);
-
-	solAssert(
-		numBytes <= 32,
-		"Memory store of more than 32 bytes requested (Type: " + _type.toString(true) + ")."
-	);
-
-	if (_cleanup)
-		convertType(_type, _type, true);
-
-	if (numBytes != 32 && !_type.leftAligned() && !_padToWords)
-		// shift the value accordingly before storing
-		leftShiftNumberOnStack((32 - numBytes) * 8);
-
-	return numBytes;
-}
diff --git a/libsolidity/codegen/CompilerUtils.h b/libsolidity/codegen/CompilerUtils.h
deleted file mode 100644
index f51f8c3cd888..000000000000
--- a/libsolidity/codegen/CompilerUtils.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Routines used by both the compiler and the expression compiler.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/codegen/CompilerContext.h>
-
-namespace solidity::frontend
-{
-
-class Type; // forward
-
-class CompilerUtils
-{
-public:
-	explicit CompilerUtils(CompilerContext& _context): m_context(_context)
-	{}
-
-	/// Stores the initial value of the free-memory-pointer at its position;
-	void initialiseFreeMemoryPointer();
-	/// Copies the free memory pointer to the stack.
-	/// Stack pre:
-	/// Stack post: <mem_start>
-	void fetchFreeMemoryPointer();
-	/// Stores the free memory pointer from the stack.
-	/// Stack pre: <mem_end>
-	/// Stack post:
-	void storeFreeMemoryPointer();
-	/// Allocates a number of bytes in memory as given on the stack.
-	/// Stack pre: <size>
-	/// Stack post: <mem_start>
-	void allocateMemory();
-	/// Allocates a number of bytes in memory as given on the stack.
-	/// Stack pre:
-	/// Stack post: <mem_start>
-	void allocateMemory(u256 const& size);
-	/// Appends code that transforms memptr to (memptr - free_memptr) memptr
-	/// Stack pre: <mem_end>
-	/// Stack post: <size> <mem_start>
-	void toSizeAfterFreeMemoryPointer();
-
-	/// Appends code that performs a revert, providing the given string data.
-	/// Will also append an error signature corresponding to Error(string).
-	/// @param _argumentType the type of the string argument, will be converted to memory string.
-	/// Stack pre: string data
-	/// Stack post:
-	void revertWithStringData(Type const& _argumentType);
-
-	void revertWithError(
-		std::string const& _errorName,
-		std::vector<Type const*> const& _parameterTypes,
-		std::vector<Type const*> const& _argumentTypes
-	);
-
-	/// Allocates a new array and copies the return data to it.
-	/// If the EVM does not support return data, creates an empty array.
-	void returnDataToArray();
-
-	/// Computes the absolute calldata offset of a tail given a base reference and the (absolute)
-	/// offset of the tail pointer. Performs bounds checks. If @a _type is a dynamically sized array it also
-	/// returns the array length on the stack.
-	/// Stack pre: base_ref tail_ptr
-	/// Stack post: tail_ref [length]
-	void accessCalldataTail(Type const& _type);
-
-	/// Loads data from memory to the stack.
-	/// @param _offset offset in memory (or calldata)
-	/// @param _type data type to load
-	/// @param _fromCalldata if true, load from calldata, not from memory
-	/// @param _padToWords if true, assume the data is padded to full words (32 bytes)
-	/// @returns the number of bytes consumed in memory.
-	unsigned loadFromMemory(
-		unsigned _offset,
-		Type const& _type,
-		bool _fromCalldata,
-		bool _padToWords
-	);
-	/// Dynamic version of @see loadFromMemory, expects the memory offset on the stack.
-	/// Stack pre: memory_offset
-	/// Stack post: value... (memory_offset+length)
-	void loadFromMemoryDynamic(
-		Type const& _type,
-		bool _fromCalldata = false,
-		bool _padToWords = true,
-		bool _keepUpdatedMemoryOffset = true
-	);
-	/// Stores a 256 bit integer from stack in memory.
-	/// @param _offset offset in memory
-	void storeInMemory(unsigned _offset);
-
-	/// Dynamic version of @see storeInMemory, expects the memory offset below the value on the stack
-	/// and also updates that. For reference types, only copies the data pointer. Fails for
-	/// non-memory-references. For string literals no value is available on the stack.
-	/// @param _padToWords if true, adds zeros to pad to multiple of 32 bytes. Array elements
-	///                    are always padded (except for byte arrays), regardless of this parameter.
-	/// @param _cleanup if true, adds code to cleanup the value before storing it.
-	/// Stack pre: memory_offset value...
-	/// Stack post: (memory_offset+length)
-	void storeInMemoryDynamic(Type const& _type, bool _padToWords = true, bool _cleanup = true);
-
-	/// Creates code that unpacks the arguments according to their types specified by a vector of TypePointers.
-	/// From memory if @a _fromMemory is true, otherwise from call data.
-	/// Calls revert if the supplied size is shorter than the static data requirements
-	/// or if dynamic data pointers reach outside of the area.
-	/// Also has a hard cap of 0x100000000 for any given length/offset field.
-	/// Stack pre: <source_offset> <length>
-	/// Stack post: <value0> <value1> ... <valuen>
-	void abiDecode(TypePointers const& _typeParameters, bool _fromMemory = false);
-
-	/// Copies values (of types @a _givenTypes) given on the stack to a location in memory given
-	/// at the stack top, encoding them according to the ABI as the given types @a _targetTypes.
-	/// Removes the values from the stack and leaves the updated memory pointer.
-	/// Stack pre: <v1> <v2> ... <vn> <memptr>
-	/// Stack post: <memptr_updated>
-	/// Does not touch the memory-free pointer.
-	/// @param _padToWords if false, all values are concatenated without padding.
-	/// @param _copyDynamicDataInPlace if true, dynamic types is stored (without length)
-	/// together with fixed-length data.
-	/// @param _encodeAsLibraryTypes if true, encodes for a library function, e.g. does not
-	/// convert storage pointer types to memory types.
-	/// @note the locations of target reference types are ignored, because it will always be
-	/// memory.
-	void encodeToMemory(
-		TypePointers const& _givenTypes,
-		TypePointers const& _targetTypes,
-		bool _padToWords,
-		bool _copyDynamicDataInPlace,
-		bool _encodeAsLibraryTypes = false
-	);
-
-	/// Special case of @a encodeToMemory which assumes tight packing, e.g. no zero padding
-	/// and dynamic data is encoded in-place.
-	/// Stack pre: <value0> <value1> ... <valueN-1> <head_start>
-	/// Stack post: <mem_ptr>
-	void packedEncode(
-		TypePointers const& _givenTypes,
-		TypePointers const& _targetTypes,
-		bool _encodeAsLibraryTypes = false
-	)
-	{
-		encodeToMemory(_givenTypes, _targetTypes, false, true, _encodeAsLibraryTypes);
-	}
-
-	/// Special case of @a encodeToMemory which assumes that everything is padded to words
-	/// and dynamic data is not copied in place (i.e. a proper ABI encoding).
-	/// Stack pre: <value0> <value1> ... <valueN-1> <head_start>
-	/// Stack post: <mem_ptr>
-	void abiEncode(
-		TypePointers const& _givenTypes,
-		TypePointers const& _targetTypes,
-		bool _encodeAsLibraryTypes = false
-	)
-	{
-		encodeToMemory(_givenTypes, _targetTypes, true, false, _encodeAsLibraryTypes);
-	}
-
-	/// Special case of @a encodeToMemory which assumes that everything is padded to words
-	/// and dynamic data is not copied in place (i.e. a proper ABI encoding).
-	/// Uses a new, less tested encoder implementation.
-	/// Stack pre: <value0> <value1> ... <valueN-1> <head_start>
-	/// Stack post: <mem_ptr>
-	void abiEncodeV2(
-		TypePointers const& _givenTypes,
-		TypePointers const& _targetTypes,
-		bool _encodeAsLibraryTypes = false,
-		bool _padToWordBoundaries = true
-	);
-
-	/// Decodes data from ABI encoding into internal encoding. If @a _fromMemory is set to true,
-	/// the data is taken from memory instead of from calldata.
-	/// Can allocate memory.
-	/// Stack pre: <source_offset> <length>
-	/// Stack post: <value0> <value1> ... <valuen>
-	void abiDecodeV2(TypePointers const& _parameterTypes, bool _fromMemory = false);
-
-	/// Zero-initialises (the data part of) an already allocated memory array.
-	/// Length has to be nonzero!
-	/// Stack pre: <length> <memptr>
-	/// Stack post: <updated_memptr>
-	void zeroInitialiseMemoryArray(ArrayType const& _type);
-
-	/// Copies full 32 byte words in memory (regions cannot overlap), i.e. may copy more than length.
-	/// Length can be zero, in this case, it copies nothing.
-	/// Stack pre: <size> <target> <source>
-	/// Stack post:
-	void memoryCopy32();
-	/// Copies data in memory (regions cannot overlap).
-	/// Length can be zero, in this case, it copies nothing.
-	/// Stack pre: <size> <target> <source>
-	/// Stack post:
-	void memoryCopy();
-
-	/// Stores the given string in memory.
-	/// Stack pre: mempos
-	/// Stack post:
-	void storeStringData(bytesConstRef _data);
-
-	/// Converts the combined and left-aligned (right-aligned if @a _rightAligned is true)
-	/// external function type <address><function identifier> into two stack slots:
-	/// address (right aligned), function identifier (right aligned)
-	void splitExternalFunctionType(bool _rightAligned);
-	/// Performs the opposite operation of splitExternalFunctionType(_rightAligned)
-	void combineExternalFunctionType(bool _rightAligned);
-	/// Appends code that combines the construction-time (if available) and runtime function
-	/// entry label of the given function into a single stack slot.
-	/// Note: This might cause the compilation queue of the runtime context to be extended.
-	/// If @a _runtimeOnly, the entry label will include the runtime assembly tag.
-	void pushCombinedFunctionEntryLabel(Declaration const& _function, bool _runtimeOnly = true);
-
-	/// Appends code for an implicit or explicit type conversion. This includes erasing higher
-	/// order bits (@see appendHighBitCleanup) when widening integer but also copy to memory
-	/// if a reference type is converted from calldata or storage to memory.
-	/// If @a _cleanupNeeded, high order bits cleanup is also done if no type conversion would be
-	/// necessary.
-	/// If @a _chopSignBits, the function resets the signed bits out of the width of the signed integer.
-	/// If @a _asPartOfArgumentDecoding is true, failed conversions are flagged via REVERT,
-	/// otherwise they are flagged with INVALID.
-	void convertType(
-		Type const& _typeOnStack,
-		Type const& _targetType,
-		bool _cleanupNeeded = false,
-		bool _chopSignBits = false,
-		bool _asPartOfArgumentDecoding = false
-	);
-
-	/// Creates a zero-value for the given type and puts it onto the stack. This might allocate
-	/// memory for memory references.
-	void pushZeroValue(Type const& _type);
-	/// Pushes a pointer to the stack that points to a (potentially shared) location in memory
-	/// that always contains a zero. It is not allowed to write there.
-	void pushZeroPointer();
-
-	/// Moves the value that is at the top of the stack to a stack variable.
-	void moveToStackVariable(VariableDeclaration const& _variable);
-	/// Copies an item that occupies @a _itemSize stack slots from a stack depth of @a _stackDepth
-	/// to the top of the stack.
-	void copyToStackTop(unsigned _stackDepth, unsigned _itemSize);
-	/// Moves an item that occupies @a _itemSize stack slots and has items occupying @a _stackDepth
-	/// slots above it to the top of the stack.
-	void moveToStackTop(unsigned _stackDepth, unsigned _itemSize = 1);
-	/// Moves @a _itemSize elements past @a _stackDepth other stack elements
-	void moveIntoStack(unsigned _stackDepth, unsigned _itemSize = 1);
-	/// Rotates the topmost @a _items items on the stack, such that the previously topmost element
-	/// is bottom-most.
-	void rotateStackUp(unsigned _items);
-	/// Rotates the topmost @a _items items on the stack, such that the previously bottom-most element
-	/// is now topmost.
-	void rotateStackDown(unsigned _items);
-	/// Removes the current value from the top of the stack.
-	void popStackElement(Type const& _type);
-	/// Removes element from the top of the stack _amount times.
-	void popStackSlots(size_t _amount);
-	/// Pops slots from the stack such that its height is _toHeight.
-	/// Adds jump to _jumpTo.
-	/// Readjusts the stack offset to the original value.
-	void popAndJump(unsigned _toHeight, evmasm::AssemblyItem const& _jumpTo);
-
-	template <class T>
-	static unsigned sizeOnStack(std::vector<T> const& _variables);
-	static unsigned sizeOnStack(std::vector<Type const*> const& _variableTypes);
-
-	/// Helper function to shift top value on the stack to the left.
-	/// Stack pre: <value> <shift_by_bits>
-	/// Stack post: <shifted_value>
-	void leftShiftNumberOnStack(unsigned _bits);
-
-	/// Helper function to shift top value on the stack to the right.
-	/// Stack pre: <value> <shift_by_bits>
-	/// Stack post: <shifted_value>
-	void rightShiftNumberOnStack(unsigned _bits);
-
-	/// Appends code that computes the Keccak-256 hash of the topmost stack element of 32 byte type.
-	void computeHashStatic();
-
-	/// Appends code that copies the code of the given contract to memory.
-	/// Stack pre: Memory position
-	/// Stack post: Updated memory position
-	/// @param creation if true, copies creation code, if false copies runtime code.
-	/// @note the contract has to be compiled already, so beware of cyclic dependencies!
-	void copyContractCodeToMemory(ContractDefinition const& contract, bool _creationCode);
-
-	/// Bytes we need to the start of call data.
-	///  - The size in bytes of the function (hash) identifier.
-	static unsigned const dataStartOffset;
-
-	/// Position of the free-memory-pointer in memory;
-	static size_t const freeMemoryPointer;
-	/// Position of the memory slot that is always zero.
-	static size_t const zeroPointer;
-	/// Starting offset for memory available to the user (aka the contract).
-	static size_t const generalPurposeMemoryStart;
-
-private:
-	/// Appends code that cleans higher-order bits for integer types.
-	void cleanHigherOrderBits(IntegerType const& _typeOnStack);
-
-	/// Prepares the given type for storing in memory by shifting it if necessary.
-	/// @param _cleanup if true, also cleanup the value when preparing to store it in memory
-	unsigned prepareMemoryStore(Type const& _type, bool _padToWords, bool _cleanup = true);
-	/// Loads type from memory assuming memory offset is on stack top.
-	unsigned loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWords);
-
-	CompilerContext& m_context;
-};
-
-
-template <class T>
-unsigned CompilerUtils::sizeOnStack(std::vector<T> const& _variables)
-{
-	unsigned size = 0;
-	for (T const& variable: _variables)
-		size += variable->annotation().type->sizeOnStack();
-	return size;
-}
-
-}
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
deleted file mode 100644
index 186cebc787c3..000000000000
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ /dev/null
@@ -1,1555 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity compiler.
- */
-
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTUtils.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/codegen/ContractCompiler.h>
-#include <libsolidity/codegen/ExpressionCompiler.h>
-
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AST.h>
-#include <libyul/backends/evm/AsmCodeGen.h>
-#include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/optimiser/Suite.h>
-#include <libyul/Object.h>
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/YulString.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/Assembly.h>
-#include <libevmasm/GasMeter.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/StackTooDeepString.h>
-
-#include <range/v3/view/reverse.hpp>
-
-#include <algorithm>
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-using solidity::util::FixedHash;
-using solidity::util::h256;
-using solidity::util::errinfo_comment;
-
-namespace
-{
-
-/**
- * Simple helper class to ensure that the stack height is the same at certain places in the code.
- */
-class StackHeightChecker
-{
-public:
-	explicit StackHeightChecker(CompilerContext const& _context):
-		m_context(_context), stackHeight(m_context.stackHeight()) {}
-	void check()
-	{
-		solAssert(
-			m_context.stackHeight() == stackHeight,
-			std::string("I sense a disturbance in the stack: ") + std::to_string(m_context.stackHeight()) + " vs " + std::to_string(stackHeight)
-		);
-	}
-private:
-	CompilerContext const& m_context;
-	unsigned stackHeight;
-};
-
-}
-
-void ContractCompiler::compileContract(
-	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
-)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _contract);
-
-	if (_contract.isLibrary())
-		// Check whether this is a call (true) or a delegatecall (false).
-		// This has to be the first code in the contract.
-		appendDelegatecallCheck();
-
-	initializeContext(_contract, _otherCompilers);
-	// This generates the dispatch function for externally visible functions
-	// and adds the function to the compilation queue. Additionally internal functions,
-	// which are referenced directly or indirectly will be added.
-	appendFunctionSelector(_contract);
-}
-
-size_t ContractCompiler::compileConstructor(
-	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
-)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _contract);
-	if (_contract.isLibrary())
-		return deployLibrary(_contract);
-	else
-	{
-		initializeContext(_contract, _otherCompilers);
-		return packIntoContractCreator(_contract);
-	}
-}
-
-void ContractCompiler::initializeContext(
-	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
-)
-{
-	m_context.setUseABICoderV2(*_contract.sourceUnit().annotation().useABICoderV2);
-	m_context.setOtherCompilers(_otherCompilers);
-	m_context.setMostDerivedContract(_contract);
-	if (m_runtimeCompiler)
-		registerImmutableVariables(_contract);
-	CompilerUtils(m_context).initialiseFreeMemoryPointer();
-	registerStateVariables(_contract);
-	m_context.resetVisitedNodes(&_contract);
-}
-
-void ContractCompiler::appendCallValueCheck()
-{
-	// Throw if function is not payable but call contained ether.
-	m_context << Instruction::CALLVALUE;
-	m_context.appendConditionalRevert(false, "Ether sent to non-payable function");
-}
-
-void ContractCompiler::appendInitAndConstructorCode(ContractDefinition const& _contract)
-{
-	solAssert(!_contract.isLibrary(), "Tried to initialize library.");
-	CompilerContext::LocationSetter locationSetter(m_context, _contract);
-
-	m_baseArguments = &_contract.annotation().baseConstructorArguments;
-
-	// Initialization of state variables in base-to-derived order.
-	for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-		initializeStateVariables(*contract);
-
-	if (FunctionDefinition const* constructor = _contract.constructor())
-		appendConstructor(*constructor);
-	else
-	{
-		// Implicit constructors are always non-payable.
-		appendCallValueCheck();
-		if (auto c = _contract.nextConstructor(m_context.mostDerivedContract()))
-			appendBaseConstructor(*c);
-	}
-}
-
-size_t ContractCompiler::packIntoContractCreator(ContractDefinition const& _contract)
-{
-	solAssert(!!m_runtimeCompiler, "");
-	solAssert(!_contract.isLibrary(), "Tried to use contract creator or library.");
-
-	appendInitAndConstructorCode(_contract);
-
-	// We jump to the deploy routine because we first have to append all missing functions,
-	// which can cause further functions to be added to the runtime context.
-	evmasm::AssemblyItem deployRoutine = m_context.appendJumpToNew();
-
-	// We have to include copies of functions in the construction time and runtime context
-	// because of absolute jumps.
-	appendMissingFunctions();
-	m_runtimeCompiler->appendMissingFunctions();
-
-	CompilerContext::LocationSetter locationSetter(m_context, _contract);
-	m_context << deployRoutine;
-
-	solAssert(m_context.runtimeSub() != std::numeric_limits<size_t>::max(), "Runtime sub not registered");
-
-	ContractType contractType(_contract);
-	auto const& immutables = contractType.immutableVariables();
-	// Push all immutable values on the stack.
-	for (auto const& immutable: immutables)
-		CompilerUtils(m_context).loadFromMemory(
-			static_cast<unsigned>(m_context.immutableMemoryOffset(*immutable)),
-			*immutable->annotation().type,
-			false,
-			true
-	);
-	m_context.pushSubroutineSize(m_context.runtimeSub());
-	if (immutables.empty())
-		m_context << Instruction::DUP1;
-	m_context.pushSubroutineOffset(m_context.runtimeSub());
-	m_context << u256(0) << Instruction::CODECOPY;
-	// Assign immutable values from stack in reversed order.
-	for (auto const& immutable: immutables | ranges::views::reverse)
-	{
-		auto slotNames = m_context.immutableVariableSlotNames(*immutable);
-		for (auto&& slotName: slotNames | ranges::views::reverse)
-		{
-			m_context << u256(0);
-			m_context.appendImmutableAssignment(slotName);
-		}
-	}
-	if (!immutables.empty())
-		m_context.pushSubroutineSize(m_context.runtimeSub());
-	m_context << u256(0) << Instruction::RETURN;
-
-	return m_context.runtimeSub();
-}
-
-size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract)
-{
-	solAssert(!!m_runtimeCompiler, "");
-	solAssert(_contract.isLibrary(), "Tried to deploy contract as library.");
-
-	appendMissingFunctions();
-	m_runtimeCompiler->appendMissingFunctions();
-
-	CompilerContext::LocationSetter locationSetter(m_context, _contract);
-
-	solAssert(m_context.runtimeSub() != std::numeric_limits<size_t>::max(), "Runtime sub not registered");
-	m_context.pushSubroutineSize(m_context.runtimeSub());
-	m_context.pushSubroutineOffset(m_context.runtimeSub());
-	// This code replaces the address added by appendDeployTimeAddress().
-	m_context.appendInlineAssembly(
-		util::Whiskers(R"(
-		{
-			// If code starts at 11, an mstore(0) writes to the full PUSH20 plus data
-			// without the need for a shift.
-			let codepos := 11
-			codecopy(codepos, subOffset, subSize)
-			// Check that the first opcode is a PUSH20
-			if iszero(eq(0x73, byte(0, mload(codepos)))) {
-				mstore(0, <panicSelector>)
-				mstore(4, <panicCode>)
-				revert(0, 0x24)
-			}
-			mstore(0, address())
-			mstore8(codepos, 0x73)
-			return(codepos, subSize)
-		}
-		)")
-		("panicSelector", util::selectorFromSignatureU256("Panic(uint256)").str())
-		("panicCode", "0")
-		.render(),
-		{"subSize", "subOffset"}
-	);
-
-	return m_context.runtimeSub();
-}
-
-void ContractCompiler::appendBaseConstructor(FunctionDefinition const& _constructor)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _constructor);
-	FunctionType constructorType(_constructor);
-	if (!constructorType.parameterTypes().empty())
-	{
-		solAssert(m_baseArguments, "");
-		solAssert(m_baseArguments->count(&_constructor), "");
-		std::vector<ASTPointer<Expression>> const* arguments = nullptr;
-		ASTNode const* baseArgumentNode = m_baseArguments->at(&_constructor);
-		if (auto inheritanceSpecifier = dynamic_cast<InheritanceSpecifier const*>(baseArgumentNode))
-			arguments = inheritanceSpecifier->arguments();
-		else if (auto modifierInvocation = dynamic_cast<ModifierInvocation const*>(baseArgumentNode))
-			arguments = modifierInvocation->arguments();
-		solAssert(arguments, "");
-		solAssert(arguments->size() == constructorType.parameterTypes().size(), "");
-		for (unsigned i = 0; i < arguments->size(); ++i)
-			compileExpression(*(arguments->at(i)), constructorType.parameterTypes()[i]);
-	}
-	_constructor.accept(*this);
-}
-
-void ContractCompiler::appendConstructor(FunctionDefinition const& _constructor)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _constructor);
-	if (!_constructor.isPayable())
-		appendCallValueCheck();
-
-	// copy constructor arguments from code to memory and then to stack, they are supplied after the actual program
-	if (!_constructor.parameters().empty())
-	{
-		CompilerUtils(m_context).fetchFreeMemoryPointer();
-		// CODESIZE returns the actual size of the code,
-		// which is the size of the generated code (``programSize``)
-		// plus the constructor arguments added to the transaction payload.
-		m_context.appendProgramSize();
-		m_context << Instruction::CODESIZE << Instruction::SUB;
-		// stack: <memptr> <argument size>
-		m_context << Instruction::DUP1;
-		m_context.appendProgramSize();
-		m_context << Instruction::DUP4 << Instruction::CODECOPY;
-		// stack: <memptr> <argument size>
-		m_context << Instruction::DUP2 << Instruction::DUP2 << Instruction::ADD;
-		// stack: <memptr> <argument size> <mem end>
-		CompilerUtils(m_context).storeFreeMemoryPointer();
-		// stack: <memptr> <argument size>
-		CompilerUtils(m_context).abiDecode(FunctionType(_constructor).parameterTypes(), true);
-	}
-	_constructor.accept(*this);
-}
-
-void ContractCompiler::appendDelegatecallCheck()
-{
-	// Special constant that will be replaced by the address at deploy time.
-	// At compilation time, this is just "PUSH20 00...000".
-	m_context.appendDeployTimeAddress();
-	m_context << Instruction::ADDRESS << Instruction::EQ;
-	// The result on the stack is
-	// "We have not been called via DELEGATECALL".
-}
-
-void ContractCompiler::appendInternalSelector(
-	std::map<FixedHash<4>, evmasm::AssemblyItem const> const& _entryPoints,
-	std::vector<FixedHash<4>> const& _ids,
-	evmasm::AssemblyItem const& _notFoundTag,
-	size_t _runs
-)
-{
-	// Code for selecting from n functions without split:
-	//   n times: dup1, push4 <id_i>, eq, push2/3 <tag_i>, jumpi
-	//   push2/3 <notfound> jump
-	// (called SELECT[n])
-	// Code for selecting from n functions with split:
-	//   dup1, push4 <pivot>, gt, push2/3<tag_less>, jumpi
-	//     SELECT[n/2]
-	//   tag_less:
-	//     SELECT[n/2]
-	//
-	// This means each split adds 16-18 bytes of additional code (note the additional jump out!)
-	// The average execution cost if we do not split at all are:
-	//   (3 + 3 + 3 + 3 + 10) * n/2 = 24 * n/2 = 12 * n
-	// If we split once:
-	//    (3 + 3 + 3 + 3 + 10) + 24 * n/4 = 24 * (n/4 + 1) = 6 * n + 24;
-	//
-	// We should split if
-	//     _runs * 12 * n > _runs * (6 * n + 24) + 17 * createDataGas
-	// <=> _runs * 6 * (n - 4) > 17 * createDataGas
-	//
-	// Which also means that the execution itself is not profitable
-	// unless we have at least 5 functions.
-
-	// Start with some comparisons to avoid overflow, then do the actual comparison.
-	bool split = false;
-	if (_ids.size() <= 4)
-		split = false;
-	else if (_runs > (17 * evmasm::GasCosts::createDataGas) / 6)
-		split = true;
-	else
-		split = (_runs * 6 * (_ids.size() - 4) > 17 * evmasm::GasCosts::createDataGas);
-
-	if (split)
-	{
-		size_t pivotIndex = _ids.size() / 2;
-		FixedHash<4> pivot{_ids.at(pivotIndex)};
-		m_context << dupInstruction(1) << u256(FixedHash<4>::Arith(pivot)) << Instruction::GT;
-		evmasm::AssemblyItem lessTag{m_context.appendConditionalJump()};
-		// Here, we have funid >= pivot
-		std::vector<FixedHash<4>> larger{_ids.begin() + static_cast<ptrdiff_t>(pivotIndex), _ids.end()};
-		appendInternalSelector(_entryPoints, larger, _notFoundTag, _runs);
-		m_context << lessTag;
-		// Here, we have funid < pivot
-		std::vector<FixedHash<4>> smaller{_ids.begin(), _ids.begin() + static_cast<ptrdiff_t>(pivotIndex)};
-		appendInternalSelector(_entryPoints, smaller, _notFoundTag, _runs);
-	}
-	else
-	{
-		for (auto const& id: _ids)
-		{
-			m_context << dupInstruction(1) << u256(FixedHash<4>::Arith(id)) << Instruction::EQ;
-			m_context.appendConditionalJumpTo(_entryPoints.at(id));
-		}
-		m_context.appendJumpTo(_notFoundTag);
-	}
-}
-
-namespace
-{
-
-// Helper function to check if any function is payable
-bool hasPayableFunctions(ContractDefinition const& _contract)
-{
-	if (_contract.receiveFunction())
-		return true;
-
-	FunctionDefinition const* fallback = _contract.fallbackFunction();
-	if (fallback && fallback->isPayable())
-		return true;
-
-	for (auto const& it: _contract.interfaceFunctions())
-		if (it.second->isPayable())
-			return true;
-
-	return false;
-}
-
-}
-
-void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contract)
-{
-	std::map<FixedHash<4>, FunctionTypePointer> interfaceFunctions = _contract.interfaceFunctions();
-	std::map<FixedHash<4>, evmasm::AssemblyItem const> callDataUnpackerEntryPoints;
-
-	if (_contract.isLibrary())
-	{
-		solAssert(m_context.stackHeight() == 1, "CALL / DELEGATECALL flag expected.");
-	}
-
-	FunctionDefinition const* fallback = _contract.fallbackFunction();
-	solAssert(!_contract.isLibrary() || !fallback, "Libraries can't have fallback functions");
-
-	FunctionDefinition const* etherReceiver = _contract.receiveFunction();
-	solAssert(!_contract.isLibrary() || !etherReceiver, "Libraries can't have ether receiver functions");
-
-	bool needToAddCallvalueCheck = true;
-	if (!hasPayableFunctions(_contract) && !interfaceFunctions.empty() && !_contract.isLibrary())
-	{
-		appendCallValueCheck();
-		needToAddCallvalueCheck = false;
-	}
-
-	evmasm::AssemblyItem notFoundOrReceiveEther = m_context.newTag();
-	// If there is neither a fallback nor a receive ether function, we only need one label to jump to, which
-	// always reverts.
-	evmasm::AssemblyItem notFound = (!fallback && !etherReceiver) ? notFoundOrReceiveEther : m_context.newTag();
-
-	// directly jump to fallback or ether receiver if the data is too short to contain a function selector
-	// also guards against short data
-	m_context << u256(4) << Instruction::CALLDATASIZE << Instruction::LT;
-	m_context.appendConditionalJumpTo(notFoundOrReceiveEther);
-
-	// retrieve the function signature hash from the calldata
-	if (!interfaceFunctions.empty())
-	{
-		CompilerUtils(m_context).loadFromMemory(0, IntegerType(CompilerUtils::dataStartOffset * 8), true, false);
-
-		// stack now is: <can-call-non-view-functions>? <funhash>
-		std::vector<FixedHash<4>> sortedIDs;
-		for (auto const& it: interfaceFunctions)
-		{
-			callDataUnpackerEntryPoints.emplace(it.first, m_context.newTag());
-			sortedIDs.emplace_back(it.first);
-		}
-		std::sort(sortedIDs.begin(), sortedIDs.end());
-		appendInternalSelector(callDataUnpackerEntryPoints, sortedIDs, notFound, m_optimiserSettings.expectedExecutionsPerDeployment);
-	}
-
-	m_context << notFoundOrReceiveEther;
-
-	if (!fallback && !etherReceiver)
-		m_context.appendRevert("Contract does not have fallback nor receive functions");
-	else
-	{
-		if (etherReceiver)
-		{
-			// directly jump to fallback, if there is calldata
-			m_context << Instruction::CALLDATASIZE;
-			m_context.appendConditionalJumpTo(notFound);
-
-			solAssert(!_contract.isLibrary(), "");
-			solAssert(etherReceiver->isReceive(), "");
-			solAssert(FunctionType(*etherReceiver).parameterTypes().empty(), "");
-			solAssert(FunctionType(*etherReceiver).returnParameterTypes().empty(), "");
-			etherReceiver->accept(*this);
-			m_context << Instruction::STOP;
-		}
-
-		m_context << notFound;
-		if (fallback)
-		{
-			solAssert(!_contract.isLibrary(), "");
-			if (!fallback->isPayable() && needToAddCallvalueCheck)
-				appendCallValueCheck();
-
-			solAssert(fallback->isFallback(), "");
-			m_context.setStackOffset(0);
-
-			if (!FunctionType(*fallback).parameterTypes().empty())
-				m_context << u256(0) << Instruction::CALLDATASIZE;
-
-			fallback->accept(*this);
-
-			if (FunctionType(*fallback).returnParameterTypes().empty())
-				m_context << Instruction::STOP;
-			else
-			{
-				m_context << Instruction::DUP1 << Instruction::MLOAD << Instruction::SWAP1;
-				m_context << u256(0x20) << Instruction::ADD;
-				m_context << Instruction::RETURN;
-			}
-		}
-		else
-			m_context.appendRevert("Unknown signature and no fallback defined");
-	}
-
-
-	for (auto const& it: interfaceFunctions)
-	{
-		m_context.setStackOffset(1);
-		FunctionTypePointer const& functionType = it.second;
-		solAssert(functionType->hasDeclaration(), "");
-		CompilerContext::LocationSetter locationSetter(m_context, functionType->declaration());
-
-		m_context << callDataUnpackerEntryPoints.at(it.first);
-		if (_contract.isLibrary() && functionType->stateMutability() > StateMutability::View)
-		{
-			// If the function is not a view function and is called without DELEGATECALL,
-			// we revert.
-			m_context << dupInstruction(2);
-			m_context.appendConditionalRevert(false, "Non-view function of library called without DELEGATECALL");
-		}
-		m_context.setStackOffset(0);
-		// We have to allow this for libraries, because value of the previous
-		// call is still visible in the delegatecall.
-		if (!functionType->isPayable() && !_contract.isLibrary() && needToAddCallvalueCheck)
-			appendCallValueCheck();
-
-		// Return tag is used to jump out of the function.
-		evmasm::AssemblyItem returnTag = m_context.pushNewTag();
-		if (!functionType->parameterTypes().empty())
-		{
-			// Parameter for calldataUnpacker
-			m_context << CompilerUtils::dataStartOffset;
-			m_context << Instruction::DUP1 << Instruction::CALLDATASIZE << Instruction::SUB;
-			CompilerUtils(m_context).abiDecode(functionType->parameterTypes());
-		}
-		m_context.appendJumpTo(
-			m_context.functionEntryLabel(functionType->declaration()),
-			evmasm::AssemblyItem::JumpType::IntoFunction
-		);
-		m_context << returnTag;
-		// Return tag and input parameters get consumed.
-		m_context.adjustStackOffset(
-			static_cast<int>(CompilerUtils::sizeOnStack(functionType->returnParameterTypes())) -
-			static_cast<int>(CompilerUtils::sizeOnStack(functionType->parameterTypes())) -
-			1
-		);
-		// Consumes the return parameters.
-		appendReturnValuePacker(functionType->returnParameterTypes(), _contract.isLibrary());
-	}
-}
-
-void ContractCompiler::appendReturnValuePacker(TypePointers const& _typeParameters, bool _isLibrary)
-{
-	CompilerUtils utils(m_context);
-	if (_typeParameters.empty())
-		m_context << Instruction::STOP;
-	else
-	{
-		utils.fetchFreeMemoryPointer();
-		//@todo optimization: if we return a single memory array, there should be enough space before
-		// its data to add the needed parts and we avoid a memory copy.
-		utils.abiEncode(_typeParameters, _typeParameters, _isLibrary);
-		utils.toSizeAfterFreeMemoryPointer();
-		m_context << Instruction::RETURN;
-	}
-}
-
-void ContractCompiler::registerStateVariables(ContractDefinition const& _contract)
-{
-	for (auto const& var: ContractType(_contract).stateVariables())
-		m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
-}
-
-void ContractCompiler::registerImmutableVariables(ContractDefinition const& _contract)
-{
-	solAssert(m_runtimeCompiler, "Attempted to register immutables for runtime code generation.");
-	for (auto const& var: ContractType(_contract).immutableVariables())
-		m_context.addImmutable(*var);
-}
-
-void ContractCompiler::initializeStateVariables(ContractDefinition const& _contract)
-{
-	solAssert(!_contract.isLibrary(), "Tried to initialize state variables of library.");
-	for (VariableDeclaration const* variable: _contract.stateVariables())
-		if (variable->value() && !variable->isConstant())
-			ExpressionCompiler(m_context, m_optimiserSettings.runOrderLiterals).appendStateVariableInitialization(*variable);
-}
-
-bool ContractCompiler::visit(VariableDeclaration const& _variableDeclaration)
-{
-	solAssert(_variableDeclaration.isStateVariable(), "Compiler visit to non-state variable declaration.");
-	CompilerContext::LocationSetter locationSetter(m_context, _variableDeclaration);
-
-	m_context.startFunction(_variableDeclaration);
-	m_breakTags.clear();
-	m_continueTags.clear();
-
-	if (_variableDeclaration.isConstant())
-		ExpressionCompiler(m_context, m_optimiserSettings.runOrderLiterals)
-			.appendConstStateVariableAccessor(_variableDeclaration);
-	else
-		ExpressionCompiler(m_context, m_optimiserSettings.runOrderLiterals)
-			.appendStateVariableAccessor(_variableDeclaration);
-
-	return false;
-}
-
-bool ContractCompiler::visit(FunctionDefinition const& _function)
-{
-	solAssert(_function.isImplemented(), "");
-
-	CompilerContext::LocationSetter locationSetter(m_context, _function);
-
-	m_context.startFunction(_function);
-
-	// stack upon entry: [return address] [arg0] [arg1] ... [argn]
-	// reserve additional slots: [retarg0] ... [retargm]
-
-	unsigned parametersSize = CompilerUtils::sizeOnStack(_function.parameters());
-	if (_function.isFallback())
-		m_context.adjustStackOffset(static_cast<int>(parametersSize));
-	else if (!_function.isConstructor())
-		// adding 1 for return address.
-		m_context.adjustStackOffset(static_cast<int>(parametersSize) + 1);
-	for (ASTPointer<VariableDeclaration> const& variable: _function.parameters())
-	{
-		m_context.addVariable(*variable, parametersSize);
-		parametersSize -= variable->annotation().type->sizeOnStack();
-	}
-
-	for (ASTPointer<VariableDeclaration> const& variable: _function.returnParameters())
-		appendStackVariableInitialisation(*variable, /* _provideDefaultValue = */ true);
-
-	if (_function.isConstructor())
-		if (auto c = dynamic_cast<ContractDefinition const&>(*_function.scope()).nextConstructor(
-				m_context.mostDerivedContract()
-		))
-			appendBaseConstructor(*c);
-
-	solAssert(m_returnTags.empty(), "");
-	m_breakTags.clear();
-	m_continueTags.clear();
-	m_currentFunction = &_function;
-	m_modifierDepth = std::numeric_limits<unsigned>::max();
-	m_scopeStackHeight.clear();
-	m_context.setModifierDepth(0);
-
-	appendModifierOrFunctionCode();
-	m_context.setModifierDepth(0);
-	solAssert(m_returnTags.empty(), "");
-
-	// Now we need to re-shuffle the stack. For this we keep a record of the stack layout
-	// that shows the target positions of the elements, where "-1" denotes that this element needs
-	// to be removed from the stack.
-	// Note that the fact that the return arguments are of increasing index is vital for this
-	// algorithm to work.
-
-	unsigned const c_argumentsSize = CompilerUtils::sizeOnStack(_function.parameters());
-	unsigned const c_returnValuesSize = CompilerUtils::sizeOnStack(_function.returnParameters());
-
-	std::vector<int> stackLayout;
-	if (!_function.isConstructor() && !_function.isFallback())
-		stackLayout.push_back(static_cast<int>(c_returnValuesSize)); // target of return address
-	stackLayout += std::vector<int>(c_argumentsSize, -1); // discard all arguments
-	for (size_t i = 0; i < c_returnValuesSize; ++i)
-		stackLayout.push_back(static_cast<int>(i));
-
-	if (stackLayout.size() > 17)
-		BOOST_THROW_EXCEPTION(
-			StackTooDeepError() <<
-			errinfo_sourceLocation(_function.location()) <<
-			util::errinfo_comment(util::stackTooDeepString)
-		);
-	while (!stackLayout.empty() && stackLayout.back() != static_cast<int>(stackLayout.size() - 1))
-		if (stackLayout.back() < 0)
-		{
-			m_context << Instruction::POP;
-			stackLayout.pop_back();
-		}
-		else
-		{
-			m_context << swapInstruction(static_cast<unsigned>(stackLayout.size()) - static_cast<unsigned>(stackLayout.back()) - 1u);
-			std::swap(stackLayout[static_cast<size_t>(stackLayout.back())], stackLayout.back());
-		}
-	for (size_t i = 0; i < stackLayout.size(); ++i)
-		if (stackLayout[i] != static_cast<int>(i))
-			solAssert(false, "Invalid stack layout on cleanup.");
-
-	for (ASTPointer<VariableDeclaration> const& variable: _function.parameters() + _function.returnParameters())
-		m_context.removeVariable(*variable);
-
-	m_context.adjustStackOffset(-(int)c_returnValuesSize);
-
-	/// The constructor and the fallback function doesn't to jump out.
-	if (!_function.isConstructor())
-	{
-		solAssert(m_context.numberOfLocalVariables() == 0, "");
-		if (!_function.isFallback() && !_function.isReceive())
-			m_context.appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction);
-	}
-
-	return false;
-}
-
-bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
-{
-	unsigned startStackHeight = m_context.stackHeight();
-	yul::ExternalIdentifierAccess::CodeGenerator identifierAccessCodeGen = [&](
-		yul::Identifier const& _identifier,
-		yul::IdentifierContext _context,
-		yul::AbstractAssembly& _assembly
-	)
-	{
-		solAssert(_context == yul::IdentifierContext::RValue || _context == yul::IdentifierContext::LValue, "");
-		auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
-		solAssert(ref != _inlineAssembly.annotation().externalReferences.end(), "");
-		Declaration const* decl = ref->second.declaration;
-		solAssert(!!decl, "");
-		if (_context == yul::IdentifierContext::RValue)
-		{
-			int const depositBefore = _assembly.stackHeight();
-			solAssert(!!decl->type(), "Type of declaration required but not yet determined.");
-			if (auto variable = dynamic_cast<VariableDeclaration const*>(decl))
-			{
-				solAssert(!variable->immutable(), "");
-				if (variable->isConstant())
-				{
-					variable = rootConstVariableDeclaration(*variable);
-					// If rootConstVariableDeclaration fails and returns nullptr,
-					// it should have failed in TypeChecker already, causing a compilation error.
-					// In such case we should not get here.
-					solAssert(variable, "");
-
-					u256 value;
-					if (variable->value()->annotation().type->category() == Type::Category::RationalNumber)
-					{
-						value = dynamic_cast<RationalNumberType const&>(*variable->value()->annotation().type).literalValue(nullptr);
-						if (FixedBytesType const* bytesType = dynamic_cast<FixedBytesType const*>(variable->type()))
-							value = value << (256 - 8 * bytesType->numBytes());
-						else
-							solAssert(variable->type()->category() == Type::Category::Integer, "");
-					}
-					else if (Literal const* literal = dynamic_cast<Literal const*>(variable->value().get()))
-					{
-						Type const* type = literal->annotation().type;
-
-						switch (type->category())
-						{
-						case Type::Category::Bool:
-						case Type::Category::Address:
-							// Either both the literal and the variable are bools, or they are both addresses.
-							// If they are both bools, comparing category is the same as comparing the types.
-							// If they are both addresses, compare category so that payable/nonpayable is not compared.
-							solAssert(type->category() == variable->annotation().type->category(), "");
-							value = type->literalValue(literal);
-							break;
-						case Type::Category::StringLiteral:
-						{
-							StringLiteralType const& stringLiteral = dynamic_cast<StringLiteralType const&>(*type);
-							solAssert(variable->type()->category() == Type::Category::FixedBytes, "");
-							unsigned const numBytes = dynamic_cast<FixedBytesType const&>(*variable->type()).numBytes();
-							solAssert(stringLiteral.value().size() <= numBytes, "");
-							value = u256(h256(stringLiteral.value(), h256::AlignLeft));
-							break;
-						}
-						default:
-							solAssert(false, "");
-						}
-					}
-					else
-						solAssert(false, "Invalid constant in inline assembly.");
-					m_context << value;
-				}
-				else if (m_context.isStateVariable(decl))
-				{
-					auto const& location = m_context.storageLocationOfVariable(*decl);
-					if (ref->second.suffix == "slot")
-						m_context << location.first;
-					else if (ref->second.suffix == "offset")
-						m_context << u256(location.second);
-					else
-						solAssert(false, "");
-				}
-				else if (m_context.isLocalVariable(decl))
-				{
-					unsigned stackDiff = static_cast<unsigned>(_assembly.stackHeight()) - m_context.baseStackOffsetOfVariable(*variable);
-					if (!ref->second.suffix.empty())
-					{
-						std::string const& suffix = ref->second.suffix;
-						if (variable->type()->dataStoredIn(DataLocation::Storage))
-						{
-							solAssert(suffix == "offset" || suffix == "slot", "");
-							unsigned size = variable->type()->sizeOnStack();
-							if (size == 2)
-							{
-								// slot plus offset
-								if (suffix == "offset")
-									stackDiff--;
-							}
-							else
-							{
-								solAssert(size == 1, "");
-								// only slot, offset is zero
-								if (suffix == "offset")
-								{
-									_assembly.appendConstant(u256(0));
-									return;
-								}
-							}
-						}
-						else if (variable->type()->dataStoredIn(DataLocation::CallData))
-						{
-							auto const* arrayType = dynamic_cast<ArrayType const*>(variable->type());
-							solAssert(
-								arrayType && arrayType->isDynamicallySized() && arrayType->dataStoredIn(DataLocation::CallData),
-								""
-							);
-							solAssert(suffix == "offset" || suffix == "length", "");
-							solAssert(variable->type()->sizeOnStack() == 2, "");
-							if (suffix == "length")
-								stackDiff--;
-						}
-						else if (
-							auto const* functionType = dynamic_cast<FunctionType const*>(variable->type());
-							functionType && functionType->kind() == FunctionType::Kind::External
-						)
-						{
-							solAssert(suffix == "selector" || suffix == "address", "");
-							solAssert(variable->type()->sizeOnStack() == 2, "");
-							if (suffix == "selector")
-								stackDiff--;
-						}
-						else
-							solAssert(false, "");
-					}
-					else
-						solAssert(variable->type()->sizeOnStack() == 1, "");
-					if (stackDiff < 1 || stackDiff > 16)
-						BOOST_THROW_EXCEPTION(
-							StackTooDeepError() <<
-							errinfo_sourceLocation(_inlineAssembly.location()) <<
-							util::errinfo_comment(util::stackTooDeepString)
-						);
-					_assembly.appendInstruction(dupInstruction(stackDiff));
-				}
-				else
-					solAssert(false, "");
-			}
-			else if (auto contract = dynamic_cast<ContractDefinition const*>(decl))
-			{
-				solAssert(ref->second.suffix.empty(), "");
-				solAssert(contract->isLibrary(), "");
-				_assembly.appendLinkerSymbol(contract->fullyQualifiedName());
-			}
-			else
-				solAssert(false, "Invalid declaration type.");
-			solAssert(_assembly.stackHeight() - depositBefore == static_cast<int>(ref->second.valueSize), "");
-		}
-		else
-		{
-			// lvalue context
-			auto variable = dynamic_cast<VariableDeclaration const*>(decl);
-			unsigned stackDiff = static_cast<unsigned>(_assembly.stackHeight()) - m_context.baseStackOffsetOfVariable(*variable) - 1;
-			std::string const& suffix = ref->second.suffix;
-			if (variable->type()->dataStoredIn(DataLocation::Storage))
-			{
-				solAssert(
-					!!variable && m_context.isLocalVariable(variable),
-					"Can only assign to stack variables in inline assembly."
-				);
-				solAssert(variable->type()->sizeOnStack() == 1, "");
-				solAssert(suffix == "slot", "");
-			}
-			else if (variable->type()->dataStoredIn(DataLocation::CallData))
-			{
-				if (auto const* arrayType = dynamic_cast<ArrayType const*>(variable->type()))
-				{
-					if (arrayType->isDynamicallySized())
-					{
-						solAssert(suffix == "offset" || suffix == "length", "");
-						solAssert(variable->type()->sizeOnStack() == 2, "");
-						if (suffix == "length")
-							stackDiff--;
-					}
-					else
-					{
-						solAssert(variable->type()->sizeOnStack() == 1, "");
-						solAssert(suffix.empty(), "");
-					}
-				}
-				else
-				{
-					auto const* structType = dynamic_cast<StructType const*>(variable->type());
-					solAssert(structType, "");
-					solAssert(variable->type()->sizeOnStack() == 1, "");
-					solAssert(suffix.empty(), "");
-				}
-			}
-			else if (
-				auto const* functionType = dynamic_cast<FunctionType const*>(variable->type());
-				functionType && functionType->kind() == FunctionType::Kind::External
-			)
-			{
-				solAssert(suffix == "selector" || suffix == "address", "");
-				solAssert(variable->type()->sizeOnStack() == 2, "");
-				if (suffix == "selector")
-					stackDiff--;
-			}
-			else
-				solAssert(suffix.empty(), "");
-
-			if (stackDiff > 16 || stackDiff < 1)
-				BOOST_THROW_EXCEPTION(
-					StackTooDeepError() <<
-					errinfo_sourceLocation(_inlineAssembly.location()) <<
-					util::errinfo_comment(util::stackTooDeepString)
-				);
-			_assembly.appendInstruction(swapInstruction(stackDiff));
-			_assembly.appendInstruction(Instruction::POP);
-		}
-	};
-
-	yul::Block const* code = &_inlineAssembly.operations();
-	yul::AsmAnalysisInfo* analysisInfo = _inlineAssembly.annotation().analysisInfo.get();
-
-	// Only used in the scope below, but required to live outside to keep the
-	// std::shared_ptr's alive
-	yul::Object object = {};
-
-	// The optimiser cannot handle external references
-	if (
-		m_optimiserSettings.runYulOptimiser &&
-		_inlineAssembly.annotation().externalReferences.empty()
-	)
-	{
-		yul::EVMDialect const* dialect = dynamic_cast<decltype(dialect)>(&_inlineAssembly.dialect());
-		solAssert(dialect, "");
-
-		// Create a modifiable copy of the code and analysis
-		object.code = std::make_shared<yul::Block>(yul::ASTCopier().translate(*code));
-		object.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(*dialect, object));
-
-		m_context.optimizeYul(object, *dialect, m_optimiserSettings);
-
-		code = object.code.get();
-		analysisInfo = object.analysisInfo.get();
-	}
-
-	yul::CodeGenerator::assemble(
-		*code,
-		*analysisInfo,
-		*m_context.assemblyPtr(),
-		m_context.evmVersion(),
-		identifierAccessCodeGen,
-		false,
-		m_optimiserSettings.optimizeStackAllocation
-	);
-	m_context.setStackOffset(static_cast<int>(startStackHeight));
-	return false;
-}
-
-bool ContractCompiler::visit(TryStatement const& _tryStatement)
-{
-	StackHeightChecker checker(m_context);
-	CompilerContext::LocationSetter locationSetter(m_context, _tryStatement);
-
-	compileExpression(_tryStatement.externalCall());
-	int const returnSize = static_cast<int>(_tryStatement.externalCall().annotation().type->sizeOnStack());
-
-	// Stack: [ return values] <success flag>
-	evmasm::AssemblyItem successTag = m_context.appendConditionalJump();
-
-	// Catch case.
-	m_context.adjustStackOffset(-returnSize);
-
-	handleCatch(_tryStatement.clauses());
-
-	evmasm::AssemblyItem endTag = m_context.appendJumpToNew();
-
-	m_context << successTag;
-	m_context.adjustStackOffset(returnSize);
-	{
-		// Success case.
-		// Stack: return values
-		TryCatchClause const& successClause = *_tryStatement.clauses().front();
-		if (successClause.parameters())
-		{
-			std::vector<Type const*> exprTypes{_tryStatement.externalCall().annotation().type};
-			if (auto tupleType = dynamic_cast<TupleType const*>(exprTypes.front()))
-				exprTypes = tupleType->components();
-			std::vector<ASTPointer<VariableDeclaration>> const& params = successClause.parameters()->parameters();
-			solAssert(exprTypes.size() == params.size(), "");
-			for (size_t i = 0; i < exprTypes.size(); ++i)
-				solAssert(params[i] && exprTypes[i] && *params[i]->annotation().type == *exprTypes[i], "");
-		}
-		else
-			CompilerUtils(m_context).popStackSlots(static_cast<size_t>(returnSize));
-
-		_tryStatement.clauses().front()->accept(*this);
-	}
-
-	m_context << endTag;
-	checker.check();
-	return false;
-}
-
-void ContractCompiler::handleCatch(std::vector<ASTPointer<TryCatchClause>> const& _catchClauses)
-{
-	// Stack is empty.
-	ASTPointer<TryCatchClause> error{};
-	ASTPointer<TryCatchClause> panic{};
-	ASTPointer<TryCatchClause> fallback{};
-	for (size_t i = 1; i < _catchClauses.size(); ++i)
-		if (_catchClauses[i]->errorName() == "Error")
-			error = _catchClauses[i];
-		else if (_catchClauses[i]->errorName() == "Panic")
-			panic = _catchClauses[i];
-		else if (_catchClauses[i]->errorName().empty())
-			fallback = _catchClauses[i];
-		else
-			solAssert(false, "");
-
-	solAssert(_catchClauses.size() == 1ul + (error ? 1 : 0) + (panic ? 1 : 0) + (fallback ? 1 : 0), "");
-
-	evmasm::AssemblyItem endTag = m_context.newTag();
-	evmasm::AssemblyItem fallbackTag = m_context.newTag();
-	evmasm::AssemblyItem panicTag = m_context.newTag();
-	if (error || panic)
-		// Note that this function returns zero on failure, which is not a problem yet,
-		// but will be a problem once we allow user-defined errors.
-		m_context.callYulFunction(m_context.utilFunctions().returnDataSelectorFunction(), 0, 1);
-		// stack: <selector>
-	if (error)
-	{
-		solAssert(
-			error->parameters() &&
-			error->parameters()->parameters().size() == 1 &&
-			error->parameters()->parameters().front() &&
-			*error->parameters()->parameters().front()->annotation().type == *TypeProvider::stringMemory(),
-			""
-		);
-		solAssert(m_context.evmVersion().supportsReturndata(), "");
-
-		// stack: <selector>
-		m_context << Instruction::DUP1 << util::selectorFromSignatureU32("Error(string)") << Instruction::EQ;
-		m_context << Instruction::ISZERO;
-		m_context.appendConditionalJumpTo(panicTag);
-		m_context << Instruction::POP; // remove selector
-
-		// Try to decode the error message.
-		// If this fails, leaves 0 on the stack, otherwise the pointer to the data string.
-		m_context.callYulFunction(m_context.utilFunctions().tryDecodeErrorMessageFunction(), 0, 1);
-		m_context << Instruction::DUP1;
-		AssemblyItem decodeSuccessTag = m_context.appendConditionalJump();
-		m_context << Instruction::POP;
-		m_context.appendJumpTo(fallbackTag);
-		m_context.adjustStackOffset(1);
-
-		m_context << decodeSuccessTag;
-		error->accept(*this);
-		m_context.appendJumpTo(endTag);
-		m_context.adjustStackOffset(1);
-	}
-	m_context << panicTag;
-	if (panic)
-	{
-		solAssert(
-			panic->parameters() &&
-			panic->parameters()->parameters().size() == 1 &&
-			panic->parameters()->parameters().front() &&
-			*panic->parameters()->parameters().front()->annotation().type == *TypeProvider::uint256(),
-			""
-		);
-		solAssert(m_context.evmVersion().supportsReturndata(), "");
-
-		// stack: <selector>
-		m_context << util::selectorFromSignatureU32("Panic(uint256)") << Instruction::EQ;
-		m_context << Instruction::ISZERO;
-		m_context.appendConditionalJumpTo(fallbackTag);
-
-		m_context.callYulFunction(m_context.utilFunctions().tryDecodePanicDataFunction(), 0, 2);
-		m_context << Instruction::SWAP1;
-		// stack: <code> <success>
-		AssemblyItem decodeSuccessTag = m_context.appendConditionalJump();
-		m_context << Instruction::POP;
-		m_context.appendJumpTo(fallbackTag);
-		m_context.adjustStackOffset(1);
-
-		m_context << decodeSuccessTag;
-		panic->accept(*this);
-		m_context.appendJumpTo(endTag);
-		m_context.adjustStackOffset(1);
-	}
-	if (error || panic)
-		m_context << Instruction::POP; // selector
-	m_context << fallbackTag;
-	if (fallback)
-	{
-		if (fallback->parameters())
-		{
-			solAssert(m_context.evmVersion().supportsReturndata(), "");
-			solAssert(
-				fallback->parameters()->parameters().size() == 1 &&
-				fallback->parameters()->parameters().front() &&
-				*fallback->parameters()->parameters().front()->annotation().type == *TypeProvider::bytesMemory(),
-				""
-			);
-			CompilerUtils(m_context).returnDataToArray();
-		}
-
-		fallback->accept(*this);
-	}
-	else
-	{
-		// re-throw
-		if (m_context.evmVersion().supportsReturndata())
-			m_context.appendInlineAssembly(R"({
-				returndatacopy(0, 0, returndatasize())
-				revert(0, returndatasize())
-			})");
-		else
-			// Since both returndata and revert are >=byzantium, this should be unreachable.
-			solAssert(false, "");
-	}
-	m_context << endTag;
-}
-
-bool ContractCompiler::visit(TryCatchClause const& _clause)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _clause);
-
-	unsigned varSize = 0;
-
-	if (_clause.parameters())
-		for (ASTPointer<VariableDeclaration> const& varDecl: _clause.parameters()->parameters() | ranges::views::reverse)
-		{
-			solAssert(varDecl, "");
-			varSize += varDecl->annotation().type->sizeOnStack();
-			m_context.addVariable(*varDecl, varSize);
-		}
-
-	_clause.block().accept(*this);
-
-	m_context.removeVariablesAboveStackHeight(m_context.stackHeight() - varSize);
-	CompilerUtils(m_context).popStackSlots(varSize);
-
-	return false;
-}
-
-bool ContractCompiler::visit(IfStatement const& _ifStatement)
-{
-	StackHeightChecker checker(m_context);
-	CompilerContext::LocationSetter locationSetter(m_context, _ifStatement);
-	compileExpression(_ifStatement.condition());
-	m_context << Instruction::ISZERO;
-	evmasm::AssemblyItem falseTag = m_context.appendConditionalJump();
-	evmasm::AssemblyItem endTag = falseTag;
-	_ifStatement.trueStatement().accept(*this);
-	if (_ifStatement.falseStatement())
-	{
-		endTag = m_context.appendJumpToNew();
-		m_context << falseTag;
-		_ifStatement.falseStatement()->accept(*this);
-	}
-	m_context << endTag;
-
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(WhileStatement const& _whileStatement)
-{
-	StackHeightChecker checker(m_context);
-	CompilerContext::LocationSetter locationSetter(m_context, _whileStatement);
-
-	evmasm::AssemblyItem loopStart = m_context.newTag();
-	evmasm::AssemblyItem loopEnd = m_context.newTag();
-	m_breakTags.emplace_back(loopEnd, m_context.stackHeight());
-
-	m_context << loopStart;
-
-	if (_whileStatement.isDoWhile())
-	{
-		evmasm::AssemblyItem condition = m_context.newTag();
-		m_continueTags.emplace_back(condition, m_context.stackHeight());
-
-		_whileStatement.body().accept(*this);
-
-		m_context << condition;
-		compileExpression(_whileStatement.condition());
-		m_context << Instruction::ISZERO << Instruction::ISZERO;
-		m_context.appendConditionalJumpTo(loopStart);
-	}
-	else
-	{
-		m_continueTags.emplace_back(loopStart, m_context.stackHeight());
-		compileExpression(_whileStatement.condition());
-		m_context << Instruction::ISZERO;
-		m_context.appendConditionalJumpTo(loopEnd);
-
-		_whileStatement.body().accept(*this);
-
-		m_context.appendJumpTo(loopStart);
-	}
-	m_context << loopEnd;
-
-	m_continueTags.pop_back();
-	m_breakTags.pop_back();
-
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(ForStatement const& _forStatement)
-{
-	StackHeightChecker checker(m_context);
-	CompilerContext::LocationSetter locationSetter(m_context, _forStatement);
-	evmasm::AssemblyItem loopStart = m_context.newTag();
-	evmasm::AssemblyItem loopEnd = m_context.newTag();
-	evmasm::AssemblyItem loopNext = m_context.newTag();
-
-	storeStackHeight(&_forStatement);
-
-	if (_forStatement.initializationExpression())
-		_forStatement.initializationExpression()->accept(*this);
-
-	m_breakTags.emplace_back(loopEnd, m_context.stackHeight());
-	m_continueTags.emplace_back(loopNext, m_context.stackHeight());
-	m_context << loopStart;
-
-	// if there is no terminating condition in for, default is to always be true
-	if (_forStatement.condition())
-	{
-		compileExpression(*_forStatement.condition());
-		m_context << Instruction::ISZERO;
-		m_context.appendConditionalJumpTo(loopEnd);
-	}
-
-	_forStatement.body().accept(*this);
-
-	m_context << loopNext;
-
-	// for's loop expression if existing
-	if (_forStatement.loopExpression())
-	{
-		Arithmetic previousArithmetic = m_context.arithmetic();
-		if (
-			*_forStatement.annotation().isSimpleCounterLoop &&
-			m_optimiserSettings.simpleCounterForLoopUncheckedIncrement
-		)
-			m_context.setArithmetic(Arithmetic::Wrapping);
-		_forStatement.loopExpression()->accept(*this);
-		m_context.setArithmetic(previousArithmetic);
-	}
-
-	m_context.appendJumpTo(loopStart);
-
-	m_context << loopEnd;
-
-	m_continueTags.pop_back();
-	m_breakTags.pop_back();
-
-	// For the case where no break/return is executed:
-	// loop initialization variables have to be freed
-	popScopedVariables(&_forStatement);
-
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(Continue const& _continueStatement)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _continueStatement);
-	solAssert(!m_continueTags.empty(), "");
-	CompilerUtils(m_context).popAndJump(m_continueTags.back().second, m_continueTags.back().first);
-	return false;
-}
-
-bool ContractCompiler::visit(Break const& _breakStatement)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _breakStatement);
-	solAssert(!m_breakTags.empty(), "");
-	CompilerUtils(m_context).popAndJump(m_breakTags.back().second, m_breakTags.back().first);
-	return false;
-}
-
-bool ContractCompiler::visit(Return const& _return)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _return);
-	if (Expression const* expression = _return.expression())
-	{
-		solAssert(_return.annotation().functionReturnParameters, "Invalid return parameters pointer.");
-		std::vector<ASTPointer<VariableDeclaration>> const& returnParameters =
-			_return.annotation().functionReturnParameters->parameters();
-		TypePointers types;
-		for (auto const& retVariable: returnParameters)
-			types.push_back(retVariable->annotation().type);
-
-		Type const* expectedType;
-		if (expression->annotation().type->category() == Type::Category::Tuple || types.size() != 1)
-			expectedType = TypeProvider::tuple(std::move(types));
-		else
-			expectedType = types.front();
-		compileExpression(*expression, expectedType);
-
-		for (auto const& retVariable: returnParameters | ranges::views::reverse)
-			CompilerUtils(m_context).moveToStackVariable(*retVariable);
-	}
-
-	CompilerUtils(m_context).popAndJump(m_returnTags.back().second, m_returnTags.back().first);
-	return false;
-}
-
-bool ContractCompiler::visit(Throw const&)
-{
-	solAssert(false, "Throw statement is disallowed.");
-	return false;
-}
-
-bool ContractCompiler::visit(EmitStatement const& _emit)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _emit);
-	StackHeightChecker checker(m_context);
-	compileExpression(_emit.eventCall());
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(RevertStatement const& _revert)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _revert);
-	StackHeightChecker checker(m_context);
-	compileExpression(_revert.errorCall());
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(VariableDeclarationStatement const& _variableDeclarationStatement)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _variableDeclarationStatement);
-
-	// Local variable slots are reserved when their declaration is visited,
-	// and freed in the end of their scope.
-	for (auto decl: _variableDeclarationStatement.declarations())
-		if (decl)
-			appendStackVariableInitialisation(*decl, !_variableDeclarationStatement.initialValue());
-
-	StackHeightChecker checker(m_context);
-	if (Expression const* expression = _variableDeclarationStatement.initialValue())
-	{
-		CompilerUtils utils(m_context);
-		compileExpression(*expression);
-		TypePointers valueTypes;
-		if (auto tupleType = dynamic_cast<TupleType const*>(expression->annotation().type))
-			valueTypes = tupleType->components();
-		else
-			valueTypes = TypePointers{expression->annotation().type};
-		auto const& declarations = _variableDeclarationStatement.declarations();
-		solAssert(declarations.size() == valueTypes.size(), "");
-		for (size_t i = 0; i < declarations.size(); ++i)
-		{
-			size_t j = declarations.size() - i - 1;
-			solAssert(!!valueTypes[j], "");
-			if (VariableDeclaration const* varDecl = declarations[j].get())
-			{
-				utils.convertType(*valueTypes[j], *varDecl->annotation().type);
-				utils.moveToStackVariable(*varDecl);
-			}
-			else
-				utils.popStackElement(*valueTypes[j]);
-		}
-	}
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(ExpressionStatement const& _expressionStatement)
-{
-	StackHeightChecker checker(m_context);
-	CompilerContext::LocationSetter locationSetter(m_context, _expressionStatement);
-	Expression const& expression = _expressionStatement.expression();
-	compileExpression(expression);
-	CompilerUtils(m_context).popStackElement(*expression.annotation().type);
-	checker.check();
-	return false;
-}
-
-bool ContractCompiler::visit(PlaceholderStatement const& _placeholderStatement)
-{
-	StackHeightChecker checker(m_context);
-	CompilerContext::LocationSetter locationSetter(m_context, _placeholderStatement);
-	solAssert(m_context.arithmetic() == Arithmetic::Checked, "Placeholder cannot be used inside checked block.");
-	appendModifierOrFunctionCode();
-	solAssert(m_context.arithmetic() == Arithmetic::Checked, "Arithmetic not reset to 'checked'.");
-	checker.check();
-	return true;
-}
-
-bool ContractCompiler::visit(Block const& _block)
-{
-	m_context.pushVisitedNodes(&_block);
-	if (_block.unchecked())
-	{
-		solAssert(m_context.arithmetic() == Arithmetic::Checked, "");
-		m_context.setArithmetic(Arithmetic::Wrapping);
-	}
-	storeStackHeight(&_block);
-	return true;
-}
-
-void ContractCompiler::endVisit(Block const& _block)
-{
-	if (_block.unchecked())
-	{
-		solAssert(m_context.arithmetic() == Arithmetic::Wrapping, "");
-		m_context.setArithmetic(Arithmetic::Checked);
-	}
-	// Frees local variables declared in the scope of this block.
-	popScopedVariables(&_block);
-	m_context.popVisitedNodes();
-}
-
-void ContractCompiler::appendMissingFunctions()
-{
-	while (Declaration const* function = m_context.nextFunctionToCompile())
-	{
-		m_context.setStackOffset(0);
-		function->accept(*this);
-		solAssert(m_context.nextFunctionToCompile() != function, "Compiled the wrong function?");
-	}
-	m_context.appendMissingLowLevelFunctions();
-	m_context.appendYulUtilityFunctions(m_optimiserSettings);
-}
-
-void ContractCompiler::appendModifierOrFunctionCode()
-{
-	solAssert(m_currentFunction, "");
-	unsigned stackSurplus = 0;
-	Block const* codeBlock = nullptr;
-	std::vector<VariableDeclaration const*> addedVariables;
-
-	m_modifierDepth++;
-	m_context.setModifierDepth(m_modifierDepth);
-
-	if (m_modifierDepth >= m_currentFunction->modifiers().size())
-	{
-		solAssert(m_currentFunction->isImplemented(), "");
-		codeBlock = &m_currentFunction->body();
-	}
-	else
-	{
-		ASTPointer<ModifierInvocation> const& modifierInvocation = m_currentFunction->modifiers()[m_modifierDepth];
-
-		// constructor call should be excluded
-		if (dynamic_cast<ContractDefinition const*>(modifierInvocation->name().annotation().referencedDeclaration))
-			appendModifierOrFunctionCode();
-		else
-		{
-			ModifierDefinition const& referencedModifier = dynamic_cast<ModifierDefinition const&>(
-				*modifierInvocation->name().annotation().referencedDeclaration
-			);
-			VirtualLookup lookup = *modifierInvocation->name().annotation().requiredLookup;
-			solAssert(lookup == VirtualLookup::Virtual || lookup == VirtualLookup::Static, "");
-			ModifierDefinition const& modifier =
-				lookup == VirtualLookup::Virtual ?
-				referencedModifier.resolveVirtual(m_context.mostDerivedContract()) :
-				referencedModifier;
-
-			CompilerContext::LocationSetter locationSetter(m_context, modifier);
-			std::vector<ASTPointer<Expression>> const& modifierArguments =
-				modifierInvocation->arguments() ? *modifierInvocation->arguments() : std::vector<ASTPointer<Expression>>();
-
-			solAssert(modifier.parameters().size() == modifierArguments.size(), "");
-			for (unsigned i = 0; i < modifier.parameters().size(); ++i)
-			{
-				m_context.addVariable(*modifier.parameters()[i]);
-				addedVariables.push_back(modifier.parameters()[i].get());
-				compileExpression(
-					*modifierArguments[i],
-					modifier.parameters()[i]->annotation().type
-				);
-			}
-
-			stackSurplus = CompilerUtils::sizeOnStack(modifier.parameters());
-			codeBlock = &modifier.body();
-		}
-	}
-
-	if (codeBlock)
-	{
-		m_context.setArithmetic(Arithmetic::Checked);
-
-		bool coderV2Outside = m_context.useABICoderV2();
-		m_context.setUseABICoderV2(*codeBlock->sourceUnit().annotation().useABICoderV2);
-
-		m_returnTags.emplace_back(m_context.newTag(), m_context.stackHeight());
-		codeBlock->accept(*this);
-
-		m_context.setUseABICoderV2(coderV2Outside);
-
-		solAssert(!m_returnTags.empty(), "");
-		m_context << m_returnTags.back().first;
-		m_returnTags.pop_back();
-
-		CompilerUtils(m_context).popStackSlots(stackSurplus);
-		for (auto var: addedVariables)
-			m_context.removeVariable(*var);
-	}
-	m_modifierDepth--;
-	m_context.setModifierDepth(m_modifierDepth);
-}
-
-void ContractCompiler::appendStackVariableInitialisation(
-	VariableDeclaration const& _variable,
-	bool _provideDefaultValue
-)
-{
-	CompilerContext::LocationSetter location(m_context, _variable);
-	m_context.addVariable(_variable);
-	if (!_provideDefaultValue && _variable.type()->dataStoredIn(DataLocation::Memory))
-	{
-		solAssert(_variable.type()->sizeOnStack() == 1, "");
-		m_context << u256(0);
-	}
-	else
-		CompilerUtils(m_context).pushZeroValue(*_variable.annotation().type);
-}
-
-void ContractCompiler::compileExpression(Expression const& _expression, Type const* _targetType)
-{
-	ExpressionCompiler expressionCompiler(m_context, m_optimiserSettings.runOrderLiterals);
-	expressionCompiler.compile(_expression);
-	if (_targetType)
-		CompilerUtils(m_context).convertType(*_expression.annotation().type, *_targetType);
-}
-
-void ContractCompiler::popScopedVariables(ASTNode const* _node)
-{
-	unsigned blockHeight = m_scopeStackHeight.at(m_modifierDepth).at(_node);
-	m_context.removeVariablesAboveStackHeight(blockHeight);
-	solAssert(m_context.stackHeight() >= blockHeight, "");
-	unsigned stackDiff = m_context.stackHeight() - blockHeight;
-	CompilerUtils(m_context).popStackSlots(stackDiff);
-	m_scopeStackHeight[m_modifierDepth].erase(_node);
-	if (m_scopeStackHeight[m_modifierDepth].empty())
-		m_scopeStackHeight.erase(m_modifierDepth);
-}
-
-void ContractCompiler::storeStackHeight(ASTNode const* _node)
-{
-	m_scopeStackHeight[m_modifierDepth][_node] = m_context.stackHeight();
-}
diff --git a/libsolidity/codegen/ContractCompiler.h b/libsolidity/codegen/ContractCompiler.h
deleted file mode 100644
index 592b6703997b..000000000000
--- a/libsolidity/codegen/ContractCompiler.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Code generator for contracts.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <libevmasm/Assembly.h>
-#include <functional>
-#include <ostream>
-#include <map>
-
-namespace solidity::frontend
-{
-
-/**
- * Code generator at the contract level. Can be used to generate code for exactly one contract
- * either in "runtime mode" or "creation mode".
- */
-class ContractCompiler: private ASTConstVisitor
-{
-public:
-	explicit ContractCompiler(
-		ContractCompiler* _runtimeCompiler,
-		CompilerContext& _context,
-		OptimiserSettings _optimiserSettings
-	):
-		m_optimiserSettings(std::move(_optimiserSettings)),
-		m_runtimeCompiler(_runtimeCompiler),
-		m_context(_context)
-	{
-	}
-
-	void compileContract(
-		ContractDefinition const& _contract,
-		std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
-	);
-	/// Compiles the constructor part of the contract.
-	/// @returns the identifier of the runtime sub-assembly.
-	size_t compileConstructor(
-		ContractDefinition const& _contract,
-		std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
-	);
-
-private:
-	/// Registers the non-function objects inside the contract with the context and stores the basic
-	/// information about the contract like the AST annotations.
-	void initializeContext(
-		ContractDefinition const& _contract,
-		std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
-	);
-	/// Adds the code that is run at creation time. Should be run after exchanging the run-time context
-	/// with a new and initialized context. Adds the constructor code.
-	/// @returns the identifier of the runtime sub assembly
-	size_t packIntoContractCreator(ContractDefinition const& _contract);
-	/// Appends code that deploys the given contract as a library.
-	/// Will also add code that modifies the contract in memory by injecting the current address
-	/// for the call protector.
-	size_t deployLibrary(ContractDefinition const& _contract);
-	/// Appends state variable initialisation and constructor code.
-	void appendInitAndConstructorCode(ContractDefinition const& _contract);
-	void appendBaseConstructor(FunctionDefinition const& _constructor);
-	void appendConstructor(FunctionDefinition const& _constructor);
-	/// Appends code that returns a boolean flag on the stack that tells whether
-	/// the contract has been called via delegatecall (false) or regular call (true).
-	/// This is done by inserting a specific push constant as the first instruction
-	/// whose data will be modified in memory at deploy time.
-	void appendDelegatecallCheck();
-	/// Appends the function selector. Is called recursively to create a binary search tree.
-	/// @a _runs the number of intended executions of the contract to tune the split point.
-	void appendInternalSelector(
-		std::map<util::FixedHash<4>, evmasm::AssemblyItem const> const& _entryPoints,
-		std::vector<util::FixedHash<4>> const& _ids,
-		evmasm::AssemblyItem const& _notFoundTag,
-		size_t _runs
-	);
-	void appendFunctionSelector(ContractDefinition const& _contract);
-	void appendCallValueCheck();
-	void appendReturnValuePacker(TypePointers const& _typeParameters, bool _isLibrary);
-
-	void registerStateVariables(ContractDefinition const& _contract);
-	void registerImmutableVariables(ContractDefinition const& _contract);
-	void initializeStateVariables(ContractDefinition const& _contract);
-
-	bool visit(VariableDeclaration const& _variableDeclaration) override;
-	bool visit(FunctionDefinition const& _function) override;
-	bool visit(InlineAssembly const& _inlineAssembly) override;
-	bool visit(TryStatement const& _tryStatement) override;
-	void handleCatch(std::vector<ASTPointer<TryCatchClause>> const& _catchClauses);
-	bool visit(TryCatchClause const& _clause) override;
-	bool visit(IfStatement const& _ifStatement) override;
-	bool visit(WhileStatement const& _whileStatement) override;
-	bool visit(ForStatement const& _forStatement) override;
-	bool visit(Continue const& _continueStatement) override;
-	bool visit(Break const& _breakStatement) override;
-	bool visit(Return const& _return) override;
-	bool visit(Throw const& _throw) override;
-	bool visit(EmitStatement const& _emit) override;
-	bool visit(RevertStatement const& _revert) override;
-	bool visit(VariableDeclarationStatement const& _variableDeclarationStatement) override;
-	bool visit(ExpressionStatement const& _expressionStatement) override;
-	bool visit(PlaceholderStatement const&) override;
-	bool visit(Block const& _block) override;
-	void endVisit(Block const& _block) override;
-
-	/// Repeatedly visits all function which are referenced but which are not compiled yet.
-	void appendMissingFunctions();
-
-	/// Appends one layer of function modifier code of the current function, or the function
-	/// body itself if the last modifier was reached.
-	void appendModifierOrFunctionCode();
-
-	/// Creates a stack slot for the given variable and assigns a default value.
-	/// If the default value is complex (needs memory allocation) and @a _provideDefaultValue
-	/// is false, this might be skipped.
-	void appendStackVariableInitialisation(VariableDeclaration const& _variable, bool _provideDefaultValue);
-	void compileExpression(Expression const& _expression, Type const* _targetType = nullptr);
-
-	/// Frees the variables of a certain scope (to be used when leaving).
-	void popScopedVariables(ASTNode const* _node);
-
-	/// Sets the stack height for the visited loop.
-	void storeStackHeight(ASTNode const* _node);
-
-	OptimiserSettings const m_optimiserSettings;
-	/// Pointer to the runtime compiler in case this is a creation compiler.
-	ContractCompiler* m_runtimeCompiler = nullptr;
-	CompilerContext& m_context;
-
-	/// Tag to jump to for a "break" statement and the stack height after freeing the local loop variables.
-	std::vector<std::pair<evmasm::AssemblyItem, unsigned>> m_breakTags;
-	/// Tag to jump to for a "continue" statement and the stack height after freeing the local loop variables.
-	std::vector<std::pair<evmasm::AssemblyItem, unsigned>> m_continueTags;
-	/// Tag to jump to for a "return" statement and the stack height after freeing the local function or modifier variables.
-	/// Needs to be stacked because of modifiers.
-	std::vector<std::pair<evmasm::AssemblyItem, unsigned>> m_returnTags;
-	unsigned m_modifierDepth = 0;
-	FunctionDefinition const* m_currentFunction = nullptr;
-
-	// arguments for base constructors, filled in derived-to-base order
-	std::map<FunctionDefinition const*, ASTNode const*> const* m_baseArguments;
-
-	/// Stores the variables that were declared inside a specific scope, for each modifier depth.
-	std::map<unsigned, std::map<ASTNode const*, unsigned>> m_scopeStackHeight;
-};
-
-}
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
deleted file mode 100644
index 517f49c35331..000000000000
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ /dev/null
@@ -1,2978 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity AST to EVM bytecode compiler for expressions.
- */
-
-#include <libsolidity/codegen/ExpressionCompiler.h>
-
-#include <libsolidity/codegen/ReturnInfo.h>
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/codegen/LValue.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTUtils.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libevmasm/GasMeter.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StackTooDeepString.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <numeric>
-#include <utility>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::util;
-
-namespace
-{
-
-Type const* closestType(Type const* _type, Type const* _targetType, bool _isShiftOp)
-{
-	if (_isShiftOp)
-		return _type->mobileType();
-	else if (auto const* tupleType = dynamic_cast<TupleType const*>(_type))
-	{
-		solAssert(_targetType, "");
-		TypePointers const& targetComponents = dynamic_cast<TupleType const&>(*_targetType).components();
-		solAssert(tupleType->components().size() == targetComponents.size(), "");
-		TypePointers tempComponents(targetComponents.size());
-		for (size_t i = 0; i < targetComponents.size(); ++i)
-		{
-			if (tupleType->components()[i] && targetComponents[i])
-			{
-				tempComponents[i] = closestType(tupleType->components()[i], targetComponents[i], _isShiftOp);
-				solAssert(tempComponents[i], "");
-			}
-		}
-		return TypeProvider::tuple(std::move(tempComponents));
-	}
-	else
-		return _targetType->dataStoredIn(DataLocation::Storage) ? _type->mobileType() : _targetType;
-}
-
-}
-
-void ExpressionCompiler::compile(Expression const& _expression)
-{
-	_expression.accept(*this);
-}
-
-void ExpressionCompiler::appendStateVariableInitialization(VariableDeclaration const& _varDecl)
-{
-	if (!_varDecl.value())
-		return;
-	Type const* type = _varDecl.value()->annotation().type;
-	solAssert(!!type, "Type information not available.");
-	CompilerContext::LocationSetter locationSetter(m_context, _varDecl);
-	_varDecl.value()->accept(*this);
-
-	if (_varDecl.annotation().type->dataStoredIn(DataLocation::Storage))
-	{
-		// reference type, only convert value to mobile type and do final conversion in storeValue.
-		auto mt = type->mobileType();
-		solAssert(mt, "");
-		utils().convertType(*type, *mt);
-		type = mt;
-	}
-	else
-	{
-		utils().convertType(*type, *_varDecl.annotation().type);
-		type = _varDecl.annotation().type;
-	}
-	if (_varDecl.immutable())
-		ImmutableItem(m_context, _varDecl).storeValue(*type, _varDecl.location(), true);
-	else
-		StorageItem(m_context, _varDecl).storeValue(*type, _varDecl.location(), true);
-}
-
-void ExpressionCompiler::appendConstStateVariableAccessor(VariableDeclaration const& _varDecl)
-{
-	solAssert(_varDecl.isConstant(), "");
-	acceptAndConvert(*_varDecl.value(), *_varDecl.annotation().type);
-
-	// append return
-	m_context << dupInstruction(_varDecl.annotation().type->sizeOnStack() + 1);
-	m_context.appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction);
-}
-
-void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const& _varDecl)
-{
-	solAssert(!_varDecl.isConstant(), "");
-	CompilerContext::LocationSetter locationSetter(m_context, _varDecl);
-	FunctionType accessorType(_varDecl);
-
-	TypePointers paramTypes = accessorType.parameterTypes();
-	if (_varDecl.immutable())
-		solAssert(paramTypes.empty(), "");
-
-	m_context.adjustStackOffset(static_cast<int>(1 + CompilerUtils::sizeOnStack(paramTypes)));
-
-	if (!_varDecl.immutable())
-	{
-		// retrieve the position of the variable
-		auto const& location = m_context.storageLocationOfVariable(_varDecl);
-		m_context << location.first << u256(location.second);
-	}
-
-	Type const* returnType = _varDecl.annotation().type;
-
-	for (size_t i = 0; i < paramTypes.size(); ++i)
-	{
-		if (auto mappingType = dynamic_cast<MappingType const*>(returnType))
-		{
-			solAssert(CompilerUtils::freeMemoryPointer >= 0x40, "");
-
-			// pop offset
-			m_context << Instruction::POP;
-			if (paramTypes[i]->isDynamicallySized())
-			{
-				solAssert(
-					dynamic_cast<ArrayType const&>(*paramTypes[i]).isByteArrayOrString(),
-					"Expected string or byte array for mapping key type"
-				);
-
-				// stack: <keys..> <slot position>
-
-				// copy key[i] to top.
-				utils().copyToStackTop(static_cast<unsigned>(paramTypes.size() - i + 1), 1);
-
-				m_context.appendInlineAssembly(R"({
-					let key_len := mload(key_ptr)
-					// Temp. use the memory after the array data for the slot
-					// position
-					let post_data_ptr := add(key_ptr, add(key_len, 0x20))
-					let orig_data := mload(post_data_ptr)
-					mstore(post_data_ptr, slot_pos)
-					let hash := keccak256(add(key_ptr, 0x20), add(key_len, 0x20))
-					mstore(post_data_ptr, orig_data)
-					slot_pos := hash
-				})", {"slot_pos", "key_ptr"});
-
-				m_context << Instruction::POP;
-			}
-			else
-			{
-				solAssert(paramTypes[i]->isValueType(), "Expected value type for mapping key");
-
-				// move storage offset to memory.
-				utils().storeInMemory(32);
-
-				// move key to memory.
-				utils().copyToStackTop(static_cast<unsigned>(paramTypes.size() - i), 1);
-				utils().storeInMemory(0);
-				m_context << u256(64) << u256(0);
-				m_context << Instruction::KECCAK256;
-			}
-
-			// push offset
-			m_context << u256(0);
-			returnType = mappingType->valueType();
-		}
-		else if (auto arrayType = dynamic_cast<ArrayType const*>(returnType))
-		{
-			// pop offset
-			m_context << Instruction::POP;
-			utils().copyToStackTop(static_cast<unsigned>(paramTypes.size() - i + 1), 1);
-
-			ArrayUtils(m_context).retrieveLength(*arrayType, 1);
-			// Stack: ref [length] index length
-			// check out-of-bounds access
-			m_context << Instruction::DUP2 << Instruction::LT;
-			auto tag = m_context.appendConditionalJump();
-			m_context << u256(0) << Instruction::DUP1 << Instruction::REVERT;
-			m_context << tag;
-
-			ArrayUtils(m_context).accessIndex(*arrayType, false);
-			returnType = arrayType->baseType();
-		}
-		else
-			solAssert(false, "Index access is allowed only for \"mapping\" and \"array\" types.");
-	}
-	// remove index arguments.
-	if (paramTypes.size() == 1)
-		m_context << Instruction::SWAP2 << Instruction::POP << Instruction::SWAP1;
-	else if (paramTypes.size() >= 2)
-	{
-		m_context << swapInstruction(static_cast<unsigned>(paramTypes.size()));
-		m_context << Instruction::POP;
-		m_context << swapInstruction(static_cast<unsigned>(paramTypes.size()));
-		utils().popStackSlots(paramTypes.size() - 1);
-	}
-	unsigned retSizeOnStack = 0;
-	auto returnTypes = accessorType.returnParameterTypes();
-	solAssert(returnTypes.size() >= 1, "");
-	if (StructType const* structType = dynamic_cast<StructType const*>(returnType))
-	{
-		solAssert(!_varDecl.immutable(), "");
-		// remove offset
-		m_context << Instruction::POP;
-		auto const& names = accessorType.returnParameterNames();
-		// struct
-		for (size_t i = 0; i < names.size(); ++i)
-		{
-			if (returnTypes[i]->category() == Type::Category::Mapping)
-				continue;
-			if (auto arrayType = dynamic_cast<ArrayType const*>(returnTypes[i]))
-				if (!arrayType->isByteArrayOrString())
-					continue;
-			std::pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
-			m_context << Instruction::DUP1 << u256(offsets.first) << Instruction::ADD << u256(offsets.second);
-			Type const* memberType = structType->memberType(names[i]);
-			StorageItem(m_context, *memberType).retrieveValue(SourceLocation(), true);
-			utils().convertType(*memberType, *returnTypes[i]);
-			utils().moveToStackTop(returnTypes[i]->sizeOnStack());
-			retSizeOnStack += returnTypes[i]->sizeOnStack();
-		}
-		// remove slot
-		m_context << Instruction::POP;
-	}
-	else
-	{
-		// simple value or array
-		solAssert(returnTypes.size() == 1, "");
-		if (_varDecl.immutable())
-			ImmutableItem(m_context, _varDecl).retrieveValue(SourceLocation());
-		else
-			StorageItem(m_context, *returnType).retrieveValue(SourceLocation(), true);
-		utils().convertType(*returnType, *returnTypes.front());
-		retSizeOnStack = returnTypes.front()->sizeOnStack();
-	}
-	solAssert(retSizeOnStack == utils().sizeOnStack(returnTypes), "");
-	if (retSizeOnStack > 15)
-		BOOST_THROW_EXCEPTION(
-			StackTooDeepError() <<
-			errinfo_sourceLocation(_varDecl.location()) <<
-			util::errinfo_comment(util::stackTooDeepString)
-		);
-	m_context << dupInstruction(retSizeOnStack + 1);
-	m_context.appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction);
-}
-
-bool ExpressionCompiler::visit(Conditional const& _condition)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _condition);
-	_condition.condition().accept(*this);
-	evmasm::AssemblyItem trueTag = m_context.appendConditionalJump();
-	acceptAndConvert(_condition.falseExpression(), *_condition.annotation().type);
-	evmasm::AssemblyItem endTag = m_context.appendJumpToNew();
-	m_context << trueTag;
-	int offset = static_cast<int>(_condition.annotation().type->sizeOnStack());
-	m_context.adjustStackOffset(-offset);
-	acceptAndConvert(_condition.trueExpression(), *_condition.annotation().type);
-	m_context << endTag;
-	return false;
-}
-
-bool ExpressionCompiler::visit(Assignment const& _assignment)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _assignment);
-	Token op = _assignment.assignmentOperator();
-	Token binOp = op == Token::Assign ? op : TokenTraits::AssignmentToBinaryOp(op);
-	Type const& leftType = *_assignment.leftHandSide().annotation().type;
-	if (leftType.category() == Type::Category::Tuple)
-	{
-		solAssert(*_assignment.annotation().type == TupleType(), "");
-		solAssert(op == Token::Assign, "");
-	}
-	else
-		solAssert(*_assignment.annotation().type == leftType, "");
-	bool cleanupNeeded = false;
-	if (op != Token::Assign)
-		cleanupNeeded = cleanupNeededForOp(leftType.category(), binOp, m_context.arithmetic());
-	_assignment.rightHandSide().accept(*this);
-	// Perform some conversion already. This will convert storage types to memory and literals
-	// to their actual type, but will not convert e.g. memory to storage.
-	Type const* rightIntermediateType = closestType(
-		_assignment.rightHandSide().annotation().type,
-		_assignment.leftHandSide().annotation().type,
-		op != Token::Assign && TokenTraits::isShiftOp(binOp)
-	);
-
-	solAssert(rightIntermediateType, "");
-	utils().convertType(*_assignment.rightHandSide().annotation().type, *rightIntermediateType, cleanupNeeded);
-
-	_assignment.leftHandSide().accept(*this);
-	solAssert(!!m_currentLValue, "LValue not retrieved.");
-
-	if (op == Token::Assign)
-		m_currentLValue->storeValue(*rightIntermediateType, _assignment.location());
-	else  // compound assignment
-	{
-		solAssert(binOp != Token::Exp, "Compound exp is not possible.");
-		solAssert(leftType.isValueType(), "Compound operators only available for value types.");
-		unsigned lvalueSize = m_currentLValue->sizeOnStack();
-		unsigned itemSize = _assignment.annotation().type->sizeOnStack();
-		if (lvalueSize > 0)
-		{
-			utils().copyToStackTop(lvalueSize + itemSize, itemSize);
-			utils().copyToStackTop(itemSize + lvalueSize, lvalueSize);
-			// value lvalue_ref value lvalue_ref
-		}
-		m_currentLValue->retrieveValue(_assignment.location(), true);
-		utils().convertType(leftType, leftType, cleanupNeeded);
-
-		if (TokenTraits::isShiftOp(binOp))
-			appendShiftOperatorCode(binOp, leftType, *rightIntermediateType);
-		else
-		{
-			solAssert(leftType == *rightIntermediateType, "");
-			appendOrdinaryBinaryOperatorCode(binOp, leftType);
-		}
-		if (lvalueSize > 0)
-		{
-			if (itemSize + lvalueSize > 16)
-				BOOST_THROW_EXCEPTION(
-					StackTooDeepError() <<
-					errinfo_sourceLocation(_assignment.location()) <<
-					util::errinfo_comment(util::stackTooDeepString)
-				);
-			// value [lvalue_ref] updated_value
-			for (unsigned i = 0; i < itemSize; ++i)
-				m_context << swapInstruction(itemSize + lvalueSize) << Instruction::POP;
-		}
-		m_currentLValue->storeValue(*_assignment.annotation().type, _assignment.location());
-	}
-	m_currentLValue.reset();
-	return false;
-}
-
-bool ExpressionCompiler::visit(TupleExpression const& _tuple)
-{
-	if (_tuple.isInlineArray())
-	{
-		ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*_tuple.annotation().type);
-
-		solAssert(!arrayType.isDynamicallySized(), "Cannot create dynamically sized inline array.");
-		utils().allocateMemory(std::max(u256(32u), arrayType.memoryDataSize()));
-		m_context << Instruction::DUP1;
-
-		for (auto const& component: _tuple.components())
-		{
-			acceptAndConvert(*component, *arrayType.baseType(), true);
-			utils().storeInMemoryDynamic(*arrayType.baseType(), true);
-		}
-
-		m_context << Instruction::POP;
-	}
-	else
-	{
-		std::vector<std::unique_ptr<LValue>> lvalues;
-		for (auto const& component: _tuple.components())
-			if (component)
-			{
-				component->accept(*this);
-				if (_tuple.annotation().willBeWrittenTo)
-				{
-					solAssert(!!m_currentLValue, "");
-					lvalues.push_back(std::move(m_currentLValue));
-				}
-			}
-			else if (_tuple.annotation().willBeWrittenTo)
-				lvalues.push_back(std::unique_ptr<LValue>());
-		if (_tuple.annotation().willBeWrittenTo)
-		{
-			if (_tuple.components().size() == 1)
-				m_currentLValue = std::move(lvalues[0]);
-			else
-				m_currentLValue = std::make_unique<TupleObject>(m_context, std::move(lvalues));
-		}
-	}
-	return false;
-}
-
-bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _unaryOperation);
-
-	FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction;
-	if (function)
-	{
-		solAssert(function->isFree());
-
-		FunctionType const* functionType = _unaryOperation.userDefinedFunctionType();
-		solAssert(functionType);
-		solAssert(functionType->parameterTypes().size() == 1);
-		solAssert(functionType->returnParameterTypes().size() == 1);
-		solAssert(functionType->kind() == FunctionType::Kind::Internal);
-
-		evmasm::AssemblyItem returnLabel = m_context.pushNewTag();
-		acceptAndConvert(
-			_unaryOperation.subExpression(),
-			*functionType->parameterTypes()[0],
-			false // _cleanupNeeded
-		);
-
-		m_context << m_context.functionEntryLabel(*function).pushTag();
-		m_context.appendJump(evmasm::AssemblyItem::JumpType::IntoFunction);
-		m_context << returnLabel;
-
-		unsigned parameterSize = CompilerUtils::sizeOnStack(functionType->parameterTypes());
-		unsigned returnParametersSize = CompilerUtils::sizeOnStack(functionType->returnParameterTypes());
-
-		// callee adds return parameters, but removes arguments and return label
-		m_context.adjustStackOffset(static_cast<int>(returnParametersSize - parameterSize) - 1);
-
-		return false;
-	}
-
-	Type const& type = *_unaryOperation.annotation().type;
-	if (type.category() == Type::Category::RationalNumber)
-	{
-		m_context << type.literalValue(nullptr);
-		return false;
-	}
-
-	_unaryOperation.subExpression().accept(*this);
-
-	switch (_unaryOperation.getOperator())
-	{
-	case Token::Not: // !
-		m_context << Instruction::ISZERO;
-		break;
-	case Token::BitNot: // ~
-		m_context << Instruction::NOT;
-		break;
-	case Token::Delete: // delete
-		solAssert(!!m_currentLValue, "LValue not retrieved.");
-		m_currentLValue->setToZero(_unaryOperation.location());
-		m_currentLValue.reset();
-		break;
-	case Token::Inc: // ++ (pre- or postfix)
-	case Token::Dec: // -- (pre- or postfix)
-		solAssert(!!m_currentLValue, "LValue not retrieved.");
-		solUnimplementedAssert(
-			type.category() != Type::Category::FixedPoint,
-			"Not yet implemented - FixedPointType."
-		);
-		m_currentLValue->retrieveValue(_unaryOperation.location());
-		if (!_unaryOperation.isPrefixOperation())
-		{
-			// store value for later
-			solUnimplementedAssert(type.sizeOnStack() == 1, "Stack size != 1 not implemented.");
-			m_context << Instruction::DUP1;
-			if (m_currentLValue->sizeOnStack() > 0)
-				for (unsigned i = 1 + m_currentLValue->sizeOnStack(); i > 0; --i)
-					m_context << swapInstruction(i);
-		}
-		if (_unaryOperation.getOperator() == Token::Inc)
-		{
-			if (m_context.arithmetic() == Arithmetic::Checked)
-				m_context.callYulFunction(m_context.utilFunctions().incrementCheckedFunction(type), 1, 1);
-			else
-			{
-				m_context << u256(1);
-				m_context << Instruction::ADD;
-			}
-		}
-		else
-		{
-			if (m_context.arithmetic() == Arithmetic::Checked)
-				m_context.callYulFunction(m_context.utilFunctions().decrementCheckedFunction(type), 1, 1);
-			else
-			{
-				m_context << u256(1);
-				m_context << Instruction::SWAP1 << Instruction::SUB;
-			}
-		}
-		// Stack for prefix: [ref...] (*ref)+-1
-		// Stack for postfix: *ref [ref...] (*ref)+-1
-		for (unsigned i = m_currentLValue->sizeOnStack(); i > 0; --i)
-			m_context << swapInstruction(i);
-		m_currentLValue->storeValue(
-			*_unaryOperation.annotation().type, _unaryOperation.location(),
-			!_unaryOperation.isPrefixOperation());
-		m_currentLValue.reset();
-		break;
-	case Token::Add: // +
-		// According to SyntaxChecker...
-		solAssert(false, "Use of unary + is disallowed.");
-	case Token::Sub: // -
-		solUnimplementedAssert(
-			type.category() != Type::Category::FixedPoint,
-			"Not yet implemented - FixedPointType."
-		);
-		if (m_context.arithmetic() == Arithmetic::Checked)
-			m_context.callYulFunction(m_context.utilFunctions().negateNumberCheckedFunction(type), 1, 1);
-		else
-			m_context << u256(0) << Instruction::SUB;
-		break;
-	default:
-		solAssert(false, "Invalid unary operator: " + std::string(TokenTraits::toString(_unaryOperation.getOperator())));
-	}
-	return false;
-}
-
-bool ExpressionCompiler::visit(BinaryOperation const& _binaryOperation)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _binaryOperation);
-	Expression const& leftExpression = _binaryOperation.leftExpression();
-	Expression const& rightExpression = _binaryOperation.rightExpression();
-	FunctionDefinition const* function = *_binaryOperation.annotation().userDefinedFunction;
-	if (function)
-	{
-		solAssert(function->isFree());
-
-		FunctionType const* functionType = _binaryOperation.userDefinedFunctionType();
-		solAssert(functionType);
-		solAssert(functionType->parameterTypes().size() == 2);
-		solAssert(functionType->returnParameterTypes().size() == 1);
-		solAssert(functionType->kind() == FunctionType::Kind::Internal);
-
-		evmasm::AssemblyItem returnLabel = m_context.pushNewTag();
-		acceptAndConvert(
-			leftExpression,
-			*functionType->parameterTypes()[0],
-			false // _cleanupNeeded
-		);
-		acceptAndConvert(
-			rightExpression,
-			*functionType->parameterTypes()[1],
-			false // _cleanupNeeded
-		);
-
-		m_context << m_context.functionEntryLabel(*function).pushTag();
-		m_context.appendJump(evmasm::AssemblyItem::JumpType::IntoFunction);
-		m_context << returnLabel;
-
-		unsigned parameterSize = CompilerUtils::sizeOnStack(functionType->parameterTypes());
-		unsigned returnParametersSize = CompilerUtils::sizeOnStack(functionType->returnParameterTypes());
-
-		// callee adds return parameters, but removes arguments and return label
-		m_context.adjustStackOffset(static_cast<int>(returnParametersSize - parameterSize) - 1);
-		return false;
-	}
-
-	solAssert(!!_binaryOperation.annotation().commonType);
-	Type const* commonType = _binaryOperation.annotation().commonType;
-	Token const c_op = _binaryOperation.getOperator();
-
-	if (c_op == Token::And || c_op == Token::Or) // special case: short-circuiting
-		appendAndOrOperatorCode(_binaryOperation);
-	else if (commonType->category() == Type::Category::RationalNumber)
-		m_context << commonType->literalValue(nullptr);
-	else
-	{
-		bool cleanupNeeded = cleanupNeededForOp(commonType->category(), c_op, m_context.arithmetic());
-
-		Type const* leftTargetType = commonType;
-		Type const* rightTargetType =
-			TokenTraits::isShiftOp(c_op) || c_op == Token::Exp ?
-			rightExpression.annotation().type->mobileType() :
-			commonType;
-		solAssert(rightTargetType, "");
-
-		// for commutative operators, push the literal as late as possible to allow improved optimization
-		auto isLiteral = [](Expression const& _e)
-		{
-			return dynamic_cast<Literal const*>(&_e) || _e.annotation().type->category() == Type::Category::RationalNumber;
-		};
-		bool swap = m_optimiseOrderLiterals && TokenTraits::isCommutativeOp(c_op) && isLiteral(rightExpression) && !isLiteral(leftExpression);
-		if (swap)
-		{
-			acceptAndConvert(leftExpression, *leftTargetType, cleanupNeeded);
-			acceptAndConvert(rightExpression, *rightTargetType, cleanupNeeded);
-		}
-		else
-		{
-			acceptAndConvert(rightExpression, *rightTargetType, cleanupNeeded);
-			acceptAndConvert(leftExpression, *leftTargetType, cleanupNeeded);
-		}
-		if (TokenTraits::isShiftOp(c_op))
-			// shift only cares about the signedness of both sides
-			appendShiftOperatorCode(c_op, *leftTargetType, *rightTargetType);
-		else if (c_op == Token::Exp)
-			appendExpOperatorCode(*leftTargetType, *rightTargetType);
-		else if (TokenTraits::isCompareOp(c_op))
-			appendCompareOperatorCode(c_op, *commonType);
-		else
-			appendOrdinaryBinaryOperatorCode(c_op, *commonType);
-	}
-
-	// do not visit the child nodes, we already did that explicitly
-	return false;
-}
-
-bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
-{
-	auto functionCallKind = *_functionCall.annotation().kind;
-
-	CompilerContext::LocationSetter locationSetter(m_context, _functionCall);
-	if (functionCallKind == FunctionCallKind::TypeConversion)
-	{
-		solAssert(_functionCall.arguments().size() == 1, "");
-		solAssert(_functionCall.names().empty(), "");
-		auto const& expression = *_functionCall.arguments().front();
-		auto const& targetType = *_functionCall.annotation().type;
-		if (auto const* typeType = dynamic_cast<TypeType const*>(expression.annotation().type))
-			if (auto const* addressType = dynamic_cast<AddressType const*>(&targetType))
-			{
-				auto const* contractType = dynamic_cast<ContractType const*>(typeType->actualType());
-				solAssert(
-					contractType &&
-					contractType->contractDefinition().isLibrary() &&
-					addressType->stateMutability() == StateMutability::NonPayable,
-					""
-				);
-				m_context.appendLibraryAddress(contractType->contractDefinition().fullyQualifiedName());
-				return false;
-			}
-		acceptAndConvert(expression, targetType);
-		return false;
-	}
-
-	FunctionTypePointer functionType;
-	if (functionCallKind == FunctionCallKind::StructConstructorCall)
-	{
-		auto const& type = dynamic_cast<TypeType const&>(*_functionCall.expression().annotation().type);
-		auto const& structType = dynamic_cast<StructType const&>(*type.actualType());
-		functionType = structType.constructorType();
-	}
-	else
-		functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type);
-
-	TypePointers parameterTypes = functionType->parameterTypes();
-
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.sortedArguments();
-
-	if (functionCallKind == FunctionCallKind::StructConstructorCall)
-	{
-		TypeType const& type = dynamic_cast<TypeType const&>(*_functionCall.expression().annotation().type);
-		auto const& structType = dynamic_cast<StructType const&>(*type.actualType());
-
-		utils().allocateMemory(std::max(u256(32u), structType.memoryDataSize()));
-		m_context << Instruction::DUP1;
-
-		for (unsigned i = 0; i < arguments.size(); ++i)
-		{
-			acceptAndConvert(*arguments[i], *functionType->parameterTypes()[i]);
-			utils().storeInMemoryDynamic(*functionType->parameterTypes()[i]);
-		}
-		m_context << Instruction::POP;
-	}
-	else
-	{
-		FunctionType const& function = *functionType;
-		if (function.hasBoundFirstArgument())
-			solAssert(
-				function.kind() == FunctionType::Kind::DelegateCall ||
-				function.kind() == FunctionType::Kind::Internal ||
-				function.kind() == FunctionType::Kind::ArrayPush ||
-				function.kind() == FunctionType::Kind::ArrayPop,
-			"");
-		switch (function.kind())
-		{
-		case FunctionType::Kind::Declaration:
-			solAssert(false, "Attempted to generate code for calling a function definition.");
-			break;
-		case FunctionType::Kind::Internal:
-		{
-			// Calling convention: Caller pushes return address and arguments
-			// Callee removes them and pushes return values
-
-			evmasm::AssemblyItem returnLabel = m_context.pushNewTag();
-			for (unsigned i = 0; i < arguments.size(); ++i)
-				acceptAndConvert(*arguments[i], *function.parameterTypes()[i]);
-			_functionCall.expression().accept(*this);
-
-			unsigned parameterSize = CompilerUtils::sizeOnStack(function.parameterTypes());
-			if (function.hasBoundFirstArgument())
-			{
-				// stack: arg2, ..., argn, label, arg1
-				unsigned depth = parameterSize + 1;
-				utils().moveIntoStack(depth, function.selfType()->sizeOnStack());
-				parameterSize += function.selfType()->sizeOnStack();
-			}
-
-			if (m_context.runtimeContext())
-				// We have a runtime context, so we need the creation part.
-				utils().rightShiftNumberOnStack(32);
-			else
-				// Extract the runtime part.
-				m_context << ((u256(1) << 32) - 1) << Instruction::AND;
-
-			m_context.appendJump(evmasm::AssemblyItem::JumpType::IntoFunction);
-			m_context << returnLabel;
-
-			unsigned returnParametersSize = CompilerUtils::sizeOnStack(function.returnParameterTypes());
-			// callee adds return parameters, but removes arguments and return label
-			m_context.adjustStackOffset(static_cast<int>(returnParametersSize - parameterSize) - 1);
-			break;
-		}
-		case FunctionType::Kind::BareCall:
-		case FunctionType::Kind::BareDelegateCall:
-		case FunctionType::Kind::BareStaticCall:
-			solAssert(!_functionCall.annotation().tryCall, "");
-			[[fallthrough]];
-		case FunctionType::Kind::External:
-		case FunctionType::Kind::DelegateCall:
-			_functionCall.expression().accept(*this);
-			appendExternalFunctionCall(function, arguments, _functionCall.annotation().tryCall);
-			break;
-		case FunctionType::Kind::BareCallCode:
-			solAssert(false, "Callcode has been removed.");
-		case FunctionType::Kind::Creation:
-		{
-			_functionCall.expression().accept(*this);
-			// Stack: [salt], [value]
-
-			solAssert(!function.gasSet(), "Gas limit set for contract creation.");
-			solAssert(function.returnParameterTypes().size() == 1, "");
-			TypePointers argumentTypes;
-			for (auto const& arg: arguments)
-			{
-				arg->accept(*this);
-				argumentTypes.push_back(arg->annotation().type);
-			}
-			ContractDefinition const* contract =
-				&dynamic_cast<ContractType const&>(*function.returnParameterTypes().front()).contractDefinition();
-			utils().fetchFreeMemoryPointer();
-			utils().copyContractCodeToMemory(*contract, true);
-			utils().abiEncode(argumentTypes, function.parameterTypes());
-			// now on stack: [salt], [value], memory_end_ptr
-			// need: [salt], size, offset, value
-
-			if (function.saltSet())
-			{
-				m_context << dupInstruction(2 + (function.valueSet() ? 1 : 0));
-				m_context << Instruction::SWAP1;
-			}
-
-			// now: [salt], [value], [salt], memory_end_ptr
-			utils().toSizeAfterFreeMemoryPointer();
-
-			// now: [salt], [value], [salt], size, offset
-			if (function.valueSet())
-				m_context << dupInstruction(3 + (function.saltSet() ? 1 : 0));
-			else
-				m_context << u256(0);
-
-			// now: [salt], [value], [salt], size, offset, value
-			if (function.saltSet())
-				m_context << Instruction::CREATE2;
-			else
-				m_context << Instruction::CREATE;
-
-			// now: [salt], [value], address
-
-			if (function.valueSet())
-				m_context << swapInstruction(1) << Instruction::POP;
-			if (function.saltSet())
-				m_context << swapInstruction(1) << Instruction::POP;
-
-			// Check if zero (reverted)
-			m_context << Instruction::DUP1 << Instruction::ISZERO;
-			if (_functionCall.annotation().tryCall)
-			{
-				// If this is a try call, return "<address> 1" in the success case and
-				// "0" in the error case.
-				AssemblyItem errorCase = m_context.appendConditionalJump();
-				m_context << u256(1);
-				m_context << errorCase;
-			}
-			else
-				m_context.appendConditionalRevert(true);
-			break;
-		}
-		case FunctionType::Kind::SetGas:
-		{
-			// stack layout: contract_address function_id [gas] [value]
-			_functionCall.expression().accept(*this);
-
-			acceptAndConvert(*arguments.front(), *TypeProvider::uint256(), true);
-			// Note that function is not the original function, but the ".gas" function.
-			// Its values of gasSet and valueSet is equal to the original function's though.
-			unsigned stackDepth = (function.gasSet() ? 1u : 0u) + (function.valueSet() ? 1u : 0u);
-			if (stackDepth > 0)
-				m_context << swapInstruction(stackDepth);
-			if (function.gasSet())
-				m_context << Instruction::POP;
-			break;
-		}
-		case FunctionType::Kind::SetValue:
-			// stack layout: contract_address function_id [gas] [value]
-			_functionCall.expression().accept(*this);
-			// Note that function is not the original function, but the ".value" function.
-			// Its values of gasSet and valueSet is equal to the original function's though.
-			if (function.valueSet())
-				m_context << Instruction::POP;
-			arguments.front()->accept(*this);
-			break;
-		case FunctionType::Kind::Send:
-		case FunctionType::Kind::Transfer:
-		{
-			_functionCall.expression().accept(*this);
-			// Provide the gas stipend manually at first because we may send zero ether.
-			// Will be zeroed if we send more than zero ether.
-			m_context << u256(evmasm::GasCosts::callStipend);
-			acceptAndConvert(*arguments.front(), *function.parameterTypes().front(), true);
-			// gas <- gas * !value
-			m_context << Instruction::SWAP1 << Instruction::DUP2;
-			m_context << Instruction::ISZERO << Instruction::MUL << Instruction::SWAP1;
-			FunctionType::Options callOptions;
-			callOptions.valueSet = true;
-			callOptions.gasSet = true;
-			appendExternalFunctionCall(
-				FunctionType(
-					TypePointers{},
-					TypePointers{},
-					strings(),
-					strings(),
-					FunctionType::Kind::BareCall,
-					StateMutability::NonPayable,
-					nullptr,
-					callOptions
-				),
-				{},
-				false
-			);
-			if (function.kind() == FunctionType::Kind::Transfer)
-			{
-				// Check if zero (out of stack or not enough balance).
-				m_context << Instruction::ISZERO;
-				// Revert message bubbles up.
-				m_context.appendConditionalRevert(true);
-			}
-			break;
-		}
-		case FunctionType::Kind::Selfdestruct:
-			acceptAndConvert(*arguments.front(), *function.parameterTypes().front(), true);
-			m_context << Instruction::SELFDESTRUCT;
-			break;
-		case FunctionType::Kind::Revert:
-		{
-			if (arguments.empty())
-				m_context.appendRevert();
-			else
-			{
-				// function-sel(Error(string)) + encoding
-				solAssert(arguments.size() == 1, "");
-				solAssert(function.parameterTypes().size() == 1, "");
-				if (m_context.revertStrings() == RevertStrings::Strip)
-				{
-					if (!*arguments.front()->annotation().isPure)
-					{
-						arguments.front()->accept(*this);
-						utils().popStackElement(*arguments.front()->annotation().type);
-					}
-					m_context.appendRevert();
-				}
-				else
-				{
-					arguments.front()->accept(*this);
-					utils().revertWithStringData(*arguments.front()->annotation().type);
-				}
-			}
-			break;
-		}
-		case FunctionType::Kind::KECCAK256:
-		{
-			solAssert(arguments.size() == 1, "");
-			solAssert(!function.padArguments(), "");
-			Type const* argType = arguments.front()->annotation().type;
-			solAssert(argType, "");
-			arguments.front()->accept(*this);
-			if (auto const* stringLiteral = dynamic_cast<StringLiteralType const*>(argType))
-				// Optimization: Compute keccak256 on string literals at compile-time.
-				m_context << u256(keccak256(stringLiteral->value()));
-			else if (*argType == *TypeProvider::bytesMemory() || *argType == *TypeProvider::stringMemory())
-			{
-				// Optimization: If type is bytes or string, then do not encode,
-				// but directly compute keccak256 on memory.
-				ArrayUtils(m_context).retrieveLength(*TypeProvider::bytesMemory());
-				m_context << Instruction::SWAP1 << u256(0x20) << Instruction::ADD;
-				m_context << Instruction::KECCAK256;
-			}
-			else
-			{
-				utils().fetchFreeMemoryPointer();
-				utils().packedEncode({argType}, TypePointers());
-				utils().toSizeAfterFreeMemoryPointer();
-				m_context << Instruction::KECCAK256;
-			}
-			break;
-		}
-		case FunctionType::Kind::Event:
-		{
-			_functionCall.expression().accept(*this);
-			auto const& event = dynamic_cast<EventDefinition const&>(function.declaration());
-			unsigned numIndexed = 0;
-			TypePointers paramTypes = function.parameterTypes();
-			// All indexed arguments go to the stack
-			for (size_t arg = arguments.size(); arg > 0; --arg)
-				if (event.parameters()[arg - 1]->isIndexed())
-				{
-					++numIndexed;
-					arguments[arg - 1]->accept(*this);
-					if (auto const& referenceType = dynamic_cast<ReferenceType const*>(paramTypes[arg - 1]))
-					{
-						utils().fetchFreeMemoryPointer();
-						utils().packedEncode(
-							{arguments[arg - 1]->annotation().type},
-							{referenceType}
-						);
-						utils().toSizeAfterFreeMemoryPointer();
-						m_context << Instruction::KECCAK256;
-					}
-					else
-					{
-						solAssert(paramTypes[arg - 1]->isValueType(), "");
-						if (auto functionType =	dynamic_cast<FunctionType const*>(paramTypes[arg - 1]))
-						{
-							auto argumentType =
-								dynamic_cast<FunctionType const*>(arguments[arg-1]->annotation().type);
-							solAssert(
-								argumentType &&
-								functionType->kind() == FunctionType::Kind::External &&
-								argumentType->kind() == FunctionType::Kind::External &&
-								!argumentType->hasBoundFirstArgument(),
-								""
-							);
-
-							utils().combineExternalFunctionType(true);
-						}
-						else
-							utils().convertType(
-								*arguments[arg - 1]->annotation().type,
-								*paramTypes[arg - 1],
-								true
-							);
-					}
-				}
-			if (!event.isAnonymous())
-			{
-				m_context << u256(h256::Arith(keccak256(function.externalSignature())));
-				++numIndexed;
-			}
-			solAssert(numIndexed <= 4, "Too many indexed arguments.");
-			// Copy all non-indexed arguments to memory (data)
-			// Memory position is only a hack and should be removed once we have free memory pointer.
-			TypePointers nonIndexedArgTypes;
-			TypePointers nonIndexedParamTypes;
-			for (unsigned arg = 0; arg < arguments.size(); ++arg)
-				if (!event.parameters()[arg]->isIndexed())
-				{
-					arguments[arg]->accept(*this);
-					nonIndexedArgTypes.push_back(arguments[arg]->annotation().type);
-					nonIndexedParamTypes.push_back(paramTypes[arg]);
-				}
-			utils().fetchFreeMemoryPointer();
-			utils().abiEncode(nonIndexedArgTypes, nonIndexedParamTypes);
-			// need: topic1 ... topicn memsize memstart
-			utils().toSizeAfterFreeMemoryPointer();
-			m_context << logInstruction(numIndexed);
-			break;
-		}
-		case FunctionType::Kind::Error:
-		{
-			_functionCall.expression().accept(*this);
-			std::vector<Type const*> argumentTypes;
-			for (ASTPointer<Expression const> const& arg: _functionCall.sortedArguments())
-			{
-				arg->accept(*this);
-				argumentTypes.push_back(arg->annotation().type);
-			}
-			solAssert(dynamic_cast<ErrorDefinition const*>(&function.declaration()), "");
-			utils().revertWithError(
-				function.externalSignature(),
-				function.parameterTypes(),
-				argumentTypes
-			);
-			break;
-		}
-		case FunctionType::Kind::Wrap:
-		case FunctionType::Kind::Unwrap:
-		{
-			solAssert(arguments.size() == 1, "");
-			Type const* argumentType = arguments.at(0)->annotation().type;
-			Type const* functionCallType = _functionCall.annotation().type;
-			solAssert(argumentType, "");
-			solAssert(functionCallType, "");
-			FunctionType::Kind kind = functionType->kind();
-			if (kind == FunctionType::Kind::Wrap)
-			{
-				solAssert(
-					argumentType->isImplicitlyConvertibleTo(
-						dynamic_cast<UserDefinedValueType const&>(*functionCallType).underlyingType()
-					),
-					""
-				);
-				solAssert(argumentType->isImplicitlyConvertibleTo(*function.parameterTypes()[0]), "");
-			}
-			else
-				solAssert(
-					dynamic_cast<UserDefinedValueType const&>(*argumentType) ==
-					dynamic_cast<UserDefinedValueType const&>(*function.parameterTypes()[0]),
-					""
-				);
-
-			acceptAndConvert(*arguments[0], *function.parameterTypes()[0]);
-			break;
-		}
-		case FunctionType::Kind::BlockHash:
-		{
-			acceptAndConvert(*arguments[0], *function.parameterTypes()[0], true);
-			m_context << Instruction::BLOCKHASH;
-			break;
-		}
-		case FunctionType::Kind::AddMod:
-		case FunctionType::Kind::MulMod:
-		{
-			acceptAndConvert(*arguments[2], *TypeProvider::uint256());
-			m_context << Instruction::DUP1 << Instruction::ISZERO;
-			m_context.appendConditionalPanic(util::PanicCode::DivisionByZero);
-			for (unsigned i = 1; i < 3; i ++)
-				acceptAndConvert(*arguments[2 - i], *TypeProvider::uint256());
-			if (function.kind() == FunctionType::Kind::AddMod)
-				m_context << Instruction::ADDMOD;
-			else
-				m_context << Instruction::MULMOD;
-			break;
-		}
-		case FunctionType::Kind::ECRecover:
-		case FunctionType::Kind::SHA256:
-		case FunctionType::Kind::RIPEMD160:
-		{
-			_functionCall.expression().accept(*this);
-			static std::map<FunctionType::Kind, u256> const contractAddresses{
-				{FunctionType::Kind::ECRecover, 1},
-				{FunctionType::Kind::SHA256, 2},
-				{FunctionType::Kind::RIPEMD160, 3}
-			};
-			m_context << contractAddresses.at(function.kind());
-			for (unsigned i = function.sizeOnStack(); i > 0; --i)
-				m_context << swapInstruction(i);
-			solAssert(!_functionCall.annotation().tryCall, "");
-			appendExternalFunctionCall(function, arguments, false);
-			break;
-		}
-		case FunctionType::Kind::ArrayPush:
-		{
-			solAssert(function.hasBoundFirstArgument(), "");
-			_functionCall.expression().accept(*this);
-
-			if (function.parameterTypes().size() == 0)
-			{
-				auto paramType = function.returnParameterTypes().at(0);
-				solAssert(paramType, "");
-
-				ArrayType const* arrayType = dynamic_cast<ArrayType const*>(function.selfType());
-				solAssert(arrayType, "");
-
-				// stack: ArrayReference
-				m_context << u256(1) << Instruction::DUP2;
-				ArrayUtils(m_context).incrementDynamicArraySize(*arrayType);
-				// stack: ArrayReference 1 newLength
-				m_context << Instruction::SUB;
-				// stack: ArrayReference (newLength-1)
-				ArrayUtils(m_context).accessIndex(*arrayType, false);
-
-				if (arrayType->isByteArrayOrString())
-					setLValue<StorageByteArrayElement>(_functionCall);
-				else
-					setLValueToStorageItem(_functionCall);
-			}
-			else
-			{
-				solAssert(function.parameterTypes().size() == 1, "");
-				solAssert(!!function.parameterTypes()[0], "");
-				Type const* paramType = function.parameterTypes()[0];
-				ArrayType const* arrayType = dynamic_cast<ArrayType const*>(function.selfType());
-				solAssert(arrayType, "");
-
-				// stack: ArrayReference
-				arguments[0]->accept(*this);
-				Type const* argType = arguments[0]->annotation().type;
-				// stack: ArrayReference argValue
-				utils().moveToStackTop(argType->sizeOnStack(), 1);
-				// stack: argValue ArrayReference
-				m_context << Instruction::DUP1;
-				ArrayUtils(m_context).incrementDynamicArraySize(*arrayType);
-				// stack: argValue ArrayReference newLength
-				m_context << u256(1) << Instruction::SWAP1 << Instruction::SUB;
-				// stack: argValue ArrayReference (newLength-1)
-				ArrayUtils(m_context).accessIndex(*arrayType, false);
-				// stack: argValue storageSlot slotOffset
-				utils().moveToStackTop(2, argType->sizeOnStack());
-				// stack: storageSlot slotOffset argValue
-				Type const* type =
-					arrayType->baseType()->dataStoredIn(DataLocation::Storage) ?
-					arguments[0]->annotation().type->mobileType() :
-					arrayType->baseType();
-				solAssert(type, "");
-				utils().convertType(*argType, *type);
-				utils().moveToStackTop(1 + type->sizeOnStack());
-				utils().moveToStackTop(1 + type->sizeOnStack());
-				// stack: argValue storageSlot slotOffset
-				if (!arrayType->isByteArrayOrString())
-					StorageItem(m_context, *paramType).storeValue(*type, _functionCall.location(), true);
-				else
-					StorageByteArrayElement(m_context).storeValue(*type, _functionCall.location(), true);
-			}
-			break;
-		}
-		case FunctionType::Kind::ArrayPop:
-		{
-			_functionCall.expression().accept(*this);
-			solAssert(function.hasBoundFirstArgument(), "");
-			solAssert(function.parameterTypes().empty(), "");
-			ArrayType const* arrayType = dynamic_cast<ArrayType const*>(function.selfType());
-			solAssert(arrayType && arrayType->dataStoredIn(DataLocation::Storage), "");
-			ArrayUtils(m_context).popStorageArrayElement(*arrayType);
-			break;
-		}
-		case FunctionType::Kind::StringConcat:
-		case FunctionType::Kind::BytesConcat:
-		{
-			_functionCall.expression().accept(*this);
-			std::vector<Type const*> argumentTypes;
-			std::vector<Type const*> targetTypes;
-			for (auto const& argument: arguments)
-			{
-				argument->accept(*this);
-				solAssert(argument->annotation().type, "");
-				argumentTypes.emplace_back(argument->annotation().type);
-				if (argument->annotation().type->category() == Type::Category::FixedBytes)
-					targetTypes.emplace_back(argument->annotation().type);
-				else if (
-					auto const* literalType = dynamic_cast<StringLiteralType const*>(argument->annotation().type);
-					literalType && !literalType->value().empty() && literalType->value().size() <= 32
-				)
-					targetTypes.emplace_back(TypeProvider::fixedBytes(static_cast<unsigned>(literalType->value().size())));
-				else
-				{
-					solAssert(!dynamic_cast<RationalNumberType const*>(argument->annotation().type), "");
-					if (function.kind() == FunctionType::Kind::StringConcat)
-					{
-						solAssert(argument->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::stringMemory()), "");
-						targetTypes.emplace_back(TypeProvider::stringMemory());
-					}
-					else if (function.kind() == FunctionType::Kind::BytesConcat)
-					{
-						solAssert(argument->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()), "");
-						targetTypes.emplace_back(TypeProvider::bytesMemory());
-					}
-				}
-			}
-			utils().fetchFreeMemoryPointer();
-			// stack: <arg1> <arg2> ... <argn> <free mem>
-			m_context << u256(32) << Instruction::ADD;
-			utils().packedEncode(argumentTypes, targetTypes);
-			utils().fetchFreeMemoryPointer();
-			m_context.appendInlineAssembly(R"({
-				mstore(mem_ptr, sub(sub(mem_end, mem_ptr), 0x20))
-			})", {"mem_end", "mem_ptr"});
-			m_context << Instruction::SWAP1;
-			utils().storeFreeMemoryPointer();
-
-			break;
-		}
-		case FunctionType::Kind::ObjectCreation:
-		{
-			ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*_functionCall.annotation().type);
-			_functionCall.expression().accept(*this);
-			solAssert(arguments.size() == 1, "");
-
-			// Fetch requested length.
-			acceptAndConvert(*arguments[0], *TypeProvider::uint256());
-
-			// Make sure we can allocate memory without overflow
-			m_context << u256(0xffffffffffffffff);
-			m_context << Instruction::DUP2;
-			m_context << Instruction::GT;
-			m_context.appendConditionalPanic(PanicCode::ResourceError);
-
-			// Stack: requested_length
-			utils().fetchFreeMemoryPointer();
-
-			// Stack: requested_length memptr
-			m_context << Instruction::SWAP1;
-			// Stack: memptr requested_length
-			// store length
-			m_context << Instruction::DUP1 << Instruction::DUP3 << Instruction::MSTORE;
-			// Stack: memptr requested_length
-			// update free memory pointer
-			m_context << Instruction::DUP1;
-			// Stack: memptr requested_length requested_length
-			if (arrayType.isByteArrayOrString())
-				// Round up to multiple of 32
-				m_context << u256(31) << Instruction::ADD << u256(31) << Instruction::NOT << Instruction::AND;
-			else
-				m_context << arrayType.baseType()->memoryHeadSize() << Instruction::MUL;
-			// stacK: memptr requested_length data_size
-			m_context << u256(32) << Instruction::ADD;
-			m_context << Instruction::DUP3 << Instruction::ADD;
-			utils().storeFreeMemoryPointer();
-			// Stack: memptr requested_length
-
-			// Check if length is zero
-			m_context << Instruction::DUP1 << Instruction::ISZERO;
-			auto skipInit = m_context.appendConditionalJump();
-			// Always initialize because the free memory pointer might point at
-			// a dirty memory area.
-			m_context << Instruction::DUP2 << u256(32) << Instruction::ADD;
-			utils().zeroInitialiseMemoryArray(arrayType);
-			m_context << skipInit;
-			m_context << Instruction::POP;
-			break;
-		}
-		case FunctionType::Kind::Assert:
-		case FunctionType::Kind::Require:
-		{
-			acceptAndConvert(*arguments.front(), *function.parameterTypes().front(), false);
-
-			bool haveReasonString = arguments.size() > 1 && m_context.revertStrings() != RevertStrings::Strip;
-
-			if (arguments.size() > 1)
-			{
-				// Users probably expect the second argument to be evaluated
-				// even if the condition is false, as would be the case for an actual
-				// function call.
-				solAssert(arguments.size() == 2, "");
-				solAssert(function.kind() == FunctionType::Kind::Require, "");
-				if (m_context.revertStrings() == RevertStrings::Strip)
-				{
-					if (!*arguments.at(1)->annotation().isPure)
-					{
-						arguments.at(1)->accept(*this);
-						utils().popStackElement(*arguments.at(1)->annotation().type);
-					}
-				}
-				else
-				{
-					arguments.at(1)->accept(*this);
-					utils().moveIntoStack(1, arguments.at(1)->annotation().type->sizeOnStack());
-				}
-			}
-			// Stack: <error string (unconverted)> <condition>
-			// jump if condition was met
-			m_context << Instruction::ISZERO << Instruction::ISZERO;
-			auto success = m_context.appendConditionalJump();
-			if (function.kind() == FunctionType::Kind::Assert)
-				// condition was not met, flag an error
-				m_context.appendPanic(util::PanicCode::Assert);
-			else if (haveReasonString)
-			{
-				utils().revertWithStringData(*arguments.at(1)->annotation().type);
-				// Here, the argument is consumed, but in the other branch, it is still there.
-				m_context.adjustStackOffset(static_cast<int>(arguments.at(1)->annotation().type->sizeOnStack()));
-			}
-			else
-				m_context.appendRevert();
-			// the success branch
-			m_context << success;
-			if (haveReasonString)
-				utils().popStackElement(*arguments.at(1)->annotation().type);
-			break;
-		}
-		case FunctionType::Kind::ABIEncode:
-		case FunctionType::Kind::ABIEncodePacked:
-		case FunctionType::Kind::ABIEncodeWithSelector:
-		case FunctionType::Kind::ABIEncodeCall:
-		case FunctionType::Kind::ABIEncodeWithSignature:
-		{
-			bool const isPacked = function.kind() == FunctionType::Kind::ABIEncodePacked;
-			bool const hasSelectorOrSignature =
-				function.kind() == FunctionType::Kind::ABIEncodeWithSelector ||
-				function.kind() == FunctionType::Kind::ABIEncodeCall ||
-				function.kind() == FunctionType::Kind::ABIEncodeWithSignature;
-
-			TypePointers argumentTypes;
-			TypePointers targetTypes;
-
-			ASTNode::listAccept(arguments, *this);
-
-			if (function.kind() == FunctionType::Kind::ABIEncodeCall)
-			{
-				solAssert(arguments.size() == 2);
-
-				// Account for tuples with one component which become that component
-				if (auto const tupleType = dynamic_cast<TupleType const*>(arguments[1]->annotation().type))
-					argumentTypes = tupleType->components();
-				else
-					argumentTypes.emplace_back(arguments[1]->annotation().type);
-
-				auto functionPtr = dynamic_cast<FunctionTypePointer>(arguments[0]->annotation().type);
-				solAssert(functionPtr);
-				functionPtr = functionPtr->asExternallyCallableFunction(false);
-				solAssert(functionPtr);
-				targetTypes = functionPtr->parameterTypes();
-			}
-			else
-				for (unsigned i = 0; i < arguments.size(); ++i)
-				{
-					// Do not keep the selector as part of the ABI encoded args
-					if (!hasSelectorOrSignature || i > 0)
-						argumentTypes.push_back(arguments[i]->annotation().type);
-				}
-
-			utils().fetchFreeMemoryPointer();
-			// stack now: [<selector/functionPointer/signature>] <arg1> .. <argN> <free_mem>
-
-			// adjust by 32(+4) bytes to accommodate the length(+selector)
-			m_context << u256(32 + (hasSelectorOrSignature ? 4 : 0)) << Instruction::ADD;
-			// stack now: [<selector/functionPointer/signature>] <arg1> .. <argN> <data_encoding_area_start>
-
-			if (isPacked)
-			{
-				solAssert(!function.padArguments(), "");
-				utils().packedEncode(argumentTypes, targetTypes);
-			}
-			else
-			{
-				solAssert(function.padArguments(), "");
-				utils().abiEncode(argumentTypes, targetTypes);
-			}
-			utils().fetchFreeMemoryPointer();
-			// stack: [<selector/functionPointer/signature>] <data_encoding_area_end> <bytes_memory_ptr>
-
-			// size is end minus start minus length slot
-			m_context.appendInlineAssembly(R"({
-				mstore(mem_ptr, sub(sub(mem_end, mem_ptr), 0x20))
-			})", {"mem_end", "mem_ptr"});
-			m_context << Instruction::SWAP1;
-			utils().storeFreeMemoryPointer();
-			// stack: [<selector/functionPointer/signature>] <memory ptr>
-
-			if (hasSelectorOrSignature)
-			{
-				// stack: <selector/functionPointer/signature> <memory pointer>
-				solAssert(arguments.size() >= 1, "");
-				Type const* selectorType = arguments[0]->annotation().type;
-				utils().moveIntoStack(selectorType->sizeOnStack());
-				Type const* dataOnStack = selectorType;
-
-				// stack: <memory pointer> <selector/functionPointer/signature>
-				if (function.kind() == FunctionType::Kind::ABIEncodeWithSignature)
-				{
-					// hash the signature
-					if (auto const* stringType = dynamic_cast<StringLiteralType const*>(selectorType))
-					{
-						m_context << util::selectorFromSignatureU256(stringType->value());
-						dataOnStack = TypeProvider::fixedBytes(4);
-					}
-					else
-					{
-						utils().fetchFreeMemoryPointer();
-						// stack: <memory pointer> <signature> <free mem ptr>
-						utils().packedEncode(TypePointers{selectorType}, TypePointers());
-						utils().toSizeAfterFreeMemoryPointer();
-						m_context << Instruction::KECCAK256;
-						// stack: <memory pointer> <hash>
-
-						dataOnStack = TypeProvider::fixedBytes(32);
-					}
-				}
-				else if (function.kind() == FunctionType::Kind::ABIEncodeCall)
-				{
-					auto const& funType = dynamic_cast<FunctionType const&>(*selectorType);
-					if (funType.kind() == FunctionType::Kind::Declaration)
-					{
-						solAssert(funType.hasDeclaration());
-						solAssert(selectorType->sizeOnStack() == 0);
-						m_context << funType.externalIdentifier();
-					}
-					else
-					{
-						solAssert(selectorType->sizeOnStack() == 2);
-						// stack: <memory pointer> <functionPointer>
-						// Extract selector from the stack
-						m_context << Instruction::SWAP1 << Instruction::POP;
-					}
-					// Conversion will be done below
-					dataOnStack = TypeProvider::uint(32);
-				}
-				else
-					solAssert(function.kind() == FunctionType::Kind::ABIEncodeWithSelector, "");
-
-				utils().convertType(*dataOnStack, FixedBytesType(4), true);
-
-				// stack: <memory pointer> <selector>
-
-				// load current memory, mask and combine the selector
-				std::string mask = formatNumber((u256(-1) >> 32));
-				m_context.appendInlineAssembly(R"({
-					let data_start := add(mem_ptr, 0x20)
-					let data := mload(data_start)
-					let mask := )" + mask + R"(
-					mstore(data_start, or(and(data, mask), selector))
-				})", {"mem_ptr", "selector"});
-				m_context << Instruction::POP;
-			}
-
-			// stack now: <memory pointer>
-			break;
-		}
-		case FunctionType::Kind::ABIDecode:
-		{
-			arguments.front()->accept(*this);
-			Type const* firstArgType = arguments.front()->annotation().type;
-			TypePointers targetTypes;
-			if (TupleType const* targetTupleType = dynamic_cast<TupleType const*>(_functionCall.annotation().type))
-				targetTypes = targetTupleType->components();
-			else
-				targetTypes = TypePointers{_functionCall.annotation().type};
-			if (
-				auto referenceType = dynamic_cast<ReferenceType const*>(firstArgType);
-				referenceType && referenceType->dataStoredIn(DataLocation::CallData)
-			)
-			{
-				solAssert(referenceType->isImplicitlyConvertibleTo(*TypeProvider::bytesCalldata()), "");
-				utils().convertType(*referenceType, *TypeProvider::bytesCalldata());
-				utils().abiDecode(targetTypes, false);
-			}
-			else
-			{
-				utils().convertType(*firstArgType, *TypeProvider::bytesMemory());
-				m_context << Instruction::DUP1 << u256(32) << Instruction::ADD;
-				m_context << Instruction::SWAP1 << Instruction::MLOAD;
-				// stack now: <mem_pos> <length>
-
-				utils().abiDecode(targetTypes, true);
-			}
-			break;
-		}
-		case FunctionType::Kind::GasLeft:
-			m_context << Instruction::GAS;
-			break;
-		case FunctionType::Kind::MetaType:
-			// No code to generate.
-			break;
-		}
-	}
-	return false;
-}
-
-bool ExpressionCompiler::visit(FunctionCallOptions const& _functionCallOptions)
-{
-	_functionCallOptions.expression().accept(*this);
-
-	// Desired Stack: [salt], [gas], [value]
-	enum Option { Salt, Gas, Value };
-
-	std::vector<Option> presentOptions;
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(
-		*_functionCallOptions.expression().annotation().type
-	);
-	if (funType.saltSet()) presentOptions.emplace_back(Salt);
-	if (funType.gasSet()) presentOptions.emplace_back(Gas);
-	if (funType.valueSet()) presentOptions.emplace_back(Value);
-
-	for (size_t i = 0; i < _functionCallOptions.options().size(); ++i)
-	{
-		std::string const& name = *_functionCallOptions.names()[i];
-		Type const* requiredType = TypeProvider::uint256();
-		Option newOption;
-		if (name == "salt")
-		{
-			newOption = Salt;
-			requiredType = TypeProvider::fixedBytes(32);
-		}
-		else if (name == "gas")
-			newOption = Gas;
-		else if (name == "value")
-			newOption = Value;
-		else
-			solAssert(false, "Unexpected option name!");
-		acceptAndConvert(*_functionCallOptions.options()[i], *requiredType);
-
-		solAssert(!util::contains(presentOptions, newOption), "");
-		ptrdiff_t insertPos = presentOptions.end() - lower_bound(presentOptions.begin(), presentOptions.end(), newOption);
-
-		utils().moveIntoStack(static_cast<unsigned>(insertPos), 1);
-		presentOptions.insert(presentOptions.end() - insertPos, newOption);
-	}
-
-	return false;
-}
-
-bool ExpressionCompiler::visit(NewExpression const&)
-{
-	// code is created for the function call (CREATION) only
-	return false;
-}
-
-bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _memberAccess);
-	// Check whether the member is an attached function.
-	ASTString const& member = _memberAccess.memberName();
-	if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type))
-		if (funType->hasBoundFirstArgument())
-		{
-			acceptAndConvert(_memberAccess.expression(), *funType->selfType(), true);
-			if (funType->kind() == FunctionType::Kind::Internal)
-			{
-				FunctionDefinition const& funDef = dynamic_cast<decltype(funDef)>(funType->declaration());
-				solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-				utils().pushCombinedFunctionEntryLabel(
-					funDef,
-					// If we call directly, do not include the second label.
-					!_memberAccess.annotation().calledDirectly
-				);
-				utils().moveIntoStack(funType->selfType()->sizeOnStack(), 1);
-			}
-			else if (
-				funType->kind() == FunctionType::Kind::ArrayPop ||
-				funType->kind() == FunctionType::Kind::ArrayPush
-			)
-			{
-			}
-			else
-			{
-				solAssert(funType->kind() == FunctionType::Kind::DelegateCall, "");
-				auto contract = dynamic_cast<ContractDefinition const*>(funType->declaration().scope());
-				solAssert(contract && contract->isLibrary(), "");
-				m_context.appendLibraryAddress(contract->fullyQualifiedName());
-				m_context << funType->externalIdentifier();
-				utils().moveIntoStack(funType->selfType()->sizeOnStack(), 2);
-			}
-			return false;
-		}
-
-	// Special processing for TypeType because we do not want to visit the library itself
-	// for internal functions, or enum/struct definitions.
-	if (TypeType const* type = dynamic_cast<TypeType const*>(_memberAccess.expression().annotation().type))
-	{
-		if (auto contractType = dynamic_cast<ContractType const*>(type->actualType()))
-		{
-			solAssert(_memberAccess.annotation().type, "_memberAccess has no type");
-			if (contractType->isSuper())
-			{
-				_memberAccess.expression().accept(*this);
-				solAssert(_memberAccess.annotation().referencedDeclaration, "Referenced declaration not resolved.");
-				solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Super, "");
-				utils().pushCombinedFunctionEntryLabel(
-					m_context.superFunction(
-						dynamic_cast<FunctionDefinition const&>(*_memberAccess.annotation().referencedDeclaration),
-						contractType->contractDefinition()
-					),
-					// If we call directly, do not include the second label.
-					!_memberAccess.annotation().calledDirectly
-				);
-			}
-			else
-			{
-				if (auto variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-					appendVariable(*variable, static_cast<Expression const&>(_memberAccess));
-				else if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type))
-				{
-					switch (funType->kind())
-					{
-					case FunctionType::Kind::Declaration:
-						break;
-					case FunctionType::Kind::Internal:
-						// We do not visit the expression here on purpose, because in the case of an
-						// internal library function call, this would push the library address forcing
-						// us to link against it although we actually do not need it.
-						if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-						{
-							solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-							utils().pushCombinedFunctionEntryLabel(
-								*function,
-								// If we call directly, do not include the second label.
-								!_memberAccess.annotation().calledDirectly
-							);
-						}
-						else
-							solAssert(false, "Function not found in member access");
-						break;
-					case FunctionType::Kind::Event:
-						if (!dynamic_cast<EventDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-							solAssert(false, "event not found");
-						// no-op, because the parent node will do the job
-						break;
-					case FunctionType::Kind::Error:
-						if (!dynamic_cast<ErrorDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-							solAssert(false, "error not found");
-						// no-op, because the parent node will do the job
-						break;
-					case FunctionType::Kind::DelegateCall:
-						_memberAccess.expression().accept(*this);
-						m_context << funType->externalIdentifier();
-					break;
-					case FunctionType::Kind::External:
-					case FunctionType::Kind::Creation:
-					case FunctionType::Kind::Send:
-					case FunctionType::Kind::BareCall:
-					case FunctionType::Kind::BareCallCode:
-					case FunctionType::Kind::BareDelegateCall:
-					case FunctionType::Kind::BareStaticCall:
-					case FunctionType::Kind::Transfer:
-					case FunctionType::Kind::ECRecover:
-					case FunctionType::Kind::SHA256:
-					case FunctionType::Kind::RIPEMD160:
-					default:
-						solAssert(false, "unsupported member function");
-					}
-				}
-				else if (dynamic_cast<TypeType const*>(_memberAccess.annotation().type))
-				{
-					// no-op
-				}
-				else
-					_memberAccess.expression().accept(*this);
-			}
-		}
-		else if (auto enumType = dynamic_cast<EnumType const*>(type->actualType()))
-		{
-			_memberAccess.expression().accept(*this);
-			m_context << enumType->memberValue(_memberAccess.memberName());
-		}
-		else
-			_memberAccess.expression().accept(*this);
-		return false;
-	}
-	// Another special case for `this.f.selector` and for ``C.f.selector`` which do not need the address.
-	// There are other uses of `.selector` which do need the address, but we want these
-	// specific uses to be pure expressions.
-	if (
-		auto const* functionType = dynamic_cast<FunctionType const*>(_memberAccess.expression().annotation().type);
-		functionType && member == "selector"
-	)
-	{
-		if (functionType->hasDeclaration())
-		{
-			// Still visit the expression in case it has side effects.
-			_memberAccess.expression().accept(*this);
-			utils().popStackElement(*functionType);
-
-			if (functionType->kind() == FunctionType::Kind::Event)
-				m_context << u256(h256::Arith(util::keccak256(functionType->externalSignature())));
-			else
-			{
-				m_context << functionType->externalIdentifier();
-				/// need to store it as bytes4
-				utils().leftShiftNumberOnStack(224);
-			}
-			return false;
-		}
-		else if (auto const* expr = dynamic_cast<MemberAccess const*>(&_memberAccess.expression()))
-			if (auto const* exprInt = dynamic_cast<Identifier const*>(&expr->expression()))
-				if (exprInt->name() == "this")
-					if (Declaration const* declaration = expr->annotation().referencedDeclaration)
-					{
-						u256 identifier;
-						if (auto const* variable = dynamic_cast<VariableDeclaration const*>(declaration))
-							identifier = FunctionType(*variable).externalIdentifier();
-						else if (auto const* function = dynamic_cast<FunctionDefinition const*>(declaration))
-							identifier = FunctionType(*function).externalIdentifier();
-						else
-							solAssert(false, "Contract member is neither variable nor function.");
-						m_context << identifier;
-						/// need to store it as bytes4
-						utils().leftShiftNumberOnStack(224);
-						return false;
-					}
-	}
-	// Another special case for `address(this).balance`. Post-Istanbul, we can use the selfbalance
-	// opcode.
-	if (
-		m_context.evmVersion().hasSelfBalance() &&
-		member == "balance" &&
-		_memberAccess.expression().annotation().type->category() == Type::Category::Address
-	)
-		if (FunctionCall const* funCall = dynamic_cast<FunctionCall const*>(&_memberAccess.expression()))
-			if (auto const* addr = dynamic_cast<ElementaryTypeNameExpression const*>(&funCall->expression()))
-				if (
-					addr->type().typeName().token() == Token::Address &&
-					funCall->arguments().size() == 1
-				)
-					if (auto arg = dynamic_cast<Identifier const*>( funCall->arguments().front().get()))
-						if (
-							arg->name() == "this" &&
-							dynamic_cast<MagicVariableDeclaration const*>(arg->annotation().referencedDeclaration)
-						)
-						{
-							m_context << Instruction::SELFBALANCE;
-							return false;
-						}
-
-	// Another special case for `address.code.length`, which should simply call extcodesize
-	if (
-		auto innerExpression = dynamic_cast<MemberAccess const*>(&_memberAccess.expression());
-		member == "length" &&
-		innerExpression &&
-		innerExpression->memberName() == "code" &&
-		innerExpression->expression().annotation().type->category() == Type::Category::Address
-	)
-	{
-		solAssert(innerExpression->annotation().type->category() == Type::Category::Array, "");
-
-		innerExpression->expression().accept(*this);
-
-		utils().convertType(
-			*innerExpression->expression().annotation().type,
-			*TypeProvider::address(),
-			true
-		);
-		m_context << Instruction::EXTCODESIZE;
-
-		return false;
-	}
-
-	_memberAccess.expression().accept(*this);
-	switch (_memberAccess.expression().annotation().type->category())
-	{
-	case Type::Category::Contract:
-	{
-		ContractType const& type = dynamic_cast<ContractType const&>(*_memberAccess.expression().annotation().type);
-		// ordinary contract type
-		if (Declaration const* declaration = _memberAccess.annotation().referencedDeclaration)
-		{
-			u256 identifier;
-			if (auto const* variable = dynamic_cast<VariableDeclaration const*>(declaration))
-				identifier = FunctionType(*variable).externalIdentifier();
-			else if (auto const* function = dynamic_cast<FunctionDefinition const*>(declaration))
-				identifier = FunctionType(*function).externalIdentifier();
-			else
-				solAssert(false, "Contract member is neither variable nor function.");
-			utils().convertType(type, type.isPayable() ? *TypeProvider::payableAddress() : *TypeProvider::address(), true);
-			m_context << identifier;
-		}
-		else
-			solAssert(false, "Invalid member access in contract");
-		break;
-	}
-	case Type::Category::Integer:
-	{
-		solAssert(false, "Invalid member access to integer");
-		break;
-	}
-	case Type::Category::Address:
-	{
-		if (member == "balance")
-		{
-			utils().convertType(
-				*_memberAccess.expression().annotation().type,
-				*TypeProvider::address(),
-				true
-			);
-			m_context << Instruction::BALANCE;
-		}
-		else if (member == "code")
-		{
-			// Stack: <address>
-			utils().convertType(
-				*_memberAccess.expression().annotation().type,
-				*TypeProvider::address(),
-				true
-			);
-
-			m_context << Instruction::DUP1 << Instruction::EXTCODESIZE;
-			// Stack post: <address> <size>
-
-			m_context << Instruction::DUP1;
-			// Account for the size field of `bytes memory`
-			m_context << u256(32) << Instruction::ADD;
-			utils().allocateMemory();
-			// Stack post: <address> <size> <mem_offset>
-
-			// Store size at mem_offset
-			m_context << Instruction::DUP2 << Instruction::DUP2 << Instruction::MSTORE;
-
-			m_context << u256(0) << Instruction::SWAP1 << Instruction::DUP1;
-			// Stack post: <address> <size> 0 <mem_offset> <mem_offset>
-
-			m_context << u256(32) << Instruction::ADD << Instruction::SWAP1;
-			// Stack post: <address> <size> 0 <mem_offset_adjusted> <mem_offset>
-
-			m_context << Instruction::SWAP4;
-			// Stack post: <mem_offset> <size> 0 <mem_offset_adjusted> <address>
-
-			m_context << Instruction::EXTCODECOPY;
-			// Stack post: <mem_offset>
-		}
-		else if (member == "codehash")
-		{
-			utils().convertType(
-				*_memberAccess.expression().annotation().type,
-				*TypeProvider::address(),
-				true
-			);
-			m_context << Instruction::EXTCODEHASH;
-		}
-		else if ((std::set<std::string>{"send", "transfer"}).count(member))
-		{
-			solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable, "");
-			utils().convertType(
-				*_memberAccess.expression().annotation().type,
-				AddressType(StateMutability::Payable),
-				true
-			);
-		}
-		else if ((std::set<std::string>{"call", "callcode", "delegatecall", "staticcall"}).count(member))
-			utils().convertType(
-				*_memberAccess.expression().annotation().type,
-				*TypeProvider::address(),
-				true
-			);
-		else
-			solAssert(false, "Invalid member access to address");
-		break;
-	}
-	case Type::Category::Function:
-		if (member == "selector")
-		{
-			auto const& functionType = dynamic_cast<FunctionType const&>(*_memberAccess.expression().annotation().type);
-			// all events should have already been caught by this stage
-			solAssert(!(functionType.kind() == FunctionType::Kind::Event));
-
-			if (functionType.kind() == FunctionType::Kind::External)
-				CompilerUtils(m_context).popStackSlots(functionType.sizeOnStack() - 2);
-			m_context << Instruction::SWAP1 << Instruction::POP;
-
-			/// need to store it as bytes4
-			utils().leftShiftNumberOnStack(224);
-		}
-		else if (member == "address")
-		{
-			auto const& functionType = dynamic_cast<FunctionType const&>(*_memberAccess.expression().annotation().type);
-			solAssert(functionType.kind() == FunctionType::Kind::External, "");
-			CompilerUtils(m_context).popStackSlots(functionType.sizeOnStack() - 1);
-		}
-		else
-			solAssert(
-				!!_memberAccess.expression().annotation().type->memberType(member),
-				"Invalid member access to function."
-			);
-		break;
-	case Type::Category::Magic:
-		// we can ignore the kind of magic and only look at the name of the member
-		if (member == "coinbase")
-			m_context << Instruction::COINBASE;
-		else if (member == "timestamp")
-			m_context << Instruction::TIMESTAMP;
-		else if (member == "difficulty" || member == "prevrandao")
-			m_context << Instruction::PREVRANDAO;
-		else if (member == "number")
-			m_context << Instruction::NUMBER;
-		else if (member == "gaslimit")
-			m_context << Instruction::GASLIMIT;
-		else if (member == "sender")
-			m_context << Instruction::CALLER;
-		else if (member == "value")
-			m_context << Instruction::CALLVALUE;
-		else if (member == "origin")
-			m_context << Instruction::ORIGIN;
-		else if (member == "gasprice")
-			m_context << Instruction::GASPRICE;
-		else if (member == "chainid")
-			m_context << Instruction::CHAINID;
-		else if (member == "basefee")
-			m_context << Instruction::BASEFEE;
-		else if (member == "data")
-			m_context << u256(0) << Instruction::CALLDATASIZE;
-		else if (member == "sig")
-			m_context << u256(0) << Instruction::CALLDATALOAD
-				<< (u256(0xffffffff) << (256 - 32)) << Instruction::AND;
-		else if (member == "gas")
-			solAssert(false, "Gas has been removed.");
-		else if (member == "blockhash")
-			solAssert(false, "Blockhash has been removed.");
-		else if (member == "creationCode" || member == "runtimeCode")
-		{
-			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
-			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
-			solAssert(!contractType.isSuper(), "");
-			ContractDefinition const& contract = contractType.contractDefinition();
-			utils().fetchFreeMemoryPointer();
-			m_context << Instruction::DUP1 << u256(32) << Instruction::ADD;
-			utils().copyContractCodeToMemory(contract, member == "creationCode");
-			// Stack: start end
-			m_context.appendInlineAssembly(
-				Whiskers(R"({
-					mstore(start, sub(end, add(start, 0x20)))
-					mstore(<free>, and(add(end, 31), not(31)))
-				})")("free", std::to_string(CompilerUtils::freeMemoryPointer)).render(),
-				{"start", "end"}
-			);
-			m_context << Instruction::POP;
-		}
-		else if (member == "name")
-		{
-			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
-			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
-			ContractDefinition const& contract = contractType.isSuper() ?
-				*contractType.contractDefinition().superContract(m_context.mostDerivedContract()) :
-				dynamic_cast<ContractType const&>(*arg).contractDefinition();
-			utils().allocateMemory(((contract.name().length() + 31) / 32) * 32 + 32);
-			// store string length
-			m_context << u256(contract.name().length()) << Instruction::DUP2 << Instruction::MSTORE;
-			// adjust pointer
-			m_context << Instruction::DUP1 << u256(32) << Instruction::ADD;
-			utils().storeStringData(contract.name());
-		}
-		else if (member == "interfaceId")
-		{
-			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
-			ContractDefinition const& contract = dynamic_cast<ContractType const&>(*arg).contractDefinition();
-			m_context << (u256{contract.interfaceId()} << (256 - 32));
-		}
-		else if (member == "min" || member == "max")
-		{
-			MagicType const* arg = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type);
-			if (IntegerType const* integerType = dynamic_cast<IntegerType const*>(arg->typeArgument()))
-				m_context << (member == "min" ? integerType->min() : integerType->max());
-			else if (EnumType const* enumType = dynamic_cast<EnumType const*>(arg->typeArgument()))
-				m_context << (member == "min" ? enumType->minValue() : enumType->maxValue());
-			else
-				solAssert(false, "min/max not available for the given type.");
-
-		}
-		else if ((std::set<std::string>{"encode", "encodePacked", "encodeWithSelector", "encodeWithSignature", "decode"}).count(member))
-		{
-			// no-op
-		}
-		else
-			solAssert(false, "Unknown magic member.");
-		break;
-	case Type::Category::Struct:
-	{
-		StructType const& type = dynamic_cast<StructType const&>(*_memberAccess.expression().annotation().type);
-		Type const* memberType = _memberAccess.annotation().type;
-		switch (type.location())
-		{
-		case DataLocation::Storage:
-		{
-			std::pair<u256, unsigned> const& offsets = type.storageOffsetsOfMember(member);
-			m_context << offsets.first << Instruction::ADD << u256(offsets.second);
-			setLValueToStorageItem(_memberAccess);
-			break;
-		}
-		case DataLocation::Memory:
-		{
-			m_context << type.memoryOffsetOfMember(member) << Instruction::ADD;
-			setLValue<MemoryItem>(_memberAccess, *memberType);
-			break;
-		}
-		case DataLocation::CallData:
-		{
-			if (_memberAccess.annotation().type->isDynamicallyEncoded())
-			{
-				m_context << Instruction::DUP1;
-				m_context << type.calldataOffsetOfMember(member) << Instruction::ADD;
-				CompilerUtils(m_context).accessCalldataTail(*memberType);
-			}
-			else
-			{
-				m_context << type.calldataOffsetOfMember(member) << Instruction::ADD;
-				// For non-value types the calldata offset is returned directly.
-				if (memberType->isValueType())
-				{
-					solAssert(memberType->calldataEncodedSize() > 0, "");
-					solAssert(memberType->storageBytes() <= 32, "");
-					if (memberType->storageBytes() < 32 && m_context.useABICoderV2())
-					{
-						m_context << u256(32);
-						CompilerUtils(m_context).abiDecodeV2({memberType}, false);
-					}
-					else
-						CompilerUtils(m_context).loadFromMemoryDynamic(*memberType, true, true, false);
-				}
-				else
-					solAssert(
-						memberType->category() == Type::Category::Array ||
-						memberType->category() == Type::Category::Struct,
-						""
-					);
-			}
-			break;
-		}
-		default:
-			solAssert(false, "Illegal data location for struct.");
-		}
-		break;
-	}
-	case Type::Category::Enum:
-	{
-		EnumType const& type = dynamic_cast<EnumType const&>(*_memberAccess.expression().annotation().type);
-		m_context << type.memberValue(_memberAccess.memberName());
-		break;
-	}
-	case Type::Category::Array:
-	{
-		auto const& type = dynamic_cast<ArrayType const&>(*_memberAccess.expression().annotation().type);
-		if (member == "length")
-		{
-			if (!type.isDynamicallySized())
-			{
-				utils().popStackElement(type);
-				m_context << type.length();
-			}
-			else
-				switch (type.location())
-				{
-				case DataLocation::CallData:
-					m_context << Instruction::SWAP1 << Instruction::POP;
-					break;
-				case DataLocation::Storage:
-					ArrayUtils(m_context).retrieveLength(type);
-					m_context << Instruction::SWAP1 << Instruction::POP;
-					break;
-				case DataLocation::Memory:
-					m_context << Instruction::MLOAD;
-					break;
-				}
-		}
-		else if (member == "push" || member == "pop")
-		{
-			solAssert(
-				type.isDynamicallySized() &&
-				type.location() == DataLocation::Storage &&
-				type.category() == Type::Category::Array,
-				"Tried to use ." + member + "() on a non-dynamically sized array"
-			);
-		}
-		else
-			solAssert(false, "Illegal array member.");
-		break;
-	}
-	case Type::Category::FixedBytes:
-	{
-		auto const& type = dynamic_cast<FixedBytesType const&>(*_memberAccess.expression().annotation().type);
-		utils().popStackElement(type);
-		if (member == "length")
-			m_context << u256(type.numBytes());
-		else
-			solAssert(false, "Illegal fixed bytes member.");
-		break;
-	}
-	case Type::Category::Module:
-	{
-		Type::Category category = _memberAccess.annotation().type->category();
-		solAssert(
-			dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration) ||
-			dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration) ||
-			dynamic_cast<ErrorDefinition const*>(_memberAccess.annotation().referencedDeclaration) ||
-			category == Type::Category::TypeType ||
-			category == Type::Category::Module,
-			""
-		);
-		if (auto variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			solAssert(variable->isConstant(), "");
-			appendVariable(*variable, static_cast<Expression const&>(_memberAccess));
-		}
-		else if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
-			solAssert(function && function->isFree(), "");
-			solAssert(funType->kind() == FunctionType::Kind::Internal, "");
-			solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-			utils().pushCombinedFunctionEntryLabel(
-				*function,
-				// If we call directly, do not include the second label.
-				!_memberAccess.annotation().calledDirectly
-			);
-		}
-		else if (auto const* contract = dynamic_cast<ContractDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			if (contract->isLibrary())
-				m_context.appendLibraryAddress(contract->fullyQualifiedName());
-		}
-		break;
-	}
-	default:
-		solAssert(false, "Member access to unknown type.");
-	}
-	return false;
-}
-
-bool ExpressionCompiler::visit(IndexAccess const& _indexAccess)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _indexAccess);
-	_indexAccess.baseExpression().accept(*this);
-
-	Type const& baseType = *_indexAccess.baseExpression().annotation().type;
-
-	switch (baseType.category())
-	{
-		case Type::Category::Mapping:
-		{
-			// stack: storage_base_ref
-			Type const* keyType = dynamic_cast<MappingType const&>(baseType).keyType();
-			solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-			if (keyType->isDynamicallySized())
-			{
-				_indexAccess.indexExpression()->accept(*this);
-				utils().fetchFreeMemoryPointer();
-				// stack: base index mem
-				// note: the following operations must not allocate memory!
-				utils().packedEncode(
-					TypePointers{_indexAccess.indexExpression()->annotation().type},
-					TypePointers{keyType}
-				);
-				m_context << Instruction::SWAP1;
-				utils().storeInMemoryDynamic(*TypeProvider::uint256());
-				utils().toSizeAfterFreeMemoryPointer();
-			}
-			else
-			{
-				m_context << u256(0); // memory position
-				appendExpressionCopyToMemory(*keyType, *_indexAccess.indexExpression());
-				m_context << Instruction::SWAP1;
-				solAssert(CompilerUtils::freeMemoryPointer >= 0x40, "");
-				utils().storeInMemoryDynamic(*TypeProvider::uint256());
-				m_context << u256(0);
-			}
-			m_context << Instruction::KECCAK256;
-			m_context << u256(0);
-			setLValueToStorageItem(_indexAccess);
-			break;
-		}
-		case Type::Category::ArraySlice:
-		{
-			auto const& arrayType = dynamic_cast<ArraySliceType const&>(baseType).arrayType();
-			solAssert(
-				arrayType.location() == DataLocation::CallData &&
-				arrayType.isDynamicallySized() &&
-				!arrayType.baseType()->isDynamicallyEncoded(),
-				""
-			);
-			solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-
-			acceptAndConvert(*_indexAccess.indexExpression(), *TypeProvider::uint256(), true);
-			ArrayUtils(m_context).accessCallDataArrayElement(arrayType);
-			break;
-
-		}
-		case Type::Category::Array:
-		{
-			ArrayType const& arrayType = dynamic_cast<ArrayType const&>(baseType);
-			solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-
-			acceptAndConvert(*_indexAccess.indexExpression(), *TypeProvider::uint256(), true);
-			// stack layout: <base_ref> [<length>] <index>
-			switch (arrayType.location())
-			{
-				case DataLocation::Storage:
-					ArrayUtils(m_context).accessIndex(arrayType);
-					if (arrayType.isByteArrayOrString())
-					{
-						solAssert(!arrayType.isString(), "Index access to string is not allowed.");
-						setLValue<StorageByteArrayElement>(_indexAccess);
-					}
-					else
-						setLValueToStorageItem(_indexAccess);
-					break;
-				case DataLocation::Memory:
-					ArrayUtils(m_context).accessIndex(arrayType);
-					setLValue<MemoryItem>(_indexAccess, *_indexAccess.annotation().type, !arrayType.isByteArrayOrString());
-					break;
-				case DataLocation::CallData:
-					ArrayUtils(m_context).accessCallDataArrayElement(arrayType);
-					break;
-			}
-			break;
-		}
-		case Type::Category::FixedBytes:
-		{
-			FixedBytesType const& fixedBytesType = dynamic_cast<FixedBytesType const&>(baseType);
-			solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-
-			acceptAndConvert(*_indexAccess.indexExpression(), *TypeProvider::uint256(), true);
-			// stack layout: <value> <index>
-			// check out-of-bounds access
-			m_context << u256(fixedBytesType.numBytes());
-			m_context << Instruction::DUP2 << Instruction::LT << Instruction::ISZERO;
-			// out-of-bounds access throws exception
-			m_context.appendConditionalPanic(util::PanicCode::ArrayOutOfBounds);
-
-			m_context << Instruction::BYTE;
-			utils().leftShiftNumberOnStack(256 - 8);
-			break;
-		}
-		case Type::Category::TypeType:
-		{
-			solAssert(baseType.sizeOnStack() == 0, "");
-			solAssert(_indexAccess.annotation().type->sizeOnStack() == 0, "");
-			// no-op - this seems to be a lone array type (`structType[];`)
-			break;
-		}
-		default:
-			solAssert(false, "Index access only allowed for mappings or arrays.");
-			break;
-	}
-
-	return false;
-}
-
-bool ExpressionCompiler::visit(IndexRangeAccess const& _indexAccess)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _indexAccess);
-	_indexAccess.baseExpression().accept(*this);
-	// stack: offset length
-
-	Type const& baseType = *_indexAccess.baseExpression().annotation().type;
-
-	ArrayType const *arrayType = dynamic_cast<ArrayType const*>(&baseType);
-	if (!arrayType)
-		if (ArraySliceType const* sliceType = dynamic_cast<ArraySliceType const*>(&baseType))
-			arrayType = &sliceType->arrayType();
-
-	solAssert(arrayType, "");
-	solUnimplementedAssert(
-		arrayType->location() == DataLocation::CallData &&
-		arrayType->isDynamicallySized() &&
-		!arrayType->baseType()->isDynamicallyEncoded()
-	);
-
-	if (_indexAccess.startExpression())
-		acceptAndConvert(*_indexAccess.startExpression(), *TypeProvider::uint256());
-	else
-		m_context << u256(0);
-	// stack: offset length sliceStart
-
-	m_context << Instruction::SWAP1;
-	// stack: offset sliceStart length
-
-	if (_indexAccess.endExpression())
-		acceptAndConvert(*_indexAccess.endExpression(), *TypeProvider::uint256());
-	else
-		m_context << Instruction::DUP1;
-	// stack: offset sliceStart length sliceEnd
-
-	m_context << Instruction::SWAP3;
-	// stack: sliceEnd sliceStart length offset
-
-	m_context.callYulFunction(m_context.utilFunctions().calldataArrayIndexRangeAccess(*arrayType), 4, 2);
-
-	return false;
-}
-
-void ExpressionCompiler::endVisit(Identifier const& _identifier)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _identifier);
-	Declaration const* declaration = _identifier.annotation().referencedDeclaration;
-	if (MagicVariableDeclaration const* magicVar = dynamic_cast<MagicVariableDeclaration const*>(declaration))
-	{
-		switch (magicVar->type()->category())
-		{
-		case Type::Category::Contract:
-			if (dynamic_cast<ContractType const*>(magicVar->type()))
-			{
-				solAssert(_identifier.name() == "this", "");
-				m_context << Instruction::ADDRESS;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	else if (FunctionDefinition const* functionDef = dynamic_cast<FunctionDefinition const*>(declaration))
-	{
-		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, "");
-		utils().pushCombinedFunctionEntryLabel(
-			functionDef->resolveVirtual(m_context.mostDerivedContract()),
-			// If we call directly, do not include the second (potential runtime) label.
-			// Including the label might lead to the runtime code being included in the creation
-			// code even though it is never executed.
-			!_identifier.annotation().calledDirectly
-		);
-	}
-	else if (auto variable = dynamic_cast<VariableDeclaration const*>(declaration))
-		appendVariable(*variable, static_cast<Expression const&>(_identifier));
-	else if (auto contract = dynamic_cast<ContractDefinition const*>(declaration))
-	{
-		if (contract->isLibrary())
-			m_context.appendLibraryAddress(contract->fullyQualifiedName());
-	}
-	else if (dynamic_cast<EventDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<ErrorDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<EnumDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<UserDefinedValueTypeDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<StructDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<ImportDirective const*>(declaration))
-	{
-		// no-op
-	}
-	else
-	{
-		solAssert(false, "Identifier type not expected in expression context.");
-	}
-}
-
-void ExpressionCompiler::endVisit(Literal const& _literal)
-{
-	CompilerContext::LocationSetter locationSetter(m_context, _literal);
-	Type const* type = _literal.annotation().type;
-
-	switch (type->category())
-	{
-	case Type::Category::RationalNumber:
-	case Type::Category::Bool:
-	case Type::Category::Address:
-		m_context << type->literalValue(&_literal);
-		break;
-	case Type::Category::StringLiteral:
-		break; // will be done during conversion
-	default:
-		solUnimplemented("Only integer, boolean and string literals implemented for now.");
-	}
-}
-
-void ExpressionCompiler::appendAndOrOperatorCode(BinaryOperation const& _binaryOperation)
-{
-	Token const c_op = _binaryOperation.getOperator();
-	solAssert(c_op == Token::Or || c_op == Token::And, "");
-
-	_binaryOperation.leftExpression().accept(*this);
-	m_context << Instruction::DUP1;
-	if (c_op == Token::And)
-		m_context << Instruction::ISZERO;
-	evmasm::AssemblyItem endLabel = m_context.appendConditionalJump();
-	m_context << Instruction::POP;
-	_binaryOperation.rightExpression().accept(*this);
-	m_context << endLabel;
-}
-
-void ExpressionCompiler::appendCompareOperatorCode(Token _operator, Type const& _type)
-{
-	if (_operator == Token::Equal || _operator == Token::NotEqual)
-	{
-		FunctionType const* functionType = dynamic_cast<decltype(functionType)>(&_type);
-		if (functionType && functionType->kind() == FunctionType::Kind::External)
-		{
-			solUnimplementedAssert(functionType->sizeOnStack() == 2, "");
-			m_context << Instruction::SWAP3;
-
-			m_context << ((u256(1) << 160) - 1) << Instruction::AND;
-			m_context << Instruction::SWAP1;
-			m_context << ((u256(1) << 160) - 1) << Instruction::AND;
-			m_context << Instruction::EQ;
-			m_context << Instruction::SWAP2;
-			m_context << ((u256(1) << 32) - 1) << Instruction::AND;
-			m_context << Instruction::SWAP1;
-			m_context << ((u256(1) << 32) - 1) << Instruction::AND;
-			m_context << Instruction::EQ;
-			m_context << Instruction::AND;
-		}
-		else
-		{
-			solAssert(_type.sizeOnStack() == 1, "Comparison of multi-slot types.");
-			if (functionType && functionType->kind() == FunctionType::Kind::Internal)
-			{
-				// We have to remove the upper bits (construction time value) because they might
-				// be "unknown" in one of the operands and not in the other.
-				m_context << ((u256(1) << 32) - 1) << Instruction::AND;
-				m_context << Instruction::SWAP1;
-				m_context << ((u256(1) << 32) - 1) << Instruction::AND;
-			}
-			m_context << Instruction::EQ;
-		}
-		if (_operator == Token::NotEqual)
-			m_context << Instruction::ISZERO;
-	}
-	else
-	{
-		solAssert(_type.sizeOnStack() == 1, "Comparison of multi-slot types.");
-		bool isSigned = false;
-		if (auto type = dynamic_cast<IntegerType const*>(&_type))
-			isSigned = type->isSigned();
-
-		switch (_operator)
-		{
-		case Token::GreaterThanOrEqual:
-			m_context <<
-				(isSigned ? Instruction::SLT : Instruction::LT) <<
-				Instruction::ISZERO;
-			break;
-		case Token::LessThanOrEqual:
-			m_context <<
-				(isSigned ? Instruction::SGT : Instruction::GT) <<
-				Instruction::ISZERO;
-			break;
-		case Token::GreaterThan:
-			m_context << (isSigned ? Instruction::SGT : Instruction::GT);
-			break;
-		case Token::LessThan:
-			m_context << (isSigned ? Instruction::SLT : Instruction::LT);
-			break;
-		default:
-			solAssert(false, "Unknown comparison operator.");
-		}
-	}
-}
-
-void ExpressionCompiler::appendOrdinaryBinaryOperatorCode(Token _operator, Type const& _type)
-{
-	if (TokenTraits::isArithmeticOp(_operator))
-		appendArithmeticOperatorCode(_operator, _type);
-	else if (TokenTraits::isBitOp(_operator))
-		appendBitOperatorCode(_operator);
-	else
-		solAssert(false, "Unknown binary operator.");
-}
-
-void ExpressionCompiler::appendArithmeticOperatorCode(Token _operator, Type const& _type)
-{
-	if (_type.category() == Type::Category::FixedPoint)
-		solUnimplemented("Not yet implemented - FixedPointType.");
-
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-	if (m_context.arithmetic() == Arithmetic::Checked)
-	{
-		std::string functionName;
-		switch (_operator)
-		{
-		case Token::Add:
-			functionName = m_context.utilFunctions().overflowCheckedIntAddFunction(type);
-			break;
-		case Token::Sub:
-			functionName = m_context.utilFunctions().overflowCheckedIntSubFunction(type);
-			break;
-		case Token::Mul:
-			functionName = m_context.utilFunctions().overflowCheckedIntMulFunction(type);
-			break;
-		case Token::Div:
-			functionName = m_context.utilFunctions().overflowCheckedIntDivFunction(type);
-			break;
-		case Token::Mod:
-			functionName = m_context.utilFunctions().intModFunction(type);
-			break;
-		case Token::Exp:
-			// EXP is handled in a different function.
-		default:
-			solAssert(false, "Unknown arithmetic operator.");
-		}
-		// TODO Maybe we want to force-inline this?
-		m_context.callYulFunction(functionName, 2, 1);
-	}
-	else
-	{
-		bool const c_isSigned = type.isSigned();
-
-		switch (_operator)
-		{
-		case Token::Add:
-			m_context << Instruction::ADD;
-			break;
-		case Token::Sub:
-			m_context << Instruction::SUB;
-			break;
-		case Token::Mul:
-			m_context << Instruction::MUL;
-			break;
-		case Token::Div:
-		case Token::Mod:
-		{
-			// Test for division by zero
-			m_context << Instruction::DUP2 << Instruction::ISZERO;
-			m_context.appendConditionalPanic(util::PanicCode::DivisionByZero);
-
-			if (_operator == Token::Div)
-				m_context << (c_isSigned ? Instruction::SDIV : Instruction::DIV);
-			else
-				m_context << (c_isSigned ? Instruction::SMOD : Instruction::MOD);
-			break;
-		}
-		default:
-			solAssert(false, "Unknown arithmetic operator.");
-		}
-	}
-}
-
-void ExpressionCompiler::appendBitOperatorCode(Token _operator)
-{
-	switch (_operator)
-	{
-	case Token::BitOr:
-		m_context << Instruction::OR;
-		break;
-	case Token::BitAnd:
-		m_context << Instruction::AND;
-		break;
-	case Token::BitXor:
-		m_context << Instruction::XOR;
-		break;
-	default:
-		solAssert(false, "Unknown bit operator.");
-	}
-}
-
-void ExpressionCompiler::appendShiftOperatorCode(Token _operator, Type const& _valueType, Type const& _shiftAmountType)
-{
-	// stack: shift_amount value_to_shift
-
-	bool c_valueSigned = false;
-	if (auto valueType = dynamic_cast<IntegerType const*>(&_valueType))
-		c_valueSigned = valueType->isSigned();
-	else
-		solAssert(dynamic_cast<FixedBytesType const*>(&_valueType), "Only integer and fixed bytes type supported for shifts.");
-
-	// The amount can be a RationalNumberType too.
-	if (auto amountType = dynamic_cast<RationalNumberType const*>(&_shiftAmountType))
-	{
-		// This should be handled by the type checker.
-		solAssert(amountType->integerType(), "");
-		solAssert(!amountType->integerType()->isSigned(), "");
-	}
-	else if (auto amountType = dynamic_cast<IntegerType const*>(&_shiftAmountType))
-		solAssert(!amountType->isSigned(), "");
-	else
-		solAssert(false, "Invalid shift amount type.");
-
-	m_context << Instruction::SWAP1;
-	// stack: value_to_shift shift_amount
-
-	switch (_operator)
-	{
-	case Token::SHL:
-		if (m_context.evmVersion().hasBitwiseShifting())
-			m_context << Instruction::SHL;
-		else
-			m_context << u256(2) << Instruction::EXP << Instruction::MUL;
-		break;
-	case Token::SAR:
-		if (m_context.evmVersion().hasBitwiseShifting())
-			m_context << (c_valueSigned ? Instruction::SAR : Instruction::SHR);
-		else
-		{
-			if (c_valueSigned)
-				// In the following assembly snippet, xor_mask will be zero, if value_to_shift is positive.
-				// Therefore xor'ing with xor_mask is the identity and the computation reduces to
-				// div(value_to_shift, exp(2, shift_amount)), which is correct, since for positive values
-				// arithmetic right shift is dividing by a power of two (which, as a bitwise operation, results
-				// in discarding bits on the right and filling with zeros from the left).
-				// For negative values arithmetic right shift, viewed as a bitwise operation, discards bits to the
-				// right and fills in ones from the left. This is achieved as follows:
-				// If value_to_shift is negative, then xor_mask will have all bits set, so xor'ing with xor_mask
-				// will flip all bits. First all bits in value_to_shift are flipped. As for the positive case,
-				// dividing by a power of two using integer arithmetic results in discarding bits to the right
-				// and filling with zeros from the left. Flipping all bits in the result again, turns all zeros
-				// on the left to ones and restores the non-discarded, shifted bits to their original value (they
-				// have now been flipped twice). In summary we now have discarded bits to the right and filled with
-				// ones from the left, i.e. we have performed an arithmetic right shift.
-				m_context.appendInlineAssembly(R"({
-					let xor_mask := sub(0, slt(value_to_shift, 0))
-					value_to_shift := xor(div(xor(value_to_shift, xor_mask), exp(2, shift_amount)), xor_mask)
-				})", {"value_to_shift", "shift_amount"});
-			else
-				m_context.appendInlineAssembly(R"({
-					value_to_shift := div(value_to_shift, exp(2, shift_amount))
-				})", {"value_to_shift", "shift_amount"});
-			m_context << Instruction::POP;
-
-		}
-		break;
-	case Token::SHR:
-	default:
-		solAssert(false, "Unknown shift operator.");
-	}
-}
-
-void ExpressionCompiler::appendExpOperatorCode(Type const& _valueType, Type const& _exponentType)
-{
-	solAssert(_valueType.category() == Type::Category::Integer, "");
-	solAssert(!dynamic_cast<IntegerType const&>(_exponentType).isSigned(), "");
-
-
-	if (m_context.arithmetic() == Arithmetic::Checked)
-		m_context.callYulFunction(m_context.utilFunctions().overflowCheckedIntExpFunction(
-			dynamic_cast<IntegerType const&>(_valueType),
-			dynamic_cast<IntegerType const&>(_exponentType)
-		), 2, 1);
-	else
-		m_context << Instruction::EXP;
-}
-
-void ExpressionCompiler::appendExternalFunctionCall(
-	FunctionType const& _functionType,
-	std::vector<ASTPointer<Expression const>> const& _arguments,
-	bool _tryCall
-)
-{
-	solAssert(
-		_functionType.takesArbitraryParameters() ||
-		_arguments.size() == _functionType.parameterTypes().size(), ""
-	);
-
-	// Assumed stack content here:
-	// <stack top>
-	// value [if _functionType.valueSet()]
-	// gas [if _functionType.gasSet()]
-	// self object [if bound - moved to top right away]
-	// function identifier [unless bare]
-	// contract address
-
-	unsigned selfSize = _functionType.hasBoundFirstArgument() ? _functionType.selfType()->sizeOnStack() : 0;
-	unsigned gasValueSize = (_functionType.gasSet() ? 1u : 0u) + (_functionType.valueSet() ? 1u : 0u);
-	unsigned contractStackPos = m_context.currentToBaseStackOffset(1 + gasValueSize + selfSize + (_functionType.isBareCall() ? 0 : 1));
-	unsigned gasStackPos = m_context.currentToBaseStackOffset(gasValueSize);
-	unsigned valueStackPos = m_context.currentToBaseStackOffset(1);
-
-	// move self object to top
-	if (_functionType.hasBoundFirstArgument())
-		utils().moveToStackTop(gasValueSize, _functionType.selfType()->sizeOnStack());
-
-	auto funKind = _functionType.kind();
-
-	solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall(), "");
-
-	solAssert(funKind != FunctionType::Kind::BareCallCode, "Callcode has been removed.");
-
-	bool returnSuccessConditionAndReturndata = funKind == FunctionType::Kind::BareCall || funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::BareStaticCall;
-	bool isDelegateCall = funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::DelegateCall;
-	bool useStaticCall = funKind == FunctionType::Kind::BareStaticCall || (_functionType.stateMutability() <= StateMutability::View && m_context.evmVersion().hasStaticCall());
-
-	if (_tryCall)
-	{
-		solAssert(!returnSuccessConditionAndReturndata, "");
-		solAssert(!_functionType.isBareCall(), "");
-	}
-
-	ReturnInfo const returnInfo{m_context.evmVersion(), _functionType};
-	bool const haveReturndatacopy = m_context.evmVersion().supportsReturndata();
-	unsigned const retSize = returnInfo.estimatedReturnSize;
-	bool const dynamicReturnSize = returnInfo.dynamicReturnSize;
-	TypePointers const& returnTypes = returnInfo.returnTypes;
-
-	// Evaluate arguments.
-	TypePointers argumentTypes;
-	TypePointers parameterTypes = _functionType.parameterTypes();
-	if (_functionType.hasBoundFirstArgument())
-	{
-		argumentTypes.push_back(_functionType.selfType());
-		parameterTypes.insert(parameterTypes.begin(), _functionType.selfType());
-	}
-	for (size_t i = 0; i < _arguments.size(); ++i)
-	{
-		_arguments[i]->accept(*this);
-		argumentTypes.push_back(_arguments[i]->annotation().type);
-	}
-
-	if (funKind == FunctionType::Kind::ECRecover)
-	{
-		// Clears 32 bytes of currently free memory and advances free memory pointer.
-		// Output area will be "start of input area" - 32.
-		// The reason is that a failing ECRecover cannot be detected, it will just return
-		// zero bytes (which we cannot detect).
-		solAssert(0 < retSize && retSize <= 32, "");
-		utils().fetchFreeMemoryPointer();
-		m_context << u256(0) << Instruction::DUP2 << Instruction::MSTORE;
-		m_context << u256(32) << Instruction::ADD;
-		utils().storeFreeMemoryPointer();
-	}
-
-	if (!m_context.evmVersion().canOverchargeGasForCall())
-	{
-		// Touch the end of the output area so that we do not pay for memory resize during the call
-		// (which we would have to subtract from the gas left)
-		// We could also just use MLOAD; POP right before the gas calculation, but the optimizer
-		// would remove that, so we use MSTORE here.
-		if (!_functionType.gasSet() && retSize > 0)
-		{
-			m_context << u256(0);
-			utils().fetchFreeMemoryPointer();
-			// This touches too much, but that way we save some rounding arithmetic
-			m_context << u256(retSize) << Instruction::ADD << Instruction::MSTORE;
-		}
-	}
-
-	// Copy function identifier to memory.
-	utils().fetchFreeMemoryPointer();
-	if (!_functionType.isBareCall())
-	{
-		m_context << dupInstruction(2 + gasValueSize + CompilerUtils::sizeOnStack(argumentTypes));
-		utils().storeInMemoryDynamic(IntegerType(8 * CompilerUtils::dataStartOffset), false);
-	}
-
-	// If the function takes arbitrary parameters or is a bare call, copy dynamic length data in place.
-	// Move arguments to memory, will not update the free memory pointer (but will update the memory
-	// pointer on the stack).
-	bool encodeInPlace = _functionType.takesArbitraryParameters() || _functionType.isBareCall();
-	if (_functionType.kind() == FunctionType::Kind::ECRecover)
-		// This would be the only combination of padding and in-place encoding,
-		// but all parameters of ecrecover are value types anyway.
-		encodeInPlace = false;
-	bool encodeForLibraryCall = funKind == FunctionType::Kind::DelegateCall;
-	utils().encodeToMemory(
-		argumentTypes,
-		parameterTypes,
-		_functionType.padArguments(),
-		encodeInPlace,
-		encodeForLibraryCall
-	);
-
-	// Stack now:
-	// <stack top>
-	// input_memory_end
-	// value [if _functionType.valueSet()]
-	// gas [if _functionType.gasSet()]
-	// function identifier [unless bare]
-	// contract address
-
-	// Output data will replace input data, unless we have ECRecover (then, output
-	// area will be 32 bytes just before input area).
-	// put on stack: <size of output> <memory pos of output> <size of input> <memory pos of input>
-	m_context << u256(retSize);
-	utils().fetchFreeMemoryPointer(); // This is the start of input
-	if (funKind == FunctionType::Kind::ECRecover)
-	{
-		// In this case, output is 32 bytes before input and has already been cleared.
-		m_context << u256(32) << Instruction::DUP2 << Instruction::SUB << Instruction::SWAP1;
-		// Here: <input end> <output size> <outpos> <input pos>
-		m_context << Instruction::DUP1 << Instruction::DUP5 << Instruction::SUB;
-		m_context << Instruction::SWAP1;
-	}
-	else
-	{
-		m_context << Instruction::DUP1 << Instruction::DUP4 << Instruction::SUB;
-		m_context << Instruction::DUP2;
-	}
-
-	// CALL arguments: outSize, outOff, inSize, inOff (already present up to here)
-	// [value,] addr, gas (stack top)
-	if (isDelegateCall)
-		solAssert(!_functionType.valueSet(), "Value set for delegatecall");
-	else if (useStaticCall)
-		solAssert(!_functionType.valueSet(), "Value set for staticcall");
-	else if (_functionType.valueSet())
-		m_context << dupInstruction(m_context.baseToCurrentStackOffset(valueStackPos));
-	else
-		m_context << u256(0);
-	m_context << dupInstruction(m_context.baseToCurrentStackOffset(contractStackPos));
-
-	bool existenceChecked = false;
-	// Check the target contract exists (has code) for non-low-level calls.
-	if (funKind == FunctionType::Kind::External || funKind == FunctionType::Kind::DelegateCall)
-	{
-		size_t encodedHeadSize = 0;
-		for (auto const& t: returnTypes)
-			encodedHeadSize += t->decodingType()->calldataHeadSize();
-		// We do not need to check extcodesize if we expect return data, since if there is no
-		// code, the call will return empty data and the ABI decoder will revert.
-		if (
-			encodedHeadSize == 0 ||
-			!haveReturndatacopy ||
-			m_context.revertStrings() >= RevertStrings::Debug
-		)
-		{
-			m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO;
-			m_context.appendConditionalRevert(false, "Target contract does not contain code");
-			existenceChecked = true;
-		}
-	}
-
-	if (_functionType.gasSet())
-		m_context << dupInstruction(m_context.baseToCurrentStackOffset(gasStackPos));
-	else if (m_context.evmVersion().canOverchargeGasForCall())
-		// Send all gas (requires tangerine whistle EVM)
-		m_context << Instruction::GAS;
-	else
-	{
-		// send all gas except the amount needed to execute "SUB" and "CALL"
-		// @todo this retains too much gas for now, needs to be fine-tuned.
-		u256 gasNeededByCaller = evmasm::GasCosts::callGas(m_context.evmVersion()) + 10;
-		if (_functionType.valueSet())
-			gasNeededByCaller += evmasm::GasCosts::callValueTransferGas;
-		if (!existenceChecked)
-			gasNeededByCaller += evmasm::GasCosts::callNewAccountGas; // we never know
-		m_context << gasNeededByCaller << Instruction::GAS << Instruction::SUB;
-	}
-	// Order is important here, STATICCALL might overlap with DELEGATECALL.
-	if (isDelegateCall)
-		m_context << Instruction::DELEGATECALL;
-	else if (useStaticCall)
-		m_context << Instruction::STATICCALL;
-	else
-		m_context << Instruction::CALL;
-
-	unsigned remainsSize =
-		2u + // contract address, input_memory_end
-		(_functionType.valueSet() ? 1 : 0) +
-		(_functionType.gasSet() ? 1 : 0) +
-		(!_functionType.isBareCall() ? 1 : 0);
-
-	evmasm::AssemblyItem endTag = m_context.newTag();
-
-	if (!returnSuccessConditionAndReturndata && !_tryCall)
-	{
-		// Propagate error condition (if CALL pushes 0 on stack).
-		m_context << Instruction::ISZERO;
-		m_context.appendConditionalRevert(true);
-	}
-	else
-		m_context << swapInstruction(remainsSize);
-	utils().popStackSlots(remainsSize);
-
-	// Only success flag is remaining on stack.
-
-	if (_tryCall)
-	{
-		m_context << Instruction::DUP1 << Instruction::ISZERO;
-		m_context.appendConditionalJumpTo(endTag);
-		m_context << Instruction::POP;
-	}
-
-	if (returnSuccessConditionAndReturndata)
-	{
-		// success condition is already there
-		// The return parameter types can be empty, when this function is used as
-		// an internal helper function e.g. for ``send`` and ``transfer``. In that
-		// case we're only interested in the success condition, not the return data.
-		if (!_functionType.returnParameterTypes().empty())
-			utils().returnDataToArray();
-	}
-	else if (funKind == FunctionType::Kind::RIPEMD160)
-	{
-		// fix: built-in contract returns right-aligned data
-		utils().fetchFreeMemoryPointer();
-		utils().loadFromMemoryDynamic(IntegerType(160), false, true, false);
-		utils().convertType(IntegerType(160), FixedBytesType(20));
-	}
-	else if (funKind == FunctionType::Kind::ECRecover)
-	{
-		// Output is 32 bytes before input / free mem pointer.
-		// Failing ecrecover cannot be detected, so we clear output before the call.
-		m_context << u256(32);
-		utils().fetchFreeMemoryPointer();
-		m_context << Instruction::SUB << Instruction::MLOAD;
-	}
-	else if (!returnTypes.empty())
-	{
-		utils().fetchFreeMemoryPointer();
-		// Stack: return_data_start
-
-		// The old decoder did not allocate any memory (i.e. did not touch the free
-		// memory pointer), but kept references to the return data for
-		// (statically-sized) arrays
-		bool needToUpdateFreeMemoryPtr = false;
-		if (dynamicReturnSize || m_context.useABICoderV2())
-			needToUpdateFreeMemoryPtr = true;
-		else
-			for (auto const& retType: returnTypes)
-				if (dynamic_cast<ReferenceType const*>(retType))
-					needToUpdateFreeMemoryPtr = true;
-
-		// Stack: return_data_start
-		if (dynamicReturnSize)
-		{
-			solAssert(haveReturndatacopy, "");
-			m_context.appendInlineAssembly("{ returndatacopy(return_data_start, 0, returndatasize()) }", {"return_data_start"});
-		}
-		else
-			solAssert(retSize > 0, "");
-		// Always use the actual return length, and not our calculated expected length, if returndatacopy is supported.
-		// This ensures it can catch badly formatted input from external calls.
-		m_context << (haveReturndatacopy ? evmasm::AssemblyItem(Instruction::RETURNDATASIZE) : u256(retSize));
-		// Stack: return_data_start return_data_size
-		if (needToUpdateFreeMemoryPtr)
-			m_context.appendInlineAssembly(R"({
-				// round size to the next multiple of 32
-				let newMem := add(start, and(add(size, 0x1f), not(0x1f)))
-				mstore(0x40, newMem)
-			})", {"start", "size"});
-
-		utils().abiDecode(returnTypes, true);
-	}
-
-	if (_tryCall)
-	{
-		// Success branch will reach this, failure branch will directly jump to endTag.
-		m_context << u256(1);
-		m_context << endTag;
-	}
-}
-
-void ExpressionCompiler::appendExpressionCopyToMemory(Type const& _expectedType, Expression const& _expression)
-{
-	solUnimplementedAssert(_expectedType.isValueType(), "Not implemented for non-value types.");
-	acceptAndConvert(_expression, _expectedType, true);
-	utils().storeInMemoryDynamic(_expectedType);
-}
-
-void ExpressionCompiler::appendVariable(VariableDeclaration const& _variable, Expression const& _expression)
-{
-	if (_variable.isConstant())
-		acceptAndConvert(*_variable.value(), *_variable.annotation().type);
-	else if (_variable.immutable())
-		setLValue<ImmutableItem>(_expression, _variable);
-	else
-		setLValueFromDeclaration(_variable, _expression);
-}
-
-void ExpressionCompiler::setLValueFromDeclaration(Declaration const& _declaration, Expression const& _expression)
-{
-	if (m_context.isLocalVariable(&_declaration))
-		setLValue<StackVariable>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
-	else if (m_context.isStateVariable(&_declaration))
-		setLValue<StorageItem>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
-	else
-		BOOST_THROW_EXCEPTION(InternalCompilerError()
-			<< errinfo_sourceLocation(_expression.location())
-			<< util::errinfo_comment("Identifier type not supported or identifier not found."));
-}
-
-void ExpressionCompiler::setLValueToStorageItem(Expression const& _expression)
-{
-	setLValue<StorageItem>(_expression, *_expression.annotation().type);
-}
-
-bool ExpressionCompiler::cleanupNeededForOp(Type::Category _type, Token _op, Arithmetic _arithmetic)
-{
-	if (TokenTraits::isCompareOp(_op) || TokenTraits::isShiftOp(_op))
-		return true;
-	else if (
-		_arithmetic == Arithmetic::Wrapping &&
-		_type == Type::Category::Integer &&
-		(_op == Token::Div || _op == Token::Mod || _op == Token::Exp)
-	)
-		// We need cleanup for EXP because 0**0 == 1, but 0**0x100 == 0
-		// It would suffice to clean the exponent, though.
-		return true;
-	else
-		return false;
-}
-
-void ExpressionCompiler::acceptAndConvert(Expression const& _expression, Type const& _type, bool _cleanupNeeded)
-{
-	_expression.accept(*this);
-	utils().convertType(*_expression.annotation().type, _type, _cleanupNeeded);
-}
-
-CompilerUtils ExpressionCompiler::utils()
-{
-	return CompilerUtils(m_context);
-}
diff --git a/libsolidity/codegen/ExpressionCompiler.h b/libsolidity/codegen/ExpressionCompiler.h
deleted file mode 100644
index 13e1e3106e54..000000000000
--- a/libsolidity/codegen/ExpressionCompiler.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @author Gav Wood <g@ethdev.com>
- * @date 2014
- * Solidity AST to EVM bytecode compiler for expressions.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/codegen/LValue.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceLocation.h>
-#include <libsolutil/Common.h>
-
-#include <functional>
-#include <memory>
-
-namespace solidity::evmasm
-{
-class AssemblyItem; // forward
-}
-
-namespace solidity::frontend
-{
-
-// forward declarations
-class CompilerContext;
-class CompilerUtils;
-class Type;
-class IntegerType;
-class ArrayType;
-
-/**
- * Compiler for expressions, i.e. converts an AST tree whose root is an Expression into a stream
- * of EVM instructions. It needs a compiler context that is the same for the whole compilation
- * unit.
- */
-class ExpressionCompiler: private ASTConstVisitor
-{
-public:
-	ExpressionCompiler(
-		CompilerContext& _compilerContext,
-		bool _optimiseOrderLiterals
-	):
-		m_optimiseOrderLiterals(_optimiseOrderLiterals),
-		m_context(_compilerContext)
-	{}
-
-	/// Compile the given @a _expression and leave its value on the stack.
-	void compile(Expression const& _expression);
-
-	/// Appends code to set a state variable to its initial value/expression.
-	void appendStateVariableInitialization(VariableDeclaration const& _varDecl);
-
-	/// Appends code for a State Variable accessor function
-	void appendStateVariableAccessor(VariableDeclaration const& _varDecl);
-
-	/// Appends code for a Constant State Variable accessor function
-	void appendConstStateVariableAccessor(VariableDeclaration const& _varDecl);
-
-private:
-	bool visit(Conditional const& _condition) override;
-	bool visit(Assignment const& _assignment) override;
-	bool visit(TupleExpression const& _tuple) override;
-	bool visit(UnaryOperation const& _unaryOperation) override;
-	bool visit(BinaryOperation const& _binaryOperation) override;
-	bool visit(FunctionCall const& _functionCall) override;
-	bool visit(FunctionCallOptions const& _functionCallOptions) override;
-	bool visit(NewExpression const& _newExpression) override;
-	bool visit(MemberAccess const& _memberAccess) override;
-	bool visit(IndexAccess const& _indexAccess) override;
-	bool visit(IndexRangeAccess const& _indexAccess) override;
-	void endVisit(Identifier const& _identifier) override;
-	void endVisit(Literal const& _literal) override;
-
-	///@{
-	///@name Append code for various operator types
-	void appendAndOrOperatorCode(BinaryOperation const& _binaryOperation);
-	void appendCompareOperatorCode(Token _operator, Type const& _type);
-	void appendOrdinaryBinaryOperatorCode(Token _operator, Type const& _type);
-
-	void appendArithmeticOperatorCode(Token _operator, Type const& _type);
-	void appendBitOperatorCode(Token _operator);
-	void appendShiftOperatorCode(Token _operator, Type const& _valueType, Type const& _shiftAmountType);
-	void appendExpOperatorCode(Type const& _valueType, Type const& _exponentType);
-	/// @}
-
-	/// Appends code to call a function of the given type with the given arguments.
-	/// @param _tryCall if true, this is the external call of a try statement. In that case,
-	///                 returns success flag on top of stack and does not revert on failure.
-	void appendExternalFunctionCall(
-		FunctionType const& _functionType,
-		std::vector<ASTPointer<Expression const>> const& _arguments,
-		bool _tryCall
-	);
-	/// Appends code that evaluates a single expression and moves the result to memory. The memory offset is
-	/// expected to be on the stack and is updated by this call.
-	void appendExpressionCopyToMemory(Type const& _expectedType, Expression const& _expression);
-
-	/// Appends code for a variable that might be a constant or not
-	void appendVariable(VariableDeclaration const& _variable, Expression const& _expression);
-	/// Sets the current LValue to a new one (of the appropriate type) from the given declaration.
-	/// Also retrieves the value if it was not requested by @a _expression.
-	void setLValueFromDeclaration(Declaration const& _declaration, Expression const& _expression);
-	/// Sets the current LValue to a StorageItem holding the type of @a _expression. The reference is assumed
-	/// to be on the stack.
-	/// Also retrieves the value if it was not requested by @a _expression.
-	void setLValueToStorageItem(Expression const& _expression);
-	/// Sets the current LValue to a new LValue constructed from the arguments.
-	/// Also retrieves the value if it was not requested by @a _expression.
-	template <class LValueType, class... Arguments>
-	void setLValue(Expression const& _expression, Arguments const&... _arguments);
-
-	/// @returns true if the operator applied to the given type requires a cleanup prior to the
-	/// operation.
-	static bool cleanupNeededForOp(Type::Category _type, Token _op, Arithmetic _arithmetic);
-
-	void acceptAndConvert(Expression const& _expression, Type const& _type, bool _cleanupNeeded = false);
-
-	/// @returns the CompilerUtils object containing the current context.
-	CompilerUtils utils();
-
-	bool m_optimiseOrderLiterals;
-	CompilerContext& m_context;
-	std::unique_ptr<LValue> m_currentLValue;
-
-};
-
-template <class LValueType, class... Arguments>
-void ExpressionCompiler::setLValue(Expression const& _expression, Arguments const&... _arguments)
-{
-	solAssert(!m_currentLValue, "Current LValue not reset before trying to set new one.");
-	std::unique_ptr<LValueType> lvalue = std::make_unique<LValueType>(m_context, _arguments...);
-	if (_expression.annotation().willBeWrittenTo)
-		m_currentLValue = std::move(lvalue);
-	else
-		lvalue->retrieveValue(_expression.location(), true);
-}
-
-}
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
deleted file mode 100644
index 3fbf10383499..000000000000
--- a/libsolidity/codegen/LValue.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * LValues for use in the expression compiler.
- */
-
-#include <libsolidity/codegen/LValue.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libevmasm/Instruction.h>
-
-#include <libsolutil/StackTooDeepString.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::util;
-
-
-StackVariable::StackVariable(CompilerContext& _compilerContext, VariableDeclaration const& _declaration):
-	LValue(_compilerContext, _declaration.annotation().type),
-	m_baseStackOffset(m_context.baseStackOffsetOfVariable(_declaration)),
-	m_size(m_dataType->sizeOnStack())
-{
-}
-
-void StackVariable::retrieveValue(SourceLocation const& _location, bool) const
-{
-	unsigned stackPos = m_context.baseToCurrentStackOffset(m_baseStackOffset);
-	if (stackPos + 1 > 16) //@todo correct this by fetching earlier or moving to memory
-		BOOST_THROW_EXCEPTION(
-			StackTooDeepError() <<
-			errinfo_sourceLocation(_location) <<
-			util::errinfo_comment(util::stackTooDeepString)
-		);
-	solAssert(stackPos + 1 >= m_size, "Size and stack pos mismatch.");
-	for (unsigned i = 0; i < m_size; ++i)
-		m_context << dupInstruction(stackPos + 1);
-}
-
-void StackVariable::storeValue(Type const&, SourceLocation const& _location, bool _move) const
-{
-	unsigned stackDiff = m_context.baseToCurrentStackOffset(m_baseStackOffset) - m_size + 1;
-	if (stackDiff > 16)
-		BOOST_THROW_EXCEPTION(
-			StackTooDeepError() <<
-			errinfo_sourceLocation(_location) <<
-			util::errinfo_comment(util::stackTooDeepString)
-		);
-	else if (stackDiff > 0)
-		for (unsigned i = 0; i < m_size; ++i)
-			m_context << swapInstruction(stackDiff) << Instruction::POP;
-	if (!_move)
-		retrieveValue(_location);
-}
-
-void StackVariable::setToZero(SourceLocation const& _location, bool) const
-{
-	CompilerUtils(m_context).pushZeroValue(*m_dataType);
-	storeValue(*m_dataType, _location, true);
-}
-
-MemoryItem::MemoryItem(CompilerContext& _compilerContext, Type const& _type, bool _padded):
-	LValue(_compilerContext, &_type),
-	m_padded(_padded)
-{
-}
-
-void MemoryItem::retrieveValue(SourceLocation const&, bool _remove) const
-{
-	if (m_dataType->isValueType())
-	{
-		if (!_remove)
-			m_context << Instruction::DUP1;
-		CompilerUtils(m_context).loadFromMemoryDynamic(*m_dataType, false, m_padded, false);
-	}
-	else
-		m_context << Instruction::MLOAD;
-}
-
-void MemoryItem::storeValue(Type const& _sourceType, SourceLocation const&, bool _move) const
-{
-	CompilerUtils utils(m_context);
-	if (m_dataType->isValueType())
-	{
-		solAssert(_sourceType.isValueType(), "");
-		utils.moveIntoStack(_sourceType.sizeOnStack());
-		utils.convertType(_sourceType, *m_dataType, true);
-		if (!_move)
-		{
-			utils.moveToStackTop(m_dataType->sizeOnStack());
-			utils.copyToStackTop(1 + m_dataType->sizeOnStack(), m_dataType->sizeOnStack());
-		}
-		if (!m_padded)
-		{
-			solAssert(m_dataType->calldataEncodedSize(false) == 1, "Invalid non-padded type.");
-			solAssert(m_dataType->category() != Type::Category::UserDefinedValueType, "");
-			if (m_dataType->category() == Type::Category::FixedBytes)
-				m_context << u256(0) << Instruction::BYTE;
-			m_context << Instruction::SWAP1 << Instruction::MSTORE8;
-		}
-		else
-		{
-			utils.storeInMemoryDynamic(*m_dataType, m_padded);
-			m_context << Instruction::POP;
-		}
-	}
-	else
-	{
-		solUnimplementedAssert(_sourceType == *m_dataType, "Conversion not implemented for assignment to memory.");
-
-		solAssert(m_dataType->sizeOnStack() == 1, "");
-		if (!_move)
-			m_context << Instruction::DUP2 << Instruction::SWAP1;
-		// stack: [value] value lvalue
-		// only store the reference
-		m_context << Instruction::MSTORE;
-	}
-}
-
-void MemoryItem::setToZero(SourceLocation const&, bool _removeReference) const
-{
-	CompilerUtils utils(m_context);
-	solAssert(_removeReference, "");
-	utils.pushZeroValue(*m_dataType);
-	utils.storeInMemoryDynamic(*m_dataType, m_padded);
-	m_context << Instruction::POP;
-}
-
-
-ImmutableItem::ImmutableItem(CompilerContext& _compilerContext, VariableDeclaration const& _variable):
-	LValue(_compilerContext, _variable.annotation().type), m_variable(_variable)
-{
-	solAssert(_variable.immutable(), "");
-}
-
-void ImmutableItem::retrieveValue(SourceLocation const&, bool) const
-{
-	solUnimplementedAssert(m_dataType->isValueType());
-
-	if (m_context.runtimeContext())
-		CompilerUtils(m_context).loadFromMemory(
-			static_cast<unsigned>(m_context.immutableMemoryOffset(m_variable)),
-			*m_dataType,
-			false,
-			true
-		);
-	else
-		for (auto&& slotName: m_context.immutableVariableSlotNames(m_variable))
-			m_context.appendImmutable(slotName);
-}
-
-void ImmutableItem::storeValue(Type const& _sourceType, SourceLocation const&, bool _move) const
-{
-	CompilerUtils utils(m_context);
-	solUnimplementedAssert(m_dataType->isValueType());
-	solAssert(_sourceType.isValueType(), "");
-
-	utils.convertType(_sourceType, *m_dataType, true);
-	m_context << m_context.immutableMemoryOffset(m_variable);
-	if (_move)
-		utils.moveIntoStack(m_dataType->sizeOnStack());
-	else
-		utils.copyToStackTop(m_dataType->sizeOnStack() + 1, m_dataType->sizeOnStack());
-	utils.storeInMemoryDynamic(*m_dataType);
-	m_context << Instruction::POP;
-}
-
-void ImmutableItem::setToZero(SourceLocation const&, bool _removeReference) const
-{
-	CompilerUtils utils(m_context);
-	solUnimplementedAssert(m_dataType->isValueType());
-	solAssert(_removeReference);
-
-	m_context << m_context.immutableMemoryOffset(m_variable);
-	utils.pushZeroValue(*m_dataType);
-	utils.storeInMemoryDynamic(*m_dataType);
-	m_context << Instruction::POP;
-}
-
-StorageItem::StorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration):
-	StorageItem(_compilerContext, *_declaration.annotation().type)
-{
-	solAssert(!_declaration.immutable(), "");
-	auto const& location = m_context.storageLocationOfVariable(_declaration);
-	m_context << location.first << u256(location.second);
-}
-
-StorageItem::StorageItem(CompilerContext& _compilerContext, Type const& _type):
-	LValue(_compilerContext, &_type)
-{
-	if (m_dataType->isValueType())
-	{
-		if (m_dataType->category() != Type::Category::Function)
-			solAssert(m_dataType->storageSize() == m_dataType->sizeOnStack(), "");
-		solAssert(m_dataType->storageSize() == 1, "Invalid storage size.");
-	}
-}
-
-void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
-{
-	// stack: storage_key storage_offset
-	if (!m_dataType->isValueType())
-	{
-		solAssert(m_dataType->sizeOnStack() == 1, "Invalid storage ref size.");
-		if (_remove)
-			m_context << Instruction::POP; // remove byte offset
-		else
-			m_context << Instruction::DUP2;
-		return;
-	}
-	if (!_remove)
-		CompilerUtils(m_context).copyToStackTop(sizeOnStack(), sizeOnStack());
-	if (m_dataType->storageBytes() == 32)
-		m_context << Instruction::POP << Instruction::SLOAD;
-	else
-	{
-		Type const* type = m_dataType;
-		if (type->category() == Type::Category::UserDefinedValueType)
-			type = type->encodingType();
-		bool cleaned = false;
-		m_context
-			<< Instruction::SWAP1 << Instruction::SLOAD << Instruction::SWAP1
-			<< u256(0x100) << Instruction::EXP << Instruction::SWAP1 << Instruction::DIV;
-		if (type->category() == Type::Category::FixedPoint)
-			// implementation should be very similar to the integer case.
-			solUnimplemented("Not yet implemented - FixedPointType.");
-		else if (FunctionType const* fun = dynamic_cast<decltype(fun)>(type))
-		{
-			if (fun->kind() == FunctionType::Kind::External)
-			{
-				CompilerUtils(m_context).splitExternalFunctionType(false);
-				cleaned = true;
-			}
-			else if (fun->kind() == FunctionType::Kind::Internal)
-			{
-				m_context << Instruction::DUP1 << Instruction::ISZERO;
-				CompilerUtils(m_context).pushZeroValue(*fun);
-				m_context << Instruction::MUL << Instruction::OR;
-			}
-		}
-		else if (type->leftAligned())
-		{
-			CompilerUtils(m_context).leftShiftNumberOnStack(256 - 8 * type->storageBytes());
-			cleaned = true;
-		}
-		else if (
-			type->category() == Type::Category::Integer &&
-			dynamic_cast<IntegerType const&>(*type).isSigned()
-		)
-		{
-			m_context << u256(type->storageBytes() - 1) << Instruction::SIGNEXTEND;
-			cleaned = true;
-		}
-
-		if (!cleaned)
-		{
-			solAssert(type->sizeOnStack() == 1, "");
-			m_context << ((u256(0x1) << (8 * type->storageBytes())) - 1) << Instruction::AND;
-		}
-	}
-}
-
-void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _location, bool _move) const
-{
-	CompilerUtils utils(m_context);
-	solAssert(m_dataType, "");
-
-	// stack: value storage_key storage_offset
-	if (m_dataType->isValueType())
-	{
-		solAssert(m_dataType->storageBytes() <= 32, "Invalid storage bytes size.");
-		solAssert(m_dataType->storageBytes() > 0, "Invalid storage bytes size.");
-		if (m_dataType->storageBytes() == 32)
-		{
-			solAssert(m_dataType->sizeOnStack() == 1, "Invalid stack size.");
-			// offset should be zero
-			m_context << Instruction::POP;
-			if (!_move)
-				m_context << Instruction::DUP2 << Instruction::SWAP1;
-
-			m_context << Instruction::SWAP1;
-			utils.convertType(_sourceType, *m_dataType, true);
-			m_context << Instruction::SWAP1;
-
-			m_context << Instruction::SSTORE;
-		}
-		else
-		{
-			// OR the value into the other values in the storage slot
-			m_context << u256(0x100) << Instruction::EXP;
-			// stack: value storage_ref multiplier
-			// fetch old value
-			m_context << Instruction::DUP2 << Instruction::SLOAD;
-			// stack: value storage_ref multiplier old_full_value
-			// clear bytes in old value
-			m_context
-				<< Instruction::DUP2 << ((u256(1) << (8 * m_dataType->storageBytes())) - 1)
-				<< Instruction::MUL;
-			m_context << Instruction::NOT << Instruction::AND << Instruction::SWAP1;
-			// stack: value storage_ref cleared_value multiplier
-			utils.copyToStackTop(3 + m_dataType->sizeOnStack(), m_dataType->sizeOnStack());
-			// stack: value storage_ref cleared_value multiplier value
-			if (auto const* fun = dynamic_cast<FunctionType const*>(m_dataType))
-			{
-				solAssert(
-					_sourceType.isImplicitlyConvertibleTo(*m_dataType),
-					"function item stored but target is not implicitly convertible to source"
-				);
-				solAssert(!fun->hasBoundFirstArgument(), "");
-				if (fun->kind() == FunctionType::Kind::External)
-				{
-					solAssert(fun->sizeOnStack() == 2, "");
-					// Combine the two-item function type into a single stack slot.
-					utils.combineExternalFunctionType(false);
-				}
-				else
-				{
-					solAssert(fun->sizeOnStack() == 1, "");
-					m_context <<
-						((u256(1) << (8 * m_dataType->storageBytes())) - 1) <<
-						Instruction::AND;
-				}
-			}
-			else if (m_dataType->leftAligned())
-			{
-				solAssert(_sourceType.category() == Type::Category::FixedBytes || (
-					_sourceType.encodingType() &&
-					_sourceType.encodingType()->category() == Type::Category::FixedBytes
-				), "source not fixed bytes");
-				CompilerUtils(m_context).rightShiftNumberOnStack(256 - 8 * m_dataType->storageBytes());
-			}
-			else
-			{
-				solAssert(m_dataType->sizeOnStack() == 1, "Invalid stack size for opaque type.");
-				// remove the higher order bits
-				utils.convertType(_sourceType, *m_dataType, true, true);
-			}
-			m_context  << Instruction::MUL << Instruction::OR;
-			// stack: value storage_ref updated_value
-			m_context << Instruction::SWAP1 << Instruction::SSTORE;
-			if (_move)
-				utils.popStackElement(*m_dataType);
-		}
-	}
-	else
-	{
-		solAssert(
-			_sourceType.category() == m_dataType->category(),
-			"Wrong type conversation for assignment."
-		);
-		if (m_dataType->category() == Type::Category::Array)
-		{
-			m_context << Instruction::POP; // remove byte offset
-			ArrayUtils(m_context).copyArrayToStorage(
-				dynamic_cast<ArrayType const&>(*m_dataType),
-				dynamic_cast<ArrayType const&>(_sourceType)
-			);
-			if (_move)
-				m_context << Instruction::POP;
-		}
-		else if (m_dataType->category() == Type::Category::Struct)
-		{
-			// stack layout: source_ref target_ref target_offset
-			// note that we have structs, so offset should be zero and are ignored
-			m_context << Instruction::POP;
-			auto const& structType = dynamic_cast<StructType const&>(*m_dataType);
-			auto const& sourceType = dynamic_cast<StructType const&>(_sourceType);
-			solAssert(
-				structType.structDefinition() == sourceType.structDefinition(),
-				"Struct assignment with conversion."
-			);
-			solAssert(!structType.containsNestedMapping(), "");
-			if (sourceType.location() == DataLocation::CallData)
-			{
-				solAssert(sourceType.sizeOnStack() == 1, "");
-				solAssert(structType.sizeOnStack() == 1, "");
-				m_context << Instruction::DUP2 << Instruction::DUP2;
-				m_context.callYulFunction(m_context.utilFunctions().updateStorageValueFunction(sourceType, structType, 0), 2, 0);
-			}
-			else
-			{
-				for (auto const& member: structType.members(nullptr))
-				{
-					// assign each member that can live outside of storage
-					Type const* memberType = member.type;
-					solAssert(memberType->nameable(), "");
-					Type const* sourceMemberType = sourceType.memberType(member.name);
-					if (sourceType.location() == DataLocation::Storage)
-					{
-						// stack layout: source_ref target_ref
-						std::pair<u256, unsigned> const& offsets = sourceType.storageOffsetsOfMember(member.name);
-						m_context << offsets.first << Instruction::DUP3 << Instruction::ADD;
-						m_context << u256(offsets.second);
-						// stack: source_ref target_ref source_member_ref source_member_off
-						StorageItem(m_context, *sourceMemberType).retrieveValue(_location, true);
-						// stack: source_ref target_ref source_value...
-					}
-					else
-					{
-						solAssert(sourceType.location() == DataLocation::Memory, "");
-						// stack layout: source_ref target_ref
-						m_context << sourceType.memoryOffsetOfMember(member.name);
-						m_context << Instruction::DUP3 << Instruction::ADD;
-						MemoryItem(m_context, *sourceMemberType).retrieveValue(_location, true);
-						// stack layout: source_ref target_ref source_value...
-					}
-					unsigned stackSize = sourceMemberType->sizeOnStack();
-					std::pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member.name);
-					m_context << dupInstruction(1 + stackSize) << offsets.first << Instruction::ADD;
-					m_context << u256(offsets.second);
-					// stack: source_ref target_ref target_off source_value... target_member_ref target_member_byte_off
-					StorageItem(m_context, *memberType).storeValue(*sourceMemberType, _location, true);
-				}
-			}
-			// stack layout: source_ref target_ref
-			solAssert(sourceType.sizeOnStack() == 1, "Unexpected source size.");
-			if (_move)
-				utils.popStackSlots(2);
-			else
-				m_context << Instruction::SWAP1 << Instruction::POP;
-		}
-		else
-			BOOST_THROW_EXCEPTION(
-				InternalCompilerError()
-					<< errinfo_sourceLocation(_location)
-					<< util::errinfo_comment("Invalid non-value type for assignment."));
-	}
-}
-
-void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
-{
-	if (m_dataType->category() == Type::Category::Array)
-	{
-		if (!_removeReference)
-			CompilerUtils(m_context).copyToStackTop(sizeOnStack(), sizeOnStack());
-		ArrayUtils(m_context).clearArray(dynamic_cast<ArrayType const&>(*m_dataType));
-	}
-	else if (m_dataType->category() == Type::Category::Struct)
-	{
-		// stack layout: storage_key storage_offset
-		// @todo this can be improved: use StorageItem for non-value types, and just store 0 in
-		// all slots that contain value types later.
-		auto const& structType = dynamic_cast<StructType const&>(*m_dataType);
-		for (auto const& member: structType.members(nullptr))
-		{
-			// zero each member that is not a mapping
-			Type const* memberType = member.type;
-			if (memberType->category() == Type::Category::Mapping)
-				continue;
-			std::pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member.name);
-			m_context
-				<< offsets.first << Instruction::DUP3 << Instruction::ADD
-				<< u256(offsets.second);
-			StorageItem(m_context, *memberType).setToZero();
-		}
-		if (_removeReference)
-			m_context << Instruction::POP << Instruction::POP;
-	}
-	else
-	{
-		solAssert(m_dataType->isValueType(), "Clearing of unsupported type requested: " + m_dataType->toString());
-		if (!_removeReference)
-			CompilerUtils(m_context).copyToStackTop(sizeOnStack(), sizeOnStack());
-		if (m_dataType->storageBytes() == 32)
-		{
-			// offset should be zero
-			m_context
-				<< Instruction::POP << u256(0)
-				<< Instruction::SWAP1 << Instruction::SSTORE;
-		}
-		else
-		{
-			m_context << u256(0x100) << Instruction::EXP;
-			// stack: storage_ref multiplier
-			// fetch old value
-			m_context << Instruction::DUP2 << Instruction::SLOAD;
-			// stack: storage_ref multiplier old_full_value
-			// clear bytes in old value
-			m_context
-				<< Instruction::SWAP1 << ((u256(1) << (8 * m_dataType->storageBytes())) - 1)
-				<< Instruction::MUL;
-			m_context << Instruction::NOT << Instruction::AND;
-			// stack: storage_ref cleared_value
-			m_context << Instruction::SWAP1 << Instruction::SSTORE;
-		}
-	}
-}
-
-StorageByteArrayElement::StorageByteArrayElement(CompilerContext& _compilerContext):
-	LValue(_compilerContext, TypeProvider::byte())
-{
-}
-
-void StorageByteArrayElement::retrieveValue(SourceLocation const&, bool _remove) const
-{
-	// stack: ref byte_number
-	if (_remove)
-		m_context << Instruction::SWAP1 << Instruction::SLOAD
-			<< Instruction::SWAP1 << Instruction::BYTE;
-	else
-		m_context << Instruction::DUP2 << Instruction::SLOAD
-			<< Instruction::DUP2 << Instruction::BYTE;
-	m_context << (u256(1) << (256 - 8)) << Instruction::MUL;
-}
-
-void StorageByteArrayElement::storeValue(Type const&, SourceLocation const&, bool _move) const
-{
-	// stack: value ref byte_number
-	m_context << u256(31) << Instruction::SUB << u256(0x100) << Instruction::EXP;
-	// stack: value ref (1<<(8*(31-byte_number)))
-	m_context << Instruction::DUP2 << Instruction::SLOAD;
-	// stack: value ref (1<<(8*(31-byte_number))) old_full_value
-	// clear byte in old value
-	m_context << Instruction::DUP2 << u256(0xff) << Instruction::MUL
-		<< Instruction::NOT << Instruction::AND;
-	// stack: value ref (1<<(32-byte_number)) old_full_value_with_cleared_byte
-	m_context << Instruction::SWAP1;
-	m_context << (u256(1) << (256 - 8)) << Instruction::DUP5 << Instruction::DIV
-		<< Instruction::MUL << Instruction::OR;
-	// stack: value ref new_full_value
-	m_context << Instruction::SWAP1 << Instruction::SSTORE;
-	if (_move)
-		m_context << Instruction::POP;
-}
-
-void StorageByteArrayElement::setToZero(SourceLocation const&, bool _removeReference) const
-{
-	// stack: ref byte_number
-	solAssert(_removeReference, "");
-	m_context << u256(31) << Instruction::SUB << u256(0x100) << Instruction::EXP;
-	// stack: ref (1<<(8*(31-byte_number)))
-	m_context << Instruction::DUP2 << Instruction::SLOAD;
-	// stack: ref (1<<(8*(31-byte_number))) old_full_value
-	// clear byte in old value
-	m_context << Instruction::SWAP1 << u256(0xff) << Instruction::MUL;
-	m_context << Instruction::NOT << Instruction::AND;
-	// stack: ref old_full_value_with_cleared_byte
-	m_context << Instruction::SWAP1 << Instruction::SSTORE;
-}
-
-TupleObject::TupleObject(
-	CompilerContext& _compilerContext,
-	std::vector<std::unique_ptr<LValue>>&& _lvalues
-):
-	LValue(_compilerContext), m_lvalues(std::move(_lvalues))
-{
-}
-
-unsigned TupleObject::sizeOnStack() const
-{
-	unsigned size = 0;
-	for (auto const& lv: m_lvalues)
-		if (lv)
-			size += lv->sizeOnStack();
-	return size;
-}
-
-void TupleObject::retrieveValue(SourceLocation const&, bool) const
-{
-	solAssert(false, "Tried to retrieve value of tuple.");
-}
-
-void TupleObject::storeValue(Type const& _sourceType, SourceLocation const& _location, bool) const
-{
-	// values are below the lvalue references
-	unsigned valuePos = sizeOnStack();
-	TypePointers const& valueTypes = dynamic_cast<TupleType const&>(_sourceType).components();
-	solAssert(valueTypes.size() == m_lvalues.size(), "");
-	// valuePos .... refPos ...
-	// We will assign from right to left to optimize stack layout.
-	for (size_t i = 0; i < m_lvalues.size(); ++i)
-	{
-		std::unique_ptr<LValue> const& lvalue = m_lvalues[m_lvalues.size() - i - 1];
-		Type const* valType = valueTypes[valueTypes.size() - i - 1];
-		unsigned stackHeight = m_context.stackHeight();
-		solAssert(!valType == !lvalue, "");
-		if (!lvalue)
-			continue;
-		valuePos += valType->sizeOnStack();
-		// copy value to top
-		CompilerUtils(m_context).copyToStackTop(valuePos, valType->sizeOnStack());
-		// move lvalue ref above value
-		CompilerUtils(m_context).moveToStackTop(valType->sizeOnStack(), lvalue->sizeOnStack());
-		lvalue->storeValue(*valType, _location, true);
-		valuePos += m_context.stackHeight() - stackHeight;
-	}
-	// As the type of an assignment to a tuple type is the empty tuple, we always move.
-	CompilerUtils(m_context).popStackElement(_sourceType);
-}
-
-void TupleObject::setToZero(SourceLocation const&, bool) const
-{
-	solAssert(false, "Tried to delete tuple.");
-}
diff --git a/libsolidity/codegen/LValue.h b/libsolidity/codegen/LValue.h
deleted file mode 100644
index 9bf0d1c05c0c..000000000000
--- a/libsolidity/codegen/LValue.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * LValues for use in the expression compiler.
- */
-
-#pragma once
-
-#include <libsolidity/codegen/ArrayUtils.h>
-#include <libsolutil/Common.h>
-#include <liblangutil/SourceLocation.h>
-#include <memory>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-class Declaration;
-class Type;
-class TupleType;
-class ArrayType;
-class CompilerContext;
-class VariableDeclaration;
-
-/**
- * Abstract class used to retrieve, delete and store data in lvalues/variables.
- */
-class LValue
-{
-protected:
-	explicit LValue(CompilerContext& _compilerContext, Type const* _dataType = nullptr):
-		m_context(_compilerContext), m_dataType(_dataType) {}
-
-public:
-	virtual ~LValue() = default;
-	/// @returns the number of stack slots occupied by the lvalue reference
-	virtual unsigned sizeOnStack() const { return 1; }
-	/// Copies the value of the current lvalue to the top of the stack and, if @a _remove is true,
-	/// also removes the reference from the stack.
-	/// @a _location source location of the current expression, used for error reporting.
-	virtual void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const = 0;
-	/// Moves a value from the stack to the lvalue. Removes the value if @a _move is true.
-	/// @a _location is the source location of the expression that caused this operation.
-	/// Stack pre: value [lvalue_ref]
-	/// Stack post: if !_move: value_of(lvalue_ref)
-	virtual void storeValue(Type const& _sourceType,
-		langutil::SourceLocation const& _location = {}, bool _move = false) const = 0;
-	/// Stores zero in the lvalue. Removes the reference from the stack if @a _removeReference is true.
-	/// @a _location is the source location of the requested operation
-	virtual void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const = 0;
-
-protected:
-	CompilerContext& m_context;
-	Type const* m_dataType;
-};
-
-/**
- * Local variable that is completely stored on the stack.
- */
-class StackVariable: public LValue
-{
-public:
-	StackVariable(CompilerContext& _compilerContext, VariableDeclaration const& _declaration);
-
-	unsigned sizeOnStack() const override { return 0; }
-	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
-	void storeValue(
-		Type const& _sourceType,
-		langutil::SourceLocation const& _location = {},
-		bool _move = false
-	) const override;
-	void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const override;
-
-private:
-	/// Base stack offset (@see CompilerContext::baseStackOffsetOfVariable) of the local variable.
-	unsigned m_baseStackOffset;
-	/// Number of stack elements occupied by the value (not the reference).
-	unsigned m_size;
-};
-
-/**
- * Reference to some item in memory.
- */
-class MemoryItem: public LValue
-{
-public:
-	MemoryItem(CompilerContext& _compilerContext, Type const& _type, bool _padded = true);
-	unsigned sizeOnStack() const override { return 1; }
-	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
-	void storeValue(
-		Type const& _sourceType,
-		langutil::SourceLocation const& _location = {},
-		bool _move = false
-	) const override;
-	void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const override;
-private:
-	/// Special flag to deal with byte array elements.
-	bool m_padded = false;
-};
-
-/**
- * Reference to an immutable variable. During contract creation this refers to a location in memory. At the
- * end of contract creation the values from these memory locations are copied into all occurrences of the immutable
- * variable in the runtime code.
- */
-class ImmutableItem: public LValue
-{
-public:
-	ImmutableItem(CompilerContext& _compilerContext, VariableDeclaration const& _variable);
-	unsigned sizeOnStack() const override { return 0; }
-	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
-	void storeValue(
-		Type const& _sourceType,
-		langutil::SourceLocation const& _location = {},
-		bool _move = false
-	) const override;
-	void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const override;
-private:
-	VariableDeclaration const& m_variable;
-};
-
-/**
- * Reference to some item in storage. On the stack this is <storage key> <offset_inside_value>,
- * where 0 <= offset_inside_value < 32 and an offset of i means that the value is multiplied
- * by 2**i before storing it.
- */
-class StorageItem: public LValue
-{
-public:
-	/// Constructs the LValue and pushes the location of @a _declaration onto the stack.
-	StorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration);
-	/// Constructs the LValue and assumes that the storage reference is already on the stack.
-	StorageItem(CompilerContext& _compilerContext, Type const& _type);
-	unsigned sizeOnStack() const override { return 2; }
-	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
-	void storeValue(
-		Type const& _sourceType,
-		langutil::SourceLocation const& _location = {},
-		bool _move = false
-	) const override;
-	void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const override;
-};
-
-/**
- * Reference to a single byte inside a storage byte array.
- * Stack: <storage_ref> <byte_number>
- */
-class StorageByteArrayElement: public LValue
-{
-public:
-	/// Constructs the LValue and assumes that the storage reference is already on the stack.
-	StorageByteArrayElement(CompilerContext& _compilerContext);
-	unsigned sizeOnStack() const override { return 2; }
-	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
-	void storeValue(
-		Type const& _sourceType,
-		langutil::SourceLocation const& _location = {},
-		bool _move = false
-	) const override;
-	void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const override;
-};
-
-/**
- * Tuple object that can itself hold several LValues.
- */
-class TupleObject: public LValue
-{
-public:
-	/// Constructs the LValue assuming that the other LValues are present on the stack.
-	/// Empty unique_ptrs are possible if e.g. some values should be ignored during assignment.
-	TupleObject(CompilerContext& _compilerContext, std::vector<std::unique_ptr<LValue>>&& _lvalues);
-	unsigned sizeOnStack() const override;
-	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
-	void storeValue(
-		Type const& _sourceType,
-		langutil::SourceLocation const& _location = {},
-		bool _move = false
-	) const override;
-	void setToZero(
-		langutil::SourceLocation const& _location = {},
-		bool _removeReference = true
-	) const override;
-
-private:
-	std::vector<std::unique_ptr<LValue>> m_lvalues;
-};
-
-}
diff --git a/libsolidity/codegen/MultiUseYulFunctionCollector.cpp b/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
deleted file mode 100644
index 306f65121964..000000000000
--- a/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Container of (unparsed) Yul functions identified by name which are meant to be generated
- * only once.
- */
-
-#include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
-
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StringUtils.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::util;
-
-std::string MultiUseYulFunctionCollector::requestedFunctions()
-{
-	std::string result = std::move(m_code);
-	m_code.clear();
-	m_requestedFunctions.clear();
-	return result;
-}
-
-std::string MultiUseYulFunctionCollector::createFunction(std::string const& _name, std::function<std::string()> const& _creator)
-{
-	if (!m_requestedFunctions.count(_name))
-	{
-		m_requestedFunctions.insert(_name);
-		std::string fun = _creator();
-		solAssert(!fun.empty(), "");
-		solAssert(fun.find("function " + _name + "(") != std::string::npos, "Function not properly named.");
-		m_code += std::move(fun);
-	}
-	return _name;
-}
-
-std::string MultiUseYulFunctionCollector::createFunction(
-	std::string const& _name,
-	std::function<std::string(std::vector<std::string>&, std::vector<std::string>&)> const& _creator
-)
-{
-	solAssert(!_name.empty(), "");
-	if (!m_requestedFunctions.count(_name))
-	{
-		m_requestedFunctions.insert(_name);
-		std::vector<std::string> arguments;
-		std::vector<std::string> returnParameters;
-		std::string body = _creator(arguments, returnParameters);
-		solAssert(!body.empty(), "");
-
-		m_code += Whiskers(R"(
-			function <functionName>(<args>)<?+retParams> -> <retParams></+retParams> {
-				<body>
-			}
-		)")
-		("functionName", _name)
-		("args", joinHumanReadable(arguments))
-		("retParams", joinHumanReadable(returnParameters))
-		("body", body)
-		.render();
-	}
-	return _name;
-}
diff --git a/libsolidity/codegen/MultiUseYulFunctionCollector.h b/libsolidity/codegen/MultiUseYulFunctionCollector.h
deleted file mode 100644
index 050b5858f215..000000000000
--- a/libsolidity/codegen/MultiUseYulFunctionCollector.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Container of (unparsed) Yul functions identified by name which are meant to be generated
- * only once.
- */
-
-#pragma once
-
-#include <functional>
-#include <map>
-#include <string>
-#include <set>
-
-namespace solidity::frontend
-{
-
-/**
- * Container of (unparsed) Yul functions identified by name which are meant to be generated
- * only once.
- */
-class MultiUseYulFunctionCollector
-{
-public:
-	/// Helper function that uses @a _creator to create a function and add it to
-	/// @a m_requestedFunctions if it has not been created yet and returns @a _name in both
-	/// cases.
-	std::string createFunction(std::string const& _name, std::function<std::string()> const& _creator);
-
-	std::string createFunction(
-		std::string const& _name,
-		std::function<std::string(std::vector<std::string>&, std::vector<std::string>&)> const& _creator
-	);
-
-	/// @returns concatenation of all generated functions in the order in which they were
-	/// generated.
-	/// Clears the internal list, i.e. calling it again will result in an
-	/// empty return value.
-	std::string requestedFunctions();
-
-	/// @returns true IFF a function with the specified name has already been collected.
-	bool contains(std::string const& _name) const { return m_requestedFunctions.count(_name) > 0; }
-
-private:
-	std::set<std::string> m_requestedFunctions;
-	std::string m_code;
-};
-
-}
diff --git a/libsolidity/codegen/ReturnInfo.cpp b/libsolidity/codegen/ReturnInfo.cpp
deleted file mode 100644
index 28518d9b2a9a..000000000000
--- a/libsolidity/codegen/ReturnInfo.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/codegen/ReturnInfo.h>
-
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/AST.h>
-
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-ReturnInfo::ReturnInfo(EVMVersion const& _evmVersion, FunctionType const& _functionType)
-{
-	FunctionType::Kind const funKind = _functionType.kind();
-	bool const haveReturndatacopy = _evmVersion.supportsReturndata();
-	bool const returnSuccessConditionAndReturndata =
-		funKind == FunctionType::Kind::BareCall ||
-		funKind == FunctionType::Kind::BareDelegateCall ||
-		funKind == FunctionType::Kind::BareStaticCall;
-
-	if (!returnSuccessConditionAndReturndata)
-	{
-		if (haveReturndatacopy)
-			returnTypes = _functionType.returnParameterTypes();
-		else
-			returnTypes = _functionType.returnParameterTypesWithoutDynamicTypes();
-
-		for (auto const& retType: returnTypes)
-		{
-			solAssert(retType->decodingType(), "");
-			if (retType->decodingType()->isDynamicallyEncoded())
-			{
-				solAssert(haveReturndatacopy, "");
-				dynamicReturnSize = true;
-				estimatedReturnSize = 0;
-				break;
-			}
-			else
-				estimatedReturnSize += retType->decodingType()->calldataEncodedSize();
-		}
-	}
-	if (dynamicReturnSize)
-		solAssert(estimatedReturnSize == 0);
-}
diff --git a/libsolidity/codegen/ReturnInfo.h b/libsolidity/codegen/ReturnInfo.h
deleted file mode 100644
index 85a9255e0123..000000000000
--- a/libsolidity/codegen/ReturnInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that computes information relevant during decoding an external function
- * call's return values.
- */
-#pragma once
-
-#include <liblangutil/EVMVersion.h>
-#include <libsolidity/ast/Types.h>
-
-namespace solidity::frontend
-{
-
-/**
- * Computes and holds information relevant during decoding an external function
- * call's return values.
- */
-struct ReturnInfo
-{
-	ReturnInfo(langutil::EVMVersion const& _evmVersion, FunctionType const& _functionType);
-
-	/// Vector of Type const*, for each return variable. Dynamic types are already replaced if required.
-	TypePointers returnTypes = {};
-
-	/// Boolean, indicating whether or not return size is only known at runtime.
-	bool dynamicReturnSize = false;
-
-	/// Contains the at compile time estimated return size.
-	unsigned estimatedReturnSize = 0;
-};
-
-}
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
deleted file mode 100644
index 5ff5ac4f3b98..000000000000
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ /dev/null
@@ -1,4651 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that can generate various useful Yul functions.
- */
-
-#include <libsolidity/codegen/YulUtilFunctions.h>
-
-#include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace std::string_literals;
-
-std::string YulUtilFunctions::identityFunction()
-{
-	std::string functionName = "identity";
-	return m_functionCollector.createFunction("identity", [&](std::vector<std::string>& _args, std::vector<std::string>& _rets) {
-		_args.push_back("value");
-		_rets.push_back("ret");
-		return "ret := value";
-	});
-}
-
-std::string YulUtilFunctions::combineExternalFunctionIdFunction()
-{
-	std::string functionName = "combine_external_function_id";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(addr, selector) -> combined {
-				combined := <shl64>(or(<shl32>(addr), and(selector, 0xffffffff)))
-			}
-		)")
-		("functionName", functionName)
-		("shl32", shiftLeftFunction(32))
-		("shl64", shiftLeftFunction(64))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::splitExternalFunctionIdFunction()
-{
-	std::string functionName = "split_external_function_id";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(combined) -> addr, selector {
-				combined := <shr64>(combined)
-				selector := and(combined, 0xffffffff)
-				addr := <shr32>(combined)
-			}
-		)")
-		("functionName", functionName)
-		("shr32", shiftRightFunction(32))
-		("shr64", shiftRightFunction(64))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cleanup)
-{
-	std::string functionName =
-		"copy_"s +
-		(_fromCalldata ? "calldata"s : "memory"s) +
-		"_to_memory"s +
-		(_cleanup ? "_with_cleanup"s : ""s);
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (_fromCalldata)
-		{
-			return Whiskers(R"(
-				function <functionName>(src, dst, length) {
-					calldatacopy(dst, src, length)
-					<?cleanup>mstore(add(dst, length), 0)</cleanup>
-				}
-			)")
-			("functionName", functionName)
-			("cleanup", _cleanup)
-			.render();
-		}
-		else
-		{
-			return Whiskers(R"(
-				function <functionName>(src, dst, length) {
-					let i := 0
-					for { } lt(i, length) { i := add(i, 32) }
-					{
-						mstore(add(dst, i), mload(add(src, i)))
-					}
-					<?cleanup>mstore(add(dst, length), 0)</cleanup>
-				}
-			)")
-			("functionName", functionName)
-			("cleanup", _cleanup)
-			.render();
-		}
-	});
-}
-
-std::string YulUtilFunctions::copyLiteralToMemoryFunction(std::string const& _literal)
-{
-	std::string functionName = "copy_literal_to_memory_" + util::toHex(util::keccak256(_literal).asBytes());
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>() -> memPtr {
-				memPtr := <arrayAllocationFunction>(<size>)
-				<storeLiteralInMem>(add(memPtr, 32))
-			}
-			)")
-			("functionName", functionName)
-			("arrayAllocationFunction", allocateMemoryArrayFunction(*TypeProvider::array(DataLocation::Memory, true)))
-			("size", std::to_string(_literal.size()))
-			("storeLiteralInMem", storeLiteralInMemoryFunction(_literal))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::storeLiteralInMemoryFunction(std::string const& _literal)
-{
-	std::string functionName = "store_literal_in_memory_" + util::toHex(util::keccak256(_literal).asBytes());
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		size_t words = (_literal.length() + 31) / 32;
-		std::vector<std::map<std::string, std::string>> wordParams(words);
-		for (size_t i = 0; i < words; ++i)
-		{
-			wordParams[i]["offset"] = std::to_string(i * 32);
-			wordParams[i]["wordValue"] = formatAsStringOrNumber(_literal.substr(32 * i, 32));
-		}
-
-		return Whiskers(R"(
-			function <functionName>(memPtr) {
-				<#word>
-					mstore(add(memPtr, <offset>), <wordValue>)
-				</word>
-			}
-			)")
-			("functionName", functionName)
-			("word", wordParams)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::copyLiteralToStorageFunction(std::string const& _literal)
-{
-	std::string functionName = "copy_literal_to_storage_" + util::toHex(util::keccak256(_literal).asBytes());
-
-	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
-		_args = {"slot"};
-
-		if (_literal.size() >= 32)
-		{
-			size_t words = (_literal.length() + 31) / 32;
-			std::vector<std::map<std::string, std::string>> wordParams(words);
-			for (size_t i = 0; i < words; ++i)
-			{
-				wordParams[i]["offset"] = std::to_string(i);
-				wordParams[i]["wordValue"] = formatAsStringOrNumber(_literal.substr(32 * i, 32));
-			}
-			return Whiskers(R"(
-				let oldLen := <byteArrayLength>(sload(slot))
-				<cleanUpArrayEnd>(slot, oldLen, <length>)
-				sstore(slot, <encodedLen>)
-				let dstPtr := <dataArea>(slot)
-				<#word>
-					sstore(add(dstPtr, <offset>), <wordValue>)
-				</word>
-			)")
-			("byteArrayLength", extractByteArrayLengthFunction())
-			("cleanUpArrayEnd", cleanUpDynamicByteArrayEndSlotsFunction(*TypeProvider::bytesStorage()))
-			("dataArea", arrayDataAreaFunction(*TypeProvider::bytesStorage()))
-			("word", wordParams)
-			("length", std::to_string(_literal.size()))
-			("encodedLen", std::to_string(2 * _literal.size() + 1))
-			.render();
-		}
-		else
-			return Whiskers(R"(
-				let oldLen := <byteArrayLength>(sload(slot))
-				<cleanUpArrayEnd>(slot, oldLen, <length>)
-				sstore(slot, add(<wordValue>, <encodedLen>))
-			)")
-			("byteArrayLength", extractByteArrayLengthFunction())
-			("cleanUpArrayEnd", cleanUpDynamicByteArrayEndSlotsFunction(*TypeProvider::bytesStorage()))
-			("wordValue", formatAsStringOrNumber(_literal))
-			("length", std::to_string(_literal.size()))
-			("encodedLen", std::to_string(2 * _literal.size()))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _messageType)
-{
-	std::string functionName =
-		std::string(_assert ? "assert_helper" : "require_helper") +
-		(_messageType ? ("_" + _messageType->identifier()) : "");
-
-	solAssert(!_assert || !_messageType, "Asserts can't have messages!");
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (!_messageType)
-			return Whiskers(R"(
-				function <functionName>(condition) {
-					if iszero(condition) { <error> }
-				}
-			)")
-			("error", _assert ? panicFunction(PanicCode::Assert) + "()" : "revert(0, 0)")
-			("functionName", functionName)
-			.render();
-
-		int const hashHeaderSize = 4;
-		u256 const errorHash = util::selectorFromSignatureU256("Error(string)");
-
-		std::string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
-			.tupleEncoder(
-				{_messageType},
-				{TypeProvider::stringMemory()}
-			);
-
-		return Whiskers(R"(
-			function <functionName>(condition <messageVars>) {
-				if iszero(condition) {
-					let memPtr := <allocateUnbounded>()
-					mstore(memPtr, <errorHash>)
-					let end := <abiEncodeFunc>(add(memPtr, <hashHeaderSize>) <messageVars>)
-					revert(memPtr, sub(end, memPtr))
-				}
-			}
-		)")
-		("functionName", functionName)
-		("allocateUnbounded", allocateUnboundedFunction())
-		("errorHash", formatNumber(errorHash))
-		("abiEncodeFunc", encodeFunc)
-		("hashHeaderSize", std::to_string(hashHeaderSize))
-		("messageVars",
-			(_messageType->sizeOnStack() > 0 ? ", " : "") +
-			suffixedVariableNameList("message_", 1, 1 + _messageType->sizeOnStack())
-		)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::leftAlignFunction(Type const& _type)
-{
-	std::string functionName = std::string("leftAlign_") + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(value) -> aligned {
-				<body>
-			}
-		)");
-		templ("functionName", functionName);
-		switch (_type.category())
-		{
-		case Type::Category::Address:
-			templ("body", "aligned := " + leftAlignFunction(IntegerType(160)) + "(value)");
-			break;
-		case Type::Category::Integer:
-		{
-			IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-			if (type.numBits() == 256)
-				templ("body", "aligned := value");
-			else
-				templ("body", "aligned := " + shiftLeftFunction(256 - type.numBits()) + "(value)");
-			break;
-		}
-		case Type::Category::RationalNumber:
-			solAssert(false, "Left align requested for rational number.");
-			break;
-		case Type::Category::Bool:
-			templ("body", "aligned := " + leftAlignFunction(IntegerType(8)) + "(value)");
-			break;
-		case Type::Category::FixedPoint:
-			solUnimplemented("Fixed point types not implemented.");
-			break;
-		case Type::Category::Array:
-		case Type::Category::Struct:
-			solAssert(false, "Left align requested for non-value type.");
-			break;
-		case Type::Category::FixedBytes:
-			templ("body", "aligned := value");
-			break;
-		case Type::Category::Contract:
-			templ("body", "aligned := " + leftAlignFunction(*TypeProvider::address()) + "(value)");
-			break;
-		case Type::Category::Enum:
-		{
-			solAssert(dynamic_cast<EnumType const&>(_type).storageBytes() == 1, "");
-			templ("body", "aligned := " + leftAlignFunction(IntegerType(8)) + "(value)");
-			break;
-		}
-		case Type::Category::InaccessibleDynamic:
-			solAssert(false, "Left align requested for inaccessible dynamic type.");
-			break;
-		default:
-			solAssert(false, "Left align of type " + _type.identifier() + " requested.");
-		}
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::shiftLeftFunction(size_t _numBits)
-{
-	solAssert(_numBits < 256, "");
-
-	std::string functionName = "shift_left_" + std::to_string(_numBits);
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value) -> newValue {
-				newValue :=
-				<?hasShifts>
-					shl(<numBits>, value)
-				<!hasShifts>
-					mul(value, <multiplier>)
-				</hasShifts>
-			}
-			)")
-			("functionName", functionName)
-			("numBits", std::to_string(_numBits))
-			("hasShifts", m_evmVersion.hasBitwiseShifting())
-			("multiplier", toCompactHexWithPrefix(u256(1) << _numBits))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::shiftLeftFunctionDynamic()
-{
-	std::string functionName = "shift_left_dynamic";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(bits, value) -> newValue {
-				newValue :=
-				<?hasShifts>
-					shl(bits, value)
-				<!hasShifts>
-					mul(value, exp(2, bits))
-				</hasShifts>
-			}
-			)")
-			("functionName", functionName)
-			("hasShifts", m_evmVersion.hasBitwiseShifting())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::shiftRightFunction(size_t _numBits)
-{
-	solAssert(_numBits < 256, "");
-
-	// Note that if this is extended with signed shifts,
-	// the opcodes SAR and SDIV behave differently with regards to rounding!
-
-	std::string functionName = "shift_right_" + std::to_string(_numBits) + "_unsigned";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value) -> newValue {
-				newValue :=
-				<?hasShifts>
-					shr(<numBits>, value)
-				<!hasShifts>
-					div(value, <multiplier>)
-				</hasShifts>
-			}
-			)")
-			("functionName", functionName)
-			("hasShifts", m_evmVersion.hasBitwiseShifting())
-			("numBits", std::to_string(_numBits))
-			("multiplier", toCompactHexWithPrefix(u256(1) << _numBits))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::shiftRightFunctionDynamic()
-{
-	std::string const functionName = "shift_right_unsigned_dynamic";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(bits, value) -> newValue {
-				newValue :=
-				<?hasShifts>
-					shr(bits, value)
-				<!hasShifts>
-					div(value, exp(2, bits))
-				</hasShifts>
-			}
-			)")
-			("functionName", functionName)
-			("hasShifts", m_evmVersion.hasBitwiseShifting())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::shiftRightSignedFunctionDynamic()
-{
-	std::string const functionName = "shift_right_signed_dynamic";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(bits, value) -> result {
-				<?hasShifts>
-					result := sar(bits, value)
-				<!hasShifts>
-					let divisor := exp(2, bits)
-					let xor_mask := sub(0, slt(value, 0))
-					result := xor(div(xor(value, xor_mask), divisor), xor_mask)
-					// combined version of
-					//   switch slt(value, 0)
-					//   case 0 { result := div(value, divisor) }
-					//   default { result := not(div(not(value), divisor)) }
-				</hasShifts>
-			}
-			)")
-			("functionName", functionName)
-			("hasShifts", m_evmVersion.hasBitwiseShifting())
-			.render();
-	});
-}
-
-
-std::string YulUtilFunctions::typedShiftLeftFunction(Type const& _type, Type const& _amountType)
-{
-	solUnimplementedAssert(_type.category() != Type::Category::FixedPoint, "Not yet implemented - FixedPointType.");
-	solAssert(_type.category() == Type::Category::FixedBytes || _type.category() == Type::Category::Integer, "");
-	solAssert(_amountType.category() == Type::Category::Integer, "");
-	solAssert(!dynamic_cast<IntegerType const&>(_amountType).isSigned(), "");
-	std::string const functionName = "shift_left_" + _type.identifier() + "_" + _amountType.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value, bits) -> result {
-				bits := <cleanAmount>(bits)
-				result := <cleanup>(<shift>(bits, <cleanup>(value)))
-			}
-			)")
-			("functionName", functionName)
-			("cleanAmount", cleanupFunction(_amountType))
-			("shift", shiftLeftFunctionDynamic())
-			("cleanup", cleanupFunction(_type))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::typedShiftRightFunction(Type const& _type, Type const& _amountType)
-{
-	solUnimplementedAssert(_type.category() != Type::Category::FixedPoint, "Not yet implemented - FixedPointType.");
-	solAssert(_type.category() == Type::Category::FixedBytes || _type.category() == Type::Category::Integer, "");
-	solAssert(_amountType.category() == Type::Category::Integer, "");
-	solAssert(!dynamic_cast<IntegerType const&>(_amountType).isSigned(), "");
-	IntegerType const* integerType = dynamic_cast<IntegerType const*>(&_type);
-	bool valueSigned = integerType && integerType->isSigned();
-
-	std::string const functionName = "shift_right_" + _type.identifier() + "_" + _amountType.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value, bits) -> result {
-				bits := <cleanAmount>(bits)
-				result := <cleanup>(<shift>(bits, <cleanup>(value)))
-			}
-			)")
-			("functionName", functionName)
-			("cleanAmount", cleanupFunction(_amountType))
-			("shift", valueSigned ? shiftRightSignedFunctionDynamic() : shiftRightFunctionDynamic())
-			("cleanup", cleanupFunction(_type))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::updateByteSliceFunction(size_t _numBytes, size_t _shiftBytes)
-{
-	solAssert(_numBytes <= 32, "");
-	solAssert(_shiftBytes <= 32, "");
-	size_t numBits = _numBytes * 8;
-	size_t shiftBits = _shiftBytes * 8;
-	std::string functionName = "update_byte_slice_" + std::to_string(_numBytes) + "_shift_" + std::to_string(_shiftBytes);
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value, toInsert) -> result {
-				let mask := <mask>
-				toInsert := <shl>(toInsert)
-				value := and(value, not(mask))
-				result := or(value, and(toInsert, mask))
-			}
-			)")
-			("functionName", functionName)
-			("mask", formatNumber(((bigint(1) << numBits) - 1) << shiftBits))
-			("shl", shiftLeftFunction(shiftBits))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::updateByteSliceFunctionDynamic(size_t _numBytes)
-{
-	solAssert(_numBytes <= 32, "");
-	size_t numBits = _numBytes * 8;
-	std::string functionName = "update_byte_slice_dynamic" + std::to_string(_numBytes);
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value, shiftBytes, toInsert) -> result {
-				let shiftBits := mul(shiftBytes, 8)
-				let mask := <shl>(shiftBits, <mask>)
-				toInsert := <shl>(shiftBits, toInsert)
-				value := and(value, not(mask))
-				result := or(value, and(toInsert, mask))
-			}
-			)")
-			("functionName", functionName)
-			("mask", formatNumber((bigint(1) << numBits) - 1))
-			("shl", shiftLeftFunctionDynamic())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::maskBytesFunctionDynamic()
-{
-	std::string functionName = "mask_bytes_dynamic";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(data, bytes) -> result {
-				let mask := not(<shr>(mul(8, bytes), not(0)))
-				result := and(data, mask)
-			})")
-			("functionName", functionName)
-			("shr", shiftRightFunctionDynamic())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::maskLowerOrderBytesFunction(size_t _bytes)
-{
-	std::string functionName = "mask_lower_order_bytes_" + std::to_string(_bytes);
-	solAssert(_bytes <= 32, "");
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(data) -> result {
-				result := and(data, <mask>)
-			})")
-			("functionName", functionName)
-			("mask", formatNumber((~u256(0)) >> (256 - 8 * _bytes)))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::maskLowerOrderBytesFunctionDynamic()
-{
-	std::string functionName = "mask_lower_order_bytes_dynamic";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(data, bytes) -> result {
-				let mask := not(<shl>(mul(8, bytes), not(0)))
-				result := and(data, mask)
-			})")
-			("functionName", functionName)
-			("shl", shiftLeftFunctionDynamic())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::roundUpFunction()
-{
-	std::string functionName = "round_up_to_mul_of_32";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(value) -> result {
-				result := and(add(value, 31), not(31))
-			}
-			)")
-			("functionName", functionName)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::divide32CeilFunction()
-{
-	return m_functionCollector.createFunction(
-		"divide_by_32_ceil",
-		[&](std::vector<std::string>& _args, std::vector<std::string>& _ret) {
-			_args = {"value"};
-			_ret = {"result"};
-			return "result := div(add(value, 31), 32)";
-		}
-	);
-}
-
-std::string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
-{
-	std::string functionName = "checked_add_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> sum {
-				x := <cleanupFunction>(x)
-				y := <cleanupFunction>(y)
-				sum := add(x, y)
-				<?signed>
-					<?256bit>
-						// overflow, if x >= 0 and sum < y
-						// underflow, if x < 0 and sum >= y
-						if or(
-							and(iszero(slt(x, 0)), slt(sum, y)),
-							and(slt(x, 0), iszero(slt(sum, y)))
-						) { <panic>() }
-					<!256bit>
-						if or(
-							sgt(sum, <maxValue>),
-							slt(sum, <minValue>)
-						) { <panic>() }
-					</256bit>
-				<!signed>
-					<?256bit>
-						if gt(x, sum) { <panic>() }
-					<!256bit>
-						if gt(sum, <maxValue>) { <panic>() }
-					</256bit>
-				</signed>
-			}
-			)")
-			("functionName", functionName)
-			("signed", _type.isSigned())
-			("maxValue", toCompactHexWithPrefix(u256(_type.maxValue())))
-			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
-			("cleanupFunction", cleanupFunction(_type))
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("256bit", _type.numBits() == 256)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::wrappingIntAddFunction(IntegerType const& _type)
-{
-	std::string functionName = "wrapping_add_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> sum {
-				sum := <cleanupFunction>(add(x, y))
-			}
-			)")
-			("functionName", functionName)
-			("cleanupFunction", cleanupFunction(_type))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedIntMulFunction(IntegerType const& _type)
-{
-	std::string functionName = "checked_mul_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			// Multiplication by zero could be treated separately and directly return zero.
-			Whiskers(R"(
-			function <functionName>(x, y) -> product {
-				x := <cleanupFunction>(x)
-				y := <cleanupFunction>(y)
-				let product_raw := mul(x, y)
-				product := <cleanupFunction>(product_raw)
-				<?signed>
-					<?gt128bit>
-						<?256bit>
-							// special case
-							if and(slt(x, 0), eq(y, <minValue>)) { <panic>() }
-						</256bit>
-						// overflow, if x != 0 and y != product/x
-						if iszero(
-							or(
-								iszero(x),
-								eq(y, sdiv(product, x))
-							)
-						) { <panic>() }
-					<!gt128bit>
-						if iszero(eq(product, product_raw)) { <panic>() }
-					</gt128bit>
-				<!signed>
-					<?gt128bit>
-						// overflow, if x != 0 and y != product/x
-						if iszero(
-							or(
-								iszero(x),
-								eq(y, div(product, x))
-							)
-						) { <panic>() }
-					<!gt128bit>
-						if iszero(eq(product, product_raw)) { <panic>() }
-					</gt128bit>
-				</signed>
-			}
-			)")
-			("functionName", functionName)
-			("signed", _type.isSigned())
-			("cleanupFunction", cleanupFunction(_type))
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
-			("256bit", _type.numBits() == 256)
-			("gt128bit", _type.numBits() > 128)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::wrappingIntMulFunction(IntegerType const& _type)
-{
-	std::string functionName = "wrapping_mul_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> product {
-				product := <cleanupFunction>(mul(x, y))
-			}
-			)")
-			("functionName", functionName)
-			("cleanupFunction", cleanupFunction(_type))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedIntDivFunction(IntegerType const& _type)
-{
-	std::string functionName = "checked_div_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> r {
-				x := <cleanupFunction>(x)
-				y := <cleanupFunction>(y)
-				if iszero(y) { <panicDivZero>() }
-				<?signed>
-				// overflow for minVal / -1
-				if and(
-					eq(x, <minVal>),
-					eq(y, sub(0, 1))
-				) { <panicOverflow>() }
-				</signed>
-				r := <?signed>s</signed>div(x, y)
-			}
-			)")
-			("functionName", functionName)
-			("signed", _type.isSigned())
-			("minVal", toCompactHexWithPrefix(u256(_type.minValue())))
-			("cleanupFunction", cleanupFunction(_type))
-			("panicDivZero", panicFunction(PanicCode::DivisionByZero))
-			("panicOverflow", panicFunction(PanicCode::UnderOverflow))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::wrappingIntDivFunction(IntegerType const& _type)
-{
-	std::string functionName = "wrapping_div_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> r {
-				x := <cleanupFunction>(x)
-				y := <cleanupFunction>(y)
-				if iszero(y) { <error>() }
-				r := <?signed>s</signed>div(x, y)
-			}
-			)")
-			("functionName", functionName)
-			("cleanupFunction", cleanupFunction(_type))
-			("signed", _type.isSigned())
-			("error", panicFunction(PanicCode::DivisionByZero))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::intModFunction(IntegerType const& _type)
-{
-	std::string functionName = "mod_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> r {
-				x := <cleanupFunction>(x)
-				y := <cleanupFunction>(y)
-				if iszero(y) { <panic>() }
-				r := <?signed>s</signed>mod(x, y)
-			}
-			)")
-			("functionName", functionName)
-			("signed", _type.isSigned())
-			("cleanupFunction", cleanupFunction(_type))
-			("panic", panicFunction(PanicCode::DivisionByZero))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
-{
-	std::string functionName = "checked_sub_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&] {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> diff {
-				x := <cleanupFunction>(x)
-				y := <cleanupFunction>(y)
-				diff := sub(x, y)
-				<?signed>
-					<?256bit>
-						// underflow, if y >= 0 and diff > x
-						// overflow, if y < 0 and diff < x
-						if or(
-							and(iszero(slt(y, 0)), sgt(diff, x)),
-							and(slt(y, 0), slt(diff, x))
-						) { <panic>() }
-					<!256bit>
-						if or(
-							slt(diff, <minValue>),
-							sgt(diff, <maxValue>)
-						) { <panic>() }
-					</256bit>
-				<!signed>
-					<?256bit>
-						if gt(diff, x) { <panic>() }
-					<!256bit>
-						if gt(diff, <maxValue>) { <panic>() }
-					</256bit>
-				</signed>
-			}
-			)")
-			("functionName", functionName)
-			("signed", _type.isSigned())
-			("maxValue", toCompactHexWithPrefix(u256(_type.maxValue())))
-			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
-			("cleanupFunction", cleanupFunction(_type))
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("256bit", _type.numBits() == 256)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::wrappingIntSubFunction(IntegerType const& _type)
-{
-	std::string functionName = "wrapping_sub_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&] {
-		return
-			Whiskers(R"(
-			function <functionName>(x, y) -> diff {
-				diff := <cleanupFunction>(sub(x, y))
-			}
-			)")
-			("functionName", functionName)
-			("cleanupFunction", cleanupFunction(_type))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedIntExpFunction(
-	IntegerType const& _type,
-	IntegerType const& _exponentType
-)
-{
-	solAssert(!_exponentType.isSigned(), "");
-
-	std::string functionName = "checked_exp_" + _type.identifier() + "_" + _exponentType.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(base, exponent) -> power {
-				base := <baseCleanupFunction>(base)
-				exponent := <exponentCleanupFunction>(exponent)
-				<?signed>
-					power := <exp>(base, exponent, <minValue>, <maxValue>)
-				<!signed>
-					power := <exp>(base, exponent, <maxValue>)
-				</signed>
-
-			}
-			)")
-			("functionName", functionName)
-			("signed", _type.isSigned())
-			("exp", _type.isSigned() ? overflowCheckedSignedExpFunction() : overflowCheckedUnsignedExpFunction())
-			("maxValue", toCompactHexWithPrefix(_type.max()))
-			("minValue", toCompactHexWithPrefix(_type.min()))
-			("baseCleanupFunction", cleanupFunction(_type))
-			("exponentCleanupFunction", cleanupFunction(_exponentType))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedIntLiteralExpFunction(
-	RationalNumberType const& _baseType,
-	IntegerType const& _exponentType,
-	IntegerType const& _commonType
-)
-{
-	solAssert(!_exponentType.isSigned(), "");
-	solAssert(_baseType.isNegative() == _commonType.isSigned(), "");
-	solAssert(_commonType.numBits() == 256, "");
-
-	std::string functionName = "checked_exp_" + _baseType.richIdentifier() + "_" + _exponentType.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]()
-	{
-		// Converts a bigint number into u256 (negative numbers represented in two's complement form.)
-		// We assume that `_v` fits in 256 bits.
-		auto bigint2u = [&](bigint const& _v) -> u256
-		{
-			if (_v < 0)
-				return s2u(s256(_v));
-			return u256(_v);
-		};
-
-		// Calculates the upperbound for exponentiation, that is, calculate `b`, such that
-		// _base**b <= _maxValue and _base**(b + 1) > _maxValue
-		auto findExponentUpperbound = [](bigint const _base, bigint const _maxValue) -> unsigned
-		{
-			// There is no overflow for these cases
-			if (_base == 0 || _base == -1 || _base == 1)
-				return 0;
-
-			unsigned first = 0;
-			unsigned last = 255;
-			unsigned middle;
-
-			while (first < last)
-			{
-				middle = (first + last) / 2;
-
-				if (
-					// The condition on msb is a shortcut that avoids computing large powers in
-					// arbitrary precision.
-					boost::multiprecision::msb(_base) * middle <= boost::multiprecision::msb(_maxValue) &&
-					boost::multiprecision::pow(_base, middle) <= _maxValue
-				)
-				{
-					if (boost::multiprecision::pow(_base, middle + 1) > _maxValue)
-						return middle;
-					else
-						first = middle + 1;
-				}
-				else
-					last = middle;
-			}
-
-			return last;
-		};
-
-		bigint baseValue = _baseType.isNegative() ?
-			u2s(_baseType.literalValue(nullptr)) :
-			_baseType.literalValue(nullptr);
-		bool needsOverflowCheck = !((baseValue == 0) || (baseValue == -1) || (baseValue == 1));
-		unsigned exponentUpperbound;
-
-		if (_baseType.isNegative())
-		{
-			// Only checks for underflow. The only case where this can be a problem is when, for a
-			// negative base, say `b`, and an even exponent, say `e`, `b**e = 2**255` (which is an
-			// overflow.) But this never happens because, `255 = 3*5*17`, and therefore there is no even
-			// number `e` such that `b**e = 2**255`.
-			exponentUpperbound = findExponentUpperbound(abs(baseValue), abs(_commonType.minValue()));
-
-			bigint power = boost::multiprecision::pow(baseValue, exponentUpperbound);
-			bigint overflowedPower = boost::multiprecision::pow(baseValue, exponentUpperbound + 1);
-
-			if (needsOverflowCheck)
-				solAssert(
-					(power <= _commonType.maxValue()) && (power >= _commonType.minValue()) &&
-					!((overflowedPower <= _commonType.maxValue()) && (overflowedPower >= _commonType.minValue())),
-					"Incorrect exponent upper bound calculated."
-				);
-		}
-		else
-		{
-			exponentUpperbound = findExponentUpperbound(baseValue, _commonType.maxValue());
-
-			if (needsOverflowCheck)
-				solAssert(
-					boost::multiprecision::pow(baseValue, exponentUpperbound) <= _commonType.maxValue() &&
-					boost::multiprecision::pow(baseValue, exponentUpperbound + 1) > _commonType.maxValue(),
-					"Incorrect exponent upper bound calculated."
-				);
-		}
-
-		return Whiskers(R"(
-			function <functionName>(exponent) -> power {
-				exponent := <exponentCleanupFunction>(exponent)
-				<?needsOverflowCheck>
-				if gt(exponent, <exponentUpperbound>) { <panic>() }
-				</needsOverflowCheck>
-				power := exp(<base>, exponent)
-			}
-			)")
-			("functionName", functionName)
-			("exponentCleanupFunction", cleanupFunction(_exponentType))
-			("needsOverflowCheck", needsOverflowCheck)
-			("exponentUpperbound", std::to_string(exponentUpperbound))
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("base", bigint2u(baseValue).str())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedUnsignedExpFunction()
-{
-	// Checks for the "small number specialization" below.
-	using namespace boost::multiprecision;
-	solAssert(pow(bigint(10), 77) < pow(bigint(2), 256), "");
-	solAssert(pow(bigint(11), 77) >= pow(bigint(2), 256), "");
-	solAssert(pow(bigint(10), 78) >= pow(bigint(2), 256), "");
-
-	solAssert(pow(bigint(306), 31) < pow(bigint(2), 256), "");
-	solAssert(pow(bigint(307), 31) >= pow(bigint(2), 256), "");
-	solAssert(pow(bigint(306), 32) >= pow(bigint(2), 256), "");
-
-	std::string functionName = "checked_exp_unsigned";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(base, exponent, max) -> power {
-				// This function currently cannot be inlined because of the
-				// "leave" statements. We have to improve the optimizer.
-
-				// Note that 0**0 == 1
-				if iszero(exponent) { power := 1 leave }
-				if iszero(base) { power := 0 leave }
-
-				// Specializations for small bases
-				switch base
-				// 0 is handled above
-				case 1 { power := 1 leave }
-				case 2
-				{
-					if gt(exponent, 255) { <panic>() }
-					power := exp(2, exponent)
-					if gt(power, max) { <panic>() }
-					leave
-				}
-				if or(
-					and(lt(base, 11), lt(exponent, 78)),
-					and(lt(base, 307), lt(exponent, 32))
-				)
-				{
-					power := exp(base, exponent)
-					if gt(power, max) { <panic>() }
-					leave
-				}
-
-				power, base := <expLoop>(1, base, exponent, max)
-
-				if gt(power, div(max, base)) { <panic>() }
-				power := mul(power, base)
-			}
-			)")
-			("functionName", functionName)
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("expLoop", overflowCheckedExpLoopFunction())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedSignedExpFunction()
-{
-	std::string functionName = "checked_exp_signed";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(base, exponent, min, max) -> power {
-				// Currently, `leave` avoids this function being inlined.
-				// We have to improve the optimizer.
-
-				// Note that 0**0 == 1
-				switch exponent
-				case 0 { power := 1 leave }
-				case 1 { power := base leave }
-				if iszero(base) { power := 0 leave }
-
-				power := 1
-
-				// We pull out the first iteration because it is the only one in which
-				// base can be negative.
-				// Exponent is at least 2 here.
-
-				// overflow check for base * base
-				switch sgt(base, 0)
-				case 1 { if gt(base, div(max, base)) { <panic>() } }
-				case 0 { if slt(base, sdiv(max, base)) { <panic>() } }
-				if and(exponent, 1)
-				{
-					power := base
-				}
-				base := mul(base, base)
-				exponent := <shr_1>(exponent)
-
-				// Below this point, base is always positive.
-
-				power, base := <expLoop>(power, base, exponent, max)
-
-				if and(sgt(power, 0), gt(power, div(max, base))) { <panic>() }
-				if and(slt(power, 0), slt(power, sdiv(min, base))) { <panic>() }
-				power := mul(power, base)
-			}
-			)")
-			("functionName", functionName)
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("expLoop", overflowCheckedExpLoopFunction())
-			("shr_1", shiftRightFunction(1))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::overflowCheckedExpLoopFunction()
-{
-	// We use this loop for both signed and unsigned exponentiation
-	// because we pull out the first iteration in the signed case which
-	// results in the base always being positive.
-
-	// This function does not include the final multiplication.
-
-	std::string functionName = "checked_exp_helper";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(_power, _base, exponent, max) -> power, base {
-				power := _power
-				base  := _base
-				for { } gt(exponent, 1) {}
-				{
-					// overflow check for base * base
-					if gt(base, div(max, base)) { <panic>() }
-					if and(exponent, 1)
-					{
-						// No checks for power := mul(power, base) needed, because the check
-						// for base * base above is sufficient, since:
-						// |power| <= base (proof by induction) and thus:
-						// |power * base| <= base * base <= max <= |min| (for signed)
-						// (this is equally true for signed and unsigned exp)
-						power := mul(power, base)
-					}
-					base := mul(base, base)
-					exponent := <shr_1>(exponent)
-				}
-			}
-			)")
-			("functionName", functionName)
-			("panic", panicFunction(PanicCode::UnderOverflow))
-			("shr_1", shiftRightFunction(1))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::wrappingIntExpFunction(
-	IntegerType const& _type,
-	IntegerType const& _exponentType
-)
-{
-	solAssert(!_exponentType.isSigned(), "");
-
-	std::string functionName = "wrapping_exp_" + _type.identifier() + "_" + _exponentType.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return
-			Whiskers(R"(
-			function <functionName>(base, exponent) -> power {
-				base := <baseCleanupFunction>(base)
-				exponent := <exponentCleanupFunction>(exponent)
-				power := <baseCleanupFunction>(exp(base, exponent))
-			}
-			)")
-			("functionName", functionName)
-			("baseCleanupFunction", cleanupFunction(_type))
-			("exponentCleanupFunction", cleanupFunction(_exponentType))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::arrayLengthFunction(ArrayType const& _type)
-{
-	std::string functionName = "array_length_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers w(R"(
-			function <functionName>(value<?dynamic><?calldata>, len</calldata></dynamic>) -> length {
-				<?dynamic>
-					<?memory>
-						length := mload(value)
-					</memory>
-					<?storage>
-						length := sload(value)
-						<?byteArray>
-							length := <extractByteArrayLength>(length)
-						</byteArray>
-					</storage>
-					<?calldata>
-						length := len
-					</calldata>
-				<!dynamic>
-					length := <length>
-				</dynamic>
-			}
-		)");
-		w("functionName", functionName);
-		w("dynamic", _type.isDynamicallySized());
-		if (!_type.isDynamicallySized())
-			w("length", toCompactHexWithPrefix(_type.length()));
-		w("memory", _type.location() == DataLocation::Memory);
-		w("storage", _type.location() == DataLocation::Storage);
-		w("calldata", _type.location() == DataLocation::CallData);
-		if (_type.location() == DataLocation::Storage)
-		{
-			w("byteArray", _type.isByteArrayOrString());
-			if (_type.isByteArrayOrString())
-				w("extractByteArrayLength", extractByteArrayLengthFunction());
-		}
-
-		return w.render();
-	});
-}
-
-std::string YulUtilFunctions::extractByteArrayLengthFunction()
-{
-	std::string functionName = "extract_byte_array_length";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers w(R"(
-			function <functionName>(data) -> length {
-				length := div(data, 2)
-				let outOfPlaceEncoding := and(data, 1)
-				if iszero(outOfPlaceEncoding) {
-					length := and(length, 0x7f)
-				}
-
-				if eq(outOfPlaceEncoding, lt(length, 32)) {
-					<panic>()
-				}
-			}
-		)");
-		w("functionName", functionName);
-		w("panic", panicFunction(PanicCode::StorageEncodingError));
-		return w.render();
-	});
-}
-
-std::string YulUtilFunctions::resizeArrayFunction(ArrayType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32);
-
-	if (_type.isByteArrayOrString())
-		return resizeDynamicByteArrayFunction(_type);
-
-	std::string functionName = "resize_array_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(array, newLen) {
-				if gt(newLen, <maxArrayLength>) {
-					<panic>()
-				}
-
-				let oldLen := <fetchLength>(array)
-
-				<?isDynamic>
-					// Store new length
-					sstore(array, newLen)
-				</isDynamic>
-
-				<?needsClearing>
-					<cleanUpArrayEnd>(array, oldLen, newLen)
-				</needsClearing>
-			})");
-			templ("functionName", functionName);
-			templ("maxArrayLength", (u256(1) << 64).str());
-			templ("panic", panicFunction(util::PanicCode::ResourceError));
-			templ("fetchLength", arrayLengthFunction(_type));
-			templ("isDynamic", _type.isDynamicallySized());
-			bool isMappingBase = _type.baseType()->category() == Type::Category::Mapping;
-			templ("needsClearing", !isMappingBase);
-			if (!isMappingBase)
-				templ("cleanUpArrayEnd", cleanUpStorageArrayEndFunction(_type));
-			return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::cleanUpStorageArrayEndFunction(ArrayType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.baseType()->category() != Type::Category::Mapping, "");
-	solAssert(!_type.isByteArrayOrString(), "");
-	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32);
-
-	std::string functionName = "cleanup_storage_array_end_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
-		_args = {"array", "len", "startIndex"};
-		return Whiskers(R"(
-			if lt(startIndex, len) {
-				// Size was reduced, clear end of array
-				let oldSlotCount := <convertToSize>(len)
-				let newSlotCount := <convertToSize>(startIndex)
-				let arrayDataStart := <dataPosition>(array)
-				let deleteStart := add(arrayDataStart, newSlotCount)
-				let deleteEnd := add(arrayDataStart, oldSlotCount)
-				<?packed>
-					// if we are dealing with packed array and offset is greater than zero
-					// we have  to partially clear last slot that is still used, so decreasing start by one
-					let offset := mul(mod(startIndex, <itemsPerSlot>), <storageBytes>)
-					if gt(offset, 0) { <partialClearStorageSlot>(sub(deleteStart, 1), offset) }
-				</packed>
-				<clearStorageRange>(deleteStart, deleteEnd)
-			}
-		)")
-		("convertToSize", arrayConvertLengthToSize(_type))
-		("dataPosition", arrayDataAreaFunction(_type))
-		("clearStorageRange", clearStorageRangeFunction(*_type.baseType()))
-		("packed", _type.baseType()->storageBytes() <= 16)
-		("itemsPerSlot", std::to_string(32 / _type.baseType()->storageBytes()))
-		("storageBytes", std::to_string(_type.baseType()->storageBytes()))
-		("partialClearStorageSlot", partialClearStorageSlotFunction())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::resizeDynamicByteArrayFunction(ArrayType const& _type)
-{
-	std::string functionName = "resize_array_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
-		_args = {"array", "newLen"};
-		return Whiskers(R"(
-			let data := sload(array)
-			let oldLen := <extractLength>(data)
-
-			if gt(newLen, oldLen) {
-				<increaseSize>(array, data, oldLen, newLen)
-			}
-
-			if lt(newLen, oldLen) {
-				<decreaseSize>(array, data, oldLen, newLen)
-			}
-		)")
-		("extractLength", extractByteArrayLengthFunction())
-		("decreaseSize", decreaseByteArraySizeFunction(_type))
-		("increaseSize", increaseByteArraySizeFunction(_type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::cleanUpDynamicByteArrayEndSlotsFunction(ArrayType const& _type)
-{
-	solAssert(_type.isByteArrayOrString(), "");
-	solAssert(_type.isDynamicallySized(), "");
-
-	std::string functionName = "clean_up_bytearray_end_slots_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
-		_args = {"array", "len", "startIndex"};
-		return Whiskers(R"(
-			if gt(len, 31) {
-				let dataArea := <dataLocation>(array)
-				let deleteStart := add(dataArea, <div32Ceil>(startIndex))
-				// If we are clearing array to be short byte array, we want to clear only data starting from array data area.
-				if lt(startIndex, 32) { deleteStart := dataArea }
-				<clearStorageRange>(deleteStart, add(dataArea, <div32Ceil>(len)))
-			}
-		)")
-		("dataLocation", arrayDataAreaFunction(_type))
-		("div32Ceil", divide32CeilFunction())
-		("clearStorageRange", clearStorageRangeFunction(*_type.baseType()))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::decreaseByteArraySizeFunction(ArrayType const& _type)
-{
-	std::string functionName = "byte_array_decrease_size_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array, data, oldLen, newLen) {
-				switch lt(newLen, 32)
-				case  0 {
-					let arrayDataStart := <dataPosition>(array)
-					let deleteStart := add(arrayDataStart, <div32Ceil>(newLen))
-
-					// we have to partially clear last slot that is still used
-					let offset := and(newLen, 0x1f)
-					if offset { <partialClearStorageSlot>(sub(deleteStart, 1), offset) }
-
-					<clearStorageRange>(deleteStart, add(arrayDataStart, <div32Ceil>(oldLen)))
-
-					sstore(array, or(mul(2, newLen), 1))
-				}
-				default {
-					switch gt(oldLen, 31)
-					case 1 {
-						let arrayDataStart := <dataPosition>(array)
-						// clear whole old array, as we are transforming to short bytes array
-						<clearStorageRange>(add(arrayDataStart, 1), add(arrayDataStart, <div32Ceil>(oldLen)))
-						<transitLongToShort>(array, newLen)
-					}
-					default {
-						sstore(array, <encodeUsedSetLen>(data, newLen))
-					}
-				}
-			})")
-			("functionName", functionName)
-			("dataPosition", arrayDataAreaFunction(_type))
-			("partialClearStorageSlot", partialClearStorageSlotFunction())
-			("clearStorageRange", clearStorageRangeFunction(*_type.baseType()))
-			("transitLongToShort", byteArrayTransitLongToShortFunction(_type))
-			("div32Ceil", divide32CeilFunction())
-			("encodeUsedSetLen", shortByteArrayEncodeUsedAreaSetLengthFunction())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::increaseByteArraySizeFunction(ArrayType const& _type)
-{
-	std::string functionName = "byte_array_increase_size_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
-		_args = {"array", "data", "oldLen", "newLen"};
-		return Whiskers(R"(
-			if gt(newLen, <maxArrayLength>) { <panic>() }
-
-			switch lt(oldLen, 32)
-			case 0 {
-				// in this case array stays unpacked, so we just set new length
-				sstore(array, add(mul(2, newLen), 1))
-			}
-			default {
-				switch lt(newLen, 32)
-				case 0 {
-					// we need to copy elements to data area as we changed array from packed to unpacked
-					data := and(not(0xff), data)
-					sstore(<dataPosition>(array), data)
-					sstore(array, add(mul(2, newLen), 1))
-				}
-				default {
-					// here array stays packed, we just need to increase length
-					sstore(array, <encodeUsedSetLen>(data, newLen))
-				}
-			}
-		)")
-		("panic", panicFunction(PanicCode::ResourceError))
-		("maxArrayLength", (u256(1) << 64).str())
-		("dataPosition", arrayDataAreaFunction(_type))
-		("encodeUsedSetLen", shortByteArrayEncodeUsedAreaSetLengthFunction())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::byteArrayTransitLongToShortFunction(ArrayType const& _type)
-{
-	std::string functionName = "transit_byte_array_long_to_short_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array, len) {
-				// we need to copy elements from old array to new
-				// we want to copy only elements that are part of the array after resizing
-				let dataPos := <dataPosition>(array)
-				let data := <extractUsedApplyLen>(sload(dataPos), len)
-				sstore(array, data)
-				sstore(dataPos, 0)
-			})")
-			("functionName", functionName)
-			("dataPosition", arrayDataAreaFunction(_type))
-			("extractUsedApplyLen", shortByteArrayEncodeUsedAreaSetLengthFunction())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::shortByteArrayEncodeUsedAreaSetLengthFunction()
-{
-	std::string functionName = "extract_used_part_and_set_length_of_short_byte_array";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(data, len) -> used {
-				// we want to save only elements that are part of the array after resizing
-				// others should be set to zero
-				data := <maskBytes>(data, len)
-				used := or(data, mul(2, len))
-			})")
-			("functionName", functionName)
-			("maskBytes", maskBytesFunctionDynamic())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::longByteArrayStorageIndexAccessNoCheckFunction()
-{
-	return m_functionCollector.createFunction(
-		"long_byte_array_index_access_no_checks",
-		[&](std::vector<std::string>& _args, std::vector<std::string>& _returnParams) {
-			_args = {"array", "index"};
-			_returnParams = {"slot", "offset"};
-			return Whiskers(R"(
-				offset := sub(31, mod(index, 0x20))
-				let dataArea := <dataAreaFunc>(array)
-				slot := add(dataArea, div(index, 0x20))
-			)")
-			("dataAreaFunc", arrayDataAreaFunction(*TypeProvider::bytesStorage()))
-			.render();
-		}
-	);
-}
-
-std::string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32, "Base type is not yet implemented.");
-	if (_type.isByteArrayOrString())
-		return storageByteArrayPopFunction(_type);
-
-	std::string functionName = "array_pop_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array) {
-				let oldLen := <fetchLength>(array)
-				if iszero(oldLen) { <panic>() }
-				let newLen := sub(oldLen, 1)
-				let slot, offset := <indexAccess>(array, newLen)
-				<?+setToZero><setToZero>(slot, offset)</+setToZero>
-				sstore(array, newLen)
-			})")
-			("functionName", functionName)
-			("panic", panicFunction(PanicCode::EmptyArrayPop))
-			("fetchLength", arrayLengthFunction(_type))
-			("indexAccess", storageArrayIndexAccessFunction(_type))
-			(
-				"setToZero",
-				_type.baseType()->category() != Type::Category::Mapping ? storageSetToZeroFunction(*_type.baseType()) : ""
-			)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::storageByteArrayPopFunction(ArrayType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-	solAssert(_type.isByteArrayOrString(), "");
-
-	std::string functionName = "byte_array_pop_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array) {
-				let data := sload(array)
-				let oldLen := <extractByteArrayLength>(data)
-				if iszero(oldLen) { <panic>() }
-
-				switch oldLen
-				case 32 {
-					// Here we have a special case where array transitions to shorter than 32
-					// So we need to copy data
-					<transitLongToShort>(array, 31)
-				}
-				default {
-					let newLen := sub(oldLen, 1)
-					switch lt(oldLen, 32)
-					case 1 {
-						sstore(array, <encodeUsedSetLen>(data, newLen))
-					}
-					default {
-						let slot, offset := <indexAccessNoChecks>(array, newLen)
-						<setToZero>(slot, offset)
-						sstore(array, sub(data, 2))
-					}
-				}
-			})")
-			("functionName", functionName)
-			("panic", panicFunction(PanicCode::EmptyArrayPop))
-			("extractByteArrayLength", extractByteArrayLengthFunction())
-			("transitLongToShort", byteArrayTransitLongToShortFunction(_type))
-			("encodeUsedSetLen", shortByteArrayEncodeUsedAreaSetLengthFunction())
-			("indexAccessNoChecks", longByteArrayStorageIndexAccessNoCheckFunction())
-			("setToZero", storageSetToZeroFunction(*_type.baseType()))
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type const* _fromType)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-	if (!_fromType)
-		_fromType = _type.baseType();
-	else if (_fromType->isValueType())
-		solUnimplementedAssert(*_fromType == *_type.baseType());
-
-	std::string functionName =
-		std::string{"array_push_from_"} +
-		_fromType->identifier() +
-		"_to_" +
-		_type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array <values>) {
-				<?isByteArrayOrString>
-					let data := sload(array)
-					let oldLen := <extractByteArrayLength>(data)
-					if iszero(lt(oldLen, <maxArrayLength>)) { <panic>() }
-
-					switch gt(oldLen, 31)
-					case 0 {
-						let value := byte(0 <values>)
-						switch oldLen
-						case 31 {
-							// Here we have special case when array switches from short array to long array
-							// We need to copy data
-							let dataArea := <dataAreaFunction>(array)
-							data := and(data, not(0xff))
-							sstore(dataArea, or(and(0xff, value), data))
-							// New length is 32, encoded as (32 * 2 + 1)
-							sstore(array, 65)
-						}
-						default {
-							data := add(data, 2)
-							let shiftBits := mul(8, sub(31, oldLen))
-							let valueShifted := <shl>(shiftBits, and(0xff, value))
-							let mask := <shl>(shiftBits, 0xff)
-							data := or(and(data, not(mask)), valueShifted)
-							sstore(array, data)
-						}
-					}
-					default {
-						sstore(array, add(data, 2))
-						let slot, offset := <indexAccess>(array, oldLen)
-						<storeValue>(slot, offset <values>)
-					}
-				<!isByteArrayOrString>
-					let oldLen := sload(array)
-					if iszero(lt(oldLen, <maxArrayLength>)) { <panic>() }
-					sstore(array, add(oldLen, 1))
-					let slot, offset := <indexAccess>(array, oldLen)
-					<storeValue>(slot, offset <values>)
-				</isByteArrayOrString>
-			})")
-			("functionName", functionName)
-			("values", _fromType->sizeOnStack() == 0 ? "" : ", " + suffixedVariableNameList("value", 0, _fromType->sizeOnStack()))
-			("panic", panicFunction(PanicCode::ResourceError))
-			("extractByteArrayLength", _type.isByteArrayOrString() ? extractByteArrayLengthFunction() : "")
-			("dataAreaFunction", arrayDataAreaFunction(_type))
-			("isByteArrayOrString", _type.isByteArrayOrString())
-			("indexAccess", storageArrayIndexAccessFunction(_type))
-			("storeValue", updateStorageValueFunction(*_fromType, *_type.baseType()))
-			("maxArrayLength", (u256(1) << 64).str())
-			("shl", shiftLeftFunctionDynamic())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::storageArrayPushZeroFunction(ArrayType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-	solAssert(_type.isDynamicallySized(), "");
-	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32, "Base type is not yet implemented.");
-
-	std::string functionName = "array_push_zero_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array) -> slot, offset {
-				<?isBytes>
-					let data := sload(array)
-					let oldLen := <extractLength>(data)
-					<increaseBytesSize>(array, data, oldLen, add(oldLen, 1))
-				<!isBytes>
-					let oldLen := <fetchLength>(array)
-					if iszero(lt(oldLen, <maxArrayLength>)) { <panic>() }
-					sstore(array, add(oldLen, 1))
-				</isBytes>
-				slot, offset := <indexAccess>(array, oldLen)
-			})")
-			("functionName", functionName)
-			("isBytes", _type.isByteArrayOrString())
-			("increaseBytesSize", _type.isByteArrayOrString() ? increaseByteArraySizeFunction(_type) : "")
-			("extractLength", _type.isByteArrayOrString() ? extractByteArrayLengthFunction() : "")
-			("panic", panicFunction(PanicCode::ResourceError))
-			("fetchLength", arrayLengthFunction(_type))
-			("indexAccess", storageArrayIndexAccessFunction(_type))
-			("maxArrayLength", (u256(1) << 64).str())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::partialClearStorageSlotFunction()
-{
-	std::string functionName = "partial_clear_storage_slot";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-		function <functionName>(slot, offset) {
-			let mask := <shr>(mul(8, sub(32, offset)), <ones>)
-			sstore(slot, and(mask, sload(slot)))
-		}
-		)")
-		("functionName", functionName)
-		("ones", formatNumber((bigint(1) << 256) - 1))
-		("shr", shiftRightFunctionDynamic())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::clearStorageRangeFunction(Type const& _type)
-{
-	if (_type.storageBytes() < 32)
-		solAssert(_type.isValueType(), "");
-
-	std::string functionName = "clear_storage_range_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(start, end) {
-				for {} lt(start, end) { start := add(start, <increment>) }
-				{
-					<setToZero>(start, 0)
-				}
-			}
-		)")
-		("functionName", functionName)
-		("setToZero", storageSetToZeroFunction(_type.storageBytes() < 32 ? *TypeProvider::uint256() : _type))
-		("increment", _type.storageSize().str())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::clearStorageArrayFunction(ArrayType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-
-	if (_type.baseType()->storageBytes() < 32)
-	{
-		solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
-		solAssert(_type.baseType()->storageSize() <= 1, "Invalid storage size for type.");
-	}
-
-	if (_type.baseType()->isValueType())
-		solAssert(_type.baseType()->storageSize() <= 1, "Invalid size for value type.");
-
-	std::string functionName = "clear_storage_array_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(slot) {
-				<?dynamic>
-					<resizeArray>(slot, 0)
-				<!dynamic>
-					<?+clearRange><clearRange>(slot, add(slot, <lenToSize>(<len>)))</+clearRange>
-				</dynamic>
-			}
-		)")
-		("functionName", functionName)
-		("dynamic", _type.isDynamicallySized())
-		("resizeArray", _type.isDynamicallySized() ? resizeArrayFunction(_type) : "")
-		(
-			"clearRange",
-			_type.baseType()->category() != Type::Category::Mapping ?
-			clearStorageRangeFunction((_type.baseType()->storageBytes() < 32) ? *TypeProvider::uint256() : *_type.baseType()) :
-			""
-		)
-		("lenToSize", arrayConvertLengthToSize(_type))
-		("len", _type.length().str())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::clearStorageStructFunction(StructType const& _type)
-{
-	solAssert(_type.location() == DataLocation::Storage, "");
-
-	std::string functionName = "clear_struct_storage_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		MemberList::MemberMap structMembers = _type.nativeMembers(nullptr);
-		std::vector<std::map<std::string, std::string>> memberSetValues;
-
-		std::set<u256> slotsCleared;
-		for (auto const& member: structMembers)
-		{
-			if (member.type->category() == Type::Category::Mapping)
-				continue;
-			if (member.type->storageBytes() < 32)
-			{
-				auto const& slotDiff = _type.storageOffsetsOfMember(member.name).first;
-				if (!slotsCleared.count(slotDiff))
-				{
-					memberSetValues.emplace_back().emplace("clearMember", "sstore(add(slot, " + slotDiff.str() + "), 0)");
-					slotsCleared.emplace(slotDiff);
-				}
-			}
-			else
-			{
-				auto const& [memberSlotDiff, memberStorageOffset] = _type.storageOffsetsOfMember(member.name);
-				solAssert(memberStorageOffset == 0, "");
-
-				memberSetValues.emplace_back().emplace("clearMember", Whiskers(R"(
-						<setZero>(add(slot, <memberSlotDiff>), <memberStorageOffset>)
-					)")
-					("setZero", storageSetToZeroFunction(*member.type))
-					("memberSlotDiff",  memberSlotDiff.str())
-					("memberStorageOffset", std::to_string(memberStorageOffset))
-					.render()
-				);
-			}
-		}
-
-		return Whiskers(R"(
-			function <functionName>(slot) {
-				<#member>
-					<clearMember>
-				</member>
-			}
-		)")
-		("functionName", functionName)
-		("member", memberSetValues)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
-{
-	solAssert(
-		(*_fromType.copyForLocation(_toType.location(), _toType.isPointer())).equals(dynamic_cast<ReferenceType const&>(_toType)),
-		""
-	);
-	if (!_toType.isDynamicallySized())
-		solAssert(!_fromType.isDynamicallySized() && _fromType.length() <= _toType.length(), "");
-
-	if (_fromType.isByteArrayOrString())
-		return copyByteArrayToStorageFunction(_fromType, _toType);
-	if (_toType.baseType()->isValueType())
-		return copyValueArrayToStorageFunction(_fromType, _toType);
-
-	solAssert(_toType.storageStride() == 32);
-	solAssert(!_fromType.baseType()->isValueType());
-
-	std::string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
-	return m_functionCollector.createFunction(functionName, [&](){
-		Whiskers templ(R"(
-			function <functionName>(slot, value<?isFromDynamicCalldata>, len</isFromDynamicCalldata>) {
-				<?fromStorage> if eq(slot, value) { leave } </fromStorage>
-				let length := <arrayLength>(value<?isFromDynamicCalldata>, len</isFromDynamicCalldata>)
-
-				<resizeArray>(slot, length)
-
-				let srcPtr := <srcDataLocation>(value)
-
-				let elementSlot := <dstDataLocation>(slot)
-
-				for { let i := 0 } lt(i, length) {i := add(i, 1)} {
-					<?fromCalldata>
-						let <stackItems> :=
-						<?dynamicallyEncodedBase>
-							<accessCalldataTail>(value, srcPtr)
-						<!dynamicallyEncodedBase>
-							srcPtr
-						</dynamicallyEncodedBase>
-					</fromCalldata>
-
-					<?fromMemory>
-						let <stackItems> := <readFromMemoryOrCalldata>(srcPtr)
-					</fromMemory>
-
-					<?fromStorage>
-						let <stackItems> := srcPtr
-					</fromStorage>
-
-					<updateStorageValue>(elementSlot, <stackItems>)
-
-					srcPtr := add(srcPtr, <srcStride>)
-
-					elementSlot := add(elementSlot, <storageSize>)
-				}
-			}
-		)");
-		if (_fromType.dataStoredIn(DataLocation::Storage))
-			solAssert(!_fromType.isValueType(), "");
-		templ("functionName", functionName);
-		bool fromCalldata = _fromType.dataStoredIn(DataLocation::CallData);
-		templ("isFromDynamicCalldata", _fromType.isDynamicallySized() && fromCalldata);
-		templ("fromStorage", _fromType.dataStoredIn(DataLocation::Storage));
-		bool fromMemory = _fromType.dataStoredIn(DataLocation::Memory);
-		templ("fromMemory", fromMemory);
-		templ("fromCalldata", fromCalldata);
-		templ("srcDataLocation", arrayDataAreaFunction(_fromType));
-		if (fromCalldata)
-		{
-			templ("dynamicallyEncodedBase", _fromType.baseType()->isDynamicallyEncoded());
-			if (_fromType.baseType()->isDynamicallyEncoded())
-				templ("accessCalldataTail", accessCalldataTailFunction(*_fromType.baseType()));
-		}
-		templ("resizeArray", resizeArrayFunction(_toType));
-		templ("arrayLength",arrayLengthFunction(_fromType));
-		templ("dstDataLocation", arrayDataAreaFunction(_toType));
-		if (fromMemory || (fromCalldata && _fromType.baseType()->isValueType()))
-			templ("readFromMemoryOrCalldata", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
-		templ("stackItems", suffixedVariableNameList(
-			"stackItem_",
-			0,
-			_fromType.baseType()->stackItems().size()
-		));
-		templ("updateStorageValue", updateStorageValueFunction(*_fromType.baseType(), *_toType.baseType(), 0));
-		templ("srcStride",
-			fromCalldata ?
-			std::to_string(_fromType.calldataStride()) :
-				fromMemory ?
-				std::to_string(_fromType.memoryStride()) :
-				formatNumber(_fromType.baseType()->storageSize())
-		);
-		templ("storageSize", _toType.baseType()->storageSize().str());
-
-		return templ.render();
-	});
-}
-
-
-std::string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
-{
-	solAssert(
-		(*_fromType.copyForLocation(_toType.location(), _toType.isPointer())).equals(dynamic_cast<ReferenceType const&>(_toType)),
-		""
-	);
-	solAssert(_fromType.isByteArrayOrString(), "");
-	solAssert(_toType.isByteArrayOrString(), "");
-
-	std::string functionName = "copy_byte_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
-	return m_functionCollector.createFunction(functionName, [&](){
-		Whiskers templ(R"(
-			function <functionName>(slot, src<?fromCalldata>, len</fromCalldata>) {
-				<?fromStorage> if eq(slot, src) { leave } </fromStorage>
-
-				let newLen := <arrayLength>(src<?fromCalldata>, len</fromCalldata>)
-				// Make sure array length is sane
-				if gt(newLen, 0xffffffffffffffff) { <panic>() }
-
-				let oldLen := <byteArrayLength>(sload(slot))
-
-				// potentially truncate data
-				<cleanUpEndArray>(slot, oldLen, newLen)
-
-				let srcOffset := 0
-				<?fromMemory>
-					srcOffset := 0x20
-				</fromMemory>
-
-				switch gt(newLen, 31)
-				case 1 {
-					let loopEnd := and(newLen, not(0x1f))
-					<?fromStorage> src := <srcDataLocation>(src) </fromStorage>
-					let dstPtr := <dstDataLocation>(slot)
-					let i := 0
-					for { } lt(i, loopEnd) { i := add(i, 0x20) } {
-						sstore(dstPtr, <read>(add(src, srcOffset)))
-						dstPtr := add(dstPtr, 1)
-						srcOffset := add(srcOffset, <srcIncrement>)
-					}
-					if lt(loopEnd, newLen) {
-						let lastValue := <read>(add(src, srcOffset))
-						sstore(dstPtr, <maskBytes>(lastValue, and(newLen, 0x1f)))
-					}
-					sstore(slot, add(mul(newLen, 2), 1))
-				}
-				default {
-					let value := 0
-					if newLen {
-						value := <read>(add(src, srcOffset))
-					}
-					sstore(slot, <byteArrayCombineShort>(value, newLen))
-				}
-			}
-		)");
-		templ("functionName", functionName);
-		bool fromStorage = _fromType.dataStoredIn(DataLocation::Storage);
-		templ("fromStorage", fromStorage);
-		bool fromCalldata = _fromType.dataStoredIn(DataLocation::CallData);
-		templ("fromMemory", _fromType.dataStoredIn(DataLocation::Memory));
-		templ("fromCalldata", fromCalldata);
-		templ("arrayLength", arrayLengthFunction(_fromType));
-		templ("panic", panicFunction(PanicCode::ResourceError));
-		templ("byteArrayLength", extractByteArrayLengthFunction());
-		templ("dstDataLocation", arrayDataAreaFunction(_toType));
-		if (fromStorage)
-			templ("srcDataLocation", arrayDataAreaFunction(_fromType));
-		templ("cleanUpEndArray", cleanUpDynamicByteArrayEndSlotsFunction(_toType));
-		templ("srcIncrement", std::to_string(fromStorage ? 1 : 0x20));
-		templ("read", fromStorage ? "sload" : fromCalldata ? "calldataload" : "mload");
-		templ("maskBytes", maskBytesFunctionDynamic());
-		templ("byteArrayCombineShort", shortByteArrayEncodeUsedAreaSetLengthFunction());
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
-{
-	solAssert(_fromType.baseType()->isValueType(), "");
-	solAssert(_toType.baseType()->isValueType(), "");
-	solAssert(_fromType.baseType()->isImplicitlyConvertibleTo(*_toType.baseType()), "");
-
-	solAssert(!_fromType.isByteArrayOrString(), "");
-	solAssert(!_toType.isByteArrayOrString(), "");
-	solAssert(_toType.dataStoredIn(DataLocation::Storage), "");
-
-	solAssert(_fromType.storageStride() <= _toType.storageStride(), "");
-	solAssert(_toType.storageStride() <= 32, "");
-
-	std::string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
-	return m_functionCollector.createFunction(functionName, [&](){
-		Whiskers templ(R"(
-			function <functionName>(dst, src<?isFromDynamicCalldata>, len</isFromDynamicCalldata>) {
-				<?isFromStorage>
-				if eq(dst, src) { leave }
-				</isFromStorage>
-				let length := <arrayLength>(src<?isFromDynamicCalldata>, len</isFromDynamicCalldata>)
-				// Make sure array length is sane
-				if gt(length, 0xffffffffffffffff) { <panic>() }
-				<resizeArray>(dst, length)
-
-				let srcPtr := <srcDataLocation>(src)
-				let dstSlot := <dstDataLocation>(dst)
-
-				let fullSlots := div(length, <itemsPerSlot>)
-
-				<?isFromStorage>
-				let srcSlotValue := sload(srcPtr)
-				let srcItemIndexInSlot := 0
-				</isFromStorage>
-
-				for { let i := 0 } lt(i, fullSlots) { i := add(i, 1) } {
-					let dstSlotValue := 0
-					<?sameTypeFromStorage>
-						dstSlotValue := <maskFull>(srcSlotValue)
-						<updateSrcPtr>
-					<!sameTypeFromStorage>
-						<?multipleItemsPerSlotDst>for { let j := 0 } lt(j, <itemsPerSlot>) { j := add(j, 1) } </multipleItemsPerSlotDst>
-						{
-							<?isFromStorage>
-							let <stackItems> := <convert>(
-								<extractFromSlot>(srcSlotValue, mul(<srcStride>, srcItemIndexInSlot))
-							)
-							<!isFromStorage>
-							let <stackItems> := <readFromMemoryOrCalldata>(srcPtr)
-							</isFromStorage>
-							let itemValue := <prepareStore>(<stackItems>)
-							dstSlotValue :=
-							<?multipleItemsPerSlotDst>
-								<updateByteSlice>(dstSlotValue, mul(<dstStride>, j), itemValue)
-							<!multipleItemsPerSlotDst>
-								itemValue
-							</multipleItemsPerSlotDst>
-
-							<updateSrcPtr>
-						}
-					</sameTypeFromStorage>
-
-					sstore(add(dstSlot, i), dstSlotValue)
-				}
-
-				<?multipleItemsPerSlotDst>
-					let spill := sub(length, mul(fullSlots, <itemsPerSlot>))
-					if gt(spill, 0) {
-						let dstSlotValue := 0
-						<?sameTypeFromStorage>
-							dstSlotValue := <maskBytes>(srcSlotValue, mul(spill, <srcStride>))
-							<updateSrcPtr>
-						<!sameTypeFromStorage>
-							for { let j := 0 } lt(j, spill) { j := add(j, 1) } {
-								<?isFromStorage>
-								let <stackItems> := <convert>(
-									<extractFromSlot>(srcSlotValue, mul(<srcStride>, srcItemIndexInSlot))
-								)
-								<!isFromStorage>
-								let <stackItems> := <readFromMemoryOrCalldata>(srcPtr)
-								</isFromStorage>
-								let itemValue := <prepareStore>(<stackItems>)
-								dstSlotValue := <updateByteSlice>(dstSlotValue, mul(<dstStride>, j), itemValue)
-
-								<updateSrcPtr>
-							}
-						</sameTypeFromStorage>
-						sstore(add(dstSlot, fullSlots), dstSlotValue)
-					}
-				</multipleItemsPerSlotDst>
-			}
-		)");
-		if (_fromType.dataStoredIn(DataLocation::Storage))
-			solAssert(!_fromType.isValueType(), "");
-
-		bool fromCalldata = _fromType.dataStoredIn(DataLocation::CallData);
-		bool fromStorage = _fromType.dataStoredIn(DataLocation::Storage);
-		templ("functionName", functionName);
-		templ("resizeArray", resizeArrayFunction(_toType));
-		templ("arrayLength", arrayLengthFunction(_fromType));
-		templ("panic", panicFunction(PanicCode::ResourceError));
-		templ("isFromDynamicCalldata", _fromType.isDynamicallySized() && fromCalldata);
-		templ("isFromStorage", fromStorage);
-		templ("readFromMemoryOrCalldata", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
-		templ("srcDataLocation", arrayDataAreaFunction(_fromType));
-		templ("dstDataLocation", arrayDataAreaFunction(_toType));
-		templ("srcStride", std::to_string(_fromType.storageStride()));
-		templ("stackItems", suffixedVariableNameList(
-			"stackItem_",
-			0,
-			_fromType.baseType()->stackItems().size()
-		));
-		unsigned itemsPerSlot = 32 / _toType.storageStride();
-		templ("itemsPerSlot", std::to_string(itemsPerSlot));
-		templ("multipleItemsPerSlotDst", itemsPerSlot > 1);
-		bool sameTypeFromStorage = fromStorage && (*_fromType.baseType() == *_toType.baseType());
-		if (auto functionType = dynamic_cast<FunctionType const*>(_fromType.baseType()))
-		{
-			solAssert(functionType->equalExcludingStateMutability(
-				dynamic_cast<FunctionType const&>(*_toType.baseType())
-			));
-			sameTypeFromStorage = fromStorage;
-		}
-		templ("sameTypeFromStorage", sameTypeFromStorage);
-		if (sameTypeFromStorage)
-		{
-			templ("maskFull", maskLowerOrderBytesFunction(itemsPerSlot * _toType.storageStride()));
-			templ("maskBytes", maskLowerOrderBytesFunctionDynamic());
-		}
-		else
-		{
-			templ("dstStride", std::to_string(_toType.storageStride()));
-			templ("extractFromSlot", extractFromStorageValueDynamic(*_fromType.baseType()));
-			templ("updateByteSlice", updateByteSliceFunctionDynamic(_toType.storageStride()));
-			templ("convert", conversionFunction(*_fromType.baseType(), *_toType.baseType()));
-			templ("prepareStore", prepareStoreFunction(*_toType.baseType()));
-		}
-		if (fromStorage)
-			templ("updateSrcPtr", Whiskers(R"(
-				<?srcReadMultiPerSlot>
-					srcItemIndexInSlot := add(srcItemIndexInSlot, 1)
-					if eq(srcItemIndexInSlot, <srcItemsPerSlot>) {
-						// here we are done with this slot, we need to read next one
-						srcPtr := add(srcPtr, 1)
-						srcSlotValue := sload(srcPtr)
-						srcItemIndexInSlot := 0
-					}
-				<!srcReadMultiPerSlot>
-					srcPtr := add(srcPtr, 1)
-					srcSlotValue := sload(srcPtr)
-				</srcReadMultiPerSlot>
-				)")
-				("srcReadMultiPerSlot", !sameTypeFromStorage && _fromType.storageStride() <= 16)
-				("srcItemsPerSlot", std::to_string(32 / _fromType.storageStride()))
-				.render()
-			);
-		else
-			templ("updateSrcPtr", Whiskers(R"(
-					srcPtr := add(srcPtr, <srcStride>)
-				)")
-				("srcStride", fromCalldata ? std::to_string(_fromType.calldataStride()) : std::to_string(_fromType.memoryStride()))
-				.render()
-			);
-
-		return templ.render();
-	});
-}
-
-
-std::string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
-{
-	std::string functionName = "array_convert_length_to_size_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Type const& baseType = *_type.baseType();
-
-		switch (_type.location())
-		{
-			case DataLocation::Storage:
-			{
-				unsigned const baseStorageBytes = baseType.storageBytes();
-				solAssert(baseStorageBytes > 0, "");
-				solAssert(32 / baseStorageBytes > 0, "");
-
-				return Whiskers(R"(
-					function <functionName>(length) -> size {
-						size := length
-						<?multiSlot>
-							size := <mul>(<storageSize>, length)
-						<!multiSlot>
-							// Number of slots rounded up
-							size := div(add(length, sub(<itemsPerSlot>, 1)), <itemsPerSlot>)
-						</multiSlot>
-					})")
-					("functionName", functionName)
-					("multiSlot", baseType.storageSize() > 1)
-					("itemsPerSlot", std::to_string(32 / baseStorageBytes))
-					("storageSize", baseType.storageSize().str())
-					("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256()))
-					.render();
-			}
-			case DataLocation::CallData: // fallthrough
-			case DataLocation::Memory:
-				return Whiskers(R"(
-					function <functionName>(length) -> size {
-						<?byteArray>
-							size := length
-						<!byteArray>
-							size := <mul>(length, <stride>)
-						</byteArray>
-					})")
-					("functionName", functionName)
-					("stride", std::to_string(_type.location() == DataLocation::Memory ? _type.memoryStride() : _type.calldataStride()))
-					("byteArray", _type.isByteArrayOrString())
-					("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256()))
-					.render();
-			default:
-				solAssert(false, "");
-		}
-
-	});
-}
-
-std::string YulUtilFunctions::arrayAllocationSizeFunction(ArrayType const& _type)
-{
-	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-	std::string functionName = "array_allocation_size_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers w(R"(
-			function <functionName>(length) -> size {
-				// Make sure we can allocate memory without overflow
-				if gt(length, 0xffffffffffffffff) { <panic>() }
-				<?byteArray>
-					size := <roundUp>(length)
-				<!byteArray>
-					size := mul(length, 0x20)
-				</byteArray>
-				<?dynamic>
-					// add length slot
-					size := add(size, 0x20)
-				</dynamic>
-			}
-		)");
-		w("functionName", functionName);
-		w("panic", panicFunction(PanicCode::ResourceError));
-		w("byteArray", _type.isByteArrayOrString());
-		w("roundUp", roundUpFunction());
-		w("dynamic", _type.isDynamicallySized());
-		return w.render();
-	});
-}
-
-std::string YulUtilFunctions::arrayDataAreaFunction(ArrayType const& _type)
-{
-	std::string functionName = "array_dataslot_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		// No special processing for calldata arrays, because they are stored as
-		// offset of the data area and length on the stack, so the offset already
-		// points to the data area.
-		// This might change, if calldata arrays are stored in a single
-		// stack slot at some point.
-		return Whiskers(R"(
-			function <functionName>(ptr) -> data {
-				data := ptr
-				<?dynamic>
-					<?memory>
-						data := add(ptr, 0x20)
-					</memory>
-					<?storage>
-						mstore(0, ptr)
-						data := keccak256(0, 0x20)
-					</storage>
-				</dynamic>
-			}
-		)")
-		("functionName", functionName)
-		("dynamic", _type.isDynamicallySized())
-		("memory", _type.location() == DataLocation::Memory)
-		("storage", _type.location() == DataLocation::Storage)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::storageArrayIndexAccessFunction(ArrayType const& _type)
-{
-	std::string functionName = "storage_array_index_access_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(array, index) -> slot, offset {
-				let arrayLength := <arrayLen>(array)
-				if iszero(lt(index, arrayLength)) { <panic>() }
-
-				<?multipleItemsPerSlot>
-					<?isBytesArray>
-						switch lt(arrayLength, 0x20)
-						case 0 {
-							slot, offset := <indexAccessNoChecks>(array, index)
-						}
-						default {
-							offset := sub(31, mod(index, 0x20))
-							slot := array
-						}
-					<!isBytesArray>
-						let dataArea := <dataAreaFunc>(array)
-						slot := add(dataArea, div(index, <itemsPerSlot>))
-						offset := mul(mod(index, <itemsPerSlot>), <storageBytes>)
-					</isBytesArray>
-				<!multipleItemsPerSlot>
-					let dataArea := <dataAreaFunc>(array)
-					slot := add(dataArea, mul(index, <storageSize>))
-					offset := 0
-				</multipleItemsPerSlot>
-			}
-		)")
-		("functionName", functionName)
-		("panic", panicFunction(PanicCode::ArrayOutOfBounds))
-		("arrayLen", arrayLengthFunction(_type))
-		("dataAreaFunc", arrayDataAreaFunction(_type))
-		("indexAccessNoChecks", longByteArrayStorageIndexAccessNoCheckFunction())
-		("multipleItemsPerSlot", _type.baseType()->storageBytes() <= 16)
-		("isBytesArray", _type.isByteArrayOrString())
-		("storageSize", _type.baseType()->storageSize().str())
-		("storageBytes", toString(_type.baseType()->storageBytes()))
-		("itemsPerSlot", std::to_string(32 / _type.baseType()->storageBytes()))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::memoryArrayIndexAccessFunction(ArrayType const& _type)
-{
-	std::string functionName = "memory_array_index_access_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(baseRef, index) -> addr {
-				if iszero(lt(index, <arrayLen>(baseRef))) {
-					<panic>()
-				}
-
-				let offset := mul(index, <stride>)
-				<?dynamicallySized>
-					offset := add(offset, 32)
-				</dynamicallySized>
-				addr := add(baseRef, offset)
-			}
-		)")
-		("functionName", functionName)
-		("panic", panicFunction(PanicCode::ArrayOutOfBounds))
-		("arrayLen", arrayLengthFunction(_type))
-		("stride", std::to_string(_type.memoryStride()))
-		("dynamicallySized", _type.isDynamicallySized())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::calldataArrayIndexAccessFunction(ArrayType const& _type)
-{
-	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	std::string functionName = "calldata_array_index_access_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(base_ref<?dynamicallySized>, length</dynamicallySized>, index) -> addr<?dynamicallySizedBase>, len</dynamicallySizedBase> {
-				if iszero(lt(index, <?dynamicallySized>length<!dynamicallySized><arrayLen></dynamicallySized>)) { <panic>() }
-				addr := add(base_ref, mul(index, <stride>))
-				<?dynamicallyEncodedBase>
-					addr<?dynamicallySizedBase>, len</dynamicallySizedBase> := <accessCalldataTail>(base_ref, addr)
-				</dynamicallyEncodedBase>
-			}
-		)")
-		("functionName", functionName)
-		("panic", panicFunction(PanicCode::ArrayOutOfBounds))
-		("stride", std::to_string(_type.calldataStride()))
-		("dynamicallySized", _type.isDynamicallySized())
-		("dynamicallyEncodedBase", _type.baseType()->isDynamicallyEncoded())
-		("dynamicallySizedBase", _type.baseType()->isDynamicallySized())
-		("arrayLen",  toCompactHexWithPrefix(_type.length()))
-		("accessCalldataTail", _type.baseType()->isDynamicallyEncoded() ? accessCalldataTailFunction(*_type.baseType()): "")
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::calldataArrayIndexRangeAccess(ArrayType const& _type)
-{
-	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	solAssert(_type.isDynamicallySized(), "");
-	std::string functionName = "calldata_array_index_range_access_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(offset, length, startIndex, endIndex) -> offsetOut, lengthOut {
-				if gt(startIndex, endIndex) { <revertSliceStartAfterEnd>() }
-				if gt(endIndex, length) { <revertSliceGreaterThanLength>() }
-				offsetOut := add(offset, mul(startIndex, <stride>))
-				lengthOut := sub(endIndex, startIndex)
-			}
-		)")
-		("functionName", functionName)
-		("stride", std::to_string(_type.calldataStride()))
-		("revertSliceStartAfterEnd", revertReasonIfDebugFunction("Slice starts after end"))
-		("revertSliceGreaterThanLength", revertReasonIfDebugFunction("Slice is greater than length"))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::accessCalldataTailFunction(Type const& _type)
-{
-	solAssert(_type.isDynamicallyEncoded(), "");
-	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	std::string functionName = "access_calldata_tail_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(base_ref, ptr_to_tail) -> addr<?dynamicallySized>, length</dynamicallySized> {
-				let rel_offset_of_tail := calldataload(ptr_to_tail)
-				if iszero(slt(rel_offset_of_tail, sub(sub(calldatasize(), base_ref), sub(<neededLength>, 1)))) { <invalidCalldataTailOffset>() }
-				addr := add(base_ref, rel_offset_of_tail)
-				<?dynamicallySized>
-					length := calldataload(addr)
-					if gt(length, 0xffffffffffffffff) { <invalidCalldataTailLength>() }
-					addr := add(addr, 32)
-					if sgt(addr, sub(calldatasize(), mul(length, <calldataStride>))) { <shortCalldataTail>() }
-				</dynamicallySized>
-			}
-		)")
-		("functionName", functionName)
-		("dynamicallySized", _type.isDynamicallySized())
-		("neededLength", toCompactHexWithPrefix(_type.calldataEncodedTailSize()))
-		("calldataStride", toCompactHexWithPrefix(_type.isDynamicallySized() ? dynamic_cast<ArrayType const&>(_type).calldataStride() : 0))
-		("invalidCalldataTailOffset", revertReasonIfDebugFunction("Invalid calldata tail offset"))
-		("invalidCalldataTailLength", revertReasonIfDebugFunction("Invalid calldata tail length"))
-		("shortCalldataTail", revertReasonIfDebugFunction("Calldata tail too short"))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::nextArrayElementFunction(ArrayType const& _type)
-{
-	solAssert(!_type.isByteArrayOrString(), "");
-	if (_type.dataStoredIn(DataLocation::Storage))
-		solAssert(_type.baseType()->storageBytes() > 16, "");
-	std::string functionName = "array_nextElement_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(ptr) -> next {
-				next := add(ptr, <advance>)
-			}
-		)");
-		templ("functionName", functionName);
-		switch (_type.location())
-		{
-		case DataLocation::Memory:
-			templ("advance", "0x20");
-			break;
-		case DataLocation::Storage:
-		{
-			u256 size = _type.baseType()->storageSize();
-			solAssert(size >= 1, "");
-			templ("advance", toCompactHexWithPrefix(size));
-			break;
-		}
-		case DataLocation::CallData:
-		{
-			u256 size = _type.calldataStride();
-			solAssert(size >= 32 && size % 32 == 0, "");
-			templ("advance", toCompactHexWithPrefix(size));
-			break;
-		}
-		}
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _from, ArrayType const& _to)
-{
-	solAssert(_from.dataStoredIn(DataLocation::Storage), "");
-	solAssert(_to.dataStoredIn(DataLocation::Memory), "");
-	solAssert(_from.isDynamicallySized() == _to.isDynamicallySized(), "");
-	if (!_from.isDynamicallySized())
-		solAssert(_from.length() == _to.length(), "");
-
-	std::string functionName = "copy_array_from_storage_to_memory_" + _from.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (_from.baseType()->isValueType())
-		{
-			solAssert(*_from.baseType() == *_to.baseType(), "");
-			ABIFunctions abi(m_evmVersion, m_revertStrings, m_functionCollector);
-			return Whiskers(R"(
-				function <functionName>(slot) -> memPtr {
-					memPtr := <allocateUnbounded>()
-					let end := <encode>(slot, memPtr)
-					<finalizeAllocation>(memPtr, sub(end, memPtr))
-				}
-			)")
-			("functionName", functionName)
-			("allocateUnbounded", allocateUnboundedFunction())
-			(
-				"encode",
-				abi.abiEncodeAndReturnUpdatedPosFunction(_from, _to, ABIFunctions::EncodingOptions{})
-			)
-			("finalizeAllocation", finalizeAllocationFunction())
-			.render();
-		}
-		else
-		{
-			solAssert(_to.memoryStride() == 32, "");
-			solAssert(_to.baseType()->dataStoredIn(DataLocation::Memory), "");
-			solAssert(_from.baseType()->dataStoredIn(DataLocation::Storage), "");
-			solAssert(!_from.isByteArrayOrString(), "");
-			solAssert(*_to.withLocation(DataLocation::Storage, _from.isPointer()) == _from, "");
-			return Whiskers(R"(
-				function <functionName>(slot) -> memPtr {
-					let length := <lengthFunction>(slot)
-					memPtr := <allocateArray>(length)
-					let mpos := memPtr
-					<?dynamic>mpos := add(mpos, 0x20)</dynamic>
-					let spos := <arrayDataArea>(slot)
-					for { let i := 0 } lt(i, length) { i := add(i, 1) } {
-						mstore(mpos, <convert>(spos))
-						mpos := add(mpos, 0x20)
-						spos := add(spos, <baseStorageSize>)
-					}
-				}
-			)")
-			("functionName", functionName)
-			("lengthFunction", arrayLengthFunction(_from))
-			("allocateArray", allocateMemoryArrayFunction(_to))
-			("arrayDataArea", arrayDataAreaFunction(_from))
-			("dynamic", _to.isDynamicallySized())
-			("convert", conversionFunction(*_from.baseType(), *_to.baseType()))
-			("baseStorageSize", _from.baseType()->storageSize().str())
-			.render();
-		}
-	});
-}
-
-std::string YulUtilFunctions::bytesOrStringConcatFunction(
-	std::vector<Type const*> const& _argumentTypes,
-	FunctionType::Kind _functionTypeKind
-)
-{
-	solAssert(_functionTypeKind == FunctionType::Kind::BytesConcat || _functionTypeKind == FunctionType::Kind::StringConcat);
-	std::string functionName = (_functionTypeKind == FunctionType::Kind::StringConcat) ? "string_concat" : "bytes_concat";
-	size_t totalParams = 0;
-	std::vector<Type const*> targetTypes;
-
-	for (Type const* argumentType: _argumentTypes)
-	{
-		if (_functionTypeKind == FunctionType::Kind::StringConcat)
-			solAssert(argumentType->isImplicitlyConvertibleTo(*TypeProvider::stringMemory()));
-		else if (_functionTypeKind == FunctionType::Kind::BytesConcat)
-			solAssert(
-				argumentType->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()) ||
-				argumentType->isImplicitlyConvertibleTo(*TypeProvider::fixedBytes(32))
-			);
-
-		if (argumentType->category() == Type::Category::FixedBytes)
-			targetTypes.emplace_back(argumentType);
-		else if (
-			auto const* literalType = dynamic_cast<StringLiteralType const*>(argumentType);
-			literalType && !literalType->value().empty() && literalType->value().size() <= 32
-		)
-			targetTypes.emplace_back(TypeProvider::fixedBytes(static_cast<unsigned>(literalType->value().size())));
-		else
-		{
-			solAssert(!dynamic_cast<RationalNumberType const*>(argumentType));
-			targetTypes.emplace_back(
-				_functionTypeKind == FunctionType::Kind::StringConcat ?
-				TypeProvider::stringMemory() :
-				TypeProvider::bytesMemory()
-			);
-		}
-		totalParams += argumentType->sizeOnStack();
-		functionName += "_" + argumentType->identifier();
-	}
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(<parameters>) -> outPtr {
-				outPtr := <allocateUnbounded>()
-				let dataStart := add(outPtr, 0x20)
-				let dataEnd := <encodePacked>(dataStart<?+parameters>, <parameters></+parameters>)
-				mstore(outPtr, sub(dataEnd, dataStart))
-				<finalizeAllocation>(outPtr, sub(dataEnd, outPtr))
-			}
-		)");
-		templ("functionName", functionName);
-		templ("parameters", suffixedVariableNameList("param_", 0, totalParams));
-		templ("allocateUnbounded", allocateUnboundedFunction());
-		templ("finalizeAllocation", finalizeAllocationFunction());
-		templ(
-			"encodePacked",
-			ABIFunctions{m_evmVersion, m_revertStrings, m_functionCollector}.tupleEncoderPacked(
-				_argumentTypes,
-				targetTypes
-			)
-		);
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingType, Type const& _keyType)
-{
-	std::string functionName = "mapping_index_access_" + _mappingType.identifier() + "_of_" + _keyType.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (_mappingType.keyType()->isDynamicallySized())
-			return Whiskers(R"(
-				function <functionName>(slot <?+key>,</+key> <key>) -> dataSlot {
-					dataSlot := <hash>(<key> <?+key>,</+key> slot)
-				}
-			)")
-			("functionName", functionName)
-			("key", suffixedVariableNameList("key_", 0, _keyType.sizeOnStack()))
-			("hash", packedHashFunction(
-				{&_keyType, TypeProvider::uint256()},
-				{_mappingType.keyType(), TypeProvider::uint256()}
-			))
-			.render();
-		else
-		{
-			solAssert(CompilerUtils::freeMemoryPointer >= 0x40, "");
-			solAssert(!_mappingType.keyType()->isDynamicallyEncoded(), "");
-			solAssert(_mappingType.keyType()->calldataEncodedSize(false) <= 0x20, "");
-			Whiskers templ(R"(
-				function <functionName>(slot <key>) -> dataSlot {
-					mstore(0, <convertedKey>)
-					mstore(0x20, slot)
-					dataSlot := keccak256(0, 0x40)
-				}
-			)");
-			templ("functionName", functionName);
-			templ("key", _keyType.sizeOnStack() == 1 ? ", key" : "");
-			if (_keyType.sizeOnStack() == 0)
-				templ("convertedKey", conversionFunction(_keyType, *_mappingType.keyType()) + "()");
-			else
-				templ("convertedKey", conversionFunction(_keyType, *_mappingType.keyType()) + "(key)");
-			return templ.render();
-		}
-	});
-}
-
-std::string YulUtilFunctions::readFromStorage(Type const& _type, size_t _offset, bool _splitFunctionTypes)
-{
-	if (_type.isValueType())
-		return readFromStorageValueType(_type, _offset, _splitFunctionTypes);
-	else
-	{
-		solAssert(_offset == 0, "");
-		return readFromStorageReferenceType(_type);
-	}
-}
-
-std::string YulUtilFunctions::readFromStorageDynamic(Type const& _type, bool _splitFunctionTypes)
-{
-	if (_type.isValueType())
-		return readFromStorageValueType(_type, {}, _splitFunctionTypes);
-	std::string functionName =
-		"read_from_storage__dynamic_" +
-		std::string(_splitFunctionTypes ? "split_" : "") +
-		_type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		return Whiskers(R"(
-			function <functionName>(slot, offset) -> value {
-				if gt(offset, 0) { <panic>() }
-				value := <readFromStorage>(slot)
-			}
-		)")
-		("functionName", functionName)
-		("panic", panicFunction(util::PanicCode::Generic))
-		("readFromStorage", readFromStorageReferenceType(_type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::readFromStorageValueType(Type const& _type, std::optional<size_t> _offset, bool _splitFunctionTypes)
-{
-	solAssert(_type.isValueType(), "");
-
-	std::string functionName =
-			"read_from_storage_" +
-			std::string(_splitFunctionTypes ? "split_" : "") + (
-				_offset.has_value() ?
-				"offset_" + std::to_string(*_offset) :
-				"dynamic"
-			) +
-			"_" +
-			_type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		Whiskers templ(R"(
-			function <functionName>(slot<?dynamic>, offset</dynamic>) -> <?split>addr, selector<!split>value</split> {
-				<?split>let</split> value := <extract>(sload(slot)<?dynamic>, offset</dynamic>)
-				<?split>
-					addr, selector := <splitFunction>(value)
-				</split>
-			}
-		)");
-		templ("functionName", functionName);
-		templ("dynamic", !_offset.has_value());
-		if (_offset.has_value())
-			templ("extract", extractFromStorageValue(_type, *_offset));
-		else
-			templ("extract", extractFromStorageValueDynamic(_type));
-		auto const* funType = dynamic_cast<FunctionType const*>(&_type);
-		bool split = _splitFunctionTypes && funType && funType->kind() == FunctionType::Kind::External;
-		templ("split", split);
-		if (split)
-			templ("splitFunction", splitExternalFunctionIdFunction());
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::readFromStorageReferenceType(Type const& _type)
-{
-	if (auto const* arrayType = dynamic_cast<ArrayType const*>(&_type))
-	{
-		solAssert(arrayType->dataStoredIn(DataLocation::Memory), "");
-		return copyArrayFromStorageToMemoryFunction(
-			dynamic_cast<ArrayType const&>(*arrayType->copyForLocation(DataLocation::Storage, false)),
-			*arrayType
-		);
-	}
-	solAssert(_type.category() == Type::Category::Struct, "");
-
-	std::string functionName = "read_from_storage_reference_type_" + _type.identifier();
-
-	auto const& structType = dynamic_cast<StructType const&>(_type);
-	solAssert(structType.location() == DataLocation::Memory, "");
-	MemberList::MemberMap structMembers = structType.nativeMembers(nullptr);
-	std::vector<std::map<std::string, std::string>> memberSetValues(structMembers.size());
-	for (size_t i = 0; i < structMembers.size(); ++i)
-	{
-		auto const& [memberSlotDiff, memberStorageOffset] = structType.storageOffsetsOfMember(structMembers[i].name);
-		solAssert(structMembers[i].type->isValueType() || memberStorageOffset == 0, "");
-
-		memberSetValues[i]["setMember"] = Whiskers(R"(
-			{
-				let <memberValues> := <readFromStorage>(add(slot, <memberSlotDiff>))
-				<writeToMemory>(add(value, <memberMemoryOffset>), <memberValues>)
-			}
-		)")
-		("memberValues", suffixedVariableNameList("memberValue_", 0, structMembers[i].type->stackItems().size()))
-		("memberMemoryOffset", structType.memoryOffsetOfMember(structMembers[i].name).str())
-		("memberSlotDiff",  memberSlotDiff.str())
-		("readFromStorage", readFromStorage(*structMembers[i].type, memberStorageOffset, true))
-		("writeToMemory", writeToMemoryFunction(*structMembers[i].type))
-		.render();
-	}
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		return Whiskers(R"(
-			function <functionName>(slot) -> value {
-				value := <allocStruct>()
-				<#member>
-					<setMember>
-				</member>
-			}
-		)")
-		("functionName", functionName)
-		("allocStruct", allocateMemoryStructFunction(structType))
-		("member", memberSetValues)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::readFromMemory(Type const& _type)
-{
-	return readFromMemoryOrCalldata(_type, false);
-}
-
-std::string YulUtilFunctions::readFromCalldata(Type const& _type)
-{
-	return readFromMemoryOrCalldata(_type, true);
-}
-
-std::string YulUtilFunctions::updateStorageValueFunction(
-	Type const& _fromType,
-	Type const& _toType,
-	std::optional<unsigned> const& _offset
-)
-{
-	std::string const functionName =
-		"update_storage_value_" +
-		(_offset.has_value() ? ("offset_" + std::to_string(*_offset)) : "") +
-		_fromType.identifier() +
-		"_to_" +
-		_toType.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		if (_toType.isValueType())
-		{
-			solAssert(_fromType.isImplicitlyConvertibleTo(_toType), "");
-			solAssert(_toType.storageBytes() <= 32, "Invalid storage bytes size.");
-			solAssert(_toType.storageBytes() > 0, "Invalid storage bytes size.");
-
-			return Whiskers(R"(
-				function <functionName>(slot, <offset><fromValues>) {
-					let <toValues> := <convert>(<fromValues>)
-					sstore(slot, <update>(sload(slot), <offset><prepare>(<toValues>)))
-				}
-
-			)")
-			("functionName", functionName)
-			("update",
-				_offset.has_value() ?
-					updateByteSliceFunction(_toType.storageBytes(), *_offset) :
-					updateByteSliceFunctionDynamic(_toType.storageBytes())
-			)
-			("offset", _offset.has_value() ? "" : "offset, ")
-			("convert", conversionFunction(_fromType, _toType))
-			("fromValues", suffixedVariableNameList("value_", 0, _fromType.sizeOnStack()))
-			("toValues", suffixedVariableNameList("convertedValue_", 0, _toType.sizeOnStack()))
-			("prepare", prepareStoreFunction(_toType))
-			.render();
-		}
-
-		auto const* toReferenceType = dynamic_cast<ReferenceType const*>(&_toType);
-		auto const* fromReferenceType = dynamic_cast<ReferenceType const*>(&_fromType);
-		solAssert(toReferenceType, "");
-
-		if (!fromReferenceType)
-		{
-			solAssert(_fromType.category() == Type::Category::StringLiteral, "");
-			solAssert(toReferenceType->category() == Type::Category::Array, "");
-			auto const& toArrayType = dynamic_cast<ArrayType const&>(*toReferenceType);
-			solAssert(toArrayType.isByteArrayOrString(), "");
-
-			return Whiskers(R"(
-				function <functionName>(slot<?dynamicOffset>, offset</dynamicOffset>) {
-					<?dynamicOffset>if offset { <panic>() }</dynamicOffset>
-					<copyToStorage>(slot)
-				}
-			)")
-			("functionName", functionName)
-			("dynamicOffset", !_offset.has_value())
-			("panic", panicFunction(PanicCode::Generic))
-			("copyToStorage", copyLiteralToStorageFunction(dynamic_cast<StringLiteralType const&>(_fromType).value()))
-			.render();
-		}
-
-		solAssert((*toReferenceType->copyForLocation(
-			fromReferenceType->location(),
-			fromReferenceType->isPointer()
-		).get()).equals(*fromReferenceType), "");
-
-		if (fromReferenceType->category() == Type::Category::ArraySlice)
-			solAssert(toReferenceType->category() == Type::Category::Array, "");
-		else
-			solAssert(toReferenceType->category() == fromReferenceType->category(), "");
-		solAssert(_offset.value_or(0) == 0, "");
-
-		Whiskers templ(R"(
-			function <functionName>(slot, <?dynamicOffset>offset, </dynamicOffset><value>) {
-				<?dynamicOffset>if offset { <panic>() }</dynamicOffset>
-				<copyToStorage>(slot, <value>)
-			}
-		)");
-		templ("functionName", functionName);
-		templ("dynamicOffset", !_offset.has_value());
-		templ("panic", panicFunction(PanicCode::Generic));
-		templ("value", suffixedVariableNameList("value_", 0, _fromType.sizeOnStack()));
-		if (_fromType.category() == Type::Category::Array)
-			templ("copyToStorage", copyArrayToStorageFunction(
-				dynamic_cast<ArrayType const&>(_fromType),
-				dynamic_cast<ArrayType const&>(_toType)
-			));
-		else if (_fromType.category() == Type::Category::ArraySlice)
-		{
-			solAssert(
-				_fromType.dataStoredIn(DataLocation::CallData),
-				"Currently only calldata array slices are supported!"
-			);
-			templ("copyToStorage", copyArrayToStorageFunction(
-				dynamic_cast<ArraySliceType const&>(_fromType).arrayType(),
-				dynamic_cast<ArrayType const&>(_toType)
-			));
-		}
-		else
-			templ("copyToStorage", copyStructToStorageFunction(
-				dynamic_cast<StructType const&>(_fromType),
-				dynamic_cast<StructType const&>(_toType)
-			));
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::writeToMemoryFunction(Type const& _type)
-{
-	std::string const functionName = "write_to_memory_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		solAssert(!dynamic_cast<StringLiteralType const*>(&_type), "");
-		if (auto ref = dynamic_cast<ReferenceType const*>(&_type))
-		{
-			solAssert(
-				ref->location() == DataLocation::Memory,
-				"Can only update types with location memory."
-			);
-
-			return Whiskers(R"(
-				function <functionName>(memPtr, value) {
-					mstore(memPtr, value)
-				}
-			)")
-			("functionName", functionName)
-			.render();
-		}
-		else if (
-			_type.category() == Type::Category::Function &&
-			dynamic_cast<FunctionType const&>(_type).kind() == FunctionType::Kind::External
-		)
-		{
-			return Whiskers(R"(
-				function <functionName>(memPtr, addr, selector) {
-					mstore(memPtr, <combine>(addr, selector))
-				}
-			)")
-			("functionName", functionName)
-			("combine", combineExternalFunctionIdFunction())
-			.render();
-		}
-		else if (_type.isValueType())
-		{
-			return Whiskers(R"(
-				function <functionName>(memPtr, value) {
-					mstore(memPtr, <cleanup>(value))
-				}
-			)")
-			("functionName", functionName)
-			("cleanup", cleanupFunction(_type))
-			.render();
-		}
-		else // Should never happen
-		{
-			solAssert(
-				false,
-				"Memory store of type " + _type.toString(true) + " not allowed."
-			);
-		}
-	});
-}
-
-std::string YulUtilFunctions::extractFromStorageValueDynamic(Type const& _type)
-{
-	std::string functionName =
-		"extract_from_storage_value_dynamic" +
-		_type.identifier();
-	return m_functionCollector.createFunction(functionName, [&] {
-		return Whiskers(R"(
-			function <functionName>(slot_value, offset) -> value {
-				value := <cleanupStorage>(<shr>(mul(offset, 8), slot_value))
-			}
-		)")
-		("functionName", functionName)
-		("shr", shiftRightFunctionDynamic())
-		("cleanupStorage", cleanupFromStorageFunction(_type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::extractFromStorageValue(Type const& _type, size_t _offset)
-{
-	std::string functionName = "extract_from_storage_value_offset_" + std::to_string(_offset) + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&] {
-		return Whiskers(R"(
-			function <functionName>(slot_value) -> value {
-				value := <cleanupStorage>(<shr>(slot_value))
-			}
-		)")
-		("functionName", functionName)
-		("shr", shiftRightFunction(_offset * 8))
-		("cleanupStorage", cleanupFromStorageFunction(_type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::cleanupFromStorageFunction(Type const& _type)
-{
-	solAssert(_type.isValueType(), "");
-
-	std::string functionName = std::string("cleanup_from_storage_") + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&] {
-		Whiskers templ(R"(
-			function <functionName>(value) -> cleaned {
-				cleaned := <cleaned>
-			}
-		)");
-		templ("functionName", functionName);
-
-		Type const* encodingType = &_type;
-		if (_type.category() == Type::Category::UserDefinedValueType)
-			encodingType = _type.encodingType();
-		unsigned storageBytes = encodingType->storageBytes();
-		if (IntegerType const* intType = dynamic_cast<IntegerType const*>(encodingType))
-			if (intType->isSigned() && storageBytes != 32)
-			{
-				templ("cleaned", "signextend(" + std::to_string(storageBytes - 1) + ", value)");
-				return templ.render();
-			}
-
-		if (storageBytes == 32)
-			templ("cleaned", "value");
-		else if (encodingType->leftAligned())
-			templ("cleaned", shiftLeftFunction(256 - 8 * storageBytes) + "(value)");
-		else
-			templ("cleaned", "and(value, " + toCompactHexWithPrefix((u256(1) << (8 * storageBytes)) - 1) + ")");
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::prepareStoreFunction(Type const& _type)
-{
-	std::string functionName = "prepare_store_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		solAssert(_type.isValueType(), "");
-		auto const* funType = dynamic_cast<FunctionType const*>(&_type);
-		if (funType && funType->kind() == FunctionType::Kind::External)
-		{
-			Whiskers templ(R"(
-				function <functionName>(addr, selector) -> ret {
-					ret := <prepareBytes>(<combine>(addr, selector))
-				}
-			)");
-			templ("functionName", functionName);
-			templ("prepareBytes", prepareStoreFunction(*TypeProvider::fixedBytes(24)));
-			templ("combine", combineExternalFunctionIdFunction());
-			return templ.render();
-		}
-		else
-		{
-			solAssert(_type.sizeOnStack() == 1, "");
-			Whiskers templ(R"(
-				function <functionName>(value) -> ret {
-					ret := <actualPrepare>
-				}
-			)");
-			templ("functionName", functionName);
-			if (_type.leftAligned())
-				templ("actualPrepare", shiftRightFunction(256 - 8 * _type.storageBytes()) + "(value)");
-			else
-				templ("actualPrepare", "value");
-			return templ.render();
-		}
-	});
-}
-
-std::string YulUtilFunctions::allocationFunction()
-{
-	std::string functionName = "allocate_memory";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(size) -> memPtr {
-				memPtr := <allocateUnbounded>()
-				<finalizeAllocation>(memPtr, size)
-			}
-		)")
-		("functionName", functionName)
-		("allocateUnbounded", allocateUnboundedFunction())
-		("finalizeAllocation", finalizeAllocationFunction())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::allocateUnboundedFunction()
-{
-	std::string functionName = "allocate_unbounded";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>() -> memPtr {
-				memPtr := mload(<freeMemoryPointer>)
-			}
-		)")
-		("freeMemoryPointer", std::to_string(CompilerUtils::freeMemoryPointer))
-		("functionName", functionName)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::finalizeAllocationFunction()
-{
-	std::string functionName = "finalize_allocation";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(memPtr, size) {
-				let newFreePtr := add(memPtr, <roundUp>(size))
-				// protect against overflow
-				if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { <panic>() }
-				mstore(<freeMemoryPointer>, newFreePtr)
-			}
-		)")
-		("functionName", functionName)
-		("freeMemoryPointer", std::to_string(CompilerUtils::freeMemoryPointer))
-		("roundUp", roundUpFunction())
-		("panic", panicFunction(PanicCode::ResourceError))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::zeroMemoryArrayFunction(ArrayType const& _type)
-{
-	if (_type.baseType()->hasSimpleZeroValueInMemory())
-		return zeroMemoryFunction(*_type.baseType());
-	return zeroComplexMemoryArrayFunction(_type);
-}
-
-std::string YulUtilFunctions::zeroMemoryFunction(Type const& _type)
-{
-	solAssert(_type.hasSimpleZeroValueInMemory(), "");
-
-	std::string functionName = "zero_memory_chunk_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(dataStart, dataSizeInBytes) {
-				calldatacopy(dataStart, calldatasize(), dataSizeInBytes)
-			}
-		)")
-		("functionName", functionName)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::zeroComplexMemoryArrayFunction(ArrayType const& _type)
-{
-	solAssert(!_type.baseType()->hasSimpleZeroValueInMemory(), "");
-
-	std::string functionName = "zero_complex_memory_array_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		solAssert(_type.memoryStride() == 32, "");
-		return Whiskers(R"(
-			function <functionName>(dataStart, dataSizeInBytes) {
-				for {let i := 0} lt(i, dataSizeInBytes) { i := add(i, <stride>) } {
-					mstore(add(dataStart, i), <zeroValue>())
-				}
-			}
-		)")
-		("functionName", functionName)
-		("stride", std::to_string(_type.memoryStride()))
-		("zeroValue", zeroValueFunction(*_type.baseType(), false))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::allocateMemoryArrayFunction(ArrayType const& _type)
-{
-	std::string functionName = "allocate_memory_array_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-				function <functionName>(length) -> memPtr {
-					let allocSize := <allocSize>(length)
-					memPtr := <alloc>(allocSize)
-					<?dynamic>
-					mstore(memPtr, length)
-					</dynamic>
-				}
-			)")
-			("functionName", functionName)
-			("alloc", allocationFunction())
-			("allocSize", arrayAllocationSizeFunction(_type))
-			("dynamic", _type.isDynamicallySized())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::allocateAndInitializeMemoryArrayFunction(ArrayType const& _type)
-{
-	std::string functionName = "allocate_and_zero_memory_array_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-				function <functionName>(length) -> memPtr {
-					memPtr := <allocArray>(length)
-					let dataStart := memPtr
-					let dataSize := <allocSize>(length)
-					<?dynamic>
-					dataStart := add(dataStart, 32)
-					dataSize := sub(dataSize, 32)
-					</dynamic>
-					<zeroArrayFunction>(dataStart, dataSize)
-				}
-			)")
-			("functionName", functionName)
-			("allocArray", allocateMemoryArrayFunction(_type))
-			("allocSize", arrayAllocationSizeFunction(_type))
-			("zeroArrayFunction", zeroMemoryArrayFunction(_type))
-			("dynamic", _type.isDynamicallySized())
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::allocateMemoryStructFunction(StructType const& _type)
-{
-	std::string functionName = "allocate_memory_struct_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-		function <functionName>() -> memPtr {
-			memPtr := <alloc>(<allocSize>)
-		}
-		)");
-		templ("functionName", functionName);
-		templ("alloc", allocationFunction());
-		templ("allocSize", _type.memoryDataSize().str());
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::allocateAndInitializeMemoryStructFunction(StructType const& _type)
-{
-	std::string functionName = "allocate_and_zero_memory_struct_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-		function <functionName>() -> memPtr {
-			memPtr := <allocStruct>()
-			let offset := memPtr
-			<#member>
-				mstore(offset, <zeroValue>())
-				offset := add(offset, 32)
-			</member>
-		}
-		)");
-		templ("functionName", functionName);
-		templ("allocStruct", allocateMemoryStructFunction(_type));
-
-		TypePointers const& members = _type.memoryMemberTypes();
-
-		std::vector<std::map<std::string, std::string>> memberParams(members.size());
-		for (size_t i = 0; i < members.size(); ++i)
-		{
-			solAssert(members[i]->memoryHeadSize() == 32, "");
-			memberParams[i]["zeroValue"] = zeroValueFunction(
-				*TypeProvider::withLocationIfReference(DataLocation::Memory, members[i]),
-				false
-			);
-		}
-		templ("member", memberParams);
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
-{
-	if (_from.category() == Type::Category::UserDefinedValueType)
-	{
-		solAssert(_from == _to || _to == dynamic_cast<UserDefinedValueType const&>(_from).underlyingType(), "");
-		return conversionFunction(dynamic_cast<UserDefinedValueType const&>(_from).underlyingType(), _to);
-	}
-	if (_to.category() == Type::Category::UserDefinedValueType)
-	{
-		solAssert(_from == _to || _from.isImplicitlyConvertibleTo(dynamic_cast<UserDefinedValueType const&>(_to).underlyingType()), "");
-		return conversionFunction(_from, dynamic_cast<UserDefinedValueType const&>(_to).underlyingType());
-	}
-	if (_from.category() == Type::Category::Function)
-	{
-		solAssert(_to.category() == Type::Category::Function, "");
-		FunctionType const& fromType = dynamic_cast<FunctionType const&>(_from);
-		FunctionType const& targetType = dynamic_cast<FunctionType const&>(_to);
-		solAssert(
-			fromType.isImplicitlyConvertibleTo(targetType) &&
-			fromType.sizeOnStack() == targetType.sizeOnStack() &&
-			(fromType.kind() == FunctionType::Kind::Internal || fromType.kind() == FunctionType::Kind::External) &&
-			fromType.kind() == targetType.kind(),
-			"Invalid function type conversion requested."
-		);
-		std::string const functionName =
-			"convert_" +
-			_from.identifier() +
-			"_to_" +
-			_to.identifier();
-		return m_functionCollector.createFunction(functionName, [&]() {
-			return Whiskers(R"(
-				function <functionName>(<?external>addr, </external>functionId) -> <?external>outAddr, </external>outFunctionId {
-					<?external>outAddr := addr</external>
-					outFunctionId := functionId
-				}
-			)")
-			("functionName", functionName)
-			("external", fromType.kind() == FunctionType::Kind::External)
-			.render();
-		});
-	}
-	else if (_from.category() == Type::Category::ArraySlice)
-	{
-		auto const& fromType = dynamic_cast<ArraySliceType const&>(_from);
-		if (_to.category() == Type::Category::FixedBytes)
-		{
-			solAssert(fromType.arrayType().isByteArray(), "Array types other than bytes not convertible to bytesNN.");
-			return bytesToFixedBytesConversionFunction(fromType.arrayType(), dynamic_cast<FixedBytesType const &>(_to));
-		}
-		solAssert(_to.category() == Type::Category::Array);
-		auto const& targetType = dynamic_cast<ArrayType const&>(_to);
-
-		solAssert(
-			fromType.arrayType().isImplicitlyConvertibleTo(targetType) ||
-			(fromType.arrayType().isByteArrayOrString() && targetType.isByteArrayOrString())
-		);
-		solAssert(
-			fromType.arrayType().dataStoredIn(DataLocation::CallData) &&
-			fromType.arrayType().isDynamicallySized() &&
-			!fromType.arrayType().baseType()->isDynamicallyEncoded()
-		);
-
-		if (!targetType.dataStoredIn(DataLocation::CallData))
-			return arrayConversionFunction(fromType.arrayType(), targetType);
-
-		std::string const functionName =
-			"convert_" +
-			_from.identifier() +
-			"_to_" +
-			_to.identifier();
-		return m_functionCollector.createFunction(functionName, [&]() {
-			return Whiskers(R"(
-				function <functionName>(offset, length) -> outOffset, outLength {
-					outOffset := offset
-					outLength := length
-				}
-			)")
-			("functionName", functionName)
-			.render();
-		});
-	}
-	else if (_from.category() == Type::Category::Array)
-	{
-		auto const& fromArrayType =  dynamic_cast<ArrayType const&>(_from);
-		if (_to.category() == Type::Category::FixedBytes)
-		{
-			solAssert(fromArrayType.isByteArray(), "Array types other than bytes not convertible to bytesNN.");
-			return bytesToFixedBytesConversionFunction(fromArrayType, dynamic_cast<FixedBytesType const &>(_to));
-		}
-		solAssert(_to.category() == Type::Category::Array, "");
-		return arrayConversionFunction(fromArrayType, dynamic_cast<ArrayType const&>(_to));
-	}
-
-	if (_from.sizeOnStack() != 1 || _to.sizeOnStack() != 1)
-		return conversionFunctionSpecial(_from, _to);
-
-	std::string functionName =
-		"convert_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(value) -> converted {
-				<body>
-			}
-		)");
-		templ("functionName", functionName);
-		std::string body;
-		auto toCategory = _to.category();
-		auto fromCategory = _from.category();
-		switch (fromCategory)
-		{
-		case Type::Category::Address:
-		case Type::Category::Contract:
-			body =
-				Whiskers("converted := <convert>(value)")
-					("convert", conversionFunction(IntegerType(160), _to))
-					.render();
-			break;
-		case Type::Category::Integer:
-		case Type::Category::RationalNumber:
-		{
-			solAssert(_from.mobileType(), "");
-			if (RationalNumberType const* rational = dynamic_cast<RationalNumberType const*>(&_from))
-				if (rational->isFractional())
-					solAssert(toCategory == Type::Category::FixedPoint, "");
-
-			if (toCategory == Type::Category::Address || toCategory == Type::Category::Contract)
-				body =
-					Whiskers("converted := <convert>(value)")
-					("convert", conversionFunction(_from, IntegerType(160)))
-					.render();
-			else
-			{
-				Whiskers bodyTemplate("converted := <cleanOutput>(<convert>(<cleanInput>(value)))");
-				bodyTemplate("cleanInput", cleanupFunction(_from));
-				bodyTemplate("cleanOutput", cleanupFunction(_to));
-				std::string convert;
-
-				solAssert(_to.category() != Type::Category::UserDefinedValueType, "");
-				if (auto const* toFixedBytes = dynamic_cast<FixedBytesType const*>(&_to))
-					convert = shiftLeftFunction(256 - toFixedBytes->numBytes() * 8);
-				else if (dynamic_cast<FixedPointType const*>(&_to))
-					solUnimplemented("");
-				else if (dynamic_cast<IntegerType const*>(&_to))
-				{
-					solUnimplementedAssert(fromCategory != Type::Category::FixedPoint);
-					convert = identityFunction();
-				}
-				else if (toCategory == Type::Category::Enum)
-				{
-					solAssert(fromCategory != Type::Category::FixedPoint, "");
-					convert = identityFunction();
-				}
-				else
-					solAssert(false, "");
-				solAssert(!convert.empty(), "");
-				bodyTemplate("convert", convert);
-				body = bodyTemplate.render();
-			}
-			break;
-		}
-		case Type::Category::Bool:
-		{
-			solAssert(_from == _to, "Invalid conversion for bool.");
-			body =
-				Whiskers("converted := <clean>(value)")
-				("clean", cleanupFunction(_from))
-				.render();
-			break;
-		}
-		case Type::Category::FixedPoint:
-			solUnimplemented("Fixed point types not implemented.");
-			break;
-		case Type::Category::Struct:
-		{
-			solAssert(toCategory == Type::Category::Struct, "");
-			auto const& fromStructType = dynamic_cast<StructType const &>(_from);
-			auto const& toStructType = dynamic_cast<StructType const &>(_to);
-			solAssert(fromStructType.structDefinition() == toStructType.structDefinition(), "");
-
-			if (fromStructType.location() == toStructType.location() && toStructType.isPointer())
-				body = "converted := value";
-			else
-			{
-				solUnimplementedAssert(toStructType.location() == DataLocation::Memory);
-				solUnimplementedAssert(fromStructType.location() != DataLocation::Memory);
-
-				if (fromStructType.location() == DataLocation::CallData)
-					body = Whiskers(R"(
-						converted := <abiDecode>(value, calldatasize())
-					)")
-					(
-						"abiDecode",
-						ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector).abiDecodingFunctionStruct(
-							toStructType,
-							false
-						)
-					).render();
-				else
-				{
-					solAssert(fromStructType.location() == DataLocation::Storage, "");
-
-					body = Whiskers(R"(
-						converted := <readFromStorage>(value)
-					)")
-					("readFromStorage", readFromStorage(toStructType, 0, true))
-					.render();
-				}
-			}
-
-			break;
-		}
-		case Type::Category::FixedBytes:
-		{
-			FixedBytesType const& from = dynamic_cast<FixedBytesType const&>(_from);
-			if (toCategory == Type::Category::Integer)
-				body =
-					Whiskers("converted := <convert>(<shift>(value))")
-					("shift", shiftRightFunction(256 - from.numBytes() * 8))
-					("convert", conversionFunction(IntegerType(from.numBytes() * 8), _to))
-					.render();
-			else if (toCategory == Type::Category::Address)
-				body =
-					Whiskers("converted := <convert>(value)")
-						("convert", conversionFunction(_from, IntegerType(160)))
-						.render();
-			else
-			{
-				solAssert(toCategory == Type::Category::FixedBytes, "Invalid type conversion requested.");
-				FixedBytesType const& to = dynamic_cast<FixedBytesType const&>(_to);
-				body =
-					Whiskers("converted := <clean>(value)")
-					("clean", cleanupFunction((to.numBytes() <= from.numBytes()) ? to : from))
-					.render();
-			}
-			break;
-		}
-		case Type::Category::Function:
-		{
-			solAssert(false, "Conversion should not be called for function types.");
-			break;
-		}
-		case Type::Category::Enum:
-		{
-			solAssert(toCategory == Type::Category::Integer || _from == _to, "");
-			EnumType const& enumType = dynamic_cast<decltype(enumType)>(_from);
-			body =
-				Whiskers("converted := <clean>(value)")
-				("clean", cleanupFunction(enumType))
-				.render();
-			break;
-		}
-		case Type::Category::Tuple:
-		{
-			solUnimplemented("Tuple conversion not implemented.");
-			break;
-		}
-		case Type::Category::TypeType:
-		{
-			TypeType const& typeType = dynamic_cast<decltype(typeType)>(_from);
-			if (
-				auto const* contractType = dynamic_cast<ContractType const*>(typeType.actualType());
-				contractType->contractDefinition().isLibrary() &&
-				_to == *TypeProvider::address()
-			)
-				body = "converted := value";
-			else
-				solAssert(false, "Invalid conversion from " + _from.canonicalName() + " to " + _to.canonicalName());
-			break;
-		}
-		case Type::Category::Mapping:
-		{
-			solAssert(_from == _to, "");
-			body = "converted := value";
-			break;
-		}
-		default:
-			solAssert(false, "Invalid conversion from " + _from.canonicalName() + " to " + _to.canonicalName());
-		}
-
-		solAssert(!body.empty(), _from.canonicalName() + " to " + _to.canonicalName());
-		templ("body", body);
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _from, FixedBytesType const& _to)
-{
-	solAssert(_from.isByteArray(), "");
-	solAssert(_from.isDynamicallySized(), "");
-	std::string functionName = "convert_bytes_to_fixedbytes_from_" + _from.identifier() + "_to_" + _to.identifier();
-	return m_functionCollector.createFunction(functionName, [&](auto& _args, auto& _returnParams) {
-		_args = { "array" };
-		bool fromCalldata = _from.dataStoredIn(DataLocation::CallData);
-		if (fromCalldata)
-			_args.emplace_back("len");
-		_returnParams = {"value"};
-		Whiskers templ(R"(
-			let length := <arrayLen>(array<?fromCalldata>, len</fromCalldata>)
-			let dataArea := array
-			<?fromMemory>
-				dataArea := <dataArea>(array)
-			</fromMemory>
-			<?fromStorage>
-				if gt(length, 31) { dataArea := <dataArea>(array) }
-			</fromStorage>
-
-			<?fromCalldata>
-				value := <cleanup>(calldataload(dataArea))
-			<!fromCalldata>
-				value := <extractValue>(dataArea)
-			</fromCalldata>
-
-			if lt(length, <fixedBytesLen>) {
-				value := and(
-					value,
-					<shl>(
-						mul(8, sub(<fixedBytesLen>, length)),
-						<mask>
-					)
-				)
-			}
-		)");
-		templ("fromCalldata", fromCalldata);
-		templ("arrayLen", arrayLengthFunction(_from));
-		templ("fixedBytesLen", std::to_string(_to.numBytes()));
-		templ("fromMemory", _from.dataStoredIn(DataLocation::Memory));
-		templ("fromStorage", _from.dataStoredIn(DataLocation::Storage));
-		templ("dataArea", arrayDataAreaFunction(_from));
-		if (fromCalldata)
-			templ("cleanup", cleanupFunction(_to));
-		else
-			templ(
-				"extractValue",
-				_from.dataStoredIn(DataLocation::Storage) ?
-				readFromStorage(_to, 32 - _to.numBytes(), false) :
-				readFromMemory(_to)
-			);
-		templ("shl", shiftLeftFunctionDynamic());
-		templ("mask", formatNumber(~((u256(1) << (256 - _to.numBytes() * 8)) - 1)));
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, StructType const& _to)
-{
-	solAssert(_to.dataStoredIn(DataLocation::Storage), "");
-	solAssert(_from.structDefinition() == _to.structDefinition(), "");
-
-	std::string functionName =
-		"copy_struct_to_storage_from_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&](auto& _arguments, auto&) {
-		_arguments = {"slot", "value"};
-		Whiskers templ(R"(
-			<?fromStorage> if iszero(eq(slot, value)) { </fromStorage>
-			<#member>
-			{
-				<updateMemberCall>
-			}
-			</member>
-			<?fromStorage> } </fromStorage>
-		)");
-		templ("fromStorage", _from.dataStoredIn(DataLocation::Storage));
-
-		MemberList::MemberMap structMembers = _from.nativeMembers(nullptr);
-		MemberList::MemberMap toStructMembers = _to.nativeMembers(nullptr);
-
-		std::vector<std::map<std::string, std::string>> memberParams(structMembers.size());
-		for (size_t i = 0; i < structMembers.size(); ++i)
-		{
-			Type const& memberType = *structMembers[i].type;
-			solAssert(memberType.memoryHeadSize() == 32, "");
-			auto const&[slotDiff, offset] = _to.storageOffsetsOfMember(structMembers[i].name);
-
-			Whiskers t(R"(
-				let memberSlot := add(slot, <memberStorageSlotDiff>)
-				let memberSrcPtr := add(value, <memberOffset>)
-
-				<?fromCalldata>
-					let <memberValues> :=
-						<?dynamicallyEncodedMember>
-							<accessCalldataTail>(value, memberSrcPtr)
-						<!dynamicallyEncodedMember>
-							memberSrcPtr
-						</dynamicallyEncodedMember>
-
-					<?isValueType>
-						<memberValues> := <read>(<memberValues>)
-					</isValueType>
-				</fromCalldata>
-
-				<?fromMemory>
-					let <memberValues> := <read>(memberSrcPtr)
-				</fromMemory>
-
-				<?fromStorage>
-					let <memberValues> :=
-						<?isValueType>
-							<read>(memberSrcPtr)
-						<!isValueType>
-							memberSrcPtr
-						</isValueType>
-				</fromStorage>
-
-				<updateStorageValue>(memberSlot, <memberValues>)
-			)");
-			bool fromCalldata = _from.location() == DataLocation::CallData;
-			t("fromCalldata", fromCalldata);
-			bool fromMemory = _from.location() == DataLocation::Memory;
-			t("fromMemory", fromMemory);
-			bool fromStorage = _from.location() == DataLocation::Storage;
-			t("fromStorage", fromStorage);
-			t("isValueType", memberType.isValueType());
-			t("memberValues", suffixedVariableNameList("memberValue_", 0, memberType.stackItems().size()));
-
-			t("memberStorageSlotDiff", slotDiff.str());
-			if (fromCalldata)
-			{
-				t("memberOffset", std::to_string(_from.calldataOffsetOfMember(structMembers[i].name)));
-				t("dynamicallyEncodedMember", memberType.isDynamicallyEncoded());
-				if (memberType.isDynamicallyEncoded())
-					t("accessCalldataTail", accessCalldataTailFunction(memberType));
-				if (memberType.isValueType())
-					t("read", readFromCalldata(memberType));
-			}
-			else if (fromMemory)
-			{
-				t("memberOffset", _from.memoryOffsetOfMember(structMembers[i].name).str());
-				t("read", readFromMemory(memberType));
-			}
-			else if (fromStorage)
-			{
-				auto const& [srcSlotOffset, srcOffset] = _from.storageOffsetsOfMember(structMembers[i].name);
-				t("memberOffset", formatNumber(srcSlotOffset));
-				if (memberType.isValueType())
-					t("read", readFromStorageValueType(memberType, srcOffset, true));
-				else
-					solAssert(srcOffset == 0, "");
-
-			}
-			t("updateStorageValue", updateStorageValueFunction(
-				memberType,
-				*toStructMembers[i].type,
-				std::optional<unsigned>{offset}
-			));
-			memberParams[i]["updateMemberCall"] = t.render();
-		}
-		templ("member", memberParams);
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayType const& _to)
-{
-	if (_to.dataStoredIn(DataLocation::CallData))
-		solAssert(
-			_from.dataStoredIn(DataLocation::CallData) && _from.isByteArrayOrString() && _to.isByteArrayOrString(),
-			""
-		);
-
-	// Other cases are done explicitly in LValue::storeValue, and only possible by assignment.
-	if (_to.location() == DataLocation::Storage)
-		solAssert(
-			(_to.isPointer() || (_from.isByteArrayOrString() && _to.isByteArrayOrString())) &&
-			_from.location() == DataLocation::Storage,
-			"Invalid conversion to storage type."
-		);
-
-	std::string functionName =
-		"convert_array_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(value<?fromCalldataDynamic>, length</fromCalldataDynamic>) -> converted <?toCalldataDynamic>, outLength</toCalldataDynamic> {
-				<body>
-				<?toCalldataDynamic>
-					outLength := <length>
-				</toCalldataDynamic>
-			}
-		)");
-		templ("functionName", functionName);
-		templ("fromCalldataDynamic", _from.dataStoredIn(DataLocation::CallData) && _from.isDynamicallySized());
-		templ("toCalldataDynamic", _to.dataStoredIn(DataLocation::CallData) && _to.isDynamicallySized());
-		templ("length", _from.isDynamicallySized() ? "length" : _from.length().str());
-
-		if (
-			_from == _to ||
-			(_from.dataStoredIn(DataLocation::Memory) && _to.dataStoredIn(DataLocation::Memory)) ||
-			(_from.dataStoredIn(DataLocation::CallData) && _to.dataStoredIn(DataLocation::CallData)) ||
-			_to.dataStoredIn(DataLocation::Storage)
-		)
-			templ("body", "converted := value");
-		else if (_to.dataStoredIn(DataLocation::Memory))
-			templ(
-				"body",
-				Whiskers(R"(
-					// Copy the array to a free position in memory
-					converted :=
-					<?fromStorage>
-						<arrayStorageToMem>(value)
-					</fromStorage>
-					<?fromCalldata>
-						<abiDecode>(value, <length>, calldatasize())
-					</fromCalldata>
-				)")
-				("fromStorage", _from.dataStoredIn(DataLocation::Storage))
-				("fromCalldata", _from.dataStoredIn(DataLocation::CallData))
-				("length", _from.isDynamicallySized() ? "length" : _from.length().str())
-				(
-					"abiDecode",
-					_from.dataStoredIn(DataLocation::CallData) ?
-					ABIFunctions(
-						m_evmVersion,
-						m_revertStrings,
-						m_functionCollector
-					).abiDecodingFunctionArrayAvailableLength(_to, false) :
-					""
-				)
-				(
-					"arrayStorageToMem",
-					_from.dataStoredIn(DataLocation::Storage) ? copyArrayFromStorageToMemoryFunction(_from, _to) : ""
-				)
-				.render()
-			);
-		else
-			solAssert(false, "");
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::cleanupFunction(Type const& _type)
-{
-	if (auto userDefinedValueType = dynamic_cast<UserDefinedValueType const*>(&_type))
-		return cleanupFunction(userDefinedValueType->underlyingType());
-
-	std::string functionName = std::string("cleanup_") + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(value) -> cleaned {
-				<body>
-			}
-		)");
-		templ("functionName", functionName);
-		switch (_type.category())
-		{
-		case Type::Category::Address:
-			templ("body", "cleaned := " + cleanupFunction(IntegerType(160)) + "(value)");
-			break;
-		case Type::Category::Integer:
-		{
-			IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-			if (type.numBits() == 256)
-				templ("body", "cleaned := value");
-			else if (type.isSigned())
-				templ("body", "cleaned := signextend(" + std::to_string(type.numBits() / 8 - 1) + ", value)");
-			else
-				templ("body", "cleaned := and(value, " + toCompactHexWithPrefix((u256(1) << type.numBits()) - 1) + ")");
-			break;
-		}
-		case Type::Category::RationalNumber:
-			templ("body", "cleaned := value");
-			break;
-		case Type::Category::Bool:
-			templ("body", "cleaned := iszero(iszero(value))");
-			break;
-		case Type::Category::FixedPoint:
-			solUnimplemented("Fixed point types not implemented.");
-			break;
-		case Type::Category::Function:
-			switch (dynamic_cast<FunctionType const&>(_type).kind())
-			{
-				case FunctionType::Kind::External:
-					templ("body", "cleaned := " + cleanupFunction(FixedBytesType(24)) + "(value)");
-					break;
-				case FunctionType::Kind::Internal:
-					templ("body", "cleaned := value");
-					break;
-				default:
-					solAssert(false, "");
-					break;
-			}
-			break;
-		case Type::Category::Array:
-		case Type::Category::Struct:
-		case Type::Category::Mapping:
-			solAssert(_type.dataStoredIn(DataLocation::Storage), "Cleanup requested for non-storage reference type.");
-			templ("body", "cleaned := value");
-			break;
-		case Type::Category::FixedBytes:
-		{
-			FixedBytesType const& type = dynamic_cast<FixedBytesType const&>(_type);
-			if (type.numBytes() == 32)
-				templ("body", "cleaned := value");
-			else if (type.numBytes() == 0)
-				// This is disallowed in the type system.
-				solAssert(false, "");
-			else
-			{
-				size_t numBits = type.numBytes() * 8;
-				u256 mask = ((u256(1) << numBits) - 1) << (256 - numBits);
-				templ("body", "cleaned := and(value, " + toCompactHexWithPrefix(mask) + ")");
-			}
-			break;
-		}
-		case Type::Category::Contract:
-		{
-			AddressType addressType(dynamic_cast<ContractType const&>(_type).isPayable() ?
-				StateMutability::Payable :
-				StateMutability::NonPayable
-			);
-			templ("body", "cleaned := " + cleanupFunction(addressType) + "(value)");
-			break;
-		}
-		case Type::Category::Enum:
-		{
-			// Out of range enums cannot be truncated unambigiously and therefore it should be an error.
-			templ("body", "cleaned := value " + validatorFunction(_type, false) + "(value)");
-			break;
-		}
-		case Type::Category::InaccessibleDynamic:
-			templ("body", "cleaned := 0");
-			break;
-		default:
-			solAssert(false, "Cleanup of type " + _type.identifier() + " requested.");
-		}
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFailure)
-{
-	std::string functionName = std::string("validator_") + (_revertOnFailure ? "revert_" : "assert_") + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(value) {
-				if iszero(<condition>) { <failure> }
-			}
-		)");
-		templ("functionName", functionName);
-		PanicCode panicCode = PanicCode::Generic;
-
-		switch (_type.category())
-		{
-		case Type::Category::Address:
-		case Type::Category::Integer:
-		case Type::Category::RationalNumber:
-		case Type::Category::Bool:
-		case Type::Category::FixedPoint:
-		case Type::Category::Function:
-		case Type::Category::Array:
-		case Type::Category::Struct:
-		case Type::Category::Mapping:
-		case Type::Category::FixedBytes:
-		case Type::Category::Contract:
-		case Type::Category::UserDefinedValueType:
-		{
-			templ("condition", "eq(value, " + cleanupFunction(_type) + "(value))");
-			break;
-		}
-		case Type::Category::Enum:
-		{
-			size_t members = dynamic_cast<EnumType const&>(_type).numberOfMembers();
-			solAssert(members > 0, "empty enum should have caused a parser error.");
-			panicCode = PanicCode::EnumConversionError;
-			templ("condition", "lt(value, " + std::to_string(members) + ")");
-			break;
-		}
-		case Type::Category::InaccessibleDynamic:
-			templ("condition", "1");
-			break;
-		default:
-			solAssert(false, "Validation of type " + _type.identifier() + " requested.");
-		}
-
-		if (_revertOnFailure)
-			templ("failure", "revert(0, 0)");
-		else
-			templ("failure", panicFunction(panicCode) + "()");
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::packedHashFunction(
-	std::vector<Type const*> const& _givenTypes,
-	std::vector<Type const*> const& _targetTypes
-)
-{
-	std::string functionName = std::string("packed_hashed_");
-	for (auto const& t: _givenTypes)
-		functionName += t->identifier() + "_";
-	functionName += "_to_";
-	for (auto const& t: _targetTypes)
-		functionName += t->identifier() + "_";
-	size_t sizeOnStack = 0;
-	for (Type const* t: _givenTypes)
-		sizeOnStack += t->sizeOnStack();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		Whiskers templ(R"(
-			function <functionName>(<variables>) -> hash {
-				let pos := <allocateUnbounded>()
-				let end := <packedEncode>(pos <comma> <variables>)
-				hash := keccak256(pos, sub(end, pos))
-			}
-		)");
-		templ("functionName", functionName);
-		templ("variables", suffixedVariableNameList("var_", 1, 1 + sizeOnStack));
-		templ("comma", sizeOnStack > 0 ? "," : "");
-		templ("allocateUnbounded", allocateUnboundedFunction());
-		templ("packedEncode", ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector).tupleEncoderPacked(_givenTypes, _targetTypes));
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::forwardingRevertFunction()
-{
-	bool forward = m_evmVersion.supportsReturndata();
-	std::string functionName = "revert_forward_" + std::to_string(forward);
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (forward)
-			return Whiskers(R"(
-				function <functionName>() {
-					let pos := <allocateUnbounded>()
-					returndatacopy(pos, 0, returndatasize())
-					revert(pos, returndatasize())
-				}
-			)")
-			("functionName", functionName)
-			("allocateUnbounded", allocateUnboundedFunction())
-			.render();
-		else
-			return Whiskers(R"(
-				function <functionName>() {
-					revert(0, 0)
-				}
-			)")
-			("functionName", functionName)
-			.render();
-	});
-}
-
-std::string YulUtilFunctions::decrementCheckedFunction(Type const& _type)
-{
-	solAssert(_type.category() == Type::Category::Integer, "");
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-
-	std::string const functionName = "decrement_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(value) -> ret {
-				value := <cleanupFunction>(value)
-				if eq(value, <minval>) { <panic>() }
-				ret := sub(value, 1)
-			}
-		)")
-		("functionName", functionName)
-		("panic", panicFunction(PanicCode::UnderOverflow))
-		("minval", toCompactHexWithPrefix(type.min()))
-		("cleanupFunction", cleanupFunction(_type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::decrementWrappingFunction(Type const& _type)
-{
-	solAssert(_type.category() == Type::Category::Integer, "");
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-
-	std::string const functionName = "decrement_wrapping_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(value) -> ret {
-				ret := <cleanupFunction>(sub(value, 1))
-			}
-		)")
-		("functionName", functionName)
-		("cleanupFunction", cleanupFunction(type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::incrementCheckedFunction(Type const& _type)
-{
-	solAssert(_type.category() == Type::Category::Integer, "");
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-
-	std::string const functionName = "increment_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(value) -> ret {
-				value := <cleanupFunction>(value)
-				if eq(value, <maxval>) { <panic>() }
-				ret := add(value, 1)
-			}
-		)")
-		("functionName", functionName)
-		("maxval", toCompactHexWithPrefix(type.max()))
-		("panic", panicFunction(PanicCode::UnderOverflow))
-		("cleanupFunction", cleanupFunction(_type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::incrementWrappingFunction(Type const& _type)
-{
-	solAssert(_type.category() == Type::Category::Integer, "");
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-
-	std::string const functionName = "increment_wrapping_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(value) -> ret {
-				ret := <cleanupFunction>(add(value, 1))
-			}
-		)")
-		("functionName", functionName)
-		("cleanupFunction", cleanupFunction(type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::negateNumberCheckedFunction(Type const& _type)
-{
-	solAssert(_type.category() == Type::Category::Integer, "");
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-	solAssert(type.isSigned(), "Expected signed type!");
-
-	std::string const functionName = "negate_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(value) -> ret {
-				value := <cleanupFunction>(value)
-				if eq(value, <minval>) { <panic>() }
-				ret := sub(0, value)
-			}
-		)")
-		("functionName", functionName)
-		("minval", toCompactHexWithPrefix(type.min()))
-		("cleanupFunction", cleanupFunction(_type))
-		("panic", panicFunction(PanicCode::UnderOverflow))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::negateNumberWrappingFunction(Type const& _type)
-{
-	solAssert(_type.category() == Type::Category::Integer, "");
-	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-	solAssert(type.isSigned(), "Expected signed type!");
-
-	std::string const functionName = "negate_wrapping_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>(value) -> ret {
-				ret := <cleanupFunction>(sub(0, value))
-			}
-		)")
-		("functionName", functionName)
-		("cleanupFunction", cleanupFunction(type))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::zeroValueFunction(Type const& _type, bool _splitFunctionTypes)
-{
-	solAssert(_type.category() != Type::Category::Mapping, "");
-
-	std::string const functionName = "zero_value_for_" + std::string(_splitFunctionTypes ? "split_" : "") + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		FunctionType const* fType = dynamic_cast<FunctionType const*>(&_type);
-		if (fType && fType->kind() == FunctionType::Kind::External && _splitFunctionTypes)
-			return Whiskers(R"(
-				function <functionName>() -> retAddress, retFunction {
-					retAddress := 0
-					retFunction := 0
-				}
-			)")
-			("functionName", functionName)
-			.render();
-
-		if (_type.dataStoredIn(DataLocation::CallData))
-		{
-			solAssert(
-				_type.category() == Type::Category::Struct ||
-				_type.category() == Type::Category::Array,
-			"");
-			Whiskers templ(R"(
-				function <functionName>() -> offset<?hasLength>, length</hasLength> {
-					offset := calldatasize()
-					<?hasLength> length := 0 </hasLength>
-				}
-			)");
-			templ("functionName", functionName);
-			templ("hasLength",
-				_type.category() == Type::Category::Array &&
-				dynamic_cast<ArrayType const&>(_type).isDynamicallySized()
-			);
-
-			return templ.render();
-		}
-
-		Whiskers templ(R"(
-			function <functionName>() -> ret {
-				ret := <zeroValue>
-			}
-		)");
-		templ("functionName", functionName);
-
-		if (_type.isValueType())
-		{
-			solAssert((
-				_type.hasSimpleZeroValueInMemory() ||
-				(fType && (fType->kind() == FunctionType::Kind::Internal || fType->kind() == FunctionType::Kind::External))
-			), "");
-			templ("zeroValue", "0");
-		}
-		else
-		{
-			solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-			if (auto const* arrayType = dynamic_cast<ArrayType const*>(&_type))
-			{
-				if (_type.isDynamicallySized())
-					templ("zeroValue", std::to_string(CompilerUtils::zeroPointer));
-				else
-					templ("zeroValue", allocateAndInitializeMemoryArrayFunction(*arrayType) + "(" + std::to_string(unsigned(arrayType->length())) + ")");
-
-			}
-			else if (auto const* structType = dynamic_cast<StructType const*>(&_type))
-				templ("zeroValue", allocateAndInitializeMemoryStructFunction(*structType) + "()");
-			else
-				solUnimplemented("");
-		}
-
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::storageSetToZeroFunction(Type const& _type)
-{
-	std::string const functionName = "storage_set_to_zero_" + _type.identifier();
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (_type.isValueType())
-			return Whiskers(R"(
-				function <functionName>(slot, offset) {
-					let <values> := <zeroValue>()
-					<store>(slot, offset, <values>)
-				}
-			)")
-			("functionName", functionName)
-			("store", updateStorageValueFunction(_type, _type))
-			("values", suffixedVariableNameList("zero_", 0, _type.sizeOnStack()))
-			("zeroValue", zeroValueFunction(_type))
-			.render();
-		else if (_type.category() == Type::Category::Array)
-			return Whiskers(R"(
-				function <functionName>(slot, offset) {
-					if iszero(eq(offset, 0)) { <panic>() }
-					<clearArray>(slot)
-				}
-			)")
-			("functionName", functionName)
-			("clearArray", clearStorageArrayFunction(dynamic_cast<ArrayType const&>(_type)))
-			("panic", panicFunction(PanicCode::Generic))
-			.render();
-		else if (_type.category() == Type::Category::Struct)
-			return Whiskers(R"(
-				function <functionName>(slot, offset) {
-					if iszero(eq(offset, 0)) { <panic>() }
-					<clearStruct>(slot)
-				}
-			)")
-			("functionName", functionName)
-			("clearStruct", clearStorageStructFunction(dynamic_cast<StructType const&>(_type)))
-			("panic", panicFunction(PanicCode::Generic))
-			.render();
-		else
-			solUnimplemented("setToZero for type " + _type.identifier() + " not yet implemented!");
-	});
-}
-
-std::string YulUtilFunctions::conversionFunctionSpecial(Type const& _from, Type const& _to)
-{
-	std::string functionName =
-		"convert_" +
-		_from.identifier() +
-		"_to_" +
-		_to.identifier();
-	return m_functionCollector.createFunction(functionName, [&]() {
-		if (
-			auto fromTuple = dynamic_cast<TupleType const*>(&_from), toTuple = dynamic_cast<TupleType const*>(&_to);
-			fromTuple && toTuple && fromTuple->components().size() == toTuple->components().size()
-		)
-		{
-			size_t sourceStackSize = 0;
-			size_t destStackSize = 0;
-			std::string conversions;
-			for (size_t i = 0; i < fromTuple->components().size(); ++i)
-			{
-				auto fromComponent = fromTuple->components()[i];
-				auto toComponent = toTuple->components()[i];
-				solAssert(fromComponent, "");
-				if (toComponent)
-				{
-					conversions +=
-						suffixedVariableNameList("converted", destStackSize, destStackSize + toComponent->sizeOnStack()) +
-						(toComponent->sizeOnStack() > 0 ? " := " : "") +
-						conversionFunction(*fromComponent, *toComponent) +
-						"(" +
-						suffixedVariableNameList("value", sourceStackSize, sourceStackSize + fromComponent->sizeOnStack()) +
-						")\n";
-					destStackSize += toComponent->sizeOnStack();
-				}
-				sourceStackSize += fromComponent->sizeOnStack();
-			}
-			return Whiskers(R"(
-				function <functionName>(<values>) <arrow> <converted> {
-					<conversions>
-				}
-			)")
-			("functionName", functionName)
-			("values", suffixedVariableNameList("value", 0, sourceStackSize))
-			("arrow", destStackSize > 0 ? "->" : "")
-			("converted", suffixedVariableNameList("converted", 0, destStackSize))
-			("conversions", conversions)
-			.render();
-		}
-
-		solUnimplementedAssert(
-			_from.category() == Type::Category::StringLiteral,
-			"Type conversion " + _from.toString() + " -> " + _to.toString() + " not yet implemented."
-		);
-		std::string const& data = dynamic_cast<StringLiteralType const&>(_from).value();
-		if (_to.category() == Type::Category::FixedBytes)
-		{
-			unsigned const numBytes = dynamic_cast<FixedBytesType const&>(_to).numBytes();
-			solAssert(data.size() <= 32, "");
-			Whiskers templ(R"(
-				function <functionName>() -> converted {
-					converted := <data>
-				}
-			)");
-			templ("functionName", functionName);
-			templ("data", formatNumber(
-				h256::Arith(h256(data, h256::AlignLeft)) &
-				(~(u256(-1) >> (8 * numBytes)))
-			));
-			return templ.render();
-		}
-		else if (_to.category() == Type::Category::Array)
-		{
-			solAssert(dynamic_cast<ArrayType const&>(_to).isByteArrayOrString(), "");
-			Whiskers templ(R"(
-				function <functionName>() -> converted {
-					converted := <copyLiteralToMemory>()
-				}
-			)");
-			templ("functionName", functionName);
-			templ("copyLiteralToMemory", copyLiteralToMemoryFunction(data));
-			return templ.render();
-		}
-		else
-			solAssert(
-				false,
-				"Invalid conversion from std::string literal to " + _to.toString() + " requested."
-			);
-	});
-}
-
-std::string YulUtilFunctions::readFromMemoryOrCalldata(Type const& _type, bool _fromCalldata)
-{
-	std::string functionName =
-		std::string("read_from_") +
-		(_fromCalldata ? "calldata" : "memory") +
-		_type.identifier();
-
-	// TODO use ABI functions for handling calldata
-	if (_fromCalldata)
-		solAssert(!_type.isDynamicallyEncoded(), "");
-
-	return m_functionCollector.createFunction(functionName, [&] {
-		if (auto refType = dynamic_cast<ReferenceType const*>(&_type))
-		{
-			solAssert(refType->sizeOnStack() == 1, "");
-			solAssert(!_fromCalldata, "");
-
-			return Whiskers(R"(
-				function <functionName>(memPtr) -> value {
-					value := mload(memPtr)
-				}
-			)")
-			("functionName", functionName)
-			.render();
-		}
-
-		solAssert(_type.isValueType(), "");
-		Whiskers templ(R"(
-			function <functionName>(ptr) -> <returnVariables> {
-				<?fromCalldata>
-					let value := calldataload(ptr)
-					<validate>(value)
-				<!fromCalldata>
-					let value := <cleanup>(mload(ptr))
-				</fromCalldata>
-
-				<returnVariables> :=
-				<?externalFunction>
-					<splitFunction>(value)
-				<!externalFunction>
-					value
-				</externalFunction>
-			}
-		)");
-		templ("functionName", functionName);
-		templ("fromCalldata", _fromCalldata);
-		if (_fromCalldata)
-			templ("validate", validatorFunction(_type, true));
-		auto const* funType = dynamic_cast<FunctionType const*>(&_type);
-		if (funType && funType->kind() == FunctionType::Kind::External)
-		{
-			templ("externalFunction", true);
-			templ("splitFunction", splitExternalFunctionIdFunction());
-			templ("returnVariables", "addr, selector");
-		}
-		else
-		{
-			templ("externalFunction", false);
-			templ("returnVariables", "returnValue");
-		}
-
-		// Byte array elements generally need cleanup.
-		// Other types are cleaned as well to account for dirty memory e.g. due to inline assembly.
-		templ("cleanup", cleanupFunction(_type));
-		return templ.render();
-	});
-}
-
-std::string YulUtilFunctions::revertReasonIfDebugFunction(std::string const& _message)
-{
-	std::string functionName = "revert_error_" + util::toHex(util::keccak256(_message).asBytes());
-	return m_functionCollector.createFunction(functionName, [&](auto&, auto&) -> std::string {
-		return revertReasonIfDebugBody(m_revertStrings, allocateUnboundedFunction() + "()", _message);
-	});
-}
-
-std::string YulUtilFunctions::revertReasonIfDebugBody(
-	RevertStrings _revertStrings,
-	std::string const& _allocation,
-	std::string const& _message
-)
-{
-	if (_revertStrings < RevertStrings::Debug || _message.empty())
-		return "revert(0, 0)";
-
-	Whiskers templ(R"(
-		let start := <allocate>
-		let pos := start
-		mstore(pos, <sig>)
-		pos := add(pos, 4)
-		mstore(pos, 0x20)
-		pos := add(pos, 0x20)
-		mstore(pos, <length>)
-		pos := add(pos, 0x20)
-		<#word>
-			mstore(add(pos, <offset>), <wordValue>)
-		</word>
-		revert(start, <overallLength>)
-	)");
-	templ("allocate", _allocation);
-	templ("sig", util::selectorFromSignatureU256("Error(string)").str());
-	templ("length", std::to_string(_message.length()));
-
-	size_t words = (_message.length() + 31) / 32;
-	std::vector<std::map<std::string, std::string>> wordParams(words);
-	for (size_t i = 0; i < words; ++i)
-	{
-		wordParams[i]["offset"] = std::to_string(i * 32);
-		wordParams[i]["wordValue"] = formatAsStringOrNumber(_message.substr(32 * i, 32));
-	}
-	templ("word", wordParams);
-	templ("overallLength", std::to_string(4 + 0x20 + 0x20 + words * 32));
-
-	return templ.render();
-}
-
-std::string YulUtilFunctions::panicFunction(util::PanicCode _code)
-{
-	std::string functionName = "panic_error_" + toCompactHexWithPrefix(uint64_t(_code));
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return Whiskers(R"(
-			function <functionName>() {
-				mstore(0, <selector>)
-				mstore(4, <code>)
-				revert(0, 0x24)
-			}
-		)")
-		("functionName", functionName)
-		("selector", util::selectorFromSignatureU256("Panic(uint256)").str())
-		("code", toCompactHexWithPrefix(static_cast<unsigned>(_code)))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::returnDataSelectorFunction()
-{
-	std::string const functionName = "return_data_selector";
-	solAssert(m_evmVersion.supportsReturndata(), "");
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return util::Whiskers(R"(
-			function <functionName>() -> sig {
-				if gt(returndatasize(), 3) {
-					returndatacopy(0, 0, 4)
-					sig := <shr224>(mload(0))
-				}
-			}
-		)")
-		("functionName", functionName)
-		("shr224", shiftRightFunction(224))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::tryDecodeErrorMessageFunction()
-{
-	std::string const functionName = "try_decode_error_message";
-	solAssert(m_evmVersion.supportsReturndata(), "");
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return util::Whiskers(R"(
-			function <functionName>() -> ret {
-				if lt(returndatasize(), 0x44) { leave }
-
-				let data := <allocateUnbounded>()
-				returndatacopy(data, 4, sub(returndatasize(), 4))
-
-				let offset := mload(data)
-				if or(
-					gt(offset, 0xffffffffffffffff),
-					gt(add(offset, 0x24), returndatasize())
-				) {
-					leave
-				}
-
-				let msg := add(data, offset)
-				let length := mload(msg)
-				if gt(length, 0xffffffffffffffff) { leave }
-
-				let end := add(add(msg, 0x20), length)
-				if gt(end, add(data, sub(returndatasize(), 4))) { leave }
-
-				<finalizeAllocation>(data, add(offset, add(0x20, length)))
-				ret := msg
-			}
-		)")
-		("functionName", functionName)
-		("allocateUnbounded", allocateUnboundedFunction())
-		("finalizeAllocation", finalizeAllocationFunction())
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::tryDecodePanicDataFunction()
-{
-	std::string const functionName = "try_decode_panic_data";
-	solAssert(m_evmVersion.supportsReturndata(), "");
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return util::Whiskers(R"(
-			function <functionName>() -> success, data {
-				if gt(returndatasize(), 0x23) {
-					returndatacopy(0, 4, 0x20)
-					success := 1
-					data := mload(0)
-				}
-			}
-		)")
-		("functionName", functionName)
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::extractReturndataFunction()
-{
-	std::string const functionName = "extract_returndata";
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return util::Whiskers(R"(
-			function <functionName>() -> data {
-				<?supportsReturndata>
-					switch returndatasize()
-					case 0 {
-						data := <emptyArray>()
-					}
-					default {
-						data := <allocateArray>(returndatasize())
-						returndatacopy(add(data, 0x20), 0, returndatasize())
-					}
-				<!supportsReturndata>
-					data := <emptyArray>()
-				</supportsReturndata>
-			}
-		)")
-		("functionName", functionName)
-		("supportsReturndata", m_evmVersion.supportsReturndata())
-		("allocateArray", allocateMemoryArrayFunction(*TypeProvider::bytesMemory()))
-		("emptyArray", zeroValueFunction(*TypeProvider::bytesMemory()))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::copyConstructorArgumentsToMemoryFunction(
-	ContractDefinition const& _contract,
-	std::string const& _creationObjectName
-)
-{
-	std::string functionName = "copy_arguments_for_constructor_" +
-		toString(_contract.constructor()->id()) +
-		"_object_" +
-		_contract.name() +
-		"_" +
-		toString(_contract.id());
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		std::string returnParams = suffixedVariableNameList("ret_param_",0, CompilerUtils::sizeOnStack(_contract.constructor()->parameters()));
-		ABIFunctions abiFunctions(m_evmVersion, m_revertStrings, m_functionCollector);
-
-		return util::Whiskers(R"(
-			function <functionName>() -> <retParams> {
-				let programSize := datasize("<object>")
-				let argSize := sub(codesize(), programSize)
-
-				let memoryDataOffset := <allocate>(argSize)
-				codecopy(memoryDataOffset, programSize, argSize)
-
-				<retParams> := <abiDecode>(memoryDataOffset, add(memoryDataOffset, argSize))
-			}
-		)")
-		("functionName", functionName)
-		("retParams", returnParams)
-		("object", _creationObjectName)
-		("allocate", allocationFunction())
-		("abiDecode", abiFunctions.tupleDecoder(FunctionType(*_contract.constructor()).parameterTypes(), true))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::externalCodeFunction()
-{
-	std::string functionName = "external_code_at";
-
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return util::Whiskers(R"(
-			function <functionName>(addr) -> mpos {
-				let length := extcodesize(addr)
-				mpos := <allocateArray>(length)
-				extcodecopy(addr, add(mpos, 0x20), 0, length)
-			}
-		)")
-		("functionName", functionName)
-		("allocateArray", allocateMemoryArrayFunction(*TypeProvider::bytesMemory()))
-		.render();
-	});
-}
-
-std::string YulUtilFunctions::externalFunctionPointersEqualFunction()
-{
-	std::string const functionName = "externalFunctionPointersEqualFunction";
-	return m_functionCollector.createFunction(functionName, [&]() {
-		return util::Whiskers(R"(
-			function <functionName>(
-				leftAddress,
-				leftSelector,
-				rightAddress,
-				rightSelector
-			) -> result {
-				result := and(
-					eq(
-						<addressCleanUpFunction>(leftAddress), <addressCleanUpFunction>(rightAddress)
-					),
-					eq(
-						<selectorCleanUpFunction>(leftSelector), <selectorCleanUpFunction>(rightSelector)
-					)
-				)
-			}
-		)")
-		("functionName", functionName)
-		("addressCleanUpFunction", cleanupFunction(*TypeProvider::address()))
-		("selectorCleanUpFunction", cleanupFunction(*TypeProvider::uint(32)))
-		.render();
-	});
-}
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
deleted file mode 100644
index 7d736df5b3bc..000000000000
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that can generate various useful Yul functions.
- */
-
-#pragma once
-
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
-
-#include <libsolidity/interface/DebugSettings.h>
-
-#include <libsolutil/ErrorCodes.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-class Type;
-class ArrayType;
-class MappingType;
-class IntegerType;
-class StructType;
-
-/**
- * Component that can generate various useful Yul functions.
- */
-class YulUtilFunctions
-{
-public:
-	explicit YulUtilFunctions(
-		langutil::EVMVersion _evmVersion,
-		RevertStrings _revertStrings,
-		MultiUseYulFunctionCollector& _functionCollector
-	):
-		m_evmVersion(_evmVersion),
-		m_revertStrings(_revertStrings),
-		m_functionCollector(_functionCollector)
-	{}
-
-	/// @returns the name of a function that returns its argument.
-	/// Sometimes needed to satisfy templates.
-	std::string identityFunction();
-
-	/// @returns a function that combines the address and selector to a single value
-	/// for use in the ABI.
-	std::string combineExternalFunctionIdFunction();
-
-	/// @returns a function that splits the address and selector from a single value
-	/// for use in the ABI.
-	std::string splitExternalFunctionIdFunction();
-
-	/// @returns a function that copies raw bytes of dynamic length from calldata
-	/// or memory to memory.
-	/// @params _cleanup If true, pads with zeros up to the 32 byte boundary after the specified length
-	/// signature: (src, dst, length) ->
-	std::string copyToMemoryFunction(bool _fromCalldata, bool _cleanup);
-
-	/// @returns the name of a function that copies a string literal to memory
-	/// and returns a pointer to the memory area containing the string literal.
-	/// signature: () -> memPtr
-	std::string copyLiteralToMemoryFunction(std::string const& _literal);
-
-	/// @returns the name of a function that stores a string literal at a specific location in memory
-	/// signature: (memPtr) ->
-	std::string storeLiteralInMemoryFunction(std::string const& _literal);
-
-	/// @returns the name of a function that stores a string literal at a specific location in storage
-	/// signature: (slot) ->
-	std::string copyLiteralToStorageFunction(std::string const& _literal);
-
-	// @returns the name of a function that has the equivalent logic of an
-	// `assert` or `require` call.
-	std::string requireOrAssertFunction(bool _assert, Type const* _messageType = nullptr);
-
-	/// @returns the name of a function that takes a (cleaned) value of the given value type and
-	/// left-aligns it, usually for use in non-padded encoding.
-	std::string leftAlignFunction(Type const& _type);
-
-	std::string shiftLeftFunction(size_t _numBits);
-	std::string shiftLeftFunctionDynamic();
-	std::string shiftRightFunction(size_t _numBits);
-	std::string shiftRightFunctionDynamic();
-	std::string shiftRightSignedFunctionDynamic();
-
-	/// @returns the name of a function that performs a left shift and subsequent cleanup
-	/// and, if needed, prior cleanup.
-	/// signature: (value, amountToShift) -> result
-	std::string typedShiftLeftFunction(Type const& _type, Type const& _amountType);
-	std::string typedShiftRightFunction(Type const& _type, Type const& _amountType);
-
-	/// @returns the name of a function which replaces the
-	/// _numBytes bytes starting at byte position _shiftBytes (counted from the least significant
-	/// byte) by the _numBytes least significant bytes of `toInsert`.
-	/// signature: (value, toInsert) -> result
-	std::string updateByteSliceFunction(size_t _numBytes, size_t _shiftBytes);
-
-	/// signature: (value, shiftBytes, toInsert) -> result
-	std::string updateByteSliceFunctionDynamic(size_t _numBytes);
-
-	/// Function that sets all but the first ``bytes`` bytes of ``value`` to zero.
-	/// @note ``bytes`` has to be small enough not to overflow ``8 * bytes``.
-	/// signature: (value, bytes) -> result
-	std::string maskBytesFunctionDynamic();
-
-	/// Zeroes out all bytes above the first ``_bytes`` lower order bytes.
-	/// signature: (value) -> result
-	std::string maskLowerOrderBytesFunction(size_t _bytes);
-
-	/// Zeroes out all bytes above the first ``bytes`` lower order bytes.
-	/// @note ``bytes`` has to be small enough not to overflow ``8 * bytes``.
-	/// signature: (value, bytes) -> result
-	std::string maskLowerOrderBytesFunctionDynamic();
-
-	/// @returns the name of a function that rounds its input to the next multiple
-	/// of 32 or the input if it is a multiple of 32.
-	/// Ignores overflow.
-	/// signature: (value) -> result
-	std::string roundUpFunction();
-
-	/// @returns the name of a function that divides by 32 and rounds up during the division.
-	/// In other words, on input x it returns the smallest y such that y * 32 >= x.
-	/// Ignores overflow.
-	/// signature: (x) -> y
-	std::string divide32CeilFunction();
-
-	/// signature: (x, y) -> sum
-	std::string overflowCheckedIntAddFunction(IntegerType const& _type);
-	/// signature: (x, y) -> sum
-	std::string wrappingIntAddFunction(IntegerType const& _type);
-
-	/// signature: (x, y) -> product
-	std::string overflowCheckedIntMulFunction(IntegerType const& _type);
-	/// signature: (x, y) -> product
-	std::string wrappingIntMulFunction(IntegerType const& _type);
-
-	/// @returns name of function to perform division on integers.
-	/// Checks for division by zero and the special case of
-	/// signed division of the smallest number by -1.
-	std::string overflowCheckedIntDivFunction(IntegerType const& _type);
-	/// @returns name of function to perform division on integers.
-	/// Checks for division by zero.
-	std::string wrappingIntDivFunction(IntegerType const& _type);
-
-	/// @returns name of function to perform modulo on integers.
-	/// Reverts for modulo by zero.
-	std::string intModFunction(IntegerType const& _type);
-
-	/// @returns computes the difference between two values.
-	/// Assumes the input to be in range for the type.
-	/// signature: (x, y) -> diff
-	std::string overflowCheckedIntSubFunction(IntegerType const& _type);
-
-	/// @returns computes the difference between two values.
-	/// signature: (x, y) -> diff
-	std::string wrappingIntSubFunction(IntegerType const& _type);
-
-	/// @returns the name of the exponentiation function.
-	/// signature: (base, exponent) -> power
-	std::string overflowCheckedIntExpFunction(IntegerType const& _type, IntegerType const& _exponentType);
-
-	/// @returns the name of the exponentiation function, specialized for literal base.
-	/// signature: exponent -> power
-	std::string overflowCheckedIntLiteralExpFunction(
-		RationalNumberType const& _baseType,
-		IntegerType const& _exponentType,
-		IntegerType const& _commonType
-	);
-
-	/// Generic unsigned checked exponentiation function.
-	/// Reverts if the result is larger than max.
-	/// signature: (base, exponent, max) -> power
-	std::string overflowCheckedUnsignedExpFunction();
-
-	/// Generic signed checked exponentiation function.
-	/// Reverts if the result is smaller than min or larger than max.
-	/// The code relies on max <= |min| and min < 0.
-	/// signature: (base, exponent, min, max) -> power
-	std::string overflowCheckedSignedExpFunction();
-
-	/// Helper function for the two checked exponentiation functions.
-	/// signature: (power, base, exponent, max) -> power
-	std::string overflowCheckedExpLoopFunction();
-
-	/// @returns the name of the exponentiation function.
-	/// signature: (base, exponent) -> power
-	std::string wrappingIntExpFunction(IntegerType const& _type, IntegerType const& _exponentType);
-
-	/// @returns the name of a function that fetches the length of the given
-	/// array
-	/// signature: (array) -> length
-	std::string arrayLengthFunction(ArrayType const& _type);
-
-	/// @returns function name that extracts and returns byte array length from the value
-	/// stored at the slot.
-	/// Causes a Panic if the length encoding is wrong.
-	/// signature: (data) -> length
-	std::string extractByteArrayLengthFunction();
-
-	/// @returns the name of a function that resizes a storage array
-	/// for statically sized arrays, it will just clean-up elements of array starting from newLen until the end
-	/// signature: (array, newLen)
-	std::string resizeArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that zeroes all storage array elements from `startIndex` to `len` (excluding).
-	/// Assumes that `len` is the array length. Does nothing if `startIndex >= len`. Does not modify the stored length.
-	/// signature: (array, len, startIndex)
-	std::string cleanUpStorageArrayEndFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that reduces the size of a storage array by one element
-	/// signature: (array)
-	std::string storageArrayPopFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that pushes an element to a storage array
-	/// @param _fromType represents the type of the element being pushed.
-	/// If _fromType is ReferenceType the function will perform deep copy.
-	/// signature: (array, value)
-	std::string storageArrayPushFunction(ArrayType const& _type, Type const* _fromType = nullptr);
-
-	/// @returns the name of a function that pushes the base type's zero element to a storage array and returns storage slot and offset of the added element.
-	/// signature: (array) -> slot, offset
-	std::string storageArrayPushZeroFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that will clear the storage area given
-	/// by the start and end (exclusive) parameters (slots).
-	/// signature: (start, end)
-	std::string clearStorageRangeFunction(Type const& _type);
-
-	/// @returns the name of a function that will clear the given storage array
-	/// signature: (slot) ->
-	std::string clearStorageArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that will copy an array to storage
-	/// signature (to_slot, from_ptr) ->
-	std::string copyArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType);
-
-	/// @returns the name of a function that will copy a byte array to storage
-	/// signature (to_slot, from_ptr) ->
-	std::string copyByteArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType);
-
-	/// @returns the name of a function that will copy an array of value types to storage.
-	/// signature (to_slot, from_ptr[, from_length]) ->
-	std::string copyValueArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType);
-
-	/// Returns the name of a function that will convert a given length to the
-	/// size in memory (number of storage slots or calldata/memory bytes) it
-	/// will require.
-	/// signature: (length) -> size
-	std::string arrayConvertLengthToSize(ArrayType const& _type);
-
-	/// @returns the name of a function that computes the number of bytes required
-	/// to store an array in memory given its length (internally encoded, not ABI encoded).
-	/// The function reverts for too large lengths.
-	std::string arrayAllocationSizeFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that converts a storage slot number
-	/// a memory pointer or a calldata pointer to the slot number / memory pointer / calldata pointer
-	/// for the data position of an array which is stored in that slot / memory area / calldata area.
-	std::string arrayDataAreaFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that returns the slot and offset for the
-	/// given array and index
-	/// signature: (array, index) -> slot, offset
-	std::string storageArrayIndexAccessFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that returns the memory address for the
-	/// given array base ref and index.
-	/// Causes invalid opcode on out of range access.
-	/// signature: (baseRef, index) -> address
-	std::string memoryArrayIndexAccessFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that returns the calldata address for the
-	/// given array base ref and index.
-	/// signature: (baseRef, index) -> offset[, length]
-	std::string calldataArrayIndexAccessFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that returns offset and length for array slice
-	/// for the given array offset, length and start and end indices for slice
-	/// signature: (arrayOffset, arrayLength, sliceStart, sliceEnd) -> offset, length
-	std::string calldataArrayIndexRangeAccess(ArrayType const& _type);
-
-	/// @returns the name of a function that follows a calldata tail while performing
-	/// bounds checks.
-	/// signature: (baseRef, tailPointer) -> offset[, length]
-	std::string accessCalldataTailFunction(Type const& _type);
-
-	/// @returns the name of a function that advances an array data pointer to the next element.
-	/// Only works for memory arrays, calldata arrays and storage arrays that every item occupies one or multiple full slots.
-	std::string nextArrayElementFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that allocates a memory array and copies the contents
-	/// of the storage array into it.
-	std::string copyArrayFromStorageToMemoryFunction(ArrayType const& _from, ArrayType const& _to);
-
-	/// @returns the name of a function that does concatenation of variadic number of
-	/// bytes if @a functionTypeKind is FunctionType::Kind::BytesConcat,
-	/// or of strings, if @a functionTypeKind is FunctionType::Kind::StringConcat.
-	std::string bytesOrStringConcatFunction(
-		std::vector<Type const*> const& _argumentTypes,
-		FunctionType::Kind _functionTypeKind
-	);
-
-	/// @returns the name of a function that performs index access for mappings.
-	/// @param _mappingType the type of the mapping
-	/// @param _keyType the type of the value provided
-	std::string mappingIndexAccessFunction(MappingType const& _mappingType, Type const& _keyType);
-
-	/// @returns a function that reads a type from storage.
-	/// @param _splitFunctionTypes if false, returns the address and function signature in a
-	/// single variable.
-	std::string readFromStorage(Type const& _type, size_t _offset, bool _splitFunctionTypes);
-	std::string readFromStorageDynamic(Type const& _type, bool _splitFunctionTypes);
-
-	/// @returns a function that reads a value type from memory. Performs cleanup.
-	/// signature: (addr) -> value
-	std::string readFromMemory(Type const& _type);
-	/// @returns a function that reads a value type from calldata.
-	/// Reverts on invalid input.
-	/// signature: (addr) -> value
-	std::string readFromCalldata(Type const& _type);
-
-	/// @returns a function that extracts a value type from storage slot that has been
-	/// retrieved already.
-	/// Performs bit mask/sign extend cleanup and appropriate left / right shift, but not validation.
-	///
-	/// For external function types, input and output is in "compressed"/"unsplit" form.
-	std::string extractFromStorageValue(Type const& _type, size_t _offset);
-	std::string extractFromStorageValueDynamic(Type const& _type);
-
-	/// Returns the name of a function will write the given value to
-	/// the specified slot and offset. If offset is not given, it is expected as
-	/// runtime parameter.
-	/// For reference types, offset is checked to be zero at runtime.
-	/// signature: (slot, [offset,] value)
-	std::string updateStorageValueFunction(
-		Type const& _fromType,
-		Type const& _toType,
-		std::optional<unsigned> const& _offset = std::optional<unsigned>()
-	);
-
-	/// Returns the name of a function that will write the given value to
-	/// the specified address.
-	/// Performs a cleanup before writing for value types.
-	/// signature: (memPtr, value) ->
-	std::string writeToMemoryFunction(Type const& _type);
-
-	/// Performs cleanup after reading from a potentially compressed storage slot.
-	/// The function does not perform any validation, it just masks or sign-extends
-	/// higher order bytes or left-aligns (in case of bytesNN).
-	/// The storage cleanup expects the value to be right-aligned with potentially
-	/// dirty higher order bytes.
-	/// For external functions, input and output is in "compressed"/"unsplit" form.
-	std::string cleanupFromStorageFunction(Type const& _type);
-
-	/// @returns the name of a function that prepares a value of the given type
-	/// for being stored in storage. This usually includes cleanup and right-alignment
-	/// to fit the number of bytes in storage.
-	/// The resulting value might still have dirty higher order bits.
-	std::string prepareStoreFunction(Type const& _type);
-
-	/// @returns the name of a function that allocates memory.
-	/// Modifies the "free memory pointer"
-	/// signature: (size) -> memPtr
-	std::string allocationFunction();
-
-	/// @returns the name of the function that allocates memory whose size might be defined later.
-	/// The allocation can be finalized using finalizeAllocationFunction.
-	/// Any other allocation will invalidate the memory pointer unless finalizeAllocationFunction
-	/// is called.
-	/// signature: () -> memPtr
-	std::string allocateUnboundedFunction();
-
-	/// @returns the name of the function that finalizes an unbounded memory allocation,
-	/// i.e. sets its size and makes the allocation permanent.
-	/// signature: (memPtr, size) ->
-	std::string finalizeAllocationFunction();
-
-	/// @returns the name of a function that zeroes an array.
-	/// signature: (dataStart, dataSizeInBytes) ->
-	std::string zeroMemoryArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that zeroes a chunk of memory.
-	/// signature: (dataStart, dataSizeInBytes) ->
-	std::string zeroMemoryFunction(Type const& _type);
-
-	/// @returns the name of a function that zeroes an array
-	/// where the base does not have simple zero value in memory.
-	/// signature: (dataStart, dataSizeInBytes) ->
-	std::string zeroComplexMemoryArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that allocates a memory array.
-	/// For dynamic arrays it adds space for length and stores it.
-	/// The contents of the data area are unspecified.
-	/// signature: (length) -> memPtr
-	std::string allocateMemoryArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that allocates and zeroes a memory array.
-	/// For dynamic arrays it adds space for length and stores it.
-	/// signature: (length) -> memPtr
-	std::string allocateAndInitializeMemoryArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that allocates a memory struct (no
-	/// initialization takes place).
-	/// signature: () -> memPtr
-	std::string allocateMemoryStructFunction(StructType const& _type);
-
-	/// @returns the name of a function that allocates and zeroes a memory struct.
-	/// signature: () -> memPtr
-	std::string allocateAndInitializeMemoryStructFunction(StructType const& _type);
-
-	/// @returns the name of the function that converts a value of type @a _from
-	/// to a value of type @a _to. The resulting vale is guaranteed to be in range
-	/// (i.e. "clean"). Asserts on failure.
-	///
-	/// This is used for data being encoded or general type conversions in the code.
-	std::string conversionFunction(Type const& _from, Type const& _to);
-
-	/// @returns the name of a function that converts bytes array to fixed bytes type
-	/// signature: (array) -> value
-	std::string bytesToFixedBytesConversionFunction(ArrayType const& _from, FixedBytesType const& _to);
-
-	/// @returns the name of the cleanup function for the given type and
-	/// adds its implementation to the requested functions.
-	/// The cleanup function defers to the validator function with "assert"
-	/// if there is no reasonable way to clean a value.
-	std::string cleanupFunction(Type const& _type);
-
-	/// @returns the name of the validator function for the given type and
-	/// adds its implementation to the requested functions.
-	/// @param _revertOnFailure if true, causes revert on invalid data,
-	/// otherwise an assertion failure.
-	///
-	/// This is used for data decoded from external sources.
-	std::string validatorFunction(Type const& _type, bool _revertOnFailure);
-
-	std::string packedHashFunction(std::vector<Type const*> const& _givenTypes, std::vector<Type const*> const& _targetTypes);
-
-	/// @returns the name of a function that reverts and uses returndata (if available)
-	/// as reason string.
-	std::string forwardingRevertFunction();
-
-	std::string incrementCheckedFunction(Type const& _type);
-	std::string incrementWrappingFunction(Type const& _type);
-	std::string decrementCheckedFunction(Type const& _type);
-	std::string decrementWrappingFunction(Type const& _type);
-
-	std::string negateNumberCheckedFunction(Type const& _type);
-	std::string negateNumberWrappingFunction(Type const& _type);
-
-	/// @returns the name of a function that returns the zero value for the
-	/// provided type.
-	/// @param _splitFunctionTypes if false, returns two zeroes
-	std::string zeroValueFunction(Type const& _type, bool _splitFunctionTypes = true);
-
-	/// @returns the name of a function that will set the given storage item to
-	/// zero
-	/// signature: (slot, offset) ->
-	std::string storageSetToZeroFunction(Type const& _type);
-
-	/// If revertStrings is debug, @returns the name of a function that
-	/// stores @param _message in memory position 0 and reverts.
-	/// Otherwise returns the name of a function that uses "revert(0, 0)".
-	std::string revertReasonIfDebugFunction(std::string const& _message = "");
-
-	/// @returns the function body of ``revertReasonIfDebug``.
-	/// Should only be used internally and by the old code generator.
-	static std::string revertReasonIfDebugBody(
-		RevertStrings _revertStrings,
-		std::string const& _allocation,
-		std::string const& _message
-	);
-
-	/// Reverts with ``Panic(uint256)`` and the given code.
-	std::string panicFunction(util::PanicCode _code);
-
-	/// @returns the name of a function that returns the return data selector.
-	/// Returns zero if return data is too short.
-	std::string returnDataSelectorFunction();
-
-	/// @returns the name of a function that tries to abi-decode a string from offset 4 in the
-	/// return data. On failure, returns 0, otherwise a pointer to the newly allocated string.
-	/// Does not check the return data signature.
-	/// signature: () -> ptr
-	std::string tryDecodeErrorMessageFunction();
-
-	/// @returns the name of a function that tries to abi-decode a uint256 value from offset 4 in the
-	/// return data.
-	/// Does not check the return data signature.
-	/// signature: () -> success, value
-	std::string tryDecodePanicDataFunction();
-
-	/// Returns a function name that returns a newly allocated `bytes` array that contains the return data.
-	///
-	/// If returndatacopy() is not supported by the underlying target, a empty array will be returned instead.
-	std::string extractReturndataFunction();
-
-	/// @returns function name that returns constructor arguments copied to memory
-	/// signature: () -> arguments
-	std::string copyConstructorArgumentsToMemoryFunction(
-		ContractDefinition const& _contract,
-		std::string const& _creationObjectName
-	);
-
-	/// @returns the name of a function that copies code from a given address to a newly
-	/// allocated byte array in memory.
-	/// Signature: (address) -> mpos
-	std::string externalCodeFunction();
-
-	/// @return the name of a function that that checks if two external functions pointers are equal or not
-	std::string externalFunctionPointersEqualFunction();
-
-private:
-	/// @returns the name of a function that copies a struct from calldata or memory to storage
-	/// signature: (slot, value) ->
-	std::string copyStructToStorageFunction(StructType const& _from, StructType const& _to);
-
-	/// Special case of conversion functions - handles all array conversions.
-	std::string arrayConversionFunction(ArrayType const& _from, ArrayType const& _to);
-
-	/// Special case of conversionFunction - handles everything that does not
-	/// use exactly one variable to hold the value.
-	std::string conversionFunctionSpecial(Type const& _from, Type const& _to);
-
-	/// @returns the name of a function that reduces the size of a storage byte array by one element
-	/// signature: (byteArray)
-	std::string storageByteArrayPopFunction(ArrayType const& _type);
-
-	std::string readFromMemoryOrCalldata(Type const& _type, bool _fromCalldata);
-
-	/// @returns a function that reads a value type from storage.
-	/// Performs bit mask/sign extend cleanup and appropriate left / right shift, but not validation.
-	/// @param _splitFunctionTypes if false, returns the address and function signature in a
-	/// single variable.
-	/// @param _offset if provided, read from static offset, otherwise offset is a parameter of the Yul function.
-	std::string readFromStorageValueType(Type const& _type, std::optional<size_t> _offset, bool _splitFunctionTypes);
-
-	/// @returns a function that reads a reference type from storage to memory (performing a deep copy).
-	std::string readFromStorageReferenceType(Type const& _type);
-
-	/// @returns the name of a function that will clear given storage slot
-	/// starting with given offset until the end of the slot
-	/// signature: (slot, offset)
-	std::string partialClearStorageSlotFunction();
-
-	/// @returns the name of a function that will clear the given storage struct
-	/// signature: (slot) ->
-	std::string clearStorageStructFunction(StructType const& _type);
-
-	/// @returns the name of a function that resizes a storage byte array
-	/// signature: (array, newLen)
-	std::string resizeDynamicByteArrayFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that cleans up elements of a storage byte array starting from startIndex.
-	/// It will not copy elements in case of transformation to short byte array, and will not change array length.
-	/// In case of startIndex is greater than len, doesn't do anything.
-	/// In case of short byte array (< 32 bytes) doesn't do anything.
-	/// If the first slot to be cleaned up is partially occupied, does not touch it. Cleans up only completely unused slots.
-	/// signature: (array, len, startIndex)
-	std::string cleanUpDynamicByteArrayEndSlotsFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that increases size of byte array
-	/// when we resize byte array frextractUsedSetLenom < 32 elements to >= 32 elements or we push to byte array of size 31 copying of data will  occur
-	/// signature: (array, data, oldLen, newLen)
-	std::string increaseByteArraySizeFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that decreases size of byte array
-	/// when we resize byte array from >= 32 elements to < 32 elements or we pop from byte array of size 32 copying of data will  occur
-	/// signature: (array, data, oldLen, newLen)
-	std::string decreaseByteArraySizeFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that sets size of short byte array while copying data
-	/// should be called when we resize from long byte array (more than 32 elements) to short byte array
-	/// signature: (array, data, len)
-	std::string byteArrayTransitLongToShortFunction(ArrayType const& _type);
-
-	/// @returns the name of a function that extracts only used part of slot that represents short byte array
-	/// signature: (data, len) -> data
-	std::string shortByteArrayEncodeUsedAreaSetLengthFunction();
-
-	/// @returns the name of a function that calculates slot and offset for index
-	/// Doesn't perform length checks, assumes that index is in bounds
-	/// signature: (array, index)
-	std::string longByteArrayStorageIndexAccessNoCheckFunction();
-
-	langutil::EVMVersion m_evmVersion;
-	RevertStrings m_revertStrings;
-	MultiUseYulFunctionCollector& m_functionCollector;
-};
-
-}
diff --git a/libsolidity/codegen/ir/Common.cpp b/libsolidity/codegen/ir/Common.cpp
deleted file mode 100644
index 9300c7848570..000000000000
--- a/libsolidity/codegen/ir/Common.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/codegen/ir/Common.h>
-#include <libsolidity/codegen/ir/IRGenerationContext.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <libyul/AsmPrinter.h>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-namespace solidity::frontend
-{
-
-YulArity YulArity::fromType(FunctionType const& _functionType)
-{
-	return YulArity{
-		TupleType(_functionType.parameterTypesIncludingSelf()).sizeOnStack(),
-		TupleType(_functionType.returnParameterTypes()).sizeOnStack()
-	};
-}
-
-std::string IRNames::externalFunctionABIWrapper(Declaration const& _functionOrVarDecl)
-{
-	if (auto const* function = dynamic_cast<FunctionDefinition const*>(&_functionOrVarDecl))
-		solAssert(!function->isConstructor());
-
-	return "external_fun_" + _functionOrVarDecl.name() + "_" + std::to_string(_functionOrVarDecl.id());
-}
-
-std::string IRNames::function(FunctionDefinition const& _function)
-{
-	if (_function.isConstructor())
-		return constructor(*_function.annotation().contract);
-
-	return "fun_" + _function.name() + "_" + std::to_string(_function.id());
-}
-
-std::string IRNames::function(VariableDeclaration const& _varDecl)
-{
-	return "getter_fun_" + _varDecl.name() + "_" + std::to_string(_varDecl.id());
-}
-
-std::string IRNames::modifierInvocation(ModifierInvocation const& _modifierInvocation)
-{
-	// This uses the ID of the modifier invocation because it has to be unique
-	// for each invocation.
-	solAssert(!_modifierInvocation.name().path().empty(), "");
-	std::string const& modifierName = _modifierInvocation.name().path().back();
-	solAssert(!modifierName.empty(), "");
-	return "modifier_" + modifierName + "_" + std::to_string(_modifierInvocation.id());
-}
-
-std::string IRNames::functionWithModifierInner(FunctionDefinition const& _function)
-{
-	return "fun_" + _function.name() + "_" + std::to_string(_function.id()) + "_inner";
-}
-
-std::string IRNames::creationObject(ContractDefinition const& _contract)
-{
-	return _contract.name() + "_" + toString(_contract.id());
-}
-
-std::string IRNames::deployedObject(ContractDefinition const& _contract)
-{
-	return _contract.name() + "_" + toString(_contract.id()) + "_deployed";
-}
-
-std::string IRNames::internalDispatch(YulArity const& _arity)
-{
-	return "dispatch_internal"
-		"_in_" + std::to_string(_arity.in) +
-		"_out_" + std::to_string(_arity.out);
-}
-
-std::string IRNames::constructor(ContractDefinition const& _contract)
-{
-	return "constructor_" + _contract.name() + "_" + std::to_string(_contract.id());
-}
-
-std::string IRNames::libraryAddressImmutable()
-{
-	return "library_deploy_address";
-}
-
-std::string IRNames::constantValueFunction(VariableDeclaration const& _constant)
-{
-	solAssert(_constant.isConstant(), "");
-	return "constant_" + _constant.name() + "_" + std::to_string(_constant.id());
-}
-
-std::string IRNames::localVariable(VariableDeclaration const& _declaration)
-{
-	return "var_" + _declaration.name() + '_' + std::to_string(_declaration.id());
-}
-
-std::string IRNames::localVariable(Expression const& _expression)
-{
-	return "expr_" + std::to_string(_expression.id());
-}
-
-std::string IRNames::trySuccessConditionVariable(Expression const& _expression)
-{
-	auto annotation = dynamic_cast<FunctionCallAnnotation const*>(&_expression.annotation());
-	solAssert(annotation, "");
-	solAssert(annotation->tryCall, "Parameter must be a FunctionCall with tryCall-annotation set.");
-
-	return "trySuccessCondition_" + std::to_string(_expression.id());
-}
-
-std::string IRNames::tupleComponent(size_t _i)
-{
-	return "component_" + std::to_string(_i + 1);
-}
-
-std::string IRNames::zeroValue(Type const& _type, std::string const& _variableName)
-{
-	return "zero_" + _type.identifier() + _variableName;
-}
-
-std::string dispenseLocationComment(langutil::SourceLocation const& _location, IRGenerationContext& _context)
-{
-	solAssert(_location.sourceName, "");
-	_context.markSourceUsed(*_location.sourceName);
-
-	std::string debugInfo = AsmPrinter::formatSourceLocation(
-		_location,
-		_context.sourceIndices(),
-		_context.debugInfoSelection(),
-		_context.soliditySourceProvider()
-	);
-
-	return debugInfo.empty() ? "" : "/// " + debugInfo;
-}
-
-std::string dispenseLocationComment(ASTNode const& _node, IRGenerationContext& _context)
-{
-	return dispenseLocationComment(_node.location(), _context);
-}
-
-}
diff --git a/libsolidity/codegen/ir/Common.h b/libsolidity/codegen/ir/Common.h
deleted file mode 100644
index 2484ad80914f..000000000000
--- a/libsolidity/codegen/ir/Common.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Miscellaneous utilities for use in IR generator.
- */
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-
-#include <algorithm>
-#include <string>
-
-namespace solidity::frontend
-{
-
-class IRGenerationContext;
-
-/**
- * Structure that describes arity and co-arity of a Yul function, i.e. the number of its inputs and outputs.
- */
-struct YulArity
-{
-	explicit YulArity(size_t _in, size_t _out): in(_in), out(_out) {}
-
-	static YulArity fromType(FunctionType const& _functionType);
-
-	bool operator==(YulArity const& _other) const { return in == _other.in && out == _other.out; }
-	bool operator!=(YulArity const& _other) const { return !(*this == _other); }
-
-	size_t in;  /// Number of input parameters
-	size_t out; /// Number of output parameters
-};
-
-struct IRNames
-{
-	static std::string externalFunctionABIWrapper(Declaration const& _functionOrVardecl);
-	static std::string function(FunctionDefinition const& _function);
-	static std::string function(VariableDeclaration const& _varDecl);
-	static std::string modifierInvocation(ModifierInvocation const& _modifierInvocation);
-	static std::string functionWithModifierInner(FunctionDefinition const& _function);
-	static std::string creationObject(ContractDefinition const& _contract);
-	static std::string deployedObject(ContractDefinition const& _contract);
-	static std::string internalDispatch(YulArity const& _arity);
-	static std::string constructor(ContractDefinition const& _contract);
-	static std::string libraryAddressImmutable();
-	static std::string constantValueFunction(VariableDeclaration const& _constant);
-	static std::string localVariable(VariableDeclaration const& _declaration);
-	static std::string localVariable(Expression const& _expression);
-	/// @returns the variable name that can be used to inspect the success or failure of an external
-	/// function call that was invoked as part of the try statement.
-	static std::string trySuccessConditionVariable(Expression const& _expression);
-	static std::string tupleComponent(size_t _i);
-	static std::string zeroValue(Type const& _type, std::string const& _variableName);
-};
-
-
-/**
- * @returns a source location comment in the form of
- * `/// @src <sourceIndex>:<locationStart>:<locationEnd>`
- * and marks the source index as used.
- */
-std::string dispenseLocationComment(langutil::SourceLocation const& _location, IRGenerationContext& _context);
-std::string dispenseLocationComment(ASTNode const& _node, IRGenerationContext& _context);
-
-}
-
-// Overloading std::less() makes it possible to use YulArity as a map key. We could define operator<
-// instead but such an operator would be a bit ambiguous (e.g. YulArity{2, 2} would be be greater than
-// YulArity{1, 10} in lexicographical order but the latter has greater total number of inputs and outputs).
-template<>
-struct std::less<solidity::frontend::YulArity>
-{
-	bool operator() (solidity::frontend::YulArity const& _lhs, solidity::frontend::YulArity const& _rhs) const
-	{
-		return _lhs.in < _rhs.in || (_lhs.in == _rhs.in && _lhs.out < _rhs.out);
-	}
-};
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
deleted file mode 100644
index e087dc69a575..000000000000
--- a/libsolidity/codegen/ir/IRGenerationContext.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Class that contains contextual information during IR generation.
- */
-
-#include <libsolidity/codegen/ir/IRGenerationContext.h>
-
-#include <libsolidity/codegen/YulUtilFunctions.h>
-#include <libsolidity/codegen/ABIFunctions.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StringUtils.h>
-
-#include <range/v3/view/map.hpp>
-#include <range/v3/algorithm/find.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-
-std::string IRGenerationContext::enqueueFunctionForCodeGeneration(FunctionDefinition const& _function)
-{
-	std::string name = IRNames::function(_function);
-
-	if (!m_functions.contains(name))
-		m_functionGenerationQueue.push_back(&_function);
-
-	return name;
-}
-
-FunctionDefinition const* IRGenerationContext::dequeueFunctionForCodeGeneration()
-{
-	solAssert(!m_functionGenerationQueue.empty(), "");
-
-	FunctionDefinition const* result = m_functionGenerationQueue.front();
-	m_functionGenerationQueue.pop_front();
-	return result;
-}
-
-ContractDefinition const& IRGenerationContext::mostDerivedContract() const
-{
-	solAssert(m_mostDerivedContract, "Most derived contract requested but not set.");
-	return *m_mostDerivedContract;
-}
-
-IRVariable const& IRGenerationContext::addLocalVariable(VariableDeclaration const& _varDecl)
-{
-	auto const& [it, didInsert] = m_localVariables.emplace(
-		std::make_pair(&_varDecl, IRVariable{_varDecl})
-	);
-	solAssert(didInsert, "Local variable added multiple times.");
-	return it->second;
-}
-
-IRVariable const& IRGenerationContext::localVariable(VariableDeclaration const& _varDecl)
-{
-	solAssert(
-		m_localVariables.count(&_varDecl),
-		"Unknown variable: " + _varDecl.name()
-	);
-	return m_localVariables.at(&_varDecl);
-}
-
-void IRGenerationContext::resetLocalVariables()
-{
-	m_localVariables.clear();
-}
-
-void IRGenerationContext::registerImmutableVariable(VariableDeclaration const& _variable)
-{
-	solAssert(_variable.immutable(), "Attempted to register a non-immutable variable as immutable.");
-	solUnimplementedAssert(
-		_variable.annotation().type->isValueType(),
-		"Only immutable variables of value type are supported."
-	);
-	solAssert(m_reservedMemory.has_value(), "Reserved memory has already been reset.");
-	m_immutableVariables[&_variable] = CompilerUtils::generalPurposeMemoryStart + *m_reservedMemory;
-	solAssert(_variable.annotation().type->memoryHeadSize() == 32, "Memory writes might overlap.");
-	*m_reservedMemory += _variable.annotation().type->memoryHeadSize();
-}
-
-size_t IRGenerationContext::immutableMemoryOffset(VariableDeclaration const& _variable) const
-{
-	solAssert(
-		m_immutableVariables.count(&_variable),
-		"Unknown immutable variable: " + _variable.name()
-	);
-	return m_immutableVariables.at(&_variable);
-}
-
-size_t IRGenerationContext::reservedMemory()
-{
-	solAssert(m_reservedMemory.has_value(), "Reserved memory was used before.");
-	size_t reservedMemory = *m_reservedMemory;
-	m_reservedMemory = std::nullopt;
-	return reservedMemory;
-}
-
-void IRGenerationContext::addStateVariable(
-	VariableDeclaration const& _declaration,
-	u256 _storageOffset,
-	unsigned _byteOffset
-)
-{
-	m_stateVariables[&_declaration] = std::make_pair(std::move(_storageOffset), _byteOffset);
-}
-
-std::string IRGenerationContext::newYulVariable()
-{
-	return "_" + std::to_string(++m_varCounter);
-}
-
-void IRGenerationContext::initializeInternalDispatch(InternalDispatchMap _internalDispatch)
-{
-	solAssert(internalDispatchClean(), "");
-
-	for (DispatchQueue const& functions: _internalDispatch | ranges::views::values)
-		for (auto function: functions)
-			enqueueFunctionForCodeGeneration(*function);
-
-	m_internalDispatchMap = std::move(_internalDispatch);
-}
-
-InternalDispatchMap IRGenerationContext::consumeInternalDispatchMap()
-{
-	InternalDispatchMap internalDispatch = std::move(m_internalDispatchMap);
-	m_internalDispatchMap.clear();
-	return internalDispatch;
-}
-
-void IRGenerationContext::addToInternalDispatch(FunctionDefinition const& _function)
-{
-	FunctionType const* functionType = TypeProvider::function(_function, FunctionType::Kind::Internal);
-	solAssert(functionType);
-
-	YulArity arity = YulArity::fromType(*functionType);
-	DispatchQueue& dispatchQueue = m_internalDispatchMap[arity];
-	if (ranges::find(dispatchQueue, &_function) == ranges::end(dispatchQueue))
-	{
-		dispatchQueue.push_back(&_function);
-		enqueueFunctionForCodeGeneration(_function);
-	}
-}
-
-
-void IRGenerationContext::internalFunctionCalledThroughDispatch(YulArity const& _arity)
-{
-	m_internalDispatchMap.try_emplace(_arity);
-}
-
-YulUtilFunctions IRGenerationContext::utils()
-{
-	return YulUtilFunctions(m_evmVersion, m_revertStrings, m_functions);
-}
-
-ABIFunctions IRGenerationContext::abiFunctions()
-{
-	return ABIFunctions(m_evmVersion, m_revertStrings, m_functions);
-}
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
deleted file mode 100644
index a80a18a62a10..000000000000
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Class that contains contextual information during IR generation.
- */
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/codegen/ir/IRVariable.h>
-#include <libsolidity/interface/DebugSettings.h>
-
-#include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
-#include <libsolidity/codegen/ir/Common.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/Common.h>
-
-#include <set>
-#include <string>
-#include <memory>
-
-namespace solidity::frontend
-{
-
-class YulUtilFunctions;
-class ABIFunctions;
-
-using DispatchQueue = std::deque<FunctionDefinition const*>;
-using InternalDispatchMap = std::map<YulArity, DispatchQueue>;
-
-/**
- * Class that contains contextual information during IR generation.
- */
-class IRGenerationContext
-{
-public:
-	enum class ExecutionContext { Creation, Deployed };
-
-	IRGenerationContext(
-		langutil::EVMVersion _evmVersion,
-		ExecutionContext _executionContext,
-		RevertStrings _revertStrings,
-		std::map<std::string, unsigned> _sourceIndices,
-		langutil::DebugInfoSelection const& _debugInfoSelection,
-		langutil::CharStreamProvider const* _soliditySourceProvider
-	):
-		m_evmVersion(_evmVersion),
-		m_executionContext(_executionContext),
-		m_revertStrings(_revertStrings),
-		m_sourceIndices(std::move(_sourceIndices)),
-		m_debugInfoSelection(_debugInfoSelection),
-		m_soliditySourceProvider(_soliditySourceProvider)
-	{}
-
-	MultiUseYulFunctionCollector& functionCollector() { return m_functions; }
-
-	/// Adds a Solidity function to the function generation queue and returns the name of the
-	/// corresponding Yul function.
-	std::string enqueueFunctionForCodeGeneration(FunctionDefinition const& _function);
-
-	/// Pops one item from the function generation queue. Must not be called if the queue is empty.
-	FunctionDefinition const* dequeueFunctionForCodeGeneration();
-
-	bool functionGenerationQueueEmpty() { return m_functionGenerationQueue.empty(); }
-
-	/// Sets the most derived contract (the one currently being compiled)>
-	void setMostDerivedContract(ContractDefinition const& _mostDerivedContract)
-	{
-		m_mostDerivedContract = &_mostDerivedContract;
-	}
-	ContractDefinition const& mostDerivedContract() const;
-
-
-	IRVariable const& addLocalVariable(VariableDeclaration const& _varDecl);
-	bool isLocalVariable(VariableDeclaration const& _varDecl) const { return m_localVariables.count(&_varDecl); }
-	IRVariable const& localVariable(VariableDeclaration const& _varDecl);
-	void resetLocalVariables();
-
-	/// Registers an immutable variable of the contract.
-	/// Should only be called at construction time.
-	void registerImmutableVariable(VariableDeclaration const& _varDecl);
-	/// @returns the reserved memory for storing the value of the
-	/// immutable @a _variable during contract creation.
-	size_t immutableMemoryOffset(VariableDeclaration const& _variable) const;
-	/// @returns the reserved memory and resets it to mark it as used.
-	/// Intended to be used only once for initializing the free memory pointer
-	/// to after the area used for immutables.
-	size_t reservedMemory();
-
-	void addStateVariable(VariableDeclaration const& _varDecl, u256 _storageOffset, unsigned _byteOffset);
-	bool isStateVariable(VariableDeclaration const& _varDecl) const { return m_stateVariables.count(&_varDecl); }
-	std::pair<u256, unsigned> storageLocationOfStateVariable(VariableDeclaration const& _varDecl) const
-	{
-		solAssert(isStateVariable(_varDecl), "");
-		return m_stateVariables.at(&_varDecl);
-	}
-
-	std::string newYulVariable();
-
-	void initializeInternalDispatch(InternalDispatchMap _internalDispatchMap);
-	InternalDispatchMap consumeInternalDispatchMap();
-	bool internalDispatchClean() const { return m_internalDispatchMap.empty(); }
-
-	/// Notifies the context that a function call that needs to go through internal dispatch was
-	/// encountered while visiting the AST. This ensures that the corresponding dispatch function
-	/// gets added to the dispatch map even if there are no entries in it (which may happen if
-	/// the code contains a call to an uninitialized function variable).
-	void internalFunctionCalledThroughDispatch(YulArity const& _arity);
-
-	/// Adds a function to the internal dispatch.
-	void addToInternalDispatch(FunctionDefinition const& _function);
-
-	/// @returns a new copy of the utility function generator (but using the same function set).
-	YulUtilFunctions utils();
-
-	langutil::EVMVersion evmVersion() const { return m_evmVersion; }
-	ExecutionContext executionContext() const { return m_executionContext; }
-
-	void setArithmetic(Arithmetic _value) { m_arithmetic = _value; }
-	Arithmetic arithmetic() const { return m_arithmetic; }
-
-	ABIFunctions abiFunctions();
-
-	RevertStrings revertStrings() const { return m_revertStrings; }
-
-	std::set<ContractDefinition const*, ASTNode::CompareByID>& subObjectsCreated() { return m_subObjects; }
-
-	bool memoryUnsafeInlineAssemblySeen() const { return m_memoryUnsafeInlineAssemblySeen; }
-	void setMemoryUnsafeInlineAssemblySeen() { m_memoryUnsafeInlineAssemblySeen = true; }
-
-	std::map<std::string, unsigned> const& sourceIndices() const { return m_sourceIndices; }
-	void markSourceUsed(std::string const& _name) { m_usedSourceNames.insert(_name); }
-	std::set<std::string> const& usedSourceNames() const { return m_usedSourceNames; }
-
-	bool immutableRegistered(VariableDeclaration const& _varDecl) const { return m_immutableVariables.count(&_varDecl); }
-
-	langutil::DebugInfoSelection debugInfoSelection() const { return m_debugInfoSelection; }
-	langutil::CharStreamProvider const* soliditySourceProvider() const { return m_soliditySourceProvider; }
-
-private:
-	langutil::EVMVersion m_evmVersion;
-	ExecutionContext m_executionContext;
-	RevertStrings m_revertStrings;
-	std::map<std::string, unsigned> m_sourceIndices;
-	std::set<std::string> m_usedSourceNames;
-	ContractDefinition const* m_mostDerivedContract = nullptr;
-	std::map<VariableDeclaration const*, IRVariable> m_localVariables;
-	/// Memory offsets reserved for the values of immutable variables during contract creation.
-	/// This map is empty in the runtime context.
-	std::map<VariableDeclaration const*, size_t> m_immutableVariables;
-	/// Total amount of reserved memory. Reserved memory is used to store
-	/// immutable variables during contract creation.
-	std::optional<size_t> m_reservedMemory = {0};
-	/// Storage offsets of state variables
-	std::map<VariableDeclaration const*, std::pair<u256, unsigned>> m_stateVariables;
-	MultiUseYulFunctionCollector m_functions;
-	size_t m_varCounter = 0;
-	/// Whether to use checked or wrapping arithmetic.
-	Arithmetic m_arithmetic = Arithmetic::Checked;
-
-	/// Flag indicating whether any memory-unsafe inline assembly block was seen.
-	bool m_memoryUnsafeInlineAssemblySeen = false;
-
-	/// Function definitions queued for code generation. They're the Solidity functions whose calls
-	/// were discovered by the IR generator during AST traversal.
-	/// Note that the queue gets filled in a lazy way - new definitions can be added while the
-	/// collected ones get removed and traversed.
-	/// The order and duplicates are relevant here
-	/// (see: IRGenerationContext::[enqueue|dequeue]FunctionForCodeGeneration)
-	DispatchQueue m_functionGenerationQueue;
-
-	/// Collection of functions that need to be callable via internal dispatch.
-	/// Note that having a key with an empty set of functions is a valid situation. It means that
-	/// the code contains a call via a pointer even though a specific function is never assigned to it.
-	/// It will fail at runtime but the code must still compile.
-	InternalDispatchMap m_internalDispatchMap;
-
-	std::set<ContractDefinition const*, ASTNode::CompareByID> m_subObjects;
-
-	langutil::DebugInfoSelection m_debugInfoSelection = {};
-	langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr;
-};
-
-}
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
deleted file mode 100644
index b84fbc357345..000000000000
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ /dev/null
@@ -1,1111 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * @date 2017
- * Component that translates Solidity code into Yul.
- */
-
-#include <libsolidity/codegen/ir/Common.h>
-#include <libsolidity/codegen/ir/IRGenerator.h>
-#include <libsolidity/codegen/ir/IRGeneratorForStatements.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/codegen/ABIFunctions.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-
-#include <libyul/YulStack.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/Whiskers.h>
-
-#include <json/json.h>
-
-#include <sstream>
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace std::string_literals;
-
-namespace
-{
-
-void verifyCallGraph(
-	std::set<CallableDeclaration const*, ASTNode::CompareByID> const& _expectedCallables,
-	std::set<FunctionDefinition const*> _generatedFunctions
-)
-{
-	for (auto const& expectedCallable: _expectedCallables)
-		if (auto const* expectedFunction = dynamic_cast<FunctionDefinition const*>(expectedCallable))
-		{
-			solAssert(
-				_generatedFunctions.count(expectedFunction) == 1 || expectedFunction->isConstructor(),
-				"No code generated for function " + expectedFunction->name() + " even though it is not a constructor."
-			);
-			_generatedFunctions.erase(expectedFunction);
-		}
-
-	solAssert(
-		_generatedFunctions.size() == 0,
-		"Of the generated functions " + toString(_generatedFunctions.size()) + " are not in the call graph."
-	);
-}
-
-std::set<CallableDeclaration const*, ASTNode::CompareByID> collectReachableCallables(
-	CallGraph const& _graph
-)
-{
-	std::set<CallableDeclaration const*, ASTNode::CompareByID> reachableCallables;
-	for (CallGraph::Node const& reachableNode: _graph.edges | ranges::views::keys)
-		if (std::holds_alternative<CallableDeclaration const*>(reachableNode))
-			reachableCallables.emplace(std::get<CallableDeclaration const*>(reachableNode));
-
-	return reachableCallables;
-}
-
-}
-
-std::string IRGenerator::run(
-	ContractDefinition const& _contract,
-	bytes const& _cborMetadata,
-	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
-)
-{
-	return yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
-}
-
-std::string IRGenerator::generate(
-	ContractDefinition const& _contract,
-	bytes const& _cborMetadata,
-	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
-)
-{
-	auto subObjectSources = [&_otherYulSources](std::set<ContractDefinition const*, ASTNode::CompareByID> const& subObjects) -> std::string
-	{
-		std::string subObjectsSources;
-		for (ContractDefinition const* subObject: subObjects)
-			subObjectsSources += _otherYulSources.at(subObject);
-		return subObjectsSources;
-	};
-	auto formatUseSrcMap = [](IRGenerationContext const& _context) -> std::string
-	{
-		return joinHumanReadable(
-			ranges::views::transform(_context.usedSourceNames(), [_context](std::string const& _sourceName) {
-				return std::to_string(_context.sourceIndices().at(_sourceName)) + ":" + escapeAndQuoteString(_sourceName);
-			}),
-			", "
-		);
-	};
-
-	Whiskers t(R"(
-		/// @use-src <useSrcMapCreation>
-		object "<CreationObject>" {
-			code {
-				<sourceLocationCommentCreation>
-				<memoryInitCreation>
-				<callValueCheck>
-				<?library>
-				<!library>
-				<?constructorHasParams> let <constructorParams> := <copyConstructorArguments>() </constructorHasParams>
-				<constructor>(<constructorParams>)
-				</library>
-				<deploy>
-				<functions>
-			}
-			/// @use-src <useSrcMapDeployed>
-			object "<DeployedObject>" {
-				code {
-					<sourceLocationCommentDeployed>
-					<memoryInitDeployed>
-					<?library>
-					let called_via_delegatecall := iszero(eq(loadimmutable("<library_address>"), address()))
-					</library>
-					<dispatch>
-					<deployedFunctions>
-				}
-				<deployedSubObjects>
-				data "<metadataName>" hex"<cborMetadata>"
-			}
-			<subObjects>
-		}
-	)");
-
-	resetContext(_contract, ExecutionContext::Creation);
-	for (VariableDeclaration const* var: ContractType(_contract).immutableVariables())
-		m_context.registerImmutableVariable(*var);
-
-	t("CreationObject", IRNames::creationObject(_contract));
-	t("sourceLocationCommentCreation", dispenseLocationComment(_contract));
-	t("library", _contract.isLibrary());
-
-	FunctionDefinition const* constructor = _contract.constructor();
-	t("callValueCheck", !constructor || !constructor->isPayable() ? callValueCheck() : "");
-	std::vector<std::string> constructorParams;
-	if (constructor && !constructor->parameters().empty())
-	{
-		for (size_t i = 0; i < CompilerUtils::sizeOnStack(constructor->parameters()); ++i)
-			constructorParams.emplace_back(m_context.newYulVariable());
-		t(
-			"copyConstructorArguments",
-			m_utils.copyConstructorArgumentsToMemoryFunction(_contract, IRNames::creationObject(_contract))
-		);
-	}
-	t("constructorParams", joinHumanReadable(constructorParams));
-	t("constructorHasParams", !constructorParams.empty());
-	t("constructor", IRNames::constructor(_contract));
-
-	t("deploy", deployCode(_contract));
-	generateConstructors(_contract);
-	std::set<FunctionDefinition const*> creationFunctionList = generateQueuedFunctions();
-	InternalDispatchMap internalDispatchMap = generateInternalDispatchFunctions(_contract);
-
-	t("functions", m_context.functionCollector().requestedFunctions());
-	t("subObjects", subObjectSources(m_context.subObjectsCreated()));
-
-	// This has to be called only after all other code generation for the creation object is complete.
-	bool creationInvolvesMemoryUnsafeAssembly = m_context.memoryUnsafeInlineAssemblySeen();
-	t("memoryInitCreation", memoryInit(!creationInvolvesMemoryUnsafeAssembly));
-	t("useSrcMapCreation", formatUseSrcMap(m_context));
-
-	resetContext(_contract, ExecutionContext::Deployed);
-
-	// NOTE: Function pointers can be passed from creation code via storage variables. We need to
-	// get all the functions they could point to into the dispatch functions even if they're never
-	// referenced by name in the deployed code.
-	m_context.initializeInternalDispatch(std::move(internalDispatchMap));
-
-	// Do not register immutables to avoid assignment.
-	t("DeployedObject", IRNames::deployedObject(_contract));
-	t("sourceLocationCommentDeployed", dispenseLocationComment(_contract));
-	t("library_address", IRNames::libraryAddressImmutable());
-	t("dispatch", dispatchRoutine(_contract));
-	std::set<FunctionDefinition const*> deployedFunctionList = generateQueuedFunctions();
-	generateInternalDispatchFunctions(_contract);
-	t("deployedFunctions", m_context.functionCollector().requestedFunctions());
-	t("deployedSubObjects", subObjectSources(m_context.subObjectsCreated()));
-	t("metadataName", yul::Object::metadataName());
-	t("cborMetadata", util::toHex(_cborMetadata));
-
-	t("useSrcMapDeployed", formatUseSrcMap(m_context));
-
-	// This has to be called only after all other code generation for the deployed object is complete.
-	bool deployedInvolvesMemoryUnsafeAssembly = m_context.memoryUnsafeInlineAssemblySeen();
-	t("memoryInitDeployed", memoryInit(!deployedInvolvesMemoryUnsafeAssembly));
-
-	solAssert(_contract.annotation().creationCallGraph->get() != nullptr, "");
-	solAssert(_contract.annotation().deployedCallGraph->get() != nullptr, "");
-	verifyCallGraph(collectReachableCallables(**_contract.annotation().creationCallGraph), std::move(creationFunctionList));
-	verifyCallGraph(collectReachableCallables(**_contract.annotation().deployedCallGraph), std::move(deployedFunctionList));
-
-	return t.render();
-}
-
-std::string IRGenerator::generate(Block const& _block)
-{
-	IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings);
-	generator.generate(_block);
-	return generator.code();
-}
-
-std::set<FunctionDefinition const*> IRGenerator::generateQueuedFunctions()
-{
-	std::set<FunctionDefinition const*> functions;
-
-	while (!m_context.functionGenerationQueueEmpty())
-	{
-		FunctionDefinition const& functionDefinition = *m_context.dequeueFunctionForCodeGeneration();
-
-		functions.emplace(&functionDefinition);
-		// NOTE: generateFunction() may modify function generation queue
-		generateFunction(functionDefinition);
-	}
-
-	return functions;
-}
-
-InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefinition const& _contract)
-{
-	solAssert(
-		m_context.functionGenerationQueueEmpty(),
-		"At this point all the enqueued functions should have been generated. "
-		"Otherwise the dispatch may be incomplete."
-	);
-
-	InternalDispatchMap internalDispatchMap = m_context.consumeInternalDispatchMap();
-	for (YulArity const& arity: internalDispatchMap | ranges::views::keys)
-	{
-		std::string funName = IRNames::internalDispatch(arity);
-		m_context.functionCollector().createFunction(funName, [&]() {
-			Whiskers templ(R"(
-				<sourceLocationComment>
-				function <functionName>(fun<?+in>, <in></+in>) <?+out>-> <out></+out> {
-					switch fun
-					<#cases>
-					case <funID>
-					{
-						<?+out> <out> :=</+out> <name>(<in>)
-					}
-					</cases>
-					default { <panic>() }
-				}
-				<sourceLocationComment>
-			)");
-			templ("sourceLocationComment", dispenseLocationComment(_contract));
-			templ("functionName", funName);
-			templ("panic", m_utils.panicFunction(PanicCode::InvalidInternalFunction));
-			templ("in", suffixedVariableNameList("in_", 0, arity.in));
-			templ("out", suffixedVariableNameList("out_", 0, arity.out));
-
-			std::vector<std::map<std::string, std::string>> cases;
-			std::set<int64_t> caseValues;
-			for (FunctionDefinition const* function: internalDispatchMap.at(arity))
-			{
-				solAssert(function, "");
-				solAssert(
-					YulArity::fromType(*TypeProvider::function(*function, FunctionType::Kind::Internal)) == arity,
-					"A single dispatch function can only handle functions of one arity"
-				);
-				solAssert(!function->isConstructor(), "");
-				// 0 is reserved for uninitialized function pointers
-				solAssert(function->id() != 0, "Unexpected function ID: 0");
-				solAssert(caseValues.count(function->id()) == 0, "Duplicate function ID");
-				solAssert(m_context.functionCollector().contains(IRNames::function(*function)), "");
-
-				cases.emplace_back(std::map<std::string, std::string>{
-					{"funID", std::to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(function))},
-					{"name", IRNames::function(*function)}
-				});
-				caseValues.insert(function->id());
-			}
-
-			templ("cases", std::move(cases));
-			return templ.render();
-		});
-	}
-
-	solAssert(m_context.internalDispatchClean(), "");
-	solAssert(
-		m_context.functionGenerationQueueEmpty(),
-		"Internal dispatch generation must not add new functions to generation queue because they won't be proeessed."
-	);
-
-	return internalDispatchMap;
-}
-
-std::string IRGenerator::generateFunction(FunctionDefinition const& _function)
-{
-	std::string functionName = IRNames::function(_function);
-	return m_context.functionCollector().createFunction(functionName, [&]() {
-		m_context.resetLocalVariables();
-		Whiskers t(R"(
-			<astIDComment><sourceLocationComment>
-			function <functionName>(<params>)<?+retParams> -> <retParams></+retParams> {
-				<retInit>
-				<body>
-			}
-			<contractSourceLocationComment>
-		)");
-
-		if (m_context.debugInfoSelection().astID)
-			t("astIDComment", "/// @ast-id " + std::to_string(_function.id()) + "\n");
-		else
-			t("astIDComment", "");
-		t("sourceLocationComment", dispenseLocationComment(_function));
-		t(
-			"contractSourceLocationComment",
-			dispenseLocationComment(m_context.mostDerivedContract())
-		);
-
-		t("functionName", functionName);
-		std::vector<std::string> params;
-		for (auto const& varDecl: _function.parameters())
-			params += m_context.addLocalVariable(*varDecl).stackSlots();
-		t("params", joinHumanReadable(params));
-		std::vector<std::string> retParams;
-		std::string retInit;
-		for (auto const& varDecl: _function.returnParameters())
-		{
-			retParams += m_context.addLocalVariable(*varDecl).stackSlots();
-			retInit += generateInitialAssignment(*varDecl);
-		}
-
-		t("retParams", joinHumanReadable(retParams));
-		t("retInit", retInit);
-
-		if (_function.modifiers().empty())
-			t("body", generate(_function.body()));
-		else
-		{
-			for (size_t i = 0; i < _function.modifiers().size(); ++i)
-			{
-				ModifierInvocation const& modifier = *_function.modifiers().at(i);
-				std::string next =
-					i + 1 < _function.modifiers().size() ?
-					IRNames::modifierInvocation(*_function.modifiers().at(i + 1)) :
-					IRNames::functionWithModifierInner(_function);
-				generateModifier(modifier, _function, next);
-			}
-			t("body",
-				(retParams.empty() ? std::string{} : joinHumanReadable(retParams) + " := ") +
-				IRNames::modifierInvocation(*_function.modifiers().at(0)) +
-				"(" +
-				joinHumanReadable(retParams + params) +
-				")"
-			);
-			// Now generate the actual inner function.
-			generateFunctionWithModifierInner(_function);
-		}
-		return t.render();
-	});
-}
-
-std::string IRGenerator::generateModifier(
-	ModifierInvocation const& _modifierInvocation,
-	FunctionDefinition const& _function,
-	std::string const& _nextFunction
-)
-{
-	std::string functionName = IRNames::modifierInvocation(_modifierInvocation);
-	return m_context.functionCollector().createFunction(functionName, [&]() {
-		m_context.resetLocalVariables();
-		Whiskers t(R"(
-			<astIDComment><sourceLocationComment>
-			function <functionName>(<params>)<?+retParams> -> <retParams></+retParams> {
-				<assignRetParams>
-				<evalArgs>
-				<body>
-			}
-			<contractSourceLocationComment>
-		)");
-
-		t("functionName", functionName);
-		std::vector<std::string> retParamsIn;
-		for (auto const& varDecl: _function.returnParameters())
-			retParamsIn += m_context.addLocalVariable(*varDecl).stackSlots();
-		std::vector<std::string> params = retParamsIn;
-		for (auto const& varDecl: _function.parameters())
-			params += m_context.addLocalVariable(*varDecl).stackSlots();
-		t("params", joinHumanReadable(params));
-		std::vector<std::string> retParams;
-		std::string assignRetParams;
-		for (size_t i = 0; i < retParamsIn.size(); ++i)
-		{
-			retParams.emplace_back(m_context.newYulVariable());
-			assignRetParams += retParams.at(i) + " := " + retParamsIn.at(i) + "\n";
-		}
-		t("retParams", joinHumanReadable(retParams));
-		t("assignRetParams", assignRetParams);
-
-		ModifierDefinition const* modifier = dynamic_cast<ModifierDefinition const*>(
-			_modifierInvocation.name().annotation().referencedDeclaration
-		);
-		solAssert(modifier, "");
-
-		if (m_context.debugInfoSelection().astID)
-			t("astIDComment", "/// @ast-id " + std::to_string(modifier->id()) + "\n");
-		else
-			t("astIDComment", "");
-		t("sourceLocationComment", dispenseLocationComment(*modifier));
-		t(
-			"contractSourceLocationComment",
-			dispenseLocationComment(m_context.mostDerivedContract())
-		);
-
-		switch (*_modifierInvocation.name().annotation().requiredLookup)
-		{
-		case VirtualLookup::Virtual:
-			modifier = &modifier->resolveVirtual(m_context.mostDerivedContract());
-			solAssert(modifier, "");
-			break;
-		case VirtualLookup::Static:
-			break;
-		case VirtualLookup::Super:
-			solAssert(false, "");
-		}
-
-		solAssert(
-			modifier->parameters().empty() ==
-			(!_modifierInvocation.arguments() || _modifierInvocation.arguments()->empty()),
-			""
-		);
-		IRGeneratorForStatements expressionEvaluator(m_context, m_utils, m_optimiserSettings);
-		if (_modifierInvocation.arguments())
-			for (size_t i = 0; i < _modifierInvocation.arguments()->size(); i++)
-			{
-				IRVariable argument = expressionEvaluator.evaluateExpression(
-					*_modifierInvocation.arguments()->at(i),
-					*modifier->parameters()[i]->annotation().type
-				);
-				expressionEvaluator.define(
-					m_context.addLocalVariable(*modifier->parameters()[i]),
-					argument
-				);
-			}
-
-		t("evalArgs", expressionEvaluator.code());
-		IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings, [&]() {
-			std::string ret = joinHumanReadable(retParams);
-			return
-				(ret.empty() ? "" : ret + " := ") +
-				_nextFunction + "(" + joinHumanReadable(params) + ")\n";
-		});
-		generator.generate(modifier->body());
-		t("body", generator.code());
-		return t.render();
-	});
-}
-
-std::string IRGenerator::generateFunctionWithModifierInner(FunctionDefinition const& _function)
-{
-	std::string functionName = IRNames::functionWithModifierInner(_function);
-	return m_context.functionCollector().createFunction(functionName, [&]() {
-		m_context.resetLocalVariables();
-		Whiskers t(R"(
-			<sourceLocationComment>
-			function <functionName>(<params>)<?+retParams> -> <retParams></+retParams> {
-				<assignRetParams>
-				<body>
-			}
-			<contractSourceLocationComment>
-		)");
-		t("sourceLocationComment", dispenseLocationComment(_function));
-		t(
-			"contractSourceLocationComment",
-			dispenseLocationComment(m_context.mostDerivedContract())
-		);
-		t("functionName", functionName);
-		std::vector<std::string> retParams;
-		std::vector<std::string> retParamsIn;
-		for (auto const& varDecl: _function.returnParameters())
-			retParams += m_context.addLocalVariable(*varDecl).stackSlots();
-		std::string assignRetParams;
-		for (size_t i = 0; i < retParams.size(); ++i)
-		{
-			retParamsIn.emplace_back(m_context.newYulVariable());
-			assignRetParams += retParams.at(i) + " := " + retParamsIn.at(i) + "\n";
-		}
-		std::vector<std::string> params = retParamsIn;
-		for (auto const& varDecl: _function.parameters())
-			params += m_context.addLocalVariable(*varDecl).stackSlots();
-		t("params", joinHumanReadable(params));
-		t("retParams", joinHumanReadable(retParams));
-		t("assignRetParams", assignRetParams);
-		t("body", generate(_function.body()));
-		return t.render();
-	});
-}
-
-std::string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
-{
-	std::string functionName = IRNames::function(_varDecl);
-	return m_context.functionCollector().createFunction(functionName, [&]() {
-		Type const* type = _varDecl.annotation().type;
-
-		solAssert(_varDecl.isStateVariable(), "");
-
-		FunctionType accessorType(_varDecl);
-		TypePointers paramTypes = accessorType.parameterTypes();
-		if (_varDecl.immutable())
-		{
-			solAssert(paramTypes.empty(), "");
-			solUnimplementedAssert(type->sizeOnStack() == 1);
-			return Whiskers(R"(
-				<astIDComment><sourceLocationComment>
-				function <functionName>() -> rval {
-					rval := loadimmutable("<id>")
-				}
-				<contractSourceLocationComment>
-			)")
-			(
-				"astIDComment",
-				m_context.debugInfoSelection().astID ?
-					"/// @ast-id " + std::to_string(_varDecl.id()) + "\n" :
-					""
-			)
-			("sourceLocationComment", dispenseLocationComment(_varDecl))
-			(
-				"contractSourceLocationComment",
-				dispenseLocationComment(m_context.mostDerivedContract())
-			)
-			("functionName", functionName)
-			("id", std::to_string(_varDecl.id()))
-			.render();
-		}
-		else if (_varDecl.isConstant())
-		{
-			solAssert(paramTypes.empty(), "");
-			return Whiskers(R"(
-				<astIDComment><sourceLocationComment>
-				function <functionName>() -> <ret> {
-					<ret> := <constantValueFunction>()
-				}
-				<contractSourceLocationComment>
-			)")
-			(
-				"astIDComment",
-				m_context.debugInfoSelection().astID ?
-					"/// @ast-id " + std::to_string(_varDecl.id()) + "\n" :
-					""
-			)
-			("sourceLocationComment", dispenseLocationComment(_varDecl))
-			(
-				"contractSourceLocationComment",
-				dispenseLocationComment(m_context.mostDerivedContract())
-			)
-			("functionName", functionName)
-			("constantValueFunction", IRGeneratorForStatements(m_context, m_utils, m_optimiserSettings).constantValueFunction(_varDecl))
-			("ret", suffixedVariableNameList("ret_", 0, _varDecl.type()->sizeOnStack()))
-			.render();
-		}
-
-		std::string code;
-
-		auto const& location = m_context.storageLocationOfStateVariable(_varDecl);
-		code += Whiskers(R"(
-			let slot := <slot>
-			let offset := <offset>
-		)")
-		("slot", location.first.str())
-		("offset", std::to_string(location.second))
-		.render();
-
-		if (!paramTypes.empty())
-			solAssert(
-				location.second == 0,
-				"If there are parameters, we are dealing with structs or mappings and thus should have offset zero."
-			);
-
-		// The code of an accessor is of the form `x[a][b][c]` (it is slightly more complicated
-		// if the final type is a struct).
-		// In each iteration of the loop below, we consume one parameter, perform an
-		// index access, reassign the yul variable `slot` and move @a currentType further "down".
-		// The initial value of @a currentType is only used if we skip the loop completely.
-		Type const* currentType = _varDecl.annotation().type;
-
-		std::vector<std::string> parameters;
-		std::vector<std::string> returnVariables;
-
-		for (size_t i = 0; i < paramTypes.size(); ++i)
-		{
-			MappingType const* mappingType = dynamic_cast<MappingType const*>(currentType);
-			ArrayType const* arrayType = dynamic_cast<ArrayType const*>(currentType);
-			solAssert(mappingType || arrayType, "");
-
-			std::vector<std::string> keys = IRVariable("key_" + std::to_string(i),
-				mappingType ? *mappingType->keyType() : *TypeProvider::uint256()
-			).stackSlots();
-			parameters += keys;
-
-			Whiskers templ(R"(
-				<?array>
-					if iszero(lt(<keys>, <length>(slot))) { revert(0, 0) }
-				</array>
-				slot<?array>, offset</array> := <indexAccess>(slot<?+keys>, <keys></+keys>)
-			)");
-			templ(
-				"indexAccess",
-				mappingType ?
-				m_utils.mappingIndexAccessFunction(*mappingType, *mappingType->keyType()) :
-				m_utils.storageArrayIndexAccessFunction(*arrayType)
-			)
-			("array", arrayType != nullptr)
-			("keys", joinHumanReadable(keys));
-			if (arrayType)
-				templ("length", m_utils.arrayLengthFunction(*arrayType));
-
-			code += templ.render();
-
-			currentType = mappingType ? mappingType->valueType() : arrayType->baseType();
-		}
-
-		auto returnTypes = accessorType.returnParameterTypes();
-		solAssert(returnTypes.size() >= 1, "");
-		if (StructType const* structType = dynamic_cast<StructType const*>(currentType))
-		{
-			solAssert(location.second == 0, "");
-			auto const& names = accessorType.returnParameterNames();
-			for (size_t i = 0; i < names.size(); ++i)
-			{
-				if (returnTypes[i]->category() == Type::Category::Mapping)
-					continue;
-				if (
-					auto const* arrayType = dynamic_cast<ArrayType const*>(returnTypes[i]);
-					arrayType && !arrayType->isByteArrayOrString()
-				)
-					continue;
-
-				std::pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
-				std::vector<std::string> retVars = IRVariable("ret_" + std::to_string(returnVariables.size()), *returnTypes[i]).stackSlots();
-				returnVariables += retVars;
-				code += Whiskers(R"(
-					<ret> := <readStorage>(add(slot, <slotOffset>))
-				)")
-				("ret", joinHumanReadable(retVars))
-				("readStorage", m_utils.readFromStorage(*returnTypes[i], offsets.second, true))
-				("slotOffset", offsets.first.str())
-				.render();
-			}
-		}
-		else
-		{
-			solAssert(returnTypes.size() == 1, "");
-			auto const* arrayType = dynamic_cast<ArrayType const*>(returnTypes.front());
-			if (arrayType)
-				solAssert(arrayType->isByteArrayOrString(), "");
-			std::vector<std::string> retVars = IRVariable("ret", *returnTypes.front()).stackSlots();
-			returnVariables += retVars;
-			code += Whiskers(R"(
-				<ret> := <readStorage>(slot, offset)
-			)")
-			("ret", joinHumanReadable(retVars))
-			("readStorage", m_utils.readFromStorageDynamic(*returnTypes.front(), true))
-			.render();
-		}
-
-		return Whiskers(R"(
-			<astIDComment><sourceLocationComment>
-			function <functionName>(<params>) -> <retVariables> {
-				<code>
-			}
-			<contractSourceLocationComment>
-		)")
-		("functionName", functionName)
-		("params", joinHumanReadable(parameters))
-		("retVariables", joinHumanReadable(returnVariables))
-		("code", std::move(code))
-		(
-			"astIDComment",
-			m_context.debugInfoSelection().astID ?
-				"/// @ast-id " + std::to_string(_varDecl.id()) + "\n" :
-				""
-		)
-		("sourceLocationComment", dispenseLocationComment(_varDecl))
-		(
-			"contractSourceLocationComment",
-			dispenseLocationComment(m_context.mostDerivedContract())
-		)
-		.render();
-	});
-}
-
-std::string IRGenerator::generateExternalFunction(ContractDefinition const& _contract, FunctionType const& _functionType)
-{
-	std::string functionName = IRNames::externalFunctionABIWrapper(_functionType.declaration());
-	return m_context.functionCollector().createFunction(functionName, [&](std::vector<std::string>&, std::vector<std::string>&) -> std::string {
-		Whiskers t(R"X(
-			<callValueCheck>
-			<?+params>let <params> := </+params> <abiDecode>(4, calldatasize())
-			<?+retParams>let <retParams> := </+retParams> <function>(<params>)
-			let memPos := <allocateUnbounded>()
-			let memEnd := <abiEncode>(memPos <?+retParams>,</+retParams> <retParams>)
-			return(memPos, sub(memEnd, memPos))
-		)X");
-		t("callValueCheck", (_functionType.isPayable() || _contract.isLibrary()) ? "" : callValueCheck());
-
-		unsigned paramVars = std::make_shared<TupleType>(_functionType.parameterTypes())->sizeOnStack();
-		unsigned retVars = std::make_shared<TupleType>(_functionType.returnParameterTypes())->sizeOnStack();
-
-		ABIFunctions abiFunctions(m_evmVersion, m_context.revertStrings(), m_context.functionCollector());
-		t("abiDecode", abiFunctions.tupleDecoder(_functionType.parameterTypes()));
-		t("params",  suffixedVariableNameList("param_", 0, paramVars));
-		t("retParams",  suffixedVariableNameList("ret_", 0, retVars));
-
-		if (FunctionDefinition const* funDef = dynamic_cast<FunctionDefinition const*>(&_functionType.declaration()))
-		{
-			solAssert(!funDef->isConstructor());
-			t("function", m_context.enqueueFunctionForCodeGeneration(*funDef));
-		}
-		else if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(&_functionType.declaration()))
-			t("function", generateGetter(*varDecl));
-		else
-			solAssert(false, "Unexpected declaration for function!");
-
-		t("allocateUnbounded", m_utils.allocateUnboundedFunction());
-		t("abiEncode", abiFunctions.tupleEncoder(_functionType.returnParameterTypes(), _functionType.returnParameterTypes(), _contract.isLibrary()));
-		return t.render();
-	});
-}
-
-std::string IRGenerator::generateInitialAssignment(VariableDeclaration const& _varDecl)
-{
-	IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings);
-	generator.initializeLocalVar(_varDecl);
-	return generator.code();
-}
-
-std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::string>>> IRGenerator::evaluateConstructorArguments(
-	ContractDefinition const& _contract
-)
-{
-	struct InheritanceOrder
-	{
-		bool operator()(ContractDefinition const* _c1, ContractDefinition const* _c2) const
-		{
-			solAssert(util::contains(linearizedBaseContracts, _c1) && util::contains(linearizedBaseContracts, _c2), "");
-			auto it1 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c1);
-			auto it2 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c2);
-			return it1 < it2;
-		}
-		std::vector<ContractDefinition const*> const& linearizedBaseContracts;
-	} inheritanceOrder{_contract.annotation().linearizedBaseContracts};
-
-	std::map<ContractDefinition const*, std::vector<std::string>> constructorParams;
-
-	std::map<ContractDefinition const*, std::vector<ASTPointer<Expression>>const *, InheritanceOrder>
-		baseConstructorArguments(inheritanceOrder);
-
-	for (ASTPointer<InheritanceSpecifier> const& base: _contract.baseContracts())
-		if (FunctionDefinition const* baseConstructor = dynamic_cast<ContractDefinition const*>(
-				base->name().annotation().referencedDeclaration
-		)->constructor(); baseConstructor && base->arguments())
-			solAssert(baseConstructorArguments.emplace(
-				dynamic_cast<ContractDefinition const*>(baseConstructor->scope()),
-				base->arguments()
-			).second, "");
-
-	if (FunctionDefinition const* constructor = _contract.constructor())
-		for (ASTPointer<ModifierInvocation> const& modifier: constructor->modifiers())
-			if (auto const* baseContract = dynamic_cast<ContractDefinition const*>(
-				modifier->name().annotation().referencedDeclaration
-			))
-				if (
-					FunctionDefinition const* baseConstructor = baseContract->constructor();
-					baseConstructor && modifier->arguments()
-				)
-					solAssert(baseConstructorArguments.emplace(
-						dynamic_cast<ContractDefinition const*>(baseConstructor->scope()),
-						modifier->arguments()
-					).second, "");
-
-	IRGeneratorForStatements generator{m_context, m_utils, m_optimiserSettings};
-	for (auto&& [baseContract, arguments]: baseConstructorArguments)
-	{
-		solAssert(baseContract && arguments, "");
-		if (baseContract->constructor() && !arguments->empty())
-		{
-			std::vector<std::string> params;
-			for (size_t i = 0; i < arguments->size(); ++i)
-				params += generator.evaluateExpression(
-					*(arguments->at(i)),
-					*(baseContract->constructor()->parameters()[i]->type())
-				).stackSlots();
-			constructorParams[baseContract] = std::move(params);
-		}
-	}
-
-	return {generator.code(), constructorParams};
-}
-
-std::string IRGenerator::initStateVariables(ContractDefinition const& _contract)
-{
-	IRGeneratorForStatements generator{m_context, m_utils, m_optimiserSettings};
-	for (VariableDeclaration const* variable: _contract.stateVariables())
-		if (!variable->isConstant())
-			generator.initializeStateVar(*variable);
-
-	return generator.code();
-}
-
-
-void IRGenerator::generateConstructors(ContractDefinition const& _contract)
-{
-	auto listAllParams =
-		[&](std::map<ContractDefinition const*, std::vector<std::string>> const& baseParams) -> std::vector<std::string>
-		{
-			std::vector<std::string> params;
-			for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts)
-				if (baseParams.count(contract))
-					params += baseParams.at(contract);
-			return params;
-		};
-
-	std::map<ContractDefinition const*, std::vector<std::string>> baseConstructorParams;
-	for (size_t i = 0; i < _contract.annotation().linearizedBaseContracts.size(); ++i)
-	{
-		ContractDefinition const* contract = _contract.annotation().linearizedBaseContracts[i];
-		baseConstructorParams.erase(contract);
-
-		m_context.resetLocalVariables();
-		m_context.functionCollector().createFunction(IRNames::constructor(*contract), [&]() {
-			Whiskers t(R"(
-				<astIDComment><sourceLocationComment>
-				function <functionName>(<params><comma><baseParams>) {
-					<evalBaseArguments>
-					<sourceLocationComment>
-					<?hasNextConstructor> <nextConstructor>(<nextParams>) </hasNextConstructor>
-					<initStateVariables>
-					<userDefinedConstructorBody>
-				}
-				<contractSourceLocationComment>
-			)");
-			std::vector<std::string> params;
-			if (contract->constructor())
-				for (ASTPointer<VariableDeclaration> const& varDecl: contract->constructor()->parameters())
-					params += m_context.addLocalVariable(*varDecl).stackSlots();
-
-			if (m_context.debugInfoSelection().astID && contract->constructor())
-				t("astIDComment", "/// @ast-id " + std::to_string(contract->constructor()->id()) + "\n");
-			else
-				t("astIDComment", "");
-			t("sourceLocationComment", dispenseLocationComment(
-				contract->constructor() ?
-				dynamic_cast<ASTNode const&>(*contract->constructor()) :
-				dynamic_cast<ASTNode const&>(*contract)
-			));
-			t(
-				"contractSourceLocationComment",
-				dispenseLocationComment(m_context.mostDerivedContract())
-			);
-
-			t("params", joinHumanReadable(params));
-			std::vector<std::string> baseParams = listAllParams(baseConstructorParams);
-			t("baseParams", joinHumanReadable(baseParams));
-			t("comma", !params.empty() && !baseParams.empty() ? ", " : "");
-			t("functionName", IRNames::constructor(*contract));
-			std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::string>>> evaluatedArgs = evaluateConstructorArguments(*contract);
-			baseConstructorParams.insert(evaluatedArgs.second.begin(), evaluatedArgs.second.end());
-			t("evalBaseArguments", evaluatedArgs.first);
-			if (i < _contract.annotation().linearizedBaseContracts.size() - 1)
-			{
-				t("hasNextConstructor", true);
-				ContractDefinition const* nextContract = _contract.annotation().linearizedBaseContracts[i + 1];
-				t("nextConstructor", IRNames::constructor(*nextContract));
-				t("nextParams", joinHumanReadable(listAllParams(baseConstructorParams)));
-			}
-			else
-				t("hasNextConstructor", false);
-			t("initStateVariables", initStateVariables(*contract));
-			std::string body;
-			if (FunctionDefinition const* constructor = contract->constructor())
-			{
-				std::vector<ModifierInvocation*> realModifiers;
-				for (auto const& modifierInvocation: constructor->modifiers())
-					// Filter out the base constructor calls
-					if (dynamic_cast<ModifierDefinition const*>(modifierInvocation->name().annotation().referencedDeclaration))
-						realModifiers.emplace_back(modifierInvocation.get());
-				if (realModifiers.empty())
-					body = generate(constructor->body());
-				else
-				{
-					for (size_t i = 0; i < realModifiers.size(); ++i)
-					{
-						ModifierInvocation const& modifier = *realModifiers.at(i);
-						std::string next =
-							i + 1 < realModifiers.size() ?
-							IRNames::modifierInvocation(*realModifiers.at(i + 1)) :
-							IRNames::functionWithModifierInner(*constructor);
-						generateModifier(modifier, *constructor, next);
-					}
-					body =
-						IRNames::modifierInvocation(*realModifiers.at(0)) +
-						"(" +
-						joinHumanReadable(params) +
-						")";
-					// Now generate the actual inner function.
-					generateFunctionWithModifierInner(*constructor);
-				}
-			}
-			t("userDefinedConstructorBody", std::move(body));
-
-			return t.render();
-		});
-	}
-}
-
-std::string IRGenerator::deployCode(ContractDefinition const& _contract)
-{
-	Whiskers t(R"X(
-		let <codeOffset> := <allocateUnbounded>()
-		codecopy(<codeOffset>, dataoffset("<object>"), datasize("<object>"))
-		<#immutables>
-			setimmutable(<codeOffset>, "<immutableName>", <value>)
-		</immutables>
-		return(<codeOffset>, datasize("<object>"))
-	)X");
-	t("allocateUnbounded", m_utils.allocateUnboundedFunction());
-	t("codeOffset", m_context.newYulVariable());
-	t("object", IRNames::deployedObject(_contract));
-
-	std::vector<std::map<std::string, std::string>> immutables;
-	if (_contract.isLibrary())
-	{
-		solAssert(ContractType(_contract).immutableVariables().empty(), "");
-		immutables.emplace_back(std::map<std::string, std::string>{
-			{"immutableName"s, IRNames::libraryAddressImmutable()},
-			{"value"s, "address()"}
-		});
-
-	}
-	else
-		for (VariableDeclaration const* immutable: ContractType(_contract).immutableVariables())
-		{
-			solUnimplementedAssert(immutable->type()->isValueType());
-			solUnimplementedAssert(immutable->type()->sizeOnStack() == 1);
-			immutables.emplace_back(std::map<std::string, std::string>{
-				{"immutableName"s, std::to_string(immutable->id())},
-				{"value"s, "mload(" + std::to_string(m_context.immutableMemoryOffset(*immutable)) + ")"}
-			});
-		}
-	t("immutables", std::move(immutables));
-	return t.render();
-}
-
-std::string IRGenerator::callValueCheck()
-{
-	return "if callvalue() { " + m_utils.revertReasonIfDebugFunction("Ether sent to non-payable function") + "() }";
-}
-
-std::string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
-{
-	Whiskers t(R"X(
-		<?+cases>if iszero(lt(calldatasize(), 4))
-		{
-			let selector := <shr224>(calldataload(0))
-			switch selector
-			<#cases>
-			case <functionSelector>
-			{
-				// <functionName>
-				<delegatecallCheck>
-				<externalFunction>()
-			}
-			</cases>
-			default {}
-		}</+cases>
-		<?+receiveEther>if iszero(calldatasize()) { <receiveEther> }</+receiveEther>
-		<fallback>
-	)X");
-	t("shr224", m_utils.shiftRightFunction(224));
-	std::vector<std::map<std::string, std::string>> functions;
-	for (auto const& function: _contract.interfaceFunctions())
-	{
-		functions.emplace_back();
-		std::map<std::string, std::string>& templ = functions.back();
-		templ["functionSelector"] = "0x" + function.first.hex();
-		FunctionTypePointer const& type = function.second;
-		templ["functionName"] = type->externalSignature();
-		std::string delegatecallCheck;
-		if (_contract.isLibrary())
-		{
-			solAssert(!type->isPayable(), "");
-			if (type->stateMutability() > StateMutability::View)
-				// If the function is not a view function and is called without DELEGATECALL,
-				// we revert.
-				delegatecallCheck =
-					"if iszero(called_via_delegatecall) { " +
-					m_utils.revertReasonIfDebugFunction("Non-view function of library called without DELEGATECALL") +
-					"() }";
-		}
-		templ["delegatecallCheck"] = delegatecallCheck;
-
-		templ["externalFunction"] = generateExternalFunction(_contract, *type);
-	}
-	t("cases", functions);
-	FunctionDefinition const* etherReceiver = _contract.receiveFunction();
-	if (etherReceiver)
-	{
-		solAssert(!_contract.isLibrary(), "");
-		t("receiveEther", m_context.enqueueFunctionForCodeGeneration(*etherReceiver) + "() stop()");
-	}
-	else
-		t("receiveEther", "");
-	if (FunctionDefinition const* fallback = _contract.fallbackFunction())
-	{
-		solAssert(!_contract.isLibrary(), "");
-		std::string fallbackCode;
-		if (!fallback->isPayable())
-			fallbackCode += callValueCheck() + "\n";
-		if (fallback->parameters().empty())
-			fallbackCode += m_context.enqueueFunctionForCodeGeneration(*fallback) + "() stop()";
-		else
-		{
-			solAssert(fallback->parameters().size() == 1 && fallback->returnParameters().size() == 1, "");
-			fallbackCode += "let retval := " + m_context.enqueueFunctionForCodeGeneration(*fallback) + "(0, calldatasize())\n";
-			fallbackCode += "return(add(retval, 0x20), mload(retval))\n";
-
-		}
-
-		t("fallback", fallbackCode);
-	}
-	else
-		t("fallback", (
-			etherReceiver ?
-			m_utils.revertReasonIfDebugFunction("Unknown signature and no fallback defined") :
-			m_utils.revertReasonIfDebugFunction("Contract does not have fallback nor receive functions")
-		) + "()");
-	return t.render();
-}
-
-std::string IRGenerator::memoryInit(bool _useMemoryGuard)
-{
-	// This function should be called at the beginning of the EVM call frame
-	// and thus can assume all memory to be zero, including the contents of
-	// the "zero memory area" (the position CompilerUtils::zeroPointer points to).
-	return
-		Whiskers{
-			_useMemoryGuard ?
-			"mstore(<memPtr>, memoryguard(<freeMemoryStart>))" :
-			"mstore(<memPtr>, <freeMemoryStart>)"
-		}
-		("memPtr", std::to_string(CompilerUtils::freeMemoryPointer))
-		(
-			"freeMemoryStart",
-			std::to_string(CompilerUtils::generalPurposeMemoryStart + m_context.reservedMemory())
-		).render();
-}
-
-void IRGenerator::resetContext(ContractDefinition const& _contract, ExecutionContext _context)
-{
-	solAssert(
-		m_context.functionGenerationQueueEmpty(),
-		"Reset function generation queue while it still had functions."
-	);
-	solAssert(
-		m_context.functionCollector().requestedFunctions().empty(),
-		"Reset context while it still had functions."
-	);
-	solAssert(
-		m_context.internalDispatchClean(),
-		"Reset internal dispatch map without consuming it."
-	);
-	IRGenerationContext newContext(
-		m_evmVersion,
-		_context,
-		m_context.revertStrings(),
-		m_context.sourceIndices(),
-		m_context.debugInfoSelection(),
-		m_context.soliditySourceProvider()
-	);
-	m_context = std::move(newContext);
-
-	m_context.setMostDerivedContract(_contract);
-	for (auto const& var: ContractType(_contract).stateVariables())
-		m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
-}
-
-std::string IRGenerator::dispenseLocationComment(ASTNode const& _node)
-{
-	return ::dispenseLocationComment(_node, m_context);
-}
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
deleted file mode 100644
index 9026954d6100..000000000000
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * @date 2017
- * Component that translates Solidity code into Yul.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTForward.h>
-#include <libsolidity/ast/CallGraph.h>
-#include <libsolidity/codegen/ir/IRGenerationContext.h>
-#include <libsolidity/codegen/YulUtilFunctions.h>
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <json/json.h>
-
-#include <string>
-
-namespace solidity::frontend
-{
-
-class SourceUnit;
-
-class IRGenerator
-{
-public:
-	using ExecutionContext = IRGenerationContext::ExecutionContext;
-
-	IRGenerator(
-		langutil::EVMVersion _evmVersion,
-		std::optional<uint8_t> _eofVersion,
-		RevertStrings _revertStrings,
-		std::map<std::string, unsigned> _sourceIndices,
-		langutil::DebugInfoSelection const& _debugInfoSelection,
-		langutil::CharStreamProvider const* _soliditySourceProvider,
-		OptimiserSettings& _optimiserSettings
-	):
-		m_evmVersion(_evmVersion),
-		m_eofVersion(_eofVersion),
-		m_context(
-			_evmVersion,
-			ExecutionContext::Creation,
-			_revertStrings,
-			std::move(_sourceIndices),
-			_debugInfoSelection,
-			_soliditySourceProvider
-		),
-		m_utils(_evmVersion, m_context.revertStrings(), m_context.functionCollector()),
-		m_optimiserSettings(_optimiserSettings)
-	{}
-
-	/// Generates and returns (unoptimized) IR code.
-	std::string run(
-		ContractDefinition const& _contract,
-		bytes const& _cborMetadata,
-		std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
-	);
-
-private:
-	std::string generate(
-		ContractDefinition const& _contract,
-		bytes const& _cborMetadata,
-		std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
-	);
-	std::string generate(Block const& _block);
-
-	/// Generates code for all the functions from the function generation queue.
-	/// The resulting code is stored in the function collector in IRGenerationContext.
-	/// @returns A set of ast nodes of the generated functions.
-	std::set<FunctionDefinition const*> generateQueuedFunctions();
-	/// Generates  all the internal dispatch functions necessary to handle any function that could
-	/// possibly be called via a pointer.
-	/// @return The content of the dispatch for reuse in runtime code. Reuse is necessary because
-	/// pointers to functions can be passed from the creation code in storage variables.
-	InternalDispatchMap generateInternalDispatchFunctions(ContractDefinition const& _contract);
-	/// Generates code for and returns the name of the function.
-	std::string generateFunction(FunctionDefinition const& _function);
-	std::string generateModifier(
-		ModifierInvocation const& _modifierInvocation,
-		FunctionDefinition const& _function,
-		std::string const& _nextFunction
-	);
-	std::string generateFunctionWithModifierInner(FunctionDefinition const& _function);
-	/// Generates a getter for the given declaration and returns its name
-	std::string generateGetter(VariableDeclaration const& _varDecl);
-
-	/// Generates the external part (ABI decoding and encoding) of a function or getter.
-	std::string generateExternalFunction(ContractDefinition const& _contract, FunctionType const& _functionType);
-
-	/// Generates code that assigns the initial value of the respective type.
-	std::string generateInitialAssignment(VariableDeclaration const& _varDecl);
-
-	/// Generates constructors for all contracts in the inheritance hierarchy of
-	/// @a _contract
-	/// If there are user defined constructors, their body will be included in the implicit constructor's body.
-	void generateConstructors(ContractDefinition const& _contract);
-
-	/// Evaluates constructor's arguments for all base contracts (listed in inheritance specifiers) of
-	/// @a _contract
-	/// @returns Pair of expressions needed to evaluate params and list of parameters in a map contract -> params
-	std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::string>>>
-	evaluateConstructorArguments(ContractDefinition const& _contract);
-
-	/// Initializes state variables of
-	/// @a _contract
-	/// @returns Source code to initialize state variables
-	std::string initStateVariables(ContractDefinition const& _contract);
-
-	std::string deployCode(ContractDefinition const& _contract);
-	std::string callValueCheck();
-
-	std::string dispatchRoutine(ContractDefinition const& _contract);
-
-	/// @a _useMemoryGuard If true, use a memory guard, allowing the optimiser
-	/// to perform memory optimizations.
-	std::string memoryInit(bool _useMemoryGuard);
-
-	void resetContext(ContractDefinition const& _contract, ExecutionContext _context);
-
-	std::string dispenseLocationComment(ASTNode const& _node);
-
-	langutil::EVMVersion const m_evmVersion;
-	std::optional<uint8_t> const m_eofVersion;
-
-	IRGenerationContext m_context;
-	YulUtilFunctions m_utils;
-	OptimiserSettings m_optimiserSettings;
-};
-
-}
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
deleted file mode 100644
index a5196366fd30..000000000000
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ /dev/null
@@ -1,3410 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that translates Solidity code into Yul at statement level and below.
- */
-
-#include <libsolidity/codegen/ir/IRGeneratorForStatements.h>
-
-#include <libsolidity/codegen/ABIFunctions.h>
-#include <libsolidity/codegen/ir/IRGenerationContext.h>
-#include <libsolidity/codegen/ir/IRLValue.h>
-#include <libsolidity/codegen/ir/IRVariable.h>
-#include <libsolidity/codegen/YulUtilFunctions.h>
-#include <libsolidity/codegen/ABIFunctions.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-#include <libsolidity/codegen/ReturnInfo.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/ast/ASTUtils.h>
-
-#include <libevmasm/GasMeter.h>
-
-#include <libyul/AsmPrinter.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/optimiser/ASTCopier.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/view/transform.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace std::string_literals;
-
-namespace
-{
-
-struct CopyTranslate: public yul::ASTCopier
-{
-	using ExternalRefsMap = std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo>;
-
-	CopyTranslate(yul::Dialect const& _dialect, IRGenerationContext& _context, ExternalRefsMap const& _references):
-		m_dialect(_dialect), m_context(_context), m_references(_references) {}
-
-	using ASTCopier::operator();
-
-	yul::Expression operator()(yul::Identifier const& _identifier) override
-	{
-		// The operator() function is only called in lvalue context. In rvalue context,
-		// only translate(yul::Identifier) is called.
-		if (m_references.count(&_identifier))
-			return translateReference(_identifier);
-		else
-			return ASTCopier::operator()(_identifier);
-	}
-
-	yul::YulString translateIdentifier(yul::YulString _name) override
-	{
-		// Strictly, the dialect used by inline assembly (m_dialect) could be different
-		// from the Yul dialect we are compiling to. So we are assuming here that the builtin
-		// functions are identical. This should not be a problem for now since everything
-		// is EVM anyway.
-		if (m_dialect.builtin(_name))
-			return _name;
-		else
-			return yul::YulString{"usr$" + _name.str()};
-	}
-
-	yul::Identifier translate(yul::Identifier const& _identifier) override
-	{
-		if (!m_references.count(&_identifier))
-			return ASTCopier::translate(_identifier);
-
-		yul::Expression translated = translateReference(_identifier);
-		solAssert(std::holds_alternative<yul::Identifier>(translated));
-		return std::get<yul::Identifier>(std::move(translated));
-	}
-
-private:
-
-	/// Translates a reference to a local variable, potentially including
-	/// a suffix. Might return a literal, which causes this to be invalid in
-	/// lvalue-context.
-	yul::Expression translateReference(yul::Identifier const& _identifier)
-	{
-		auto const& reference = m_references.at(&_identifier);
-		auto const varDecl = dynamic_cast<VariableDeclaration const*>(reference.declaration);
-		solUnimplementedAssert(varDecl);
-		std::string const& suffix = reference.suffix;
-
-		std::string value;
-		if (suffix.empty() && varDecl->isLocalVariable())
-		{
-			auto const& var = m_context.localVariable(*varDecl);
-			solAssert(var.type().sizeOnStack() == 1);
-
-			value = var.commaSeparatedList();
-		}
-		else if (varDecl->isConstant())
-		{
-			VariableDeclaration const* variable = rootConstVariableDeclaration(*varDecl);
-			solAssert(variable);
-
-			if (variable->value()->annotation().type->category() == Type::Category::RationalNumber)
-			{
-				u256 intValue = dynamic_cast<RationalNumberType const&>(*variable->value()->annotation().type).literalValue(nullptr);
-				if (auto const* bytesType = dynamic_cast<FixedBytesType const*>(variable->type()))
-					intValue <<= 256 - 8 * bytesType->numBytes();
-				else
-					solAssert(variable->type()->category() == Type::Category::Integer);
-				value = intValue.str();
-			}
-			else if (auto const* literal = dynamic_cast<Literal const*>(variable->value().get()))
-			{
-				Type const* type = literal->annotation().type;
-
-				switch (type->category())
-				{
-				case Type::Category::Bool:
-				case Type::Category::Address:
-					solAssert(type->category() == variable->annotation().type->category());
-					value = toCompactHexWithPrefix(type->literalValue(literal));
-					break;
-				case Type::Category::StringLiteral:
-				{
-					auto const& stringLiteral = dynamic_cast<StringLiteralType const&>(*type);
-					solAssert(variable->type()->category() == Type::Category::FixedBytes);
-					unsigned const numBytes = dynamic_cast<FixedBytesType const&>(*variable->type()).numBytes();
-					solAssert(stringLiteral.value().size() <= numBytes);
-					value = formatNumber(u256(h256(stringLiteral.value(), h256::AlignLeft)));
-					break;
-				}
-				default:
-					solAssert(false);
-				}
-			}
-			else
-				solAssert(false, "Invalid constant in inline assembly.");
-		}
-		else if (varDecl->isStateVariable())
-		{
-			if (suffix == "slot")
-				value = m_context.storageLocationOfStateVariable(*varDecl).first.str();
-			else if (suffix == "offset")
-				value = std::to_string(m_context.storageLocationOfStateVariable(*varDecl).second);
-			else
-				solAssert(false);
-		}
-		else if (varDecl->type()->dataStoredIn(DataLocation::Storage))
-		{
-			solAssert(suffix == "slot" || suffix == "offset");
-			solAssert(varDecl->isLocalVariable());
-			solAssert(!varDecl->type()->isValueType());
-			if (suffix == "slot")
-				value = IRVariable{*varDecl}.part("slot").name();
-			else
-			{
-				solAssert(!IRVariable{*varDecl}.hasPart("offset"));
-				value = "0"s;
-			}
-		}
-		else if (varDecl->type()->dataStoredIn(DataLocation::CallData))
-		{
-			solAssert(suffix == "offset" || suffix == "length");
-			value = IRVariable{*varDecl}.part(suffix).name();
-		}
-		else if (
-			auto const* functionType = dynamic_cast<FunctionType const*>(varDecl->type());
-			functionType && functionType->kind() == FunctionType::Kind::External
-		)
-		{
-			solAssert(suffix == "selector" || suffix == "address");
-			solAssert(varDecl->type()->sizeOnStack() == 2);
-			if (suffix == "selector")
-				value = IRVariable{*varDecl}.part("functionSelector").name();
-			else
-				value = IRVariable{*varDecl}.part("address").name();
-		}
-		else
-			solAssert(false);
-
-		if (isDigit(value.front()))
-			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::YulString{value}, {}};
-		else
-			return yul::Identifier{_identifier.debugData, yul::YulString{value}};
-	}
-
-
-	yul::Dialect const& m_dialect;
-	IRGenerationContext& m_context;
-	ExternalRefsMap const& m_references;
-};
-
-}
-
-std::string IRGeneratorForStatementsBase::code() const
-{
-	return m_code.str();
-}
-
-std::ostringstream& IRGeneratorForStatementsBase::appendCode(bool _addLocationComment)
-{
-	if (
-		_addLocationComment &&
-		m_currentLocation.isValid() &&
-		m_lastLocation != m_currentLocation
-	)
-		m_code << dispenseLocationComment(m_currentLocation, m_context) << "\n";
-
-	m_lastLocation = m_currentLocation;
-
-	return m_code;
-}
-
-void IRGeneratorForStatementsBase::setLocation(ASTNode const& _node)
-{
-	m_currentLocation = _node.location();
-}
-
-std::string IRGeneratorForStatements::code() const
-{
-	solAssert(!m_currentLValue, "LValue not reset!");
-	return IRGeneratorForStatementsBase::code();
-}
-
-void IRGeneratorForStatements::generate(Block const& _block)
-{
-	try
-	{
-		_block.accept(*this);
-	}
-	catch (langutil::UnimplementedFeatureError const& _error)
-	{
-		if (!boost::get_error_info<langutil::errinfo_sourceLocation>(_error))
-			_error << langutil::errinfo_sourceLocation(m_currentLocation);
-		BOOST_THROW_EXCEPTION(_error);
-	}
-}
-
-void IRGeneratorForStatements::initializeStateVar(VariableDeclaration const& _varDecl)
-{
-	try
-	{
-		setLocation(_varDecl);
-
-		solAssert(_varDecl.immutable() || m_context.isStateVariable(_varDecl), "Must be immutable or a state variable.");
-		solAssert(!_varDecl.isConstant());
-		if (!_varDecl.value())
-			return;
-
-		_varDecl.value()->accept(*this);
-
-		writeToLValue(
-			_varDecl.immutable() ?
-			IRLValue{*_varDecl.annotation().type, IRLValue::Immutable{&_varDecl}} :
-			IRLValue{*_varDecl.annotation().type, IRLValue::Storage{
-				toCompactHexWithPrefix(m_context.storageLocationOfStateVariable(_varDecl).first),
-				m_context.storageLocationOfStateVariable(_varDecl).second
-			}},
-			*_varDecl.value()
-		);
-	}
-	catch (langutil::UnimplementedFeatureError const& _error)
-	{
-		if (!boost::get_error_info<langutil::errinfo_sourceLocation>(_error))
-			_error << langutil::errinfo_sourceLocation(m_currentLocation);
-		BOOST_THROW_EXCEPTION(_error);
-	}
-}
-
-void IRGeneratorForStatements::initializeLocalVar(VariableDeclaration const& _varDecl)
-{
-	try
-	{
-		setLocation(_varDecl);
-
-		solAssert(m_context.isLocalVariable(_varDecl), "Must be a local variable.");
-
-		auto const* type = _varDecl.type();
-		if (dynamic_cast<MappingType const*>(type))
-			return;
-		else if (auto const* refType = dynamic_cast<ReferenceType const*>(type))
-			if (refType->dataStoredIn(DataLocation::Storage) && refType->isPointer())
-				return;
-
-		IRVariable zero = zeroValue(*type);
-		assign(m_context.localVariable(_varDecl), zero);
-	}
-	catch (langutil::UnimplementedFeatureError const& _error)
-	{
-		if (!boost::get_error_info<langutil::errinfo_sourceLocation>(_error))
-			_error << langutil::errinfo_sourceLocation(m_currentLocation);
-		BOOST_THROW_EXCEPTION(_error);
-	}
-}
-
-IRVariable IRGeneratorForStatements::evaluateExpression(Expression const& _expression, Type const& _targetType)
-{
-	try
-	{
-		setLocation(_expression);
-
-		_expression.accept(*this);
-
-		setLocation(_expression);
-		IRVariable variable{m_context.newYulVariable(), _targetType};
-		define(variable, _expression);
-		return variable;
-	}
-	catch (langutil::UnimplementedFeatureError const& _error)
-	{
-		if (!boost::get_error_info<langutil::errinfo_sourceLocation>(_error))
-			_error << langutil::errinfo_sourceLocation(m_currentLocation);
-		BOOST_THROW_EXCEPTION(_error);
-	}
-}
-
-std::string IRGeneratorForStatements::constantValueFunction(VariableDeclaration const& _constant)
-{
-	try
-	{
-		std::string functionName = IRNames::constantValueFunction(_constant);
-		return m_context.functionCollector().createFunction(functionName, [&] {
-			Whiskers templ(R"(
-				<sourceLocationComment>
-				function <functionName>() -> <ret> {
-					<code>
-					<ret> := <value>
-				}
-			)");
-			templ("sourceLocationComment", dispenseLocationComment(_constant, m_context));
-			templ("functionName", functionName);
-			IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings);
-			solAssert(_constant.value());
-			Type const& constantType = *_constant.type();
-			templ("value", generator.evaluateExpression(*_constant.value(), constantType).commaSeparatedList());
-			templ("code", generator.code());
-			templ("ret", IRVariable("ret", constantType).commaSeparatedList());
-
-			return templ.render();
-		});
-	}
-	catch (langutil::UnimplementedFeatureError const& _error)
-	{
-		if (!boost::get_error_info<langutil::errinfo_sourceLocation>(_error))
-			_error << langutil::errinfo_sourceLocation(m_currentLocation);
-		BOOST_THROW_EXCEPTION(_error);
-	}
-}
-
-void IRGeneratorForStatements::endVisit(VariableDeclarationStatement const& _varDeclStatement)
-{
-	setLocation(_varDeclStatement);
-
-	if (Expression const* expression = _varDeclStatement.initialValue())
-	{
-		if (_varDeclStatement.declarations().size() > 1)
-		{
-			auto const* tupleType = dynamic_cast<TupleType const*>(expression->annotation().type);
-			solAssert(tupleType, "Expected expression of tuple type.");
-			solAssert(_varDeclStatement.declarations().size() == tupleType->components().size(), "Invalid number of tuple components.");
-			for (size_t i = 0; i < _varDeclStatement.declarations().size(); ++i)
-				if (auto const& decl = _varDeclStatement.declarations()[i])
-				{
-					solAssert(tupleType->components()[i]);
-					define(m_context.addLocalVariable(*decl), IRVariable(*expression).tupleComponent(i));
-				}
-		}
-		else
-		{
-			VariableDeclaration const& varDecl = *_varDeclStatement.declarations().front();
-			define(m_context.addLocalVariable(varDecl), *expression);
-		}
-	}
-	else
-		for (auto const& decl: _varDeclStatement.declarations())
-			if (decl)
-			{
-				declare(m_context.addLocalVariable(*decl));
-				initializeLocalVar(*decl);
-			}
-}
-
-bool IRGeneratorForStatements::visit(Conditional const& _conditional)
-{
-	_conditional.condition().accept(*this);
-
-	setLocation(_conditional);
-
-	std::string condition = expressionAsType(_conditional.condition(), *TypeProvider::boolean());
-	declare(_conditional);
-
-	appendCode() << "switch " << condition << "\n" "case 0 {\n";
-
-	_conditional.falseExpression().accept(*this);
-	setLocation(_conditional);
-
-	assign(_conditional, _conditional.falseExpression());
-	appendCode() << "}\n" "default {\n";
-
-	_conditional.trueExpression().accept(*this);
-	setLocation(_conditional);
-
-	assign(_conditional, _conditional.trueExpression());
-	appendCode() << "}\n";
-
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(Assignment const& _assignment)
-{
-	_assignment.rightHandSide().accept(*this);
-	setLocation(_assignment);
-
-	Token assignmentOperator = _assignment.assignmentOperator();
-	Token binaryOperator =
-		assignmentOperator == Token::Assign ?
-		assignmentOperator :
-		TokenTraits::AssignmentToBinaryOp(assignmentOperator);
-
-	if (TokenTraits::isShiftOp(binaryOperator))
-		solAssert(type(_assignment.rightHandSide()).mobileType());
-	IRVariable value =
-		type(_assignment.leftHandSide()).isValueType() ?
-		convert(
-			_assignment.rightHandSide(),
-			TokenTraits::isShiftOp(binaryOperator) ? *type(_assignment.rightHandSide()).mobileType() : type(_assignment)
-		) :
-		_assignment.rightHandSide();
-
-	_assignment.leftHandSide().accept(*this);
-
-	solAssert(!!m_currentLValue, "LValue not retrieved.");
-	setLocation(_assignment);
-
-	if (assignmentOperator != Token::Assign)
-	{
-		solAssert(type(_assignment.leftHandSide()).isValueType(), "Compound operators only available for value types.");
-		solAssert(binaryOperator != Token::Exp);
-		solAssert(type(_assignment) == type(_assignment.leftHandSide()));
-
-		IRVariable leftIntermediate = readFromLValue(*m_currentLValue);
-		solAssert(type(_assignment) == leftIntermediate.type());
-
-		define(_assignment) << (
-			TokenTraits::isShiftOp(binaryOperator) ?
-			shiftOperation(binaryOperator, leftIntermediate, value) :
-			binaryOperation(binaryOperator, type(_assignment), leftIntermediate.name(), value.name())
-		) << "\n";
-
-		writeToLValue(*m_currentLValue, IRVariable(_assignment));
-	}
-	else
-	{
-		writeToLValue(*m_currentLValue, value);
-
-		if (dynamic_cast<ReferenceType const*>(&m_currentLValue->type))
-			define(_assignment, readFromLValue(*m_currentLValue));
-		else if (*_assignment.annotation().type != *TypeProvider::emptyTuple())
-			define(_assignment, value);
-	}
-
-	m_currentLValue.reset();
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(TupleExpression const& _tuple)
-{
-	setLocation(_tuple);
-
-	if (_tuple.isInlineArray())
-	{
-		auto const& arrayType = dynamic_cast<ArrayType const&>(*_tuple.annotation().type);
-		solAssert(!arrayType.isDynamicallySized(), "Cannot create dynamically sized inline array.");
-		define(_tuple) <<
-			m_utils.allocateMemoryArrayFunction(arrayType) <<
-			"(" <<
-			_tuple.components().size() <<
-			")\n";
-
-		std::string mpos = IRVariable(_tuple).part("mpos").name();
-		Type const& baseType = *arrayType.baseType();
-		for (size_t i = 0; i < _tuple.components().size(); i++)
-		{
-			Expression const& component = *_tuple.components()[i];
-			component.accept(*this);
-			setLocation(_tuple);
-			IRVariable converted = convert(component, baseType);
-			appendCode() <<
-				m_utils.writeToMemoryFunction(baseType) <<
-				"(" <<
-				("add(" + mpos + ", " + std::to_string(i * arrayType.memoryStride()) + ")") <<
-				", " <<
-				converted.commaSeparatedList() <<
-				")\n";
-		}
-	}
-	else
-	{
-		bool willBeWrittenTo = _tuple.annotation().willBeWrittenTo;
-		if (willBeWrittenTo)
-			solAssert(!m_currentLValue);
-		if (_tuple.components().size() == 1)
-		{
-			solAssert(_tuple.components().front());
-			_tuple.components().front()->accept(*this);
-			setLocation(_tuple);
-			if (willBeWrittenTo)
-				solAssert(!!m_currentLValue);
-			else
-				define(_tuple, *_tuple.components().front());
-		}
-		else
-		{
-			std::vector<std::optional<IRLValue>> lvalues;
-			for (size_t i = 0; i < _tuple.components().size(); ++i)
-				if (auto const& component = _tuple.components()[i])
-				{
-					component->accept(*this);
-					setLocation(_tuple);
-					if (willBeWrittenTo)
-					{
-						solAssert(!!m_currentLValue);
-						lvalues.emplace_back(std::move(m_currentLValue));
-						m_currentLValue.reset();
-					}
-					else
-						define(IRVariable(_tuple).tupleComponent(i), *component);
-				}
-				else if (willBeWrittenTo)
-					lvalues.emplace_back();
-
-			if (_tuple.annotation().willBeWrittenTo)
-				m_currentLValue.emplace(IRLValue{
-					*_tuple.annotation().type,
-					IRLValue::Tuple{std::move(lvalues)}
-				});
-		}
-	}
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(Block const& _block)
-{
-	if (_block.unchecked())
-	{
-		solAssert(m_context.arithmetic() == Arithmetic::Checked);
-		m_context.setArithmetic(Arithmetic::Wrapping);
-	}
-	return true;
-}
-
-void IRGeneratorForStatements::endVisit(Block const& _block)
-{
-	if (_block.unchecked())
-	{
-		solAssert(m_context.arithmetic() == Arithmetic::Wrapping);
-		m_context.setArithmetic(Arithmetic::Checked);
-	}
-}
-
-bool IRGeneratorForStatements::visit(IfStatement const& _ifStatement)
-{
-	_ifStatement.condition().accept(*this);
-	setLocation(_ifStatement);
-	std::string condition = expressionAsType(_ifStatement.condition(), *TypeProvider::boolean());
-
-	if (_ifStatement.falseStatement())
-	{
-		appendCode() << "switch " << condition << "\n" "case 0 {\n";
-		_ifStatement.falseStatement()->accept(*this);
-		setLocation(_ifStatement);
-		appendCode() << "}\n" "default {\n";
-	}
-	else
-		appendCode() << "if " << condition << " {\n";
-	_ifStatement.trueStatement().accept(*this);
-	setLocation(_ifStatement);
-	appendCode() << "}\n";
-
-	return false;
-}
-
-void IRGeneratorForStatements::endVisit(PlaceholderStatement const& _placeholder)
-{
-	solAssert(m_placeholderCallback);
-	setLocation(_placeholder);
-	appendCode() << m_placeholderCallback();
-}
-
-bool IRGeneratorForStatements::visit(ForStatement const& _forStatement)
-{
-	setLocation(_forStatement);
-	generateLoop(
-		_forStatement.body(),
-		_forStatement.condition(),
-		_forStatement.initializationExpression(),
-		_forStatement.loopExpression(),
-		false, // _isDoWhile
-		*_forStatement.annotation().isSimpleCounterLoop
-	);
-
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(WhileStatement const& _whileStatement)
-{
-	setLocation(_whileStatement);
-	generateLoop(
-		_whileStatement.body(),
-		&_whileStatement.condition(),
-		nullptr,
-		nullptr,
-		_whileStatement.isDoWhile()
-	);
-
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(Continue const& _continue)
-{
-	setLocation(_continue);
-	appendCode() << "continue\n";
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(Break const& _break)
-{
-	setLocation(_break);
-	appendCode() << "break\n";
-	return false;
-}
-
-void IRGeneratorForStatements::endVisit(Return const& _return)
-{
-	setLocation(_return);
-	if (Expression const* value = _return.expression())
-	{
-		solAssert(_return.annotation().functionReturnParameters, "Invalid return parameters pointer.");
-		std::vector<ASTPointer<VariableDeclaration>> const& returnParameters =
-			_return.annotation().functionReturnParameters->parameters();
-		if (returnParameters.size() > 1)
-			for (size_t i = 0; i < returnParameters.size(); ++i)
-				assign(m_context.localVariable(*returnParameters[i]), IRVariable(*value).tupleComponent(i));
-		else if (returnParameters.size() == 1)
-			assign(m_context.localVariable(*returnParameters.front()), *value);
-	}
-	appendCode() << "leave\n";
-}
-
-bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
-{
-	setLocation(_unaryOperation);
-
-	FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction;
-	if (function)
-	{
-		_unaryOperation.subExpression().accept(*this);
-		setLocation(_unaryOperation);
-
-		solAssert(function->isImplemented());
-		solAssert(function->isFree());
-		solAssert(function->parameters().size() == 1);
-		solAssert(function->returnParameters().size() == 1);
-		solAssert(*function->returnParameters()[0]->type() == *_unaryOperation.annotation().type);
-
-		std::string argument = expressionAsType(_unaryOperation.subExpression(), *function->parameters()[0]->type());
-		solAssert(!argument.empty());
-
-		solAssert(_unaryOperation.userDefinedFunctionType()->kind() == FunctionType::Kind::Internal);
-		define(_unaryOperation) <<
-			m_context.enqueueFunctionForCodeGeneration(*function) <<
-			("(" + argument + ")\n");
-
-		return false;
-	}
-
-	Type const& resultType = type(_unaryOperation);
-	Token const op = _unaryOperation.getOperator();
-
-	if (resultType.category() == Type::Category::RationalNumber)
-	{
-		define(_unaryOperation) << formatNumber(resultType.literalValue(nullptr)) << "\n";
-		return false;
-	}
-
-	_unaryOperation.subExpression().accept(*this);
-	setLocation(_unaryOperation);
-
-	if (op == Token::Delete)
-	{
-		solAssert(!!m_currentLValue, "LValue not retrieved.");
-		std::visit(
-			util::GenericVisitor{
-				[&](IRLValue::Storage const& _storage) {
-					appendCode() <<
-						m_utils.storageSetToZeroFunction(m_currentLValue->type) <<
-						"(" <<
-						_storage.slot <<
-						", " <<
-						_storage.offsetString() <<
-						")\n";
-					m_currentLValue.reset();
-				},
-				[&](auto const&) {
-					IRVariable zeroValue(m_context.newYulVariable(), m_currentLValue->type);
-					define(zeroValue) << m_utils.zeroValueFunction(m_currentLValue->type) << "()\n";
-					writeToLValue(*m_currentLValue, zeroValue);
-					m_currentLValue.reset();
-				}
-			},
-			m_currentLValue->kind
-		);
-	}
-	else if (resultType.category() == Type::Category::Integer)
-	{
-		solAssert(resultType == type(_unaryOperation.subExpression()), "Result type doesn't match!");
-
-		if (op == Token::Inc || op == Token::Dec)
-		{
-			solAssert(!!m_currentLValue, "LValue not retrieved.");
-			IRVariable modifiedValue(m_context.newYulVariable(), resultType);
-			IRVariable originalValue = readFromLValue(*m_currentLValue);
-
-			bool checked = m_context.arithmetic() == Arithmetic::Checked;
-			define(modifiedValue) <<
-				(op == Token::Inc ?
-					(checked ? m_utils.incrementCheckedFunction(resultType) : m_utils.incrementWrappingFunction(resultType)) :
-					(checked ? m_utils.decrementCheckedFunction(resultType) : m_utils.decrementWrappingFunction(resultType))
-				) <<
-				"(" <<
-				originalValue.name() <<
-				")\n";
-			writeToLValue(*m_currentLValue, modifiedValue);
-			m_currentLValue.reset();
-
-			define(_unaryOperation, _unaryOperation.isPrefixOperation() ? modifiedValue : originalValue);
-		}
-		else if (op == Token::BitNot)
-			appendSimpleUnaryOperation(_unaryOperation, _unaryOperation.subExpression());
-		else if (op == Token::Add)
-			// According to SyntaxChecker...
-			solAssert(false, "Use of unary + is disallowed.");
-		else if (op == Token::Sub)
-		{
-			IntegerType const& intType = *dynamic_cast<IntegerType const*>(&resultType);
-			define(_unaryOperation) << (
-				m_context.arithmetic() == Arithmetic::Checked ?
-				m_utils.negateNumberCheckedFunction(intType) :
-				m_utils.negateNumberWrappingFunction(intType)
-			) << "(" << IRVariable(_unaryOperation.subExpression()).name() << ")\n";
-		}
-		else
-			solUnimplemented("Unary operator not yet implemented");
-	}
-	else if (resultType.category() == Type::Category::FixedBytes)
-	{
-		solAssert(op == Token::BitNot, "Only bitwise negation is allowed for FixedBytes");
-		solAssert(resultType == type(_unaryOperation.subExpression()), "Result type doesn't match!");
-		appendSimpleUnaryOperation(_unaryOperation, _unaryOperation.subExpression());
-	}
-	else if (resultType.category() == Type::Category::Bool)
-	{
-		solAssert(
-			op != Token::BitNot,
-			"Bitwise Negation can't be done on bool!"
-		);
-
-		appendSimpleUnaryOperation(_unaryOperation, _unaryOperation.subExpression());
-	}
-	else
-		solUnimplemented("Unary operator not yet implemented");
-
-	return false;
-}
-
-bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
-{
-	setLocation(_binOp);
-
-	FunctionDefinition const* function = *_binOp.annotation().userDefinedFunction;
-	if (function)
-	{
-		_binOp.leftExpression().accept(*this);
-		_binOp.rightExpression().accept(*this);
-		setLocation(_binOp);
-
-		solAssert(function->isImplemented());
-		solAssert(function->isFree());
-		solAssert(function->parameters().size() == 2);
-		solAssert(function->returnParameters().size() == 1);
-		solAssert(*function->returnParameters()[0]->type() == *_binOp.annotation().type);
-
-		std::string left = expressionAsType(_binOp.leftExpression(), *function->parameters()[0]->type());
-		std::string right = expressionAsType(_binOp.rightExpression(), *function->parameters()[1]->type());
-		solAssert(!left.empty() && !right.empty());
-
-		solAssert(_binOp.userDefinedFunctionType()->kind() == FunctionType::Kind::Internal);
-		define(_binOp) <<
-			m_context.enqueueFunctionForCodeGeneration(*function) <<
-			("(" + left + ", " + right + ")\n");
-
-		return false;
-	}
-
-	solAssert(!!_binOp.annotation().commonType);
-	Type const* commonType = _binOp.annotation().commonType;
-	langutil::Token op = _binOp.getOperator();
-
-	if (op == Token::And || op == Token::Or)
-	{
-		// This can short-circuit!
-		appendAndOrOperatorCode(_binOp);
-		return false;
-	}
-
-	if (commonType->category() == Type::Category::RationalNumber)
-	{
-		define(_binOp) << toCompactHexWithPrefix(commonType->literalValue(nullptr)) << "\n";
-		return false; // skip sub-expressions
-	}
-
-	_binOp.leftExpression().accept(*this);
-	_binOp.rightExpression().accept(*this);
-	setLocation(_binOp);
-
-	if (TokenTraits::isCompareOp(op))
-	{
-		solAssert(commonType->isValueType());
-
-		bool isSigned = false;
-		if (auto type = dynamic_cast<IntegerType const*>(commonType))
-			isSigned = type->isSigned();
-
-		std::string args = expressionAsCleanedType(_binOp.leftExpression(), *commonType);
-		args += ", " + expressionAsCleanedType(_binOp.rightExpression(), *commonType);
-
-		auto functionType = dynamic_cast<FunctionType const*>(commonType);
-		solAssert(functionType ? (op == Token::Equal || op == Token::NotEqual) : true, "Invalid function pointer comparison!");
-
-		std::string expr;
-
-		if (functionType && functionType->kind() ==  FunctionType::Kind::External)
-		{
-			solUnimplementedAssert(functionType->sizeOnStack() == 2, "");
-			expr = m_utils.externalFunctionPointersEqualFunction() +
-				"(" +
-				IRVariable{_binOp.leftExpression()}.part("address").name() + "," +
-				IRVariable{_binOp.leftExpression()}.part("functionSelector").name() + "," +
-				IRVariable{_binOp.rightExpression()}.part("address").name() + "," +
-				IRVariable{_binOp.rightExpression()}.part("functionSelector").name() +
-				")";
-			if (op == Token::NotEqual)
-				expr = "iszero(" + expr + ")";
-		}
-		else if (op == Token::Equal)
-			expr = "eq(" + std::move(args) + ")";
-		else if (op == Token::NotEqual)
-			expr = "iszero(eq(" + std::move(args) + "))";
-		else if (op == Token::GreaterThanOrEqual)
-			expr = "iszero(" + std::string(isSigned ? "slt(" : "lt(") + std::move(args) + "))";
-		else if (op == Token::LessThanOrEqual)
-			expr = "iszero(" + std::string(isSigned ? "sgt(" : "gt(") + std::move(args) + "))";
-		else if (op == Token::GreaterThan)
-			expr = (isSigned ? "sgt(" : "gt(") + std::move(args) + ")";
-		else if (op == Token::LessThan)
-			expr = (isSigned ? "slt(" : "lt(") + std::move(args) + ")";
-		else
-			solAssert(false, "Unknown comparison operator.");
-		define(_binOp) << expr << "\n";
-	}
-	else if (op == Token::Exp)
-	{
-		IRVariable left = convert(_binOp.leftExpression(), *commonType);
-		IRVariable right = convert(_binOp.rightExpression(), *type(_binOp.rightExpression()).mobileType());
-
-		if (m_context.arithmetic() == Arithmetic::Wrapping)
-			define(_binOp) << m_utils.wrappingIntExpFunction(
-				dynamic_cast<IntegerType const&>(left.type()),
-				dynamic_cast<IntegerType const&>(right.type())
-			) << "(" << left.name() << ", " << right.name() << ")\n";
-		else if (auto rationalNumberType = dynamic_cast<RationalNumberType const*>(_binOp.leftExpression().annotation().type))
-		{
-			solAssert(rationalNumberType->integerType(), "Invalid literal as the base for exponentiation.");
-			solAssert(dynamic_cast<IntegerType const*>(commonType));
-
-			define(_binOp) << m_utils.overflowCheckedIntLiteralExpFunction(
-				*rationalNumberType,
-				dynamic_cast<IntegerType const&>(right.type()),
-				dynamic_cast<IntegerType const&>(*commonType)
-			) << "(" << right.name() << ")\n";
-		}
-		else
-			define(_binOp) << m_utils.overflowCheckedIntExpFunction(
-				dynamic_cast<IntegerType const&>(left.type()),
-				dynamic_cast<IntegerType const&>(right.type())
-			) << "(" << left.name() << ", " << right.name() << ")\n";
-	}
-	else if (TokenTraits::isShiftOp(op))
-	{
-		IRVariable left = convert(_binOp.leftExpression(), *commonType);
-		IRVariable right = convert(_binOp.rightExpression(), *type(_binOp.rightExpression()).mobileType());
-		define(_binOp) << shiftOperation(_binOp.getOperator(), left, right) << "\n";
-	}
-	else
-	{
-		std::string left = expressionAsType(_binOp.leftExpression(), *commonType);
-		std::string right = expressionAsType(_binOp.rightExpression(), *commonType);
-		define(_binOp) << binaryOperation(_binOp.getOperator(), *commonType, left, right) << "\n";
-	}
-	return false;
-}
-
-void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
-{
-	setLocation(_functionCall);
-	auto functionCallKind = *_functionCall.annotation().kind;
-
-	if (functionCallKind == FunctionCallKind::TypeConversion)
-	{
-		solAssert(
-			_functionCall.expression().annotation().type->category() == Type::Category::TypeType,
-			"Expected category to be TypeType"
-		);
-		solAssert(_functionCall.arguments().size() == 1, "Expected one argument for type conversion");
-		define(_functionCall, *_functionCall.arguments().front());
-		return;
-	}
-
-	FunctionTypePointer functionType = nullptr;
-	if (functionCallKind == FunctionCallKind::StructConstructorCall)
-	{
-		auto const& type = dynamic_cast<TypeType const&>(*_functionCall.expression().annotation().type);
-		auto const& structType = dynamic_cast<StructType const&>(*type.actualType());
-		functionType = structType.constructorType();
-	}
-	else
-		functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type);
-
-	TypePointers parameterTypes = functionType->parameterTypes();
-
-	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.sortedArguments();
-
-	if (functionCallKind == FunctionCallKind::StructConstructorCall)
-	{
-		TypeType const& type = dynamic_cast<TypeType const&>(*_functionCall.expression().annotation().type);
-		auto const& structType = dynamic_cast<StructType const&>(*type.actualType());
-
-		define(_functionCall) << m_utils.allocateMemoryStructFunction(structType) << "()\n";
-
-		MemberList::MemberMap members = structType.nativeMembers(nullptr);
-
-		solAssert(members.size() == arguments.size(), "Struct parameter mismatch.");
-
-		for (size_t i = 0; i < arguments.size(); i++)
-		{
-			IRVariable converted = convert(*arguments[i], *parameterTypes[i]);
-			appendCode() <<
-				m_utils.writeToMemoryFunction(*functionType->parameterTypes()[i]) <<
-				"(add(" <<
-				IRVariable(_functionCall).part("mpos").name() <<
-				", " <<
-				structType.memoryOffsetOfMember(members[i].name) <<
-				"), " <<
-				converted.commaSeparatedList() <<
-				")\n";
-		}
-
-		return;
-	}
-
-	switch (functionType->kind())
-	{
-	case FunctionType::Kind::Declaration:
-		solAssert(false, "Attempted to generate code for calling a function definition.");
-		break;
-	case FunctionType::Kind::Internal:
-	{
-		FunctionDefinition const* functionDef = ASTNode::resolveFunctionCall(_functionCall, &m_context.mostDerivedContract());
-
-		solAssert(!functionType->takesArbitraryParameters());
-
-		std::vector<std::string> args;
-		if (functionType->hasBoundFirstArgument())
-			args += IRVariable(_functionCall.expression()).part("self").stackSlots();
-
-		for (size_t i = 0; i < arguments.size(); ++i)
-			args += convert(*arguments[i], *parameterTypes[i]).stackSlots();
-
-		if (functionDef)
-		{
-			solAssert(functionDef->isImplemented());
-
-			define(_functionCall) <<
-				m_context.enqueueFunctionForCodeGeneration(*functionDef) <<
-				"(" <<
-				joinHumanReadable(args) <<
-				")\n";
-		}
-		else
-		{
-			YulArity arity = YulArity::fromType(*functionType);
-			m_context.internalFunctionCalledThroughDispatch(arity);
-
-			define(_functionCall) <<
-				IRNames::internalDispatch(arity) <<
-				"(" <<
-				IRVariable(_functionCall.expression()).part("functionIdentifier").name() <<
-				joinHumanReadablePrefixed(args) <<
-				")\n";
-		}
-		break;
-	}
-	case FunctionType::Kind::External:
-	case FunctionType::Kind::DelegateCall:
-		appendExternalFunctionCall(_functionCall, arguments);
-		break;
-	case FunctionType::Kind::BareCall:
-	case FunctionType::Kind::BareDelegateCall:
-	case FunctionType::Kind::BareStaticCall:
-		appendBareCall(_functionCall, arguments);
-		break;
-	case FunctionType::Kind::BareCallCode:
-		solAssert(false, "Callcode has been removed.");
-	case FunctionType::Kind::Event:
-	{
-		auto const& event = dynamic_cast<EventDefinition const&>(functionType->declaration());
-		TypePointers paramTypes = functionType->parameterTypes();
-		ABIFunctions abi(m_context.evmVersion(), m_context.revertStrings(), m_context.functionCollector());
-
-		std::vector<IRVariable> indexedArgs;
-		std::vector<std::string> nonIndexedArgs;
-		TypePointers nonIndexedArgTypes;
-		TypePointers nonIndexedParamTypes;
-		if (!event.isAnonymous())
-			define(indexedArgs.emplace_back(m_context.newYulVariable(), *TypeProvider::uint256())) <<
-				formatNumber(u256(h256::Arith(keccak256(functionType->externalSignature())))) << "\n";
-		for (size_t i = 0; i < event.parameters().size(); ++i)
-		{
-			Expression const& arg = *arguments[i];
-			if (event.parameters()[i]->isIndexed())
-			{
-				std::string value;
-				if (auto const& referenceType = dynamic_cast<ReferenceType const*>(paramTypes[i]))
-					define(indexedArgs.emplace_back(m_context.newYulVariable(), *TypeProvider::uint256())) <<
-						m_utils.packedHashFunction({arg.annotation().type}, {referenceType}) <<
-						"(" <<
-						IRVariable(arg).commaSeparatedList() <<
-						")\n";
-				else if (auto functionType = dynamic_cast<FunctionType const*>(paramTypes[i]))
-				{
-					solAssert(
-						IRVariable(arg).type() == *functionType &&
-						functionType->kind() == FunctionType::Kind::External &&
-						!functionType->hasBoundFirstArgument(),
-						""
-					);
-					define(indexedArgs.emplace_back(m_context.newYulVariable(), *TypeProvider::fixedBytes(32))) <<
-						m_utils.combineExternalFunctionIdFunction() <<
-						"(" <<
-						IRVariable(arg).commaSeparatedList() <<
-						")\n";
-				}
-				else
-				{
-					solAssert(parameterTypes[i]->sizeOnStack() == 1, "");
-					indexedArgs.emplace_back(convertAndCleanup(arg, *parameterTypes[i]));
-				}
-			}
-			else
-			{
-				nonIndexedArgs += IRVariable(arg).stackSlots();
-				nonIndexedArgTypes.push_back(arg.annotation().type);
-				nonIndexedParamTypes.push_back(paramTypes[i]);
-			}
-		}
-		solAssert(indexedArgs.size() <= 4, "Too many indexed arguments.");
-		Whiskers templ(R"({
-			let <pos> := <allocateUnbounded>()
-			let <end> := <encode>(<pos> <nonIndexedArgs>)
-			<log>(<pos>, sub(<end>, <pos>) <indexedArgs>)
-		})");
-		templ("pos", m_context.newYulVariable());
-		templ("end", m_context.newYulVariable());
-		templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-		templ("encode", abi.tupleEncoder(nonIndexedArgTypes, nonIndexedParamTypes));
-		templ("nonIndexedArgs", joinHumanReadablePrefixed(nonIndexedArgs));
-		templ("log", "log" + std::to_string(indexedArgs.size()));
-		templ("indexedArgs", joinHumanReadablePrefixed(indexedArgs | ranges::views::transform([&](auto const& _arg) {
-			return _arg.commaSeparatedList();
-		})));
-		appendCode() << templ.render();
-		break;
-	}
-	case FunctionType::Kind::Error:
-	{
-		ErrorDefinition const* error = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(_functionCall.expression()));
-		solAssert(error);
-		revertWithError(
-			error->functionType(true)->externalSignature(),
-			error->functionType(true)->parameterTypes(),
-			_functionCall.sortedArguments()
-		);
-		break;
-	}
-	case FunctionType::Kind::Wrap:
-	case FunctionType::Kind::Unwrap:
-	{
-		solAssert(arguments.size() == 1);
-		FunctionType::Kind kind = functionType->kind();
-		if (kind == FunctionType::Kind::Wrap)
-			solAssert(
-				type(*arguments.at(0)).isImplicitlyConvertibleTo(
-					dynamic_cast<UserDefinedValueType const&>(type(_functionCall)).underlyingType()
-				),
-				""
-			);
-		else
-			solAssert(type(*arguments.at(0)).category() == Type::Category::UserDefinedValueType);
-
-		define(_functionCall, *arguments.at(0));
-		break;
-	}
-	case FunctionType::Kind::Assert:
-	case FunctionType::Kind::Require:
-	{
-		solAssert(arguments.size() > 0, "Expected at least one parameter for require/assert");
-		solAssert(arguments.size() <= 2, "Expected no more than two parameters for require/assert");
-
-		Type const* messageArgumentType =
-			arguments.size() > 1 && m_context.revertStrings() != RevertStrings::Strip ?
-			arguments[1]->annotation().type :
-			nullptr;
-		std::string requireOrAssertFunction = m_utils.requireOrAssertFunction(
-			functionType->kind() == FunctionType::Kind::Assert,
-			messageArgumentType
-		);
-
-		appendCode() << std::move(requireOrAssertFunction) << "(" << IRVariable(*arguments[0]).name();
-		if (messageArgumentType && messageArgumentType->sizeOnStack() > 0)
-			appendCode() << ", " << IRVariable(*arguments[1]).commaSeparatedList();
-		appendCode() << ")\n";
-
-		break;
-	}
-	case FunctionType::Kind::ABIEncode:
-	case FunctionType::Kind::ABIEncodePacked:
-	case FunctionType::Kind::ABIEncodeWithSelector:
-	case FunctionType::Kind::ABIEncodeCall:
-	case FunctionType::Kind::ABIEncodeWithSignature:
-	{
-		bool const isPacked = functionType->kind() == FunctionType::Kind::ABIEncodePacked;
-		solAssert(functionType->padArguments() != isPacked);
-		bool const hasSelectorOrSignature =
-			functionType->kind() == FunctionType::Kind::ABIEncodeWithSelector ||
-			functionType->kind() == FunctionType::Kind::ABIEncodeCall ||
-			functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature;
-
-		TypePointers argumentTypes;
-		TypePointers targetTypes;
-		std::vector<std::string> argumentVars;
-		std::string selector;
-		std::vector<ASTPointer<Expression const>> argumentsOfEncodeFunction;
-
-		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
-		{
-			solAssert(arguments.size() == 2);
-			// Account for tuples with one component which become that component
-			if (type(*arguments[1]).category() == Type::Category::Tuple)
-			{
-				auto const& tupleExpression = dynamic_cast<TupleExpression const&>(*arguments[1]);
-				for (auto component: tupleExpression.components())
-					argumentsOfEncodeFunction.push_back(component);
-			}
-			else
-				argumentsOfEncodeFunction.push_back(arguments[1]);
-		}
-		else
-			for (size_t i = 0; i < arguments.size(); ++i)
-			{
-				// ignore selector
-				if (hasSelectorOrSignature && i == 0)
-					continue;
-				argumentsOfEncodeFunction.push_back(arguments[i]);
-			}
-
-		for (auto const& argument: argumentsOfEncodeFunction)
-		{
-			argumentTypes.emplace_back(&type(*argument));
-			argumentVars += IRVariable(*argument).stackSlots();
-		}
-
-		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
-		{
-			auto encodedFunctionType = dynamic_cast<FunctionType const*>(arguments.front()->annotation().type);
-			solAssert(encodedFunctionType);
-			encodedFunctionType = encodedFunctionType->asExternallyCallableFunction(false);
-			solAssert(encodedFunctionType);
-			targetTypes = encodedFunctionType->parameterTypes();
-		}
-		else
-			for (auto const& argument: argumentsOfEncodeFunction)
-				targetTypes.emplace_back(type(*argument).fullEncodingType(false, true, isPacked));
-
-
-		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
-		{
-			auto const& selectorType = dynamic_cast<FunctionType const&>(type(*arguments.front()));
-			if (selectorType.kind() == FunctionType::Kind::Declaration)
-			{
-				solAssert(selectorType.hasDeclaration());
-				selector = formatNumber(selectorType.externalIdentifier() << (256 - 32));
-			}
-			else
-			{
-				selector = convert(
-					IRVariable(*arguments[0]).part("functionSelector"),
-					*TypeProvider::fixedBytes(4)
-				).name();
-			}
-		}
-		else if (functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature)
-		{
-			// hash the signature
-			Type const& selectorType = type(*arguments.front());
-			if (auto const* stringType = dynamic_cast<StringLiteralType const*>(&selectorType))
-				selector = formatNumber(util::selectorFromSignatureU256(stringType->value()));
-			else
-			{
-				// Used to reset the free memory pointer later.
-				// TODO This is an abuse of the `allocateUnbounded` function.
-				// We might want to introduce a new set of memory handling functions here
-				// a la "setMemoryCheckPoint" and "freeUntilCheckPoint".
-				std::string freeMemoryPre = m_context.newYulVariable();
-				appendCode() << "let " << freeMemoryPre << " := " << m_utils.allocateUnboundedFunction() << "()\n";
-				IRVariable array = convert(*arguments[0], *TypeProvider::bytesMemory());
-				IRVariable hashVariable(m_context.newYulVariable(), *TypeProvider::fixedBytes(32));
-
-				std::string dataAreaFunction = m_utils.arrayDataAreaFunction(*TypeProvider::bytesMemory());
-				std::string arrayLengthFunction = m_utils.arrayLengthFunction(*TypeProvider::bytesMemory());
-				define(hashVariable) <<
-					"keccak256(" <<
-					(dataAreaFunction + "(" + array.commaSeparatedList() + ")") <<
-					", " <<
-					(arrayLengthFunction + "(" + array.commaSeparatedList() +")") <<
-					")\n";
-				IRVariable selectorVariable(m_context.newYulVariable(), *TypeProvider::fixedBytes(4));
-				define(selectorVariable, hashVariable);
-				selector = selectorVariable.name();
-				appendCode() << m_utils.finalizeAllocationFunction() << "(" << freeMemoryPre << ", 0)\n";
-			}
-		}
-		else if (functionType->kind() == FunctionType::Kind::ABIEncodeWithSelector)
-			selector = convert(*arguments.front(), *TypeProvider::fixedBytes(4)).name();
-
-		Whiskers templ(R"(
-			let <data> := <allocateUnbounded>()
-			let <memPtr> := add(<data>, 0x20)
-			<?+selector>
-				mstore(<memPtr>, <selector>)
-				<memPtr> := add(<memPtr>, 4)
-			</+selector>
-			let <mend> := <encode>(<memPtr><arguments>)
-			mstore(<data>, sub(<mend>, add(<data>, 0x20)))
-			<finalizeAllocation>(<data>, sub(<mend>, <data>))
-		)");
-		templ("data", IRVariable(_functionCall).part("mpos").name());
-		templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-		templ("memPtr", m_context.newYulVariable());
-		templ("mend", m_context.newYulVariable());
-		templ("selector", selector);
-		templ("encode",
-			isPacked ?
-			m_context.abiFunctions().tupleEncoderPacked(argumentTypes, targetTypes) :
-			m_context.abiFunctions().tupleEncoder(argumentTypes, targetTypes, false)
-		);
-		templ("arguments", joinHumanReadablePrefixed(argumentVars));
-		templ("finalizeAllocation", m_utils.finalizeAllocationFunction());
-
-		appendCode() << templ.render();
-		break;
-	}
-	case FunctionType::Kind::ABIDecode:
-	{
-		Whiskers templ(R"(
-			<?+retVars>let <retVars> := </+retVars> <abiDecode>(<offset>, add(<offset>, <length>))
-		)");
-
-		Type const* firstArgType = arguments.front()->annotation().type;
-		TypePointers targetTypes;
-
-		if (TupleType const* targetTupleType = dynamic_cast<TupleType const*>(_functionCall.annotation().type))
-			targetTypes = targetTupleType->components();
-		else
-			targetTypes = TypePointers{_functionCall.annotation().type};
-
-		if (
-			auto referenceType = dynamic_cast<ReferenceType const*>(firstArgType);
-			referenceType && referenceType->dataStoredIn(DataLocation::CallData)
-			)
-		{
-			solAssert(referenceType->isImplicitlyConvertibleTo(*TypeProvider::bytesCalldata()));
-			IRVariable var = convert(*arguments[0], *TypeProvider::bytesCalldata());
-			templ("abiDecode", m_context.abiFunctions().tupleDecoder(targetTypes, false));
-			templ("offset", var.part("offset").name());
-			templ("length", var.part("length").name());
-		}
-		else
-		{
-			IRVariable var = convert(*arguments[0], *TypeProvider::bytesMemory());
-			templ("abiDecode", m_context.abiFunctions().tupleDecoder(targetTypes, true));
-			templ("offset", "add(" + var.part("mpos").name() + ", 32)");
-			templ("length",
-				m_utils.arrayLengthFunction(*TypeProvider::bytesMemory()) + "(" + var.part("mpos").name() + ")"
-			);
-		}
-		templ("retVars", IRVariable(_functionCall).commaSeparatedList());
-
-		appendCode() << templ.render();
-		break;
-	}
-	case FunctionType::Kind::Revert:
-	{
-		solAssert(arguments.size() == parameterTypes.size());
-		solAssert(arguments.size() <= 1);
-		solAssert(
-			arguments.empty() ||
-			arguments.front()->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::stringMemory()),
-		"");
-		if (m_context.revertStrings() == RevertStrings::Strip || arguments.empty())
-			appendCode() << "revert(0, 0)\n";
-		else
-			revertWithError(
-				"Error(string)",
-				{TypeProvider::stringMemory()},
-				{arguments.front()}
-			);
-		break;
-	}
-	// Array creation using new
-	case FunctionType::Kind::ObjectCreation:
-	{
-		ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*_functionCall.annotation().type);
-		solAssert(arguments.size() == 1);
-
-		IRVariable value = convert(*arguments[0], *TypeProvider::uint256());
-		define(_functionCall) <<
-			m_utils.allocateAndInitializeMemoryArrayFunction(arrayType) <<
-			"(" <<
-			value.commaSeparatedList() <<
-			")\n";
-		break;
-	}
-	case FunctionType::Kind::KECCAK256:
-	{
-		solAssert(arguments.size() == 1);
-
-		ArrayType const* arrayType = TypeProvider::bytesMemory();
-
-		if (auto const* stringLiteral = dynamic_cast<StringLiteralType const*>(arguments.front()->annotation().type))
-		{
-			// Optimization: Compute keccak256 on string literals at compile-time.
-			define(_functionCall) <<
-				("0x" + keccak256(stringLiteral->value()).hex()) <<
-				"\n";
-		}
-		else
-		{
-			auto array = convert(*arguments[0], *arrayType);
-
-			std::string dataAreaFunction = m_utils.arrayDataAreaFunction(*arrayType);
-			std::string arrayLengthFunction = m_utils.arrayLengthFunction(*arrayType);
-			define(_functionCall) <<
-				"keccak256(" <<
-				(dataAreaFunction + "(" + array.commaSeparatedList() + ")") <<
-				", " <<
-				(arrayLengthFunction + "(" + array.commaSeparatedList() +")") <<
-				")\n";
-		}
-		break;
-	}
-	case FunctionType::Kind::ArrayPop:
-	{
-		solAssert(functionType->hasBoundFirstArgument());
-		solAssert(functionType->parameterTypes().empty());
-		ArrayType const* arrayType = dynamic_cast<ArrayType const*>(functionType->selfType());
-		solAssert(arrayType);
-		define(_functionCall) <<
-			m_utils.storageArrayPopFunction(*arrayType) <<
-			"(" <<
-			IRVariable(_functionCall.expression()).commaSeparatedList() <<
-			")\n";
-		break;
-	}
-	case FunctionType::Kind::ArrayPush:
-	{
-		ArrayType const* arrayType = dynamic_cast<ArrayType const*>(functionType->selfType());
-		solAssert(arrayType);
-
-		if (arguments.empty())
-		{
-			auto slotName = m_context.newYulVariable();
-			auto offsetName = m_context.newYulVariable();
-			appendCode() << "let " << slotName << ", " << offsetName << " := " <<
-				m_utils.storageArrayPushZeroFunction(*arrayType) <<
-				"(" << IRVariable(_functionCall.expression()).commaSeparatedList() << ")\n";
-			setLValue(_functionCall, IRLValue{
-				*arrayType->baseType(),
-				IRLValue::Storage{
-					slotName,
-					offsetName,
-				}
-			});
-		}
-		else
-		{
-			IRVariable argument =
-				arrayType->baseType()->isValueType() ?
-				convert(*arguments.front(), *arrayType->baseType()) :
-				*arguments.front();
-
-			appendCode() <<
-				m_utils.storageArrayPushFunction(*arrayType, &argument.type()) <<
-				"(" <<
-				IRVariable(_functionCall.expression()).commaSeparatedList() <<
-				(argument.stackSlots().empty() ? "" : (", " + argument.commaSeparatedList()))  <<
-				")\n";
-		}
-		break;
-	}
-	case FunctionType::Kind::StringConcat:
-	case FunctionType::Kind::BytesConcat:
-	{
-		TypePointers argumentTypes;
-		std::vector<std::string> argumentVars;
-		for (ASTPointer<Expression const> const& argument: arguments)
-		{
-			argumentTypes.emplace_back(&type(*argument));
-			argumentVars += IRVariable(*argument).stackSlots();
-		}
-		define(IRVariable(_functionCall)) <<
-			m_utils.bytesOrStringConcatFunction(argumentTypes, functionType->kind()) <<
-			"(" <<
-			joinHumanReadable(argumentVars) <<
-			")\n";
-		break;
-	}
-	case FunctionType::Kind::MetaType:
-	{
-		break;
-	}
-	case FunctionType::Kind::AddMod:
-	case FunctionType::Kind::MulMod:
-	{
-		static std::map<FunctionType::Kind, std::string> functions = {
-			{FunctionType::Kind::AddMod, "addmod"},
-			{FunctionType::Kind::MulMod, "mulmod"},
-		};
-		solAssert(functions.find(functionType->kind()) != functions.end());
-		solAssert(arguments.size() == 3 && parameterTypes.size() == 3);
-
-		IRVariable modulus(m_context.newYulVariable(), *(parameterTypes[2]));
-		define(modulus, *arguments[2]);
-		Whiskers templ("if iszero(<modulus>) { <panic>() }\n");
-		templ("modulus", modulus.name());
-		templ("panic", m_utils.panicFunction(PanicCode::DivisionByZero));
-		appendCode() << templ.render();
-
-		std::string args;
-		for (size_t i = 0; i < 2; ++i)
-			args += expressionAsType(*arguments[i], *(parameterTypes[i])) + ", ";
-		args += modulus.name();
-		define(_functionCall) << functions[functionType->kind()] << "(" << args << ")\n";
-		break;
-	}
-	case FunctionType::Kind::GasLeft:
-	case FunctionType::Kind::Selfdestruct:
-	case FunctionType::Kind::BlockHash:
-	{
-		static std::map<FunctionType::Kind, std::string> functions = {
-			{FunctionType::Kind::GasLeft, "gas"},
-			{FunctionType::Kind::Selfdestruct, "selfdestruct"},
-			{FunctionType::Kind::BlockHash, "blockhash"},
-		};
-		solAssert(functions.find(functionType->kind()) != functions.end());
-
-		std::string args;
-		for (size_t i = 0; i < arguments.size(); ++i)
-			args += (args.empty() ? "" : ", ") + expressionAsType(*arguments[i], *(parameterTypes[i]));
-		define(_functionCall) << functions[functionType->kind()] << "(" << args << ")\n";
-		break;
-	}
-	case FunctionType::Kind::Creation:
-	{
-		solAssert(!functionType->gasSet(), "Gas limit set for contract creation.");
-		solAssert(
-			functionType->returnParameterTypes().size() == 1,
-			"Constructor should return only one type"
-		);
-
-		TypePointers argumentTypes;
-		std::vector<std::string> constructorParams;
-		for (ASTPointer<Expression const> const& arg: arguments)
-		{
-			argumentTypes.push_back(arg->annotation().type);
-			constructorParams += IRVariable{*arg}.stackSlots();
-		}
-
-		ContractDefinition const* contract =
-			&dynamic_cast<ContractType const&>(*functionType->returnParameterTypes().front()).contractDefinition();
-		m_context.subObjectsCreated().insert(contract);
-
-		Whiskers t(R"(let <memPos> := <allocateUnbounded>()
-			let <memEnd> := add(<memPos>, datasize("<object>"))
-			if or(gt(<memEnd>, 0xffffffffffffffff), lt(<memEnd>, <memPos>)) { <panic>() }
-			datacopy(<memPos>, dataoffset("<object>"), datasize("<object>"))
-			<memEnd> := <abiEncode>(<memEnd><constructorParams>)
-			<?saltSet>
-				let <address> := create2(<value>, <memPos>, sub(<memEnd>, <memPos>), <salt>)
-			<!saltSet>
-				let <address> := create(<value>, <memPos>, sub(<memEnd>, <memPos>))
-			</saltSet>
-			<?isTryCall>
-				let <success> := iszero(iszero(<address>))
-			<!isTryCall>
-				if iszero(<address>) { <forwardingRevert>() }
-			</isTryCall>
-		)");
-		t("memPos", m_context.newYulVariable());
-		t("memEnd", m_context.newYulVariable());
-		t("allocateUnbounded", m_utils.allocateUnboundedFunction());
-		t("object", IRNames::creationObject(*contract));
-		t("panic", m_utils.panicFunction(PanicCode::ResourceError));
-		t("abiEncode",
-			m_context.abiFunctions().tupleEncoder(argumentTypes, functionType->parameterTypes(), false)
-		);
-		t("constructorParams", joinHumanReadablePrefixed(constructorParams));
-		t("value", functionType->valueSet() ? IRVariable(_functionCall.expression()).part("value").name() : "0");
-		t("saltSet", functionType->saltSet());
-		if (functionType->saltSet())
-			t("salt", IRVariable(_functionCall.expression()).part("salt").name());
-		solAssert(IRVariable(_functionCall).stackSlots().size() == 1);
-		t("address", IRVariable(_functionCall).commaSeparatedList());
-		t("isTryCall", _functionCall.annotation().tryCall);
-		if (_functionCall.annotation().tryCall)
-			t("success", IRNames::trySuccessConditionVariable(_functionCall));
-		else
-			t("forwardingRevert", m_utils.forwardingRevertFunction());
-		appendCode() << t.render();
-
-		break;
-	}
-	case FunctionType::Kind::Send:
-	case FunctionType::Kind::Transfer:
-	{
-		solAssert(arguments.size() == 1 && parameterTypes.size() == 1);
-		std::string address{IRVariable(_functionCall.expression()).part("address").name()};
-		std::string value{expressionAsType(*arguments[0], *(parameterTypes[0]))};
-		Whiskers templ(R"(
-			let <gas> := 0
-			if iszero(<value>) { <gas> := <callStipend> }
-			let <success> := call(<gas>, <address>, <value>, 0, 0, 0, 0)
-			<?isTransfer>
-				if iszero(<success>) { <forwardingRevert>() }
-			</isTransfer>
-		)");
-		templ("gas", m_context.newYulVariable());
-		templ("callStipend", toString(evmasm::GasCosts::callStipend));
-		templ("address", address);
-		templ("value", value);
-		if (functionType->kind() == FunctionType::Kind::Transfer)
-			templ("success", m_context.newYulVariable());
-		else
-			templ("success", IRVariable(_functionCall).commaSeparatedList());
-		templ("isTransfer", functionType->kind() == FunctionType::Kind::Transfer);
-		templ("forwardingRevert", m_utils.forwardingRevertFunction());
-		appendCode() << templ.render();
-
-		break;
-	}
-	case FunctionType::Kind::ECRecover:
-	case FunctionType::Kind::RIPEMD160:
-	case FunctionType::Kind::SHA256:
-	{
-		solAssert(!_functionCall.annotation().tryCall);
-		solAssert(!functionType->valueSet());
-		solAssert(!functionType->gasSet());
-		solAssert(!functionType->hasBoundFirstArgument());
-
-		static std::map<FunctionType::Kind, std::tuple<unsigned, size_t>> precompiles = {
-			{FunctionType::Kind::ECRecover, std::make_tuple(1, 0)},
-			{FunctionType::Kind::SHA256, std::make_tuple(2, 0)},
-			{FunctionType::Kind::RIPEMD160, std::make_tuple(3, 12)},
-		};
-		auto [ address, offset ] = precompiles[functionType->kind()];
-		TypePointers argumentTypes;
-		std::vector<std::string> argumentStrings;
-		for (auto const& arg: arguments)
-		{
-			argumentTypes.emplace_back(&type(*arg));
-			argumentStrings += IRVariable(*arg).stackSlots();
-		}
-		Whiskers templ(R"(
-			let <pos> := <allocateUnbounded>()
-			let <end> := <encodeArgs>(<pos> <argumentString>)
-			<?isECRecover>
-				mstore(0, 0)
-			</isECRecover>
-			let <success> := <call>(<gas>, <address> <?isCall>, 0</isCall>, <pos>, sub(<end>, <pos>), 0, 32)
-			if iszero(<success>) { <forwardingRevert>() }
-			let <retVars> := <shl>(mload(0))
-		)");
-		templ("call", m_context.evmVersion().hasStaticCall() ? "staticcall" : "call");
-		templ("isCall", !m_context.evmVersion().hasStaticCall());
-		templ("shl", m_utils.shiftLeftFunction(offset * 8));
-		templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-		templ("pos", m_context.newYulVariable());
-		templ("end", m_context.newYulVariable());
-		templ("isECRecover", FunctionType::Kind::ECRecover == functionType->kind());
-		if (FunctionType::Kind::ECRecover == functionType->kind())
-			templ("encodeArgs", m_context.abiFunctions().tupleEncoder(argumentTypes, parameterTypes));
-		else
-			templ("encodeArgs", m_context.abiFunctions().tupleEncoderPacked(argumentTypes, parameterTypes));
-		templ("argumentString", joinHumanReadablePrefixed(argumentStrings));
-		templ("address", toString(address));
-		templ("success", m_context.newYulVariable());
-		templ("retVars", IRVariable(_functionCall).commaSeparatedList());
-		templ("forwardingRevert", m_utils.forwardingRevertFunction());
-		if (m_context.evmVersion().canOverchargeGasForCall())
-			// Send all gas (requires tangerine whistle EVM)
-			templ("gas", "gas()");
-		else
-		{
-			// @todo The value 10 is not exact and this could be fine-tuned,
-			// but this has worked for years in the old code generator.
-			u256 gasNeededByCaller = evmasm::GasCosts::callGas(m_context.evmVersion()) + 10 + evmasm::GasCosts::callNewAccountGas;
-			templ("gas", "sub(gas(), " + formatNumber(gasNeededByCaller) + ")");
-		}
-
-		appendCode() << templ.render();
-
-		break;
-	}
-	default:
-		solUnimplemented("FunctionKind " + toString(static_cast<int>(functionType->kind())) + " not yet implemented");
-	}
-}
-
-void IRGeneratorForStatements::endVisit(FunctionCallOptions const& _options)
-{
-	setLocation(_options);
-	FunctionType const& previousType = dynamic_cast<FunctionType const&>(*_options.expression().annotation().type);
-
-	solUnimplementedAssert(!previousType.hasBoundFirstArgument());
-
-	// Copy over existing values.
-	for (auto const& item: previousType.stackItems())
-		define(IRVariable(_options).part(std::get<0>(item)), IRVariable(_options.expression()).part(std::get<0>(item)));
-
-	for (size_t i = 0; i < _options.names().size(); ++i)
-	{
-		std::string const& name = *_options.names()[i];
-		solAssert(name == "salt" || name == "gas" || name == "value");
-
-		define(IRVariable(_options).part(name), *_options.options()[i]);
-	}
-}
-
-bool IRGeneratorForStatements::visit(MemberAccess const& _memberAccess)
-{
-	// A shortcut for <address>.code.length. We skip visiting <address>.code and directly visit
-	// <address>. The actual code is generated in endVisit.
-	if (
-		auto innerExpression = dynamic_cast<MemberAccess const*>(&_memberAccess.expression());
-		_memberAccess.memberName() == "length" &&
-		innerExpression &&
-		innerExpression->memberName() == "code" &&
-		innerExpression->expression().annotation().type->category() == Type::Category::Address
-	)
-	{
-		solAssert(innerExpression->annotation().type->category() == Type::Category::Array);
-		// Skip visiting <address>.code
-		innerExpression->expression().accept(*this);
-
-		return false;
-	}
-
-	return true;
-}
-
-void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
-{
-	setLocation(_memberAccess);
-
-	ASTString const& member = _memberAccess.memberName();
-	auto memberFunctionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
-	Type::Category objectCategory = _memberAccess.expression().annotation().type->category();
-
-	if (memberFunctionType && memberFunctionType->hasBoundFirstArgument())
-	{
-		define(IRVariable(_memberAccess).part("self"), _memberAccess.expression());
-		solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static);
-		if (memberFunctionType->kind() == FunctionType::Kind::Internal)
-			assignInternalFunctionIDIfNotCalledDirectly(
-				_memberAccess,
-				dynamic_cast<FunctionDefinition const&>(memberFunctionType->declaration())
-			);
-		else if (
-			memberFunctionType->kind() == FunctionType::Kind::ArrayPush ||
-			memberFunctionType->kind() == FunctionType::Kind::ArrayPop
-		)
-		{
-			// Nothing to do.
-		}
-		else
-		{
-			auto const& functionDefinition = dynamic_cast<FunctionDefinition const&>(memberFunctionType->declaration());
-			solAssert(memberFunctionType->kind() == FunctionType::Kind::DelegateCall);
-			auto contract = dynamic_cast<ContractDefinition const*>(functionDefinition.scope());
-			solAssert(contract && contract->isLibrary());
-			define(IRVariable(_memberAccess).part("address")) << linkerSymbol(*contract) << "\n";
-			define(IRVariable(_memberAccess).part("functionSelector")) << memberFunctionType->externalIdentifier() << "\n";
-		}
-		return;
-	}
-
-	switch (objectCategory)
-	{
-	case Type::Category::Contract:
-	{
-		ContractType const& type = dynamic_cast<ContractType const&>(*_memberAccess.expression().annotation().type);
-		if (type.isSuper())
-			solAssert(false);
-
-		// ordinary contract type
-		else if (Declaration const* declaration = _memberAccess.annotation().referencedDeclaration)
-		{
-			u256 identifier;
-			if (auto const* variable = dynamic_cast<VariableDeclaration const*>(declaration))
-				identifier = FunctionType(*variable).externalIdentifier();
-			else if (auto const* function = dynamic_cast<FunctionDefinition const*>(declaration))
-				identifier = FunctionType(*function).externalIdentifier();
-			else
-				solAssert(false, "Contract member is neither variable nor function.");
-
-			define(IRVariable(_memberAccess).part("address"), _memberAccess.expression());
-			define(IRVariable(_memberAccess).part("functionSelector")) << formatNumber(identifier) << "\n";
-		}
-		else
-			solAssert(false, "Invalid member access in contract");
-		break;
-	}
-	case Type::Category::Integer:
-	{
-		solAssert(false, "Invalid member access to integer");
-		break;
-	}
-	case Type::Category::Address:
-	{
-		if (member == "balance")
-			define(_memberAccess) <<
-				"balance(" <<
-				expressionAsType(_memberAccess.expression(), *TypeProvider::address()) <<
-				")\n";
-		else if (member == "code")
-		{
-			std::string externalCodeFunction = m_utils.externalCodeFunction();
-			define(_memberAccess) <<
-				externalCodeFunction <<
-				"(" <<
-				expressionAsType(_memberAccess.expression(), *TypeProvider::address()) <<
-				")\n";
-		}
-		else if (member == "codehash")
-			define(_memberAccess) <<
-				"extcodehash(" <<
-				expressionAsType(_memberAccess.expression(), *TypeProvider::address()) <<
-				")\n";
-		else if (std::set<std::string>{"send", "transfer"}.count(member))
-		{
-			solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable);
-			define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
-		}
-		else if (std::set<std::string>{"call", "callcode", "delegatecall", "staticcall"}.count(member))
-			define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
-		else
-			solAssert(false, "Invalid member access to address");
-		break;
-	}
-	case Type::Category::Function:
-		if (member == "selector")
-		{
-			FunctionType const& functionType = dynamic_cast<FunctionType const&>(
-				*_memberAccess.expression().annotation().type
-			);
-			if (
-				functionType.kind() == FunctionType::Kind::External ||
-				functionType.kind() == FunctionType::Kind::DelegateCall
-			)
-				define(IRVariable{_memberAccess}, IRVariable(_memberAccess.expression()).part("functionSelector"));
-			else if (
-				functionType.kind() == FunctionType::Kind::Declaration ||
-				functionType.kind() == FunctionType::Kind::Error ||
-				// In some situations, internal function types also provide the "selector" member.
-				// See Types.cpp for details.
-				functionType.kind() == FunctionType::Kind::Internal
-			)
-			{
-				solAssert(functionType.hasDeclaration());
-				solAssert(
-					functionType.kind() == FunctionType::Kind::Error ||
-					functionType.declaration().isPartOfExternalInterface(),
-					""
-				);
-				define(IRVariable{_memberAccess}) << formatNumber(
-					util::selectorFromSignatureU256(functionType.externalSignature())
-				) << "\n";
-			}
-			else if (functionType.kind() == FunctionType::Kind::Event)
-			{
-				solAssert(functionType.hasDeclaration());
-				solAssert(functionType.kind() == FunctionType::Kind::Event);
-				solAssert(
-					!(dynamic_cast<EventDefinition const&>(functionType.declaration()).isAnonymous())
-				);
-				define(IRVariable{_memberAccess}) << formatNumber(
-					u256(h256::Arith(util::keccak256(functionType.externalSignature())))
-				) << "\n";
-			}
-			else
-				solAssert(false, "Invalid use of .selector: " + functionType.toString(false));
-		}
-		else if (member == "address")
-		{
-			solUnimplementedAssert(
-				dynamic_cast<FunctionType const&>(*_memberAccess.expression().annotation().type).kind() ==
-				FunctionType::Kind::External
-			);
-			define(IRVariable{_memberAccess}, IRVariable(_memberAccess.expression()).part("address"));
-		}
-		else
-			solAssert(
-				!!_memberAccess.expression().annotation().type->memberType(member),
-				"Invalid member access to function."
-			);
-		break;
-	case Type::Category::Magic:
-		// we can ignore the kind of magic and only look at the name of the member
-		if (member == "coinbase")
-			define(_memberAccess) << "coinbase()\n";
-		else if (member == "timestamp")
-			define(_memberAccess) << "timestamp()\n";
-		else if (member == "difficulty" || member == "prevrandao")
-		{
-			if (m_context.evmVersion().hasPrevRandao())
-				define(_memberAccess) << "prevrandao()\n";
-			else
-				define(_memberAccess) << "difficulty()\n";
-		}
-		else if (member == "number")
-			define(_memberAccess) << "number()\n";
-		else if (member == "gaslimit")
-			define(_memberAccess) << "gaslimit()\n";
-		else if (member == "sender")
-			define(_memberAccess) << "caller()\n";
-		else if (member == "value")
-			define(_memberAccess) << "callvalue()\n";
-		else if (member == "origin")
-			define(_memberAccess) << "origin()\n";
-		else if (member == "gasprice")
-			define(_memberAccess) << "gasprice()\n";
-		else if (member == "chainid")
-			define(_memberAccess) << "chainid()\n";
-		else if (member == "basefee")
-			define(_memberAccess) << "basefee()\n";
-		else if (member == "data")
-		{
-			IRVariable var(_memberAccess);
-			define(var.part("offset")) << "0\n";
-			define(var.part("length")) << "calldatasize()\n";
-		}
-		else if (member == "sig")
-			define(_memberAccess) <<
-				"and(calldataload(0), " <<
-				formatNumber(u256(0xffffffff) << (256 - 32)) <<
-				")\n";
-		else if (member == "gas")
-			solAssert(false, "Gas has been removed.");
-		else if (member == "blockhash")
-			solAssert(false, "Blockhash has been removed.");
-		else if (member == "creationCode" || member == "runtimeCode")
-		{
-			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
-			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
-			solAssert(!contractType.isSuper());
-			ContractDefinition const& contract = contractType.contractDefinition();
-			m_context.subObjectsCreated().insert(&contract);
-			appendCode() << Whiskers(R"(
-				let <size> := datasize("<objectName>")
-				let <result> := <allocationFunction>(add(<size>, 32))
-				mstore(<result>, <size>)
-				datacopy(add(<result>, 32), dataoffset("<objectName>"), <size>)
-			)")
-			("allocationFunction", m_utils.allocationFunction())
-			("size", m_context.newYulVariable())
-			("objectName", IRNames::creationObject(contract) + (member == "runtimeCode" ? "." + IRNames::deployedObject(contract) : ""))
-			("result", IRVariable(_memberAccess).commaSeparatedList()).render();
-		}
-		else if (member == "name")
-		{
-			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
-			ContractDefinition const& contract = dynamic_cast<ContractType const&>(*arg).contractDefinition();
-			define(IRVariable(_memberAccess)) << m_utils.copyLiteralToMemoryFunction(contract.name()) << "()\n";
-		}
-		else if (member == "interfaceId")
-		{
-			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
-			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
-			solAssert(!contractType.isSuper());
-			ContractDefinition const& contract = contractType.contractDefinition();
-			define(_memberAccess) << formatNumber(u256{contract.interfaceId()} << (256 - 32)) << "\n";
-		}
-		else if (member == "min" || member == "max")
-		{
-			MagicType const* arg = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type);
-
-			std::string requestedValue;
-			if (IntegerType const* integerType = dynamic_cast<IntegerType const*>(arg->typeArgument()))
-			{
-				if (member == "min")
-					requestedValue = formatNumber(integerType->min());
-				else
-					requestedValue = formatNumber(integerType->max());
-			}
-			else if (EnumType const* enumType = dynamic_cast<EnumType const*>(arg->typeArgument()))
-			{
-				if (member == "min")
-					requestedValue = std::to_string(enumType->minValue());
-				else
-					requestedValue = std::to_string(enumType->maxValue());
-			}
-			else
-				solAssert(false, "min/max requested on unexpected type.");
-
-			define(_memberAccess) << requestedValue << "\n";
-		}
-		else if (std::set<std::string>{"encode", "encodePacked", "encodeWithSelector", "encodeCall", "encodeWithSignature", "decode"}.count(member))
-		{
-			// no-op
-		}
-		else
-			solAssert(false, "Unknown magic member.");
-		break;
-	case Type::Category::Struct:
-	{
-		auto const& structType = dynamic_cast<StructType const&>(*_memberAccess.expression().annotation().type);
-
-		IRVariable expression(_memberAccess.expression());
-		switch (structType.location())
-		{
-		case DataLocation::Storage:
-		{
-			std::pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member);
-			std::string slot = m_context.newYulVariable();
-			appendCode() << "let " << slot << " := " <<
-				("add(" + expression.part("slot").name() + ", " + offsets.first.str() + ")\n");
-			setLValue(_memberAccess, IRLValue{
-				type(_memberAccess),
-				IRLValue::Storage{slot, offsets.second}
-			});
-			break;
-		}
-		case DataLocation::Memory:
-		{
-			std::string pos = m_context.newYulVariable();
-			appendCode() << "let " << pos << " := " <<
-				("add(" + expression.part("mpos").name() + ", " + structType.memoryOffsetOfMember(member).str() + ")\n");
-			setLValue(_memberAccess, IRLValue{
-				type(_memberAccess),
-				IRLValue::Memory{pos}
-			});
-			break;
-		}
-		case DataLocation::CallData:
-		{
-			std::string baseRef = expression.part("offset").name();
-			std::string offset = m_context.newYulVariable();
-			appendCode() << "let " << offset << " := " << "add(" << baseRef << ", " << std::to_string(structType.calldataOffsetOfMember(member)) << ")\n";
-			if (_memberAccess.annotation().type->isDynamicallyEncoded())
-				define(_memberAccess) <<
-					m_utils.accessCalldataTailFunction(*_memberAccess.annotation().type) <<
-					"(" <<
-					baseRef <<
-					", " <<
-					offset <<
-					")\n";
-			else if (
-				dynamic_cast<ArrayType const*>(_memberAccess.annotation().type) ||
-				dynamic_cast<StructType const*>(_memberAccess.annotation().type)
-			)
-				define(_memberAccess) << offset << "\n";
-			else
-				define(_memberAccess) <<
-					m_utils.readFromCalldata(*_memberAccess.annotation().type) <<
-					"(" <<
-					offset <<
-					")\n";
-			break;
-		}
-		default:
-			solAssert(false, "Illegal data location for struct.");
-		}
-		break;
-	}
-	case Type::Category::Enum:
-	{
-		EnumType const& type = dynamic_cast<EnumType const&>(*_memberAccess.expression().annotation().type);
-		define(_memberAccess) << std::to_string(type.memberValue(_memberAccess.memberName())) << "\n";
-		break;
-	}
-	case Type::Category::Array:
-	{
-		auto const& type = dynamic_cast<ArrayType const&>(*_memberAccess.expression().annotation().type);
-		if (member == "length")
-		{
-			// shortcut for <address>.code.length
-			if (
-				auto innerExpression = dynamic_cast<MemberAccess const*>(&_memberAccess.expression());
-				innerExpression &&
-				innerExpression->memberName() == "code" &&
-				innerExpression->expression().annotation().type->category() == Type::Category::Address
-			)
-				define(_memberAccess) <<
-					"extcodesize(" <<
-					expressionAsType(innerExpression->expression(), *TypeProvider::address()) <<
-					")\n";
-			else
-				define(_memberAccess) <<
-					m_utils.arrayLengthFunction(type) <<
-					"(" <<
-					IRVariable(_memberAccess.expression()).commaSeparatedList() <<
-					")\n";
-		}
-		else if (member == "pop" || member == "push")
-		{
-			solAssert(type.location() == DataLocation::Storage);
-			define(IRVariable{_memberAccess}.part("slot"), IRVariable{_memberAccess.expression()}.part("slot"));
-		}
-		else
-			solAssert(false, "Invalid array member access.");
-
-		break;
-	}
-	case Type::Category::FixedBytes:
-	{
-		auto const& type = dynamic_cast<FixedBytesType const&>(*_memberAccess.expression().annotation().type);
-		if (member == "length")
-			define(_memberAccess) << std::to_string(type.numBytes()) << "\n";
-		else
-			solAssert(false, "Illegal fixed bytes member.");
-		break;
-	}
-	case Type::Category::TypeType:
-	{
-		Type const& actualType = *dynamic_cast<TypeType const&>(
-			*_memberAccess.expression().annotation().type
-		).actualType();
-
-		if (actualType.category() == Type::Category::Contract)
-		{
-			ContractType const& contractType = dynamic_cast<ContractType const&>(actualType);
-			if (contractType.isSuper())
-			{
-				solAssert(!!_memberAccess.annotation().referencedDeclaration, "Referenced declaration not resolved.");
-				ContractDefinition const* super = contractType.contractDefinition().superContract(m_context.mostDerivedContract());
-				solAssert(super, "Super contract not available.");
-				FunctionDefinition const& resolvedFunctionDef =
-					dynamic_cast<FunctionDefinition const&>(
-						*_memberAccess.annotation().referencedDeclaration
-					).resolveVirtual(m_context.mostDerivedContract(), super);
-
-				solAssert(resolvedFunctionDef.functionType(true));
-				solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal);
-				assignInternalFunctionIDIfNotCalledDirectly(_memberAccess, resolvedFunctionDef);
-			}
-			else if (auto const* variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-				handleVariableReference(*variable, _memberAccess);
-			else if (memberFunctionType)
-			{
-				switch (memberFunctionType->kind())
-				{
-				case FunctionType::Kind::Declaration:
-					break;
-				case FunctionType::Kind::Internal:
-					if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-						assignInternalFunctionIDIfNotCalledDirectly(_memberAccess, *function);
-					else
-						solAssert(false, "Function not found in member access");
-					break;
-				case FunctionType::Kind::Event:
-					solAssert(
-						dynamic_cast<EventDefinition const*>(_memberAccess.annotation().referencedDeclaration),
-						"Event not found"
-					);
-						// the call will do the resolving
-					break;
-				case FunctionType::Kind::Error:
-					solAssert(
-						dynamic_cast<ErrorDefinition const*>(_memberAccess.annotation().referencedDeclaration),
-						"Error not found"
-					);
-					// The function call will resolve the selector.
-					break;
-				case FunctionType::Kind::DelegateCall:
-					define(IRVariable(_memberAccess).part("address"), _memberAccess.expression());
-					define(IRVariable(_memberAccess).part("functionSelector")) << formatNumber(memberFunctionType->externalIdentifier()) << "\n";
-					break;
-				case FunctionType::Kind::External:
-				case FunctionType::Kind::Creation:
-				case FunctionType::Kind::Send:
-				case FunctionType::Kind::BareCall:
-				case FunctionType::Kind::BareCallCode:
-				case FunctionType::Kind::BareDelegateCall:
-				case FunctionType::Kind::BareStaticCall:
-				case FunctionType::Kind::Transfer:
-				case FunctionType::Kind::ECRecover:
-				case FunctionType::Kind::SHA256:
-				case FunctionType::Kind::RIPEMD160:
-				default:
-					solAssert(false, "unsupported member function");
-				}
-			}
-			else if (dynamic_cast<TypeType const*>(_memberAccess.annotation().type))
-			{
-			// no-op
-			}
-			else
-				// The old code generator had a generic "else" case here
-				// without any specific code being generated,
-				// but it would still be better to have an exhaustive list.
-				solAssert(false);
-		}
-		else if (EnumType const* enumType = dynamic_cast<EnumType const*>(&actualType))
-			define(_memberAccess) << std::to_string(enumType->memberValue(_memberAccess.memberName())) << "\n";
-		else if (dynamic_cast<UserDefinedValueType const*>(&actualType))
-			solAssert(member == "wrap" || member == "unwrap");
-		else if (auto const* arrayType = dynamic_cast<ArrayType const*>(&actualType))
-			solAssert(arrayType->isByteArrayOrString() && member == "concat");
-		else
-			// The old code generator had a generic "else" case here
-			// without any specific code being generated,
-			// but it would still be better to have an exhaustive list.
-			solAssert(false);
-		break;
-	}
-	case Type::Category::Module:
-	{
-		Type::Category category = _memberAccess.annotation().type->category();
-		solAssert(
-			dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration) ||
-			dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration) ||
-			dynamic_cast<ErrorDefinition const*>(_memberAccess.annotation().referencedDeclaration) ||
-			category == Type::Category::TypeType ||
-			category == Type::Category::Module,
-			""
-		);
-		if (auto variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			solAssert(variable->isConstant());
-			handleVariableReference(*variable, static_cast<Expression const&>(_memberAccess));
-		}
-		else if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
-			solAssert(function && function->isFree());
-			solAssert(function->functionType(true));
-			solAssert(function->functionType(true)->kind() == FunctionType::Kind::Internal);
-			solAssert(funType->kind() == FunctionType::Kind::Internal);
-			solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static);
-
-			assignInternalFunctionIDIfNotCalledDirectly(_memberAccess, *function);
-		}
-		else if (auto const* contract = dynamic_cast<ContractDefinition const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			if (contract->isLibrary())
-				define(IRVariable(_memberAccess).part("address")) << linkerSymbol(*contract) << "\n";
-		}
-		break;
-	}
-	default:
-		solAssert(false, "Member access to unknown type.");
-	}
-}
-
-bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
-{
-	setLocation(_inlineAsm);
-	if (*_inlineAsm.annotation().hasMemoryEffects && !_inlineAsm.annotation().markedMemorySafe)
-		m_context.setMemoryUnsafeInlineAssemblySeen();
-	CopyTranslate bodyCopier{_inlineAsm.dialect(), m_context, _inlineAsm.annotation().externalReferences};
-
-	yul::Statement modified = bodyCopier(_inlineAsm.operations());
-
-	solAssert(std::holds_alternative<yul::Block>(modified));
-
-	// Do not provide dialect so that we get the full type information.
-	appendCode() << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
-	return false;
-}
-
-
-void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
-{
-	setLocation(_indexAccess);
-	Type const& baseType = *_indexAccess.baseExpression().annotation().type;
-
-	if (baseType.category() == Type::Category::Mapping)
-	{
-		solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-
-		MappingType const& mappingType = dynamic_cast<MappingType const&>(baseType);
-		Type const& keyType = *_indexAccess.indexExpression()->annotation().type;
-
-		std::string slot = m_context.newYulVariable();
-		Whiskers templ("let <slot> := <indexAccess>(<base><?+key>,<key></+key>)\n");
-		templ("slot", slot);
-		templ("indexAccess", m_utils.mappingIndexAccessFunction(mappingType, keyType));
-		templ("base", IRVariable(_indexAccess.baseExpression()).commaSeparatedList());
-		templ("key", IRVariable(*_indexAccess.indexExpression()).commaSeparatedList());
-		appendCode() << templ.render();
-		setLValue(_indexAccess, IRLValue{
-			*_indexAccess.annotation().type,
-			IRLValue::Storage{
-				slot,
-				0u
-			}
-		});
-	}
-	else if (baseType.category() == Type::Category::Array || baseType.category() == Type::Category::ArraySlice)
-	{
-		ArrayType const& arrayType =
-			baseType.category() == Type::Category::Array ?
-			dynamic_cast<ArrayType const&>(baseType) :
-			dynamic_cast<ArraySliceType const&>(baseType).arrayType();
-
-		if (baseType.category() == Type::Category::ArraySlice)
-			solAssert(arrayType.dataStoredIn(DataLocation::CallData) && arrayType.isDynamicallySized());
-
-		solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-
-		switch (arrayType.location())
-		{
-			case DataLocation::Storage:
-			{
-				std::string slot = m_context.newYulVariable();
-				std::string offset = m_context.newYulVariable();
-
-				appendCode() << Whiskers(R"(
-					let <slot>, <offset> := <indexFunc>(<array>, <index>)
-				)")
-				("slot", slot)
-				("offset", offset)
-				("indexFunc", m_utils.storageArrayIndexAccessFunction(arrayType))
-				("array", IRVariable(_indexAccess.baseExpression()).part("slot").name())
-				("index", IRVariable(*_indexAccess.indexExpression()).name())
-				.render();
-
-				setLValue(_indexAccess, IRLValue{
-					*_indexAccess.annotation().type,
-					IRLValue::Storage{slot, offset}
-				});
-
-				break;
-			}
-			case DataLocation::Memory:
-			{
-				std::string const indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
-				std::string const baseRef = IRVariable(_indexAccess.baseExpression()).part("mpos").name();
-				std::string const indexExpression = expressionAsType(
-					*_indexAccess.indexExpression(),
-					*TypeProvider::uint256()
-				);
-				std::string const memAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
-
-				setLValue(_indexAccess, IRLValue{
-					*arrayType.baseType(),
-					IRLValue::Memory{memAddress, arrayType.isByteArrayOrString()}
-				});
-				break;
-			}
-			case DataLocation::CallData:
-			{
-				std::string const indexAccessFunction = m_utils.calldataArrayIndexAccessFunction(arrayType);
-				std::string const baseRef = IRVariable(_indexAccess.baseExpression()).commaSeparatedList();
-				std::string const indexExpression = expressionAsType(
-					*_indexAccess.indexExpression(),
-					*TypeProvider::uint256()
-				);
-				std::string const calldataAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
-
-				if (arrayType.isByteArrayOrString())
-					define(_indexAccess) <<
-						m_utils.cleanupFunction(*arrayType.baseType()) <<
-						"(calldataload(" <<
-						calldataAddress <<
-						"))\n";
-				else if (arrayType.baseType()->isValueType())
-					define(_indexAccess) <<
-						m_utils.readFromCalldata(*arrayType.baseType()) <<
-						"(" <<
-						calldataAddress <<
-						")\n";
-				else
-					define(_indexAccess) << calldataAddress << "\n";
-				break;
-			}
-		}
-	}
-	else if (baseType.category() == Type::Category::FixedBytes)
-	{
-		auto const& fixedBytesType = dynamic_cast<FixedBytesType const&>(baseType);
-		solAssert(_indexAccess.indexExpression(), "Index expression expected.");
-
-		IRVariable index{m_context.newYulVariable(), *TypeProvider::uint256()};
-		define(index, *_indexAccess.indexExpression());
-		appendCode() << Whiskers(R"(
-			if iszero(lt(<index>, <length>)) { <panic>() }
-			let <result> := <shl248>(byte(<index>, <array>))
-		)")
-		("index", index.name())
-		("length", std::to_string(fixedBytesType.numBytes()))
-		("panic", m_utils.panicFunction(PanicCode::ArrayOutOfBounds))
-		("array", IRVariable(_indexAccess.baseExpression()).name())
-		("shl248", m_utils.shiftLeftFunction(256 - 8))
-		("result", IRVariable(_indexAccess).name())
-		.render();
-	}
-	else if (baseType.category() == Type::Category::TypeType)
-	{
-		solAssert(baseType.sizeOnStack() == 0);
-		solAssert(_indexAccess.annotation().type->sizeOnStack() == 0);
-		// no-op - this seems to be a lone array type (`structType[];`)
-	}
-	else
-		solAssert(false, "Index access only allowed for mappings or arrays.");
-}
-
-void IRGeneratorForStatements::endVisit(IndexRangeAccess const& _indexRangeAccess)
-{
-	setLocation(_indexRangeAccess);
-	Type const& baseType = *_indexRangeAccess.baseExpression().annotation().type;
-	solAssert(
-		baseType.category() == Type::Category::Array || baseType.category() == Type::Category::ArraySlice,
-		"Index range accesses is available only on arrays and array slices."
-	);
-
-	ArrayType const& arrayType =
-		baseType.category() == Type::Category::Array ?
-		dynamic_cast<ArrayType const &>(baseType) :
-		dynamic_cast<ArraySliceType const &>(baseType).arrayType();
-
-	switch (arrayType.location())
-	{
-		case DataLocation::CallData:
-		{
-			solAssert(baseType.isDynamicallySized());
-			IRVariable sliceStart{m_context.newYulVariable(), *TypeProvider::uint256()};
-			if (_indexRangeAccess.startExpression())
-				define(sliceStart, IRVariable{*_indexRangeAccess.startExpression()});
-			else
-				define(sliceStart) << u256(0) << "\n";
-
-			IRVariable sliceEnd{
-				m_context.newYulVariable(),
-				*TypeProvider::uint256()
-			};
-			if (_indexRangeAccess.endExpression())
-				define(sliceEnd, IRVariable{*_indexRangeAccess.endExpression()});
-			else
-				define(sliceEnd, IRVariable{_indexRangeAccess.baseExpression()}.part("length"));
-
-			IRVariable range{_indexRangeAccess};
-			define(range) <<
-				m_utils.calldataArrayIndexRangeAccess(arrayType) << "(" <<
-				IRVariable{_indexRangeAccess.baseExpression()}.commaSeparatedList() << ", " <<
-				sliceStart.name() << ", " <<
-				sliceEnd.name() << ")\n";
-			break;
-		}
-		default:
-			solUnimplemented("Index range accesses is implemented only on calldata arrays.");
-	}
-}
-
-void IRGeneratorForStatements::endVisit(Identifier const& _identifier)
-{
-	setLocation(_identifier);
-	Declaration const* declaration = _identifier.annotation().referencedDeclaration;
-	if (MagicVariableDeclaration const* magicVar = dynamic_cast<MagicVariableDeclaration const*>(declaration))
-	{
-		switch (magicVar->type()->category())
-		{
-		case Type::Category::Contract:
-			solAssert(_identifier.name() == "this");
-			define(_identifier) << "address()\n";
-			break;
-		case Type::Category::Integer:
-			solAssert(_identifier.name() == "now");
-			define(_identifier) << "timestamp()\n";
-			break;
-		case Type::Category::TypeType:
-		{
-			auto typeType = dynamic_cast<TypeType const*>(magicVar->type());
-			if (auto contractType = dynamic_cast<ContractType const*>(typeType->actualType()))
-				solAssert(!contractType->isSuper() || _identifier.name() == "super");
-			break;
-		}
-		default:
-			break;
-		}
-		return;
-	}
-	else if (FunctionDefinition const* functionDef = dynamic_cast<FunctionDefinition const*>(declaration))
-	{
-		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual);
-		FunctionDefinition const& resolvedFunctionDef = functionDef->resolveVirtual(m_context.mostDerivedContract());
-
-		solAssert(resolvedFunctionDef.functionType(true));
-		solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal);
-		assignInternalFunctionIDIfNotCalledDirectly(_identifier, resolvedFunctionDef);
-	}
-	else if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(declaration))
-		handleVariableReference(*varDecl, _identifier);
-	else if (auto const* contract = dynamic_cast<ContractDefinition const*>(declaration))
-	{
-		if (contract->isLibrary())
-			define(IRVariable(_identifier).part("address")) << linkerSymbol(*contract) << "\n";
-	}
-	else if (dynamic_cast<EventDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<ErrorDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<EnumDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<StructDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<ImportDirective const*>(declaration))
-	{
-		// no-op
-	}
-	else if (dynamic_cast<UserDefinedValueTypeDefinition const*>(declaration))
-	{
-		// no-op
-	}
-	else
-	{
-		solAssert(false, "Identifier type not expected in expression context.");
-	}
-}
-
-bool IRGeneratorForStatements::visit(Literal const& _literal)
-{
-	setLocation(_literal);
-	Type const& literalType = type(_literal);
-
-	switch (literalType.category())
-	{
-	case Type::Category::RationalNumber:
-	case Type::Category::Bool:
-	case Type::Category::Address:
-		define(_literal) << toCompactHexWithPrefix(literalType.literalValue(&_literal)) << "\n";
-		break;
-	case Type::Category::StringLiteral:
-		break; // will be done during conversion
-	default:
-		solUnimplemented("Only integer, boolean and string literals implemented for now.");
-	}
-	return false;
-}
-
-void IRGeneratorForStatements::handleVariableReference(
-	VariableDeclaration const& _variable,
-	Expression const& _referencingExpression
-)
-{
-	if ((_variable.isStateVariable() || _variable.isFileLevelVariable()) && _variable.isConstant())
-		define(_referencingExpression) << constantValueFunction(_variable) << "()\n";
-	else if (_variable.isStateVariable() && _variable.immutable())
-		setLValue(_referencingExpression, IRLValue{
-			*_variable.annotation().type,
-			IRLValue::Immutable{&_variable}
-		});
-	else if (m_context.isLocalVariable(_variable))
-		setLValue(_referencingExpression, IRLValue{
-			*_variable.annotation().type,
-			IRLValue::Stack{m_context.localVariable(_variable)}
-		});
-	else if (m_context.isStateVariable(_variable))
-		setLValue(_referencingExpression, IRLValue{
-			*_variable.annotation().type,
-			IRLValue::Storage{
-				toCompactHexWithPrefix(m_context.storageLocationOfStateVariable(_variable).first),
-				m_context.storageLocationOfStateVariable(_variable).second
-			}
-		});
-	else
-		solAssert(false, "Invalid variable kind.");
-}
-
-void IRGeneratorForStatements::appendExternalFunctionCall(
-	FunctionCall const& _functionCall,
-	std::vector<ASTPointer<Expression const>> const& _arguments
-)
-{
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(type(_functionCall.expression()));
-	solAssert(!funType.takesArbitraryParameters());
-	solAssert(_arguments.size() == funType.parameterTypes().size());
-	solAssert(!funType.isBareCall());
-	FunctionType::Kind const funKind = funType.kind();
-
-	solAssert(
-		funKind == FunctionType::Kind::External || funKind == FunctionType::Kind::DelegateCall,
-		"Can only be used for regular external calls."
-	);
-
-	bool const isDelegateCall = funKind == FunctionType::Kind::DelegateCall;
-	bool const useStaticCall = funType.stateMutability() <= StateMutability::View && m_context.evmVersion().hasStaticCall();
-
-	ReturnInfo const returnInfo{m_context.evmVersion(), funType};
-
-	TypePointers parameterTypes = funType.parameterTypes();
-	TypePointers argumentTypes;
-	std::vector<std::string> argumentStrings;
-	if (funType.hasBoundFirstArgument())
-	{
-		parameterTypes.insert(parameterTypes.begin(), funType.selfType());
-		argumentTypes.emplace_back(funType.selfType());
-		argumentStrings += IRVariable(_functionCall.expression()).part("self").stackSlots();
-	}
-
-	for (auto const& arg: _arguments)
-	{
-		argumentTypes.emplace_back(&type(*arg));
-		argumentStrings += IRVariable(*arg).stackSlots();
-	}
-
-
-	if (!m_context.evmVersion().canOverchargeGasForCall())
-	{
-		// Touch the end of the output area so that we do not pay for memory resize during the call
-		// (which we would have to subtract from the gas left)
-		// We could also just use MLOAD; POP right before the gas calculation, but the optimizer
-		// would remove that, so we use MSTORE here.
-		if (!funType.gasSet() && returnInfo.estimatedReturnSize > 0)
-			appendCode() << "mstore(add(" << m_utils.allocateUnboundedFunction() << "() , " << std::to_string(returnInfo.estimatedReturnSize) << "), 0)\n";
-	}
-
-	// NOTE: When the expected size of returndata is static, we pass that in to the call opcode and it gets copied automatically.
-    // When it's dynamic, we get zero from estimatedReturnSize() instead and then we need an explicit returndatacopy().
-	Whiskers templ(R"(
-		<?checkExtcodesize>
-			if iszero(extcodesize(<address>)) { <revertNoCode>() }
-		</checkExtcodesize>
-		// storage for arguments and returned data
-		let <pos> := <allocateUnbounded>()
-		mstore(<pos>, <shl28>(<funSel>))
-		let <end> := <encodeArgs>(add(<pos>, 4) <argumentString>)
-
-		let <success> := <call>(<gas>, <address>, <?hasValue> <value>, </hasValue> <pos>, sub(<end>, <pos>), <pos>, <staticReturndataSize>)
-		<?noTryCall>
-			if iszero(<success>) { <forwardingRevert>() }
-		</noTryCall>
-		<?+retVars> let <retVars> </+retVars>
-		if <success> {
-			<?isReturndataSizeDynamic>
-				let <returnDataSizeVar> := returndatasize()
-				returndatacopy(<pos>, 0, <returnDataSizeVar>)
-			<!isReturndataSizeDynamic>
-				let <returnDataSizeVar> := <staticReturndataSize>
-				<?supportsReturnData>
-					if gt(<returnDataSizeVar>, returndatasize()) {
-						<returnDataSizeVar> := returndatasize()
-					}
-				</supportsReturnData>
-			</isReturndataSizeDynamic>
-
-			// update freeMemoryPointer according to dynamic return size
-			<finalizeAllocation>(<pos>, <returnDataSizeVar>)
-
-			// decode return parameters from external try-call into retVars
-			<?+retVars> <retVars> := </+retVars> <abiDecode>(<pos>, add(<pos>, <returnDataSizeVar>))
-		}
-	)");
-	templ("revertNoCode", m_utils.revertReasonIfDebugFunction("Target contract does not contain code"));
-
-	// We do not need to check extcodesize if we expect return data: If there is no
-	// code, the call will return empty data and the ABI decoder will revert.
-	size_t encodedHeadSize = 0;
-	for (auto const& t: returnInfo.returnTypes)
-		encodedHeadSize += t->decodingType()->calldataHeadSize();
-	bool const checkExtcodesize =
-		encodedHeadSize == 0 ||
-		!m_context.evmVersion().supportsReturndata() ||
-		m_context.revertStrings() >= RevertStrings::Debug;
-	templ("checkExtcodesize", checkExtcodesize);
-
-	templ("pos", m_context.newYulVariable());
-	templ("end", m_context.newYulVariable());
-	if (_functionCall.annotation().tryCall)
-		templ("success", IRNames::trySuccessConditionVariable(_functionCall));
-	else
-		templ("success", m_context.newYulVariable());
-	templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-	templ("finalizeAllocation", m_utils.finalizeAllocationFunction());
-	templ("shl28", m_utils.shiftLeftFunction(8 * (32 - 4)));
-
-	templ("funSel", IRVariable(_functionCall.expression()).part("functionSelector").name());
-	templ("address", IRVariable(_functionCall.expression()).part("address").name());
-
-	if (returnInfo.dynamicReturnSize)
-		solAssert(m_context.evmVersion().supportsReturndata());
-	templ("returnDataSizeVar", m_context.newYulVariable());
-	templ("staticReturndataSize", std::to_string(returnInfo.estimatedReturnSize));
-	templ("supportsReturnData", m_context.evmVersion().supportsReturndata());
-
-	std::string const retVars = IRVariable(_functionCall).commaSeparatedList();
-	templ("retVars", retVars);
-	solAssert(retVars.empty() == returnInfo.returnTypes.empty());
-
-	templ("abiDecode", m_context.abiFunctions().tupleDecoder(returnInfo.returnTypes, true));
-	templ("isReturndataSizeDynamic", returnInfo.dynamicReturnSize);
-
-	templ("noTryCall", !_functionCall.annotation().tryCall);
-
-	bool encodeForLibraryCall = funKind == FunctionType::Kind::DelegateCall;
-
-	solAssert(funType.padArguments());
-	templ("encodeArgs", m_context.abiFunctions().tupleEncoder(argumentTypes, parameterTypes, encodeForLibraryCall));
-	templ("argumentString", joinHumanReadablePrefixed(argumentStrings));
-
-	solAssert(!isDelegateCall || !funType.valueSet(), "Value set for delegatecall");
-	solAssert(!useStaticCall || !funType.valueSet(), "Value set for staticcall");
-
-	templ("hasValue", !isDelegateCall && !useStaticCall);
-	templ("value", funType.valueSet() ? IRVariable(_functionCall.expression()).part("value").name() : "0");
-
-	if (funType.gasSet())
-		templ("gas", IRVariable(_functionCall.expression()).part("gas").name());
-	else if (m_context.evmVersion().canOverchargeGasForCall())
-		// Send all gas (requires tangerine whistle EVM)
-		templ("gas", "gas()");
-	else
-	{
-		// send all gas except the amount needed to execute "SUB" and "CALL"
-		// @todo this retains too much gas for now, needs to be fine-tuned.
-		u256 gasNeededByCaller = evmasm::GasCosts::callGas(m_context.evmVersion()) + 10;
-		if (funType.valueSet())
-			gasNeededByCaller += evmasm::GasCosts::callValueTransferGas;
-		if (!checkExtcodesize)
-			gasNeededByCaller += evmasm::GasCosts::callNewAccountGas; // we never know
-		templ("gas", "sub(gas(), " + formatNumber(gasNeededByCaller) + ")");
-	}
-	// Order is important here, STATICCALL might overlap with DELEGATECALL.
-	if (isDelegateCall)
-		templ("call", "delegatecall");
-	else if (useStaticCall)
-		templ("call", "staticcall");
-	else
-		templ("call", "call");
-
-	templ("forwardingRevert", m_utils.forwardingRevertFunction());
-
-	appendCode() << templ.render();
-}
-
-void IRGeneratorForStatements::appendBareCall(
-	FunctionCall const& _functionCall,
-	std::vector<ASTPointer<Expression const>> const& _arguments
-)
-{
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(type(_functionCall.expression()));
-	solAssert(
-		!funType.hasBoundFirstArgument() &&
-		!funType.takesArbitraryParameters() &&
-		_arguments.size() == 1 &&
-		funType.parameterTypes().size() == 1, ""
-	);
-	FunctionType::Kind const funKind = funType.kind();
-
-	solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall());
-	solAssert(funKind != FunctionType::Kind::BareCallCode, "Callcode has been removed.");
-	solAssert(
-		funKind == FunctionType::Kind::BareCall ||
-		funKind == FunctionType::Kind::BareDelegateCall ||
-		funKind == FunctionType::Kind::BareStaticCall, ""
-	);
-
-	solAssert(!_functionCall.annotation().tryCall);
-	Whiskers templ(R"(
-		<?needsEncoding>
-			let <pos> := <allocateUnbounded>()
-			let <length> := sub(<encode>(<pos> <?+arg>,</+arg> <arg>), <pos>)
-		<!needsEncoding>
-			let <pos> := add(<arg>, 0x20)
-			let <length> := mload(<arg>)
-		</needsEncoding>
-
-		let <success> := <call>(<gas>, <address>, <?+value> <value>, </+value> <pos>, <length>, 0, 0)
-		let <returndataVar> := <extractReturndataFunction>()
-	)");
-
-	templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-	templ("pos", m_context.newYulVariable());
-	templ("length", m_context.newYulVariable());
-
-	templ("arg", IRVariable(*_arguments.front()).commaSeparatedList());
-	Type const& argType = type(*_arguments.front());
-	if (argType == *TypeProvider::bytesMemory() || argType == *TypeProvider::stringMemory())
-		templ("needsEncoding", false);
-	else
-	{
-		templ("needsEncoding", true);
-		ABIFunctions abi(m_context.evmVersion(), m_context.revertStrings(), m_context.functionCollector());
-		templ("encode", abi.tupleEncoderPacked({&argType}, {TypeProvider::bytesMemory()}));
-	}
-
-	templ("success", IRVariable(_functionCall).tupleComponent(0).name());
-	templ("returndataVar", IRVariable(_functionCall).tupleComponent(1).commaSeparatedList());
-	templ("extractReturndataFunction", m_utils.extractReturndataFunction());
-
-	templ("address", IRVariable(_functionCall.expression()).part("address").name());
-
-	if (funKind == FunctionType::Kind::BareCall)
-	{
-		templ("value", funType.valueSet() ? IRVariable(_functionCall.expression()).part("value").name() : "0");
-		templ("call", "call");
-	}
-	else
-	{
-		solAssert(!funType.valueSet(), "Value set for delegatecall or staticcall.");
-		templ("value", "");
-		if (funKind == FunctionType::Kind::BareStaticCall)
-			templ("call", "staticcall");
-		else
-			templ("call", "delegatecall");
-	}
-
-	if (funType.gasSet())
-		templ("gas", IRVariable(_functionCall.expression()).part("gas").name());
-	else if (m_context.evmVersion().canOverchargeGasForCall())
-		// Send all gas (requires tangerine whistle EVM)
-		templ("gas", "gas()");
-	else
-	{
-		// send all gas except the amount needed to execute "SUB" and "CALL"
-		// @todo this retains too much gas for now, needs to be fine-tuned.
-		u256 gasNeededByCaller = evmasm::GasCosts::callGas(m_context.evmVersion()) + 10;
-		if (funType.valueSet())
-			gasNeededByCaller += evmasm::GasCosts::callValueTransferGas;
-		gasNeededByCaller += evmasm::GasCosts::callNewAccountGas; // we never know
-		templ("gas", "sub(gas(), " + formatNumber(gasNeededByCaller) + ")");
-	}
-
-	appendCode() << templ.render();
-}
-
-void IRGeneratorForStatements::assignInternalFunctionIDIfNotCalledDirectly(
-	Expression const& _expression,
-	FunctionDefinition const& _referencedFunction
-)
-{
-	solAssert(
-		dynamic_cast<MemberAccess const*>(&_expression) ||
-		dynamic_cast<Identifier const*>(&_expression),
-		""
-	);
-	if (_expression.annotation().calledDirectly)
-		return;
-
-	define(IRVariable(_expression).part("functionIdentifier")) <<
-		std::to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(&_referencedFunction)) <<
-		"\n";
-	m_context.addToInternalDispatch(_referencedFunction);
-}
-
-IRVariable IRGeneratorForStatements::convert(IRVariable const& _from, Type const& _to)
-{
-	if (_from.type() == _to)
-		return _from;
-	else
-	{
-		IRVariable converted(m_context.newYulVariable(), _to);
-		define(converted, _from);
-		return converted;
-	}
-}
-
-IRVariable IRGeneratorForStatements::convertAndCleanup(IRVariable const& _from, Type const& _to)
-{
-	IRVariable converted(m_context.newYulVariable(), _to);
-	defineAndCleanup(converted, _from);
-	return converted;
-}
-
-std::string IRGeneratorForStatements::expressionAsType(Expression const& _expression, Type const& _to)
-{
-	IRVariable from(_expression);
-	if (from.type() == _to)
-		return from.commaSeparatedList();
-	else
-		return m_utils.conversionFunction(from.type(), _to) + "(" + from.commaSeparatedList() + ")";
-}
-
-std::string IRGeneratorForStatements::expressionAsCleanedType(Expression const& _expression, Type const& _to)
-{
-	IRVariable from(_expression);
-	if (from.type() == _to)
-		return m_utils.cleanupFunction(_to) + "(" + expressionAsType(_expression, _to) + ")";
-	else
-		return expressionAsType(_expression, _to) ;
-}
-
-std::ostream& IRGeneratorForStatements::define(IRVariable const& _var)
-{
-	if (_var.type().sizeOnStack() > 0)
-		appendCode() << "let " << _var.commaSeparatedList() << " := ";
-	return appendCode(false);
-}
-
-void IRGeneratorForStatements::declare(IRVariable const& _var)
-{
-	if (_var.type().sizeOnStack() > 0)
-		appendCode() << "let " << _var.commaSeparatedList() << "\n";
-}
-
-void IRGeneratorForStatements::declareAssign(IRVariable const& _lhs, IRVariable const& _rhs, bool _declare, bool _forceCleanup)
-{
-	std::string output;
-	if (_lhs.type() == _rhs.type() && !_forceCleanup)
-		for (auto const& [stackItemName, stackItemType]: _lhs.type().stackItems())
-			if (stackItemType)
-				declareAssign(_lhs.part(stackItemName), _rhs.part(stackItemName), _declare);
-			else
-				appendCode() << (_declare ? "let ": "") << _lhs.part(stackItemName).name() << " := " << _rhs.part(stackItemName).name() << "\n";
-	else
-	{
-		if (_lhs.type().sizeOnStack() > 0)
-			appendCode() <<
-				(_declare ? "let ": "") <<
-				_lhs.commaSeparatedList() <<
-				" := ";
-		appendCode() << m_context.utils().conversionFunction(_rhs.type(), _lhs.type()) <<
-			"(" <<
-			_rhs.commaSeparatedList() <<
-			")\n";
-	}
-}
-
-IRVariable IRGeneratorForStatements::zeroValue(Type const& _type, bool _splitFunctionTypes)
-{
-	IRVariable irVar{IRNames::zeroValue(_type, m_context.newYulVariable()), _type};
-	define(irVar) << m_utils.zeroValueFunction(_type, _splitFunctionTypes) << "()\n";
-	return irVar;
-}
-
-void IRGeneratorForStatements::appendSimpleUnaryOperation(UnaryOperation const& _operation, Expression const& _expr)
-{
-	std::string func;
-
-	if (_operation.getOperator() == Token::Not)
-		func = "iszero";
-	else if (_operation.getOperator() == Token::BitNot)
-		func = "not";
-	else
-		solAssert(false, "Invalid Token!");
-
-	define(_operation) <<
-		m_utils.cleanupFunction(type(_expr)) <<
-		"(" <<
-			func <<
-			"(" <<
-			IRVariable(_expr).commaSeparatedList() <<
-			")" <<
-		")\n";
-}
-
-std::string IRGeneratorForStatements::binaryOperation(
-	langutil::Token _operator,
-	Type const& _type,
-	std::string const& _left,
-	std::string const& _right
-)
-{
-	solAssert(
-		!TokenTraits::isShiftOp(_operator),
-		"Have to use specific shift operation function for shifts."
-	);
-	std::string fun;
-	if (TokenTraits::isBitOp(_operator))
-	{
-		solAssert(
-			_type.category() == Type::Category::Integer ||
-			_type.category() == Type::Category::FixedBytes,
-			""
-		);
-		switch (_operator)
-		{
-		case Token::BitOr: fun = "or"; break;
-		case Token::BitXor: fun = "xor"; break;
-		case Token::BitAnd: fun = "and"; break;
-		default: break;
-		}
-	}
-	else if (TokenTraits::isArithmeticOp(_operator))
-	{
-		solUnimplementedAssert(
-			_type.category() != Type::Category::FixedPoint,
-			"Not yet implemented - FixedPointType."
-		);
-		IntegerType const* type = dynamic_cast<IntegerType const*>(&_type);
-		solAssert(type);
-		bool checked = m_context.arithmetic() == Arithmetic::Checked;
-		switch (_operator)
-		{
-		case Token::Add:
-			fun = checked ? m_utils.overflowCheckedIntAddFunction(*type) : m_utils.wrappingIntAddFunction(*type);
-			break;
-		case Token::Sub:
-			fun = checked ? m_utils.overflowCheckedIntSubFunction(*type) : m_utils.wrappingIntSubFunction(*type);
-			break;
-		case Token::Mul:
-			fun = checked ? m_utils.overflowCheckedIntMulFunction(*type) : m_utils.wrappingIntMulFunction(*type);
-			break;
-		case Token::Div:
-			fun = checked ? m_utils.overflowCheckedIntDivFunction(*type) : m_utils.wrappingIntDivFunction(*type);
-			break;
-		case Token::Mod:
-			fun = m_utils.intModFunction(*type);
-			break;
-		default:
-			break;
-		}
-	}
-
-	solUnimplementedAssert(!fun.empty(), "Type: " + _type.toString());
-	return fun + "(" + _left + ", " + _right + ")\n";
-}
-
-std::string IRGeneratorForStatements::shiftOperation(
-	langutil::Token _operator,
-	IRVariable const& _value,
-	IRVariable const& _amountToShift
-)
-{
-	solUnimplementedAssert(
-		_amountToShift.type().category() != Type::Category::FixedPoint &&
-		_value.type().category() != Type::Category::FixedPoint,
-		"Not yet implemented - FixedPointType."
-	);
-	IntegerType const* amountType = dynamic_cast<IntegerType const*>(&_amountToShift.type());
-	solAssert(amountType);
-
-	solAssert(_operator == Token::SHL || _operator == Token::SAR);
-
-	return
-		Whiskers(R"(
-			<shift>(<value>, <amount>)
-		)")
-		("shift",
-			_operator == Token::SHL ?
-			m_utils.typedShiftLeftFunction(_value.type(), *amountType) :
-			m_utils.typedShiftRightFunction(_value.type(), *amountType)
-		)
-		("value", _value.name())
-		("amount", _amountToShift.name())
-		.render();
-}
-
-void IRGeneratorForStatements::appendAndOrOperatorCode(BinaryOperation const& _binOp)
-{
-	langutil::Token const op = _binOp.getOperator();
-	solAssert(op == Token::Or || op == Token::And);
-
-	_binOp.leftExpression().accept(*this);
-	setLocation(_binOp);
-
-	IRVariable value(_binOp);
-	define(value, _binOp.leftExpression());
-	if (op == Token::Or)
-		appendCode() << "if iszero(" << value.name() << ") {\n";
-	else
-		appendCode() << "if " << value.name() << " {\n";
-	_binOp.rightExpression().accept(*this);
-	setLocation(_binOp);
-	assign(value, _binOp.rightExpression());
-	appendCode() << "}\n";
-}
-
-void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable const& _value)
-{
-	std::visit(
-		util::GenericVisitor{
-			[&](IRLValue::Storage const& _storage) {
-				std::string offsetArgument;
-				std::optional<unsigned> offsetStatic;
-
-				std::visit(GenericVisitor{
-					[&](unsigned _offset) { offsetStatic = _offset; },
-					[&](std::string const& _offset) { offsetArgument = ", " + _offset; }
-				}, _storage.offset);
-
-				appendCode() <<
-					m_utils.updateStorageValueFunction(_value.type(), _lvalue.type, offsetStatic) <<
-					"(" <<
-					_storage.slot <<
-					offsetArgument <<
-					_value.commaSeparatedListPrefixed() <<
-					")\n";
-
-			},
-			[&](IRLValue::Memory const& _memory) {
-				if (_lvalue.type.isValueType())
-				{
-					IRVariable prepared(m_context.newYulVariable(), _lvalue.type);
-					define(prepared, _value);
-
-					if (_memory.byteArrayElement)
-					{
-						solAssert(_lvalue.type == *TypeProvider::byte());
-						appendCode() << "mstore8(" + _memory.address + ", byte(0, " + prepared.commaSeparatedList() + "))\n";
-					}
-					else
-						appendCode() << m_utils.writeToMemoryFunction(_lvalue.type) <<
-							"(" <<
-							_memory.address <<
-							", " <<
-							prepared.commaSeparatedList() <<
-							")\n";
-				}
-				else if (auto const* literalType = dynamic_cast<StringLiteralType const*>(&_value.type()))
-				{
-					std::string writeUInt = m_utils.writeToMemoryFunction(*TypeProvider::uint256());
-					appendCode() <<
-						writeUInt <<
-						"(" <<
-						_memory.address <<
-						", " <<
-						m_utils.copyLiteralToMemoryFunction(literalType->value()) + "()" <<
-						")\n";
-				}
-				else
-				{
-					solAssert(_lvalue.type.sizeOnStack() == 1);
-					auto const* valueReferenceType = dynamic_cast<ReferenceType const*>(&_value.type());
-					solAssert(valueReferenceType);
-					if (valueReferenceType->dataStoredIn(DataLocation::Memory))
-						appendCode() << "mstore(" + _memory.address + ", " + _value.part("mpos").name() + ")\n";
-					else
-						appendCode() << "mstore(" + _memory.address + ", " + m_utils.conversionFunction(_value.type(), _lvalue.type) + "(" + _value.commaSeparatedList() + "))\n";
-				}
-			},
-			[&](IRLValue::Stack const& _stack) { assign(_stack.variable, _value); },
-			[&](IRLValue::Immutable const& _immutable)
-			{
-				solUnimplementedAssert(_lvalue.type.isValueType());
-				solUnimplementedAssert(_lvalue.type.sizeOnStack() == 1);
-				solAssert(_lvalue.type == *_immutable.variable->type());
-				size_t memOffset = m_context.immutableMemoryOffset(*_immutable.variable);
-
-				IRVariable prepared(m_context.newYulVariable(), _lvalue.type);
-				define(prepared, _value);
-
-				appendCode() << "mstore(" << std::to_string(memOffset) << ", " << prepared.commaSeparatedList() << ")\n";
-			},
-			[&](IRLValue::Tuple const& _tuple) {
-				auto components = std::move(_tuple.components);
-				for (size_t i = 0; i < components.size(); i++)
-				{
-					size_t idx = components.size() - i - 1;
-					if (components[idx])
-						writeToLValue(*components[idx], _value.tupleComponent(idx));
-				}
-			}
-		},
-		_lvalue.kind
-	);
-}
-
-IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
-{
-	IRVariable result{m_context.newYulVariable(), _lvalue.type};
-	std::visit(GenericVisitor{
-		[&](IRLValue::Storage const& _storage) {
-			if (!_lvalue.type.isValueType())
-				define(result) << _storage.slot << "\n";
-			else if (std::holds_alternative<std::string>(_storage.offset))
-				define(result) <<
-					m_utils.readFromStorageDynamic(_lvalue.type, true) <<
-					"(" <<
-					_storage.slot <<
-					", " <<
-					std::get<std::string>(_storage.offset) <<
-					")\n";
-			else
-				define(result) <<
-					m_utils.readFromStorage(_lvalue.type, std::get<unsigned>(_storage.offset), true) <<
-					"(" <<
-					_storage.slot <<
-					")\n";
-		},
-		[&](IRLValue::Memory const& _memory) {
-			if (_lvalue.type.isValueType())
-				define(result) <<
-					m_utils.readFromMemory(_lvalue.type) <<
-					"(" <<
-					_memory.address <<
-					")\n";
-			else
-				define(result) << "mload(" << _memory.address << ")\n";
-		},
-		[&](IRLValue::Stack const& _stack) {
-			define(result, _stack.variable);
-		},
-		[&](IRLValue::Immutable const& _immutable) {
-			solUnimplementedAssert(_lvalue.type.isValueType());
-			solUnimplementedAssert(_lvalue.type.sizeOnStack() == 1);
-			solAssert(_lvalue.type == *_immutable.variable->type());
-			if (m_context.executionContext() == IRGenerationContext::ExecutionContext::Creation)
-			{
-				std::string readFunction = m_utils.readFromMemory(*_immutable.variable->type());
-				define(result) <<
-					readFunction <<
-					"(" <<
-					std::to_string(m_context.immutableMemoryOffset(*_immutable.variable)) <<
-					")\n";
-			}
-			else
-				define(result) << "loadimmutable(\"" << std::to_string(_immutable.variable->id()) << "\")\n";
-		},
-		[&](IRLValue::Tuple const&) {
-			solAssert(false, "Attempted to read from tuple lvalue.");
-		}
-	}, _lvalue.kind);
-	return result;
-}
-
-void IRGeneratorForStatements::setLValue(Expression const& _expression, IRLValue _lvalue)
-{
-	solAssert(!m_currentLValue);
-
-	if (_expression.annotation().willBeWrittenTo)
-	{
-		m_currentLValue.emplace(std::move(_lvalue));
-		if (_lvalue.type.dataStoredIn(DataLocation::CallData))
-			solAssert(std::holds_alternative<IRLValue::Stack>(_lvalue.kind));
-	}
-	else
-		// Only define the expression, if it will not be written to.
-		define(_expression, readFromLValue(_lvalue));
-}
-
-void IRGeneratorForStatements::generateLoop(
-	Statement const& _body,
-	Expression const* _conditionExpression,
-	Statement const*  _initExpression,
-	ExpressionStatement const* _loopExpression,
-	bool _isDoWhile,
-	bool _isSimpleCounterLoop
-)
-{
-	std::string firstRun;
-
-	if (_isDoWhile)
-	{
-		solAssert(_conditionExpression, "Expected condition for doWhile");
-		firstRun = m_context.newYulVariable();
-		appendCode() << "let " << firstRun << " := 1\n";
-	}
-
-	appendCode() << "for {\n";
-	if (_initExpression)
-		_initExpression->accept(*this);
-	appendCode() << "} 1 {\n";
-	if (_loopExpression)
-	{
-		Arithmetic previousArithmetic = m_context.arithmetic();
-		if (m_optimiserSettings.simpleCounterForLoopUncheckedIncrement && _isSimpleCounterLoop)
-			m_context.setArithmetic(Arithmetic::Wrapping);
-		_loopExpression->accept(*this);
-		m_context.setArithmetic(previousArithmetic);
-	}
-	appendCode() << "}\n";
-	appendCode() << "{\n";
-
-	if (_conditionExpression)
-	{
-		if (_isDoWhile)
-			appendCode() << "if iszero(" << firstRun << ") {\n";
-
-		_conditionExpression->accept(*this);
-		appendCode() <<
-			"if iszero(" <<
-			expressionAsType(*_conditionExpression, *TypeProvider::boolean()) <<
-			") { break }\n";
-
-		if (_isDoWhile)
-			appendCode() << "}\n" << firstRun << " := 0\n";
-	}
-
-	_body.accept(*this);
-
-	appendCode() << "}\n";
-}
-
-Type const& IRGeneratorForStatements::type(Expression const& _expression)
-{
-	solAssert(_expression.annotation().type, "Type of expression not set.");
-	return *_expression.annotation().type;
-}
-
-bool IRGeneratorForStatements::visit(TryStatement const& _tryStatement)
-{
-	Expression const& externalCall = _tryStatement.externalCall();
-	externalCall.accept(*this);
-	setLocation(_tryStatement);
-
-	appendCode() << "switch iszero(" << IRNames::trySuccessConditionVariable(externalCall) << ")\n";
-
-	appendCode() << "case 0 { // success case\n";
-	TryCatchClause const& successClause = *_tryStatement.clauses().front();
-	if (successClause.parameters())
-	{
-		size_t i = 0;
-		for (ASTPointer<VariableDeclaration> const& varDecl: successClause.parameters()->parameters())
-		{
-			solAssert(varDecl);
-			define(m_context.addLocalVariable(*varDecl),
-				successClause.parameters()->parameters().size() == 1 ?
-				IRVariable(externalCall) :
-				IRVariable(externalCall).tupleComponent(i++)
-			);
-		}
-	}
-
-	successClause.block().accept(*this);
-	setLocation(_tryStatement);
-	appendCode() << "}\n";
-
-	appendCode() << "default { // failure case\n";
-	handleCatch(_tryStatement);
-	appendCode() << "}\n";
-
-	return false;
-}
-
-void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
-{
-	setLocation(_tryStatement);
-	std::string const runFallback = m_context.newYulVariable();
-	appendCode() << "let " << runFallback << " := 1\n";
-
-	// This function returns zero on "short returndata". We have to add a success flag
-	// once we implement custom error codes.
-	if (_tryStatement.errorClause() || _tryStatement.panicClause())
-		appendCode() << "switch " << m_utils.returnDataSelectorFunction() << "()\n";
-
-	if (TryCatchClause const* errorClause = _tryStatement.errorClause())
-	{
-		appendCode() << "case " << selectorFromSignatureU32("Error(string)") << " {\n";
-		setLocation(*errorClause);
-		std::string const dataVariable = m_context.newYulVariable();
-		appendCode() << "let " << dataVariable << " := " << m_utils.tryDecodeErrorMessageFunction() << "()\n";
-		appendCode() << "if " << dataVariable << " {\n";
-		appendCode() << runFallback << " := 0\n";
-		if (errorClause->parameters())
-		{
-			solAssert(errorClause->parameters()->parameters().size() == 1);
-			IRVariable const& var = m_context.addLocalVariable(*errorClause->parameters()->parameters().front());
-			define(var) << dataVariable << "\n";
-		}
-		errorClause->accept(*this);
-		setLocation(*errorClause);
-		appendCode() << "}\n";
-		setLocation(_tryStatement);
-		appendCode() << "}\n";
-	}
-	if (TryCatchClause const* panicClause = _tryStatement.panicClause())
-	{
-		appendCode() << "case " << selectorFromSignatureU32("Panic(uint256)") << " {\n";
-		setLocation(*panicClause);
-		std::string const success = m_context.newYulVariable();
-		std::string const code = m_context.newYulVariable();
-		appendCode() << "let " << success << ", " << code << " := " << m_utils.tryDecodePanicDataFunction() << "()\n";
-		appendCode() << "if " << success << " {\n";
-		appendCode() << runFallback << " := 0\n";
-		if (panicClause->parameters())
-		{
-			solAssert(panicClause->parameters()->parameters().size() == 1);
-			IRVariable const& var = m_context.addLocalVariable(*panicClause->parameters()->parameters().front());
-			define(var) << code << "\n";
-		}
-		panicClause->accept(*this);
-		setLocation(*panicClause);
-		appendCode() << "}\n";
-		setLocation(_tryStatement);
-		appendCode() << "}\n";
-	}
-
-	setLocation(_tryStatement);
-	appendCode() << "if " << runFallback << " {\n";
-	if (_tryStatement.fallbackClause())
-		handleCatchFallback(*_tryStatement.fallbackClause());
-	else
-		appendCode() << m_utils.forwardingRevertFunction() << "()\n";
-	setLocation(_tryStatement);
-	appendCode() << "}\n";
-}
-
-void IRGeneratorForStatements::handleCatchFallback(TryCatchClause const& _fallback)
-{
-	setLocation(_fallback);
-	if (_fallback.parameters())
-	{
-		solAssert(m_context.evmVersion().supportsReturndata());
-		solAssert(
-			_fallback.parameters()->parameters().size() == 1 &&
-			_fallback.parameters()->parameters().front() &&
-			*_fallback.parameters()->parameters().front()->annotation().type == *TypeProvider::bytesMemory(),
-			""
-		);
-
-		VariableDeclaration const& paramDecl = *_fallback.parameters()->parameters().front();
-		define(m_context.addLocalVariable(paramDecl)) << m_utils.extractReturndataFunction() << "()\n";
-	}
-	_fallback.accept(*this);
-}
-
-void IRGeneratorForStatements::revertWithError(
-	std::string const& _signature,
-	std::vector<Type const*> const& _parameterTypes,
-	std::vector<ASTPointer<Expression const>> const& _errorArguments
-)
-{
-	Whiskers templ(R"({
-		let <pos> := <allocateUnbounded>()
-		mstore(<pos>, <hash>)
-		let <end> := <encode>(add(<pos>, 4) <argumentVars>)
-		revert(<pos>, sub(<end>, <pos>))
-	})");
-	templ("pos", m_context.newYulVariable());
-	templ("end", m_context.newYulVariable());
-	templ("hash", util::selectorFromSignatureU256(_signature).str());
-	templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-
-	std::vector<std::string> errorArgumentVars;
-	std::vector<Type const*> errorArgumentTypes;
-	for (ASTPointer<Expression const> const& arg: _errorArguments)
-	{
-		errorArgumentVars += IRVariable(*arg).stackSlots();
-		solAssert(arg->annotation().type);
-		errorArgumentTypes.push_back(arg->annotation().type);
-	}
-	templ("argumentVars", joinHumanReadablePrefixed(errorArgumentVars));
-	templ("encode", m_context.abiFunctions().tupleEncoder(errorArgumentTypes, _parameterTypes));
-
-	appendCode() << templ.render();
-}
-
-
-bool IRGeneratorForStatements::visit(TryCatchClause const& _clause)
-{
-	_clause.block().accept(*this);
-	return false;
-}
-
-std::string IRGeneratorForStatements::linkerSymbol(ContractDefinition const& _library) const
-{
-	solAssert(_library.isLibrary());
-	return "linkersymbol(" + util::escapeAndQuoteString(_library.fullyQualifiedName()) + ")";
-}
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.h b/libsolidity/codegen/ir/IRGeneratorForStatements.h
deleted file mode 100644
index f4ce2a7d00a1..000000000000
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that translates Solidity code into Yul at statement level and below.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/codegen/ir/IRLValue.h>
-#include <libsolidity/codegen/ir/IRVariable.h>
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <functional>
-
-namespace solidity::frontend
-{
-
-class IRGenerationContext;
-class YulUtilFunctions;
-
-/**
- * Base class for the statement generator.
- * Encapsulates access to the yul code stream and handles source code locations.
- */
-class IRGeneratorForStatementsBase: public ASTConstVisitor
-{
-public:
-	IRGeneratorForStatementsBase(IRGenerationContext& _context):
-		m_context(_context)
-	{}
-
-	virtual std::string code() const;
-	std::ostringstream& appendCode(bool _addLocationComment = true);
-protected:
-	void setLocation(ASTNode const& _node);
-	langutil::SourceLocation m_currentLocation = {};
-	langutil::SourceLocation m_lastLocation = {};
-	IRGenerationContext& m_context;
-private:
-	std::ostringstream m_code;
-};
-
-/**
- * Component that translates Solidity's AST into Yul at statement level and below.
- * It is an AST visitor that appends to an internal string buffer.
- */
-class IRGeneratorForStatements: public IRGeneratorForStatementsBase
-{
-public:
-	IRGeneratorForStatements(
-		IRGenerationContext& _context,
-		YulUtilFunctions& _utils,
-		OptimiserSettings& _optimiserSettings,
-		std::function<std::string()> _placeholderCallback = {}
-	):
-		IRGeneratorForStatementsBase(_context),
-		m_placeholderCallback(std::move(_placeholderCallback)),
-		m_utils(_utils),
-		m_optimiserSettings(_optimiserSettings)
-	{}
-
-	std::string code() const override;
-
-	/// Generate the code for the statements in the block;
-	void generate(Block const& _block);
-
-	/// Generates code to initialize the given state variable.
-	void initializeStateVar(VariableDeclaration const& _varDecl);
-	/// Generates code to initialize the given local variable.
-	void initializeLocalVar(VariableDeclaration const& _varDecl);
-
-	/// Calculates expression's value and returns variable where it was stored
-	IRVariable evaluateExpression(Expression const& _expression, Type const& _to);
-
-	/// Defines @a _var using the value of @a _value while performing type conversions, if required.
-	void define(IRVariable const& _var, IRVariable const& _value)
-	{
-		bool _declare = true;
-		declareAssign(_var, _value, _declare);
-	}
-
-	/// Defines @a _var using the value of @a _value while performing type conversions, if required.
-	/// It also cleans the value of the variable.
-	void defineAndCleanup(IRVariable const& _var, IRVariable const& _value)
-	{
-		bool _forceCleanup = true;
-		bool _declare = true;
-		declareAssign(_var, _value, _declare, _forceCleanup);
-	}
-
-	/// @returns the name of a function that computes the value of the given constant
-	/// and also generates the function.
-	std::string constantValueFunction(VariableDeclaration const& _constant);
-
-	void endVisit(VariableDeclarationStatement const& _variableDeclaration) override;
-	bool visit(Conditional const& _conditional) override;
-	bool visit(Assignment const& _assignment) override;
-	bool visit(TupleExpression const& _tuple) override;
-	void endVisit(PlaceholderStatement const& _placeholder) override;
-	bool visit(Block const& _block) override;
-	void endVisit(Block const& _block) override;
-	bool visit(IfStatement const& _ifStatement) override;
-	bool visit(ForStatement const& _forStatement) override;
-	bool visit(WhileStatement const& _whileStatement) override;
-	bool visit(Continue const& _continueStatement) override;
-	bool visit(Break const& _breakStatement) override;
-	void endVisit(Return const& _return) override;
-	bool visit(UnaryOperation const& _unaryOperation) override;
-	bool visit(BinaryOperation const& _binOp) override;
-	void endVisit(FunctionCall const& _funCall) override;
-	void endVisit(FunctionCallOptions const& _funCallOptions) override;
-	bool visit(MemberAccess const& _memberAccess) override;
-	void endVisit(MemberAccess const& _memberAccess) override;
-	bool visit(InlineAssembly const& _inlineAsm) override;
-	void endVisit(IndexAccess const& _indexAccess) override;
-	void endVisit(IndexRangeAccess const& _indexRangeAccess) override;
-	void endVisit(Identifier const& _identifier) override;
-	bool visit(Literal const& _literal) override;
-
-	bool visit(TryStatement const& _tryStatement) override;
-	bool visit(TryCatchClause const& _tryCatchClause) override;
-
-private:
-	/// Handles all catch cases of a try statement, except the success-case.
-	void handleCatch(TryStatement const& _tryStatement);
-	void handleCatchFallback(TryCatchClause const& _fallback);
-
-	/// Generates code to revert with an error. The error arguments are assumed to
-	/// be already evaluated and available in local IRVariables, but not yet
-	/// converted.
-	void revertWithError(
-		std::string const& _signature,
-		std::vector<Type const*> const& _parameterTypes,
-		std::vector<ASTPointer<Expression const>> const& _errorArguments
-	);
-
-	void handleVariableReference(
-		VariableDeclaration const& _variable,
-		Expression const& _referencingExpression
-	);
-
-	/// Appends code to call an external function with the given arguments.
-	/// All involved expressions have already been visited.
-	void appendExternalFunctionCall(
-		FunctionCall const& _functionCall,
-		std::vector<ASTPointer<Expression const>> const& _arguments
-	);
-
-	/// Appends code for .call / .delegatecall / .staticcall.
-	/// All involved expressions have already been visited.
-	void appendBareCall(
-		FunctionCall const& _functionCall,
-		std::vector<ASTPointer<Expression const>> const& _arguments
-	);
-
-	/// Requests and assigns the internal ID of the referenced function to the referencing
-	/// expression and adds the function to the internal dispatch.
-	/// If the function is called right away, it does nothing.
-	void assignInternalFunctionIDIfNotCalledDirectly(
-		Expression const& _expression,
-		FunctionDefinition const& _referencedFunction
-	);
-
-	/// Generates the required conversion code and @returns an IRVariable referring to the value of @a _variable
-	IRVariable convert(IRVariable const& _variable, Type const& _to);
-
-	/// Generates the required conversion code and @returns an IRVariable referring to the value of @a _variable
-	/// It also cleans the value of the variable.
-	IRVariable convertAndCleanup(IRVariable const& _from, Type const& _to);
-
-	/// @returns a Yul expression representing the current value of @a _expression,
-	/// converted to type @a _to if it does not yet have that type.
-	std::string expressionAsType(Expression const& _expression, Type const& _to);
-
-	/// @returns a Yul expression representing the current value of @a _expression,
-	/// converted to type @a _to if it does not yet have that type.
-	/// It also cleans the value, in case it already has type @a _to.
-	std::string expressionAsCleanedType(Expression const& _expression, Type const& _to);
-
-	/// @returns an output stream that can be used to define @a _var using a function call or
-	/// single stack slot expression.
-	std::ostream& define(IRVariable const& _var);
-
-	/// Assigns @a _var to the value of @a _value while performing type conversions, if required.
-	void assign(IRVariable const& _var, IRVariable const& _value) { declareAssign(_var, _value, false); }
-	/// Declares variable @a _var.
-	void declare(IRVariable const& _var);
-
-	void declareAssign(IRVariable const& _var, IRVariable const& _value, bool _define, bool _forceCleanup = false);
-
-	/// @returns an IRVariable with the zero
-	/// value of @a _type.
-	/// @param _splitFunctionTypes if false, returns two zeroes
-	IRVariable zeroValue(Type const& _type, bool _splitFunctionTypes = true);
-
-	void appendAndOrOperatorCode(BinaryOperation const& _binOp);
-	void appendSimpleUnaryOperation(UnaryOperation const& _operation, Expression const& _expr);
-
-	/// @returns code to perform the given binary operation in the given type on the two values.
-	std::string binaryOperation(
-		langutil::Token _op,
-		Type const& _type,
-		std::string const& _left,
-		std::string const& _right
-	);
-
-	/// @returns code to perform the given shift operation.
-	/// The operation itself will be performed in the type of the value,
-	/// while the amount to shift can have its own type.
-	std::string shiftOperation(langutil::Token _op, IRVariable const& _value, IRVariable const& _shiftAmount);
-
-	/// Assigns the value of @a _value to the lvalue @a _lvalue.
-	void writeToLValue(IRLValue const& _lvalue, IRVariable const& _value);
-	/// @returns a fresh IR variable containing the value of the lvalue @a _lvalue.
-	IRVariable readFromLValue(IRLValue const& _lvalue);
-
-	/// Stores the given @a _lvalue in m_currentLValue, if it will be written to (willBeWrittenTo). Otherwise
-	/// defines the expression @a _expression by reading the value from @a _lvalue.
-	void setLValue(Expression const& _expression, IRLValue _lvalue);
-	void generateLoop(
-		Statement const& _body,
-		Expression const* _conditionExpression,
-		Statement const*  _initExpression = nullptr,
-		ExpressionStatement const* _loopExpression = nullptr,
-		bool _isDoWhile = false,
-		bool _isSimpleCounterLoop = false
-	);
-
-	static Type const& type(Expression const& _expression);
-
-	std::string linkerSymbol(ContractDefinition const& _library) const;
-
-	std::function<std::string()> m_placeholderCallback;
-	YulUtilFunctions& m_utils;
-	std::optional<IRLValue> m_currentLValue;
-	OptimiserSettings m_optimiserSettings;
-};
-
-}
diff --git a/libsolidity/codegen/ir/IRLValue.h b/libsolidity/codegen/ir/IRLValue.h
deleted file mode 100644
index fef390d4cb89..000000000000
--- a/libsolidity/codegen/ir/IRLValue.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Classes that store locations of lvalues.
- */
-
-#pragma once
-
-#include <libsolidity/codegen/ir/IRVariable.h>
-#include <variant>
-
-namespace solidity::frontend
-{
-
-class Type;
-
-struct IRLValue
-{
-	Type const& type;
-	struct Stack
-	{
-		IRVariable variable;
-	};
-	struct Immutable
-	{
-		VariableDeclaration const* variable = nullptr;
-	};
-	struct Storage
-	{
-		std::string const slot;
-		/// unsigned: Used when the offset is known at compile time, uses optimized
-		///           functions
-		/// string: Used when the offset is determined at run time
-		std::variant<std::string, unsigned> const offset;
-		std::string offsetString() const
-		{
-			if (std::holds_alternative<unsigned>(offset))
-				return std::to_string(std::get<unsigned>(offset));
-			else
-				return std::get<std::string>(offset);
-		}
-	};
-	struct Memory
-	{
-		std::string const address;
-		bool byteArrayElement = false;
-	};
-	struct Tuple
-	{
-		std::vector<std::optional<IRLValue>> components;
-	};
-	std::variant<Stack, Immutable, Storage, Memory, Tuple> kind;
-};
-
-}
diff --git a/libsolidity/codegen/ir/IRVariable.cpp b/libsolidity/codegen/ir/IRVariable.cpp
deleted file mode 100644
index 690ef4fc36c0..000000000000
--- a/libsolidity/codegen/ir/IRVariable.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/codegen/ir/Common.h>
-#include <libsolidity/codegen/ir/IRVariable.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolutil/StringUtils.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::util;
-
-IRVariable::IRVariable(std::string _baseName, Type const& _type):
-	m_baseName(std::move(_baseName)), m_type(_type)
-{
-}
-
-IRVariable::IRVariable(VariableDeclaration const& _declaration):
-	IRVariable(IRNames::localVariable(_declaration), *_declaration.annotation().type)
-{
-	solAssert(!_declaration.isStateVariable(), "");
-}
-
-IRVariable::IRVariable(Expression const& _expression):
-	IRVariable(IRNames::localVariable(_expression), *_expression.annotation().type)
-{
-}
-
-IRVariable IRVariable::part(std::string const& _name) const
-{
-	for (auto const& [itemName, itemType]: m_type.stackItems())
-		if (itemName == _name)
-		{
-			solAssert(itemName.empty() || itemType, "");
-			return IRVariable{suffixedName(itemName), itemType ? *itemType : m_type};
-		}
-	solAssert(false, "Invalid stack item name: " + _name);
-}
-
-bool IRVariable::hasPart(std::string const& _name) const
-{
-	for (auto const& [itemName, itemType]: m_type.stackItems())
-		if (itemName == _name)
-		{
-			solAssert(itemName.empty() || itemType, "");
-			return true;
-		}
-	return false;
-}
-
-std::vector<std::string> IRVariable::stackSlots() const
-{
-	std::vector<std::string> result;
-	for (auto const& [itemName, itemType]: m_type.stackItems())
-		if (itemType)
-		{
-			solAssert(!itemName.empty(), "");
-			solAssert(m_type != *itemType, "");
-			result += IRVariable{suffixedName(itemName), *itemType}.stackSlots();
-		}
-		else
-		{
-			solAssert(itemName.empty(), "");
-			result.emplace_back(m_baseName);
-		}
-	return result;
-}
-
-std::string IRVariable::commaSeparatedList() const
-{
-	return joinHumanReadable(stackSlots());
-}
-
-std::string IRVariable::commaSeparatedListPrefixed() const
-{
-	return joinHumanReadablePrefixed(stackSlots());
-}
-
-std::string IRVariable::name() const
-{
-	solAssert(m_type.sizeOnStack() == 1, "");
-	auto const& [itemName, type] = m_type.stackItems().front();
-	solAssert(!type, "Expected null type for name " + itemName);
-	return suffixedName(itemName);
-}
-
-IRVariable IRVariable::tupleComponent(size_t _i) const
-{
-	solAssert(
-		m_type.category() == Type::Category::Tuple,
-		"Requested tuple component of non-tuple IR variable."
-	);
-	return part(IRNames::tupleComponent(_i));
-}
-
-std::string IRVariable::suffixedName(std::string const& _suffix) const
-{
-	if (_suffix.empty())
-		return m_baseName;
-	else
-		return m_baseName + '_' + _suffix;
-}
diff --git a/libsolidity/codegen/ir/IRVariable.h b/libsolidity/codegen/ir/IRVariable.h
deleted file mode 100644
index 1f403a07da92..000000000000
--- a/libsolidity/codegen/ir/IRVariable.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <optional>
-#include <string>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-class VariableDeclaration;
-class Type;
-class Expression;
-
-/**
- * An IRVariable refers to a set of yul variables that correspond to the stack layout of a Solidity variable or expression
- * of a specific Solidity type. If the Solidity type occupies a single stack slot, the IRVariable refers to a single yul variable.
- * Otherwise the set of yul variables it refers to is (recursively) determined by  @see ``Type::stackItems()``.
- * For example, an IRVariable referring to a dynamically sized calldata array will consist of two parts named
- * ``offset`` and ``length``, whereas an IRVariable referring to a statically sized calldata type, a storage reference
- * type or a memory reference type will contain a single unnamed part containing an offset. An IRVariable referring to
- * a value type will contain a single unnamed part containing the value, an IRVariable referring to a tuple will
- * have the typed tuple components as parts.
- */
-class IRVariable
-{
-public:
-	/// IR variable with explicit base name @a _baseName and type @a _type.
-	IRVariable(std::string _baseName, Type const& _type);
-	/// IR variable referring to the declaration @a _decl.
-	explicit IRVariable(VariableDeclaration const& _decl);
-	/// IR variable referring to the expression @a _expr.
-	/// Intentionally not defined as explicit to allow defining IRVariables for expressions directly via implicit conversions.
-	IRVariable(Expression const& _expression);
-
-	/// @returns the name of the variable, if it occupies a single stack slot (otherwise throws).
-	std::string name() const;
-
-	/// @returns a comma-separated list of the stack slots of the variable.
-	std::string commaSeparatedList() const;
-
-	/// @returns a comma-separated list of the stack slots of the variable that is
-	/// prefixed with a comma, unless it is empty.
-	std::string commaSeparatedListPrefixed() const;
-
-	/// @returns an IRVariable referring to the tuple component @a _i of a tuple variable.
-	IRVariable tupleComponent(std::size_t _i) const;
-
-	/// @returns the type of the variable.
-	Type const& type() const { return m_type; }
-
-	/// @returns an IRVariable referring to the stack component @a _slot of the variable.
-	/// @a _slot must be among the stack slots in ``m_type.stackItems()``.
-	/// The returned IRVariable is itself typed with the type of the stack slot as defined
-	/// in ``m_type.stackItems()`` and may again occupy multiple stack slots.
-	IRVariable part(std::string const& _slot) const;
-
-	/// @returns true if variable contains @a _name component
-	/// @a _name name of the component that is being checked
-	bool hasPart(std::string const& _name) const;
-
-	/// @returns a vector containing the names of the stack slots of the variable.
-	std::vector<std::string> stackSlots() const;
-
-private:
-	/// @returns a name consisting of the base name appended with an underscore and @æ _suffix,
-	/// unless @a _suffix is empty, in which case the base name itself is returned.
-	std::string suffixedName(std::string const& _suffix) const;
-	std::string m_baseName;
-	Type const& m_type;
-};
-
-
-}
diff --git a/libsolidity/codegen/ir/README.md b/libsolidity/codegen/ir/README.md
deleted file mode 100644
index cfabd83b903b..000000000000
--- a/libsolidity/codegen/ir/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# The Solidity to Yul Code Generator
-
-This directory contains the new experimental code generator that
-compiles Solidity to an intermediate representation in Yul
-with EVM dialect.
-
-The main semantic differences to the legacy code generator are the following:
-
-- Arithmetic operations cause a failing assertion if the result is not in range.
-- Resizing a storage array to a length larger than 2**64 causes a failing assertion.
diff --git a/libsolidity/experimental/analysis/Analysis.cpp b/libsolidity/experimental/analysis/Analysis.cpp
deleted file mode 100644
index 672aa4f87958..000000000000
--- a/libsolidity/experimental/analysis/Analysis.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/experimental/analysis/Analysis.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend::experimental;
-
-bool Analysis::check(std::vector<std::shared_ptr<SourceUnit const>> const&)
-{
-	m_errorReporter.error(
-		6547_error,
-		Error::Type::UnimplementedFeatureError,
-		SourceLocation{},
-		"Experimental Analysis is not implemented yet."
-	);
-	return false;
-}
diff --git a/libsolidity/experimental/analysis/Analysis.h b/libsolidity/experimental/analysis/Analysis.h
deleted file mode 100644
index 729ff2b93d33..000000000000
--- a/libsolidity/experimental/analysis/Analysis.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <vector>
-#include <memory>
-
-namespace solidity::frontend
-{
-class SourceUnit;
-}
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend::experimental
-{
-
-class Analysis
-{
-public:
-	Analysis(langutil::ErrorReporter& _errorReporter):
-		m_errorReporter(_errorReporter)
-	{}
-
-	bool check(std::vector<std::shared_ptr<SourceUnit const>> const& _sourceUnits);
-
-private:
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libsolidity/formal/ArraySlicePredicate.cpp b/libsolidity/formal/ArraySlicePredicate.cpp
deleted file mode 100644
index 21d5fb1add29..000000000000
--- a/libsolidity/formal/ArraySlicePredicate.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/ArraySlicePredicate.h>
-
-#include <liblangutil/Exceptions.h>
-
-using namespace solidity;
-using namespace solidity::smtutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::smt;
-
-std::map<std::string, ArraySlicePredicate::SliceData> ArraySlicePredicate::m_slicePredicates;
-
-std::pair<bool, ArraySlicePredicate::SliceData const&> ArraySlicePredicate::create(SortPointer _sort, EncodingContext& _context)
-{
-	solAssert(_sort->kind == Kind::Tuple, "");
-	auto tupleSort = std::dynamic_pointer_cast<TupleSort>(_sort);
-	solAssert(tupleSort, "");
-
-	auto tupleName = tupleSort->name;
-	if (m_slicePredicates.count(tupleName))
-		return {true, m_slicePredicates.at(tupleName)};
-
-	auto sort = tupleSort->components.at(0);
-	solAssert(sort->kind == Kind::Array, "");
-
-	smt::SymbolicArrayVariable aVar{sort, "a_" + tupleName, _context };
-	smt::SymbolicArrayVariable bVar{sort, "b_" + tupleName, _context};
-	smt::SymbolicIntVariable startVar{TypeProvider::uint256(), TypeProvider::uint256(), "start_" + tupleName, _context};
-	smt::SymbolicIntVariable endVar{TypeProvider::uint256(), TypeProvider::uint256(), "end_" + tupleName, _context };
-	smt::SymbolicIntVariable iVar{TypeProvider::uint256(), TypeProvider::uint256(), "i_" + tupleName, _context};
-
-	std::vector<SortPointer> domain{sort, sort, startVar.sort(), endVar.sort()};
-	auto sliceSort = std::make_shared<FunctionSort>(domain, SortProvider::boolSort);
-	Predicate const& slice = *Predicate::create(sliceSort, "array_slice_" + tupleName, PredicateType::Custom, _context);
-
-	domain.emplace_back(iVar.sort());
-	auto predSort = std::make_shared<FunctionSort>(domain, SortProvider::boolSort);
-	Predicate const& header = *Predicate::create(predSort, "array_slice_header_" + tupleName, PredicateType::Custom, _context);
-	Predicate const& loop = *Predicate::create(predSort, "array_slice_loop_" + tupleName, PredicateType::Custom, _context);
-
-	auto a = aVar.elements();
-	auto b = bVar.elements();
-	auto start = startVar.currentValue();
-	auto end = endVar.currentValue();
-	auto i = iVar.currentValue();
-
-	auto rule1 = smtutil::Expression::implies(
-		end > start,
-		header({a, b, start, end, 0})
-	);
-
-	auto rule2 = smtutil::Expression::implies(
-		header({a, b, start, end, i}) && i >= (end - start),
-		slice({a, b, start, end})
-	);
-
-	auto rule3 = smtutil::Expression::implies(
-		header({a, b, start, end, i}) && i >= 0 && i < (end - start),
-		loop({a, b, start, end, i})
-	);
-
-	auto b_i = smtutil::Expression::select(b, i);
-	auto a_start_i = smtutil::Expression::select(a, start + i);
-	auto rule4 = smtutil::Expression::implies(
-		loop({a, b, start, end, i}) && b_i == a_start_i,
-		header({a, b, start, end, i + 1})
-	);
-
-	return {false, m_slicePredicates[tupleName] = {
-		{&slice, &header, &loop},
-		{std::move(rule1), std::move(rule2), std::move(rule3), std::move(rule4)}
-	}};
-}
diff --git a/libsolidity/formal/ArraySlicePredicate.h b/libsolidity/formal/ArraySlicePredicate.h
deleted file mode 100644
index 180a9d1898ed..000000000000
--- a/libsolidity/formal/ArraySlicePredicate.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/Predicate.h>
-#include <libsolidity/formal/SymbolicVariables.h>
-
-#include <libsmtutil/Sorts.h>
-
-#include <vector>
-
-namespace solidity::frontend
-{
-
-/**
- * Contains the set of rules to compute an array slice.
- * Rules:
- * 1. end > start => ArraySliceHeader(a, b, start, end, 0)
- * 2. ArraySliceHeader(a, b, start, end, i) && i >= (end - start) => ArraySlice(a, b, start, end)
- * 3. ArraySliceHeader(a, b, start, end, i) && i >= 0 && i < (end - start) => ArraySliceLoop(a, b, start, end, i)
- * 4. ArraySliceLoop(a, b, start, end, i) && b[i] = a[start + i] => ArraySliceHeader(a, b, start, end, i + 1)
- *
- * The rule to be used by CHC is ArraySlice(a, b, start, end).
- */
-
-struct ArraySlicePredicate
-{
-	/// Contains the predicates and rules created to compute
-	/// array slices for a given sort.
-	struct SliceData
-	{
-		std::vector<Predicate const*> predicates;
-		std::vector<smtutil::Expression> rules;
-	};
-
-	/// @returns a flag representing whether the array slice predicates had already been created before for this sort,
-	/// and the corresponding slice data.
-	static std::pair<bool, SliceData const&> create(smtutil::SortPointer _sort, smt::EncodingContext& _context);
-
-	static void reset() { m_slicePredicates.clear(); }
-
-private:
-	/// Maps a unique sort name to its slice data.
-	static std::map<std::string, SliceData> m_slicePredicates;
-};
-
-}
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
deleted file mode 100644
index b16182af8c88..000000000000
--- a/libsolidity/formal/BMC.cpp
+++ /dev/null
@@ -1,1329 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/BMC.h>
-
-#include <libsolidity/formal/SymbolicTypes.h>
-
-#include <libsmtutil/SMTPortfolio.h>
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/CharStreamProvider.h>
-
-#include <utility>
-
-#ifdef HAVE_Z3_DLOPEN
-#include <z3_version.h>
-#endif
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-BMC::BMC(
-	smt::EncodingContext& _context,
-	UniqueErrorReporter& _errorReporter,
-	UniqueErrorReporter& _unsupportedErrorReporter,
-	std::map<h256, std::string> const& _smtlib2Responses,
-	ReadCallback::Callback const& _smtCallback,
-	ModelCheckerSettings _settings,
-	CharStreamProvider const& _charStreamProvider
-):
-	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
-	m_interface(std::make_unique<smtutil::SMTPortfolio>(
-		_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout, _settings.printQuery
-	))
-{
-	solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
-#if defined (HAVE_Z3) || defined (HAVE_CVC4)
-	if (m_settings.solvers.cvc4 || m_settings.solvers.z3)
-		if (!_smtlib2Responses.empty())
-			m_errorReporter.warning(
-				5622_error,
-				"SMT-LIB2 query responses were given in the auxiliary input, "
-				"but this Solidity binary uses an SMT solver (Z3/CVC4) directly."
-				"These responses will be ignored."
-				"Consider disabling Z3/CVC4 at compilation time in order to use SMT-LIB2 responses."
-			);
-#endif
-}
-
-void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> _solvedTargets)
-{
-	// At this point every enabled solver is available.
-	if (!m_settings.solvers.cvc4 && !m_settings.solvers.smtlib2 && !m_settings.solvers.z3)
-	{
-		m_errorReporter.warning(
-			7710_error,
-			SourceLocation(),
-			"BMC analysis was not possible since no SMT solver was found and enabled."
-			" The accepted solvers for BMC are cvc4 and z3."
-		);
-		return;
-	}
-
-	SMTEncoder::resetSourceAnalysis();
-
-	state().prepareForSourceUnit(_source, false);
-	m_solvedTargets = std::move(_solvedTargets);
-	m_context.setSolver(m_interface.get());
-	m_context.reset();
-	m_context.setAssertionAccumulation(true);
-	m_variableUsage.setFunctionInlining(shouldInlineFunctionCall);
-	createFreeConstants(sourceDependencies(_source));
-	m_unprovedAmt = 0;
-
-	_source.accept(*this);
-
-	if (m_unprovedAmt > 0 && !m_settings.showUnproved)
-		m_errorReporter.warning(
-			2788_error,
-			{},
-			"BMC: " +
-			std::to_string(m_unprovedAmt) +
-			" verification condition(s) could not be proved." +
-			" Enable the model checker option \"show unproved\" to see all of them." +
-			" Consider choosing a specific contract to be verified in order to reduce the solving problems." +
-			" Consider increasing the timeout per query."
-		);
-
-	if (!m_settings.showProvedSafe && !m_safeTargets.empty())
-		m_errorReporter.info(
-			6002_error,
-			"BMC: " +
-			std::to_string(m_safeTargets.size()) +
-			" verification condition(s) proved safe!" +
-			" Enable the model checker option \"show proved safe\" to see all of them."
-		);
-	else if (m_settings.showProvedSafe)
-		for (auto const& [node, targets]: m_safeTargets)
-			for (auto const& target: targets)
-				m_errorReporter.info(
-					2961_error,
-					node->location(),
-					"BMC: " +
-					targetDescription(target) +
-					" check is safe!"
-				);
-
-
-	// If this check is true, Z3 and CVC4 are not available
-	// and the query answers were not provided, since SMTPortfolio
-	// guarantees that SmtLib2Interface is the first solver, if enabled.
-	if (
-		!m_interface->unhandledQueries().empty() &&
-		m_interface->solvers() == 1 &&
-		m_settings.solvers.smtlib2
-	)
-		m_errorReporter.warning(
-			8084_error,
-			SourceLocation(),
-			"BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available."
-			" None of the installed solvers was enabled."
-#ifdef HAVE_Z3_DLOPEN
-			" Install libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION) + " to enable Z3."
-#endif
-		);
-}
-
-bool BMC::shouldInlineFunctionCall(
-	FunctionCall const& _funCall,
-	ContractDefinition const* _scopeContract,
-	ContractDefinition const* _contextContract
-)
-{
-	auto funDef = functionCallToDefinition(_funCall, _scopeContract, _contextContract);
-	if (!funDef || !funDef->isImplemented())
-		return false;
-
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	if (funType.kind() == FunctionType::Kind::External)
-		return isExternalCallToThis(&_funCall.expression());
-	else if (funType.kind() != FunctionType::Kind::Internal)
-		return false;
-
-	return true;
-}
-
-/// AST visitors.
-
-bool BMC::visit(ContractDefinition const& _contract)
-{
-	initContract(_contract);
-
-	SMTEncoder::visit(_contract);
-
-	return false;
-}
-
-void BMC::endVisit(ContractDefinition const& _contract)
-{
-	if (auto constructor = _contract.constructor())
-		constructor->accept(*this);
-	else
-	{
-		/// Visiting implicit constructor - we need a dummy callstack frame
-		pushCallStack({nullptr, nullptr});
-		inlineConstructorHierarchy(_contract);
-		popCallStack();
-		/// Check targets created by state variable initialization.
-		checkVerificationTargets();
-		m_verificationTargets.clear();
-	}
-
-	SMTEncoder::endVisit(_contract);
-}
-
-bool BMC::visit(FunctionDefinition const& _function)
-{
-	// Free functions need to be visited in the context of a contract.
-	if (!m_currentContract)
-		return false;
-
-	auto contract = dynamic_cast<ContractDefinition const*>(_function.scope());
-	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
-	if (contract && find(hierarchy.begin(), hierarchy.end(), contract) == hierarchy.end())
-		createStateVariables(*contract);
-
-	if (m_callStack.empty())
-	{
-		reset();
-		initFunction(_function);
-		if (_function.isConstructor() || _function.isPublic())
-			m_context.addAssertion(state().txTypeConstraints() && state().txFunctionConstraints(_function));
-		resetStateVariables();
-	}
-
-	if (_function.isConstructor())
-	{
-		solAssert(contract, "");
-		inlineConstructorHierarchy(*contract);
-	}
-
-	/// Already visits the children.
-	SMTEncoder::visit(_function);
-
-	return false;
-}
-
-void BMC::endVisit(FunctionDefinition const& _function)
-{
-	// Free functions need to be visited in the context of a contract.
-	if (!m_currentContract)
-		return;
-
-	if (isRootFunction())
-	{
-		checkVerificationTargets();
-		m_verificationTargets.clear();
-		m_pathConditions.clear();
-	}
-
-	SMTEncoder::endVisit(_function);
-}
-
-bool BMC::visit(IfStatement const& _node)
-{
-	auto indicesBeforePush = copyVariableIndices();
-	// This check needs to be done in its own context otherwise
-	// constraints from the If body might influence it.
-	m_context.pushSolver();
-	_node.condition().accept(*this);
-
-	// We ignore called functions here because they have
-	// specific input values.
-	if (isRootFunction() && !isInsideLoop())
-		addVerificationTarget(
-			VerificationTargetType::ConstantCondition,
-			expr(_node.condition()),
-			&_node.condition()
-		);
-	m_context.popSolver();
-	resetVariableIndices(std::move(indicesBeforePush));
-
-	_node.condition().accept(*this);
-	auto conditionExpr = expr(_node.condition());
-	// visit true branch
-	auto [indicesEndTrue, trueEndPathCondition] = visitBranch(&_node.trueStatement(), conditionExpr);
-
-	// visit false branch
-	decltype(indicesEndTrue) indicesEndFalse;
-	auto falseEndPathCondition = currentPathConditions() && !conditionExpr;
-	if (_node.falseStatement())
-		std::tie(indicesEndFalse, falseEndPathCondition) = visitBranch(_node.falseStatement(), !conditionExpr);
-	else
-		indicesEndFalse = copyVariableIndices();
-
-	// merge the information from branches
-	setPathCondition(trueEndPathCondition || falseEndPathCondition);
-	mergeVariables(expr(_node.condition()), indicesEndTrue, indicesEndFalse);
-
-	return false;
-}
-
-bool BMC::visit(Conditional const& _op)
-{
-	auto indicesBeforePush = copyVariableIndices();
-	m_context.pushSolver();
-	_op.condition().accept(*this);
-
-	if (isRootFunction() && !isInsideLoop())
-		addVerificationTarget(
-			VerificationTargetType::ConstantCondition,
-			expr(_op.condition()),
-			&_op.condition()
-		);
-	m_context.popSolver();
-	resetVariableIndices(std::move(indicesBeforePush));
-
-	SMTEncoder::visit(_op);
-
-	return false;
-}
-
-// Unrolls while or do-while loop
-bool BMC::visit(WhileStatement const& _node)
-{
-	unsigned int bmcLoopIterations = m_settings.bmcLoopIterations.value_or(1);
-	smtutil::Expression broke(false);
-	smtutil::Expression loopCondition(true);
-	if (_node.isDoWhile())
-	{
-		for (unsigned int i = 0; i < bmcLoopIterations; ++i)
-		{
-			m_loopCheckpoints.emplace();
-
-			auto indicesBefore = copyVariableIndices();
-			_node.body().accept(*this);
-
-			auto brokeInCurrentIteration = mergeVariablesFromLoopCheckpoints();
-
-			auto indicesBreak = copyVariableIndices();
-			_node.condition().accept(*this);
-			mergeVariables(
-				!brokeInCurrentIteration,
-				copyVariableIndices(),
-				indicesBreak
-			);
-
-			mergeVariables(
-				broke || !loopCondition,
-				indicesBefore,
-				copyVariableIndices()
-			);
-			loopCondition = loopCondition && expr(_node.condition());
-			broke = broke || brokeInCurrentIteration;
-			m_loopCheckpoints.pop();
-		}
-		if (bmcLoopIterations > 0)
-			m_context.addAssertion(!loopCondition || broke);
-	}
-	else {
-		smtutil::Expression loopConditionOnPreviousIterations(true);
-		for (unsigned int i = 0; i < bmcLoopIterations; ++i)
-		{
-			m_loopCheckpoints.emplace();
-			auto indicesBefore = copyVariableIndices();
-			_node.condition().accept(*this);
-			loopCondition = expr(_node.condition());
-
-			auto indicesAfterCondition = copyVariableIndices();
-
-			pushPathCondition(loopCondition);
-			_node.body().accept(*this);
-			popPathCondition();
-
-			auto brokeInCurrentIteration =	mergeVariablesFromLoopCheckpoints();
-
-			// merges indices modified when accepting loop condition that no longer holds
-			mergeVariables(
-				!loopCondition,
-				indicesAfterCondition,
-				copyVariableIndices()
-			);
-
-			// handles breaks in previous iterations
-			// breaks in current iterations are handled when traversing loop checkpoints
-			// handles case when the loop condition no longer holds but bmc loop iterations still unrolls the loop
-			mergeVariables(
-				broke || !loopConditionOnPreviousIterations,
-				indicesBefore,
-				copyVariableIndices()
-			);
-			m_loopCheckpoints.pop();
-			broke = broke || brokeInCurrentIteration;
-			loopConditionOnPreviousIterations = loopConditionOnPreviousIterations && loopCondition;
-		}
-		if (bmcLoopIterations > 0)
-		{
-			//after loop iterations are done, we check the loop condition last final time
-			auto indices = copyVariableIndices();
-			_node.condition().accept(*this);
-			loopCondition = expr(_node.condition());
-			// asseert that the loop is complete
-			m_context.addAssertion(!loopCondition || broke || !loopConditionOnPreviousIterations);
-			mergeVariables(
-				broke || !loopConditionOnPreviousIterations,
-				indices,
-				copyVariableIndices()
-			);
-		}
-	}
-	m_loopExecutionHappened = true;
-	return false;
-}
-
-// Unrolls for loop
-bool BMC::visit(ForStatement const& _node)
-{
-	if (_node.initializationExpression())
-		_node.initializationExpression()->accept(*this);
-
-	smtutil::Expression broke(false);
-	smtutil::Expression forCondition(true);
-	smtutil::Expression forConditionOnPreviousIterations(true);
-	unsigned int bmcLoopIterations = m_settings.bmcLoopIterations.value_or(1);
-	for (unsigned int i = 0; i < bmcLoopIterations; ++i)
-	{
-		auto indicesBefore = copyVariableIndices();
-		if (_node.condition())
-		{
-			_node.condition()->accept(*this);
-			// values in loop condition might change during loop iteration
-			forCondition = expr(*_node.condition());
-		}
-		m_loopCheckpoints.emplace();
-		auto indicesAfterCondition = copyVariableIndices();
-
-		pushPathCondition(forCondition);
-		_node.body().accept(*this);
-
-		auto brokeInCurrentIteration =	mergeVariablesFromLoopCheckpoints();
-
-		// accept loop expression if there was no break
-		if (_node.loopExpression())
-		{
-			auto indicesBreak = copyVariableIndices();
-			_node.loopExpression()->accept(*this);
-			mergeVariables(
-				!brokeInCurrentIteration,
-				copyVariableIndices(),
-				indicesBreak
-			);
-		}
-		popPathCondition();
-
-		// merges indices modified when accepting loop condition that does no longer hold
-		mergeVariables(
-			!forCondition,
-			indicesAfterCondition,
-			copyVariableIndices()
-		);
-
-		// handles breaks in previous iterations
-		// breaks in current iterations are handled when traversing loop checkpoints
-		// handles case when the loop condition no longer holds but bmc loop iterations still unrolls the loop
-		mergeVariables(
-			broke || !forConditionOnPreviousIterations,
-			indicesBefore,
-			copyVariableIndices()
-		);
-		m_loopCheckpoints.pop();
-		broke = broke || brokeInCurrentIteration;
-		forConditionOnPreviousIterations = forConditionOnPreviousIterations && forCondition;
-	}
-	if (bmcLoopIterations > 0)
-	{
-		//after loop iterations are done, we check the loop condition last final time
-		auto indices = copyVariableIndices();
-		if (_node.condition())
-		{
-			_node.condition()->accept(*this);
-			forCondition = expr(*_node.condition());
-		}
-		// asseert that the loop is complete
-		m_context.addAssertion(!forCondition || broke || !forConditionOnPreviousIterations);
-		mergeVariables(
-			broke || !forConditionOnPreviousIterations,
-			indices,
-			copyVariableIndices()
-		);
-	}
-	m_loopExecutionHappened = true;
-	return false;
-}
-
-// merges variables based on loop control statements
-// returns expression indicating whether there was a break in current loop unroll iteration
-smtutil::Expression BMC::mergeVariablesFromLoopCheckpoints()
-{
-	smtutil::Expression continues(false);
-	smtutil::Expression brokeInCurrentIteration(false);
-	for (auto const& loopControl: m_loopCheckpoints.top())
-	{
-		// use SSAs associated with this break statement only if
-		// loop didn't break or continue earlier in the iteration
-		// loop condition is included in break path conditions
-		mergeVariables(
-			!brokeInCurrentIteration && !continues && loopControl.pathConditions,
-			loopControl.variableIndices,
-			copyVariableIndices()
-		);
-		if (loopControl.kind == LoopControlKind::Break)
-			brokeInCurrentIteration =
-				brokeInCurrentIteration || loopControl.pathConditions;
-		else if (loopControl.kind == LoopControlKind::Continue)
-			continues = continues || loopControl.pathConditions;
-	}
-	return brokeInCurrentIteration;
-}
-
-bool BMC::visit(TryStatement const& _tryStatement)
-{
-	FunctionCall const* externalCall = dynamic_cast<FunctionCall const*>(&_tryStatement.externalCall());
-	solAssert(externalCall && externalCall->annotation().tryCall, "");
-
-	externalCall->accept(*this);
-	if (_tryStatement.successClause()->parameters())
-		expressionToTupleAssignment(_tryStatement.successClause()->parameters()->parameters(), *externalCall);
-
-	smtutil::Expression clauseId = m_context.newVariable("clause_choice_" + std::to_string(m_context.newUniqueId()), smtutil::SortProvider::uintSort);
-	auto const& clauses = _tryStatement.clauses();
-	m_context.addAssertion(clauseId >= 0 && clauseId < clauses.size());
-	solAssert(clauses[0].get() == _tryStatement.successClause(), "First clause of TryStatement should be the success clause");
-	std::vector<std::pair<VariableIndices, smtutil::Expression>> clausesVisitResults;
-	for (size_t i = 0; i < clauses.size(); ++i)
-		clausesVisitResults.push_back(visitBranch(clauses[i].get()));
-
-	// merge the information from all clauses
-	smtutil::Expression pathCondition = clausesVisitResults.front().second;
-	auto currentIndices = clausesVisitResults[0].first;
-	for (size_t i = 1; i < clauses.size(); ++i)
-	{
-		mergeVariables(clauseId == i, clausesVisitResults[i].first, currentIndices);
-		currentIndices = copyVariableIndices();
-		pathCondition = pathCondition || clausesVisitResults[i].second;
-	}
-	setPathCondition(pathCondition);
-
-	return false;
-}
-
-bool BMC::visit(Break const&)
-{
-	LoopControl control = {
-		LoopControlKind::Break,
-		currentPathConditions(),
-		copyVariableIndices()
-	};
-	m_loopCheckpoints.top().emplace_back(control);
-	return false;
-}
-
-bool BMC::visit(Continue const&)
-{
-	LoopControl control = {
-		LoopControlKind::Continue,
-		currentPathConditions(),
-		copyVariableIndices()
-	};
-	m_loopCheckpoints.top().emplace_back(control);
-	return false;
-}
-
-void BMC::endVisit(UnaryOperation const& _op)
-{
-	SMTEncoder::endVisit(_op);
-
-	// User-defined operators are essentially function calls.
-	if (auto funDef = *_op.annotation().userDefinedFunction)
-	{
-		std::vector<Expression const*> arguments;
-		arguments.push_back(&_op.subExpression());
-		// pushCallStack and defineExpr inside createReturnedExpression should be called on the expression
-		// in case of a user-defined operator call
-		inlineFunctionCall(funDef, _op, std::nullopt, arguments);
-		return;
-	}
-
-	if (
-		_op.annotation().type->category() == Type::Category::RationalNumber ||
-		_op.annotation().type->category() == Type::Category::FixedPoint
-	)
-		return;
-
-	if (_op.getOperator() == Token::Sub && smt::isInteger(*_op.annotation().type))
-		addVerificationTarget(
-			VerificationTargetType::UnderOverflow,
-			expr(_op),
-			&_op
-		);
-}
-
-void BMC::endVisit(BinaryOperation const& _op)
-{
-	SMTEncoder::endVisit(_op);
-
-	if (auto funDef = *_op.annotation().userDefinedFunction)
-	{
-		std::vector<Expression const*> arguments;
-		arguments.push_back(&_op.leftExpression());
-		arguments.push_back(&_op.rightExpression());
-
-		// pushCallStack and defineExpr inside createReturnedExpression should be called on the expression
-		// in case of a user-defined operator call
-		inlineFunctionCall(funDef, _op, std::nullopt, arguments);
-	}
-}
-
-void BMC::endVisit(FunctionCall const& _funCall)
-{
-	auto functionCallKind = *_funCall.annotation().kind;
-
-	if (functionCallKind != FunctionCallKind::FunctionCall)
-	{
-		SMTEncoder::endVisit(_funCall);
-		return;
-	}
-
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	switch (funType.kind())
-	{
-	case FunctionType::Kind::Assert:
-		visitAssert(_funCall);
-		SMTEncoder::endVisit(_funCall);
-		break;
-	case FunctionType::Kind::Require:
-		visitRequire(_funCall);
-		SMTEncoder::endVisit(_funCall);
-		break;
-	case FunctionType::Kind::Internal:
-	case FunctionType::Kind::External:
-	case FunctionType::Kind::DelegateCall:
-	case FunctionType::Kind::BareCall:
-	case FunctionType::Kind::BareCallCode:
-	case FunctionType::Kind::BareDelegateCall:
-	case FunctionType::Kind::BareStaticCall:
-	case FunctionType::Kind::Creation:
-		SMTEncoder::endVisit(_funCall);
-		internalOrExternalFunctionCall(_funCall);
-		break;
-	case FunctionType::Kind::Send:
-	case FunctionType::Kind::Transfer:
-	{
-		auto value = _funCall.arguments().front();
-		solAssert(value, "");
-		smtutil::Expression thisBalance = state().balance();
-
-		addVerificationTarget(
-			VerificationTargetType::Balance,
-			thisBalance < expr(*value),
-			&_funCall
-		);
-
-		SMTEncoder::endVisit(_funCall);
-		break;
-	}
-	case FunctionType::Kind::KECCAK256:
-	case FunctionType::Kind::ECRecover:
-	case FunctionType::Kind::SHA256:
-	case FunctionType::Kind::RIPEMD160:
-	case FunctionType::Kind::BlockHash:
-	case FunctionType::Kind::AddMod:
-	case FunctionType::Kind::MulMod:
-	case FunctionType::Kind::Unwrap:
-	case FunctionType::Kind::Wrap:
-		[[fallthrough]];
-	default:
-		SMTEncoder::endVisit(_funCall);
-		break;
-	}
-}
-
-void BMC::endVisit(Return const& _return)
-{
-	SMTEncoder::endVisit(_return);
-	setPathCondition(smtutil::Expression(false));
-}
-
-/// Visitor helpers.
-
-void BMC::visitAssert(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() == 1, "");
-	solAssert(args.front()->annotation().type->category() == Type::Category::Bool, "");
-	addVerificationTarget(
-		VerificationTargetType::Assert,
-		expr(*args.front()),
-		&_funCall
-	);
-}
-
-void BMC::visitRequire(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() >= 1, "");
-	solAssert(args.front()->annotation().type->category() == Type::Category::Bool, "");
-	if (isRootFunction() && !isInsideLoop())
-		addVerificationTarget(
-			VerificationTargetType::ConstantCondition,
-			expr(*args.front()),
-			args.front().get()
-		);
-}
-
-void BMC::visitAddMulMod(FunctionCall const& _funCall)
-{
-	solAssert(_funCall.arguments().at(2), "");
-	addVerificationTarget(
-		VerificationTargetType::DivByZero,
-		expr(*_funCall.arguments().at(2)),
-		&_funCall
-	);
-
-	SMTEncoder::visitAddMulMod(_funCall);
-}
-
-void BMC::inlineFunctionCall(
-	FunctionDefinition const* _funDef,
-	Expression const& _callStackExpr,
-	std::optional<Expression const*> _boundArgumentCall,
-	std::vector<Expression const*> const& _arguments
-)
-{
-	solAssert(_funDef, "");
-
-	if (visitedFunction(_funDef))
-	{
-		auto const& returnParams = _funDef->returnParameters();
-		for (auto param: returnParams)
-		{
-			m_context.newValue(*param);
-			m_context.setUnknownValue(*param);
-		}
-	}
-	else
-	{
-		initializeFunctionCallParameters(*_funDef, symbolicArguments(_funDef->parameters(), _arguments, _boundArgumentCall));
-
-		// The reason why we need to pushCallStack here instead of visit(FunctionDefinition)
-		// is that there we don't have `_callStackExpr`.
-		pushCallStack({_funDef, &_callStackExpr});
-		pushPathCondition(currentPathConditions());
-		auto oldChecked = std::exchange(m_checked, true);
-		_funDef->accept(*this);
-		m_checked = oldChecked;
-		popPathCondition();
-	}
-
-	createReturnedExpressions(_funDef, _callStackExpr);
-}
-
-void BMC::inlineFunctionCall(FunctionCall const& _funCall)
-{
-	solAssert(shouldInlineFunctionCall(_funCall, currentScopeContract(), m_currentContract), "");
-
-	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	Expression const* expr = &_funCall.expression();
-	auto funType = dynamic_cast<FunctionType const*>(expr->annotation().type);
-	std::optional<Expression const*> boundArgumentCall =
-		funType->hasBoundFirstArgument() ? std::make_optional(expr) : std::nullopt;
-
-	std::vector<Expression const*> arguments;
-	for (auto& arg: _funCall.sortedArguments())
-		arguments.push_back(&(*arg));
-
-	// pushCallStack and defineExpr inside createReturnedExpression should be called
-	// on the FunctionCall object for the normal function call case
-	inlineFunctionCall(funDef, _funCall, boundArgumentCall, arguments);
-}
-
-void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
-{
-	auto const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	if (shouldInlineFunctionCall(_funCall, currentScopeContract(), m_currentContract))
-		inlineFunctionCall(_funCall);
-	else if (publicGetter(_funCall.expression()))
-	{
-		// Do nothing here.
-		// The processing happens in SMT Encoder, but we need to prevent the resetting of the state variables.
-	}
-	else if (funType.kind() == FunctionType::Kind::Internal)
-		m_unsupportedErrors.warning(
-			5729_error,
-			_funCall.location(),
-			"BMC does not yet implement this type of function call."
-		);
-	else if (funType.kind() == FunctionType::Kind::BareStaticCall)
-	{
-		// Do nothing here.
-		// Neither storage nor balances should be modified.
-	}
-	else
-	{
-		m_externalFunctionCallHappened = true;
-		resetStorageVariables();
-		resetBalances();
-	}
-}
-
-std::pair<smtutil::Expression, smtutil::Expression> BMC::arithmeticOperation(
-	Token _op,
-	smtutil::Expression const& _left,
-	smtutil::Expression const& _right,
-	Type const* _commonType,
-	Expression const& _expression
-)
-{
-	// Unchecked does not disable div by 0 checks.
-	if (_op == Token::Div || _op == Token::Mod)
-		addVerificationTarget(
-			VerificationTargetType::DivByZero,
-			_right,
-			&_expression
-		);
-
-	auto values = SMTEncoder::arithmeticOperation(_op, _left, _right, _commonType, _expression);
-
-	if (!m_checked)
-		return values;
-
-	auto const* intType = dynamic_cast<IntegerType const*>(_commonType);
-	if (!intType)
-		intType = TypeProvider::uint256();
-
-	// Mod does not need underflow/overflow checks.
-	if (_op == Token::Mod)
-		return values;
-
-	VerificationTargetType type;
-	// The order matters here:
-	// If _op is Div and intType is signed, we only care about overflow.
-	if (_op == Token::Div)
-	{
-		if (intType->isSigned())
-			// Signed division can only overflow.
-			type = VerificationTargetType::Overflow;
-		else
-			// Unsigned division cannot underflow/overflow.
-			return values;
-	}
-	else if (intType->isSigned())
-		type = VerificationTargetType::UnderOverflow;
-	else if (_op == Token::Sub)
-		type = VerificationTargetType::Underflow;
-	else if (_op == Token::Add || _op == Token::Mul)
-		type = VerificationTargetType::Overflow;
-	else
-		solAssert(false, "");
-
-	addVerificationTarget(
-		type,
-		values.second,
-		&_expression
-	);
-	return values;
-}
-
-void BMC::reset()
-{
-	m_externalFunctionCallHappened = false;
-	m_loopExecutionHappened = false;
-}
-
-std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> BMC::modelExpressions()
-{
-	std::vector<smtutil::Expression> expressionsToEvaluate;
-	std::vector<std::string> expressionNames;
-	for (auto const& var: m_context.variables())
-		if (var.first->type()->isValueType())
-		{
-			expressionsToEvaluate.emplace_back(currentValue(*var.first));
-			expressionNames.push_back(var.first->name());
-		}
-	for (auto const& var: m_context.globalSymbols())
-	{
-		auto const& type = var.second->type();
-		if (
-			type->isValueType() &&
-			smt::smtKind(*type) != smtutil::Kind::Function
-		)
-		{
-			expressionsToEvaluate.emplace_back(var.second->currentValue());
-			expressionNames.push_back(var.first);
-		}
-	}
-	for (auto const& uf: m_uninterpretedTerms)
-		if (uf->annotation().type->isValueType())
-		{
-			expressionsToEvaluate.emplace_back(expr(*uf));
-			std::string expressionName;
-			if (uf->location().hasText())
-				expressionName = m_charStreamProvider.charStream(*uf->location().sourceName).text(
-					uf->location()
-				);
-			expressionNames.push_back(std::move(expressionName));
-		}
-
-	return {expressionsToEvaluate, expressionNames};
-}
-
-/// Verification targets.
-
-std::string BMC::targetDescription(BMCVerificationTarget const& _target)
-{
-	if (
-		_target.type == VerificationTargetType::Underflow ||
-		_target.type == VerificationTargetType::Overflow
-	)
-	{
-		auto const* intType = dynamic_cast<IntegerType const*>(_target.expression->annotation().type);
-		if (!intType)
-			intType = TypeProvider::uint256();
-
-		if (_target.type == VerificationTargetType::Underflow)
-			return "Underflow (resulting value less than " + formatNumberReadable(intType->minValue()) + ")";
-		return "Overflow (resulting value larger than " + formatNumberReadable(intType->maxValue()) + ")";
-	}
-	else if (_target.type == VerificationTargetType::DivByZero)
-		return "Division by zero";
-	else if (_target.type == VerificationTargetType::Assert)
-		return "Assertion violation";
-	else if (_target.type == VerificationTargetType::Balance)
-		return "Insufficient funds";
-	solAssert(false);
-}
-
-void BMC::checkVerificationTargets()
-{
-	for (auto& target: m_verificationTargets)
-		checkVerificationTarget(target);
-}
-
-void BMC::checkVerificationTarget(BMCVerificationTarget& _target)
-{
-	switch (_target.type)
-	{
-		case VerificationTargetType::ConstantCondition:
-			checkConstantCondition(_target);
-			break;
-		case VerificationTargetType::Underflow:
-			checkUnderflow(_target);
-			break;
-		case VerificationTargetType::Overflow:
-			checkOverflow(_target);
-			break;
-		case VerificationTargetType::UnderOverflow:
-			checkUnderflow(_target);
-			checkOverflow(_target);
-			break;
-		case VerificationTargetType::DivByZero:
-			checkDivByZero(_target);
-			break;
-		case VerificationTargetType::Balance:
-			checkBalance(_target);
-			break;
-		case VerificationTargetType::Assert:
-			checkAssert(_target);
-			break;
-		default:
-			solAssert(false, "");
-	}
-}
-
-void BMC::checkConstantCondition(BMCVerificationTarget& _target)
-{
-	checkBooleanNotConstant(
-		*_target.expression,
-		_target.constraints,
-		_target.value,
-		_target.callStack
-	);
-}
-
-void BMC::checkUnderflow(BMCVerificationTarget& _target)
-{
-	solAssert(
-		_target.type == VerificationTargetType::Underflow ||
-			_target.type == VerificationTargetType::UnderOverflow,
-		""
-	);
-
-	if (
-		m_solvedTargets.count(_target.expression) && (
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::Underflow) ||
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::UnderOverflow)
-		)
-	)
-		return;
-
-	auto const* intType = dynamic_cast<IntegerType const*>(_target.expression->annotation().type);
-	if (!intType)
-		intType = TypeProvider::uint256();
-
-	checkCondition(
-		_target,
-		_target.constraints && _target.value < smt::minValue(*intType),
-		_target.callStack,
-		_target.modelExpressions,
-		_target.expression->location(),
-		4144_error,
-		8312_error,
-		"<result>",
-		&_target.value
-	);
-}
-
-void BMC::checkOverflow(BMCVerificationTarget& _target)
-{
-	solAssert(
-		_target.type == VerificationTargetType::Overflow ||
-			_target.type == VerificationTargetType::UnderOverflow,
-		""
-	);
-
-	if (
-		m_solvedTargets.count(_target.expression) && (
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::Overflow) ||
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::UnderOverflow)
-		)
-	)
-		return;
-
-	auto const* intType = dynamic_cast<IntegerType const*>(_target.expression->annotation().type);
-	if (!intType)
-		intType = TypeProvider::uint256();
-
-	checkCondition(
-		_target,
-		_target.constraints && _target.value > smt::maxValue(*intType),
-		_target.callStack,
-		_target.modelExpressions,
-		_target.expression->location(),
-		2661_error,
-		8065_error,
-		"<result>",
-		&_target.value
-	);
-}
-
-void BMC::checkDivByZero(BMCVerificationTarget& _target)
-{
-	solAssert(_target.type == VerificationTargetType::DivByZero, "");
-
-	if (
-		m_solvedTargets.count(_target.expression) &&
-		m_solvedTargets.at(_target.expression).count(VerificationTargetType::DivByZero)
-	)
-		return;
-
-	checkCondition(
-		_target,
-		_target.constraints && (_target.value == 0),
-		_target.callStack,
-		_target.modelExpressions,
-		_target.expression->location(),
-		3046_error,
-		5272_error,
-		"<result>",
-		&_target.value
-	);
-}
-
-void BMC::checkBalance(BMCVerificationTarget& _target)
-{
-	solAssert(_target.type == VerificationTargetType::Balance, "");
-	checkCondition(
-		_target,
-		_target.constraints && _target.value,
-		_target.callStack,
-		_target.modelExpressions,
-		_target.expression->location(),
-		1236_error,
-		4010_error,
-		"address(this).balance"
-	);
-}
-
-void BMC::checkAssert(BMCVerificationTarget& _target)
-{
-	solAssert(_target.type == VerificationTargetType::Assert, "");
-
-	if (
-		m_solvedTargets.count(_target.expression) &&
-		m_solvedTargets.at(_target.expression).count(_target.type)
-	)
-		return;
-
-	checkCondition(
-		_target,
-		_target.constraints && !_target.value,
-		_target.callStack,
-		_target.modelExpressions,
-		_target.expression->location(),
-		4661_error,
-		7812_error
-	);
-}
-
-void BMC::addVerificationTarget(
-	VerificationTargetType _type,
-	smtutil::Expression const& _value,
-	Expression const* _expression
-)
-{
-	if (!m_settings.targets.has(_type) || (m_currentContract && !shouldAnalyze(*m_currentContract)))
-		return;
-
-	BMCVerificationTarget target{
-		{
-			_type,
-			_value,
-			currentPathConditions() && m_context.assertions()
-		},
-		_expression,
-		m_callStack,
-		modelExpressions()
-	};
-	if (_type == VerificationTargetType::ConstantCondition)
-		checkVerificationTarget(target);
-	else
-		m_verificationTargets.emplace_back(std::move(target));
-}
-
-/// Solving.
-
-void BMC::checkCondition(
-	BMCVerificationTarget const& _target,
-	smtutil::Expression _condition,
-	std::vector<SMTEncoder::CallStackEntry> const& _callStack,
-	std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> const& _modelExpressions,
-	SourceLocation const& _location,
-	ErrorId _errorHappens,
-	ErrorId _errorMightHappen,
-	std::string const& _additionalValueName,
-	smtutil::Expression const* _additionalValue
-)
-{
-	m_interface->push();
-	m_interface->addAssertion(_condition);
-
-	std::vector<smtutil::Expression> expressionsToEvaluate;
-	std::vector<std::string> expressionNames;
-	tie(expressionsToEvaluate, expressionNames) = _modelExpressions;
-	if (!_callStack.empty())
-		if (_additionalValue)
-		{
-			expressionsToEvaluate.emplace_back(*_additionalValue);
-			expressionNames.push_back(_additionalValueName);
-		}
-	smtutil::CheckResult result;
-	std::vector<std::string> values;
-	tie(result, values) = checkSatisfiableAndGenerateModel(expressionsToEvaluate);
-
-	std::string extraComment = SMTEncoder::extraComment();
-	if (m_loopExecutionHappened)
-		extraComment +=
-			"False negatives are possible when unrolling loops.\n"
-			"This is due to the possibility that the BMC loop iteration setting is"
-			" smaller than the actual number of iterations needed to complete a loop.";
-	if (m_externalFunctionCallHappened)
-		extraComment +=
-			"\nNote that external function calls are not inlined,"
-			" even if the source code of the function is available."
-			" This is due to the possibility that the actual called contract"
-			" has the same ABI but implements the function differently.";
-
-	SecondarySourceLocation secondaryLocation{};
-	secondaryLocation.append(extraComment, SourceLocation{});
-
-	switch (result)
-	{
-	case smtutil::CheckResult::SATISFIABLE:
-	{
-		solAssert(!_callStack.empty(), "");
-		std::ostringstream message;
-		message << "BMC: " << targetDescription(_target) << " happens here.";
-
-		std::ostringstream modelMessage;
-		// Sometimes models have complex smtlib2 expressions that SMTLib2Interface fails to parse.
-		if (values.size() == expressionNames.size())
-		{
-			modelMessage << "Counterexample:\n";
-			std::map<std::string, std::string> sortedModel;
-			for (size_t i = 0; i < values.size(); ++i)
-				if (expressionsToEvaluate.at(i).name != values.at(i))
-					sortedModel[expressionNames.at(i)] = values.at(i);
-
-			for (auto const& eval: sortedModel)
-				modelMessage << "  " << eval.first << " = " << eval.second << "\n";
-		}
-
-		m_errorReporter.warning(
-			_errorHappens,
-			_location,
-			message.str(),
-			SecondarySourceLocation().append(modelMessage.str(), SourceLocation{})
-			.append(SMTEncoder::callStackMessage(_callStack))
-			.append(std::move(secondaryLocation))
-		);
-		break;
-	}
-	case smtutil::CheckResult::UNSATISFIABLE:
-	{
-		m_safeTargets[_target.expression].insert(_target);
-		break;
-	}
-	case smtutil::CheckResult::UNKNOWN:
-	{
-		++m_unprovedAmt;
-		if (m_settings.showUnproved)
-			m_errorReporter.warning(_errorMightHappen, _location, "BMC: " + targetDescription(_target) + " might happen here.", secondaryLocation);
-		break;
-	}
-	case smtutil::CheckResult::CONFLICTING:
-		m_errorReporter.warning(1584_error, _location, "BMC: At least two SMT solvers provided conflicting answers. Results might not be sound.");
-		break;
-	case smtutil::CheckResult::ERROR:
-		m_errorReporter.warning(1823_error, _location, "BMC: Error trying to invoke SMT solver.");
-		break;
-	}
-
-	m_interface->pop();
-}
-
-void BMC::checkBooleanNotConstant(
-	Expression const& _condition,
-	smtutil::Expression const& _constraints,
-	smtutil::Expression const& _value,
-	std::vector<SMTEncoder::CallStackEntry> const& _callStack
-)
-{
-	// Do not check for const-ness if this is a constant.
-	if (dynamic_cast<Literal const*>(&_condition))
-		return;
-
-	m_interface->push();
-	m_interface->addAssertion(_constraints && _value);
-	auto positiveResult = checkSatisfiable();
-	m_interface->pop();
-
-	m_interface->push();
-	m_interface->addAssertion(_constraints && !_value);
-	auto negatedResult = checkSatisfiable();
-	m_interface->pop();
-
-	if (positiveResult == smtutil::CheckResult::ERROR || negatedResult == smtutil::CheckResult::ERROR)
-		m_errorReporter.warning(8592_error, _condition.location(), "BMC: Error trying to invoke SMT solver.");
-	else if (positiveResult == smtutil::CheckResult::CONFLICTING || negatedResult == smtutil::CheckResult::CONFLICTING)
-		m_errorReporter.warning(3356_error, _condition.location(), "BMC: At least two SMT solvers provided conflicting answers. Results might not be sound.");
-	else if (positiveResult == smtutil::CheckResult::SATISFIABLE && negatedResult == smtutil::CheckResult::SATISFIABLE)
-	{
-		// everything fine.
-	}
-	else if (positiveResult == smtutil::CheckResult::UNKNOWN || negatedResult == smtutil::CheckResult::UNKNOWN)
-	{
-		// can't do anything.
-	}
-	else if (positiveResult == smtutil::CheckResult::UNSATISFIABLE && negatedResult == smtutil::CheckResult::UNSATISFIABLE)
-		m_errorReporter.warning(2512_error, _condition.location(), "BMC: Condition unreachable.", SMTEncoder::callStackMessage(_callStack));
-	else
-	{
-		std::string description;
-		if (positiveResult == smtutil::CheckResult::SATISFIABLE)
-		{
-			solAssert(negatedResult == smtutil::CheckResult::UNSATISFIABLE, "");
-			description = "BMC: Condition is always true.";
-		}
-		else
-		{
-			solAssert(positiveResult == smtutil::CheckResult::UNSATISFIABLE, "");
-			solAssert(negatedResult == smtutil::CheckResult::SATISFIABLE, "");
-			description = "BMC: Condition is always false.";
-		}
-		m_errorReporter.warning(
-			6838_error,
-			_condition.location(),
-			description,
-			SMTEncoder::callStackMessage(_callStack)
-		);
-	}
-}
-
-std::pair<smtutil::CheckResult, std::vector<std::string>>
-BMC::checkSatisfiableAndGenerateModel(std::vector<smtutil::Expression> const& _expressionsToEvaluate)
-{
-	smtutil::CheckResult result;
-	std::vector<std::string> values;
-	try
-	{
-		if (m_settings.printQuery)
-		{
-			auto portfolio = dynamic_cast<smtutil::SMTPortfolio*>(m_interface.get());
-			std::string smtlibCode = portfolio->dumpQuery(_expressionsToEvaluate);
-			m_errorReporter.info(
-				6240_error,
-				"BMC: Requested query:\n" + smtlibCode
-			);
-		}
-		tie(result, values) = m_interface->check(_expressionsToEvaluate);
-	}
-	catch (smtutil::SolverError const& _e)
-	{
-		std::string description("BMC: Error querying SMT solver");
-		if (_e.comment())
-			description += ": " + *_e.comment();
-		m_errorReporter.warning(8140_error, description);
-		result = smtutil::CheckResult::ERROR;
-	}
-
-	for (std::string& value: values)
-	{
-		try
-		{
-			// Parse and re-format nicely
-			value = formatNumberReadable(bigint(value));
-		}
-		catch (...) { }
-	}
-
-	return make_pair(result, values);
-}
-
-smtutil::CheckResult BMC::checkSatisfiable()
-{
-	return checkSatisfiableAndGenerateModel({}).first;
-}
-
-void BMC::assignment(smt::SymbolicVariable& _symVar, smtutil::Expression const& _value)
-{
-	auto oldVar = _symVar.currentValue();
-	auto newVar = _symVar.increaseIndex();
-	m_context.addAssertion(smtutil::Expression::ite(
-		currentPathConditions(),
-		newVar == _value,
-		newVar == oldVar
-	));
-}
-
-bool BMC::isInsideLoop() const
-{
-	return !m_loopCheckpoints.empty();
-}
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
deleted file mode 100644
index 9daa1683721c..000000000000
--- a/libsolidity/formal/BMC.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Class that implements an SMT-based Bounded Model Checker (BMC).
- * Traverses the AST such that:
- * - Loops are unrolled
- * - Internal function calls are inlined
- * Creates verification targets for:
- * - Underflow/Overflow
- * - Constant conditions
- * - Assertions
- */
-
-#pragma once
-
-
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/ModelCheckerSettings.h>
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <libsolidity/interface/ReadFile.h>
-
-#include <libsmtutil/SolverInterface.h>
-#include <liblangutil/UniqueErrorReporter.h>
-
-#include <set>
-#include <string>
-#include <vector>
-
-using solidity::util::h256;
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct ErrorId;
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-
-class BMC: public SMTEncoder
-{
-public:
-	BMC(
-		smt::EncodingContext& _context,
-		langutil::UniqueErrorReporter& _errorReporter,
-		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
-		std::map<h256, std::string> const& _smtlib2Responses,
-		ReadCallback::Callback const& _smtCallback,
-		ModelCheckerSettings _settings,
-		langutil::CharStreamProvider const& _charStreamProvider
-	);
-
-	void analyze(SourceUnit const& _sources, std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> _solvedTargets);
-
-	/// This is used if the SMT solver is not directly linked into this binary.
-	/// @returns a list of inputs to the SMT solver that were not part of the argument to
-	/// the constructor.
-	std::vector<std::string> unhandledQueries() { return m_interface->unhandledQueries(); }
-
-	/// @returns true if _funCall should be inlined, otherwise false.
-	/// @param _scopeContract The contract that contains the current function being analyzed.
-	/// @param _contextContract The most derived contract, currently being analyzed.
-	static bool shouldInlineFunctionCall(
-		FunctionCall const& _funCall,
-		ContractDefinition const* _scopeContract,
-		ContractDefinition const* _contextContract
-	);
-
-private:
-	/// AST visitors.
-	/// Only nodes that lead to verification targets being built
-	/// or checked are visited.
-	//@{
-	bool visit(ContractDefinition const& _node) override;
-	void endVisit(ContractDefinition const& _node) override;
-	bool visit(FunctionDefinition const& _node) override;
-	void endVisit(FunctionDefinition const& _node) override;
-	bool visit(IfStatement const& _node) override;
-	bool visit(Conditional const& _node) override;
-	bool visit(WhileStatement const& _node) override;
-	bool visit(ForStatement const& _node) override;
-	void endVisit(UnaryOperation const& _node) override;
-	void endVisit(BinaryOperation const& _node) override;
-	void endVisit(FunctionCall const& _node) override;
-	void endVisit(Return const& _node) override;
-	bool visit(TryStatement const& _node) override;
-	bool visit(Break const& _node) override;
-	bool visit(Continue const& _node) override;
-	//@}
-
-	/// Visitor helpers.
-	//@{
-	void visitAssert(FunctionCall const& _funCall);
-	void visitRequire(FunctionCall const& _funCall);
-	void visitAddMulMod(FunctionCall const& _funCall) override;
-	void assignment(smt::SymbolicVariable& _symVar, smtutil::Expression const& _value) override;
-	/// Visits the FunctionDefinition of the called function
-	/// if available and inlines the return value.
-	void inlineFunctionCall(FunctionCall const& _funCall);
-	void inlineFunctionCall(
-		FunctionDefinition const* _funDef,
-		Expression const& _callStackExpr,
-		std::optional<Expression const*> _calledExpr,
-		std::vector<Expression const*> const& _arguments
-	);
-	/// Inlines if the function call is internal or external to `this`.
-	/// Erases knowledge about state variables if external.
-	void internalOrExternalFunctionCall(FunctionCall const& _funCall);
-
-	/// Creates underflow/overflow verification targets.
-	std::pair<smtutil::Expression, smtutil::Expression> arithmeticOperation(
-		Token _op,
-		smtutil::Expression const& _left,
-		smtutil::Expression const& _right,
-		Type const* _commonType,
-		Expression const& _expression
-	) override;
-
-	void reset();
-
-	std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> modelExpressions();
-	//@}
-
-	/// Verification targets.
-	//@{
-	struct BMCVerificationTarget: VerificationTarget
-	{
-		Expression const* expression;
-		std::vector<CallStackEntry> callStack;
-		std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> modelExpressions;
-
-		friend bool operator<(BMCVerificationTarget const& _a, BMCVerificationTarget const& _b)
-		{
-			return _a.expression->id() < _b.expression->id();
-		}
-	};
-
-	std::string targetDescription(BMCVerificationTarget const& _target);
-
-	void checkVerificationTargets();
-	void checkVerificationTarget(BMCVerificationTarget& _target);
-	void checkConstantCondition(BMCVerificationTarget& _target);
-	void checkUnderflow(BMCVerificationTarget& _target);
-	void checkOverflow(BMCVerificationTarget& _target);
-	void checkDivByZero(BMCVerificationTarget& _target);
-	void checkBalance(BMCVerificationTarget& _target);
-	void checkAssert(BMCVerificationTarget& _target);
-	void addVerificationTarget(
-		VerificationTargetType _type,
-		smtutil::Expression const& _value,
-		Expression const* _expression
-	);
-	//@}
-
-	/// Solver related.
-	//@{
-	/// Check that a condition can be satisfied.
-	void checkCondition(
-		BMCVerificationTarget const& _target,
-		smtutil::Expression _condition,
-		std::vector<CallStackEntry> const& _callStack,
-		std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> const& _modelExpressions,
-		langutil::SourceLocation const& _location,
-		langutil::ErrorId _errorHappens,
-		langutil::ErrorId _errorMightHappen,
-		std::string const& _additionalValueName = "",
-		smtutil::Expression const* _additionalValue = nullptr
-	);
-	/// Checks that a boolean condition is not constant. Do not warn if the expression
-	/// is a literal constant.
-	void checkBooleanNotConstant(
-		Expression const& _condition,
-		smtutil::Expression const& _constraints,
-		smtutil::Expression const& _value,
-		std::vector<CallStackEntry> const& _callStack
-	);
-	std::pair<smtutil::CheckResult, std::vector<std::string>>
-	checkSatisfiableAndGenerateModel(std::vector<smtutil::Expression> const& _expressionsToEvaluate);
-
-	smtutil::CheckResult checkSatisfiable();
-	//@}
-
-	smtutil::Expression mergeVariablesFromLoopCheckpoints();
-	bool isInsideLoop() const;
-
-	std::unique_ptr<smtutil::SolverInterface> m_interface;
-
-	/// Flags used for better warning messages.
-	bool m_loopExecutionHappened = false;
-	bool m_externalFunctionCallHappened = false;
-
-	std::vector<BMCVerificationTarget> m_verificationTargets;
-
-	/// Targets proved safe by this engine.
-	std::map<ASTNode const*, std::set<BMCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
-
-	/// Targets that were already proven before this engine started.
-	std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> m_solvedTargets;
-
-	/// Number of verification conditions that could not be proved.
-	size_t m_unprovedAmt = 0;
-
-	enum class LoopControlKind
-	{
-		Continue,
-		Break
-	};
-
-	// Current path conditions and SSA indices for break or continue statement
-	struct LoopControl {
-		LoopControlKind kind;
-		smtutil::Expression pathConditions;
-		VariableIndices variableIndices;
-	};
-
-	// Loop control statements for every loop
-	std::stack<std::vector<LoopControl>> m_loopCheckpoints;
-};
-}
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
deleted file mode 100644
index 3cd1524599df..000000000000
--- a/libsolidity/formal/CHC.cpp
+++ /dev/null
@@ -1,2488 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/CHC.h>
-
-#include <libsolidity/formal/ModelChecker.h>
-
-#ifdef HAVE_Z3
-#include <libsmtutil/Z3CHCInterface.h>
-#endif
-
-#include <libsolidity/formal/ArraySlicePredicate.h>
-#include <libsolidity/formal/Invariants.h>
-#include <libsolidity/formal/PredicateInstance.h>
-#include <libsolidity/formal/PredicateSort.h>
-#include <libsolidity/formal/SymbolicTypes.h>
-
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libsmtutil/CHCSmtLib2Interface.h>
-#include <liblangutil/CharStreamProvider.h>
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/StringUtils.h>
-
-#ifdef HAVE_Z3_DLOPEN
-#include <z3_version.h>
-#endif
-
-#include <boost/algorithm/string.hpp>
-
-#include <range/v3/algorithm/for_each.hpp>
-#include <range/v3/view.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/reverse.hpp>
-
-#include <charconv>
-#include <queue>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::smtutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::smt;
-
-CHC::CHC(
-	EncodingContext& _context,
-	UniqueErrorReporter& _errorReporter,
-	UniqueErrorReporter& _unsupportedErrorReporter,
-	std::map<util::h256, std::string> const& _smtlib2Responses,
-	ReadCallback::Callback const& _smtCallback,
-	ModelCheckerSettings _settings,
-	CharStreamProvider const& _charStreamProvider
-):
-	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
-	m_smtlib2Responses(_smtlib2Responses),
-	m_smtCallback(_smtCallback)
-{
-	solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
-}
-
-void CHC::analyze(SourceUnit const& _source)
-{
-	// At this point every enabled solver is available.
-	if (!m_settings.solvers.eld && !m_settings.solvers.smtlib2 && !m_settings.solvers.z3)
-	{
-		m_errorReporter.warning(
-			7649_error,
-			SourceLocation(),
-			"CHC analysis was not possible since no Horn solver was found and enabled."
-			" The accepted solvers for CHC are Eldarica and z3."
-		);
-		return;
-	}
-
-	if (m_settings.solvers.eld && m_settings.solvers.z3)
-		m_errorReporter.warning(
-			5798_error,
-			SourceLocation(),
-			"Multiple Horn solvers were selected for CHC."
-			" CHC only supports one solver at a time, therefore only z3 will be used."
-			" If you wish to use Eldarica, please enable Eldarica only."
-		);
-
-	if (!shouldAnalyze(_source))
-		return;
-
-	resetSourceAnalysis();
-
-	auto sources = sourceDependencies(_source);
-	collectFreeFunctions(sources);
-	createFreeConstants(sources);
-	state().prepareForSourceUnit(_source, encodeExternalCallsAsTrusted());
-
-	for (auto const* source: sources)
-		defineInterfacesAndSummaries(*source);
-	for (auto const* source: sources)
-		source->accept(*this);
-
-	checkVerificationTargets();
-
-	bool ranSolver = true;
-	// If ranSolver is true here it's because an SMT solver callback was
-	// actually given and the queries were solved,
-	// or Eldarica was chosen and was present in the system.
-	if (auto const* smtLibInterface = dynamic_cast<CHCSmtLib2Interface const*>(m_interface.get()))
-		ranSolver = smtLibInterface->unhandledQueries().empty();
-	if (!ranSolver)
-		m_errorReporter.warning(
-			3996_error,
-			SourceLocation(),
-			"CHC analysis was not possible. No Horn solver was available."
-			" None of the installed solvers was enabled."
-		);
-}
-
-std::vector<std::string> CHC::unhandledQueries() const
-{
-	if (auto smtlib2 = dynamic_cast<CHCSmtLib2Interface const*>(m_interface.get()))
-		return smtlib2->unhandledQueries();
-
-	return {};
-}
-
-bool CHC::visit(ContractDefinition const& _contract)
-{
-	if (!shouldAnalyze(_contract))
-		return false;
-
-	resetContractAnalysis();
-	initContract(_contract);
-	clearIndices(&_contract);
-
-	m_scopes.push_back(&_contract);
-
-	m_stateVariables = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract);
-	solAssert(m_currentContract, "");
-
-	SMTEncoder::visit(_contract);
-	return false;
-}
-
-void CHC::endVisit(ContractDefinition const& _contract)
-{
-	if (!shouldAnalyze(_contract))
-		return;
-
-	for (auto base: _contract.annotation().linearizedBaseContracts)
-	{
-		if (auto constructor = base->constructor())
-			constructor->accept(*this);
-		defineContractInitializer(*base, _contract);
-	}
-
-	auto const& entry = *createConstructorBlock(_contract, "implicit_constructor_entry");
-
-	// In case constructors use uninitialized state variables,
-	// they need to be zeroed.
-	// This is not part of `initialConstraints` because it's only true here,
-	// at the beginning of the deployment routine.
-	smtutil::Expression zeroes(true);
-	for (auto var: stateVariablesIncludingInheritedAndPrivate(_contract))
-		zeroes = zeroes && currentValue(*var) == smt::zeroValue(var->type());
-
-	smtutil::Expression newAddress = encodeExternalCallsAsTrusted() ?
-		!state().addressActive(state().thisAddress()) :
-		smtutil::Expression(true);
-
-	// The contract's address might already have funds before deployment,
-	// so the balance must be at least `msg.value`, but not equals.
-	auto initialBalanceConstraint = state().balance(state().thisAddress()) >= state().txMember("msg.value");
-	addRule(smtutil::Expression::implies(
-		initialConstraints(_contract) && zeroes && newAddress && initialBalanceConstraint,
-		predicate(entry)
-	), entry.functor().name);
-
-	setCurrentBlock(entry);
-
-	if (encodeExternalCallsAsTrusted())
-	{
-		auto const& entryAfterAddress = *createConstructorBlock(_contract, "implicit_constructor_entry_after_address");
-		state().setAddressActive(state().thisAddress(), true);
-
-		connectBlocks(m_currentBlock, predicate(entryAfterAddress));
-		setCurrentBlock(entryAfterAddress);
-	}
-
-	solAssert(!m_errorDest, "");
-	m_errorDest = m_constructorSummaries.at(&_contract);
-	// We need to evaluate the base constructor calls (arguments) from derived -> base
-	auto baseArgs = baseArguments(_contract);
-	for (auto base: _contract.annotation().linearizedBaseContracts)
-		if (base != &_contract)
-		{
-			m_callGraph[&_contract].insert(base);
-
-			auto baseConstructor = base->constructor();
-			if (baseConstructor && baseArgs.count(base))
-			{
-				std::vector<ASTPointer<Expression>> const& args = baseArgs.at(base);
-				auto const& params = baseConstructor->parameters();
-				solAssert(params.size() == args.size(), "");
-				for (unsigned i = 0; i < params.size(); ++i)
-				{
-					args.at(i)->accept(*this);
-					if (params.at(i))
-					{
-						solAssert(m_context.knownVariable(*params.at(i)), "");
-						m_context.addAssertion(currentValue(*params.at(i)) == expr(*args.at(i), params.at(i)->type()));
-					}
-				}
-			}
-		}
-	m_errorDest = nullptr;
-	// Then call initializer_Base from base -> derived
-	for (auto base: _contract.annotation().linearizedBaseContracts | ranges::views::reverse)
-	{
-		errorFlag().increaseIndex();
-		m_context.addAssertion(smt::constructorCall(*m_contractInitializers.at(&_contract).at(base), m_context));
-		connectBlocks(m_currentBlock, summary(_contract), errorFlag().currentValue() > 0);
-		m_context.addAssertion(errorFlag().currentValue() == 0);
-	}
-
-	if (encodeExternalCallsAsTrusted())
-		state().writeStateVars(_contract, state().thisAddress());
-
-	connectBlocks(m_currentBlock, summary(_contract));
-
-	setCurrentBlock(*m_constructorSummaries.at(&_contract));
-
-	solAssert(&_contract == m_currentContract, "");
-	if (shouldAnalyze(_contract))
-	{
-		auto constructor = _contract.constructor();
-		auto txConstraints = state().txTypeConstraints();
-		if (!constructor || !constructor->isPayable())
-			txConstraints = txConstraints && state().txNonPayableConstraint();
-		m_queryPlaceholders[&_contract].push_back({txConstraints, errorFlag().currentValue(), m_currentBlock});
-		connectBlocks(m_currentBlock, interface(), txConstraints && errorFlag().currentValue() == 0);
-	}
-
-	solAssert(m_scopes.back() == &_contract, "");
-	m_scopes.pop_back();
-
-	SMTEncoder::endVisit(_contract);
-}
-
-bool CHC::visit(FunctionDefinition const& _function)
-{
-	// Free functions need to be visited in the context of a contract.
-	if (!m_currentContract)
-		return false;
-
-	if (
-		!_function.isImplemented() ||
-		abstractAsNondet(_function)
-	)
-	{
-		smtutil::Expression conj(true);
-		if (
-			_function.stateMutability() == StateMutability::Pure ||
-			_function.stateMutability() == StateMutability::View
-		)
-			conj = conj && currentEqualInitialVarsConstraints(stateVariablesIncludingInheritedAndPrivate(_function));
-
-		conj = conj && errorFlag().currentValue() == 0;
-		addRule(smtutil::Expression::implies(conj, summary(_function)), "summary_function_" + std::to_string(_function.id()));
-		return false;
-	}
-
-	// No inlining.
-	solAssert(!m_currentFunction, "Function inlining should not happen in CHC.");
-	m_currentFunction = &_function;
-
-	m_scopes.push_back(&_function);
-
-	initFunction(_function);
-
-	auto functionEntryBlock = createBlock(m_currentFunction, PredicateType::FunctionBlock);
-	auto bodyBlock = createBlock(&m_currentFunction->body(), PredicateType::FunctionBlock);
-
-	auto functionPred = predicate(*functionEntryBlock);
-	auto bodyPred = predicate(*bodyBlock);
-
-	addRule(functionPred, functionPred.name);
-
-	solAssert(m_currentContract, "");
-	m_context.addAssertion(initialConstraints(*m_currentContract, &_function));
-
-	connectBlocks(functionPred, bodyPred);
-
-	setCurrentBlock(*bodyBlock);
-
-	solAssert(!m_errorDest, "");
-	m_errorDest = m_summaries.at(m_currentContract).at(&_function);
-	SMTEncoder::visit(*m_currentFunction);
-	m_errorDest = nullptr;
-
-	return false;
-}
-
-void CHC::endVisit(FunctionDefinition const& _function)
-{
-	// Free functions need to be visited in the context of a contract.
-	if (!m_currentContract)
-		return;
-
-	if (
-		!_function.isImplemented() ||
-		abstractAsNondet(_function)
-	)
-		return;
-
-	solAssert(m_currentFunction && m_currentContract, "");
-	// No inlining.
-	solAssert(m_currentFunction == &_function, "");
-
-	solAssert(m_scopes.back() == &_function, "");
-	m_scopes.pop_back();
-
-	connectBlocks(m_currentBlock, summary(_function));
-	setCurrentBlock(*m_summaries.at(m_currentContract).at(&_function));
-
-	// Query placeholders for constructors are not created here because
-	// of contracts without constructors.
-	// Instead, those are created in endVisit(ContractDefinition).
-	if (
-		!_function.isConstructor() &&
-		_function.isPublic() &&
-		contractFunctions(*m_currentContract).count(&_function) &&
-		shouldAnalyze(*m_currentContract)
-	)
-	{
-		defineExternalFunctionInterface(_function, *m_currentContract);
-		setCurrentBlock(*m_interfaces.at(m_currentContract));
-
-		// Create the rule
-		// interface \land externalFunctionEntry => interface'
-		auto ifacePre = smt::interfacePre(*m_interfaces.at(m_currentContract), *m_currentContract, m_context);
-		auto sum = externalSummary(_function);
-
-		m_queryPlaceholders[&_function].push_back({sum, errorFlag().currentValue(), ifacePre});
-		connectBlocks(ifacePre, interface(), sum && errorFlag().currentValue() == 0);
-	}
-
-	m_currentFunction = nullptr;
-
-	SMTEncoder::endVisit(_function);
-}
-
-bool CHC::visit(Block const& _block)
-{
-	m_scopes.push_back(&_block);
-	return SMTEncoder::visit(_block);
-}
-
-void CHC::endVisit(Block const& _block)
-{
-	solAssert(m_scopes.back() == &_block, "");
-	m_scopes.pop_back();
-	SMTEncoder::endVisit(_block);
-}
-
-bool CHC::visit(IfStatement const& _if)
-{
-	solAssert(m_currentFunction, "");
-
-	bool unknownFunctionCallWasSeen = m_unknownFunctionCallSeen;
-	m_unknownFunctionCallSeen = false;
-
-	solAssert(m_currentFunction, "");
-	auto const& functionBody = m_currentFunction->body();
-
-	auto ifHeaderBlock = createBlock(&_if, PredicateType::FunctionBlock, "if_header_");
-	auto trueBlock = createBlock(&_if.trueStatement(), PredicateType::FunctionBlock, "if_true_");
-	auto falseBlock = _if.falseStatement() ? createBlock(_if.falseStatement(), PredicateType::FunctionBlock, "if_false_") : nullptr;
-	auto afterIfBlock = createBlock(&functionBody, PredicateType::FunctionBlock);
-
-	connectBlocks(m_currentBlock, predicate(*ifHeaderBlock));
-
-	setCurrentBlock(*ifHeaderBlock);
-	_if.condition().accept(*this);
-	auto condition = expr(_if.condition());
-
-	connectBlocks(m_currentBlock, predicate(*trueBlock), condition);
-	if (_if.falseStatement())
-		connectBlocks(m_currentBlock, predicate(*falseBlock), !condition);
-	else
-		connectBlocks(m_currentBlock, predicate(*afterIfBlock), !condition);
-
-	setCurrentBlock(*trueBlock);
-	_if.trueStatement().accept(*this);
-	connectBlocks(m_currentBlock, predicate(*afterIfBlock));
-
-	if (_if.falseStatement())
-	{
-		setCurrentBlock(*falseBlock);
-		_if.falseStatement()->accept(*this);
-		connectBlocks(m_currentBlock, predicate(*afterIfBlock));
-	}
-
-	setCurrentBlock(*afterIfBlock);
-
-	if (m_unknownFunctionCallSeen)
-		eraseKnowledge();
-
-	m_unknownFunctionCallSeen = unknownFunctionCallWasSeen;
-
-	return false;
-}
-
-bool CHC::visit(WhileStatement const& _while)
-{
-	bool unknownFunctionCallWasSeen = m_unknownFunctionCallSeen;
-	m_unknownFunctionCallSeen = false;
-
-	solAssert(m_currentFunction, "");
-	auto const& functionBody = m_currentFunction->body();
-
-	auto namePrefix = std::string(_while.isDoWhile() ? "do_" : "") + "while";
-	auto loopHeaderBlock = createBlock(&_while, PredicateType::FunctionBlock, namePrefix + "_header_");
-	auto loopBodyBlock = createBlock(&_while.body(), PredicateType::FunctionBlock, namePrefix + "_body_");
-	auto afterLoopBlock = createBlock(&functionBody, PredicateType::FunctionBlock);
-
-	auto outerBreakDest = m_breakDest;
-	auto outerContinueDest = m_continueDest;
-	m_breakDest = afterLoopBlock;
-	m_continueDest = loopHeaderBlock;
-
-	if (_while.isDoWhile())
-		_while.body().accept(*this);
-
-	connectBlocks(m_currentBlock, predicate(*loopHeaderBlock));
-
-	setCurrentBlock(*loopHeaderBlock);
-
-	_while.condition().accept(*this);
-	auto condition = expr(_while.condition());
-
-	connectBlocks(m_currentBlock, predicate(*loopBodyBlock), condition);
-	connectBlocks(m_currentBlock, predicate(*afterLoopBlock), !condition);
-
-	// Loop body visit.
-	setCurrentBlock(*loopBodyBlock);
-	_while.body().accept(*this);
-
-	m_breakDest = outerBreakDest;
-	m_continueDest = outerContinueDest;
-
-	// Back edge.
-	connectBlocks(m_currentBlock, predicate(*loopHeaderBlock));
-	setCurrentBlock(*afterLoopBlock);
-
-	if (m_unknownFunctionCallSeen)
-		eraseKnowledge();
-
-	m_unknownFunctionCallSeen = unknownFunctionCallWasSeen;
-
-	return false;
-}
-
-bool CHC::visit(ForStatement const& _for)
-{
-	m_scopes.push_back(&_for);
-
-	bool unknownFunctionCallWasSeen = m_unknownFunctionCallSeen;
-	m_unknownFunctionCallSeen = false;
-
-	solAssert(m_currentFunction, "");
-	auto const& functionBody = m_currentFunction->body();
-
-	auto loopHeaderBlock = createBlock(&_for, PredicateType::FunctionBlock, "for_header_");
-	auto loopBodyBlock = createBlock(&_for.body(), PredicateType::FunctionBlock, "for_body_");
-	auto afterLoopBlock = createBlock(&functionBody, PredicateType::FunctionBlock);
-	auto postLoop = _for.loopExpression();
-	auto postLoopBlock = postLoop ? createBlock(postLoop, PredicateType::FunctionBlock, "for_post_") : nullptr;
-
-	auto outerBreakDest = m_breakDest;
-	auto outerContinueDest = m_continueDest;
-	m_breakDest = afterLoopBlock;
-	m_continueDest = postLoop ? postLoopBlock : loopHeaderBlock;
-
-	if (auto init = _for.initializationExpression())
-		init->accept(*this);
-
-	connectBlocks(m_currentBlock, predicate(*loopHeaderBlock));
-	setCurrentBlock(*loopHeaderBlock);
-
-	auto condition = smtutil::Expression(true);
-	if (auto forCondition = _for.condition())
-	{
-		forCondition->accept(*this);
-		condition = expr(*forCondition);
-	}
-
-	connectBlocks(m_currentBlock, predicate(*loopBodyBlock), condition);
-	connectBlocks(m_currentBlock, predicate(*afterLoopBlock), !condition);
-
-	// Loop body visit.
-	setCurrentBlock(*loopBodyBlock);
-	_for.body().accept(*this);
-
-	if (postLoop)
-	{
-		connectBlocks(m_currentBlock, predicate(*postLoopBlock));
-		setCurrentBlock(*postLoopBlock);
-		postLoop->accept(*this);
-	}
-
-	m_breakDest = outerBreakDest;
-	m_continueDest = outerContinueDest;
-
-	// Back edge.
-	connectBlocks(m_currentBlock, predicate(*loopHeaderBlock));
-	setCurrentBlock(*afterLoopBlock);
-
-	if (m_unknownFunctionCallSeen)
-		eraseKnowledge();
-
-	m_unknownFunctionCallSeen = unknownFunctionCallWasSeen;
-
-	return false;
-}
-
-void CHC::endVisit(ForStatement const& _for)
-{
-	solAssert(m_scopes.back() == &_for, "");
-	m_scopes.pop_back();
-}
-
-void CHC::endVisit(UnaryOperation const& _op)
-{
-	SMTEncoder::endVisit(_op);
-
-	if (auto funDef = *_op.annotation().userDefinedFunction)
-	{
-		std::vector<Expression const*> arguments;
-		arguments.push_back(&_op.subExpression());
-		internalFunctionCall(funDef, std::nullopt, _op.userDefinedFunctionType(), arguments, state().thisAddress());
-
-		createReturnedExpressions(funDef, _op);
-	}
-}
-
-void CHC::endVisit(BinaryOperation const& _op)
-{
-	SMTEncoder::endVisit(_op);
-
-	if (auto funDef = *_op.annotation().userDefinedFunction)
-	{
-		std::vector<Expression const*> arguments;
-		arguments.push_back(&_op.leftExpression());
-		arguments.push_back(&_op.rightExpression());
-		internalFunctionCall(funDef, std::nullopt, _op.userDefinedFunctionType(), arguments, state().thisAddress());
-
-		createReturnedExpressions(funDef, _op);
-	}
-}
-
-void CHC::endVisit(FunctionCall const& _funCall)
-{
-	auto functionCallKind = *_funCall.annotation().kind;
-
-	if (functionCallKind != FunctionCallKind::FunctionCall)
-	{
-		SMTEncoder::endVisit(_funCall);
-		return;
-	}
-
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	switch (funType.kind())
-	{
-	case FunctionType::Kind::Assert:
-		visitAssert(_funCall);
-		SMTEncoder::endVisit(_funCall);
-		break;
-	case FunctionType::Kind::Internal:
-		internalFunctionCall(_funCall);
-		break;
-	case FunctionType::Kind::External:
-	case FunctionType::Kind::BareStaticCall:
-	case FunctionType::Kind::BareCall:
-		externalFunctionCall(_funCall);
-		SMTEncoder::endVisit(_funCall);
-		break;
-	case FunctionType::Kind::Creation:
-		visitDeployment(_funCall);
-		break;
-	case FunctionType::Kind::DelegateCall:
-	case FunctionType::Kind::BareCallCode:
-	case FunctionType::Kind::BareDelegateCall:
-		SMTEncoder::endVisit(_funCall);
-		unknownFunctionCall(_funCall);
-		break;
-	case FunctionType::Kind::KECCAK256:
-	case FunctionType::Kind::ECRecover:
-	case FunctionType::Kind::SHA256:
-	case FunctionType::Kind::RIPEMD160:
-	case FunctionType::Kind::BlockHash:
-	case FunctionType::Kind::AddMod:
-	case FunctionType::Kind::MulMod:
-	case FunctionType::Kind::Unwrap:
-	case FunctionType::Kind::Wrap:
-		[[fallthrough]];
-	default:
-		SMTEncoder::endVisit(_funCall);
-		break;
-	}
-
-	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	createReturnedExpressions(funDef, _funCall);
-}
-
-void CHC::endVisit(Break const& _break)
-{
-	solAssert(m_breakDest, "");
-	connectBlocks(m_currentBlock, predicate(*m_breakDest));
-
-	// Add an unreachable ghost node to collect unreachable statements after a break.
-	auto breakGhost = createBlock(&_break, PredicateType::FunctionBlock, "break_ghost_");
-	m_currentBlock = predicate(*breakGhost);
-}
-
-void CHC::endVisit(Continue const& _continue)
-{
-	solAssert(m_continueDest, "");
-	connectBlocks(m_currentBlock, predicate(*m_continueDest));
-
-	// Add an unreachable ghost node to collect unreachable statements after a continue.
-	auto continueGhost = createBlock(&_continue, PredicateType::FunctionBlock, "continue_ghost_");
-	m_currentBlock = predicate(*continueGhost);
-}
-
-void CHC::endVisit(IndexRangeAccess const& _range)
-{
-	createExpr(_range);
-
-	auto baseArray = std::dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(_range.baseExpression()));
-	auto sliceArray = std::dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(_range));
-	solAssert(baseArray && sliceArray, "");
-
-	auto const& sliceData = ArraySlicePredicate::create(sliceArray->sort(), m_context);
-	if (!sliceData.first)
-	{
-		for (auto pred: sliceData.second.predicates)
-			m_interface->registerRelation(pred->functor());
-		for (auto const& rule: sliceData.second.rules)
-			addRule(rule, "");
-	}
-
-	auto start = _range.startExpression() ? expr(*_range.startExpression()) : 0;
-	auto end = _range.endExpression() ? expr(*_range.endExpression()) : baseArray->length();
-	auto slicePred = (*sliceData.second.predicates.at(0))({
-		baseArray->elements(),
-		sliceArray->elements(),
-		start,
-		end
-	});
-
-	m_context.addAssertion(slicePred);
-	m_context.addAssertion(sliceArray->length() == end - start);
-}
-
-void CHC::endVisit(Return const& _return)
-{
-	SMTEncoder::endVisit(_return);
-
-	connectBlocks(m_currentBlock, predicate(*m_returnDests.back()));
-
-	// Add an unreachable ghost node to collect unreachable statements after a return.
-	auto returnGhost = createBlock(&_return, PredicateType::FunctionBlock, "return_ghost_");
-	m_currentBlock = predicate(*returnGhost);
-}
-
-bool CHC::visit(TryCatchClause const& _tryStatement)
-{
-	m_scopes.push_back(&_tryStatement);
-	return SMTEncoder::visit(_tryStatement);
-}
-
-void CHC::endVisit(TryCatchClause const& _tryStatement)
-{
-	solAssert(m_scopes.back() == &_tryStatement, "");
-	m_scopes.pop_back();
-}
-
-bool CHC::visit(TryStatement const& _tryStatement)
-{
-	FunctionCall const* externalCall = dynamic_cast<FunctionCall const*>(&_tryStatement.externalCall());
-	solAssert(externalCall && externalCall->annotation().tryCall, "");
-	solAssert(m_currentFunction, "");
-
-	auto tryHeaderBlock = createBlock(&_tryStatement, PredicateType::FunctionBlock, "try_header_");
-	auto afterTryBlock = createBlock(&m_currentFunction->body(), PredicateType::FunctionBlock);
-
-	auto const& clauses = _tryStatement.clauses();
-	solAssert(clauses[0].get() == _tryStatement.successClause(), "First clause of TryStatement should be the success clause");
-	auto clauseBlocks = applyMap(clauses, [this](ASTPointer<TryCatchClause> clause) {
-		return createBlock(clause.get(), PredicateType::FunctionBlock, "try_clause_" + std::to_string(clause->id()));
-	});
-
-	connectBlocks(m_currentBlock, predicate(*tryHeaderBlock));
-	setCurrentBlock(*tryHeaderBlock);
-	// Visit everything, except the actual external call.
-	externalCall->expression().accept(*this);
-	ASTNode::listAccept(externalCall->arguments(), *this);
-	// Branch directly to all catch clauses, since in these cases, any effects of the external call are reverted.
-	for (size_t i = 1; i < clauseBlocks.size(); ++i)
-		connectBlocks(m_currentBlock, predicate(*clauseBlocks[i]));
-	// Only now visit the actual call to record its effects and connect to the success clause.
-	endVisit(*externalCall);
-	if (_tryStatement.successClause()->parameters())
-		expressionToTupleAssignment(_tryStatement.successClause()->parameters()->parameters(), *externalCall);
-
-	connectBlocks(m_currentBlock, predicate(*clauseBlocks[0]));
-
-	for (size_t i = 0; i < clauses.size(); ++i)
-	{
-		setCurrentBlock(*clauseBlocks[i]);
-		clauses[i]->accept(*this);
-		connectBlocks(m_currentBlock, predicate(*afterTryBlock));
-	}
-	setCurrentBlock(*afterTryBlock);
-
-	return false;
-}
-
-void CHC::pushInlineFrame(CallableDeclaration const& _callable)
-{
-	m_returnDests.push_back(createBlock(&_callable, PredicateType::FunctionBlock, "return_"));
-}
-
-void CHC::popInlineFrame(CallableDeclaration const& _callable)
-{
-	solAssert(!m_returnDests.empty(), "");
-	auto const& ret = *m_returnDests.back();
-	solAssert(ret.programNode() == &_callable, "");
-	connectBlocks(m_currentBlock, predicate(ret));
-	setCurrentBlock(ret);
-	m_returnDests.pop_back();
-}
-
-void CHC::visitAssert(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() == 1, "");
-	solAssert(args.front()->annotation().type->category() == Type::Category::Bool, "");
-
-	solAssert(m_currentContract, "");
-	solAssert(m_currentFunction, "");
-	auto errorCondition = !m_context.expression(*args.front())->currentValue();
-	verificationTargetEncountered(&_funCall, VerificationTargetType::Assert, errorCondition);
-}
-
-void CHC::visitPublicGetter(FunctionCall const& _funCall)
-{
-	createExpr(_funCall);
-	if (encodeExternalCallsAsTrusted())
-	{
-		auto const& access = dynamic_cast<MemberAccess const&>(_funCall.expression());
-		auto const& contractType = dynamic_cast<ContractType const&>(*access.expression().annotation().type);
-		state().writeStateVars(*m_currentContract, state().thisAddress());
-		state().readStateVars(contractType.contractDefinition(), expr(access.expression()));
-	}
-	SMTEncoder::visitPublicGetter(_funCall);
-}
-
-void CHC::visitAddMulMod(FunctionCall const& _funCall)
-{
-	solAssert(_funCall.arguments().at(2), "");
-
-	verificationTargetEncountered(&_funCall, VerificationTargetType::DivByZero, expr(*_funCall.arguments().at(2)) == 0);
-
-	SMTEncoder::visitAddMulMod(_funCall);
-}
-
-void CHC::visitDeployment(FunctionCall const& _funCall)
-{
-	if (!encodeExternalCallsAsTrusted())
-	{
-		SMTEncoder::endVisit(_funCall);
-		unknownFunctionCall(_funCall);
-		return;
-	}
-
-	auto [callExpr, callOptions] = functionCallExpression(_funCall);
-	auto funType = dynamic_cast<FunctionType const*>(callExpr->annotation().type);
-	ContractDefinition const* contract =
-		&dynamic_cast<ContractType const&>(*funType->returnParameterTypes().front()).contractDefinition();
-
-	// copy state variables from m_currentContract to state.storage.
-	state().writeStateVars(*m_currentContract, state().thisAddress());
-	errorFlag().increaseIndex();
-
-	Expression const* value = valueOption(callOptions);
-	if (value)
-		decreaseBalanceFromOptionsValue(*value);
-
-	auto originalTx = state().tx();
-	newTxConstraints(value);
-
-	auto prevThisAddr = state().thisAddress();
-	auto newAddr = state().newThisAddress();
-
-	if (auto constructor = contract->constructor())
-	{
-		auto const& args = _funCall.sortedArguments();
-		auto const& params = constructor->parameters();
-		solAssert(args.size() == params.size(), "");
-		for (auto [arg, param]: ranges::zip_view(args, params))
-			m_context.addAssertion(expr(*arg) == m_context.variable(*param)->currentValue());
-	}
-	for (auto var: stateVariablesIncludingInheritedAndPrivate(*contract))
-		m_context.variable(*var)->increaseIndex();
-	Predicate const& constructorSummary = *m_constructorSummaries.at(contract);
-	m_context.addAssertion(smt::constructorCall(constructorSummary, m_context, false));
-
-	solAssert(m_errorDest, "");
-	connectBlocks(
-		m_currentBlock,
-		predicate(*m_errorDest),
-		errorFlag().currentValue() > 0
-	);
-	m_context.addAssertion(errorFlag().currentValue() == 0);
-
-	m_context.addAssertion(state().newThisAddress() == prevThisAddr);
-
-	// copy state variables from state.storage to m_currentContract.
-	state().readStateVars(*m_currentContract, state().thisAddress());
-
-	state().newTx();
-	m_context.addAssertion(originalTx == state().tx());
-
-	defineExpr(_funCall, newAddr);
-}
-
-void CHC::internalFunctionCall(
-	FunctionDefinition const* _funDef,
-	std::optional<Expression const*> _boundArgumentCall,
-	FunctionType const* _funType,
-	std::vector<Expression const*> const& _arguments,
-	smtutil::Expression _contractAddressValue
-)
-{
-	solAssert(m_currentContract, "");
-	solAssert(_funType, "");
-
-	if (_funDef)
-	{
-		if (m_currentFunction && !m_currentFunction->isConstructor())
-			m_callGraph[m_currentFunction].insert(_funDef);
-		else
-			m_callGraph[m_currentContract].insert(_funDef);
-	}
-
-	m_context.addAssertion(predicate(_funDef, _boundArgumentCall, _funType, _arguments, _contractAddressValue));
-
-	solAssert(m_errorDest, "");
-	connectBlocks(
-		m_currentBlock,
-		predicate(*m_errorDest),
-		errorFlag().currentValue() > 0 && currentPathConditions()
-	);
-	m_context.addAssertion(smtutil::Expression::implies(currentPathConditions(), errorFlag().currentValue() == 0));
-	m_context.addAssertion(errorFlag().increaseIndex() == 0);
-}
-
-void CHC::internalFunctionCall(FunctionCall const& _funCall)
-{
-	solAssert(m_currentContract, "");
-
-	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	if (funDef)
-	{
-		if (m_currentFunction && !m_currentFunction->isConstructor())
-			m_callGraph[m_currentFunction].insert(funDef);
-		else
-			m_callGraph[m_currentContract].insert(funDef);
-	}
-
-	Expression const* calledExpr = &_funCall.expression();
-	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
-
-	auto contractAddressValue = [this](FunctionCall const& _f) {
-		auto [callExpr, callOptions] = functionCallExpression(_f);
-
-		FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
-		if (funType.kind() == FunctionType::Kind::Internal)
-			return state().thisAddress();
-		if (MemberAccess const* callBase = dynamic_cast<MemberAccess const*>(callExpr))
-			return expr(callBase->expression());
-		solAssert(false, "Unreachable!");
-	};
-
-	std::vector<Expression const*> arguments;
-	for (auto& arg: _funCall.sortedArguments())
-		arguments.push_back(&(*arg));
-
-	std::optional<Expression const*> boundArgumentCall =
-		funType->hasBoundFirstArgument() ? std::make_optional(calledExpr) : std::nullopt;
-	internalFunctionCall(funDef, boundArgumentCall, funType, arguments, contractAddressValue(_funCall));
-}
-
-void CHC::addNondetCalls(ContractDefinition const& _contract)
-{
-	for (auto var: _contract.stateVariables())
-		if (auto contractType = dynamic_cast<ContractType const*>(var->type()))
-		{
-			auto const& symbVar = m_context.variable(*var);
-			m_context.addAssertion(symbVar->currentValue() == symbVar->valueAtIndex(0));
-			nondetCall(contractType->contractDefinition(), *var);
-		}
-}
-
-void CHC::nondetCall(ContractDefinition const& _contract, VariableDeclaration const& _var)
-{
-	auto address = m_context.variable(_var)->currentValue();
-	// Load the called contract's state variables from the global state.
-	state().readStateVars(_contract, address);
-
-	m_context.addAssertion(state().state() == state().state(0));
-	auto preCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
-
-	state().newState();
-	for (auto const* var: _contract.stateVariables())
-		m_context.variable(*var)->increaseIndex();
-
-	auto error = errorFlag().increaseIndex();
-
-	Predicate const& callPredicate = *createSymbolicBlock(
-		nondetInterfaceSort(_contract, state()),
-		"nondet_call_" + uniquePrefix(),
-		PredicateType::FunctionSummary,
-		&_var,
-		m_currentContract
-	);
-	auto postCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
-	std::vector<smtutil::Expression> stateExprs{error, address, state().abi(), state().crypto()};
-
-	auto nondet = (*m_nondetInterfaces.at(&_contract))(stateExprs + preCallState + postCallState);
-	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
-
-	addRule(smtutil::Expression::implies(nondet, nondetCall), nondetCall.name);
-
-	m_context.addAssertion(nondetCall);
-
-	// Load the called contract's state variables into the global state.
-	state().writeStateVars(_contract, address);
-}
-
-void CHC::externalFunctionCall(FunctionCall const& _funCall)
-{
-	/// In external function calls we do not add a "predicate call"
-	/// because we do not trust their function body anyway,
-	/// so we just add the nondet_interface predicate.
-
-	solAssert(m_currentContract, "");
-
-	auto [callExpr, callOptions] = functionCallExpression(_funCall);
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
-
-	auto kind = funType.kind();
-	solAssert(
-		kind == FunctionType::Kind::External ||
-		kind == FunctionType::Kind::BareCall ||
-		kind == FunctionType::Kind::BareStaticCall,
-		""
-	);
-
-
-	// Only consider high level external calls in trusted mode.
-	if (
-		kind == FunctionType::Kind::External &&
-		(encodeExternalCallsAsTrusted() || isExternalCallToThis(callExpr))
-	)
-	{
-		externalFunctionCallToTrustedCode(_funCall);
-		return;
-	}
-
-	// Low level calls are still encoded nondeterministically.
-
-	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	if (function)
-		for (auto var: function->returnParameters())
-			m_context.variable(*var)->increaseIndex();
-
-	// If we see a low level call in trusted mode,
-	// we need to havoc the global state.
-	if (
-		kind == FunctionType::Kind::BareCall &&
-		encodeExternalCallsAsTrusted()
-	)
-		state().newStorage();
-
-	// No reentrancy from constructor calls.
-	if (!m_currentFunction || m_currentFunction->isConstructor())
-		return;
-
-	if (Expression const* value = valueOption(callOptions))
-		decreaseBalanceFromOptionsValue(*value);
-
-	auto preCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables();
-
-	if (!usesStaticCall(_funCall))
-	{
-		state().newState();
-		for (auto const* var: m_stateVariables)
-			m_context.variable(*var)->increaseIndex();
-	}
-
-	auto error = errorFlag().increaseIndex();
-
-	Predicate const& callPredicate = *createSymbolicBlock(
-		nondetInterfaceSort(*m_currentContract, state()),
-		"nondet_call_" + uniquePrefix(),
-		PredicateType::ExternalCallUntrusted,
-		&_funCall
-	);
-	auto postCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables();
-	std::vector<smtutil::Expression> stateExprs{error, state().thisAddress(), state().abi(), state().crypto()};
-
-	auto nondet = (*m_nondetInterfaces.at(m_currentContract))(stateExprs + preCallState + postCallState);
-	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
-
-	addRule(smtutil::Expression::implies(nondet, nondetCall), nondetCall.name);
-
-	m_context.addAssertion(nondetCall);
-	solAssert(m_errorDest, "");
-	connectBlocks(m_currentBlock, predicate(*m_errorDest), errorFlag().currentValue() > 0 && currentPathConditions());
-
-	// To capture the possibility of a reentrant call, we record in the call graph that the  current function
-	// can call any of the external methods of the current contract.
-	if (m_currentFunction)
-		for (auto const* definedFunction: contractFunctions(*m_currentContract))
-			if (!definedFunction->isConstructor() && definedFunction->isPublic())
-				m_callGraph[m_currentFunction].insert(definedFunction);
-
-	m_context.addAssertion(errorFlag().currentValue() == 0);
-}
-
-void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
-{
-	if (publicGetter(_funCall.expression()))
-		visitPublicGetter(_funCall);
-
-	solAssert(m_currentContract, "");
-
-	auto [callExpr, callOptions] = functionCallExpression(_funCall);
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
-
-	auto kind = funType.kind();
-	solAssert(kind == FunctionType::Kind::External || kind == FunctionType::Kind::BareStaticCall, "");
-
-	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	if (!function)
-		return;
-
-	// Remember the external call in the call graph to properly detect verification targets for the current function
-	if (m_currentFunction && !m_currentFunction->isConstructor())
-		m_callGraph[m_currentFunction].insert(function);
-	else
-		m_callGraph[m_currentContract].insert(function);
-
-	// External call creates a new transaction.
-	auto originalTx = state().tx();
-	Expression const* value = valueOption(callOptions);
-	newTxConstraints(value);
-
-	auto calledAddress = contractAddressValue(_funCall);
-	if (value)
-	{
-		decreaseBalanceFromOptionsValue(*value);
-		state().addBalance(calledAddress, expr(*value));
-	}
-
-	if (encodeExternalCallsAsTrusted())
-	{
-		// The order here is important!! Write should go first.
-
-		// Load the caller contract's state variables into the global state.
-		state().writeStateVars(*m_currentContract, state().thisAddress());
-		// Load the called contract's state variables from the global state.
-		state().readStateVars(*function->annotation().contract, contractAddressValue(_funCall));
-	}
-
-	std::vector<Expression const*> arguments;
-	for (auto& arg: _funCall.sortedArguments())
-		arguments.push_back(&(*arg));
-	smtutil::Expression pred = predicate(function, std::nullopt, &funType, arguments, calledAddress);
-
-	auto txConstraints = state().txTypeConstraints() && state().txFunctionConstraints(*function);
-	m_context.addAssertion(pred && txConstraints);
-	// restore the original transaction data
-	state().newTx();
-	m_context.addAssertion(originalTx == state().tx());
-
-	solAssert(m_errorDest, "");
-	connectBlocks(
-		m_currentBlock,
-		predicate(*m_errorDest),
-		(errorFlag().currentValue() > 0)
-	);
-	m_context.addAssertion(errorFlag().currentValue() == 0);
-
-	if (!usesStaticCall(_funCall))
-		if (encodeExternalCallsAsTrusted())
-		{
-			// The order here is important!! Write should go first.
-
-			// Load the called contract's state variables into the global state.
-			state().writeStateVars(*function->annotation().contract, contractAddressValue(_funCall));
-			// Load the caller contract's state variables from the global state.
-			state().readStateVars(*m_currentContract, state().thisAddress());
-		}
-}
-
-void CHC::unknownFunctionCall(FunctionCall const&)
-{
-	/// Function calls are not handled at the moment,
-	/// so always erase knowledge.
-	/// TODO remove when function calls get predicates/blocks.
-	eraseKnowledge();
-
-	/// Used to erase outer scope knowledge in loops and ifs.
-	/// TODO remove when function calls get predicates/blocks.
-	m_unknownFunctionCallSeen = true;
-}
-
-void CHC::makeArrayPopVerificationTarget(FunctionCall const& _arrayPop)
-{
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_arrayPop.expression().annotation().type);
-	solAssert(funType.kind() == FunctionType::Kind::ArrayPop, "");
-
-	auto memberAccess = dynamic_cast<MemberAccess const*>(cleanExpression(_arrayPop.expression()));
-	solAssert(memberAccess, "");
-	auto symbArray = std::dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
-	solAssert(symbArray, "");
-
-	verificationTargetEncountered(&_arrayPop, VerificationTargetType::PopEmptyArray, symbArray->length() <= 0);
-}
-
-void CHC::makeOutOfBoundsVerificationTarget(IndexAccess const& _indexAccess)
-{
-	if (_indexAccess.annotation().type->category() == Type::Category::TypeType)
-		return;
-
-	auto baseType = _indexAccess.baseExpression().annotation().type;
-
-	std::optional<smtutil::Expression> length;
-	if (smt::isArray(*baseType))
-		length = dynamic_cast<smt::SymbolicArrayVariable const&>(
-			*m_context.expression(_indexAccess.baseExpression())
-		).length();
-	else if (auto const* type = dynamic_cast<FixedBytesType const*>(baseType))
-		length = smtutil::Expression(static_cast<size_t>(type->numBytes()));
-
-	std::optional<smtutil::Expression> target;
-	if (
-		auto index = _indexAccess.indexExpression();
-		index && length
-	)
-		target = expr(*index) < 0 || expr(*index) >= *length;
-
-	if (target)
-		verificationTargetEncountered(&_indexAccess, VerificationTargetType::OutOfBounds, *target);
-}
-
-std::pair<smtutil::Expression, smtutil::Expression> CHC::arithmeticOperation(
-	Token _op,
-	smtutil::Expression const& _left,
-	smtutil::Expression const& _right,
-	Type const* _commonType,
-	frontend::Expression const& _expression
-)
-{
-	// Unchecked does not disable div by 0 checks.
-	if (_op == Token::Mod || _op == Token::Div)
-		verificationTargetEncountered(&_expression, VerificationTargetType::DivByZero, _right == 0);
-
-	auto values = SMTEncoder::arithmeticOperation(_op, _left, _right, _commonType, _expression);
-
-	if (!m_checked)
-		return values;
-
-	IntegerType const* intType = nullptr;
-	if (auto const* type = dynamic_cast<IntegerType const*>(_commonType))
-		intType = type;
-	else
-		intType = TypeProvider::uint256();
-
-	// Mod does not need underflow/overflow checks.
-	// Div only needs overflow check for signed types.
-	if (_op == Token::Mod || (_op == Token::Div && !intType->isSigned()))
-		return values;
-
-	if (_op == Token::Div)
-		verificationTargetEncountered(&_expression, VerificationTargetType::Overflow, values.second > intType->maxValue());
-	else if (intType->isSigned())
-	{
-		verificationTargetEncountered(&_expression, VerificationTargetType::Underflow, values.second < intType->minValue());
-		verificationTargetEncountered(&_expression, VerificationTargetType::Overflow, values.second > intType->maxValue());
-	}
-	else if (_op == Token::Sub)
-		verificationTargetEncountered(&_expression, VerificationTargetType::Underflow, values.second < intType->minValue());
-	else if (_op == Token::Add || _op == Token::Mul)
-		verificationTargetEncountered(&_expression, VerificationTargetType::Overflow, values.second > intType->maxValue());
-	else
-		solAssert(false, "");
-	return values;
-}
-
-void CHC::resetSourceAnalysis()
-{
-	SMTEncoder::resetSourceAnalysis();
-
-	m_unprovedTargets.clear();
-	m_invariants.clear();
-	m_functionTargetIds.clear();
-	m_verificationTargets.clear();
-	m_queryPlaceholders.clear();
-	m_callGraph.clear();
-	m_summaries.clear();
-	m_externalSummaries.clear();
-	m_interfaces.clear();
-	m_nondetInterfaces.clear();
-	m_constructorSummaries.clear();
-	m_contractInitializers.clear();
-	Predicate::reset();
-	ArraySlicePredicate::reset();
-	m_blockCounter = 0;
-
-	// At this point every enabled solver is available.
-	// If more than one Horn solver is selected we go with z3.
-	// We still need the ifdef because of Z3CHCInterface.
-	if (m_settings.solvers.z3)
-	{
-#ifdef HAVE_Z3
-		// z3::fixedpoint does not have a reset mechanism, so we need to create another.
-		m_interface = std::make_unique<Z3CHCInterface>(m_settings.timeout);
-		auto z3Interface = dynamic_cast<Z3CHCInterface const*>(m_interface.get());
-		solAssert(z3Interface, "");
-		m_context.setSolver(z3Interface->z3Interface());
-#else
-		solAssert(false);
-#endif
-	}
-	if (!m_settings.solvers.z3)
-	{
-		solAssert(m_settings.solvers.smtlib2 || m_settings.solvers.eld);
-
-		if (!m_interface)
-			m_interface = std::make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.solvers, m_settings.timeout);
-
-		auto smtlib2Interface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
-		solAssert(smtlib2Interface, "");
-		smtlib2Interface->reset();
-		m_context.setSolver(smtlib2Interface->smtlib2Interface());
-	}
-
-	m_context.reset();
-	m_context.resetUniqueId();
-	m_context.setAssertionAccumulation(false);
-}
-
-void CHC::resetContractAnalysis()
-{
-	m_stateVariables.clear();
-	m_unknownFunctionCallSeen = false;
-	m_breakDest = nullptr;
-	m_continueDest = nullptr;
-	m_returnDests.clear();
-	errorFlag().resetIndex();
-}
-
-void CHC::eraseKnowledge()
-{
-	resetStorageVariables();
-	resetBalances();
-}
-
-void CHC::clearIndices(ContractDefinition const* _contract, FunctionDefinition const* _function)
-{
-	SMTEncoder::clearIndices(_contract, _function);
-	for (auto const* var: m_stateVariables)
-		/// SSA index 0 is reserved for state variables at the beginning
-		/// of the current transaction.
-		m_context.variable(*var)->increaseIndex();
-	if (_function)
-	{
-		for (auto const& var: _function->parameters() + _function->returnParameters())
-			m_context.variable(*var)->increaseIndex();
-		for (auto const& var: localVariablesIncludingModifiers(*_function, _contract))
-			m_context.variable(*var)->increaseIndex();
-	}
-
-	state().newState();
-}
-
-void CHC::setCurrentBlock(Predicate const& _block)
-{
-	if (m_context.solverStackHeigh() > 0)
-		m_context.popSolver();
-	solAssert(m_currentContract, "");
-	clearIndices(m_currentContract, m_currentFunction);
-	m_context.pushSolver();
-	m_currentBlock = predicate(_block);
-}
-
-std::set<unsigned> CHC::transactionVerificationTargetsIds(ASTNode const* _txRoot)
-{
-	std::set<unsigned> verificationTargetsIds;
-	struct ASTNodeCompare: EncodingContext::IdCompare
-	{
-		bool operator<(ASTNodeCompare _other) const { return operator()(node, _other.node); }
-		ASTNode const* node;
-	};
-	solidity::util::BreadthFirstSearch<ASTNodeCompare>{{{{}, _txRoot}}}.run([&](auto _node, auto&& _addChild) {
-		verificationTargetsIds.insert(m_functionTargetIds[_node.node].begin(), m_functionTargetIds[_node.node].end());
-		for (ASTNode const* called: m_callGraph[_node.node])
-			_addChild({{}, called});
-	});
-	return verificationTargetsIds;
-}
-
-bool CHC::usesStaticCall(FunctionDefinition const* _funDef, FunctionType const* _funType)
-{
-	auto kind = _funType->kind();
-	return (_funDef && (_funDef->stateMutability() == StateMutability::Pure || _funDef->stateMutability() == StateMutability::View)) || kind == FunctionType::Kind::BareStaticCall;
-}
-
-bool CHC::usesStaticCall(FunctionCall const& _funCall)
-{
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	auto kind = funType.kind();
-	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	return (function && (function->stateMutability() == StateMutability::Pure || function->stateMutability() == StateMutability::View)) || kind == FunctionType::Kind::BareStaticCall;
-}
-
-std::optional<CHC::CHCNatspecOption> CHC::natspecOptionFromString(std::string const& _option)
-{
-	static std::map<std::string, CHCNatspecOption> options{
-		{"abstract-function-nondet", CHCNatspecOption::AbstractFunctionNondet}
-	};
-	if (options.count(_option))
-		return options.at(_option);
-	return {};
-}
-
-std::set<CHC::CHCNatspecOption> CHC::smtNatspecTags(FunctionDefinition const& _function)
-{
-	std::set<CHC::CHCNatspecOption> options;
-	std::string smtStr = "custom:smtchecker";
-	bool errorSeen = false;
-	for (auto const& [tag, value]: _function.annotation().docTags)
-		if (tag == smtStr)
-		{
-			std::string const& content = value.content;
-			if (auto option = natspecOptionFromString(content))
-				options.insert(*option);
-			else if (!errorSeen)
-			{
-				errorSeen = true;
-				m_errorReporter.warning(3130_error, _function.location(), "Unknown option for \"" + smtStr + "\": \"" + content + "\"");
-			}
-		}
-	return options;
-}
-
-bool CHC::abstractAsNondet(FunctionDefinition const& _function)
-{
-	return smtNatspecTags(_function).count(CHCNatspecOption::AbstractFunctionNondet);
-}
-
-SortPointer CHC::sort(FunctionDefinition const& _function)
-{
-	return functionBodySort(_function, m_currentContract, state());
-}
-
-bool CHC::encodeExternalCallsAsTrusted()
-{
-	return m_settings.externalCalls.isTrusted();
-}
-
-SortPointer CHC::sort(ASTNode const* _node)
-{
-	if (auto funDef = dynamic_cast<FunctionDefinition const*>(_node))
-		return sort(*funDef);
-
-	solAssert(m_currentFunction, "");
-	return functionBodySort(*m_currentFunction, m_currentContract, state());
-}
-
-Predicate const* CHC::createSymbolicBlock(SortPointer _sort, std::string const& _name, PredicateType _predType, ASTNode const* _node, ContractDefinition const* _contractContext)
-{
-	auto const* block = Predicate::create(_sort, _name, _predType, m_context, _node, _contractContext, m_scopes);
-	m_interface->registerRelation(block->functor());
-	return block;
-}
-
-void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
-{
-	for (auto const& node: _source.nodes())
-		if (auto const* contract = dynamic_cast<ContractDefinition const*>(node.get()))
-		{
-			std::string suffix = contract->name() + "_" + std::to_string(contract->id());
-			m_interfaces[contract] = createSymbolicBlock(interfaceSort(*contract, state()), "interface_" + uniquePrefix() + "_" + suffix, PredicateType::Interface, contract, contract);
-			m_nondetInterfaces[contract] = createSymbolicBlock(nondetInterfaceSort(*contract, state()), "nondet_interface_" + uniquePrefix() + "_" + suffix, PredicateType::NondetInterface, contract, contract);
-			m_constructorSummaries[contract] = createConstructorBlock(*contract, "summary_constructor");
-
-			for (auto const* var: stateVariablesIncludingInheritedAndPrivate(*contract))
-				if (!m_context.knownVariable(*var))
-					createVariable(*var);
-
-			/// Base nondeterministic interface that allows
-			/// 0 steps to be taken, used as base for the inductive
-			/// rule for each function.
-			auto const& iface = *m_nondetInterfaces.at(contract);
-			addRule(smtutil::Expression::implies(errorFlag().currentValue() == 0, smt::nondetInterface(iface, *contract, m_context, 0, 0)), "base_nondet");
-
-			auto const& resolved = contractFunctions(*contract);
-			for (auto const* function: contractFunctionsWithoutVirtual(*contract) + allFreeFunctions())
-			{
-				for (auto var: function->parameters())
-					createVariable(*var);
-				for (auto var: function->returnParameters())
-					createVariable(*var);
-				for (auto const* var: localVariablesIncludingModifiers(*function, contract))
-					createVariable(*var);
-
-				m_summaries[contract].emplace(function, createSummaryBlock(*function, *contract));
-
-				if (
-					!function->isConstructor() &&
-					function->isPublic() &&
-					// Public library functions should have interfaces only for the libraries
-					// they're declared in.
-					(!function->libraryFunction() || (function->scope() == contract)) &&
-					resolved.count(function)
-				)
-				{
-					m_externalSummaries[contract].emplace(function, createSummaryBlock(*function, *contract));
-
-					auto state1 = stateVariablesAtIndex(1, *contract);
-					auto state2 = stateVariablesAtIndex(2, *contract);
-
-					auto errorPre = errorFlag().currentValue();
-					auto nondetPre = smt::nondetInterface(iface, *contract, m_context, 0, 1);
-					auto errorPost = errorFlag().increaseIndex();
-					auto nondetPost = smt::nondetInterface(iface, *contract, m_context, 0, 2);
-
-					std::vector<smtutil::Expression> args{errorPost, state().thisAddress(), state().abi(), state().crypto(), state().tx(), state().state(1)};
-					args += state1 +
-						applyMap(function->parameters(), [this](auto _var) { return valueAtIndex(*_var, 0); }) +
-						std::vector<smtutil::Expression>{state().state(2)} +
-						state2 +
-						applyMap(function->parameters(), [this](auto _var) { return valueAtIndex(*_var, 1); }) +
-						applyMap(function->returnParameters(), [this](auto _var) { return valueAtIndex(*_var, 1); });
-
-					connectBlocks(nondetPre, nondetPost, errorPre == 0 && (*m_externalSummaries.at(contract).at(function))(args));
-				}
-			}
-		}
-}
-
-void CHC::defineExternalFunctionInterface(FunctionDefinition const& _function, ContractDefinition const& _contract)
-{
-	// Create a rule that represents an external call to this function.
-	// This contains more things than the function body itself,
-	// such as balance updates because of ``msg.value``.
-	auto functionEntryBlock = createBlock(&_function, PredicateType::FunctionBlock);
-	auto functionPred = predicate(*functionEntryBlock);
-	addRule(functionPred, functionPred.name);
-	setCurrentBlock(*functionEntryBlock);
-
-	m_context.addAssertion(initialConstraints(_contract, &_function));
-	m_context.addAssertion(state().txTypeConstraints() && state().txFunctionConstraints(_function));
-
-	// The contract may have received funds through a selfdestruct or
-	// block.coinbase, which do not trigger calls into the contract.
-	// So the only constraint we can add here is that the balance of
-	// the contract grows by at least `msg.value`.
-	SymbolicIntVariable k{TypeProvider::uint256(), TypeProvider::uint256(), "funds_" + std::to_string(m_context.newUniqueId()), m_context};
-	m_context.addAssertion(k.currentValue() >= state().txMember("msg.value"));
-	// Assume that address(this).balance cannot overflow.
-	m_context.addAssertion(smt::symbolicUnknownConstraints(state().balance(state().thisAddress()) + k.currentValue(), TypeProvider::uint256()));
-	state().addBalance(state().thisAddress(), k.currentValue());
-
-	if (encodeExternalCallsAsTrusted())
-	{
-		// If the contract has state variables that are addresses to other contracts,
-		// we need to encode the fact that those contracts may have been called in between
-		// transactions to _contract.
-		//
-		// We do that by adding nondet_interface constraints for those contracts,
-		// in the last line of this if block.
-		//
-		// If there are state variables of container types like structs or arrays
-		// that indirectly contain contract types, we havoc the state for simplicity,
-		// in the first part of this block.
-		// TODO: This could actually be supported.
-		// For structs: simply collect the SMT expressions of all the indirect contract type members.
-		// For arrays: more involved, needs to traverse the array symbolically and do the same for each contract.
-		// For mappings: way more complicated if the element type is a contract.
-		auto hasContractOrAddressSubType = [&](VariableDeclaration const* _var) -> bool {
-			bool foundContract = false;
-			solidity::util::BreadthFirstSearch<Type const*> bfs{{_var->type()}};
-			bfs.run([&](auto _type, auto&& _addChild) {
-				if (
-					_type->category() == Type::Category::Address ||
-					_type->category() == Type::Category::Contract
-				)
-				{
-					foundContract = true;
-					bfs.abort();
-				}
-				if (auto const* mapType = dynamic_cast<MappingType const*>(_type))
-					_addChild(mapType->valueType());
-				else if (auto const* arrayType = dynamic_cast<ArrayType const*>(_type))
-					_addChild(arrayType->baseType());
-				else if (auto const* structType = dynamic_cast<StructType const*>(_type))
-					for (auto const& member: structType->nativeMembers(nullptr))
-						_addChild(member.type);
-			});
-			return foundContract;
-		};
-		bool found = false;
-		for (auto var: m_currentContract->stateVariables())
-			if (
-				var->type()->category() != Type::Category::Address &&
-				var->type()->category() != Type::Category::Contract &&
-				hasContractOrAddressSubType(var)
-			)
-			{
-				found = true;
-				break;
-			}
-
-		if (found)
-			state().newStorage();
-		else
-			addNondetCalls(*m_currentContract);
-	}
-
-	errorFlag().increaseIndex();
-	m_context.addAssertion(summaryCall(_function));
-
-	connectBlocks(functionPred, externalSummary(_function));
-}
-
-void CHC::defineContractInitializer(ContractDefinition const& _contract, ContractDefinition const& _contextContract)
-{
-	m_contractInitializers[&_contextContract][&_contract] = createConstructorBlock(_contract, "contract_initializer");
-	auto const& implicitConstructorPredicate = *createConstructorBlock(_contract, "contract_initializer_entry");
-
-	auto implicitFact = smt::constructor(implicitConstructorPredicate, m_context);
-	addRule(smtutil::Expression::implies(initialConstraints(_contract), implicitFact), implicitFact.name);
-	setCurrentBlock(implicitConstructorPredicate);
-
-	auto prevErrorDest = m_errorDest;
-	m_errorDest = m_contractInitializers.at(&_contextContract).at(&_contract);
-	for (auto var: _contract.stateVariables())
-		if (var->value())
-		{
-			var->value()->accept(*this);
-			assignment(*var, *var->value());
-		}
-	m_errorDest = prevErrorDest;
-
-	auto const& afterInit = *createConstructorBlock(_contract, "contract_initializer_after_init");
-	connectBlocks(m_currentBlock, predicate(afterInit));
-	setCurrentBlock(afterInit);
-
-	if (auto constructor = _contract.constructor())
-	{
-		errorFlag().increaseIndex();
-		m_context.addAssertion(smt::functionCall(*m_summaries.at(&_contextContract).at(constructor), &_contextContract, m_context));
-		connectBlocks(m_currentBlock, initializer(_contract, _contextContract), errorFlag().currentValue() > 0);
-		m_context.addAssertion(errorFlag().currentValue() == 0);
-	}
-
-	connectBlocks(m_currentBlock, initializer(_contract, _contextContract));
-}
-
-smtutil::Expression CHC::interface()
-{
-	solAssert(m_currentContract, "");
-	return interface(*m_currentContract);
-}
-
-smtutil::Expression CHC::interface(ContractDefinition const& _contract)
-{
-	return ::interface(*m_interfaces.at(&_contract), _contract, m_context);
-}
-
-smtutil::Expression CHC::error()
-{
-	return (*m_errorPredicate)({});
-}
-
-smtutil::Expression CHC::error(unsigned _idx)
-{
-	return m_errorPredicate->functor(_idx)({});
-}
-
-smtutil::Expression CHC::initializer(ContractDefinition const& _contract, ContractDefinition const& _contractContext)
-{
-	return predicate(*m_contractInitializers.at(&_contractContext).at(&_contract));
-}
-
-smtutil::Expression CHC::summary(ContractDefinition const& _contract)
-{
-	return predicate(*m_constructorSummaries.at(&_contract));
-}
-
-smtutil::Expression CHC::summary(FunctionDefinition const& _function, ContractDefinition const& _contract)
-{
-	return smt::function(*m_summaries.at(&_contract).at(&_function), &_contract, m_context);
-}
-
-smtutil::Expression CHC::summary(FunctionDefinition const& _function)
-{
-	solAssert(m_currentContract, "");
-	return summary(_function, *m_currentContract);
-}
-
-smtutil::Expression CHC::summaryCall(FunctionDefinition const& _function, ContractDefinition const& _contract)
-{
-	return smt::functionCall(*m_summaries.at(&_contract).at(&_function), &_contract, m_context);
-}
-
-smtutil::Expression CHC::summaryCall(FunctionDefinition const& _function)
-{
-	solAssert(m_currentContract, "");
-	return summaryCall(_function, *m_currentContract);
-}
-
-smtutil::Expression CHC::externalSummary(FunctionDefinition const& _function, ContractDefinition const& _contract)
-{
-	return smt::function(*m_externalSummaries.at(&_contract).at(&_function), &_contract, m_context);
-}
-
-smtutil::Expression CHC::externalSummary(FunctionDefinition const& _function)
-{
-	solAssert(m_currentContract, "");
-	return externalSummary(_function, *m_currentContract);
-}
-
-Predicate const* CHC::createBlock(ASTNode const* _node, PredicateType _predType, std::string const& _prefix)
-{
-	auto block = createSymbolicBlock(
-		sort(_node),
-		"block_" + uniquePrefix() + "_" + _prefix + predicateName(_node),
-		_predType,
-		_node,
-		m_currentContract
-	);
-
-	solAssert(m_currentFunction, "");
-	return block;
-}
-
-Predicate const* CHC::createSummaryBlock(FunctionDefinition const& _function, ContractDefinition const& _contract, PredicateType _type)
-{
-	return createSymbolicBlock(
-		functionSort(_function, &_contract, state()),
-		"summary_" + uniquePrefix() + "_" + predicateName(&_function, &_contract),
-		_type,
-		&_function,
-		&_contract
-	);
-}
-
-Predicate const* CHC::createConstructorBlock(ContractDefinition const& _contract, std::string const& _prefix)
-{
-	return createSymbolicBlock(
-		constructorSort(_contract, state()),
-		_prefix + "_" + uniquePrefix() + "_" + contractSuffix(_contract),
-		PredicateType::ConstructorSummary,
-		&_contract,
-		&_contract
-	);
-}
-
-void CHC::createErrorBlock()
-{
-	m_errorPredicate = createSymbolicBlock(
-		arity0FunctionSort(),
-		"error_target_" + std::to_string(m_context.newUniqueId()),
-		PredicateType::Error
-	);
-	m_interface->registerRelation(m_errorPredicate->functor());
-}
-
-void CHC::connectBlocks(smtutil::Expression const& _from, smtutil::Expression const& _to, smtutil::Expression const& _constraints)
-{
-	smtutil::Expression edge = smtutil::Expression::implies(
-		_from && m_context.assertions() && _constraints,
-		_to
-	);
-	addRule(edge, _from.name + "_to_" + _to.name);
-}
-
-smtutil::Expression CHC::initialConstraints(ContractDefinition const& _contract, FunctionDefinition const* _function)
-{
-	smtutil::Expression conj = state().state() == state().state(0);
-	conj = conj && errorFlag().currentValue() == 0;
-	conj = conj && currentEqualInitialVarsConstraints(stateVariablesIncludingInheritedAndPrivate(_contract));
-
-	FunctionDefinition const* function = _function ? _function : _contract.constructor();
-	if (function)
-		conj = conj && currentEqualInitialVarsConstraints(applyMap(function->parameters(), [](auto&& _var) -> VariableDeclaration const* { return _var.get(); }));
-
-	return conj;
-}
-
-std::vector<smtutil::Expression> CHC::initialStateVariables()
-{
-	return stateVariablesAtIndex(0);
-}
-
-std::vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index)
-{
-	solAssert(m_currentContract, "");
-	return stateVariablesAtIndex(_index, *m_currentContract);
-}
-
-std::vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract)
-{
-	return applyMap(
-		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
-		[&](auto _var) { return valueAtIndex(*_var, _index); }
-	);
-}
-
-std::vector<smtutil::Expression> CHC::currentStateVariables()
-{
-	solAssert(m_currentContract, "");
-	return currentStateVariables(*m_currentContract);
-}
-
-std::vector<smtutil::Expression> CHC::currentStateVariables(ContractDefinition const& _contract)
-{
-	return applyMap(SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract), [this](auto _var) { return currentValue(*_var); });
-}
-
-smtutil::Expression CHC::currentEqualInitialVarsConstraints(std::vector<VariableDeclaration const*> const& _vars) const
-{
-	return fold(_vars, smtutil::Expression(true), [this](auto&& _conj, auto _var) {
-		return std::move(_conj) && currentValue(*_var) == m_context.variable(*_var)->valueAtIndex(0);
-	});
-}
-
-std::string CHC::predicateName(ASTNode const* _node, ContractDefinition const* _contract)
-{
-	std::string prefix;
-	if (auto funDef = dynamic_cast<FunctionDefinition const*>(_node))
-	{
-		prefix += TokenTraits::toString(funDef->kind());
-		if (!funDef->name().empty())
-			prefix += "_" + funDef->name() + "_";
-	}
-	else if (m_currentFunction && !m_currentFunction->name().empty())
-		prefix += m_currentFunction->name();
-
-	auto contract = _contract ? _contract : m_currentContract;
-	solAssert(contract, "");
-	return prefix + "_" + std::to_string(_node->id()) + "_" + std::to_string(contract->id());
-}
-
-smtutil::Expression CHC::predicate(Predicate const& _block)
-{
-	switch (_block.type())
-	{
-	case PredicateType::Interface:
-		solAssert(m_currentContract, "");
-		return ::interface(_block, *m_currentContract, m_context);
-	case PredicateType::ConstructorSummary:
-		return constructor(_block, m_context);
-	case PredicateType::FunctionSummary:
-	case PredicateType::InternalCall:
-	case PredicateType::ExternalCallTrusted:
-	case PredicateType::ExternalCallUntrusted:
-		return smt::function(_block, m_currentContract, m_context);
-	case PredicateType::FunctionBlock:
-	case PredicateType::FunctionErrorBlock:
-		solAssert(m_currentFunction, "");
-		return functionBlock(_block, *m_currentFunction, m_currentContract, m_context);
-	case PredicateType::Error:
-		return _block({});
-	case PredicateType::NondetInterface:
-		// Nondeterministic interface predicates are handled differently.
-		solAssert(false, "");
-	case PredicateType::Custom:
-		// Custom rules are handled separately.
-		solAssert(false, "");
-	}
-	solAssert(false, "");
-}
-
-smtutil::Expression CHC::predicate(
-	FunctionDefinition const* _funDef,
-	std::optional<Expression const*> _boundArgumentCall,
-	FunctionType const* _funType,
-	std::vector<Expression const*> _arguments,
-	smtutil::Expression _contractAddressValue
-)
-{
-	solAssert(_funType, "");
-	auto kind = _funType->kind();
-	solAssert(kind == FunctionType::Kind::Internal || kind == FunctionType::Kind::External || kind == FunctionType::Kind::BareStaticCall, "");
-	if (!_funDef)
-		return smtutil::Expression(true);
-
-	errorFlag().increaseIndex();
-
-	std::vector<smtutil::Expression> args{errorFlag().currentValue(), _contractAddressValue, state().abi(), state().crypto(), state().tx(), state().state()};
-
-	auto const* contract = _funDef->annotation().contract;
-	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
-	solAssert(kind != FunctionType::Kind::Internal || _funDef->isFree() || (contract && contract->isLibrary()) || util::contains(hierarchy, contract), "");
-
-	if (kind == FunctionType::Kind::Internal)
-		contract = m_currentContract;
-
-	args += currentStateVariables(*contract);
-	args += symbolicArguments(_funDef->parameters(), _arguments, _boundArgumentCall);
-	if (!usesStaticCall(_funDef, _funType))
-	{
-		state().newState();
-		for (auto const& var: stateVariablesIncludingInheritedAndPrivate(*contract))
-			m_context.variable(*var)->increaseIndex();
-	}
-	args += std::vector<smtutil::Expression>{state().state()};
-	args += currentStateVariables(*contract);
-
-	for (auto var: _funDef->parameters() + _funDef->returnParameters())
-	{
-		if (m_context.knownVariable(*var))
-			m_context.variable(*var)->increaseIndex();
-		else
-			createVariable(*var);
-		args.push_back(currentValue(*var));
-	}
-
-	Predicate const& summary = *m_summaries.at(contract).at(_funDef);
-	auto from = smt::function(summary, contract, m_context);
-	Predicate const& callPredicate = *createSummaryBlock(
-		*_funDef,
-		*contract,
-		kind == FunctionType::Kind::Internal ? PredicateType::InternalCall : PredicateType::ExternalCallTrusted
-	);
-	auto to = smt::function(callPredicate, contract, m_context);
-	addRule(smtutil::Expression::implies(from, to), to.name);
-
-	return callPredicate(args);
-}
-
-void CHC::addRule(smtutil::Expression const& _rule, std::string const& _ruleName)
-{
-	m_interface->addRule(_rule, _ruleName);
-}
-
-std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
-{
-	CheckResult result;
-	smtutil::Expression invariant(true);
-	CHCSolverInterface::CexGraph cex;
-	if (m_settings.printQuery)
-	{
-		auto smtLibInterface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
-		solAssert(smtLibInterface, "Requested to print queries but CHCSmtLib2Interface not available");
-		std::string smtLibCode = smtLibInterface->dumpQuery(_query);
-		m_errorReporter.info(
-			2339_error,
-			"CHC: Requested query:\n" + smtLibCode
-		);
-	}
-	std::tie(result, invariant, cex) = m_interface->query(_query);
-	switch (result)
-	{
-	case CheckResult::SATISFIABLE:
-	{
-	// We still need the ifdef because of Z3CHCInterface.
-		if (m_settings.solvers.z3)
-		{
-#ifdef HAVE_Z3
-			// Even though the problem is SAT, Spacer's pre processing makes counterexamples incomplete.
-			// We now disable those optimizations and check whether we can still solve the problem.
-			auto* spacer = dynamic_cast<Z3CHCInterface*>(m_interface.get());
-			solAssert(spacer, "");
-			spacer->setSpacerOptions(false);
-
-			CheckResult resultNoOpt;
-			smtutil::Expression invariantNoOpt(true);
-			CHCSolverInterface::CexGraph cexNoOpt;
-			std::tie(resultNoOpt, invariantNoOpt, cexNoOpt) = m_interface->query(_query);
-
-			if (resultNoOpt == CheckResult::SATISFIABLE)
-				cex = std::move(cexNoOpt);
-
-			spacer->setSpacerOptions(true);
-#else
-			solAssert(false);
-#endif
-		}
-		break;
-	}
-	case CheckResult::UNSATISFIABLE:
-		break;
-	case CheckResult::UNKNOWN:
-		break;
-	case CheckResult::CONFLICTING:
-		m_errorReporter.warning(1988_error, _location, "CHC: At least two SMT solvers provided conflicting answers. Results might not be sound.");
-		break;
-	case CheckResult::ERROR:
-		m_errorReporter.warning(1218_error, _location, "CHC: Error trying to invoke SMT solver.");
-		break;
-	}
-	return {result, invariant, cex};
-}
-
-void CHC::verificationTargetEncountered(
-	ASTNode const* const _errorNode,
-	VerificationTargetType _type,
-	smtutil::Expression const& _errorCondition
-)
-{
-	if (!m_settings.targets.has(_type))
-		return;
-
-	if (!(m_currentContract || m_currentFunction))
-		return;
-
-	bool scopeIsFunction = m_currentFunction && !m_currentFunction->isConstructor();
-	auto errorId = newErrorId();
-	solAssert(m_verificationTargets.count(errorId) == 0, "Error ID is not unique!");
-	m_verificationTargets.emplace(errorId, CHCVerificationTarget{{_type, _errorCondition, smtutil::Expression(true)}, errorId, _errorNode});
-	if (scopeIsFunction)
-		m_functionTargetIds[m_currentFunction].push_back(errorId);
-	else
-		m_functionTargetIds[m_currentContract].push_back(errorId);
-	auto previousError = errorFlag().currentValue();
-	errorFlag().increaseIndex();
-	auto extendedErrorCondition = currentPathConditions() && _errorCondition;
-
-	Predicate const* localBlock = m_currentFunction ?
-		createBlock(m_currentFunction, PredicateType::FunctionErrorBlock) :
-		createConstructorBlock(*m_currentContract, "local_error");
-
-	auto pred = predicate(*localBlock);
-	connectBlocks(
-		m_currentBlock,
-		pred,
-		extendedErrorCondition && errorFlag().currentValue() == errorId
-	);
-	solAssert(m_errorDest, "");
-	addRule(smtutil::Expression::implies(pred, predicate(*m_errorDest)), pred.name);
-
-	m_context.addAssertion(errorFlag().currentValue() == previousError);
-}
-
-std::pair<std::string, ErrorId> CHC::targetDescription(CHCVerificationTarget const& _target)
-{
-	if (_target.type == VerificationTargetType::PopEmptyArray)
-	{
-		solAssert(dynamic_cast<FunctionCall const*>(_target.errorNode), "");
-		return {"Empty array \"pop\"", 2529_error};
-	}
-	else if (_target.type == VerificationTargetType::OutOfBounds)
-	{
-		solAssert(dynamic_cast<IndexAccess const*>(_target.errorNode), "");
-		return {"Out of bounds access", 6368_error};
-	}
-	else if (
-		_target.type == VerificationTargetType::Underflow ||
-		_target.type == VerificationTargetType::Overflow
-	)
-	{
-		auto const* expr = dynamic_cast<Expression const*>(_target.errorNode);
-		solAssert(expr, "");
-		auto const* intType = dynamic_cast<IntegerType const*>(expr->annotation().type);
-		if (!intType)
-			intType = TypeProvider::uint256();
-
-		if (_target.type == VerificationTargetType::Underflow)
-			return {
-				"Underflow (resulting value less than " + formatNumberReadable(intType->minValue()) + ")",
-				3944_error
-			};
-
-		return {
-			"Overflow (resulting value larger than " + formatNumberReadable(intType->maxValue()) + ")",
-			4984_error
-		};
-	}
-	else if (_target.type == VerificationTargetType::DivByZero)
-		return {"Division by zero", 4281_error};
-	else if (_target.type == VerificationTargetType::Assert)
-		return {"Assertion violation", 6328_error};
-	else
-		solAssert(false);
-}
-
-void CHC::checkVerificationTargets()
-{
-	// The verification conditions have been collected per function where they have been encountered (m_verificationTargets).
-	// Also, all possible contexts in which an external function can be called has been recorded (m_queryPlaceholders).
-	// Here we combine every context in which an external function can be called with all possible verification conditions
-	// in its call graph. Each such combination forms a unique verification target.
-	std::map<unsigned, std::vector<CHCQueryPlaceholder>> targetEntryPoints;
-	for (auto const& [function, placeholders]: m_queryPlaceholders)
-	{
-		auto functionTargets = transactionVerificationTargetsIds(function);
-		for (auto const& placeholder: placeholders)
-			for (unsigned id: functionTargets)
-				targetEntryPoints[id].push_back(placeholder);
-	}
-
-	std::set<unsigned> checkedErrorIds;
-	for (auto const& [targetId, placeholders]: targetEntryPoints)
-	{
-		auto const& target = m_verificationTargets.at(targetId);
-		auto [errorType, errorReporterId] = targetDescription(target);
-
-		checkAndReportTarget(target, placeholders, errorReporterId, errorType + " happens here.", errorType + " might happen here.");
-		checkedErrorIds.insert(target.errorId);
-	}
-
-	auto toReport = m_unsafeTargets;
-	if (m_settings.showUnproved)
-		for (auto const& [node, targets]: m_unprovedTargets)
-			for (auto const& [target, info]: targets)
-				toReport[node].emplace(target, info);
-
-	for (auto const& [node, targets]: toReport)
-		for (auto const& [target, info]: targets)
-			m_errorReporter.warning(
-				info.error,
-				info.location,
-				info.message
-			);
-
-	if (!m_settings.showUnproved && !m_unprovedTargets.empty())
-		m_errorReporter.warning(
-			5840_error,
-			{},
-			"CHC: " +
-			std::to_string(m_unprovedTargets.size()) +
-			" verification condition(s) could not be proved." +
-			" Enable the model checker option \"show unproved\" to see all of them." +
-			" Consider choosing a specific contract to be verified in order to reduce the solving problems." +
-			" Consider increasing the timeout per query."
-		);
-
-	if (!m_settings.showProvedSafe && !m_safeTargets.empty())
-		m_errorReporter.info(
-			1391_error,
-			"CHC: " +
-			std::to_string(m_safeTargets.size()) +
-			" verification condition(s) proved safe!" +
-			" Enable the model checker option \"show proved safe\" to see all of them."
-		);
-	else if (m_settings.showProvedSafe)
-		for (auto const& [node, targets]: m_safeTargets)
-			for (auto const& target: targets)
-				m_errorReporter.info(
-					9576_error,
-					node->location(),
-					"CHC: " +
-					targetDescription(target).first +
-					" check is safe!"
-				);
-
-	if (!m_settings.invariants.invariants.empty())
-	{
-		std::string msg;
-		for (auto pred: m_invariants | ranges::views::keys)
-		{
-			ASTNode const* node = pred->programNode();
-			std::string what;
-			if (auto contract = dynamic_cast<ContractDefinition const*>(node))
-				what = contract->fullyQualifiedName();
-			else
-				solAssert(false, "");
-
-			std::string invType;
-			if (pred->type() == PredicateType::Interface)
-				invType = "Contract invariant(s)";
-			else if (pred->type() == PredicateType::NondetInterface)
-				invType = "Reentrancy property(ies)";
-			else
-				solAssert(false, "");
-
-			msg += invType + " for " + what + ":\n";
-			for (auto const& inv: m_invariants.at(pred))
-				msg += inv + "\n";
-		}
-		if (msg.find("<errorCode>") != std::string::npos)
-		{
-			std::set<unsigned> seenErrors;
-			msg += "<errorCode> = 0 -> no errors\n";
-			for (auto const& [id, target]: m_verificationTargets)
-				if (!seenErrors.count(target.errorId))
-				{
-					seenErrors.insert(target.errorId);
-					std::string loc = std::string(m_charStreamProvider.charStream(*target.errorNode->location().sourceName).text(target.errorNode->location()));
-					msg += "<errorCode> = " + std::to_string(target.errorId) + " -> " + ModelCheckerTargets::targetTypeToString.at(target.type) + " at " + loc + "\n";
-
-				}
-		}
-		if (!msg.empty())
-			m_errorReporter.info(1180_error, msg);
-	}
-
-	// There can be targets in internal functions that are not reachable from the external interface.
-	// These are safe by definition and are not even checked by the CHC engine, but this information
-	// must still be reported safe by the BMC engine.
-	std::set<unsigned> allErrorIds;
-	for (auto const& entry: m_functionTargetIds)
-		for (unsigned id: entry.second)
-			allErrorIds.insert(id);
-
-	std::set<unsigned> unreachableErrorIds;
-	set_difference(
-		allErrorIds.begin(),
-		allErrorIds.end(),
-		checkedErrorIds.begin(),
-		checkedErrorIds.end(),
-		inserter(unreachableErrorIds, unreachableErrorIds.begin())
-	);
-	for (auto id: unreachableErrorIds)
-		m_safeTargets[m_verificationTargets.at(id).errorNode].insert(m_verificationTargets.at(id));
-}
-
-void CHC::checkAndReportTarget(
-	CHCVerificationTarget const& _target,
-	std::vector<CHCQueryPlaceholder> const& _placeholders,
-	ErrorId _errorReporterId,
-	std::string _satMsg,
-	std::string _unknownMsg
-)
-{
-	if (m_unsafeTargets.count(_target.errorNode) && m_unsafeTargets.at(_target.errorNode).count(_target.type))
-		return;
-
-	createErrorBlock();
-	for (auto const& placeholder: _placeholders)
-		connectBlocks(
-			placeholder.fromPredicate,
-			error(),
-			placeholder.constraints && placeholder.errorExpression == _target.errorId
-		);
-	auto const& location = _target.errorNode->location();
-	auto [result, invariant, model] = query(error(), location);
-	if (result == CheckResult::UNSATISFIABLE)
-	{
-		m_safeTargets[_target.errorNode].insert(_target);
-		std::set<Predicate const*> predicates;
-		for (auto const* pred: m_interfaces | ranges::views::values)
-			predicates.insert(pred);
-		for (auto const* pred: m_nondetInterfaces | ranges::views::values)
-			predicates.insert(pred);
-		std::map<Predicate const*, std::set<std::string>> invariants = collectInvariants(invariant, predicates, m_settings.invariants);
-		for (auto pred: invariants | ranges::views::keys)
-			m_invariants[pred] += std::move(invariants.at(pred));
-	}
-	else if (result == CheckResult::SATISFIABLE)
-	{
-		solAssert(!_satMsg.empty(), "");
-		auto cex = generateCounterexample(model, error().name);
-		if (cex)
-			m_unsafeTargets[_target.errorNode][_target.type] = {
-				_errorReporterId,
-				location,
-				"CHC: " + _satMsg + "\nCounterexample:\n" + *cex
-			};
-		else
-			m_unsafeTargets[_target.errorNode][_target.type] = {
-				_errorReporterId,
-				location,
-				"CHC: " + _satMsg
-			};
-	}
-	else if (!_unknownMsg.empty())
-		m_unprovedTargets[_target.errorNode][_target.type] = {
-			_errorReporterId,
-			location,
-			"CHC: " + _unknownMsg
-		};
-}
-
-/**
-The counterexample DAG has the following properties:
-1) The root node represents the reachable error predicate.
-2) The root node has 1 or 2 children:
-	- One of them is the summary of the function that was called and led to that node.
-	If this is the only child, this function must be the constructor.
-	- If it has 2 children, the function is not the constructor and the other child is the interface node,
-	that is, it represents the state of the contract before the function described above was called.
-3) Interface nodes also have property 2.
-
-We run a BFS on the DAG from the root node collecting the reachable function summaries from the given node.
-When a function summary is seen, the search continues with that summary as the new root for its subgraph.
-The result of the search is a callgraph containing:
-- Functions calls needed to reach the root node, that is, transaction entry points.
-- Functions called by other functions (internal calls or external calls/internal transactions).
-The BFS visit order and the shape of the DAG described in the previous paragraph guarantee that the order of
-the function summaries in the callgraph of the error node is the reverse transaction trace.
-
-The first function summary seen contains the values for the state, input and output variables at the
-error point.
-*/
-std::optional<std::string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const& _graph, std::string const& _root)
-{
-	std::optional<unsigned> rootId;
-	for (auto const& [id, node]: _graph.nodes)
-		if (node.name == _root)
-		{
-			rootId = id;
-			break;
-		}
-	if (!rootId)
-		return {};
-
-	std::vector<std::string> path;
-	std::string localState;
-
-	auto callGraph = summaryCalls(_graph, *rootId);
-
-	auto nodePred = [&](auto _node) { return Predicate::predicate(_graph.nodes.at(_node).name); };
-	auto nodeArgs = [&](auto _node) { return _graph.nodes.at(_node).arguments; };
-
-	bool first = true;
-	for (auto summaryId: callGraph.at(*rootId))
-	{
-		CHCSolverInterface::CexNode const& summaryNode = _graph.nodes.at(summaryId);
-		Predicate const* summaryPredicate = Predicate::predicate(summaryNode.name);
-		auto const& summaryArgs = summaryNode.arguments;
-
-		if (!summaryPredicate->programVariable())
-		{
-			auto stateVars = summaryPredicate->stateVariables();
-			solAssert(stateVars.has_value(), "");
-			auto stateValues = summaryPredicate->summaryStateValues(summaryArgs);
-			solAssert(stateValues.size() == stateVars->size(), "");
-
-			if (first)
-			{
-				first = false;
-				/// Generate counterexample message local to the failed target.
-				localState = formatVariableModel(*stateVars, stateValues, ", ") + "\n";
-
-				if (auto calledFun = summaryPredicate->programFunction())
-				{
-					auto inValues = summaryPredicate->summaryPostInputValues(summaryArgs);
-					auto const& inParams = calledFun->parameters();
-					if (auto inStr = formatVariableModel(inParams, inValues, "\n"); !inStr.empty())
-						localState += inStr + "\n";
-					auto outValues = summaryPredicate->summaryPostOutputValues(summaryArgs);
-					auto const& outParams = calledFun->returnParameters();
-					if (auto outStr = formatVariableModel(outParams, outValues, "\n"); !outStr.empty())
-						localState += outStr + "\n";
-
-					std::optional<unsigned> localErrorId;
-					solidity::util::BreadthFirstSearch<unsigned> bfs{{summaryId}};
-					bfs.run([&](auto _nodeId, auto&& _addChild) {
-						auto const& children = _graph.edges.at(_nodeId);
-						if (
-							children.size() == 1 &&
-							nodePred(children.front())->isFunctionErrorBlock()
-						)
-						{
-							localErrorId = children.front();
-							bfs.abort();
-						}
-						ranges::for_each(children, _addChild);
-					});
-
-					if (localErrorId.has_value())
-					{
-						auto const* localError = nodePred(*localErrorId);
-						solAssert(localError && localError->isFunctionErrorBlock(), "");
-						auto const [localValues, localVars] = localError->localVariableValues(nodeArgs(*localErrorId));
-						if (auto localStr = formatVariableModel(localVars, localValues, "\n"); !localStr.empty())
-							localState += localStr + "\n";
-					}
-				}
-			}
-			else
-			{
-				auto modelMsg = formatVariableModel(*stateVars, stateValues, ", ");
-				/// We report the state after every tx in the trace except for the last, which is reported
-				/// first in the code above.
-				if (!modelMsg.empty())
-					path.emplace_back("State: " + modelMsg);
-			}
-		}
-
-		std::string txCex = summaryPredicate->formatSummaryCall(summaryArgs, m_charStreamProvider);
-
-		std::list<std::string> calls;
-		auto dfs = [&](unsigned parent, unsigned node, unsigned depth, auto&& _dfs) -> void {
-			auto pred = nodePred(node);
-			auto parentPred = nodePred(parent);
-			solAssert(pred && pred->isSummary(), "");
-			solAssert(parentPred && parentPred->isSummary(), "");
-			auto callTraceSize = calls.size();
-			if (!pred->isConstructorSummary())
-				for (unsigned v: callGraph[node])
-					_dfs(node, v, depth + 1, _dfs);
-
-			bool appendTxVars = pred->isConstructorSummary() || pred->isFunctionSummary() || pred->isExternalCallUntrusted();
-
-			calls.push_front(std::string(depth * 4, ' ') + pred->formatSummaryCall(nodeArgs(node), m_charStreamProvider, appendTxVars));
-			if (pred->isInternalCall())
-				calls.front() += " -- internal call";
-			else if (pred->isExternalCallTrusted())
-				calls.front() += " -- trusted external call";
-			else if (pred->isExternalCallUntrusted())
-			{
-				calls.front() += " -- untrusted external call";
-				if (calls.size() > callTraceSize + 1)
-					calls.front() += ", synthesized as:";
-			}
-			else if (pred->programVariable())
-			{
-				calls.front() += "-- action on external contract in state variable \"" + pred->programVariable()->name() + "\"";
-				if (calls.size() > callTraceSize + 1)
-					calls.front() += ", synthesized as:";
-			}
-			else if (pred->isFunctionSummary() && parentPred->isExternalCallUntrusted())
-				calls.front() += " -- reentrant call";
-		};
-		dfs(summaryId, summaryId, 0, dfs);
-		path.emplace_back(boost::algorithm::join(calls, "\n"));
-	}
-
-	return localState + "\nTransaction trace:\n" + boost::algorithm::join(path | ranges::views::reverse, "\n");
-}
-
-std::map<unsigned, std::vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph const& _graph, unsigned _root)
-{
-	std::map<unsigned, std::vector<unsigned>> calls;
-
-	auto compare = [&](unsigned _a, unsigned _b) {
-		auto extract = [&](std::string const& _s) {
-			// We want to sort sibling predicates in the counterexample graph by their unique predicate id.
-			// For most predicates, this actually doesn't matter.
-			// The cases where this matters are internal and external function calls which have the form:
-			// summary_<CALLID>_<suffix>
-			// nondet_call_<CALLID>_<suffix>
-			// Those have the extra unique <CALLID> numbers based on the traversal order, and are necessary
-			// to infer the call order so that's shown property in the counterexample trace.
-			// Predicates that do not have a CALLID have a predicate id at the end of <suffix>,
-			// so the assertion below should still hold.
-			auto beg = _s.data();
-			while (beg != _s.data() + _s.size() && !isDigit(*beg)) ++beg;
-			auto end = beg;
-			while (end != _s.data() + _s.size() && isDigit(*end)) ++end;
-
-			solAssert(beg != end, "Expected to find numerical call or predicate id.");
-
-			int result;
-			auto [p, ec] = std::from_chars(beg, end, result);
-			solAssert(ec == std::errc(), "Id should be a number.");
-
-			return result;
-		};
-		return extract(_graph.nodes.at(_a).name) > extract(_graph.nodes.at(_b).name);
-	};
-
-	std::queue<std::pair<unsigned, unsigned>> q;
-	q.push({_root, _root});
-	while (!q.empty())
-	{
-		auto [node, root] = q.front();
-		q.pop();
-
-		Predicate const* nodePred = Predicate::predicate(_graph.nodes.at(node).name);
-		Predicate const* rootPred = Predicate::predicate(_graph.nodes.at(root).name);
-		if (nodePred->isSummary() && (
-			_root == root ||
-			nodePred->isInternalCall() ||
-			nodePred->isExternalCallTrusted() ||
-			nodePred->isExternalCallUntrusted() ||
-			rootPred->isExternalCallUntrusted() ||
-			rootPred->programVariable()
-		))
-		{
-			calls[root].push_back(node);
-			root = node;
-		}
-		auto const& edges = _graph.edges.at(node);
-		for (unsigned v: std::set<unsigned, decltype(compare)>(begin(edges), end(edges), compare))
-			q.push({v, root});
-	}
-
-	return calls;
-}
-
-std::string CHC::cex2dot(CHCSolverInterface::CexGraph const& _cex)
-{
-	std::string dot = "digraph {\n";
-
-	auto pred = [&](CHCSolverInterface::CexNode const& _node) {
-		std::vector<std::string> args = applyMap(
-			_node.arguments,
-			[&](auto const& arg) { return arg.name; }
-		);
-		return "\"" + _node.name + "(" + boost::algorithm::join(args, ", ") + ")\"";
-	};
-
-	for (auto const& [u, vs]: _cex.edges)
-		for (auto v: vs)
-			dot += pred(_cex.nodes.at(v)) + " -> " + pred(_cex.nodes.at(u)) + "\n";
-
-	dot += "}";
-	return dot;
-}
-
-std::string CHC::uniquePrefix()
-{
-	return std::to_string(m_blockCounter++);
-}
-
-std::string CHC::contractSuffix(ContractDefinition const& _contract)
-{
-	return _contract.name() + "_" + std::to_string(_contract.id());
-}
-
-unsigned CHC::newErrorId()
-{
-	unsigned errorId = m_context.newUniqueId();
-	// We need to make sure the error id is not zero,
-	// because error id zero actually means no error in the CHC encoding.
-	if (errorId == 0)
-		errorId = m_context.newUniqueId();
-	return errorId;
-}
-
-SymbolicIntVariable& CHC::errorFlag()
-{
-	return state().errorFlag();
-}
-
-void CHC::newTxConstraints(Expression const* _value)
-{
-	auto txOrigin = state().txMember("tx.origin");
-	state().newTx();
-	// set the transaction sender as this contract
-	m_context.addAssertion(state().txMember("msg.sender") == state().thisAddress());
-	// set the origin to be the current transaction origin
-	m_context.addAssertion(state().txMember("tx.origin") == txOrigin);
-
-	if (_value)
-		// set the msg value
-		m_context.addAssertion(state().txMember("msg.value") == expr(*_value));
-}
-
-frontend::Expression const* CHC::valueOption(FunctionCallOptions const* _options)
-{
-	if (_options)
-		for (auto&& [i, name]: _options->names() | ranges::views::enumerate)
-			if (name && *name == "value")
-				return _options->options().at(i).get();
-	return nullptr;
-}
-
-void CHC::decreaseBalanceFromOptionsValue(Expression const& _value)
-{
-	state().addBalance(state().thisAddress(), 0 - expr(_value));
-}
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
deleted file mode 100644
index fe7387bd3568..000000000000
--- a/libsolidity/formal/CHC.h
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/**
- * Model checker based on Constrained Horn Clauses.
- *
- * A Solidity contract's CFG is encoded into a system of Horn clauses where
- * each block has a predicate and edges are rules.
- *
- * The entry block is the constructor which has no in-edges.
- * The constructor has one out-edge to an artificial block named _Interface_
- * which has in/out-edges from/to all public functions.
- *
- * Loop invariants for Interface -> Interface' are state invariants.
- */
-
-#pragma once
-
-#include <libsolidity/formal/ModelCheckerSettings.h>
-#include <libsolidity/formal/Predicate.h>
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <libsolidity/interface/ReadFile.h>
-
-#include <libsmtutil/CHCSolverInterface.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <liblangutil/UniqueErrorReporter.h>
-
-#include <boost/algorithm/string/join.hpp>
-
-#include <map>
-#include <optional>
-#include <set>
-
-namespace solidity::frontend
-{
-
-class CHC: public SMTEncoder
-{
-public:
-	CHC(
-		smt::EncodingContext& _context,
-		langutil::UniqueErrorReporter& _errorReporter,
-		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
-		std::map<util::h256, std::string> const& _smtlib2Responses,
-		ReadCallback::Callback const& _smtCallback,
-		ModelCheckerSettings _settings,
-		langutil::CharStreamProvider const& _charStreamProvider
-	);
-
-	void analyze(SourceUnit const& _sources);
-
-	struct CHCVerificationTarget: VerificationTarget
-	{
-		unsigned const errorId;
-		ASTNode const* const errorNode;
-
-		friend bool operator<(CHCVerificationTarget const& _a, CHCVerificationTarget const& _b)
-		{
-			return _a.errorId < _b.errorId;
-		}
-	};
-
-	struct ReportTargetInfo
-	{
-		langutil::ErrorId error;
-		langutil::SourceLocation location;
-		std::string message;
-	};
-
-	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
-	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> const& unsafeTargets() const { return m_unsafeTargets; }
-
-	/// This is used if the Horn solver is not directly linked into this binary.
-	/// @returns a list of inputs to the Horn solver that were not part of the argument to
-	/// the constructor.
-	std::vector<std::string> unhandledQueries() const;
-
-	enum class CHCNatspecOption
-	{
-		AbstractFunctionNondet
-	};
-
-private:
-	/// Visitor functions.
-	//@{
-	bool visit(ContractDefinition const& _node) override;
-	void endVisit(ContractDefinition const& _node) override;
-	bool visit(FunctionDefinition const& _node) override;
-	void endVisit(FunctionDefinition const& _node) override;
-	bool visit(Block const& _block) override;
-	void endVisit(Block const& _block) override;
-	bool visit(IfStatement const& _node) override;
-	bool visit(WhileStatement const&) override;
-	bool visit(ForStatement const&) override;
-	void endVisit(ForStatement const&) override;
-	void endVisit(FunctionCall const& _node) override;
-	void endVisit(BinaryOperation const& _op) override;
-	void endVisit(UnaryOperation const& _op) override;
-	void endVisit(Break const& _node) override;
-	void endVisit(Continue const& _node) override;
-	void endVisit(IndexRangeAccess const& _node) override;
-	void endVisit(Return const& _node) override;
-	bool visit(TryCatchClause const&) override;
-	void endVisit(TryCatchClause const&) override;
-	bool visit(TryStatement const& _node) override;
-
-	void pushInlineFrame(CallableDeclaration const& _callable) override;
-	void popInlineFrame(CallableDeclaration const& _callable) override;
-
-	void visitAssert(FunctionCall const& _funCall);
-	void visitPublicGetter(FunctionCall const& _funCall) override;
-	void visitAddMulMod(FunctionCall const& _funCall) override;
-	void visitDeployment(FunctionCall const& _funCall);
-	void internalFunctionCall(FunctionCall const& _funCall);
-	void internalFunctionCall(
-		FunctionDefinition const* _funDef,
-		std::optional<Expression const*> _boundArgumentCall,
-		FunctionType const* _funType,
-		std::vector<Expression const*> const& _arguments,
-		smtutil::Expression _contractAddressValue
-	);
-	void externalFunctionCall(FunctionCall const& _funCall);
-	void externalFunctionCallToTrustedCode(FunctionCall const& _funCall);
-	void addNondetCalls(ContractDefinition const& _contract);
-	void nondetCall(ContractDefinition const& _contract, VariableDeclaration const& _var);
-	void unknownFunctionCall(FunctionCall const& _funCall);
-	void makeArrayPopVerificationTarget(FunctionCall const& _arrayPop) override;
-	void makeOutOfBoundsVerificationTarget(IndexAccess const& _access) override;
-	/// Creates underflow/overflow verification targets.
-	std::pair<smtutil::Expression, smtutil::Expression> arithmeticOperation(
-		Token _op,
-		smtutil::Expression const& _left,
-		smtutil::Expression const& _right,
-		Type const* _commonType,
-		Expression const& _expression
-	) override;
-	//@}
-
-	/// Helpers.
-	//@{
-	void resetSourceAnalysis();
-	void resetContractAnalysis();
-	void eraseKnowledge();
-	void clearIndices(ContractDefinition const* _contract, FunctionDefinition const* _function = nullptr) override;
-	void setCurrentBlock(Predicate const& _block);
-	std::set<unsigned> transactionVerificationTargetsIds(ASTNode const* _txRoot);
-	bool usesStaticCall(FunctionDefinition const* _funDef, FunctionType const* _funType);
-	bool usesStaticCall(FunctionCall const& _funCall);
-	//@}
-
-	/// SMT Natspec and abstraction helpers.
-	//@{
-	/// @returns a CHCNatspecOption enum if _option is a valid SMTChecker Natspec value
-	/// or nullopt otherwise.
-	static std::optional<CHCNatspecOption> natspecOptionFromString(std::string const& _option);
-	/// @returns which SMTChecker options are enabled by @a _function's Natspec via
-	/// `@custom:smtchecker <option>` or nullopt if none is used.
-	std::set<CHCNatspecOption> smtNatspecTags(FunctionDefinition const& _function);
-	/// @returns true if _function is Natspec annotated to be abstracted by
-	/// nondeterministic values.
-	bool abstractAsNondet(FunctionDefinition const& _function);
-
-	/// @returns true if external calls should be considered trusted.
-	/// If that's the case, their code is used if available at compile time.
-	bool encodeExternalCallsAsTrusted();
-	//@}
-
-	/// Sort helpers.
-	//@{
-	smtutil::SortPointer sort(FunctionDefinition const& _function);
-	smtutil::SortPointer sort(ASTNode const* _block);
-	//@}
-
-	/// Predicate helpers.
-	//@{
-	/// @returns a new block of given _sort and _name.
-	Predicate const* createSymbolicBlock(smtutil::SortPointer _sort, std::string const& _name, PredicateType _predType, ASTNode const* _node = nullptr, ContractDefinition const* _contractContext = nullptr);
-
-	/// Creates summary predicates for all functions of all contracts
-	/// in a given _source.
-	void defineInterfacesAndSummaries(SourceUnit const& _source);
-
-	/// Creates the rule
-	/// summary_function \land transaction_entry_constraints => external_summary_function
-	/// This is needed to add these transaction entry constraints which include
-	/// potential balance increase by external means, for example.
-	void defineExternalFunctionInterface(FunctionDefinition const& _function, ContractDefinition const& _contract);
-
-	/// Creates a CHC system that, for a given contract,
-	/// - initializes its state variables (as 0 or given value, if any).
-	/// - "calls" the explicit constructor function of the contract, if any.
-	void defineContractInitializer(ContractDefinition const& _contract, ContractDefinition const& _contractContext);
-
-	/// Interface predicate over current variables.
-	smtutil::Expression interface();
-	smtutil::Expression interface(ContractDefinition const& _contract);
-	/// Error predicate over current variables.
-	smtutil::Expression error();
-	smtutil::Expression error(unsigned _idx);
-
-	/// Creates a block for the given _node.
-	Predicate const* createBlock(ASTNode const* _node, PredicateType _predType, std::string const& _prefix = "");
-	/// Creates a call block for the given function _function from contract _contract.
-	/// The contract is needed here because of inheritance.
-	/// There are different types of summaries, where the most common is FunctionSummary,
-	/// but other summaries are also used for internal and external function calls.
-	Predicate const* createSummaryBlock(
-		FunctionDefinition const& _function,
-		ContractDefinition const& _contract,
-		PredicateType _type = PredicateType::FunctionSummary
-	);
-
-	/// @returns a block related to @a _contract's constructor.
-	Predicate const* createConstructorBlock(ContractDefinition const& _contract, std::string const& _prefix);
-
-	/// Creates a new error block to be used by an assertion.
-	/// Also registers the predicate.
-	void createErrorBlock();
-
-	void connectBlocks(smtutil::Expression const& _from, smtutil::Expression const& _to, smtutil::Expression const& _constraints = smtutil::Expression(true));
-
-	/// @returns The initial constraints that set up the beginning of a function.
-	smtutil::Expression initialConstraints(ContractDefinition const& _contract, FunctionDefinition const* _function = nullptr);
-
-	/// @returns the symbolic values of the state variables at the beginning
-	/// of the current transaction.
-	std::vector<smtutil::Expression> initialStateVariables();
-	std::vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index);
-	std::vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract);
-	/// @returns the current symbolic values of the current state variables.
-	std::vector<smtutil::Expression> currentStateVariables();
-	std::vector<smtutil::Expression> currentStateVariables(ContractDefinition const& _contract);
-
-	/// @returns \bigwedge currentValue(_vars[i]) == initialState(_var[i])
-	smtutil::Expression currentEqualInitialVarsConstraints(std::vector<VariableDeclaration const*> const& _vars) const;
-
-	/// @returns the predicate name for a given node.
-	std::string predicateName(ASTNode const* _node, ContractDefinition const* _contract = nullptr);
-	/// @returns a predicate application after checking the predicate's type.
-	smtutil::Expression predicate(Predicate const& _block);
-	/// @returns the summary predicate for the called function.
-	smtutil::Expression predicate(
-		FunctionDefinition const* _funDef,
-		std::optional<Expression const*> _boundArgumentCall,
-		FunctionType const* _funType,
-		std::vector<Expression const*> _arguments,
-		smtutil::Expression _contractAddressValue
-	);
-	/// @returns a predicate that defines a contract initializer for _contract in the context of _contractContext.
-	smtutil::Expression initializer(ContractDefinition const& _contract, ContractDefinition const& _contractContext);
-	/// @returns a predicate that defines a constructor summary.
-	smtutil::Expression summary(ContractDefinition const& _contract);
-	/// @returns a predicate that defines a function summary.
-	smtutil::Expression summary(FunctionDefinition const& _function);
-	smtutil::Expression summary(FunctionDefinition const& _function, ContractDefinition const& _contract);
-	/// @returns a predicate that applies a function summary
-	/// over the constrained variables.
-	smtutil::Expression summaryCall(FunctionDefinition const& _function);
-	smtutil::Expression summaryCall(FunctionDefinition const& _function, ContractDefinition const& _contract);
-	/// @returns a predicate that defines an external function summary.
-	smtutil::Expression externalSummary(FunctionDefinition const& _function);
-	smtutil::Expression externalSummary(FunctionDefinition const& _function, ContractDefinition const& _contract);
-	//@}
-
-	/// Solver related.
-	//@{
-	/// Adds Horn rule to the solver.
-	void addRule(smtutil::Expression const& _rule, std::string const& _ruleName);
-	/// @returns <true, invariant, empty> if query is unsatisfiable (safe).
-	/// @returns <false, Expression(true), model> otherwise.
-	std::tuple<smtutil::CheckResult, smtutil::Expression, smtutil::CHCSolverInterface::CexGraph> query(smtutil::Expression const& _query, langutil::SourceLocation const& _location);
-
-	void verificationTargetEncountered(ASTNode const* const _errorNode, VerificationTargetType _type, smtutil::Expression const& _errorCondition);
-
-	void checkVerificationTargets();
-	struct CHCQueryPlaceholder;
-	void checkAssertTarget(ASTNode const* _scope, CHCVerificationTarget const& _target);
-	void checkAndReportTarget(
-		CHCVerificationTarget const& _target,
-		std::vector<CHCQueryPlaceholder> const& _placeholders,
-		langutil::ErrorId _errorReporterId,
-		std::string _satMsg,
-		std::string _unknownMsg = ""
-	);
-
-	std::pair<std::string, langutil::ErrorId> targetDescription(CHCVerificationTarget const& _target);
-
-	std::optional<std::string> generateCounterexample(smtutil::CHCSolverInterface::CexGraph const& _graph, std::string const& _root);
-
-	/// @returns a call graph for function summaries in the counterexample graph.
-	/// The returned map also contains a key _root, whose value are the
-	/// summaries called by _root.
-	std::map<unsigned, std::vector<unsigned>> summaryCalls(
-		smtutil::CHCSolverInterface::CexGraph const& _graph,
-		unsigned _root
-	);
-
-	/// @returns a set of pairs _var = _value separated by _separator.
-	template <typename T>
-	std::string formatVariableModel(std::vector<T> const& _variables, std::vector<std::optional<std::string>> const& _values, std::string const& _separator) const
-	{
-		solAssert(_variables.size() == _values.size(), "");
-
-		std::vector<std::string> assignments;
-		for (unsigned i = 0; i < _values.size(); ++i)
-		{
-			auto var = _variables.at(i);
-			if (var && _values.at(i))
-				assignments.emplace_back(var->name() + " = " + *_values.at(i));
-		}
-
-		return boost::algorithm::join(assignments, _separator);
-	}
-
-	/// @returns a DAG in the dot format.
-	/// Used for debugging purposes.
-	std::string cex2dot(smtutil::CHCSolverInterface::CexGraph const& _graph);
-	//@}
-
-	/// Misc.
-	//@{
-	/// @returns a prefix to be used in a new unique block name
-	/// and increases the block counter.
-	std::string uniquePrefix();
-
-	/// @returns a suffix to be used by contract related predicates.
-	std::string contractSuffix(ContractDefinition const& _contract);
-
-	/// @returns a new unique error id associated with _expr and stores
-	/// it into m_errorIds.
-	unsigned newErrorId();
-
-	smt::SymbolicIntVariable& errorFlag();
-
-	/// Adds to the solver constraints that
-	/// - propagate tx.origin
-	/// - set the current contract as msg.sender
-	/// - set the msg.value as _value, if not nullptr
-	void newTxConstraints(Expression const* _value);
-
-	/// @returns the expression representing the value sent in
-	/// an external call if present,
-	/// and nullptr otherwise.
-	frontend::Expression const* valueOption(FunctionCallOptions const* _options);
-
-	/// Adds constraints that decrease the balance of the caller by _value.
-	void decreaseBalanceFromOptionsValue(Expression const& _value);
-	//@}
-
-	/// Predicates.
-	//@{
-	/// Artificial Interface predicate.
-	/// Single entry block for all functions.
-	std::map<ContractDefinition const*, Predicate const*> m_interfaces;
-
-	/// Nondeterministic interfaces.
-	/// These are used when the analyzed contract makes external calls to unknown code,
-	/// which means that the analyzed contract can potentially be called
-	/// nondeterministically.
-	std::map<ContractDefinition const*, Predicate const*> m_nondetInterfaces;
-
-	std::map<ContractDefinition const*, Predicate const*> m_constructorSummaries;
-	std::map<ContractDefinition const*, std::map<ContractDefinition const*, Predicate const*>> m_contractInitializers;
-
-	/// Artificial Error predicate.
-	/// Single error block for all assertions.
-	Predicate const* m_errorPredicate = nullptr;
-
-	/// Function predicates.
-	std::map<ContractDefinition const*, std::map<FunctionDefinition const*, Predicate const*>> m_summaries;
-
-	/// External function predicates.
-	std::map<ContractDefinition const*, std::map<FunctionDefinition const*, Predicate const*>> m_externalSummaries;
-	//@}
-
-	/// Variables.
-	//@{
-	/// State variables.
-	/// Used to create all predicates.
-	std::vector<VariableDeclaration const*> m_stateVariables;
-	//@}
-
-	/// Verification targets.
-	//@{
-	/// Query placeholder stores information necessary to create the final query edge in the CHC system.
-	/// It is combined with the unique error id (and error type) to create a complete Verification Target.
-	struct CHCQueryPlaceholder
-	{
-		smtutil::Expression const constraints;
-		smtutil::Expression const errorExpression;
-		smtutil::Expression const fromPredicate;
-	};
-
-	/// Query placeholders for constructors, if the key has type ContractDefinition*,
-	/// or external functions, if the key has type FunctionDefinition*.
-	/// A placeholder is created for each possible context of a function (e.g. multiple contracts in contract inheritance hierarchy).
-	std::map<ASTNode const*, std::vector<CHCQueryPlaceholder>, smt::EncodingContext::IdCompare> m_queryPlaceholders;
-
-	/// Records verification conditions IDs per function encountered during an analysis of that function.
-	/// The key is the ASTNode of the function where the verification condition has been encountered,
-	/// or the ASTNode of the contract if the verification condition happens inside an implicit constructor.
-	std::map<ASTNode const*, std::vector<unsigned>, smt::EncodingContext::IdCompare> m_functionTargetIds;
-	/// Helper mapping unique IDs to actual verification targets.
-	std::map<unsigned, CHCVerificationTarget> m_verificationTargets;
-
-	/// Targets proved safe.
-	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
-	/// Targets proved unsafe.
-	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unsafeTargets;
-	/// Targets not proved.
-	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unprovedTargets;
-
-	/// Inferred invariants.
-	std::map<Predicate const*, std::set<std::string>, PredicateCompare> m_invariants;
-	//@}
-
-	/// Control-flow.
-	//@{
-	FunctionDefinition const* m_currentFunction = nullptr;
-
-	std::map<ASTNode const*, std::set<ASTNode const*, smt::EncodingContext::IdCompare>, smt::EncodingContext::IdCompare> m_callGraph;
-
-	/// The current block.
-	smtutil::Expression m_currentBlock = smtutil::Expression(true);
-
-	/// Counter to generate unique block names.
-	unsigned m_blockCounter = 0;
-
-	/// Whether a function call was seen in the current scope.
-	bool m_unknownFunctionCallSeen = false;
-
-	/// Block where a loop break should go to.
-	Predicate const* m_breakDest = nullptr;
-	/// Block where a loop continue should go to.
-	Predicate const* m_continueDest = nullptr;
-
-	/// Block where an error condition should go to.
-	/// This can be:
-	/// 1) Constructor initializer summary, if error happens while evaluating initial values of state variables.
-	/// 2) Constructor summary, if error happens while evaluating base constructor arguments.
-	/// 3) Function summary, if error happens inside a function.
-	Predicate const* m_errorDest = nullptr;
-
-	/// Represents the stack of destinations where a `return` should go.
-	/// This is different from `m_errorDest` above:
-	/// - Constructor initializers and constructor summaries will never be `return` targets because they are artificial.
-	/// - Modifiers also have their own `return` target blocks, whereas they do not have their own error destination.
-	std::vector<Predicate const*> m_returnDests;
-	//@}
-
-	/// CHC solver.
-	std::unique_ptr<smtutil::CHCSolverInterface> m_interface;
-
-	std::map<util::h256, std::string> const& m_smtlib2Responses;
-	ReadCallback::Callback const& m_smtCallback;
-};
-
-}
diff --git a/libsolidity/formal/EncodingContext.cpp b/libsolidity/formal/EncodingContext.cpp
deleted file mode 100644
index e0a09bcf7b8f..000000000000
--- a/libsolidity/formal/EncodingContext.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/EncodingContext.h>
-
-#include <libsolidity/formal/SymbolicTypes.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend::smt;
-
-EncodingContext::EncodingContext():
-	m_state(*this)
-{
-}
-
-void EncodingContext::reset()
-{
-	resetAllVariables();
-	m_expressions.clear();
-	m_globalContext.clear();
-	m_state.reset();
-	m_assertions.clear();
-}
-
-void EncodingContext::resetUniqueId()
-{
-	m_nextUniqueId = 0;
-}
-
-unsigned EncodingContext::newUniqueId()
-{
-	return m_nextUniqueId++;
-}
-
-/// Variables.
-
-std::shared_ptr<SymbolicVariable> EncodingContext::variable(frontend::VariableDeclaration const& _varDecl)
-{
-	solAssert(knownVariable(_varDecl), "");
-	return m_variables[&_varDecl];
-}
-
-bool EncodingContext::createVariable(frontend::VariableDeclaration const& _varDecl)
-{
-	solAssert(!knownVariable(_varDecl), "");
-	auto const& type = _varDecl.type();
-	auto result = newSymbolicVariable(*type, _varDecl.name() + "_" + std::to_string(_varDecl.id()), *this);
-	m_variables.emplace(&_varDecl, result.second);
-	return result.first;
-}
-
-bool EncodingContext::knownVariable(frontend::VariableDeclaration const& _varDecl)
-{
-	return m_variables.count(&_varDecl);
-}
-
-void EncodingContext::resetVariable(frontend::VariableDeclaration const& _variable)
-{
-	newValue(_variable);
-	setUnknownValue(_variable);
-}
-
-void EncodingContext::resetVariables(std::set<frontend::VariableDeclaration const*> const& _variables)
-{
-	for (auto const* decl: _variables)
-		resetVariable(*decl);
-}
-
-void EncodingContext::resetVariables(std::function<bool(frontend::VariableDeclaration const&)> const& _filter)
-{
-	for_each(begin(m_variables), end(m_variables), [&](auto _variable)
-	{
-		if (_filter(*_variable.first))
-			this->resetVariable(*_variable.first);
-	});
-}
-
-void EncodingContext::resetAllVariables()
-{
-	resetVariables([&](frontend::VariableDeclaration const&) { return true; });
-}
-
-smtutil::Expression EncodingContext::newValue(frontend::VariableDeclaration const& _decl)
-{
-	solAssert(knownVariable(_decl), "");
-	return m_variables.at(&_decl)->increaseIndex();
-}
-
-void EncodingContext::setZeroValue(frontend::VariableDeclaration const& _decl)
-{
-	solAssert(knownVariable(_decl), "");
-	setZeroValue(*m_variables.at(&_decl));
-}
-
-void EncodingContext::setZeroValue(SymbolicVariable& _variable)
-{
-	setSymbolicZeroValue(_variable, *this);
-}
-
-void EncodingContext::setUnknownValue(frontend::VariableDeclaration const& _decl)
-{
-	solAssert(knownVariable(_decl), "");
-	setUnknownValue(*m_variables.at(&_decl));
-}
-
-void EncodingContext::setUnknownValue(SymbolicVariable& _variable)
-{
-	setSymbolicUnknownValue(_variable, *this);
-}
-
-/// Expressions
-
-std::shared_ptr<SymbolicVariable> EncodingContext::expression(frontend::Expression const& _e)
-{
-	if (!knownExpression(_e))
-		createExpression(_e);
-	return m_expressions.at(&_e);
-}
-
-bool EncodingContext::createExpression(frontend::Expression const& _e, std::shared_ptr<SymbolicVariable> _symbVar)
-{
-	solAssert(_e.annotation().type, "");
-	if (knownExpression(_e))
-	{
-		expression(_e)->increaseIndex();
-		return false;
-	}
-	else if (_symbVar)
-	{
-		m_expressions.emplace(&_e, _symbVar);
-		return false;
-	}
-	else
-	{
-		auto result = newSymbolicVariable(*_e.annotation().type, "expr_" + std::to_string(_e.id()), *this);
-		m_expressions.emplace(&_e, result.second);
-		return result.first;
-	}
-}
-
-bool EncodingContext::knownExpression(frontend::Expression const& _e) const
-{
-	return m_expressions.count(&_e);
-}
-
-/// Global variables and functions.
-
-std::shared_ptr<SymbolicVariable> EncodingContext::globalSymbol(std::string const& _name)
-{
-	solAssert(knownGlobalSymbol(_name), "");
-	return m_globalContext.at(_name);
-}
-
-bool EncodingContext::createGlobalSymbol(std::string const& _name, frontend::Expression const& _expr)
-{
-	solAssert(!knownGlobalSymbol(_name), "");
-	auto result = newSymbolicVariable(*_expr.annotation().type, _name, *this);
-	m_globalContext.emplace(_name, result.second);
-	setUnknownValue(*result.second);
-	return result.first;
-}
-
-bool EncodingContext::knownGlobalSymbol(std::string const& _var) const
-{
-	return m_globalContext.count(_var);
-}
-
-/// Solver.
-
-smtutil::Expression EncodingContext::assertions()
-{
-	if (m_assertions.empty())
-		return smtutil::Expression(true);
-
-	return m_assertions.back();
-}
-
-void EncodingContext::pushSolver()
-{
-	if (m_accumulateAssertions)
-		m_assertions.push_back(assertions());
-	else
-		m_assertions.emplace_back(true);
-}
-
-void EncodingContext::popSolver()
-{
-	solAssert(!m_assertions.empty(), "");
-	m_assertions.pop_back();
-}
-
-void EncodingContext::addAssertion(smtutil::Expression const& _expr)
-{
-	if (m_assertions.empty())
-		m_assertions.push_back(_expr);
-	else
-		m_assertions.back() = _expr && std::move(m_assertions.back());
-}
diff --git a/libsolidity/formal/EncodingContext.h b/libsolidity/formal/EncodingContext.h
deleted file mode 100644
index 35e54ed76bc9..000000000000
--- a/libsolidity/formal/EncodingContext.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/SymbolicState.h>
-#include <libsolidity/formal/SymbolicVariables.h>
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <map>
-
-namespace solidity::frontend::smt
-{
-
-/**
- * Stores the context of the SMT encoding.
- */
-class EncodingContext
-{
-public:
-	EncodingContext();
-
-	/// Resets the entire context except for symbolic variables which stay
-	/// alive because of state variables and inlined function calls.
-	/// To be used in the beginning of a root function visit.
-	void reset();
-	/// Resets the fresh id for slack variables.
-	void resetUniqueId();
-	/// Returns the current fresh slack id and increments it.
-	unsigned newUniqueId();
-	/// Clears the entire context, erasing everything.
-	/// To be used before a model checking engine starts.
-	void clear();
-
-	/// Sets the current solver used by the current engine for
-	/// SMT variable declaration.
-	void setSolver(smtutil::SolverInterface* _solver)
-	{
-		solAssert(_solver, "");
-		m_solver = _solver;
-	}
-
-	/// Sets whether the context should conjoin assertions in the assertion stack.
-	void setAssertionAccumulation(bool _acc) { m_accumulateAssertions = _acc; }
-
-	/// Forwards variable creation to the solver.
-	smtutil::Expression newVariable(std::string _name, smtutil::SortPointer _sort)
-	{
-		solAssert(m_solver, "");
-		return m_solver->newVariable(std::move(_name), std::move(_sort));
-	}
-
-	struct IdCompare
-	{
-		bool operator()(ASTNode const* lhs, ASTNode const* rhs) const
-		{
-			return lhs->id() < rhs->id();
-		}
-	};
-
-	/// Variables.
-	//@{
-	/// @returns the symbolic representation of a program variable.
-	std::shared_ptr<SymbolicVariable> variable(frontend::VariableDeclaration const& _varDecl);
-	/// @returns all symbolic variables.
-	std::map<frontend::VariableDeclaration const*, std::shared_ptr<SymbolicVariable>, IdCompare> const& variables() const { return m_variables; }
-
-	/// Creates a symbolic variable and
-	/// @returns true if a variable's type is not supported and is therefore abstract.
-	bool createVariable(frontend::VariableDeclaration const& _varDecl);
-	/// @returns true if variable was created.
-	bool knownVariable(frontend::VariableDeclaration const& _varDecl);
-
-	/// Resets a specific variable.
-	void resetVariable(frontend::VariableDeclaration const& _variable);
-	/// Resets a set of variables.
-	void resetVariables(std::set<frontend::VariableDeclaration const*> const& _variables);
-	/// Resets variables according to a predicate.
-	void resetVariables(std::function<bool(frontend::VariableDeclaration const&)> const& _filter);
-	///Resets all variables.
-	void resetAllVariables();
-
-	/// Allocates a new index for the declaration, updates the current
-	/// index to this value and returns the expression.
-	smtutil::Expression newValue(frontend::VariableDeclaration const& _decl);
-	/// Sets the value of the declaration to zero.
-	void setZeroValue(frontend::VariableDeclaration const& _decl);
-	void setZeroValue(SymbolicVariable& _variable);
-	/// Resets the variable to an unknown value (in its range).
-	void setUnknownValue(frontend::VariableDeclaration const& decl);
-	void setUnknownValue(SymbolicVariable& _variable);
-	//@}
-
-	/// Expressions.
-	////@{
-	/// @returns the symbolic representation of an AST node expression.
-	std::shared_ptr<SymbolicVariable> expression(frontend::Expression const& _e);
-	/// @returns all symbolic expressions.
-	std::map<frontend::Expression const*, std::shared_ptr<SymbolicVariable>, IdCompare> const& expressions() const { return m_expressions; }
-
-	/// Creates the expression (value can be arbitrary).
-	/// @returns true if type is not supported.
-	bool createExpression(frontend::Expression const& _e, std::shared_ptr<SymbolicVariable> _symbExpr = nullptr);
-	/// Checks if expression was created.
-	bool knownExpression(frontend::Expression const& _e) const;
-	//@}
-
-	/// Global variables and functions.
-	//@{
-	/// Global variables and functions.
-	std::shared_ptr<SymbolicVariable> globalSymbol(std::string const& _name);
-	/// @returns all symbolic globals.
-	std::map<std::string, std::shared_ptr<SymbolicVariable>> const& globalSymbols() const { return m_globalContext; }
-
-	/// Defines a new global variable or function
-	/// and @returns true if type was abstracted.
-	bool createGlobalSymbol(std::string const& _name, frontend::Expression const& _expr);
-	/// Checks if special variable or function was seen.
-	bool knownGlobalSymbol(std::string const& _var) const;
-	//@}
-
-	/// Solver.
-	//@{
-	/// @returns conjunction of all added assertions.
-	smtutil::Expression assertions();
-	void pushSolver();
-	void popSolver();
-	void addAssertion(smtutil::Expression const& _e);
-	size_t solverStackHeigh() { return m_assertions.size(); } const
-	smtutil::SolverInterface* solver()
-	{
-		solAssert(m_solver, "");
-		return m_solver;
-	}
-	//@}
-
-	SymbolicState& state() { return m_state; }
-
-private:
-	/// Symbolic expressions.
-	//{@
-	/// Symbolic variables.
-	std::map<frontend::VariableDeclaration const*, std::shared_ptr<SymbolicVariable>, IdCompare> m_variables;
-
-	/// Symbolic expressions.
-	std::map<frontend::Expression const*, std::shared_ptr<SymbolicVariable>, IdCompare> m_expressions;
-
-	/// Symbolic representation of global symbols including
-	/// variables and functions.
-	std::map<std::string, std::shared_ptr<smt::SymbolicVariable>> m_globalContext;
-
-	/// Symbolic representation of the blockchain state.
-	SymbolicState m_state;
-	//@}
-
-	/// Solver related.
-	//@{
-	/// Solver can be SMT solver or Horn solver in the future.
-	smtutil::SolverInterface* m_solver = nullptr;
-
-	/// Assertion stack.
-	std::vector<smtutil::Expression> m_assertions;
-
-	/// Whether to conjoin assertions in the assertion stack.
-	bool m_accumulateAssertions = true;
-	//@}
-
-	/// Central source of unique ids.
-	unsigned m_nextUniqueId = 0;
-};
-
-}
diff --git a/libsolidity/formal/ExpressionFormatter.cpp b/libsolidity/formal/ExpressionFormatter.cpp
deleted file mode 100644
index cf2f2c3b8126..000000000000
--- a/libsolidity/formal/ExpressionFormatter.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/ExpressionFormatter.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/CommonData.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <range/v3/algorithm/for_each.hpp>
-
-#include <map>
-#include <vector>
-#include <string>
-
-using boost::algorithm::starts_with;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::smtutil;
-using namespace solidity::frontend::smt;
-
-namespace solidity::frontend::smt
-{
-
-namespace
-{
-
-std::string formatDatatypeAccessor(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
-{
-	auto const& op = _expr.name;
-
-	// This is the most complicated part of the translation.
-	// Datatype accessor means access to a field of a datatype.
-	// In our encoding, datatypes are used to encode:
-	// - arrays/mappings as the tuple (array, length)
-	// - structs as the tuple (<member1>, ..., <memberK>)
-	// - hash and signature functions as the tuple (keccak256, sha256, ripemd160, ecrecover),
-	//   where each element is an array emulating an UF
-	// - abi.* functions as the tuple (<abiCall1>, ..., <abiCallK>).
-	if (op == "dt_accessor_keccak256")
-		return "keccak256";
-	if (op == "dt_accessor_sha256")
-		return "sha256";
-	if (op == "dt_accessor_ripemd160")
-		return "ripemd160";
-	if (op == "dt_accessor_ecrecover")
-		return "ecrecover";
-
-	std::string accessorStr = "accessor_";
-	// Struct members have suffix "accessor_<memberName>".
-	std::string type = op.substr(op.rfind(accessorStr) + accessorStr.size());
-	solAssert(_expr.arguments.size() == 1, "");
-
-	if (type == "length")
-		return _args.at(0) + ".length";
-	if (type == "array")
-		return _args.at(0);
-
-	if (
-		starts_with(type, "block") ||
-		starts_with(type, "msg") ||
-		starts_with(type, "tx") ||
-		starts_with(type, "abi")
-	)
-		return type;
-
-	if (starts_with(type, "t_function_abi"))
-		return type;
-
-	return _args.at(0) + "." + type;
-}
-
-std::string formatGenericOp(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
-{
-	return _expr.name + "(" + boost::algorithm::join(_args, ", ") + ")";
-}
-
-std::string formatInfixOp(std::string const& _op, std::vector<std::string> const& _args)
-{
-	return "(" + boost::algorithm::join(_args, " " + _op + " ") + ")";
-}
-
-std::string formatArrayOp(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
-{
-	if (_expr.name == "select")
-	{
-		auto const& a0 = _args.at(0);
-		static std::set<std::string> const ufs{"keccak256", "sha256", "ripemd160", "ecrecover"};
-		if (ufs.count(a0) || starts_with(a0, "t_function_abi"))
-			return _args.at(0) + "(" + _args.at(1) + ")";
-		return _args.at(0) + "[" + _args.at(1) + "]";
-	}
-	if (_expr.name == "store")
-		return "(" + _args.at(0) + "[" + _args.at(1) + "] := " + _args.at(2) + ")";
-	return formatGenericOp(_expr, _args);
-}
-
-std::string formatUnaryOp(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
-{
-	if (_expr.name == "not")
-		return "!" + _args.at(0);
-	// Other operators such as exists may end up here.
-	return formatGenericOp(_expr, _args);
-}
-
-}
-
-smtutil::Expression substitute(smtutil::Expression _from, std::map<std::string, std::string> const& _subst)
-{
-	// TODO For now we ignore nested quantifier expressions,
-	// but we should support them in the future.
-	if (_from.name == "forall" || _from.name == "exists")
-		return smtutil::Expression(true);
-	if (_subst.count(_from.name))
-		_from.name = _subst.at(_from.name);
-	for (auto& arg: _from.arguments)
-		arg = substitute(arg, _subst);
-	return _from;
-}
-
-std::string toSolidityStr(smtutil::Expression const& _expr)
-{
-	auto const& op = _expr.name;
-
-	auto const& args = _expr.arguments;
-	auto strArgs = util::applyMap(args, [](auto const& _arg) { return toSolidityStr(_arg); });
-
-	// Constant or variable.
-	if (args.empty())
-		return op;
-
-	if (starts_with(op, "dt_accessor"))
-		return formatDatatypeAccessor(_expr, strArgs);
-
-	// Infix operators with format replacements.
-	static std::map<std::string, std::string> const infixOps{
-		{"and", "&&"},
-		{"or", "||"},
-		{"implies", "=>"},
-		{"=", "="},
-		{">", ">"},
-		{">=", ">="},
-		{"<", "<"},
-		{"<=", "<="},
-		{"+", "+"},
-		{"-", "-"},
-		{"*", "*"},
-		{"/", "/"},
-		{"div", "/"},
-		{"mod", "%"}
-	};
-	// Some of these (and, or, +, *) may have >= 2 arguments from z3.
-	if (infixOps.count(op))
-		return formatInfixOp(infixOps.at(op), strArgs);
-
-	static std::set<std::string> const arrayOps{"select", "store", "const_array"};
-	if (arrayOps.count(op))
-		return formatArrayOp(_expr, strArgs);
-
-	if (args.size() == 1)
-		return formatUnaryOp(_expr, strArgs);
-
-	// Other operators such as bv2int, int2bv may end up here.
-	return op + "(" + boost::algorithm::join(strArgs, ", ") + ")";
-}
-
-}
diff --git a/libsolidity/formal/ExpressionFormatter.h b/libsolidity/formal/ExpressionFormatter.h
deleted file mode 100644
index 3efbeb781f2c..000000000000
--- a/libsolidity/formal/ExpressionFormatter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-/**
- * Formats SMT expressions into Solidity-like strings.
- */
-
-#include <libsolidity/formal/Predicate.h>
-
-#include <map>
-#include <string>
-
-namespace solidity::frontend::smt
-{
-
-/// @returns another smtutil::Expressions where every term in _from
-/// may be replaced if it is in the substitution map _subst.
-smtutil::Expression substitute(smtutil::Expression _from, std::map<std::string, std::string> const& _subst);
-
-/// @returns a Solidity-like expression string built from _expr.
-/// This is done at best-effort and is not guaranteed to always create a perfect Solidity expression string.
-std::string toSolidityStr(smtutil::Expression const& _expr);
-
-}
diff --git a/libsolidity/formal/Invariants.cpp b/libsolidity/formal/Invariants.cpp
deleted file mode 100644
index 017ab1e3aedb..000000000000
--- a/libsolidity/formal/Invariants.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/Invariants.h>
-
-#include <libsolidity/formal/ExpressionFormatter.h>
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <libsolutil/Algorithms.h>
-
-#include <boost/algorithm/string.hpp>
-
-using boost::algorithm::starts_with;
-using namespace solidity;
-using namespace solidity::smtutil;
-using namespace solidity::frontend::smt;
-
-namespace solidity::frontend::smt
-{
-
-std::map<Predicate const*, std::set<std::string>> collectInvariants(
-	smtutil::Expression const& _proof,
-	std::set<Predicate const*> const& _predicates,
-	ModelCheckerInvariants const& _invariantsSetting
-)
-{
-	std::set<std::string> targets;
-	if (_invariantsSetting.has(InvariantType::Contract))
-		targets.insert("interface_");
-	if (_invariantsSetting.has(InvariantType::Reentrancy))
-		targets.insert("nondet_interface_");
-
-	std::map<std::string, std::pair<smtutil::Expression, smtutil::Expression>> equalities;
-	// Collect equalities where one of the sides is a predicate we're interested in.
-	util::BreadthFirstSearch<smtutil::Expression const*>{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) {
-		if (_expr->name == "=")
-			for (auto const& t: targets)
-			{
-				auto arg0 = _expr->arguments.at(0);
-				auto arg1 = _expr->arguments.at(1);
-				if (starts_with(arg0.name, t))
-					equalities.insert({arg0.name, {arg0, std::move(arg1)}});
-				else if (starts_with(arg1.name, t))
-					equalities.insert({arg1.name, {arg1, std::move(arg0)}});
-			}
-		for (auto const& arg: _expr->arguments)
-			_addChild(&arg);
-	});
-
-	std::map<Predicate const*, std::set<std::string>> invariants;
-	for (auto pred: _predicates)
-	{
-		auto predName = pred->functor().name;
-		if (!equalities.count(predName))
-			continue;
-
-		solAssert(pred->contextContract(), "");
-
-		auto const& [predExpr, invExpr] = equalities.at(predName);
-
-		static std::set<std::string> const ignore{"true", "false"};
-		auto r = substitute(invExpr, pred->expressionSubstitution(predExpr));
-		// No point in reporting true/false as invariants.
-		if (!ignore.count(r.name))
-			invariants[pred].insert(toSolidityStr(r));
-	}
-	return invariants;
-}
-
-}
diff --git a/libsolidity/formal/Invariants.h b/libsolidity/formal/Invariants.h
deleted file mode 100644
index b6459fccd415..000000000000
--- a/libsolidity/formal/Invariants.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/ModelCheckerSettings.h>
-#include <libsolidity/formal/Predicate.h>
-
-#include <map>
-#include <set>
-#include <string>
-
-namespace solidity::frontend::smt
-{
-
-std::map<Predicate const*, std::set<std::string>> collectInvariants(
-	smtutil::Expression const& _proof,
-	std::set<Predicate const*> const& _predicates,
-	ModelCheckerInvariants const& _invariantsSettings
-);
-
-}
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
deleted file mode 100644
index 5632ff5c4ec6..000000000000
--- a/libsolidity/formal/ModelChecker.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/ModelChecker.h>
-#ifdef HAVE_Z3
-#include <libsmtutil/Z3Interface.h>
-#endif
-#ifdef HAVE_Z3_DLOPEN
-#include <z3_version.h>
-#endif
-
-#if defined(__linux) || defined(__APPLE__)
-#include <boost/process.hpp>
-#endif
-
-#include <range/v3/algorithm/any_of.hpp>
-#include <range/v3/view.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::smtutil;
-
-ModelChecker::ModelChecker(
-	ErrorReporter& _errorReporter,
-	langutil::CharStreamProvider const& _charStreamProvider,
-	std::map<h256, std::string> const& _smtlib2Responses,
-	ModelCheckerSettings _settings,
-	ReadCallback::Callback const& _smtCallback
-):
-	m_errorReporter(_errorReporter),
-	m_settings(std::move(_settings)),
-	m_context(),
-	m_bmc(m_context, m_uniqueErrorReporter, m_unsupportedErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider),
-	m_chc(m_context, m_uniqueErrorReporter, m_unsupportedErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider)
-{
-}
-
-// TODO This should be removed for 0.9.0.
-bool ModelChecker::isPragmaPresent(std::vector<std::shared_ptr<SourceUnit>> const& _sources)
-{
-	return ranges::any_of(_sources, [](auto _source) {
-		return _source && _source->annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker);
-	});
-}
-
-void ModelChecker::checkRequestedSourcesAndContracts(std::vector<std::shared_ptr<SourceUnit>> const& _sources)
-{
-	std::map<std::string, std::set<std::string>> exist;
-	for (auto const& source: _sources)
-		for (auto node: source->nodes())
-			if (auto contract = std::dynamic_pointer_cast<ContractDefinition>(node))
-				exist[contract->sourceUnitName()].insert(contract->name());
-
-	// Requested sources
-	for (auto const& sourceName: m_settings.contracts.contracts | ranges::views::keys)
-	{
-		if (!exist.count(sourceName))
-		{
-			m_uniqueErrorReporter.warning(
-				9134_error,
-				SourceLocation(),
-				"Requested source \"" + sourceName + "\" does not exist."
-			);
-			continue;
-		}
-		auto const& source = exist.at(sourceName);
-		// Requested contracts in source `s`.
-		for (auto const& contract: m_settings.contracts.contracts.at(sourceName))
-			if (!source.count(contract))
-				m_uniqueErrorReporter.warning(
-					7400_error,
-					SourceLocation(),
-					"Requested contract \"" + contract + "\" does not exist in source \"" + sourceName + "\"."
-				);
-	}
-}
-
-void ModelChecker::analyze(SourceUnit const& _source)
-{
-	// TODO This should be removed for 0.9.0.
-	if (_source.annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker))
-	{
-		PragmaDirective const* smtPragma = nullptr;
-		for (auto node: _source.nodes())
-			if (auto pragma = std::dynamic_pointer_cast<PragmaDirective>(node))
-				if (
-					pragma->literals().size() >= 2 &&
-					pragma->literals().at(1) == "SMTChecker"
-				)
-				{
-					smtPragma = pragma.get();
-					break;
-				}
-		solAssert(smtPragma, "");
-		m_uniqueErrorReporter.warning(
-			5523_error,
-			smtPragma->location(),
-			"The SMTChecker pragma has been deprecated and will be removed in the future. "
-			"Please use the \"model checker engine\" compiler setting to activate the SMTChecker instead. "
-			"If the pragma is enabled, all engines will be used."
-		);
-	}
-
-	if (m_settings.engine.none())
-		return;
-
-	if (m_settings.engine.chc)
-		m_chc.analyze(_source);
-
-	std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> solvedTargets;
-
-	for (auto const& [node, targets]: m_chc.safeTargets())
-		for (auto const& target: targets)
-			solvedTargets[node].insert(target.type);
-
-	for (auto const& [node, targets]: m_chc.unsafeTargets())
-		solvedTargets[node] += targets | ranges::views::keys;
-
-	if (m_settings.engine.bmc)
-		m_bmc.analyze(_source, solvedTargets);
-
-	if (m_settings.showUnsupported)
-	{
-		m_errorReporter.append(m_unsupportedErrorReporter.errors());
-		m_unsupportedErrorReporter.clear();
-	}
-	else if (!m_unsupportedErrorReporter.errors().empty())
-		m_errorReporter.warning(
-			5724_error,
-			{},
-			"SMTChecker: " +
-			std::to_string(m_unsupportedErrorReporter.errors().size()) +
-			" unsupported language feature(s)."
-			" Enable the model checker option \"show unsupported\" to see all of them."
-		);
-
-	m_errorReporter.append(m_uniqueErrorReporter.errors());
-	m_uniqueErrorReporter.clear();
-}
-
-std::vector<std::string> ModelChecker::unhandledQueries()
-{
-	return m_bmc.unhandledQueries() + m_chc.unhandledQueries();
-}
-
-SMTSolverChoice ModelChecker::availableSolvers()
-{
-	smtutil::SMTSolverChoice available = smtutil::SMTSolverChoice::SMTLIB2();
-#if defined(__linux) || defined(__APPLE__)
-	available.eld = !boost::process::search_path("eld").empty();
-#endif
-#ifdef HAVE_Z3
-	available.z3 = solidity::smtutil::Z3Interface::available();
-#endif
-#ifdef HAVE_CVC4
-	available.cvc4 = true;
-#endif
-	return available;
-}
-
-SMTSolverChoice ModelChecker::checkRequestedSolvers(SMTSolverChoice _enabled, ErrorReporter& _errorReporter)
-{
-	SMTSolverChoice availableSolvers{ModelChecker::availableSolvers()};
-
-	if (_enabled.cvc4 && !availableSolvers.cvc4)
-	{
-		_enabled.cvc4 = false;
-		_errorReporter.warning(
-			4902_error,
-			SourceLocation(),
-			"Solver CVC4 was selected for SMTChecker but it is not available."
-		);
-	}
-
-	if (_enabled.eld && !availableSolvers.eld)
-	{
-		_enabled.eld = false;
-		_errorReporter.warning(
-			4458_error,
-			SourceLocation(),
-#if defined(__linux) || defined(__APPLE__)
-			"Solver Eldarica was selected for SMTChecker but it was not found in the system."
-#else
-			"Solver Eldarica was selected for SMTChecker but it is only supported on Linux and MacOS."
-#endif
-		);
-	}
-
-	if (_enabled.z3 && !availableSolvers.z3)
-	{
-		_enabled.z3 = false;
-		_errorReporter.warning(
-			8158_error,
-			SourceLocation(),
-			"Solver z3 was selected for SMTChecker but it is not available."
-#ifdef HAVE_Z3_DLOPEN
-			" libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION) + " was not found."
-#endif
-		);
-	}
-
-	return _enabled;
-}
diff --git a/libsolidity/formal/ModelChecker.h b/libsolidity/formal/ModelChecker.h
deleted file mode 100644
index 4c795fa7079d..000000000000
--- a/libsolidity/formal/ModelChecker.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Entry point to the model checking engines.
- * The goal of this class is to make different
- * engines share knowledge to boost their proving power.
- */
-
-#pragma once
-
-#include <libsolidity/formal/BMC.h>
-#include <libsolidity/formal/CHC.h>
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/ModelCheckerSettings.h>
-
-#include <libsolidity/interface/ReadFile.h>
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/UniqueErrorReporter.h>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-}
-
-namespace solidity::frontend
-{
-
-class ModelChecker
-{
-public:
-	/// @param _enabledSolvers represents a runtime choice of which SMT solvers
-	/// should be used, even if all are available. The default choice is to use all.
-	ModelChecker(
-		langutil::ErrorReporter& _errorReporter,
-		langutil::CharStreamProvider const& _charStreamProvider,
-		std::map<solidity::util::h256, std::string> const& _smtlib2Responses,
-		ModelCheckerSettings _settings = ModelCheckerSettings{},
-		ReadCallback::Callback const& _smtCallback = ReadCallback::Callback()
-	);
-
-	// TODO This should be removed for 0.9.0.
-	static bool isPragmaPresent(std::vector<std::shared_ptr<SourceUnit>> const& _sources);
-
-	/// Generates error messages if the requested sources and contracts
-	/// do not exist.
-	void checkRequestedSourcesAndContracts(std::vector<std::shared_ptr<SourceUnit>> const& _sources);
-
-	void analyze(SourceUnit const& _sources);
-
-	/// This is used if the SMT solver is not directly linked into this binary.
-	/// @returns a list of inputs to the SMT solver that were not part of the argument to
-	/// the constructor.
-	std::vector<std::string> unhandledQueries();
-
-	/// @returns SMT solvers that are available via the C++ API.
-	static smtutil::SMTSolverChoice availableSolvers();
-
-	/// @returns the intersection of the enabled and available solvers,
-	/// reporting warnings when a solver is enabled but not available.
-	static smtutil::SMTSolverChoice checkRequestedSolvers(smtutil::SMTSolverChoice _enabled, langutil::ErrorReporter& _errorReporter);
-
-private:
-	/// Error reporter from CompilerStack.
-	/// We need to append m_uniqueErrorReporter
-	/// to this one when the analysis is done.
-	langutil::ErrorReporter& m_errorReporter;
-
-	/// Used by ModelChecker, SMTEncoder, BMC and CHC to avoid duplicates.
-	/// This is local to ModelChecker, so needs to be appended
-	/// to m_errorReporter at the end of the analysis.
-	langutil::UniqueErrorReporter m_uniqueErrorReporter;
-
-	/// Used by SMTEncoder, BMC and CHC to accumulate unsupported
-	/// warnings and avoid duplicates.
-	/// This is local to ModelChecker, so needs to be appended
-	/// to m_errorReporter at the end of the analysis.
-	langutil::UniqueErrorReporter m_unsupportedErrorReporter;
-
-	ModelCheckerSettings m_settings;
-
-	/// Stores the context of the encoding.
-	smt::EncodingContext m_context;
-
-	/// Bounded Model Checker engine.
-	BMC m_bmc;
-
-	/// Constrained Horn Clauses engine.
-	CHC m_chc;
-};
-
-}
diff --git a/libsolidity/formal/ModelCheckerSettings.cpp b/libsolidity/formal/ModelCheckerSettings.cpp
deleted file mode 100644
index ed4d5ce204c0..000000000000
--- a/libsolidity/formal/ModelCheckerSettings.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/ModelCheckerSettings.h>
-
-#include <optional>
-#include <range/v3/view.hpp>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-std::map<std::string, InvariantType> const ModelCheckerInvariants::validInvariants{
-	{"contract", InvariantType::Contract},
-	{"reentrancy", InvariantType::Reentrancy}
-};
-
-std::optional<ModelCheckerInvariants> ModelCheckerInvariants::fromString(std::string const& _invs)
-{
-	std::set<InvariantType> chosenInvs;
-	if (_invs == "default")
-	{
-		// The default is that no invariants are reported.
-	}
-	else if (_invs == "all")
-		for (auto&& v: validInvariants | ranges::views::values)
-			chosenInvs.insert(v);
-	else
-		for (auto&& t: _invs | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
-		{
-			if (!validInvariants.count(t))
-				return {};
-			chosenInvs.insert(validInvariants.at(t));
-		}
-
-	return ModelCheckerInvariants{chosenInvs};
-}
-
-bool ModelCheckerInvariants::setFromString(std::string const& _inv)
-{
-	if (!validInvariants.count(_inv))
-		return false;
-	invariants.insert(validInvariants.at(_inv));
-	return true;
-}
-
-using TargetType = VerificationTargetType;
-std::map<std::string, TargetType> const ModelCheckerTargets::targetStrings{
-	{"constantCondition", TargetType::ConstantCondition},
-	{"underflow", TargetType::Underflow},
-	{"overflow", TargetType::Overflow},
-	{"divByZero", TargetType::DivByZero},
-	{"balance", TargetType::Balance},
-	{"assert", TargetType::Assert},
-	{"popEmptyArray", TargetType::PopEmptyArray},
-	{"outOfBounds", TargetType::OutOfBounds}
-};
-
-std::map<TargetType, std::string> const ModelCheckerTargets::targetTypeToString{
-	{TargetType::ConstantCondition, "Constant condition"},
-	{TargetType::Underflow, "Underflow"},
-	{TargetType::Overflow, "Overflow"},
-	{TargetType::DivByZero, "Division by zero"},
-	{TargetType::Balance, "Insufficient balance"},
-	{TargetType::Assert, "Assertion failed"},
-	{TargetType::PopEmptyArray, "Empty array pop"},
-	{TargetType::OutOfBounds, "Out of bounds access"}
-};
-
-std::optional<ModelCheckerTargets> ModelCheckerTargets::fromString(std::string const& _targets)
-{
-	std::set<TargetType> chosenTargets;
-	if (_targets == "default" || _targets == "all")
-	{
-		bool all = _targets == "all";
-		for (auto&& v: targetStrings | ranges::views::values)
-		{
-			if (!all && (v == TargetType::Underflow || v == TargetType::Overflow))
-				continue;
-			chosenTargets.insert(v);
-		}
-	}
-	else
-		for (auto&& t: _targets | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
-		{
-			if (!targetStrings.count(t))
-				return {};
-			chosenTargets.insert(targetStrings.at(t));
-		}
-
-	return ModelCheckerTargets{chosenTargets};
-}
-
-bool ModelCheckerTargets::setFromString(std::string const& _target)
-{
-	if (!targetStrings.count(_target))
-		return false;
-	targets.insert(targetStrings.at(_target));
-	return true;
-}
-
-std::optional<ModelCheckerContracts> ModelCheckerContracts::fromString(std::string const& _contracts)
-{
-	std::map<std::string, std::set<std::string>> chosen;
-	if (_contracts == "default")
-		return ModelCheckerContracts::Default();
-
-	for (auto&& sourceContract: _contracts | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
-	{
-		auto&& names = sourceContract | ranges::views::split(':') | ranges::to<std::vector<std::string>>();
-		if (names.size() != 2 || names.at(0).empty() || names.at(1).empty())
-			return {};
-		chosen[names.at(0)].insert(names.at(1));
-	}
-
-	return ModelCheckerContracts{chosen};
-}
-
-std::optional<ModelCheckerExtCalls> ModelCheckerExtCalls::fromString(std::string const& _mode)
-{
-	if (_mode == "untrusted")
-		return ModelCheckerExtCalls{Mode::UNTRUSTED};
-	if (_mode == "trusted")
-		return ModelCheckerExtCalls{Mode::TRUSTED};
-	return {};
-}
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
deleted file mode 100644
index b645f7c3b6e7..000000000000
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <optional>
-#include <set>
-
-namespace solidity::frontend
-{
-
-struct ModelCheckerContracts
-{
-	/// By default all contracts are analyzed.
-	static ModelCheckerContracts Default() { return {}; }
-
-	/// Parses a string of the form <path>:<contract>,<path>:contract,...
-	/// and returns nullopt if a path or contract name is empty.
-	static std::optional<ModelCheckerContracts> fromString(std::string const& _contracts);
-
-	/// @returns true if all contracts should be analyzed.
-	bool isDefault() const { return contracts.empty(); }
-
-	bool has(std::string const& _source) const { return contracts.count(_source); }
-	bool has(std::string const& _source, std::string const& _contract) const
-	{
-		return has(_source) && contracts.at(_source).count(_contract);
-	}
-
-	bool operator!=(ModelCheckerContracts const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(ModelCheckerContracts const& _other) const noexcept { return contracts == _other.contracts; }
-
-	/// Represents which contracts should be analyzed by the SMTChecker
-	/// as the most derived.
-	/// The key is the source file. If the map is empty, all sources must be analyzed.
-	/// For each source, contracts[source] represents the contracts in that source
-	/// that should be analyzed.
-	/// If the set of contracts is empty, all contracts in that source should be analyzed.
-	std::map<std::string, std::set<std::string>> contracts;
-};
-
-struct ModelCheckerEngine
-{
-	bool bmc = false;
-	bool chc = false;
-
-	static constexpr ModelCheckerEngine All() { return {true, true}; }
-	static constexpr ModelCheckerEngine BMC() { return {true, false}; }
-	static constexpr ModelCheckerEngine CHC() { return {false, true}; }
-	static constexpr ModelCheckerEngine None() { return {false, false}; }
-
-	bool none() const { return !any(); }
-	bool any() const { return bmc || chc; }
-	bool all() const { return bmc && chc; }
-
-	static std::optional<ModelCheckerEngine> fromString(std::string const& _engine)
-	{
-		static std::map<std::string, ModelCheckerEngine> engineMap{
-			{"all", All()},
-			{"bmc", BMC()},
-			{"chc", CHC()},
-			{"none", None()}
-		};
-		if (engineMap.count(_engine))
-			return engineMap.at(_engine);
-		return {};
-	}
-
-	bool operator!=(ModelCheckerEngine const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(ModelCheckerEngine const& _other) const noexcept { return bmc == _other.bmc && chc == _other.chc; }
-};
-
-enum class InvariantType { Contract, Reentrancy };
-
-struct ModelCheckerInvariants
-{
-	/// Adds the default targets, that is, all except underflow and overflow.
-	static ModelCheckerInvariants Default() { return *fromString("default"); }
-	/// Adds all targets, including underflow and overflow.
-	static ModelCheckerInvariants All() { return *fromString("all"); }
-	static ModelCheckerInvariants None() { return {{}}; }
-
-	static std::optional<ModelCheckerInvariants> fromString(std::string const& _invs);
-
-	bool has(InvariantType _inv) const { return invariants.count(_inv); }
-
-	/// @returns true if the @p _target is valid,
-	/// and false otherwise.
-	bool setFromString(std::string const& _target);
-
-	static std::map<std::string, InvariantType> const validInvariants;
-
-	bool operator!=(ModelCheckerInvariants const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(ModelCheckerInvariants const& _other) const noexcept { return invariants == _other.invariants; }
-
-	std::set<InvariantType> invariants;
-};
-
-enum class VerificationTargetType { ConstantCondition, Underflow, Overflow, UnderOverflow, DivByZero, Balance, Assert, PopEmptyArray, OutOfBounds };
-
-struct ModelCheckerTargets
-{
-	/// Adds the default targets, that is, all except underflow and overflow.
-	static ModelCheckerTargets Default() { return *fromString("default"); }
-	/// Adds all targets, including underflow and overflow.
-	static ModelCheckerTargets All() { return *fromString("all"); }
-
-	static std::optional<ModelCheckerTargets> fromString(std::string const& _targets);
-
-	bool has(VerificationTargetType _type) const { return targets.count(_type); }
-
-	/// @returns true if the @p _target is valid,
-	/// and false otherwise.
-	bool setFromString(std::string const& _target);
-
-	static std::map<std::string, VerificationTargetType> const targetStrings;
-
-	static std::map<VerificationTargetType, std::string> const targetTypeToString;
-
-	bool operator!=(ModelCheckerTargets const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(ModelCheckerTargets const& _other) const noexcept { return targets == _other.targets; }
-
-	std::set<VerificationTargetType> targets;
-};
-
-struct ModelCheckerExtCalls
-{
-	enum class Mode
-	{
-		UNTRUSTED,
-		TRUSTED
-	};
-
-	Mode mode = Mode::UNTRUSTED;
-
-	static std::optional<ModelCheckerExtCalls> fromString(std::string const& _mode);
-
-	bool isTrusted() const { return mode == Mode::TRUSTED; }
-};
-
-struct ModelCheckerSettings
-{
-	std::optional<unsigned> bmcLoopIterations;
-	ModelCheckerContracts contracts = ModelCheckerContracts::Default();
-	/// Currently division and modulo are replaced by multiplication with slack vars, such that
-	/// a / b <=> a = b * k + m
-	/// where k and m are slack variables.
-	/// This is the default because Spacer prefers that over precise / and mod.
-	/// This option allows disabling this mechanism since other solvers
-	/// might prefer the precise encoding.
-	bool divModNoSlacks = false;
-	ModelCheckerEngine engine = ModelCheckerEngine::None();
-	ModelCheckerExtCalls externalCalls = {};
-	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
-	bool printQuery = false;
-	bool showProvedSafe = false;
-	bool showUnproved = false;
-	bool showUnsupported = false;
-	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::Z3();
-	ModelCheckerTargets targets = ModelCheckerTargets::Default();
-	std::optional<unsigned> timeout;
-
-	bool operator!=(ModelCheckerSettings const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(ModelCheckerSettings const& _other) const noexcept
-	{
-		return
-			bmcLoopIterations == _other.bmcLoopIterations &&
-			contracts == _other.contracts &&
-			divModNoSlacks == _other.divModNoSlacks &&
-			engine == _other.engine &&
-			externalCalls.mode == _other.externalCalls.mode &&
-			invariants == _other.invariants &&
-			printQuery == _other.printQuery &&
-			showProvedSafe == _other.showProvedSafe &&
-			showUnproved == _other.showUnproved &&
-			showUnsupported == _other.showUnsupported &&
-			solvers == _other.solvers &&
-			targets == _other.targets &&
-			timeout == _other.timeout;
-	}
-};
-
-}
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
deleted file mode 100644
index 2ab494fc4d28..000000000000
--- a/libsolidity/formal/Predicate.cpp
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/Predicate.h>
-
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/CharStream.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <range/v3/view.hpp>
-#include <utility>
-
-using boost::algorithm::starts_with;
-using namespace solidity;
-using namespace solidity::smtutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::smt;
-
-std::map<std::string, Predicate> Predicate::m_predicates;
-
-Predicate const* Predicate::create(
-	SortPointer _sort,
-	std::string _name,
-	PredicateType _type,
-	EncodingContext& _context,
-	ASTNode const* _node,
-	ContractDefinition const* _contractContext,
-	std::vector<ScopeOpener const*> _scopeStack
-)
-{
-	smt::SymbolicFunctionVariable predicate{_sort, std::move(_name), _context};
-	std::string functorName = predicate.currentName();
-	solAssert(!m_predicates.count(functorName), "");
-	return &m_predicates.emplace(
-		std::piecewise_construct,
-		std::forward_as_tuple(functorName),
-		std::forward_as_tuple(std::move(predicate), _type, _node, _contractContext, std::move(_scopeStack))
-	).first->second;
-}
-
-Predicate::Predicate(
-	smt::SymbolicFunctionVariable&& _predicate,
-	PredicateType _type,
-	ASTNode const* _node,
-	ContractDefinition const* _contractContext,
-	std::vector<ScopeOpener const*> _scopeStack
-):
-	m_predicate(std::move(_predicate)),
-	m_type(_type),
-	m_node(_node),
-	m_contractContext(_contractContext),
-	m_scopeStack(_scopeStack)
-{
-}
-
-Predicate const* Predicate::predicate(std::string const& _name)
-{
-	return &m_predicates.at(_name);
-}
-
-void Predicate::reset()
-{
-	m_predicates.clear();
-}
-
-smtutil::Expression Predicate::operator()(std::vector<smtutil::Expression> const& _args) const
-{
-	return m_predicate(_args);
-}
-
-smtutil::Expression Predicate::functor() const
-{
-	return m_predicate.currentFunctionValue();
-}
-
-smtutil::Expression Predicate::functor(unsigned _idx) const
-{
-	return m_predicate.functionValueAtIndex(_idx);
-}
-
-void Predicate::newFunctor()
-{
-	m_predicate.increaseIndex();
-}
-
-ASTNode const* Predicate::programNode() const
-{
-	return m_node;
-}
-
-ContractDefinition const* Predicate::contextContract() const
-{
-	return m_contractContext;
-}
-
-ContractDefinition const* Predicate::programContract() const
-{
-	if (auto const* contract = dynamic_cast<ContractDefinition const*>(m_node))
-		if (!contract->constructor())
-			return contract;
-
-	return nullptr;
-}
-
-FunctionDefinition const* Predicate::programFunction() const
-{
-	if (auto const* contract = dynamic_cast<ContractDefinition const*>(m_node))
-	{
-		if (contract->constructor())
-			return contract->constructor();
-		return nullptr;
-	}
-
-	if (auto const* fun = dynamic_cast<FunctionDefinition const*>(m_node))
-		return fun;
-
-	return nullptr;
-}
-
-FunctionCall const* Predicate::programFunctionCall() const
-{
-	return dynamic_cast<FunctionCall const*>(m_node);
-}
-
-VariableDeclaration  const* Predicate::programVariable() const
-{
-	return dynamic_cast<VariableDeclaration const*>(m_node);
-}
-
-std::optional<std::vector<VariableDeclaration const*>> Predicate::stateVariables() const
-{
-	if (m_contractContext)
-		return SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*m_contractContext);
-
-	return std::nullopt;
-}
-
-bool Predicate::isSummary() const
-{
-	return isFunctionSummary() ||
-		isInternalCall() ||
-		isExternalCallTrusted() ||
-		isExternalCallUntrusted() ||
-		isConstructorSummary();
-}
-
-bool Predicate::isFunctionSummary() const
-{
-	return m_type == PredicateType::FunctionSummary;
-}
-
-bool Predicate::isFunctionBlock() const
-{
-	return m_type == PredicateType::FunctionBlock;
-}
-
-bool Predicate::isFunctionErrorBlock() const
-{
-	return m_type == PredicateType::FunctionErrorBlock;
-}
-
-bool Predicate::isInternalCall() const
-{
-	return m_type == PredicateType::InternalCall;
-}
-
-bool Predicate::isExternalCallTrusted() const
-{
-	return m_type == PredicateType::ExternalCallTrusted;
-}
-
-bool Predicate::isExternalCallUntrusted() const
-{
-	return m_type == PredicateType::ExternalCallUntrusted;
-}
-
-bool Predicate::isConstructorSummary() const
-{
-	return m_type == PredicateType::ConstructorSummary;
-}
-
-bool Predicate::isInterface() const
-{
-	return m_type == PredicateType::Interface;
-}
-
-bool Predicate::isNondetInterface() const
-{
-	return m_type == PredicateType::NondetInterface;
-}
-
-std::string Predicate::formatSummaryCall(
-	std::vector<smtutil::Expression> const& _args,
-	langutil::CharStreamProvider const& _charStreamProvider,
-	bool _appendTxVars
-) const
-{
-	solAssert(isSummary(), "");
-
-	if (programVariable())
-		return {};
-
-	if (auto funCall = programFunctionCall())
-	{
-		if (funCall->location().hasText())
-			return std::string(_charStreamProvider.charStream(*funCall->location().sourceName).text(funCall->location()));
-		else
-			return {};
-	}
-
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockChainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
-	/// Here we are interested in preInputVars to format the function call.
-
-	std::string txModel;
-
-	if (_appendTxVars)
-	{
-		std::set<std::string> txVars;
-		if (isFunctionSummary())
-		{
-			solAssert(programFunction(), "");
-			if (programFunction()->isPayable())
-				txVars.insert("msg.value");
-		}
-		else if (isConstructorSummary())
-		{
-			FunctionDefinition const* fun = programFunction();
-			if (fun && fun->isPayable())
-				txVars.insert("msg.value");
-		}
-
-		struct TxVarsVisitor: public ASTConstVisitor
-		{
-			bool visit(MemberAccess const& _memberAccess)
-			{
-				Expression const* memberExpr = SMTEncoder::innermostTuple(_memberAccess.expression());
-
-				Type const* exprType = memberExpr->annotation().type;
-				solAssert(exprType, "");
-				if (exprType->category() == Type::Category::Magic)
-					if (auto const* identifier = dynamic_cast<Identifier const*>(memberExpr))
-					{
-						ASTString const& name = identifier->name();
-						auto memberName = _memberAccess.memberName();
-
-						// TODO remove this for 0.9.0
-						if (name == "block" && memberName == "difficulty")
-							memberName = "prevrandao";
-
-						if (name == "block" || name == "msg" || name == "tx")
-							txVars.insert(name + "." + memberName);
-					}
-
-				return true;
-			}
-
-			std::set<std::string> txVars;
-		} txVarsVisitor;
-
-		if (auto fun = programFunction())
-		{
-			fun->accept(txVarsVisitor);
-			txVars += txVarsVisitor.txVars;
-		}
-
-		// Here we are interested in txData from the summary predicate.
-		auto txValues = readTxVars(_args.at(4));
-		std::vector<std::string> values;
-		for (auto const& _var: txVars)
-			if (auto v = txValues.at(_var))
-				values.push_back(_var + ": " + *v);
-
-		if (!values.empty())
-			txModel = "{ " + boost::algorithm::join(values, ", ") + " }";
-	}
-
-	if (auto contract = programContract())
-		return contract->name() + ".constructor()" + txModel;
-
-	auto stateVars = stateVariables();
-	solAssert(stateVars.has_value(), "");
-	auto const* fun = programFunction();
-	solAssert(fun, "");
-
-	auto first = _args.begin() + 6 + static_cast<int>(stateVars->size());
-	auto last = first + static_cast<int>(fun->parameters().size());
-	solAssert(first >= _args.begin() && first <= _args.end(), "");
-	solAssert(last >= _args.begin() && last <= _args.end(), "");
-	auto inTypes = SMTEncoder::replaceUserTypes(FunctionType(*fun).parameterTypes());
-	std::vector<std::optional<std::string>> functionArgsCex = formatExpressions(std::vector<smtutil::Expression>(first, last), inTypes);
-	std::vector<std::string> functionArgs;
-
-	auto const& params = fun->parameters();
-	solAssert(params.size() == functionArgsCex.size(), "");
-	for (unsigned i = 0; i < params.size(); ++i)
-		if (params.at(i) && functionArgsCex.at(i))
-			functionArgs.emplace_back(*functionArgsCex.at(i));
-		else
-			functionArgs.emplace_back(params[i]->name());
-
-	std::string fName = fun->isConstructor() ? "constructor" :
-		fun->isFallback() ? "fallback" :
-		fun->isReceive() ? "receive" :
-		fun->name();
-
-	std::string prefix;
-	if (fun->isFree())
-		prefix = !fun->sourceUnitName().empty() ? (fun->sourceUnitName() + ":") : "";
-	else
-	{
-		solAssert(fun->annotation().contract, "");
-		prefix = fun->annotation().contract->name() + ".";
-	}
-	return prefix + fName + "(" + boost::algorithm::join(functionArgs, ", ") + ")" + txModel;
-}
-
-std::vector<std::optional<std::string>> Predicate::summaryStateValues(std::vector<smtutil::Expression> const& _args) const
-{
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
-	/// The signature of the summary predicate of a contract without constructor is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, postBlockchainState, preStateVars, postStateVars).
-	/// Here we are interested in postStateVars.
-	auto stateVars = stateVariables();
-	solAssert(stateVars.has_value(), "");
-
-	std::vector<smtutil::Expression>::const_iterator stateFirst;
-	std::vector<smtutil::Expression>::const_iterator stateLast;
-	if (auto const* function = programFunction())
-	{
-		stateFirst = _args.begin() + 6 + static_cast<int>(stateVars->size()) + static_cast<int>(function->parameters().size()) + 1;
-		stateLast = stateFirst + static_cast<int>(stateVars->size());
-	}
-	else if (programContract())
-	{
-		stateFirst = _args.begin() + 7 + static_cast<int>(stateVars->size());
-		stateLast = stateFirst + static_cast<int>(stateVars->size());
-	}
-	else if (programVariable())
-		return {};
-	else
-		solAssert(false, "");
-
-	solAssert(stateFirst >= _args.begin() && stateFirst <= _args.end(), "");
-	solAssert(stateLast >= _args.begin() && stateLast <= _args.end(), "");
-
-	std::vector<smtutil::Expression> stateArgs(stateFirst, stateLast);
-	solAssert(stateArgs.size() == stateVars->size(), "");
-	auto stateTypes = util::applyMap(*stateVars, [&](auto const& _var) { return _var->type(); });
-	return formatExpressions(stateArgs, stateTypes);
-}
-
-std::vector<std::optional<std::string>> Predicate::summaryPostInputValues(std::vector<smtutil::Expression> const& _args) const
-{
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
-	/// Here we are interested in postInputVars.
-	auto const* function = programFunction();
-	solAssert(function, "");
-
-	auto stateVars = stateVariables();
-	solAssert(stateVars.has_value(), "");
-
-	auto const& inParams = function->parameters();
-
-	auto first = _args.begin() + 6 + static_cast<int>(stateVars->size()) * 2 + static_cast<int>(inParams.size()) + 1;
-	auto last = first + static_cast<int>(inParams.size());
-
-	solAssert(first >= _args.begin() && first <= _args.end(), "");
-	solAssert(last >= _args.begin() && last <= _args.end(), "");
-
-	std::vector<smtutil::Expression> inValues(first, last);
-	solAssert(inValues.size() == inParams.size(), "");
-	auto inTypes = SMTEncoder::replaceUserTypes(FunctionType(*function).parameterTypes());
-	return formatExpressions(inValues, inTypes);
-}
-
-std::vector<std::optional<std::string>> Predicate::summaryPostOutputValues(std::vector<smtutil::Expression> const& _args) const
-{
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
-	/// Here we are interested in outputVars.
-	auto const* function = programFunction();
-	solAssert(function, "");
-
-	auto stateVars = stateVariables();
-	solAssert(stateVars.has_value(), "");
-
-	auto const& inParams = function->parameters();
-
-	auto first = _args.begin() + 6 + static_cast<int>(stateVars->size()) * 2 + static_cast<int>(inParams.size()) * 2 + 1;
-
-	solAssert(first >= _args.begin() && first <= _args.end(), "");
-
-	std::vector<smtutil::Expression> outValues(first, _args.end());
-	solAssert(outValues.size() == function->returnParameters().size(), "");
-	auto outTypes = SMTEncoder::replaceUserTypes(FunctionType(*function).returnParameterTypes());
-	return formatExpressions(outValues, outTypes);
-}
-
-std::pair<std::vector<std::optional<std::string>>, std::vector<VariableDeclaration const*>> Predicate::localVariableValues(std::vector<smtutil::Expression> const& _args) const
-{
-	/// The signature of a local block predicate is:
-	/// block(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars, localVars).
-	/// Here we are interested in localVars.
-	auto const* function = programFunction();
-	solAssert(function, "");
-
-	auto const& localVars = SMTEncoder::localVariablesIncludingModifiers(*function, m_contractContext);
-	auto first = _args.end() - static_cast<int>(localVars.size());
-	std::vector<smtutil::Expression> outValues(first, _args.end());
-
-	auto mask = util::applyMap(
-		localVars,
-		[this](auto _var) {
-			auto varScope = dynamic_cast<ScopeOpener const*>(_var->scope());
-			return find(begin(m_scopeStack), end(m_scopeStack), varScope) != end(m_scopeStack);
-		}
-	);
-	auto localVarsInScope = util::filter(localVars, mask);
-	auto outValuesInScope = util::filter(outValues, mask);
-
-	auto outTypes = util::applyMap(localVarsInScope, [](auto _var) { return _var->type(); });
-	return {formatExpressions(outValuesInScope, outTypes), localVarsInScope};
-}
-
-std::map<std::string, std::string> Predicate::expressionSubstitution(smtutil::Expression const& _predExpr) const
-{
-	std::map<std::string, std::string> subst;
-	std::string predName = functor().name;
-
-	solAssert(contextContract(), "");
-	auto const& stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*contextContract());
-
-	auto nArgs = _predExpr.arguments.size();
-
-	// The signature of an interface predicate is
-	// interface(this, abiFunctions, cryptoFunctions, blockchainState, stateVariables).
-	// An invariant for an interface predicate is a contract
-	// invariant over its state, for example `x <= 0`.
-	if (isInterface())
-	{
-		solAssert(starts_with(predName, "interface"), "");
-		subst[_predExpr.arguments.at(0).name] = "address(this)";
-		solAssert(nArgs == stateVars.size() + 4, "");
-		for (size_t i = nArgs - stateVars.size(); i < nArgs; ++i)
-			subst[_predExpr.arguments.at(i).name] = stateVars.at(i - 4)->name();
-	}
-	// The signature of a nondet interface predicate is
-	// nondet_interface(error, this, abiFunctions, cryptoFunctions, blockchainState, stateVariables, blockchainState', stateVariables').
-	// An invariant for a nondet interface predicate is a reentrancy property
-	// over the pre and post state variables of a contract, where pre state vars
-	// are represented by the variable's name and post state vars are represented
-	// by the primed variable's name, for example
-	// `(x <= 0) => (x' <= 100)`.
-	else if (isNondetInterface())
-	{
-		solAssert(starts_with(predName, "nondet_interface"), "");
-		subst[_predExpr.arguments.at(0).name] = "<errorCode>";
-		subst[_predExpr.arguments.at(1).name] = "address(this)";
-		solAssert(nArgs == stateVars.size() * 2 + 6, "");
-		for (size_t i = nArgs - stateVars.size(), s = 0; i < nArgs; ++i, ++s)
-			subst[_predExpr.arguments.at(i).name] = stateVars.at(s)->name() + "'";
-		for (size_t i = nArgs - (stateVars.size() * 2 + 1), s = 0; i < nArgs - (stateVars.size() + 1); ++i, ++s)
-			subst[_predExpr.arguments.at(i).name] = stateVars.at(s)->name();
-	}
-
-	return subst;
-}
-
-std::vector<std::optional<std::string>> Predicate::formatExpressions(std::vector<smtutil::Expression> const& _exprs, std::vector<Type const*> const& _types) const
-{
-	solAssert(_exprs.size() == _types.size(), "");
-	std::vector<std::optional<std::string>> strExprs;
-	for (unsigned i = 0; i < _exprs.size(); ++i)
-		strExprs.push_back(expressionToString(_exprs.at(i), _types.at(i)));
-	return strExprs;
-}
-
-std::optional<std::string> Predicate::expressionToString(smtutil::Expression const& _expr, Type const* _type) const
-{
-	if (smt::isNumber(*_type))
-	{
-		solAssert(_expr.sort->kind == Kind::Int, "");
-		solAssert(_expr.arguments.empty(), "");
-
-		if (
-			_type->category() == Type::Category::Address ||
-			_type->category() == Type::Category::FixedBytes
-		)
-		{
-			try
-			{
-				if (_expr.name == "0")
-					return "0x0";
-				// For some reason the code below returns "0x" for "0".
-				return util::toHex(toCompactBigEndian(bigint(_expr.name)), util::HexPrefix::Add, util::HexCase::Lower);
-			}
-			catch (std::out_of_range const&)
-			{
-			}
-			catch (std::invalid_argument const&)
-			{
-			}
-		}
-
-		return _expr.name;
-	}
-	if (smt::isBool(*_type))
-	{
-		solAssert(_expr.sort->kind == Kind::Bool, "");
-		solAssert(_expr.arguments.empty(), "");
-		solAssert(_expr.name == "true" || _expr.name == "false", "");
-		return _expr.name;
-	}
-	if (smt::isFunction(*_type))
-	{
-		solAssert(_expr.arguments.empty(), "");
-		return _expr.name;
-	}
-	if (smt::isArray(*_type))
-	{
-		auto const& arrayType = dynamic_cast<ArrayType const&>(*_type);
-		if (_expr.name != "tuple_constructor")
-			return {};
-
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_expr.sort);
-		solAssert(tupleSort.components.size() == 2, "");
-
-		unsigned long length;
-		try
-		{
-			length = stoul(_expr.arguments.at(1).name);
-		}
-		catch(std::out_of_range const&)
-		{
-			return {};
-		}
-		catch(std::invalid_argument const&)
-		{
-			return {};
-		}
-
-		// Limit this counterexample size to 1k.
-		// Some OSs give you "unlimited" memory through swap and other virtual memory,
-		// so purely relying on bad_alloc being thrown is not a good idea.
-		// In that case, the array allocation might cause OOM and the program is killed.
-		if (length >= 1024)
-			return {};
-		try
-		{
-			std::vector<std::string> array(length);
-			if (!fillArray(_expr.arguments.at(0), array, arrayType))
-				return {};
-			return "[" + boost::algorithm::join(array, ", ") + "]";
-		}
-		catch (std::bad_alloc const&)
-		{
-			// Solver gave a concrete array but length is too large.
-		}
-	}
-	if (smt::isNonRecursiveStruct(*_type))
-	{
-		auto const& structType = dynamic_cast<StructType const&>(*_type);
-		solAssert(_expr.name == "tuple_constructor", "");
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_expr.sort);
-		auto members = structType.structDefinition().members();
-		solAssert(tupleSort.components.size() == members.size(), "");
-		solAssert(_expr.arguments.size() == members.size(), "");
-		std::vector<std::string> elements;
-		for (unsigned i = 0; i < members.size(); ++i)
-		{
-			std::optional<std::string> elementStr = expressionToString(_expr.arguments.at(i), members[i]->type());
-			elements.push_back(members[i]->name() + (elementStr.has_value() ?  ": " + elementStr.value() : ""));
-		}
-		return "{" + boost::algorithm::join(elements, ", ") + "}";
-	}
-
-	return {};
-}
-
-bool Predicate::fillArray(smtutil::Expression const& _expr, std::vector<std::string>& _array, ArrayType const& _type) const
-{
-	// Base case
-	if (_expr.name == "const_array")
-	{
-		auto length = _array.size();
-		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(1), _type.baseType());
-		if (!elemStr)
-			return false;
-		_array.clear();
-		_array.resize(length, *elemStr);
-		return true;
-	}
-
-	// Recursive case.
-	if (_expr.name == "store")
-	{
-		if (!fillArray(_expr.arguments.at(0), _array, _type))
-			return false;
-		std::optional<std::string> indexStr = expressionToString(_expr.arguments.at(1), TypeProvider::uint256());
-		if (!indexStr)
-			return false;
-		// Sometimes the solver assigns huge lengths that are not related,
-		// we should catch and ignore those.
-		unsigned long index;
-		try
-		{
-			index = stoul(*indexStr);
-		}
-		catch (std::out_of_range const&)
-		{
-			return true;
-		}
-		catch (std::invalid_argument const&)
-		{
-			return true;
-		}
-		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(2), _type.baseType());
-		if (!elemStr)
-			return false;
-		if (index < _array.size())
-			_array.at(index) = *elemStr;
-		return true;
-	}
-
-	// Special base case, not supported yet.
-	if (_expr.name.rfind("(_ as-array") == 0)
-	{
-		// Z3 expression representing reinterpretation of a different term as an array
-		return false;
-	}
-
-	solAssert(false, "");
-}
-
-std::map<std::string, std::optional<std::string>> Predicate::readTxVars(smtutil::Expression const& _tx) const
-{
-	std::map<std::string, Type const*> const txVars{
-		{"block.basefee", TypeProvider::uint256()},
-		{"block.chainid", TypeProvider::uint256()},
-		{"block.coinbase", TypeProvider::address()},
-		{"block.prevrandao", TypeProvider::uint256()},
-		{"block.gaslimit", TypeProvider::uint256()},
-		{"block.number", TypeProvider::uint256()},
-		{"block.timestamp", TypeProvider::uint256()},
-		{"blockhash", TypeProvider::array(DataLocation::Memory, TypeProvider::uint256())},
-		{"msg.data", TypeProvider::array(DataLocation::CallData)},
-		{"msg.sender", TypeProvider::address()},
-		{"msg.sig", TypeProvider::fixedBytes(4)},
-		{"msg.value", TypeProvider::uint256()},
-		{"tx.gasprice", TypeProvider::uint256()},
-		{"tx.origin", TypeProvider::address()}
-	};
-	std::map<std::string, std::optional<std::string>> vars;
-	for (auto&& [i, v]: txVars | ranges::views::enumerate)
-		vars.emplace(v.first, expressionToString(_tx.arguments.at(i), v.second));
-	return vars;
-}
diff --git a/libsolidity/formal/Predicate.h b/libsolidity/formal/Predicate.h
deleted file mode 100644
index d7ac0da35223..000000000000
--- a/libsolidity/formal/Predicate.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/SymbolicVariables.h>
-#include <libsolidity/formal/SymbolicVariables.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <libsmtutil/Sorts.h>
-
-#include <map>
-#include <optional>
-#include <vector>
-
-namespace solidity::langutil
-{
-class CharStreamProvider;
-}
-
-namespace solidity::frontend
-{
-
-enum class PredicateType
-{
-	Interface,
-	NondetInterface,
-	ConstructorSummary,
-	FunctionSummary,
-	FunctionBlock,
-	FunctionErrorBlock,
-	InternalCall,
-	ExternalCallTrusted,
-	ExternalCallUntrusted,
-	Error,
-	Custom
-};
-
-/**
- * Represents a predicate used by the CHC engine.
- */
-class Predicate
-{
-public:
-	static Predicate const* create(
-		smtutil::SortPointer _sort,
-		std::string _name,
-		PredicateType _type,
-		smt::EncodingContext& _context,
-		ASTNode const* _node = nullptr,
-		ContractDefinition const* _contractContext = nullptr,
-		std::vector<ScopeOpener const*> _scopeStack = {}
-	);
-
-	Predicate(
-		smt::SymbolicFunctionVariable&& _predicate,
-		PredicateType _type,
-		ASTNode const* _node = nullptr,
-		ContractDefinition const* _contractContext = nullptr,
-		std::vector<ScopeOpener const*> _scopeStack = {}
-	);
-
-	/// Predicate should not be copiable.
-	Predicate(Predicate const&) = delete;
-	Predicate& operator=(Predicate const&) = delete;
-
-	/// @returns the Predicate associated with _name.
-	static Predicate const* predicate(std::string const& _name);
-
-	/// Resets all the allocated predicates.
-	static void reset();
-
-	/// @returns a function application of the predicate over _args.
-	smtutil::Expression operator()(std::vector<smtutil::Expression> const& _args) const;
-
-	/// @returns the function declaration of the predicate.
-	smtutil::Expression functor() const;
-	/// @returns the function declaration of the predicate with index _idx.
-	smtutil::Expression functor(unsigned _idx) const;
-	/// Increases the index of the function declaration of the predicate.
-	void newFunctor();
-
-	/// @returns the program node this predicate represents.
-	ASTNode const* programNode() const;
-
-	/// @returns the ContractDefinition of the most derived contract
-	/// being analyzed.
-	ContractDefinition const* contextContract() const;
-
-	/// @returns the ContractDefinition that this predicate represents
-	/// or nullptr otherwise.
-	ContractDefinition const* programContract() const;
-
-	/// @returns the FunctionDefinition that this predicate represents
-	/// or nullptr otherwise.
-	FunctionDefinition const* programFunction() const;
-
-	/// @returns the FunctionCall that this predicate represents
-	/// or nullptr otherwise.
-	FunctionCall const* programFunctionCall() const;
-
-	/// @returns the VariableDeclaration that this predicate represents
-	/// or nullptr otherwise.
-	VariableDeclaration const* programVariable() const;
-
-	/// @returns the program state variables in the scope of this predicate.
-	std::optional<std::vector<VariableDeclaration const*>> stateVariables() const;
-
-	/// @returns true if this predicate represents a summary.
-	bool isSummary() const;
-
-	/// @returns true if this predicate represents a function summary.
-	bool isFunctionSummary() const;
-
-	/// @returns true if this predicate represents a function block.
-	bool isFunctionBlock() const;
-
-	/// @returns true if this predicate represents a function error block.
-	bool isFunctionErrorBlock() const;
-
-	/// @returns true if this predicate represents an internal function call.
-	bool isInternalCall() const;
-
-	/// @returns true if this predicate represents a trusted external function call.
-	bool isExternalCallTrusted() const;
-
-	/// @returns true if this predicate represents an untrusted external function call.
-	bool isExternalCallUntrusted() const;
-
-	/// @returns true if this predicate represents a constructor summary.
-	bool isConstructorSummary() const;
-
-	/// @returns true if this predicate represents an interface.
-	bool isInterface() const;
-
-	/// @returns true if this predicate represents a nondeterministic interface.
-	bool isNondetInterface() const;
-
-	PredicateType type() const { return m_type; }
-
-	/// @returns a formatted string representing a call to this predicate
-	/// with _args.
-	std::string formatSummaryCall(
-		std::vector<smtutil::Expression> const& _args,
-		langutil::CharStreamProvider const& _charStreamProvider,
-		bool _appendTxVars = false
-	) const;
-
-	/// @returns the values of the state variables from _args at the point
-	/// where this summary was reached.
-	std::vector<std::optional<std::string>> summaryStateValues(std::vector<smtutil::Expression> const& _args) const;
-
-	/// @returns the values of the function input variables from _args at the point
-	/// where this summary was reached.
-	std::vector<std::optional<std::string>> summaryPostInputValues(std::vector<smtutil::Expression> const& _args) const;
-
-	/// @returns the values of the function output variables from _args at the point
-	/// where this summary was reached.
-	std::vector<std::optional<std::string>> summaryPostOutputValues(std::vector<smtutil::Expression> const& _args) const;
-
-	/// @returns the values of the local variables used by this predicate.
-	std::pair<std::vector<std::optional<std::string>>, std::vector<VariableDeclaration const*>> localVariableValues(std::vector<smtutil::Expression> const& _args) const;
-
-	/// @returns a substitution map from the arguments of _predExpr
-	/// to a Solidity-like expression.
-	std::map<std::string, std::string> expressionSubstitution(smtutil::Expression const& _predExpr) const;
-
-private:
-	/// @returns the formatted version of the given SMT expressions. Those expressions must be SMT constants.
-	std::vector<std::optional<std::string>> formatExpressions(std::vector<smtutil::Expression> const& _exprs, std::vector<Type const*> const& _types) const;
-
-	/// @returns a string representation of the SMT expression based on a Solidity type.
-	std::optional<std::string> expressionToString(smtutil::Expression const& _expr, Type const* _type) const;
-
-	/// Recursively fills _array from _expr.
-	/// _expr should have the form `store(store(...(const_array(x_0), i_0, e_0), i_m, e_m), i_k, e_k)`.
-	/// @returns true if the construction worked,
-	/// and false if at least one element could not be built.
-	bool fillArray(smtutil::Expression const& _expr, std::vector<std::string>& _array, ArrayType const& _type) const;
-
-	std::map<std::string, std::optional<std::string>> readTxVars(smtutil::Expression const& _tx) const;
-
-	/// The actual SMT expression.
-	smt::SymbolicFunctionVariable m_predicate;
-
-	/// The type of this predicate.
-	PredicateType m_type;
-
-	/// The ASTNode that this predicate represents.
-	/// nullptr if this predicate is not associated with a specific program AST node.
-	ASTNode const* m_node = nullptr;
-
-	/// The ContractDefinition that contains this predicate.
-	/// nullptr if this predicate is not associated with a specific contract.
-	/// This is unfortunately necessary because of virtual resolution for
-	/// function nodes.
-	ContractDefinition const* m_contractContext = nullptr;
-
-	/// Maps the name of the predicate to the actual Predicate.
-	/// Used in counterexample generation.
-	static std::map<std::string, Predicate> m_predicates;
-
-	/// The scope stack when the predicate was created.
-	/// Used to identify the subset of variables in scope.
-	std::vector<ScopeOpener const*> const m_scopeStack;
-};
-
-struct PredicateCompare
-{
-	bool operator()(Predicate const* lhs, Predicate const* rhs) const
-	{
-		// We cannot use m_node->id() because different predicates may
-		// represent the same program node.
-		// We use the symbolic name since it is unique per predicate and
-		// the order does not really matter.
-		return lhs->functor().name < rhs->functor().name;
-	}
-};
-
-}
diff --git a/libsolidity/formal/PredicateInstance.cpp b/libsolidity/formal/PredicateInstance.cpp
deleted file mode 100644
index 0bf352dd4777..000000000000
--- a/libsolidity/formal/PredicateInstance.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/PredicateInstance.h>
-
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/SMTEncoder.h>
-
-using namespace solidity::util;
-using namespace solidity::smtutil;
-
-namespace solidity::frontend::smt
-{
-smtutil::Expression interfacePre(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context)
-{
-	auto& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state(0)};
-	return _pred(stateExprs + initialStateVariables(_contract, _context));
-}
-
-smtutil::Expression interface(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context)
-{
-	auto const& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state()};
-	return _pred(stateExprs + currentStateVariables(_contract, _context));
-}
-
-smtutil::Expression nondetInterface(
-	Predicate const& _pred,
-	ContractDefinition const& _contract,
-	EncodingContext& _context,
-	unsigned _preIdx,
-	unsigned _postIdx)
-{
-	auto const& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(), state.abi(), state.crypto()};
-	return _pred(
-		stateExprs +
-		std::vector<smtutil::Expression>{_context.state().state(_preIdx)} +
-		stateVariablesAtIndex(_preIdx, _contract, _context) +
-		std::vector<smtutil::Expression>{_context.state().state(_postIdx)} +
-		stateVariablesAtIndex(_postIdx, _contract, _context)
-	);
-}
-
-smtutil::Expression constructor(Predicate const& _pred, EncodingContext& _context)
-{
-	auto const& contract = dynamic_cast<ContractDefinition const&>(*_pred.programNode());
-	if (auto const* constructor = contract.constructor())
-		return _pred(currentFunctionVariablesForDefinition(*constructor, &contract, _context));
-
-	auto& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0), state.state()};
-	return _pred(stateExprs + initialStateVariables(contract, _context) + currentStateVariables(contract, _context));
-}
-
-smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _context, bool _internal)
-{
-	auto const& contract = dynamic_cast<ContractDefinition const&>(*_pred.programNode());
-	if (auto const* constructor = contract.constructor())
-		return _pred(currentFunctionVariablesForCall(*constructor, &contract, _context, _internal));
-
-	auto& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
-	state.newState();
-	stateExprs += std::vector<smtutil::Expression>{state.state()};
-	stateExprs += currentStateVariables(contract, _context);
-	stateExprs += newStateVariables(contract, _context);
-	return _pred(stateExprs);
-}
-
-smtutil::Expression function(
-	Predicate const& _pred,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-)
-{
-	auto const& function = dynamic_cast<FunctionDefinition const&>(*_pred.programNode());
-	return _pred(currentFunctionVariablesForDefinition(function, _contract, _context));
-}
-
-smtutil::Expression functionCall(
-	Predicate const& _pred,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-)
-{
-	auto const& function = dynamic_cast<FunctionDefinition const&>(*_pred.programNode());
-	return _pred(currentFunctionVariablesForCall(function, _contract, _context));
-}
-
-smtutil::Expression functionBlock(
-	Predicate const& _pred,
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-)
-{
-	return _pred(currentBlockVariables(_function, _contract, _context));
-}
-
-/// Helpers
-
-std::vector<smtutil::Expression> initialStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
-{
-	return stateVariablesAtIndex(0, _contract, _context);
-}
-
-std::vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract, EncodingContext& _context)
-{
-	return applyMap(
-		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
-		[&](auto _var) { return _context.variable(*_var)->valueAtIndex(_index); }
-	);
-}
-
-std::vector<smtutil::Expression> currentStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
-{
-	return applyMap(
-		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
-		[&](auto _var) { return _context.variable(*_var)->currentValue(); }
-	);
-}
-
-std::vector<smtutil::Expression> newStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
-{
-	return applyMap(
-		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
-		[&](auto _var) { return _context.variable(*_var)->increaseIndex(); }
-	);
-}
-
-std::vector<smtutil::Expression> currentFunctionVariablesForDefinition(
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-)
-{
-	auto& state = _context.state();
-	std::vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0)};
-	exprs += _contract ? initialStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
-	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->valueAtIndex(0); });
-	exprs += std::vector<smtutil::Expression>{state.state()};
-	exprs += _contract ? currentStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
-	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
-	exprs += applyMap(_function.returnParameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
-	return exprs;
-}
-
-std::vector<smtutil::Expression> currentFunctionVariablesForCall(
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context,
-	bool _internal
-)
-{
-	auto& state = _context.state();
-	std::vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
-	exprs += _contract ? currentStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
-	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
-
-	state.newState();
-
-	exprs += std::vector<smtutil::Expression>{state.state()};
-	exprs += _contract ? newStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
-	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->increaseIndex(); });
-	exprs += applyMap(_function.returnParameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
-	return exprs;
-}
-
-std::vector<smtutil::Expression> currentBlockVariables(FunctionDefinition const& _function, ContractDefinition const* _contract, EncodingContext& _context)
-{
-	return currentFunctionVariablesForDefinition(_function, _contract, _context) +
-		applyMap(
-			SMTEncoder::localVariablesIncludingModifiers(_function, _contract),
-			[&](auto _var) { return _context.variable(*_var)->currentValue(); }
-		);
-}
-
-}
diff --git a/libsolidity/formal/PredicateInstance.h b/libsolidity/formal/PredicateInstance.h
deleted file mode 100644
index 42a9e2040b36..000000000000
--- a/libsolidity/formal/PredicateInstance.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/Predicate.h>
-
-namespace solidity::frontend::smt
-{
-
-class EncodingContext;
-
-/**
- * This file represents the specification for building CHC predicate instances.
- * The predicates follow the specification in PredicateSort.h.
- * */
-
-smtutil::Expression interfacePre(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context);
-
-smtutil::Expression interface(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context);
-
-smtutil::Expression nondetInterface(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context, unsigned _preIdx, unsigned _postIdx);
-
-smtutil::Expression constructor(Predicate const& _pred, EncodingContext& _context);
-/// The encoding of the deployment procedure includes adding constraints
-/// for base constructors if inheritance is used.
-/// From the predicate point of view this is not different,
-/// but some of the arguments are different.
-/// @param _internal = true means that this constructor call is used in the
-/// deployment procedure, whereas false means it is used in the deployment
-/// of a contract.
-smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _context, bool _internal = true);
-
-smtutil::Expression function(
-	Predicate const& _pred,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-);
-
-smtutil::Expression functionCall(
-	Predicate const& _pred,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-);
-
-smtutil::Expression functionBlock(
-	Predicate const& _pred,
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-);
-
-/// Helpers
-
-std::vector<smtutil::Expression> initialStateVariables(ContractDefinition const& _contract, EncodingContext& _context);
-
-std::vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract, EncodingContext& _context);
-
-std::vector<smtutil::Expression> currentStateVariables(ContractDefinition const& _contract, EncodingContext& _context);
-
-std::vector<smtutil::Expression> newStateVariables(ContractDefinition const& _contract, EncodingContext& _context);
-
-std::vector<smtutil::Expression> currentFunctionVariablesForDefinition(
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-);
-
-std::vector<smtutil::Expression> currentFunctionVariablesForCall(
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context,
-	bool _internal = true
-);
-
-std::vector<smtutil::Expression> currentBlockVariables(
-	FunctionDefinition const& _function,
-	ContractDefinition const* _contract,
-	EncodingContext& _context
-);
-
-}
diff --git a/libsolidity/formal/PredicateSort.cpp b/libsolidity/formal/PredicateSort.cpp
deleted file mode 100644
index 2e95a29a531d..000000000000
--- a/libsolidity/formal/PredicateSort.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/PredicateSort.h>
-
-#include <libsolidity/formal/SMTEncoder.h>
-#include <libsolidity/formal/SymbolicTypes.h>
-
-using namespace solidity::util;
-using namespace solidity::smtutil;
-
-namespace solidity::frontend::smt
-{
-
-SortPointer interfaceSort(ContractDefinition const& _contract, SymbolicState& _state)
-{
-	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.stateSort()} + stateSorts(_contract),
-		SortProvider::boolSort
-	);
-}
-
-SortPointer nondetInterfaceSort(ContractDefinition const& _contract, SymbolicState& _state)
-{
-	auto varSorts = stateSorts(_contract);
-	std::vector<SortPointer> stateSort{_state.stateSort()};
-	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort()} +
-			stateSort +
-			varSorts +
-			stateSort +
-			varSorts,
-		SortProvider::boolSort
-	);
-}
-
-SortPointer constructorSort(ContractDefinition const& _contract, SymbolicState& _state)
-{
-	if (auto const* constructor = _contract.constructor())
-		return functionSort(*constructor, &_contract, _state);
-
-	auto varSorts = stateSorts(_contract);
-	std::vector<SortPointer> stateSort{_state.stateSort()};
-	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort(), _state.stateSort()} + varSorts + varSorts,
-		SortProvider::boolSort
-	);
-}
-
-SortPointer functionSort(FunctionDefinition const& _function, ContractDefinition const* _contract, SymbolicState& _state)
-{
-	auto smtSort = [](auto _var) { return smt::smtSortAbstractFunction(*_var->type()); };
-	auto varSorts = _contract ? stateSorts(*_contract) : std::vector<SortPointer>{};
-	auto inputSorts = applyMap(_function.parameters(), smtSort);
-	auto outputSorts = applyMap(_function.returnParameters(), smtSort);
-	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort()} +
-			varSorts +
-			inputSorts +
-			std::vector<SortPointer>{_state.stateSort()} +
-			varSorts +
-			inputSorts +
-			outputSorts,
-		SortProvider::boolSort
-	);
-}
-
-SortPointer functionBodySort(FunctionDefinition const& _function, ContractDefinition const* _contract, SymbolicState& _state)
-{
-	auto fSort = std::dynamic_pointer_cast<FunctionSort>(functionSort(_function, _contract, _state));
-	solAssert(fSort, "");
-
-	auto smtSort = [](auto _var) { return smt::smtSortAbstractFunction(*_var->type()); };
-	return std::make_shared<FunctionSort>(
-		fSort->domain + applyMap(SMTEncoder::localVariablesIncludingModifiers(_function, _contract), smtSort),
-		SortProvider::boolSort
-	);
-}
-
-SortPointer arity0FunctionSort()
-{
-	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>(),
-		SortProvider::boolSort
-	);
-}
-
-/// Helpers
-
-std::vector<SortPointer> stateSorts(ContractDefinition const& _contract)
-{
-	return applyMap(
-		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
-		[](auto _var) { return smt::smtSortAbstractFunction(*_var->type()); }
-	);
-}
-
-}
diff --git a/libsolidity/formal/PredicateSort.h b/libsolidity/formal/PredicateSort.h
deleted file mode 100644
index 5638582546e9..000000000000
--- a/libsolidity/formal/PredicateSort.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/Predicate.h>
-
-#include <libsolidity/formal/SymbolicState.h>
-
-#include <libsmtutil/Sorts.h>
-
-namespace solidity::frontend::smt
-{
-
-/**
- * This file represents the specification for CHC predicate sorts.
- * Types of predicates:
- *
- * 1. Interface
- * The idle state of a contract. Signature:
- * interface(this, abiFunctions, cryptoFunctions, blockchainState, stateVariables).
- *
- * 2. Nondet interface
- * The nondeterminism behavior of a contract. Signature:
- * nondet_interface(error, this, abiFunctions, cryptoFunctions, blockchainState, stateVariables, blockchainState', stateVariables').
- *
- * 3. Constructor entry/summary
- * The summary of a contract's deployment procedure.
- * Signature:
- * If the contract has a constructor function, this is the same as the summary of that function. Otherwise:
- * constructor_summary(error, this, abiFunctions, cryptoFunctions, txData, blockchainState, blockchainState', stateVariables, stateVariables').
- *
- * 4. Function entry/summary
- * The entry point of a function definition. Signature:
- * function_entry(error, this, abiFunctions, cryptoFunctions, txData, blockchainState, stateVariables, inputVariables, blockchainState', stateVariables', inputVariables', outputVariables').
- *
- * 5. Function body
- * Use for any predicate within a function. Signature:
- * function_body(error, this, abiFunctions, cryptoFunctions, txData, blockchainState, stateVariables, inputVariables, blockchainState', stateVariables', inputVariables', outputVariables', localVariables).
- */
-
-/// @returns the interface predicate sort for _contract.
-smtutil::SortPointer interfaceSort(ContractDefinition const& _contract, SymbolicState& _state);
-
-/// @returns the nondeterminisc interface predicate sort for _contract.
-smtutil::SortPointer nondetInterfaceSort(ContractDefinition const& _contract, SymbolicState& _state);
-
-/// @returns the constructor entry/summary predicate sort for _contract.
-smtutil::SortPointer constructorSort(ContractDefinition const& _contract, SymbolicState& _state);
-
-/// @returns the function entry/summary predicate sort for _function contained in _contract.
-smtutil::SortPointer functionSort(FunctionDefinition const& _function, ContractDefinition const* _contract, SymbolicState& _state);
-
-/// @returns the function body predicate sort for _function contained in _contract.
-smtutil::SortPointer functionBodySort(FunctionDefinition const& _function, ContractDefinition const* _contract, SymbolicState& _state);
-
-/// @returns the sort of a predicate without parameters.
-smtutil::SortPointer arity0FunctionSort();
-
-/// Helpers
-
-std::vector<smtutil::SortPointer> stateSorts(ContractDefinition const& _contract) ;
-
-}
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
deleted file mode 100644
index ae3a06869d19..000000000000
--- a/libsolidity/formal/SMTEncoder.cpp
+++ /dev/null
@@ -1,3218 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/formal/SymbolicState.h>
-#include <libsolidity/formal/SymbolicTypes.h>
-
-#include <libsolidity/analysis/ConstantEvaluator.h>
-
-#include <libyul/AST.h>
-#include <libyul/optimiser/Semantics.h>
-
-#include <libsmtutil/SMTPortfolio.h>
-#include <libsmtutil/Helpers.h>
-
-#include <liblangutil/CharStreamProvider.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/FunctionSelector.h>
-
-#include <range/v3/view.hpp>
-
-#include <limits>
-#include <deque>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace std::string_literals;
-
-SMTEncoder::SMTEncoder(
-	smt::EncodingContext& _context,
-	ModelCheckerSettings _settings,
-	UniqueErrorReporter& _errorReporter,
-	UniqueErrorReporter& _unsupportedErrorReporter,
-	langutil::CharStreamProvider const& _charStreamProvider
-):
-	m_errorReporter(_errorReporter),
-	m_unsupportedErrors(_unsupportedErrorReporter),
-	m_context(_context),
-	m_settings(std::move(_settings)),
-	m_charStreamProvider(_charStreamProvider)
-{
-}
-
-void SMTEncoder::resetSourceAnalysis()
-{
-	m_freeFunctions.clear();
-}
-
-bool SMTEncoder::visit(ContractDefinition const& _contract)
-{
-	solAssert(m_currentContract, "");
-
-	for (auto const& node: _contract.subNodes())
-		if (
-			!std::dynamic_pointer_cast<FunctionDefinition>(node) &&
-			!std::dynamic_pointer_cast<VariableDeclaration>(node)
-		)
-			node->accept(*this);
-
-	for (auto const& base: _contract.annotation().linearizedBaseContracts)
-	{
-		// Look for all the constructor invocations bottom up.
-		if (auto const& constructor =  base->constructor())
-			for (auto const& invocation: constructor->modifiers())
-			{
-				auto refDecl = invocation->name().annotation().referencedDeclaration;
-				if (auto const& baseContract = dynamic_cast<ContractDefinition const*>(refDecl))
-				{
-					solAssert(!m_baseConstructorCalls.count(baseContract), "");
-					m_baseConstructorCalls[baseContract] = invocation.get();
-				}
-			}
-	}
-	// Functions are visited first since they might be used
-	// for state variable initialization which is part of
-	// the constructor.
-	// Constructors are visited as part of the constructor
-	// hierarchy inlining.
-	for (auto const* function: contractFunctionsWithoutVirtual(_contract) + allFreeFunctions())
-		if (!function->isConstructor())
-			function->accept(*this);
-
-	// Constructors need to be handled by the engines separately.
-
-	return false;
-}
-
-void SMTEncoder::endVisit(ContractDefinition const& _contract)
-{
-	m_context.resetAllVariables();
-
-	m_baseConstructorCalls.clear();
-
-	solAssert(m_currentContract == &_contract, "");
-	m_currentContract = nullptr;
-
-	if (m_callStack.empty())
-		m_context.popSolver();
-}
-
-bool SMTEncoder::visit(ImportDirective const&)
-{
-	// do not visit because the identifier therein will confuse us.
-	return false;
-}
-
-void SMTEncoder::endVisit(VariableDeclaration const& _varDecl)
-{
-	// State variables are handled by the constructor.
-	if (_varDecl.isLocalVariable() &&_varDecl.value())
-		assignment(_varDecl, *_varDecl.value());
-}
-
-bool SMTEncoder::visit(ModifierDefinition const&)
-{
-	return false;
-}
-
-bool SMTEncoder::visit(FunctionDefinition const& _function)
-{
-	solAssert(m_currentContract, "");
-
-	m_modifierDepthStack.push_back(-1);
-
-	initializeLocalVariables(_function);
-
-	_function.parameterList().accept(*this);
-	if (_function.returnParameterList())
-		_function.returnParameterList()->accept(*this);
-
-	visitFunctionOrModifier();
-
-	return false;
-}
-
-void SMTEncoder::visitFunctionOrModifier()
-{
-	solAssert(!m_callStack.empty(), "");
-	solAssert(!m_modifierDepthStack.empty(), "");
-
-	++m_modifierDepthStack.back();
-	FunctionDefinition const& function = dynamic_cast<FunctionDefinition const&>(*m_callStack.back().first);
-
-	if (m_modifierDepthStack.back() == static_cast<int>(function.modifiers().size()))
-	{
-		if (function.isImplemented())
-		{
-			pushInlineFrame(function);
-			function.body().accept(*this);
-			popInlineFrame(function);
-		}
-	}
-	else
-	{
-		solAssert(m_modifierDepthStack.back() < static_cast<int>(function.modifiers().size()), "");
-		ASTPointer<ModifierInvocation> const& modifierInvocation =
-			function.modifiers()[static_cast<size_t>(m_modifierDepthStack.back())];
-		solAssert(modifierInvocation, "");
-		auto refDecl = modifierInvocation->name().annotation().referencedDeclaration;
-		if (dynamic_cast<ContractDefinition const*>(refDecl))
-			visitFunctionOrModifier();
-		else if (auto modifier = resolveModifierInvocation(*modifierInvocation, m_currentContract))
-		{
-			m_scopes.push_back(modifier);
-			inlineModifierInvocation(modifierInvocation.get(), modifier);
-			solAssert(m_scopes.back() == modifier, "");
-			m_scopes.pop_back();
-		}
-		else
-			solAssert(false, "");
-	}
-
-	--m_modifierDepthStack.back();
-}
-
-void SMTEncoder::inlineModifierInvocation(ModifierInvocation const* _invocation, CallableDeclaration const* _definition)
-{
-	solAssert(_invocation, "");
-	_invocation->accept(*this);
-
-	std::vector<smtutil::Expression> args;
-	if (auto const* arguments = _invocation->arguments())
-	{
-		auto const& modifierParams = _definition->parameters();
-		solAssert(modifierParams.size() == arguments->size(), "");
-		for (unsigned i = 0; i < arguments->size(); ++i)
-			args.push_back(expr(*arguments->at(i), modifierParams.at(i)->type()));
-	}
-
-	initializeFunctionCallParameters(*_definition, args);
-
-	pushCallStack({_definition, _invocation});
-	pushInlineFrame(*_definition);
-	if (auto modifier = dynamic_cast<ModifierDefinition const*>(_definition))
-	{
-		if (modifier->isImplemented())
-			modifier->body().accept(*this);
-		popCallStack();
-	}
-	else if (auto function = dynamic_cast<FunctionDefinition const*>(_definition))
-	{
-		if (function->isImplemented())
-			function->accept(*this);
-		// Functions are popped from the callstack in endVisit(FunctionDefinition)
-	}
-	popInlineFrame(*_definition);
-}
-
-void SMTEncoder::inlineConstructorHierarchy(ContractDefinition const& _contract)
-{
-	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
-	auto it = find(begin(hierarchy), end(hierarchy), &_contract);
-	solAssert(it != end(hierarchy), "");
-
-	auto nextBase = it + 1;
-	// Initialize the base contracts here as long as their constructors are implicit,
-	// stop when the first explicit constructor is found.
-	while (nextBase != end(hierarchy))
-	{
-		if (auto baseConstructor = (*nextBase)->constructor())
-		{
-			createLocalVariables(*baseConstructor);
-			// If any subcontract explicitly called baseConstructor, use those arguments.
-			if (m_baseConstructorCalls.count(*nextBase))
-				inlineModifierInvocation(m_baseConstructorCalls.at(*nextBase), baseConstructor);
-			else if (baseConstructor->isImplemented())
-			{
-				// The first constructor found is handled like a function
-				// and its pushed into the callstack there.
-				// This if avoids duplication in the callstack.
-				if (!m_callStack.empty())
-					pushCallStack({baseConstructor, nullptr});
-				baseConstructor->accept(*this);
-				// popped by endVisit(FunctionDefinition)
-			}
-			break;
-		}
-		else
-		{
-			initializeStateVariables(**nextBase);
-			++nextBase;
-		}
-	}
-
-	initializeStateVariables(_contract);
-}
-
-bool SMTEncoder::visit(PlaceholderStatement const&)
-{
-	solAssert(!m_callStack.empty(), "");
-	auto lastCall = popCallStack();
-	visitFunctionOrModifier();
-	pushCallStack(lastCall);
-	return true;
-}
-
-void SMTEncoder::endVisit(FunctionDefinition const&)
-{
-	solAssert(m_currentContract, "");
-
-	popCallStack();
-	solAssert(m_modifierDepthStack.back() == -1, "");
-	m_modifierDepthStack.pop_back();
-	if (m_callStack.empty())
-		m_context.popSolver();
-}
-
-bool SMTEncoder::visit(Block const& _block)
-{
-	if (_block.unchecked())
-	{
-		solAssert(m_checked, "");
-		m_checked = false;
-	}
-	return true;
-}
-
-void SMTEncoder::endVisit(Block const& _block)
-{
-	if (_block.unchecked())
-	{
-		solAssert(!m_checked, "");
-		m_checked = true;
-	}
-}
-
-bool SMTEncoder::visit(InlineAssembly const& _inlineAsm)
-{
-	/// This is very similar to `yul::Assignments`, except I need to collect `Identifier`s and not just names as `YulString`s.
-	struct AssignedExternalsCollector: public yul::ASTWalker
-	{
-		AssignedExternalsCollector(InlineAssembly const& _inlineAsm): externalReferences(_inlineAsm.annotation().externalReferences)
-		{
-			this->operator()(_inlineAsm.operations());
-		}
-
-		std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> const& externalReferences;
-		std::set<VariableDeclaration const*> assignedVars;
-
-		using yul::ASTWalker::operator();
-		void operator()(yul::Assignment const& _assignment)
-		{
-			auto const& vars = _assignment.variableNames;
-			for (auto const& identifier: vars)
-				if (auto externalInfo = util::valueOrNullptr(externalReferences, &identifier))
-					if (auto varDecl = dynamic_cast<VariableDeclaration const*>(externalInfo->declaration))
-						assignedVars.insert(varDecl);
-		}
-	};
-
-	yul::SideEffectsCollector sideEffectsCollector(_inlineAsm.dialect(), _inlineAsm.operations());
-	if (sideEffectsCollector.invalidatesMemory())
-		resetMemoryVariables();
-	if (sideEffectsCollector.invalidatesStorage())
-		resetStorageVariables();
-
-	auto assignedVars = AssignedExternalsCollector(_inlineAsm).assignedVars;
-	for (auto const* var: assignedVars)
-	{
-		solAssert(var, "");
-		solAssert(var->isLocalVariable(), "Non-local variable assigned in inlined assembly");
-		m_context.resetVariable(*var);
-	}
-
-	m_unsupportedErrors.warning(
-		7737_error,
-		_inlineAsm.location(),
-		"Inline assembly may cause SMTChecker to produce spurious warnings (false positives)."
-	);
-	return false;
-}
-
-void SMTEncoder::pushInlineFrame(CallableDeclaration const&)
-{
-	pushPathCondition(currentPathConditions());
-}
-
-void SMTEncoder::popInlineFrame(CallableDeclaration const&)
-{
-	popPathCondition();
-}
-
-void SMTEncoder::endVisit(VariableDeclarationStatement const& _varDecl)
-{
-	if (auto init = _varDecl.initialValue())
-		expressionToTupleAssignment(_varDecl.declarations(), *init);
-}
-
-bool SMTEncoder::visit(Assignment const& _assignment)
-{
-	// RHS must be visited before LHS; as opposed to what Assignment::accept does
-	_assignment.rightHandSide().accept(*this);
-	_assignment.leftHandSide().accept(*this);
-	return false;
-}
-
-void SMTEncoder::endVisit(Assignment const& _assignment)
-{
-	createExpr(_assignment);
-
-	Token op = _assignment.assignmentOperator();
-	solAssert(TokenTraits::isAssignmentOp(op), "");
-
-	if (!isSupportedType(*_assignment.annotation().type))
-	{
-		// Give it a new index anyway to keep the SSA scheme sound.
-
-		Expression const* base = &_assignment.leftHandSide();
-		if (auto const* indexAccess = dynamic_cast<IndexAccess const*>(base))
-			base = leftmostBase(*indexAccess);
-
-		if (auto varDecl = identifierToVariable(*base))
-			m_context.newValue(*varDecl);
-	}
-	else
-	{
-		if (dynamic_cast<TupleType const*>(_assignment.rightHandSide().annotation().type))
-			tupleAssignment(_assignment.leftHandSide(), _assignment.rightHandSide());
-		else
-		{
-			auto const& type = _assignment.annotation().type;
-			auto rightHandSide = op == Token::Assign ?
-				expr(_assignment.rightHandSide(), type) :
-				compoundAssignment(_assignment);
-			defineExpr(_assignment, rightHandSide);
-			assignment(
-				_assignment.leftHandSide(),
-				expr(_assignment, type),
-				type
-			);
-		}
-	}
-}
-
-void SMTEncoder::endVisit(TupleExpression const& _tuple)
-{
-	if (_tuple.annotation().type->category() == Type::Category::Function)
-		return;
-
-	if (_tuple.annotation().type->category() == Type::Category::TypeType)
-		return;
-
-	createExpr(_tuple);
-
-	if (_tuple.isInlineArray())
-	{
-		// Add constraints for the length and values as it is known.
-		auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_tuple));
-		solAssert(symbArray, "");
-
-		addArrayLiteralAssertions(*symbArray, applyMap(_tuple.components(), [&](auto const& c) { return expr(*c); }));
-	}
-	else
-	{
-		auto values = applyMap(_tuple.components(), [this](auto const& component) -> std::optional<smtutil::Expression> {
-			if (component)
-			{
-				if (!m_context.knownExpression(*component))
-						createExpr(*component);
-				return expr(*component);
-			}
-			return {};
-		});
-		defineExpr(_tuple, values);
-	}
-}
-
-void SMTEncoder::endVisit(UnaryOperation const& _op)
-{
-	/// We need to shortcut here due to potentially unknown
-	/// rational number sizes.
-	if (_op.annotation().type->category() == Type::Category::RationalNumber)
-		return;
-
-	if (TokenTraits::isBitOp(_op.getOperator()) && !*_op.annotation().userDefinedFunction)
-		return bitwiseNotOperation(_op);
-
-	createExpr(_op);
-
-	// User-defined operators are essentially function calls.
-	if (*_op.annotation().userDefinedFunction)
-		return;
-
-	auto const* subExpr = innermostTuple(_op.subExpression());
-	auto type = _op.annotation().type;
-	switch (_op.getOperator())
-	{
-	case Token::Not: // !
-	{
-		solAssert(smt::isBool(*type), "");
-		defineExpr(_op, !expr(*subExpr));
-		break;
-	}
-	case Token::Inc: // ++ (pre- or postfix)
-	case Token::Dec: // -- (pre- or postfix)
-	{
-		solAssert(smt::isInteger(*type) || smt::isFixedPoint(*type), "");
-		solAssert(subExpr->annotation().willBeWrittenTo, "");
-		auto innerValue = expr(*subExpr);
-		auto newValue = arithmeticOperation(
-			_op.getOperator() == Token::Inc ? Token::Add : Token::Sub,
-			innerValue,
-			smtutil::Expression(size_t(1)),
-			_op.annotation().type,
-			_op
-		).first;
-		defineExpr(_op, _op.isPrefixOperation() ? newValue : innerValue);
-		assignment(*subExpr, newValue);
-		break;
-	}
-	case Token::Sub: // -
-	{
-		defineExpr(_op, 0 - expr(*subExpr));
-		break;
-	}
-	case Token::Delete:
-	{
-		if (auto decl = identifierToVariable(*subExpr))
-		{
-			m_context.newValue(*decl);
-			m_context.setZeroValue(*decl);
-		}
-		else
-		{
-			solAssert(m_context.knownExpression(*subExpr), "");
-			auto const& symbVar = m_context.expression(*subExpr);
-			symbVar->increaseIndex();
-			m_context.setZeroValue(*symbVar);
-			if (
-				dynamic_cast<IndexAccess const*>(subExpr) ||
-				dynamic_cast<MemberAccess const*>(subExpr)
-			)
-				indexOrMemberAssignment(*subExpr, symbVar->currentValue());
-			// Empty push added a zero value anyway, so no need to delete extra.
-			else if (!isEmptyPush(*subExpr))
-				solAssert(false, "");
-		}
-		break;
-	}
-	default:
-		solAssert(false, "");
-	}
-}
-
-bool SMTEncoder::visit(UnaryOperation const& _op)
-{
-	return !shortcutRationalNumber(_op);
-}
-
-bool SMTEncoder::visit(BinaryOperation const& _op)
-{
-	if (shortcutRationalNumber(_op))
-		return false;
-	if (TokenTraits::isBooleanOp(_op.getOperator()) && !*_op.annotation().userDefinedFunction)
-	{
-		booleanOperation(_op);
-		return false;
-	}
-	return true;
-}
-
-void SMTEncoder::endVisit(BinaryOperation const& _op)
-{
-	/// If _op is const evaluated the RationalNumber shortcut was taken.
-	if (isConstant(_op))
-		return;
-	if (TokenTraits::isBooleanOp(_op.getOperator()) && !*_op.annotation().userDefinedFunction)
-		return;
-
-	createExpr(_op);
-
-	// User-defined operators are essentially function calls.
-	if (*_op.annotation().userDefinedFunction)
-		return;
-
-	if (TokenTraits::isArithmeticOp(_op.getOperator()))
-		arithmeticOperation(_op);
-	else if (TokenTraits::isCompareOp(_op.getOperator()))
-		compareOperation(_op);
-	else if (TokenTraits::isBitOp(_op.getOperator()) || TokenTraits::isShiftOp(_op.getOperator()))
-		bitwiseOperation(_op);
-	else
-		solAssert(false, "");
-}
-
-bool SMTEncoder::visit(Conditional const& _op)
-{
-	_op.condition().accept(*this);
-
-	auto indicesEndTrue = visitBranch(&_op.trueExpression(), expr(_op.condition())).first;
-
-	auto indicesEndFalse = visitBranch(&_op.falseExpression(), !expr(_op.condition())).first;
-
-	mergeVariables(expr(_op.condition()), indicesEndTrue, indicesEndFalse);
-
-	defineExpr(_op, smtutil::Expression::ite(
-		expr(_op.condition()),
-		expr(_op.trueExpression(), _op.annotation().type),
-		expr(_op.falseExpression(), _op.annotation().type)
-	));
-
-	return false;
-}
-
-bool SMTEncoder::visit(FunctionCall const& _funCall)
-{
-	auto functionCallKind = *_funCall.annotation().kind;
-	if (functionCallKind != FunctionCallKind::FunctionCall)
-		return true;
-
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	// We do not want to visit the TypeTypes in the second argument of `abi.decode`.
-	// Those types are checked/used in SymbolicState::buildABIFunctions.
-	if (funType.kind() == FunctionType::Kind::ABIDecode)
-	{
-		if (auto arg = _funCall.arguments().front())
-			arg->accept(*this);
-		return false;
-	}
-
-	// We do not really need to visit the expression in a wrap/unwrap no-op call,
-	// so we just ignore the function call expression to avoid "unsupported" warnings.
-	else if (
-		funType.kind() == FunctionType::Kind::Wrap ||
-		funType.kind() == FunctionType::Kind::Unwrap
-	)
-	{
-		if (auto arg = _funCall.arguments().front())
-			arg->accept(*this);
-		return false;
-	}
-	return true;
-}
-
-void SMTEncoder::endVisit(FunctionCall const& _funCall)
-{
-	auto functionCallKind = *_funCall.annotation().kind;
-
-	createExpr(_funCall);
-	if (functionCallKind == FunctionCallKind::StructConstructorCall)
-	{
-		visitStructConstructorCall(_funCall);
-		return;
-	}
-
-	if (functionCallKind == FunctionCallKind::TypeConversion)
-	{
-		visitTypeConversion(_funCall);
-		return;
-	}
-
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-
-	std::vector<ASTPointer<Expression const>> const args = _funCall.arguments();
-	switch (funType.kind())
-	{
-	case FunctionType::Kind::Assert:
-		visitAssert(_funCall);
-		break;
-	case FunctionType::Kind::Require:
-		visitRequire(_funCall);
-		break;
-	case FunctionType::Kind::Revert:
-		// Revert is a special case of require and equals to `require(false)`
-		addPathImpliedExpression(smtutil::Expression(false));
-		break;
-	case FunctionType::Kind::GasLeft:
-		visitGasLeft(_funCall);
-		break;
-	case FunctionType::Kind::External:
-		if (publicGetter(_funCall.expression()))
-			visitPublicGetter(_funCall);
-		break;
-	case FunctionType::Kind::ABIDecode:
-	case FunctionType::Kind::ABIEncode:
-	case FunctionType::Kind::ABIEncodePacked:
-	case FunctionType::Kind::ABIEncodeWithSelector:
-	case FunctionType::Kind::ABIEncodeCall:
-	case FunctionType::Kind::ABIEncodeWithSignature:
-		visitABIFunction(_funCall);
-		break;
-	case FunctionType::Kind::Internal:
-	case FunctionType::Kind::BareStaticCall:
-	case FunctionType::Kind::BareCall:
-		break;
-	case FunctionType::Kind::KECCAK256:
-	case FunctionType::Kind::ECRecover:
-	case FunctionType::Kind::SHA256:
-	case FunctionType::Kind::RIPEMD160:
-		visitCryptoFunction(_funCall);
-		break;
-	case FunctionType::Kind::BlockHash:
-		defineExpr(_funCall, state().blockhash(expr(*_funCall.arguments().at(0))));
-		break;
-	case FunctionType::Kind::AddMod:
-	case FunctionType::Kind::MulMod:
-		visitAddMulMod(_funCall);
-		break;
-	case FunctionType::Kind::Unwrap:
-	case FunctionType::Kind::Wrap:
-		visitWrapUnwrap(_funCall);
-		break;
-	case FunctionType::Kind::Send:
-	case FunctionType::Kind::Transfer:
-	{
-		auto const& memberAccess = dynamic_cast<MemberAccess const&>(_funCall.expression());
-		auto const& address = memberAccess.expression();
-		auto const& value = args.front();
-		solAssert(value, "");
-
-		smtutil::Expression thisBalance = state().balance();
-		setSymbolicUnknownValue(thisBalance, TypeProvider::uint256(), m_context);
-
-		state().transfer(state().thisAddress(), expr(address), expr(*value));
-		break;
-	}
-	case FunctionType::Kind::ArrayPush:
-		arrayPush(_funCall);
-		break;
-	case FunctionType::Kind::ArrayPop:
-		arrayPop(_funCall);
-		break;
-	case FunctionType::Kind::Event:
-	case FunctionType::Kind::Error:
-		// This can be safely ignored.
-		break;
-	case FunctionType::Kind::ObjectCreation:
-		visitObjectCreation(_funCall);
-		return;
-	case FunctionType::Kind::Creation:
-		if (!m_settings.engine.chc || !m_settings.externalCalls.isTrusted())
-			m_unsupportedErrors.warning(
-				8729_error,
-				_funCall.location(),
-				"Contract deployment is only supported in the trusted mode for external calls"
-				" with the CHC engine."
-			);
-		break;
-	case FunctionType::Kind::DelegateCall:
-	case FunctionType::Kind::BareCallCode:
-	case FunctionType::Kind::BareDelegateCall:
-	default:
-		m_unsupportedErrors.warning(
-			4588_error,
-			_funCall.location(),
-			"Assertion checker does not yet implement this type of function call."
-		);
-	}
-}
-
-bool SMTEncoder::visit(ModifierInvocation const& _node)
-{
-	if (auto const* args = _node.arguments())
-		for (auto const& arg: *args)
-			if (arg)
-				arg->accept(*this);
-	return false;
-}
-
-void SMTEncoder::initContract(ContractDefinition const& _contract)
-{
-	solAssert(m_currentContract == nullptr, "");
-	m_currentContract = &_contract;
-
-	m_context.reset();
-	m_context.pushSolver();
-	createStateVariables(_contract);
-	clearIndices(m_currentContract, nullptr);
-	m_variableUsage.setCurrentContract(_contract);
-	m_checked = true;
-}
-
-void SMTEncoder::initFunction(FunctionDefinition const& _function)
-{
-	solAssert(m_callStack.empty(), "");
-	solAssert(m_currentContract, "");
-	m_context.pushSolver();
-	m_pathConditions.clear();
-	pushCallStack({&_function, nullptr});
-	m_uninterpretedTerms.clear();
-	createStateVariables(*m_currentContract);
-	createLocalVariables(_function);
-	m_arrayAssignmentHappened = false;
-	clearIndices(m_currentContract, &_function);
-	m_checked = true;
-}
-
-void SMTEncoder::visitAssert(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() == 1, "");
-	solAssert(args.front()->annotation().type->category() == Type::Category::Bool, "");
-}
-
-void SMTEncoder::visitRequire(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() >= 1, "");
-	solAssert(args.front()->annotation().type->category() == Type::Category::Bool, "");
-	addPathImpliedExpression(expr(*args.front()));
-}
-
-void SMTEncoder::visitABIFunction(FunctionCall const& _funCall)
-{
-	auto symbFunction = state().abiFunction(&_funCall);
-	auto const& [name, inTypes, outTypes] = state().abiFunctionTypes(&_funCall);
-
-	auto const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	auto kind = funType.kind();
-	auto const& args = _funCall.sortedArguments();
-	auto argsActualLength = kind == FunctionType::Kind::ABIDecode ? 1 : args.size();
-
-	solAssert(inTypes.size() == argsActualLength, "");
-	if (argsActualLength == 0)
-	{
-		defineExpr(_funCall, smt::zeroValue(TypeProvider::bytesMemory()));
-		return;
-	}
-	std::vector<smtutil::Expression> symbArgs;
-	for (unsigned i = 0; i < argsActualLength; ++i)
-		if (args.at(i))
-			symbArgs.emplace_back(expr(*args.at(i), inTypes.at(i)));
-
-	std::optional<smtutil::Expression> arg;
-	if (inTypes.size() == 1)
-		arg = expr(*args.at(0), inTypes.at(0));
-	else
-	{
-		auto inputSort = dynamic_cast<smtutil::ArraySort&>(*symbFunction.sort).domain;
-		arg = smtutil::Expression::tuple_constructor(
-			smtutil::Expression(std::make_shared<smtutil::SortSort>(inputSort), ""),
-			symbArgs
-		);
-	}
-
-	auto out = smtutil::Expression::select(symbFunction, *arg);
-	if (outTypes.size() == 1)
-		defineExpr(_funCall, out);
-	else
-	{
-		auto symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_funCall));
-		solAssert(symbTuple, "");
-		solAssert(symbTuple->components().size() == outTypes.size(), "");
-		solAssert(out.sort->kind == smtutil::Kind::Tuple, "");
-
-		symbTuple->increaseIndex();
-		for (unsigned i = 0; i < symbTuple->components().size(); ++i)
-			m_context.addAssertion(symbTuple->component(i) == smtutil::Expression::tuple_get(out, i));
-	}
-}
-
-void SMTEncoder::visitCryptoFunction(FunctionCall const& _funCall)
-{
-	auto const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	auto kind = funType.kind();
-	auto arg0 = expr(*_funCall.arguments().at(0));
-	std::optional<smtutil::Expression> result;
-	if (kind == FunctionType::Kind::KECCAK256)
-		result = smtutil::Expression::select(state().cryptoFunction("keccak256"), arg0);
-	else if (kind == FunctionType::Kind::SHA256)
-		result = smtutil::Expression::select(state().cryptoFunction("sha256"), arg0);
-	else if (kind == FunctionType::Kind::RIPEMD160)
-		result = smtutil::Expression::select(state().cryptoFunction("ripemd160"), arg0);
-	else if (kind == FunctionType::Kind::ECRecover)
-	{
-		auto e = state().cryptoFunction("ecrecover");
-		auto arg0 = expr(*_funCall.arguments().at(0));
-		auto arg1 = expr(*_funCall.arguments().at(1));
-		auto arg2 = expr(*_funCall.arguments().at(2));
-		auto arg3 = expr(*_funCall.arguments().at(3));
-		auto inputSort = dynamic_cast<smtutil::ArraySort&>(*e.sort).domain;
-		auto ecrecoverInput = smtutil::Expression::tuple_constructor(
-			smtutil::Expression(std::make_shared<smtutil::SortSort>(inputSort), ""),
-			{arg0, arg1, arg2, arg3}
-		);
-		result = smtutil::Expression::select(e, ecrecoverInput);
-	}
-	else
-		solAssert(false, "");
-
-	defineExpr(_funCall, *result);
-}
-
-void SMTEncoder::visitGasLeft(FunctionCall const& _funCall)
-{
-	std::string gasLeft = "gasleft";
-	// We increase the variable index since gasleft changes
-	// inside a tx.
-	defineGlobalVariable(gasLeft, _funCall, true);
-	auto const& symbolicVar = m_context.globalSymbol(gasLeft);
-	unsigned index = symbolicVar->index();
-	// We set the current value to unknown anyway to add type constraints.
-	m_context.setUnknownValue(*symbolicVar);
-	if (index > 0)
-		m_context.addAssertion(symbolicVar->currentValue() <= symbolicVar->valueAtIndex(index - 1));
-}
-
-void SMTEncoder::visitAddMulMod(FunctionCall const& _funCall)
-{
-	auto const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	auto kind = funType.kind();
-	solAssert(kind == FunctionType::Kind::AddMod || kind == FunctionType::Kind::MulMod, "");
-	auto const& args = _funCall.arguments();
-	solAssert(args.at(0) && args.at(1) && args.at(2), "");
-	auto x = expr(*args.at(0));
-	auto y = expr(*args.at(1));
-	auto k = expr(*args.at(2));
-	auto const& intType = dynamic_cast<IntegerType const&>(*_funCall.annotation().type);
-
-	if (kind == FunctionType::Kind::AddMod)
-		defineExpr(_funCall, divModWithSlacks(x + y, k, intType).second);
-	else
-		defineExpr(_funCall, divModWithSlacks(x * y, k, intType).second);
-}
-
-void SMTEncoder::visitWrapUnwrap(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() == 1, "");
-	defineExpr(_funCall, expr(*args.front()));
-}
-
-void SMTEncoder::visitObjectCreation(FunctionCall const& _funCall)
-{
-	auto const& args = _funCall.arguments();
-	solAssert(args.size() >= 1, "");
-	auto argType = args.front()->annotation().type->category();
-	solAssert(argType == Type::Category::Integer || argType == Type::Category::RationalNumber, "");
-
-	smtutil::Expression arraySize = expr(*args.front());
-	setSymbolicUnknownValue(arraySize, TypeProvider::uint256(), m_context);
-
-	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_funCall));
-	solAssert(symbArray, "");
-	smt::setSymbolicZeroValue(*symbArray, m_context);
-	auto zeroElements = symbArray->elements();
-	symbArray->increaseIndex();
-	m_context.addAssertion(symbArray->length() == arraySize);
-	m_context.addAssertion(symbArray->elements() == zeroElements);
-}
-
-void SMTEncoder::endVisit(Identifier const& _identifier)
-{
-	if (auto decl = identifierToVariable(_identifier))
-	{
-		if (decl->isConstant())
-			defineExpr(_identifier, constantExpr(_identifier, *decl));
-		else
-			defineExpr(_identifier, currentValue(*decl));
-	}
-	else if (_identifier.annotation().type->category() == Type::Category::Function)
-		visitFunctionIdentifier(_identifier);
-	else if (_identifier.name() == "now")
-		defineGlobalVariable(_identifier.name(), _identifier);
-	else if (_identifier.name() == "this")
-	{
-		defineExpr(_identifier, state().thisAddress());
-		m_uninterpretedTerms.insert(&_identifier);
-	}
-	// Ignore type identifiers
-	else if (dynamic_cast<TypeType const*>(_identifier.annotation().type))
-		return;
-	// Ignore module identifiers
-	else if (dynamic_cast<ModuleType const*>(_identifier.annotation().type))
-		return;
-	// Ignore user defined value type identifiers
-	else if (dynamic_cast<UserDefinedValueType const*>(_identifier.annotation().type))
-		return;
-	// Ignore the builtin abi, it is handled in FunctionCall.
-	// TODO: ignore MagicType in general (abi, block, msg, tx, type)
-	else if (auto magicType = dynamic_cast<MagicType const*>(_identifier.annotation().type); magicType && magicType->kind() == MagicType::Kind::ABI)
-	{
-		solAssert(_identifier.name() == "abi", "");
-		return;
-	}
-	else
-		createExpr(_identifier);
-}
-
-void SMTEncoder::endVisit(ElementaryTypeNameExpression const& _typeName)
-{
-	auto const& typeType = dynamic_cast<TypeType const&>(*_typeName.annotation().type);
-	auto result = smt::newSymbolicVariable(
-		*TypeProvider::uint256(),
-		typeType.actualType()->toString(false),
-		m_context
-	);
-	solAssert(!result.first && result.second, "");
-	m_context.createExpression(_typeName, result.second);
-}
-
-namespace // helpers for SMTEncoder::visitPublicGetter
-{
-
-bool isReturnedFromStructGetter(Type const* _type)
-{
-	// So far it seems that only Mappings and ordinary Arrays are not returned.
-	auto category = _type->category();
-	if (category == Type::Category::Mapping)
-		return false;
-	if (category == Type::Category::Array)
-		return dynamic_cast<ArrayType const&>(*_type).isByteArrayOrString();
-	// default
-	return true;
-}
-
-std::vector<std::string> structGetterReturnedMembers(StructType const& _structType)
-{
-	std::vector<std::string> returnedMembers;
-	for (auto const& member: _structType.nativeMembers(nullptr))
-		if (isReturnedFromStructGetter(member.type))
-			returnedMembers.push_back(member.name);
-	return returnedMembers;
-}
-
-}
-
-void SMTEncoder::visitPublicGetter(FunctionCall const& _funCall)
-{
-	auto var = publicGetter(_funCall.expression());
-	solAssert(var && var->isStateVariable(), "");
-	solAssert(m_context.knownExpression(_funCall), "");
-	auto paramExpectedTypes = replaceUserTypes(FunctionType(*var).parameterTypes());
-	auto actualArguments = _funCall.arguments();
-	solAssert(actualArguments.size() == paramExpectedTypes.size(), "");
-	std::deque<smtutil::Expression> symbArguments;
-	for (unsigned i = 0; i < paramExpectedTypes.size(); ++i)
-		symbArguments.push_back(expr(*actualArguments[i], paramExpectedTypes[i]));
-
-	// See FunctionType::FunctionType(VariableDeclaration const& _varDecl)
-	// to understand the return types of public getters.
-	Type const* type = var->type();
-	smtutil::Expression currentExpr = currentValue(*var);
-	while (true)
-	{
-		if (
-			type->isValueType() ||
-			(type->category() == Type::Category::Array && dynamic_cast<ArrayType const&>(*type).isByteArrayOrString())
-		)
-		{
-			solAssert(symbArguments.empty(), "");
-			defineExpr(_funCall, currentExpr);
-			return;
-		}
-		switch (type->category())
-		{
-			case Type::Category::Array:
-			case Type::Category::Mapping:
-			{
-				solAssert(!symbArguments.empty(), "");
-				// For nested arrays/mappings, each argument in the call is an index to the next layer.
-				// We mirror this with `select` after unpacking the SMT-LIB array expression.
-				currentExpr = smtutil::Expression::select(smtutil::Expression::tuple_get(currentExpr, 0), symbArguments.front());
-				symbArguments.pop_front();
-				if (auto arrayType = dynamic_cast<ArrayType const*>(type))
-					type = arrayType->baseType();
-				else if (auto mappingType = dynamic_cast<MappingType const*>(type))
-					type = mappingType->valueType();
-				else
-					solAssert(false, "");
-				break;
-			}
-			case Type::Category::Struct:
-			{
-				solAssert(symbArguments.empty(), "");
-				smt::SymbolicStructVariable structVar(dynamic_cast<StructType const*>(type), "struct_temp_" + std::to_string(_funCall.id()), m_context);
-				m_context.addAssertion(structVar.currentValue() == currentExpr);
-				auto returnedMembers = structGetterReturnedMembers(dynamic_cast<StructType const&>(*structVar.type()));
-				solAssert(!returnedMembers.empty(), "");
-				auto returnedValues = applyMap(returnedMembers, [&](std::string const& memberName) -> std::optional<smtutil::Expression> { return structVar.member(memberName); });
-				defineExpr(_funCall, returnedValues);
-				return;
-			}
-			default:
-			{
-				// Unsupported cases, do nothing and the getter will be abstracted.
-				return;
-			}
-		}
-	}
-}
-
-bool SMTEncoder::shouldAnalyze(SourceUnit const& _source) const
-{
-	return m_settings.contracts.isDefault() ||
-		m_settings.contracts.has(*_source.annotation().path);
-}
-
-bool SMTEncoder::shouldAnalyze(ContractDefinition const& _contract) const
-{
-	if (!_contract.canBeDeployed())
-		return false;
-
-	return m_settings.contracts.isDefault() ||
-		m_settings.contracts.has(_contract.sourceUnitName());
-}
-
-void SMTEncoder::visitTypeConversion(FunctionCall const& _funCall)
-{
-	solAssert(*_funCall.annotation().kind == FunctionCallKind::TypeConversion, "");
-	solAssert(_funCall.arguments().size() == 1, "");
-
-	auto argument = _funCall.arguments().front();
-	auto const argType = argument->annotation().type;
-	auto const funCallType = _funCall.annotation().type;
-
-	auto symbArg = expr(*argument, funCallType);
-
-	if (smt::isStringLiteral(*argType) && smt::isFixedBytes(*funCallType))
-	{
-		defineExpr(_funCall, symbArg);
-		return;
-	}
-
-	ArrayType const* arrayType = dynamic_cast<ArrayType const*>(argType);
-	if (auto sliceType = dynamic_cast<ArraySliceType const*>(argType))
-		arrayType = &sliceType->arrayType();
-
-	if (arrayType && arrayType->isByteArrayOrString() && smt::isFixedBytes(*funCallType))
-	{
-		auto array = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*argument));
-		bytesToFixedBytesAssertions(*array, _funCall);
-		return;
-	}
-
-	// TODO Simplify this whole thing for 0.8.0 where weird casts are disallowed.
-
-	unsigned argSize = argType->storageBytes();
-	unsigned castSize = funCallType->storageBytes();
-	bool castIsSigned = smt::isNumber(*funCallType) && smt::isSigned(funCallType);
-	bool argIsSigned = smt::isNumber(*argType) && smt::isSigned(argType);
-	std::optional<smtutil::Expression> symbMin;
-	std::optional<smtutil::Expression> symbMax;
-	if (smt::isNumber(*funCallType))
-	{
-		symbMin = smt::minValue(funCallType);
-		symbMax = smt::maxValue(funCallType);
-	}
-	if (argSize == castSize)
-	{
-		// If sizes are the same, it's possible that the signs are different.
-		if (smt::isNumber(*funCallType) && smt::isNumber(*argType))
-		{
-			// castIsSigned && !argIsSigned => might overflow if arg > castType.max
-			// !castIsSigned && argIsSigned => might underflow if arg < castType.min
-			// !castIsSigned && !argIsSigned => ok
-			// castIsSigned && argIsSigned => ok
-
-			if (castIsSigned && !argIsSigned)
-			{
-				auto wrap = smtutil::Expression::ite(
-					symbArg > *symbMax,
-					symbArg - (*symbMax - *symbMin + 1),
-					symbArg
-				);
-				defineExpr(_funCall, wrap);
-			}
-			else if (!castIsSigned && argIsSigned)
-			{
-				auto wrap = smtutil::Expression::ite(
-					symbArg < *symbMin,
-					symbArg + (*symbMax + 1),
-					symbArg
-				);
-				defineExpr(_funCall, wrap);
-			}
-			else
-				defineExpr(_funCall, symbArg);
-		}
-		else
-			defineExpr(_funCall, symbArg);
-	}
-	else if (castSize > argSize)
-	{
-		solAssert(smt::isNumber(*funCallType), "");
-		// RationalNumbers have size 32.
-		solAssert(argType->category() != Type::Category::RationalNumber, "");
-
-		// castIsSigned && !argIsSigned => ok
-		// castIsSigned && argIsSigned => ok
-		// !castIsSigned && !argIsSigned => ok except for FixedBytesType, need to adjust padding
-		// !castIsSigned && argIsSigned => might underflow if arg < castType.min
-
-		if (!castIsSigned && argIsSigned)
-		{
-			auto wrap = smtutil::Expression::ite(
-				symbArg < *symbMin,
-				symbArg + (*symbMax + 1),
-				symbArg
-			);
-			defineExpr(_funCall, wrap);
-		}
-		else if (!castIsSigned && !argIsSigned)
-		{
-			if (auto const* fixedCast = dynamic_cast<FixedBytesType const*>(funCallType))
-			{
-				auto const* fixedArg = dynamic_cast<FixedBytesType const*>(argType);
-				solAssert(fixedArg, "");
-				auto diff = fixedCast->numBytes() - fixedArg->numBytes();
-				solAssert(diff > 0, "");
-				auto bvSize = fixedCast->numBytes() * 8;
-				defineExpr(
-					_funCall,
-					smtutil::Expression::bv2int(smtutil::Expression::int2bv(symbArg, bvSize) << smtutil::Expression::int2bv(diff * 8, bvSize))
-				);
-			}
-			else
-				defineExpr(_funCall, symbArg);
-		}
-		else
-			defineExpr(_funCall, symbArg);
-	}
-	else // castSize < argSize
-	{
-		solAssert(smt::isNumber(*funCallType), "");
-
-		RationalNumberType const* rationalType = isConstant(*argument);
-		if (rationalType)
-		{
-			// The TypeChecker guarantees that a constant fits in the cast size.
-			defineExpr(_funCall, symbArg);
-			return;
-		}
-
-		auto const* fixedCast = dynamic_cast<FixedBytesType const*>(funCallType);
-		auto const* fixedArg = dynamic_cast<FixedBytesType const*>(argType);
-		if (fixedCast && fixedArg)
-		{
-			createExpr(_funCall);
-			auto diff = argSize - castSize;
-			solAssert(fixedArg->numBytes() - fixedCast->numBytes() == diff, "");
-
-			auto argValueBV = smtutil::Expression::int2bv(symbArg, argSize * 8);
-			auto shr = smtutil::Expression::int2bv(diff * 8, argSize * 8);
-			solAssert(!castIsSigned, "");
-			defineExpr(_funCall, smtutil::Expression::bv2int(argValueBV >> shr));
-		}
-		else
-		{
-			auto argValueBV = smtutil::Expression::int2bv(symbArg, castSize * 8);
-			defineExpr(_funCall, smtutil::Expression::bv2int(argValueBV, castIsSigned));
-		}
-	}
-}
-
-void SMTEncoder::visitFunctionIdentifier(Identifier const& _identifier)
-{
-	auto const& fType = dynamic_cast<FunctionType const&>(*_identifier.annotation().type);
-	if (replaceUserTypes(fType.returnParameterTypes()).size() == 1)
-	{
-		defineGlobalVariable(fType.identifier(), _identifier);
-		m_context.createExpression(_identifier, m_context.globalSymbol(fType.identifier()));
-	}
-}
-
-void SMTEncoder::visitStructConstructorCall(FunctionCall const& _funCall)
-{
-	solAssert(*_funCall.annotation().kind == FunctionCallKind::StructConstructorCall, "");
-	if (smt::isNonRecursiveStruct(*_funCall.annotation().type))
-	{
-		auto& structSymbolicVar = dynamic_cast<smt::SymbolicStructVariable&>(*m_context.expression(_funCall));
-		auto structType = dynamic_cast<StructType const*>(structSymbolicVar.type());
-		solAssert(structType, "");
-		auto const& structMembers = structType->structDefinition().members();
-		solAssert(structMembers.size() == _funCall.sortedArguments().size(), "");
-		auto args = _funCall.sortedArguments();
-		structSymbolicVar.assignAllMembers(applyMap(
-			ranges::views::zip(args, structMembers),
-			[this] (auto const& argMemberPair) { return expr(*argMemberPair.first, argMemberPair.second->type()); }
-		));
-	}
-
-}
-
-void SMTEncoder::endVisit(Literal const& _literal)
-{
-	solAssert(_literal.annotation().type, "Expected type for AST node");
-	Type const& type = *_literal.annotation().type;
-	if (smt::isNumber(type))
-		defineExpr(_literal, smtutil::Expression(type.literalValue(&_literal)));
-	else if (smt::isBool(type))
-		defineExpr(_literal, smtutil::Expression(_literal.token() == Token::TrueLiteral ? true : false));
-	else if (smt::isStringLiteral(type))
-	{
-		createExpr(_literal);
-
-		// Add constraints for the length and values as it is known.
-		auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_literal));
-		solAssert(symbArray, "");
-
-		addArrayLiteralAssertions(
-			*symbArray,
-			applyMap(_literal.value(), [](unsigned char c) { return smtutil::Expression{size_t(c)}; })
-		);
-	}
-	else
-		solAssert(false, "");
-}
-
-void SMTEncoder::addArrayLiteralAssertions(
-	smt::SymbolicArrayVariable& _symArray,
-	std::vector<smtutil::Expression> const& _elementValues
-)
-{
-	m_context.addAssertion(_symArray.length() == _elementValues.size());
-	for (size_t i = 0; i < _elementValues.size(); i++)
-		m_context.addAssertion(smtutil::Expression::select(_symArray.elements(), i) == _elementValues[i]);
-}
-
-void SMTEncoder::bytesToFixedBytesAssertions(
-	smt::SymbolicArrayVariable& _symArray,
-	Expression const& _fixedBytes
-)
-{
-	auto const& fixed = dynamic_cast<FixedBytesType const&>(*_fixedBytes.annotation().type);
-	auto intType = TypeProvider::uint256();
-	std::string suffix = std::to_string(_fixedBytes.id()) + "_" + std::to_string(m_context.newUniqueId());
-	smt::SymbolicIntVariable k(intType, intType, "k_" + suffix, m_context);
-	m_context.addAssertion(k.currentValue() == 0);
-	size_t n = fixed.numBytes();
-	for (size_t i = 0; i < n; i++)
-	{
-		auto kPrev = k.currentValue();
-		m_context.addAssertion((smtutil::Expression::select(_symArray.elements(), i) * (u256(1) << ((n - i - 1) * 8))) + kPrev == k.increaseIndex());
-	}
-	m_context.addAssertion(expr(_fixedBytes) == k.currentValue());
-}
-
-void SMTEncoder::endVisit(Return const& _return)
-{
-	if (_return.expression() && m_context.knownExpression(*_return.expression()))
-	{
-		auto returnParams = m_callStack.back().first->returnParameters();
-		if (returnParams.size() > 1)
-		{
-			auto const& symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(*_return.expression()));
-			solAssert(symbTuple, "");
-			solAssert(symbTuple->components().size() == returnParams.size(), "");
-
-			auto const* tupleType = dynamic_cast<TupleType const*>(_return.expression()->annotation().type);
-			solAssert(tupleType, "");
-			auto const& types = tupleType->components();
-			solAssert(types.size() == returnParams.size(), "");
-
-			for (unsigned i = 0; i < returnParams.size(); ++i)
-				assignment(*returnParams.at(i), symbTuple->component(i, types.at(i), returnParams.at(i)->type()));
-		}
-		else if (returnParams.size() == 1)
-			assignment(*returnParams.front(), expr(*_return.expression(), returnParams.front()->type()));
-	}
-}
-
-bool SMTEncoder::visit(MemberAccess const& _memberAccess)
-{
-	createExpr(_memberAccess);
-
-	auto const& accessType = _memberAccess.annotation().type;
-	if (accessType->category() == Type::Category::Function)
-	{
-		auto const* functionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
-		if (functionType && functionType->hasDeclaration())
-			defineExpr(
-				_memberAccess,
-				util::selectorFromSignatureU32(functionType->richIdentifier())
-			);
-
-		return true;
-	}
-
-	Expression const* memberExpr = innermostTuple(_memberAccess.expression());
-
-	auto const& exprType = memberExpr->annotation().type;
-	solAssert(exprType, "");
-
-	if (exprType->category() == Type::Category::Magic)
-	{
-		if (auto const* identifier = dynamic_cast<Identifier const*>(memberExpr))
-		{
-			auto const& name = identifier->name();
-			solAssert(name == "block" || name == "msg" || name == "tx", "");
-			auto memberName = _memberAccess.memberName();
-
-			// TODO remove this for 0.9.0
-			if (name == "block" && memberName == "difficulty")
-				memberName = "prevrandao";
-
-			defineExpr(_memberAccess, state().txMember(name + "." + memberName));
-		}
-		else if (auto magicType = dynamic_cast<MagicType const*>(exprType))
-		{
-			if (magicType->kind() == MagicType::Kind::Block)
-				defineExpr(_memberAccess, state().txMember("block." + _memberAccess.memberName()));
-			else if (magicType->kind() == MagicType::Kind::Message)
-				defineExpr(_memberAccess, state().txMember("msg." + _memberAccess.memberName()));
-			else if (magicType->kind() == MagicType::Kind::Transaction)
-				defineExpr(_memberAccess, state().txMember("tx." + _memberAccess.memberName()));
-			else if (magicType->kind() == MagicType::Kind::MetaType)
-			{
-				auto const& memberName = _memberAccess.memberName();
-				if (memberName == "min" || memberName == "max")
-				{
-					if (IntegerType const* integerType = dynamic_cast<IntegerType const*>(magicType->typeArgument()))
-						defineExpr(_memberAccess, memberName == "min" ? integerType->minValue() : integerType->maxValue());
-					else if (EnumType const* enumType = dynamic_cast<EnumType const*>(magicType->typeArgument()))
-						defineExpr(_memberAccess, memberName == "min" ? enumType->minValue() : enumType->maxValue());
-				}
-				else if (memberName == "interfaceId")
-				{
-					ContractDefinition const& contract = dynamic_cast<ContractType const&>(*magicType->typeArgument()).contractDefinition();
-					defineExpr(_memberAccess, contract.interfaceId());
-				}
-				else
-					// NOTE: supporting name, creationCode, runtimeCode would be easy enough, but the bytes/string they return are not
-					//       at all usable in the SMT checker currently
-					m_unsupportedErrors.warning(
-						7507_error,
-						_memberAccess.location(),
-						"Assertion checker does not yet support this expression."
-					);
-
-			}
-		}
-		else
-			solAssert(false, "");
-
-		return false;
-	}
-	else if (smt::isNonRecursiveStruct(*exprType))
-	{
-		memberExpr->accept(*this);
-		auto const& symbStruct = std::dynamic_pointer_cast<smt::SymbolicStructVariable>(m_context.expression(*memberExpr));
-		defineExpr(_memberAccess, symbStruct->member(_memberAccess.memberName()));
-		return false;
-	}
-	else if (exprType->category() == Type::Category::TypeType)
-	{
-		auto const* decl = expressionToDeclaration(*memberExpr);
-		if (dynamic_cast<EnumDefinition const*>(decl))
-		{
-			auto enumType = dynamic_cast<EnumType const*>(accessType);
-			solAssert(enumType, "");
-			defineExpr(_memberAccess, enumType->memberValue(_memberAccess.memberName()));
-
-			return false;
-		}
-		else if (dynamic_cast<ContractDefinition const*>(decl))
-		{
-			if (auto const* var = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-			{
-				if (var->isConstant())
-					defineExpr(_memberAccess, constantExpr(_memberAccess, *var));
-				else
-					defineExpr(_memberAccess, currentValue(*var));
-				return false;
-			}
-		}
-	}
-	else if (exprType->category() == Type::Category::Address)
-	{
-		memberExpr->accept(*this);
-		if (_memberAccess.memberName() == "balance")
-		{
-			defineExpr(_memberAccess, state().balance(expr(*memberExpr)));
-			setSymbolicUnknownValue(*m_context.expression(_memberAccess), m_context);
-			m_uninterpretedTerms.insert(&_memberAccess);
-			return false;
-		}
-	}
-	else if (exprType->category() == Type::Category::Array)
-	{
-		memberExpr->accept(*this);
-		if (_memberAccess.memberName() == "length")
-		{
-			auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*memberExpr));
-			solAssert(symbArray, "");
-			defineExpr(_memberAccess, symbArray->length());
-			m_uninterpretedTerms.insert(&_memberAccess);
-			setSymbolicUnknownValue(
-				expr(_memberAccess),
-				_memberAccess.annotation().type,
-				m_context
-			);
-		}
-		return false;
-	}
-	else if (
-		auto const* functionType = dynamic_cast<FunctionType const*>(exprType);
-		functionType &&
-		_memberAccess.memberName() == "selector" &&
-		functionType->hasDeclaration()
-	)
-	{
-		defineExpr(_memberAccess, functionType->externalIdentifier());
-		return false;
-	}
-	else if (exprType->category() == Type::Category::Module)
-	{
-		if (auto const* var = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-		{
-			solAssert(var->isConstant(), "");
-			defineExpr(_memberAccess, constantExpr(_memberAccess, *var));
-			return false;
-		}
-	}
-
-	m_unsupportedErrors.warning(
-		7650_error,
-		_memberAccess.location(),
-		"Assertion checker does not yet support this expression."
-	);
-
-	return true;
-}
-
-void SMTEncoder::endVisit(IndexAccess const& _indexAccess)
-{
-	createExpr(_indexAccess);
-
-	if (_indexAccess.annotation().type->category() == Type::Category::TypeType)
-		return;
-
-	makeOutOfBoundsVerificationTarget(_indexAccess);
-
-	if (auto const* type = dynamic_cast<FixedBytesType const*>(_indexAccess.baseExpression().annotation().type))
-	{
-		smtutil::Expression base = expr(_indexAccess.baseExpression());
-
-		if (type->numBytes() == 1)
-			defineExpr(_indexAccess, base);
-		else
-		{
-			auto [bvSize, isSigned] = smt::typeBvSizeAndSignedness(_indexAccess.baseExpression().annotation().type);
-			solAssert(!isSigned, "");
-			solAssert(bvSize >= 16, "");
-			solAssert(bvSize % 8 == 0, "");
-
-			smtutil::Expression idx = expr(*_indexAccess.indexExpression());
-
-			auto bvBase = smtutil::Expression::int2bv(base, bvSize);
-			auto bvShl = smtutil::Expression::int2bv(idx * 8, bvSize);
-			auto bvShr = smtutil::Expression::int2bv(bvSize - 8, bvSize);
-			auto result = (bvBase << bvShl) >> bvShr;
-
-			auto anyValue = expr(_indexAccess);
-			m_context.expression(_indexAccess)->increaseIndex();
-			unsigned numBytes = bvSize / 8;
-			auto withBound = smtutil::Expression::ite(
-				idx < numBytes,
-				smtutil::Expression::bv2int(result, false),
-				anyValue
-			);
-			defineExpr(_indexAccess, withBound);
-		}
-		return;
-	}
-
-	std::shared_ptr<smt::SymbolicVariable> array;
-	if (auto const* id = dynamic_cast<Identifier const*>(&_indexAccess.baseExpression()))
-	{
-		auto varDecl = identifierToVariable(*id);
-		solAssert(varDecl, "");
-		array = m_context.variable(*varDecl);
-
-		if (varDecl && varDecl->isConstant())
-			m_context.addAssertion(currentValue(*varDecl) == expr(*id));
-	}
-	else
-	{
-		solAssert(m_context.knownExpression(_indexAccess.baseExpression()), "");
-		array = m_context.expression(_indexAccess.baseExpression());
-	}
-
-	auto arrayVar = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(array);
-	solAssert(arrayVar, "");
-
-	Type const* baseType = _indexAccess.baseExpression().annotation().type;
-	defineExpr(_indexAccess, smtutil::Expression::select(
-		arrayVar->elements(),
-		expr(*_indexAccess.indexExpression(), keyType(baseType))
-	));
-	setSymbolicUnknownValue(
-		expr(_indexAccess),
-		_indexAccess.annotation().type,
-		m_context
-	);
-	m_uninterpretedTerms.insert(&_indexAccess);
-}
-
-void SMTEncoder::endVisit(IndexRangeAccess const& _indexRangeAccess)
-{
-	createExpr(_indexRangeAccess);
-	/// The actual slice is created by CHC which also assigns the length.
-}
-
-void SMTEncoder::arrayAssignment()
-{
-	m_arrayAssignmentHappened = true;
-}
-
-void SMTEncoder::indexOrMemberAssignment(Expression const& _expr, smtutil::Expression const& _rightHandSide)
-{
-	auto toStore = _rightHandSide;
-	auto const* lastExpr = &_expr;
-	while (true)
-	{
-		if (auto const* indexAccess = dynamic_cast<IndexAccess const*>(lastExpr))
-		{
-			auto const& base = indexAccess->baseExpression();
-			if (dynamic_cast<Identifier const*>(&base))
-				base.accept(*this);
-
-			Type const* baseType = base.annotation().type;
-			auto indexExpr = expr(*indexAccess->indexExpression(), keyType(baseType));
-			auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(base));
-			solAssert(symbArray, "");
-			toStore = smtutil::Expression::tuple_constructor(
-				smtutil::Expression(std::make_shared<smtutil::SortSort>(smt::smtSort(*baseType)), baseType->toString(true)),
-				{smtutil::Expression::store(symbArray->elements(), indexExpr, toStore), symbArray->length()}
-			);
-			defineExpr(*indexAccess, smtutil::Expression::select(
-				symbArray->elements(),
-				indexExpr
-			));
-			lastExpr = &indexAccess->baseExpression();
-		}
-		else if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(lastExpr))
-		{
-			auto const& base = memberAccess->expression();
-			if (dynamic_cast<Identifier const*>(&base))
-				base.accept(*this);
-
-			if (
-				auto const* structType = dynamic_cast<StructType const*>(base.annotation().type);
-				structType && structType->recursive()
-			)
-			{
-				m_unsupportedErrors.warning(
-					4375_error,
-					memberAccess->location(),
-					"Assertion checker does not support recursive structs."
-				);
-				return;
-			}
-			if (auto varDecl = identifierToVariable(*memberAccess))
-			{
-				if (varDecl->hasReferenceOrMappingType())
-					resetReferences(*varDecl);
-
-				assignment(*varDecl, toStore);
-				break;
-			}
-
-			auto symbStruct = std::dynamic_pointer_cast<smt::SymbolicStructVariable>(m_context.expression(base));
-			solAssert(symbStruct, "");
-			symbStruct->assignMember(memberAccess->memberName(), toStore);
-			toStore = symbStruct->currentValue();
-			defineExpr(*memberAccess, symbStruct->member(memberAccess->memberName()));
-			lastExpr = &memberAccess->expression();
-		}
-		else if (auto const& id = dynamic_cast<Identifier const*>(lastExpr))
-		{
-			auto varDecl = identifierToVariable(*id);
-			solAssert(varDecl, "");
-
-			if (varDecl->hasReferenceOrMappingType())
-				resetReferences(*varDecl);
-
-			assignment(*varDecl, toStore);
-			defineExpr(*id, currentValue(*varDecl));
-			break;
-		}
-		else
-		{
-			auto type = lastExpr->annotation().type;
-			if (
-				dynamic_cast<ReferenceType const*>(type) ||
-				dynamic_cast<MappingType const*>(type)
-			)
-				resetReferences(type);
-
-			assignment(*m_context.expression(*lastExpr), toStore);
-			break;
-		}
-	}
-}
-
-void SMTEncoder::arrayPush(FunctionCall const& _funCall)
-{
-	auto memberAccess = dynamic_cast<MemberAccess const*>(&_funCall.expression());
-	solAssert(memberAccess, "");
-	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
-	solAssert(symbArray, "");
-	auto oldLength = symbArray->length();
-	m_context.addAssertion(oldLength >= 0);
-	// Real world assumption: the array length is assumed to not overflow.
-	// This assertion guarantees that both the current and updated lengths have the above property.
-	m_context.addAssertion(oldLength + 1 < (smt::maxValue(*TypeProvider::uint256()) - 1));
-
-	auto const& arguments = _funCall.arguments();
-	auto arrayType = dynamic_cast<ArrayType const*>(symbArray->type());
-	solAssert(arrayType, "");
-	auto elementType = arrayType->baseType();
-	smtutil::Expression element = arguments.empty() ?
-		smt::zeroValue(elementType) :
-		expr(*arguments.front(), elementType);
-	smtutil::Expression store = smtutil::Expression::store(
-		symbArray->elements(),
-		oldLength,
-		element
-	);
-	symbArray->increaseIndex();
-	m_context.addAssertion(symbArray->elements() == store);
-	m_context.addAssertion(symbArray->length() == oldLength + 1);
-
-	if (arguments.empty())
-		defineExpr(_funCall, element);
-
-	assignment(memberAccess->expression(), symbArray->currentValue());
-}
-
-void SMTEncoder::arrayPop(FunctionCall const& _funCall)
-{
-	auto memberAccess = dynamic_cast<MemberAccess const*>(cleanExpression(_funCall.expression()));
-	solAssert(memberAccess, "");
-	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
-	solAssert(symbArray, "");
-
-	makeArrayPopVerificationTarget(_funCall);
-
-	auto oldElements = symbArray->elements();
-	auto oldLength = symbArray->length();
-
-	symbArray->increaseIndex();
-	m_context.addAssertion(symbArray->elements() == oldElements);
-	auto newLength = smtutil::Expression::ite(
-		oldLength > 0,
-		oldLength - 1,
-		0
-	);
-	m_context.addAssertion(symbArray->length() == newLength);
-
-	assignment(memberAccess->expression(), symbArray->currentValue());
-}
-
-void SMTEncoder::defineGlobalVariable(std::string const& _name, Expression const& _expr, bool _increaseIndex)
-{
-	if (!m_context.knownGlobalSymbol(_name))
-	{
-		bool abstract = m_context.createGlobalSymbol(_name, _expr);
-		if (abstract)
-			m_unsupportedErrors.warning(
-				1695_error,
-				_expr.location(),
-				"Assertion checker does not yet support this global variable."
-			);
-	}
-	else if (_increaseIndex)
-		m_context.globalSymbol(_name)->increaseIndex();
-	// The default behavior is not to increase the index since
-	// most of the global values stay the same throughout a tx.
-	if (isSupportedType(*_expr.annotation().type))
-		defineExpr(_expr, m_context.globalSymbol(_name)->currentValue());
-}
-
-bool SMTEncoder::shortcutRationalNumber(Expression const& _expr)
-{
-	RationalNumberType const* rationalType = isConstant(_expr);
-	if (!rationalType)
-		return false;
-
-	if (rationalType->isNegative())
-		defineExpr(_expr, smtutil::Expression(u2s(rationalType->literalValue(nullptr))));
-	else
-		defineExpr(_expr, smtutil::Expression(rationalType->literalValue(nullptr)));
-	return true;
-}
-
-void SMTEncoder::arithmeticOperation(BinaryOperation const& _op)
-{
-	auto type = _op.annotation().commonType;
-	solAssert(type, "");
-	solAssert(type->category() == Type::Category::Integer || type->category() == Type::Category::FixedPoint, "");
-	switch (_op.getOperator())
-	{
-	case Token::Add:
-	case Token::Sub:
-	case Token::Mul:
-	case Token::Div:
-	case Token::Mod:
-	{
-		auto values = arithmeticOperation(
-			_op.getOperator(),
-			expr(_op.leftExpression()),
-			expr(_op.rightExpression()),
-			_op.annotation().commonType,
-			_op
-		);
-		defineExpr(_op, values.first);
-		break;
-	}
-	default:
-		m_unsupportedErrors.warning(
-			5188_error,
-			_op.location(),
-			"Assertion checker does not yet implement this operator."
-		);
-	}
-}
-
-std::pair<smtutil::Expression, smtutil::Expression> SMTEncoder::arithmeticOperation(
-	Token _op,
-	smtutil::Expression const& _left,
-	smtutil::Expression const& _right,
-	Type const* _commonType,
-	Expression const& _operation
-)
-{
-	static std::set<Token> validOperators{
-		Token::Add,
-		Token::Sub,
-		Token::Mul,
-		Token::Div,
-		Token::Mod
-	};
-	solAssert(validOperators.count(_op), "");
-	solAssert(_commonType, "");
-	solAssert(
-		_commonType->category() == Type::Category::Integer || _commonType->category() == Type::Category::FixedPoint,
-		""
-	);
-
-	IntegerType const* intType = nullptr;
-	if (auto type = dynamic_cast<IntegerType const*>(_commonType))
-		intType = type;
-	else
-		intType = TypeProvider::uint256();
-
-	auto valueUnbounded = [&]() -> smtutil::Expression {
-		switch (_op)
-		{
-		case Token::Add: return _left + _right;
-		case Token::Sub: return _left - _right;
-		case Token::Mul: return _left * _right;
-		case Token::Div: return divModWithSlacks(_left, _right, *intType).first;
-		case Token::Mod: return divModWithSlacks(_left, _right, *intType).second;
-		default: solAssert(false, "");
-		}
-	}();
-
-	if (m_checked)
-		return {valueUnbounded, valueUnbounded};
-
-	if (_op == Token::Div || _op == Token::Mod)
-	{
-		// mod and unsigned division never underflow/overflow
-		if (_op == Token::Mod || !intType->isSigned())
-			return {valueUnbounded, valueUnbounded};
-
-		// The only case where division overflows is
-		// - type is signed
-		// - LHS is type.min
-		// - RHS is -1
-		// the result is then -(type.min), which wraps back to type.min
-		smtutil::Expression maxLeft = _left == smt::minValue(*intType);
-		smtutil::Expression minusOneRight = _right == std::numeric_limits<size_t >::max();
-		smtutil::Expression wrap = smtutil::Expression::ite(maxLeft && minusOneRight, smt::minValue(*intType), valueUnbounded);
-		return {wrap, valueUnbounded};
-	}
-
-	auto symbMin = smt::minValue(*intType);
-	auto symbMax = smt::maxValue(*intType);
-
-	smtutil::Expression intValueRange = (0 - symbMin) + symbMax + 1;
-	std::string suffix = std::to_string(_operation.id()) + "_" + std::to_string(m_context.newUniqueId());
-	smt::SymbolicIntVariable k(intType, intType, "k_" + suffix, m_context);
-	smt::SymbolicIntVariable m(intType, intType, "m_" + suffix, m_context);
-
-	// To wrap around valueUnbounded in case of overflow or underflow, we replace it with a k, given:
-	// 1. k + m * intValueRange = valueUnbounded
-	// 2. k is in range of the desired integer type
-	auto wrap = k.currentValue();
-	m_context.addAssertion(valueUnbounded == (k.currentValue() + intValueRange * m.currentValue()));
-	m_context.addAssertion(k.currentValue() >= symbMin);
-	m_context.addAssertion(k.currentValue() <= symbMax);
-
-	// TODO this could be refined:
-	// for unsigned types it's enough to check only the upper bound.
-	auto value = smtutil::Expression::ite(
-		valueUnbounded > symbMax,
-		wrap,
-		smtutil::Expression::ite(
-			valueUnbounded < symbMin,
-			wrap,
-			valueUnbounded
-		)
-	);
-
-	return {value, valueUnbounded};
-}
-
-smtutil::Expression SMTEncoder::bitwiseOperation(
-	Token _op,
-	smtutil::Expression const& _left,
-	smtutil::Expression const& _right,
-	Type const* _commonType
-)
-{
-	static std::set<Token> validOperators{
-		Token::BitAnd,
-		Token::BitOr,
-		Token::BitXor,
-		Token::SHL,
-		Token::SHR,
-		Token::SAR
-	};
-	solAssert(validOperators.count(_op), "");
-	solAssert(_commonType, "");
-
-	auto [bvSize, isSigned] = smt::typeBvSizeAndSignedness(_commonType);
-
-	auto bvLeft = smtutil::Expression::int2bv(_left, bvSize);
-	auto bvRight = smtutil::Expression::int2bv(_right, bvSize);
-
-	std::optional<smtutil::Expression> result;
-	switch (_op)
-	{
-		case Token::BitAnd:
-			result = bvLeft & bvRight;
-			break;
-		case Token::BitOr:
-			result = bvLeft | bvRight;
-			break;
-		case Token::BitXor:
-			result = bvLeft ^ bvRight;
-			break;
-		case Token::SHL:
-			result = bvLeft << bvRight;
-			break;
-		case Token::SHR:
-			result = bvLeft >> bvRight;
-			break;
-		case Token::SAR:
-			result = isSigned ?
-				smtutil::Expression::ashr(bvLeft, bvRight) :
-				bvLeft >> bvRight;
-			break;
-		default:
-			solAssert(false, "");
-	}
-
-	solAssert(result.has_value(), "");
-	return smtutil::Expression::bv2int(*result, isSigned);
-}
-
-void SMTEncoder::compareOperation(BinaryOperation const& _op)
-{
-	auto commonType = _op.annotation().commonType;
-	solAssert(commonType, "");
-
-	if (isSupportedType(*commonType))
-	{
-		smtutil::Expression left(expr(_op.leftExpression(), commonType));
-		smtutil::Expression right(expr(_op.rightExpression(), commonType));
-		Token op = _op.getOperator();
-		std::shared_ptr<smtutil::Expression> value;
-		if (smt::isNumber(*commonType))
-		{
-			value = std::make_shared<smtutil::Expression>(
-				op == Token::Equal ? (left == right) :
-				op == Token::NotEqual ? (left != right) :
-				op == Token::LessThan ? (left < right) :
-				op == Token::LessThanOrEqual ? (left <= right) :
-				op == Token::GreaterThan ? (left > right) :
-				/*op == Token::GreaterThanOrEqual*/ (left >= right)
-			);
-		}
-		else // Bool
-		{
-			solUnimplementedAssert(smt::isBool(*commonType), "Operation not yet supported");
-			value = std::make_shared<smtutil::Expression>(
-				op == Token::Equal ? (left == right) :
-				/*op == Token::NotEqual*/ (left != right)
-			);
-		}
-		// TODO: check that other values for op are not possible.
-		defineExpr(_op, *value);
-	}
-	else
-		m_unsupportedErrors.warning(
-			7229_error,
-			_op.location(),
-			"Assertion checker does not yet implement the type " + _op.annotation().commonType->toString() + " for comparisons"
-		);
-}
-
-void SMTEncoder::booleanOperation(BinaryOperation const& _op)
-{
-	solAssert(_op.getOperator() == Token::And || _op.getOperator() == Token::Or, "");
-	solAssert(_op.annotation().commonType, "");
-	solAssert(_op.annotation().commonType->category() == Type::Category::Bool, "");
-	// @TODO check that both of them are not constant
-	_op.leftExpression().accept(*this);
-	if (_op.getOperator() == Token::And)
-	{
-		auto indicesAfterSecond = visitBranch(&_op.rightExpression(), expr(_op.leftExpression())).first;
-		mergeVariables(!expr(_op.leftExpression()), copyVariableIndices(), indicesAfterSecond);
-		defineExpr(_op, expr(_op.leftExpression()) && expr(_op.rightExpression()));
-	}
-	else
-	{
-		auto indicesAfterSecond = visitBranch(&_op.rightExpression(), !expr(_op.leftExpression())).first;
-		mergeVariables(expr(_op.leftExpression()), copyVariableIndices(), indicesAfterSecond);
-		defineExpr(_op, expr(_op.leftExpression()) || expr(_op.rightExpression()));
-	}
-}
-
-void SMTEncoder::bitwiseOperation(BinaryOperation const& _op)
-{
-	auto op = _op.getOperator();
-	solAssert(TokenTraits::isBitOp(op) || TokenTraits::isShiftOp(op), "");
-	auto commonType = _op.annotation().commonType;
-	solAssert(commonType, "");
-
-	defineExpr(_op, bitwiseOperation(
-		_op.getOperator(),
-		expr(_op.leftExpression(), commonType),
-		expr(_op.rightExpression(), commonType),
-		commonType
-	));
-}
-
-void SMTEncoder::bitwiseNotOperation(UnaryOperation const& _op)
-{
-	solAssert(_op.getOperator() == Token::BitNot, "");
-
-	auto [bvSize, isSigned] = smt::typeBvSizeAndSignedness(_op.annotation().type);
-
-	auto bvOperand = smtutil::Expression::int2bv(expr(_op.subExpression(), _op.annotation().type), bvSize);
-	defineExpr(_op, smtutil::Expression::bv2int(~bvOperand, isSigned));
-}
-
-std::pair<smtutil::Expression, smtutil::Expression> SMTEncoder::divModWithSlacks(
-	smtutil::Expression _left,
-	smtutil::Expression _right,
-	IntegerType const& _type
-)
-{
-	if (m_settings.divModNoSlacks)
-		return {_left / _right, _left % _right};
-
-	IntegerType const* intType = &_type;
-	std::string suffix = "div_mod_" + std::to_string(m_context.newUniqueId());
-	smt::SymbolicIntVariable dSymb(intType, intType, "d_" + suffix, m_context);
-	smt::SymbolicIntVariable rSymb(intType, intType, "r_" + suffix, m_context);
-	auto d = dSymb.currentValue();
-	auto r = rSymb.currentValue();
-
-	// x / y = d and x % y = r iff d * y + r = x and
-	// either x >= 0 and 0 <= r < abs(y) (or just 0 <= r < y for unsigned)
-	// or     x < 0 and -abs(y) < r <= 0
-	m_context.addAssertion(((d * _right) + r) == _left);
-	if (_type.isSigned())
-		m_context.addAssertion(
-			(_left >= 0 && 0 <= r && (_right == 0 || r < smtutil::abs(_right))) ||
-			(_left < 0 && ((_right == 0 || 0 - smtutil::abs(_right) < r) && r <= 0))
-		);
-	else // unsigned version
-		m_context.addAssertion(0 <= r && (_right == 0 || r < _right));
-
-	auto divResult = smtutil::Expression::ite(_right == 0, 0, d);
-	auto modResult = smtutil::Expression::ite(_right == 0, 0, r);
-	return {divResult, modResult};
-}
-
-void SMTEncoder::assignment(Expression const& _left, smtutil::Expression const& _right)
-{
-	assignment(_left, _right, _left.annotation().type);
-}
-
-void SMTEncoder::assignment(
-	Expression const& _left,
-	smtutil::Expression const& _right,
-	Type const* _type
-)
-{
-	solAssert(
-		_left.annotation().type->category() != Type::Category::Tuple,
-		"Tuple assignments should be handled by tupleAssignment."
-	);
-
-	Expression const* left = cleanExpression(_left);
-
-	if (!isSupportedType(*_type))
-	{
-		// Give it a new index anyway to keep the SSA scheme sound.
-		if (auto varDecl = identifierToVariable(*left))
-			m_context.newValue(*varDecl);
-	}
-	else if (auto varDecl = identifierToVariable(*left))
-	{
-		if (varDecl->hasReferenceOrMappingType())
-			resetReferences(*varDecl);
-		assignment(*varDecl, _right);
-	}
-	else if (
-		dynamic_cast<IndexAccess const*>(left) ||
-		dynamic_cast<MemberAccess const*>(left)
-	)
-		indexOrMemberAssignment(*left, _right);
-	else if (auto const* funCall = dynamic_cast<FunctionCall const*>(left))
-	{
-		if (auto funType = dynamic_cast<FunctionType const*>(funCall->expression().annotation().type))
-		{
-			if (funType->kind() == FunctionType::Kind::ArrayPush)
-			{
-				auto memberAccess = dynamic_cast<MemberAccess const*>(&funCall->expression());
-				solAssert(memberAccess, "");
-				auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
-				solAssert(symbArray, "");
-
-				auto oldLength = symbArray->length();
-				auto store = smtutil::Expression::store(
-					symbArray->elements(),
-					symbArray->length() - 1,
-					_right
-				);
-				symbArray->increaseIndex();
-				m_context.addAssertion(symbArray->elements() == store);
-				m_context.addAssertion(symbArray->length() == oldLength);
-				assignment(memberAccess->expression(), symbArray->currentValue());
-			}
-			else if (funType->kind() == FunctionType::Kind::Internal)
-			{
-				for (auto type: replaceUserTypes(funType->returnParameterTypes()))
-					if (type->category() == Type::Category::Mapping || dynamic_cast<ReferenceType const*>(type))
-						resetReferences(type);
-			}
-		}
-	}
-	else
-		solAssert(false, "");
-}
-
-void SMTEncoder::tupleAssignment(Expression const& _left, Expression const& _right)
-{
-	auto lTuple = dynamic_cast<TupleExpression const*>(innermostTuple(_left));
-	solAssert(lTuple, "");
-	Expression const* right = innermostTuple(_right);
-
-	auto const& lComponents = lTuple->components();
-
-	// If both sides are tuple expressions, we individually and potentially
-	// recursively assign each pair of components.
-	// This is because of potential type conversion.
-	if (auto rTuple = dynamic_cast<TupleExpression const*>(right))
-	{
-		auto const& rComponents = rTuple->components();
-		solAssert(lComponents.size() == rComponents.size(), "");
-		for (unsigned i = 0; i < lComponents.size(); ++i)
-		{
-			if (!lComponents.at(i) || !rComponents.at(i))
-				continue;
-			auto const& lExpr = *lComponents.at(i);
-			auto const& rExpr = *rComponents.at(i);
-			if (lExpr.annotation().type->category() == Type::Category::Tuple)
-				tupleAssignment(lExpr, rExpr);
-			else
-			{
-				auto type = lExpr.annotation().type;
-				assignment(lExpr, expr(rExpr, type), type);
-			}
-		}
-	}
-	else
-	{
-		auto rType = dynamic_cast<TupleType const*>(right->annotation().type);
-		solAssert(rType, "");
-
-		auto const& rComponents = rType->components();
-		solAssert(lComponents.size() == rComponents.size(), "");
-
-		auto symbRight = expr(*right);
-		solAssert(symbRight.sort->kind == smtutil::Kind::Tuple, "");
-
-		for (unsigned i = 0; i < lComponents.size(); ++i)
-			if (auto component = lComponents.at(i); component && rComponents.at(i))
-				assignment(*component, smtutil::Expression::tuple_get(symbRight, i), component->annotation().type);
-	}
-}
-
-smtutil::Expression SMTEncoder::compoundAssignment(Assignment const& _assignment)
-{
-	static std::map<Token, Token> const compoundToArithmetic{
-		{Token::AssignAdd, Token::Add},
-		{Token::AssignSub, Token::Sub},
-		{Token::AssignMul, Token::Mul},
-		{Token::AssignDiv, Token::Div},
-		{Token::AssignMod, Token::Mod}
-	};
-	static std::map<Token, Token> const compoundToBitwise{
-		{Token::AssignBitAnd, Token::BitAnd},
-		{Token::AssignBitOr, Token::BitOr},
-		{Token::AssignBitXor, Token::BitXor},
-		{Token::AssignShl, Token::SHL},
-		{Token::AssignShr, Token::SHR},
-		{Token::AssignSar, Token::SAR}
-	};
-	Token op = _assignment.assignmentOperator();
-	solAssert(compoundToArithmetic.count(op) || compoundToBitwise.count(op), "");
-
-	auto decl = identifierToVariable(_assignment.leftHandSide());
-
-	if (compoundToBitwise.count(op))
-		return bitwiseOperation(
-			compoundToBitwise.at(op),
-			decl ? currentValue(*decl) : expr(_assignment.leftHandSide(), _assignment.annotation().type),
-			expr(_assignment.rightHandSide(), _assignment.annotation().type),
-			_assignment.annotation().type
-		);
-
-	auto values = arithmeticOperation(
-		compoundToArithmetic.at(op),
-		decl ? currentValue(*decl) : expr(_assignment.leftHandSide(), _assignment.annotation().type),
-		expr(_assignment.rightHandSide(), _assignment.annotation().type),
-		_assignment.annotation().type,
-		_assignment
-	);
-	return values.first;
-}
-
-void SMTEncoder::expressionToTupleAssignment(std::vector<std::shared_ptr<VariableDeclaration>> const& _variables, Expression const& _rhs)
-{
-	auto symbolicVar = m_context.expression(_rhs);
-	if (_variables.size() > 1)
-	{
-		auto symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(symbolicVar);
-		solAssert(symbTuple, "");
-		auto const& symbComponents = symbTuple->components();
-		solAssert(symbComponents.size() == _variables.size(), "");
-		auto tupleType = dynamic_cast<TupleType const*>(_rhs.annotation().type);
-		solAssert(tupleType, "");
-		auto const& typeComponents = tupleType->components();
-		solAssert(typeComponents.size() == symbComponents.size(), "");
-		for (unsigned i = 0; i < symbComponents.size(); ++i)
-		{
-			auto param = _variables.at(i);
-			if (param)
-			{
-				solAssert(m_context.knownVariable(*param), "");
-				assignment(*param, symbTuple->component(i, typeComponents[i], param->type()));
-			}
-		}
-	}
-	else if (_variables.size() == 1)
-	{
-		auto const& var = *_variables.front();
-		solAssert(m_context.knownVariable(var), "");
-		assignment(var, _rhs);
-	}
-}
-
-void SMTEncoder::assignment(VariableDeclaration const& _variable, Expression const& _value)
-{
-	// In general, at this point, the SMT sorts of _variable and _value are the same,
-	// even if there is implicit conversion.
-	// This is a special case where the SMT sorts are different.
-	// For now we are unaware of other cases where this happens, but if they do appear
-	// we should extract this into an `implicitConversion` function.
-	assignment(_variable, expr(_value, _variable.type()));
-}
-
-void SMTEncoder::assignment(VariableDeclaration const& _variable, smtutil::Expression const& _value)
-{
-	Type const* type = _variable.type();
-	if (type->category() == Type::Category::Mapping)
-		arrayAssignment();
-	assignment(*m_context.variable(_variable), _value);
-}
-
-void SMTEncoder::assignment(smt::SymbolicVariable& _symVar, smtutil::Expression const& _value)
-{
-	m_context.addAssertion(_symVar.increaseIndex() == _value);
-}
-
-std::pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
-	ASTNode const* _statement,
-	smtutil::Expression _condition
-)
-{
-	return visitBranch(_statement, &_condition);
-}
-
-std::pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
-	ASTNode const* _statement,
-	smtutil::Expression const* _condition
-)
-{
-	auto indicesBeforeBranch = copyVariableIndices();
-	if (_condition)
-		pushPathCondition(*_condition);
-	_statement->accept(*this);
-	auto pathConditionOnExit = currentPathConditions();
-	if (_condition)
-		popPathCondition();
-	auto indicesAfterBranch = copyVariableIndices();
-	resetVariableIndices(indicesBeforeBranch);
-	return {indicesAfterBranch, pathConditionOnExit};
-}
-
-void SMTEncoder::initializeFunctionCallParameters(CallableDeclaration const& _function, std::vector<smtutil::Expression> const& _callArgs)
-{
-	auto const& funParams = _function.parameters();
-	solAssert(funParams.size() == _callArgs.size(), "");
-	for (unsigned i = 0; i < funParams.size(); ++i)
-		if (createVariable(*funParams[i]))
-		{
-			m_context.addAssertion(_callArgs[i] == m_context.newValue(*funParams[i]));
-			if (funParams[i]->annotation().type->category() == Type::Category::Mapping)
-				m_arrayAssignmentHappened = true;
-		}
-
-	std::vector<VariableDeclaration const*> localVars;
-	if (auto const* fun = dynamic_cast<FunctionDefinition const*>(&_function))
-		localVars = localVariablesIncludingModifiers(*fun, m_currentContract);
-	else
-		localVars = _function.localVariables();
-	for (auto const& variable: localVars)
-		if (createVariable(*variable))
-		{
-			m_context.newValue(*variable);
-			m_context.setZeroValue(*variable);
-		}
-
-	if (_function.returnParameterList())
-		for (auto const& retParam: _function.returnParameters())
-			if (createVariable(*retParam))
-			{
-				m_context.newValue(*retParam);
-				m_context.setZeroValue(*retParam);
-			}
-}
-
-void SMTEncoder::createStateVariables(ContractDefinition const& _contract)
-{
-	for (auto var: stateVariablesIncludingInheritedAndPrivate(_contract))
-		createVariable(*var);
-}
-
-void SMTEncoder::initializeStateVariables(ContractDefinition const& _contract)
-{
-	for (auto var: _contract.stateVariables())
-	{
-		solAssert(m_context.knownVariable(*var), "");
-		m_context.setZeroValue(*var);
-	}
-
-	for (auto var: _contract.stateVariables())
-		if (var->value())
-		{
-			var->value()->accept(*this);
-			assignment(*var, *var->value());
-		}
-}
-
-void SMTEncoder::createLocalVariables(FunctionDefinition const& _function)
-{
-	for (auto const& variable: localVariablesIncludingModifiers(_function, m_currentContract))
-		createVariable(*variable);
-
-	for (auto const& param: _function.parameters())
-		createVariable(*param);
-
-	if (_function.returnParameterList())
-		for (auto const& retParam: _function.returnParameters())
-			createVariable(*retParam);
-}
-
-void SMTEncoder::initializeLocalVariables(FunctionDefinition const& _function)
-{
-	for (auto const& variable: localVariablesIncludingModifiers(_function, m_currentContract))
-	{
-		solAssert(m_context.knownVariable(*variable), "");
-		m_context.setZeroValue(*variable);
-	}
-
-	for (auto const& param: _function.parameters())
-	{
-		solAssert(m_context.knownVariable(*param), "");
-		m_context.setUnknownValue(*param);
-	}
-
-	if (_function.returnParameterList())
-		for (auto const& retParam: _function.returnParameters())
-		{
-			solAssert(m_context.knownVariable(*retParam), "");
-			m_context.setZeroValue(*retParam);
-		}
-}
-
-void SMTEncoder::resetStateVariables()
-{
-	m_context.resetVariables([&](VariableDeclaration const& _variable) { return _variable.isStateVariable(); });
-}
-
-void SMTEncoder::resetMemoryVariables()
-{
-	m_context.resetVariables([&](VariableDeclaration const& _variable) {
-		return _variable.referenceLocation() == VariableDeclaration::Location::Memory;
-	});
-}
-
-void SMTEncoder::resetStorageVariables()
-{
-	m_context.resetVariables([&](VariableDeclaration const& _variable) {
-		return _variable.referenceLocation() == VariableDeclaration::Location::Storage || _variable.isStateVariable();
-	});
-}
-
-void SMTEncoder::resetBalances()
-{
-	state().newBalances();
-}
-
-void SMTEncoder::resetReferences(VariableDeclaration const& _varDecl)
-{
-	m_context.resetVariables([&](VariableDeclaration const& _var) {
-		if (_var == _varDecl)
-			return false;
-
-		// If both are state variables no need to clear knowledge.
-		if (_var.isStateVariable() && _varDecl.isStateVariable())
-			return false;
-
-		return sameTypeOrSubtype(_var.type(), _varDecl.type());
-	});
-}
-
-void SMTEncoder::resetReferences(Type const* _type)
-{
-	m_context.resetVariables([&](VariableDeclaration const& _var) {
-		return sameTypeOrSubtype(_var.type(), _type);
-	});
-}
-
-bool SMTEncoder::sameTypeOrSubtype(Type const* _a, Type const* _b)
-{
-	bool foundSame = false;
-
-	solidity::util::BreadthFirstSearch<Type const*> bfs{{_a}};
-	bfs.run([&](auto _type, auto&& _addChild) {
-		if (*typeWithoutPointer(_b) == *typeWithoutPointer(_type))
-		{
-			foundSame = true;
-			bfs.abort();
-		}
-		if (auto const* mapType = dynamic_cast<MappingType const*>(_type))
-			_addChild(mapType->valueType());
-		else if (auto const* arrayType = dynamic_cast<ArrayType const*>(_type))
-			_addChild(arrayType->baseType());
-		else if (auto const* structType = dynamic_cast<StructType const*>(_type))
-			for (auto const& member: structType->nativeMembers(nullptr))
-				_addChild(member.type);
-	});
-
-	return foundSame;
-}
-
-bool SMTEncoder::isSupportedType(Type const& _type) const
-{
-	return smt::isSupportedType(*underlyingType(&_type));
-}
-
-Type const* SMTEncoder::typeWithoutPointer(Type const* _type)
-{
-	if (auto refType = dynamic_cast<ReferenceType const*>(_type))
-		return TypeProvider::withLocationIfReference(refType->location(), _type);
-	return _type;
-}
-
-void SMTEncoder::mergeVariables(smtutil::Expression const& _condition, VariableIndices const& _indicesEndTrue, VariableIndices const& _indicesEndFalse)
-{
-	for (auto const& entry: _indicesEndTrue)
-	{
-		VariableDeclaration const* var = entry.first;
-		auto trueIndex = entry.second;
-		if (_indicesEndFalse.count(var) && _indicesEndFalse.at(var) != trueIndex)
-		{
-			m_context.addAssertion(m_context.newValue(*var) == smtutil::Expression::ite(
-				_condition,
-				valueAtIndex(*var, trueIndex),
-				valueAtIndex(*var, _indicesEndFalse.at(var)))
-			);
-		}
-	}
-}
-
-smtutil::Expression SMTEncoder::currentValue(VariableDeclaration const& _decl) const
-{
-	solAssert(m_context.knownVariable(_decl), "");
-	return m_context.variable(_decl)->currentValue();
-}
-
-smtutil::Expression SMTEncoder::valueAtIndex(VariableDeclaration const& _decl, unsigned _index) const
-{
-	solAssert(m_context.knownVariable(_decl), "");
-	return m_context.variable(_decl)->valueAtIndex(_index);
-}
-
-bool SMTEncoder::createVariable(VariableDeclaration const& _varDecl)
-{
-	if (m_context.knownVariable(_varDecl))
-		return true;
-	bool abstract = m_context.createVariable(_varDecl);
-	if (abstract)
-	{
-		m_unsupportedErrors.warning(
-			8115_error,
-			_varDecl.location(),
-			"Assertion checker does not yet support the type of this variable."
-		);
-		return false;
-	}
-	return true;
-}
-
-smtutil::Expression SMTEncoder::expr(Expression const& _e, Type const* _targetType)
-{
-	if (!m_context.knownExpression(_e))
-	{
-		m_unsupportedErrors.warning(6031_error, _e.location(), "Internal error: Expression undefined for SMT solver." );
-		createExpr(_e);
-	}
-
-	return m_context.expression(_e)->currentValue(underlyingType(_targetType));
-}
-
-void SMTEncoder::createExpr(Expression const& _e)
-{
-	bool abstract = m_context.createExpression(_e);
-	if (abstract)
-		m_unsupportedErrors.warning(
-			8364_error,
-			_e.location(),
-			"Assertion checker does not yet implement type " + _e.annotation().type->toString()
-		);
-}
-
-void SMTEncoder::defineExpr(Expression const& _e, smtutil::Expression _value)
-{
-	auto type = _e.annotation().type;
-	createExpr(_e);
-	solAssert(_value.sort->kind != smtutil::Kind::Function, "Equality operator applied to type that is not fully supported");
-	if (!smt::isInaccessibleDynamic(*type))
-		m_context.addAssertion(expr(_e) == _value);
-
-	if (m_checked && smt::isNumber(*type))
-		m_context.addAssertion(smtutil::Expression::implies(
-			currentPathConditions(),
-			smt::symbolicUnknownConstraints(expr(_e), type)
-		));
-}
-
-void SMTEncoder::defineExpr(Expression const& _e, std::vector<std::optional<smtutil::Expression>> const& _values)
-{
-	if (_values.size() == 1 && _values.front())
-	{
-		defineExpr(_e, *_values.front());
-		return;
-	}
-	auto const& symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_e));
-	solAssert(symbTuple, "");
-	symbTuple->increaseIndex();
-	auto const& symbComponents = symbTuple->components();
-	solAssert(symbComponents.size() == _values.size(), "");
-	auto tupleType = dynamic_cast<TupleType const*>(_e.annotation().type);
-	solAssert(tupleType, "");
-	solAssert(tupleType->components().size() == symbComponents.size(), "");
-	for (unsigned i = 0; i < symbComponents.size(); ++i)
-		if (_values[i] && !smt::isInaccessibleDynamic(*tupleType->components()[i]))
-			m_context.addAssertion(symbTuple->component(i) == *_values[i]);
-}
-
-void SMTEncoder::popPathCondition()
-{
-	solAssert(m_pathConditions.size() > 0, "Cannot pop path condition, empty.");
-	m_pathConditions.pop_back();
-}
-
-void SMTEncoder::pushPathCondition(smtutil::Expression const& _e)
-{
-	m_pathConditions.push_back(currentPathConditions() && _e);
-}
-
-void SMTEncoder::setPathCondition(smtutil::Expression const& _e)
-{
-	if (m_pathConditions.empty())
-		m_pathConditions.push_back(_e);
-	else
-		m_pathConditions.back() = _e;
-}
-
-smtutil::Expression SMTEncoder::currentPathConditions()
-{
-	if (m_pathConditions.empty())
-		return smtutil::Expression(true);
-	return m_pathConditions.back();
-}
-
-SecondarySourceLocation SMTEncoder::callStackMessage(std::vector<CallStackEntry> const& _callStack)
-{
-	SecondarySourceLocation callStackLocation;
-	solAssert(!_callStack.empty(), "");
-	callStackLocation.append("Callstack:", SourceLocation());
-	for (auto const& call: _callStack | ranges::views::reverse)
-		if (call.second)
-			callStackLocation.append("", call.second->location());
-	return callStackLocation;
-}
-
-std::pair<CallableDeclaration const*, ASTNode const*> SMTEncoder::popCallStack()
-{
-	solAssert(!m_callStack.empty(), "");
-	auto lastCalled = m_callStack.back();
-	m_callStack.pop_back();
-	return lastCalled;
-}
-
-void SMTEncoder::pushCallStack(CallStackEntry _entry)
-{
-	m_callStack.push_back(_entry);
-}
-
-void SMTEncoder::addPathImpliedExpression(smtutil::Expression const& _e)
-{
-	m_context.addAssertion(smtutil::Expression::implies(currentPathConditions(), _e));
-}
-
-bool SMTEncoder::isRootFunction()
-{
-	return m_callStack.size() == 1;
-}
-
-bool SMTEncoder::visitedFunction(FunctionDefinition const* _funDef)
-{
-	for (auto const& call: m_callStack)
-		if (call.first == _funDef)
-			return true;
-	return false;
-}
-
-ContractDefinition const* SMTEncoder::currentScopeContract()
-{
-	for (auto&& f: m_callStack | ranges::views::reverse | ranges::views::keys)
-		if (auto fun = dynamic_cast<FunctionDefinition const*>(f))
-			return fun->annotation().contract;
-	return nullptr;
-}
-
-SMTEncoder::VariableIndices SMTEncoder::copyVariableIndices()
-{
-	VariableIndices indices;
-	for (auto const& var: m_context.variables())
-		indices.emplace(var.first, var.second->index());
-	return indices;
-}
-
-void SMTEncoder::resetVariableIndices(VariableIndices const& _indices)
-{
-	for (auto const& var: _indices)
-		m_context.variable(*var.first)->setIndex(var.second);
-}
-
-void SMTEncoder::clearIndices(ContractDefinition const* _contract, FunctionDefinition const* _function)
-{
-	solAssert(_contract, "");
-	for (auto var: stateVariablesIncludingInheritedAndPrivate(*_contract))
-		m_context.variable(*var)->resetIndex();
-	if (_function)
-	{
-		for (auto const& var: _function->parameters() + _function->returnParameters())
-			m_context.variable(*var)->resetIndex();
-		for (auto const& var: localVariablesIncludingModifiers(*_function, _contract))
-			m_context.variable(*var)->resetIndex();
-	}
-	state().reset();
-}
-
-Expression const* SMTEncoder::leftmostBase(IndexAccess const& _indexAccess)
-{
-	Expression const* base = &_indexAccess.baseExpression();
-	while (auto access = dynamic_cast<IndexAccess const*>(base))
-		base = &access->baseExpression();
-	return base;
-}
-
-Type const* SMTEncoder::keyType(Type const* _type)
-{
-	if (auto const* mappingType = dynamic_cast<MappingType const*>(_type))
-		return mappingType->keyType();
-	if (
-		dynamic_cast<ArrayType const*>(_type) ||
-		dynamic_cast<ArraySliceType const*>(_type)
-	)
-		return TypeProvider::uint256();
-	else
-		solAssert(false, "");
-}
-
-Expression const* SMTEncoder::innermostTuple(Expression const& _expr)
-{
-	auto const* tuple = dynamic_cast<TupleExpression const*>(&_expr);
-	if (!tuple || tuple->isInlineArray())
-		return &_expr;
-
-	Expression const* expr = tuple;
-	while (tuple && !tuple->isInlineArray() && tuple->components().size() == 1)
-	{
-		expr = tuple->components().front().get();
-		tuple = dynamic_cast<TupleExpression const*>(expr);
-	}
-	solAssert(expr, "");
-	return expr;
-}
-
-Type const* SMTEncoder::underlyingType(Type const* _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		_type = &userType->underlyingType();
-	return _type;
-}
-
-TypePointers SMTEncoder::replaceUserTypes(TypePointers const& _types)
-{
-	return applyMap(_types, [](auto _type) {
-		if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-			return &userType->underlyingType();
-		return _type;
-	});
-}
-
-std::pair<Expression const*, FunctionCallOptions const*> SMTEncoder::functionCallExpression(FunctionCall const& _funCall)
-{
-	Expression const* callExpr = &_funCall.expression();
-	auto const* callOptions = dynamic_cast<FunctionCallOptions const*>(callExpr);
-	if (callOptions)
-		callExpr = &callOptions->expression();
-
-	return {callExpr, callOptions};
-}
-
-Expression const* SMTEncoder::cleanExpression(Expression const& _expr)
-{
-	auto const* expr = &_expr;
-	if (auto const* tuple = dynamic_cast<TupleExpression const*>(expr))
-		return cleanExpression(*innermostTuple(*tuple));
-	if (auto const* functionCall = dynamic_cast<FunctionCall const*>(expr))
-		if (*functionCall->annotation().kind == FunctionCallKind::TypeConversion)
-		{
-			auto typeType = dynamic_cast<TypeType const*>(functionCall->expression().annotation().type);
-			solAssert(typeType, "");
-			if (auto const* arrayType = dynamic_cast<ArrayType const*>(typeType->actualType()))
-				if (arrayType->isByteArrayOrString())
-				{
-					// this is a cast to `bytes`
-					solAssert(functionCall->arguments().size() == 1, "");
-					Expression const& arg = *functionCall->arguments()[0];
-					if (
-						auto const* argArrayType = dynamic_cast<ArrayType const*>(arg.annotation().type);
-						argArrayType && argArrayType->isByteArrayOrString()
-					)
-						return cleanExpression(arg);
-				}
-		}
-	solAssert(expr, "");
-	return expr;
-}
-
-std::set<VariableDeclaration const*> SMTEncoder::touchedVariables(ASTNode const& _node)
-{
-	std::vector<CallableDeclaration const*> callStack;
-	for (auto const& call: m_callStack)
-		callStack.push_back(call.first);
-	return m_variableUsage.touchedVariables(_node, callStack);
-}
-
-Declaration const* SMTEncoder::expressionToDeclaration(Expression const& _expr) const
-{
-	if (auto const* identifier = dynamic_cast<Identifier const*>(&_expr))
-		return identifier->annotation().referencedDeclaration;
-	if (auto const* outerMemberAccess = dynamic_cast<MemberAccess const*>(&_expr))
-		return outerMemberAccess->annotation().referencedDeclaration;
-	return nullptr;
-}
-
-VariableDeclaration const* SMTEncoder::identifierToVariable(Expression const& _expr) const
-{
-	// We do not use `expressionToDeclaration` here because we are not interested in
-	// struct.field, for example.
-	if (auto const* identifier = dynamic_cast<Identifier const*>(&_expr))
-		if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(identifier->annotation().referencedDeclaration))
-		{
-			solAssert(m_context.knownVariable(*varDecl), "");
-			return varDecl;
-		}
-	// But we are interested in "contract.var", because that is the same as just "var".
-	if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(&_expr))
-		if (dynamic_cast<ContractDefinition const*>(expressionToDeclaration(
-			*cleanExpression(memberAccess->expression())
-		)))
-			if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration))
-			{
-				solAssert(m_context.knownVariable(*varDecl), "");
-				return varDecl;
-			}
-
-	return nullptr;
-}
-
-MemberAccess const* SMTEncoder::isEmptyPush(Expression const& _expr) const
-{
-	if (
-		auto const* funCall = dynamic_cast<FunctionCall const*>(&_expr);
-		funCall && funCall->arguments().empty()
-	)
-	{
-		auto const& funType = dynamic_cast<FunctionType const&>(*funCall->expression().annotation().type);
-		if (funType.kind() == FunctionType::Kind::ArrayPush)
-			return &dynamic_cast<MemberAccess const&>(funCall->expression());
-	}
-	return nullptr;
-}
-
-smtutil::Expression SMTEncoder::contractAddressValue(FunctionCall const& _f)
-{
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_f.expression().annotation().type);
-	if (funType.kind() == FunctionType::Kind::Internal)
-		return state().thisAddress();
-	auto [funExpr, funOptions] = functionCallExpression(_f);
-	if (MemberAccess const* callBase = dynamic_cast<MemberAccess const*>(funExpr))
-		return expr(callBase->expression());
-	solAssert(false, "Unreachable!");
-}
-
-VariableDeclaration const* SMTEncoder::publicGetter(Expression const& _expr) const {
-	if (auto memberAccess = dynamic_cast<MemberAccess const*>(&_expr))
-		if (auto variableDeclaration = dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration))
-			return variableDeclaration->isStateVariable() ? variableDeclaration : nullptr;
-	return nullptr;
-}
-
-bool SMTEncoder::isExternalCallToThis(Expression const* _expr) {
-	auto memberAccess = dynamic_cast<MemberAccess const*>(_expr);
-	if (!memberAccess)
-		return false;
-
-	auto identifier = dynamic_cast<Identifier const*>(&memberAccess->expression());
-	return identifier &&
-		identifier->name() == "this" &&
-		identifier->annotation().referencedDeclaration &&
-		dynamic_cast<MagicVariableDeclaration const*>(identifier->annotation().referencedDeclaration)
-	;
-}
-
-std::string SMTEncoder::extraComment()
-{
-	std::string extra;
-	if (m_arrayAssignmentHappened)
-		extra +=
-			"\nNote that array aliasing is not supported,"
-			" therefore all mapping information is erased after"
-			" a mapping local variable/parameter is assigned.\n"
-			"You can re-introduce information using require().";
-	return extra;
-}
-
-FunctionDefinition const* SMTEncoder::functionCallToDefinition(
-	FunctionCall const& _funCall,
-	ContractDefinition const* _scopeContract,
-	ContractDefinition const* _contextContract
-)
-{
-	if (*_funCall.annotation().kind != FunctionCallKind::FunctionCall)
-		return {};
-
-	auto [calledExpr, callOptions] = functionCallExpression(_funCall);
-
-	if (TupleExpression const* fun = dynamic_cast<TupleExpression const*>(calledExpr))
-	{
-		solAssert(fun->components().size() == 1, "");
-		calledExpr = innermostTuple(*calledExpr);
-	}
-
-	auto resolveVirtual = [&](auto const* _ref) -> FunctionDefinition const* {
-		VirtualLookup lookup = *_ref->annotation().requiredLookup;
-		solAssert(_contextContract || lookup == VirtualLookup::Static, "No contract context provided for function lookup resolution!");
-		auto funDef = dynamic_cast<FunctionDefinition const*>(_ref->annotation().referencedDeclaration);
-		if (!funDef)
-			return funDef;
-		switch (lookup)
-		{
-		case VirtualLookup::Virtual:
-			return &(funDef->resolveVirtual(*_contextContract));
-		case VirtualLookup::Super:
-		{
-			solAssert(_scopeContract, "");
-			auto super = _scopeContract->superContract(*_contextContract);
-			solAssert(super, "Super contract not available.");
-			return &funDef->resolveVirtual(*_contextContract, super);
-		}
-		case VirtualLookup::Static:
-			return funDef;
-		}
-		solAssert(false, "");
-	};
-
-	if (Identifier const* fun = dynamic_cast<Identifier const*>(calledExpr))
-		return resolveVirtual(fun);
-	else if (MemberAccess const* fun = dynamic_cast<MemberAccess const*>(calledExpr))
-		return resolveVirtual(fun);
-
-	return {};
-}
-
-std::vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(ContractDefinition const& _contract)
-{
-	return fold(
-		_contract.annotation().linearizedBaseContracts,
-		std::vector<VariableDeclaration const*>{},
-		[](auto&& _acc, auto _contract) { return _acc + _contract->stateVariables(); }
-	);
-}
-
-std::vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(FunctionDefinition const& _function)
-{
-	if (auto contract = dynamic_cast<ContractDefinition const*>(_function.scope()))
-		return stateVariablesIncludingInheritedAndPrivate(*contract);
-	return {};
-}
-
-std::vector<VariableDeclaration const*> SMTEncoder::localVariablesIncludingModifiers(FunctionDefinition const& _function, ContractDefinition const* _contract)
-{
-	return _function.localVariables() + tryCatchVariables(_function) + modifiersVariables(_function, _contract);
-}
-
-std::vector<VariableDeclaration const*> SMTEncoder::tryCatchVariables(FunctionDefinition const& _function)
-{
-	struct TryCatchVarsVisitor : public ASTConstVisitor
-	{
-		bool visit(TryCatchClause const& _catchClause) override
-		{
-			if (_catchClause.parameters())
-			{
-				auto const& params = _catchClause.parameters()->parameters();
-				for (auto param: params)
-					vars.push_back(param.get());
-			}
-
-			return true;
-		}
-
-		std::vector<VariableDeclaration const*> vars;
-	} tryCatchVarsVisitor;
-	_function.accept(tryCatchVarsVisitor);
-	return tryCatchVarsVisitor.vars;
-}
-
-std::vector<VariableDeclaration const*> SMTEncoder::modifiersVariables(FunctionDefinition const& _function, ContractDefinition const* _contract)
-{
-	struct BlockVars: ASTConstVisitor
-	{
-		BlockVars(Block const& _block) { _block.accept(*this); }
-		void endVisit(VariableDeclaration const& _var) { vars.push_back(&_var); }
-		std::vector<VariableDeclaration const*> vars;
-	};
-
-	std::vector<VariableDeclaration const*> vars;
-	std::set<ModifierDefinition const*> visited;
-	for (auto invok: _function.modifiers())
-	{
-		if (!invok)
-			continue;
-		auto const* modifier = resolveModifierInvocation(*invok, _contract);
-		if (!modifier || visited.count(modifier))
-			continue;
-
-		visited.insert(modifier);
-		if (modifier->isImplemented())
-		{
-			vars += applyMap(modifier->parameters(), [](auto _var) { return _var.get(); });
-			vars += BlockVars(modifier->body()).vars;
-		}
-	}
-	return vars;
-}
-
-ModifierDefinition const* SMTEncoder::resolveModifierInvocation(ModifierInvocation const& _invocation, ContractDefinition const* _contract)
-{
-	auto const* modifier = dynamic_cast<ModifierDefinition const*>(_invocation.name().annotation().referencedDeclaration);
-	if (modifier)
-	{
-		VirtualLookup lookup = *_invocation.name().annotation().requiredLookup;
-		solAssert(lookup == VirtualLookup::Virtual || lookup == VirtualLookup::Static, "");
-		solAssert(_contract || lookup == VirtualLookup::Static, "No contract context provided for modifier lookup resolution!");
-		if (lookup == VirtualLookup::Virtual)
-			modifier = &modifier->resolveVirtual(*_contract);
-	}
-	return modifier;
-}
-
-std::set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contractFunctions(ContractDefinition const& _contract)
-{
-	if (!m_contractFunctions.count(&_contract))
-	{
-		auto const& functions = _contract.definedFunctions();
-		std::set<FunctionDefinition const*, ASTNode::CompareByID> resolvedFunctions(begin(functions), end(functions));
-		for (auto const* base: _contract.annotation().linearizedBaseContracts)
-		{
-			if (base == &_contract)
-				continue;
-			for (auto const* baseFunction: base->definedFunctions())
-			{
-				if (baseFunction->isConstructor()) // We don't want to include constructors of parent contracts
-					continue;
-				bool overridden = false;
-				for (auto const* function: resolvedFunctions)
-					if (
-						function->name() == baseFunction->name() &&
-						function->kind() == baseFunction->kind() &&
-						FunctionType(*function).asExternallyCallableFunction(false)->
-							hasEqualParameterTypes(*FunctionType(*baseFunction).asExternallyCallableFunction(false))
-						)
-					{
-						overridden = true;
-						break;
-					}
-				if (!overridden)
-					resolvedFunctions.insert(baseFunction);
-			}
-		}
-		m_contractFunctions.emplace(&_contract, std::move(resolvedFunctions));
-	}
-	return m_contractFunctions.at(&_contract);
-}
-
-std::set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contractFunctionsWithoutVirtual(ContractDefinition const& _contract)
-{
-	if (!m_contractFunctionsWithoutVirtual.count(&_contract))
-	{
-		auto allFunctions = contractFunctions(_contract);
-		for (auto const* base: _contract.annotation().linearizedBaseContracts)
-			for (auto const* baseFun: base->definedFunctions())
-				allFunctions.insert(baseFun);
-
-		m_contractFunctionsWithoutVirtual.emplace(&_contract, std::move(allFunctions));
-
-	}
-	return m_contractFunctionsWithoutVirtual.at(&_contract);
-}
-
-std::map<ContractDefinition const*, std::vector<ASTPointer<frontend::Expression>>> SMTEncoder::baseArguments(ContractDefinition const& _contract)
-{
-	std::map<ContractDefinition const*, std::vector<ASTPointer<Expression>>> baseArgs;
-
-	for (auto contract: _contract.annotation().linearizedBaseContracts)
-	{
-		/// Collect base contracts and potential constructor arguments.
-		for (auto specifier: contract->baseContracts())
-		{
-			solAssert(specifier, "");
-			auto const& base = dynamic_cast<ContractDefinition const&>(*specifier->name().annotation().referencedDeclaration);
-			if (auto args = specifier->arguments())
-				baseArgs[&base] = *args;
-		}
-		/// Collect base constructor arguments given as constructor modifiers.
-		if (auto constructor = contract->constructor())
-			for (auto mod: constructor->modifiers())
-			{
-				auto decl = mod->name().annotation().referencedDeclaration;
-				if (auto base = dynamic_cast<ContractDefinition const*>(decl))
-				{
-					solAssert(!baseArgs.count(base), "");
-					if (auto args = mod->arguments())
-						baseArgs[base] = *args;
-				}
-			}
-	}
-
-	return baseArgs;
-}
-
-RationalNumberType const* SMTEncoder::isConstant(Expression const& _expr)
-{
-	if (auto type = dynamic_cast<RationalNumberType const*>(_expr.annotation().type))
-		return type;
-
-	// _expr may not be constant evaluable.
-	// In that case we ignore any warnings emitted by the constant evaluator,
-	// as it will return nullptr in case of failure.
-	ErrorList l;
-	ErrorReporter e(l);
-	if (auto t = ConstantEvaluator::evaluate(e, _expr))
-		return TypeProvider::rationalNumber(t->value);
-
-	return nullptr;
-}
-
-std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectABICalls(ASTNode const* _node)
-{
-	struct ABIFunctions: public ASTConstVisitor
-	{
-		ABIFunctions(ASTNode const* _node) { _node->accept(*this); }
-		void endVisit(FunctionCall const& _funCall)
-		{
-			if (*_funCall.annotation().kind == FunctionCallKind::FunctionCall)
-				switch (dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type).kind())
-				{
-				case FunctionType::Kind::ABIEncode:
-				case FunctionType::Kind::ABIEncodePacked:
-				case FunctionType::Kind::ABIEncodeWithSelector:
-				case FunctionType::Kind::ABIEncodeCall:
-				case FunctionType::Kind::ABIEncodeWithSignature:
-				case FunctionType::Kind::ABIDecode:
-					abiCalls.insert(&_funCall);
-					break;
-				default: {}
-				}
-		}
-
-		std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
-	};
-
-	return ABIFunctions(_node).abiCalls;
-}
-
-std::set<SourceUnit const*, ASTNode::CompareByID> SMTEncoder::sourceDependencies(SourceUnit const& _source)
-{
-	std::set<SourceUnit const*, ASTNode::CompareByID> sources;
-	sources.insert(&_source);
-	for (auto const& source: _source.referencedSourceUnits(true))
-		sources.insert(source);
-	return sources;
-}
-
-void SMTEncoder::createReturnedExpressions(FunctionDefinition const* _funDef, Expression const& _callStackExpr)
-{
-	if (!_funDef)
-		return;
-
-	auto const& returnParams = _funDef->returnParameters();
-	for (auto param: returnParams)
-		createVariable(*param);
-	auto returnValues = applyMap(returnParams, [this](auto const& param) -> std::optional<smtutil::Expression> {
-		solAssert(param && m_context.knownVariable(*param), "");
-		return currentValue(*param);
-	});
-	defineExpr(_callStackExpr, returnValues);
-}
-
-std::vector<smtutil::Expression> SMTEncoder::symbolicArguments(
-	std::vector<ASTPointer<VariableDeclaration>> const& _funParameters,
-	std::vector<Expression const*> const& _arguments,
-	std::optional<Expression const*> _boundArgumentCall
-)
-{
-	std::vector<smtutil::Expression> args;
-	unsigned firstParam = 0;
-	if (_boundArgumentCall)
-	{
-		Expression const* calledExpr = innermostTuple(*_boundArgumentCall.value());
-		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(calledExpr);
-		solAssert(attachedFunction, "");
-		args.push_back(expr(attachedFunction->expression(), _funParameters.front()->type()));
-		firstParam = 1;
-	}
-
-	solAssert((_arguments.size() + firstParam) == _funParameters.size(), "");
-
-	for (unsigned i = 0; i < _arguments.size(); ++i)
-		args.push_back(expr(*_arguments.at(i), _funParameters.at(i + firstParam)->type()));
-
-	return args;
-}
-
-smtutil::Expression SMTEncoder::constantExpr(Expression const& _expr, VariableDeclaration const& _var)
-{
-	if (RationalNumberType const* rationalType = isConstant(_expr))
-	{
-		if (rationalType->isNegative())
-			return smtutil::Expression(u2s(rationalType->literalValue(nullptr)));
-		else
-			return smtutil::Expression(rationalType->literalValue(nullptr));
-	}
-	else
-	{
-		solAssert(_var.value(), "");
-		_var.value()->accept(*this);
-		return expr(*_var.value(), _expr.annotation().type);
-	}
-	solAssert(false, "");
-}
-
-void SMTEncoder::collectFreeFunctions(std::set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
-{
-	for (auto source: _sources)
-		for (auto node: source->nodes())
-			if (auto function = dynamic_cast<FunctionDefinition const*>(node.get()))
-				m_freeFunctions.insert(function);
-			else if (
-				auto contract = dynamic_cast<ContractDefinition const*>(node.get());
-				contract && contract->isLibrary()
-			)
-				for (auto function: contract->definedFunctions())
-					// We need to add public library functions too because they can be called
-					// internally by internal library functions that are considered free functions.
-					m_freeFunctions.insert(function);
-}
-
-void SMTEncoder::createFreeConstants(std::set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
-{
-	for (auto source: _sources)
-		for (auto node: source->nodes())
-			if (auto var = dynamic_cast<VariableDeclaration const*>(node.get()))
-				createVariable(*var);
-			else if (
-				auto contract = dynamic_cast<ContractDefinition const*>(node.get());
-				contract && contract->isLibrary()
-			)
-				for (auto var: contract->stateVariables())
-				{
-					solAssert(var->isConstant(), "");
-					createVariable(*var);
-				}
-}
-
-smt::SymbolicState& SMTEncoder::state()
-{
-	return m_context.state();
-}
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
deleted file mode 100644
index 69010fb1cf54..000000000000
--- a/libsolidity/formal/SMTEncoder.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Encodes Solidity into SMT expressions without creating
- * any verification targets.
- * Also implements the SSA scheme for branches.
- */
-
-#pragma once
-
-
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/ModelCheckerSettings.h>
-#include <libsolidity/formal/SymbolicVariables.h>
-#include <libsolidity/formal/VariableUsage.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/interface/ReadFile.h>
-#include <liblangutil/UniqueErrorReporter.h>
-
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <utility>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-class CharStreamProvider;
-}
-
-namespace solidity::frontend
-{
-
-class SMTEncoder: public ASTConstVisitor
-{
-public:
-	SMTEncoder(
-		smt::EncodingContext& _context,
-		ModelCheckerSettings _settings,
-		langutil::UniqueErrorReporter& _errorReporter,
-		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
-		langutil::CharStreamProvider const& _charStreamProvider
-	);
-
-	/// @returns the leftmost identifier in a multi-d IndexAccess.
-	static Expression const* leftmostBase(IndexAccess const& _indexAccess);
-
-	/// @returns the key type in _type.
-	/// _type must allow IndexAccess, that is,
-	/// it must be either ArrayType or MappingType
-	static Type const* keyType(Type const* _type);
-
-	/// @returns the innermost element in a chain of 1-tuples if applicable,
-	/// otherwise _expr.
-	static Expression const* innermostTuple(Expression const& _expr);
-
-	/// @returns the underlying type if _type is UserDefinedValueType,
-	/// and _type otherwise.
-	static Type const* underlyingType(Type const* _type);
-
-	static TypePointers replaceUserTypes(TypePointers const& _types);
-
-	/// @returns {_funCall.expression(), nullptr} if function call option values are not given, and
-	/// {_funCall.expression().expression(), _funCall.expression()} if they are.
-	static std::pair<Expression const*, FunctionCallOptions const*> functionCallExpression(FunctionCall const& _funCall);
-
-	/// @returns the expression after stripping redundant syntactic sugar.
-	/// Currently supports stripping:
-	/// 1. 1-tuple; i.e. ((x)) -> x
-	/// 2. Explicit cast from string to bytes; i.e. bytes(s) -> s; for s of type string
-	static Expression const* cleanExpression(Expression const& _expr);
-
-	/// @returns the FunctionDefinition of a FunctionCall
-	/// if possible or nullptr.
-	/// @param _scopeContract is the contract that contains the function currently being
-	///        analyzed, if applicable.
-	/// @param _contextContract is the most derived contract currently being analyzed.
-	/// The difference between the two parameters appears in the case of inheritance.
-	/// Let A and B be two contracts so that B derives from A, and A defines a function `f`
-	/// that `B` does not override. Function `f` is visited twice:
-	/// - Once when A is the most derived contract, where both _scopeContract and _contextContract are A.
-	/// - Once when B is the most derived contract, where _scopeContract is A and _contextContract is B.
-	static FunctionDefinition const* functionCallToDefinition(
-		FunctionCall const& _funCall,
-		ContractDefinition const* _scopeContract,
-		ContractDefinition const* _contextContract
-	);
-
-	static std::vector<VariableDeclaration const*> stateVariablesIncludingInheritedAndPrivate(ContractDefinition const& _contract);
-	static std::vector<VariableDeclaration const*> stateVariablesIncludingInheritedAndPrivate(FunctionDefinition const& _function);
-
-	static std::vector<VariableDeclaration const*> localVariablesIncludingModifiers(FunctionDefinition const& _function, ContractDefinition const* _contract);
-	static std::vector<VariableDeclaration const*> modifiersVariables(FunctionDefinition const& _function, ContractDefinition const* _contract);
-	static std::vector<VariableDeclaration const*> tryCatchVariables(FunctionDefinition const& _function);
-
-	/// @returns the ModifierDefinition of a ModifierInvocation if possible, or nullptr.
-	static ModifierDefinition const* resolveModifierInvocation(ModifierInvocation const& _invocation, ContractDefinition const* _contract);
-
-	/// @returns the arguments for each base constructor call in the hierarchy of @a _contract.
-	std::map<ContractDefinition const*, std::vector<ASTPointer<frontend::Expression>>> baseArguments(ContractDefinition const& _contract);
-
-	/// @returns a valid RationalNumberType pointer if _expr has type
-	/// RationalNumberType or can be const evaluated, and nullptr otherwise.
-	static RationalNumberType const* isConstant(Expression const& _expr);
-
-	static std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> collectABICalls(ASTNode const* _node);
-
-	/// @returns all the sources that @param _source depends on,
-	/// including itself.
-	static std::set<SourceUnit const*, ASTNode::CompareByID> sourceDependencies(SourceUnit const& _source);
-
-protected:
-	void resetSourceAnalysis();
-
-	// TODO: Check that we do not have concurrent reads and writes to a variable,
-	// because the order of expression evaluation is undefined
-	// TODO: or just force a certain order, but people might have a different idea about that.
-
-	bool visit(ImportDirective const& _node) override;
-	bool visit(ContractDefinition const& _node) override;
-	void endVisit(ContractDefinition const& _node) override;
-	void endVisit(VariableDeclaration const& _node) override;
-	bool visit(ModifierDefinition const& _node) override;
-	bool visit(FunctionDefinition const& _node) override;
-	void endVisit(FunctionDefinition const& _node) override;
-	bool visit(Block const& _node) override;
-	void endVisit(Block const& _node) override;
-	bool visit(PlaceholderStatement const& _node) override;
-	bool visit(IfStatement const&) override { return false; }
-	bool visit(WhileStatement const&) override { return false; }
-	bool visit(ForStatement const&) override { return false; }
-	void endVisit(ForStatement const&) override {}
-	void endVisit(VariableDeclarationStatement const& _node) override;
-	bool visit(Assignment const& _node) override;
-	void endVisit(Assignment const& _node) override;
-	void endVisit(TupleExpression const& _node) override;
-	bool visit(UnaryOperation const& _node) override;
-	void endVisit(UnaryOperation const& _node) override;
-	bool visit(BinaryOperation const& _node) override;
-	void endVisit(BinaryOperation const& _node) override;
-	bool visit(Conditional const& _node) override;
-	bool visit(FunctionCall const& _node) override;
-	void endVisit(FunctionCall const& _node) override;
-	bool visit(ModifierInvocation const& _node) override;
-	void endVisit(Identifier const& _node) override;
-	void endVisit(ElementaryTypeNameExpression const& _node) override;
-	void endVisit(Literal const& _node) override;
-	void endVisit(Return const& _node) override;
-	bool visit(MemberAccess const& _node) override;
-	void endVisit(IndexAccess const& _node) override;
-	void endVisit(IndexRangeAccess const& _node) override;
-	bool visit(InlineAssembly const& _node) override;
-	bool visit(Break const&) override { return false; }
-	void endVisit(Break const&) override {}
-	bool visit(Continue const&) override { return false; }
-	void endVisit(Continue const&) override {}
-	bool visit(TryCatchClause const&) override { return true; }
-	void endVisit(TryCatchClause const&) override {}
-	bool visit(TryStatement const&) override { return false; }
-
-	virtual void pushInlineFrame(CallableDeclaration const&);
-	virtual void popInlineFrame(CallableDeclaration const&);
-
-	/// Do not visit subtree if node is a RationalNumber.
-	/// Symbolic _expr is the rational literal.
-	bool shortcutRationalNumber(Expression const& _expr);
-	void arithmeticOperation(BinaryOperation const& _op);
-	/// @returns _op(_left, _right) with and without modular arithmetic.
-	/// Used by the function above, compound assignments and
-	/// unary increment/decrement.
-	virtual std::pair<smtutil::Expression, smtutil::Expression> arithmeticOperation(
-		Token _op,
-		smtutil::Expression const& _left,
-		smtutil::Expression const& _right,
-		Type const* _commonType,
-		Expression const& _expression
-	);
-
-	smtutil::Expression bitwiseOperation(
-		Token _op,
-		smtutil::Expression const& _left,
-		smtutil::Expression const& _right,
-		Type const* _commonType
-	);
-
-	void compareOperation(BinaryOperation const& _op);
-	void booleanOperation(BinaryOperation const& _op);
-	void bitwiseOperation(BinaryOperation const& _op);
-	void bitwiseNotOperation(UnaryOperation const& _op);
-
-	void initContract(ContractDefinition const& _contract);
-	void initFunction(FunctionDefinition const& _function);
-	void visitAssert(FunctionCall const& _funCall);
-	void visitRequire(FunctionCall const& _funCall);
-	void visitABIFunction(FunctionCall const& _funCall);
-	void visitCryptoFunction(FunctionCall const& _funCall);
-	void visitGasLeft(FunctionCall const& _funCall);
-	virtual void visitAddMulMod(FunctionCall const& _funCall);
-	void visitWrapUnwrap(FunctionCall const& _funCall);
-	void visitObjectCreation(FunctionCall const& _funCall);
-	void visitTypeConversion(FunctionCall const& _funCall);
-	void visitStructConstructorCall(FunctionCall const& _funCall);
-	void visitFunctionIdentifier(Identifier const& _identifier);
-	virtual void visitPublicGetter(FunctionCall const& _funCall);
-
-	/// @returns true if @param _contract is set for analysis in the settings
-	/// and it is not abstract.
-	bool shouldAnalyze(ContractDefinition const& _contract) const;
-	/// @returns true if @param _source is set for analysis in the settings.
-	bool shouldAnalyze(SourceUnit const& _source) const;
-
-	/// @returns the state variable returned by a public getter if
-	/// @a _expr is a call to a public getter,
-	/// otherwise nullptr.
-	VariableDeclaration const* publicGetter(Expression const& _expr) const;
-
-	smtutil::Expression contractAddressValue(FunctionCall const& _f);
-
-	/// Encodes a modifier or function body according to the modifier
-	/// visit depth.
-	void visitFunctionOrModifier();
-
-	/// Inlines a modifier or base constructor call.
-	void inlineModifierInvocation(ModifierInvocation const* _invocation, CallableDeclaration const* _definition);
-
-	/// Inlines the constructor hierarchy into a single constructor.
-	void inlineConstructorHierarchy(ContractDefinition const& _contract);
-
-	/// Defines a new global variable or function.
-	void defineGlobalVariable(std::string const& _name, Expression const& _expr, bool _increaseIndex = false);
-
-	/// Handles the side effects of assignment
-	/// to variable of some SMT array type
-	/// while aliasing is not supported.
-	void arrayAssignment();
-	/// Handles assignments to index or member access.
-	void indexOrMemberAssignment(Expression const& _expr, smtutil::Expression const& _rightHandSide);
-
-	void arrayPush(FunctionCall const& _funCall);
-	void arrayPop(FunctionCall const& _funCall);
-	/// Allows BMC and CHC to create verification targets for popping
-	/// an empty array.
-	virtual void makeArrayPopVerificationTarget(FunctionCall const&) {}
-	/// Allows BMC and CHC to create verification targets for out of bounds access.
-	virtual void makeOutOfBoundsVerificationTarget(IndexAccess const&) {}
-
-	void addArrayLiteralAssertions(
-		smt::SymbolicArrayVariable& _symArray,
-		std::vector<smtutil::Expression> const& _elementValues
-	);
-
-	void bytesToFixedBytesAssertions(
-		smt::SymbolicArrayVariable& _symArray,
-		Expression const& _fixedBytes
-	);
-
-	/// @returns a pair of expressions representing _left / _right and _left mod _right, respectively.
-	/// Uses slack variables and additional constraints to express the results using only operations
-	/// more friendly to the SMT solver (multiplication, addition, subtraction and comparison).
-	std::pair<smtutil::Expression, smtutil::Expression>	divModWithSlacks(
-		smtutil::Expression _left,
-		smtutil::Expression _right,
-		IntegerType const& _type
-	);
-
-	/// Handles the actual assertion of the new value to the encoding context.
-	/// Other assignment methods should use this one in the end.
-	virtual void assignment(smt::SymbolicVariable& _symVar, smtutil::Expression const& _value);
-
-	void assignment(VariableDeclaration const& _variable, Expression const& _value);
-	/// Handles assignments to variables of different types.
-	void assignment(VariableDeclaration const& _variable, smtutil::Expression const& _value);
-	/// Handles assignments between generic expressions.
-	/// Will also be used for assignments of tuple components.
-	void assignment(Expression const& _left, smtutil::Expression const& _right);
-	void assignment(
-		Expression const& _left,
-		smtutil::Expression const& _right,
-		Type const* _type
-	);
-	/// Handle assignments between tuples.
-	void tupleAssignment(Expression const& _left, Expression const& _right);
-	/// Computes the right hand side of a compound assignment.
-	smtutil::Expression compoundAssignment(Assignment const& _assignment);
-	/// Handles assignment of an expression to a tuple of variables.
-	void expressionToTupleAssignment(std::vector<std::shared_ptr<VariableDeclaration>> const& _variables, Expression const& _rhs);
-
-	/// Maps a variable to an SSA index.
-	using VariableIndices = std::unordered_map<VariableDeclaration const*, unsigned>;
-
-	/// Visits the branch given by the statement, pushes and pops the current path conditions.
-	/// @param _condition if present, asserts that this condition is true within the branch.
-	/// @returns the variable indices after visiting the branch and the expression representing
-	/// the path condition at the end of the branch.
-	std::pair<VariableIndices, smtutil::Expression> visitBranch(ASTNode const* _statement, smtutil::Expression const* _condition = nullptr);
-	std::pair<VariableIndices, smtutil::Expression> visitBranch(ASTNode const* _statement, smtutil::Expression _condition);
-
-	using CallStackEntry = std::pair<CallableDeclaration const*, ASTNode const*>;
-
-	void createStateVariables(ContractDefinition const& _contract);
-	void initializeStateVariables(ContractDefinition const& _contract);
-	void createLocalVariables(FunctionDefinition const& _function);
-	void initializeLocalVariables(FunctionDefinition const& _function);
-	void initializeFunctionCallParameters(CallableDeclaration const& _function, std::vector<smtutil::Expression> const& _callArgs);
-	void resetStateVariables();
-	void resetStorageVariables();
-	void resetMemoryVariables();
-	void resetBalances();
-	/// Resets all references/pointers that have the same type or have
-	/// a subexpression of the same type as _varDecl.
-	void resetReferences(VariableDeclaration const& _varDecl);
-	/// Resets all references/pointers that have type _type.
-	void resetReferences(Type const* _type);
-	/// @returns the type without storage pointer information if it has it.
-	Type const* typeWithoutPointer(Type const* _type);
-	/// @returns whether _a or a subtype of _a is the same as _b.
-	bool sameTypeOrSubtype(Type const* _a, Type const* _b);
-
-	bool isSupportedType(Type const& _type) const;
-
-	/// Given the state of the symbolic variables at the end of two different branches,
-	/// create a merged state using the given branch condition.
-	void mergeVariables(smtutil::Expression const& _condition, VariableIndices const& _indicesEndTrue, VariableIndices const& _indicesEndFalse);
-	/// Tries to create an uninitialized variable and returns true on success.
-	bool createVariable(VariableDeclaration const& _varDecl);
-
-	/// @returns an expression denoting the value of the variable declared in @a _decl
-	/// at the current point.
-	smtutil::Expression currentValue(VariableDeclaration const& _decl) const;
-	/// @returns an expression denoting the value of the variable declared in @a _decl
-	/// at the given index. Does not ensure that this index exists.
-	smtutil::Expression valueAtIndex(VariableDeclaration const& _decl, unsigned _index) const;
-	/// Returns the expression corresponding to the AST node.
-	/// If _targetType is not null apply conversion.
-	/// Throws if the expression does not exist.
-	smtutil::Expression expr(Expression const& _e, Type const* _targetType = nullptr);
-	/// Creates the expression (value can be arbitrary)
-	void createExpr(Expression const& _e);
-	/// Creates the expression and sets its value.
-	void defineExpr(Expression const& _e, smtutil::Expression _value);
-	/// Creates the tuple expression and sets its value.
-	void defineExpr(Expression const& _e, std::vector<std::optional<smtutil::Expression>> const& _values);
-	/// Overwrites the current path condition
-	void setPathCondition(smtutil::Expression const& _e);
-	/// Adds a new path condition
-	void pushPathCondition(smtutil::Expression const& _e);
-	/// Remove the last path condition
-	void popPathCondition();
-	/// Returns the conjunction of all path conditions or True if empty
-	smtutil::Expression currentPathConditions();
-	/// @returns a human-readable call stack. Used for models.
-	langutil::SecondarySourceLocation callStackMessage(std::vector<CallStackEntry> const& _callStack);
-	/// Copies and pops the last called node.
-	CallStackEntry popCallStack();
-	/// Adds (_definition, _node) to the callstack.
-	void pushCallStack(CallStackEntry _entry);
-	/// Add to the solver: the given expression implied by the current path conditions
-	void addPathImpliedExpression(smtutil::Expression const& _e);
-
-	/// Copy the SSA indices of m_variables.
-	VariableIndices copyVariableIndices();
-	/// Resets the variable indices.
-	void resetVariableIndices(VariableIndices const& _indices);
-	/// Used when starting a new block.
-	virtual void clearIndices(ContractDefinition const* _contract, FunctionDefinition const* _function = nullptr);
-
-
-	/// @returns variables that are touched in _node's subtree.
-	std::set<VariableDeclaration const*> touchedVariables(ASTNode const& _node);
-
-	/// @returns the declaration referenced by _expr, if any,
-	/// and nullptr otherwise.
-	Declaration const* expressionToDeclaration(Expression const& _expr) const;
-
-	/// @returns the VariableDeclaration referenced by an Expression or nullptr.
-	VariableDeclaration const* identifierToVariable(Expression const& _expr) const;
-
-	/// @returns the MemberAccess <expression>.push if _expr is an empty array push call,
-	/// otherwise nullptr.
-	MemberAccess const* isEmptyPush(Expression const& _expr) const;
-
-	/// @returns true if the given expression is `this`.
-	/// This means we don't have to abstract away effects of external function calls to this contract.
-	static bool isExternalCallToThis(Expression const* _expr);
-
-	/// Creates symbolic expressions for the returned values
-	/// and set them as the components of the symbolic tuple.
-	void createReturnedExpressions(FunctionDefinition const* _funDef, Expression const& _calledExpr);
-
-	/// @returns the symbolic arguments for a function call,
-	/// taking into account attached functions and
-	/// type conversion.
-	std::vector<smtutil::Expression> symbolicArguments(
-		std::vector<ASTPointer<VariableDeclaration>> const& _funParameters,
-		std::vector<Expression const*> const& _arguments,
-		std::optional<Expression const*> _calledExpr
-	);
-
-	smtutil::Expression constantExpr(Expression const& _expr, VariableDeclaration const& _var);
-
-	/// Traverses all source units available collecting free functions
-	/// and internal library functions in m_freeFunctions.
-	void collectFreeFunctions(std::set<SourceUnit const*, ASTNode::CompareByID> const& _sources);
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> const& allFreeFunctions() const { return m_freeFunctions; }
-	/// Create symbolic variables for the free constants in all @param _sources.
-	void createFreeConstants(std::set<SourceUnit const*, ASTNode::CompareByID> const& _sources);
-
-	/// @returns a note to be added to warnings.
-	std::string extraComment();
-
-	struct VerificationTarget
-	{
-		VerificationTargetType type;
-		smtutil::Expression value;
-		smtutil::Expression constraints;
-	};
-
-	smt::VariableUsage m_variableUsage;
-	bool m_arrayAssignmentHappened = false;
-
-	/// Stores the instances of an Uninterpreted Function applied to arguments.
-	/// These may be direct application of UFs or Array index access.
-	/// Used to retrieve models.
-	std::set<Expression const*> m_uninterpretedTerms;
-	std::vector<smtutil::Expression> m_pathConditions;
-
-	/// Whether the currently visited block uses checked
-	/// or unchecked arithmetic.
-	bool m_checked = true;
-
-	langutil::UniqueErrorReporter& m_errorReporter;
-	langutil::UniqueErrorReporter& m_unsupportedErrors;
-
-	/// Stores the current function/modifier call/invocation path.
-	std::vector<CallStackEntry> m_callStack;
-
-	/// Stack of scopes.
-	std::vector<ScopeOpener const*> m_scopes;
-
-	/// Returns true if the current function was not visited by
-	/// a function call.
-	bool isRootFunction();
-	/// Returns true if _funDef was already visited.
-	bool visitedFunction(FunctionDefinition const* _funDef);
-	/// @returns the contract that contains the current FunctionDefinition that is being visited,
-	/// or nullptr if the analysis is not inside a FunctionDefinition.
-	ContractDefinition const* currentScopeContract();
-
-	/// @returns FunctionDefinitions of the given contract (including its constructor and inherited methods),
-	/// taking into account overriding of the virtual functions.
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> const& contractFunctions(ContractDefinition const& _contract);
-	/// Cache for the method contractFunctions.
-	std::map<ContractDefinition const*, std::set<FunctionDefinition const*, ASTNode::CompareByID>> m_contractFunctions;
-
-	/// @returns FunctionDefinitions of the given contract (including its constructor and methods of bases),
-	/// without taking into account overriding of the virtual functions.
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> const& contractFunctionsWithoutVirtual(ContractDefinition const& _contract);
-	/// Cache for the method contractFunctionsWithoutVirtual.
-	std::map<ContractDefinition const*, std::set<FunctionDefinition const*, ASTNode::CompareByID>> m_contractFunctionsWithoutVirtual;
-
-	/// Depth of visit to modifiers.
-	/// When m_modifierDepth == #modifiers the function can be visited
-	/// when placeholder is visited.
-	/// Needs to be a stack because of function calls.
-	std::vector<int> m_modifierDepthStack;
-
-	std::map<ContractDefinition const*, ModifierInvocation const*> m_baseConstructorCalls;
-
-	ContractDefinition const* m_currentContract = nullptr;
-
-	/// Stores the free functions and internal library functions.
-	/// Those need to be encoded repeatedely for every analyzed contract.
-	std::set<FunctionDefinition const*, ASTNode::CompareByID> m_freeFunctions;
-
-	/// Stores the context of the encoding.
-	smt::EncodingContext& m_context;
-
-	ModelCheckerSettings m_settings;
-
-	/// Character stream for each source,
-	/// used for retrieving source text of expressions for e.g. counter-examples.
-	langutil::CharStreamProvider const& m_charStreamProvider;
-
-	smt::SymbolicState& state();
-};
-
-}
diff --git a/libsolidity/formal/SSAVariable.cpp b/libsolidity/formal/SSAVariable.cpp
deleted file mode 100644
index 482388cedbd7..000000000000
--- a/libsolidity/formal/SSAVariable.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/SSAVariable.h>
-
-using namespace solidity::frontend;
-using namespace solidity::frontend::smt;
-
-SSAVariable::SSAVariable()
-{
-	resetIndex();
-}
-
-void SSAVariable::resetIndex()
-{
-	m_currentIndex = 0;
-	m_nextFreeIndex = 1;
-}
-
-void SSAVariable::setIndex(unsigned _index)
-{
-	m_currentIndex = _index;
-	if (m_nextFreeIndex <= _index)
-		m_nextFreeIndex = _index + 1;
-}
diff --git a/libsolidity/formal/SSAVariable.h b/libsolidity/formal/SSAVariable.h
deleted file mode 100644
index 7db69d1fdf53..000000000000
--- a/libsolidity/formal/SSAVariable.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <memory>
-
-namespace solidity::frontend::smt
-{
-
-/**
- * This class represents the SSA representation of a program variable.
- */
-class SSAVariable
-{
-public:
-	SSAVariable();
-	/// Resets index to 0 and next index to 1.
-	void resetIndex();
-	/// Sets index to _index and only adjusts next if next <= _index.
-	void setIndex(unsigned _index);
-
-	/// This function returns the current index of this SSA variable.
-	unsigned index() const { return m_currentIndex; }
-	unsigned& index() { return m_currentIndex; }
-
-	unsigned operator++()
-	{
-		return m_currentIndex = m_nextFreeIndex++;
-	}
-
-private:
-	unsigned m_currentIndex;
-	unsigned m_nextFreeIndex;
-};
-
-}
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
deleted file mode 100644
index 3859e99c6243..000000000000
--- a/libsolidity/formal/SymbolicState.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/SymbolicState.h>
-
-#include <libsolidity/formal/SymbolicTypes.h>
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <libsmtutil/Sorts.h>
-
-#include <range/v3/view.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::smtutil;
-using namespace solidity::frontend::smt;
-
-BlockchainVariable::BlockchainVariable(
-	std::string _name,
-	std::map<std::string, smtutil::SortPointer> _members,
-	EncodingContext& _context
-):
-	m_name(std::move(_name)),
-	m_members(std::move(_members)),
-	m_context(_context)
-{
-	std::vector<std::string> members;
-	std::vector<SortPointer> sorts;
-	for (auto const& [component, sort]: m_members)
-	{
-		members.emplace_back(component);
-		sorts.emplace_back(sort);
-		m_componentIndices[component] = static_cast<unsigned>(members.size() - 1);
-	}
-	m_tuple = std::make_unique<SymbolicTupleVariable>(
-		std::make_shared<smtutil::TupleSort>(m_name + "_type", members, sorts),
-		m_name,
-		m_context
-	);
-}
-
-smtutil::Expression BlockchainVariable::member(std::string const& _member) const
-{
-	return m_tuple->component(m_componentIndices.at(_member));
-}
-
-smtutil::Expression BlockchainVariable::assignMember(std::string const& _member, smtutil::Expression const& _value)
-{
-	smtutil::Expression newTuple = smt::assignMember(m_tuple->currentValue(), {{_member, _value}});
-	m_context.addAssertion(m_tuple->increaseIndex() == newTuple);
-	return m_tuple->currentValue();
-}
-
-void SymbolicState::reset()
-{
-	m_error.resetIndex();
-	m_thisAddress.resetIndex();
-	m_tx.reset();
-	m_crypto.reset();
-	if (m_abi)
-		m_abi->reset();
-	/// We don't reset nor clear these pointers on purpose,
-	/// since it only helps to keep the already generated types.
-	if (m_state)
-		m_state->reset();
-}
-
-smtutil::Expression SymbolicState::balances() const
-{
-	return m_state->member("balances");
-}
-
-smtutil::Expression SymbolicState::balance() const
-{
-	return balance(thisAddress());
-}
-
-smtutil::Expression SymbolicState::balance(smtutil::Expression _address) const
-{
-	return smtutil::Expression::select(balances(), std::move(_address));
-}
-
-smtutil::Expression SymbolicState::blockhash(smtutil::Expression _blockNumber) const
-{
-	return smtutil::Expression::select(m_tx.member("blockhash"), std::move(_blockNumber));
-}
-
-void SymbolicState::newBalances()
-{
-	auto tupleSort = std::dynamic_pointer_cast<TupleSort>(stateSort());
-	auto balanceSort = tupleSort->components.at(tupleSort->memberToIndex.at("balances"));
-	SymbolicVariable newBalances(balanceSort, "fresh_balances_" + std::to_string(m_context.newUniqueId()), m_context);
-	m_state->assignMember("balances", newBalances.currentValue());
-}
-
-void SymbolicState::transfer(smtutil::Expression _from, smtutil::Expression _to, smtutil::Expression _value)
-{
-	unsigned indexBefore = m_state->index();
-	addBalance(_from, 0 - _value);
-	addBalance(_to, std::move(_value));
-	unsigned indexAfter = m_state->index();
-	solAssert(indexAfter > indexBefore, "");
-	m_state->newVar();
-	/// Do not apply the transfer operation if _from == _to.
-	auto newState = smtutil::Expression::ite(
-		std::move(_from) == std::move(_to),
-		m_state->value(indexBefore),
-		m_state->value(indexAfter)
-	);
-	m_context.addAssertion(m_state->value() == newState);
-}
-
-smtutil::Expression SymbolicState::storage(ContractDefinition const& _contract) const
-{
-	return smt::member(m_state->member("storage"), contractStorageKey(_contract));
-}
-
-smtutil::Expression SymbolicState::storage(ContractDefinition const& _contract, smtutil::Expression _address) const
-{
-	return smtutil::Expression::select(storage(_contract), std::move(_address));
-}
-
-smtutil::Expression SymbolicState::addressActive(smtutil::Expression _address) const
-{
-	return smtutil::Expression::select(m_state->member("isActive"), std::move(_address));
-}
-
-void SymbolicState::setAddressActive(
-	smtutil::Expression _address,
-	bool _active
-)
-{
-	m_state->assignMember("isActive", smtutil::Expression::store(
-		m_state->member("isActive"),
-		std::move(_address),
-		smtutil::Expression(_active))
-	);
-}
-
-void SymbolicState::newStorage()
-{
-	auto newStorageVar = SymbolicTupleVariable(
-		m_state->member("storage").sort,
-		"havoc_storage_" + std::to_string(m_context.newUniqueId()),
-		m_context
-	);
-	m_state->assignMember("storage", newStorageVar.currentValue());
-}
-
-void SymbolicState::writeStateVars(ContractDefinition const& _contract, smtutil::Expression _address)
-{
-	auto stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract);
-	if (stateVars.empty())
-		return;
-
-	std::map<std::string, smtutil::Expression> values;
-	for (auto var: stateVars)
-		values.emplace(stateVarStorageKey(*var, _contract), m_context.variable(*var)->currentValue());
-
-	smtutil::Expression thisStorage = storage(_contract, _address);
-	smtutil::Expression newStorage = smt::assignMember(thisStorage, values);
-	auto newContractStorage = smtutil::Expression::store(
-		storage(_contract), std::move(_address), newStorage
-	);
-	smtutil::Expression newAllStorage = smt::assignMember(m_state->member("storage"), {{contractStorageKey(_contract), newContractStorage}});
-	m_state->assignMember("storage", newAllStorage);
-}
-
-void SymbolicState::readStateVars(ContractDefinition const& _contract, smtutil::Expression _address)
-{
-	auto stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract);
-	if (stateVars.empty())
-		return;
-
-	auto contractStorage = storage(_contract, std::move(_address));
-	for (auto var: stateVars)
-		m_context.addAssertion(
-			m_context.variable(*var)->increaseIndex() ==
-			smt::member(contractStorage, stateVarStorageKey(*var, _contract))
-		);
-}
-
-void SymbolicState::addBalance(smtutil::Expression _address, smtutil::Expression _value)
-{
-	auto newBalances = smtutil::Expression::store(
-		balances(),
-		_address,
-		balance(_address) + std::move(_value)
-	);
-	m_state->assignMember("balances", newBalances);
-}
-
-smtutil::Expression SymbolicState::txMember(std::string const& _member) const
-{
-	return m_tx.member(_member);
-}
-
-smtutil::Expression SymbolicState::evmParisConstraints() const
-{
-	// Ensure prevrandao range as defined by EIP-4399.
-	return txMember("block.prevrandao") > (u256(1) << 64);
-}
-
-smtutil::Expression SymbolicState::txTypeConstraints() const
-{
-	return
-		evmParisConstraints() &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.basefee"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.chainid"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.coinbase"), TypeProvider::address()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.prevrandao"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.gaslimit"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.number"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.timestamp"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("msg.sender"), TypeProvider::address()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("msg.value"), TypeProvider::uint256()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("tx.origin"), TypeProvider::address()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("tx.gasprice"), TypeProvider::uint256());
-}
-
-smtutil::Expression SymbolicState::txNonPayableConstraint() const
-{
-	return m_tx.member("msg.value") == 0;
-}
-
-smtutil::Expression SymbolicState::txFunctionConstraints(FunctionDefinition const& _function) const
-{
-	smtutil::Expression conj = _function.isPayable() ? smtutil::Expression(true) : txNonPayableConstraint();
-	if (_function.isPartOfExternalInterface())
-	{
-		auto sig = TypeProvider::function(_function)->externalIdentifier();
-		conj = conj && m_tx.member("msg.sig") == sig;
-		auto b0 = sig >> (3 * 8);
-		auto b1 = (sig & 0x00ff0000) >> (2 * 8);
-		auto b2 = (sig & 0x0000ff00) >> (1 * 8);
-		auto b3 = (sig & 0x000000ff);
-		auto data = smtutil::Expression::tuple_get(m_tx.member("msg.data"), 0);
-		conj = conj && smtutil::Expression::select(data, 0) == b0;
-		conj = conj && smtutil::Expression::select(data, 1) == b1;
-		conj = conj && smtutil::Expression::select(data, 2) == b2;
-		conj = conj && smtutil::Expression::select(data, 3) == b3;
-		auto length = smtutil::Expression::tuple_get(m_tx.member("msg.data"), 1);
-		// TODO add ABI size of function input parameters here \/
-		conj = conj && length >= 4;
-	}
-
-	return conj;
-}
-
-void SymbolicState::prepareForSourceUnit(SourceUnit const& _source, bool _storage)
-{
-	auto allSources = _source.referencedSourceUnits(true);
-	allSources.insert(&_source);
-	std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
-	std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> contracts;
-	for (auto const& source: allSources)
-	{
-		abiCalls += SMTEncoder::collectABICalls(source);
-		for (auto node: source->nodes())
-			if (auto contract = dynamic_cast<ContractDefinition const*>(node.get()))
-				contracts.insert(contract);
-	}
-	buildState(contracts, _storage);
-	buildABIFunctions(abiCalls);
-}
-
-/// Private helpers.
-
-std::string SymbolicState::contractSuffix(ContractDefinition const& _contract) const
-{
-	return "_" + _contract.name() + "_" + std::to_string(_contract.id());
-}
-
-std::string SymbolicState::contractStorageKey(ContractDefinition const& _contract) const
-{
-	return "storage" + contractSuffix(_contract);
-}
-
-std::string SymbolicState::stateVarStorageKey(VariableDeclaration const& _var, ContractDefinition const& _contract) const
-{
-	return _var.name() + "_" + std::to_string(_var.id()) + contractSuffix(_contract);
-}
-
-void SymbolicState::buildState(std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> const& _contracts, bool _allStorages)
-{
-	std::map<std::string, SortPointer> stateMembers{
-		{"balances", std::make_shared<smtutil::ArraySort>(smtutil::SortProvider::uintSort, smtutil::SortProvider::uintSort)}
-	};
-
-	if (_allStorages)
-	{
-		std::vector<std::string> memberNames;
-		std::vector<SortPointer> memberSorts;
-		for (auto contract: _contracts)
-		{
-			std::string suffix = contractSuffix(*contract);
-
-			// z3 doesn't like empty tuples, so if the contract has 0
-			// state vars we can't put it there.
-			auto stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*contract);
-			if (stateVars.empty())
-				continue;
-
-			auto names = applyMap(stateVars, [&](auto var) {
-				return var->name() + "_" + std::to_string(var->id()) + suffix;
-			});
-			auto sorts = applyMap(stateVars, [](auto var) { return smtSortAbstractFunction(*var->type()); });
-
-			std::string name = "storage" + suffix;
-			auto storageTuple = std::make_shared<smtutil::TupleSort>(
-				name + "_type", names, sorts
-			);
-
-			auto storageSort = std::make_shared<smtutil::ArraySort>(
-				smtSort(*TypeProvider::address()),
-				storageTuple
-			);
-
-			memberNames.emplace_back(name);
-			memberSorts.emplace_back(storageSort);
-		}
-
-		stateMembers.emplace(
-			"isActive",
-			std::make_shared<smtutil::ArraySort>(smtSort(*TypeProvider::address()), smtutil::SortProvider::boolSort)
-		);
-		stateMembers.emplace(
-			"storage",
-			std::make_shared<smtutil::TupleSort>(
-				"storage_type", memberNames, memberSorts
-			)
-		);
-	}
-
-	m_state = std::make_unique<BlockchainVariable>(
-		"state",
-		std::move(stateMembers),
-		m_context
-	);
-}
-
-void SymbolicState::buildABIFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions)
-{
-	std::map<std::string, SortPointer> functions;
-
-	for (auto const* funCall: _abiFunctions)
-	{
-		auto t = dynamic_cast<FunctionType const*>(funCall->expression().annotation().type);
-
-		auto const& args = funCall->sortedArguments();
-		auto const& paramTypes = t->parameterTypes();
-		auto const& returnTypes = t->returnParameterTypes();
-
-
-		auto argTypes = [](auto const& _args) {
-			return util::applyMap(_args, [](auto arg) { return arg->annotation().type; });
-		};
-
-		/// Since each abi.* function may have a different number of input/output parameters,
-		/// we generically compute those types.
-		std::vector<frontend::Type const*> inTypes;
-		std::vector<frontend::Type const*> outTypes;
-		if (t->kind() == FunctionType::Kind::ABIDecode)
-		{
-			/// abi.decode : (bytes, tuple_of_types(return_types)) -> (return_types)
-			solAssert(args.size() == 2, "Unexpected number of arguments for abi.decode");
-			inTypes.emplace_back(TypeProvider::bytesMemory());
-			auto argType = args.at(1)->annotation().type;
-			if (auto const* tupleType = dynamic_cast<TupleType const*>(argType))
-				for (auto componentType: tupleType->components())
-				{
-					auto typeType = dynamic_cast<TypeType const*>(componentType);
-					solAssert(typeType, "");
-					outTypes.emplace_back(typeType->actualType());
-				}
-			else if (auto const* typeType = dynamic_cast<TypeType const*>(argType))
-				outTypes.emplace_back(typeType->actualType());
-			else
-				solAssert(false, "Unexpected argument of abi.decode");
-		}
-		else if (t->kind() == FunctionType::Kind::ABIEncodeCall)
-		{
-			// abi.encodeCall : (functionPointer, tuple_of_args_or_one_non_tuple_arg(arguments)) -> bytes
-			solAssert(args.size() == 2, "Unexpected number of arguments for abi.encodeCall");
-
-			outTypes.emplace_back(TypeProvider::bytesMemory());
-			inTypes.emplace_back(args.at(0)->annotation().type);
-			inTypes.emplace_back(args.at(1)->annotation().type);
-		}
-		else
-		{
-			outTypes = returnTypes;
-			if (
-				t->kind() == FunctionType::Kind::ABIEncodeWithSelector ||
-				t->kind() == FunctionType::Kind::ABIEncodeWithSignature
-			)
-			{
-				/// abi.encodeWithSelector : (bytes4, one_or_more_types) -> bytes
-				/// abi.encodeWithSignature : (string, one_or_more_types) -> bytes
-				inTypes.emplace_back(paramTypes.front());
-				inTypes += argTypes(std::vector<ASTPointer<Expression const>>(args.begin() + 1, args.end()));
-			}
-			else
-			{
-				/// abi.encode/abi.encodePacked : one_or_more_types -> bytes
-				solAssert(
-					t->kind() == FunctionType::Kind::ABIEncode ||
-					t->kind() == FunctionType::Kind::ABIEncodePacked,
-					""
-				);
-				inTypes = argTypes(args);
-			}
-		}
-
-		/// Rational numbers and string literals add the concrete values to the type name,
-		/// so we replace them by uint256 and bytes since those are the same as their SMT types.
-		/// TODO we could also replace all types by their ABI type.
-		auto replaceTypes = [](auto& _types) {
-			for (auto& t: _types)
-				if (t->category() == frontend::Type::Category::RationalNumber)
-					t = TypeProvider::uint256();
-				else if (t->category() == frontend::Type::Category::StringLiteral)
-					t = TypeProvider::bytesMemory();
-				else if (auto userType = dynamic_cast<UserDefinedValueType const*>(t))
-					t = &userType->underlyingType();
-		};
-		replaceTypes(inTypes);
-		replaceTypes(outTypes);
-
-		auto name = t->richIdentifier();
-		for (auto paramType: inTypes + outTypes)
-			name += "_" + paramType->richIdentifier();
-
-		m_abiMembers[funCall] = {name, inTypes, outTypes};
-
-		if (functions.count(name))
-			continue;
-
-		/// If there is only one input or output parameter, we use that type directly.
-		/// Otherwise we create a tuple wrapping the necessary input or output types.
-		auto typesToSort = [](auto const& _types, std::string const& _name) -> std::shared_ptr<Sort> {
-			if (_types.size() == 1)
-				return smtSortAbstractFunction(*_types.front());
-
-			std::vector<std::string> inNames;
-			std::vector<SortPointer> sorts;
-			for (unsigned i = 0; i < _types.size(); ++i)
-			{
-				inNames.emplace_back(_name + "_input_" + std::to_string(i));
-				sorts.emplace_back(smtSortAbstractFunction(*_types.at(i)));
-			}
-			return std::make_shared<smtutil::TupleSort>(
-				_name + "_input",
-				inNames,
-				sorts
-			);
-		};
-
-		auto functionSort = std::make_shared<smtutil::ArraySort>(
-			typesToSort(inTypes, name),
-			typesToSort(outTypes, name)
-		);
-
-		functions[name] = functionSort;
-	}
-
-	m_abi = std::make_unique<BlockchainVariable>("abi", std::move(functions), m_context);
-}
-
-smtutil::Expression SymbolicState::abiFunction(frontend::FunctionCall const* _funCall)
-{
-	solAssert(m_abi, "");
-	return m_abi->member(std::get<0>(m_abiMembers.at(_funCall)));
-}
-
-SymbolicState::SymbolicABIFunction const& SymbolicState::abiFunctionTypes(FunctionCall const* _funCall) const
-{
-	return m_abiMembers.at(_funCall);
-}
diff --git a/libsolidity/formal/SymbolicState.h b/libsolidity/formal/SymbolicState.h
deleted file mode 100644
index 7fe5b028d627..000000000000
--- a/libsolidity/formal/SymbolicState.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/SymbolicTypes.h>
-#include <libsolidity/formal/SymbolicVariables.h>
-
-#include <libsmtutil/Sorts.h>
-#include <libsmtutil/SolverInterface.h>
-
-namespace solidity::frontend::smt
-{
-
-class EncodingContext;
-class SymbolicAddressVariable;
-class SymbolicArrayVariable;
-
-class BlockchainVariable
-{
-public:
-	BlockchainVariable(std::string _name, std::map<std::string, smtutil::SortPointer> _members, EncodingContext& _context);
-	/// @returns the variable data as a tuple.
-	smtutil::Expression value() const { return m_tuple->currentValue(); }
-	smtutil::Expression value(unsigned _idx) const { return m_tuple->valueAtIndex(_idx); }
-	smtutil::SortPointer const& sort() const { return m_tuple->sort(); }
-	unsigned index() const { return m_tuple->index(); }
-	void newVar() { m_tuple->increaseIndex(); }
-	void reset() { m_tuple->resetIndex(); }
-
-	/// @returns the symbolic _member.
-	smtutil::Expression member(std::string const& _member) const;
-	/// Generates a new tuple where _member is assigned _value.
-	smtutil::Expression assignMember(std::string const& _member, smtutil::Expression const& _value);
-
-private:
-	std::string const m_name;
-	std::map<std::string, smtutil::SortPointer> const m_members;
-	EncodingContext& m_context;
-	std::map<std::string, unsigned> m_componentIndices;
-	std::unique_ptr<SymbolicTupleVariable> m_tuple;
-};
-
-/**
- * Symbolic representation of the blockchain context:
- * - error flag
- * - this (the address of the currently executing contract)
- * - state, represented as a tuple of:
- *   - balances
- *   - array of address => bool representing whether an address is used by a contract
- *   - storage of contracts
- * - block and transaction properties, represented as a tuple of:
- *   - blockhash
- *   - block basefee
- *   - block chainid
- *   - block coinbase
- *   - block gaslimit
- *   - block number
- *   - block prevrandao
- *   - block timestamp
- *   - TODO gasleft
- *   - msg data
- *   - msg sender
- *   - msg sig
- *   - msg value
- *   - tx gasprice
- *   - tx origin
- */
-class SymbolicState
-{
-public:
-	SymbolicState(EncodingContext& _context): m_context(_context) {}
-
-	void reset();
-
-	/// Error flag.
-	//@{
-	SymbolicIntVariable& errorFlag() { return m_error; }
-	SymbolicIntVariable const& errorFlag() const { return m_error; }
-	smtutil::SortPointer const& errorFlagSort() const { return m_error.sort(); }
-	//@}
-
-	/// This.
-	//@{
-	/// @returns the symbolic value of the currently executing contract's address.
-	smtutil::Expression thisAddress() const { return m_thisAddress.currentValue(); }
-	smtutil::Expression thisAddress(unsigned _idx) const { return m_thisAddress.valueAtIndex(_idx); }
-	smtutil::Expression newThisAddress() { return m_thisAddress.increaseIndex(); }
-	smtutil::SortPointer const& thisAddressSort() const { return m_thisAddress.sort(); }
-	//@}
-
-	/// Blockchain state.
-	//@{
-	smtutil::Expression state() const { solAssert(m_state, ""); return m_state->value(); }
-	smtutil::Expression state(unsigned _idx) const { solAssert(m_state, ""); return m_state->value(_idx); }
-	smtutil::SortPointer const& stateSort() const { solAssert(m_state, ""); return m_state->sort(); }
-	void newState() { solAssert(m_state, ""); m_state->newVar(); }
-
-	void newBalances();
-
-	/// Balance.
-	/// @returns the symbolic balances.
-	smtutil::Expression balances() const;
-	/// @returns the symbolic balance of address `this`.
-	smtutil::Expression balance() const;
-	/// @returns the symbolic balance of an address.
-	smtutil::Expression balance(smtutil::Expression _address) const;
-	/// Transfer _value from _from to _to.
-	void transfer(smtutil::Expression _from, smtutil::Expression _to, smtutil::Expression _value);
-
-	/// Adds _value to _account's balance.
-	void addBalance(smtutil::Expression _account, smtutil::Expression _value);
-
-	/// Storage.
-	smtutil::Expression storage(ContractDefinition const& _contract) const;
-	smtutil::Expression storage(ContractDefinition const& _contract, smtutil::Expression _address) const;
-	smtutil::Expression addressActive(smtutil::Expression _address) const;
-	void setAddressActive(smtutil::Expression _address, bool _active);
-
-	void newStorage();
-	void writeStateVars(ContractDefinition const& _contract, smtutil::Expression _address);
-	void readStateVars(ContractDefinition const& _contract, smtutil::Expression _address);
-	//@}
-
-	/// Transaction data.
-	//@{
-	/// @returns the tx data as a tuple.
-	smtutil::Expression tx() const { return m_tx.value(); }
-	smtutil::Expression tx(unsigned _idx) const { return m_tx.value(_idx); }
-	smtutil::SortPointer const& txSort() const { return m_tx.sort(); }
-	void newTx() { m_tx.newVar(); }
-	smtutil::Expression txMember(std::string const& _member) const;
-	smtutil::Expression txFunctionConstraints(FunctionDefinition const& _function) const;
-	smtutil::Expression txTypeConstraints() const;
-	smtutil::Expression txNonPayableConstraint() const;
-	smtutil::Expression blockhash(smtutil::Expression _blockNumber) const;
-	smtutil::Expression evmParisConstraints() const;
-	//@}
-
-	/// Crypto functions.
-	//@{
-	/// @returns the crypto functions represented as a tuple of arrays.
-	smtutil::Expression crypto() const { return m_crypto.value(); }
-	smtutil::Expression crypto(unsigned _idx) const { return m_crypto.value(_idx); }
-	smtutil::SortPointer const& cryptoSort() const { return m_crypto.sort(); }
-	void newCrypto() { m_crypto.newVar(); }
-	smtutil::Expression cryptoFunction(std::string const& _member) const { return m_crypto.member(_member); }
-	//@}
-
-	/// Calls the internal methods that build
-	/// - the symbolic ABI functions based on the abi.* calls
-	///   in _source and referenced sources.
-	/// - the symbolic storages for all contracts in _source and
-	///   referenced sources.
-	void prepareForSourceUnit(SourceUnit const& _source, bool _storage);
-
-	/// ABI functions.
-	//@{
-	smtutil::Expression abiFunction(FunctionCall const* _funCall);
-	using SymbolicABIFunction = std::tuple<
-		std::string,
-		std::vector<frontend::Type const*>,
-		std::vector<frontend::Type const*>
-	>;
-	SymbolicABIFunction const& abiFunctionTypes(FunctionCall const* _funCall) const;
-
-	smtutil::Expression abi() const { solAssert(m_abi, ""); return m_abi->value(); }
-	smtutil::Expression abi(unsigned _idx) const { solAssert(m_abi, ""); return m_abi->value(_idx); }
-	smtutil::SortPointer const& abiSort() const { solAssert(m_abi, ""); return m_abi->sort(); }
-	void newABI() { solAssert(m_abi, ""); m_abi->newVar(); }
-	//@}
-
-private:
-	std::string contractSuffix(ContractDefinition const& _contract) const;
-	std::string contractStorageKey(ContractDefinition const& _contract) const;
-	std::string stateVarStorageKey(VariableDeclaration const& _var, ContractDefinition const& _contract) const;
-
-	/// Builds state.storage based on _contracts.
-	void buildState(std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> const& _contracts, bool _allStorages);
-
-	/// Builds m_abi based on the abi.* calls _abiFunctions.
-	void buildABIFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions);
-
-	EncodingContext& m_context;
-
-	SymbolicIntVariable m_error{
-		TypeProvider::uint256(),
-		TypeProvider::uint256(),
-		"error",
-		m_context
-	};
-
-	SymbolicAddressVariable m_thisAddress{
-		"this",
-		m_context
-	};
-
-	/// m_state is a tuple of
-	/// - balances: array of address to balance of address.
-	/// - isActive: array of address to Boolean, where element is true iff address is used.
-	/// - storage: tuple containing the storage of every contract, where
-	/// each element of the tuple represents a contract,
-	/// and is defined by an array where the index is the contract's address
-	/// and the element is a tuple containing the state variables of that contract.
-	std::unique_ptr<BlockchainVariable> m_state;
-
-	BlockchainVariable m_tx{
-		"tx",
-		{
-			{"block.basefee", smtutil::SortProvider::uintSort},
-			{"block.chainid", smtutil::SortProvider::uintSort},
-			{"block.coinbase", smt::smtSort(*TypeProvider::address())},
-			{"block.prevrandao", smtutil::SortProvider::uintSort},
-			{"block.gaslimit", smtutil::SortProvider::uintSort},
-			{"block.number", smtutil::SortProvider::uintSort},
-			{"block.timestamp", smtutil::SortProvider::uintSort},
-			{"blockhash", std::make_shared<smtutil::ArraySort>(smtutil::SortProvider::uintSort, smtutil::SortProvider::uintSort)},
-			// TODO gasleft
-			{"msg.data", smt::smtSort(*TypeProvider::bytesMemory())},
-			{"msg.sender", smt::smtSort(*TypeProvider::address())},
-			{"msg.sig", smtutil::SortProvider::uintSort},
-			{"msg.value", smtutil::SortProvider::uintSort},
-			{"tx.gasprice", smtutil::SortProvider::uintSort},
-			{"tx.origin", smt::smtSort(*TypeProvider::address())}
-		},
-		m_context
-	};
-
-	BlockchainVariable m_crypto{
-		"crypto",
-		{
-			{"keccak256", std::make_shared<smtutil::ArraySort>(
-				smt::smtSort(*TypeProvider::bytesStorage()),
-				smtSort(*TypeProvider::fixedBytes(32))
-			)},
-			{"sha256", std::make_shared<smtutil::ArraySort>(
-				smt::smtSort(*TypeProvider::bytesStorage()),
-				smtSort(*TypeProvider::fixedBytes(32))
-			)},
-			{"ripemd160", std::make_shared<smtutil::ArraySort>(
-				smt::smtSort(*TypeProvider::bytesStorage()),
-				smtSort(*TypeProvider::fixedBytes(20))
-			)},
-			{"ecrecover", std::make_shared<smtutil::ArraySort>(
-				std::make_shared<smtutil::TupleSort>(
-					"ecrecover_input_type",
-					std::vector<std::string>{"hash", "v", "r", "s"},
-					std::vector<smtutil::SortPointer>{
-						smt::smtSort(*TypeProvider::fixedBytes(32)),
-						smt::smtSort(*TypeProvider::uint(8)),
-						smt::smtSort(*TypeProvider::fixedBytes(32)),
-						smt::smtSort(*TypeProvider::fixedBytes(32))
-					}
-				),
-				smtSort(*TypeProvider::address())
-			)}
-		},
-		m_context
-	};
-
-	/// Tuple containing all used ABI functions.
-	std::unique_ptr<BlockchainVariable> m_abi;
-	/// Maps ABI functions calls to their tuple names generated by
-	/// `buildABIFunctions`.
-	std::map<FunctionCall const*, SymbolicABIFunction> m_abiMembers;
-};
-
-}
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
deleted file mode 100644
index 45b872b3d0d9..000000000000
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/SymbolicTypes.h>
-
-#include <libsolidity/formal/EncodingContext.h>
-
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolutil/CommonData.h>
-#include <memory>
-#include <vector>
-
-using namespace solidity::util;
-using namespace solidity::smtutil;
-
-namespace solidity::frontend::smt
-{
-
-SortPointer smtSort(frontend::Type const& _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(&_type))
-		return smtSort(userType->underlyingType());
-
-	switch (smtKind(_type))
-	{
-	case Kind::Int:
-		if (auto const* intType = dynamic_cast<IntegerType const*>(&_type))
-			return SortProvider::intSort(intType->isSigned());
-		if (auto const* fixedType = dynamic_cast<FixedPointType const*>(&_type))
-			return SortProvider::intSort(fixedType->isSigned());
-		return SortProvider::uintSort;
-	case Kind::Bool:
-		return SortProvider::boolSort;
-	case Kind::Function:
-	{
-		auto fType = dynamic_cast<frontend::FunctionType const*>(&_type);
-		solAssert(fType, "");
-		std::vector<SortPointer> parameterSorts = smtSort(fType->parameterTypes());
-		auto returnTypes = fType->returnParameterTypes();
-		SortPointer returnSort;
-		// TODO change this when we support tuples.
-		if (returnTypes.size() == 0)
-			// We cannot declare functions without a return sort, so we use the smallest.
-			returnSort = SortProvider::boolSort;
-		else if (returnTypes.size() > 1)
-			// Abstract sort.
-			returnSort = SortProvider::uintSort;
-		else
-			returnSort = smtSort(*returnTypes.front());
-		return std::make_shared<FunctionSort>(parameterSorts, returnSort);
-	}
-	case Kind::Array:
-	{
-		std::shared_ptr<ArraySort> array;
-		if (isMapping(_type))
-		{
-			auto mapType = dynamic_cast<frontend::MappingType const*>(&_type);
-			solAssert(mapType, "");
-			array = std::make_shared<ArraySort>(smtSortAbstractFunction(*mapType->keyType()), smtSortAbstractFunction(*mapType->valueType()));
-		}
-		else if (isStringLiteral(_type))
-		{
-			auto stringLitType = dynamic_cast<frontend::StringLiteralType const*>(&_type);
-			solAssert(stringLitType, "");
-			array = std::make_shared<ArraySort>(SortProvider::uintSort, SortProvider::uintSort);
-		}
-		else
-		{
-			frontend::ArrayType const* arrayType = nullptr;
-			if (auto const* arr = dynamic_cast<frontend::ArrayType const*>(&_type))
-				arrayType = arr;
-			else if (auto const* slice = dynamic_cast<frontend::ArraySliceType const*>(&_type))
-				arrayType = &slice->arrayType();
-			else
-				solAssert(false, "");
-
-			solAssert(arrayType, "");
-			array = std::make_shared<ArraySort>(SortProvider::uintSort, smtSortAbstractFunction(*arrayType->baseType()));
-		}
-
-		std::string tupleName;
-		auto sliceArrayType = dynamic_cast<ArraySliceType const*>(&_type);
-		ArrayType const* arrayType = sliceArrayType ? &sliceArrayType->arrayType() : dynamic_cast<ArrayType const*>(&_type);
-		if (
-			(arrayType && arrayType->isByteArrayOrString()) ||
-			_type.category() == frontend::Type::Category::StringLiteral
-		)
-			tupleName = "bytes";
-		else if (arrayType)
-		{
-			auto baseType = arrayType->baseType();
-			// Solidity allows implicit conversion also when assigning arrays.
-			// So if the base type potentially has a size, that size cannot go
-			// in the tuple's name.
-			if (auto tupleSort = std::dynamic_pointer_cast<TupleSort>(array->range))
-				tupleName = tupleSort->name;
-			else if (
-				baseType->category() == frontend::Type::Category::Integer ||
-				baseType->category() == frontend::Type::Category::FixedPoint
-			)
-				tupleName = "uint";
-			else if (baseType->category() == frontend::Type::Category::FixedBytes)
-				tupleName = "fixedbytes";
-			else
-				tupleName = arrayType->baseType()->toString(true);
-
-			tupleName += "_array";
-		}
-		else
-			tupleName = _type.toString(true);
-
-		tupleName += "_tuple";
-
-		return std::make_shared<TupleSort>(
-			tupleName,
-			std::vector<std::string>{tupleName + "_accessor_array", tupleName + "_accessor_length"},
-			std::vector<SortPointer>{array, SortProvider::uintSort}
-		);
-	}
-	case Kind::Tuple:
-	{
-		std::vector<std::string> members;
-		auto const& tupleName = _type.toString(true);
-		std::vector<SortPointer> sorts;
-
-		if (auto const* tupleType = dynamic_cast<frontend::TupleType const*>(&_type))
-		{
-			auto const& components = tupleType->components();
-			for (unsigned i = 0; i < components.size(); ++i)
-				members.emplace_back(tupleName + "_accessor_" + std::to_string(i));
-			sorts = smtSortAbstractFunction(tupleType->components());
-		}
-		else if (auto const* structType = dynamic_cast<frontend::StructType const*>(&_type))
-		{
-			solAssert(!structType->recursive(), "");
-			auto const& structMembers = structType->structDefinition().members();
-			for (auto member: structMembers)
-				members.emplace_back(tupleName + "_accessor_" + member->name());
-			sorts = smtSortAbstractFunction(applyMap(
-				structMembers,
-				[](auto var) { return var->type(); }
-			));
-		}
-		else
-			solAssert(false, "");
-
-		return std::make_shared<TupleSort>(tupleName, members, sorts);
-	}
-	default:
-		// Abstract case.
-		return SortProvider::uintSort;
-	}
-}
-
-std::vector<SortPointer> smtSort(std::vector<frontend::Type const*> const& _types)
-{
-	std::vector<SortPointer> sorts;
-	for (auto const& type: _types)
-		sorts.push_back(smtSort(*type));
-	return sorts;
-}
-
-SortPointer smtSortAbstractFunction(frontend::Type const& _type)
-{
-	if (isFunction(_type))
-		return SortProvider::uintSort;
-	return smtSort(_type);
-}
-
-std::vector<SortPointer> smtSortAbstractFunction(std::vector<frontend::Type const*> const& _types)
-{
-	std::vector<SortPointer> sorts;
-	for (auto const& type: _types)
-		if (type)
-			sorts.push_back(smtSortAbstractFunction(*type));
-		else
-			sorts.push_back(SortProvider::uintSort);
-	return sorts;
-}
-
-Kind smtKind(frontend::Type const& _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(&_type))
-		return smtKind(userType->underlyingType());
-
-	if (isNumber(_type))
-		return Kind::Int;
-	else if (isBool(_type))
-		return Kind::Bool;
-	else if (isFunction(_type))
-		return Kind::Function;
-	else if (isMapping(_type) || isArray(_type))
-		return Kind::Array;
-	else if (isTuple(_type) || isNonRecursiveStruct(_type))
-		return Kind::Tuple;
-	// Abstract case.
-	return Kind::Int;
-}
-
-bool isSupportedType(frontend::Type const& _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(&_type))
-		return isSupportedType(userType->underlyingType());
-
-	return isNumber(_type) ||
-		isBool(_type) ||
-		isMapping(_type) ||
-		isArray(_type) ||
-		isTuple(_type) ||
-		isNonRecursiveStruct(_type);
-}
-
-bool isSupportedTypeDeclaration(frontend::Type const& _type)
-{
-	return isSupportedType(_type) ||
-		isFunction(_type);
-}
-
-std::pair<bool, std::shared_ptr<SymbolicVariable>> newSymbolicVariable(
-	frontend::Type const& _type,
-	std::string const& _uniqueName,
-	EncodingContext& _context
-)
-{
-	bool abstract = false;
-	std::shared_ptr<SymbolicVariable> var;
-	frontend::Type const* type = &_type;
-
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(type))
-		return newSymbolicVariable(userType->underlyingType(), _uniqueName, _context);
-
-	if (!isSupportedTypeDeclaration(_type))
-	{
-		abstract = true;
-		var = std::make_shared<SymbolicIntVariable>(frontend::TypeProvider::uint256(), type, _uniqueName, _context);
-	}
-	else if (isBool(_type))
-		var = std::make_shared<SymbolicBoolVariable>(type, _uniqueName, _context);
-	else if (isFunction(_type))
-	{
-		auto const& fType = dynamic_cast<FunctionType const*>(type);
-		auto const& paramsIn = fType->parameterTypes();
-		auto const& paramsOut = fType->returnParameterTypes();
-		auto findFunctionParam = [&](auto&& params) {
-			return find_if(
-				begin(params),
-				end(params),
-				[&](frontend::Type const* _paramType) { return _paramType->category() == frontend::Type::Category::Function; }
-			);
-		};
-		if (
-			findFunctionParam(paramsIn) != end(paramsIn) ||
-			findFunctionParam(paramsOut) != end(paramsOut)
-		)
-		{
-			abstract = true;
-			var = std::make_shared<SymbolicIntVariable>(TypeProvider::uint256(), type, _uniqueName, _context);
-		}
-		else
-			var = std::make_shared<SymbolicFunctionVariable>(type, _uniqueName, _context);
-	}
-	else if (isInteger(_type))
-		var = std::make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
-	else if (isFixedPoint(_type))
-		var = std::make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
-	else if (isFixedBytes(_type))
-	{
-		auto fixedBytesType = dynamic_cast<frontend::FixedBytesType const*>(type);
-		solAssert(fixedBytesType, "");
-		var = std::make_shared<SymbolicFixedBytesVariable>(type, fixedBytesType->numBytes(), _uniqueName, _context);
-	}
-	else if (isAddress(_type) || isContract(_type))
-		var = std::make_shared<SymbolicAddressVariable>(_uniqueName, _context);
-	else if (isEnum(_type))
-		var = std::make_shared<SymbolicEnumVariable>(type, _uniqueName, _context);
-	else if (isRational(_type))
-	{
-		auto rational = dynamic_cast<frontend::RationalNumberType const*>(&_type);
-		solAssert(rational, "");
-		if (rational->isFractional())
-			var = std::make_shared<SymbolicIntVariable>(frontend::TypeProvider::uint256(), type, _uniqueName, _context);
-		else
-			var = std::make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
-	}
-	else if (isMapping(_type) || isArray(_type))
-		var = std::make_shared<SymbolicArrayVariable>(type, type, _uniqueName, _context);
-	else if (isTuple(_type))
-		var = std::make_shared<SymbolicTupleVariable>(type, _uniqueName, _context);
-	else if (isStringLiteral(_type))
-	{
-		auto stringType = TypeProvider::stringMemory();
-		var = std::make_shared<SymbolicArrayVariable>(stringType, type, _uniqueName, _context);
-	}
-	else if (isNonRecursiveStruct(_type))
-		var = std::make_shared<SymbolicStructVariable>(type, _uniqueName, _context);
-	else
-		solAssert(false, "");
-	return make_pair(abstract, var);
-}
-
-bool isInteger(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Integer;
-}
-
-bool isFixedPoint(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::FixedPoint;
-}
-
-bool isRational(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::RationalNumber;
-}
-
-bool isFixedBytes(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::FixedBytes;
-}
-
-bool isAddress(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Address;
-}
-
-bool isContract(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Contract;
-}
-
-bool isEnum(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Enum;
-}
-
-bool isNumber(frontend::Type const& _type)
-{
-	return isInteger(_type) ||
-		isFixedPoint(_type) ||
-		isRational(_type) ||
-		isFixedBytes(_type) ||
-		isAddress(_type) ||
-		isContract(_type) ||
-		isEnum(_type);
-}
-
-bool isBool(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Bool;
-}
-
-bool isFunction(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Function;
-}
-
-bool isMapping(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Mapping;
-}
-
-bool isArray(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Array ||
-		_type.category() == frontend::Type::Category::StringLiteral ||
-		_type.category() == frontend::Type::Category::ArraySlice;
-}
-
-bool isTuple(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::Tuple;
-}
-
-bool isStringLiteral(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::StringLiteral;
-}
-
-bool isNonRecursiveStruct(frontend::Type const& _type)
-{
-	auto structType = dynamic_cast<StructType const*>(&_type);
-	return structType && !structType->recursive();
-}
-
-bool isInaccessibleDynamic(frontend::Type const& _type)
-{
-	return _type.category() == frontend::Type::Category::InaccessibleDynamic;
-}
-
-smtutil::Expression minValue(frontend::IntegerType const& _type)
-{
-	return smtutil::Expression(_type.minValue());
-}
-
-smtutil::Expression minValue(frontend::Type const* _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		return minValue(&userType->underlyingType());
-
-	solAssert(isNumber(*_type), "");
-	if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
-		return intType->minValue();
-	if (auto const* fixedType = dynamic_cast<FixedPointType const*>(_type))
-		return fixedType->minIntegerValue();
-	if (
-		dynamic_cast<AddressType const*>(_type) ||
-		dynamic_cast<ContractType const*>(_type) ||
-		dynamic_cast<EnumType const*>(_type) ||
-		dynamic_cast<FixedBytesType const*>(_type)
-	)
-		return 0;
-	solAssert(false, "");
-}
-
-smtutil::Expression maxValue(frontend::IntegerType const& _type)
-{
-	return smtutil::Expression(_type.maxValue());
-}
-
-smtutil::Expression maxValue(frontend::Type const* _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		return maxValue(&userType->underlyingType());
-
-	solAssert(isNumber(*_type), "");
-	if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
-		return intType->maxValue();
-	if (auto const* fixedType = dynamic_cast<FixedPointType const*>(_type))
-		return fixedType->maxIntegerValue();
-	if (
-		dynamic_cast<AddressType const*>(_type) ||
-		dynamic_cast<ContractType const*>(_type)
-	)
-		return TypeProvider::uint(160)->maxValue();
-	if (auto const* enumType = dynamic_cast<EnumType const*>(_type))
-		return enumType->numberOfMembers() - 1;
-	if (auto const* bytesType = dynamic_cast<FixedBytesType const*>(_type))
-		return TypeProvider::uint(bytesType->numBytes() * 8)->maxValue();
-	solAssert(false, "");
-}
-
-void setSymbolicZeroValue(SymbolicVariable const& _variable, EncodingContext& _context)
-{
-	setSymbolicZeroValue(_variable.currentValue(), _variable.type(), _context);
-}
-
-void setSymbolicZeroValue(smtutil::Expression _expr, frontend::Type const* _type, EncodingContext& _context)
-{
-	solAssert(_type, "");
-	_context.addAssertion(_expr == zeroValue(_type));
-}
-
-smtutil::Expression zeroValue(frontend::Type const* _type)
-{
-	solAssert(_type, "");
-
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		return zeroValue(&userType->underlyingType());
-
-	if (isSupportedType(*_type))
-	{
-		if (isNumber(*_type))
-			return 0;
-		if (isBool(*_type))
-			return smtutil::Expression(false);
-		if (isArray(*_type) || isMapping(*_type))
-		{
-			auto tupleSort = std::dynamic_pointer_cast<TupleSort>(smtSort(*_type));
-			solAssert(tupleSort, "");
-			auto sortSort = std::make_shared<SortSort>(tupleSort->components.front());
-
-			std::optional<smtutil::Expression> zeroArray;
-			auto length = bigint(0);
-			if (auto arrayType = dynamic_cast<ArrayType const*>(_type))
-			{
-				zeroArray = smtutil::Expression::const_array(smtutil::Expression(sortSort), zeroValue(arrayType->baseType()));
-				if (!arrayType->isDynamicallySized())
-					length = bigint(arrayType->length());
-			}
-			else if (auto mappingType = dynamic_cast<MappingType const*>(_type))
-				zeroArray = smtutil::Expression::const_array(smtutil::Expression(sortSort), zeroValue(mappingType->valueType()));
-			else
-				solAssert(false, "");
-
-			solAssert(zeroArray, "");
-			return smtutil::Expression::tuple_constructor(
-				smtutil::Expression(std::make_shared<SortSort>(tupleSort), tupleSort->name),
-				std::vector<smtutil::Expression>{*zeroArray, length}
-			);
-
-		}
-		if (isNonRecursiveStruct(*_type))
-		{
-			auto const* structType = dynamic_cast<StructType const*>(_type);
-			auto structSort = std::dynamic_pointer_cast<TupleSort>(smtSort(*_type));
-			return smtutil::Expression::tuple_constructor(
-				smtutil::Expression(std::make_shared<SortSort>(structSort), structSort->name),
-				applyMap(
-					structType->structDefinition().members(),
-					[](auto var) { return zeroValue(var->type()); }
-				)
-			);
-		}
-		solAssert(false, "");
-	}
-	// Unsupported types are abstracted as Int.
-	return 0;
-}
-
-bool isSigned(frontend::Type const* _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		return isSigned(&userType->underlyingType());
-
-	solAssert(smt::isNumber(*_type), "");
-	bool isSigned = false;
-	if (auto const* numberType = dynamic_cast<RationalNumberType const*>(_type))
-		isSigned |= numberType->isNegative();
-	else if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
-		isSigned |= intType->isSigned();
-	else if (auto const* fixedType = dynamic_cast<FixedPointType const*>(_type))
-		isSigned |= fixedType->isSigned();
-	else if (
-		dynamic_cast<AddressType const*>(_type) ||
-		dynamic_cast<ContractType const*>(_type) ||
-		dynamic_cast<EnumType const*>(_type) ||
-		dynamic_cast<FixedBytesType const*>(_type)
-	)
-		return false;
-	else
-		solAssert(false, "");
-
-	return isSigned;
-}
-
-std::pair<unsigned, bool> typeBvSizeAndSignedness(frontend::Type const* _type)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		return typeBvSizeAndSignedness(&userType->underlyingType());
-
-	if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
-		return {intType->numBits(), intType->isSigned()};
-	else if (auto const* fixedType = dynamic_cast<FixedPointType const*>(_type))
-		return {fixedType->numBits(), fixedType->isSigned()};
-	else if (auto const* fixedBytesType = dynamic_cast<FixedBytesType const*>(_type))
-		return {fixedBytesType->numBytes() * 8, false};
-	else
-		solAssert(false, "");
-}
-
-void setSymbolicUnknownValue(SymbolicVariable const& _variable, EncodingContext& _context)
-{
-	setSymbolicUnknownValue(_variable.currentValue(), _variable.type(), _context);
-}
-
-void setSymbolicUnknownValue(smtutil::Expression _expr, frontend::Type const* _type, EncodingContext& _context)
-{
-	_context.addAssertion(symbolicUnknownConstraints(_expr, _type));
-}
-
-smtutil::Expression symbolicUnknownConstraints(smtutil::Expression _expr, frontend::Type const* _type)
-{
-	solAssert(_type, "");
-
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
-		return symbolicUnknownConstraints(std::move(_expr), &userType->underlyingType());
-
-	if (isEnum(*_type) || isInteger(*_type) || isAddress(*_type) || isFixedBytes(*_type))
-		return _expr >= minValue(_type) && _expr <= maxValue(_type);
-	else if (
-		auto arrayType = dynamic_cast<ArrayType const*>(_type);
-		arrayType && !arrayType->isDynamicallySized()
-	)
-		return smtutil::Expression::tuple_get(_expr, 1) == arrayType->length();
-	else if (isArray(*_type) || isMapping(*_type))
-		/// Length cannot be negative.
-		return smtutil::Expression::tuple_get(_expr, 1) >= 0;
-
-	return smtutil::Expression(true);
-}
-
-std::optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from, frontend::Type const* _to)
-{
-	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_to))
-		return symbolicTypeConversion(_from, &userType->underlyingType());
-
-	if (_to && _from)
-		// StringLiterals are encoded as SMT arrays in the generic case,
-		// but they can also be compared/assigned to fixed bytes, in which
-		// case they'd need to be encoded as numbers.
-		if (auto strType = dynamic_cast<StringLiteralType const*>(_from))
-			if (auto fixedBytesType = dynamic_cast<FixedBytesType const*>(_to))
-			{
-				if (strType->value().empty())
-					return smtutil::Expression(size_t(0));
-				auto bytesVec = util::asBytes(strType->value());
-				bytesVec.resize(fixedBytesType->numBytes(), 0);
-				return smtutil::Expression(u256(util::toHex(bytesVec, util::HexPrefix::Add)));
-			}
-
-	return std::nullopt;
-}
-
-smtutil::Expression member(smtutil::Expression const& _tuple, std::string const& _member)
-{
-	TupleSort const& _sort = dynamic_cast<TupleSort const&>(*_tuple.sort);
-	return smtutil::Expression::tuple_get(
-		_tuple,
-		_sort.memberToIndex.at(_member)
-	);
-}
-
-smtutil::Expression assignMember(smtutil::Expression const _tuple, std::map<std::string, smtutil::Expression> const& _values)
-{
-	TupleSort const& _sort = dynamic_cast<TupleSort const&>(*_tuple.sort);
-	std::vector<smtutil::Expression> args;
-	for (auto const& m: _sort.members)
-		if (auto* value = util::valueOrNullptr(_values, m))
-			args.emplace_back(*value);
-		else
-			args.emplace_back(member(_tuple, m));
-	auto sortExpr = smtutil::Expression(std::make_shared<smtutil::SortSort>(_tuple.sort), _tuple.name);
-	return smtutil::Expression::tuple_constructor(sortExpr, args);
-}
-
-}
diff --git a/libsolidity/formal/SymbolicTypes.h b/libsolidity/formal/SymbolicTypes.h
deleted file mode 100644
index 747e27b7e372..000000000000
--- a/libsolidity/formal/SymbolicTypes.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/SymbolicVariables.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/Types.h>
-
-namespace solidity::frontend::smt
-{
-
-class EncodingContext;
-
-/// Returns the SMT sort that models the Solidity type _type.
-smtutil::SortPointer smtSort(frontend::Type const& _type);
-std::vector<smtutil::SortPointer> smtSort(std::vector<frontend::Type const*> const& _types);
-/// If _type has type Function, abstract it to Integer.
-/// Otherwise return smtSort(_type).
-smtutil::SortPointer smtSortAbstractFunction(frontend::Type const& _type);
-std::vector<smtutil::SortPointer> smtSortAbstractFunction(std::vector<frontend::Type const*> const& _types);
-/// Returns the SMT kind that models the Solidity type type category _category.
-smtutil::Kind smtKind(frontend::Type const& _type);
-
-/// Returns true if type is fully supported (declaration and operations).
-bool isSupportedType(frontend::Type const& _type);
-bool isSupportedType(frontend::Type const& _type);
-/// Returns true if type is partially supported (declaration).
-bool isSupportedTypeDeclaration(frontend::Type const& _type);
-bool isSupportedTypeDeclaration(frontend::Type const& _type);
-
-bool isInteger(frontend::Type const& _type);
-bool isFixedPoint(frontend::Type const& _type);
-bool isRational(frontend::Type const& _type);
-bool isFixedBytes(frontend::Type const& _type);
-bool isAddress(frontend::Type const& _type);
-bool isContract(frontend::Type const& _type);
-bool isEnum(frontend::Type const& _type);
-bool isNumber(frontend::Type const& _type);
-bool isBool(frontend::Type const& _type);
-bool isFunction(frontend::Type const& _type);
-bool isMapping(frontend::Type const& _type);
-bool isArray(frontend::Type const& _type);
-bool isTuple(frontend::Type const& _type);
-bool isStringLiteral(frontend::Type const& _type);
-bool isNonRecursiveStruct(frontend::Type const& _type);
-bool isInaccessibleDynamic(frontend::Type const& _type);
-
-/// Returns a new symbolic variable, according to _type.
-/// Also returns whether the type is abstract or not,
-/// which is true for unsupported types.
-std::pair<bool, std::shared_ptr<SymbolicVariable>> newSymbolicVariable(frontend::Type const& _type, std::string const& _uniqueName, EncodingContext& _context);
-
-smtutil::Expression minValue(frontend::IntegerType const& _type);
-smtutil::Expression minValue(frontend::Type const* _type);
-smtutil::Expression maxValue(frontend::IntegerType const& _type);
-smtutil::Expression maxValue(frontend::Type const* _type);
-smtutil::Expression zeroValue(frontend::Type const* _type);
-bool isSigned(frontend::Type const* _type);
-
-std::pair<unsigned, bool> typeBvSizeAndSignedness(frontend::Type const* type);
-
-void setSymbolicZeroValue(SymbolicVariable const& _variable, EncodingContext& _context);
-void setSymbolicZeroValue(smtutil::Expression _expr, frontend::Type const* _type, EncodingContext& _context);
-void setSymbolicUnknownValue(SymbolicVariable const& _variable, EncodingContext& _context);
-void setSymbolicUnknownValue(smtutil::Expression _expr, frontend::Type const* _type, EncodingContext& _context);
-smtutil::Expression symbolicUnknownConstraints(smtutil::Expression _expr, frontend::Type const* _type);
-
-std::optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from, frontend::Type const* _to);
-
-smtutil::Expression member(smtutil::Expression const& _tuple, std::string const& _member);
-smtutil::Expression assignMember(smtutil::Expression const _tuple, std::map<std::string, smtutil::Expression> const& _values);
-
-}
diff --git a/libsolidity/formal/SymbolicVariables.cpp b/libsolidity/formal/SymbolicVariables.cpp
deleted file mode 100644
index 6d6dbee65da5..000000000000
--- a/libsolidity/formal/SymbolicVariables.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/SymbolicVariables.h>
-
-#include <libsolidity/formal/EncodingContext.h>
-#include <libsolidity/formal/SymbolicTypes.h>
-
-#include <libsolutil/Algorithms.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::smtutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::smt;
-
-SymbolicVariable::SymbolicVariable(
-	frontend::Type const* _type,
-	frontend::Type const* _originalType,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	m_type(_type),
-	m_originalType(_originalType),
-	m_uniqueName(std::move(_uniqueName)),
-	m_context(_context),
-	m_ssa(std::make_unique<SSAVariable>())
-{
-	solAssert(m_type, "");
-	m_sort = smtSort(*m_type);
-	solAssert(m_sort, "");
-}
-
-SymbolicVariable::SymbolicVariable(
-	SortPointer _sort,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	m_sort(std::move(_sort)),
-	m_uniqueName(std::move(_uniqueName)),
-	m_context(_context),
-	m_ssa(std::make_unique<SSAVariable>())
-{
-	solAssert(m_sort, "");
-}
-
-smtutil::Expression SymbolicVariable::currentValue(frontend::Type const*) const
-{
-	return valueAtIndex(m_ssa->index());
-}
-
-std::string SymbolicVariable::currentName() const
-{
-	return uniqueSymbol(m_ssa->index());
-}
-
-smtutil::Expression SymbolicVariable::valueAtIndex(unsigned _index) const
-{
-	return m_context.newVariable(uniqueSymbol(_index), m_sort);
-}
-
-std::string SymbolicVariable::nameAtIndex(unsigned _index) const
-{
-	return uniqueSymbol(_index);
-}
-
-std::string SymbolicVariable::uniqueSymbol(unsigned _index) const
-{
-	return m_uniqueName + "_" + std::to_string(_index);
-}
-
-smtutil::Expression SymbolicVariable::resetIndex()
-{
-	m_ssa->resetIndex();
-	return currentValue();
-}
-
-smtutil::Expression SymbolicVariable::setIndex(unsigned _index)
-{
-	m_ssa->setIndex(_index);
-	return currentValue();
-}
-
-smtutil::Expression SymbolicVariable::increaseIndex()
-{
-	++(*m_ssa);
-	return currentValue();
-}
-
-SymbolicBoolVariable::SymbolicBoolVariable(
-	frontend::Type const* _type,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
-{
-	solAssert(m_type->category() == frontend::Type::Category::Bool, "");
-}
-
-SymbolicIntVariable::SymbolicIntVariable(
-	frontend::Type const* _type,
-	frontend::Type const* _originalType,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _originalType, std::move(_uniqueName), _context)
-{
-	solAssert(isNumber(*m_type), "");
-}
-
-SymbolicAddressVariable::SymbolicAddressVariable(
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicIntVariable(TypeProvider::uint(160), TypeProvider::uint(160), std::move(_uniqueName), _context)
-{
-}
-
-SymbolicFixedBytesVariable::SymbolicFixedBytesVariable(
-	frontend::Type const* _originalType,
-	unsigned _numBytes,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicIntVariable(TypeProvider::uint(_numBytes * 8), _originalType, std::move(_uniqueName), _context)
-{
-}
-
-SymbolicFunctionVariable::SymbolicFunctionVariable(
-	frontend::Type const* _type,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _type, std::move(_uniqueName), _context),
-	m_declaration(m_context.newVariable(currentName(), m_sort))
-{
-	solAssert(m_type->category() == frontend::Type::Category::Function, "");
-}
-
-SymbolicFunctionVariable::SymbolicFunctionVariable(
-	SortPointer _sort,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context),
-	m_declaration(m_context.newVariable(currentName(), m_sort))
-{
-	solAssert(m_sort->kind == Kind::Function, "");
-}
-
-smtutil::Expression SymbolicFunctionVariable::currentValue(frontend::Type const* _targetType) const
-{
-	return m_abstract.currentValue(_targetType);
-}
-
-smtutil::Expression SymbolicFunctionVariable::currentFunctionValue() const
-{
-	return m_declaration;
-}
-
-smtutil::Expression SymbolicFunctionVariable::valueAtIndex(unsigned _index) const
-{
-	return m_abstract.valueAtIndex(_index);
-}
-
-smtutil::Expression SymbolicFunctionVariable::functionValueAtIndex(unsigned _index) const
-{
-	return SymbolicVariable::valueAtIndex(_index);
-}
-
-smtutil::Expression SymbolicFunctionVariable::resetIndex()
-{
-	SymbolicVariable::resetIndex();
-	return m_abstract.resetIndex();
-}
-
-smtutil::Expression SymbolicFunctionVariable::setIndex(unsigned _index)
-{
-	SymbolicVariable::setIndex(_index);
-	return m_abstract.setIndex(_index);
-}
-
-smtutil::Expression SymbolicFunctionVariable::increaseIndex()
-{
-	++(*m_ssa);
-	resetDeclaration();
-	m_abstract.increaseIndex();
-	return m_abstract.currentValue();
-}
-
-smtutil::Expression SymbolicFunctionVariable::operator()(std::vector<smtutil::Expression> _arguments) const
-{
-	return m_declaration(_arguments);
-}
-
-void SymbolicFunctionVariable::resetDeclaration()
-{
-	m_declaration = m_context.newVariable(currentName(), m_sort);
-}
-
-SymbolicEnumVariable::SymbolicEnumVariable(
-	frontend::Type const* _type,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
-{
-	solAssert(isEnum(*m_type), "");
-}
-
-SymbolicTupleVariable::SymbolicTupleVariable(
-	frontend::Type const* _type,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
-{
-	solAssert(isTuple(*m_type), "");
-}
-
-SymbolicTupleVariable::SymbolicTupleVariable(
-	SortPointer _sort,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context)
-{
-	solAssert(m_sort->kind == Kind::Tuple, "");
-}
-
-smtutil::Expression SymbolicTupleVariable::currentValue(frontend::Type const* _targetType) const
-{
-	if (!_targetType || sort() == smtSort(*_targetType))
-		return SymbolicVariable::currentValue();
-
-	auto thisTuple = std::dynamic_pointer_cast<TupleSort>(sort());
-	auto otherTuple = std::dynamic_pointer_cast<TupleSort>(smtSort(*_targetType));
-	solAssert(thisTuple && otherTuple, "");
-	solAssert(thisTuple->components.size() == otherTuple->components.size(), "");
-	std::vector<smtutil::Expression> args;
-	for (size_t i = 0; i < thisTuple->components.size(); ++i)
-		args.emplace_back(component(i, type(), _targetType));
-	return smtutil::Expression::tuple_constructor(
-		smtutil::Expression(std::make_shared<smtutil::SortSort>(smtSort(*_targetType)), ""),
-		args
-	);
-}
-
-std::vector<SortPointer> const& SymbolicTupleVariable::components() const
-{
-	auto tupleSort = std::dynamic_pointer_cast<TupleSort>(m_sort);
-	solAssert(tupleSort, "");
-	return tupleSort->components;
-}
-
-smtutil::Expression SymbolicTupleVariable::component(
-	size_t _index,
-	frontend::Type const* _fromType,
-	frontend::Type const* _toType
-) const
-{
-	std::optional<smtutil::Expression> conversion = symbolicTypeConversion(_fromType, _toType);
-	if (conversion)
-		return *conversion;
-
-	return smtutil::Expression::tuple_get(currentValue(), _index);
-}
-
-SymbolicArrayVariable::SymbolicArrayVariable(
-	frontend::Type const* _type,
-	frontend::Type const* _originalType,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _originalType, std::move(_uniqueName), _context),
-	m_pair(
-		smtSort(*_type),
-		m_uniqueName + "_length_pair",
-		m_context
-	)
-{
-	solAssert(isArray(*m_type) || isMapping(*m_type), "");
-}
-
-SymbolicArrayVariable::SymbolicArrayVariable(
-	SortPointer _sort,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context),
-	m_pair(
-		std::make_shared<TupleSort>(
-			"array_length_pair",
-			std::vector<std::string>{"array", "length"},
-			std::vector<SortPointer>{m_sort, SortProvider::uintSort}
-		),
-		m_uniqueName + "_array_length_pair",
-		m_context
-	)
-{
-	solAssert(m_sort->kind == Kind::Array, "");
-}
-
-smtutil::Expression SymbolicArrayVariable::currentValue(frontend::Type const* _targetType) const
-{
-	std::optional<smtutil::Expression> conversion = symbolicTypeConversion(m_originalType, _targetType);
-	if (conversion)
-		return *conversion;
-
-	return m_pair.currentValue();
-}
-
-smtutil::Expression SymbolicArrayVariable::valueAtIndex(unsigned _index) const
-{
-	return m_pair.valueAtIndex(_index);
-}
-
-smtutil::Expression SymbolicArrayVariable::elements() const
-{
-	return m_pair.component(0);
-}
-
-smtutil::Expression SymbolicArrayVariable::length() const
-{
-	return m_pair.component(1);
-}
-
-SymbolicStructVariable::SymbolicStructVariable(
-	frontend::Type const* _type,
-	std::string _uniqueName,
-	EncodingContext& _context
-):
-	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
-{
-	solAssert(isNonRecursiveStruct(*m_type), "");
-	auto const* structType = dynamic_cast<StructType const*>(_type);
-	solAssert(structType, "");
-	auto const& members = structType->structDefinition().members();
-	for (unsigned i = 0; i < members.size(); ++i)
-	{
-		solAssert(members.at(i), "");
-		m_memberIndices.emplace(members.at(i)->name(), i);
-	}
-}
-
-smtutil::Expression SymbolicStructVariable::member(std::string const& _member) const
-{
-	return smtutil::Expression::tuple_get(currentValue(), m_memberIndices.at(_member));
-}
-
-smtutil::Expression SymbolicStructVariable::assignMember(std::string const& _member, smtutil::Expression const& _memberValue)
-{
-	auto const* structType = dynamic_cast<StructType const*>(m_type);
-	solAssert(structType, "");
-	auto const& structDef = structType->structDefinition();
-	auto const& structMembers = structDef.members();
-	auto oldMembers = applyMap(
-		structMembers,
-		[&](auto _member) { return member(_member->name()); }
-	);
-	increaseIndex();
-	for (unsigned i = 0; i < structMembers.size(); ++i)
-	{
-		auto const& memberName = structMembers.at(i)->name();
-		auto newMember = memberName == _member ? _memberValue : oldMembers.at(i);
-		m_context.addAssertion(member(memberName) == newMember);
-	}
-
-	return currentValue();
-}
-
-smtutil::Expression SymbolicStructVariable::assignAllMembers(std::vector<smtutil::Expression> const& _memberValues)
-{
-	auto structType = dynamic_cast<StructType const*>(m_type);
-	solAssert(structType, "");
-
-	auto const& structDef = structType->structDefinition();
-	auto const& structMembers = structDef.members();
-	solAssert(_memberValues.size() == structMembers.size(), "");
-	increaseIndex();
-	for (unsigned i = 0; i < _memberValues.size(); ++i)
-		m_context.addAssertion(_memberValues[i] == member(structMembers[i]->name()));
-
-	return currentValue();
-}
diff --git a/libsolidity/formal/SymbolicVariables.h b/libsolidity/formal/SymbolicVariables.h
deleted file mode 100644
index 9fd37fe2a161..000000000000
--- a/libsolidity/formal/SymbolicVariables.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/formal/SSAVariable.h>
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/TypeProvider.h>
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <map>
-#include <memory>
-
-namespace solidity::frontend::smt
-{
-
-class EncodingContext;
-class Type;
-
-/**
- * This abstract class represents the symbolic version of a program variable.
- */
-class SymbolicVariable
-{
-public:
-	SymbolicVariable(
-		frontend::Type const* _type,
-		frontend::Type const* _originalType,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-	SymbolicVariable(
-		smtutil::SortPointer _sort,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-
-	SymbolicVariable(SymbolicVariable&&) = default;
-
-	virtual ~SymbolicVariable() = default;
-
-	virtual smtutil::Expression currentValue(frontend::Type const* _targetType = nullptr) const;
-	std::string currentName() const;
-	virtual smtutil::Expression valueAtIndex(unsigned _index) const;
-	virtual std::string nameAtIndex(unsigned _index) const;
-	virtual smtutil::Expression resetIndex();
-	virtual smtutil::Expression setIndex(unsigned _index);
-	virtual smtutil::Expression increaseIndex();
-	virtual smtutil::Expression operator()(std::vector<smtutil::Expression> /*_arguments*/) const
-	{
-		solAssert(false, "Function application to non-function.");
-	}
-
-	unsigned index() const { return m_ssa->index(); }
-	unsigned& index() { return m_ssa->index(); }
-
-	smtutil::SortPointer const& sort() const { return m_sort; }
-	frontend::Type const* type() const { return m_type; }
-	frontend::Type const* originalType() const { return m_originalType; }
-
-protected:
-	std::string uniqueSymbol(unsigned _index) const;
-
-	/// SMT sort.
-	smtutil::SortPointer m_sort;
-	/// Solidity type, used for size and range in number types.
-	frontend::Type const* m_type;
-	/// Solidity original type, used for type conversion if necessary.
-	frontend::Type const* m_originalType;
-	std::string m_uniqueName;
-	EncodingContext& m_context;
-	std::unique_ptr<SSAVariable> m_ssa;
-};
-
-/**
- * Specialization of SymbolicVariable for Bool
- */
-class SymbolicBoolVariable: public SymbolicVariable
-{
-public:
-	SymbolicBoolVariable(
-		frontend::Type const* _type,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-};
-
-/**
- * Specialization of SymbolicVariable for Integers
- */
-class SymbolicIntVariable: public SymbolicVariable
-{
-public:
-	SymbolicIntVariable(
-		frontend::Type const* _type,
-		frontend::Type const* _originalType,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-};
-
-/**
- * Specialization of SymbolicVariable for Address
- */
-class SymbolicAddressVariable: public SymbolicIntVariable
-{
-public:
-	SymbolicAddressVariable(
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-};
-
-/**
- * Specialization of SymbolicVariable for FixedBytes
- */
-class SymbolicFixedBytesVariable: public SymbolicIntVariable
-{
-public:
-	SymbolicFixedBytesVariable(
-		frontend::Type const* _originalType,
-		unsigned _numBytes,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-};
-
-/**
- * Specialization of SymbolicVariable for FunctionType.
- * Besides containing a symbolic function declaration,
- * it also has an integer used as abstraction.
- * By default, the abstract representation is used when
- * values are requested, and the function declaration is
- * used when operator() is applied over arguments.
- */
-class SymbolicFunctionVariable: public SymbolicVariable
-{
-public:
-	SymbolicFunctionVariable(
-		frontend::Type const* _type,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-	SymbolicFunctionVariable(
-		smtutil::SortPointer _sort,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-
-	smtutil::Expression currentValue(frontend::Type const* _targetType = nullptr) const override;
-
-	// Explicit request the function declaration.
-	smtutil::Expression currentFunctionValue() const;
-
-	smtutil::Expression valueAtIndex(unsigned _index) const override;
-
-	// Explicit request the function declaration.
-	smtutil::Expression functionValueAtIndex(unsigned _index) const;
-
-	smtutil::Expression resetIndex() override;
-	smtutil::Expression setIndex(unsigned _index) override;
-	smtutil::Expression increaseIndex() override;
-
-	smtutil::Expression operator()(std::vector<smtutil::Expression> _arguments) const override;
-
-private:
-	/// Creates a new function declaration.
-	void resetDeclaration();
-
-	/// Stores the current function declaration.
-	smtutil::Expression m_declaration;
-
-	/// Abstract representation.
-	SymbolicIntVariable m_abstract{
-		TypeProvider::uint256(),
-		TypeProvider::uint256(),
-		m_uniqueName + "_abstract",
-		m_context
-	};
-};
-
-/**
- * Specialization of SymbolicVariable for Enum
- */
-class SymbolicEnumVariable: public SymbolicVariable
-{
-public:
-	SymbolicEnumVariable(
-		frontend::Type const* _type,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-};
-
-/**
- * Specialization of SymbolicVariable for Tuple
- */
-class SymbolicTupleVariable: public SymbolicVariable
-{
-public:
-	SymbolicTupleVariable(
-		frontend::Type const* _type,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-	SymbolicTupleVariable(
-		smtutil::SortPointer _sort,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-
-	smtutil::Expression currentValue(frontend::Type const* _targetType = nullptr) const override;
-
-	std::vector<smtutil::SortPointer> const& components() const;
-	smtutil::Expression component(
-		size_t _index,
-		frontend::Type const* _fromType = nullptr,
-		frontend::Type const* _toType = nullptr
-	) const;
-};
-
-/**
- * Specialization of SymbolicVariable for Array
- */
-class SymbolicArrayVariable: public SymbolicVariable
-{
-public:
-	SymbolicArrayVariable(
-		frontend::Type const* _type,
-		frontend::Type const* _originalTtype,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-	SymbolicArrayVariable(
-		smtutil::SortPointer _sort,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-
-	SymbolicArrayVariable(SymbolicArrayVariable&&) = default;
-
-	smtutil::Expression currentValue(frontend::Type const* _targetType = nullptr) const override;
-	smtutil::Expression valueAtIndex(unsigned _index) const override;
-	smtutil::Expression resetIndex() override { SymbolicVariable::resetIndex(); return m_pair.resetIndex(); }
-	smtutil::Expression setIndex(unsigned _index) override { SymbolicVariable::setIndex(_index); return m_pair.setIndex(_index); }
-	smtutil::Expression increaseIndex() override { SymbolicVariable::increaseIndex(); return m_pair.increaseIndex(); }
-	smtutil::Expression elements() const;
-	smtutil::Expression length() const;
-
-	smtutil::SortPointer tupleSort() { return m_pair.sort(); }
-
-private:
-	SymbolicTupleVariable m_pair;
-};
-
-/**
- * Specialization of SymbolicVariable for Struct.
- */
-class SymbolicStructVariable: public SymbolicVariable
-{
-public:
-	SymbolicStructVariable(
-		frontend::Type const* _type,
-		std::string _uniqueName,
-		EncodingContext& _context
-	);
-
-	/// @returns the symbolic expression representing _member.
-	smtutil::Expression member(std::string const& _member) const;
-
-	/// @returns the symbolic expression representing this struct
-	/// with field _member updated.
-	smtutil::Expression assignMember(std::string const& _member, smtutil::Expression const& _memberValue);
-
-	/// @returns the symbolic expression representing this struct
-	/// with all fields updated with the given values.
-	smtutil::Expression assignAllMembers(std::vector<smtutil::Expression> const& _memberValues);
-
-private:
-	std::map<std::string, unsigned> m_memberIndices;
-};
-
-
-
-}
diff --git a/libsolidity/formal/VariableUsage.cpp b/libsolidity/formal/VariableUsage.cpp
deleted file mode 100644
index ab7c425ae46c..000000000000
--- a/libsolidity/formal/VariableUsage.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/formal/VariableUsage.h>
-
-#include <libsolidity/formal/BMC.h>
-#include <libsolidity/formal/SMTEncoder.h>
-
-#include <range/v3/view.hpp>
-
-#include <algorithm>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::frontend::smt;
-
-std::set<VariableDeclaration const*> VariableUsage::touchedVariables(ASTNode const& _node, std::vector<CallableDeclaration const*> const& _outerCallstack)
-{
-	m_touchedVariables.clear();
-	m_callStack.clear();
-	m_callStack += _outerCallstack;
-	if (!m_callStack.empty())
-		m_lastCall = m_callStack.back();
-	_node.accept(*this);
-	return m_touchedVariables;
-}
-
-void VariableUsage::endVisit(Identifier const& _identifier)
-{
-	if (_identifier.annotation().willBeWrittenTo)
-		checkIdentifier(_identifier);
-}
-
-void VariableUsage::endVisit(IndexAccess const& _indexAccess)
-{
-	if (_indexAccess.annotation().willBeWrittenTo)
-	{
-		/// identifier.annotation().willBeWrittenTo == false, that's why we
-		/// need to check that before.
-		auto identifier = dynamic_cast<Identifier const*>(SMTEncoder::leftmostBase(_indexAccess));
-		if (identifier)
-			checkIdentifier(*identifier);
-	}
-}
-
-void VariableUsage::endVisit(FunctionCall const& _funCall)
-{
-	auto scopeContract = currentScopeContract();
-	if (m_inlineFunctionCalls(_funCall, scopeContract, m_currentContract))
-		if (auto funDef = SMTEncoder::functionCallToDefinition(_funCall, scopeContract, m_currentContract))
-			if (find(m_callStack.begin(), m_callStack.end(), funDef) == m_callStack.end())
-				funDef->accept(*this);
-}
-
-bool VariableUsage::visit(FunctionDefinition const& _function)
-{
-	m_callStack.push_back(&_function);
-	return true;
-}
-
-void VariableUsage::endVisit(FunctionDefinition const&)
-{
-	solAssert(!m_callStack.empty(), "");
-	m_callStack.pop_back();
-}
-
-void VariableUsage::endVisit(ModifierInvocation const& _modifierInv)
-{
-	auto const& modifierDef = dynamic_cast<ModifierDefinition const*>(_modifierInv.name().annotation().referencedDeclaration);
-	if (modifierDef)
-		modifierDef->accept(*this);
-}
-
-void VariableUsage::endVisit(PlaceholderStatement const&)
-{
-	solAssert(!m_callStack.empty(), "");
-	FunctionDefinition const* funDef = nullptr;
-	for (auto it = m_callStack.rbegin(); it != m_callStack.rend() && !funDef; ++it)
-		funDef = dynamic_cast<FunctionDefinition const*>(*it);
-	solAssert(funDef, "");
-	if (funDef->isImplemented())
-		funDef->body().accept(*this);
-}
-
-void VariableUsage::checkIdentifier(Identifier const& _identifier)
-{
-	Declaration const* declaration = _identifier.annotation().referencedDeclaration;
-	solAssert(declaration, "");
-	if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(declaration))
-	{
-		if (!varDecl->isLocalVariable() || (m_lastCall && varDecl->functionOrModifierDefinition() == m_lastCall))
-			m_touchedVariables.insert(varDecl);
-	}
-}
-
-ContractDefinition const* VariableUsage::currentScopeContract()
-{
-	for (auto&& f: m_callStack | ranges::views::reverse)
-		if (auto fun = dynamic_cast<FunctionDefinition const*>(f))
-			return fun->annotation().contract;
-	return nullptr;
-}
diff --git a/libsolidity/formal/VariableUsage.h b/libsolidity/formal/VariableUsage.h
deleted file mode 100644
index 4dc90f8c07a7..000000000000
--- a/libsolidity/formal/VariableUsage.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolidity/ast/ASTVisitor.h>
-
-#include <vector>
-#include <set>
-
-namespace solidity::frontend::smt
-{
-
-/**
- * This class computes information about which variables are modified in a certain subtree.
- */
-class VariableUsage: private ASTConstVisitor
-{
-public:
-	/// @param _outerCallstack the current callstack in the callers context.
-	std::set<VariableDeclaration const*> touchedVariables(ASTNode const& _node, std::vector<CallableDeclaration const*> const& _outerCallstack);
-
-	/// Sets whether to inline function calls.
-	void setFunctionInlining(std::function<bool(FunctionCall const&, ContractDefinition const*, ContractDefinition const*)> _inlineFunctionCalls) { m_inlineFunctionCalls = _inlineFunctionCalls; }
-
-	void setCurrentContract(ContractDefinition const& _contract) { m_currentContract = &_contract; }
-
-private:
-	void endVisit(Identifier const& _node) override;
-	void endVisit(IndexAccess const& _node) override;
-	void endVisit(FunctionCall const& _node) override;
-	bool visit(FunctionDefinition const& _node) override;
-	void endVisit(FunctionDefinition const& _node) override;
-	void endVisit(ModifierInvocation const& _node) override;
-	void endVisit(PlaceholderStatement const& _node) override;
-
-	/// Checks whether an identifier should be added to touchedVariables.
-	void checkIdentifier(Identifier const& _identifier);
-
-	ContractDefinition const* currentScopeContract();
-
-	std::set<VariableDeclaration const*> m_touchedVariables;
-	std::vector<CallableDeclaration const*> m_callStack;
-	CallableDeclaration const* m_lastCall = nullptr;
-	ContractDefinition const* m_currentContract = nullptr;
-
-	std::function<bool(FunctionCall const&, ContractDefinition const*, ContractDefinition const*)> m_inlineFunctionCalls = [](FunctionCall const&, ContractDefinition const*, ContractDefinition const*) { return false; };
-};
-
-}
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
deleted file mode 100644
index cf6e863bbbf2..000000000000
--- a/libsolidity/interface/ABI.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Utilities to handle the Contract ABI (https://docs.soliditylang.org/en/develop/abi-spec.html)
- */
-
-#include <libsolidity/interface/ABI.h>
-
-#include <libsolidity/ast/AST.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-namespace
-{
-bool anyDataStoredInStorage(TypePointers const& _pointers)
-{
-	for (Type const* pointer: _pointers)
-		if (pointer->dataStoredIn(DataLocation::Storage))
-			return true;
-
-	return false;
-}
-}
-
-Json::Value ABI::generate(ContractDefinition const& _contractDef)
-{
-	auto compare = [](Json::Value const& _a, Json::Value const& _b) -> bool {
-		return std::make_tuple(_a["type"], _a["name"]) < std::make_tuple(_b["type"], _b["name"]);
-	};
-	std::multiset<Json::Value, decltype(compare)> abi(compare);
-
-	for (auto it: _contractDef.interfaceFunctions())
-	{
-		if (_contractDef.isLibrary() && (
-			it.second->stateMutability() > StateMutability::View ||
-			anyDataStoredInStorage(it.second->parameterTypes() + it.second->returnParameterTypes())
-		))
-			continue;
-
-		FunctionType const* externalFunctionType = it.second->interfaceFunctionType();
-		solAssert(!!externalFunctionType, "");
-		Json::Value method{Json::objectValue};
-		method["type"] = "function";
-		method["name"] = it.second->declaration().name();
-		method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
-		method["inputs"] = formatTypeList(
-			externalFunctionType->parameterNames(),
-			externalFunctionType->parameterTypes(),
-			it.second->parameterTypes(),
-			_contractDef.isLibrary()
-		);
-		method["outputs"] = formatTypeList(
-			externalFunctionType->returnParameterNames(),
-			externalFunctionType->returnParameterTypes(),
-			it.second->returnParameterTypes(),
-			_contractDef.isLibrary()
-		);
-		abi.emplace(std::move(method));
-	}
-	FunctionDefinition const* constructor = _contractDef.constructor();
-	if (constructor && !_contractDef.abstract())
-	{
-		FunctionType constrType(*constructor);
-		FunctionType const* externalFunctionType = constrType.interfaceFunctionType();
-		solAssert(!!externalFunctionType, "");
-		Json::Value method{Json::objectValue};
-		method["type"] = "constructor";
-		method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
-		method["inputs"] = formatTypeList(
-			externalFunctionType->parameterNames(),
-			externalFunctionType->parameterTypes(),
-			constrType.parameterTypes(),
-			_contractDef.isLibrary()
-		);
-		abi.emplace(std::move(method));
-	}
-	for (auto const* fallbackOrReceive: {_contractDef.fallbackFunction(), _contractDef.receiveFunction()})
-		if (fallbackOrReceive)
-		{
-			auto const* externalFunctionType = FunctionType(*fallbackOrReceive).interfaceFunctionType();
-			solAssert(!!externalFunctionType, "");
-			Json::Value method{Json::objectValue};
-			method["type"] = TokenTraits::toString(fallbackOrReceive->kind());
-			method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
-			abi.emplace(std::move(method));
-		}
-	for (auto const& it: _contractDef.interfaceEvents())
-	{
-		Json::Value event{Json::objectValue};
-		event["type"] = "event";
-		event["name"] = it->name();
-		event["anonymous"] = it->isAnonymous();
-		Json::Value params{Json::arrayValue};
-		for (auto const& p: it->parameters())
-		{
-			Type const* type = p->annotation().type->interfaceType(false);
-			solAssert(type, "");
-			auto param = formatType(p->name(), *type, *p->annotation().type, false);
-			param["indexed"] = p->isIndexed();
-			params.append(std::move(param));
-		}
-		event["inputs"] = std::move(params);
-		abi.emplace(std::move(event));
-	}
-
-	for (ErrorDefinition const* error: _contractDef.interfaceErrors())
-	{
-		Json::Value errorJson{Json::objectValue};
-		errorJson["type"] = "error";
-		errorJson["name"] = error->name();
-		errorJson["inputs"] = Json::arrayValue;
-		for (auto const& p: error->parameters())
-		{
-			Type const* type = p->annotation().type->interfaceType(false);
-			solAssert(type, "");
-			errorJson["inputs"].append(
-				formatType(p->name(), *type, *p->annotation().type, false)
-			);
-		}
-		abi.emplace(std::move(errorJson));
-	}
-
-	Json::Value abiJson{Json::arrayValue};
-	for (auto& f: abi)
-		abiJson.append(std::move(f));
-	return abiJson;
-}
-
-Json::Value ABI::formatTypeList(
-	std::vector<std::string> const& _names,
-	std::vector<Type const*> const& _encodingTypes,
-	std::vector<Type const*> const& _solidityTypes,
-	bool _forLibrary
-)
-{
-	Json::Value params{Json::arrayValue};
-	solAssert(_names.size() == _encodingTypes.size(), "Names and types vector size does not match");
-	solAssert(_names.size() == _solidityTypes.size(), "");
-	for (unsigned i = 0; i < _names.size(); ++i)
-	{
-		solAssert(_encodingTypes[i], "");
-		params.append(formatType(_names[i], *_encodingTypes[i], *_solidityTypes[i], _forLibrary));
-	}
-	return params;
-}
-
-Json::Value ABI::formatType(
-	std::string const& _name,
-	Type const& _encodingType,
-	Type const& _solidityType,
-	bool _forLibrary
-)
-{
-	Json::Value ret{Json::objectValue};
-	ret["name"] = _name;
-	ret["internalType"] = _solidityType.toString(true);
-	std::string suffix = (_forLibrary && _encodingType.dataStoredIn(DataLocation::Storage)) ? " storage" : "";
-	if (_encodingType.isValueType() || (_forLibrary && _encodingType.dataStoredIn(DataLocation::Storage)))
-		ret["type"] = _encodingType.canonicalName() + suffix;
-	else if (ArrayType const* arrayType = dynamic_cast<ArrayType const*>(&_encodingType))
-	{
-		if (arrayType->isByteArrayOrString())
-			ret["type"] = _encodingType.canonicalName() + suffix;
-		else
-		{
-			std::string suffix;
-			if (arrayType->isDynamicallySized())
-				suffix = "[]";
-			else
-				suffix = std::string("[") + arrayType->length().str() + "]";
-			solAssert(arrayType->baseType(), "");
-			Json::Value subtype = formatType(
-				"",
-				*arrayType->baseType(),
-				*dynamic_cast<ArrayType const&>(_solidityType).baseType(),
-				_forLibrary
-			);
-			if (subtype.isMember("components"))
-			{
-				ret["type"] = subtype["type"].asString() + suffix;
-				ret["components"] = subtype["components"];
-			}
-			else
-				ret["type"] = subtype["type"].asString() + suffix;
-		}
-	}
-	else if (StructType const* structType = dynamic_cast<StructType const*>(&_encodingType))
-	{
-		ret["type"] = "tuple";
-		ret["components"] = Json::arrayValue;
-		for (auto const& member: structType->members(nullptr))
-		{
-			solAssert(member.type, "");
-			Type const* t = member.type->interfaceType(_forLibrary);
-			solAssert(t, "");
-			ret["components"].append(formatType(member.name, *t, *member.type, _forLibrary));
-		}
-	}
-	else
-		solAssert(false, "Invalid type.");
-	return ret;
-}
diff --git a/libsolidity/interface/ABI.h b/libsolidity/interface/ABI.h
deleted file mode 100644
index e956614497db..000000000000
--- a/libsolidity/interface/ABI.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Utilities to handle the Contract ABI (https://docs.soliditylang.org/en/develop/abi-spec.html)
- */
-
-#pragma once
-
-#include <json/json.h>
-#include <memory>
-#include <string>
-
-namespace solidity::frontend
-{
-
-// Forward declarations
-class ContractDefinition;
-class Type;
-
-class ABI
-{
-public:
-	/// Get the ABI Interface of the contract
-	/// @param _contractDef The contract definition
-	/// @return             A JSONrepresentation of the contract's ABI Interface
-	static Json::Value generate(ContractDefinition const& _contractDef);
-private:
-	/// @returns a json value suitable for a list of types in function input or output
-	/// parameters or other places. If @a _forLibrary is true, complex types are referenced
-	/// by name, otherwise they are anonymously expanded.
-	/// @a _solidityTypes is the list of original Solidity types where @a _encodingTypes is the list of
-	/// ABI types used for the actual encoding.
-	static Json::Value formatTypeList(
-		std::vector<std::string> const& _names,
-		std::vector<Type const*> const& _encodingTypes,
-		std::vector<Type const*> const& _solidityTypes,
-		bool _forLibrary
-	);
-	/// @returns a Json object with "name", "type", "internalType" and potentially
-	/// "components" keys, according to the ABI specification.
-	/// If it is possible to express the type as a single string, it is allowed to return a single string.
-	/// @a _solidityType is the original Solidity type and @a _encodingTypes is the
-	/// ABI type used for the actual encoding.
-	static Json::Value formatType(
-		std::string const& _name,
-		Type const& _encodingType,
-		Type const& _solidityType,
-		bool _forLibrary
-	);
-};
-
-}
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
deleted file mode 100644
index 14b335016395..000000000000
--- a/libsolidity/interface/CompilerStack.cpp
+++ /dev/null
@@ -1,1923 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @author Gav Wood <g@ethdev.com>
- * @date 2014
- * Full-stack compiler that converts a source code string to bytecode.
- */
-
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/ImportRemapper.h>
-
-#include <libsolidity/analysis/ControlFlowAnalyzer.h>
-#include <libsolidity/analysis/ControlFlowGraph.h>
-#include <libsolidity/analysis/ControlFlowRevertPruner.h>
-#include <libsolidity/analysis/ContractLevelChecker.h>
-#include <libsolidity/analysis/DeclarationTypeChecker.h>
-#include <libsolidity/analysis/DocStringAnalyser.h>
-#include <libsolidity/analysis/DocStringTagParser.h>
-#include <libsolidity/analysis/GlobalContext.h>
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/analysis/PostTypeChecker.h>
-#include <libsolidity/analysis/PostTypeContractLevelChecker.h>
-#include <libsolidity/analysis/StaticAnalyzer.h>
-#include <libsolidity/analysis/SyntaxChecker.h>
-#include <libsolidity/analysis/Scoper.h>
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/analysis/ViewPureChecker.h>
-#include <libsolidity/analysis/ImmutableValidator.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/ast/ASTJsonImporter.h>
-#include <libsolidity/codegen/Compiler.h>
-#include <libsolidity/formal/ModelChecker.h>
-#include <libsolidity/interface/ABI.h>
-#include <libsolidity/interface/Natspec.h>
-#include <libsolidity/interface/GasEstimator.h>
-#include <libsolidity/interface/StorageLayout.h>
-#include <libsolidity/interface/Version.h>
-#include <libsolidity/parsing/Parser.h>
-
-#include <libsolidity/experimental/analysis/Analysis.h>
-
-#include <libsolidity/codegen/ir/Common.h>
-#include <libsolidity/codegen/ir/IRGenerator.h>
-
-#include <libstdlib/stdlib.h>
-
-#include <libyul/YulString.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/AsmJsonConverter.h>
-#include <libyul/YulStack.h>
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SemVerHandler.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-
-#include <libsolutil/SwarmHash.h>
-#include <libsolutil/IpfsHash.h>
-#include <libsolutil/JSON.h>
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/FunctionSelector.h>
-
-#include <json/json.h>
-
-#include <boost/algorithm/string/replace.hpp>
-
-#include <range/v3/view/concat.hpp>
-#include <range/v3/view/map.hpp>
-
-#include <fmt/format.h>
-
-#include <utility>
-#include <map>
-#include <limits>
-#include <string>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::stdlib;
-using namespace std::string_literals;
-
-using solidity::util::errinfo_comment;
-
-static int g_compilerStackCounts = 0;
-
-CompilerStack::CompilerStack(ReadCallback::Callback _readFile):
-	m_readFile{std::move(_readFile)},
-	m_errorReporter{m_errorList}
-{
-	// Because TypeProvider is currently a singleton API, we must ensure that
-	// no more than one entity is actually using it at a time.
-	solAssert(g_compilerStackCounts == 0, "You shall not have another CompilerStack aside me.");
-	++g_compilerStackCounts;
-}
-
-CompilerStack::~CompilerStack()
-{
-	--g_compilerStackCounts;
-	TypeProvider::reset();
-}
-
-void CompilerStack::createAndAssignCallGraphs()
-{
-	for (Source const* source: m_sourceOrder)
-	{
-		if (!source->ast)
-			continue;
-
-		for (ContractDefinition const* contract: ASTNode::filteredNodes<ContractDefinition>(source->ast->nodes()))
-		{
-			ContractDefinitionAnnotation& annotation =
-				m_contracts.at(contract->fullyQualifiedName()).contract->annotation();
-
-			annotation.creationCallGraph = std::make_unique<CallGraph>(
-				FunctionCallGraphBuilder::buildCreationGraph(*contract)
-			);
-			annotation.deployedCallGraph = std::make_unique<CallGraph>(
-				FunctionCallGraphBuilder::buildDeployedGraph(
-					*contract,
-					**annotation.creationCallGraph
-				)
-			);
-
-			solAssert(annotation.contractDependencies.empty(), "contractDependencies expected to be empty?!");
-
-			annotation.contractDependencies = annotation.creationCallGraph->get()->bytecodeDependency;
-
-			for (auto const& [dependencyContract, referencee]: annotation.deployedCallGraph->get()->bytecodeDependency)
-				annotation.contractDependencies.emplace(dependencyContract, referencee);
-		}
-	}
-}
-
-void CompilerStack::findAndReportCyclicContractDependencies()
-{
-	// Cycles we found, used to avoid duplicate reports for the same reference
-	std::set<ASTNode const*, ASTNode::CompareByID> foundCycles;
-
-	for (Source const* source: m_sourceOrder)
-	{
-		if (!source->ast)
-			continue;
-
-		for (ContractDefinition const* contractDefinition: ASTNode::filteredNodes<ContractDefinition>(source->ast->nodes()))
-		{
-			util::CycleDetector<ContractDefinition> cycleDetector{[&](
-				ContractDefinition const& _contract,
-				util::CycleDetector<ContractDefinition>& _cycleDetector,
-				size_t _depth
-			)
-			{
-				// No specific reason for exactly that number, just a limit we're unlikely to hit.
-				if (_depth >= 256)
-					m_errorReporter.fatalTypeError(
-						7864_error,
-						_contract.location(),
-						"Contract dependencies exhausting cyclic dependency validator"
-					);
-
-				for (auto& [dependencyContract, referencee]: _contract.annotation().contractDependencies)
-					if (_cycleDetector.run(*dependencyContract))
-						return;
-			}};
-
-			ContractDefinition const* cycle = cycleDetector.run(*contractDefinition);
-
-			if (!cycle)
-				continue;
-
-			ASTNode const* referencee = contractDefinition->annotation().contractDependencies.at(cycle);
-
-			if (foundCycles.find(referencee) != foundCycles.end())
-				continue;
-
-			SecondarySourceLocation secondaryLocation{};
-			secondaryLocation.append("Referenced contract is here:"s, cycle->location());
-
-			m_errorReporter.typeError(
-				7813_error,
-				referencee->location(),
-				secondaryLocation,
-				"Circular reference to contract bytecode either via \"new\" or \"type(...).creationCode\" / \"type(...).runtimeCode\"."
-			);
-
-			foundCycles.emplace(referencee);
-		}
-	}
-}
-
-void CompilerStack::setRemappings(std::vector<ImportRemapper::Remapping> _remappings)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set remappings before parsing.");
-	for (auto const& remapping: _remappings)
-		solAssert(!remapping.prefix.empty(), "");
-	m_importRemapper.setRemappings(std::move(_remappings));
-}
-
-void CompilerStack::setViaIR(bool _viaIR)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set viaIR before parsing.");
-	m_viaIR = _viaIR;
-}
-
-void CompilerStack::setEVMVersion(langutil::EVMVersion _version)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set EVM version before parsing.");
-	m_evmVersion = _version;
-}
-
-void CompilerStack::setEOFVersion(std::optional<uint8_t> _version)
-{
-	if (m_stackState >= CompilationSuccessful)
-		solThrow(CompilerError, "Must set EOF version before compiling.");
-	if (_version && _version != 1)
-		solThrow(CompilerError, "Invalid EOF version.");
-	m_eofVersion = _version;
-}
-
-void CompilerStack::setModelCheckerSettings(ModelCheckerSettings _settings)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set model checking settings before parsing.");
-	m_modelCheckerSettings = _settings;
-}
-
-void CompilerStack::setLibraries(std::map<std::string, util::h160> const& _libraries)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set libraries before parsing.");
-	m_libraries = _libraries;
-}
-
-void CompilerStack::setOptimiserSettings(bool _optimize, size_t _runs)
-{
-	OptimiserSettings settings = _optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal();
-	settings.expectedExecutionsPerDeployment = _runs;
-	setOptimiserSettings(std::move(settings));
-}
-
-void CompilerStack::setOptimiserSettings(OptimiserSettings _settings)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set optimiser settings before parsing.");
-	m_optimiserSettings = std::move(_settings);
-}
-
-void CompilerStack::setRevertStringBehaviour(RevertStrings _revertStrings)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set revert std::string settings before parsing.");
-	solUnimplementedAssert(_revertStrings != RevertStrings::VerboseDebug);
-	m_revertStrings = _revertStrings;
-}
-
-void CompilerStack::useMetadataLiteralSources(bool _metadataLiteralSources)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set use literal sources before parsing.");
-	m_metadataLiteralSources = _metadataLiteralSources;
-}
-
-void CompilerStack::setMetadataHash(MetadataHash _metadataHash)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set metadata hash before parsing.");
-	m_metadataHash = _metadataHash;
-}
-
-void CompilerStack::selectDebugInfo(DebugInfoSelection _debugInfoSelection)
-{
-	if (m_stackState >= CompilationSuccessful)
-		BOOST_THROW_EXCEPTION(CompilerError() << util::errinfo_comment("Must select debug info components before compilation."));
-	m_debugInfoSelection = _debugInfoSelection;
-}
-
-void CompilerStack::addSMTLib2Response(h256 const& _hash, std::string const& _response)
-{
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must add SMTLib2 responses before parsing.");
-	m_smtlib2Responses[_hash] = _response;
-}
-
-void CompilerStack::reset(bool _keepSettings)
-{
-	m_stackState = Empty;
-	m_sources.clear();
-	m_smtlib2Responses.clear();
-	m_unhandledSMTLib2Queries.clear();
-	if (!_keepSettings)
-	{
-		m_importRemapper.clear();
-		m_libraries.clear();
-		m_viaIR = false;
-		m_evmVersion = langutil::EVMVersion();
-		m_modelCheckerSettings = ModelCheckerSettings{};
-		m_generateIR = false;
-		m_revertStrings = RevertStrings::Default;
-		m_optimiserSettings = OptimiserSettings::minimal();
-		m_metadataLiteralSources = false;
-		m_metadataFormat = defaultMetadataFormat();
-		m_metadataHash = MetadataHash::IPFS;
-		m_stopAfter = State::CompilationSuccessful;
-	}
-	m_experimentalAnalysis.reset();
-	m_globalContext.reset();
-	m_sourceOrder.clear();
-	m_contracts.clear();
-	m_errorReporter.clear();
-	TypeProvider::reset();
-}
-
-void CompilerStack::setSources(StringMap _sources)
-{
-	if (m_stackState == SourcesSet)
-		solThrow(CompilerError, "Cannot change sources once set.");
-	if (m_stackState != Empty)
-		solThrow(CompilerError, "Must set sources before parsing.");
-	for (auto source: _sources)
-		m_sources[source.first].charStream = std::make_unique<CharStream>(/*content*/std::move(source.second), /*name*/source.first);
-	m_stackState = SourcesSet;
-}
-
-bool CompilerStack::parse()
-{
-	if (m_stackState != SourcesSet)
-		solThrow(CompilerError, "Must call parse only after the SourcesSet state.");
-	m_errorReporter.clear();
-
-	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
-		m_errorReporter.warning(3805_error, "This is a pre-release compiler version, please do not use it in production.");
-
-	Parser parser{m_errorReporter, m_evmVersion};
-
-	std::vector<std::string> sourcesToParse;
-	for (auto const& s: m_sources)
-		sourcesToParse.push_back(s.first);
-
-	for (size_t i = 0; i < sourcesToParse.size(); ++i)
-	{
-		std::string const& path = sourcesToParse[i];
-		Source& source = m_sources[path];
-		source.ast = parser.parse(*source.charStream);
-		if (!source.ast)
-			solAssert(Error::containsErrors(m_errorReporter.errors()), "Parser returned null but did not report error.");
-		else
-		{
-			source.ast->annotation().path = path;
-
-			for (auto const& import: ASTNode::filteredNodes<ImportDirective>(source.ast->nodes()))
-			{
-				solAssert(!import->path().empty(), "Import path cannot be empty.");
-				// Check whether the import directive is for the standard library,
-				// and if yes, add specified file to source units to be parsed.
-				auto it = stdlib::sources.find(import->path());
-				if (it != stdlib::sources.end())
-				{
-					auto [name, content] = *it;
-					m_sources[name].charStream = std::make_unique<CharStream>(content, name);
-					sourcesToParse.push_back(name);
-				}
-
-				// The current value of `path` is the absolute path as seen from this source file.
-				// We first have to apply remappings before we can store the actual absolute path
-				// as seen globally.
-				import->annotation().absolutePath = applyRemapping(util::absolutePath(
-					import->path(),
-					path
-				), path);
-			}
-
-			if (m_stopAfter >= ParsedAndImported)
-				for (auto const& newSource: loadMissingSources(*source.ast))
-				{
-					std::string const& newPath = newSource.first;
-					std::string const& newContents = newSource.second;
-					m_sources[newPath].charStream = std::make_shared<CharStream>(newContents, newPath);
-					sourcesToParse.push_back(newPath);
-				}
-		}
-	}
-
-	if (Error::containsErrors(m_errorReporter.errors()))
-		return false;
-
-	m_stackState = (m_stopAfter <= Parsed ? Parsed : ParsedAndImported);
-	storeContractDefinitions();
-	return true;
-}
-
-void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _sources)
-{
-	if (m_stackState != Empty)
-		solThrow(CompilerError, "Must call importASTs only before the SourcesSet state.");
-	std::map<std::string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
-	for (auto& src: reconstructedSources)
-	{
-		std::string const& path = src.first;
-		Source source;
-		source.ast = src.second;
-		source.charStream = std::make_shared<CharStream>(
-			util::jsonCompactPrint(_sources.at(src.first)),
-			src.first,
-			true // imported from AST
-		);
-		m_sources[path] = std::move(source);
-	}
-	m_stackState = ParsedAndImported;
-	m_compilationSourceType = CompilationSourceType::SolidityAST;
-
-	storeContractDefinitions();
-}
-
-bool CompilerStack::analyze()
-{
-	if (m_stackState != ParsedAndImported)
-		solThrow(CompilerError, "Must call analyze only after parsing was successful.");
-
-	if (!resolveImports())
-		return false;
-
-	for (Source const* source: m_sourceOrder)
-		if (source->ast)
-			Scoper::assignScopes(*source->ast);
-
-	bool noErrors = true;
-
-	try
-	{
-		bool experimentalSolidity = !m_sourceOrder.empty() && m_sourceOrder.front()->ast->experimentalSolidity();
-
-		SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
-				noErrors = false;
-
-		m_globalContext = std::make_shared<GlobalContext>();
-		// We need to keep the same resolver during the whole process.
-		NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !resolver.registerDeclarations(*source->ast))
-				return false;
-
-		std::map<std::string, SourceUnit const*> sourceUnitsByName;
-		for (auto& source: m_sources)
-			sourceUnitsByName[source.first] = source.second.ast.get();
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !resolver.performImports(*source->ast, sourceUnitsByName))
-				return false;
-
-		resolver.warnHomonymDeclarations();
-
-		DocStringTagParser docStringTagParser(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !docStringTagParser.parseDocStrings(*source->ast))
-				noErrors = false;
-
-		// Requires DocStringTagParser
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !resolver.resolveNamesAndTypes(*source->ast))
-				return false;
-
-		if (experimentalSolidity)
-		{
-			if (!analyzeExperimental())
-				noErrors = false;
-		}
-		else if (!analyzeLegacy(noErrors))
-			noErrors = false;
-	}
-	catch (FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-		noErrors = false;
-	}
-
-	if (!noErrors)
-		return false;
-
-	m_stackState = AnalysisSuccessful;
-	return true;
-}
-
-
-bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
-{
-	bool noErrors = _noErrorsSoFar;
-
-	DeclarationTypeChecker declarationTypeChecker(m_errorReporter, m_evmVersion);
-	for (Source const* source: m_sourceOrder)
-		if (source->ast && !declarationTypeChecker.check(*source->ast))
-			return false;
-
-	// Requires DeclarationTypeChecker to have run
-	DocStringTagParser docStringTagParser(m_errorReporter);
-	for (Source const* source: m_sourceOrder)
-		if (source->ast && !docStringTagParser.validateDocStringsUsingTypes(*source->ast))
-			noErrors = false;
-
-	// Next, we check inheritance, overrides, function collisions and other things at
-	// contract or function level.
-	// This also calculates whether a contract is abstract, which is needed by the
-	// type checker.
-	ContractLevelChecker contractLevelChecker(m_errorReporter);
-
-	for (Source const* source: m_sourceOrder)
-		if (auto sourceAst = source->ast)
-			noErrors = contractLevelChecker.check(*sourceAst);
-
-	// Now we run full type checks that go down to the expression level. This
-	// cannot be done earlier, because we need cross-contract types and information
-	// about whether a contract is abstract for the `new` expression.
-	// This populates the `type` annotation for all expressions.
-	//
-	// Note: this does not resolve overloaded functions. In order to do that, types of arguments are needed,
-	// which is only done one step later.
-	TypeChecker typeChecker(m_evmVersion, m_errorReporter);
-	for (Source const* source: m_sourceOrder)
-		if (source->ast && !typeChecker.checkTypeRequirements(*source->ast))
-			noErrors = false;
-
-	if (noErrors)
-	{
-		// Requires ContractLevelChecker and TypeChecker
-		DocStringAnalyser docStringAnalyser(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !docStringAnalyser.analyseDocStrings(*source->ast))
-				noErrors = false;
-	}
-
-	if (noErrors)
-	{
-		// Checks that can only be done when all types of all AST nodes are known.
-		PostTypeChecker postTypeChecker(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !postTypeChecker.check(*source->ast))
-				noErrors = false;
-		if (!postTypeChecker.finalize())
-			noErrors = false;
-	}
-
-	// Create & assign callgraphs and check for contract dependency cycles
-	if (noErrors)
-	{
-		createAndAssignCallGraphs();
-		annotateInternalFunctionIDs();
-		findAndReportCyclicContractDependencies();
-	}
-
-	if (noErrors)
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !PostTypeContractLevelChecker{m_errorReporter}.check(*source->ast))
-				noErrors = false;
-
-	// Check that immutable variables are never read in c'tors and assigned
-	// exactly once
-	if (noErrors)
-		for (Source const* source: m_sourceOrder)
-			if (source->ast)
-				for (ASTPointer<ASTNode> const& node: source->ast->nodes())
-					if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-						ImmutableValidator(m_errorReporter, *contract).analyze();
-
-	if (noErrors)
-	{
-		// Control flow graph generator and analyzer. It can check for issues such as
-		// variable is used before it is assigned to.
-		CFG cfg(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !cfg.constructFlow(*source->ast))
-				noErrors = false;
-
-		if (noErrors)
-		{
-			ControlFlowRevertPruner pruner(cfg);
-			pruner.run();
-
-			ControlFlowAnalyzer controlFlowAnalyzer(cfg, m_errorReporter);
-			if (!controlFlowAnalyzer.run())
-				noErrors = false;
-		}
-	}
-
-	if (noErrors)
-	{
-		// Checks for common mistakes. Only generates warnings.
-		StaticAnalyzer staticAnalyzer(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !staticAnalyzer.analyze(*source->ast))
-				noErrors = false;
-	}
-
-	if (noErrors)
-	{
-		// Check for state mutability in every function.
-		std::vector<ASTPointer<ASTNode>> ast;
-		for (Source const* source: m_sourceOrder)
-			if (source->ast)
-				ast.push_back(source->ast);
-
-		if (!ViewPureChecker(ast, m_errorReporter).check())
-			noErrors = false;
-	}
-
-	if (noErrors)
-	{
-		// Run SMTChecker
-
-		auto allSources = util::applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; });
-		if (ModelChecker::isPragmaPresent(allSources))
-			m_modelCheckerSettings.engine = ModelCheckerEngine::All();
-
-		// m_modelCheckerSettings is spread to engines and solver interfaces,
-		// so we need to check whether the enabled ones are available before building the classes.
-		if (m_modelCheckerSettings.engine.any())
-			m_modelCheckerSettings.solvers = ModelChecker::checkRequestedSolvers(m_modelCheckerSettings.solvers, m_errorReporter);
-
-		ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
-		modelChecker.checkRequestedSourcesAndContracts(allSources);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast)
-				modelChecker.analyze(*source->ast);
-		m_unhandledSMTLib2Queries += modelChecker.unhandledQueries();
-	}
-
-	return noErrors;
-}
-
-bool CompilerStack::analyzeExperimental()
-{
-	solAssert(!m_experimentalAnalysis);
-	m_experimentalAnalysis = std::make_unique<experimental::Analysis>(m_errorReporter);
-	std::vector<std::shared_ptr<SourceUnit const>> sourceAsts;
-	for (Source const* source: m_sourceOrder)
-		if (source->ast)
-			sourceAsts.emplace_back(source->ast);
-	return m_experimentalAnalysis->check(sourceAsts);
-}
-
-bool CompilerStack::parseAndAnalyze(State _stopAfter)
-{
-	m_stopAfter = _stopAfter;
-
-	bool success = parse();
-	if (m_stackState >= m_stopAfter)
-		return success;
-	if (success)
-		success = analyze();
-	return success;
-}
-
-bool CompilerStack::isRequestedSource(std::string const& _sourceName) const
-{
-	return
-		m_requestedContractNames.empty() ||
-		m_requestedContractNames.count("") ||
-		m_requestedContractNames.count(_sourceName);
-}
-
-bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) const
-{
-	/// In case nothing was specified in outputSelection.
-	if (m_requestedContractNames.empty())
-		return true;
-
-	for (auto const& key: std::vector<std::string>{"", _contract.sourceUnitName()})
-	{
-		auto const& it = m_requestedContractNames.find(key);
-		if (it != m_requestedContractNames.end())
-			if (it->second.count(_contract.name()) || it->second.count(""))
-				return true;
-	}
-
-	return false;
-}
-
-bool CompilerStack::compile(State _stopAfter)
-{
-	m_stopAfter = _stopAfter;
-	if (m_stackState < AnalysisSuccessful)
-		if (!parseAndAnalyze(_stopAfter))
-			return false;
-
-	if (m_stackState >= m_stopAfter)
-		return true;
-
-	// Only compile contracts individually which have been requested.
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> otherCompilers;
-
-	for (Source const* source: m_sourceOrder)
-		for (ASTPointer<ASTNode> const& node: source->ast->nodes())
-			if (auto contract = dynamic_cast<ContractDefinition const*>(node.get()))
-				if (isRequestedContract(*contract))
-				{
-					try
-					{
-						if (m_viaIR || m_generateIR)
-							generateIR(*contract);
-						if (m_generateEvmBytecode)
-						{
-							if (m_viaIR)
-								generateEVMFromIR(*contract);
-							else
-							{
-								if (m_experimentalAnalysis)
-									solThrow(CompilerError, "Legacy codegen after experimental analysis is unsupported.");
-								compileContract(*contract, otherCompilers);
-							}
-						}
-					}
-					catch (Error const& _error)
-					{
-						if (_error.type() != Error::Type::CodeGenerationError)
-							throw;
-						m_errorReporter.error(_error.errorId(), _error.type(), SourceLocation(), _error.what());
-						return false;
-					}
-					catch (UnimplementedFeatureError const& _unimplementedError)
-					{
-						if (
-							SourceLocation const* sourceLocation =
-							boost::get_error_info<langutil::errinfo_sourceLocation>(_unimplementedError)
-						)
-						{
-							std::string const* comment = _unimplementedError.comment();
-							m_errorReporter.error(
-								1834_error,
-								Error::Type::CodeGenerationError,
-								*sourceLocation,
-								fmt::format(
-									"Unimplemented feature error {} in {}",
-									(comment && !comment->empty()) ? ": " + *comment : "",
-									_unimplementedError.lineInfo()
-								)
-							);
-							return false;
-						}
-						else
-							throw;
-					}
-				}
-	m_stackState = CompilationSuccessful;
-	this->link();
-	return true;
-}
-
-void CompilerStack::link()
-{
-	solAssert(m_stackState >= CompilationSuccessful, "");
-	for (auto& contract: m_contracts)
-	{
-		contract.second.object.link(m_libraries);
-		contract.second.runtimeObject.link(m_libraries);
-	}
-}
-
-std::vector<std::string> CompilerStack::contractNames() const
-{
-	if (m_stackState < Parsed)
-		solThrow(CompilerError, "Parsing was not successful.");
-	std::vector<std::string> contractNames;
-	for (auto const& contract: m_contracts)
-		contractNames.push_back(contract.first);
-	return contractNames;
-}
-
-std::string const CompilerStack::lastContractName(std::optional<std::string> const& _sourceName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Parsing was not successful.");
-	// try to find some user-supplied contract
-	std::string contractName;
-	for (auto const& it: m_sources)
-		if (_sourceName.value_or(it.first) == it.first)
-			for (auto const* contract: ASTNode::filteredNodes<ContractDefinition>(it.second.ast->nodes()))
-				contractName = contract->fullyQualifiedName();
-	return contractName;
-}
-
-evmasm::AssemblyItems const* CompilerStack::assemblyItems(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& currentContract = contract(_contractName);
-	return currentContract.evmAssembly ? &currentContract.evmAssembly->items() : nullptr;
-}
-
-evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& currentContract = contract(_contractName);
-	return currentContract.evmRuntimeAssembly ? &currentContract.evmRuntimeAssembly->items() : nullptr;
-}
-
-Json::Value CompilerStack::generatedSources(std::string const& _contractName, bool _runtime) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& c = contract(_contractName);
-	util::LazyInit<Json::Value const> const& sources =
-		_runtime ?
-		c.runtimeGeneratedSources :
-		c.generatedSources;
-	return sources.init([&]{
-		Json::Value sources{Json::arrayValue};
-		// If there is no compiler, then no bytecode was generated and thus no
-		// sources were generated (or we compiled "via IR").
-		if (c.compiler)
-		{
-			solAssert(!m_viaIR, "");
-			std::string source =
-				_runtime ?
-				c.compiler->runtimeGeneratedYulUtilityCode() :
-				c.compiler->generatedYulUtilityCode();
-			if (!source.empty())
-			{
-				std::string sourceName = CompilerContext::yulUtilityFileName();
-				unsigned sourceIndex = sourceIndices()[sourceName];
-				ErrorList errors;
-				ErrorReporter errorReporter(errors);
-				CharStream charStream(source, sourceName);
-				yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
-				std::shared_ptr<yul::Block> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
-				solAssert(parserResult, "");
-				sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(*parserResult);
-				sources[0]["name"] = sourceName;
-				sources[0]["id"] = sourceIndex;
-				sources[0]["language"] = "Yul";
-				sources[0]["contents"] = std::move(source);
-			}
-		}
-		return sources;
-	});
-}
-
-std::string const* CompilerStack::sourceMapping(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& c = contract(_contractName);
-	if (!c.sourceMapping)
-	{
-		if (auto items = assemblyItems(_contractName))
-			c.sourceMapping.emplace(evmasm::AssemblyItem::computeSourceMapping(*items, sourceIndices()));
-	}
-	return c.sourceMapping ? &*c.sourceMapping : nullptr;
-}
-
-std::string const* CompilerStack::runtimeSourceMapping(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& c = contract(_contractName);
-	if (!c.runtimeSourceMapping)
-	{
-		if (auto items = runtimeAssemblyItems(_contractName))
-			c.runtimeSourceMapping.emplace(
-				evmasm::AssemblyItem::computeSourceMapping(*items, sourceIndices())
-			);
-	}
-	return c.runtimeSourceMapping ? &*c.runtimeSourceMapping : nullptr;
-}
-
-std::string const CompilerStack::filesystemFriendlyName(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "No compiled contracts found.");
-
-	// Look up the contract (by its fully-qualified name)
-	Contract const& matchContract = m_contracts.at(_contractName);
-	// Check to see if it could collide on name
-	for (auto const& contract: m_contracts)
-	{
-		if (contract.second.contract->name() == matchContract.contract->name() &&
-				contract.second.contract != matchContract.contract)
-		{
-			// If it does, then return its fully-qualified name, made fs-friendly
-			std::string friendlyName = boost::algorithm::replace_all_copy(_contractName, "/", "_");
-			boost::algorithm::replace_all(friendlyName, ":", "_");
-			boost::algorithm::replace_all(friendlyName, ".", "_");
-			return friendlyName;
-		}
-	}
-	// If no collision, return the contract's name
-	return matchContract.contract->name();
-}
-
-std::string const& CompilerStack::yulIR(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).yulIR;
-}
-
-Json::Value const& CompilerStack::yulIRAst(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).yulIRAst;
-}
-
-std::string const& CompilerStack::yulIROptimized(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).yulIROptimized;
-}
-
-Json::Value const& CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).yulIROptimizedAst;
-}
-
-evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).object;
-}
-
-evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).runtimeObject;
-}
-
-/// TODO: cache this std::string
-std::string CompilerStack::assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& currentContract = contract(_contractName);
-	if (currentContract.evmAssembly)
-		return currentContract.evmAssembly->assemblyString(m_debugInfoSelection, _sourceCodes);
-	else
-		return std::string();
-}
-
-/// TODO: cache the JSON
-Json::Value CompilerStack::assemblyJSON(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	Contract const& currentContract = contract(_contractName);
-	if (currentContract.evmAssembly)
-		return currentContract.evmAssembly->assemblyJSON(sourceIndices());
-	else
-		return Json::Value();
-}
-
-std::vector<std::string> CompilerStack::sourceNames() const
-{
-	return ranges::to<std::vector>(m_sources | ranges::views::keys);
-}
-
-std::map<std::string, unsigned> CompilerStack::sourceIndices() const
-{
-	std::map<std::string, unsigned> indices;
-	unsigned index = 0;
-	for (auto const& s: m_sources)
-		indices[s.first] = index++;
-	solAssert(!indices.count(CompilerContext::yulUtilityFileName()), "");
-	indices[CompilerContext::yulUtilityFileName()] = index++;
-	return indices;
-}
-
-Json::Value const& CompilerStack::contractABI(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	return contractABI(contract(_contractName));
-}
-
-Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
-	return _contract.abi.init([&]{ return ABI::generate(*_contract.contract); });
-}
-
-Json::Value const& CompilerStack::storageLayout(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	return storageLayout(contract(_contractName));
-}
-
-Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
-	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
-}
-
-Json::Value const& CompilerStack::natspecUser(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	return natspecUser(contract(_contractName));
-}
-
-Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
-	return _contract.userDocumentation.init([&]{ return Natspec::userDocumentation(*_contract.contract); });
-}
-
-Json::Value const& CompilerStack::natspecDev(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	return natspecDev(contract(_contractName));
-}
-
-Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
-	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
-}
-
-Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	Json::Value interfaceSymbols(Json::objectValue);
-	// Always have a methods object
-	interfaceSymbols["methods"] = Json::objectValue;
-
-	for (auto const& it: contractDefinition(_contractName).interfaceFunctions())
-		interfaceSymbols["methods"][it.second->externalSignature()] = it.first.hex();
-	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
-	{
-		std::string signature = error->functionType(true)->externalSignature();
-		interfaceSymbols["errors"][signature] = util::toHex(toCompactBigEndian(util::selectorFromSignatureU32(signature), 4));
-	}
-
-	for (EventDefinition const* event: ranges::concat_view(
-		contractDefinition(_contractName).definedInterfaceEvents(),
-		contractDefinition(_contractName).usedInterfaceEvents()
-	))
-		if (!event->isAnonymous())
-		{
-			std::string signature = event->functionType(true)->externalSignature();
-			interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(util::keccak256(signature))));
-		}
-
-	return interfaceSymbols;
-}
-
-bytes CompilerStack::cborMetadata(std::string const& _contractName, bool _forIR) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	return createCBORMetadata(contract(_contractName), _forIR);
-}
-
-std::string const& CompilerStack::metadata(Contract const& _contract) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
-	return _contract.metadata.init([&]{ return createMetadata(_contract, m_viaIR); });
-}
-
-CharStream const& CompilerStack::charStream(std::string const& _sourceName) const
-{
-	if (m_stackState < SourcesSet)
-		solThrow(CompilerError, "No sources set.");
-
-	solAssert(source(_sourceName).charStream, "");
-
-	return *source(_sourceName).charStream;
-}
-
-SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
-{
-	if (m_stackState < Parsed)
-		solThrow(CompilerError, "Parsing not yet performed.");
-	if (!source(_sourceName).ast)
-		solThrow(CompilerError, "Parsing was not successful.");
-
-	return *source(_sourceName).ast;
-}
-
-ContractDefinition const& CompilerStack::contractDefinition(std::string const& _contractName) const
-{
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	return *contract(_contractName).contract;
-}
-
-size_t CompilerStack::functionEntryPoint(
-	std::string const& _contractName,
-	FunctionDefinition const& _function
-) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	for (auto&& [name, data]: contract(_contractName).runtimeObject.functionDebugData)
-		if (data.sourceID == _function.id())
-			if (data.instructionIndex)
-				return *data.instructionIndex;
-	return 0;
-}
-
-h256 const& CompilerStack::Source::keccak256() const
-{
-	if (keccak256HashCached == h256{})
-		keccak256HashCached = util::keccak256(charStream->source());
-	return keccak256HashCached;
-}
-
-h256 const& CompilerStack::Source::swarmHash() const
-{
-	if (swarmHashCached == h256{})
-		swarmHashCached = util::bzzr1Hash(charStream->source());
-	return swarmHashCached;
-}
-
-std::string const& CompilerStack::Source::ipfsUrl() const
-{
-	if (ipfsUrlCached.empty())
-		ipfsUrlCached = "dweb:/ipfs/" + util::ipfsHashBase58(charStream->source());
-	return ipfsUrlCached;
-}
-
-StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
-{
-	solAssert(m_stackState < ParsedAndImported, "");
-	StringMap newSources;
-	try
-	{
-		for (auto const& node: _ast.nodes())
-			if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
-			{
-				std::string const& importPath = *import->annotation().absolutePath;
-
-				if (m_sources.count(importPath) || newSources.count(importPath))
-					continue;
-
-				ReadCallback::Result result{false, std::string("File not supplied initially.")};
-				if (m_readFile)
-					result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), importPath);
-
-				if (result.success)
-					newSources[importPath] = result.responseOrErrorMessage;
-				else
-				{
-					m_errorReporter.parserError(
-						6275_error,
-						import->location(),
-						std::string("Source \"" + importPath + "\" not found: " + result.responseOrErrorMessage)
-					);
-					continue;
-				}
-			}
-	}
-	catch (FatalError const&)
-	{
-		solAssert(m_errorReporter.hasErrors(), "");
-	}
-	return newSources;
-}
-
-std::string CompilerStack::applyRemapping(std::string const& _path, std::string const& _context)
-{
-	solAssert(m_stackState < ParsedAndImported, "");
-	return m_importRemapper.apply(_path, _context);
-}
-
-bool CompilerStack::resolveImports()
-{
-	solAssert(m_stackState == ParsedAndImported, "");
-
-	// topological sorting (depth first search) of the import graph, cutting potential cycles
-	std::vector<Source const*> sourceOrder;
-	std::set<Source const*> sourcesSeen;
-
-	std::function<void(Source const*)> toposort = [&](Source const* _source)
-	{
-		if (sourcesSeen.count(_source))
-			return;
-		sourcesSeen.insert(_source);
-		solAssert(_source->ast);
-		for (ASTPointer<ASTNode> const& node: _source->ast->nodes())
-			if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
-			{
-				std::string const& path = *import->annotation().absolutePath;
-				solAssert(m_sources.count(path), "");
-				import->annotation().sourceUnit = m_sources[path].ast.get();
-				toposort(&m_sources[path]);
-			}
-		sourceOrder.push_back(_source);
-	};
-
-	std::vector<PragmaDirective const*> experimentalPragmaDirectives;
-	for (auto const& sourcePair: m_sources)
-	{
-		if (isRequestedSource(sourcePair.first))
-			toposort(&sourcePair.second);
-		if (sourcePair.second.ast && sourcePair.second.ast->experimentalSolidity())
-			for (ASTPointer<ASTNode> const& node: sourcePair.second.ast->nodes())
-				if (PragmaDirective const* pragma = dynamic_cast<PragmaDirective*>(node.get()))
-					if (pragma->literals().size() >=2 && pragma->literals()[0] == "experimental" && pragma->literals()[1] == "solidity")
-					{
-						experimentalPragmaDirectives.push_back(pragma);
-						break;
-					}
-	}
-
-	if (!experimentalPragmaDirectives.empty() && experimentalPragmaDirectives.size() != m_sources.size())
-	{
-		for (auto &&pragma: experimentalPragmaDirectives)
-			m_errorReporter.parserError(
-					2141_error,
-					pragma->location(),
-					"File declares \"pragma experimental solidity\". If you want to enable the experimental mode, all source units must include the pragma."
-			);
-		return false;
-	}
-
-	swap(m_sourceOrder, sourceOrder);
-	return true;
-}
-
-void CompilerStack::storeContractDefinitions()
-{
-	for (auto const& pair: m_sources)
-		if (pair.second.ast)
-			for (
-				ContractDefinition const* contract:
-				ASTNode::filteredNodes<ContractDefinition>(pair.second.ast->nodes())
-			)
-			{
-				std::string fullyQualifiedName = *pair.second.ast->annotation().path + ":" + contract->name();
-				// Note that we now reference contracts by their fully qualified names, and
-				// thus contracts can only conflict if declared in the same source file. This
-				// should already cause a double-declaration error elsewhere.
-				if (!m_contracts.count(fullyQualifiedName))
-					m_contracts[fullyQualifiedName].contract = contract;
-			}
-}
-
-void CompilerStack::annotateInternalFunctionIDs()
-{
-	for (Source const* source: m_sourceOrder)
-	{
-		if (!source->ast)
-			continue;
-
-		for (ContractDefinition const* contract: ASTNode::filteredNodes<ContractDefinition>(source->ast->nodes()))
-		{
-			uint64_t internalFunctionID = 1;
-			ContractDefinitionAnnotation& annotation = contract->annotation();
-
-			if (auto const* deployTimeInternalDispatch = util::valueOrNullptr((*annotation.deployedCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
-				for (auto const& node: *deployTimeInternalDispatch)
-					if (auto const* callable = std::get_if<CallableDeclaration const*>(&node))
-						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
-						{
-							solAssert(contract->annotation().internalFunctionIDs.count(function) == 0);
-							contract->annotation().internalFunctionIDs[function] = internalFunctionID++;
-						}
-			if (auto const* creationTimeInternalDispatch = util::valueOrNullptr((*annotation.creationCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
-				for (auto const& node: *creationTimeInternalDispatch)
-					if (auto const* callable = std::get_if<CallableDeclaration const*>(&node))
-						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
-							// Make sure the function already got an ID since it also occurs in the deploy-time internal dispatch.
-							solAssert(contract->annotation().internalFunctionIDs.count(function) != 0);
-		}
-	}
-}
-
-namespace
-{
-bool onlySafeExperimentalFeaturesActivated(std::set<ExperimentalFeature> const& features)
-{
-	for (auto const feature: features)
-		if (!ExperimentalFeatureWithoutWarning.count(feature))
-			return false;
-	return true;
-}
-}
-
-void CompilerStack::assembleYul(
-	ContractDefinition const& _contract,
-	std::shared_ptr<evmasm::Assembly> _assembly,
-	std::shared_ptr<evmasm::Assembly> _runtimeAssembly
-)
-{
-	solAssert(m_stackState >= AnalysisSuccessful, "");
-
-	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
-
-	compiledContract.evmAssembly = _assembly;
-	solAssert(compiledContract.evmAssembly, "");
-	try
-	{
-		// Assemble deployment (incl. runtime)  object.
-		compiledContract.object = compiledContract.evmAssembly->assemble();
-	}
-	catch (evmasm::AssemblyException const&)
-	{
-		solAssert(false, "Assembly exception for bytecode");
-	}
-	solAssert(compiledContract.object.immutableReferences.empty(), "Leftover immutables.");
-
-	compiledContract.evmRuntimeAssembly = _runtimeAssembly;
-	solAssert(compiledContract.evmRuntimeAssembly, "");
-	try
-	{
-		// Assemble runtime object.
-		compiledContract.runtimeObject = compiledContract.evmRuntimeAssembly->assemble();
-	}
-	catch (evmasm::AssemblyException const&)
-	{
-		solAssert(false, "Assembly exception for deployed bytecode");
-	}
-
-	// Throw a warning if EIP-170 limits are exceeded:
-	//   If contract creation returns data with length greater than 0x6000 (2^14 + 2^13) bytes,
-	//   contract creation fails with an out of gas error.
-	if (
-		m_evmVersion >= langutil::EVMVersion::spuriousDragon() &&
-		compiledContract.runtimeObject.bytecode.size() > 0x6000
-	)
-		m_errorReporter.warning(
-			5574_error,
-			_contract.location(),
-			"Contract code size is "s +
-			std::to_string(compiledContract.runtimeObject.bytecode.size()) +
-			" bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). "
-			"This contract may not be deployable on Mainnet. "
-			"Consider enabling the optimizer (with a low \"runs\" value!), "
-			"turning off revert strings, or using libraries."
-		);
-
-	// Throw a warning if EIP-3860 limits are exceeded:
-	//   If initcode is larger than 0xC000 bytes (twice the runtime code limit),
-	//   then contract creation fails with an out of gas error.
-	if (
-		m_evmVersion >= langutil::EVMVersion::shanghai() &&
-		compiledContract.object.bytecode.size() > 0xC000
-	)
-		m_errorReporter.warning(
-			3860_error,
-			_contract.location(),
-			"Contract initcode size is "s +
-			std::to_string(compiledContract.object.bytecode.size()) +
-			" bytes and exceeds 49152 bytes (a limit introduced in Shanghai). "
-			"This contract may not be deployable on Mainnet. "
-			"Consider enabling the optimizer (with a low \"runs\" value!), "
-			"turning off revert strings, or using libraries."
-		);
-}
-
-void CompilerStack::compileContract(
-	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>>& _otherCompilers
-)
-{
-	solAssert(!m_viaIR, "");
-	solUnimplementedAssert(!m_eofVersion.has_value(), "Experimental EOF support is only available for via-IR compilation.");
-	solAssert(m_stackState >= AnalysisSuccessful, "");
-
-	if (_otherCompilers.count(&_contract))
-		return;
-
-	for (auto const& [dependency, referencee]: _contract.annotation().contractDependencies)
-		compileContract(*dependency, _otherCompilers);
-
-	if (!_contract.canBeDeployed())
-		return;
-
-	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
-
-	std::shared_ptr<Compiler> compiler = std::make_shared<Compiler>(m_evmVersion, m_revertStrings, m_optimiserSettings);
-	compiledContract.compiler = compiler;
-
-	solAssert(!m_viaIR, "");
-	bytes cborEncodedMetadata = createCBORMetadata(compiledContract, /* _forIR */ false);
-
-	try
-	{
-		// Run optimiser and compile the contract.
-		compiler->compileContract(_contract, _otherCompilers, cborEncodedMetadata);
-	}
-	catch(evmasm::OptimizerException const&)
-	{
-		solAssert(false, "Optimizer exception during compilation");
-	}
-
-	_otherCompilers[compiledContract.contract] = compiler;
-
-	assembleYul(_contract, compiler->assemblyPtr(), compiler->runtimeAssemblyPtr());
-}
-
-void CompilerStack::generateIR(ContractDefinition const& _contract)
-{
-	solAssert(m_stackState >= AnalysisSuccessful, "");
-
-	if (m_experimentalAnalysis)
-		solThrow(CompilerError, "IR codegen after experimental analysis is unsupported.");
-
-	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
-	if (!compiledContract.yulIR.empty())
-		return;
-
-	if (!*_contract.sourceUnit().annotation().useABICoderV2)
-		m_errorReporter.warning(
-			2066_error,
-			_contract.location(),
-			"Contract requests the ABI coder v1, which is incompatible with the IR. "
-			"Using ABI coder v2 instead."
-		);
-
-	std::string dependenciesSource;
-	for (auto const& [dependency, referencee]: _contract.annotation().contractDependencies)
-		generateIR(*dependency);
-
-	if (!_contract.canBeDeployed())
-		return;
-
-	std::map<ContractDefinition const*, std::string_view const> otherYulSources;
-	for (auto const& pair: m_contracts)
-		otherYulSources.emplace(pair.second.contract, pair.second.yulIR);
-
-	IRGenerator generator(
-		m_evmVersion,
-		m_eofVersion,
-		m_revertStrings,
-		sourceIndices(),
-		m_debugInfoSelection,
-		this,
-		m_optimiserSettings
-	);
-	compiledContract.yulIR = generator.run(
-		_contract,
-		createCBORMetadata(compiledContract, /* _forIR */ true),
-		otherYulSources
-	);
-
-	yul::YulStack stack(
-		m_evmVersion,
-		m_eofVersion,
-		yul::YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_debugInfoSelection
-	);
-	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
-	solAssert(
-		yulAnalysisSuccessful,
-		compiledContract.yulIR + "\n\n"
-		"Invalid IR generated:\n" +
-		langutil::SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
-	);
-
-	compiledContract.yulIRAst = stack.astJson();
-	stack.optimize();
-	compiledContract.yulIROptimized = stack.print(this);
-	compiledContract.yulIROptimizedAst = stack.astJson();
-}
-
-void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
-{
-	solAssert(m_stackState >= AnalysisSuccessful, "");
-
-	if (!_contract.canBeDeployed())
-		return;
-
-	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
-	solAssert(!compiledContract.yulIROptimized.empty(), "");
-	if (!compiledContract.object.bytecode.empty())
-		return;
-
-	// Re-parse the Yul IR in EVM dialect
-	yul::YulStack stack(
-		m_evmVersion,
-		m_eofVersion,
-		yul::YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_debugInfoSelection
-	);
-	bool analysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIROptimized);
-	solAssert(analysisSuccessful);
-
-	//cout << yul::AsmPrinter{}(*stack.parserResult()->code) << endl;
-
-	std::string deployedName = IRNames::deployedObject(_contract);
-	solAssert(!deployedName.empty(), "");
-	tie(compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly) = stack.assembleEVMWithDeployed(deployedName);
-	assembleYul(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly);
-}
-
-CompilerStack::Contract const& CompilerStack::contract(std::string const& _contractName) const
-{
-	solAssert(m_stackState >= AnalysisSuccessful, "");
-
-	auto it = m_contracts.find(_contractName);
-	if (it != m_contracts.end())
-		return it->second;
-
-	// To provide a measure of backward-compatibility, if a contract is not located by its
-	// fully-qualified name, a lookup will be attempted purely on the contract's name to see
-	// if anything will satisfy.
-	if (_contractName.find(':') == std::string::npos)
-	{
-		for (auto const& contractEntry: m_contracts)
-		{
-			std::stringstream ss;
-			ss.str(contractEntry.first);
-			// All entries are <source>:<contract>
-			std::string source;
-			std::string foundName;
-			getline(ss, source, ':');
-			getline(ss, foundName, ':');
-			if (foundName == _contractName)
-				return contractEntry.second;
-		}
-	}
-
-	// If we get here, both lookup methods failed.
-	solThrow(CompilerError, "Contract \"" + _contractName + "\" not found.");
-}
-
-CompilerStack::Source const& CompilerStack::source(std::string const& _sourceName) const
-{
-	auto it = m_sources.find(_sourceName);
-	if (it == m_sources.end())
-		solThrow(CompilerError, "Given source file not found: " + _sourceName);
-
-	return it->second;
-}
-
-std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) const
-{
-	Json::Value meta{Json::objectValue};
-	meta["version"] = 1;
-	std::string sourceType;
-	switch (m_compilationSourceType)
-	{
-	case CompilationSourceType::Solidity:
-		sourceType = "Solidity";
-		break;
-	case CompilationSourceType::SolidityAST:
-		sourceType = "SolidityAST";
-		break;
-	}
-	meta["language"] = sourceType;
-	meta["compiler"]["version"] = VersionStringStrict;
-
-	/// All the source files (including self), which should be included in the metadata.
-	std::set<std::string> referencedSources;
-	referencedSources.insert(*_contract.contract->sourceUnit().annotation().path);
-	for (auto const sourceUnit: _contract.contract->sourceUnit().referencedSourceUnits(true))
-		referencedSources.insert(*sourceUnit->annotation().path);
-
-	meta["sources"] = Json::objectValue;
-	for (auto const& s: m_sources)
-	{
-		if (!referencedSources.count(s.first))
-			continue;
-
-		solAssert(s.second.charStream, "Character stream not available");
-		meta["sources"][s.first]["keccak256"] = "0x" + util::toHex(s.second.keccak256().asBytes());
-		if (std::optional<std::string> licenseString = s.second.ast->licenseString())
-			meta["sources"][s.first]["license"] = *licenseString;
-		if (m_metadataLiteralSources)
-			meta["sources"][s.first]["content"] = s.second.charStream->source();
-		else
-		{
-			meta["sources"][s.first]["urls"] = Json::arrayValue;
-			meta["sources"][s.first]["urls"].append("bzz-raw://" + util::toHex(s.second.swarmHash().asBytes()));
-			meta["sources"][s.first]["urls"].append(s.second.ipfsUrl());
-		}
-	}
-
-	static_assert(sizeof(m_optimiserSettings.expectedExecutionsPerDeployment) <= sizeof(Json::LargestUInt), "Invalid word size.");
-	solAssert(static_cast<Json::LargestUInt>(m_optimiserSettings.expectedExecutionsPerDeployment) < std::numeric_limits<Json::LargestUInt>::max(), "");
-	meta["settings"]["optimizer"]["runs"] = Json::Value(Json::LargestUInt(m_optimiserSettings.expectedExecutionsPerDeployment));
-
-	/// Backwards compatibility: If set to one of the default settings, do not provide details.
-	OptimiserSettings settingsWithoutRuns = m_optimiserSettings;
-	// reset to default
-	settingsWithoutRuns.expectedExecutionsPerDeployment = OptimiserSettings::minimal().expectedExecutionsPerDeployment;
-	if (settingsWithoutRuns == OptimiserSettings::minimal())
-		meta["settings"]["optimizer"]["enabled"] = false;
-	else if (settingsWithoutRuns == OptimiserSettings::standard())
-		meta["settings"]["optimizer"]["enabled"] = true;
-	else
-	{
-		Json::Value details{Json::objectValue};
-
-		details["orderLiterals"] = m_optimiserSettings.runOrderLiterals;
-		details["inliner"] = m_optimiserSettings.runInliner;
-		details["jumpdestRemover"] = m_optimiserSettings.runJumpdestRemover;
-		details["peephole"] = m_optimiserSettings.runPeephole;
-		details["deduplicate"] = m_optimiserSettings.runDeduplicate;
-		details["cse"] = m_optimiserSettings.runCSE;
-		details["constantOptimizer"] = m_optimiserSettings.runConstantOptimiser;
-		details["simpleCounterForLoopUncheckedIncrement"] = m_optimiserSettings.simpleCounterForLoopUncheckedIncrement;
-		details["yul"] = m_optimiserSettings.runYulOptimiser;
-		if (m_optimiserSettings.runYulOptimiser)
-		{
-			details["yulDetails"] = Json::objectValue;
-			details["yulDetails"]["stackAllocation"] = m_optimiserSettings.optimizeStackAllocation;
-			details["yulDetails"]["optimizerSteps"] = m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps;
-		}
-
-		meta["settings"]["optimizer"]["details"] = std::move(details);
-	}
-
-	if (m_revertStrings != RevertStrings::Default)
-		meta["settings"]["debug"]["revertStrings"] = revertStringsToString(m_revertStrings);
-
-	if (m_metadataFormat == MetadataFormat::NoMetadata)
-		meta["settings"]["metadata"]["appendCBOR"] = false;
-
-	if (m_metadataLiteralSources)
-		meta["settings"]["metadata"]["useLiteralContent"] = true;
-
-	static std::vector<std::string> hashes{"ipfs", "bzzr1", "none"};
-	meta["settings"]["metadata"]["bytecodeHash"] = hashes.at(unsigned(m_metadataHash));
-
-	if (_forIR)
-		meta["settings"]["viaIR"] = _forIR;
-	meta["settings"]["evmVersion"] = m_evmVersion.name();
-	if (m_eofVersion.has_value())
-		meta["settings"]["eofVersion"] = *m_eofVersion;
-	meta["settings"]["compilationTarget"][_contract.contract->sourceUnitName()] =
-		*_contract.contract->annotation().canonicalName;
-
-	meta["settings"]["remappings"] = Json::arrayValue;
-	std::set<std::string> remappings;
-	for (auto const& r: m_importRemapper.remappings())
-		remappings.insert(r.context + ":" + r.prefix + "=" + r.target);
-	for (auto const& r: remappings)
-		meta["settings"]["remappings"].append(r);
-
-	meta["settings"]["libraries"] = Json::objectValue;
-	for (auto const& library: m_libraries)
-		meta["settings"]["libraries"][library.first] = "0x" + util::toHex(library.second.asBytes());
-
-	meta["output"]["abi"] = contractABI(_contract);
-	meta["output"]["userdoc"] = natspecUser(_contract);
-	meta["output"]["devdoc"] = natspecDev(_contract);
-
-	return util::jsonCompactPrint(meta);
-}
-
-class MetadataCBOREncoder
-{
-public:
-	void pushBytes(std::string const& key, bytes const& value)
-	{
-		m_entryCount++;
-		pushTextString(key);
-		pushByteString(value);
-	}
-
-	void pushString(std::string const& key, std::string const& value)
-	{
-		m_entryCount++;
-		pushTextString(key);
-		pushTextString(value);
-	}
-
-	void pushBool(std::string const& key, bool value)
-	{
-		m_entryCount++;
-		pushTextString(key);
-		pushBool(value);
-	}
-
-	bytes serialise() const
-	{
-		size_t size = m_data.size() + 1;
-		solAssert(size <= 0xffff, "Metadata too large.");
-		solAssert(m_entryCount <= 0x1f, "Too many map entries.");
-
-		// CBOR fixed-length map
-		bytes ret{static_cast<unsigned char>(0xa0 + m_entryCount)};
-		// The already encoded key-value pairs
-		ret += m_data;
-		// 16-bit big endian length
-		ret += toCompactBigEndian(size, 2);
-		return ret;
-	}
-
-private:
-	void pushTextString(std::string const& key)
-	{
-		size_t length = key.size();
-		if (length < 24)
-		{
-			m_data += bytes{static_cast<unsigned char>(0x60 + length)};
-			m_data += key;
-		}
-		else if (length <= 256)
-		{
-			m_data += bytes{0x78, static_cast<unsigned char>(length)};
-			m_data += key;
-		}
-		else
-			solAssert(false, "Text std::string too large.");
-	}
-	void pushByteString(bytes const& key)
-	{
-		size_t length = key.size();
-		if (length < 24)
-		{
-			m_data += bytes{static_cast<unsigned char>(0x40 + length)};
-			m_data += key;
-		}
-		else if (length <= 256)
-		{
-			m_data += bytes{0x58, static_cast<unsigned char>(length)};
-			m_data += key;
-		}
-		else
-			solAssert(false, "Byte std::string too large.");
-	}
-	void pushBool(bool value)
-	{
-		if (value)
-			m_data += bytes{0xf5};
-		else
-			m_data += bytes{0xf4};
-	}
-	unsigned m_entryCount = 0;
-	bytes m_data;
-};
-
-bytes CompilerStack::createCBORMetadata(Contract const& _contract, bool _forIR) const
-{
-	if (m_metadataFormat == MetadataFormat::NoMetadata)
-		return bytes{};
-
-	bool const experimentalMode = !onlySafeExperimentalFeaturesActivated(
-		_contract.contract->sourceUnit().annotation().experimentalFeatures
-	);
-
-	std::string meta = (_forIR == m_viaIR ? metadata(_contract) : createMetadata(_contract, _forIR));
-
-	MetadataCBOREncoder encoder;
-
-	if (m_metadataHash == MetadataHash::IPFS)
-		encoder.pushBytes("ipfs", util::ipfsHash(meta));
-	else if (m_metadataHash == MetadataHash::Bzzr1)
-		encoder.pushBytes("bzzr1", util::bzzr1Hash(meta).asBytes());
-	else
-		solAssert(m_metadataHash == MetadataHash::None, "Invalid metadata hash");
-
-	if (experimentalMode || m_eofVersion.has_value())
-		encoder.pushBool("experimental", true);
-	if (m_metadataFormat == MetadataFormat::WithReleaseVersionTag)
-		encoder.pushBytes("solc", VersionCompactBytes);
-	else
-	{
-		solAssert(
-			m_metadataFormat == MetadataFormat::WithPrereleaseVersionTag,
-			"Invalid metadata format."
-		);
-		encoder.pushString("solc", VersionStringStrict);
-	}
-	return encoder.serialise();
-}
-
-namespace
-{
-
-Json::Value gasToJson(GasEstimator::GasConsumption const& _gas)
-{
-	if (_gas.isInfinite)
-		return Json::Value("infinite");
-	else
-		return Json::Value(util::toString(_gas.value));
-}
-
-}
-
-Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	if (!assemblyItems(_contractName) && !runtimeAssemblyItems(_contractName))
-		return Json::Value();
-
-	using Gas = GasEstimator::GasConsumption;
-	GasEstimator gasEstimator(m_evmVersion);
-	Json::Value output(Json::objectValue);
-
-	if (evmasm::AssemblyItems const* items = assemblyItems(_contractName))
-	{
-		Gas executionGas = gasEstimator.functionalEstimation(*items);
-		Gas codeDepositGas{evmasm::GasMeter::dataGas(runtimeObject(_contractName).bytecode, false, m_evmVersion)};
-
-		Json::Value creation(Json::objectValue);
-		creation["codeDepositCost"] = gasToJson(codeDepositGas);
-		creation["executionCost"] = gasToJson(executionGas);
-		/// TODO: implement + overload to avoid the need of +=
-		executionGas += codeDepositGas;
-		creation["totalCost"] = gasToJson(executionGas);
-		output["creation"] = creation;
-	}
-
-	if (evmasm::AssemblyItems const* items = runtimeAssemblyItems(_contractName))
-	{
-		/// External functions
-		ContractDefinition const& contract = contractDefinition(_contractName);
-		Json::Value externalFunctions(Json::objectValue);
-		for (auto it: contract.interfaceFunctions())
-		{
-			std::string sig = it.second->externalSignature();
-			externalFunctions[sig] = gasToJson(gasEstimator.functionalEstimation(*items, sig));
-		}
-
-		if (contract.fallbackFunction())
-			/// This needs to be set to an invalid signature in order to trigger the fallback,
-			/// without the shortcut (of CALLDATSIZE == 0), and therefore to receive the upper bound.
-			/// An empty string ("") would work to trigger the shortcut only.
-			externalFunctions[""] = gasToJson(gasEstimator.functionalEstimation(*items, "INVALID"));
-
-		if (!externalFunctions.empty())
-			output["external"] = externalFunctions;
-
-		/// Internal functions
-		Json::Value internalFunctions(Json::objectValue);
-		for (auto const& it: contract.definedFunctions())
-		{
-			/// Exclude externally visible functions, constructor, fallback and receive ether function
-			if (it->isPartOfExternalInterface() || !it->isOrdinary())
-				continue;
-
-			size_t entry = functionEntryPoint(_contractName, *it);
-			GasEstimator::GasConsumption gas = GasEstimator::GasConsumption::infinite();
-			if (entry > 0)
-				gas = gasEstimator.functionalEstimation(*items, entry, *it);
-
-			/// TODO: This could move into a method shared with externalSignature()
-			FunctionType type(*it);
-			std::string sig = it->name() + "(";
-			auto paramTypes = type.parameterTypes();
-			for (auto it = paramTypes.begin(); it != paramTypes.end(); ++it)
-				sig += (*it)->toString() + (it + 1 == paramTypes.end() ? "" : ",");
-			sig += ")";
-
-			internalFunctions[sig] = gasToJson(gas);
-		}
-
-		if (!internalFunctions.empty())
-			output["internal"] = internalFunctions;
-	}
-
-	return output;
-}
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
deleted file mode 100644
index 929e7e54f49a..000000000000
--- a/libsolidity/interface/CompilerStack.h
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @author Gav Wood <g@ethdev.com>
- * @date 2014
- * Full-stack compiler that converts a source code string to bytecode.
- */
-
-#pragma once
-
-#include <libsolidity/analysis/FunctionCallGraph.h>
-#include <libsolidity/interface/ReadFile.h>
-#include <libsolidity/interface/ImportRemapper.h>
-#include <libsolidity/interface/OptimiserSettings.h>
-#include <libsolidity/interface/Version.h>
-#include <libsolidity/interface/DebugSettings.h>
-
-#include <libsolidity/formal/ModelCheckerSettings.h>
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <libevmasm/AbstractAssemblyStack.h>
-#include <libevmasm/LinkerObject.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/LazyInit.h>
-
-#include <json/json.h>
-
-#include <functional>
-#include <memory>
-#include <ostream>
-#include <set>
-#include <string>
-#include <vector>
-
-namespace solidity::langutil
-{
-class CharStream;
-}
-
-
-namespace solidity::evmasm
-{
-class Assembly;
-class AssemblyItem;
-using AssemblyItems = std::vector<AssemblyItem>;
-}
-
-namespace solidity::frontend
-{
-
-// forward declarations
-class ASTNode;
-class ContractDefinition;
-class FunctionDefinition;
-class SourceUnit;
-class Compiler;
-class GlobalContext;
-class Natspec;
-class DeclarationContainer;
-namespace experimental
-{
-class Analysis;
-}
-
-/**
- * Easy to use and self-contained Solidity compiler with as few header dependencies as possible.
- * It holds state and can be used to either step through the compilation stages (and abort e.g.
- * before compilation to bytecode) or run the whole compilation in one call.
- */
-class CompilerStack: public langutil::CharStreamProvider, public evmasm::AbstractAssemblyStack
-{
-public:
-	/// Noncopyable.
-	CompilerStack(CompilerStack const&) = delete;
-	CompilerStack& operator=(CompilerStack const&) = delete;
-
-	enum State {
-		Empty,
-		SourcesSet,
-		Parsed,
-		ParsedAndImported,
-		AnalysisSuccessful,
-		CompilationSuccessful
-	};
-
-	enum class MetadataFormat {
-		WithReleaseVersionTag,
-		WithPrereleaseVersionTag,
-		NoMetadata
-	};
-
-	enum class MetadataHash {
-		IPFS,
-		Bzzr1,
-		None
-	};
-
-	enum class CompilationSourceType {
-		/// Regular compilation from Solidity source files.
-		Solidity,
-		/// Compilation from an imported Solidity AST.
-		SolidityAST,
-	};
-
-	/// Creates a new compiler stack.
-	/// @param _readFile callback used to read files for import statements. Must return
-	/// and must not emit exceptions.
-	explicit CompilerStack(ReadCallback::Callback _readFile = ReadCallback::Callback());
-
-	~CompilerStack() override;
-
-	/// @returns the list of errors that occurred during parsing and type checking.
-	langutil::ErrorList const& errors() const { return m_errorReporter.errors(); }
-
-	/// @returns the current state.
-	State state() const { return m_stackState; }
-
-	virtual bool compilationSuccessful() const override { return m_stackState >= CompilationSuccessful; }
-
-	/// Resets the compiler to an empty state. Unless @a _keepSettings is set to true,
-	/// all settings are reset as well.
-	void reset(bool _keepSettings = false);
-
-	/// Sets path remappings.
-	/// Must be set before parsing.
-	void setRemappings(std::vector<ImportRemapper::Remapping> _remappings);
-
-	/// Sets library addresses. Addresses are cleared iff @a _libraries is missing.
-	/// Must be set before parsing.
-	void setLibraries(std::map<std::string, util::h160> const& _libraries = {});
-
-	/// Changes the optimiser settings.
-	/// Must be set before parsing.
-	void setOptimiserSettings(bool _optimize, size_t _runs = OptimiserSettings{}.expectedExecutionsPerDeployment);
-
-	/// Changes the optimiser settings.
-	/// Must be set before parsing.
-	void setOptimiserSettings(OptimiserSettings _settings);
-
-	/// Sets whether to strip revert strings, add additional strings or do nothing at all.
-	void setRevertStringBehaviour(RevertStrings _revertStrings);
-
-	/// Sets the pipeline to go through the Yul IR or not.
-	/// Must be set before parsing.
-	void setViaIR(bool _viaIR);
-
-	/// Set the EVM version used before running compile.
-	/// When called without an argument it will revert to the default version.
-	/// Must be set before parsing.
-	void setEVMVersion(langutil::EVMVersion _version = langutil::EVMVersion{});
-
-	/// Set the EOF version used before running compile.
-	/// If set to std::nullopt (the default), legacy non-EOF bytecode is generated.
-	void setEOFVersion(std::optional<uint8_t> version);
-
-	/// Set model checker settings.
-	void setModelCheckerSettings(ModelCheckerSettings _settings);
-
-	/// Sets the requested contract names by source.
-	/// If empty, no filtering is performed and every contract
-	/// found in the supplied sources is compiled.
-	/// Names are cleared iff @a _contractNames is missing.
-	void setRequestedContractNames(std::map<std::string, std::set<std::string>> const& _contractNames = std::map<std::string, std::set<std::string>>{})
-	{
-		m_requestedContractNames = _contractNames;
-	}
-
-	/// Enable EVM Bytecode generation. This is enabled by default.
-	void enableEvmBytecodeGeneration(bool _enable = true) { m_generateEvmBytecode = _enable; }
-
-	/// Enable generation of Yul IR code.
-	void enableIRGeneration(bool _enable = true) { m_generateIR = _enable; }
-
-	/// @arg _metadataLiteralSources When true, store sources as literals in the contract metadata.
-	/// Must be set before parsing.
-	void useMetadataLiteralSources(bool _metadataLiteralSources);
-
-	/// Sets whether and which hash should be used
-	/// to store the metadata in the bytecode.
-	/// @param _metadataHash can be IPFS, Bzzr1, None
-	void setMetadataHash(MetadataHash _metadataHash);
-
-	/// Select components of debug info that should be included in comments in generated assembly.
-	void selectDebugInfo(langutil::DebugInfoSelection _debugInfoSelection);
-
-	/// Sets the sources. Must be set before parsing.
-	void setSources(StringMap _sources);
-
-	/// Adds a response to an SMTLib2 query (identified by the hash of the query input).
-	/// Must be set before parsing.
-	void addSMTLib2Response(util::h256 const& _hash, std::string const& _response);
-
-	/// Parses all source units that were added
-	/// @returns false on error.
-	bool parse();
-
-	/// Imports given SourceUnits so they can be analyzed. Leads to the same internal state as parse().
-	/// Will throw errors if the import fails
-	void importASTs(std::map<std::string, Json::Value> const& _sources);
-
-	/// Performs the analysis steps (imports, scopesetting, syntaxCheck, referenceResolving,
-	///  typechecking, staticAnalysis) on previously parsed sources.
-	/// @returns false on error.
-	bool analyze();
-
-	/// Parses and analyzes all source units that were added
-	/// @returns false on error.
-	bool parseAndAnalyze(State _stopAfter = State::CompilationSuccessful);
-
-	/// Compiles the source units that were previously added and parsed.
-	/// @returns false on error.
-	bool compile(State _stopAfter = State::CompilationSuccessful);
-
-	/// @returns the list of sources (paths) used
-	virtual std::vector<std::string> sourceNames() const override;
-
-	/// @returns a mapping assigning each source name its index inside the vector returned
-	/// by sourceNames().
-	std::map<std::string, unsigned> sourceIndices() const;
-
-	/// @returns the previously used character stream, useful for counting lines during error reporting.
-	langutil::CharStream const& charStream(std::string const& _sourceName) const override;
-
-	/// @returns the parsed source unit with the supplied name.
-	SourceUnit const& ast(std::string const& _sourceName) const;
-
-	/// @returns the parsed contract with the supplied name. Throws an exception if the contract
-	/// does not exist.
-	ContractDefinition const& contractDefinition(std::string const& _contractName) const;
-
-	/// @returns a list of unhandled queries to the SMT solver (has to be supplied in a second run
-	/// by calling @a addSMTLib2Response).
-	std::vector<std::string> const& unhandledSMTLib2Queries() const { return m_unhandledSMTLib2Queries; }
-
-	/// @returns a list of the contract names in the sources.
-	virtual std::vector<std::string> contractNames() const override;
-
-	/// @returns the name of the last contract. If _sourceName is defined the last contract of that source will be returned.
-	std::string const lastContractName(std::optional<std::string> const& _sourceName = std::nullopt) const;
-
-	/// @returns either the contract's name or a mixture of its name and source file, sanitized for filesystem use
-	virtual std::string const filesystemFriendlyName(std::string const& _contractName) const override;
-
-	/// @returns the IR representation of a contract.
-	std::string const& yulIR(std::string const& _contractName) const;
-
-	/// @returns the IR representation of a contract AST in format.
-	Json::Value const& yulIRAst(std::string const& _contractName) const;
-
-	/// @returns the optimized IR representation of a contract.
-	std::string const& yulIROptimized(std::string const& _contractName) const;
-
-	/// @returns the optimized IR representation of a contract AST in JSON format.
-	Json::Value const& yulIROptimizedAst(std::string const& _contractName) const;
-
-	/// @returns the assembled object for a contract.
-	virtual evmasm::LinkerObject const& object(std::string const& _contractName) const override;
-
-	/// @returns the runtime object for the contract.
-	virtual evmasm::LinkerObject const& runtimeObject(std::string const& _contractName) const override;
-
-	/// @returns normal contract assembly items
-	evmasm::AssemblyItems const* assemblyItems(std::string const& _contractName) const;
-
-	/// @returns runtime contract assembly items
-	evmasm::AssemblyItems const* runtimeAssemblyItems(std::string const& _contractName) const;
-
-	/// @returns an array containing all utility sources generated during compilation.
-	/// Format: [ { name: string, id: number, language: "Yul", contents: string }, ... ]
-	Json::Value generatedSources(std::string const& _contractName, bool _runtime = false) const;
-
-	/// @returns the string that provides a mapping between bytecode and sourcecode or a nullptr
-	/// if the contract does not (yet) have bytecode.
-	virtual std::string const* sourceMapping(std::string const& _contractName) const override;
-
-	/// @returns the string that provides a mapping between runtime bytecode and sourcecode.
-	/// if the contract does not (yet) have bytecode.
-	virtual std::string const* runtimeSourceMapping(std::string const& _contractName) const override;
-
-	/// @return a verbose text representation of the assembly.
-	/// @arg _sourceCodes is the map of input files to source code strings
-	/// Prerequisite: Successful compilation.
-	virtual std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes = StringMap()) const override;
-
-	/// @returns a JSON representation of the assembly.
-	/// @arg _sourceCodes is the map of input files to source code strings
-	/// Prerequisite: Successful compilation.
-	virtual Json::Value assemblyJSON(std::string const& _contractName) const override;
-
-	/// @returns a JSON representing the contract ABI.
-	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& contractABI(std::string const& _contractName) const;
-
-	/// @returns a JSON representing the storage layout of the contract.
-	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& storageLayout(std::string const& _contractName) const;
-
-	/// @returns a JSON representing the contract's user documentation.
-	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& natspecUser(std::string const& _contractName) const;
-
-	/// @returns a JSON representing the contract's developer documentation.
-	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& natspecDev(std::string const& _contractName) const;
-
-	/// @returns a JSON object with the three members ``methods``, ``events``, ``errors``. Each is a map, mapping identifiers (hashes) to function names.
-	Json::Value interfaceSymbols(std::string const& _contractName) const;
-
-	/// @returns the Contract Metadata matching the pipeline selected using the viaIR setting.
-	std::string const& metadata(std::string const& _contractName) const { return metadata(contract(_contractName)); }
-
-	/// @returns the CBOR-encoded metadata matching the pipeline selected using the viaIR setting.
-	bytes cborMetadata(std::string const& _contractName) const { return cborMetadata(_contractName, m_viaIR); }
-
-	/// @returns the CBOR-encoded metadata.
-	/// @param _forIR If true, the metadata for the IR codegen is used. Otherwise it's the metadata
-	///               for the EVM codegen
-	bytes cborMetadata(std::string const& _contractName, bool _forIR) const;
-
-	/// @returns a JSON representing the estimated gas usage for contract creation, internal and external functions
-	Json::Value gasEstimates(std::string const& _contractName) const;
-
-	/// Changes the format of the metadata appended at the end of the bytecode.
-	void setMetadataFormat(MetadataFormat _metadataFormat) { m_metadataFormat = _metadataFormat; }
-
-	static MetadataFormat defaultMetadataFormat()
-	{
-		return VersionIsRelease ? MetadataFormat::WithReleaseVersionTag : MetadataFormat::WithPrereleaseVersionTag;
-	}
-
-private:
-	/// The state per source unit. Filled gradually during parsing.
-	struct Source
-	{
-		std::shared_ptr<langutil::CharStream> charStream;
-		std::shared_ptr<SourceUnit> ast;
-		util::h256 mutable keccak256HashCached;
-		util::h256 mutable swarmHashCached;
-		std::string mutable ipfsUrlCached;
-		void reset() { *this = Source(); }
-		util::h256 const& keccak256() const;
-		util::h256 const& swarmHash() const;
-		std::string const& ipfsUrl() const;
-	};
-
-	/// The state per contract. Filled gradually during compilation.
-	struct Contract
-	{
-		ContractDefinition const* contract = nullptr;
-		std::shared_ptr<Compiler> compiler;
-		std::shared_ptr<evmasm::Assembly> evmAssembly;
-		std::shared_ptr<evmasm::Assembly> evmRuntimeAssembly;
-		evmasm::LinkerObject object; ///< Deployment object (includes the runtime sub-object).
-		evmasm::LinkerObject runtimeObject; ///< Runtime object.
-		std::string yulIR; ///< Yul IR code.
-		std::string yulIROptimized; ///< Optimized Yul IR code.
-		Json::Value yulIRAst; ///< JSON AST of Yul IR code.
-		Json::Value yulIROptimizedAst; ///< JSON AST of optimized Yul IR code.
-		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
-		util::LazyInit<Json::Value const> abi;
-		util::LazyInit<Json::Value const> storageLayout;
-		util::LazyInit<Json::Value const> userDocumentation;
-		util::LazyInit<Json::Value const> devDocumentation;
-		util::LazyInit<Json::Value const> generatedSources;
-		util::LazyInit<Json::Value const> runtimeGeneratedSources;
-		mutable std::optional<std::string const> sourceMapping;
-		mutable std::optional<std::string const> runtimeSourceMapping;
-	};
-
-	void createAndAssignCallGraphs();
-	void findAndReportCyclicContractDependencies();
-
-	/// Loads the missing sources from @a _ast (named @a _path) using the callback
-	/// @a m_readFile
-	/// @returns the newly loaded sources.
-	StringMap loadMissingSources(SourceUnit const& _ast);
-	std::string applyRemapping(std::string const& _path, std::string const& _context);
-	bool resolveImports();
-
-	/// Store the contract definitions in m_contracts.
-	void storeContractDefinitions();
-
-	/// Annotate internal dispatch function Ids
-	void annotateInternalFunctionIDs();
-
-	/// @returns true if the source is requested to be compiled.
-	bool isRequestedSource(std::string const& _sourceName) const;
-
-	/// @returns true if the contract is requested to be compiled.
-	bool isRequestedContract(ContractDefinition const& _contract) const;
-
-	/// Perform the analysis steps of legacy language mode.
-	/// @returns false on error.
-	bool analyzeLegacy(bool _noErrorsSoFar);
-
-	/// Perform the analysis steps of experimental language mode.
-	/// @returns false on error.
-	bool analyzeExperimental();
-
-	/// Assembles the contract.
-	/// This function should only be internally called by compileContract and generateEVMFromIR.
-	void assembleYul(
-		ContractDefinition const& _contract,
-		std::shared_ptr<evmasm::Assembly> _assembly,
-		std::shared_ptr<evmasm::Assembly> _runtimeAssembly
-	);
-
-	/// Compile a single contract.
-	/// @param _otherCompilers provides access to compilers of other contracts, to get
-	///                        their bytecode if needed. Only filled after they have been compiled.
-	void compileContract(
-		ContractDefinition const& _contract,
-		std::map<ContractDefinition const*, std::shared_ptr<Compiler const>>& _otherCompilers
-	);
-
-	/// Generate Yul IR for a single contract.
-	/// The IR is stored but otherwise unused.
-	void generateIR(ContractDefinition const& _contract);
-
-	/// Generate EVM representation for a single contract.
-	/// Depends on output generated by generateIR.
-	void generateEVMFromIR(ContractDefinition const& _contract);
-
-	/// Links all the known library addresses in the available objects. Any unknown
-	/// library will still be kept as an unlinked placeholder in the objects.
-	void link();
-
-	/// @returns the contract object for the given @a _contractName.
-	/// Can only be called after state is CompilationSuccessful.
-	Contract const& contract(std::string const& _contractName) const;
-
-	/// @returns the source object for the given @a _sourceName.
-	/// Can only be called after state is SourcesSet.
-	Source const& source(std::string const& _sourceName) const;
-
-	/// @param _forIR If true, include a flag that indicates that the bytecode comes from IR codegen.
-	/// @returns the metadata JSON as a compact string for the given contract.
-	std::string createMetadata(Contract const& _contract, bool _forIR) const;
-
-	/// @returns the metadata CBOR for the given serialised metadata JSON.
-	/// @param _forIR If true, use the metadata for the IR codegen. Otherwise the one for EVM codegen.
-	bytes createCBORMetadata(Contract const& _contract, bool _forIR) const;
-
-	/// @returns the contract ABI as a JSON object.
-	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& contractABI(Contract const&) const;
-
-	/// @returns the storage layout of the contract as a JSON object.
-	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& storageLayout(Contract const&) const;
-
-	/// @returns the Natspec User documentation as a JSON object.
-	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& natspecUser(Contract const&) const;
-
-	/// @returns the Natspec Developer documentation as a JSON object.
-	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& natspecDev(Contract const&) const;
-
-	/// @returns the Contract Metadata matching the pipeline selected using the viaIR setting.
-	/// This will generate the metadata and store it in the Contract object if it is not present yet.
-	std::string const& metadata(Contract const& _contract) const;
-
-	/// @returns the offset of the entry point of the given function into the list of assembly items
-	/// or zero if it is not found or does not exist.
-	size_t functionEntryPoint(
-		std::string const& _contractName,
-		FunctionDefinition const& _function
-	) const;
-
-	ReadCallback::Callback m_readFile;
-	OptimiserSettings m_optimiserSettings;
-	RevertStrings m_revertStrings = RevertStrings::Default;
-	State m_stopAfter = State::CompilationSuccessful;
-	bool m_viaIR = false;
-	langutil::EVMVersion m_evmVersion;
-	std::optional<uint8_t> m_eofVersion;
-	ModelCheckerSettings m_modelCheckerSettings;
-	std::map<std::string, std::set<std::string>> m_requestedContractNames;
-	bool m_generateEvmBytecode = true;
-	bool m_generateIR = false;
-	std::map<std::string, util::h160> m_libraries;
-	ImportRemapper m_importRemapper;
-	std::map<std::string const, Source> m_sources;
-	std::vector<std::string> m_unhandledSMTLib2Queries;
-	std::map<util::h256, std::string> m_smtlib2Responses;
-	std::shared_ptr<GlobalContext> m_globalContext;
-	std::vector<Source const*> m_sourceOrder;
-	std::map<std::string const, Contract> m_contracts;
-
-	langutil::ErrorList m_errorList;
-	langutil::ErrorReporter m_errorReporter;
-	std::unique_ptr<experimental::Analysis> m_experimentalAnalysis;
-	bool m_metadataLiteralSources = false;
-	MetadataHash m_metadataHash = MetadataHash::IPFS;
-	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();
-	State m_stackState = Empty;
-	CompilationSourceType m_compilationSourceType = CompilationSourceType::Solidity;
-	MetadataFormat m_metadataFormat = defaultMetadataFormat();
-};
-
-}
diff --git a/libsolidity/interface/DebugSettings.h b/libsolidity/interface/DebugSettings.h
deleted file mode 100644
index e0dab05bb234..000000000000
--- a/libsolidity/interface/DebugSettings.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Settings to aid debugging.
- */
-
-#pragma once
-
-#include <cstddef>
-#include <string>
-#include <optional>
-
-namespace solidity::frontend
-{
-
-enum class RevertStrings
-{
-
-	Default, // no compiler-generated strings, keep user-supplied strings
-	Strip, // no compiler-generated strings, remove user-supplied strings (if possible)
-	Debug, // add strings for internal reverts, keep user-supplied strings
-	VerboseDebug // add strings for internal reverts, add user-supplied strings if not provided
-};
-
-inline std::string revertStringsToString(RevertStrings _str)
-{
-	switch (_str)
-	{
-	case RevertStrings::Default: return "default";
-	case RevertStrings::Strip: return "strip";
-	case RevertStrings::Debug: return "debug";
-	case RevertStrings::VerboseDebug: return "verboseDebug";
-	}
-	// Cannot reach this.
-	return "INVALID";
-}
-
-inline std::optional<RevertStrings> revertStringsFromString(std::string const& _str)
-{
-	for (auto i: {RevertStrings::Default, RevertStrings::Strip, RevertStrings::Debug, RevertStrings::VerboseDebug})
-		if (revertStringsToString(i) == _str)
-			return i;
-	return std::nullopt;
-}
-
-}
diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
deleted file mode 100644
index 4197780e65b2..000000000000
--- a/libsolidity/interface/FileReader.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/interface/FileReader.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <range/v3/range/conversion.hpp>
-
-#include <functional>
-
-using solidity::frontend::ReadCallback;
-using solidity::langutil::InternalCompilerError;
-using solidity::util::errinfo_comment;
-using solidity::util::readFileAsString;
-using solidity::util::joinHumanReadable;
-
-namespace solidity::frontend
-{
-
-FileReader::FileReader(
-	boost::filesystem::path _basePath,
-	std::vector<boost::filesystem::path> const& _includePaths,
-	FileSystemPathSet _allowedDirectories
-):
-	m_allowedDirectories(std::move(_allowedDirectories)),
-	m_sourceCodes()
-{
-	setBasePath(_basePath);
-	for (boost::filesystem::path const& includePath: _includePaths)
-		addIncludePath(includePath);
-
-	for (boost::filesystem::path const& allowedDir: m_allowedDirectories)
-		solAssert(!allowedDir.empty(), "");
-}
-
-void FileReader::setBasePath(boost::filesystem::path const& _path)
-{
-	if (_path.empty())
-	{
-		// Empty base path is a special case that does not make sense when include paths are used.
-		solAssert(m_includePaths.empty(), "");
-		m_basePath = "";
-	}
-	else
-		m_basePath = normalizeCLIPathForVFS(_path);
-}
-
-void FileReader::addIncludePath(boost::filesystem::path const& _path)
-{
-	solAssert(!m_basePath.empty(), "");
-	solAssert(!_path.empty(), "");
-	m_includePaths.push_back(normalizeCLIPathForVFS(_path));
-}
-
-void FileReader::allowDirectory(boost::filesystem::path _path)
-{
-	solAssert(!_path.empty(), "");
-	m_allowedDirectories.insert(std::move(_path));
-}
-
-void FileReader::addOrUpdateFile(boost::filesystem::path const& _path, SourceCode _source)
-{
-	m_sourceCodes[cliPathToSourceUnitName(_path)] = std::move(_source);
-}
-
-void FileReader::setStdin(SourceCode _source)
-{
-	m_sourceCodes["<stdin>"] = std::move(_source);
-}
-
-void FileReader::setSourceUnits(StringMap _sources)
-{
-	m_sourceCodes = std::move(_sources);
-}
-
-ReadCallback::Result FileReader::readFile(std::string const& _kind, std::string const& _sourceUnitName)
-{
-	try
-	{
-		if (_kind != ReadCallback::kindString(ReadCallback::Kind::ReadFile))
-			solAssert(false, "ReadFile callback used as callback kind " + _kind);
-		std::string strippedSourceUnitName = _sourceUnitName;
-		if (strippedSourceUnitName.find("file://") == 0)
-			strippedSourceUnitName.erase(0, 7);
-
-		std::vector<boost::filesystem::path> candidates;
-		std::vector<std::reference_wrapper<boost::filesystem::path>> prefixes = {m_basePath};
-		prefixes += (m_includePaths | ranges::to<std::vector<std::reference_wrapper<boost::filesystem::path>>>);
-
-		for (auto const& prefix: prefixes)
-		{
-			boost::filesystem::path canonicalPath = normalizeCLIPathForVFS(prefix / strippedSourceUnitName, SymlinkResolution::Enabled);
-			if (boost::filesystem::exists(canonicalPath))
-				candidates.push_back(std::move(canonicalPath));
-		}
-
-		auto pathToQuotedString = [](boost::filesystem::path const& _path){ return "\"" + _path.string() + "\""; };
-
-		if (candidates.empty())
-			return ReadCallback::Result{
-				false,
-				"File not found. Searched the following locations: " +
-				joinHumanReadable(prefixes | ranges::views::transform(pathToQuotedString), ", ") +
-				"."
-			};
-
-		if (candidates.size() >= 2)
-			return ReadCallback::Result{
-				false,
-				"Ambiguous import. "
-				"Multiple matching files found inside base path and/or include paths: " +
-				joinHumanReadable(candidates | ranges::views::transform(pathToQuotedString), ", ") +
-				"."
-			};
-
-		FileSystemPathSet allowedPaths =
-			m_allowedDirectories +
-			decltype(allowedPaths){m_basePath.empty() ? "." : m_basePath} +
-			m_includePaths;
-
-		bool isAllowed = false;
-		for (boost::filesystem::path const& allowedDir: allowedPaths)
-			if (isPathPrefix(normalizeCLIPathForVFS(allowedDir, SymlinkResolution::Enabled), candidates[0]))
-			{
-				isAllowed = true;
-				break;
-			}
-
-		if (!isAllowed)
-			return ReadCallback::Result{
-				false,
-				"File outside of allowed directories. The following are allowed: " +
-				joinHumanReadable(allowedPaths | ranges::views::transform(pathToQuotedString), ", ") +
-				"."
-			};
-
-		if (!boost::filesystem::is_regular_file(candidates[0]))
-			return ReadCallback::Result{false, "Not a valid file."};
-
-		// NOTE: we ignore the FileNotFound exception as we manually check above
-		auto contents = readFileAsString(candidates[0]);
-		solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
-		m_sourceCodes[_sourceUnitName] = contents;
-		return ReadCallback::Result{true, contents};
-	}
-	catch (util::Exception const& _exception)
-	{
-		return ReadCallback::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
-	}
-	catch (std::exception const& _exception)
-	{
-		return ReadCallback::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
-	}
-	catch (...)
-	{
-		return ReadCallback::Result{false, "Unknown exception in read callback: " + boost::current_exception_diagnostic_information()};
-	}
-}
-
-std::string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const
-{
-	std::vector<boost::filesystem::path> prefixes = {m_basePath.empty() ? normalizeCLIPathForVFS(".") : m_basePath};
-	prefixes += m_includePaths;
-
-	boost::filesystem::path normalizedPath = normalizeCLIPathForVFS(_cliPath);
-	for (boost::filesystem::path const& prefix: prefixes)
-		if (isPathPrefix(prefix, normalizedPath))
-		{
-			// Multiple prefixes can potentially match the path. We take the first one.
-			normalizedPath = stripPrefixIfPresent(prefix, normalizedPath);
-			break;
-		}
-
-	return normalizedPath.generic_string();
-}
-
-std::map<std::string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const
-{
-	std::map<std::string, FileReader::FileSystemPathSet> nameToPaths;
-	for (boost::filesystem::path const& cliPath: _cliPaths)
-	{
-		std::string sourceUnitName = cliPathToSourceUnitName(cliPath);
-		boost::filesystem::path normalizedPath = normalizeCLIPathForVFS(cliPath);
-		nameToPaths[sourceUnitName].insert(normalizedPath);
-	}
-
-	std::map<std::string, FileReader::FileSystemPathSet> collisions;
-	for (auto&& [sourceUnitName, cliPaths]: nameToPaths)
-		if (cliPaths.size() >= 2)
-			collisions[sourceUnitName] = std::move(cliPaths);
-
-	return collisions;
-}
-
-boost::filesystem::path FileReader::normalizeCLIPathForVFS(
-	boost::filesystem::path const& _path,
-	SymlinkResolution _symlinkResolution
-)
-{
-	// Detailed normalization rules:
-	// - Makes the path either be absolute or have slash as root (note that on Windows paths with
-	//   slash as root are not considered absolute by Boost). If it is empty, it becomes
-	//   the current working directory.
-	// - Collapses redundant . and .. segments.
-	// - Removes leading .. segments from an absolute path (i.e. /../../ becomes just /).
-	// - Squashes sequences of multiple path separators into one.
-	// - Ensures that forward slashes are used as path separators on all platforms.
-	// - Removes the root name (e.g. drive letter on Windows) when it matches the root name in the
-	//   path to the current working directory.
-	//
-	// Also note that this function:
-	// - Does NOT resolve symlinks (except for symlinks in the path to the current working directory)
-	//   unless explicitly requested.
-	// - Does NOT check if the path refers to a file or a directory. If the path ends with a slash,
-	//   the slash is preserved even if it's a file.
-	//   - The only exception are paths where the file name is a dot (e.g. '.' or 'a/b/.'). These
-	//     always have a trailing slash after normalization.
-	// - Preserves case. Even if the filesystem is case-insensitive but case-preserving and the
-	//   case differs, the actual case from disk is NOT detected.
-
-	boost::filesystem::path canonicalWorkDir = boost::filesystem::weakly_canonical(boost::filesystem::current_path());
-
-	// NOTE: On UNIX systems the path returned from current_path() has symlinks resolved while on
-	// Windows it does not. To get consistent results we resolve them on all platforms.
-	boost::filesystem::path absolutePath = boost::filesystem::absolute(_path, canonicalWorkDir);
-
-	boost::filesystem::path normalizedPath;
-	if (_symlinkResolution == SymlinkResolution::Enabled)
-	{
-		// NOTE: weakly_canonical() will not convert a relative path into an absolute one if no
-		// directory included in the path actually exists.
-		normalizedPath = boost::filesystem::weakly_canonical(absolutePath);
-
-		// The three corner cases in which lexically_normal() includes a trailing slash in the
-		// normalized path but weakly_canonical() does not. Note that the trailing slash is not
-		// ignored when comparing paths with ==.
-		if ((_path == "." || _path == "./" || _path == "../") && !boost::ends_with(normalizedPath.generic_string(), "/"))
-			normalizedPath = normalizedPath.parent_path() / (normalizedPath.filename().string() + "/");
-	}
-	else
-	{
-		solAssert(_symlinkResolution == SymlinkResolution::Disabled, "");
-
-		// NOTE: boost path preserves certain differences that are ignored by its operator ==.
-		// E.g. "a//b" vs "a/b" or "a/b/" vs "a/b/.". lexically_normal() does remove these differences.
-		normalizedPath = absolutePath.lexically_normal();
-	}
-	solAssert(normalizedPath.is_absolute() || normalizedPath.root_path() == "/", "");
-
-	// If the path is on the same drive as the working dir, for portability we prefer not to
-	// include the root name. Do this only for non-UNC paths - my experiments show that on Windows
-	// when the working dir is an UNC path, / does not not actually refer to the root of the UNC path.
-
-	boost::filesystem::path normalizedRootPath = normalizeCLIRootPathForVFS(normalizedPath, canonicalWorkDir);
-
-	// lexically_normal() will not squash paths like "/../../" into "/". We have to do it manually.
-	boost::filesystem::path dotDotPrefix = absoluteDotDotPrefix(normalizedPath);
-
-	boost::filesystem::path normalizedPathNoDotDot = normalizedPath;
-	if (dotDotPrefix.empty())
-		normalizedPathNoDotDot = normalizedRootPath / normalizedPath.relative_path();
-	else
-		normalizedPathNoDotDot = normalizedRootPath / normalizedPath.lexically_relative(normalizedPath.root_path() / dotDotPrefix);
-	solAssert(!hasDotDotSegments(normalizedPathNoDotDot), "");
-
-	// NOTE: On Windows lexically_normal() converts all separators to forward slashes. Convert them back.
-	// Separators do not affect path comparison but remain in internal representation returned by native().
-	// This will also normalize the root name to start with // in UNC paths.
-	normalizedPathNoDotDot = normalizedPathNoDotDot.generic_string();
-
-	// For some reason boost considers "/." different than "/" even though for other directories
-	// the trailing dot is ignored.
-	if (normalizedPathNoDotDot == "/.")
-		return "/";
-
-	return normalizedPathNoDotDot;
-}
-
-boost::filesystem::path FileReader::normalizeCLIRootPathForVFS(
-	boost::filesystem::path const& _path,
-	boost::filesystem::path const& _workDir
-)
-{
-	solAssert(_workDir.is_absolute(), "");
-
-	boost::filesystem::path absolutePath = boost::filesystem::absolute(_path, _workDir);
-	boost::filesystem::path rootPath = absolutePath.root_path();
-	boost::filesystem::path baseRootPath = _workDir.root_path();
-
-	if (isUNCPath(absolutePath))
-		return rootPath;
-
-	// Ignore drive letter case on Windows (C:\ <=> c:\).
-	if (boost::filesystem::equivalent(rootPath, baseRootPath))
-		return "/";
-
-	return rootPath;
-}
-
-bool FileReader::isPathPrefix(boost::filesystem::path const& _prefix, boost::filesystem::path const& _path)
-{
-	solAssert(!_prefix.empty() && !_path.empty(), "");
-	// NOTE: On Windows paths starting with a slash (rather than a drive letter) are considered relative by boost.
-	solAssert(_prefix.is_absolute() || isUNCPath(_prefix) || _prefix.root_path() == "/", "");
-	solAssert(_path.is_absolute() || isUNCPath(_path) || _path.root_path() == "/", "");
-	// NOTE: On Windows before Boost 1.78 lexically_normal() would not replace the `//` UNC prefix with `\\\\`.
-	// Later versions do. Use generic_path() to normalize all slashes to `/` and ignore that difference.
-	// This does not make the assert weaker because == ignores slash type anyway.
-	solAssert(_prefix == _prefix.lexically_normal().generic_string() && _path == _path.lexically_normal().generic_string(), "");
-	solAssert(!hasDotDotSegments(_prefix) && !hasDotDotSegments(_path), "");
-
-	boost::filesystem::path strippedPath = _path.lexically_relative(
-		// Before 1.72.0 lexically_relative() was not handling paths with empty, dot and dot dot segments
-		// correctly (see https://github.com/boostorg/filesystem/issues/76). The only case where this
-		// is possible after our normalization is a directory name ending in a slash (filename is a dot).
-		_prefix.filename_is_dot() ? _prefix.parent_path() : _prefix
-	);
-	return !strippedPath.empty() && *strippedPath.begin() != "..";
-}
-
-boost::filesystem::path FileReader::stripPrefixIfPresent(boost::filesystem::path const& _prefix, boost::filesystem::path const& _path)
-{
-	if (!isPathPrefix(_prefix, _path))
-		return _path;
-
-	boost::filesystem::path strippedPath = _path.lexically_relative(
-		_prefix.filename_is_dot() ? _prefix.parent_path() : _prefix
-	);
-	solAssert(strippedPath.empty() || *strippedPath.begin() != "..", "");
-	return strippedPath;
-}
-
-boost::filesystem::path FileReader::absoluteDotDotPrefix(boost::filesystem::path const& _path)
-{
-	solAssert(_path.is_absolute() || _path.root_path() == "/", "");
-
-	boost::filesystem::path _pathWithoutRoot = _path.relative_path();
-	boost::filesystem::path prefix;
-	for (boost::filesystem::path const& segment: _pathWithoutRoot)
-		if (segment.filename_is_dot_dot())
-			prefix /= segment;
-
-	return prefix;
-}
-
-bool FileReader::hasDotDotSegments(boost::filesystem::path const& _path)
-{
-	for (boost::filesystem::path const& segment: _path)
-		if (segment.filename_is_dot_dot())
-			return true;
-
-	return false;
-}
-
-bool FileReader::isUNCPath(boost::filesystem::path const& _path)
-{
-	std::string rootName = _path.root_name().string();
-
-	return (
-		rootName.size() == 2 ||
-		(rootName.size() > 2 && rootName[2] != rootName[1])
-	) && (
-		(rootName[0] == '/' && rootName[1] == '/')
-#if defined(_WIN32)
-		|| (rootName[0] == '\\' && rootName[1] == '\\')
-#endif
-	);
-}
-
-}
diff --git a/libsolidity/interface/FileReader.h b/libsolidity/interface/FileReader.h
deleted file mode 100644
index f05ce894d91e..000000000000
--- a/libsolidity/interface/FileReader.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolidity/interface/ImportRemapper.h>
-#include <libsolidity/interface/ReadFile.h>
-
-#include <boost/filesystem.hpp>
-
-#include <map>
-#include <set>
-
-namespace solidity::frontend
-{
-
-/// FileReader - used for progressively loading source code.
-///
-/// It is used in solc to load files from CLI parameters, stdin, or from JSON and
-/// also used in the solc language server where solc is a long running process.
-class FileReader
-{
-public:
-	using StringMap = std::map<SourceUnitName, SourceCode>;
-	using PathMap = std::map<SourceUnitName, boost::filesystem::path>;
-	using FileSystemPathSet = std::set<boost::filesystem::path>;
-
-	enum SymlinkResolution {
-		Disabled, ///< Do not resolve symbolic links in the path.
-		Enabled,  ///< Follow symbolic links. The path should contain no symlinks.
-	};
-
-	/// Constructs a FileReader with a base path and sets of include paths and allowed directories
-	/// that will be used when requesting files from this file reader instance.
-	explicit FileReader(
-		boost::filesystem::path _basePath = {},
-		std::vector<boost::filesystem::path> const& _includePaths = {},
-		FileSystemPathSet _allowedDirectories = {}
-	);
-
-	void setBasePath(boost::filesystem::path const& _path);
-	boost::filesystem::path const& basePath() const noexcept { return m_basePath; }
-
-	void addIncludePath(boost::filesystem::path const& _path);
-	std::vector<boost::filesystem::path> const& includePaths() const noexcept { return m_includePaths; }
-
-	void allowDirectory(boost::filesystem::path _path);
-	FileSystemPathSet const& allowedDirectories() const noexcept { return m_allowedDirectories; }
-
-	/// @returns all sources by their internal source unit names.
-	StringMap const& sourceUnits() const noexcept { return m_sourceCodes; }
-
-	/// Resets all sources to the given map of source unit name to source codes.
-	/// Does not enforce @a allowedDirectories().
-	void setSourceUnits(StringMap _sources);
-
-	/// Adds the source code under a source unit name created by normalizing the file path
-	/// or changes an existing source.
-	/// Does not enforce @a allowedDirectories().
-	void addOrUpdateFile(boost::filesystem::path const& _path, SourceCode _source);
-
-	/// Adds the source code under the source unit name of @a <stdin>.
-	/// Does not enforce @a allowedDirectories().
-	void setStdin(SourceCode _source);
-
-	/// Receives a @p _sourceUnitName that refers to a source unit in compiler's virtual filesystem
-	/// and attempts to interpret it as a path and read the corresponding file from disk.
-	/// The read will only succeed if the canonical path of the file is within one of the @a allowedDirectories().
-	/// @param _kind must be equal to "source". Other values are not supported.
-	/// @return Content of the loaded file or an error message. If the operation succeeds, a copy of
-	/// the content is retained in @a sourceUnits() under the key of @a _sourceUnitName. If the key
-	/// already exists, previous content is discarded.
-	frontend::ReadCallback::Result readFile(std::string const& _kind, std::string const& _sourceUnitName);
-
-	frontend::ReadCallback::Callback reader()
-	{
-		return [this](std::string const& _kind, std::string const& _path) { return readFile(_kind, _path); };
-	}
-
-	/// Creates a source unit name by normalizing a path given on the command line and, if possible,
-	/// making it relative to base path or one of the include directories.
-	std::string cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const;
-
-	/// Checks if a set contains any paths that lead to different files but would receive identical
-	/// source unit names. Files are considered the same if their paths are exactly the same after
-	/// normalization (without following symlinks).
-	/// @returns a map containing all the conflicting source unit names and the paths that would
-	/// receive them. The returned paths are normalized.
-	std::map<std::string, FileSystemPathSet> detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const;
-
-	/// Normalizes a filesystem path to make it include all components up to the filesystem root,
-	/// remove small, inconsequential differences that do not affect the meaning and make it look
-	/// the same on all platforms (if possible).
-	/// The resulting path uses forward slashes as path separators, has no redundant separators,
-	/// has no redundant . or .. segments and has no root name if removing it does not change the meaning.
-	/// The path does not have to actually exist.
-	/// @param _path Path to normalize.
-	/// @param _symlinkResolution If @a Disabled, any symlinks present in @a _path are preserved.
-	static boost::filesystem::path normalizeCLIPathForVFS(
-		boost::filesystem::path const& _path,
-		SymlinkResolution _symlinkResolution = SymlinkResolution::Disabled
-	);
-
-	/// Normalizes a root path by excluding, in some cases, its root name.
-	/// The function is used for better portability, and intended to omit root name
-	/// if the path can be used without it.
-	/// @param _path Path to normalize the root path.
-	/// @param _workDir Current working directory path, must be absolute.
-	/// @returns a normalized root path.
-	static boost::filesystem::path normalizeCLIRootPathForVFS(
-		boost::filesystem::path const& _path,
-		boost::filesystem::path const& _workDir = boost::filesystem::current_path()
-	);
-
-	/// @returns true if all the path components of @a _prefix are present at the beginning of @a _path.
-	/// Both paths must be absolute (or have slash as root) and normalized (no . or .. segments, no
-	/// multiple consecutive slashes).
-	/// Paths are treated as case-sensitive. Does not require the path to actually exist in the
-	/// filesystem and does not follow symlinks. Only considers whole segments, e.g. /abc/d is not
-	/// considered a prefix of /abc/def. Both paths must be non-empty.
-	/// Ignores the trailing slash, i.e. /a/b/c.sol/ is treated as a valid prefix of /a/b/c.sol.
-	static bool isPathPrefix(boost::filesystem::path const& _prefix, boost::filesystem::path const& _path);
-
-	/// If @a _prefix is actually a prefix of @p _path, removes it from @a _path to make it relative.
-	/// @returns The path without the prefix or unchanged path if there is not prefix.
-	/// If @a _path and @_prefix are identical, the result is '.'.
-	static boost::filesystem::path stripPrefixIfPresent(boost::filesystem::path const& _prefix, boost::filesystem::path const& _path);
-
-	/// @returns true if the specified path is an UNC path.
-	/// UNC paths start with // followed by a name (on Windows they can also start with \\).
-	/// They are used for network shares on Windows. On UNIX systems they do not have the same
-	/// functionality but usually they are still recognized and treated in a special way.
-	static bool isUNCPath(boost::filesystem::path const& _path);
-
-private:
-	/// If @a _path starts with a number of .. segments, returns a path consisting only of those
-	/// segments (root name is not included). Otherwise returns an empty path. @a _path must be
-	/// absolute (or have slash as root).
-	static boost::filesystem::path absoluteDotDotPrefix(boost::filesystem::path const& _path);
-
-	/// @returns true if the path contains any .. segments.
-	static bool hasDotDotSegments(boost::filesystem::path const& _path);
-
-	/// Base path, used for resolving relative paths in imports.
-	boost::filesystem::path m_basePath;
-
-	/// Additional directories used for resolving relative paths in imports.
-	std::vector<boost::filesystem::path> m_includePaths;
-
-	/// list of allowed directories to read files from
-	FileSystemPathSet m_allowedDirectories;
-
-	/// map of input files to source code strings
-	StringMap m_sourceCodes;
-};
-
-}
diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
deleted file mode 100644
index fd3fbbc02c45..000000000000
--- a/libsolidity/interface/GasEstimator.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Gas consumption estimator working alongside the AST.
- */
-
-#include <libsolidity/interface/GasEstimator.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/codegen/CompilerUtils.h>
-
-#include <libevmasm/ControlFlowGraph.h>
-#include <libevmasm/KnownState.h>
-#include <libevmasm/PathGasMeter.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/Keccak256.h>
-
-#include <functional>
-#include <map>
-#include <memory>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-GasEstimator::GasConsumption GasEstimator::functionalEstimation(
-	AssemblyItems const& _items,
-	std::string const& _signature
-) const
-{
-	auto state = std::make_shared<KnownState>();
-
-	if (!_signature.empty())
-	{
-		ExpressionClasses& classes = state->expressionClasses();
-		using Id = ExpressionClasses::Id;
-		using Ids = std::vector<Id>;
-		Id hashValue = classes.find(u256(util::selectorFromSignatureU32(_signature)));
-		Id calldata = classes.find(Instruction::CALLDATALOAD, Ids{classes.find(u256(0))});
-		if (!m_evmVersion.hasBitwiseShifting())
-			// div(calldataload(0), 1 << 224) equals to hashValue
-			classes.forceEqual(
-				hashValue,
-				Instruction::DIV,
-				Ids{calldata, classes.find(u256(1) << 224)}
-			);
-		else
-			// shr(0xe0, calldataload(0)) equals to hashValue
-			classes.forceEqual(
-				hashValue,
-				Instruction::SHR,
-				Ids{classes.find(u256(0xe0)), calldata}
-			);
-		// lt(calldatasize(), 4) equals to 0 (ignore the shortcut for fallback functions)
-		classes.forceEqual(
-			classes.find(u256(0)),
-			Instruction::LT,
-			Ids{classes.find(Instruction::CALLDATASIZE), classes.find(u256(4))}
-		);
-	}
-
-	return PathGasMeter::estimateMax(_items, m_evmVersion, 0, state);
-}
-
-GasEstimator::GasConsumption GasEstimator::functionalEstimation(
-	AssemblyItems const& _items,
-	size_t const& _offset,
-	FunctionDefinition const& _function
-) const
-{
-	auto state = std::make_shared<KnownState>();
-
-	unsigned parametersSize = CompilerUtils::sizeOnStack(_function.parameters());
-	if (parametersSize > 16)
-		return GasConsumption::infinite();
-
-	// Store an invalid return value on the stack, so that the path estimator breaks upon reaching
-	// the return jump.
-	AssemblyItem invalidTag(PushTag, u256(-0x10));
-	state->feedItem(invalidTag, true);
-	if (parametersSize > 0)
-		state->feedItem(swapInstruction(parametersSize));
-
-	return PathGasMeter::estimateMax(_items, m_evmVersion, _offset, state);
-}
-
-std::set<ASTNode const*> GasEstimator::finestNodesAtLocation(
-	std::vector<ASTNode const*> const& _roots
-)
-{
-	std::map<SourceLocation, ASTNode const*> locations;
-	std::set<ASTNode const*> nodes;
-	SimpleASTVisitor visitor(std::function<bool(ASTNode const&)>(), [&](ASTNode const& _n)
-	{
-		if (!locations.count(_n.location()))
-		{
-			locations[_n.location()] = &_n;
-			nodes.insert(&_n);
-		}
-	});
-
-	for (ASTNode const* root: _roots)
-		root->accept(visitor);
-	return nodes;
-}
diff --git a/libsolidity/interface/GasEstimator.h b/libsolidity/interface/GasEstimator.h
deleted file mode 100644
index 5f564cb0ace7..000000000000
--- a/libsolidity/interface/GasEstimator.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Gas consumption estimator working alongside the AST.
- */
-
-#pragma once
-
-#include <liblangutil/EVMVersion.h>
-
-#include <libevmasm/Assembly.h>
-#include <libevmasm/GasMeter.h>
-
-#include <array>
-#include <map>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-class ASTNode;
-class FunctionDefinition;
-
-struct GasEstimator
-{
-public:
-	using GasConsumption = evmasm::GasMeter::GasConsumption;
-	using ASTGasConsumption = std::map<ASTNode const*, GasConsumption>;
-	using ASTGasConsumptionSelfAccumulated =
-		std::map<ASTNode const*, std::array<GasConsumption, 2>>;
-
-	explicit GasEstimator(langutil::EVMVersion _evmVersion): m_evmVersion(_evmVersion) {}
-
-	/// @returns the estimated gas consumption by the (public or external) function with the
-	/// given signature. If no signature is given, estimates the maximum gas usage.
-	GasConsumption functionalEstimation(
-		evmasm::AssemblyItems const& _items,
-		std::string const& _signature = ""
-	) const;
-
-	/// @returns the estimated gas consumption by the given function which starts at the given
-	/// offset into the list of assembly items.
-	/// @note this does not work correctly for recursive functions.
-	GasConsumption functionalEstimation(
-		evmasm::AssemblyItems const& _items,
-		size_t const& _offset,
-		FunctionDefinition const& _function
-	) const;
-
-private:
-	/// @returns the set of AST nodes which are the finest nodes at their location.
-	static std::set<ASTNode const*> finestNodesAtLocation(std::vector<ASTNode const*> const& _roots);
-	langutil::EVMVersion m_evmVersion;
-};
-
-}
diff --git a/libsolidity/interface/ImportRemapper.cpp b/libsolidity/interface/ImportRemapper.cpp
deleted file mode 100644
index 6b870875e35b..000000000000
--- a/libsolidity/interface/ImportRemapper.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/interface/ImportRemapper.h>
-#include <libsolutil/CommonIO.h>
-#include <liblangutil/Exceptions.h>
-
-namespace solidity::frontend
-{
-
-void ImportRemapper::setRemappings(std::vector<Remapping> _remappings)
-{
-	for (auto const& remapping: _remappings)
-		solAssert(!remapping.prefix.empty(), "");
-	m_remappings = std::move(_remappings);
-}
-
-SourceUnitName ImportRemapper::apply(ImportPath const& _path, std::string const& _context) const
-{
-	// Try to find the longest prefix match in all remappings that are active in the current context.
-	auto isPrefixOf = [](std::string const& _a, std::string const& _b)
-	{
-		if (_a.length() > _b.length())
-			return false;
-		return equal(_a.begin(), _a.end(), _b.begin());
-	};
-
-	size_t longestPrefix = 0;
-	size_t longestContext = 0;
-	std::string bestMatchTarget;
-
-	for (auto const& redir: m_remappings)
-	{
-		std::string context = util::sanitizePath(redir.context);
-		std::string prefix = util::sanitizePath(redir.prefix);
-
-		// Skip if current context is closer
-		if (context.length() < longestContext)
-			continue;
-		// Skip if redir.context is not a prefix of _context
-		if (!isPrefixOf(context, _context))
-			continue;
-		// Skip if we already have a closer prefix match.
-		if (prefix.length() < longestPrefix && context.length() == longestContext)
-			continue;
-		// Skip if the prefix does not match.
-		if (!isPrefixOf(prefix, _path))
-			continue;
-
-		longestContext = context.length();
-		longestPrefix = prefix.length();
-		bestMatchTarget = util::sanitizePath(redir.target);
-	}
-	std::string path = bestMatchTarget;
-	path.append(_path.begin() + static_cast<std::string::difference_type>(longestPrefix), _path.end());
-	return path;
-}
-
-bool ImportRemapper::isRemapping(std::string_view _input)
-{
-	return _input.find("=") != std::string::npos;
-}
-
-	std::optional<ImportRemapper::Remapping> ImportRemapper::parseRemapping(std::string_view _input)
-{
-	auto equals = std::find(_input.cbegin(), _input.cend(), '=');
-	if (equals == _input.end())
-		return std::nullopt;
-
-	auto const colon = std::find(_input.cbegin(), equals, ':');
-
-	Remapping remapping{
-		(colon == equals ? "" : std::string(_input.cbegin(), colon)),
-		(colon == equals ? std::string(_input.cbegin(), equals) : std::string(colon + 1, equals)),
-		std::string(equals + 1, _input.cend()),
-	};
-
-	if (remapping.prefix.empty())
-		return std::nullopt;
-
-	return remapping;
-}
-
-}
diff --git a/libsolidity/interface/ImportRemapper.h b/libsolidity/interface/ImportRemapper.h
deleted file mode 100644
index 66946d0917dd..000000000000
--- a/libsolidity/interface/ImportRemapper.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <optional>
-#include <string>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-// Some helper typedefs to make reading the signatures more self explaining.
-using SourceUnitName = std::string;
-using SourceCode = std::string;
-using ImportPath = std::string;
-
-/// The ImportRemapper is being used on imported file paths for being remapped to source unit IDs before being loaded.
-class ImportRemapper
-{
-public:
-	struct Remapping
-	{
-		bool operator!=(Remapping const& _other) const noexcept { return !(*this == _other); }
-		bool operator==(Remapping const& _other) const noexcept
-		{
-			return
-				context == _other.context &&
-				prefix == _other.prefix &&
-				target == _other.target;
-		}
-
-		std::string context;
-		std::string prefix;
-		std::string target;
-	};
-
-	void clear() { m_remappings.clear(); }
-
-	void setRemappings(std::vector<Remapping> _remappings);
-	std::vector<Remapping> const& remappings() const noexcept { return m_remappings; }
-
-	SourceUnitName apply(ImportPath const& _path, std::string const& _context) const;
-
-	/// @returns true if the string can be parsed as a remapping
-	static bool isRemapping(std::string_view _input);
-
-	/// Parses a remapping of the format "context:prefix=target".
-	static std::optional<Remapping> parseRemapping(std::string_view _input);
-
-private:
-	/// list of path prefix remappings, e.g. mylibrary: github.com/ethereum = /usr/local/ethereum
-	/// "context:prefix=target"
-	std::vector<Remapping> m_remappings = {};
-};
-
-}
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
deleted file mode 100644
index 539a3573f50b..000000000000
--- a/libsolidity/interface/Natspec.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris <lefteris@ethdev.com>
- * @date 2014
- * Takes the parsed AST and produces the Natspec documentation:
- * https://github.com/ethereum/wiki/wiki/Ethereum-Natural-Specification-Format
- *
- * Can generally deal with JSON files
- */
-
-#include <libsolidity/interface/Natspec.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <boost/algorithm/string.hpp>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
-{
-	Json::Value doc{Json::objectValue};
-
-	doc["version"] = Json::Value(c_natspecVersion);
-	doc["kind"]    = Json::Value("user");
-	doc["methods"] = Json::objectValue;
-
-	auto constructorDefinition(_contractDef.constructor());
-	if (constructorDefinition)
-	{
-		std::string const value = extractDoc(constructorDefinition->annotation().docTags, "notice");
-		if (!value.empty())
-		{
-			// add the constructor, only if we have any documentation to add
-			Json::Value user{Json::objectValue};
-			user["notice"] = Json::Value(value);
-			doc["methods"]["constructor"] = user;
-		}
-	}
-
-	std::string notice = extractDoc(_contractDef.annotation().docTags, "notice");
-	if (!notice.empty())
-		doc["notice"] = Json::Value(notice);
-
-	for (auto const& it: _contractDef.interfaceFunctions())
-		if (it.second->hasDeclaration())
-		{
-			std::string value;
-
-			if (auto const* f = dynamic_cast<FunctionDefinition const*>(&it.second->declaration()))
-				value = extractDoc(f->annotation().docTags, "notice");
-			else if (auto var = dynamic_cast<VariableDeclaration const*>(&it.second->declaration()))
-			{
-				solAssert(var->isStateVariable() && var->isPublic(), "");
-				value = extractDoc(var->annotation().docTags, "notice");
-			}
-
-			if (!value.empty())
-				// since @notice is the only user tag if missing function should not appear
-				doc["methods"][it.second->externalSignature()]["notice"] = value;
-		}
-
-	for (auto const& event: uniqueInterfaceEvents(_contractDef))
-	{
-		std::string value = extractDoc(event->annotation().docTags, "notice");
-		if (!value.empty())
-			doc["events"][event->functionType(true)->externalSignature()]["notice"] = value;
-	}
-
-	for (auto const& error: _contractDef.interfaceErrors())
-	{
-		std::string value = extractDoc(error->annotation().docTags, "notice");
-		if (!value.empty())
-		{
-			Json::Value errorDoc{Json::objectValue};
-			errorDoc["notice"] = value;
-			doc["errors"][error->functionType(true)->externalSignature()].append(std::move(errorDoc));
-		}
-	}
-
-	return doc;
-}
-
-Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
-{
-	Json::Value doc = extractCustomDoc(_contractDef.annotation().docTags);
-
-	doc["version"] = Json::Value(c_natspecVersion);
-	doc["kind"] = Json::Value("dev");
-
-	auto author = extractDoc(_contractDef.annotation().docTags, "author");
-	if (!author.empty())
-		doc["author"] = author;
-	auto title = extractDoc(_contractDef.annotation().docTags, "title");
-	if (!title.empty())
-		doc["title"] = title;
-	auto dev = extractDoc(_contractDef.annotation().docTags, "dev");
-	if (!dev.empty())
-		doc["details"] = Json::Value(dev);
-
-	doc["methods"] = Json::objectValue;
-	auto constructorDefinition(_contractDef.constructor());
-	if (constructorDefinition)
-	{
-		Json::Value constructor(devDocumentation(constructorDefinition->annotation().docTags));
-		if (!constructor.empty())
-			// add the constructor, only if we have any documentation to add
-			doc["methods"]["constructor"] = constructor;
-	}
-
-	for (auto const& it: _contractDef.interfaceFunctions())
-	{
-		if (!it.second->hasDeclaration())
-			continue;
-		if (auto fun = dynamic_cast<FunctionDefinition const*>(&it.second->declaration()))
-		{
-			Json::Value method(devDocumentation(fun->annotation().docTags));
-			// add the function, only if we have any documentation to add
-			Json::Value jsonReturn = extractReturnParameterDocs(
-				fun->annotation().docTags,
-				fun->functionType(false)->returnParameterNames()
-			);
-
-			if (!jsonReturn.empty())
-				method["returns"] = std::move(jsonReturn);
-
-			if (!method.empty())
-				doc["methods"][it.second->externalSignature()] = std::move(method);
-		}
-	}
-
-	for (VariableDeclaration const* varDecl: _contractDef.stateVariables())
-	{
-		if (auto devDoc = devDocumentation(varDecl->annotation().docTags); !devDoc.empty())
-			doc["stateVariables"][varDecl->name()] = devDoc;
-
-		auto const assignIfNotEmpty = [&](std::string const& _name, Json::Value const& _content)
-		{
-			if (!_content.empty())
-				doc["stateVariables"][varDecl->name()][_name] = _content;
-		};
-
-		if (varDecl->annotation().docTags.count("return") == 1)
-			assignIfNotEmpty("return", extractDoc(varDecl->annotation().docTags, "return"));
-
-		if (FunctionTypePointer functionType = varDecl->functionType(false))
-			assignIfNotEmpty("returns", extractReturnParameterDocs(
-				varDecl->annotation().docTags,
-				functionType->returnParameterNames()
-			));
-	}
-
-	for (auto const& event: uniqueInterfaceEvents(_contractDef))
-		if (auto devDoc = devDocumentation(event->annotation().docTags); !devDoc.empty())
-			doc["events"][event->functionType(true)->externalSignature()] = devDoc;
-	for (auto const& error: _contractDef.interfaceErrors())
-		if (auto devDoc = devDocumentation(error->annotation().docTags); !devDoc.empty())
-			doc["errors"][error->functionType(true)->externalSignature()].append(devDoc);
-
-	return doc;
-}
-
-Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames)
-{
-	Json::Value jsonReturn{Json::objectValue};
-	auto returnDocs = _tags.equal_range("return");
-
-	if (!_returnParameterNames.empty())
-	{
-		size_t n = 0;
-		for (auto i = returnDocs.first; i != returnDocs.second; i++)
-		{
-			std::string paramName = _returnParameterNames.at(n);
-			std::string content = i->second.content;
-
-			if (paramName.empty())
-				paramName = "_" + std::to_string(n);
-			else
-			{
-				//check to make sure the first word of the doc str is the same as the return name
-				auto nameEndPos = content.find_first_of(" \t");
-				solAssert(content.substr(0, nameEndPos) == paramName, "No return param name given: " + paramName);
-				content = content.substr(nameEndPos+1);
-			}
-
-			jsonReturn[paramName] = Json::Value(content);
-			n++;
-		}
-	}
-
-	return jsonReturn;
-}
-
-std::string Natspec::extractDoc(std::multimap<std::string, DocTag> const& _tags, std::string const& _name)
-{
-	std::string value;
-	auto range = _tags.equal_range(_name);
-	for (auto i = range.first; i != range.second; i++)
-		value += i->second.content;
-	return value;
-}
-
-Json::Value Natspec::extractCustomDoc(std::multimap<std::string, DocTag> const& _tags)
-{
-	std::map<std::string, std::string> concatenated;
-	for (auto const& [tag, value]: _tags)
-		if (boost::starts_with(tag, "custom"))
-			concatenated[tag] += value.content;
-	// We do not want to create an object if there are no custom tags found.
-	if (concatenated.empty())
-		return Json::nullValue;
-	Json::Value result{Json::objectValue};
-	for (auto& [tag, value]: concatenated)
-		result[tag] = std::move(value);
-	return result;
-}
-
-Json::Value Natspec::devDocumentation(std::multimap<std::string, DocTag> const& _tags)
-{
-	Json::Value json = extractCustomDoc(_tags);
-	auto dev = extractDoc(_tags, "dev");
-	if (!dev.empty())
-		json["details"] = Json::Value(dev);
-
-	auto author = extractDoc(_tags, "author");
-	if (!author.empty())
-		json["author"] = author;
-
-	Json::Value params(Json::objectValue);
-	auto paramRange = _tags.equal_range("param");
-	for (auto i = paramRange.first; i != paramRange.second; ++i)
-		params[i->second.paramName] = Json::Value(i->second.content);
-
-	if (!params.empty())
-		json["params"] = params;
-
-	return json;
-}
-
-std::vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinition const& _contract)
-{
-	auto eventSignature = [](EventDefinition const* _event) -> std::string {
-		FunctionType const* functionType = _event->functionType(true);
-		solAssert(functionType, "");
-		return functionType->externalSignature();
-	};
-	auto compareBySignature =
-		[&](EventDefinition const* _lhs, EventDefinition const* _rhs) -> bool {
-			return eventSignature(_lhs) < eventSignature(_rhs);
-		};
-
-	std::set<EventDefinition const*, decltype(compareBySignature)> uniqueEvents{compareBySignature};
-	// Insert events defined in the contract first so that in case of a conflict
-	// they're the ones that get selected.
-	uniqueEvents += _contract.definedInterfaceEvents();
-
-	std::set<EventDefinition const*, decltype(compareBySignature)> filteredUsedEvents{compareBySignature};
-	std::set<std::string> usedSignatures;
-	for (EventDefinition const* event: _contract.usedInterfaceEvents())
-	{
-		auto&& [eventIt, eventInserted] = filteredUsedEvents.insert(event);
-		auto&& [signatureIt, signatureInserted] = usedSignatures.insert(eventSignature(event));
-		if (!signatureInserted)
-			filteredUsedEvents.erase(eventIt);
-	}
-
-	uniqueEvents += filteredUsedEvents;
-	return util::convertContainer<std::vector<EventDefinition const*>>(std::move(uniqueEvents));
-}
diff --git a/libsolidity/interface/Natspec.h b/libsolidity/interface/Natspec.h
deleted file mode 100644
index e75485097def..000000000000
--- a/libsolidity/interface/Natspec.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris <lefteris@ethdev.com>
- * @date 2014
- * Takes the parsed AST and produces the Natspec documentation:
- * https://docs.soliditylang.org/en/develop/natspec-format.html
- *
- * Can generally deal with JSON files
- */
-
-#pragma once
-
-#include <json/json.h>
-#include <memory>
-#include <string>
-#include <libsolidity/ast/AST.h>
-
-namespace solidity::frontend
-{
-
-// Forward declarations
-class ContractDefinition;
-struct DocTag;
-
-class Natspec
-{
-public:
-	static unsigned int constexpr c_natspecVersion = 1;
-
-	/// Get the User documentation of the contract
-	/// @param _contractDef The contract definition
-	/// @return             A JSON representation of the contract's user documentation
-	static Json::Value userDocumentation(ContractDefinition const& _contractDef);
-	/// Generates the Developer's documentation of the contract
-	/// @param _contractDef The contract definition
-	/// @return             A JSON representation
-	///                     of the contract's developer documentation
-	static Json::Value devDocumentation(ContractDefinition const& _contractDef);
-
-private:
-	/// @returns concatenation of all content under the given tag name.
-	static std::string extractDoc(std::multimap<std::string, DocTag> const& _tags, std::string const& _name);
-
-	/// Extract all custom tags from @a _tags.
-	static Json::Value extractCustomDoc(std::multimap<std::string, DocTag> const& _tags);
-
-	/// Helper-function that will create a json object with dev specific annotations, if present.
-	/// @param _tags docTags that are used.
-	/// @return      A JSON representation
-	///              of the contract's developer documentation
-	static Json::Value devDocumentation(std::multimap<std::string, DocTag> const& _tags);
-
-	/// Helper-function that will create a json object for the "returns" field for a given function definition.
-	/// @param _tags docTags that are used.
-	/// @param _returnParameterNames names of the return parameters
-	/// @return      A JSON representation
-	///              of a method's return notice documentation
-	static Json::Value extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames);
-
-	/// Temporary function until https://github.com/ethereum/solidity/issues/11114 is implemented.
-	/// @return all events defined in the contract and its base contracts and all events
-	/// that are emitted during the execution of the contract, but allowing only unique signatures.
-	/// In case of conflict between a library event and a contract one, selects the latter
-	/// In case of conflict between two library events, none is selected
-	static std::vector<EventDefinition const*> uniqueInterfaceEvents(ContractDefinition const& _contract);
-};
-
-}
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
deleted file mode 100644
index 46683088a042..000000000000
--- a/libsolidity/interface/OptimiserSettings.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * @date 2017
- * Helper class for optimiser settings.
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-
-#include <cstddef>
-#include <string>
-
-namespace solidity::frontend
-{
-
-enum class OptimisationPreset
-{
-	None,
-	Minimal,
-	Standard,
-	Full,
-};
-
-struct OptimiserSettings
-{
-	static char constexpr DefaultYulOptimiserSteps[] =
-		"dhfoDgvulfnTUtnIf"            // None of these can make stack problems worse
-		"["
-			"xa[r]EscLM"               // Turn into SSA and simplify
-			"cCTUtTOntnfDIul"          // Perform structural simplification
-			"Lcul"                     // Simplify again
-			"Vcul [j]"                 // Reverse SSA
-
-			// should have good "compilability" property here.
-
-			"Tpeul"                    // Run functional expression inliner
-			"xa[rul]"                  // Prune a bit more in SSA
-			"xa[r]cL"                  // Turn into SSA again and simplify
-			"gvif"                     // Run full inliner
-			"CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify
-		"]"
-		"jmul[jul] VcTOcul jmul";      // Make source short and pretty
-
-	static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmu";
-
-	/// No optimisations at all - not recommended.
-	static OptimiserSettings none()
-	{
-		return {};
-	}
-	/// Minimal optimisations: Peephole and jumpdest remover
-	static OptimiserSettings minimal()
-	{
-		OptimiserSettings s = none();
-		s.runJumpdestRemover = true;
-		s.runPeephole = true;
-		s.simpleCounterForLoopUncheckedIncrement = true;
-		return s;
-	}
-	/// Standard optimisations.
-	static OptimiserSettings standard()
-	{
-		OptimiserSettings s;
-		s.runOrderLiterals = true;
-		s.runInliner = true;
-		s.runJumpdestRemover = true;
-		s.runPeephole = true;
-		s.runDeduplicate = true;
-		s.runCSE = true;
-		s.runConstantOptimiser = true;
-		s.simpleCounterForLoopUncheckedIncrement = true;
-		s.runYulOptimiser = true;
-		s.optimizeStackAllocation = true;
-		return s;
-	}
-	/// Full optimisations. Currently an alias for standard optimisations.
-	static OptimiserSettings full()
-	{
-		return standard();
-	}
-
-	static OptimiserSettings preset(OptimisationPreset _preset)
-	{
-		switch (_preset)
-		{
-			case OptimisationPreset::None: return none();
-			case OptimisationPreset::Minimal: return minimal();
-			case OptimisationPreset::Standard: return standard();
-			case OptimisationPreset::Full: return full();
-		}
-		util::unreachable();
-	}
-
-	bool operator==(OptimiserSettings const& _other) const
-	{
-		return
-			runOrderLiterals == _other.runOrderLiterals &&
-			runInliner == _other.runInliner &&
-			runJumpdestRemover == _other.runJumpdestRemover &&
-			runPeephole == _other.runPeephole &&
-			runDeduplicate == _other.runDeduplicate &&
-			runCSE == _other.runCSE &&
-			runConstantOptimiser == _other.runConstantOptimiser &&
-			simpleCounterForLoopUncheckedIncrement == _other.simpleCounterForLoopUncheckedIncrement &&
-			optimizeStackAllocation == _other.optimizeStackAllocation &&
-			runYulOptimiser == _other.runYulOptimiser &&
-			yulOptimiserSteps == _other.yulOptimiserSteps &&
-			expectedExecutionsPerDeployment == _other.expectedExecutionsPerDeployment;
-	}
-
-	bool operator!=(OptimiserSettings const& _other) const
-	{
-		return !(*this == _other);
-	}
-
-	/// Move literals to the right of commutative binary operators during code generation.
-	/// This helps exploiting associativity.
-	bool runOrderLiterals = false;
-	/// Inliner
-	bool runInliner = false;
-	/// Non-referenced jump destination remover.
-	bool runJumpdestRemover = false;
-	/// Peephole optimizer
-	bool runPeephole = false;
-	/// Assembly block deduplicator
-	bool runDeduplicate = false;
-	/// Common subexpression eliminator based on assembly items.
-	bool runCSE = false;
-	/// Constant optimizer, which tries to find better representations that satisfy the given
-	/// size/cost-trade-off.
-	bool runConstantOptimiser = false;
-	/// Perform more efficient stack allocation for variables during code generation from Yul to bytecode.
-	bool simpleCounterForLoopUncheckedIncrement = false;
-	/// Yul optimiser with default settings. Will only run on certain parts of the code for now.
-	bool optimizeStackAllocation = false;
-	/// Allow unchecked arithmetic when incrementing the counter of certain kinds of 'for' loop
-	bool runYulOptimiser = false;
-	/// Sequence of optimisation steps to be performed by Yul optimiser.
-	/// Note that there are some hard-coded steps in the optimiser and you cannot disable
-	/// them just by setting this to an empty string. Set @a runYulOptimiser to false if you want
-	/// no optimisations.
-	std::string yulOptimiserSteps = DefaultYulOptimiserSteps;
-	/// Sequence of clean-up optimisation steps after yulOptimiserSteps is run. Note that if the string
-	/// is left empty, there will still be hard-coded optimisation steps that will run regardless.
-	/// Set @a runYulOptimiser to false if you want no optimisations.
-	std::string yulOptimiserCleanupSteps = DefaultYulOptimiserCleanupSteps;
-	/// This specifies an estimate on how often each opcode in this assembly will be executed,
-	/// i.e. use a small value to optimise for size and a large value to optimise for runtime gas usage.
-	size_t expectedExecutionsPerDeployment = 200;
-};
-
-}
diff --git a/libsolidity/interface/ReadFile.h b/libsolidity/interface/ReadFile.h
deleted file mode 100644
index ff505fee723d..000000000000
--- a/libsolidity/interface/ReadFile.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-
-#include <functional>
-#include <string>
-
-namespace solidity::frontend
-{
-
-class ReadCallback
-{
-public:
-	/// Noncopyable.
-	ReadCallback(ReadCallback const&) = delete;
-	ReadCallback& operator=(ReadCallback const&) = delete;
-
-	/// File reading or generic query result.
-	struct Result
-	{
-		bool success;
-		std::string responseOrErrorMessage;
-	};
-
-	enum class Kind
-	{
-		ReadFile,
-		SMTQuery
-	};
-
-	static std::string kindString(Kind _kind)
-	{
-		switch (_kind)
-		{
-		case Kind::ReadFile:
-			return "source";
-		case Kind::SMTQuery:
-			return "smt-query";
-		default:
-			solAssert(false, "");
-		}
-	}
-
-	/// File reading or generic query callback.
-	using Callback = std::function<Result(std::string const&, std::string const&)>;
-};
-
-}
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
deleted file mode 100644
index 92e0485b84a7..000000000000
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/interface/SMTSolverCommand.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/process.hpp>
-
-using solidity::langutil::InternalCompilerError;
-using solidity::util::errinfo_comment;
-
-
-namespace solidity::frontend
-{
-
-SMTSolverCommand::SMTSolverCommand(std::string _solverCmd) : m_solverCmd(_solverCmd) {}
-
-ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
-{
-	try
-	{
-		if (_kind != ReadCallback::kindString(ReadCallback::Kind::SMTQuery))
-			solAssert(false, "SMTQuery callback used as callback kind " + _kind);
-
-		auto tempDir = solidity::util::TemporaryDirectory("smt");
-		util::h256 queryHash = util::keccak256(_query);
-		auto queryFileName = tempDir.path() / ("query_" + queryHash.hex() + ".smt2");
-
-		auto queryFile = boost::filesystem::ofstream(queryFileName);
-		queryFile << _query;
-
-		auto eldBin = boost::process::search_path(m_solverCmd);
-
-		if (eldBin.empty())
-			return ReadCallback::Result{false, m_solverCmd + " binary not found."};
-
-		boost::process::ipstream pipe;
-		boost::process::child eld(
-			eldBin,
-			queryFileName,
-			boost::process::std_out > pipe
-		);
-
-		std::vector<std::string> data;
-		std::string line;
-		while (eld.running() && std::getline(pipe, line))
-			if (!line.empty())
-				data.push_back(line);
-
-		eld.wait();
-
-		return ReadCallback::Result{true, boost::join(data, "\n")};
-	}
-	catch (...)
-	{
-		return ReadCallback::Result{false, "Unknown exception in SMTQuery callback: " + boost::current_exception_diagnostic_information()};
-	}
-}
-
-}
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
deleted file mode 100644
index 56a6ba171055..000000000000
--- a/libsolidity/interface/SMTSolverCommand.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolidity/interface/ReadFile.h>
-
-#include <boost/filesystem.hpp>
-
-namespace solidity::frontend
-{
-
-/// SMTSolverCommand wraps an SMT solver called via its binary in the OS.
-class SMTSolverCommand
-{
-public:
-	SMTSolverCommand(std::string _solverCmd);
-
-	/// Calls an SMT solver with the given query.
-	frontend::ReadCallback::Result solve(std::string const& _kind, std::string const& _query);
-
-	frontend::ReadCallback::Callback solver()
-	{
-		return [this](std::string const& _kind, std::string const& _query) { return solve(_kind, _query); };
-	}
-
-private:
-	/// The name of the solver's binary.
-	std::string const m_solverCmd;
-};
-
-}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
deleted file mode 100644
index 91a748053131..000000000000
--- a/libsolidity/interface/StandardCompiler.cpp
+++ /dev/null
@@ -1,1693 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * @date 2016
- * Standard JSON compiler interface.
- */
-
-#include <libsolidity/interface/StandardCompiler.h>
-#include <libsolidity/interface/ImportRemapper.h>
-
-#include <libsolidity/ast/ASTJsonExporter.h>
-#include <libyul/YulStack.h>
-#include <libyul/Exceptions.h>
-#include <libyul/optimiser/Suite.h>
-
-#include <libevmasm/Disassemble.h>
-
-#include <libsmtutil/Exceptions.h>
-
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/JSON.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/CommonData.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <algorithm>
-#include <optional>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace std::string_literals;
-
-namespace
-{
-
-Json::Value formatError(
-	Error::Type _type,
-	std::string const& _component,
-	std::string const& _message,
-	std::string const& _formattedMessage = "",
-	Json::Value const& _sourceLocation = Json::Value(),
-	Json::Value const& _secondarySourceLocation = Json::Value()
-)
-{
-	Json::Value error{Json::objectValue};
-	error["type"] = Error::formatErrorType(_type);
-	error["component"] = _component;
-	error["severity"] = Error::formatErrorSeverityLowercase(Error::errorSeverity(_type));
-	error["message"] = _message;
-	error["formattedMessage"] = (_formattedMessage.length() > 0) ? _formattedMessage : _message;
-	if (_sourceLocation.isObject())
-		error["sourceLocation"] = _sourceLocation;
-	if (_secondarySourceLocation.isArray())
-		error["secondarySourceLocations"] = _secondarySourceLocation;
-	return error;
-}
-
-Json::Value formatFatalError(Error::Type _type, std::string const& _message)
-{
-	Json::Value output{Json::objectValue};
-	output["errors"] = Json::arrayValue;
-	output["errors"].append(formatError(_type, "general", _message));
-	return output;
-}
-
-Json::Value formatSourceLocation(SourceLocation const* location)
-{
-	if (!location || !location->sourceName)
-		return Json::nullValue;
-
-	Json::Value sourceLocation{Json::objectValue};
-	sourceLocation["file"] = *location->sourceName;
-	sourceLocation["start"] = location->start;
-	sourceLocation["end"] = location->end;
-	return sourceLocation;
-}
-
-Json::Value formatSecondarySourceLocation(SecondarySourceLocation const* _secondaryLocation)
-{
-	if (!_secondaryLocation)
-		return Json::nullValue;
-
-	Json::Value secondarySourceLocation{Json::arrayValue};
-	for (auto const& location: _secondaryLocation->infos)
-	{
-		Json::Value msg = formatSourceLocation(&location.second);
-		msg["message"] = location.first;
-		secondarySourceLocation.append(msg);
-	}
-	return secondarySourceLocation;
-}
-
-Json::Value formatErrorWithException(
-	CharStreamProvider const& _charStreamProvider,
-	util::Exception const& _exception,
-	Error::Type _type,
-	std::string const& _component,
-	std::string const& _message,
-	std::optional<ErrorId> _errorId = std::nullopt
-)
-{
-	std::string message;
-	// TODO: consider enabling color
-	std::string formattedMessage = SourceReferenceFormatter::formatExceptionInformation(
-		_exception,
-		_type,
-		_charStreamProvider,
-		false // colored
-	);
-
-	if (std::string const* description = _exception.comment())
-		message = ((_message.length() > 0) ? (_message + ":") : "") + *description;
-	else
-		message = _message;
-
-	Json::Value error = formatError(
-		_type,
-		_component,
-		message,
-		formattedMessage,
-		formatSourceLocation(boost::get_error_info<errinfo_sourceLocation>(_exception)),
-		formatSecondarySourceLocation(boost::get_error_info<errinfo_secondarySourceLocation>(_exception))
-	);
-
-	if (_errorId)
-		error["errorCode"] = std::to_string(_errorId.value().error);
-
-	return error;
-}
-
-std::map<std::string, std::set<std::string>> requestedContractNames(Json::Value const& _outputSelection)
-{
-	std::map<std::string, std::set<std::string>> contracts;
-	for (auto const& sourceName: _outputSelection.getMemberNames())
-	{
-		std::string key = (sourceName == "*") ? "" : sourceName;
-		for (auto const& contractName: _outputSelection[sourceName].getMemberNames())
-		{
-			std::string value = (contractName == "*") ? "" : contractName;
-			contracts[key].insert(value);
-		}
-	}
-	return contracts;
-}
-
-/// Returns true iff @a _hash (hex with 0x prefix) is the Keccak256 hash of the binary data in @a _content.
-bool hashMatchesContent(std::string const& _hash, std::string const& _content)
-{
-	try
-	{
-		return util::h256(_hash) == util::keccak256(_content);
-	}
-	catch (util::BadHexCharacter const&)
-	{
-		return false;
-	}
-}
-
-bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _artifact, bool _wildcardMatchesExperimental)
-{
-	static std::set<std::string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst"};
-	for (auto const& selectedArtifactJson: _outputSelection)
-	{
-		std::string const& selectedArtifact = selectedArtifactJson.asString();
-		if (
-			_artifact == selectedArtifact ||
-			boost::algorithm::starts_with(_artifact, selectedArtifact + ".")
-		)
-			return true;
-		else if (selectedArtifact == "*")
-		{
-			// "ir", "irOptimized" can only be matched by "*" if activated.
-			if (experimental.count(_artifact) == 0 || _wildcardMatchesExperimental)
-				return true;
-		}
-	}
-	return false;
-}
-
-///
-/// @a _outputSelection is a JSON object containing a two-level hashmap, where the first level is the filename,
-/// the second level is the contract name and the value is an array of artifact names to be requested for that contract.
-/// @a _file is the current file
-/// @a _contract is the current contract
-/// @a _artifact is the current artifact name
-///
-/// @returns true if the @a _outputSelection has a match for the requested target in the specific file / contract.
-///
-/// In @a _outputSelection the use of '*' as a wildcard is permitted.
-///
-/// @TODO optimise this. Perhaps flatten the structure upfront.
-///
-bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _file, std::string const& _contract, std::string const& _artifact, bool _wildcardMatchesExperimental)
-{
-	if (!_outputSelection.isObject())
-		return false;
-
-	for (auto const& file: { _file, std::string("*") })
-		if (_outputSelection.isMember(file) && _outputSelection[file].isObject())
-		{
-			/// For SourceUnit-level targets (such as AST) only allow empty name, otherwise
-			/// for Contract-level targets try both contract name and wildcard
-			std::vector<std::string> contracts{ _contract };
-			if (!_contract.empty())
-				contracts.emplace_back("*");
-			for (auto const& contract: contracts)
-				if (
-					_outputSelection[file].isMember(contract) &&
-					_outputSelection[file][contract].isArray() &&
-					isArtifactRequested(_outputSelection[file][contract], _artifact, _wildcardMatchesExperimental)
-				)
-					return true;
-		}
-
-	return false;
-}
-
-bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _file, std::string const& _contract, std::vector<std::string> const& _artifacts, bool _wildcardMatchesExperimental)
-{
-	for (auto const& artifact: _artifacts)
-		if (isArtifactRequested(_outputSelection, _file, _contract, artifact, _wildcardMatchesExperimental))
-			return true;
-	return false;
-}
-
-/// @returns all artifact names of the EVM object, either for creation or deploy time.
-std::vector<std::string> evmObjectComponents(std::string const& _objectKind)
-{
-	solAssert(_objectKind == "bytecode" || _objectKind == "deployedBytecode", "");
-	std::vector<std::string> components{"", ".object", ".opcodes", ".sourceMap", ".functionDebugData", ".generatedSources", ".linkReferences"};
-	if (_objectKind == "deployedBytecode")
-		components.push_back(".immutableReferences");
-	return util::applyMap(components, [&](auto const& _s) { return "evm." + _objectKind + _s; });
-}
-
-/// @returns true if any binary was requested, i.e. we actually have to perform compilation.
-bool isBinaryRequested(Json::Value const& _outputSelection)
-{
-	if (!_outputSelection.isObject())
-		return false;
-
-	// This does not include "evm.methodIdentifiers" on purpose!
-	static std::vector<std::string> const outputsThatRequireBinaries = std::vector<std::string>{
-		"*",
-		"ir", "irAst", "irOptimized", "irOptimizedAst",
-		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
-	} + evmObjectComponents("bytecode") + evmObjectComponents("deployedBytecode");
-
-	for (auto const& fileRequests: _outputSelection)
-		for (auto const& requests: fileRequests)
-			for (auto const& output: outputsThatRequireBinaries)
-				if (isArtifactRequested(requests, output, false))
-					return true;
-	return false;
-}
-
-/// @returns true if EVM bytecode was requested, i.e. we have to run the old code generator.
-bool isEvmBytecodeRequested(Json::Value const& _outputSelection)
-{
-	if (!_outputSelection.isObject())
-		return false;
-
-	static std::vector<std::string> const outputsThatRequireEvmBinaries = std::vector<std::string>{
-		"*",
-		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
-	} + evmObjectComponents("bytecode") + evmObjectComponents("deployedBytecode");
-
-	for (auto const& fileRequests: _outputSelection)
-		for (auto const& requests: fileRequests)
-			for (auto const& output: outputsThatRequireEvmBinaries)
-				if (isArtifactRequested(requests, output, false))
-					return true;
-	return false;
-}
-
-/// @returns true if any Yul IR was requested. Note that as an exception, '*' does not
-/// yet match "ir", "irAst", "irOptimized" or "irOptimizedAst"
-bool isIRRequested(Json::Value const& _outputSelection)
-{
-	if (!_outputSelection.isObject())
-		return false;
-
-	for (auto const& fileRequests: _outputSelection)
-		for (auto const& requests: fileRequests)
-			for (auto const& request: requests)
-				if (
-					request == "ir" ||
-					request == "irAst" ||
-					request == "irOptimized" ||
-					request == "irOptimizedAst"
-				)
-					return true;
-
-	return false;
-}
-
-Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
-{
-	Json::Value ret{Json::objectValue};
-
-	for (auto const& ref: linkReferences)
-	{
-		std::string const& fullname = ref.second;
-
-		// If the link reference does not contain a colon, assume that the file name is missing and
-		// the whole string represents the library name.
-		size_t colon = fullname.rfind(':');
-		std::string file = (colon != std::string::npos ? fullname.substr(0, colon) : "");
-		std::string name = (colon != std::string::npos ? fullname.substr(colon + 1) : fullname);
-
-		Json::Value fileObject = ret.get(file, Json::objectValue);
-		Json::Value libraryArray = fileObject.get(name, Json::arrayValue);
-
-		Json::Value entry{Json::objectValue};
-		entry["start"] = Json::UInt(ref.first);
-		entry["length"] = 20;
-
-		libraryArray.append(entry);
-		fileObject[name] = libraryArray;
-		ret[file] = fileObject;
-	}
-
-	return ret;
-}
-
-Json::Value formatImmutableReferences(std::map<u256, std::pair<std::string, std::vector<size_t>>> const& _immutableReferences)
-{
-	Json::Value ret{Json::objectValue};
-
-	for (auto const& immutableReference: _immutableReferences)
-	{
-		auto const& [identifier, byteOffsets] = immutableReference.second;
-		Json::Value array(Json::arrayValue);
-		for (size_t byteOffset: byteOffsets)
-		{
-			Json::Value byteRange{Json::objectValue};
-			byteRange["start"] = Json::UInt(byteOffset);
-			byteRange["length"] = Json::UInt(32); // immutable references are currently always 32 bytes wide
-			array.append(byteRange);
-		}
-		ret[identifier] = array;
-	}
-
-	return ret;
-}
-
-Json::Value collectEVMObject(
-	langutil::EVMVersion _evmVersion,
-	evmasm::LinkerObject const& _object,
-	std::string const* _sourceMap,
-	Json::Value _generatedSources,
-	bool _runtimeObject,
-	std::function<bool(std::string)> const& _artifactRequested
-)
-{
-	Json::Value output{Json::objectValue};
-	if (_artifactRequested("object"))
-		output["object"] = _object.toHex();
-	if (_artifactRequested("opcodes"))
-		output["opcodes"] = evmasm::disassemble(_object.bytecode, _evmVersion);
-	if (_artifactRequested("sourceMap"))
-		output["sourceMap"] = _sourceMap ? *_sourceMap : "";
-	if (_artifactRequested("functionDebugData"))
-		output["functionDebugData"] = StandardCompiler::formatFunctionDebugData(_object.functionDebugData);
-	if (_artifactRequested("linkReferences"))
-		output["linkReferences"] = formatLinkReferences(_object.linkReferences);
-	if (_runtimeObject && _artifactRequested("immutableReferences"))
-		output["immutableReferences"] = formatImmutableReferences(_object.immutableReferences);
-	if (_artifactRequested("generatedSources"))
-		output["generatedSources"] = std::move(_generatedSources);
-	return output;
-}
-
-std::optional<Json::Value> checkKeys(Json::Value const& _input, std::set<std::string> const& _keys, std::string const& _name)
-{
-	if (!!_input && !_input.isObject())
-		return formatFatalError(Error::Type::JSONError, "\"" + _name + "\" must be an object");
-
-	for (auto const& member: _input.getMemberNames())
-		if (!_keys.count(member))
-			return formatFatalError(Error::Type::JSONError, "Unknown key \"" + member + "\"");
-
-	return std::nullopt;
-}
-
-std::optional<Json::Value> checkRootKeys(Json::Value const& _input)
-{
-	static std::set<std::string> keys{"auxiliaryInput", "language", "settings", "sources"};
-	return checkKeys(_input, keys, "root");
-}
-
-std::optional<Json::Value> checkSourceKeys(Json::Value const& _input, std::string const& _name)
-{
-	static std::set<std::string> keys{"content", "keccak256", "urls"};
-	return checkKeys(_input, keys, "sources." + _name);
-}
-
-std::optional<Json::Value> checkAuxiliaryInputKeys(Json::Value const& _input)
-{
-	static std::set<std::string> keys{"smtlib2responses"};
-	return checkKeys(_input, keys, "auxiliaryInput");
-}
-
-std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
-{
-	static std::set<std::string> keys{"debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
-	return checkKeys(_input, keys, "settings");
-}
-
-std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
-{
-	static std::set<std::string> keys{"bmcLoopIterations", "contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "printQuery", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
-	return checkKeys(_input, keys, "modelChecker");
-}
-
-std::optional<Json::Value> checkOptimizerKeys(Json::Value const& _input)
-{
-	static std::set<std::string> keys{"details", "enabled", "runs"};
-	return checkKeys(_input, keys, "settings.optimizer");
-}
-
-std::optional<Json::Value> checkOptimizerDetailsKeys(Json::Value const& _input)
-{
-	static std::set<std::string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails", "simpleCounterForLoopUncheckedIncrement"};
-	return checkKeys(_input, keys, "settings.optimizer.details");
-}
-
-std::optional<Json::Value> checkOptimizerDetail(Json::Value const& _details, std::string const& _name, bool& _setting)
-{
-	if (_details.isMember(_name))
-	{
-		if (!_details[_name].isBool())
-			return formatFatalError(Error::Type::JSONError, "\"settings.optimizer.details." + _name + "\" must be Boolean");
-		_setting = _details[_name].asBool();
-	}
-	return {};
-}
-
-std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, std::string& _optimiserSetting, std::string& _cleanupSetting)
-{
-	if (_details.isMember(_name))
-	{
-		if (_details[_name].isString())
-		{
-			try
-			{
-				yul::OptimiserSuite::validateSequence(_details[_name].asString());
-			}
-			catch (yul::OptimizerException const& _exception)
-			{
-				return formatFatalError(
-					Error::Type::JSONError,
-					"Invalid optimizer step sequence in \"settings.optimizer.details." + _name + "\": " + _exception.what()
-				);
-			}
-
-			std::string const fullSequence = _details[_name].asString();
-			auto const delimiterPos = fullSequence.find(":");
-			_optimiserSetting = fullSequence.substr(0, delimiterPos);
-
-			if (delimiterPos != std::string::npos)
-				_cleanupSetting = fullSequence.substr(delimiterPos + 1);
-			else
-				solAssert(_cleanupSetting == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
-		}
-		else
-			return formatFatalError(Error::Type::JSONError, "\"settings.optimizer.details." + _name + "\" must be a string");
-
-	}
-	return {};
-}
-
-std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
-{
-	if (_input.isObject())
-	{
-		if (_input.isMember("appendCBOR") && !_input["appendCBOR"].isBool())
-			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.appendCBOR\" must be Boolean");
-		if (_input.isMember("useLiteralContent") && !_input["useLiteralContent"].isBool())
-			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.useLiteralContent\" must be Boolean");
-
-		static std::set<std::string> hashes{"ipfs", "bzzr1", "none"};
-		if (_input.isMember("bytecodeHash") && !hashes.count(_input["bytecodeHash"].asString()))
-			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.bytecodeHash\" must be \"ipfs\", \"bzzr1\" or \"none\"");
-	}
-	static std::set<std::string> keys{"appendCBOR", "useLiteralContent", "bytecodeHash"};
-	return checkKeys(_input, keys, "settings.metadata");
-}
-
-std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelection)
-{
-	if (!!_outputSelection && !_outputSelection.isObject())
-		return formatFatalError(Error::Type::JSONError, "\"settings.outputSelection\" must be an object");
-
-	for (auto const& sourceName: _outputSelection.getMemberNames())
-	{
-		auto const& sourceVal = _outputSelection[sourceName];
-
-		if (!sourceVal.isObject())
-			return formatFatalError(
-				Error::Type::JSONError,
-				"\"settings.outputSelection." + sourceName + "\" must be an object"
-			);
-
-		for (auto const& contractName: sourceVal.getMemberNames())
-		{
-			auto const& contractVal = sourceVal[contractName];
-
-			if (!contractVal.isArray())
-				return formatFatalError(
-					Error::Type::JSONError,
-					"\"settings.outputSelection." +
-					sourceName +
-					"." +
-					contractName +
-					"\" must be a string array"
-				);
-
-			for (auto const& output: contractVal)
-				if (!output.isString())
-					return formatFatalError(
-						Error::Type::JSONError,
-						"\"settings.outputSelection." +
-						sourceName +
-						"." +
-						contractName +
-						"\" must be a string array"
-					);
-		}
-	}
-
-	return std::nullopt;
-}
-
-/// Validates the optimizer settings and returns them in a parsed object.
-/// On error returns the json-formatted error message.
-std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value const& _jsonInput)
-{
-	if (auto result = checkOptimizerKeys(_jsonInput))
-		return *result;
-
-	OptimiserSettings settings = OptimiserSettings::minimal();
-
-	if (_jsonInput.isMember("enabled"))
-	{
-		if (!_jsonInput["enabled"].isBool())
-			return formatFatalError(Error::Type::JSONError, "The \"enabled\" setting must be a Boolean.");
-
-		if (_jsonInput["enabled"].asBool())
-			settings = OptimiserSettings::standard();
-	}
-
-	if (_jsonInput.isMember("runs"))
-	{
-		if (!_jsonInput["runs"].isUInt())
-			return formatFatalError(Error::Type::JSONError, "The \"runs\" setting must be an unsigned number.");
-		settings.expectedExecutionsPerDeployment = _jsonInput["runs"].asUInt();
-	}
-
-	if (_jsonInput.isMember("details"))
-	{
-		Json::Value const& details = _jsonInput["details"];
-		if (auto result = checkOptimizerDetailsKeys(details))
-			return *result;
-
-		if (auto error = checkOptimizerDetail(details, "peephole", settings.runPeephole))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "inliner", settings.runInliner))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "jumpdestRemover", settings.runJumpdestRemover))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "orderLiterals", settings.runOrderLiterals))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "deduplicate", settings.runDeduplicate))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "cse", settings.runCSE))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "constantOptimizer", settings.runConstantOptimiser))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "yul", settings.runYulOptimiser))
-			return *error;
-		if (auto error = checkOptimizerDetail(details, "simpleCounterForLoopUncheckedIncrement", settings.simpleCounterForLoopUncheckedIncrement))
-			return *error;
-		settings.optimizeStackAllocation = settings.runYulOptimiser;
-		if (details.isMember("yulDetails"))
-		{
-			if (!settings.runYulOptimiser)
-				return formatFatalError(Error::Type::JSONError, "\"Providing yulDetails requires Yul optimizer to be enabled.");
-
-			if (auto result = checkKeys(details["yulDetails"], {"stackAllocation", "optimizerSteps"}, "settings.optimizer.details.yulDetails"))
-				return *result;
-			if (auto error = checkOptimizerDetail(details["yulDetails"], "stackAllocation", settings.optimizeStackAllocation))
-				return *error;
-			if (auto error = checkOptimizerDetailSteps(details["yulDetails"], "optimizerSteps", settings.yulOptimiserSteps, settings.yulOptimiserCleanupSteps))
-				return *error;
-		}
-	}
-	return { std::move(settings) };
-}
-
-}
-
-
-std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler::parseInput(Json::Value const& _input)
-{
-	InputsAndSettings ret;
-
-	if (!_input.isObject())
-		return formatFatalError(Error::Type::JSONError, "Input is not a JSON object.");
-
-	if (auto result = checkRootKeys(_input))
-		return *result;
-
-	ret.language = _input["language"].asString();
-
-	Json::Value const& sources = _input["sources"];
-
-	if (!sources.isObject() && !sources.isNull())
-		return formatFatalError(Error::Type::JSONError, "\"sources\" is not a JSON object.");
-
-	if (sources.empty())
-		return formatFatalError(Error::Type::JSONError, "No input sources specified.");
-
-	ret.errors = Json::arrayValue;
-
-	if (ret.language == "Solidity" || ret.language == "Yul")
-	{
-		for (auto const& sourceName: sources.getMemberNames())
-		{
-			std::string hash;
-
-			if (auto result = checkSourceKeys(sources[sourceName], sourceName))
-				return *result;
-
-			if (sources[sourceName]["keccak256"].isString())
-				hash = sources[sourceName]["keccak256"].asString();
-
-			if (sources[sourceName]["content"].isString())
-			{
-				std::string content = sources[sourceName]["content"].asString();
-				if (!hash.empty() && !hashMatchesContent(hash, content))
-					ret.errors.append(formatError(
-						Error::Type::IOError,
-						"general",
-						"Mismatch between content and supplied hash for \"" + sourceName + "\""
-					));
-				else
-					ret.sources[sourceName] = content;
-			}
-			else if (sources[sourceName]["urls"].isArray())
-			{
-				if (!m_readFile)
-					return formatFatalError(
-						Error::Type::JSONError, "No import callback supplied, but URL is requested."
-					);
-
-				std::vector<std::string> failures;
-				bool found = false;
-
-				for (auto const& url: sources[sourceName]["urls"])
-				{
-					if (!url.isString())
-						return formatFatalError(Error::Type::JSONError, "URL must be a string.");
-					ReadCallback::Result result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), url.asString());
-					if (result.success)
-					{
-						if (!hash.empty() && !hashMatchesContent(hash, result.responseOrErrorMessage))
-							ret.errors.append(formatError(
-								Error::Type::IOError,
-								"general",
-								"Mismatch between content and supplied hash for \"" + sourceName + "\" at \"" + url.asString() + "\""
-							));
-						else
-						{
-							ret.sources[sourceName] = result.responseOrErrorMessage;
-							found = true;
-							break;
-						}
-					}
-					else
-						failures.push_back(
-							"Cannot import url (\"" + url.asString() + "\"): " + result.responseOrErrorMessage
-						);
-				}
-
-				for (auto const& failure: failures)
-				{
-					/// If the import succeeded, let mark all the others as warnings, otherwise all of them are errors.
-					ret.errors.append(formatError(
-						found ? Error::Type::Warning : Error::Type::IOError,
-						"general",
-						failure
-					));
-				}
-			}
-			else
-				return formatFatalError(Error::Type::JSONError, "Invalid input source specified.");
-		}
-	}
-	else if (ret.language == "SolidityAST")
-	{
-		for (auto const& sourceName: sources.getMemberNames())
-			ret.sources[sourceName] = util::jsonCompactPrint(sources[sourceName]);
-	}
-
-	Json::Value const& auxInputs = _input["auxiliaryInput"];
-
-	if (auto result = checkAuxiliaryInputKeys(auxInputs))
-		return *result;
-
-	if (!!auxInputs)
-	{
-		Json::Value const& smtlib2Responses = auxInputs["smtlib2responses"];
-		if (!!smtlib2Responses)
-		{
-			if (!smtlib2Responses.isObject())
-				return formatFatalError(Error::Type::JSONError, "\"auxiliaryInput.smtlib2responses\" must be an object.");
-
-			for (auto const& hashString: smtlib2Responses.getMemberNames())
-			{
-				util::h256 hash;
-				try
-				{
-					hash = util::h256(hashString);
-				}
-				catch (util::BadHexCharacter const&)
-				{
-					return formatFatalError(Error::Type::JSONError, "Invalid hex encoding of SMTLib2 auxiliary input.");
-				}
-
-				if (!smtlib2Responses[hashString].isString())
-					return formatFatalError(
-						Error::Type::JSONError,
-						"\"smtlib2Responses." + hashString + "\" must be a string."
-					);
-
-				ret.smtLib2Responses[hash] = smtlib2Responses[hashString].asString();
-			}
-		}
-	}
-
-	Json::Value const& settings = _input.get("settings", Json::Value());
-
-	if (auto result = checkSettingsKeys(settings))
-		return *result;
-
-	if (settings.isMember("stopAfter"))
-	{
-		if (!settings["stopAfter"].isString())
-			return formatFatalError(Error::Type::JSONError, "\"settings.stopAfter\" must be a string.");
-
-		if (settings["stopAfter"].asString() != "parsing")
-			return formatFatalError(Error::Type::JSONError, "Invalid value for \"settings.stopAfter\". Only valid value is \"parsing\".");
-
-		ret.stopAfter = CompilerStack::State::Parsed;
-	}
-
-	if (settings.isMember("viaIR"))
-	{
-		if (!settings["viaIR"].isBool())
-			return formatFatalError(Error::Type::JSONError, "\"settings.viaIR\" must be a Boolean.");
-		ret.viaIR = settings["viaIR"].asBool();
-	}
-
-	if (settings.isMember("evmVersion"))
-	{
-		if (!settings["evmVersion"].isString())
-			return formatFatalError(Error::Type::JSONError, "evmVersion must be a string.");
-		std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(settings["evmVersion"].asString());
-		if (!version)
-			return formatFatalError(Error::Type::JSONError, "Invalid EVM version requested.");
-		if (version < EVMVersion::constantinople())
-			ret.errors.append(formatError(
-				Error::Type::Warning,
-				"general",
-				"Support for EVM versions older than constantinople is deprecated and will be removed in the future."
-			));
-		ret.evmVersion = *version;
-	}
-
-	if (settings.isMember("eofVersion"))
-	{
-		if (!settings["eofVersion"].isUInt())
-			return formatFatalError(Error::Type::JSONError, "eofVersion must be an unsigned integer.");
-		auto eofVersion = settings["evmVersion"].asUInt();
-		if (eofVersion != 1)
-			return formatFatalError(Error::Type::JSONError, "Invalid EOF version requested.");
-		ret.eofVersion = 1;
-	}
-
-	if (settings.isMember("debug"))
-	{
-		if (auto result = checkKeys(settings["debug"], {"revertStrings", "debugInfo"}, "settings.debug"))
-			return *result;
-
-		if (settings["debug"].isMember("revertStrings"))
-		{
-			if (!settings["debug"]["revertStrings"].isString())
-				return formatFatalError(Error::Type::JSONError, "settings.debug.revertStrings must be a string.");
-			std::optional<RevertStrings> revertStrings = revertStringsFromString(settings["debug"]["revertStrings"].asString());
-			if (!revertStrings)
-				return formatFatalError(Error::Type::JSONError, "Invalid value for settings.debug.revertStrings.");
-			if (*revertStrings == RevertStrings::VerboseDebug)
-				return formatFatalError(
-					Error::Type::UnimplementedFeatureError,
-					"Only \"default\", \"strip\" and \"debug\" are implemented for settings.debug.revertStrings for now."
-				);
-			ret.revertStrings = *revertStrings;
-		}
-
-		if (settings["debug"].isMember("debugInfo"))
-		{
-			if (!settings["debug"]["debugInfo"].isArray())
-				return formatFatalError(Error::Type::JSONError, "settings.debug.debugInfo must be an array.");
-
-			std::vector<std::string> components;
-			for (Json::Value const& arrayValue: settings["debug"]["debugInfo"])
-				components.push_back(arrayValue.asString());
-
-			std::optional<DebugInfoSelection> debugInfoSelection = DebugInfoSelection::fromComponents(
-				components,
-				true /* _acceptWildcards */
-			);
-			if (!debugInfoSelection.has_value())
-				return formatFatalError(Error::Type::JSONError, "Invalid value in settings.debug.debugInfo.");
-
-			if (debugInfoSelection->snippet && !debugInfoSelection->location)
-				return formatFatalError(
-					Error::Type::JSONError,
-					"To use 'snippet' with settings.debug.debugInfo you must select also 'location'."
-				);
-
-			ret.debugInfoSelection = debugInfoSelection.value();
-		}
-	}
-
-	if (settings.isMember("remappings") && !settings["remappings"].isArray())
-		return formatFatalError(Error::Type::JSONError, "\"settings.remappings\" must be an array of strings.");
-
-	for (auto const& remapping: settings.get("remappings", Json::Value()))
-	{
-		if (!remapping.isString())
-			return formatFatalError(Error::Type::JSONError, "\"settings.remappings\" must be an array of strings");
-		if (auto r = ImportRemapper::parseRemapping(remapping.asString()))
-			ret.remappings.emplace_back(std::move(*r));
-		else
-			return formatFatalError(Error::Type::JSONError, "Invalid remapping: \"" + remapping.asString() + "\"");
-	}
-
-	if (settings.isMember("optimizer"))
-	{
-		auto optimiserSettings = parseOptimizerSettings(settings["optimizer"]);
-		if (std::holds_alternative<Json::Value>(optimiserSettings))
-			return std::get<Json::Value>(std::move(optimiserSettings)); // was an error
-		else
-			ret.optimiserSettings = std::get<OptimiserSettings>(std::move(optimiserSettings));
-	}
-
-	Json::Value jsonLibraries = settings.get("libraries", Json::Value(Json::objectValue));
-	if (!jsonLibraries.isObject())
-		return formatFatalError(Error::Type::JSONError, "\"libraries\" is not a JSON object.");
-	for (auto const& sourceName: jsonLibraries.getMemberNames())
-	{
-		auto const& jsonSourceName = jsonLibraries[sourceName];
-		if (!jsonSourceName.isObject())
-			return formatFatalError(Error::Type::JSONError, "Library entry is not a JSON object.");
-		for (auto const& library: jsonSourceName.getMemberNames())
-		{
-			if (!jsonSourceName[library].isString())
-				return formatFatalError(Error::Type::JSONError, "Library address must be a string.");
-			std::string address = jsonSourceName[library].asString();
-
-			if (!boost::starts_with(address, "0x"))
-				return formatFatalError(
-					Error::Type::JSONError,
-					"Library address is not prefixed with \"0x\"."
-				);
-
-			if (address.length() != 42)
-				return formatFatalError(
-					Error::Type::JSONError,
-					"Library address is of invalid length."
-				);
-
-			try
-			{
-				ret.libraries[sourceName + ":" + library] = util::h160(address);
-			}
-			catch (util::BadHexCharacter const&)
-			{
-				return formatFatalError(
-					Error::Type::JSONError,
-					"Invalid library address (\"" + address + "\") supplied."
-				);
-			}
-		}
-	}
-
-	Json::Value metadataSettings = settings.get("metadata", Json::Value());
-
-	if (auto result = checkMetadataKeys(metadataSettings))
-		return *result;
-
-	solAssert(CompilerStack::defaultMetadataFormat() != CompilerStack::MetadataFormat::NoMetadata, "");
-	ret.metadataFormat =
-		metadataSettings.get("appendCBOR", Json::Value(true)).asBool() ?
-		CompilerStack::defaultMetadataFormat() :
-		CompilerStack::MetadataFormat::NoMetadata;
-
-	ret.metadataLiteralSources = metadataSettings.get("useLiteralContent", Json::Value(false)).asBool();
-	if (metadataSettings.isMember("bytecodeHash"))
-	{
-		auto metadataHash = metadataSettings["bytecodeHash"].asString();
-		ret.metadataHash =
-			metadataHash == "ipfs" ?
-			CompilerStack::MetadataHash::IPFS :
-				metadataHash == "bzzr1" ?
-				CompilerStack::MetadataHash::Bzzr1 :
-				CompilerStack::MetadataHash::None;
-		if (ret.metadataFormat == CompilerStack::MetadataFormat::NoMetadata && ret.metadataHash != CompilerStack::MetadataHash::None)
-			return formatFatalError(
-				Error::Type::JSONError,
-				"When the parameter \"appendCBOR\" is set to false, the parameter \"bytecodeHash\" cannot be set to \"" +
-				metadataHash +
-				"\". The parameter \"bytecodeHash\" should either be skipped, or set to \"none\"."
-			);
-	}
-
-	Json::Value outputSelection = settings.get("outputSelection", Json::Value());
-
-	if (auto jsonError = checkOutputSelection(outputSelection))
-		return *jsonError;
-
-	ret.outputSelection = std::move(outputSelection);
-
-	if (ret.stopAfter != CompilerStack::State::CompilationSuccessful && isBinaryRequested(ret.outputSelection))
-		return formatFatalError(
-			Error::Type::JSONError,
-			"Requested output selection conflicts with \"settings.stopAfter\"."
-		);
-
-	Json::Value const& modelCheckerSettings = settings.get("modelChecker", Json::Value());
-
-	if (auto result = checkModelCheckerSettingsKeys(modelCheckerSettings))
-		return *result;
-
-	if (modelCheckerSettings.isMember("contracts"))
-	{
-		auto const& sources = modelCheckerSettings["contracts"];
-		if (!sources.isObject() && !sources.isNull())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.contracts is not a JSON object.");
-
-		std::map<std::string, std::set<std::string>> sourceContracts;
-		for (auto const& source: sources.getMemberNames())
-		{
-			if (source.empty())
-				return formatFatalError(Error::Type::JSONError, "Source name cannot be empty.");
-
-			auto const& contracts = sources[source];
-			if (!contracts.isArray())
-				return formatFatalError(Error::Type::JSONError, "Source contracts must be an array.");
-
-			for (auto const& contract: contracts)
-			{
-				if (!contract.isString())
-					return formatFatalError(Error::Type::JSONError, "Every contract in settings.modelChecker.contracts must be a string.");
-				if (contract.asString().empty())
-					return formatFatalError(Error::Type::JSONError, "Contract name cannot be empty.");
-				sourceContracts[source].insert(contract.asString());
-			}
-
-			if (sourceContracts[source].empty())
-				return formatFatalError(Error::Type::JSONError, "Source contracts must be a non-empty array.");
-		}
-		ret.modelCheckerSettings.contracts = {std::move(sourceContracts)};
-	}
-
-	if (modelCheckerSettings.isMember("divModNoSlacks"))
-	{
-		auto const& divModNoSlacks = modelCheckerSettings["divModNoSlacks"];
-		if (!divModNoSlacks.isBool())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.divModNoSlacks must be a Boolean.");
-		ret.modelCheckerSettings.divModNoSlacks = divModNoSlacks.asBool();
-	}
-
-	if (modelCheckerSettings.isMember("engine"))
-	{
-		if (!modelCheckerSettings["engine"].isString())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.engine must be a string.");
-		std::optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(modelCheckerSettings["engine"].asString());
-		if (!engine)
-			return formatFatalError(Error::Type::JSONError, "Invalid model checker engine requested.");
-		ret.modelCheckerSettings.engine = *engine;
-	}
-
-	if (modelCheckerSettings.isMember("bmcLoopIterations"))
-	{
-		if (!ret.modelCheckerSettings.engine.bmc)
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.bmcLoopIterations requires the BMC engine to be enabled.");
-		if (modelCheckerSettings["bmcLoopIterations"].isUInt())
-			ret.modelCheckerSettings.bmcLoopIterations = modelCheckerSettings["bmcLoopIterations"].asUInt();
-		else
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.bmcLoopIterations must be an unsigned integer.");
-	}
-
-	if (modelCheckerSettings.isMember("extCalls"))
-	{
-		if (!modelCheckerSettings["extCalls"].isString())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.extCalls must be a string.");
-		std::optional<ModelCheckerExtCalls> extCalls = ModelCheckerExtCalls::fromString(modelCheckerSettings["extCalls"].asString());
-		if (!extCalls)
-			return formatFatalError(Error::Type::JSONError, "Invalid model checker extCalls requested.");
-		ret.modelCheckerSettings.externalCalls = *extCalls;
-	}
-
-	if (modelCheckerSettings.isMember("invariants"))
-	{
-		auto const& invariantsArray = modelCheckerSettings["invariants"];
-		if (!invariantsArray.isArray())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.invariants must be an array.");
-
-		ModelCheckerInvariants invariants;
-		for (auto const& i: invariantsArray)
-		{
-			if (!i.isString())
-				return formatFatalError(Error::Type::JSONError, "Every invariant type in settings.modelChecker.invariants must be a string.");
-			if (!invariants.setFromString(i.asString()))
-				return formatFatalError(Error::Type::JSONError, "Invalid model checker invariants requested.");
-		}
-
-		if (invariants.invariants.empty())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.invariants must be a non-empty array.");
-
-		ret.modelCheckerSettings.invariants = invariants;
-	}
-
-	if (modelCheckerSettings.isMember("showProvedSafe"))
-	{
-		auto const& showProvedSafe = modelCheckerSettings["showProvedSafe"];
-		if (!showProvedSafe.isBool())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showProvedSafe must be a Boolean value.");
-		ret.modelCheckerSettings.showProvedSafe = showProvedSafe.asBool();
-	}
-
-	if (modelCheckerSettings.isMember("showUnproved"))
-	{
-		auto const& showUnproved = modelCheckerSettings["showUnproved"];
-		if (!showUnproved.isBool())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showUnproved must be a Boolean value.");
-		ret.modelCheckerSettings.showUnproved = showUnproved.asBool();
-	}
-
-	if (modelCheckerSettings.isMember("showUnsupported"))
-	{
-		auto const& showUnsupported = modelCheckerSettings["showUnsupported"];
-		if (!showUnsupported.isBool())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showUnsupported must be a Boolean value.");
-		ret.modelCheckerSettings.showUnsupported = showUnsupported.asBool();
-	}
-
-	if (modelCheckerSettings.isMember("solvers"))
-	{
-		auto const& solversArray = modelCheckerSettings["solvers"];
-		if (!solversArray.isArray())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.solvers must be an array.");
-
-		smtutil::SMTSolverChoice solvers;
-		for (auto const& s: solversArray)
-		{
-			if (!s.isString())
-				return formatFatalError(Error::Type::JSONError, "Every target in settings.modelChecker.solvers must be a string.");
-			if (!solvers.setSolver(s.asString()))
-				return formatFatalError(Error::Type::JSONError, "Invalid model checker solvers requested.");
-		}
-
-		ret.modelCheckerSettings.solvers = solvers;
-	}
-
-	if (modelCheckerSettings.isMember("printQuery"))
-	{
-		auto const& printQuery = modelCheckerSettings["printQuery"];
-		if (!printQuery.isBool())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.printQuery must be a Boolean value.");
-
-		if (!(ret.modelCheckerSettings.solvers == smtutil::SMTSolverChoice::SMTLIB2()))
-			return formatFatalError(Error::Type::JSONError, "Only SMTLib2 solver can be enabled to print queries");
-
-		ret.modelCheckerSettings.printQuery = printQuery.asBool();
-	}
-
-	if (modelCheckerSettings.isMember("targets"))
-	{
-		auto const& targetsArray = modelCheckerSettings["targets"];
-		if (!targetsArray.isArray())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.targets must be an array.");
-
-		ModelCheckerTargets targets;
-		for (auto const& t: targetsArray)
-		{
-			if (!t.isString())
-				return formatFatalError(Error::Type::JSONError, "Every target in settings.modelChecker.targets must be a string.");
-			if (!targets.setFromString(t.asString()))
-				return formatFatalError(Error::Type::JSONError, "Invalid model checker targets requested.");
-		}
-
-		if (targets.targets.empty())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.targets must be a non-empty array.");
-
-		ret.modelCheckerSettings.targets = targets;
-	}
-
-	if (modelCheckerSettings.isMember("timeout"))
-	{
-		if (!modelCheckerSettings["timeout"].isUInt())
-			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.timeout must be an unsigned integer.");
-		ret.modelCheckerSettings.timeout = modelCheckerSettings["timeout"].asUInt();
-	}
-
-	return {std::move(ret)};
-}
-
-std::map<std::string, Json::Value> StandardCompiler::parseAstFromInput(StringMap const& _sources)
-{
-	std::map<std::string, Json::Value> sourceJsons;
-	for (auto const& [sourceName, sourceCode]: _sources)
-	{
-		Json::Value ast;
-		astAssert(util::jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
-		std::string astKey = ast.isMember("ast") ? "ast" : "AST";
-
-		astAssert(ast.isMember(astKey), "astkey is not member");
-		astAssert(ast[astKey]["nodeType"].asString() == "SourceUnit", "Top-level node should be a 'SourceUnit'");
-		astAssert(sourceJsons.count(sourceName) == 0, "All sources must have unique names");
-		sourceJsons.emplace(sourceName, std::move(ast[astKey]));
-	}
-	return sourceJsons;
-}
-
-Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inputsAndSettings)
-{
-	CompilerStack compilerStack(m_readFile);
-
-	StringMap sourceList = std::move(_inputsAndSettings.sources);
-	if (_inputsAndSettings.language == "Solidity")
-		compilerStack.setSources(sourceList);
-	for (auto const& smtLib2Response: _inputsAndSettings.smtLib2Responses)
-		compilerStack.addSMTLib2Response(smtLib2Response.first, smtLib2Response.second);
-	compilerStack.setViaIR(_inputsAndSettings.viaIR);
-	compilerStack.setEVMVersion(_inputsAndSettings.evmVersion);
-	compilerStack.setRemappings(std::move(_inputsAndSettings.remappings));
-	compilerStack.setOptimiserSettings(std::move(_inputsAndSettings.optimiserSettings));
-	compilerStack.setRevertStringBehaviour(_inputsAndSettings.revertStrings);
-	if (_inputsAndSettings.debugInfoSelection.has_value())
-		compilerStack.selectDebugInfo(_inputsAndSettings.debugInfoSelection.value());
-	compilerStack.setLibraries(_inputsAndSettings.libraries);
-	compilerStack.useMetadataLiteralSources(_inputsAndSettings.metadataLiteralSources);
-	compilerStack.setMetadataFormat(_inputsAndSettings.metadataFormat);
-	compilerStack.setMetadataHash(_inputsAndSettings.metadataHash);
-	compilerStack.setRequestedContractNames(requestedContractNames(_inputsAndSettings.outputSelection));
-	compilerStack.setModelCheckerSettings(_inputsAndSettings.modelCheckerSettings);
-
-	compilerStack.enableEvmBytecodeGeneration(isEvmBytecodeRequested(_inputsAndSettings.outputSelection));
-	compilerStack.enableIRGeneration(isIRRequested(_inputsAndSettings.outputSelection));
-
-	Json::Value errors = std::move(_inputsAndSettings.errors);
-
-	bool const binariesRequested = isBinaryRequested(_inputsAndSettings.outputSelection);
-
-	try
-	{
-		if (_inputsAndSettings.language == "SolidityAST")
-		{
-			try
-			{
-				compilerStack.importASTs(parseAstFromInput(sourceList));
-				if (!compilerStack.analyze())
-					errors.append(formatError(Error::Type::FatalError, "general", "Analysis of the AST failed."));
-				if (binariesRequested)
-					compilerStack.compile();
-			}
-			catch (util::Exception const& _exc)
-			{
-				solThrow(util::Exception, "Failed to import AST: "s + _exc.what());
-			}
-		}
-		else
-		{
-			if (binariesRequested)
-				compilerStack.compile();
-			else
-				compilerStack.parseAndAnalyze(_inputsAndSettings.stopAfter);
-
-			for (auto const& error: compilerStack.errors())
-				errors.append(formatErrorWithException(
-					compilerStack,
-					*error,
-					error->type(),
-					"general",
-					"",
-					error->errorId()
-				));
-		}
-	}
-	/// This is only thrown in a very few locations.
-	catch (Error const& _error)
-	{
-		errors.append(formatErrorWithException(
-			compilerStack,
-			_error,
-			_error.type(),
-			"general",
-			"Uncaught error: "
-		));
-	}
-	/// This should not be leaked from compile().
-	catch (FatalError const& _exception)
-	{
-		errors.append(formatError(
-			Error::Type::FatalError,
-			"general",
-			"Uncaught fatal error: " + boost::diagnostic_information(_exception)
-		));
-	}
-	catch (CompilerError const& _exception)
-	{
-		errors.append(formatErrorWithException(
-			compilerStack,
-			_exception,
-			Error::Type::CompilerError,
-			"general",
-			"Compiler error (" + _exception.lineInfo() + ")"
-		));
-	}
-	catch (InternalCompilerError const& _exception)
-	{
-		errors.append(formatErrorWithException(
-			compilerStack,
-			_exception,
-			Error::Type::InternalCompilerError,
-			"general",
-			"Internal compiler error (" + _exception.lineInfo() + ")"
-		));
-	}
-	catch (UnimplementedFeatureError const& _exception)
-	{
-		errors.append(formatErrorWithException(
-			compilerStack,
-			_exception,
-			Error::Type::UnimplementedFeatureError,
-			"general",
-			"Unimplemented feature (" + _exception.lineInfo() + ")"
-		));
-	}
-	catch (yul::YulException const& _exception)
-	{
-		errors.append(formatErrorWithException(
-			compilerStack,
-			_exception,
-			Error::Type::YulException,
-			"general",
-			"Yul exception"
-		));
-	}
-	catch (smtutil::SMTLogicError const& _exception)
-	{
-		errors.append(formatErrorWithException(
-			compilerStack,
-			_exception,
-			Error::Type::SMTLogicException,
-			"general",
-			"SMT logic exception"
-		));
-	}
-	catch (util::Exception const& _exception)
-	{
-		errors.append(formatError(
-			Error::Type::Exception,
-			"general",
-			"Exception during compilation: " + boost::diagnostic_information(_exception)
-		));
-	}
-	catch (std::exception const& _exception)
-	{
-		errors.append(formatError(
-			Error::Type::Exception,
-			"general",
-			"Unknown exception during compilation: " + boost::diagnostic_information(_exception)
-		));
-	}
-	catch (...)
-	{
-		errors.append(formatError(
-			Error::Type::Exception,
-			"general",
-			"Unknown exception during compilation: " + boost::current_exception_diagnostic_information()
-		));
-	}
-
-	bool parsingSuccess = compilerStack.state() >= CompilerStack::State::Parsed;
-	bool analysisSuccess = compilerStack.state() >= CompilerStack::State::AnalysisSuccessful;
-	bool compilationSuccess = compilerStack.state() == CompilerStack::State::CompilationSuccessful;
-
-	// If analysis fails, the artifacts inside CompilerStack are potentially incomplete and must not be returned.
-	// Note that not completing analysis due to stopAfter does not count as a failure. It's neither failure nor success.
-	bool analysisFailed = !analysisSuccess && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisSuccessful;
-	bool compilationFailed = !compilationSuccess && binariesRequested;
-
-	/// Inconsistent state - stop here to receive error reports from users
-	if (
-		(compilationFailed || analysisFailed || !parsingSuccess) &&
-		errors.empty()
-	)
-		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
-
-	Json::Value output = Json::objectValue;
-
-	if (errors.size() > 0)
-		output["errors"] = std::move(errors);
-
-	if (!compilerStack.unhandledSMTLib2Queries().empty())
-		for (std::string const& query: compilerStack.unhandledSMTLib2Queries())
-			output["auxiliaryInputRequested"]["smtlib2queries"]["0x" + util::keccak256(query).hex()] = query;
-
-	bool const wildcardMatchesExperimental = false;
-
-	output["sources"] = Json::objectValue;
-	unsigned sourceIndex = 0;
-	// NOTE: A case that will pass `parsingSuccess && !analysisFailed` but not `analysisSuccess` is
-	// stopAfter: parsing with no parsing errors.
-	if (parsingSuccess && !analysisFailed)
-		for (std::string const& sourceName: compilerStack.sourceNames())
-		{
-			Json::Value sourceResult = Json::objectValue;
-			sourceResult["id"] = sourceIndex++;
-			if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "ast", wildcardMatchesExperimental))
-				sourceResult["ast"] = ASTJsonExporter(compilerStack.state(), compilerStack.sourceIndices()).toJson(compilerStack.ast(sourceName));
-			output["sources"][sourceName] = sourceResult;
-		}
-
-	Json::Value contractsOutput = Json::objectValue;
-	for (std::string const& contractName: analysisSuccess ? compilerStack.contractNames() : std::vector<std::string>())
-	{
-		size_t colon = contractName.rfind(':');
-		solAssert(colon != std::string::npos, "");
-		std::string file = contractName.substr(0, colon);
-		std::string name = contractName.substr(colon + 1);
-
-		// ABI, storage layout, documentation and metadata
-		Json::Value contractData(Json::objectValue);
-		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "abi", wildcardMatchesExperimental))
-			contractData["abi"] = compilerStack.contractABI(contractName);
-		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "storageLayout", false))
-			contractData["storageLayout"] = compilerStack.storageLayout(contractName);
-		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "metadata", wildcardMatchesExperimental))
-			contractData["metadata"] = compilerStack.metadata(contractName);
-		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "userdoc", wildcardMatchesExperimental))
-			contractData["userdoc"] = compilerStack.natspecUser(contractName);
-		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "devdoc", wildcardMatchesExperimental))
-			contractData["devdoc"] = compilerStack.natspecDev(contractName);
-
-		// IR
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "ir", wildcardMatchesExperimental))
-			contractData["ir"] = compilerStack.yulIR(contractName);
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irAst", wildcardMatchesExperimental))
-			contractData["irAst"] = compilerStack.yulIRAst(contractName);
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irOptimized", wildcardMatchesExperimental))
-			contractData["irOptimized"] = compilerStack.yulIROptimized(contractName);
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irOptimizedAst", wildcardMatchesExperimental))
-			contractData["irOptimizedAst"] = compilerStack.yulIROptimizedAst(contractName);
-
-		// EVM
-		Json::Value evmData(Json::objectValue);
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.assembly", wildcardMatchesExperimental))
-			evmData["assembly"] = compilerStack.assemblyString(contractName, sourceList);
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.legacyAssembly", wildcardMatchesExperimental))
-			evmData["legacyAssembly"] = compilerStack.assemblyJSON(contractName);
-		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.methodIdentifiers", wildcardMatchesExperimental))
-			evmData["methodIdentifiers"] = compilerStack.interfaceSymbols(contractName)["methods"];
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.gasEstimates", wildcardMatchesExperimental))
-			evmData["gasEstimates"] = compilerStack.gasEstimates(contractName);
-
-		if (compilationSuccess && isArtifactRequested(
-			_inputsAndSettings.outputSelection,
-			file,
-			name,
-			evmObjectComponents("bytecode"),
-			wildcardMatchesExperimental
-		))
-			evmData["bytecode"] = collectEVMObject(
-				_inputsAndSettings.evmVersion,
-				compilerStack.object(contractName),
-				compilerStack.sourceMapping(contractName),
-				compilerStack.generatedSources(contractName),
-				false,
-				[&](std::string const& _element) { return isArtifactRequested(
-					_inputsAndSettings.outputSelection,
-					file,
-					name,
-					"evm.bytecode." + _element,
-					wildcardMatchesExperimental
-				); }
-			);
-
-		if (compilationSuccess && isArtifactRequested(
-			_inputsAndSettings.outputSelection,
-			file,
-			name,
-			evmObjectComponents("deployedBytecode"),
-			wildcardMatchesExperimental
-		))
-			evmData["deployedBytecode"] = collectEVMObject(
-				_inputsAndSettings.evmVersion,
-				compilerStack.runtimeObject(contractName),
-				compilerStack.runtimeSourceMapping(contractName),
-				compilerStack.generatedSources(contractName, true),
-				true,
-				[&](std::string const& _element) { return isArtifactRequested(
-					_inputsAndSettings.outputSelection,
-					file,
-					name,
-					"evm.deployedBytecode." + _element,
-					wildcardMatchesExperimental
-				); }
-			);
-
-		if (!evmData.empty())
-			contractData["evm"] = evmData;
-
-		if (!contractData.empty())
-		{
-			if (!contractsOutput.isMember(file))
-				contractsOutput[file] = Json::objectValue;
-			contractsOutput[file][name] = contractData;
-		}
-	}
-	if (!contractsOutput.empty())
-		output["contracts"] = contractsOutput;
-
-	return output;
-}
-
-
-Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
-{
-	Json::Value output = Json::objectValue;
-	output["errors"] = std::move(_inputsAndSettings.errors);
-
-	if (_inputsAndSettings.sources.size() != 1)
-	{
-		output["errors"].append(formatError(
-			Error::Type::JSONError,
-			"general",
-			"Yul mode only supports exactly one input file."
-		));
-		return output;
-	}
-	if (!_inputsAndSettings.smtLib2Responses.empty())
-	{
-		output["errors"].append(formatError(
-			Error::Type::JSONError,
-			"general",
-			"Yul mode does not support smtlib2responses."
-		));
-		return output;
-	}
-	if (!_inputsAndSettings.remappings.empty())
-	{
-		output["errors"].append(formatError(
-			Error::Type::JSONError,
-			"general",
-			"Field \"settings.remappings\" cannot be used for Yul."
-		));
-		return output;
-	}
-	if (_inputsAndSettings.revertStrings != RevertStrings::Default)
-	{
-		output["errors"].append(formatError(
-			Error::Type::JSONError,
-			"general",
-			"Field \"settings.debug.revertStrings\" cannot be used for Yul."
-		));
-		return output;
-	}
-
-	YulStack stack(
-		_inputsAndSettings.evmVersion,
-		_inputsAndSettings.eofVersion,
-		YulStack::Language::StrictAssembly,
-		_inputsAndSettings.optimiserSettings,
-		_inputsAndSettings.debugInfoSelection.has_value() ?
-			_inputsAndSettings.debugInfoSelection.value() :
-			DebugInfoSelection::Default()
-	);
-	std::string const& sourceName = _inputsAndSettings.sources.begin()->first;
-	std::string const& sourceContents = _inputsAndSettings.sources.begin()->second;
-
-	// Inconsistent state - stop here to receive error reports from users
-	if (!stack.parseAndAnalyze(sourceName, sourceContents) && stack.errors().empty())
-	{
-		output["errors"].append(formatError(
-			Error::Type::InternalCompilerError,
-			"general",
-			"No error reported, but compilation failed."
-		));
-		return output;
-	}
-
-	if (!stack.errors().empty())
-	{
-		for (auto const& error: stack.errors())
-		{
-			auto err = std::dynamic_pointer_cast<Error const>(error);
-
-			output["errors"].append(formatErrorWithException(
-				stack,
-				*error,
-				err->type(),
-				"general",
-				""
-			));
-		}
-		return output;
-	}
-
-	std::string contractName = stack.parserResult()->name.str();
-
-	bool const wildcardMatchesExperimental = true;
-	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ir", wildcardMatchesExperimental))
-		output["contracts"][sourceName][contractName]["ir"] = stack.print();
-
-	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ast", wildcardMatchesExperimental))
-	{
-		Json::Value sourceResult = Json::objectValue;
-		sourceResult["id"] = 0;
-		sourceResult["ast"] = stack.astJson();
-		output["sources"][sourceName] = sourceResult;
-	}
-	stack.optimize();
-
-	MachineAssemblyObject object;
-	MachineAssemblyObject deployedObject;
-	std::tie(object, deployedObject) = stack.assembleWithDeployed();
-
-	if (object.bytecode)
-		object.bytecode->link(_inputsAndSettings.libraries);
-	if (deployedObject.bytecode)
-		deployedObject.bytecode->link(_inputsAndSettings.libraries);
-
-	for (auto&& [kind, isDeployed]: {make_pair("bytecode"s, false), make_pair("deployedBytecode"s, true)})
-		if (isArtifactRequested(
-			_inputsAndSettings.outputSelection,
-			sourceName,
-			contractName,
-			evmObjectComponents(kind),
-			wildcardMatchesExperimental
-		))
-		{
-			MachineAssemblyObject const& o = isDeployed ? deployedObject : object;
-			if (o.bytecode)
-				output["contracts"][sourceName][contractName]["evm"][kind] =
-					collectEVMObject(
-						_inputsAndSettings.evmVersion,
-						*o.bytecode,
-						o.sourceMappings.get(),
-						Json::arrayValue,
-						isDeployed,
-						[&, kind = kind](std::string const& _element) { return isArtifactRequested(
-							_inputsAndSettings.outputSelection,
-							sourceName,
-							contractName,
-							"evm." + kind + "." + _element,
-							wildcardMatchesExperimental
-						); }
-					);
-		}
-
-	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "irOptimized", wildcardMatchesExperimental))
-		output["contracts"][sourceName][contractName]["irOptimized"] = stack.print();
-	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "evm.assembly", wildcardMatchesExperimental))
-		output["contracts"][sourceName][contractName]["evm"]["assembly"] = object.assembly;
-
-	return output;
-}
-
-
-Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
-{
-	YulStringRepository::reset();
-
-	try
-	{
-		auto parsed = parseInput(_input);
-		if (std::holds_alternative<Json::Value>(parsed))
-			return std::get<Json::Value>(std::move(parsed));
-		InputsAndSettings settings = std::get<InputsAndSettings>(std::move(parsed));
-		if (settings.language == "Solidity")
-			return compileSolidity(std::move(settings));
-		else if (settings.language == "Yul")
-			return compileYul(std::move(settings));
-		else if (settings.language == "SolidityAST")
-			return compileSolidity(std::move(settings));
-		else
-			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\", \"Yul\" or \"SolidityAST\" is supported as a language.");
-	}
-	catch (Json::LogicError const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON logic exception: ") + _exception.what());
-	}
-	catch (Json::RuntimeError const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON runtime exception: ") + _exception.what());
-	}
-	catch (util::Exception const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " + boost::diagnostic_information(_exception));
-	}
-	catch (...)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " +  boost::current_exception_diagnostic_information());
-	}
-}
-
-std::string StandardCompiler::compile(std::string const& _input) noexcept
-{
-	Json::Value input;
-	std::string errors;
-	try
-	{
-		if (!util::jsonParseStrict(_input, input, &errors))
-			return util::jsonPrint(formatFatalError(Error::Type::JSONError, errors), m_jsonPrintingFormat);
-	}
-	catch (...)
-	{
-		return "{\"errors\":[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error parsing input JSON.\"}]}";
-	}
-
-	// cout << "Input: " << input.toStyledString() << endl;
-	Json::Value output = compile(input);
-	// cout << "Output: " << output.toStyledString() << endl;
-
-	try
-	{
-		return util::jsonPrint(output, m_jsonPrintingFormat);
-	}
-	catch (...)
-	{
-		return "{\"errors\":[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error writing output JSON.\"}]}";
-	}
-}
-
-Json::Value StandardCompiler::formatFunctionDebugData(
-	std::map<std::string, evmasm::LinkerObject::FunctionDebugData> const& _debugInfo
-)
-{
-	Json::Value ret(Json::objectValue);
-	for (auto const& [name, info]: _debugInfo)
-	{
-		Json::Value fun;
-		if (info.sourceID)
-			fun["id"] = Json::UInt64(*info.sourceID);
-		else
-			fun["id"] = Json::nullValue;
-		if (info.bytecodeOffset)
-			fun["entryPoint"] = Json::UInt64(*info.bytecodeOffset);
-		else
-			fun["entryPoint"] = Json::nullValue;
-		fun["parameterSlots"] = Json::UInt64(info.params);
-		fun["returnSlots"] = Json::UInt64(info.returns);
-		ret[name] = std::move(fun);
-	}
-
-	return ret;
-}
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
deleted file mode 100644
index 523c09d94e49..000000000000
--- a/libsolidity/interface/StandardCompiler.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * @date 2016
- * Standard JSON compiler interface.
- */
-
-#pragma once
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolutil/JSON.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-
-#include <optional>
-#include <utility>
-#include <variant>
-
-namespace solidity::frontend
-{
-
-/**
- * Standard JSON compiler interface, which expects a JSON input and returns a JSON output.
- * See docs/using-the-compiler#compiler-input-and-output-json-description.
- */
-class StandardCompiler
-{
-public:
-	/// Noncopyable.
-	StandardCompiler(StandardCompiler const&) = delete;
-	StandardCompiler& operator=(StandardCompiler const&) = delete;
-
-	/// Creates a new StandardCompiler.
-	/// @param _readFile callback used to read files for import statements. Must return
-	/// and must not emit exceptions.
-	explicit StandardCompiler(ReadCallback::Callback _readFile = ReadCallback::Callback(),
-		util::JsonFormat const& _format = {}):
-		m_readFile(std::move(_readFile)),
-		m_jsonPrintingFormat(std::move(_format))
-	{
-	}
-
-	/// Sets all input parameters according to @a _input which conforms to the standardized input
-	/// format, performs compilation and returns a standardized output.
-	Json::Value compile(Json::Value const& _input) noexcept;
-	/// Parses input as JSON and peforms the above processing steps, returning a serialized JSON
-	/// output. Parsing errors are returned as regular errors.
-	std::string compile(std::string const& _input) noexcept;
-
-	static Json::Value formatFunctionDebugData(
-		std::map<std::string, evmasm::LinkerObject::FunctionDebugData> const& _debugInfo
-	);
-
-private:
-	struct InputsAndSettings
-	{
-		std::string language;
-		Json::Value errors;
-		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
-		std::map<std::string, std::string> sources;
-		std::map<util::h256, std::string> smtLib2Responses;
-		langutil::EVMVersion evmVersion;
-		std::optional<uint8_t> eofVersion;
-		std::vector<ImportRemapper::Remapping> remappings;
-		RevertStrings revertStrings = RevertStrings::Default;
-		OptimiserSettings optimiserSettings = OptimiserSettings::minimal();
-		std::optional<langutil::DebugInfoSelection> debugInfoSelection;
-		std::map<std::string, util::h160> libraries;
-		bool metadataLiteralSources = false;
-		CompilerStack::MetadataFormat metadataFormat = CompilerStack::defaultMetadataFormat();
-		CompilerStack::MetadataHash metadataHash = CompilerStack::MetadataHash::IPFS;
-		Json::Value outputSelection;
-		ModelCheckerSettings modelCheckerSettings = ModelCheckerSettings{};
-		bool viaIR = false;
-	};
-
-	/// Parses the input json (and potentially invokes the read callback) and either returns
-	/// it in condensed form or an error as a json object.
-	std::variant<InputsAndSettings, Json::Value> parseInput(Json::Value const& _input);
-
-	std::map<std::string, Json::Value> parseAstFromInput(StringMap const& _sources);
-	Json::Value compileSolidity(InputsAndSettings _inputsAndSettings);
-	Json::Value compileYul(InputsAndSettings _inputsAndSettings);
-
-	ReadCallback::Callback m_readFile;
-
-	util::JsonFormat m_jsonPrintingFormat;
-};
-
-}
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
deleted file mode 100644
index 8e1d0eed101d..000000000000
--- a/libsolidity/interface/StorageLayout.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/interface/StorageLayout.h>
-
-#include <libsolidity/ast/TypeProvider.h>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-Json::Value StorageLayout::generate(ContractDefinition const& _contractDef)
-{
-	solAssert(!m_contract, "");
-	m_contract = &_contractDef;
-	m_types.clear();
-
-	auto typeType = dynamic_cast<TypeType const*>(_contractDef.type());
-	solAssert(typeType, "");
-	auto contractType = dynamic_cast<ContractType const*>(typeType->actualType());
-	solAssert(contractType, "");
-
-	Json::Value variables(Json::arrayValue);
-	for (auto [var, slot, offset]: contractType->stateVariables())
-		variables.append(generate(*var, slot, offset));
-
-	Json::Value layout;
-	layout["storage"] = std::move(variables);
-	layout["types"] = std::move(m_types);
-	return layout;
-}
-
-Json::Value StorageLayout::generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset)
-{
-	Json::Value varEntry;
-	Type const* varType = _var.type();
-
-	varEntry["label"] = _var.name();
-	varEntry["astId"] = static_cast<int>(_var.id());
-	varEntry["contract"] = m_contract->fullyQualifiedName();
-	varEntry["slot"] = _slot.str();
-	varEntry["offset"] = _offset;
-	varEntry["type"] = typeKeyName(varType);
-
-	generate(varType);
-
-	return varEntry;
-}
-
-void StorageLayout::generate(Type const* _type)
-{
-	if (m_types.isMember(typeKeyName(_type)))
-		return;
-
-	// Register it now to cut recursive visits.
-	Json::Value& typeInfo = m_types[typeKeyName(_type)];
-	typeInfo["label"] = _type->toString(true);
-	typeInfo["numberOfBytes"] = u256(_type->storageBytes() * _type->storageSize()).str();
-
-	if (auto structType = dynamic_cast<StructType const*>(_type))
-	{
-		Json::Value members(Json::arrayValue);
-		auto const& structDef = structType->structDefinition();
-		for (auto const& member: structDef.members())
-		{
-			auto const& offsets = structType->storageOffsetsOfMember(member->name());
-			members.append(generate(*member, offsets.first, offsets.second));
-		}
-		typeInfo["members"] = std::move(members);
-		typeInfo["encoding"] = "inplace";
-	}
-	else if (auto mappingType = dynamic_cast<MappingType const*>(_type))
-	{
-		typeInfo["key"] = typeKeyName(mappingType->keyType());
-		typeInfo["value"] = typeKeyName(mappingType->valueType());
-		generate(mappingType->keyType());
-		generate(mappingType->valueType());
-		typeInfo["encoding"] = "mapping";
-	}
-	else if (auto arrayType = dynamic_cast<ArrayType const*>(_type))
-	{
-		if (arrayType->isByteArrayOrString())
-			typeInfo["encoding"] = "bytes";
-		else
-		{
-			typeInfo["base"] = typeKeyName(arrayType->baseType());
-			generate(arrayType->baseType());
-			typeInfo["encoding"] = arrayType->isDynamicallySized() ? "dynamic_array" : "inplace";
-		}
-	}
-	else
-	{
-		solAssert(_type->isValueType(), "");
-		typeInfo["encoding"] = "inplace";
-	}
-
-	solAssert(typeInfo.isMember("encoding"), "");
-}
-
-std::string StorageLayout::typeKeyName(Type const* _type)
-{
-	if (auto refType = dynamic_cast<ReferenceType const*>(_type))
-		return TypeProvider::withLocationIfReference(refType->location(), _type)->richIdentifier();
-	return _type->richIdentifier();
-}
diff --git a/libsolidity/interface/StorageLayout.h b/libsolidity/interface/StorageLayout.h
deleted file mode 100644
index ffe8e6b5a0c6..000000000000
--- a/libsolidity/interface/StorageLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Generates the storage layout of a contract.
- */
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/Types.h>
-
-#include <json/json.h>
-
-namespace solidity::frontend
-{
-
-class StorageLayout
-{
-public:
-	/// Generates the storage layout of the contract
-	/// @param _contractDef The contract definition
-	/// @return A JSON representation of the contract's storage layout.
-	Json::Value generate(ContractDefinition const& _contractDef);
-
-private:
-	/// Generates the JSON information for a variable and its storage location.
-	Json::Value generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset);
-
-	/// Generates the JSON information for @param _type
-	void generate(Type const* _type);
-
-	/// The key for the JSON object describing a type.
-	std::string typeKeyName(Type const* _type);
-
-	Json::Value m_types;
-
-	/// Current analyzed contract
-	ContractDefinition const* m_contract = nullptr;
-};
-
-}
diff --git a/libsolidity/interface/UniversalCallback.h b/libsolidity/interface/UniversalCallback.h
deleted file mode 100644
index 3fe74c65e48f..000000000000
--- a/libsolidity/interface/UniversalCallback.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolidity/interface/FileReader.h>
-#include <libsolidity/interface/SMTSolverCommand.h>
-
-namespace solidity::frontend
-{
-
-/// UniversalCallback is used to wrap both FileReader and SMTSolverCommand
-/// callbacks in a single callback.  It uses the Kind of the callback to
-/// determine which to call internally.
-class UniversalCallback
-{
-public:
-	UniversalCallback(FileReader* _fileReader, SMTSolverCommand& _solver) :
-		m_fileReader{_fileReader},
-		m_solver{_solver}
-	{}
-
-	frontend::ReadCallback::Callback callback()
-	{
-		return [this](std::string const& _kind, std::string const& _data) -> ReadCallback::Result {
-			if (_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile))
-				if (!m_fileReader)
-					return ReadCallback::Result{false, "No import callback."};
-				else
-					return m_fileReader->readFile(_kind, _data);
-			else if (_kind == ReadCallback::kindString(ReadCallback::Kind::SMTQuery))
-				return m_solver.solve(_kind, _data);
-			solAssert(false, "Unknown callback kind.");
-		};
-	}
-
-	void resetImportCallback() { m_fileReader = nullptr; }
-
-private:
-	FileReader* m_fileReader;
-	SMTSolverCommand& m_solver;
-};
-
-}
diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp
deleted file mode 100644
index 565ff2a60ecf..000000000000
--- a/libsolidity/interface/Version.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Versioning.
- */
-
-#include <libsolidity/interface/Version.h>
-
-#include <solidity/BuildInfo.h>
-
-char const* solidity::frontend::VersionNumber = ETH_PROJECT_VERSION;
-
-std::string const solidity::frontend::VersionString =
-	std::string(solidity::frontend::VersionNumber) +
-	(std::string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + std::string(SOL_VERSION_PRERELEASE)) +
-	(std::string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + std::string(SOL_VERSION_BUILDINFO));
-
-std::string const solidity::frontend::VersionStringStrict =
-	std::string(solidity::frontend::VersionNumber) +
-	(std::string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + std::string(SOL_VERSION_PRERELEASE)) +
-	(std::string(SOL_VERSION_COMMIT).empty() ? "" : "+" + std::string(SOL_VERSION_COMMIT));
-
-solidity::bytes const solidity::frontend::VersionCompactBytes = {
-	ETH_PROJECT_VERSION_MAJOR,
-	ETH_PROJECT_VERSION_MINOR,
-	ETH_PROJECT_VERSION_PATCH
-};
-
-bool const solidity::frontend::VersionIsRelease = std::string(SOL_VERSION_PRERELEASE).empty();
diff --git a/libsolidity/interface/Version.h b/libsolidity/interface/Version.h
deleted file mode 100644
index bc05fb403312..000000000000
--- a/libsolidity/interface/Version.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Versioning.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-#include <string>
-
-namespace solidity
-{
-using bytes = std::vector<uint8_t>;
-
-namespace frontend
-{
-
-extern char const* VersionNumber;
-extern std::string const VersionString;
-extern std::string const VersionStringStrict;
-extern bytes const VersionCompactBytes;
-extern bool const VersionIsRelease;
-
-}
-}
diff --git a/libsolidity/lsp/DocumentHoverHandler.cpp b/libsolidity/lsp/DocumentHoverHandler.cpp
deleted file mode 100644
index 39d1d72c331c..000000000000
--- a/libsolidity/lsp/DocumentHoverHandler.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/lsp/DocumentHoverHandler.h>
-#include <libsolidity/lsp/Utils.h>
-
-#include <fmt/format.h>
-
-namespace solidity::lsp
-{
-using namespace solidity::lsp;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-
-struct MarkdownBuilder
-{
-	std::stringstream result;
-
-	MarkdownBuilder& solidityCode(std::string const& _code)
-	{
-		auto constexpr SolidityLanguageId = "solidity";
-		result << "```" << SolidityLanguageId << '\n' << _code << "\n```\n\n";
-		return *this;
-	}
-
-	MarkdownBuilder& paragraph(std::string const& _text)
-	{
-		if (!_text.empty())
-		{
-			result << _text << '\n';
-			if (_text.back() != '\n') // We want double-LF to ensure constructing a paragraph.
-				result << '\n';
-		}
-		return *this;
-	}
-};
-
-}
-
-void DocumentHoverHandler::operator()(MessageID _id, Json::Value const& _args)
-{
-	auto const [sourceUnitName, lineColumn] = HandlerBase(*this).extractSourceUnitNameAndLineColumn(_args);
-	auto const [sourceNode, sourceOffset] = m_server.astNodeAndOffsetAtSourceLocation(sourceUnitName, lineColumn);
-
-	MarkdownBuilder markdown;
-	auto rangeToHighlight = toRange(sourceNode->location());
-
-	// Try getting the type definition of the underlying AST node, if available.
-	if (auto const* expression = dynamic_cast<Expression const*>(sourceNode))
-	{
-		if (auto const* declaration = ASTNode::referencedDeclaration(*expression))
-			if (declaration->type())
-				markdown.solidityCode(declaration->type()->toString(false));
-	}
-	else if (auto const* declaration = dynamic_cast<Declaration const*>(sourceNode))
-	{
-		if (declaration->type())
-			markdown.solidityCode(declaration->type()->toString(false));
-	}
-	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(sourceNode))
-	{
-		for (size_t i = 0; i < identifierPath->path().size(); ++i)
-		{
-			if (identifierPath->pathLocations()[i].containsOffset(sourceOffset))
-			{
-				rangeToHighlight = toRange(identifierPath->pathLocations()[i]);
-
-				if (i < identifierPath->annotation().pathDeclarations.size())
-				{
-					Declaration const* declaration = identifierPath->annotation().pathDeclarations[i];
-					if (declaration && declaration->type())
-						markdown.solidityCode(declaration->type()->toString(false));
-					if (auto const* structurallyDocumented = dynamic_cast<StructurallyDocumented const*>(declaration))
-						if (structurallyDocumented->documentation()->text())
-							markdown.paragraph(*structurallyDocumented->documentation()->text());
-				}
-				break;
-			}
-		}
-	}
-
-	// If this AST node contains documentation itself, append it.
-	if (auto const* documented = dynamic_cast<StructurallyDocumented const*>(sourceNode))
-	{
-		if (documented->documentation())
-			markdown.paragraph(*documented->documentation()->text());
-	}
-
-	auto tooltipText = markdown.result.str();
-
-	if (tooltipText.empty())
-	{
-		client().reply(_id, Json::nullValue);
-		return;
-	}
-
-	Json::Value reply = Json::objectValue;
-	reply["range"] = rangeToHighlight;
-	reply["contents"]["kind"] = "markdown";
-	reply["contents"]["value"] = std::move(tooltipText);
-
-	client().reply(_id, reply);
-}
-
-}
diff --git a/libsolidity/lsp/DocumentHoverHandler.h b/libsolidity/lsp/DocumentHoverHandler.h
deleted file mode 100644
index 9bb4084c261e..000000000000
--- a/libsolidity/lsp/DocumentHoverHandler.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-#include <libsolidity/lsp/HandlerBase.h>
-
-namespace solidity::lsp
-{
-
-class DocumentHoverHandler: public HandlerBase
-{
-public:
-	using HandlerBase::HandlerBase;
-
-	void operator()(MessageID, Json::Value const&);
-};
-
-}
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
deleted file mode 100644
index 7138cbd86adf..000000000000
--- a/libsolidity/lsp/FileRepository.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/lsp/FileRepository.h>
-#include <libsolidity/lsp/Transport.h>
-#include <libsolidity/lsp/Utils.h>
-
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/CommonIO.h>
-
-#include <range/v3/algorithm/none_of.hpp>
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/transform.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <regex>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <fmt/format.h>
-
-using namespace solidity;
-using namespace solidity::lsp;
-using namespace solidity::frontend;
-
-using solidity::util::readFileAsString;
-using solidity::util::joinHumanReadable;
-using solidity::util::Result;
-
-FileRepository::FileRepository(boost::filesystem::path _basePath, std::vector<boost::filesystem::path> _includePaths):
-	m_basePath(std::move(_basePath)),
-	m_includePaths(std::move(_includePaths))
-{
-}
-
-void FileRepository::setIncludePaths(std::vector<boost::filesystem::path> _paths)
-{
-	m_includePaths = std::move(_paths);
-}
-
-std::string FileRepository::sourceUnitNameToUri(std::string const& _sourceUnitName) const
-{
-	std::regex const windowsDriveLetterPath("^[a-zA-Z]:/");
-
-	auto const ensurePathIsUnixLike = [&](std::string inputPath) -> std::string {
-		if (!regex_search(inputPath, windowsDriveLetterPath))
-			return inputPath;
-		else
-			return "/" + std::move(inputPath);
-	};
-
-	if (m_sourceUnitNamesToUri.count(_sourceUnitName))
-	{
-		solAssert(boost::starts_with(m_sourceUnitNamesToUri.at(_sourceUnitName), "file://"), "");
-		return m_sourceUnitNamesToUri.at(_sourceUnitName);
-	}
-	else if (_sourceUnitName.find("file://") == 0)
-		return _sourceUnitName;
-	else if (regex_search(_sourceUnitName, windowsDriveLetterPath))
-		return "file:///" + _sourceUnitName;
-	else if (
-		auto const resolvedPath = tryResolvePath(_sourceUnitName);
-		resolvedPath.message().empty()
-	)
-		return "file://" + ensurePathIsUnixLike(resolvedPath.get().generic_string());
-	else if (m_basePath.generic_string() != "/")
-		return "file://" + m_basePath.generic_string() + "/" + _sourceUnitName;
-	else
-		// Avoid double-/ in case base-path itself is simply a UNIX root filesystem root.
-		return "file:///" + _sourceUnitName;
-}
-
-std::string FileRepository::uriToSourceUnitName(std::string const& _path) const
-{
-	lspRequire(boost::algorithm::starts_with(_path, "file://"), ErrorCode::InternalError, "URI must start with file://");
-	return stripFileUriSchemePrefix(_path);
-}
-
-void FileRepository::setSourceByUri(std::string const& _uri, std::string _source)
-{
-	// This is needed for uris outside the base path. It can lead to collisions,
-	// but we need to mostly rewrite this in a future version anyway.
-	auto sourceUnitName = uriToSourceUnitName(_uri);
-	lspDebug(fmt::format("FileRepository.setSourceByUri({}): {}", _uri, _source));
-	m_sourceUnitNamesToUri.emplace(sourceUnitName, _uri);
-	m_sourceCodes[sourceUnitName] = std::move(_source);
-}
-
-Result<boost::filesystem::path> FileRepository::tryResolvePath(std::string const& _strippedSourceUnitName) const
-{
-	if (
-		boost::filesystem::path(_strippedSourceUnitName).has_root_path() &&
-		boost::filesystem::exists(_strippedSourceUnitName)
-	)
-		return boost::filesystem::path(_strippedSourceUnitName);
-
-	std::vector<boost::filesystem::path> candidates;
-	std::vector<std::reference_wrapper<boost::filesystem::path const>> prefixes = {m_basePath};
-	prefixes += (m_includePaths | ranges::to<std::vector<std::reference_wrapper<boost::filesystem::path const>>>);
-	auto const defaultInclude = m_basePath / "node_modules";
-	if (m_includePaths.empty())
-		prefixes.emplace_back(defaultInclude);
-
-	auto const pathToQuotedString = [](boost::filesystem::path const& _path) { return "\"" + _path.string() + "\""; };
-
-	for (auto const& prefix: prefixes)
-	{
-		boost::filesystem::path canonicalPath = boost::filesystem::path(prefix) / boost::filesystem::path(_strippedSourceUnitName);
-
-		if (boost::filesystem::exists(canonicalPath))
-			candidates.push_back(std::move(canonicalPath));
-	}
-
-	if (candidates.empty())
-		return Result<boost::filesystem::path>::err(
-			"File not found. Searched the following locations: " +
-			joinHumanReadable(prefixes | ranges::views::transform(pathToQuotedString), ", ") +
-			"."
-		);
-
-	if (candidates.size() >= 2)
-		return Result<boost::filesystem::path>::err(
-			"Ambiguous import. "
-			"Multiple matching files found inside base path and/or include paths: " +
-			joinHumanReadable(candidates | ranges::views::transform(pathToQuotedString), ", ") +
-			"."
-		);
-
-	if (!boost::filesystem::is_regular_file(candidates[0]))
-		return Result<boost::filesystem::path>::err("Not a valid file.");
-
-	return candidates[0];
-}
-
-frontend::ReadCallback::Result FileRepository::readFile(std::string const& _kind, std::string const& _sourceUnitName)
-{
-	solAssert(
-		_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile),
-		"ReadFile callback used as callback kind " + _kind
-	);
-
-	try
-	{
-		// File was read already. Use local store.
-		if (m_sourceCodes.count(_sourceUnitName))
-			return ReadCallback::Result{true, m_sourceCodes.at(_sourceUnitName)};
-
-		std::string const strippedSourceUnitName = stripFileUriSchemePrefix(_sourceUnitName);
-		Result<boost::filesystem::path> const resolvedPath = tryResolvePath(strippedSourceUnitName);
-		if (!resolvedPath.message().empty())
-			return ReadCallback::Result{false, resolvedPath.message()};
-
-		auto contents = readFileAsString(resolvedPath.get());
-		solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
-		m_sourceCodes[_sourceUnitName] = contents;
-		return ReadCallback::Result{true, std::move(contents)};
-	}
-	catch (std::exception const& _exception)
-	{
-		return ReadCallback::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
-	}
-	catch (...)
-	{
-		return ReadCallback::Result{false, "Unknown exception in read callback: " + boost::current_exception_diagnostic_information()};
-	}
-}
-
diff --git a/libsolidity/lsp/FileRepository.h b/libsolidity/lsp/FileRepository.h
deleted file mode 100644
index dfd9319383e2..000000000000
--- a/libsolidity/lsp/FileRepository.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolidity/interface/FileReader.h>
-#include <libsolutil/Result.h>
-
-#include <string>
-#include <map>
-
-namespace solidity::lsp
-{
-
-class FileRepository
-{
-public:
-	FileRepository(boost::filesystem::path _basePath, std::vector<boost::filesystem::path> _includePaths);
-
-	std::vector<boost::filesystem::path> const& includePaths() const noexcept { return m_includePaths; }
-	void setIncludePaths(std::vector<boost::filesystem::path> _paths);
-
-	boost::filesystem::path const& basePath() const { return m_basePath; }
-
-	/// Translates a compiler-internal source unit name to an LSP client path.
-	std::string sourceUnitNameToUri(std::string const& _sourceUnitName) const;
-
-	/// Translates an LSP file URI into a compiler-internal source unit name.
-	std::string uriToSourceUnitName(std::string const& _uri) const;
-
-	/// @returns all sources by their compiler-internal source unit name.
-	StringMap const& sourceUnits() const noexcept { return m_sourceCodes; }
-
-	/// Changes the source identified by the LSP client path _uri to _text.
-	void setSourceByUri(std::string const& _uri, std::string _text);
-
-	void setSourceUnits(StringMap _sources);
-	frontend::ReadCallback::Result readFile(std::string const& _kind, std::string const& _sourceUnitName);
-	frontend::ReadCallback::Callback reader()
-	{
-		return [this](std::string const& _kind, std::string const& _path) { return readFile(_kind, _path); };
-	}
-
-	util::Result<boost::filesystem::path> tryResolvePath(std::string const& _sourceUnitName) const;
-
-private:
-	/// Base path without URI scheme.
-	boost::filesystem::path m_basePath;
-
-	/// Additional directories used for resolving relative paths in imports.
-	std::vector<boost::filesystem::path> m_includePaths;
-
-	/// Mapping of source unit names to their URIs as understood by the client.
-	StringMap m_sourceUnitNamesToUri;
-
-	/// Mapping of source unit names to their file content.
-	StringMap m_sourceCodes;
-};
-
-}
diff --git a/libsolidity/lsp/GotoDefinition.cpp b/libsolidity/lsp/GotoDefinition.cpp
deleted file mode 100644
index 136e4d7c391b..000000000000
--- a/libsolidity/lsp/GotoDefinition.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/lsp/GotoDefinition.h>
-#include <libsolidity/lsp/Transport.h> // for RequestError
-#include <libsolidity/lsp/Utils.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTUtils.h>
-
-#include <fmt/format.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::lsp;
-
-void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
-{
-	auto const [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
-
-	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
-
-	std::vector<SourceLocation> locations;
-	if (auto const* expression = dynamic_cast<Expression const*>(sourceNode))
-	{
-		// Handles all expressions that can have one or more declaration annotation.
-		if (auto const* declaration = referencedDeclaration(expression))
-			if (auto location = declarationLocation(declaration))
-				locations.emplace_back(std::move(location.value()));
-	}
-	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(sourceNode))
-	{
-		if (auto const* declaration = identifierPath->annotation().referencedDeclaration)
-			if (auto location = declarationLocation(declaration))
-				locations.emplace_back(std::move(location.value()));
-	}
-	else if (auto const* importDirective = dynamic_cast<ImportDirective const*>(sourceNode))
-	{
-		auto const& path = *importDirective->annotation().absolutePath;
-		if (fileRepository().sourceUnits().count(path))
-			locations.emplace_back(SourceLocation{0, 0, std::make_shared<std::string const>(path)});
-	}
-
-	Json::Value reply = Json::arrayValue;
-	for (SourceLocation const& location: locations)
-		reply.append(toJson(location));
-	client().reply(_id, reply);
-}
diff --git a/libsolidity/lsp/GotoDefinition.h b/libsolidity/lsp/GotoDefinition.h
deleted file mode 100644
index 453da3f1561c..000000000000
--- a/libsolidity/lsp/GotoDefinition.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/lsp/HandlerBase.h>
-
-namespace solidity::lsp
-{
-
-class GotoDefinition: public HandlerBase
-{
-public:
-	explicit GotoDefinition(LanguageServer& _server): HandlerBase(_server) {}
-
-	void operator()(MessageID, Json::Value const&);
-};
-
-}
diff --git a/libsolidity/lsp/HandlerBase.cpp b/libsolidity/lsp/HandlerBase.cpp
deleted file mode 100644
index a23e43a83ce1..000000000000
--- a/libsolidity/lsp/HandlerBase.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolutil/Exceptions.h>
-
-#include <libsolidity/lsp/HandlerBase.h>
-#include <libsolidity/lsp/LanguageServer.h>
-#include <libsolidity/lsp/Utils.h>
-#include <libsolidity/ast/AST.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <fmt/format.h>
-
-using namespace solidity::langutil;
-using namespace solidity::lsp;
-using namespace solidity::util;
-
-Json::Value HandlerBase::toRange(SourceLocation const& _location) const
-{
-	if (!_location.hasText())
-		return toJsonRange({}, {});
-
-	solAssert(_location.sourceName, "");
-	langutil::CharStream const& stream = charStreamProvider().charStream(*_location.sourceName);
-	LineColumn start = stream.translatePositionToLineColumn(_location.start);
-	LineColumn end = stream.translatePositionToLineColumn(_location.end);
-	return toJsonRange(start, end);
-}
-
-Json::Value HandlerBase::toJson(SourceLocation const& _location) const
-{
-	solAssert(_location.sourceName);
-	Json::Value item = Json::objectValue;
-	item["uri"] = fileRepository().sourceUnitNameToUri(*_location.sourceName);
-	item["range"] = toRange(_location);
-	return item;
-}
-
-std::pair<std::string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json::Value const& _args) const
-{
-	std::string const uri = _args["textDocument"]["uri"].asString();
-	std::string const sourceUnitName = fileRepository().uriToSourceUnitName(uri);
-	if (!fileRepository().sourceUnits().count(sourceUnitName))
-		BOOST_THROW_EXCEPTION(
-			RequestError(ErrorCode::RequestFailed) <<
-			errinfo_comment("Unknown file: " + uri)
-		);
-
-	auto const lineColumn = parseLineColumn(_args["position"]);
-	if (!lineColumn)
-		BOOST_THROW_EXCEPTION(
-			RequestError(ErrorCode::RequestFailed) <<
-			errinfo_comment(fmt::format(
-				"Unknown position {line}:{column} in file: {file}",
-				fmt::arg("line", lineColumn.value().line),
-				fmt::arg("column", lineColumn.value().column),
-				fmt::arg("file", sourceUnitName)
-			))
-		);
-
-	return {sourceUnitName, *lineColumn};
-}
diff --git a/libsolidity/lsp/HandlerBase.h b/libsolidity/lsp/HandlerBase.h
deleted file mode 100644
index e2ccb88d82ec..000000000000
--- a/libsolidity/lsp/HandlerBase.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolidity/lsp/FileRepository.h>
-#include <libsolidity/lsp/LanguageServer.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <liblangutil/CharStreamProvider.h>
-
-#include <optional>
-
-namespace solidity::lsp
-{
-
-class Transport;
-
-/**
- * Helper base class for implementing handlers.
- */
-class HandlerBase
-{
-public:
-	explicit HandlerBase(LanguageServer& _server): m_server{_server} {}
-
-	Json::Value toRange(langutil::SourceLocation const& _location) const;
-	Json::Value toJson(langutil::SourceLocation const& _location) const;
-
-	/// @returns source unit name and the line column position as extracted
-	/// from the JSON-RPC parameters.
-	std::pair<std::string, langutil::LineColumn> extractSourceUnitNameAndLineColumn(Json::Value const& _params) const;
-
-	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.compilerStack(); }
-	FileRepository& fileRepository() const noexcept { return m_server.fileRepository(); }
-	Transport& client() const noexcept { return m_server.client(); }
-
-protected:
-	LanguageServer& m_server;
-};
-
-}
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
deleted file mode 100644
index 2b8b62706d50..000000000000
--- a/libsolidity/lsp/LanguageServer.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTUtils.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/interface/ReadFile.h>
-#include <libsolidity/interface/StandardCompiler.h>
-#include <libsolidity/lsp/LanguageServer.h>
-#include <libsolidity/lsp/HandlerBase.h>
-#include <libsolidity/lsp/Utils.h>
-
-// LSP feature implementations
-#include <libsolidity/lsp/DocumentHoverHandler.h>
-#include <libsolidity/lsp/GotoDefinition.h>
-#include <libsolidity/lsp/RenameSymbol.h>
-#include <libsolidity/lsp/SemanticTokensBuilder.h>
-
-#include <liblangutil/SourceReferenceExtractor.h>
-#include <liblangutil/CharStream.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Visitor.h>
-#include <libsolutil/JSON.h>
-
-#include <boost/exception/diagnostic_information.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <ostream>
-#include <string>
-
-#include <fmt/format.h>
-
-using namespace std::string_literals;
-using namespace std::placeholders;
-
-using namespace solidity::lsp;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace fs = boost::filesystem;
-
-namespace
-{
-
-bool resolvesToRegularFile(boost::filesystem::path _path, int maxRecursionDepth = 10)
-{
-	fs::file_status fileStatus = fs::status(_path);
-
-	while (fileStatus.type() == fs::file_type::symlink_file && maxRecursionDepth > 0)
-	{
-		_path = boost::filesystem::read_symlink(_path);
-		fileStatus = fs::status(_path);
-		maxRecursionDepth--;
-	}
-
-	return fileStatus.type() == fs::file_type::regular_file;
-}
-
-int toDiagnosticSeverity(Error::Type _errorType)
-{
-	// 1=Error, 2=Warning, 3=Info, 4=Hint
-	switch (Error::errorSeverity(_errorType))
-	{
-	case Error::Severity::Error: return 1;
-	case Error::Severity::Warning: return 2;
-	case Error::Severity::Info: return 3;
-	}
-	solAssert(false);
-	return -1;
-}
-
-Json::Value semanticTokensLegend()
-{
-	Json::Value legend = Json::objectValue;
-
-	// NOTE! The (alphabetical) order and items must match exactly the items of
-	//       their respective enum class members.
-
-	Json::Value tokenTypes = Json::arrayValue;
-	tokenTypes.append("class");
-	tokenTypes.append("comment");
-	tokenTypes.append("enum");
-	tokenTypes.append("enumMember");
-	tokenTypes.append("event");
-	tokenTypes.append("function");
-	tokenTypes.append("interface");
-	tokenTypes.append("keyword");
-	tokenTypes.append("macro");
-	tokenTypes.append("method");
-	tokenTypes.append("modifier");
-	tokenTypes.append("number");
-	tokenTypes.append("operator");
-	tokenTypes.append("parameter");
-	tokenTypes.append("property");
-	tokenTypes.append("std::string");
-	tokenTypes.append("struct");
-	tokenTypes.append("type");
-	tokenTypes.append("typeParameter");
-	tokenTypes.append("variable");
-	legend["tokenTypes"] = tokenTypes;
-
-	Json::Value tokenModifiers = Json::arrayValue;
-	tokenModifiers.append("abstract");
-	tokenModifiers.append("declaration");
-	tokenModifiers.append("definition");
-	tokenModifiers.append("deprecated");
-	tokenModifiers.append("documentation");
-	tokenModifiers.append("modification");
-	tokenModifiers.append("readonly");
-	legend["tokenModifiers"] = tokenModifiers;
-
-	return legend;
-}
-
-}
-
-LanguageServer::LanguageServer(Transport& _transport):
-	m_client{_transport},
-	m_handlers{
-		{"$/cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
-		{"cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
-		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
-		{"initialize", std::bind(&LanguageServer::handleInitialize, this, _1, _2)},
-		{"initialized", std::bind(&LanguageServer::handleInitialized, this, _1, _2)},
-		{"$/setTrace", [this](auto, Json::Value const& args) { setTrace(args["value"]); }},
-		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
-		{"textDocument/definition", GotoDefinition(*this) },
-		{"textDocument/didOpen", std::bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
-		{"textDocument/didChange", std::bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
-		{"textDocument/didClose", std::bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
-		{"textDocument/hover", DocumentHoverHandler(*this) },
-		{"textDocument/rename", RenameSymbol(*this) },
-		{"textDocument/implementation", GotoDefinition(*this) },
-		{"textDocument/semanticTokens/full", std::bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
-		{"workspace/didChangeConfiguration", std::bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
-	},
-	m_fileRepository("/" /* basePath */, {} /* no search paths */),
-	m_compilerStack{m_fileRepository.reader()}
-{
-}
-
-Json::Value LanguageServer::toRange(SourceLocation const& _location)
-{
-	return HandlerBase(*this).toRange(_location);
-}
-
-Json::Value LanguageServer::toJson(SourceLocation const& _location)
-{
-	return HandlerBase(*this).toJson(_location);
-}
-
-void LanguageServer::changeConfiguration(Json::Value const& _settings)
-{
-	// The settings item: "file-load-strategy" (enum) defaults to "project-directory" if not (or not correctly) set.
-	// It can be overridden during client's handshake or at runtime, as usual.
-	//
-	// If this value is set to "project-directory" (default), all .sol files located inside the project directory or reachable through symbolic links will be subject to operations.
-	//
-	// Operations include compiler analysis, but also finding all symbolic references or symbolic renaming.
-	//
-	// If this value is set to "directly-opened-and-on-import", then only currently directly opened files and
-	// those files being imported directly or indirectly will be included in operations.
-	if (_settings["file-load-strategy"])
-	{
-		auto const text = _settings["file-load-strategy"].asString();
-		if (text == "project-directory")
-			m_fileLoadStrategy = FileLoadStrategy::ProjectDirectory;
-		else if (text == "directly-opened-and-on-import")
-			m_fileLoadStrategy = FileLoadStrategy::DirectlyOpenedAndOnImported;
-		else
-			lspRequire(false, ErrorCode::InvalidParams, "Invalid file load strategy: " + text);
-	}
-
-	m_settingsObject = _settings;
-	Json::Value jsonIncludePaths = _settings["include-paths"];
-
-	if (jsonIncludePaths)
-	{
-		int typeFailureCount = 0;
-		if (jsonIncludePaths.isArray())
-		{
-			std::vector<boost::filesystem::path> includePaths;
-			for (Json::Value const& jsonPath: jsonIncludePaths)
-			{
-				if (jsonPath.isString())
-					includePaths.emplace_back(boost::filesystem::path(jsonPath.asString()));
-				else
-					typeFailureCount++;
-			}
-			m_fileRepository.setIncludePaths(std::move(includePaths));
-		}
-		else
-			++typeFailureCount;
-
-		if (typeFailureCount)
-			m_client.trace("Invalid JSON configuration passed. \"include-paths\" must be an array of strings.");
-	}
-}
-
-std::vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() const
-{
-	std::vector<fs::path> collectedPaths{};
-
-	// We explicitly decided against including all files from include paths but leave the possibility
-	// open for a future PR to enable such a feature to be optionally enabled (default disabled).
-	// Note: Newer versions of boost have deprecated symlink_option::recurse
-#if (BOOST_VERSION < 107200)
-	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
-#else
-	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::directory_options::follow_directory_symlink);
-#endif
-	for (fs::directory_entry const& dirEntry: directoryIterator)
-		if (
-			dirEntry.path().extension() == ".sol" &&
-			(dirEntry.status().type() == fs::file_type::regular_file || resolvesToRegularFile(dirEntry.path()))
-		)
-			collectedPaths.push_back(dirEntry.path());
-
-	return collectedPaths;
-}
-
-void LanguageServer::compile()
-{
-	// For files that are not open, we have to take changes on disk into account,
-	// so we just remove all non-open files.
-
-	FileRepository oldRepository(m_fileRepository.basePath(), m_fileRepository.includePaths());
-	std::swap(oldRepository, m_fileRepository);
-
-	// Load all solidity files from project.
-	if (m_fileLoadStrategy == FileLoadStrategy::ProjectDirectory)
-		for (auto const& projectFile: allSolidityFilesFromProject())
-		{
-			lspDebug(fmt::format("adding project file: {}", projectFile.generic_string()));
-			m_fileRepository.setSourceByUri(
-				m_fileRepository.sourceUnitNameToUri(projectFile.generic_string()),
-				util::readFileAsString(projectFile)
-			);
-		}
-
-	// Overwrite all files as opened by the client, including the ones which might potentially have changes.
-	for (std::string const& fileName: m_openFiles)
-		m_fileRepository.setSourceByUri(
-			fileName,
-			oldRepository.sourceUnits().at(oldRepository.uriToSourceUnitName(fileName))
-		);
-
-	// TODO: optimize! do not recompile if nothing has changed (file(s) not flagged dirty).
-
-	m_compilerStack.reset(false);
-	m_compilerStack.setSources(m_fileRepository.sourceUnits());
-	m_compilerStack.compile(CompilerStack::State::AnalysisSuccessful);
-}
-
-void LanguageServer::compileAndUpdateDiagnostics()
-{
-	compile();
-
-	// These are the source units we will sent diagnostics to the client for sure,
-	// even if it is just to clear previous diagnostics.
-	std::map<std::string, Json::Value> diagnosticsBySourceUnit;
-	for (std::string const& sourceUnitName: m_fileRepository.sourceUnits() | ranges::views::keys)
-		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
-	for (std::string const& sourceUnitName: m_nonemptyDiagnostics)
-		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
-
-	for (std::shared_ptr<Error const> const& error: m_compilerStack.errors())
-	{
-		SourceLocation const* location = error->sourceLocation();
-		if (!location || !location->sourceName)
-			// LSP only has diagnostics applied to individual files.
-			continue;
-
-		Json::Value jsonDiag;
-		jsonDiag["source"] = "solc";
-		jsonDiag["severity"] = toDiagnosticSeverity(error->type());
-		jsonDiag["code"] = Json::UInt64{error->errorId().error};
-		std::string message = Error::formatErrorType(error->type()) + ":";
-		if (std::string const* comment = error->comment())
-			message += " " + *comment;
-		jsonDiag["message"] = std::move(message);
-		jsonDiag["range"] = toRange(*location);
-
-		if (auto const* secondary = error->secondarySourceLocation())
-			for (auto&& [secondaryMessage, secondaryLocation]: secondary->infos)
-			{
-				Json::Value jsonRelated;
-				jsonRelated["message"] = secondaryMessage;
-				jsonRelated["location"] = toJson(secondaryLocation);
-				jsonDiag["relatedInformation"].append(jsonRelated);
-			}
-
-		diagnosticsBySourceUnit[*location->sourceName].append(jsonDiag);
-	}
-
-	if (m_client.traceValue() != TraceValue::Off)
-	{
-		Json::Value extra;
-		extra["openFileCount"] = Json::UInt64(diagnosticsBySourceUnit.size());
-		m_client.trace("Number of currently open files: " + std::to_string(diagnosticsBySourceUnit.size()), extra);
-	}
-
-	m_nonemptyDiagnostics.clear();
-	for (auto&& [sourceUnitName, diagnostics]: diagnosticsBySourceUnit)
-	{
-		Json::Value params;
-		params["uri"] = m_fileRepository.sourceUnitNameToUri(sourceUnitName);
-		if (!diagnostics.empty())
-			m_nonemptyDiagnostics.insert(sourceUnitName);
-		params["diagnostics"] = std::move(diagnostics);
-		m_client.notify("textDocument/publishDiagnostics", std::move(params));
-	}
-}
-
-bool LanguageServer::run()
-{
-	while (m_state != State::ExitRequested && m_state != State::ExitWithoutShutdown && !m_client.closed())
-	{
-		MessageID id;
-		try
-		{
-			std::optional<Json::Value> const jsonMessage = m_client.receive();
-			if (!jsonMessage)
-				continue;
-
-			if ((*jsonMessage)["method"].isString())
-			{
-				std::string const methodName = (*jsonMessage)["method"].asString();
-				id = (*jsonMessage)["id"];
-				lspDebug(fmt::format("received method call: {}", methodName));
-
-				if (auto handler = util::valueOrDefault(m_handlers, methodName))
-					handler(id, (*jsonMessage)["params"]);
-				else
-					m_client.error(id, ErrorCode::MethodNotFound, "Unknown method " + methodName);
-			}
-			else
-				m_client.error({}, ErrorCode::ParseError, "\"method\" has to be a string.");
-		}
-		catch (Json::Exception const&)
-		{
-			m_client.error(id, ErrorCode::InvalidParams, "JSON object access error. Most likely due to a badly formatted JSON request message."s);
-		}
-		catch (RequestError const& error)
-		{
-			m_client.error(id, error.code(), error.comment() ? *error.comment() : ""s);
-		}
-		catch (...)
-		{
-			m_client.error(id, ErrorCode::InternalError, "Unhandled exception: "s + boost::current_exception_diagnostic_information());
-		}
-	}
-	return m_state == State::ExitRequested;
-}
-
-void LanguageServer::requireServerInitialized()
-{
-	lspRequire(
-		m_state == State::Initialized,
-		ErrorCode::ServerNotInitialized,
-		"Server is not properly initialized."
-	);
-}
-
-void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
-{
-	lspRequire(
-		m_state == State::Started,
-		ErrorCode::RequestFailed,
-		"Initialize called at the wrong time."
-	);
-
-	m_state = State::Initialized;
-
-	// The default of FileReader is to use `.`, but the path from where the LSP was started
-	// should not matter.
-	std::string rootPath("/");
-	if (Json::Value uri = _args["rootUri"])
-	{
-		rootPath = uri.asString();
-		lspRequire(
-			boost::starts_with(rootPath, "file://"),
-			ErrorCode::InvalidParams,
-			"rootUri only supports file URI scheme."
-		);
-		rootPath = stripFileUriSchemePrefix(rootPath);
-	}
-	else if (Json::Value rootPath = _args["rootPath"])
-		rootPath = rootPath.asString();
-
-	if (_args["trace"])
-		setTrace(_args["trace"]);
-
-	m_fileRepository = FileRepository(rootPath, {});
-	if (_args["initializationOptions"].isObject())
-		changeConfiguration(_args["initializationOptions"]);
-
-	Json::Value replyArgs;
-	replyArgs["serverInfo"]["name"] = "solc";
-	replyArgs["serverInfo"]["version"] = std::string(VersionNumber);
-	replyArgs["capabilities"]["definitionProvider"] = true;
-	replyArgs["capabilities"]["implementationProvider"] = true;
-	replyArgs["capabilities"]["textDocumentSync"]["change"] = 2; // 0=none, 1=full, 2=incremental
-	replyArgs["capabilities"]["textDocumentSync"]["openClose"] = true;
-	replyArgs["capabilities"]["semanticTokensProvider"]["legend"] = semanticTokensLegend();
-	replyArgs["capabilities"]["semanticTokensProvider"]["range"] = false;
-	replyArgs["capabilities"]["semanticTokensProvider"]["full"] = true; // XOR requests.full.delta = true
-	replyArgs["capabilities"]["renameProvider"] = true;
-	replyArgs["capabilities"]["hoverProvider"] = true;
-
-	m_client.reply(_id, std::move(replyArgs));
-}
-
-void LanguageServer::handleInitialized(MessageID, Json::Value const&)
-{
-	if (m_fileLoadStrategy == FileLoadStrategy::ProjectDirectory)
-		compileAndUpdateDiagnostics();
-}
-
-void LanguageServer::semanticTokensFull(MessageID _id, Json::Value const& _args)
-{
-	auto uri = _args["textDocument"]["uri"];
-
-	compile();
-
-	auto const sourceName = m_fileRepository.uriToSourceUnitName(uri.as<std::string>());
-	SourceUnit const& ast = m_compilerStack.ast(sourceName);
-	m_compilerStack.charStream(sourceName);
-	Json::Value data = SemanticTokensBuilder().build(ast, m_compilerStack.charStream(sourceName));
-
-	Json::Value reply = Json::objectValue;
-	reply["data"] = data;
-
-	m_client.reply(_id, std::move(reply));
-}
-
-void LanguageServer::handleWorkspaceDidChangeConfiguration(Json::Value const& _args)
-{
-	requireServerInitialized();
-
-	if (_args["settings"].isObject())
-		changeConfiguration(_args["settings"]);
-}
-
-void LanguageServer::setTrace(Json::Value const& _args)
-{
-	if (!_args.isString())
-		// Simply ignore invalid parameter.
-		return;
-
-	std::string const stringValue = _args.asString();
-	if (stringValue == "off")
-		m_client.setTrace(TraceValue::Off);
-	else if (stringValue == "messages")
-		m_client.setTrace(TraceValue::Messages);
-	else if (stringValue == "verbose")
-		m_client.setTrace(TraceValue::Verbose);
-}
-
-void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
-{
-	requireServerInitialized();
-
-	lspRequire(
-		_args["textDocument"],
-		ErrorCode::RequestFailed,
-		"Text document parameter missing."
-	);
-
-	std::string text = _args["textDocument"]["text"].asString();
-	std::string uri = _args["textDocument"]["uri"].asString();
-	m_openFiles.insert(uri);
-	m_fileRepository.setSourceByUri(uri, std::move(text));
-	compileAndUpdateDiagnostics();
-}
-
-void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
-{
-	requireServerInitialized();
-
-	std::string const uri = _args["textDocument"]["uri"].asString();
-
-	for (Json::Value jsonContentChange: _args["contentChanges"])
-	{
-		lspRequire(
-			jsonContentChange.isObject(),
-			ErrorCode::RequestFailed,
-			"Invalid content reference."
-		);
-
-		std::string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
-		lspRequire(
-			m_fileRepository.sourceUnits().count(sourceUnitName),
-			ErrorCode::RequestFailed,
-			"Unknown file: " + uri
-		);
-
-		std::string text = jsonContentChange["text"].asString();
-		if (jsonContentChange["range"].isObject()) // otherwise full content update
-		{
-			std::optional<SourceLocation> change = parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
-			lspRequire(
-				change && change->hasText(),
-				ErrorCode::RequestFailed,
-				"Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"])
-			);
-
-			std::string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
-			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), std::move(text));
-			text = std::move(buffer);
-		}
-		m_fileRepository.setSourceByUri(uri, std::move(text));
-	}
-
-	compileAndUpdateDiagnostics();
-}
-
-void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
-{
-	requireServerInitialized();
-
-	lspRequire(
-		_args["textDocument"],
-		ErrorCode::RequestFailed,
-		"Text document parameter missing."
-	);
-
-	std::string uri = _args["textDocument"]["uri"].asString();
-	m_openFiles.erase(uri);
-
-	compileAndUpdateDiagnostics();
-}
-
-ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
-{
-	return std::get<ASTNode const*>(astNodeAndOffsetAtSourceLocation(_sourceUnitName, _filePos));
-}
-
-std::tuple<ASTNode const*, int> LanguageServer::astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
-{
-	if (m_compilerStack.state() < CompilerStack::AnalysisSuccessful)
-		return {nullptr, -1};
-	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
-		return {nullptr, -1};
-
-	std::optional<int> sourcePos = m_compilerStack.charStream(_sourceUnitName).translateLineColumnToPosition(_filePos);
-	if (!sourcePos)
-		return {nullptr, -1};
-
-	return {locateInnermostASTNode(*sourcePos, m_compilerStack.ast(_sourceUnitName)), *sourcePos};
-}
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
deleted file mode 100644
index d80f8e879c7a..000000000000
--- a/libsolidity/lsp/LanguageServer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolidity/lsp/Transport.h>
-#include <libsolidity/lsp/FileRepository.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/FileReader.h>
-
-#include <json/value.h>
-
-#include <functional>
-#include <map>
-#include <optional>
-#include <string>
-#include <vector>
-
-namespace solidity::lsp
-{
-
-class RenameSymbol;
-enum class ErrorCode;
-
-/**
- * Enum to mandate what files to take into consideration for source code analysis.
- */
-enum class FileLoadStrategy
-{
-	/// Takes only those files into consideration that are explicitly opened and those
-	/// that have been directly or indirectly imported.
-	DirectlyOpenedAndOnImported = 0,
-
-	/// Takes all Solidity (.sol) files within the project root into account.
-	/// Symbolic links will be followed, even if they lead outside of the project directory
-	/// (`--allowed-paths` is currently ignored by the LSP).
-	///
-	/// This resembles the closest what other LSPs should be doing already.
-	ProjectDirectory = 1,
-};
-
-/**
- * Solidity Language Server, managing one LSP client.
- * This implements a subset of LSP version 3.16 that can be found at:
- * https://microsoft.github.io/language-server-protocol/specifications/specification-3-16/
- */
-class LanguageServer
-{
-public:
-	/// @param _transport Customizable transport layer.
-	explicit LanguageServer(Transport& _transport);
-
-	/// Re-compiles the project and updates the diagnostics pushed to the client.
-	void compileAndUpdateDiagnostics();
-
-	/// Loops over incoming messages via the transport layer until shutdown condition is met.
-	///
-	/// The standard shutdown condition is when the maximum number of consecutive failures
-	/// has been exceeded.
-	///
-	/// @return boolean indicating normal or abnormal termination.
-	bool run();
-
-	FileRepository& fileRepository() noexcept { return m_fileRepository; }
-	Transport& client() noexcept { return m_client; }
-	std::tuple<frontend::ASTNode const*, int> astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
-	frontend::ASTNode const* astNodeAtSourceLocation(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
-	frontend::CompilerStack const& compilerStack() const noexcept { return m_compilerStack; }
-
-private:
-	/// Checks if the server is initialized (to be used by messages that need it to be initialized).
-	/// Reports an error and returns false if not.
-	void requireServerInitialized();
-	void handleInitialize(MessageID _id, Json::Value const& _args);
-	void handleInitialized(MessageID _id, Json::Value const& _args);
-	void handleWorkspaceDidChangeConfiguration(Json::Value const& _args);
-	void setTrace(Json::Value const& _args);
-	void handleTextDocumentDidOpen(Json::Value const& _args);
-	void handleTextDocumentDidChange(Json::Value const& _args);
-	void handleTextDocumentDidClose(Json::Value const& _args);
-	void handleRename(Json::Value const& _args);
-	void handleGotoDefinition(MessageID _id, Json::Value const& _args);
-	void semanticTokensFull(MessageID _id, Json::Value const& _args);
-
-	/// Invoked when the server user-supplied configuration changes (initiated by the client).
-	void changeConfiguration(Json::Value const&);
-
-	/// Compile everything until after analysis phase.
-	void compile();
-
-	std::vector<boost::filesystem::path> allSolidityFilesFromProject() const;
-
-	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
-
-	Json::Value toRange(langutil::SourceLocation const& _location);
-	Json::Value toJson(langutil::SourceLocation const& _location);
-
-	// LSP related member fields
-
-	enum class State { Started, Initialized, ShutdownRequested, ExitRequested, ExitWithoutShutdown };
-	State m_state = State::Started;
-
-	Transport& m_client;
-	std::map<std::string, MessageHandler> m_handlers;
-
-	/// Set of files (names in URI form) known to be open by the client.
-	std::set<std::string> m_openFiles;
-	/// Set of source unit names for which we sent diagnostics to the client in the last iteration.
-	std::set<std::string> m_nonemptyDiagnostics;
-	FileRepository m_fileRepository;
-	FileLoadStrategy m_fileLoadStrategy = FileLoadStrategy::ProjectDirectory;
-
-	frontend::CompilerStack m_compilerStack;
-
-	/// User-supplied custom configuration settings (such as EVM version).
-	Json::Value m_settingsObject;
-};
-
-}
diff --git a/libsolidity/lsp/RenameSymbol.cpp b/libsolidity/lsp/RenameSymbol.cpp
deleted file mode 100644
index 75f032fcca47..000000000000
--- a/libsolidity/lsp/RenameSymbol.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/lsp/RenameSymbol.h>
-#include <libsolidity/lsp/Utils.h>
-
-#include <libyul/AST.h>
-
-#include <fmt/format.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::lsp;
-
-namespace
-{
-
-CallableDeclaration const* extractCallableDeclaration(FunctionCall const& _functionCall)
-{
-	if (
-		auto const* functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type);
-		functionType && functionType->hasDeclaration()
-	)
-		if (auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(&functionType->declaration()))
-			return functionDefinition;
-
-	return nullptr;
-}
-
-}
-
-void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
-{
-	auto const&& [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
-	std::string const newName = _args["newName"].asString();
-	std::string const uri = _args["textDocument"]["uri"].asString();
-
-	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
-
-	m_symbolName = {};
-	m_declarationToRename = nullptr;
-	m_sourceUnits = { &m_server.compilerStack().ast(sourceUnitName) };
-	m_locations.clear();
-
-	std::optional<int> cursorBytePosition = charStreamProvider()
-		.charStream(sourceUnitName)
-		.translateLineColumnToPosition(lineColumn);
-	solAssert(cursorBytePosition.has_value(), "Expected source pos");
-
-	extractNameAndDeclaration(*sourceNode, *cursorBytePosition);
-
-	// Find all source units using this symbol
-	for (auto const& [name, content]: fileRepository().sourceUnits())
-	{
-		auto const& sourceUnit = m_server.compilerStack().ast(name);
-		for (auto const* referencedSourceUnit: sourceUnit.referencedSourceUnits(true, util::convertContainer<std::set<SourceUnit const*>>(m_sourceUnits)))
-			if (*referencedSourceUnit->location().sourceName == sourceUnitName)
-			{
-				m_sourceUnits.insert(&sourceUnit);
-				break;
-			}
-	}
-
-	// Origin source unit should always be checked
-	m_sourceUnits.insert(&m_declarationToRename->sourceUnit());
-
-	Visitor visitor(*this);
-
-	for (auto const* sourceUnit: m_sourceUnits)
-		sourceUnit->accept(visitor);
-
-	// Apply changes in reverse order (will iterate in reverse)
-	sort(m_locations.begin(), m_locations.end());
-
-	Json::Value reply = Json::objectValue;
-	reply["changes"] = Json::objectValue;
-
-	Json::Value edits = Json::arrayValue;
-
-	for (auto i = m_locations.rbegin(); i != m_locations.rend(); i++)
-	{
-		solAssert(i->isValid());
-
-		// Replace in our file repository
-		std::string const uri = fileRepository().sourceUnitNameToUri(*i->sourceName);
-		std::string buffer = fileRepository().sourceUnits().at(*i->sourceName);
-		buffer.replace((size_t)i->start, (size_t)(i->end - i->start), newName);
-		fileRepository().setSourceByUri(uri, std::move(buffer));
-
-		Json::Value edit = Json::objectValue;
-		edit["range"] = toRange(*i);
-		edit["newText"] = newName;
-
-		// Record changes for the client
-		edits.append(edit);
-		if (i + 1 == m_locations.rend() || (i + 1)->sourceName != i->sourceName)
-		{
-			reply["changes"][uri] = edits;
-			edits = Json::arrayValue;
-		}
-	}
-
-	client().reply(_id, reply);
-}
-
-void RenameSymbol::extractNameAndDeclaration(ASTNode const& _node, int _cursorBytePosition)
-{
-	// Identify symbol name and node
-	if (auto const* declaration = dynamic_cast<Declaration const*>(&_node))
-	{
-		if (declaration->nameLocation().containsOffset(_cursorBytePosition))
-		{
-			m_symbolName = declaration->name();
-			m_declarationToRename = declaration;
-		}
-		else if (auto const* importDirective = dynamic_cast<ImportDirective const*>(declaration))
-			extractNameAndDeclaration(*importDirective, _cursorBytePosition);
-	}
-	else if (auto const* identifier = dynamic_cast<Identifier const*>(&_node))
-	{
-		if (auto const* declReference = dynamic_cast<Declaration const*>(identifier->annotation().referencedDeclaration))
-		{
-			m_symbolName = identifier->name();
-			m_declarationToRename = declReference;
-		}
-	}
-	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(&_node))
-		extractNameAndDeclaration(*identifierPath, _cursorBytePosition);
-	else if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(&_node))
-	{
-		m_symbolName = memberAccess->memberName();
-		m_declarationToRename = memberAccess->annotation().referencedDeclaration;
-	}
-	else if (auto const* functionCall = dynamic_cast<FunctionCall const*>(&_node))
-		extractNameAndDeclaration(*functionCall, _cursorBytePosition);
-	else if (auto const* inlineAssembly = dynamic_cast<InlineAssembly const*>(&_node))
-		extractNameAndDeclaration(*inlineAssembly, _cursorBytePosition);
-	else
-		solAssert(false, "Unexpected ASTNODE id: " + std::to_string(_node.id()));
-
-	lspDebug(fmt::format("Goal: rename '{}', loc: {}-{}", m_symbolName, m_declarationToRename->nameLocation().start, m_declarationToRename->nameLocation().end));
-}
-
-void RenameSymbol::extractNameAndDeclaration(ImportDirective const& _importDirective, int _cursorBytePosition)
-{
-	for (ImportDirective::SymbolAlias const& symbolAlias: _importDirective.symbolAliases())
-		if (symbolAlias.location.containsOffset(_cursorBytePosition))
-		{
-			solAssert(symbolAlias.alias);
-			m_symbolName = *symbolAlias.alias;
-			m_declarationToRename = symbolAlias.symbol->annotation().referencedDeclaration;
-			break;
-		}
-}
-
-void RenameSymbol::Visitor::endVisit(ImportDirective const& _node)
-{
-	// Handles SourceUnit aliases
-	if (handleGenericDeclaration(_node))
-		return;
-
-	for (ImportDirective::SymbolAlias const& symbolAlias: _node.symbolAliases())
-		if (
-			symbolAlias.alias != nullptr &&
-			*symbolAlias.alias == m_outer.m_symbolName &&
-			symbolAlias.symbol->annotation().referencedDeclaration == m_outer.m_declarationToRename
-		)
-			m_outer.m_locations.emplace_back(symbolAlias.location);
-}
-
-void RenameSymbol::extractNameAndDeclaration(FunctionCall const& _functionCall, int _cursorBytePosition)
-{
-	if (auto const* functionDefinition = extractCallableDeclaration(_functionCall))
-		for (size_t i = 0; i < _functionCall.names().size(); i++)
-			if (_functionCall.nameLocations()[i].containsOffset(_cursorBytePosition))
-			{
-				m_symbolName = *_functionCall.names()[i];
-				for (size_t j = 0; j < functionDefinition->parameters().size(); j++)
-					if (
-						functionDefinition->parameters()[j] &&
-						functionDefinition->parameters()[j]->name() == m_symbolName
-					)
-						m_declarationToRename =  functionDefinition->parameters()[j].get();
-				return;
-			}
-}
-
-void RenameSymbol::Visitor::endVisit(FunctionCall const& _node)
-{
-	SourceLocation nameLocationInFunctionCall;
-
-	for (size_t i = 0; i < _node.names().size(); i++)
-		if (_node.names()[i] && *_node.names()[i] == m_outer.m_symbolName)
-			nameLocationInFunctionCall = _node.nameLocations()[i];
-
-	if (!nameLocationInFunctionCall.isValid())
-		return;
-
-	if (auto const* functionDefinition = extractCallableDeclaration(_node))
-		for (size_t j = 0; j < functionDefinition->parameters().size(); j++)
-			if (
-				functionDefinition->parameters()[j] &&
-				*functionDefinition->parameters()[j] == *m_outer.m_declarationToRename
-			)
-				m_outer.m_locations.emplace_back(nameLocationInFunctionCall);
-}
-
-void RenameSymbol::Visitor::endVisit(MemberAccess const& _node)
-{
-	if (
-		m_outer.m_symbolName == _node.memberName() &&
-		*m_outer.m_declarationToRename == *_node.annotation().referencedDeclaration
-	)
-		m_outer.m_locations.emplace_back(_node.memberLocation());
-}
-
-void RenameSymbol::Visitor::endVisit(Identifier const& _node)
-{
-	if (
-		m_outer.m_symbolName == _node.name() &&
-		*m_outer.m_declarationToRename == *_node.annotation().referencedDeclaration
-	)
-		m_outer.m_locations.emplace_back(_node.location());
-}
-
-void RenameSymbol::extractNameAndDeclaration(IdentifierPath const& _identifierPath, int _cursorBytePosition)
-{
-	// iterate through the elements of the path to find the one the cursor is on
-	size_t numIdentifiers = _identifierPath.pathLocations().size();
-	for (size_t i = 0; i < numIdentifiers; i++)
-	{
-		auto& location = _identifierPath.pathLocations()[i];
-
-		if (location.containsOffset(_cursorBytePosition))
-		{
-			solAssert(_identifierPath.annotation().pathDeclarations.size() == numIdentifiers);
-			solAssert(_identifierPath.path().size() == numIdentifiers);
-
-			m_declarationToRename = _identifierPath.annotation().pathDeclarations[i];
-			m_symbolName = _identifierPath.path()[i];
-		}
-	}
-}
-
-void RenameSymbol::Visitor::endVisit(IdentifierPath const& _node)
-{
-	std::vector<Declaration const*>& declarations = _node.annotation().pathDeclarations;
-	solAssert(declarations.size() == _node.path().size());
-
-	for (size_t i = 0; i < _node.path().size(); i++)
-		if (
-			_node.path()[i] == m_outer.m_symbolName &&
-			declarations[i] == m_outer.m_declarationToRename
-		)
-			m_outer.m_locations.emplace_back(_node.pathLocations()[i]);
-}
-
-void RenameSymbol::extractNameAndDeclaration(InlineAssembly const& _inlineAssembly, int _cursorBytePosition)
-{
-	for (auto&& [identifier, externalReference]: _inlineAssembly.annotation().externalReferences)
-	{
-		SourceLocation location = yul::nativeLocationOf(*identifier);
-		location.end -= static_cast<int>(externalReference.suffix.size() + 1);
-
-		if (location.containsOffset(_cursorBytePosition))
-		{
-			m_declarationToRename = externalReference.declaration;
-			m_symbolName = identifier->name.str();
-
-			if (!externalReference.suffix.empty())
-				m_symbolName = m_symbolName.substr(0, m_symbolName.length() - externalReference.suffix.size() - 1);
-			break;
-		}
-	}
-}
-
-void RenameSymbol::Visitor::endVisit(InlineAssembly const& _node)
-{
-	for (auto&& [identifier, externalReference]: _node.annotation().externalReferences)
-	{
-		std::string identifierName = identifier->name.str();
-		if (!externalReference.suffix.empty())
-			identifierName = identifierName.substr(0, identifierName.length() - externalReference.suffix.size() - 1);
-
-		if (
-			externalReference.declaration == m_outer.m_declarationToRename &&
-			identifierName == m_outer.m_symbolName
-		)
-		{
-			SourceLocation location = yul::nativeLocationOf(*identifier);
-			location.end -= static_cast<int>(externalReference.suffix.size() + 1);
-
-			m_outer.m_locations.emplace_back(location);
-		}
-	}
-
-}
diff --git a/libsolidity/lsp/RenameSymbol.h b/libsolidity/lsp/RenameSymbol.h
deleted file mode 100644
index cafa8c067a25..000000000000
--- a/libsolidity/lsp/RenameSymbol.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/lsp/HandlerBase.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::lsp
-{
-
-class RenameSymbol: public HandlerBase
-{
-public:
-	explicit RenameSymbol(LanguageServer& _server): HandlerBase(_server) {}
-
-	void operator()(MessageID, Json::Value const&);
-protected:
-	// Nested class because otherwise `RenameSymbol` couldn't be easily used
-	// with LanguageServer::m_handlers as `ASTConstVisitor` deletes required
-	// c'tors
-	struct Visitor: public frontend::ASTConstVisitor
-	{
-		explicit Visitor(RenameSymbol& _outer): m_outer(_outer) {}
-		void endVisit(frontend::ImportDirective const& _node) override;
-		void endVisit(frontend::MemberAccess const& _node) override;
-		void endVisit(frontend::Identifier const& _node) override;
-		void endVisit(frontend::IdentifierPath const& _node) override;
-		void endVisit(frontend::FunctionCall const& _node) override;
-		void endVisit(frontend::InlineAssembly const& _node) override;
-
-		void endVisit(frontend::ContractDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::StructDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::EnumDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::EnumValue const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::UserDefinedValueTypeDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::VariableDeclaration const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::FunctionDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::ModifierDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::EventDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-		void endVisit(frontend::ErrorDefinition const& _node) override
-		{
-			handleGenericDeclaration(_node);
-		}
-
-		bool handleGenericDeclaration(frontend::Declaration const& _declaration)
-		{
-			if (
-				m_outer.m_symbolName == _declaration.name() &&
-				*m_outer.m_declarationToRename == _declaration
-			)
-			{
-				m_outer.m_locations.emplace_back(_declaration.nameLocation());
-				return true;
-			}
-			return false;
-		}
-
-		private:
-			RenameSymbol& m_outer;
-	};
-
-	void extractNameAndDeclaration(frontend::ASTNode const& _node, int _cursorBytePosition);
-	void extractNameAndDeclaration(frontend::IdentifierPath const& _identifierPath, int _cursorBytePosition);
-	void extractNameAndDeclaration(frontend::ImportDirective const& _importDirective, int _cursorBytePosition);
-	void extractNameAndDeclaration(frontend::FunctionCall const& _functionCall, int _cursorBytePosition);
-	void extractNameAndDeclaration(frontend::InlineAssembly const& _inlineAssembly, int _cursorBytePosition);
-
-	// Node to rename
-	frontend::Declaration const* m_declarationToRename = nullptr;
-	// Original name
-	frontend::ASTString m_symbolName = {};
-	// SourceUnits to search & replace symbol in
-	std::set<frontend::SourceUnit const*, frontend::ASTNode::CompareByID> m_sourceUnits = {};
-	// Source locations that need to be replaced
-	std::vector<langutil::SourceLocation> m_locations = {};
-};
-
-}
diff --git a/libsolidity/lsp/SemanticTokensBuilder.cpp b/libsolidity/lsp/SemanticTokensBuilder.cpp
deleted file mode 100644
index 2f44354184ef..000000000000
--- a/libsolidity/lsp/SemanticTokensBuilder.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/lsp/SemanticTokensBuilder.h>
-#include <libsolidity/lsp/Utils.h>
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <fmt/format.h>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace solidity::lsp
-{
-
-namespace
-{
-
-std::optional<SemanticTokenType> semanticTokenTypeForType(frontend::Type const* _type)
-{
-	if (!_type)
-		return std::nullopt;
-
-	switch (_type->category())
-	{
-	case frontend::Type::Category::Address: return SemanticTokenType::Class;
-	case frontend::Type::Category::Bool: return SemanticTokenType::Number;
-	case frontend::Type::Category::Enum: return SemanticTokenType::Enum;
-	case frontend::Type::Category::Function: return SemanticTokenType::Function;
-	case frontend::Type::Category::Integer: return SemanticTokenType::Number;
-	case frontend::Type::Category::RationalNumber: return SemanticTokenType::Number;
-	case frontend::Type::Category::StringLiteral: return SemanticTokenType::String;
-	case frontend::Type::Category::Struct: return SemanticTokenType::Struct;
-	case frontend::Type::Category::Contract: return SemanticTokenType::Class;
-	default:
-		lspDebug(fmt::format("semanticTokenTypeForType: unknown category: {}", static_cast<unsigned>(_type->category())));
-		return SemanticTokenType::Type;
-	}
-}
-
-SemanticTokenType semanticTokenTypeForExpression(frontend::Type const* _type)
-{
-	if (!_type)
-		return SemanticTokenType::Variable;
-
-	switch (_type->category())
-	{
-	case frontend::Type::Category::Enum:
-		return SemanticTokenType::Enum;
-	default:
-		return SemanticTokenType::Variable;
-	}
-}
-
-} // end namespace
-
-Json::Value SemanticTokensBuilder::build(SourceUnit const& _sourceUnit, CharStream const& _charStream)
-{
-	reset(&_charStream);
-	_sourceUnit.accept(*this);
-	return m_encodedTokens;
-}
-
-void SemanticTokensBuilder::reset(CharStream const* _charStream)
-{
-	m_encodedTokens = Json::arrayValue;
-	m_charStream = _charStream;
-	m_lastLine = 0;
-	m_lastStartChar = 0;
-}
-
-void SemanticTokensBuilder::encode(
-	SourceLocation const& _sourceLocation,
-	SemanticTokenType _tokenType,
-	SemanticTokenModifiers _modifiers
-)
-{
-	/*
-		https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#textDocument_semanticTokens
-
-		// Step-1: Absolute positions
-		{ line: 2, startChar:  5, length: 3, tokenType: 0, tokenModifiers: 3 },
-		{ line: 2, startChar: 10, length: 4, tokenType: 1, tokenModifiers: 0 },
-		{ line: 5, startChar:  2, length: 7, tokenType: 2, tokenModifiers: 0 }
-
-		// Step-2: Relative positions as intermediate step
-		{ deltaLine: 2, deltaStartChar: 5, length: 3, tokenType: 0, tokenModifiers: 3 },
-		{ deltaLine: 0, deltaStartChar: 5, length: 4, tokenType: 1, tokenModifiers: 0 },
-		{ deltaLine: 3, deltaStartChar: 2, length: 7, tokenType: 2, tokenModifiers: 0 }
-
-		// Step-3: final array result
-		// 1st token,  2nd token,  3rd token
-		[  2,5,3,0,3,  0,5,4,1,0,  3,2,7,2,0 ]
-
-		So traverse through the AST and assign each leaf a token 5-tuple.
-	*/
-
-	// solAssert(_sourceLocation.isValid());
-	if (!_sourceLocation.isValid())
-		return;
-
-	auto const [line, startChar] = m_charStream->translatePositionToLineColumn(_sourceLocation.start);
-	auto const length = _sourceLocation.end - _sourceLocation.start;
-
-	lspDebug(fmt::format("encode [{}:{}..{}] {}", line, startChar, length, static_cast<int>(_tokenType)));
-
-	m_encodedTokens.append(line - m_lastLine);
-	if (line == m_lastLine)
-		m_encodedTokens.append(startChar - m_lastStartChar);
-	else
-		m_encodedTokens.append(startChar);
-	m_encodedTokens.append(length);
-	m_encodedTokens.append(static_cast<int>(_tokenType));
-	m_encodedTokens.append(static_cast<int>(_modifiers));
-
-	m_lastLine = line;
-	m_lastStartChar = startChar;
-}
-
-bool SemanticTokensBuilder::visit(frontend::ContractDefinition const& _node)
-{
-	encode(_node.nameLocation(), SemanticTokenType::Class);
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::ElementaryTypeName const& _node)
-{
-	encode(_node.location(), SemanticTokenType::Type);
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::ElementaryTypeNameExpression const& _node)
-{
-	if (auto const tokenType = semanticTokenTypeForType(_node.annotation().type); tokenType.has_value())
-		encode(_node.location(), tokenType.value());
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::EnumDefinition const& _node)
-{
-	encode(_node.nameLocation(), SemanticTokenType::Enum);
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::EnumValue const& _node)
-{
-	encode(_node.nameLocation(), SemanticTokenType::EnumMember);
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::ErrorDefinition const& _node)
-{
-	encode(_node.nameLocation(), SemanticTokenType::Event);
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::FunctionDefinition const& _node)
-{
-	encode(_node.nameLocation(), SemanticTokenType::Function);
-	return true;
-}
-
-bool SemanticTokensBuilder::visit(frontend::ModifierDefinition const& _node)
-{
-	encode(_node.nameLocation(), SemanticTokenType::Modifier);
-	return true;
-}
-
-void SemanticTokensBuilder::endVisit(frontend::Literal const& _literal)
-{
-	encode(_literal.location(), SemanticTokenType::Number);
-}
-
-void SemanticTokensBuilder::endVisit(frontend::StructuredDocumentation const& _documentation)
-{
-	encode(_documentation.location(), SemanticTokenType::Comment);
-}
-
-void SemanticTokensBuilder::endVisit(frontend::Identifier const& _identifier)
-{
-	//lspDebug(fmt::format("Identifier: {}, {}..{} cat={}", _identifier.name(), _identifier.location().start, _identifier.location().end, _identifier.annotation().type->category()));
-
-	SemanticTokenModifiers modifiers = SemanticTokenModifiers::None;
-	if (_identifier.annotation().isConstant.set() && *_identifier.annotation().isConstant)
-	{
-		lspDebug("OMG We've found a const!");
-		modifiers = modifiers | SemanticTokenModifiers::Readonly;
-	}
-
-	encode(_identifier.location(), semanticTokenTypeForExpression(_identifier.annotation().type), modifiers);
-}
-
-void SemanticTokensBuilder::endVisit(frontend::IdentifierPath const& _node)
-{
-	lspDebug(fmt::format("IdentifierPath: identifier path [{}..{}]", _node.location().start, _node.location().end));
-	for (size_t i = 0; i < _node.path().size(); ++i)
-		lspDebug(fmt::format("  [{}]: {}", i, _node.path().at(i)));
-	if (dynamic_cast<EnumDefinition const*>(_node.annotation().referencedDeclaration))
-		encode(_node.location(), SemanticTokenType::EnumMember);
-	else
-		encode(_node.location(), SemanticTokenType::Variable);
-}
-
-bool SemanticTokensBuilder::visit(frontend::MemberAccess const& _node)
-{
-	lspDebug(fmt::format("[{}..{}] MemberAccess({}): {}", _node.location().start, _node.location().end, _node.annotation().referencedDeclaration ?  _node.annotation().referencedDeclaration->name() : "?", _node.memberName()));
-
-	auto const memberNameLength = static_cast<int>(_node.memberName().size());
-	auto const memberTokenType = semanticTokenTypeForExpression(_node.annotation().type);
-
-	auto lhsLocation = _node.location();
-	lhsLocation.end -= (memberNameLength + 1 /*exclude the dot*/);
-
-	auto rhsLocation = _node.location();
-	rhsLocation.start = rhsLocation.end - static_cast<int>(memberNameLength);
-
-	if (memberTokenType == SemanticTokenType::Enum)
-	{
-		// Special handling for enumeration symbols.
-		encode(lhsLocation, SemanticTokenType::Enum);
-		encode(rhsLocation, SemanticTokenType::EnumMember);
-	}
-	else if (memberTokenType == SemanticTokenType::Function)
-	{
-		// Special handling for function symbols.
-		encode(lhsLocation, SemanticTokenType::Variable);
-		encode(rhsLocation, memberTokenType);
-	}
-	else
-	{
-		encode(rhsLocation, memberTokenType);
-	}
-
-	return false; // we handle LHS and RHS explicitly above.
-}
-
-void SemanticTokensBuilder::endVisit(PragmaDirective const& _pragma)
-{
-	encode(_pragma.location(), SemanticTokenType::Macro);
-	// NOTE: It would be nice if we could highlight based on the symbols,
-	//       such as (version) numerics be different than identifiers.
-}
-
-bool SemanticTokensBuilder::visit(frontend::UserDefinedTypeName const& _node)
-{
-	if (auto const token = semanticTokenTypeForType(_node.annotation().type); token.has_value())
-		encode(_node.location(), *token);
-	return false;
-}
-
-bool SemanticTokensBuilder::visit(frontend::VariableDeclaration const& _node)
-{
-	lspDebug(fmt::format("VariableDeclaration: {}", _node.name()));
-
-	if (auto const token = semanticTokenTypeForType(_node.typeName().annotation().type); token.has_value())
-		encode(_node.typeName().location(), *token);
-
-	encode(_node.nameLocation(), SemanticTokenType::Variable);
-	if (_node.overrides())
-		_node.overrides()->accept(*this);
-	if (_node.value())
-		_node.value()->accept(*this);
-	return false;
-}
-
-} // end namespace
diff --git a/libsolidity/lsp/SemanticTokensBuilder.h b/libsolidity/lsp/SemanticTokensBuilder.h
deleted file mode 100644
index ca3c48d1c68d..000000000000
--- a/libsolidity/lsp/SemanticTokensBuilder.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/ASTVisitor.h>
-#include <json/json.h>
-
-#include <fmt/format.h>
-
-namespace solidity::langutil
-{
-class CharStream;
-struct SourceLocation;
-}
-
-namespace solidity::lsp
-{
-
-// See: https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#semanticTokenTypes
-enum class SemanticTokenType
-{
-	Class,
-	Comment,
-	Enum,
-	EnumMember,
-	Event,
-	Function,
-	Interface,
-	Keyword,
-	Macro,
-	Method,
-	Modifier,
-	Number,
-	Operator,
-	Parameter,
-	Property,
-	String,
-	Struct,
-	Type,
-	TypeParameter,
-	Variable,
-
-	// Unused below:
-	// Namespace,
-	// Regexp,
-};
-
-enum class SemanticTokenModifiers
-{
-	None            = 0,
-
-	// Member integer values must be bit-values as
-	// they can be OR'd together.
-	Abstract        = 0x0001,
-	Declaration     = 0x0002,
-	Definition      = 0x0004,
-	Deprecated      = 0x0008,
-	Documentation   = 0x0010,
-	Modification    = 0x0020,
-	Readonly        = 0x0040,
-
-	// Unused below:
-	// Static,
-	// Async,
-	// DefaultLibrary,
-};
-
-constexpr SemanticTokenModifiers operator|(SemanticTokenModifiers a, SemanticTokenModifiers b) noexcept
-{
-	return static_cast<SemanticTokenModifiers>(static_cast<int>(a) | static_cast<int>(b));
-}
-
-class SemanticTokensBuilder: public frontend::ASTConstVisitor
-{
-public:
-	Json::Value build(frontend::SourceUnit const& _sourceUnit, langutil::CharStream const& _charStream);
-
-	void reset(langutil::CharStream const* _charStream);
-	void encode(
-		langutil::SourceLocation const& _sourceLocation,
-		SemanticTokenType _tokenType,
-		SemanticTokenModifiers _modifiers = SemanticTokenModifiers::None
-	);
-
-	bool visit(frontend::ContractDefinition const&) override;
-	bool visit(frontend::ElementaryTypeName const&) override;
-	bool visit(frontend::ElementaryTypeNameExpression const&) override;
-	bool visit(frontend::EnumDefinition const&) override;
-	bool visit(frontend::EnumValue const&) override;
-	bool visit(frontend::ErrorDefinition const&) override;
-	bool visit(frontend::FunctionDefinition const&) override;
-	bool visit(frontend::ModifierDefinition const&) override;
-	void endVisit(frontend::Literal const&) override;
-	void endVisit(frontend::StructuredDocumentation const&) override;
-	void endVisit(frontend::Identifier const&) override;
-	void endVisit(frontend::IdentifierPath const&) override;
-	bool visit(frontend::MemberAccess const&) override;
-	void endVisit(frontend::PragmaDirective const&) override;
-	bool visit(frontend::UserDefinedTypeName const&) override;
-	bool visit(frontend::VariableDeclaration const&) override;
-
-private:
-	Json::Value m_encodedTokens;
-	langutil::CharStream const* m_charStream;
-	int m_lastLine;
-	int m_lastStartChar;
-};
-
-} // end namespace
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
deleted file mode 100644
index 7f8eb2283488..000000000000
--- a/libsolidity/lsp/Transport.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libsolidity/lsp/Transport.h>
-#include <libsolidity/lsp/Utils.h>
-
-#include <libsolutil/JSON.h>
-#include <libsolutil/Visitor.h>
-#include <libsolutil/CommonIO.h>
-#include <liblangutil/Exceptions.h>
-
-#include <fmt/format.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <iostream>
-#include <sstream>
-#include <string>
-
-
-#if defined(_WIN32)
-#include <io.h>
-#include <fcntl.h>
-#endif
-
-using namespace solidity::lsp;
-
-// {{{ Transport
-std::optional<Json::Value> Transport::receive()
-{
-	auto const headers = parseHeaders();
-	if (!headers)
-	{
-		error({}, ErrorCode::ParseError, "Could not parse RPC headers.");
-		return std::nullopt;
-	}
-
-	if (!headers->count("content-length"))
-	{
-		error({}, ErrorCode::ParseError, "No content-length header found.");
-		return std::nullopt;
-	}
-
-	std::string const data = readBytes(stoul(headers->at("content-length")));
-
-	Json::Value jsonMessage;
-	std::string jsonParsingErrors;
-	solidity::util::jsonParseStrict(data, jsonMessage, &jsonParsingErrors);
-	if (!jsonParsingErrors.empty() || !jsonMessage || !jsonMessage.isObject())
-	{
-		error({}, ErrorCode::ParseError, "Could not parse RPC JSON payload. " + jsonParsingErrors);
-		return std::nullopt;
-	}
-
-	return {std::move(jsonMessage)};
-}
-
-void Transport::trace(std::string _message, Json::Value _extra)
-{
-	if (m_logTrace != TraceValue::Off)
-	{
-		Json::Value params;
-		if (_extra.isObject())
-			params = std::move(_extra);
-		params["message"] = std::move(_message);
-		notify("$/logTrace", std::move(params));
-	}
-}
-
-std::optional<std::map<std::string, std::string>> Transport::parseHeaders()
-{
-	std::map<std::string, std::string> headers;
-
-	while (true)
-	{
-		auto line = getline();
-		if (boost::trim_copy(line).empty())
-			break;
-
-		auto const delimiterPos = line.find(':');
-		if (delimiterPos == std::string::npos)
-			return std::nullopt;
-
-		auto const name = boost::to_lower_copy(line.substr(0, delimiterPos));
-		auto const value = line.substr(delimiterPos + 1);
-		if (!headers.emplace(boost::trim_copy(name), boost::trim_copy(value)).second)
-			return std::nullopt;
-	}
-	return {std::move(headers)};
-}
-
-void Transport::notify(std::string _method, Json::Value _message)
-{
-	Json::Value json;
-	json["method"] = std::move(_method);
-	json["params"] = std::move(_message);
-	send(std::move(json));
-}
-
-void Transport::reply(MessageID _id, Json::Value _message)
-{
-	Json::Value json;
-	json["result"] = std::move(_message);
-	send(std::move(json), _id);
-}
-
-void Transport::error(MessageID _id, ErrorCode _code, std::string _message)
-{
-	Json::Value json;
-	json["error"]["code"] = static_cast<int>(_code);
-	json["error"]["message"] = std::move(_message);
-	send(std::move(json), _id);
-}
-
-void Transport::send(Json::Value _json, MessageID _id)
-{
-	solAssert(_json.isObject());
-	_json["jsonrpc"] = "2.0";
-	if (_id != Json::nullValue)
-		_json["id"] = _id;
-
-	// Trailing CRLF only for easier readability.
-	std::string const jsonString = solidity::util::jsonCompactPrint(_json);
-
-	writeBytes(fmt::format("Content-Length: {}\r\n\r\n", jsonString.size()));
-	writeBytes(jsonString);
-	flushOutput();
-}
-// }}}
-
-// {{{ IOStreamTransport
-IOStreamTransport::IOStreamTransport(std::istream& _in, std::ostream& _out):
-	m_input{_in},
-	m_output{_out}
-{
-}
-
-bool IOStreamTransport::closed() const noexcept
-{
-	return m_input.eof();
-}
-
-std::string IOStreamTransport::readBytes(size_t _length)
-{
-	return util::readBytes(m_input, _length);
-}
-
-std::string IOStreamTransport::getline()
-{
-	std::string line;
-	std::getline(m_input, line);
-	return line;
-}
-
-void IOStreamTransport::writeBytes(std::string_view _data)
-{
-	m_output.write(_data.data(), static_cast<std::streamsize>(_data.size()));
-}
-
-void IOStreamTransport::flushOutput()
-{
-	m_output.flush();
-}
-// }}}
-
-// {{{ StdioTransport
-StdioTransport::StdioTransport()
-{
-	#if defined(_WIN32)
-	// Attempt to change the modes of stdout from text to binary.
-	setmode(fileno(stdout), O_BINARY);
-	#endif
-}
-
-bool StdioTransport::closed() const noexcept
-{
-	return feof(stdin);
-}
-
-std::string StdioTransport::readBytes(size_t _byteCount)
-{
-	std::string buffer;
-	buffer.resize(_byteCount);
-	auto const n = fread(buffer.data(), 1, _byteCount, stdin);
-	if (n < _byteCount)
-		buffer.resize(n);
-	return buffer;
-}
-
-std::string StdioTransport::getline()
-{
-	std::string line;
-	std::getline(std::cin, line);
-	lspDebug(fmt::format("Received: {}", line));
-	return line;
-}
-
-void StdioTransport::writeBytes(std::string_view _data)
-{
-	lspDebug(fmt::format("Sending: {}", _data));
-	auto const bytesWritten = fwrite(_data.data(), 1, _data.size(), stdout);
-	solAssert(bytesWritten == _data.size());
-}
-
-void StdioTransport::flushOutput()
-{
-	fflush(stdout);
-}
-// }}}
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
deleted file mode 100644
index 3e94e0398119..000000000000
--- a/libsolidity/lsp/Transport.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-
-#include <json/value.h>
-
-#include <functional>
-#include <iosfwd>
-#include <map>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <variant>
-
-namespace solidity::lsp
-{
-
-using MessageID = Json::Value;
-
-enum class TraceValue
-{
-	Off,
-	Messages,
-	Verbose
-};
-
-enum class ErrorCode
-{
-	// Defined by JSON RPC
-	ParseError = -32700,
-	MethodNotFound = -32601,
-	InvalidParams = -32602,
-	InternalError = -32603,
-
-	// Defined by the protocol.
-	ServerNotInitialized = -32002,
-	RequestFailed = -32803
-};
-
-/**
- * Error exception used to bail out on errors in the LSP function-call handlers.
- */
-class RequestError: public util::Exception
-{
-public:
-	explicit RequestError(ErrorCode _code):
-		m_code{_code}
-	{
-	}
-
-	ErrorCode code() const noexcept { return m_code; }
-
-private:
-	ErrorCode m_code;
-};
-
-/**
- * Ensures precondition check is valid.
- * This is supposed to be a recoverable error, that means, if the condition fails to be valid,
- * an exception is being raised to be thrown out of the current request handlers
- * of the current LSP's client RPC call and this will cause the current request to fail
- * with the given error code - but subsequent calls shall be able to continue.
- */
-#define lspRequire(condition, errorCode, errorMessage) \
-	if (!(condition)) \
-	{ \
-		BOOST_THROW_EXCEPTION( \
-			RequestError(errorCode) << \
-			util::errinfo_comment(errorMessage) \
-		); \
-	}
-
-/**
- * Transport layer API
- *
- * The transport layer API is abstracted to make LSP more testable as well as
- * this way it could be possible to support other transports (HTTP for example) easily.
- */
-class Transport
-{
-public:
-	virtual ~Transport() = default;
-
-	std::optional<Json::Value> receive();
-	void notify(std::string _method, Json::Value _params);
-	void reply(MessageID _id, Json::Value _result);
-	void error(MessageID _id, ErrorCode _code, std::string _message);
-
-	virtual bool closed() const noexcept = 0;
-
-	void trace(std::string _message, Json::Value _extra = Json::nullValue);
-
-	TraceValue traceValue() const noexcept { return m_logTrace; }
-	void setTrace(TraceValue _value) noexcept { m_logTrace = _value; }
-
-private:
-	TraceValue m_logTrace = TraceValue::Off;
-
-protected:
-	/// Reads from the transport and parses the headers until the beginning
-	/// of the contents.
-	std::optional<std::map<std::string, std::string>> parseHeaders();
-
-	/// Consumes exactly @p _byteCount bytes, as needed for consuming
-	/// the message body from the transport line.
-	virtual std::string readBytes(size_t _byteCount) = 0;
-
-	// Mimmicks std::getline() on this Transport API.
-	virtual std::string getline() = 0;
-
-	/// Writes the given payload @p _data to transport.
-	/// This call may or may not buffer.
-	virtual void writeBytes(std::string_view _data) = 0;
-
-	/// Ensures transport output is flushed.
-	virtual void flushOutput() = 0;
-
-	/// Sends an arbitrary raw message to the client.
-	///
-	/// Used by the notify/reply/error function family.
-	virtual void send(Json::Value _message, MessageID _id = Json::nullValue);
-};
-
-/**
- * LSP Transport using JSON-RPC over iostreams.
- */
-class IOStreamTransport: public Transport
-{
-public:
-	/// Constructs a standard stream transport layer.
-	///
-	/// @param _in for example std::cin (stdin)
-	/// @param _out for example std::cout (stdout)
-	IOStreamTransport(std::istream& _in, std::ostream& _out);
-
-	bool closed() const noexcept override;
-
-protected:
-	std::string readBytes(size_t _byteCount) override;
-	std::string getline() override;
-	void writeBytes(std::string_view _data) override;
-	void flushOutput() override;
-
-private:
-	std::istream& m_input;
-	std::ostream& m_output;
-};
-
-/**
- * Standard I/O transport Layer utilizing stdin/stdout for communication.
- */
-class StdioTransport: public Transport
-{
-public:
-	StdioTransport();
-
-	bool closed() const noexcept override;
-
-protected:
-	std::string readBytes(size_t _byteCount) override;
-	std::string getline() override;
-	void writeBytes(std::string_view _data) override;
-	void flushOutput() override;
-};
-
-}
diff --git a/libsolidity/lsp/Utils.cpp b/libsolidity/lsp/Utils.cpp
deleted file mode 100644
index 85e27a4fda5f..000000000000
--- a/libsolidity/lsp/Utils.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/lsp/FileRepository.h>
-#include <libsolidity/lsp/Utils.h>
-
-#include <regex>
-#include <fstream>
-
-namespace solidity::lsp
-{
-
-using namespace frontend;
-using namespace langutil;
-
-std::optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
-{
-	if (_lineColumn.isObject() && _lineColumn["line"].isInt() && _lineColumn["character"].isInt())
-		return LineColumn{_lineColumn["line"].asInt(), _lineColumn["character"].asInt()};
-	else
-		return std::nullopt;
-}
-
-Json::Value toJson(LineColumn const& _pos)
-{
-	Json::Value json = Json::objectValue;
-	json["line"] = std::max(_pos.line, 0);
-	json["character"] = std::max(_pos.column, 0);
-
-	return json;
-}
-
-Json::Value toJsonRange(LineColumn const& _start, LineColumn const& _end)
-{
-	Json::Value json;
-	json["start"] = toJson(_start);
-	json["end"] = toJson(_end);
-	return json;
-}
-
-Declaration const* referencedDeclaration(Expression const* _expression)
-{
-	if (auto const* identifier = dynamic_cast<Identifier const*>(_expression))
-		if (Declaration const* referencedDeclaration = identifier->annotation().referencedDeclaration)
-			return referencedDeclaration;
-
-	if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(_expression))
-		if (memberAccess->annotation().referencedDeclaration)
-			return memberAccess->annotation().referencedDeclaration;
-
-	return nullptr;
-}
-
-std::optional<SourceLocation> declarationLocation(Declaration const* _declaration)
-{
-	if (!_declaration)
-		return std::nullopt;
-
-	if (_declaration->nameLocation().isValid())
-		return _declaration->nameLocation();
-
-	if (_declaration->location().isValid())
-		return _declaration->location();
-
-	return std::nullopt;
-}
-
-std::optional<SourceLocation> parsePosition(
-	FileRepository const& _fileRepository,
-	std::string const& _sourceUnitName,
-	Json::Value const& _position
-)
-{
-	if (!_fileRepository.sourceUnits().count(_sourceUnitName))
-		return std::nullopt;
-
-	if (std::optional<LineColumn> lineColumn = parseLineColumn(_position))
-		if (std::optional<int> const offset = CharStream::translateLineColumnToPosition(
-			_fileRepository.sourceUnits().at(_sourceUnitName),
-			*lineColumn
-		))
-			return SourceLocation{*offset, *offset, std::make_shared<std::string>(_sourceUnitName)};
-	return std::nullopt;
-}
-
-std::optional<SourceLocation> parseRange(FileRepository const& _fileRepository, std::string const& _sourceUnitName, Json::Value const& _range)
-{
-	if (!_range.isObject())
-		return std::nullopt;
-	std::optional<SourceLocation> start = parsePosition(_fileRepository, _sourceUnitName, _range["start"]);
-	std::optional<SourceLocation> end = parsePosition(_fileRepository, _sourceUnitName, _range["end"]);
-	if (!start || !end)
-		return std::nullopt;
-	solAssert(*start->sourceName == *end->sourceName);
-	start->end = end->end;
-	return start;
-}
-
-std::string stripFileUriSchemePrefix(std::string const& _path)
-{
-	std::regex const windowsDriveLetterPath("^file:///[a-zA-Z]:/");
-	if (regex_search(_path, windowsDriveLetterPath))
-		return _path.substr(8);
-	if (_path.find("file://") == 0)
-		return _path.substr(7);
-	else
-		return _path;
-}
-
-}
diff --git a/libsolidity/lsp/Utils.h b/libsolidity/lsp/Utils.h
deleted file mode 100644
index c6d40213e6d3..000000000000
--- a/libsolidity/lsp/Utils.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <liblangutil/SourceLocation.h>
-
-#include <libsolidity/ast/ASTForward.h>
-
-#include <libsolutil/JSON.h>
-
-#include <optional>
-#include <vector>
-
-#if !defined(NDEBUG)
-#include <fstream>
-#define lspDebug(message) (std::ofstream("/tmp/solc.log", std::ios::app) << (message) << std::endl)
-#else
-#define lspDebug(message) do {} while (0)
-#endif
-
-namespace solidity::langutil
-{
-class CharStreamProvider;
-}
-
-namespace solidity::lsp
-{
-
-class FileRepository;
-
-std::optional<langutil::LineColumn> parseLineColumn(Json::Value const& _lineColumn);
-Json::Value toJson(langutil::LineColumn const& _pos);
-Json::Value toJsonRange(langutil::LineColumn const& _start, langutil::LineColumn const& _end);
-
-/// @returns the source location given a source unit name and an LSP Range object,
-/// or nullopt on failure.
-std::optional<langutil::SourceLocation> parsePosition(
-	FileRepository const& _fileRepository,
-	std::string const& _sourceUnitName,
-	Json::Value const& _position
-);
-
-/// @returns the source location given a source unit name and an LSP Range object,
-/// or nullopt on failure.
-std::optional<langutil::SourceLocation> parseRange(
-	FileRepository const& _fileRepository,
-	std::string const& _sourceUnitName,
-	Json::Value const& _range
-);
-
-/// Strips the file:// URI prefix off the given path, if present,
-/// also taking special care of Windows-drive-letter paths.
-///
-/// So file:///path/to/some/file.txt returns /path/to/some/file.txt, as well as,
-/// file:///C:/file.txt will return C:/file.txt (forward-slash is okay on Windows).
-std::string stripFileUriSchemePrefix(std::string const& _path);
-
-/// Extracts the resolved declaration of the given expression AST node.
-///
-/// This may for example be the type declaration of an identifier,
-/// or the type declaration of a structured member identifier.
-///
-/// @returns the resolved type declaration if found, or nullptr otherwise.
-frontend::Declaration const* referencedDeclaration(frontend::Expression const* _expression);
-
-/// @returns the location of the declaration's name, if present, or the location of the complete
-/// declaration otherwise. If the input declaration is nullptr, std::nullopt is returned instead.
-std::optional<langutil::SourceLocation> declarationLocation(frontend::Declaration const* _declaration);
-
-}
diff --git a/libsolidity/parsing/DocStringParser.cpp b/libsolidity/parsing/DocStringParser.cpp
deleted file mode 100644
index b9f358e020a0..000000000000
--- a/libsolidity/parsing/DocStringParser.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolidity/parsing/DocStringParser.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <liblangutil/Common.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Exceptions.h>
-
-#include <range/v3/algorithm/find_first_of.hpp>
-#include <range/v3/algorithm/find_if_not.hpp>
-#include <range/v3/view/subrange.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-
-std::string::const_iterator skipLineOrEOS(
-	std::string::const_iterator _nlPos,
-	std::string::const_iterator _end
-)
-{
-	return (_nlPos == _end) ? _end : ++_nlPos;
-}
-
-std::string::const_iterator firstNonIdentifier(
-	std::string::const_iterator _pos,
-	std::string::const_iterator _end
-)
-{
-	auto currPos = _pos;
-	if (currPos == _pos && isIdentifierStart(*currPos))
-	{
-		currPos++;
-		currPos = ranges::find_if_not(ranges::make_subrange(currPos, _end), isIdentifierPart);
-	}
-	return currPos;
-}
-
-std::string::const_iterator firstWhitespaceOrNewline(
-	std::string::const_iterator _pos,
-	std::string::const_iterator _end
-)
-{
-	return ranges::find_first_of(ranges::make_subrange(_pos, _end), " \t\n");
-}
-
-
-std::string::const_iterator skipWhitespace(
-	std::string::const_iterator _pos,
-	std::string::const_iterator _end
-)
-{
-	auto isWhitespace = [](char const& c) { return (c == ' ' || c == '\t'); };
-	return ranges::find_if_not(ranges::make_subrange(_pos, _end), isWhitespace);
-}
-
-}
-
-std::multimap<std::string, DocTag> DocStringParser::parse()
-{
-	m_lastTag = nullptr;
-	m_docTags = {};
-
-	solAssert(m_node.text(), "");
-	iter currPos = m_node.text()->begin();
-	iter end = m_node.text()->end();
-
-	while (currPos != end)
-	{
-		iter tagPos = find(currPos, end, '@');
-		iter nlPos = find(currPos, end, '\n');
-
-		if (tagPos != end && tagPos < nlPos)
-		{
-			// we found a tag
-			iter tagNameEndPos = firstWhitespaceOrNewline(tagPos, end);
-			std::string tagName{tagPos + 1, tagNameEndPos};
-			iter tagDataPos = (tagNameEndPos != end) ? tagNameEndPos + 1 : tagNameEndPos;
-			currPos = parseDocTag(tagDataPos, end, tagName);
-		}
-		else if (!!m_lastTag) // continuation of the previous tag
-			currPos = parseDocTagLine(currPos, end, true);
-		else if (currPos != end)
-		{
-			// if it begins without a tag then consider it as @notice
-			if (currPos == m_node.text()->begin())
-			{
-				currPos = parseDocTag(currPos, end, "notice");
-				continue;
-			}
-			else if (nlPos == end) //end of text
-				break;
-			// else skip the line if a newline was found and we get here
-			currPos = nlPos + 1;
-		}
-	}
-	return std::move(m_docTags);
-}
-
-DocStringParser::iter DocStringParser::parseDocTagLine(iter _pos, iter _end, bool _appending)
-{
-	solAssert(!!m_lastTag, "");
-	auto nlPos = find(_pos, _end, '\n');
-	if (_appending && _pos != _end && *_pos != ' ' && *_pos != '\t')
-		m_lastTag->content += " ";
-	else if (!_appending)
-		_pos = skipWhitespace(_pos, _end);
-	copy(_pos, nlPos, back_inserter(m_lastTag->content));
-	return skipLineOrEOS(nlPos, _end);
-}
-
-DocStringParser::iter DocStringParser::parseDocTagParam(iter _pos, iter _end)
-{
-	// find param name start
-	auto nameStartPos = skipWhitespace(_pos, _end);
-	if (nameStartPos == _end)
-	{
-		m_errorReporter.docstringParsingError(3335_error, m_node.location(), "No param name given");
-		return _end;
-	}
-	auto nameEndPos = firstNonIdentifier(nameStartPos, _end);
-	auto paramName = std::string(nameStartPos, nameEndPos);
-
-	auto descStartPos = skipWhitespace(nameEndPos, _end);
-	auto nlPos = find(descStartPos, _end, '\n');
-
-	if (descStartPos == nlPos)
-	{
-		m_errorReporter.docstringParsingError(9942_error, m_node.location(), "No description given for param " + paramName);
-		return _end;
-	}
-
-	auto paramDesc = std::string(descStartPos, nlPos);
-	newTag("param");
-	m_lastTag->paramName = paramName;
-	m_lastTag->content = paramDesc;
-
-	return skipLineOrEOS(nlPos, _end);
-}
-
-DocStringParser::iter DocStringParser::parseDocTag(iter _pos, iter _end, std::string const& _tag)
-{
-	// TODO: need to check for @(start of a tag) between here and the end of line
-	// for all cases.
-	if (!m_lastTag || _tag != "")
-	{
-		if (_tag == "param")
-			return parseDocTagParam(_pos, _end);
-		else
-		{
-			newTag(_tag);
-			return parseDocTagLine(_pos, _end, false);
-		}
-	}
-	else
-		return parseDocTagLine(_pos, _end, true);
-}
-
-void DocStringParser::newTag(std::string const& _tagName)
-{
-	m_lastTag = &m_docTags.insert(make_pair(_tagName, DocTag()))->second;
-}
diff --git a/libsolidity/parsing/DocStringParser.h b/libsolidity/parsing/DocStringParser.h
deleted file mode 100644
index 22625a160c23..000000000000
--- a/libsolidity/parsing/DocStringParser.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris <lefteris@ethdev.com>
- * @date 2014, 2015
- * Parses a given docstring into pieces introduced by tags.
- */
-
-#pragma once
-
-#include <libsolidity/ast/ASTAnnotations.h>
-#include <liblangutil/SourceLocation.h>
-#include <string>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::frontend
-{
-
-class StructuredDocumentation;
-
-class DocStringParser
-{
-public:
-	/// @param _documentedNode the node whose documentation is parsed.
-	DocStringParser(StructuredDocumentation const& _documentedNode, langutil::ErrorReporter& _errorReporter):
-		m_node(_documentedNode),
-		m_errorReporter(_errorReporter)
-	{}
-	std::multimap<std::string, DocTag> parse();
-
-private:
-	using iter = std::string::const_iterator;
-
-	iter parseDocTagLine(iter _pos, iter _end, bool _appending);
-	iter parseDocTagParam(iter _pos, iter _end);
-
-	/// Parses the doc tag named @a _tag, adds it to m_docTags and returns the position
-	/// after the tag.
-	iter parseDocTag(iter _pos, iter _end, std::string const& _tag);
-
-	/// Creates and inserts a new tag and adjusts m_lastTag.
-	void newTag(std::string const& _tagName);
-
-	StructuredDocumentation const& m_node;
-	langutil::ErrorReporter& m_errorReporter;
-	/// Mapping tag name -> content.
-	std::multimap<std::string, DocTag> m_docTags;
-	DocTag* m_lastTag = nullptr;
-};
-
-}
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
deleted file mode 100644
index 76b5d23d31ac..000000000000
--- a/libsolidity/parsing/Parser.cpp
+++ /dev/null
@@ -1,2462 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity parser.
- */
-
-#include <libsolidity/parsing/Parser.h>
-
-#include <libsolidity/ast/UserDefinableOperators.h>
-#include <libsolidity/interface/Version.h>
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SemVerHandler.h>
-#include <liblangutil/SourceLocation.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <cctype>
-#include <memory>
-#include <regex>
-#include <tuple>
-#include <vector>
-
-using namespace solidity::langutil;
-using namespace std::string_literals;
-
-namespace solidity::frontend
-{
-
-/// AST node factory that also tracks the begin and end position of an AST node
-/// while it is being parsed
-class Parser::ASTNodeFactory
-{
-public:
-	explicit ASTNodeFactory(Parser& _parser):
-		m_parser(_parser), m_location{
-			_parser.currentLocation().start,
-			-1,
-			_parser.currentLocation().sourceName
-		}
-	{}
-	ASTNodeFactory(Parser& _parser, ASTPointer<ASTNode> const& _childNode):
-		m_parser(_parser), m_location{_childNode->location()} {}
-
-	void markEndPosition() { m_location.end = m_parser.currentLocation().end; }
-	void setLocation(SourceLocation const& _location) { m_location = _location; }
-	void setLocationEmpty() { m_location.end = m_location.start; }
-	/// Set the end position to the one of the given node.
-	void setEndPositionFromNode(ASTPointer<ASTNode> const& _node) { m_location.end = _node->location().end; }
-
-	template <class NodeType, typename... Args>
-	ASTPointer<NodeType> createNode(Args&& ... _args)
-	{
-		solAssert(m_location.sourceName, "");
-		if (m_location.end < 0)
-			markEndPosition();
-		return std::make_shared<NodeType>(m_parser.nextID(), m_location, std::forward<Args>(_args)...);
-	}
-
-	SourceLocation const& location() const noexcept { return m_location; }
-
-private:
-	Parser& m_parser;
-	SourceLocation m_location;
-};
-
-ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
-{
-	solAssert(!m_insideModifier, "");
-	try
-	{
-		m_recursionDepth = 0;
-		m_scanner = std::make_shared<Scanner>(_charStream);
-		ASTNodeFactory nodeFactory(*this);
-		m_experimentalSolidityEnabledInCurrentSourceUnit = false;
-
-		std::vector<ASTPointer<ASTNode>> nodes;
-		while (m_scanner->currentToken() == Token::Pragma)
-			nodes.push_back(parsePragmaDirective(false));
-
-		while (m_scanner->currentToken() != Token::EOS)
-		{
-			switch (m_scanner->currentToken())
-			{
-			case Token::Pragma:
-				nodes.push_back(parsePragmaDirective(true));
-				break;
-			case Token::Import:
-				nodes.push_back(parseImportDirective());
-				break;
-			case Token::Abstract:
-			case Token::Interface:
-			case Token::Contract:
-			case Token::Library:
-				nodes.push_back(parseContractDefinition());
-				break;
-			case Token::Struct:
-				nodes.push_back(parseStructDefinition());
-				break;
-			case Token::Enum:
-				nodes.push_back(parseEnumDefinition());
-				break;
-			case Token::Type:
-				nodes.push_back(parseUserDefinedValueTypeDefinition());
-				break;
-			case Token::Using:
-				nodes.push_back(parseUsingDirective());
-				break;
-			case Token::Function:
-				nodes.push_back(parseFunctionDefinition(true));
-				break;
-			case Token::Event:
-				nodes.push_back(parseEventDefinition());
-				break;
-			default:
-				if (
-					// Workaround because `error` is not a keyword.
-					m_scanner->currentToken() == Token::Identifier &&
-					currentLiteral() == "error" &&
-					m_scanner->peekNextToken() == Token::Identifier &&
-					m_scanner->peekNextNextToken() == Token::LParen
-				)
-					nodes.push_back(parseErrorDefinition());
-				// Constant variable.
-				else if (variableDeclarationStart() && m_scanner->peekNextToken() != Token::EOS)
-				{
-					VarDeclParserOptions options;
-					options.kind = VarDeclKind::FileLevel;
-					options.allowInitialValue = true;
-					nodes.push_back(parseVariableDeclaration(options));
-					expectToken(Token::Semicolon);
-				}
-				else
-					fatalParserError(7858_error, "Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.");
-			}
-		}
-		solAssert(m_recursionDepth == 0, "");
-		return nodeFactory.createNode<SourceUnit>(findLicenseString(nodes), nodes, m_experimentalSolidityEnabledInCurrentSourceUnit);
-	}
-	catch (FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-		return nullptr;
-	}
-}
-
-void Parser::parsePragmaVersion(SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals)
-{
-	SemVerMatchExpressionParser parser(_tokens, _literals);
-	try
-	{
-		SemVerMatchExpression matchExpression = parser.parse();
-		static SemVerVersion const currentVersion{std::string(VersionString)};
-		// FIXME: only match for major version incompatibility
-		if (!matchExpression.matches(currentVersion))
-			m_errorReporter.fatalParserError(
-				5333_error,
-				_location,
-				"Source file requires different compiler version (current compiler is " +
-				std::string(VersionString) + ") - note that nightly builds are considered to be "
-				"strictly less than the released version"
-			);
-	}
-	catch (SemVerError const& matchError)
-	{
-		m_errorReporter.fatalParserError(
-			1684_error,
-			_location,
-			"Invalid version pragma. "s + matchError.what()
-		);
-	}
-}
-
-ASTPointer<StructuredDocumentation> Parser::parseStructuredDocumentation()
-{
-	if (m_scanner->currentCommentLiteral() != "")
-	{
-		ASTNodeFactory nodeFactory{*this};
-		nodeFactory.setLocation(m_scanner->currentCommentLocation());
-		return nodeFactory.createNode<StructuredDocumentation>(
-			std::make_shared<ASTString>(m_scanner->currentCommentLiteral())
-		);
-	}
-	return nullptr;
-}
-
-ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedParsingTopLevelPragmas)
-{
-	RecursionGuard recursionGuard(*this);
-	// pragma anything* ;
-	// Currently supported:
-	// pragma solidity ^0.4.0 || ^0.3.0;
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Pragma);
-	std::vector<std::string> literals;
-	std::vector<Token> tokens;
-
-	do
-	{
-		Token token = m_scanner->currentToken();
-		if (token == Token::Illegal)
-			parserError(6281_error, "Token incompatible with Solidity parser as part of pragma directive.");
-		else
-		{
-			std::string literal = m_scanner->currentLiteral();
-			if (literal.empty() && TokenTraits::toString(token))
-				literal = TokenTraits::toString(token);
-			literals.push_back(literal);
-			tokens.push_back(token);
-		}
-		advance();
-	}
-	while (m_scanner->currentToken() != Token::Semicolon && m_scanner->currentToken() != Token::EOS);
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-
-	if (literals.size() >= 1 && literals[0] == "solidity")
-	{
-		parsePragmaVersion(
-			nodeFactory.location(),
-			std::vector<Token>(tokens.begin() + 1, tokens.end()),
-			std::vector<std::string>(literals.begin() + 1, literals.end())
-		);
-	}
-
-	if (literals.size() >= 2 && literals[0] == "experimental" && literals[1] == "solidity")
-	{
-		if (m_evmVersion < EVMVersion::constantinople())
-			fatalParserError(7637_error, "Experimental solidity requires Constantinople EVM version at the minimum.");
-		if (_finishedParsingTopLevelPragmas)
-			fatalParserError(8185_error, "Experimental pragma \"solidity\" can only be set at the beginning of the source unit.");
-		m_experimentalSolidityEnabledInCurrentSourceUnit = true;
-	}
-
-	return nodeFactory.createNode<PragmaDirective>(tokens, literals);
-}
-
-ASTPointer<ImportDirective> Parser::parseImportDirective()
-{
-	RecursionGuard recursionGuard(*this);
-	// import "abc" [as x];
-	// import * as x from "abc";
-	// import {a as b, c} from "abc";
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Import);
-	ASTPointer<ASTString> path;
-	ASTPointer<ASTString> unitAlias = std::make_shared<std::string>();
-	SourceLocation unitAliasLocation{};
-	ImportDirective::SymbolAliasList symbolAliases;
-
-	if (isQuotedPath() || isStdlibPath())
-	{
-		path = isQuotedPath() ? getLiteralAndAdvance() : getStdlibImportPathAndAdvance();
-		if (m_scanner->currentToken() == Token::As)
-		{
-			advance();
-			tie(unitAlias, unitAliasLocation) = expectIdentifierWithLocation();
-		}
-	}
-	else
-	{
-		if (m_scanner->currentToken() == Token::LBrace)
-		{
-			advance();
-			while (true)
-			{
-				ASTPointer<ASTString> alias;
-				SourceLocation aliasLocation = currentLocation();
-				ASTPointer<Identifier> id = parseIdentifier();
-				if (m_scanner->currentToken() == Token::As)
-				{
-					expectToken(Token::As);
-					tie(alias, aliasLocation) = expectIdentifierWithLocation();
-				}
-				symbolAliases.emplace_back(ImportDirective::SymbolAlias{std::move(id), std::move(alias), aliasLocation});
-				if (m_scanner->currentToken() != Token::Comma)
-					break;
-				advance();
-			}
-			expectToken(Token::RBrace);
-		}
-		else if (m_scanner->currentToken() == Token::Mul)
-		{
-			advance();
-			expectToken(Token::As);
-			tie(unitAlias, unitAliasLocation) = expectIdentifierWithLocation();
-		}
-		else
-			fatalParserError(9478_error, "Expected string literal (path), \"*\" or alias list.");
-		// "from" is not a keyword but parsed as an identifier because of backwards
-		// compatibility and because it is a really common word.
-		if (m_scanner->currentToken() != Token::Identifier || m_scanner->currentLiteral() != "from")
-			fatalParserError(8208_error, "Expected \"from\".");
-		advance();
-		if (!isQuotedPath() && !isStdlibPath())
-			fatalParserError(6845_error, "Expected import path.");
-		path = isQuotedPath() ? getLiteralAndAdvance() : getStdlibImportPathAndAdvance();
-	}
-	if (path->empty())
-		fatalParserError(6326_error, "Import path cannot be empty.");
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<ImportDirective>(path, unitAlias, unitAliasLocation, std::move(symbolAliases));
-}
-
-std::pair<ContractKind, bool> Parser::parseContractKind()
-{
-	ContractKind kind;
-	bool abstract = false;
-	if (m_scanner->currentToken() == Token::Abstract)
-	{
-		abstract = true;
-		advance();
-	}
-	switch (m_scanner->currentToken())
-	{
-	case Token::Interface:
-		kind = ContractKind::Interface;
-		break;
-	case Token::Contract:
-		kind = ContractKind::Contract;
-		break;
-	case Token::Library:
-		kind = ContractKind::Library;
-		break;
-	default:
-		parserError(3515_error, "Expected keyword \"contract\", \"interface\" or \"library\".");
-		return std::make_pair(ContractKind::Contract, abstract);
-	}
-	advance();
-	return std::make_pair(kind, abstract);
-}
-
-ASTPointer<ContractDefinition> Parser::parseContractDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<ASTString> name =  nullptr;
-	SourceLocation nameLocation{};
-	ASTPointer<StructuredDocumentation> documentation;
-	std::vector<ASTPointer<InheritanceSpecifier>> baseContracts;
-	std::vector<ASTPointer<ASTNode>> subNodes;
-	std::pair<ContractKind, bool> contractKind{};
-	documentation = parseStructuredDocumentation();
-	contractKind = parseContractKind();
-	std::tie(name, nameLocation) = expectIdentifierWithLocation();
-	if (m_scanner->currentToken() == Token::Is)
-		do
-		{
-			advance();
-			baseContracts.push_back(parseInheritanceSpecifier());
-		}
-		while (m_scanner->currentToken() == Token::Comma);
-	expectToken(Token::LBrace);
-	while (true)
-	{
-		Token currentTokenValue = m_scanner->currentToken();
-		if (currentTokenValue == Token::RBrace)
-			break;
-		else if (
-			(currentTokenValue == Token::Function && m_scanner->peekNextToken() != Token::LParen) ||
-			currentTokenValue == Token::Constructor ||
-			currentTokenValue == Token::Receive ||
-			currentTokenValue == Token::Fallback
-		)
-			subNodes.push_back(parseFunctionDefinition());
-		else if (currentTokenValue == Token::Struct)
-			subNodes.push_back(parseStructDefinition());
-		else if (currentTokenValue == Token::Enum)
-			subNodes.push_back(parseEnumDefinition());
-		else if (currentTokenValue == Token::Type)
-			subNodes.push_back(parseUserDefinedValueTypeDefinition());
-		else if (
-			// Workaround because `error` is not a keyword.
-			currentTokenValue == Token::Identifier &&
-			currentLiteral() == "error" &&
-			m_scanner->peekNextToken() == Token::Identifier &&
-			m_scanner->peekNextNextToken() == Token::LParen
-		)
-			subNodes.push_back(parseErrorDefinition());
-		else if (variableDeclarationStart())
-		{
-			VarDeclParserOptions options;
-			options.kind = VarDeclKind::State;
-			options.allowInitialValue = true;
-			subNodes.push_back(parseVariableDeclaration(options));
-			expectToken(Token::Semicolon);
-		}
-		else if (currentTokenValue == Token::Modifier)
-			subNodes.push_back(parseModifierDefinition());
-		else if (currentTokenValue == Token::Event)
-			subNodes.push_back(parseEventDefinition());
-		else if (currentTokenValue == Token::Using)
-			subNodes.push_back(parseUsingDirective());
-		else
-			fatalParserError(9182_error, "Function, variable, struct or modifier declaration expected.");
-	}
-	nodeFactory.markEndPosition();
-	expectToken(Token::RBrace);
-	return nodeFactory.createNode<ContractDefinition>(
-		name,
-		nameLocation,
-		documentation,
-		baseContracts,
-		subNodes,
-		contractKind.first,
-		contractKind.second
-	);
-}
-
-ASTPointer<InheritanceSpecifier> Parser::parseInheritanceSpecifier()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<IdentifierPath> name(parseIdentifierPath());
-	std::unique_ptr<std::vector<ASTPointer<Expression>>> arguments;
-	if (m_scanner->currentToken() == Token::LParen)
-	{
-		advance();
-		arguments = std::make_unique<std::vector<ASTPointer<Expression>>>(parseFunctionCallListArguments());
-		nodeFactory.markEndPosition();
-		expectToken(Token::RParen);
-	}
-	else
-		nodeFactory.setEndPositionFromNode(name);
-	return nodeFactory.createNode<InheritanceSpecifier>(name, std::move(arguments));
-}
-
-Visibility Parser::parseVisibilitySpecifier()
-{
-	Visibility visibility(Visibility::Default);
-	Token token = m_scanner->currentToken();
-	switch (token)
-	{
-		case Token::Public:
-			visibility = Visibility::Public;
-			break;
-		case Token::Internal:
-			visibility = Visibility::Internal;
-			break;
-		case Token::Private:
-			visibility = Visibility::Private;
-			break;
-		case Token::External:
-			visibility = Visibility::External;
-			break;
-		default:
-			solAssert(false, "Invalid visibility specifier.");
-	}
-	advance();
-	return visibility;
-}
-
-ASTPointer<OverrideSpecifier> Parser::parseOverrideSpecifier()
-{
-	solAssert(m_scanner->currentToken() == Token::Override, "");
-
-	ASTNodeFactory nodeFactory(*this);
-	std::vector<ASTPointer<IdentifierPath>> overrides;
-
-	nodeFactory.markEndPosition();
-	advance();
-
-	if (m_scanner->currentToken() == Token::LParen)
-	{
-		advance();
-		while (true)
-		{
-			overrides.push_back(parseIdentifierPath());
-
-			if (m_scanner->currentToken() == Token::RParen)
-				break;
-
-			expectToken(Token::Comma);
-		}
-
-		nodeFactory.markEndPosition();
-		expectToken(Token::RParen);
-	}
-
-	return nodeFactory.createNode<OverrideSpecifier>(std::move(overrides));
-}
-
-StateMutability Parser::parseStateMutability()
-{
-	StateMutability stateMutability(StateMutability::NonPayable);
-	Token token = m_scanner->currentToken();
-	switch (token)
-	{
-		case Token::Payable:
-			stateMutability = StateMutability::Payable;
-			break;
-		case Token::View:
-			stateMutability = StateMutability::View;
-			break;
-		case Token::Pure:
-			stateMutability = StateMutability::Pure;
-			break;
-		default:
-			solAssert(false, "Invalid state mutability specifier.");
-	}
-	advance();
-	return stateMutability;
-}
-
-Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _isStateVariable)
-{
-	RecursionGuard recursionGuard(*this);
-	FunctionHeaderParserResult result;
-
-	VarDeclParserOptions options;
-	options.allowLocationSpecifier = true;
-	result.parameters = parseParameterList(options);
-	while (true)
-	{
-		Token token = m_scanner->currentToken();
-		if (!_isStateVariable && token == Token::Identifier)
-			result.modifiers.push_back(parseModifierInvocation());
-		else if (TokenTraits::isVisibilitySpecifier(token))
-		{
-			if (result.visibility != Visibility::Default)
-			{
-				// There is the special case of a public state variable of function type.
-				// Detect this and return early.
-				if (_isStateVariable && (result.visibility == Visibility::External || result.visibility == Visibility::Internal))
-					break;
-				parserError(
-					9439_error,
-					"Visibility already specified as \"" +
-					Declaration::visibilityToString(result.visibility) +
-					"\"."
-				);
-				advance();
-			}
-			else
-				result.visibility = parseVisibilitySpecifier();
-		}
-		else if (TokenTraits::isStateMutabilitySpecifier(token))
-		{
-			if (result.stateMutability != StateMutability::NonPayable)
-			{
-				parserError(
-					9680_error,
-					"State mutability already specified as \"" +
-					stateMutabilityToString(result.stateMutability) +
-					"\"."
-				);
-				advance();
-			}
-			else
-				result.stateMutability = parseStateMutability();
-		}
-		else if (!_isStateVariable && token == Token::Override)
-		{
-			if (result.overrides)
-				parserError(1827_error, "Override already specified.");
-
-			result.overrides = parseOverrideSpecifier();
-		}
-		else if (!_isStateVariable && token == Token::Virtual)
-		{
-			if (result.isVirtual)
-				parserError(6879_error, "Virtual already specified.");
-
-			result.isVirtual = true;
-			advance();
-		}
-		else
-			break;
-	}
-	if (m_scanner->currentToken() == Token::Returns)
-	{
-		bool const permitEmptyParameterList = false;
-		advance();
-		result.returnParameters = parseParameterList(options, permitEmptyParameterList);
-	}
-	else
-		result.returnParameters = createEmptyParameterList();
-	return result;
-}
-
-ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
-
-	Token kind = m_scanner->currentToken();
-	ASTPointer<ASTString> name;
-	SourceLocation nameLocation;
-	if (kind == Token::Function)
-	{
-		advance();
-		if (
-			m_scanner->currentToken() == Token::Constructor ||
-			m_scanner->currentToken() == Token::Fallback ||
-			m_scanner->currentToken() == Token::Receive
-		)
-		{
-			std::string expected = std::map<Token, std::string>{
-				{Token::Constructor, "constructor"},
-				{Token::Fallback, "fallback function"},
-				{Token::Receive, "receive function"},
-			}.at(m_scanner->currentToken());
-			nameLocation = currentLocation();
-			name = std::make_shared<ASTString>(TokenTraits::toString(m_scanner->currentToken()));
-			std::string message{
-				"This function is named \"" + *name + "\" but is not the " + expected + " of the contract. "
-				"If you intend this to be a " + expected + ", use \"" + *name + "(...) { ... }\" without "
-				"the \"function\" keyword to define it."
-			};
-			if (m_scanner->currentToken() == Token::Constructor)
-				parserError(3323_error, message);
-			else
-				parserWarning(3445_error, message);
-			advance();
-		}
-		else
-			tie(name, nameLocation) = expectIdentifierWithLocation();
-	}
-	else
-	{
-		solAssert(kind == Token::Constructor || kind == Token::Fallback || kind == Token::Receive, "");
-		advance();
-		name = std::make_shared<ASTString>();
-	}
-
-	FunctionHeaderParserResult header = parseFunctionHeader(false);
-
-	ASTPointer<Block> block;
-	nodeFactory.markEndPosition();
-	if (m_scanner->currentToken() == Token::Semicolon)
-		advance();
-	else
-	{
-		block = parseBlock();
-		nodeFactory.setEndPositionFromNode(block);
-	}
-	return nodeFactory.createNode<FunctionDefinition>(
-		name,
-		nameLocation,
-		header.visibility,
-		header.stateMutability,
-		_freeFunction,
-		kind,
-		header.isVirtual,
-		header.overrides,
-		documentation,
-		header.parameters,
-		header.modifiers,
-		header.returnParameters,
-		block
-	);
-}
-
-ASTPointer<StructDefinition> Parser::parseStructDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
-	expectToken(Token::Struct);
-	auto [name, nameLocation] = expectIdentifierWithLocation();
-	std::vector<ASTPointer<VariableDeclaration>> members;
-	expectToken(Token::LBrace);
-	while (m_scanner->currentToken() != Token::RBrace)
-	{
-		members.push_back(parseVariableDeclaration());
-		expectToken(Token::Semicolon);
-	}
-	nodeFactory.markEndPosition();
-	expectToken(Token::RBrace);
-	return nodeFactory.createNode<StructDefinition>(std::move(name), std::move(nameLocation), std::move(members), std::move(documentation));
-}
-
-ASTPointer<EnumValue> Parser::parseEnumValue()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	nodeFactory.markEndPosition();
-	return nodeFactory.createNode<EnumValue>(expectIdentifierToken());
-}
-
-ASTPointer<EnumDefinition> Parser::parseEnumDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
-	expectToken(Token::Enum);
-	auto [name, nameLocation] = expectIdentifierWithLocation();
-	std::vector<ASTPointer<EnumValue>> members;
-	expectToken(Token::LBrace);
-
-	while (m_scanner->currentToken() != Token::RBrace)
-	{
-		members.push_back(parseEnumValue());
-		if (m_scanner->currentToken() == Token::RBrace)
-			break;
-		expectToken(Token::Comma);
-		if (m_scanner->currentToken() != Token::Identifier)
-			fatalParserError(1612_error, "Expected identifier after ','");
-	}
-	if (members.empty())
-		parserError(3147_error, "Enum with no members is not allowed.");
-
-	nodeFactory.markEndPosition();
-	expectToken(Token::RBrace);
-	return nodeFactory.createNode<EnumDefinition>(name, nameLocation, members, documentation);
-}
-
-ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
-	VarDeclParserOptions const& _options,
-	ASTPointer<TypeName> const& _lookAheadArrayType
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory = _lookAheadArrayType ?
-		ASTNodeFactory(*this, _lookAheadArrayType) : ASTNodeFactory(*this);
-
-	ASTPointer<StructuredDocumentation> const documentation = parseStructuredDocumentation();
-	ASTPointer<TypeName> type = _lookAheadArrayType ? _lookAheadArrayType : parseTypeName();
-	nodeFactory.setEndPositionFromNode(type);
-
-	if (dynamic_cast<FunctionTypeName*>(type.get()) && _options.kind == VarDeclKind::State && m_scanner->currentToken() == Token::LBrace)
-		fatalParserError(
-			2915_error,
-			"Expected a state variable declaration. If you intended this as a fallback function "
-			"or a function to handle plain ether transactions, use the \"fallback\" keyword "
-			"or the \"receive\" keyword instead."
-		);
-
-	bool isIndexed = false;
-	VariableDeclaration::Mutability mutability = VariableDeclaration::Mutability::Mutable;
-	ASTPointer<OverrideSpecifier> overrides = nullptr;
-	Visibility visibility(Visibility::Default);
-	VariableDeclaration::Location location = VariableDeclaration::Location::Unspecified;
-	ASTPointer<ASTString> identifier;
-	SourceLocation nameLocation{};
-
-	while (true)
-	{
-		Token token = m_scanner->currentToken();
-		if (_options.kind == VarDeclKind::State && TokenTraits::isVariableVisibilitySpecifier(token))
-		{
-			nodeFactory.markEndPosition();
-			if (visibility != Visibility::Default)
-			{
-				parserError(
-					4110_error,
-					"Visibility already specified as \"" +
-					Declaration::visibilityToString(visibility) +
-					"\"."
-				);
-				advance();
-			}
-			else
-				visibility = parseVisibilitySpecifier();
-		}
-		else if (_options.kind == VarDeclKind::State && token == Token::Override)
-		{
-			if (overrides)
-				parserError(9125_error, "Override already specified.");
-
-			overrides = parseOverrideSpecifier();
-		}
-		else
-		{
-			if (_options.allowIndexed && token == Token::Indexed)
-			{
-				if (isIndexed)
-					parserError(5399_error, "Indexed already specified.");
-
-				isIndexed = true;
-			}
-			else if (token == Token::Constant || token == Token::Immutable)
-			{
-				if (mutability != VariableDeclaration::Mutability::Mutable)
-					parserError(
-						3109_error,
-						std::string("Mutability already set to ") +
-						(mutability == VariableDeclaration::Mutability::Constant ? "\"constant\"" : "\"immutable\"")
-					);
-				else if (token == Token::Constant)
-					mutability = VariableDeclaration::Mutability::Constant;
-				else if (token == Token::Immutable)
-					mutability = VariableDeclaration::Mutability::Immutable;
-			}
-			else if (_options.allowLocationSpecifier && TokenTraits::isLocationSpecifier(token))
-			{
-				if (location != VariableDeclaration::Location::Unspecified)
-					parserError(3548_error, "Location already specified.");
-				else
-				{
-					switch (token)
-					{
-					case Token::Storage:
-						location = VariableDeclaration::Location::Storage;
-						break;
-					case Token::Memory:
-						location = VariableDeclaration::Location::Memory;
-						break;
-					case Token::CallData:
-						location = VariableDeclaration::Location::CallData;
-						break;
-					default:
-						solAssert(false, "Unknown data location.");
-					}
-				}
-			}
-			else
-				break;
-			nodeFactory.markEndPosition();
-			advance();
-		}
-	}
-
-	if (_options.allowEmptyName && m_scanner->currentToken() != Token::Identifier)
-		identifier = std::make_shared<ASTString>("");
-	else
-	{
-		nodeFactory.markEndPosition();
-		tie(identifier, nameLocation) = expectIdentifierWithLocation();
-	}
-	ASTPointer<Expression> value;
-	if (_options.allowInitialValue)
-	{
-		if (m_scanner->currentToken() == Token::Assign)
-		{
-			advance();
-			value = parseExpression();
-			nodeFactory.setEndPositionFromNode(value);
-		}
-	}
-	return nodeFactory.createNode<VariableDeclaration>(
-		type,
-		identifier,
-		nameLocation,
-		value,
-		visibility,
-		documentation,
-		isIndexed,
-		mutability,
-		overrides,
-		location
-	);
-}
-
-ASTPointer<ModifierDefinition> Parser::parseModifierDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-	ScopeGuard resetModifierFlag([this]() { m_insideModifier = false; });
-	m_insideModifier = true;
-
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
-
-	expectToken(Token::Modifier);
-	auto [name, nameLocation] = expectIdentifierWithLocation();
-	ASTPointer<ParameterList> parameters;
-	if (m_scanner->currentToken() == Token::LParen)
-	{
-		VarDeclParserOptions options;
-		options.allowLocationSpecifier = true;
-		parameters = parseParameterList(options);
-	}
-	else
-		parameters = createEmptyParameterList();
-
-	ASTPointer<OverrideSpecifier> overrides;
-	bool isVirtual = false;
-
-	while (true)
-	{
-		if (m_scanner->currentToken() == Token::Override)
-		{
-			if (overrides)
-				parserError(9102_error, "Override already specified.");
-			overrides = parseOverrideSpecifier();
-		}
-		else if (m_scanner->currentToken() == Token::Virtual)
-		{
-			if (isVirtual)
-				parserError(2662_error, "Virtual already specified.");
-
-			isVirtual = true;
-			advance();
-		}
-		else
-			break;
-	}
-
-	ASTPointer<Block> block;
-	nodeFactory.markEndPosition();
-	if (m_scanner->currentToken() != Token::Semicolon)
-	{
-		block = parseBlock();
-		nodeFactory.setEndPositionFromNode(block);
-	}
-	else
-		advance(); // just consume the ';'
-
-	return nodeFactory.createNode<ModifierDefinition>(name, nameLocation, documentation, parameters, isVirtual, overrides, block);
-}
-
-std::pair<ASTPointer<ASTString>, SourceLocation> Parser::expectIdentifierWithLocation()
-{
-	SourceLocation nameLocation = currentLocation();
-	ASTPointer<ASTString> name = expectIdentifierToken();
-
-	return {std::move(name), std::move(nameLocation)};
-}
-
-ASTPointer<EventDefinition> Parser::parseEventDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
-
-	expectToken(Token::Event);
-	auto [name, nameLocation] = expectIdentifierWithLocation();
-
-	VarDeclParserOptions options;
-	options.allowIndexed = true;
-	ASTPointer<ParameterList> parameters = parseParameterList(options);
-
-	bool anonymous = false;
-	if (m_scanner->currentToken() == Token::Anonymous)
-	{
-		anonymous = true;
-		advance();
-	}
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<EventDefinition>(name, nameLocation, documentation, parameters, anonymous);
-}
-
-ASTPointer<ErrorDefinition> Parser::parseErrorDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
-
-	solAssert(*expectIdentifierToken() == "error", "");
-	auto&& [name, nameLocation] = expectIdentifierWithLocation();
-
-	ASTPointer<ParameterList> parameters = parseParameterList({});
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<ErrorDefinition>(name, std::move(nameLocation), documentation, parameters);
-}
-
-ASTPointer<UsingForDirective> Parser::parseUsingDirective()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-
-	expectToken(Token::Using);
-
-	std::vector<ASTPointer<IdentifierPath>> functions;
-	std::vector<std::optional<Token>> operators;
-	bool const usesBraces = m_scanner->currentToken() == Token::LBrace;
-	if (usesBraces)
-	{
-		do
-		{
-			advance();
-			functions.emplace_back(parseIdentifierPath());
-			if (m_scanner->currentToken() == Token::As)
-			{
-				advance();
-				Token operator_ = m_scanner->currentToken();
-				if (!util::contains(userDefinableOperators, operator_))
-				{
-					std::string operatorName;
-					if (!m_scanner->currentLiteral().empty())
-						operatorName = m_scanner->currentLiteral();
-					else if (char const* tokenString = TokenTraits::toString(operator_))
-						operatorName = std::string(tokenString);
-
-					parserError(
-						4403_error,
-						fmt::format(
-							"Not a user-definable operator: {}. Only the following operators can be user-defined: {}",
-							operatorName,
-							util::joinHumanReadable(userDefinableOperators | ranges::views::transform([](Token _t) { return std::string{TokenTraits::toString(_t)}; }))
-						)
-					);
-				}
-				operators.emplace_back(operator_);
-				advance();
-			}
-			else
-				operators.emplace_back(std::nullopt);
-		}
-		while (m_scanner->currentToken() == Token::Comma);
-		expectToken(Token::RBrace);
-	}
-	else
-	{
-		functions.emplace_back(parseIdentifierPath());
-		operators.emplace_back(std::nullopt);
-	}
-
-	ASTPointer<TypeName> typeName;
-	expectToken(Token::For);
-	if (m_scanner->currentToken() == Token::Mul)
-		advance();
-	else
-		typeName = parseTypeName();
-	bool global = false;
-	if (m_scanner->currentToken() == Token::Identifier && currentLiteral() == "global")
-	{
-		global = true;
-		advance();
-	}
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<UsingForDirective>(std::move(functions), std::move(operators), usesBraces, typeName, global);
-}
-
-ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<IdentifierPath> name(parseIdentifierPath());
-	std::unique_ptr<std::vector<ASTPointer<Expression>>> arguments;
-	if (m_scanner->currentToken() == Token::LParen)
-	{
-		advance();
-		arguments = std::make_unique<std::vector<ASTPointer<Expression>>>(parseFunctionCallListArguments());
-		nodeFactory.markEndPosition();
-		expectToken(Token::RParen);
-	}
-	else
-		nodeFactory.setEndPositionFromNode(name);
-	return nodeFactory.createNode<ModifierInvocation>(name, std::move(arguments));
-}
-
-ASTPointer<Identifier> Parser::parseIdentifier()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	nodeFactory.markEndPosition();
-	return nodeFactory.createNode<Identifier>(expectIdentifierToken());
-}
-
-ASTPointer<Identifier> Parser::parseIdentifierOrAddress()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	nodeFactory.markEndPosition();
-	return nodeFactory.createNode<Identifier>(expectIdentifierTokenOrAddress());
-}
-
-ASTPointer<UserDefinedTypeName> Parser::parseUserDefinedTypeName()
-{
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<IdentifierPath> identifierPath = parseIdentifierPath();
-	nodeFactory.setEndPositionFromNode(identifierPath);
-	return nodeFactory.createNode<UserDefinedTypeName>(identifierPath);
-}
-
-ASTPointer<UserDefinedValueTypeDefinition> Parser::parseUserDefinedValueTypeDefinition()
-{
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Type);
-	auto&& [name, nameLocation] = expectIdentifierWithLocation();
-	expectToken(Token::Is);
-	ASTPointer<TypeName> typeName = parseTypeName();
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<UserDefinedValueTypeDefinition>(
-		name,
-		std::move(nameLocation),
-		typeName
-	);
-}
-
-ASTPointer<IdentifierPath> Parser::parseIdentifierPath()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	nodeFactory.markEndPosition();
-
-	auto [name, nameLocation] = expectIdentifierWithLocation();
-
-	std::vector<ASTString> identifierPath{*name};
-	std::vector<SourceLocation> identifierPathLocations{nameLocation};
-
-	while (m_scanner->currentToken() == Token::Period)
-	{
-		advance();
-
-		nodeFactory.markEndPosition();
-
-		tie(name, nameLocation) = expectIdentifierWithLocation();
-
-		identifierPath.push_back(*name);
-		identifierPathLocations.push_back(nameLocation);
-	}
-	return nodeFactory.createNode<IdentifierPath>(identifierPath, identifierPathLocations);
-}
-
-ASTPointer<TypeName> Parser::parseTypeNameSuffix(ASTPointer<TypeName> type, ASTNodeFactory& nodeFactory)
-{
-	RecursionGuard recursionGuard(*this);
-	while (m_scanner->currentToken() == Token::LBrack)
-	{
-		advance();
-		ASTPointer<Expression> length;
-		if (m_scanner->currentToken() != Token::RBrack)
-			length = parseExpression();
-		nodeFactory.markEndPosition();
-		expectToken(Token::RBrack);
-		type = nodeFactory.createNode<ArrayTypeName>(type, length);
-	}
-	return type;
-}
-
-ASTPointer<TypeName> Parser::parseTypeName()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<TypeName> type;
-	Token token = m_scanner->currentToken();
-	if (TokenTraits::isElementaryTypeName(token))
-	{
-		unsigned firstSize;
-		unsigned secondSize;
-		std::tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
-		ElementaryTypeNameToken elemTypeName(token, firstSize, secondSize);
-		ASTNodeFactory nodeFactory(*this);
-		nodeFactory.markEndPosition();
-		advance();
-		auto stateMutability = elemTypeName.token() == Token::Address
-			? std::optional<StateMutability>{StateMutability::NonPayable}
-			: std::nullopt;
-		if (TokenTraits::isStateMutabilitySpecifier(m_scanner->currentToken()))
-		{
-			if (elemTypeName.token() == Token::Address)
-			{
-				nodeFactory.markEndPosition();
-				stateMutability = parseStateMutability();
-			}
-			else
-			{
-				parserError(9106_error, "State mutability can only be specified for address types.");
-				advance();
-			}
-		}
-		type = nodeFactory.createNode<ElementaryTypeName>(elemTypeName, stateMutability);
-	}
-	else if (token == Token::Function)
-		type = parseFunctionType();
-	else if (token == Token::Mapping)
-		type = parseMapping();
-	else if (token == Token::Identifier)
-		type = parseUserDefinedTypeName();
-	else
-		fatalParserError(3546_error, "Expected type name");
-
-	solAssert(type, "");
-	// Parse "[...]" postfixes for arrays.
-	type = parseTypeNameSuffix(type, nodeFactory);
-
-	return type;
-}
-
-ASTPointer<FunctionTypeName> Parser::parseFunctionType()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Function);
-	FunctionHeaderParserResult header = parseFunctionHeader(true);
-	return nodeFactory.createNode<FunctionTypeName>(
-		header.parameters,
-		header.returnParameters,
-		header.visibility,
-		header.stateMutability
-	);
-}
-
-ASTPointer<Mapping> Parser::parseMapping()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Mapping);
-	expectToken(Token::LParen);
-	ASTPointer<TypeName> keyType;
-	Token token = m_scanner->currentToken();
-	unsigned firstSize;
-	unsigned secondSize;
-	std::tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
-	if (token == Token::Identifier)
-		keyType = parseUserDefinedTypeName();
-	else if (TokenTraits::isElementaryTypeName(token))
-	{
-		keyType = ASTNodeFactory(*this).createNode<ElementaryTypeName>(
-			ElementaryTypeNameToken{token, firstSize, secondSize}
-		);
-		advance();
-	}
-	else
-		fatalParserError(1005_error, "Expected elementary type name or identifier for mapping key type");
-	ASTPointer<ASTString> keyName = std::make_shared<ASTString>("");
-	SourceLocation keyNameLocation{};
-	if (m_scanner->currentToken() == Token::Identifier)
-		tie(keyName, keyNameLocation) = expectIdentifierWithLocation();
-	expectToken(Token::DoubleArrow);
-	ASTPointer<TypeName> valueType = parseTypeName();
-	ASTPointer<ASTString> valueName = std::make_shared<ASTString>("");
-	SourceLocation valueNameLocation{};
-	if (m_scanner->currentToken() == Token::Identifier)
-		tie(valueName, valueNameLocation) = expectIdentifierWithLocation();
-	nodeFactory.markEndPosition();
-	expectToken(Token::RParen);
-	return nodeFactory.createNode<Mapping>(keyType, keyName, keyNameLocation, valueType, valueName, valueNameLocation);
-}
-
-ASTPointer<ParameterList> Parser::parseParameterList(
-	VarDeclParserOptions const& _options,
-	bool _allowEmpty
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	std::vector<ASTPointer<VariableDeclaration>> parameters;
-	VarDeclParserOptions options(_options);
-	options.allowEmptyName = true;
-	expectToken(Token::LParen);
-	if (!_allowEmpty || m_scanner->currentToken() != Token::RParen)
-	{
-		parameters.push_back(parseVariableDeclaration(options));
-		while (m_scanner->currentToken() != Token::RParen)
-		{
-			if (m_scanner->currentToken() == Token::Comma && m_scanner->peekNextToken() == Token::RParen)
-				fatalParserError(7591_error, "Unexpected trailing comma in parameter list.");
-			expectToken(Token::Comma);
-			parameters.push_back(parseVariableDeclaration(options));
-		}
-	}
-	nodeFactory.markEndPosition();
-	advance();
-	return nodeFactory.createNode<ParameterList>(parameters);
-}
-
-ASTPointer<Block> Parser::parseBlock(bool _allowUnchecked, ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	bool const unchecked = m_scanner->currentToken() == Token::Unchecked;
-	if (unchecked)
-	{
-		if (!_allowUnchecked)
-			parserError(5296_error, "\"unchecked\" blocks can only be used inside regular blocks.");
-		advance();
-	}
-	expectToken(Token::LBrace);
-	std::vector<ASTPointer<Statement>> statements;
-	while (m_scanner->currentToken() != Token::RBrace)
-		statements.push_back(parseStatement(true));
-	nodeFactory.markEndPosition();
-	expectToken(Token::RBrace);
-	return nodeFactory.createNode<Block>(_docString, unchecked, statements);
-}
-
-ASTPointer<Statement> Parser::parseStatement(bool _allowUnchecked)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTPointer<ASTString> docString;
-	ASTPointer<Statement> statement;
-	if (m_scanner->currentCommentLiteral() != "")
-		docString = std::make_shared<ASTString>(m_scanner->currentCommentLiteral());
-	switch (m_scanner->currentToken())
-	{
-	case Token::If:
-		return parseIfStatement(docString);
-	case Token::While:
-		return parseWhileStatement(docString);
-	case Token::Do:
-		return parseDoWhileStatement(docString);
-	case Token::For:
-		return parseForStatement(docString);
-	case Token::Unchecked:
-	case Token::LBrace:
-		return parseBlock(_allowUnchecked, docString);
-	case Token::Continue:
-		statement = ASTNodeFactory(*this).createNode<Continue>(docString);
-		advance();
-		break;
-	case Token::Break:
-		statement = ASTNodeFactory(*this).createNode<Break>(docString);
-		advance();
-		break;
-	case Token::Return:
-	{
-		ASTNodeFactory nodeFactory(*this);
-		ASTPointer<Expression> expression;
-		if (advance() != Token::Semicolon)
-			{
-				expression = parseExpression();
-				nodeFactory.setEndPositionFromNode(expression);
-			}
-		statement = nodeFactory.createNode<Return>(docString, expression);
-			break;
-	}
-	case Token::Throw:
-	{
-		statement = ASTNodeFactory(*this).createNode<Throw>(docString);
-		advance();
-		break;
-	}
-	case Token::Try:
-		return parseTryStatement(docString);
-	case Token::Assembly:
-		return parseInlineAssembly(docString);
-	case Token::Emit:
-		statement = parseEmitStatement(docString);
-		break;
-	case Token::Identifier:
-		if (m_scanner->currentLiteral() == "revert" && m_scanner->peekNextToken() == Token::Identifier)
-			statement = parseRevertStatement(docString);
-		else if (m_insideModifier && m_scanner->currentLiteral() == "_")
-		{
-			statement = ASTNodeFactory(*this).createNode<PlaceholderStatement>(docString);
-			advance();
-		}
-		else
-			statement = parseSimpleStatement(docString);
-		break;
-	default:
-		statement = parseSimpleStatement(docString);
-		break;
-	}
-	expectToken(Token::Semicolon);
-	return statement;
-}
-
-ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	SourceLocation location = currentLocation();
-
-	expectToken(Token::Assembly);
-	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
-	if (m_scanner->currentToken() == Token::StringLiteral)
-	{
-		if (m_scanner->currentLiteral() != "evmasm")
-			fatalParserError(4531_error, "Only \"evmasm\" supported.");
-		// This can be used in the future to set the dialect.
-		advance();
-	}
-
-	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
-	if (m_scanner->currentToken() == Token::LParen)
-	{
-		flags = std::make_shared<std::vector<ASTPointer<ASTString>>>();
-		do
-		{
-			advance();
-			expectToken(Token::StringLiteral, false);
-			flags->emplace_back(std::make_shared<ASTString>(m_scanner->currentLiteral()));
-			advance();
-		}
-		while (m_scanner->currentToken() == Token::Comma);
-		expectToken(Token::RParen);
-	}
-
-	yul::Parser asmParser(m_errorReporter, dialect);
-	std::shared_ptr<yul::Block> block = asmParser.parseInline(m_scanner);
-	if (block == nullptr)
-		BOOST_THROW_EXCEPTION(FatalError());
-
-	location.end = nativeLocationOf(*block).end;
-	return std::make_shared<InlineAssembly>(nextID(), location, _docString, dialect, std::move(flags), block);
-}
-
-ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::If);
-	expectToken(Token::LParen);
-	ASTPointer<Expression> condition = parseExpression();
-	expectToken(Token::RParen);
-	ASTPointer<Statement> trueBody = parseStatement();
-	ASTPointer<Statement> falseBody;
-	if (m_scanner->currentToken() == Token::Else)
-	{
-		advance();
-		falseBody = parseStatement();
-		nodeFactory.setEndPositionFromNode(falseBody);
-	}
-	else
-		nodeFactory.setEndPositionFromNode(trueBody);
-	return nodeFactory.createNode<IfStatement>(_docString, condition, trueBody, falseBody);
-}
-
-ASTPointer<TryStatement> Parser::parseTryStatement(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Try);
-	ASTPointer<Expression> externalCall = parseExpression();
-	std::vector<ASTPointer<TryCatchClause>> clauses;
-
-	ASTNodeFactory successClauseFactory(*this);
-	ASTPointer<ParameterList> returnsParameters;
-	if (m_scanner->currentToken() == Token::Returns)
-	{
-		advance();
-		VarDeclParserOptions options;
-		options.allowEmptyName = true;
-		options.allowLocationSpecifier = true;
-		returnsParameters = parseParameterList(options, false);
-	}
-	ASTPointer<Block> successBlock = parseBlock();
-	successClauseFactory.setEndPositionFromNode(successBlock);
-	clauses.emplace_back(successClauseFactory.createNode<TryCatchClause>(
-		std::make_shared<ASTString>(), returnsParameters, successBlock
-	));
-
-	do
-	{
-		clauses.emplace_back(parseCatchClause());
-	}
-	while (m_scanner->currentToken() == Token::Catch);
-	nodeFactory.setEndPositionFromNode(clauses.back());
-	return nodeFactory.createNode<TryStatement>(
-		_docString, externalCall, clauses
-	);
-}
-
-ASTPointer<TryCatchClause> Parser::parseCatchClause()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Catch);
-	ASTPointer<ASTString> errorName = std::make_shared<std::string>();
-	ASTPointer<ParameterList> errorParameters;
-	if (m_scanner->currentToken() != Token::LBrace)
-	{
-		if (m_scanner->currentToken() == Token::Identifier)
-			errorName = expectIdentifierToken();
-		VarDeclParserOptions options;
-		options.allowEmptyName = true;
-		options.allowLocationSpecifier = true;
-		errorParameters = parseParameterList(options, !errorName->empty());
-	}
-	ASTPointer<Block> block = parseBlock();
-	nodeFactory.setEndPositionFromNode(block);
-	return nodeFactory.createNode<TryCatchClause>(errorName, errorParameters, block);
-}
-
-ASTPointer<WhileStatement> Parser::parseWhileStatement(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::While);
-	expectToken(Token::LParen);
-	ASTPointer<Expression> condition = parseExpression();
-	expectToken(Token::RParen);
-	ASTPointer<Statement> body = parseStatement();
-	nodeFactory.setEndPositionFromNode(body);
-	return nodeFactory.createNode<WhileStatement>(_docString, condition, body, false);
-}
-
-ASTPointer<WhileStatement> Parser::parseDoWhileStatement(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	expectToken(Token::Do);
-	ASTPointer<Statement> body = parseStatement();
-	expectToken(Token::While);
-	expectToken(Token::LParen);
-	ASTPointer<Expression> condition = parseExpression();
-	expectToken(Token::RParen);
-	nodeFactory.markEndPosition();
-	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<WhileStatement>(_docString, condition, body, true);
-}
-
-
-ASTPointer<ForStatement> Parser::parseForStatement(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<Statement> initExpression;
-	ASTPointer<Expression> conditionExpression;
-	ASTPointer<ExpressionStatement> loopExpression;
-	expectToken(Token::For);
-	expectToken(Token::LParen);
-
-	// TODO: Maybe here have some predicate like peekExpression() instead of checking for semicolon and RParen?
-	if (m_scanner->currentToken() != Token::Semicolon)
-		initExpression = parseSimpleStatement(ASTPointer<ASTString>());
-	expectToken(Token::Semicolon);
-
-	if (m_scanner->currentToken() != Token::Semicolon)
-		conditionExpression = parseExpression();
-	expectToken(Token::Semicolon);
-
-	if (m_scanner->currentToken() != Token::RParen)
-		loopExpression = parseExpressionStatement(ASTPointer<ASTString>());
-	expectToken(Token::RParen);
-
-	ASTPointer<Statement> body = parseStatement();
-	nodeFactory.setEndPositionFromNode(body);
-	return nodeFactory.createNode<ForStatement>(
-		_docString,
-		initExpression,
-		conditionExpression,
-		loopExpression,
-		body
-	);
-}
-
-ASTPointer<EmitStatement> Parser::parseEmitStatement(ASTPointer<ASTString> const& _docString)
-{
-	expectToken(Token::Emit, false);
-
-	ASTNodeFactory nodeFactory(*this);
-	advance();
-	ASTNodeFactory eventCallNodeFactory(*this);
-
-	if (m_scanner->currentToken() != Token::Identifier)
-		fatalParserError(5620_error, "Expected event name or path.");
-
-	IndexAccessedPath iap;
-	while (true)
-	{
-		iap.path.push_back(parseIdentifier());
-		if (m_scanner->currentToken() != Token::Period)
-			break;
-		advance();
-	}
-
-	auto eventName = expressionFromIndexAccessStructure(iap);
-	expectToken(Token::LParen);
-
-	auto functionCallArguments = parseFunctionCallArguments();
-	eventCallNodeFactory.markEndPosition();
-	nodeFactory.markEndPosition();
-	expectToken(Token::RParen);
-	auto eventCall = eventCallNodeFactory.createNode<FunctionCall>(
-		eventName,
-		functionCallArguments.arguments,
-		functionCallArguments.parameterNames,
-		functionCallArguments.parameterNameLocations
-	);
-	return nodeFactory.createNode<EmitStatement>(_docString, eventCall);
-}
-
-ASTPointer<RevertStatement> Parser::parseRevertStatement(ASTPointer<ASTString> const& _docString)
-{
-	ASTNodeFactory nodeFactory(*this);
-	solAssert(*expectIdentifierToken() == "revert", "");
-
-	ASTNodeFactory errorCallNodeFactory(*this);
-
-	solAssert(m_scanner->currentToken() == Token::Identifier, "");
-
-	IndexAccessedPath iap;
-	while (true)
-	{
-		iap.path.push_back(parseIdentifier());
-		if (m_scanner->currentToken() != Token::Period)
-			break;
-		advance();
-	}
-
-	auto errorName = expressionFromIndexAccessStructure(iap);
-	expectToken(Token::LParen);
-
-	auto functionCallArguments = parseFunctionCallArguments();
-	errorCallNodeFactory.markEndPosition();
-	nodeFactory.markEndPosition();
-	expectToken(Token::RParen);
-	auto errorCall = errorCallNodeFactory.createNode<FunctionCall>(
-		errorName,
-		functionCallArguments.arguments,
-		functionCallArguments.parameterNames,
-		functionCallArguments.parameterNameLocations
-	);
-	return nodeFactory.createNode<RevertStatement>(_docString, errorCall);
-}
-
-ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const& _docString)
-{
-	RecursionGuard recursionGuard(*this);
-	LookAheadInfo statementType;
-	IndexAccessedPath iap;
-
-	if (m_scanner->currentToken() == Token::LParen)
-	{
-		ASTNodeFactory nodeFactory(*this);
-		size_t emptyComponents = 0;
-		// First consume all empty components.
-		expectToken(Token::LParen);
-		while (m_scanner->currentToken() == Token::Comma)
-		{
-			advance();
-			emptyComponents++;
-		}
-
-		// Now see whether we have a variable declaration or an expression.
-		std::tie(statementType, iap) = tryParseIndexAccessedPath();
-		switch (statementType)
-		{
-		case LookAheadInfo::VariableDeclaration:
-		{
-			std::vector<ASTPointer<VariableDeclaration>> variables;
-			ASTPointer<Expression> value;
-			// We have already parsed something like `(,,,,a.b.c[2][3]`
-			VarDeclParserOptions options;
-			options.allowLocationSpecifier = true;
-			variables = std::vector<ASTPointer<VariableDeclaration>>(emptyComponents, nullptr);
-			variables.push_back(parseVariableDeclaration(options, typeNameFromIndexAccessStructure(iap)));
-
-			while (m_scanner->currentToken() != Token::RParen)
-			{
-				expectToken(Token::Comma);
-				if (m_scanner->currentToken() == Token::Comma || m_scanner->currentToken() == Token::RParen)
-					variables.push_back(nullptr);
-				else
-					variables.push_back(parseVariableDeclaration(options));
-			}
-			expectToken(Token::RParen);
-			expectToken(Token::Assign);
-			value = parseExpression();
-			nodeFactory.setEndPositionFromNode(value);
-			return nodeFactory.createNode<VariableDeclarationStatement>(_docString, variables, value);
-		}
-		case LookAheadInfo::Expression:
-		{
-			// Complete parsing the expression in the current component.
-			std::vector<ASTPointer<Expression>> components(emptyComponents, nullptr);
-			components.push_back(parseExpression(expressionFromIndexAccessStructure(iap)));
-			while (m_scanner->currentToken() != Token::RParen)
-			{
-				expectToken(Token::Comma);
-				if (m_scanner->currentToken() == Token::Comma || m_scanner->currentToken() == Token::RParen)
-					components.push_back(ASTPointer<Expression>());
-				else
-					components.push_back(parseExpression());
-			}
-			nodeFactory.markEndPosition();
-			expectToken(Token::RParen);
-			return parseExpressionStatement(_docString, nodeFactory.createNode<TupleExpression>(components, false));
-		}
-		default:
-			solAssert(false);
-		}
-	}
-	else
-	{
-		std::tie(statementType, iap) = tryParseIndexAccessedPath();
-		switch (statementType)
-		{
-		case LookAheadInfo::VariableDeclaration:
-			return parseVariableDeclarationStatement(_docString, typeNameFromIndexAccessStructure(iap));
-		case LookAheadInfo::Expression:
-			return parseExpressionStatement(_docString, expressionFromIndexAccessStructure(iap));
-		default:
-			solAssert(false);
-		}
-	}
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-bool Parser::IndexAccessedPath::empty() const
-{
-	if (!indices.empty())
-		solAssert(!path.empty());
-
-	return path.empty() && indices.empty();
-}
-
-
-std::pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseIndexAccessedPath()
-{
-	// These two cases are very hard to distinguish:
-	// x[7 * 20 + 3] a;     and     x[7 * 20 + 3] = 9;
-	// In the first case, x is a type name, in the second it is the name of a variable.
-	// As an extension, we can even have:
-	// `x.y.z[1][2] a;` and `x.y.z[1][2] = 10;`
-	// Where in the first, x.y.z leads to a type name where in the second, it accesses structs.
-
-	auto statementType = peekStatementType();
-	switch (statementType)
-	{
-	case LookAheadInfo::VariableDeclaration:
-	case LookAheadInfo::Expression:
-		return std::make_pair(statementType, IndexAccessedPath());
-	default:
-		break;
-	}
-
-	// At this point, we have 'Identifier "["' or 'Identifier "." Identifier' or 'ElementoryTypeName "["'.
-	// We parse '(Identifier ("." Identifier)* |ElementaryTypeName) ( "[" Expression "]" )*'
-	// until we can decide whether to hand this over to ExpressionStatement or create a
-	// VariableDeclarationStatement out of it.
-	IndexAccessedPath iap = parseIndexAccessedPath();
-
-	if (m_scanner->currentToken() == Token::Identifier || TokenTraits::isLocationSpecifier(m_scanner->currentToken()))
-		return std::make_pair(LookAheadInfo::VariableDeclaration, std::move(iap));
-	else
-		return std::make_pair(LookAheadInfo::Expression, std::move(iap));
-}
-
-ASTPointer<VariableDeclarationStatement> Parser::parseVariableDeclarationStatement(
-	ASTPointer<ASTString> const& _docString,
-	ASTPointer<TypeName> const& _lookAheadArrayType
-)
-{
-	// This does not parse multi variable declaration statements starting directly with
-	// `(`, they are parsed in parseSimpleStatement, because they are hard to distinguish
-	// from tuple expressions.
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	if (_lookAheadArrayType)
-		nodeFactory.setLocation(_lookAheadArrayType->location());
-
-	VarDeclParserOptions options;
-	options.allowLocationSpecifier = true;
-	std::vector<ASTPointer<VariableDeclaration>> variables;
-	variables.emplace_back(parseVariableDeclaration(options, _lookAheadArrayType));
-	nodeFactory.setEndPositionFromNode(variables.back());
-
-	ASTPointer<Expression> value;
-	if (m_scanner->currentToken() == Token::Assign)
-	{
-		advance();
-		value = parseExpression();
-		nodeFactory.setEndPositionFromNode(value);
-	}
-	return nodeFactory.createNode<VariableDeclarationStatement>(_docString, variables, value);
-}
-
-ASTPointer<ExpressionStatement> Parser::parseExpressionStatement(
-	ASTPointer<ASTString> const& _docString,
-	ASTPointer<Expression> const& _partialParserResult
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTPointer<Expression> expression = parseExpression(_partialParserResult);
-	return ASTNodeFactory(*this, expression).createNode<ExpressionStatement>(_docString, expression);
-}
-
-ASTPointer<Expression> Parser::parseExpression(
-	ASTPointer<Expression> const& _partiallyParsedExpression
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTPointer<Expression> expression = parseBinaryExpression(4, _partiallyParsedExpression);
-	if (TokenTraits::isAssignmentOp(m_scanner->currentToken()))
-	{
-		Token assignmentOperator = m_scanner->currentToken();
-		advance();
-		ASTPointer<Expression> rightHandSide = parseExpression();
-		ASTNodeFactory nodeFactory(*this, expression);
-		nodeFactory.setEndPositionFromNode(rightHandSide);
-		return nodeFactory.createNode<Assignment>(expression, assignmentOperator, rightHandSide);
-	}
-	else if (m_scanner->currentToken() == Token::Conditional)
-	{
-		advance();
-		ASTPointer<Expression> trueExpression = parseExpression();
-		expectToken(Token::Colon);
-		ASTPointer<Expression> falseExpression = parseExpression();
-		ASTNodeFactory nodeFactory(*this, expression);
-		nodeFactory.setEndPositionFromNode(falseExpression);
-		return nodeFactory.createNode<Conditional>(expression, trueExpression, falseExpression);
-	}
-	else
-		return expression;
-}
-
-ASTPointer<Expression> Parser::parseBinaryExpression(
-	int _minPrecedence,
-	ASTPointer<Expression> const& _partiallyParsedExpression
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTPointer<Expression> expression = parseUnaryExpression(_partiallyParsedExpression);
-	ASTNodeFactory nodeFactory(*this, expression);
-	int precedence = TokenTraits::precedence(m_scanner->currentToken());
-	for (; precedence >= _minPrecedence; --precedence)
-		while (TokenTraits::precedence(m_scanner->currentToken()) == precedence)
-		{
-			Token op = m_scanner->currentToken();
-			advance();
-
-			static_assert(TokenTraits::hasExpHighestPrecedence(), "Exp does not have the highest precedence");
-
-			// Parse a**b**c as a**(b**c)
-			ASTPointer<Expression> right = (op == Token::Exp) ?
-				parseBinaryExpression(precedence) :
-				parseBinaryExpression(precedence + 1);
-			nodeFactory.setEndPositionFromNode(right);
-			expression = nodeFactory.createNode<BinaryOperation>(expression, op, right);
-		}
-	return expression;
-}
-
-ASTPointer<Expression> Parser::parseUnaryExpression(
-	ASTPointer<Expression> const& _partiallyParsedExpression
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory = _partiallyParsedExpression ?
-		ASTNodeFactory(*this, _partiallyParsedExpression) : ASTNodeFactory(*this);
-	Token token = m_scanner->currentToken();
-
-	if (token == Token::Add)
-		fatalParserError(9636_error, "Use of unary + is disallowed.");
-
-	if (!_partiallyParsedExpression && (TokenTraits::isUnaryOp(token) || TokenTraits::isCountOp(token)))
-	{
-		// prefix expression
-		advance();
-		ASTPointer<Expression> subExpression = parseUnaryExpression();
-		nodeFactory.setEndPositionFromNode(subExpression);
-		return nodeFactory.createNode<UnaryOperation>(token, subExpression, true);
-	}
-	else
-	{
-		// potential postfix expression
-		ASTPointer<Expression> subExpression = parseLeftHandSideExpression(_partiallyParsedExpression);
-		token = m_scanner->currentToken();
-
-		if (!TokenTraits::isCountOp(token))
-			return subExpression;
-		nodeFactory.markEndPosition();
-		advance();
-		return nodeFactory.createNode<UnaryOperation>(token, subExpression, false);
-	}
-}
-
-ASTPointer<Expression> Parser::parseLeftHandSideExpression(
-	ASTPointer<Expression> const& _partiallyParsedExpression
-)
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory = _partiallyParsedExpression ?
-		ASTNodeFactory(*this, _partiallyParsedExpression) : ASTNodeFactory(*this);
-
-	ASTPointer<Expression> expression;
-	if (_partiallyParsedExpression)
-		expression = _partiallyParsedExpression;
-	else if (m_scanner->currentToken() == Token::New)
-	{
-		expectToken(Token::New);
-		ASTPointer<TypeName> typeName(parseTypeName());
-		nodeFactory.setEndPositionFromNode(typeName);
-		expression = nodeFactory.createNode<NewExpression>(typeName);
-	}
-	else if (m_scanner->currentToken() == Token::Payable)
-	{
-		expectToken(Token::Payable);
-		nodeFactory.markEndPosition();
-		auto expressionType = nodeFactory.createNode<ElementaryTypeName>(
-			ElementaryTypeNameToken(Token::Address, 0, 0),
-			std::make_optional(StateMutability::Payable)
-		);
-		expression = nodeFactory.createNode<ElementaryTypeNameExpression>(expressionType);
-		expectToken(Token::LParen, false);
-	}
-	else
-		expression = parsePrimaryExpression();
-
-	while (true)
-	{
-		switch (m_scanner->currentToken())
-		{
-		case Token::LBrack:
-		{
-			advance();
-			ASTPointer<Expression> index;
-			ASTPointer<Expression> endIndex;
-			if (m_scanner->currentToken() != Token::RBrack && m_scanner->currentToken() != Token::Colon)
-				index = parseExpression();
-			if (m_scanner->currentToken() == Token::Colon)
-			{
-				expectToken(Token::Colon);
-				if (m_scanner->currentToken() != Token::RBrack)
-					endIndex = parseExpression();
-				nodeFactory.markEndPosition();
-				expectToken(Token::RBrack);
-				expression = nodeFactory.createNode<IndexRangeAccess>(expression, index, endIndex);
-			}
-			else
-			{
-				nodeFactory.markEndPosition();
-				expectToken(Token::RBrack);
-				expression = nodeFactory.createNode<IndexAccess>(expression, index);
-			}
-			break;
-		}
-		case Token::Period:
-		{
-			advance();
-			nodeFactory.markEndPosition();
-			SourceLocation memberLocation = currentLocation();
-			ASTPointer<ASTString> memberName = expectIdentifierTokenOrAddress();
-			expression = nodeFactory.createNode<MemberAccess>(expression, std::move(memberName), std::move(memberLocation));
-			break;
-		}
-		case Token::LParen:
-		{
-			advance();
-			auto functionCallArguments = parseFunctionCallArguments();
-			nodeFactory.markEndPosition();
-			expectToken(Token::RParen);
-			expression = nodeFactory.createNode<FunctionCall>(
-				expression,
-				functionCallArguments.arguments,
-				functionCallArguments.parameterNames,
-				functionCallArguments.parameterNameLocations);
-			break;
-		}
-		case Token::LBrace:
-		{
-			// See if this is followed by <identifier>, followed by ":". If not, it is not
-			// a function call options but a Block (from a try statement).
-			if (
-				m_scanner->peekNextToken() != Token::Identifier ||
-				m_scanner->peekNextNextToken() != Token::Colon
-			)
-				return expression;
-
-			expectToken(Token::LBrace);
-			auto optionList = parseNamedArguments();
-
-			nodeFactory.markEndPosition();
-			expectToken(Token::RBrace);
-
-			expression = nodeFactory.createNode<FunctionCallOptions>(expression, optionList.arguments, optionList.parameterNames);
-			break;
-		}
-		default:
-			return expression;
-		}
-	}
-}
-
-ASTPointer<Expression> Parser::parseLiteral()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	Token initialToken = m_scanner->currentToken();
-	ASTPointer<ASTString> value = std::make_shared<std::string>(m_scanner->currentLiteral());
-
-	switch (initialToken)
-	{
-	case Token::TrueLiteral:
-	case Token::FalseLiteral:
-	case Token::Number:
-	{
-		nodeFactory.markEndPosition();
-		advance();
-		break;
-	}
-	case Token::StringLiteral:
-	case Token::UnicodeStringLiteral:
-	case Token::HexStringLiteral:
-	{
-		while (m_scanner->peekNextToken() == initialToken)
-		{
-			advance();
-			*value += m_scanner->currentLiteral();
-		}
-		nodeFactory.markEndPosition();
-		advance();
-		if (m_scanner->currentToken() == Token::Illegal)
-			fatalParserError(5428_error, to_string(m_scanner->currentError()));
-		break;
-	}
-	default:
-		solAssert(false);
-	}
-
-	if (initialToken == Token::Number && (
-		TokenTraits::isEtherSubdenomination(m_scanner->currentToken()) ||
-		TokenTraits::isTimeSubdenomination(m_scanner->currentToken())
-	))
-	{
-		nodeFactory.markEndPosition();
-		Literal::SubDenomination subDenomination = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
-		advance();
-		return nodeFactory.createNode<Literal>(initialToken, std::move(value), subDenomination);
-	}
-
-	return nodeFactory.createNode<Literal>(initialToken, std::move(value), Literal::SubDenomination::None);
-}
-
-ASTPointer<Expression> Parser::parsePrimaryExpression()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	Token token = m_scanner->currentToken();
-	ASTPointer<Expression> expression;
-
-	switch (token)
-	{
-	case Token::TrueLiteral:
-	case Token::FalseLiteral:
-	case Token::Number:
-	case Token::StringLiteral:
-	case Token::UnicodeStringLiteral:
-	case Token::HexStringLiteral:
-		expression = parseLiteral();
-		break;
-	case Token::Identifier:
-		nodeFactory.markEndPosition();
-		expression = nodeFactory.createNode<Identifier>(getLiteralAndAdvance());
-		break;
-	case Token::Type:
-		// Inside expressions "type" is the name of a special, globally-available function.
-		nodeFactory.markEndPosition();
-		advance();
-		expression = nodeFactory.createNode<Identifier>(std::make_shared<ASTString>("type"));
-		break;
-	case Token::LParen:
-	case Token::LBrack:
-	{
-		// Tuple/parenthesized expression or inline array/bracketed expression.
-		// Special cases: ()/[] is empty tuple/array type, (x) is not a real tuple,
-		// (x,) is one-dimensional tuple, elements in arrays cannot be left out, only in tuples.
-		advance();
-		std::vector<ASTPointer<Expression>> components;
-		Token oppositeToken = (token == Token::LParen ? Token::RParen : Token::RBrack);
-		bool isArray = (token == Token::LBrack);
-
-		if (m_scanner->currentToken() != oppositeToken)
-			while (true)
-			{
-				if (m_scanner->currentToken() != Token::Comma && m_scanner->currentToken() != oppositeToken)
-					components.push_back(parseExpression());
-				else if (isArray)
-					parserError(4799_error, "Expected expression (inline array elements cannot be omitted).");
-				else
-					components.push_back(ASTPointer<Expression>());
-
-				if (m_scanner->currentToken() == oppositeToken)
-					break;
-
-				expectToken(Token::Comma);
-			}
-		nodeFactory.markEndPosition();
-		expectToken(oppositeToken);
-		expression = nodeFactory.createNode<TupleExpression>(components, isArray);
-		break;
-	}
-	case Token::Illegal:
-		fatalParserError(8936_error, to_string(m_scanner->currentError()));
-		break;
-	default:
-		if (TokenTraits::isElementaryTypeName(token))
-		{
-			//used for casts
-			unsigned firstSize;
-			unsigned secondSize;
-			std::tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
-			auto expressionType = nodeFactory.createNode<ElementaryTypeName>(
-				ElementaryTypeNameToken(m_scanner->currentToken(), firstSize, secondSize)
-			);
-			expression = nodeFactory.createNode<ElementaryTypeNameExpression>(expressionType);
-			advance();
-		}
-		else
-			fatalParserError(6933_error, "Expected primary expression.");
-		break;
-	}
-	return expression;
-}
-
-std::vector<ASTPointer<Expression>> Parser::parseFunctionCallListArguments()
-{
-	RecursionGuard recursionGuard(*this);
-	std::vector<ASTPointer<Expression>> arguments;
-	if (m_scanner->currentToken() != Token::RParen)
-	{
-		arguments.push_back(parseExpression());
-		while (m_scanner->currentToken() != Token::RParen)
-		{
-			expectToken(Token::Comma);
-			arguments.push_back(parseExpression());
-		}
-	}
-	return arguments;
-}
-
-Parser::FunctionCallArguments Parser::parseFunctionCallArguments()
-{
-	RecursionGuard recursionGuard(*this);
-	FunctionCallArguments ret;
-
-	Token token = m_scanner->currentToken();
-	if (token == Token::LBrace)
-	{
-		// call({arg1 : 1, arg2 : 2 })
-		expectToken(Token::LBrace);
-		ret = parseNamedArguments();
-		expectToken(Token::RBrace);
-	}
-	else
-		ret.arguments = parseFunctionCallListArguments();
-	return ret;
-}
-
-Parser::FunctionCallArguments Parser::parseNamedArguments()
-{
-	FunctionCallArguments ret;
-
-	bool first = true;
-	while (m_scanner->currentToken() != Token::RBrace)
-	{
-		if (!first)
-			expectToken(Token::Comma);
-
-		auto identifierWithLocation = expectIdentifierWithLocation();
-
-		// Add name
-		ret.parameterNames.emplace_back(std::move(identifierWithLocation.first));
-		// Add location
-		ret.parameterNameLocations.emplace_back(std::move(identifierWithLocation.second));
-
-		expectToken(Token::Colon);
-		ret.arguments.emplace_back(parseExpression());
-
-		if (
-			m_scanner->currentToken() == Token::Comma &&
-			m_scanner->peekNextToken() == Token::RBrace
-		)
-		{
-			parserError(2074_error, "Unexpected trailing comma.");
-			advance();
-		}
-
-		first = false;
-	}
-
-	return ret;
-}
-
-bool Parser::variableDeclarationStart()
-{
-	Token currentToken = m_scanner->currentToken();
-	return
-		currentToken == Token::Identifier ||
-		currentToken == Token::Mapping ||
-		TokenTraits::isElementaryTypeName(currentToken) ||
-		(currentToken == Token::Function && m_scanner->peekNextToken() == Token::LParen);
-}
-
-std::optional<std::string> Parser::findLicenseString(std::vector<ASTPointer<ASTNode>> const& _nodes)
-{
-	// We circumvent the scanner here, because it skips non-docstring comments.
-	static std::regex const licenseNameRegex("([a-zA-Z0-9 ()+.-]+)");
-	static std::regex const licenseDeclarationRegex("SPDX-License-Identifier:\\s*(.+?)([\n\r]|(\\*/))");
-
-	// Search inside all parts of the source not covered by parsed nodes.
-	// This will leave e.g. "global comments".
-	using iter = std::string::const_iterator;
-	std::vector<std::pair<iter, iter>> sequencesToSearch;
-	std::string const& source = m_scanner->charStream().source();
-	sequencesToSearch.emplace_back(source.begin(), source.end());
-	for (ASTPointer<ASTNode> const& node: _nodes)
-		if (node->location().hasText())
-		{
-			sequencesToSearch.back().second = source.begin() + node->location().start;
-			sequencesToSearch.emplace_back(source.begin() + node->location().end, source.end());
-		}
-
-	std::vector<std::string> licenseNames;
-	for (auto const& [start, end]: sequencesToSearch)
-	{
-		auto declarationsBegin = std::sregex_iterator(start, end, licenseDeclarationRegex);
-		auto declarationsEnd = std::sregex_iterator();
-
-		for (std::sregex_iterator declIt = declarationsBegin; declIt != declarationsEnd; ++declIt)
-			if (!declIt->empty())
-			{
-				std::string license = boost::trim_copy(std::string((*declIt)[1]));
-				licenseNames.emplace_back(std::move(license));
-			}
-	}
-
-	if (licenseNames.size() == 1)
-	{
-std::string const& license = licenseNames.front();
-		if (regex_match(license, licenseNameRegex))
-			return license;
-		else
-			parserError(
-				1114_error,
-				{-1, -1, m_scanner->currentLocation().sourceName},
-				"Invalid SPDX license identifier."
-			);
-	}
-	else if (licenseNames.empty())
-		parserWarning(
-			1878_error,
-			{-1, -1, m_scanner->currentLocation().sourceName},
-			"SPDX license identifier not provided in source file. "
-			"Before publishing, consider adding a comment containing "
-			"\"SPDX-License-Identifier: <SPDX-License>\" to each source file. "
-			"Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. "
-			"Please see https://spdx.org for more information."
-		);
-	else
-		parserError(
-			3716_error,
-			{-1, -1, m_scanner->currentLocation().sourceName},
-			"Multiple SPDX license identifiers found in source file. "
-			"Use \"AND\" or \"OR\" to combine multiple licenses. "
-			"Please see https://spdx.org for more information."
-		);
-
-	return {};
-}
-
-Parser::LookAheadInfo Parser::peekStatementType() const
-{
-	// Distinguish between variable declaration (and potentially assignment) and expression statement
-	// (which include assignments to other expressions and pre-declared variables).
-	// We have a variable declaration if we get a keyword that specifies a type name.
-	// If it is an identifier or an elementary type name followed by an identifier
-	// or a mutability specifier, we also have a variable declaration.
-	// If we get an identifier followed by a "[" or ".", it can be both ("lib.type[9] a;" or "variable.el[9] = 7;").
-	// In all other cases, we have an expression statement.
-	Token token(m_scanner->currentToken());
-	bool mightBeTypeName = (TokenTraits::isElementaryTypeName(token) || token == Token::Identifier);
-
-	if (token == Token::Mapping || token == Token::Function)
-		return LookAheadInfo::VariableDeclaration;
-	if (mightBeTypeName)
-	{
-		Token next = m_scanner->peekNextToken();
-		// So far we only allow ``address payable`` in variable declaration statements and in no other
-		// kind of statement. This means, for example, that we do not allow type expressions of the form
-		// ``address payable;``.
-		// If we want to change this in the future, we need to consider another scanner token here.
-		if (TokenTraits::isElementaryTypeName(token) && TokenTraits::isStateMutabilitySpecifier(next))
-			return LookAheadInfo::VariableDeclaration;
-		if (next == Token::Identifier || TokenTraits::isLocationSpecifier(next))
-			return LookAheadInfo::VariableDeclaration;
-		if (next == Token::LBrack || next == Token::Period)
-			return LookAheadInfo::IndexAccessStructure;
-	}
-	return LookAheadInfo::Expression;
-}
-
-Parser::IndexAccessedPath Parser::parseIndexAccessedPath()
-{
-	IndexAccessedPath iap;
-	if (m_scanner->currentToken() == Token::Identifier)
-	{
-		iap.path.push_back(parseIdentifier());
-		while (m_scanner->currentToken() == Token::Period)
-		{
-			advance();
-			iap.path.push_back(parseIdentifierOrAddress());
-		}
-	}
-	else
-	{
-		unsigned firstNum;
-		unsigned secondNum;
-		std::tie(firstNum, secondNum) = m_scanner->currentTokenInfo();
-		auto expressionType = ASTNodeFactory(*this).createNode<ElementaryTypeName>(
-			ElementaryTypeNameToken(m_scanner->currentToken(), firstNum, secondNum)
-		);
-		iap.path.push_back(ASTNodeFactory(*this).createNode<ElementaryTypeNameExpression>(expressionType));
-		advance();
-	}
-	while (m_scanner->currentToken() == Token::LBrack)
-	{
-		expectToken(Token::LBrack);
-		ASTPointer<Expression> index;
-		if (m_scanner->currentToken() != Token::RBrack && m_scanner->currentToken() != Token::Colon)
-			index = parseExpression();
-		SourceLocation indexLocation = iap.path.front()->location();
-		if (m_scanner->currentToken() == Token::Colon)
-		{
-			expectToken(Token::Colon);
-			ASTPointer<Expression> endIndex;
-			if (m_scanner->currentToken() != Token::RBrack)
-				endIndex = parseExpression();
-			indexLocation.end = currentLocation().end;
-			iap.indices.emplace_back(IndexAccessedPath::Index{index, {endIndex}, indexLocation});
-			expectToken(Token::RBrack);
-		}
-		else
-		{
-			indexLocation.end = currentLocation().end;
-			iap.indices.emplace_back(IndexAccessedPath::Index{index, {}, indexLocation});
-			expectToken(Token::RBrack);
-		}
-	}
-
-	return iap;
-}
-
-ASTPointer<TypeName> Parser::typeNameFromIndexAccessStructure(Parser::IndexAccessedPath const& _iap)
-{
-	if (_iap.empty())
-		return {};
-
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	SourceLocation location = _iap.path.front()->location();
-	location.end = _iap.path.back()->location().end;
-	nodeFactory.setLocation(location);
-
-	ASTPointer<TypeName> type;
-	if (auto typeName = dynamic_cast<ElementaryTypeNameExpression const*>(_iap.path.front().get()))
-	{
-		solAssert(_iap.path.size() == 1, "");
-		type = nodeFactory.createNode<ElementaryTypeName>(typeName->type().typeName());
-	}
-	else
-	{
-		std::vector<ASTString> path;
-		std::vector<SourceLocation> pathLocations;
-
-		for (auto const& el: _iap.path)
-		{
-			auto& identifier = dynamic_cast<Identifier const&>(*el);
-			path.push_back(identifier.name());
-			pathLocations.push_back(identifier.location());
-		}
-
-		type = nodeFactory.createNode<UserDefinedTypeName>(nodeFactory.createNode<IdentifierPath>(path, pathLocations));
-	}
-	for (auto const& lengthExpression: _iap.indices)
-	{
-		if (lengthExpression.end)
-			parserError(5464_error, lengthExpression.location, "Expected array length expression.");
-		nodeFactory.setLocation(lengthExpression.location);
-		type = nodeFactory.createNode<ArrayTypeName>(type, lengthExpression.start);
-	}
-	return type;
-}
-
-ASTPointer<Expression> Parser::expressionFromIndexAccessStructure(
-	Parser::IndexAccessedPath const& _iap
-)
-{
-	if (_iap.empty())
-		return {};
-
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this, _iap.path.front());
-	ASTPointer<Expression> expression(_iap.path.front());
-	for (size_t i = 1; i < _iap.path.size(); ++i)
-	{
-		SourceLocation location(_iap.path.front()->location());
-		location.end = _iap.path[i]->location().end;
-		nodeFactory.setLocation(location);
-		Identifier const& identifier = dynamic_cast<Identifier const&>(*_iap.path[i]);
-		expression = nodeFactory.createNode<MemberAccess>(
-			expression,
-			std::make_shared<ASTString>(identifier.name()),
-			identifier.location()
-		);
-	}
-	for (auto const& index: _iap.indices)
-	{
-		nodeFactory.setLocation(index.location);
-		if (index.end)
-			expression = nodeFactory.createNode<IndexRangeAccess>(expression, index.start, *index.end);
-		else
-			expression = nodeFactory.createNode<IndexAccess>(expression, index.start);
-	}
-	return expression;
-}
-
-ASTPointer<ParameterList> Parser::createEmptyParameterList()
-{
-	RecursionGuard recursionGuard(*this);
-	ASTNodeFactory nodeFactory(*this);
-	nodeFactory.setLocationEmpty();
-	return nodeFactory.createNode<ParameterList>(std::vector<ASTPointer<VariableDeclaration>>());
-}
-
-ASTPointer<ASTString> Parser::expectIdentifierToken()
-{
-	expectToken(Token::Identifier, false /* do not advance */);
-	return getLiteralAndAdvance();
-}
-
-ASTPointer<ASTString> Parser::expectIdentifierTokenOrAddress()
-{
-	ASTPointer<ASTString> result;
-	if (m_scanner->currentToken() == Token::Address)
-	{
-		result = std::make_shared<ASTString>("address");
-		advance();
-	}
-	else
-	{
-		expectToken(Token::Identifier, false /* do not advance */);
-		result = getLiteralAndAdvance();
-	}
-	return result;
-}
-
-ASTPointer<ASTString> Parser::getLiteralAndAdvance()
-{
-	ASTPointer<ASTString> identifier = std::make_shared<ASTString>(m_scanner->currentLiteral());
-	advance();
-	return identifier;
-}
-
-bool Parser::isQuotedPath() const
-{
-	return m_scanner->currentToken() == Token::StringLiteral;
-}
-
-bool Parser::isStdlibPath() const
-{
-	return m_experimentalSolidityEnabledInCurrentSourceUnit
-		&& m_scanner->currentToken() == Token::Identifier
-		&& m_scanner->currentLiteral() == "std";
-}
-
-ASTPointer<ASTString> Parser::getStdlibImportPathAndAdvance()
-{
-	ASTPointer<ASTString> std = expectIdentifierToken();
-	if (m_scanner->currentToken() == Token::Period)
-		advance();
-	ASTPointer<ASTString> library = expectIdentifierToken();
-	return std::make_shared<ASTString>(*std + "." + *library);
-}
-
-}
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
deleted file mode 100644
index 5f2a1213d5ae..000000000000
--- a/libsolidity/parsing/Parser.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity parser.
- */
-
-#pragma once
-
-#include <libsolidity/ast/AST.h>
-#include <liblangutil/ParserBase.h>
-#include <liblangutil/EVMVersion.h>
-
-namespace solidity::langutil
-{
-class CharStream;
-}
-
-namespace solidity::frontend
-{
-
-class Parser: public langutil::ParserBase
-{
-public:
-	explicit Parser(
-		langutil::ErrorReporter& _errorReporter,
-		langutil::EVMVersion _evmVersion
-	):
-		ParserBase(_errorReporter),
-		m_evmVersion(_evmVersion)
-	{}
-
-	ASTPointer<SourceUnit> parse(langutil::CharStream& _charStream);
-
-private:
-	class ASTNodeFactory;
-
-	enum class VarDeclKind { FileLevel, State, Other };
-	struct VarDeclParserOptions
-	{
-		// This is actually not needed, but due to a defect in the C++ standard, we have to.
-		// https://stackoverflow.com/questions/17430377
-		VarDeclParserOptions() {}
-		VarDeclKind kind = VarDeclKind::Other;
-		bool allowIndexed = false;
-		bool allowEmptyName = false;
-		bool allowInitialValue = false;
-		bool allowLocationSpecifier = false;
-	};
-
-	/// This struct is shared for parsing a function header and a function type.
-	struct FunctionHeaderParserResult
-	{
-		bool isVirtual = false;
-		ASTPointer<OverrideSpecifier> overrides;
-		ASTPointer<ParameterList> parameters;
-		ASTPointer<ParameterList> returnParameters;
-		Visibility visibility = Visibility::Default;
-		StateMutability stateMutability = StateMutability::NonPayable;
-		std::vector<ASTPointer<ModifierInvocation>> modifiers;
-	};
-
-	/// Struct to share parsed function call arguments.
-	struct FunctionCallArguments
-	{
-		std::vector<ASTPointer<Expression>> arguments;
-		std::vector<ASTPointer<ASTString>> parameterNames;
-		std::vector<langutil::SourceLocation> parameterNameLocations;
-	};
-
-	///@{
-	///@name Parsing functions for the AST nodes
-	void parsePragmaVersion(langutil::SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals);
-	ASTPointer<StructuredDocumentation> parseStructuredDocumentation();
-	ASTPointer<PragmaDirective> parsePragmaDirective(bool _finishedParsingTopLevelPragmas);
-	ASTPointer<ImportDirective> parseImportDirective();
-	/// @returns an std::pair<ContractKind, bool>, where
-	/// result.second is set to true, if an abstract contract was parsed, false otherwise.
-	std::pair<ContractKind, bool> parseContractKind();
-	ASTPointer<ContractDefinition> parseContractDefinition();
-	ASTPointer<InheritanceSpecifier> parseInheritanceSpecifier();
-	Visibility parseVisibilitySpecifier();
-	ASTPointer<OverrideSpecifier> parseOverrideSpecifier();
-	StateMutability parseStateMutability();
-	FunctionHeaderParserResult parseFunctionHeader(bool _isStateVariable);
-	ASTPointer<ASTNode> parseFunctionDefinition(bool _freeFunction = false);
-	ASTPointer<StructDefinition> parseStructDefinition();
-	ASTPointer<EnumDefinition> parseEnumDefinition();
-	ASTPointer<UserDefinedValueTypeDefinition> parseUserDefinedValueTypeDefinition();
-	ASTPointer<EnumValue> parseEnumValue();
-	ASTPointer<VariableDeclaration> parseVariableDeclaration(
-		VarDeclParserOptions const& _options = {},
-		ASTPointer<TypeName> const& _lookAheadArrayType = ASTPointer<TypeName>()
-	);
-	ASTPointer<ModifierDefinition> parseModifierDefinition();
-	ASTPointer<EventDefinition> parseEventDefinition();
-	ASTPointer<ErrorDefinition> parseErrorDefinition();
-	ASTPointer<UsingForDirective> parseUsingDirective();
-	ASTPointer<ModifierInvocation> parseModifierInvocation();
-	ASTPointer<Identifier> parseIdentifier();
-	ASTPointer<Identifier> parseIdentifierOrAddress();
-	ASTPointer<UserDefinedTypeName> parseUserDefinedTypeName();
-	ASTPointer<IdentifierPath> parseIdentifierPath();
-	ASTPointer<TypeName> parseTypeNameSuffix(ASTPointer<TypeName> type, ASTNodeFactory& nodeFactory);
-	ASTPointer<TypeName> parseTypeName();
-	ASTPointer<FunctionTypeName> parseFunctionType();
-	ASTPointer<Mapping> parseMapping();
-	ASTPointer<ParameterList> parseParameterList(
-		VarDeclParserOptions const& _options = {},
-		bool _allowEmpty = true
-	);
-	ASTPointer<Block> parseBlock(bool _allowUncheckedBlock = false, ASTPointer<ASTString> const& _docString = {});
-	ASTPointer<Statement> parseStatement(bool _allowUncheckedBlock = false);
-	ASTPointer<InlineAssembly> parseInlineAssembly(ASTPointer<ASTString> const& _docString = {});
-	ASTPointer<IfStatement> parseIfStatement(ASTPointer<ASTString> const& _docString);
-	ASTPointer<TryStatement> parseTryStatement(ASTPointer<ASTString> const& _docString);
-	ASTPointer<TryCatchClause> parseCatchClause();
-	ASTPointer<WhileStatement> parseWhileStatement(ASTPointer<ASTString> const& _docString);
-	ASTPointer<WhileStatement> parseDoWhileStatement(ASTPointer<ASTString> const& _docString);
-	ASTPointer<ForStatement> parseForStatement(ASTPointer<ASTString> const& _docString);
-	ASTPointer<EmitStatement> parseEmitStatement(ASTPointer<ASTString> const& docString);
-	ASTPointer<RevertStatement> parseRevertStatement(ASTPointer<ASTString> const& docString);
-	/// A "simple statement" can be a variable declaration statement or an expression statement.
-	ASTPointer<Statement> parseSimpleStatement(ASTPointer<ASTString> const& _docString);
-	ASTPointer<VariableDeclarationStatement> parseVariableDeclarationStatement(
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<TypeName> const& _lookAheadArrayType = ASTPointer<TypeName>()
-	);
-	ASTPointer<ExpressionStatement> parseExpressionStatement(
-		ASTPointer<ASTString> const& _docString,
-		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
-	);
-	ASTPointer<Expression> parseExpression(
-		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
-	);
-	ASTPointer<Expression> parseBinaryExpression(int _minPrecedence = 4,
-		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
-	);
-	ASTPointer<Expression> parseUnaryExpression(
-		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
-	);
-	ASTPointer<Expression> parseLeftHandSideExpression(
-		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
-	);
-	ASTPointer<Expression> parseLiteral();
-	ASTPointer<Expression> parsePrimaryExpression();
-	std::vector<ASTPointer<Expression>> parseFunctionCallListArguments();
-
-	FunctionCallArguments parseFunctionCallArguments();
-	FunctionCallArguments parseNamedArguments();
-	std::pair<ASTPointer<ASTString>, langutil::SourceLocation> expectIdentifierWithLocation();
-	///@}
-
-	///@{
-	///@name Helper functions
-
-	/// @return true if we are at the start of a variable declaration.
-	bool variableDeclarationStart();
-
-	/// Used as return value of @see peekStatementType.
-	enum class LookAheadInfo
-	{
-		IndexAccessStructure, VariableDeclaration, Expression
-	};
-	/// Structure that represents a.b.c[x][y][z]. Can be converted either to an expression
-	/// or to a type name. For this to be valid, path cannot be empty, but indices can be empty.
-	struct IndexAccessedPath
-	{
-		struct Index
-		{
-			ASTPointer<Expression> start;
-			std::optional<ASTPointer<Expression>> end;
-			langutil::SourceLocation location;
-		};
-		std::vector<ASTPointer<PrimaryExpression>> path;
-		std::vector<Index> indices;
-		bool empty() const;
-	};
-
-	std::optional<std::string> findLicenseString(std::vector<ASTPointer<ASTNode>> const& _nodes);
-
-	/// Returns the next AST node ID
-	int64_t nextID() { return ++m_currentNodeID; }
-
-	std::pair<LookAheadInfo, IndexAccessedPath> tryParseIndexAccessedPath();
-	/// Performs limited look-ahead to distinguish between variable declaration and expression statement.
-	/// For source code of the form "a[][8]" ("IndexAccessStructure"), this is not possible to
-	/// decide with constant look-ahead.
-	LookAheadInfo peekStatementType() const;
-	/// @returns an IndexAccessedPath as a prestage to parsing a variable declaration (type name)
-	/// or an expression;
-	IndexAccessedPath parseIndexAccessedPath();
-	/// @returns a typename parsed in look-ahead fashion from something like "a.b[8][2**70]",
-	/// or an empty pointer if an empty @a _pathAndIncides has been supplied.
-	ASTPointer<TypeName> typeNameFromIndexAccessStructure(IndexAccessedPath const& _pathAndIndices);
-	/// @returns an expression parsed in look-ahead fashion from something like "a.b[8][2**70]",
-	/// or an empty pointer if an empty @a _pathAndIncides has been supplied.
-	ASTPointer<Expression> expressionFromIndexAccessStructure(IndexAccessedPath const& _pathAndIndices);
-
-	ASTPointer<ASTString> expectIdentifierToken();
-	ASTPointer<ASTString> expectIdentifierTokenOrAddress();
-	ASTPointer<ASTString> getLiteralAndAdvance();
-	///@}
-
-	bool isQuotedPath() const;
-	bool isStdlibPath() const;
-
-	ASTPointer<ASTString> getStdlibImportPathAndAdvance();
-
-	/// Creates an empty ParameterList at the current location (used if parameters can be omitted).
-	ASTPointer<ParameterList> createEmptyParameterList();
-
-	/// Flag that signifies whether '_' is parsed as a PlaceholderStatement or a regular identifier.
-	bool m_insideModifier = false;
-	langutil::EVMVersion m_evmVersion;
-	/// Counter for the next AST node ID
-	int64_t m_currentNodeID = 0;
-	/// Flag that indicates whether experimental mode is enabled in the current source unit
-	bool m_experimentalSolidityEnabledInCurrentSourceUnit = false;
-};
-
-}
diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h
deleted file mode 100644
index 0382aba0eb34..000000000000
--- a/libsolidity/parsing/Token.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Solidity and Yul both share the same Token (and Scanner) API.
- *
- * This may (or may not) change in the future. But for the time being, we've put both
- * at a shared place, and *just* import them.
-*/
-#pragma once
-
-#include <liblangutil/Token.h>
-
-namespace solidity::frontend
-{
-namespace TokenTraits = langutil::TokenTraits;
-
-using langutil::Token;
-using langutil::ElementaryTypeNameToken;
-}
diff --git a/libsolutil/Algorithms.h b/libsolutil/Algorithms.h
deleted file mode 100644
index c9176c25aac4..000000000000
--- a/libsolutil/Algorithms.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-
-#include <functional>
-#include <list>
-#include <set>
-
-namespace solidity::util
-{
-
-/**
- * Detector for cycles in directed graphs. It returns the first
- * vertex on the path towards a cycle or a nullptr if there is
- * no reachable cycle starting from a given vertex.
- */
-template <typename V>
-class CycleDetector
-{
-public:
-	using Visitor = std::function<void(V const&, CycleDetector&, size_t)>;
-
-	/// Initializes the cycle detector
-	/// @param _visit function that is given the current vertex
-	///               and is supposed to call @a run on all
-	///               adjacent vertices.
-	explicit CycleDetector(Visitor _visit):
-		m_visit(std::move(_visit))
-	{  }
-
-	/// Recursively perform cycle detection starting
-	/// (or continuing) with @param _vertex
-	/// @returns the first vertex on the path towards a cycle from @a _vertex
-	/// or nullptr if no cycle is reachable from @a _vertex.
-	V const* run(V const& _vertex)
-	{
-		if (m_firstCycleVertex)
-			return m_firstCycleVertex;
-		if (m_processed.count(&_vertex))
-			return nullptr;
-		else if (m_processing.count(&_vertex))
-			return m_firstCycleVertex = &_vertex;
-		m_processing.insert(&_vertex);
-
-		m_depth++;
-		m_visit(_vertex, *this, m_depth);
-		m_depth--;
-		if (m_firstCycleVertex && m_depth == 1)
-			m_firstCycleVertex = &_vertex;
-
-		m_processing.erase(&_vertex);
-		m_processed.insert(&_vertex);
-		return m_firstCycleVertex;
-	}
-
-private:
-	Visitor m_visit;
-	std::set<V const*> m_processing;
-	std::set<V const*> m_processed;
-	size_t m_depth = 0;
-	V const* m_firstCycleVertex = nullptr;
-};
-
-/**
- * Generic breadth first search.
- *
- * Note that V needs to be a comparable value type or a pointer.
- *
- * Example: Gather all (recursive) children in a graph starting at (and including) ``root``:
- *
- * Node const* root = ...;
- * std::set<Node const*> allNodes = BreadthFirstSearch<Node const*>{{root}}.run([](Node const* _node, auto&& _addChild) {
- *   // Potentially process ``_node``.
- *   for (Node const& _child: _node->children())
- *     // Potentially filter the children to be visited.
- *     _addChild(&_child);
- * }).visited;
- */
-template<typename V>
-struct BreadthFirstSearch
-{
-	/// Runs the breadth first search. The verticesToTraverse member of the struct needs to be initialized.
-	/// @param _forEachChild is a callable of the form [...](V const& _node, auto&& _addChild) { ... }
-	/// that is called for each visited node and is supposed to call _addChild(childNode) for every child
-	/// node of _node.
-	template<typename ForEachChild>
-	BreadthFirstSearch& run(ForEachChild&& _forEachChild)
-	{
-		while (!verticesToTraverse.empty())
-		{
-			V v = std::move(verticesToTraverse.front());
-			verticesToTraverse.pop_front();
-
-			if (!visited.insert(v).second)
-				continue;
-
-			_forEachChild(v, [this](V _vertex) {
-				verticesToTraverse.emplace_back(std::move(_vertex));
-			});
-		}
-		return *this;
-	}
-	void abort()
-	{
-		verticesToTraverse.clear();
-	}
-
-	std::list<V> verticesToTraverse;
-	std::set<V> visited{};
-};
-
-}
diff --git a/libsolutil/AnsiColorized.h b/libsolutil/AnsiColorized.h
deleted file mode 100644
index 08b4a4d228ea..000000000000
--- a/libsolutil/AnsiColorized.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <ostream>
-#include <vector>
-
-namespace solidity::util
-{
-
-namespace formatting
-{
-
-// control codes
-static constexpr char const* RESET = "\033[0m";
-static constexpr char const* INVERSE = "\033[7m";
-static constexpr char const* BOLD = "\033[1m";
-static constexpr char const* BRIGHT = BOLD;
-
-// standard foreground colors
-static constexpr char const* BLACK = "\033[30m";
-static constexpr char const* RED = "\033[31m";
-static constexpr char const* GREEN = "\033[32m";
-static constexpr char const* YELLOW = "\033[33m";
-static constexpr char const* BLUE = "\033[34m";
-static constexpr char const* MAGENTA = "\033[35m";
-static constexpr char const* CYAN = "\033[36m";
-static constexpr char const* WHITE = "\033[37m";
-
-// standard background colors
-static constexpr char const* BLACK_BACKGROUND = "\033[40m";
-static constexpr char const* RED_BACKGROUND = "\033[41m";
-static constexpr char const* GREEN_BACKGROUND = "\033[42m";
-static constexpr char const* YELLOW_BACKGROUND = "\033[43m";
-static constexpr char const* BLUE_BACKGROUND = "\033[44m";
-static constexpr char const* MAGENTA_BACKGROUND = "\033[45m";
-static constexpr char const* CYAN_BACKGROUND = "\033[46m";
-static constexpr char const* WHITE_BACKGROUND = "\033[47m";
-static constexpr char const* GRAY_BACKGROUND = "\033[100m";
-
-// 256-bit-colors (incomplete set)
-static constexpr char const* RED_BACKGROUND_256 = "\033[48;5;160m";
-static constexpr char const* ORANGE_BACKGROUND_256 = "\033[48;5;166m";
-
-}
-
-/// AnsiColorized provides a convenience helper to colorize ostream with formatting-reset assured.
-class AnsiColorized
-{
-public:
-	AnsiColorized(std::ostream& _os, bool const _enabled, std::vector<char const*>&& _formatting):
-		m_stream{_os}, m_enabled{_enabled}, m_codes{std::move(_formatting)}
-	{
-		if (m_enabled)
-			for (auto const& code: m_codes)
-				m_stream << code;
-	}
-
-	~AnsiColorized()
-	{
-		if (m_enabled)
-			m_stream << formatting::RESET;
-	}
-
-	template <typename T>
-	std::ostream& operator<<(T&& _t)
-	{
-		return m_stream << std::forward<T>(_t);
-	}
-
-private:
-	std::ostream& m_stream;
-	bool m_enabled;
-	std::vector<char const*> m_codes;
-};
-
-}
diff --git a/libsolutil/Assertions.h b/libsolutil/Assertions.h
deleted file mode 100644
index 6735cda166be..000000000000
--- a/libsolutil/Assertions.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @file Assertions.h
- * @author Christian <c@ethdev.com>
- * @date 2015
- *
- * Assertion handling.
- */
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-
-#include <string>
-
-namespace solidity::util
-{
-
-#if defined(_MSC_VER)
-#define ETH_FUNC __FUNCSIG__
-#elif defined(__GNUC__)
-#define ETH_FUNC __PRETTY_FUNCTION__
-#else
-#define ETH_FUNC __func__
-#endif
-
-#if defined(__GNUC__)
-// GCC 4.8+, Clang, Intel and other compilers compatible with GCC (-std=c++0x or above)
-[[noreturn]] inline __attribute__((always_inline)) void unreachable()
-{
-	__builtin_unreachable();
-}
-
-#elif defined(_MSC_VER) // MSVC
-
-[[noreturn]] __forceinline void unreachable()
-{
-	__assume(false);
-}
-
-#else
-
-[[noreturn]] inline void unreachable()
-{
-	solThrow(Exception, "Unreachable");
-}
-#endif
-
-namespace assertions
-{
-
-inline std::string stringOrDefault(std::string _string, std::string _defaultString)
-{
-	// NOTE: Putting this in a function rather than directly in a macro prevents the string from
-	// being evaluated multiple times if it's not just a literal.
-	return (!_string.empty() ? _string : _defaultString);
-}
-
-}
-
-/// Base macro that can be used to implement assertion macros.
-/// Throws an exception containing the given description if the condition is not met.
-/// Allows you to provide the default description for the case where the user of your macro does
-/// not provide any.
-/// The second parameter must be an exception class (rather than an instance).
-#define assertThrowWithDefaultDescription(_condition, _exceptionType, _description, _defaultDescription) \
-	do \
-	{ \
-		if (!(_condition)) \
-			solThrow( \
-				_exceptionType, \
-				::solidity::util::assertions::stringOrDefault((_description), (_defaultDescription)) \
-			); \
-	} \
-	while (false)
-
-/// Assertion that throws an exception containing the given description if it is not met.
-/// Use it as assertThrow(1 == 1, ExceptionType, "Mathematics is wrong.");
-/// The second parameter must be an exception class (rather than an instance).
-#define assertThrow(_condition, _exceptionType, _description) \
-	assertThrowWithDefaultDescription((_condition), _exceptionType, (_description), "Assertion failed")
-
-}
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
deleted file mode 100644
index f97d61b671c1..000000000000
--- a/libsolutil/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-set(sources
-	Algorithms.h
-	AnsiColorized.h
-	Assertions.h
-	Common.h
-	CommonData.cpp
-	CommonData.h
-	CommonIO.cpp
-	CommonIO.h
-	cxx20.h
-	Exceptions.cpp
-	Exceptions.h
-	ErrorCodes.h
-	FixedHash.h
-	FunctionSelector.h
-	IpfsHash.cpp
-	IpfsHash.h
-	JSON.cpp
-	JSON.h
-	Keccak256.cpp
-	Keccak256.h
-	LazyInit.h
-	LEB128.h
-	Numeric.cpp
-	Numeric.h
-	picosha2.h
-	Result.h
-	SetOnce.h
-	StackTooDeepString.h
-	StringUtils.cpp
-	StringUtils.h
-	SwarmHash.cpp
-	SwarmHash.h
-	TemporaryDirectory.cpp
-	TemporaryDirectory.h
-	UTF8.cpp
-	UTF8.h
-	vector_ref.h
-	Views.h
-	Visitor.h
-	Whiskers.cpp
-	Whiskers.h
-)
-
-add_library(solutil ${sources})
-target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only)
-target_include_directories(solutil PUBLIC "${PROJECT_SOURCE_DIR}")
-add_dependencies(solutil solidity_BuildInfo.h)
-
-if(SOLC_LINK_STATIC)
-	target_link_libraries(solutil PUBLIC Threads::Threads)
-endif()
diff --git a/libsolutil/Common.h b/libsolutil/Common.h
deleted file mode 100644
index c908c13ae2bc..000000000000
--- a/libsolutil/Common.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Common.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * Very common stuff (i.e. that every other header needs except vector_ref.h).
- */
-
-#pragma once
-
-// way too many unsigned to size_t warnings in 32 bit build
-#ifdef _M_IX86
-#pragma warning(disable:4244)
-#endif
-
-#if _MSC_VER && _MSC_VER < 1900
-#define _ALLOW_KEYWORD_MACROS
-#define noexcept throw()
-#endif
-
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:3682) //call through incomplete class
-#endif
-
-#include <libsolutil/vector_ref.h>
-
-#include <boost/version.hpp>
-
-#include <cstdint>
-#include <functional>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace solidity
-{
-
-// Binary data types.
-using bytes = std::vector<uint8_t>;
-using bytesRef = util::vector_ref<uint8_t>;
-using bytesConstRef = util::vector_ref<uint8_t const>;
-
-// Map types.
-using StringMap = std::map<std::string, std::string>;
-
-// String types.
-using strings = std::vector<std::string>;
-
-/// RAII utility class whose destructor calls a given function.
-class ScopeGuard
-{
-public:
-	explicit ScopeGuard(std::function<void(void)> _f): m_f(std::move(_f)) {}
-	~ScopeGuard() { m_f(); }
-
-private:
-	std::function<void(void)> m_f;
-};
-
-/// RAII utility class that sets the value of a variable for the current scope and restores it to its old value
-/// during its destructor.
-template<typename V>
-class ScopedSaveAndRestore
-{
-public:
-	explicit ScopedSaveAndRestore(V& _variable, V&& _value): m_variable(_variable), m_oldValue(std::move(_value))
-	{
-		std::swap(m_variable, m_oldValue);
-	}
-	ScopedSaveAndRestore(ScopedSaveAndRestore const&) = delete;
-	~ScopedSaveAndRestore() { std::swap(m_variable, m_oldValue); }
-	ScopedSaveAndRestore& operator=(ScopedSaveAndRestore const&) = delete;
-
-private:
-	V& m_variable;
-	V m_oldValue;
-};
-
-template<typename V, typename... Args>
-ScopedSaveAndRestore(V, Args...) -> ScopedSaveAndRestore<V>;
-
-}
diff --git a/libsolutil/CommonData.cpp b/libsolutil/CommonData.cpp
deleted file mode 100644
index 69f08308c2e8..000000000000
--- a/libsolutil/CommonData.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file CommonData.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include <libsolutil/Assertions.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-
-namespace
-{
-
-static char const* upperHexChars = "0123456789ABCDEF";
-static char const* lowerHexChars = "0123456789abcdef";
-
-}
-
-std::string solidity::util::toHex(uint8_t _data, HexCase _case)
-{
-	assertThrow(_case != HexCase::Mixed, BadHexCase, "Mixed case can only be used for byte arrays.");
-
-	char const* chars = _case == HexCase::Upper ? upperHexChars : lowerHexChars;
-
-	return std::string{
-		chars[(unsigned(_data) / 16) & 0xf],
-		chars[unsigned(_data) & 0xf]
-	};
-}
-
-std::string solidity::util::toHex(bytes const& _data, HexPrefix _prefix, HexCase _case)
-{
-	std::string ret(_data.size() * 2 + (_prefix == HexPrefix::Add ? 2 : 0), 0);
-
-	size_t i = 0;
-	if (_prefix == HexPrefix::Add)
-	{
-		ret[i++] = '0';
-		ret[i++] = 'x';
-	}
-
-	// Mixed case will be handled inside the loop.
-	char const* chars = _case == HexCase::Upper ? upperHexChars : lowerHexChars;
-	size_t rix = _data.size() - 1;
-	for (uint8_t c: _data)
-	{
-		// switch hex case every four hexchars
-		if (_case == HexCase::Mixed)
-			chars = (rix-- & 2) == 0 ? lowerHexChars : upperHexChars;
-
-		ret[i++] = chars[(static_cast<size_t>(c) >> 4ul) & 0xfu];
-		ret[i++] = chars[c & 0xfu];
-	}
-	assertThrow(i == ret.size(), Exception, "");
-
-	return ret;
-}
-
-int solidity::util::fromHex(char _i, WhenError _throw)
-{
-	if (_i >= '0' && _i <= '9')
-		return _i - '0';
-	if (_i >= 'a' && _i <= 'f')
-		return _i - 'a' + 10;
-	if (_i >= 'A' && _i <= 'F')
-		return _i - 'A' + 10;
-	if (_throw == WhenError::Throw)
-		assertThrow(false, BadHexCharacter, std::to_string(_i));
-	else
-		return -1;
-}
-
-bytes solidity::util::fromHex(std::string const& _s, WhenError _throw)
-{
-	if (_s.empty())
-		return {};
-
-	unsigned s = (_s.size() >= 2 && _s[0] == '0' && _s[1] == 'x') ? 2 : 0;
-	std::vector<uint8_t> ret;
-	ret.reserve((_s.size() - s + 1) / 2);
-
-	if (_s.size() % 2)
-	{
-		int h = fromHex(_s[s++], _throw);
-		if (h != -1)
-			ret.push_back(static_cast<uint8_t>(h));
-		else
-			return bytes();
-	}
-	for (unsigned i = s; i < _s.size(); i += 2)
-	{
-		int h = fromHex(_s[i], _throw);
-		int l = fromHex(_s[i + 1], _throw);
-		if (h != -1 && l != -1)
-			ret.push_back(static_cast<uint8_t>(h * 16 + l));
-		else
-			return bytes();
-	}
-	return ret;
-}
-
-
-bool solidity::util::passesAddressChecksum(std::string const& _str, bool _strict)
-{
-	std::string s = _str.substr(0, 2) == "0x" ? _str : "0x" + _str;
-
-	if (s.length() != 42)
-		return false;
-
-	if (!_strict && (
-		s.find_first_of("abcdef") == std::string::npos ||
-		s.find_first_of("ABCDEF") == std::string::npos
-	))
-		return true;
-
-	return s == solidity::util::getChecksummedAddress(s);
-}
-
-std::string solidity::util::getChecksummedAddress(std::string const& _addr)
-{
-	std::string s = _addr.substr(0, 2) == "0x" ? _addr.substr(2) : _addr;
-	assertThrow(s.length() == 40, InvalidAddress, "");
-	assertThrow(s.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos, InvalidAddress, "");
-
-	h256 hash = keccak256(boost::algorithm::to_lower_copy(s, std::locale::classic()));
-
-	std::string ret = "0x";
-	for (unsigned i = 0; i < 40; ++i)
-	{
-		char addressCharacter = s[i];
-		uint8_t nibble = hash[i / 2u] >> (4u * (1u - (i % 2u))) & 0xf;
-		if (nibble >= 8)
-			ret += toUpper(addressCharacter);
-		else
-			ret += toLower(addressCharacter);
-	}
-	return ret;
-}
-
-bool solidity::util::isValidHex(std::string const& _string)
-{
-	if (_string.substr(0, 2) != "0x")
-		return false;
-	if (_string.find_first_not_of("0123456789abcdefABCDEF", 2) != std::string::npos)
-		return false;
-	return true;
-}
-
-bool solidity::util::isValidDecimal(std::string const& _string)
-{
-	if (_string.empty())
-		return false;
-	if (_string == "0")
-		return true;
-	// No leading zeros
-	if (_string.front() == '0')
-		return false;
-	if (_string.find_first_not_of("0123456789") != std::string::npos)
-		return false;
-	return true;
-}
-
-std::string solidity::util::formatAsStringOrNumber(std::string const& _value)
-{
-	assertThrow(_value.length() <= 32, StringTooLong, "String to be formatted longer than 32 bytes.");
-
-	for (auto const& c: _value)
-		if (c <= 0x1f || c >= 0x7f || c == '"')
-			return "0x" + h256(_value, h256::AlignLeft).hex();
-
-	return escapeAndQuoteString(_value);
-}
-
-
-std::string solidity::util::escapeAndQuoteString(std::string const& _input)
-{
-	std::string out;
-
-	for (char c: _input)
-		if (c == '\\')
-			out += "\\\\";
-		else if (c == '"')
-			out += "\\\"";
-		else if (c == '\n')
-			out += "\\n";
-		else if (c == '\r')
-			out += "\\r";
-		else if (c == '\t')
-			out += "\\t";
-		else if (!isPrint(c))
-		{
-			std::ostringstream o;
-			o << "\\x" << std::hex << std::setfill('0') << std::setw(2) << (unsigned)(unsigned char)(c);
-			out += o.str();
-		}
-		else
-			out += c;
-
-	return "\"" + std::move(out) + "\"";
-}
diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
deleted file mode 100644
index f3c168e6510b..000000000000
--- a/libsolutil/CommonData.h
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file CommonData.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * Shared algorithms and data types.
- */
-
-#pragma once
-
-#include <iterator>
-#include <libsolutil/Common.h>
-
-#include <vector>
-#include <type_traits>
-#include <cstring>
-#include <optional>
-#include <string>
-#include <set>
-#include <functional>
-#include <utility>
-#include <type_traits>
-#include <list>
-#include <algorithm>
-
-/// Operators need to stay in the global namespace.
-
-/// Concatenate the contents of a container onto a vector
-template <class T, class U> std::vector<T>& operator+=(std::vector<T>& _a, U& _b)
-{
-	for (auto const& i: _b)
-		_a.push_back(T(i));
-	return _a;
-}
-/// Concatenate the contents of a container onto a vector, move variant.
-template <class T, class U> std::vector<T>& operator+=(std::vector<T>& _a, U&& _b)
-{
-	std::move(_b.begin(), _b.end(), std::back_inserter(_a));
-	return _a;
-}
-
-/// Concatenate the contents of a container onto a list
-template <class T, class U> std::list<T>& operator+=(std::list<T>& _a, U& _b)
-{
-	for (auto const& i: _b)
-		_a.push_back(T(i));
-	return _a;
-}
-/// Concatenate the contents of a container onto a list, move variant.
-template <class T, class U> std::list<T>& operator+=(std::list<T>& _a, U&& _b)
-{
-	std::move(_b.begin(), _b.end(), std::back_inserter(_a));
-	return _a;
-}
-
-/// Concatenate the contents of a container onto a multiset
-template <class U, class... T> std::multiset<T...>& operator+=(std::multiset<T...>& _a, U& _b)
-{
-	_a.insert(_b.begin(), _b.end());
-	return _a;
-}
-/// Concatenate the contents of a container onto a multiset, move variant.
-template <class U, class... T> std::multiset<T...>& operator+=(std::multiset<T...>& _a, U&& _b)
-{
-	for (auto&& x: _b)
-		_a.insert(std::move(x));
-	return _a;
-}
-/// Concatenate the contents of a container onto a set
-template <class U, class... T> std::set<T...>& operator+=(std::set<T...>& _a, U& _b)
-{
-	_a.insert(_b.begin(), _b.end());
-	return _a;
-}
-/// Concatenate the contents of a container onto a set, move variant.
-template <class U, class... T> std::set<T...>& operator+=(std::set<T...>& _a, U&& _b)
-{
-	for (auto&& x: _b)
-		_a.insert(std::move(x));
-	return _a;
-}
-
-/// Concatenate two vectors of elements.
-template <class T>
-inline std::vector<T> operator+(std::vector<T> const& _a, std::vector<T> const& _b)
-{
-	std::vector<T> ret(_a);
-	ret += _b;
-	return ret;
-}
-
-/// Concatenate two vectors of elements, moving them.
-template <class T>
-inline std::vector<T> operator+(std::vector<T>&& _a, std::vector<T>&& _b)
-{
-	std::vector<T> ret(std::move(_a));
-	assert(&_a != &_b);
-	ret += std::move(_b);
-	return ret;
-}
-
-/// Concatenate something to a sets of elements.
-template <class U, class... T>
-inline std::set<T...> operator+(std::set<T...> const& _a, U&& _b)
-{
-	std::set<T...> ret(_a);
-	ret += std::forward<U>(_b);
-	return ret;
-}
-
-/// Concatenate something to a sets of elements, move variant.
-template <class U, class... T>
-inline std::set<T...> operator+(std::set<T...>&& _a, U&& _b)
-{
-	std::set<T...> ret(std::move(_a));
-	ret += std::forward<U>(_b);
-	return ret;
-}
-
-/// Remove the elements of a container from a set.
-template <class C, class... T>
-inline std::set<T...>& operator-=(std::set<T...>& _a, C const& _b)
-{
-	for (auto const& x: _b)
-		_a.erase(x);
-	return _a;
-}
-
-template <class C, class... T>
-inline std::set<T...> operator-(std::set<T...> const& _a, C const& _b)
-{
-	auto result = _a;
-	result -= _b;
-	return result;
-}
-
-/// Remove the elements of a container from a multiset.
-template <class C, class... T>
-inline std::multiset<T...>& operator-=(std::multiset<T...>& _a, C const& _b)
-{
-	for (auto const& x: _b)
-		_a.erase(x);
-	return _a;
-}
-
-namespace solidity::util
-{
-
-/// Functional map.
-/// Returns a container _oc applying @param _op to each element in @param _c.
-/// By default _oc is a vector.
-/// If another return type is desired, an empty contained of that type
-/// is given as @param _oc.
-template<class Container, class Callable, class OutputContainer =
-	std::vector<std::invoke_result_t<
-		Callable,
-		decltype(*std::begin(std::declval<Container>()))
->>>
-auto applyMap(Container const& _c, Callable&& _op, OutputContainer _oc = OutputContainer{})
-{
-	std::transform(std::begin(_c), std::end(_c), std::inserter(_oc, std::end(_oc)), _op);
-	return _oc;
-}
-
-/// Filter a vector.
-/// Returns a copy of the vector after only taking indices `i` such that `_mask[i]` is true.
-template<typename T>
-std::vector<T> filter(std::vector<T> const& _vec, std::vector<bool> const& _mask)
-{
-	assert(_vec.size() == _mask.size());
-
-	std::vector<T> ret;
-
-	for (size_t i = 0; i < _mask.size(); ++i)
-		if (_mask[i])
-			ret.push_back(_vec[i]);
-
-	return ret;
-}
-
-/// Functional fold.
-/// Given a container @param _c, an initial value @param _acc,
-/// and a binary operator @param _binaryOp(T, U), accumulate
-/// the elements of _c over _acc.
-/// Note that <numeric> has a similar function `accumulate` which
-/// until C++20 does *not* std::move the partial accumulated.
-template<class C, class T, class Callable>
-auto fold(C const& _c, T _acc, Callable&& _binaryOp)
-{
-	for (auto const& e: _c)
-		_acc = _binaryOp(std::move(_acc), e);
-	return _acc;
-}
-
-template <class T, class U>
-T convertContainer(U const& _from)
-{
-	return T{_from.cbegin(), _from.cend()};
-}
-
-template <class T, class U>
-T convertContainer(U&& _from)
-{
-	return T{
-		std::make_move_iterator(_from.begin()),
-		std::make_move_iterator(_from.end())
-	};
-}
-
-/// Gets a @a K -> @a V map and returns a map where values from the original map are keys and keys
-/// from the original map are values.
-///
-/// @pre @a originalMap must have unique values.
-template <typename K, typename V>
-std::map<V, K> invertMap(std::map<K, V> const& originalMap)
-{
-	std::map<V, K> inverseMap;
-	for (auto const& originalPair: originalMap)
-	{
-		assert(inverseMap.count(originalPair.second) == 0);
-		inverseMap.insert({originalPair.second, originalPair.first});
-	}
-
-	return inverseMap;
-}
-
-/// Returns a set of keys of a map.
-template <typename K, typename V>
-std::set<K> keys(std::map<K, V> const& _map)
-{
-	return applyMap(_map, [](auto const& _elem) { return _elem.first; }, std::set<K>{});
-}
-
-/// @returns a pointer to the entry of @a _map at @a _key, if there is one, and nullptr otherwise.
-template<typename MapType, typename KeyType>
-decltype(auto) valueOrNullptr(MapType&& _map, KeyType const& _key)
-{
-	auto it = _map.find(_key);
-	return (it == _map.end()) ? nullptr : &it->second;
-}
-
-namespace detail
-{
-struct allow_copy {};
-}
-static constexpr auto allow_copy = detail::allow_copy{};
-
-/// @returns a reference to the entry of @a _map at @a _key, if there is one, and @a _defaultValue otherwise.
-/// Makes sure no copy is involved, unless allow_copy is passed as fourth argument.
-template<
-	typename MapType,
-	typename KeyType,
-	typename ValueType = std::decay_t<decltype(std::declval<MapType>().find(std::declval<KeyType>())->second)> const&,
-	typename AllowCopyType = std::conditional_t<(std::is_trivial_v<ValueType> && std::is_standard_layout_v<ValueType>) || std::is_pointer_v<ValueType>, detail::allow_copy, void*>
->
-decltype(auto) valueOrDefault(
-	MapType&& _map,
-	KeyType const& _key,
-	ValueType&& _defaultValue = {},
-	AllowCopyType = {}
-)
-{
-	auto it = _map.find(_key);
-	static_assert(
-		std::is_same_v<AllowCopyType, detail::allow_copy> ||
-		std::is_reference_v<decltype((it == _map.end()) ? std::forward<ValueType>(_defaultValue) : it->second)>,
-		"valueOrDefault does not allow copies by default. Pass allow_copy as additional argument, if you want to allow copies."
-	);
-	return (it == _map.end()) ? std::forward<ValueType>(_defaultValue) : it->second;
-}
-
-namespace detail
-{
-template<typename Callable>
-struct MapTuple
-{
-	Callable callable;
-	template<typename TupleType>
-	decltype(auto) operator()(TupleType&& _tuple) {
-		using PlainTupleType = std::remove_cv_t<std::remove_reference_t<TupleType>>;
-		return operator()(
-			std::forward<TupleType>(_tuple),
-			std::make_index_sequence<std::tuple_size_v<PlainTupleType>>{}
-		);
-	}
-private:
-	template<typename TupleType, size_t... I>
-	decltype(auto) operator()(TupleType&& _tuple, std::index_sequence<I...>)
-	{
-		return callable(std::get<I>(std::forward<TupleType>(_tuple))...);
-	}
-};
-}
-
-/// Wraps @a _callable, which takes multiple arguments, into a callable that takes a single tuple of arguments.
-/// Since structured binding in lambdas is not allowed, i.e. [](auto&& [key, value]) { ... } is invalid, this allows
-/// to instead use mapTuple([](auto&& key, auto&& value) { ... }).
-template<typename Callable>
-decltype(auto) mapTuple(Callable&& _callable)
-{
-	return detail::MapTuple<Callable>{std::forward<Callable>(_callable)};
-}
-
-/// Merges map @a _b into map @a _a. If the same key exists in both maps,
-/// calls @a _conflictSolver to combine the two values.
-template <class K, class V, class F>
-void joinMap(std::map<K, V>& _a, std::map<K, V>&& _b, F _conflictSolver)
-{
-	auto ita = _a.begin();
-	auto aend = _a.end();
-	auto itb = _b.begin();
-	auto bend = _b.end();
-
-	for (; itb != bend; ++ita)
-	{
-		if (ita == aend)
-			ita = _a.insert(ita, std::move(*itb++));
-		else if (ita->first < itb->first)
-			continue;
-		else if (itb->first < ita->first)
-			ita = _a.insert(ita, std::move(*itb++));
-		else
-		{
-			_conflictSolver(ita->second, std::move(itb->second));
-			++itb;
-		}
-	}
-}
-
-namespace detail
-{
-
-template<typename Container, typename Value>
-auto findOffset(Container&& _container, Value&& _value, int)
--> decltype(_container.find(_value) == _container.end(), std::distance(_container.begin(), _container.find(_value)), std::optional<size_t>())
-{
-	auto it = _container.find(std::forward<Value>(_value));
-	auto end = _container.end();
-	if (it == end)
-		return std::nullopt;
-	return std::distance(_container.begin(), it);
-}
-template<typename Range, typename Value>
-auto findOffset(Range&& _range, Value&& _value, void*)
--> decltype(std::find(std::begin(_range), std::end(_range), std::forward<Value>(_value)) == std::end(_range), std::optional<size_t>())
-{
-	auto begin = std::begin(_range);
-	auto end = std::end(_range);
-	auto it = std::find(begin, end, std::forward<Value>(_value));
-	if (it == end)
-		return std::nullopt;
-	return std::distance(begin, it);
-}
-
-}
-
-/// @returns an std::optional<size_t> containing the offset of the first element in @a _range that is equal to @a _value,
-/// if any, or std::nullopt otherwise.
-/// Uses a linear search (``std::find``) unless @a _range is a container and provides a
-/// suitable ``.find`` function (e.g. it will use the logarithmic ``.find`` function in ``std::set`` instead).
-template<typename Range>
-auto findOffset(Range&& _range, std::remove_reference_t<decltype(*std::cbegin(_range))> const& _value)
--> decltype(detail::findOffset(std::forward<Range>(_range), _value, 0))
-{
-	return detail::findOffset(std::forward<Range>(_range), _value, 0);
-}
-
-// String conversion functions, mainly to/from hex/nibble/byte representations.
-
-enum class WhenError
-{
-	DontThrow = 0,
-	Throw = 1,
-};
-
-enum class HexPrefix
-{
-	DontAdd = 0,
-	Add = 1,
-};
-
-enum class HexCase
-{
-	Lower = 0,
-	Upper = 1,
-	Mixed = 2,
-};
-
-/// Convert a single byte to a string of hex characters (of length two),
-/// optionally with uppercase hex letters.
-std::string toHex(uint8_t _data, HexCase _case = HexCase::Lower);
-
-/// Convert a series of bytes to the corresponding string of hex duplets,
-/// optionally with "0x" prefix and with uppercase hex letters.
-std::string toHex(bytes const& _data, HexPrefix _prefix = HexPrefix::DontAdd, HexCase _case = HexCase::Lower);
-
-/// Converts a (printable) ASCII hex character into the corresponding integer value.
-/// @example fromHex('A') == 10 && fromHex('f') == 15 && fromHex('5') == 5
-int fromHex(char _i, WhenError _throw);
-
-/// Converts a (printable) ASCII hex string into the corresponding byte stream.
-/// @example fromHex("41626261") == asBytes("Abba")
-/// If _throw = ThrowType::DontThrow, it replaces bad hex characters with 0's, otherwise it will throw an exception.
-bytes fromHex(std::string const& _s, WhenError _throw = WhenError::DontThrow);
-/// Converts byte array to a string containing the same (binary) data. Unless
-/// the byte array happens to contain ASCII data, this won't be printable.
-inline std::string asString(bytes const& _b)
-{
-	return std::string((char const*)_b.data(), (char const*)(_b.data() + _b.size()));
-}
-
-/// Converts byte array ref to a string containing the same (binary) data. Unless
-/// the byte array happens to contain ASCII data, this won't be printable.
-inline std::string asString(bytesConstRef _b)
-{
-	return std::string((char const*)_b.data(), (char const*)(_b.data() + _b.size()));
-}
-
-/// Converts a string to a byte array containing the string's (byte) data.
-inline bytes asBytes(std::string const& _b)
-{
-	return bytes((uint8_t const*)_b.data(), (uint8_t const*)(_b.data() + _b.size()));
-}
-
-template <class T, class V>
-bool contains(T const& _t, V const& _v)
-{
-	return std::end(_t) != std::find(std::begin(_t), std::end(_t), _v);
-}
-
-template <class T, class Predicate>
-bool contains_if(T const& _t, Predicate const& _p)
-{
-	return std::end(_t) != std::find_if(std::begin(_t), std::end(_t), _p);
-}
-
-/// Function that iterates over a vector, calling a function on each of its
-/// elements. If that function returns a vector, the element is replaced by
-/// the returned vector. During the iteration, the original vector is only valid
-/// on the current element and after that. The actual replacement takes
-/// place at the end, but already visited elements might be invalidated.
-/// If nothing is replaced, no copy is performed.
-template <typename T, typename F>
-void iterateReplacing(std::vector<T>& _vector, F const& _f)
-{
-	// Concept: _f must be Callable, must accept param T&, must return optional<vector<T>>
-	bool useModified = false;
-	std::vector<T> modifiedVector;
-	for (size_t i = 0; i < _vector.size(); ++i)
-	{
-		if (std::optional<std::vector<T>> r = _f(_vector[i]))
-		{
-			if (!useModified)
-			{
-				std::move(_vector.begin(), _vector.begin() + ptrdiff_t(i), back_inserter(modifiedVector));
-				useModified = true;
-			}
-			modifiedVector += std::move(*r);
-		}
-		else if (useModified)
-			modifiedVector.emplace_back(std::move(_vector[i]));
-	}
-	if (useModified)
-		_vector = std::move(modifiedVector);
-}
-
-namespace detail
-{
-template <typename T, typename F, std::size_t... I>
-void iterateReplacingWindow(std::vector<T>& _vector, F const& _f, std::index_sequence<I...>)
-{
-	// Concept: _f must be Callable, must accept sizeof...(I) parameters of type T&, must return optional<vector<T>>
-	bool useModified = false;
-	std::vector<T> modifiedVector;
-	size_t i = 0;
-	for (; i + sizeof...(I) <= _vector.size(); ++i)
-	{
-		if (std::optional<std::vector<T>> r = _f(_vector[i + I]...))
-		{
-			if (!useModified)
-			{
-				std::move(_vector.begin(), _vector.begin() + ptrdiff_t(i), back_inserter(modifiedVector));
-				useModified = true;
-			}
-			modifiedVector += std::move(*r);
-			i += sizeof...(I) - 1;
-		}
-		else if (useModified)
-			modifiedVector.emplace_back(std::move(_vector[i]));
-	}
-	if (useModified)
-	{
-		for (; i < _vector.size(); ++i)
-			modifiedVector.emplace_back(std::move(_vector[i]));
-		_vector = std::move(modifiedVector);
-	}
-}
-
-}
-
-/// Function that iterates over the vector @param _vector,
-/// calling the function @param _f on sequences of @tparam N of its
-/// elements. If @param _f returns a vector, these elements are replaced by
-/// the returned vector and the iteration continues with the next @tparam N elements.
-/// If the function does not return a vector, the iteration continues with an overlapping
-/// sequence of @tparam N elements that starts with the second element of the previous
-/// iteration.
-/// During the iteration, the original vector is only valid
-/// on the current element and after that. The actual replacement takes
-/// place at the end, but already visited elements might be invalidated.
-/// If nothing is replaced, no copy is performed.
-template <std::size_t N, typename T, typename F>
-void iterateReplacingWindow(std::vector<T>& _vector, F const& _f)
-{
-	// Concept: _f must be Callable, must accept N parameters of type T&, must return optional<vector<T>>
-	detail::iterateReplacingWindow(_vector, _f, std::make_index_sequence<N>{});
-}
-
-/// @returns true iff @a _str passess the hex address checksum test.
-/// @param _strict if false, hex strings with only uppercase or only lowercase letters
-/// are considered valid.
-bool passesAddressChecksum(std::string const& _str, bool _strict);
-
-/// @returns the checksummed version of an address
-/// @param hex strings that look like an address
-std::string getChecksummedAddress(std::string const& _addr);
-
-bool isValidHex(std::string const& _string);
-bool isValidDecimal(std::string const& _string);
-
-/// @returns a quoted string if all characters are printable ASCII chars,
-/// or its hex representation otherwise.
-/// _value cannot be longer than 32 bytes.
-std::string formatAsStringOrNumber(std::string const& _value);
-
-/// @returns a string with the usual backslash-escapes for non-printable and non-ASCII
-/// characters and surrounded by '"'-characters.
-std::string escapeAndQuoteString(std::string const& _input);
-
-template<typename Container, typename Compare>
-bool containerEqual(Container const& _lhs, Container const& _rhs, Compare&& _compare)
-{
-	return std::equal(std::begin(_lhs), std::end(_lhs), std::begin(_rhs), std::end(_rhs), std::forward<Compare>(_compare));
-}
-
-inline std::string findAnyOf(std::string const& _haystack, std::vector<std::string> const& _needles)
-{
-	for (std::string const& needle: _needles)
-		if (_haystack.find(needle) != std::string::npos)
-			return needle;
-	return "";
-}
-
-
-namespace detail
-{
-template<typename T>
-void variadicEmplaceBack(std::vector<T>&) {}
-template<typename T, typename A, typename... Args>
-void variadicEmplaceBack(std::vector<T>& _vector, A&& _a, Args&&... _args)
-{
-	_vector.emplace_back(std::forward<A>(_a));
-	variadicEmplaceBack(_vector, std::forward<Args>(_args)...);
-}
-}
-
-template<typename T, typename... Args>
-std::vector<T> make_vector(Args&&... _args)
-{
-	std::vector<T> result;
-	result.reserve(sizeof...(_args));
-	detail::variadicEmplaceBack(result, std::forward<Args>(_args)...);
-	return result;
-}
-
-}
diff --git a/libsolutil/CommonIO.cpp b/libsolutil/CommonIO.cpp
deleted file mode 100644
index 06ce23a02401..000000000000
--- a/libsolutil/CommonIO.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file CommonIO.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Assertions.h>
-
-#include <fstream>
-#if defined(_WIN32)
-#include <windows.h>
-#else
-#include <unistd.h>
-#include <termios.h>
-#endif
-
-using namespace solidity::util;
-
-namespace
-{
-
-template <typename T>
-inline T readFile(boost::filesystem::path const& _file)
-{
-	assertThrow(boost::filesystem::exists(_file), FileNotFound, _file.string());
-
-	// ifstream does not always fail when the path leads to a directory. Instead it might succeed
-	// with tellg() returning a nonsensical value so that std::length_error gets raised in resize().
-	assertThrow(boost::filesystem::is_regular_file(_file), NotAFile, _file.string());
-
-	T ret;
-	size_t const c_elementSize = sizeof(typename T::value_type);
-	std::ifstream is(_file.string(), std::ifstream::binary);
-
-	// Technically, this can still fail even though we checked above because FS content can change at any time.
-	assertThrow(is, FileNotFound, _file.string());
-
-	// get length of file:
-	is.seekg(0, is.end);
-	std::streamoff length = is.tellg();
-	if (length == 0)
-		return ret; // do not read empty file (MSVC does not like it)
-	is.seekg(0, is.beg);
-
-	ret.resize((static_cast<size_t>(length) + c_elementSize - 1) / c_elementSize);
-	is.read(const_cast<char*>(reinterpret_cast<char const*>(ret.data())), static_cast<std::streamsize>(length));
-	return ret;
-}
-
-}
-
-std::string solidity::util::readFileAsString(boost::filesystem::path const& _file)
-{
-	return readFile<std::string>(_file);
-}
-
-std::string solidity::util::readUntilEnd(std::istream& _stdin)
-{
-	std::ostringstream ss;
-	ss << _stdin.rdbuf();
-	return ss.str();
-}
-
-std::string solidity::util::readBytes(std::istream& _input, size_t _length)
-{
-	std::string output;
-	output.resize(_length);
-	_input.read(output.data(), static_cast<std::streamsize>(_length));
-	// If read() reads fewer bytes it sets failbit in addition to eofbit.
-	if (_input.fail())
-		output.resize(static_cast<size_t>(_input.gcount()));
-	return output;
-}
-
-#if defined(_WIN32)
-class DisableConsoleBuffering
-{
-public:
-	DisableConsoleBuffering()
-	{
-		m_stdin = GetStdHandle(STD_INPUT_HANDLE);
-		GetConsoleMode(m_stdin, &m_oldMode);
-		SetConsoleMode(m_stdin, m_oldMode & (~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT)));
-	}
-	~DisableConsoleBuffering()
-	{
-		SetConsoleMode(m_stdin, m_oldMode);
-	}
-private:
-	HANDLE m_stdin;
-	DWORD m_oldMode;
-};
-#else
-class DisableConsoleBuffering
-{
-public:
-	DisableConsoleBuffering()
-	{
-		tcgetattr(0, &m_termios);
-		m_termios.c_lflag &= ~tcflag_t(ICANON);
-		m_termios.c_lflag &= ~tcflag_t(ECHO);
-		m_termios.c_cc[VMIN] = 1;
-		m_termios.c_cc[VTIME] = 0;
-		tcsetattr(0, TCSANOW, &m_termios);
-	}
-	~DisableConsoleBuffering()
-	{
-		m_termios.c_lflag |= ICANON;
-		m_termios.c_lflag |= ECHO;
-		tcsetattr(0, TCSADRAIN, &m_termios);
-	}
-private:
-	struct termios m_termios;
-};
-#endif
-
-int solidity::util::readStandardInputChar()
-{
-	DisableConsoleBuffering disableConsoleBuffering;
-	return std::cin.get();
-}
-
-std::string solidity::util::absolutePath(std::string const& _path, std::string const& _reference)
-{
-	boost::filesystem::path p(_path);
-	// Anything that does not start with `.` is an absolute path.
-	if (p.begin() == p.end() || (*p.begin() != "." && *p.begin() != ".."))
-		return _path;
-	boost::filesystem::path result(_reference);
-
-	// If filename is "/", then remove_filename() throws.
-	// See: https://github.com/boostorg/filesystem/issues/176
-	if (result.filename() != boost::filesystem::path("/"))
-		result.remove_filename();
-	for (boost::filesystem::path::iterator it = p.begin(); it != p.end(); ++it)
-		if (*it == "..")
-			result = result.parent_path();
-		else if (*it != ".")
-			result /= *it;
-	return result.generic_string();
-}
-
-std::string solidity::util::sanitizePath(std::string const& _path) {
-	return boost::filesystem::path(_path).generic_string();
-}
diff --git a/libsolutil/CommonIO.h b/libsolutil/CommonIO.h
deleted file mode 100644
index e6cd0c1616bb..000000000000
--- a/libsolutil/CommonIO.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file CommonIO.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * File & stream I/O routines.
- */
-
-#pragma once
-
-#include <boost/filesystem.hpp>
-
-#include <libsolutil/Common.h>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace solidity
-{
-
-inline std::ostream& operator<<(std::ostream& os, bytes const& _bytes)
-{
-	std::ostringstream ss;
-	ss << std::hex;
-	std::copy(_bytes.begin(), _bytes.end(), std::ostream_iterator<int>(ss, ","));
-	std::string result = ss.str();
-	result.pop_back();
-	os << "[" + result + "]";
-	return os;
-}
-
-namespace util
-{
-
-/// Retrieves and returns the contents of the given file as a std::string.
-/// If the file doesn't exist, it will throw a FileNotFound exception.
-/// If the file exists but is not a regular file, it will throw NotAFile exception.
-/// If the file is empty, returns an empty string.
-std::string readFileAsString(boost::filesystem::path const& _file);
-
-/// Retrieves and returns the whole content of the specified input stream (until EOF).
-std::string readUntilEnd(std::istream& _stdin);
-
-/// Tries to read exactly @a _length bytes from @a _input.
-/// Returns a string containing as much data as has been read.
-std::string readBytes(std::istream& _input, size_t _length);
-
-/// Retrieves and returns a character from standard input (without waiting for EOL).
-int readStandardInputChar();
-
-/// Converts arbitrary value to string representation using std::stringstream.
-template <class T>
-std::string toString(T const& _t)
-{
-	std::ostringstream o;
-	o << _t;
-	return o.str();
-}
-
-/// @returns the absolute path corresponding to @a _path relative to @a _reference.
-std::string absolutePath(std::string const& _path, std::string const& _reference);
-
-/// Helper function to return path converted strings.
-std::string sanitizePath(std::string const& _path);
-
-}
-}
diff --git a/libsolutil/ErrorCodes.h b/libsolutil/ErrorCodes.h
deleted file mode 100644
index bc11041a6f01..000000000000
--- a/libsolutil/ErrorCodes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <string>
-
-namespace solidity::util
-{
-
-enum class PanicCode
-{
-	Generic = 0x00, // generic / unspecified error
-	Assert = 0x01, // used by the assert() builtin
-	UnderOverflow = 0x11, // arithmetic underflow or overflow
-	DivisionByZero = 0x12, // division or modulo by zero
-	EnumConversionError = 0x21, // enum conversion error
-	StorageEncodingError = 0x22, // invalid encoding in storage
-	EmptyArrayPop = 0x31, // empty array pop
-	ArrayOutOfBounds = 0x32, // array out of bounds access
-	ResourceError = 0x41, // resource error (too large allocation or too large array)
-	InvalidInternalFunction = 0x51, // calling invalid internal function
-};
-
-}
diff --git a/libsolutil/Exceptions.cpp b/libsolutil/Exceptions.cpp
deleted file mode 100644
index 00fe3e26ce92..000000000000
--- a/libsolutil/Exceptions.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/Exceptions.h>
-
-using namespace solidity::util;
-
-char const* Exception::what() const noexcept
-{
-	// Return the comment if available.
-	if (std::string const* cmt = comment())
-		return cmt->data();
-
-	// Fallback to base what().
-	// Boost accepts nullptr, but the C++ standard doesn't
-	// and crashes on some platforms.
-	return std::exception::what();
-}
-
-std::string Exception::lineInfo() const
-{
-	char const* const* file = boost::get_error_info<boost::throw_file>(*this);
-	int const* line = boost::get_error_info<boost::throw_line>(*this);
-	std::string ret;
-	if (file)
-		ret += *file;
-	ret += ':';
-	if (line)
-		ret += std::to_string(*line);
-	return ret;
-}
-
-std::string const* Exception::comment() const noexcept
-{
-	return boost::get_error_info<errinfo_comment>(*this);
-}
diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
deleted file mode 100644
index 9d73a0012eb4..000000000000
--- a/libsolutil/Exceptions.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <boost/exception/exception.hpp>
-#include <boost/exception/info.hpp>
-#include <boost/exception/info_tuple.hpp>
-#include <boost/exception/diagnostic_information.hpp>
-
-#include <exception>
-#include <string>
-
-namespace solidity::util
-{
-
-/// Base class for all exceptions.
-struct Exception: virtual std::exception, virtual boost::exception
-{
-	char const* what() const noexcept override;
-
-	/// @returns "FileName:LineNumber" referring to the point where the exception was thrown.
-	std::string lineInfo() const;
-
-	/// @returns the errinfo_comment of this exception.
-	std::string const* comment() const noexcept;
-};
-
-/// Throws an exception with a given description and extra information about the location the
-/// exception was thrown from.
-/// @param _exceptionType The type of the exception to throw (not an instance).
-/// @param _description The message that describes the error.
-#define solThrow(_exceptionType, _description) \
-	::boost::throw_exception( \
-		_exceptionType() << \
-		::solidity::util::errinfo_comment((_description)) << \
-		::boost::throw_function(ETH_FUNC) << \
-		::boost::throw_file(__FILE__) << \
-		::boost::throw_line(__LINE__) \
-	)
-
-/// Throws an exception if condition is not met with a given description and extra information about the location the
-/// exception was thrown from.
-/// @param _condition if condition is not met, specified exception will be thrown.
-/// @param _exceptionType The type of the exception to throw (not an instance).
-/// @param _description The message that describes the error.
-#define solRequire(_condition, _exceptionType, _description) \
-	if (!(_condition)) \
-		solThrow(_exceptionType, (_description))
-
-/// Defines an exception type that's meant to signal a specific condition and be caught rather than
-/// unwind the stack all the way to the top-level exception handler and interrupt the program.
-/// As such it does not carry a message - the code catching it is expected to handle it without
-/// letting it escape.
-#define DEV_SIMPLE_EXCEPTION(X) struct X: virtual ::solidity::util::Exception { const char* what() const noexcept override { return #X; } }
-
-DEV_SIMPLE_EXCEPTION(InvalidAddress);
-DEV_SIMPLE_EXCEPTION(BadHexCharacter);
-DEV_SIMPLE_EXCEPTION(BadHexCase);
-DEV_SIMPLE_EXCEPTION(FileNotFound);
-DEV_SIMPLE_EXCEPTION(NotAFile);
-DEV_SIMPLE_EXCEPTION(DataTooLong);
-DEV_SIMPLE_EXCEPTION(StringTooLong);
-
-// error information to be added to exceptions
-using errinfo_comment = boost::error_info<struct tag_comment, std::string>;
-
-}
diff --git a/libsolutil/FixedHash.h b/libsolutil/FixedHash.h
deleted file mode 100644
index c4c72e9eb78a..000000000000
--- a/libsolutil/FixedHash.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file FixedHash.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * The FixedHash fixed-size "hash" container type.
- */
-
-#pragma once
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-
-#include <boost/functional/hash.hpp>
-#include <boost/io/ios_state.hpp>
-
-#include <array>
-#include <cstdint>
-#include <algorithm>
-
-namespace solidity::util
-{
-
-/// Fixed-size raw-byte array container type, with an API optimised for storing hashes.
-/// Transparently converts to/from the corresponding arithmetic type; this will
-/// assume the data contained in the hash is big-endian.
-template <unsigned N>
-class FixedHash
-{
-public:
-	/// The corresponding arithmetic type.
-	using Arith = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
-
-	/// The size of the container.
-	enum { size = N };
-	static_assert(N != 0);
-
-	/// Method to convert from a string.
-	enum ConstructFromStringType { FromHex, FromBinary };
-
-	/// Method to convert from a string.
-	enum ConstructFromHashType { AlignLeft, AlignRight, FailIfDifferent };
-
-	/// Construct an empty hash.
-	explicit FixedHash() { m_data.fill(0); }
-
-	/// Construct from another hash, filling with zeroes or cropping as necessary.
-	template <unsigned M> explicit FixedHash(FixedHash<M> const& _h, ConstructFromHashType _t)
-	{
-		m_data.fill(0);
-		unsigned c = std::min(M, N);
-		for (unsigned i = 0; i < c; ++i)
-			m_data[_t == AlignRight ? N - 1 - i : i] = _h[_t == AlignRight ? M - 1 - i : i];
-	}
-
-	/// Convert from the corresponding arithmetic type.
-	FixedHash(Arith const& _arith) { toBigEndian(_arith, m_data); }
-
-	/// Explicitly construct, copying from a byte array.
-	explicit FixedHash(bytes const& _array, ConstructFromHashType _sizeMismatchBehavior = FailIfDifferent)
-	{
-		if (_array.size() == N)
-			memcpy(m_data.data(), _array.data(), _array.size());
-		else
-		{
-			m_data.fill(0);
-			if (_sizeMismatchBehavior != FailIfDifferent)
-			{
-				auto bytesToCopy = std::min<size_t>(_array.size(), N);
-				for (size_t i = 0; i < bytesToCopy; ++i)
-					if (_sizeMismatchBehavior == AlignRight)
-						m_data[N - 1 - i] = _array[_array.size() - 1 - i];
-					else
-						m_data[i] = _array[i];
-			}
-		}
-	}
-
-	/// Explicitly construct, copying from a byte array.
-	explicit FixedHash(bytesConstRef _b, ConstructFromHashType _t = FailIfDifferent)
-	{
-		if (_b.size() == N)
-			memcpy(m_data.data(), _b.data(), std::min<size_t>(_b.size(), N));
-		else
-		{
-			m_data.fill(0);
-			if (_t != FailIfDifferent)
-			{
-				auto c = std::min<size_t>(_b.size(), N);
-				for (size_t i = 0; i < c; ++i)
-					if (_t == AlignRight)
-						m_data[N - 1 - i] = _b[_b.size() - 1 - i];
-					else
-						m_data[i] = _b[i];
-			}
-		}
-	}
-
-	/// Explicitly construct, copying from a string.
-	explicit FixedHash(std::string const& _s, ConstructFromStringType _t = FromHex, ConstructFromHashType _ht = FailIfDifferent):
-		FixedHash(_t == FromHex ? fromHex(_s, WhenError::Throw) : solidity::util::asBytes(_s), _ht)
-	{}
-
-	/// Convert to arithmetic type.
-	operator Arith() const { return fromBigEndian<Arith>(m_data); }
-
-	// The obvious comparison operators.
-	bool operator==(FixedHash const& _c) const { return m_data == _c.m_data; }
-	bool operator!=(FixedHash const& _c) const { return m_data != _c.m_data; }
-	/// Required to sort objects of this type or use them as map keys.
-	bool operator<(FixedHash const& _c) const {
-		for (unsigned i = 0; i < N; ++i)
-		{
-			if (m_data[i] < _c.m_data[i])
-				return true;
-			else if (m_data[i] > _c.m_data[i])
-				return false;
-		}
-		return false;
-	}
-
-	/// @returns a particular byte from the hash.
-	uint8_t& operator[](unsigned _i) { return m_data[_i]; }
-	/// @returns a particular byte from the hash.
-	uint8_t operator[](unsigned _i) const { return m_data[_i]; }
-
-	/// @returns the hash as a user-readable hex string.
-	std::string hex() const { return toHex(asBytes()); }
-
-	/// @returns a mutable byte vector_ref to the object's data.
-	bytesRef ref() { return bytesRef(m_data.data(), N); }
-
-	/// @returns a constant byte vector_ref to the object's data.
-	bytesConstRef ref() const { return bytesConstRef(m_data.data(), N); }
-
-	/// @returns a mutable byte pointer to the object's data.
-	uint8_t* data() { return m_data.data(); }
-
-	/// @returns a constant byte pointer to the object's data.
-	uint8_t const* data() const { return m_data.data(); }
-
-	/// @returns a copy of the object's data as a byte vector.
-	bytes asBytes() const { return bytes(data(), data() + N); }
-
-private:
-	std::array<uint8_t, N> m_data;		///< The binary data.
-};
-
-/// Stream I/O for the FixedHash class.
-template <unsigned N>
-inline std::ostream& operator<<(std::ostream& _out, FixedHash<N> const& _h)
-{
-	boost::io::ios_all_saver guard(_out);
-	_out << std::noshowbase << std::hex << std::setfill('0');
-	for (unsigned i = 0; i < N; ++i)
-		_out << std::setw(2) << (int)_h[i];
-	_out << std::dec;
-	return _out;
-}
-
-// Common types of FixedHash.
-using h256 = FixedHash<32>;
-using h160 = FixedHash<20>;
-
-}
diff --git a/libsolutil/FunctionSelector.h b/libsolutil/FunctionSelector.h
deleted file mode 100644
index 2712f6bad71f..000000000000
--- a/libsolutil/FunctionSelector.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/FixedHash.h>
-
-#include <string>
-
-namespace solidity::util
-{
-
-/// @returns the ABI selector for a given function signature, as a FixedHash h32.
-inline FixedHash<4> selectorFromSignatureH32(std::string const& _signature)
-{
-	return FixedHash<4>(util::keccak256(_signature), FixedHash<4>::AlignLeft);
-}
-
-/// @returns the ABI selector for a given function signature, as a 32 bit number.
-inline uint32_t selectorFromSignatureU32(std::string const& _signature)
-{
-	return uint32_t(FixedHash<4>::Arith(selectorFromSignatureH32(_signature)));
-}
-
-/// @returns the ABI selector for a given function signature, as a u256 (left aligned) number.
-inline u256 selectorFromSignatureU256(std::string const& _signature)
-{
-	return u256(selectorFromSignatureU32(_signature)) << (256 - 32);
-}
-
-}
diff --git a/libsolutil/IpfsHash.cpp b/libsolutil/IpfsHash.cpp
deleted file mode 100644
index 3599b7121830..000000000000
--- a/libsolutil/IpfsHash.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/IpfsHash.h>
-
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/picosha2.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-
-using namespace solidity;
-using namespace solidity::util;
-
-namespace
-{
-bytes varintEncoding(size_t _n)
-{
-	bytes encoded;
-	while (_n > 0x7f)
-	{
-		encoded.emplace_back(uint8_t(0x80 | (_n & 0x7f)));
-		_n >>= 7;
-	}
-	encoded.emplace_back(_n);
-	return encoded;
-}
-
-bytes encodeByteArray(bytes const& _data)
-{
-	return bytes{0x0a} + varintEncoding(_data.size()) + _data;
-}
-
-bytes encodeHash(bytes const& _data)
-{
-	return bytes{0x12, 0x20} + picosha2::hash256(_data);
-}
-
-bytes encodeLinkData(bytes const& _data)
-{
-	return bytes{0x12} + varintEncoding(_data.size()) + _data;
-}
-
-std::string base58Encode(bytes const& _data)
-{
-	static std::string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"};
-	bigint data(util::toHex(_data, HexPrefix::Add));
-	std::string output;
-	while (data)
-	{
-		output += alphabet[static_cast<size_t>(data % alphabet.size())];
-		data /= alphabet.size();
-	}
-	reverse(output.begin(), output.end());
-	return output;
-}
-
-struct Chunk
-{
-	Chunk() = default;
-	Chunk(bytes _hash, size_t _size, size_t _blockSize):
-		hash(std::move(_hash)),
-		size(_size),
-		blockSize(_blockSize)
-	{}
-
-	bytes hash = {};
-	size_t size = 0;
-	size_t blockSize = 0;
-};
-
-using Chunks = std::vector<Chunk>;
-
-Chunk combineLinks(Chunks& _links)
-{
-	bytes data = {};
-	bytes lengths = {};
-	Chunk chunk = {};
-	for (Chunk& link: _links)
-	{
-		chunk.size += link.size;
-		chunk.blockSize += link.blockSize;
-
-		data += encodeLinkData(
-			bytes {0x0a} +
-			varintEncoding(link.hash.size()) +
-			std::move(link.hash) +
-			bytes{0x12, 0x00, 0x18} +
-			varintEncoding(link.blockSize)
-		);
-
-		lengths += bytes{0x20} + varintEncoding(link.size);
-	}
-
-	bytes blockData = data + encodeByteArray(bytes{0x08, 0x02, 0x18} + varintEncoding(chunk.size) + lengths);
-
-	chunk.blockSize += blockData.size();
-	chunk.hash = encodeHash(blockData);
-
-	return chunk;
-}
-
-Chunks buildNextLevel(Chunks& _currentLevel)
-{
-	size_t const maxChildNum = 174;
-
-	Chunks nextLevel;
-	Chunks links;
-
-	for (Chunk& chunk: _currentLevel)
-	{
-		links.emplace_back(std::move(chunk.hash), chunk.size, chunk.blockSize);
-		if (links.size() == maxChildNum)
-		{
-			nextLevel.emplace_back(combineLinks(links));
-			links = {};
-		}
-	}
-	if (!links.empty())
-		nextLevel.emplace_back(combineLinks(links));
-
-	return nextLevel;
-}
-
-/// Builds a tree starting from the bottom level where nodes are data nodes.
-/// Data nodes should be calculated and passed as the only level in chunk levels
-/// Each next level is calculated as following:
-///   - Pick up to maxChildNum (174) nodes until a whole level is added, group them and pass to the node in the next level
-///   - Do this until the current level has only one node, return the hash in that node
-bytes groupChunksBottomUp(Chunks _currentLevel)
-{
-	// when we reach root it will be the only node in that level
-	while (_currentLevel.size() != 1)
-		_currentLevel = buildNextLevel(_currentLevel);
-
-	// top level's only node stores the hash for file
-	return _currentLevel.front().hash;
-}
-}
-
-bytes solidity::util::ipfsHash(std::string _data)
-{
-	size_t const maxChunkSize = 1024 * 256;
-	size_t chunkCount = _data.length() / maxChunkSize + (_data.length() % maxChunkSize > 0 ? 1 : 0);
-	chunkCount = chunkCount == 0 ? 1 : chunkCount;
-
-	Chunks allChunks;
-
-	for (size_t chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++)
-	{
-		bytes chunkBytes = asBytes(
-			_data.substr(chunkIndex * maxChunkSize, std::min(maxChunkSize, _data.length() - chunkIndex * maxChunkSize))
-		);
-
-		bytes lengthAsVarint = varintEncoding(chunkBytes.size());
-
-		bytes protobufEncodedData;
-		// Type: File
-		protobufEncodedData += bytes{0x08, 0x02};
-		if (!chunkBytes.empty())
-		{
-			// Data (length delimited bytes)
-			protobufEncodedData += bytes{0x12};
-			protobufEncodedData += lengthAsVarint;
-			protobufEncodedData += chunkBytes;
-		}
-		// filesize: length as varint
-		protobufEncodedData += bytes{0x18} + lengthAsVarint;
-
-		// PBDag:
-		// Data: (length delimited bytes)
-		bytes blockData = encodeByteArray(protobufEncodedData);
-
-		// Multihash: sha2-256, 256 bits
-		allChunks.emplace_back(
-			encodeHash(blockData),
-			chunkBytes.size(),
-			blockData.size()
-		);
-	}
-
-	return groupChunksBottomUp(std::move(allChunks));
-}
-
-std::string solidity::util::ipfsHashBase58(std::string _data)
-{
-	return base58Encode(ipfsHash(std::move(_data)));
-}
diff --git a/libsolutil/IpfsHash.h b/libsolutil/IpfsHash.h
deleted file mode 100644
index 977fb9836ba7..000000000000
--- a/libsolutil/IpfsHash.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Common.h>
-
-#include <string>
-
-namespace solidity::util
-{
-
-/// Compute the "ipfs hash" of a file with the content @a _data.
-/// The output will be the multihash of the UnixFS protobuf encoded data.
-/// As hash function it will use sha2-256.
-/// The effect is that the hash should be identical to the one produced by
-/// the command `ipfs add <filename>`.
-bytes ipfsHash(std::string _data);
-
-/// Compute the "ipfs hash" as above, but encoded in base58 as used by ipfs / bitcoin.
-std::string ipfsHashBase58(std::string _data);
-
-}
diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
deleted file mode 100644
index ea75ada0f79f..000000000000
--- a/libsolutil/JSON.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file JSON.cpp
- * @author Alexander Arlt <alexander.arlt@arlt-labs.com>
- * @date 2018
- */
-
-#include <libsolutil/JSON.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/algorithm/string/replace.hpp>
-
-#include <sstream>
-#include <map>
-#include <memory>
-
-static_assert(
-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
-);
-
-namespace solidity::util
-{
-
-namespace
-{
-
-/// StreamWriterBuilder that can be constructed with specific settings
-class StreamWriterBuilder: public Json::StreamWriterBuilder
-{
-public:
-	explicit StreamWriterBuilder(std::map<std::string, Json::Value> const& _settings)
-	{
-		for (auto const& iter: _settings)
-			this->settings_[iter.first] = iter.second;
-	}
-};
-
-/// CharReaderBuilder with strict-mode settings
-class StrictModeCharReaderBuilder: public Json::CharReaderBuilder
-{
-public:
-	StrictModeCharReaderBuilder()
-	{
-		Json::CharReaderBuilder::strictMode(&this->settings_);
-	}
-};
-
-/// Serialise the JSON object (@a _input) with specific builder (@a _builder)
-/// \param _input JSON input string
-/// \param _builder StreamWriterBuilder that is used to create new Json::StreamWriter
-/// \return serialized json object
-std::string print(Json::Value const& _input, Json::StreamWriterBuilder const& _builder)
-{
-	std::stringstream stream;
-	std::unique_ptr<Json::StreamWriter> writer(_builder.newStreamWriter());
-	writer->write(_input, &stream);
-	return stream.str();
-}
-
-/// Parse a JSON string (@a _input) with specified builder (@ _builder) and writes resulting JSON object to (@a _json)
-/// \param _builder CharReaderBuilder that is used to create new Json::CharReaders
-/// \param _input JSON input string
-/// \param _json [out] resulting JSON object
-/// \param _errs [out] Formatted error messages
-/// \return \c true if the document was successfully parsed, \c false if an error occurred.
-bool parse(Json::CharReaderBuilder& _builder, std::string const& _input, Json::Value& _json, std::string* _errs)
-{
-	std::unique_ptr<Json::CharReader> reader(_builder.newCharReader());
-	return reader->parse(_input.c_str(), _input.c_str() + _input.length(), &_json, _errs);
-}
-
-/// Takes a JSON value (@ _json) and removes all its members with value 'null' recursively.
-void removeNullMembersHelper(Json::Value& _json)
-{
-	if (_json.type() == Json::ValueType::arrayValue)
-		for (auto& child: _json)
-			removeNullMembersHelper(child);
-	else if (_json.type() == Json::ValueType::objectValue)
-		for (auto const& key: _json.getMemberNames())
-		{
-			Json::Value& value = _json[key];
-			if (value.isNull())
-				_json.removeMember(key);
-			else
-				removeNullMembersHelper(value);
-		}
-}
-
-} // end anonymous namespace
-
-Json::Value removeNullMembers(Json::Value _json)
-{
-	removeNullMembersHelper(_json);
-	return _json;
-}
-
-std::string jsonPrettyPrint(Json::Value const& _input)
-{
-	return jsonPrint(_input, JsonFormat{ JsonFormat::Pretty });
-}
-
-std::string jsonCompactPrint(Json::Value const& _input)
-{
-	return jsonPrint(_input, JsonFormat{ JsonFormat::Compact });
-}
-
-std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format)
-{
-	std::map<std::string, Json::Value> settings;
-	if (_format.format == JsonFormat::Pretty)
-	{
-		settings["indentation"] = std::string(_format.indent, ' ');
-		settings["enableYAMLCompatibility"] = true;
-	}
-	else
-		settings["indentation"] = "";
-	StreamWriterBuilder writerBuilder(settings);
-	std::string result = print(_input, writerBuilder);
-	if (_format.format == JsonFormat::Pretty)
-		boost::replace_all(result, " \n", "\n");
-	return result;
-}
-
-bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs /* = nullptr */)
-{
-	static StrictModeCharReaderBuilder readerBuilder;
-	return parse(readerBuilder, _input, _json, _errs);
-}
-
-std::optional<Json::Value> jsonValueByPath(Json::Value const& _node, std::string_view _jsonPath)
-{
-	if (!_node.isObject() || _jsonPath.empty())
-		return {};
-
-	std::string memberName = std::string(_jsonPath.substr(0, _jsonPath.find_first_of('.')));
-	if (!_node.isMember(memberName))
-		return {};
-
-	if (memberName == _jsonPath)
-		return _node[memberName];
-
-	return jsonValueByPath(_node[memberName], _jsonPath.substr(memberName.size() + 1));
-}
-
-} // namespace solidity::util
diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h
deleted file mode 100644
index f368739e1a99..000000000000
--- a/libsolutil/JSON.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file JSON.h
- * @date 2016
- *
- * JSON related helpers
- */
-
-#pragma once
-
-#include <json/json.h>
-
-#include <string>
-#include <string_view>
-#include <optional>
-
-namespace solidity::util
-{
-
-/// Removes members with null value recursively from (@a _json).
-Json::Value removeNullMembers(Json::Value _json);
-
-/// JSON printing format.
-struct JsonFormat
-{
-	enum Format
-	{
-		Compact, // No unnecessary whitespace (including new lines and indentation)
-		Pretty,  // Nicely indented, with new lines
-	};
-
-	static constexpr uint32_t defaultIndent = 2;
-
-	bool operator==(JsonFormat const& _other) const noexcept { return (format == _other.format) && (indent == _other.indent); }
-	bool operator!=(JsonFormat const& _other) const noexcept { return !(*this == _other); }
-
-	Format format = Compact;
-	uint32_t indent = defaultIndent;
-};
-
-/// Serialise the JSON object (@a _input) with indentation
-std::string jsonPrettyPrint(Json::Value const& _input);
-
-/// Serialise the JSON object (@a _input) without indentation
-std::string jsonCompactPrint(Json::Value const& _input);
-
-/// Serialise the JSON object (@a _input) using specified format (@a _format)
-std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format);
-
-/// Parse a JSON string (@a _input) with enabled strict-mode and writes resulting JSON object to (@a _json)
-/// \param _input JSON input string
-/// \param _json [out] resulting JSON object
-/// \param _errs [out] Formatted error messages
-/// \return \c true if the document was successfully parsed, \c false if an error occurred.
-bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr);
-
-/// Retrieves the value specified by @p _jsonPath by from a series of nested JSON dictionaries.
-/// @param _jsonPath A dot-separated series of dictionary keys.
-/// @param _node The node representing the start of the path.
-/// @returns The value of the last key on the path. @a nullptr if any node on the path descends
-/// into something that is not a dictionary or the key is not present.
-std::optional<Json::Value> jsonValueByPath(Json::Value const& _node, std::string_view _jsonPath);
-
-namespace detail
-{
-
-template<typename T>
-struct helper;
-
-template<typename T, bool(Json::Value::*checkMember)() const, T(Json::Value::*convertMember)() const>
-struct helper_impl
-{
-	static bool isOfType(Json::Value const& _input)
-	{
-		return (_input.*checkMember)();
-	}
-	static T get(Json::Value const& _input)
-	{
-		return (_input.*convertMember)();
-	}
-	static T getOrDefault(Json::Value const& _input, T _default = {})
-	{
-		T result = _default;
-		if (isOfType(_input))
-			result = (_input.*convertMember)();
-		return result;
-	}
-};
-
-template<> struct helper<float>: helper_impl<float, &Json::Value::isDouble, &Json::Value::asFloat> {};
-template<> struct helper<double>: helper_impl<double, &Json::Value::isDouble, &Json::Value::asDouble> {};
-template<> struct helper<std::string>: helper_impl<std::string, &Json::Value::isString, &Json::Value::asString> {};
-template<> struct helper<Json::Int>: helper_impl<Json::Int, &Json::Value::isInt, &Json::Value::asInt> {};
-template<> struct helper<Json::Int64>: helper_impl<Json::Int64, &Json::Value::isInt64, &Json::Value::asInt64> {};
-template<> struct helper<Json::UInt>: helper_impl<Json::UInt, &Json::Value::isUInt, &Json::Value::asUInt> {};
-template<> struct helper<Json::UInt64>: helper_impl<Json::UInt64, &Json::Value::isUInt64, &Json::Value::asUInt64> {};
-
-} // namespace detail
-
-template<typename T>
-bool isOfType(Json::Value const& _input)
-{
-	return detail::helper<T>::isOfType(_input);
-}
-
-template<typename T>
-bool isOfTypeIfExists(Json::Value const& _input, std::string const& _name)
-{
-	if (_input.isMember(_name))
-		return isOfType<T>(_input[_name]);
-	return true;
-}
-
-template<typename T>
-T get(Json::Value const& _input)
-{
-	return detail::helper<T>::get(_input);
-}
-
-template<typename T>
-T getOrDefault(Json::Value const& _input, T _default = {})
-{
-	return detail::helper<T>::getOrDefault(_input, _default);
-}
-
-} // namespace solidity::util
diff --git a/libsolutil/Keccak256.cpp b/libsolutil/Keccak256.cpp
deleted file mode 100644
index c54dedabeb8f..000000000000
--- a/libsolutil/Keccak256.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file SHA3.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include <libsolutil/Keccak256.h>
-
-#include <cstdint>
-#include <cstring>
-
-namespace solidity::util
-{
-
-namespace
-{
-
-/** libkeccak-tiny
- *
- * A single-file implementation of SHA-3 and SHAKE.
- *
- * Implementor: David Leon Gil
- * License: CC0, attribution kindly requested. Blame taken too,
- * but not liability.
- */
-
-/******** The Keccak-f[1600] permutation ********/
-
-/*** Constants. ***/
-static uint8_t const rho[24] = \
-	{ 1,  3,   6, 10, 15, 21,
-	28, 36, 45, 55,  2, 14,
-	27, 41, 56,  8, 25, 43,
-	62, 18, 39, 61, 20, 44};
-static uint8_t const pi[24] = \
-	{10,  7, 11, 17, 18, 3,
-	5, 16,  8, 21, 24, 4,
-	15, 23, 19, 13, 12, 2,
-	20, 14, 22,  9, 6,  1};
-static uint64_t const RC[24] = \
-	{1ULL, 0x8082ULL, 0x800000000000808aULL, 0x8000000080008000ULL,
-	0x808bULL, 0x80000001ULL, 0x8000000080008081ULL, 0x8000000000008009ULL,
-	0x8aULL, 0x88ULL, 0x80008009ULL, 0x8000000aULL,
-	0x8000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL, 0x8000000000008003ULL,
-	0x8000000000008002ULL, 0x8000000000000080ULL, 0x800aULL, 0x800000008000000aULL,
-	0x8000000080008081ULL, 0x8000000000008080ULL, 0x80000001ULL, 0x8000000080008008ULL};
-
-/*** Helper macros to unroll the permutation. ***/
-#define rol(x, s) (((x) << s) | ((x) >> (64 - s)))
-#define REPEAT6(e) e e e e e e
-#define REPEAT24(e) REPEAT6(e e e e)
-#define REPEAT5(e) e e e e e
-#define FOR5(type, v, s, e) \
-	v = 0;            \
-	REPEAT5(e; v = static_cast<type>(v + s);)
-
-/*** Keccak-f[1600] ***/
-static inline void keccakf(void* state) {
-	auto* a = static_cast<uint64_t*>(state);
-	uint64_t b[5] = {0};
-
-	for (int i = 0; i < 24; i++)
-	{
-		uint8_t x, y;
-		// Theta
-		FOR5(uint8_t, x, 1,
-			b[x] = 0;
-			FOR5(uint8_t, y, 5,
-				b[x] ^= a[x + y]; ))
-		FOR5(uint8_t, x, 1,
-			FOR5(uint8_t, y, 5,
-				a[y + x] ^= b[(x + 4) % 5] ^ rol(b[(x + 1) % 5], 1); ))
-		// Rho and pi
-		uint64_t t = a[1];
-		x = 0;
-		REPEAT24(b[0] = a[pi[x]];
-				a[pi[x]] = rol(t, rho[x]);
-				t = b[0];
-				x++; )
-		// Chi
-		FOR5(uint8_t,
-			y,
-			5,
-			FOR5(uint8_t, x, 1,
-				b[x] = a[y + x];)
-			FOR5(uint8_t, x, 1,
-				a[y + x] = b[x] ^ ((~b[(x + 1) % 5]) & b[(x + 2) % 5]); ))
-		// Iota
-		a[0] ^= RC[i];
-	}
-}
-
-/******** The FIPS202-defined functions. ********/
-
-/*** Some helper macros. ***/
-
-#define _(S) do { S } while (0)
-#define FOR(i, ST, L, S) \
-	_(for (size_t i = 0; i < L; i += ST) { S; })
-#define mkapply_ds(NAME, S)                                          \
-	static inline void NAME(uint8_t* dst,                              \
-							uint8_t const* src,                        \
-							size_t len) {                              \
-		FOR(i, 1, len, S);                                               \
-	}
-#define mkapply_sd(NAME, S)                                          \
-	static inline void NAME(uint8_t const* src,                        \
-							uint8_t* dst,                              \
-							size_t len) {                              \
-		FOR(i, 1, len, S);                                               \
-	}
-
-mkapply_ds(xorin, dst[i] ^= src[i])  // xorin
-mkapply_sd(setout, dst[i] = src[i])  // setout
-
-#define P keccakf
-#define Plen 200
-
-// Fold P*F over the full blocks of an input.
-#define foldP(I, L, F) \
-	while (L >= rate) {  \
-		F(a, I, rate);     \
-		P(a);              \
-		I += rate;         \
-		L -= rate;         \
-	}
-
-/** The sponge-based hash construction. **/
-inline void hash(
-	uint8_t* out,
-	size_t outlen,
-	uint8_t const* in,
-	size_t inlen,
-	size_t rate,
-	uint8_t delim
-)
-{
-	uint8_t a[Plen] = {0};
-	// Absorb input.
-	foldP(in, inlen, xorin);
-	// Xor in the DS and pad frame.
-	a[inlen] ^= delim;
-	a[rate - 1] ^= 0x80;
-	// Xor in the last block.
-	xorin(a, in, inlen);
-	// Apply P
-	P(a);
-	// Squeeze output.
-	foldP(out, outlen, setout);
-	setout(a, out, outlen);
-	memset(a, 0, 200);
-}
-
-}
-
-h256 keccak256(bytesConstRef _input)
-{
-	h256 output;
-	// Parameters used:
-	// The 0x01 is the specific padding for keccak (sha3 uses 0x06) and
-	// the way the round size (or window or whatever it was) is calculated.
-	// 200 - (256 / 4) is the "rate"
-	hash(output.data(), output.size, _input.data(), _input.size(), 200 - (256 / 4), 0x01);
-	return output;
-}
-
-}
diff --git a/libsolutil/Keccak256.h b/libsolutil/Keccak256.h
deleted file mode 100644
index 7fb7c7501a7b..000000000000
--- a/libsolutil/Keccak256.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file SHA3.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * The FixedHash fixed-size "hash" container type.
- */
-
-#pragma once
-
-#include <libsolutil/FixedHash.h>
-
-#include <string>
-
-namespace solidity::util
-{
-
-/// Calculate Keccak-256 hash of the given input, returning as a 256-bit hash.
-h256 keccak256(bytesConstRef _input);
-
-/// Calculate Keccak-256 hash of the given input, returning as a 256-bit hash.
-inline h256 keccak256(bytes const& _input) { return keccak256(bytesConstRef(&_input)); }
-
-/// Calculate Keccak-256 hash of the given input (presented as a binary-filled string), returning as a 256-bit hash.
-inline h256 keccak256(std::string const& _input) { return keccak256(bytesConstRef(_input)); }
-
-/// Calculate Keccak-256 hash of the given input (presented as a FixedHash), returns a 256-bit hash.
-template<unsigned N> inline h256 keccak256(FixedHash<N> const& _input) { return keccak256(_input.ref()); }
-
-}
diff --git a/libsolutil/LEB128.h b/libsolutil/LEB128.h
deleted file mode 100644
index a156a09bd588..000000000000
--- a/libsolutil/LEB128.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-
-#include <libsolutil/Common.h>
-
-namespace solidity::util
-{
-
-inline bytes lebEncode(uint64_t _n)
-{
-	bytes encoded;
-	while (_n > 0x7f)
-	{
-		encoded.emplace_back(uint8_t(0x80 | (_n & 0x7f)));
-		_n >>= 7;
-	}
-	encoded.emplace_back(_n);
-	return encoded;
-}
-
-// signed right shift is an arithmetic right shift
-static_assert((-1 >> 1) == -1, "Arithmetic shift not supported.");
-
-inline bytes lebEncodeSigned(int64_t _n)
-{
-	// Based on https://github.com/llvm/llvm-project/blob/master/llvm/include/llvm/Support/LEB128.h
-	bytes result;
-	bool more;
-	do
-	{
-		uint8_t v = _n & 0x7f;
-		_n >>= 7;
-		more = !((((_n == 0) && ((v & 0x40) == 0)) || ((_n == -1) && ((v & 0x40) != 0))));
-		if (more)
-			v |= 0x80; // Mark this byte to show that more bytes will follow.
-		result.emplace_back(v);
-	}
-	while (more);
-	return result;
-}
-
-}
diff --git a/libsolutil/LazyInit.h b/libsolutil/LazyInit.h
deleted file mode 100644
index b242484df688..000000000000
--- a/libsolutil/LazyInit.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Assertions.h>
-#include <libsolutil/Exceptions.h>
-
-#include <memory>
-#include <optional>
-#include <type_traits>
-#include <utility>
-
-namespace solidity::util
-{
-
-DEV_SIMPLE_EXCEPTION(BadLazyInitAccess);
-
-/**
- * A value that is initialized at some point after construction of the LazyInit. The stored value can only be accessed
- * while calling "init", which initializes the stored value (if it has not already been initialized).
- *
- * @tparam T the type of the stored value; may not be a function, reference, array, or void type; may be const-qualified.
- */
-template<typename T>
-class LazyInit
-{
-public:
-	using value_type = T;
-
-	static_assert(std::is_object_v<value_type>, "Function, reference, and void types are not supported");
-	static_assert(!std::is_array_v<value_type>, "Array types are not supported.");
-	static_assert(!std::is_volatile_v<value_type>, "Volatile-qualified types are not supported.");
-
-	LazyInit() = default;
-
-	LazyInit(LazyInit const&) = delete;
-	LazyInit& operator=(LazyInit const&) = delete;
-
-	// Move constructor must be overridden to ensure that moved-from object is left empty.
-	constexpr LazyInit(LazyInit&& _other) noexcept:
-		m_value(std::move(_other.m_value))
-	{
-		_other.m_value.reset();
-	}
-
-	LazyInit& operator=(LazyInit&& _other) noexcept
-	{
-		this->m_value.swap(_other.m_value);
-		_other.m_value.reset();
-	}
-
-	template<typename F>
-	value_type& init(F&& _fun)
-	{
-		doInit(std::forward<F>(_fun));
-		return m_value.value();
-	}
-
-	template<typename F>
-	value_type const& init(F&& _fun) const
-	{
-		doInit(std::forward<F>(_fun));
-		return m_value.value();
-	}
-
-private:
-	/// Although not quite logically const, this is marked const for pragmatic reasons. It doesn't change the platonic
-	/// value of the object (which is something that is initialized to some computed value on first use).
-	template<typename F>
-	void doInit(F&& _fun) const
-	{
-		if (!m_value.has_value())
-			m_value.emplace(std::forward<F>(_fun)());
-	}
-
-	mutable std::optional<value_type> m_value;
-};
-
-}
diff --git a/libsolutil/Numeric.cpp b/libsolutil/Numeric.cpp
deleted file mode 100644
index 97a7b042066e..000000000000
--- a/libsolutil/Numeric.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/Numeric.h>
-
-#include <liblangutil/Exceptions.h>
-
-using namespace solidity;
-
-bool solidity::fitsPrecisionBaseX(bigint const& _mantissa, double _log2OfBase, uint32_t _exp)
-{
-	if (_mantissa == 0)
-		return true;
-
-	solAssert(_mantissa > 0, "");
-
-	size_t const bitsMax = 4096;
-
-	size_t mostSignificantMantissaBit = static_cast<size_t>(boost::multiprecision::msb(_mantissa));
-	if (mostSignificantMantissaBit > bitsMax) // _mantissa >= 2 ^ 4096
-		return false;
-
-	bigint bitsNeeded = mostSignificantMantissaBit + bigint(floor(double(_exp) * _log2OfBase)) + 1;
-	return bitsNeeded <= bitsMax;
-}
diff --git a/libsolutil/Numeric.h b/libsolutil/Numeric.h
deleted file mode 100644
index be9f0bea243a..000000000000
--- a/libsolutil/Numeric.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Definition of u256 and similar types and helper functions.
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonData.h>
-
-#include <boost/version.hpp>
-
-// TODO: do this only conditionally as soon as a boost version with gcc 12 support is released.
-#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#pragma GCC diagnostic ignored "-Wstringop-overread"
-#pragma GCC diagnostic ignored "-Waggressive-loop-optimizations"
-#endif
-#include <boost/multiprecision/cpp_int.hpp>
-#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)
-#pragma GCC diagnostic pop
-#endif
-
-#include <limits>
-
-namespace solidity
-{
-
-// Numeric types.
-using bigint = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<>>;
-using u256 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<256, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
-using s256 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<256, 256, boost::multiprecision::signed_magnitude, boost::multiprecision::unchecked, void>>;
-
-/// Interprets @a _u as a two's complement signed number and returns the resulting s256.
-inline s256 u2s(u256 _u)
-{
-	static bigint const c_end = bigint(1) << 256;
-	if (boost::multiprecision::bit_test(_u, 255))
-		return s256(-(c_end - _u));
-	else
-		return s256(_u);
-}
-
-/// @returns the two's complement signed representation of the signed number _u.
-inline u256 s2u(s256 _u)
-{
-	static bigint const c_end = bigint(1) << 256;
-	if (_u >= 0)
-		return u256(_u);
-	else
-		return u256(c_end + _u);
-}
-
-inline u256 exp256(u256 _base, u256 _exponent)
-{
-	using boost::multiprecision::limb_type;
-	u256 result = 1;
-	while (_exponent)
-	{
-		if (boost::multiprecision::bit_test(_exponent, 0))
-			result *= _base;
-		_base *= _base;
-		_exponent >>= 1;
-	}
-	return result;
-}
-
-/// Checks whether _mantissa * (X ** _exp) fits into 4096 bits,
-/// where X is given indirectly via _log2OfBase = log2(X).
-bool fitsPrecisionBaseX(bigint const& _mantissa, double _log2OfBase, uint32_t _exp);
-
-
-// Big-endian to/from host endian conversion functions.
-
-/// Converts a templated integer value to the big-endian byte-stream represented on a templated collection.
-/// The size of the collection object will be unchanged. If it is too small, it will not represent the
-/// value properly, if too big then the additional elements will be zeroed out.
-/// @a Out will typically be either std::string or bytes.
-/// @a T will typically by unsigned, u160, u256 or bigint.
-template <class T, class Out>
-inline void toBigEndian(T _val, Out& o_out)
-{
-	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
-	for (auto i = o_out.size(); i != 0; _val >>= 8, i--)
-	{
-		T v = _val & (T)0xff;
-		o_out[i - 1] = (typename Out::value_type)(uint8_t)v;
-	}
-}
-
-/// Converts a big-endian byte-stream represented on a templated collection to a templated integer value.
-/// @a In will typically be either std::string or bytes.
-/// @a T will typically by unsigned, u256 or bigint.
-template <class T, class In>
-inline T fromBigEndian(In const& _bytes)
-{
-	T ret = (T)0;
-	for (auto i: _bytes)
-		ret = (T)((ret << 8) | (uint8_t)(typename std::make_unsigned<typename In::value_type>::type)i);
-	return ret;
-}
-inline bytes toBigEndian(u256 _val) { bytes ret(32); toBigEndian(_val, ret); return ret; }
-
-/// Convenience function for toBigEndian.
-/// @returns a byte array just big enough to represent @a _val.
-template <class T>
-inline bytes toCompactBigEndian(T _val, unsigned _min = 0)
-{
-	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
-	unsigned i = 0;
-	for (T v = _val; v; ++i, v >>= 8) {}
-	bytes ret(std::max<unsigned>(_min, i), 0);
-	toBigEndian(_val, ret);
-	return ret;
-}
-
-/// Convenience function for conversion of a u256 to hex
-inline std::string toHex(u256 val)
-{
-	return util::toHex(toBigEndian(val));
-}
-
-template <class T>
-inline std::string toCompactHexWithPrefix(T _value)
-{
-	return "0x" + util::toHex(toCompactBigEndian(_value, 1));
-}
-
-/// Returns decimal representation for small numbers and hex for large numbers.
-inline std::string formatNumber(bigint const& _value)
-{
-	if (_value < 0)
-		return "-" + formatNumber(-_value);
-	if (_value > 0x1000000)
-		return "0x" + util::toHex(toCompactBigEndian(_value, 1));
-	else
-		return _value.str();
-}
-
-inline std::string formatNumber(u256 const& _value)
-{
-	if (_value > 0x1000000)
-		return toCompactHexWithPrefix(_value);
-	else
-		return _value.str();
-}
-
-
-// Algorithms for string and string-like collections.
-
-/// Determine bytes required to encode the given integer value. @returns 0 if @a _i is zero.
-template <class T>
-inline unsigned numberEncodingSize(T _i)
-{
-	static_assert(std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed, "only unsigned types or bigint supported"); //bigint does not carry sign bit on shift
-	unsigned i = 0;
-	for (; _i != 0; ++i, _i >>= 8) {}
-	return i;
-}
-
-}
diff --git a/libsolutil/Result.h b/libsolutil/Result.h
deleted file mode 100644
index ca9563947729..000000000000
--- a/libsolutil/Result.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <string>
-
-namespace solidity::util
-{
-
-/// Simple generic result that holds a value and an optional error message.
-/// Results can be implicitly converted to and created from the type of
-/// the value they hold. The class is mainly designed for a result type of
-/// bool or pointer type. The idea is that the default constructed value of
-/// the result type is interpreted as an error value.
-///
-/// Result<bool> check()
-/// {
-///		if (false)
-///			return Result<bool>::err("Error message.")
-///		return true;
-/// }
-///
-
-template <class ResultType>
-class [[nodiscard]] Result
-{
-public:
-	/// Constructs a result with _value and an empty message.
-	/// This is meant to be called with valid results. Please use
-	/// the static err() member function to signal an error.
-	Result(ResultType _value): Result(_value, std::string{}) {}
-
-	/// Constructs a result with a default-constructed value and an
-	/// error message.
-	static Result<ResultType> err(std::string _message)
-	{
-		return Result{ResultType{}, std::move(_message)};
-	}
-
-	/// @{
-	/// @name Wrapper functions
-	/// Wrapper functions that provide implicit conversions to and explicit retrieval of
-	/// the value this result holds.
-	operator ResultType const&() const { return m_value; }
-	ResultType const& get() const { return m_value; }
-	/// @}
-
-	/// @returns the error message (can be empty).
-	std::string const& message() const { return m_message; }
-
-	/// Merges _other into this using the _merger
-	/// and appends the error messages. Meant to be called
-	/// with logical operators like logical_and, etc.
-	template<typename F>
-	void merge(Result<ResultType> const& _other, F _merger)
-	{
-		m_value = _merger(m_value, _other.get());
-		m_message += _other.message();
-	}
-
-private:
-	explicit Result(ResultType _value, std::string _message):
-		m_value(std::move(_value)),
-		m_message(std::move(_message))
-	{}
-
-	ResultType m_value;
-	std::string m_message;
-};
-
-}
diff --git a/libsolutil/SetOnce.h b/libsolutil/SetOnce.h
deleted file mode 100644
index 007424ff1ed4..000000000000
--- a/libsolutil/SetOnce.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <libsolutil/Assertions.h>
-#include <libsolutil/Exceptions.h>
-
-#include <memory>
-#include <optional>
-#include <utility>
-
-namespace solidity::util
-{
-
-DEV_SIMPLE_EXCEPTION(BadSetOnceReassignment);
-DEV_SIMPLE_EXCEPTION(BadSetOnceAccess);
-
-/// A class that stores a value that can only be set once
-/// \tparam T the type of the stored value
-template<typename T>
-class SetOnce
-{
-public:
-	/// Initializes the class to have no stored value.
-	SetOnce() = default;
-
-	// Not copiable
-	SetOnce(SetOnce const&) = delete;
-	SetOnce(SetOnce&&) = delete;
-
-	// Not movable
-	SetOnce& operator=(SetOnce const&) = delete;
-	SetOnce& operator=(SetOnce&&) = delete;
-
-	/// @brief Sets the stored value to \p _newValue
-	/// @throws BadSetOnceReassignment when the stored value has already been set
-	/// @return `*this`
-	constexpr SetOnce& operator=(T _newValue) &
-	{
-		assertThrow(
-			!m_value.has_value(),
-			BadSetOnceReassignment,
-			"Attempt to reassign to a SetOnce that already has a value."
-		);
-
-		m_value.emplace(std::move(_newValue));
-		return *this;
-	}
-
-	/// @return A reference to the stored value. The returned reference has the same lifetime as `*this`.
-	/// @throws BadSetOnceAccess when the stored value has not yet been set
-	T const& operator*() const
-	{
-		assertThrow(
-			m_value.has_value(),
-			BadSetOnceAccess,
-			"Attempt to access the value of a SetOnce that does not have a value."
-		);
-
-		return m_value.value();
-	}
-
-	/// @return A reference to the stored value. The referent of the returned pointer has the same lifetime as `*this`.
-	/// @throws BadSetOnceAccess when the stored value has not yet been set
-	T const* operator->() const { return std::addressof(**this); }
-
-	/// @return true if a value was assigned
-	bool set() const { return m_value.has_value(); }
-private:
-	std::optional<T> m_value = std::nullopt;
-};
-
-}
diff --git a/libsolutil/StackTooDeepString.h b/libsolutil/StackTooDeepString.h
deleted file mode 100644
index 75fe557e2c8e..000000000000
--- a/libsolutil/StackTooDeepString.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <string>
-
-namespace solidity::util
-{
-	static std::string stackTooDeepString =
-		"Stack too deep. "
-		"Try compiling with `--via-ir` (cli) or the equivalent `viaIR: true` (standard JSON) "
-		"while enabling the optimizer. Otherwise, try removing local variables.";
-}
diff --git a/libsolutil/StringUtils.cpp b/libsolutil/StringUtils.cpp
deleted file mode 100644
index f5d2bbfb3735..000000000000
--- a/libsolutil/StringUtils.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file StringUtils.h
- * @author Balajiganapathi S <balajiganapathi.s@gmail.com>
- * @date 2017
- *
- * String routines
- */
-
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string/trim.hpp>
-
-#include <sstream>
-#include <string>
-#include <vector>
-
-using namespace solidity;
-using namespace solidity::util;
-
-bool solidity::util::stringWithinDistance(std::string const& _str1, std::string const& _str2, size_t _maxDistance, size_t _lenThreshold)
-{
-	if (_str1 == _str2)
-		return true;
-
-	size_t n1 = _str1.size();
-	size_t n2 = _str2.size();
-	if (_lenThreshold > 0 && n1 * n2 > _lenThreshold)
-		return false;
-
-	size_t distance = stringDistance(_str1, _str2);
-
-	// if distance is not greater than _maxDistance, and distance is strictly less than length of both names, they can be considered similar
-	// this is to avoid irrelevant suggestions
-	return distance <= _maxDistance && distance < n1 && distance < n2;
-}
-
-size_t solidity::util::stringDistance(std::string const& _str1, std::string const& _str2)
-{
-	size_t n1 = _str1.size();
-	size_t n2 = _str2.size();
-	// Optimize by storing only last 2 rows and current row. So first index is considered modulo 3
-	// This is a two-dimensional array of size 3 x (n2 + 1).
-	std::vector<size_t> dp(3 * (n2 + 1));
-
-	// In this dp formulation of Damerau–Levenshtein distance we are assuming that the strings are 1-based to make base case storage easier.
-	// So index accesser to _name1 and _name2 have to be adjusted accordingly
-	for (size_t i1 = 0; i1 <= n1; ++i1)
-		for (size_t i2 = 0; i2 <= n2; ++i2)
-		{
-			size_t x = 0;
-			if (std::min(i1, i2) == 0) // base case
-				x = std::max(i1, i2);
-			else
-			{
-				size_t left = dp[(i1 - 1) % 3 + i2 * 3];
-				size_t up = dp[(i1 % 3) + (i2 - 1) * 3];
-				size_t upleft = dp[((i1 - 1) % 3) + (i2 - 1) * 3];
-				// deletion and insertion
-				x = std::min(left + 1, up + 1);
-				if (_str1[i1-1] == _str2[i2-1])
-					// same chars, can skip
-					x = std::min(x, upleft);
-				else
-					// different chars so try substitution
-					x = std::min(x, upleft + 1);
-
-				// transposing
-				if (i1 > 1 && i2 > 1 && _str1[i1 - 1] == _str2[i2 - 2] && _str1[i1 - 2] == _str2[i2 - 1])
-					x = std::min(x, dp[((i1 - 2) % 3) + (i2 - 2) * 3] + 1);
-			}
-			dp[(i1 % 3) + i2 * 3] = x;
-		}
-
-	return dp[(n1 % 3) + n2 * 3];
-}
-
-std::string solidity::util::quotedAlternativesList(std::vector<std::string> const& suggestions)
-{
-	std::vector<std::string> quotedSuggestions;
-
-	for (auto& suggestion: suggestions)
-		quotedSuggestions.emplace_back("\"" + suggestion + "\"");
-
-	return joinHumanReadable(quotedSuggestions, ", ", " or ");
-}
-
-std::string solidity::util::suffixedVariableNameList(std::string const& _baseName, size_t _startSuffix, size_t _endSuffix)
-{
-	std::string result;
-	if (_startSuffix < _endSuffix)
-	{
-		result = _baseName + std::to_string(_startSuffix++);
-		while (_startSuffix < _endSuffix)
-			result += ", " + _baseName + std::to_string(_startSuffix++);
-	}
-	else if (_endSuffix < _startSuffix)
-	{
-		result = _baseName + std::to_string(_endSuffix++);
-		while (_endSuffix < _startSuffix)
-			result = _baseName + std::to_string(_endSuffix++) + ", " + result;
-	}
-	return result;
-}
-
-namespace
-{
-
-/// Try to format as N * 2**x
-std::optional<std::string> tryFormatPowerOfTwo(bigint const& _value)
-{
-	bigint prefix = _value;
-
-	// when multiple trailing zero bytes, format as N * 2**x
-	int i = 0;
-	for (; (prefix & 0xff) == 0; prefix >>= 8)
-		++i;
-	if (i <= 2)
-		return std::nullopt;
-
-	// 0x100 yields 2**8 (N is 1 and redundant)
-	if (prefix == 1)
-		return {fmt::format("2**{}", i * 8)};
-	else if ((prefix & (prefix - 1)) == 0)
-	{
-		int j = 0;
-		for (; (prefix & 0x1) == 0; prefix >>= 1)
-			j++;
-		return {fmt::format("2**{}", i * 8 + j)};
-	}
-	else
-		return {fmt::format(
-			"{} * 2**{}",
-			toHex(toCompactBigEndian(prefix), HexPrefix::Add, HexCase::Mixed),
-			i * 8
-		)};
-}
-
-}
-
-std::string solidity::util::formatNumberReadable(bigint const& _value, bool _useTruncation)
-{
-	bool const isNegative = _value < 0;
-	bigint const absValue = isNegative ? (bigint(-1) * _value) : bigint(_value);
-	std::string const sign = isNegative ? "-" : "";
-
-	// smaller numbers return as decimal
-	if (absValue <= 0x1000000)
-		return sign + absValue.str();
-
-	if (auto result = tryFormatPowerOfTwo(absValue))
-		return {sign + *result};
-	else if (auto result = tryFormatPowerOfTwo(absValue + 1))
-		return {sign + *result + (isNegative ? " + 1" : " - 1")};
-
-	std::string str = toHex(toCompactBigEndian(absValue), HexPrefix::Add, HexCase::Mixed);
-
-	if (_useTruncation)
-	{
-		// return as interior-truncated hex.
-		size_t len = str.size();
-
-		if (len < 24)
-			return sign + str;
-
-		size_t const initialChars = 6;
-		size_t const finalChars = 4;
-		size_t numSkipped = len - initialChars - finalChars;
-
-		return fmt::format(
-			"{}{}...{{+{} more}}...{}",
-			sign,
-			str.substr(0, initialChars),
-			numSkipped,
-			str.substr(len-finalChars, len)
-		);
-	}
-
-	return sign + str;
-}
-
-std::string solidity::util::prefixLines(
-	std::string const& _input,
-	std::string const& _prefix,
-	bool _trimPrefix
-)
-{
-	std::ostringstream output;
-	printPrefixed(output, _input, _prefix, _trimPrefix, false /* _ensureFinalNewline */);
-	return output.str();
-}
-
-void solidity::util::printPrefixed(
-	std::ostream& _output,
-	std::string const& _input,
-	std::string const& _prefix,
-	bool _trimPrefix,
-	bool _ensureFinalNewline
-)
-{
-	std::istringstream input(_input);
-	std::string line;
-	while (std::getline(input, line))
-	{
-		if (line.empty() && _trimPrefix)
-			_output << boost::trim_right_copy(_prefix);
-		else
-			_output << _prefix << line;
-		if (!input.eof() || _ensureFinalNewline)
-			_output << '\n';
-	}
-}
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
deleted file mode 100644
index 77ffe6735401..000000000000
--- a/libsolutil/StringUtils.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file StringUtils.h
- * @author Balajiganapathi S <balajiganapathi.s@gmail.com>
- * @date 2017
- *
- * String routines
- */
-
-#pragma once
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-
-#include <fmt/format.h>
-
-#include <algorithm>
-#include <limits>
-#include <locale>
-#include <string>
-#include <vector>
-
-namespace solidity::util
-{
-
-// Calculates the Damerau–Levenshtein distance between _str1 and _str2 and returns true if that distance is not greater than _maxDistance
-// if _lenThreshold > 0 and the product of the strings length is greater than _lenThreshold, the function will return false
-bool stringWithinDistance(std::string const& _str1, std::string const& _str2, size_t _maxDistance, size_t _lenThreshold = 0);
-// Calculates the Damerau–Levenshtein distance between _str1 and _str2
-size_t stringDistance(std::string const& _str1, std::string const& _str2);
-// Return a string having elements of suggestions as quoted, alternative suggestions. e.g. "a", "b" or "c"
-std::string quotedAlternativesList(std::vector<std::string> const& suggestions);
-
-/// @returns a string containing a comma-separated list of variable names consisting of @a _baseName suffixed
-/// with increasing integers in the range [@a _startSuffix, @a _endSuffix), if @a _startSuffix < @a _endSuffix,
-/// and with decreasing integers in the range [@a _endSuffix, @a _startSuffix), if @a _endSuffix < @a _startSuffix.
-/// If @a _startSuffix == @a _endSuffix, the empty string is returned.
-std::string suffixedVariableNameList(std::string const& _baseName, size_t _startSuffix, size_t _endSuffix);
-
-/// Joins collection of strings into one string with separators between, last separator can be different.
-/// @param _list collection of strings to join
-/// @param _separator defaults to ", "
-/// @param _lastSeparator (optional) will be used to separate last two strings instead of _separator
-/// @example join(vector<string>{"a", "b", "c"}, "; ", " or ") == "a; b or c"
-template<class T>
-std::string joinHumanReadable
-(
-	T const& _list,
-	std::string const& _separator = ", ",
-	std::string const& _lastSeparator = ""
-)
-{
-	auto const itEnd = end(_list);
-
-	std::string result;
-
-	for (auto it = begin(_list); it != itEnd; )
-	{
-		std::string element = *it;
-		bool first = (it == begin(_list));
-		++it;
-		if (!first)
-		{
-			if (it == itEnd && !_lastSeparator.empty())
-				result += _lastSeparator; // last iteration
-			else
-				result += _separator;
-		}
-		result += std::move(element);
-	}
-
-	return result;
-}
-
-/// Joins collection of strings just like joinHumanReadable, but prepends the separator
-/// unless the collection is empty.
-template<class T>
-std::string joinHumanReadablePrefixed
-(
-	T const& _list,
-	std::string const& _separator = ", ",
-	std::string const& _lastSeparator = ""
-)
-{
-	if (begin(_list) == end(_list))
-		return {};
-	else
-		return _separator + joinHumanReadable(_list, _separator, _lastSeparator);
-}
-
-/// Formats large numbers to be easily readable by humans.
-/// Returns decimal representation for smaller numbers; hex for large numbers.
-/// "Special" numbers, powers-of-two and powers-of-two minus 1, are returned in
-/// formulaic form like 0x01 * 2**24 - 1.
-/// @a T can be any integer type, will typically be u160, u256 or bigint.
-/// @param _value to be formatted
-/// @param _useTruncation if true, internal truncation is also applied,
-/// like  0x5555...{+56 more}...5555
-/// @example formatNumberReadable((u256)0x7ffffff) = "2**27 - 1"
-/// @example formatNumberReadable(-57896044618658097711785492504343953926634992332820282019728792003956564819968) = -2**255
-std::string formatNumberReadable(bigint const& _value, bool _useTruncation = false);
-
-/// Safely converts an unsigned integer as string into an unsigned int type.
-///
-/// @return the converted number or nullopt in case of an failure (including if it would not fit).
-inline std::optional<unsigned> toUnsignedInt(std::string const& _value)
-{
-	try
-	{
-		auto const ulong = stoul(_value);
-		if (ulong > std::numeric_limits<unsigned>::max())
-			return std::nullopt;
-		return static_cast<unsigned>(ulong);
-	}
-	catch (...)
-	{
-		return std::nullopt;
-	}
-}
-
-/// Converts parameter _c to its lowercase equivalent if c is an uppercase letter and has a lowercase equivalent. It uses the classic "C" locale semantics.
-/// @param _c value to be converted
-/// @return the converted value
-inline char toLower(char _c)
-{
-	return tolower(_c, std::locale::classic());
-}
-
-/// Converts parameter _c to its uppercase equivalent if c is an lowercase letter and has a uppercase equivalent. It uses the classic "C" locale semantics.
-/// @param _c value to be converted
-/// @return the converted value
-inline char toUpper(char _c)
-{
-	return toupper(_c, std::locale::classic());
-}
-
-/// Converts parameter _s to its lowercase equivalent. It uses the classic "C" locale semantics.
-/// @param _s value to be converted
-/// @return the converted value
-inline std::string toLower(std::string _s)
-{
-	std::transform(_s.begin(), _s.end(), _s.begin(), [](char _c) {
-		return toLower(_c);
-	});
-	return _s;
-}
-
-/// Checks whether _c is a decimal digit character. It uses the classic "C" locale semantics.
-/// @param _c character to be checked
-/// @return true if _c is a decimal digit character, false otherwise
-inline bool isDigit(char _c)
-{
-	return isdigit(_c, std::locale::classic());
-}
-
-/// Checks if character is printable using classic "C" locale
-/// @param _c character to be checked
-/// @return true if _c is a printable character, false otherwise.
-inline bool isPrint(char _c)
-{
-	return isprint(_c, std::locale::classic());
-}
-
-/// Adds a prefix to every line in the input.
-/// @see printPrefixed()
-std::string prefixLines(
-	std::string const& _input,
-	std::string const& _prefix,
-	bool _trimPrefix = true
-);
-
-/// Prints to a stream, adding a prefix to every line in the input.
-/// Assumes \n as the line separator.
-/// @param _trimPrefix If true, the function avoids introducing trailing whitespace on empty lines.
-///     This is achieved by removing trailing spaces from the prefix on such lines.
-///     Note that tabs and newlines are not removed, only spaces are.
-/// @param _finalNewline If true, an extra \n will be printed at the end of @a _input if it does
-///     not already end with one.
-void printPrefixed(
-	std::ostream& _output,
-	std::string const& _input,
-	std::string const& _prefix,
-	bool _trimPrefix = true,
-	bool _ensureFinalNewline = true
-);
-
-/// Adds a standard indent of 4 spaces to every line in the input.
-/// Assumes \n as the line separator.
-/// @param _indentEmptyLines If true, the indent will be applied to empty lines as well, resulting
-///     such lines containing trailing whitespace.
-inline std::string indent(std::string const& _input, bool _indentEmptyLines = false)
-{
-	return prefixLines(_input, "    ", !_indentEmptyLines);
-}
-
-}
diff --git a/libsolutil/SwarmHash.cpp b/libsolutil/SwarmHash.cpp
deleted file mode 100644
index cf47cb15935b..000000000000
--- a/libsolutil/SwarmHash.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file SwarmHash.cpp
- */
-
-#include <libsolutil/SwarmHash.h>
-
-#include <libsolutil/Keccak256.h>
-
-using namespace solidity;
-using namespace solidity::util;
-
-namespace
-{
-
-bytes toLittleEndian(uint64_t _size)
-{
-	bytes encoded(8);
-	for (size_t i = 0; i < 8; ++i)
-		encoded[i] = (_size >> (8 * i)) & 0xff;
-	return encoded;
-}
-
-h256 swarmHashSimple(bytesConstRef _data, size_t _size)
-{
-	return keccak256(toLittleEndian(_size) + _data.toBytes());
-}
-
-h256 swarmHashIntermediate(std::string const& _input, size_t _offset, size_t _length)
-{
-	bytesConstRef ref;
-	bytes innerNodes;
-	if (_length <= 0x1000)
-		ref = bytesConstRef(_input).cropped(_offset, _length);
-	else
-	{
-		size_t maxRepresentedSize = 0x1000;
-		while (maxRepresentedSize * (0x1000 / 32) < _length)
-			maxRepresentedSize *= (0x1000 / 32);
-		for (size_t i = 0; i < _length; i += maxRepresentedSize)
-		{
-			size_t size = std::min(maxRepresentedSize, _length - i);
-			innerNodes += swarmHashIntermediate(_input, _offset + i, size).asBytes();
-		}
-		ref = bytesConstRef(&innerNodes);
-	}
-	return swarmHashSimple(ref, _length);
-}
-
-h256 bmtHash(bytesConstRef _data)
-{
-	if (_data.size() <= 64)
-		return keccak256(_data);
-
-	size_t midPoint = _data.size() / 2;
-	return keccak256(
-		bmtHash(_data.cropped(0, midPoint)).asBytes() +
-		bmtHash(_data.cropped(midPoint)).asBytes()
-	);
-}
-
-h256 chunkHash(bytesConstRef const _data, bool _forceHigherLevel = false)
-{
-	bytes dataToHash;
-	if (_data.size() < 0x1000)
-		dataToHash = _data.toBytes();
-	else if (_data.size() == 0x1000 && !_forceHigherLevel)
-		dataToHash = _data.toBytes();
-	else
-	{
-		size_t maxRepresentedSize = 0x1000;
-		while (maxRepresentedSize * (0x1000 / 32) < _data.size())
-			maxRepresentedSize *= (0x1000 / 32);
-		// If remaining size is 0x1000, but maxRepresentedSize is not,
-		// we have to still do one level of the chunk hashes.
-		bool forceHigher = maxRepresentedSize > 0x1000;
-		for (size_t i = 0; i < _data.size(); i += maxRepresentedSize)
-		{
-			size_t size = std::min(maxRepresentedSize, _data.size() - i);
-			dataToHash += chunkHash(_data.cropped(i, size), forceHigher).asBytes();
-		}
-	}
-
-	dataToHash.resize(0x1000, 0);
-	return keccak256(toLittleEndian(_data.size()) + bmtHash(&dataToHash).asBytes());
-}
-
-
-}
-
-h256 solidity::util::bzzr0Hash(std::string const& _input)
-{
-	return swarmHashIntermediate(_input, 0, _input.size());
-}
-
-
-h256 solidity::util::bzzr1Hash(bytes const& _input)
-{
-	if (_input.empty())
-		return h256{};
-	return chunkHash(&_input);
-}
diff --git a/libsolutil/SwarmHash.h b/libsolutil/SwarmHash.h
deleted file mode 100644
index ed7a52292d39..000000000000
--- a/libsolutil/SwarmHash.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file SwarmHash.h
- */
-
-#pragma once
-
-#include <libsolutil/FixedHash.h>
-
-#include <string>
-
-namespace solidity::util
-{
-
-/// Compute the "swarm hash" of @a _input (OLD 0x1000-section version)
-h256 bzzr0Hash(std::string const& _input);
-
-/// Compute the "bzz hash" of @a _input (the NEW binary / BMT version)
-h256 bzzr1Hash(bytes const& _input);
-
-inline h256 bzzr1Hash(std::string const& _input)
-{
-	return bzzr1Hash(asBytes(_input));
-}
-
-}
diff --git a/libsolutil/TemporaryDirectory.cpp b/libsolutil/TemporaryDirectory.cpp
deleted file mode 100644
index ff4504794156..000000000000
--- a/libsolutil/TemporaryDirectory.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
-
-#include <regex>
-#include <iostream>
-
-using namespace solidity;
-using namespace solidity::util;
-
-namespace fs = boost::filesystem;
-
-TemporaryDirectory::TemporaryDirectory(std::string const& _prefix):
-	m_path(fs::temp_directory_path() / fs::unique_path(_prefix + "-%%%%-%%%%-%%%%-%%%%"))
-{
-	// Prefix should just be a file name and not contain anything that would make us step out of /tmp.
-	solAssert(fs::path(_prefix) == fs::path(_prefix).stem(), "");
-
-	fs::create_directory(m_path);
-}
-
-TemporaryDirectory::TemporaryDirectory(
-	std::vector<boost::filesystem::path> const& _subdirectories,
-	std::string const& _prefix
-):
-	TemporaryDirectory(_prefix)
-{
-	for (boost::filesystem::path const& subdirectory: _subdirectories)
-	{
-		solAssert(!subdirectory.is_absolute() && subdirectory.root_path() != "/", "");
-		solAssert(
-			m_path.lexically_relative(subdirectory).empty() ||
-			*m_path.lexically_relative(subdirectory).begin() != "..",
-			""
-		);
-		boost::filesystem::create_directories(m_path / subdirectory);
-	}
-}
-
-TemporaryDirectory::~TemporaryDirectory()
-{
-	// A few paranoid sanity checks just to be extra sure we're not deleting someone's homework.
-	solAssert(m_path.string().find(fs::temp_directory_path().string()) == 0, "");
-	solAssert(!fs::equivalent(m_path, fs::temp_directory_path()), "");
-	solAssert(!fs::equivalent(m_path, m_path.root_path()), "");
-	solAssert(!m_path.empty(), "");
-
-	boost::system::error_code errorCode;
-	uintmax_t numRemoved = fs::remove_all(m_path, errorCode);
-	if (errorCode.value() != boost::system::errc::success)
-	{
-		std::cerr << "Failed to completely remove temporary directory '" << m_path << "'. ";
-		std::cerr << "Only " << numRemoved << " files were actually removed." << std::endl;
-		std::cerr << "Reason: " << errorCode.message() << std::endl;
-	}
-}
-
-TemporaryWorkingDirectory::TemporaryWorkingDirectory(fs::path const& _newDirectory):
-	m_originalWorkingDirectory(fs::current_path())
-{
-	fs::current_path(_newDirectory);
-}
-
-TemporaryWorkingDirectory::~TemporaryWorkingDirectory()
-{
-	fs::current_path(m_originalWorkingDirectory);
-}
diff --git a/libsolutil/TemporaryDirectory.h b/libsolutil/TemporaryDirectory.h
deleted file mode 100644
index 4e42c6df4152..000000000000
--- a/libsolutil/TemporaryDirectory.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Utilities for creating temporary directories and temporarily changing the working directory
- * for use in tests.
- */
-
-#pragma once
-
-#include <boost/filesystem.hpp>
-
-#include <string>
-#include <vector>
-
-namespace solidity::util
-{
-
-/**
- * An object that creates a unique temporary directory and automatically deletes it and its
- * content upon being destroyed.
- *
- * The directory is guaranteed to be newly created and empty. Directory names are generated
- * randomly. If a directory with the same name already exists (very unlikely but possible) the
- * object won't reuse it and will fail with an exception instead.
- */
-class TemporaryDirectory
-{
-public:
-	TemporaryDirectory(std::string const& _prefix = "solidity");
-	TemporaryDirectory(
-		std::vector<boost::filesystem::path> const& _subdirectories,
-		std::string const& _prefix = "solidity"
-	);
-	~TemporaryDirectory();
-
-	boost::filesystem::path const& path() const { return m_path; }
-	operator boost::filesystem::path() const { return m_path; }
-
-private:
-	boost::filesystem::path m_path;
-};
-
-/**
- * An object that changes current working directory and restores it upon destruction.
- */
-class TemporaryWorkingDirectory
-{
-public:
-	TemporaryWorkingDirectory(boost::filesystem::path const& _newDirectory);
-	~TemporaryWorkingDirectory();
-
-	boost::filesystem::path const& originalWorkingDirectory() const { return m_originalWorkingDirectory; }
-	operator boost::filesystem::path() const { return boost::filesystem::current_path(); }
-
-private:
-	boost::filesystem::path m_originalWorkingDirectory;
-};
-
-}
diff --git a/libsolutil/UTF8.cpp b/libsolutil/UTF8.cpp
deleted file mode 100644
index baeda14b08ea..000000000000
--- a/libsolutil/UTF8.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file UTF8.cpp
- * @author Alex Beregszaszi
- * @date 2016
- *
- * UTF-8 related helpers
- */
-
-#include <libsolutil/UTF8.h>
-
-namespace solidity::util
-{
-namespace
-{
-
-/// Validate byte sequence against Unicode chapter 3 Table 3-7.
-bool isWellFormed(unsigned char byte1, unsigned char byte2)
-{
-	if (byte1 == 0xc0 || byte1 == 0xc1)
-		return false;
-	else if (byte1 >= 0xc2 && byte1 <= 0xdf)
-		return true;
-	else if (byte1 == 0xe0)
-	{
-		if (byte2 < 0xa0)
-			return false;
-		else
-			return true;
-	}
-	else if (byte1 >= 0xe1 && byte1 <= 0xec)
-		return true;
-	else if (byte1 == 0xed)
-	{
-		if (byte2 > 0x9f)
-			return false;
-		else
-			return true;
-	}
-	else if (byte1 == 0xee || byte1 == 0xef)
-		return true;
-	else if (byte1 == 0xf0)
-	{
-		if (byte2 < 0x90)
-			return false;
-		else
-			return true;
-	}
-	else if (byte1 >= 0xf1 && byte1 <= 0xf3)
-		return true;
-	else if (byte1 == 0xf4)
-	{
-		if (byte2 > 0x8f)
-			return false;
-		else
-			return true;
-	}
-	/// 0xf5 .. 0xf7 is disallowed
-	/// Technically anything below 0xc0 or above 0xf7 is
-	/// not possible to encode using Table 3-6 anyway.
-	return false;
-}
-
-bool validateUTF8(unsigned char const* _input, size_t _length, size_t& _invalidPosition)
-{
-	bool valid = true;
-	size_t i = 0;
-
-	for (; i < _length; i++)
-	{
-		// Check for Unicode Chapter 3 Table 3-6 conformity.
-		if (_input[i] < 0x80)
-			continue;
-
-		size_t count = 0;
-		if (_input[i] >= 0xc0 && _input[i] <= 0xdf)
-			count = 1;
-		else if (_input[i] >= 0xe0 && _input[i] <= 0xef)
-			count = 2;
-		else if (_input[i] >= 0xf0 && _input[i] <= 0xf7)
-			count = 3;
-
-		if (count == 0)
-		{
-			valid = false;
-			break;
-		}
-
-		if ((i + count) >= _length)
-		{
-			valid = false;
-			break;
-		}
-
-		for (size_t j = 0; j < count; j++)
-		{
-			i++;
-			if ((_input[i] & 0xc0) != 0x80)
-			{
-				valid = false;
-				break;
-			}
-
-			// Check for Unicode Chapter 3 Table 3-7 conformity.
-			if ((j == 0) && !isWellFormed(_input[i - 1], _input[i]))
-			{
-				valid = false;
-				break;
-			}
-		}
-	}
-
-	if (valid)
-		return true;
-
-	_invalidPosition = i;
-	return false;
-}
-
-}
-
-bool validateUTF8(std::string const& _input, size_t& _invalidPosition)
-{
-	return validateUTF8(reinterpret_cast<unsigned char const*>(_input.c_str()), _input.length(), _invalidPosition);
-}
-
-}
diff --git a/libsolutil/UTF8.h b/libsolutil/UTF8.h
deleted file mode 100644
index 59e2d41455e0..000000000000
--- a/libsolutil/UTF8.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file UTF8.h
- * @author Alex Beregszaszi
- * @date 2016
- *
- * UTF-8 related helpers
- */
-
-#pragma once
-
-#include <string>
-
-namespace solidity::util
-{
-
-/// Validate an input for UTF8 encoding
-/// @returns false if it is invalid and the first invalid position in invalidPosition
-bool validateUTF8(std::string const& _input, size_t& _invalidPosition);
-
-inline bool validateUTF8(std::string const& _input)
-{
-	size_t invalidPos;
-	return validateUTF8(_input, invalidPos);
-}
-
-}
diff --git a/libsolutil/Views.h b/libsolutil/Views.h
deleted file mode 100644
index 7ab75047b5dd..000000000000
--- a/libsolutil/Views.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <range/v3/view/transform.hpp>
-
-#include <liblangutil/Exceptions.h>
-
-
-namespace solidity::util::views
-{
-
-static constexpr auto dereference = ranges::views::transform([](auto&& x) -> decltype(auto) { return *x; });
-
-static constexpr auto dereferenceChecked = ranges::views::transform(
-	[](auto&& x) -> decltype(auto)
-	{
-		solAssert(x, "");
-		return *x;
-	}
-);
-
-}
diff --git a/libsolutil/Visitor.h b/libsolutil/Visitor.h
deleted file mode 100644
index 1147f9579bc3..000000000000
--- a/libsolutil/Visitor.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Visitor templates.
- */
-
-#pragma once
-
-namespace solidity::util
-{
-
-/**
- * Generic visitor used as follows:
- * std::visit(GenericVisitor{
- *     [](Class1& _c) { _c.f(); },
- *     [](Class2& _c) { _c.g(); }
- * }, variant);
- * This one does not have a fallback and will fail at
- * compile-time if you do not specify all variants.
- *
- * Fallback with no return (it will not fail if you do not specify all variants):
- * std::visit(GenericVisitor{
- *     VisitorFallback<>{},
- *     [](Class1& _c) { _c.f(); },
- *     [](Class2& _c) { _c.g(); }
- * }, variant);
- *
- * Fallback with return type R (the fallback returns `R{}`:
- * std::visit(GenericVisitor{
- *     VisitorFallback<R>{},
- *     [](Class1& _c) { _c.f(); },
- *     [](Class2& _c) { _c.g(); }
- * }, variant);
- */
-
-template <typename...> struct VisitorFallback;
-
-template <typename R>
-struct VisitorFallback<R> { template<typename T> R operator()(T&&) const { return {}; } };
-
-template<>
-struct VisitorFallback<> { template<typename T> void operator()(T&&) const {} };
-
-// MSVC. Empty base class optimization does not happen in some scenarios.
-// Enforcing it with __declspec(empty_bases) avoids MSVC Debug test crash
-// (Run-Time Check Failure #2 - Stack around the variable '....' was corrupted).
-// See https://docs.microsoft.com/en-us/cpp/cpp/empty-bases,
-//     https://developercommunity.visualstudio.com/t/10005513.
-#if defined(_MSC_VER)
-#define SOLC_EMPTY_BASES __declspec(empty_bases)
-#else
-#define SOLC_EMPTY_BASES
-#endif
-
-template <typename... Visitors> struct SOLC_EMPTY_BASES GenericVisitor: Visitors... { using Visitors::operator()...; };
-template <typename... Visitors> GenericVisitor(Visitors...) -> GenericVisitor<Visitors...>;
-}
diff --git a/libsolutil/Whiskers.cpp b/libsolutil/Whiskers.cpp
deleted file mode 100644
index 1f026d9464a7..000000000000
--- a/libsolutil/Whiskers.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Whiskers.cpp
- * @author Chris <chis@ethereum.org>
- * @date 2017
- *
- * Moustache-like templates.
- */
-
-#include <libsolutil/Whiskers.h>
-
-#include <libsolutil/Assertions.h>
-
-#include <regex>
-
-using namespace solidity::util;
-
-Whiskers::Whiskers(std::string _template):
-	m_template(std::move(_template))
-{
-	checkTemplateValid();
-}
-
-Whiskers& Whiskers::operator()(std::string _parameter, std::string _value)
-{
-	checkParameterValid(_parameter);
-	checkParameterUnknown(_parameter);
-	checkTemplateContainsTags(_parameter, {""});
-	m_parameters[std::move(_parameter)] = std::move(_value);
-	return *this;
-}
-
-Whiskers& Whiskers::operator()(std::string _parameter, bool _value)
-{
-	checkParameterValid(_parameter);
-	checkParameterUnknown(_parameter);
-	checkTemplateContainsTags(_parameter, {"?", "/"});
-	m_conditions[std::move(_parameter)] = _value;
-	return *this;
-}
-
-Whiskers& Whiskers::operator()(
-	std::string _listParameter,
-	std::vector<std::map<std::string, std::string>> _values
-)
-{
-	checkParameterValid(_listParameter);
-	checkParameterUnknown(_listParameter);
-	checkTemplateContainsTags(_listParameter, {"#", "/"});
-	for (auto const& element: _values)
-		for (auto const& val: element)
-			checkParameterValid(val.first);
-	m_listParameters[std::move(_listParameter)] = std::move(_values);
-	return *this;
-}
-
-std::string Whiskers::render() const
-{
-	return replace(m_template, m_parameters, m_conditions, m_listParameters);
-}
-
-void Whiskers::checkTemplateValid() const
-{
-	std::regex validTemplate("<[#?!\\/]\\+{0,1}[a-zA-Z0-9_$-]+(?:[^a-zA-Z0-9_$>-]|$)");
-	std::smatch match;
-	assertThrow(
-		!regex_search(m_template, match, validTemplate),
-		WhiskersError,
-		"Template contains an invalid/unclosed tag " + match.str()
-	);
-}
-
-void Whiskers::checkParameterValid(std::string const& _parameter) const
-{
-	static std::regex validParam("^" + paramRegex() + "$");
-	assertThrow(
-		regex_match(_parameter, validParam),
-		WhiskersError,
-		"Parameter" + _parameter + " contains invalid characters."
-	);
-}
-
-void Whiskers::checkParameterUnknown(std::string const& _parameter) const
-{
-	assertThrow(
-		!m_parameters.count(_parameter),
-		WhiskersError,
-		_parameter + " already set as value parameter."
-	);
-	assertThrow(
-		!m_conditions.count(_parameter),
-		WhiskersError,
-		_parameter + " already set as condition parameter."
-	);
-	assertThrow(
-		!m_listParameters.count(_parameter),
-		WhiskersError,
-		_parameter + " already set as list parameter."
-	);
-}
-
-void Whiskers::checkTemplateContainsTags(std::string const& _parameter, std::vector<std::string> const& _prefixes) const
-{
-	for (auto const& prefix: _prefixes)
-	{
-		std::string tag{"<" + prefix + _parameter + ">"};
-		assertThrow(
-			m_template.find(tag) != std::string::npos,
-			WhiskersError,
-			"Tag '" + tag + "' not found in template:\n" + m_template
-		);
-	}
-}
-
-namespace
-{
-template<class ReplaceCallback>
-std::string regex_replace(
-	std::string const& _source,
-	std::regex const& _pattern,
-	ReplaceCallback _replace,
-	std::regex_constants::match_flag_type _flags = std::regex_constants::match_default
-)
-{
-	std::sregex_iterator curMatch(_source.begin(), _source.end(), _pattern, _flags);
-	std::sregex_iterator matchEnd;
-	std::string::const_iterator lastMatchedPos(_source.cbegin());
-	std::string result;
-	while (curMatch != matchEnd)
-	{
-		result.append(curMatch->prefix().first, curMatch->prefix().second);
-		result.append(_replace(*curMatch));
-		lastMatchedPos = (*curMatch)[0].second;
-		++curMatch;
-	}
-	result.append(lastMatchedPos, _source.cend());
-	return result;
-}
-}
-
-std::string Whiskers::replace(
-	std::string const& _template,
-	StringMap const& _parameters,
-	std::map<std::string, bool> const& _conditions,
-	std::map<std::string, std::vector<StringMap>> const& _listParameters
-)
-{
-	static std::regex listOrTag(
-		"<(" + paramRegex() + ")>|"
-		"<#(" + paramRegex() + ")>((?:.|\\r|\\n)*?)</\\2>|"
-		"<\\?(\\+?" + paramRegex() + ")>((?:.|\\r|\\n)*?)(<!\\4>((?:.|\\r|\\n)*?))?</\\4>"
-	);
-	return regex_replace(_template, listOrTag, [&](std::match_results<std::string::const_iterator> _match) -> std::string
-	{
-		std::string tagName(_match[1]);
-		std::string listName(_match[2]);
-		std::string conditionName(_match[4]);
-		if (!tagName.empty())
-		{
-			assertThrow(
-				_parameters.count(tagName),
-				WhiskersError,
-				"Value for tag " + tagName + " not provided.\n" +
-				"Template:\n" +
-				_template
-			);
-			return _parameters.at(tagName);
-		}
-		else if (!listName.empty())
-		{
-			std::string templ(_match[3]);
-			assertThrow(
-				_listParameters.count(listName),
-				WhiskersError, "List parameter " + listName + " not set."
-			);
-			std::string replacement;
-			for (auto const& parameters: _listParameters.at(listName))
-				replacement += replace(templ, joinMaps(_parameters, parameters), _conditions);
-			return replacement;
-		}
-		else
-		{
-			assertThrow(!conditionName.empty(), WhiskersError, "");
-			bool conditionValue = false;
-			if (conditionName[0] == '+')
-			{
-				std::string tag = conditionName.substr(1);
-
-				if (_parameters.count(tag))
-					conditionValue = !_parameters.at(tag).empty();
-				else if (_listParameters.count(tag))
-					conditionValue = !_listParameters.at(tag).empty();
-				else
-					assertThrow(false, WhiskersError, "Tag " + tag + " used as condition but was not set.");
-			}
-			else
-			{
-				assertThrow(
-					_conditions.count(conditionName),
-					WhiskersError, "Condition parameter " + conditionName + " not set."
-				);
-				conditionValue = _conditions.at(conditionName);
-			}
-			return replace(
-				conditionValue ? _match[5] : _match[7],
-				_parameters,
-				_conditions,
-				_listParameters
-			);
-		}
-	});
-}
-
-Whiskers::StringMap Whiskers::joinMaps(
-	Whiskers::StringMap const& _a,
-	Whiskers::StringMap const& _b
-)
-{
-	Whiskers::StringMap ret = _a;
-	for (auto const& x: _b)
-		assertThrow(
-			ret.insert(x).second,
-			WhiskersError,
-			"Parameter collision"
-		);
-	return ret;
-}
-
diff --git a/libsolutil/Whiskers.h b/libsolutil/Whiskers.h
deleted file mode 100644
index e65e508ae74a..000000000000
--- a/libsolutil/Whiskers.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file Whiskers.h
- * @author Chris <chis@ethereum.org>
- * @date 2017
- *
- * Moustache-like templates.
- */
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-
-#include <string>
-#include <map>
-#include <vector>
-
-namespace solidity::util
-{
-
-DEV_SIMPLE_EXCEPTION(WhiskersError);
-
-/**
- * Moustache-like templates.
- *
- * Usage:
- *     std::vector<std::map<std::string, std::string>> listValues(2);
- *     listValues[0]["k"] = "key1";
- *     listValues[0]["v"] = "value1";
- *     listValues[1]["k"] = "key2";
- *     listValues[1]["v"] = "value2";
- *     auto s = Whiskers("<?c><p1><!c>y</c>\n<#list><k> -> <v>\n</list>")
- *         ("p1", "HEAD")
- *         ("c", true)
- *         ("list", listValues)
- *         .render();
- *
- * results in s == "HEAD\nkey1 -> value1\nkey2 -> value2\n"
- *
- * Note that lists cannot themselves contain lists - this would be a future feature.
- *
- * The elements are:
- *  - Regular parameter: <name>
- *    just replaced
- *  - Condition parameter: <?name>...<!name>...</name>, where "<!name>" is optional
- *    replaced (and recursively expanded) by the first part if the condition is true
- *    and by the second (or empty string if missing) if the condition is false
- *  - List parameter: <#list>...</list>
- *    The part between the tags is repeated as often as values are provided
- *    in the mapping. Each list element can have its own parameter -> value mapping.
- *  - Conditional value parameter: <?+name>...<!+name>...</+name>
- *    Works similar to a conditional parameter where the checked condition is
- *    that the string or list parameter called "name" is non-empty or contains
- *    no elements respectively.
- */
-class Whiskers
-{
-public:
-	using StringMap = std::map<std::string, std::string>;
-	using StringListMap = std::map<std::string, std::vector<StringMap>>;
-
-	explicit Whiskers(std::string _template = "");
-
-	/// Sets a single regular parameter, <paramName>.
-	Whiskers& operator()(std::string _parameter, std::string _value);
-	Whiskers& operator()(std::string _parameter, char const* _value) { return (*this)(_parameter, std::string{_value}); }
-	/// Sets a condition parameter, <?paramName>...<!paramName>...</paramName>
-	Whiskers& operator()(std::string _parameter, bool _value);
-	/// Sets a list parameter, <#listName> </listName>.
-	Whiskers& operator()(
-		std::string _listParameter,
-		std::vector<StringMap> _values
-	);
-
-	std::string render() const;
-
-private:
-	// Prevent implicit cast to bool
-	Whiskers& operator()(std::string _parameter, long long);
-	void checkTemplateValid() const;
-	void checkParameterValid(std::string const& _parameter) const;
-	void checkParameterUnknown(std::string const& _parameter) const;
-
-	/// Checks whether the string stored in `m_template` contains all the tags specified.
-	/// @param _parameter name of the parameter. This name is used to construct the tag(s).
-	/// @param _prefixes a vector of strings, where each element is used to compose the tag
-	///        like `"<" + element + _parameter + ">"`. Each element of _prefixes is used as a prefix of the tag name.
-	void checkTemplateContainsTags(std::string const& _parameter, std::vector<std::string> const& _prefixes) const;
-
-	static std::string replace(
-		std::string const& _template,
-		StringMap const& _parameters,
-		std::map<std::string, bool> const& _conditions,
-		StringListMap const& _listParameters = StringListMap()
-	);
-
-	static std::string paramRegex() { return "[a-zA-Z0-9_$-]+"; }
-
-	/// Joins the two maps throwing an exception if two keys are equal.
-	static StringMap joinMaps(StringMap const& _a, StringMap const& _b);
-
-	std::string m_template;
-	StringMap m_parameters;
-	std::map<std::string, bool> m_conditions;
-	StringListMap m_listParameters;
-};
-
-}
diff --git a/libsolutil/cxx20.h b/libsolutil/cxx20.h
deleted file mode 100644
index c65b0454b89c..000000000000
--- a/libsolutil/cxx20.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <map>
-
-// Contains polyfills of STL functions and algorithms that will become available in C++20.
-namespace solidity::cxx20
-{
-
-// Taken from https://en.cppreference.com/w/cpp/container/map/erase_if.
-template<class Key, class T, class Compare, class Alloc, class Pred>
-typename std::map<Key, T, Compare, Alloc>::size_type erase_if(std::map<Key,T,Compare,Alloc>& _c, Pred _pred)
-{
-	auto old_size = _c.size();
-	for (auto i = _c.begin(), last = _c.end(); i != last;)
-		if (_pred(*i))
-			i = _c.erase(i);
-		else
-			++i;
-	return old_size - _c.size();
-}
-
-// Taken from https://en.cppreference.com/w/cpp/container/unordered_map/erase_if.
-template<class Key, class T, class Hash, class KeyEqual, class Alloc, class Pred>
-typename std::unordered_map<Key, T, Hash, KeyEqual, Alloc>::size_type
-erase_if(std::unordered_map<Key, T, Hash, KeyEqual, Alloc>& _c, Pred _pred)
-{
-	auto old_size = _c.size();
-	for (auto i = _c.begin(), last = _c.end(); i != last;)
-		if (_pred(*i))
-			i = _c.erase(i);
-		else
-			++i;
-	return old_size - _c.size();
-}
-
-// Taken from https://en.cppreference.com/w/cpp/container/vector/erase2
-template<class T, class Alloc, class Pred>
-constexpr typename std::vector<T, Alloc>::size_type
-erase_if(std::vector<T, Alloc>& c, Pred pred)
-{
-	auto it = std::remove_if(c.begin(), c.end(), pred);
-	auto r = std::distance(it, c.end());
-	c.erase(it, c.end());
-	return static_cast<typename std::vector<T, Alloc>::size_type>(r);
-}
-
-}
diff --git a/libsolutil/picosha2.h b/libsolutil/picosha2.h
deleted file mode 100644
index 6994455a25c7..000000000000
--- a/libsolutil/picosha2.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (C) 2017 okdshin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-#ifndef PICOSHA2_H
-#define PICOSHA2_H
-// picosha2:20140213
-
-#ifndef PICOSHA2_BUFFER_SIZE_FOR_INPUT_ITERATOR
-#define PICOSHA2_BUFFER_SIZE_FOR_INPUT_ITERATOR \
-    1048576  //=1024*1024: default is 1MB memory
-#endif
-
-#include <algorithm>
-#include <cassert>
-#include <iterator>
-#include <sstream>
-#include <vector>
-#include <fstream>
-namespace picosha2 {
-typedef unsigned long word_t;
-typedef unsigned char byte_t;
-
-static const size_t k_digest_size = 32;
-
-namespace detail {
-inline byte_t mask_8bit(byte_t x) { return x & 0xff; }
-
-inline word_t mask_32bit(word_t x) { return x & 0xffffffff; }
-
-const word_t add_constant[64] = {
-    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
-    0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-    0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
-    0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
-    0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-    0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
-    0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
-    0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-    0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2};
-
-const word_t initial_message_digest[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372,
-                                          0xa54ff53a, 0x510e527f, 0x9b05688c,
-                                          0x1f83d9ab, 0x5be0cd19};
-
-inline word_t ch(word_t x, word_t y, word_t z) { return (x & y) ^ ((~x) & z); }
-
-inline word_t maj(word_t x, word_t y, word_t z) {
-    return (x & y) ^ (x & z) ^ (y & z);
-}
-
-inline word_t rotr(word_t x, std::size_t n) {
-    assert(n < 32);
-    return mask_32bit((x >> n) | (x << (32 - n)));
-}
-
-inline word_t bsig0(word_t x) { return rotr(x, 2) ^ rotr(x, 13) ^ rotr(x, 22); }
-
-inline word_t bsig1(word_t x) { return rotr(x, 6) ^ rotr(x, 11) ^ rotr(x, 25); }
-
-inline word_t shr(word_t x, std::size_t n) {
-    assert(n < 32);
-    return x >> n;
-}
-
-inline word_t ssig0(word_t x) { return rotr(x, 7) ^ rotr(x, 18) ^ shr(x, 3); }
-
-inline word_t ssig1(word_t x) { return rotr(x, 17) ^ rotr(x, 19) ^ shr(x, 10); }
-
-template <typename RaIter1, typename RaIter2>
-void hash256_block(RaIter1 message_digest, RaIter2 first, RaIter2 last) {
-    assert(first + 64 == last);
-    static_cast<void>(last);  // for avoiding unused-variable warning
-    word_t w[64];
-    std::fill(w, w + 64, 0);
-    for (std::size_t i = 0; i < 16; ++i) {
-        w[i] = (static_cast<word_t>(mask_8bit(*(first + long(i) * 4))) << 24) |
-               (static_cast<word_t>(mask_8bit(*(first + long(i) * 4 + 1))) << 16) |
-               (static_cast<word_t>(mask_8bit(*(first + long(i) * 4 + 2))) << 8) |
-               (static_cast<word_t>(mask_8bit(*(first + long(i) * 4 + 3))));
-    }
-    for (std::size_t i = 16; i < 64; ++i) {
-        w[i] = mask_32bit(ssig1(w[i - 2]) + w[i - 7] + ssig0(w[i - 15]) +
-                          w[i - 16]);
-    }
-
-    word_t a = *message_digest;
-    word_t b = *(message_digest + 1);
-    word_t c = *(message_digest + 2);
-    word_t d = *(message_digest + 3);
-    word_t e = *(message_digest + 4);
-    word_t f = *(message_digest + 5);
-    word_t g = *(message_digest + 6);
-    word_t h = *(message_digest + 7);
-
-    for (std::size_t i = 0; i < 64; ++i) {
-        word_t temp1 = h + bsig1(e) + ch(e, f, g) + add_constant[i] + w[i];
-        word_t temp2 = bsig0(a) + maj(a, b, c);
-        h = g;
-        g = f;
-        f = e;
-        e = mask_32bit(d + temp1);
-        d = c;
-        c = b;
-        b = a;
-        a = mask_32bit(temp1 + temp2);
-    }
-    *message_digest += a;
-    *(message_digest + 1) += b;
-    *(message_digest + 2) += c;
-    *(message_digest + 3) += d;
-    *(message_digest + 4) += e;
-    *(message_digest + 5) += f;
-    *(message_digest + 6) += g;
-    *(message_digest + 7) += h;
-    for (std::size_t i = 0; i < 8; ++i) {
-        *(message_digest + i) = mask_32bit(*(message_digest + i));
-    }
-}
-
-}  // namespace detail
-
-template <typename InIter>
-void output_hex(InIter first, InIter last, std::ostream& os) {
-    os.setf(std::ios::hex, std::ios::basefield);
-    while (first != last) {
-        os.width(2);
-        os.fill('0');
-        os << static_cast<unsigned int>(*first);
-        ++first;
-    }
-    os.setf(std::ios::dec, std::ios::basefield);
-}
-
-template <typename InIter>
-void bytes_to_hex_string(InIter first, InIter last, std::string& hex_str) {
-    std::ostringstream oss;
-    output_hex(first, last, oss);
-    hex_str.assign(oss.str());
-}
-
-template <typename InContainer>
-void bytes_to_hex_string(const InContainer& bytes, std::string& hex_str) {
-    bytes_to_hex_string(bytes.begin(), bytes.end(), hex_str);
-}
-
-template <typename InIter>
-std::string bytes_to_hex_string(InIter first, InIter last) {
-    std::string hex_str;
-    bytes_to_hex_string(first, last, hex_str);
-    return hex_str;
-}
-
-template <typename InContainer>
-std::string bytes_to_hex_string(const InContainer& bytes) {
-    std::string hex_str;
-    bytes_to_hex_string(bytes, hex_str);
-    return hex_str;
-}
-
-class hash256_one_by_one {
-   public:
-    hash256_one_by_one() { init(); }
-
-    void init() {
-        buffer_.clear();
-        std::fill(data_length_digits_, data_length_digits_ + 4, 0);
-        std::copy(detail::initial_message_digest,
-                  detail::initial_message_digest + 8, h_);
-    }
-
-    template <typename RaIter>
-    void process(RaIter first, RaIter last) {
-        add_to_data_length(static_cast<word_t>(std::distance(first, last)));
-        std::copy(first, last, std::back_inserter(buffer_));
-        std::size_t i = 0;
-        for (; i + 64 <= buffer_.size(); i += 64) {
-            detail::hash256_block(h_, buffer_.begin() + long(i),
-                                  buffer_.begin() + long(i) + 64);
-        }
-        buffer_.erase(buffer_.begin(), buffer_.begin() + long(i));
-    }
-
-    void finish() {
-        byte_t temp[64];
-        std::fill(temp, temp + 64, 0);
-        std::size_t remains = buffer_.size();
-        std::copy(buffer_.begin(), buffer_.end(), temp);
-        temp[remains] = 0x80;
-
-        if (remains > 55) {
-            std::fill(temp + remains + 1, temp + 64, 0);
-            detail::hash256_block(h_, temp, temp + 64);
-            std::fill(temp, temp + 64 - 4, 0);
-        } else {
-            std::fill(temp + remains + 1, temp + 64 - 4, 0);
-        }
-
-        write_data_bit_length(&(temp[56]));
-        detail::hash256_block(h_, temp, temp + 64);
-    }
-
-    template <typename OutIter>
-    void get_hash_bytes(OutIter first, OutIter last) const {
-        for (const word_t* iter = h_; iter != h_ + 8; ++iter) {
-            for (std::size_t i = 0; i < 4 && first != last; ++i) {
-                *(first++) = detail::mask_8bit(
-                    static_cast<byte_t>((*iter >> (24 - 8 * i))));
-            }
-        }
-    }
-
-   private:
-    void add_to_data_length(word_t n) {
-        word_t carry = 0;
-        data_length_digits_[0] += n;
-        for (std::size_t i = 0; i < 4; ++i) {
-            data_length_digits_[i] += carry;
-            if (data_length_digits_[i] >= 65536u) {
-                carry = data_length_digits_[i] >> 16;
-                data_length_digits_[i] &= 65535u;
-            } else {
-                break;
-            }
-        }
-    }
-    void write_data_bit_length(byte_t* begin) {
-        word_t data_bit_length_digits[4];
-        std::copy(data_length_digits_, data_length_digits_ + 4,
-                  data_bit_length_digits);
-
-        // convert byte length to bit length (multiply 8 or shift 3 times left)
-        word_t carry = 0;
-        for (std::size_t i = 0; i < 4; ++i) {
-            word_t before_val = data_bit_length_digits[i];
-            data_bit_length_digits[i] <<= 3;
-            data_bit_length_digits[i] |= carry;
-            data_bit_length_digits[i] &= 65535u;
-            carry = (before_val >> (16 - 3)) & 65535u;
-        }
-
-        // write data_bit_length
-        for (int i = 3; i >= 0; --i) {
-            (*begin++) = static_cast<byte_t>(data_bit_length_digits[i] >> 8);
-            (*begin++) = static_cast<byte_t>(data_bit_length_digits[i]);
-        }
-    }
-    std::vector<byte_t> buffer_;
-    word_t data_length_digits_[4];  // as 64bit integer (16bit x 4 integer)
-    word_t h_[8];
-};
-
-inline void get_hash_hex_string(const hash256_one_by_one& hasher,
-                                std::string& hex_str) {
-    byte_t hash[k_digest_size];
-    hasher.get_hash_bytes(hash, hash + k_digest_size);
-    return bytes_to_hex_string(hash, hash + k_digest_size, hex_str);
-}
-
-inline std::string get_hash_hex_string(const hash256_one_by_one& hasher) {
-    std::string hex_str;
-    get_hash_hex_string(hasher, hex_str);
-    return hex_str;
-}
-
-namespace impl {
-template <typename RaIter, typename OutIter>
-void hash256_impl(RaIter first, RaIter last, OutIter first2, OutIter last2, int,
-                  std::random_access_iterator_tag) {
-    hash256_one_by_one hasher;
-    // hasher.init();
-    hasher.process(first, last);
-    hasher.finish();
-    hasher.get_hash_bytes(first2, last2);
-}
-
-template <typename InputIter, typename OutIter>
-void hash256_impl(InputIter first, InputIter last, OutIter first2,
-                  OutIter last2, size_t buffer_size, std::input_iterator_tag) {
-    std::vector<byte_t> buffer(buffer_size);
-    hash256_one_by_one hasher;
-    // hasher.init();
-    while (first != last) {
-        size_t size = buffer_size;
-        for (size_t i = 0; i != buffer_size; ++i, ++first) {
-            if (first == last) {
-                size = i;
-                break;
-            }
-            buffer[i] = *first;
-        }
-        hasher.process(buffer.begin(), buffer.begin() + ptrdiff_t(size));
-    }
-    hasher.finish();
-    hasher.get_hash_bytes(first2, last2);
-}
-}
-
-template <typename InIter, typename OutIter>
-void hash256(InIter first, InIter last, OutIter first2, OutIter last2,
-             int buffer_size = PICOSHA2_BUFFER_SIZE_FOR_INPUT_ITERATOR) {
-    picosha2::impl::hash256_impl(
-        first, last, first2, last2, buffer_size,
-        typename std::iterator_traits<InIter>::iterator_category());
-}
-
-template <typename InIter, typename OutContainer>
-void hash256(InIter first, InIter last, OutContainer& dst) {
-    hash256(first, last, dst.begin(), dst.end());
-}
-
-template <typename InContainer, typename OutIter>
-void hash256(const InContainer& src, OutIter first, OutIter last) {
-    hash256(src.begin(), src.end(), first, last);
-}
-
-template <typename InContainer, typename OutContainer>
-void hash256(const InContainer& src, OutContainer& dst) {
-    hash256(src.begin(), src.end(), dst.begin(), dst.end());
-}
-
-template <typename InIter>
-void hash256_hex_string(InIter first, InIter last, std::string& hex_str) {
-    byte_t hashed[k_digest_size];
-    hash256(first, last, hashed, hashed + k_digest_size);
-    std::ostringstream oss;
-    output_hex(hashed, hashed + k_digest_size, oss);
-    hex_str.assign(oss.str());
-}
-
-template <typename RaContainer>
-std::vector<uint8_t> hash256(RaContainer const& _src)
-{
-       std::vector<uint8_t> ret(32);
-       hash256(_src.begin(), _src.end(), ret.begin(), ret.end());
-       return ret;
-}
-
-template <typename InIter>
-std::string hash256_hex_string(InIter first, InIter last) {
-    std::string hex_str;
-    hash256_hex_string(first, last, hex_str);
-    return hex_str;
-}
-
-inline void hash256_hex_string(const std::string& src, std::string& hex_str) {
-    hash256_hex_string(src.begin(), src.end(), hex_str);
-}
-
-template <typename InContainer>
-void hash256_hex_string(const InContainer& src, std::string& hex_str) {
-    hash256_hex_string(src.begin(), src.end(), hex_str);
-}
-
-template <typename InContainer>
-std::string hash256_hex_string(const InContainer& src) {
-    return hash256_hex_string(src.begin(), src.end());
-}
-template<typename OutIter>void hash256(std::ifstream& f, OutIter first, OutIter last){
-    hash256(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>(), first,last);
-
-}
-}// namespace picosha2
-#endif  // PICOSHA2_H
diff --git a/libsolutil/vector_ref.h b/libsolutil/vector_ref.h
deleted file mode 100644
index 56942b9abb71..000000000000
--- a/libsolutil/vector_ref.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma once
-
-#include <cstring>
-#include <cassert>
-#include <type_traits>
-#include <vector>
-#include <string>
-
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:597) // will not be called for implicit or explicit conversions
-#endif
-
-namespace solidity::util
-{
-
-/**
- * A modifiable reference to an existing object or vector in memory.
- */
-template <class T>
-class vector_ref
-{
-public:
-	using value_type = T;
-	using element_type = T;
-	using mutable_value_type = typename std::conditional<std::is_const<T>::value, typename std::remove_const<T>::type, T>::type;
-	using string_type = typename std::conditional<std::is_const<T>::value, std::string const, std::string>::type;
-	using vector_type = typename std::conditional<std::is_const<T>::value, std::vector<typename std::remove_const<T>::type> const, std::vector<T>>::type;
-	using iterator = T*;
-	using const_iterator = T const*;
-
-	static_assert(std::is_standard_layout_v<value_type> && std::is_trivial_v<value_type>, "vector_ref can only be used with PODs due to its low-level treatment of data.");
-
-	vector_ref(): m_data(nullptr), m_count(0) {}
-	/// Creates a new vector_ref to point to @a _count elements starting at @a _data.
-	vector_ref(T* _data, size_t _count): m_data(_data), m_count(_count) {}
-	/// Creates a new vector_ref pointing to the data part of a string (given as pointer).
-	vector_ref(string_type* _data): m_data(reinterpret_cast<T*>(_data->data())), m_count(_data->size() / sizeof(T)) {}
-	/// Creates a new vector_ref pointing to the data part of a string (given as reference).
-	vector_ref(string_type& _data): vector_ref(&_data) {}
-	/// Creates a new vector_ref pointing to the data part of a vector (given as pointer).
-	vector_ref(vector_type* _data): m_data(_data->data()), m_count(_data->size()) {}
-	explicit operator bool() const { return m_data && m_count; }
-
-	std::vector<unsigned char> toBytes() const { return std::vector<unsigned char>(reinterpret_cast<unsigned char const*>(m_data), reinterpret_cast<unsigned char const*>(m_data) + m_count * sizeof(T)); }
-	std::string toString() const { return std::string((char const*)m_data, ((char const*)m_data) + m_count * sizeof(T)); }
-
-	operator vector_ref<T const>() const { return vector_ref<T const>(m_data, m_count); }
-
-	T* data() const { return m_data; }
-	/// @returns the number of elements referenced (not necessarily number of bytes).
-	size_t size() const { return m_count; }
-	bool empty() const { return !m_count; }
-	/// @returns a new vector_ref which is a shifted and shortened view of the original data.
-	/// If this goes out of bounds in any way, returns an empty vector_ref.
-	/// If @a _count is ~size_t(0), extends the view to the end of the data.
-	vector_ref<T> cropped(size_t _begin, size_t _count) const { if (m_data && _begin <= m_count && _count <= m_count && _begin + _count <= m_count) return vector_ref<T>(m_data + _begin, _count == ~size_t(0) ? m_count - _begin : _count); else return vector_ref<T>(); }
-	/// @returns a new vector_ref which is a shifted view of the original data (not going beyond it).
-	vector_ref<T> cropped(size_t _begin) const { if (m_data && _begin <= m_count) return vector_ref<T>(m_data + _begin, m_count - _begin); else return vector_ref<T>(); }
-
-	T* begin() { return m_data; }
-	T* end() { return m_data + m_count; }
-	T const* begin() const { return m_data; }
-	T const* end() const { return m_data + m_count; }
-
-	T& operator[](size_t _i) { assert(m_data); assert(_i < m_count); return m_data[_i]; }
-	T const& operator[](size_t _i) const { assert(m_data); assert(_i < m_count); return m_data[_i]; }
-
-	bool operator==(vector_ref<T> const& _cmp) const { return m_data == _cmp.m_data && m_count == _cmp.m_count; }
-	bool operator!=(vector_ref<T> const& _cmp) const { return !operator==(_cmp); }
-
-	void reset() { m_data = nullptr; m_count = 0; }
-
-private:
-	T* m_data = nullptr;
-	size_t m_count = 0;
-};
-
-}
diff --git a/libstdlib/CMakeLists.txt b/libstdlib/CMakeLists.txt
deleted file mode 100644
index 65a3a1cda16b..000000000000
--- a/libstdlib/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# This will re-generate the headers if any file within src was modified.
-set_directory_properties(PROPERTY CMAKE_CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/stdlib/src/)
-
-set(STDLIB stub)
-set(GENERATED_STDLIB_HEADERS)
-foreach(src IN LISTS STDLIB)
-    set(STDLIB_FILE ${PROJECT_SOURCE_DIR}/libstdlib/src/${src}.sol)
-    file(READ ${STDLIB_FILE} STDLIB_FILE_CONTENT HEX)
-    string(REGEX MATCHALL ".." STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
-    list(REMOVE_ITEM STDLIB_FILE_CONTENT "0d")
-    string(REGEX REPLACE ";" ",\n\t0x" STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
-    set(STDLIB_FILE_CONTENT "0x${STDLIB_FILE_CONTENT}")
-    set(STDLIB_FILE_NAME ${src})
-    configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
-    list(APPEND GENERATED_STDLIB_HEADERS ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h)
-endforeach()
-
-configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)
diff --git a/libstdlib/src/stub.sol b/libstdlib/src/stub.sol
deleted file mode 100644
index 46ae21dcf5a2..000000000000
--- a/libstdlib/src/stub.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity >=0.0;
-
-pragma experimental solidity;
-
-function identity(uint256 x) pure returns (uint256)
-{
-  return x;
-}
diff --git a/libstdlib/stdlib.h.in b/libstdlib/stdlib.h.in
deleted file mode 100644
index 3b86029dc6e1..000000000000
--- a/libstdlib/stdlib.h.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-
-#include "libstdlib/stub.h"
-
-namespace solidity::stdlib
-{
-
-static std::map<std::string, std::string> sources = {
-	{ "std.stub", stub }
-};
-
-} // namespace solidity::stdlib
diff --git a/libstdlib/stdlib.src.h.in b/libstdlib/stdlib.src.h.in
deleted file mode 100644
index 0407663d6b4d..000000000000
--- a/libstdlib/stdlib.src.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
-// The generation of this file is defined in stdlib/CMakeLists.txt.
-// This file was generated by using the content of stdlib/src/@STDLIB_FILE_NAME@.sol.
-
-#pragma once
-
-namespace solidity::stdlib
-{
-
-static char const @STDLIB_FILE_NAME@[] = {
-	@STDLIB_FILE_CONTENT@, 0
-};
-
-} // namespace solidity::stdlib
diff --git a/libyul/AST.h b/libyul/AST.h
deleted file mode 100644
index 71419d807faa..000000000000
--- a/libyul/AST.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Parsed inline assembly to be used by the AST
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <liblangutil/SourceLocation.h>
-
-#include <memory>
-#include <optional>
-
-namespace solidity::yul
-{
-
-using Type = YulString;
-
-struct DebugData
-{
-	explicit DebugData(
-		langutil::SourceLocation _nativeLocation,
-		langutil::SourceLocation _originLocation = {},
-		std::optional<int64_t> _astID = {}
-	):
-		nativeLocation(std::move(_nativeLocation)),
-		originLocation(std::move(_originLocation)),
-		astID(std::move(_astID))
-	{}
-
-	static std::shared_ptr<DebugData const> create(
-		langutil::SourceLocation _nativeLocation = {},
-		langutil::SourceLocation _originLocation = {},
-		std::optional<int64_t> _astID = {}
-	)
-	{
-		return std::make_shared<DebugData const>(
-			std::move(_nativeLocation),
-			std::move(_originLocation),
-			std::move(_astID)
-		);
-	}
-
-	/// Location in the Yul code.
-	langutil::SourceLocation nativeLocation;
-	/// Location in the original source that the Yul code was produced from.
-	/// Optional. Only present if the Yul source contains location annotations.
-	langutil::SourceLocation originLocation;
-	/// ID in the (Solidity) source AST.
-	std::optional<int64_t> astID;
-};
-
-struct TypedName { std::shared_ptr<DebugData const> debugData; YulString name; Type type; };
-using TypedNameList = std::vector<TypedName>;
-
-/// Literal number or string (up to 32 bytes)
-enum class LiteralKind { Number, Boolean, String };
-struct Literal { std::shared_ptr<DebugData const> debugData; LiteralKind kind; YulString value; Type type; };
-/// External / internal identifier or label reference
-struct Identifier { std::shared_ptr<DebugData const> debugData; YulString name; };
-/// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand
-/// side and requires x to occupy exactly one stack slot.
-///
-/// Multiple assignment ("x, y := f()"), where the left hand side variables each occupy
-/// a single stack slot and expects a single expression on the right hand returning
-/// the same amount of items as the number of variables.
-struct Assignment { std::shared_ptr<DebugData const> debugData; std::vector<Identifier> variableNames; std::unique_ptr<Expression> value; };
-struct FunctionCall { std::shared_ptr<DebugData const> debugData; Identifier functionName; std::vector<Expression> arguments; };
-/// Statement that contains only a single expression
-struct ExpressionStatement { std::shared_ptr<DebugData const> debugData; Expression expression; };
-/// Block-scope variable declaration ("let x:u256 := mload(20:u256)"), non-hoisted
-struct VariableDeclaration { std::shared_ptr<DebugData const> debugData; TypedNameList variables; std::unique_ptr<Expression> value; };
-/// Block that creates a scope (frees declared stack variables)
-struct Block { std::shared_ptr<DebugData const> debugData; std::vector<Statement> statements; };
-/// Function definition ("function f(a, b) -> (d, e) { ... }")
-struct FunctionDefinition { std::shared_ptr<DebugData const> debugData; YulString name; TypedNameList parameters; TypedNameList returnVariables; Block body; };
-/// Conditional execution without "else" part.
-struct If { std::shared_ptr<DebugData const> debugData; std::unique_ptr<Expression> condition; Block body; };
-/// Switch case or default case
-struct Case { std::shared_ptr<DebugData const> debugData; std::unique_ptr<Literal> value; Block body; };
-/// Switch statement
-struct Switch { std::shared_ptr<DebugData const> debugData; std::unique_ptr<Expression> expression; std::vector<Case> cases; };
-struct ForLoop { std::shared_ptr<DebugData const> debugData; Block pre; std::unique_ptr<Expression> condition; Block post; Block body; };
-/// Break statement (valid within for loop)
-struct Break { std::shared_ptr<DebugData const> debugData; };
-/// Continue statement (valid within for loop)
-struct Continue { std::shared_ptr<DebugData const> debugData; };
-/// Leave statement (valid within function)
-struct Leave { std::shared_ptr<DebugData const> debugData; };
-
-/// Extracts the IR source location from a Yul node.
-template <class T> inline langutil::SourceLocation nativeLocationOf(T const& _node)
-{
-	return _node.debugData ? _node.debugData->nativeLocation : langutil::SourceLocation{};
-}
-
-/// Extracts the IR source location from a Yul node.
-template <class... Args> inline langutil::SourceLocation nativeLocationOf(std::variant<Args...> const& _node)
-{
-	return std::visit([](auto const& _arg) { return nativeLocationOf(_arg); }, _node);
-}
-
-/// Extracts the original source location from a Yul node.
-template <class T> inline langutil::SourceLocation originLocationOf(T const& _node)
-{
-	return _node.debugData ? _node.debugData->originLocation : langutil::SourceLocation{};
-}
-
-/// Extracts the original source location from a Yul node.
-template <class... Args> inline langutil::SourceLocation originLocationOf(std::variant<Args...> const& _node)
-{
-	return std::visit([](auto const& _arg) { return originLocationOf(_arg); }, _node);
-}
-
-/// Extracts the debug data from a Yul node.
-template <class T> inline std::shared_ptr<DebugData const> debugDataOf(T const& _node)
-{
-	return _node.debugData;
-}
-
-/// Extracts the debug data from a Yul node.
-template <class... Args> inline std::shared_ptr<DebugData const> debugDataOf(std::variant<Args...> const& _node)
-{
-	return std::visit([](auto const& _arg) { return debugDataOf(_arg); }, _node);
-}
-
-inline bool hasDefaultCase(Switch const& _switch)
-{
-	return std::any_of(
-		_switch.cases.begin(),
-		_switch.cases.end(),
-		[](Case const& _case) { return !_case.value; }
-	);
-}
-
-}
diff --git a/libyul/ASTForward.h b/libyul/ASTForward.h
deleted file mode 100644
index 0e61c6ca1263..000000000000
--- a/libyul/ASTForward.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Forward declaration of classes for inline assembly / Yul AST
- */
-
-#pragma once
-
-#include <variant>
-
-namespace solidity::yul
-{
-
-struct DebugData;
-enum class LiteralKind;
-struct Literal;
-struct Label;
-struct Identifier;
-struct Assignment;
-struct VariableDeclaration;
-struct FunctionDefinition;
-struct FunctionCall;
-struct If;
-struct Switch;
-struct Case;
-struct ForLoop;
-struct Break;
-struct Continue;
-struct Leave;
-struct ExpressionStatement;
-struct Block;
-
-struct TypedName;
-
-using Expression = std::variant<FunctionCall, Identifier, Literal>;
-using Statement = std::variant<ExpressionStatement, Assignment, VariableDeclaration, FunctionDefinition, If, Switch, ForLoop, Break, Continue, Leave, Block>;
-
-}
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
deleted file mode 100644
index ed4187540e76..000000000000
--- a/libyul/AsmAnalysis.cpp
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Analyzer part of inline assembly.
- */
-
-#include <libyul/AsmAnalysis.h>
-
-#include <libyul/AST.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/Utilities.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Object.h>
-#include <libyul/Scope.h>
-#include <libyul/ScopeFiller.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/Visitor.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <fmt/format.h>
-
-#include <memory>
-#include <functional>
-
-using namespace std::string_literals;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-namespace
-{
-inline std::string to_string(LiteralKind _kind)
-{
-	switch (_kind)
-	{
-	case LiteralKind::Number: return "number";
-	case LiteralKind::Boolean: return "boolean";
-	case LiteralKind::String: return "string";
-	default: yulAssert(false, "");
-	}
-}
-}
-
-bool AsmAnalyzer::analyze(Block const& _block)
-{
-	auto watcher = m_errorReporter.errorWatcher();
-	try
-	{
-		if (!(ScopeFiller(m_info, m_errorReporter))(_block))
-			return false;
-
-		(*this)(_block);
-	}
-	catch (FatalError const&)
-	{
-		// This FatalError con occur if the errorReporter has too many errors.
-		yulAssert(!watcher.ok(), "Fatal error detected, but no error is reported.");
-	}
-	return watcher.ok();
-}
-
-AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect, Object const& _object)
-{
-	ErrorList errorList;
-	langutil::ErrorReporter errors(errorList);
-	AsmAnalysisInfo analysisInfo;
-	bool success = yul::AsmAnalyzer(
-		analysisInfo,
-		errors,
-		_dialect,
-		{},
-		_object.qualifiedDataNames()
-	).analyze(*_object.code);
-	yulAssert(success && !errors.hasErrors(), "Invalid assembly/yul code.");
-	return analysisInfo;
-}
-
-std::vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
-{
-	expectValidType(_literal.type, nativeLocationOf(_literal));
-	if (_literal.kind == LiteralKind::String && _literal.value.str().size() > 32)
-		m_errorReporter.typeError(
-			3069_error,
-			nativeLocationOf(_literal),
-			"String literal too long (" + std::to_string(_literal.value.str().size()) + " > 32)"
-		);
-	else if (_literal.kind == LiteralKind::Number && bigint(_literal.value.str()) > u256(-1))
-		m_errorReporter.typeError(6708_error, nativeLocationOf(_literal), "Number literal too large (> 256 bits)");
-	else if (_literal.kind == LiteralKind::Boolean)
-		yulAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "");
-
-	if (!m_dialect.validTypeForLiteral(_literal.kind, _literal.value, _literal.type))
-		m_errorReporter.typeError(
-			5170_error,
-			nativeLocationOf(_literal),
-			"Invalid type \"" + _literal.type.str() + "\" for literal \"" + _literal.value.str() + "\"."
-		);
-
-	return {_literal.type};
-}
-
-std::vector<YulString> AsmAnalyzer::operator()(Identifier const& _identifier)
-{
-	yulAssert(!_identifier.name.empty(), "");
-	auto watcher = m_errorReporter.errorWatcher();
-	YulString type = m_dialect.defaultType;
-
-	if (m_currentScope->lookup(_identifier.name, GenericVisitor{
-		[&](Scope::Variable const& _var)
-		{
-			if (!m_activeVariables.count(&_var))
-				m_errorReporter.declarationError(
-					4990_error,
-					nativeLocationOf(_identifier),
-					"Variable " + _identifier.name.str() + " used before it was declared."
-				);
-			type = _var.type;
-		},
-		[&](Scope::Function const&)
-		{
-			m_errorReporter.typeError(
-				6041_error,
-				nativeLocationOf(_identifier),
-				"Function " + _identifier.name.str() + " used without being called."
-			);
-		}
-	}))
-	{
-		if (m_resolver)
-			// We found a local reference, make sure there is no external reference.
-			m_resolver(
-				_identifier,
-				yul::IdentifierContext::NonExternal,
-				m_currentScope->insideFunction()
-			);
-	}
-	else
-	{
-		bool found = m_resolver && m_resolver(
-			_identifier,
-			yul::IdentifierContext::RValue,
-			m_currentScope->insideFunction()
-		);
-		if (!found && watcher.ok())
-			// Only add an error message if the callback did not do it.
-			m_errorReporter.declarationError(
-				8198_error,
-				nativeLocationOf(_identifier),
-				"Identifier \"" + _identifier.name.str() + "\" not found."
-			);
-
-	}
-
-	return {type};
-}
-
-void AsmAnalyzer::operator()(ExpressionStatement const& _statement)
-{
-	auto watcher = m_errorReporter.errorWatcher();
-	std::vector<YulString> types = std::visit(*this, _statement.expression);
-	if (watcher.ok() && !types.empty())
-		m_errorReporter.typeError(
-			3083_error,
-			nativeLocationOf(_statement),
-			"Top-level expressions are not supposed to return values (this expression returns " +
-			std::to_string(types.size()) +
-			" value" +
-			(types.size() == 1 ? "" : "s") +
-			"). Use ``pop()`` or assign them."
-		);
-}
-
-void AsmAnalyzer::operator()(Assignment const& _assignment)
-{
-	yulAssert(_assignment.value, "");
-	size_t const numVariables = _assignment.variableNames.size();
-	yulAssert(numVariables >= 1, "");
-
-	std::set<YulString> variables;
-	for (auto const& _variableName: _assignment.variableNames)
-		if (!variables.insert(_variableName.name).second)
-			m_errorReporter.declarationError(
-				9005_error,
-				nativeLocationOf(_assignment),
-				"Variable " +
-				_variableName.name.str() +
-				" occurs multiple times on the left-hand side of the assignment."
-			);
-
-	std::vector<YulString> types = std::visit(*this, *_assignment.value);
-
-	if (types.size() != numVariables)
-		m_errorReporter.declarationError(
-			8678_error,
-			nativeLocationOf(_assignment),
-			"Variable count for assignment to \"" +
-			joinHumanReadable(applyMap(_assignment.variableNames, [](auto const& _identifier){ return _identifier.name.str(); })) +
-			"\" does not match number of values (" +
-			std::to_string(numVariables) +
-			" vs. " +
-			std::to_string(types.size()) +
-			")"
-		);
-
-	for (size_t i = 0; i < numVariables; ++i)
-		if (i < types.size())
-			checkAssignment(_assignment.variableNames[i], types[i]);
-}
-
-void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
-{
-	size_t const numVariables = _varDecl.variables.size();
-	if (m_resolver)
-		for (auto const& variable: _varDecl.variables)
-			// Call the resolver for variable declarations to allow it to raise errors on shadowing.
-			m_resolver(
-				yul::Identifier{variable.debugData, variable.name},
-				yul::IdentifierContext::VariableDeclaration,
-				m_currentScope->insideFunction()
-			);
-	for (auto const& variable: _varDecl.variables)
-	{
-		expectValidIdentifier(variable.name, nativeLocationOf(variable));
-		expectValidType(variable.type, nativeLocationOf(variable));
-	}
-
-	if (_varDecl.value)
-	{
-		std::vector<YulString> types = std::visit(*this, *_varDecl.value);
-		if (types.size() != numVariables)
-			m_errorReporter.declarationError(
-				3812_error,
-				nativeLocationOf(_varDecl),
-				"Variable count mismatch for declaration of \"" +
-				joinHumanReadable(applyMap(_varDecl.variables, [](auto const& _identifier){ return _identifier.name.str(); })) +
-				+ "\": " +
-				std::to_string(numVariables) +
-				" variables and " +
-				std::to_string(types.size()) +
-				" values."
-			);
-
-		for (size_t i = 0; i < _varDecl.variables.size(); ++i)
-		{
-			YulString givenType = m_dialect.defaultType;
-			if (i < types.size())
-				givenType = types[i];
-			TypedName const& variable = _varDecl.variables[i];
-			if (variable.type != givenType)
-				m_errorReporter.typeError(
-					3947_error,
-					nativeLocationOf(variable),
-					"Assigning value of type \"" + givenType.str() + "\" to variable of type \"" + variable.type.str() + "\"."
-				);
-		}
-	}
-
-	for (TypedName const& variable: _varDecl.variables)
-		m_activeVariables.insert(&std::get<Scope::Variable>(
-			m_currentScope->identifiers.at(variable.name))
-		);
-}
-
-void AsmAnalyzer::operator()(FunctionDefinition const& _funDef)
-{
-	yulAssert(!_funDef.name.empty(), "");
-	expectValidIdentifier(_funDef.name, nativeLocationOf(_funDef));
-	Block const* virtualBlock = m_info.virtualBlocks.at(&_funDef).get();
-	yulAssert(virtualBlock, "");
-	Scope& varScope = scope(virtualBlock);
-	for (auto const& var: _funDef.parameters + _funDef.returnVariables)
-	{
-		expectValidIdentifier(var.name, nativeLocationOf(var));
-		expectValidType(var.type, nativeLocationOf(var));
-		m_activeVariables.insert(&std::get<Scope::Variable>(varScope.identifiers.at(var.name)));
-	}
-
-	(*this)(_funDef.body);
-}
-
-std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
-{
-	yulAssert(!_funCall.functionName.name.empty(), "");
-	auto watcher = m_errorReporter.errorWatcher();
-	std::vector<YulString> const* parameterTypes = nullptr;
-	std::vector<YulString> const* returnTypes = nullptr;
-	std::vector<std::optional<LiteralKind>> const* literalArguments = nullptr;
-
-	if (BuiltinFunction const* f = m_dialect.builtin(_funCall.functionName.name))
-	{
-		if (_funCall.functionName.name == "selfdestruct"_yulstring)
-			m_errorReporter.warning(
-				1699_error,
-				nativeLocationOf(_funCall.functionName),
-				"\"selfdestruct\" has been deprecated. "
-				"The underlying opcode will eventually undergo breaking changes, "
-				"and its use is not recommended."
-			);
-		parameterTypes = &f->parameters;
-		returnTypes = &f->returns;
-		if (!f->literalArguments.empty())
-			literalArguments = &f->literalArguments;
-
-		validateInstructions(_funCall);
-		m_sideEffects += f->sideEffects;
-	}
-	else if (m_currentScope->lookup(_funCall.functionName.name, GenericVisitor{
-		[&](Scope::Variable const&)
-		{
-			m_errorReporter.typeError(
-				4202_error,
-				nativeLocationOf(_funCall.functionName),
-				"Attempt to call variable instead of function."
-			);
-		},
-		[&](Scope::Function const& _fun)
-		{
-			parameterTypes = &_fun.arguments;
-			returnTypes = &_fun.returns;
-		}
-	}))
-	{
-		if (m_resolver)
-			// We found a local reference, make sure there is no external reference.
-			m_resolver(
-				_funCall.functionName,
-				yul::IdentifierContext::NonExternal,
-				m_currentScope->insideFunction()
-			);
-	}
-	else
-	{
-		if (!validateInstructions(_funCall))
-			m_errorReporter.declarationError(
-				4619_error,
-				nativeLocationOf(_funCall.functionName),
-				"Function \"" + _funCall.functionName.name.str() + "\" not found."
-			);
-		yulAssert(!watcher.ok(), "Expected a reported error.");
-	}
-
-	if (parameterTypes && _funCall.arguments.size() != parameterTypes->size())
-		m_errorReporter.typeError(
-			7000_error,
-			nativeLocationOf(_funCall.functionName),
-			"Function \"" + _funCall.functionName.name.str() + "\" expects " +
-			std::to_string(parameterTypes->size()) +
-			" arguments but got " +
-			std::to_string(_funCall.arguments.size()) + "."
-		);
-
-	std::vector<YulString> argTypes;
-	for (size_t i = _funCall.arguments.size(); i > 0; i--)
-	{
-		Expression const& arg = _funCall.arguments[i - 1];
-		if (
-			auto literalArgumentKind = (literalArguments && i <= literalArguments->size()) ?
-				literalArguments->at(i - 1) :
-				std::nullopt
-		)
-		{
-			if (!std::holds_alternative<Literal>(arg))
-				m_errorReporter.typeError(
-					9114_error,
-					nativeLocationOf(_funCall.functionName),
-					"Function expects direct literals as arguments."
-				);
-			else if (*literalArgumentKind != std::get<Literal>(arg).kind)
-				m_errorReporter.typeError(
-					5859_error,
-					nativeLocationOf(arg),
-					"Function expects " + to_string(*literalArgumentKind) + " literal."
-				);
-			else if (*literalArgumentKind == LiteralKind::String)
-			{
-				std::string functionName = _funCall.functionName.name.str();
-				if (functionName == "datasize" || functionName == "dataoffset")
-				{
-					if (!m_dataNames.count(std::get<Literal>(arg).value))
-						m_errorReporter.typeError(
-							3517_error,
-							nativeLocationOf(arg),
-							"Unknown data object \"" + std::get<Literal>(arg).value.str() + "\"."
-						);
-				}
-				else if (functionName.substr(0, "verbatim_"s.size()) == "verbatim_")
-				{
-					if (std::get<Literal>(arg).value.empty())
-						m_errorReporter.typeError(
-							1844_error,
-							nativeLocationOf(arg),
-							"The \"verbatim_*\" builtins cannot be used with empty bytecode."
-						);
-				}
-
-				argTypes.emplace_back(expectUnlimitedStringLiteral(std::get<Literal>(arg)));
-				continue;
-			}
-		}
-		argTypes.emplace_back(expectExpression(arg));
-	}
-	std::reverse(argTypes.begin(), argTypes.end());
-
-	if (parameterTypes && parameterTypes->size() == argTypes.size())
-		for (size_t i = 0; i < parameterTypes->size(); ++i)
-			expectType((*parameterTypes)[i], argTypes[i], nativeLocationOf(_funCall.arguments[i]));
-
-	if (watcher.ok())
-	{
-		yulAssert(parameterTypes && parameterTypes->size() == argTypes.size(), "");
-		yulAssert(returnTypes, "");
-		return *returnTypes;
-	}
-	else if (returnTypes)
-		return std::vector<YulString>(returnTypes->size(), m_dialect.defaultType);
-	else
-		return {};
-}
-
-void AsmAnalyzer::operator()(If const& _if)
-{
-	expectBoolExpression(*_if.condition);
-
-	(*this)(_if.body);
-}
-
-void AsmAnalyzer::operator()(Switch const& _switch)
-{
-	yulAssert(_switch.expression, "");
-
-	if (_switch.cases.size() == 1 && !_switch.cases[0].value)
-		m_errorReporter.warning(
-			9592_error,
-			nativeLocationOf(_switch),
-			"\"switch\" statement with only a default case."
-		);
-
-	YulString valueType = expectExpression(*_switch.expression);
-
-	std::set<u256> cases;
-	for (auto const& _case: _switch.cases)
-	{
-		if (_case.value)
-		{
-			auto watcher = m_errorReporter.errorWatcher();
-
-			expectType(valueType, _case.value->type, nativeLocationOf(*_case.value));
-
-			// We cannot use "expectExpression" here because *_case.value is not an
-			// Expression and would be converted to an Expression otherwise.
-			(*this)(*_case.value);
-
-			/// Note: the parser ensures there is only one default case
-			if (watcher.ok() && !cases.insert(valueOfLiteral(*_case.value)).second)
-				m_errorReporter.declarationError(
-					6792_error,
-					nativeLocationOf(_case),
-					"Duplicate case \"" +
-					valueOfLiteral(*_case.value).str() +
-					"\" defined."
-				);
-		}
-
-		(*this)(_case.body);
-	}
-}
-
-void AsmAnalyzer::operator()(ForLoop const& _for)
-{
-	yulAssert(_for.condition, "");
-
-	Scope* outerScope = m_currentScope;
-
-	(*this)(_for.pre);
-
-	// The block was closed already, but we re-open it again and stuff the
-	// condition, the body and the post part inside.
-	m_currentScope = &scope(&_for.pre);
-
-	expectBoolExpression(*_for.condition);
-	// backup outer for-loop & create new state
-	auto outerForLoop = m_currentForLoop;
-	m_currentForLoop = &_for;
-
-	(*this)(_for.body);
-	(*this)(_for.post);
-
-	m_currentScope = outerScope;
-	m_currentForLoop = outerForLoop;
-}
-
-void AsmAnalyzer::operator()(Block const& _block)
-{
-	auto previousScope = m_currentScope;
-	m_currentScope = &scope(&_block);
-
-	for (auto const& s: _block.statements)
-		std::visit(*this, s);
-
-	m_currentScope = previousScope;
-}
-
-YulString AsmAnalyzer::expectExpression(Expression const& _expr)
-{
-	std::vector<YulString> types = std::visit(*this, _expr);
-	if (types.size() != 1)
-		m_errorReporter.typeError(
-			3950_error,
-			nativeLocationOf(_expr),
-			"Expected expression to evaluate to one value, but got " +
-			std::to_string(types.size()) +
-			" values instead."
-		);
-	return types.empty() ? m_dialect.defaultType : types.front();
-}
-
-YulString AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
-{
-	yulAssert(_literal.kind == LiteralKind::String, "");
-	yulAssert(m_dialect.validTypeForLiteral(LiteralKind::String, _literal.value, _literal.type), "");
-
-	return {_literal.type};
-}
-
-void AsmAnalyzer::expectBoolExpression(Expression const& _expr)
-{
-	YulString type = expectExpression(_expr);
-	if (type != m_dialect.boolType)
-		m_errorReporter.typeError(
-			1733_error,
-			nativeLocationOf(_expr),
-			"Expected a value of boolean type \"" +
-			m_dialect.boolType.str() +
-			"\" but got \"" +
-			type.str() +
-			"\""
-		);
-}
-
-void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulString _valueType)
-{
-	yulAssert(!_variable.name.empty(), "");
-	auto watcher = m_errorReporter.errorWatcher();
-	YulString const* variableType = nullptr;
-	bool found = false;
-	if (Scope::Identifier const* var = m_currentScope->lookup(_variable.name))
-	{
-		if (m_resolver)
-			// We found a local reference, make sure there is no external reference.
-			m_resolver(
-				_variable,
-				yul::IdentifierContext::NonExternal,
-				m_currentScope->insideFunction()
-			);
-
-		if (!std::holds_alternative<Scope::Variable>(*var))
-			m_errorReporter.typeError(2657_error, nativeLocationOf(_variable), "Assignment requires variable.");
-		else if (!m_activeVariables.count(&std::get<Scope::Variable>(*var)))
-			m_errorReporter.declarationError(
-				1133_error,
-				nativeLocationOf(_variable),
-				"Variable " + _variable.name.str() + " used before it was declared."
-			);
-		else
-			variableType = &std::get<Scope::Variable>(*var).type;
-		found = true;
-	}
-	else if (m_resolver)
-	{
-		bool insideFunction = m_currentScope->insideFunction();
-		if (m_resolver(_variable, yul::IdentifierContext::LValue, insideFunction))
-		{
-			found = true;
-			variableType = &m_dialect.defaultType;
-		}
-	}
-
-	if (!found && watcher.ok())
-		// Only add message if the callback did not.
-		m_errorReporter.declarationError(4634_error, nativeLocationOf(_variable), "Variable not found or variable not lvalue.");
-	if (variableType && *variableType != _valueType)
-		m_errorReporter.typeError(
-			9547_error,
-			nativeLocationOf(_variable),
-			"Assigning a value of type \"" +
-			_valueType.str() +
-			"\" to a variable of type \"" +
-			variableType->str() +
-			"\"."
-		);
-
-	yulAssert(!watcher.ok() || variableType, "");
-}
-
-Scope& AsmAnalyzer::scope(Block const* _block)
-{
-	yulAssert(m_info.scopes.count(_block) == 1, "Scope requested but not present.");
-	auto scopePtr = m_info.scopes.at(_block);
-	yulAssert(scopePtr, "Scope requested but not present.");
-	return *scopePtr;
-}
-
-void AsmAnalyzer::expectValidIdentifier(YulString _identifier, SourceLocation const& _location)
-{
-	// NOTE: the leading dot case is handled by the parser not allowing it.
-	if (boost::ends_with(_identifier.str(), "."))
-		m_errorReporter.syntaxError(
-			3384_error,
-			_location,
-			"\"" + _identifier.str() + "\" is not a valid identifier (ends with a dot)."
-		);
-
-	if (_identifier.str().find("..") != std::string::npos)
-		m_errorReporter.syntaxError(
-			7771_error,
-			_location,
-			"\"" + _identifier.str() + "\" is not a valid identifier (contains consecutive dots)."
-		);
-
-	if (m_dialect.reservedIdentifier(_identifier))
-		m_errorReporter.declarationError(
-			5017_error,
-			_location,
-			"The identifier \"" + _identifier.str() + "\" is reserved and can not be used."
-		);
-}
-
-void AsmAnalyzer::expectValidType(YulString _type, SourceLocation const& _location)
-{
-	if (!m_dialect.types.count(_type))
-		m_errorReporter.typeError(
-			5473_error,
-			_location,
-			fmt::format("\"{}\" is not a valid type (user defined types are not yet supported).", _type)
-		);
-}
-
-void AsmAnalyzer::expectType(YulString _expectedType, YulString _givenType, SourceLocation const& _location)
-{
-	if (_expectedType != _givenType)
-		m_errorReporter.typeError(
-			3781_error,
-			_location,
-			fmt::format("Expected a value of type \"{}\" but got \"{}\".", _expectedType, _givenType)
-		);
-}
-
-bool AsmAnalyzer::validateInstructions(std::string const& _instructionIdentifier, langutil::SourceLocation const& _location)
-{
-	auto const builtin = EVMDialect::strictAssemblyForEVM(EVMVersion{}).builtin(YulString(_instructionIdentifier));
-	if (builtin && builtin->instruction.has_value())
-		return validateInstructions(builtin->instruction.value(), _location);
-	else
-		return false;
-}
-
-bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocation const& _location)
-{
-	// We assume that returndatacopy, returndatasize and staticcall are either all available
-	// or all not available.
-	yulAssert(m_evmVersion.supportsReturndata() == m_evmVersion.hasStaticCall(), "");
-	// Similarly we assume bitwise shifting and create2 go together.
-	yulAssert(m_evmVersion.hasBitwiseShifting() == m_evmVersion.hasCreate2(), "");
-
-	// These instructions are disabled in the dialect.
-	yulAssert(
-		_instr != evmasm::Instruction::JUMP &&
-		_instr != evmasm::Instruction::JUMPI &&
-		_instr != evmasm::Instruction::JUMPDEST,
-	"");
-
-	auto errorForVM = [&](ErrorId _errorId, std::string const& vmKindMessage) {
-		m_errorReporter.typeError(
-			_errorId,
-			_location,
-			fmt::format(
-				"The \"{instruction}\" instruction is {kind} VMs (you are currently compiling for \"{version}\").",
-				fmt::arg("instruction", boost::to_lower_copy(instructionInfo(_instr, m_evmVersion).name)),
-				fmt::arg("kind", vmKindMessage),
-				fmt::arg("version", m_evmVersion.name())
-			)
-		);
-	};
-
-	if (_instr == evmasm::Instruction::RETURNDATACOPY && !m_evmVersion.supportsReturndata())
-		errorForVM(7756_error, "only available for Byzantium-compatible");
-	else if (_instr == evmasm::Instruction::RETURNDATASIZE && !m_evmVersion.supportsReturndata())
-		errorForVM(4778_error, "only available for Byzantium-compatible");
-	else if (_instr == evmasm::Instruction::STATICCALL && !m_evmVersion.hasStaticCall())
-		errorForVM(1503_error, "only available for Byzantium-compatible");
-	else if (_instr == evmasm::Instruction::SHL && !m_evmVersion.hasBitwiseShifting())
-		errorForVM(6612_error, "only available for Constantinople-compatible");
-	else if (_instr == evmasm::Instruction::SHR && !m_evmVersion.hasBitwiseShifting())
-		errorForVM(7458_error, "only available for Constantinople-compatible");
-	else if (_instr == evmasm::Instruction::SAR && !m_evmVersion.hasBitwiseShifting())
-		errorForVM(2054_error, "only available for Constantinople-compatible");
-	else if (_instr == evmasm::Instruction::CREATE2 && !m_evmVersion.hasCreate2())
-		errorForVM(6166_error, "only available for Constantinople-compatible");
-	else if (_instr == evmasm::Instruction::EXTCODEHASH && !m_evmVersion.hasExtCodeHash())
-		errorForVM(7110_error, "only available for Constantinople-compatible");
-	else if (_instr == evmasm::Instruction::CHAINID && !m_evmVersion.hasChainID())
-		errorForVM(1561_error, "only available for Istanbul-compatible");
-	else if (_instr == evmasm::Instruction::SELFBALANCE && !m_evmVersion.hasSelfBalance())
-		errorForVM(7721_error, "only available for Istanbul-compatible");
-	else if (_instr == evmasm::Instruction::BASEFEE && !m_evmVersion.hasBaseFee())
-		errorForVM(5430_error, "only available for London-compatible");
-	else if (_instr == evmasm::Instruction::PC)
-		m_errorReporter.error(
-			2450_error,
-			Error::Type::SyntaxError,
-			_location,
-			"PC instruction is a low-level EVM feature. "
-			"Because of that PC is disallowed in strict assembly."
-		);
-	else
-		return false;
-
-	return true;
-}
-
-bool AsmAnalyzer::validateInstructions(FunctionCall const& _functionCall)
-{
-	return validateInstructions(_functionCall.functionName.name.str(), nativeLocationOf(_functionCall.functionName));
-}
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
deleted file mode 100644
index c49e6855914d..000000000000
--- a/libyul/AsmAnalysis.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Analysis part of inline assembly.
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libyul/ASTForward.h>
-#include <libyul/Dialect.h>
-#include <libyul/Scope.h>
-
-#include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <functional>
-#include <list>
-#include <memory>
-#include <optional>
-#include <utility>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-}
-
-namespace solidity::yul
-{
-
-struct AsmAnalysisInfo;
-
-/**
- * Performs the full analysis stage, calls the ScopeFiller internally, then resolves
- * references and performs other checks.
- * If all these checks pass, code generation should not throw errors.
- */
-class AsmAnalyzer
-{
-public:
-	explicit AsmAnalyzer(
-		AsmAnalysisInfo& _analysisInfo,
-		langutil::ErrorReporter& _errorReporter,
-		Dialect const& _dialect,
-		ExternalIdentifierAccess::Resolver _resolver = ExternalIdentifierAccess::Resolver(),
-		std::set<YulString> _dataNames = {}
-	):
-		m_resolver(std::move(_resolver)),
-		m_info(_analysisInfo),
-		m_errorReporter(_errorReporter),
-		m_dialect(_dialect),
-		m_dataNames(std::move(_dataNames))
-	{
-		if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect))
-			m_evmVersion = evmDialect->evmVersion();
-	}
-
-	bool analyze(Block const& _block);
-
-	/// Performs analysis on the outermost code of the given object and returns the analysis info.
-	/// Asserts on failure.
-	static AsmAnalysisInfo analyzeStrictAssertCorrect(Dialect const& _dialect, Object const& _object);
-
-	std::vector<YulString> operator()(Literal const& _literal);
-	std::vector<YulString> operator()(Identifier const&);
-	void operator()(ExpressionStatement const&);
-	void operator()(Assignment const& _assignment);
-	void operator()(VariableDeclaration const& _variableDeclaration);
-	void operator()(FunctionDefinition const& _functionDefinition);
-	std::vector<YulString> operator()(FunctionCall const& _functionCall);
-	void operator()(If const& _if);
-	void operator()(Switch const& _switch);
-	void operator()(ForLoop const& _forLoop);
-	void operator()(Break const&) { }
-	void operator()(Continue const&) { }
-	void operator()(Leave const&) { }
-	void operator()(Block const& _block);
-
-	/// @returns the worst side effects encountered during analysis (including within defined functions).
-	SideEffects const& sideEffects() const { return m_sideEffects; }
-private:
-	/// Visits the expression, expects that it evaluates to exactly one value and
-	/// returns the type. Reports errors on errors and returns the default type.
-	YulString expectExpression(Expression const& _expr);
-	YulString expectUnlimitedStringLiteral(Literal const& _literal);
-	/// Visits the expression and expects it to return a single boolean value.
-	/// Reports an error otherwise.
-	void expectBoolExpression(Expression const& _expr);
-
-	/// Verifies that a variable to be assigned to exists, can be assigned to
-	/// and has the same type as the value.
-	void checkAssignment(Identifier const& _variable, YulString _valueType);
-
-	Scope& scope(Block const* _block);
-	void expectValidIdentifier(YulString _identifier, langutil::SourceLocation const& _location);
-	void expectValidType(YulString _type, langutil::SourceLocation const& _location);
-	void expectType(YulString _expectedType, YulString _givenType, langutil::SourceLocation const& _location);
-
-	bool validateInstructions(evmasm::Instruction _instr, langutil::SourceLocation const& _location);
-	bool validateInstructions(std::string const& _instrIdentifier, langutil::SourceLocation const& _location);
-	bool validateInstructions(FunctionCall const& _functionCall);
-
-	yul::ExternalIdentifierAccess::Resolver m_resolver;
-	Scope* m_currentScope = nullptr;
-	/// Variables that are active at the current point in assembly (as opposed to
-	/// "part of the scope but not yet declared")
-	std::set<Scope::Variable const*> m_activeVariables;
-	AsmAnalysisInfo& m_info;
-	langutil::ErrorReporter& m_errorReporter;
-	langutil::EVMVersion m_evmVersion;
-	Dialect const& m_dialect;
-	/// Names of data objects to be referenced by builtin functions with literal arguments.
-	std::set<YulString> m_dataNames;
-	ForLoop const* m_currentForLoop = nullptr;
-	/// Worst side effects encountered during analysis (including within defined functions).
-	SideEffects m_sideEffects;
-};
-
-}
diff --git a/libyul/AsmAnalysisInfo.h b/libyul/AsmAnalysisInfo.h
deleted file mode 100644
index 120228d2e763..000000000000
--- a/libyul/AsmAnalysisInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Information generated during analyzer part of inline assembly.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <map>
-#include <memory>
-#include <vector>
-
-namespace solidity::yul
-{
-
-struct Scope;
-
-struct AsmAnalysisInfo
-{
-	using StackHeightInfo = std::map<void const*, int>;
-	using Scopes = std::map<Block const*, std::shared_ptr<Scope>>;
-	Scopes scopes;
-	/// Virtual blocks which will be used for scopes for function arguments and return values.
-	std::map<FunctionDefinition const*, std::shared_ptr<Block const>> virtualBlocks;
-};
-
-}
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
deleted file mode 100644
index bf2468b4e4bb..000000000000
--- a/libyul/AsmJsonConverter.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2019
- * Converts inline assembly AST to JSON format
- */
-
-#include <libyul/AsmJsonConverter.h>
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/UTF8.h>
-
-namespace solidity::yul
-{
-
-Json::Value AsmJsonConverter::operator()(Block const& _node) const
-{
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBlock");
-	ret["statements"] = vectorOfVariantsToJson(_node.statements);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(TypedName const& _node) const
-{
-	yulAssert(!_node.name.empty(), "Invalid variable name.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulTypedName");
-	ret["name"] = _node.name.str();
-	ret["type"] = _node.type.str();
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(Literal const& _node) const
-{
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLiteral");
-	switch (_node.kind)
-	{
-	case LiteralKind::Number:
-		yulAssert(
-			util::isValidDecimal(_node.value.str()) || util::isValidHex(_node.value.str()),
-			"Invalid number literal"
-		);
-		ret["kind"] = "number";
-		break;
-	case LiteralKind::Boolean:
-		ret["kind"] = "bool";
-		break;
-	case LiteralKind::String:
-		ret["kind"] = "string";
-		ret["hexValue"] = util::toHex(util::asBytes(_node.value.str()));
-		break;
-	}
-	ret["type"] = _node.type.str();
-	if (util::validateUTF8(_node.value.str()))
-		ret["value"] = _node.value.str();
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(Identifier const& _node) const
-{
-	yulAssert(!_node.name.empty(), "Invalid identifier");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIdentifier");
-	ret["name"] = _node.name.str();
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(Assignment const& _node) const
-{
-	yulAssert(_node.variableNames.size() >= 1, "Invalid assignment syntax");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulAssignment");
-	for (auto const& var: _node.variableNames)
-		ret["variableNames"].append((*this)(var));
-	ret["value"] = _node.value ? std::visit(*this, *_node.value) : Json::nullValue;
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(FunctionCall const& _node) const
-{
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionCall");
-	ret["functionName"] = (*this)(_node.functionName);
-	ret["arguments"] = vectorOfVariantsToJson(_node.arguments);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(ExpressionStatement const& _node) const
-{
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulExpressionStatement");
-	ret["expression"] = std::visit(*this, _node.expression);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(VariableDeclaration const& _node) const
-{
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulVariableDeclaration");
-	for (auto const& var: _node.variables)
-		ret["variables"].append((*this)(var));
-
-	ret["value"] = _node.value ? std::visit(*this, *_node.value) : Json::nullValue;
-
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(FunctionDefinition const& _node) const
-{
-	yulAssert(!_node.name.empty(), "Invalid function name.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionDefinition");
-	ret["name"] = _node.name.str();
-	for (auto const& var: _node.parameters)
-		ret["parameters"].append((*this)(var));
-	for (auto const& var: _node.returnVariables)
-		ret["returnVariables"].append((*this)(var));
-	ret["body"] = (*this)(_node.body);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(If const& _node) const
-{
-	yulAssert(_node.condition, "Invalid if condition.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIf");
-	ret["condition"] = std::visit(*this, *_node.condition);
-	ret["body"] = (*this)(_node.body);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(Switch const& _node) const
-{
-	yulAssert(_node.expression, "Invalid expression pointer.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulSwitch");
-	ret["expression"] = std::visit(*this, *_node.expression);
-	for (auto const& var: _node.cases)
-		ret["cases"].append((*this)(var));
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(Case const& _node) const
-{
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulCase");
-	ret["value"] = _node.value ? (*this)(*_node.value) : "default";
-	ret["body"] = (*this)(_node.body);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(ForLoop const& _node) const
-{
-	yulAssert(_node.condition, "Invalid for loop condition.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulForLoop");
-	ret["pre"] = (*this)(_node.pre);
-	ret["condition"] = std::visit(*this, *_node.condition);
-	ret["post"] = (*this)(_node.post);
-	ret["body"] = (*this)(_node.body);
-	return ret;
-}
-
-Json::Value AsmJsonConverter::operator()(Break const& _node) const
-{
-	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBreak");
-}
-
-Json::Value AsmJsonConverter::operator()(Continue const& _node) const
-{
-	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulContinue");
-}
-
-Json::Value AsmJsonConverter::operator()(Leave const& _node) const
-{
-	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLeave");
-}
-
-Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, std::string _nodeType) const
-{
-	Json::Value ret{Json::objectValue};
-	ret["nodeType"] = std::move(_nodeType);
-	auto srcLocation = [&](int start, int end) -> std::string
-	{
-		int length = (start >= 0 && end >= 0 && end >= start) ? end - start : -1;
-		return std::to_string(start) + ":" + std::to_string(length) + ":" + (m_sourceIndex.has_value() ? std::to_string(m_sourceIndex.value()) : "-1");
-	};
-	ret["src"] = srcLocation(_originLocation.start, _originLocation.end);
-	ret["nativeSrc"] = srcLocation(_nativeLocation.start, _nativeLocation.end);
-	return ret;
-}
-
-template <class T>
-Json::Value AsmJsonConverter::vectorOfVariantsToJson(std::vector<T> const& _vec) const
-{
-	Json::Value ret{Json::arrayValue};
-	for (auto const& var: _vec)
-		ret.append(std::visit(*this, var));
-	return ret;
-}
-
-}
diff --git a/libyul/AsmJsonConverter.h b/libyul/AsmJsonConverter.h
deleted file mode 100644
index 236ecbba579c..000000000000
--- a/libyul/AsmJsonConverter.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2019
- * @author julius <djudju@protonmail.com>
- * Converts inline assembly AST to JSON format
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <liblangutil/SourceLocation.h>
-#include <json/json.h>
-#include <boost/variant/static_visitor.hpp>
-#include <optional>
-#include <vector>
-
-namespace solidity::yul
-{
-
-/**
- * Converter of the yul AST into JSON format
- */
-class AsmJsonConverter: public boost::static_visitor<Json::Value>
-{
-public:
-	/// Create a converter to JSON for any block of inline assembly
-	/// @a _sourceIndex to be used to abbreviate source name in the source locations
-	explicit AsmJsonConverter(std::optional<size_t> _sourceIndex): m_sourceIndex(_sourceIndex) {}
-
-	Json::Value operator()(Block const& _node) const;
-	Json::Value operator()(TypedName const& _node) const;
-	Json::Value operator()(Literal const& _node) const;
-	Json::Value operator()(Identifier const& _node) const;
-	Json::Value operator()(Assignment const& _node) const;
-	Json::Value operator()(VariableDeclaration const& _node) const;
-	Json::Value operator()(FunctionDefinition const& _node) const;
-	Json::Value operator()(FunctionCall const& _node) const;
-	Json::Value operator()(If const& _node) const;
-	Json::Value operator()(Switch const& _node) const;
-	Json::Value operator()(Case const& _node) const;
-	Json::Value operator()(ForLoop const& _node) const;
-	Json::Value operator()(Break const& _node) const;
-	Json::Value operator()(Continue const& _node) const;
-	Json::Value operator()(Leave const& _node) const;
-	Json::Value operator()(ExpressionStatement const& _node) const;
-	Json::Value operator()(Label const& _node) const;
-
-private:
-	Json::Value createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, std::string _nodeType) const;
-	template <class T>
-	Json::Value vectorOfVariantsToJson(std::vector<T> const& vec) const;
-
-	std::optional<size_t> const m_sourceIndex;
-};
-
-}
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
deleted file mode 100644
index ea8faa8792ee..000000000000
--- a/libyul/AsmJsonImporter.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author julius <djudju@protonmail.com>
- * @date 2019
- * Converts an inlineAssembly AST from JSON format to AsmData
-
- */
-
-#include <libyul/AsmJsonImporter.h>
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/Scanner.h>
-
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <vector>
-
-using namespace solidity::langutil;
-
-namespace solidity::yul
-{
-
-using SourceLocation = langutil::SourceLocation;
-
-SourceLocation const AsmJsonImporter::createSourceLocation(Json::Value const& _node)
-{
-	yulAssert(member(_node, "src").isString(), "'src' must be a string");
-
-	return solidity::langutil::parseSourceLocation(_node["src"].asString(), m_sourceNames);
-}
-
-template <class T>
-T AsmJsonImporter::createAsmNode(Json::Value const& _node)
-{
-	T r;
-	SourceLocation nativeLocation = createSourceLocation(_node);
-	yulAssert(nativeLocation.hasText(), "Invalid source location in Asm AST");
-	// TODO: We should add originLocation to the AST.
-	// While it's not included, we'll use nativeLocation for it because we only support importing
-	// inline assembly as a part of a Solidity AST and there these locations are always the same.
-	r.debugData = DebugData::create(nativeLocation, nativeLocation);
-	return r;
-}
-
-Json::Value AsmJsonImporter::member(Json::Value const& _node, std::string const& _name)
-{
-	if (!_node.isMember(_name))
-		return Json::nullValue;
-	return _node[_name];
-}
-
-TypedName AsmJsonImporter::createTypedName(Json::Value const& _node)
-{
-	auto typedName = createAsmNode<TypedName>(_node);
-	typedName.type = YulString{member(_node, "type").asString()};
-	typedName.name = YulString{member(_node, "name").asString()};
-	return typedName;
-}
-
-Statement AsmJsonImporter::createStatement(Json::Value const& _node)
-{
-	Json::Value jsonNodeType = member(_node, "nodeType");
-	yulAssert(jsonNodeType.isString(), "Expected \"nodeType\" to be of type string!");
-	std::string nodeType = jsonNodeType.asString();
-
-	yulAssert(nodeType.substr(0, 3) == "Yul", "Invalid nodeType prefix");
-	nodeType = nodeType.substr(3);
-
-	if (nodeType == "ExpressionStatement")
-		return createExpressionStatement(_node);
-	else if (nodeType == "Assignment")
-		return createAssignment(_node);
-	else if (nodeType == "VariableDeclaration")
-		return createVariableDeclaration(_node);
-	else if (nodeType == "FunctionDefinition")
-		return createFunctionDefinition(_node);
-	else if (nodeType == "If")
-		return createIf(_node);
-	else if (nodeType == "Switch")
-		return createSwitch(_node);
-	else if (nodeType == "ForLoop")
-		return createForLoop(_node);
-	else if (nodeType == "Break")
-		return createBreak(_node);
-	else if (nodeType == "Continue")
-		return createContinue(_node);
-	else if (nodeType == "Leave")
-		return createLeave(_node);
-	else if (nodeType == "Block")
-		return createBlock(_node);
-	else
-		yulAssert(false, "Invalid nodeType as statement");
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-Expression AsmJsonImporter::createExpression(Json::Value const& _node)
-{
-	Json::Value jsonNodeType = member(_node, "nodeType");
-	yulAssert(jsonNodeType.isString(), "Expected \"nodeType\" to be of type string!");
-	std::string nodeType = jsonNodeType.asString();
-
-	yulAssert(nodeType.substr(0, 3) == "Yul", "Invalid nodeType prefix");
-	nodeType = nodeType.substr(3);
-
-	if (nodeType == "FunctionCall")
-		return createFunctionCall(_node);
-	else if (nodeType == "Identifier")
-		return createIdentifier(_node);
-	else if (nodeType == "Literal")
-		return createLiteral(_node);
-	else
-		yulAssert(false, "Invalid nodeType as expression");
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-std::vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
-{
-	std::vector<Expression> ret;
-	for (auto& var: _array)
-		ret.emplace_back(createExpression(var));
-	return ret;
-}
-
-std::vector<Statement> AsmJsonImporter::createStatementVector(Json::Value const& _array)
-{
-	std::vector<Statement> ret;
-	for (auto& var: _array)
-		ret.emplace_back(createStatement(var));
-	return ret;
-}
-
-Block AsmJsonImporter::createBlock(Json::Value const& _node)
-{
-	auto block = createAsmNode<Block>(_node);
-	block.statements = createStatementVector(_node["statements"]);
-	return block;
-}
-
-Literal AsmJsonImporter::createLiteral(Json::Value const& _node)
-{
-	auto lit = createAsmNode<Literal>(_node);
-	std::string kind = member(_node, "kind").asString();
-
-	solAssert(member(_node, "hexValue").isString() || member(_node, "value").isString(), "");
-	if (_node.isMember("hexValue"))
-		lit.value = YulString{util::asString(util::fromHex(member(_node, "hexValue").asString()))};
-	else
-		lit.value = YulString{member(_node, "value").asString()};
-
-	lit.type= YulString{member(_node, "type").asString()};
-
-	if (kind == "number")
-	{
-		langutil::CharStream charStream(lit.value.str(), "");
-		langutil::Scanner scanner{charStream};
-		lit.kind = LiteralKind::Number;
-		yulAssert(
-			scanner.currentToken() == Token::Number,
-			"Expected number but got " + langutil::TokenTraits::friendlyName(scanner.currentToken()) + std::string(" while scanning ") + lit.value.str()
-		);
-	}
-	else if (kind == "bool")
-	{
-		langutil::CharStream charStream(lit.value.str(), "");
-		langutil::Scanner scanner{charStream};
-		lit.kind = LiteralKind::Boolean;
-		yulAssert(
-			scanner.currentToken() == Token::TrueLiteral ||
-			scanner.currentToken() == Token::FalseLiteral,
-			"Expected true/false literal!"
-		);
-	}
-	else if (kind == "string")
-	{
-		lit.kind = LiteralKind::String;
-		yulAssert(
-			lit.value.str().size() <= 32,
-			"String literal too long (" + std::to_string(lit.value.str().size()) + " > 32)"
-		);
-	}
-	else
-		yulAssert(false, "unknown type of literal");
-
-	return lit;
-}
-
-Leave AsmJsonImporter::createLeave(Json::Value const& _node)
-{
-	return createAsmNode<Leave>(_node);
-}
-
-Identifier AsmJsonImporter::createIdentifier(Json::Value const& _node)
-{
-	auto identifier = createAsmNode<Identifier>(_node);
-	identifier.name = YulString(member(_node, "name").asString());
-	return identifier;
-}
-
-Assignment AsmJsonImporter::createAssignment(Json::Value const& _node)
-{
-	auto assignment = createAsmNode<Assignment>(_node);
-
-	if (_node.isMember("variableNames"))
-		for (auto const& var: member(_node, "variableNames"))
-			assignment.variableNames.emplace_back(createIdentifier(var));
-
-	assignment.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
-	return assignment;
-}
-
-FunctionCall AsmJsonImporter::createFunctionCall(Json::Value const& _node)
-{
-	auto functionCall = createAsmNode<FunctionCall>(_node);
-
-	for (auto const& var: member(_node, "arguments"))
-		functionCall.arguments.emplace_back(createExpression(var));
-
-	functionCall.functionName = createIdentifier(member(_node, "functionName"));
-
-	return functionCall;
-}
-
-ExpressionStatement AsmJsonImporter::createExpressionStatement(Json::Value const& _node)
-{
-	auto statement = createAsmNode<ExpressionStatement>(_node);
-	statement.expression = createExpression(member(_node, "expression"));
-	return statement;
-}
-
-VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json::Value const& _node)
-{
-	auto varDec = createAsmNode<VariableDeclaration>(_node);
-	for (auto const& var: member(_node, "variables"))
-		varDec.variables.emplace_back(createTypedName(var));
-	varDec.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
-	return varDec;
-}
-
-FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json::Value const& _node)
-{
-	auto funcDef = createAsmNode<FunctionDefinition>(_node);
-	funcDef.name = YulString{member(_node, "name").asString()};
-
-	if (_node.isMember("parameters"))
-		for (auto const& var: member(_node, "parameters"))
-			funcDef.parameters.emplace_back(createTypedName(var));
-
-	if (_node.isMember("returnVariables"))
-		for (auto const& var: member(_node, "returnVariables"))
-			funcDef.returnVariables.emplace_back(createTypedName(var));
-
-	funcDef.body = createBlock(member(_node, "body"));
-	return funcDef;
-}
-
-If AsmJsonImporter::createIf(Json::Value const& _node)
-{
-	auto ifStatement = createAsmNode<If>(_node);
-	ifStatement.condition = std::make_unique<Expression>(createExpression(member(_node, "condition")));
-	ifStatement.body = createBlock(member(_node, "body"));
-	return ifStatement;
-}
-
-Case AsmJsonImporter::createCase(Json::Value const& _node)
-{
-	auto caseStatement = createAsmNode<Case>(_node);
-	auto const& value = member(_node, "value");
-	if (value.isString())
-		yulAssert(value.asString() == "default", "Expected default case");
-	else
-		caseStatement.value = std::make_unique<Literal>(createLiteral(value));
-	caseStatement.body = createBlock(member(_node, "body"));
-	return caseStatement;
-}
-
-Switch AsmJsonImporter::createSwitch(Json::Value const& _node)
-{
-	auto switchStatement = createAsmNode<Switch>(_node);
-	switchStatement.expression = std::make_unique<Expression>(createExpression(member(_node, "expression")));
-	for (auto const& var: member(_node, "cases"))
-		switchStatement.cases.emplace_back(createCase(var));
-	return switchStatement;
-}
-
-ForLoop AsmJsonImporter::createForLoop(Json::Value const& _node)
-{
-	auto forLoop = createAsmNode<ForLoop>(_node);
-	forLoop.pre = createBlock(member(_node, "pre"));
-	forLoop.condition = std::make_unique<Expression>(createExpression(member(_node, "condition")));
-	forLoop.post = createBlock(member(_node, "post"));
-	forLoop.body = createBlock(member(_node, "body"));
-	return forLoop;
-}
-
-Break AsmJsonImporter::createBreak(Json::Value const& _node)
-{
-	return createAsmNode<Break>(_node);
-}
-
-Continue AsmJsonImporter::createContinue(Json::Value const& _node)
-{
-	return createAsmNode<Continue>(_node);
-}
-
-}
diff --git a/libyul/AsmJsonImporter.h b/libyul/AsmJsonImporter.h
deleted file mode 100644
index 506352fa4811..000000000000
--- a/libyul/AsmJsonImporter.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author julius <djudju@protonmail.com>
- * @date 2019
- * Converts an inlineAssembly AST from JSON format to AsmData
- */
-
-#pragma once
-
-#include <json/json.h>
-#include <liblangutil/SourceLocation.h>
-#include <libyul/ASTForward.h>
-
-#include <utility>
-
-namespace solidity::yul
-{
-
-/**
- * Component that imports an AST from json format to the internal format
- */
-class AsmJsonImporter
-{
-public:
-	explicit AsmJsonImporter(std::vector<std::shared_ptr<std::string const>> const& _sourceNames):
-		m_sourceNames(_sourceNames)
-	{}
-	yul::Block createBlock(Json::Value const& _node);
-
-private:
-	langutil::SourceLocation const createSourceLocation(Json::Value const& _node);
-	template <class T>
-	T createAsmNode(Json::Value const& _node);
-	/// helper function to access member functions of the JSON
-	/// and throw an error if it does not exist
-	Json::Value member(Json::Value const& _node, std::string const& _name);
-
-	yul::Statement createStatement(Json::Value const& _node);
-	yul::Expression createExpression(Json::Value const& _node);
-	std::vector<yul::Statement> createStatementVector(Json::Value const& _array);
-	std::vector<yul::Expression> createExpressionVector(Json::Value const& _array);
-
-	yul::TypedName createTypedName(Json::Value const& _node);
-	yul::Literal createLiteral(Json::Value const& _node);
-	yul::Leave createLeave(Json::Value const& _node);
-	yul::Identifier createIdentifier(Json::Value const& _node);
-	yul::Assignment createAssignment(Json::Value const& _node);
-	yul::FunctionCall createFunctionCall(Json::Value const& _node);
-	yul::ExpressionStatement createExpressionStatement(Json::Value const& _node);
-	yul::VariableDeclaration createVariableDeclaration(Json::Value const& _node);
-	yul::FunctionDefinition createFunctionDefinition(Json::Value const& _node);
-	yul::If createIf(Json::Value const& _node);
-	yul::Case createCase(Json::Value const& _node);
-	yul::Switch createSwitch(Json::Value const& _node);
-	yul::ForLoop createForLoop(Json::Value const& _node);
-	yul::Break createBreak(Json::Value const& _node);
-	yul::Continue createContinue(Json::Value const& _node);
-
-	std::vector<std::shared_ptr<std::string const>> const& m_sourceNames;
-};
-
-}
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
deleted file mode 100644
index 5d3ec84a4b97..000000000000
--- a/libyul/AsmParser.cpp
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Solidity inline assembly parser.
- */
-
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-#include <libyul/Exceptions.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/Scanner.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/view/subrange.hpp>
-
-#include <boost/algorithm/string.hpp>
-
-#include <algorithm>
-#include <regex>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-
-namespace
-{
-
-std::optional<int> toInt(std::string const& _value)
-{
-	try
-	{
-		return stoi(_value);
-	}
-	catch (...)
-	{
-		return std::nullopt;
-	}
-}
-
-}
-
-std::shared_ptr<DebugData const> Parser::createDebugData() const
-{
-	switch (m_useSourceLocationFrom)
-	{
-		case UseSourceLocationFrom::Scanner:
-			return DebugData::create(ParserBase::currentLocation(), ParserBase::currentLocation());
-		case UseSourceLocationFrom::LocationOverride:
-			return DebugData::create(m_locationOverride, m_locationOverride);
-		case UseSourceLocationFrom::Comments:
-			return DebugData::create(ParserBase::currentLocation(), m_locationFromComment, m_astIDFromComment);
-	}
-	solAssert(false, "");
-}
-
-void Parser::updateLocationEndFrom(
-	std::shared_ptr<DebugData const>& _debugData,
-	SourceLocation const& _location
-) const
-{
-	solAssert(_debugData, "");
-
-	switch (m_useSourceLocationFrom)
-	{
-		case UseSourceLocationFrom::Scanner:
-		{
-			DebugData updatedDebugData = *_debugData;
-			updatedDebugData.nativeLocation.end = _location.end;
-			updatedDebugData.originLocation.end = _location.end;
-			_debugData = std::make_shared<DebugData const>(std::move(updatedDebugData));
-			break;
-		}
-		case UseSourceLocationFrom::LocationOverride:
-			// Ignore the update. The location we're overriding with is not supposed to change
-			break;
-		case UseSourceLocationFrom::Comments:
-		{
-			DebugData updatedDebugData = *_debugData;
-			updatedDebugData.nativeLocation.end = _location.end;
-			_debugData = std::make_shared<DebugData const>(std::move(updatedDebugData));
-			break;
-		}
-	}
-}
-
-std::unique_ptr<Block> Parser::parse(CharStream& _charStream)
-{
-	m_scanner = std::make_shared<Scanner>(_charStream);
-	std::unique_ptr<Block> block = parseInline(m_scanner);
-	expectToken(Token::EOS);
-	return block;
-}
-
-std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scanner)
-{
-	m_recursionDepth = 0;
-
-	auto previousScannerKind = _scanner->scannerKind();
-	_scanner->setScannerMode(ScannerKind::Yul);
-	ScopeGuard resetScanner([&]{ _scanner->setScannerMode(previousScannerKind); });
-
-	try
-	{
-		m_scanner = _scanner;
-		if (m_useSourceLocationFrom == UseSourceLocationFrom::Comments)
-			fetchDebugDataFromComment();
-		return std::make_unique<Block>(parseBlock());
-	}
-	catch (FatalError const&)
-	{
-		yulAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
-	}
-
-	return nullptr;
-}
-
-langutil::Token Parser::advance()
-{
-	auto const token = ParserBase::advance();
-	if (m_useSourceLocationFrom == UseSourceLocationFrom::Comments)
-		fetchDebugDataFromComment();
-	return token;
-}
-
-void Parser::fetchDebugDataFromComment()
-{
-	solAssert(m_sourceNames.has_value(), "");
-
-	static std::regex const tagRegex = std::regex(
-		R"~~((?:^|\s+)(@[a-zA-Z0-9\-_]+)(?:\s+|$))~~", // tag, e.g: @src
-		std::regex_constants::ECMAScript | std::regex_constants::optimize
-	);
-
-	std::string_view commentLiteral = m_scanner->currentCommentLiteral();
-	std::match_results<std::string_view::const_iterator> match;
-
-	langutil::SourceLocation originLocation = m_locationFromComment;
-	// Empty for each new node.
-	std::optional<int> astID;
-
-	while (regex_search(commentLiteral.cbegin(), commentLiteral.cend(), match, tagRegex))
-	{
-		solAssert(match.size() == 2, "");
-		commentLiteral = commentLiteral.substr(static_cast<size_t>(match.position() + match.length()));
-
-		if (match[1] == "@src")
-		{
-			if (auto parseResult = parseSrcComment(commentLiteral, m_scanner->currentCommentLocation()))
-				tie(commentLiteral, originLocation) = *parseResult;
-			else
-				break;
-		}
-		else if (match[1] == "@ast-id")
-		{
-			if (auto parseResult = parseASTIDComment(commentLiteral, m_scanner->currentCommentLocation()))
-				tie(commentLiteral, astID) = *parseResult;
-			else
-				break;
-		}
-		else
-			// Ignore unrecognized tags.
-			continue;
-	}
-
-	m_locationFromComment = originLocation;
-	m_astIDFromComment = astID;
-}
-
-std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComment(
-	std::string_view const _arguments,
-	langutil::SourceLocation const& _commentLocation
-)
-{
-	static std::regex const argsRegex = std::regex(
-		R"~~(^(-1|\d+):(-1|\d+):(-1|\d+)(?:\s+|$))~~"  // index and location, e.g.: 1:234:-1
-		R"~~(("(?:[^"\\]|\\.)*"?)?)~~",                // optional code snippet, e.g.: "string memory s = \"abc\";..."
-		std::regex_constants::ECMAScript | std::regex_constants::optimize
-	);
-	std::match_results<std::string_view::const_iterator> match;
-	if (!regex_search(_arguments.cbegin(), _arguments.cend(), match, argsRegex))
-	{
-		m_errorReporter.syntaxError(
-			8387_error,
-			_commentLocation,
-			"Invalid values in source location mapping. Could not parse location specification."
-		);
-		return std::nullopt;
-	}
-
-	solAssert(match.size() == 5, "");
-	std::string_view tail = _arguments.substr(static_cast<size_t>(match.position() + match.length()));
-
-	if (match[4].matched && (
-		!boost::algorithm::ends_with(match[4].str(), "\"") ||
-		boost::algorithm::ends_with(match[4].str(), "\\\"")
-	))
-	{
-		m_errorReporter.syntaxError(
-			1544_error,
-			_commentLocation,
-			"Invalid code snippet in source location mapping. Quote is not terminated."
-		);
-		return {{tail, SourceLocation{}}};
-	}
-
-	std::optional<int> const sourceIndex = toInt(match[1].str());
-	std::optional<int> const start = toInt(match[2].str());
-	std::optional<int> const end = toInt(match[3].str());
-
-	if (!sourceIndex.has_value() || !start.has_value() || !end.has_value())
-		m_errorReporter.syntaxError(
-			6367_error,
-			_commentLocation,
-			"Invalid value in source location mapping. "
-			"Expected non-negative integer values or -1 for source index and location."
-		);
-	else if (sourceIndex == -1)
-		return {{tail, SourceLocation{start.value(), end.value(), nullptr}}};
-	else if (!(sourceIndex >= 0 && m_sourceNames->count(static_cast<unsigned>(sourceIndex.value()))))
-		m_errorReporter.syntaxError(
-			2674_error,
-			_commentLocation,
-			"Invalid source mapping. Source index not defined via @use-src."
-		);
-	else
-	{
-		std::shared_ptr<std::string const> sourceName = m_sourceNames->at(static_cast<unsigned>(sourceIndex.value()));
-		solAssert(sourceName, "");
-		return {{tail, SourceLocation{start.value(), end.value(), std::move(sourceName)}}};
-	}
-	return {{tail, SourceLocation{}}};
-}
-
-std::optional<std::pair<std::string_view, std::optional<int>>> Parser::parseASTIDComment(
-	std::string_view _arguments,
-	langutil::SourceLocation const& _commentLocation
-)
-{
-	static std::regex const argRegex = std::regex(
-		R"~~(^(\d+)(?:\s|$))~~",
-		std::regex_constants::ECMAScript | std::regex_constants::optimize
-	);
-	std::match_results<std::string_view::const_iterator> match;
-	std::optional<int> astID;
-	bool matched = regex_search(_arguments.cbegin(), _arguments.cend(), match, argRegex);
-	std::string_view tail = _arguments;
-	if (matched)
-	{
-		solAssert(match.size() == 2, "");
-		tail = _arguments.substr(static_cast<size_t>(match.position() + match.length()));
-
-		astID = toInt(match[1].str());
-	}
-
-	if (!matched || !astID || *astID < 0 || static_cast<int64_t>(*astID) != *astID)
-	{
-		m_errorReporter.syntaxError(1749_error, _commentLocation, "Invalid argument for @ast-id.");
-		astID = std::nullopt;
-	}
-	if (matched)
-		return {{_arguments, astID}};
-	else
-		return std::nullopt;
-}
-
-Block Parser::parseBlock()
-{
-	RecursionGuard recursionGuard(*this);
-	Block block = createWithLocation<Block>();
-	expectToken(Token::LBrace);
-	while (currentToken() != Token::RBrace)
-		block.statements.emplace_back(parseStatement());
-	updateLocationEndFrom(block.debugData, currentLocation());
-	advance();
-	return block;
-}
-
-Statement Parser::parseStatement()
-{
-	RecursionGuard recursionGuard(*this);
-	switch (currentToken())
-	{
-	case Token::Let:
-		return parseVariableDeclaration();
-	case Token::Function:
-		return parseFunctionDefinition();
-	case Token::LBrace:
-		return parseBlock();
-	case Token::If:
-	{
-		If _if = createWithLocation<If>();
-		advance();
-		_if.condition = std::make_unique<Expression>(parseExpression());
-		_if.body = parseBlock();
-		updateLocationEndFrom(_if.debugData, nativeLocationOf(_if.body));
-		return Statement{std::move(_if)};
-	}
-	case Token::Switch:
-	{
-		Switch _switch = createWithLocation<Switch>();
-		advance();
-		_switch.expression = std::make_unique<Expression>(parseExpression());
-		while (currentToken() == Token::Case)
-			_switch.cases.emplace_back(parseCase());
-		if (currentToken() == Token::Default)
-			_switch.cases.emplace_back(parseCase());
-		if (currentToken() == Token::Default)
-			fatalParserError(6931_error, "Only one default case allowed.");
-		else if (currentToken() == Token::Case)
-			fatalParserError(4904_error, "Case not allowed after default case.");
-		if (_switch.cases.empty())
-			fatalParserError(2418_error, "Switch statement without any cases.");
-		updateLocationEndFrom(_switch.debugData, nativeLocationOf(_switch.cases.back().body));
-		return Statement{std::move(_switch)};
-	}
-	case Token::For:
-		return parseForLoop();
-	case Token::Break:
-	{
-		Statement stmt{createWithLocation<Break>()};
-		checkBreakContinuePosition("break");
-		advance();
-		return stmt;
-	}
-	case Token::Continue:
-	{
-		Statement stmt{createWithLocation<Continue>()};
-		checkBreakContinuePosition("continue");
-		advance();
-		return stmt;
-	}
-	case Token::Leave:
-	{
-		Statement stmt{createWithLocation<Leave>()};
-		if (!m_insideFunction)
-			m_errorReporter.syntaxError(8149_error, currentLocation(), "Keyword \"leave\" can only be used inside a function.");
-		advance();
-		return stmt;
-	}
-	default:
-		break;
-	}
-
-	// Options left:
-	// Expression/FunctionCall
-	// Assignment
-	std::variant<Literal, Identifier> elementary(parseLiteralOrIdentifier());
-
-	switch (currentToken())
-	{
-	case Token::LParen:
-	{
-		Expression expr = parseCall(std::move(elementary));
-		return ExpressionStatement{debugDataOf(expr), std::move(expr)};
-	}
-	case Token::Comma:
-	case Token::AssemblyAssign:
-	{
-		Assignment assignment;
-		assignment.debugData = debugDataOf(elementary);
-
-		while (true)
-		{
-			if (!std::holds_alternative<Identifier>(elementary))
-			{
-				auto const token = currentToken() == Token::Comma ? "," : ":=";
-
-				fatalParserError(
-					2856_error,
-					std::string("Variable name must precede \"") +
-					token +
-					"\"" +
-					(currentToken() == Token::Comma ? " in multiple assignment." : " in assignment.")
-				);
-			}
-
-			auto const& identifier = std::get<Identifier>(elementary);
-
-			if (m_dialect.builtin(identifier.name))
-				fatalParserError(6272_error, "Cannot assign to builtin function \"" + identifier.name.str() + "\".");
-
-			assignment.variableNames.emplace_back(identifier);
-
-			if (currentToken() != Token::Comma)
-				break;
-
-			expectToken(Token::Comma);
-
-			elementary = parseLiteralOrIdentifier();
-		}
-
-		expectToken(Token::AssemblyAssign);
-
-		assignment.value = std::make_unique<Expression>(parseExpression());
-		updateLocationEndFrom(assignment.debugData, nativeLocationOf(*assignment.value));
-
-		return Statement{std::move(assignment)};
-	}
-	default:
-		fatalParserError(6913_error, "Call or assignment expected.");
-		break;
-	}
-
-	yulAssert(false, "");
-	return {};
-}
-
-Case Parser::parseCase()
-{
-	RecursionGuard recursionGuard(*this);
-	Case _case = createWithLocation<Case>();
-	if (currentToken() == Token::Default)
-		advance();
-	else if (currentToken() == Token::Case)
-	{
-		advance();
-		std::variant<Literal, Identifier> literal = parseLiteralOrIdentifier();
-		if (!std::holds_alternative<Literal>(literal))
-			fatalParserError(4805_error, "Literal expected.");
-		_case.value = std::make_unique<Literal>(std::get<Literal>(std::move(literal)));
-	}
-	else
-		yulAssert(false, "Case or default case expected.");
-	_case.body = parseBlock();
-	updateLocationEndFrom(_case.debugData, nativeLocationOf(_case.body));
-	return _case;
-}
-
-ForLoop Parser::parseForLoop()
-{
-	RecursionGuard recursionGuard(*this);
-
-	ForLoopComponent outerForLoopComponent = m_currentForLoopComponent;
-
-	ForLoop forLoop = createWithLocation<ForLoop>();
-	expectToken(Token::For);
-	m_currentForLoopComponent = ForLoopComponent::ForLoopPre;
-	forLoop.pre = parseBlock();
-	m_currentForLoopComponent = ForLoopComponent::None;
-	forLoop.condition = std::make_unique<Expression>(parseExpression());
-	m_currentForLoopComponent = ForLoopComponent::ForLoopPost;
-	forLoop.post = parseBlock();
-	m_currentForLoopComponent = ForLoopComponent::ForLoopBody;
-	forLoop.body = parseBlock();
-	updateLocationEndFrom(forLoop.debugData, nativeLocationOf(forLoop.body));
-
-	m_currentForLoopComponent = outerForLoopComponent;
-
-	return forLoop;
-}
-
-Expression Parser::parseExpression()
-{
-	RecursionGuard recursionGuard(*this);
-
-	std::variant<Literal, Identifier> operation = parseLiteralOrIdentifier();
-	return visit(GenericVisitor{
-		[&](Identifier& _identifier) -> Expression
-		{
-			if (currentToken() == Token::LParen)
-				return parseCall(std::move(operation));
-			if (m_dialect.builtin(_identifier.name))
-				fatalParserError(
-					7104_error,
-					nativeLocationOf(_identifier),
-					"Builtin function \"" + _identifier.name.str() + "\" must be called."
-				);
-			return std::move(_identifier);
-		},
-		[&](Literal& _literal) -> Expression
-		{
-			return std::move(_literal);
-		}
-	}, operation);
-}
-
-std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier()
-{
-	RecursionGuard recursionGuard(*this);
-	switch (currentToken())
-	{
-	case Token::Identifier:
-	{
-		Identifier identifier{createDebugData(), YulString{currentLiteral()}};
-		advance();
-		return identifier;
-	}
-	case Token::StringLiteral:
-	case Token::HexStringLiteral:
-	case Token::Number:
-	case Token::TrueLiteral:
-	case Token::FalseLiteral:
-	{
-		LiteralKind kind = LiteralKind::Number;
-		switch (currentToken())
-		{
-		case Token::StringLiteral:
-		case Token::HexStringLiteral:
-			kind = LiteralKind::String;
-			break;
-		case Token::Number:
-			if (!isValidNumberLiteral(currentLiteral()))
-				fatalParserError(4828_error, "Invalid number literal.");
-			kind = LiteralKind::Number;
-			break;
-		case Token::TrueLiteral:
-		case Token::FalseLiteral:
-			kind = LiteralKind::Boolean;
-			break;
-		default:
-			break;
-		}
-
-		Literal literal{
-			createDebugData(),
-			kind,
-			YulString{currentLiteral()},
-			kind == LiteralKind::Boolean ? m_dialect.boolType : m_dialect.defaultType
-		};
-		advance();
-		if (currentToken() == Token::Colon)
-		{
-			expectToken(Token::Colon);
-			updateLocationEndFrom(literal.debugData, currentLocation());
-			literal.type = expectAsmIdentifier();
-		}
-
-		return literal;
-	}
-	case Token::Illegal:
-		fatalParserError(1465_error, "Illegal token: " + to_string(m_scanner->currentError()));
-		break;
-	default:
-		fatalParserError(1856_error, "Literal or identifier expected.");
-	}
-	return {};
-}
-
-VariableDeclaration Parser::parseVariableDeclaration()
-{
-	RecursionGuard recursionGuard(*this);
-	VariableDeclaration varDecl = createWithLocation<VariableDeclaration>();
-	expectToken(Token::Let);
-	while (true)
-	{
-		varDecl.variables.emplace_back(parseTypedName());
-		if (currentToken() == Token::Comma)
-			expectToken(Token::Comma);
-		else
-			break;
-	}
-	if (currentToken() == Token::AssemblyAssign)
-	{
-		expectToken(Token::AssemblyAssign);
-		varDecl.value = std::make_unique<Expression>(parseExpression());
-		updateLocationEndFrom(varDecl.debugData, nativeLocationOf(*varDecl.value));
-	}
-	else
-		updateLocationEndFrom(varDecl.debugData, nativeLocationOf(varDecl.variables.back()));
-
-	return varDecl;
-}
-
-FunctionDefinition Parser::parseFunctionDefinition()
-{
-	RecursionGuard recursionGuard(*this);
-
-	if (m_currentForLoopComponent == ForLoopComponent::ForLoopPre)
-		m_errorReporter.syntaxError(
-			3441_error,
-			currentLocation(),
-			"Functions cannot be defined inside a for-loop init block."
-		);
-
-	ForLoopComponent outerForLoopComponent = m_currentForLoopComponent;
-	m_currentForLoopComponent = ForLoopComponent::None;
-
-	FunctionDefinition funDef = createWithLocation<FunctionDefinition>();
-	expectToken(Token::Function);
-	funDef.name = expectAsmIdentifier();
-	expectToken(Token::LParen);
-	while (currentToken() != Token::RParen)
-	{
-		funDef.parameters.emplace_back(parseTypedName());
-		if (currentToken() == Token::RParen)
-			break;
-		expectToken(Token::Comma);
-	}
-	expectToken(Token::RParen);
-	if (currentToken() == Token::RightArrow)
-	{
-		expectToken(Token::RightArrow);
-		while (true)
-		{
-			funDef.returnVariables.emplace_back(parseTypedName());
-			if (currentToken() == Token::LBrace)
-				break;
-			expectToken(Token::Comma);
-		}
-	}
-	bool preInsideFunction = m_insideFunction;
-	m_insideFunction = true;
-	funDef.body = parseBlock();
-	m_insideFunction = preInsideFunction;
-	updateLocationEndFrom(funDef.debugData, nativeLocationOf(funDef.body));
-
-	m_currentForLoopComponent = outerForLoopComponent;
-	return funDef;
-}
-
-FunctionCall Parser::parseCall(std::variant<Literal, Identifier>&& _initialOp)
-{
-	RecursionGuard recursionGuard(*this);
-
-	if (!std::holds_alternative<Identifier>(_initialOp))
-		fatalParserError(9980_error, "Function name expected.");
-
-	FunctionCall ret;
-	ret.functionName = std::move(std::get<Identifier>(_initialOp));
-	ret.debugData = ret.functionName.debugData;
-
-	expectToken(Token::LParen);
-	if (currentToken() != Token::RParen)
-	{
-		ret.arguments.emplace_back(parseExpression());
-		while (currentToken() != Token::RParen)
-		{
-			expectToken(Token::Comma);
-			ret.arguments.emplace_back(parseExpression());
-		}
-	}
-	updateLocationEndFrom(ret.debugData, currentLocation());
-	expectToken(Token::RParen);
-	return ret;
-}
-
-TypedName Parser::parseTypedName()
-{
-	RecursionGuard recursionGuard(*this);
-	TypedName typedName = createWithLocation<TypedName>();
-	typedName.name = expectAsmIdentifier();
-	if (currentToken() == Token::Colon)
-	{
-		expectToken(Token::Colon);
-		updateLocationEndFrom(typedName.debugData, currentLocation());
-		typedName.type = expectAsmIdentifier();
-	}
-	else
-		typedName.type = m_dialect.defaultType;
-
-	return typedName;
-}
-
-YulString Parser::expectAsmIdentifier()
-{
-	YulString name{currentLiteral()};
-	if (currentToken() == Token::Identifier && m_dialect.builtin(name))
-		fatalParserError(5568_error, "Cannot use builtin function name \"" + name.str() + "\" as identifier name.");
-	// NOTE: We keep the expectation here to ensure the correct source location for the error above.
-	expectToken(Token::Identifier);
-	return name;
-}
-
-void Parser::checkBreakContinuePosition(std::string const& _which)
-{
-	switch (m_currentForLoopComponent)
-	{
-	case ForLoopComponent::None:
-		m_errorReporter.syntaxError(2592_error, currentLocation(), "Keyword \"" + _which + "\" needs to be inside a for-loop body.");
-		break;
-	case ForLoopComponent::ForLoopPre:
-		m_errorReporter.syntaxError(9615_error, currentLocation(), "Keyword \"" + _which + "\" in for-loop init block is not allowed.");
-		break;
-	case ForLoopComponent::ForLoopPost:
-		m_errorReporter.syntaxError(2461_error, currentLocation(), "Keyword \"" + _which + "\" in for-loop post block is not allowed.");
-		break;
-	case ForLoopComponent::ForLoopBody:
-		break;
-	}
-}
-
-bool Parser::isValidNumberLiteral(std::string const& _literal)
-{
-	try
-	{
-		// Try to convert _literal to u256.
-		[[maybe_unused]] auto tmp = u256(_literal);
-	}
-	catch (...)
-	{
-		return false;
-	}
-	if (boost::starts_with(_literal, "0x"))
-		return true;
-	else
-		return _literal.find_first_not_of("0123456789") == std::string::npos;
-}
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
deleted file mode 100644
index da4f09ed2212..000000000000
--- a/libyul/AsmParser.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Solidity inline assembly parser.
- */
-
-#pragma once
-
-#include <libyul/AST.h>
-#include <libyul/ASTForward.h>
-#include <libyul/Dialect.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/ParserBase.h>
-
-#include <map>
-#include <memory>
-#include <variant>
-#include <vector>
-#include <string_view>
-
-namespace solidity::yul
-{
-
-class Parser: public langutil::ParserBase
-{
-public:
-	enum class ForLoopComponent
-	{
-		None, ForLoopPre, ForLoopPost, ForLoopBody
-	};
-
-	enum class UseSourceLocationFrom
-	{
-		Scanner, LocationOverride, Comments,
-	};
-
-	explicit Parser(
-		langutil::ErrorReporter& _errorReporter,
-		Dialect const& _dialect,
-		std::optional<langutil::SourceLocation> _locationOverride = {}
-	):
-		ParserBase(_errorReporter),
-		m_dialect(_dialect),
-		m_locationOverride{_locationOverride ? *_locationOverride : langutil::SourceLocation{}},
-		m_useSourceLocationFrom{
-			_locationOverride ?
-			UseSourceLocationFrom::LocationOverride :
-			UseSourceLocationFrom::Scanner
-		}
-	{}
-
-	/// Constructs a Yul parser that is using the debug data
-	/// from the comments (via @src and other tags).
-	explicit Parser(
-		langutil::ErrorReporter& _errorReporter,
-		Dialect const& _dialect,
-		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceNames
-	):
-		ParserBase(_errorReporter),
-		m_dialect(_dialect),
-		m_sourceNames{std::move(_sourceNames)},
-		m_useSourceLocationFrom{
-			m_sourceNames.has_value() ?
-			UseSourceLocationFrom::Comments :
-			UseSourceLocationFrom::Scanner
-		}
-	{}
-
-	/// Parses an inline assembly block starting with `{` and ending with `}`.
-	/// @returns an empty shared pointer on error.
-	std::unique_ptr<Block> parseInline(std::shared_ptr<langutil::Scanner> const& _scanner);
-
-	/// Parses an assembly block starting with `{` and ending with `}`
-	/// and expects end of input after the '}'.
-	/// @returns an empty shared pointer on error.
-	std::unique_ptr<Block> parse(langutil::CharStream& _charStream);
-
-protected:
-	langutil::SourceLocation currentLocation() const override
-	{
-		if (m_useSourceLocationFrom == UseSourceLocationFrom::LocationOverride)
-			return m_locationOverride;
-
-		return ParserBase::currentLocation();
-	}
-
-	langutil::Token advance() override;
-
-	void fetchDebugDataFromComment();
-
-	std::optional<std::pair<std::string_view, langutil::SourceLocation>> parseSrcComment(
-		std::string_view _arguments,
-		langutil::SourceLocation const& _commentLocation
-	);
-
-	std::optional<std::pair<std::string_view, std::optional<int>>> parseASTIDComment(
-		std::string_view _arguments,
-		langutil::SourceLocation const& _commentLocation
-	);
-
-	/// Creates a DebugData object with the correct source location set.
-	std::shared_ptr<DebugData const> createDebugData() const;
-
-	void updateLocationEndFrom(
-		std::shared_ptr<DebugData const>& _debugData,
-		langutil::SourceLocation const& _location
-	) const;
-
-	/// Creates an inline assembly node with the current source location.
-	template <class T> T createWithLocation() const
-	{
-		T r;
-		r.debugData = createDebugData();
-		return r;
-	}
-
-	Block parseBlock();
-	Statement parseStatement();
-	Case parseCase();
-	ForLoop parseForLoop();
-	/// Parses a functional expression that has to push exactly one stack element
-	Expression parseExpression();
-	/// Parses an elementary operation, i.e. a literal, identifier, instruction or
-	/// builtin functian call (only the name).
-	std::variant<Literal, Identifier> parseLiteralOrIdentifier();
-	VariableDeclaration parseVariableDeclaration();
-	FunctionDefinition parseFunctionDefinition();
-	FunctionCall parseCall(std::variant<Literal, Identifier>&& _initialOp);
-	TypedName parseTypedName();
-	YulString expectAsmIdentifier();
-
-	/// Reports an error if we are currently not inside the body part of a for loop.
-	void checkBreakContinuePosition(std::string const& _which);
-
-	static bool isValidNumberLiteral(std::string const& _literal);
-
-private:
-	Dialect const& m_dialect;
-
-	std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> m_sourceNames;
-	langutil::SourceLocation m_locationOverride;
-	langutil::SourceLocation m_locationFromComment;
-	std::optional<int64_t> m_astIDFromComment;
-	UseSourceLocationFrom m_useSourceLocationFrom = UseSourceLocationFrom::Scanner;
-	ForLoopComponent m_currentForLoopComponent = ForLoopComponent::None;
-	bool m_insideFunction = false;
-};
-
-}
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
deleted file mode 100644
index bee213f8cafb..000000000000
--- a/libyul/AsmPrinter.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2017
- * Converts a parsed assembly into its textual form.
- */
-
-#include <libyul/AsmPrinter.h>
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Dialect.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/replace.hpp>
-
-#include <range/v3/view/transform.hpp>
-
-#include <memory>
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-std::string AsmPrinter::operator()(Literal const& _literal)
-{
-	std::string const locationComment = formatDebugData(_literal);
-
-	switch (_literal.kind)
-	{
-	case LiteralKind::Number:
-		yulAssert(isValidDecimal(_literal.value.str()) || isValidHex(_literal.value.str()), "Invalid number literal");
-		return locationComment + _literal.value.str() + appendTypeName(_literal.type);
-	case LiteralKind::Boolean:
-		yulAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "Invalid bool literal.");
-		return locationComment + ((_literal.value == "true"_yulstring) ? "true" : "false") + appendTypeName(_literal.type, true);
-	case LiteralKind::String:
-		break;
-	}
-
-	return locationComment + escapeAndQuoteString(_literal.value.str()) + appendTypeName(_literal.type);
-}
-
-std::string AsmPrinter::operator()(Identifier const& _identifier)
-{
-	yulAssert(!_identifier.name.empty(), "Invalid identifier.");
-	return formatDebugData(_identifier) + _identifier.name.str();
-}
-
-std::string AsmPrinter::operator()(ExpressionStatement const& _statement)
-{
-	std::string const locationComment = formatDebugData(_statement);
-
-	return locationComment + std::visit(*this, _statement.expression);
-}
-
-std::string AsmPrinter::operator()(Assignment const& _assignment)
-{
-	std::string const locationComment = formatDebugData(_assignment);
-
-	yulAssert(_assignment.variableNames.size() >= 1, "");
-	std::string variables = (*this)(_assignment.variableNames.front());
-	for (size_t i = 1; i < _assignment.variableNames.size(); ++i)
-		variables += ", " + (*this)(_assignment.variableNames[i]);
-
-	return locationComment + variables + " := " + std::visit(*this, *_assignment.value);
-}
-
-std::string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration)
-{
-	std::string out = formatDebugData(_variableDeclaration);
-
-	out += "let ";
-	out += boost::algorithm::join(
-		_variableDeclaration.variables | ranges::views::transform(
-			[this](TypedName argument) { return formatTypedName(argument); }
-		),
-		", "
-	);
-	if (_variableDeclaration.value)
-	{
-		out += " := ";
-		out += std::visit(*this, *_variableDeclaration.value);
-	}
-	return out;
-}
-
-std::string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition)
-{
-	yulAssert(!_functionDefinition.name.empty(), "Invalid function name.");
-
-	std::string out = formatDebugData(_functionDefinition);
-	out += "function " + _functionDefinition.name.str() + "(";
-	out += boost::algorithm::join(
-		_functionDefinition.parameters | ranges::views::transform(
-			[this](TypedName argument) { return formatTypedName(argument); }
-		),
-		", "
-	);
-	out += ")";
-	if (!_functionDefinition.returnVariables.empty())
-	{
-		out += " -> ";
-		out += boost::algorithm::join(
-			_functionDefinition.returnVariables | ranges::views::transform(
-				[this](TypedName argument) { return formatTypedName(argument); }
-			),
-			", "
-		);
-	}
-
-	return out + "\n" + (*this)(_functionDefinition.body);
-}
-
-std::string AsmPrinter::operator()(FunctionCall const& _functionCall)
-{
-	std::string const locationComment = formatDebugData(_functionCall);
-	std::string const functionName = (*this)(_functionCall.functionName);
-	return
-		locationComment +
-		functionName + "(" +
-		boost::algorithm::join(
-			_functionCall.arguments | ranges::views::transform([&](auto&& _node) { return std::visit(*this, _node); }),
-			", " ) +
-		")";
-}
-
-std::string AsmPrinter::operator()(If const& _if)
-{
-	yulAssert(_if.condition, "Invalid if condition.");
-
-	std::string out = formatDebugData(_if);
-	out += "if " + std::visit(*this, *_if.condition);
-
-	std::string body = (*this)(_if.body);
-	char delim = '\n';
-	if (body.find('\n') == std::string::npos)
-		delim = ' ';
-
-	return out + delim + body;
-}
-
-std::string AsmPrinter::operator()(Switch const& _switch)
-{
-	yulAssert(_switch.expression, "Invalid expression pointer.");
-
-	std::string out = formatDebugData(_switch);
-	out += "switch " + std::visit(*this, *_switch.expression);
-
-	for (auto const& _case: _switch.cases)
-	{
-		if (!_case.value)
-			out += "\ndefault ";
-		else
-			out += "\ncase " + (*this)(*_case.value) + " ";
-		out += (*this)(_case.body);
-	}
-	return out;
-}
-
-std::string AsmPrinter::operator()(ForLoop const& _forLoop)
-{
-	yulAssert(_forLoop.condition, "Invalid for loop condition.");
-	std::string const locationComment = formatDebugData(_forLoop);
-
-	std::string pre = (*this)(_forLoop.pre);
-	std::string condition = std::visit(*this, *_forLoop.condition);
-	std::string post = (*this)(_forLoop.post);
-
-	char delim = '\n';
-	if (
-		pre.size() + condition.size() + post.size() < 60 &&
-		pre.find('\n') == std::string::npos &&
-		post.find('\n') == std::string::npos
-	)
-		delim = ' ';
-	return
-		locationComment +
-		("for " + std::move(pre) + delim + std::move(condition) + delim + std::move(post) + "\n") +
-		(*this)(_forLoop.body);
-}
-
-std::string AsmPrinter::operator()(Break const& _break)
-{
-	return formatDebugData(_break) + "break";
-}
-
-std::string AsmPrinter::operator()(Continue const& _continue)
-{
-	return formatDebugData(_continue) + "continue";
-}
-
-// '_leave' and '__leave' is reserved in VisualStudio
-std::string AsmPrinter::operator()(Leave const& leave_)
-{
-	return formatDebugData(leave_) + "leave";
-}
-
-std::string AsmPrinter::operator()(Block const& _block)
-{
-	std::string const locationComment = formatDebugData(_block);
-
-	if (_block.statements.empty())
-		return locationComment + "{ }";
-	std::string body = boost::algorithm::join(
-		_block.statements | ranges::views::transform([&](auto&& _node) { return std::visit(*this, _node); }),
-		"\n"
-	);
-	if (body.size() < 30 && body.find('\n') == std::string::npos)
-		return locationComment + "{ " + body + " }";
-	else
-	{
-		boost::replace_all(body, "\n", "\n    ");
-		return locationComment + "{\n    " + body + "\n}";
-	}
-}
-
-std::string AsmPrinter::formatTypedName(TypedName _variable)
-{
-	yulAssert(!_variable.name.empty(), "Invalid variable name.");
-	return formatDebugData(_variable) + _variable.name.str() + appendTypeName(_variable.type);
-}
-
-std::string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const
-{
-	if (m_dialect && !_type.empty())
-	{
-		if (!_isBoolLiteral && _type == m_dialect->defaultType)
-			_type = {};
-		else if (_isBoolLiteral && _type == m_dialect->boolType && !m_dialect->defaultType.empty())
-			// Special case: If we have a bool type but empty default type, do not remove the type.
-			_type = {};
-	}
-	if (_type.empty())
-		return {};
-	else
-		return ":" + _type.str();
-}
-
-std::string AsmPrinter::formatSourceLocation(
-	SourceLocation const& _location,
-	std::map<std::string, unsigned> const& _nameToSourceIndex,
-	DebugInfoSelection const& _debugInfoSelection,
-	CharStreamProvider const* _soliditySourceProvider
-)
-{
-	yulAssert(!_nameToSourceIndex.empty(), "");
-	if (_debugInfoSelection.snippet)
-		yulAssert(_debugInfoSelection.location, "@src tag must always contain the source location");
-
-	if (_debugInfoSelection.none())
-		return "";
-
-	std::string sourceIndex = "-1";
-	std::string solidityCodeSnippet = "";
-	if (_location.sourceName)
-	{
-		sourceIndex = std::to_string(_nameToSourceIndex.at(*_location.sourceName));
-
-		if (
-			_debugInfoSelection.snippet &&
-			_soliditySourceProvider &&
-			!_soliditySourceProvider->charStream(*_location.sourceName).isImportedFromAST()
-		)
-		{
-			solidityCodeSnippet = escapeAndQuoteString(
-				_soliditySourceProvider->charStream(*_location.sourceName).singleLineSnippet(_location)
-			);
-
-			// On top of escaping quotes we also escape the slash inside any `*/` to guard against
-			// it prematurely terminating multi-line comment blocks. We do not escape all slashes
-			// because the ones without `*` are not dangerous and ignoring them reduces visual noise.
-			boost::replace_all(solidityCodeSnippet, "*/", "*\\/");
-		}
-	}
-
-	std::string sourceLocation =
-		"@src " +
-		sourceIndex +
-		":" +
-		std::to_string(_location.start) +
-		":" +
-		std::to_string(_location.end);
-
-	return sourceLocation + (solidityCodeSnippet.empty() ? "" : "  ") + solidityCodeSnippet;
-}
-
-std::string AsmPrinter::formatDebugData(std::shared_ptr<DebugData const> const& _debugData, bool _statement)
-{
-	if (!_debugData || m_debugInfoSelection.none())
-		return "";
-
-	std::vector<std::string> items;
-	if (auto id = _debugData->astID)
-		if (m_debugInfoSelection.astID)
-			items.emplace_back("@ast-id " + std::to_string(*id));
-
-	if (
-		m_lastLocation != _debugData->originLocation &&
-		!m_nameToSourceIndex.empty()
-	)
-	{
-		m_lastLocation = _debugData->originLocation;
-
-		items.emplace_back(formatSourceLocation(
-			_debugData->originLocation,
-			m_nameToSourceIndex,
-			m_debugInfoSelection,
-			m_soliditySourceProvider
-		));
-	}
-
-	std::string commentBody = joinHumanReadable(items, " ");
-	if (commentBody.empty())
-		return "";
-	else
-		return
-			_statement ?
-			"/// " + commentBody + "\n" :
-			"/** " + commentBody + " */ ";
-}
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
deleted file mode 100644
index 7c67c14acfdc..000000000000
--- a/libyul/AsmPrinter.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2017
- * Converts a parsed assembly into its textual form.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Converts a parsed Yul AST into readable string representation.
- * Ignores source locations.
- * If a dialect is provided, the dialect's default type is omitted.
- */
-class AsmPrinter
-{
-public:
-	explicit AsmPrinter(
-		Dialect const* _dialect = nullptr,
-		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceIndexToName = {},
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	):
-		m_dialect(_dialect),
-		m_debugInfoSelection(_debugInfoSelection),
-		m_soliditySourceProvider(_soliditySourceProvider)
-	{
-		if (_sourceIndexToName)
-			for (auto&& [index, name]: *_sourceIndexToName)
-				m_nameToSourceIndex[*name] = index;
-	}
-
-	explicit AsmPrinter(
-		Dialect const& _dialect,
-		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceIndexToName = {},
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	): AsmPrinter(&_dialect, _sourceIndexToName, _debugInfoSelection, _soliditySourceProvider) {}
-
-	std::string operator()(Literal const& _literal);
-	std::string operator()(Identifier const& _identifier);
-	std::string operator()(ExpressionStatement const& _expr);
-	std::string operator()(Assignment const& _assignment);
-	std::string operator()(VariableDeclaration const& _variableDeclaration);
-	std::string operator()(FunctionDefinition const& _functionDefinition);
-	std::string operator()(FunctionCall const& _functionCall);
-	std::string operator()(If const& _if);
-	std::string operator()(Switch const& _switch);
-	std::string operator()(ForLoop const& _forLoop);
-	std::string operator()(Break const& _break);
-	std::string operator()(Continue const& _continue);
-	std::string operator()(Leave const& _continue);
-	std::string operator()(Block const& _block);
-
-	static std::string formatSourceLocation(
-		langutil::SourceLocation const& _location,
-		std::map<std::string, unsigned> const& _nameToSourceIndex,
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr
-	);
-
-private:
-	std::string formatTypedName(TypedName _variable);
-	std::string appendTypeName(YulString _type, bool _isBoolLiteral = false) const;
-	std::string formatDebugData(std::shared_ptr<DebugData const> const& _debugData, bool _statement);
-	template <class T>
-	std::string formatDebugData(T const& _node)
-	{
-		bool isExpression = std::is_constructible<Expression, T>::value;
-		return formatDebugData(_node.debugData, !isExpression);
-	}
-
-	Dialect const* const m_dialect = nullptr;
-	std::map<std::string, unsigned> m_nameToSourceIndex;
-	langutil::SourceLocation m_lastLocation = {};
-	langutil::DebugInfoSelection m_debugInfoSelection = {};
-	langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr;
-};
-
-}
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
deleted file mode 100644
index 811a6239b7f0..000000000000
--- a/libyul/CMakeLists.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-add_library(yul
-	${GENERATED_POLYFILL_HEADERS}
-
-	AsmAnalysis.cpp
-	AsmAnalysis.h
-	AsmAnalysisInfo.h
-	AST.h
-	ASTForward.h
-	AsmJsonConverter.h
-	AsmJsonConverter.cpp
-	AsmJsonImporter.h
-	AsmJsonImporter.cpp
-	AsmParser.cpp
-	AsmParser.h
-	AsmPrinter.cpp
-	AsmPrinter.h
-	YulStack.h
-	YulStack.cpp
-	CompilabilityChecker.cpp
-	CompilabilityChecker.h
-	ControlFlowSideEffects.h
-	ControlFlowSideEffectsCollector.cpp
-	ControlFlowSideEffectsCollector.h
-	Dialect.cpp
-	Dialect.h
-	Exceptions.h
-	FunctionReferenceResolver.cpp
-	FunctionReferenceResolver.h
-	Object.cpp
-	Object.h
-	ObjectParser.cpp
-	ObjectParser.h
-	Scope.cpp
-	Scope.h
-	ScopeFiller.cpp
-	ScopeFiller.h
-	Utilities.cpp
-	Utilities.h
-	YulString.h
-	backends/evm/AbstractAssembly.h
-	backends/evm/AsmCodeGen.cpp
-	backends/evm/AsmCodeGen.h
-	backends/evm/ConstantOptimiser.cpp
-	backends/evm/ConstantOptimiser.h
-	backends/evm/ControlFlowGraph.h
-	backends/evm/ControlFlowGraphBuilder.cpp
-	backends/evm/ControlFlowGraphBuilder.h
-	backends/evm/EthAssemblyAdapter.cpp
-	backends/evm/EthAssemblyAdapter.h
-	backends/evm/EVMCodeTransform.cpp
-	backends/evm/EVMCodeTransform.h
-	backends/evm/EVMDialect.cpp
-	backends/evm/EVMDialect.h
-	backends/evm/EVMObjectCompiler.cpp
-	backends/evm/EVMObjectCompiler.h
-	backends/evm/EVMMetrics.cpp
-	backends/evm/EVMMetrics.h
-	backends/evm/NoOutputAssembly.h
-	backends/evm/NoOutputAssembly.cpp
-	backends/evm/OptimizedEVMCodeTransform.cpp
-	backends/evm/OptimizedEVMCodeTransform.h
-	backends/evm/StackHelpers.h
-	backends/evm/StackLayoutGenerator.cpp
-	backends/evm/StackLayoutGenerator.h
-	backends/evm/VariableReferenceCounter.h
-	backends/evm/VariableReferenceCounter.cpp
-	optimiser/ASTCopier.cpp
-	optimiser/ASTCopier.h
-	optimiser/ASTWalker.cpp
-	optimiser/ASTWalker.h
-	optimiser/BlockFlattener.cpp
-	optimiser/BlockFlattener.h
-	optimiser/BlockHasher.cpp
-	optimiser/BlockHasher.h
-	optimiser/CallGraphGenerator.cpp
-	optimiser/CallGraphGenerator.h
-	optimiser/CircularReferencesPruner.cpp
-	optimiser/CircularReferencesPruner.h
-	optimiser/CommonSubexpressionEliminator.cpp
-	optimiser/CommonSubexpressionEliminator.h
-	optimiser/ConditionalSimplifier.cpp
-	optimiser/ConditionalSimplifier.h
-	optimiser/ConditionalUnsimplifier.cpp
-	optimiser/ConditionalUnsimplifier.h
-	optimiser/ControlFlowSimplifier.cpp
-	optimiser/ControlFlowSimplifier.h
-	optimiser/DataFlowAnalyzer.cpp
-	optimiser/DataFlowAnalyzer.h
-	optimiser/DeadCodeEliminator.cpp
-	optimiser/DeadCodeEliminator.h
-	optimiser/Disambiguator.cpp
-	optimiser/Disambiguator.h
-	optimiser/EqualStoreEliminator.cpp
-	optimiser/EqualStoreEliminator.h
-	optimiser/EquivalentFunctionDetector.cpp
-	optimiser/EquivalentFunctionDetector.h
-	optimiser/EquivalentFunctionCombiner.cpp
-	optimiser/EquivalentFunctionCombiner.h
-	optimiser/ExpressionInliner.cpp
-	optimiser/ExpressionInliner.h
-	optimiser/ExpressionJoiner.cpp
-	optimiser/ExpressionJoiner.h
-	optimiser/ExpressionSimplifier.cpp
-	optimiser/ExpressionSimplifier.h
-	optimiser/ExpressionSplitter.cpp
-	optimiser/ExpressionSplitter.h
-	optimiser/ForLoopConditionIntoBody.cpp
-	optimiser/ForLoopConditionIntoBody.h
-	optimiser/ForLoopConditionOutOfBody.cpp
-	optimiser/ForLoopConditionOutOfBody.h
-	optimiser/ForLoopInitRewriter.cpp
-	optimiser/ForLoopInitRewriter.h
-	optimiser/FullInliner.cpp
-	optimiser/FullInliner.h
-	optimiser/FunctionCallFinder.cpp
-	optimiser/FunctionCallFinder.h
-	optimiser/FunctionGrouper.cpp
-	optimiser/FunctionGrouper.h
-	optimiser/FunctionHoister.cpp
-	optimiser/FunctionHoister.h
-	optimiser/FunctionSpecializer.cpp
-	optimiser/FunctionSpecializer.h
-	optimiser/InlinableExpressionFunctionFinder.cpp
-	optimiser/InlinableExpressionFunctionFinder.h
-	optimiser/KnowledgeBase.cpp
-	optimiser/KnowledgeBase.h
-	optimiser/LoadResolver.cpp
-	optimiser/LoadResolver.h
-	optimiser/LoopInvariantCodeMotion.cpp
-	optimiser/LoopInvariantCodeMotion.h
-	optimiser/Metrics.cpp
-	optimiser/Metrics.h
-	optimiser/NameCollector.cpp
-	optimiser/NameCollector.h
-	optimiser/NameDispenser.cpp
-	optimiser/NameDispenser.h
-	optimiser/NameDisplacer.cpp
-	optimiser/NameDisplacer.h
-	optimiser/NameSimplifier.cpp
-	optimiser/NameSimplifier.h
-	optimiser/OptimiserStep.h
-	optimiser/OptimizerUtilities.cpp
-	optimiser/OptimizerUtilities.h
-	optimiser/UnusedAssignEliminator.cpp
-	optimiser/UnusedAssignEliminator.h
-	optimiser/UnusedStoreBase.cpp
-	optimiser/UnusedStoreBase.h
-	optimiser/UnusedStoreEliminator.cpp
-	optimiser/UnusedStoreEliminator.h
-	optimiser/Rematerialiser.cpp
-	optimiser/Rematerialiser.h
-	optimiser/SSAReverser.cpp
-	optimiser/SSAReverser.h
-	optimiser/SSATransform.cpp
-	optimiser/SSATransform.h
-	optimiser/SSAValueTracker.cpp
-	optimiser/SSAValueTracker.h
-	optimiser/Semantics.cpp
-	optimiser/Semantics.h
-	optimiser/SimplificationRules.cpp
-	optimiser/SimplificationRules.h
-	optimiser/StackCompressor.cpp
-	optimiser/StackCompressor.h
-	optimiser/StackLimitEvader.cpp
-	optimiser/StackLimitEvader.h
-	optimiser/StackToMemoryMover.cpp
-	optimiser/StackToMemoryMover.h
-	optimiser/StructuralSimplifier.cpp
-	optimiser/StructuralSimplifier.h
-	optimiser/Substitution.cpp
-	optimiser/Substitution.h
-	optimiser/Suite.cpp
-	optimiser/Suite.h
-	optimiser/SyntacticalEquality.cpp
-	optimiser/SyntacticalEquality.h
-	optimiser/TypeInfo.cpp
-	optimiser/TypeInfo.h
-	optimiser/UnusedFunctionParameterPruner.cpp
-	optimiser/UnusedFunctionParameterPruner.h
-	optimiser/UnusedFunctionsCommon.h
-	optimiser/UnusedFunctionsCommon.cpp
-	optimiser/UnusedPruner.cpp
-	optimiser/UnusedPruner.h
-	optimiser/VarDeclInitializer.cpp
-	optimiser/VarDeclInitializer.h
-	optimiser/VarNameCleaner.cpp
-	optimiser/VarNameCleaner.h
-)
-
-target_link_libraries(yul PUBLIC evmasm solutil langutil smtutil fmt::fmt-header-only)
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
deleted file mode 100644
index 9e18f48d824c..000000000000
--- a/libyul/CompilabilityChecker.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Component that checks whether all variables are reachable on the stack.
- */
-
-#include <libyul/CompilabilityChecker.h>
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-
-#include <libyul/backends/evm/EVMCodeTransform.h>
-#include <libyul/backends/evm/NoOutputAssembly.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-CompilabilityChecker::CompilabilityChecker(
-	Dialect const& _dialect,
-	Object const& _object,
-	bool _optimizeStackAllocation
-)
-{
-	if (auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
-	{
-		NoOutputEVMDialect noOutputDialect(*evmDialect);
-
-		yul::AsmAnalysisInfo analysisInfo =
-			yul::AsmAnalyzer::analyzeStrictAssertCorrect(noOutputDialect, _object);
-
-		BuiltinContext builtinContext;
-		builtinContext.currentObject = &_object;
-		if (!_object.name.empty())
-			builtinContext.subIDs[_object.name] = 1;
-		for (auto const& subNode: _object.subObjects)
-			builtinContext.subIDs[subNode->name] = 1;
-		NoOutputAssembly assembly{evmDialect->evmVersion()};
-		CodeTransform transform(
-			assembly,
-			analysisInfo,
-			*_object.code,
-			noOutputDialect,
-			builtinContext,
-			_optimizeStackAllocation
-		);
-		transform(*_object.code);
-
-		for (StackTooDeepError const& error: transform.stackErrors())
-		{
-			auto& unreachables = unreachableVariables[error.functionName];
-			if (!util::contains(unreachables, error.variable))
-				unreachables.emplace_back(error.variable);
-			int& deficit = stackDeficit[error.functionName];
-			deficit = std::max(error.depth, deficit);
-		}
-	}
-}
diff --git a/libyul/CompilabilityChecker.h b/libyul/CompilabilityChecker.h
deleted file mode 100644
index c046df94ffb9..000000000000
--- a/libyul/CompilabilityChecker.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that checks whether all variables are reachable on the stack.
- */
-
-#pragma once
-
-#include <libyul/Dialect.h>
-#include <libyul/ASTForward.h>
-#include <libyul/Object.h>
-
-#include <map>
-#include <memory>
-
-namespace solidity::yul
-{
-
-/**
- * Component that checks whether all variables are reachable on the stack and
- * provides a mapping from function name to the largest stack difference found
- * in that function (no entry present if that function is compilable), as well
- * as the set of unreachable variables for each function.
- *
- * This only works properly if the outermost block is compilable and
- * functions are not nested. Otherwise, it might miss reporting some functions.
- *
- * Only checks the code of the object itself, does not descend into sub-objects.
- */
-struct CompilabilityChecker
-{
-	CompilabilityChecker(Dialect const& _dialect, Object const& _object, bool _optimizeStackAllocation);
-	std::map<YulString, std::vector<YulString>> unreachableVariables;
-	std::map<YulString, int> stackDeficit;
-};
-
-}
diff --git a/libyul/ControlFlowSideEffects.h b/libyul/ControlFlowSideEffects.h
deleted file mode 100644
index d4debab9381a..000000000000
--- a/libyul/ControlFlowSideEffects.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-namespace solidity::yul
-{
-
-/**
- * Side effects of a user-defined or builtin function.
- *
- * Each of the three booleans represents a reachability condition. There is an implied
- * fourth alternative, which is going out of gas while executing the function. Since
- * this can always happen and depends on the supply of gas, it is not considered.
- *
- * If all three booleans are false, it means that the function always leads to infinite
- * recursion.
- */
-struct ControlFlowSideEffects
-{
-	/// If true, the function contains at least one reachable branch that terminates successfully.
-	bool canTerminate = false;
-	/// If true, the function contains at least one reachable branch that reverts.
-	bool canRevert = false;
-	/// If true, the function has a regular outgoing control-flow.
-	bool canContinue = true;
-
-	bool terminatesOrReverts() const
-	{
-		return (canTerminate || canRevert) && !canContinue;
-	}
-};
-
-}
diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
deleted file mode 100644
index c657fa17cba2..000000000000
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/ControlFlowSideEffectsCollector.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/FunctionReferenceResolver.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Algorithms.h>
-
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/algorithm/find_if.hpp>
-
-using namespace solidity::yul;
-
-
-ControlFlowBuilder::ControlFlowBuilder(Block const& _ast)
-{
-	m_currentNode = newNode();
-	(*this)(_ast);
-}
-
-void ControlFlowBuilder::operator()(FunctionCall const& _functionCall)
-{
-	walkVector(_functionCall.arguments | ranges::views::reverse);
-	newConnectedNode();
-	m_currentNode->functionCall = &_functionCall;
-}
-
-void ControlFlowBuilder::operator()(If const& _if)
-{
-	visit(*_if.condition);
-	ControlFlowNode* node = m_currentNode;
-
-	ControlFlowNode* ifEnd = newNode();
-	node->successors.emplace_back(ifEnd);
-
-	newConnectedNode();
-	(*this)(_if.body);
-
-	m_currentNode->successors.emplace_back(ifEnd);
-	m_currentNode = ifEnd;
-}
-
-void ControlFlowBuilder::operator()(Switch const& _switch)
-{
-	visit(*_switch.expression);
-	ControlFlowNode* initialNode = m_currentNode;
-	ControlFlowNode* finalNode = newNode();
-
-	if (_switch.cases.back().value)
-		initialNode->successors.emplace_back(finalNode);
-
-	for (Case const& case_: _switch.cases)
-	{
-		m_currentNode = initialNode;
-		newConnectedNode();
-		(*this)(case_.body);
-		m_currentNode->successors.emplace_back(finalNode);
-	}
-	m_currentNode = finalNode;
-}
-
-void ControlFlowBuilder::operator()(FunctionDefinition const& _function)
-{
-	ScopedSaveAndRestore currentNode(m_currentNode, nullptr);
-	ScopedSaveAndRestore leave(m_leave, nullptr);
-	ScopedSaveAndRestore _break(m_break, nullptr);
-	ScopedSaveAndRestore _continue(m_continue, nullptr);
-
-	FunctionFlow flow;
-	flow.exit = newNode();
-	m_currentNode = newNode();
-	flow.entry = m_currentNode;
-	m_leave = flow.exit;
-
-	(*this)(_function.body);
-
-	m_currentNode->successors.emplace_back(flow.exit);
-
-	m_functionFlows[&_function] = std::move(flow);
-
-	m_leave = nullptr;
-}
-
-void ControlFlowBuilder::operator()(ForLoop const& _for)
-{
-	ScopedSaveAndRestore scopedBreakNode(m_break, nullptr);
-	ScopedSaveAndRestore scopedContinueNode(m_continue, nullptr);
-
-	(*this)(_for.pre);
-
-	ControlFlowNode* breakNode = newNode();
-	m_break = breakNode;
-	ControlFlowNode* continueNode = newNode();
-	m_continue = continueNode;
-
-	newConnectedNode();
-	ControlFlowNode* loopNode = m_currentNode;
-	visit(*_for.condition);
-	m_currentNode->successors.emplace_back(m_break);
-	newConnectedNode();
-
-	(*this)(_for.body);
-
-	m_currentNode->successors.emplace_back(m_continue);
-	m_currentNode = continueNode;
-
-	(*this)(_for.post);
-	m_currentNode->successors.emplace_back(loopNode);
-
-	m_currentNode = breakNode;
-}
-
-void ControlFlowBuilder::operator()(Break const&)
-{
-	yulAssert(m_break);
-	m_currentNode->successors.emplace_back(m_break);
-	m_currentNode = newNode();
-}
-
-void ControlFlowBuilder::operator()(Continue const&)
-{
-	yulAssert(m_continue);
-	m_currentNode->successors.emplace_back(m_continue);
-	m_currentNode = newNode();
-}
-
-void ControlFlowBuilder::operator()(Leave const&)
-{
-	yulAssert(m_leave);
-	m_currentNode->successors.emplace_back(m_leave);
-	m_currentNode = newNode();
-}
-
-void ControlFlowBuilder::newConnectedNode()
-{
-	ControlFlowNode* node = newNode();
-	m_currentNode->successors.emplace_back(node);
-	m_currentNode = node;
-}
-
-ControlFlowNode* ControlFlowBuilder::newNode()
-{
-	m_nodes.emplace_back(std::make_shared<ControlFlowNode>());
-	return m_nodes.back().get();
-}
-
-
-ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
-	Dialect const& _dialect,
-	Block const& _ast
-):
-	m_dialect(_dialect),
-	m_cfgBuilder(_ast),
-	m_functionReferences(FunctionReferenceResolver{_ast}.references())
-{
-	for (auto&& [function, flow]: m_cfgBuilder.functionFlows())
-	{
-		yulAssert(!flow.entry->functionCall);
-		yulAssert(function);
-		m_processedNodes[function] = {};
-		m_pendingNodes[function].push_front(flow.entry);
-		m_functionSideEffects[function] = {false, false, false};
-		m_functionCalls[function] = {};
-	}
-
-	// Process functions while we have progress. For now, we are only interested
-	// in `canContinue`.
-	bool progress = true;
-	while (progress)
-	{
-		progress = false;
-		for (FunctionDefinition const* function: m_pendingNodes | ranges::views::keys)
-			if (processFunction(*function))
-				progress = true;
-	}
-
-	// No progress anymore: All remaining nodes are calls
-	// to functions that always recurse.
-	// If we have not set `canContinue` by now, the function's exit
-	// is not reachable.
-
-	// Now it is sufficient to handle the reachable function calls (`m_functionCalls`),
-	// we do not have to consider the control-flow graph anymore.
-	for (auto&& [function, calls]: m_functionCalls)
-	{
-		yulAssert(function);
-		ControlFlowSideEffects& functionSideEffects = m_functionSideEffects[function];
-		auto _visit = [&, visited = std::set<FunctionDefinition const*>{}](FunctionDefinition const& _function, auto&& _recurse) mutable {
-			// Worst side-effects already, stop searching.
-			if (functionSideEffects.canTerminate && functionSideEffects.canRevert)
-				return;
-			if (!visited.insert(&_function).second)
-				return;
-
-			for (FunctionCall const* call: m_functionCalls.at(&_function))
-			{
-				ControlFlowSideEffects const& calledSideEffects = sideEffects(*call);
-				if (calledSideEffects.canTerminate)
-					functionSideEffects.canTerminate = true;
-				if (calledSideEffects.canRevert)
-					functionSideEffects.canRevert = true;
-
-				if (m_functionReferences.count(call))
-					_recurse(*m_functionReferences.at(call), _recurse);
-			}
-		};
-		_visit(*function, _visit);
-	}
-}
-
-std::map<YulString, ControlFlowSideEffects> ControlFlowSideEffectsCollector::functionSideEffectsNamed() const
-{
-	std::map<YulString, ControlFlowSideEffects> result;
-	for (auto&& [function, sideEffects]: m_functionSideEffects)
-		yulAssert(result.insert({function->name, sideEffects}).second);
-	return result;
-}
-
-bool ControlFlowSideEffectsCollector::processFunction(FunctionDefinition const& _function)
-{
-	bool progress = false;
-	while (ControlFlowNode const* node = nextProcessableNode(_function))
-	{
-		if (node == m_cfgBuilder.functionFlows().at(&_function).exit)
-		{
-			m_functionSideEffects[&_function].canContinue = true;
-			return true;
-		}
-		for (ControlFlowNode const* s: node->successors)
-			recordReachabilityAndQueue(_function, s);
-
-		progress = true;
-	}
-	return progress;
-}
-
-ControlFlowNode const* ControlFlowSideEffectsCollector::nextProcessableNode(FunctionDefinition const& _function)
-{
-	std::list<ControlFlowNode const*>& nodes = m_pendingNodes[&_function];
-	auto it = ranges::find_if(nodes, [this](ControlFlowNode const* _node) {
-		return !_node->functionCall || sideEffects(*_node->functionCall).canContinue;
-	});
-	if (it == nodes.end())
-		return nullptr;
-
-	ControlFlowNode const* node = *it;
-	nodes.erase(it);
-	return node;
-}
-
-ControlFlowSideEffects const& ControlFlowSideEffectsCollector::sideEffects(FunctionCall const& _call) const
-{
-	if (auto const* builtin = m_dialect.builtin(_call.functionName.name))
-		return builtin->controlFlowSideEffects;
-	else
-		return m_functionSideEffects.at(m_functionReferences.at(&_call));
-}
-
-void ControlFlowSideEffectsCollector::recordReachabilityAndQueue(
-	FunctionDefinition const& _function,
-	ControlFlowNode const* _node
-)
-{
-	if (_node->functionCall)
-		m_functionCalls[&_function].insert(_node->functionCall);
-	if (m_processedNodes[&_function].insert(_node).second)
-		m_pendingNodes.at(&_function).push_front(_node);
-}
diff --git a/libyul/ControlFlowSideEffectsCollector.h b/libyul/ControlFlowSideEffectsCollector.h
deleted file mode 100644
index a4ab2bfae770..000000000000
--- a/libyul/ControlFlowSideEffectsCollector.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/ControlFlowSideEffects.h>
-
-#include <set>
-#include <stack>
-#include <optional>
-#include <list>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-
-struct ControlFlowNode
-{
-	std::vector<ControlFlowNode const*> successors;
-	/// Function call AST node, if present.
-	FunctionCall const* functionCall = nullptr;
-};
-
-/**
- * The control flow of a function with entry and exit nodes.
- */
-struct FunctionFlow
-{
-	ControlFlowNode const* entry;
-	ControlFlowNode const* exit;
-};
-
-/**
- * Requires: Disambiguator, Function Hoister.
- */
-class ControlFlowBuilder: private ASTWalker
-{
-public:
-	/// Computes the control-flows of all function defined in the block.
-	/// Assumes the functions are hoisted to the topmost block.
-	explicit ControlFlowBuilder(Block const& _ast);
-	std::map<FunctionDefinition const*, FunctionFlow> const& functionFlows() const { return m_functionFlows; }
-
-private:
-	using ASTWalker::operator();
-	void operator()(FunctionCall const& _functionCall) override;
-	void operator()(If const& _if) override;
-	void operator()(Switch const& _switch) override;
-	void operator()(FunctionDefinition const& _functionDefinition) override;
-	void operator()(ForLoop const& _forLoop) override;
-	void operator()(Break const& _break) override;
-	void operator()(Continue const& _continue) override;
-	void operator()(Leave const& _leaveStatement) override;
-
-	void newConnectedNode();
-	ControlFlowNode* newNode();
-
-	std::vector<std::shared_ptr<ControlFlowNode>> m_nodes;
-
-	ControlFlowNode* m_currentNode = nullptr;
-	ControlFlowNode const* m_leave = nullptr;
-	ControlFlowNode const* m_break = nullptr;
-	ControlFlowNode const* m_continue = nullptr;
-
-	std::map<FunctionDefinition const*, FunctionFlow> m_functionFlows;
-};
-
-
-/**
- * Computes control-flow side-effects for user-defined functions.
- * Source does not have to be disambiguated, unless you want the side-effects
- * based on function names.
- */
-class ControlFlowSideEffectsCollector
-{
-public:
-	explicit ControlFlowSideEffectsCollector(
-		Dialect const& _dialect,
-		Block const& _ast
-	);
-
-	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& functionSideEffects() const
-	{
-		return m_functionSideEffects;
-	}
-	/// Returns the side effects by function name, requires unique function names.
-	std::map<YulString, ControlFlowSideEffects> functionSideEffectsNamed() const;
-private:
-
-	/// @returns false if nothing could be processed.
-	bool processFunction(FunctionDefinition const& _function);
-
-	/// @returns the next pending node of the function that is not
-	/// a function call to a function that might not continue.
-	/// De-queues the node or returns nullptr if no such node is found.
-	ControlFlowNode const* nextProcessableNode(FunctionDefinition const& _function);
-
-	/// @returns the side-effects of either a builtin call or a user defined function
-	/// call (as far as already computed).
-	ControlFlowSideEffects const& sideEffects(FunctionCall const& _call) const;
-
-	/// Queues the given node to be processed (if not already visited)
-	/// and if it is a function call, records that `_functionName` calls
-	/// `*_node->functionCall`.
-	void recordReachabilityAndQueue(FunctionDefinition const& _function, ControlFlowNode const* _node);
-
-	Dialect const& m_dialect;
-	ControlFlowBuilder m_cfgBuilder;
-	/// Function references, but only for calls to user-defined functions.
-	std::map<FunctionCall const*, FunctionDefinition const*> m_functionReferences;
-	/// Side effects of user-defined functions, is being constructod.
-	std::map<FunctionDefinition const*, ControlFlowSideEffects> m_functionSideEffects;
-	/// Control flow nodes still to process, per function.
-	std::map<FunctionDefinition const*, std::list<ControlFlowNode const*>> m_pendingNodes;
-	/// Control flow nodes already processed, per function.
-	std::map<FunctionDefinition const*, std::set<ControlFlowNode const*>> m_processedNodes;
-	/// Set of reachable function calls nodes in each function (including calls to builtins).
-	std::map<FunctionDefinition const*, std::set<FunctionCall const*>> m_functionCalls;
-};
-
-
-}
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
deleted file mode 100644
index 8440698f1336..000000000000
--- a/libyul/Dialect.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul dialect.
- */
-
-#include <libyul/Dialect.h>
-#include <libyul/AST.h>
-
-using namespace solidity::yul;
-using namespace solidity::langutil;
-
-Literal Dialect::zeroLiteralForType(solidity::yul::YulString _type) const
-{
-	if (_type == boolType && _type != defaultType)
-		return {DebugData::create(), LiteralKind::Boolean, "false"_yulstring, _type};
-	return {DebugData::create(), LiteralKind::Number, "0"_yulstring, _type};
-}
-
-
-Literal Dialect::trueLiteral() const
-{
-	if (boolType != defaultType)
-		return {DebugData::create(), LiteralKind::Boolean, "true"_yulstring, boolType};
-	else
-		return {DebugData::create(), LiteralKind::Number, "1"_yulstring, defaultType};
-}
-
-bool Dialect::validTypeForLiteral(LiteralKind _kind, YulString, YulString _type) const
-{
-	if (_kind == LiteralKind::Boolean)
-		return _type == boolType;
-	else
-		return true;
-}
-
-Dialect const& Dialect::yulDeprecated()
-{
-	static std::unique_ptr<Dialect> dialect;
-	static YulStringRepository::ResetCallback callback{[&] { dialect.reset(); }};
-
-	if (!dialect)
-	{
-		// TODO will probably change, especially the list of types.
-		dialect = std::make_unique<Dialect>();
-		dialect->defaultType = "u256"_yulstring;
-		dialect->boolType = "bool"_yulstring;
-		dialect->types = {
-			"bool"_yulstring,
-			"u8"_yulstring,
-			"s8"_yulstring,
-			"u32"_yulstring,
-			"s32"_yulstring,
-			"u64"_yulstring,
-			"s64"_yulstring,
-			"u128"_yulstring,
-			"s128"_yulstring,
-			"u256"_yulstring,
-			"s256"_yulstring
-		};
-	};
-
-	return *dialect;
-}
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
deleted file mode 100644
index e7a5e4827334..000000000000
--- a/libyul/Dialect.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul dialect.
- */
-
-#pragma once
-
-#include <libyul/YulString.h>
-#include <libyul/ControlFlowSideEffects.h>
-#include <libyul/SideEffects.h>
-
-#include <vector>
-#include <set>
-#include <optional>
-
-namespace solidity::yul
-{
-
-class YulString;
-using Type = YulString;
-enum class LiteralKind;
-struct Literal;
-
-struct BuiltinFunction
-{
-	YulString name;
-	std::vector<Type> parameters;
-	std::vector<Type> returns;
-	SideEffects sideEffects;
-	ControlFlowSideEffects controlFlowSideEffects;
-	/// If true, this is the msize instruction or might contain it.
-	bool isMSize = false;
-	/// Must be empty or the same length as the arguments.
-	/// If set at index i, the i'th argument has to be a literal which means it can't be moved to variables.
-	std::vector<std::optional<LiteralKind>> literalArguments{};
-	std::optional<LiteralKind> literalArgument(size_t i) const
-	{
-		return literalArguments.empty() ? std::nullopt : literalArguments.at(i);
-	}
-};
-
-struct Dialect
-{
-	/// Noncopiable.
-	Dialect(Dialect const&) = delete;
-	Dialect& operator=(Dialect const&) = delete;
-
-	/// Default type, can be omitted.
-	YulString defaultType;
-	/// Type used for the literals "true" and "false".
-	YulString boolType;
-	std::set<YulString> types = {{}};
-
-	/// @returns the builtin function of the given name or a nullptr if it is not a builtin function.
-	virtual BuiltinFunction const* builtin(YulString /*_name*/) const { return nullptr; }
-
-	/// @returns true if the identifier is reserved. This includes the builtins too.
-	virtual bool reservedIdentifier(YulString _name) const { return builtin(_name) != nullptr; }
-
-	virtual BuiltinFunction const* discardFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* equalityFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* booleanNegationFunction() const { return nullptr; }
-
-	virtual BuiltinFunction const* memoryStoreFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* memoryLoadFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* storageStoreFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* storageLoadFunction(YulString /* _type */) const { return nullptr; }
-	virtual YulString hashFunction(YulString /* _type */ ) const { return YulString{}; }
-
-	/// Check whether the given type is legal for the given literal value.
-	/// Should only be called if the type exists in the dialect at all.
-	virtual bool validTypeForLiteral(LiteralKind _kind, YulString _value, YulString _type) const;
-
-	virtual Literal zeroLiteralForType(YulString _type) const;
-	virtual Literal trueLiteral() const;
-
-	virtual std::set<YulString> fixedFunctionNames() const { return {}; }
-
-	Dialect() = default;
-	virtual ~Dialect() = default;
-
-	/// Old "yul" dialect. This is only used for testing.
-	static Dialect const& yulDeprecated();
-};
-
-}
diff --git a/libyul/Exceptions.h b/libyul/Exceptions.h
deleted file mode 100644
index 45c681a5d6e5..000000000000
--- a/libyul/Exceptions.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Exceptions in Yul.
- */
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/Assertions.h>
-
-#include <libyul/YulString.h>
-
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/facilities/overload.hpp>
-
-namespace solidity::yul
-{
-
-struct YulException: virtual util::Exception {};
-struct OptimizerException: virtual YulException {};
-struct CodegenException: virtual YulException {};
-struct YulAssertion: virtual YulException {};
-
-struct StackTooDeepError: virtual YulException
-{
-	StackTooDeepError(YulString _variable, int _depth, std::string const& _message):
-		variable(_variable), depth(_depth)
-	{
-		*this << util::errinfo_comment(_message);
-	}
-	StackTooDeepError(YulString _functionName, YulString _variable, int _depth, std::string const& _message):
-		functionName(_functionName), variable(_variable), depth(_depth)
-	{
-		*this << util::errinfo_comment(_message);
-	}
-	YulString functionName;
-	YulString variable;
-	int depth;
-};
-
-/// Assertion that throws an YulAssertion containing the given description if it is not met.
-#if !BOOST_PP_VARIADICS_MSVC
-#define yulAssert(...) BOOST_PP_OVERLOAD(yulAssert_,__VA_ARGS__)(__VA_ARGS__)
-#else
-#define yulAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(yulAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
-#endif
-
-#define yulAssert_1(CONDITION) \
-	yulAssert_2((CONDITION), "")
-
-#define yulAssert_2(CONDITION, DESCRIPTION) \
-	assertThrowWithDefaultDescription( \
-		(CONDITION), \
-		::solidity::yul::YulAssertion, \
-		(DESCRIPTION), \
-		"Yul assertion failed" \
-	)
-
-}
diff --git a/libyul/FunctionReferenceResolver.cpp b/libyul/FunctionReferenceResolver.cpp
deleted file mode 100644
index 99e83c2130e7..000000000000
--- a/libyul/FunctionReferenceResolver.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/FunctionReferenceResolver.h>
-
-#include <libyul/AST.h>
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/view/reverse.hpp>
-
-using namespace solidity::yul;
-using namespace solidity::util;
-
-FunctionReferenceResolver::FunctionReferenceResolver(Block const& _ast)
-{
-	(*this)(_ast);
-	yulAssert(m_scopes.empty());
-}
-
-void FunctionReferenceResolver::operator()(FunctionCall const& _functionCall)
-{
-	for (auto&& scope: m_scopes | ranges::views::reverse)
-		if (FunctionDefinition const** function = util::valueOrNullptr(scope, _functionCall.functionName.name))
-		{
-			m_functionReferences[&_functionCall] = *function;
-			break;
-		}
-
-	// If we did not find anything, it was a builtin call.
-
-	ASTWalker::operator()(_functionCall);
-}
-
-void FunctionReferenceResolver::operator()(Block const& _block)
-{
-	m_scopes.emplace_back();
-	for (auto const& statement: _block.statements)
-		if (auto const* function = std::get_if<FunctionDefinition>(&statement))
-			m_scopes.back()[function->name] = function;
-
-	ASTWalker::operator()(_block);
-
-	m_scopes.pop_back();
-}
diff --git a/libyul/FunctionReferenceResolver.h b/libyul/FunctionReferenceResolver.h
deleted file mode 100644
index 8c1385adb6c7..000000000000
--- a/libyul/FunctionReferenceResolver.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-
-namespace solidity::yul
-{
-
-/**
- * Resolves references to user-defined functions in function calls.
- * Assumes the code is correct, i.e. does not check for references to be valid or unique.
- *
- * Be careful not to iterate over the result - it is not deterministic.
- */
-class FunctionReferenceResolver: private ASTWalker
-{
-public:
-	explicit FunctionReferenceResolver(Block const& _ast);
-	std::map<FunctionCall const*, FunctionDefinition const*> const& references() const { return m_functionReferences; }
-
-private:
-	using ASTWalker::operator();
-	void operator()(FunctionCall const& _functionCall) override;
-	void operator()(Block const& _block) override;
-
-	std::map<FunctionCall const*, FunctionDefinition const*> m_functionReferences;
-	std::vector<std::map<YulString, FunctionDefinition const*>> m_scopes;
-};
-
-
-}
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
deleted file mode 100644
index 0d3d66c8e5f2..000000000000
--- a/libyul/Object.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul code and data object container.
- */
-
-#include <libyul/Object.h>
-
-#include <libyul/AsmPrinter.h>
-#include <libyul/AsmJsonConverter.h>
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <range/v3/view/transform.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-std::string Data::toString(Dialect const*, DebugInfoSelection const&, CharStreamProvider const*) const
-{
-	return "data \"" + name.str() + "\" hex\"" + util::toHex(data) + "\"";
-}
-
-std::string Object::toString(
-	Dialect const* _dialect,
-	DebugInfoSelection const& _debugInfoSelection,
-	CharStreamProvider const* _soliditySourceProvider
-) const
-{
-	yulAssert(code, "No code");
-	yulAssert(debugData, "No debug data");
-
-	std::string useSrcComment;
-
-	if (debugData->sourceNames)
-		useSrcComment =
-			"/// @use-src " +
-			joinHumanReadable(ranges::views::transform(*debugData->sourceNames, [](auto&& _pair) {
-				return std::to_string(_pair.first) + ":" + util::escapeAndQuoteString(*_pair.second);
-			})) +
-			"\n";
-
-	std::string inner = "code " + AsmPrinter(
-		_dialect,
-		debugData->sourceNames,
-		_debugInfoSelection,
-		_soliditySourceProvider
-	)(*code);
-
-	for (auto const& obj: subObjects)
-		inner += "\n" + obj->toString(_dialect, _debugInfoSelection, _soliditySourceProvider);
-
-	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
-}
-
-Json::Value Data::toJson() const
-{
-	Json::Value ret{Json::objectValue};
-	ret["nodeType"] = "YulData";
-	ret["value"] = util::toHex(data);
-	return ret;
-}
-
-Json::Value Object::toJson() const
-{
-	yulAssert(code, "No code");
-
-	Json::Value codeJson{Json::objectValue};
-	codeJson["nodeType"] = "YulCode";
-	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(*code);
-
-	Json::Value subObjectsJson{Json::arrayValue};
-	for (std::shared_ptr<ObjectNode> const& subObject: subObjects)
-		subObjectsJson.append(subObject->toJson());
-
-	Json::Value ret{Json::objectValue};
-	ret["nodeType"] = "YulObject";
-	ret["name"] = name.str();
-	ret["code"] = codeJson;
-	ret["subObjects"] = subObjectsJson;
-	return ret;
-}
-
-std::set<YulString> Object::qualifiedDataNames() const
-{
-	std::set<YulString> qualifiedNames =
-		name.empty() || util::contains(name.str(), '.') ?
-		std::set<YulString>{} :
-		std::set<YulString>{name};
-	for (std::shared_ptr<ObjectNode> const& subObjectNode: subObjects)
-	{
-		yulAssert(qualifiedNames.count(subObjectNode->name) == 0, "");
-		if (util::contains(subObjectNode->name.str(), '.'))
-			continue;
-		qualifiedNames.insert(subObjectNode->name);
-		if (auto const* subObject = dynamic_cast<Object const*>(subObjectNode.get()))
-			for (YulString const& subSubObj: subObject->qualifiedDataNames())
-				if (subObject->name != subSubObj)
-				{
-					yulAssert(qualifiedNames.count(YulString{subObject->name.str() + "." + subSubObj.str()}) == 0, "");
-					qualifiedNames.insert(YulString{subObject->name.str() + "." + subSubObj.str()});
-				}
-	}
-
-	yulAssert(qualifiedNames.count(YulString{}) == 0, "");
-	qualifiedNames.erase(YulString{});
-	return qualifiedNames;
-}
-
-std::vector<size_t> Object::pathToSubObject(YulString _qualifiedName) const
-{
-	yulAssert(_qualifiedName != name, "");
-	yulAssert(subIndexByName.count(name) == 0, "");
-
-	if (boost::algorithm::starts_with(_qualifiedName.str(), name.str() + "."))
-		_qualifiedName = YulString{_qualifiedName.str().substr(name.str().length() + 1)};
-	yulAssert(!_qualifiedName.empty(), "");
-
-	std::vector<std::string> subObjectPathComponents;
-	boost::algorithm::split(subObjectPathComponents, _qualifiedName.str(), boost::is_any_of("."));
-
-	std::vector<size_t> path;
-	Object const* object = this;
-	for (std::string const& currentSubObjectName: subObjectPathComponents)
-	{
-		yulAssert(!currentSubObjectName.empty(), "");
-		auto subIndexIt = object->subIndexByName.find(YulString{currentSubObjectName});
-		yulAssert(
-			subIndexIt != object->subIndexByName.end(),
-			"Assembly object <" + _qualifiedName.str() + "> not found or does not contain code."
-		);
-		object = dynamic_cast<Object const*>(object->subObjects[subIndexIt->second].get());
-		yulAssert(object, "Assembly object <" + _qualifiedName.str() + "> not found or does not contain code.");
-		yulAssert(object->subId != std::numeric_limits<size_t>::max(), "");
-		path.push_back({object->subId});
-	}
-
-	return path;
-}
diff --git a/libyul/Object.h b/libyul/Object.h
deleted file mode 100644
index 5f88d3bc7ff6..000000000000
--- a/libyul/Object.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul code and data object container.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/DebugInfoSelection.h>
-
-#include <libsolutil/Common.h>
-
-#include <memory>
-#include <set>
-#include <limits>
-#include <json/json.h>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct AsmAnalysisInfo;
-
-using SourceNameMap = std::map<unsigned, std::shared_ptr<std::string const>>;
-
-struct Object;
-
-/**
- * Generic base class for both Yul objects and Yul data.
- */
-struct ObjectNode
-{
-	virtual ~ObjectNode() = default;
-
-	/// Name of the object.
-	/// Can be empty since .yul files can also just contain code, without explicitly placing it in an object.
-	YulString name;
-	virtual std::string toString(
-		Dialect const* _dialect,
-		langutil::DebugInfoSelection const& _debugInfoSelection,
-		langutil::CharStreamProvider const* _soliditySourceProvider
-	) const = 0;
-	virtual Json::Value toJson() const = 0;
-};
-
-/**
- * Named data in Yul objects.
- */
-struct Data: public ObjectNode
-{
-	Data(YulString _name, bytes _data): data(std::move(_data)) { name = _name; }
-
-	bytes data;
-
-	std::string toString(
-		Dialect const* _dialect,
-		langutil::DebugInfoSelection const& _debugInfoSelection,
-		langutil::CharStreamProvider const* _soliditySourceProvider
-	) const override;
-	Json::Value toJson() const override;
-};
-
-
-struct ObjectDebugData
-{
-	std::optional<SourceNameMap> sourceNames = {};
-};
-
-
-/**
- * Yul code and data object container.
- */
-struct Object: public ObjectNode
-{
-public:
-	/// @returns a (parseable) string representation.
-	std::string toString(
-		Dialect const* _dialect,
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	) const;
-	/// @returns a compact JSON representation of the AST.
-	Json::Value toJson() const;
-	/// @returns the set of names of data objects accessible from within the code of
-	/// this object, including the name of object itself
-	/// Handles all names containing dots as reserved identifiers, not accessible as data.
-	std::set<YulString> qualifiedDataNames() const;
-
-	/// @returns vector of subIDs if possible to reach subobject with @a _qualifiedName, throws otherwise
-	/// For "B.C" should return vector of two values if success (subId of B and subId of C in B).
-	/// In object "A" if called for "A.B" will return only one value (subId for B)
-	/// will return empty vector for @a _qualifiedName that equals to object name.
-	/// Example:
-	/// A1{ B2{ C3, D3 }, E2{ F3{ G4, K4, H4{ I5 } } } }
-	/// pathToSubObject("A1.E2.F3.H4") == {1, 0, 2}
-	/// pathToSubObject("E2.F3.H4") == {1, 0, 2}
-	/// pathToSubObject("A1.E2") == {1}
-	/// The path must not lead to a @a Data object (will throw in that case).
-	std::vector<size_t> pathToSubObject(YulString _qualifiedName) const;
-
-	/// sub id for object if it is subobject of another object, max value if it is not subobject
-	size_t subId = std::numeric_limits<size_t>::max();
-
-	std::shared_ptr<Block> code;
-	std::vector<std::shared_ptr<ObjectNode>> subObjects;
-	std::map<YulString, size_t> subIndexByName;
-	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
-
-	std::shared_ptr<ObjectDebugData const> debugData;
-
-	/// @returns the name of the special metadata data object.
-	static std::string metadataName() { return ".metadata"; }
-};
-
-}
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
deleted file mode 100644
index 2038959de4fa..000000000000
--- a/libyul/ObjectParser.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Parser for Yul code and data object container.
- */
-
-#include <libyul/AST.h>
-#include <libyul/ObjectParser.h>
-
-#include <libyul/AsmParser.h>
-#include <libyul/Exceptions.h>
-
-#include <liblangutil/Token.h>
-#include <liblangutil/Scanner.h>
-
-#include <libsolutil/StringUtils.h>
-
-#include <regex>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _scanner, bool _reuseScanner)
-{
-	m_recursionDepth = 0;
-	try
-	{
-		std::shared_ptr<Object> object;
-		m_scanner = _scanner;
-
-		if (currentToken() == Token::LBrace)
-		{
-			// Special case: Code-only form.
-			object = std::make_shared<Object>();
-			object->name = "object"_yulstring;
-			auto sourceNameMapping = tryParseSourceNameMapping();
-			object->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
-			object->code = parseBlock(sourceNameMapping);
-			if (!object->code)
-				return nullptr;
-		}
-		else
-			object = parseObject();
-		if (!_reuseScanner)
-			expectToken(Token::EOS);
-		return object;
-	}
-	catch (FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-	}
-	return nullptr;
-}
-
-std::shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
-{
-	RecursionGuard guard(*this);
-
-	std::shared_ptr<Object> ret = std::make_shared<Object>();
-
-	auto sourceNameMapping = tryParseSourceNameMapping();
-	ret->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
-
-	if (currentToken() != Token::Identifier || currentLiteral() != "object")
-		fatalParserError(4294_error, "Expected keyword \"object\".");
-	advance();
-
-	ret->name = parseUniqueName(_containingObject);
-
-	expectToken(Token::LBrace);
-
-	ret->code = parseCode(std::move(sourceNameMapping));
-
-	while (currentToken() != Token::RBrace)
-	{
-		if (currentToken() == Token::Identifier && currentLiteral() == "object")
-			parseObject(ret.get());
-		else if (currentToken() == Token::Identifier && currentLiteral() == "data")
-			parseData(*ret);
-		else
-			fatalParserError(8143_error, "Expected keyword \"data\" or \"object\" or \"}\".");
-	}
-	if (_containingObject)
-		addNamedSubObject(*_containingObject, ret->name, ret);
-
-	expectToken(Token::RBrace);
-
-	return ret;
-}
-
-std::shared_ptr<Block> ObjectParser::parseCode(std::optional<SourceNameMap> _sourceNames)
-{
-	if (currentToken() != Token::Identifier || currentLiteral() != "code")
-		fatalParserError(4846_error, "Expected keyword \"code\".");
-	advance();
-
-	return parseBlock(std::move(_sourceNames));
-}
-
-std::optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
-{
-	// @use-src 0:"abc.sol", 1:"foo.sol", 2:"bar.sol"
-	//
-	// UseSrcList := UseSrc (',' UseSrc)*
-	// UseSrc     := [0-9]+ ':' FileName
-	// FileName   := "(([^\"]|\.)*)"
-
-	// Matches some "@use-src TEXT".
-	static std::regex const lineRE = std::regex(
-		"(^|\\s)@use-src\\b",
-		std::regex_constants::ECMAScript | std::regex_constants::optimize
-	);
-	std::smatch sm;
-	if (!std::regex_search(m_scanner->currentCommentLiteral(), sm, lineRE))
-		return std::nullopt;
-
-	solAssert(sm.size() == 2, "");
-	auto text = m_scanner->currentCommentLiteral().substr(static_cast<size_t>(sm.position() + sm.length()));
-	CharStream charStream(text, "");
-	Scanner scanner(charStream);
-	if (scanner.currentToken() == Token::EOS)
-		return SourceNameMap{};
-	SourceNameMap sourceNames;
-
-	while (scanner.currentToken() != Token::EOS)
-	{
-		if (scanner.currentToken() != Token::Number)
-			break;
-		auto sourceIndex = toUnsignedInt(scanner.currentLiteral());
-		if (!sourceIndex)
-			break;
-		if (scanner.next() != Token::Colon)
-			break;
-		if (scanner.next() != Token::StringLiteral)
-			break;
-		sourceNames[*sourceIndex] = std::make_shared<std::string const>(scanner.currentLiteral());
-
-		Token const next = scanner.next();
-		if (next == Token::EOS)
-			return {std::move(sourceNames)};
-		if (next != Token::Comma)
-			break;
-		scanner.next();
-	}
-
-	m_errorReporter.syntaxError(
-		9804_error,
-		m_scanner->currentCommentLocation(),
-		"Error parsing arguments to @use-src. Expected: <number> \":\" \"<filename>\", ..."
-	);
-	return std::nullopt;
-}
-
-std::shared_ptr<Block> ObjectParser::parseBlock(std::optional<SourceNameMap> _sourceNames)
-{
-	Parser parser(m_errorReporter, m_dialect, std::move(_sourceNames));
-	std::shared_ptr<Block> block = parser.parseInline(m_scanner);
-	yulAssert(block || m_errorReporter.hasErrors(), "Invalid block but no error!");
-	return block;
-}
-
-void ObjectParser::parseData(Object& _containingObject)
-{
-	yulAssert(
-		currentToken() == Token::Identifier && currentLiteral() == "data",
-		"parseData called on wrong input."
-	);
-	advance();
-
-	YulString name = parseUniqueName(&_containingObject);
-
-	if (currentToken() == Token::HexStringLiteral)
-		expectToken(Token::HexStringLiteral, false);
-	else
-		expectToken(Token::StringLiteral, false);
-	addNamedSubObject(_containingObject, name, std::make_shared<Data>(name, asBytes(currentLiteral())));
-	advance();
-}
-
-YulString ObjectParser::parseUniqueName(Object const* _containingObject)
-{
-	expectToken(Token::StringLiteral, false);
-	YulString name{currentLiteral()};
-	if (name.empty())
-		parserError(3287_error, "Object name cannot be empty.");
-	else if (_containingObject && _containingObject->name == name)
-		parserError(8311_error, "Object name cannot be the same as the name of the containing object.");
-	else if (_containingObject && _containingObject->subIndexByName.count(name))
-		parserError(8794_error, "Object name \"" + name.str() + "\" already exists inside the containing object.");
-	advance();
-	return name;
-}
-
-void ObjectParser::addNamedSubObject(Object& _container, YulString _name, std::shared_ptr<ObjectNode> _subObject)
-{
-	_container.subIndexByName[_name] = _container.subObjects.size();
-	_container.subObjects.emplace_back(std::move(_subObject));
-}
diff --git a/libyul/ObjectParser.h b/libyul/ObjectParser.h
deleted file mode 100644
index 716a191ea878..000000000000
--- a/libyul/ObjectParser.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Parser for Yul code and data object container.
- */
-
-#pragma once
-
-#include <libyul/YulString.h>
-#include <libyul/Object.h>
-#include <libyul/Dialect.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/ParserBase.h>
-
-#include <libsolutil/Common.h>
-
-#include <memory>
-
-namespace solidity::langutil
-{
-class Scanner;
-}
-
-namespace solidity::yul
-{
-
-/**
- * Yul object parser. Invokes the inline assembly parser.
- */
-class ObjectParser: public langutil::ParserBase
-{
-public:
-	explicit ObjectParser(langutil::ErrorReporter& _errorReporter, Dialect const& _dialect):
-		ParserBase(_errorReporter), m_dialect(_dialect) {}
-
-	/// Parses a Yul object.
-	/// Falls back to code-only parsing if the source starts with `{`.
-	/// @param _reuseScanner if true, do check for end of input after the last `}`.
-	/// @returns an empty shared pointer on error.
-	std::shared_ptr<Object> parse(std::shared_ptr<langutil::Scanner> const& _scanner, bool _reuseScanner);
-
-private:
-	std::optional<SourceNameMap> tryParseSourceNameMapping() const;
-	std::shared_ptr<Object> parseObject(Object* _containingObject = nullptr);
-	std::shared_ptr<Block> parseCode(std::optional<SourceNameMap> _sourceNames);
-	std::shared_ptr<Block> parseBlock(std::optional<SourceNameMap> _sourceNames);
-	void parseData(Object& _containingObject);
-
-	/// Tries to parse a name that is non-empty and unique inside the containing object.
-	YulString parseUniqueName(Object const* _containingObject);
-	void addNamedSubObject(Object& _container, YulString _name, std::shared_ptr<ObjectNode> _subObject);
-
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/Scope.cpp b/libyul/Scope.cpp
deleted file mode 100644
index 4471aa53130d..000000000000
--- a/libyul/Scope.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Scopes for identifiers.
- */
-
-#include <libyul/Scope.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-bool Scope::registerVariable(YulString _name, YulType const& _type)
-{
-	if (exists(_name))
-		return false;
-	Variable variable;
-	variable.type = _type;
-	variable.name = _name;
-	identifiers[_name] = variable;
-	return true;
-}
-
-bool Scope::registerFunction(YulString _name, std::vector<YulType> _arguments, std::vector<YulType> _returns)
-{
-	if (exists(_name))
-		return false;
-	identifiers[_name] = Function{std::move(_arguments), std::move(_returns), _name};
-	return true;
-}
-
-Scope::Identifier* Scope::lookup(YulString _name)
-{
-	bool crossedFunctionBoundary = false;
-	for (Scope* s = this; s; s = s->superScope)
-	{
-		auto id = s->identifiers.find(_name);
-		if (id != s->identifiers.end())
-		{
-			if (crossedFunctionBoundary && std::holds_alternative<Scope::Variable>(id->second))
-				return nullptr;
-			else
-				return &id->second;
-		}
-
-		if (s->functionScope)
-			crossedFunctionBoundary = true;
-	}
-	return nullptr;
-}
-
-bool Scope::exists(YulString _name) const
-{
-	if (identifiers.count(_name))
-		return true;
-	else if (superScope)
-		return superScope->exists(_name);
-	else
-		return false;
-}
-
-size_t Scope::numberOfVariables() const
-{
-	size_t count = 0;
-	for (auto const& identifier: identifiers)
-		if (std::holds_alternative<Scope::Variable>(identifier.second))
-			count++;
-	return count;
-}
-
-bool Scope::insideFunction() const
-{
-	for (Scope const* s = this; s; s = s->superScope)
-		if (s->functionScope)
-			return true;
-	return false;
-}
diff --git a/libyul/Scope.h b/libyul/Scope.h
deleted file mode 100644
index f9ac3830a295..000000000000
--- a/libyul/Scope.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Scopes for identifiers.
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-
-#include <libyul/YulString.h>
-
-#include <functional>
-#include <memory>
-#include <optional>
-#include <variant>
-
-namespace solidity::yul
-{
-
-struct Scope
-{
-	using YulType = YulString;
-
-	struct Variable
-	{
-		YulType type;
-		YulString name;
-	};
-	struct Function
-	{
-		std::vector<YulType> arguments;
-		std::vector<YulType> returns;
-		YulString name;
-	};
-
-	using Identifier = std::variant<Variable, Function>;
-
-	bool registerVariable(YulString _name, YulType const& _type);
-	bool registerFunction(
-		YulString _name,
-		std::vector<YulType> _arguments,
-		std::vector<YulType> _returns
-	);
-
-	/// Looks up the identifier in this or super scopes and returns a valid pointer if found
-	/// or a nullptr if not found. Variable lookups up across function boundaries will fail, as
-	/// will any lookups across assembly boundaries.
-	/// The pointer will be invalidated if the scope is modified.
-	/// @param _crossedFunction if true, we already crossed a function boundary during recursive lookup
-	Identifier* lookup(YulString _name);
-	/// Looks up the identifier in this and super scopes (will not find variables across function
-	/// boundaries and generally stops at assembly boundaries) and calls the visitor, returns
-	/// false if not found.
-	template <class V>
-	bool lookup(YulString _name, V const& _visitor)
-	{
-		if (Identifier* id = lookup(_name))
-		{
-			std::visit(_visitor, *id);
-			return true;
-		}
-		else
-			return false;
-	}
-	/// @returns true if the name exists in this scope or in super scopes (also searches
-	/// across function and assembly boundaries).
-	bool exists(YulString _name) const;
-
-	/// @returns the number of variables directly registered inside the scope.
-	size_t numberOfVariables() const;
-	/// @returns true if this scope is inside a function.
-	bool insideFunction() const;
-
-	Scope* superScope = nullptr;
-	/// If true, variables from the super scope are not visible here (other identifiers are),
-	/// but they are still taken into account to prevent shadowing.
-	bool functionScope = false;
-	std::map<YulString, Identifier> identifiers;
-};
-
-}
diff --git a/libyul/ScopeFiller.cpp b/libyul/ScopeFiller.cpp
deleted file mode 100644
index 22c0d17e3289..000000000000
--- a/libyul/ScopeFiller.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Module responsible for registering identifiers inside their scopes.
- */
-
-#include <libyul/ScopeFiller.h>
-
-#include <libyul/AST.h>
-#include <libyul/Scope.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/Exceptions.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <memory>
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-ScopeFiller::ScopeFiller(AsmAnalysisInfo& _info, ErrorReporter& _errorReporter):
-	m_info(_info), m_errorReporter(_errorReporter)
-{
-	m_currentScope = &scope(nullptr);
-}
-
-bool ScopeFiller::operator()(ExpressionStatement const& _expr)
-{
-	return std::visit(*this, _expr.expression);
-}
-
-bool ScopeFiller::operator()(VariableDeclaration const& _varDecl)
-{
-	for (auto const& variable: _varDecl.variables)
-		if (!registerVariable(variable, nativeLocationOf(_varDecl), *m_currentScope))
-			return false;
-	return true;
-}
-
-bool ScopeFiller::operator()(FunctionDefinition const& _funDef)
-{
-	auto virtualBlock = m_info.virtualBlocks[&_funDef] = std::make_shared<Block>();
-	Scope& varScope = scope(virtualBlock.get());
-	varScope.superScope = m_currentScope;
-	m_currentScope = &varScope;
-	varScope.functionScope = true;
-
-	bool success = true;
-	for (auto const& var: _funDef.parameters + _funDef.returnVariables)
-		if (!registerVariable(var, nativeLocationOf(_funDef), varScope))
-			success = false;
-
-	if (!(*this)(_funDef.body))
-		success = false;
-
-	yulAssert(m_currentScope == &varScope, "");
-	m_currentScope = m_currentScope->superScope;
-
-	return success;
-}
-
-bool ScopeFiller::operator()(If const& _if)
-{
-	return (*this)(_if.body);
-}
-
-bool ScopeFiller::operator()(Switch const& _switch)
-{
-	bool success = true;
-	for (auto const& _case: _switch.cases)
-		if (!(*this)(_case.body))
-			success = false;
-	return success;
-}
-
-bool ScopeFiller::operator()(ForLoop const& _forLoop)
-{
-	Scope* originalScope = m_currentScope;
-
-	bool success = true;
-	if (!(*this)(_forLoop.pre))
-		success = false;
-	m_currentScope = &scope(&_forLoop.pre);
-	if (!std::visit(*this, *_forLoop.condition))
-		success = false;
-	if (!(*this)(_forLoop.body))
-		success = false;
-	if (!(*this)(_forLoop.post))
-		success = false;
-
-	m_currentScope = originalScope;
-
-	return success;
-}
-
-bool ScopeFiller::operator()(Block const& _block)
-{
-	bool success = true;
-	scope(&_block).superScope = m_currentScope;
-	m_currentScope = &scope(&_block);
-
-	// First visit all functions to make them create
-	// an entry in the scope according to their visibility.
-	for (auto const& s: _block.statements)
-		if (std::holds_alternative<FunctionDefinition>(s))
-			if (!registerFunction(std::get<FunctionDefinition>(s)))
-				success = false;
-	for (auto const& s: _block.statements)
-		if (!std::visit(*this, s))
-			success = false;
-
-	m_currentScope = m_currentScope->superScope;
-	return success;
-}
-
-bool ScopeFiller::registerVariable(TypedName const& _name, SourceLocation const& _location, Scope& _scope)
-{
-	if (!_scope.registerVariable(_name.name, _name.type))
-	{
-		//@TODO secondary location
-		m_errorReporter.declarationError(
-			1395_error,
-			_location,
-			"Variable name " + _name.name.str() + " already taken in this scope."
-		);
-		return false;
-	}
-	return true;
-}
-
-bool ScopeFiller::registerFunction(FunctionDefinition const& _funDef)
-{
-	std::vector<Scope::YulType> parameters;
-	for (auto const& parameter: _funDef.parameters)
-		parameters.emplace_back(parameter.type);
-	std::vector<Scope::YulType> returns;
-	for (auto const& returnVariable: _funDef.returnVariables)
-		returns.emplace_back(returnVariable.type);
-	if (!m_currentScope->registerFunction(_funDef.name, std::move(parameters), std::move(returns)))
-	{
-		//@TODO secondary location
-		m_errorReporter.declarationError(
-			6052_error,
-			nativeLocationOf(_funDef),
-			"Function name " + _funDef.name.str() + " already taken in this scope."
-		);
-		return false;
-	}
-	return true;
-}
-
-Scope& ScopeFiller::scope(Block const* _block)
-{
-	auto& scope = m_info.scopes[_block];
-	if (!scope)
-		scope = std::make_shared<Scope>();
-	return *scope;
-}
diff --git a/libyul/ScopeFiller.h b/libyul/ScopeFiller.h
deleted file mode 100644
index b43910874337..000000000000
--- a/libyul/ScopeFiller.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Module responsible for registering identifiers inside their scopes.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <functional>
-#include <memory>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-struct SourceLocation;
-}
-
-namespace solidity::yul
-{
-
-struct TypedName;
-struct Scope;
-struct AsmAnalysisInfo;
-
-/**
- * Fills scopes with identifiers and checks for name clashes.
- * Does not resolve references.
- */
-class ScopeFiller
-{
-public:
-	ScopeFiller(AsmAnalysisInfo& _info, langutil::ErrorReporter& _errorReporter);
-
-	bool operator()(Literal const&) { return true; }
-	bool operator()(Identifier const&) { return true; }
-	bool operator()(ExpressionStatement const& _expr);
-	bool operator()(Assignment const&) { return true; }
-	bool operator()(VariableDeclaration const& _variableDeclaration);
-	bool operator()(FunctionDefinition const& _functionDefinition);
-	bool operator()(FunctionCall const&) { return true; }
-	bool operator()(If const& _if);
-	bool operator()(Switch const& _switch);
-	bool operator()(ForLoop const& _forLoop);
-	bool operator()(Break const&) { return true; }
-	bool operator()(Continue const&) { return true; }
-	bool operator()(Leave const&) { return true; }
-	bool operator()(Block const& _block);
-
-private:
-	bool registerVariable(
-		TypedName const& _name,
-		langutil::SourceLocation const& _location,
-		Scope& _scope
-	);
-	bool registerFunction(FunctionDefinition const& _funDef);
-
-	Scope& scope(Block const* _block);
-
-	Scope* m_currentScope = nullptr;
-	AsmAnalysisInfo& m_info;
-	langutil::ErrorReporter& m_errorReporter;
-};
-
-}
diff --git a/libyul/SideEffects.h b/libyul/SideEffects.h
deleted file mode 100644
index b6df8df83f89..000000000000
--- a/libyul/SideEffects.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <algorithm>
-#include <set>
-
-namespace solidity::yul
-{
-
-/**
- * Side effects of code.
- *
- * The default-constructed value applies to the "empty code".
- */
-struct SideEffects
-{
-	/// Corresponds to the effect that a Yul-builtin has on a generic data location (storage, memory
-	/// and other blockchain state).
-	enum Effect
-	{
-		None,
-		Read,
-		Write
-	};
-
-	friend Effect operator+(Effect const& _a, Effect const& _b)
-	{
-		return static_cast<Effect>(std::max(static_cast<int>(_a), static_cast<int>(_b)));
-	}
-
-	/// If true, expressions in this code can be freely moved and copied without altering the
-	/// semantics.
-	/// At statement level, it means that functions containing this code can be
-	/// called multiple times, their calls can be rearranged and calls can also be
-	/// deleted without changing the semantics.
-	/// This means it cannot depend on storage or memory, cannot have any side-effects,
-	/// but it can depend on state that is constant across an EVM-call.
-	bool movable = true;
-	/// If true, the expressions in this code can be moved or copied (together with their arguments)
-	/// across control flow branches and instructions as long as these instructions' 'effects' do
-	/// not influence the 'effects' of the aforementioned expressions.
-	bool movableApartFromEffects = true;
-	/// If true, the code can be removed without changing the semantics.
-	bool canBeRemoved = true;
-	/// If true, the code can be removed without changing the semantics as long as
-	/// the whole program does not contain the msize instruction.
-	bool canBeRemovedIfNoMSize = true;
-	/// If false, the code calls a for-loop or a recursive function, and therefore potentially loops
-	/// infinitely. All builtins are set to true by default, even `invalid()`.
-	bool cannotLoop = true;
-	/// Can write, read or have no effect on the blockchain state, when the value of `otherState` is
-	/// `Write`, `Read` or `None` respectively.
-	Effect otherState = None;
-	/// Can write, read or have no effect on storage, when the value of `storage` is `Write`, `Read`
-	/// or `None` respectively. When the value is `Write`, the expression can invalidate storage,
-	/// potentially indirectly through external calls.
-	Effect storage = None;
-	/// Can write, read or have no effect on memory, when the value of `memory` is `Write`, `Read`
-	/// or `None` respectively. Note that, when the value is `Read`, the expression can have an
-	/// effect on `msize()`.
-	Effect memory = None;
-
-	/// @returns the worst-case side effects.
-	static SideEffects worst()
-	{
-		return SideEffects{false, false, false, false, false, Write, Write, Write};
-	}
-
-	/// @returns the combined side effects of two pieces of code.
-	SideEffects operator+(SideEffects const& _other)
-	{
-		return SideEffects{
-			movable && _other.movable,
-			movableApartFromEffects && _other.movableApartFromEffects,
-			canBeRemoved && _other.canBeRemoved,
-			canBeRemovedIfNoMSize && _other.canBeRemovedIfNoMSize,
-			cannotLoop && _other.cannotLoop,
-			otherState + _other.otherState,
-			storage + _other.storage,
-			memory + _other.memory
-		};
-	}
-
-	/// Adds the side effects of another piece of code to this side effect.
-	SideEffects& operator+=(SideEffects const& _other)
-	{
-		*this = *this + _other;
-		return *this;
-	}
-
-	bool operator==(SideEffects const& _other) const
-	{
-		return
-			movable == _other.movable &&
-			movableApartFromEffects == _other.movableApartFromEffects &&
-			canBeRemoved == _other.canBeRemoved &&
-			canBeRemovedIfNoMSize == _other.canBeRemovedIfNoMSize &&
-			cannotLoop == _other.cannotLoop &&
-			otherState == _other.otherState &&
-			storage == _other.storage &&
-			memory == _other.memory;
-	}
-};
-
-}
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
deleted file mode 100644
index 8242553d3709..000000000000
--- a/libyul/Utilities.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Some useful snippets for the optimiser.
- */
-
-#include <libyul/Utilities.h>
-
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/FixedHash.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <algorithm>
-#include <sstream>
-#include <vector>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-std::string solidity::yul::reindent(std::string const& _code)
-{
-	int constexpr indentationWidth = 4;
-
-	auto constexpr static countBraces = [](std::string const& _s) noexcept -> int
-	{
-		auto const i = _s.find("//");
-		auto const e = i == _s.npos ? end(_s) : next(begin(_s), static_cast<ptrdiff_t>(i));
-		auto const opening = count_if(begin(_s), e, [](auto ch) { return ch == '{' || ch == '('; });
-		auto const closing = count_if(begin(_s), e, [](auto ch) { return ch == '}' || ch == ')'; });
-		return int(opening - closing);
-	};
-
-	std::vector<std::string> lines;
-	boost::split(lines, _code, boost::is_any_of("\n"));
-	for (std::string& line: lines)
-		boost::trim(line);
-
-	// Reduce multiple consecutive empty lines.
-	lines = fold(lines, std::vector<std::string>{}, [](auto&& _lines, auto&& _line) {
-		if (!(_line.empty() && !_lines.empty() && _lines.back().empty()))
-			_lines.emplace_back(std::move(_line));
-		return std::move(_lines);
-	});
-
-	std::stringstream out;
-	int depth = 0;
-
-	for (std::string const& line: lines)
-	{
-		int const diff = countBraces(line);
-		if (diff < 0)
-			depth += diff;
-
-		if (!line.empty())
-		{
-			for (int i = 0; i < depth * indentationWidth; ++i)
-				out << ' ';
-			out << line;
-		}
-		out << '\n';
-
-		if (diff > 0)
-			depth += diff;
-	}
-
-	return out.str();
-}
-
-u256 solidity::yul::valueOfNumberLiteral(Literal const& _literal)
-{
-	yulAssert(_literal.kind == LiteralKind::Number, "Expected number literal!");
-
-	static std::map<YulString, u256> numberCache;
-	static YulStringRepository::ResetCallback callback{[&] { numberCache.clear(); }};
-
-	auto&& [it, isNew] = numberCache.try_emplace(_literal.value, 0);
-	if (isNew)
-	{
-		std::string const& literalString = _literal.value.str();
-		yulAssert(isValidDecimal(literalString) || isValidHex(literalString), "Invalid number literal!");
-		it->second = u256(literalString);
-	}
-	return it->second;
-}
-
-u256 solidity::yul::valueOfStringLiteral(Literal const& _literal)
-{
-	yulAssert(_literal.kind == LiteralKind::String, "Expected string literal!");
-	yulAssert(_literal.value.str().size() <= 32, "Literal string too long!");
-
-	return u256(h256(_literal.value.str(), h256::FromBinary, h256::AlignLeft));
-}
-
-u256 yul::valueOfBoolLiteral(Literal const& _literal)
-{
-	yulAssert(_literal.kind == LiteralKind::Boolean, "Expected bool literal!");
-
-	if (_literal.value == "true"_yulstring)
-		return u256(1);
-	else if (_literal.value == "false"_yulstring)
-		return u256(0);
-
-	yulAssert(false, "Unexpected bool literal value!");
-}
-
-u256 solidity::yul::valueOfLiteral(Literal const& _literal)
-{
-	switch (_literal.kind)
-	{
-		case LiteralKind::Number:
-			return valueOfNumberLiteral(_literal);
-		case LiteralKind::Boolean:
-			return valueOfBoolLiteral(_literal);
-		case LiteralKind::String:
-			return valueOfStringLiteral(_literal);
-		default:
-			yulAssert(false, "Unexpected literal kind!");
-	}
-}
-
-template<>
-bool Less<Literal>::operator()(Literal const& _lhs, Literal const& _rhs) const
-{
-	if (std::make_tuple(_lhs.kind, _lhs.type) != std::make_tuple(_rhs.kind, _rhs.type))
-		return std::make_tuple(_lhs.kind, _lhs.type) < std::make_tuple(_rhs.kind, _rhs.type);
-
-	if (_lhs.kind == LiteralKind::Number)
-		return valueOfNumberLiteral(_lhs) < valueOfNumberLiteral(_rhs);
-	else
-		return _lhs.value < _rhs.value;
-}
-
-bool SwitchCaseCompareByLiteralValue::operator()(Case const* _lhs, Case const* _rhs) const
-{
-	yulAssert(_lhs && _rhs, "");
-	return Less<Literal*>{}(_lhs->value.get(), _rhs->value.get());
-}
diff --git a/libyul/Utilities.h b/libyul/Utilities.h
deleted file mode 100644
index e4d496cd4eba..000000000000
--- a/libyul/Utilities.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Small useful snippets for the optimiser.
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-#include <libyul/ASTForward.h>
-
-namespace solidity::yul
-{
-
-std::string reindent(std::string const& _code);
-
-u256 valueOfNumberLiteral(Literal const& _literal);
-u256 valueOfStringLiteral(Literal const& _literal);
-u256 valueOfBoolLiteral(Literal const& _literal);
-u256 valueOfLiteral(Literal const& _literal);
-
-/**
- * Linear order on Yul AST nodes.
- *
- * Defines a linear order on Yul AST nodes to be used in maps and sets.
- * Note: the order is total and deterministic, but independent of the semantics, e.g.
- * it is not guaranteed that the false Literal is "less" than the true Literal.
- */
-template<typename T>
-struct Less
-{
-	bool operator()(T const& _lhs, T const& _rhs) const;
-};
-
-template<typename T>
-struct Less<T*>
-{
-	bool operator()(T const* _lhs, T const* _rhs) const
-	{
-		if (_lhs && _rhs)
-			return Less<T>{}(*_lhs, *_rhs);
-		else
-			return _lhs < _rhs;
-	}
-};
-
-template<> bool Less<Literal>::operator()(Literal const& _lhs, Literal const& _rhs) const;
-extern template struct Less<Literal>;
-
-// This can only be used for cases within one switch statement and
-// relies on the fact that there are no duplicate cases.
-struct SwitchCaseCompareByLiteralValue
-{
-	bool operator()(Case const* _lhsCase, Case const* _rhsCase) const;
-};
-
-}
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
deleted file mode 100644
index a5d72c7bb5d7..000000000000
--- a/libyul/YulStack.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5
- */
-
-
-#include <libyul/YulStack.h>
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/backends/evm/EthAssemblyAdapter.h>
-#include <libyul/backends/evm/EVMCodeTransform.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/EVMObjectCompiler.h>
-#include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/ObjectParser.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/Suite.h>
-#include <libevmasm/Assembly.h>
-#include <liblangutil/Scanner.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <optional>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::langutil;
-
-namespace
-{
-Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _version)
-{
-	switch (_language)
-	{
-	case YulStack::Language::Assembly:
-	case YulStack::Language::StrictAssembly:
-		return EVMDialect::strictAssemblyForEVMObjects(_version);
-	case YulStack::Language::Yul:
-		return EVMDialectTyped::instance(_version);
-	}
-	yulAssert(false, "");
-	return Dialect::yulDeprecated();
-}
-
-}
-
-
-CharStream const& YulStack::charStream(std::string const& _sourceName) const
-{
-	yulAssert(m_charStream, "");
-	yulAssert(m_charStream->name() == _sourceName, "");
-	return *m_charStream;
-}
-
-bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
-{
-	m_errors.clear();
-	m_analysisSuccessful = false;
-	m_charStream = std::make_unique<CharStream>(_source, _sourceName);
-	std::shared_ptr<Scanner> scanner = std::make_shared<Scanner>(*m_charStream);
-	m_parserResult = ObjectParser(m_errorReporter, languageToDialect(m_language, m_evmVersion)).parse(scanner, false);
-	if (!m_errorReporter.errors().empty())
-		return false;
-	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
-
-	return analyzeParsed();
-}
-
-void YulStack::optimize()
-{
-	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
-	yulAssert(m_parserResult);
-
-	if (
-		!m_optimiserSettings.runYulOptimiser &&
-		yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
-	)
-		return;
-
-	m_analysisSuccessful = false;
-	yulAssert(m_parserResult, "");
-	optimize(*m_parserResult, true);
-	yulAssert(analyzeParsed(), "Invalid source code after optimization.");
-}
-
-bool YulStack::analyzeParsed()
-{
-	yulAssert(m_parserResult, "");
-	m_analysisSuccessful = analyzeParsed(*m_parserResult);
-	return m_analysisSuccessful;
-}
-
-bool YulStack::analyzeParsed(Object& _object)
-{
-	yulAssert(_object.code, "");
-	_object.analysisInfo = std::make_shared<AsmAnalysisInfo>();
-
-	AsmAnalyzer analyzer(
-		*_object.analysisInfo,
-		m_errorReporter,
-		languageToDialect(m_language, m_evmVersion),
-		{},
-		_object.qualifiedDataNames()
-	);
-	bool success = analyzer.analyze(*_object.code);
-	for (auto& subNode: _object.subObjects)
-		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
-			if (!analyzeParsed(*subObject))
-				success = false;
-	return success;
-}
-
-void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
-{
-	EVMDialect const* dialect = nullptr;
-	switch (m_language)
-	{
-		case Language::Assembly:
-		case Language::StrictAssembly:
-			dialect = &EVMDialect::strictAssemblyForEVMObjects(m_evmVersion);
-			break;
-		case Language::Yul:
-			dialect = &EVMDialectTyped::instance(m_evmVersion);
-			break;
-		default:
-			yulAssert(false, "Invalid language.");
-			break;
-	}
-
-	EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize, m_eofVersion);
-}
-
-void YulStack::optimize(Object& _object, bool _isCreation)
-{
-	yulAssert(_object.code, "");
-	yulAssert(_object.analysisInfo, "");
-	for (auto& subNode: _object.subObjects)
-		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
-		{
-			bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed");
-			optimize(*subObject, isCreation);
-		}
-
-	Dialect const& dialect = languageToDialect(m_language, m_evmVersion);
-	std::unique_ptr<GasMeter> meter;
-	if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&dialect))
-		meter = std::make_unique<GasMeter>(*evmDialect, _isCreation, m_optimiserSettings.expectedExecutionsPerDeployment);
-
-	OptimiserSuite::run(
-		dialect,
-		meter.get(),
-		_object,
-		// Defaults are the minimum necessary to avoid running into "Stack too deep" constantly.
-		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.optimizeStackAllocation : true,
-		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserSteps : "u",
-		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserCleanupSteps : "",
-		_isCreation ? std::nullopt : std::make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
-		{}
-	);
-}
-
-MachineAssemblyObject YulStack::assemble(Machine _machine) const
-{
-	yulAssert(m_analysisSuccessful, "");
-	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
-	yulAssert(m_parserResult->analysisInfo, "");
-
-	switch (_machine)
-	{
-	case Machine::EVM:
-		return assembleWithDeployed().first;
-	}
-	// unreachable
-	return MachineAssemblyObject();
-}
-
-std::pair<MachineAssemblyObject, MachineAssemblyObject>
-YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName) const
-{
-	auto [creationAssembly, deployedAssembly] = assembleEVMWithDeployed(_deployName);
-	yulAssert(creationAssembly, "");
-	yulAssert(m_charStream, "");
-
-	MachineAssemblyObject creationObject;
-	creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
-	yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
-	creationObject.assembly = creationAssembly->assemblyString(m_debugInfoSelection);
-	creationObject.sourceMappings = std::make_unique<std::string>(
-		evmasm::AssemblyItem::computeSourceMapping(
-			creationAssembly->items(),
-			{{m_charStream->name(), 0}}
-		)
-	);
-
-	MachineAssemblyObject deployedObject;
-	if (deployedAssembly)
-	{
-		deployedObject.bytecode = std::make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
-		deployedObject.assembly = deployedAssembly->assemblyString(m_debugInfoSelection);
-		deployedObject.sourceMappings = std::make_unique<std::string>(
-			evmasm::AssemblyItem::computeSourceMapping(
-				deployedAssembly->items(),
-				{{m_charStream->name(), 0}}
-			)
-		);
-	}
-
-	return {std::move(creationObject), std::move(deployedObject)};
-}
-
-std::pair<std::shared_ptr<evmasm::Assembly>, std::shared_ptr<evmasm::Assembly>>
-YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName) const
-{
-	yulAssert(m_analysisSuccessful, "");
-	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
-	yulAssert(m_parserResult->analysisInfo, "");
-
-	evmasm::Assembly assembly(m_evmVersion, true, {});
-	EthAssemblyAdapter adapter(assembly);
-
-	// NOTE: We always need stack optimization when Yul optimizer is disabled (unless code contains
-	// msize). It being disabled just means that we don't use the full step sequence. We still run
-	// it with the minimal steps required to avoid "stack too deep".
-	bool optimize = m_optimiserSettings.optimizeStackAllocation || (
-		!m_optimiserSettings.runYulOptimiser &&
-		!yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
-	);
-	compileEVM(adapter, optimize);
-
-	assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));
-
-	std::optional<size_t> subIndex;
-
-	// Pick matching assembly if name was given
-	if (_deployName.has_value())
-	{
-		for (size_t i = 0; i < assembly.numSubs(); i++)
-			if (assembly.sub(i).name() == _deployName)
-			{
-				subIndex = i;
-				break;
-			}
-
-		solAssert(subIndex.has_value(), "Failed to find object to be deployed.");
-	}
-	// Otherwise use heuristic: If there is a single sub-assembly, this is likely the object to be deployed.
-	else if (assembly.numSubs() == 1)
-		subIndex = 0;
-
-	if (subIndex.has_value())
-	{
-		evmasm::Assembly& runtimeAssembly = assembly.sub(*subIndex);
-		return {std::make_shared<evmasm::Assembly>(assembly), std::make_shared<evmasm::Assembly>(runtimeAssembly)};
-	}
-
-	return {std::make_shared<evmasm::Assembly>(assembly), {}};
-}
-
-std::string YulStack::print(
-	CharStreamProvider const* _soliditySourceProvider
-) const
-{
-	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
-	return m_parserResult->toString(&languageToDialect(m_language, m_evmVersion), m_debugInfoSelection, _soliditySourceProvider) + "\n";
-}
-
-Json::Value YulStack::astJson() const
-{
-	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
-	return  m_parserResult->toJson();
-}
-
-std::shared_ptr<Object> YulStack::parserResult() const
-{
-	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
-	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
-	return m_parserResult;
-}
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
deleted file mode 100644
index 700fd2b3baa3..000000000000
--- a/libyul/YulStack.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM.
- */
-
-#pragma once
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libyul/Object.h>
-#include <libyul/ObjectParser.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <libevmasm/LinkerObject.h>
-
-#include <json/json.h>
-
-#include <memory>
-#include <string>
-
-namespace solidity::evmasm
-{
-class Assembly;
-}
-
-namespace solidity::langutil
-{
-class Scanner;
-}
-
-namespace solidity::yul
-{
-class AbstractAssembly;
-
-
-struct MachineAssemblyObject
-{
-	std::shared_ptr<evmasm::LinkerObject> bytecode;
-	std::string assembly;
-	std::unique_ptr<std::string> sourceMappings;
-};
-
-/*
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM as output.
- */
-class YulStack: public langutil::CharStreamProvider
-{
-public:
-	enum class Language { Yul, Assembly, StrictAssembly };
-	enum class Machine { EVM };
-
-	YulStack():
-		YulStack(
-			langutil::EVMVersion{},
-			std::nullopt,
-			Language::Assembly,
-			solidity::frontend::OptimiserSettings::none(),
-			langutil::DebugInfoSelection::Default()
-		)
-	{}
-
-	YulStack(
-		langutil::EVMVersion _evmVersion,
-		std::optional<uint8_t> _eofVersion,
-		Language _language,
-		solidity::frontend::OptimiserSettings _optimiserSettings,
-		langutil::DebugInfoSelection const& _debugInfoSelection
-	):
-		m_language(_language),
-		m_evmVersion(_evmVersion),
-		m_eofVersion(_eofVersion),
-		m_optimiserSettings(std::move(_optimiserSettings)),
-		m_debugInfoSelection(_debugInfoSelection),
-		m_errorReporter(m_errors)
-	{}
-
-	/// @returns the char stream used during parsing
-	langutil::CharStream const& charStream(std::string const& _sourceName) const override;
-
-	/// Runs parsing and analysis steps, returns false if input cannot be assembled.
-	/// Multiple calls overwrite the previous state.
-	bool parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
-
-	/// Run the optimizer suite. Can only be used with Yul or strict assembly.
-	/// If the settings (see constructor) disabled the optimizer, nothing is done here.
-	void optimize();
-
-	/// Run the assembly step (should only be called after parseAndAnalyze).
-	MachineAssemblyObject assemble(Machine _machine) const;
-
-	/// Run the assembly step (should only be called after parseAndAnalyze).
-	/// In addition to the value returned by @a assemble, returns
-	/// a second object that is the runtime code.
-	/// Only available for EVM.
-	std::pair<MachineAssemblyObject, MachineAssemblyObject>
-	assembleWithDeployed(
-		std::optional<std::string_view> _deployName = {}
-	) const;
-
-	/// Run the assembly step (should only be called after parseAndAnalyze).
-	/// Similar to @a assemblyWithDeployed, but returns EVM assembly objects.
-	/// Only available for EVM.
-	std::pair<std::shared_ptr<evmasm::Assembly>, std::shared_ptr<evmasm::Assembly>>
-	assembleEVMWithDeployed(
-		std::optional<std::string_view> _deployName = {}
-	) const;
-
-	/// @returns the errors generated during parsing, analysis (and potentially assembly).
-	langutil::ErrorList const& errors() const { return m_errors; }
-
-	/// Pretty-print the input after having parsed it.
-	std::string print(
-		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	) const;
-	Json::Value astJson() const;
-	/// Return the parsed and analyzed object.
-	std::shared_ptr<Object> parserResult() const;
-
-private:
-	bool analyzeParsed();
-	bool analyzeParsed(yul::Object& _object);
-
-	void compileEVM(yul::AbstractAssembly& _assembly, bool _optimize) const;
-
-	void optimize(yul::Object& _object, bool _isCreation);
-
-	Language m_language = Language::Assembly;
-	langutil::EVMVersion m_evmVersion;
-	std::optional<uint8_t> m_eofVersion;
-	solidity::frontend::OptimiserSettings m_optimiserSettings;
-	langutil::DebugInfoSelection m_debugInfoSelection{};
-
-	std::unique_ptr<langutil::CharStream> m_charStream;
-
-	bool m_analysisSuccessful = false;
-	std::shared_ptr<yul::Object> m_parserResult;
-	langutil::ErrorList m_errors;
-	langutil::ErrorReporter m_errorReporter;
-
-	std::unique_ptr<std::string> m_sourceMappings;
-};
-
-}
diff --git a/libyul/YulString.h b/libyul/YulString.h
deleted file mode 100644
index 5522e34849a4..000000000000
--- a/libyul/YulString.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * String abstraction that avoids copies.
- */
-
-#pragma once
-
-#include <fmt/format.h>
-
-#include <unordered_map>
-#include <memory>
-#include <vector>
-#include <string>
-#include <functional>
-
-namespace solidity::yul
-{
-
-/// Repository for YulStrings.
-/// Owns the string data for all YulStrings, which can be referenced by a Handle.
-/// A Handle consists of an ID (that depends on the insertion order of YulStrings and is potentially
-/// non-deterministic) and a deterministic string hash.
-class YulStringRepository
-{
-public:
-	struct Handle
-	{
-		size_t id;
-		std::uint64_t hash;
-	};
-
-	static YulStringRepository& instance()
-	{
-		static YulStringRepository inst;
-		return inst;
-	}
-
-	Handle stringToHandle(std::string const& _string)
-	{
-		if (_string.empty())
-			return { 0, emptyHash() };
-		std::uint64_t h = hash(_string);
-		auto range = m_hashToID.equal_range(h);
-		for (auto it = range.first; it != range.second; ++it)
-			if (*m_strings[it->second] == _string)
-				return Handle{it->second, h};
-		m_strings.emplace_back(std::make_shared<std::string>(_string));
-		size_t id = m_strings.size() - 1;
-		m_hashToID.emplace_hint(range.second, std::make_pair(h, id));
-
-		return Handle{id, h};
-	}
-	std::string const& idToString(size_t _id) const	{ return *m_strings.at(_id); }
-
-	static std::uint64_t hash(std::string const& v)
-	{
-		// FNV hash - can be replaced by a better one, e.g. xxhash64
-		std::uint64_t hash = emptyHash();
-		for (char c: v)
-		{
-			hash *= 1099511628211u;
-			hash ^= static_cast<uint64_t>(c);
-		}
-
-		return hash;
-	}
-	static constexpr std::uint64_t emptyHash() { return 14695981039346656037u; }
-	/// Clear the repository.
-	/// Use with care - there cannot be any dangling YulString references.
-	/// If references need to be cleared manually, register the callback via
-	/// resetCallback.
-	static void reset()
-	{
-		for (auto const& cb: resetCallbacks())
-			cb();
-		instance() = YulStringRepository{};
-	}
-	/// Struct that registers a reset callback as a side-effect of its construction.
-	/// Useful as static local variable to register a reset callback once.
-	struct ResetCallback
-	{
-		ResetCallback(std::function<void()> _fun)
-		{
-			YulStringRepository::resetCallbacks().emplace_back(std::move(_fun));
-		}
-	};
-
-private:
-	YulStringRepository() = default;
-	YulStringRepository(YulStringRepository const&) = delete;
-	YulStringRepository(YulStringRepository&&) = default;
-	YulStringRepository& operator=(YulStringRepository const& _rhs) = delete;
-	YulStringRepository& operator=(YulStringRepository&& _rhs) = default;
-
-	static std::vector<std::function<void()>>& resetCallbacks()
-	{
-		static std::vector<std::function<void()>> callbacks;
-		return callbacks;
-	}
-
-	std::vector<std::shared_ptr<std::string>> m_strings = {std::make_shared<std::string>()};
-	std::unordered_multimap<std::uint64_t, size_t> m_hashToID = {{emptyHash(), 0}};
-};
-
-/// Wrapper around handles into the YulString repository.
-/// Equality of two YulStrings is determined by comparing their ID.
-/// The <-operator depends on the string hash and is not consistent
-/// with string comparisons (however, it is still deterministic).
-class YulString
-{
-public:
-	YulString() = default;
-	explicit YulString(std::string const& _s): m_handle(YulStringRepository::instance().stringToHandle(_s)) {}
-	YulString(YulString const&) = default;
-	YulString(YulString&&) = default;
-	YulString& operator=(YulString const&) = default;
-	YulString& operator=(YulString&&) = default;
-
-	/// This is not consistent with the string <-operator!
-	/// First compares the string hashes. If they are equal
-	/// it checks for identical IDs (only identical strings have
-	/// identical IDs and identical strings do not compare as "less").
-	/// If the hashes are identical and the strings are distinct, it
-	/// falls back to string comparison.
-	bool operator<(YulString const& _other) const
-	{
-		if (m_handle.hash < _other.m_handle.hash) return true;
-		if (_other.m_handle.hash < m_handle.hash) return false;
-		if (m_handle.id == _other.m_handle.id) return false;
-		return str() < _other.str();
-	}
-	/// Equality is determined based on the string ID.
-	bool operator==(YulString const& _other) const { return m_handle.id == _other.m_handle.id; }
-	bool operator!=(YulString const& _other) const { return m_handle.id != _other.m_handle.id; }
-
-	bool empty() const { return m_handle.id == 0; }
-	std::string const& str() const
-	{
-		return YulStringRepository::instance().idToString(m_handle.id);
-	}
-
-	uint64_t hash() const { return m_handle.hash; }
-
-private:
-	/// Handle of the string. Assumes that the empty string has ID zero.
-	YulStringRepository::Handle m_handle{ 0, YulStringRepository::emptyHash() };
-};
-
-inline YulString operator "" _yulstring(char const* _string, std::size_t _size)
-{
-	return YulString(std::string(_string, _size));
-}
-
-}
-
-namespace fmt
-{
-template <>
-struct formatter<solidity::yul::YulString>
-{
-	template <typename ParseContext>
-	constexpr auto parse(ParseContext& _context)
-	{
-		return _context.begin();
-	}
-
-	template <typename FormatContext>
-	auto format(solidity::yul::YulString _value, FormatContext& _context)
-	{
-		return format_to(_context.out(), "{}", _value.str());
-	}
-};
-}
-
-namespace std
-{
-template<> struct hash<solidity::yul::YulString>
-{
-	size_t operator()(solidity::yul::YulString const& x) const
-	{
-		return static_cast<size_t>(x.hash());
-	}
-};
-}
diff --git a/libyul/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h
deleted file mode 100644
index fe45008962c8..000000000000
--- a/libyul/backends/evm/AbstractAssembly.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Abstract assembly interface, subclasses of which are to be used with the generic
- * bytecode generator.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <functional>
-#include <memory>
-#include <optional>
-
-namespace solidity::langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::evmasm
-{
-enum class Instruction: uint8_t;
-}
-
-namespace solidity::yul
-{
-struct Identifier;
-
-///
-/// Assembly class that abstracts both the libevmasm assembly and the new Yul assembly.
-///
-class AbstractAssembly
-{
-public:
-	using LabelID = size_t;
-	using SubID = size_t;
-	enum class JumpType { Ordinary, IntoFunction, OutOfFunction };
-
-	virtual ~AbstractAssembly() = default;
-
-	/// Set a new source location valid starting from the next instruction.
-	virtual void setSourceLocation(langutil::SourceLocation const& _location) = 0;
-	/// Retrieve the current height of the stack. This does not have to be zero
-	/// at the beginning.
-	virtual int stackHeight() const = 0;
-	virtual void setStackHeight(int height) = 0;
-	/// Append an EVM instruction.
-	virtual void appendInstruction(evmasm::Instruction _instruction) = 0;
-	/// Append a constant.
-	virtual void appendConstant(u256 const& _constant) = 0;
-	/// Append a label.
-	virtual void appendLabel(LabelID _labelId) = 0;
-	/// Append a label reference.
-	virtual void appendLabelReference(LabelID _labelId) = 0;
-	/// Generate a new unique label.
-	virtual LabelID newLabelId() = 0;
-	/// Returns a label identified by the given name. Creates it if it does not yet exist.
-	virtual LabelID namedLabel(std::string const& _name, size_t _params, size_t _returns, std::optional<size_t> _sourceID) = 0;
-	/// Append a reference to a to-be-linked symbol.
-	/// Currently, we assume that the value is always a 20 byte number.
-	virtual void appendLinkerSymbol(std::string const& _name) = 0;
-
-	/// Append raw bytes that stay untouched by the optimizer.
-	virtual void appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables) = 0;
-
-	/// Append a jump instruction.
-	/// @param _stackDiffAfter the stack adjustment after this instruction.
-	/// This is helpful to stack height analysis if there is no continuing control flow.
-	virtual void appendJump(int _stackDiffAfter, JumpType _jumpType = JumpType::Ordinary) = 0;
-
-	/// Append a jump-to-immediate operation.
-	/// @param _stackDiffAfter the stack adjustment after this instruction.
-	virtual void appendJumpTo(LabelID _labelId, int _stackDiffAfter = 0, JumpType _jumpType = JumpType::Ordinary) = 0;
-	/// Append a jump-to-if-immediate operation.
-	virtual void appendJumpToIf(LabelID _labelId, JumpType _jumpType = JumpType::Ordinary) = 0;
-
-	/// Append the assembled size as a constant.
-	virtual void appendAssemblySize() = 0;
-	/// Creates a new sub-assembly, which can be referenced using dataSize and dataOffset.
-	virtual std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(bool _creation, std::string _name = "") = 0;
-	/// Appends the offset of the given sub-assembly or data.
-	virtual void appendDataOffset(std::vector<SubID> const& _subPath) = 0;
-	/// Appends the size of the given sub-assembly or data.
-	virtual void appendDataSize(std::vector<SubID> const& _subPath) = 0;
-	/// Appends the given data to the assembly and returns its ID.
-	virtual SubID appendData(bytes const& _data) = 0;
-
-	/// Appends loading an immutable variable.
-	virtual void appendImmutable(std::string const& _identifier) = 0;
-	/// Appends an assignment to an immutable variable.
-	virtual void appendImmutableAssignment(std::string const& _identifier) = 0;
-
-	/// Appends data to the very end of the bytecode. Repeated calls concatenate.
-	virtual void appendToAuxiliaryData(bytes const& _data) = 0;
-
-	/// Mark this assembly as invalid. Any attempt to request bytecode from it should throw.
-	virtual void markAsInvalid() = 0;
-
-	/// @returns the EVM version the assembly targets.
-	virtual langutil::EVMVersion evmVersion() const = 0;
-};
-
-enum class IdentifierContext { LValue, RValue, VariableDeclaration, NonExternal };
-
-/// Object that is used to resolve references and generate code for access to identifiers external
-/// to inline assembly (not used in standalone assembly mode).
-struct ExternalIdentifierAccess
-{
-	using Resolver = std::function<bool(Identifier const&, IdentifierContext, bool /*_crossesFunctionBoundary*/)>;
-	/// Resolve an external reference given by the identifier in the given context.
-	/// @returns the size of the value (number of stack slots) or size_t(-1) if not found.
-	Resolver resolve;
-	using CodeGenerator = std::function<void(Identifier const&, IdentifierContext, yul::AbstractAssembly&)>;
-	/// Generate code for retrieving the value (rvalue context) or storing the value (lvalue context)
-	/// of an identifier. The code should be appended to the assembly. In rvalue context, the value is supposed
-	/// to be put onto the stack, in lvalue context, the value is assumed to be at the top of the stack.
-	CodeGenerator generateCode;
-};
-
-}
diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
deleted file mode 100644
index 645d1fd87bc1..000000000000
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Helper to compile Yul code using libevmasm.
- */
-
-#include <libyul/backends/evm/AsmCodeGen.h>
-
-#include <libyul/backends/evm/EthAssemblyAdapter.h>
-#include <libyul/backends/evm/EVMCodeTransform.h>
-#include <libyul/AST.h>
-#include <libyul/AsmAnalysisInfo.h>
-
-#include <libsolutil/StackTooDeepString.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-void CodeGenerator::assemble(
-	Block const& _parsedData,
-	AsmAnalysisInfo& _analysisInfo,
-	evmasm::Assembly& _assembly,
-	langutil::EVMVersion _evmVersion,
-	ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
-	bool _useNamedLabelsForFunctions,
-	bool _optimizeStackAllocation
-)
-{
-	EthAssemblyAdapter assemblyAdapter(_assembly);
-	BuiltinContext builtinContext;
-	CodeTransform transform(
-		assemblyAdapter,
-		_analysisInfo,
-		_parsedData,
-		EVMDialect::strictAssemblyForEVM(_evmVersion),
-		builtinContext,
-		_optimizeStackAllocation,
-		_identifierAccessCodeGen,
-			_useNamedLabelsForFunctions ?
-			CodeTransform::UseNamedLabels::YesAndForceUnique :
-			CodeTransform::UseNamedLabels::Never
-	);
-	transform(_parsedData);
-	if (!transform.stackErrors().empty())
-		assertThrow(
-			false,
-			langutil::StackTooDeepError,
-			util::stackTooDeepString + " When compiling inline assembly" +
-			(transform.stackErrors().front().comment() ? ": " + *transform.stackErrors().front().comment() : ".")
-		);
-}
diff --git a/libyul/backends/evm/AsmCodeGen.h b/libyul/backends/evm/AsmCodeGen.h
deleted file mode 100644
index b79338074957..000000000000
--- a/libyul/backends/evm/AsmCodeGen.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Helper to compile Yul code using libevmasm.
- */
-
-#pragma once
-
-#include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/AsmAnalysis.h>
-#include <liblangutil/EVMVersion.h>
-
-namespace solidity::evmasm
-{
-class Assembly;
-}
-
-namespace solidity::yul
-{
-struct Block;
-struct AsmAnalysisInfo;
-
-class CodeGenerator
-{
-public:
-	/// Performs code generation and appends generated to _assembly.
-	static void assemble(
-		Block const& _parsedData,
-		AsmAnalysisInfo& _analysisInfo,
-		evmasm::Assembly& _assembly,
-		langutil::EVMVersion _evmVersion,
-		ExternalIdentifierAccess::CodeGenerator _identifierAccess = {},
-		bool _useNamedLabelsForFunctions = false,
-		bool _optimizeStackAllocation = false
-	);
-};
-}
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
deleted file mode 100644
index c5a33e52f452..000000000000
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that replaces constants by expressions that compute them.
- */
-
-#include <libyul/backends/evm/ConstantOptimiser.h>
-
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-using Representation = ConstantOptimiser::Representation;
-
-namespace
-{
-struct MiniEVMInterpreter
-{
-	explicit MiniEVMInterpreter(EVMDialect const& _dialect): m_dialect(_dialect) {}
-
-	u256 eval(Expression const& _expr)
-	{
-		return std::visit(*this, _expr);
-	}
-
-	u256 eval(evmasm::Instruction _instr, std::vector<Expression> const& _arguments)
-	{
-		std::vector<u256> args;
-		for (auto const& arg: _arguments)
-			args.emplace_back(eval(arg));
-		switch (_instr)
-		{
-		case evmasm::Instruction::ADD:
-			return args.at(0) + args.at(1);
-		case evmasm::Instruction::SUB:
-			return args.at(0) - args.at(1);
-		case evmasm::Instruction::MUL:
-			return args.at(0) * args.at(1);
-		case evmasm::Instruction::EXP:
-			return exp256(args.at(0), args.at(1));
-		case evmasm::Instruction::SHL:
-			return args.at(0) > 255 ? 0 : (args.at(1) << unsigned(args.at(0)));
-		case evmasm::Instruction::NOT:
-			return ~args.at(0);
-		default:
-			yulAssert(false, "Invalid operation generated in constant optimizer.");
-		}
-		return 0;
-	}
-
-	u256 operator()(FunctionCall const& _funCall)
-	{
-		BuiltinFunctionForEVM const* fun = m_dialect.builtin(_funCall.functionName.name);
-		yulAssert(fun, "Expected builtin function.");
-		yulAssert(fun->instruction, "Expected EVM instruction.");
-		return eval(*fun->instruction, _funCall.arguments);
-	}
-	u256 operator()(Literal const& _literal)
-	{
-		return valueOfLiteral(_literal);
-	}
-	u256 operator()(Identifier const&) { yulAssert(false, ""); }
-
-	EVMDialect const& m_dialect;
-};
-}
-
-void ConstantOptimiser::visit(Expression& _e)
-{
-	if (std::holds_alternative<Literal>(_e))
-	{
-		Literal const& literal = std::get<Literal>(_e);
-		if (literal.kind != LiteralKind::Number)
-			return;
-
-		if (
-			Expression const* repr =
-				RepresentationFinder(m_dialect, m_meter, debugDataOf(_e), m_cache)
-				.tryFindRepresentation(valueOfLiteral(literal))
-		)
-			_e = ASTCopier{}.translate(*repr);
-	}
-	else
-		ASTModifier::visit(_e);
-}
-
-Expression const* RepresentationFinder::tryFindRepresentation(u256 const& _value)
-{
-	if (_value < 0x10000)
-		return nullptr;
-
-	Representation const& repr = findRepresentation(_value);
-	if (std::holds_alternative<Literal>(*repr.expression))
-		return nullptr;
-	else
-		return repr.expression.get();
-}
-
-Representation const& RepresentationFinder::findRepresentation(u256 const& _value)
-{
-	if (m_cache.count(_value))
-		return m_cache.at(_value);
-
-	Representation routine = represent(_value);
-
-	if (numberEncodingSize(~_value) < numberEncodingSize(_value))
-		// Negated is shorter to represent
-		routine = min(std::move(routine), represent("not"_yulstring, findRepresentation(~_value)));
-
-	// Decompose value into a * 2**k + b where abs(b) << 2**k
-	for (unsigned bits = 255; bits > 8 && m_maxSteps > 0; --bits)
-	{
-		unsigned gapDetector = unsigned((_value >> (bits - 8)) & 0x1ff);
-		if (gapDetector != 0xff && gapDetector != 0x100)
-			continue;
-
-		u256 powerOfTwo = u256(1) << bits;
-		u256 upperPart = _value >> bits;
-		bigint lowerPart = _value & (powerOfTwo - 1);
-		if ((powerOfTwo - lowerPart) < lowerPart)
-		{
-			lowerPart = lowerPart - powerOfTwo; // make it negative
-			upperPart++;
-		}
-		if (upperPart == 0)
-			continue;
-		if (abs(lowerPart) >= (powerOfTwo >> 8))
-			continue;
-		Representation newRoutine;
-		if (m_dialect.evmVersion().hasBitwiseShifting())
-			newRoutine = represent("shl"_yulstring, represent(bits), findRepresentation(upperPart));
-		else
-		{
-			newRoutine = represent("exp"_yulstring, represent(2), represent(bits));
-			if (upperPart != 1)
-				newRoutine = represent("mul"_yulstring, findRepresentation(upperPart), newRoutine);
-		}
-
-		if (newRoutine.cost >= routine.cost)
-			continue;
-
-		if (lowerPart > 0)
-			newRoutine = represent("add"_yulstring, newRoutine, findRepresentation(u256(abs(lowerPart))));
-		else if (lowerPart < 0)
-			newRoutine = represent("sub"_yulstring, newRoutine, findRepresentation(u256(abs(lowerPart))));
-
-		if (m_maxSteps > 0)
-			m_maxSteps--;
-		routine = min(std::move(routine), std::move(newRoutine));
-	}
-	yulAssert(MiniEVMInterpreter{m_dialect}.eval(*routine.expression) == _value, "Invalid expression generated.");
-	return m_cache[_value] = std::move(routine);
-}
-
-Representation RepresentationFinder::represent(u256 const& _value) const
-{
-	Representation repr;
-	repr.expression = std::make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, YulString{formatNumber(_value)}, {}});
-	repr.cost = m_meter.costs(*repr.expression);
-	return repr;
-}
-
-Representation RepresentationFinder::represent(
-	YulString _instruction,
-	Representation const& _argument
-) const
-{
-	Representation repr;
-	repr.expression = std::make_unique<Expression>(FunctionCall{
-		m_debugData,
-		Identifier{m_debugData, _instruction},
-		{ASTCopier{}.translate(*_argument.expression)}
-	});
-	repr.cost = _argument.cost + m_meter.instructionCosts(*m_dialect.builtin(_instruction)->instruction);
-	return repr;
-}
-
-Representation RepresentationFinder::represent(
-	YulString _instruction,
-	Representation const& _arg1,
-	Representation const& _arg2
-) const
-{
-	Representation repr;
-	repr.expression = std::make_unique<Expression>(FunctionCall{
-		m_debugData,
-		Identifier{m_debugData, _instruction},
-		{ASTCopier{}.translate(*_arg1.expression), ASTCopier{}.translate(*_arg2.expression)}
-	});
-	repr.cost = m_meter.instructionCosts(*m_dialect.builtin(_instruction)->instruction) + _arg1.cost + _arg2.cost;
-	return repr;
-}
-
-Representation RepresentationFinder::min(Representation _a, Representation _b)
-{
-	if (_a.cost <= _b.cost)
-		return _a;
-	else
-		return _b;
-}
diff --git a/libyul/backends/evm/ConstantOptimiser.h b/libyul/backends/evm/ConstantOptimiser.h
deleted file mode 100644
index a60d2b2f5601..000000000000
--- a/libyul/backends/evm/ConstantOptimiser.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that replaces constants by expressions that compute them.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
-#include <libyul/Dialect.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/ASTForward.h>
-
-#include <liblangutil/SourceLocation.h>
-
-#include <libsolutil/Common.h>
-
-#include <tuple>
-#include <map>
-#include <memory>
-
-namespace solidity::yul
-{
-struct Dialect;
-class GasMeter;
-
-/**
- * Optimisation stage that replaces constants by expressions that compute them.
- *
- * Prerequisite: None
- */
-class ConstantOptimiser: public ASTModifier
-{
-public:
-	ConstantOptimiser(EVMDialect const& _dialect, GasMeter const& _meter):
-		m_dialect(_dialect),
-		m_meter(_meter)
-	{}
-
-	void visit(Expression& _e) override;
-
-	struct Representation
-	{
-		std::unique_ptr<Expression> expression;
-		bigint cost;
-	};
-
-private:
-	EVMDialect const& m_dialect;
-	GasMeter const& m_meter;
-	std::map<u256, Representation> m_cache;
-};
-
-class RepresentationFinder
-{
-public:
-	using Representation = ConstantOptimiser::Representation;
-	RepresentationFinder(
-		EVMDialect const& _dialect,
-		GasMeter const& _meter,
-		std::shared_ptr<DebugData const> _debugData,
-		std::map<u256, Representation>& _cache
-	):
-		m_dialect(_dialect),
-		m_meter(_meter),
-		m_debugData(std::move(_debugData)),
-		m_cache(_cache)
-	{}
-
-	/// @returns a cheaper representation for the number than its representation
-	/// as a literal or nullptr otherwise.
-	Expression const* tryFindRepresentation(u256 const& _value);
-
-private:
-	/// Recursively try to find the cheapest representation of the given number,
-	/// literal if necessary.
-	Representation const& findRepresentation(u256 const& _value);
-
-	Representation represent(u256 const& _value) const;
-	Representation represent(YulString _instruction, Representation const& _arg) const;
-	Representation represent(YulString _instruction, Representation const& _arg1, Representation const& _arg2) const;
-
-	Representation min(Representation _a, Representation _b);
-
-	EVMDialect const& m_dialect;
-	GasMeter const& m_meter;
-	std::shared_ptr<DebugData const> m_debugData;
-	/// Counter for the complexity of optimization, will stop when it reaches zero.
-	size_t m_maxSteps = 10000;
-	std::map<u256, Representation>& m_cache;
-};
-
-}
diff --git a/libyul/backends/evm/ControlFlowGraph.h b/libyul/backends/evm/ControlFlowGraph.h
deleted file mode 100644
index 853a9e705dc2..000000000000
--- a/libyul/backends/evm/ControlFlowGraph.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Control flow graph and stack layout structures used during code generation.
- */
-
-#pragma once
-
-#include <libyul/AST.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/Dialect.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Scope.h>
-
-#include <libsolutil/Numeric.h>
-
-#include <functional>
-#include <list>
-#include <vector>
-
-namespace solidity::yul
-{
-
-/// The following structs describe different kinds of stack slots.
-/// Each stack slot is equality- and less-than-comparable and
-/// specifies an attribute ``canBeFreelyGenerated`` that is true,
-/// if a slot of this kind always has a known value at compile time and
-/// therefore can safely be removed from the stack at any time and then
-/// regenerated later.
-
-/// The label pushed as return label before a function call, i.e. the label the call is supposed to return to.
-struct FunctionCallReturnLabelSlot
-{
-	std::reference_wrapper<yul::FunctionCall const> call;
-	bool operator==(FunctionCallReturnLabelSlot const& _rhs) const { return &call.get() == &_rhs.call.get(); }
-	bool operator<(FunctionCallReturnLabelSlot const& _rhs) const { return &call.get() < &_rhs.call.get(); }
-	static constexpr bool canBeFreelyGenerated = true;
-};
-/// The return jump target of a function while generating the code of the function body.
-/// I.e. the caller of a function pushes a ``FunctionCallReturnLabelSlot`` (see above) before jumping to the function and
-/// this very slot is viewed as ``FunctionReturnLabelSlot`` inside the function body and jumped to when returning from
-/// the function.
-struct FunctionReturnLabelSlot
-{
-	std::reference_wrapper<Scope::Function const> function;
-	bool operator==(FunctionReturnLabelSlot const& _rhs) const
-	{
-		// There can never be return label slots of different functions on stack simultaneously.
-		yulAssert(&function.get() == &_rhs.function.get(), "");
-		return true;
-	}
-	bool operator<(FunctionReturnLabelSlot const& _rhs) const
-	{
-		// There can never be return label slots of different functions on stack simultaneously.
-		yulAssert(&function.get() == &_rhs.function.get(), "");
-		return false;
-	}
-	static constexpr bool canBeFreelyGenerated = false;
-};
-/// A slot containing the current value of a particular variable.
-struct VariableSlot
-{
-	std::reference_wrapper<Scope::Variable const> variable;
-	std::shared_ptr<DebugData const> debugData{};
-	bool operator==(VariableSlot const& _rhs) const { return &variable.get() == &_rhs.variable.get(); }
-	bool operator<(VariableSlot const& _rhs) const { return &variable.get() < &_rhs.variable.get(); }
-	static constexpr bool canBeFreelyGenerated = false;
-};
-/// A slot containing a literal value.
-struct LiteralSlot
-{
-	u256 value;
-	std::shared_ptr<DebugData const> debugData{};
-	bool operator==(LiteralSlot const& _rhs) const { return value == _rhs.value; }
-	bool operator<(LiteralSlot const& _rhs) const { return value < _rhs.value; }
-	static constexpr bool canBeFreelyGenerated = true;
-};
-/// A slot containing the index-th return value of a previous call.
-struct TemporarySlot
-{
-	/// The call that returned this slot.
-	std::reference_wrapper<yul::FunctionCall const> call;
-	/// Specifies to which of the values returned by the call this slot refers.
-	/// index == 0 refers to the slot deepest in the stack after the call.
-	size_t index = 0;
-	bool operator==(TemporarySlot const& _rhs) const { return &call.get() == &_rhs.call.get() && index == _rhs.index; }
-	bool operator<(TemporarySlot const& _rhs) const { return std::make_pair(&call.get(), index) < std::make_pair(&_rhs.call.get(), _rhs.index); }
-	static constexpr bool canBeFreelyGenerated = false;
-};
-/// A slot containing an arbitrary value that is always eventually popped and never used.
-/// Used to maintain stack balance on control flow joins.
-struct JunkSlot
-{
-	bool operator==(JunkSlot const&) const { return true; }
-	bool operator<(JunkSlot const&) const { return false; }
-	static constexpr bool canBeFreelyGenerated = true;
-};
-using StackSlot = std::variant<FunctionCallReturnLabelSlot, FunctionReturnLabelSlot, VariableSlot, LiteralSlot, TemporarySlot, JunkSlot>;
-/// The stack top is usually the last element of the vector.
-using Stack = std::vector<StackSlot>;
-
-/// @returns true if @a _slot can be generated on the stack at any time.
-inline bool canBeFreelyGenerated(StackSlot const& _slot)
-{
-	return std::visit([](auto const& _typedSlot) { return std::decay_t<decltype(_typedSlot)>::canBeFreelyGenerated; }, _slot);
-}
-
-/// Control flow graph consisting of ``CFG::BasicBlock``s connected by control flow.
-struct CFG
-{
-	explicit CFG() {}
-	CFG(CFG const&) = delete;
-	CFG(CFG&&) = delete;
-	CFG& operator=(CFG const&) = delete;
-	CFG& operator=(CFG&&) = delete;
-	~CFG() = default;
-
-	struct BuiltinCall
-	{
-		std::shared_ptr<DebugData const> debugData;
-		std::reference_wrapper<BuiltinFunction const> builtin;
-		std::reference_wrapper<yul::FunctionCall const> functionCall;
-		/// Number of proper arguments with a position on the stack, excluding literal arguments.
-		/// Literal arguments (like the literal string in ``datasize``) do not have a location on the stack,
-		/// but are handled internally by the builtin's code generation function.
-		size_t arguments = 0;
-	};
-	struct FunctionCall
-	{
-		std::shared_ptr<DebugData const> debugData;
-		std::reference_wrapper<Scope::Function const> function;
-		std::reference_wrapper<yul::FunctionCall const> functionCall;
-		/// True, if the call is recursive, i.e. entering the function involves a control flow path (potentially involving
-		/// more intermediate function calls) that leads back to this very call.
-		bool recursive = false;
-		/// True, if the call can return.
-		bool canContinue = true;
-	};
-	struct Assignment
-	{
-		std::shared_ptr<DebugData const> debugData;
-		/// The variables being assigned to also occur as ``output`` in the ``Operation`` containing
-		/// the assignment, but are also stored here for convenience.
-		std::vector<VariableSlot> variables;
-	};
-
-	struct Operation
-	{
-		/// Stack slots this operation expects at the top of the stack and consumes.
-		Stack input;
-		/// Stack slots this operation leaves on the stack as output.
-		Stack output;
-		std::variant<FunctionCall, BuiltinCall, Assignment> operation;
-	};
-
-	struct FunctionInfo;
-	/// A basic control flow block containing ``Operation``s acting on the stack.
-	/// Maintains a list of entry blocks and a typed exit.
-	struct BasicBlock
-	{
-		struct MainExit {};
-		struct ConditionalJump
-		{
-			std::shared_ptr<DebugData const> debugData;
-			StackSlot condition;
-			BasicBlock* nonZero = nullptr;
-			BasicBlock* zero = nullptr;
-		};
-		struct Jump
-		{
-			std::shared_ptr<DebugData const> debugData;
-			BasicBlock* target = nullptr;
-			/// The only backwards jumps are jumps from loop post to loop condition.
-			bool backwards = false;
-		};
-		struct FunctionReturn
-		{
-			std::shared_ptr<DebugData const> debugData;
-			CFG::FunctionInfo* info = nullptr;
-		};
-		struct Terminated {};
-		std::shared_ptr<DebugData const> debugData;
-		std::vector<BasicBlock*> entries;
-		std::vector<Operation> operations;
-		/// True, if the block is the beginning of a disconnected subgraph. That is, if no block that is reachable
-		/// from this block is an ancestor of this block. In other words, this is true, if this block is the target
-		/// of a cut-edge/bridge in the CFG or if the block itself terminates.
-		bool isStartOfSubGraph = false;
-		/// True, if there is a path from this block to a function return.
-		bool needsCleanStack = false;
-		/// If the block starts a sub-graph and does not lead to a function return, we are free to add junk to it.
-		bool allowsJunk() const { return isStartOfSubGraph && !needsCleanStack; }
-		std::variant<MainExit, Jump, ConditionalJump, FunctionReturn, Terminated> exit = MainExit{};
-	};
-
-	struct FunctionInfo
-	{
-		std::shared_ptr<DebugData const> debugData;
-		Scope::Function const& function;
-		FunctionDefinition const& functionDefinition;
-		BasicBlock* entry = nullptr;
-		std::vector<VariableSlot> parameters;
-		std::vector<VariableSlot> returnVariables;
-		std::vector<BasicBlock*> exits;
-		bool canContinue = true;
-	};
-
-	/// The main entry point, i.e. the start of the outermost Yul block.
-	BasicBlock* entry = nullptr;
-	/// Subgraphs for functions.
-	std::map<Scope::Function const*, FunctionInfo> functionInfo;
-	/// List of functions in order of declaration.
-	std::list<Scope::Function const*> functions;
-
-	/// Container for blocks for explicit ownership.
-	std::list<BasicBlock> blocks;
-	/// Container for generated variables for explicit ownership.
-	/// Ghost variables are generated to store switch conditions when transforming the control flow
-	/// of a switch to a sequence of conditional jumps.
-	std::list<Scope::Variable> ghostVariables;
-	/// Container for generated calls for explicit ownership.
-	/// Ghost calls are used for the equality comparisons of the switch condition ghost variable with
-	/// the switch case literals when transforming the control flow of a switch to a sequence of conditional jumps.
-	std::list<yul::FunctionCall> ghostCalls;
-
-	BasicBlock& makeBlock(std::shared_ptr<DebugData const> _debugData)
-	{
-		return blocks.emplace_back(BasicBlock{std::move(_debugData), {}, {}});
-	}
-};
-
-}
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
deleted file mode 100644
index 9a0a73b35fbf..000000000000
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Transformation of a Yul AST into a control flow graph.
- */
-
-#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Utilities.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-
-#include <libsolutil/cxx20.h>
-#include <libsolutil/Visitor.h>
-#include <libsolutil/Algorithms.h>
-
-#include <range/v3/action/push_back.hpp>
-#include <range/v3/action/erase.hpp>
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/concat.hpp>
-#include <range/v3/view/drop_last.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/view/iota.hpp>
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/single.hpp>
-#include <range/v3/view/take_last.hpp>
-#include <range/v3/view/transform.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-namespace
-{
-/// Removes edges to blocks that are not reachable.
-void cleanUnreachable(CFG& _cfg)
-{
-	// Determine which blocks are reachable from the entry.
-	util::BreadthFirstSearch<CFG::BasicBlock*> reachabilityCheck{{_cfg.entry}};
-	for (auto const& functionInfo: _cfg.functionInfo | ranges::views::values)
-		reachabilityCheck.verticesToTraverse.emplace_back(functionInfo.entry);
-
-	reachabilityCheck.run([&](CFG::BasicBlock* _node, auto&& _addChild) {
-		visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::Jump const& _jump) {
-				_addChild(_jump.target);
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _jump) {
-				_addChild(_jump.zero);
-				_addChild(_jump.nonZero);
-			},
-			[](CFG::BasicBlock::FunctionReturn const&) {},
-			[](CFG::BasicBlock::Terminated const&) {},
-			[](CFG::BasicBlock::MainExit const&) {}
-		}, _node->exit);
-	});
-
-	// Remove all entries from unreachable nodes from the graph.
-	for (CFG::BasicBlock* node: reachabilityCheck.visited)
-		cxx20::erase_if(node->entries, [&](CFG::BasicBlock* entry) -> bool {
-			return !reachabilityCheck.visited.count(entry);
-		});
-}
-
-/// Sets the ``recursive`` member to ``true`` for all recursive function calls.
-void markRecursiveCalls(CFG& _cfg)
-{
-	std::map<CFG::BasicBlock*, std::vector<CFG::FunctionCall*>> callsPerBlock;
-	auto const& findCalls = [&](CFG::BasicBlock* _block)
-	{
-		if (auto* calls = util::valueOrNullptr(callsPerBlock, _block))
-			return *calls;
-		std::vector<CFG::FunctionCall*>& calls = callsPerBlock[_block];
-		util::BreadthFirstSearch<CFG::BasicBlock*>{{_block}}.run([&](CFG::BasicBlock* _block, auto _addChild) {
-			for (auto& operation: _block->operations)
-				if (auto* functionCall = std::get_if<CFG::FunctionCall>(&operation.operation))
-					calls.emplace_back(functionCall);
-			std::visit(util::GenericVisitor{
-				[&](CFG::BasicBlock::MainExit const&) {},
-				[&](CFG::BasicBlock::Jump const& _jump)
-				{
-					_addChild(_jump.target);
-				},
-				[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-				{
-					_addChild(_conditionalJump.zero);
-					_addChild(_conditionalJump.nonZero);
-				},
-				[&](CFG::BasicBlock::FunctionReturn const&) {},
-				[&](CFG::BasicBlock::Terminated const&)	{},
-			}, _block->exit);
-		});
-		return calls;
-	};
-	for (auto& functionInfo: _cfg.functionInfo | ranges::views::values)
-		for (CFG::FunctionCall* call: findCalls(functionInfo.entry))
-		{
-			util::BreadthFirstSearch<CFG::FunctionCall*> breadthFirstSearch{{call}};
-			breadthFirstSearch.run([&](CFG::FunctionCall* _call, auto _addChild) {
-				auto& calledFunctionInfo = _cfg.functionInfo.at(&_call->function.get());
-				if (&calledFunctionInfo == &functionInfo)
-				{
-					call->recursive = true;
-					breadthFirstSearch.abort();
-					return;
-				}
-				for (CFG::FunctionCall* nestedCall: findCalls(_cfg.functionInfo.at(&_call->function.get()).entry))
-					_addChild(nestedCall);
-			});
-		}
-}
-
-/// Marks each cut-vertex in the CFG, i.e. each block that begins a disconnected sub-graph of the CFG.
-/// Entering such a block means that control flow will never return to a previously visited block.
-void markStartsOfSubGraphs(CFG& _cfg)
-{
-	std::vector<CFG::BasicBlock*> entries;
-	entries.emplace_back(_cfg.entry);
-	for (auto&& functionInfo: _cfg.functionInfo | ranges::views::values)
-		entries.emplace_back(functionInfo.entry);
-	for (auto& entry: entries)
-	{
-		/**
-		 * Detect bridges following Algorithm 1 in https://arxiv.org/pdf/2108.07346.pdf
-		 * and mark the bridge targets as starts of sub-graphs.
-		 */
-		std::set<CFG::BasicBlock*> visited;
-		std::map<CFG::BasicBlock*, size_t> disc;
-		std::map<CFG::BasicBlock*, size_t> low;
-		std::map<CFG::BasicBlock*, CFG::BasicBlock*> parent;
-		size_t time = 0;
-		auto dfs = [&](CFG::BasicBlock* _u, auto _recurse) -> void {
-			visited.insert(_u);
-			disc[_u] = low[_u] = time;
-			time++;
-
-			std::vector<CFG::BasicBlock*> children = _u->entries;
-			visit(util::GenericVisitor{
-				[&](CFG::BasicBlock::Jump const& _jump) {
-					children.emplace_back(_jump.target);
-				},
-				[&](CFG::BasicBlock::ConditionalJump const& _jump) {
-					children.emplace_back(_jump.zero);
-					children.emplace_back(_jump.nonZero);
-				},
-				[&](CFG::BasicBlock::FunctionReturn const&) {},
-				[&](CFG::BasicBlock::Terminated const&) { _u->isStartOfSubGraph = true; },
-				[&](CFG::BasicBlock::MainExit const&) { _u->isStartOfSubGraph = true; }
-			}, _u->exit);
-			yulAssert(!util::contains(children, _u));
-
-			for (CFG::BasicBlock* v: children)
-				if (!visited.count(v))
-				{
-					parent[v] = _u;
-					_recurse(v, _recurse);
-					low[_u] = std::min(low[_u], low[v]);
-					if (low[v] > disc[_u])
-					{
-						// _u <-> v is a cut edge in the undirected graph
-						bool edgeVtoU = util::contains(_u->entries, v);
-						bool edgeUtoV = util::contains(v->entries, _u);
-						if (edgeVtoU && !edgeUtoV)
-							// Cut edge v -> _u
-							_u->isStartOfSubGraph = true;
-						else if (edgeUtoV && !edgeVtoU)
-							// Cut edge _u -> v
-							v->isStartOfSubGraph = true;
-					}
-				}
-				else if (v != parent[_u])
-					low[_u] = std::min(low[_u], disc[v]);
-		};
-		dfs(entry, dfs);
-	}
-}
-
-/// Marks each block that needs to maintain a clean stack. That is each block that has an outgoing
-/// path to a function return.
-void markNeedsCleanStack(CFG& _cfg)
-{
-	for (auto& functionInfo: _cfg.functionInfo | ranges::views::values)
-		for (CFG::BasicBlock* exit: functionInfo.exits)
-			util::BreadthFirstSearch<CFG::BasicBlock*>{{exit}}.run([&](CFG::BasicBlock* _block, auto _addChild) {
-				_block->needsCleanStack = true;
-				for (CFG::BasicBlock* entry: _block->entries)
-					_addChild(entry);
-			});
-}
-}
-
-std::unique_ptr<CFG> ControlFlowGraphBuilder::build(
-	AsmAnalysisInfo const& _analysisInfo,
-	Dialect const& _dialect,
-	Block const& _block
-)
-{
-	auto result = std::make_unique<CFG>();
-	result->entry = &result->makeBlock(debugDataOf(_block));
-
-	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
-	ControlFlowGraphBuilder builder(*result, _analysisInfo, sideEffects.functionSideEffects(), _dialect);
-	builder.m_currentBlock = result->entry;
-	builder(_block);
-
-	cleanUnreachable(*result);
-	markRecursiveCalls(*result);
-	markStartsOfSubGraphs(*result);
-	markNeedsCleanStack(*result);
-
-	// TODO: It might be worthwhile to run some further simplifications on the graph itself here.
-	// E.g. if there is a jump to a node that has the jumping node as its only entry, the nodes can be fused, etc.
-
-	return result;
-}
-
-ControlFlowGraphBuilder::ControlFlowGraphBuilder(
-	CFG& _graph,
-	AsmAnalysisInfo const& _analysisInfo,
-	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
-	Dialect const& _dialect
-):
-	m_graph(_graph),
-	m_info(_analysisInfo),
-	m_functionSideEffects(_functionSideEffects),
-	m_dialect(_dialect)
-{
-}
-
-StackSlot ControlFlowGraphBuilder::operator()(Literal const& _literal)
-{
-	return LiteralSlot{valueOfLiteral(_literal), _literal.debugData};
-}
-
-StackSlot ControlFlowGraphBuilder::operator()(Identifier const& _identifier)
-{
-	return VariableSlot{lookupVariable(_identifier.name), _identifier.debugData};
-}
-
-StackSlot ControlFlowGraphBuilder::operator()(Expression const& _expression)
-{
-	return std::visit(*this, _expression);
-}
-
-StackSlot ControlFlowGraphBuilder::operator()(FunctionCall const& _call)
-{
-	Stack const& output = visitFunctionCall(_call);
-	yulAssert(output.size() == 1, "");
-	return output.front();
-}
-
-void ControlFlowGraphBuilder::operator()(VariableDeclaration const& _varDecl)
-{
-	yulAssert(m_currentBlock, "");
-	auto declaredVariables = _varDecl.variables | ranges::views::transform([&](TypedName const& _var) {
-		return VariableSlot{lookupVariable(_var.name), _var.debugData};
-	}) | ranges::to<std::vector<VariableSlot>>;
-	Stack input;
-	if (_varDecl.value)
-		input = visitAssignmentRightHandSide(*_varDecl.value, declaredVariables.size());
-	else
-		input = Stack(_varDecl.variables.size(), LiteralSlot{0, _varDecl.debugData});
-	m_currentBlock->operations.emplace_back(CFG::Operation{
-		std::move(input),
-		declaredVariables | ranges::to<Stack>,
-		CFG::Assignment{_varDecl.debugData, declaredVariables}
-	});
-}
-void ControlFlowGraphBuilder::operator()(Assignment const& _assignment)
-{
-	auto assignedVariables = _assignment.variableNames | ranges::views::transform([&](Identifier const& _var) {
-		return VariableSlot{lookupVariable(_var.name), _var.debugData};
-	}) | ranges::to<std::vector<VariableSlot>>;
-
-	Stack input = visitAssignmentRightHandSide(*_assignment.value, assignedVariables.size());
-	yulAssert(m_currentBlock);
-	m_currentBlock->operations.emplace_back(CFG::Operation{
-		std::move(input),
-		// output
-		assignedVariables | ranges::to<Stack>,
-		// operation
-		CFG::Assignment{_assignment.debugData, assignedVariables}
-	});
-}
-void ControlFlowGraphBuilder::operator()(ExpressionStatement const& _exprStmt)
-{
-	std::visit(util::GenericVisitor{
-		[&](FunctionCall const& _call) {
-			Stack const& output = visitFunctionCall(_call);
-			yulAssert(output.empty(), "");
-		},
-		[&](auto const&) { yulAssert(false, ""); }
-	}, _exprStmt.expression);
-}
-
-void ControlFlowGraphBuilder::operator()(Block const& _block)
-{
-	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
-	for (auto const& statement: _block.statements)
-		if (auto const* function = std::get_if<FunctionDefinition>(&statement))
-			registerFunction(*function);
-	for (auto const& statement: _block.statements)
-		std::visit(*this, statement);
-}
-
-void ControlFlowGraphBuilder::operator()(If const& _if)
-{
-	auto& ifBranch = m_graph.makeBlock(debugDataOf(_if.body));
-	auto& afterIf = m_graph.makeBlock(debugDataOf(*m_currentBlock));
-	StackSlot condition = std::visit(*this, *_if.condition);
-	makeConditionalJump(debugDataOf(_if), std::move(condition), ifBranch, afterIf);
-	m_currentBlock = &ifBranch;
-	(*this)(_if.body);
-	jump(debugDataOf(_if.body), afterIf);
-}
-
-void ControlFlowGraphBuilder::operator()(Switch const& _switch)
-{
-	yulAssert(m_currentBlock, "");
-	std::shared_ptr<DebugData const> preSwitchDebugData = debugDataOf(_switch);
-
-	auto ghostVariableId = m_graph.ghostVariables.size();
-	YulString ghostVariableName("GHOST[" + std::to_string(ghostVariableId) + "]");
-	auto& ghostVar = m_graph.ghostVariables.emplace_back(Scope::Variable{""_yulstring, ghostVariableName});
-
-	// Artificially generate:
-	// let <ghostVariable> := <switchExpression>
-	VariableSlot ghostVarSlot{ghostVar, debugDataOf(*_switch.expression)};
-	StackSlot expression = std::visit(*this, *_switch.expression);
-	m_currentBlock->operations.emplace_back(CFG::Operation{
-		Stack{std::move(expression)},
-		Stack{ghostVarSlot},
-		CFG::Assignment{_switch.debugData, {ghostVarSlot}}
-	});
-
-	BuiltinFunction const* equalityBuiltin = m_dialect.equalityFunction({});
-	yulAssert(equalityBuiltin, "");
-
-	// Artificially generate:
-	// eq(<literal>, <ghostVariable>)
-	auto makeValueCompare = [&](Case const& _case) {
-		yul::FunctionCall const& ghostCall = m_graph.ghostCalls.emplace_back(yul::FunctionCall{
-			debugDataOf(_case),
-			yul::Identifier{{}, "eq"_yulstring},
-			{*_case.value, Identifier{{}, ghostVariableName}}
-		});
-		CFG::Operation& operation = m_currentBlock->operations.emplace_back(CFG::Operation{
-			Stack{ghostVarSlot, LiteralSlot{valueOfLiteral(*_case.value), debugDataOf(*_case.value)}},
-			Stack{TemporarySlot{ghostCall, 0}},
-			CFG::BuiltinCall{debugDataOf(_case), *equalityBuiltin, ghostCall, 2},
-		});
-		return operation.output.front();
-	};
-	CFG::BasicBlock& afterSwitch = m_graph.makeBlock(preSwitchDebugData);
-	yulAssert(!_switch.cases.empty(), "");
-	for (auto const& switchCase: _switch.cases | ranges::views::drop_last(1))
-	{
-		yulAssert(switchCase.value, "");
-		auto& caseBranch = m_graph.makeBlock(debugDataOf(switchCase.body));
-		auto& elseBranch = m_graph.makeBlock(debugDataOf(_switch));
-		makeConditionalJump(debugDataOf(switchCase), makeValueCompare(switchCase), caseBranch, elseBranch);
-		m_currentBlock = &caseBranch;
-		(*this)(switchCase.body);
-		jump(debugDataOf(switchCase.body), afterSwitch);
-		m_currentBlock = &elseBranch;
-	}
-	Case const& switchCase = _switch.cases.back();
-	if (switchCase.value)
-	{
-		CFG::BasicBlock& caseBranch = m_graph.makeBlock(debugDataOf(switchCase.body));
-		makeConditionalJump(debugDataOf(switchCase), makeValueCompare(switchCase), caseBranch, afterSwitch);
-		m_currentBlock = &caseBranch;
-	}
-	(*this)(switchCase.body);
-	jump(debugDataOf(switchCase.body), afterSwitch);
-}
-
-void ControlFlowGraphBuilder::operator()(ForLoop const& _loop)
-{
-	std::shared_ptr<DebugData const> preLoopDebugData = debugDataOf(_loop);
-	ScopedSaveAndRestore scopeRestore(m_scope, m_info.scopes.at(&_loop.pre).get());
-	(*this)(_loop.pre);
-
-	std::optional<bool> constantCondition;
-	if (auto const* literalCondition = std::get_if<yul::Literal>(_loop.condition.get()))
-		constantCondition = valueOfLiteral(*literalCondition) != 0;
-
-	CFG::BasicBlock& loopCondition = m_graph.makeBlock(debugDataOf(*_loop.condition));
-	CFG::BasicBlock& loopBody = m_graph.makeBlock(debugDataOf(_loop.body));
-	CFG::BasicBlock& post = m_graph.makeBlock(debugDataOf(_loop.post));
-	CFG::BasicBlock& afterLoop = m_graph.makeBlock(preLoopDebugData);
-
-	ScopedSaveAndRestore scopedSaveAndRestore(m_forLoopInfo, ForLoopInfo{afterLoop, post});
-
-	if (constantCondition.has_value())
-	{
-		if (*constantCondition)
-		{
-			jump(debugDataOf(_loop.pre), loopBody);
-			(*this)(_loop.body);
-			jump(debugDataOf(_loop.body), post);
-			(*this)(_loop.post);
-			jump(debugDataOf(_loop.post), loopBody, true);
-		}
-		else
-			jump(debugDataOf(_loop.pre), afterLoop);
-	}
-	else
-	{
-		jump(debugDataOf(_loop.pre), loopCondition);
-		StackSlot condition = std::visit(*this, *_loop.condition);
-		makeConditionalJump(debugDataOf(*_loop.condition), std::move(condition), loopBody, afterLoop);
-		m_currentBlock = &loopBody;
-		(*this)(_loop.body);
-		jump(debugDataOf(_loop.body), post);
-		(*this)(_loop.post);
-		jump(debugDataOf(_loop.post), loopCondition, true);
-	}
-
-	m_currentBlock = &afterLoop;
-}
-
-void ControlFlowGraphBuilder::operator()(Break const& _break)
-{
-	yulAssert(m_forLoopInfo.has_value(), "");
-	jump(debugDataOf(_break), m_forLoopInfo->afterLoop);
-	m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
-}
-
-void ControlFlowGraphBuilder::operator()(Continue const& _continue)
-{
-	yulAssert(m_forLoopInfo.has_value(), "");
-	jump(debugDataOf(_continue), m_forLoopInfo->post);
-	m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
-}
-
-// '_leave' and '__leave' are reserved in VisualStudio
-void ControlFlowGraphBuilder::operator()(Leave const& leave_)
-{
-	yulAssert(m_currentFunction.has_value(), "");
-	m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(leave_), *m_currentFunction};
-	(*m_currentFunction)->exits.emplace_back(m_currentBlock);
-	m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
-}
-
-void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
-{
-	yulAssert(m_scope, "");
-	yulAssert(m_scope->identifiers.count(_function.name), "");
-	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
-	m_graph.functions.emplace_back(&function);
-
-	CFG::FunctionInfo& functionInfo = m_graph.functionInfo.at(&function);
-
-	ControlFlowGraphBuilder builder{m_graph, m_info, m_functionSideEffects, m_dialect};
-	builder.m_currentFunction = &functionInfo;
-	builder.m_currentBlock = functionInfo.entry;
-	builder(_function.body);
-	functionInfo.exits.emplace_back(builder.m_currentBlock);
-	builder.m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(_function), &functionInfo};
-}
-
-void ControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _functionDefinition)
-{
-	yulAssert(m_scope, "");
-	yulAssert(m_scope->identifiers.count(_functionDefinition.name), "");
-	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
-
-	yulAssert(m_info.scopes.at(&_functionDefinition.body), "");
-	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_functionDefinition).get()).get();
-	yulAssert(virtualFunctionScope, "");
-
-	bool inserted = m_graph.functionInfo.emplace(std::make_pair(&function, CFG::FunctionInfo{
-		_functionDefinition.debugData,
-		function,
-		_functionDefinition,
-		&m_graph.makeBlock(debugDataOf(_functionDefinition.body)),
-		_functionDefinition.parameters | ranges::views::transform([&](auto const& _param) {
-			return VariableSlot{
-				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)),
-				_param.debugData
-			};
-		}) | ranges::to<std::vector>,
-		_functionDefinition.returnVariables | ranges::views::transform([&](auto const& _retVar) {
-			return VariableSlot{
-				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_retVar.name)),
-				_retVar.debugData
-			};
-		}) | ranges::to<std::vector>,
-		{},
-		m_functionSideEffects.at(&_functionDefinition).canContinue
-	})).second;
-	yulAssert(inserted);
-}
-
-Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _call)
-{
-	yulAssert(m_scope, "");
-	yulAssert(m_currentBlock, "");
-
-	Stack const* output = nullptr;
-	bool canContinue = true;
-	if (BuiltinFunction const* builtin = m_dialect.builtin(_call.functionName.name))
-	{
-		Stack inputs;
-		for (auto&& [idx, arg]: _call.arguments | ranges::views::enumerate | ranges::views::reverse)
-			if (!builtin->literalArgument(idx).has_value())
-				inputs.emplace_back(std::visit(*this, arg));
-		CFG::BuiltinCall builtinCall{_call.debugData, *builtin, _call, inputs.size()};
-		output = &m_currentBlock->operations.emplace_back(CFG::Operation{
-			// input
-			std::move(inputs),
-			// output
-			ranges::views::iota(0u, builtin->returns.size()) | ranges::views::transform([&](size_t _i) {
-				return TemporarySlot{_call, _i};
-			}) | ranges::to<Stack>,
-			// operation
-			std::move(builtinCall)
-		}).output;
-		canContinue = builtin->controlFlowSideEffects.canContinue;
-	}
-	else
-	{
-		Scope::Function const& function = lookupFunction(_call.functionName.name);
-		canContinue = m_graph.functionInfo.at(&function).canContinue;
-		Stack inputs;
-		if (canContinue)
-			inputs.emplace_back(FunctionCallReturnLabelSlot{_call});
-		for (auto const& arg: _call.arguments | ranges::views::reverse)
-			inputs.emplace_back(std::visit(*this, arg));
-		output = &m_currentBlock->operations.emplace_back(CFG::Operation{
-			// input
-			std::move(inputs),
-			// output
-			ranges::views::iota(0u, function.returns.size()) | ranges::views::transform([&](size_t _i) {
-				return TemporarySlot{_call, _i};
-			}) | ranges::to<Stack>,
-			// operation
-			CFG::FunctionCall{_call.debugData, function, _call, /* recursive */ false, canContinue}
-		}).output;
-	}
-	if (!canContinue)
-	{
-		m_currentBlock->exit = CFG::BasicBlock::Terminated{};
-		m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
-	}
-	return *output;
-}
-
-Stack ControlFlowGraphBuilder::visitAssignmentRightHandSide(Expression const& _expression, size_t _expectedSlotCount)
-{
-	return std::visit(util::GenericVisitor{
-		[&](FunctionCall const& _call) -> Stack {
-			Stack const& output = visitFunctionCall(_call);
-			yulAssert(_expectedSlotCount == output.size(), "");
-			return output;
-		},
-		[&](auto const& _identifierOrLiteral) -> Stack {
-			yulAssert(_expectedSlotCount == 1, "");
-			return {(*this)(_identifierOrLiteral)};
-		}
-	}, _expression);
-}
-
-Scope::Function const& ControlFlowGraphBuilder::lookupFunction(YulString _name) const
-{
-	Scope::Function const* function = nullptr;
-	yulAssert(m_scope->lookup(_name, util::GenericVisitor{
-		[](Scope::Variable&) { yulAssert(false, "Expected function name."); },
-		[&](Scope::Function& _function) { function = &_function; }
-	}), "Function name not found.");
-	yulAssert(function, "");
-	return *function;
-}
-
-Scope::Variable const& ControlFlowGraphBuilder::lookupVariable(YulString _name) const
-{
-	yulAssert(m_scope, "");
-	Scope::Variable const* var = nullptr;
-	if (m_scope->lookup(_name, util::GenericVisitor{
-		[&](Scope::Variable& _var) { var = &_var; },
-		[](Scope::Function&)
-		{
-			yulAssert(false, "Function not removed during desugaring.");
-		}
-	}))
-	{
-		yulAssert(var, "");
-		return *var;
-	};
-	yulAssert(false, "External identifier access unimplemented.");
-}
-
-void ControlFlowGraphBuilder::makeConditionalJump(
-	std::shared_ptr<DebugData const> _debugData,
-	StackSlot _condition,
-	CFG::BasicBlock& _nonZero,
-	CFG::BasicBlock& _zero
-)
-{
-	yulAssert(m_currentBlock, "");
-	m_currentBlock->exit = CFG::BasicBlock::ConditionalJump{
-		std::move(_debugData),
-		std::move(_condition),
-		&_nonZero,
-		&_zero
-	};
-	_nonZero.entries.emplace_back(m_currentBlock);
-	_zero.entries.emplace_back(m_currentBlock);
-	m_currentBlock = nullptr;
-}
-
-void ControlFlowGraphBuilder::jump(
-	std::shared_ptr<DebugData const> _debugData,
-	CFG::BasicBlock& _target,
-	bool backwards
-)
-{
-	yulAssert(m_currentBlock, "");
-	m_currentBlock->exit = CFG::BasicBlock::Jump{std::move(_debugData), &_target, backwards};
-	_target.entries.emplace_back(m_currentBlock);
-	m_currentBlock = &_target;
-}
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.h b/libyul/backends/evm/ControlFlowGraphBuilder.h
deleted file mode 100644
index ffe935b0dd72..000000000000
--- a/libyul/backends/evm/ControlFlowGraphBuilder.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Transformation of a Yul AST into a control flow graph.
- */
-#pragma once
-
-#include <libyul/backends/evm/ControlFlowGraph.h>
-#include <libyul/ControlFlowSideEffects.h>
-
-namespace solidity::yul
-{
-
-class ControlFlowGraphBuilder
-{
-public:
-	ControlFlowGraphBuilder(ControlFlowGraphBuilder const&) = delete;
-	ControlFlowGraphBuilder& operator=(ControlFlowGraphBuilder const&) = delete;
-	static std::unique_ptr<CFG> build(AsmAnalysisInfo const& _analysisInfo, Dialect const& _dialect, Block const& _block);
-
-	StackSlot operator()(Expression const& _literal);
-	StackSlot operator()(Literal const& _literal);
-	StackSlot operator()(Identifier const& _identifier);
-	StackSlot operator()(FunctionCall const&);
-
-	void operator()(VariableDeclaration const& _varDecl);
-	void operator()(Assignment const& _assignment);
-	void operator()(ExpressionStatement const& _statement);
-
-	void operator()(Block const& _block);
-
-	void operator()(If const& _if);
-	void operator()(Switch const& _switch);
-	void operator()(ForLoop const&);
-	void operator()(Break const&);
-	void operator()(Continue const&);
-	void operator()(Leave const&);
-	void operator()(FunctionDefinition const&);
-
-private:
-	ControlFlowGraphBuilder(
-		CFG& _graph,
-		AsmAnalysisInfo const& _analysisInfo,
-		std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
-		Dialect const& _dialect
-	);
-	void registerFunction(FunctionDefinition const& _function);
-	Stack const& visitFunctionCall(FunctionCall const&);
-	Stack visitAssignmentRightHandSide(Expression const& _expression, size_t _expectedSlotCount);
-
-	Scope::Function const& lookupFunction(YulString _name) const;
-	Scope::Variable const& lookupVariable(YulString _name) const;
-	/// Resets m_currentBlock to enforce a subsequent explicit reassignment.
-	void makeConditionalJump(
-		std::shared_ptr<DebugData const> _debugData,
-		StackSlot _condition,
-		CFG::BasicBlock& _nonZero,
-		CFG::BasicBlock& _zero
-	);
-	void jump(
-		std::shared_ptr<DebugData const> _debugData,
-		CFG::BasicBlock& _target,
-		bool _backwards = false
-	);
-	CFG& m_graph;
-	AsmAnalysisInfo const& m_info;
-	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& m_functionSideEffects;
-	Dialect const& m_dialect;
-	CFG::BasicBlock* m_currentBlock = nullptr;
-	Scope* m_scope = nullptr;
-	struct ForLoopInfo
-	{
-		std::reference_wrapper<CFG::BasicBlock> afterLoop;
-		std::reference_wrapper<CFG::BasicBlock> post;
-	};
-	std::optional<ForLoopInfo> m_forLoopInfo;
-	std::optional<CFG::FunctionInfo*> m_currentFunction;
-};
-
-}
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
deleted file mode 100644
index 50e48f7681f7..000000000000
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Code generator for translating Yul / inline assembly to EVM.
- */
-
-#include <libyul/backends/evm/EVMCodeTransform.h>
-
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/Visitor.h>
-#include <libsolutil/StackTooDeepString.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <range/v3/view/reverse.hpp>
-
-#include <range/v3/algorithm/max.hpp>
-#include <range/v3/algorithm/none_of.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <utility>
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-CodeTransform::CodeTransform(
-	AbstractAssembly& _assembly,
-	AsmAnalysisInfo& _analysisInfo,
-	Block const& _block,
-	bool _allowStackOpt,
-	EVMDialect const& _dialect,
-	BuiltinContext& _builtinContext,
-	ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
-	UseNamedLabels _useNamedLabelsForFunctions,
-	std::shared_ptr<Context> _context,
-	std::vector<TypedName> _delayedReturnVariables,
-	std::optional<AbstractAssembly::LabelID> _functionExitLabel
-):
-	m_assembly(_assembly),
-	m_info(_analysisInfo),
-	m_dialect(_dialect),
-	m_builtinContext(_builtinContext),
-	m_allowStackOpt(_allowStackOpt),
-	m_useNamedLabelsForFunctions(_useNamedLabelsForFunctions),
-	m_identifierAccessCodeGen(std::move(_identifierAccessCodeGen)),
-	m_context(std::move(_context)),
-	m_delayedReturnVariables(std::move(_delayedReturnVariables)),
-	m_functionExitLabel(_functionExitLabel)
-{
-	if (!m_context)
-	{
-		// initialize
-		m_context = std::make_shared<Context>();
-		if (m_allowStackOpt)
-			m_context->variableReferences = VariableReferenceCounter::run(m_info, _block);
-	}
-}
-
-void CodeTransform::decreaseReference(YulString, Scope::Variable const& _var)
-{
-	if (!m_allowStackOpt)
-		return;
-
-	unsigned& ref = m_context->variableReferences.at(&_var);
-	yulAssert(ref >= 1, "");
-	--ref;
-	if (ref == 0)
-		m_variablesScheduledForDeletion.insert(&_var);
-}
-
-bool CodeTransform::unreferenced(Scope::Variable const& _var) const
-{
-	return !m_context->variableReferences.count(&_var) || m_context->variableReferences[&_var] == 0;
-}
-
-void CodeTransform::freeUnusedVariables(bool _popUnusedSlotsAtStackTop)
-{
-	if (!m_allowStackOpt)
-		return;
-
-	for (auto const& identifier: m_scope->identifiers)
-		if (Scope::Variable const* var = std::get_if<Scope::Variable>(&identifier.second))
-			if (m_variablesScheduledForDeletion.count(var))
-				deleteVariable(*var);
-	// Directly in a function body block, we can also delete the function arguments,
-	// which live in the virtual function scope.
-	// However, doing so after the return variables are already allocated, seems to have an adverse
-	// effect, so we only do it before that.
-	if (!returnVariablesAndFunctionExitAreSetup() && !m_scope->functionScope && m_scope->superScope && m_scope->superScope->functionScope)
-		for (auto const& identifier: m_scope->superScope->identifiers)
-			if (Scope::Variable const* var = std::get_if<Scope::Variable>(&identifier.second))
-				if (m_variablesScheduledForDeletion.count(var))
-					deleteVariable(*var);
-
-	if (_popUnusedSlotsAtStackTop)
-		while (m_unusedStackSlots.count(m_assembly.stackHeight() - 1))
-		{
-			yulAssert(m_unusedStackSlots.erase(m_assembly.stackHeight() - 1), "");
-			m_assembly.appendInstruction(evmasm::Instruction::POP);
-		}
-}
-
-void CodeTransform::deleteVariable(Scope::Variable const& _var)
-{
-	yulAssert(m_allowStackOpt, "");
-	yulAssert(m_context->variableStackHeights.count(&_var) > 0, "");
-	m_unusedStackSlots.insert(static_cast<int>(m_context->variableStackHeights[&_var]));
-	m_context->variableStackHeights.erase(&_var);
-	m_context->variableReferences.erase(&_var);
-	m_variablesScheduledForDeletion.erase(&_var);
-}
-
-void CodeTransform::operator()(VariableDeclaration const& _varDecl)
-{
-	yulAssert(m_scope, "");
-
-	size_t const numVariables = _varDecl.variables.size();
-	auto heightAtStart = static_cast<size_t>(m_assembly.stackHeight());
-	if (_varDecl.value)
-	{
-		std::visit(*this, *_varDecl.value);
-		expectDeposit(static_cast<int>(numVariables), static_cast<int>(heightAtStart));
-		freeUnusedVariables(false);
-	}
-	else
-	{
-		m_assembly.setSourceLocation(originLocationOf(_varDecl));
-		size_t variablesLeft = numVariables;
-		while (variablesLeft--)
-			m_assembly.appendConstant(u256(0));
-	}
-
-	m_assembly.setSourceLocation(originLocationOf(_varDecl));
-	bool atTopOfStack = true;
-	for (size_t varIndex = 0; varIndex < numVariables; ++varIndex)
-	{
-		size_t varIndexReverse = numVariables - 1 - varIndex;
-		YulString varName = _varDecl.variables[varIndexReverse].name;
-		auto& var = std::get<Scope::Variable>(m_scope->identifiers.at(varName));
-		m_context->variableStackHeights[&var] = heightAtStart + varIndexReverse;
-		if (!m_allowStackOpt)
-			continue;
-
-		if (unreferenced(var))
-		{
-			if (atTopOfStack)
-			{
-				m_context->variableStackHeights.erase(&var);
-				m_assembly.appendInstruction(evmasm::Instruction::POP);
-			}
-			else
-				m_variablesScheduledForDeletion.insert(&var);
-		}
-		else
-		{
-			bool foundUnusedSlot = false;
-			for (auto it = m_unusedStackSlots.begin(); it != m_unusedStackSlots.end(); ++it)
-			{
-				if (m_assembly.stackHeight() - *it > 17)
-					continue;
-				foundUnusedSlot = true;
-				auto slot = static_cast<size_t>(*it);
-				m_unusedStackSlots.erase(it);
-				m_context->variableStackHeights[&var] = slot;
-				if (size_t heightDiff = variableHeightDiff(var, varName, true))
-					m_assembly.appendInstruction(evmasm::swapInstruction(static_cast<unsigned>(heightDiff - 1)));
-				m_assembly.appendInstruction(evmasm::Instruction::POP);
-				break;
-			}
-			if (!foundUnusedSlot)
-				atTopOfStack = false;
-		}
-	}
-}
-
-void CodeTransform::stackError(StackTooDeepError _error, int _targetStackHeight)
-{
-	m_assembly.appendInstruction(evmasm::Instruction::INVALID);
-	// Correct the stack.
-	while (m_assembly.stackHeight() > _targetStackHeight)
-		m_assembly.appendInstruction(evmasm::Instruction::POP);
-	while (m_assembly.stackHeight() < _targetStackHeight)
-		m_assembly.appendConstant(u256(0));
-	// Store error.
-	m_stackErrors.emplace_back(std::move(_error));
-	m_assembly.markAsInvalid();
-}
-
-void CodeTransform::operator()(Assignment const& _assignment)
-{
-	int height = m_assembly.stackHeight();
-	std::visit(*this, *_assignment.value);
-	expectDeposit(static_cast<int>(_assignment.variableNames.size()), height);
-
-	m_assembly.setSourceLocation(originLocationOf(_assignment));
-	generateMultiAssignment(_assignment.variableNames);
-}
-
-void CodeTransform::operator()(ExpressionStatement const& _statement)
-{
-	m_assembly.setSourceLocation(originLocationOf(_statement));
-	std::visit(*this, _statement.expression);
-}
-
-void CodeTransform::operator()(FunctionCall const& _call)
-{
-	yulAssert(m_scope, "");
-
-	m_assembly.setSourceLocation(originLocationOf(_call));
-	if (BuiltinFunctionForEVM const* builtin = m_dialect.builtin(_call.functionName.name))
-	{
-		for (auto&& [i, arg]: _call.arguments | ranges::views::enumerate | ranges::views::reverse)
-			if (!builtin->literalArgument(i))
-				visitExpression(arg);
-		m_assembly.setSourceLocation(originLocationOf(_call));
-		builtin->generateCode(_call, m_assembly, m_builtinContext);
-	}
-	else
-	{
-		AbstractAssembly::LabelID returnLabel = m_assembly.newLabelId();
-		m_assembly.appendLabelReference(returnLabel);
-
-		Scope::Function* function = nullptr;
-		yulAssert(m_scope->lookup(_call.functionName.name, GenericVisitor{
-			[](Scope::Variable&) { yulAssert(false, "Expected function name."); },
-			[&](Scope::Function& _function) { function = &_function; }
-		}), "Function name not found.");
-		yulAssert(function, "");
-		yulAssert(function->arguments.size() == _call.arguments.size(), "");
-		for (auto const& arg: _call.arguments | ranges::views::reverse)
-			visitExpression(arg);
-		m_assembly.setSourceLocation(originLocationOf(_call));
-		m_assembly.appendJumpTo(
-			functionEntryID(*function),
-			static_cast<int>(function->returns.size() - function->arguments.size()) - 1,
-			AbstractAssembly::JumpType::IntoFunction
-		);
-		m_assembly.appendLabel(returnLabel);
-	}
-}
-
-void CodeTransform::operator()(Identifier const& _identifier)
-{
-	m_assembly.setSourceLocation(originLocationOf(_identifier));
-	// First search internals, then externals.
-	yulAssert(m_scope, "");
-	if (m_scope->lookup(_identifier.name, GenericVisitor{
-		[&](Scope::Variable& _var)
-		{
-			// TODO: opportunity for optimization: Do not DUP if this is the last reference
-			// to the top most element of the stack
-			if (size_t heightDiff = variableHeightDiff(_var, _identifier.name, false))
-				m_assembly.appendInstruction(evmasm::dupInstruction(static_cast<unsigned>(heightDiff)));
-			else
-				// Store something to balance the stack
-				m_assembly.appendConstant(u256(0));
-			decreaseReference(_identifier.name, _var);
-		},
-		[](Scope::Function&)
-		{
-			yulAssert(false, "Function not removed during desugaring.");
-		}
-	}))
-	{
-		return;
-	}
-	yulAssert(
-		m_identifierAccessCodeGen,
-		"Identifier not found and no external access available."
-	);
-	m_identifierAccessCodeGen(_identifier, IdentifierContext::RValue, m_assembly);
-}
-
-void CodeTransform::operator()(Literal const& _literal)
-{
-	m_assembly.setSourceLocation(originLocationOf(_literal));
-	m_assembly.appendConstant(valueOfLiteral(_literal));
-}
-
-void CodeTransform::operator()(If const& _if)
-{
-	visitExpression(*_if.condition);
-	m_assembly.setSourceLocation(originLocationOf(_if));
-	m_assembly.appendInstruction(evmasm::Instruction::ISZERO);
-	AbstractAssembly::LabelID end = m_assembly.newLabelId();
-	m_assembly.appendJumpToIf(end);
-	(*this)(_if.body);
-	m_assembly.setSourceLocation(originLocationOf(_if));
-	m_assembly.appendLabel(end);
-}
-
-void CodeTransform::operator()(Switch const& _switch)
-{
-	visitExpression(*_switch.expression);
-	int expressionHeight = m_assembly.stackHeight();
-	std::map<Case const*, AbstractAssembly::LabelID> caseBodies;
-	AbstractAssembly::LabelID end = m_assembly.newLabelId();
-	for (Case const& c: _switch.cases)
-	{
-		if (c.value)
-		{
-			(*this)(*c.value);
-			m_assembly.setSourceLocation(originLocationOf(c));
-			AbstractAssembly::LabelID bodyLabel = m_assembly.newLabelId();
-			caseBodies[&c] = bodyLabel;
-			yulAssert(m_assembly.stackHeight() == expressionHeight + 1, "");
-			m_assembly.appendInstruction(evmasm::dupInstruction(2));
-			m_assembly.appendInstruction(evmasm::Instruction::EQ);
-			m_assembly.appendJumpToIf(bodyLabel);
-		}
-		else
-			// default case
-			(*this)(c.body);
-	}
-	m_assembly.setSourceLocation(originLocationOf(_switch));
-	m_assembly.appendJumpTo(end);
-
-	size_t numCases = caseBodies.size();
-	for (auto const& c: caseBodies)
-	{
-		m_assembly.setSourceLocation(originLocationOf(*c.first));
-		m_assembly.appendLabel(c.second);
-		(*this)(c.first->body);
-		// Avoid useless "jump to next" for the last case.
-		if (--numCases > 0)
-		{
-			m_assembly.setSourceLocation(originLocationOf(*c.first));
-			m_assembly.appendJumpTo(end);
-		}
-	}
-
-	m_assembly.setSourceLocation(originLocationOf(_switch));
-	m_assembly.appendLabel(end);
-	m_assembly.appendInstruction(evmasm::Instruction::POP);
-}
-
-void CodeTransform::operator()(FunctionDefinition const& _function)
-{
-	yulAssert(m_scope, "");
-	yulAssert(m_scope->identifiers.count(_function.name), "");
-	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
-
-	size_t height = 1;
-	yulAssert(m_info.scopes.at(&_function.body), "");
-	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get();
-	yulAssert(virtualFunctionScope, "");
-	for (auto const& v: _function.parameters | ranges::views::reverse)
-	{
-		auto& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(v.name));
-		m_context->variableStackHeights[&var] = height++;
-	}
-
-	m_assembly.setSourceLocation(originLocationOf(_function));
-	int const stackHeightBefore = m_assembly.stackHeight();
-
-	m_assembly.appendLabel(functionEntryID(function));
-
-	m_assembly.setStackHeight(static_cast<int>(height));
-
-	CodeTransform subTransform(
-		m_assembly,
-		m_info,
-		_function.body,
-		m_allowStackOpt,
-		m_dialect,
-		m_builtinContext,
-		m_identifierAccessCodeGen,
-		m_useNamedLabelsForFunctions,
-		m_context,
-		_function.returnVariables,
-		m_assembly.newLabelId()
-	);
-	subTransform.m_scope = virtualFunctionScope;
-
-	if (m_allowStackOpt)
-		// Immediately delete entirely unused parameters.
-		for (auto const& v: _function.parameters | ranges::views::reverse)
-		{
-			auto& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(v.name));
-			if (util::valueOrDefault(m_context->variableReferences, &var, 0u) == 0)
-				subTransform.deleteVariable(var);
-		}
-
-	if (!m_allowStackOpt)
-		subTransform.setupReturnVariablesAndFunctionExit();
-
-	subTransform.m_assignedNamedLabels = std::move(m_assignedNamedLabels);
-
-	subTransform(_function.body);
-
-	m_assignedNamedLabels = std::move(subTransform.m_assignedNamedLabels);
-
-	m_assembly.setSourceLocation(originLocationOf(_function));
-	if (!subTransform.m_stackErrors.empty())
-	{
-		m_assembly.markAsInvalid();
-		for (StackTooDeepError& stackError: subTransform.m_stackErrors)
-		{
-			if (stackError.functionName.empty())
-				stackError.functionName = _function.name;
-			m_stackErrors.emplace_back(std::move(stackError));
-		}
-	}
-
-	if (!subTransform.returnVariablesAndFunctionExitAreSetup())
-		subTransform.setupReturnVariablesAndFunctionExit();
-	appendPopUntil(*subTransform.m_functionExitStackHeight);
-
-	yulAssert(
-		subTransform.m_functionExitStackHeight &&
-		*subTransform.m_functionExitStackHeight == m_assembly.stackHeight(),
-		""
-	);
-
-	m_assembly.appendLabel(*subTransform.m_functionExitLabel);
-
-	{
-		// The stack layout here is:
-		// <return label>? <arguments...> <return values...>
-		// But we would like it to be:
-		// <return values...> <return label>?
-		// So we have to append some SWAP and POP instructions.
-
-		// This vector holds the desired target positions of all stack slots and is
-		// modified parallel to the actual stack.
-		std::vector<int> stackLayout(static_cast<size_t>(m_assembly.stackHeight()), -1);
-		stackLayout[0] = static_cast<int>(_function.returnVariables.size()); // Move return label to the top
-		for (auto&& [n, returnVariable]: ranges::views::enumerate(_function.returnVariables))
-			stackLayout.at(m_context->variableStackHeights.at(
-				&std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(returnVariable.name))
-			)) = static_cast<int>(n);
-
-		if (stackLayout.size() > 17)
-		{
-			StackTooDeepError error(
-				_function.name,
-				YulString{},
-				static_cast<int>(stackLayout.size()) - 17,
-				"The function " +
-				_function.name.str() +
-				" has " +
-				std::to_string(stackLayout.size() - 17) +
-				" parameters or return variables too many to fit the stack size."
-			);
-			stackError(std::move(error), m_assembly.stackHeight() - static_cast<int>(_function.parameters.size()));
-		}
-		else
-		{
-			while (!stackLayout.empty() && stackLayout.back() != static_cast<int>(stackLayout.size() - 1))
-				if (stackLayout.back() < 0)
-				{
-					m_assembly.appendInstruction(evmasm::Instruction::POP);
-					stackLayout.pop_back();
-				}
-				else
-				{
-					m_assembly.appendInstruction(evmasm::swapInstruction(static_cast<unsigned>(stackLayout.size()) - static_cast<unsigned>(stackLayout.back()) - 1u));
-					std::swap(stackLayout[static_cast<size_t>(stackLayout.back())], stackLayout.back());
-				}
-			for (size_t i = 0; i < stackLayout.size(); ++i)
-				yulAssert(i == static_cast<size_t>(stackLayout[i]), "Error reshuffling stack.");
-		}
-	}
-	m_assembly.appendJump(
-		stackHeightBefore - static_cast<int>(_function.returnVariables.size()),
-		AbstractAssembly::JumpType::OutOfFunction
-	);
-	m_assembly.setStackHeight(stackHeightBefore);
-}
-
-void CodeTransform::operator()(ForLoop const& _forLoop)
-{
-	Scope* originalScope = m_scope;
-	// We start with visiting the block, but not finalizing it.
-	m_scope = m_info.scopes.at(&_forLoop.pre).get();
-	int stackStartHeight = m_assembly.stackHeight();
-
-	visitStatements(_forLoop.pre.statements);
-
-	AbstractAssembly::LabelID loopStart = m_assembly.newLabelId();
-	AbstractAssembly::LabelID postPart = m_assembly.newLabelId();
-	AbstractAssembly::LabelID loopEnd = m_assembly.newLabelId();
-
-	m_assembly.setSourceLocation(originLocationOf(_forLoop));
-	m_assembly.appendLabel(loopStart);
-
-	visitExpression(*_forLoop.condition);
-	m_assembly.setSourceLocation(originLocationOf(_forLoop));
-	m_assembly.appendInstruction(evmasm::Instruction::ISZERO);
-	m_assembly.appendJumpToIf(loopEnd);
-
-	int const stackHeightBody = m_assembly.stackHeight();
-	m_context->forLoopStack.emplace(Context::ForLoopLabels{ {postPart, stackHeightBody}, {loopEnd, stackHeightBody} });
-	(*this)(_forLoop.body);
-
-	m_assembly.setSourceLocation(originLocationOf(_forLoop));
-	m_assembly.appendLabel(postPart);
-
-	(*this)(_forLoop.post);
-
-	m_assembly.setSourceLocation(originLocationOf(_forLoop));
-	m_assembly.appendJumpTo(loopStart);
-	m_assembly.appendLabel(loopEnd);
-
-	finalizeBlock(_forLoop.pre, stackStartHeight);
-	m_context->forLoopStack.pop();
-	m_scope = originalScope;
-}
-
-int CodeTransform::appendPopUntil(int _targetDepth)
-{
-	int const stackDiffAfter = m_assembly.stackHeight() - _targetDepth;
-	for (int i = 0; i < stackDiffAfter; ++i)
-		m_assembly.appendInstruction(evmasm::Instruction::POP);
-	return stackDiffAfter;
-}
-
-void CodeTransform::operator()(Break const& _break)
-{
-	yulAssert(!m_context->forLoopStack.empty(), "Invalid break-statement. Requires surrounding for-loop in code generation.");
-	m_assembly.setSourceLocation(originLocationOf(_break));
-
-	Context::JumpInfo const& jump = m_context->forLoopStack.top().done;
-	m_assembly.appendJumpTo(jump.label, appendPopUntil(jump.targetStackHeight));
-}
-
-void CodeTransform::operator()(Continue const& _continue)
-{
-	yulAssert(!m_context->forLoopStack.empty(), "Invalid continue-statement. Requires surrounding for-loop in code generation.");
-	m_assembly.setSourceLocation(originLocationOf(_continue));
-
-	Context::JumpInfo const& jump = m_context->forLoopStack.top().post;
-	m_assembly.appendJumpTo(jump.label, appendPopUntil(jump.targetStackHeight));
-}
-
-void CodeTransform::operator()(Leave const& _leaveStatement)
-{
-	yulAssert(m_functionExitLabel, "Invalid leave-statement. Requires surrounding function in code generation.");
-	yulAssert(m_functionExitStackHeight, "");
-	m_assembly.setSourceLocation(originLocationOf(_leaveStatement));
-	m_assembly.appendJumpTo(*m_functionExitLabel, appendPopUntil(*m_functionExitStackHeight));
-}
-
-void CodeTransform::operator()(Block const& _block)
-{
-	Scope* originalScope = m_scope;
-	m_scope = m_info.scopes.at(&_block).get();
-
-	for (auto const& statement: _block.statements)
-		if (auto function = std::get_if<FunctionDefinition>(&statement))
-			createFunctionEntryID(*function);
-
-	int blockStartStackHeight = m_assembly.stackHeight();
-	visitStatements(_block.statements);
-
-	bool isOutermostFunctionBodyBlock = m_scope && m_scope->superScope && m_scope->superScope->functionScope;
-	bool performValidation = !m_allowStackOpt || !isOutermostFunctionBodyBlock;
-	finalizeBlock(_block, performValidation ? std::make_optional(blockStartStackHeight) : std::nullopt);
-	m_scope = originalScope;
-}
-
-void CodeTransform::createFunctionEntryID(FunctionDefinition const& _function)
-{
-	Scope::Function& scopeFunction = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
-	yulAssert(!m_context->functionEntryIDs.count(&scopeFunction), "");
-
-	std::optional<size_t> astID;
-	if (_function.debugData)
-		astID = _function.debugData->astID;
-
-	bool nameAlreadySeen = !m_assignedNamedLabels.insert(_function.name).second;
-
-	if (m_useNamedLabelsForFunctions == UseNamedLabels::YesAndForceUnique)
-		yulAssert(!nameAlreadySeen);
-
-	m_context->functionEntryIDs[&scopeFunction] =
-		(
-			m_useNamedLabelsForFunctions != UseNamedLabels::Never &&
-			!nameAlreadySeen
-		) ?
-		m_assembly.namedLabel(
-			_function.name.str(),
-			_function.parameters.size(),
-			_function.returnVariables.size(),
-			astID
-		) :
-		m_assembly.newLabelId();
-}
-
-AbstractAssembly::LabelID CodeTransform::functionEntryID(Scope::Function const& _scopeFunction) const
-{
-	yulAssert(m_context->functionEntryIDs.count(&_scopeFunction), "");
-	return m_context->functionEntryIDs.at(&_scopeFunction);
-}
-
-void CodeTransform::visitExpression(Expression const& _expression)
-{
-	int height = m_assembly.stackHeight();
-	std::visit(*this, _expression);
-	expectDeposit(1, height);
-}
-
-void CodeTransform::setupReturnVariablesAndFunctionExit()
-{
-	yulAssert(isInsideFunction(), "");
-	yulAssert(!returnVariablesAndFunctionExitAreSetup(), "");
-	yulAssert(m_scope, "");
-
-	ScopeGuard scopeGuard([oldScope = m_scope, this] { m_scope = oldScope; });
-	if (!m_scope->functionScope)
-	{
-		yulAssert(m_scope->superScope && m_scope->superScope->functionScope, "");
-		m_scope = m_scope->superScope;
-	}
-
-	// We could reuse unused slots for return variables, but it turns out this is detrimental in practice.
-	m_unusedStackSlots.clear();
-
-	if (m_delayedReturnVariables.empty())
-	{
-		m_functionExitStackHeight = 1;
-		return;
-	}
-
-	// Allocate slots for return variables as if they were declared as variables in the virtual function scope.
-	for (TypedName const& var: m_delayedReturnVariables)
-		(*this)(VariableDeclaration{var.debugData, {var}, {}});
-
-	m_functionExitStackHeight = ranges::max(m_delayedReturnVariables | ranges::views::transform([&](TypedName const& _name) {
-		return variableStackHeight(_name.name);
-	})) + 1;
-	m_delayedReturnVariables.clear();
-}
-
-namespace
-{
-
-bool statementNeedsReturnVariableSetup(Statement const& _statement, std::vector<TypedName> const& _returnVariables)
-{
-	if (std::holds_alternative<FunctionDefinition>(_statement))
-		return true;
-	if (
-		std::holds_alternative<ExpressionStatement>(_statement) ||
-		std::holds_alternative<Assignment>(_statement)
-	)
-	{
-		std::map<YulString, size_t> references = VariableReferencesCounter::countReferences(_statement);
-		auto isReferenced = [&references](TypedName const& _returnVariable) {
-			return references.count(_returnVariable.name);
-		};
-		if (ranges::none_of(_returnVariables, isReferenced))
-			return false;
-	}
-	return true;
-}
-
-}
-
-void CodeTransform::visitStatements(std::vector<Statement> const& _statements)
-{
-	std::optional<AbstractAssembly::LabelID> jumpTarget = std::nullopt;
-
-	for (auto const& statement: _statements)
-	{
-		freeUnusedVariables();
-		if (
-			isInsideFunction() &&
-			!returnVariablesAndFunctionExitAreSetup() &&
-			statementNeedsReturnVariableSetup(statement, m_delayedReturnVariables)
-		)
-			setupReturnVariablesAndFunctionExit();
-
-		auto const* functionDefinition = std::get_if<FunctionDefinition>(&statement);
-		if (functionDefinition && !jumpTarget)
-		{
-			m_assembly.setSourceLocation(originLocationOf(*functionDefinition));
-			jumpTarget = m_assembly.newLabelId();
-			m_assembly.appendJumpTo(*jumpTarget, 0);
-		}
-		else if (!functionDefinition && jumpTarget)
-		{
-			m_assembly.appendLabel(*jumpTarget);
-			jumpTarget = std::nullopt;
-		}
-
-		std::visit(*this, statement);
-	}
-	// we may have a leftover jumpTarget
-	if (jumpTarget)
-		m_assembly.appendLabel(*jumpTarget);
-
-	freeUnusedVariables();
-}
-
-void CodeTransform::finalizeBlock(Block const& _block, std::optional<int> blockStartStackHeight)
-{
-	m_assembly.setSourceLocation(originLocationOf(_block));
-
-	freeUnusedVariables();
-
-	// pop variables
-	yulAssert(m_info.scopes.at(&_block).get() == m_scope, "");
-	for (auto const& id: m_scope->identifiers)
-		if (std::holds_alternative<Scope::Variable>(id.second))
-		{
-			Scope::Variable const& var = std::get<Scope::Variable>(id.second);
-			if (m_allowStackOpt)
-			{
-				yulAssert(!m_context->variableStackHeights.count(&var), "");
-				yulAssert(!m_context->variableReferences.count(&var), "");
-			}
-			else
-				m_assembly.appendInstruction(evmasm::Instruction::POP);
-		}
-
-	if (blockStartStackHeight)
-	{
-		int deposit = m_assembly.stackHeight() - *blockStartStackHeight;
-		yulAssert(deposit == 0, "Invalid stack height at end of block: " + std::to_string(deposit));
-	}
-}
-
-void CodeTransform::generateMultiAssignment(std::vector<Identifier> const& _variableNames)
-{
-	yulAssert(m_scope, "");
-	for (auto const& variableName: _variableNames | ranges::views::reverse)
-		generateAssignment(variableName);
-}
-
-void CodeTransform::generateAssignment(Identifier const& _variableName)
-{
-	yulAssert(m_scope, "");
-	if (auto var = m_scope->lookup(_variableName.name))
-	{
-		Scope::Variable const& _var = std::get<Scope::Variable>(*var);
-		if (size_t heightDiff = variableHeightDiff(_var, _variableName.name, true))
-			m_assembly.appendInstruction(evmasm::swapInstruction(static_cast<unsigned>(heightDiff - 1)));
-		m_assembly.appendInstruction(evmasm::Instruction::POP);
-		decreaseReference(_variableName.name, _var);
-	}
-	else
-	{
-		yulAssert(
-			m_identifierAccessCodeGen,
-			"Identifier not found and no external access available."
-		);
-		m_identifierAccessCodeGen(_variableName, IdentifierContext::LValue, m_assembly);
-	}
-}
-
-size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString _varName, bool _forSwap)
-{
-	yulAssert(m_context->variableStackHeights.count(&_var), "");
-	size_t heightDiff = static_cast<size_t>(m_assembly.stackHeight()) - m_context->variableStackHeights[&_var];
-	yulAssert(heightDiff > (_forSwap ? 1 : 0), "Negative stack difference for variable.");
-	size_t limit = _forSwap ? 17 : 16;
-	if (heightDiff > limit)
-	{
-		m_stackErrors.emplace_back(
-			_varName,
-			heightDiff - limit,
-			"Variable " +
-			_varName.str() +
-			" is " +
-			std::to_string(heightDiff - limit) +
-			" slot(s) too deep inside the stack. " +
-			stackTooDeepString
-		);
-		m_assembly.markAsInvalid();
-		return _forSwap ? 2 : 1;
-	}
-	return heightDiff;
-}
-
-int CodeTransform::variableStackHeight(YulString _name) const
-{
-	Scope::Variable const* var = std::get_if<Scope::Variable>(m_scope->lookup(_name));
-	yulAssert(var, "");
-	return static_cast<int>(m_context->variableStackHeights.at(var));
-}
-
-void CodeTransform::expectDeposit(int _deposit, int _oldHeight) const
-{
-	yulAssert(m_assembly.stackHeight() == _oldHeight + _deposit, "Invalid stack deposit.");
-}
diff --git a/libyul/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
deleted file mode 100644
index bad9a357ff29..000000000000
--- a/libyul/backends/evm/EVMCodeTransform.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Code generator for translating Yul / inline assembly to EVM.
- */
-
-#pragma once
-
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/VariableReferenceCounter.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AST.h>
-#include <libyul/Scope.h>
-
-#include <optional>
-#include <stack>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::yul
-{
-
-struct AsmAnalysisInfo;
-
-struct CodeTransformContext
-{
-	std::map<Scope::Function const*, AbstractAssembly::LabelID> functionEntryIDs;
-	std::map<Scope::Variable const*, size_t> variableStackHeights;
-	std::map<Scope::Variable const*, unsigned> variableReferences;
-
-	struct JumpInfo
-	{
-		AbstractAssembly::LabelID label;  ///< Jump's LabelID to jump to.
-		int targetStackHeight;            ///< Stack height after the jump.
-	};
-
-	struct ForLoopLabels
-	{
-		JumpInfo post; ///< Jump info for jumping to post branch.
-		JumpInfo done; ///< Jump info for jumping to done branch.
-	};
-
-	std::stack<ForLoopLabels> forLoopStack;
-};
-
-class CodeTransform
-{
-public:
-	/// Use named labels for functions 1) Yes and check that the names are unique
-	/// 2) For none of the functions 3) for the first function of each name.
-	enum class UseNamedLabels { YesAndForceUnique, Never, ForFirstFunctionOfEachName };
-
-	/// Create the code transformer.
-	/// @param _identifierAccessCodeGen used to generate code for identifiers external to the inline assembly
-	/// As a side-effect of its construction, translates the Yul code and appends it to the
-	/// given assembly.
-	/// Throws StackTooDeepError if a variable is not accessible or if a function has too
-	/// many parameters.
-	CodeTransform(
-		AbstractAssembly& _assembly,
-		AsmAnalysisInfo& _analysisInfo,
-		Block const& _block,
-		EVMDialect const& _dialect,
-		BuiltinContext& _builtinContext,
-		bool _allowStackOpt = false,
-		ExternalIdentifierAccess::CodeGenerator const& _identifierAccessCodeGen = {},
-		UseNamedLabels _useNamedLabelsForFunctions = UseNamedLabels::Never
-	): CodeTransform(
-		_assembly,
-		_analysisInfo,
-		_block,
-		_allowStackOpt,
-		_dialect,
-		_builtinContext,
-		_identifierAccessCodeGen,
-		_useNamedLabelsForFunctions,
-		nullptr,
-		{},
-		std::nullopt
-	)
-	{
-	}
-
-	std::vector<StackTooDeepError> const& stackErrors() const { return m_stackErrors; }
-
-protected:
-	using Context = CodeTransformContext;
-
-	CodeTransform(
-		AbstractAssembly& _assembly,
-		AsmAnalysisInfo& _analysisInfo,
-		Block const& _block,
-		bool _allowStackOpt,
-		EVMDialect const& _dialect,
-		BuiltinContext& _builtinContext,
-		ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
-		UseNamedLabels _useNamedLabelsForFunctions,
-		std::shared_ptr<Context> _context,
-		std::vector<TypedName> _delayedReturnVariables,
-		std::optional<AbstractAssembly::LabelID> _functionExitLabel
-	);
-
-	void decreaseReference(YulString _name, Scope::Variable const& _var);
-	bool unreferenced(Scope::Variable const& _var) const;
-	/// Marks slots of variables that are not used anymore
-	/// and were defined in the current scope for reuse.
-	/// Also POPs unused topmost stack slots,
-	/// unless @a _popUnusedSlotsAtStackTop is set to false.
-	void freeUnusedVariables(bool _popUnusedSlotsAtStackTop = true);
-	/// Marks the stack slot of @a _var to be reused.
-	void deleteVariable(Scope::Variable const& _var);
-
-public:
-	void operator()(Literal const& _literal);
-	void operator()(Identifier const& _identifier);
-	void operator()(FunctionCall const&);
-	void operator()(ExpressionStatement const& _statement);
-	void operator()(Assignment const& _assignment);
-	void operator()(VariableDeclaration const& _varDecl);
-	void operator()(If const& _if);
-	void operator()(Switch const& _switch);
-	void operator()(FunctionDefinition const&);
-	void operator()(ForLoop const&);
-	void operator()(Break const&);
-	void operator()(Continue const&);
-	void operator()(Leave const&);
-	void operator()(Block const& _block);
-
-private:
-	AbstractAssembly::LabelID labelFromIdentifier(Identifier const& _identifier);
-	void createFunctionEntryID(FunctionDefinition const& _function);
-	AbstractAssembly::LabelID functionEntryID(Scope::Function const& _scopeFunction) const;
-	/// Generates code for an expression that is supposed to return a single value.
-	void visitExpression(Expression const& _expression);
-
-	void visitStatements(std::vector<Statement> const& _statements);
-
-	/// Pops all variables declared in the block and checks that the stack height is equal
-	/// to @a _blockStartStackHeight.
-	void finalizeBlock(Block const& _block, std::optional<int> _blockStartStackHeight);
-
-	void generateMultiAssignment(std::vector<Identifier> const& _variableNames);
-	void generateAssignment(Identifier const& _variableName);
-
-	/// Determines the stack height difference to the given variables. Throws
-	/// if it is not yet in scope or the height difference is too large. Returns
-	/// the (positive) stack height difference otherwise.
-	/// @param _forSwap if true, produces stack error if the difference is invalid for a swap
-	///                 opcode, otherwise checks for validity for a dup opcode.
-	size_t variableHeightDiff(Scope::Variable const& _var, YulString _name, bool _forSwap);
-
-	/// Determines the stack height of the given variable. Throws if the variable is not in scope.
-	int variableStackHeight(YulString _name) const;
-
-	void expectDeposit(int _deposit, int _oldHeight) const;
-
-	/// Stores the stack error in the list of errors, appends an invalid opcode
-	/// and corrects the stack height to the target stack height.
-	void stackError(StackTooDeepError _error, int _targetStackSize);
-
-	/// Ensures stack height is down to @p _targetDepth by appending POP instructions to the output assembly.
-	/// Returns the number of POP statements that have been appended.
-	int appendPopUntil(int _targetDepth);
-
-	/// Allocates stack slots for remaining delayed return values and sets the function exit stack height.
-	void setupReturnVariablesAndFunctionExit();
-	bool returnVariablesAndFunctionExitAreSetup() const
-	{
-		return m_functionExitStackHeight.has_value();
-	}
-	bool isInsideFunction() const
-	{
-		return m_functionExitLabel.has_value();
-	}
-
-	AbstractAssembly& m_assembly;
-	AsmAnalysisInfo& m_info;
-	Scope* m_scope = nullptr;
-	EVMDialect const& m_dialect;
-	BuiltinContext& m_builtinContext;
-	bool const m_allowStackOpt = true;
-	UseNamedLabels const m_useNamedLabelsForFunctions = UseNamedLabels::Never;
-	std::set<YulString> m_assignedNamedLabels;
-	ExternalIdentifierAccess::CodeGenerator m_identifierAccessCodeGen;
-	std::shared_ptr<Context> m_context;
-
-	/// Set of variables whose reference counter has reached zero,
-	/// and whose stack slot will be marked as unused once we reach
-	/// statement level in the scope where the variable was defined.
-	std::set<Scope::Variable const*> m_variablesScheduledForDeletion;
-	std::set<int> m_unusedStackSlots;
-
-	/// A list of return variables for which no stack slots have been assigned yet.
-	std::vector<TypedName> m_delayedReturnVariables;
-
-	/// Function exit label. Used as jump target for ``leave``.
-	std::optional<AbstractAssembly::LabelID> m_functionExitLabel;
-	/// The required stack height at the function exit label.
-	/// This is the minimal stack height covering all return variables. Only set after all
-	/// return variables were assigned slots.
-	std::optional<int> m_functionExitStackHeight;
-
-	std::vector<StackTooDeepError> m_stackErrors;
-};
-
-}
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
deleted file mode 100644
index 47130fd6c46d..000000000000
--- a/libyul/backends/evm/EVMDialect.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul dialects for EVM.
- */
-
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/SemanticInformation.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/StringUtils.h>
-#include <libyul/AST.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmParser.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Object.h>
-#include <libyul/Utilities.h>
-#include <libyul/backends/evm/AbstractAssembly.h>
-
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/tail.hpp>
-
-#include <regex>
-
-using namespace std::string_literals;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-namespace
-{
-
-std::pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
-	langutil::EVMVersion _evmVersion,
-	std::string const& _name,
-	evmasm::Instruction _instruction
-)
-{
-	evmasm::InstructionInfo info = evmasm::instructionInfo(_instruction, _evmVersion);
-	BuiltinFunctionForEVM f;
-	f.name = YulString{_name};
-	f.parameters.resize(static_cast<size_t>(info.args));
-	f.returns.resize(static_cast<size_t>(info.ret));
-	f.sideEffects = EVMDialect::sideEffectsOfInstruction(_instruction);
-	if (evmasm::SemanticInformation::terminatesControlFlow(_instruction))
-	{
-		f.controlFlowSideEffects.canContinue = false;
-		if (evmasm::SemanticInformation::reverts(_instruction))
-		{
-			f.controlFlowSideEffects.canTerminate = false;
-			f.controlFlowSideEffects.canRevert = true;
-		}
-		else
-		{
-			f.controlFlowSideEffects.canTerminate = true;
-			f.controlFlowSideEffects.canRevert = false;
-		}
-	}
-	f.isMSize = _instruction == evmasm::Instruction::MSIZE;
-	f.literalArguments.clear();
-	f.instruction = _instruction;
-	f.generateCode = [_instruction](
-		FunctionCall const&,
-		AbstractAssembly& _assembly,
-		BuiltinContext&
-	) {
-		_assembly.appendInstruction(_instruction);
-	};
-
-	YulString name = f.name;
-	return {name, std::move(f)};
-}
-
-std::pair<YulString, BuiltinFunctionForEVM> createFunction(
-	std::string _name,
-	size_t _params,
-	size_t _returns,
-	SideEffects _sideEffects,
-	std::vector<std::optional<LiteralKind>> _literalArguments,
-	std::function<void(FunctionCall const&, AbstractAssembly&, BuiltinContext&)> _generateCode
-)
-{
-	yulAssert(_literalArguments.size() == _params || _literalArguments.empty(), "");
-
-	YulString name{std::move(_name)};
-	BuiltinFunctionForEVM f;
-	f.name = name;
-	f.parameters.resize(_params);
-	f.returns.resize(_returns);
-	f.sideEffects = std::move(_sideEffects);
-	f.literalArguments = std::move(_literalArguments);
-	f.isMSize = false;
-	f.instruction = {};
-	f.generateCode = std::move(_generateCode);
-	return {name, f};
-}
-
-std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
-{
-	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
-	// basefee for VMs before london.
-	auto baseFeeException = [&](evmasm::Instruction _instr) -> bool
-	{
-		return _instr == evmasm::Instruction::BASEFEE && _evmVersion < langutil::EVMVersion::london();
-	};
-
-	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
-	// prevrandao for VMs before paris.
-	auto prevRandaoException = [&](std::string const& _instrName) -> bool
-	{
-		// Using string comparison as the opcode is the same as for "difficulty"
-		return _instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris();
-	};
-
-	std::set<YulString> reserved;
-	for (auto const& instr: evmasm::c_instructions)
-	{
-		std::string name = toLower(instr.first);
-		if (!baseFeeException(instr.second) && !prevRandaoException(name))
-			reserved.emplace(name);
-	}
-	reserved += std::vector<YulString>{
-		"linkersymbol"_yulstring,
-		"datasize"_yulstring,
-		"dataoffset"_yulstring,
-		"datacopy"_yulstring,
-		"setimmutable"_yulstring,
-		"loadimmutable"_yulstring,
-	};
-	return reserved;
-}
-
-std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
-{
-
-	// Exclude prevrandao as builtin for VMs before paris and difficulty for VMs after paris.
-	auto prevRandaoException = [&](std::string const& _instrName) -> bool
-	{
-		return (_instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris()) || (_instrName == "difficulty" && _evmVersion >= langutil::EVMVersion::paris());
-	};
-
-	std::map<YulString, BuiltinFunctionForEVM> builtins;
-	for (auto const& instr: evmasm::c_instructions)
-	{
-		std::string name = toLower(instr.first);
-		auto const opcode = instr.second;
-
-		if (
-			!evmasm::isDupInstruction(opcode) &&
-			!evmasm::isSwapInstruction(opcode) &&
-			!evmasm::isPushInstruction(opcode) &&
-			opcode != evmasm::Instruction::JUMP &&
-			opcode != evmasm::Instruction::JUMPI &&
-			opcode != evmasm::Instruction::JUMPDEST &&
-			_evmVersion.hasOpcode(opcode) &&
-			!prevRandaoException(name)
-		)
-			builtins.emplace(createEVMFunction(_evmVersion, name, opcode));
-	}
-
-	if (_objectAccess)
-	{
-		builtins.emplace(createFunction("linkersymbol", 1, 1, SideEffects{}, {LiteralKind::String}, [](
-			FunctionCall const& _call,
-			AbstractAssembly& _assembly,
-			BuiltinContext&
-		) {
-			yulAssert(_call.arguments.size() == 1, "");
-			Expression const& arg = _call.arguments.front();
-			_assembly.appendLinkerSymbol(std::get<Literal>(arg).value.str());
-		}));
-
-		builtins.emplace(createFunction(
-			"memoryguard",
-			1,
-			1,
-			SideEffects{},
-			{LiteralKind::Number},
-			[](
-				FunctionCall const& _call,
-				AbstractAssembly& _assembly,
-				BuiltinContext&
-			) {
-				yulAssert(_call.arguments.size() == 1, "");
-				Literal const* literal = std::get_if<Literal>(&_call.arguments.front());
-				yulAssert(literal, "");
-				_assembly.appendConstant(valueOfLiteral(*literal));
-			})
-		);
-
-		builtins.emplace(createFunction("datasize", 1, 1, SideEffects{}, {LiteralKind::String}, [](
-			FunctionCall const& _call,
-			AbstractAssembly& _assembly,
-			BuiltinContext& _context
-		) {
-			yulAssert(_context.currentObject, "No object available.");
-			yulAssert(_call.arguments.size() == 1, "");
-			Expression const& arg = _call.arguments.front();
-			YulString dataName = std::get<Literal>(arg).value;
-			if (_context.currentObject->name == dataName)
-				_assembly.appendAssemblySize();
-			else
-			{
-			std::vector<size_t> subIdPath =
-					_context.subIDs.count(dataName) == 0 ?
-						_context.currentObject->pathToSubObject(dataName) :
-						std::vector<size_t>{_context.subIDs.at(dataName)};
-				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
-				_assembly.appendDataSize(subIdPath);
-			}
-		}));
-		builtins.emplace(createFunction("dataoffset", 1, 1, SideEffects{}, {LiteralKind::String}, [](
-			FunctionCall const& _call,
-			AbstractAssembly& _assembly,
-			BuiltinContext& _context
-		) {
-			yulAssert(_context.currentObject, "No object available.");
-			yulAssert(_call.arguments.size() == 1, "");
-			Expression const& arg = _call.arguments.front();
-			YulString dataName = std::get<Literal>(arg).value;
-			if (_context.currentObject->name == dataName)
-				_assembly.appendConstant(0);
-			else
-			{
-			std::vector<size_t> subIdPath =
-					_context.subIDs.count(dataName) == 0 ?
-						_context.currentObject->pathToSubObject(dataName) :
-						std::vector<size_t>{_context.subIDs.at(dataName)};
-				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
-				_assembly.appendDataOffset(subIdPath);
-			}
-		}));
-		builtins.emplace(createFunction(
-			"datacopy",
-			3,
-			0,
-			SideEffects{false, true, false, false, true, SideEffects::None, SideEffects::None, SideEffects::Write},
-			{},
-			[](
-				FunctionCall const&,
-				AbstractAssembly& _assembly,
-				BuiltinContext&
-			) {
-				_assembly.appendInstruction(evmasm::Instruction::CODECOPY);
-			}
-		));
-		builtins.emplace(createFunction(
-			"setimmutable",
-			3,
-			0,
-			SideEffects{false, false, false, false, true, SideEffects::None, SideEffects::None, SideEffects::Write},
-			{std::nullopt, LiteralKind::String, std::nullopt},
-			[](
-				FunctionCall const& _call,
-				AbstractAssembly& _assembly,
-				BuiltinContext&
-			) {
-				yulAssert(_call.arguments.size() == 3, "");
-				YulString identifier = std::get<Literal>(_call.arguments[1]).value;
-				_assembly.appendImmutableAssignment(identifier.str());
-			}
-		));
-		builtins.emplace(createFunction(
-			"loadimmutable",
-			1,
-			1,
-			SideEffects{},
-			{LiteralKind::String},
-			[](
-				FunctionCall const& _call,
-				AbstractAssembly& _assembly,
-				BuiltinContext&
-			) {
-				yulAssert(_call.arguments.size() == 1, "");
-				_assembly.appendImmutable(std::get<Literal>(_call.arguments.front()).value.str());
-			}
-		));
-	}
-	return builtins;
-}
-
-std::regex const& verbatimPattern()
-{
-	std::regex static const pattern{"verbatim_([1-9]?[0-9])i_([1-9]?[0-9])o"};
-	return pattern;
-}
-
-}
-
-
-EVMDialect::EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess):
-	m_objectAccess(_objectAccess),
-	m_evmVersion(_evmVersion),
-	m_functions(createBuiltins(_evmVersion, _objectAccess)),
-	m_reserved(createReservedIdentifiers(_evmVersion))
-{
-}
-
-BuiltinFunctionForEVM const* EVMDialect::builtin(YulString _name) const
-{
-	if (m_objectAccess)
-	{
-		std::smatch match;
-		if (regex_match(_name.str(), match, verbatimPattern()))
-			return verbatimFunction(stoul(match[1]), stoul(match[2]));
-	}
-	auto it = m_functions.find(_name);
-	if (it != m_functions.end())
-		return &it->second;
-	else
-		return nullptr;
-}
-
-bool EVMDialect::reservedIdentifier(YulString _name) const
-{
-	if (m_objectAccess)
-		if (_name.str().substr(0, "verbatim"s.size()) == "verbatim")
-			return true;
-	return m_reserved.count(_name) != 0;
-}
-
-EVMDialect const& EVMDialect::strictAssemblyForEVM(langutil::EVMVersion _version)
-{
-	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialect const>> dialects;
-	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
-	if (!dialects[_version])
-		dialects[_version] = std::make_unique<EVMDialect>(_version, false);
-	return *dialects[_version];
-}
-
-EVMDialect const& EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion _version)
-{
-	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialect const>> dialects;
-	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
-	if (!dialects[_version])
-		dialects[_version] = std::make_unique<EVMDialect>(_version, true);
-	return *dialects[_version];
-}
-
-SideEffects EVMDialect::sideEffectsOfInstruction(evmasm::Instruction _instruction)
-{
-	auto translate = [](evmasm::SemanticInformation::Effect _e) -> SideEffects::Effect
-	{
-		return static_cast<SideEffects::Effect>(_e);
-	};
-
-	return SideEffects{
-		evmasm::SemanticInformation::movable(_instruction),
-		evmasm::SemanticInformation::movableApartFromEffects(_instruction),
-		evmasm::SemanticInformation::canBeRemoved(_instruction),
-		evmasm::SemanticInformation::canBeRemovedIfNoMSize(_instruction),
-		true, // cannotLoop
-		translate(evmasm::SemanticInformation::otherState(_instruction)),
-		translate(evmasm::SemanticInformation::storage(_instruction)),
-		translate(evmasm::SemanticInformation::memory(_instruction)),
-	};
-}
-
-BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, size_t _returnVariables) const
-{
-	std::pair<size_t, size_t> key{_arguments, _returnVariables};
-	std::shared_ptr<BuiltinFunctionForEVM const>& function = m_verbatimFunctions[key];
-	if (!function)
-	{
-		BuiltinFunctionForEVM builtinFunction = createFunction(
-			"verbatim_" + std::to_string(_arguments) + "i_" + std::to_string(_returnVariables) + "o",
-			1 + _arguments,
-			_returnVariables,
-			SideEffects::worst(),
-			std::vector<std::optional<LiteralKind>>{LiteralKind::String} + std::vector<std::optional<LiteralKind>>(_arguments),
-			[=](
-				FunctionCall const& _call,
-				AbstractAssembly& _assembly,
-				BuiltinContext&
-			) {
-				yulAssert(_call.arguments.size() == (1 + _arguments), "");
-				Expression const& bytecode = _call.arguments.front();
-
-				_assembly.appendVerbatim(
-					asBytes(std::get<Literal>(bytecode).value.str()),
-					_arguments,
-					_returnVariables
-				);
-			}
-		).second;
-		builtinFunction.isMSize = true;
-		function = std::make_shared<BuiltinFunctionForEVM const>(std::move(builtinFunction));
-	}
-	return function.get();
-}
-
-EVMDialectTyped::EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectAccess):
-	EVMDialect(_evmVersion, _objectAccess)
-{
-	defaultType = "u256"_yulstring;
-	boolType = "bool"_yulstring;
-	types = {defaultType, boolType};
-
-	// Set all types to ``defaultType``
-	for (auto& fun: m_functions)
-	{
-		for (auto& p: fun.second.parameters)
-			p = defaultType;
-		for (auto& r: fun.second.returns)
-			r = defaultType;
-	}
-
-	m_functions["lt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["gt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["slt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["sgt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["eq"_yulstring].returns = {"bool"_yulstring};
-
-	// "not" and "bitnot" replace "iszero" and "not"
-	m_functions["bitnot"_yulstring] = m_functions["not"_yulstring];
-	m_functions["bitnot"_yulstring].name = "bitnot"_yulstring;
-	m_functions["not"_yulstring] = m_functions["iszero"_yulstring];
-	m_functions["not"_yulstring].name = "not"_yulstring;
-	m_functions["not"_yulstring].returns = {"bool"_yulstring};
-	m_functions["not"_yulstring].parameters = {"bool"_yulstring};
-	m_functions.erase("iszero"_yulstring);
-
-	m_functions["bitand"_yulstring] = m_functions["and"_yulstring];
-	m_functions["bitand"_yulstring].name = "bitand"_yulstring;
-	m_functions["bitor"_yulstring] = m_functions["or"_yulstring];
-	m_functions["bitor"_yulstring].name = "bitor"_yulstring;
-	m_functions["bitxor"_yulstring] = m_functions["xor"_yulstring];
-	m_functions["bitxor"_yulstring].name = "bitxor"_yulstring;
-	m_functions["and"_yulstring].parameters = {"bool"_yulstring, "bool"_yulstring};
-	m_functions["and"_yulstring].returns = {"bool"_yulstring};
-	m_functions["or"_yulstring].parameters = {"bool"_yulstring, "bool"_yulstring};
-	m_functions["or"_yulstring].returns = {"bool"_yulstring};
-	m_functions["xor"_yulstring].parameters = {"bool"_yulstring, "bool"_yulstring};
-	m_functions["xor"_yulstring].returns = {"bool"_yulstring};
-	m_functions["popbool"_yulstring] = m_functions["pop"_yulstring];
-	m_functions["popbool"_yulstring].name = "popbool"_yulstring;
-	m_functions["popbool"_yulstring].parameters = {"bool"_yulstring};
-	m_functions.insert(createFunction("bool_to_u256", 1, 1, {}, {}, [](
-		FunctionCall const&,
-		AbstractAssembly&,
-		BuiltinContext&
-	) {}));
-	m_functions["bool_to_u256"_yulstring].parameters = {"bool"_yulstring};
-	m_functions["bool_to_u256"_yulstring].returns = {"u256"_yulstring};
-	m_functions.insert(createFunction("u256_to_bool", 1, 1, {}, {}, [](
-		FunctionCall const&,
-		AbstractAssembly& _assembly,
-		BuiltinContext&
-	) {
-		// TODO this should use a Panic.
-		// A value larger than 1 causes an invalid instruction.
-		_assembly.appendConstant(2);
-		_assembly.appendInstruction(evmasm::Instruction::DUP2);
-		_assembly.appendInstruction(evmasm::Instruction::LT);
-		AbstractAssembly::LabelID inRange = _assembly.newLabelId();
-		_assembly.appendJumpToIf(inRange);
-		_assembly.appendInstruction(evmasm::Instruction::INVALID);
-		_assembly.appendLabel(inRange);
-	}));
-	m_functions["u256_to_bool"_yulstring].parameters = {"u256"_yulstring};
-	m_functions["u256_to_bool"_yulstring].returns = {"bool"_yulstring};
-}
-
-BuiltinFunctionForEVM const* EVMDialectTyped::discardFunction(YulString _type) const
-{
-	if (_type == "bool"_yulstring)
-		return builtin("popbool"_yulstring);
-	else
-	{
-		yulAssert(_type == defaultType, "");
-		return builtin("pop"_yulstring);
-	}
-}
-
-BuiltinFunctionForEVM const* EVMDialectTyped::equalityFunction(YulString _type) const
-{
-	if (_type == "bool"_yulstring)
-		return nullptr;
-	else
-	{
-		yulAssert(_type == defaultType, "");
-		return builtin("eq"_yulstring);
-	}
-}
-
-EVMDialectTyped const& EVMDialectTyped::instance(langutil::EVMVersion _version)
-{
-	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialectTyped const>> dialects;
-	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
-	if (!dialects[_version])
-		dialects[_version] = std::make_unique<EVMDialectTyped>(_version, true);
-	return *dialects[_version];
-}
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
deleted file mode 100644
index 28649f3e5e90..000000000000
--- a/libyul/backends/evm/EVMDialect.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul dialects for EVM.
- */
-
-#pragma once
-
-#include <libyul/Dialect.h>
-
-#include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/ASTForward.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <map>
-#include <set>
-
-namespace solidity::yul
-{
-
-class YulString;
-using Type = YulString;
-struct FunctionCall;
-struct Object;
-
-/**
- * Context used during code generation.
- */
-struct BuiltinContext
-{
-	Object const* currentObject = nullptr;
-	/// Mapping from named objects to abstract assembly sub IDs.
-	std::map<YulString, AbstractAssembly::SubID> subIDs;
-};
-
-struct BuiltinFunctionForEVM: public BuiltinFunction
-{
-	std::optional<evmasm::Instruction> instruction;
-	/// Function to generate code for the given function call and append it to the abstract
-	/// assembly. Expects all non-literal arguments of the call to be on stack in reverse order
-	/// (i.e. right-most argument pushed first).
-	/// Expects the caller to set the source location.
-	std::function<void(FunctionCall const&, AbstractAssembly&, BuiltinContext&)> generateCode;
-};
-
-
-/**
- * Yul dialect for EVM as a backend.
- * The main difference is that the builtin functions take an AbstractAssembly for the
- * code generation.
- */
-struct EVMDialect: public Dialect
-{
-	/// Constructor, should only be used internally. Use the factory functions below.
-	EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess);
-
-	/// @returns the builtin function of the given name or a nullptr if it is not a builtin function.
-	BuiltinFunctionForEVM const* builtin(YulString _name) const override;
-
-	/// @returns true if the identifier is reserved. This includes the builtins too.
-	bool reservedIdentifier(YulString _name) const override;
-
-	BuiltinFunctionForEVM const* discardFunction(YulString /*_type*/) const override { return builtin("pop"_yulstring); }
-	BuiltinFunctionForEVM const* equalityFunction(YulString /*_type*/) const override { return builtin("eq"_yulstring); }
-	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("iszero"_yulstring); }
-	BuiltinFunctionForEVM const* memoryStoreFunction(YulString /*_type*/) const override { return builtin("mstore"_yulstring); }
-	BuiltinFunctionForEVM const* memoryLoadFunction(YulString /*_type*/) const override { return builtin("mload"_yulstring); }
-	BuiltinFunctionForEVM const* storageStoreFunction(YulString /*_type*/) const override { return builtin("sstore"_yulstring); }
-	BuiltinFunctionForEVM const* storageLoadFunction(YulString /*_type*/) const override { return builtin("sload"_yulstring); }
-	YulString hashFunction(YulString /*_type*/) const override { return "keccak256"_yulstring; }
-
-	static EVMDialect const& strictAssemblyForEVM(langutil::EVMVersion _version);
-	static EVMDialect const& strictAssemblyForEVMObjects(langutil::EVMVersion _version);
-
-	langutil::EVMVersion evmVersion() const { return m_evmVersion; }
-
-	bool providesObjectAccess() const { return m_objectAccess; }
-
-	static SideEffects sideEffectsOfInstruction(evmasm::Instruction _instruction);
-
-protected:
-	BuiltinFunctionForEVM const* verbatimFunction(size_t _arguments, size_t _returnVariables) const;
-
-	bool const m_objectAccess;
-	langutil::EVMVersion const m_evmVersion;
-	std::map<YulString, BuiltinFunctionForEVM> m_functions;
-	std::map<std::pair<size_t, size_t>, std::shared_ptr<BuiltinFunctionForEVM const>> mutable m_verbatimFunctions;
-	std::set<YulString> m_reserved;
-};
-
-/**
- * EVM dialect with types u256 (default) and bool.
- * Difference to EVMDialect:
- *  - All comparison functions return type bool
- *  - bitwise operations are called bitor, bitand, bitxor and bitnot
- *  - and, or, xor take bool and return bool
- *  - iszero is replaced by not, which takes bool and returns bool
- *  - there are conversion functions bool_to_u256 and u256_to_bool.
- *  - there is popbool
- */
-struct EVMDialectTyped: public EVMDialect
-{
-	/// Constructor, should only be used internally. Use the factory function below.
-	EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectAccess);
-
-	BuiltinFunctionForEVM const* discardFunction(YulString _type) const override;
-	BuiltinFunctionForEVM const* equalityFunction(YulString _type) const override;
-	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("not"_yulstring); }
-
-	static EVMDialectTyped const& instance(langutil::EVMVersion _version);
-};
-
-}
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
deleted file mode 100644
index 09c6abdd14d4..000000000000
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
-* Module providing metrics for the EVM optimizer.
-*/
-
-#include <libyul/backends/evm/EVMMetrics.h>
-
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Utilities.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/GasMeter.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-bigint GasMeter::costs(Expression const& _expression) const
-{
-	return combineCosts(GasMeterVisitor::costs(_expression, m_dialect, m_isCreation));
-}
-
-bigint GasMeter::instructionCosts(evmasm::Instruction _instruction) const
-{
-	return combineCosts(GasMeterVisitor::instructionCosts(_instruction, m_dialect, m_isCreation));
-}
-
-bigint GasMeter::combineCosts(std::pair<bigint, bigint> _costs) const
-{
-	return _costs.first * m_runs + _costs.second;
-}
-
-
-std::pair<bigint, bigint> GasMeterVisitor::costs(
-	Expression const& _expression,
-	EVMDialect const& _dialect,
-	bool _isCreation
-)
-{
-	GasMeterVisitor gmv(_dialect, _isCreation);
-	gmv.visit(_expression);
-	return {gmv.m_runGas, gmv.m_dataGas};
-}
-
-std::pair<bigint, bigint> GasMeterVisitor::instructionCosts(
-	evmasm::Instruction _instruction,
-	EVMDialect const& _dialect,
-	bool _isCreation
-)
-{
-	GasMeterVisitor gmv(_dialect, _isCreation);
-	gmv.instructionCostsInternal(_instruction);
-	return {gmv.m_runGas, gmv.m_dataGas};
-}
-
-void GasMeterVisitor::operator()(FunctionCall const& _funCall)
-{
-	ASTWalker::operator()(_funCall);
-	if (BuiltinFunctionForEVM const* f = m_dialect.builtin(_funCall.functionName.name))
-		if (f->instruction)
-		{
-			instructionCostsInternal(*f->instruction);
-			return;
-		}
-	yulAssert(false, "Functions not implemented.");
-}
-
-void GasMeterVisitor::operator()(Literal const& _lit)
-{
-	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::PUSH1, m_dialect.evmVersion());
-	m_dataGas +=
-		singleByteDataGas() +
-		evmasm::GasMeter::dataGas(
-			toCompactBigEndian(valueOfLiteral(_lit), 1),
-			m_isCreation,
-			m_dialect.evmVersion()
-		);
-}
-
-void GasMeterVisitor::operator()(Identifier const&)
-{
-	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::DUP1, m_dialect.evmVersion());
-	m_dataGas += singleByteDataGas();
-}
-
-bigint GasMeterVisitor::singleByteDataGas() const
-{
-	if (m_isCreation)
-		return evmasm::GasCosts::txDataNonZeroGas(m_dialect.evmVersion());
-	else
-		return evmasm::GasCosts::createDataGas;
-}
-
-void GasMeterVisitor::instructionCostsInternal(evmasm::Instruction _instruction)
-{
-	if (_instruction == evmasm::Instruction::EXP)
-		m_runGas += evmasm::GasCosts::expGas + evmasm::GasCosts::expByteGas(m_dialect.evmVersion());
-	else if (_instruction == evmasm::Instruction::KECCAK256)
-		// Assumes that Keccak-256 is computed on a single word (rounded up).
-		m_runGas += evmasm::GasCosts::keccak256Gas + evmasm::GasCosts::keccak256WordGas;
-	else
-		m_runGas += evmasm::GasMeter::runGas(_instruction, m_dialect.evmVersion());
-	m_dataGas += singleByteDataGas();
-}
diff --git a/libyul/backends/evm/EVMMetrics.h b/libyul/backends/evm/EVMMetrics.h
deleted file mode 100644
index b67cb77cdd50..000000000000
--- a/libyul/backends/evm/EVMMetrics.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Module providing metrics for the optimizer.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <liblangutil/EVMVersion.h>
-#include <libsolutil/Numeric.h>
-#include <libevmasm/Instruction.h>
-
-namespace solidity::yul
-{
-
-struct EVMDialect;
-
-/**
- * Gas meter for expressions only involving literals, identifiers and
- * EVM instructions.
- *
- * Assumes that EXP is not used with exponents larger than a single byte.
- * Is not particularly exact for anything apart from arithmetic.
- *
- * Assumes that Keccak-256 is computed on a single word (rounded up).
- */
-class GasMeter
-{
-public:
-	GasMeter(EVMDialect const& _dialect, bool _isCreation, bigint _runs):
-		m_dialect(_dialect),
-		m_isCreation{_isCreation},
-		m_runs(_isCreation? 1 : _runs)
-	{}
-
-	/// @returns the full combined costs of deploying and evaluating the expression.
-	bigint costs(Expression const& _expression) const;
-	/// @returns the combined costs of deploying and running the instruction, not including
-	/// the costs for its arguments.
-	bigint instructionCosts(evmasm::Instruction _instruction) const;
-
-private:
-	bigint combineCosts(std::pair<bigint, bigint> _costs) const;
-
-	EVMDialect const& m_dialect;
-	bool m_isCreation = false;
-	bigint m_runs;
-};
-
-class GasMeterVisitor: public ASTWalker
-{
-public:
-	static std::pair<bigint, bigint> costs(
-		Expression const& _expression,
-		EVMDialect const& _dialect,
-		bool _isCreation
-	);
-
-	static std::pair<bigint, bigint> instructionCosts(
-		evmasm::Instruction _instruction,
-		EVMDialect const& _dialect,
-		bool _isCreation = false
-	);
-
-public:
-	GasMeterVisitor(EVMDialect const& _dialect, bool _isCreation):
-		m_dialect(_dialect),
-		m_isCreation{_isCreation}
-	{}
-
-	void operator()(FunctionCall const& _funCall) override;
-	void operator()(Literal const& _literal) override;
-	void operator()(Identifier const& _identifier) override;
-
-private:
-	bigint singleByteDataGas() const;
-	/// Computes the cost of storing and executing the single instruction (excluding its arguments).
-	/// For EXP, it assumes that the exponent is at most 255.
-	/// Does not work particularly exact for anything apart from arithmetic.
-	void instructionCostsInternal(evmasm::Instruction _instruction);
-
-	EVMDialect const& m_dialect;
-	bool m_isCreation = false;
-	bigint m_runGas = 0;
-	bigint m_dataGas = 0;
-};
-
-}
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
deleted file mode 100644
index 28b72c0871ee..000000000000
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Compiler that transforms Yul Objects to EVM bytecode objects.
- */
-
-#include <libyul/backends/evm/EVMObjectCompiler.h>
-
-#include <libyul/backends/evm/EVMCodeTransform.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/OptimizedEVMCodeTransform.h>
-
-#include <libyul/optimiser/FunctionCallFinder.h>
-
-#include <libyul/Object.h>
-#include <libyul/Exceptions.h>
-
-#include <boost/algorithm/string.hpp>
-
-using namespace solidity::yul;
-
-void EVMObjectCompiler::compile(
-	Object& _object,
-	AbstractAssembly& _assembly,
-	EVMDialect const& _dialect,
-	bool _optimize,
-	std::optional<uint8_t> _eofVersion
-)
-{
-	EVMObjectCompiler compiler(_assembly, _dialect, _eofVersion);
-	compiler.run(_object, _optimize);
-}
-
-void EVMObjectCompiler::run(Object& _object, bool _optimize)
-{
-	BuiltinContext context;
-	context.currentObject = &_object;
-
-
-	for (auto const& subNode: _object.subObjects)
-		if (auto* subObject = dynamic_cast<Object*>(subNode.get()))
-		{
-			bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed");
-			auto subAssemblyAndID = m_assembly.createSubAssembly(isCreation, subObject->name.str());
-			context.subIDs[subObject->name] = subAssemblyAndID.second;
-			subObject->subId = subAssemblyAndID.second;
-			compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize, m_eofVersion);
-		}
-		else
-		{
-			Data const& data = dynamic_cast<Data const&>(*subNode);
-			// Special handling of metadata.
-			if (data.name.str() == Object::metadataName())
-				m_assembly.appendToAuxiliaryData(data.data);
-			else
-				context.subIDs[data.name] = m_assembly.appendData(data.data);
-		}
-
-	yulAssert(_object.analysisInfo, "No analysis info.");
-	yulAssert(_object.code, "No code.");
-	if (m_eofVersion.has_value())
-		yulAssert(
-			_optimize && (m_dialect.evmVersion() == langutil::EVMVersion()),
-			"Experimental EOF support is only available for optimized via-IR compilation and the most recent EVM version."
-		);
-	if (_optimize && m_dialect.evmVersion().canOverchargeGasForCall())
-	{
-		auto stackErrors = OptimizedEVMCodeTransform::run(
-			m_assembly,
-			*_object.analysisInfo,
-			*_object.code,
-			m_dialect,
-			context,
-			OptimizedEVMCodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
-		);
-		if (!stackErrors.empty())
-		{
-			std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
-				*_object.code,
-				"memoryguard"_yulstring
-			);
-			auto stackError = stackErrors.front();
-			std::string msg = stackError.comment() ? *stackError.comment() : "";
-			if (memoryGuardCalls.empty())
-				msg += "\nNo memoryguard was present. "
-					"Consider using memory-safe assembly only and annotating it via "
-					"'assembly (\"memory-safe\") { ... }'.";
-			else
-				msg += "\nmemoryguard was present.";
-			stackError << util::errinfo_comment(msg);
-			BOOST_THROW_EXCEPTION(stackError);
-		}
-	}
-	else
-	{
-		// We do not catch and re-throw the stack too deep exception here because it is a YulException,
-		// which should be native to this part of the code.
-		CodeTransform transform{
-			m_assembly,
-			*_object.analysisInfo,
-			*_object.code,
-			m_dialect,
-			context,
-			_optimize,
-			{},
-			CodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
-		};
-		transform(*_object.code);
-		if (!transform.stackErrors().empty())
-			BOOST_THROW_EXCEPTION(transform.stackErrors().front());
-	}
-}
diff --git a/libyul/backends/evm/EVMObjectCompiler.h b/libyul/backends/evm/EVMObjectCompiler.h
deleted file mode 100644
index df8d71c2cef5..000000000000
--- a/libyul/backends/evm/EVMObjectCompiler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Compiler that transforms Yul Objects to EVM bytecode objects.
- */
-
-#pragma once
-
-#include <optional>
-#include <cstdint>
-
-namespace solidity::yul
-{
-struct Object;
-class AbstractAssembly;
-struct EVMDialect;
-
-class EVMObjectCompiler
-{
-public:
-	static void compile(
-		Object& _object,
-		AbstractAssembly& _assembly,
-		EVMDialect const& _dialect,
-		bool _optimize,
-		std::optional<uint8_t> _eofVersion
-	);
-private:
-	EVMObjectCompiler(AbstractAssembly& _assembly, EVMDialect const& _dialect, std::optional<uint8_t> _eofVersion):
-		m_assembly(_assembly), m_dialect(_dialect), m_eofVersion(_eofVersion)
-	{}
-
-	void run(Object& _object, bool _optimize);
-
-	AbstractAssembly& m_assembly;
-	EVMDialect const& m_dialect;
-	std::optional<uint8_t> m_eofVersion;
-};
-
-}
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
deleted file mode 100644
index 79146f859c26..000000000000
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Adaptor between AbstractAssembly and libevmasm.
- */
-
-#include <libyul/backends/evm/EthAssemblyAdapter.h>
-
-#include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/Exceptions.h>
-
-#include <libevmasm/Assembly.h>
-#include <libevmasm/AssemblyItem.h>
-#include <libevmasm/Instruction.h>
-
-#include <liblangutil/SourceLocation.h>
-
-#include <memory>
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-EthAssemblyAdapter::EthAssemblyAdapter(evmasm::Assembly& _assembly):
-	m_assembly(_assembly)
-{
-}
-
-void EthAssemblyAdapter::setSourceLocation(SourceLocation const& _location)
-{
-	m_assembly.setSourceLocation(_location);
-}
-
-int EthAssemblyAdapter::stackHeight() const
-{
-	return m_assembly.deposit();
-}
-
-void EthAssemblyAdapter::setStackHeight(int height)
-{
-	m_assembly.setDeposit(height);
-}
-
-void EthAssemblyAdapter::appendInstruction(evmasm::Instruction _instruction)
-{
-	m_assembly.append(_instruction);
-}
-
-void EthAssemblyAdapter::appendConstant(u256 const& _constant)
-{
-	m_assembly.append(_constant);
-}
-
-void EthAssemblyAdapter::appendLabel(LabelID _labelId)
-{
-	m_assembly.append(evmasm::AssemblyItem(evmasm::Tag, _labelId));
-}
-
-void EthAssemblyAdapter::appendLabelReference(LabelID _labelId)
-{
-	m_assembly.append(evmasm::AssemblyItem(evmasm::PushTag, _labelId));
-}
-
-size_t EthAssemblyAdapter::newLabelId()
-{
-	return assemblyTagToIdentifier(m_assembly.newTag());
-}
-
-size_t EthAssemblyAdapter::namedLabel(std::string const& _name, size_t _params, size_t _returns, std::optional<size_t> _sourceID)
-{
-	return assemblyTagToIdentifier(m_assembly.namedTag(_name, _params, _returns, _sourceID));
-}
-
-void EthAssemblyAdapter::appendLinkerSymbol(std::string const& _linkerSymbol)
-{
-	m_assembly.appendLibraryAddress(_linkerSymbol);
-}
-
-void EthAssemblyAdapter::appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables)
-{
-	m_assembly.appendVerbatim(std::move(_data), _arguments, _returnVariables);
-}
-
-void EthAssemblyAdapter::appendJump(int _stackDiffAfter, JumpType _jumpType)
-{
-	appendJumpInstruction(evmasm::Instruction::JUMP, _jumpType);
-	m_assembly.adjustDeposit(_stackDiffAfter);
-}
-
-void EthAssemblyAdapter::appendJumpTo(LabelID _labelId, int _stackDiffAfter, JumpType _jumpType)
-{
-	appendLabelReference(_labelId);
-	appendJump(_stackDiffAfter, _jumpType);
-}
-
-void EthAssemblyAdapter::appendJumpToIf(LabelID _labelId, JumpType _jumpType)
-{
-	appendLabelReference(_labelId);
-	appendJumpInstruction(evmasm::Instruction::JUMPI, _jumpType);
-}
-
-void EthAssemblyAdapter::appendAssemblySize()
-{
-	m_assembly.appendProgramSize();
-}
-
-std::pair<std::shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, std::string _name)
-{
-	std::shared_ptr<evmasm::Assembly> assembly{std::make_shared<evmasm::Assembly>(m_assembly.evmVersion(), _creation, std::move(_name))};
-	auto sub = m_assembly.newSub(assembly);
-	return {std::make_shared<EthAssemblyAdapter>(*assembly), static_cast<size_t>(sub.data())};
-}
-
-void EthAssemblyAdapter::appendDataOffset(std::vector<AbstractAssembly::SubID> const& _subPath)
-{
-	if (auto it = m_dataHashBySubId.find(_subPath[0]); it != m_dataHashBySubId.end())
-	{
-		yulAssert(_subPath.size() == 1, "");
-		m_assembly << evmasm::AssemblyItem(evmasm::PushData, it->second);
-		return;
-	}
-
-	m_assembly.pushSubroutineOffset(m_assembly.encodeSubPath(_subPath));
-}
-
-void EthAssemblyAdapter::appendDataSize(std::vector<AbstractAssembly::SubID> const& _subPath)
-{
-	if (auto it = m_dataHashBySubId.find(_subPath[0]); it != m_dataHashBySubId.end())
-	{
-		yulAssert(_subPath.size() == 1, "");
-		m_assembly << u256(m_assembly.data(h256(it->second)).size());
-		return;
-	}
-
-	m_assembly.pushSubroutineSize(m_assembly.encodeSubPath(_subPath));
-}
-
-AbstractAssembly::SubID EthAssemblyAdapter::appendData(bytes const& _data)
-{
-	evmasm::AssemblyItem pushData = m_assembly.newData(_data);
-	SubID subID = m_nextDataCounter++;
-	m_dataHashBySubId[subID] = pushData.data();
-	return subID;
-}
-
-void EthAssemblyAdapter::appendToAuxiliaryData(bytes const& _data)
-{
-	m_assembly.appendToAuxiliaryData(_data);
-}
-
-void EthAssemblyAdapter::appendImmutable(std::string const& _identifier)
-{
-	m_assembly.appendImmutable(_identifier);
-}
-
-void EthAssemblyAdapter::appendImmutableAssignment(std::string const& _identifier)
-{
-	m_assembly.appendImmutableAssignment(_identifier);
-}
-
-void EthAssemblyAdapter::markAsInvalid()
-{
-	m_assembly.markAsInvalid();
-}
-
-langutil::EVMVersion EthAssemblyAdapter::evmVersion() const
-{
-	return m_assembly.evmVersion();
-}
-
-EthAssemblyAdapter::LabelID EthAssemblyAdapter::assemblyTagToIdentifier(evmasm::AssemblyItem const& _tag)
-{
-	u256 id = _tag.data();
-	yulAssert(id <= std::numeric_limits<LabelID>::max(), "Tag id too large.");
-	return LabelID(id);
-}
-
-void EthAssemblyAdapter::appendJumpInstruction(evmasm::Instruction _instruction, JumpType _jumpType)
-{
-	yulAssert(_instruction == evmasm::Instruction::JUMP || _instruction == evmasm::Instruction::JUMPI, "");
-	evmasm::AssemblyItem jump(_instruction);
-	switch (_jumpType)
-	{
-	case JumpType::Ordinary:
-		yulAssert(jump.getJumpType() == evmasm::AssemblyItem::JumpType::Ordinary, "");
-		break;
-	case JumpType::IntoFunction:
-		jump.setJumpType(evmasm::AssemblyItem::JumpType::IntoFunction);
-		break;
-	case JumpType::OutOfFunction:
-		jump.setJumpType(evmasm::AssemblyItem::JumpType::OutOfFunction);
-		break;
-	}
-	m_assembly.append(std::move(jump));
-}
diff --git a/libyul/backends/evm/EthAssemblyAdapter.h b/libyul/backends/evm/EthAssemblyAdapter.h
deleted file mode 100644
index 011081dedaac..000000000000
--- a/libyul/backends/evm/EthAssemblyAdapter.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Adaptor between AbstractAssembly and libevmasm.
- */
-
-#pragma once
-
-#include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/AsmAnalysis.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <functional>
-#include <limits>
-
-namespace solidity::evmasm
-{
-class Assembly;
-class AssemblyItem;
-}
-
-namespace solidity::yul
-{
-class EthAssemblyAdapter: public AbstractAssembly
-{
-public:
-	explicit EthAssemblyAdapter(evmasm::Assembly& _assembly);
-	void setSourceLocation(langutil::SourceLocation const& _location) override;
-	int stackHeight() const override;
-	void setStackHeight(int height) override;
-	void appendInstruction(evmasm::Instruction _instruction) override;
-	void appendConstant(u256 const& _constant) override;
-	void appendLabel(LabelID _labelId) override;
-	void appendLabelReference(LabelID _labelId) override;
-	size_t newLabelId() override;
-	size_t namedLabel(std::string const& _name, size_t _params, size_t _returns, std::optional<size_t> _sourceID) override;
-	void appendLinkerSymbol(std::string const& _linkerSymbol) override;
-	void appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables) override;
-	void appendJump(int _stackDiffAfter, JumpType _jumpType) override;
-	void appendJumpTo(LabelID _labelId, int _stackDiffAfter, JumpType _jumpType) override;
-	void appendJumpToIf(LabelID _labelId, JumpType _jumpType) override;
-	void appendAssemblySize() override;
-	std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(bool _creation, std::string _name = {}) override;
-	void appendDataOffset(std::vector<SubID> const& _subPath) override;
-	void appendDataSize(std::vector<SubID> const& _subPath) override;
-	SubID appendData(bytes const& _data) override;
-
-	void appendToAuxiliaryData(bytes const& _data) override;
-
-	void appendImmutable(std::string const& _identifier) override;
-	void appendImmutableAssignment(std::string const& _identifier) override;
-
-	void markAsInvalid() override;
-
-	langutil::EVMVersion evmVersion() const override;
-
-
-private:
-	static LabelID assemblyTagToIdentifier(evmasm::AssemblyItem const& _tag);
-	void appendJumpInstruction(evmasm::Instruction _instruction, JumpType _jumpType);
-
-	evmasm::Assembly& m_assembly;
-	std::map<SubID, u256> m_dataHashBySubId;
-	size_t m_nextDataCounter = std::numeric_limits<size_t>::max() / 2;
-};
-}
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
deleted file mode 100644
index 2a3cca52cc32..000000000000
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Assembly interface that ignores everything. Can be used as a backend for a compilation dry-run.
- */
-
-#include <libyul/backends/evm/NoOutputAssembly.h>
-
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <range/v3/view/iota.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-
-void NoOutputAssembly::appendInstruction(evmasm::Instruction _instr)
-{
-	m_stackHeight += instructionInfo(_instr, m_evmVersion).ret - instructionInfo(_instr, m_evmVersion).args;
-}
-
-void NoOutputAssembly::appendConstant(u256 const&)
-{
-	appendInstruction(evmasm::pushInstruction(1));
-}
-
-void NoOutputAssembly::appendLabel(LabelID)
-{
-	appendInstruction(evmasm::Instruction::JUMPDEST);
-}
-
-void NoOutputAssembly::appendLabelReference(LabelID)
-{
-	appendInstruction(evmasm::pushInstruction(1));
-}
-
-NoOutputAssembly::LabelID NoOutputAssembly::newLabelId()
-{
-	return 1;
-}
-
-AbstractAssembly::LabelID NoOutputAssembly::namedLabel(std::string const&, size_t, size_t, std::optional<size_t>)
-{
-	return 1;
-}
-
-void NoOutputAssembly::appendLinkerSymbol(std::string const&)
-{
-	yulAssert(false, "Linker symbols not yet implemented.");
-}
-
-void NoOutputAssembly::appendVerbatim(bytes, size_t _arguments, size_t _returnVariables)
-{
-	m_stackHeight += static_cast<int>(_returnVariables - _arguments);
-}
-
-void NoOutputAssembly::appendJump(int _stackDiffAfter, JumpType)
-{
-	appendInstruction(evmasm::Instruction::JUMP);
-	m_stackHeight += _stackDiffAfter;
-}
-
-void NoOutputAssembly::appendJumpTo(LabelID _labelId, int _stackDiffAfter, JumpType _jumpType)
-{
-	appendLabelReference(_labelId);
-	appendJump(_stackDiffAfter, _jumpType);
-}
-
-void NoOutputAssembly::appendJumpToIf(LabelID _labelId, JumpType)
-{
-	appendLabelReference(_labelId);
-	appendInstruction(evmasm::Instruction::JUMPI);
-}
-
-void NoOutputAssembly::appendAssemblySize()
-{
-	appendInstruction(evmasm::Instruction::PUSH1);
-}
-
-std::pair<std::shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(bool, std::string)
-{
-	yulAssert(false, "Sub assemblies not implemented.");
-	return {};
-}
-
-void NoOutputAssembly::appendDataOffset(std::vector<AbstractAssembly::SubID> const&)
-{
-	appendInstruction(evmasm::Instruction::PUSH1);
-}
-
-void NoOutputAssembly::appendDataSize(std::vector<AbstractAssembly::SubID> const&)
-{
-	appendInstruction(evmasm::Instruction::PUSH1);
-}
-
-AbstractAssembly::SubID NoOutputAssembly::appendData(bytes const&)
-{
-	return 1;
-}
-
-
-void NoOutputAssembly::appendImmutable(std::string const&)
-{
-	yulAssert(false, "loadimmutable not implemented.");
-}
-
-void NoOutputAssembly::appendImmutableAssignment(std::string const&)
-{
-	yulAssert(false, "setimmutable not implemented.");
-}
-
-NoOutputEVMDialect::NoOutputEVMDialect(EVMDialect const& _copyFrom):
-	EVMDialect(_copyFrom.evmVersion(), _copyFrom.providesObjectAccess())
-{
-	for (auto& fun: m_functions)
-	{
-		size_t returns = fun.second.returns.size();
-		fun.second.generateCode = [=](FunctionCall const& _call, AbstractAssembly& _assembly, BuiltinContext&)
-		{
-			for (size_t i: ranges::views::iota(0u, _call.arguments.size()))
-				if (!fun.second.literalArgument(i))
-					_assembly.appendInstruction(evmasm::Instruction::POP);
-
-			for (size_t i = 0; i < returns; i++)
-				_assembly.appendConstant(u256(0));
-		};
-	}
-}
diff --git a/libyul/backends/evm/NoOutputAssembly.h b/libyul/backends/evm/NoOutputAssembly.h
deleted file mode 100644
index 8d7dda0bb50c..000000000000
--- a/libyul/backends/evm/NoOutputAssembly.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Assembly interface that ignores everything. Can be used as a backend for a compilation dry-run.
- */
-
-#pragma once
-
-#include <libyul/backends/evm/AbstractAssembly.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libevmasm/LinkerObject.h>
-
-#include <map>
-
-namespace solidity::langutil
-{
-struct SourceLocation;
-}
-
-namespace solidity::yul
-{
-
-
-/**
- * Assembly class that just ignores everything and only performs stack counting.
- * The purpose is to use this assembly for compilation dry-runs.
- */
-class NoOutputAssembly: public AbstractAssembly
-{
-public:
-	explicit NoOutputAssembly(langutil::EVMVersion _evmVersion): m_evmVersion(_evmVersion) { }
-	~NoOutputAssembly() override = default;
-
-	void setSourceLocation(langutil::SourceLocation const&) override {}
-	int stackHeight() const override { return m_stackHeight; }
-	void setStackHeight(int height) override { m_stackHeight = height; }
-	void appendInstruction(evmasm::Instruction _instruction) override;
-	void appendConstant(u256 const& _constant) override;
-	void appendLabel(LabelID _labelId) override;
-	void appendLabelReference(LabelID _labelId) override;
-	LabelID newLabelId() override;
-	LabelID namedLabel(std::string const& _name, size_t _params, size_t _returns, std::optional<size_t> _sourceID) override;
-	void appendLinkerSymbol(std::string const& _name) override;
-	void appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables) override;
-
-	void appendJump(int _stackDiffAfter, JumpType _jumpType) override;
-	void appendJumpTo(LabelID _labelId, int _stackDiffAfter, JumpType _jumpType) override;
-	void appendJumpToIf(LabelID _labelId, JumpType _jumpType) override;
-
-	void appendAssemblySize() override;
-	std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(bool _creation, std::string _name = "") override;
-	void appendDataOffset(std::vector<SubID> const& _subPath) override;
-	void appendDataSize(std::vector<SubID> const& _subPath) override;
-	SubID appendData(bytes const& _data) override;
-
-	void appendToAuxiliaryData(bytes const&) override {}
-
-	void appendImmutable(std::string const& _identifier) override;
-	void appendImmutableAssignment(std::string const& _identifier) override;
-
-	void markAsInvalid() override {}
-
-	langutil::EVMVersion evmVersion() const override { return m_evmVersion; }
-
-private:
-	int m_stackHeight = 0;
-	langutil::EVMVersion m_evmVersion;
-};
-
-
-/**
- * EVM dialect that does not generate any code.
- */
-struct NoOutputEVMDialect: public EVMDialect
-{
-	explicit NoOutputEVMDialect(EVMDialect const& _copyFrom);
-};
-
-
-}
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
deleted file mode 100644
index 3df75bb88f50..000000000000
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/backends/evm/OptimizedEVMCodeTransform.h>
-
-#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
-#include <libyul/backends/evm/StackHelpers.h>
-#include <libyul/backends/evm/StackLayoutGenerator.h>
-
-#include <libyul/Utilities.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <libsolutil/Visitor.h>
-#include <libsolutil/cxx20.h>
-
-#include <range/v3/view/drop.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/view/iota.hpp>
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/take_last.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-std::vector<StackTooDeepError> OptimizedEVMCodeTransform::run(
-	AbstractAssembly& _assembly,
-	AsmAnalysisInfo& _analysisInfo,
-	Block const& _block,
-	EVMDialect const& _dialect,
-	BuiltinContext& _builtinContext,
-	UseNamedLabels _useNamedLabelsForFunctions
-)
-{
-	std::unique_ptr<CFG> dfg = ControlFlowGraphBuilder::build(_analysisInfo, _dialect, _block);
-	StackLayout stackLayout = StackLayoutGenerator::run(*dfg);
-	OptimizedEVMCodeTransform optimizedCodeTransform(
-		_assembly,
-		_builtinContext,
-		_useNamedLabelsForFunctions,
-		*dfg,
-		stackLayout
-	);
-	// Create initial entry layout.
-	optimizedCodeTransform.createStackLayout(debugDataOf(*dfg->entry), stackLayout.blockInfos.at(dfg->entry).entryLayout);
-	optimizedCodeTransform(*dfg->entry);
-	for (Scope::Function const* function: dfg->functions)
-		optimizedCodeTransform(dfg->functionInfo.at(function));
-	return std::move(optimizedCodeTransform.m_stackErrors);
-}
-
-void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
-{
-	// Validate stack.
-	{
-		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-		yulAssert(m_stack.size() >= _call.function.get().arguments.size() + (_call.canContinue ? 1 : 0), "");
-		// Assert that we got the correct arguments on stack for the call.
-		for (auto&& [arg, slot]: ranges::zip_view(
-			_call.functionCall.get().arguments | ranges::views::reverse,
-			m_stack | ranges::views::take_last(_call.functionCall.get().arguments.size())
-		))
-			validateSlot(slot, arg);
-		// Assert that we got the correct return label on stack.
-		if (_call.canContinue)
-		{
-			auto const* returnLabelSlot = std::get_if<FunctionCallReturnLabelSlot>(
-				&m_stack.at(m_stack.size() - _call.functionCall.get().arguments.size() - 1)
-			);
-			yulAssert(returnLabelSlot && &returnLabelSlot->call.get() == &_call.functionCall.get(), "");
-		}
-	}
-
-	// Emit code.
-	{
-		m_assembly.setSourceLocation(originLocationOf(_call));
-		m_assembly.appendJumpTo(
-			getFunctionLabel(_call.function),
-			static_cast<int>(_call.function.get().returns.size() - _call.function.get().arguments.size()) - (_call.canContinue ? 1 : 0),
-			AbstractAssembly::JumpType::IntoFunction
-		);
-		if (_call.canContinue)
-			m_assembly.appendLabel(m_returnLabels.at(&_call.functionCall.get()));
-	}
-
-	// Update stack.
-	{
-		// Remove arguments and return label from m_stack.
-		for (size_t i = 0; i < _call.function.get().arguments.size() + (_call.canContinue ? 1 : 0); ++i)
-			m_stack.pop_back();
-		// Push return values to m_stack.
-		for (size_t index: ranges::views::iota(0u, _call.function.get().returns.size()))
-			m_stack.emplace_back(TemporarySlot{_call.functionCall, index});
-		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-	}
-}
-
-void OptimizedEVMCodeTransform::operator()(CFG::BuiltinCall const& _call)
-{
-	// Validate stack.
-	{
-		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-		yulAssert(m_stack.size() >= _call.arguments, "");
-		// Assert that we got a correct stack for the call.
-		for (auto&& [arg, slot]: ranges::zip_view(
-			_call.functionCall.get().arguments |
-			ranges::views::enumerate |
-			ranges::views::filter(util::mapTuple([&](size_t idx, auto&) -> bool {
-				return !_call.builtin.get().literalArgument(idx);
-			})) |
-			ranges::views::reverse |
-			ranges::views::values,
-			m_stack | ranges::views::take_last(_call.arguments)
-		))
-			validateSlot(slot, arg);
-	}
-
-	// Emit code.
-	{
-		m_assembly.setSourceLocation(originLocationOf(_call));
-		static_cast<BuiltinFunctionForEVM const&>(_call.builtin.get()).generateCode(
-			_call.functionCall,
-			m_assembly,
-			m_builtinContext
-		);
-	}
-
-	// Update stack.
-	{
-		// Remove arguments from m_stack.
-		for (size_t i = 0; i < _call.arguments; ++i)
-			m_stack.pop_back();
-		// Push return values to m_stack.
-		for (size_t index: ranges::views::iota(0u, _call.builtin.get().returns.size()))
-			m_stack.emplace_back(TemporarySlot{_call.functionCall, index});
-		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-	}
-}
-
-void OptimizedEVMCodeTransform::operator()(CFG::Assignment const& _assignment)
-{
-	yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-
-	// Invalidate occurrences of the assigned variables.
-	for (auto& currentSlot: m_stack)
-		if (VariableSlot const* varSlot = std::get_if<VariableSlot>(&currentSlot))
-			if (util::contains(_assignment.variables, *varSlot))
-				currentSlot = JunkSlot{};
-
-	// Assign variables to current stack top.
-	yulAssert(m_stack.size() >= _assignment.variables.size(), "");
-	for (auto&& [currentSlot, varSlot]: ranges::zip_view(
-		m_stack | ranges::views::take_last(_assignment.variables.size()),
-		_assignment.variables
-	))
-		currentSlot = varSlot;
-}
-
-OptimizedEVMCodeTransform::OptimizedEVMCodeTransform(
-	AbstractAssembly& _assembly,
-	BuiltinContext& _builtinContext,
-	UseNamedLabels _useNamedLabelsForFunctions,
-	CFG const& _dfg,
-	StackLayout const& _stackLayout
-):
-	m_assembly(_assembly),
-	m_builtinContext(_builtinContext),
-	m_dfg(_dfg),
-	m_stackLayout(_stackLayout),
-	m_functionLabels([&](){
-		std::map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> functionLabels;
-		std::set<YulString> assignedFunctionNames;
-		for (Scope::Function const* function: m_dfg.functions)
-		{
-			CFG::FunctionInfo const& functionInfo = m_dfg.functionInfo.at(function);
-			bool nameAlreadySeen = !assignedFunctionNames.insert(function->name).second;
-			if (_useNamedLabelsForFunctions == UseNamedLabels::YesAndForceUnique)
-				yulAssert(!nameAlreadySeen);
-			bool useNamedLabel = _useNamedLabelsForFunctions != UseNamedLabels::Never && !nameAlreadySeen;
-			functionLabels[&functionInfo] = useNamedLabel ?
-				m_assembly.namedLabel(
-					function->name.str(),
-					function->arguments.size(),
-					function->returns.size(),
-					functionInfo.debugData ? functionInfo.debugData->astID : std::nullopt
-				) :
-				m_assembly.newLabelId();
-		}
-		return functionLabels;
-	}())
-{
-}
-
-void OptimizedEVMCodeTransform::assertLayoutCompatibility(Stack const& _currentStack, Stack const& _desiredStack)
-{
-	yulAssert(_currentStack.size() == _desiredStack.size(), "");
-	for (auto&& [currentSlot, desiredSlot]: ranges::zip_view(_currentStack, _desiredStack))
-		yulAssert(std::holds_alternative<JunkSlot>(desiredSlot) || currentSlot == desiredSlot, "");
-}
-
-AbstractAssembly::LabelID OptimizedEVMCodeTransform::getFunctionLabel(Scope::Function const& _function)
-{
-	return m_functionLabels.at(&m_dfg.functionInfo.at(&_function));
-}
-
-void OptimizedEVMCodeTransform::validateSlot(StackSlot const& _slot, Expression const& _expression)
-{
-	std::visit(util::GenericVisitor{
-		[&](yul::Literal const& _literal) {
-			auto* literalSlot = std::get_if<LiteralSlot>(&_slot);
-			yulAssert(literalSlot && valueOfLiteral(_literal) == literalSlot->value, "");
-		},
-		[&](yul::Identifier const& _identifier) {
-			auto* variableSlot = std::get_if<VariableSlot>(&_slot);
-			yulAssert(variableSlot && variableSlot->variable.get().name == _identifier.name, "");
-		},
-		[&](yul::FunctionCall const& _call) {
-			auto* temporarySlot = std::get_if<TemporarySlot>(&_slot);
-			yulAssert(temporarySlot && &temporarySlot->call.get() == &_call && temporarySlot->index == 0, "");
-		}
-	}, _expression);
-}
-
-void OptimizedEVMCodeTransform::createStackLayout(std::shared_ptr<DebugData const> _debugData, Stack _targetStack)
-{
-	static constexpr auto slotVariableName = [](StackSlot const& _slot) {
-		return std::visit(util::GenericVisitor{
-			[](VariableSlot const& _var) { return _var.variable.get().name; },
-			[](auto const&) { return YulString{}; }
-		}, _slot);
-	};
-
-	yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-	// ::createStackLayout asserts that it has successfully achieved the target layout.
-	langutil::SourceLocation sourceLocation = _debugData ? _debugData->originLocation : langutil::SourceLocation{};
-	m_assembly.setSourceLocation(sourceLocation);
-	::createStackLayout(
-		m_stack,
-		_targetStack | ranges::to<Stack>,
-		// Swap callback.
-		[&](unsigned _i)
-		{
-			yulAssert(static_cast<int>(m_stack.size()) == m_assembly.stackHeight(), "");
-			yulAssert(_i > 0 && _i < m_stack.size(), "");
-			if (_i <= 16)
-				m_assembly.appendInstruction(evmasm::swapInstruction(_i));
-			else
-			{
-				int deficit = static_cast<int>(_i) - 16;
-				StackSlot const& deepSlot = m_stack.at(m_stack.size() - _i - 1);
-				YulString varNameDeep = slotVariableName(deepSlot);
-				YulString varNameTop = slotVariableName(m_stack.back());
-				std::string msg =
-					"Cannot swap " + (varNameDeep.empty() ? "Slot " + stackSlotToString(deepSlot) : "Variable " + varNameDeep.str()) +
-					" with " + (varNameTop.empty() ? "Slot " + stackSlotToString(m_stack.back()) : "Variable " + varNameTop.str()) +
-					": too deep in the stack by " + std::to_string(deficit) + " slots in " + stackToString(m_stack);
-				m_stackErrors.emplace_back(StackTooDeepError(
-					m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulString{},
-					varNameDeep.empty() ? varNameTop : varNameDeep,
-					deficit,
-					msg
-				));
-				m_assembly.markAsInvalid();
-			}
-		},
-		// Push or dup callback.
-		[&](StackSlot const& _slot)
-		{
-			yulAssert(static_cast<int>(m_stack.size()) == m_assembly.stackHeight(), "");
-
-			// Dup the slot, if already on stack and reachable.
-			if (auto depth = util::findOffset(m_stack | ranges::views::reverse, _slot))
-			{
-				if (*depth < 16)
-				{
-					m_assembly.appendInstruction(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)));
-					return;
-				}
-				else if (!canBeFreelyGenerated(_slot))
-				{
-					int deficit = static_cast<int>(*depth - 15);
-					YulString varName = slotVariableName(_slot);
-					std::string msg =
-						(varName.empty() ? "Slot " + stackSlotToString(_slot) : "Variable " + varName.str())
-						+ " is " + std::to_string(*depth - 15) + " too deep in the stack " + stackToString(m_stack);
-					m_stackErrors.emplace_back(StackTooDeepError(
-						m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulString{},
-						varName,
-						deficit,
-						msg
-					));
-					m_assembly.markAsInvalid();
-					m_assembly.appendConstant(u256(0xCAFFEE));
-					return;
-				}
-				// else: the slot is too deep in stack, but can be freely generated, we fall through to push it again.
-			}
-
-			// The slot can be freely generated or is an unassigned return variable. Push it.
-			std::visit(util::GenericVisitor{
-				[&](LiteralSlot const& _literal)
-				{
-					m_assembly.setSourceLocation(originLocationOf(_literal));
-					m_assembly.appendConstant(_literal.value);
-					m_assembly.setSourceLocation(sourceLocation);
-				},
-				[&](FunctionReturnLabelSlot const&)
-				{
-					yulAssert(false, "Cannot produce function return label.");
-				},
-				[&](FunctionCallReturnLabelSlot const& _returnLabel)
-				{
-					if (!m_returnLabels.count(&_returnLabel.call.get()))
-						m_returnLabels[&_returnLabel.call.get()] = m_assembly.newLabelId();
-					m_assembly.setSourceLocation(originLocationOf(_returnLabel.call.get()));
-					m_assembly.appendLabelReference(m_returnLabels.at(&_returnLabel.call.get()));
-					m_assembly.setSourceLocation(sourceLocation);
-				},
-				[&](VariableSlot const& _variable)
-				{
-					if (m_currentFunctionInfo && util::contains(m_currentFunctionInfo->returnVariables, _variable))
-					{
-						m_assembly.setSourceLocation(originLocationOf(_variable));
-						m_assembly.appendConstant(0);
-						m_assembly.setSourceLocation(sourceLocation);
-						return;
-					}
-					yulAssert(false, "Variable not found on stack.");
-				},
-				[&](TemporarySlot const&)
-				{
-					yulAssert(false, "Function call result requested, but not found on stack.");
-				},
-				[&](JunkSlot const&)
-				{
-					// Note: this will always be popped, so we can push anything.
-					if (m_assembly.evmVersion().hasPush0())
-						m_assembly.appendConstant(0);
-					else
-						m_assembly.appendInstruction(evmasm::Instruction::CODESIZE);
-				}
-			}, _slot);
-		},
-		// Pop callback.
-		[&]()
-		{
-			m_assembly.appendInstruction(evmasm::Instruction::POP);
-		}
-	);
-	yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-}
-
-void OptimizedEVMCodeTransform::operator()(CFG::BasicBlock const& _block)
-{
-	// Assert that this is the first visit of the block and mark as generated.
-	yulAssert(m_generated.insert(&_block).second, "");
-
-	m_assembly.setSourceLocation(originLocationOf(_block));
-	auto const& blockInfo = m_stackLayout.blockInfos.at(&_block);
-
-	// Assert that the stack is valid for entering the block.
-	assertLayoutCompatibility(m_stack, blockInfo.entryLayout);
-	m_stack = blockInfo.entryLayout; // Might set some slots to junk, if not required by the block.
-	yulAssert(static_cast<int>(m_stack.size()) == m_assembly.stackHeight(), "");
-
-	// Emit jump label, if required.
-	if (auto label = util::valueOrNullptr(m_blockLabels, &_block))
-		m_assembly.appendLabel(*label);
-
-	for (auto const& operation: _block.operations)
-	{
-		// Create required layout for entering the operation.
-		createStackLayout(debugDataOf(operation.operation), m_stackLayout.operationEntryLayout.at(&operation));
-
-		// Assert that we have the inputs of the operation on stack top.
-		yulAssert(static_cast<int>(m_stack.size()) == m_assembly.stackHeight(), "");
-		yulAssert(m_stack.size() >= operation.input.size(), "");
-		size_t baseHeight = m_stack.size() - operation.input.size();
-		assertLayoutCompatibility(
-			m_stack | ranges::views::take_last(operation.input.size()) | ranges::to<Stack>,
-			operation.input
-		);
-
-		// Perform the operation.
-		std::visit(*this, operation.operation);
-
-		// Assert that the operation produced its proclaimed output.
-		yulAssert(static_cast<int>(m_stack.size()) == m_assembly.stackHeight(), "");
-		yulAssert(m_stack.size() == baseHeight + operation.output.size(), "");
-		yulAssert(m_stack.size() >= operation.output.size(), "");
-		assertLayoutCompatibility(
-			m_stack | ranges::views::take_last(operation.output.size()) | ranges::to<Stack>,
-			operation.output
-		);
-	}
-
-	// Exit the block.
-	m_assembly.setSourceLocation(originLocationOf(_block));
-	std::visit(util::GenericVisitor{
-		[&](CFG::BasicBlock::MainExit const&)
-		{
-			m_assembly.appendInstruction(evmasm::Instruction::STOP);
-		},
-		[&](CFG::BasicBlock::Jump const& _jump)
-		{
-			// Create the stack expected at the jump target.
-			createStackLayout(debugDataOf(_jump), m_stackLayout.blockInfos.at(_jump.target).entryLayout);
-
-			// If this is the only jump to the block, we do not need a label and can directly continue with the target block.
-			if (!m_blockLabels.count(_jump.target) && _jump.target->entries.size() == 1)
-			{
-				yulAssert(!_jump.backwards, "");
-				(*this)(*_jump.target);
-			}
-			else
-			{
-				// Generate a jump label for the target, if not already present.
-				if (!m_blockLabels.count(_jump.target))
-					m_blockLabels[_jump.target] = m_assembly.newLabelId();
-
-				// If we already have generated the target block, jump to it, otherwise generate it in place.
-				if (m_generated.count(_jump.target))
-					m_assembly.appendJumpTo(m_blockLabels[_jump.target]);
-				else
-					(*this)(*_jump.target);
-			}
-		},
-		[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-		{
-			// Create the shared entry layout of the jump targets, which is stored as exit layout of the current block.
-			createStackLayout(debugDataOf(_conditionalJump), blockInfo.exitLayout);
-
-			// Create labels for the targets, if not already present.
-			if (!m_blockLabels.count(_conditionalJump.nonZero))
-				m_blockLabels[_conditionalJump.nonZero] = m_assembly.newLabelId();
-			if (!m_blockLabels.count(_conditionalJump.zero))
-				m_blockLabels[_conditionalJump.zero] = m_assembly.newLabelId();
-
-			// Assert that we have the correct condition on stack.
-			yulAssert(!m_stack.empty(), "");
-			yulAssert(m_stack.back() == _conditionalJump.condition, "");
-
-			// Emit the conditional jump to the non-zero label and update the stored stack.
-			m_assembly.appendJumpToIf(m_blockLabels[_conditionalJump.nonZero]);
-			m_stack.pop_back();
-
-			// Assert that we have a valid stack for both jump targets.
-			assertLayoutCompatibility(m_stack, m_stackLayout.blockInfos.at(_conditionalJump.nonZero).entryLayout);
-			assertLayoutCompatibility(m_stack, m_stackLayout.blockInfos.at(_conditionalJump.zero).entryLayout);
-
-			{
-				// Restore the stack afterwards for the non-zero case below.
-				ScopeGuard stackRestore([storedStack = m_stack, this]() {
-					m_stack = std::move(storedStack);
-					m_assembly.setStackHeight(static_cast<int>(m_stack.size()));
-				});
-
-				// If we have already generated the zero case, jump to it, otherwise generate it in place.
-				if (m_generated.count(_conditionalJump.zero))
-					m_assembly.appendJumpTo(m_blockLabels[_conditionalJump.zero]);
-				else
-					(*this)(*_conditionalJump.zero);
-			}
-			// Note that each block visit terminates control flow, so we cannot fall through from the zero case.
-
-			// Generate the non-zero block, if not done already.
-			if (!m_generated.count(_conditionalJump.nonZero))
-				(*this)(*_conditionalJump.nonZero);
-		},
-		[&](CFG::BasicBlock::FunctionReturn const& _functionReturn)
-		{
-			yulAssert(m_currentFunctionInfo);
-			yulAssert(m_currentFunctionInfo == _functionReturn.info);
-			yulAssert(m_currentFunctionInfo->canContinue);
-
-			// Construct the function return layout, which is fully determined by the function signature.
-			Stack exitStack = m_currentFunctionInfo->returnVariables | ranges::views::transform([](auto const& _varSlot){
-				return StackSlot{_varSlot};
-			}) | ranges::to<Stack>;
-			exitStack.emplace_back(FunctionReturnLabelSlot{_functionReturn.info->function});
-
-			// Create the function return layout and jump.
-			createStackLayout(debugDataOf(_functionReturn), exitStack);
-			m_assembly.appendJump(0, AbstractAssembly::JumpType::OutOfFunction);
-		},
-		[&](CFG::BasicBlock::Terminated const&)
-		{
-			yulAssert(!_block.operations.empty());
-			if (CFG::BuiltinCall const* builtinCall = std::get_if<CFG::BuiltinCall>(&_block.operations.back().operation))
-				yulAssert(builtinCall->builtin.get().controlFlowSideEffects.terminatesOrReverts(), "");
-			else if (CFG::FunctionCall const* functionCall = std::get_if<CFG::FunctionCall>(&_block.operations.back().operation))
-				yulAssert(!functionCall->canContinue);
-			else
-				yulAssert(false);
-		}
-	}, _block.exit);
-	// TODO: We could assert that the last emitted assembly item terminated or was an (unconditional) jump.
-	//       But currently AbstractAssembly does not allow peeking at the last emitted assembly item.
-	m_stack.clear();
-	m_assembly.setStackHeight(0);
-}
-
-void OptimizedEVMCodeTransform::operator()(CFG::FunctionInfo const& _functionInfo)
-{
-	yulAssert(!m_currentFunctionInfo, "");
-	ScopedSaveAndRestore currentFunctionInfoRestore(m_currentFunctionInfo, &_functionInfo);
-
-	yulAssert(m_stack.empty() && m_assembly.stackHeight() == 0, "");
-
-	// Create function entry layout in m_stack.
-	if (_functionInfo.canContinue)
-		m_stack.emplace_back(FunctionReturnLabelSlot{_functionInfo.function});
-	for (auto const& param: _functionInfo.parameters | ranges::views::reverse)
-		m_stack.emplace_back(param);
-	m_assembly.setStackHeight(static_cast<int>(m_stack.size()));
-
-	m_assembly.setSourceLocation(originLocationOf(_functionInfo));
-	m_assembly.appendLabel(getFunctionLabel(_functionInfo.function));
-
-	// Create the entry layout of the function body block and visit.
-	createStackLayout(debugDataOf(_functionInfo), m_stackLayout.blockInfos.at(_functionInfo.entry).entryLayout);
-	(*this)(*_functionInfo.entry);
-
-	m_stack.clear();
-	m_assembly.setStackHeight(0);
-}
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.h b/libyul/backends/evm/OptimizedEVMCodeTransform.h
deleted file mode 100644
index ed03c1453015..000000000000
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Code generator for translating Yul / inline assembly to EVM.
- */
-
-#pragma once
-
-#include <libyul/AST.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/ControlFlowGraph.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Scope.h>
-
-#include <optional>
-#include <stack>
-
-namespace solidity::langutil
-{
-class ErrorReporter;
-}
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-struct StackLayout;
-
-class OptimizedEVMCodeTransform
-{
-public:
-	/// Use named labels for functions 1) Yes and check that the names are unique
-	/// 2) For none of the functions 3) for the first function of each name.
-	enum class UseNamedLabels { YesAndForceUnique, Never, ForFirstFunctionOfEachName };
-
-	[[nodiscard]] static std::vector<StackTooDeepError> run(
-		AbstractAssembly& _assembly,
-		AsmAnalysisInfo& _analysisInfo,
-		Block const& _block,
-		EVMDialect const& _dialect,
-		BuiltinContext& _builtinContext,
-		UseNamedLabels _useNamedLabelsForFunctions
-	);
-
-	/// Generate code for the function call @a _call. Only public for using with std::visit.
-	void operator()(CFG::FunctionCall const& _call);
-	/// Generate code for the builtin call @a _call. Only public for using with std::visit.
-	void operator()(CFG::BuiltinCall const& _call);
-	/// Generate code for the assignment @a _assignment. Only public for using with std::visit.
-	void operator()(CFG::Assignment const& _assignment);
-private:
-	OptimizedEVMCodeTransform(
-		AbstractAssembly& _assembly,
-		BuiltinContext& _builtinContext,
-		UseNamedLabels _useNamedLabelsForFunctions,
-		CFG const& _dfg,
-		StackLayout const& _stackLayout
-	);
-
-	/// Assert that it is valid to transition from @a _currentStack to @a _desiredStack.
-	/// That is @a _currentStack matches each slot in @a _desiredStack that is not a JunkSlot exactly.
-	static void assertLayoutCompatibility(Stack const& _currentStack, Stack const& _desiredStack);
-
-	/// @returns The label of the entry point of the given @a _function.
-	/// Creates and stores a new label, if none exists already.
-	AbstractAssembly::LabelID getFunctionLabel(Scope::Function const& _function);
-	/// Assert that @a _slot contains the value of @a _expression.
-	static void validateSlot(StackSlot const& _slot, Expression const& _expression);
-
-	/// Shuffles m_stack to the desired @a _targetStack while emitting the shuffling code to m_assembly.
-	/// Sets the source locations to the one in @a _debugData.
-	void createStackLayout(std::shared_ptr<DebugData const> _debugData, Stack _targetStack);
-
-	/// Generate code for the given block @a _block.
-	/// Expects the current stack layout m_stack to be a stack layout that is compatible with the
-	/// entry layout expected by the block.
-	/// Recursively generates code for blocks that are jumped to.
-	/// The last emitted assembly instruction is always an unconditional jump or terminating.
-	/// Always exits with an empty stack layout.
-	void operator()(CFG::BasicBlock const& _block);
-
-	/// Generate code for the given function.
-	/// Resets m_stack.
-	void operator()(CFG::FunctionInfo const& _functionInfo);
-
-	AbstractAssembly& m_assembly;
-	BuiltinContext& m_builtinContext;
-	CFG const& m_dfg;
-	StackLayout const& m_stackLayout;
-	Stack m_stack;
-	std::map<yul::FunctionCall const*, AbstractAssembly::LabelID> m_returnLabels;
-	std::map<CFG::BasicBlock const*, AbstractAssembly::LabelID> m_blockLabels;
-	std::map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> const m_functionLabels;
-	/// Set of blocks already generated. If any of the contained blocks is ever jumped to, m_blockLabels should
-	/// contain a jump label for it.
-	std::set<CFG::BasicBlock const*> m_generated;
-	CFG::FunctionInfo const* m_currentFunctionInfo = nullptr;
-	std::vector<StackTooDeepError> m_stackErrors;
-};
-
-}
diff --git a/libyul/backends/evm/StackHelpers.h b/libyul/backends/evm/StackHelpers.h
deleted file mode 100644
index dae4352a02c4..000000000000
--- a/libyul/backends/evm/StackHelpers.h
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/backends/evm/ControlFlowGraph.h>
-#include <libyul/Exceptions.h>
-
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-#include <range/v3/algorithm/any_of.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/iota.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/take.hpp>
-
-namespace solidity::yul
-{
-
-inline std::string stackSlotToString(StackSlot const& _slot)
-{
-	return std::visit(util::GenericVisitor{
-		[](FunctionCallReturnLabelSlot const& _ret) -> std::string { return "RET[" + _ret.call.get().functionName.name.str() + "]"; },
-		[](FunctionReturnLabelSlot const&) -> std::string { return "RET"; },
-		[](VariableSlot const& _var) { return _var.variable.get().name.str(); },
-		[](LiteralSlot const& _lit) { return toCompactHexWithPrefix(_lit.value); },
-		[](TemporarySlot const& _tmp) -> std::string { return "TMP[" + _tmp.call.get().functionName.name.str() + ", " + std::to_string(_tmp.index) + "]"; },
-		[](JunkSlot const&) -> std::string { return "JUNK"; }
-	}, _slot);
-}
-
-inline std::string stackToString(Stack const& _stack)
-{
-	std::string result("[ ");
-	for (auto const& slot: _stack)
-		result += stackSlotToString(slot) + ' ';
-	result += ']';
-	return result;
-}
-
-
-// Abstraction of stack shuffling operations. Can be defined as actual concept once we switch to C++20.
-// Used as an interface for the stack shuffler below.
-// The shuffle operation class is expected to internally keep track of a current stack layout (the "source layout")
-// that the shuffler is supposed to shuffle to a fixed target stack layout.
-// The shuffler works iteratively. At each iteration it instantiates an instance of the shuffle operations and
-// queries it for various information about the current source stack layout and the target layout, as described
-// in the interface below.
-// Based on that information the shuffler decides which is the next optimal operation to perform on the stack
-// and calls the corresponding entry point in the shuffling operations (swap, pushOrDupTarget or pop).
-/*
-template<typename ShuffleOperations>
-concept ShuffleOperationConcept = requires(ShuffleOperations ops, size_t sourceOffset, size_t targetOffset, size_t depth) {
-	// Returns true, iff the current slot at sourceOffset in source layout is a suitable slot at targetOffset.
-	{ ops.isCompatible(sourceOffset, targetOffset) } -> std::convertible_to<bool>;
-	// Returns true, iff the slots at the two given source offsets are identical.
-	{ ops.sourceIsSame(sourceOffset, sourceOffset) } -> std::convertible_to<bool>;
-	// Returns a positive integer n, if the slot at the given source offset needs n more copies.
-	// Returns a negative integer -n, if the slot at the given source offsets occurs n times too many.
-	// Returns zero if the amount of occurrences, in the current source layout, of the slot at the given source offset
-	// matches the desired amount of occurrences in the target.
-	{ ops.sourceMultiplicity(sourceOffset) } -> std::convertible_to<int>;
-	// Returns a positive integer n, if the slot at the given target offset needs n more copies.
-	// Returns a negative integer -n, if the slot at the given target offsets occurs n times too many.
-	// Returns zero if the amount of occurrences, in the current source layout, of the slot at the given target offset
-	// matches the desired amount of occurrences in the target.
-	{ ops.targetMultiplicity(targetOffset) } -> std::convertible_to<int>;
-	// Returns true, iff any slot is compatible with the given target offset.
-	{ ops.targetIsArbitrary(targetOffset) } -> std::convertible_to<bool>;
-	// Returns the number of slots in the source layout.
-	{ ops.sourceSize() } -> std::convertible_to<size_t>;
-	// Returns the number of slots in the target layout.
-	{ ops.targetSize() } -> std::convertible_to<size_t>;
-	// Swaps the top most slot in the source with the slot `depth` slots below the top.
-	// In terms of EVM opcodes this is supposed to be a `SWAP<depth>`.
-	// In terms of vectors this is supposed to be `std::swap(source.at(source.size() - depth - 1, source.top))`.
-	{ ops.swap(depth) };
-	// Pops the top most slot in the source, i.e. the slot at offset ops.sourceSize() - 1.
-	// In terms of EVM opcodes this is `POP`.
-	// In terms of vectors this is `source.pop();`.
-	{ ops.pop() };
-	// Dups or pushes the slot that is supposed to end up at the given target offset.
-	{ ops.pushOrDupTarget(targetOffset) };
-};
-*/
-/// Helper class that can perform shuffling of a source stack layout to a target stack layout via
-/// abstracted shuffle operations.
-template</*ShuffleOperationConcept*/ typename ShuffleOperations>
-class Shuffler
-{
-public:
-	/// Executes the stack shuffling operations. Instantiates an instance of ShuffleOperations
-	/// in each iteration. Each iteration performs exactly one operation that modifies the stack.
-	/// After `shuffle`, source and target have the same size and all slots in the source layout are
-	/// compatible with the slots at the same target offset.
-	template<typename... Args>
-	static void shuffle(Args&&... args)
-	{
-		bool needsMoreShuffling = true;
-		// The shuffling algorithm should always terminate in polynomial time, but we provide a limit
-		// in case it does not terminate due to a bug.
-		size_t iterationCount = 0;
-		while (iterationCount < 1000 && (needsMoreShuffling = shuffleStep(std::forward<Args>(args)...)))
-			++iterationCount;
-		yulAssert(!needsMoreShuffling, "Could not create stack layout after 1000 iterations.");
-	}
-private:
-	// If dupping an ideal slot causes a slot that will still be required to become unreachable, then dup
-	// the latter slot first.
-	// @returns true, if it performed a dup.
-	static bool dupDeepSlotIfRequired(ShuffleOperations& _ops)
-	{
-		// Check if the stack is large enough for anything to potentially become unreachable.
-		if (_ops.sourceSize() < 15)
-			return false;
-		// Check whether any deep slot might still be needed later (i.e. we still need to reach it with a DUP or SWAP).
-		for (size_t sourceOffset: ranges::views::iota(0u, _ops.sourceSize() - 15))
-		{
-			// This slot needs to be moved.
-			if (!_ops.isCompatible(sourceOffset, sourceOffset))
-			{
-				// If the current top fixes the slot, swap it down now.
-				if (_ops.isCompatible(_ops.sourceSize() - 1, sourceOffset))
-				{
-					_ops.swap(_ops.sourceSize() - sourceOffset - 1);
-					return true;
-				}
-				// Bring up a slot to fix this now, if possible.
-				if (bringUpTargetSlot(_ops, sourceOffset))
-					return true;
-				// Otherwise swap up the slot that will fix the offending slot.
-				for (auto offset: ranges::views::iota(sourceOffset + 1, _ops.sourceSize()))
-					if (_ops.isCompatible(offset, sourceOffset))
-					{
-						_ops.swap(_ops.sourceSize() - offset - 1);
-						return true;
-					}
-				// Otherwise give up - we will need stack compression or stack limit evasion.
-			}
-			// We need another copy of this slot.
-			else if (_ops.sourceMultiplicity(sourceOffset) > 0)
-			{
-				// If this slot occurs again later, we skip this occurrence.
-				if (ranges::any_of(
-					ranges::views::iota(sourceOffset + 1, _ops.sourceSize()),
-					[&](size_t _offset) { return _ops.sourceIsSame(sourceOffset, _offset); }
-				))
-					continue;
-				// Bring up the target slot that would otherwise become unreachable.
-				for (size_t targetOffset: ranges::views::iota(0u, _ops.targetSize()))
-					if (!_ops.targetIsArbitrary(targetOffset) && _ops.isCompatible(sourceOffset, targetOffset))
-					{
-						_ops.pushOrDupTarget(targetOffset);
-						return true;
-					}
-			}
-		}
-		return false;
-	}
-	/// Finds a slot to dup or push with the aim of eventually fixing @a _targetOffset in the target.
-	/// In the simplest case, the slot at @a _targetOffset has a multiplicity > 0, i.e. it can directly be dupped or pushed
-	/// and the next iteration will fix @a _targetOffset.
-	/// But, in general, there may already be enough copies of the slot that is supposed to end up at @a _targetOffset
-	/// on stack, s.t. it cannot be dupped again. In that case there has to be a copy of the desired slot on stack already
-	/// elsewhere that is not yet in place (`nextOffset` below). The fact that ``nextOffset`` is not in place means that
-	/// we can (recursively) try bringing up the slot that is supposed to end up at ``nextOffset`` in the *target*.
-	/// When the target slot at ``nextOffset`` is fixed, the current source slot at ``nextOffset`` will be
-	/// at the stack top, which is the slot required at @a _targetOffset.
-	static bool bringUpTargetSlot(ShuffleOperations& _ops, size_t _targetOffset)
-	{
-		std::list<size_t> toVisit{_targetOffset};
-		std::set<size_t> visited;
-
-		while (!toVisit.empty())
-		{
-			auto offset = *toVisit.begin();
-			toVisit.erase(toVisit.begin());
-			visited.emplace(offset);
-			if (_ops.targetMultiplicity(offset) > 0)
-			{
-				_ops.pushOrDupTarget(offset);
-				return true;
-			}
-			// There must be another slot we can dup/push that will lead to the target slot at ``offset`` to be fixed.
-			for (auto nextOffset: ranges::views::iota(0u, std::min(_ops.sourceSize(), _ops.targetSize())))
-				if (
-					!_ops.isCompatible(nextOffset, nextOffset) &&
-					_ops.isCompatible(nextOffset, offset)
-				)
-					if (!visited.count(nextOffset))
-						toVisit.emplace_back(nextOffset);
-		}
-		return false;
-	}
-	/// Performs a single stack operation, transforming the source layout closer to the target layout.
-	template<typename... Args>
-	static bool shuffleStep(Args&&... args)
-	{
-		ShuffleOperations ops{std::forward<Args>(args)...};
-
-		// All source slots are final.
-		if (ranges::all_of(
-			ranges::views::iota(0u, ops.sourceSize()),
-			[&](size_t _index) { return ops.isCompatible(_index, _index); }
-		))
-		{
-			// Bring up all remaining target slots, if any, or terminate otherwise.
-			if (ops.sourceSize() < ops.targetSize())
-			{
-				if (!dupDeepSlotIfRequired(ops))
-					yulAssert(bringUpTargetSlot(ops, ops.sourceSize()), "");
-				return true;
-			}
-			return false;
-		}
-
-		size_t sourceTop = ops.sourceSize() - 1;
-		// If we no longer need the current stack top, we pop it, unless we need an arbitrary slot at this position
-		// in the target.
-		if (
-			ops.sourceMultiplicity(sourceTop) < 0 &&
-			!ops.targetIsArbitrary(sourceTop)
-		)
-		{
-			ops.pop();
-			return true;
-		}
-
-		yulAssert(ops.targetSize() > 0, "");
-
-		// If the top is not supposed to be exactly what is on top right now, try to find a lower position to swap it to.
-		if (!ops.isCompatible(sourceTop, sourceTop) || ops.targetIsArbitrary(sourceTop))
-			for (size_t offset: ranges::views::iota(0u, std::min(ops.sourceSize(), ops.targetSize())))
-				// It makes sense to swap to a lower position, if
-				if (
-					!ops.isCompatible(offset, offset) && // The lower slot is not already in position.
-					!ops.sourceIsSame(offset, sourceTop) && // We would not just swap identical slots.
-					ops.isCompatible(sourceTop, offset) // The lower position wants to have this slot.
-				)
-				{
-					// We cannot swap that deep.
-					if (ops.sourceSize() - offset - 1 > 16)
-					{
-						// If there is a reachable slot to be removed, park the current top there.
-						for (size_t swapDepth: ranges::views::iota(1u, 17u) | ranges::views::reverse)
-							if (ops.sourceMultiplicity(ops.sourceSize() - 1 - swapDepth) < 0)
-							{
-								ops.swap(swapDepth);
-								if (ops.targetIsArbitrary(sourceTop))
-									// Usually we keep a slot that is to-be-removed, if the current top is arbitrary.
-									// However, since we are in a stack-too-deep situation, pop it immediately
-									// to compress the stack (we can always push back junk in the end).
-									ops.pop();
-								return true;
-							}
-						// Otherwise we rely on stack compression or stack-to-memory.
-					}
-					ops.swap(ops.sourceSize() - offset - 1);
-					return true;
-				}
-
-		// ops.sourceSize() > ops.targetSize() cannot be true anymore, since if the source top is no longer required,
-		// we already popped it, and if it is required, we already swapped it down to a suitable target position.
-		yulAssert(ops.sourceSize() <= ops.targetSize(), "");
-
-		// If a lower slot should be removed, try to bring up the slot that should end up there and bring it up.
-		// Note that after the cases above, there will always be a target slot to duplicate in this case.
-		for (size_t offset: ranges::views::iota(0u, ops.sourceSize()))
-			if (
-				!ops.isCompatible(offset, offset) && // The lower slot is not already in position.
-				ops.sourceMultiplicity(offset) < 0 && // We have too many copies of this slot.
-				offset <= ops.targetSize() && // There is a target slot at this position.
-				!ops.targetIsArbitrary(offset) // And that target slot is not arbitrary.
-			)
-			{
-				if (!dupDeepSlotIfRequired(ops))
-					yulAssert(bringUpTargetSlot(ops, offset), "");
-				return true;
-			}
-
-		// At this point we want to keep all slots.
-		for (size_t i = 0; i < ops.sourceSize(); ++i)
-			yulAssert(ops.sourceMultiplicity(i) >= 0, "");
-		yulAssert(ops.sourceSize() <= ops.targetSize(), "");
-
-		// If the top is not in position, try to find a slot that wants to be at the top and swap it up.
-		if (!ops.isCompatible(sourceTop, sourceTop))
-			for (size_t sourceOffset: ranges::views::iota(0u, ops.sourceSize()))
-				if (
-					!ops.isCompatible(sourceOffset, sourceOffset) &&
-					ops.isCompatible(sourceOffset, sourceTop)
-				)
-				{
-					ops.swap(ops.sourceSize() - sourceOffset - 1);
-					return true;
-				}
-
-		// If we still need more slots, produce a suitable one.
-		if (ops.sourceSize() < ops.targetSize())
-		{
-			if (!dupDeepSlotIfRequired(ops))
-				yulAssert(bringUpTargetSlot(ops, ops.sourceSize()), "");
-			return true;
-		}
-
-		// The stack has the correct size, each slot has the correct number of copies and the top is in position.
-		yulAssert(ops.sourceSize() == ops.targetSize(), "");
-		size_t size = ops.sourceSize();
-		for (size_t i = 0; i < ops.sourceSize(); ++i)
-			yulAssert(ops.sourceMultiplicity(i) == 0 && (ops.targetIsArbitrary(i) || ops.targetMultiplicity(i) == 0), "");
-		yulAssert(ops.isCompatible(sourceTop, sourceTop), "");
-
-		auto swappableOffsets = ranges::views::iota(size > 17 ? size - 17 : 0u, size);
-
-		// If we find a lower slot that is out of position, but also compatible with the top, swap that up.
-		for (size_t offset: swappableOffsets)
-			if (!ops.isCompatible(offset, offset) && ops.isCompatible(sourceTop, offset))
-			{
-				ops.swap(size - offset - 1);
-				return true;
-			}
-		// Swap up any reachable slot that is still out of position.
-		for (size_t offset: swappableOffsets)
-			if (!ops.isCompatible(offset, offset) && !ops.sourceIsSame(offset, sourceTop))
-			{
-				ops.swap(size - offset - 1);
-				return true;
-			}
-		// We are in a stack-too-deep situation and try to reduce the stack size.
-		// If the current top is merely kept since the target slot is arbitrary, pop it.
-		if (ops.targetIsArbitrary(sourceTop) && ops.sourceMultiplicity(sourceTop) <= 0)
-		{
-			ops.pop();
-			return true;
-		}
-		// If any reachable slot is merely kept, since the target slot is arbitrary, swap it up and pop it.
-		for (size_t offset: swappableOffsets)
-			if (ops.targetIsArbitrary(offset) && ops.sourceMultiplicity(offset) <= 0)
-			{
-				ops.swap(size - offset - 1);
-				ops.pop();
-				return true;
-			}
-		// We cannot avoid a stack-too-deep error. Repeat the above without restricting to reachable slots.
-		for (size_t offset: ranges::views::iota(0u, size))
-			if (!ops.isCompatible(offset, offset) && ops.isCompatible(sourceTop, offset))
-			{
-				ops.swap(size - offset - 1);
-				return true;
-			}
-		for (size_t offset: ranges::views::iota(0u, size))
-			if (!ops.isCompatible(offset, offset) && !ops.sourceIsSame(offset, sourceTop))
-			{
-				ops.swap(size - offset - 1);
-				return true;
-			}
-		yulAssert(false, "");
-
-		// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-		throw std::exception();
-	}
-};
-
-/// A simple optimized map for mapping StackSlots to ints.
-class Multiplicity
-{
-public:
-	int& operator[](StackSlot const& _slot)
-	{
-		if (auto* p = std::get_if<FunctionCallReturnLabelSlot>(&_slot))
-			return m_functionCallReturnLabelSlotMultiplicity[*p];
-		if (std::holds_alternative<FunctionReturnLabelSlot>(_slot))
-			return m_functionReturnLabelSlotMultiplicity;
-		if (auto* p = std::get_if<VariableSlot>(&_slot))
-			return m_variableSlotMultiplicity[*p];
-		if (auto* p = std::get_if<LiteralSlot>(&_slot))
-			return m_literalSlotMultiplicity[*p];
-		if (auto* p = std::get_if<TemporarySlot>(&_slot))
-			return m_temporarySlotMultiplicity[*p];
-		yulAssert(std::holds_alternative<JunkSlot>(_slot));
-		return m_junkSlotMultiplicity;
-	}
-
-	int at(StackSlot const& _slot) const
-	{
-		if (auto* p = std::get_if<FunctionCallReturnLabelSlot>(&_slot))
-			return m_functionCallReturnLabelSlotMultiplicity.at(*p);
-		if (std::holds_alternative<FunctionReturnLabelSlot>(_slot))
-			return m_functionReturnLabelSlotMultiplicity;
-		if (auto* p = std::get_if<VariableSlot>(&_slot))
-			return m_variableSlotMultiplicity.at(*p);
-		if (auto* p = std::get_if<LiteralSlot>(&_slot))
-			return m_literalSlotMultiplicity.at(*p);
-		if (auto* p = std::get_if<TemporarySlot>(&_slot))
-			return m_temporarySlotMultiplicity.at(*p);
-		yulAssert(std::holds_alternative<JunkSlot>(_slot));
-		return m_junkSlotMultiplicity;
-	}
-
-private:
-	std::map<FunctionCallReturnLabelSlot, int> m_functionCallReturnLabelSlotMultiplicity;
-	int m_functionReturnLabelSlotMultiplicity = 0;
-	std::map<VariableSlot, int> m_variableSlotMultiplicity;
-	std::map<LiteralSlot, int> m_literalSlotMultiplicity;
-	std::map<TemporarySlot, int> m_temporarySlotMultiplicity;
-	int m_junkSlotMultiplicity = 0;
-};
-
-/// Transforms @a _currentStack to @a _targetStack, invoking the provided shuffling operations.
-/// Modifies @a _currentStack itself after each invocation of the shuffling operations.
-/// @a _swap is a function with signature void(unsigned) that is called when the top most slot is swapped with
-/// the slot `depth` slots below the top. In terms of EVM opcodes this is supposed to be a `SWAP<depth>`.
-/// @a _pushOrDup is a function with signature void(StackSlot const&) that is called to push or dup the slot given as
-/// its argument to the stack top.
-/// @a _pop is a function with signature void() that is called when the top most slot is popped.
-template<typename Swap, typename PushOrDup, typename Pop>
-void createStackLayout(Stack& _currentStack, Stack const& _targetStack, Swap _swap, PushOrDup _pushOrDup, Pop _pop)
-{
-	struct ShuffleOperations
-	{
-		Stack& currentStack;
-		Stack const& targetStack;
-		Swap swapCallback;
-		PushOrDup pushOrDupCallback;
-		Pop popCallback;
-		Multiplicity multiplicity;
-		ShuffleOperations(
-			Stack& _currentStack,
-			Stack const& _targetStack,
-			Swap _swap,
-			PushOrDup _pushOrDup,
-			Pop _pop
-		):
-			currentStack(_currentStack),
-			targetStack(_targetStack),
-			swapCallback(_swap),
-			pushOrDupCallback(_pushOrDup),
-			popCallback(_pop)
-		{
-			for (auto const& slot: currentStack)
-				--multiplicity[slot];
-			for (auto&& [offset, slot]: targetStack | ranges::views::enumerate)
-				if (std::holds_alternative<JunkSlot>(slot) && offset < currentStack.size())
-					++multiplicity[currentStack.at(offset)];
-				else
-					++multiplicity[slot];
-		}
-		bool isCompatible(size_t _source, size_t _target)
-		{
-			return
-				_source < currentStack.size() &&
-				_target < targetStack.size() &&
-				(
-					std::holds_alternative<JunkSlot>(targetStack.at(_target)) ||
-					currentStack.at(_source) == targetStack.at(_target)
-				);
-		}
-		bool sourceIsSame(size_t _lhs, size_t _rhs) { return currentStack.at(_lhs) == currentStack.at(_rhs); }
-		int sourceMultiplicity(size_t _offset) { return multiplicity.at(currentStack.at(_offset)); }
-		int targetMultiplicity(size_t _offset) { return multiplicity.at(targetStack.at(_offset)); }
-		bool targetIsArbitrary(size_t offset)
-		{
-			return offset < targetStack.size() && std::holds_alternative<JunkSlot>(targetStack.at(offset));
-		}
-		void swap(size_t _i)
-		{
-			swapCallback(static_cast<unsigned>(_i));
-			std::swap(currentStack.at(currentStack.size() - _i - 1), currentStack.back());
-		}
-		size_t sourceSize() { return currentStack.size(); }
-		size_t targetSize() { return targetStack.size(); }
-		void pop()
-		{
-			popCallback();
-			currentStack.pop_back();
-		}
-		void pushOrDupTarget(size_t _offset)
-		{
-			auto const& targetSlot = targetStack.at(_offset);
-			pushOrDupCallback(targetSlot);
-			currentStack.push_back(targetSlot);
-		}
-	};
-
-	Shuffler<ShuffleOperations>::shuffle(_currentStack, _targetStack, _swap, _pushOrDup, _pop);
-
-	yulAssert(_currentStack.size() == _targetStack.size(), "");
-	for (auto&& [current, target]: ranges::zip_view(_currentStack, _targetStack))
-		if (std::holds_alternative<JunkSlot>(target))
-			current = JunkSlot{};
-		else
-			yulAssert(current == target, "");
-}
-
-}
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
deleted file mode 100644
index 88190b45b3fc..000000000000
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Stack layout generator for Yul to EVM code generation.
- */
-
-#include <libyul/backends/evm/StackLayoutGenerator.h>
-
-#include <libyul/backends/evm/StackHelpers.h>
-
-#include <libevmasm/GasMeter.h>
-
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/cxx20.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/algorithm/any_of.hpp>
-#include <range/v3/algorithm/find.hpp>
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/all.hpp>
-#include <range/v3/view/concat.hpp>
-#include <range/v3/view/drop.hpp>
-#include <range/v3/view/drop_last.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/view/iota.hpp>
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/take.hpp>
-#include <range/v3/view/take_last.hpp>
-#include <range/v3/view/transform.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-StackLayout StackLayoutGenerator::run(CFG const& _cfg)
-{
-	StackLayout stackLayout;
-	StackLayoutGenerator{stackLayout, nullptr}.processEntryPoint(*_cfg.entry);
-
-	for (auto& functionInfo: _cfg.functionInfo | ranges::views::values)
-		StackLayoutGenerator{stackLayout, &functionInfo}.processEntryPoint(*functionInfo.entry, &functionInfo);
-
-	return stackLayout;
-}
-
-std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg)
-{
-	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> stackTooDeepErrors;
-	stackTooDeepErrors[YulString{}] = reportStackTooDeep(_cfg, YulString{});
-	for (auto const& function: _cfg.functions)
-		if (auto errors = reportStackTooDeep(_cfg, function->name); !errors.empty())
-			stackTooDeepErrors[function->name] = std::move(errors);
-	return stackTooDeepErrors;
-}
-
-std::vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg, YulString _functionName)
-{
-	StackLayout stackLayout;
-	CFG::FunctionInfo const* functionInfo = nullptr;
-	if (!_functionName.empty())
-	{
-		functionInfo = &ranges::find(
-			_cfg.functionInfo,
-			_functionName,
-			util::mapTuple([](auto&&, auto&& info) { return info.function.name; })
-		)->second;
-		yulAssert(functionInfo, "Function not found.");
-	}
-
-	StackLayoutGenerator generator{stackLayout, functionInfo};
-	CFG::BasicBlock const* entry = functionInfo ? functionInfo->entry : _cfg.entry;
-	generator.processEntryPoint(*entry);
-	return generator.reportStackTooDeep(*entry);
-}
-
-StackLayoutGenerator::StackLayoutGenerator(StackLayout& _layout, CFG::FunctionInfo const* _functionInfo):
-	m_layout(_layout),
-	m_currentFunctionInfo(_functionInfo)
-{
-}
-
-namespace
-{
-/// @returns all stack too deep errors that would occur when shuffling @a _source to @a _target.
-std::vector<StackLayoutGenerator::StackTooDeep> findStackTooDeep(Stack const& _source, Stack const& _target)
-{
-	Stack currentStack = _source;
-	std::vector<StackLayoutGenerator::StackTooDeep> stackTooDeepErrors;
-	auto getVariableChoices = [](auto&& _range) {
-		std::vector<YulString> result;
-		for (auto const& slot: _range)
-			if (auto const* variableSlot = std::get_if<VariableSlot>(&slot))
-				if (!util::contains(result, variableSlot->variable.get().name))
-					result.push_back(variableSlot->variable.get().name);
-		return result;
-	};
-	::createStackLayout(
-		currentStack,
-		_target,
-		[&](unsigned _i)
-		{
-			if (_i > 16)
-				stackTooDeepErrors.emplace_back(StackLayoutGenerator::StackTooDeep{
-					_i - 16,
-					getVariableChoices(currentStack | ranges::views::take_last(_i + 1))
-				});
-		},
-		[&](StackSlot const& _slot)
-		{
-			if (canBeFreelyGenerated(_slot))
-				return;
-			if (
-				auto depth = util::findOffset(currentStack | ranges::views::reverse, _slot);
-				depth && *depth >= 16
-			)
-				stackTooDeepErrors.emplace_back(StackLayoutGenerator::StackTooDeep{
-					*depth - 15,
-					getVariableChoices(currentStack | ranges::views::take_last(*depth + 1))
-				});
-		},
-		[&]() {}
-	);
-	return stackTooDeepErrors;
-}
-
-/// @returns the ideal stack to have before executing an operation that outputs @a _operationOutput, s.t.
-/// shuffling to @a _post is cheap (excluding the input of the operation itself).
-/// If @a _generateSlotOnTheFly returns true for a slot, this slot should not occur in the ideal stack, but
-/// rather be generated on the fly during shuffling.
-template<typename Callable>
-Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Callable _generateSlotOnTheFly)
-{
-	struct PreviousSlot { size_t slot; };
-
-	// Determine the number of slots that have to be on stack before executing the operation (excluding
-	// the inputs of the operation itself).
-	// That is slots that should not be generated on the fly and are not outputs of the operation.
-	size_t preOperationLayoutSize = _post.size();
-	for (auto const& slot: _post)
-		if (util::contains(_operationOutput, slot) || _generateSlotOnTheFly(slot))
-			--preOperationLayoutSize;
-
-	// The symbolic layout directly after the operation has the form
-	// PreviousSlot{0}, ..., PreviousSlot{n}, [output<0>], ..., [output<m>]
-	auto layout = ranges::views::iota(0u, preOperationLayoutSize) |
-		ranges::views::transform([](size_t _index) { return PreviousSlot{_index}; }) |
-		ranges::to<std::vector<std::variant<PreviousSlot, StackSlot>>>;
-	layout += _operationOutput;
-
-	// Shortcut for trivial case.
-	if (layout.empty())
-		return Stack{};
-
-	// Next we will shuffle the layout to the post stack using ShuffleOperations
-	// that are aware of PreviousSlot's.
-	struct ShuffleOperations
-	{
-		std::vector<std::variant<PreviousSlot, StackSlot>>& layout;
-		Stack const& post;
-		std::set<StackSlot> outputs;
-		Multiplicity multiplicity;
-		Callable generateSlotOnTheFly;
-		ShuffleOperations(
-			std::vector<std::variant<PreviousSlot, StackSlot>>& _layout,
-			Stack const& _post,
-			Callable _generateSlotOnTheFly
-		): layout(_layout), post(_post), generateSlotOnTheFly(_generateSlotOnTheFly)
-		{
-			for (auto const& layoutSlot: layout)
-				if (StackSlot const* slot = std::get_if<StackSlot>(&layoutSlot))
-					outputs.insert(*slot);
-
-			for (auto const& layoutSlot: layout)
-				if (StackSlot const* slot = std::get_if<StackSlot>(&layoutSlot))
-					--multiplicity[*slot];
-			for (auto&& slot: post)
-				if (outputs.count(slot) || generateSlotOnTheFly(slot))
-					++multiplicity[slot];
-		}
-		bool isCompatible(size_t _source, size_t _target)
-		{
-			return
-				_source < layout.size() &&
-				_target < post.size() &&
-				(
-					std::holds_alternative<JunkSlot>(post.at(_target)) ||
-					std::visit(util::GenericVisitor{
-						[&](PreviousSlot const&) {
-							return !outputs.count(post.at(_target)) && !generateSlotOnTheFly(post.at(_target));
-						},
-						[&](StackSlot const& _s) { return _s == post.at(_target); }
-					}, layout.at(_source))
-				);
-		}
-		bool sourceIsSame(size_t _lhs, size_t _rhs)
-		{
-			return std::visit(util::GenericVisitor{
-				[&](PreviousSlot const&, PreviousSlot const&) { return true; },
-				[&](StackSlot const& _lhs, StackSlot const& _rhs) { return _lhs == _rhs; },
-				[&](auto const&, auto const&) { return false; }
-			}, layout.at(_lhs), layout.at(_rhs));
-		}
-		int sourceMultiplicity(size_t _offset)
-		{
-			return std::visit(util::GenericVisitor{
-				[&](PreviousSlot const&) { return 0; },
-				[&](StackSlot const& _s) { return multiplicity.at(_s); }
-			}, layout.at(_offset));
-		}
-		int targetMultiplicity(size_t _offset)
-		{
-			if (!outputs.count(post.at(_offset)) && !generateSlotOnTheFly(post.at(_offset)))
-				return 0;
-			return multiplicity.at(post.at(_offset));
-		}
-		bool targetIsArbitrary(size_t _offset)
-		{
-			return _offset < post.size() && std::holds_alternative<JunkSlot>(post.at(_offset));
-		}
-		void swap(size_t _i)
-		{
-			yulAssert(!std::holds_alternative<PreviousSlot>(layout.at(layout.size() - _i - 1)) || !std::holds_alternative<PreviousSlot>(layout.back()), "");
-			std::swap(layout.at(layout.size() -  _i - 1), layout.back());
-		}
-		size_t sourceSize() { return layout.size(); }
-		size_t targetSize() { return post.size(); }
-		void pop() { layout.pop_back(); }
-		void pushOrDupTarget(size_t _offset) { layout.push_back(post.at(_offset)); }
-	};
-	Shuffler<ShuffleOperations>::shuffle(layout, _post, _generateSlotOnTheFly);
-
-	// Now we can construct the ideal layout before the operation.
-	// "layout" has shuffled the PreviousSlot{x} to new places using minimal operations to move the operation
-	// output in place. The resulting permutation of the PreviousSlot yields the ideal positions of slots
-	// before the operation, i.e. if PreviousSlot{2} is at a position at which _post contains VariableSlot{"tmp"},
-	// then we want the variable tmp in the slot at offset 2 in the layout before the operation.
-	std::vector<std::optional<StackSlot>> idealLayout(_post.size(), std::nullopt);
-	for (auto&& [slot, idealPosition]: ranges::zip_view(_post, layout))
-		if (PreviousSlot* previousSlot = std::get_if<PreviousSlot>(&idealPosition))
-			idealLayout.at(previousSlot->slot) = slot;
-
-	// The tail of layout must have contained the operation outputs and will not have been assigned slots in the last loop.
-	while (!idealLayout.empty() && !idealLayout.back())
-		idealLayout.pop_back();
-
-	yulAssert(idealLayout.size() == preOperationLayoutSize, "");
-
-	return idealLayout | ranges::views::transform([](std::optional<StackSlot> s) {
-		yulAssert(s, "");
-		return *s;
-	}) | ranges::to<Stack>;
-}
-}
-
-Stack StackLayoutGenerator::propagateStackThroughOperation(Stack _exitStack, CFG::Operation const& _operation, bool _aggressiveStackCompression)
-{
-	// Enable aggressive stack compression for recursive calls.
-	if (auto const* functionCall = std::get_if<CFG::FunctionCall>(&_operation.operation))
-		if (functionCall->recursive)
-			_aggressiveStackCompression = true;
-
-	// This is a huge tradeoff between code size, gas cost and stack size.
-	auto generateSlotOnTheFly = [&](StackSlot const& _slot) {
-		return _aggressiveStackCompression && canBeFreelyGenerated(_slot);
-	};
-
-	// Determine the ideal permutation of the slots in _exitLayout that are not operation outputs (and not to be
-	// generated on the fly), s.t. shuffling the `stack + _operation.output` to _exitLayout is cheap.
-	Stack stack = createIdealLayout(_operation.output, _exitStack, generateSlotOnTheFly);
-
-	// Make sure the resulting previous slots do not overlap with any assignmed variables.
-	if (auto const* assignment = std::get_if<CFG::Assignment>(&_operation.operation))
-		for (auto& stackSlot: stack)
-			if (auto const* varSlot = std::get_if<VariableSlot>(&stackSlot))
-				yulAssert(!util::contains(assignment->variables, *varSlot), "");
-
-	// Since stack+_operation.output can be easily shuffled to _exitLayout, the desired layout before the operation
-	// is stack+_operation.input;
-	stack += _operation.input;
-
-	// Store the exact desired operation entry layout. The stored layout will be recreated by the code transform
-	// before executing the operation. However, this recreation can produce slots that can be freely generated or
-	// are duplicated, i.e. we can compress the stack afterwards without causing problems for code generation later.
-	m_layout.operationEntryLayout[&_operation] = stack;
-
-	// Remove anything from the stack top that can be freely generated or dupped from deeper on the stack.
-	while (!stack.empty())
-	{
-		if (canBeFreelyGenerated(stack.back()))
-			stack.pop_back();
-		else if (auto offset = util::findOffset(stack | ranges::views::reverse | ranges::views::drop(1), stack.back()))
-		{
-			if (*offset + 2 < 16)
-				stack.pop_back();
-			else
-				break;
-		}
-		else
-			break;
-	}
-
-	return stack;
-}
-
-Stack StackLayoutGenerator::propagateStackThroughBlock(Stack _exitStack, CFG::BasicBlock const& _block, bool _aggressiveStackCompression)
-{
-	Stack stack = _exitStack;
-	for (auto&& [idx, operation]: _block.operations | ranges::views::enumerate | ranges::views::reverse)
-	{
-		Stack newStack = propagateStackThroughOperation(stack, operation, _aggressiveStackCompression);
-		if (!_aggressiveStackCompression && !findStackTooDeep(newStack, stack).empty())
-			// If we had stack errors, run again with aggressive stack compression.
-			return propagateStackThroughBlock(std::move(_exitStack), _block, true);
-		stack = std::move(newStack);
-	}
-
-	return stack;
-}
-
-void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry, CFG::FunctionInfo const* _functionInfo)
-{
-	std::list<CFG::BasicBlock const*> toVisit{&_entry};
-	std::set<CFG::BasicBlock const*> visited;
-
-	// TODO: check whether visiting only a subset of these in the outer iteration below is enough.
-	std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> backwardsJumps = collectBackwardsJumps(_entry);
-
-	while (!toVisit.empty())
-	{
-		// First calculate stack layouts without walking backwards jumps, i.e. assuming the current preliminary
-		// entry layout of the backwards jump target as the initial exit layout of the backwards-jumping block.
-		while (!toVisit.empty())
-		{
-			CFG::BasicBlock const *block = *toVisit.begin();
-			toVisit.pop_front();
-
-			if (visited.count(block))
-				continue;
-
-			if (std::optional<Stack> exitLayout = getExitLayoutOrStageDependencies(*block, visited, toVisit))
-			{
-				visited.emplace(block);
-				auto& info = m_layout.blockInfos[block];
-				info.exitLayout = *exitLayout;
-				info.entryLayout = propagateStackThroughBlock(info.exitLayout, *block);
-
-				for (auto entry: block->entries)
-					toVisit.emplace_back(entry);
-			}
-			else
-				continue;
-		}
-
-		// Determine which backwards jumps still require fixing and stage revisits of appropriate nodes.
-		for (auto [jumpingBlock, target]: backwardsJumps)
-			// This block jumps backwards, but does not provide all slots required by the jump target on exit.
-			// Therefore we need to visit the subgraph between ``target`` and ``jumpingBlock`` again.
-			if (ranges::any_of(
-				m_layout.blockInfos[target].entryLayout,
-				[exitLayout = m_layout.blockInfos[jumpingBlock].exitLayout](StackSlot const& _slot) {
-					return !util::contains(exitLayout, _slot);
-				}
-			))
-			{
-				// In particular we can visit backwards starting from ``jumpingBlock`` and mark all entries to-be-visited-
-				// again until we hit ``target``.
-				toVisit.emplace_front(jumpingBlock);
-				// Since we are likely to permute the entry layout of ``target``, we also visit its entries again.
-				// This is not required for correctness, since the set of stack slots will match, but it may move some
-				// required stack shuffling from the loop condition to outside the loop.
-				for (CFG::BasicBlock const* entry: target->entries)
-					visited.erase(entry);
-				util::BreadthFirstSearch<CFG::BasicBlock const*>{{jumpingBlock}}.run(
-					[&visited, target = target](CFG::BasicBlock const* _block, auto _addChild) {
-						visited.erase(_block);
-						if (_block == target)
-							return;
-						for (auto const* entry: _block->entries)
-							_addChild(entry);
-					}
-				);
-				// While the shuffled layout for ``target`` will be compatible, it can be worthwhile propagating
-				// it further up once more.
-				// This would mean not stopping at _block == target above, resp. even doing visited.clear() here, revisiting the entire graph.
-				// This is a tradeoff between the runtime of this process and the optimality of the result.
-				// Also note that while visiting the entire graph again *can* be helpful, it can also be detrimental.
-			}
-	}
-
-	stitchConditionalJumps(_entry);
-	fillInJunk(_entry, _functionInfo);
-}
-
-std::optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
-	CFG::BasicBlock const& _block,
-	std::set<CFG::BasicBlock const*> const& _visited,
-	std::list<CFG::BasicBlock const*>& _toVisit
-) const
-{
-	return std::visit(util::GenericVisitor{
-		[&](CFG::BasicBlock::MainExit const&) -> std::optional<Stack>
-		{
-			// On the exit of the outermost block the stack can be empty.
-			return Stack{};
-		},
-		[&](CFG::BasicBlock::Jump const& _jump) -> std::optional<Stack>
-		{
-			if (_jump.backwards)
-			{
-				// Choose the best currently known entry layout of the jump target as initial exit.
-				// Note that this may not yet be the final layout.
-				if (auto* info = util::valueOrNullptr(m_layout.blockInfos, _jump.target))
-					return info->entryLayout;
-				return Stack{};
-			}
-			// If the current iteration has already visited the jump target, start from its entry layout.
-			if (_visited.count(_jump.target))
-				return m_layout.blockInfos.at(_jump.target).entryLayout;
-			// Otherwise stage the jump target for visit and defer the current block.
-			_toVisit.emplace_front(_jump.target);
-			return std::nullopt;
-		},
-		[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump) -> std::optional<Stack>
-		{
-			bool zeroVisited = _visited.count(_conditionalJump.zero);
-			bool nonZeroVisited = _visited.count(_conditionalJump.nonZero);
-			if (zeroVisited && nonZeroVisited)
-			{
-				// If the current iteration has already visited both jump targets, start from its entry layout.
-				Stack stack = combineStack(
-					m_layout.blockInfos.at(_conditionalJump.zero).entryLayout,
-					m_layout.blockInfos.at(_conditionalJump.nonZero).entryLayout
-				);
-				// Additionally, the jump condition has to be at the stack top at exit.
-				stack.emplace_back(_conditionalJump.condition);
-				return stack;
-			}
-			// If one of the jump targets has not been visited, stage it for visit and defer the current block.
-			if (!zeroVisited)
-				_toVisit.emplace_front(_conditionalJump.zero);
-			if (!nonZeroVisited)
-				_toVisit.emplace_front(_conditionalJump.nonZero);
-			return std::nullopt;
-		},
-		[&](CFG::BasicBlock::FunctionReturn const& _functionReturn) -> std::optional<Stack>
-		{
-			// A function return needs the return variables and the function return label slot on stack.
-			yulAssert(_functionReturn.info, "");
-			Stack stack = _functionReturn.info->returnVariables | ranges::views::transform([](auto const& _varSlot){
-				return StackSlot{_varSlot};
-			}) | ranges::to<Stack>;
-			stack.emplace_back(FunctionReturnLabelSlot{_functionReturn.info->function});
-			return stack;
-		},
-		[&](CFG::BasicBlock::Terminated const&) -> std::optional<Stack>
-		{
-			// A terminating block can have an empty stack on exit.
-			return Stack{};
-		},
-	}, _block.exit);
-}
-
-std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> StackLayoutGenerator::collectBackwardsJumps(CFG::BasicBlock const& _entry) const
-{
-	std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> backwardsJumps;
-	util::BreadthFirstSearch<CFG::BasicBlock const*>{{&_entry}}.run([&](CFG::BasicBlock const* _block, auto _addChild) {
-		std::visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::MainExit const&) {},
-			[&](CFG::BasicBlock::Jump const& _jump)
-			{
-				if (_jump.backwards)
-					backwardsJumps.emplace_back(_block, _jump.target);
-				_addChild(_jump.target);
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			{
-				_addChild(_conditionalJump.zero);
-				_addChild(_conditionalJump.nonZero);
-			},
-			[&](CFG::BasicBlock::FunctionReturn const&) {},
-			[&](CFG::BasicBlock::Terminated const&) {},
-		}, _block->exit);
-	});
-	return backwardsJumps;
-}
-
-void StackLayoutGenerator::stitchConditionalJumps(CFG::BasicBlock const& _block)
-{
-	util::BreadthFirstSearch<CFG::BasicBlock const*> breadthFirstSearch{{&_block}};
-	breadthFirstSearch.run([&](CFG::BasicBlock const* _block, auto _addChild) {
-		auto& info = m_layout.blockInfos.at(_block);
-		std::visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::MainExit const&) {},
-			[&](CFG::BasicBlock::Jump const& _jump)
-			{
-				if (!_jump.backwards)
-					_addChild(_jump.target);
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			{
-				auto& zeroTargetInfo = m_layout.blockInfos.at(_conditionalJump.zero);
-				auto& nonZeroTargetInfo = m_layout.blockInfos.at(_conditionalJump.nonZero);
-				Stack exitLayout = info.exitLayout;
-
-				// The last block must have produced the condition at the stack top.
-				yulAssert(!exitLayout.empty(), "");
-				yulAssert(exitLayout.back() == _conditionalJump.condition, "");
-				// The condition is consumed by the jump.
-				exitLayout.pop_back();
-
-				auto fixJumpTargetEntry = [&](Stack const& _originalEntryLayout) -> Stack {
-					Stack newEntryLayout = exitLayout;
-					// Whatever the block being jumped to does not actually require, can be marked as junk.
-					for (auto& slot: newEntryLayout)
-						if (!util::contains(_originalEntryLayout, slot))
-							slot = JunkSlot{};
-					// Make sure everything the block being jumped to requires is actually present or can be generated.
-					for (auto const& slot: _originalEntryLayout)
-						yulAssert(canBeFreelyGenerated(slot) || util::contains(newEntryLayout, slot), "");
-					return newEntryLayout;
-				};
-				zeroTargetInfo.entryLayout = fixJumpTargetEntry(zeroTargetInfo.entryLayout);
-				nonZeroTargetInfo.entryLayout = fixJumpTargetEntry(nonZeroTargetInfo.entryLayout);
-				_addChild(_conditionalJump.zero);
-				_addChild(_conditionalJump.nonZero);
-			},
-			[&](CFG::BasicBlock::FunctionReturn const&)	{},
-			[&](CFG::BasicBlock::Terminated const&) { },
-		}, _block->exit);
-	});
-}
-
-Stack StackLayoutGenerator::combineStack(Stack const& _stack1, Stack const& _stack2)
-{
-	// TODO: it would be nicer to replace this by a constructive algorithm.
-	// Currently it uses a reduced version of the Heap Algorithm to partly brute-force, which seems
-	// to work decently well.
-
-	Stack commonPrefix;
-	for (auto&& [slot1, slot2]: ranges::zip_view(_stack1, _stack2))
-	{
-		if (!(slot1 == slot2))
-			break;
-		commonPrefix.emplace_back(slot1);
-	}
-
-	Stack stack1Tail = _stack1 | ranges::views::drop(commonPrefix.size()) | ranges::to<Stack>;
-	Stack stack2Tail = _stack2 | ranges::views::drop(commonPrefix.size()) | ranges::to<Stack>;
-
-	if (stack1Tail.empty())
-		return commonPrefix + compressStack(stack2Tail);
-	if (stack2Tail.empty())
-		return commonPrefix + compressStack(stack1Tail);
-
-	Stack candidate;
-	for (auto slot: stack1Tail)
-		if (!util::contains(candidate, slot))
-			candidate.emplace_back(slot);
-	for (auto slot: stack2Tail)
-		if (!util::contains(candidate, slot))
-			candidate.emplace_back(slot);
-	cxx20::erase_if(candidate, [](StackSlot const& slot) {
-		return std::holds_alternative<LiteralSlot>(slot) || std::holds_alternative<FunctionCallReturnLabelSlot>(slot);
-	});
-
-	auto evaluate = [&](Stack const& _candidate) -> size_t {
-		size_t numOps = 0;
-		Stack testStack = _candidate;
-		auto swap = [&](unsigned _swapDepth) { ++numOps; if (_swapDepth > 16) numOps += 1000; };
-		auto dupOrPush = [&](StackSlot const& _slot)
-		{
-			if (canBeFreelyGenerated(_slot))
-				return;
-			auto depth = util::findOffset(ranges::concat_view(commonPrefix, testStack) | ranges::views::reverse, _slot);
-			if (depth && *depth >= 16)
-				numOps += 1000;
-		};
-		createStackLayout(testStack, stack1Tail, swap, dupOrPush, [&](){});
-		testStack = _candidate;
-		createStackLayout(testStack, stack2Tail, swap, dupOrPush, [&](){});
-		return numOps;
-	};
-
-	// See https://en.wikipedia.org/wiki/Heap's_algorithm
-	size_t n = candidate.size();
-	Stack bestCandidate = candidate;
-	size_t bestCost = evaluate(candidate);
-	std::vector<size_t> c(n, 0);
-	size_t i = 1;
-	while (i < n)
-	{
-		if (c[i] < i)
-		{
-			if (i & 1)
-				std::swap(candidate.front(), candidate[i]);
-			else
-				std::swap(candidate[c[i]], candidate[i]);
-			size_t cost = evaluate(candidate);
-			if (cost < bestCost)
-			{
-				bestCost = cost;
-				bestCandidate = candidate;
-			}
-			++c[i];
-			// Note that for a proper implementation of the Heap algorithm this would need to revert back to ``i = 1.``
-			// However, the incorrect implementation produces decent result and the proper version would have n!
-			// complexity and is thereby not feasible.
-			++i;
-		}
-		else
-		{
-			c[i] = 0;
-			++i;
-		}
-	}
-
-	return commonPrefix + bestCandidate;
-}
-
-std::vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG::BasicBlock const& _entry) const
-{
-	std::vector<StackTooDeep> stackTooDeepErrors;
-	util::BreadthFirstSearch<CFG::BasicBlock const*> breadthFirstSearch{{&_entry}};
-	breadthFirstSearch.run([&](CFG::BasicBlock const* _block, auto _addChild) {
-		Stack currentStack = m_layout.blockInfos.at(_block).entryLayout;
-
-		for (auto const& operation: _block->operations)
-		{
-			Stack& operationEntry = m_layout.operationEntryLayout.at(&operation);
-
-			stackTooDeepErrors += findStackTooDeep(currentStack, operationEntry);
-			currentStack = operationEntry;
-			for (size_t i = 0; i < operation.input.size(); i++)
-				currentStack.pop_back();
-			currentStack += operation.output;
-		}
-		// Do not attempt to create the exit layout m_layout.blockInfos.at(_block).exitLayout here,
-		// since the code generator will directly move to the target entry layout.
-
-		std::visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::MainExit const&) {},
-			[&](CFG::BasicBlock::Jump const& _jump)
-			{
-				Stack const& targetLayout = m_layout.blockInfos.at(_jump.target).entryLayout;
-				stackTooDeepErrors += findStackTooDeep(currentStack, targetLayout);
-
-				if (!_jump.backwards)
-					_addChild(_jump.target);
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			{
-				for (Stack const& targetLayout: {
-					m_layout.blockInfos.at(_conditionalJump.zero).entryLayout,
-					m_layout.blockInfos.at(_conditionalJump.nonZero).entryLayout
-				})
-					stackTooDeepErrors += findStackTooDeep(currentStack, targetLayout);
-
-				_addChild(_conditionalJump.zero);
-				_addChild(_conditionalJump.nonZero);
-			},
-			[&](CFG::BasicBlock::FunctionReturn const&) {},
-			[&](CFG::BasicBlock::Terminated const&) {},
-		}, _block->exit);
-	});
-	return stackTooDeepErrors;
-}
-
-Stack StackLayoutGenerator::compressStack(Stack _stack)
-{
-	std::optional<size_t> firstDupOffset;
-	do
-	{
-		if (firstDupOffset)
-		{
-			std::swap(_stack.at(*firstDupOffset), _stack.back());
-			_stack.pop_back();
-			firstDupOffset.reset();
-		}
-		for (auto&& [depth, slot]: _stack | ranges::views::reverse | ranges::views::enumerate)
-			if (canBeFreelyGenerated(slot))
-			{
-				firstDupOffset = _stack.size() - depth - 1;
-				break;
-			}
-			else if (auto dupDepth = util::findOffset(_stack | ranges::views::reverse | ranges::views::drop(depth + 1), slot))
-				if (depth + *dupDepth <= 16)
-				{
-					firstDupOffset = _stack.size() - depth - 1;
-					break;
-				}
-	}
-	while (firstDupOffset);
-	return _stack;
-}
-
-void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::FunctionInfo const* _functionInfo)
-{
-	/// Recursively adds junk to the subgraph starting on @a _entry.
-	/// Since it is only called on cut-vertices, the full subgraph retains proper stack balance.
-	auto addJunkRecursive = [&](CFG::BasicBlock const* _entry, size_t _numJunk) {
-		util::BreadthFirstSearch<CFG::BasicBlock const*> breadthFirstSearch{{_entry}};
-		breadthFirstSearch.run([&](CFG::BasicBlock const* _block, auto _addChild) {
-			auto& blockInfo = m_layout.blockInfos.at(_block);
-			blockInfo.entryLayout = Stack{_numJunk, JunkSlot{}} + std::move(blockInfo.entryLayout);
-			for (auto const& operation: _block->operations)
-			{
-				auto& operationEntryLayout = m_layout.operationEntryLayout.at(&operation);
-				operationEntryLayout = Stack{_numJunk, JunkSlot{}} + std::move(operationEntryLayout);
-			}
-			blockInfo.exitLayout = Stack{_numJunk, JunkSlot{}} + std::move(blockInfo.exitLayout);
-
-			std::visit(util::GenericVisitor{
-				[&](CFG::BasicBlock::MainExit const&) {},
-				[&](CFG::BasicBlock::Jump const& _jump)
-				{
-					_addChild(_jump.target);
-				},
-				[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-				{
-					_addChild(_conditionalJump.zero);
-					_addChild(_conditionalJump.nonZero);
-				},
-				[&](CFG::BasicBlock::FunctionReturn const&) { yulAssert(false); },
-				[&](CFG::BasicBlock::Terminated const&) {},
-			}, _block->exit);
-		});
-	};
-	/// @returns the number of operations required to transform @a _source to @a _target.
-	auto evaluateTransform = [&](Stack _source, Stack const& _target) -> size_t {
-		size_t opGas = 0;
-		auto swap = [&](unsigned _swapDepth)
-		{
-			if (_swapDepth > 16)
-				opGas += 1000;
-			else
-				opGas += evmasm::GasMeter::runGas(evmasm::swapInstruction(_swapDepth), langutil::EVMVersion());
-		};
-		auto dupOrPush = [&](StackSlot const& _slot)
-		{
-			if (canBeFreelyGenerated(_slot))
-				opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(32), langutil::EVMVersion());
-			else
-			{
-				if (auto depth = util::findOffset(_source | ranges::views::reverse, _slot))
-				{
-					if (*depth < 16)
-						opGas += evmasm::GasMeter::runGas(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)), langutil::EVMVersion());
-					else
-						opGas += 1000;
-				}
-				else
-				{
-					// This has to be a previously unassigned return variable.
-					// We at least sanity-check that it is among the return variables at all.
-					yulAssert(m_currentFunctionInfo && std::holds_alternative<VariableSlot>(_slot));
-					yulAssert(util::contains(m_currentFunctionInfo->returnVariables, std::get<VariableSlot>(_slot)));
-					// Strictly speaking the cost of the PUSH0 depends on the targeted EVM version, but the difference
-					// will not matter here.
-					opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(0), langutil::EVMVersion());;
-				}
-			}
-		};
-		auto pop = [&]() { opGas += evmasm::GasMeter::runGas(evmasm::Instruction::POP,langutil::EVMVersion()); };
-		createStackLayout(_source, _target, swap, dupOrPush, pop);
-		return opGas;
-	};
-	/// @returns the number of junk slots to be prepended to @a _targetLayout for an optimal transition from
-	/// @a _entryLayout to @a _targetLayout.
-	auto getBestNumJunk = [&](Stack const& _entryLayout, Stack const& _targetLayout) -> size_t {
-		size_t bestCost = evaluateTransform(_entryLayout, _targetLayout);
-		size_t bestNumJunk = 0;
-		size_t maxJunk = _entryLayout.size();
-		for (size_t numJunk = 1; numJunk <= maxJunk; ++numJunk)
-		{
-			size_t cost = evaluateTransform(_entryLayout, Stack{numJunk, JunkSlot{}} + _targetLayout);
-			if (cost < bestCost)
-			{
-				bestCost = cost;
-				bestNumJunk = numJunk;
-			}
-		}
-		return bestNumJunk;
-	};
-
-	if (_functionInfo && !_functionInfo->canContinue && _block.allowsJunk())
-	{
-		size_t bestNumJunk = getBestNumJunk(
-			_functionInfo->parameters | ranges::views::reverse | ranges::to<Stack>,
-			m_layout.blockInfos.at(&_block).entryLayout
-		);
-		if (bestNumJunk > 0)
-			addJunkRecursive(&_block, bestNumJunk);
-	}
-
-	/// Traverses the CFG and at each block that allows junk, i.e. that is a cut-vertex that never leads to a function
-	/// return, checks if adding junk reduces the shuffling cost upon entering and if so recursively adds junk
-	/// to the spanned subgraph.
-	util::BreadthFirstSearch<CFG::BasicBlock const*>{{&_block}}.run([&](CFG::BasicBlock const* _block, auto _addChild) {
-		if (_block->allowsJunk())
-		{
-			auto& blockInfo = m_layout.blockInfos.at(_block);
-			Stack entryLayout = blockInfo.entryLayout;
-			Stack const& nextLayout = _block->operations.empty() ? blockInfo.exitLayout : m_layout.operationEntryLayout.at(&_block->operations.front());
-			if (entryLayout != nextLayout)
-			{
-				size_t bestNumJunk = getBestNumJunk(
-					entryLayout,
-					nextLayout
-				);
-				if (bestNumJunk > 0)
-				{
-					addJunkRecursive(_block, bestNumJunk);
-					blockInfo.entryLayout = entryLayout;
-				}
-			}
-		}
-		std::visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::MainExit const&) {},
-			[&](CFG::BasicBlock::Jump const& _jump)
-			{
-				_addChild(_jump.target);
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			{
-				_addChild(_conditionalJump.zero);
-				_addChild(_conditionalJump.nonZero);
-			},
-			[&](CFG::BasicBlock::FunctionReturn const&) {},
-			[&](CFG::BasicBlock::Terminated const&) {},
-		}, _block->exit);
-	});
-}
diff --git a/libyul/backends/evm/StackLayoutGenerator.h b/libyul/backends/evm/StackLayoutGenerator.h
deleted file mode 100644
index d04b80bdc02a..000000000000
--- a/libyul/backends/evm/StackLayoutGenerator.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Stack layout generator for Yul to EVM code generation.
- */
-
-#pragma once
-
-#include <libyul/backends/evm/ControlFlowGraph.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-
-struct StackLayout
-{
-	struct BlockInfo
-	{
-		/// Complete stack layout that is required for entering a block.
-		Stack entryLayout;
-		/// The resulting stack layout after executing the block.
-		Stack exitLayout;
-	};
-	std::map<CFG::BasicBlock const*, BlockInfo> blockInfos;
-	/// For each operation the complete stack layout that:
-	/// - has the slots required for the operation at the stack top.
-	/// - will have the operation result in a layout that makes it easy to achieve the next desired layout.
-	std::map<CFG::Operation const*, Stack> operationEntryLayout;
-};
-
-class StackLayoutGenerator
-{
-public:
-	struct StackTooDeep
-	{
-		/// Number of slots that need to be saved.
-		size_t deficit = 0;
-		/// Set of variables, eliminating which would decrease the stack deficit.
-		std::vector<YulString> variableChoices;
-	};
-
-	static StackLayout run(CFG const& _cfg);
-	/// @returns a map from function names to the stack too deep errors occurring in that function.
-	/// Requires @a _cfg to be a control flow graph generated from disambiguated Yul.
-	/// The empty string is mapped to the stack too deep errors of the main entry point.
-	static std::map<YulString, std::vector<StackTooDeep>> reportStackTooDeep(CFG const& _cfg);
-	/// @returns all stack too deep errors in the function named @a _functionName.
-	/// Requires @a _cfg to be a control flow graph generated from disambiguated Yul.
-	/// If @a _functionName is empty, the stack too deep errors of the main entry point are reported instead.
-	static std::vector<StackTooDeep> reportStackTooDeep(CFG const& _cfg, YulString _functionName);
-
-private:
-	StackLayoutGenerator(StackLayout& _context, CFG::FunctionInfo const* _functionInfo);
-
-	/// @returns the optimal entry stack layout, s.t. @a _operation can be applied to it and
-	/// the result can be transformed to @a _exitStack with minimal stack shuffling.
-	/// Simultaneously stores the entry layout required for executing the operation in m_layout.
-	Stack propagateStackThroughOperation(Stack _exitStack, CFG::Operation const& _operation, bool _aggressiveStackCompression = false);
-
-	/// @returns the desired stack layout at the entry of @a _block, assuming the layout after
-	/// executing the block should be @a _exitStack.
-	Stack propagateStackThroughBlock(Stack _exitStack, CFG::BasicBlock const& _block, bool _aggressiveStackCompression = false);
-
-	/// Main algorithm walking the graph from entry to exit and propagating back the stack layouts to the entries.
-	/// Iteratively reruns itself along backwards jumps until the layout is stabilized.
-	void processEntryPoint(CFG::BasicBlock const& _entry, CFG::FunctionInfo const* _functionInfo = nullptr);
-
-	/// @returns the best known exit layout of @a _block, if all dependencies are already @a _visited.
-	/// If not, adds the dependencies to @a _dependencyList and @returns std::nullopt.
-	std::optional<Stack> getExitLayoutOrStageDependencies(
-		CFG::BasicBlock const& _block,
-		std::set<CFG::BasicBlock const*> const& _visited,
-		std::list<CFG::BasicBlock const*>& _dependencyList
-	) const;
-
-	/// @returns a pair of ``{jumpingBlock, targetBlock}`` for each backwards jump in the graph starting at @a _entry.
-	std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> collectBackwardsJumps(CFG::BasicBlock const& _entry) const;
-
-	/// After the main algorithms, layouts at conditional jumps are merely compatible, i.e. the exit layout of the
-	/// jumping block is a superset of the entry layout of the target block. This function modifies the entry layouts
-	/// of conditional jump targets, s.t. the entry layout of target blocks match the exit layout of the jumping block
-	/// exactly, except that slots not required after the jump are marked as `JunkSlot`s.
-	void stitchConditionalJumps(CFG::BasicBlock const& _block);
-
-	/// Calculates the ideal stack layout, s.t. both @a _stack1 and @a _stack2 can be achieved with minimal
-	/// stack shuffling when starting from the returned layout.
-	static Stack combineStack(Stack const& _stack1, Stack const& _stack2);
-
-	/// Walks through the CFG and reports any stack too deep errors that would occur when generating code for it
-	/// without countermeasures.
-	std::vector<StackTooDeep> reportStackTooDeep(CFG::BasicBlock const& _entry) const;
-
-	/// @returns a copy of @a _stack stripped of all duplicates and slots that can be freely generated.
-	/// Attempts to create a layout that requires a minimal amount of operations to reconstruct the original
-	/// stack @a _stack.
-	static Stack compressStack(Stack _stack);
-
-	//// Fills in junk when entering branches that do not need a clean stack in case the result is cheaper.
-	void fillInJunk(CFG::BasicBlock const& _block, CFG::FunctionInfo const* _functionInfo = nullptr);
-
-	StackLayout& m_layout;
-	CFG::FunctionInfo const* m_currentFunctionInfo = nullptr;
-};
-
-}
diff --git a/libyul/backends/evm/VariableReferenceCounter.cpp b/libyul/backends/evm/VariableReferenceCounter.cpp
deleted file mode 100644
index c2afb399d28f..000000000000
--- a/libyul/backends/evm/VariableReferenceCounter.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Counts the number of references to a variable.
- */
-#include <libyul/backends/evm/VariableReferenceCounter.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/Visitor.h>
-
-using namespace solidity::yul;
-
-void VariableReferenceCounter::operator()(Identifier const& _identifier)
-{
-	increaseRefIfFound(_identifier.name);
-}
-
-void VariableReferenceCounter::operator()(FunctionDefinition const& _function)
-{
-	Scope* originalScope = m_scope;
-
-	yulAssert(m_info.virtualBlocks.at(&_function), "");
-	m_scope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get();
-	yulAssert(m_scope, "Variable scope does not exist.");
-
-	for (auto const& v: _function.returnVariables)
-		increaseRefIfFound(v.name);
-
-	(*this)(_function.body);
-
-	m_scope = originalScope;
-}
-
-void VariableReferenceCounter::operator()(ForLoop const& _forLoop)
-{
-	Scope* originalScope = m_scope;
-	// Special scoping rules.
-	m_scope = m_info.scopes.at(&_forLoop.pre).get();
-
-	walkVector(_forLoop.pre.statements);
-	visit(*_forLoop.condition);
-	(*this)(_forLoop.body);
-	(*this)(_forLoop.post);
-
-	m_scope = originalScope;
-}
-
-void VariableReferenceCounter::operator()(Block const& _block)
-{
-	Scope* originalScope = m_scope;
-	m_scope = m_info.scopes.at(&_block).get();
-
-	ASTWalker::operator()(_block);
-
-	m_scope = originalScope;
-}
-
-void VariableReferenceCounter::increaseRefIfFound(YulString _variableName)
-{
-	m_scope->lookup(_variableName, util::GenericVisitor{
-		[&](Scope::Variable const& _var)
-		{
-			++m_variableReferences[&_var];
-		},
-		[](Scope::Function const&) { }
-	});
-}
diff --git a/libyul/backends/evm/VariableReferenceCounter.h b/libyul/backends/evm/VariableReferenceCounter.h
deleted file mode 100644
index ba6404b17180..000000000000
--- a/libyul/backends/evm/VariableReferenceCounter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Counts the number of references to a variable.
- */
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/Scope.h>
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-
-/**
- * Counts the number of references to a variable. This includes actual (read) references
- * but also assignments to the variable. It does not include the declaration itself or
- * function parameters, but it does include function return parameters.
- *
- * This component can handle multiple variables of the same name.
- *
- * Can only be applied to strict assembly.
- */
-struct VariableReferenceCounter: public yul::ASTWalker
-{
-public:
-	static std::map<Scope::Variable const*, unsigned> run(AsmAnalysisInfo const& _assemblyInfo, Block const& _block)
-	{
-		VariableReferenceCounter variableReferenceCounter(_assemblyInfo);
-		variableReferenceCounter(_block);
-		return std::move(variableReferenceCounter.m_variableReferences);
-	}
-
-protected:
-	void operator()(Block const& _block) override;
-	void operator()(Identifier const& _identifier) override;
-	void operator()(FunctionDefinition const&) override;
-	void operator()(ForLoop const&) override;
-
-private:
-	explicit VariableReferenceCounter(
-		AsmAnalysisInfo const& _assemblyInfo
-	): m_info(_assemblyInfo)
-	{}
-
-	void increaseRefIfFound(YulString _variableName);
-
-	AsmAnalysisInfo const& m_info;
-	Scope* m_scope = nullptr;
-	std::map<Scope::Variable const*, unsigned> m_variableReferences;
-};
-
-}
diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
deleted file mode 100644
index 9f41079418b2..000000000000
--- a/libyul/optimiser/ASTCopier.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Creates an independent copy of an AST, renaming identifiers to be unique.
- */
-
-#include <libyul/optimiser/ASTCopier.h>
-
-#include <libyul/AST.h>
-
-#include <libsolutil/Common.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-Statement ASTCopier::operator()(ExpressionStatement const& _statement)
-{
-	return ExpressionStatement{ _statement.debugData, translate(_statement.expression) };
-}
-
-Statement ASTCopier::operator()(VariableDeclaration const& _varDecl)
-{
-	return VariableDeclaration{
-		_varDecl.debugData,
-		translateVector(_varDecl.variables),
-		translate(_varDecl.value)
-	};
-}
-
-Statement ASTCopier::operator()(Assignment const& _assignment)
-{
-	return Assignment{
-		_assignment.debugData,
-		translateVector(_assignment.variableNames),
-		translate(_assignment.value)
-	};
-}
-
-Expression ASTCopier::operator()(FunctionCall const& _call)
-{
-	return FunctionCall{
-		_call.debugData,
-		translate(_call.functionName),
-		translateVector(_call.arguments)
-	};
-}
-
-Expression ASTCopier::operator()(Identifier const& _identifier)
-{
-	return translate(_identifier);
-}
-
-Expression ASTCopier::operator()(Literal const& _literal)
-{
-	return translate(_literal);
-}
-
-Statement ASTCopier::operator()(If const& _if)
-{
-	return If{_if.debugData, translate(_if.condition), translate(_if.body)};
-}
-
-Statement ASTCopier::operator()(Switch const& _switch)
-{
-	return Switch{_switch.debugData, translate(_switch.expression), translateVector(_switch.cases)};
-}
-
-Statement ASTCopier::operator()(FunctionDefinition const& _function)
-{
-	YulString translatedName = translateIdentifier(_function.name);
-
-	enterFunction(_function);
-	ScopeGuard g([&]() { this->leaveFunction(_function); });
-
-	return FunctionDefinition{
-		_function.debugData,
-		translatedName,
-		translateVector(_function.parameters),
-		translateVector(_function.returnVariables),
-		translate(_function.body)
-	};
-}
-
-Statement ASTCopier::operator()(ForLoop const& _forLoop)
-{
-	enterScope(_forLoop.pre);
-	ScopeGuard g([&]() { this->leaveScope(_forLoop.pre); });
-
-	return ForLoop{
-		_forLoop.debugData,
-		translate(_forLoop.pre),
-		translate(_forLoop.condition),
-		translate(_forLoop.post),
-		translate(_forLoop.body)
-	};
-}
-Statement ASTCopier::operator()(Break const& _break)
-{
-	return Break{ _break };
-}
-
-Statement ASTCopier::operator()(Continue const& _continue)
-{
-	return Continue{ _continue };
-}
-
-Statement ASTCopier::operator()(Leave const& _leaveStatement)
-{
-	return Leave{_leaveStatement};
-}
-
-Statement ASTCopier::operator ()(Block const& _block)
-{
-	return translate(_block);
-}
-
-Expression ASTCopier::translate(Expression const& _expression)
-{
-	return std::visit(static_cast<ExpressionCopier&>(*this), _expression);
-}
-
-Statement ASTCopier::translate(Statement const& _statement)
-{
-	return std::visit(static_cast<StatementCopier&>(*this), _statement);
-}
-
-Block ASTCopier::translate(Block const& _block)
-{
-	enterScope(_block);
-	ScopeGuard g([&]() { this->leaveScope(_block); });
-
-	return Block{_block.debugData, translateVector(_block.statements)};
-}
-
-Case ASTCopier::translate(Case const& _case)
-{
-	return Case{_case.debugData, translate(_case.value), translate(_case.body)};
-}
-
-Identifier ASTCopier::translate(Identifier const& _identifier)
-{
-	return Identifier{_identifier.debugData, translateIdentifier(_identifier.name)};
-}
-
-Literal ASTCopier::translate(Literal const& _literal)
-{
-	return _literal;
-}
-
-TypedName ASTCopier::translate(TypedName const& _typedName)
-{
-	return TypedName{_typedName.debugData, translateIdentifier(_typedName.name), _typedName.type};
-}
-
-YulString FunctionCopier::translateIdentifier(YulString _name)
-{
-	if (m_translations.count(_name))
-		return m_translations.at(_name);
-	return _name;
-}
diff --git a/libyul/optimiser/ASTCopier.h b/libyul/optimiser/ASTCopier.h
deleted file mode 100644
index db9d72af35ec..000000000000
--- a/libyul/optimiser/ASTCopier.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Creates an independent copy of an AST, renaming identifiers to be unique.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libyul/YulString.h>
-
-#include <memory>
-#include <optional>
-#include <set>
-#include <vector>
-#include <map>
-
-namespace solidity::yul
-{
-
-class ExpressionCopier
-{
-public:
-	virtual ~ExpressionCopier() = default;
-	virtual Expression operator()(Literal const& _literal) = 0;
-	virtual Expression operator()(Identifier const& _identifier) = 0;
-	virtual Expression operator()(FunctionCall const&) = 0;
-};
-
-class StatementCopier
-{
-public:
-	virtual ~StatementCopier() = default;
-	virtual Statement operator()(ExpressionStatement const& _statement) = 0;
-	virtual Statement operator()(Assignment const& _assignment) = 0;
-	virtual Statement operator()(VariableDeclaration const& _varDecl) = 0;
-	virtual Statement operator()(If const& _if) = 0;
-	virtual Statement operator()(Switch const& _switch) = 0;
-	virtual Statement operator()(FunctionDefinition const&) = 0;
-	virtual Statement operator()(ForLoop const&) = 0;
-	virtual Statement operator()(Break const&) = 0;
-	virtual Statement operator()(Continue const&) = 0;
-	virtual Statement operator()(Leave const&) = 0;
-	virtual Statement operator()(Block const& _block) = 0;
-};
-
-/**
- * Creates a copy of a Yul AST potentially replacing identifier names.
- * Base class to be extended.
- */
-class ASTCopier: public ExpressionCopier, public StatementCopier
-{
-public:
-	~ASTCopier() override = default;
-	Expression operator()(Literal const& _literal) override;
-	Expression operator()(Identifier const& _identifier) override;
-	Expression operator()(FunctionCall const&) override;
-	Statement operator()(ExpressionStatement const& _statement) override;
-	Statement operator()(Assignment const& _assignment) override;
-	Statement operator()(VariableDeclaration const& _varDecl) override;
-	Statement operator()(If const& _if) override;
-	Statement operator()(Switch const& _switch) override;
-	Statement operator()(FunctionDefinition const&) override;
-	Statement operator()(ForLoop const&) override;
-	Statement operator()(Break const&) override;
-	Statement operator()(Continue const&) override;
-	Statement operator()(Leave const&) override;
-	Statement operator()(Block const& _block) override;
-
-	virtual Expression translate(Expression const& _expression);
-	virtual Statement translate(Statement const& _statement);
-
-	Block translate(Block const& _block);
-protected:
-	template <typename T>
-	std::vector<T> translateVector(std::vector<T> const& _values);
-
-	template <typename T>
-	std::unique_ptr<T> translate(std::unique_ptr<T> const& _v)
-	{
-		return _v ? std::make_unique<T>(translate(*_v)) : nullptr;
-	}
-
-	Case translate(Case const& _case);
-	virtual Identifier translate(Identifier const& _identifier);
-	Literal translate(Literal const& _literal);
-	TypedName translate(TypedName const& _typedName);
-
-	virtual void enterScope(Block const&) { }
-	virtual void leaveScope(Block const&) { }
-	virtual void enterFunction(FunctionDefinition const&) { }
-	virtual void leaveFunction(FunctionDefinition const&) { }
-	virtual YulString translateIdentifier(YulString _name) { return _name; }
-};
-
-template <typename T>
-std::vector<T> ASTCopier::translateVector(std::vector<T> const& _values)
-{
-	std::vector<T> translated;
-	for (auto const& v: _values)
-		translated.emplace_back(translate(v));
-	return translated;
-}
-
-/// Helper class that creates a copy of the function definition, replacing the names of the variable
-/// declarations with new names.
-class FunctionCopier: public ASTCopier
-{
-public:
-	FunctionCopier(
-		std::map<YulString, YulString> const& _translations
-	):
-		m_translations(_translations)
-	{}
-	using ASTCopier::operator();
-	YulString translateIdentifier(YulString _name) override;
-private:
-	/// A mapping between old and new names. We replace the names of variable declarations contained
-	/// in the mapping with their new names.
-	std::map<YulString, YulString> const& m_translations;
-};
-
-}
diff --git a/libyul/optimiser/ASTWalker.cpp b/libyul/optimiser/ASTWalker.cpp
deleted file mode 100644
index cd8732cd081e..000000000000
--- a/libyul/optimiser/ASTWalker.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Generic AST walker.
- */
-
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <libyul/AST.h>
-
-#include <range/v3/view/reverse.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void ASTWalker::operator()(FunctionCall const& _funCall)
-{
-	// Does not visit _funCall.functionName on purpose
-	walkVector(_funCall.arguments | ranges::views::reverse);
-}
-
-void ASTWalker::operator()(ExpressionStatement const& _statement)
-{
-	visit(_statement.expression);
-}
-
-void ASTWalker::operator()(Assignment const& _assignment)
-{
-	for (auto const& name: _assignment.variableNames)
-		(*this)(name);
-	visit(*_assignment.value);
-}
-
-void ASTWalker::operator()(VariableDeclaration const& _varDecl)
-{
-	if (_varDecl.value)
-		visit(*_varDecl.value);
-}
-
-void ASTWalker::operator()(If const& _if)
-{
-	visit(*_if.condition);
-	(*this)(_if.body);
-}
-
-void ASTWalker::operator()(Switch const& _switch)
-{
-	visit(*_switch.expression);
-	for (auto const& _case: _switch.cases)
-	{
-		if (_case.value)
-			(*this)(*_case.value);
-		(*this)(_case.body);
-	}
-}
-
-void ASTWalker::operator()(FunctionDefinition const& _fun)
-{
-	(*this)(_fun.body);
-}
-
-void ASTWalker::operator()(ForLoop const& _for)
-{
-	(*this)(_for.pre);
-	visit(*_for.condition);
-	(*this)(_for.body);
-	(*this)(_for.post);
-}
-
-void ASTWalker::operator()(Block const& _block)
-{
-	walkVector(_block.statements);
-}
-
-void ASTWalker::visit(Statement const& _st)
-{
-	std::visit(*this, _st);
-}
-
-void ASTWalker::visit(Expression const& _e)
-{
-	std::visit(*this, _e);
-}
-
-void ASTModifier::operator()(FunctionCall& _funCall)
-{
-	// Does not visit _funCall.functionName on purpose
-	walkVector(_funCall.arguments | ranges::views::reverse);
-}
-
-void ASTModifier::operator()(ExpressionStatement& _statement)
-{
-	visit(_statement.expression);
-}
-
-void ASTModifier::operator()(Assignment& _assignment)
-{
-	for (auto& name: _assignment.variableNames)
-		(*this)(name);
-	visit(*_assignment.value);
-}
-
-void ASTModifier::operator()(VariableDeclaration& _varDecl)
-{
-	if (_varDecl.value)
-		visit(*_varDecl.value);
-}
-
-void ASTModifier::operator()(If& _if)
-{
-	visit(*_if.condition);
-	(*this)(_if.body);
-}
-
-void ASTModifier::operator()(Switch& _switch)
-{
-	visit(*_switch.expression);
-	for (auto& _case: _switch.cases)
-	{
-		if (_case.value)
-			(*this)(*_case.value);
-		(*this)(_case.body);
-	}
-}
-
-void ASTModifier::operator()(FunctionDefinition& _fun)
-{
-	(*this)(_fun.body);
-}
-
-void ASTModifier::operator()(ForLoop& _for)
-{
-	(*this)(_for.pre);
-	visit(*_for.condition);
-	(*this)(_for.post);
-	(*this)(_for.body);
-}
-
-void ASTModifier::operator()(Break&)
-{
-}
-
-void ASTModifier::operator()(Continue&)
-{
-}
-
-void ASTModifier::operator()(Leave&)
-{
-}
-
-void ASTModifier::operator()(Block& _block)
-{
-	walkVector(_block.statements);
-}
-
-void ASTModifier::visit(Statement& _st)
-{
-	std::visit(*this, _st);
-}
-
-void ASTModifier::visit(Expression& _e)
-{
-	std::visit(*this, _e);
-}
diff --git a/libyul/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
deleted file mode 100644
index b937f7eae423..000000000000
--- a/libyul/optimiser/ASTWalker.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Generic AST walker.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libyul/Exceptions.h>
-#include <libyul/YulString.h>
-
-#include <map>
-#include <optional>
-#include <set>
-#include <vector>
-
-namespace solidity::yul
-{
-
-/**
- * Generic AST walker.
- */
-class ASTWalker
-{
-public:
-	virtual ~ASTWalker() = default;
-	virtual void operator()(Literal const&) {}
-	virtual void operator()(Identifier const&) {}
-	virtual void operator()(FunctionCall const& _funCall);
-	virtual void operator()(ExpressionStatement const& _statement);
-	virtual void operator()(Assignment const& _assignment);
-	virtual void operator()(VariableDeclaration const& _varDecl);
-	virtual void operator()(If const& _if);
-	virtual void operator()(Switch const& _switch);
-	virtual void operator()(FunctionDefinition const&);
-	virtual void operator()(ForLoop const&);
-	virtual void operator()(Break const&) {}
-	virtual void operator()(Continue const&) {}
-	virtual void operator()(Leave const&) {}
-	virtual void operator()(Block const& _block);
-
-	virtual void visit(Statement const& _st);
-	virtual void visit(Expression const& _e);
-
-protected:
-	template <class T>
-	void walkVector(T const& _statements)
-	{
-		for (auto const& statement: _statements)
-			visit(statement);
-	}
-};
-
-/**
- * Generic AST modifier (i.e. non-const version of ASTWalker).
- */
-class ASTModifier
-{
-public:
-	virtual ~ASTModifier() = default;
-	virtual void operator()(Literal&) {}
-	virtual void operator()(Identifier&) {}
-	virtual void operator()(FunctionCall& _funCall);
-	virtual void operator()(ExpressionStatement& _statement);
-	virtual void operator()(Assignment& _assignment);
-	virtual void operator()(VariableDeclaration& _varDecl);
-	virtual void operator()(If& _if);
-	virtual void operator()(Switch& _switch);
-	virtual void operator()(FunctionDefinition&);
-	virtual void operator()(ForLoop&);
-	virtual void operator()(Break&);
-	virtual void operator()(Continue&);
-	virtual void operator()(Leave&);
-	virtual void operator()(Block& _block);
-
-	virtual void visit(Statement& _st);
-	virtual void visit(Expression& _e);
-
-protected:
-	template <class T>
-	void walkVector(T&& _statements)
-	{
-		for (auto& st: _statements)
-			visit(st);
-	}
-};
-
-namespace detail
-{
-template <
-	typename Node,
-	typename Visitor,
-	typename Base = std::conditional_t<std::is_const_v<Node>, ASTWalker, ASTModifier>
->
-struct ForEach: Base
-{
-	ForEach(Visitor& _visitor): visitor(_visitor) {}
-
-	using Base::operator();
-	void operator()(Node& _node) override
-	{
-		visitor(_node);
-		Base::operator()(_node);
-	}
-
-	Visitor& visitor;
-};
-}
-
-/// Helper function that traverses the AST and calls the visitor for each
-/// node of a specific type.
-template<typename Node, typename Entry, typename Visitor>
-void forEach(Entry&& _entry, Visitor&& _visitor)
-{
-	detail::ForEach<Node, Visitor&>{_visitor}(_entry);
-}
-
-}
diff --git a/libyul/optimiser/BlockFlattener.cpp b/libyul/optimiser/BlockFlattener.cpp
deleted file mode 100644
index f7dc19f96cf0..000000000000
--- a/libyul/optimiser/BlockFlattener.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void BlockFlattener::operator()(Block& _block)
-{
-	ASTModifier::operator()(_block);
-
-	iterateReplacing(
-		_block.statements,
-		[](Statement& _s) -> std::optional<std::vector<Statement>>
-		{
-			if (std::holds_alternative<Block>(_s))
-				return std::move(std::get<Block>(_s).statements);
-			else
-				return {};
-		}
-	);
-}
-
-void BlockFlattener::run(OptimiserStepContext&, Block& _ast)
-{
-	BlockFlattener flattener;
-	for (auto& statement: _ast.statements)
-		if (auto* block = std::get_if<Block>(&statement))
-			flattener(*block);
-		else if (auto* function = std::get_if<FunctionDefinition>(&statement))
-			flattener(function->body);
-		else
-			yulAssert(false, "BlockFlattener requires the FunctionGrouper.");
-}
diff --git a/libyul/optimiser/BlockFlattener.h b/libyul/optimiser/BlockFlattener.h
deleted file mode 100644
index 3825647de3bc..000000000000
--- a/libyul/optimiser/BlockFlattener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-class BlockFlattener: public ASTModifier
-{
-public:
-	static constexpr char const* name{"BlockFlattener"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-
-private:
-	BlockFlattener() = default;
-};
-
-}
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
deleted file mode 100644
index 380cc15fb399..000000000000
--- a/libyul/optimiser/BlockHasher.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that calculates hash values for block prefixes.
- */
-
-#include <libyul/optimiser/BlockHasher.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-namespace
-{
-static constexpr uint64_t compileTimeLiteralHash(char const* _literal, size_t _n)
-{
-	return (_n == 0) ? BlockHasher::fnvEmptyHash : (static_cast<uint64_t>(_literal[0]) * BlockHasher::fnvPrime) ^ compileTimeLiteralHash(_literal + 1, _n - 1);
-}
-
-template<size_t N>
-static constexpr uint64_t compileTimeLiteralHash(char const (&_literal)[N])
-{
-	return compileTimeLiteralHash(_literal, N);
-}
-}
-
-std::map<Block const*, uint64_t> BlockHasher::run(Block const& _block)
-{
-	std::map<Block const*, uint64_t> result;
-	BlockHasher blockHasher(result);
-	blockHasher(_block);
-	return result;
-}
-
-void BlockHasher::operator()(Literal const& _literal)
-{
-	hash64(compileTimeLiteralHash("Literal"));
-	if (_literal.kind == LiteralKind::Number)
-		hash64(std::hash<u256>{}(valueOfNumberLiteral(_literal)));
-	else
-		hash64(_literal.value.hash());
-	hash64(_literal.type.hash());
-	hash8(static_cast<uint8_t>(_literal.kind));
-}
-
-void BlockHasher::operator()(Identifier const& _identifier)
-{
-	hash64(compileTimeLiteralHash("Identifier"));
-	auto it = m_variableReferences.find(_identifier.name);
-	if (it == m_variableReferences.end())
-	{
-		it = m_variableReferences.emplace(_identifier.name, VariableReference {
-			m_externalIdentifierCount++,
-			true
-		}).first;
-		m_externalReferences.emplace_back(_identifier.name);
-	}
-	if (it->second.isExternal)
-		hash64(compileTimeLiteralHash("external"));
-	else
-		hash64(compileTimeLiteralHash("internal"));
-	hash64(it->second.id);
-}
-
-void BlockHasher::operator()(FunctionCall const& _funCall)
-{
-	hash64(compileTimeLiteralHash("FunctionCall"));
-	hash64(_funCall.functionName.name.hash());
-	hash64(_funCall.arguments.size());
-	ASTWalker::operator()(_funCall);
-}
-
-void BlockHasher::operator()(ExpressionStatement const& _statement)
-{
-	hash64(compileTimeLiteralHash("ExpressionStatement"));
-	ASTWalker::operator()(_statement);
-}
-
-void BlockHasher::operator()(Assignment const& _assignment)
-{
-	hash64(compileTimeLiteralHash("Assignment"));
-	hash64(_assignment.variableNames.size());
-	for (auto const& name: _assignment.variableNames)
-		(*this)(name);
-	visit(*_assignment.value);
-}
-
-void BlockHasher::operator()(VariableDeclaration const& _varDecl)
-{
-	hash64(compileTimeLiteralHash("VariableDeclaration"));
-	hash64(_varDecl.variables.size());
-	for (auto const& var: _varDecl.variables)
-	{
-		yulAssert(!m_variableReferences.count(var.name), "");
-		m_variableReferences[var.name] = VariableReference{
-			m_internalIdentifierCount++,
-			false
-		};
-	}
-	ASTWalker::operator()(_varDecl);
-}
-
-void BlockHasher::operator()(If const& _if)
-{
-	hash64(compileTimeLiteralHash("If"));
-	ASTWalker::operator()(_if);
-}
-
-void BlockHasher::operator()(Switch const& _switch)
-{
-	hash64(compileTimeLiteralHash("Switch"));
-	hash64(_switch.cases.size());
-	// Instead of sorting we could consider to combine
-	// the case hashes using a commutative operation here.
-	std::set<Case const*, SwitchCaseCompareByLiteralValue> cases;
-	for (auto const& _case: _switch.cases)
-		cases.insert(&_case);
-
-	visit(*_switch.expression);
-	for (auto const& _case: cases)
-	{
-		if (_case->value)
-			(*this)(*_case->value);
-		(*this)(_case->body);
-	}
-}
-
-void BlockHasher::operator()(FunctionDefinition const& _funDef)
-{
-	hash64(compileTimeLiteralHash("FunctionDefinition"));
-	ASTWalker::operator()(_funDef);
-}
-
-void BlockHasher::operator()(ForLoop const& _loop)
-{
-	yulAssert(_loop.pre.statements.empty(), "");
-
-	hash64(compileTimeLiteralHash("ForLoop"));
-	ASTWalker::operator()(_loop);
-}
-
-void BlockHasher::operator()(Break const& _break)
-{
-	hash64(compileTimeLiteralHash("Break"));
-	ASTWalker::operator()(_break);
-}
-
-void BlockHasher::operator()(Continue const& _continue)
-{
-	hash64(compileTimeLiteralHash("Continue"));
-	ASTWalker::operator()(_continue);
-}
-
-void BlockHasher::operator()(Leave const& _leaveStatement)
-{
-	hash64(compileTimeLiteralHash("Leave"));
-	ASTWalker::operator()(_leaveStatement);
-}
-
-void BlockHasher::operator()(Block const& _block)
-{
-	hash64(compileTimeLiteralHash("Block"));
-	hash64(_block.statements.size());
-	if (_block.statements.empty())
-		return;
-
-	BlockHasher subBlockHasher(m_blockHashes);
-	for (auto const& statement: _block.statements)
-		subBlockHasher.visit(statement);
-
-	m_blockHashes[&_block] = subBlockHasher.m_hash;
-
-	hash64(subBlockHasher.m_hash);
-	hash64(subBlockHasher.m_externalReferences.size());
-
-	for (auto& externalReference: subBlockHasher.m_externalReferences)
-		(*this)(Identifier{{}, externalReference});
-}
-
-uint64_t ExpressionHasher::run(Expression const& _e)
-{
-	ExpressionHasher expressionHasher;
-	expressionHasher.visit(_e);
-	return expressionHasher.m_hash;
-}
-
-void ExpressionHasher::operator()(Literal const& _literal)
-{
-	hash64(compileTimeLiteralHash("Literal"));
-	if (_literal.kind == LiteralKind::Number)
-		hash64(std::hash<u256>{}(valueOfNumberLiteral(_literal)));
-	else
-		hash64(_literal.value.hash());
-	hash64(_literal.type.hash());
-	hash8(static_cast<uint8_t>(_literal.kind));
-}
-
-void ExpressionHasher::operator()(Identifier const& _identifier)
-{
-	hash64(compileTimeLiteralHash("Identifier"));
-	hash64(_identifier.name.hash());
-}
-
-void ExpressionHasher::operator()(FunctionCall const& _funCall)
-{
-	hash64(compileTimeLiteralHash("FunctionCall"));
-	hash64(_funCall.functionName.name.hash());
-	hash64(_funCall.arguments.size());
-	ASTWalker::operator()(_funCall);
-}
diff --git a/libyul/optimiser/BlockHasher.h b/libyul/optimiser/BlockHasher.h
deleted file mode 100644
index 6dc55371cc8a..000000000000
--- a/libyul/optimiser/BlockHasher.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that calculates hash values for blocks.
- */
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-namespace solidity::yul
-{
-
-class HasherBase
-{
-public:
-	static constexpr uint64_t fnvPrime = 1099511628211u;
-	static constexpr uint64_t fnvEmptyHash = 14695981039346656037u;
-
-protected:
-	void hash8(uint8_t _value)
-	{
-		m_hash *= fnvPrime;
-		m_hash ^= _value;
-	}
-	void hash16(uint16_t _value)
-	{
-		hash8(static_cast<uint8_t>(_value & 0xFF));
-		hash8(static_cast<uint8_t>(_value >> 8));
-	}
-	void hash32(uint32_t _value)
-	{
-		hash16(static_cast<uint16_t>(_value & 0xFFFF));
-		hash16(static_cast<uint16_t>(_value >> 16));
-	}
-	void hash64(uint64_t _value)
-	{
-		hash32(static_cast<uint32_t>(_value & 0xFFFFFFFF));
-		hash32(static_cast<uint32_t>(_value >> 32));
-	}
-
-
-	uint64_t m_hash = fnvEmptyHash;
-};
-
-/**
- * Optimiser component that calculates hash values for blocks.
- * Syntactically equal blocks will have identical hashes and
- * blocks with equal hashes will likely be syntactically equal.
- *
- * The names of internally declared variables are replaced by
- * a simple counter, so differing names are not taken into account,
- * but only the order of references to declared variables.
- *
- * Similarly, the names of referenced external variables are not considered,
- * but replaced by a (distinct) counter as well.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter
- */
-class BlockHasher: public ASTWalker, public HasherBase
-{
-public:
-
-	using ASTWalker::operator();
-
-	void operator()(Literal const&) override;
-	void operator()(Identifier const&) override;
-	void operator()(FunctionCall const& _funCall) override;
-	void operator()(ExpressionStatement const& _statement) override;
-	void operator()(Assignment const& _assignment) override;
-	void operator()(VariableDeclaration const& _varDecl) override;
-	void operator()(If const& _if) override;
-	void operator()(Switch const& _switch) override;
-	void operator()(FunctionDefinition const&) override;
-	void operator()(ForLoop const&) override;
-	void operator()(Break const&) override;
-	void operator()(Continue const&) override;
-	void operator()(Leave const&) override;
-	void operator()(Block const& _block) override;
-
-	static std::map<Block const*, uint64_t> run(Block const& _block);
-
-
-private:
-	BlockHasher(std::map<Block const*, uint64_t>& _blockHashes): m_blockHashes(_blockHashes) {}
-
-	std::map<Block const*, uint64_t>& m_blockHashes;
-
-	struct VariableReference
-	{
-		size_t id = 0;
-		bool isExternal = false;
-	};
-	std::map<YulString, VariableReference> m_variableReferences;
-	std::vector<YulString> m_externalReferences;
-	size_t m_externalIdentifierCount = 0;
-	size_t m_internalIdentifierCount = 0;
-};
-
-
-/**
- * Computes hashes of expressions that are likely different for syntactically different expressions.
- * In contrast to the BlockHasher, hashes of identifiers are likely different if the identifiers
- * have a different name and the same if the name matches.
- * This means this hasher should only be used on disambiguated sources.
- */
-class ExpressionHasher: public ASTWalker, public HasherBase
-{
-public:
-	/// Computes a hash of an expression that (in contrast to the behaviour of the class)
-	/// distinguishes (up to hash collisions) variables with different names.
-	static uint64_t run(Expression const& _e);
-
-	using ASTWalker::operator();
-
-	void operator()(Literal const&) override;
-	void operator()(Identifier const&) override;
-	void operator()(FunctionCall const& _funCall) override;
-};
-
-struct ExpressionHash
-{
-	uint64_t operator()(Expression const& _expression) const
-	{
-		return ExpressionHasher::run(_expression);
-	}
-};
-
-}
diff --git a/libyul/optimiser/CallGraphGenerator.cpp b/libyul/optimiser/CallGraphGenerator.cpp
deleted file mode 100644
index 87035e68a0e7..000000000000
--- a/libyul/optimiser/CallGraphGenerator.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST walker that generates the call graph.
- */
-
-#include <libyul/AST.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-
-#include <libsolutil/CommonData.h>
-#include <stack>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-namespace
-{
-// TODO: This algorithm is non-optimal.
-struct CallGraphCycleFinder
-{
-	CallGraph const& callGraph;
-	std::set<YulString> containedInCycle{};
-	std::set<YulString> visited{};
-	std::vector<YulString> currentPath{};
-
-	void visit(YulString _function)
-	{
-		if (visited.count(_function))
-			return;
-		if (
-			auto it = find(currentPath.begin(), currentPath.end(), _function);
-			it != currentPath.end()
-		)
-			containedInCycle.insert(it, currentPath.end());
-		else
-		{
-			currentPath.emplace_back(_function);
-			if (callGraph.functionCalls.count(_function))
-				for (auto const& child: callGraph.functionCalls.at(_function))
-					visit(child);
-			currentPath.pop_back();
-			visited.insert(_function);
-		}
-	}
-};
-}
-
-std::set<YulString> CallGraph::recursiveFunctions() const
-{
-	CallGraphCycleFinder cycleFinder{*this};
-	// Visiting the root only is not enough, since there may be disconnected recursive functions.
-	for (auto const& call: functionCalls)
-		cycleFinder.visit(call.first);
-	return cycleFinder.containedInCycle;
-}
-
-CallGraph CallGraphGenerator::callGraph(Block const& _ast)
-{
-	CallGraphGenerator gen;
-	gen(_ast);
-	return std::move(gen.m_callGraph);
-}
-
-void CallGraphGenerator::operator()(FunctionCall const& _functionCall)
-{
-	auto& functionCalls = m_callGraph.functionCalls[m_currentFunction];
-	if (!util::contains(functionCalls, _functionCall.functionName.name))
-		functionCalls.emplace_back(_functionCall.functionName.name);
-	ASTWalker::operator()(_functionCall);
-}
-
-void CallGraphGenerator::operator()(ForLoop const& _forLoop)
-{
-	m_callGraph.functionsWithLoops.insert(m_currentFunction);
-	ASTWalker::operator()(_forLoop);
-}
-
-void CallGraphGenerator::operator()(FunctionDefinition const& _functionDefinition)
-{
-	YulString previousFunction = m_currentFunction;
-	m_currentFunction = _functionDefinition.name;
-	yulAssert(m_callGraph.functionCalls.count(m_currentFunction) == 0, "");
-	m_callGraph.functionCalls[m_currentFunction] = {};
-	ASTWalker::operator()(_functionDefinition);
-	m_currentFunction = previousFunction;
-}
-
-CallGraphGenerator::CallGraphGenerator()
-{
-	m_callGraph.functionCalls[YulString{}] = {};
-}
-
diff --git a/libyul/optimiser/CallGraphGenerator.h b/libyul/optimiser/CallGraphGenerator.h
deleted file mode 100644
index ad19878b6892..000000000000
--- a/libyul/optimiser/CallGraphGenerator.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST walker that generates the call graph.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <map>
-#include <optional>
-#include <set>
-
-namespace solidity::yul
-{
-
-struct CallGraph
-{
-	std::map<YulString, std::vector<YulString>> functionCalls;
-	std::set<YulString> functionsWithLoops;
-	/// @returns the set of functions contained in cycles in the call graph, i.e.
-	/// functions that are part of a (mutual) recursion.
-	/// Note that this does not include functions that merely call recursive functions.
-	std::set<YulString> recursiveFunctions() const;
-};
-
-/**
- * Specific AST walker that generates the call graph.
- *
- * It also generates information about which functions contain for loops.
- *
- * The outermost (non-function) context is denoted by the empty string.
- */
-class CallGraphGenerator: public ASTWalker
-{
-public:
-	static CallGraph callGraph(Block const& _ast);
-
-	using ASTWalker::operator();
-	void operator()(FunctionCall const& _functionCall) override;
-	void operator()(ForLoop const& _forLoop) override;
-	void operator()(FunctionDefinition const& _functionDefinition) override;
-
-private:
-	CallGraphGenerator();
-
-	CallGraph m_callGraph;
-	/// The name of the function we are currently visiting during traversal.
-	YulString m_currentFunction;
-};
-
-}
diff --git a/libyul/optimiser/CircularReferencesPruner.cpp b/libyul/optimiser/CircularReferencesPruner.cpp
deleted file mode 100644
index 824d2be39fb0..000000000000
--- a/libyul/optimiser/CircularReferencesPruner.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/CircularReferencesPruner.h>
-
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/Algorithms.h>
-
-using namespace solidity::yul;
-
-void CircularReferencesPruner::run(OptimiserStepContext& _context, Block& _ast)
-{
-	CircularReferencesPruner{_context.reservedIdentifiers}(_ast);
-	FunctionGrouper::run(_context, _ast);
-}
-
-void CircularReferencesPruner::operator()(Block& _block)
-{
-	std::set<YulString> functionsToKeep =
-		functionsCalledFromOutermostContext(CallGraphGenerator::callGraph(_block));
-
-	for (auto&& statement: _block.statements)
-		if (std::holds_alternative<FunctionDefinition>(statement))
-		{
-			FunctionDefinition const& funDef = std::get<FunctionDefinition>(statement);
-			if (!functionsToKeep.count(funDef.name))
-				statement = Block{};
-		}
-
-	removeEmptyBlocks(_block);
-}
-
-std::set<YulString> CircularReferencesPruner::functionsCalledFromOutermostContext(CallGraph const& _callGraph)
-{
-	std::set<YulString> verticesToTraverse = m_reservedIdentifiers;
-	verticesToTraverse.insert(YulString(""));
-
-	return util::BreadthFirstSearch<YulString>{{verticesToTraverse.begin(), verticesToTraverse.end()}}.run(
-		[&_callGraph](YulString _function, auto&& _addChild) {
-			if (_callGraph.functionCalls.count(_function))
-				for (auto const& callee: _callGraph.functionCalls.at(_function))
-					if (_callGraph.functionCalls.count(callee))
-						_addChild(callee);
-		}).visited;
-}
diff --git a/libyul/optimiser/CircularReferencesPruner.h b/libyul/optimiser/CircularReferencesPruner.h
deleted file mode 100644
index 0602445af4ab..000000000000
--- a/libyul/optimiser/CircularReferencesPruner.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimization stage that removes functions that call each other but are
- * otherwise unreferenced.
- *
- *  Prerequisites: Disambiguator, FunctionHoister.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Optimization stage that removes functions that call each other but are
- * neither externally referenced nor referenced from the outermost context.
- */
-class CircularReferencesPruner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"CircularReferencesPruner"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-private:
-	CircularReferencesPruner(std::set<YulString> const& _reservedIdentifiers):
-		m_reservedIdentifiers(_reservedIdentifiers)
-	{}
-
-	/// Run a breadth-first search starting from the outermost context and
-	/// externally referenced functions to find all the functions that are
-	/// called from there either directly or indirectly.
-	std::set<YulString> functionsCalledFromOutermostContext(CallGraph const& _callGraph);
-
-	std::set<YulString> const& m_reservedIdentifiers;
-};
-
-}
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
deleted file mode 100644
index ae55f75e9847..000000000000
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Optimisation stage that replaces expressions known to be the current value of a variable
- * in scope by a reference to that variable.
- */
-
-#include <libyul/optimiser/CommonSubexpressionEliminator.h>
-
-#include <libyul/optimiser/SyntacticalEquality.h>
-#include <libyul/optimiser/BlockHasher.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/SideEffects.h>
-#include <libyul/Exceptions.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/Utilities.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void CommonSubexpressionEliminator::run(OptimiserStepContext& _context, Block& _ast)
-{
-	CommonSubexpressionEliminator cse{
-		_context.dialect,
-		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast))
-	};
-	cse(_ast);
-}
-
-CommonSubexpressionEliminator::CommonSubexpressionEliminator(
-	Dialect const& _dialect,
-	std::map<YulString, SideEffects> _functionSideEffects
-):
-	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore, std::move(_functionSideEffects))
-{
-}
-
-void CommonSubexpressionEliminator::operator()(FunctionDefinition& _fun)
-{
-	ScopedSaveAndRestore returnVariables(m_returnVariables, {});
-	ScopedSaveAndRestore replacementCandidates(m_replacementCandidates, {});
-
-	for (auto const& v: _fun.returnVariables)
-		m_returnVariables.insert(v.name);
-
-	DataFlowAnalyzer::operator()(_fun);
-}
-
-void CommonSubexpressionEliminator::visit(Expression& _e)
-{
-	bool descend = true;
-	// If this is a function call to a function that requires literal arguments,
-	// do not try to simplify there.
-	if (std::holds_alternative<FunctionCall>(_e))
-	{
-		FunctionCall& funCall = std::get<FunctionCall>(_e);
-
-		if (BuiltinFunction const* builtin = m_dialect.builtin(funCall.functionName.name))
-		{
-			for (size_t i = funCall.arguments.size(); i > 0; i--)
-				// We should not modify function arguments that have to be literals
-				// Note that replacing the function call entirely is fine,
-				// if the function call is movable.
-				if (!builtin->literalArgument(i - 1))
-					visit(funCall.arguments[i - 1]);
-
-			descend = false;
-		}
-	}
-
-	// We visit the inner expression first to first simplify inner expressions,
-	// which hopefully allows more matches.
-	// Note that the DataFlowAnalyzer itself only has code for visiting Statements,
-	// so this basically invokes the AST walker directly and thus post-visiting
-	// is also fine with regards to data flow analysis.
-	if (descend)
-		DataFlowAnalyzer::visit(_e);
-
-	if (Identifier const* identifier = std::get_if<Identifier>(&_e))
-	{
-		YulString identifierName = identifier->name;
-		if (AssignedValue const* assignedValue = variableValue(identifierName))
-		{
-			assertThrow(assignedValue->value, OptimizerException, "");
-			if (Identifier const* value = std::get_if<Identifier>(assignedValue->value))
-				if (inScope(value->name))
-					_e = Identifier{debugDataOf(_e), value->name};
-		}
-	}
-	else if (auto const* candidates = util::valueOrNullptr(m_replacementCandidates, _e))
-		for (auto const& variable: *candidates)
-			if (AssignedValue const* value = variableValue(variable))
-			{
-				assertThrow(value->value, OptimizerException, "");
-				// Prevent using the default value of return variables
-				// instead of literal zeros.
-				if (
-					m_returnVariables.count(variable) &&
-					std::holds_alternative<Literal>(*value->value) &&
-					valueOfLiteral(std::get<Literal>(*value->value)) == 0
-				)
-					continue;
-				// We check for syntactic equality again because the value might have changed.
-				if (inScope(variable) && SyntacticallyEqual{}(_e, *value->value))
-				{
-					_e = Identifier{debugDataOf(_e), variable};
-					break;
-				}
-			}
-}
-
-void CommonSubexpressionEliminator::assignValue(YulString _variable, Expression const* _value)
-{
-	if (_value)
-		m_replacementCandidates[*_value].insert(_variable);
-	DataFlowAnalyzer::assignValue(_variable, _value);
-}
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.h b/libyul/optimiser/CommonSubexpressionEliminator.h
deleted file mode 100644
index 163c9df994e4..000000000000
--- a/libyul/optimiser/CommonSubexpressionEliminator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that replaces expressions known to be the current value of a variable
- * in scope by a reference to that variable.
- */
-
-#pragma once
-
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/SyntacticalEquality.h>
-#include <libyul/optimiser/BlockHasher.h>
-
-#include <set>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-struct SideEffects;
-
-/**
- * Optimisation stage that replaces expressions known to be the current value of a variable
- * in scope by a reference to that variable.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class CommonSubexpressionEliminator: public DataFlowAnalyzer
-{
-public:
-	static constexpr char const* name{"CommonSubexpressionEliminator"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using DataFlowAnalyzer::operator();
-	void operator()(FunctionDefinition&) override;
-
-private:
-	CommonSubexpressionEliminator(
-		Dialect const& _dialect,
-		std::map<YulString, SideEffects> _functionSideEffects
-	);
-
-protected:
-	using ASTModifier::visit;
-	void visit(Expression& _e) override;
-
-	void assignValue(YulString _variable, Expression const* _value) override;
-private:
-	std::set<YulString> m_returnVariables;
-	std::unordered_map<
-		std::reference_wrapper<Expression const>,
-		std::set<YulString>,
-		ExpressionHash,
-		SyntacticallyEqualExpression
-	> m_replacementCandidates;
-};
-
-
-}
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
deleted file mode 100644
index b08b113de0ca..000000000000
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/ConditionalSimplifier.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/AST.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void ConditionalSimplifier::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ConditionalSimplifier{
-		_context.dialect,
-		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed()
-	}(_ast);
-}
-
-void ConditionalSimplifier::operator()(Switch& _switch)
-{
-	visit(*_switch.expression);
-	if (!std::holds_alternative<Identifier>(*_switch.expression))
-	{
-		ASTModifier::operator()(_switch);
-		return;
-	}
-	YulString expr = std::get<Identifier>(*_switch.expression).name;
-	for (auto& _case: _switch.cases)
-	{
-		if (_case.value)
-		{
-			(*this)(*_case.value);
-			_case.body.statements.insert(_case.body.statements.begin(),
-				Assignment{
-					_case.body.debugData,
-					{Identifier{_case.body.debugData, expr}},
-					std::make_unique<Expression>(*_case.value)
-				}
-			);
-		}
-		(*this)(_case.body);
-	}
-}
-
-void ConditionalSimplifier::operator()(Block& _block)
-{
-	iterateReplacing(
-		_block.statements,
-		[&](Statement& _s) -> std::optional<std::vector<Statement>>
-		{
-			visit(_s);
-			if (std::holds_alternative<If>(_s))
-			{
-				If& _if = std::get<If>(_s);
-				if (
-					std::holds_alternative<Identifier>(*_if.condition) &&
-					!_if.body.statements.empty() &&
-					TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
-						TerminationFinder::ControlFlow::FlowOut
-				)
-				{
-					YulString condition = std::get<Identifier>(*_if.condition).name;
-					std::shared_ptr<DebugData const> debugData = _if.debugData;
-					return make_vector<Statement>(
-						std::move(_s),
-						Assignment{
-							debugData,
-							{Identifier{debugData, condition}},
-							std::make_unique<Expression>(m_dialect.zeroLiteralForType(m_dialect.boolType))
-						}
-					);
-				}
-			}
-			return {};
-		}
-	);
-}
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
deleted file mode 100644
index e558a1c6cf5c..000000000000
--- a/libyul/optimiser/ConditionalSimplifier.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/ASTForward.h>
-#include <libyul/Dialect.h>
-#include <libsolutil/Common.h>
-
-namespace solidity::yul
-{
-
-/**
- * Conditional simplifier.
- *
- * Inserts assignments to condition variables if the value can be determined
- * from the control-flow.
- *
- * Destroys SSA form.
- *
- * Currently, this tool is very limited, mostly because we do not yet have support
- * for boolean types. Since conditions only check for expressions being nonzero,
- * we cannot assign a specific value.
- *
- * Current features:
- *  - switch cases: insert "<condition> := <caseLabel>"
- *  - after if statement with terminating control-flow, insert "<condition> := 0"
- *
- * Future features:
- *  - allow replacements by "1"
- *
- * Works best with SSA form and if dead code removal has run before.
- *
- * Prerequisite: Disambiguator.
- */
-class ConditionalSimplifier: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ConditionalSimplifier"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Switch& _switch) override;
-	void operator()(Block& _block) override;
-
-private:
-	explicit ConditionalSimplifier(
-		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> _sideEffects
-	):
-		m_dialect(_dialect), m_functionSideEffects(std::move(_sideEffects))
-	{}
-	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
-};
-
-}
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
deleted file mode 100644
index 2af09af04b60..000000000000
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/ConditionalUnsimplifier.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void ConditionalUnsimplifier::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ConditionalUnsimplifier{
-		_context.dialect,
-		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed()
-	}(_ast);
-}
-
-void ConditionalUnsimplifier::operator()(Switch& _switch)
-{
-	visit(*_switch.expression);
-	if (!std::holds_alternative<Identifier>(*_switch.expression))
-	{
-		ASTModifier::operator()(_switch);
-		return;
-	}
-	YulString expr = std::get<Identifier>(*_switch.expression).name;
-	for (auto& _case: _switch.cases)
-	{
-		if (_case.value)
-		{
-			(*this)(*_case.value);
-			if (
-				!_case.body.statements.empty() &&
-				std::holds_alternative<Assignment>(_case.body.statements.front())
-			)
-			{
-				Assignment const& assignment = std::get<Assignment>(_case.body.statements.front());
-				if (
-					assignment.variableNames.size() == 1 &&
-					assignment.variableNames.front().name == expr &&
-					std::holds_alternative<Literal>(*assignment.value) &&
-					valueOfLiteral(std::get<Literal>(*assignment.value)) == valueOfLiteral(*_case.value)
-				)
-					_case.body.statements.erase(_case.body.statements.begin());
-			}
-		}
-		(*this)(_case.body);
-	}
-}
-
-void ConditionalUnsimplifier::operator()(Block& _block)
-{
-	walkVector(_block.statements);
-	iterateReplacingWindow<2>(
-		_block.statements,
-		[&](Statement& _stmt1, Statement& _stmt2) -> std::optional<std::vector<Statement>>
-		{
-			if (std::holds_alternative<If>(_stmt1))
-			{
-				If& _if = std::get<If>(_stmt1);
-				if (
-					std::holds_alternative<Identifier>(*_if.condition) &&
-					!_if.body.statements.empty()
-				)
-				{
-					YulString condition = std::get<Identifier>(*_if.condition).name;
-					if (
-						std::holds_alternative<Assignment>(_stmt2) &&
-						TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
-							TerminationFinder::ControlFlow::FlowOut
-					)
-					{
-						Assignment const& assignment = std::get<Assignment>(_stmt2);
-						if (
-							assignment.variableNames.size() == 1 &&
-							assignment.variableNames.front().name == condition &&
-							std::holds_alternative<Literal>(*assignment.value) &&
-							valueOfLiteral(std::get<Literal>(*assignment.value)) == 0
-						)
-							return {make_vector<Statement>(std::move(_stmt1))};
-					}
-				}
-			}
-			return {};
-		}
-	);
-}
diff --git a/libyul/optimiser/ConditionalUnsimplifier.h b/libyul/optimiser/ConditionalUnsimplifier.h
deleted file mode 100644
index 8025b661b96b..000000000000
--- a/libyul/optimiser/ConditionalUnsimplifier.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/Dialect.h>
-#include <libsolutil/Common.h>
-
-namespace solidity::yul
-{
-
-/**
- * Reverse of conditional simplifier.
- *
- */
-class ConditionalUnsimplifier: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ConditionalUnsimplifier"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Switch& _switch) override;
-	void operator()(Block& _block) override;
-
-private:
-	explicit ConditionalUnsimplifier(
-		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
-	):
-		m_dialect(_dialect), m_functionSideEffects(_sideEffects)
-	{}
-	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
-};
-
-}
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
deleted file mode 100644
index 771b4e86bfc7..000000000000
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/ControlFlowSimplifier.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/TypeInfo.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-#include <libyul/Dialect.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/action/remove_if.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-using OptionalStatements = std::optional<std::vector<Statement>>;
-
-namespace
-{
-
-ExpressionStatement makeDiscardCall(
-	std::shared_ptr<DebugData const> const& _debugData,
-	BuiltinFunction const& _discardFunction,
-	Expression&& _expression
-)
-{
-	return {_debugData, FunctionCall{
-		_debugData,
-		Identifier{_debugData, _discardFunction.name},
-		{std::move(_expression)}
-	}};
-}
-
-void removeEmptyDefaultFromSwitch(Switch& _switchStmt)
-{
-	ranges::actions::remove_if(
-		_switchStmt.cases,
-		[](Case const& _case) { return !_case.value && _case.body.statements.empty(); }
-	);
-}
-
-void removeEmptyCasesFromSwitch(Switch& _switchStmt)
-{
-	if (hasDefaultCase(_switchStmt))
-		return;
-
-	ranges::actions::remove_if(
-		_switchStmt.cases,
-		[](Case const& _case) { return _case.body.statements.empty(); }
-	);
-}
-
-}
-
-void ControlFlowSimplifier::run(OptimiserStepContext& _context, Block& _ast)
-{
-	TypeInfo typeInfo(_context.dialect, _ast);
-	ControlFlowSimplifier{_context.dialect, typeInfo}(_ast);
-}
-
-void ControlFlowSimplifier::operator()(Block& _block)
-{
-	simplify(_block.statements);
-}
-
-void ControlFlowSimplifier::operator()(FunctionDefinition& _funDef)
-{
-	ASTModifier::operator()(_funDef);
-	if (!_funDef.body.statements.empty() && std::holds_alternative<Leave>(_funDef.body.statements.back()))
-		_funDef.body.statements.pop_back();
-}
-
-void ControlFlowSimplifier::visit(Statement& _st)
-{
-	if (std::holds_alternative<ForLoop>(_st))
-	{
-		ForLoop& forLoop = std::get<ForLoop>(_st);
-		yulAssert(forLoop.pre.statements.empty(), "");
-
-		size_t outerBreak = m_numBreakStatements;
-		size_t outerContinue = m_numContinueStatements;
-		m_numBreakStatements = 0;
-		m_numContinueStatements = 0;
-
-		ASTModifier::visit(_st);
-
-		if (!forLoop.body.statements.empty())
-		{
-			bool isTerminating = false;
-			TerminationFinder::ControlFlow controlFlow = TerminationFinder{m_dialect}.controlFlowKind(forLoop.body.statements.back());
-			if (controlFlow == TerminationFinder::ControlFlow::Break)
-			{
-				isTerminating = true;
-				--m_numBreakStatements;
-			}
-			else if (
-				controlFlow == TerminationFinder::ControlFlow::Terminate ||
-				controlFlow == TerminationFinder::ControlFlow::Leave
-			)
-				isTerminating = true;
-
-			if (isTerminating && m_numContinueStatements == 0 && m_numBreakStatements == 0)
-			{
-				If replacement{forLoop.debugData, std::move(forLoop.condition), std::move(forLoop.body)};
-				if (controlFlow == TerminationFinder::ControlFlow::Break)
-					replacement.body.statements.resize(replacement.body.statements.size() - 1);
-				_st = std::move(replacement);
-			}
-		}
-
-		m_numBreakStatements = outerBreak;
-		m_numContinueStatements = outerContinue;
-	}
-	else
-		ASTModifier::visit(_st);
-}
-
-void ControlFlowSimplifier::simplify(std::vector<yul::Statement>& _statements)
-{
-	GenericVisitor visitor{
-		VisitorFallback<OptionalStatements>{},
-		[&](If& _ifStmt) -> OptionalStatements {
-			if (_ifStmt.body.statements.empty() && m_dialect.discardFunction(m_dialect.boolType))
-			{
-				OptionalStatements s = std::vector<Statement>{};
-				s->emplace_back(makeDiscardCall(
-					_ifStmt.debugData,
-					*m_dialect.discardFunction(m_dialect.boolType),
-					std::move(*_ifStmt.condition)
-				));
-				return s;
-			}
-			return {};
-		},
-		[&](Switch& _switchStmt) -> OptionalStatements {
-			removeEmptyDefaultFromSwitch(_switchStmt);
-			removeEmptyCasesFromSwitch(_switchStmt);
-
-			if (_switchStmt.cases.empty())
-				return reduceNoCaseSwitch(_switchStmt);
-			else if (_switchStmt.cases.size() == 1)
-				return reduceSingleCaseSwitch(_switchStmt);
-
-			return {};
-		}
-	};
-	iterateReplacing(
-		_statements,
-		[&](Statement& _stmt) -> OptionalStatements
-		{
-			OptionalStatements result = std::visit(visitor, _stmt);
-			if (result)
-				simplify(*result);
-			else
-				visit(_stmt);
-			return result;
-		}
-	);
-}
-
-OptionalStatements ControlFlowSimplifier::reduceNoCaseSwitch(Switch& _switchStmt) const
-{
-	yulAssert(_switchStmt.cases.empty(), "Expected no case!");
-	BuiltinFunction const* discardFunction =
-		m_dialect.discardFunction(m_typeInfo.typeOf(*_switchStmt.expression));
-	if (!discardFunction)
-		return {};
-
-	return make_vector<Statement>(makeDiscardCall(
-		debugDataOf(*_switchStmt.expression),
-		*discardFunction,
-		std::move(*_switchStmt.expression)
-	));
-}
-
-OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switchStmt) const
-{
-	yulAssert(_switchStmt.cases.size() == 1, "Expected only one case!");
-
-	auto& switchCase = _switchStmt.cases.front();
-	std::shared_ptr<DebugData const> debugData = debugDataOf(*_switchStmt.expression);
-	YulString type = m_typeInfo.typeOf(*_switchStmt.expression);
-	if (switchCase.value)
-	{
-		if (!m_dialect.equalityFunction(type))
-			return {};
-		return make_vector<Statement>(If{
-			std::move(_switchStmt.debugData),
-			std::make_unique<Expression>(FunctionCall{
-				debugData,
-				Identifier{debugData, m_dialect.equalityFunction(type)->name},
-				{std::move(*switchCase.value), std::move(*_switchStmt.expression)}
-			}),
-			std::move(switchCase.body)
-		});
-	}
-	else
-	{
-		if (!m_dialect.discardFunction(type))
-			return {};
-
-		return make_vector<Statement>(
-			makeDiscardCall(
-				debugData,
-				*m_dialect.discardFunction(type),
-				std::move(*_switchStmt.expression)
-			),
-			std::move(switchCase.body)
-		);
-	}
-}
-
diff --git a/libyul/optimiser/ControlFlowSimplifier.h b/libyul/optimiser/ControlFlowSimplifier.h
deleted file mode 100644
index 3ebbe7c9aeee..000000000000
--- a/libyul/optimiser/ControlFlowSimplifier.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct OptimiserStepContext;
-class TypeInfo;
-
-/**
- * Simplifies several control-flow structures:
- * - replace if with empty body with pop(condition)
- * - remove empty default switch case
- * - remove empty switch case if no default case exists
- * - replace switch with no cases with pop(expression)
- * - turn switch with single case into if
- * - replace switch with only default case with pop(expression) and body
- * - replace switch with const expr with matching case body
- * - replace ``for`` with terminating control flow and without other break/continue by ``if``
- * - remove ``leave`` at the end of a function.
- *
- * None of these operations depend on the data flow. The StructuralSimplifier
- * performs similar tasks that do depend on data flow.
- *
- * The ControlFlowSimplifier does record the presence or absence of ``break``
- * and ``continue`` statements during its traversal.
- *
- * Prerequisite: Disambiguator, FunctionHoister, ForLoopInitRewriter.
- *
- * Important: Introduces EVM opcodes and thus can only be used on EVM code for now.
- */
-class ControlFlowSimplifier: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ControlFlowSimplifier"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Break&) override { ++m_numBreakStatements; }
-	void operator()(Continue&) override { ++m_numContinueStatements; }
-	void operator()(Block& _block) override;
-	void operator()(FunctionDefinition& _funDef) override;
-
-	void visit(Statement& _st) override;
-
-private:
-	ControlFlowSimplifier(Dialect const& _dialect, TypeInfo const& _typeInfo):
-		m_dialect(_dialect),
-		m_typeInfo(_typeInfo)
-	{}
-
-	void simplify(std::vector<Statement>& _statements);
-
-	std::optional<std::vector<Statement>> reduceNoCaseSwitch(Switch& _switchStmt) const;
-	std::optional<std::vector<Statement>> reduceSingleCaseSwitch(Switch& _switchStmt) const;
-
-	Dialect const& m_dialect;
-	TypeInfo const& m_typeInfo;
-	size_t m_numBreakStatements = 0;
-	size_t m_numContinueStatements = 0;
-};
-
-}
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
deleted file mode 100644
index 5992c9b985c6..000000000000
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ /dev/null
@@ -1,481 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Base class to perform data flow analysis during AST walks.
- * Tracks assignments and is used as base class for both Rematerialiser and
- * Common Subexpression Eliminator.
- */
-
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/optimiser/KnowledgeBase.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/cxx20.h>
-
-#include <variant>
-
-#include <range/v3/view/reverse.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-DataFlowAnalyzer::DataFlowAnalyzer(
-	Dialect const& _dialect,
-	MemoryAndStorage _analyzeStores,
-	std::map<YulString, SideEffects> _functionSideEffects
-):
-	m_dialect(_dialect),
-	m_functionSideEffects(std::move(_functionSideEffects)),
-	m_knowledgeBase([this](YulString _var) { return variableValue(_var); }),
-	m_analyzeStores(_analyzeStores == MemoryAndStorage::Analyze)
-{
-	if (m_analyzeStores)
-	{
-		if (auto const* builtin = _dialect.memoryStoreFunction(YulString{}))
-			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-		if (auto const* builtin = _dialect.memoryLoadFunction(YulString{}))
-			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-		if (auto const* builtin = _dialect.storageStoreFunction(YulString{}))
-			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
-		if (auto const* builtin = _dialect.storageLoadFunction(YulString{}))
-			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
-	}
-}
-
-void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
-{
-	if (m_analyzeStores)
-	{
-		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, _statement))
-		{
-			ASTModifier::operator()(_statement);
-			cxx20::erase_if(m_state.environment.storage, mapTuple([&](auto&& key, auto&& value) {
-				return
-					!m_knowledgeBase.knownToBeDifferent(vars->first, key) &&
-					vars->second != value;
-			}));
-			m_state.environment.storage[vars->first] = vars->second;
-			return;
-		}
-		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, _statement))
-		{
-			ASTModifier::operator()(_statement);
-			cxx20::erase_if(m_state.environment.memory, mapTuple([&](auto&& key, auto&& /* value */) {
-				return !m_knowledgeBase.knownToBeDifferentByAtLeast32(vars->first, key);
-			}));
-			// TODO erase keccak knowledge, but in a more clever way
-			m_state.environment.keccak = {};
-			m_state.environment.memory[vars->first] = vars->second;
-			return;
-		}
-	}
-	clearKnowledgeIfInvalidated(_statement.expression);
-	ASTModifier::operator()(_statement);
-}
-
-void DataFlowAnalyzer::operator()(Assignment& _assignment)
-{
-	std::set<YulString> names;
-	for (auto const& var: _assignment.variableNames)
-		names.emplace(var.name);
-	assertThrow(_assignment.value, OptimizerException, "");
-	clearKnowledgeIfInvalidated(*_assignment.value);
-	visit(*_assignment.value);
-	handleAssignment(names, _assignment.value.get(), false);
-}
-
-void DataFlowAnalyzer::operator()(VariableDeclaration& _varDecl)
-{
-	std::set<YulString> names;
-	for (auto const& var: _varDecl.variables)
-		names.emplace(var.name);
-	m_variableScopes.back().variables += names;
-
-	if (_varDecl.value)
-	{
-		clearKnowledgeIfInvalidated(*_varDecl.value);
-		visit(*_varDecl.value);
-	}
-
-	handleAssignment(names, _varDecl.value.get(), true);
-}
-
-void DataFlowAnalyzer::operator()(If& _if)
-{
-	clearKnowledgeIfInvalidated(*_if.condition);
-	Environment preEnvironment = m_state.environment;
-
-	ASTModifier::operator()(_if);
-	joinKnowledge(preEnvironment);
-
-	clearValues(assignedVariableNames(_if.body));
-}
-
-void DataFlowAnalyzer::operator()(Switch& _switch)
-{
-	clearKnowledgeIfInvalidated(*_switch.expression);
-	visit(*_switch.expression);
-	std::set<YulString> assignedVariables;
-	for (auto& _case: _switch.cases)
-	{
-		Environment preEnvironment = m_state.environment;
-		(*this)(_case.body);
-		joinKnowledge(preEnvironment);
-
-		std::set<YulString> variables = assignedVariableNames(_case.body);
-		assignedVariables += variables;
-		// This is a little too destructive, we could retain the old values.
-		clearValues(variables);
-		clearKnowledgeIfInvalidated(_case.body);
-	}
-	for (auto& _case: _switch.cases)
-		clearKnowledgeIfInvalidated(_case.body);
-	clearValues(assignedVariables);
-}
-
-void DataFlowAnalyzer::operator()(FunctionDefinition& _fun)
-{
-	// Save all information. We might rather reinstantiate this class,
-	// but this could be difficult if it is subclassed.
-	ScopedSaveAndRestore stateResetter(m_state, {});
-	ScopedSaveAndRestore loopDepthResetter(m_loopDepth, 0u);
-	pushScope(true);
-
-	for (auto const& parameter: _fun.parameters)
-		m_variableScopes.back().variables.emplace(parameter.name);
-	for (auto const& var: _fun.returnVariables)
-	{
-		m_variableScopes.back().variables.emplace(var.name);
-		handleAssignment({var.name}, nullptr, true);
-	}
-	ASTModifier::operator()(_fun);
-
-	// Note that the contents of return variables, storage and memory at this point
-	// might be incorrect due to the fact that the DataFlowAnalyzer ignores the ``leave``
-	// statement.
-
-	popScope();
-}
-
-void DataFlowAnalyzer::operator()(ForLoop& _for)
-{
-	// If the pre block was not empty,
-	// we would have to deal with more complicated scoping rules.
-	assertThrow(_for.pre.statements.empty(), OptimizerException, "");
-
-	++m_loopDepth;
-
-	AssignmentsSinceContinue assignmentsSinceCont;
-	assignmentsSinceCont(_for.body);
-
-	std::set<YulString> assignedVariables =
-		assignedVariableNames(_for.body) + assignedVariableNames(_for.post);
-	clearValues(assignedVariables);
-
-	// break/continue are tricky for storage and thus we almost always clear here.
-	clearKnowledgeIfInvalidated(*_for.condition);
-	clearKnowledgeIfInvalidated(_for.post);
-	clearKnowledgeIfInvalidated(_for.body);
-
-	visit(*_for.condition);
-	(*this)(_for.body);
-	clearValues(assignmentsSinceCont.names());
-	clearKnowledgeIfInvalidated(_for.body);
-	(*this)(_for.post);
-	clearValues(assignedVariables);
-	clearKnowledgeIfInvalidated(*_for.condition);
-	clearKnowledgeIfInvalidated(_for.post);
-	clearKnowledgeIfInvalidated(_for.body);
-
-	--m_loopDepth;
-}
-
-void DataFlowAnalyzer::operator()(Block& _block)
-{
-	size_t numScopes = m_variableScopes.size();
-	pushScope(false);
-	ASTModifier::operator()(_block);
-	popScope();
-	assertThrow(numScopes == m_variableScopes.size(), OptimizerException, "");
-}
-
-std::optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
-{
-	if (YulString const* value = valueOrNullptr(m_state.environment.storage, _key))
-		return *value;
-	else
-		return std::nullopt;
-}
-
-std::optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
-{
-	if (YulString const* value = valueOrNullptr(m_state.environment.memory, _key))
-		return *value;
-	else
-		return std::nullopt;
-}
-
-std::optional<YulString> DataFlowAnalyzer::keccakValue(YulString _start, YulString _length) const
-{
-	if (YulString const* value = valueOrNullptr(m_state.environment.keccak, std::make_pair(_start, _length)))
-		return *value;
-	else
-		return std::nullopt;
-}
-
-void DataFlowAnalyzer::handleAssignment(std::set<YulString> const& _variables, Expression* _value, bool _isDeclaration)
-{
-	if (!_isDeclaration)
-		clearValues(_variables);
-
-	MovableChecker movableChecker{m_dialect, &m_functionSideEffects};
-	if (_value)
-		movableChecker.visit(*_value);
-	else
-		for (auto const& var: _variables)
-			assignValue(var, &m_zero);
-
-	if (_value && _variables.size() == 1)
-	{
-		YulString name = *_variables.begin();
-		// Expression has to be movable and cannot contain a reference
-		// to the variable that will be assigned to.
-		if (movableChecker.movable() && !movableChecker.referencedVariables().count(name))
-			assignValue(name, _value);
-	}
-
-	auto const& referencedVariables = movableChecker.referencedVariables();
-	for (auto const& name: _variables)
-	{
-		m_state.references[name] = referencedVariables;
-		if (!_isDeclaration)
-		{
-			// assignment to slot denoted by "name"
-			m_state.environment.storage.erase(name);
-			// assignment to slot contents denoted by "name"
-			cxx20::erase_if(m_state.environment.storage, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
-			// assignment to slot denoted by "name"
-			m_state.environment.memory.erase(name);
-			// assignment to slot contents denoted by "name"
-			cxx20::erase_if(m_state.environment.keccak, [&name](auto&& _item) {
-				return _item.first.first == name || _item.first.second == name || _item.second == name;
-			});
-			cxx20::erase_if(m_state.environment.memory, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
-		}
-	}
-
-	if (_value && _variables.size() == 1)
-	{
-		YulString variable = *_variables.begin();
-		if (!movableChecker.referencedVariables().count(variable))
-		{
-			// This might erase additional knowledge about the slot.
-			// On the other hand, if we knew the value in the slot
-			// already, then the sload() / mload() would have been replaced by a variable anyway.
-			if (auto key = isSimpleLoad(StoreLoadLocation::Memory, *_value))
-				m_state.environment.memory[*key] = variable;
-			else if (auto key = isSimpleLoad(StoreLoadLocation::Storage, *_value))
-				m_state.environment.storage[*key] = variable;
-			else if (auto arguments = isKeccak(*_value))
-				m_state.environment.keccak[*arguments] = variable;
-		}
-	}
-}
-
-void DataFlowAnalyzer::pushScope(bool _functionScope)
-{
-	m_variableScopes.emplace_back(_functionScope);
-}
-
-void DataFlowAnalyzer::popScope()
-{
-	for (auto const& name: m_variableScopes.back().variables)
-	{
-		m_state.value.erase(name);
-		m_state.references.erase(name);
-	}
-	m_variableScopes.pop_back();
-}
-
-void DataFlowAnalyzer::clearValues(std::set<YulString> _variables)
-{
-	// All variables that reference variables to be cleared also have to be
-	// cleared, but not recursively, since only the value of the original
-	// variables changes. Example:
-	// let a := 1
-	// let b := a
-	// let c := b
-	// a := 2
-	// add(b, c)
-	// In the last line, we can replace c by b, but not b by a.
-	//
-	// This cannot be easily tested since the substitutions will be done
-	// one by one on the fly, and the last line will just be add(1, 1)
-
-	// First clear storage knowledge, because we do not have to clear
-	// storage knowledge of variables whose expression has changed,
-	// since the value is still unchanged.
-	auto eraseCondition = mapTuple([&_variables](auto&& key, auto&& value) {
-		return _variables.count(key) || _variables.count(value);
-	});
-	cxx20::erase_if(m_state.environment.storage, eraseCondition);
-	cxx20::erase_if(m_state.environment.memory, eraseCondition);
-	cxx20::erase_if(m_state.environment.keccak, [&_variables](auto&& _item) {
-		return
-			_variables.count(_item.first.first) ||
-			_variables.count(_item.first.second) ||
-			_variables.count(_item.second);
-	});
-
-	// Also clear variables that reference variables to be cleared.
-	std::set<YulString> referencingVariables;
-	for (auto const& variableToClear: _variables)
-		for (auto const& [ref, names]: m_state.references)
-			if (names.count(variableToClear))
-				referencingVariables.emplace(ref);
-
-	// Clear the value and update the reference relation.
-	for (auto const& name: _variables + referencingVariables)
-	{
-		m_state.value.erase(name);
-		m_state.references.erase(name);
-	}
-}
-
-void DataFlowAnalyzer::assignValue(YulString _variable, Expression const* _value)
-{
-	m_state.value[_variable] = {_value, m_loopDepth};
-}
-
-void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Block const& _block)
-{
-	if (!m_analyzeStores)
-		return;
-	SideEffectsCollector sideEffects(m_dialect, _block, &m_functionSideEffects);
-	if (sideEffects.invalidatesStorage())
-		m_state.environment.storage.clear();
-	if (sideEffects.invalidatesMemory())
-	{
-		m_state.environment.memory.clear();
-		m_state.environment.keccak.clear();
-	}
-}
-
-void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
-{
-	if (!m_analyzeStores)
-		return;
-	SideEffectsCollector sideEffects(m_dialect, _expr, &m_functionSideEffects);
-	if (sideEffects.invalidatesStorage())
-		m_state.environment.storage.clear();
-	if (sideEffects.invalidatesMemory())
-	{
-		m_state.environment.memory.clear();
-		m_state.environment.keccak.clear();
-	}
-}
-
-bool DataFlowAnalyzer::inScope(YulString _variableName) const
-{
-	for (auto const& scope: m_variableScopes | ranges::views::reverse)
-	{
-		if (scope.variables.count(_variableName))
-			return true;
-		if (scope.isFunction)
-			return false;
-	}
-	return false;
-}
-
-std::optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name) const
-{
-	if (AssignedValue const* value = variableValue(_name))
-		if (Literal const* literal = std::get_if<Literal>(value->value))
-			return valueOfLiteral(*literal);
-	return std::nullopt;
-}
-
-std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isSimpleStore(
-	StoreLoadLocation _location,
-	ExpressionStatement const& _statement
-) const
-{
-	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_statement.expression))
-		if (funCall->functionName.name == m_storeFunctionName[static_cast<unsigned>(_location)])
-			if (Identifier const* key = std::get_if<Identifier>(&funCall->arguments.front()))
-				if (Identifier const* value = std::get_if<Identifier>(&funCall->arguments.back()))
-					return std::make_pair(key->name, value->name);
-	return {};
-}
-
-std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
-	StoreLoadLocation _location,
-	Expression const& _expression
-) const
-{
-	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_expression))
-		if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(_location)])
-			if (Identifier const* key = std::get_if<Identifier>(&funCall->arguments.front()))
-				return key->name;
-	return {};
-}
-
-std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
-{
-	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_expression))
-		if (funCall->functionName.name == m_dialect.hashFunction({}))
-			if (Identifier const* start = std::get_if<Identifier>(&funCall->arguments.at(0)))
-				if (Identifier const* length = std::get_if<Identifier>(&funCall->arguments.at(1)))
-					return std::make_pair(start->name, length->name);
-	return std::nullopt;
-}
-
-void DataFlowAnalyzer::joinKnowledge(Environment const& _olderEnvironment)
-{
-	if (!m_analyzeStores)
-		return;
-	joinKnowledgeHelper(m_state.environment.storage, _olderEnvironment.storage);
-	joinKnowledgeHelper(m_state.environment.memory, _olderEnvironment.memory);
-	cxx20::erase_if(m_state.environment.keccak, mapTuple([&_olderEnvironment](auto&& key, auto&& currentValue) {
-		YulString const* oldValue = valueOrNullptr(_olderEnvironment.keccak, key);
-		return !oldValue || *oldValue != currentValue;
-	}));
-}
-
-void DataFlowAnalyzer::joinKnowledgeHelper(
-	std::unordered_map<YulString, YulString>& _this,
-	std::unordered_map<YulString, YulString> const& _older
-)
-{
-	// We clear if the key does not exist in the older map or if the value is different.
-	// This also works for memory because _older is an "older version"
-	// of m_state.environment.memory and thus any overlapping write would have cleared the keys
-	// that are not known to be different inside m_state.environment.memory already.
-	cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){
-		YulString const* oldValue = valueOrNullptr(_older, key);
-		return !oldValue || *oldValue != currentValue;
-	}));
-}
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
deleted file mode 100644
index b449357e6606..000000000000
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Base class to perform data flow analysis during AST walks.
- * Tracks assignments and is used as base class for both Rematerialiser and
- * Common Subexpression Eliminator.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/KnowledgeBase.h>
-#include <libyul/YulString.h>
-#include <libyul/AST.h> // Needed for m_zero below.
-#include <libyul/SideEffects.h>
-
-#include <libsolutil/Numeric.h>
-#include <libsolutil/Common.h>
-
-#include <map>
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct SideEffects;
-class KnowledgeBase;
-
-/// Value assigned to a variable.
-struct AssignedValue
-{
-	Expression const* value{nullptr};
-	/// Loop nesting depth of the definition of the variable.
-	size_t loopDepth{0};
-};
-
-/**
- * Base class to perform data flow analysis during AST walks.
- * Tracks assignments and is used as base class for both Rematerialiser and
- * Common Subexpression Eliminator.
- *
- * A special zero constant expression is used for the default value of variables.
- *
- * The class also tracks contents in storage and memory. Both keys and values
- * are names of variables. Whenever such a variable is re-assigned, the knowledge
- * is cleared.
- *
- * For elementary statements, we check if it is an SSTORE(x, y) / MSTORE(x, y)
- * If yes, visit the statement. Then record that fact and clear all storage slots t
- *   where we cannot prove x != t or y == m_storage[t] using the current values of the variables x and t.
- * Otherwise, determine if the statement invalidates storage/memory. If yes, clear all knowledge
- * about storage/memory before visiting the statement. Then visit the statement.
- *
- * For forward-joining control flow, storage/memory information from the branches is combined.
- * If the keys or values are different or non-existent in one branch, the key is deleted.
- * This works also for memory (where addresses overlap) because one branch is always an
- * older version of the other and thus overlapping contents would have been deleted already
- * at the point of assignment.
- *
- * The DataFlowAnalyzer currently does not deal with the ``leave`` statement. This is because
- * it only matters at the end of a function body, which is a point in the code a derived class
- * can not easily deal with.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class DataFlowAnalyzer: public ASTModifier
-{
-public:
-	enum class MemoryAndStorage { Analyze, Ignore };
-	/// @param _functionSideEffects
-	///            Side-effects of user-defined functions. Worst-case side-effects are assumed
-	///            if this is not provided or the function is not found.
-	///            The parameter is mostly used to determine movability of expressions.
-	explicit DataFlowAnalyzer(
-		Dialect const& _dialect,
-		MemoryAndStorage _analyzeStores,
-		std::map<YulString, SideEffects> _functionSideEffects = {}
-	);
-
-	using ASTModifier::operator();
-	void operator()(ExpressionStatement& _statement) override;
-	void operator()(Assignment& _assignment) override;
-	void operator()(VariableDeclaration& _varDecl) override;
-	void operator()(If& _if) override;
-	void operator()(Switch& _switch) override;
-	void operator()(FunctionDefinition&) override;
-	void operator()(ForLoop&) override;
-	void operator()(Block& _block) override;
-
-	/// @returns the current value of the given variable, if known - always movable.
-	AssignedValue const* variableValue(YulString _variable) const { return util::valueOrNullptr(m_state.value, _variable); }
-	std::set<YulString> const* references(YulString _variable) const { return util::valueOrNullptr(m_state.references, _variable); }
-	std::map<YulString, AssignedValue> const& allValues() const { return m_state.value; }
-	std::optional<YulString> storageValue(YulString _key) const;
-	std::optional<YulString> memoryValue(YulString _key) const;
-	std::optional<YulString> keccakValue(YulString _start, YulString _length) const;
-
-protected:
-	/// Registers the assignment.
-	void handleAssignment(std::set<YulString> const& _names, Expression* _value, bool _isDeclaration);
-
-	/// Creates a new inner scope.
-	void pushScope(bool _functionScope);
-
-	/// Removes the innermost scope and clears all variables in it.
-	void popScope();
-
-	/// Clears information about the values assigned to the given variables,
-	/// for example at points where control flow is merged.
-	void clearValues(std::set<YulString> _names);
-
-	virtual void assignValue(YulString _variable, Expression const* _value);
-
-	/// Clears knowledge about storage or memory if they may be modified inside the block.
-	void clearKnowledgeIfInvalidated(Block const& _block);
-
-	/// Clears knowledge about storage or memory if they may be modified inside the expression.
-	void clearKnowledgeIfInvalidated(Expression const& _expression);
-
-	/// Returns true iff the variable is in scope.
-	bool inScope(YulString _variableName) const;
-
-	/// Returns the literal value of the identifier, if it exists.
-	std::optional<u256> valueOfIdentifier(YulString const& _name) const;
-
-	enum class StoreLoadLocation {
-		Memory = 0,
-		Storage = 1,
-		Last = Storage
-	};
-
-	/// Checks if the statement is sstore(a, b) / mstore(a, b)
-	/// where a and b are variables and returns these variables in that case.
-	std::optional<std::pair<YulString, YulString>> isSimpleStore(
-		StoreLoadLocation _location,
-		ExpressionStatement const& _statement
-	) const;
-
-	/// Checks if the expression is sload(a) / mload(a)
-	/// where a is a variable and returns the variable in that case.
-	std::optional<YulString> isSimpleLoad(
-		StoreLoadLocation _location,
-		Expression const& _expression
-	) const;
-
-	/// Checks if the expression is keccak256(s, l)
-	/// where s and l are variables and returns these variables in that case.
-	std::optional<std::pair<YulString, YulString>> isKeccak(Expression const& _expression) const;
-
-	Dialect const& m_dialect;
-	/// Side-effects of user-defined functions. Worst-case side-effects are assumed
-	/// if this is not provided or the function is not found.
-	std::map<YulString, SideEffects> m_functionSideEffects;
-
-private:
-	struct Environment
-	{
-		std::unordered_map<YulString, YulString> storage;
-		std::unordered_map<YulString, YulString> memory;
-		/// If keccak[s, l] = y then y := keccak256(s, l) occurs in the code.
-		std::map<std::pair<YulString, YulString>, YulString> keccak;
-	};
-	struct State
-	{
-		/// Current values of variables, always movable.
-		std::map<YulString, AssignedValue> value;
-		/// m_references[a].contains(b) <=> the current expression assigned to a references b
-		std::unordered_map<YulString, std::set<YulString>> references;
-
-		Environment environment;
-	};
-
-	/// Joins knowledge about storage and memory with an older point in the control-flow.
-	/// This only works if the current state is a direct successor of the older point,
-	/// i.e. `_olderState.storage` and `_olderState.memory` cannot have additional changes.
-	/// Does nothing if memory and storage analysis is disabled / ignored.
-	void joinKnowledge(Environment const& _olderEnvironment);
-
-	static void joinKnowledgeHelper(
-		std::unordered_map<YulString, YulString>& _thisData,
-		std::unordered_map<YulString, YulString> const& _olderData
-	);
-
-	State m_state;
-
-protected:
-	KnowledgeBase m_knowledgeBase;
-
-	/// If true, analyzes memory and storage content via mload/mstore and sload/sstore.
-	bool m_analyzeStores = true;
-	YulString m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];
-	YulString m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];
-
-	/// Current nesting depth of loops.
-	size_t m_loopDepth{0};
-
-	struct Scope
-	{
-		explicit Scope(bool _isFunction): isFunction(_isFunction) {}
-		std::set<YulString> variables;
-		bool isFunction;
-	};
-	/// Special expression whose address will be used in m_value.
-	/// YulString does not need to be reset because DataFlowAnalyzer is short-lived.
-	Expression const m_zero{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
-	/// List of scopes.
-	std::vector<Scope> m_variableScopes;
-};
-
-}
diff --git a/libyul/optimiser/DeadCodeEliminator.cpp b/libyul/optimiser/DeadCodeEliminator.cpp
deleted file mode 100644
index 71682584a25e..000000000000
--- a/libyul/optimiser/DeadCodeEliminator.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that removes unreachable code.
- */
-
-#include <libyul/optimiser/DeadCodeEliminator.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-#include <libyul/AST.h>
-
-#include <libevmasm/SemanticInformation.h>
-
-#include <algorithm>
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-void DeadCodeEliminator::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
-	DeadCodeEliminator{
-		_context.dialect,
-		sideEffects.functionSideEffectsNamed()
-	}(_ast);
-}
-
-void DeadCodeEliminator::operator()(ForLoop& _for)
-{
-	yulAssert(_for.pre.statements.empty(), "DeadCodeEliminator needs ForLoopInitRewriter as a prerequisite.");
-	ASTModifier::operator()(_for);
-}
-
-void DeadCodeEliminator::operator()(Block& _block)
-{
-	TerminationFinder::ControlFlow controlFlowChange;
-	size_t index;
-	std::tie(controlFlowChange, index) = TerminationFinder{m_dialect, &m_functionSideEffects}.firstUnconditionalControlFlowChange(_block.statements);
-
-	// Erase everything after the terminating statement that is not a function definition.
-	if (controlFlowChange != TerminationFinder::ControlFlow::FlowOut && index != std::numeric_limits<size_t>::max())
-		_block.statements.erase(
-			remove_if(
-				_block.statements.begin() + static_cast<ptrdiff_t>(index) + 1,
-				_block.statements.end(),
-				[] (Statement const& _s) { return !std::holds_alternative<yul::FunctionDefinition>(_s); }
-			),
-			_block.statements.end()
-		);
-
-	ASTModifier::operator()(_block);
-}
diff --git a/libyul/optimiser/DeadCodeEliminator.h b/libyul/optimiser/DeadCodeEliminator.h
deleted file mode 100644
index ae8c1b2a6a4a..000000000000
--- a/libyul/optimiser/DeadCodeEliminator.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that removes unused variables and functions.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
-#include <libyul/ControlFlowSideEffects.h>
-
-#include <map>
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct OptimiserStepContext;
-
-/**
- * Optimisation stage that removes unreachable code
- *
- * Unreachable code is any code within a block which is preceded by a
- * leave, return, invalid, break, continue, selfdestruct or revert or
- * a call to a user-defined function that never returns (either due to
- * recursion or a call to return / revert / stop).
- *
- * Function definitions are retained as they might be called by earlier
- * code and thus are considered reachable.
- *
- * Because variables declared in a for loop's init block have their scope extended to the loop body,
- * we require ForLoopInitRewriter to run before this step.
- *
- * Prerequisite: ForLoopInitRewriter, Function Hoister, Function Grouper
- */
-class DeadCodeEliminator: public ASTModifier
-{
-public:
-	static constexpr char const* name{"DeadCodeEliminator"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(ForLoop& _for) override;
-	void operator()(Block& _block) override;
-
-private:
-	DeadCodeEliminator(
-		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> _sideEffects
-	): m_dialect(_dialect), m_functionSideEffects(std::move(_sideEffects)) {}
-
-	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
-};
-
-}
diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
deleted file mode 100644
index 34e6bc7e6a9b..000000000000
--- a/libyul/optimiser/Disambiguator.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that makes all identifiers unique.
- */
-
-#include <libyul/optimiser/Disambiguator.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Scope.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-YulString Disambiguator::translateIdentifier(YulString _originalName)
-{
-	if (m_dialect.builtin(_originalName) || m_externallyUsedIdentifiers.count(_originalName))
-		return _originalName;
-
-	assertThrow(!m_scopes.empty() && m_scopes.back(), OptimizerException, "");
-	Scope::Identifier const* id = m_scopes.back()->lookup(_originalName);
-	assertThrow(id, OptimizerException, "");
-	if (!m_translations.count(id))
-		m_translations[id] = m_nameDispenser.newName(_originalName);
-	return m_translations.at(id);
-}
-
-void Disambiguator::enterScope(Block const& _block)
-{
-	enterScopeInternal(*m_info.scopes.at(&_block));
-}
-
-void Disambiguator::leaveScope(Block const& _block)
-{
-	leaveScopeInternal(*m_info.scopes.at(&_block));
-}
-
-void Disambiguator::enterFunction(FunctionDefinition const& _function)
-{
-	enterScopeInternal(*m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()));
-}
-
-void Disambiguator::leaveFunction(FunctionDefinition const& _function)
-{
-	leaveScopeInternal(*m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()));
-}
-
-void Disambiguator::enterScopeInternal(Scope& _scope)
-{
-	m_scopes.push_back(&_scope);
-}
-
-void Disambiguator::leaveScopeInternal(Scope& _scope)
-{
-	assertThrow(!m_scopes.empty(), OptimizerException, "");
-	assertThrow(m_scopes.back() == &_scope, OptimizerException, "");
-	m_scopes.pop_back();
-}
diff --git a/libyul/optimiser/Disambiguator.h b/libyul/optimiser/Disambiguator.h
deleted file mode 100644
index 062173882761..000000000000
--- a/libyul/optimiser/Disambiguator.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that makes all identifiers unique.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <optional>
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Creates a copy of a Yul AST replacing all identifiers by unique names.
- */
-class Disambiguator: public ASTCopier
-{
-public:
-	explicit Disambiguator(
-		Dialect const& _dialect,
-		AsmAnalysisInfo const& _analysisInfo,
-		std::set<YulString> const& _externallyUsedIdentifiers = {}
-	):
-		m_info(_analysisInfo),
-		m_dialect(_dialect),
-		m_externallyUsedIdentifiers(_externallyUsedIdentifiers),
-		m_nameDispenser(_dialect, m_externallyUsedIdentifiers)
-	{
-	}
-
-protected:
-	void enterScope(Block const& _block) override;
-	void leaveScope(Block const& _block) override;
-	void enterFunction(FunctionDefinition const& _function) override;
-	void leaveFunction(FunctionDefinition const& _function) override;
-	YulString translateIdentifier(YulString _name) override;
-
-	void enterScopeInternal(Scope& _scope);
-	void leaveScopeInternal(Scope& _scope);
-
-	AsmAnalysisInfo const& m_info;
-	Dialect const& m_dialect;
-	std::set<YulString> const& m_externallyUsedIdentifiers;
-
-	std::vector<Scope*> m_scopes;
-	std::map<void const*, YulString> m_translations;
-	NameDispenser m_nameDispenser;
-};
-
-}
diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
deleted file mode 100644
index 1e894608e9f9..000000000000
--- a/libyul/optimiser/EqualStoreEliminator.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that removes mstore and sstore operations if they store the same
- * value that is already known to be in that slot.
- */
-
-#include <libyul/optimiser/EqualStoreEliminator.h>
-
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-using namespace solidity::yul;
-
-void EqualStoreEliminator::run(OptimiserStepContext const& _context, Block& _ast)
-{
-	EqualStoreEliminator eliminator{
-		_context.dialect,
-		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast))
-	};
-	eliminator(_ast);
-
-	StatementRemover remover{eliminator.m_pendingRemovals};
-	remover(_ast);
-}
-
-void EqualStoreEliminator::visit(Statement& _statement)
-{
-	// No need to consider potential changes through complex arguments since
-	// isSimpleStore only returns something if the arguments are identifiers.
-	if (ExpressionStatement const* expression = std::get_if<ExpressionStatement>(&_statement))
-	{
-		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression))
-		{
-			if (std::optional<YulString> currentValue = storageValue(vars->first))
-				if (*currentValue == vars->second)
-					m_pendingRemovals.insert(&_statement);
-		}
-		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression))
-		{
-			if (std::optional<YulString> currentValue = memoryValue(vars->first))
-				if (*currentValue == vars->second)
-					m_pendingRemovals.insert(&_statement);
-		}
-	}
-
-	DataFlowAnalyzer::visit(_statement);
-}
diff --git a/libyul/optimiser/EqualStoreEliminator.h b/libyul/optimiser/EqualStoreEliminator.h
deleted file mode 100644
index b8572f4667fd..000000000000
--- a/libyul/optimiser/EqualStoreEliminator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that removes mstore and sstore operations if they store the same
- * value that is already known to be in that slot.
- */
-
-#pragma once
-
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Optimisation stage that removes mstore and sstore operations if they store the same
- * value that is already known to be in that slot.
- *
- * Works best if the code is in SSA form - without literal arguments.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class EqualStoreEliminator: public DataFlowAnalyzer
-{
-public:
-	static constexpr char const* name{"EqualStoreEliminator"};
-	static void run(OptimiserStepContext const&, Block& _ast);
-
-private:
-	EqualStoreEliminator(
-		Dialect const& _dialect,
-		std::map<YulString, SideEffects> _functionSideEffects
-	):
-		DataFlowAnalyzer(_dialect, MemoryAndStorage::Analyze, std::move(_functionSideEffects))
-	{}
-
-protected:
-	using ASTModifier::visit;
-	void visit(Statement& _statement) override;
-
-	std::set<Statement const*> m_pendingRemovals;
-};
-
-}
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.cpp b/libyul/optimiser/EquivalentFunctionCombiner.cpp
deleted file mode 100644
index 10d15126e645..000000000000
--- a/libyul/optimiser/EquivalentFunctionCombiner.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that combines syntactically equivalent functions.
- */
-
-#include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/AST.h>
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void EquivalentFunctionCombiner::run(OptimiserStepContext&, Block& _ast)
-{
-	EquivalentFunctionCombiner{EquivalentFunctionDetector::run(_ast)}(_ast);
-}
-
-void EquivalentFunctionCombiner::operator()(FunctionCall& _funCall)
-{
-	auto it = m_duplicates.find(_funCall.functionName.name);
-	if (it != m_duplicates.end())
-		_funCall.functionName.name = it->second->name;
-	ASTModifier::operator()(_funCall);
-}
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.h b/libyul/optimiser/EquivalentFunctionCombiner.h
deleted file mode 100644
index 5337f76842d6..000000000000
--- a/libyul/optimiser/EquivalentFunctionCombiner.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that combines syntactically equivalent functions.
- */
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/EquivalentFunctionDetector.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/ASTForward.h>
-
-namespace solidity::yul
-{
-
-struct OptimiserStepContext;
-
-/**
- * Optimiser component that detects syntactically equivalent functions and replaces all calls to any of them by calls
- * to one particular of them.
- *
- * Prerequisite: Disambiguator, Function Hoister
- */
-class EquivalentFunctionCombiner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"EquivalentFunctionCombiner"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(FunctionCall& _funCall) override;
-
-private:
-	EquivalentFunctionCombiner(std::map<YulString, FunctionDefinition const*> _duplicates): m_duplicates(std::move(_duplicates)) {}
-	std::map<YulString, FunctionDefinition const*> m_duplicates;
-};
-
-
-}
diff --git a/libyul/optimiser/EquivalentFunctionDetector.cpp b/libyul/optimiser/EquivalentFunctionDetector.cpp
deleted file mode 100644
index de19887d8693..000000000000
--- a/libyul/optimiser/EquivalentFunctionDetector.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that combines syntactically equivalent functions.
- */
-
-#include <libyul/optimiser/EquivalentFunctionDetector.h>
-#include <libyul/optimiser/SyntacticalEquality.h>
-
-#include <libyul/AST.h>
-#include <libyul/optimiser/Metrics.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void EquivalentFunctionDetector::operator()(FunctionDefinition const& _fun)
-{
-	uint64_t bodyHash = m_blockHashes[&_fun.body];
-	auto& candidates = m_candidates[bodyHash];
-	for (auto const& candidate: candidates)
-		if (SyntacticallyEqual{}.statementEqual(_fun, *candidate))
-		{
-			m_duplicates[_fun.name] = candidate;
-			return;
-		}
-	candidates.push_back(&_fun);
-}
diff --git a/libyul/optimiser/EquivalentFunctionDetector.h b/libyul/optimiser/EquivalentFunctionDetector.h
deleted file mode 100644
index d3ddc25f7bdb..000000000000
--- a/libyul/optimiser/EquivalentFunctionDetector.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that combines syntactically equivalent functions.
- */
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/BlockHasher.h>
-#include <libyul/ASTForward.h>
-
-namespace solidity::yul
-{
-
-/**
- * Optimiser component that detects syntactically equivalent functions.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter
- */
-class EquivalentFunctionDetector: public ASTWalker
-{
-public:
-	static std::map<YulString, FunctionDefinition const*> run(Block& _block)
-	{
-		EquivalentFunctionDetector detector{BlockHasher::run(_block)};
-		detector(_block);
-		return std::move(detector.m_duplicates);
-	}
-
-	using ASTWalker::operator();
-	void operator()(FunctionDefinition const& _fun) override;
-
-private:
-	EquivalentFunctionDetector(std::map<Block const*, uint64_t> _blockHashes): m_blockHashes(std::move(_blockHashes)) {}
-
-	std::map<Block const*, uint64_t> m_blockHashes;
-	std::map<uint64_t, std::vector<FunctionDefinition const*>> m_candidates;
-	std::map<YulString, FunctionDefinition const*> m_duplicates;
-};
-
-
-}
diff --git a/libyul/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp
deleted file mode 100644
index cacf5843d6b3..000000000000
--- a/libyul/optimiser/ExpressionInliner.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that performs function inlining inside expressions.
- */
-
-#include <libyul/optimiser/ExpressionInliner.h>
-
-#include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/Substitution.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void ExpressionInliner::run(OptimiserStepContext& _context, Block& _ast)
-{
-	InlinableExpressionFunctionFinder funFinder;
-	funFinder(_ast);
-	ExpressionInliner inliner{_context.dialect, funFinder.inlinableFunctions()};
-	inliner(_ast);
-}
-
-void ExpressionInliner::operator()(FunctionDefinition& _fun)
-{
-	ASTModifier::operator()(_fun);
-}
-
-void ExpressionInliner::visit(Expression& _expression)
-{
-	ASTModifier::visit(_expression);
-	if (std::holds_alternative<FunctionCall>(_expression))
-	{
-		FunctionCall& funCall = std::get<FunctionCall>(_expression);
-		if (!m_inlinableFunctions.count(funCall.functionName.name))
-			return;
-		FunctionDefinition const& fun = *m_inlinableFunctions.at(funCall.functionName.name);
-
-		std::map<YulString, Expression const*> substitutions;
-		for (size_t i = 0; i < funCall.arguments.size(); i++)
-		{
-			Expression const& arg = funCall.arguments[i];
-			YulString paraName = fun.parameters[i].name;
-
-			if (!SideEffectsCollector(m_dialect, arg).movable())
-				return;
-
-			size_t refs = ReferencesCounter::countReferences(fun.body)[paraName];
-			size_t cost = CodeCost::codeCost(m_dialect, arg);
-
-			if (refs > 1 && cost > 1)
-				return;
-
-			substitutions[paraName] = &arg;
-		}
-
-		_expression = Substitution(substitutions).translate(*std::get<Assignment>(fun.body.statements.front()).value);
-	}
-}
diff --git a/libyul/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h
deleted file mode 100644
index ff7da67b8832..000000000000
--- a/libyul/optimiser/ExpressionInliner.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that performs function inlining.
- */
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/ASTForward.h>
-
-#include <optional>
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct OptimiserStepContext;
-
-/**
- * Optimiser component that modifies an AST in place, inlining functions that can be
- * inlined inside functional expressions, i.e. functions that
- *  - return a single value
- *  - have a body like r := <functional expression>
- *  - neither reference themselves nor r in the right hand side
- *
- * Furthermore, for all parameters, all of the following need to be true
- *  - the argument is movable
- *  - the parameter is either referenced less than twice in the function body, or the argument is rather cheap
- *    ("cost" of at most 1 like a constant up to 0xff)
- *
- * This component can only be used on sources with unique names.
- */
-class ExpressionInliner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ExpressionInliner"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(FunctionDefinition& _fun) override;
-
-	void visit(Expression& _expression) override;
-
-private:
-	ExpressionInliner(
-		Dialect const& _dialect,
-		std::map<YulString, FunctionDefinition const*> const& _inlinableFunctions
-	): m_dialect(_dialect), m_inlinableFunctions(_inlinableFunctions)
-	{}
-
-	Dialect const& m_dialect;
-	std::map<YulString, FunctionDefinition const*> const& m_inlinableFunctions;
-
-	std::map<YulString, YulString> m_varReplacements;
-	/// Set of functions we are currently visiting inside.
-	std::set<YulString> m_currentFunctions;
-};
-
-}
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
deleted file mode 100644
index ee8d12b8b9fe..000000000000
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that undoes what the ExpressionSplitter did, i.e.
- * it more or less inlines variable declarations.
- */
-
-#include <libyul/optimiser/ExpressionJoiner.h>
-
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/Exceptions.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/view/reverse.hpp>
-
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void ExpressionJoiner::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ExpressionJoiner{_ast}(_ast);
-	FunctionGrouper::run(_context, _ast);
-}
-
-
-void ExpressionJoiner::operator()(FunctionCall& _funCall)
-{
-	handleArguments(_funCall.arguments);
-}
-
-void ExpressionJoiner::operator()(Block& _block)
-{
-	resetLatestStatementPointer();
-	for (size_t i = 0; i < _block.statements.size(); ++i)
-	{
-		visit(_block.statements[i]);
-		m_currentBlock = &_block;
-		m_latestStatementInBlock = i;
-	}
-
-	removeEmptyBlocks(_block);
-	resetLatestStatementPointer();
-}
-
-void ExpressionJoiner::visit(Expression& _e)
-{
-	if (std::holds_alternative<Identifier>(_e))
-	{
-		Identifier const& identifier = std::get<Identifier>(_e);
-		if (isLatestStatementVarDeclJoinable(identifier))
-		{
-			VariableDeclaration& varDecl = std::get<VariableDeclaration>(*latestStatement());
-			_e = std::move(*varDecl.value);
-
-			// Delete the variable declaration (also get the moved-from structure back into a sane state)
-			*latestStatement() = Block();
-
-			decrementLatestStatementPointer();
-		}
-	}
-	else
-		ASTModifier::visit(_e);
-}
-
-ExpressionJoiner::ExpressionJoiner(Block& _ast)
-{
-	m_references = VariableReferencesCounter::countReferences(_ast);
-}
-
-void ExpressionJoiner::handleArguments(std::vector<Expression>& _arguments)
-{
-	// We have to fill from left to right, but we can only
-	// fill if everything to the right is just an identifier
-	// or a literal.
-	// Also we only descend into function calls if everything
-	// on the right is an identifier or literal.
-
-	size_t i = _arguments.size();
-	for (Expression const& arg: _arguments | ranges::views::reverse)
-	{
-		--i;
-		if (!std::holds_alternative<Identifier>(arg) && !std::holds_alternative<Literal>(arg))
-			break;
-	}
-	// i points to the last element that is neither an identifier nor a literal,
-	// or to the first element if all of them are identifiers or literals.
-
-	for (; i < _arguments.size(); ++i)
-		visit(_arguments.at(i));
-}
-
-void ExpressionJoiner::decrementLatestStatementPointer()
-{
-	if (!m_currentBlock)
-		return;
-	if (m_latestStatementInBlock > 0)
-		--m_latestStatementInBlock;
-	else
-		resetLatestStatementPointer();
-}
-
-void ExpressionJoiner::resetLatestStatementPointer()
-{
-	m_currentBlock = nullptr;
-	m_latestStatementInBlock = std::numeric_limits<size_t>::max();
-}
-
-Statement* ExpressionJoiner::latestStatement()
-{
-	if (!m_currentBlock)
-		return nullptr;
-	else
-		return &m_currentBlock->statements.at(m_latestStatementInBlock);
-}
-
-bool ExpressionJoiner::isLatestStatementVarDeclJoinable(Identifier const& _identifier)
-{
-	Statement const* statement = latestStatement();
-	if (!statement || !std::holds_alternative<VariableDeclaration>(*statement))
-		return false;
-	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(*statement);
-	if (varDecl.variables.size() != 1 || !varDecl.value)
-		return false;
-	assertThrow(varDecl.variables.size() == 1, OptimizerException, "");
-	assertThrow(varDecl.value, OptimizerException, "");
-	return varDecl.variables.at(0).name == _identifier.name && m_references[_identifier.name] == 1;
-}
diff --git a/libyul/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h
deleted file mode 100644
index eb22ad79fbdb..000000000000
--- a/libyul/optimiser/ExpressionJoiner.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that undoes what the ExpressionSplitter did, i.e.
- * it more or less inlines variable declarations.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-
-class NameCollector;
-struct OptimiserStepContext;
-
-/**
- * Optimiser component that modifies an AST in place, turning sequences
- * of variable declarations into complex expressions, if the variables
- * are declared in the right order. This component does the opposite
- * of ExpressionSplitter.
- * Since the order of opcode or function evaluation is unchanged,
- * this transformation does not need to care about conflicting opcodes.
- *
- * Code of the form
- *
- * let a1 := mload(y)
- * let a2 := mul(x, 4)
- * sstore(a2, a1)
- *
- * is transformed into
- *
- * sstore(mul(x, 4), mload(y))
- *
- * The transformation is not applied to loop conditions, because those are
- * evaluated with each loop.
- *
- * The component can be applied to sub-blocks of the AST, you do not
- * need to pass a full AST.
- *
- * Prerequisites: Disambiguator
- *
- * Implementation note: We visit the AST, modifying it in place.
- * The class starts counting references and will only replace variables
- * that have exactly one reference. It keeps a "latest statement pointer"
- * which always points to the statement right before the current statement.
- * Any function call or opcode will reset this pointer. If an identifier
- * is encountered that was declared in the "latest statement", it is replaced
- * by the value of the declaration, the "latest statement" is replaced
- * by an empty block and the pointer is decremented.
- * A block also resets the latest statement pointer.
- */
-class ExpressionJoiner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ExpressionJoiner"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-private:
-	explicit ExpressionJoiner(Block& _ast);
-
-	void operator()(Block& _block) override;
-	void operator()(FunctionCall&) override;
-
-	using ASTModifier::visit;
-	void visit(Expression& _e) override;
-
-	void handleArguments(std::vector<Expression>& _arguments);
-
-	void decrementLatestStatementPointer();
-	void resetLatestStatementPointer();
-	Statement* latestStatement();
-	bool isLatestStatementVarDeclJoinable(Identifier const& _identifier);
-
-private:
-	Block* m_currentBlock = nullptr;		///< Pointer to current block holding the statement being visited.
-	size_t m_latestStatementInBlock = 0;		///< Offset to m_currentBlock's statements of the last visited statement.
-	std::map<YulString, size_t> m_references;	///< Holds reference counts to all variable declarations in current block.
-};
-
-}
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
deleted file mode 100644
index c87c5df23f36..000000000000
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that uses the simplification rules to simplify expressions.
- */
-
-#include <libyul/optimiser/ExpressionSimplifier.h>
-
-#include <libyul/optimiser/SimplificationRules.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-#include <libevmasm/SemanticInformation.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void ExpressionSimplifier::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ExpressionSimplifier{_context.dialect}(_ast);
-}
-
-void ExpressionSimplifier::visit(Expression& _expression)
-{
-	ASTModifier::visit(_expression);
-
-	while (auto const* match = SimplificationRules::findFirstMatch(
-		_expression,
-		m_dialect,
-		[this](YulString _var) { return variableValue(_var); }
-	))
-		_expression = match->action().toExpression(debugDataOf(_expression), evmVersionFromDialect(m_dialect));
-
-	if (auto* functionCall = std::get_if<FunctionCall>(&_expression))
-		if (std::optional<evmasm::Instruction> instruction = toEVMInstruction(m_dialect, functionCall->functionName.name))
-			for (auto op: evmasm::SemanticInformation::readWriteOperations(*instruction))
-				if (op.startParameter && op.lengthParameter)
-				{
-					Expression& startArgument = functionCall->arguments.at(*op.startParameter);
-					Expression const& lengthArgument = functionCall->arguments.at(*op.lengthParameter);
-					if (
-						knownToBeZero(lengthArgument) &&
-						!knownToBeZero(startArgument) &&
-						!std::holds_alternative<FunctionCall>(startArgument)
-					)
-						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, "0"_yulstring, {}};
-				}
-}
-
-bool ExpressionSimplifier::knownToBeZero(Expression const& _expression) const
-{
-	if (auto const* literal = std::get_if<Literal>(&_expression))
-		return valueOfLiteral(*literal) == 0;
-	else if (auto const* identifier = std::get_if<Identifier>(&_expression))
-		return valueOfIdentifier(identifier->name) == 0;
-	else
-		return false;
-}
diff --git a/libyul/optimiser/ExpressionSimplifier.h b/libyul/optimiser/ExpressionSimplifier.h
deleted file mode 100644
index 662c8c389936..000000000000
--- a/libyul/optimiser/ExpressionSimplifier.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that uses the simplification rules to simplify expressions.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct OptimiserStepContext;
-
-/**
- * Applies simplification rules to all expressions.
- * The component will work best if the code is in SSA form, but
- * this is not required for correctness. Using CommonSubexpressionEliminator
- * also helps this component track equivalent sub-expressions.
- *
- * It tracks the current values of variables using the DataFlowAnalyzer
- * and takes them into account for replacements.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class ExpressionSimplifier: public DataFlowAnalyzer
-{
-public:
-	static constexpr char const* name{"ExpressionSimplifier"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void visit(Expression& _expression) override;
-
-private:
-	explicit ExpressionSimplifier(Dialect const& _dialect):
-		DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore)
-	{}
-	bool knownToBeZero(Expression const& _expression) const;
-};
-
-}
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
deleted file mode 100644
index 986bcb097f33..000000000000
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that turns complex expressions into multiple variable
- * declarations.
- */
-
-#include <libyul/optimiser/ExpressionSplitter.h>
-
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/TypeInfo.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-void ExpressionSplitter::run(OptimiserStepContext& _context, Block& _ast)
-{
-	TypeInfo typeInfo(_context.dialect, _ast);
-	ExpressionSplitter{_context.dialect, _context.dispenser, typeInfo}(_ast);
-}
-
-void ExpressionSplitter::operator()(FunctionCall& _funCall)
-{
-	BuiltinFunction const* builtin = m_dialect.builtin(_funCall.functionName.name);
-
-	for (size_t i = _funCall.arguments.size(); i > 0; i--)
-		if (!builtin || !builtin->literalArgument(i - 1))
-			outlineExpression(_funCall.arguments[i - 1]);
-}
-
-void ExpressionSplitter::operator()(If& _if)
-{
-	outlineExpression(*_if.condition);
-	(*this)(_if.body);
-}
-
-void ExpressionSplitter::operator()(Switch& _switch)
-{
-	outlineExpression(*_switch.expression);
-	for (auto& _case: _switch.cases)
-		// Do not visit the case expression, nothing to split there.
-		(*this)(_case.body);
-}
-
-void ExpressionSplitter::operator()(ForLoop& _loop)
-{
-	(*this)(_loop.pre);
-	// Do not visit the condition because we cannot split expressions there.
-	(*this)(_loop.post);
-	(*this)(_loop.body);
-}
-
-void ExpressionSplitter::operator()(Block& _block)
-{
-	std::vector<Statement> saved;
-	swap(saved, m_statementsToPrefix);
-
-	std::function<std::optional<std::vector<Statement>>(Statement&)> f =
-			[&](Statement& _statement) -> std::optional<std::vector<Statement>> {
-		m_statementsToPrefix.clear();
-		visit(_statement);
-		if (m_statementsToPrefix.empty())
-			return {};
-		m_statementsToPrefix.emplace_back(std::move(_statement));
-		return std::move(m_statementsToPrefix);
-	};
-	iterateReplacing(_block.statements, f);
-
-	swap(saved, m_statementsToPrefix);
-}
-
-void ExpressionSplitter::outlineExpression(Expression& _expr)
-{
-	if (std::holds_alternative<Identifier>(_expr))
-		return;
-
-	visit(_expr);
-
-	std::shared_ptr<DebugData const> debugData = debugDataOf(_expr);
-	YulString var = m_nameDispenser.newName({});
-	YulString type = m_typeInfo.typeOf(_expr);
-	m_statementsToPrefix.emplace_back(VariableDeclaration{
-		debugData,
-		{{TypedName{debugData, var, type}}},
-		std::make_unique<Expression>(std::move(_expr))
-	});
-	_expr = Identifier{debugData, var};
-	m_typeInfo.setVariableType(var, type);
-}
-
diff --git a/libyul/optimiser/ExpressionSplitter.h b/libyul/optimiser/ExpressionSplitter.h
deleted file mode 100644
index bbde8d6a2df0..000000000000
--- a/libyul/optimiser/ExpressionSplitter.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that turns complex expressions into multiple variable
- * declarations.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <vector>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-struct OptimiserStepContext;
-class TypeInfo;
-
-/**
- * Optimiser component that modifies an AST in place, turning complex
- * expressions into simple expressions and multiple variable declarations.
- *
- * Code of the form
- *
- * sstore(mul(x, 4), mload(y))
- *
- * is transformed into
- *
- * let a1 := mload(y)
- * let a2 := mul(x, 4)
- * sstore(a2, a1)
- *
- * The transformation is not applied to loop conditions, because the loop control flow
- * does not allow "outlining" the inner expressions in all cases.
- *
- * The final program should be in a form such that with the exception of a loop condition,
- * function calls can only appear in the right-hand side of a variable declaration,
- * assignments or expression statements and all arguments have to be constants or variables.
- */
-class ExpressionSplitter: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ExpressionSplitter"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	void operator()(FunctionCall&) override;
-	void operator()(If&) override;
-	void operator()(Switch&) override;
-	void operator()(ForLoop&) override;
-	void operator()(Block& _block) override;
-
-private:
-	explicit ExpressionSplitter(
-		Dialect const& _dialect,
-		NameDispenser& _nameDispenser,
-		TypeInfo& _typeInfo
-	):
-		m_dialect(_dialect),
-		m_nameDispenser(_nameDispenser),
-		m_typeInfo(_typeInfo)
-	{ }
-
-	/// Replaces the expression by a variable if it is a function call or functional
-	/// instruction. The declaration of the variable is appended to m_statementsToPrefix.
-	/// Recurses via visit().
-	void outlineExpression(Expression& _expr);
-
-	/// List of statements that should go in front of the currently visited AST element,
-	/// at the statement level.
-	std::vector<Statement> m_statementsToPrefix;
-	Dialect const& m_dialect;
-	NameDispenser& m_nameDispenser;
-	TypeInfo& m_typeInfo;
-};
-
-}
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
deleted file mode 100644
index 2dd0832c4288..000000000000
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/ForLoopConditionIntoBody.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void ForLoopConditionIntoBody::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ForLoopConditionIntoBody{_context.dialect}(_ast);
-}
-
-void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
-{
-	if (
-		m_dialect.booleanNegationFunction() &&
-		!std::holds_alternative<Literal>(*_forLoop.condition) &&
-		!std::holds_alternative<Identifier>(*_forLoop.condition)
-	)
-	{
-		std::shared_ptr<DebugData const> debugData = debugDataOf(*_forLoop.condition);
-
-		_forLoop.body.statements.emplace(
-			begin(_forLoop.body.statements),
-			If {
-				debugData,
-				std::make_unique<Expression>(
-					FunctionCall {
-						debugData,
-						{debugData, m_dialect.booleanNegationFunction()->name},
-						util::make_vector<Expression>(std::move(*_forLoop.condition))
-					}
-				),
-				Block {debugData, util::make_vector<Statement>(Break{{}})}
-			}
-		);
-		_forLoop.condition = std::make_unique<Expression>(
-			Literal {
-				debugData,
-				LiteralKind::Boolean,
-				"true"_yulstring,
-				m_dialect.boolType
-			}
-		);
-	}
-	ASTModifier::operator()(_forLoop);
-}
-
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.h b/libyul/optimiser/ForLoopConditionIntoBody.h
deleted file mode 100644
index 2a9c92c23783..000000000000
--- a/libyul/optimiser/ForLoopConditionIntoBody.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/Dialect.h>
-
-namespace solidity::yul
-{
-
-struct OptimiserStepContext;
-
-/**
- * Rewrites ForLoop by moving iteration condition into the ForLoop body.
- * For example, `for {} lt(a, b) {} { mstore(1, 2) }` will become
- * `for {} 1 {} { if iszero(lt(a, b)) { break } mstore(1, 2) }`
- *
- * By moving the iteration check part into the ForLoop body, we can apply expression splitter
- * to the condition expression.
- *
- * This rewriter will skip loops that already have literal constant as iteration condition.
- *
- * Requirements:
- * - The Disambiguator must be run upfront.
- * - To avoid unnecessary rewrite, it is recommended to run this rewriter after StructuralSimplifier.
- * - Only works for dialects with a builtin boolean negation function.
- */
-class ForLoopConditionIntoBody: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ForLoopConditionIntoBody"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(ForLoop& _forLoop) override;
-
-private:
-	ForLoopConditionIntoBody(Dialect const& _dialect): m_dialect(_dialect) {}
-
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
deleted file mode 100644
index 363ecdf0c02d..000000000000
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/ForLoopConditionOutOfBody.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void ForLoopConditionOutOfBody::run(OptimiserStepContext& _context, Block& _ast)
-{
-	ForLoopConditionOutOfBody{_context.dialect}(_ast);
-}
-
-void ForLoopConditionOutOfBody::operator()(ForLoop& _forLoop)
-{
-	ASTModifier::operator()(_forLoop);
-
-	if (
-		!m_dialect.booleanNegationFunction() ||
-		!std::holds_alternative<Literal>(*_forLoop.condition) ||
-		valueOfLiteral(std::get<Literal>(*_forLoop.condition)) == u256(0) ||
-		_forLoop.body.statements.empty() ||
-		!std::holds_alternative<If>(_forLoop.body.statements.front())
-	)
-		return;
-
-	If& firstStatement = std::get<If>(_forLoop.body.statements.front());
-	if (
-		firstStatement.body.statements.empty() ||
-		!std::holds_alternative<Break>(firstStatement.body.statements.front())
-	)
-		return;
-	if (!SideEffectsCollector(m_dialect, *firstStatement.condition).movable())
-		return;
-
-	YulString iszero = m_dialect.booleanNegationFunction()->name;
-	std::shared_ptr<DebugData const> debugData = debugDataOf(*firstStatement.condition);
-
-	if (
-		std::holds_alternative<FunctionCall>(*firstStatement.condition) &&
-		std::get<FunctionCall>(*firstStatement.condition).functionName.name == iszero
-	)
-		_forLoop.condition = std::make_unique<Expression>(std::move(std::get<FunctionCall>(*firstStatement.condition).arguments.front()));
-	else
-		_forLoop.condition = std::make_unique<Expression>(FunctionCall{
-			debugData,
-			Identifier{debugData, iszero},
-			util::make_vector<Expression>(
-				std::move(*firstStatement.condition)
-			)
-		});
-
-	_forLoop.body.statements.erase(_forLoop.body.statements.begin());
-}
-
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.h b/libyul/optimiser/ForLoopConditionOutOfBody.h
deleted file mode 100644
index ba3b7eb18309..000000000000
--- a/libyul/optimiser/ForLoopConditionOutOfBody.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/Dialect.h>
-
-namespace solidity::yul
-{
-
-/**
- * Reverses the transformation of ForLoopConditionIntoBody.
- *
- * For any movable ``c``, it turns
- *
- * for { ... } 1 { ... } {
- *   if iszero(c) { break }
- *   ...
- * }
- *
- * into
- *
- * for { ... } c { ... } {
- *   ...
- * }
- *
- * and it turns
- *
- * for { ... } 1 { ... } {
- *   if c { break }
- *   ...
- * }
- *
- * into
- *
- * for { ... } iszero(c) { ... } {
- *   ...
- * }
- *
- * The LiteralRematerialiser should be run before this step.
- */
-class ForLoopConditionOutOfBody: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ForLoopConditionOutOfBody"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(ForLoop& _forLoop) override;
-
-private:
-	ForLoopConditionOutOfBody(Dialect const& _dialect):
-		m_dialect(_dialect)
-	{}
-
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/optimiser/ForLoopInitRewriter.cpp b/libyul/optimiser/ForLoopInitRewriter.cpp
deleted file mode 100644
index b0696f3b259a..000000000000
--- a/libyul/optimiser/ForLoopInitRewriter.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <functional>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void ForLoopInitRewriter::operator()(Block& _block)
-{
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _stmt) -> std::optional<std::vector<Statement>>
-		{
-			if (std::holds_alternative<ForLoop>(_stmt))
-			{
-				auto& forLoop = std::get<ForLoop>(_stmt);
-				(*this)(forLoop.pre);
-				(*this)(forLoop.body);
-				(*this)(forLoop.post);
-				std::vector<Statement> rewrite;
-				swap(rewrite, forLoop.pre.statements);
-				rewrite.emplace_back(std::move(forLoop));
-				return { std::move(rewrite) };
-			}
-			else
-			{
-				visit(_stmt);
-				return {};
-			}
-		}
-	);
-}
diff --git a/libyul/optimiser/ForLoopInitRewriter.h b/libyul/optimiser/ForLoopInitRewriter.h
deleted file mode 100644
index 96ae0cca7e98..000000000000
--- a/libyul/optimiser/ForLoopInitRewriter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Rewrites ForLoop by moving the pre statement block in front of the ForLoop.
- * Requirements:
- * - The Disambiguator must be run upfront.
- */
-class ForLoopInitRewriter: public ASTModifier
-{
-public:
-	static constexpr char const* name{"ForLoopInitRewriter"};
-	static void run(OptimiserStepContext&, Block& _ast)
-	{
-		ForLoopInitRewriter{}(_ast);
-	}
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-
-private:
-	ForLoopInitRewriter() = default;
-};
-
-}
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
deleted file mode 100644
index 6e4d8497199f..000000000000
--- a/libyul/optimiser/FullInliner.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that performs function inlining for arbitrary functions.
- */
-
-#include <libyul/optimiser/FullInliner.h>
-
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/Exceptions.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/action/remove.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <range/v3/view/zip.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void FullInliner::run(OptimiserStepContext& _context, Block& _ast)
-{
-	FullInliner inliner{_ast, _context.dispenser, _context.dialect};
-	inliner.run(Pass::InlineTiny);
-	inliner.run(Pass::InlineRest);
-}
-
-FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const& _dialect):
-	m_ast(_ast),
-	m_recursiveFunctions(CallGraphGenerator::callGraph(_ast).recursiveFunctions()),
-	m_nameDispenser(_dispenser),
-	m_dialect(_dialect)
-{
-
-	// Determine constants
-	SSAValueTracker tracker;
-	tracker(m_ast);
-	for (auto const& ssaValue: tracker.values())
-		if (ssaValue.second && std::holds_alternative<Literal>(*ssaValue.second))
-			m_constants.emplace(ssaValue.first);
-
-	// Store size of global statements.
-	m_functionSizes[YulString{}] = CodeSize::codeSize(_ast);
-	std::map<YulString, size_t> references = ReferencesCounter::countReferences(m_ast);
-	for (auto& statement: m_ast.statements)
-	{
-		if (!std::holds_alternative<FunctionDefinition>(statement))
-			continue;
-		FunctionDefinition& fun = std::get<FunctionDefinition>(statement);
-		m_functions[fun.name] = &fun;
-		if (LeaveFinder::containsLeave(fun))
-			m_noInlineFunctions.insert(fun.name);
-		// Always inline functions that are only called once.
-		if (references[fun.name] == 1)
-			m_singleUse.emplace(fun.name);
-		updateCodeSize(fun);
-	}
-
-	// Check for memory guard.
-	std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
-		_ast,
-		"memoryguard"_yulstring
-	);
-	// We will perform less aggressive inlining, if no ``memoryguard`` call is found.
-	if (!memoryGuardCalls.empty())
-		m_hasMemoryGuard = true;
-}
-
-void FullInliner::run(Pass _pass)
-{
-	m_pass = _pass;
-
-	// Note that the order of inlining can result in very different code.
-	// Since AST IDs and thus function names depend on whether or not a contract
-	// is compiled together with other source files, a change in AST IDs
-	// should have as little an impact as possible. This is the case
-	// if we handle inlining in source (and thus, for the IR generator,
-	// function name) order.
-	// We use stable_sort below to keep the inlining order of two functions
-	// with the same depth.
-	std::map<YulString, size_t> depths = callDepths();
-	std::vector<FunctionDefinition*> functions;
-	for (auto& statement: m_ast.statements)
-		if (std::holds_alternative<FunctionDefinition>(statement))
-			functions.emplace_back(&std::get<FunctionDefinition>(statement));
-	std::stable_sort(functions.begin(), functions.end(), [depths](
-		FunctionDefinition const* _a,
-		FunctionDefinition const* _b
-	) {
-		return depths.at(_a->name) < depths.at(_b->name);
-	});
-	for (FunctionDefinition* fun: functions)
-	{
-		handleBlock(fun->name, fun->body);
-		updateCodeSize(*fun);
-	}
-
-	for (auto& statement: m_ast.statements)
-		if (std::holds_alternative<Block>(statement))
-			handleBlock({}, std::get<Block>(statement));
-}
-
-std::map<YulString, size_t> FullInliner::callDepths() const
-{
-	CallGraph cg = CallGraphGenerator::callGraph(m_ast);
-	cg.functionCalls.erase(""_yulstring);
-
-	// Remove calls to builtin functions.
-	for (auto& call: cg.functionCalls)
-		for (auto it = call.second.begin(); it != call.second.end();)
-			if (m_dialect.builtin(*it))
-				it = call.second.erase(it);
-			else
-				++it;
-
-	std::map<YulString, size_t> depths;
-	size_t currentDepth = 0;
-
-	while (true)
-	{
-		std::vector<YulString> removed;
-		for (auto it = cg.functionCalls.begin(); it != cg.functionCalls.end();)
-		{
-			auto const& [fun, callees] = *it;
-			if (callees.empty())
-			{
-				removed.emplace_back(fun);
-				depths[fun] = currentDepth;
-				it = cg.functionCalls.erase(it);
-			}
-			else
-				++it;
-		}
-
-		for (auto& call: cg.functionCalls)
-			for (YulString toBeRemoved: removed)
-				ranges::actions::remove(call.second, toBeRemoved);
-
-		currentDepth++;
-
-		if (removed.empty())
-			break;
-	}
-
-	// Only recursive functions left here.
-	for (auto const& fun: cg.functionCalls)
-		depths[fun.first] = currentDepth;
-
-	return depths;
-}
-
-bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
-{
-	// No recursive inlining
-	if (_funCall.functionName.name == _callSite)
-		return false;
-
-	FunctionDefinition* calledFunction = function(_funCall.functionName.name);
-	if (!calledFunction)
-		return false;
-
-	if (m_noInlineFunctions.count(_funCall.functionName.name) || recursive(*calledFunction))
-		return false;
-
-	// No inlining of calls where argument expressions may have side-effects.
-	// To avoid running into this, make sure that ExpressionSplitter runs before FullInliner.
-	for (auto const& argument: _funCall.arguments)
-		if (!std::holds_alternative<Literal>(argument) && !std::holds_alternative<Identifier>(argument))
-			return false;
-
-	// Inline really, really tiny functions
-	size_t size = m_functionSizes.at(calledFunction->name);
-	if (size <= 1)
-		return true;
-
-	// In the first pass, only inline tiny functions.
-	if (m_pass == Pass::InlineTiny)
-		return false;
-
-	bool aggressiveInlining = true;
-
-	if (
-		EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect);
-		!evmDialect || !evmDialect->providesObjectAccess() || evmDialect->evmVersion() <= langutil::EVMVersion::homestead()
-	)
-		// No aggressive inlining with the old code transform.
-		aggressiveInlining = false;
-
-	// No aggressive inlining, if we cannot perform stack-to-memory.
-	if (!m_hasMemoryGuard || m_recursiveFunctions.count(_callSite))
-		aggressiveInlining = false;
-
-	if (!aggressiveInlining && m_functionSizes.at(_callSite) > 45)
-		return false;
-
-	if (m_singleUse.count(calledFunction->name))
-		return true;
-
-	// Constant arguments might provide a means for further optimization, so they cause a bonus.
-	bool constantArg = false;
-	for (auto const& argument: _funCall.arguments)
-		if (std::holds_alternative<Literal>(argument) || (
-			std::holds_alternative<Identifier>(argument) &&
-			m_constants.count(std::get<Identifier>(argument).name)
-		))
-		{
-			constantArg = true;
-			break;
-		}
-
-	return (size < (aggressiveInlining ? 8u : 6u) || (constantArg && size < (aggressiveInlining ? 16u : 12u)));
-}
-
-void FullInliner::tentativelyUpdateCodeSize(YulString _function, YulString _callSite)
-{
-	m_functionSizes.at(_callSite) += m_functionSizes.at(_function);
-}
-
-void FullInliner::updateCodeSize(FunctionDefinition const& _fun)
-{
-	m_functionSizes[_fun.name] = CodeSize::codeSize(_fun.body);
-}
-
-void FullInliner::handleBlock(YulString _currentFunctionName, Block& _block)
-{
-	InlineModifier{*this, m_nameDispenser, _currentFunctionName, m_dialect}(_block);
-}
-
-bool FullInliner::recursive(FunctionDefinition const& _fun) const
-{
-	std::map<YulString, size_t> references = ReferencesCounter::countReferences(_fun);
-	return references[_fun.name] > 0;
-}
-
-void InlineModifier::operator()(Block& _block)
-{
-	std::function<std::optional<std::vector<Statement>>(Statement&)> f = [&](Statement& _statement) -> std::optional<std::vector<Statement>> {
-		visit(_statement);
-		return tryInlineStatement(_statement);
-	};
-	util::iterateReplacing(_block.statements, f);
-}
-
-std::optional<std::vector<Statement>> InlineModifier::tryInlineStatement(Statement& _statement)
-{
-	// Only inline for expression statements, assignments and variable declarations.
-	Expression* e = std::visit(util::GenericVisitor{
-		util::VisitorFallback<Expression*>{},
-		[](ExpressionStatement& _s) { return &_s.expression; },
-		[](Assignment& _s) { return _s.value.get(); },
-		[](VariableDeclaration& _s) { return _s.value.get(); }
-	}, _statement);
-	if (e)
-	{
-		// Only inline direct function calls.
-		FunctionCall* funCall = std::visit(util::GenericVisitor{
-			util::VisitorFallback<FunctionCall*>{},
-			[](FunctionCall& _e) { return &_e; }
-		}, *e);
-		if (funCall && m_driver.shallInline(*funCall, m_currentFunction))
-			return performInline(_statement, *funCall);
-	}
-	return {};
-}
-
-std::vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionCall& _funCall)
-{
-	std::vector<Statement> newStatements;
-	std::map<YulString, YulString> variableReplacements;
-
-	FunctionDefinition* function = m_driver.function(_funCall.functionName.name);
-	assertThrow(!!function, OptimizerException, "Attempt to inline invalid function.");
-
-	m_driver.tentativelyUpdateCodeSize(function->name, m_currentFunction);
-
-	// helper function to create a new variable that is supposed to model
-	// an existing variable.
-	auto newVariable = [&](TypedName const& _existingVariable, Expression* _value) {
-		YulString newName = m_nameDispenser.newName(_existingVariable.name);
-		variableReplacements[_existingVariable.name] = newName;
-		VariableDeclaration varDecl{_funCall.debugData, {{_funCall.debugData, newName, _existingVariable.type}}, {}};
-		if (_value)
-			varDecl.value = std::make_unique<Expression>(std::move(*_value));
-		else
-			varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteralForType(varDecl.variables.front().type));
-		newStatements.emplace_back(std::move(varDecl));
-	};
-
-	for (auto&& [parameter, argument]: ranges::views::zip(function->parameters, _funCall.arguments) | ranges::views::reverse)
-		newVariable(parameter, &argument);
-	for (auto const& var: function->returnVariables)
-		newVariable(var, nullptr);
-
-	Statement newBody = BodyCopier(m_nameDispenser, variableReplacements)(function->body);
-	newStatements += std::move(std::get<Block>(newBody).statements);
-
-	std::visit(util::GenericVisitor{
-		util::VisitorFallback<>{},
-		[&](Assignment& _assignment)
-		{
-			for (size_t i = 0; i < _assignment.variableNames.size(); ++i)
-				newStatements.emplace_back(Assignment{
-					_assignment.debugData,
-					{_assignment.variableNames[i]},
-					std::make_unique<Expression>(Identifier{
-						_assignment.debugData,
-						variableReplacements.at(function->returnVariables[i].name)
-					})
-				});
-		},
-		[&](VariableDeclaration& _varDecl)
-		{
-			for (size_t i = 0; i < _varDecl.variables.size(); ++i)
-				newStatements.emplace_back(VariableDeclaration{
-					_varDecl.debugData,
-					{std::move(_varDecl.variables[i])},
-					std::make_unique<Expression>(Identifier{
-						_varDecl.debugData,
-						variableReplacements.at(function->returnVariables[i].name)
-					})
-				});
-		}
-		// nothing to be done for expression statement
-	}, _statement);
-	return newStatements;
-}
-
-Statement BodyCopier::operator()(VariableDeclaration const& _varDecl)
-{
-	for (auto const& var: _varDecl.variables)
-		m_variableReplacements[var.name] = m_nameDispenser.newName(var.name);
-	return ASTCopier::operator()(_varDecl);
-}
-
-Statement BodyCopier::operator()(FunctionDefinition const&)
-{
-	assertThrow(false, OptimizerException, "Function hoisting has to be done before function inlining.");
-	return {};
-}
-
-YulString BodyCopier::translateIdentifier(YulString _name)
-{
-	if (m_variableReplacements.count(_name))
-		return m_variableReplacements.at(_name);
-	else
-		return _name;
-}
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
deleted file mode 100644
index 931315305c57..000000000000
--- a/libyul/optimiser/FullInliner.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that performs function inlining for arbitrary functions.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/Exceptions.h>
-
-#include <liblangutil/SourceLocation.h>
-
-#include <optional>
-#include <set>
-#include <utility>
-
-namespace solidity::yul
-{
-
-class NameCollector;
-
-
-/**
- * Optimiser component that modifies an AST in place, inlining functions.
- * Expressions are expected to be split, i.e. the component will only inline
- * function calls that are at the root of the expression and that only contains
- * variables or literals as arguments. More specifically, it will inline
- *  - let x1, ..., xn := f(a1, ..., am)
- *  - x1, ..., xn := f(a1, ..., am)
- *  - f(a1, ..., am)
- *
- * The transform changes code of the form
- *
- * function f(a, b) -> c { ... }
- * let z := f(x, y)
- *
- * into
- *
- * function f(a, b) -> c { ... }
- *
- * let f_b := y
- * let f_a := x
- * let f_c
- * code of f, with replacements: a -> f_a, b -> f_b, c -> f_c
- * let z := f_c
- *
- * Prerequisites: Disambiguator
- * More efficient if run after: Function Hoister, Expression Splitter
- */
-class FullInliner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"FullInliner"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	/// Inlining heuristic.
-	/// @param _callSite the name of the function in which the function call is located.
-	bool shallInline(FunctionCall const& _funCall, YulString _callSite);
-
-	FunctionDefinition* function(YulString _name)
-	{
-		auto it = m_functions.find(_name);
-		if (it != m_functions.end())
-			return it->second;
-		return nullptr;
-	}
-
-	/// Adds the size of _funCall to the size of _callSite. This is just
-	/// a rough estimate that is done during inlining. The proper size
-	/// should be determined after inlining is completed.
-	void tentativelyUpdateCodeSize(YulString _function, YulString _callSite);
-
-private:
-	enum Pass { InlineTiny, InlineRest };
-
-	FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const& _dialect);
-	void run(Pass _pass);
-
-	/// @returns a map containing the maximum depths of a call chain starting at each
-	/// function. For recursive functions, the value is one larger than for all others.
-	std::map<YulString, size_t> callDepths() const;
-
-	void updateCodeSize(FunctionDefinition const& _fun);
-	void handleBlock(YulString _currentFunctionName, Block& _block);
-	bool recursive(FunctionDefinition const& _fun) const;
-
-	Pass m_pass;
-	/// The AST to be modified. The root block itself will not be modified, because
-	/// we store pointers to functions.
-	Block& m_ast;
-	std::map<YulString, FunctionDefinition*> m_functions;
-	/// Functions not to be inlined (because they contain the ``leave`` statement).
-	std::set<YulString> m_noInlineFunctions;
-	/// True, if the code contains a ``memoryguard`` and we can expect to be able to move variables to memory later.
-	bool m_hasMemoryGuard = false;
-	/// Set of recursive functions.
-	std::set<YulString> m_recursiveFunctions;
-	/// Names of functions to always inline.
-	std::set<YulString> m_singleUse;
-	/// Variables that are constants (used for inlining heuristic)
-	std::set<YulString> m_constants;
-	std::map<YulString, size_t> m_functionSizes;
-	NameDispenser& m_nameDispenser;
-	Dialect const& m_dialect;
-};
-
-/**
- * Class that walks the AST of a block that does not contain function definitions and perform
- * the actual code modifications.
- */
-class InlineModifier: public ASTModifier
-{
-public:
-	InlineModifier(FullInliner& _driver, NameDispenser& _nameDispenser, YulString _functionName, Dialect const& _dialect):
-		m_currentFunction(std::move(_functionName)),
-		m_driver(_driver),
-		m_nameDispenser(_nameDispenser),
-		m_dialect(_dialect)
-	{ }
-
-	void operator()(Block& _block) override;
-
-private:
-	std::optional<std::vector<Statement>> tryInlineStatement(Statement& _statement);
-	std::vector<Statement> performInline(Statement& _statement, FunctionCall& _funCall);
-
-	YulString m_currentFunction;
-	FullInliner& m_driver;
-	NameDispenser& m_nameDispenser;
-	Dialect const& m_dialect;
-};
-
-/**
- * Creates a copy of a block that is supposed to be the body of a function.
- * Applies replacements to referenced variables and creates new names for
- * variable declarations.
- */
-class BodyCopier: public ASTCopier
-{
-public:
-	BodyCopier(
-		NameDispenser& _nameDispenser,
-		std::map<YulString, YulString> _variableReplacements
-	):
-		m_nameDispenser(_nameDispenser),
-		m_variableReplacements(std::move(_variableReplacements))
-	{}
-
-	using ASTCopier::operator ();
-
-	Statement operator()(VariableDeclaration const& _varDecl) override;
-	Statement operator()(FunctionDefinition const& _funDef) override;
-
-	YulString translateIdentifier(YulString _name) override;
-
-	NameDispenser& m_nameDispenser;
-	std::map<YulString, YulString> m_variableReplacements;
-};
-
-
-}
diff --git a/libyul/optimiser/FunctionCallFinder.cpp b/libyul/optimiser/FunctionCallFinder.cpp
deleted file mode 100644
index 9d94dc5f9ca1..000000000000
--- a/libyul/optimiser/FunctionCallFinder.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-std::vector<FunctionCall*> FunctionCallFinder::run(Block& _block, YulString _functionName)
-{
-	FunctionCallFinder functionCallFinder(_functionName);
-	functionCallFinder(_block);
-	return functionCallFinder.m_calls;
-}
-
-FunctionCallFinder::FunctionCallFinder(YulString _functionName): m_functionName(_functionName) {}
-
-void FunctionCallFinder::operator()(FunctionCall& _functionCall)
-{
-	ASTModifier::operator()(_functionCall);
-	if (_functionCall.functionName.name == m_functionName)
-		m_calls.emplace_back(&_functionCall);
-}
diff --git a/libyul/optimiser/FunctionCallFinder.h b/libyul/optimiser/FunctionCallFinder.h
deleted file mode 100644
index 365f86688b74..000000000000
--- a/libyul/optimiser/FunctionCallFinder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * AST walker that finds all calls to a function of a given name.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <vector>
-
-namespace solidity::yul
-{
-
-/**
- * AST walker that finds all calls to a function of a given name.
- *
- * Prerequisite: Disambiguator
- */
-class FunctionCallFinder: ASTModifier
-{
-public:
-	static std::vector<FunctionCall*> run(Block& _block, YulString _functionName);
-private:
-	FunctionCallFinder(YulString _functionName);
-	using ASTModifier::operator();
-	void operator()(FunctionCall& _functionCall) override;
-	YulString m_functionName;
-	std::vector<FunctionCall*> m_calls;
-};
-
-}
diff --git a/libyul/optimiser/FunctionGrouper.cpp b/libyul/optimiser/FunctionGrouper.cpp
deleted file mode 100644
index 5f649d1891e8..000000000000
--- a/libyul/optimiser/FunctionGrouper.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that changes the code of a block so that all non-function definition
- * statements are moved to a block of their own followed by all function definitions.
- */
-
-#include <libyul/optimiser/FunctionGrouper.h>
-
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-
-void FunctionGrouper::operator()(Block& _block)
-{
-	if (alreadyGrouped(_block))
-		return;
-
-	std::vector<Statement> reordered;
-	reordered.emplace_back(Block{_block.debugData, {}});
-
-	for (auto&& statement: _block.statements)
-	{
-		if (std::holds_alternative<FunctionDefinition>(statement))
-			reordered.emplace_back(std::move(statement));
-		else
-			std::get<Block>(reordered.front()).statements.emplace_back(std::move(statement));
-	}
-	_block.statements = std::move(reordered);
-}
-
-bool FunctionGrouper::alreadyGrouped(Block const& _block)
-{
-	if (_block.statements.empty())
-		return false;
-	if (!std::holds_alternative<Block>(_block.statements.front()))
-		return false;
-	for (size_t i = 1; i < _block.statements.size(); ++i)
-		if (!std::holds_alternative<FunctionDefinition>(_block.statements.at(i)))
-			return false;
-	return true;
-}
diff --git a/libyul/optimiser/FunctionGrouper.h b/libyul/optimiser/FunctionGrouper.h
deleted file mode 100644
index 57ea80cac9f7..000000000000
--- a/libyul/optimiser/FunctionGrouper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that changes the code of a block so that all non-function definition
- * instructions are moved to a block of their own followed by all function definitions.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-namespace solidity::yul
-{
-
-struct OptimiserStepContext;
-
-/**
- * Moves all instructions in a block into a new block at the start of the block, followed by
- * all function definitions.
- *
- * After this step, a block is of the form
- * { { I... } F... }
- * Where I are (non-function-definition) instructions and F are function definitions.
- */
-class FunctionGrouper
-{
-public:
-	static constexpr char const* name{"FunctionGrouper"};
-	static void run(OptimiserStepContext&, Block& _ast) { FunctionGrouper{}(_ast); }
-
-	void operator()(Block& _block);
-
-private:
-	FunctionGrouper() = default;
-
-	bool alreadyGrouped(Block const& _block);
-};
-
-}
diff --git a/libyul/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp
deleted file mode 100644
index 32df3b121a61..000000000000
--- a/libyul/optimiser/FunctionHoister.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that changes the code so that it consists of a block starting with
- * a single block followed only by function definitions and with no functions defined
- * anywhere else.
- */
-
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void FunctionHoister::operator()(Block& _block)
-{
-	bool topLevel = m_isTopLevel;
-	m_isTopLevel = false;
-	for (auto&& statement: _block.statements)
-	{
-		std::visit(*this, statement);
-		if (std::holds_alternative<FunctionDefinition>(statement))
-		{
-			m_functions.emplace_back(std::move(statement));
-			statement = Block{_block.debugData, {}};
-		}
-	}
-	removeEmptyBlocks(_block);
-	if (topLevel)
-		_block.statements += std::move(m_functions);
-}
diff --git a/libyul/optimiser/FunctionHoister.h b/libyul/optimiser/FunctionHoister.h
deleted file mode 100644
index 04d7f64e3d73..000000000000
--- a/libyul/optimiser/FunctionHoister.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that changes the code so that all function definitions are at the top
- * level block.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-
-namespace solidity::yul
-{
-struct OptimiserStepContext;
-
-/**
- * Moves all functions to the top-level scope.
- * Applying this transformation to source code that has ambiguous identifiers might
- * lead to invalid code.
- *
- * Prerequisites: Disambiguator
- */
-class FunctionHoister: public ASTModifier
-{
-public:
-	static constexpr char const* name{"FunctionHoister"};
-	static void run(OptimiserStepContext&, Block& _ast) { FunctionHoister{}(_ast); }
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-
-private:
-	FunctionHoister() = default;
-
-	bool m_isTopLevel = true;
-	std::vector<Statement> m_functions;
-};
-
-}
diff --git a/libyul/optimiser/FunctionSpecializer.cpp b/libyul/optimiser/FunctionSpecializer.cpp
deleted file mode 100644
index 7e6d486327ea..000000000000
--- a/libyul/optimiser/FunctionSpecializer.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/FunctionSpecializer.h>
-
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <libyul/AST.h>
-#include <libyul/YulString.h>
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/algorithm/any_of.hpp>
-#include <range/v3/view/enumerate.hpp>
-
-#include <variant>
-
-using namespace solidity::util;
-using namespace solidity::yul;
-
-FunctionSpecializer::LiteralArguments FunctionSpecializer::specializableArguments(
-	FunctionCall const& _f
-)
-{
-	auto heuristic = [&](Expression const& _e) -> std::optional<Expression>
-	{
-		if (std::holds_alternative<Literal>(_e))
-			return ASTCopier{}.translate(_e);
-		return std::nullopt;
-	};
-
-	return applyMap(_f.arguments, heuristic);
-}
-
-void FunctionSpecializer::operator()(FunctionCall& _f)
-{
-	ASTModifier::operator()(_f);
-
-	// TODO When backtracking is implemented, the restriction of recursive functions can be lifted.
-	if (
-		m_dialect.builtin(_f.functionName.name) ||
-		m_recursiveFunctions.count(_f.functionName.name)
-	)
-		return;
-
-	LiteralArguments arguments = specializableArguments(_f);
-
-	if (ranges::any_of(arguments, [](auto& _a) { return _a.has_value(); }))
-	{
-		YulString oldName = std::move(_f.functionName.name);
-		auto newName = m_nameDispenser.newName(oldName);
-
-		m_oldToNewMap[oldName].emplace_back(std::make_pair(newName, arguments));
-
-		_f.functionName.name = newName;
-		_f.arguments = util::filter(
-			_f.arguments,
-			applyMap(arguments, [](auto& _a) { return !_a; })
-		);
-	}
-}
-
-FunctionDefinition FunctionSpecializer::specialize(
-	FunctionDefinition const& _f,
-	YulString _newName,
-	FunctionSpecializer::LiteralArguments _arguments
-)
-{
-	yulAssert(_arguments.size() == _f.parameters.size(), "");
-
-	std::map<YulString, YulString> translatedNames = applyMap(
-		NameCollector{_f, NameCollector::OnlyVariables}.names(),
-		[&](auto& _name) -> std::pair<YulString, YulString>
-		{
-			return std::make_pair(_name, m_nameDispenser.newName(_name));
-		},
-		std::map<YulString, YulString>{}
-	);
-
-	FunctionDefinition newFunction = std::get<FunctionDefinition>(FunctionCopier{translatedNames}(_f));
-
-	// Function parameters that will be specialized inside the body are converted into variable
-	// declarations.
-	std::vector<Statement> missingVariableDeclarations;
-	for (auto&& [index, argument]: _arguments | ranges::views::enumerate)
-		if (argument)
-			missingVariableDeclarations.emplace_back(
-				VariableDeclaration{
-					_f.debugData,
-					std::vector<TypedName>{newFunction.parameters[index]},
-					std::make_unique<Expression>(std::move(*argument))
-				}
-			);
-
-	newFunction.body.statements =
-		std::move(missingVariableDeclarations) + std::move(newFunction.body.statements);
-
-	// Only take those indices that cannot be specialized, i.e., whose value is `nullopt`.
-	newFunction.parameters =
-		util::filter(
-			newFunction.parameters,
-			applyMap(_arguments, [&](auto const& _v) { return !_v; })
-		);
-
-	newFunction.name = std::move(_newName);
-
-	return newFunction;
-}
-
-void FunctionSpecializer::run(OptimiserStepContext& _context, Block& _ast)
-{
-	FunctionSpecializer f{
-		CallGraphGenerator::callGraph(_ast).recursiveFunctions(),
-		_context.dispenser,
-		_context.dialect
-	};
-	f(_ast);
-
-	iterateReplacing(_ast.statements, [&](Statement& _s) -> std::optional<std::vector<Statement>>
-	{
-		if (std::holds_alternative<FunctionDefinition>(_s))
-		{
-			auto& functionDefinition = std::get<FunctionDefinition>(_s);
-
-			if (f.m_oldToNewMap.count(functionDefinition.name))
-			{
-				std::vector<Statement> out = applyMap(
-					f.m_oldToNewMap.at(functionDefinition.name),
-					[&](auto& _p) -> Statement
-					{
-						return f.specialize(functionDefinition, std::move(_p.first), std::move(_p.second));
-					}
-				);
-				return std::move(out) + make_vector<Statement>(std::move(functionDefinition));
-			}
-		}
-
-		return std::nullopt;
-	});
-}
diff --git a/libyul/optimiser/FunctionSpecializer.h b/libyul/optimiser/FunctionSpecializer.h
deleted file mode 100644
index b922ece8b09f..000000000000
--- a/libyul/optimiser/FunctionSpecializer.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-#include <libyul/ASTForward.h>
-#include <libyul/Dialect.h>
-
-#include <map>
-#include <optional>
-#include <vector>
-
-namespace solidity::yul
-{
-
-/**
- * FunctionSpecializer: Optimiser step that specializes the function with its literal arguments.
- *
- * If a function, say, `function f(a, b) { sstore (a, b)}`, is called with literal arguments, for
- * example, `f(x, 5)`, where `x` is an identifier, it could be specialized by creating a new
- * function `f_1` that takes only one argument, i.e.,
- *
- *   function f_1(a_1) {
- *     let b_1 := 5
- *     sstore(a_1, b_1)
- *   }
- *
- * Other optimization steps will be able to make more simplifications to the function. The
- * optimization step is mainly useful for functions that would not be inlined.
- *
- * Prerequisites: Disambiguator, FunctionHoister
- *
- * LiteralRematerialiser is recommended as a prerequisite, even though it's not required for
- * correctness.
- */
-class FunctionSpecializer: public ASTModifier
-{
-public:
-	/// A vector of function-call arguments. An element 'has value' if it's a literal, and the
-	/// corresponding Expression would be the literal.
-	using LiteralArguments = std::vector<std::optional<Expression>>;
-
-	static constexpr char const* name{"FunctionSpecializer"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(FunctionCall& _f) override;
-
-private:
-	explicit FunctionSpecializer(
-		std::set<YulString> _recursiveFunctions,
-		NameDispenser& _nameDispenser,
-		Dialect const& _dialect
-	):
-		m_recursiveFunctions(std::move(_recursiveFunctions)),
-		m_nameDispenser(_nameDispenser),
-		m_dialect(_dialect)
-	{}
-	/// Returns a vector of Expressions, where the index `i` is an expression if the function's
-	/// `i`-th argument can be specialized, nullopt otherwise.
-	LiteralArguments specializableArguments(FunctionCall const& _f);
-	/// Given a function definition `_f` and its arguments `_arguments`, of which, at least one is a
-	/// literal, this function returns a new function with the literal arguments specialized.
-	///
-	/// Note that the returned function definition will have new (and unique) names, for both the
-	/// function and variable declarations to retain the properties enforced by the Disambiguator.
-	///
-	/// For example, if `_f` is the function `function f(a, b, c) -> d { sstore(a, b) }`,
-	/// `_arguments` is the vector of literals `{1, 2, nullopt}` and the @param, `_newName` has
-	/// value `f_1`, the returned function could be:
-	///
-	///   function f_1(c_2) -> d_3 {
-	///     let a_4 := 1
-	///     let b_5 := 2
-	///     sstore(a_4, b_5)
-	///   }
-	///
-	FunctionDefinition specialize(
-		FunctionDefinition const& _f,
-		YulString _newName,
-		FunctionSpecializer::LiteralArguments _arguments
-	);
-
-	/// A mapping between the old function name and a pair of new function name and its arguments.
-	/// Note that at least one of the argument will have a literal value.
-	std::map<YulString, std::vector<std::pair<YulString, LiteralArguments>>> m_oldToNewMap;
-	/// We skip specializing recursive functions. Need backtracking to properly deal with them.
-	std::set<YulString> const m_recursiveFunctions;
-
-	NameDispenser& m_nameDispenser;
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
deleted file mode 100644
index 0bb4d368d841..000000000000
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that identifies functions to be inlined.
- */
-
-#include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
-
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void InlinableExpressionFunctionFinder::operator()(Identifier const& _identifier)
-{
-	checkAllowed(_identifier.name);
-	ASTWalker::operator()(_identifier);
-}
-
-void InlinableExpressionFunctionFinder::operator()(FunctionCall const& _funCall)
-{
-	checkAllowed(_funCall.functionName.name);
-	ASTWalker::operator()(_funCall);
-}
-
-void InlinableExpressionFunctionFinder::operator()(FunctionDefinition const& _function)
-{
-	if (_function.returnVariables.size() == 1 && _function.body.statements.size() == 1)
-	{
-		YulString retVariable = _function.returnVariables.front().name;
-		Statement const& bodyStatement = _function.body.statements.front();
-		if (std::holds_alternative<Assignment>(bodyStatement))
-		{
-			Assignment const& assignment = std::get<Assignment>(bodyStatement);
-			if (assignment.variableNames.size() == 1 && assignment.variableNames.front().name == retVariable)
-			{
-				// TODO: use code size metric here
-
-				// We cannot overwrite previous settings, because this function definition
-				// would not be valid here if we were searching inside a functionally inlinable
-				// function body.
-				assertThrow(m_disallowedIdentifiers.empty() && !m_foundDisallowedIdentifier, OptimizerException, "");
-				m_disallowedIdentifiers = std::set<YulString>{retVariable, _function.name};
-				std::visit(*this, *assignment.value);
-				if (!m_foundDisallowedIdentifier)
-					m_inlinableFunctions[_function.name] = &_function;
-				m_disallowedIdentifiers.clear();
-				m_foundDisallowedIdentifier = false;
-			}
-		}
-	}
-	ASTWalker::operator()(_function.body);
-}
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.h b/libyul/optimiser/InlinableExpressionFunctionFinder.h
deleted file mode 100644
index 587bdca91172..000000000000
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that identifies functions to be inlined.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <set>
-
-namespace solidity::yul
-{
-
-/**
- * Optimiser component that finds functions that can be
- * inlined inside functional expressions, i.e. functions that
- *  - have a single return parameter r
- *  - have a body like r := <functional expression>
- *  - neither reference themselves nor r in the right hand side
- *
- * This component can only be used on sources with unique names.
- */
-class InlinableExpressionFunctionFinder: public ASTWalker
-{
-public:
-
-	std::map<YulString, FunctionDefinition const*> const& inlinableFunctions() const
-	{
-		return m_inlinableFunctions;
-	}
-
-	using ASTWalker::operator();
-	void operator()(Identifier const& _identifier) override;
-	void operator()(FunctionCall const& _funCall) override;
-	void operator()(FunctionDefinition const& _function) override;
-
-private:
-	void checkAllowed(YulString _name)
-	{
-		if (m_disallowedIdentifiers.count(_name))
-			m_foundDisallowedIdentifier = true;
-	}
-
-	bool m_foundDisallowedIdentifier = false;
-	std::set<YulString> m_disallowedIdentifiers;
-	std::map<YulString, FunctionDefinition const*> m_inlinableFunctions;
-};
-
-}
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
deleted file mode 100644
index c280ecf14e1d..000000000000
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Class that can answer questions about values of variables and their relations.
- */
-
-#include <libyul/optimiser/KnowledgeBase.h>
-
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-KnowledgeBase::KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues):
-	m_valuesAreSSA(true),
-	m_variableValues([_ssaValues](YulString _var) { return util::valueOrNullptr(_ssaValues, _var); })
-{}
-
-bool KnowledgeBase::knownToBeDifferent(YulString _a, YulString _b)
-{
-	if (std::optional<u256> difference = differenceIfKnownConstant(_a, _b))
-		return difference != 0;
-	return false;
-}
-
-std::optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulString _b)
-{
-	VariableOffset offA = explore(_a);
-	VariableOffset offB = explore(_b);
-	if (offA.reference == offB.reference)
-		return offA.offset - offB.offset;
-	else
-		return std::nullopt;
-}
-
-
-bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulString _a, YulString _b)
-{
-	if (std::optional<u256> difference = differenceIfKnownConstant(_a, _b))
-		return difference >= 32 && difference <= u256(0) - 32;
-
-	return false;
-}
-
-bool KnowledgeBase::knownToBeZero(YulString _a)
-{
-	return valueIfKnownConstant(_a) == 0;
-}
-
-std::optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
-{
-	return explore(_a).absoluteValue();
-}
-
-std::optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression)
-{
-	if (Identifier const* ident = std::get_if<Identifier>(&_expression))
-		return valueIfKnownConstant(ident->name);
-	else if (Literal const* lit = std::get_if<Literal>(&_expression))
-		return valueOfLiteral(*lit);
-	else
-		return std::nullopt;
-}
-
-KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
-{
-	Expression const* value = nullptr;
-	if (m_valuesAreSSA)
-	{
-		// In SSA, a once determined offset is always valid, so we first see
-		// if we already computed it.
-		if (VariableOffset const* varOff = util::valueOrNullptr(m_offsets, _var))
-			return *varOff;
-		value = valueOf(_var);
-	}
-	else
-	{
-		// For non-SSA, we query the value first so that the variable is reset if it has changed
-		// since the last call.
-		value = valueOf(_var);
-		if (VariableOffset const* varOff = util::valueOrNullptr(m_offsets, _var))
-			return *varOff;
-	}
-
-	if (value)
-		if (std::optional<VariableOffset> offset = explore(*value))
-			return setOffset(_var, *offset);
-	return setOffset(_var, VariableOffset{_var, 0});
-
-}
-
-std::optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
-{
-	if (Literal const* literal = std::get_if<Literal>(&_value))
-		return VariableOffset{YulString{}, valueOfLiteral(*literal)};
-	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
-		return explore(identifier->name);
-	else if (FunctionCall const* f = std::get_if<FunctionCall>(&_value))
-	{
-		if (f->functionName.name == "add"_yulstring)
-		{
-			if (std::optional<VariableOffset> a = explore(f->arguments[0]))
-				if (std::optional<VariableOffset> b = explore(f->arguments[1]))
-				{
-					u256 offset = a->offset + b->offset;
-					if (a->isAbsolute())
-						// a is constant
-						return VariableOffset{b->reference, offset};
-					else if (b->isAbsolute())
-						// b is constant
-						return VariableOffset{a->reference, offset};
-				}
-		}
-		else if (f->functionName.name == "sub"_yulstring)
-			if (std::optional<VariableOffset> a = explore(f->arguments[0]))
-				if (std::optional<VariableOffset> b = explore(f->arguments[1]))
-				{
-					u256 offset = a->offset - b->offset;
-					if (a->reference == b->reference)
-						return VariableOffset{YulString{}, offset};
-					else if (b->isAbsolute())
-						// b is constant
-						return VariableOffset{a->reference, offset};
-				}
-	}
-
-	return std::nullopt;
-}
-
-Expression const* KnowledgeBase::valueOf(YulString _var)
-{
-	AssignedValue const* assignedValue = m_variableValues(_var);
-	Expression const* currentValue = assignedValue ? assignedValue->value : nullptr;
-	if (m_valuesAreSSA)
-		return currentValue;
-
-	Expression const* lastValue = m_lastKnownValue[_var];
-	if (lastValue != currentValue)
-		reset(_var);
-	m_lastKnownValue[_var] = currentValue;
-	return currentValue;
-}
-
-void KnowledgeBase::reset(YulString _var)
-{
-	yulAssert(!m_valuesAreSSA);
-
-	m_lastKnownValue.erase(_var);
-	if (VariableOffset const* offset = util::valueOrNullptr(m_offsets, _var))
-	{
-		// Remove var from its group
-		if (!offset->isAbsolute())
-			m_groupMembers[offset->reference].erase(_var);
-		m_offsets.erase(_var);
-	}
-	if (std::set<YulString>* group = util::valueOrNullptr(m_groupMembers, _var))
-	{
-		// _var was a representative, we might have to find a new one.
-		if (!group->empty())
-		{
-			YulString newRepresentative = *group->begin();
-			yulAssert(newRepresentative != _var);
-			u256 newOffset = m_offsets[newRepresentative].offset;
-			// newOffset = newRepresentative - _var
-			for (YulString groupMember: *group)
-			{
-				yulAssert(m_offsets[groupMember].reference == _var);
-				m_offsets[groupMember].reference = newRepresentative;
-				// groupMember = _var + m_offsets[groupMember].offset (old)
-				//             = newRepresentative - newOffset + m_offsets[groupMember].offset (old)
-				// so subtracting newOffset from .offset yields the original relation again,
-				// just with _var replaced by newRepresentative
-				m_offsets[groupMember].offset -= newOffset;
-			}
-			m_groupMembers[newRepresentative] = std::move(*group);
-
-		}
-		m_groupMembers.erase(_var);
-	}
-}
-
-KnowledgeBase::VariableOffset KnowledgeBase::setOffset(YulString _variable, VariableOffset _value)
-{
-	m_offsets[_variable] = _value;
-	// Constants are not tracked in m_groupMembers because
-	// the "representative" can never be reset.
-	if (!_value.reference.empty())
-		m_groupMembers[_value.reference].insert(_variable);
-	return _value;
-}
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
deleted file mode 100644
index 258f85f5cddf..000000000000
--- a/libyul/optimiser/KnowledgeBase.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Class that can answer questions about values of variables and their relations.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-
-#include <map>
-#include <functional>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-struct AssignedValue;
-
-/**
- * Class that can answer questions about values of variables and their relations.
- *
- * Requires a callback that returns the current value of the variable.
- * The value can change any time during the lifetime of the KnowledgeBase,
- * it will update its internal data structure accordingly.
- *
- * This means that the code the KnowledgeBase is used on does not need to be in SSA
- * form.
- * The only requirement is that the assigned values are movable expressions.
- *
- * There is a constructor to provide all SSA values right at the beginning.
- * If you use this, the KnowledgeBase will be slightly more efficient.
- *
- * Internally, tries to find groups of variables that have a mutual constant
- * difference and stores these differences always relative to a specific
- * representative variable of the group.
- *
- * There is a special group which is the constant values. Those use the
- * empty YulString as representative "variable".
- */
-class KnowledgeBase
-{
-public:
-	/// Constructor for arbitrary value callback that allows for variable values
-	/// to change in between calls to functions of this class.
-	KnowledgeBase(std::function<AssignedValue const*(YulString)> _variableValues):
-		m_variableValues(std::move(_variableValues))
-	{}
-	/// Constructor to use if source code is in SSA form and values are constant.
-	KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues);
-
-	bool knownToBeDifferent(YulString _a, YulString _b);
-	std::optional<u256> differenceIfKnownConstant(YulString _a, YulString _b);
-	bool knownToBeDifferentByAtLeast32(YulString _a, YulString _b);
-	bool knownToBeZero(YulString _a);
-	std::optional<u256> valueIfKnownConstant(YulString _a);
-	std::optional<u256> valueIfKnownConstant(Expression const& _expression);
-
-private:
-	/**
-	 * Constant offset relative to a reference variable, or absolute constant if the
-	 * reference variable is the empty YulString.
-	 */
-	struct VariableOffset
-	{
-		YulString reference;
-		u256 offset;
-
-		bool isAbsolute() const
-		{
-			return reference.empty();
-		}
-
-		std::optional<u256> absoluteValue() const
-		{
-			if (isAbsolute())
-				return offset;
-			else
-				return std::nullopt;
-		}
-	};
-
-	VariableOffset explore(YulString _var);
-	std::optional<VariableOffset> explore(Expression const& _value);
-
-	/// Retrieves the current value of a variable and potentially resets the variable if it is not up to date.
-	Expression const* valueOf(YulString _var);
-
-	/// Resets all information about the variable and removes it from its group,
-	/// potentially finding a new representative.
-	void reset(YulString _var);
-
-	VariableOffset setOffset(YulString _variable, VariableOffset _value);
-
-	/// If true, we can assume that variable values never change and skip some steps.
-	bool m_valuesAreSSA = false;
-	/// Callback to retrieve the current value of a variable.
-	std::function<AssignedValue const*(YulString)> m_variableValues;
-
-	/// Offsets for each variable to one representative per group.
-	/// The empty string is the representative of the constant value zero.
-	std::map<YulString, VariableOffset> m_offsets;
-	/// Last known value of each variable we queried.
-	std::map<YulString, Expression const*> m_lastKnownValue;
-	/// For each representative, variables that use it to offset from.
-	std::map<YulString, std::set<YulString>> m_groupMembers;
-};
-
-}
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
deleted file mode 100644
index 84094c33e096..000000000000
--- a/libyul/optimiser/LoadResolver.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that replaces expressions of type ``sload(x)`` by the value
- * currently stored in storage, if known.
- */
-
-#include <libyul/optimiser/LoadResolver.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/SideEffects.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-#include <libevmasm/GasMeter.h>
-#include <libsolutil/Keccak256.h>
-
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::evmasm;
-using namespace solidity::yul;
-
-void LoadResolver::run(OptimiserStepContext& _context, Block& _ast)
-{
-	bool containsMSize = MSizeFinder::containsMSize(_context.dialect, _ast);
-	LoadResolver{
-		_context.dialect,
-		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast)),
-		containsMSize,
-		_context.expectedExecutionsPerDeployment
-	}(_ast);
-}
-
-void LoadResolver::visit(Expression& _e)
-{
-	DataFlowAnalyzer::visit(_e);
-
-	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_e))
-	{
-		if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)])
-			tryResolve(_e, StoreLoadLocation::Memory, funCall->arguments);
-		else if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)])
-			tryResolve(_e, StoreLoadLocation::Storage, funCall->arguments);
-		else if (!m_containsMSize && funCall->functionName.name == m_dialect.hashFunction({}))
-		{
-			Identifier const* start = std::get_if<Identifier>(&funCall->arguments.at(0));
-			Identifier const* length = std::get_if<Identifier>(&funCall->arguments.at(1));
-			if (start && length)
-				if (auto const& value = keccakValue(start->name, length->name))
-					if (inScope(*value))
-					{
-						_e = Identifier{debugDataOf(_e), *value};
-						return;
-					}
-			tryEvaluateKeccak(_e, funCall->arguments);
-		}
-	}
-}
-
-void LoadResolver::tryResolve(
-	Expression& _e,
-	StoreLoadLocation _location,
-	std::vector<Expression> const& _arguments
-)
-{
-	if (_arguments.empty() || !std::holds_alternative<Identifier>(_arguments.at(0)))
-		return;
-
-	YulString key = std::get<Identifier>(_arguments.at(0)).name;
-	if (_location == StoreLoadLocation::Storage)
-	{
-		if (auto value = storageValue(key))
-			if (inScope(*value))
-				_e = Identifier{debugDataOf(_e), *value};
-	}
-	else if (!m_containsMSize && _location == StoreLoadLocation::Memory)
-		if (auto value = memoryValue(key))
-			if (inScope(*value))
-				_e = Identifier{debugDataOf(_e), *value};
-}
-
-void LoadResolver::tryEvaluateKeccak(
-	Expression& _e,
-	std::vector<Expression> const& _arguments
-)
-{
-	yulAssert(_arguments.size() == 2, "");
-	Identifier const* memoryKey = std::get_if<Identifier>(&_arguments.at(0));
-	Identifier const* length = std::get_if<Identifier>(&_arguments.at(1));
-
-	if (!memoryKey || !length)
-		return;
-
-	// The costs are only correct for hashes of 32 bytes or 1 word (when rounded up).
-	GasMeter gasMeter{
-		dynamic_cast<EVMDialect const&>(m_dialect),
-		!m_expectedExecutionsPerDeployment,
-		m_expectedExecutionsPerDeployment ? *m_expectedExecutionsPerDeployment : 1
-	};
-
-	bigint costOfKeccak = gasMeter.costs(_e);
-	bigint costOfLiteral = gasMeter.costs(
-		Literal{
-			{},
-			LiteralKind::Number,
-			// a dummy 256-bit number to represent the Keccak256 hash.
-			YulString{std::numeric_limits<u256>::max().str()},
-			{}
-		}
-	);
-
-	// We skip if there are no net gas savings.
-	// Note that for default `m_runs = 200`, the values are
-	// `costOfLiteral = 7200` and `costOfKeccak = 9000` for runtime context.
-	// For creation context: `costOfLiteral = 531` and `costOfKeccak = 90`.
-	if (costOfLiteral > costOfKeccak)
-		return;
-
-	std::optional<YulString> value = memoryValue(memoryKey->name);
-	if (value && inScope(*value))
-	{
-		std::optional<u256> memoryContent = valueOfIdentifier(*value);
-		std::optional<u256> byteLength = valueOfIdentifier(length->name);
-		if (memoryContent && byteLength && *byteLength <= 32)
-		{
-			bytes contentAsBytes = toBigEndian(*memoryContent);
-			contentAsBytes.resize(static_cast<size_t>(*byteLength));
-			_e = Literal{
-				debugDataOf(_e),
-				LiteralKind::Number,
-				YulString{u256(keccak256(contentAsBytes)).str()},
-				m_dialect.defaultType
-			};
-		}
-	}
-}
diff --git a/libyul/optimiser/LoadResolver.h b/libyul/optimiser/LoadResolver.h
deleted file mode 100644
index e56bc6c4a206..000000000000
--- a/libyul/optimiser/LoadResolver.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that replaces expressions of type ``sload(x)`` by the value
- * currently stored in storage, if known.
- */
-
-#pragma once
-
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Optimisation stage that replaces expressions of type ``sload(x)`` and ``mload(x)`` by the value
- * currently stored in storage resp. memory, if known.
- *
- * Also evaluates simple ``keccak256(a, c)`` when the value at memory location `a` is known and `c`
- * is a constant `<= 32`.
- *
- * Works best if the code is in SSA form.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class LoadResolver: public DataFlowAnalyzer
-{
-public:
-	static constexpr char const* name{"LoadResolver"};
-	/// Run the load resolver on the given complete AST.
-	static void run(OptimiserStepContext&, Block& _ast);
-
-private:
-	LoadResolver(
-		Dialect const& _dialect,
-		std::map<YulString, SideEffects> _functionSideEffects,
-		bool _containsMSize,
-		std::optional<size_t> _expectedExecutionsPerDeployment
-	):
-		DataFlowAnalyzer(_dialect, MemoryAndStorage::Analyze, std::move(_functionSideEffects)),
-		m_containsMSize(_containsMSize),
-		m_expectedExecutionsPerDeployment(std::move(_expectedExecutionsPerDeployment))
-	{}
-
-protected:
-	using ASTModifier::visit;
-	void visit(Expression& _e) override;
-
-	void tryResolve(
-		Expression& _e,
-		StoreLoadLocation _location,
-		std::vector<Expression> const& _arguments
-	);
-
-	/// Evaluates simple ``keccak256(a, c)`` when the value at memory location ``a`` is known and
-	/// `c` is a constant `<= 32`.
-	void tryEvaluateKeccak(
-		Expression& _e,
-		std::vector<Expression> const& _arguments
-	);
-
-	/// If the AST contains `msize`, then we skip resolving `mload` and `keccak256`.
-	bool m_containsMSize = false;
-	/// The --optimize-runs parameter. Value `nullopt` represents creation code.
-	std::optional<size_t> m_expectedExecutionsPerDeployment;
-};
-
-}
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.cpp b/libyul/optimiser/LoopInvariantCodeMotion.cpp
deleted file mode 100644
index da3c5e3e0a5a..000000000000
--- a/libyul/optimiser/LoopInvariantCodeMotion.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/LoopInvariantCodeMotion.h>
-
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/AST.h>
-#include <libsolutil/CommonData.h>
-
-#include <utility>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void LoopInvariantCodeMotion::run(OptimiserStepContext& _context, Block& _ast)
-{
-	std::map<YulString, SideEffects> functionSideEffects =
-		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast));
-	bool containsMSize = MSizeFinder::containsMSize(_context.dialect, _ast);
-	std::set<YulString> ssaVars = SSAValueTracker::ssaVariables(_ast);
-	LoopInvariantCodeMotion{_context.dialect, ssaVars, functionSideEffects, containsMSize}(_ast);
-}
-
-void LoopInvariantCodeMotion::operator()(Block& _block)
-{
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _s) -> std::optional<std::vector<Statement>>
-		{
-			visit(_s);
-			if (std::holds_alternative<ForLoop>(_s))
-				return rewriteLoop(std::get<ForLoop>(_s));
-			else
-				return {};
-		}
-	);
-}
-
-bool LoopInvariantCodeMotion::canBePromoted(
-	VariableDeclaration const& _varDecl,
-	std::set<YulString> const& _varsDefinedInCurrentScope,
-	SideEffects const& _forLoopSideEffects
-) const
-{
-	// A declaration can be promoted iff
-	// 1. Its LHS is a SSA variable
-	// 2. Its RHS only references SSA variables declared outside of the current scope
-	// 3. Its RHS is movable
-
-	for (auto const& var: _varDecl.variables)
-		if (!m_ssaVariables.count(var.name))
-			return false;
-	if (_varDecl.value)
-	{
-		for (auto const& ref: VariableReferencesCounter::countReferences(*_varDecl.value))
-			if (_varsDefinedInCurrentScope.count(ref.first) || !m_ssaVariables.count(ref.first))
-				return false;
-		SideEffectsCollector sideEffects{m_dialect, *_varDecl.value, &m_functionSideEffects};
-		if (!sideEffects.movableRelativeTo(_forLoopSideEffects, m_containsMSize))
-			return false;
-	}
-	return true;
-}
-
-std::optional<std::vector<Statement>> LoopInvariantCodeMotion::rewriteLoop(ForLoop& _for)
-{
-	assertThrow(_for.pre.statements.empty(), OptimizerException, "");
-
-	auto forLoopSideEffects =
-		SideEffectsCollector{m_dialect, _for, &m_functionSideEffects}.sideEffects();
-
-	std::vector<Statement> replacement;
-	for (Block* block: {&_for.post, &_for.body})
-	{
-		std::set<YulString> varsDefinedInScope;
-		util::iterateReplacing(
-			block->statements,
-			[&](Statement& _s) -> std::optional<std::vector<Statement>>
-			{
-				if (std::holds_alternative<VariableDeclaration>(_s))
-				{
-					VariableDeclaration const& varDecl = std::get<VariableDeclaration>(_s);
-					if (canBePromoted(varDecl, varsDefinedInScope, forLoopSideEffects))
-					{
-						replacement.emplace_back(std::move(_s));
-						// Do not add the variables declared here to varsDefinedInScope because we are moving them.
-						return std::vector<Statement>{};
-					}
-					for (auto const& var: varDecl.variables)
-						varsDefinedInScope.insert(var.name);
-				}
-				return {};
-			}
-		);
-	}
-	if (replacement.empty())
-		return {};
-	else
-	{
-		replacement.emplace_back(std::move(_for));
-		return { std::move(replacement) };
-	}
-}
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.h b/libyul/optimiser/LoopInvariantCodeMotion.h
deleted file mode 100644
index 1b264792470c..000000000000
--- a/libyul/optimiser/LoopInvariantCodeMotion.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Loop-invariant code motion.
- *
- * This optimization moves movable SSA variable declarations outside the loop.
- *
- * Only statements at the top level in a loop's body or post block are considered, i.e variable
- * declarations inside conditional branches will not be moved out of the loop.
- *
- * Requirements:
- * - The Disambiguator, ForLoopInitRewriter and FunctionHoister must be run upfront.
- * - Expression splitter and SSA transform should be run upfront to obtain better result.
- */
-
-class LoopInvariantCodeMotion: public ASTModifier
-{
-public:
-	static constexpr char const* name{"LoopInvariantCodeMotion"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	void operator()(Block& _block) override;
-
-private:
-	explicit LoopInvariantCodeMotion(
-		Dialect const& _dialect,
-		std::set<YulString> const& _ssaVariables,
-		std::map<YulString, SideEffects> const& _functionSideEffects,
-		bool _containsMSize
-	):
-		m_containsMSize(_containsMSize),
-		m_dialect(_dialect),
-		m_ssaVariables(_ssaVariables),
-		m_functionSideEffects(_functionSideEffects)
-	{ }
-
-	/// @returns true if the given variable declaration can be moved to in front of the loop.
-	bool canBePromoted(
-		VariableDeclaration const& _varDecl,
-		std::set<YulString> const& _varsDefinedInCurrentScope,
-		SideEffects const& _forLoopSideEffects
-	) const;
-	std::optional<std::vector<Statement>> rewriteLoop(ForLoop& _for);
-
-	bool m_containsMSize = true;
-	Dialect const& m_dialect;
-	std::set<YulString> const& m_ssaVariables;
-	std::map<YulString, SideEffects> const& m_functionSideEffects;
-};
-
-}
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
deleted file mode 100644
index 42845f3b6627..000000000000
--- a/libyul/optimiser/Metrics.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
-* Module providing metrics for the optimizer.
-*/
-
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Utilities.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-size_t CodeWeights::costOf(Statement const& _statement) const
-{
-	if (std::holds_alternative<ExpressionStatement>(_statement))
-		return expressionStatementCost;
-	else if (std::holds_alternative<Assignment>(_statement))
-		return assignmentCost;
-	else if (std::holds_alternative<VariableDeclaration>(_statement))
-		return variableDeclarationCost;
-	else if (std::holds_alternative<FunctionDefinition>(_statement))
-		return functionDefinitionCost;
-	else if (std::holds_alternative<If>(_statement))
-		return ifCost;
-	else if (std::holds_alternative<Switch>(_statement))
-		return switchCost + caseCost * std::get<Switch>(_statement).cases.size();
-	else if (std::holds_alternative<ForLoop>(_statement))
-		return forLoopCost;
-	else if (std::holds_alternative<Break>(_statement))
-		return breakCost;
-	else if (std::holds_alternative<Continue>(_statement))
-		return continueCost;
-	else if (std::holds_alternative<Leave>(_statement))
-		return leaveCost;
-	else if (std::holds_alternative<Block>(_statement))
-		return blockCost;
-	else
-		yulAssert(false, "If you add a new statement type, you must update CodeWeights.");
-}
-
-size_t CodeWeights::costOf(Expression const& _expression) const
-{
-	if (std::holds_alternative<FunctionCall>(_expression))
-		return functionCallCost;
-	else if (std::holds_alternative<Identifier>(_expression))
-		return identifierCost;
-	else if (Literal const* literal = std::get_if<Literal>(&_expression))
-	{
-		// Avoid strings because they could be longer than 32 bytes.
-		if (literal->kind != LiteralKind::String && valueOfLiteral(*literal) == 0)
-			return literalZeroCost;
-		else
-			return literalCost;
-	}
-	else
-		yulAssert(false, "If you add a new expression type, you must update CodeWeights.");
-}
-
-
-size_t CodeSize::codeSize(Statement const& _statement, CodeWeights const& _weights)
-{
-	CodeSize cs(true, _weights);
-	cs.visit(_statement);
-	return cs.m_size;
-}
-
-size_t CodeSize::codeSize(Expression const& _expression, CodeWeights const& _weights)
-{
-	CodeSize cs(true, _weights);
-	cs.visit(_expression);
-	return cs.m_size;
-}
-
-size_t CodeSize::codeSize(Block const& _block, CodeWeights const& _weights)
-{
-	CodeSize cs(true, _weights);
-	cs(_block);
-	return cs.m_size;
-}
-
-size_t CodeSize::codeSizeIncludingFunctions(Block const& _block, CodeWeights const& _weights)
-{
-	CodeSize cs(false, _weights);
-	cs(_block);
-	return cs.m_size;
-}
-
-void CodeSize::visit(Statement const& _statement)
-{
-	if (std::holds_alternative<FunctionDefinition>(_statement) && m_ignoreFunctions)
-		return;
-
-	m_size += m_weights.costOf(_statement);
-	ASTWalker::visit(_statement);
-}
-
-void CodeSize::visit(Expression const& _expression)
-{
-	m_size += m_weights.costOf(_expression);
-	ASTWalker::visit(_expression);
-}
-
-
-size_t CodeCost::codeCost(Dialect const& _dialect, Expression const& _expr)
-{
-	CodeCost cc(_dialect);
-	cc.visit(_expr);
-	return cc.m_cost;
-}
-
-
-void CodeCost::operator()(FunctionCall const& _funCall)
-{
-	ASTWalker::operator()(_funCall);
-
-	if (auto instruction = toEVMInstruction(m_dialect, _funCall.functionName.name))
-	{
-		addInstructionCost(*instruction);
-		return;
-	}
-
-	m_cost += 49;
-}
-
-void CodeCost::operator()(Literal const& _literal)
-{
-	yulAssert(m_cost >= 1, "Should assign cost one in visit(Expression).");
-	size_t cost = 0;
-	switch (_literal.kind)
-	{
-	case LiteralKind::Boolean:
-		break;
-	case LiteralKind::Number:
-		for (u256 n = u256(_literal.value.str()); n >= 0x100; n >>= 8)
-			cost++;
-		if (valueOfLiteral(_literal) == 0)
-			if (auto evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect))
-				if (evmDialect->evmVersion().hasPush0())
-					--m_cost;
-		break;
-	case LiteralKind::String:
-		cost = _literal.value.str().size();
-		break;
-	}
-
-	m_cost += cost;
-}
-
-void CodeCost::visit(Statement const& _statement)
-{
-	++m_cost;
-	ASTWalker::visit(_statement);
-}
-
-void CodeCost::visit(Expression const& _expression)
-{
-	++m_cost;
-	ASTWalker::visit(_expression);
-}
-
-void CodeCost::addInstructionCost(evmasm::Instruction _instruction)
-{
-	evmasm::Tier gasPriceTier = evmasm::instructionInfo(_instruction, evmVersionFromDialect(m_dialect)).gasPriceTier;
-	if (gasPriceTier < evmasm::Tier::VeryLow)
-		m_cost -= 1;
-	else if (gasPriceTier < evmasm::Tier::High)
-		m_cost += 1;
-	else
-		m_cost += 49;
-}
-
-void AssignmentCounter::operator()(Assignment const& _assignment)
-{
-	for (auto const& variable: _assignment.variableNames)
-		++m_assignmentCounters[variable.name];
-}
-
-size_t AssignmentCounter::assignmentCount(YulString _name) const
-{
-	auto it = m_assignmentCounters.find(_name);
-	return (it == m_assignmentCounters.end()) ? 0 : it->second;
-}
diff --git a/libyul/optimiser/Metrics.h b/libyul/optimiser/Metrics.h
deleted file mode 100644
index f86e3b28dfad..000000000000
--- a/libyul/optimiser/Metrics.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Module providing metrics for the optimizer.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <liblangutil/EVMVersion.h>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-struct EVMDialect;
-
-/**
- * Weights to be assigned to specific yul statements and expressions by a metric.
- *
- * The default values are meant to reflect specifically the number of AST nodes.
- *
- * The following AST elements have a default cost of zero (because the cleanup phase would
- * remove them anyway or they are just wrappers around something else that will be counted instead):
- *  - expression statement (only the expression inside has a cost)
- *  - block (only the statements inside have a cost)
- *  - variable references
- *  - variable declarations (only the right hand side has a cost)
- *  - assignments (only the value has a cost)
- *  - literal zeros (we optimistically assume they can be copied from somewhere else)
- *
- * Each statement incurs and additional cost of one
- * per jump/branch. This means if, break and continue statements have a cost of 2,
- * switch statements have a cost of 1 plus the number of cases times two,
- * and for loops cost 3.
-*/
-struct CodeWeights
-{
-	// Statements
-	size_t expressionStatementCost = 0;
-	size_t assignmentCost = 0;
-	size_t variableDeclarationCost = 0;
-	size_t functionDefinitionCost = 1;
-	size_t ifCost = 2;
-	size_t switchCost = 1;
-	size_t caseCost = 2;
-	size_t forLoopCost = 3;
-	size_t breakCost = 2;
-	size_t continueCost = 2;
-	size_t leaveCost = 2;
-	size_t blockCost = 0;
-
-	// Expressions
-	size_t functionCallCost = 1;
-	size_t identifierCost = 0;
-	size_t literalCost = 1;
-	size_t literalZeroCost = 0;
-
-	size_t costOf(Statement const& _statement) const;
-	size_t costOf(Expression const& _expression) const;
-};
-
-/**
- * Metric for the size of code.
- * Ignores function definitions while traversing the AST by default.
- * If you want to know the size of a function, you have to invoke this on its body.
- *
- * The cost of each statement and expression type is configurable via CodeWeights.
- */
-class CodeSize: public ASTWalker
-{
-public:
-	static size_t codeSize(Statement const& _statement, CodeWeights const& _weights = {});
-	static size_t codeSize(Expression const& _expression, CodeWeights const& _weights = {});
-	static size_t codeSize(Block const& _block, CodeWeights const& _weights = {});
-	static size_t codeSizeIncludingFunctions(Block const& _block, CodeWeights const& _weights = {});
-
-private:
-	CodeSize(bool _ignoreFunctions = true, CodeWeights const& _weights = {}):
-		m_ignoreFunctions(_ignoreFunctions),
-		m_weights(_weights) {}
-
-	void visit(Statement const& _statement) override;
-	void visit(Expression const& _expression) override;
-
-private:
-	bool m_ignoreFunctions;
-	size_t m_size = 0;
-	CodeWeights m_weights;
-};
-
-/**
- * Very rough cost that takes the size and execution cost of code into account.
- * The cost per AST element is one, except for literals where it is the byte size.
- * Function calls cost 50. Instructions cost 0 for 3 or less gas (same as DUP),
- * 2 for up to 10 and 50 otherwise.
- */
-class CodeCost: public ASTWalker
-{
-public:
-	static size_t codeCost(Dialect const& _dialect, Expression const& _expression);
-
-private:
-	CodeCost(Dialect const& _dialect): m_dialect(_dialect) {}
-
-	void operator()(FunctionCall const& _funCall) override;
-	void operator()(Literal const& _literal) override;
-	void visit(Statement const& _statement) override;
-	void visit(Expression const& _expression) override;
-
-private:
-	void addInstructionCost(evmasm::Instruction _instruction);
-
-	Dialect const& m_dialect;
-	size_t m_cost = 0;
-};
-
-/**
- * Counts the number of assignments to every variable.
- * Only works after running the Disambiguator.
- */
-class AssignmentCounter: public ASTWalker
-{
-public:
-	using ASTWalker::operator();
-	void operator()(Assignment const& _assignment) override;
-	std::size_t assignmentCount(YulString _name) const;
-private:
-	std::map<YulString, size_t> m_assignmentCounters;
-};
-
-}
diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
deleted file mode 100644
index 7fb0c7ed28e9..000000000000
--- a/libyul/optimiser/NameCollector.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST walker that collects all defined names.
- */
-
-#include <libyul/optimiser/NameCollector.h>
-
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void NameCollector::operator()(VariableDeclaration const& _varDecl)
-{
-	if (m_collectWhat != OnlyFunctions)
-		for (auto const& var: _varDecl.variables)
-			m_names.emplace(var.name);
-}
-
-void NameCollector::operator()(FunctionDefinition const& _funDef)
-{
-	if (m_collectWhat != OnlyVariables)
-		m_names.emplace(_funDef.name);
-	if (m_collectWhat != OnlyFunctions)
-	{
-		for (auto const& arg: _funDef.parameters)
-			m_names.emplace(arg.name);
-		for (auto const& ret: _funDef.returnVariables)
-			m_names.emplace(ret.name);
-	}
-	ASTWalker::operator ()(_funDef);
-}
-
-void ReferencesCounter::operator()(Identifier const& _identifier)
-{
-	++m_references[_identifier.name];
-}
-
-void ReferencesCounter::operator()(FunctionCall const& _funCall)
-{
-	++m_references[_funCall.functionName.name];
-	ASTWalker::operator()(_funCall);
-}
-
-std::map<YulString, size_t> ReferencesCounter::countReferences(Block const& _block)
-{
-	ReferencesCounter counter;
-	counter(_block);
-	return std::move(counter.m_references);
-}
-
-std::map<YulString, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function)
-{
-	ReferencesCounter counter;
-	counter(_function);
-	return std::move(counter.m_references);
-}
-
-std::map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _expression)
-{
-	ReferencesCounter counter;
-	counter.visit(_expression);
-	return std::move(counter.m_references);
-}
-
-void VariableReferencesCounter::operator()(Identifier const& _identifier)
-{
-	++m_references[_identifier.name];
-}
-
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(Block const& _block)
-{
-	VariableReferencesCounter counter;
-	counter(_block);
-	return std::move(counter.m_references);
-}
-
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(FunctionDefinition const& _function)
-{
-	VariableReferencesCounter counter;
-	counter(_function);
-	return std::move(counter.m_references);
-}
-
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(Expression const& _expression)
-{
-	VariableReferencesCounter counter;
-	counter.visit(_expression);
-	return std::move(counter.m_references);
-}
-
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(Statement const& _statement)
-{
-	VariableReferencesCounter counter;
-	counter.visit(_statement);
-	return std::move(counter.m_references);
-}
-
-void AssignmentsSinceContinue::operator()(ForLoop const& _forLoop)
-{
-	m_forLoopDepth++;
-	ASTWalker::operator()(_forLoop);
-	m_forLoopDepth--;
-}
-
-void AssignmentsSinceContinue::operator()(Continue const&)
-{
-	if (m_forLoopDepth == 0)
-		m_continueFound = true;
-}
-
-void AssignmentsSinceContinue::operator()(Assignment const& _assignment)
-{
-	if (m_continueFound)
-		for (auto const& var: _assignment.variableNames)
-			m_names.emplace(var.name);
-}
-
-void AssignmentsSinceContinue::operator()(FunctionDefinition const&)
-{
-	yulAssert(false, "");
-}
-
-std::set<YulString> solidity::yul::assignedVariableNames(Block const& _code)
-{
-	std::set<YulString> names;
-	forEach<Assignment const>(_code, [&](Assignment const& _assignment) {
-		for (auto const& var: _assignment.variableNames)
-			names.emplace(var.name);
-	});
-	return names;
-}
-
-std::map<YulString, FunctionDefinition const*> solidity::yul::allFunctionDefinitions(Block const& _block)
-{
-	std::map<YulString, FunctionDefinition const*> result;
-	forEach<FunctionDefinition const>(_block, [&](FunctionDefinition const& _function) {
-		result[_function.name] = &_function;
-	});
-	return result;
-}
diff --git a/libyul/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
deleted file mode 100644
index ad18e1e26bb3..000000000000
--- a/libyul/optimiser/NameCollector.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST walkers that collect facts about identifiers and definitions.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <map>
-#include <set>
-
-namespace solidity::yul
-{
-
-/**
- * Specific AST walker that collects all defined names.
- */
-class NameCollector: public ASTWalker
-{
-public:
-	enum CollectWhat { VariablesAndFunctions, OnlyVariables, OnlyFunctions };
-
-	explicit NameCollector(
-		Block const& _block,
-		CollectWhat _collectWhat = VariablesAndFunctions
-	):
-		m_collectWhat(_collectWhat)
-	{
-		(*this)(_block);
-	}
-
-	explicit NameCollector(
-		FunctionDefinition const& _functionDefinition,
-		CollectWhat _collectWhat = VariablesAndFunctions
-	):
-		m_collectWhat(_collectWhat)
-	{
-		(*this)(_functionDefinition);
-	}
-
-	using ASTWalker::operator ();
-	void operator()(VariableDeclaration const& _varDecl) override;
-	void operator()(FunctionDefinition const& _funDef) override;
-
-	std::set<YulString> names() const { return m_names; }
-private:
-	std::set<YulString> m_names;
-	CollectWhat m_collectWhat = VariablesAndFunctions;
-};
-
-/**
- * Specific AST walker that counts all references to all declarations.
- */
-class ReferencesCounter: public ASTWalker
-{
-public:
-	using ASTWalker::operator ();
-	void operator()(Identifier const& _identifier) override;
-	void operator()(FunctionCall const& _funCall) override;
-
-	static std::map<YulString, size_t> countReferences(Block const& _block);
-	static std::map<YulString, size_t> countReferences(FunctionDefinition const& _function);
-	static std::map<YulString, size_t> countReferences(Expression const& _expression);
-
-private:
-	std::map<YulString, size_t> m_references;
-};
-
-/**
- * Specific AST walker that counts all references to all variable declarations.
- */
-class VariableReferencesCounter: public ASTWalker
-{
-public:
-	using ASTWalker::operator ();
-	void operator()(Identifier const& _identifier) override;
-
-	static std::map<YulString, size_t> countReferences(Block const& _block);
-	static std::map<YulString, size_t> countReferences(FunctionDefinition const& _function);
-	static std::map<YulString, size_t> countReferences(Expression const& _expression);
-	static std::map<YulString, size_t> countReferences(Statement const& _statement);
-
-private:
-	std::map<YulString, size_t> m_references;
-};
-
-/**
- * Collects all names from a given continue statement on onwards.
- *
- * It makes only sense to be invoked from within a body of an outer for loop, that is,
- * it will only collect all names from the beginning of the first continue statement
- * of the outer-most ForLoop.
- */
-class AssignmentsSinceContinue: public ASTWalker
-{
-public:
-	using ASTWalker::operator();
-	void operator()(ForLoop const& _forLoop) override;
-	void operator()(Continue const&) override;
-	void operator()(Assignment const& _assignment) override;
-	void operator()(FunctionDefinition const& _funDef) override;
-
-	std::set<YulString> const& names() const { return m_names; }
-	bool empty() const noexcept { return m_names.empty(); }
-
-private:
-	size_t m_forLoopDepth = 0;
-	bool m_continueFound = false;
-	std::set<YulString> m_names;
-};
-
-/// @returns the names of all variables that are assigned to inside @a _code.
-/// (ignores variable declarations)
-std::set<YulString> assignedVariableNames(Block const& _code);
-
-/// @returns all function definitions anywhere in the AST.
-/// Requires disambiguated source.
-std::map<YulString, FunctionDefinition const*> allFunctionDefinitions(Block const& _block);
-
-}
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
deleted file mode 100644
index 3a8db5ee449e..000000000000
--- a/libyul/optimiser/NameDispenser.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that can create new unique names.
- */
-
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/YulString.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-NameDispenser::NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulString> _reservedNames):
-	NameDispenser(_dialect, NameCollector(_ast).names() + _reservedNames)
-{
-	m_reservedNames = std::move(_reservedNames);
-}
-
-NameDispenser::NameDispenser(Dialect const& _dialect, std::set<YulString> _usedNames):
-	m_dialect(_dialect),
-	m_usedNames(std::move(_usedNames))
-{
-}
-
-YulString NameDispenser::newName(YulString _nameHint)
-{
-	YulString name = _nameHint;
-	while (illegalName(name))
-	{
-		m_counter++;
-		name = YulString(_nameHint.str() + "_" + std::to_string(m_counter));
-	}
-	m_usedNames.emplace(name);
-	return name;
-}
-
-bool NameDispenser::illegalName(YulString _name)
-{
-	return isRestrictedIdentifier(m_dialect, _name) || m_usedNames.count(_name);
-}
-
-void NameDispenser::reset(Block const& _ast)
-{
-	m_usedNames = NameCollector(_ast).names() + m_reservedNames;
-	m_counter = 0;
-}
diff --git a/libyul/optimiser/NameDispenser.h b/libyul/optimiser/NameDispenser.h
deleted file mode 100644
index 6e655e416b51..000000000000
--- a/libyul/optimiser/NameDispenser.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that can create new unique names.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libyul/YulString.h>
-
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Optimizer component that can be used to generate new names that
- * do not conflict with existing names.
- *
- * Tries to keep names short and appends decimals to disambiguate.
- */
-class NameDispenser
-{
-public:
-	/// Initialize the name dispenser with all the names used in the given AST.
-	explicit NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulString> _reservedNames = {});
-	/// Initialize the name dispenser with the given used names.
-	explicit NameDispenser(Dialect const& _dialect, std::set<YulString> _usedNames);
-
-	/// @returns a currently unused name that should be similar to _nameHint.
-	YulString newName(YulString _nameHint);
-
-	/// Mark @a _name as used, i.e. the dispenser's newName function will not
-	/// return it.
-	void markUsed(YulString _name) { m_usedNames.insert(_name); }
-
-	std::set<YulString> const& usedNames() { return m_usedNames; }
-
-	/// Returns true if `_name` is either used or is a restricted identifier.
-	bool illegalName(YulString _name);
-
-	/// Resets `m_usedNames` with *only* the names that are used in the AST. Also resets value of
-	/// `m_counter` to zero.
-	void reset(Block const& _ast);
-
-private:
-	Dialect const& m_dialect;
-	std::set<YulString> m_usedNames;
-	std::set<YulString> m_reservedNames;
-	size_t m_counter = 0;
-};
-
-}
diff --git a/libyul/optimiser/NameDisplacer.cpp b/libyul/optimiser/NameDisplacer.cpp
deleted file mode 100644
index 4d0d217d8619..000000000000
--- a/libyul/optimiser/NameDisplacer.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that renames identifiers to free up certain names.
- */
-
-#include <libyul/optimiser/NameDisplacer.h>
-
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void NameDisplacer::operator()(Identifier& _identifier)
-{
-	checkAndReplace(_identifier.name);
-}
-
-void NameDisplacer::operator()(VariableDeclaration& _varDecl)
-{
-	for (TypedName& var: _varDecl.variables)
-		checkAndReplaceNew(var.name);
-
-	ASTModifier::operator()(_varDecl);
-}
-
-void NameDisplacer::operator()(FunctionDefinition& _function)
-{
-	// Should have been done in the block already.
-	yulAssert(!m_namesToFree.count(_function.name), "");
-
-	for (auto& param: _function.parameters)
-		checkAndReplaceNew(param.name);
-	for (auto& retVar: _function.returnVariables)
-		checkAndReplaceNew(retVar.name);
-
-	ASTModifier::operator()(_function);
-}
-
-void NameDisplacer::operator()(FunctionCall& _funCall)
-{
-	checkAndReplace(_funCall.functionName.name);
-	ASTModifier::operator()(_funCall);
-}
-
-void NameDisplacer::operator()(Block& _block)
-{
-	// First replace all the names of function definitions
-	// because of scoping.
-	for (auto& st: _block.statements)
-		if (std::holds_alternative<FunctionDefinition>(st))
-			checkAndReplaceNew(std::get<FunctionDefinition>(st).name);
-
-	ASTModifier::operator()(_block);
-}
-
-void NameDisplacer::checkAndReplaceNew(YulString& _name)
-{
-	yulAssert(!m_translations.count(_name), "");
-	if (m_namesToFree.count(_name))
-		_name = (m_translations[_name] = m_nameDispenser.newName(_name));
-}
-
-void NameDisplacer::checkAndReplace(YulString& _name) const
-{
-	if (m_translations.count(_name))
-		_name = m_translations.at(_name);
-}
-
diff --git a/libyul/optimiser/NameDisplacer.h b/libyul/optimiser/NameDisplacer.h
deleted file mode 100644
index 336dd04e42de..000000000000
--- a/libyul/optimiser/NameDisplacer.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that renames identifiers to free up certain names.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <set>
-#include <map>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Optimiser component that renames identifiers to free up certain names.
- *
- * Only replaces names that have been defined inside the code. If the code uses
- * names to be freed but does not define them, they remain unchanged.
- *
- * Prerequisites: Disambiguator
- */
-class NameDisplacer: public ASTModifier
-{
-public:
-	explicit NameDisplacer(
-		NameDispenser& _dispenser,
-		std::set<YulString> const& _namesToFree
-	):
-		m_nameDispenser(_dispenser),
-		m_namesToFree(_namesToFree)
-	{
-		for (YulString n: _namesToFree)
-			m_nameDispenser.markUsed(n);
-	}
-
-	using ASTModifier::operator();
-	void operator()(Identifier& _identifier) override;
-	void operator()(VariableDeclaration& _varDecl) override;
-	void operator()(FunctionDefinition& _function) override;
-	void operator()(FunctionCall& _funCall) override;
-	void operator()(Block& _block) override;
-
-	std::map<YulString, YulString> const& translations() const { return m_translations; }
-
-protected:
-	/// Check if the newly introduced identifier @a _name has to be replaced.
-	void checkAndReplaceNew(YulString& _name);
-	/// Replace the identifier @a _name if it is in the translation map.
-	void checkAndReplace(YulString& _name) const;
-
-	NameDispenser& m_nameDispenser;
-	std::set<YulString> const& m_namesToFree;
-	std::map<YulString, YulString> m_translations;
-};
-
-}
diff --git a/libyul/optimiser/NameSimplifier.cpp b/libyul/optimiser/NameSimplifier.cpp
deleted file mode 100644
index f7d732547773..000000000000
--- a/libyul/optimiser/NameSimplifier.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <libyul/optimiser/NameSimplifier.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/YulString.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <regex>
-
-using namespace solidity::yul;
-
-NameSimplifier::NameSimplifier(OptimiserStepContext& _context, Block const& _ast):
-	m_context(_context)
-{
-	for (YulString name: _context.reservedIdentifiers)
-		m_translations[name] = name;
-
-	for (YulString const& name: NameCollector(_ast).names())
-		findSimplification(name);
-}
-
-void NameSimplifier::operator()(FunctionDefinition& _funDef)
-{
-	translate(_funDef.name);
-	renameVariables(_funDef.parameters);
-	renameVariables(_funDef.returnVariables);
-	ASTModifier::operator()(_funDef);
-}
-
-void NameSimplifier::operator()(VariableDeclaration& _varDecl)
-{
-	renameVariables(_varDecl.variables);
-	ASTModifier::operator()(_varDecl);
-}
-
-void NameSimplifier::renameVariables(std::vector<TypedName>& _variables)
-{
-	for (TypedName& typedName: _variables)
-		translate(typedName.name);
-}
-
-void NameSimplifier::operator()(Identifier& _identifier)
-{
-	translate(_identifier.name);
-}
-
-void NameSimplifier::operator()(FunctionCall& _funCall)
-{
-	// The visitor on its own does not visit the function name.
-	if (!m_context.dialect.builtin(_funCall.functionName.name))
-		(*this)(_funCall.functionName);
-	ASTModifier::operator()(_funCall);
-}
-
-void NameSimplifier::findSimplification(YulString const& _name)
-{
-	if (m_translations.count(_name))
-		return;
-
-	std::string name = _name.str();
-
-	static auto replacements = std::vector<std::pair<std::regex, std::string>>{
-		{std::regex("_\\$|\\$_"), "_"}, // remove type mangling delimiters
-		{std::regex("_[0-9]+([^0-9a-fA-Fx])"), "$1"}, // removes AST IDs that are not hex.
-		{std::regex("_[0-9]+$"), ""}, // removes AST IDs that are not hex.
-		{std::regex("_t_"), "_"}, // remove type prefixes
-		{std::regex("__"), "_"},
-		{std::regex("(abi_..code.*)_to_.*"), "$1"}, // removes _to... for abi functions
-		{std::regex("(stringliteral_?[0-9a-f][0-9a-f][0-9a-f][0-9a-f])[0-9a-f]*"), "$1"}, // shorten string literal
-		{std::regex("tuple_"), ""},
-		{std::regex("_memory_ptr"), ""},
-		{std::regex("_calldata_ptr"), "_calldata"},
-		{std::regex("_fromStack"), ""},
-		{std::regex("_storage_storage"), "_storage"},
-		{std::regex("(storage.*)_?storage"), "$1"},
-		{std::regex("_memory_memory"), "_memory"},
-		{std::regex("_contract\\$_([^_]*)_?"), "$1_"},
-		{std::regex("index_access_(t_)?array"), "index_access"},
-		{std::regex("[0-9]*_$"), ""}
-	};
-
-	for (auto const& [pattern, substitute]: replacements)
-	{
-		std::string candidate = regex_replace(name, pattern, substitute);
-		if (!candidate.empty() && !m_context.dispenser.illegalName(YulString(candidate)))
-			name = candidate;
-	}
-
-	if (name != _name.str())
-	{
-		YulString newName{name};
-		m_context.dispenser.markUsed(newName);
-		m_translations[_name] = std::move(newName);
-	}
-}
-
-void NameSimplifier::translate(YulString& _name)
-{
-	auto it = m_translations.find(_name);
-	if (it != m_translations.end())
-		_name = it->second;
-}
diff --git a/libyul/optimiser/NameSimplifier.h b/libyul/optimiser/NameSimplifier.h
deleted file mode 100644
index 34cf6945115b..000000000000
--- a/libyul/optimiser/NameSimplifier.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-#include <map>
-#include <set>
-#include <string>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-
-/**
- * Pass to "simplify" all identifier names.
- *
- * The purpose of this is to make generated code more readable, but also
- * to remove AST identifiers that could lead to a different sorting order
- * and thus influence e.g. the order of function inlining.
- *
- * Prerequisites: Disambiguator, FunctionHoister, FunctionGrouper
- */
-class NameSimplifier: public ASTModifier
-{
-public:
-	static constexpr char const* name{"NameSimplifier"};
-	static void run(OptimiserStepContext& _context, Block& _ast)
-	{
-		NameSimplifier{_context, _ast}(_ast);
-	}
-
-	using ASTModifier::operator();
-	void operator()(VariableDeclaration& _varDecl) override;
-	void operator()(Identifier& _identifier) override;
-	void operator()(FunctionCall& _funCall) override;
-	void operator()(FunctionDefinition& _funDef) override;
-
-private:
-	NameSimplifier(OptimiserStepContext& _context, Block const& _ast);
-
-	/// Tries to rename a list of variables.
-	void renameVariables(std::vector<TypedName>& _variables);
-
-	void findSimplification(YulString const& _name);
-	void translate(YulString& _name);
-
-	OptimiserStepContext& m_context;
-	std::map<YulString, YulString> m_translations;
-};
-
-}
diff --git a/libyul/optimiser/OptimiserStep.h b/libyul/optimiser/OptimiserStep.h
deleted file mode 100644
index e3e5fe4c605d..000000000000
--- a/libyul/optimiser/OptimiserStep.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/Exceptions.h>
-
-#include <optional>
-#include <string>
-#include <set>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-struct Block;
-class YulString;
-class NameDispenser;
-
-struct OptimiserStepContext
-{
-	Dialect const& dialect;
-	NameDispenser& dispenser;
-	std::set<YulString> const& reservedIdentifiers;
-	/// The value nullopt represents creation code
-	std::optional<size_t> expectedExecutionsPerDeployment;
-};
-
-
-/**
- * Construction to create dynamically callable objects out of the
- * statically callable optimiser steps.
- */
-struct OptimiserStep
-{
-	explicit OptimiserStep(std::string _name): name(std::move(_name)) {}
-	virtual ~OptimiserStep() = default;
-
-	virtual void run(OptimiserStepContext&, Block&) const = 0;
-	/// @returns non-nullopt if the step cannot be run, for example because it requires
-	/// an SMT solver to be loaded, but none is available. In that case, the string
-	/// contains a human-readable reason.
-	virtual std::optional<std::string> invalidInCurrentEnvironment() const = 0;
-	std::string name;
-};
-
-template <class Step>
-struct OptimiserStepInstance: public OptimiserStep
-{
-private:
-	template<typename T>
-	struct HasInvalidInCurrentEnvironmentMethod
-	{
-	private:
-		template<typename U> static auto test(int) -> decltype(U::invalidInCurrentEnvironment(), std::true_type());
-		template<typename> static std::false_type test(...);
-
-	public:
-		static constexpr bool value = decltype(test<T>(0))::value;
-	};
-
-public:
-	OptimiserStepInstance(): OptimiserStep{Step::name} {}
-	void run(OptimiserStepContext& _context, Block& _ast) const override
-	{
-		Step::run(_context, _ast);
-	}
-	std::optional<std::string> invalidInCurrentEnvironment() const override
-	{
-		if constexpr (HasInvalidInCurrentEnvironmentMethod<Step>::value)
-			return Step::invalidInCurrentEnvironment();
-		else
-			return std::nullopt;
-	}
-};
-
-
-}
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
deleted file mode 100644
index 17f912762b38..000000000000
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Some useful snippets for the optimiser.
- */
-
-#include <libyul/optimiser/OptimizerUtilities.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libyul/Dialect.h>
-#include <libyul/AST.h>
-
-#include <liblangutil/Token.h>
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/action/remove_if.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-void yul::removeEmptyBlocks(Block& _block)
-{
-	auto isEmptyBlock = [](Statement const& _st) -> bool {
-		return std::holds_alternative<Block>(_st) && std::get<Block>(_st).statements.empty();
-	};
-	ranges::actions::remove_if(_block.statements, isEmptyBlock);
-}
-
-bool yul::isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifier)
-{
-	return _identifier.empty() || TokenTraits::isYulKeyword(_identifier.str()) || _dialect.reservedIdentifier(_identifier);
-}
-
-std::optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, YulString const& _name)
-{
-	if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
-		if (BuiltinFunctionForEVM const* builtin = dialect->builtin(_name))
-			return builtin->instruction;
-	return std::nullopt;
-}
-
-langutil::EVMVersion const yul::evmVersionFromDialect(Dialect const& _dialect)
-{
-	if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
-		return dialect->evmVersion();
-	return langutil::EVMVersion();
-}
-
-void StatementRemover::operator()(Block& _block)
-{
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _statement) -> std::optional<std::vector<Statement>>
-		{
-			if (m_toRemove.count(&_statement))
-				return {std::vector<Statement>{}};
-			else
-				return std::nullopt;
-		}
-	);
-	ASTModifier::operator()(_block);
-}
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
deleted file mode 100644
index cb07f7a53006..000000000000
--- a/libyul/optimiser/OptimizerUtilities.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Small useful snippets for the optimiser.
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-#include <libyul/ASTForward.h>
-#include <libyul/Dialect.h>
-#include <libyul/YulString.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <optional>
-
-namespace solidity::evmasm
-{
-enum class Instruction: uint8_t;
-}
-
-namespace solidity::yul
-{
-
-/// Removes statements that are just empty blocks (non-recursive).
-/// If this is run on the outermost block, the FunctionGrouper should be run afterwards to keep
-/// the canonical form.
-void removeEmptyBlocks(Block& _block);
-
-/// Returns true if a given literal can not be used as an identifier.
-/// This includes Yul keywords and builtins of the given dialect.
-bool isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifier);
-
-/// Helper function that returns the instruction, if the `_name` is a BuiltinFunction
-std::optional<evmasm::Instruction> toEVMInstruction(Dialect const& _dialect, YulString const& _name);
-
-/// Helper function that returns the EVM version from a dialect.
-/// It returns the default EVM version if dialect is not an EVMDialect.
-langutil::EVMVersion const evmVersionFromDialect(Dialect const& _dialect);
-
-class StatementRemover: public ASTModifier
-{
-public:
-	explicit StatementRemover(std::set<Statement const*> const& _toRemove): m_toRemove(_toRemove) {}
-
-	void operator()(Block& _block) override;
-private:
-	std::set<Statement const*> const& m_toRemove;
-};
-
-}
diff --git a/libyul/optimiser/README.md b/libyul/optimiser/README.md
deleted file mode 100644
index 67a6e1190229..000000000000
--- a/libyul/optimiser/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Yul-Based Optimizer
-
-The documentation of the Yul-based optimizer module has been moved to the official Solidity documentation.
-
-Please refer to the [optimizer documentation](/docs/internals/optimizer.rst) for a description of all optimization stages and how to use the optimizer and to the [Yul documentation](/docs/yul.rst#optimization-step-sequence) for more information on the optimization step sequence and a list of abbreviations for each step.
\ No newline at end of file
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
deleted file mode 100644
index db6920f2439b..000000000000
--- a/libyul/optimiser/Rematerialiser.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Optimisation stage that replaces variables by their most recently assigned expressions.
- */
-
-#include <libyul/optimiser/Rematerialiser.h>
-
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/Exceptions.h>
-#include <libyul/AST.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void Rematerialiser::run(Dialect const& _dialect, Block& _ast, std::set<YulString> _varsToAlwaysRematerialize, bool _onlySelectedVariables)
-{
-	Rematerialiser{_dialect, _ast, std::move(_varsToAlwaysRematerialize), _onlySelectedVariables}(_ast);
-}
-
-Rematerialiser::Rematerialiser(
-	Dialect const& _dialect,
-	Block& _ast,
-	std::set<YulString> _varsToAlwaysRematerialize,
-	bool _onlySelectedVariables
-):
-	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore),
-	m_referenceCounts(VariableReferencesCounter::countReferences(_ast)),
-	m_varsToAlwaysRematerialize(std::move(_varsToAlwaysRematerialize)),
-	m_onlySelectedVariables(_onlySelectedVariables)
-{
-}
-
-void Rematerialiser::visit(Expression& _e)
-{
-	if (std::holds_alternative<Identifier>(_e))
-	{
-		Identifier& identifier = std::get<Identifier>(_e);
-		YulString name = identifier.name;
-		if (AssignedValue const* value = variableValue(name))
-		{
-			assertThrow(value->value, OptimizerException, "");
-			size_t refs = m_referenceCounts[name];
-			size_t cost = CodeCost::codeCost(m_dialect, *value->value);
-			if (
-				(
-					!m_onlySelectedVariables && (
-						(refs <= 1 && value->loopDepth == m_loopDepth) ||
-						cost == 0 ||
-						(refs <= 5 && cost <= 1 && m_loopDepth == 0)
-					)
-				) || m_varsToAlwaysRematerialize.count(name)
-			)
-			{
-				assertThrow(m_referenceCounts[name] > 0, OptimizerException, "");
-				auto variableReferences = references(name);
-				if (!variableReferences || ranges::all_of(*variableReferences, [&](auto const& ref) { return inScope(ref); }))
-				{
-					// update reference counts
-					m_referenceCounts[name]--;
-					for (auto const& ref: VariableReferencesCounter::countReferences(
-						*value->value
-					))
-						m_referenceCounts[ref.first] += ref.second;
-					_e = (ASTCopier{}).translate(*value->value);
-				}
-			}
-		}
-	}
-	DataFlowAnalyzer::visit(_e);
-}
-
-void LiteralRematerialiser::visit(Expression& _e)
-{
-	if (std::holds_alternative<Identifier>(_e))
-	{
-		Identifier& identifier = std::get<Identifier>(_e);
-		YulString name = identifier.name;
-		if (AssignedValue const* value = variableValue(name))
-		{
-			assertThrow(value->value, OptimizerException, "");
-			if (std::holds_alternative<Literal>(*value->value))
-				_e = *value->value;
-		}
-	}
-	DataFlowAnalyzer::visit(_e);
-}
diff --git a/libyul/optimiser/Rematerialiser.h b/libyul/optimiser/Rematerialiser.h
deleted file mode 100644
index 9ee5209fdfeb..000000000000
--- a/libyul/optimiser/Rematerialiser.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that replaces variables by their most recently assigned expressions.
- */
-
-#pragma once
-
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Optimisation stage that replaces variable references by those expressions
- * that are most recently assigned to the referenced variables,
- * but only if the expression is movable and one of the following holds:
- *  - the variable is referenced exactly once (and definition-to-reference does not cross a loop boundary)
- *  - the value is extremely cheap ("cost" of zero like ``caller()``)
- *  - the variable is referenced at most 5 times and the value is rather cheap
- *    ("cost" of at most 1 like a constant up to 0xff) and we are not in a loop
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class Rematerialiser: public DataFlowAnalyzer
-{
-public:
-	static constexpr char const* name{"Rematerialiser"};
-	static void run(
-		OptimiserStepContext& _context,
-		Block& _ast
-	) { run(_context.dialect, _ast); }
-
-	static void run(
-		Dialect const& _dialect,
-		Block& _ast,
-		std::set<YulString> _varsToAlwaysRematerialize = {},
-		bool _onlySelectedVariables = false
-	);
-
-protected:
-	Rematerialiser(
-		Dialect const& _dialect,
-		Block& _ast,
-		std::set<YulString> _varsToAlwaysRematerialize = {},
-		bool _onlySelectedVariables = false
-	);
-
-	using DataFlowAnalyzer::operator();
-
-	using ASTModifier::visit;
-	void visit(Expression& _e) override;
-
-	std::map<YulString, size_t> m_referenceCounts;
-	std::set<YulString> m_varsToAlwaysRematerialize;
-	bool m_onlySelectedVariables = false;
-};
-
-/**
- * If a variable is referenced that is known to have a literal
- * value at that point, replace it by a literal.
- *
- * This is mostly used so that other components do not have to rely
- * on the data flow analyzer.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class LiteralRematerialiser: public DataFlowAnalyzer
-{
-public:
-	static constexpr char const* name{"LiteralRematerialiser"};
-	static void run(
-		OptimiserStepContext& _context,
-		Block& _ast
-	) { LiteralRematerialiser{_context.dialect}(_ast); }
-
-	using ASTModifier::visit;
-	void visit(Expression& _e) override;
-
-private:
-	LiteralRematerialiser(Dialect const& _dialect):
-		DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore)
-	{}
-};
-
-
-}
diff --git a/libyul/optimiser/SSAReverser.cpp b/libyul/optimiser/SSAReverser.cpp
deleted file mode 100644
index d47c39033352..000000000000
--- a/libyul/optimiser/SSAReverser.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/SSAReverser.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/AST.h>
-#include <libsolutil/CommonData.h>
-
-#include <variant>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void SSAReverser::run(OptimiserStepContext&, Block& _block)
-{
-	AssignmentCounter assignmentCounter;
-	assignmentCounter(_block);
-	SSAReverser{assignmentCounter}(_block);
-}
-
-void SSAReverser::operator()(Block& _block)
-{
-	walkVector(_block.statements);
-	util::iterateReplacingWindow<2>(
-		_block.statements,
-		[&](Statement& _stmt1, Statement& _stmt2) -> std::optional<std::vector<Statement>>
-		{
-			auto* varDecl = std::get_if<VariableDeclaration>(&_stmt1);
-
-			if (!varDecl || varDecl->variables.size() != 1 || !varDecl->value)
-				return {};
-
-			// Replaces
-			//   let a_1 := E
-			//   a := a_1
-			// with
-			//   a := E
-			//   let a_1 := a
-			if (auto* assignment = std::get_if<Assignment>(&_stmt2))
-			{
-				auto* identifier = std::get_if<Identifier>(assignment->value.get());
-				if (
-					assignment->variableNames.size() == 1 &&
-					identifier &&
-					identifier->name == varDecl->variables.front().name
-				)
-				{
-					// in the special case a == a_1, just remove the assignment
-					if (assignment->variableNames.front().name == identifier->name)
-						return util::make_vector<Statement>(std::move(_stmt1));
-					else
-						return util::make_vector<Statement>(
-							Assignment{
-								std::move(assignment->debugData),
-								assignment->variableNames,
-								std::move(varDecl->value)
-							},
-							VariableDeclaration{
-								std::move(varDecl->debugData),
-								std::move(varDecl->variables),
-								std::make_unique<Expression>(assignment->variableNames.front())
-							}
-						);
-				}
-			}
-			// Replaces
-			//   let a_1 := E
-			//   let a := a_1
-			// with
-			//   let a := E
-			//   let a_1 := a
-			else if (auto* varDecl2 = std::get_if<VariableDeclaration>(&_stmt2))
-			{
-				auto* identifier = std::get_if<Identifier>(varDecl2->value.get());
-				if (
-					varDecl2->variables.size() == 1 &&
-					identifier &&
-					identifier->name == varDecl->variables.front().name && (
-						m_assignmentCounter.assignmentCount(varDecl2->variables.front().name) >
-						m_assignmentCounter.assignmentCount(varDecl->variables.front().name)
-					)
-				)
-				{
-					auto varIdentifier2 = std::make_unique<Expression>(Identifier{
-						varDecl2->variables.front().debugData,
-						varDecl2->variables.front().name
-					});
-					return util::make_vector<Statement>(
-						VariableDeclaration{
-							std::move(varDecl2->debugData),
-							std::move(varDecl2->variables),
-							std::move(varDecl->value)
-						},
-						VariableDeclaration{
-							std::move(varDecl->debugData),
-							std::move(varDecl->variables),
-							std::move(varIdentifier2)
-						}
-					);
-				}
-			}
-
-			return {};
-		}
-	);
-}
diff --git a/libyul/optimiser/SSAReverser.h b/libyul/optimiser/SSAReverser.h
deleted file mode 100644
index bb6e98bc8ded..000000000000
--- a/libyul/optimiser/SSAReverser.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-class AssignmentCounter;
-
-/**
- * Reverses the SSA transformation.
- *
- * In particular, the SSA transform will rewrite
- *
- * 		a := E
- *
- * to
- *
- * 		let a_1 := E
- * 		a := a_1
- *
- * To undo this kind of transformation, the SSAReverser changes this back to
- *
- * 		a := E
- * 		let a_1 := a
- *
- * 	In the special case
- * 		let a := E
- * 		a := a
- *
- * 	the redundant assignment "a := a" is removed.
- *
- *
- * Secondly, the SSA transform will rewrite
- *
- * 		let a := E
- * to
- *
- * 		let a_1 := E
- * 		let a := a_1
- *
- * To undo this kind of transformation, the SSAReverser changes this back to
- *
- * 		let a := E
- * 		let a_1 := a
- *
- * 	After that the CSE can replace references of a_1 by references to a,
- * 	after which the unused pruner can remove the declaration of a_1.
- *
- * 	Prerequisites: Disambiguator
- *
- */
-class SSAReverser: public ASTModifier
-{
-public:
-	static constexpr char const* name{"SSAReverser"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-
-private:
-	explicit SSAReverser(AssignmentCounter const& _assignmentCounter): m_assignmentCounter(_assignmentCounter) {}
-
-	AssignmentCounter const& m_assignmentCounter;
-};
-
-}
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
deleted file mode 100644
index 74a7701494d4..000000000000
--- a/libyul/optimiser/SSATransform.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that turns subsequent assignments to variable declarations
- * and assignments.
- */
-
-#include <libyul/optimiser/SSATransform.h>
-
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <libyul/optimiser/TypeInfo.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::langutil;
-
-namespace
-{
-
-/**
- * First step of SSA transform: Introduces new SSA variables for each assignment or
- * declaration of a variable to be replaced.
- */
-class IntroduceSSA: public ASTModifier
-{
-public:
-	explicit IntroduceSSA(
-		NameDispenser& _nameDispenser,
-		std::set<YulString> const& _variablesToReplace,
-		TypeInfo& _typeInfo
-	):
-		m_nameDispenser(_nameDispenser),
-		m_variablesToReplace(_variablesToReplace),
-		m_typeInfo(_typeInfo)
-	{ }
-
-	void operator()(Block& _block) override;
-
-private:
-	NameDispenser& m_nameDispenser;
-	std::set<YulString> const& m_variablesToReplace;
-	TypeInfo const& m_typeInfo;
-};
-
-
-void IntroduceSSA::operator()(Block& _block)
-{
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _s) -> std::optional<std::vector<Statement>>
-		{
-			if (std::holds_alternative<VariableDeclaration>(_s))
-			{
-				VariableDeclaration& varDecl = std::get<VariableDeclaration>(_s);
-				if (varDecl.value)
-					visit(*varDecl.value);
-
-				bool needToReplaceSome = false;
-				for (auto const& var: varDecl.variables)
-					if (m_variablesToReplace.count(var.name))
-						needToReplaceSome = true;
-				if (!needToReplaceSome)
-					return {};
-
-				// Replace "let a := v" by "let a_1 := v  let a := a_1"
-				// Replace "let a, b := v" by "let a_1, b_1 := v  let a := a_1 let b := b_2"
-				std::shared_ptr<DebugData const> debugData = varDecl.debugData;
-				std::vector<Statement> statements;
-				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(varDecl.value)});
-				TypedNameList newVariables;
-				for (auto const& var: varDecl.variables)
-				{
-					YulString oldName = var.name;
-					YulString newName = m_nameDispenser.newName(oldName);
-					newVariables.emplace_back(TypedName{debugData, newName, var.type});
-					statements.emplace_back(VariableDeclaration{
-						debugData,
-						{TypedName{debugData, oldName, var.type}},
-						std::make_unique<Expression>(Identifier{debugData, newName})
-					});
-				}
-				std::get<VariableDeclaration>(statements.front()).variables = std::move(newVariables);
-				return { std::move(statements) };
-			}
-			else if (std::holds_alternative<Assignment>(_s))
-			{
-				Assignment& assignment = std::get<Assignment>(_s);
-				visit(*assignment.value);
-				for (auto const& var: assignment.variableNames)
-					assertThrow(m_variablesToReplace.count(var.name), OptimizerException, "");
-
-				// Replace "a := v" by "let a_1 := v  a := v"
-				// Replace "a, b := v" by "let a_1, b_1 := v  a := a_1 b := b_2"
-				std::shared_ptr<DebugData const> debugData = assignment.debugData;
-				std::vector<Statement> statements;
-				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(assignment.value)});
-				TypedNameList newVariables;
-				for (auto const& var: assignment.variableNames)
-				{
-					YulString oldName = var.name;
-					YulString newName = m_nameDispenser.newName(oldName);
-					newVariables.emplace_back(TypedName{debugData,
-						newName,
-						m_typeInfo.typeOfVariable(oldName)
-					});
-					statements.emplace_back(Assignment{
-						debugData,
-						{Identifier{debugData, oldName}},
-						std::make_unique<Expression>(Identifier{debugData, newName})
-					});
-				}
-				std::get<VariableDeclaration>(statements.front()).variables = std::move(newVariables);
-				return { std::move(statements) };
-			}
-			else
-				visit(_s);
-			return {};
-		}
-	);
-}
-
-/**
- * Second step of SSA transform: Introduces new SSA variables at each control-flow join
- * and at the beginning of functions.
- */
-class IntroduceControlFlowSSA: public ASTModifier
-{
-public:
-	explicit IntroduceControlFlowSSA(
-		NameDispenser& _nameDispenser,
-		std::set<YulString> const& _variablesToReplace,
-		TypeInfo const& _typeInfo
-	):
-		m_nameDispenser(_nameDispenser),
-		m_variablesToReplace(_variablesToReplace),
-		m_typeInfo(_typeInfo)
-	{ }
-
-	void operator()(FunctionDefinition& _function) override;
-	void operator()(ForLoop& _forLoop) override;
-	void operator()(Switch& _switch) override;
-	void operator()(Block& _block) override;
-
-private:
-	NameDispenser& m_nameDispenser;
-	std::set<YulString> const& m_variablesToReplace;
-	/// Variables (that are to be replaced) currently in scope.
-	std::set<YulString> m_variablesInScope;
-	/// Set of variables that do not have a specific value.
-	std::set<YulString> m_variablesToReassign;
-	TypeInfo const& m_typeInfo;
-};
-
-void IntroduceControlFlowSSA::operator()(FunctionDefinition& _function)
-{
-	std::set<YulString> varsInScope;
-	std::swap(varsInScope, m_variablesInScope);
-	std::set<YulString> toReassign;
-	std::swap(toReassign, m_variablesToReassign);
-
-	for (auto const& param: _function.parameters)
-		if (m_variablesToReplace.count(param.name))
-		{
-			m_variablesInScope.insert(param.name);
-			m_variablesToReassign.insert(param.name);
-		}
-
-	ASTModifier::operator()(_function);
-
-	m_variablesInScope = std::move(varsInScope);
-	m_variablesToReassign = std::move(toReassign);
-}
-
-void IntroduceControlFlowSSA::operator()(ForLoop& _for)
-{
-	yulAssert(_for.pre.statements.empty(), "For loop init rewriter not run.");
-
-	for (auto const& var: assignedVariableNames(_for.body) + assignedVariableNames(_for.post))
-		if (m_variablesInScope.count(var))
-			m_variablesToReassign.insert(var);
-
-	(*this)(_for.body);
-	(*this)(_for.post);
-}
-
-void IntroduceControlFlowSSA::operator()(Switch& _switch)
-{
-	yulAssert(m_variablesToReassign.empty(), "");
-
-	std::set<YulString> toReassign;
-	for (auto& c: _switch.cases)
-	{
-		(*this)(c.body);
-		toReassign += m_variablesToReassign;
-	}
-
-	m_variablesToReassign += toReassign;
-}
-
-void IntroduceControlFlowSSA::operator()(Block& _block)
-{
-	std::set<YulString> variablesDeclaredHere;
-	std::set<YulString> assignedVariables;
-
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _s) -> std::optional<std::vector<Statement>>
-		{
-		std::vector<Statement> toPrepend;
-			for (YulString toReassign: m_variablesToReassign)
-			{
-				YulString newName = m_nameDispenser.newName(toReassign);
-				toPrepend.emplace_back(VariableDeclaration{
-					debugDataOf(_s),
-					{TypedName{debugDataOf(_s), newName, m_typeInfo.typeOfVariable(toReassign)}},
-					std::make_unique<Expression>(Identifier{debugDataOf(_s), toReassign})
-				});
-				assignedVariables.insert(toReassign);
-			}
-			m_variablesToReassign.clear();
-
-			if (std::holds_alternative<VariableDeclaration>(_s))
-			{
-				VariableDeclaration& varDecl = std::get<VariableDeclaration>(_s);
-				for (auto const& var: varDecl.variables)
-					if (m_variablesToReplace.count(var.name))
-					{
-						variablesDeclaredHere.insert(var.name);
-						m_variablesInScope.insert(var.name);
-					}
-			}
-			else if (std::holds_alternative<Assignment>(_s))
-			{
-				Assignment& assignment = std::get<Assignment>(_s);
-				for (auto const& var: assignment.variableNames)
-					if (m_variablesToReplace.count(var.name))
-						assignedVariables.insert(var.name);
-			}
-			else
-				visit(_s);
-
-			if (toPrepend.empty())
-				return {};
-			else
-			{
-				toPrepend.emplace_back(std::move(_s));
-				return {std::move(toPrepend)};
-			}
-		}
-	);
-	m_variablesToReassign += assignedVariables;
-	m_variablesInScope -= variablesDeclaredHere;
-	m_variablesToReassign -= variablesDeclaredHere;
-}
-
-/**
- * Third step of SSA transform: Replace the references to variables-to-be-replaced
- * by their current values.
- */
-class PropagateValues: public ASTModifier
-{
-public:
-	explicit PropagateValues(std::set<YulString> const& _variablesToReplace):
-		m_variablesToReplace(_variablesToReplace)
-	{ }
-
-	void operator()(Identifier& _identifier) override;
-	void operator()(VariableDeclaration& _varDecl) override;
-	void operator()(Assignment& _assignment) override;
-	void operator()(ForLoop& _for) override;
-	void operator()(Block& _block) override;
-
-private:
-	/// This is a set of all variables that are assigned to anywhere in the code.
-	/// Variables that are only declared but never re-assigned are not touched.
-	std::set<YulString> const& m_variablesToReplace;
-	std::map<YulString, YulString> m_currentVariableValues;
-	std::set<YulString> m_clearAtEndOfBlock;
-};
-
-void PropagateValues::operator()(Identifier& _identifier)
-{
-	if (m_currentVariableValues.count(_identifier.name))
-		_identifier.name = m_currentVariableValues[_identifier.name];
-}
-
-void PropagateValues::operator()(VariableDeclaration& _varDecl)
-{
-	ASTModifier::operator()(_varDecl);
-
-	if (_varDecl.variables.size() != 1)
-		return;
-
-	YulString variable = _varDecl.variables.front().name;
-	if (m_variablesToReplace.count(variable))
-	{
-		// `let a := a_1` - regular declaration of non-SSA variable
-		yulAssert(std::holds_alternative<Identifier>(*_varDecl.value), "");
-		m_currentVariableValues[variable] = std::get<Identifier>(*_varDecl.value).name;
-		m_clearAtEndOfBlock.insert(variable);
-	}
-	else if (_varDecl.value && std::holds_alternative<Identifier>(*_varDecl.value))
-	{
-		// `let a_1 := a` - assignment to SSA variable after a branch.
-		YulString value = std::get<Identifier>(*_varDecl.value).name;
-		if (m_variablesToReplace.count(value))
-		{
-			// This is safe because `a_1` is not a "variable to replace" and thus
-			// will not be re-assigned.
-			m_currentVariableValues[value] = variable;
-			m_clearAtEndOfBlock.insert(value);
-		}
-	}
-}
-
-
-void PropagateValues::operator()(Assignment& _assignment)
-{
-	visit(*_assignment.value);
-
-	if (_assignment.variableNames.size() != 1)
-		return;
-	YulString name = _assignment.variableNames.front().name;
-	if (!m_variablesToReplace.count(name))
-		return;
-
-	yulAssert(_assignment.value && std::holds_alternative<Identifier>(*_assignment.value), "");
-	m_currentVariableValues[name] = std::get<Identifier>(*_assignment.value).name;
-	m_clearAtEndOfBlock.insert(name);
-}
-
-void PropagateValues::operator()(ForLoop& _for)
-{
-	yulAssert(_for.pre.statements.empty(), "For loop init rewriter not run.");
-
-	for (auto const& var: assignedVariableNames(_for.body) + assignedVariableNames(_for.post))
-		m_currentVariableValues.erase(var);
-
-	visit(*_for.condition);
-	(*this)(_for.body);
-	(*this)(_for.post);
-}
-
-void PropagateValues::operator()(Block& _block)
-{
-	std::set<YulString> clearAtParentBlock = std::move(m_clearAtEndOfBlock);
-	m_clearAtEndOfBlock.clear();
-
-	ASTModifier::operator()(_block);
-
-	for (auto const& var: m_clearAtEndOfBlock)
-		m_currentVariableValues.erase(var);
-
-	m_clearAtEndOfBlock = std::move(clearAtParentBlock);
-}
-
-}
-
-void SSATransform::run(OptimiserStepContext& _context, Block& _ast)
-{
-	TypeInfo typeInfo(_context.dialect, _ast);
-	std::set<YulString> assignedVariables = assignedVariableNames(_ast);
-	IntroduceSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
-	IntroduceControlFlowSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
-	PropagateValues{assignedVariables}(_ast);
-}
-
-
diff --git a/libyul/optimiser/SSATransform.h b/libyul/optimiser/SSATransform.h
deleted file mode 100644
index 64181bf208d3..000000000000
--- a/libyul/optimiser/SSATransform.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that turns subsequent assignments to variable declarations
- * and assignments.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-#include <liblangutil/SourceLocation.h>
-
-#include <vector>
-
-namespace solidity::yul
-{
-
-class NameDispenser;
-
-/**
- * Optimizer stage that tries to replace repeated assignments to
- * existing variables by declarations of new variables as much as
- * possible.
- * The reassignments are still there, but all references to the
- * reassigned variables are replaced by the newly declared variables.
- *
- * Example:
- * {
- *   let a := 1
- *   mstore(a, 2)
- *   a := 3
- * }
- * is transformed to
- * {
- *   let a_1 := 1
- *   let a := a_1
- *   mstore(a_1, 2)
- *   let a_3 := 3
- *   a := a_3
- * }
- *
- * Exact semantics:
- *
- * For any variable a that is assigned to somewhere in the code (assignment with
- * declaration does not count) perform the following transforms:
- *  - replace "let a := v" by "let a_1 := v   let a := a_1"
- *  - replace "a := v" by "let a_1 := v   a := a_1"
- * Furthermore, always note the current variable/value assigned to a and replace each
- * reference to a by this variable.
- * The current value mapping is cleared for a variable a at the end of each block
- * in which it was assigned. We compensate that by appending a declaration
- * of the form of "let a_1 := a" right after the location where control flow joins so
- * variable references can use the SSA variable. The only exception to this rule are
- * for loop conditions, as we cannot insert a variable declaration there.
- *
- * After this stage, UnusedAssignmentEliminator is recommended to remove the unnecessary
- * intermediate assignments.
- *
- * This stage provides best results if CSE is run right before it, because
- * then it does not generate excessive amounts of variables.
- *
- * The transform is implemented in three stages. All stages are only concerned
- * with variables that are assigned somewhere in the code (excluding declarations).
- * The first stage inserts new SSA variables for each declaration and assignment of
- * such variables.
- * The second stage inserts new SSA variables at control flow joins.
- * The last stage replaces references to variables that are assigned to somewhere in the
- * code by their current SSA variable.
- *
- * TODO Which transforms are required to keep this idempotent?
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class SSATransform: public ASTModifier
-{
-public:
-	static constexpr char const* name{"SSATransform"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-};
-
-}
diff --git a/libyul/optimiser/SSAValueTracker.cpp b/libyul/optimiser/SSAValueTracker.cpp
deleted file mode 100644
index 1d25cb54b514..000000000000
--- a/libyul/optimiser/SSAValueTracker.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that collects variables that are never assigned to and their
- * initial values.
- */
-
-#include <libyul/optimiser/SSAValueTracker.h>
-
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void SSAValueTracker::operator()(Assignment const& _assignment)
-{
-	for (auto const& var: _assignment.variableNames)
-		m_values.erase(var.name);
-}
-
-void SSAValueTracker::operator()(FunctionDefinition const& _funDef)
-{
-	for (auto const& var: _funDef.returnVariables)
-		setValue(var.name, nullptr);
-	ASTWalker::operator()(_funDef);
-}
-
-void SSAValueTracker::operator()(VariableDeclaration const& _varDecl)
-{
-	if (!_varDecl.value)
-		for (auto const& var: _varDecl.variables)
-			setValue(var.name, nullptr);
-	else if (_varDecl.variables.size() == 1)
-		setValue(_varDecl.variables.front().name, _varDecl.value.get());
-}
-
-std::set<YulString> SSAValueTracker::ssaVariables(Block const& _ast)
-{
-	SSAValueTracker t;
-	t(_ast);
-	std::set<YulString> ssaVars;
-	for (auto const& value: t.values())
-		ssaVars.insert(value.first);
-	return ssaVars;
-}
-
-void SSAValueTracker::setValue(YulString _name, Expression const* _value)
-{
-	assertThrow(
-		m_values.count(_name) == 0,
-		OptimizerException,
-		"Source needs to be disambiguated."
-	);
-	if (!_value)
-		_value = &m_zero;
-	m_values[_name] = _value;
-}
diff --git a/libyul/optimiser/SSAValueTracker.h b/libyul/optimiser/SSAValueTracker.h
deleted file mode 100644
index f1c93ff229de..000000000000
--- a/libyul/optimiser/SSAValueTracker.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that collects variables that are never assigned to and their
- * initial values.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AST.h> // Needed for m_zero below.
-
-#include <map>
-#include <set>
-
-namespace solidity::yul
-{
-
-/**
- * Class that walks the AST and stores the initial value of each variable
- * that is never assigned to.
- *
- * A special zero constant expression is used for the default value of variables.
- *
- * Prerequisite: Disambiguator
- */
-class SSAValueTracker: public ASTWalker
-{
-public:
-	using ASTWalker::operator();
-	void operator()(FunctionDefinition const& _funDef) override;
-	void operator()(VariableDeclaration const& _varDecl) override;
-	void operator()(Assignment const& _assignment) override;
-
-	std::map<YulString, Expression const*> const& values() const { return m_values; }
-	Expression const* value(YulString _name) const { return m_values.at(_name); }
-
-	static std::set<YulString> ssaVariables(Block const& _ast);
-
-private:
-	void setValue(YulString _name, Expression const* _value);
-
-	/// Special expression whose address will be used in m_values.
-	/// YulString does not need to be reset because SSAValueTracker is short-lived.
-	Expression const m_zero{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
-	std::map<YulString, Expression const*> m_values;
-};
-
-}
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
deleted file mode 100644
index 5d375b1454cb..000000000000
--- a/libyul/optimiser/Semantics.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST walkers that collect semantical facts.
- */
-
-#include <libyul/optimiser/Semantics.h>
-
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/Exceptions.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <libevmasm/SemanticInformation.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Algorithms.h>
-
-#include <limits>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-
-SideEffectsCollector::SideEffectsCollector(
-		Dialect const& _dialect,
-		Expression const& _expression,
-		std::map<YulString, SideEffects> const* _functionSideEffects
-):
-	SideEffectsCollector(_dialect, _functionSideEffects)
-{
-	visit(_expression);
-}
-
-SideEffectsCollector::SideEffectsCollector(Dialect const& _dialect, Statement const& _statement):
-	SideEffectsCollector(_dialect)
-{
-	visit(_statement);
-}
-
-SideEffectsCollector::SideEffectsCollector(
-	Dialect const& _dialect,
-	Block const& _ast,
-	std::map<YulString, SideEffects> const* _functionSideEffects
-):
-	SideEffectsCollector(_dialect, _functionSideEffects)
-{
-	operator()(_ast);
-}
-
-SideEffectsCollector::SideEffectsCollector(
-	Dialect const& _dialect,
-	ForLoop const& _ast,
-	std::map<YulString, SideEffects> const* _functionSideEffects
-):
-	SideEffectsCollector(_dialect, _functionSideEffects)
-{
-	operator()(_ast);
-}
-
-void SideEffectsCollector::operator()(FunctionCall const& _functionCall)
-{
-	ASTWalker::operator()(_functionCall);
-
-	YulString functionName = _functionCall.functionName.name;
-	if (BuiltinFunction const* f = m_dialect.builtin(functionName))
-		m_sideEffects += f->sideEffects;
-	else if (m_functionSideEffects && m_functionSideEffects->count(functionName))
-		m_sideEffects += m_functionSideEffects->at(functionName);
-	else
-		m_sideEffects += SideEffects::worst();
-}
-
-bool MSizeFinder::containsMSize(Dialect const& _dialect, Block const& _ast)
-{
-	MSizeFinder finder(_dialect);
-	finder(_ast);
-	return finder.m_msizeFound;
-}
-
-bool MSizeFinder::containsMSize(Dialect const& _dialect, Object const& _object)
-{
-	if (containsMSize(_dialect, *_object.code))
-		return true;
-
-	for (std::shared_ptr<ObjectNode> const& node: _object.subObjects)
-		if (auto const* object = dynamic_cast<Object const*>(node.get()))
-			if (containsMSize(_dialect, *object))
-				return true;
-
-	return false;
-}
-
-void MSizeFinder::operator()(FunctionCall const& _functionCall)
-{
-	ASTWalker::operator()(_functionCall);
-
-	if (BuiltinFunction const* f = m_dialect.builtin(_functionCall.functionName.name))
-		if (f->isMSize)
-			m_msizeFound = true;
-}
-
-std::map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
-	Dialect const& _dialect,
-	CallGraph const& _directCallGraph
-)
-{
-	// Any loop currently makes a function non-movable, because
-	// it could be a non-terminating loop.
-	// The same is true for any function part of a call cycle.
-	// In the future, we should refine that, because the property
-	// is actually a bit different from "not movable".
-
-	std::map<YulString, SideEffects> ret;
-	for (auto const& function: _directCallGraph.functionsWithLoops + _directCallGraph.recursiveFunctions())
-	{
-		ret[function].movable = false;
-		ret[function].canBeRemoved = false;
-		ret[function].canBeRemovedIfNoMSize = false;
-		ret[function].cannotLoop = false;
-	}
-
-	for (auto const& call: _directCallGraph.functionCalls)
-	{
-		YulString funName = call.first;
-		SideEffects sideEffects;
-		auto _visit = [&, visited = std::set<YulString>{}](YulString _function, auto&& _recurse) mutable {
-			if (!visited.insert(_function).second)
-				return;
-			if (sideEffects == SideEffects::worst())
-				return;
-			if (BuiltinFunction const* f = _dialect.builtin(_function))
-				sideEffects += f->sideEffects;
-			else
-			{
-				if (ret.count(_function))
-					sideEffects += ret[_function];
-				for (YulString callee: _directCallGraph.functionCalls.at(_function))
-					_recurse(callee, _recurse);
-			}
-		};
-		for (auto const& _v: call.second)
-			_visit(_v, _visit);
-		ret[funName] += sideEffects;
-	}
-	return ret;
-}
-
-MovableChecker::MovableChecker(Dialect const& _dialect, Expression const& _expression):
-	MovableChecker(_dialect)
-{
-	visit(_expression);
-}
-
-void MovableChecker::operator()(Identifier const& _identifier)
-{
-	SideEffectsCollector::operator()(_identifier);
-	m_variableReferences.emplace(_identifier.name);
-}
-
-void MovableChecker::visit(Statement const&)
-{
-	assertThrow(false, OptimizerException, "Movability for statement requested.");
-}
-
-std::pair<TerminationFinder::ControlFlow, size_t> TerminationFinder::firstUnconditionalControlFlowChange(
-	std::vector<Statement> const& _statements
-)
-{
-	for (size_t i = 0; i < _statements.size(); ++i)
-	{
-		ControlFlow controlFlow = controlFlowKind(_statements[i]);
-		if (controlFlow != ControlFlow::FlowOut)
-			return {controlFlow, i};
-	}
-	return {ControlFlow::FlowOut, std::numeric_limits<size_t>::max()};
-}
-
-TerminationFinder::ControlFlow TerminationFinder::controlFlowKind(Statement const& _statement)
-{
-	if (
-		std::holds_alternative<VariableDeclaration>(_statement) &&
-		std::get<VariableDeclaration>(_statement).value &&
-		containsNonContinuingFunctionCall(*std::get<VariableDeclaration>(_statement).value)
-	)
-		return ControlFlow::Terminate;
-	else if (
-		std::holds_alternative<Assignment>(_statement) &&
-		containsNonContinuingFunctionCall(*std::get<Assignment>(_statement).value)
-	)
-		return ControlFlow::Terminate;
-	else if (
-		std::holds_alternative<ExpressionStatement>(_statement) &&
-		containsNonContinuingFunctionCall(std::get<ExpressionStatement>(_statement).expression)
-	)
-		return ControlFlow::Terminate;
-	else if (std::holds_alternative<Break>(_statement))
-		return ControlFlow::Break;
-	else if (std::holds_alternative<Continue>(_statement))
-		return ControlFlow::Continue;
-	else if (std::holds_alternative<Leave>(_statement))
-		return ControlFlow::Leave;
-	else
-		return ControlFlow::FlowOut;
-}
-
-bool TerminationFinder::containsNonContinuingFunctionCall(Expression const& _expr)
-{
-	if (auto functionCall = std::get_if<FunctionCall>(&_expr))
-	{
-		for (auto const& arg: functionCall->arguments)
-			if (containsNonContinuingFunctionCall(arg))
-				return true;
-
-		if (auto builtin = m_dialect.builtin(functionCall->functionName.name))
-			return !builtin->controlFlowSideEffects.canContinue;
-		else if (m_functionSideEffects && m_functionSideEffects->count(functionCall->functionName.name))
-			return !m_functionSideEffects->at(functionCall->functionName.name).canContinue;
-	}
-	return false;
-}
diff --git a/libyul/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
deleted file mode 100644
index 762c80110618..000000000000
--- a/libyul/optimiser/Semantics.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST walkers that collect semantical facts.
- */
-
-#pragma once
-
-#include <libyul/AST.h>
-#include <libyul/Object.h>
-#include <libyul/SideEffects.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Specific AST walker that determines side-effect free-ness and movability of code.
- * Enters into function definitions.
- */
-class SideEffectsCollector: public ASTWalker
-{
-public:
-	explicit SideEffectsCollector(
-		Dialect const& _dialect,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
-	): m_dialect(_dialect), m_functionSideEffects(_functionSideEffects) {}
-	SideEffectsCollector(
-		Dialect const& _dialect,
-		Expression const& _expression,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
-	);
-	SideEffectsCollector(Dialect const& _dialect, Statement const& _statement);
-	SideEffectsCollector(
-		Dialect const& _dialect,
-		Block const& _ast,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
-	);
-	SideEffectsCollector(
-		Dialect const& _dialect,
-		ForLoop const& _ast,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
-	);
-
-	using ASTWalker::operator();
-	void operator()(FunctionCall const& _functionCall) override;
-
-	bool movable() const { return m_sideEffects.movable; }
-
-	bool movableRelativeTo(SideEffects const& _other, bool _codeContainsMSize)
-	{
-		if (!m_sideEffects.cannotLoop)
-			return false;
-
-		if (m_sideEffects.movable)
-			return true;
-
-		if (
-			!m_sideEffects.movableApartFromEffects ||
-			m_sideEffects.storage == SideEffects::Write ||
-			m_sideEffects.otherState == SideEffects::Write ||
-			m_sideEffects.memory == SideEffects::Write
-		)
-			return false;
-
-		if (m_sideEffects.otherState == SideEffects::Read)
-			if (_other.otherState == SideEffects::Write)
-				return false;
-
-		if (m_sideEffects.storage == SideEffects::Read)
-			if (_other.storage == SideEffects::Write)
-				return false;
-
-		if (m_sideEffects.memory == SideEffects::Read)
-			if (_codeContainsMSize || _other.memory == SideEffects::Write)
-				return false;
-
-		return true;
-	}
-
-	bool canBeRemoved(bool _allowMSizeModification = false) const
-	{
-		if (_allowMSizeModification)
-			return m_sideEffects.canBeRemovedIfNoMSize;
-		else
-			return m_sideEffects.canBeRemoved;
-	}
-	bool cannotLoop() const { return m_sideEffects.cannotLoop; }
-	bool invalidatesStorage() const { return m_sideEffects.storage == SideEffects::Write; }
-	bool invalidatesMemory() const { return m_sideEffects.memory == SideEffects::Write; }
-
-	SideEffects sideEffects() { return m_sideEffects; }
-
-private:
-	Dialect const& m_dialect;
-	std::map<YulString, SideEffects> const* m_functionSideEffects = nullptr;
-	SideEffects m_sideEffects;
-};
-
-/**
- * This class can be used to determine the side-effects of user-defined functions.
- *
- * It is given a dialect and a mapping that represents the direct calls from user-defined
- * functions to other user-defined functions and built-in functions.
- */
-class SideEffectsPropagator
-{
-public:
-	static std::map<YulString, SideEffects> sideEffects(
-		Dialect const& _dialect,
-		CallGraph const& _directCallGraph
-	);
-};
-
-/**
- * Class that can be used to find out if certain code contains the MSize instruction
- * or a verbatim bytecode builtin (which is always assumed that it could contain MSize).
- *
- * Note that this is a purely syntactic property meaning that even if this is false,
- * the code can still contain calls to functions that contain the msize instruction.
- *
- * The only safe way to determine this is by passing the full AST.
- */
-class MSizeFinder: public ASTWalker
-{
-public:
-	static bool containsMSize(Dialect const& _dialect, Block const& _ast);
-	static bool containsMSize(Dialect const& _dialect, Object const& _object);
-
-	using ASTWalker::operator();
-	void operator()(FunctionCall const& _funCall) override;
-
-private:
-	MSizeFinder(Dialect const& _dialect): m_dialect(_dialect) {}
-	Dialect const& m_dialect;
-	bool m_msizeFound = false;
-};
-
-/**
- * Class that can be used to find out if the given function contains the ``leave`` statement.
- *
- * Returns true even in the case where the function definition contains another function definition
- * that contains the leave statement.
- */
-class LeaveFinder: public ASTWalker
-{
-public:
-	static bool containsLeave(FunctionDefinition const& _fun)
-	{
-		LeaveFinder f;
-		f(_fun);
-		return f.m_leaveFound;
-	}
-
-	using ASTWalker::operator();
-	void operator()(Leave const&) override { m_leaveFound = true; }
-
-private:
-	LeaveFinder() = default;
-
-	bool m_leaveFound = false;
-};
-
-/**
- * Specific AST walker that determines whether an expression is movable
- * and collects the referenced variables.
- * Can only be used on expressions.
- */
-class MovableChecker: public SideEffectsCollector
-{
-public:
-	explicit MovableChecker(
-		Dialect const& _dialect,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
-	): SideEffectsCollector(_dialect, _functionSideEffects) {}
-	MovableChecker(Dialect const& _dialect, Expression const& _expression);
-
-	void operator()(Identifier const& _identifier) override;
-
-	/// Disallow visiting anything apart from Expressions (this throws).
-	void visit(Statement const&) override;
-	using ASTWalker::visit;
-
-	std::set<YulString> const& referencedVariables() const { return m_variableReferences; }
-
-private:
-	/// Which variables the current expression references.
-	std::set<YulString> m_variableReferences;
-};
-
-struct ControlFlowSideEffects;
-
-/**
- * Helper class to find "irregular" control flow.
- * This includes termination, break, continue and leave.
- * In general, it is applied only to "simple" statements. The control-flow
- * of loops, switches and if statements is always "FlowOut" with the assumption
- * that the caller will descend into them.
- */
-class TerminationFinder
-{
-public:
-	/// "Terminate" here means that there is no continuing control-flow.
-	/// If this is applied to a function that can revert or stop, but can also
-	/// exit regularly, the property is set to "FlowOut".
-	enum class ControlFlow { FlowOut, Break, Continue, Terminate, Leave };
-
-	TerminationFinder(
-		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> const* _functionSideEffects = nullptr
-	): m_dialect(_dialect), m_functionSideEffects(_functionSideEffects) {}
-
-	/// @returns the index of the first statement in the provided sequence
-	/// that is an unconditional ``break``, ``continue``, ``leave`` or a
-	/// call to a terminating function.
-	/// If control flow can continue at the end of the list,
-	/// returns `FlowOut` and ``size_t(-1)``.
-	/// The function might return ``FlowOut`` even though control
-	/// flow cannot actually continue.
-	std::pair<ControlFlow, size_t> firstUnconditionalControlFlowChange(
-		std::vector<Statement> const& _statements
-	);
-
-	/// @returns the control flow type of the given statement.
-	/// This function could return FlowOut even if control flow never continues.
-	ControlFlow controlFlowKind(Statement const& _statement);
-
-	/// @returns true if the expression contains a
-	/// call to a terminating function, i.e. a function that does not have
-	/// a regular "flow out" control-flow (it might also be recursive).
-	bool containsNonContinuingFunctionCall(Expression const& _expr);
-
-private:
-	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> const* m_functionSideEffects;
-};
-
-}
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
deleted file mode 100644
index f8bbcf678a1c..000000000000
--- a/libyul/optimiser/SimplificationRules.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Module for applying replacement rules against Expressions.
- */
-
-#include <libyul/optimiser/SimplificationRules.h>
-
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/SyntacticalEquality.h>
-
-#include <libevmasm/RuleList.h>
-#include <libsolutil/StringUtils.h>
-
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-
-SimplificationRules::Rule const* SimplificationRules::findFirstMatch(
-	Expression const& _expr,
-	Dialect const& _dialect,
-	std::function<AssignedValue const*(YulString)> const& _ssaValues
-)
-{
-	auto instruction = instructionAndArguments(_dialect, _expr);
-	if (!instruction)
-		return nullptr;
-
-	static std::map<std::optional<EVMVersion>, std::unique_ptr<SimplificationRules>> evmRules;
-
-	std::optional<EVMVersion> version;
-	if (yul::EVMDialect const* evmDialect = dynamic_cast<yul::EVMDialect const*>(&_dialect))
-		version = evmDialect->evmVersion();
-
-	if (!evmRules[version])
-		evmRules[version] = std::make_unique<SimplificationRules>(version);
-
-	SimplificationRules& rules = *evmRules[version];
-	assertThrow(rules.isInitialized(), OptimizerException, "Rule list not properly initialized.");
-
-	for (auto const& rule: rules.m_rules[uint8_t(instruction->first)])
-	{
-		rules.resetMatchGroups();
-		if (rule.pattern.matches(_expr, _dialect, _ssaValues))
-			if (!rule.feasible || rule.feasible())
-				return &rule;
-	}
-	return nullptr;
-}
-
-bool SimplificationRules::isInitialized() const
-{
-	return !m_rules[uint8_t(evmasm::Instruction::ADD)].empty();
-}
-
-std::optional<std::pair<evmasm::Instruction, std::vector<Expression> const*>>
-	SimplificationRules::instructionAndArguments(Dialect const& _dialect, Expression const& _expr)
-{
-	if (std::holds_alternative<FunctionCall>(_expr))
-		if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
-			if (auto const* builtin = dialect->builtin(std::get<FunctionCall>(_expr).functionName.name))
-				if (builtin->instruction)
-					return std::make_pair(*builtin->instruction, &std::get<FunctionCall>(_expr).arguments);
-
-	return {};
-}
-
-void SimplificationRules::addRules(std::vector<Rule> const& _rules)
-{
-	for (auto const& r: _rules)
-		addRule(r);
-}
-
-void SimplificationRules::addRule(Rule const& _rule)
-{
-	m_rules[uint8_t(_rule.pattern.instruction())].push_back(_rule);
-}
-
-SimplificationRules::SimplificationRules(std::optional<langutil::EVMVersion> _evmVersion)
-{
-	// Multiple occurrences of one of these inside one rule must match the same equivalence class.
-	// Constants.
-	Pattern A(PatternKind::Constant);
-	Pattern B(PatternKind::Constant);
-	Pattern C(PatternKind::Constant);
-	// Anything.
-	Pattern W;
-	Pattern X;
-	Pattern Y;
-	Pattern Z;
-	A.setMatchGroup(1, m_matchGroups);
-	B.setMatchGroup(2, m_matchGroups);
-	C.setMatchGroup(3, m_matchGroups);
-	W.setMatchGroup(4, m_matchGroups);
-	X.setMatchGroup(5, m_matchGroups);
-	Y.setMatchGroup(6, m_matchGroups);
-	Z.setMatchGroup(7, m_matchGroups);
-
-	addRules(simplificationRuleList(_evmVersion, A, B, C, W, X, Y, Z));
-	assertThrow(isInitialized(), OptimizerException, "Rule list not properly initialized.");
-}
-
-yul::Pattern::Pattern(evmasm::Instruction _instruction, std::initializer_list<Pattern> _arguments):
-	m_kind(PatternKind::Operation),
-	m_instruction(_instruction),
-	m_arguments(_arguments)
-{
-}
-
-void Pattern::setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups)
-{
-	m_matchGroup = _group;
-	m_matchGroups = &_matchGroups;
-}
-
-bool Pattern::matches(
-	Expression const& _expr,
-	Dialect const& _dialect,
-	std::function<AssignedValue const*(YulString)> const& _ssaValues
-) const
-{
-	Expression const* expr = &_expr;
-
-	// Resolve the variable if possible.
-	// Do not do it for "Any" because we can check identity better for variables.
-	if (m_kind != PatternKind::Any && std::holds_alternative<Identifier>(_expr))
-	{
-		YulString varName = std::get<Identifier>(_expr).name;
-		if (AssignedValue const* value = _ssaValues(varName))
-			if (Expression const* new_expr = value->value)
-				expr = new_expr;
-	}
-	assertThrow(expr, OptimizerException, "");
-
-	if (m_kind == PatternKind::Constant)
-	{
-		if (!std::holds_alternative<Literal>(*expr))
-			return false;
-		Literal const& literal = std::get<Literal>(*expr);
-		if (literal.kind != LiteralKind::Number)
-			return false;
-		if (m_data && *m_data != u256(literal.value.str()))
-			return false;
-		assertThrow(m_arguments.empty(), OptimizerException, "");
-	}
-	else if (m_kind == PatternKind::Operation)
-	{
-		auto instrAndArgs = SimplificationRules::instructionAndArguments(_dialect, *expr);
-		if (!instrAndArgs || m_instruction != instrAndArgs->first)
-			return false;
-		assertThrow(m_arguments.size() == instrAndArgs->second->size(), OptimizerException, "");
-		for (size_t i = 0; i < m_arguments.size(); ++i)
-		{
-			Expression const& arg = instrAndArgs->second->at(i);
-			// If this is a direct function call instead of a variable or literal,
-			// we reject the match because side-effects could prevent us from
-			// arbitrarily modifying the code.
-			if (
-				std::holds_alternative<FunctionCall>(arg) ||
-				!m_arguments[i].matches(arg, _dialect, _ssaValues)
-			)
-				return false;
-		}
-	}
-	else
-	{
-		assertThrow(m_arguments.empty(), OptimizerException, "\"Any\" should not have arguments.");
-		assertThrow(!std::holds_alternative<FunctionCall>(*expr), OptimizerException, "\"Any\" at top-level.");
-	}
-
-	if (m_matchGroup)
-	{
-		// We support matching multiple expressions that require the same value
-		// based on identical ASTs, which have to be movable.
-
-		// TODO: add tests:
-		// - { let x := mload(0) let y := and(x, x) }
-		// - { let x := 4 let y := and(x, y) }
-
-		// This code uses `_expr` again for "Any", because we want the comparison to be done
-		// on the variables and not their values.
-		// The assumption is that CSE or local value numbering has been done prior to this step.
-
-		if (m_matchGroups->count(m_matchGroup))
-		{
-			assertThrow(m_kind == PatternKind::Any, OptimizerException, "Match group repetition for non-any.");
-			Expression const* firstMatch = (*m_matchGroups)[m_matchGroup];
-			assertThrow(firstMatch, OptimizerException, "Match set but to null.");
-			assertThrow(
-				!std::holds_alternative<FunctionCall>(_expr) &&
-				!std::holds_alternative<FunctionCall>(*firstMatch),
-				OptimizerException,
-				"Group matches have to be literals or variables."
-			);
-
-			return SyntacticallyEqual{}(*firstMatch, _expr);
-		}
-		else if (m_kind == PatternKind::Any)
-			(*m_matchGroups)[m_matchGroup] = &_expr;
-		else
-		{
-			assertThrow(m_kind == PatternKind::Constant, OptimizerException, "Match group set for operation.");
-			// We do not use _expr here, because we want the actual number.
-			(*m_matchGroups)[m_matchGroup] = expr;
-		}
-	}
-	return true;
-}
-
-evmasm::Instruction Pattern::instruction() const
-{
-	assertThrow(m_kind == PatternKind::Operation, OptimizerException, "");
-	return m_instruction;
-}
-
-Expression Pattern::toExpression(std::shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const
-{
-	if (matchGroup())
-		return ASTCopier().translate(matchGroupValue());
-	if (m_kind == PatternKind::Constant)
-	{
-		assertThrow(m_data, OptimizerException, "No match group and no constant value given.");
-		return Literal{_debugData, LiteralKind::Number, YulString{formatNumber(*m_data)}, {}};
-	}
-	else if (m_kind == PatternKind::Operation)
-	{
-		std::vector<Expression> arguments;
-		for (auto const& arg: m_arguments)
-			arguments.emplace_back(arg.toExpression(_debugData, _evmVersion));
-
-		std::string name = util::toLower(instructionInfo(m_instruction, _evmVersion).name);
-
-		return FunctionCall{_debugData,
-			Identifier{_debugData, YulString{name}},
-			std::move(arguments)
-		};
-	}
-	assertThrow(false, OptimizerException, "Pattern of kind 'any', but no match group.");
-}
-
-u256 Pattern::d() const
-{
-	return valueOfNumberLiteral(std::get<Literal>(matchGroupValue()));
-}
-
-Expression const& Pattern::matchGroupValue() const
-{
-	assertThrow(m_matchGroup > 0, OptimizerException, "");
-	assertThrow(!!m_matchGroups, OptimizerException, "");
-	assertThrow((*m_matchGroups)[m_matchGroup], OptimizerException, "");
-	return *(*m_matchGroups)[m_matchGroup];
-}
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
deleted file mode 100644
index e36730f05425..000000000000
--- a/libyul/optimiser/SimplificationRules.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Module for applying replacement rules against Expressions.
- */
-
-#pragma once
-
-#include <libevmasm/SimplificationRule.h>
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/SourceLocation.h>
-
-#include <functional>
-#include <optional>
-#include <vector>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct AssignedValue;
-class Pattern;
-
-/**
- * Container for all simplification rules.
- */
-class SimplificationRules
-{
-public:
-	/// Noncopiable.
-	SimplificationRules(SimplificationRules const&) = delete;
-	SimplificationRules& operator=(SimplificationRules const&) = delete;
-
-	using Rule = evmasm::SimplificationRule<Pattern>;
-
-	explicit SimplificationRules(std::optional<langutil::EVMVersion> _evmVersion = std::nullopt);
-
-	/// @returns a pointer to the first matching pattern and sets the match
-	/// groups accordingly.
-	/// @param _ssaValues values of variables that are assigned exactly once.
-	static Rule const* findFirstMatch(
-		Expression const& _expr,
-		Dialect const& _dialect,
-		std::function<AssignedValue const*(YulString)> const& _ssaValues
-	);
-
-	/// Checks whether the rulelist is non-empty. This is usually enforced
-	/// by the constructor, but we had some issues with static initialization.
-	bool isInitialized() const;
-
-	static std::optional<std::pair<evmasm::Instruction, std::vector<Expression> const*>>
-	instructionAndArguments(Dialect const& _dialect, Expression const& _expr);
-
-private:
-	void addRules(std::vector<Rule> const& _rules);
-	void addRule(Rule const& _rule);
-
-	void resetMatchGroups() { m_matchGroups.clear(); }
-
-	std::map<unsigned, Expression const*> m_matchGroups;
-	std::vector<evmasm::SimplificationRule<Pattern>> m_rules[256];
-};
-
-enum class PatternKind
-{
-	Operation,
-	Constant,
-	Any
-};
-
-/**
- * Pattern to match against an expression.
- * Also stores matched expressions to retrieve them later, for constructing new expressions using
- * ExpressionTemplate.
- */
-class Pattern
-{
-public:
-	using Builtins = evmasm::EVMBuiltins<Pattern>;
-	static constexpr size_t WordSize = 256;
-	using Word = u256;
-
-	/// Matches any expression.
-	Pattern(PatternKind _kind = PatternKind::Any): m_kind(_kind) {}
-	// Matches a specific constant value.
-	Pattern(unsigned _value): Pattern(u256(_value)) {}
-	Pattern(int _value): Pattern(u256(_value)) {}
-	Pattern(long unsigned _value): Pattern(u256(_value)) {}
-	// Matches a specific constant value.
-	Pattern(u256 const& _value): m_kind(PatternKind::Constant), m_data(std::make_shared<u256>(_value)) {}
-	// Matches a given instruction with given arguments
-	Pattern(evmasm::Instruction _instruction, std::initializer_list<Pattern> _arguments = {});
-	/// Sets this pattern to be part of the match group with the identifier @a _group.
-	/// Inside one rule, all patterns in the same match group have to match expressions from the
-	/// same expression equivalence class.
-	void setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups);
-	unsigned matchGroup() const { return m_matchGroup; }
-	bool matches(
-		Expression const& _expr,
-		Dialect const& _dialect,
-		std::function<AssignedValue const*(YulString)> const& _ssaValues
-	) const;
-
-	std::vector<Pattern> arguments() const { return m_arguments; }
-
-	/// @returns the data of the matched expression if this pattern is part of a match group.
-	u256 d() const;
-
-	evmasm::Instruction instruction() const;
-
-	/// Turns this pattern into an actual expression. Should only be called
-	/// for patterns resulting from an action, i.e. with match groups assigned.
-	Expression toExpression(std::shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const;
-
-private:
-	Expression const& matchGroupValue() const;
-
-	PatternKind m_kind = PatternKind::Any;
-	evmasm::Instruction m_instruction; ///< Only valid if m_kind is Operation
-	std::shared_ptr<u256> m_data; ///< Only valid if m_kind is Constant
-	std::vector<Pattern> m_arguments;
-	unsigned m_matchGroup = 0;
-	std::map<unsigned, Expression const*>* m_matchGroups = nullptr;
-};
-
-}
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
deleted file mode 100644
index 87a5e411c5e2..000000000000
--- a/libyul/optimiser/StackCompressor.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Optimisation stage that aggressively rematerializes certain variables ina a function to free
- * space on the stack until it is compilable.
- */
-
-#include <libyul/optimiser/StackCompressor.h>
-
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/Rematerialiser.h>
-#include <libyul/optimiser/UnusedPruner.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/Semantics.h>
-
-#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
-#include <libyul/backends/evm/StackHelpers.h>
-#include <libyul/backends/evm/StackLayoutGenerator.h>
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-
-#include <libyul/CompilabilityChecker.h>
-
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-namespace
-{
-
-/**
- * Class that discovers all variables that can be fully eliminated by rematerialization,
- * and the corresponding approximate costs.
- *
- * Prerequisite: Disambiguator, Function Grouper
- */
-class RematCandidateSelector: public DataFlowAnalyzer
-{
-public:
-	explicit RematCandidateSelector(Dialect const& _dialect): DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore) {}
-
-	/// @returns a map from function name to rematerialisation costs to a vector of variables to rematerialise
-	/// and variables that occur in their expression.
-	/// While the map is sorted by cost, the contained vectors are sorted by the order of occurrence.
-	std::map<YulString, std::map<size_t, std::vector<YulString>>> candidates()
-	{
-		std::map<YulString, std::map<size_t, std::vector<YulString>>> cand;
-		for (auto const& [functionName, candidate]: m_candidates)
-		{
-			if (size_t const* cost = util::valueOrNullptr(m_expressionCodeCost, candidate))
-			{
-				size_t numRef = m_numReferences[candidate];
-				cand[functionName][*cost * numRef].emplace_back(candidate);
-			}
-		}
-		return cand;
-	}
-
-	using DataFlowAnalyzer::operator();
-	void operator()(FunctionDefinition& _function) override
-	{
-		yulAssert(m_currentFunctionName.empty());
-		m_currentFunctionName = _function.name;
-		DataFlowAnalyzer::operator()(_function);
-		m_currentFunctionName = {};
-	}
-
-	void operator()(VariableDeclaration& _varDecl) override
-	{
-		DataFlowAnalyzer::operator()(_varDecl);
-		if (_varDecl.variables.size() == 1)
-		{
-			YulString varName = _varDecl.variables.front().name;
-			if (AssignedValue const* value = variableValue(varName))
-			{
-				yulAssert(!m_expressionCodeCost.count(varName), "");
-				m_candidates.emplace_back(m_currentFunctionName, varName);
-				m_expressionCodeCost[varName] = CodeCost::codeCost(m_dialect, *value->value);
-			}
-		}
-	}
-
-	void operator()(Assignment& _assignment) override
-	{
-		for (auto const& var: _assignment.variableNames)
-			rematImpossible(var.name);
-		DataFlowAnalyzer::operator()(_assignment);
-	}
-
-	// We use visit(Expression) because operator()(Identifier) would also
-	// get called on left-hand-sides of assignments.
-	void visit(Expression& _e) override
-	{
-		if (std::holds_alternative<Identifier>(_e))
-		{
-			YulString name = std::get<Identifier>(_e).name;
-			if (m_expressionCodeCost.count(name))
-			{
-				if (!variableValue(name))
-					rematImpossible(name);
-				else
-					++m_numReferences[name];
-			}
-		}
-		DataFlowAnalyzer::visit(_e);
-	}
-
-	/// Remove the variable from the candidate set.
-	void rematImpossible(YulString _variable)
-	{
-		m_numReferences.erase(_variable);
-		m_expressionCodeCost.erase(_variable);
-	}
-
-	YulString m_currentFunctionName = {};
-
-	/// All candidate variables by function name, in order of occurrence.
-	std::vector<std::pair<YulString, YulString>> m_candidates;
-	/// Candidate variables and the code cost of their value.
-	std::map<YulString, size_t> m_expressionCodeCost;
-	/// Number of references to each candidate variable.
-	std::map<YulString, size_t> m_numReferences;
-};
-
-/// Selects at most @a _numVariables among @a _candidates.
-std::set<YulString> chooseVarsToEliminate(
-	std::map<size_t, std::vector<YulString>> const& _candidates,
-	size_t _numVariables
-)
-{
-	std::set<YulString> varsToEliminate;
-	for (auto&& [cost, candidates]: _candidates)
-		for (auto&& candidate: candidates)
-		{
-			if (varsToEliminate.size() >= _numVariables)
-				return varsToEliminate;
-			varsToEliminate.insert(candidate);
-		}
-	return varsToEliminate;
-}
-
-void eliminateVariables(
-	Dialect const& _dialect,
-	Block& _ast,
-	std::map<YulString, int> const& _numVariables,
-	bool _allowMSizeOptimization
-)
-{
-	RematCandidateSelector selector{_dialect};
-	selector(_ast);
-	std::map<YulString, std::map<size_t, std::vector<YulString>>> candidates = selector.candidates();
-
-	std::set<YulString> varsToEliminate;
-	for (auto const& [functionName, numVariables]: _numVariables)
-	{
-		yulAssert(numVariables > 0);
-		varsToEliminate += chooseVarsToEliminate(candidates[functionName], static_cast<size_t>(numVariables));
-	}
-
-	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate));
-	// Do not remove functions.
-	std::set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
-	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
-}
-
-void eliminateVariablesOptimizedCodegen(
-	Dialect const& _dialect,
-	Block& _ast,
-	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _unreachables,
-	bool _allowMSizeOptimization
-)
-{
-	if (std::all_of(_unreachables.begin(), _unreachables.end(), [](auto const& _item) { return _item.second.empty(); }))
-		return;
-
-	RematCandidateSelector selector{_dialect};
-	selector(_ast);
-
-	std::map<YulString, size_t> candidates;
-	for (auto const& [functionName, candidatesInFunction]: selector.candidates())
-		for (auto [cost, candidatesWithCost]: candidatesInFunction)
-			for (auto candidate: candidatesWithCost)
-				candidates[candidate] = cost;
-
-	std::set<YulString> varsToEliminate;
-
-	// TODO: this currently ignores the fact that variables may reference other variables we want to eliminate.
-	for (auto const& [functionName, unreachables]: _unreachables)
-		for (auto const& unreachable: unreachables)
-		{
-			std::map<size_t, std::vector<YulString>> suitableCandidates;
-			size_t neededSlots = unreachable.deficit;
-			for (auto varName: unreachable.variableChoices)
-			{
-				if (varsToEliminate.count(varName))
-					--neededSlots;
-				else if (size_t* cost = util::valueOrNullptr(candidates, varName))
-					if (!util::contains(suitableCandidates[*cost], varName))
-						suitableCandidates[*cost].emplace_back(varName);
-			}
-			for (auto candidatesByCost: suitableCandidates)
-			{
-				for (auto candidate: candidatesByCost.second)
-					if (neededSlots--)
-						varsToEliminate.emplace(candidate);
-					else
-						break;
-				if (!neededSlots)
-					break;
-			}
-		}
-	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate), true);
-	// Do not remove functions.
-	std::set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
-	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
-}
-
-}
-
-bool StackCompressor::run(
-	Dialect const& _dialect,
-	Object& _object,
-	bool _optimizeStackAllocation,
-	size_t _maxIterations
-)
-{
-	yulAssert(
-		_object.code &&
-		_object.code->statements.size() > 0 && std::holds_alternative<Block>(_object.code->statements.at(0)),
-		"Need to run the function grouper before the stack compressor."
-	);
-	bool usesOptimizedCodeGenerator = false;
-	if (auto evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
-		usesOptimizedCodeGenerator =
-			_optimizeStackAllocation &&
-			evmDialect->evmVersion().canOverchargeGasForCall() &&
-			evmDialect->providesObjectAccess();
-	bool allowMSizeOptimzation = !MSizeFinder::containsMSize(_dialect, *_object.code);
-	if (usesOptimizedCodeGenerator)
-	{
-		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
-		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, *_object.code);
-		eliminateVariablesOptimizedCodegen(
-			_dialect,
-			*_object.code,
-			StackLayoutGenerator::reportStackTooDeep(*cfg),
-			allowMSizeOptimzation
-		);
-	}
-	else
-		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
-		{
-			std::map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
-			if (stackSurplus.empty())
-				return true;
-			eliminateVariables(
-				_dialect,
-				*_object.code,
-				stackSurplus,
-				allowMSizeOptimzation
-			);
-		}
-	return false;
-}
-
diff --git a/libyul/optimiser/StackCompressor.h b/libyul/optimiser/StackCompressor.h
deleted file mode 100644
index d18618667f71..000000000000
--- a/libyul/optimiser/StackCompressor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that aggressively rematerializes certain variables ina a function to free
- * space on the stack until it is compilable.
- */
-
-#pragma once
-
-#include <libyul/Object.h>
-
-#include <memory>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-struct Object;
-struct FunctionDefinition;
-
-/**
- * Optimisation stage that aggressively rematerializes certain variables in a function to free
- * space on the stack until it is compilable.
- *
- * Only runs on the code of the object itself, does not descend into sub-objects.
- *
- * Prerequisite: Disambiguator, Function Grouper
- */
-class StackCompressor
-{
-public:
-	/// Try to remove local variables until the AST is compilable.
-	/// @returns true if it was successful.
-	static bool run(
-		Dialect const& _dialect,
-		Object& _object,
-		bool _optimizeStackAllocation,
-		size_t _maxIterations
-	);
-};
-
-}
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
deleted file mode 100644
index 5d7f7fe5d430..000000000000
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <libyul/optimiser/StackLimitEvader.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/StackToMemoryMover.h>
-#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AST.h>
-#include <libyul/CompilabilityChecker.h>
-#include <libyul/Exceptions.h>
-#include <libyul/Object.h>
-#include <libyul/Utilities.h>
-#include <libsolutil/Algorithms.h>
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/concat.hpp>
-#include <range/v3/view/take.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-namespace
-{
-/**
- * Walks the call graph using a Depth-First-Search assigning memory slots to variables.
- * - The leaves of the call graph will get the lowest slot, increasing towards the root.
- * - ``slotsRequiredForFunction`` maps a function to the number of slots it requires (which is also the
- *   next available slot that can be used by another function that calls this function).
- * - For each function starting from the root of the call graph:
- * - Visit all children that are not already visited.
- * - Determine the maximum value ``n`` of the values of ``slotsRequiredForFunction`` among the children.
- * - If the function itself contains variables that need memory slots, but is contained in a cycle,
- *   abort the process as failure.
- * - If not, assign each variable its slot starting from ``n`` (incrementing it).
- * - Assign ``n`` to ``slotsRequiredForFunction`` of the function.
- */
-struct MemoryOffsetAllocator
-{
-	uint64_t run(YulString _function = YulString{})
-	{
-		if (slotsRequiredForFunction.count(_function))
-			return slotsRequiredForFunction[_function];
-
-		// Assign to zero early to guard against recursive calls.
-		slotsRequiredForFunction[_function] = 0;
-
-		uint64_t requiredSlots = 0;
-		if (callGraph.count(_function))
-			for (YulString child: callGraph.at(_function))
-				requiredSlots = std::max(run(child), requiredSlots);
-
-		if (auto const* unreachables = util::valueOrNullptr(unreachableVariables, _function))
-		{
-			if (FunctionDefinition const* functionDefinition = util::valueOrDefault(functionDefinitions, _function, nullptr, util::allow_copy))
-				if (
-					size_t totalArgCount = functionDefinition->returnVariables.size() + functionDefinition->parameters.size();
-					totalArgCount > 16
-				)
-					for (TypedName const& var: ranges::concat_view(
-						functionDefinition->parameters,
-						functionDefinition->returnVariables
-					) | ranges::views::take(totalArgCount - 16))
-						slotAllocations[var.name] = requiredSlots++;
-
-			// Assign slots for all variables that become unreachable in the function body, if the above did not
-			// assign a slot for them already.
-			for (YulString variable: *unreachables)
-				// The empty case is a function with too many arguments or return values,
-				// which was already handled above.
-				if (!variable.empty() && !slotAllocations.count(variable))
-					slotAllocations[variable] = requiredSlots++;
-		}
-
-		return slotsRequiredForFunction[_function] = requiredSlots;
-	}
-
-	/// Maps function names to the set of unreachable variables in that function.
-	/// An empty variable name means that the function has too many arguments or return variables.
-	std::map<YulString, std::vector<YulString>> const& unreachableVariables;
-	/// The graph of immediate function calls of all functions.
-	std::map<YulString, std::vector<YulString>> const& callGraph;
-	/// Maps the name of each user-defined function to its definition.
-	std::map<YulString, FunctionDefinition const*> const& functionDefinitions;
-
-	/// Maps variable names to the memory slot the respective variable is assigned.
-	std::map<YulString, uint64_t> slotAllocations{};
-	/// Maps function names to the number of memory slots the respective function requires.
-	std::map<YulString, uint64_t> slotsRequiredForFunction{};
-};
-
-u256 literalArgumentValue(FunctionCall const& _call)
-{
-	yulAssert(_call.arguments.size() == 1, "");
-	Literal const* literal = std::get_if<Literal>(&_call.arguments.front());
-	yulAssert(literal && literal->kind == LiteralKind::Number, "");
-	return valueOfLiteral(*literal);
-}
-}
-
-void StackLimitEvader::run(
-	OptimiserStepContext& _context,
-	Object& _object
-)
-{
-	auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
-	yulAssert(
-		evmDialect && evmDialect->providesObjectAccess(),
-		"StackLimitEvader can only be run on objects using the EVMDialect with object access."
-	);
-	if (evmDialect && evmDialect->evmVersion().canOverchargeGasForCall())
-	{
-		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, _object);
-		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, *_object.code);
-		run(_context, _object, StackLayoutGenerator::reportStackTooDeep(*cfg));
-	}
-	else
-		run(_context, _object, CompilabilityChecker{
-			_context.dialect,
-			_object,
-			true
-		}.unreachableVariables);
-
-}
-
-void StackLimitEvader::run(
-	OptimiserStepContext& _context,
-	Object& _object,
-	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
-)
-{
-	std::map<YulString, std::vector<YulString>> unreachableVariables;
-	for (auto&& [function, stackTooDeepErrors]: _stackTooDeepErrors)
-	{
-		auto& unreachables = unreachableVariables[function];
-		// TODO: choose wisely.
-		for (auto const& stackTooDeepError: stackTooDeepErrors)
-			for (auto variable: stackTooDeepError.variableChoices | ranges::views::take(stackTooDeepError.deficit))
-				if (!util::contains(unreachables, variable))
-					unreachables.emplace_back(variable);
-	}
-	run(_context, _object, unreachableVariables);
-}
-
-void StackLimitEvader::run(
-	OptimiserStepContext& _context,
-	Object& _object,
-	std::map<YulString, std::vector<YulString>> const& _unreachableVariables
-)
-{
-	yulAssert(_object.code, "");
-	auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
-	yulAssert(
-		evmDialect && evmDialect->providesObjectAccess(),
-		"StackLimitEvader can only be run on objects using the EVMDialect with object access."
-	);
-
-	std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
-		*_object.code,
-		"memoryguard"_yulstring
-	);
-	// Do not optimise, if no ``memoryguard`` call is found.
-	if (memoryGuardCalls.empty())
-		return;
-
-	// Make sure all calls to ``memoryguard`` we found have the same value as argument (otherwise, abort).
-	u256 reservedMemory = literalArgumentValue(*memoryGuardCalls.front());
-	yulAssert(reservedMemory < u256(1) << 32 - 1, "");
-
-	for (FunctionCall const* memoryGuardCall: memoryGuardCalls)
-		if (reservedMemory != literalArgumentValue(*memoryGuardCall))
-			return;
-
-	CallGraph callGraph = CallGraphGenerator::callGraph(*_object.code);
-
-	// We cannot move variables in recursive functions to fixed memory offsets.
-	for (YulString function: callGraph.recursiveFunctions())
-		if (_unreachableVariables.count(function))
-			return;
-
-	std::map<YulString, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
-
-	MemoryOffsetAllocator memoryOffsetAllocator{_unreachableVariables, callGraph.functionCalls, functionDefinitions};
-	uint64_t requiredSlots = memoryOffsetAllocator.run();
-	yulAssert(requiredSlots < (uint64_t(1) << 32) - 1, "");
-
-	StackToMemoryMover::run(_context, reservedMemory, memoryOffsetAllocator.slotAllocations, requiredSlots, *_object.code);
-
-	reservedMemory += 32 * requiredSlots;
-	for (FunctionCall* memoryGuardCall: FunctionCallFinder::run(*_object.code, "memoryguard"_yulstring))
-	{
-		Literal* literal = std::get_if<Literal>(&memoryGuardCall->arguments.front());
-		yulAssert(literal && literal->kind == LiteralKind::Number, "");
-		literal->value = YulString{toCompactHexWithPrefix(reservedMemory)};
-	}
-}
diff --git a/libyul/optimiser/StackLimitEvader.h b/libyul/optimiser/StackLimitEvader.h
deleted file mode 100644
index 025553200f05..000000000000
--- a/libyul/optimiser/StackLimitEvader.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Optimisation stage that assigns memory offsets to variables that would become unreachable if
- * assigned a stack slot as usual and replaces references and assignments to them by mload and mstore calls.
- */
-
-#pragma once
-
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/backends/evm/StackLayoutGenerator.h>
-
-namespace solidity::yul
-{
-
-struct Object;
-
-/**
- * Optimisation stage that assigns memory offsets to variables that would become unreachable if
- * assigned a stack slot as usual.
- *
- * Uses CompilabilityChecker to determine which variables in which functions are unreachable.
- *
- * Only variables outside of functions contained in cycles in the call graph are considered. Thereby it is possible
- * to assign globally fixed memory offsets to the variable. If a variable in a function contained in a cycle in the
- * call graph is reported as unreachable, the process is aborted.
- *
- * Offsets are assigned to the variables, s.t. on every path through the call graph each variable gets a unique offset
- * in memory. However, distinct paths through the call graph can use the same memory offsets for their variables.
- *
- * The current arguments to the ``memoryguard`` calls are used as base memory offset and then replaced by the offset past
- * the last memory offset used for a variable on any path through the call graph.
- *
- * Finally, the StackToMemoryMover is called to actually move the variables to their offsets in memory.
- *
- * Prerequisite: Disambiguator
- */
-class StackLimitEvader
-{
-public:
-	/// @a _unreachableVariables can be determined by the CompilabilityChecker.
-	/// Can only be run on the EVM dialect with objects.
-	/// Abort and do nothing, if no ``memoryguard`` call or several ``memoryguard`` calls
-	/// with non-matching arguments are found, or if any of the @a _unreachableVariables
-	/// are contained in a recursive function.
-	static void run(
-		OptimiserStepContext& _context,
-		Object& _object,
-		std::map<YulString, std::vector<YulString>> const& _unreachableVariables
-	);
-	/// @a _stackTooDeepErrors can be determined by the StackLayoutGenerator.
-	/// Can only be run on the EVM dialect with objects.
-	/// Abort and do nothing, if no ``memoryguard`` call or several ``memoryguard`` calls
-	/// with non-matching arguments are found, or if any of the @a _stackTooDeepErrors
-	/// are contained in a recursive function.
-	static void run(
-		OptimiserStepContext& _context,
-		Object& _object,
-		std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
-	);
-	/// Determines stack too deep errors using the appropriate code generation backend.
-	/// Can only be run on the EVM dialect with objects.
-	/// Abort and do nothing, if no ``memoryguard`` call or several ``memoryguard`` calls
-	/// with non-matching arguments are found, or if any of the unreachable variables
-	/// are contained in a recursive function.
-	static void run(
-		OptimiserStepContext& _context,
-		Object& _object
-	);
-};
-
-}
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
deleted file mode 100644
index ab39669b2d9a..000000000000
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <libyul/optimiser/StackToMemoryMover.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/algorithm/none_of.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/view/transform.hpp>
-#include <range/v3/view/zip.hpp>
-#include <range/v3/range/conversion.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-namespace
-{
-std::vector<Statement> generateMemoryStore(
-	Dialect const& _dialect,
-	std::shared_ptr<DebugData const> const& _debugData,
-	YulString _mpos,
-	Expression _value
-)
-{
-	BuiltinFunction const* memoryStoreFunction = _dialect.memoryStoreFunction(_dialect.defaultType);
-	yulAssert(memoryStoreFunction, "");
-	std::vector<Statement> result;
-	result.emplace_back(ExpressionStatement{_debugData, FunctionCall{
-		_debugData,
-		Identifier{_debugData, memoryStoreFunction->name},
-		{
-			Literal{_debugData, LiteralKind::Number, _mpos, {}},
-			std::move(_value)
-		}
-	}});
-	return result;
-}
-
-FunctionCall generateMemoryLoad(Dialect const& _dialect, std::shared_ptr<DebugData const> const& _debugData, YulString _mpos)
-{
-	BuiltinFunction const* memoryLoadFunction = _dialect.memoryLoadFunction(_dialect.defaultType);
-	yulAssert(memoryLoadFunction, "");
-	return FunctionCall{
-		_debugData,
-		Identifier{_debugData, memoryLoadFunction->name}, {
-			Literal{
-				_debugData,
-				LiteralKind::Number,
-				_mpos,
-				{}
-			}
-		}
-	};
-}
-}
-
-void StackToMemoryMover::run(
-	OptimiserStepContext& _context,
-	u256 _reservedMemory,
-	std::map<YulString, uint64_t> const& _memorySlots,
-	uint64_t _numRequiredSlots,
-	Block& _block
-)
-{
-	VariableMemoryOffsetTracker memoryOffsetTracker(_reservedMemory, _memorySlots, _numRequiredSlots);
-	StackToMemoryMover stackToMemoryMover(
-		_context,
-		memoryOffsetTracker,
-		util::applyMap(
-			allFunctionDefinitions(_block),
-			util::mapTuple([](YulString _name, FunctionDefinition const* _funDef) {
-				return make_pair(_name, _funDef->returnVariables);
-			}),
-			std::map<YulString, TypedNameList>{}
-		)
-	);
-	stackToMemoryMover(_block);
-	_block.statements += std::move(stackToMemoryMover.m_newFunctionDefinitions);
-}
-
-StackToMemoryMover::StackToMemoryMover(
-	OptimiserStepContext& _context,
-	VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-	std::map<YulString, TypedNameList> _functionReturnVariables
-):
-m_context(_context),
-m_memoryOffsetTracker(_memoryOffsetTracker),
-m_nameDispenser(_context.dispenser),
-m_functionReturnVariables(std::move(_functionReturnVariables))
-{
-	auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
-	yulAssert(
-		evmDialect && evmDialect->providesObjectAccess(),
-		"StackToMemoryMover can only be run on objects using the EVMDialect with object access."
-	);
-}
-
-void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
-{
-	// It is important to first visit the function body, so that it doesn't replace the memory inits for
-	// variable arguments we might generate below.
-	ASTModifier::operator()(_functionDefinition);
-
-	std::vector<Statement> memoryVariableInits;
-
-	// All function parameters with a memory slot are moved at the beginning of the function body.
-	for (TypedName const& param: _functionDefinition.parameters)
-		if (auto slot = m_memoryOffsetTracker(param.name))
-			memoryVariableInits += generateMemoryStore(
-				m_context.dialect,
-				param.debugData,
-				*slot,
-				Identifier{param.debugData, param.name}
-			);
-
-	// All memory return variables have to be initialized to zero in memory.
-	for (TypedName const& returnVariable: _functionDefinition.returnVariables)
-		if (auto slot = m_memoryOffsetTracker(returnVariable.name))
-			memoryVariableInits += generateMemoryStore(
-				m_context.dialect,
-				returnVariable.debugData,
-				*slot,
-				Literal{returnVariable.debugData, LiteralKind::Number, "0"_yulstring, {}}
-			);
-
-	// Special case of a function with a single return argument that needs to move to memory.
-	if (_functionDefinition.returnVariables.size() == 1 && m_memoryOffsetTracker(_functionDefinition.returnVariables.front().name))
-	{
-		TypedNameList stackParameters = _functionDefinition.parameters | ranges::views::filter(
-			std::not_fn(m_memoryOffsetTracker)
-		) | ranges::to<TypedNameList>;
-		// Generate new function without return variable and with only the non-moved parameters.
-		YulString newFunctionName = m_context.dispenser.newName(_functionDefinition.name);
-		m_newFunctionDefinitions.emplace_back(FunctionDefinition{
-			_functionDefinition.debugData,
-			newFunctionName,
-			stackParameters,
-			{},
-			std::move(_functionDefinition.body)
-		});
-		// Generate new names for the arguments to maintain disambiguation.
-		std::map<YulString, YulString> newArgumentNames;
-		for (TypedName const& _var: stackParameters)
-			newArgumentNames[_var.name] = m_context.dispenser.newName(_var.name);
-		for (auto& parameter: _functionDefinition.parameters)
-			parameter.name = util::valueOrDefault(newArgumentNames, parameter.name, parameter.name);
-		// Replace original function by a call to the new function and an assignment to the return variable from memory.
-		_functionDefinition.body = Block{_functionDefinition.debugData, std::move(memoryVariableInits)};
-		_functionDefinition.body.statements.emplace_back(ExpressionStatement{
-			_functionDefinition.debugData,
-			FunctionCall{
-				_functionDefinition.debugData,
-				Identifier{_functionDefinition.debugData, newFunctionName},
-				stackParameters | ranges::views::transform([&](TypedName const& _arg) {
-					return Expression{Identifier{_arg.debugData, newArgumentNames.at(_arg.name)}};
-				}) | ranges::to<std::vector<Expression>>
-			}
-		});
-		_functionDefinition.body.statements.emplace_back(Assignment{
-			_functionDefinition.debugData,
-			{Identifier{_functionDefinition.debugData, _functionDefinition.returnVariables.front().name}},
-			std::make_unique<Expression>(generateMemoryLoad(
-				m_context.dialect,
-				_functionDefinition.debugData,
-				*m_memoryOffsetTracker(_functionDefinition.returnVariables.front().name)
-			))
-		});
-		return;
-	}
-
-	if (!memoryVariableInits.empty())
-		_functionDefinition.body.statements = std::move(memoryVariableInits) + std::move(_functionDefinition.body.statements);
-
-	_functionDefinition.returnVariables = _functionDefinition.returnVariables | ranges::views::filter(
-		std::not_fn(m_memoryOffsetTracker)
-	) | ranges::to<TypedNameList>;
-}
-
-void StackToMemoryMover::operator()(Block& _block)
-{
-	using OptionalStatements = std::optional<std::vector<Statement>>;
-
-	auto rewriteAssignmentOrVariableDeclarationLeftHandSide = [this](
-		auto& _stmt,
-		auto& _lhsVars
-	) -> OptionalStatements {
-		using StatementType = std::decay_t<decltype(_stmt)>;
-
-		auto debugData = _stmt.debugData;
-		if (_lhsVars.size() == 1)
-		{
-			if (std::optional<YulString> offset = m_memoryOffsetTracker(_lhsVars.front().name))
-				return generateMemoryStore(
-					m_context.dialect,
-					debugData,
-					*offset,
-					_stmt.value ? *std::move(_stmt.value) : Literal{debugData, LiteralKind::Number, "0"_yulstring, {}}
-				);
-			else
-				return {};
-		}
-		std::vector<std::optional<YulString>> rhsMemorySlots;
-		if (_stmt.value)
-		{
-			FunctionCall const* functionCall = std::get_if<FunctionCall>(_stmt.value.get());
-			yulAssert(functionCall, "");
-			if (m_context.dialect.builtin(functionCall->functionName.name))
-				rhsMemorySlots = std::vector<std::optional<YulString>>(_lhsVars.size(), std::nullopt);
-			else
-				rhsMemorySlots =
-					m_functionReturnVariables.at(functionCall->functionName.name) |
-					ranges::views::transform(m_memoryOffsetTracker) |
-					ranges::to<std::vector<std::optional<YulString>>>;
-		}
-		else
-			rhsMemorySlots = std::vector<std::optional<YulString>>(_lhsVars.size(), std::nullopt);
-
-		// Nothing to do, if the right-hand-side remains entirely on the stack and
-		// none of the variables in the left-hand-side are moved.
-		if (
-			ranges::none_of(rhsMemorySlots, [](std::optional<YulString> const& _slot) { return _slot.has_value(); }) &&
-			!util::contains_if(_lhsVars, m_memoryOffsetTracker)
-		)
-			return {};
-
-		std::vector<Statement> memoryAssignments;
-		std::vector<Statement> variableAssignments;
-		VariableDeclaration tempDecl{debugData, {}, std::move(_stmt.value)};
-
-		yulAssert(rhsMemorySlots.size() == _lhsVars.size(), "");
-		for (auto&& [lhsVar, rhsSlot]: ranges::views::zip(_lhsVars, rhsMemorySlots))
-		{
-			std::unique_ptr<Expression> rhs;
-			if (rhsSlot)
-				rhs = std::make_unique<Expression>(generateMemoryLoad(m_context.dialect, debugData, *rhsSlot));
-			else
-			{
-				YulString tempVarName = m_nameDispenser.newName(lhsVar.name);
-				tempDecl.variables.emplace_back(TypedName{lhsVar.debugData, tempVarName, {}});
-				rhs = std::make_unique<Expression>(Identifier{debugData, tempVarName});
-			}
-
-			if (std::optional<YulString> offset = m_memoryOffsetTracker(lhsVar.name))
-				memoryAssignments += generateMemoryStore(
-					m_context.dialect,
-					_stmt.debugData,
-					*offset,
-					std::move(*rhs)
-				);
-			else
-				variableAssignments.emplace_back(StatementType{
-					debugData,
-					{ std::move(lhsVar) },
-					std::move(rhs)
-				});
-		}
-
-		std::vector<Statement> result;
-		if (tempDecl.variables.empty())
-			result.emplace_back(ExpressionStatement{debugData, *std::move(tempDecl.value)});
-		else
-			result.emplace_back(std::move(tempDecl));
-		reverse(memoryAssignments.begin(), memoryAssignments.end());
-		result += std::move(memoryAssignments);
-		reverse(variableAssignments.begin(), variableAssignments.end());
-		result += std::move(variableAssignments);
-		return OptionalStatements{std::move(result)};
-	};
-
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _statement) -> OptionalStatements
-		{
-			visit(_statement);
-			if (auto* assignment = std::get_if<Assignment>(&_statement))
-				return rewriteAssignmentOrVariableDeclarationLeftHandSide(*assignment, assignment->variableNames);
-			else if (auto* varDecl = std::get_if<VariableDeclaration>(&_statement))
-				return rewriteAssignmentOrVariableDeclarationLeftHandSide(*varDecl, varDecl->variables);
-			return {};
-		}
-	);
-}
-
-void StackToMemoryMover::visit(Expression& _expression)
-{
-	ASTModifier::visit(_expression);
-	if (Identifier* identifier = std::get_if<Identifier>(&_expression))
-		if (std::optional<YulString> offset = m_memoryOffsetTracker(identifier->name))
-			_expression = generateMemoryLoad(m_context.dialect, identifier->debugData, *offset);
-}
-
-std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulString _variable) const
-{
-	if (m_memorySlots.count(_variable))
-	{
-		uint64_t slot = m_memorySlots.at(_variable);
-		yulAssert(slot < m_numRequiredSlots, "");
-		return YulString{toCompactHexWithPrefix(m_reservedMemory + 32 * (m_numRequiredSlots - slot - 1))};
-	}
-	else
-		return std::nullopt;
-}
-
-std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(TypedName const& _variable) const
-{
-	return (*this)(_variable.name);
-}
-
-std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(Identifier const& _variable) const
-{
-	return (*this)(_variable.name);
-}
diff --git a/libyul/optimiser/StackToMemoryMover.h b/libyul/optimiser/StackToMemoryMover.h
deleted file mode 100644
index 64c661c0bfed..000000000000
--- a/libyul/optimiser/StackToMemoryMover.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Optimisation stage that moves Yul variables from stack to memory.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/ASTForward.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-
-#include <list>
-
-namespace solidity::yul
-{
-
-/**
- * Optimisation stage that moves Yul variables from stack to memory.
- * It takes a map from functions names and variable names to memory offsets.
- * It then transforms the AST as follows:
- *
- * Single variable declarations are replaced by mstore's as follows:
- *   If a is in the map, replace
- *     let a
- *   by
- *     mstore(<memory offset for a>, 0)
- *   respectively, replace
- *     let a := expr
- *   by
- *     mstore(<memory offset for a>, expr)
- *
- * In a multi-variable declaration, variables to be moved are replaced by fresh variables and then moved to memory:
- *   If b and d are in the map, replace
- *     let a, b, c, d := f()
- *   by
- *     let _1, _2, _3, _4 := f()
- *     mstore(<memory offset for d>, _4)
- *     mstore(<memory offset for b>, _2)
- *     let c := _3
- *     let a := _1
- *
- * In case f has return parameters that are moved to memory, fewer variables are returned and the return values read
- * from memory instead. Assume the third return parameter of f (i.e. c) has to be moved to memory:
- *     let a, b, c, d := f()
- *   then it is replaced by
- *     let _1, _2, _4 := f()
- *     mstore(<memory offset for d>, _4)
- *     mstore(<memory offset for b>, _2)
- *     let c := mload(<memory offset of third return parameter of f>)
- *     let a := _1
- *
- * Assignments to single variables are replaced by mstore's:
- *   If a is in the map, replace
- *     a := expr
- *   by
- *     mstore(<memory offset for a>, expr)
- *
- * Assignments to multiple variables are split up similarly to multi-variable declarations:
- *   If b and d are in the map, replace
- *     a, b, c, d := f()
- *   by
- *     let _1, _2, _3, _4 := f()
- *     mstore(<memory offset for d>, _4)
- *     mstore(<memory offset for b>, _2)
- *     c := _3
- *     a := _1
- *
- * Replace all references to a variable ``a`` in the map by ``mload(<memory offset for a>)``.
- *
- * Function arguments are moved at the beginning of a function body:
- *   If a1 is in the map, replace
- *     function f(a1, a2, ..., a17)
- *     {
- *       ...
- *       sstore(a1, a17)
- *     }
- *   by
- *     function f(a1, a2, ..., a17)
- *     {
- *       mstore(<memory offset for a1>, a1)
- *       ...
- *       sstore(mload(<memory offset for a1>, a17)
- *     }
- * This relies on the code transform popping arguments that are no longer used, if they are on the stack top.
- *
- * Functions with only one return argument that has to be moved are encapsulated in a wrapper function as follows:
- *   Suppose b and r need to be moved in:
- *     function f(a, b) -> r
- *     {
- *       ...body of f...
- *       r := b
- *       ...body of f continued...
- *     }
- *   then replace by:
- *     function f(a, b) -> r
- *     {
- *       mstore(<memory offset of b>, b)
- *       mstore(<memory offset of r>, 0)
- *       f_1(a)
- *       r := mload(<memory offset of r>)
- *     }
- *     function f_1(a)
- *     {
- *       ...body of f...
- *       mstore(<memory offset of r>, mload(<memory offset of b>))
- *       ...body of f continued...
- *     }
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter, FunctionHoister.
- */
-class StackToMemoryMover: ASTModifier
-{
-public:
-	/**
-	 * Runs the stack to memory mover.
-	 * @param _reservedMemory Is the amount of previously reserved memory,
-	 *                        i.e. the lowest memory offset to which variables can be moved.
-	 * @param _memorySlots A map from variables to a slot in memory. Based on the slot a unique offset in the memory range
-	 *                     between _reservedMemory and _reservedMemory + 32 * _numRequiredSlots is calculated for each
-	 *                     variable.
-	 * @param _numRequiredSlots The number of slots required in total. The maximum value that may occur in @a _memorySlots.
-	 */
-	static void run(
-		OptimiserStepContext& _context,
-		u256 _reservedMemory,
-		std::map<YulString, uint64_t> const& _memorySlots,
-		uint64_t _numRequiredSlots,
-		Block& _block
-	);
-	using ASTModifier::operator();
-
-	void operator()(FunctionDefinition& _functionDefinition) override;
-	void operator()(Block& _block) override;
-	using ASTModifier::visit;
-	void visit(Expression& _expression) override;
-private:
-	class VariableMemoryOffsetTracker
-	{
-	public:
-		VariableMemoryOffsetTracker(
-			u256 _reservedMemory,
-			std::map<YulString, uint64_t> const& _memorySlots,
-			uint64_t _numRequiredSlots
-		): m_reservedMemory(_reservedMemory), m_memorySlots(_memorySlots), m_numRequiredSlots(_numRequiredSlots)
-		{}
-
-		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
-		/// or std::nullopt if the variable should not be moved.
-		std::optional<YulString> operator()(YulString _variable) const;
-		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
-		/// or std::nullopt if the variable should not be moved.
-		std::optional<YulString> operator()(TypedName const& _variable) const;
-		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
-		/// or std::nullopt if the variable should not be moved.
-		std::optional<YulString> operator()(Identifier const& _variable) const;
-
-	private:
-		u256 m_reservedMemory;
-		std::map<YulString, uint64_t> const& m_memorySlots;
-		uint64_t m_numRequiredSlots = 0;
-	};
-	struct FunctionMoveInfo
-	{
-		std::vector<std::optional<YulString>> returnVariableSlots;
-	};
-
-	StackToMemoryMover(
-		OptimiserStepContext& _context,
-		VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-		std::map<YulString, std::vector<TypedName>> _functionReturnVariables
-	);
-
-	OptimiserStepContext& m_context;
-	VariableMemoryOffsetTracker const& m_memoryOffsetTracker;
-	NameDispenser& m_nameDispenser;
-	/// Map from function names to the return variables of the function with that name.
-	std::map<YulString, std::vector<TypedName>> m_functionReturnVariables;
-	/// List of functions generated while running this step that are to be appended to the code in the end.
-	std::list<Statement> m_newFunctionDefinitions;
-};
-
-}
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
deleted file mode 100644
index 2af0f7bac044..000000000000
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-using OptionalStatements = std::optional<std::vector<Statement>>;
-
-namespace
-{
-
-OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _constExprVal)
-{
-	Block* matchingCaseBlock = nullptr;
-	Case* defaultCase = nullptr;
-
-	for (auto& _case: _switchStmt.cases)
-	{
-		if (_case.value && valueOfLiteral(*_case.value) == _constExprVal)
-		{
-			matchingCaseBlock = &_case.body;
-			break;
-		}
-		else if (!_case.value)
-			defaultCase = &_case;
-	}
-
-	if (!matchingCaseBlock && defaultCase)
-		matchingCaseBlock = &defaultCase->body;
-
-	if (matchingCaseBlock)
-		return util::make_vector<Statement>(std::move(*matchingCaseBlock));
-	else
-		return std::optional<std::vector<Statement>>{std::vector<Statement>{}};
-}
-
-std::optional<u256> hasLiteralValue(Expression const& _expression)
-{
-	if (std::holds_alternative<Literal>(_expression))
-		return valueOfLiteral(std::get<Literal>(_expression));
-	else
-		return std::optional<u256>();
-}
-
-bool expressionAlwaysTrue(Expression const& _expression)
-{
-	if (std::optional<u256> value = hasLiteralValue(_expression))
-		return *value != 0;
-	else
-		return false;
-}
-
-bool expressionAlwaysFalse(Expression const& _expression)
-{
-	if (std::optional<u256> value = hasLiteralValue(_expression))
-		return *value == 0;
-	else
-		return false;
-}
-
-}
-
-void StructuralSimplifier::run(OptimiserStepContext&, Block& _ast)
-{
-	StructuralSimplifier{}(_ast);
-}
-
-void StructuralSimplifier::operator()(Block& _block)
-{
-	simplify(_block.statements);
-}
-
-void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
-{
-	util::GenericVisitor visitor{
-		util::VisitorFallback<OptionalStatements>{},
-		[&](If& _ifStmt) -> OptionalStatements {
-			if (expressionAlwaysTrue(*_ifStmt.condition))
-				return {std::move(_ifStmt.body.statements)};
-			else if (expressionAlwaysFalse(*_ifStmt.condition))
-				return {std::vector<Statement>{}};
-			return {};
-		},
-		[&](Switch& _switchStmt) -> OptionalStatements {
-			if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression))
-				return replaceConstArgSwitch(_switchStmt, constExprVal.value());
-			return {};
-		},
-		[&](ForLoop& _forLoop) -> OptionalStatements {
-			if (expressionAlwaysFalse(*_forLoop.condition))
-				return {std::move(_forLoop.pre.statements)};
-			return {};
-		}
-	};
-
-	util::iterateReplacing(
-		_statements,
-		[&](Statement& _stmt) -> OptionalStatements
-		{
-			OptionalStatements result = std::visit(visitor, _stmt);
-			if (result)
-				simplify(*result);
-			else
-				visit(_stmt);
-			return result;
-		}
-	);
-}
diff --git a/libyul/optimiser/StructuralSimplifier.h b/libyul/optimiser/StructuralSimplifier.h
deleted file mode 100644
index 734b2e53af8e..000000000000
--- a/libyul/optimiser/StructuralSimplifier.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libsolutil/Common.h>
-
-namespace solidity::yul
-{
-
-/**
- * Structural simplifier. Performs the following simplification steps:
- * - replace if with true condition with its body
- * - remove if with false condition
- * - replace switch with const expr with matching case body
- * - replace for with false condition by its initialization part
- *
- * The LiteralRematerialiser should be run before this.
- *
- * Prerequisite: Disambiguator.
- *
- * Important: Can only be used on EVM code.
- */
-class StructuralSimplifier: public ASTModifier
-{
-public:
-	static constexpr char const* name{"StructuralSimplifier"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-private:
-	StructuralSimplifier() = default;
-
-	void simplify(std::vector<Statement>& _statements);
-};
-
-}
diff --git a/libyul/optimiser/Substitution.cpp b/libyul/optimiser/Substitution.cpp
deleted file mode 100644
index b2d4d469e171..000000000000
--- a/libyul/optimiser/Substitution.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST copier that replaces certain identifiers with expressions.
- */
-
-#include <libyul/optimiser/Substitution.h>
-
-#include <libyul/AST.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-Expression Substitution::translate(Expression const& _expression)
-{
-	if (std::holds_alternative<Identifier>(_expression))
-	{
-		YulString name = std::get<Identifier>(_expression).name;
-		if (m_substitutions.count(name))
-			// No recursive substitution
-			return ASTCopier().translate(*m_substitutions.at(name));
-	}
-	return ASTCopier::translate(_expression);
-}
diff --git a/libyul/optimiser/Substitution.h b/libyul/optimiser/Substitution.h
deleted file mode 100644
index f76dcc72ea47..000000000000
--- a/libyul/optimiser/Substitution.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Specific AST copier that replaces certain identifiers with expressions.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTCopier.h>
-#include <libyul/YulString.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-
-/**
- * Specific AST copier that replaces certain identifiers with expressions.
- */
-class Substitution: public ASTCopier
-{
-public:
-	Substitution(std::map<YulString, Expression const*> const& _substitutions):
-		m_substitutions(_substitutions)
-	{}
-	Expression translate(Expression const& _expression) override;
-
-private:
-	std::map<YulString, Expression const*> const& m_substitutions;
-};
-
-}
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
deleted file mode 100644
index 58561ee10a15..000000000000
--- a/libyul/optimiser/Suite.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser suite that combines all steps and also provides the settings for the heuristics.
- */
-
-#include <libyul/optimiser/Suite.h>
-
-#include <libyul/optimiser/Disambiguator.h>
-#include <libyul/optimiser/VarDeclInitializer.h>
-#include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/CircularReferencesPruner.h>
-#include <libyul/optimiser/ControlFlowSimplifier.h>
-#include <libyul/optimiser/ConditionalSimplifier.h>
-#include <libyul/optimiser/ConditionalUnsimplifier.h>
-#include <libyul/optimiser/DeadCodeEliminator.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/EqualStoreEliminator.h>
-#include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/optimiser/ExpressionSplitter.h>
-#include <libyul/optimiser/ExpressionJoiner.h>
-#include <libyul/optimiser/ExpressionInliner.h>
-#include <libyul/optimiser/FullInliner.h>
-#include <libyul/optimiser/ForLoopConditionIntoBody.h>
-#include <libyul/optimiser/ForLoopConditionOutOfBody.h>
-#include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/optimiser/ForLoopConditionIntoBody.h>
-#include <libyul/optimiser/FunctionSpecializer.h>
-#include <libyul/optimiser/Rematerialiser.h>
-#include <libyul/optimiser/UnusedFunctionParameterPruner.h>
-#include <libyul/optimiser/UnusedPruner.h>
-#include <libyul/optimiser/ExpressionSimplifier.h>
-#include <libyul/optimiser/CommonSubexpressionEliminator.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/SSAReverser.h>
-#include <libyul/optimiser/SSATransform.h>
-#include <libyul/optimiser/StackCompressor.h>
-#include <libyul/optimiser/StackLimitEvader.h>
-#include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/optimiser/SyntacticalEquality.h>
-#include <libyul/optimiser/UnusedAssignEliminator.h>
-#include <libyul/optimiser/UnusedStoreEliminator.h>
-#include <libyul/optimiser/VarNameCleaner.h>
-#include <libyul/optimiser/LoadResolver.h>
-#include <libyul/optimiser/LoopInvariantCodeMotion.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/NameSimplifier.h>
-#include <libyul/backends/evm/ConstantOptimiser.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/AST.h>
-#include <libyul/Object.h>
-
-#include <libyul/backends/evm/NoOutputAssembly.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <libyul/CompilabilityChecker.h>
-
-#include <range/v3/view/map.hpp>
-#include <range/v3/action/remove.hpp>
-
-#include <limits>
-#include <tuple>
-
-#ifdef PROFILE_OPTIMIZER_STEPS
-#include <chrono>
-#include <fmt/format.h>
-#endif
-
-using namespace solidity;
-using namespace solidity::yul;
-#ifdef PROFILE_OPTIMIZER_STEPS
-using namespace std::chrono;
-#endif
-using namespace std::string_literals;
-
-namespace
-{
-
-#ifdef PROFILE_OPTIMIZER_STEPS
-void outputPerformanceMetrics(map<string, int64_t> const& _metrics)
-{
-	vector<pair<string, int64_t>> durations(_metrics.begin(), _metrics.end());
-	sort(
-		durations.begin(),
-		durations.end(),
-		[](pair<string, int64_t> const& _lhs, pair<string, int64_t> const& _rhs) -> bool
-		{
-			return _lhs.second < _rhs.second;
-		}
-	);
-
-	int64_t totalDurationInMicroseconds = 0;
-	for (auto&& [step, durationInMicroseconds]: durations)
-		totalDurationInMicroseconds += durationInMicroseconds;
-
-	cerr << "Performance metrics of optimizer steps" << endl;
-	cerr << "======================================" << endl;
-	constexpr double microsecondsInSecond = 1000000;
-	for (auto&& [step, durationInMicroseconds]: durations)
-	{
-		double percentage = 100.0 * static_cast<double>(durationInMicroseconds) / static_cast<double>(totalDurationInMicroseconds);
-		double sec = static_cast<double>(durationInMicroseconds) / microsecondsInSecond;
-		cerr << fmt::format("{:>7.3f}% ({} s): {}", percentage, sec, step) << endl;
-	}
-	double totalDurationInSeconds = static_cast<double>(totalDurationInMicroseconds) / microsecondsInSecond;
-	cerr << "--------------------------------------" << endl;
-	cerr << fmt::format("{:>7}% ({:.3f} s)", 100, totalDurationInSeconds) << endl;
-}
-#endif
-
-}
-
-
-void OptimiserSuite::run(
-	Dialect const& _dialect,
-	GasMeter const* _meter,
-	Object& _object,
-	bool _optimizeStackAllocation,
-	std::string_view _optimisationSequence,
-	std::string_view _optimisationCleanupSequence,
-	std::optional<size_t> _expectedExecutionsPerDeployment,
-	std::set<YulString> const& _externallyUsedIdentifiers
-)
-{
-	EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect);
-	bool usesOptimizedCodeGenerator =
-		_optimizeStackAllocation &&
-		evmDialect &&
-		evmDialect->evmVersion().canOverchargeGasForCall() &&
-		evmDialect->providesObjectAccess();
-	std::set<YulString> reservedIdentifiers = _externallyUsedIdentifiers;
-	reservedIdentifiers += _dialect.fixedFunctionNames();
-
-	*_object.code = std::get<Block>(Disambiguator(
-		_dialect,
-		*_object.analysisInfo,
-		reservedIdentifiers
-	)(*_object.code));
-	Block& ast = *_object.code;
-
-	NameDispenser dispenser{_dialect, ast, reservedIdentifiers};
-	OptimiserStepContext context{_dialect, dispenser, reservedIdentifiers, _expectedExecutionsPerDeployment};
-
-	OptimiserSuite suite(context, Debug::None);
-
-	// Some steps depend on properties ensured by FunctionHoister, BlockFlattener, FunctionGrouper and
-	// ForLoopInitRewriter. Run them first to be able to run arbitrary sequences safely.
-	suite.runSequence("hgfo", ast);
-
-	NameSimplifier::run(suite.m_context, ast);
-	// Now the user-supplied part
-	suite.runSequence(_optimisationSequence, ast);
-
-	// This is a tuning parameter, but actually just prevents infinite loops.
-	size_t stackCompressorMaxIterations = 16;
-	suite.runSequence("g", ast);
-
-	// We ignore the return value because we will get a much better error
-	// message once we perform code generation.
-	if (!usesOptimizedCodeGenerator)
-		StackCompressor::run(
-			_dialect,
-			_object,
-			_optimizeStackAllocation,
-			stackCompressorMaxIterations
-		);
-
-	// Run the user-supplied clean up sequence
-	suite.runSequence(_optimisationCleanupSequence, ast);
-	// Hard-coded FunctionGrouper step is used to bring the AST into a canonical form required by the StackCompressor
-	// and StackLimitEvader. This is hard-coded as the last step, as some previously executed steps may break the
-	// aforementioned form, thus causing the StackCompressor/StackLimitEvader to throw.
-	suite.runSequence("g", ast);
-
-	if (evmDialect)
-	{
-		yulAssert(_meter, "");
-		ConstantOptimiser{*evmDialect, *_meter}(ast);
-		if (usesOptimizedCodeGenerator)
-		{
-			StackCompressor::run(
-				_dialect,
-				_object,
-				_optimizeStackAllocation,
-				stackCompressorMaxIterations
-			);
-			if (evmDialect->providesObjectAccess())
-				StackLimitEvader::run(suite.m_context, _object);
-		}
-		else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
-			StackLimitEvader::run(suite.m_context, _object);
-	}
-
-	dispenser.reset(ast);
-	NameSimplifier::run(suite.m_context, ast);
-	VarNameCleaner::run(suite.m_context, ast);
-
-#ifdef PROFILE_OPTIMIZER_STEPS
-	outputPerformanceMetrics(suite.m_durationPerStepInMicroseconds);
-#endif
-
-	*_object.analysisInfo = AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
-}
-
-namespace
-{
-
-template <class... Step>
-std::map<std::string, std::unique_ptr<OptimiserStep>> optimiserStepCollection()
-{
-	std::map<std::string, std::unique_ptr<OptimiserStep>> ret;
-	for (std::unique_ptr<OptimiserStep>& s: util::make_vector<std::unique_ptr<OptimiserStep>>(
-		(std::make_unique<OptimiserStepInstance<Step>>())...
-	))
-	{
-		yulAssert(!ret.count(s->name), "");
-		ret[s->name] = std::move(s);
-	}
-	return ret;
-}
-
-}
-
-std::map<std::string, std::unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
-{
-	static std::map<std::string, std::unique_ptr<OptimiserStep>> instance;
-	if (instance.empty())
-		instance = optimiserStepCollection<
-			BlockFlattener,
-			CircularReferencesPruner,
-			CommonSubexpressionEliminator,
-			ConditionalSimplifier,
-			ConditionalUnsimplifier,
-			ControlFlowSimplifier,
-			DeadCodeEliminator,
-			EqualStoreEliminator,
-			EquivalentFunctionCombiner,
-			ExpressionInliner,
-			ExpressionJoiner,
-			ExpressionSimplifier,
-			ExpressionSplitter,
-			ForLoopConditionIntoBody,
-			ForLoopConditionOutOfBody,
-			ForLoopInitRewriter,
-			FullInliner,
-			FunctionGrouper,
-			FunctionHoister,
-			FunctionSpecializer,
-			LiteralRematerialiser,
-			LoadResolver,
-			LoopInvariantCodeMotion,
-			UnusedAssignEliminator,
-			UnusedStoreEliminator,
-			Rematerialiser,
-			SSAReverser,
-			SSATransform,
-			StructuralSimplifier,
-			UnusedFunctionParameterPruner,
-			UnusedPruner,
-			VarDeclInitializer
-		>();
-	// Does not include VarNameCleaner because it destroys the property of unique names.
-	// Does not include NameSimplifier.
-	return instance;
-}
-
-std::map<std::string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
-{
-	static std::map<std::string, char> lookupTable{
-		{BlockFlattener::name,                'f'},
-		{CircularReferencesPruner::name,      'l'},
-		{CommonSubexpressionEliminator::name, 'c'},
-		{ConditionalSimplifier::name,         'C'},
-		{ConditionalUnsimplifier::name,       'U'},
-		{ControlFlowSimplifier::name,         'n'},
-		{DeadCodeEliminator::name,            'D'},
-		{EqualStoreEliminator::name,          'E'},
-		{EquivalentFunctionCombiner::name,    'v'},
-		{ExpressionInliner::name,             'e'},
-		{ExpressionJoiner::name,              'j'},
-		{ExpressionSimplifier::name,          's'},
-		{ExpressionSplitter::name,            'x'},
-		{ForLoopConditionIntoBody::name,      'I'},
-		{ForLoopConditionOutOfBody::name,     'O'},
-		{ForLoopInitRewriter::name,           'o'},
-		{FullInliner::name,                   'i'},
-		{FunctionGrouper::name,               'g'},
-		{FunctionHoister::name,               'h'},
-		{FunctionSpecializer::name,           'F'},
-		{LiteralRematerialiser::name,         'T'},
-		{LoadResolver::name,                  'L'},
-		{LoopInvariantCodeMotion::name,       'M'},
-		{UnusedAssignEliminator::name,        'r'},
-		{UnusedStoreEliminator::name,         'S'},
-		{Rematerialiser::name,                'm'},
-		{SSAReverser::name,                   'V'},
-		{SSATransform::name,                  'a'},
-		{StructuralSimplifier::name,          't'},
-		{UnusedFunctionParameterPruner::name, 'p'},
-		{UnusedPruner::name,                  'u'},
-		{VarDeclInitializer::name,            'd'},
-	};
-	yulAssert(lookupTable.size() == allSteps().size(), "");
-	yulAssert((
-			util::convertContainer<std::set<char>>(std::string(NonStepAbbreviations)) -
-			util::convertContainer<std::set<char>>(lookupTable | ranges::views::values)
-		).size() == std::string(NonStepAbbreviations).size(),
-		"Step abbreviation conflicts with a character reserved for another syntactic element"
-	);
-
-	return lookupTable;
-}
-
-std::map<char, std::string> const& OptimiserSuite::stepAbbreviationToNameMap()
-{
-	static std::map<char, std::string> lookupTable = util::invertMap(stepNameToAbbreviationMap());
-
-	return lookupTable;
-}
-
-void OptimiserSuite::validateSequence(std::string_view _stepAbbreviations)
-{
-	int8_t nestingLevel = 0;
-	int8_t colonDelimiters = 0;
-	for (char abbreviation: _stepAbbreviations)
-		switch (abbreviation)
-		{
-		case ' ':
-		case '\n':
-			break;
-		case '[':
-			assertThrow(nestingLevel < std::numeric_limits<int8_t>::max(), OptimizerException, "Brackets nested too deep");
-			nestingLevel++;
-			break;
-		case ']':
-			nestingLevel--;
-			assertThrow(nestingLevel >= 0, OptimizerException, "Unbalanced brackets");
-			break;
-		case ':':
-			++colonDelimiters;
-			assertThrow(nestingLevel == 0, OptimizerException, "Cleanup sequence delimiter cannot be placed inside the brackets");
-			assertThrow(colonDelimiters <= 1, OptimizerException, "Too many cleanup sequence delimiters");
-			break;
-		default:
-		{
-			yulAssert(
-				std::string(NonStepAbbreviations).find(abbreviation) == std::string::npos,
-				"Unhandled syntactic element in the abbreviation sequence"
-			);
-			assertThrow(
-				stepAbbreviationToNameMap().find(abbreviation) != stepAbbreviationToNameMap().end(),
-				OptimizerException,
-				"'"s + abbreviation + "' is not a valid step abbreviation"
-			);
-			std::optional<std::string> invalid = allSteps().at(stepAbbreviationToNameMap().at(abbreviation))->invalidInCurrentEnvironment();
-			assertThrow(
-				!invalid.has_value(),
-				OptimizerException,
-				"'"s + abbreviation + "' is invalid in the current environment: " + *invalid
-			);
-		}
-		}
-	assertThrow(nestingLevel == 0, OptimizerException, "Unbalanced brackets");
-}
-
-void OptimiserSuite::runSequence(std::string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable)
-{
-	validateSequence(_stepAbbreviations);
-
-	// This splits 'aaa[bbb]ccc...' into 'aaa' and '[bbb]ccc...'.
-	auto extractNonNestedPrefix = [](std::string_view _tail) -> std::tuple<std::string_view, std::string_view>
-	{
-		for (size_t i = 0; i < _tail.size(); ++i)
-		{
-			yulAssert(_tail[i] != ']');
-			if (_tail[i] == '[')
-				return {_tail.substr(0, i), _tail.substr(i)};
-		}
-		return {_tail, {}};
-	};
-
-	// This splits '[bbb]ccc...' into 'bbb' and 'ccc...'.
-	auto extractBracketContent = [](std::string_view _tail) -> std::tuple<std::string_view, std::string_view>
-	{
-		yulAssert(!_tail.empty() && _tail[0] == '[');
-
-		size_t contentLength = 0;
-		int8_t nestingLevel = 1;
-		for (char abbreviation: _tail.substr(1))
-		{
-			if (abbreviation == '[')
-			{
-				yulAssert(nestingLevel < std::numeric_limits<int8_t>::max());
-				++nestingLevel;
-			}
-			else if (abbreviation == ']')
-			{
-				--nestingLevel;
-				if (nestingLevel == 0)
-					break;
-			}
-			++contentLength;
-		}
-		yulAssert(nestingLevel == 0);
-		yulAssert(_tail[contentLength + 1] == ']');
-
-		return {_tail.substr(1, contentLength), _tail.substr(contentLength + 2)};
-	};
-
-	auto abbreviationsToSteps = [](std::string_view _sequence) -> std::vector<std::string>
-	{
-		std::vector<std::string> steps;
-		for (char abbreviation: _sequence)
-			if (abbreviation != ' ' && abbreviation != '\n')
-				steps.emplace_back(stepAbbreviationToNameMap().at(abbreviation));
-		return steps;
-	};
-
-	std::vector<std::tuple<std::string_view, bool>> subsequences;
-	std::string_view tail = _stepAbbreviations;
-	while (!tail.empty())
-	{
-		std::string_view subsequence;
-		tie(subsequence, tail) = extractNonNestedPrefix(tail);
-		if (subsequence.size() > 0)
-			subsequences.push_back({subsequence, false});
-
-		if (tail.empty())
-			break;
-
-		tie(subsequence, tail) = extractBracketContent(tail);
-		if (subsequence.size() > 0)
-			subsequences.push_back({subsequence, true});
-	}
-
-	size_t codeSize = 0;
-	for (size_t round = 0; round < MaxRounds; ++round)
-	{
-		for (auto const& [subsequence, repeat]: subsequences)
-		{
-			if (repeat)
-				runSequence(subsequence, _ast, true);
-			else
-				runSequence(abbreviationsToSteps(subsequence), _ast);
-		}
-
-		if (!_repeatUntilStable)
-			break;
-
-		size_t newSize = CodeSize::codeSizeIncludingFunctions(_ast);
-		if (newSize == codeSize)
-			break;
-		codeSize = newSize;
-	}
-}
-
-void OptimiserSuite::runSequence(std::vector<std::string> const& _steps, Block& _ast)
-{
-	std::unique_ptr<Block> copy;
-	if (m_debug == Debug::PrintChanges)
-		copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
-	for (std::string const& step: _steps)
-	{
-		if (m_debug == Debug::PrintStep)
-			std::cout << "Running " << step << std::endl;
-#ifdef PROFILE_OPTIMIZER_STEPS
-		steady_clock::time_point startTime = steady_clock::now();
-#endif
-		allSteps().at(step)->run(m_context, _ast);
-#ifdef PROFILE_OPTIMIZER_STEPS
-		steady_clock::time_point endTime = steady_clock::now();
-		m_durationPerStepInMicroseconds[step] += duration_cast<microseconds>(endTime - startTime).count();
-#endif
-		if (m_debug == Debug::PrintChanges)
-		{
-			// TODO should add switch to also compare variable names!
-			if (SyntacticallyEqual{}.statementEqual(_ast, *copy))
-				std::cout << "== Running " << step << " did not cause changes." << std::endl;
-			else
-			{
-				std::cout << "== Running " << step << " changed the AST." << std::endl;
-				std::cout << AsmPrinter{}(_ast) << std::endl;
-				copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
-			}
-		}
-	}
-}
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
deleted file mode 100644
index abed2720e2a5..000000000000
--- a/libyul/optimiser/Suite.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser suite that combines all steps and also provides the settings for the heuristics.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <set>
-#include <string>
-#include <string_view>
-#include <memory>
-
-namespace solidity::yul
-{
-
-struct AsmAnalysisInfo;
-struct Dialect;
-class GasMeter;
-struct Object;
-
-/**
- * Optimiser suite that combines all steps and also provides the settings for the heuristics.
- * Only optimizes the code of the provided object, does not descend into the sub-objects.
- */
-class OptimiserSuite
-{
-public:
-	static constexpr size_t MaxRounds = 12;
-
-	/// Special characters that do not represent optimiser steps but are allowed in abbreviation sequences.
-	/// Some of them (like whitespace) are ignored, others (like brackets) are a part of the syntax.
-	static constexpr char NonStepAbbreviations[] = " \n[]:";
-
-	enum class Debug
-	{
-		None,
-		PrintStep,
-		PrintChanges
-	};
-	OptimiserSuite(OptimiserStepContext& _context, Debug _debug = Debug::None): m_context(_context), m_debug(_debug) {}
-
-	/// The value nullopt for `_expectedExecutionsPerDeployment` represents creation code.
-	static void run(
-		Dialect const& _dialect,
-		GasMeter const* _meter,
-		Object& _object,
-		bool _optimizeStackAllocation,
-		std::string_view _optimisationSequence,
-		std::string_view _optimisationCleanupSequence,
-		std::optional<size_t> _expectedExecutionsPerDeployment,
-		std::set<YulString> const& _externallyUsedIdentifiers = {}
-	);
-
-	/// Ensures that specified sequence of step abbreviations is well-formed and can be executed.
-	/// @throw OptimizerException if the sequence is invalid
-	static void validateSequence(std::string_view _stepAbbreviations);
-
-	void runSequence(std::vector<std::string> const& _steps, Block& _ast);
-	void runSequence(std::string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable = false);
-
-	static std::map<std::string, std::unique_ptr<OptimiserStep>> const& allSteps();
-	static std::map<std::string, char> const& stepNameToAbbreviationMap();
-	static std::map<char, std::string> const& stepAbbreviationToNameMap();
-
-private:
-	OptimiserStepContext& m_context;
-	Debug m_debug;
-#ifdef PROFILE_OPTIMIZER_STEPS
-	std::map<std::string, int64_t> m_durationPerStepInMicroseconds;
-#endif
-};
-
-}
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
deleted file mode 100644
index 6f7753827ddc..000000000000
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Component that can compare ASTs for equality on a syntactic basis.
- */
-
-#include <libyul/optimiser/SyntacticalEquality.h>
-
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-bool SyntacticallyEqual::operator()(Expression const& _lhs, Expression const& _rhs)
-{
-	return std::visit([this](auto&& _lhsExpr, auto&& _rhsExpr) -> bool {
-		// ``this->`` is redundant, but required to work around a bug present in gcc 6.x.
-		return this->expressionEqual(_lhsExpr, _rhsExpr);
-	}, _lhs, _rhs);
-}
-
-bool SyntacticallyEqual::operator()(Statement const& _lhs, Statement const& _rhs)
-{
-	return std::visit([this](auto&& _lhsStmt, auto&& _rhsStmt) -> bool {
-		// ``this->`` is redundant, but required to work around a bug present in gcc 6.x.
-		return this->statementEqual(_lhsStmt, _rhsStmt);
-	}, _lhs, _rhs);
-}
-
-bool SyntacticallyEqual::expressionEqual(FunctionCall const& _lhs, FunctionCall const& _rhs)
-{
-	return
-		expressionEqual(_lhs.functionName, _rhs.functionName) &&
-		util::containerEqual(_lhs.arguments, _rhs.arguments, [this](Expression const& _lhsExpr, Expression const& _rhsExpr) -> bool {
-			return (*this)(_lhsExpr, _rhsExpr);
-		});
-}
-
-bool SyntacticallyEqual::expressionEqual(Identifier const& _lhs, Identifier const& _rhs)
-{
-	auto lhsIt = m_identifiersLHS.find(_lhs.name);
-	auto rhsIt = m_identifiersRHS.find(_rhs.name);
-	return
-		(lhsIt == m_identifiersLHS.end() && rhsIt == m_identifiersRHS.end() && _lhs.name == _rhs.name) ||
-		(lhsIt != m_identifiersLHS.end() && rhsIt != m_identifiersRHS.end() && lhsIt->second == rhsIt->second);
-}
-bool SyntacticallyEqual::expressionEqual(Literal const& _lhs, Literal const& _rhs)
-{
-	if (_lhs.kind != _rhs.kind || _lhs.type != _rhs.type)
-		return false;
-	if (_lhs.kind == LiteralKind::Number)
-		return valueOfNumberLiteral(_lhs) == valueOfNumberLiteral(_rhs);
-	else
-		return _lhs.value == _rhs.value;
-}
-
-bool SyntacticallyEqual::statementEqual(ExpressionStatement const& _lhs, ExpressionStatement const& _rhs)
-{
-	return (*this)(_lhs.expression, _rhs.expression);
-}
-bool SyntacticallyEqual::statementEqual(Assignment const& _lhs, Assignment const& _rhs)
-{
-	return util::containerEqual(
-		_lhs.variableNames,
-		_rhs.variableNames,
-		[this](Identifier const& _lhsVarName, Identifier const& _rhsVarName) -> bool {
-			return this->expressionEqual(_lhsVarName, _rhsVarName);
-		}
-	) && (*this)(*_lhs.value, *_rhs.value);
-}
-
-bool SyntacticallyEqual::statementEqual(VariableDeclaration const& _lhs, VariableDeclaration const& _rhs)
-{
-	// first visit expression, then variable declarations
-	if (!compareUniquePtr<Expression, &SyntacticallyEqual::operator()>(_lhs.value, _rhs.value))
-		return false;
-	return util::containerEqual(_lhs.variables, _rhs.variables, [this](TypedName const& _lhsVarName, TypedName const& _rhsVarName) -> bool {
-		return this->visitDeclaration(_lhsVarName, _rhsVarName);
-	});
-}
-
-bool SyntacticallyEqual::statementEqual(FunctionDefinition const& _lhs, FunctionDefinition const& _rhs)
-{
-	auto compare = [this](TypedName const& _lhsVarName, TypedName const& _rhsVarName) -> bool {
-		return this->visitDeclaration(_lhsVarName, _rhsVarName);
-	};
-	// first visit parameter declarations, then body
-	if (!util::containerEqual(_lhs.parameters, _rhs.parameters, compare))
-		return false;
-	if (!util::containerEqual(_lhs.returnVariables, _rhs.returnVariables, compare))
-		return false;
-	return statementEqual(_lhs.body, _rhs.body);
-}
-
-bool SyntacticallyEqual::statementEqual(If const& _lhs, If const& _rhs)
-{
-	return
-		compareUniquePtr<Expression, &SyntacticallyEqual::operator()>(_lhs.condition, _rhs.condition) &&
-		statementEqual(_lhs.body, _rhs.body);
-}
-
-bool SyntacticallyEqual::statementEqual(Switch const& _lhs, Switch const& _rhs)
-{
-	std::set<Case const*, SwitchCaseCompareByLiteralValue> lhsCases;
-	std::set<Case const*, SwitchCaseCompareByLiteralValue> rhsCases;
-	for (auto const& lhsCase: _lhs.cases)
-		lhsCases.insert(&lhsCase);
-	for (auto const& rhsCase: _rhs.cases)
-		rhsCases.insert(&rhsCase);
-	return
-		compareUniquePtr<Expression, &SyntacticallyEqual::operator()>(_lhs.expression, _rhs.expression) &&
-		util::containerEqual(lhsCases, rhsCases, [this](Case const* _lhsCase, Case const* _rhsCase) -> bool {
-			return this->switchCaseEqual(*_lhsCase, *_rhsCase);
-		});
-}
-
-
-bool SyntacticallyEqual::switchCaseEqual(Case const& _lhs, Case const& _rhs)
-{
-	return
-		compareUniquePtr<Literal, &SyntacticallyEqual::expressionEqual>(_lhs.value, _rhs.value) &&
-		statementEqual(_lhs.body, _rhs.body);
-}
-
-bool SyntacticallyEqual::statementEqual(ForLoop const& _lhs, ForLoop const& _rhs)
-{
-	return
-		statementEqual(_lhs.pre, _rhs.pre) &&
-		compareUniquePtr<Expression, &SyntacticallyEqual::operator()>(_lhs.condition, _rhs.condition) &&
-		statementEqual(_lhs.body, _rhs.body) &&
-		statementEqual(_lhs.post, _rhs.post);
-}
-
-bool SyntacticallyEqual::statementEqual(Block const& _lhs, Block const& _rhs)
-{
-	return util::containerEqual(_lhs.statements, _rhs.statements, [this](Statement const& _lhsStmt, Statement const& _rhsStmt) -> bool {
-		return (*this)(_lhsStmt, _rhsStmt);
-	});
-}
-
-bool SyntacticallyEqual::visitDeclaration(TypedName const& _lhs, TypedName const& _rhs)
-{
-	if (_lhs.type != _rhs.type)
-		return false;
-	std::size_t id = m_idsUsed++;
-	m_identifiersLHS[_lhs.name] = id;
-	m_identifiersRHS[_rhs.name] = id;
-	return true;
-}
-
-bool SyntacticallyEqualExpression::operator()(Expression const& _lhs, Expression const& _rhs) const
-{
-	return SyntacticallyEqual{}(_lhs, _rhs);
-}
-
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
deleted file mode 100644
index 319da763e8ac..000000000000
--- a/libyul/optimiser/SyntacticalEquality.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Component that can compare ASTs for equality on a syntactic basis.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <map>
-#include <type_traits>
-
-namespace solidity::yul
-{
-
-
-/**
- * Component that can compare ASTs for equality on a syntactic basis.
- * Ignores source locations and allows for different variable names but requires exact matches otherwise.
- *
- * Prerequisite: Disambiguator (unless only expressions are compared)
- */
-class SyntacticallyEqual
-{
-public:
-	bool operator()(Expression const& _lhs, Expression const& _rhs);
-	bool operator()(Statement const& _lhs, Statement const& _rhs);
-
-	bool expressionEqual(FunctionCall const& _lhs, FunctionCall const& _rhs);
-	bool expressionEqual(Identifier const& _lhs, Identifier const& _rhs);
-	bool expressionEqual(Literal const& _lhs, Literal const& _rhs);
-
-	bool statementEqual(ExpressionStatement const& _lhs, ExpressionStatement const& _rhs);
-	bool statementEqual(Assignment const& _lhs, Assignment const& _rhs);
-	bool statementEqual(VariableDeclaration const& _lhs, VariableDeclaration const& _rhs);
-	bool statementEqual(FunctionDefinition const& _lhs, FunctionDefinition const& _rhs);
-	bool statementEqual(If const& _lhs, If const& _rhs);
-	bool statementEqual(Switch const& _lhs, Switch const& _rhs);
-	bool switchCaseEqual(Case const& _lhs, Case const& _rhs);
-	bool statementEqual(ForLoop const& _lhs, ForLoop const& _rhs);
-	bool statementEqual(Break const&, Break const&) { return true; }
-	bool statementEqual(Continue const&, Continue const&) { return true; }
-	bool statementEqual(Leave const&, Leave const&) { return true; }
-	bool statementEqual(Block const& _lhs, Block const& _rhs);
-private:
-	bool visitDeclaration(TypedName const& _lhs, TypedName const& _rhs);
-
-	template<typename U, typename V>
-	bool expressionEqual(U const&, V const&, std::enable_if_t<!std::is_same<U, V>::value>* = nullptr)
-	{
-		return false;
-	}
-
-	template<typename U, typename V>
-	bool statementEqual(U const&, V const&, std::enable_if_t<!std::is_same<U, V>::value>* = nullptr)
-	{
-		return false;
-	}
-
-	template<typename T, bool (SyntacticallyEqual::*CompareMember)(T const&, T const&)>
-	bool compareUniquePtr(std::unique_ptr<T> const& _lhs, std::unique_ptr<T> const& _rhs)
-	{
-		return (_lhs == _rhs) || (_lhs && _rhs && (this->*CompareMember)(*_lhs, *_rhs));
-	}
-
-	std::size_t m_idsUsed = 0;
-	std::map<YulString, std::size_t> m_identifiersLHS;
-	std::map<YulString, std::size_t> m_identifiersRHS;
-};
-
-/**
- * Does the same as SyntacticallyEqual just that the operator() function is const.
- */
-struct SyntacticallyEqualExpression
-{
-	bool operator()(Expression const& _lhs, Expression const& _rhs) const;
-};
-
-
-}
diff --git a/libyul/optimiser/TypeInfo.cpp b/libyul/optimiser/TypeInfo.cpp
deleted file mode 100644
index 16ce65496861..000000000000
--- a/libyul/optimiser/TypeInfo.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Helper class that keeps track of the types while performing optimizations.
- */
-
-#include <libyul/optimiser/TypeInfo.h>
-
-#include <libyul/optimiser/NameCollector.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <libsolutil/Visitor.h>
-
-using namespace solidity::yul;
-using namespace solidity::util;
-
-class TypeInfo::TypeCollector: public ASTWalker
-{
-public:
-	explicit TypeCollector(Block const& _block)
-	{
-		(*this)(_block);
-	}
-
-	using ASTWalker::operator();
-	void operator()(VariableDeclaration const& _varDecl) override
-	{
-		for (auto const& var: _varDecl.variables)
-			variableTypes[var.name] = var.type;
-	}
-	void operator()(FunctionDefinition const& _funDef) override
-	{
-		ASTWalker::operator()(_funDef);
-
-		auto& funType = functionTypes[_funDef.name];
-		for (auto const& arg: _funDef.parameters)
-		{
-			funType.parameters.emplace_back(arg.type);
-			variableTypes[arg.name] = arg.type;
-		}
-		for (auto const& ret: _funDef.returnVariables)
-		{
-			funType.returns.emplace_back(ret.type);
-			variableTypes[ret.name] = ret.type;
-		}
-	}
-
-	std::map<YulString, YulString> variableTypes;
-	std::map<YulString, FunctionType> functionTypes;
-};
-
-
-TypeInfo::TypeInfo(Dialect const& _dialect, Block const& _ast):
-	m_dialect(_dialect)
-{
-	TypeCollector types(_ast);
-	m_functionTypes = std::move(types.functionTypes);
-	m_variableTypes = std::move(types.variableTypes);
-}
-
-YulString TypeInfo::typeOf(Expression const& _expression) const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionCall const& _funCall) {
-			YulString name = _funCall.functionName.name;
-			std::vector<YulString> const* retTypes = nullptr;
-			if (BuiltinFunction const* fun = m_dialect.builtin(name))
-				retTypes = &fun->returns;
-			else
-				retTypes = &m_functionTypes.at(name).returns;
-			yulAssert(retTypes && retTypes->size() == 1, "Call to typeOf for non-single-value expression.");
-			return retTypes->front();
-		},
-		[&](Identifier const& _identifier) {
-			return m_variableTypes.at(_identifier.name);
-		},
-		[&](Literal const& _literal) {
-			return _literal.type;
-		}
-	}, _expression);
-}
-
-YulString TypeInfo::typeOfVariable(YulString _name) const
-{
-	return m_variableTypes.at(_name);
-}
diff --git a/libyul/optimiser/TypeInfo.h b/libyul/optimiser/TypeInfo.h
deleted file mode 100644
index 5ed0a0d55c5f..000000000000
--- a/libyul/optimiser/TypeInfo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Helper class that keeps track of the types while performing optimizations.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
-
-#include <vector>
-#include <map>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Helper class that keeps track of the types while performing optimizations.
- *
- * Only works on disambiguated sources!
- */
-class TypeInfo
-{
-public:
-	TypeInfo(Dialect const& _dialect, Block const& _ast);
-
-	void setVariableType(YulString _name, YulString _type) { m_variableTypes[_name] = _type; }
-
-	/// @returns the type of an expression that is assumed to return exactly one value.
-	YulString typeOf(Expression const& _expression) const;
-
-	/// \returns the type of variable
-	YulString typeOfVariable(YulString _name) const;
-
-private:
-	class TypeCollector;
-
-	struct FunctionType
-	{
-		std::vector<YulString> parameters;
-		std::vector<YulString> returns;
-	};
-
-	Dialect const& m_dialect;
-	std::map<YulString, YulString> m_variableTypes;
-	std::map<YulString, FunctionType> m_functionTypes;
-};
-
-}
diff --git a/libyul/optimiser/UnusedAssignEliminator.cpp b/libyul/optimiser/UnusedAssignEliminator.cpp
deleted file mode 100644
index f3d78288f3ca..000000000000
--- a/libyul/optimiser/UnusedAssignEliminator.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that removes assignments to variables that are not used
- * until they go out of scope or are re-assigned.
- */
-
-#include <libyul/optimiser/UnusedAssignEliminator.h>
-
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-#include <libyul/AST.h>
-#include <libyul/AsmPrinter.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/action/remove_if.hpp>
-
-#include <iostream>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void UnusedAssignEliminator::run(OptimiserStepContext& _context, Block& _ast)
-{
-	UnusedAssignEliminator uae{
-		_context.dialect,
-		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed()
-	};
-	uae(_ast);
-
-	uae.m_storesToRemove += uae.m_allStores - uae.m_usedStores;
-
-	std::set<Statement const*> toRemove{uae.m_storesToRemove.begin(), uae.m_storesToRemove.end()};
-	StatementRemover remover{toRemove};
-	remover(_ast);
-}
-
-void UnusedAssignEliminator::operator()(Identifier const& _identifier)
-{
-	markUsed(_identifier.name);
-}
-
-void UnusedAssignEliminator::operator()(Assignment const& _assignment)
-{
-	visit(*_assignment.value);
-	// Do not visit the variables because they are Identifiers
-}
-
-
-void UnusedAssignEliminator::operator()(FunctionDefinition const& _functionDefinition)
-{
-	ScopedSaveAndRestore outerReturnVariables(m_returnVariables, {});
-
-	for (auto const& retParam: _functionDefinition.returnVariables)
-		m_returnVariables.insert(retParam.name);
-
-	UnusedStoreBase::operator()(_functionDefinition);
-}
-
-void UnusedAssignEliminator::operator()(FunctionCall const& _functionCall)
-{
-	UnusedStoreBase::operator()(_functionCall);
-
-	ControlFlowSideEffects sideEffects;
-	if (auto builtin = m_dialect.builtin(_functionCall.functionName.name))
-		sideEffects = builtin->controlFlowSideEffects;
-	else
-		sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name);
-
-	if (!sideEffects.canContinue)
-		// We do not return from the current function, so it is OK to also
-		// clear the return variables.
-		m_activeStores.clear();
-}
-
-void UnusedAssignEliminator::operator()(Leave const&)
-{
-	for (YulString name: m_returnVariables)
-		markUsed(name);
-	m_activeStores.clear();
-}
-
-void UnusedAssignEliminator::operator()(Block const& _block)
-{
-	UnusedStoreBase::operator()(_block);
-
-	for (auto const& statement: _block.statements)
-		if (auto const* varDecl = std::get_if<VariableDeclaration>(&statement))
-			for (auto const& var: varDecl->variables)
-				m_activeStores.erase(var.name);
-}
-
-void UnusedAssignEliminator::visit(Statement const& _statement)
-{
-	UnusedStoreBase::visit(_statement);
-
-	if (auto const* assignment = std::get_if<Assignment>(&_statement))
-	{
-		// We do not remove assignments whose values might have side-effects,
-		// but clear the active stores to the assigned variables in any case.
-		if (SideEffectsCollector{m_dialect, *assignment->value}.movable())
-		{
-			m_allStores.insert(&_statement);
-			for (auto const& var: assignment->variableNames)
-				m_activeStores[var.name] = {&_statement};
-		}
-		else
-			for (auto const& var: assignment->variableNames)
-				m_activeStores[var.name].clear();
-	}
-}
-
-void UnusedAssignEliminator::shortcutNestedLoop(ActiveStores const& _zeroRuns)
-{
-	// Shortcut to avoid horrible runtime:
-	// Change all assignments that were newly introduced in the for loop to "used".
-	// We do not have to do that with the "break" or "continue" paths, because
-	// they will be joined later anyway.
-
-	for (auto& [variable, stores]: m_activeStores)
-	{
-		auto zeroIt = _zeroRuns.find(variable);
-		for (auto& assignment: stores)
-		{
-			if (zeroIt != _zeroRuns.end() && zeroIt->second.count(assignment))
-				continue;
-			m_usedStores.insert(assignment);
-		}
-	}
-}
-
-void UnusedAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition)
-{
-	for (auto const& retParam: _functionDefinition.returnVariables)
-		markUsed(retParam.name);
-}
-
-void UnusedAssignEliminator::markUsed(YulString _variable)
-{
-	for (auto& assignment: m_activeStores[_variable])
-		m_usedStores.insert(assignment);
-	m_activeStores.erase(_variable);
-}
diff --git a/libyul/optimiser/UnusedAssignEliminator.h b/libyul/optimiser/UnusedAssignEliminator.h
deleted file mode 100644
index 800d626eb840..000000000000
--- a/libyul/optimiser/UnusedAssignEliminator.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that removes assignments to variables that are not used
- * until they go out of scope or are re-assigned.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/UnusedStoreBase.h>
-#include <libyul/optimiser/Semantics.h>
-
-#include <map>
-#include <vector>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Optimiser component that removes assignments to variables that are not used
- * until they go out of scope or are re-assigned. This component
- * respects the control-flow and takes it into account for removal.
- *
- * Example:
- *
- * {
- *   let a
- *   a := 1
- *   a := 2
- *   b := 2
- *   if calldataload(0)
- *   {
- *     b := mload(a)
- *   }
- *   a := b
- * }
- *
- * In the example, "a := 1" can be removed because the value from this assignment
- * is not used in any control-flow branch (it is replaced right away).
- * The assignment "a := 2" is also overwritten by "a := b" at the end,
- * but there is a control-flow path (through the condition body) which uses
- * the value from "a := 2" and thus, this assignment cannot be removed.
- *
- * Detailed rules:
- *
- * The AST is traversed twice: in an information gathering step and in the
- * actual removal step. During information gathering, assignment statements
- * can be marked as "potentially unused" or as "used".
- *
- * When an assignment is visited, it is stored in the "set of all stores" and
- * added to the branch-dependent "active" sets for the assigned variables. This active
- * set for a variable contains all statements where that variable was last assigned to, i.e.
- * where a read from that variable could read from.
- * Furthermore, all other active sets for the assigned variables are cleared.
- *
- * When a reference to a variable is visited, the active assignments to that variable
- * in the current branch are marked as "used". This mark is permanent.
- * Also, the active set for this variable in the current branch is cleared.
- *
- * At points where control-flow splits, we maintain a copy of the active set
- * (all other data structures are shared across branches).
- *
- * At control-flow joins, we combine the sets of active stores for each variable.
- *
- * In the example above, the active set right after the assignment "b := mload(a)" (but before
- * the control-flow join) is "b := mload(a)"; the assignment "b := 2" was removed.
- * After the control-flow join it will contain both "b := mload(a)" and "b := 2", coming from
- * the two branches.
- *
- * For for-loops, the condition, body and post-part are visited twice, taking
- * the joining control-flow at the condition into account.
- * In other words, we create three control flow paths: Zero runs of the loop,
- * one run and two runs and then combine them at the end.
- * Running at most twice is enough because this takes into account all possible control-flow connections.
- *
- * Since this algorithm has exponential runtime in the nesting depth of for loops,
- * a shortcut is taken at a certain nesting level: We only use the zero- and
- * once-run of the for loop and change any assignment that was newly introduced
- * in the for loop from to "used".
- *
- * For switch statements that have a "default"-case, there is no control-flow
- * part that skips the switch.
- *
- * At ``leave`` statements, all return variables are set to "used" and the set of active statements
- * is cleared.
- *
- * If a function or builtin is called that does not continue, the set of active statements is
- * cleared for all variables.
- *
- * In the second traversal, all assignments that are not marked as "used" are removed.
- *
- * This step is usually run right after the SSA transform to complete
- * the generation of the pseudo-SSA.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class UnusedAssignEliminator: public UnusedStoreBase
-{
-public:
-	static constexpr char const* name{"UnusedAssignEliminator"};
-	static void run(OptimiserStepContext&, Block& _ast);
-
-	explicit UnusedAssignEliminator(
-		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects
-	):
-		UnusedStoreBase(_dialect),
-		m_controlFlowSideEffects(_controlFlowSideEffects)
-	{}
-
-	void operator()(Identifier const& _identifier) override;
-	void operator()(Assignment const& _assignment) override;
-	void operator()(FunctionDefinition const&) override;
-	void operator()(FunctionCall const& _functionCall) override;
-	void operator()(Leave const&) override;
-	void operator()(Block const& _block) override;
-
-	using UnusedStoreBase::visit;
-	void visit(Statement const& _statement) override;
-
-private:
-	void shortcutNestedLoop(ActiveStores const& _beforeLoop) override;
-	void finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition) override;
-
-	void markUsed(YulString _variable);
-
-	std::set<YulString> m_returnVariables;
-	std::map<YulString, ControlFlowSideEffects> m_controlFlowSideEffects;
-};
-
-}
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
deleted file mode 100644
index 40c2fe80c65d..000000000000
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * UnusedFunctionParameterPruner: Optimiser step that removes unused parameters from function
- * definition.
- */
-
-#include <libyul/optimiser/UnusedFunctionParameterPruner.h>
-#include <libyul/optimiser/UnusedFunctionsCommon.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/NameDisplacer.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/YulString.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-
-#include <optional>
-#include <variant>
-
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace solidity::yul::unusedFunctionsCommon;
-
-void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _ast)
-{
-	std::map<YulString, size_t> references = VariableReferencesCounter::countReferences(_ast);
-	auto used = [&](auto v) -> bool { return references.count(v.name); };
-
-	// Function name and a pair of boolean masks, the first corresponds to parameters and the second
-	// corresponds to returnVariables.
-	//
-	// For the first vector in the pair, a value `false` at index `i` indicates that the function
-	// argument at index `i` in `FunctionDefinition::parameters` is unused inside the function body.
-	//
-	// Similarly for the second vector in the pair, a value `false` at index `i` indicates that the
-	// return parameter at index `i` in `FunctionDefinition::returnVariables` is unused inside
-	// function body.
-	std::map<YulString, std::pair<std::vector<bool>, std::vector<bool>>> usedParametersAndReturnVariables;
-
-	// Step 1 of UnusedFunctionParameterPruner: Find functions whose parameters (both arguments and
-	// return-parameters) are not used in its body.
-	for (auto const& statement: _ast.statements)
-		if (std::holds_alternative<FunctionDefinition>(statement))
-		{
-			FunctionDefinition const& f = std::get<FunctionDefinition>(statement);
-
-			if (tooSimpleToBePruned(f) || ranges::all_of(f.parameters + f.returnVariables, used))
-				continue;
-
-			usedParametersAndReturnVariables[f.name] = {
-				applyMap(f.parameters, used),
-				applyMap(f.returnVariables, used)
-			};
-		}
-
-	std::set<YulString> functionNamesToFree = util::keys(usedParametersAndReturnVariables);
-
-	// Step 2 of UnusedFunctionParameterPruner: Renames the function and replaces all references to
-	// the function, say `f`, by its new name, say `f_1`.
-	NameDisplacer replace{_context.dispenser, functionNamesToFree};
-	replace(_ast);
-
-	// Inverse-Map of the above translations. In the above example, this will store an element with
-	// key `f_1` and value `f`.
-	std::map<YulString, YulString> newToOriginalNames = invertMap(replace.translations());
-
-	// Step 3 of UnusedFunctionParameterPruner: introduce a new function in the block with body of
-	// the old one. Replace the body of the old one with a function call to the new one with reduced
-	// parameters.
-	//
-	// For example: introduce a new 'linking' function `f` with the same the body as `f_1`, but with
-	// reduced parameters, i.e., `function f() -> y { y := 1 }`. Now replace the body of `f_1` with
-	// a call to `f`, i.e., `f_1(x) -> y { y := f() }`.
-	iterateReplacing(_ast.statements, [&](Statement& _s) -> std::optional<std::vector<Statement>> {
-		if (std::holds_alternative<FunctionDefinition>(_s))
-		{
-			// The original function except that it has a new name (e.g., `f_1`)
-			FunctionDefinition& originalFunction = std::get<FunctionDefinition>(_s);
-			if (newToOriginalNames.count(originalFunction.name))
-			{
-
-				YulString linkingFunctionName = originalFunction.name;
-				YulString originalFunctionName = newToOriginalNames.at(linkingFunctionName);
-				std::pair<std::vector<bool>, std::vector<bool>> used =
-					usedParametersAndReturnVariables.at(originalFunctionName);
-
-				FunctionDefinition linkingFunction = createLinkingFunction(
-					originalFunction,
-					used,
-					originalFunctionName,
-					linkingFunctionName,
-					_context.dispenser
-				);
-
-				originalFunction.name = originalFunctionName;
-				originalFunction.parameters =
-					filter(originalFunction.parameters, used.first);
-				originalFunction.returnVariables =
-					filter(originalFunction.returnVariables, used.second);
-
-				return make_vector<Statement>(std::move(originalFunction), std::move(linkingFunction));
-			}
-		}
-
-		return std::nullopt;
-	});
-}
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.h b/libyul/optimiser/UnusedFunctionParameterPruner.h
deleted file mode 100644
index 1f62a8b081b6..000000000000
--- a/libyul/optimiser/UnusedFunctionParameterPruner.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * UnusedFunctionParameterPruner: Optimiser step that removes unused parameters in a function.
- *
- * If a parameter is unused, like `c` and `y` in, `function f(a,b,c) -> x, y { x := div(a,b) }`
- *
- * We remove the parameter and create a new "linking" function as follows:
- *
- * `function f(a,b) -> x { x := div(a,b) }`
- * `function f2(a,b,c) -> x, y { x := f(a,b) }`
- *
- * and replace all references to `f` by `f2`.
- * The inliner should be run afterwards to make sure that all references to `f2` are replaced by
- * `f`.
- *
- * Prerequisites: Disambiguator, FunctionHoister, LiteralRematerialiser
- *
- * The step LiteralRematerialiser is not required for correctness. It helps deal with cases such as:
- * `function f(x) -> y { revert(y, y} }` where the literal `y` will be replaced by its value `0`,
- * allowing us to rewrite the function.
- */
-struct UnusedFunctionParameterPruner
-{
-	static constexpr char const* name{"UnusedFunctionParameterPruner"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-};
-
-}
diff --git a/libyul/optimiser/UnusedFunctionsCommon.cpp b/libyul/optimiser/UnusedFunctionsCommon.cpp
deleted file mode 100644
index ed9d0ba4c371..000000000000
--- a/libyul/optimiser/UnusedFunctionsCommon.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/UnusedFunctionsCommon.h>
-
-#include <libyul/Dialect.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace solidity::yul::unusedFunctionsCommon;
-
-FunctionDefinition unusedFunctionsCommon::createLinkingFunction(
-	FunctionDefinition const& _original,
-	std::pair<std::vector<bool>, std::vector<bool>> const& _usedParametersAndReturns,
-	YulString const& _originalFunctionName,
-	YulString const& _linkingFunctionName,
-	NameDispenser& _nameDispenser
-)
-{
-	auto generateTypedName = [&](TypedName t)
-	{
-		return TypedName{
-			t.debugData,
-			_nameDispenser.newName(t.name),
-			t.type
-		};
-	};
-
-	FunctionDefinition linkingFunction{
-		_original.debugData,
-		_linkingFunctionName,
-		util::applyMap(_original.parameters, generateTypedName),
-		util::applyMap(_original.returnVariables, generateTypedName),
-		{_original.debugData, {}} // body
-	};
-
-	FunctionCall call{_original.debugData, Identifier{_original.debugData, _originalFunctionName}, {}};
-	for (auto const& p: filter(linkingFunction.parameters, _usedParametersAndReturns.first))
-		call.arguments.emplace_back(Identifier{_original.debugData, p.name});
-
-	Assignment assignment{_original.debugData, {}, nullptr};
-
-	for (auto const& r: filter(linkingFunction.returnVariables, _usedParametersAndReturns.second))
-		assignment.variableNames.emplace_back(Identifier{_original.debugData, r.name});
-
-	if (assignment.variableNames.empty())
-		linkingFunction.body.statements.emplace_back(ExpressionStatement{_original.debugData, std::move(call)});
-	else
-	{
-		assignment.value = std::make_unique<Expression>(std::move(call));
-		linkingFunction.body.statements.emplace_back(std::move(assignment));
-	}
-
-	return linkingFunction;
-}
diff --git a/libyul/optimiser/UnusedFunctionsCommon.h b/libyul/optimiser/UnusedFunctionsCommon.h
deleted file mode 100644
index 2b0f3000dfda..000000000000
--- a/libyul/optimiser/UnusedFunctionsCommon.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <libyul/AST.h>
-
-namespace solidity::yul::unusedFunctionsCommon
-{
-
-/// Returns true if applying UnusedFunctionParameterPruner is not helpful or redundant because the
-/// inliner will be able to handle it anyway.
-inline bool tooSimpleToBePruned(FunctionDefinition const& _f)
-{
-	return _f.body.statements.size() <= 1 && CodeSize::codeSize(_f.body) <= 1;
-}
-
-/// Given a function definition `_original`, this function returns a 'linking' function that calls
-/// `_originalFunctionName` (with reduced parameters and return values).
-///
-/// The parameter `_usedParametersAndReturnVariables` is a pair of boolean-vectors. Its `.first`
-/// corresponds to function parameters and its `.second` corresponds to function return-variables. A
-/// false value at index `i` means that the corresponding function parameter / return-variable at
-/// index `i` is unused.
-///
-/// Example:
-///
-/// Let `_original` be the function `function f_1() -> y { }`. (In practice, this function usually cannot
-/// be inlined and has parameters / return-variables that are unused.)
-/// Let `_usedParametersAndReturnVariables` be `({}, {false})`
-/// Let `_originalFunctionName` be `f`.
-/// Let `_linkingFunctionName` be `f_1`.
-///
-/// Then the returned linking function would be `function f_1() -> y_1 { f() }`
-FunctionDefinition createLinkingFunction(
-	FunctionDefinition const& _original,
-	std::pair<std::vector<bool>, std::vector<bool>> const& _usedParametersAndReturns,
-	YulString const& _originalFunctionName,
-	YulString const& _linkingFunctionName,
-	NameDispenser& _nameDispenser
-);
-
-}
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
deleted file mode 100644
index a64f37ebedeb..000000000000
--- a/libyul/optimiser/UnusedPruner.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*(
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Optimisation stage that removes unused variables and functions.
- */
-
-#include <libyul/optimiser/UnusedPruner.h>
-
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/Exceptions.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/SideEffects.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void UnusedPruner::run(OptimiserStepContext& _context, Block& _ast)
-{
-	UnusedPruner::runUntilStabilisedOnFullAST(_context.dialect, _ast, _context.reservedIdentifiers);
-	FunctionGrouper::run(_context, _ast);
-}
-
-UnusedPruner::UnusedPruner(
-	Dialect const& _dialect,
-	Block& _ast,
-	bool _allowMSizeOptimization,
-	std::map<YulString, SideEffects> const* _functionSideEffects,
-	std::set<YulString> const& _externallyUsedFunctions
-):
-	m_dialect(_dialect),
-	m_allowMSizeOptimization(_allowMSizeOptimization),
-	m_functionSideEffects(_functionSideEffects)
-{
-	m_references = ReferencesCounter::countReferences(_ast);
-	for (auto const& f: _externallyUsedFunctions)
-		++m_references[f];
-}
-
-UnusedPruner::UnusedPruner(
-	Dialect const& _dialect,
-	FunctionDefinition& _function,
-	bool _allowMSizeOptimization,
-	std::set<YulString> const& _externallyUsedFunctions
-):
-	m_dialect(_dialect),
-	m_allowMSizeOptimization(_allowMSizeOptimization)
-{
-	m_references = ReferencesCounter::countReferences(_function);
-	for (auto const& f: _externallyUsedFunctions)
-		++m_references[f];
-}
-
-void UnusedPruner::operator()(Block& _block)
-{
-	for (auto&& statement: _block.statements)
-		if (std::holds_alternative<FunctionDefinition>(statement))
-		{
-			FunctionDefinition& funDef = std::get<FunctionDefinition>(statement);
-			if (!used(funDef.name))
-			{
-				subtractReferences(ReferencesCounter::countReferences(funDef.body));
-				statement = Block{std::move(funDef.debugData), {}};
-			}
-		}
-		else if (std::holds_alternative<VariableDeclaration>(statement))
-		{
-			VariableDeclaration& varDecl = std::get<VariableDeclaration>(statement);
-			// Multi-variable declarations are special. We can only remove it
-			// if all variables are unused and the right-hand-side is either
-			// movable or it returns a single value. In the latter case, we
-			// replace `let a := f()` by `pop(f())` (in pure Yul, this will be
-			// `drop(f())`).
-			if (std::none_of(
-				varDecl.variables.begin(),
-				varDecl.variables.end(),
-				[&](TypedName const& _typedName) { return used(_typedName.name); }
-			))
-			{
-				if (!varDecl.value)
-					statement = Block{std::move(varDecl.debugData), {}};
-				else if (
-					SideEffectsCollector(m_dialect, *varDecl.value, m_functionSideEffects).
-					canBeRemoved(m_allowMSizeOptimization)
-				)
-				{
-					subtractReferences(ReferencesCounter::countReferences(*varDecl.value));
-					statement = Block{std::move(varDecl.debugData), {}};
-				}
-				else if (varDecl.variables.size() == 1 && m_dialect.discardFunction(varDecl.variables.front().type))
-					statement = ExpressionStatement{varDecl.debugData, FunctionCall{
-						varDecl.debugData,
-						{varDecl.debugData, m_dialect.discardFunction(varDecl.variables.front().type)->name},
-						{*std::move(varDecl.value)}
-					}};
-			}
-		}
-		else if (std::holds_alternative<ExpressionStatement>(statement))
-		{
-			ExpressionStatement& exprStmt = std::get<ExpressionStatement>(statement);
-			if (
-				SideEffectsCollector(m_dialect, exprStmt.expression, m_functionSideEffects).
-				canBeRemoved(m_allowMSizeOptimization)
-			)
-			{
-				subtractReferences(ReferencesCounter::countReferences(exprStmt.expression));
-				statement = Block{std::move(exprStmt.debugData), {}};
-			}
-		}
-
-	removeEmptyBlocks(_block);
-
-	ASTModifier::operator()(_block);
-}
-
-void UnusedPruner::runUntilStabilised(
-	Dialect const& _dialect,
-	Block& _ast,
-	bool _allowMSizeOptimization,
-	std::map<YulString, SideEffects> const* _functionSideEffects,
-	std::set<YulString> const& _externallyUsedFunctions
-)
-{
-	while (true)
-	{
-		UnusedPruner pruner(
-			_dialect, _ast, _allowMSizeOptimization, _functionSideEffects,
-							_externallyUsedFunctions);
-		pruner(_ast);
-		if (!pruner.shouldRunAgain())
-			return;
-	}
-}
-
-void UnusedPruner::runUntilStabilisedOnFullAST(
-	Dialect const& _dialect,
-	Block& _ast,
-	std::set<YulString> const& _externallyUsedFunctions
-)
-{
-	std::map<YulString, SideEffects> functionSideEffects =
-		SideEffectsPropagator::sideEffects(_dialect, CallGraphGenerator::callGraph(_ast));
-	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _ast);
-	runUntilStabilised(_dialect, _ast, allowMSizeOptimization, &functionSideEffects, _externallyUsedFunctions);
-}
-
-void UnusedPruner::runUntilStabilised(
-	Dialect const& _dialect,
-	FunctionDefinition& _function,
-	bool _allowMSizeOptimization,
-	std::set<YulString> const& _externallyUsedFunctions
-)
-{
-	while (true)
-	{
-		UnusedPruner pruner(_dialect, _function, _allowMSizeOptimization, _externallyUsedFunctions);
-		pruner(_function);
-		if (!pruner.shouldRunAgain())
-			return;
-	}
-}
-
-bool UnusedPruner::used(YulString _name) const
-{
-	return m_references.count(_name) && m_references.at(_name) > 0;
-}
-
-void UnusedPruner::subtractReferences(std::map<YulString, size_t> const& _subtrahend)
-{
-	for (auto const& ref: _subtrahend)
-	{
-		assertThrow(m_references.count(ref.first), OptimizerException, "");
-		assertThrow(m_references.at(ref.first) >= ref.second, OptimizerException, "");
-		m_references[ref.first] -= ref.second;
-		m_shouldRunAgain = true;
-	}
-}
diff --git a/libyul/optimiser/UnusedPruner.h b/libyul/optimiser/UnusedPruner.h
deleted file mode 100644
index e4587d5d725b..000000000000
--- a/libyul/optimiser/UnusedPruner.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimisation stage that removes unused variables and functions.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/YulString.h>
-
-#include <map>
-#include <set>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct SideEffects;
-
-/**
- * Optimisation stage that removes unused variables and functions and also
- * removes side-effect-free expression statements.
- *
- * If msize is used, we cannot remove any statements that access memory.
- * Because of that, the Unused Pruner should only be invoked on full ASTs,
- * such that it can check for the presence of msize itself, or
- * the `_allowMSizeOptimization` needs to be passed.
- *
- * Note that this does not remove circular references.
- *
- * Prerequisite: Disambiguator
- */
-class UnusedPruner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"UnusedPruner"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-
-	using ASTModifier::operator();
-	void operator()(Block& _block) override;
-
-	// @returns true iff the code changed in the previous run.
-	bool shouldRunAgain() const { return m_shouldRunAgain; }
-
-	// Run the pruner until the code does not change anymore.
-	static void runUntilStabilised(
-		Dialect const& _dialect,
-		Block& _ast,
-		bool _allowMSizeOptimization,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr,
-		std::set<YulString> const& _externallyUsedFunctions = {}
-	);
-
-	static void run(
-		Dialect const& _dialect,
-		Block& _ast,
-		std::set<YulString> const& _externallyUsedFunctions = {}
-	)
-	{
-		runUntilStabilisedOnFullAST(_dialect, _ast, _externallyUsedFunctions);
-	}
-
-	/// Run the pruner until the code does not change anymore.
-	/// The provided block has to be a full AST.
-	/// The pruner itself determines if msize is used and which user-defined functions
-	/// are side-effect free.
-	static void runUntilStabilisedOnFullAST(
-		Dialect const& _dialect,
-		Block& _ast,
-		std::set<YulString> const& _externallyUsedFunctions = {}
-	);
-
-	// Run the pruner until the code does not change anymore.
-	// Only run on the given function.
-	// @param _allowMSizeOptimization if true, allows to remove instructions
-	//        whose only side-effect is a potential change of the return value of
-	//        the msize instruction.
-	static void runUntilStabilised(
-		Dialect const& _dialect,
-		FunctionDefinition& _functionDefinition,
-		bool _allowMSizeOptimization,
-		std::set<YulString> const& _externallyUsedFunctions = {}
-	);
-
-private:
-	UnusedPruner(
-		Dialect const& _dialect,
-		Block& _ast,
-		bool _allowMSizeOptimization,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr,
-		std::set<YulString> const& _externallyUsedFunctions = {}
-	);
-	UnusedPruner(
-		Dialect const& _dialect,
-		FunctionDefinition& _function,
-		bool _allowMSizeOptimization,
-		std::set<YulString> const& _externallyUsedFunctions = {}
-	);
-
-	bool used(YulString _name) const;
-	void subtractReferences(std::map<YulString, size_t> const& _subtrahend);
-
-	Dialect const& m_dialect;
-	bool m_allowMSizeOptimization = false;
-	std::map<YulString, SideEffects> const* m_functionSideEffects = nullptr;
-	bool m_shouldRunAgain = false;
-	std::map<YulString, size_t> m_references;
-};
-
-}
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
deleted file mode 100644
index 977db11c4c12..000000000000
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
- */
-
-#include <libyul/optimiser/UnusedStoreBase.h>
-
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <range/v3/action/remove_if.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void UnusedStoreBase::operator()(If const& _if)
-{
-	visit(*_if.condition);
-
-	ActiveStores skipBranch{m_activeStores};
-	(*this)(_if.body);
-
-	merge(m_activeStores, std::move(skipBranch));
-}
-
-void UnusedStoreBase::operator()(Switch const& _switch)
-{
-	visit(*_switch.expression);
-
-	ActiveStores const preState{m_activeStores};
-
-	bool hasDefault = false;
-	std::vector<ActiveStores> branches;
-	for (auto const& c: _switch.cases)
-	{
-		if (!c.value)
-			hasDefault = true;
-		(*this)(c.body);
-		branches.emplace_back(std::move(m_activeStores));
-		m_activeStores = preState;
-	}
-
-	if (hasDefault)
-	{
-		m_activeStores = std::move(branches.back());
-		branches.pop_back();
-	}
-	for (auto& branch: branches)
-		merge(m_activeStores, std::move(branch));
-}
-
-void UnusedStoreBase::operator()(FunctionDefinition const& _functionDefinition)
-{
-	ScopedSaveAndRestore allStores(m_allStores, {});
-	ScopedSaveAndRestore usedStores(m_usedStores, {});
-	ScopedSaveAndRestore outerAssignments(m_activeStores, {});
-	ScopedSaveAndRestore forLoopInfo(m_forLoopInfo, {});
-	ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, 0);
-
-	(*this)(_functionDefinition.body);
-
-	finalizeFunctionDefinition(_functionDefinition);
-	m_storesToRemove += m_allStores - m_usedStores;
-}
-
-void UnusedStoreBase::operator()(ForLoop const& _forLoop)
-{
-	ScopedSaveAndRestore outerForLoopInfo(m_forLoopInfo, {});
-	ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, m_forLoopNestingDepth + 1);
-
-	// If the pre block was not empty,
-	// we would have to deal with more complicated scoping rules.
-	assertThrow(_forLoop.pre.statements.empty(), OptimizerException, "");
-
-	// We just run the loop twice to account for the back edge.
-	// There need not be more runs because we only have three different states.
-
-	visit(*_forLoop.condition);
-
-	ActiveStores zeroRuns{m_activeStores};
-
-	(*this)(_forLoop.body);
-	merge(m_activeStores, std::move(m_forLoopInfo.pendingContinueStmts));
-	m_forLoopInfo.pendingContinueStmts = {};
-	(*this)(_forLoop.post);
-
-	visit(*_forLoop.condition);
-
-	if (m_forLoopNestingDepth < 6)
-	{
-		// Do the second run only for small nesting depths to avoid horrible runtime.
-		ActiveStores oneRun{m_activeStores};
-
-		(*this)(_forLoop.body);
-
-		merge(m_activeStores, std::move(m_forLoopInfo.pendingContinueStmts));
-		m_forLoopInfo.pendingContinueStmts.clear();
-		(*this)(_forLoop.post);
-
-		visit(*_forLoop.condition);
-		// Order of merging does not matter because "max" is commutative and associative.
-		merge(m_activeStores, std::move(oneRun));
-	}
-	else
-		// Shortcut to avoid horrible runtime.
-		shortcutNestedLoop(zeroRuns);
-
-	// Order of merging does not matter because "max" is commutative and associative.
-	merge(m_activeStores, std::move(zeroRuns));
-	merge(m_activeStores, std::move(m_forLoopInfo.pendingBreakStmts));
-	m_forLoopInfo.pendingBreakStmts.clear();
-}
-
-void UnusedStoreBase::operator()(Break const&)
-{
-	m_forLoopInfo.pendingBreakStmts.emplace_back(std::move(m_activeStores));
-	m_activeStores.clear();
-}
-
-void UnusedStoreBase::operator()(Continue const&)
-{
-	m_forLoopInfo.pendingContinueStmts.emplace_back(std::move(m_activeStores));
-	m_activeStores.clear();
-}
-
-void UnusedStoreBase::merge(ActiveStores& _target, ActiveStores&& _other)
-{
-	util::joinMap(_target, std::move(_other), [](
-		std::set<Statement const*>& _storesHere,
-		std::set<Statement const*>&& _storesThere
-	)
-	{
-		_storesHere += _storesThere;
-	});
-}
-
-void UnusedStoreBase::merge(ActiveStores& _target, std::vector<ActiveStores>&& _source)
-{
-	for (ActiveStores& ts: _source)
-		merge(_target, std::move(ts));
-	_source.clear();
-}
diff --git a/libyul/optimiser/UnusedStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
deleted file mode 100644
index 0d618d8d254f..000000000000
--- a/libyul/optimiser/UnusedStoreBase.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AST.h>
-
-#include <range/v3/action/remove_if.hpp>
-
-#include <variant>
-
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
- *
- * The class tracks the state of abstract "stores" (assignments or mstore/sstore
- * statements) across the control-flow. It is the job of the derived class to create
- * the stores and track references, but the base class manages control-flow splits and joins.
- *
- * In general, active stores are those where it has not yet been determined if they are used
- * or not. Those are split and joined at control-flow forks. Once a store has been deemed
- * used, it is removed from the active set and marked as used and this will never change.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class UnusedStoreBase: public ASTWalker
-{
-public:
-	explicit UnusedStoreBase(Dialect const& _dialect): m_dialect(_dialect) {}
-
-	using ASTWalker::operator();
-	void operator()(If const& _if) override;
-	void operator()(Switch const& _switch) override;
-	void operator()(FunctionDefinition const&) override;
-	void operator()(ForLoop const&) override;
-	void operator()(Break const&) override;
-	void operator()(Continue const&) override;
-
-protected:
-	using ActiveStores = std::map<YulString, std::set<Statement const*>>;
-
-	/// This function is called for a loop that is nested too deep to avoid
-	/// horrible runtime and should just resolve the situation in a pragmatic
-	/// and correct manner.
-	virtual void shortcutNestedLoop(ActiveStores const& _beforeLoop) = 0;
-
-	/// This function is called right before the scoped restore of the function definition.
-	virtual void finalizeFunctionDefinition(FunctionDefinition const& /*_functionDefinition*/) {}
-
-	/// Joins the assignment mapping of @a _source into @a _target according to the rules laid out
-	/// above.
-	/// Will destroy @a _source.
-	static void merge(ActiveStores& _target, ActiveStores&& _source);
-	static void merge(ActiveStores& _target, std::vector<ActiveStores>&& _source);
-
-	Dialect const& m_dialect;
-	/// Set of all stores encountered during the traversal (in the current function).
-	std::set<Statement const*> m_allStores;
-	/// Set of stores that are marked as being used (in the current function).
-	std::set<Statement const*> m_usedStores;
-	/// List of stores that can be removed (globally).
-	std::vector<Statement const*> m_storesToRemove;
-	/// Active (undecided) stores in the current branch.
-	ActiveStores m_activeStores;
-
-	/// Working data for traversing for-loops.
-	struct ForLoopInfo
-	{
-		/// Tracked assignment states for each break statement.
-		std::vector<ActiveStores> pendingBreakStmts;
-		/// Tracked assignment states for each continue statement.
-		std::vector<ActiveStores> pendingContinueStmts;
-	};
-	ForLoopInfo m_forLoopInfo;
-	size_t m_forLoopNestingDepth = 0;
-};
-
-}
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
deleted file mode 100644
index d88b07f6b158..000000000000
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that removes stores to memory and storage slots that are not used
- * or overwritten later on.
- */
-
-#include <libyul/optimiser/UnusedStoreEliminator.h>
-
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/KnowledgeBase.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-#include <libyul/AST.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/SemanticInformation.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-/// Variable names for special constants that can never appear in actual Yul code.
-static std::string const zero{"@ 0"};
-static std::string const one{"@ 1"};
-static std::string const thirtyTwo{"@ 32"};
-
-
-void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
-{
-	std::map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
-		_context.dialect,
-		CallGraphGenerator::callGraph(_ast)
-	);
-
-	SSAValueTracker ssaValues;
-	ssaValues(_ast);
-	std::map<YulString, AssignedValue> values;
-	for (auto const& [name, expression]: ssaValues.values())
-		values[name] = AssignedValue{expression, {}};
-	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
-	Expression const oneLiteral{Literal{{}, LiteralKind::Number, YulString{"1"}, {}}};
-	Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, YulString{"32"}, {}}};
-	values[YulString{zero}] = AssignedValue{&zeroLiteral, {}};
-	values[YulString{one}] = AssignedValue{&oneLiteral, {}};
-	values[YulString{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}};
-
-	bool const ignoreMemory = MSizeFinder::containsMSize(_context.dialect, _ast);
-	UnusedStoreEliminator rse{
-		_context.dialect,
-		functionSideEffects,
-		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed(),
-		values,
-		ignoreMemory
-	};
-	rse(_ast);
-
-	auto evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
-	if (evmDialect && evmDialect->providesObjectAccess())
-		rse.clearActive(Location::Memory);
-	else
-		rse.markActiveAsUsed(Location::Memory);
-	rse.markActiveAsUsed(Location::Storage);
-	rse.m_storesToRemove += rse.m_allStores - rse.m_usedStores;
-
-	std::set<Statement const*> toRemove{rse.m_storesToRemove.begin(), rse.m_storesToRemove.end()};
-	StatementRemover remover{toRemove};
-	remover(_ast);
-}
-
-UnusedStoreEliminator::UnusedStoreEliminator(
-	Dialect const& _dialect,
-	std::map<YulString, SideEffects> const& _functionSideEffects,
-	std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
-	std::map<YulString, AssignedValue> const& _ssaValues,
-	bool _ignoreMemory
-):
-	UnusedStoreBase(_dialect),
-	m_ignoreMemory(_ignoreMemory),
-	m_functionSideEffects(_functionSideEffects),
-	m_controlFlowSideEffects(_controlFlowSideEffects),
-	m_ssaValues(_ssaValues),
-	m_knowledgeBase(_ssaValues)
-{}
-
-void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall)
-{
-	UnusedStoreBase::operator()(_functionCall);
-
-	for (Operation const& op: operationsFromFunctionCall(_functionCall))
-		applyOperation(op);
-
-	ControlFlowSideEffects sideEffects;
-	if (auto builtin = m_dialect.builtin(_functionCall.functionName.name))
-		sideEffects = builtin->controlFlowSideEffects;
-	else
-		sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name);
-
-	if (sideEffects.canTerminate)
-		markActiveAsUsed(Location::Storage);
-	if (!sideEffects.canContinue)
-	{
-		clearActive(Location::Memory);
-		if (!sideEffects.canTerminate)
-			clearActive(Location::Storage);
-	}
-}
-
-void UnusedStoreEliminator::operator()(FunctionDefinition const& _functionDefinition)
-{
-	ScopedSaveAndRestore storeOperations(m_storeOperations, {});
-	UnusedStoreBase::operator()(_functionDefinition);
-}
-
-
-void UnusedStoreEliminator::operator()(Leave const&)
-{
-	markActiveAsUsed();
-}
-
-void UnusedStoreEliminator::visit(Statement const& _statement)
-{
-	using evmasm::Instruction;
-
-	UnusedStoreBase::visit(_statement);
-
-	auto const* exprStatement = std::get_if<ExpressionStatement>(&_statement);
-	if (!exprStatement)
-		return;
-
-	FunctionCall const* funCall = std::get_if<FunctionCall>(&exprStatement->expression);
-	yulAssert(funCall);
-	std::optional<Instruction> instruction = toEVMInstruction(m_dialect, funCall->functionName.name);
-	if (!instruction)
-		return;
-
-	if (!ranges::all_of(funCall->arguments, [](Expression const& _expr) -> bool {
-		return std::get_if<Identifier>(&_expr) || std::get_if<Literal>(&_expr);
-	}))
-		return;
-
-	// We determine if this is a store instruction without additional side-effects
-	// both by querying a combination of semantic information and by listing the instructions.
-	// This way the assert below should be triggered on any change.
-	using evmasm::SemanticInformation;
-	bool isStorageWrite = (*instruction == Instruction::SSTORE);
-	bool isMemoryWrite =
-		*instruction == Instruction::EXTCODECOPY ||
-		*instruction == Instruction::CODECOPY ||
-		*instruction == Instruction::CALLDATACOPY ||
-		*instruction == Instruction::RETURNDATACOPY ||
-		*instruction == Instruction::MSTORE ||
-		*instruction == Instruction::MSTORE8;
-	bool isCandidateForRemoval =
-		SemanticInformation::otherState(*instruction) != SemanticInformation::Write && (
-			SemanticInformation::storage(*instruction) == SemanticInformation::Write ||
-			(!m_ignoreMemory && SemanticInformation::memory(*instruction) == SemanticInformation::Write)
-		);
-	yulAssert(isCandidateForRemoval == (isStorageWrite || (!m_ignoreMemory && isMemoryWrite)));
-	if (isCandidateForRemoval)
-	{
-		if (*instruction == Instruction::RETURNDATACOPY)
-		{
-			// Out-of-bounds access to the returndata buffer results in a revert,
-			// so we are careful not to remove a potentially reverting call to a builtin.
-			// The only way the Solidity compiler uses `returndatacopy` is
-			// `returndatacopy(X, 0, returndatasize())`, so we only allow to remove this pattern
-			// (which is guaranteed to never cause an out-of-bounds revert).
-			bool allowReturndatacopyToBeRemoved = false;
-			auto startOffset = identifierNameIfSSA(funCall->arguments.at(1));
-			auto length = identifierNameIfSSA(funCall->arguments.at(2));
-			if (length && startOffset)
-			{
-				FunctionCall const* lengthCall = std::get_if<FunctionCall>(m_ssaValues.at(*length).value);
-				if (
-					m_knowledgeBase.knownToBeZero(*startOffset) &&
-					lengthCall &&
-					toEVMInstruction(m_dialect, lengthCall->functionName.name) == Instruction::RETURNDATASIZE
-				)
-					allowReturndatacopyToBeRemoved = true;
-			}
-			if (!allowReturndatacopyToBeRemoved)
-				return;
-		}
-		m_allStores.insert(&_statement);
-		std::vector<Operation> operations = operationsFromFunctionCall(*funCall);
-		yulAssert(operations.size() == 1, "");
-		if (operations.front().location == Location::Storage)
-			activeStorageStores().insert(&_statement);
-		else
-			activeMemoryStores().insert(&_statement);
-		m_storeOperations[&_statement] = std::move(operations.front());
-	}
-}
-
-std::vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFunctionCall(
-	FunctionCall const& _functionCall
-) const
-{
-	using evmasm::Instruction;
-
-	YulString functionName = _functionCall.functionName.name;
-	SideEffects sideEffects;
-	if (BuiltinFunction const* f = m_dialect.builtin(functionName))
-		sideEffects = f->sideEffects;
-	else
-		sideEffects = m_functionSideEffects.at(functionName);
-
-	std::optional<Instruction> instruction = toEVMInstruction(m_dialect, functionName);
-	if (!instruction)
-	{
-		std::vector<Operation> result;
-		// Unknown read is worse than unknown write.
-		if (sideEffects.memory != SideEffects::Effect::None)
-			result.emplace_back(Operation{Location::Memory, Effect::Read, {}, {}});
-		if (sideEffects.storage != SideEffects::Effect::None)
-			result.emplace_back(Operation{Location::Storage, Effect::Read, {}, {}});
-		return result;
-	}
-
-	using evmasm::SemanticInformation;
-
-	return util::applyMap(
-		SemanticInformation::readWriteOperations(*instruction),
-		[&](SemanticInformation::Operation const& _op) -> Operation
-		{
-			yulAssert(!(_op.lengthParameter && _op.lengthConstant));
-			yulAssert(_op.effect != Effect::None);
-			Operation ourOp{_op.location, _op.effect, {}, {}};
-			if (_op.startParameter)
-				ourOp.start = identifierNameIfSSA(_functionCall.arguments.at(*_op.startParameter));
-			if (_op.lengthParameter)
-				ourOp.length = identifierNameIfSSA(_functionCall.arguments.at(*_op.lengthParameter));
-			if (_op.lengthConstant)
-				switch (*_op.lengthConstant)
-				{
-				case 1: ourOp.length = YulString(one); break;
-				case 32: ourOp.length = YulString(thirtyTwo); break;
-				default: yulAssert(false);
-				}
-			return ourOp;
-		}
-	);
-}
-
-void UnusedStoreEliminator::applyOperation(UnusedStoreEliminator::Operation const& _operation)
-{
-	std::set<Statement const*>& active =
-		_operation.location == Location::Storage ?
-		activeStorageStores() :
-		activeMemoryStores();
-
-
-	for (auto it = active.begin(); it != active.end();)
-	{
-		Statement const* statement = *it;
-		Operation const& storeOperation = m_storeOperations.at(statement);
-		if (_operation.effect == Effect::Read && !knownUnrelated(storeOperation, _operation))
-		{
-			// This store is read from, mark it as used and remove it from the active set.
-			m_usedStores.insert(statement);
-			it = active.erase(it);
-		}
-		else if (_operation.effect == Effect::Write && knownCovered(storeOperation, _operation))
-			// This store is overwritten before being read, remove it from the active set.
-			it = active.erase(it);
-		else
-			++it;
-	}
-}
-
-bool UnusedStoreEliminator::knownUnrelated(
-	UnusedStoreEliminator::Operation const& _op1,
-	UnusedStoreEliminator::Operation const& _op2
-) const
-{
-	if (_op1.location != _op2.location)
-		return true;
-	if (_op1.location == Location::Storage)
-	{
-		if (_op1.start && _op2.start)
-		{
-			yulAssert(
-				_op1.length &&
-				_op2.length &&
-				m_knowledgeBase.valueIfKnownConstant(*_op1.length) == 1 &&
-				m_knowledgeBase.valueIfKnownConstant(*_op2.length) == 1
-			);
-			return m_knowledgeBase.knownToBeDifferent(*_op1.start, *_op2.start);
-		}
-	}
-	else
-	{
-		yulAssert(_op1.location == Location::Memory, "");
-		if (
-			(_op1.length && m_knowledgeBase.knownToBeZero(*_op1.length)) ||
-			(_op2.length && m_knowledgeBase.knownToBeZero(*_op2.length))
-		)
-			return true;
-
-		if (_op1.start && _op1.length && _op2.start)
-		{
-			std::optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
-			std::optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
-			std::optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
-			if (
-				(length1 && start1 && start2) &&
-				*start1 + *length1 >= *start1 && // no overflow
-				*start1 + *length1 <= *start2
-			)
-				return true;
-		}
-		if (_op2.start && _op2.length && _op1.start)
-		{
-			std::optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
-			std::optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
-			std::optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
-			if (
-				(length2 && start2 && start1) &&
-				*start2 + *length2 >= *start2 && // no overflow
-				*start2 + *length2 <= *start1
-			)
-				return true;
-		}
-
-		if (_op1.start && _op1.length && _op2.start && _op2.length)
-		{
-			std::optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
-			std::optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
-			if (
-				(length1 && *length1 <= 32) &&
-				(length2 && *length2 <= 32) &&
-				m_knowledgeBase.knownToBeDifferentByAtLeast32(*_op1.start, *_op2.start)
-			)
-				return true;
-		}
-	}
-
-	return false;
-}
-
-bool UnusedStoreEliminator::knownCovered(
-	UnusedStoreEliminator::Operation const& _covered,
-	UnusedStoreEliminator::Operation const& _covering
-) const
-{
-	if (_covered.location != _covering.location)
-		return false;
-	if (
-		(_covered.start && _covered.start == _covering.start) &&
-		(_covered.length && _covered.length == _covering.length)
-	)
-		return true;
-	if (_covered.location == Location::Memory)
-	{
-		if (_covered.length && m_knowledgeBase.knownToBeZero(*_covered.length))
-			return true;
-
-		// Condition (i = cover_i_ng, e = cover_e_d):
-		// i.start <= e.start && e.start + e.length <= i.start + i.length
-		if (!_covered.start || !_covering.start || !_covered.length || !_covering.length)
-			return false;
-		std::optional<u256> coveredLength = m_knowledgeBase.valueIfKnownConstant(*_covered.length);
-		std::optional<u256> coveringLength = m_knowledgeBase.valueIfKnownConstant(*_covering.length);
-		if (*_covered.start == *_covering.start)
-			if (coveredLength && coveringLength && *coveredLength <= *coveringLength)
-				return true;
-		std::optional<u256> coveredStart = m_knowledgeBase.valueIfKnownConstant(*_covered.start);
-		std::optional<u256> coveringStart = m_knowledgeBase.valueIfKnownConstant(*_covering.start);
-		if (coveredStart && coveringStart && coveredLength && coveringLength)
-			if (
-				*coveringStart <= *coveredStart &&
-				*coveringStart + *coveringLength >= *coveringStart && // no overflow
-				*coveredStart + *coveredLength >= *coveredStart && // no overflow
-				*coveredStart + *coveredLength <= *coveringStart + *coveringLength
-			)
-				return true;
-
-		// TODO for this we probably need a non-overflow assumption as above.
-		// Condition (i = cover_i_ng, e = cover_e_d):
-		// i.start <= e.start && e.start + e.length <= i.start + i.length
-	}
-	return false;
-}
-
-void UnusedStoreEliminator::markActiveAsUsed(
-	std::optional<UnusedStoreEliminator::Location> _onlyLocation
-)
-{
-	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Memory)
-		for (Statement const* statement: activeMemoryStores())
-			m_usedStores.insert(statement);
-	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Storage)
-		for (Statement const* statement: activeStorageStores())
-			m_usedStores.insert(statement);
-	clearActive(_onlyLocation);
-}
-
-void UnusedStoreEliminator::clearActive(
-	std::optional<UnusedStoreEliminator::Location> _onlyLocation
-)
-{
-	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Memory)
-		activeMemoryStores() = {};
-	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Storage)
-		activeStorageStores() = {};
-}
-
-std::optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
-{
-	if (Identifier const* identifier = std::get_if<Identifier>(&_expression))
-		if (m_ssaValues.count(identifier->name))
-			return {identifier->name};
-	return std::nullopt;
-}
diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h
deleted file mode 100644
index 89dbabd78d2c..000000000000
--- a/libyul/optimiser/UnusedStoreEliminator.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Optimiser component that removes stores to memory and storage slots that are not used
- * or overwritten later on.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/UnusedStoreBase.h>
-#include <libyul/optimiser/KnowledgeBase.h>
-
-#include <libevmasm/SemanticInformation.h>
-
-#include <map>
-#include <vector>
-
-namespace solidity::yul
-{
-struct Dialect;
-struct AssignedValue;
-
-/**
- * Optimizer component that removes sstore and memory store statements if conditions are met for their removal.
- * In case of an sstore, if all outgoing code paths revert (due to an explicit revert(), invalid(),
- * or infinite recursion) or lead to another ``sstore`` for which the optimizer can tell that it will overwrite the first store,
- * the statement will be removed.
- *
- * For memory store operations, things are generally simpler, at least in the outermost yul block as all such statements
- * will be removed if they are never read from in any code path. At function analysis level however, the approach is similar
- * to sstore, as we don't know whether the memory location will be read once we leave the function's scope,
- * so the statement will be removed only if all code code paths lead to a memory overwrite.
- *
- * The m_store member of UnusedStoreBase uses the key "m" for memory and "s" for storage stores.
- *
- * Best run in SSA form.
- *
- * Prerequisite: Disambiguator, ForLoopInitRewriter.
- */
-class UnusedStoreEliminator: public UnusedStoreBase
-{
-public:
-	static constexpr char const* name{"UnusedStoreEliminator"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-
-	explicit UnusedStoreEliminator(
-		Dialect const& _dialect,
-		std::map<YulString, SideEffects> const& _functionSideEffects,
-		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
-		std::map<YulString, AssignedValue> const& _ssaValues,
-		bool _ignoreMemory
-	);
-
-	using UnusedStoreBase::operator();
-	void operator()(FunctionCall const& _functionCall) override;
-	void operator()(FunctionDefinition const&) override;
-	void operator()(Leave const&) override;
-
-	using UnusedStoreBase::visit;
-	void visit(Statement const& _statement) override;
-
-	using Location = evmasm::SemanticInformation::Location;
-	using Effect = evmasm::SemanticInformation::Effect;
-	struct Operation
-	{
-		Location location;
-		Effect effect;
-		/// Start of affected area. Unknown if not provided.
-		std::optional<YulString> start;
-		/// Length of affected area, unknown if not provided.
-		/// Unused for storage.
-		std::optional<YulString> length;
-	};
-
-private:
-	std::set<Statement const*>& activeMemoryStores() { return m_activeStores["m"_yulstring]; }
-	std::set<Statement const*>& activeStorageStores() { return m_activeStores["s"_yulstring]; }
-
-	void shortcutNestedLoop(ActiveStores const&) override
-	{
-		// We might only need to do this for newly introduced stores in the loop.
-		markActiveAsUsed();
-	}
-	void finalizeFunctionDefinition(FunctionDefinition const&) override
-	{
-		markActiveAsUsed();
-	}
-
-	std::vector<Operation> operationsFromFunctionCall(FunctionCall const& _functionCall) const;
-	void applyOperation(Operation const& _operation);
-	bool knownUnrelated(Operation const& _op1, Operation const& _op2) const;
-	bool knownCovered(Operation const& _covered, Operation const& _covering) const;
-
-	void markActiveAsUsed(std::optional<Location> _onlyLocation = std::nullopt);
-	void clearActive(std::optional<Location> _onlyLocation = std::nullopt);
-
-	std::optional<YulString> identifierNameIfSSA(Expression const& _expression) const;
-
-	bool const m_ignoreMemory;
-	std::map<YulString, SideEffects> const& m_functionSideEffects;
-	std::map<YulString, ControlFlowSideEffects> m_controlFlowSideEffects;
-	std::map<YulString, AssignedValue> const& m_ssaValues;
-
-	std::map<Statement const*, Operation> m_storeOperations;
-
-	KnowledgeBase mutable m_knowledgeBase;
-};
-
-}
diff --git a/libyul/optimiser/VarDeclInitializer.cpp b/libyul/optimiser/VarDeclInitializer.cpp
deleted file mode 100644
index 845c7cc41c96..000000000000
--- a/libyul/optimiser/VarDeclInitializer.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/VarDeclInitializer.h>
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
-#include <libyul/Dialect.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-
-void VarDeclInitializer::operator()(Block& _block)
-{
-	ASTModifier::operator()(_block);
-
-	using OptionalStatements = std::optional<std::vector<Statement>>;
-	util::GenericVisitor visitor{
-		util::VisitorFallback<OptionalStatements>{},
-		[this](VariableDeclaration& _varDecl) -> OptionalStatements
-		{
-			if (_varDecl.value)
-				return {};
-
-			if (_varDecl.variables.size() == 1)
-			{
-				_varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteralForType(_varDecl.variables.front().type));
-				return {};
-			}
-			else
-			{
-				OptionalStatements ret{std::vector<Statement>{}};
-				for (auto& var: _varDecl.variables)
-				{
-					std::unique_ptr<Expression> expr = std::make_unique<Expression >(m_dialect.zeroLiteralForType(var.type));
-					ret->emplace_back(VariableDeclaration{std::move(_varDecl.debugData), {std::move(var)}, std::move(expr)});
-				}
-				return ret;
-			}
-		}
-	};
-
-	util::iterateReplacing(_block.statements, [&](auto&& _statement) { return std::visit(visitor, _statement); });
-}
diff --git a/libyul/optimiser/VarDeclInitializer.h b/libyul/optimiser/VarDeclInitializer.h
deleted file mode 100644
index 4060878b15e6..000000000000
--- a/libyul/optimiser/VarDeclInitializer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-namespace solidity::yul
-{
-
-/**
- * Rewrites variable declarations so that all of them are initialized.
- * Declarations like ``let x, y`` are split into multiple declaration
- * statements.
- * Only supports initializing with the zero literal for now.
- */
-class VarDeclInitializer: public ASTModifier
-{
-public:
-	static constexpr char const* name{"VarDeclInitializer"};
-	static void run(OptimiserStepContext& _ctx, Block& _ast) { VarDeclInitializer{_ctx.dialect}(_ast); }
-
-	void operator()(Block& _block) override;
-
-private:
-	explicit VarDeclInitializer(Dialect const& _dialect): m_dialect(_dialect) {}
-
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/optimiser/VarNameCleaner.cpp b/libyul/optimiser/VarNameCleaner.cpp
deleted file mode 100644
index b13dc8e6b49b..000000000000
--- a/libyul/optimiser/VarNameCleaner.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/optimiser/VarNameCleaner.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <algorithm>
-#include <cctype>
-#include <climits>
-#include <iterator>
-#include <string>
-#include <regex>
-#include <limits>
-
-using namespace solidity::yul;
-
-VarNameCleaner::VarNameCleaner(
-	Block const& _ast,
-	Dialect const& _dialect,
-	std::set<YulString> _namesToKeep
-):
-	m_dialect{_dialect},
-	m_namesToKeep{std::move(_namesToKeep)},
-	m_translatedNames{}
-{
-	for (auto const& statement: _ast.statements)
-		if (std::holds_alternative<FunctionDefinition>(statement))
-			m_namesToKeep.insert(std::get<FunctionDefinition>(statement).name);
-	m_usedNames = m_namesToKeep;
-}
-
-void VarNameCleaner::operator()(FunctionDefinition& _funDef)
-{
-	yulAssert(!m_insideFunction, "");
-	m_insideFunction = true;
-
-	std::set<YulString> globalUsedNames = std::move(m_usedNames);
-	m_usedNames = m_namesToKeep;
-	std::map<YulString, YulString> globalTranslatedNames;
-	swap(globalTranslatedNames, m_translatedNames);
-
-	renameVariables(_funDef.parameters);
-	renameVariables(_funDef.returnVariables);
-	ASTModifier::operator()(_funDef);
-
-	swap(globalUsedNames, m_usedNames);
-	swap(globalTranslatedNames, m_translatedNames);
-
-	m_insideFunction = false;
-}
-
-void VarNameCleaner::operator()(VariableDeclaration& _varDecl)
-{
-	renameVariables(_varDecl.variables);
-	ASTModifier::operator()(_varDecl);
-}
-
-void VarNameCleaner::renameVariables(std::vector<TypedName>& _variables)
-{
-	for (TypedName& typedName: _variables)
-	{
-		auto newName = findCleanName(typedName.name);
-		if (newName != typedName.name)
-		{
-			m_translatedNames[typedName.name] = newName;
-			typedName.name = newName;
-		}
-		m_usedNames.insert(typedName.name);
-	}
-}
-
-void VarNameCleaner::operator()(Identifier& _identifier)
-{
-	auto name = m_translatedNames.find(_identifier.name);
-	if (name != m_translatedNames.end())
-		_identifier.name = name->second;
-}
-
-YulString VarNameCleaner::findCleanName(YulString const& _name) const
-{
-	auto newName = stripSuffix(_name);
-	if (!isUsedName(newName))
-		return newName;
-
-	// create new name with suffix (by finding a free identifier)
-	for (size_t i = 1; i < std::numeric_limits<decltype(i)>::max(); ++i)
-	{
-		YulString newNameSuffixed = YulString{newName.str() + "_" + std::to_string(i)};
-		if (!isUsedName(newNameSuffixed))
-			return newNameSuffixed;
-	}
-	yulAssert(false, "Exhausted by attempting to find an available suffix.");
-}
-
-bool VarNameCleaner::isUsedName(YulString const& _name) const
-{
-	return isRestrictedIdentifier(m_dialect, _name) || m_usedNames.count(_name);
-}
-
-YulString VarNameCleaner::stripSuffix(YulString const& _name) const
-{
-	static std::regex const suffixRegex("(_+[0-9]+)+$");
-
-	std::smatch suffixMatch;
-	if (regex_search(_name.str(), suffixMatch, suffixRegex))
-		return {YulString{suffixMatch.prefix().str()}};
-	return _name;
-}
diff --git a/libyul/optimiser/VarNameCleaner.h b/libyul/optimiser/VarNameCleaner.h
deleted file mode 100644
index 7823e5716c28..000000000000
--- a/libyul/optimiser/VarNameCleaner.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
-#include <libyul/optimiser/OptimiserStep.h>
-
-#include <map>
-#include <set>
-#include <string>
-
-namespace solidity::yul
-{
-
-struct Dialect;
-
-/**
- * Pass to normalize identifier suffixes.
- *
- * That is, for each function scope, nested suffixes get flattened and all suffixes
- * renumbered by their base name.
- * Function names are not modified.
- *
- * NOTE: This step destroys the promise of the Disambiguator and thus cannot
- * be used in the main loop of the optimizer without running the disambiguator again.
- * Because of that, it is not included in the step list of the Optimizer Suite.
- *
- * Prerequisites: Disambiguator, FunctionHoister, FunctionGrouper
- */
-class VarNameCleaner: public ASTModifier
-{
-public:
-	static constexpr char const* name{"VarNameCleaner"};
-	static void run(OptimiserStepContext& _context, Block& _ast)
-	{
-		VarNameCleaner{_ast, _context.dialect, _context.reservedIdentifiers}(_ast);
-	}
-
-	using ASTModifier::operator();
-	void operator()(VariableDeclaration& _varDecl) override;
-	void operator()(Identifier& _identifier) override;
-	void operator()(FunctionDefinition& _funDef) override;
-
-private:
-	VarNameCleaner(
-		Block const& _ast,
-		Dialect const& _dialect,
-		std::set<YulString> _namesToKeep = {}
-	);
-
-	/// Tries to rename a list of variables.
-	void renameVariables(std::vector<TypedName>& _variables);
-
-	/// @returns suffix-stripped name, if a suffix was detected, none otherwise.
-	YulString stripSuffix(YulString const& _name) const;
-
-	/// Looks out for a "clean name" the given @p name could be trimmed down to.
-	/// @returns a trimmed down and "clean name" in case it found one, none otherwise.
-	YulString findCleanName(YulString const& name) const;
-
-	/// Tests whether a given name was already used within this pass
-	/// or was set to be kept.
-	bool isUsedName(YulString const& _name) const;
-
-	Dialect const& m_dialect;
-
-	/// These names will not be modified.
-	std::set<YulString> m_namesToKeep;
-
-	/// Set of names that are in use.
-	std::set<YulString> m_usedNames;
-
-	/// Maps old to new names.
-	std::map<YulString, YulString> m_translatedNames;
-
-	/// Whether the traverse is inside a function definition.
-	/// Used to assert that a function definition cannot be inside another.
-	bool m_insideFunction = false;
-};
-
-}
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
deleted file mode 100755
index 5c3f04d8e0ff..000000000000
--- a/scripts/ASTImportTest.sh
+++ /dev/null
@@ -1,386 +0,0 @@
-#!/usr/bin/env bash
-# ------------------------------------------------------------------------------
-# vim:ts=4:et
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) solidity contributors.
-# ------------------------------------------------------------------------------
-# Bash script to test the import/exports.
-#
-# ast import/export tests:
-#   - first exporting a .sol file to JSON, then loading it into the compiler
-#     and exporting it again. The second JSON should be identical to the first.
-#
-# evm-assembly import/export tests:
-#   - first a .sol file will be compiled and the EVM Assembly will be exported
-#     to JSON format using --asm-json command-line option.
-#     The EVM Assembly JSON output is then imported with --import-asm-json
-#     and compiled again. The binary generated initially and after the import
-#     should be identical.
-
-set -euo pipefail
-
-READLINK=readlink
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    READLINK=greadlink
-fi
-EXPR="expr"
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    EXPR="gexpr"
-fi
-
-REPO_ROOT=$(${READLINK} -f "$(dirname "$0")"/..)
-SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-SOLC="${SOLIDITY_BUILD_DIR}/solc/solc"
-SPLITSOURCES="${REPO_ROOT}/scripts/splitSources.py"
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-function print_usage
-{
-    echo "Usage: ${0} ast|evm-assembly [--exit-on-error|--help]."
-}
-
-function print_used_commands
-{
-    local test_directory="$1"
-    local export_command="$2"
-    local import_command="$3"
-    echo
-    printError "You can find the files used for this test in ${test_directory}"
-    printError "Commands used in the test:"
-    printError "# export"
-    echo "$ ${export_command}" >&2
-    printError "# import"
-    echo "$ ${import_command}" >&2
-}
-
-function print_stderr_stdout
-{
-    local error_message="$1"
-    local stderr_file="$2"
-    local stdout_file="$3"
-    printError "$error_message"
-    printError ""
-    printError "stderr:"
-    cat "$stderr_file" >&2
-    printError ""
-    printError "stdout:"
-    cat "$stdout_file" >&2
-}
-
-function check_import_test_type_unset
-{
-    [[ -z "$IMPORT_TEST_TYPE" ]] || fail "ERROR: Import test type can only be set once. Aborting."
-}
-
-IMPORT_TEST_TYPE=
-EXIT_ON_ERROR=0
-for PARAM in "$@"
-do
-    case "$PARAM" in
-        ast) check_import_test_type_unset ; IMPORT_TEST_TYPE="ast" ;;
-        evm-assembly) check_import_test_type_unset ; IMPORT_TEST_TYPE="evm-assembly" ;;
-        --help) print_usage ; exit 0 ;;
-        --exit-on-error) EXIT_ON_ERROR=1 ;;
-        *) fail "Unknown option '$PARAM'. Aborting. $(print_usage)" ;;
-    esac
-done
-
-SYNTAXTESTS_DIR="${REPO_ROOT}/test/libsolidity/syntaxTests"
-ASTJSONTESTS_DIR="${REPO_ROOT}/test/libsolidity/ASTJSON"
-SEMANTICTESTS_DIR="${REPO_ROOT}/test/libsolidity/semanticTests"
-
-FAILED=0
-UNCOMPILABLE=0
-TESTED=0
-
-function test_ast_import_export_equivalence
-{
-    local sol_file="$1"
-    local input_files=( "${@:2}" )
-
-    local export_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 "${input_files[@]}")
-    local import_command=("$SOLC" --import-ast --combined-json ast --pretty-json --json-indent 4 expected.json)
-    local import_via_standard_json_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 --standard-json standard_json_input.json)
-
-    # export ast - save ast json as expected result (silently)
-    if ! "${export_command[@]}" > expected.json 2> stderr_export.txt
-    then
-        print_stderr_stdout "ERROR: AST reimport failed (export) for input file ${sol_file}." ./stderr_export.txt ./expected.json
-        print_used_commands "$(pwd)" "${export_command[*]} > expected.json" "${import_command[*]}"
-        return 1
-    fi
-
-    # (re)import ast - and export it again as obtained result (silently)
-    if ! "${import_command[@]}" > obtained.json 2> stderr_import.txt
-    then
-        print_stderr_stdout "ERROR: AST reimport failed (import) for input file ${sol_file}." ./stderr_import.txt ./obtained.json
-        print_used_commands "$(pwd)" "${export_command[*]} > expected.json" "${import_command[*]}"
-        return 1
-    fi
-
-    echo ". += {\"sources\":" > _ast_json.json
-    jq .sources expected.json >> _ast_json.json
-    echo "}" >> _ast_json.json
-    echo "{\"language\": \"SolidityAST\", \"settings\": {\"outputSelection\": {\"*\": {\"\": [\"ast\"]}}}}" > standard_json.json
-    jq --from-file _ast_json.json standard_json.json > standard_json_input.json
-
-    # (re)import ast via standard json - and export it again as obtained result (silently)
-    if ! "${import_via_standard_json_command[@]}" > obtained_standard_json.json 2> stderr_import.txt
-    then
-        print_stderr_stdout "ERROR: AST reimport failed (import) for input file ${sol_file}." ./stderr_import.txt ./obtained_standard_json.json
-        print_used_commands "$(pwd)" "${export_command[*]} > expected.json" "${import_command[*]}"
-        return 1
-    fi
-
-    jq .sources expected.json > expected_standard_json.json
-    jq .sources obtained_standard_json.json >  obtained_standard_json_.json
-    jq 'walk(if type == "object" and has("ast") then .AST = .ast | del(.ast) else . end)' < obtained_standard_json_.json > obtained_standard_json.json
-    jq --sort-keys . < obtained_standard_json.json > obtained_standard_json_.json
-    mv obtained_standard_json_.json obtained_standard_json.json
-
-    # compare expected and obtained ASTs
-    if ! diff_files expected.json obtained.json || ! diff_files expected_standard_json.json obtained_standard_json.json
-    then
-        printError "ERROR: AST reimport failed for ${sol_file}"
-        if (( EXIT_ON_ERROR == 1 ))
-        then
-            print_used_commands "$(pwd)" "${export_command[*]}" "${import_command[*]}"
-            return 1
-        fi
-        FAILED=$((FAILED + 1))
-    fi
-    TESTED=$((TESTED + 1))
-}
-
-function run_solc
-{
-    local parameters=( "${@}" )
-
-    if ! "${SOLC}" "${parameters[@]}" > /dev/null 2> solc_stderr
-    then
-        printError "ERROR: ${parameters[*]}"
-        printError "${PWD}"
-        # FIXME: EXIT_ON_ERROR seems to be ignored here and in some other places.
-        # We just exit unconditionally instead.
-        fail "$(cat solc_stderr)"
-    fi
-    rm solc_stderr
-}
-
-function run_solc_store_stdout
-{
-    local output_file=$1
-    local parameters=( "${@:2}" )
-
-    if ! "${SOLC}" "${parameters[@]}" > "${output_file}" 2> "${output_file}.error"
-    then
-        printError "ERROR: ${parameters[*]}"
-        printError "${PWD}"
-        fail "$(cat "${output_file}.error")"
-    fi
-    rm "${output_file}.error"
-}
-
-function test_evmjson_import_export_equivalence
-{
-    local sol_file="$1"
-    local input_files=( "${@:2}" )
-
-    # Generate bytecode and EVM assembly JSON through normal complication
-    mkdir -p export/
-    local export_options=(--bin --asm-json "${input_files[@]}" --output-dir export/)
-    run_solc "${export_options[@]}"
-
-    # NOTE: If there is no bytecode, the compiler produces a JSON file that contains just 'null'.
-    # This is not accepted by assembly import though so we must skip such contracts.
-    echo -n null > null
-    find export/ -name '*.json' -exec cmp --quiet --bytes=4 {} null \; -delete
-
-    find export/ -name '*.bin' -size 0 -delete
-
-    for asm_json_file in export/*.json
-    do
-        mv "${asm_json_file}" "${asm_json_file/_evm/}"
-    done
-
-    # Import EVM assembly JSON
-    mkdir -p import/
-    for asm_json_file in export/*.json
-    do
-        local bin_file_from_asm_import
-        bin_file_from_asm_import="import/$(basename "${asm_json_file}" .json).bin"
-
-        local import_options=(--bin --import-asm-json "${asm_json_file}")
-        run_solc_store_stdout "${bin_file_from_asm_import}" "${import_options[@]}"
-
-        stripCLIDecorations < "$bin_file_from_asm_import" > tmpfile
-        mv tmpfile "$bin_file_from_asm_import"
-    done
-
-    # Compare bytecode from compilation with bytecode from import
-    for bin_file in export/*.bin
-    do
-        local bin_file_from_asm_import=${bin_file/export/import}
-        if ! diff --strip-trailing-cr --ignore-all-space "${bin_file}" "${bin_file_from_asm_import}" > diff_error
-        then
-            printError "ERROR: Bytecode from compilation (${bin_file}) differs from bytecode from EVM asm import (${bin_file_from_asm_import}):"
-            printError "    $(cat diff_error)"
-            if (( EXIT_ON_ERROR == 1 ))
-            then
-                # NOTE: The import_options we print here refers to the wrong file (the last one
-                # processed by the previous loop) - but it's still a good starting point for debugging ;)
-                print_used_commands "${PWD}" "${SOLC} ${export_options[*]}" "${SOLC} ${import_options[*]}"
-                return 1
-            fi
-            FAILED=$((FAILED + 1))
-        fi
-    done
-    TESTED=$((TESTED + 1))
-}
-
-# function tests whether exporting and importing again is equivalent.
-# Results are recorded by incrementing the FAILED or UNCOMPILABLE global variable.
-# Also, in case of a mismatch a diff is printed
-# Expected parameters:
-# $1 name of the file to be exported and imported
-# $2 any files needed to do so that might be in parent directories
-function test_import_export_equivalence {
-    local sol_file="$1"
-    local input_files=( "${@:2}" )
-    local output
-    local solc_return_code
-    local compile_test
-
-    case "$IMPORT_TEST_TYPE" in
-        ast) compile_test="--ast-compact-json" ;;
-        evm-assembly) compile_test="--bin" ;;
-        *) assertFail "Unknown import test type '${IMPORT_TEST_TYPE}'. Aborting." ;;
-    esac
-
-    set +e
-    output=$("$SOLC" "${compile_test}" "${input_files[@]}" 2>&1)
-    solc_return_code=$?
-    set -e
-
-    # if input files where compilable with success
-    if (( solc_return_code == 0 ))
-    then
-        case "$IMPORT_TEST_TYPE" in
-            ast) test_ast_import_export_equivalence "${sol_file}" "${input_files[@]}" ;;
-            evm-assembly) test_evmjson_import_export_equivalence "${sol_file}" "${input_files[@]}" ;;
-            *) assertFail "Unknown import test type '${IMPORT_TEST_TYPE}'. Aborting." ;;
-        esac
-    else
-        UNCOMPILABLE=$((UNCOMPILABLE + 1))
-
-        # solc will return exit code 2, if it was terminated by an uncaught exception.
-        # This should normally not happen, so we terminate the test execution here
-        # and print some details about the corresponding solc invocation.
-        if (( solc_return_code == 2 ))
-        then
-            # For the evm-assembly import/export tests, this script uses only the old code generator.
-            # Some semantic tests can only be compiled with --via-ir (some need to be additionally
-            # compiled with --optimize). The tests that are meant to be compiled with --via-ir are
-            # throwing an UnimplementedFeatureError exception, e.g.:
-            # "Copying of type struct C.S memory[] memory to storage not yet supported",
-            # "Copying nested calldata dynamic arrays to storage is not implemented in the old code generator".
-            # We will just ignore these kind of exceptions for now. However, any other exception
-            # will be treated as a fatal error and the script execution will be terminated with an error.
-            if [[ "${output}" != *"UnimplementedFeatureError"* ]]
-            then
-                fail "\n\nERROR: Uncaught exception while executing '${SOLC} ${compile_test} ${input_files[*]}':\n${output}\n"
-            fi
-        fi
-    fi
-}
-
-command_available "$SOLC" --version
-command_available jq --version
-command_available "$EXPR" --version
-command_available "$READLINK" --version
-
-case "$IMPORT_TEST_TYPE" in
-    ast) TEST_DIRS=("${SYNTAXTESTS_DIR}" "${ASTJSONTESTS_DIR}") ;;
-    evm-assembly) TEST_DIRS=("${SEMANTICTESTS_DIR}") ;;
-    *) assertFail "Import test type not defined. $(print_usage)" ;;
-esac
-
-# boost_filesystem_bug specifically tests a local fix for a boost::filesystem
-# bug. Since the test involves a malformed path, there is no point in running
-# tests on it. See https://github.com/boostorg/filesystem/issues/176
-IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and -not -name "boost_filesystem_bug.sol" -not -path "*/experimental/*")
-
-NSOURCES="$(echo "${IMPORT_TEST_FILES}" | wc -l)"
-echo "Looking at ${NSOURCES} .sol files..."
-
-COUNTER=0
-TEST_DIR=$(mktemp -d -t "import-export-test-XXXXXX")
-pushd "$TEST_DIR" > /dev/null
-
-for solfile in $IMPORT_TEST_FILES
-do
-    echo -n "·"
-
-    TEST_SUBDIR="$(printf "%05d" "$COUNTER")-$(basename "$solfile")"
-    mkdir "$TEST_SUBDIR"
-    pushd "$TEST_SUBDIR" > /dev/null
-
-    set +e
-    OUTPUT=$("$SPLITSOURCES" "$solfile")
-    SPLITSOURCES_RC=$?
-    set -e
-
-    if (( SPLITSOURCES_RC == 0 ))
-    then
-        IFS=' ' read -ra OUTPUT_ARRAY <<< "$OUTPUT"
-        test_import_export_equivalence "$solfile" "${OUTPUT_ARRAY[@]}"
-    elif (( SPLITSOURCES_RC == 1 ))
-    then
-        test_import_export_equivalence "$solfile" "$solfile"
-    elif (( SPLITSOURCES_RC == 2 ))
-    then
-        # The script will exit with return code 2, if an UnicodeDecodeError occurred.
-        # This is the case if e.g. some tests are using invalid utf-8 sequences. We will ignore
-        # these errors, but print the actual output of the script.
-        printError "\n\n${OUTPUT}\n\n"
-        test_import_export_equivalence "$solfile" "$solfile"
-    else
-        # All other return codes will be treated as critical errors. The script will exit.
-        printError "\n\nGot unexpected return code ${SPLITSOURCES_RC} from '${SPLITSOURCES} ${solfile}'. Aborting."
-        printError "\n\n${OUTPUT}\n\n"
-        exit 1
-    fi
-
-    popd > /dev/null
-    ((++COUNTER))
-done
-
-popd > /dev/null
-rm -r "$TEST_DIR"
-
-echo
-
-if (( FAILED == 0 ))
-then
-    echo "SUCCESS: ${TESTED} tests passed, ${FAILED} failed, ${UNCOMPILABLE} could not be compiled (${NSOURCES} sources total)."
-else
-    fail "FAILURE: Out of ${NSOURCES} sources, ${FAILED} failed, (${UNCOMPILABLE} could not be compiled)."
-fi
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
deleted file mode 100644
index 3a1c6a5a7cf9..000000000000
--- a/scripts/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM alpine AS build
-MAINTAINER chriseth <chris@ethereum.org>
-#Official solidity docker image
-
-#Establish working directory as solidity
-WORKDIR /solidity
-
-# Build dependencies
-RUN apk update && apk add boost-dev boost-static build-base cmake git
-
-#Copy working directory on travis to the image
-COPY / $WORKDIR
-
-# Number of parallel jobs during build
-# or 0 for auto-computing (max(1, CPU_core_count * 2/3), a greedy value)
-ARG BUILD_CONCURRENCY="0"
-
-#Install dependencies, eliminate annoying warnings
-RUN sed -i -E -e 's/include <sys\/poll.h>/include <poll.h>/' /usr/include/boost/asio/detail/socket_types.hpp
-RUN cmake -DCMAKE_BUILD_TYPE=Release -DTESTS=0 -DSOLC_LINK_STATIC=1
-RUN make solc \
-    -j$(awk "BEGIN {                                       \
-        if (${BUILD_CONCURRENCY} != 0) {                   \
-            print(${BUILD_CONCURRENCY});                   \
-        } else {                                           \
-            x=($(grep -c ^processor /proc/cpuinfo) * 2/3); \
-            if (x > 1) {                                   \
-                printf(\"%d\n\", x);                       \
-            } else {                                       \
-                print(1);                                  \
-            }                                              \
-        }                                                  \
-    }")
-RUN strip solc/solc
-
-FROM scratch
-COPY --from=build /solidity/solc/solc /usr/bin/solc
-ENTRYPOINT ["/usr/bin/solc"]
diff --git a/scripts/Dockerfile_alpine b/scripts/Dockerfile_alpine
deleted file mode 100644
index 21bba456670d..000000000000
--- a/scripts/Dockerfile_alpine
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM alpine
-MAINTAINER chriseth <chris@ethereum.org>
-
-COPY upload/solc-static-linux /usr/local/bin/solc
-ENTRYPOINT ["/usr/local/bin/solc"]
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100755
index 6edd60bd9b07..000000000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-ROOTDIR="$(dirname "$0")/.."
-BUILDDIR="${ROOTDIR}/build"
-
-if [[ $# -eq 0 ]]; then
-    BUILD_TYPE=Release
-else
-    BUILD_TYPE="$1"
-fi
-
-if [[ "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]; then
-	touch "${ROOTDIR}/prerelease.txt"
-fi
-
-mkdir -p "${BUILDDIR}"
-cd "${BUILDDIR}"
-
-cmake .. -DCMAKE_BUILD_TYPE="$BUILD_TYPE" "${@:2}"
-make -j2
-
-if [[ "${CI}" == "" ]]; then
-	echo "Installing ..."
-	sudo make install
-fi
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
deleted file mode 100755
index 1b780a4276b6..000000000000
--- a/scripts/build_emscripten.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script for building Solidity for emscripten.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-params=""
-if (( $# != 0 )); then
-    params="$(printf "%q " "${@}")"
-fi
-
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-16
-# NOTE: Without `safe.directory` git would assume it's not safe to operate on /root/project since it's owned by a different user.
-# See https://github.blog/2022-04-12-git-security-vulnerability-announced/
-docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:19fcb5ac029bbc27ec36e10f7d14ea224d8010145f9690562ef084fd16146b0c \
-    /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh ${params}"
diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
deleted file mode 100755
index cba7a0800116..000000000000
--- a/scripts/bytecodecompare/prepare_report.js
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/env node
-const process = require('process')
-const fs = require('fs')
-
-const compiler = require('solc')
-
-SETTINGS_PRESETS = {
-    'legacy-optimize':    {optimize: true,  viaIR: false},
-    'legacy-no-optimize': {optimize: false, viaIR: false},
-    'via-ir-optimize':    {optimize: true,  viaIR: true},
-    'via-ir-no-optimize': {optimize: false, viaIR: true},
-}
-
-function loadSource(sourceFileName, stripSMTPragmas)
-{
-    source = fs.readFileSync(sourceFileName).toString()
-
-    if (stripSMTPragmas)
-        // NOTE: replace() with string parameter replaces only the first occurrence.
-        return source.replace('pragma experimental SMTChecker;', '');
-
-    return source
-}
-
-function cleanString(string)
-{
-    if (string !== undefined)
-        string = string.trim()
-    return (string !== '' ? string : undefined)
-}
-
-let inputFiles = []
-let stripSMTPragmas = false
-let presets = []
-
-for (let i = 2; i < process.argv.length; ++i)
-{
-    if (process.argv[i] === '--strip-smt-pragmas')
-        stripSMTPragmas = true
-    else if (process.argv[i] === '--preset')
-    {
-        if (i + 1 === process.argv.length)
-            throw Error("Option --preset was used, but no preset name given.")
-
-        presets.push(process.argv[i + 1])
-        ++i;
-    }
-    else
-        inputFiles.push(process.argv[i])
-}
-
-if (presets.length === 0)
-    presets = ['legacy-no-optimize', 'legacy-optimize']
-
-for (const preset of presets)
-    if (!(preset in SETTINGS_PRESETS))
-        throw Error(`Invalid preset name: ${preset}.`)
-
-for (const preset of presets)
-{
-    settings = SETTINGS_PRESETS[preset]
-
-    for (const filename of inputFiles)
-    {
-        let input = {
-            language: 'Solidity',
-            sources: {
-                [filename]: {content: loadSource(filename, stripSMTPragmas)}
-            },
-            settings: {
-                optimizer: {enabled: settings.optimize},
-                // NOTE: We omit viaIR rather than set it to false to handle older versions that don't have it.
-                viaIR: settings.viaIR ? true : undefined,
-                outputSelection: {'*': {'*': ['evm.bytecode.object', 'metadata']}}
-            }
-        }
-        if (!stripSMTPragmas)
-            input['settings']['modelChecker'] = {engine: 'none'}
-
-        let serializedOutput
-        let result
-        const serializedInput = JSON.stringify(input)
-
-        let internalCompilerError = false
-        try
-        {
-            serializedOutput = compiler.compile(serializedInput)
-        }
-        catch (exception)
-        {
-            internalCompilerError = true
-        }
-
-        if (!internalCompilerError)
-        {
-            result = JSON.parse(serializedOutput)
-
-            if ('errors' in result)
-                for (const error of result['errors'])
-                    // JSON interface still returns contract metadata in case of an internal compiler error while
-                    // CLI interface does not. To make reports comparable we must force this case to be detected as
-                    // an error in both cases.
-                    if (['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError', 'YulException'].includes(error['type']))
-                    {
-                        internalCompilerError = true
-                        break
-                    }
-        }
-
-        if (
-            internalCompilerError ||
-            !('contracts' in result) ||
-            Object.keys(result['contracts']).length === 0 ||
-            Object.keys(result['contracts']).every(file => Object.keys(result['contracts'][file]).length === 0)
-        )
-            // NOTE: do not exit here because this may be run on source which cannot be compiled
-            console.log(filename + ': <ERROR>')
-        else
-            for (const contractFile in result['contracts'])
-                for (const contractName in result['contracts'][contractFile])
-                {
-                    const contractResults = result['contracts'][contractFile][contractName]
-
-                    let bytecode = '<NO BYTECODE>'
-                    let metadata = '<NO METADATA>'
-
-                    if (
-                        'evm' in contractResults &&
-                        'bytecode' in contractResults['evm'] &&
-                        'object' in contractResults['evm']['bytecode'] &&
-                        cleanString(contractResults.evm.bytecode.object) !== undefined
-                    )
-                        bytecode = cleanString(contractResults.evm.bytecode.object)
-
-                    if ('metadata' in contractResults && cleanString(contractResults.metadata) !== undefined)
-                        metadata = contractResults.metadata
-
-                    console.log(filename + ':' + contractName + ' ' + bytecode)
-                    console.log(filename + ':' + contractName + ' ' + metadata)
-                }
-    }
-}
diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
deleted file mode 100755
index 4cf24bb8aa40..000000000000
--- a/scripts/bytecodecompare/prepare_report.py
+++ /dev/null
@@ -1,477 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import subprocess
-import json
-import re
-from argparse import ArgumentParser
-from dataclasses import dataclass
-from enum import Enum
-from glob import glob
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from typing import List, Optional, Tuple, Union
-
-
-CONTRACT_SEPARATOR_PATTERN = re.compile(
-    r'^ *======= +(?:(?P<file_name>.+) *:)? *(?P<contract_name>[^:]+) +======= *$',
-    re.MULTILINE
-)
-BYTECODE_REGEX = re.compile(r'^ *Binary: *\n(?P<bytecode>.*[0-9a-f$_]+.*)$', re.MULTILINE)
-METADATA_REGEX = re.compile(r'^ *Metadata: *\n *(?P<metadata>\{.*\}) *$', re.MULTILINE)
-
-
-class CompilerInterface(Enum):
-    CLI = 'cli'
-    STANDARD_JSON = 'standard-json'
-
-
-class SettingsPreset(Enum):
-    LEGACY_OPTIMIZE = 'legacy-optimize'
-    LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
-    VIA_IR_OPTIMIZE = 'via-ir-optimize'
-    VIA_IR_NO_OPTIMIZE = 'via-ir-no-optimize'
-
-
-class SMTUse(Enum):
-    PRESERVE = 'preserve'
-    DISABLE = 'disable'
-    STRIP_PRAGMAS = 'strip-pragmas'
-
-
-@dataclass(frozen=True)
-class CompilerSettings:
-    optimize: bool
-    via_ir: bool
-
-    @staticmethod
-    def from_preset(preset: SettingsPreset):
-        return {
-            SettingsPreset.LEGACY_OPTIMIZE:    CompilerSettings(optimize=True,  via_ir=False),
-            SettingsPreset.LEGACY_NO_OPTIMIZE: CompilerSettings(optimize=False, via_ir=False),
-            SettingsPreset.VIA_IR_OPTIMIZE:    CompilerSettings(optimize=True,  via_ir=True),
-            SettingsPreset.VIA_IR_NO_OPTIMIZE: CompilerSettings(optimize=False, via_ir=True),
-        }[preset]
-
-
-@dataclass(frozen=True)
-class ContractReport:
-    contract_name: str
-    file_name: Optional[Path]
-    bytecode: Optional[str]
-    metadata: Optional[str]
-
-
-@dataclass
-class FileReport:
-    file_name: Path
-    contract_reports: Optional[List[ContractReport]]
-
-    def format_report(self) -> str:
-        report = ""
-
-        if self.contract_reports is None:
-            return f"{self.file_name.as_posix()}: <ERROR>\n"
-
-        for contract_report in self.contract_reports:
-            bytecode = contract_report.bytecode if contract_report.bytecode is not None else '<NO BYTECODE>'
-            metadata = contract_report.metadata if contract_report.metadata is not None else '<NO METADATA>'
-
-            # NOTE: Ignoring contract_report.file_name because it should always be either the same
-            # as self.file_name (for Standard JSON) or just the '<stdin>' placeholder (for CLI).
-            report += f"{self.file_name.as_posix()}:{contract_report.contract_name} {bytecode}\n"
-            report += f"{self.file_name.as_posix()}:{contract_report.contract_name} {metadata}\n"
-
-        return report
-
-    def format_summary(self, verbose: bool) -> str:
-        error = (self.contract_reports is None)
-        contract_reports = self.contract_reports if self.contract_reports is not None else []
-        no_bytecode = any(bytecode is None for bytecode in contract_reports)
-        no_metadata = any(metadata is None for metadata in contract_reports)
-
-        if verbose:
-            flags = ('E' if error else ' ') + ('B' if no_bytecode else ' ') + ('M' if no_metadata else ' ')
-            contract_count = '?' if self.contract_reports is None else str(len(self.contract_reports))
-            return f"{contract_count} {flags} {self.file_name}"
-        else:
-            if error:
-                return 'E'
-            if no_bytecode:
-                return 'B'
-            if no_metadata:
-                return 'M'
-
-            return '.'
-
-
-@dataclass
-class Statistics:
-    file_count: int = 0
-    contract_count: int = 0
-    error_count: int = 0
-    missing_bytecode_count: int = 0
-    missing_metadata_count: int = 0
-
-    def aggregate(self, report: FileReport):
-        contract_reports = report.contract_reports if report.contract_reports is not None else []
-
-        self.file_count += 1
-        self.contract_count += len(contract_reports)
-        self.error_count += (1 if report.contract_reports is None else 0)
-        self.missing_bytecode_count += sum(1 for c in contract_reports if c.bytecode is None)
-        self.missing_metadata_count += sum(1 for c in contract_reports if c.metadata is None)
-
-    def __str__(self) -> str:
-        contract_count = str(self.contract_count) + ('+' if self.error_count > 0 else '')
-        return (
-            f"test cases: {self.file_count}, "
-            f"contracts: {contract_count}, "
-            f"errors: {self.error_count}, "
-            f"missing bytecode: {self.missing_bytecode_count}, "
-            f"missing metadata: {self.missing_metadata_count}"
-        )
-
-
-def load_source(path: Union[Path, str], smt_use: SMTUse) -> str:
-    # NOTE: newline='' disables newline conversion.
-    # We want the file exactly as is because changing even a single byte in the source affects metadata.
-    with open(path, mode='r', encoding='utf8', newline='') as source_file:
-        file_content = source_file.read()
-
-    if smt_use == SMTUse.STRIP_PRAGMAS:
-        return file_content.replace('pragma experimental SMTChecker;', '', 1)
-
-    return file_content
-
-
-def clean_string(value: Optional[str]) -> Optional[str]:
-    value = value.strip() if value is not None else None
-    return value if value != '' else None
-
-
-def parse_standard_json_output(source_file_name: Path, standard_json_output: str) -> FileReport:
-    decoded_json_output = json.loads(standard_json_output.strip())
-
-    # JSON interface still returns contract metadata in case of an internal compiler error while
-    # CLI interface does not. To make reports comparable we must force this case to be detected as
-    # an error in both cases.
-    internal_compiler_error = any(
-        error['type'] in ['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError', 'YulException']
-        for error in decoded_json_output.get('errors', {})
-    )
-
-    if (
-        'contracts' not in decoded_json_output or
-        len(decoded_json_output['contracts']) == 0 or
-        all(len(file_results) == 0 for file_name, file_results in decoded_json_output['contracts'].items()) or
-        internal_compiler_error
-    ):
-        return FileReport(file_name=source_file_name, contract_reports=None)
-
-    file_report = FileReport(file_name=source_file_name, contract_reports=[])
-    for file_name, file_results in sorted(decoded_json_output['contracts'].items()):
-        for contract_name, contract_results in sorted(file_results.items()):
-            assert file_report.contract_reports is not None
-            file_report.contract_reports.append(ContractReport(
-                contract_name=contract_name,
-                file_name=Path(file_name),
-                bytecode=clean_string(contract_results.get('evm', {}).get('bytecode', {}).get('object')),
-                metadata=clean_string(contract_results.get('metadata')),
-            ))
-
-    return file_report
-
-
-def parse_cli_output(source_file_name: Path, cli_output: str) -> FileReport:
-    # re.split() returns a list containing the text between pattern occurrences but also inserts the
-    # content of matched groups in between. It also never omits the empty elements so the number of
-    # list items is predictable (3 per match + the text before the first match)
-    output_segments = re.split(CONTRACT_SEPARATOR_PATTERN, cli_output)
-    assert len(output_segments) % 3 == 1
-
-    if len(output_segments) == 1:
-        return FileReport(file_name=source_file_name, contract_reports=None)
-
-    file_report = FileReport(file_name=source_file_name, contract_reports=[])
-    for file_name, contract_name, contract_output in zip(output_segments[1::3], output_segments[2::3], output_segments[3::3]):
-        bytecode_match = re.search(BYTECODE_REGEX, contract_output)
-        metadata_match = re.search(METADATA_REGEX, contract_output)
-
-        assert file_report.contract_reports is not None
-        file_report.contract_reports.append(ContractReport(
-            contract_name=contract_name.strip(),
-            file_name=Path(file_name.strip()) if file_name is not None else None,
-            bytecode=clean_string(bytecode_match['bytecode'] if bytecode_match is not None else None),
-            metadata=clean_string(metadata_match['metadata'] if metadata_match is not None else None),
-        ))
-
-    return file_report
-
-
-def prepare_compiler_input(
-    compiler_path: Path,
-    source_file_name: Path,
-    force_no_optimize_yul: bool,
-    interface: CompilerInterface,
-    preset: SettingsPreset,
-    smt_use: SMTUse,
-    metadata_option_supported: bool,
-) -> Tuple[List[str], str]:
-
-    settings = CompilerSettings.from_preset(preset)
-
-    if interface == CompilerInterface.STANDARD_JSON:
-        json_input: dict = {
-            'language': 'Solidity',
-            'sources': {
-                str(source_file_name): {'content': load_source(source_file_name, smt_use)}
-            },
-            'settings': {
-                'optimizer': {'enabled': settings.optimize},
-                # NOTE: We omit viaIR rather than set it to false to handle older versions that don't have it.
-                **({'viaIR': True} if settings.via_ir else {}),
-                'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
-            }
-        }
-
-        if smt_use == SMTUse.DISABLE:
-            json_input['settings']['modelChecker'] = {'engine': 'none'}
-
-        command_line = [str(compiler_path), '--standard-json']
-        compiler_input = json.dumps(json_input)
-    else:
-        assert interface == CompilerInterface.CLI
-
-        compiler_options = [str(source_file_name), '--bin']
-        if metadata_option_supported:
-            compiler_options.append('--metadata')
-        if settings.optimize:
-            compiler_options.append('--optimize')
-        elif force_no_optimize_yul:
-            compiler_options.append('--no-optimize-yul')
-        if settings.via_ir:
-            compiler_options.append('--via-ir')
-        if smt_use == SMTUse.DISABLE:
-            compiler_options += ['--model-checker-engine', 'none']
-
-        command_line = [str(compiler_path)] + compiler_options
-        compiler_input = load_source(source_file_name, smt_use)
-
-    return (command_line, compiler_input)
-
-
-def detect_metadata_cli_option_support(compiler_path: Path):
-    process = subprocess.run(
-        [str(compiler_path.absolute()), '--metadata', '-'],
-        input="contract C {}",
-        encoding='utf8',
-        capture_output=True,
-        check=False,
-    )
-
-    negative_response = "unrecognised option '--metadata'".strip()
-    if (process.returncode == 0) != (process.stderr.strip() != negative_response):
-        # If the error is other than expected or there's an error message but no error, don't try
-        # to guess. Just fail.
-        print(
-            f"Compiler exit code: {process.returncode}\n"
-            f"Compiler output:\n{process.stderr}\n",
-            file=sys.stderr
-        )
-        raise RuntimeError("Failed to determine if the compiler supports the --metadata option.")
-
-    return process.returncode == 0
-
-
-def run_compiler(
-    compiler_path: Path,
-    source_file_name: Path,
-    force_no_optimize_yul: bool,
-    interface: CompilerInterface,
-    preset: SettingsPreset,
-    smt_use: SMTUse,
-    metadata_option_supported: bool,
-    tmp_dir: Path,
-    exit_on_error: bool,
-) -> FileReport:
-
-    if interface == CompilerInterface.STANDARD_JSON:
-        (command_line, compiler_input) = prepare_compiler_input(
-            compiler_path,
-            Path(source_file_name.name),
-            force_no_optimize_yul,
-            interface,
-            preset,
-            smt_use,
-            metadata_option_supported,
-        )
-
-        process = subprocess.run(
-            command_line,
-            input=compiler_input,
-            encoding='utf8',
-            capture_output=True,
-            check=exit_on_error,
-        )
-
-        return parse_standard_json_output(Path(source_file_name), process.stdout)
-    else:
-        assert interface == CompilerInterface.CLI
-        assert tmp_dir is not None
-
-        (command_line, compiler_input) = prepare_compiler_input(
-            compiler_path.absolute(),
-            Path(source_file_name.name),
-            force_no_optimize_yul,
-            interface,
-            preset,
-            smt_use,
-            metadata_option_supported,
-        )
-
-        # Create a copy that we can use directly with the CLI interface
-        modified_source_path = tmp_dir / source_file_name.name
-        # NOTE: newline='' disables newline conversion.
-        # We want the file exactly as is because changing even a single byte in the source affects metadata.
-        with open(modified_source_path, 'w', encoding='utf8', newline='') as modified_source_file:
-            modified_source_file.write(compiler_input)
-
-        process = subprocess.run(
-            command_line,
-            cwd=tmp_dir,
-            encoding='utf8',
-            capture_output=True,
-            check=exit_on_error,
-        )
-
-        return parse_cli_output(Path(source_file_name), process.stdout)
-
-
-def generate_report(
-    source_file_names: List[str],
-    compiler_path: Path,
-    interface: CompilerInterface,
-    presets: List[SettingsPreset],
-    smt_use: SMTUse,
-    force_no_optimize_yul: bool,
-    report_file_path: Path,
-    verbose: bool,
-    exit_on_error: bool,
-):
-    statistics = Statistics()
-    metadata_option_supported = detect_metadata_cli_option_support(compiler_path)
-
-    try:
-        with open(report_file_path, mode='w', encoding='utf8', newline='\n') as report_file:
-            for preset in presets:
-                with TemporaryDirectory(prefix='prepare_report-') as tmp_dir:
-                    for source_file_name in sorted(source_file_names):
-                        try:
-                            report = run_compiler(
-                                compiler_path,
-                                Path(source_file_name),
-                                force_no_optimize_yul,
-                                interface,
-                                preset,
-                                smt_use,
-                                metadata_option_supported,
-                                Path(tmp_dir),
-                                exit_on_error,
-                            )
-
-                            statistics.aggregate(report)
-                            print(report.format_summary(verbose), end=('\n' if verbose else ''), flush=True)
-
-                            report_file.write(report.format_report())
-                        except subprocess.CalledProcessError as exception:
-                            print(
-                                f"\n\nInterrupted by an exception while processing file "
-                                f"'{source_file_name}' with preset={preset}\n\n"
-                                f"COMPILER STDOUT:\n{exception.stdout}\n"
-                                f"COMPILER STDERR:\n{exception.stderr}\n",
-                                file=sys.stderr
-                            )
-                            raise
-                        except:
-                            print(
-                                f"\n\nInterrupted by an exception while processing file "
-                                f"'{source_file_name}' with preset={preset}\n\n",
-                                file=sys.stderr
-                            )
-                            raise
-    finally:
-        print('\n', statistics, '\n', sep='')
-
-
-def commandline_parser() -> ArgumentParser:
-    script_description = (
-        "Generates a report listing bytecode and metadata obtained by compiling all the "
-        "*.sol files found in the current working directory using the provided binary."
-    )
-
-    parser = ArgumentParser(description=script_description)
-    parser.add_argument(dest='compiler_path', help="Solidity compiler executable")
-    parser.add_argument(
-        '--interface',
-        dest='interface',
-        default=CompilerInterface.STANDARD_JSON.value,
-        choices=[c.value for c in CompilerInterface],
-        help="Compiler interface to use.",
-    )
-    parser.add_argument(
-        '--preset',
-        dest='presets',
-        default=None,
-        nargs='+',
-        action='append',
-        choices=[p.value for p in SettingsPreset],
-        help="Predefined set of settings to pass to the compiler. More than one can be selected.",
-    )
-    parser.add_argument(
-        '--smt-use',
-        dest='smt_use',
-        default=SMTUse.DISABLE.value,
-        choices=[s.value for s in SMTUse],
-        help="What to do about contracts that use the experimental SMT checker."
-    )
-    parser.add_argument(
-        '--force-no-optimize-yul',
-        dest='force_no_optimize_yul',
-        default=False,
-        action='store_true',
-        help="Explicitly disable Yul optimizer in CLI runs without optimization to work around a bug in solc 0.6.0 and 0.6.1."
-    )
-    parser.add_argument('--report-file', dest='report_file', default='report.txt', help="The file to write the report to.")
-    parser.add_argument('--verbose', dest='verbose', default=False, action='store_true', help="More verbose output.")
-    parser.add_argument(
-        '--exit-on-error',
-        dest='exit_on_error',
-        default=False,
-        action='store_true',
-        help="Immediately exit and print compiler output if the compiler exits with an error.",
-    )
-    return parser
-
-
-if __name__ == "__main__":
-    options = commandline_parser().parse_args()
-
-    if options.presets is None:
-        # NOTE: Can't put it in add_argument()'s default because then it would be always present.
-        # See https://github.com/python/cpython/issues/60603
-        presets = [[SettingsPreset.LEGACY_NO_OPTIMIZE.value, SettingsPreset.LEGACY_OPTIMIZE.value]]
-    else:
-        presets = options.presets
-
-    generate_report(
-        glob("*.sol"),
-        Path(options.compiler_path),
-        CompilerInterface(options.interface),
-        [SettingsPreset(p) for preset_group in presets for p in preset_group],
-        SMTUse(options.smt_use),
-        options.force_no_optimize_yul,
-        Path(options.report_file),
-        options.verbose,
-        options.exit_on_error,
-    )
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
deleted file mode 100755
index 22ad325368d3..000000000000
--- a/scripts/check_style.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-ERROR_LOG="$(mktemp -t check_style_XXXXXX.log)"
-
-EXCLUDE_FILES=(
-    # The line below is left unquoted to allow the shell globbing path expansion
-    test/cmdlineTests/*/{err,output}
-    "libsolutil/picosha2.h"
-    "test/cmdlineTests/strict_asm_only_cr/input.yul"
-    "test/libsolutil/UTF8.cpp"
-    "test/libsolidity/syntaxTests/license/license_cr_endings.sol"
-    "test/libsolidity/syntaxTests/license/license_crlf_endings.sol"
-    "test/libsolidity/syntaxTests/license/license_whitespace_trailing.sol"
-    "test/scripts/fixtures/smt_contract_with_crlf_newlines.sol"
-    "test/scripts/fixtures/smt_contract_with_cr_newlines.sol"
-    "test/scripts/fixtures/smt_contract_with_mixed_newlines.sol"
-)
-EXCLUDE_FILES_JOINED=$(printf "%s\|" "${EXCLUDE_FILES[@]}")
-EXCLUDE_FILES_JOINED=${EXCLUDE_FILES_JOINED%??}
-
-NAMESPACE_STD_FREE_FILES=(
-    libevmasm/*
-    liblangutil/*
-    libsmtutil/*
-    libsolc/*
-    libsolidity/analysis/*
-    libsolidity/ast/*
-    libsolidity/codegen/ir/*
-    libsolidity/codegen/*
-    libsolidity/formal/*
-    libsolidity/interface/*
-    libsolidity/lsp/*
-    libsolidity/parsing/*
-    libsolutil/*
-    libyul/*
-    libyul/backends/evm/*
-    libyul/optimiser/*
-    solc/*
-    test/contracts/*
-    test/libevmasm/*
-    test/liblangutil/*
-    test/libsolutil/*
-    test/libsolidity/*
-    test/libsolidity/analysis/*
-    test/libsolidity/interface/*
-    test/libsolidity/util/*
-)
-
-(
-REPO_ROOT="$(dirname "$0")"/..
-cd "$REPO_ROOT" || exit 1
-
-WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" |
-    grep -v "test/libsolidity/ASTJSON\|test/compilationTests/zeppelin/LICENSE\|${EXCLUDE_FILES_JOINED}" || true
-)
-
-if [[ "$WHITESPACE" != "" ]]
-then
-    echo "Error: Trailing whitespace found:" | tee -a "$ERROR_LOG"
-    echo "$WHITESPACE" | tee -a "$ERROR_LOG"
-    scripts/ci/post_style_errors_on_github.sh "$ERROR_LOG"
-    exit 1
-fi
-
-function preparedGrep
-{
-    git grep -nIE "$1" -- '*.h' '*.cpp' | grep -v "${EXCLUDE_FILES_JOINED}"
-    return $?
-}
-
-FORMATERROR=$(
-(
-    preparedGrep "#include \"" | grep -E -v -e "license.h" -e "BuildInfo.h"  # Use include with <> characters
-    preparedGrep "\<(if|for|while|switch)\(" # no space after "if", "for", "while" or "switch"
-    preparedGrep "\<for\>\s*\([^=]*\>\s:\s.*\)" # no space before range based for-loop
-    preparedGrep "\<if\>\s*\(.*\)\s*\{\s*$" # "{\n" on same line as "if"
-    preparedGrep "namespace .*\{"
-    preparedGrep "[,\(<]\s*const " # const on left side of type
-    preparedGrep "^\s*(static)?\s*const " # const on left side of type (beginning of line)
-    preparedGrep "^ [^*]|[^*] 	|	 [^*]" # uses spaces for indentation or mixes spaces and tabs
-    preparedGrep "[a-zA-Z0-9_]\s*[&][a-zA-Z_]" | grep -E -v "return [&]" # right-aligned reference ampersand (needs to exclude return)
-    # right-aligned reference pointer star (needs to exclude return and comments)
-    preparedGrep "[a-zA-Z0-9_]\s*[*][a-zA-Z_]" | grep -E -v -e "return [*]" -e "^* [*]" -e "^*//.*"
-    # unqualified move()/forward() checks, i.e. make sure that std::move() and std::forward() are used instead of move() and forward()
-    preparedGrep "move\(.+\)" | grep -v "std::move" | grep -E "[^a-z]move"
-    preparedGrep "forward\(.+\)" | grep -v "std::forward" | grep -E "[^a-z]forward"
-) | grep -E -v -e "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" -e "^test/" || true
-)
-
-# Special error handling for `using namespace std;` exclusion, since said statement can be present in the test directory
-# and its subdirectories, but is excluded in the above ruleset. In order to have consistent codestyle with regards to
-# std namespace usage, test directory must also be covered.
-FORMATSTDERROR=$(
-(
-    # make sure `using namespace std` is not used in INCLUDE_DIRECTORIES
-    # shellcheck disable=SC2068,SC2068
-    grep -nIE -d skip "using namespace std;" ${NAMESPACE_STD_FREE_FILES[@]}
-) || true
-)
-
-# Merge errors into single string
-FORMATEDERRORS="$FORMATERROR$FORMATSTDERROR"
-
-if [[ "$FORMATEDERRORS" != "" ]]
-then
-    echo "Coding style error:" | tee -a "$ERROR_LOG"
-    echo "$FORMATEDERRORS" | tee -a "$ERROR_LOG"
-    scripts/ci/post_style_errors_on_github.sh "$ERROR_LOG"
-    exit 1
-fi
-)
diff --git a/scripts/check_symlinks.sh b/scripts/check_symlinks.sh
deleted file mode 100755
index a02200cea04d..000000000000
--- a/scripts/check_symlinks.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-REPO_ROOT="$(dirname "$0")"/..
-REPO_ROOT=$(realpath "${REPO_ROOT}")
-
-BROKEN_LINKS=$(find -L "${REPO_ROOT}" -type l -ls)
-if [ -z "${BROKEN_LINKS}" ]
-then
-  exit 0
-else
-  echo "broken symbolic link(s) found:"
-  echo "${BROKEN_LINKS}"
-
-  exit 1
-fi
diff --git a/scripts/chk_shellscripts/chk_shellscripts.sh b/scripts/chk_shellscripts/chk_shellscripts.sh
deleted file mode 100755
index f94d9f2da32d..000000000000
--- a/scripts/chk_shellscripts/chk_shellscripts.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-REPO_ROOT="$(dirname "$0")"/../..
-REPO_ROOT=$(realpath "${REPO_ROOT}")
-
-cd "${REPO_ROOT}"
-
-SHELLCHECK=${SHELLCHECK:-"$(command -v -- shellcheck)"}
-if [ ! -f "${SHELLCHECK}" ]; then
-    echo "error: shellcheck '${SHELLCHECK}' not found."
-    exit 1
-fi
-
-mapfile -t FILES < <(find . -type f -name "*.sh")
-"${SHELLCHECK}" "${FILES[@]}"
diff --git a/scripts/ci/base64DecToArr.js b/scripts/ci/base64DecToArr.js
deleted file mode 100644
index e1f4729bc927..000000000000
--- a/scripts/ci/base64DecToArr.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function base64DecToArr (sBase64) {
-/*\
-|*|
-|*|  Base64 / binary data / UTF-8 strings utilities
-|*|
-|*|  https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
-|*|
-\*/
-
-/* Array of bytes to Base64 string decoding */
-
-function b64ToUint6 (nChr) {
-
-  return nChr > 64 && nChr < 91 ?
-      nChr - 65
-    : nChr > 96 && nChr < 123 ?
-      nChr - 71
-    : nChr > 47 && nChr < 58 ?
-      nChr + 4
-    : nChr === 43 ?
-      62
-    : nChr === 47 ?
-      63
-    :
-      0;
-
-}
-
-  var
-    nInLen = sBase64.length,
-    nOutLen = nInLen * 3 + 1 >> 2, taBytes = new Uint8Array(nOutLen);
-
-  for (var nMod3, nMod4, nUint24 = 0, nOutIdx = 0, nInIdx = 0; nInIdx < nInLen; nInIdx++) {
-    nMod4 = nInIdx & 3;
-    nUint24 |= b64ToUint6(sBase64.charCodeAt(nInIdx)) << 6 * (3 - nMod4);
-    if (nMod4 === 3 || nInLen - nInIdx === 1) {
-      for (nMod3 = 0; nMod3 < 3 && nOutIdx < nOutLen; nMod3++, nOutIdx++) {
-        taBytes[nOutIdx] = nUint24 >>> (16 >>> nMod3 & 24) & 255;
-      }
-      nUint24 = 0;
-
-    }
-  }
-
-  return taBytes;
-}
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
deleted file mode 100755
index d529b03c1aab..000000000000
--- a/scripts/ci/build.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-ROOTDIR="$(dirname "$0")/../.."
-# shellcheck source=scripts/common.sh
-source "${ROOTDIR}/scripts/common.sh"
-
-prerelease_source="${1:-ci}"
-
-cd "${ROOTDIR}"
-
-# shellcheck disable=SC2166
-if [ "$CIRCLE_BRANCH" = release -o -n "$CIRCLE_TAG" -o -n "$FORCE_RELEASE" ]
-then
-    echo -n >prerelease.txt
-else
-    # Use last commit date rather than build date to avoid ending up with builds for
-    # different platforms having different version strings (and therefore producing different bytecode)
-    # if the CI is triggered just before midnight.
-    TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" >prerelease.txt
-fi
-
-if [ -n "$CIRCLE_SHA1" ]
-then
-    echo -n "$CIRCLE_SHA1" >commit_hash.txt
-fi
-
-mkdir -p build
-cd build
-
-# shellcheck disable=SC2166
-[ -n "$COVERAGE" -a "$CIRCLE_BRANCH" != release -a -z "$CIRCLE_TAG" ] && CMAKE_OPTIONS="$CMAKE_OPTIONS -DCOVERAGE=ON"
-
-# shellcheck disable=SC2086
-cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" $CMAKE_OPTIONS -G "Unix Makefiles"
-
-make
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
deleted file mode 100755
index 04e16293fd96..000000000000
--- a/scripts/ci/build_emscripten.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# This script builds the solidity binary using Emscripten.
-# Emscripten is a way to compile C/C++ to JavaScript.
-#
-# http://kripken.github.io/emscripten-site/
-#
-# First run install_dep.sh OUTSIDE of docker and then
-# run this script inside a docker image trzeci/emscripten
-#
-# The documentation for solidity is hosted at:
-#
-# https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -ev
-
-SCRIPT_DIR="$(realpath "$(dirname "$0")/..")"
-# shellcheck source=scripts/common.sh
-source "${SCRIPT_DIR}/common.sh"
-
-function build() {
-    local build_dir="$1"
-    local prerelease_source="${2:-ci}"
-
-    cd /root/project
-
-    # shellcheck disable=SC2166
-    if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]
-    then
-        echo -n >prerelease.txt
-    else
-        # Use last commit date rather than build date to avoid ending up with builds for
-        # different platforms having different version strings (and therefore producing different bytecode)
-        # if the CI is triggered just before midnight.
-        TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" >prerelease.txt
-    fi
-    if [ -n "$CIRCLE_SHA1" ]
-    then
-        echo -n "$CIRCLE_SHA1" >commit_hash.txt
-    fi
-
-    # Disable warnings for unqualified `move()` calls, introduced and enabled by
-    # default in clang-16 which is what the emscripten docker image uses.
-    # Additionally, disable the warning for unknown warnings here, as this script is
-    # also used with earlier clang versions.
-    # TODO: This can be removed if and when all usages of `move()` in our codebase use the `std::` qualifier.
-    CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call"
-
-    mkdir -p "$build_dir"
-    cd "$build_dir"
-    emcmake cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBoost_USE_STATIC_LIBS=1 \
-        -DBoost_USE_STATIC_RUNTIME=1 \
-        -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
-        -DTESTS=0 \
-    ..
-    make soljson
-
-    cd ..
-    mkdir -p upload
-    scripts/ci/pack_soljson.sh "$build_dir/libsolc/soljson.js" "$build_dir/libsolc/soljson.wasm" upload/soljson.js
-    cp upload/soljson.js ./
-
-    OUTPUT_SIZE=$(ls -la soljson.js)
-
-    echo "Emscripten output size: $OUTPUT_SIZE"
-}
-
-function show_help() {
-cat << EOF
-Usage: ${0##*/} [-h|--help] [--build-dir DIR] [--prerelease-source prerelease_source]
-Build Solidity emscripten binary
-    -h | --help          Display this help message
-    --build-dir          The emscripten build directory
-    --prerelease-source  The prerelease source string. E.g. 'nightly' or 'ci'.
-EOF
-}
-
-function main() {
-    local build_dir="emscripten_build"
-    local prerelease_source=""
-
-    while (( $# > 0 )); do
-        case "$1" in
-            -h|--help)
-                show_help
-                exit 0
-                ;;
-            --build-dir)
-                [[ -n "$2" ]] || fail "Option --build-dir cannot be empty"
-                build_dir="$2"
-                shift 2
-                ;;
-            --prerelease-source)
-                [[ -n "$2" ]] || fail "Option --prerelease-source cannot be empty"
-                prerelease_source="$2"
-                shift 2
-                ;;
-            *) fail "Invalid option: $1" ;;
-        esac
-    done
-    build "$build_dir" "$prerelease_source"
-}
-
-main "$@"
diff --git a/scripts/ci/build_ossfuzz.sh b/scripts/ci/build_ossfuzz.sh
deleted file mode 100755
index 1240b6877f1a..000000000000
--- a/scripts/ci/build_ossfuzz.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-ROOTDIR="/root/project"
-BUILDDIR="${ROOTDIR}/build"
-mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps"
-
-function generate_protobuf_bindings
-{
-  cd "${ROOTDIR}"/test/tools/ossfuzz
-  # Generate protobuf C++ bindings
-  for protoName in yul abiV2 sol;
-  do
-    protoc "${protoName}"Proto.proto --cpp_out .
-  done
-}
-
-function build_fuzzers
-{
-  cd "${BUILDDIR}"
-  cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \
-    -DCMAKE_TOOLCHAIN_FILE="${ROOTDIR}"/cmake/toolchains/libfuzzer.cmake
-  make ossfuzz ossfuzz_proto ossfuzz_abiv2 -j 4
-}
-
-generate_protobuf_bindings
-build_fuzzers
diff --git a/scripts/ci/buildpack-deps_test_emscripten.sh b/scripts/ci/buildpack-deps_test_emscripten.sh
deleted file mode 120000
index 4e901d9ccb70..000000000000
--- a/scripts/ci/buildpack-deps_test_emscripten.sh
+++ /dev/null
@@ -1 +0,0 @@
-build_emscripten.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh b/scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh
deleted file mode 120000
index 86beda7dd2c3..000000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh
+++ /dev/null
@@ -1 +0,0 @@
-build_ossfuzz.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu1804.sh b/scripts/ci/buildpack-deps_test_ubuntu1804.sh
deleted file mode 120000
index c07a74de4fb4..000000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu1804.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2004.sh b/scripts/ci/buildpack-deps_test_ubuntu2004.sh
deleted file mode 120000
index feb6a5927fc0..000000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu2004.sh
+++ /dev/null
@@ -1 +0,0 @@
-./build.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh b/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
deleted file mode 120000
index c07a74de4fb4..000000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2204.sh b/scripts/ci/buildpack-deps_test_ubuntu2204.sh
deleted file mode 120000
index c07a74de4fb4..000000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu2204.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh
deleted file mode 100755
index a6b59e157e90..000000000000
--- a/scripts/ci/docker_upgrade.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-function error
-{
-  echo >&2 "ERROR: ${1} Aborting." && false
-}
-
-function warning
-{
-  echo >&2 "WARNING: ${1}"
-}
-
-[[ $# == 3 ]] || error "Expected exactly 3 parameters: '${0} <IMAGE_NAME> <IMAGE_VARIANT> <DOCKER_REPOSITORY>'."
-
-IMAGE_NAME="${1}"
-IMAGE_VARIANT="${2}"
-DOCKER_REPOSITORY="${3}"
-DOCKERFILE="scripts/docker/${IMAGE_NAME}/Dockerfile.${IMAGE_VARIANT}"
-
-echo "-- check_dockerfile_was_changed"
-
-# exit, if the dockerfile was not changed.
-if git diff --quiet origin/develop HEAD -- "${DOCKERFILE}"; then
-  echo "${DOCKERFILE} was not changed. Nothing to do."
-  exit 0
-fi
-
-echo "-- check_version"
-
-PREV_VERSION=$(git diff origin/develop HEAD -- "${DOCKERFILE}" | grep -e '^\s*-LABEL\s\+version=".*"\s*$' | awk -F'"' '{ print $2 }')
-NEXT_VERSION=$(git diff origin/develop HEAD -- "${DOCKERFILE}" | grep -e '^\s*+LABEL\s\+version=".*"\s*$' | awk -F'"' '{ print $2 }')
-
-[[ $NEXT_VERSION != "" ]] || error "No version label defined in Dockerfile. You may need to add 'LABEL version' in '${DOCKERFILE}'."
-
-[[ $PREV_VERSION != "" ]] || {
-  warning "no previous version found. Will set \$PREV_VERSION = 0."
-  PREV_VERSION=0
-}
-
-if [[ $((PREV_VERSION + 1)) != $((NEXT_VERSION)) ]]; then
-  error "Version label in Dockerfile was not incremented. You may need to change 'LABEL version' in '${DOCKERFILE}'."
-fi
-
-echo "-- build_docker"
-
-# This is a workaround: we run `docker build` twice to prevent the `layer does not exist` problem.
-# See https://github.com/moby/moby/issues/37965.
-docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}/Dockerfile.${IMAGE_VARIANT}" --tag "${IMAGE_NAME}" ||
-  docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}/Dockerfile.${IMAGE_VARIANT}" --tag "${IMAGE_NAME}"
-
-echo "-- test_docker @ '${PWD}'"
-
-# NOTE: Since /root/project/ is a dir from outside the container and the owner of the files is different,
-# git show in the script refuses to work. It must be marked as safe to use first.
-# See https://github.blog/2022-04-12-git-security-vulnerability-announced/
-docker run \
-  --rm \
-  --volume "${PWD}:/root/project" \
-  "${IMAGE_NAME}" \
-  bash -c "
-    git config --global --add safe.directory /root/project &&
-    /root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
-  "
-
-echo "-- push_docker"
-
-VERSION=$(docker inspect --format='{{.Config.Labels.version}}' "${IMAGE_NAME}")
-DOCKER_IMAGE_ID="${DOCKER_REPOSITORY}:${IMAGE_VARIANT}"
-
-docker tag "${IMAGE_NAME}" "${DOCKER_IMAGE_ID}-${VERSION}"
-docker push "${DOCKER_IMAGE_ID}-${VERSION}"
-
-REPO_DIGEST=$(docker inspect --format='{{.RepoDigests}}' "${DOCKER_IMAGE_ID}-${VERSION}")
-
-echo "DOCKER_IMAGE=${DOCKER_IMAGE_ID}-${VERSION}" >> "$GITHUB_ENV"
-echo "DOCKER_REPO_DIGEST=${REPO_DIGEST}" >> "$GITHUB_ENV"
diff --git a/scripts/ci/mini-lz4.js b/scripts/ci/mini-lz4.js
deleted file mode 100644
index 767647003e14..000000000000
--- a/scripts/ci/mini-lz4.js
+++ /dev/null
@@ -1,116 +0,0 @@
-function uncompress(source, uncompressedSize) {
-/*
-based off https://github.com/emscripten-core/emscripten/blob/main/third_party/mini-lz4.js
-The license only applies to the body of this function (``uncompress``).
-====
-MiniLZ4: Minimal LZ4 block decoding and encoding.
-
-based off of node-lz4, https://github.com/pierrec/node-lz4
-
-====
-Copyright (c) 2012 Pierre Curto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====
-
-changes have the same license
-*/
-/**
- * Decode a block. Assumptions: input contains all sequences of a
- * chunk, output is large enough to receive the decoded data.
- * If the output buffer is too small, an error will be thrown.
- * If the returned value is negative, an error occurred at the returned offset.
- *
- * @param {ArrayBufferView} input input data
- * @param {ArrayBufferView} output output data
- * @param {number=} sIdx
- * @param {number=} eIdx
- * @return {number} number of decoded bytes
- * @private
- */
-function uncompressBlock (input, output, sIdx, eIdx) {
-	sIdx = sIdx || 0
-	eIdx = eIdx || (input.length - sIdx)
-	// Process each sequence in the incoming data
-	for (var i = sIdx, n = eIdx, j = 0; i < n;) {
-		var token = input[i++]
-
-		// Literals
-		var literals_length = (token >> 4)
-		if (literals_length > 0) {
-			// length of literals
-			var l = literals_length + 240
-			while (l === 255) {
-				l = input[i++]
-				literals_length += l
-			}
-
-			// Copy the literals
-			var end = i + literals_length
-			while (i < end) output[j++] = input[i++]
-
-			// End of buffer?
-			if (i === n) return j
-		}
-
-		// Match copy
-		// 2 bytes offset (little endian)
-		var offset = input[i++] | (input[i++] << 8)
-
-		// XXX 0 is an invalid offset value
-		if (offset === 0) return j
-		if (offset > j) return -(i-2)
-
-		// length of match copy
-		var match_length = (token & 0xf)
-		var l = match_length + 240
-		while (l === 255) {
-			l = input[i++]
-			match_length += l
-		}
-		// Copy the match
-		var pos = j - offset // position of the match copy in the current output
-		var end = j + match_length + 4 // minmatch = 4
-		while (j < end) output[j++] = output[pos++]
-	}
-
-	return j
-}
-var result = new ArrayBuffer(uncompressedSize);
-var sourceIndex = 0;
-var destIndex = 0;
-var blockSize;
-while((blockSize = (source[sourceIndex] | (source[sourceIndex + 1] << 8) | (source[sourceIndex + 2] << 16) | (source[sourceIndex + 3] << 24))) > 0)
-{
-	sourceIndex += 4;
-	if (blockSize & 0x80000000)
-	{
-		blockSize &= 0x7FFFFFFFF;
-		for (var i = 0; i < blockSize; i++) {
-			result[destIndex++] = source[sourceIndex++];
-		}
-	}
-	else
-	{
-		destIndex += uncompressBlock(source, new Uint8Array(result, destIndex, uncompressedSize - destIndex), sourceIndex, sourceIndex + blockSize);
-		sourceIndex += blockSize;
-	}
-}
-return new Uint8Array(result, 0, uncompressedSize);
-}
diff --git a/scripts/ci/notification/matrix_notification.sh b/scripts/ci/notification/matrix_notification.sh
deleted file mode 100755
index f7bd1949b471..000000000000
--- a/scripts/ci/notification/matrix_notification.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(dirname "$0")"
-
-function fail() {
-    printf '%s\n' "$1" >&2
-    exit 1
-}
-
-function notify() {
-    [[ -z "$1" ]] && fail "Event type not provided."
-    [[ "$1" != "failure" && "$1" != "success" && "$1" != "release" ]] && fail "Wrong event type."
-    local event="$1"
-    local formatted_message
-
-    # FIXME: Checking $CIRCLE_PULL_REQUEST would be better than hard-coding branch names
-    # but it's broken. CircleCI associates runs on develop/breaking with random old PRs.
-    [[ "$BRANCH" == "develop" || "$BRANCH" == "breaking" ]] || { echo "Running on a PR or a feature branch - notification skipped."; exit 0; }
-
-    # The release notification only makes sense on tagged commits. If the commit is untagged, just bail out.
-    [[ "$event" == "release" ]] && { [[ $TAG != "" ]] || { echo "Not a tagged commit - notification skipped."; exit 0; } }
-
-    formatted_message="$(format_predefined_message "$event")"
-
-    curl "https://${MATRIX_SERVER}/_matrix/client/v3/rooms/${MATRIX_NOTIFY_ROOM_ID}/send/m.room.message" \
-        --request POST \
-        --include \
-        --fail \
-        --header "Content-Type: application/json" \
-        --header "Accept: application/json" \
-        --header "Authorization: Bearer ${MATRIX_ACCESS_TOKEN}" \
-        --data "$formatted_message"
-}
-
-function circleci_workflow_name() {
-    # Workflow name is not exposed as an env variable. Has to be queried from the API.
-    # The name is not critical so if anything fails, use the raw workflow ID as a fallback.
-    local workflow_info
-    workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
-    echo "$workflow_info" | grep -E '"\s*name"\s*:\s*".*"' | cut -d \" -f 4 || echo "$CIRCLE_WORKFLOW_ID"
-}
-
-function circleci_job_name() {
-    (( CIRCLE_NODE_TOTAL == 1 )) && echo "${CIRCLE_JOB}" && return
-    (( CIRCLE_NODE_TOTAL != 1 )) && echo "${CIRCLE_JOB} (run $((CIRCLE_NODE_INDEX + 1))/${CIRCLE_NODE_TOTAL})"
-}
-
-# Currently matrix only supports html formatted body,
-# see: https://spec.matrix.org/v1.6/client-server-api/#mtext
-#
-# Eventually, the matrix api will have support for better format options and `formatted_body` may not be necessary anymore:
-# https://github.com/matrix-org/matrix-spec-proposals/pull/1767
-function format_predefined_message() {
-    [[ -z "$1" ]] && fail "Event type not provided."
-    local event="$1"
-    local template
-
-    [[ "$event" == "failure" ]] && template="${SCRIPT_DIR}/templates/build_fail.json"
-    [[ "$event" == "success" ]] && template="${SCRIPT_DIR}/templates/build_success.json"
-    [[ "$event" == "release" ]] && template="${SCRIPT_DIR}/templates/build_release.json"
-
-    [[ -z "$template" ]] && fail "Message template for event [$event] not defined."
-
-    # shellcheck disable=SC2016
-    sed -e 's|${WORKFLOW_NAME}|'"${WORKFLOW_NAME}"'|' \
-        -e 's|${JOB}|'"${JOB}"'|' \
-        -e 's|${BRANCH}|'"${BRANCH}"'|' \
-        -e 's|${TAG}|'"${TAG}"'|' \
-        -e 's|${BUILD_URL}|'"${BUILD_URL}"'|' \
-        -e 's|${BUILD_NUM}|'"${BUILD_NUM}"'|' \
-        "$template"
-}
-
-# Set message environment variables based on CI backend
-if [[ "$CIRCLECI" = true ]] ; then
-    BRANCH="$CIRCLE_BRANCH"
-    TAG="${CIRCLE_TAG:-}"
-    BUILD_URL="$CIRCLE_BUILD_URL"
-    BUILD_NUM="$CIRCLE_BUILD_NUM"
-    WORKFLOW_NAME="$(circleci_workflow_name)"
-    JOB="$(circleci_job_name)"
-fi
-
-notify "$@"
diff --git a/scripts/ci/notification/templates/build_fail.json b/scripts/ci/notification/templates/build_fail.json
deleted file mode 100644
index baf69aa4a086..000000000000
--- a/scripts/ci/notification/templates/build_fail.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "msgtype": "m.text",
-    "body": " � [${WORKFLOW_NAME}] Job ${JOB} failed on ${BRANCH}. Please see ${BUILD_URL} for details.",
-    "format": "org.matrix.custom.html",
-    "formatted_body": " � [${WORKFLOW_NAME}] Job <strong>${JOB}</strong> failed on <strong>${BRANCH}</strong>. Please see <a href=\"${BUILD_URL}\">build ${BUILD_NUM}</a> for details."
-}
diff --git a/scripts/ci/notification/templates/build_release.json b/scripts/ci/notification/templates/build_release.json
deleted file mode 100644
index b7c538f8ce73..000000000000
--- a/scripts/ci/notification/templates/build_release.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "msgtype": "m.text",
-    "body": " 📦 Release binaries for version ${TAG} are ready and attached as artifacts to ${BUILD_URL}. Please make sure the whole workflow succeeded before using them.",
-    "format": "org.matrix.custom.html",
-    "formatted_body": " 📦 Release binaries for version <strong>${TAG}</strong> are ready and attached as artifacts to <a href=\"${BUILD_URL}\">build ${BUILD_NUM}</a>. <strong>Please make sure the whole workflow succeeded before using them.</strong>"
-}
diff --git a/scripts/ci/notification/templates/build_success.json b/scripts/ci/notification/templates/build_success.json
deleted file mode 100644
index 170360fbb858..000000000000
--- a/scripts/ci/notification/templates/build_success.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "msgtype": "m.text",
-    "body": " ✅ [${WORKFLOW_NAME}] Job ${JOB} succeeded on ${BRANCH}. Please see ${BUILD_URL} for details.",
-    "format": "org.matrix.custom.html",
-    "formatted_body":" ✅ [${WORKFLOW_NAME}] Job <strong>${JOB}</strong> succeeded on <strong>${BRANCH}</strong>. Please see <a href=\"${BUILD_URL}\">build ${BUILD_NUM}</a> for details."
-}
diff --git a/scripts/ci/pack_soljson.sh b/scripts/ci/pack_soljson.sh
deleted file mode 100755
index 75ef9e09b4c1..000000000000
--- a/scripts/ci/pack_soljson.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-script_dir="$(realpath "$(dirname "$0")")"
-soljson_js="$1"
-soljson_wasm="$2"
-soljson_wasm_size=$(wc -c "${soljson_wasm}" | cut -d ' ' -f 1)
-output="$3"
-
-(( $# == 3 )) || { >&2 echo "Usage: $0 soljson.js soljson.wasm packed_soljson.js"; exit 1; }
-
-# If this changes in an emscripten update, it's probably nothing to worry about,
-# but we should double-check when it happens and adjust the tail command below.
-[[ $(head -c 5 "${soljson_js}") == "null;" ]] || { >&2 echo 'Expected soljson.js to start with "null;"'; exit 1; }
-
-echo "Packing $soljson_js and $soljson_wasm to $output."
-(
-    echo -n 'var Module = Module || {}; Module["wasmBinary"] = '
-    echo -n '(function(source, uncompressedSize) {'
-    # Note that base64DecToArr assumes no trailing equals signs.
-    cpp "${script_dir}/base64DecToArr.js" | grep -v "^#.*"
-    # Note that mini-lz4.js assumes no file header and no frame crc checksums.
-    cpp "${script_dir}/mini-lz4.js" | grep -v "^#.*"
-    echo 'return uncompress(base64DecToArr(source), uncompressedSize);})('
-    echo -n '"'
-    # We fix lz4 format settings, remove the 8 bytes file header and remove the trailing equals signs of the base64 encoding.
-    lz4c --no-frame-crc --best --favor-decSpeed "${soljson_wasm}" - | tail -c +8 | base64 -w 0 | sed 's/[^A-Za-z0-9\+\/]//g'
-    echo '",'
-    echo -n "${soljson_wasm_size});"
-    # Remove "null;" from the js wrapper.
-    tail -c +6 "${soljson_js}"
-) > "$output"
-
-echo "Testing $output."
-echo "process.stdout.write(require('$(realpath "${output}")').wasmBinary)" | node | cmp "${soljson_wasm}" && echo "Binaries match."
-# Allow the wasm binary to be garbage collected after compilation.
-echo 'Module["wasmBinary"] = undefined;' >> "${output}"
diff --git a/scripts/ci/post_style_errors_on_github.sh b/scripts/ci/post_style_errors_on_github.sh
deleted file mode 100755
index b0bf1bda7111..000000000000
--- a/scripts/ci/post_style_errors_on_github.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-ERROR_LOG="$1"
-
-function report_error_to_github
-{
-    [[ $CIRCLE_PR_NUMBER != "" ]] || CIRCLE_PR_NUMBER="${CIRCLE_PULL_REQUEST//[^0-9]/}"
-
-    if [[ $CI == "true" ]]
-    then
-        echo "posting error message to github"
-        post_error_to_github
-        post_review_comment_to_github
-    fi
-}
-
-function post_error_to_github
-{
-    GITHUB_API_URL="https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/issues/$CIRCLE_PR_NUMBER/comments"
-
-    ESCAPED_ERROR_MSG=$(cat -e "$ERROR_LOG" | sed 's/\\/\\\\/g' | sed 's/"/\\\"/g')
-
-    FORMATTED_ERROR_MSG=$(echo "$ESCAPED_ERROR_MSG" | sed 's/\$/\\n/g' | tr -d '\n')
-
-    curl --request POST \
-        --url "$GITHUB_API_URL" \
-        --header 'accept: application/vnd.github.v3+json' \
-        --header 'content-type: application/json' \
-        -u "stackenbotten:$GITHUB_ACCESS_TOKEN" \
-        --data "{\"body\": \"There was an error when running \`$CIRCLE_JOB\` for commit \`$CIRCLE_SHA1\`:\n\`\`\`\n$FORMATTED_ERROR_MSG\n\`\`\`\nPlease check that your changes are working as intended.\"}"
-}
-
-function post_review_comment_to_github
-{
-    GITHUB_API_URL="https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER/comments"
-
-    sed -i 1d "$ERROR_LOG"
-
-    while read -r line
-    do
-        ERROR_PATH=$(echo "$line" | grep -oE ".*\.cpp")
-        ERROR_LINE=$(echo "$line" | grep -oE "[0-9]*")
-        [[ $ERROR_PATH != "" ]] || { echo "ERROR: Error message does not contain file path."; exit 1; }
-        [[ $ERROR_LINE != "" ]] || { echo "ERROR: Error message does not contain line number."; exit 1; }
-
-        curl --request POST \
-            --url "$GITHUB_API_URL" \
-            --header 'accept: application/vnd.github.v3+json, application/vnd.github.comfort-fade-preview+json' \
-            --header 'content-type: application/json' \
-            -u "stackenbotten:$GITHUB_ACCESS_TOKEN" \
-            --data "{\"commit_id\": \"$CIRCLE_SHA1\", \"path\": \"$ERROR_PATH\", \"line\": $ERROR_LINE, \"side\": \"RIGHT\", \"body\": \"Coding style error\"}"
-    done < "$ERROR_LOG"
-}
-
-report_error_to_github
diff --git a/scripts/codespell_ignored_lines.txt b/scripts/codespell_ignored_lines.txt
deleted file mode 100644
index b7987cc001aa..000000000000
--- a/scripts/codespell_ignored_lines.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-    A constant BT = BU;
-    A constant BU = BV;
-    A constant FN = FO;
-    A constant FO = FP;
-    struct BT { BU m; }
-    struct BU { BV m; }
-    struct FN { FO m; }
-    struct FO { FP m; }
-// encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
-// encode_no_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
-	BOOST_TEST(mutation(chromosome) == Chromosome("fo"));
-docker run --rm -v "${OUTPUTDIR}":/tmp/output -v "${SCRIPTDIR}":/tmp/scripts:ro -it trzeci/emscripten:sdk-tag-1.39.3-64bit /tmp/scripts/docker-scripts/rebuild_tags.sh "${TAGS}" /tmp/output "$@"
-				<assignEnd>
-					<assignEnd>
-						<assignEnd>
-		templ("assignEnd", dynamic ? "end := pos" : "");
-			templ("assignEnd", dynamic ? "end := pos" : "");
-			templ("assignEnd", "end := pos");
-			templ("assignEnd", "end := tail");
-			templ("assignEnd", "");
diff --git a/scripts/codespell_whitelist.txt b/scripts/codespell_whitelist.txt
deleted file mode 100644
index 7de8a42fe521..000000000000
--- a/scripts/codespell_whitelist.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-nd
-compilability
-keypair
diff --git a/scripts/common.sh b/scripts/common.sh
deleted file mode 100644
index da8726f3fa0d..000000000000
--- a/scripts/common.sh
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/usr/bin/env bash
-# ------------------------------------------------------------------------------
-# vim:ts=4:et
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-# ------------------------------------------------------------------------------
-
-# The fail() function defined below requires set -e to be enabled.
-set -e
-
-# Save the initial working directory so that printStackTrace() can access it even if the sourcing
-# changes directory. The paths returned by `caller` are relative to it.
-_initial_work_dir=$(pwd)
-
-if [[ -n ${CIRCLECI:-} ]]
-then
-    export TERM="${TERM:-xterm}"
-    function printTask { echo -e "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
-    function printError { >&2 echo -e "$(tput setaf 1)$1$(tput setaf 7)"; }
-    function printWarning { >&2 echo -e "$(tput setaf 11)$1$(tput setaf 7)"; }
-    function printLog { echo -e "$(tput setaf 3)$1$(tput setaf 7)"; }
-else
-    function printTask { echo -e "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
-    function printError { >&2 echo -e "$(tput setaf 1)$1$(tput sgr0)"; }
-    function printWarning { >&2 echo -e "$(tput setaf 11)$1$(tput sgr0)"; }
-    function printLog { echo -e "$(tput setaf 3)$1$(tput sgr0)"; }
-fi
-
-function checkDputEntries
-{
-    local pattern="$1"
-    grep "${pattern}" /etc/dput.cf --quiet || \
-        fail "Error: Missing ${pattern//\\/} section in /etc/dput.cf (check top comment in release_ppa.sh for more information)."
-}
-
-function sourcePPAConfig
-{
-    [[ "$LAUNCHPAD_KEYID" == "" && "$LAUNCHPAD_EMAIL" == "" ]] || fail
-
-    # source keyid and email from .release_ppa_auth
-    if [[ -e .release_ppa_auth ]]
-    then
-        # shellcheck source=/dev/null
-        source "${REPO_ROOT}/.release_ppa_auth"
-    fi
-
-    [[ "$LAUNCHPAD_KEYID" != "" && "$LAUNCHPAD_EMAIL" != "" ]] || \
-        fail "Error: Couldn't find variables \$LAUNCHPAD_KEYID or \$LAUNCHPAD_EMAIL in sourced file .release_ppa_auth (check top comment in $0 for more information)."
-}
-
-function printStackTrace
-{
-    printWarning ""
-    printWarning "Stack trace:"
-
-    local frame=1
-    while caller "$frame" > /dev/null
-    do
-        local lineNumber line file function
-
-        # `caller` returns something that could already be printed as a stacktrace but we can make
-        # it more readable by rearranging the components.
-        # NOTE: This assumes that paths do not contain spaces.
-        lineNumber=$(caller "$frame" | cut -d " " -f 1)
-        function=$(caller "$frame" | cut -d " " -f 2)
-        file=$(caller "$frame" | cut -d " " -f 3)
-
-        # Paths in the output from `caller` can be relative or absolute (depends on how the path
-        # with which the script was invoked) and if they're relative, they're not necessarily
-        # relative to the current working dir. This is a heuristic that will work if they're absolute,
-        # relative to current dir, or relative to the dir that was current when the script started.
-        # If neither works, it gives up.
-        line=$(
-            {
-                tail "--lines=+${lineNumber}" "$file" ||
-                tail "--lines=+${lineNumber}" "${_initial_work_dir}/${file}"
-            } 2> /dev/null |
-            head --lines=1 |
-            sed -e 's/^[[:space:]]*//'
-        ) || line="<failed to find source line>"
-
-        >&2 printf "    %s:%d in function %s()\n" "$file" "$lineNumber" "$function"
-        >&2 printf "        %s\n" "$line"
-
-        ((frame++))
-    done
-}
-
-function fail
-{
-    printError "$@"
-
-    # Using return rather than exit lets the invoking code handle the failure by suppressing the exit code.
-    return 1
-}
-
-function assertFail
-{
-    printError ""
-    (( $# == 0 )) && printError "Assertion failed."
-    (( $# == 1 )) && printError "Assertion failed: $1"
-    printStackTrace
-
-    # Intentionally using exit here because assertion failures are not supposed to be handled.
-    exit 2
-}
-
-function msg_on_error
-{
-    local error_message=""
-    local no_stdout=false
-    local no_stderr=false
-
-    while [[ $1 =~ ^-- ]]
-    do
-        case "$1" in
-            --msg)
-                error_message="$2"
-                shift
-                shift
-                ;;
-            --no-stdout)
-                no_stdout=true
-                shift
-                ;;
-            --no-stderr)
-                no_stderr=true
-                shift
-                ;;
-            --silent)
-                no_stdout=true
-                no_stderr=true
-                shift
-                ;;
-            *)
-                assertFail "Invalid option for msg_on_error: $1"
-                ;;
-        esac
-    done
-
-    local command=("$@")
-
-    local stdout_file stderr_file
-    stdout_file="$(mktemp -t cmdline_test_command_stdout_XXXXXX.txt)"
-    stderr_file="$(mktemp -t cmdline_test_command_stderr_XXXXXX.txt)"
-
-    if "${command[@]}" > "$stdout_file" 2> "$stderr_file"
-    then
-        [[ $no_stdout == "true" ]] || cat "$stdout_file"
-        [[ $no_stderr == "true" ]] || >&2 cat "$stderr_file"
-        rm "$stdout_file" "$stderr_file"
-        return 0
-    else
-        printError ""
-        printError "Command failed: ${error_message}"
-        printError "    command: $SOLC ${command[*]}"
-        if [[ -s "$stdout_file" ]]
-        then
-            printError "--- stdout ---"
-            printError "-----------"
-            >&2 cat "$stdout_file"
-            printError "--------------"
-        else
-            printError "    stdout: <EMPTY>"
-        fi
-        if [[ -s "$stderr_file" ]]
-        then
-            printError "--- stderr ---"
-            >&2 cat "$stderr_file"
-            printError "--------------"
-        else
-            printError "    stderr: <EMPTY>"
-        fi
-
-        rm "$stdout_file" "$stderr_file"
-
-        printStackTrace
-        return 1
-    fi
-}
-
-
-function diff_values
-{
-    (( $# >= 2 )) || fail "diff_values requires at least 2 arguments."
-
-    local value1="$1"
-    local value2="$2"
-    shift 2
-
-    if ! diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
-    then
-        if [[ -n ${DIFFVIEW:-} ]]
-        then
-            # Use user supplied diff view binary
-            "$DIFFVIEW" <(echo "$value1") <(echo "$value2")
-        fi
-        return 1
-    fi
-}
-
-function diff_files
-{
-    (( $# >= 2 )) || fail "diff_files requires at least 2 arguments."
-
-    local file1="$1"
-    local file2="$2"
-
-    if ! diff "${file1}" "${file2}"
-    then
-        if [[ -n ${DIFFVIEW:-} ]]
-        then
-            # Use user supplied diff view binary
-            "$DIFFVIEW" "${file1}" "${file2}"
-        fi
-        return 1
-    fi
-}
-
-function safe_kill
-{
-    local PID=${1}
-    local NAME=${2:-${1}}
-    local n=1
-
-    # only proceed if $PID does exist
-    kill -0 "$PID" 2>/dev/null || return
-
-    echo "Sending SIGTERM to ${NAME} (${PID}) ..."
-    kill "$PID"
-
-    # wait until process terminated gracefully
-    while kill -0 "$PID" 2>/dev/null && [[ $n -le 4 ]]; do
-        echo "Waiting ($n) ..."
-        sleep 1
-        n=$((n + 1))
-    done
-
-    # process still alive? then hard-kill
-    if kill -0 "$PID" 2>/dev/null; then
-        echo "Sending SIGKILL to ${NAME} (${PID}) ..."
-        kill -9 "$PID"
-    fi
-}
-
-function circleci_select_steps
-{
-    # We expect multiple lines in $all_steps, one step per line
-    local all_steps="$1"
-    (( $# == 1 )) || assertFail
-
-    if (( CIRCLE_NODE_TOTAL )) && (( CIRCLE_NODE_TOTAL > 1 ))
-    then
-        echo "$all_steps" | circleci tests split | xargs
-    else
-        echo "$all_steps" | xargs
-    fi
-}
-
-function circleci_select_steps_multiarg
-{
-    # We expect multiple arguments, one step per argument.
-    circleci_select_steps "$(printf '%s\n' "$@")"
-}
-
-function circleci_step_selected
-{
-    local selected_steps="$1"
-    local step="$2"
-    (( $# == 2 )) || assertFail
-    [[ $step != *" "* ]] || assertFail "Step names must not contain spaces."
-
-    [[ " $selected_steps " == *" $step "* ]] || return 1
-}
-
-function first_word
-{
-    local words="$1"
-    (( $# == 1 )) || assertFail
-
-    echo "$words" | cut -d " " -f 1
-}
-
-# Function reads from stdin. Therefore it has to be used with pipes.
-function split_on_empty_lines_into_numbered_files
-{
-    path_prefix="${1}"
-    path_suffix="${2}"
-
-    awk -v RS= "{print > (\"${path_prefix}_\"NR \"${path_suffix}\")}"
-}
-
-function command_available
-{
-    local program="$1"
-    local parameters=${*:2}
-    if ! "${program}" "${parameters}" > /dev/null 2>&1
-    then
-        fail "'${program}' not found or not executed successfully with parameter(s) '${parameters}'. aborting."
-    fi
-}
diff --git a/scripts/common/cmdline_helpers.py b/scripts/common/cmdline_helpers.py
deleted file mode 100644
index 1f322be1fcf1..000000000000
--- a/scripts/common/cmdline_helpers.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import os
-import subprocess
-from pathlib import Path
-from shutil import rmtree
-from tempfile import mkdtemp
-from textwrap import dedent
-from typing import List
-from typing import Optional
-
-from bytecodecompare.prepare_report import FileReport
-from bytecodecompare.prepare_report import parse_cli_output
-
-
-DEFAULT_PREAMBLE = dedent("""
-    // SPDX-License-Identifier: UNLICENSED
-    pragma solidity >=0.0;
-""")
-
-
-def inside_temporary_dir(prefix):
-    """
-    Creates a temporary directory, enters the directory and executes the function inside it.
-    Restores the previous working directory after executing the function.
-    """
-    def tmp_dir_decorator(fn):
-        previous_dir = os.getcwd()
-        def f(*args, **kwargs):
-            try:
-                tmp_dir = mkdtemp(prefix=prefix)
-                os.chdir(tmp_dir)
-                result = fn(*args, **kwargs)
-                rmtree(tmp_dir)
-                return result
-            finally:
-                os.chdir(previous_dir)
-        return f
-    return tmp_dir_decorator
-
-
-def solc_bin_report(solc_binary: str, input_files: List[Path], via_ir: bool) -> FileReport:
-    """
-    Runs the solidity compiler binary
-    """
-
-    output = subprocess.check_output(
-        [solc_binary, '--bin'] +
-        input_files +
-        (['--via-ir'] if via_ir else []),
-        encoding='utf8',
-    )
-    return parse_cli_output('', output)
-
-
-def save_bytecode(bytecode_path: Path, reports: FileReport, contract: Optional[str] = None):
-    with open(bytecode_path, 'w', encoding='utf8') as f:
-        for report in reports.contract_reports:
-            if contract is None or report.contract_name == contract:
-                bytecode = report.bytecode if report.bytecode is not None else '<NO BYTECODE>'
-                f.write(f'{report.contract_name}: {bytecode}\n')
-
-
-def add_preamble(source_path: Path, preamble: str = DEFAULT_PREAMBLE):
-    for source in source_path.glob('**/*.sol'):
-        with open(source, 'r+', encoding='utf8') as f:
-            content = f.read()
-            f.seek(0, 0)
-            f.write(preamble + content)
diff --git a/scripts/common/git_helpers.py b/scripts/common/git_helpers.py
deleted file mode 100644
index f43a8619fea4..000000000000
--- a/scripts/common/git_helpers.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import subprocess
-from pathlib import Path
-from shutil import which
-
-
-def run_git_command(command):
-    process = subprocess.run(
-        command,
-        encoding='utf8',
-        capture_output=True,
-        check=True,
-    )
-    return process.stdout.strip()
-
-
-def git_current_branch():
-    return run_git_command(['git', 'symbolic-ref', 'HEAD', '--short'])
-
-
-def git_commit_hash(ref: str = 'HEAD'):
-    return run_git_command(['git', 'rev-parse', '--verify', ref])
-
-
-def git_diff(file_a: Path, file_b: Path) -> int:
-    if which('git') is None:
-        raise RuntimeError('git not found.')
-
-    return subprocess.run([
-        'git',
-        'diff',
-        '--color',
-        '--word-diff=plain',
-        '--word-diff-regex=.',
-        '--ignore-space-change',
-        '--ignore-blank-lines',
-        '--exit-code',
-        file_a,
-        file_b,
-    ], encoding='utf8', check=False).returncode
diff --git a/scripts/common/rest_api_helpers.py b/scripts/common/rest_api_helpers.py
deleted file mode 100644
index 31f973e818eb..000000000000
--- a/scripts/common/rest_api_helpers.py
+++ /dev/null
@@ -1,189 +0,0 @@
-from pathlib import Path
-from typing import List, Mapping, Optional
-import functools
-import json
-import operator
-import shutil
-
-import requests
-
-
-class APIHelperError(Exception):
-    pass
-
-class JobNotSuccessful(APIHelperError):
-    def __init__(self, name: str, status: str):
-        assert status != 'success'
-
-        self.name = name
-        self.status = status
-        self.job_finished = (status in ['failed', 'blocked'])
-
-        if status == 'not_running':
-            message = f"Job {name} has not started yet."
-        elif status == 'blocked':
-            message = f"Job {name} will not run because one of its dependencies failed."
-        elif status == 'running':
-            message = f"Job {name} is still running."
-        elif status == 'failed':
-            message = f"Job {name} failed."
-        else:
-            message = f"Job {name} did not finish successfully. Current status: {status}."
-
-        super().__init__(message)
-
-class JobMissing(APIHelperError):
-    pass
-
-class InvalidResponse(APIHelperError):
-    pass
-
-class FileAlreadyExists(APIHelperError):
-    pass
-
-
-def query_api(url: str, params: Mapping[str, str], debug_requests=False) -> dict:
-    if debug_requests:
-        print(f'REQUEST URL: {url}')
-        if len(params) > 0:
-            print(f'QUERY: {params}')
-
-    response = requests.get(url, params=params, timeout=60)
-    response.raise_for_status()
-
-    if debug_requests:
-        json_response = response.json()
-        print('========== RESPONSE ==========')
-        if json_response is not None:
-            print(json.dumps(json_response, indent=4))
-        else:
-            print(response.content)
-        print('==============================')
-
-    return response.json()
-
-
-def download_file(url: str, target_path: Path, overwrite=False):
-    if not overwrite and target_path.exists():
-        raise FileAlreadyExists(f"Refusing to overwrite existing file: '{target_path}'.")
-
-    with requests.get(url, stream=True, timeout=60) as request:
-        with open(target_path, 'wb') as target_file:
-            shutil.copyfileobj(request.raw, target_file)
-
-
-class Github:
-    BASE_URL = 'https://api.github.com'
-
-    project_slug: str
-    debug_requests: bool
-
-    def __init__(self, project_slug: str, debug_requests: bool):
-        self.project_slug = project_slug
-        self.debug_requests = debug_requests
-
-    def pull_request(self, pr_id: int) -> dict:
-        return query_api(
-            f'{self.BASE_URL}/repos/{self.project_slug}/pulls/{pr_id}',
-            {},
-            self.debug_requests
-        )
-
-
-class CircleCI:
-    # None might be a more logical default for max_pages but in most cases we'll actually
-    # want some limit to prevent flooding the API with requests in case of a bug.
-    DEFAULT_MAX_PAGES = 10
-    BASE_URL = 'https://circleci.com/api/v2'
-
-    project_slug: str
-    debug_requests: bool
-
-    def __init__(self, project_slug: str, debug_requests: bool):
-        self.project_slug = project_slug
-        self.debug_requests = debug_requests
-
-    def paginated_query_api_iterator(self, url: str, params: Mapping[str, str], max_pages: int = DEFAULT_MAX_PAGES):
-        assert 'page-token' not in params
-
-        page_count = 0
-        next_page_token = None
-        while max_pages is None or page_count < max_pages:
-            if next_page_token is not None:
-                params = {**params, 'page-token': next_page_token}
-
-            json_response = query_api(url, params, self.debug_requests)
-
-            yield json_response['items']
-            next_page_token = json_response['next_page_token']
-            page_count += 1
-            if next_page_token is None:
-                break
-
-    def paginated_query_api(self, url: str, params: Mapping[str, str], max_pages: int = DEFAULT_MAX_PAGES):
-        return functools.reduce(operator.add, self.paginated_query_api_iterator(url, params, max_pages), [])
-
-    def pipelines(
-        self,
-        branch: Optional[str] = None,
-        commit_hash: Optional[str] = None,
-        excluded_trigger_types: List[str] = None,
-    ) -> List[dict]:
-        if excluded_trigger_types is None:
-            excluded_trigger_types = []
-
-        for items in self.paginated_query_api_iterator(
-            f'{self.BASE_URL}/project/gh/{self.project_slug}/pipeline',
-            {'branch': branch} if branch is not None else {},
-            max_pages=10,
-        ):
-            matching_items = [
-                item
-                for item in items
-                if (
-                    (commit_hash is None or item['vcs']['revision'] == commit_hash) and
-                    item['trigger']['type'] not in excluded_trigger_types
-                )
-            ]
-            if len(matching_items) > 0:
-                return matching_items
-
-        return []
-
-    def workflows(self, pipeline_id: str) -> dict:
-        return self.paginated_query_api(f'{self.BASE_URL}/pipeline/{pipeline_id}/workflow', {})
-
-    def jobs(self, workflow_id: str) -> Mapping[str, dict]:
-        items = self.paginated_query_api(f'{self.BASE_URL}/workflow/{workflow_id}/job', {})
-        jobs_by_name = {job['name']: job for job in items}
-
-        assert len(jobs_by_name) <= len(items)
-        if len(jobs_by_name) < len(items):
-            raise InvalidResponse("Job names in the workflow are not unique.")
-
-        return jobs_by_name
-
-    def job(self, workflow_id: str, name: str, require_success: bool = False) -> dict:
-        jobs = self.jobs(workflow_id)
-        if name not in jobs:
-            raise JobMissing(f"Job {name} is not present in the workflow.")
-
-        if require_success and jobs[name]['status'] != 'success':
-            raise JobNotSuccessful(name, jobs[name]['status'])
-
-        return jobs[name]
-
-    def artifacts(self, job_number: int) -> Mapping[str, dict]:
-        items = self.paginated_query_api(f'{self.BASE_URL}/project/gh/{self.project_slug}/{job_number}/artifacts', {})
-        artifacts_by_name = {artifact['path']: artifact for artifact in items}
-
-        assert len(artifacts_by_name) <= len(items)
-        if len(artifacts_by_name) < len(items):
-            raise InvalidResponse("Names of artifacts attached to the job are not unique.")
-
-        return artifacts_by_name
-
-    @staticmethod
-    def latest_item(items: dict) -> dict:
-        sorted_items = sorted(items, key=lambda item: item['created_at'], reverse=True)
-        return sorted_items[0] if len(sorted_items) > 0 else None
diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh
deleted file mode 100644
index 5e32a76dc9ed..000000000000
--- a/scripts/common_cmdline.sh
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/env bash
-# ------------------------------------------------------------------------------
-# vim:ts=4:et
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-# ------------------------------------------------------------------------------
-
-YULARGS=(--strict-assembly)
-FULLARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
-OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
-
-function compileFull
-{
-    local expected_exit_code=0
-    local expect_output='none'
-
-    case "$1" in
-        '--expect-errors')
-            expected_exit_code=1
-            expect_output='warnings-or-errors'
-            shift;
-            ;;
-        '--expect-warnings')
-            expect_output='warnings-or-errors'
-            shift;
-            ;;
-        '--ignore-warnings')
-            expect_output='any'
-            shift;
-            ;;
-    esac
-
-    local args=("${FULLARGS[@]}")
-    if [[ $1 = '-v' ]]; then
-        if (echo "$2" | grep -Po '(?<=0.4.)\d+' >/dev/null); then
-            patch=$(echo "$2" | grep -Po '(?<=0.4.)\d+')
-            if (( patch < 22 )); then
-                args=("${OLDARGS[@]}")
-            fi
-        fi
-        shift 2
-    fi
-
-    local files=("$@")
-
-    local stderr_path; stderr_path=$(mktemp)
-
-    if [ "${files: -4}" == ".yul" ]
-    then
-        args=("${YULARGS[@]}")
-    fi
-
-    set +e
-    "$SOLC" "${args[@]}" "${files[@]}" >/dev/null 2>"$stderr_path"
-    local exit_code=$?
-    local errors; errors=$(grep -v -E \
-        -e 'Warning: This is a pre-release compiler version|Warning: Experimental features are turned on|pragma experimental ABIEncoderV2|^ +--> |^ +\||^[0-9]+ +\| ' \
-        -e '^No text representation found.$' < "$stderr_path"
-    )
-
-    set -e
-    rm "$stderr_path"
-
-    if [[
-        $exit_code != "$expected_exit_code" ||
-        $errors != "" && $expect_output == 'none' ||
-        $errors == "" && $expect_output != 'none' && $expect_output != 'any' && $expected_exit_code == 0
-    ]]
-    then
-        printError "TEST FAILURE"
-        printError "Actual exit code:   $exit_code"
-        printError "Expected exit code: $expected_exit_code"
-        printError "==== Output ===="
-        echo "$errors"
-        printError "== Output end =="
-        printError ""
-        case "$expect_output" in
-            'none') printError "No output was expected." ;;
-            'warnings-or-errors') printError "Expected warnings or errors." ;;
-        esac
-
-        printError ""
-        printError "While calling:"
-        echo      "\"$SOLC\" ${args[*]} ${files[*]}"
-        printError "Inside directory:"
-        echo "    $(pwd)"
-        printError "Input was:"
-        echo "${files[@]}"
-        false
-    fi
-}
-
-function singleContractOutputViaStandardJSON
-{
-    (( $# == 4 )) || assertFail
-    local language="$1"
-    local selected_output="$2"
-    local extra_settings="$3"
-    local input_file="$4"
-    [[ $selected_output != "*" ]] || assertFail
-
-    json_output=$(
-        "$SOLC" --standard-json --allow-paths "$(basename "$input_file")" - <<EOF
-        {
-            "language": "${language}",
-            "sources": {"${input_file}": {"urls": ["${input_file}"]}},
-            "settings": {
-                "outputSelection": {"*": { "*": ["${selected_output}"]}},
-                ${extra_settings}
-            }
-        }
-EOF
-    )
-
-    local error_list output has_contract_level_outputs
-
-    error_list=$(echo "$json_output" | jq '.errors[] | select(.severity=="error")')
-    [[ $error_list == '' ]] || \
-        fail "Failed to compile ${input_file} via Standard JSON. Errors: ${error_list}"
-
-    has_contract_level_outputs=$(echo "$json_output" | jq 'has("contracts")')
-    [[ $has_contract_level_outputs == true ]] || \
-        fail "Standard JSON output ${selected_output} was ignored by the compiler."
-
-    output=$(echo "$json_output" | jq --raw-output ".contracts[\"${input_file}\"][].${selected_output}")
-    [[ $output != null ]] || \
-        fail "Compiler failed to produce the ${selected_output} output when compiling ${input_file} via Standard JSON."
-
-    echo "$output"
-}
-
-function stripCLIDecorations
-{
-    sed -e '/^=======.*=======$/d' \
-        -e '/^Binary:$/d' \
-        -e '/^Binary of the runtime part:$/d' \
-        -e '/^Opcodes:$/d' \
-        -e '/^IR:$/d' \
-        -e '/^Optimized IR:$/d' \
-        -e '/^EVM assembly:$/d' \
-        -e '/^JSON AST (compact format):$/d' \
-        -e '/^Function signatures:$/d' \
-        -e '/^Contract Storage Layout:$/d' \
-        -e '/^Developer Documentation$/d' \
-        -e '/^User Documentation$/d' \
-        -e '/^Contract JSON ABI$/d' \
-        -e '/^Metadata:$/d' \
-        -e '/^EVM$/d' \
-        -e '/^Pretty printed source:$/d' \
-        -e '/^Text representation:$/d' \
-        -e '/^Binary representation:$/d'
-}
-
-function stripEmptyLines
-{
-    sed -e '/^\s*$/d'
-}
diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh
deleted file mode 100755
index 1ea8c0b570f6..000000000000
--- a/scripts/create_source_tarball.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env sh
-#
-
-set -e
-
-REPO_ROOT="$(dirname "$0")"/..
-(
-    cd "$REPO_ROOT"
-    version=$(scripts/get_version.sh)
-    commithash=$(git rev-parse --short=8 HEAD)
-    commitdate=$(git show --format=%ci HEAD | head -n 1 | cut - -b1-10 | sed -e 's/-0?/./' | sed -e 's/-0?/./')
-
-    # file exists and has zero size -> not a prerelease
-    if [ -e prerelease.txt ] && [ ! -s prerelease.txt ]
-    then
-        versionstring="$version"
-    else
-        versionstring="$version-nightly-$commitdate-$commithash"
-    fi
-
-    TEMPDIR=$(mktemp -d)
-    SOLDIR="$TEMPDIR/solidity_$versionstring/"
-    mkdir "$SOLDIR"
-    # Store the current source
-    git checkout-index -a --prefix="$SOLDIR"
-    # Store the commit hash
-    echo "$commithash" > "$SOLDIR/commit_hash.txt"
-    if [ -e prerelease.txt ] && [ ! -s prerelease.txt ]
-    then
-        cp prerelease.txt "$SOLDIR/"
-    fi
-    # Add dependencies
-    mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true
-    jsoncpp_version="1.9.3"
-    jsoncpp_package_path="$SOLDIR/deps/downloads/jsoncpp-${jsoncpp_version}.tar.gz"
-    jsoncpp_sha256=8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d
-    wget -O "$jsoncpp_package_path" "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncpp_version}.tar.gz"
-    if ! [ "$(sha256sum "$jsoncpp_package_path")" = "${jsoncpp_sha256}  ${jsoncpp_package_path}" ]
-    then
-        >&2 echo "ERROR: Downloaded jsoncpp source package has wrong checksum."
-        exit 1
-    fi
-    mkdir -p "$REPO_ROOT/upload"
-    tar --owner 0 --group 0 -czf "$REPO_ROOT/upload/solidity_$versionstring.tar.gz" -C "$TEMPDIR" "solidity_$versionstring"
-    rm -r "$TEMPDIR"
-)
diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
deleted file mode 100755
index 5ee6623a6922..000000000000
--- a/scripts/deps-ppa/static_z3.sh
+++ /dev/null
@@ -1,267 +0,0 @@
-#!/usr/bin/env bash
-##############################################################################
-## This is used to package .deb packages and upload them to the launchpad
-## ppa servers for building.
-##
-## It will clone the Z3 git from github on the specified version tag,
-## create a source archive and push it to the ubuntu ppa servers.
-##
-## This requires the following entries in /etc/dput.cf:
-##
-##  [cpp-build-deps]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/cpp-build-deps
-##  login			= anonymous
-##
-## To interact with launchpad, you need to set the variables $LAUNCHPAD_EMAIL
-## and $LAUNCHPAD_KEYID in the file .release_ppa_auth in the root directory of
-## the project to your launchpad email and pgp keyid.
-## This could for example look like this:
-##
-##  LAUNCHPAD_EMAIL=your-launchpad-email@ethereum.org
-##  LAUNCHPAD_KEYID=123ABCFFFFFFFF
-##
-##############################################################################
-
-set -e
-
-packagename=z3-static
-version="$1"
-
-REPO_ROOT="$(dirname "$0")/../.."
-
-# shellcheck source=/dev/null
-source "${REPO_ROOT}/scripts/common.sh"
-
-[[ $version != "" ]] || fail "Usage: $0 <version-without-leading-v>"
-
-sourcePPAConfig
-
-# Sanity check
-checkDputEntries "\[cpp-build-deps\]"
-
-DISTRIBUTIONS="focal jammy kinetic lunar"
-
-for distribution in $DISTRIBUTIONS
-do
-cd /tmp/
-rm -rf "$distribution"
-mkdir "$distribution"
-cd "$distribution"
-
-pparepo=cpp-build-deps
-ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
-
-# Fetch source
-git clone --branch "z3-${version}" https://github.com/Z3Prover/z3.git
-cd z3
-
-debversion="${version}"
-
-CMAKE_OPTIONS="-DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release"
-
-# gzip will create different tars all the time and we are not allowed
-# to upload the same file twice with different contents, so we only
-# create it once.
-if [ ! -e "/tmp/${packagename}_${debversion}.orig.tar.gz" ]
-then
-    tar --exclude .git -czf "/tmp/${packagename}_${debversion}.orig.tar.gz" .
-fi
-cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
-
-# Create debian package information
-
-mkdir debian
-echo 9 > debian/compat
-# TODO: the Z3 packages have different build dependencies
-cat <<EOF > debian/control
-Source: z3-static
-Section: science
-Priority: extra
-Maintainer: Daniel Kirchner <daniel@ekpyron.org>
-Build-Depends: debhelper (>= 9.0.0),
-               cmake,
-               g++ (>= 5.0),
-               git,
-               libgmp-dev,
-               dh-python,
-               python3
-Standards-Version: 3.9.6
-Homepage: https://github.com/Z3Prover/z3
-Vcs-Git: https://github.com/Z3Prover/z3.git
-Vcs-Browser: https://github.com/Z3Prover/z3
-
-Package: z3-static
-Architecture: any
-Breaks: z3
-Replaces: z3
-Depends: \${misc:Depends}, \${shlibs:Depends}
-Description: theorem prover from Microsoft Research
- Z3 is a state-of-the art theorem prover from Microsoft Research. It can be
- used to check the satisfiability of logical formulas over one or more
- theories. Z3 offers a compelling match for software analysis and verification
- tools, since several common software constructs map directly into supported
- theories.
- .
- The Z3 input format is an extension of the one defined by the SMT-LIB 2.0
- standard.
-
-
-Package: libz3-static-dev
-Section: libdevel
-Architecture: any-amd64
-Breaks: libz3-dev
-Replaces: libz3-dev
-Multi-Arch: same
-Depends: \${shlibs:Depends}, \${misc:Depends}
-Description: theorem prover from Microsoft Research - development files (static library)
- Z3 is a state-of-the art theorem prover from Microsoft Research. It can be
- used to check the satisfiability of logical formulas over one or more
- theories. Z3 offers a compelling match for software analysis and verification
- tools, since several common software constructs map directly into supported
- theories.
- .
- This package can be used to invoke Z3 via its C++ API.
-EOF
-cat <<EOF > debian/rules
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-
-%:
-	dh \$@ --buildsystem=cmake
-
-override_dh_auto_test:
-
-override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
-
-override_dh_auto_configure:
-	dh_auto_configure -- ${CMAKE_OPTIONS}
-
-override_dh_auto_install:
-	dh_auto_install --destdir debian/tmp
-EOF
-cat <<EOF > debian/libz3-static-dev.install
-usr/include/*
-usr/lib/*/libz3.a
-usr/lib/*/cmake/z3/*
-EOF
-cat <<EOF > debian/z3-static.install
-usr/bin/z3
-EOF
-cat <<EOF > debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: z3
-Source: https://github.com/Z3Prover/z3
-
-Files: *
-Copyright: Microsoft Corporation
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-Files: debian/*
-Copyright: 2019 Ethereum
-License: GPL-3.0+
-This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-EOF
-cat <<EOF > debian/changelog
-z3-static (0.0.1-1ubuntu0) saucy; urgency=low
-
-  * Initial release.
-
- -- Daniel <daniel@ekpyron.org>  Mon, 03 Jun 2019 14:50:20 +0000
-EOF
-mkdir debian/source
-echo "3.0 (quilt)" > debian/source/format
-chmod +x debian/rules
-
-versionsuffix=1ubuntu0~${distribution}
-EMAIL="$LAUNCHPAD_EMAIL" dch -v "1:${debversion}-${versionsuffix}" "build of ${version}"
-
-# build source package
-# If packages is rejected because original source is already present, add
-# -sd to remove it from the .changes file
-# -d disables the build dependencies check
-debuild -S -d -sa -us -uc
-
-# prepare .changes file for Launchpad
-sed -i -e "s/UNRELEASED/${distribution}/" -e s/urgency=medium/urgency=low/ ../*.changes
-
-# check if ubuntu already has the source tarball
-(
-cd ..
-orig="${packagename}_${debversion}.orig.tar.gz"
-# shellcheck disable=SC2012
-orig_size=$(ls -l "$orig" | cut -d ' ' -f 5)
-orig_sha1=$(sha1sum "$orig" | cut -d ' ' -f 1)
-orig_sha256=$(sha256sum "$orig" | cut -d ' ' -f 1)
-orig_md5=$(md5sum "$orig" | cut -d ' ' -f 1)
-
-if wget --quiet -O "$orig-tmp" "$ppafilesurl/$orig"
-then
-    echo "[WARN] Original tarball found in Ubuntu archive, using it instead"
-    mv "${orig}-tmp" "$orig"
-    # shellcheck disable=SC2012
-    new_size=$(ls -l ./*.orig.tar.gz | cut -d ' ' -f 5)
-    new_sha1=$(sha1sum "$orig" | cut -d ' ' -f 1)
-    new_sha256=$(sha256sum "$orig" | cut -d ' ' -f 1)
-    new_md5=$(md5sum "$orig" | cut -d ' ' -f 1)
-    sed -i -e "s,$orig_sha1,$new_sha1,g" -e "s,$orig_sha256,$new_sha256,g" -e "s,$orig_size,$new_size,g" -e "s,$orig_md5,$new_md5,g" ./*.dsc
-    sed -i -e "s,$orig_sha1,$new_sha1,g" -e "s,$orig_sha256,$new_sha256,g" -e "s,$orig_size,$new_size,g" -e "s,$orig_md5,$new_md5,g" ./*.changes
-fi
-)
-
-# sign the package
-debsign --re-sign -k "${LAUNCHPAD_KEYID}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
-
-# upload
-dput "${pparepo}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
-
-done
diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
deleted file mode 100644
index c29fc699ac01..000000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ /dev/null
@@ -1,76 +0,0 @@
-# vim:syntax=dockerfile
-#------------------------------------------------------------------------------
-# Dockerfile for building and testing Solidity Compiler on CI
-# Target: Emscripten
-# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
-#
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-#------------------------------------------------------------------------------
-#
-# The Emscripten SDK at https://github.com/emscripten-core/emsdk/
-# contains a Makefile in the docker/ subdirectory that can be used to create the
-# required base image using:
-#
-#   make version=2.0.33 build
-#
-# Note that emscripten is supposed to automatically install to $(em-config CACHE)/sysroot, but
-# apparently this currently breaks due to conflicting compatibility headers.
-# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
-# dependencies automatically.
-FROM emscripten/emsdk:3.1.19 AS base
-LABEL version="16"
-
-ADD emscripten.jam /usr/src
-RUN set -ex && \
-	\
-	apt-get update && \
-	apt-get install lz4 sudo --no-install-recommends && \
-	\
-	cd /usr/src && \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \
-	cd z3 && \
-	mkdir build && \
-	cd build && \
-	emcmake cmake \
-		-DCMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot/usr \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DZ3_BUILD_LIBZ3_SHARED=OFF \
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF \
-		-DZ3_BUILD_TEST_EXECUTABLES=OFF \
-		-DZ3_BUILD_EXECUTABLE=OFF \
-		-DZ3_SINGLE_THREADED=ON \
-		-DCMAKE_CXX_FLAGS="-s DISABLE_EXCEPTION_CATCHING=0" \
-		.. && \
-	make && \
-	make install && \
-	rm -r /usr/src/z3 && \
-	cd /usr/src && \
-	\
-	wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2 && \
-	test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb  boost.tar.bz2" && \
-	tar -xf boost.tar.bz2 && \
-	rm boost.tar.bz2 && \
-	cd boost_1_75_0 && \
-	mv ../emscripten.jam . && \
-	./bootstrap.sh && \
-	echo "using emscripten : : em++ ;" >> project-config.jam && \
-	./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
-		--with-system --with-filesystem --with-test --with-program_options \
-		cxxflags="-s DISABLE_EXCEPTION_CATCHING=0 -Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
-	       --prefix=$(em-config CACHE)/sysroot/usr install && \
-	rm -r /usr/src/boost_1_75_0
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
deleted file mode 100644
index d5e6599ea71e..000000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ /dev/null
@@ -1,138 +0,0 @@
-# vim:syntax=dockerfile
-#------------------------------------------------------------------------------
-# Dockerfile for building and testing Solidity Compiler on CI
-# Target: Ubuntu ossfuzz Clang variant
-# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
-#
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2021 solidity contributors.
-#------------------------------------------------------------------------------
-FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="2"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update; \
-	apt-get -qqy install --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		ninja-build git wget \
-		libbz2-dev zlib1g-dev git curl uuid-dev \
-		pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \
-    apt-get install -qy python3-pip;
-
-# Install cmake 3.21.2 (minimum requirement is cmake 3.10)
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh; \
-    test "$(sha256sum cmake-3.21.2-Linux-x86_64.sh)" = "3310362c6fe4d4b2dc00823835f3d4a7171bbd73deb7d059738494761f1c908c  cmake-3.21.2-Linux-x86_64.sh"; \
-    chmod +x cmake-3.21.2-Linux-x86_64.sh; \
-    ./cmake-3.21.2-Linux-x86_64.sh --skip-license --prefix="/usr"
-
-FROM base AS libraries
-
-# Boost
-RUN set -ex; \
-    cd /usr/src; \
-    wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2' -O boost.tar.bz2; \
-    test "$(sha256sum boost.tar.bz2)" = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1  boost.tar.bz2" && \
-    tar -xf boost.tar.bz2; \
-    rm boost.tar.bz2; \
-    cd boost_1_74_0; \
-    CXXFLAGS="-stdlib=libc++ -pthread" LDFLAGS="-stdlib=libc++" ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
-    ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" headers; \
-    ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" \
-        link=static variant=release runtime-link=static \
-        system filesystem unit_test_framework program_options \
-        install -j $(($(nproc)/2)); \
-    rm -rf /usr/src/boost_1_74_0
-
-# Z3
-RUN set -ex; \
-    git clone --depth 1 -b z3-4.12.1 https://github.com/Z3Prover/z3.git \
-    /usr/src/z3; \
-    cd /usr/src/z3; \
-    mkdir build; \
-    cd build; \
-    LDFLAGS=$CXXFLAGS cmake -DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release ..; \
-    make libz3 -j; \
-    make install; \
-    rm -rf /usr/src/z3
-
-# OSSFUZZ: libprotobuf-mutator
-RUN set -ex; \
-	git clone https://github.com/google/libprotobuf-mutator.git \
-	    /usr/src/libprotobuf-mutator; \
-	cd /usr/src/libprotobuf-mutator; \
-	git checkout 3521f47a2828da9ace403e4ecc4aece1a84feb36; \
-	mkdir build; \
-	cd build; \
-	cmake .. -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \
-        -DLIB_PROTO_MUTATOR_TESTING=OFF -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX="/usr"; \
-	ninja; \
-	cp -vpr external.protobuf/bin/* /usr/bin/; \
-	cp -vpr external.protobuf/include/* /usr/include/; \
-	cp -vpr external.protobuf/lib/* /usr/lib/; \
-	ninja install/strip; \
-	rm -rf /usr/src/libprotobuf-mutator
-
-# EVMONE
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
-	cd evmone; \
-	mkdir build; \
-	cd build; \
-	CXX=clang++ cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/evmone
-
-# gmp
-RUN set -ex; \
-    # Replace system installed libgmp static library
-    # with sanitized version. Do not perform apt
-    # remove because it removes mlton as well that
-    # we need for building libabicoder
-    rm -f /usr/lib/x86_64-linux-gnu/libgmp.*; \
-    rm -f /usr/include/x86_64-linux-gnu/gmp.h; \
-    cd /usr/src; \
-    wget -q 'https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz' -O gmp.tar.xz; \
-    test "$(sha256sum gmp.tar.xz)" = "fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2  gmp.tar.xz"; \
-    tar -xf gmp.tar.xz; \
-    cd gmp-6.2.1; \
-    ./configure --prefix=/usr --enable-static=yes; \
-    make -j; \
-    make install; \
-    rm -rf /usr/src/gmp-6.2.1; \
-    rm -f /usr/src/gmp.tar.xz
-
-# libabicoder
-RUN set -ex; \
-    cd /usr/src; \
-    git clone https://github.com/ekpyron/Yul-Isabelle; \
-    cd Yul-Isabelle; \
-    cd libabicoder; \
-    CXX=clang++ CXXFLAGS="-stdlib=libc++ -pthread" make; \
-    cp libabicoder.a /usr/lib; \
-    cp abicoder.hpp /usr/include; \
-    rm -rf /usr/src/Yul-Isabelle
-
-FROM base
-COPY --from=libraries /usr/lib /usr/lib
-COPY --from=libraries /usr/bin /usr/bin
-COPY --from=libraries /usr/include /usr/include
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
deleted file mode 100644
index dbd1990023e7..000000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ /dev/null
@@ -1,59 +0,0 @@
-# vim:syntax=dockerfile
-#------------------------------------------------------------------------------
-# Dockerfile for building and testing Solidity Compiler on CI
-# Target: Ubuntu 19.04 (Disco Dingo)
-# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
-#
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-#------------------------------------------------------------------------------
-FROM buildpack-deps:focal AS base
-LABEL version="20"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN set -ex; \
-        dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
-        echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
-        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
-	apt-get update; \
-	apt-get install -qqy --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		cmake ninja-build \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
-		libboost-program-options-dev \
-		libcvc4-dev libz3-static-dev z3-static jq \
-		; \
-	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov; \
-	rm -rf /var/lib/apt/lists/*
-
-FROM base AS libraries
-
-# EVMONE
-RUN set -ex; \
-	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz; \
-	test "$(sha256sum /usr/src/evmone.tar.gz)" = "6052b6a4eba6e81bb1bccfa9fec2caf220a25f5ff5c32c544984883ed95e6552  /usr/src/evmone.tar.gz"; \
-	cd /usr; \
-	tar -xf /usr/src/evmone.tar.gz; \
-	rm -rf /usr/src/evmone.tar.gz
-
-FROM base
-COPY --from=libraries /usr/lib /usr/lib
-COPY --from=libraries /usr/bin /usr/bin
-COPY --from=libraries /usr/include /usr/include
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
deleted file mode 100644
index d5cfae924994..000000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ /dev/null
@@ -1,63 +0,0 @@
-# vim:syntax=dockerfile
-#------------------------------------------------------------------------------
-# Dockerfile for building and testing Solidity Compiler on CI
-# Target: Ubuntu 19.04 (Disco Dingo)
-# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
-#
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-#------------------------------------------------------------------------------
-FROM buildpack-deps:jammy AS base
-LABEL version="5"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN set -ex; \
-        dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
-        echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
-        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
-	apt-get update; \
-	apt-get install -qqy --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		cmake ninja-build \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
-		libboost-program-options-dev \
-		libcvc4-dev libz3-static-dev z3-static jq \
-		libcln-dev zip locales-all; \
-	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov; \
-	rm -rf /var/lib/apt/lists/*
-
-FROM base AS libraries
-
-# EVMONE
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
-	cd evmone; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/evmone
-
-FROM base
-COPY --from=libraries /usr/lib /usr/lib
-COPY --from=libraries /usr/bin /usr/bin
-COPY --from=libraries /usr/include /usr/include
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
deleted file mode 100644
index 3e23cd055f19..000000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ /dev/null
@@ -1,65 +0,0 @@
-# vim:syntax=dockerfile
-#------------------------------------------------------------------------------
-# Dockerfile for building and testing Solidity Compiler on CI
-# Target: Ubuntu 19.04 (Disco Dingo) Clang variant
-# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
-#
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016-2019 solidity contributors.
-#------------------------------------------------------------------------------
-FROM buildpack-deps:jammy AS base
-LABEL version="4"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN set -ex; \
-	dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
-	echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
-	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
-	apt-get update; \
-	apt-get install -qqy --no-install-recommends \
-		build-essential sudo \
-		software-properties-common \
-		cmake ninja-build \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
-		libboost-program-options-dev \
-		clang \
-		libz3-static-dev z3-static jq \
-		libcln-dev; \
-	rm -rf /var/lib/apt/lists/*
-
-FROM base AS libraries
-
-ENV CC clang
-ENV CXX clang++
-
-# EVMONE
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
-	cd evmone; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/evmone
-
-FROM base
-COPY --from=libraries /usr/lib /usr/lib
-COPY --from=libraries /usr/bin /usr/bin
-COPY --from=libraries /usr/include /usr/include
diff --git a/scripts/docker/buildpack-deps/README.md b/scripts/docker/buildpack-deps/README.md
deleted file mode 100644
index 15cb71f5be8c..000000000000
--- a/scripts/docker/buildpack-deps/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# buildpack-deps docker images
-
-The `buildpack-deps` docker images are used to compile and test solidity within our CI.
-
-## GitHub Workflow
-
-The creation of the images are triggered by a single workflow, defined in `.github/workflows/buildpack-deps.yml`.
-For each resulting `buildpack-deps` docker image a strategy is defined in the workflow file - the image variant.
-The workflow gets triggered, if any Dockerfile defined in `scripts/docker/buildpack-deps/Dockerfile.*` were changed
-within the PR.
-
-### Versioning
-
-The version of the docker images can be defined within the Dockerfile with `LABEL version`. A new docker image
-will only be created and pushed, if the new version is incremented by `1` compared with the version of the Dockerfile
-located in `develop`.
-
-### Build, Test & Push
-
-Note that the whole workflow - including all defined strategies (image variants) - will be triggered,
-even if only a single Dockerfile was changed. The full workflow will only get executed, if the corresponding
-Dockerfile was changed. The execution of workflows of unchanged Dockerfiles will not continue and just return success.
-See `scripts/ci/docker_upgrade.sh`.
-
-If the version check was successful, the docker image will be built using the Dockerfile located in
-`scripts/docker/buildpack-deps/Dockerfile.*`.
-
-The resulting docker image will be tested by executing the corresponding `scripts/ci/buildpack-deps_test_*` scripts.
-Some of these scripts are symlinked to `scripts/ci/build.sh`, except the following two:
- * `buildpack-deps-ubuntu.clang.ossfuzz` => `scripts/ci/build_ossfuzz.sh`
- * `buildpack-deps_test_emscripten.sh` => `scripts/ci/build_emscripten.sh`
-
-These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also used by CircleCI, see `.circleci/config.yml`.
-
-If the tests passed successfully, the docker image will get tagged by the version defined within the corresponding `Dockerfile`.
-Finally, a comment will be added to the PR that contains the full repository, version and repository digest
-of the freshly created docker image.
-
-The files `.circleci/config.yml` and `scripts/build_emscripten.sh` need to be updated with the new hash posted in the comment.
diff --git a/scripts/docker/buildpack-deps/emscripten.jam b/scripts/docker/buildpack-deps/emscripten.jam
deleted file mode 100644
index bc8f0fa00eb4..000000000000
--- a/scripts/docker/buildpack-deps/emscripten.jam
+++ /dev/null
@@ -1,186 +0,0 @@
-# Modified version of emscripten.jam from https://github.com/tee3/boost-build-emscripten
-# which is released under the following license:
-#
-# Boost Software License - Version 1.0 - August 17th, 2003
-#
-# Permission is hereby granted, free of charge, to any person or organization
-# obtaining a copy of the software and accompanying documentation covered by
-# this license (the "Software") to use, reproduce, display, distribute,
-# execute, and transmit the Software, and to prepare derivative works of the
-# Software, and to permit third-parties to whom the Software is furnished to
-# do so, all subject to the following:
-#
-# The copyright notices in the Software and this entire statement, including
-# the above license grant, this restriction and the following disclaimer,
-# must be included in all copies of the Software, in whole or in part, and
-# all derivative works of the Software, unless such copies or derivative
-# works are solely in the form of machine-executable object code generated by
-# a source language processor.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-# Boost.Build support for Emscipten.
-#
-# @todo add support for dynamic linking
-# @todo add support for --js-library, --pre-js, and --post-js options
-
-import generators ;
-import type ;
-import toolset ;
-import feature ;
-import common ;
-import errors ;
-
-if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
-{
-  .debug-configuration = true ;
-}
-
-# add an emscripten toolset
-feature.extend toolset : emscripten ;
-
-# extend the target-os list to include emscripten
-feature.extend target-os : emscripten ;
-# make emscripten the default target-os when compiling with the emscripten toolset
-feature.set-default target-os : emscripten ;
-
-# initialize the emscripten toolset
-rule init ( version ? : command * : options * )
-{
-  command = [ common.get-invocation-command emscripten : em++ : $(command) ] ;
-
-  if $(command)
-  {
-    version ?= [ MATCH "^([0-9.]+)" : [ SHELL \""$(command)\" --version" ] ] ;
-    if $(version)
-    {
-      local actual_version = [ MATCH "^([0-9.]+)" : [ SHELL \""$(command)\" --version" ] ] ;
-      if $(actual_version) != $(version)
-      {
-        errors.user-error "emscripten: detected version $(actual_version) does not match desired $(version)" ;
-      }
-    }
-  }
-  else
-  {
-    errors.user-error "emscripten: em++ not found" ;
-  }
-
-  local condition = [ common.check-init-parameters emscripten : version $(version) ] ;
-
-  common.handle-options emscripten : $(condition) : $(command) : $(options) ;
-
-  # @todo this seems to be the right way, but this is a list somehow
-  toolset.add-requirements <toolset>emscripten:<testing.launcher>node ;
-
-  toolset.flags emscripten.compile STDHDRS $(condition) : /emsdk/upstream/emscripten/system/include ;
-  toolset.flags emscripten.link STDLIBPATH $(condition) : /emsdk/upstream/emscripten/system/lib ;
-  toolset.flags emscripten AR $(condition) : /emsdk/upstream/emscripten/emar ;
-  toolset.flags emscripten RANLIB $(condition) : /emsdk/upstream/emscripten/emranlib ;
-}
-
-type.set-generated-target-suffix EXE : <toolset>emscripten : js ;
-#type.set-generated-target-suffix STATIC_LIB : <toolset>emscripten : bc ;
-#type.set-generated-target-suffix SHARED_LIB : <toolset>emscripten : bc ;
-#type.set-generated-target-suffix OBJ : <toolset>emscripten : bc ;
-
-generators.register-linker emscripten.link : OBJ STATIC_LIB : EXE : <toolset>emscripten ;
-
-generators.register-archiver emscripten.archive : OBJ : STATIC_LIB : <toolset>emscripten ;
-
-generators.register-c-compiler emscripten.compile.c++.preprocess : CPP : PREPROCESSED_CPP : <toolset>emscripten ;
-generators.register-c-compiler emscripten.compile.c.preprocess   : C   : PREPROCESSED_C   : <toolset>emscripten ;
-generators.register-c-compiler emscripten.compile.c++ : CPP : OBJ : <toolset>emscripten ;
-generators.register-c-compiler emscripten.compile.c : C : OBJ : <toolset>emscripten ;
-
-# Declare flags
-
-toolset.flags emscripten.compile OPTIONS <optimization>off   : -O0 ;
-toolset.flags emscripten.compile OPTIONS <optimization>speed : -O3 ;
-toolset.flags emscripten.compile OPTIONS <optimization>space : -Os ;
-
-toolset.flags emscripten.compile OPTIONS <inlining>off  : -fno-inline ;
-toolset.flags emscripten.compile OPTIONS <inlining>on   : -Wno-inline ;
-toolset.flags emscripten.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
-
-toolset.flags emscripten.compile OPTIONS <warnings>off : -w ;
-toolset.flags emscripten.compile OPTIONS <warnings>on  : -Wall ;
-toolset.flags emscripten.compile OPTIONS <warnings>all : -Wall -pedantic ;
-toolset.flags emscripten.compile OPTIONS <warnings-as-errors>on : -Werror ;
-
-toolset.flags emscripten.compile OPTIONS <debug-symbols>on : -g ;
-toolset.flags emscripten.compile OPTIONS <profiling>on : -pg ;
-
-toolset.flags emscripten.compile.c++ OPTIONS <rtti>off : -fno-rtti ;
-toolset.flags emscripten.compile.c++ OPTIONS <exception-handling>off : -fno-exceptions ;
-
-toolset.flags emscripten.compile USER_OPTIONS <cflags> ;
-toolset.flags emscripten.compile.c++ USER_OPTIONS <cxxflags> ;
-toolset.flags emscripten.compile DEFINES <define> ;
-toolset.flags emscripten.compile INCLUDES <include> ;
-toolset.flags emscripten.compile.c++ TEMPLATE_DEPTH <c++-template-depth> ;
-toolset.flags emscripten.compile.fortran USER_OPTIONS <fflags> ;
-
-toolset.flags emscripten.link DEFAULTS : -Wno-warn-absolute-paths ;
-
-toolset.flags emscripten.link LIBRARY_PATH <library-path> ;
-toolset.flags emscripten.link FINDLIBS_ST <find-static-library> ;
-toolset.flags emscripten.link FINDLIBS_SA <find-shared-library> ;
-toolset.flags emscripten.link LIBRARIES <library-file> ;
-
-toolset.flags emscripten.link OPTIONS <linkflags> ;
-
-toolset.flags emscripten.archive AROPTIONS <archiveflags> ;
-
-rule compile.c++ ( targets * : sources * : properties * )
-{
-    # Some extensions are compiled as C++ by default. For others, we need to
-    # pass -x c++. We could always pass -x c++ but distcc does not work with it.
-    if ! $(>:S) in .cc .cp .cxx .cpp .c++ .C
-    {
-        LANG on $(<) = "-x c++" ;
-    }
-}
-
-rule compile.c ( targets * : sources * : properties * )
-{
-    LANG on $(<) = "-x c" ;
-}
-
-actions compile.c++
-{
-    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
-}
-
-actions compile.c
-{
-    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
-}
-
-actions compile.c++.preprocess
-{
-    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
-}
-
-actions compile.c.preprocess
-{
-    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" "$(>)" -E >$(<)
-}
-
-actions link
-{
-  "$(CONFIG_COMMAND)" $(DEFAULTS) $(OPTIONS) -L"$(LIBRARY_PATH:W)" -L"$(STDLIBPATH:W)" -o "$(<:W)" "$(>:W)" -l"$(LIBRARIES:W)" -l"$(STDLIBRARIES:W)"
-}
-
-RM = [ common.rm-command ] ;
-actions piecemeal archive
-{
-  $(RM) "$(<)"
-  $(AR) $(AROPTIONS) rc "$(<:W)" "$(>:W)"
-}
diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
deleted file mode 100755
index 12d3e5ff4562..000000000000
--- a/scripts/docker_deploy_manual.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ -z "$1" ]
-then
-    echo "Usage: $0 <tag/branch>"
-    exit 1
-fi
-image="ethereum/solc"
-branch="$1"
-
-#docker login
-
-DIR=$(mktemp -d)
-(
-cd "$DIR"
-
-git clone --depth 2 https://github.com/ethereum/solidity.git -b "$branch"
-cd solidity
-commithash=$(git rev-parse --short=8 HEAD)
-echo -n "$commithash" > commit_hash.txt
-version=$("$(dirname "$0")/get_version.sh")
-if [ "$branch" = "release" ] || [ "$branch" = v"$version" ]
-then
-    echo -n > prerelease.txt
-else
-    date -u +"nightly.%Y.%-m.%-d" > prerelease.txt
-fi
-
-function tag_and_push
-{
-    docker tag "$image:$1" "$image:$2"
-    docker push "$image:$2"
-}
-
-rm -rf .git
-docker build -t "$image":build -f scripts/Dockerfile .
-tmp_container=$(docker create "$image":build sh)
-
-# Alpine image
-mkdir -p upload
-docker cp "${tmp_container}":/usr/bin/solc upload/solc-static-linux
-docker build -t "$image":build-alpine -f scripts/Dockerfile_alpine .
-
-if [ "$branch" = "develop" ]
-then
-    tag_and_push build nightly
-    tag_and_push build nightly-"$version"-"$commithash"
-    tag_and_push build-alpine nightly-alpine
-    tag_and_push build-alpine nightly-alpine-"$version"-"$commithash"
-elif [ "$branch" = v"$version" ]
-then
-    tag_and_push build stable
-    tag_and_push build "$version"
-    tag_and_push build-alpine stable-alpine
-    tag_and_push build-alpine "$version"-alpine
-else
-    echo "Not publishing docker image from branch or tag $branch"
-fi
-)
-rm -rf "$DIR"
diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh
deleted file mode 100755
index d56bed3a191b..000000000000
--- a/scripts/docs_version_pragma_check.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-# This script verifies that the examples compile with the oldest version mentioned in the pragma.
-# It does not verify that it cannot be compiled with an older version
-# and it also does not verify that it can be compiled with the newest version compatible with the pragma.
-
-set -e
-
-## GLOBAL VARIABLES
-
-REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
-SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
-
-function versionGreater
-{
-    v1=$1
-    v2=$2
-    # shellcheck disable=SC2206
-    ver1=( ${v1//./ } )
-    # shellcheck disable=SC2206
-    ver2=( ${v2//./ } )
-
-    if (( "${ver1[0]}" > "${ver2[0]}" ))
-    then
-        return 0
-    elif (( "${ver1[0]}" == "${ver2[0]}" )) && (( "${ver1[1]}" > "${ver2[1]}" ))
-    then
-        return 0
-    elif (( "${ver1[0]}" == "${ver2[0]}" )) && (( "${ver1[1]}" == "${ver2[1]}" )) && (( "${ver1[2]}" > "${ver2[2]}" ))
-    then
-        return 0
-    fi
-    return 1
-}
-
-function versionEqual
-{
-    if [[ "$1" == "$2" ]]
-    then
-        return 0
-    fi
-    return 1
-}
-
-function getAllAvailableVersions
-{
-    allVersions=()
-    local allListedVersions
-    mapfile -t allListedVersions <<< "$(
-        wget -q -O- https://binaries.soliditylang.org/bin/list.txt |
-        grep -Po '(?<=soljson-v)\d+.\d+.\d+(?=\+commit)' |
-        sort -V
-    )"
-    for listed in "${allListedVersions[@]}"
-    do
-        if versionGreater "$listed" "0.4.10"
-        then
-            allVersions+=( "$listed" )
-        fi
-    done
-}
-
-function findMinimalVersion
-{
-    local f=$1
-    local greater=false
-    local pragmaVersion
-
-    # Get minimum compiler version defined by pragma
-    if (grep -Po '(?<=pragma solidity >=)\d+.\d+.\d+' "$f" >/dev/null)
-    then
-        pragmaVersion="$(grep -Po '(?<=pragma solidity >=)\d+.\d+.\d+' "$f")"
-        sign=">="
-    elif (grep -Po '(?<=pragma solidity \^)\d+.\d+.\d+' "$f" >/dev/null)
-    then
-        pragmaVersion="$(grep -Po '(?<=pragma solidity \^)\d+.\d+.\d+' "$f")"
-        sign="^"
-    elif (grep -Po '(?<=pragma solidity >)\d+.\d+.\d+' "$f" >/dev/null)
-    then
-        pragmaVersion="$(grep -Po '(?<=pragma solidity >)\d+.\d+.\d+' "$f")"
-        sign=">"
-        greater=true;
-    else
-        printError "No valid pragma statement in file. Skipping..."
-        return
-    fi
-
-    version=""
-    for ver in "${allVersions[@]}" "$developmentVersion"
-    do
-        if versionGreater "$ver" "$pragmaVersion"
-        then
-            version="$ver"
-            break
-        elif [[ "$greater" == false ]] && versionEqual "$ver" "$pragmaVersion"
-        then
-            version="$ver"
-            break
-        fi
-    done
-
-    if [[ "$version" == "" ]]
-    then
-        printError "No release ${sign}${pragmaVersion} was listed in available releases!"
-        exit 1
-    fi
-}
-
-printTask "Verifying that all examples from the documentation have the correct version range..."
-SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-
-    getAllAvailableVersions
-
-    for f in *.sol
-    do
-        # The contributors guide uses syntax tests, but we cannot
-        # really handle them here.
-        if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
-        then
-            continue
-        fi
-        echo "$f"
-
-        opts=()
-        # We expect errors if explicitly stated, or if imports
-        # are used (in the style guide)
-        if ( ! grep -E "This will not compile after" "$f" >/dev/null && \
-            grep -E "This will not compile|import \"" "$f" >/dev/null )
-        then
-            opts=(--expect-errors)
-        fi
-
-        # ignore warnings in this case
-        opts+=(--ignore-warnings)
-
-        findMinimalVersion "$f"
-        if [[ "$version" == "" ]]
-        then
-            continue
-        fi
-        if [[ "$version" == "$developmentVersion" ]]
-        then
-            printWarning "Skipping unreleased development version $developmentVersion"
-            continue
-        fi
-
-        opts+=(-v "$version")
-
-        solc_bin="solc-$version"
-        echo "$solc_bin"
-        if [[ ! -f "$solc_bin" ]]
-        then
-            echo "Downloading release from github..."
-            if wget -q "https://github.com/ethereum/solidity/releases/download/v$version/solc-static-linux" >/dev/null
-            then
-                mv solc-static-linux "$solc_bin"
-            else
-                printError "No release $version was found on github!"
-                continue
-            fi
-        fi
-
-        ln -sf "$solc_bin" "solc"
-        chmod a+x solc
-
-        SOLC="$SOLTMPDIR/solc" compileFull "${opts[@]}" "$SOLTMPDIR/$f"
-    done
-)
-rm -rf "$SOLTMPDIR"
-echo "Done."
diff --git a/scripts/download_ossfuzz_corpus.sh b/scripts/download_ossfuzz_corpus.sh
deleted file mode 100755
index 92478caf6ff8..000000000000
--- a/scripts/download_ossfuzz_corpus.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-set -e
-cd /tmp
-git clone --depth 1 https://github.com/ethereum/solidity-fuzzing-corpus.git
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
deleted file mode 100755
index 8fe2c4c1bee3..000000000000
--- a/scripts/error_codes.py
+++ /dev/null
@@ -1,355 +0,0 @@
-#! /usr/bin/env python3
-import random
-import re
-import os
-import getopt
-import sys
-from os import path
-
-ENCODING = "utf-8"
-SOURCE_FILE_PATTERN = r"\b\d+_error\b"
-
-
-def read_file(file_name):
-    content = None
-    _, tail = path.split(file_name)
-    is_latin = tail == "invalid_utf8_sequence.sol"
-    try:
-        with open(file_name, "r", encoding="latin-1" if is_latin else ENCODING) as f:
-            content = f.read()
-    finally:
-        if content is None:
-            print(f"Error reading: {file_name}")
-    return content
-
-
-def write_file(file_name, content):
-    with open(file_name, "w", encoding=ENCODING) as f:
-        f.write(content)
-
-
-def in_comment(source, pos):
-    slash_slash_pos = source.rfind("//", 0, pos)
-    lf_pos = source.rfind("\n", 0, pos)
-    if slash_slash_pos > lf_pos:
-        return True
-    slash_star_pos = source.rfind("/*", 0, pos)
-    star_slash_pos = source.rfind("*/", 0, pos)
-    return slash_star_pos > star_slash_pos
-
-
-def find_ids_in_source_file(file_name, id_to_file_names):
-    source = read_file(file_name)
-    for m in re.finditer(SOURCE_FILE_PATTERN, source):
-        if in_comment(source, m.start()):
-            continue
-        underscore_pos = m.group(0).index("_")
-        error_id = m.group(0)[0:underscore_pos]
-        if error_id in id_to_file_names:
-            id_to_file_names[error_id].append(file_name)
-        else:
-            id_to_file_names[error_id] = [file_name]
-
-
-def find_ids_in_source_files(file_names):
-    """Returns a dictionary with list of source files for every appearance of every id"""
-
-    id_to_file_names = {}
-    for file_name in file_names:
-        find_ids_in_source_file(file_name, id_to_file_names)
-    return id_to_file_names
-
-
-def get_next_id(available_ids):
-    assert len(available_ids) > 0, "Out of IDs"
-    next_id = random.choice(list(available_ids))
-    available_ids.remove(next_id)
-    return next_id
-
-
-def fix_ids_in_source_file(file_name, id_to_count, available_ids):
-    source = read_file(file_name)
-
-    k = 0
-    destination = []
-    for m in re.finditer(SOURCE_FILE_PATTERN, source):
-        destination.extend(source[k:m.start()])
-
-        underscore_pos = m.group(0).index("_")
-        error_id = m.group(0)[0:underscore_pos]
-
-        # incorrect id or id has a duplicate somewhere
-        if not in_comment(source, m.start()) and (len(error_id) != 4 or error_id[0] == "0" or id_to_count[error_id] > 1):
-            assert error_id in id_to_count
-            new_id = get_next_id(available_ids)
-            assert new_id not in id_to_count
-            id_to_count[error_id] -= 1
-        else:
-            new_id = error_id
-
-        destination.extend(new_id + "_error")
-        k = m.end()
-
-    destination.extend(source[k:])
-
-    destination = ''.join(destination)
-    if source != destination:
-        write_file(file_name, destination)
-        print(f"Fixed file: {file_name}")
-
-
-def fix_ids_in_source_files(file_names, id_to_count):
-    """
-    Fixes ids in given source files;
-    id_to_count contains number of appearances of every id in sources
-    """
-
-    available_ids = {str(error_id) for error_id in range(1000, 10000)} - id_to_count.keys()
-    for file_name in file_names:
-        fix_ids_in_source_file(file_name, id_to_count, available_ids)
-
-
-def find_files(top_dir, sub_dirs, extensions):
-    """Builds a list of files with given extensions in specified subdirectories"""
-
-    source_file_names = []
-    for directory in sub_dirs:
-        for root, _, file_names in os.walk(os.path.join(top_dir, directory), onerror=lambda e: sys.exit(f"Walk error: {e}")):
-            for file_name in file_names:
-                _, ext = path.splitext(file_name)
-                if ext in extensions:
-                    source_file_names.append(path.join(root, file_name))
-
-    return source_file_names
-
-
-def find_ids_in_test_file(file_name):
-    source = read_file(file_name)
-    pattern = r"^// (.*Error|Warning|Info) \d\d\d\d:"
-    return {m.group(0)[-5:-1] for m in re.finditer(pattern, source, flags=re.MULTILINE)}
-
-
-def find_ids_in_test_files(file_names):
-    """Returns a set containing all ids in tests"""
-
-    ids = set()
-    for file_name in file_names:
-        ids |= find_ids_in_test_file(file_name)
-    return ids
-
-
-def find_ids_in_cmdline_test_err(file_name):
-    source = read_file(file_name)
-    pattern = r' \(\d\d\d\d\):'
-    return {m.group(0)[-6:-2] for m in re.finditer(pattern, source, flags=re.MULTILINE)}
-
-
-def print_ids(ids):
-    for k, error_id in enumerate(sorted(ids)):
-        if k % 10 > 0:
-            print(" ", end="")
-        elif k > 0:
-            print()
-        print(error_id, end="")
-
-
-def print_ids_per_file(ids, id_to_file_names, top_dir):
-    file_name_to_ids = {}
-    for error_id in ids:
-        for file_name in id_to_file_names[error_id]:
-            relpath = path.relpath(file_name, top_dir)
-            if relpath not in file_name_to_ids:
-                file_name_to_ids[relpath] = []
-            file_name_to_ids[relpath].append(error_id)
-
-    for file_name in sorted(file_name_to_ids):
-        print(file_name)
-        for error_id in sorted(file_name_to_ids[file_name]):
-            print(f" {error_id}", end="")
-        print()
-
-
-def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
-    test_sub_dirs = [
-        path.join("test", "libsolidity", "natspecJSON"),
-        path.join("test", "libsolidity", "smtCheckerTests"),
-        path.join("test", "libsolidity", "syntaxTests"),
-        path.join("test", "libyul", "yulSyntaxTests")
-    ]
-    test_file_names = find_files(
-        top_dir,
-        test_sub_dirs,
-        [".sol", ".yul"]
-    )
-    source_ids = source_id_to_file_names.keys()
-    test_ids = find_ids_in_test_files(test_file_names)
-
-    # special case, we are interested in warnings which are ignored by regular tests:
-    # Warning (1878): SPDX license identifier not provided in source file. ....
-    # Warning (3420): Source file does not specify required compiler version!
-    test_ids |= find_ids_in_cmdline_test_err(path.join(top_dir, "test", "cmdlineTests", "error_codes", "err"))
-
-    # white list of ids which are not covered by tests
-    white_ids = {
-        "9804", # Tested in test/libyul/ObjectParser.cpp.
-        "1544",
-        "1749",
-        "2674",
-        "6367",
-        "8387",
-        "3805", # "This is a pre-release compiler version, please do not use it in production."
-                # The warning may or may not exist in a compiler build.
-        "4591", # "There are more than 256 warnings. Ignoring the rest."
-                # Due to 3805, the warning lists look different for different compiler builds.
-        "1834", # Unimplemented feature error, as we do not test it anymore via cmdLineTests
-        "5430", # basefee being used in inline assembly for EVMVersion < london
-        "1180", # SMTChecker, covered by CL tests
-        "2339", # SMTChecker, covered by CL tests
-        "2961", # SMTChecker, covered by CL tests
-        "6240", # SMTChecker, covered by CL tests
-        "9576", # SMTChecker, covered by CL tests
-    }
-    assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect"
-    test_ids |= white_ids
-
-    test_only_ids = test_ids - source_ids
-    source_only_ids = source_ids - test_ids
-
-    if not new_ids_only:
-        print(f"IDs in source files: {len(source_ids)}")
-        print(f"IDs in test files  : {len(test_ids)} ({len(test_ids) - len(source_ids)})")
-        print()
-
-        if len(test_only_ids) != 0:
-            print("Error. The following error codes found in tests, but not in sources:")
-            print_ids(test_only_ids)
-            return False
-
-        if len(source_only_ids) != 0:
-            print("The following error codes found in sources, but not in tests:")
-            print_ids_per_file(source_only_ids, source_id_to_file_names, top_dir)
-            print("\n\nPlease make sure to add appropriate tests.")
-            return False
-
-    old_source_only_ids = {
-        "1218", "1584", "1823",
-        "1988", "2066", "2833", "3356",
-        "3893", "3996", "4010", "4458", "4802",
-        "4902", "5272", "5622", "5798", "5840", "7128", "7400",
-        "7589", "7593", "7649", "7710",
-        "8065", "8084", "8140", "8158",
-        "8312", "8592", "9134", "9609",
-    }
-
-    new_source_only_ids = source_only_ids - old_source_only_ids
-    if len(new_source_only_ids) != 0:
-        print("The following new error code(s), not covered by tests, found:")
-        print_ids(new_source_only_ids)
-        print(
-            "\nYou can:\n"
-            "- create appropriate test(s);\n"
-            "- add the error code(s) to old_source_only_ids in error_codes.py\n"
-            "  (to silence the checking script, with a promise to add a test later);\n"
-            "- add the error code(s) to white_ids in error_codes.py\n"
-            "  (for rare cases when the error is not supposed to be tested)"
-        )
-        return False
-
-    return True
-
-
-def main(argv):
-    check = False
-    fix = False
-    no_confirm = False
-    examine_coverage = False
-    next_id = False
-    opts, _args = getopt.getopt(argv, "", ["check", "fix", "no-confirm", "examine-coverage", "next"])
-
-    for opt, _arg in opts:
-        if opt == "--check":
-            check = True
-        elif opt == "--fix":
-            fix = True
-        elif opt == "--no-confirm":
-            no_confirm = True
-        elif opt == "--examine-coverage":
-            examine_coverage = True
-        elif opt == "--next":
-            next_id = True
-
-    if [check, fix, examine_coverage, next_id].count(True) != 1:
-        print("usage: python error_codes.py --check | --fix [--no-confirm] | --examine-coverage | --next")
-        sys.exit(1)
-
-    cwd = os.getcwd()
-
-    source_file_names = find_files(
-        cwd,
-        ["libevmasm", "liblangutil", "libsolc", "libsolidity", "libsolutil", "libyul", "solc"],
-        [".h", ".cpp"]
-    )
-    source_id_to_file_names = find_ids_in_source_files(source_file_names)
-
-    ok = True
-    for error_id in sorted(source_id_to_file_names):
-        if len(error_id) != 4:
-            print(f"ID {error_id} length != 4")
-            ok = False
-        if error_id[0] == "0":
-            print(f"ID {error_id} starts with zero")
-            ok = False
-        if len(source_id_to_file_names[error_id]) > 1:
-            print(f"ID {error_id} appears {len(source_id_to_file_names[error_id])} times")
-            ok = False
-
-    if examine_coverage:
-        if not ok:
-            print("Incorrect IDs have to be fixed before applying --examine-coverage")
-            sys.exit(1)
-        res = 0 if examine_id_coverage(cwd, source_id_to_file_names) else 1
-        sys.exit(res)
-
-    ok &= examine_id_coverage(cwd, source_id_to_file_names, new_ids_only=True)
-
-    random.seed()
-
-    if next_id:
-        if not ok:
-            print("Incorrect IDs have to be fixed before applying --next")
-            sys.exit(1)
-        available_ids = {str(error_id) for error_id in range(1000, 10000)} - source_id_to_file_names.keys()
-        next_id = get_next_id(available_ids)
-        print(f"Next ID: {next_id}")
-        sys.exit(0)
-
-    if ok:
-        print("No incorrect IDs found")
-        sys.exit(0)
-
-    if check:
-        sys.exit(1)
-
-    assert fix, "Unexpected state, should not come here without --fix"
-
-    if not no_confirm:
-        answer = input(
-            "\nDo you want to fix incorrect IDs?\n"
-            "Please commit current changes first, and review the results when the script finishes.\n"
-            "[Y/N]? "
-        )
-        while len(answer) == 0 or answer not in "YNyn":
-            answer = input("[Y/N]? ")
-        if answer not in "yY":
-            sys.exit(1)
-
-    # number of appearances for every id
-    source_id_to_count = { error_id: len(file_names) for error_id, file_names in source_id_to_file_names.items() }
-
-    fix_ids_in_source_files(source_file_names, source_id_to_count)
-    print("Fixing completed")
-    sys.exit(2)
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/scripts/externalTests/benchmark_diff.py b/scripts/externalTests/benchmark_diff.py
deleted file mode 100755
index 234f85ac0ea9..000000000000
--- a/scripts/externalTests/benchmark_diff.py
+++ /dev/null
@@ -1,453 +0,0 @@
-#!/usr/bin/env python3
-
-from argparse import ArgumentParser
-from dataclasses import dataclass
-from enum import Enum
-from pathlib import Path
-from textwrap import dedent
-from typing import Any, Mapping, Optional, Set, Sequence, Union
-import json
-import sys
-
-
-class DiffMode(Enum):
-    IN_PLACE = 'inplace'
-    TABLE = 'table'
-
-
-class DifferenceStyle(Enum):
-    ABSOLUTE = 'absolute'
-    RELATIVE = 'relative'
-    HUMANIZED = 'humanized'
-
-
-class OutputFormat(Enum):
-    JSON = 'json'
-    CONSOLE = 'console'
-    MARKDOWN = 'markdown'
-
-
-DEFAULT_RELATIVE_PRECISION = 4
-
-DEFAULT_DIFFERENCE_STYLE = {
-    DiffMode.IN_PLACE: DifferenceStyle.ABSOLUTE,
-    DiffMode.TABLE: DifferenceStyle.HUMANIZED,
-}
-assert all(t in DiffMode for t in DEFAULT_DIFFERENCE_STYLE)
-assert all(d in DifferenceStyle for d in DEFAULT_DIFFERENCE_STYLE.values())
-
-DEFAULT_OUTPUT_FORMAT = {
-    DiffMode.IN_PLACE: OutputFormat.JSON,
-    DiffMode.TABLE: OutputFormat.CONSOLE,
-}
-assert all(m in DiffMode for m in DEFAULT_OUTPUT_FORMAT)
-assert all(o in OutputFormat for o in DEFAULT_OUTPUT_FORMAT.values())
-
-
-class ValidationError(Exception):
-    pass
-
-
-class CommandLineError(ValidationError):
-    pass
-
-
-class BenchmarkDiffer:
-    difference_style: DifferenceStyle
-    relative_precision: Optional[int]
-    output_format: OutputFormat
-
-    def __init__(
-        self,
-        difference_style: DifferenceStyle,
-        relative_precision: Optional[int],
-        output_format: OutputFormat,
-    ):
-        self.difference_style = difference_style
-        self.relative_precision = relative_precision
-        self.output_format = output_format
-
-    def run(self, before: Any, after: Any) -> Optional[Union[dict, str, int, float]]:
-        if not isinstance(before, dict) or not isinstance(after, dict):
-            return self._diff_scalars(before, after)
-
-        if before.get('version') != after.get('version'):
-            return self._humanize_diff('!V')
-
-        diff = {}
-        for key in (set(before) | set(after)) - {'version'}:
-            value_diff = self.run(before.get(key), after.get(key))
-            if value_diff not in [None, {}]:
-                diff[key] = value_diff
-
-        return diff
-
-    def _diff_scalars(self, before: Any, after: Any) -> Optional[Union[str, int, float, dict]]:
-        assert not isinstance(before, dict) or not isinstance(after, dict)
-
-        if before is None and after is None:
-            return {}
-        if before is None:
-            return self._humanize_diff('!B')
-        if after is None:
-            return self._humanize_diff('!A')
-        if not isinstance(before, (int, float)) or not isinstance(after, (int, float)):
-            return self._humanize_diff('!T')
-
-        number_diff = self._diff_numbers(before, after)
-        if self.difference_style != DifferenceStyle.HUMANIZED:
-            return number_diff
-
-        return self._humanize_diff(number_diff)
-
-    def _diff_numbers(self, value_before: Union[int, float], value_after: Union[int, float]) -> Union[str, int, float]:
-        diff: Union[str, int, float]
-
-        if self.difference_style == DifferenceStyle.ABSOLUTE:
-            diff = value_after - value_before
-            if isinstance(diff, float) and diff.is_integer():
-                diff = int(diff)
-
-            return diff
-
-        if value_before == 0:
-            if value_after > 0:
-                return '+INF'
-            elif value_after < 0:
-                return '-INF'
-            else:
-                return 0
-
-        diff = (value_after - value_before) / abs(value_before)
-        if self.relative_precision is not None:
-            rounded_diff = round(diff, self.relative_precision)
-            if rounded_diff == 0 and diff < 0:
-                diff = '-0'
-            elif rounded_diff == 0 and diff > 0:
-                diff = '+0'
-            else:
-                diff = rounded_diff
-
-        if isinstance(diff, float) and diff.is_integer():
-            diff = int(diff)
-
-        return diff
-
-    def _humanize_diff(self, diff: Union[str, int, float]) -> str:
-        def wrap(value: str, symbol: str):
-            return f"{symbol}{value}{symbol}"
-
-        markdown = (self.output_format == OutputFormat.MARKDOWN)
-
-        if isinstance(diff, str) and diff.startswith('!'):
-            return wrap(diff, '`' if markdown else '')
-
-        value: Union[str, int, float]
-        if isinstance(diff, (int, float)):
-            value = diff * 100
-            if isinstance(value, float) and self.relative_precision is not None:
-                # The multiplication can result in new significant digits appearing. We need to reround.
-                # NOTE: round() works fine with negative precision.
-                value = round(value, self.relative_precision - 2)
-                if isinstance(value, float) and value.is_integer():
-                    value = int(value)
-            suffix = ''
-            prefix = ''
-            if diff < 0:
-                prefix = ''
-                if markdown:
-                    suffix += ' ✅'
-            elif diff > 0:
-                prefix = '+'
-                if markdown:
-                    suffix += ' �'
-            important = (diff != 0)
-        else:
-            value = diff
-            important = False
-            prefix = ''
-            suffix = ''
-
-        return wrap(
-            wrap(
-                f"{prefix}{value}%{suffix}",
-                '`' if markdown else ''
-            ),
-            '**' if important and markdown else ''
-        )
-
-
-@dataclass(frozen=True)
-class DiffTable:
-    columns: Mapping[str, Sequence[Union[int, float, str]]]
-
-
-class DiffTableSet:
-    table_headers: Sequence[str]
-    row_headers: Sequence[str]
-    column_headers: Sequence[str]
-
-    # Cells is a nested dict rather than a 3D array so that conversion to JSON is straightforward
-    cells: Mapping[str, Mapping[str, Mapping[str, Union[int, float, str]]]] # preset -> project -> attribute
-
-    def __init__(self, diff: dict):
-        self.table_headers = sorted(self._find_all_preset_names(diff))
-        self.column_headers = sorted(self._find_all_attribute_names(diff))
-        self.row_headers = sorted(project for project in diff)
-
-        # All dimensions must have unique values
-        assert len(self.table_headers) == len(set(self.table_headers))
-        assert len(self.column_headers) == len(set(self.column_headers))
-        assert len(self.row_headers) == len(set(self.row_headers))
-
-        self.cells = {
-            preset: {
-                project: {
-                    attribute: self._cell_content(diff, project, preset, attribute)
-                    for attribute in self.column_headers
-                }
-                for project in self.row_headers
-            }
-            for preset in self.table_headers
-        }
-
-    def calculate_row_column_width(self) -> int:
-        return max(len(h) for h in self.row_headers)
-
-    def calculate_column_widths(self, table_header: str) -> Sequence[int]:
-        assert table_header in self.table_headers
-
-        return [
-            max(
-                len(column_header),
-                max(
-                    len(str(self.cells[table_header][row_header][column_header]))
-                    for row_header in self.row_headers
-                )
-            )
-            for column_header in self.column_headers
-        ]
-
-    @classmethod
-    def _find_all_preset_names(cls, diff: dict) -> Set[str]:
-        return {
-            preset
-            for project, project_diff in diff.items()
-            if isinstance(project_diff, dict)
-            for preset in project_diff
-        }
-
-    @classmethod
-    def _find_all_attribute_names(cls, diff: dict) -> Set[str]:
-        return {
-            attribute
-            for project, project_diff in diff.items()
-            if isinstance(project_diff, dict)
-            for preset, preset_diff in project_diff.items()
-            if isinstance(preset_diff, dict)
-            for attribute in preset_diff
-        }
-
-    @classmethod
-    def _cell_content(cls, diff: dict, project: str, preset: str, attribute: str) -> str:
-        assert project in diff
-
-        if isinstance(diff[project], str):
-            return diff[project]
-        if preset not in diff[project]:
-            return ''
-        if isinstance(diff[project][preset], str):
-            return diff[project][preset]
-        if attribute not in diff[project][preset]:
-            return ''
-
-        return diff[project][preset][attribute]
-
-
-class DiffTableFormatter:
-    LEGEND = dedent("""
-        `!V` = version mismatch
-        `!B` = no value in the "before" version
-        `!A` = no value in the "after" version
-        `!T` = one or both values were not numeric and could not be compared
-        `-0` = very small negative value rounded to zero
-        `+0` = very small positive value rounded to zero
-    """)
-
-    @classmethod
-    def run(cls, diff_table_set: DiffTableSet, output_format: OutputFormat):
-        if output_format == OutputFormat.JSON:
-            return json.dumps(diff_table_set.cells, indent=4, sort_keys=True)
-        else:
-            assert output_format in {OutputFormat.CONSOLE, OutputFormat.MARKDOWN}
-
-            output = ''
-            for table_header in diff_table_set.table_headers:
-                column_widths = ([
-                    diff_table_set.calculate_row_column_width(),
-                    *diff_table_set.calculate_column_widths(table_header)
-                ])
-
-                if output_format == OutputFormat.MARKDOWN:
-                    output += f'\n### `{table_header}`\n'
-                else:
-                    output += f'\n{table_header.upper()}\n'
-
-                if output_format == OutputFormat.CONSOLE:
-                    output += cls._format_separator_row(column_widths, output_format) + '\n'
-                output += cls._format_data_row(['project', *diff_table_set.column_headers], column_widths) + '\n'
-                output += cls._format_separator_row(column_widths, output_format) + '\n'
-
-                for row_header in diff_table_set.row_headers:
-                    row = [
-                        diff_table_set.cells[table_header][row_header][column_header]
-                        for column_header in diff_table_set.column_headers
-                    ]
-                    output += cls._format_data_row([row_header, *row], column_widths) + '\n'
-
-                if output_format == OutputFormat.CONSOLE:
-                    output += cls._format_separator_row(column_widths, output_format) + '\n'
-
-            if output_format == OutputFormat.MARKDOWN:
-                output += f'\n{cls.LEGEND}\n'
-            return output
-
-    @classmethod
-    def _format_separator_row(cls, widths: Sequence[int], output_format: OutputFormat):
-        assert output_format in {OutputFormat.CONSOLE, OutputFormat.MARKDOWN}
-
-        if output_format == OutputFormat.MARKDOWN:
-            return '|:' + ':|-'.join('-' * width for width in widths) + ':|'
-        else:
-            return '|-' + '-|-'.join('-' * width for width in widths) + '-|'
-
-    @classmethod
-    def _format_data_row(cls, cells: Sequence[Union[int, float, str]], widths: Sequence[int]):
-        assert len(cells) == len(widths)
-
-        return '| ' + ' | '.join(str(cell).rjust(width) for cell, width in zip(cells, widths)) + ' |'
-
-
-@dataclass(frozen=True)
-class CommandLineOptions:
-    diff_mode: DiffMode
-    report_before: Path
-    report_after: Path
-    difference_style: DifferenceStyle
-    relative_precision: int
-    output_format: OutputFormat
-
-
-def process_commandline() -> CommandLineOptions:
-    script_description = (
-        "Compares summarized benchmark reports and outputs JSON with the same structure but listing only differences. "
-        "Can also print the output as markdown table and format the values to make differences stand out more."
-    )
-
-    parser = ArgumentParser(description=script_description)
-    parser.add_argument(
-        dest='diff_mode',
-        choices=[m.value for m in DiffMode],
-        help=(
-            "Diff mode: "
-            f"'{DiffMode.IN_PLACE.value}' preserves input JSON structure and replace values with differences; "
-            f"'{DiffMode.TABLE.value}' creates a table assuming 3-level project/preset/attribute structure."
-        )
-    )
-    parser.add_argument(dest='report_before', help="Path to a JSON file containing original benchmark results.")
-    parser.add_argument(dest='report_after', help="Path to a JSON file containing new benchmark results.")
-    parser.add_argument(
-        '--style',
-        dest='difference_style',
-        choices=[s.value for s in DifferenceStyle],
-        help=(
-            "How to present numeric differences: "
-            f"'{DifferenceStyle.ABSOLUTE.value}' subtracts new from original; "
-            f"'{DifferenceStyle.RELATIVE.value}' also divides by the original; "
-            f"'{DifferenceStyle.HUMANIZED.value}' is like relative but value is a percentage and "
-            "positive/negative changes are emphasized. "
-            f"(default: '{DEFAULT_DIFFERENCE_STYLE[DiffMode.IN_PLACE]}' in '{DiffMode.IN_PLACE.value}' mode, "
-            f"'{DEFAULT_DIFFERENCE_STYLE[DiffMode.TABLE]}' in '{DiffMode.TABLE.value}' mode)"
-        )
-    )
-    # NOTE: Negative values are valid for precision. round() handles them in a sensible way.
-    parser.add_argument(
-        '--precision',
-        dest='relative_precision',
-        type=int,
-        default=DEFAULT_RELATIVE_PRECISION,
-        help=(
-            "Number of significant digits for relative differences. "
-            f"Note that with --style={DifferenceStyle.HUMANIZED.value} the rounding is applied "
-            "**before** converting the value to a percentage so you need to add 2. "
-            f"Has no effect when used together with --style={DifferenceStyle.ABSOLUTE.value}. "
-            f"(default: {DEFAULT_RELATIVE_PRECISION})"
-        )
-    )
-    parser.add_argument(
-        '--output-format',
-        dest='output_format',
-        choices=[o.value for o in OutputFormat],
-        help=(
-            "The format to use for the diff: "
-            f"'{OutputFormat.JSON.value}' is raw JSON; "
-            f"'{OutputFormat.CONSOLE.value}' is a table with human-readable values that will look good in the console output. "
-            f"'{OutputFormat.MARKDOWN.value}' is similar '{OutputFormat.CONSOLE.value}' but adjusted to "
-            "render as proper markdown and with extra elements (legend, emoji to make non-zero values stand out more, etc)."
-            f"(default: '{DEFAULT_OUTPUT_FORMAT[DiffMode.IN_PLACE]}' in '{DiffMode.IN_PLACE.value}' mode, "
-            f"'{DEFAULT_OUTPUT_FORMAT[DiffMode.TABLE]}' in '{DiffMode.TABLE.value}' mode)"
-        )
-    )
-
-    options = parser.parse_args()
-
-    if options.difference_style is not None:
-        difference_style = DifferenceStyle(options.difference_style)
-    else:
-        difference_style = DEFAULT_DIFFERENCE_STYLE[DiffMode(options.diff_mode)]
-
-    if options.output_format is not None:
-        output_format = OutputFormat(options.output_format)
-    else:
-        output_format = DEFAULT_OUTPUT_FORMAT[DiffMode(options.diff_mode)]
-
-    processed_options = CommandLineOptions(
-        diff_mode=DiffMode(options.diff_mode),
-        report_before=Path(options.report_before),
-        report_after=Path(options.report_after),
-        difference_style=difference_style,
-        relative_precision=options.relative_precision,
-        output_format=output_format,
-    )
-
-    if processed_options.diff_mode == DiffMode.IN_PLACE and processed_options.output_format != OutputFormat.JSON:
-        raise CommandLineError(
-            f"Only the '{OutputFormat.JSON.value}' output format is supported in the '{DiffMode.IN_PLACE.value}' mode."
-        )
-
-    return processed_options
-
-
-def main():
-    try:
-        options = process_commandline()
-
-        differ = BenchmarkDiffer(options.difference_style, options.relative_precision, options.output_format)
-        diff = differ.run(
-            json.loads(options.report_before.read_text('utf-8')),
-            json.loads(options.report_after.read_text('utf-8')),
-        )
-
-        if options.diff_mode == DiffMode.IN_PLACE:
-            print(json.dumps(diff, indent=4, sort_keys=True))
-        else:
-            assert options.diff_mode == DiffMode.TABLE
-            print(DiffTableFormatter.run(DiffTableSet(diff), options.output_format))
-
-        return 0
-    except CommandLineError as exception:
-        print(f"ERROR: {exception}", file=sys.stderr)
-        return 1
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/scripts/externalTests/common.sh b/scripts/externalTests/common.sh
deleted file mode 100644
index 3bca968a5aa5..000000000000
--- a/scripts/externalTests/common.sh
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-set -e
-
-# Requires $REPO_ROOT to be defined and "${REPO_ROOT}/scripts/common.sh" to be included before.
-
-CURRENT_EVM_VERSION=shanghai
-
-AVAILABLE_PRESETS=(
-    legacy-no-optimize
-    ir-no-optimize
-    legacy-optimize-evm-only
-    ir-optimize-evm-only
-    legacy-optimize-evm+yul
-    ir-optimize-evm+yul
-)
-
-function print_presets_or_exit
-{
-    local selected_presets="$1"
-
-    [[ $selected_presets != "" ]] || { printWarning "No presets to run. Exiting."; exit 0; }
-
-    printLog "Selected settings presets: ${selected_presets}"
-}
-
-function verify_input
-{
-    local binary_type="$1"
-    local binary_path="$2"
-    local selected_presets="$3"
-
-    (( $# >= 2 && $# <= 3 )) || fail "Usage: $0 native|solcjs <path to solc or soljson.js> [preset]"
-    [[ $binary_type == native || $binary_type == solcjs ]] || fail "Invalid binary type: '${binary_type}'. Must be either 'native' or 'solcjs'."
-    [[ -f "$binary_path" ]] || fail "The compiler binary does not exist at '${binary_path}'"
-
-    if [[ $selected_presets != "" ]]
-    then
-        for preset in $selected_presets
-        do
-            if [[ " ${AVAILABLE_PRESETS[*]} " != *" $preset "* ]]
-            then
-                fail "Preset '${preset}' does not exist. Available presets: ${AVAILABLE_PRESETS[*]}."
-            fi
-        done
-    fi
-}
-
-function setup_solc
-{
-    local test_dir="$1"
-    local binary_type="$2"
-    local binary_path="$3"
-    local solcjs_branch="${4:-master}"
-    local install_dir="${5:-solc/}"
-    local solcjs_dir="$6"
-
-    [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
-    [[ $binary_type == solcjs || $solcjs_dir == "" ]] || assertFail
-
-    cd "$test_dir"
-
-    if [[ $binary_type == solcjs ]]
-    then
-        printLog "Setting up solc-js..."
-        if [[ $solcjs_dir == "" ]]; then
-            printLog "Cloning branch ${solcjs_branch}..."
-            git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
-        else
-            printLog "Using local solc-js from ${solcjs_dir}..."
-            cp -ra "$solcjs_dir" solc
-        fi
-
-        pushd "$install_dir"
-        npm install
-        cp "$binary_path" soljson.js
-        npm run build
-        SOLCVERSION=$(dist/solc.js --version)
-        popd
-    else
-        printLog "Setting up solc..."
-        SOLCVERSION=$("$binary_path" --version | tail -n 1 | sed -n -E 's/^Version: (.*)$/\1/p')
-    fi
-
-    SOLCVERSION_SHORT=$(echo "$SOLCVERSION" | sed -En 's/^([0-9.]+).*\+commit\.[0-9a-f]+.*$/\1/p')
-    printLog "Using compiler version $SOLCVERSION"
-}
-
-function download_project
-{
-    local repo="$1"
-    local ref_type="$2"
-    local solcjs_ref="$3"
-    local test_dir="$4"
-
-    [[ $ref_type == commit || $ref_type == branch || $ref_type == tag ]] || assertFail
-
-    printLog "Cloning ${ref_type} ${solcjs_ref} of ${repo}..."
-    if [[ $ref_type == commit ]]; then
-        mkdir ext
-        cd ext
-        git init
-        git remote add origin "$repo"
-        git fetch --depth 1 origin "$solcjs_ref"
-        git reset --hard FETCH_HEAD
-    else
-        git clone --depth 1 "$repo" -b "$solcjs_ref" "$test_dir/ext"
-        cd ext
-    fi
-    echo "Current commit hash: $(git rev-parse HEAD)"
-}
-
-function force_truffle_version
-{
-    local version="$1"
-
-    sed -i 's/"truffle":\s*".*"/"truffle": "'"$version"'"/g' package.json
-}
-
-function replace_version_pragmas
-{
-    # Replace fixed-version pragmas (part of Consensys best practice).
-    # Include all directories to also cover node dependencies.
-    printLog "Replacing fixed-version pragmas..."
-    find . test -name '*.sol' -type f -print0 | xargs -0 sed -i -E -e 's/pragma solidity [^;]+;/pragma solidity >=0.0;/'
-}
-
-function neutralize_package_lock
-{
-    # Remove lock files (if they exist) to prevent them from overriding our changes in package.json
-    printLog "Removing package lock files..."
-    rm --force --verbose yarn.lock
-    rm --force --verbose package-lock.json
-}
-
-function neutralize_package_json_hooks
-{
-    printLog "Disabling package.json hooks..."
-    [[ -f package.json ]] || fail "package.json not found"
-    sed -i 's|"prepublish": *".*"|"prepublish": ""|g' package.json
-    sed -i 's|"prepare": *".*"|"prepare": ""|g' package.json
-}
-
-function neutralize_packaged_contracts
-{
-    # Frameworks will build contracts from any package that contains a configuration file.
-    # This is both unnecessary (any files imported from these packages will get compiled again as a
-    # part of the main project anyway) and trips up our version check because it won't use our
-    # custom compiler binary.
-    printLog "Removing framework config and artifacts from npm packages..."
-    find node_modules/ -type f '(' -name 'hardhat.config.*' -o -name 'truffle-config.*' ')' -delete
-
-    # Some npm packages also come packaged with pre-built artifacts.
-    find node_modules/ -path '*artifacts/build-info/*.json' -delete
-}
-
-function force_solc_modules
-{
-    local custom_solcjs_path="${1:-solc/}"
-
-    [[ -d node_modules/ ]] || assertFail
-
-    printLog "Replacing all installed solc-js with a link to the latest version..."
-    soljson_binaries=$(find node_modules -type f -path "*/solc/soljson.js")
-    for soljson_binary in $soljson_binaries
-    do
-        local solc_module_path
-        solc_module_path=$(dirname "$soljson_binary")
-
-        printLog "Found and replaced solc-js in $solc_module_path"
-        rm -r "$solc_module_path"
-        ln -s "$custom_solcjs_path" "$solc_module_path"
-    done
-}
-
-function force_truffle_compiler_settings
-{
-    local config_file="$1"
-    local binary_type="$2"
-    local solc_path="$3"
-    local preset="$4"
-    local evm_version="${5:-"$CURRENT_EVM_VERSION"}"
-    local extra_settings="$6"
-    local extra_optimizer_settings="$7"
-
-    [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
-
-    [[ $binary_type == native ]] && local solc_path="native"
-
-    printLog "Forcing Truffle compiler settings..."
-    echo "-------------------------------------"
-    echo "Config file: $config_file"
-    echo "Binary type: $binary_type"
-    echo "Compiler path: $solc_path"
-    echo "Settings preset: ${preset}"
-    echo "Settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
-    echo "EVM version: $evm_version"
-    echo "Compiler version: ${SOLCVERSION_SHORT}"
-    echo "Compiler version (full): ${SOLCVERSION}"
-    echo "-------------------------------------"
-
-    local compiler_settings gas_reporter_settings
-    compiler_settings=$(truffle_compiler_settings "$solc_path" "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")
-    gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
-
-    {
-        echo "require('eth-gas-reporter');"
-        echo "module.exports['mocha'] = {"
-        echo "    reporter: 'eth-gas-reporter',"
-        echo "    reporterOptions: ${gas_reporter_settings}"
-        echo "};"
-
-        echo "module.exports['compilers'] = ${compiler_settings};"
-    } >> "$config_file"
-}
-
-function name_hardhat_default_export
-{
-    local config_file="$1"
-    local import="import {HardhatUserConfig} from 'hardhat/types/config';"
-    local config="const config: HardhatUserConfig = {"
-    sed -i "s|^\s*export\s*default\s*{|${import}\n${config}|g" "$config_file"
-    echo "export default config;" >> "$config_file"
-}
-
-function force_hardhat_timeout
-{
-    local config_file="$1"
-    local config_var_name="$2"
-    local new_timeout="$3"
-
-    printLog "Configuring Hardhat..."
-    echo "-------------------------------------"
-    echo "Timeout: ${new_timeout}"
-    echo "-------------------------------------"
-
-    if [[ $config_file == *\.js ]]; then
-        [[ $config_var_name == "" ]] || assertFail
-        echo "module.exports.mocha = module.exports.mocha || {timeout: ${new_timeout}}"
-        echo "module.exports.mocha.timeout =  ${new_timeout}"
-    else
-        [[ $config_file == *\.ts ]] || assertFail
-        [[ $config_var_name != "" ]] || assertFail
-        echo "${config_var_name}.mocha = ${config_var_name}.mocha ?? {timeout: ${new_timeout}};"
-        echo "${config_var_name}.mocha!.timeout = ${new_timeout}"
-    fi >> "$config_file"
-}
-
-function force_hardhat_compiler_binary
-{
-    local config_file="$1"
-    local binary_type="$2"
-    local solc_path="$3"
-
-    printLog "Configuring Hardhat..."
-    echo "-------------------------------------"
-    echo "Config file: ${config_file}"
-    echo "Binary type: ${binary_type}"
-    echo "Compiler path: ${solc_path}"
-
-    local language="${config_file##*.}"
-    hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$binary_type" "$solc_path" "$language" >> "$config_file"
-}
-
-function force_hardhat_unlimited_contract_size
-{
-    local config_file="$1"
-    local config_var_name="$2"
-
-    printLog "Configuring Hardhat..."
-    echo "-------------------------------------"
-    echo "Allow unlimited contract size: true"
-    echo "-------------------------------------"
-
-    if [[ $config_file == *\.js ]]; then
-        [[ $config_var_name == "" ]] || assertFail
-        echo "module.exports.networks.hardhat = module.exports.networks.hardhat || {allowUnlimitedContractSize: undefined}"
-        echo "module.exports.networks.hardhat.allowUnlimitedContractSize = true"
-    else
-        [[ $config_file == *\.ts ]] || assertFail
-        [[ $config_var_name != "" ]] || assertFail
-        echo "${config_var_name}.networks!.hardhat = ${config_var_name}.networks!.hardhat ?? {allowUnlimitedContractSize: undefined};"
-        echo "${config_var_name}.networks!.hardhat!.allowUnlimitedContractSize = true"
-    fi >> "$config_file"
-}
-
-function force_hardhat_compiler_settings
-{
-    local config_file="$1"
-    local preset="$2"
-    local config_var_name="$3"
-    local evm_version="${4:-"$CURRENT_EVM_VERSION"}"
-    local extra_settings="$5"
-    local extra_optimizer_settings="$6"
-
-    printLog "Configuring Hardhat..."
-    echo "-------------------------------------"
-    echo "Config file: ${config_file}"
-    echo "Settings preset: ${preset}"
-    echo "Settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
-    echo "EVM version: ${evm_version}"
-    echo "Compiler version: ${SOLCVERSION_SHORT}"
-    echo "Compiler version (full): ${SOLCVERSION}"
-    echo "-------------------------------------"
-
-    local compiler_settings gas_reporter_settings
-    compiler_settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")
-    gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
-    if [[ $config_file == *\.js ]]; then
-        [[ $config_var_name == "" ]] || assertFail
-        echo "require('hardhat-gas-reporter');"
-        echo "module.exports.gasReporter = ${gas_reporter_settings};"
-        echo "module.exports.solidity = ${compiler_settings};"
-    else
-        [[ $config_file == *\.ts ]] || assertFail
-        [[ $config_var_name != "" ]] || assertFail
-        echo 'import "hardhat-gas-reporter";'
-        echo "${config_var_name}.gasReporter = ${gas_reporter_settings};"
-        echo "${config_var_name}.solidity = {compilers: [${compiler_settings}]};"
-    fi >> "$config_file"
-}
-
-function truffle_verify_compiler_version
-{
-    local solc_version="$1"
-    local full_solc_version="$2"
-
-    printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
-    grep "$full_solc_version" --recursive --quiet build/contracts || fail "Wrong compiler version detected."
-}
-
-function hardhat_verify_compiler_version
-{
-    local solc_version="$1"
-    local full_solc_version="$2"
-
-    printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
-    local build_info_files
-    build_info_files=$(find . -path '*artifacts/build-info/*.json')
-    for build_info_file in $build_info_files; do
-        grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --quiet "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
-        grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --quiet "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
-    done
-}
-
-function truffle_clean
-{
-    rm -rf build/
-}
-
-function hardhat_clean
-{
-    rm -rf build/ artifacts/ cache/
-}
-
-function settings_from_preset
-{
-    local preset="$1"
-    local evm_version="$2"
-    local extra_settings="$3"
-    local extra_optimizer_settings="$4"
-
-    [[ " ${AVAILABLE_PRESETS[*]} " == *" $preset "* ]] || assertFail
-
-    [[ $extra_settings == "" ]] || extra_settings="${extra_settings}, "
-    [[ $extra_optimizer_settings == "" ]] || extra_optimizer_settings="${extra_optimizer_settings}, "
-
-    case "$preset" in
-        # NOTE: Remember to update `parallelism` of `t_ems_ext` job in CI config if you add/remove presets
-        legacy-no-optimize)       echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: false}}" ;;
-        ir-no-optimize)           echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true,  optimizer: {${extra_optimizer_settings}enabled: false}}" ;;
-        legacy-optimize-evm-only) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: false}}}" ;;
-        ir-optimize-evm-only)     echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true,  optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: false}}}" ;;
-        legacy-optimize-evm+yul)  echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: true}}}" ;;
-        ir-optimize-evm+yul)      echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true,  optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: true}}}" ;;
-        *)
-            fail "Unknown settings preset: '${preset}'."
-            ;;
-    esac
-}
-
-function replace_global_solc
-{
-    local solc_path="$1"
-
-    [[ ! -e solc ]] || fail "A file named 'solc' already exists in '${PWD}'."
-
-    ln -s "$solc_path" solc
-    export PATH="$PWD:$PATH"
-}
-
-function eth_gas_reporter_settings
-{
-    local preset="$1"
-
-    echo "{"
-    echo "    enabled: true,"
-    echo "    gasPrice: 1,"                           # Gas price does not matter to us at all. Set to whatever to avoid API call.
-    echo "    noColors: true,"
-    echo "    showTimeSpent: false,"                  # We're not interested in test timing
-    echo "    onlyCalledMethods: true,"               # Exclude entries with no gas for shorter report
-    echo "    showMethodSig: true,"                   # Should make diffs more stable if there are overloaded functions
-    echo "    outputFile: \"$(gas_report_path "$preset")\""
-    echo "}"
-}
-
-function truffle_compiler_settings
-{
-    local solc_path="$1"
-    local preset="$2"
-    local evm_version="$3"
-    local extra_settings="$4"
-    local extra_optimizer_settings="$5"
-
-    echo "{"
-    echo "    solc: {"
-    echo "        version: \"${solc_path}\","
-    echo "        settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
-    echo "    }"
-    echo "}"
-}
-
-function hardhat_solc_build_subtask {
-    local solc_version="$1"
-    local full_solc_version="$2"
-    local binary_type="$3"
-    local solc_path="$4"
-    local language="$5"
-
-    [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
-
-    [[ $binary_type == native ]] && local is_solcjs=false
-    [[ $binary_type == solcjs ]] && local is_solcjs=true
-
-    if [[ $language == js ]]; then
-        echo "const {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} = require('hardhat/builtin-tasks/task-names');"
-        echo "const assert = require('assert');"
-        echo
-        echo "subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, async (args, hre, runSuper) => {"
-    else
-        [[ $language == ts ]] || assertFail
-        echo "import {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} from 'hardhat/builtin-tasks/task-names';"
-        echo "import assert = require('assert');"
-        echo "import {subtask} from 'hardhat/config';"
-        echo
-        echo "subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, async (args: any, _hre: any, _runSuper: any) => {"
-    fi
-
-    echo "    assert(args.solcVersion == '${solc_version}', 'Unexpected solc version: ' + args.solcVersion)"
-    echo "    return {"
-    echo "        compilerPath: '$(realpath "$solc_path")',"
-    echo "        isSolcJs: ${is_solcjs},"
-    echo "        version: args.solcVersion,"
-    echo "        longVersion: '${full_solc_version}'"
-    echo "    }"
-    echo "})"
-}
-
-function hardhat_compiler_settings {
-    local solc_version="$1"
-    local preset="$2"
-    local evm_version="$3"
-    local extra_settings="$4"
-    local extra_optimizer_settings="$5"
-
-    echo "{"
-    echo "    version: '${solc_version}',"
-    echo "    settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
-    echo "}"
-}
-
-function compile_and_run_test
-{
-    local compile_fn="$1"
-    local test_fn="$2"
-    local verify_fn="$3"
-    local preset="$4"
-    local compile_only_presets="$5"
-
-    [[ $preset != *" "* ]] || assertFail "Preset names must not contain spaces."
-
-    printLog "Running compile function..."
-    time $compile_fn
-    $verify_fn "$SOLCVERSION_SHORT" "$SOLCVERSION"
-
-    if [[ "$COMPILE_ONLY" == 1 || " $compile_only_presets " == *" $preset "* ]]; then
-        printLog "Skipping test function..."
-    else
-        printLog "Running test function..."
-        $test_fn
-    fi
-}
-
-function truffle_run_test
-{
-    local config_file="$1"
-    local binary_type="$2"
-    local solc_path="$3"
-    local preset="$4"
-    local compile_only_presets="$5"
-    local compile_fn="$6"
-    local test_fn="$7"
-    local extra_settings="$8"
-    local extra_optimizer_settings="$9"
-
-    truffle_clean
-    force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
-    compile_and_run_test compile_fn test_fn truffle_verify_compiler_version "$preset" "$compile_only_presets"
-}
-
-function hardhat_run_test
-{
-    local config_file="$1"
-    local preset="$2"
-    local compile_only_presets="$3"
-    local compile_fn="$4"
-    local test_fn="$5"
-    local config_var_name="$6"
-    local extra_settings="$7"
-    local extra_optimizer_settings="$8"
-
-    hardhat_clean
-    force_hardhat_compiler_settings "$config_file" "$preset" "$config_var_name" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
-    compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version "$preset" "$compile_only_presets"
-}
-
-function external_test
-{
-    local name="$1"
-    local main_fn="$2"
-
-    printTask "Testing $name..."
-    echo "==========================="
-    DIR=$(mktemp -d -t "ext-test-${name}-XXXXXX")
-    (
-        [[ "$main_fn" != "" ]] || fail "Test main function not defined."
-        $main_fn
-    )
-    rm -rf "$DIR"
-    echo "Done."
-}
-
-function gas_report_path
-{
-    local preset="$1"
-
-    echo "${DIR}/gas-report-${preset}.rst"
-}
-
-function gas_report_to_json
-{
-    cat - | "${REPO_ROOT}/scripts/externalTests/parse_eth_gas_report.py" | jq '{gas: .}'
-}
-
-function detect_hardhat_artifact_dir
-{
-    if [[ -e build/ && -e artifacts/ ]]; then
-        fail "Cannot determine Hardhat artifact location. Both build/ and artifacts/ exist"
-    elif [[ -e build/ ]]; then
-        echo -n build/artifacts
-    elif [[ -e artifacts/ ]]; then
-        echo -n artifacts
-    else
-        fail "Hardhat build artifacts not found."
-    fi
-}
-
-function bytecode_size_json_from_truffle_artifacts
-{
-    # NOTE: The output of this function is a series of concatenated JSON dicts rather than a list.
-
-    for artifact in build/contracts/*.json; do
-        if [[ $(jq '. | has("unlinked_binary")' "$artifact") == false ]]; then
-            # Each artifact represents compilation output for a single contract. Some top-level keys contain
-            # bits of Standard JSON output while others are generated by Truffle. Process it into a dict
-            # of the form `{"<file>": {"<contract>": <size>}}`.
-            # NOTE: The `bytecode` field starts with 0x, which is why we subtract 1 from size.
-            jq '{
-                (.ast.absolutePath): {
-                    (.contractName): (.bytecode | length / 2 - 1)
-                }
-            }' "$artifact"
-        fi
-    done
-}
-
-function bytecode_size_json_from_hardhat_artifacts
-{
-    # NOTE: The output of this function is a series of concatenated JSON dicts rather than a list.
-
-    for artifact in "$(detect_hardhat_artifact_dir)"/build-info/*.json; do
-        # Each artifact contains Standard JSON output under the `output` key.
-        # Process it into a dict of the form `{"<file>": {"<contract>": <size>}}`,
-        # Note that one Hardhat artifact often represents multiple input files.
-        jq '.output.contracts | to_entries[] | {
-            "\(.key)": .value | to_entries[] | {
-                "\(.key)": (.value.evm.bytecode.object | length / 2)
-            }
-        }' "$artifact"
-    done
-}
-
-function combine_artifact_json
-{
-    # Combine all dicts into a list with `jq --slurp` and then use `reduce` to merge them into one
-    # big dict with keys of the form `"<file>:<contract>"`. Then run jq again to filter out items
-    # with zero size and put the rest under under a top-level `bytecode_size` key. Also add another
-    # key with total bytecode size.
-    # NOTE: The extra inner `bytecode_size` key is there only to make diffs more readable.
-    cat - |
-        jq --slurp 'reduce (.[] | to_entries[]) as {$key, $value} ({}; . + {
-            ($key + ":" + ($value | to_entries[].key)): {
-                bytecode_size: $value | to_entries[].value
-            }
-        })' |
-        jq --indent 4 --sort-keys '{
-            bytecode_size: [. | to_entries[] | select(.value.bytecode_size > 0)] | from_entries,
-            total_bytecode_size: (reduce (. | to_entries[]) as {$key, $value} (0; . + $value.bytecode_size))
-        }'
-}
-
-function project_info_json
-{
-    local project_url="$1"
-
-    echo "{"
-    echo "    \"project\": {"
-    # NOTE: Given that we clone with `--depth 1`, we'll only get useful output out of `git describe`
-    # if we directly check out a tag. Still better than nothing.
-    echo "        \"version\": \"$(git describe --always)\","
-    echo "        \"commit\": \"$(git rev-parse HEAD)\","
-    echo "        \"url\": \"${project_url}\""
-    echo "    }"
-    echo "}"
-}
-
-function store_benchmark_report
-{
-    local framework="$1"
-    local project_name="$2"
-    local project_url="$3"
-    local preset="$4"
-
-    [[ $framework == truffle || $framework == hardhat ]] || assertFail
-    [[ " ${AVAILABLE_PRESETS[*]} " == *" $preset "* ]] || assertFail
-
-    local report_dir="${REPO_ROOT}/reports/externalTests"
-    local output_file="${report_dir}/benchmark-${project_name}-${preset}.json"
-    mkdir -p "$report_dir"
-
-    {
-        if [[ -e $(gas_report_path "$preset") ]]; then
-            gas_report_to_json < "$(gas_report_path "$preset")"
-        fi
-
-        "bytecode_size_json_from_${framework}_artifacts" | combine_artifact_json
-        project_info_json "$project_url"
-    } | jq --slurp "{\"${project_name}\": {\"${preset}\": add}}" --indent 4 --sort-keys > "$output_file"
-}
diff --git a/scripts/externalTests/download_benchmarks.py b/scripts/externalTests/download_benchmarks.py
deleted file mode 100755
index 29f5fe4bc764..000000000000
--- a/scripts/externalTests/download_benchmarks.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/env python3
-
-from argparse import ArgumentParser, Namespace
-from enum import Enum, unique
-from pathlib import Path
-from typing import Mapping, Optional
-import sys
-
-import requests
-
-# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
-# pragma pylint: disable=import-error,wrong-import-position
-SCRIPTS_DIR = Path(__file__).parent.parent
-sys.path.insert(0, str(SCRIPTS_DIR))
-
-from common.git_helpers import git_current_branch, git_commit_hash
-from common.rest_api_helpers import APIHelperError, JobNotSuccessful, CircleCI, Github, download_file
-# pragma pylint: enable=import-error,wrong-import-position
-
-
-@unique
-class Status(Enum):
-    OK = 0            # Benchmarks downloaded successfully
-    ERROR = 1         # Error in the script, bad API response, unexpected data, etc.
-    NO_BENCHMARK = 2  # Benchmark collector job did not finish successfully and/or benchmark artifacts are missing.
-    PENDING = 3       # Benchmark collector job has not finished yet.
-
-
-def process_commandline() -> Namespace:
-    script_description = (
-        "Downloads benchmark results attached as artifacts to the c_ext_benchmarks job on CircleCI. "
-        "If no options are specified, downloads results for the currently checked out git branch."
-    )
-
-    parser = ArgumentParser(description=script_description)
-
-    target_definition = parser.add_mutually_exclusive_group()
-    target_definition.add_argument(
-        '--branch',
-        dest='branch',
-        help="Git branch that the job ran on.",
-    )
-    target_definition.add_argument(
-        '--pr',
-        dest='pull_request_id',
-        type=int,
-        help="Github PR ID that the job ran on.",
-    )
-    target_definition.add_argument(
-        '--base-of-pr',
-        dest='base_of_pr',
-        type=int,
-        help="ID of a Github PR that's based on top of the branch we're interested in."
-    )
-
-    parser.add_argument(
-        '--any-commit',
-        dest='ignore_commit_hash',
-        default=False,
-        action='store_true',
-        help="Include pipelines that ran on a different commit as long as branch/PR matches."
-    )
-    parser.add_argument(
-        '--overwrite',
-        dest='overwrite',
-        default=False,
-        action='store_true',
-        help="If artifacts already exist on disk, overwrite them.",
-    )
-    parser.add_argument(
-        '--debug-requests',
-        dest='debug_requests',
-        default=False,
-        action='store_true',
-        help="Print detailed info about performed API requests and received responses.",
-    )
-
-    return parser.parse_args()
-
-
-def download_benchmark_artifact(
-    artifacts: Mapping[str, dict],
-    benchmark_name: str,
-    branch: str,
-    commit_hash: str,
-    overwrite: bool,
-    silent: bool = False
-) -> bool:
-    if not silent:
-        print(f"Downloading artifact: {benchmark_name}-{branch}-{commit_hash[:8]}.json.")
-
-    artifact_path = f'reports/externalTests/{benchmark_name}.json'
-
-    if artifact_path not in artifacts:
-        if not silent:
-            print(f"Missing artifact: {artifact_path}.")
-        return False
-
-    download_file(
-        artifacts[artifact_path]['url'],
-        Path(f'{benchmark_name}-{branch}-{commit_hash[:8]}.json'),
-        overwrite,
-    )
-
-    return True
-
-
-def download_benchmarks(
-    branch: Optional[str],
-    pull_request_id: Optional[int],
-    base_of_pr: Optional[int],
-    ignore_commit_hash: bool = False,
-    overwrite: bool = False,
-    debug_requests: bool = False,
-    silent: bool = False,
-) -> Status:
-    github = Github('ethereum/solidity', debug_requests)
-    circleci = CircleCI('ethereum/solidity', debug_requests)
-
-    expected_commit_hash = None
-    if branch is None and pull_request_id is None and base_of_pr is None:
-        branch = git_current_branch()
-        expected_commit_hash = git_commit_hash()
-    elif branch is not None:
-        expected_commit_hash = git_commit_hash(branch)
-    elif pull_request_id is not None:
-        pr_info = github.pull_request(pull_request_id)
-        branch = pr_info['head']['ref']
-        expected_commit_hash = pr_info['head']['sha']
-    elif base_of_pr is not None:
-        pr_info = github.pull_request(base_of_pr)
-        branch = pr_info['base']['ref']
-        expected_commit_hash = pr_info['base']['sha']
-
-    if not silent:
-        print(
-            f"Looking for pipelines that ran on branch {branch}" +
-            (f", commit {expected_commit_hash}." if not ignore_commit_hash else " (any commit).")
-        )
-
-    pipeline = circleci.latest_item(circleci.pipelines(
-        branch,
-        expected_commit_hash if not ignore_commit_hash else None,
-        # Skip nightly workflows. They don't have the c_ext_benchmarks job and even if they did,
-        # they would likely be running a different set of external tests.
-        excluded_trigger_types=['schedule'],
-    ))
-    if pipeline is None:
-        raise RuntimeError("No matching pipelines found.")
-
-    actual_commit_hash = pipeline['vcs']['revision']
-    workflow_id = circleci.latest_item(circleci.workflows(pipeline['id']))['id']
-    benchmark_collector_job = circleci.job(workflow_id, 'c_ext_benchmarks', require_success=True)
-
-    artifacts = circleci.artifacts(int(benchmark_collector_job['job_number']))
-
-    got_summary = download_benchmark_artifact(artifacts, 'summarized-benchmarks', branch, actual_commit_hash, overwrite, silent)
-    got_full = download_benchmark_artifact(artifacts, 'all-benchmarks', branch, actual_commit_hash, overwrite, silent)
-
-    return Status.OK if got_summary and got_full else Status.NO_BENCHMARK
-
-
-def main():
-    try:
-        options = process_commandline()
-        return download_benchmarks(
-            options.branch,
-            options.pull_request_id,
-            options.base_of_pr,
-            options.ignore_commit_hash,
-            options.overwrite,
-            options.debug_requests,
-        ).value
-    except JobNotSuccessful as exception:
-        print(f"[ERROR] {exception}", file=sys.stderr)
-        if not exception.job_finished:
-            print("Please wait for the workflow to finish and try again.", file=sys.stderr)
-            return Status.PENDING.value
-        else:
-            print("Benchmarks from this run of the pipeline are not available.", file=sys.stderr)
-            return Status.NO_BENCHMARK.value
-    except APIHelperError as exception:
-        print(f"[ERROR] {exception}", file=sys.stderr)
-        return Status.ERROR.value
-    except requests.exceptions.HTTPError as exception:
-        print(f"[ERROR] {exception}", file=sys.stderr)
-        return Status.ERROR.value
-    except RuntimeError as exception:
-        print(f"[ERROR] {exception}", file=sys.stderr)
-        return Status.ERROR.value
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/scripts/externalTests/merge_benchmarks.sh b/scripts/externalTests/merge_benchmarks.sh
deleted file mode 100755
index 3e2d7318c7bf..000000000000
--- a/scripts/externalTests/merge_benchmarks.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# Reads multiple individual benchmark reports produced by scripts from
-# test/externalTests/ from standard input and creates a combined report.
-#
-# Usage:
-#    <script name>.sh < <CONCATENATED_REPORTS>
-#
-# CONCATENATED_REPORTS: JSON report files concatenated into a single stream (e.g. using cat).
-#
-# Example:
-#    cat reports/externalTests/benchmark-*.json | <script name>.sh
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2021 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -euo pipefail
-
-# We expect a series of dicts of the form {"<project>": {"<preset>": {...}}}.
-# Unfortunately jq's built-in `add` filter can't handle nested dicts and
-# would just overwrite values sharing a project name instead of merging them.
-
-# This is done by first grouping the dicts into an array of the form
-# [
-#     [{"key": "<project1>", "value": {"<preset1>": {...}}}, {"key": "<project1>", "value": {"<preset2>": {...}}, ...],
-#     [{"key": "<project2>", "value": {"<preset1>": {...}}}, {"key": "<project2>", "value": {"<preset2>": {...}}, ...],
-#     ...
-# ]
-# and then using reduce() on each group sharing the same project name to convert it into a
-# dict having preset names as keys.
-jq --slurp  --indent 4 --sort-keys '
-    map(to_entries[]) |
-    group_by(.key) |
-    map({
-        (.[0].key): (
-            reduce (.[].value | to_entries[]) as {$key, $value} (
-                {}; . + {
-                    ($key): $value
-                }
-            )
-        )
-    }) |
-    add
-'
diff --git a/scripts/externalTests/parse_eth_gas_report.py b/scripts/externalTests/parse_eth_gas_report.py
deleted file mode 100755
index c5cc58e58773..000000000000
--- a/scripts/externalTests/parse_eth_gas_report.py
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/env python3
-# coding=utf-8
-
-from dataclasses import asdict, dataclass, field
-from typing import Dict, Optional, Tuple
-import json
-import re
-import sys
-
-REPORT_HEADER_REGEX = re.compile(r'''
-    ^[|\s]+ Solc[ ]version:\s*(?P<solc_version>[\w\d.]+)
-    [|\s]+ Optimizer[ ]enabled:\s*(?P<optimize>[\w]+)
-    [|\s]+ Runs:\s*(?P<runs>[\d]+)
-    [|\s]+ Block[ ]limit:\s*(?P<block_limit>[\d]+)\s*gas
-    [|\s]+$
-''', re.VERBOSE)
-METHOD_HEADER_REGEX = re.compile(r'^[|\s]+Methods[|\s]+$')
-METHOD_COLUMN_HEADERS_REGEX = re.compile(r'''
-    ^[|\s]+ Contract
-    [|\s]+ Method
-    [|\s]+ Min
-    [|\s]+ Max
-    [|\s]+ Avg
-    [|\s]+ \#[ ]calls
-    [|\s]+ \w+[ ]\(avg\)
-    [|\s]+$
-''', re.VERBOSE)
-METHOD_ROW_REGEX = re.compile(r'''
-    ^[|\s]+ (?P<contract>[^|]+)
-    [|\s]+ (?P<method>[^|]+)
-    [|\s]+ (?P<min>[^|]+)
-    [|\s]+ (?P<max>[^|]+)
-    [|\s]+ (?P<avg>[^|]+)
-    [|\s]+ (?P<call_count>[^|]+)
-    [|\s]+ (?P<eur_avg>[^|]+)
-    [|\s]+$
-''', re.VERBOSE)
-FRAME_REGEX = re.compile(r'^[-|\s]+$')
-DEPLOYMENT_HEADER_REGEX = re.compile(r'^[|\s]+Deployments[|\s]+% of limit[|\s]+$')
-DEPLOYMENT_ROW_REGEX = re.compile(r'''
-    ^[|\s]+ (?P<contract>[^|]+)
-    [|\s]+ (?P<min>[^|]+)
-    [|\s]+ (?P<max>[^|]+)
-    [|\s]+ (?P<avg>[^|]+)
-    [|\s]+ (?P<percent_of_limit>[^|]+)\s*%
-    [|\s]+ (?P<eur_avg>[^|]+)
-    [|\s]+$
-''', re.VERBOSE)
-
-
-class ReportError(Exception):
-    pass
-
-class ReportValidationError(ReportError):
-    pass
-
-class ReportParsingError(Exception):
-    def __init__(self, message: str, line: str, line_number: int):
-        # pylint: disable=useless-super-delegation  # It's not useless, it adds type annotations.
-        super().__init__(message, line, line_number)
-
-    def __str__(self):
-        return f"Parsing error on line {self.args[2] + 1}: {self.args[0]}\n{self.args[1]}"
-
-
-@dataclass(frozen=True)
-class MethodGasReport:
-    min_gas: int
-    max_gas: int
-    avg_gas: int
-    call_count: int
-    total_gas: int = field(init=False)
-
-    def __post_init__(self):
-        object.__setattr__(self, 'total_gas', self.avg_gas * self.call_count)
-
-
-@dataclass(frozen=True)
-class ContractGasReport:
-    min_deployment_gas: Optional[int]
-    max_deployment_gas: Optional[int]
-    avg_deployment_gas: Optional[int]
-    methods: Optional[Dict[str, MethodGasReport]]
-    total_method_gas: int = field(init=False, default=0)
-
-    def __post_init__(self):
-        if self.methods is not None:
-            object.__setattr__(self, 'total_method_gas', sum(method.total_gas for method in self.methods.values()))
-
-
-@dataclass(frozen=True)
-class GasReport:
-    solc_version: str
-    optimize: bool
-    runs: int
-    block_limit: int
-    contracts: Dict[str, ContractGasReport]
-    total_method_gas: int = field(init=False)
-    total_deployment_gas: int = field(init=False)
-
-    def __post_init__(self):
-        object.__setattr__(self, 'total_method_gas', sum(
-            total_method_gas
-            for total_method_gas in (contract.total_method_gas for contract in self.contracts.values())
-            if total_method_gas is not None
-        ))
-        object.__setattr__(self, 'total_deployment_gas', sum(
-            contract.avg_deployment_gas
-            for contract in self.contracts.values()
-            if contract.avg_deployment_gas is not None
-        ))
-
-    def to_json(self):
-        return json.dumps(asdict(self), indent=4, sort_keys=True)
-
-
-def parse_bool(input_string: str) -> bool:
-    if input_string == 'true':
-        return True
-    elif input_string == 'false':
-        return True
-    else:
-        raise ValueError(f"Invalid boolean value: '{input_string}'")
-
-
-def parse_optional_int(input_string: str, default: Optional[int] = None) -> Optional[int]:
-    if input_string.strip() == '-':
-        return default
-
-    return int(input_string)
-
-
-def parse_report_header(line: str) -> Optional[dict]:
-    match = REPORT_HEADER_REGEX.match(line)
-    if match is None:
-        return None
-
-    return {
-        'solc_version': match.group('solc_version'),
-        'optimize': parse_bool(match.group('optimize')),
-        'runs': int(match.group('runs')),
-        'block_limit': int(match.group('block_limit')),
-    }
-
-
-def parse_method_row(line: str, line_number: int) -> Optional[Tuple[str, str, MethodGasReport]]:
-    match = METHOD_ROW_REGEX.match(line)
-    if match is None:
-        raise ReportParsingError("Expected a table row with method details.", line, line_number)
-
-    avg_gas = parse_optional_int(match['avg'])
-    call_count = int(match['call_count'])
-
-    if avg_gas is None and call_count == 0:
-        # No calls, no gas values. Uninteresting. Skip the row.
-        return None
-
-    return (
-        match['contract'].strip(),
-        match['method'].strip(),
-        MethodGasReport(
-            min_gas=parse_optional_int(match['min'], avg_gas),
-            max_gas=parse_optional_int(match['max'], avg_gas),
-            avg_gas=avg_gas,
-            call_count=call_count,
-        )
-    )
-
-
-def parse_deployment_row(line: str, line_number: int) -> Tuple[str, int, int, int]:
-    match = DEPLOYMENT_ROW_REGEX.match(line)
-    if match is None:
-        raise ReportParsingError("Expected a table row with deployment details.", line, line_number)
-
-    return (
-        match['contract'].strip(),
-        parse_optional_int(match['min'].strip()),
-        parse_optional_int(match['max'].strip()),
-        int(match['avg'].strip()),
-    )
-
-
-def preprocess_unicode_frames(input_string: str) -> str:
-    # The report has a mix of normal pipe chars and its unicode variant.
-    # Let's just replace all frame chars with normal pipes for easier parsing.
-    return input_string.replace('\u2502', '|').replace('·', '|')
-
-
-def parse_report(rst_report: str) -> GasReport:
-    report_params = None
-    methods_by_contract = {}
-    deployment_costs = {}
-    expected_row_type = None
-
-    for line_number, line in enumerate(preprocess_unicode_frames(rst_report).splitlines()):
-        try:
-            if (
-                line.strip() == "" or
-                FRAME_REGEX.match(line) is not None or
-                METHOD_COLUMN_HEADERS_REGEX.match(line) is not None
-            ):
-                continue
-            if METHOD_HEADER_REGEX.match(line) is not None:
-                expected_row_type = 'method'
-                continue
-            if DEPLOYMENT_HEADER_REGEX.match(line) is not None:
-                expected_row_type = 'deployment'
-                continue
-
-            new_report_params = parse_report_header(line)
-            if new_report_params is not None:
-                if report_params is not None:
-                    raise ReportParsingError("Duplicate report header.", line, line_number)
-
-                report_params = new_report_params
-                continue
-
-            if expected_row_type == 'method':
-                parsed_row = parse_method_row(line, line_number)
-                if parsed_row is None:
-                    continue
-
-                (contract, method, method_report) = parsed_row
-
-                if contract not in methods_by_contract:
-                    methods_by_contract[contract] = {}
-
-                if method in methods_by_contract[contract]:
-                    # Report must be generated with full signatures for method names to be unambiguous.
-                    raise ReportParsingError(f"Duplicate method row for '{contract}.{method}'.", line, line_number)
-
-                methods_by_contract[contract][method] = method_report
-            elif expected_row_type == 'deployment':
-                (contract, min_gas, max_gas, avg_gas) = parse_deployment_row(line, line_number)
-
-                if contract in deployment_costs:
-                    raise ReportParsingError(f"Duplicate contract deployment row for '{contract}'.", line, line_number)
-
-                deployment_costs[contract] = (min_gas, max_gas, avg_gas)
-            else:
-                assert expected_row_type is None
-                raise ReportParsingError("Found data row without a section header.", line, line_number)
-
-        except ValueError as error:
-            raise ReportParsingError(error.args[0], line, line_number) from error
-
-    if report_params is None:
-        raise ReportValidationError("Report header not found.")
-
-    report_params['contracts'] = {
-        contract: ContractGasReport(
-            min_deployment_gas=deployment_costs.get(contract, (None, None, None))[0],
-            max_deployment_gas=deployment_costs.get(contract, (None, None, None))[1],
-            avg_deployment_gas=deployment_costs.get(contract, (None, None, None))[2],
-            methods=methods_by_contract.get(contract),
-        )
-        for contract in methods_by_contract.keys() | deployment_costs.keys()
-    }
-
-    return GasReport(**report_params)
-
-
-if __name__ == "__main__":
-    try:
-        report = parse_report(sys.stdin.read())
-        print(report.to_json())
-    except ReportError as exception:
-        print(f"{exception}", file=sys.stderr)
-        sys.exit(1)
diff --git a/scripts/externalTests/runners/base.py b/scripts/externalTests/runners/base.py
deleted file mode 100644
index a79ed53442e9..000000000000
--- a/scripts/externalTests/runners/base.py
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env python3
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-# ------------------------------------------------------------------------------
-
-import os
-import subprocess
-from abc import ABCMeta
-from abc import abstractmethod
-from dataclasses import dataclass
-from dataclasses import field
-from pathlib import Path
-from shutil import rmtree
-from tempfile import mkdtemp
-from textwrap import dedent
-from typing import List
-from typing import Set
-
-from test_helpers import download_project
-from test_helpers import get_solc_short_version
-from test_helpers import parse_command_line
-from test_helpers import parse_custom_presets
-from test_helpers import parse_solc_version
-from test_helpers import replace_version_pragmas
-from test_helpers import settings_from_preset
-from test_helpers import SettingsPreset
-
-CURRENT_EVM_VERSION: str = "shanghai"
-
-@dataclass
-class TestConfig:
-    name: str
-    repo_url: str
-    ref_type: str
-    ref: str
-    compile_only_presets: List[SettingsPreset] = field(default_factory=list)
-    settings_presets: List[SettingsPreset] = field(default_factory=lambda: list(SettingsPreset))
-    evm_version: str = field(default=CURRENT_EVM_VERSION)
-
-    def selected_presets(self) -> Set[SettingsPreset]:
-        return set(self.compile_only_presets + self.settings_presets)
-
-
-class BaseRunner(metaclass=ABCMeta):
-    config: TestConfig
-    solc_binary_type: str
-    solc_binary_path: Path
-    presets: Set[SettingsPreset]
-
-    def __init__(self, argv, config: TestConfig):
-        args = parse_command_line(f"{config.name} external tests", argv)
-        self.config = config
-        self.solc_binary_type = args.solc_binary_type
-        self.solc_binary_path = args.solc_binary_path
-        self.presets = parse_custom_presets(args.selected_presets) if args.selected_presets else config.selected_presets()
-        self.env = os.environ.copy()
-        self.tmp_dir = mkdtemp(prefix=f"ext-test-{config.name}-")
-        self.test_dir = Path(self.tmp_dir) / "ext"
-
-    def setup_solc(self) -> str:
-        if self.solc_binary_type == "solcjs":
-            # TODO: add support to solc-js
-            raise NotImplementedError()
-        print("Setting up solc...")
-        solc_version_output = subprocess.check_output(
-            [self.solc_binary_path, "--version"],
-            shell=False,
-            encoding="utf-8"
-        ).split(":")[1]
-        return parse_solc_version(solc_version_output)
-
-    @staticmethod
-    def enter_test_dir(fn):
-        """Run a function inside the test directory"""
-
-        previous_dir = os.getcwd()
-        def f(self, *args, **kwargs):
-            try:
-                assert self.test_dir is not None
-                os.chdir(self.test_dir)
-                return fn(self, *args, **kwargs)
-            finally:
-                # Restore the previous directory after execute fn
-                os.chdir(previous_dir)
-        return f
-
-    def setup_environment(self):
-        """Configure the project build environment"""
-        print("Configuring Runner building environment...")
-        replace_version_pragmas(self.test_dir)
-
-    @enter_test_dir
-    def clean(self):
-        """Clean temporary directories"""
-        rmtree(self.tmp_dir)
-
-    @enter_test_dir
-    @abstractmethod
-    def configure(self):
-        raise NotImplementedError()
-
-    @enter_test_dir
-    @abstractmethod
-    def compile(self, preset: SettingsPreset):
-        raise NotImplementedError()
-
-    @enter_test_dir
-    @abstractmethod
-    def run_test(self):
-        raise NotImplementedError()
-
-def run_test(runner: BaseRunner):
-    print(f"Testing {runner.config.name}...\n===========================")
-    print(f"Selected settings presets: {' '.join(p.value for p in runner.presets)}")
-
-    # Configure solc compiler
-    solc_version = runner.setup_solc()
-    print(f"Using compiler version {solc_version}")
-
-    # Download project
-    download_project(runner.test_dir, runner.config.repo_url, runner.config.ref_type, runner.config.ref)
-
-    # Configure run environment
-    runner.setup_environment()
-
-    # Configure TestRunner instance
-    print(dedent(f"""\
-        Configuring runner's profiles with:
-        -------------------------------------
-        Binary type: {runner.solc_binary_type}
-        Compiler path: {runner.solc_binary_path}
-        -------------------------------------
-    """))
-    runner.configure()
-    for preset in runner.presets:
-        print("Running compile function...")
-        settings = settings_from_preset(preset, runner.config.evm_version)
-        print(dedent(f"""\
-            -------------------------------------
-            Settings preset: {preset.value}
-            Settings: {settings}
-            EVM version: {runner.config.evm_version}
-            Compiler version: {get_solc_short_version(solc_version)}
-            Compiler version (full): {solc_version}
-            -------------------------------------
-        """))
-        runner.compile(preset)
-        # TODO: COMPILE_ONLY should be a command-line option
-        if os.environ.get("COMPILE_ONLY") == "1" or preset in runner.config.compile_only_presets:
-            print("Skipping test function...")
-        else:
-            print("Running test function...")
-            runner.run_test()
-        # TODO: store_benchmark_report
-    runner.clean()
-    print("Done.")
diff --git a/scripts/externalTests/runners/foundry.py b/scripts/externalTests/runners/foundry.py
deleted file mode 100644
index 0b171250f77e..000000000000
--- a/scripts/externalTests/runners/foundry.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-# ------------------------------------------------------------------------------
-
-import os
-import re
-import subprocess
-from shutil import which
-from textwrap import dedent
-from typing import Optional
-
-from runners.base import BaseRunner
-from test_helpers import SettingsPreset
-from test_helpers import settings_from_preset
-
-def run_forge_command(command: str, env: Optional[dict] = None):
-    subprocess.run(
-        command.split(),
-        env=env if env is not None else os.environ.copy(),
-        check=True
-    )
-
-
-class FoundryRunner(BaseRunner):
-    """Configure and run Foundry-based projects"""
-
-    FOUNDRY_CONFIG_FILE = "foundry.toml"
-
-    def setup_environment(self):
-        super().setup_environment()
-        if which("forge") is None:
-            raise RuntimeError("Forge not found.")
-
-    @staticmethod
-    def profile_name(preset: SettingsPreset):
-        """Returns foundry profile name"""
-        # Replace - or + by underscore to avoid invalid toml syntax
-        return re.sub(r"(\-|\+)+", "_", preset.value)
-
-    @staticmethod
-    def profile_section(profile_fields: dict) -> str:
-        return dedent("""\
-            [profile.{name}]
-            gas_reports = ["*"]
-            auto_detect_solc = false
-            solc = "{solc}"
-            evm_version = "{evm_version}"
-            optimizer = {optimizer}
-            via_ir = {via_ir}
-
-            [profile.{name}.optimizer_details]
-            yul = {yul}
-        """).format(**profile_fields)
-
-    @BaseRunner.enter_test_dir
-    def configure(self):
-        """Configure forge tests profiles"""
-
-        profiles = []
-        for preset in self.presets:
-            settings = settings_from_preset(preset, self.config.evm_version)
-            profiles.append(self.profile_section({
-                "name": self.profile_name(preset),
-                "solc": self.solc_binary_path,
-                "evm_version": self.config.evm_version,
-                "optimizer": str(settings["optimizer"]["enabled"]).lower(),
-                "via_ir": str(settings["viaIR"]).lower(),
-                "yul": str(settings["optimizer"]["details"]["yul"]).lower(),
-            }))
-
-        with open(
-            file=self.test_dir / self.FOUNDRY_CONFIG_FILE,
-            mode="a",
-            encoding="utf-8",
-        ) as f:
-            for profile in profiles:
-                f.write(profile)
-
-        run_forge_command("forge install", self.env)
-
-    @BaseRunner.enter_test_dir
-    def compile(self, preset: SettingsPreset):
-        """Compile project"""
-
-        # Set the Foundry profile environment variable
-        self.env.update({"FOUNDRY_PROFILE": self.profile_name(preset)})
-        run_forge_command("forge build", self.env)
-
-    @BaseRunner.enter_test_dir
-    def run_test(self):
-        """Run project tests"""
-
-        run_forge_command("forge test --gas-report", self.env)
diff --git a/scripts/externalTests/summarize_benchmarks.sh b/scripts/externalTests/summarize_benchmarks.sh
deleted file mode 100755
index 1b84800b22a1..000000000000
--- a/scripts/externalTests/summarize_benchmarks.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# Reads a combined benchmark report from standard input and outputs an abbreviated
-# report containing only totals. Can handle individual reports coming directly
-# from scripts in test/externalTests/ as well as combined report from merge_benchmarks.sh.
-#
-# Usage:
-#    <script name>.sh < <CONCATENATED_REPORTS>
-#
-# CONCATENATED_REPORTS: JSON report files concatenated into a single stream (e.g. using cat).
-#
-# Example:
-#    cat reports/externalTests/benchmark-*.json | <script name>.sh
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2021 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -euo pipefail
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-# Iterates over presets in a dict of the form {"<project>": {"<preset>": {...}}} and for each
-# one preserves only the few keys with totals that we want to see in the summary.
-exec "${REPO_ROOT}/scripts/externalTests/merge_benchmarks.sh" | jq --indent 4 --sort-keys '
-    with_entries({
-        key: .key,
-        value: .value | with_entries({
-            key: .key,
-            value: {
-                bytecode_size: .value.total_bytecode_size,
-                method_gas: .value.gas.total_method_gas,
-                deployment_gas: .value.gas.total_deployment_gas,
-                version: .value.project.version
-            }
-        })
-    })
-'
diff --git a/scripts/externalTests/test_helpers.py b/scripts/externalTests/test_helpers.py
deleted file mode 100644
index 9a573d50adf0..000000000000
--- a/scripts/externalTests/test_helpers.py
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/env python3
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-# ------------------------------------------------------------------------------
-
-import os
-import re
-import subprocess
-import sys
-from argparse import ArgumentParser
-from enum import Enum
-from pathlib import Path
-from typing import List
-from typing import Set
-
-# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
-# pragma pylint: disable=import-error,wrong-import-position
-PROJECT_ROOT = Path(__file__).parents[2]
-sys.path.insert(0, f"{PROJECT_ROOT}/scripts/common")
-
-from git_helpers import git_commit_hash
-
-SOLC_FULL_VERSION_REGEX = re.compile(r"^[a-zA-Z: ]*(.*)$")
-SOLC_SHORT_VERSION_REGEX = re.compile(r"^([0-9.]+).*\+|\-$")
-
-
-class SettingsPreset(Enum):
-    LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
-    IR_NO_OPTIMIZE = 'ir-no-optimize'
-    LEGACY_OPTIMIZE_EVM_ONLY = 'legacy-optimize-evm-only'
-    IR_OPTIMIZE_EVM_ONLY = 'ir-optimize-evm-only'
-    LEGACY_OPTIMIZE_EVM_YUL = 'legacy-optimize-evm+yul'
-    IR_OPTIMIZE_EVM_YUL = 'ir-optimize-evm+yul'
-
-
-def compiler_settings(evm_version: str, via_ir: bool = False, optimizer: bool = False, yul: bool = False) -> dict:
-    return {
-        "optimizer": {"enabled": optimizer, "details": {"yul": yul}},
-        "evmVersion": evm_version,
-        "viaIR": via_ir,
-    }
-
-
-def settings_from_preset(preset: SettingsPreset, evm_version: str) -> dict:
-    return {
-        SettingsPreset.LEGACY_NO_OPTIMIZE:       compiler_settings(evm_version),
-        SettingsPreset.IR_NO_OPTIMIZE:           compiler_settings(evm_version, via_ir=True),
-        SettingsPreset.LEGACY_OPTIMIZE_EVM_ONLY: compiler_settings(evm_version, optimizer=True),
-        SettingsPreset.IR_OPTIMIZE_EVM_ONLY:     compiler_settings(evm_version, via_ir=True, optimizer=True),
-        SettingsPreset.LEGACY_OPTIMIZE_EVM_YUL:  compiler_settings(evm_version, optimizer=True, yul=True),
-        SettingsPreset.IR_OPTIMIZE_EVM_YUL:      compiler_settings(evm_version, via_ir=True, optimizer=True, yul=True),
-    }[preset]
-
-
-def parse_custom_presets(presets: List[str]) -> Set[SettingsPreset]:
-    return {SettingsPreset(p) for p in presets}
-
-def parse_command_line(description: str, args: List[str]):
-    arg_parser = ArgumentParser(description)
-    arg_parser.add_argument(
-        "solc_binary_type",
-        metavar="solc-binary-type",
-        type=str,
-        default="native",
-        choices=["native", "solcjs"],
-        help="""Solidity compiler binary type""",
-    )
-    arg_parser.add_argument(
-        "solc_binary_path",
-        metavar="solc-binary-path",
-        type=Path,
-        help="""Path to solc binary""",
-    )
-    arg_parser.add_argument(
-        "selected_presets",
-        metavar="selected-presets",
-        help="""List of compiler settings presets""",
-        nargs='*',
-    )
-    return arg_parser.parse_args(args)
-
-
-def download_project(test_dir: Path, repo_url: str, ref_type: str = "branch", ref: str = "master"):
-    assert ref_type in ("commit", "branch", "tag")
-
-    print(f"Cloning {ref_type} {ref} of {repo_url}...")
-    if ref_type == "commit":
-        os.mkdir(test_dir)
-        os.chdir(test_dir)
-        subprocess.run(["git", "init"], check=True)
-        subprocess.run(["git", "remote", "add", "origin", repo_url], check=True)
-        subprocess.run(["git", "fetch", "--depth", "1", "origin", ref], check=True)
-        subprocess.run(["git", "reset", "--hard", "FETCH_HEAD"], check=True)
-    else:
-        os.chdir(test_dir.parent)
-        subprocess.run(["git", "clone", "--no-progress", "--depth", "1", repo_url, "-b", ref, test_dir.resolve()], check=True)
-        if not test_dir.exists():
-            raise RuntimeError("Failed to clone the project.")
-        os.chdir(test_dir)
-
-    if (test_dir / ".gitmodules").exists():
-        subprocess.run(["git", "submodule", "update", "--init"], check=True)
-
-    print(f"Current commit hash: {git_commit_hash()}")
-
-
-def parse_solc_version(solc_version_string: str) -> str:
-    solc_version_match = re.search(SOLC_FULL_VERSION_REGEX, solc_version_string)
-    if solc_version_match is None:
-        raise RuntimeError(f"Solc version could not be found in: {solc_version_string}.")
-    return solc_version_match.group(1)
-
-
-def get_solc_short_version(solc_full_version: str) -> str:
-    solc_short_version_match = re.search(SOLC_SHORT_VERSION_REGEX, solc_full_version)
-    if solc_short_version_match is None:
-        raise RuntimeError(f"Error extracting short version string from: {solc_full_version}.")
-    return solc_short_version_match.group(1)
-
-
-def store_benchmark_report(self):
-    raise NotImplementedError()
-
-
-def replace_version_pragmas(test_dir: Path):
-    """
-    Replace fixed-version pragmas (part of Consensys best practice).
-    Include all directories to also cover node dependencies.
-    """
-    print("Replacing fixed-version pragmas...")
-    for source in test_dir.glob("**/*.sol"):
-        content = source.read_text(encoding="utf-8")
-        content = re.sub(r"pragma solidity [^;]+;", r"pragma solidity >=0.0;", content)
-        with open(source, "w", encoding="utf-8") as f:
-            f.write(content)
diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh
deleted file mode 100755
index 8a25f3790644..000000000000
--- a/scripts/externalTests/update_external_repos.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Clones external test repositories from solidity-external-tests organization
-# and for each of them pulls latest upstream changes from the main branch and
-# pushes them to our fork.
-#
-# The script assumes that the current user has write access to
-# solidity-external-tests and that git is configured to be able to push there
-# without specifying the password (e.g. with the key already unlocked and loaded
-# into ssh-agent). Otherwise git will keep asking for password for each repository.
-#
-# Usage:
-#
-#    ./update_external_repos.sh [<target_dir>]
-#
-# <target_dir>: directory where the clones of the repositories are stored.
-#               If omitted, a temporary directory will be created.
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -euo pipefail
-
-target_dir="${1:-$(mktemp -d -t update_external_repos_XXXXXX)}"
-
-function clone_repo
-{
-    local upstream_user="$1"
-    local upstream_repo="$2"
-    local fork_name="${3:-$upstream_repo}"
-
-    if [[ ! -d $fork_name ]]; then
-        git clone "git@github.com:solidity-external-tests/${fork_name}.git" --no-checkout
-    else
-        echo "Reusing existing repo: ${fork_name}."
-    fi
-
-    pushd "$fork_name" > /dev/null
-    git remote rm upstream 2> /dev/null || true
-    git remote add upstream "https://github.com/${upstream_user}/${upstream_repo}"
-    popd > /dev/null
-}
-
-function sync_branch
-{
-    local fork_name="$1"
-    local branch="$2"
-
-    echo "${fork_name}: syncing branch ${branch}..."
-    pushd "$fork_name" > /dev/null
-    git fetch upstream "$branch" --quiet
-    git checkout -B "$branch" --track "upstream/$branch" --quiet
-    git merge "upstream/${branch}" --ff-only --quiet
-    git push origin "$branch"
-    popd > /dev/null
-}
-
-mkdir -p "$target_dir"
-
-echo "Entering ${target_dir}"
-cd "$target_dir"
-
-clone_repo brinktrade        brink-core
-clone_repo dapphub           dappsys-monolithic
-clone_repo element-fi        elf-contracts
-clone_repo ensdomains        ens-contracts
-clone_repo euler-xyz         euler-contracts
-clone_repo cowprotocol       contracts                 gp2-contracts
-clone_repo gnosis            mock-contract
-clone_repo gnosis            util-contracts
-clone_repo JoinColony        colonyNetwork
-clone_repo mycelium-ethereum perpetual-pools-contracts
-clone_repo OpenZeppelin      openzeppelin-contracts
-clone_repo paulrberg         prb-math
-clone_repo pooltogether      v4-core                   pooltogether-v4-core
-clone_repo safe-global       safe-contracts
-clone_repo smartcontractkit  chainlink
-clone_repo sushiswap         trident
-clone_repo Uniswap           v2-core                   uniswap-v2-core
-clone_repo Uniswap           v3-core                   uniswap-v3-core
-clone_repo wighawag          bleeps
-clone_repo yieldprotocol     yield-liquidator-v2
-
-sync_branch brink-core                master
-sync_branch dappsys-monolithic        master
-sync_branch elf-contracts             main
-sync_branch ens-contracts             master
-sync_branch euler-contracts           master
-sync_branch gp2-contracts             main
-sync_branch mock-contract             master
-sync_branch util-contracts            main
-sync_branch colonyNetwork             develop
-sync_branch perpetual-pools-contracts develop
-sync_branch openzeppelin-contracts    master
-sync_branch prb-math                  main
-sync_branch pooltogether-v4-core      master
-sync_branch safe-contracts            main
-sync_branch chainlink                 develop
-sync_branch trident                   master
-sync_branch uniswap-v2-core           master
-sync_branch uniswap-v3-core           main
-sync_branch bleeps                    main
-sync_branch yield-liquidator-v2       master
diff --git a/scripts/extract_test_cases.py b/scripts/extract_test_cases.py
deleted file mode 100755
index c43cabce25cf..000000000000
--- a/scripts/extract_test_cases.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-#
-# This script reads C++ or RST source files and writes all
-# multi-line strings into individual files.
-# This can be used to extract the Solidity test cases
-# into files for e.g. fuzz testing as
-# scripts/isolate_tests.py test/libsolidity/*
-
-import sys
-import re
-
-def extract_test_cases(_path):
-    with open(_path, mode='rb', encoding='utf8') as f:
-        lines = f.read().splitlines()
-
-    inside = False
-    delimiter = ''
-    test = ''
-
-    ctr = 1
-    test_name = ''
-
-    for l in lines:
-        if inside:
-            if l.strip().endswith(')' + delimiter + '";'):
-                with open(f'{ctr:03d}_{test_name}.sol', mode='wb', encoding='utf8') as f:
-                    f.write(test)
-                ctr += 1
-                inside = False
-                test = ''
-            else:
-                l = re.sub('^\t\t', '', l)
-                l = l.replace('\t', '        ')
-                test += l + '\n'
-        else:
-            m = re.search(r'BOOST_AUTO_TEST_CASE\(([^(]*)\)', l.strip())
-            if m:
-                test_name = m.group(1)
-            m = re.search(r'R"([^(]*)\($', l.strip())
-            if m:
-                inside = True
-                delimiter = m.group(1)
-
-if __name__ == '__main__':
-    extract_test_cases(sys.argv[1])
diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
deleted file mode 100755
index 234d42df0c0e..000000000000
--- a/scripts/gas_diff_stats.py
+++ /dev/null
@@ -1,140 +0,0 @@
-"""A script to collect gas statistics and print it.
-
-Useful to summarize gas differences to semantic tests for a PR / branch.
-
-Dependencies: Parsec (https://pypi.org/project/parsec/) and Tabulate
-(https://pypi.org/project/tabulate/)
-
-  pip install parsec tabulate
-
-Run from root project dir.
-
-  python3 scripts/gas_diff_stats.py
-
-Note that the changes to semantic tests have to be committed.
-
-Assumes that there is a remote named ``origin`` pointing to the Solidity github
-repository. The changes are compared against ``origin/develop``.
-
-"""
-import subprocess
-from pathlib import Path
-from enum import Enum
-from parsec import generate, ParseError, regex, string
-from tabulate import tabulate
-
-class Kind(Enum):
-    IrOptimized = 1
-    Legacy = 2
-    LegacyOptimized = 3
-
-class Diff(Enum):
-    Minus = 1
-    Plus = 2
-
-minus = string("-").result(Diff.Minus)
-plus = string("+").result(Diff.Plus)
-
-space = string(" ")
-comment = string("//")
-colon = string(":")
-
-gas_ir_optimized = string("gas irOptimized").result(Kind.IrOptimized)
-gas_legacy_optimized = string("gas legacyOptimized").result(Kind.LegacyOptimized)
-gas_legacy = string("gas legacy").result(Kind.Legacy)
-
-def number() -> int:
-    """Parse number."""
-    return regex(r"([0-9]*)").parsecmap(int)
-
-@generate
-def diff_string() -> (Kind, Diff, int):
-    """Usage: diff_string.parse(string)
-
-    Example string:
-
-    -// gas irOptimized: 138070
-
-    """
-    diff_kind = yield minus | plus
-    yield comment
-    yield space
-    codegen_kind = yield gas_ir_optimized ^ gas_legacy_optimized ^ gas_legacy
-    yield colon
-    yield space
-    val = yield number()
-    return (diff_kind, codegen_kind, val)
-
-def collect_statistics(lines) -> (int, int, int, int, int, int):
-    """Returns
-
-    (old_ir_optimized, old_legacy_optimized, old_legacy, new_ir_optimized,
-    new_legacy_optimized, new_legacy)
-
-    All the values in the same file (in the diff) are summed up.
-
-    """
-    if not lines:
-        raise RuntimeError("Empty list")
-
-    def try_parse(line):
-        try:
-            return diff_string.parse(line)
-        except ParseError:
-            pass
-        return None
-
-    out = [parsed for line in lines if (parsed := try_parse(line)) is not None]
-    diff_kinds = [Diff.Minus, Diff.Plus]
-    codegen_kinds = [Kind.IrOptimized, Kind.LegacyOptimized, Kind.Legacy]
-    return tuple(
-        sum(
-            val
-            for (diff_kind, codegen_kind, val) in out
-            if diff_kind == _diff_kind and codegen_kind == _codegen_kind
-        )
-        for _diff_kind in diff_kinds
-        for _codegen_kind in codegen_kinds
-    )
-
-def semantictest_statistics():
-    """Prints the tabulated statistics that can be pasted in github."""
-    def try_parse_git_diff(fname):
-        try:
-            diff_output = subprocess.check_output(
-                "git diff --unified=0 origin/develop HEAD " + fname,
-                shell=True,
-                universal_newlines=True
-            ).splitlines()
-            if diff_output:
-                return collect_statistics(diff_output)
-        except subprocess.CalledProcessError as e:
-            print("Error in the git diff:")
-            print(e.output)
-        return None
-    def stat(old, new):
-        return ((new - old) / old) * 100  if old else 0
-
-    table = []
-
-    for path in Path("test/libsolidity/semanticTests").rglob("*.sol"):
-        fname = path.as_posix()
-        parsed = try_parse_git_diff(fname)
-        if parsed is None:
-            continue
-        ir_optimized = stat(parsed[0], parsed[3])
-        legacy_optimized = stat(parsed[1], parsed[4])
-        legacy = stat(parsed[2], parsed[5])
-        fname = fname.split('/', 3)[-1]
-        table += [map(str, [fname, ir_optimized, legacy_optimized, legacy])]
-
-    if table:
-        print("<details><summary>Click for a table of gas differences</summary>\n")
-        table_header = ["File name", "IR-optimized (%)", "Legacy-Optimized (%)", "Legacy (%)"]
-        print(tabulate(table, headers=table_header, tablefmt="github"))
-        print("</details>")
-    else:
-        print("No differences found.")
-
-if __name__ == "__main__":
-    semantictest_statistics()
diff --git a/scripts/get_nightly_version.sh b/scripts/get_nightly_version.sh
deleted file mode 100755
index 48e953966d08..000000000000
--- a/scripts/get_nightly_version.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Prints the exact version string that would be used to describe a nightly
-# build of the compiler.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2017 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-script_dir="$(dirname "$0")"
-
-solidity_version=$("${script_dir}/get_version.sh")
-last_commit_timestamp=$(git log -1 --date=iso --format=%ad HEAD)
-last_commit_date=$(date --date="$last_commit_timestamp" --utc +%Y.%-m.%-d)
-last_commit_hash=$(git rev-parse --short=8 HEAD)
-
-echo "v${solidity_version}-nightly.${last_commit_date}+commit.${last_commit_hash}"
diff --git a/scripts/get_version.sh b/scripts/get_version.sh
deleted file mode 100755
index e5f8615e722d..000000000000
--- a/scripts/get_version.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Prints version of the Solidity compiler that the source code corresponds to.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2017 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -eu
-
-version=$(sed -n -E -e 's/^\s*set\(PROJECT_VERSION "([0-9.]+)"\)\s*$/\1/p' "$(dirname "$0")/../CMakeLists.txt")
-
-# Sanity check. Sed does not fail if it does not find a match or finds more than one.
-[[ $version =~ ^[0-9.]+$ ]] || { echo "Failed to find version in CMakeLists.txt"; exit 1; }
-
-echo "$version"
diff --git a/scripts/install_cmake.sh b/scripts/install_cmake.sh
deleted file mode 100755
index 0533de7234e4..000000000000
--- a/scripts/install_cmake.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env sh
-
-# This script downloads the CMake binary and installs it in ~/.local directory
-# (the cmake executable will be in ~/.local/bin).
-# This is mostly suitable for CIs, not end users.
-
-set -eu
-
-VERSION_MAJOR=3
-VERSION_MINOR=15
-VERSION_MICRO=2
-VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_MICRO
-PREFIX="/usr/local"
-
-OS=$(uname -s)
-case $OS in
-Linux)  SHA256=f8cbec2abc433938bd9378b129d1d288bb33b8b5a277afe19644683af6e32a59;;
-Darwin) SHA256=7ec056d641b8cbea98b220efdcc99da1991758a370063dcac3a0cd388d6b30b6;;
-esac
-
-BIN=$PREFIX/bin
-
-PATH=$PREFIX/bin:$PATH
-
-if test -f $BIN/cmake && ($BIN/cmake --version | grep -q "$VERSION"); then
-    echo "CMake $VERSION already installed in $BIN"
-else
-    FILE=cmake-$VERSION-$OS-x86_64.tar.gz
-    URL=https://cmake.org/files/v$VERSION_MAJOR.$VERSION_MINOR/$FILE
-    TMPFILE=$(mktemp --tmpdir "cmake-$VERSION-$OS-x86_64.XXXXXXXX.tar.gz")
-    echo "Downloading CMake ($URL)..."
-    wget "$URL" -O "$TMPFILE" -nv
-    if ! (shasum -a256 "$TMPFILE" | grep -q "$SHA256"); then
-        echo "Checksum mismatch ($TMPFILE)"
-        exit 1
-    fi
-    mkdir -p "$PREFIX"
-    tar xzf "$TMPFILE" -C "$PREFIX" --strip 1
-    rm "$TMPFILE"
-fi
diff --git a/scripts/install_deps.ps1 b/scripts/install_deps.ps1
deleted file mode 100644
index 26a9e116f054..000000000000
--- a/scripts/install_deps.ps1
+++ /dev/null
@@ -1,31 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-# Needed for Invoke-WebRequest to work via CI.
-$progressPreference = "silentlyContinue"
-
-if ( -not (Test-Path "$PSScriptRoot\..\deps\boost") ) {
-  New-Item -ItemType Directory -Force -Path "$PSScriptRoot\..\deps"
-
-  Invoke-WebRequest -URI "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-x86_64.zip" -OutFile cmake.zip
-  if ((Get-FileHash cmake.zip).Hash -ne "e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6") {
-    throw 'Downloaded CMake source package has wrong checksum.'
-  }
-  tar -xf cmake.zip
-  mv cmake-3.27.4-windows-x86_64 "$PSScriptRoot\..\deps\cmake"
-  Remove-Item cmake.zip
-
-  # FIXME: The default user agent results in Artifactory treating Invoke-WebRequest as a browser
-  # and serving it a page that requires JavaScript.
-  Invoke-WebRequest -URI "https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.zip" -OutFile boost.zip -UserAgent ""
-  if ((Get-FileHash boost.zip).Hash -ne "c86bd9d9eef795b4b0d3802279419fde5221922805b073b9bd822edecb1ca28e") {
-    throw 'Downloaded Boost source package has wrong checksum.'
-  }
-  tar -xf boost.zip
-  Remove-Item boost.zip
-  cd boost_1_83_0
-  .\bootstrap.bat
-  .\b2 -j4 -d0 link=static runtime-link=static variant=release threading=multi address-model=64 --with-filesystem --with-system --with-program_options --with-test --prefix="$PSScriptRoot\..\deps\boost" install
-  if ( -not $? ) { throw "Error building boost." }
-  cd ..
-  Remove-Item -LiteralPath .\boost_1_83_0 -Force -Recurse
-}
diff --git a/scripts/install_evmone.ps1 b/scripts/install_evmone.ps1
deleted file mode 100644
index 0bf2fa1de37d..000000000000
--- a/scripts/install_evmone.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-# Needed for Invoke-WebRequest to work via CI.
-$progressPreference = "silentlyContinue"
-
-Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip" -OutFile "evmone.zip"
-tar -xf evmone.zip "bin/evmone.dll"
-mkdir deps
-mv bin/evmone.dll deps
diff --git a/scripts/install_obsolete_jsoncpp_1_7_4.sh b/scripts/install_obsolete_jsoncpp_1_7_4.sh
deleted file mode 100755
index 825d1a58a225..000000000000
--- a/scripts/install_obsolete_jsoncpp_1_7_4.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-TEMPDIR=$(mktemp -d)
-(
-    cd "$TEMPDIR"
-    jsoncpp_version="1.7.4"
-    jsoncpp_package="jsoncpp-${jsoncpp_version}.tar.gz"
-    jsoncpp_sha256=10dcd0677e80727e572a1e462193e51a5fde3e023b99e144b2ee1a469835f769
-    wget -O "$jsoncpp_package" https://github.com/open-source-parsers/jsoncpp/archive/${jsoncpp_version}.tar.gz
-    if ! [ "$(sha256sum "$jsoncpp_package")" = "${jsoncpp_sha256}  ${jsoncpp_package}" ]
-    then
-        >&2 echo "ERROR: Downloaded jsoncpp source package has wrong checksum."
-        exit 1
-    fi
-    tar xvzf "$jsoncpp_package"
-    cd "jsoncpp-${jsoncpp_version}"
-    mkdir -p build
-    cd build
-    cmake -DARCHIVE_INSTALL_DIR=. -G "Unix Makefiles" ..
-    make
-    make install
-)
-rm -r "$TEMPDIR"
diff --git a/scripts/isolate_tests.py b/scripts/isolate_tests.py
deleted file mode 100755
index e641d58d191f..000000000000
--- a/scripts/isolate_tests.py
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/usr/bin/env python3
-#
-# This script reads C++ or RST source files and writes all
-# multi-line strings into individual files.
-# This can be used to extract the Solidity test cases
-# into files for e.g. fuzz testing as
-# scripts/isolate_tests.py test/libsolidity/*
-
-import re
-import os
-import hashlib
-from os.path import join, isfile, basename
-from argparse import ArgumentParser
-from textwrap import indent, dedent
-
-def extract_test_cases(path):
-    with open(path, encoding="utf8", errors='ignore', mode='r', newline='') as file:
-        lines = file.read().splitlines()
-
-    inside = False
-    delimiter = ''
-    tests = []
-
-    for l in lines:
-        if inside:
-            if l.strip().endswith(')' + delimiter + '";'):
-                inside = False
-            else:
-                tests[-1] += l + '\n'
-        else:
-            m = re.search(r'R"([^(]*)\($', l.strip())
-            if m:
-                inside = True
-                delimiter = m.group(1)
-                tests += ['']
-
-    return tests
-
-def extract_solidity_docs_cases(path):
-    tests = extract_docs_cases(path, [".. code-block:: solidity", '::'])
-
-    codeStart = "(// SPDX-License-Identifier:|pragma solidity|contract.*{|library.*{|interface.*{)"
-
-    # Filter out tests that are not supposed to be compilable.
-    return [
-        test.lstrip("\n")
-        for test in tests
-        if re.search(r'^\s{4}' + codeStart, test, re.MULTILINE) is not None
-    ]
-
-def extract_yul_docs_cases(path):
-    tests = extract_docs_cases(path, [".. code-block:: yul"])
-
-    def wrap_in_object(code):
-        for line in code.splitlines():
-            line = line.lstrip()
-            if line.startswith("//"):
-                continue
-            if not line.startswith("object") and not line.startswith("{"):
-                return indent(f"{{\n{code.rstrip()}\n}}\n\n", "    ")
-            break
-
-        return code
-
-    return [
-        wrap_in_object(test)
-        for test in tests
-        if test.strip() != ""
-    ]
-
-# Extract code examples based on the 'beginMarker' parameter
-# up until we reach EOF or a line that is not empty and doesn't start with 4
-# spaces.
-def extract_docs_cases(path, beginMarkers):
-    immediatelyAfterMarker = False
-    insideBlock = False
-    tests = []
-
-    # Collect all snippets of indented blocks
-    with open(path, mode='r', errors='ignore', encoding='utf8', newline='') as f:
-        lines = f.read().splitlines()
-
-    for line in lines:
-        if insideBlock:
-            if immediatelyAfterMarker:
-                # Skip Sphinx instructions and empty lines between them
-                if line == '' or line.lstrip().startswith(":"):
-                    continue
-
-            if line == '' or line.startswith(" "):
-                tests[-1] += line + "\n"
-                immediatelyAfterMarker = False
-                continue
-
-            insideBlock = False
-        if any(map(line.lower().startswith, beginMarkers)):
-            insideBlock = True
-            immediatelyAfterMarker = True
-            tests += ['']
-
-    return tests
-
-def write_cases(f, solidityTests, yulTests):
-    cleaned_filename = f.replace(".","_").replace("-","_").replace(" ","_").lower()
-    for language, test in [("sol", t) for t in solidityTests] + [("yul", t) for t in yulTests]:
-        # When code examples are extracted they are indented by 8 spaces, which violates the style guide,
-        # so before checking remove 4 spaces from each line.
-        remainder = dedent(test)
-        source_code_hash = hashlib.sha256(test.encode("utf-8")).hexdigest()
-        sol_filename = f'test_{source_code_hash}_{cleaned_filename}.{language}'
-        with open(sol_filename, mode='w', encoding='utf8', newline='') as fi:
-            fi.write(remainder)
-
-def extract_and_write(path, language):
-    assert language in ["solidity", "yul", ""]
-    yulCases = []
-    cases = []
-
-    if path.lower().endswith('.rst'):
-        if language in ("solidity", ""):
-            cases = extract_solidity_docs_cases(path)
-
-        if language in ("yul", ""):
-            yulCases  = extract_yul_docs_cases(path)
-    elif path.endswith('.sol'):
-        if language in ("solidity", ""):
-            with open(path, mode='r', encoding='utf8', newline='') as f:
-                cases = [f.read()]
-    else:
-        cases = extract_test_cases(path)
-
-    write_cases(basename(path), cases, yulCases)
-
-if __name__ == '__main__':
-    script_description = (
-        "Reads Solidity, C++ or RST source files and extracts compilable solidity and yul code blocks from them. "
-        "Can be used to generate test cases to validate code examples. "
-    )
-
-    parser = ArgumentParser(description=script_description)
-    parser.add_argument(dest='path', help='Path to file or directory to look for code in.')
-    parser.add_argument(
-        '-l', '--language',
-        dest='language',
-        choices=["yul", "solidity"],
-        default="",
-        action='store',
-        help="Extract only code blocks in the given language"
-    )
-    options = parser.parse_args()
-    path = options.path
-
-    if isfile(path):
-        extract_and_write(path, options.language)
-    else:
-        for root, subdirs, files in os.walk(path):
-            if '_build' in subdirs:
-                subdirs.remove('_build')
-            if 'compilationTests' in subdirs:
-                subdirs.remove('compilationTests')
-            for f in files:
-                if basename(f) == "invalid_utf8_sequence.sol":
-                    continue  # ignore the test with broken utf-8 encoding
-                path = join(root, f)
-                extract_and_write(path, options.language)
diff --git a/scripts/isoltest.sh b/scripts/isoltest.sh
deleted file mode 100755
index de9146de42d3..000000000000
--- a/scripts/isoltest.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-REPO_ROOT="$(dirname "$0")"/..
-exec "${REPO_ROOT}/build/test/tools/isoltest" --testpath "${REPO_ROOT}/test"
diff --git a/scripts/list_contributors.sh b/scripts/list_contributors.sh
deleted file mode 100755
index 4b8f06d7654b..000000000000
--- a/scripts/list_contributors.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# Creates a list containing names of people who contributed to the project, for use
-# in release notes. The names come from the author field on the commits between
-# the current revision and the one specified as argument.
-#
-# Note that the output often requires extra manual processing to remove entries
-# that refer to the same person (diacritics vs no diacritics, name vs nickname, etc.).
-#
-# Usage:
-#    <script name>.sh <revision>
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -euo pipefail
-
-script_dir=$(dirname "$0")
-# shellcheck source=scripts/common.sh
-source "${script_dir}/common.sh"
-
-(( $# == 1)) || fail "Wrong number of arguments. Usage: $0 <revision>."
-
-revision="$1"
-
-# NOTE: Commas are removed from any names containing them. It would look confusing otherwise, given
-# that the list is delimited by commas. Hopefully no contributor uses a comma as their nickname.
-git shortlog --summary "${revision}..origin/develop" |
-    cut --field 2 |
-    tr --delete , |
-    sort |
-    uniq |
-    paste --serial --delimiter=, |
-    sed -e 's/,/, /g'
diff --git a/scripts/pylint_all.py b/scripts/pylint_all.py
deleted file mode 100755
index a60b000ede4f..000000000000
--- a/scripts/pylint_all.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /usr/bin/env python3
-
-"""
-Runs pylint on all Python files in project directories known to contain Python scripts.
-"""
-
-from argparse import ArgumentParser
-from os import path, walk
-from textwrap import dedent
-import subprocess
-import sys
-
-PROJECT_ROOT = path.dirname(path.dirname(path.realpath(__file__)))
-PYLINT_RCFILE = f"{PROJECT_ROOT}/scripts/pylintrc"
-
-SGR_INFO = "\033[1;32m"
-SGR_CLEAR = "\033[0m"
-
-def pylint_all_filenames(dev_mode, rootdirs):
-    """ Performs pylint on all python files within given root directory (recursively).  """
-
-    BARE_COMMAND = [
-        "pylint",
-        f"--rcfile={PYLINT_RCFILE}",
-        "--output-format=colorized",
-        "--score=n"
-    ]
-
-    filenames = []
-    for rootdir in rootdirs:
-        for rootpath, _, filenames_w in walk(rootdir):
-            for filename in filenames_w:
-                if filename.endswith('.py'):
-                    filenames.append(path.join(rootpath, filename))
-
-    if not dev_mode:
-        # NOTE: We could just give pylint the directories and it would find the files on its
-        # own but it would treat them as packages, which would result in lots of import errors.
-        command_line = BARE_COMMAND + filenames
-        return subprocess.run(command_line, check=False).returncode == 0
-
-    for i, filename in enumerate(filenames):
-        command_line = BARE_COMMAND + [filename]
-        print(
-            f"{SGR_INFO}"
-            f"[{i + 1}/{len(filenames)}] "
-            f"Running pylint on file: {filename}{SGR_CLEAR}"
-        )
-
-        process = subprocess.run(command_line, check=False)
-
-        if process.returncode != 0:
-            return False
-
-    print()
-    return True
-
-
-def parse_command_line():
-    script_description = dedent("""
-        Runs pylint on all Python files in project directories known to contain Python scripts.
-
-        This script is meant to be run from the CI but can also be easily used in the local dev
-        environment.
-    """)
-
-    parser = ArgumentParser(description=script_description)
-    parser.add_argument(
-        '-d', '--dev-mode',
-        dest='dev_mode',
-        default=False,
-        action='store_true',
-        help=(
-            "Abort on first error. "
-            "In this mode every script is passed to pylint separately. "
-        )
-    )
-    return parser.parse_args()
-
-
-def main():
-    options = parse_command_line()
-
-    rootdirs = [
-        f"{PROJECT_ROOT}/docs",
-        f"{PROJECT_ROOT}/scripts",
-        f"{PROJECT_ROOT}/test",
-    ]
-    success = pylint_all_filenames(options.dev_mode, rootdirs)
-
-    if not success:
-        sys.exit(1)
-    else:
-        print("No problems found.")
-
-
-if __name__ == "__main__":
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit("Interrupted by user. Exiting.")
diff --git a/scripts/pylintrc b/scripts/pylintrc
deleted file mode 100644
index 5ef5a6eff333..000000000000
--- a/scripts/pylintrc
+++ /dev/null
@@ -1,69 +0,0 @@
-# vim:et:ts=4
-[MESSAGES CONTROL]
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then re-enable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-
-# ATTENTION: This list should be extended with care, consider using NOLINT comments inside your
-# python files instead, as the goal is actually to reduce the list of globally disabled checks.
-#
-# TODO: What could be eliminated in future PRs: invalid-name, pointless-string-statement, redefined-outer-name.
-disable=
-    bad-indentation,
-    duplicate-code,
-    invalid-name,
-    missing-docstring,
-    no-else-return,
-    pointless-string-statement,
-    redefined-outer-name,
-    superfluous-parens,
-    too-few-public-methods,
-    too-many-arguments,
-    too-many-branches,
-    too-many-instance-attributes,
-    too-many-locals,
-    too-many-public-methods,
-    too-many-statements,
-    ungrouped-imports
-
-[BASIC]
-
-# Good variable names which should always be accepted, separated by a comma
-# added: f, h, x, a, b, p
-good-names=
-    Run,
-    _,
-    a,
-    b,
-    ex,
-    f,
-    f,
-    h,
-    h,
-    i,
-    j,
-    k,
-    l,
-    m,
-    n,
-    p,
-    x
-
-[FORMAT]
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=LF
-
-# Maximum number of characters on a single line.
-max-line-length=130
-
-[MISCELLANEOUS]
-
-notes=XXX,TMP
diff --git a/scripts/regressions.py b/scripts/regressions.py
deleted file mode 100755
index e30c0aeb9f8d..000000000000
--- a/scripts/regressions.py
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-
-from argparse import ArgumentParser
-import sys
-import os
-import subprocess
-import re
-import glob
-import threading
-import time
-
-DESCRIPTION = """Regressor is a tool to run regression tests in a CI env."""
-
-class PrintDotsThread:
-    """Prints a dot every "interval" (default is 300) seconds"""
-
-    def __init__(self, interval=300):
-        self.interval = interval
-
-        thread = threading.Thread(target=self.run, args=())
-        thread.daemon = True
-        thread.start()
-
-    def run(self):
-        """ Runs until the main Python thread exits. """
-        ## Print a newline at the very beginning.
-        print("")
-        while True:
-            # Print dot
-            print(".")
-            time.sleep(self.interval)
-
-class regressor:
-    _re_sanitizer_log = re.compile(r"""ERROR: (libFuzzer|UndefinedBehaviorSanitizer)""")
-
-    def __init__(self, description, args):
-        self._description = description
-        self._args = self.parseCmdLine(description, args)
-        self._repo_root = os.path.dirname(sys.path[0])
-        self._fuzzer_path = os.path.join(self._repo_root,
-                                         "build/test/tools/ossfuzz")
-        self._logpath = os.path.join(self._repo_root, "test_results")
-
-    @classmethod
-    def parseCmdLine(cls, description, args):
-        argParser = ArgumentParser(description)
-        argParser.add_argument('-o', '--out-dir', required=True, type=str,
-                               help="""Directory where test results will be written""")
-        return argParser.parse_args(args)
-
-    @staticmethod
-    def run_cmd(command, logfile=None, env=None):
-        """
-        Args:
-            command (str): command to run
-            logfile (str): log file name
-            env (dict): dictionary holding key-value pairs for bash environment
-                    variables
-
-        Returns:
-            int: The exit status of the command. Exit status codes are:
-                0       -> Success
-                1-255   -> Failure
-        """
-        if not logfile:
-            logfile = os.devnull
-
-        if not env:
-            env = os.environ.copy()
-
-        with open(logfile, 'w', encoding='utf8') as logfh:
-            with subprocess.Popen(command, shell=True, executable='/bin/bash',
-                                    env=env, stdout=logfh,
-                                    stderr=subprocess.STDOUT) as proc:
-                ret = proc.wait()
-                logfh.close()
-                return ret
-
-    def process_log(self, logfile):
-        """
-        Args:
-            logfile (str): log file name
-
-        Returns:
-            bool: Test status.
-                True       -> Success
-                False      -> Failure
-        """
-
-        ## Log may contain non ASCII characters, so we simply stringify them
-        ## since they don't matter for regular expression matching
-        with open(logfile, 'rb', encoding=None) as f:
-            rawtext = str(f.read())
-        return not re.search(self._re_sanitizer_log, rawtext)
-
-    def run(self):
-        """
-        Returns:
-            bool: Test status.
-                True       -> All tests succeeded
-                False      -> At least one test failed
-        """
-
-        testStatus = []
-        for fuzzer in glob.iglob(f"{self._fuzzer_path}/*_ossfuzz"):
-            basename = os.path.basename(fuzzer)
-            logfile = os.path.join(self._logpath, f"{basename}.log")
-            corpus_dir = f"/tmp/solidity-fuzzing-corpus/{basename}_seed_corpus"
-            cmd = f"find {corpus_dir} -type f | xargs -n1 sh -c '{fuzzer} $0 || exit 255'"
-            self.run_cmd(cmd, logfile=logfile)
-            ret = self.process_log(logfile)
-            if not ret:
-                print(
-                    f"\t[-] libFuzzer reported failure for {basename}. "
-                    "Failure logged to test_results")
-                testStatus.append(False)
-            else:
-                print(f"\t[+] {basename} passed regression tests.")
-                testStatus.append(True)
-        return all(testStatus)
-
-
-if __name__ == '__main__':
-    dotprinter = PrintDotsThread()
-    tool = regressor(DESCRIPTION, sys.argv[1:])
-    sys.exit(not tool.run())
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
deleted file mode 100755
index bd98865d6ebc..000000000000
--- a/scripts/release_ppa.sh
+++ /dev/null
@@ -1,313 +0,0 @@
-#!/usr/bin/env bash
-##############################################################################
-## This is used to package .deb packages and upload them to the launchpad
-## ppa servers for building.
-##
-## You can pass a branch name as argument to this script (which, if no argument is given,
-## will default to "develop").
-##
-## If the given branch is "release", the resulting package will be uploaded to
-## ethereum/ethereum PPA, or ethereum/ethereum-dev PPA otherwise.
-##
-## It will clone the Solidity git from github, determine the version,
-## create a source archive and push it to the ubuntu ppa servers.
-##
-## To interact with launchpad, you need to set the variables $LAUNCHPAD_EMAIL
-## and $LAUNCHPAD_KEYID in the file .release_ppa_auth in the root directory of
-## the project to your launchpad email and pgp keyid.
-## This could for example look like this:
-##
-##  LAUNCHPAD_EMAIL=your-launchpad-email@ethereum.org
-##  LAUNCHPAD_KEYID=123ABCFFFFFFFF
-##
-## Additionally the following entries in /etc/dput.cf are required:
-##
-##  [ethereum-dev]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/ethereum-dev
-##  login			= anonymous
-##
-##  [ethereum]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/ethereum
-##  login			= anonymous
-##
-##  [ethereum-static]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/ethereum-static
-##  login			= anonymous
-##
-##############################################################################
-
-set -e
-
-
-REPO_ROOT="$(dirname "$0")/.."
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-if [ -z "$1" ]
-then
-    branch=develop
-else
-    branch=$1
-fi
-
-is_release() {
-    [[ "${branch}" =~ ^v[0-9]+(\.[0-9]+)*$ ]]
-}
-
-sourcePPAConfig
-
-packagename=solc
-
-# This needs to be a still active release
-static_build_distribution=focal
-
-DISTRIBUTIONS="focal jammy kinetic lunar"
-
-if is_release
-then
-    DISTRIBUTIONS="$DISTRIBUTIONS STATIC"
-
-    # Sanity checks
-    checkDputEntries "\[ethereum\]"
-    checkDputEntries "\[ethereum-static\]"
-else
-    # Sanity check
-    checkDputEntries "\[ethereum-dev\]"
-fi
-
-for distribution in $DISTRIBUTIONS
-do
-cd /tmp/
-rm -rf "$distribution"
-mkdir "$distribution"
-cd "$distribution"
-
-if [ "$distribution" = STATIC ]
-then
-    pparepo=ethereum-static
-    SMTDEPENDENCY=""
-    CMAKE_OPTIONS="-DSOLC_LINK_STATIC=On -DCMAKE_EXE_LINKER_FLAGS=-static"
-else
-    if is_release
-    then
-        pparepo=ethereum
-    else
-        pparepo=ethereum-dev
-    fi
-    if [ "$distribution" = focal ]
-    then
-        SMTDEPENDENCY="libz3-static-dev,
-            libcvc4-dev,
-            "
-    elif [ "$distribution" = disco ]
-    then
-        SMTDEPENDENCY="libz3-static-dev,
-            libcvc4-dev,
-            "
-    else
-        SMTDEPENDENCY="libz3-static-dev,
-            "
-    fi
-    CMAKE_OPTIONS=""
-fi
-ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
-
-# Fetch source
-git clone --depth 2 --recursive https://github.com/ethereum/solidity.git -b "$branch"
-mv solidity solc
-
-# Fetch dependencies
-mkdir -p ./solc/deps/downloads/ 2>/dev/null || true
-wget -O ./solc/deps/downloads/jsoncpp-1.9.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
-wget -O ./solc/deps/downloads/range-v3-0.12.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
-wget -O ./solc/deps/downloads/fmt-8.0.1.tar.gz https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
-
-# Determine version
-cd solc
-version=$("$(dirname "$0")/get_version.sh")
-commithash=$(git rev-parse --short=8 HEAD)
-commitdate=$(git show --format=%ci HEAD | head -n 1 | cut - -b1-10 | sed -e 's/-0?/./' | sed -e 's/-0?/./')
-
-echo "$commithash" > commit_hash.txt
-if is_release
-then
-    debversion="$version"
-    echo -n > prerelease.txt # proper release
-else
-    debversion="$version~develop-$commitdate-$commithash"
-fi
-
-# gzip will create different tars all the time and we are not allowed
-# to upload the same file twice with different contents, so we only
-# create it once.
-if [ ! -e "/tmp/${packagename}_${debversion}.orig.tar.gz" ]
-then
-    tar --exclude .git -czf "/tmp/${packagename}_${debversion}.orig.tar.gz" .
-fi
-cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
-
-# Create debian package information
-
-mkdir debian
-echo 9 > debian/compat
-cat <<EOF > debian/control
-Source: solc
-Section: science
-Priority: extra
-Maintainer: Christian (Buildserver key) <builds@ethereum.org>
-Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
-               cmake,
-               g++ (>= 5.0),
-               git,
-               libgmp-dev,
-               libboost-all-dev,
-               automake,
-               libtool,
-               scons
-Standards-Version: 3.9.5
-Homepage: https://ethereum.org
-Vcs-Git: https://github.com/ethereum/solidity.git
-Vcs-Browser: https://github.com/ethereum/solidity
-
-Package: solc
-Architecture: any-amd64
-Multi-Arch: same
-Depends: \${shlibs:Depends}, \${misc:Depends}
-Conflicts: libethereum (<= 1.2.9)
-Description: Solidity compiler.
- The commandline interface to the Solidity smart contract compiler.
-EOF
-cat <<EOF > debian/rules
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-
-%:
-	dh \$@ --buildsystem=cmake #--with sphinxdoc
-
-override_dh_auto_test:
-
-#override_dh_installdocs:
-#	make -C docs html
-#	dh_installdocs docs/_build/html
-
-override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DTESTS=OFF -DFETCHCONTENT_FULLY_DISCONNECTED=OFF ${CMAKE_OPTIONS}
-EOF
-cat <<EOF > debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: solc
-Source: https://github.com/ethereum/solidity
-
-Files: *
-Copyright: 2014-2016 Ethereum
-License: GPL-3.0+
-
-Files: debian/*
-Copyright: 2016 Ethereum
-License: GPL-3.0+
-
-License: GPL-3.0+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-EOF
-cat <<EOF > debian/changelog
-solc (0.0.1-0ubuntu1) saucy; urgency=low
-
-  * Initial release.
-
- -- Christian <build@ethereum.org>  Mon, 03 Feb 2016 14:50:20 +0000
-EOF
-echo docs > debian/docs
-mkdir debian/source
-echo "3.0 (quilt)" > debian/source/format
-chmod +x debian/rules
-
-versionsuffix=0ubuntu1~${distribution}
-# bump version / add entry to changelog
-EMAIL="$LAUNCHPAD_EMAIL" dch -v "1:${debversion}-${versionsuffix}" "git build of ${commithash}"
-
-
-# build source package
-# If packages is rejected because original source is already present, add
-# -sd to remove it from the .changes file
-# -d disables the build dependencies check
-debuild -S -d -sa -us -uc
-
-# prepare .changes file for Launchpad
-if [ "$distribution" = STATIC ]
-then
-    sed -i -e "s/UNRELEASED/${static_build_distribution}/" -e s/urgency=medium/urgency=low/ ../*.changes
-else
-    sed -i -e "s/UNRELEASED/${distribution}/" -e s/urgency=medium/urgency=low/ ../*.changes
-fi
-
-# check if ubuntu already has the source tarball
-(
-cd ..
-orig="${packagename}_${debversion}.orig.tar.gz"
-# shellcheck disable=SC2012
-orig_size=$(ls -l "$orig" | cut -d ' ' -f 5)
-orig_sha1=$(sha1sum "$orig" | cut -d ' ' -f 1)
-orig_sha256=$(sha256sum "$orig" | cut -d ' ' -f 1)
-orig_md5=$(md5sum "$orig" | cut -d ' ' -f 1)
-
-if wget --quiet -O "$orig-tmp" "$ppafilesurl/$orig"
-then
-    echo "[WARN] Original tarball found in Ubuntu archive, using it instead"
-    mv "$orig-tmp" "$orig"
-    # shellcheck disable=SC2012
-    new_size=$(ls -l ./*.orig.tar.gz | cut -d ' ' -f 5)
-    new_sha1=$(sha1sum "$orig" | cut -d ' ' -f 1)
-    new_sha256=$(sha256sum "$orig" | cut -d ' ' -f 1)
-    new_md5=$(md5sum "$orig" | cut -d ' ' -f 1)
-    sed -i -e "s,$orig_sha1,$new_sha1,g" -e "s,$orig_sha256,$new_sha256,g" -e "s,$orig_size,$new_size,g" -e "s,$orig_md5,$new_md5,g" ./*.dsc
-    sed -i -e "s,$orig_sha1,$new_sha1,g" -e "s,$orig_sha256,$new_sha256,g" -e "s,$orig_size,$new_size,g" -e "s,$orig_md5,$new_md5,g" ./*.changes
-fi
-)
-
-# sign the package
-debsign --re-sign -k "${LAUNCHPAD_KEYID}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
-
-# upload
-dput "${pparepo}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
-
-done
diff --git a/scripts/run_proofs.sh b/scripts/run_proofs.sh
deleted file mode 100755
index db6b0e02b289..000000000000
--- a/scripts/run_proofs.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-(
-REPO_ROOT="$(dirname "$0")"/..
-cd "$REPO_ROOT"
-
-git fetch origin
-error=0
-for new_proof in $(git diff origin/develop --name-only test/formal/)
-do
-	if [ -e "$new_proof" ]; then
-		set +e
-		echo "Proving $new_proof..."
-		output=$(python3 "$new_proof")
-		result=$?
-		set -e
-
-		if [[ "$result" != 0 ]]
-		then
-			echo "Proof $(basename "$new_proof" ".py") failed: $output."
-			error=1
-		fi
-	fi
-done
-
-if [[ "error" -eq 0 ]]
-then
-	echo "All proofs succeeded."
-fi
-
-exit $error
-)
diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
deleted file mode 100755
index 92c522f8f555..000000000000
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# Determines versions of all release binaries from solc-bin repo modified in the
-# specified commit range, finds all release binaries from one, selected platform
-# that match these versions and uses them to produce bytecode reports.
-#
-# The script is meant to be backwards-compatible with older versions of the
-# compiler. Reports are generated via the CLI interface (rather than Standard
-# JSON) in case of native binaries because the JSON interface was not available
-# in very old versions.
-#
-# The script creates one report per binary and file names follow the pattern
-# 'report-<binary name>.txt'.
-#
-# Usage:
-#    <script name>.sh <PLATFORM> <BASE_REF> <TOP_REF> <SOLC_BIN_DIR> <SOLIDITY_DIR>
-#
-# PLATFORM: Platform name, corresponding the one of the top-level directories
-#     in solc-bin.
-# BASE_REF..TOP_REF: Commit range in the solc-bin repository to search for
-#     modified binaries.
-# SOLC_BIN_DIR: Directory containing a checkout of the ethereum/solc-bin
-#    repository with full history. Must be an absolute path.
-# SOLIDITY_DIR: Directory containing a checkout of the ethereum/solidity
-#    repository with full history. Bytecode report will be generated using
-#    scripts from the currently checked out revision. Must be an absolute path.
-#
-# Example:
-#    <script name>.sh linux-amd64 gh-pages pr-branch "$PWD/solc-bin" "$PWD/solidity"
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2020 solidity contributors.
-#------------------------------------------------------------------------------
-
-# FIXME: Can't use set -u because the old Bash on macOS treats empty arrays as unbound variables
-set -eo pipefail
-
-function die
-{
-    # shellcheck disable=SC2059
-    >&2 printf "ERROR: $1\n" "${@:2}"
-    exit 1
-}
-
-function get_reported_solc_version
-{
-    local solc_binary="$1"
-
-    local version_banner; version_banner=$("$solc_binary" --version)
-
-    if [[ ! $(echo "$version_banner" | head -n 1) =~ ^solc,.*$ ]]; then
-        die "%s\nFULL OUTPUT:\n" "Invalid format of --version output" "$version_banner"
-    fi
-
-    echo "$version_banner" | tail -n 1 | sed -n -E 's/^Version: (.*)$/\1/p'
-}
-
-function validate_reported_version
-{
-    local reported_version="$1"
-    local expected_version_and_commit="$2"
-
-    if [[ $reported_version =~ [\-.]mod\. ]]; then
-        die "Version '%s' reported by the '%s' binary indicates that it was built from modified source." "$reported_version" "$expected_version_and_commit"
-    fi
-
-    local actual_version_and_commit; actual_version_and_commit=$(
-        echo "$reported_version" |
-        sed -E 's/^[[:space:]]*([0-9.]+\+commit\.[0-9a-f]+)\..+\..+$/\1/'
-    )
-
-    if [[ $actual_version_and_commit != "$expected_version_and_commit" ]]; then
-        die "Binary identifies itself as version '%s' which does not match '%s' present in its name." "$actual_version_and_commit" "$expected_version_and_commit"
-    fi
-
-    echo "Binary for version ${expected_version_and_commit} reports correct version."
-}
-
-(( $# == 5 )) || die "ERROR: Not enough arguments."
-
-platform="$1"
-base_ref="$2"
-top_ref="$3"
-solc_bin_dir="$4"
-solidity_dir="$5"
-
-report_dir="$PWD"
-tmp_dir=$(mktemp -d -t bytecode-reports-XXXXXX)
-solcjs_dir="$tmp_dir/solcjs"
-script_dir="$solidity_dir/scripts"
-
-# Set locale to C to prevent it from affecting glob sort order.
-export LC_ALL=C
-
-cd "$tmp_dir"
-
-git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"
-cd "$solcjs_dir"
-npm install
-npm run build
-
-cd "${solc_bin_dir}/${platform}/"
-echo "Commit range: ${base_ref}..${top_ref}"
-
-modified_release_versions=$(
-    git diff --name-only "${base_ref}" "${top_ref}" |
-    sed -n -E 's/^[^\/]+\/(solc|soljson)-[0-9a-zA-Z-]+-v([0-9.]+)\+commit\.[0-9a-f]+(.[^.]+)?$/\2/p' |
-    sort -V |
-    uniq
-)
-echo "Release versions modified in the commit range:"
-echo "$modified_release_versions"
-
-# NOTE: We want perform the check when the soljson-* files in bin/ and wasm/ are modified too
-# because in that case the symlinks in emscripten-wasm32/ and emscripten-asmjs/ might remain
-# unchanged but were're assuming that these directories are never directly used as a platform name.
-[[ $platform != bin && $platform != wasm ]] || die "Invalid platform name."
-
-platform_binaries="$(git ls-files "solc-${platform}-v*+commit.*" | sort -V)"
-
-for binary_name in $platform_binaries; do
-    solidity_version_and_commit=$(echo "$binary_name" | sed -n -E 's/^solc-'"${platform}"'-v([0-9.]+\+commit\.[0-9a-f]+).*$/\1/p')
-    solidity_version=$(echo "$solidity_version_and_commit" | sed -n -E 's/^([0-9.]+).*$/\1/p')
-
-    if echo "$modified_release_versions" | grep -x "$solidity_version"; then
-        echo "Binary ${binary_name} (version ${solidity_version}) matches one of the modified versions."
-
-        work_dir="${tmp_dir}/${binary_name}"
-        mkdir "$work_dir"
-        cd "$work_dir"
-
-        # While bytecode scripts come from the latest compiler, the test files should come from
-        # the Solidity version we're running them against to avoid errors due to breaking syntax changes.
-        git clone --branch "v${solidity_version}" "$solidity_dir" "${work_dir}/solidity/"
-        "${script_dir}/isolate_tests.py" "${work_dir}/solidity/test/"
-
-        if [[ $platform == emscripten-wasm32 ]] || [[ $platform == emscripten-asmjs ]]; then
-            ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/soljson.js"
-            ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/dist/soljson.js"
-            npm install "${solcjs_dir}/dist"
-            cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js
-
-            validate_reported_version \
-                "$(node_modules/solc/solc.js --version)" \
-                "$solidity_version_and_commit"
-
-            # shellcheck disable=SC2035
-            ./prepare_report.js --strip-smt-pragmas *.sol > "${report_dir}/report-${binary_name}.txt"
-        else
-            yul_optimizer_flags=()
-            if [[ $solidity_version == 0.6.0 ]] || [[ $solidity_version == 0.6.1 ]]; then
-                yul_optimizer_flags+=(--force-no-optimize-yul)
-            fi
-
-            validate_reported_version \
-                "$(get_reported_solc_version "${solc_bin_dir}/${platform}/${binary_name}")" \
-                "$solidity_version_and_commit"
-
-            "${script_dir}/bytecodecompare/prepare_report.py" "${solc_bin_dir}/${platform}/${binary_name}" \
-                --interface cli \
-                --smt-use strip-pragmas \
-                --report-file "${report_dir}/report-${binary_name}.txt" \
-                "${yul_optimizer_flags[@]}"
-        fi
-
-        rm -r "${work_dir}/solidity/"
-    else
-        echo "Binary ${binary_name} (version ${solidity_version}) does not match any modified version. Skipping."
-    fi
-done
-
-rm -r "$tmp_dir"
diff --git a/scripts/solc-bin/compare_bytecode_reports.sh b/scripts/solc-bin/compare_bytecode_reports.sh
deleted file mode 100755
index 7637a102c090..000000000000
--- a/scripts/solc-bin/compare_bytecode_reports.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# Compares bytecode reports from multiple compiler versions and platforms to
-# determine if there are any differences.
-#
-# The script does not accept any arguments.
-#
-# The reports should be placed in subdirectories of the current working
-# directory and their names should follow one of the following patterns:
-#
-#     report-solc-<platform>-v<solidity version>+commit.<commit hash>.txt
-#     report-soljson-<platform>-v<solidity version>+commit.<commit hash>.js.txt
-#
-# Reports corresponding to the same version and commit hash are grouped together
-# and the script succeeds only if the files within each group are identical.
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2020 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -euo pipefail
-
-report_files="$(find . -type f -name 'report-*.txt')"
-[[ $report_files != "" ]] || { echo "No reports found in the working directory."; exit 0; }
-
-echo "Available reports:"
-echo "$report_files"
-
-versions_in_report_names=$(
-    echo "$report_files" |
-    sed -n -E 's/^\.\/[^\/]+\/report-(solc|soljson)-[0-9a-zA-Z-]+-v([0-9.]+\+commit\.[0-9a-f]+)(.[^.]+)?\.txt$/\2/p' |
-    sort -V |
-    uniq
-)
-
-num_failed_comparisons=0
-for solidity_version_and_commit in $versions_in_report_names; do
-    echo "Comparing reports for Solidity ${solidity_version_and_commit}:"
-    mapfile -t report_files_for_version < <(
-        echo "$report_files" |
-        sed -n -E '/^\.\/[^\/]+\/report-(solc|soljson)-[0-9a-zA-Z-]+-v'"${solidity_version_and_commit//\+/\\+}"'+(.[^.]+)?\.txt$/p'
-    )
-
-    diff --report-identical-files --brief --from-file "${report_files_for_version[@]}" || ((++num_failed_comparisons))
-    echo
-done
-
-(( num_failed_comparisons == 0 )) || { echo "Found bytecode differences in ${num_failed_comparisons} versions"; exit 1; }
-echo "No bytecode differences found."
diff --git a/scripts/soltest.sh b/scripts/soltest.sh
deleted file mode 100755
index e15aeb9bf5c6..000000000000
--- a/scripts/soltest.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-REPO_ROOT="$(dirname "$0")"/..
-USE_DEBUGGER=0
-DEBUGGER="gdb --args"
-BOOST_OPTIONS=()
-SOLTEST_OPTIONS=()
-SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-
-function usage
-{
-	echo 2>&1 "
-Usage: $0 [options] [soltest-options]
-Runs BOOST C++ unit test program, soltest.
-
-Options:
-  --debug                  soltest invocation prefaced with: \"$DEBUGGER\"
-  --debugger *dbg-cmd*     soltest prefaced with your own debugger command.
-  --run_test | -t  *name*  filters test unit(s) to include or exclude from test.
-                           This  option can be given several times.
-  --boost-options *x*      Set BOOST option *x*.
-  --show-progress | -p     Set BOOST option --show-progress.
-
-Important environment variables:
-
-SOLIDITY_BUILD_DIR: Sets directory where test/soltest should be found.
-           The default is \"${SOLIDITY_BUILD_DIR}\".
-"
-}
-
-while [ $# -gt 0 ]
-do
-	case "$1" in
-		--debugger)
-			shift
-			DEBUGGER="$1"
-			USE_DEBUGGER=1
-			;;
-		--debug)
-			USE_DEBUGGER=1
-			;;
-		--boost-options)
-			shift
-			BOOST_OPTIONS+=("$1")
-			;;
-		--help)
-			usage
-			exit 0
-			;;
-		--run_test | -t )
-			shift
-			BOOST_OPTIONS+=(-t "$1")
-			;;
-		--show-progress | -p)
-			BOOST_OPTIONS+=("$1")
-			;;
-		*)
-			SOLTEST_OPTIONS+=("$1")
-			;;
-	esac
-	shift
-done
-
-SOLTEST_COMMAND=("${SOLIDITY_BUILD_DIR}/test/soltest" "${BOOST_OPTIONS[@]}" -- --testpath "${REPO_ROOT}/test" "${SOLTEST_OPTIONS[@]}")
-
-if [ "$USE_DEBUGGER" -ne "0" ]; then
-	# shellcheck disable=SC2086
-	exec ${DEBUGGER} "${SOLTEST_COMMAND[@]}"
-else
-	exec "${SOLTEST_COMMAND[@]}"
-fi
diff --git a/scripts/splitSources.py b/scripts/splitSources.py
deleted file mode 100755
index 5e783b2d5aa9..000000000000
--- a/scripts/splitSources.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-#
-# This script reads a syntaxTest file and writes all
-# sources into their own files. If one source-name specifies subdirectories
-# those will be created too.
-
-# Usage: scripts/splitSources.py pathToTestfile
-# as a result prints
-# -  string of created files separated by whitespaces
-# -  'false' if the file only had one source
-
-import sys
-import os
-import traceback
-
-
-def uncaught_exception_hook(exc_type, exc_value, exc_traceback):
-    # The script `scripts/ASTImportTest.sh` will interpret return code 3
-    # as a critical error (because of the uncaught exception) and will
-    # terminate further execution.
-    print("Unhandled exception: %s", "".join(traceback.format_exception(exc_type, exc_value, exc_traceback)))
-    sys.exit(3)
-
-
-def extractSourceName(line):
-    if line.find("/") > -1:
-        filePath = line[13: line.rindex("/")]
-        # fileName = line[line.rindex("/")+1: line.find(" ====")]
-        srcName = line[line.find(":")+2: line.find(" ====")]
-        return filePath, srcName
-    return False, line[line.find(":")+2 : line.find(" ====")]
-
-
-# expects the first line of lines to be "==== Source: sourceName ===="
-# writes the following source into a file named sourceName
-def writeSourceToFile(lines):
-    filePath, srcName = extractSourceName(lines[0])
-    # print("sourceName is ", srcName)
-    # print("filePath is", filePath)
-    if filePath:
-        os.system("mkdir -p " + filePath)
-    with open(srcName, mode='a+', encoding='utf8', newline='') as f:
-        for idx, line in enumerate(lines[1:]):
-            # write to file
-            if line[:12] != "==== Source:":
-                f.write(line + '\n')
-
-            # recursive call if there is another source
-            else:
-                return [srcName] + writeSourceToFile(lines[1+idx:])
-
-    return [srcName]
-
-def split_sources(filePath, suppress_output = False):
-    sys.excepthook = uncaught_exception_hook
-
-    try:
-        # decide if file has multiple sources
-        with open(filePath, mode='r', encoding='utf8', newline='') as f:
-            lines = f.read().splitlines()
-        if len(lines) >= 1 and lines[0][:12] == "==== Source:":
-            srcString = ""
-            for src in writeSourceToFile(lines):
-                srcString += src + ' '
-            if not suppress_output:
-                print(srcString)
-            return 0
-        return 1
-
-    except UnicodeDecodeError as ude:
-        print("UnicodeDecodeError in '" + filePath + "': " + str(ude))
-        print("This is expected for some tests containing invalid utf8 sequences. "
-              "Exception will be ignored.")
-        return 2
-
-
-if __name__ == '__main__':
-    sys.exit(split_sources(sys.argv[1]))
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
deleted file mode 100755
index 4dde11bf7dac..000000000000
--- a/scripts/test_antlr_grammar.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-READLINK=readlink
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    READLINK=greadlink
-fi
-ROOT_DIR=$(${READLINK} -f "$(dirname "$0")"/..)
-WORKDIR="${ROOT_DIR}/build/antlr"
-ANTLR_JAR="${ROOT_DIR}/build/deps/antlr4.jar"
-ANTLR_JAR_URI="https://www.antlr.org/download/antlr-4.8-complete.jar"
-
-SGR_RESET="\033[0m"
-SGR_BOLD="\033[1m"
-SGR_GREEN="\033[32m"
-SGR_RED="\033[31m"
-SGR_BLUE="\033[34m"
-
-vt_cursor_up() { echo -ne "\033[A"; }
-vt_cursor_begin_of_line() { echo -ne "\r"; }
-
-function download_antlr4
-{
-  if [[ ! -e "$ANTLR_JAR" ]]
-  then
-    curl -o "${ANTLR_JAR}" "${ANTLR_JAR_URI}"
-  fi
-}
-
-function prepare_workdir
-{
-  mkdir -p "${ROOT_DIR}/build/deps"
-  mkdir -p "${WORKDIR}"
-  mkdir -p "${WORKDIR}/src"
-  mkdir -p "${WORKDIR}/target"
-}
-
-prepare_workdir
-download_antlr4
-
-echo "Creating parser"
-(
-cd "${ROOT_DIR}"/docs/grammar
-# Create lexer/parser from grammar
-java -jar "${ANTLR_JAR}" SolidityParser.g4 SolidityLexer.g4 -o "${WORKDIR}/src/"
-
-# Compile lexer/parser sources
-javac -classpath "${ANTLR_JAR}" "${WORKDIR}/src/"*.java -d "${WORKDIR}/target/"
-)
-
-# Run tests
-failed_count=0
-function test_file
-{
-  local SOL_FILE
-  SOL_FILE="$(${READLINK}  -m "${1}")"
-  local cur=${2}
-  local max=${3}
-  local solOrYul=${4}
-
-  echo -e "${SGR_BLUE}[${cur}/${max}] Testing ${SOL_FILE}${SGR_RESET} ..."
-  local output
-  if [[ "${solOrYul}" == "sol" ]]; then
-    output=$(
-      grep -v "^==== ExternalSource:" "${SOL_FILE}" | java \
-        -classpath "${ANTLR_JAR}:${WORKDIR}/target/" \
-        "org.antlr.v4.gui.TestRig" \
-        Solidity \
-        sourceUnit 2>&1
-    )
-  else
-    output=$(
-      echo "assembly $(cat "${SOL_FILE}")" | java \
-        -classpath "${ANTLR_JAR}:${WORKDIR}/target/" \
-        "org.antlr.v4.gui.TestRig" \
-        Solidity \
-        assemblyStatement 2>&1
-    )
-  fi
-  vt_cursor_up
-  vt_cursor_begin_of_line
-  if grep -qE "^\/\/ ParserError" "${SOL_FILE}"; then
-    if [[ "${output}" != "" ]]
-    then
-      echo -e "${SGR_BLUE}[${cur}/${max}] Testing ${SOL_FILE}${SGR_RESET} ${SGR_BOLD}${SGR_GREEN}FAILED AS EXPECTED${SGR_RESET}"
-    else
-      echo -e "${SGR_BLUE}[${cur}/${max}] Testing ${SOL_FILE}${SGR_RESET} ${SGR_BOLD}${SGR_RED}SUCCEEDED DESPITE PARSER ERROR${SGR_RESET}"
-      echo "${output}"
-      failed_count=$((failed_count + 1))
-      exit 1
-    fi
-  else
-    if [[ "${output}" == "" ]]
-    then
-      echo -e "${SGR_BLUE}[${cur}/${max}] Testing ${SOL_FILE}${SGR_RESET} ${SGR_BOLD}${SGR_GREEN}OK${SGR_RESET}"
-    else
-      echo -e "${SGR_BLUE}[${cur}/${max}] Testing ${SOL_FILE}${SGR_RESET} ${SGR_BOLD}${SGR_RED}FAILED${SGR_RESET}"
-      echo "${output}"
-      failed_count=$((failed_count + 1))
-      exit 1
-    fi
-  fi
-}
-
-# we only want to use files that do not contain excluded parser errors, analysis errors or multi-source files.
-SOL_FILES=()
-while IFS='' read -r line
-do
-  SOL_FILES+=("$line")
-done < <(
-  grep --include "*.sol" -riL -E \
-    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185|7637)|^==== Source:|^pragma experimental solidity;" \
-    "${ROOT_DIR}/test/libsolidity/syntaxTests" \
-    "${ROOT_DIR}/test/libsolidity/semanticTests" |
-      # Skipping the unicode tests as I couldn't adapt the lexical grammar to recursively counting RLO/LRO/PDF's.
-      grep -v -E 'comments/.*_direction_override.*.sol' |
-      grep -v -E 'literals/.*_direction_override.*.sol' |
-      # Skipping a test with "revert E;" because ANTLR cannot distinguish it from
-      # a variable declaration.
-      grep -v -E 'revertStatement/non_called.sol' |
-      # Skipping a test with "let basefee := ..."
-      grep -v -E 'inlineAssembly/basefee_berlin_function.sol' |
-      # Skipping tests with "let prevrandao := ..."
-      grep -v -E 'inlineAssembly/prevrandao_allowed_function_pre_paris.sol' |
-      grep -v -E 'inlineAssembly/prevrandao_disallowed_function_post_paris.sol' |
-      # Skipping license error, unrelated to the grammar
-      grep -v -E 'license/license_double5.sol' |
-      grep -v -E 'license/license_hidden_unicode.sol' |
-      grep -v -E 'license/license_unicode.sol' |
-      # Skipping tests with 'something.address' as 'address' as the grammar fails on those
-      grep -v -E 'inlineAssembly/external_function_pointer_address.*.sol'
-)
-
-YUL_FILES=()
-# Add all yul optimizer tests without objects and types.
-while IFS='' read -r line
-do
-  YUL_FILES+=("$line")
-done < <(
-  grep -riL -E \
-    "object|\:[ ]*[uib]" \
-    "${ROOT_DIR}/test/libyul/yulOptimizerTests"
-)
-
-num_tests=$((${#SOL_FILES[*]} + ${#YUL_FILES[*]}))
-test_count=0
-for SOL_FILE in "${SOL_FILES[@]}"
-do
-  test_count=$((test_count + 1))
-  test_file "${SOL_FILE}" ${test_count} $num_tests "sol"
-done
-for YUL_FILE in "${YUL_FILES[@]}"
-do
-  test_count=$((test_count + 1))
-  test_file "${YUL_FILE}" ${test_count} $num_tests "yul"
-done
-
-echo "Summary: ${failed_count} of $num_tests sources failed."
-exit ${failed_count}
diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh
deleted file mode 100755
index 5d2235d21260..000000000000
--- a/scripts/test_emscripten.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script to execute the Solidity tests using the emscripten binary.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2017 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-if test -z "$1"; then
-	BUILD_DIR="emscripten_build"
-else
-	BUILD_DIR="$1"
-fi
-
-REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
-SOLJSON="$REPO_ROOT/$BUILD_DIR/libsolc/soljson.js"
-VERSION=$("$REPO_ROOT"/scripts/get_version.sh)
-
-echo "Running solcjs tests...."
-"$REPO_ROOT/test/externalTests/solc-js/solc-js.sh" "$SOLJSON" "$VERSION"
diff --git a/scripts/tests.sh b/scripts/tests.sh
deleted file mode 100755
index cb1766d9a1c6..000000000000
--- a/scripts/tests.sh
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script to execute the Solidity tests.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-REPO_ROOT="$(dirname "$0")/.."
-SOLIDITY_BUILD_DIR="${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}"
-IFS=" " read -r -a SMT_FLAGS <<< "$SMT_FLAGS"
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-WORKDIR=$(mktemp -d)
-CMDLINE_PID=
-
-function cleanup
-{
-    # ensure failing commands don't cause termination during cleanup (especially within safe_kill)
-    set +e
-
-    if [[ -n "$CMDLINE_PID" ]]
-    then
-        safe_kill "$CMDLINE_PID" "Commandline tests"
-    fi
-
-    echo "Cleaning up working directory ${WORKDIR} ..."
-    rm -rf "$WORKDIR" || true
-}
-trap cleanup INT TERM
-
-log_directory=""
-no_smt=""
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        --junit_report)
-            if [ -z "$2" ]
-            then
-                echo "Usage: $0 [--junit_report <report_directory>] [--no-smt]"
-                exit 1
-            else
-                log_directory="$2"
-            fi
-            shift
-            shift
-            ;;
-        --no-smt)
-            no_smt="--no-smt"
-            SMT_FLAGS+=(--no-smt)
-            shift
-            ;;
-        *)
-            echo "Usage: $0 [--junit_report <report_directory>] [--no-smt]"
-            exit 1
-    esac
-done
-
-printTask "Testing Python scripts..."
-"$REPO_ROOT/test/pyscriptTests.py"
-
-printTask "Testing LSP..."
-"$REPO_ROOT/test/lsp.py" "${SOLIDITY_BUILD_DIR}/solc/solc"
-
-printTask "Running commandline tests..."
-# Only run in parallel if this is run on CI infrastructure
-if [[ -n "$CI" ]]
-then
-    "$REPO_ROOT/test/cmdlineTests.sh" &
-    CMDLINE_PID=$!
-else
-    if ! "$REPO_ROOT/test/cmdlineTests.sh" "$no_smt"
-    then
-        printError "Commandline tests FAILED"
-        exit 1
-    fi
-fi
-
-
-EVM_VERSIONS="homestead byzantium"
-
-if [ -z "$CI" ]
-then
-    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris shanghai"
-fi
-
-# And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer
-# and homestead / byzantium VM
-for optimize in "" "--optimize"
-do
-    for vm in $EVM_VERSIONS
-    do
-        FORCE_ABIV1_RUNS="no"
-        if [[ "$vm" == "shanghai" ]]
-        then
-            FORCE_ABIV1_RUNS="no yes" # run both in paris
-        fi
-        for abiv1 in $FORCE_ABIV1_RUNS
-        do
-            force_abiv1_flag=()
-            if [[ "$abiv1" == "yes" ]]
-            then
-                force_abiv1_flag=(--abiencoderv1)
-            fi
-            printTask "--> Running tests using $optimize --evm-version $vm ${force_abiv1_flag[*]}..."
-
-            log=()
-            if [ -n "$log_directory" ]
-            then
-                if [ -n "$optimize" ]
-                then
-                    log+=("--logger=JUNIT,error,$log_directory/opt_$vm.xml")
-                else
-                    log+=("--logger=JUNIT,error,$log_directory/noopt_$vm.xml")
-                fi
-            fi
-
-            set +e
-            "${SOLIDITY_BUILD_DIR}"/test/soltest --show-progress "${log[@]}" -- --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" "${SMT_FLAGS[@]}" "${force_abiv1_flag[@]}"
-
-            if test "0" -ne "$?"; then
-                exit 1
-            fi
-            set -e
-
-        done
-    done
-done
-
-if [[ -n $CMDLINE_PID ]] && ! wait $CMDLINE_PID
-then
-    printError "Commandline tests FAILED"
-    CMDLINE_PID=
-    exit 1
-fi
-
-cleanup
diff --git a/scripts/uniqueErrors.sh b/scripts/uniqueErrors.sh
deleted file mode 100755
index dd92fc28765f..000000000000
--- a/scripts/uniqueErrors.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-REPO="$(dirname "$0")/.."
-
-echo "Finding unique failures..."
-(
-for x in "$@"
-do
-    echo -n "$x" " # "
-    # This subshell is a workaround to prevent the shell from printing
-    # "Aborted"
-    ("$REPO"/build/test/tools/solfuzzer < "$x" || true) 2>&1 | head -n 1
-done
-) | sort -u -t'#' -k 2
diff --git a/scripts/update_bugs_by_version.py b/scripts/update_bugs_by_version.py
deleted file mode 100755
index 442cd0fdcd95..000000000000
--- a/scripts/update_bugs_by_version.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-#
-# This script is used to generate the list of bugs per compiler version
-# from the list of bugs.
-# It updates the list in place and signals failure if there were changes.
-# This makes it possible to use this script as part of CI to check
-# that the list is up to date.
-
-import json
-import re
-from pathlib import Path
-
-def comp(version_string):
-    return [int(c) for c in version_string.split('.')]
-
-root_path = Path(__file__).resolve().parent.parent
-
-bugs = json.loads((root_path / 'docs/bugs.json').read_text(encoding='utf8'))
-
-versions = {}
-with (root_path / 'Changelog.md').open(encoding='utf8') as changelog:
-    for line in changelog:
-        m = re.search(r'^### (\S+) \((\d+-\d+-\d+)\)$', line)
-        if m:
-            versions[m.group(1)] = {}
-            versions[m.group(1)]['released'] = m.group(2)
-
-for key, value in versions.items():
-    value['bugs'] = []
-    for bug in bugs:
-        if 'introduced' in bug and comp(bug['introduced']) > comp(key):
-            continue
-        if comp(bug['fixed']) <= comp(key):
-            continue
-        value['bugs'] += [bug['name']]
-
-(root_path / 'docs/bugs_by_version.json').write_text(json.dumps(
-    versions,
-    sort_keys=True,
-    indent=4,
-    separators=(',', ': ')
-), encoding='utf8')
diff --git a/scripts/wasm-rebuild/README b/scripts/wasm-rebuild/README
deleted file mode 100644
index 8de79453a89e..000000000000
--- a/scripts/wasm-rebuild/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains scripts that we used to rebuild historic releases to webassembly.
-The rebuild took place at the time of Solidity version 0.6.1 and was used to rebuild all versions from 0.3.6 to 0.6.1.
-The scripts are not actively tested or maintained, but we keep them for future reference in case we want to rebuild
-historic releases again at a later point.
diff --git a/scripts/wasm-rebuild/docker-scripts/genbytecode.sh b/scripts/wasm-rebuild/docker-scripts/genbytecode.sh
deleted file mode 100755
index d568c54526f6..000000000000
--- a/scripts/wasm-rebuild/docker-scripts/genbytecode.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Script used for cross-platform comparison as part of the travis automation.
-# Splits all test source code into multiple files, generates bytecode and
-# uploads the bytecode into github.com/ethereum/solidity-test-bytecode where
-# another travis job is triggered to do the actual comparison.
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2017 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-SCRIPTDIR=$(dirname "$0")
-SCRIPTDIR=$(realpath "${SCRIPTDIR}")
-
-
-echo "Compiling all test contracts into bytecode..."
-TMPDIR=$(mktemp -d)
-(
-    cd "${TMPDIR}"
-    "${SCRIPTDIR}/isolate_tests.py" /src/test/
-
-    cat > solc <<EOF
-#!/usr/bin/env node
-var process = require('process')
-var fs = require('fs')
-
-var compiler = require('/root/solc-js/wrapper.js')(require("${1}"))
-
-for (var optimize of [false, true])
-{
-    for (var filename of process.argv.slice(2))
-    {
-        if (filename !== undefined)
-        {
-            var inputs = {}
-            inputs[filename] = { content: fs.readFileSync(filename).toString() }
-            var input = {
-                language: 'Solidity',
-                sources: inputs,
-                settings: {
-                    optimizer: { enabled: optimize },
-                    outputSelection: { '*': { '*': ['*'] } }
-                }
-            }
-            try {
-                var result = JSON.parse(compiler.compile(JSON.stringify(input)))
-                if (
-                    !('contracts' in result) ||
-                    Object.keys(result['contracts']).length === 0
-                )
-                {
-                    // NOTE: do not exit here because this may be run on source which cannot be compiled
-                    console.log(filename + ': ERROR')
-                }
-                else
-                {
-                    for (var outputName in result['contracts'])
-                        for (var contractName in result['contracts'][outputName])
-                        {
-                            var contractData = result['contracts'][outputName][contractName];
-                            if (contractData.evm !== undefined && contractData.evm.bytecode !== undefined)
-                                console.log(filename + ':' + contractName + ' ' + contractData.evm.bytecode.object)
-                            else
-                                console.log(filename + ':' + contractName + ' NO BYTECODE')
-                            console.log(filename + ':' + contractName + ' ' + contractData.metadata)
-                        }
-                }
-            } catch (e) {
-                console.log(filename + ': FATAL ERROR')
-                console.error(filename)
-                console.error(inputs)
-            }
-        }
-    }
-}
-EOF
-    chmod +x solc
-    ./solc -- *.sol > /tmp/report.txt
-)
-rm -rf "$TMPDIR"
diff --git a/scripts/wasm-rebuild/docker-scripts/isolate_tests.py b/scripts/wasm-rebuild/docker-scripts/isolate_tests.py
deleted file mode 100755
index 41487325edac..000000000000
--- a/scripts/wasm-rebuild/docker-scripts/isolate_tests.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python2
-#
-# Not actively tested or maintained. Exists in case we want to rebuild an
-# ancient release.
-
-import sys
-import re
-import os
-import hashlib
-# Pylint for some reason insists that isfile() is unused
-from os.path import join, isfile  # pylint: disable=unused-import
-
-
-def extract_test_cases(path):
-    with open(path, encoding="utf8", errors='ignore', mode='rb') as f:
-        lines = f.read().splitlines()
-
-    inside = False
-    delimiter = ''
-    tests = []
-
-    for l in lines:
-      if inside:
-        if l.strip().endswith(')' + delimiter + '";'):
-          tests[-1] += l.strip()[:-(3 + len(delimiter))]
-          inside = False
-        else:
-          tests[-1] += l + '\n'
-      else:
-        m = re.search(r'R"([^(]*)\((.*)$', l.strip())
-        if m:
-          inside = True
-          delimiter = m.group(1)
-          tests += [m.group(2)]
-
-    return tests
-
-def extract_and_write(f, path):
-    if f.endswith('.sol'):
-        with open(path, 'r', encoding='utf8') as _f:
-            cases = [_f.read()]
-    else:
-        cases = extract_test_cases(path)
-    write_cases(f, cases)
-
-def write_cases(f, tests):
-    cleaned_filename = f.replace(".","_").replace("-","_").replace(" ","_").lower()
-    for test in tests:
-        remainder = re.sub(r'^ {4}', '', test, 0, re.MULTILINE)
-        source_code_hash = hashlib.sha256(test).hexdigest()
-        with open(f'test_{source_code_hash}_{cleaned_filename}.sol', 'w', encoding='utf8') as _f:
-            _f.write(remainder)
-
-
-if __name__ == '__main__':
-    path = sys.argv[1]
-
-    for root, subdirs, files in os.walk(path):
-        if '_build' in subdirs:
-            subdirs.remove('_build')
-        for f in files:
-            path = join(root, f)
-            extract_and_write(f, path)
diff --git a/scripts/wasm-rebuild/docker-scripts/patch.sh b/scripts/wasm-rebuild/docker-scripts/patch.sh
deleted file mode 100755
index 0c536b46c3c6..000000000000
--- a/scripts/wasm-rebuild/docker-scripts/patch.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# If we ever want to patch the binaries e.g. for compatibility with older solc-js versions,
-# we can do that here.
-#
-# This script gets the following parameters:
-# - TAG
-# - SOLJSON_JS
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
deleted file mode 100755
index fbe5a9d6005f..000000000000
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash -e
-
-# Do not call this script directly.
-
-# This script is expected to be run inside the docker image trzeci/emscripten:sdk-tag-1.39.3-64bit and
-# be called by ./rebuild_tags.sh.
-
-echo "========== STAGE 1: PREPARE ========== ($(date))"
-COMMIT_DATE="$(git show -s --format=%cI HEAD)"
-git rev-parse --short=8 HEAD >commit_hash.txt
-echo -e "" >prerelease.txt
-sed -i -e 's/-Wl,--gc-sections//' cmake/EthCompilerSettings.cmake
-echo "set(CMAKE_CXX_FLAGS \"\${CMAKE_CXX_FLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap','addFunction','removeFunction','UTF8ToString','lengthBytesUTF8','_malloc','stringToUTF8','setValue'] -s WASM=1 -s WASM_ASYNC_COMPILATION=0 -s SINGLE_FILE=1 -Wno-almost-asm\")" >>cmake/EthCompilerSettings.cmake
-# Needed for < 0.5.0.
-sed -i -e 's/-Werror/-Wno-error/' cmake/EthCompilerSettings.cmake
-
-echo "========== STAGE 2: BUILD ========== ($(date))"
-scripts/travis-emscripten/install_deps.sh
-if [ -d cryptopp ]; then
-  # Needed for < 0.4.4. Will not affect >= 0.4.5.
-  # Unfortunately we need to update to the latest
-  # release in the 5.6 series for it to build.
-  # Hopefully we don't miss any bugs.
-  rm -rf cryptopp
-  git clone https://github.com/weidai11/cryptopp/
-  (
-    set -e
-    cd cryptopp
-    git checkout CRYPTOPP_5_6_5
-    ln -s . src
-  )
-fi
-if [ -d jsoncpp ]; then
-  # Needed for < 0.4.4. Will not affect >= 0.4.5.
-  (
-    set -e
-    cd jsoncpp
-    # Checkout the latest commit at the time of our release.
-    git checkout "$(git rev-list -1 --before="$COMMIT_DATE" master)"
-  )
-fi
-
-set +e
-
-if [ -e scripts/ci/build_emscripten.sh ]; then
-  scripts/ci/build_emscripten.sh
-else
-  # The script used to be in scripts/travis-emscripten/ in earlier versions.
-  scripts/travis-emscripten/build_emscripten.sh
-fi
-
-set -e
-
-mkdir -p upload
-
-if [ ! -f upload/soljson.js ]; then
-  if [ -f build/solc/soljson.js ]; then
-    cp build/solc/soljson.js upload
-  elif [ -f build/libsolc/soljson.js ]; then
-    cp build/libsolc/soljson.js upload
-  elif [ -f emscripten_build/solc/soljson.js ]; then
-    cp emscripten_build/solc/soljson.js upload
-  elif [ -f emscripten_build/libsolc/soljson.js ]; then
-    cp emscripten_build/libsolc/soljson.js upload
-  fi
-fi
-
-if [ -f upload/soljson.js ]; then
-  echo "========== SUCCESS ========== ($(date))"
-  exit 0
-else
-  echo "========== FAILURE ========== ($(date))"
-  exit 1
-fi
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
deleted file mode 100755
index 9ef9caaa8c3c..000000000000
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/bin/bash -e
-
-# This script is expected to be run inside the docker image trzeci/emscripten:sdk-tag-1.39.3-64bit.
-# Its main purpose is to be called by ../rebuild.sh.
-
-# Usage: $0 [tagFilter] [outputDirectory]
-
-# The output directory must be outside the repository,
-# since the script will prune the repository directory after
-# each build.
-
-TAG_FILTER="$1"
-OUTPUTDIR="$2"
-RETEST=0
-shift
-shift
-while (( "$#" )); do
-  if [[ "$1" == "--retest" ]]; then
-    RETEST=1
-  else
-    echo "Unrecognized option: $1"
-    exit 1
-  fi
-  shift
-done
-
-SOLIDITY_REPO_URL="https://github.com/ethereum/solidity"
-SOLC_JS_REPO_URL="https://github.com/ethereum/solc-js"
-SOLC_JS_BRANCH=wasmRebuildTests
-RELEASE_URL="https://binaries.soliditylang.org/bin"
-RELEASE_COMMIT_LIST_URL="$RELEASE_URL/list.txt"
-
-SCRIPTDIR=$(dirname "$0")
-SCRIPTDIR=$(realpath "${SCRIPTDIR}")
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-ORANGE='\033[0;33m'
-CYAN='\033[0;36m'
-RESET='\033[0m'
-
-function generate_bytecode_report
-{
-  rm -rf /tmp/report.txt
-
-  local EXIT_STATUS
-
-  if semver -r "<0.4.12" "$3" > /dev/null; then
-    set +e
-    "${SCRIPTDIR}/genbytecode.sh" "$1" >/dev/null 2>&1
-    EXIT_STATUS=$?
-    set -e
-  else
-    set +e
-    (
-      set -e
-
-      git reset --hard HEAD --quiet
-      git clean -f -d -x --quiet
-
-      for dir in build/solc build/libsolc emscripten_build/libsolc; do
-        mkdir -p $dir
-        rm -rf $dir/soljson.js
-        ln -sf "$1" $dir/soljson.js
-      done
-
-       /tmp/storebytecode.sh >/dev/null 2>&1
-    )
-    EXIT_STATUS=$?
-  fi
-
-  if [ $EXIT_STATUS -eq 0 ] && [ -f /tmp/report.txt ] && grep -q -v -c -e "ERROR" -e "NO BYTECODE" /tmp/report.txt; then
-    mv /tmp/report.txt "$2"
-    echo -e "${GREEN}SUCCESS${RESET}"
-  else
-    echo -e "${RED}FAILURE${RESET}"
-  fi
-}
-function clean_git_checkout
-{
-  git submodule deinit --all -q
-  git reset --hard HEAD --quiet
-  git clean -f -d -x --quiet
-  git checkout "$1" --quiet
-  git submodule init -q
-  git submodule update -q
-}
-function process_tag
-{
-  local TAG=$1
-  cd /src
-  # Checkout the historic commit instead of the tag directly.
-  local HISTORIC_COMMIT_HASH; HISTORIC_COMMIT_HASH="$(grep "${TAG}+" /tmp/release_commit_list.txt | cut -d '+' -f 2 | cut -d '.' -f 2)"
-  if [ "$(git cat-file -t "${HISTORIC_COMMIT_HASH}" 2>/dev/null)" == "commit" ]; then
-    clean_git_checkout "$HISTORIC_COMMIT_HASH"
-  else
-    clean_git_checkout "${TAG}"
-  fi
-
-  # compatibility symlink
-  ln -s . solidity
-
-  local VERSION
-  if [ -f ./scripts/get_version.sh ]; then
-    VERSION=$(./scripts/get_version.sh)
-  else
-    VERSION=$(echo "$TAG" | cut -d v -f 2)
-  fi
-
-  local COMMIT_HASH; COMMIT_HASH=$(git rev-parse --short=8 HEAD)
-  local FULL_VERSION_SUFFIX="${TAG}+commit.${COMMIT_HASH}"
-  local HISTORIC_VERSION_SUFFIX="${TAG}+commit.${HISTORIC_COMMIT_HASH}"
-
-  if [ ! -f "${OUTPUTDIR}/bin/soljson-${FULL_VERSION_SUFFIX}.js" ]; then
-    echo -ne "BUILDING ${CYAN}${TAG}${RESET}... "
-    set +e
-    (
-      set -e
-      "${SCRIPTDIR}/rebuild_current.sh" "${VERSION}" >"${OUTPUTDIR}/log/running/build-$TAG.txt" 2>&1
-      "${SCRIPTDIR}/patch.sh" "$TAG" upload/soljson.js
-      cp upload/soljson.js "${OUTPUTDIR}/bin/soljson-${FULL_VERSION_SUFFIX}.js"
-      rm upload/soljson.js
-    )
-    local EXIT_STATUS=$?
-    set -e
-    rm -f "${OUTPUTDIR}/log/success/build-$TAG.txt"
-    rm -f "${OUTPUTDIR}/log/fail/build-$TAG.txt"
-    if [ $EXIT_STATUS -eq 0 ]; then
-      mv "${OUTPUTDIR}/log/running/build-$TAG.txt" "${OUTPUTDIR}/log/success"
-      echo -e "${GREEN}SUCCESS${RESET}"
-    else
-      mv "${OUTPUTDIR}/log/running/build-$TAG.txt" "${OUTPUTDIR}/log/fail"
-      echo -e "${RED}FAIL${RESET}"
-    fi
-  else
-    echo -e "${CYAN}${TAG}${RESET} ALREADY EXISTS."
-    if [ $RETEST -eq 0 ]; then
-      return 0
-    fi
-  fi
-
-  if [ -f "${OUTPUTDIR}/bin/soljson-${FULL_VERSION_SUFFIX}.js" ]; then
-
-    echo -ne "GENERATE BYTECODE REPORT FOR ${CYAN}${TAG}${RESET}... "
-    generate_bytecode_report "${OUTPUTDIR}/bin/soljson-${FULL_VERSION_SUFFIX}.js" "${OUTPUTDIR}/log/reports/report-${TAG}.txt" "${TAG}"
-    echo -ne "GENERATE BYTECODE REPORT FOR HISTORIC ${CYAN}${TAG}${RESET}... "
-    rm -rf /tmp/soljson.js
-    if wget -q "$RELEASE_URL/soljson-${HISTORIC_VERSION_SUFFIX}.js" -O /tmp/soljson.js; then
-      generate_bytecode_report /tmp/soljson.js "${OUTPUTDIR}/log/reports/report-historic-${TAG}.txt" "${TAG}"
-    else
-      echo -e "${ORANGE}CANNOT FETCH RELEASE${RESET}"
-    fi
-    rm -rf /tmp/soljson.js
-
-    if [ -f "${OUTPUTDIR}/log/reports/report-${TAG}.txt" ] && [ -f "${OUTPUTDIR}/log/reports/report-historic-${TAG}.txt" ]; then
-      rm -rf "${OUTPUTDIR}/log/success/bytecode-${TAG}.txt"
-      rm -rf "${OUTPUTDIR}/log/fail/bytecode-${TAG}.txt"
-      if diff -q "${OUTPUTDIR}/log/reports/report-${TAG}.txt" "${OUTPUTDIR}/log/reports/report-historic-${TAG}.txt" >/dev/null 2>&1; then
-        echo -e "${GREEN}BYTECODE MATCHES FOR ${CYAN}${TAG}${RESET}"
-        grep -v -c -e "ERROR" -e "NO BYTECODE" "${OUTPUTDIR}/log/reports/report-${TAG}.txt" >"${OUTPUTDIR}/log/success/bytecode-${TAG}.txt"
-      else
-        echo -e "${RED}BYTECODE DOES NOT MATCH FOR ${CYAN}${TAG}${RESET}"
-        echo "MISMATCH" >"${OUTPUTDIR}/log/fail/bytecode-${TAG}.txt"
-      fi
-    fi
-
-    echo -ne "TESTING ${CYAN}${TAG}${RESET}... "
-    cd /root/solc-js
-    npm version --allow-same-version --no-git-tag-version "${VERSION}" >/dev/null
-    sed -i -e "s/runTests(solc, .*)/runTests(solc, '${FULL_VERSION_SUFFIX}')/" test/compiler.js
-    ln -sf "${OUTPUTDIR}/bin/soljson-${FULL_VERSION_SUFFIX}.js" soljson.js
-    rm -f "${OUTPUTDIR}/log/success/test-$TAG.txt"
-    rm -f "${OUTPUTDIR}/log/fail/test-$TAG.txt"
-    if npm test >"${OUTPUTDIR}/log/running/test-$TAG.txt" 2>&1; then
-      mv "${OUTPUTDIR}/log/running/test-$TAG.txt" "${OUTPUTDIR}/log/success"
-      echo -e "${GREEN}SUCCESS${RESET}"
-    else
-      mv "${OUTPUTDIR}/log/running/test-$TAG.txt" "${OUTPUTDIR}/log/fail"
-      echo -e "${RED}FAIL${RESET}"
-    fi
-  fi
-}
-
-cd /tmp
-
-echo "Check out solidity repository..."
-if [ -d /root/project ]; then
-  echo "Solidity repo checkout already exists."
-else
-  git clone "${SOLIDITY_REPO_URL}" /root/project --quiet
-fi
-
-echo "Extract bytecode comparison scripts from v0.6.1..."
-cd /root/project
-git checkout v0.6.1 --quiet
-cp scripts/bytecodecompare/storebytecode.sh /tmp
-# shellcheck disable=SC2016
-sed -i -e 's/rm -rf "\$TMPDIR"/cp "\$TMPDIR"\/report.txt \/tmp\/report.txt ; rm -rf "\$TMPDIR"/' /tmp/storebytecode.sh
-sed -i -e 's/REPO_ROOT=.*/REPO_ROOT=\/src/' /tmp/storebytecode.sh
-sed -i -e 's/git clone/git clone --branch '"${SOLC_JS_BRANCH}"'/' /tmp/storebytecode.sh
-export SOLC_EMSCRIPTEN="On"
-
-echo "Check out solc-js repository..."
-if [ -d /root/solc-js ]; then
-  echo "solc-js repo checkout already exists."
-else
-  git clone --branch "${SOLC_JS_BRANCH}" "${SOLC_JS_REPO_URL}" /root/solc-js --quiet
-fi
-
-echo "Create symbolic links for backwards compatibility with older emscripten docker images."
-ln -sf /emsdk_portable/node/current/* /emsdk_portable/node/
-ln -sf /emsdk_portable/emscripten/sdk/ /emsdk_portable/
-ln -sf sdk /emsdk_portable/emscripten/bin
-ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin
-rm -rf /src
-ln -sf /root/project /src
-
-echo "Install dependencies and upgrade system packages."
-apt-get -qq update >/dev/null 2>&1
-apt-get -qq upgrade >/dev/null 2>&1
-apt-get -qq install cmake >/dev/null 2>&1
-
-echo "Create output directories."
-mkdir -p "${OUTPUTDIR}"
-mkdir -p "${OUTPUTDIR}"/log
-mkdir -p "${OUTPUTDIR}"/log/success
-mkdir -p "${OUTPUTDIR}"/log/fail
-mkdir -p "${OUTPUTDIR}"/log/running
-mkdir -p "${OUTPUTDIR}"/log/reports
-mkdir -p "${OUTPUTDIR}"/bin
-
-echo "Prepare solc-js."
-cd /root/solc-js
-npm install >/dev/null 2>&1
-
-echo "Install semver helper."
-npm install -g semver >/dev/null 2>&1
-
-echo "Fetching release commit list."
-wget -q "${RELEASE_COMMIT_LIST_URL}" -O /tmp/release_commit_list.txt
-
-cd /src
-TAGS=$(git tag --list "${TAG_FILTER}" | tac)
-echo "Matching tags: ${TAGS}"
-for TAG in ${TAGS}; do
-  process_tag "${TAG}"
-done
diff --git a/scripts/wasm-rebuild/rebuild.sh b/scripts/wasm-rebuild/rebuild.sh
deleted file mode 100755
index b12940a5b47a..000000000000
--- a/scripts/wasm-rebuild/rebuild.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# This script is expected to produce working builds for all compiler versions >= 0.3.6 and
-# succeeding solc-js test runs for all compiler versions >= 0.5.0.
-
-if [ $# -lt 2 ]; then
-  echo "Usage: $0 [tagFilter] [outputDirectory] [options...]"
-  echo
-  echo "  [tagFilter] will be passed to "git tag --list" to filter the tags to be built."
-  echo "  [outputDirectory] will contain log files and the resulting soljson.js builds."
-  echo "  --retest will re-run tests and bytecode comparisons, even if soljson.js is already built."
-  exit 1
-fi
-
-TAGS="$1"
-OUTPUTDIR="$2"
-shift
-shift
-SCRIPTDIR=$(dirname "$0")
-SCRIPTDIR=$(realpath "${SCRIPTDIR}")
-
-if [ ! -d "${OUTPUTDIR}" ]; then
-  echo "Output directory ${OUTPUTDIR} does not exist!."
-  exit 1
-fi
-OUTPUTDIR=$(realpath "${OUTPUTDIR}")
-
-docker run --rm -v "${OUTPUTDIR}":/tmp/output -v "${SCRIPTDIR}":/tmp/scripts:ro -it trzeci/emscripten:sdk-tag-1.39.3-64bit /tmp/scripts/docker-scripts/rebuild_tags.sh "${TAGS}" /tmp/output "$@"
diff --git a/scripts/yul_coverage.sh b/scripts/yul_coverage.sh
deleted file mode 100755
index b2b16675c532..000000000000
--- a/scripts/yul_coverage.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script to determine the percentage of tests that are compilable via Yul.
-#
-# Usage:
-#  ./yul_coverage.sh [--no-stats] [--successful] [--internal-compiler-errors]
-#                                 [--unimplemented-feature-errors] [--other-errors] [--list-files]
-#
-#    --no-stats                     will not print the stats to stdout
-#    --successful                   print output of successful test-case compilations to stdout
-#    --internal-compiler-errors     print output of test-case compilations that resulted in
-#                                   internal compilation errors to stdout
-#    --unimplemented-feature-errors print output of test-case compilations that resulted in
-#                                   unimplemented feature errors to stdout
-#    --other-errors                 print output of test-case compilations that resulted in
-#                                   errors that where not internal compiler errors or unimplemented feature errors
-#                                   to stdout
-#    --list-files                   will not print the compiler output to stdout, it will just print the files
-#                                   e.g. ./yul_coverage.sh --successful --list-files will just return a list of
-#                                   files where it's compilation result was successful
-#   Environment Variables
-#     SOLC can be set to change the used compiler.
-#
-#   ./yul_coverage.sh
-#   run the script without any parameters to execute the tests will return stats.
-#
-#   SOLC=<path-to-solc> ./yul_coverage.sh
-#   To change the used compiler, just set the SOLC environment variable.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2020 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-ROOT_DIR="$(dirname "$0")"/..
-
-for arg in "$@"; do
-  case "$arg" in
-  --no-stats) NO_STATS=1 ;;
-  --successful) SHOW_SUCCESSFUL=1 ;;
-  --internal-compiler-errors) SHOW_INTERNAL_COMPILER_ERRORS=1 ;;
-  --unimplemented-feature-errors) SHOW_UNIMPLEMENTED_FEATURE_ERRORS=1 ;;
-  --other-errors) SHOW_OTHER_ERRORS=1 ;;
-  --list-files) ONLY_LIST_FILES=1 ;;
-  *)
-    echo "Usage:"
-    echo "  $(basename "${0}") [--no-stats] [--successful] [--internal-compiler-errors] [--unimplemented-feature-errors] [--other-errors] [--list-files]"
-    echo "  --no-stats                     will not print the stats to stdout"
-    echo "  --successful                   print output of successful test-case compilations to stdout"
-    echo "  --internal-compiler-errors     print output of test-case compilations that resulted in"
-    echo "                                 internal compilation errors to stdout"
-    echo "  --unimplemented-feature-errors print output of test-case compilations that resulted in"
-    echo "                                 unimplemented feature errors to stdout"
-    echo "  --other-errors                 print output of test-case compilations that resulted in"
-    echo "                                 errors that where not internal compiler errors or unimplemented feature errors"
-    echo "                                 to stdout"
-    echo "  --list-files                   will not print the compiler output to stdout, it will just print the files"
-    echo "                                 e.g. './yul_coverage.sh --successful --list-files' will just return a list of"
-    echo "                                 files where it's compilation result was successful"
-    exit 0
-    ;;
-  esac
-done
-
-function show_output_if
-{
-  local VAR=${1}
-  if [ -n "${VAR}" ]; then
-    echo "${SOL_FILE}"
-    if [ -z "${ONLY_LIST_FILES}" ]; then
-      echo "${OUTPUT}"
-      echo ""
-    fi
-  fi
-}
-
-FAILED=()
-SUCCESS=()
-SOLC=${SOLC:-"$(command -v -- solc)"}
-if [ ! -f "${SOLC}" ]; then
-  echo "error: solc '${SOLC}' not found."
-  exit 1
-fi
-
-function test_file
-{
-  local SOL_FILE
-  local OUTPUT
-  SOL_FILE=${1}
-
-  if OUTPUT=$("${SOLC}" --ir "${SOL_FILE}" 2>&1); then
-    SUCCESS+=("${SOL_FILE}")
-    show_output_if ${SHOW_SUCCESSFUL}
-  else
-    FAILED+=("${SOL_FILE}")
-    if [[ ${OUTPUT} == *"UnimplementedFeatureError"* ]]; then
-      UNIMPLEMENTED_FEATURE_ERRORS+=("${SOL_FILE}")
-      show_output_if ${SHOW_UNIMPLEMENTED_FEATURE_ERRORS}
-    elif [[ ${OUTPUT} == *"InternalCompilerError"* ]]; then
-      INTERNAL_COMPILER_ERRORS+=("${SOL_FILE}")
-      show_output_if ${SHOW_INTERNAL_COMPILER_ERRORS}
-    else
-      OTHER_ERRORS+=("${SOL_FILE}")
-      show_output_if ${SHOW_OTHER_ERRORS}
-    fi
-  fi
-}
-
-# we only want to use files that do not contain errors or multi-source files.
-SOL_FILES=()
-while IFS='' read -r line; do
-  SOL_FILES+=("$line")
-done < <(
-  grep -riL -E \
-    "^\/\/ (DocstringParsing|Syntax|Type|Parser|Declaration)Error|^==== Source:" \
-    "${ROOT_DIR}/test/libsolidity/syntaxTests" \
-    "${ROOT_DIR}/test/libsolidity/semanticTests"
-)
-
-for SOL_FILE in "${SOL_FILES[@]}"; do
-  test_file "${SOL_FILE}"
-done
-
-if [ -z "${NO_STATS}" ]; then
-  SUM=$((${#SUCCESS[@]} + ${#FAILED[@]}))
-  PERCENTAGE=$(echo "scale=4; ${#SUCCESS[@]} / ${SUM}" | bc)
-  echo "${#SUCCESS[@]} / ${SUM} = ${PERCENTAGE}"
-  echo "UnimplementedFeatureError(s): ${#UNIMPLEMENTED_FEATURE_ERRORS[@]}"
-  echo "InternalCompilerError(s): ${#INTERNAL_COMPILER_ERRORS[@]}"
-  echo "OtherError(s): ${#OTHER_ERRORS[@]}"
-fi
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index e462823e8991..000000000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: solc
-version: develop
-version-script: git describe --exact-match --tags 2> /dev/null || echo "develop"
-summary: The Solidity Contract-Oriented Programming Language
-description: |
-  Solidity is a contract-oriented, high-level language whose syntax is similar
-  to that of JavaScript and it is designed to target the Ethereum Virtual
-  Machine (EVM).
-
-  Solidity is statically typed, supports inheritance, libraries and complex
-  user-defined types among other features.
-
-  It is possible to create contracts for voting, crowdfunding, blind auctions,
-  multi-signature wallets and more.
-
-base: core20
-grade: stable
-confinement: strict
-
-apps:
-  solc:
-    command: usr/local/bin/solc
-    plugs: [home]
-
-parts:
-  solidity:
-    source: .
-    source-type: git
-    plugin: cmake
-    build-packages: [build-essential, libboost-all-dev]
-    stage-packages: [libicu66]
-    override-build: |
-      if git describe --exact-match --tags 2> /dev/null
-      then
-        echo -n > ../src/prerelease.txt
-      fi
-      snapcraftctl build
-    after: [z3, cvc4]
-  z3:
-    source: https://github.com/Z3Prover/z3.git
-    source-tag: z3-4.8.4
-    plugin: make
-    build-packages: [python3]
-    stage-packages: [libstdc++6, libgomp1]
-    override-build: |
-      python3 scripts/mk_make.py
-      cd build
-      make -j -l $(grep -c "^processor" /proc/cpuinfo)
-      make install DESTDIR=$SNAPCRAFT_PART_INSTALL
-  cvc4:
-    source: https://github.com/CVC4/CVC4.git
-    source-tag: "1.8"
-    plugin: nil
-    build-packages: [python3, python3-toml, cmake, openjdk-11-jre, libgmp-dev, wget, antlr3, libantlr3c-3.4-0, libantlr3c-dev]
-    override-build: |
-      ./configure.sh --python3 --prefix=$SNAPCRAFT_STAGE/usr
-      cd build
-      make -j -l $(grep -c "^processor" /proc/cpuinfo)
-      make install
-      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/
-      cp $SNAPCRAFT_STAGE/usr/lib/libcvc4.so.7 $SNAPCRAFT_PART_INSTALL/usr/lib/
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
deleted file mode 100644
index 8d9d2b364cd8..000000000000
--- a/solc/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-set(libsolcli_sources
-	CommandLineInterface.cpp CommandLineInterface.h
-	CommandLineParser.cpp CommandLineParser.h
-	Exceptions.h
-)
-
-add_library(solcli ${libsolcli_sources})
-target_link_libraries(solcli PUBLIC solidity Boost::boost Boost::program_options)
-
-set(sources main.cpp)
-
-add_executable(solc ${sources})
-target_link_libraries(solc PRIVATE solcli)
-
-include(GNUInstallDirs)
-install(TARGETS solc DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
-if(SOLC_LINK_STATIC AND UNIX AND NOT APPLE)
-	# Produce solc as statically linked binary (includes C/C++ standard libraries)
-	# This is not supported on macOS, see
-	# https://developer.apple.com/library/content/qa/qa1118/_index.html.
-	set_target_properties(
-		solc PROPERTIES
-		LINK_FLAGS -static
-		LINK_SEARCH_START_STATIC ON
-		LINK_SEARCH_END_STATIC ON
-	)
-elseif(SOLC_STATIC_STDLIBS AND UNIX AND NOT APPLE)
-	set_target_properties(
-		solc PROPERTIES
-		LINK_FLAGS "-static-libgcc -static-libstdc++"
-	)
-endif()
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
deleted file mode 100644
index 7181bfd4cc7e..000000000000
--- a/solc/CommandLineInterface.cpp
+++ /dev/null
@@ -1,1340 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris <lefteris@ethdev.com>
- * @author Gav Wood <g@ethdev.com>
- * @date 2014
- * Solidity command line interface.
- */
-#include <solc/CommandLineInterface.h>
-
-#include <solc/Exceptions.h>
-
-#include "license.h"
-#include "solidity/BuildInfo.h"
-
-#include <libsolidity/interface/Version.h>
-#include <libsolidity/ast/ASTJsonExporter.h>
-#include <libsolidity/ast/ASTJsonImporter.h>
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/StandardCompiler.h>
-#include <libsolidity/interface/GasEstimator.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <libsolidity/interface/ImportRemapper.h>
-#include <libsolidity/interface/StorageLayout.h>
-#include <libsolidity/lsp/LanguageServer.h>
-#include <libsolidity/lsp/Transport.h>
-
-#include <libyul/YulStack.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/Disassemble.h>
-#include <libevmasm/GasMeter.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsmtutil/Exceptions.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/JSON.h>
-
-#include <algorithm>
-#include <fstream>
-#include <memory>
-
-#include <range/v3/view/map.hpp>
-
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/algorithm/string.hpp>
-
-#ifdef _WIN32 // windows
-	#include <io.h>
-	#define isatty _isatty
-	#define fileno _fileno
-#else // unix
-	#include <unistd.h>
-#endif
-
-#include <fstream>
-
-#if !defined(STDERR_FILENO)
-	#define STDERR_FILENO 2
-#endif
-
-using namespace std::string_literals;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-namespace
-{
-
-std::set<frontend::InputMode> const CompilerInputModes{
-	frontend::InputMode::Compiler,
-	frontend::InputMode::CompilerWithASTImport,
-};
-
-} // anonymous namespace
-
-namespace solidity::frontend
-{
-
-std::ostream& CommandLineInterface::sout(bool _markAsUsed)
-{
-	if (_markAsUsed)
-		m_hasOutput = true;
-	return m_sout;
-}
-
-std::ostream& CommandLineInterface::serr(bool _markAsUsed)
-{
-	if (_markAsUsed)
-		m_hasOutput = true;
-	return m_serr;
-}
-
-#define cin
-#define cout
-#define cerr
-
-static std::string const g_stdinFileName = "<stdin>";
-static std::string const g_strAbi = "abi";
-static std::string const g_strAsm = "asm";
-static std::string const g_strAst = "ast";
-static std::string const g_strBinary = "bin";
-static std::string const g_strBinaryRuntime = "bin-runtime";
-static std::string const g_strContracts = "contracts";
-static std::string const g_strFunDebug = "function-debug";
-static std::string const g_strFunDebugRuntime = "function-debug-runtime";
-static std::string const g_strGeneratedSources = "generated-sources";
-static std::string const g_strGeneratedSourcesRuntime = "generated-sources-runtime";
-static std::string const g_strNatspecDev = "devdoc";
-static std::string const g_strNatspecUser = "userdoc";
-static std::string const g_strOpcodes = "opcodes";
-static std::string const g_strSignatureHashes = "hashes";
-static std::string const g_strSourceList = "sourceList";
-static std::string const g_strSources = "sources";
-static std::string const g_strSrcMap = "srcmap";
-static std::string const g_strSrcMapRuntime = "srcmap-runtime";
-static std::string const g_strStorageLayout = "storage-layout";
-static std::string const g_strVersion = "version";
-
-static bool needsHumanTargetedStdout(CommandLineOptions const& _options)
-{
-	if (_options.compiler.estimateGas)
-		return true;
-	if (!_options.output.dir.empty())
-		return false;
-	return
-		_options.compiler.outputs.abi ||
-		_options.compiler.outputs.asm_ ||
-		_options.compiler.outputs.asmJson ||
-		_options.compiler.outputs.binary ||
-		_options.compiler.outputs.binaryRuntime ||
-		_options.compiler.outputs.metadata ||
-		_options.compiler.outputs.natspecUser ||
-		_options.compiler.outputs.natspecDev ||
-		_options.compiler.outputs.opcodes ||
-		_options.compiler.outputs.signatureHashes ||
-		_options.compiler.outputs.storageLayout;
-}
-
-static bool coloredOutput(CommandLineOptions const& _options)
-{
-	return
-		(!_options.formatting.coloredOutput.has_value() && isatty(STDERR_FILENO)) ||
-		(_options.formatting.coloredOutput.has_value() && _options.formatting.coloredOutput.value());
-}
-
-void CommandLineInterface::handleEVMAssembly(std::string const& _contract)
-{
-	solAssert(m_assemblyStack);
-	solAssert(
-		CompilerInputModes.count(m_options.input.mode) == 1 ||
-		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
-	);
-
-	if (!m_options.compiler.outputs.asm_ && !m_options.compiler.outputs.asmJson)
-		return;
-
-	std::string assembly;
-	if (m_options.compiler.outputs.asmJson)
-		assembly = util::jsonPrint(removeNullMembers(m_assemblyStack->assemblyJSON(_contract)), m_options.formatting.json);
-	else
-		assembly = m_assemblyStack->assemblyString(_contract, m_fileReader.sourceUnits());
-
-	if (!m_options.output.dir.empty())
-		createFile(
-			m_compiler->filesystemFriendlyName(_contract) +
-			(m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"),
-			assembly
-		);
-	else
-		sout() << "EVM assembly:" << std::endl << assembly << std::endl;
-}
-
-void CommandLineInterface::handleBinary(std::string const& _contract)
-{
-	solAssert(m_assemblyStack);
-	solAssert(
-		CompilerInputModes.count(m_options.input.mode) == 1 ||
-		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
-	);
-
-	std::string binary;
-	std::string binaryRuntime;
-	if (m_options.compiler.outputs.binary)
-		binary = objectWithLinkRefsHex(m_assemblyStack->object(_contract));
-	if (m_options.compiler.outputs.binaryRuntime)
-		binaryRuntime = objectWithLinkRefsHex(m_assemblyStack->runtimeObject(_contract));
-
-	if (m_options.compiler.outputs.binary)
-	{
-		if (!m_options.output.dir.empty())
-			createFile(m_assemblyStack->filesystemFriendlyName(_contract) + ".bin", binary);
-		else
-		{
-			sout() << "Binary:" << std::endl;
-			sout() << binary << std::endl;
-		}
-	}
-	if (m_options.compiler.outputs.binaryRuntime)
-	{
-		if (!m_options.output.dir.empty())
-			createFile(m_assemblyStack->filesystemFriendlyName(_contract) + ".bin-runtime", binaryRuntime);
-		else
-		{
-			sout() << "Binary of the runtime part:" << std::endl;
-			sout() << binaryRuntime << std::endl;
-		}
-	}
-}
-
-void CommandLineInterface::handleOpcode(std::string const& _contract)
-{
-	solAssert(m_assemblyStack);
-	solAssert(
-		CompilerInputModes.count(m_options.input.mode) == 1 ||
-		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
-	);
-
-	std::string opcodes{evmasm::disassemble(m_assemblyStack->object(_contract).bytecode, m_options.output.evmVersion)};
-
-	if (!m_options.output.dir.empty())
-		createFile(m_assemblyStack->filesystemFriendlyName(_contract) + ".opcode", opcodes);
-	else
-	{
-		sout() << "Opcodes:" << std::endl;
-		sout() << std::uppercase << opcodes;
-		sout() << std::endl;
-	}
-}
-
-void CommandLineInterface::handleIR(std::string const& _contractName)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.ir)
-		return;
-
-	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contractName) + ".yul", m_compiler->yulIR(_contractName));
-	else
-	{
-		sout() << "IR:" << std::endl;
-		sout() << m_compiler->yulIR(_contractName) << std::endl;
-	}
-}
-
-void CommandLineInterface::handleIRAst(std::string const& _contractName)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.irAstJson)
-		return;
-
-	if (!m_options.output.dir.empty())
-		createFile(
-			m_compiler->filesystemFriendlyName(_contractName) + "_yul_ast.json",
-			util::jsonPrint(
-				m_compiler->yulIRAst(_contractName),
-				m_options.formatting.json
-			)
-		);
-	else
-	{
-		sout() << "IR AST:" << std::endl;
-		sout() << util::jsonPrint(
-			m_compiler->yulIRAst(_contractName),
-			m_options.formatting.json
-		) << std::endl;
-	}
-}
-
-void CommandLineInterface::handleIROptimized(std::string const& _contractName)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.irOptimized)
-		return;
-
-	if (!m_options.output.dir.empty())
-		createFile(
-			m_compiler->filesystemFriendlyName(_contractName) + "_opt.yul",
-			m_compiler->yulIROptimized(_contractName)
-		);
-	else
-	{
-		sout() << "Optimized IR:" << std::endl;
-		sout() << m_compiler->yulIROptimized(_contractName) << std::endl;
-	}
-}
-
-void CommandLineInterface::handleIROptimizedAst(std::string const& _contractName)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.irOptimizedAstJson)
-		return;
-
-	if (!m_options.output.dir.empty())
-		createFile(
-			m_compiler->filesystemFriendlyName(_contractName) + "_opt_yul_ast.json",
-			util::jsonPrint(
-				m_compiler->yulIROptimizedAst(_contractName),
-				m_options.formatting.json
-			)
-		);
-	else
-	{
-		sout() << "Optimized IR AST:" << std::endl;
-		sout() << util::jsonPrint(
-			m_compiler->yulIROptimizedAst(_contractName),
-			m_options.formatting.json
-		) << std::endl;
-	}
-}
-
-void CommandLineInterface::handleBytecode(std::string const& _contract)
-{
-	solAssert(
-		CompilerInputModes.count(m_options.input.mode) == 1 ||
-		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
-	);
-
-	if (m_options.compiler.outputs.opcodes)
-		handleOpcode(_contract);
-	if (m_options.compiler.outputs.binary || m_options.compiler.outputs.binaryRuntime)
-		handleBinary(_contract);
-}
-
-void CommandLineInterface::handleSignatureHashes(std::string const& _contract)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.signatureHashes)
-		return;
-
-	Json::Value interfaceSymbols = m_compiler->interfaceSymbols(_contract);
-	std::string out = "Function signatures:\n";
-	for (auto const& name: interfaceSymbols["methods"].getMemberNames())
-		out += interfaceSymbols["methods"][name].asString() + ": " + name + "\n";
-
-	if (interfaceSymbols.isMember("errors"))
-	{
-		out += "\nError signatures:\n";
-		for (auto const& name: interfaceSymbols["errors"].getMemberNames())
-			out += interfaceSymbols["errors"][name].asString() + ": " + name + "\n";
-	}
-
-	if (interfaceSymbols.isMember("events"))
-	{
-		out += "\nEvent signatures:\n";
-		for (auto const& name: interfaceSymbols["events"].getMemberNames())
-			out += interfaceSymbols["events"][name].asString() + ": " + name + "\n";
-	}
-
-	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contract) + ".signatures", out);
-	else
-		sout() << out;
-}
-
-void CommandLineInterface::handleMetadata(std::string const& _contract)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.metadata)
-		return;
-
-	std::string data = m_compiler->metadata(_contract);
-	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contract) + "_meta.json", data);
-	else
-		sout() << "Metadata:" << std::endl << data << std::endl;
-}
-
-void CommandLineInterface::handleABI(std::string const& _contract)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.abi)
-		return;
-
-	std::string data = jsonPrint(removeNullMembers(m_compiler->contractABI(_contract)), m_options.formatting.json);
-	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contract) + ".abi", data);
-	else
-		sout() << "Contract JSON ABI" << std::endl << data << std::endl;
-}
-
-void CommandLineInterface::handleStorageLayout(std::string const& _contract)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.storageLayout)
-		return;
-
-	std::string data = jsonPrint(removeNullMembers(m_compiler->storageLayout(_contract)), m_options.formatting.json);
-	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contract) + "_storage.json", data);
-	else
-		sout() << "Contract Storage Layout:" << std::endl << data << std::endl;
-}
-
-void CommandLineInterface::handleNatspec(bool _natspecDev, std::string const& _contract)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	bool enabled = false;
-	std::string suffix;
-	std::string title;
-
-	if (_natspecDev)
-	{
-		enabled = m_options.compiler.outputs.natspecDev;
-		suffix = ".docdev";
-		title = "Developer Documentation";
-	}
-	else
-	{
-		enabled = m_options.compiler.outputs.natspecUser;
-		suffix = ".docuser";
-		title = "User Documentation";
-	}
-
-	if (enabled)
-	{
-		std::string output = jsonPrint(
-			removeNullMembers(
-				_natspecDev ?
-				m_compiler->natspecDev(_contract) :
-				m_compiler->natspecUser(_contract)
-			),
-			m_options.formatting.json
-		);
-
-		if (!m_options.output.dir.empty())
-			createFile(m_compiler->filesystemFriendlyName(_contract) + suffix, output);
-		else
-		{
-			sout() << title << std::endl;
-			sout() << output << std::endl;
-		}
-
-	}
-}
-
-void CommandLineInterface::handleGasEstimation(std::string const& _contract)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	Json::Value estimates = m_compiler->gasEstimates(_contract);
-	sout() << "Gas estimation:" << std::endl;
-
-	if (estimates["creation"].isObject())
-	{
-		Json::Value creation = estimates["creation"];
-		sout() << "construction:" << std::endl;
-		sout() << "   " << creation["executionCost"].asString();
-		sout() << " + " << creation["codeDepositCost"].asString();
-		sout() << " = " << creation["totalCost"].asString() << std::endl;
-	}
-
-	if (estimates["external"].isObject())
-	{
-		Json::Value externalFunctions = estimates["external"];
-		sout() << "external:" << std::endl;
-		for (auto const& name: externalFunctions.getMemberNames())
-		{
-			if (name.empty())
-				sout() << "   fallback:\t";
-			else
-				sout() << "   " << name << ":\t";
-			sout() << externalFunctions[name].asString() << std::endl;
-		}
-	}
-
-	if (estimates["internal"].isObject())
-	{
-		Json::Value internalFunctions = estimates["internal"];
-		sout() << "internal:" << std::endl;
-		for (auto const& name: internalFunctions.getMemberNames())
-		{
-			sout() << "   " << name << ":\t";
-			sout() << internalFunctions[name].asString() << std::endl;
-		}
-	}
-}
-
-void CommandLineInterface::readInputFiles()
-{
-	solAssert(!m_standardJsonInput.has_value());
-
-	if (m_options.input.noImportCallback)
-		m_universalCallback.resetImportCallback();
-
-	static std::set<frontend::InputMode> const noInputFiles{
-		frontend::InputMode::Help,
-		frontend::InputMode::License,
-		frontend::InputMode::Version
-	};
-
-	if (noInputFiles.count(m_options.input.mode) == 1)
-		return;
-
-	m_fileReader.setBasePath(m_options.input.basePath);
-
-	if (m_fileReader.basePath() != "")
-	{
-		if (!boost::filesystem::exists(m_fileReader.basePath()))
-			solThrow(CommandLineValidationError, "Base path does not exist: \"" + m_fileReader.basePath().string() + '"');
-
-		if (!boost::filesystem::is_directory(m_fileReader.basePath()))
-			solThrow(CommandLineValidationError, "Base path is not a directory: \"" + m_fileReader.basePath().string() + '"');
-	}
-
-	for (boost::filesystem::path const& includePath: m_options.input.includePaths)
-		m_fileReader.addIncludePath(includePath);
-
-	for (boost::filesystem::path const& allowedDirectory: m_options.input.allowedDirectories)
-		m_fileReader.allowDirectory(allowedDirectory);
-
-	std::map<std::string, std::set<boost::filesystem::path>> collisions =
-		m_fileReader.detectSourceUnitNameCollisions(m_options.input.paths);
-	if (!collisions.empty())
-	{
-		auto pathToQuotedString = [](boost::filesystem::path const& _path){ return "\"" + _path.string() + "\""; };
-
-		std::string message =
-			"Source unit name collision detected. "
-			"The specified values of base path and/or include paths would result in multiple "
-			"input files being assigned the same source unit name:\n";
-
-		for (auto const& [sourceUnitName, normalizedInputPaths]: collisions)
-		{
-			message += sourceUnitName + " matches: ";
-			message += util::joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) + "\n";
-		}
-
-		solThrow(CommandLineValidationError, message);
-	}
-
-	for (boost::filesystem::path const& infile: m_options.input.paths)
-	{
-		if (!boost::filesystem::exists(infile))
-		{
-			if (!m_options.input.ignoreMissingFiles)
-				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not found.");
-			else
-				report(Error::Severity::Info, fmt::format("\"{}\" is not found. Skipping.", infile.string()));
-
-			continue;
-		}
-
-		if (!boost::filesystem::is_regular_file(infile))
-		{
-			if (!m_options.input.ignoreMissingFiles)
-				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not a valid file.");
-			else
-				report(Error::Severity::Info, fmt::format("\"{}\" is not a valid file. Skipping.", infile.string()));
-
-			continue;
-		}
-
-		// NOTE: we ignore the FileNotFound exception as we manually check above
-		std::string fileContent = readFileAsString(infile);
-		if (m_options.input.mode == InputMode::StandardJson)
-		{
-			solAssert(!m_standardJsonInput.has_value());
-			m_standardJsonInput = std::move(fileContent);
-		}
-		else
-		{
-			m_fileReader.addOrUpdateFile(infile, std::move(fileContent));
-			m_fileReader.allowDirectory(boost::filesystem::canonical(infile).remove_filename());
-		}
-	}
-
-	if (m_options.input.addStdin)
-	{
-		if (m_options.input.mode == InputMode::StandardJson)
-		{
-			solAssert(!m_standardJsonInput.has_value());
-			m_standardJsonInput = readUntilEnd(m_sin);
-		}
-		else
-			m_fileReader.setStdin(readUntilEnd(m_sin));
-	}
-
-	if (
-		m_options.input.mode != InputMode::LanguageServer &&
-		m_fileReader.sourceUnits().empty() &&
-		!m_standardJsonInput.has_value()
-	)
-		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
-}
-
-std::map<std::string, Json::Value> CommandLineInterface::parseAstFromInput()
-{
-	solAssert(m_options.input.mode == InputMode::CompilerWithASTImport);
-
-	std::map<std::string, Json::Value> sourceJsons;
-	std::map<std::string, std::string> tmpSources;
-
-	for (SourceCode const& sourceCode: m_fileReader.sourceUnits() | ranges::views::values)
-	{
-		Json::Value ast;
-		astAssert(jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
-		astAssert(ast.isMember("sources"), "Invalid Format for import-JSON: Must have 'sources'-object");
-
-		for (auto& src: ast["sources"].getMemberNames())
-		{
-			std::string astKey = ast["sources"][src].isMember("ast") ? "ast" : "AST";
-
-			astAssert(ast["sources"][src].isMember(astKey), "astkey is not member");
-			astAssert(ast["sources"][src][astKey]["nodeType"].asString() == "SourceUnit",  "Top-level node should be a 'SourceUnit'");
-			astAssert(sourceJsons.count(src) == 0, "All sources must have unique names");
-			sourceJsons.emplace(src, std::move(ast["sources"][src][astKey]));
-			tmpSources[src] = util::jsonCompactPrint(ast);
-		}
-	}
-
-	m_fileReader.setSourceUnits(tmpSources);
-
-	return sourceJsons;
-}
-
-void CommandLineInterface::createFile(std::string const& _fileName, std::string const& _data)
-{
-	namespace fs = boost::filesystem;
-
-	solAssert(!m_options.output.dir.empty());
-
-	// NOTE: create_directories() raises an exception if the path consists solely of '.' or '..'
-	// (or equivalent such as './././.'). Paths like 'a/b/.' and 'a/b/..' are fine though.
-	// The simplest workaround is to use an absolute path.
-	fs::create_directories(fs::absolute(m_options.output.dir));
-
-	std::string pathName = (m_options.output.dir / _fileName).string();
-	if (fs::exists(pathName) && !m_options.output.overwriteFiles)
-		solThrow(CommandLineOutputError, "Refusing to overwrite existing file \"" + pathName + "\" (use --overwrite to force).");
-
-	std::ofstream outFile(pathName);
-	outFile << _data;
-	if (!outFile)
-		solThrow(CommandLineOutputError, "Could not write to file \"" + pathName + "\".");
-}
-
-void CommandLineInterface::createJson(std::string const& _fileName, std::string const& _json)
-{
-	createFile(boost::filesystem::path(_fileName).stem().string() + std::string(".json"), _json);
-}
-
-bool CommandLineInterface::run(int _argc, char const* const* _argv)
-{
-	try
-	{
-		if (!parseArguments(_argc, _argv))
-			return false;
-
-		readInputFiles();
-		processInput();
-		return true;
-	}
-	catch (CommandLineError const& _exception)
-	{
-		m_hasOutput = true;
-
-		// There might be no message in the exception itself if the error output is bulky and has
-		// already been printed to stderr (this happens e.g. for compiler errors).
-		if (_exception.what() != ""s)
-			report(Error::Severity::Error, _exception.what());
-
-		return false;
-	}
-}
-
-bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
-{
-	CommandLineParser parser;
-
-	if (isatty(fileno(stdin)) && _argc == 1)
-	{
-		// If the terminal is taking input from the user, provide more user-friendly output.
-		CommandLineParser::printHelp(sout());
-
-		// In this case we want to exit with an error but not display any error message.
-		return false;
-	}
-
-	try
-	{
-		parser.parse(_argc, _argv);
-	}
-	catch (...)
-	{
-		// Even if the overall CLI parsing fails, the --color/--no-color options may have been
-		// successfully parsed, and if so, should be taken into account when printing errors.
-		// If no value is present, it's possible that --no-color is still there but parsing failed
-		// due to other, unrecognized options so play it safe and disable color in that case.
-		m_options.formatting.coloredOutput = parser.options().formatting.coloredOutput.value_or(false);
-		throw;
-	}
-	m_options = parser.options();
-
-	return true;
-}
-
-void CommandLineInterface::processInput()
-{
-	if (m_options.output.evmVersion < EVMVersion::constantinople())
-		report(
-			Error::Severity::Warning,
-			"Support for EVM versions older than constantinople is deprecated and will be removed in the future."
-		);
-
-	switch (m_options.input.mode)
-	{
-	case InputMode::Help:
-		CommandLineParser::printHelp(sout());
-		break;
-	case InputMode::License:
-		printLicense();
-		break;
-	case InputMode::Version:
-		printVersion();
-		break;
-	case InputMode::StandardJson:
-	{
-		solAssert(m_standardJsonInput.has_value());
-
-		StandardCompiler compiler(m_universalCallback.callback(), m_options.formatting.json);
-		sout() << compiler.compile(std::move(m_standardJsonInput.value())) << std::endl;
-		m_standardJsonInput.reset();
-		break;
-	}
-	case InputMode::LanguageServer:
-		serveLSP();
-		break;
-	case InputMode::Assembler:
-		assembleYul(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
-		break;
-	case InputMode::Linker:
-		link();
-		writeLinkedFiles();
-		break;
-	case InputMode::Compiler:
-	case InputMode::CompilerWithASTImport:
-		compile();
-		outputCompilationResults();
-		break;
-	case InputMode::EVMAssemblerJSON:
-		assembleFromEVMAssemblyJSON();
-		handleCombinedJSON();
-		handleBytecode(m_assemblyStack->contractNames().front());
-		handleEVMAssembly(m_assemblyStack->contractNames().front());
-		break;
-	}
-}
-
-void CommandLineInterface::printVersion()
-{
-	sout() << "solc, the solidity compiler commandline interface" << std::endl;
-	sout() << "Version: " << solidity::frontend::VersionString << std::endl;
-}
-
-void CommandLineInterface::printLicense()
-{
-	sout() << otherLicenses << std::endl;
-	// This is a static variable generated by cmake from LICENSE.txt
-	sout() << licenseText << std::endl;
-}
-
-void CommandLineInterface::assembleFromEVMAssemblyJSON()
-{
-	solAssert(m_options.input.mode == InputMode::EVMAssemblerJSON);
-	solAssert(!m_assemblyStack);
-	solAssert(!m_evmAssemblyStack && !m_compiler);
-
-	solAssert(m_fileReader.sourceUnits().size() == 1);
-	auto&& [sourceUnitName, source] = *m_fileReader.sourceUnits().begin();
-
-	auto evmAssemblyStack = std::make_unique<evmasm::EVMAssemblyStack>(m_options.output.evmVersion);
-	try
-	{
-		evmAssemblyStack->parseAndAnalyze(sourceUnitName, source);
-	}
-	catch (evmasm::AssemblyImportException const& _exception)
-	{
-		solThrow(CommandLineExecutionError, "Assembly Import Error: "s + _exception.what());
-	}
-
-	if (m_options.output.debugInfoSelection.has_value())
-		evmAssemblyStack->selectDebugInfo(m_options.output.debugInfoSelection.value());
-	evmAssemblyStack->assemble();
-
-	m_evmAssemblyStack = std::move(evmAssemblyStack);
-	m_assemblyStack = m_evmAssemblyStack.get();
-}
-
-void CommandLineInterface::compile()
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-	solAssert(!m_assemblyStack);
-	solAssert(!m_evmAssemblyStack && !m_compiler);
-
-	m_compiler = std::make_unique<CompilerStack>(m_universalCallback.callback());
-	m_assemblyStack = m_compiler.get();
-
-	SourceReferenceFormatter formatter(serr(false), *m_compiler, coloredOutput(m_options), m_options.formatting.withErrorIds);
-
-	try
-	{
-		if (m_options.metadata.literalSources)
-			m_compiler->useMetadataLiteralSources(true);
-		m_compiler->setMetadataFormat(m_options.metadata.format);
-		m_compiler->setMetadataHash(m_options.metadata.hash);
-		if (m_options.modelChecker.initialize)
-			m_compiler->setModelCheckerSettings(m_options.modelChecker.settings);
-		m_compiler->setRemappings(m_options.input.remappings);
-		m_compiler->setLibraries(m_options.linker.libraries);
-		m_compiler->setViaIR(m_options.output.viaIR);
-		m_compiler->setEVMVersion(m_options.output.evmVersion);
-		m_compiler->setEOFVersion(m_options.output.eofVersion);
-		m_compiler->setRevertStringBehaviour(m_options.output.revertStrings);
-		if (m_options.output.debugInfoSelection.has_value())
-			m_compiler->selectDebugInfo(m_options.output.debugInfoSelection.value());
-		// TODO: Perhaps we should not compile unless requested
-		m_compiler->enableIRGeneration(
-			m_options.compiler.outputs.ir ||
-			m_options.compiler.outputs.irOptimized ||
-			m_options.compiler.outputs.irAstJson ||
-			m_options.compiler.outputs.irOptimizedAstJson
-		);
-		m_compiler->enableEvmBytecodeGeneration(
-			m_options.compiler.estimateGas ||
-			m_options.compiler.outputs.asm_ ||
-			m_options.compiler.outputs.asmJson ||
-			m_options.compiler.outputs.opcodes ||
-			m_options.compiler.outputs.binary ||
-			m_options.compiler.outputs.binaryRuntime ||
-			(m_options.compiler.combinedJsonRequests && (
-				m_options.compiler.combinedJsonRequests->binary ||
-				m_options.compiler.combinedJsonRequests->binaryRuntime ||
-				m_options.compiler.combinedJsonRequests->opcodes ||
-				m_options.compiler.combinedJsonRequests->asm_ ||
-				m_options.compiler.combinedJsonRequests->generatedSources ||
-				m_options.compiler.combinedJsonRequests->generatedSourcesRuntime ||
-				m_options.compiler.combinedJsonRequests->srcMap ||
-				m_options.compiler.combinedJsonRequests->srcMapRuntime ||
-				m_options.compiler.combinedJsonRequests->funDebug ||
-				m_options.compiler.combinedJsonRequests->funDebugRuntime
-			))
-		);
-
-		m_compiler->setOptimiserSettings(m_options.optimiserSettings());
-
-		if (m_options.input.mode == InputMode::CompilerWithASTImport)
-		{
-			try
-			{
-				m_compiler->importASTs(parseAstFromInput());
-
-				if (!m_compiler->analyze())
-				{
-					formatter.printErrorInformation(m_compiler->errors());
-					astAssert(false, "Analysis of the AST failed");
-				}
-			}
-			catch (Exception const& _exc)
-			{
-				// FIXME: AST import is missing proper validations. This hack catches failing
-				// assertions and presents them as if they were compiler errors.
-				solThrow(CommandLineExecutionError, "Failed to import AST: "s + _exc.what());
-			}
-		}
-		else
-			m_compiler->setSources(m_fileReader.sourceUnits());
-
-		bool successful = m_compiler->compile(m_options.output.stopAfter);
-
-		for (auto const& error: m_compiler->errors())
-		{
-			m_hasOutput = true;
-			formatter.printErrorInformation(*error);
-		}
-
-		if (!successful)
-			solThrow(CommandLineExecutionError, "");
-	}
-	catch (CompilerError const& _exception)
-	{
-		m_hasOutput = true;
-		formatter.printExceptionInformation(
-			_exception,
-			Error::errorSeverity(Error::Type::CompilerError)
-		);
-		solThrow(CommandLineExecutionError, "");
-	}
-	catch (Error const& _error)
-	{
-		if (_error.type() == Error::Type::DocstringParsingError)
-		{
-			report(Error::Severity::Error, *boost::get_error_info<errinfo_comment>(_error));
-			solThrow(CommandLineExecutionError, "Documentation parsing failed.");
-		}
-		else
-		{
-			m_hasOutput = true;
-			formatter.printErrorInformation(_error);
-			solThrow(CommandLineExecutionError, "");
-		}
-	}
-}
-
-void CommandLineInterface::handleCombinedJSON()
-{
-	solAssert(m_assemblyStack);
-	solAssert(
-		CompilerInputModes.count(m_options.input.mode) == 1 ||
-		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
-	);
-
-	if (!m_options.compiler.combinedJsonRequests.has_value())
-		return;
-
-	Json::Value output(Json::objectValue);
-
-	output[g_strVersion] = frontend::VersionString;
-	std::vector<std::string> contracts = m_assemblyStack->contractNames();
-
-	if (!contracts.empty())
-		output[g_strContracts] = Json::Value(Json::objectValue);
-	for (std::string const& contractName: contracts)
-	{
-		Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue;
-
-		// NOTE: The state checks here are more strict that in Standard JSON. There we allow
-		// requesting certain outputs even if compilation fails as long as analysis went ok.
-		if (m_compiler && m_compiler->compilationSuccessful())
-		{
-			if (m_options.compiler.combinedJsonRequests->abi)
-				contractData[g_strAbi] = m_compiler->contractABI(contractName);
-			if (m_options.compiler.combinedJsonRequests->metadata)
-				contractData["metadata"] = m_compiler->metadata(contractName);
-			if (m_options.compiler.combinedJsonRequests->storageLayout)
-				contractData[g_strStorageLayout] = m_compiler->storageLayout(contractName);
-			if (m_options.compiler.combinedJsonRequests->generatedSources)
-				contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false);
-			if (m_options.compiler.combinedJsonRequests->generatedSourcesRuntime)
-				contractData[g_strGeneratedSourcesRuntime] = m_compiler->generatedSources(contractName, true);
-			if (m_options.compiler.combinedJsonRequests->signatureHashes)
-				contractData[g_strSignatureHashes] = m_compiler->interfaceSymbols(contractName)["methods"];
-			if (m_options.compiler.combinedJsonRequests->natspecDev)
-				contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
-			if (m_options.compiler.combinedJsonRequests->natspecUser)
-				contractData[g_strNatspecUser] = m_compiler->natspecUser(contractName);
-		}
-
-		if (m_assemblyStack->compilationSuccessful())
-		{
-			if (m_options.compiler.combinedJsonRequests->binary)
-				contractData[g_strBinary] = m_assemblyStack->object(contractName).toHex();
-			if (m_options.compiler.combinedJsonRequests->binaryRuntime)
-				contractData[g_strBinaryRuntime] = m_assemblyStack->runtimeObject(contractName).toHex();
-			if (m_options.compiler.combinedJsonRequests->opcodes)
-				contractData[g_strOpcodes] = evmasm::disassemble(m_assemblyStack->object(contractName).bytecode, m_options.output.evmVersion);
-			if (m_options.compiler.combinedJsonRequests->asm_)
-				contractData[g_strAsm] = m_assemblyStack->assemblyJSON(contractName);
-			if (m_options.compiler.combinedJsonRequests->srcMap)
-			{
-				auto map = m_assemblyStack->sourceMapping(contractName);
-				contractData[g_strSrcMap] = map ? *map : "";
-			}
-			if (m_options.compiler.combinedJsonRequests->srcMapRuntime)
-			{
-				auto map = m_assemblyStack->runtimeSourceMapping(contractName);
-				contractData[g_strSrcMapRuntime] = map ? *map : "";
-			}
-			if (m_options.compiler.combinedJsonRequests->funDebug)
-				contractData[g_strFunDebug] = StandardCompiler::formatFunctionDebugData(
-					m_assemblyStack->object(contractName).functionDebugData
-				);
-			if (m_options.compiler.combinedJsonRequests->funDebugRuntime)
-				contractData[g_strFunDebugRuntime] = StandardCompiler::formatFunctionDebugData(
-					m_assemblyStack->runtimeObject(contractName).functionDebugData
-				);
-		}
-	}
-
-	bool needsSourceList =
-		m_options.compiler.combinedJsonRequests->ast ||
-		m_options.compiler.combinedJsonRequests->srcMap ||
-		m_options.compiler.combinedJsonRequests->srcMapRuntime;
-	if (needsSourceList)
-	{
-		// Indices into this array are used to abbreviate source names in source locations.
-		output[g_strSourceList] = Json::Value(Json::arrayValue);
-
-		for (auto const& source: m_assemblyStack->sourceNames())
-			output[g_strSourceList].append(source);
-	}
-
-	if (m_options.compiler.combinedJsonRequests->ast)
-	{
-		solAssert(m_compiler);
-		output[g_strSources] = Json::Value(Json::objectValue);
-		for (auto const& sourceCode: m_fileReader.sourceUnits())
-		{
-			output[g_strSources][sourceCode.first] = Json::Value(Json::objectValue);
-			output[g_strSources][sourceCode.first]["AST"] = ASTJsonExporter(
-				m_compiler->state(),
-				m_compiler->sourceIndices()
-			).toJson(m_compiler->ast(sourceCode.first));
-			output[g_strSources][sourceCode.first]["id"] = m_compiler->sourceIndices().at(sourceCode.first);
-		}
-	}
-
-	std::string json = jsonPrint(removeNullMembers(std::move(output)), m_options.formatting.json);
-	if (!m_options.output.dir.empty())
-		createJson("combined", json);
-	else
-		sout() << json << std::endl;
-}
-
-void CommandLineInterface::handleAst()
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.astCompactJson)
-		return;
-
-	std::vector<ASTNode const*> asts;
-	for (auto const& sourceCode: m_fileReader.sourceUnits())
-		asts.push_back(&m_compiler->ast(sourceCode.first));
-
-	if (!m_options.output.dir.empty())
-	{
-		for (auto const& sourceCode: m_fileReader.sourceUnits())
-		{
-			std::stringstream data;
-			std::string postfix = "";
-			ASTJsonExporter(m_compiler->state(), m_compiler->sourceIndices()).print(data, m_compiler->ast(sourceCode.first), m_options.formatting.json);
-			postfix += "_json";
-			boost::filesystem::path path(sourceCode.first);
-			createFile(path.filename().string() + postfix + ".ast", data.str());
-		}
-	}
-	else
-	{
-		sout() << "JSON AST (compact format):" << std::endl << std::endl;
-		for (auto const& sourceCode: m_fileReader.sourceUnits())
-		{
-			sout() << std::endl << "======= " << sourceCode.first << " =======" << std::endl;
-			ASTJsonExporter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first), m_options.formatting.json);
-		}
-	}
-}
-
-void CommandLineInterface::serveLSP()
-{
-	lsp::StdioTransport transport;
-	if (!lsp::LanguageServer{transport}.run())
-		solThrow(CommandLineExecutionError, "LSP terminated abnormally.");
-}
-
-void CommandLineInterface::link()
-{
-	solAssert(m_options.input.mode == InputMode::Linker);
-
-	// Map from how the libraries will be named inside the bytecode to their addresses.
-	std::map<std::string, h160> librariesReplacements;
-	int const placeholderSize = 40; // 20 bytes or 40 hex characters
-	for (auto const& library: m_options.linker.libraries)
-	{
-		std::string const& name = library.first;
-		// Library placeholders are 40 hex digits (20 bytes) that start and end with '__'.
-		// This leaves 36 characters for the library identifier. The identifier used to
-		// be just the cropped or '_'-padded library name, but this changed to
-		// the cropped hex representation of the hash of the library name.
-		// We support both ways of linking here.
-		librariesReplacements["__" + evmasm::LinkerObject::libraryPlaceholder(name) + "__"] = library.second;
-
-		std::string replacement = "__";
-		for (size_t i = 0; i < placeholderSize - 4; ++i)
-			replacement.push_back(i < name.size() ? name[i] : '_');
-		replacement += "__";
-		librariesReplacements[replacement] = library.second;
-	}
-
-	FileReader::StringMap sourceCodes = m_fileReader.sourceUnits();
-	for (auto& src: sourceCodes)
-	{
-		auto end = src.second.end();
-		for (auto it = src.second.begin(); it != end;)
-		{
-			while (it != end && *it != '_') ++it;
-			if (it == end) break;
-			if (
-				end - it < placeholderSize ||
-				*(it + 1) != '_' ||
-				*(it + placeholderSize - 2) != '_' ||
-				*(it + placeholderSize - 1) != '_'
-			)
-				solThrow(
-					CommandLineExecutionError,
-					"Error in binary object file " + src.first + " at position " + std::to_string(it - src.second.begin()) + "\n" +
-					'"' + std::string(it, it + std::min(placeholderSize, static_cast<int>(end - it))) + "\" is not a valid link reference."
-				);
-
-			std::string foundPlaceholder(it, it + placeholderSize);
-			if (librariesReplacements.count(foundPlaceholder))
-			{
-				std::string hexStr(util::toHex(librariesReplacements.at(foundPlaceholder).asBytes()));
-				copy(hexStr.begin(), hexStr.end(), it);
-			}
-			else
-				report(
-					Error::Severity::Warning,
-					fmt::format("Reference \"{}\" in file \"{}\" still unresolved.", foundPlaceholder, src.first)
-				);
-			it += placeholderSize;
-		}
-		// Remove hints for resolved libraries.
-		for (auto const& library: m_options.linker.libraries)
-			boost::algorithm::erase_all(src.second, "\n" + libraryPlaceholderHint(library.first));
-		while (!src.second.empty() && *prev(src.second.end()) == '\n')
-			src.second.resize(src.second.size() - 1);
-	}
-	m_fileReader.setSourceUnits(std::move(sourceCodes));
-}
-
-void CommandLineInterface::writeLinkedFiles()
-{
-	solAssert(m_options.input.mode == InputMode::Linker);
-
-	for (auto const& src: m_fileReader.sourceUnits())
-		if (src.first == g_stdinFileName)
-			sout() << src.second << std::endl;
-		else
-		{
-			std::ofstream outFile(src.first);
-			outFile << src.second;
-			if (!outFile)
-				solThrow(CommandLineOutputError, "Could not write to file " + src.first + ". Aborting.");
-		}
-	sout() << "Linking completed." << std::endl;
-}
-
-std::string CommandLineInterface::libraryPlaceholderHint(std::string const& _libraryName)
-{
-	return "// " + evmasm::LinkerObject::libraryPlaceholder(_libraryName) + " -> " + _libraryName;
-}
-
-std::string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _obj)
-{
-	std::string out = _obj.toHex();
-	if (!_obj.linkReferences.empty())
-	{
-		out += "\n";
-		for (auto const& linkRef: _obj.linkReferences)
-			out += "\n" + libraryPlaceholderHint(linkRef.second);
-	}
-	return out;
-}
-
-void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
-{
-	solAssert(m_options.input.mode == InputMode::Assembler);
-
-	bool successful = true;
-	std::map<std::string, yul::YulStack> yulStacks;
-	for (auto const& src: m_fileReader.sourceUnits())
-	{
-		auto& stack = yulStacks[src.first] = yul::YulStack(
-			m_options.output.evmVersion,
-			m_options.output.eofVersion,
-			_language,
-			m_options.optimiserSettings(),
-			m_options.output.debugInfoSelection.has_value() ?
-				m_options.output.debugInfoSelection.value() :
-				DebugInfoSelection::Default()
-		);
-
-		if (!stack.parseAndAnalyze(src.first, src.second))
-			successful = false;
-		else
-			stack.optimize();
-	}
-
-	for (auto const& sourceAndStack: yulStacks)
-	{
-		auto const& stack = sourceAndStack.second;
-		SourceReferenceFormatter formatter(serr(false), stack, coloredOutput(m_options), m_options.formatting.withErrorIds);
-
-		for (auto const& error: stack.errors())
-		{
-			m_hasOutput = true;
-			formatter.printErrorInformation(*error);
-		}
-		if (Error::containsErrors(stack.errors()))
-			successful = false;
-	}
-
-	if (!successful)
-	{
-		solAssert(m_hasOutput);
-		solThrow(CommandLineExecutionError, "");
-	}
-
-	for (auto const& src: m_fileReader.sourceUnits())
-	{
-		solAssert(_targetMachine == yul::YulStack::Machine::EVM);
-		std::string machine = "EVM";
-		sout() << std::endl << "======= " << src.first << " (" << machine << ") =======" << std::endl;
-
-		yul::YulStack& stack = yulStacks[src.first];
-
-		if (m_options.compiler.outputs.irOptimized)
-		{
-			// NOTE: This actually outputs unoptimized code when the optimizer is disabled but
-			// 'ir' output in StandardCompiler works the same way.
-			sout() << std::endl << "Pretty printed source:" << std::endl;
-			sout() << stack.print() << std::endl;
-		}
-
-		yul::MachineAssemblyObject object;
-		object = stack.assemble(_targetMachine);
-		object.bytecode->link(m_options.linker.libraries);
-
-		if (m_options.compiler.outputs.binary)
-		{
-			sout() << std::endl << "Binary representation:" << std::endl;
-			if (object.bytecode)
-				sout() << object.bytecode->toHex() << std::endl;
-			else
-				report(Error::Severity::Info, "No binary representation found.");
-		}
-		if (m_options.compiler.outputs.astCompactJson)
-		{
-			sout() << "AST:" << std::endl << std::endl;
-			sout() << util::jsonPrint(stack.astJson(), m_options.formatting.json) << std::endl;
-		}
-		solAssert(_targetMachine == yul::YulStack::Machine::EVM, "");
-		if (m_options.compiler.outputs.asm_)
-		{
-			sout() << std::endl << "Text representation:" << std::endl;
-			if (!object.assembly.empty())
-				sout() << object.assembly << std::endl;
-			else
-				report(Error::Severity::Info, "No text representation found.");
-		}
-	}
-}
-
-void CommandLineInterface::outputCompilationResults()
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	handleCombinedJSON();
-
-	// do we need AST output?
-	handleAst();
-
-	CompilerOutputs astOutputSelection;
-	astOutputSelection.astCompactJson = true;
-	if (m_options.compiler.outputs != CompilerOutputs() && m_options.compiler.outputs != astOutputSelection)
-	{
-		// Currently AST is the only output allowed with --stop-after parsing. For all of the others
-		// we can safely assume that full compilation was performed and successful.
-		solAssert(m_options.output.stopAfter >= CompilerStack::State::CompilationSuccessful);
-
-		for (std::string const& contract: m_compiler->contractNames())
-		{
-			if (needsHumanTargetedStdout(m_options))
-				sout() << std::endl << "======= " << contract << " =======" << std::endl;
-
-			handleEVMAssembly(contract);
-
-			if (m_options.compiler.estimateGas)
-				handleGasEstimation(contract);
-
-			handleBytecode(contract);
-			handleIR(contract);
-			handleIRAst(contract);
-			handleIROptimized(contract);
-			handleIROptimizedAst(contract);
-			handleSignatureHashes(contract);
-			handleMetadata(contract);
-			handleABI(contract);
-			handleStorageLayout(contract);
-			handleNatspec(true, contract);
-			handleNatspec(false, contract);
-		} // end of contracts iteration
-	}
-
-	if (!m_hasOutput)
-	{
-		if (!m_options.output.dir.empty())
-			sout() << "Compiler run successful. Artifact(s) can be found in directory " << m_options.output.dir << "." << std::endl;
-		else if (m_compiler->contractNames().empty())
-			sout() << "Compiler run successful. No contracts to compile." << std::endl;
-		else
-			sout() << "Compiler run successful. No output generated." << std::endl;
-	}
-}
-
-void CommandLineInterface::report(langutil::Error::Severity _severity, std::string _message)
-{
-	SourceReferenceFormatter::printPrimaryMessage(
-		serr(),
-		_message,
-		_severity,
-		std::nullopt,
-		coloredOutput(m_options),
-		m_options.formatting.withErrorIds
-	);
-}
-
-}
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
deleted file mode 100644
index 906b34d62b53..000000000000
--- a/solc/CommandLineInterface.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris <lefteris@ethdev.com>
- * @date 2014
- * Solidity command line interface.
- */
-#pragma once
-
-#include <solc/CommandLineParser.h>
-
-#include <libevmasm/AbstractAssemblyStack.h>
-#include <libevmasm/EVMAssemblyStack.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <libsolidity/interface/FileReader.h>
-#include <libsolidity/interface/SMTSolverCommand.h>
-#include <libsolidity/interface/UniversalCallback.h>
-#include <libyul/YulStack.h>
-
-#include <iostream>
-#include <memory>
-#include <string>
-
-namespace solidity::frontend
-{
-
-class CommandLineInterface
-{
-public:
-	explicit CommandLineInterface(
-		std::istream& _sin,
-		std::ostream& _sout,
-		std::ostream& _serr,
-		CommandLineOptions const& _options = CommandLineOptions{}
-	):
-		m_sin(_sin),
-		m_sout(_sout),
-		m_serr(_serr),
-		m_options(_options)
-	{}
-
-	/// Parses command-line arguments, executes the requested operation and handles validation and
-	/// execution errors.
-	/// @returns false if it catches a @p CommandLineValidationError or if the application is
-	/// expected to exit with a non-zero exit code despite there being no error.
-	bool run(int _argc, char const* const* _argv);
-
-	/// Parses command line arguments and stores the result in @p m_options.
-	/// @throws CommandLineValidationError if command-line arguments are invalid.
-	/// @returns false if the application is expected to exit with a non-zero exit code despite
-	/// there being no error.
-	bool parseArguments(int _argc, char const* const* _argv);
-
-	/// Reads the content of all input files and initializes the file reader.
-	/// @throws CommandLineValidationError if it fails to read the input files (invalid paths,
-	/// non-existent files, not enough or too many input files, etc.).
-	void readInputFiles();
-
-	/// Executes the requested operation (compilation, assembling, standard JSON, etc.) and prints
-	/// results to the terminal.
-	/// @throws CommandLineExecutionError if execution fails due to errors in the input files.
-	/// @throws CommandLineOutputError if creating output files or writing to them fails.
-	void processInput();
-
-	CommandLineOptions const& options() const { return m_options; }
-	FileReader const& fileReader() const { return m_fileReader; }
-	std::optional<std::string> const& standardJsonInput() const { return m_standardJsonInput; }
-
-private:
-	void printVersion();
-	void printLicense();
-	void compile();
-	void assembleFromEVMAssemblyJSON();
-	void serveLSP();
-	void link();
-	void writeLinkedFiles();
-	/// @returns the ``// <identifier> -> name`` hint for library placeholders.
-	static std::string libraryPlaceholderHint(std::string const& _libraryName);
-	/// @returns the full object with library placeholder hints in hex.
-	static std::string objectWithLinkRefsHex(evmasm::LinkerObject const& _obj);
-
-	void assembleYul(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine);
-
-	void outputCompilationResults();
-
-	void handleCombinedJSON();
-	void handleAst();
-	void handleEVMAssembly(std::string const& _contract);
-	void handleBinary(std::string const& _contract);
-	void handleOpcode(std::string const& _contract);
-	void handleIR(std::string const& _contract);
-	void handleIRAst(std::string const& _contract);
-	void handleIROptimized(std::string const& _contract);
-	void handleIROptimizedAst(std::string const& _contract);
-	void handleBytecode(std::string const& _contract);
-	void handleSignatureHashes(std::string const& _contract);
-	void handleMetadata(std::string const& _contract);
-	void handleABI(std::string const& _contract);
-	void handleNatspec(bool _natspecDev, std::string const& _contract);
-	void handleGasEstimation(std::string const& _contract);
-	void handleStorageLayout(std::string const& _contract);
-
-	/// Tries to read @ m_sourceCodes as a JSONs holding ASTs
-	/// such that they can be imported into the compiler  (importASTs())
-	/// (produced by --combined-json ast <file.sol>
-	/// or standard-json output
-	std::map<std::string, Json::Value> parseAstFromInput();
-
-	/// Create a file in the given directory
-	/// @arg _fileName the name of the file
-	/// @arg _data to be written
-	void createFile(std::string const& _fileName, std::string const& _data);
-
-	/// Create a json file in the given directory
-	/// @arg _fileName the name of the file (the extension will be replaced with .json)
-	/// @arg _json json string to be written
-	void createJson(std::string const& _fileName, std::string const& _json);
-
-	/// Returns the stream that should receive normal output. Sets m_hasOutput to true if the
-	/// stream has ever been used unless @arg _markAsUsed is set to false.
-	std::ostream& sout(bool _markAsUsed = true);
-
-	/// Returns the stream that should receive error output. Sets m_hasOutput to true if the
-	/// stream has ever been used unless @arg _markAsUsed is set to false.
-	std::ostream& serr(bool _markAsUsed = true);
-
-	void report(langutil::Error::Severity _severity, std::string _message);
-
-	std::istream& m_sin;
-	std::ostream& m_sout;
-	std::ostream& m_serr;
-	bool m_hasOutput = false;
-	FileReader m_fileReader;
-	SMTSolverCommand m_solverCommand{"eld"};
-	UniversalCallback m_universalCallback{&m_fileReader, m_solverCommand};
-	std::optional<std::string> m_standardJsonInput;
-	std::unique_ptr<frontend::CompilerStack> m_compiler;
-	std::unique_ptr<evmasm::EVMAssemblyStack> m_evmAssemblyStack;
-	evmasm::AbstractAssemblyStack* m_assemblyStack = nullptr;
-	CommandLineOptions m_options;
-};
-
-}
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
deleted file mode 100644
index 0c7484fd4017..000000000000
--- a/solc/CommandLineParser.cpp
+++ /dev/null
@@ -1,1496 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <solc/CommandLineParser.h>
-
-#include <solc/Exceptions.h>
-
-#include <libyul/optimiser/Suite.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <range/v3/view/transform.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/range/conversion.hpp>
-
-#include <fmt/format.h>
-
-using namespace solidity::langutil;
-
-namespace po = boost::program_options;
-
-namespace solidity::frontend
-{
-
-static std::string const g_strAllowPaths = "allow-paths";
-static std::string const g_strBasePath = "base-path";
-static std::string const g_strIncludePath = "include-path";
-static std::string const g_strAssemble = "assemble";
-static std::string const g_strCombinedJson = "combined-json";
-static std::string const g_strEVM = "evm";
-static std::string const g_strEVMVersion = "evm-version";
-static std::string const g_strEOFVersion = "experimental-eof-version";
-static std::string const g_strViaIR = "via-ir";
-static std::string const g_strExperimentalViaIR = "experimental-via-ir";
-static std::string const g_strGas = "gas";
-static std::string const g_strHelp = "help";
-static std::string const g_strImportAst = "import-ast";
-static std::string const g_strImportEvmAssemblerJson = "import-asm-json";
-static std::string const g_strInputFile = "input-file";
-static std::string const g_strYul = "yul";
-static std::string const g_strYulDialect = "yul-dialect";
-static std::string const g_strDebugInfo = "debug-info";
-static std::string const g_strIPFS = "ipfs";
-static std::string const g_strLicense = "license";
-static std::string const g_strLibraries = "libraries";
-static std::string const g_strLink = "link";
-static std::string const g_strLSP = "lsp";
-static std::string const g_strMachine = "machine";
-static std::string const g_strNoCBORMetadata = "no-cbor-metadata";
-static std::string const g_strMetadataHash = "metadata-hash";
-static std::string const g_strMetadataLiteral = "metadata-literal";
-static std::string const g_strModelCheckerContracts = "model-checker-contracts";
-static std::string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-slacks";
-static std::string const g_strModelCheckerEngine = "model-checker-engine";
-static std::string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
-static std::string const g_strModelCheckerInvariants = "model-checker-invariants";
-static std::string const g_strModelCheckerPrintQuery = "model-checker-print-query";
-static std::string const g_strModelCheckerShowProvedSafe = "model-checker-show-proved-safe";
-static std::string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
-static std::string const g_strModelCheckerShowUnsupported = "model-checker-show-unsupported";
-static std::string const g_strModelCheckerSolvers = "model-checker-solvers";
-static std::string const g_strModelCheckerTargets = "model-checker-targets";
-static std::string const g_strModelCheckerTimeout = "model-checker-timeout";
-static std::string const g_strModelCheckerBMCLoopIterations = "model-checker-bmc-loop-iterations";
-static std::string const g_strNone = "none";
-static std::string const g_strNoOptimizeYul = "no-optimize-yul";
-static std::string const g_strNoImportCallback = "no-import-callback";
-static std::string const g_strOptimize = "optimize";
-static std::string const g_strOptimizeRuns = "optimize-runs";
-static std::string const g_strOptimizeYul = "optimize-yul";
-static std::string const g_strYulOptimizations = "yul-optimizations";
-static std::string const g_strOutputDir = "output-dir";
-static std::string const g_strOverwrite = "overwrite";
-static std::string const g_strRevertStrings = "revert-strings";
-static std::string const g_strStopAfter = "stop-after";
-static std::string const g_strParsing = "parsing";
-
-/// Possible arguments to for --revert-strings
-static std::set<std::string> const g_revertStringsArgs
-{
-	revertStringsToString(RevertStrings::Default),
-	revertStringsToString(RevertStrings::Strip),
-	revertStringsToString(RevertStrings::Debug),
-	revertStringsToString(RevertStrings::VerboseDebug)
-};
-
-static std::string const g_strSources = "sources";
-static std::string const g_strSourceList = "sourceList";
-static std::string const g_strStandardJSON = "standard-json";
-static std::string const g_strStrictAssembly = "strict-assembly";
-static std::string const g_strSwarm = "swarm";
-static std::string const g_strPrettyJson = "pretty-json";
-static std::string const g_strJsonIndent = "json-indent";
-static std::string const g_strVersion = "version";
-static std::string const g_strIgnoreMissingFiles = "ignore-missing";
-static std::string const g_strColor = "color";
-static std::string const g_strNoColor = "no-color";
-static std::string const g_strErrorIds = "error-codes";
-
-/// Possible arguments to for --machine
-static std::set<std::string> const g_machineArgs
-{
-	g_strEVM
-};
-
-/// Possible arguments to for --yul-dialect
-static std::set<std::string> const g_yulDialectArgs
-{
-	g_strEVM
-};
-
-/// Possible arguments to for --metadata-hash
-static std::set<std::string> const g_metadataHashArgs
-{
-	g_strIPFS,
-	g_strSwarm,
-	g_strNone
-};
-
-static std::map<InputMode, std::string> const g_inputModeName = {
-	{InputMode::Help, "help"},
-	{InputMode::License, "license"},
-	{InputMode::Version, "version"},
-	{InputMode::Compiler, "compiler"},
-	{InputMode::CompilerWithASTImport, "compiler (AST import)"},
-	{InputMode::Assembler, "assembler"},
-	{InputMode::StandardJson, "standard JSON"},
-	{InputMode::Linker, "linker"},
-	{InputMode::LanguageServer, "language server (LSP)"},
-	{InputMode::EVMAssemblerJSON, "EVM assembler (JSON format)"},
-};
-
-void CommandLineParser::checkMutuallyExclusive(std::vector<std::string> const& _optionNames)
-{
-	if (countEnabledOptions(_optionNames) > 1)
-	{
-		solThrow(
-			CommandLineValidationError,
-			"The following options are mutually exclusive: " + joinOptionNames(_optionNames) + ". " +
-			"Select at most one."
-		);
-	}
-}
-
-bool CompilerOutputs::operator==(CompilerOutputs const& _other) const noexcept
-{
-	for (bool CompilerOutputs::* member: componentMap() | ranges::views::values)
-		if (this->*member != _other.*member)
-			return false;
-	return true;
-}
-
-std::ostream& operator<<(std::ostream& _out, CompilerOutputs const& _selection)
-{
-	std::vector<std::string> serializedSelection;
-	for (auto&& [componentName, component]: CompilerOutputs::componentMap())
-		if (_selection.*component)
-			serializedSelection.push_back(CompilerOutputs::componentName(component));
-
-	return _out << util::joinHumanReadable(serializedSelection, ",");
-}
-
-std::string const& CompilerOutputs::componentName(bool CompilerOutputs::* _component)
-{
-	solAssert(_component, "");
-
-	// NOTE: Linear search is not optimal but it's simpler than getting pointers-to-members to work as map keys.
-	for (auto const& [componentName, component]: CompilerOutputs::componentMap())
-		if (component == _component)
-			return componentName;
-
-	solAssert(false, "");
-}
-
-bool CombinedJsonRequests::operator==(CombinedJsonRequests const& _other) const noexcept
-{
-	for (bool CombinedJsonRequests::* member: componentMap() | ranges::views::values)
-		if (this->*member != _other.*member)
-			return false;
-	return true;
-}
-
-
-std::ostream& operator<<(std::ostream& _out, CombinedJsonRequests const& _requests)
-{
-	std::vector<std::string> serializedRequests;
-	for (auto&& [componentName, component]: CombinedJsonRequests::componentMap())
-		if (_requests.*component)
-			serializedRequests.push_back(CombinedJsonRequests::componentName(component));
-
-	return _out << util::joinHumanReadable(serializedRequests, ",");
-}
-
-std::string const& CombinedJsonRequests::componentName(bool CombinedJsonRequests::* _component)
-{
-	solAssert(_component, "");
-
-	for (auto const& [componentName, component]: CombinedJsonRequests::componentMap())
-		if (component == _component)
-			return componentName;
-
-	solAssert(false, "");
-}
-
-bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noexcept
-{
-	return
-		input.paths == _other.input.paths &&
-		input.remappings == _other.input.remappings &&
-		input.addStdin == _other.input.addStdin &&
-		input.basePath == _other.input.basePath &&
-		input.includePaths == _other.input.includePaths &&
-		input.allowedDirectories == _other.input.allowedDirectories &&
-		input.ignoreMissingFiles == _other.input.ignoreMissingFiles &&
-		input.noImportCallback == _other.input.noImportCallback &&
-		output.dir == _other.output.dir &&
-		output.overwriteFiles == _other.output.overwriteFiles &&
-		output.evmVersion == _other.output.evmVersion &&
-		output.viaIR == _other.output.viaIR &&
-		output.revertStrings == _other.output.revertStrings &&
-		output.debugInfoSelection == _other.output.debugInfoSelection &&
-		output.stopAfter == _other.output.stopAfter &&
-		output.eofVersion == _other.output.eofVersion &&
-		input.mode == _other.input.mode &&
-		assembly.targetMachine == _other.assembly.targetMachine &&
-		assembly.inputLanguage == _other.assembly.inputLanguage &&
-		linker.libraries == _other.linker.libraries &&
-		formatting.json == _other.formatting.json &&
-		formatting.coloredOutput == _other.formatting.coloredOutput &&
-		formatting.withErrorIds == _other.formatting.withErrorIds &&
-		compiler.outputs == _other.compiler.outputs &&
-		compiler.estimateGas == _other.compiler.estimateGas &&
-		compiler.combinedJsonRequests == _other.compiler.combinedJsonRequests &&
-		metadata.format == _other.metadata.format &&
-		metadata.hash == _other.metadata.hash &&
-		metadata.literalSources == _other.metadata.literalSources &&
-		optimizer.optimizeEvmasm == _other.optimizer.optimizeEvmasm &&
-		optimizer.optimizeYul == _other.optimizer.optimizeYul &&
-		optimizer.expectedExecutionsPerDeployment == _other.optimizer.expectedExecutionsPerDeployment &&
-		optimizer.yulSteps == _other.optimizer.yulSteps &&
-		modelChecker.initialize == _other.modelChecker.initialize &&
-		modelChecker.settings == _other.modelChecker.settings;
-}
-
-OptimiserSettings CommandLineOptions::optimiserSettings() const
-{
-	OptimiserSettings settings;
-
-	if (optimizer.optimizeEvmasm)
-		settings = OptimiserSettings::standard();
-	else
-		settings = OptimiserSettings::minimal();
-
-	settings.runYulOptimiser = optimizer.optimizeYul;
-	if (optimizer.optimizeYul)
-		// NOTE: Standard JSON disables optimizeStackAllocation by default when yul optimizer is disabled.
-		// --optimize --no-optimize-yul on the CLI does not have that effect.
-		settings.optimizeStackAllocation = true;
-
-	if (optimizer.expectedExecutionsPerDeployment.has_value())
-		settings.expectedExecutionsPerDeployment = optimizer.expectedExecutionsPerDeployment.value();
-
-	if (optimizer.yulSteps.has_value())
-	{
-		std::string const fullSequence = optimizer.yulSteps.value();
-		auto const delimiterPos = fullSequence.find(":");
-		settings.yulOptimiserSteps = fullSequence.substr(0, delimiterPos);
-
-		if (delimiterPos != std::string::npos)
-			settings.yulOptimiserCleanupSteps = fullSequence.substr(delimiterPos + 1);
-		else
-			solAssert(settings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
-	}
-
-	return settings;
-}
-
-void CommandLineParser::parse(int _argc, char const* const* _argv)
-{
-	parseArgs(_argc, _argv);
-	processArgs();
-}
-
-void CommandLineParser::parseInputPathsAndRemappings()
-{
-	m_options.input.ignoreMissingFiles = (m_args.count(g_strIgnoreMissingFiles) > 0);
-
-	if (m_args.count(g_strInputFile))
-		for (std::string const& positionalArg: m_args[g_strInputFile].as<std::vector<std::string>>())
-		{
-			if (ImportRemapper::isRemapping(positionalArg))
-			{
-				std::optional<ImportRemapper::Remapping> remapping = ImportRemapper::parseRemapping(positionalArg);
-				if (!remapping.has_value())
-					solThrow(CommandLineValidationError, "Invalid remapping: \"" + positionalArg + "\".");
-
-				if (m_options.input.mode == InputMode::StandardJson)
-					solThrow(
-						CommandLineValidationError,
-						"Import remappings are not accepted on the command line in Standard JSON mode.\n"
-						"Please put them under 'settings.remappings' in the JSON input."
-					);
-
-				if (!remapping->target.empty())
-				{
-					// If the target is a directory, whitelist it. Otherwise whitelist containing dir.
-					// NOTE: /a/b/c/ is a directory while /a/b/c is not.
-					boost::filesystem::path remappingDir = remapping->target;
-					if (remappingDir.filename() != "..")
-						// As an exception we'll treat /a/b/c/.. as a directory too. It would be
-						// unintuitive to whitelist /a/b/c when the target is equivalent to /a/b/.
-						remappingDir.remove_filename();
-					m_options.input.allowedDirectories.insert(remappingDir.empty() ? "." : remappingDir);
-				}
-
-				m_options.input.remappings.emplace_back(std::move(remapping.value()));
-			}
-			else if (positionalArg == "-")
-				m_options.input.addStdin = true;
-			else
-				m_options.input.paths.insert(positionalArg);
-		}
-
-	if (m_options.input.mode == InputMode::StandardJson)
-	{
-		if (m_options.input.paths.size() > 1 || (m_options.input.paths.size() == 1 && m_options.input.addStdin))
-			solThrow(
-				CommandLineValidationError,
-				"Too many input files for --" + g_strStandardJSON + ".\n"
-				"Please either specify a single file name or provide its content on standard input."
-			);
-		else if (m_options.input.paths.size() == 0)
-			// Standard JSON mode input used to be handled separately and zero files meant "read from stdin".
-			// Keep it working that way for backwards-compatibility.
-			m_options.input.addStdin = true;
-	}
-	else if (m_options.input.paths.size() == 0 && !m_options.input.addStdin)
-		solThrow(
-			CommandLineValidationError,
-			"No input files given. If you wish to use the standard input please specify \"-\" explicitly."
-		);
-}
-
-void CommandLineParser::parseLibraryOption(std::string const& _input)
-{
-	namespace fs = boost::filesystem;
-	std::string data = _input;
-	try
-	{
-		if (fs::is_regular_file(_input))
-			data = util::readFileAsString(_input);
-	}
-	catch (fs::filesystem_error const&)
-	{
-		// Thrown e.g. if path is too long.
-	}
-	catch (util::FileNotFound const&)
-	{
-		// Should not happen if `fs::is_regular_file` is correct.
-	}
-	catch (util::NotAFile const&)
-	{
-		// Should not happen if `fs::is_regular_file` is correct.
-	}
-
-	std::vector<std::string> libraries;
-	boost::split(libraries, data, boost::is_space() || boost::is_any_of(","), boost::token_compress_on);
-	for (std::string const& lib: libraries)
-		if (!lib.empty())
-		{
-			//search for equal sign or last colon in string as our binaries output placeholders in the form of file=Name or file:Name
-			//so we need to search for `=` or `:` in the string
-			auto separator = lib.rfind('=');
-			bool isSeparatorEqualSign = true;
-			if (separator == std::string::npos)
-			{
-				separator = lib.rfind(':');
-				if (separator == std::string::npos)
-					solThrow(
-						CommandLineValidationError,
-						"Equal sign separator missing in library address specifier \"" + lib + "\""
-					);
-				else
-					isSeparatorEqualSign = false; // separator is colon
-			}
-			else
-				if (lib.rfind('=') != lib.find('='))
-					solThrow(
-						CommandLineValidationError,
-						"Only one equal sign \"=\" is allowed in the address string \"" + lib + "\"."
-					);
-
-			std::string libName(lib.begin(), lib.begin() + static_cast<ptrdiff_t>(separator));
-			boost::trim(libName);
-			if (m_options.linker.libraries.count(libName))
-				solThrow(
-					CommandLineValidationError,
-					"Address specified more than once for library \"" + libName + "\"."
-				);
-
-			std::string addrString(lib.begin() + static_cast<ptrdiff_t>(separator) + 1, lib.end());
-			boost::trim(addrString);
-			if (addrString.empty())
-				solThrow(
-					CommandLineValidationError,
-					"Empty address provided for library \"" + libName + "\".\n"
-					"Note that there should not be any whitespace after the " +
-					(isSeparatorEqualSign ? "equal sign" : "colon") + "."
-				);
-
-			if (addrString.substr(0, 2) == "0x")
-				addrString = addrString.substr(2);
-			else
-				solThrow(
-					CommandLineValidationError,
-					"The address " + addrString + " is not prefixed with \"0x\".\n"
-					"Note that the address must be prefixed with \"0x\"."
-				);
-
-			if (addrString.length() != 40)
-				solThrow(
-					CommandLineValidationError,
-					"Invalid length for address for library \"" + libName + "\": " +
-					std::to_string(addrString.length()) + " instead of 40 characters."
-				);
-			if (!util::passesAddressChecksum(addrString, false))
-				solThrow(
-					CommandLineValidationError,
-					"Invalid checksum on address for library \"" + libName + "\": " + addrString + "\n"
-					"The correct checksum is " + util::getChecksummedAddress(addrString)
-				);
-			bytes binAddr = util::fromHex(addrString);
-			util::h160 address(binAddr, util::h160::AlignRight);
-			if (binAddr.size() > 20 || address == util::h160())
-				solThrow(
-					CommandLineValidationError,
-					"Invalid address for library \"" + libName + "\": " + addrString
-				);
-			m_options.linker.libraries[libName] = address;
-		}
-}
-
-void CommandLineParser::parseOutputSelection()
-{
-	static auto outputSupported = [](InputMode _mode, std::string_view _outputName)
-	{
-		static std::set<std::string> const compilerModeOutputs = (
-			CompilerOutputs::componentMap() |
-			ranges::views::keys |
-			ranges::to<std::set>()
-		);
-		static std::set<std::string> const assemblerModeOutputs = {
-			CompilerOutputs::componentName(&CompilerOutputs::asm_),
-			CompilerOutputs::componentName(&CompilerOutputs::binary),
-			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
-			CompilerOutputs::componentName(&CompilerOutputs::astCompactJson),
-		};
-		static std::set<std::string> const evmAssemblyJsonImportModeOutputs = {
-			CompilerOutputs::componentName(&CompilerOutputs::asm_),
-			CompilerOutputs::componentName(&CompilerOutputs::binary),
-			CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime),
-			CompilerOutputs::componentName(&CompilerOutputs::opcodes),
-			CompilerOutputs::componentName(&CompilerOutputs::asmJson),
-		};
-		switch (_mode)
-		{
-		case InputMode::Help:
-		case InputMode::License:
-		case InputMode::Version:
-		case InputMode::LanguageServer:
-			solAssert(false);
-		case InputMode::Compiler:
-		case InputMode::CompilerWithASTImport:
-			return util::contains(compilerModeOutputs, _outputName);
-		case InputMode::EVMAssemblerJSON:
-			return util::contains(evmAssemblyJsonImportModeOutputs, _outputName);
-		case InputMode::Assembler:
-			return util::contains(assemblerModeOutputs, _outputName);
-		case InputMode::StandardJson:
-		case InputMode::Linker:
-			return false;
-		}
-
-		solAssert(false, "");
-	};
-
-	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
-		m_options.compiler.outputs.*outputComponent = (m_args.count(optionName) > 0);
-
-	if (m_options.input.mode == InputMode::Assembler && m_options.compiler.outputs == CompilerOutputs{})
-	{
-		// In assembly mode keep the default outputs enabled for backwards-compatibility.
-		// TODO: Remove this (must be done in a breaking release).
-		m_options.compiler.outputs.asm_ = true;
-		m_options.compiler.outputs.binary = true;
-		m_options.compiler.outputs.irOptimized = true;
-	}
-
-	std::vector<std::string> unsupportedOutputs;
-	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
-		if (m_options.compiler.outputs.*outputComponent && !outputSupported(m_options.input.mode, optionName))
-			unsupportedOutputs.push_back(optionName);
-
-	if (!unsupportedOutputs.empty())
-		solThrow(
-			CommandLineValidationError,
-			"The following outputs are not supported in " + g_inputModeName.at(m_options.input.mode) + " mode: " +
-			joinOptionNames(unsupportedOutputs) + "."
-		);
-
-	// TODO: restrict EOF version to correct EVM version.
-}
-
-po::options_description CommandLineParser::optionsDescription(bool _forHelp)
-{
-	// Declare the supported options.
-	po::options_description desc((R"(solc, the Solidity commandline compiler.
-
-This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you
-are welcome to redistribute it under certain conditions. See 'solc --)" + g_strLicense + R"('
-for details.
-
-Usage: solc [options] [input_file...]
-Compiles the given Solidity input files (or the standard input if "-" is
-used as a file name) and outputs the components specified in the options
-at standard output or in files in the output directory, if specified.
-Imports are automatically read from the filesystem, but it is also possible to
-remap paths using the context:prefix=path syntax.
-Example:
-solc --)" + CompilerOutputs::componentName(&CompilerOutputs::binary) + R"( -o /tmp/solcoutput dapp-bin=/usr/local/lib/dapp-bin contract.sol
-
-General Information)").c_str(),
-		po::options_description::m_default_line_length,
-		po::options_description::m_default_line_length - 23
-	);
-	desc.add_options()
-		(g_strHelp.c_str(), "Show help message and exit.")
-		(g_strVersion.c_str(), "Show version and exit.")
-		(g_strLicense.c_str(), "Show licensing information and exit.")
-	;
-
-	po::options_description inputOptions("Input Options");
-	inputOptions.add_options()
-		(
-			g_strBasePath.c_str(),
-			po::value<std::string>()->value_name("path"),
-			"Use the given path as the root of the source tree instead of the root of the filesystem."
-		)
-		(
-			g_strIncludePath.c_str(),
-			po::value<std::vector<std::string>>()->value_name("path"),
-			"Make an additional source directory available to the default import callback. "
-			"Use this option if you want to import contracts whose location is not fixed in relation "
-			"to your main source tree, e.g. third-party libraries installed using a package manager. "
-			"Can be used multiple times. "
-			"Can only be used if base path has a non-empty value."
-		)
-		(
-			g_strAllowPaths.c_str(),
-			po::value<std::string>()->value_name("path(s)"),
-			"Allow a given path for imports. A list of paths can be supplied by separating them with a comma."
-		)
-		(
-			g_strIgnoreMissingFiles.c_str(),
-			"Ignore missing files."
-		)
-		(
-			g_strNoImportCallback.c_str(),
-			"Disable the default import callback to prevent the compiler from loading any source "
-			"files not listed on the command line or given in the Standard JSON input."
-		)
-	;
-	desc.add(inputOptions);
-
-	po::options_description outputOptions("Output Options");
-	outputOptions.add_options()
-		(
-			(g_strOutputDir + ",o").c_str(),
-			po::value<std::string>()->value_name("path"),
-			"If given, creates one file per output component and contract/file at the specified directory."
-		)
-		(
-			g_strOverwrite.c_str(),
-			"Overwrite existing files (used together with -o)."
-		)
-		(
-			g_strEVMVersion.c_str(),
-			po::value<std::string>()->value_name("version")->default_value(EVMVersion{}.name()),
-			"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, "
-			"byzantium, constantinople, petersburg, istanbul, berlin, london, paris or shanghai."
-		)
-	;
-	if (!_forHelp) // Note: We intentionally keep this undocumented for now.
-		outputOptions.add_options()
-			(
-				g_strEOFVersion.c_str(),
-				// Declared as uint64_t, since uint8_t will be parsed as character by boost.
-				po::value<uint64_t>()->value_name("version")->implicit_value(1),
-				"Select desired EOF version. Currently the only valid value is 1. "
-				"If not specified, legacy non-EOF bytecode will be generated."
-			)
-		;
-	outputOptions.add_options()
-		(
-			g_strExperimentalViaIR.c_str(),
-			"Deprecated synonym of --via-ir."
-		)
-		(
-			g_strViaIR.c_str(),
-			"Turn on compilation mode via the IR."
-		)
-		(
-			g_strRevertStrings.c_str(),
-			po::value<std::string>()->value_name(util::joinHumanReadable(g_revertStringsArgs, ",")),
-			"Strip revert (and require) reason strings or add additional debugging information."
-		)
-		(
-			g_strDebugInfo.c_str(),
-			po::value<std::string>()->default_value(util::toString(DebugInfoSelection::Default())),
-			("Debug info components to be included in the produced EVM assembly and Yul code. "
-			"Value can be all, none or a comma-separated list containing one or more of the "
-			"following components: " + util::joinHumanReadable(DebugInfoSelection::componentMap() | ranges::views::keys) + ".").c_str()
-		)
-		(
-			g_strStopAfter.c_str(),
-			po::value<std::string>()->value_name("stage"),
-			"Stop execution after the given compiler stage. Valid options: \"parsing\"."
-		)
-	;
-	desc.add(outputOptions);
-
-	po::options_description alternativeInputModes("Alternative Input Modes");
-	alternativeInputModes.add_options()
-		(
-			g_strStandardJSON.c_str(),
-			"Switch to Standard JSON input / output mode, ignoring all options. "
-			"It reads from standard input, if no input file was given, otherwise it reads from the provided input file. The result will be written to standard output."
-		)
-		(
-			g_strLink.c_str(),
-			("Switch to linker mode, ignoring all options apart from --" + g_strLibraries + " "
-			"and modify binaries in place.").c_str()
-		)
-		(
-			g_strAssemble.c_str(),
-			"Switch to assembly mode and assume input is assembly."
-		)
-		(
-			g_strYul.c_str(),
-			"Switch to Yul mode and assume input is Yul."
-		)
-		(
-			g_strStrictAssembly.c_str(),
-			"Switch to strict assembly mode and assume input is strict assembly."
-		)
-		(
-			g_strImportAst.c_str(),
-			("Import ASTs to be compiled, assumes input holds the AST in compact JSON format. "
-			"Supported Inputs is the output of the --" + g_strStandardJSON + " or the one produced by "
-			"--" + g_strCombinedJson + " " + CombinedJsonRequests::componentName(&CombinedJsonRequests::ast)).c_str()
-		)
-		(
-			g_strImportEvmAssemblerJson.c_str(),
-			"Import EVM assembly from JSON. Assumes input is in the format used by --asm-json."
-		)
-		(
-			g_strLSP.c_str(),
-			"Switch to language server mode (\"LSP\"). Allows the compiler to be used as an analysis backend "
-			"for your favourite IDE."
-		)
-	;
-	desc.add(alternativeInputModes);
-
-	po::options_description assemblyModeOptions("Assembly Mode Options");
-	assemblyModeOptions.add_options()
-		(
-			g_strMachine.c_str(),
-			po::value<std::string>()->value_name(util::joinHumanReadable(g_machineArgs, ",")),
-			"Target machine in assembly or Yul mode."
-		)
-		(
-			g_strYulDialect.c_str(),
-			po::value<std::string>()->value_name(util::joinHumanReadable(g_yulDialectArgs, ",")),
-			"Input dialect to use in assembly or yul mode."
-		)
-	;
-	desc.add(assemblyModeOptions);
-
-	po::options_description linkerModeOptions("Linker Mode Options");
-	linkerModeOptions.add_options()
-		(
-			g_strLibraries.c_str(),
-			po::value<std::vector<std::string>>()->value_name("libs"),
-			"Direct string or file containing library addresses. Syntax: "
-			"<libraryName>=<address> [, or whitespace] ...\n"
-			"Address is interpreted as a hex string prefixed by 0x."
-		)
-	;
-	desc.add(linkerModeOptions);
-
-	po::options_description outputFormatting("Output Formatting");
-	outputFormatting.add_options()
-		(
-			g_strPrettyJson.c_str(),
-			"Output JSON in pretty format."
-		)
-		(
-			g_strJsonIndent.c_str(),
-			po::value<uint32_t>()->value_name("N")->default_value(util::JsonFormat::defaultIndent),
-			"Indent pretty-printed JSON with N spaces. Enables '--pretty-json' automatically."
-		)
-		(
-			g_strColor.c_str(),
-			"Force colored output."
-		)
-		(
-			g_strNoColor.c_str(),
-			"Explicitly disable colored output, disabling terminal auto-detection."
-		)
-		(
-			g_strErrorIds.c_str(),
-			"Output error codes."
-		)
-	;
-	desc.add(outputFormatting);
-
-	po::options_description outputComponents("Output Components");
-	outputComponents.add_options()
-		(CompilerOutputs::componentName(&CompilerOutputs::astCompactJson).c_str(), "AST of all source files in a compact JSON format.")
-		(CompilerOutputs::componentName(&CompilerOutputs::asm_).c_str(), "EVM assembly of the contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::asmJson).c_str(), "EVM assembly of the contracts in JSON format.")
-		(CompilerOutputs::componentName(&CompilerOutputs::opcodes).c_str(), "Opcodes of the contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::binary).c_str(), "Binary of the contracts in hex.")
-		(CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime).c_str(), "Binary of the runtime part of the contracts in hex.")
-		(CompilerOutputs::componentName(&CompilerOutputs::abi).c_str(), "ABI specification of the contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::ir).c_str(), "Intermediate Representation (IR) of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::irAstJson).c_str(), "AST of Intermediate Representation (IR) of all contracts in a compact JSON format.")
-		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized Intermediate Representation (IR) of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::irOptimizedAstJson).c_str(), "AST of optimized Intermediate Representation (IR) of all contracts in a compact JSON format.")
-		(CompilerOutputs::componentName(&CompilerOutputs::signatureHashes).c_str(), "Function signature hashes of the contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::natspecUser).c_str(), "Natspec user documentation of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::natspecDev).c_str(), "Natspec developer documentation of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::metadata).c_str(), "Combined Metadata JSON whose IPFS hash is stored on-chain.")
-		(CompilerOutputs::componentName(&CompilerOutputs::storageLayout).c_str(), "Slots, offsets and types of the contract's state variables.")
-	;
-	desc.add(outputComponents);
-
-	po::options_description extraOutput("Extra Output");
-	extraOutput.add_options()
-		(
-			g_strGas.c_str(),
-			"Print an estimate of the maximal gas usage for each function."
-		)
-		(
-			g_strCombinedJson.c_str(),
-			po::value<std::string>()->value_name(util::joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")),
-			"Output a single json document containing the specified information."
-		)
-	;
-	desc.add(extraOutput);
-
-	po::options_description metadataOptions("Metadata Options");
-	metadataOptions.add_options()
-		(
-			g_strNoCBORMetadata.c_str(),
-			"Do not append CBOR metadata to the end of the bytecode."
-		)
-		(
-			g_strMetadataHash.c_str(),
-			po::value<std::string>()->value_name(util::joinHumanReadable(g_metadataHashArgs, ",")),
-			"Choose hash method for the bytecode metadata or disable it."
-		)
-		(
-			g_strMetadataLiteral.c_str(),
-			"Store referenced sources as literal data in the metadata output."
-		)
-	;
-	desc.add(metadataOptions);
-
-	po::options_description optimizerOptions("Optimizer Options");
-	optimizerOptions.add_options()
-		(
-			g_strOptimize.c_str(),
-			"Enable optimizer."
-		)
-		(
-			g_strOptimizeRuns.c_str(),
-			// TODO: The type in OptimiserSettings is size_t but we only accept values up to 2**32-1
-			// on the CLI and in Standard JSON. We should just switch to uint32_t everywhere.
-			po::value<unsigned>()->value_name("n")->default_value(static_cast<unsigned>(OptimiserSettings{}.expectedExecutionsPerDeployment)),
-			"The number of runs specifies roughly how often each opcode of the deployed code will be executed across the lifetime of the contract. "
-			"Lower values will optimize more for initial deployment cost, higher values will optimize more for high-frequency usage."
-		)
-		(
-			g_strOptimizeYul.c_str(),
-			("Enable Yul optimizer (independently of the EVM assembly optimizer). "
-			"The general --" + g_strOptimize + " option automatically enables this unless --" +
-			g_strNoOptimizeYul + " is specified.").c_str()
-		)
-		(
-			g_strNoOptimizeYul.c_str(),
-			"Disable Yul optimizer (independently of the EVM assembly optimizer)."
-		)
-		(
-			g_strYulOptimizations.c_str(),
-			po::value<std::string>()->value_name("steps"),
-			"Forces Yul optimizer to use the specified sequence of optimization steps instead of the built-in one."
-		)
-	;
-	desc.add(optimizerOptions);
-
-	po::options_description smtCheckerOptions("Model Checker Options");
-	smtCheckerOptions.add_options()
-		(
-			g_strModelCheckerContracts.c_str(),
-			po::value<std::string>()->value_name("default,<source>:<contract>")->default_value("default"),
-			"Select which contracts should be analyzed using the form <source>:<contract>."
-			"Multiple pairs <source>:<contract> can be selected at the same time, separated by a comma "
-			"and no spaces."
-		)
-		(
-			g_strModelCheckerDivModNoSlacks.c_str(),
-			"Encode division and modulo operations with their precise operators"
-			" instead of multiplication with slack variables."
-		)
-		(
-			g_strModelCheckerEngine.c_str(),
-			po::value<std::string>()->value_name("all,bmc,chc,none")->default_value("none"),
-			"Select model checker engine."
-		)
-		(
-			g_strModelCheckerExtCalls.c_str(),
-			po::value<std::string>()->value_name("untrusted,trusted")->default_value("untrusted"),
-			"Select whether to assume (trusted) that external calls always invoke"
-			" the code given by the type of the contract, if that code is available."
-		)
-		(
-			g_strModelCheckerInvariants.c_str(),
-			po::value<std::string>()->value_name("default,all,contract,reentrancy")->default_value("default"),
-			"Select whether to report inferred contract inductive invariants."
-			" Multiple types of invariants can be selected at the same time, separated by a comma and no spaces."
-			" By default no invariants are reported."
-		)
-		(
-			g_strModelCheckerPrintQuery.c_str(),
-			"Print the queries created by the SMTChecker in the SMTLIB2 format."
-		)
-		(
-			g_strModelCheckerShowProvedSafe.c_str(),
-			"Show all targets that were proved safe separately."
-		)
-		(
-			g_strModelCheckerShowUnproved.c_str(),
-			"Show all unproved targets separately."
-		)
-		(
-			g_strModelCheckerShowUnsupported.c_str(),
-			"Show all unsupported language features separately."
-		)
-		(
-			g_strModelCheckerSolvers.c_str(),
-			po::value<std::string>()->value_name("cvc4,eld,z3,smtlib2")->default_value("z3"),
-			"Select model checker solvers."
-		)
-		(
-			g_strModelCheckerTargets.c_str(),
-			po::value<std::string>()->value_name("default,all,constantCondition,underflow,overflow,divByZero,balance,assert,popEmptyArray,outOfBounds")->default_value("default"),
-			"Select model checker verification targets."
-			"Multiple targets can be selected at the same time, separated by a comma and no spaces."
-			" By default all targets except underflow and overflow are selected."
-		)
-		(
-			g_strModelCheckerTimeout.c_str(),
-			po::value<unsigned>()->value_name("ms"),
-			"Set model checker timeout per query in milliseconds."
-			"The default is a deterministic resource limit."
-			"A timeout of 0 means no resource/time restrictions for any query."
-		)
-		(
-			g_strModelCheckerBMCLoopIterations.c_str(),
-			po::value<unsigned>(),
-			"Set loop unrolling depth for BMC engine."
-			"Default is 1."
-		)
-	;
-	desc.add(smtCheckerOptions);
-
-	desc.add_options()(g_strInputFile.c_str(), po::value<std::vector<std::string>>(), "input file");
-	return desc;
-}
-
-po::positional_options_description CommandLineParser::positionalOptionsDescription()
-{
-	// All positional options should be interpreted as input files
-	po::positional_options_description filesPositions;
-	filesPositions.add(g_strInputFile.c_str(), -1);
-	return filesPositions;
-}
-
-void CommandLineParser::parseArgs(int _argc, char const* const* _argv)
-{
-	po::options_description allOptions = optionsDescription();
-	po::positional_options_description filesPositions = positionalOptionsDescription();
-
-	m_options = {};
-	m_args = {};
-
-	// parse the compiler arguments
-	try
-	{
-		po::command_line_parser cmdLineParser(_argc, _argv);
-		cmdLineParser.style(po::command_line_style::default_style & (~po::command_line_style::allow_guessing));
-		cmdLineParser.options(allOptions).positional(filesPositions);
-		po::store(cmdLineParser.run(), m_args);
-	}
-	catch (po::error const& _exception)
-	{
-		solThrow(CommandLineValidationError, _exception.what());
-	}
-
-	po::notify(m_args);
-}
-
-void CommandLineParser::processArgs()
-{
-	if (m_args.count(g_strNoColor) > 0)
-		m_options.formatting.coloredOutput = false;
-	else if (m_args.count(g_strColor) > 0)
-		m_options.formatting.coloredOutput = true;
-
-	checkMutuallyExclusive({
-		g_strHelp,
-		g_strLicense,
-		g_strVersion,
-		g_strStandardJSON,
-		g_strLink,
-		g_strAssemble,
-		g_strStrictAssembly,
-		g_strYul,
-		g_strImportAst,
-		g_strLSP,
-		g_strImportEvmAssemblerJson,
-	});
-
-	if (m_args.count(g_strHelp) > 0)
-		m_options.input.mode = InputMode::Help;
-	else if (m_args.count(g_strLicense) > 0)
-		m_options.input.mode = InputMode::License;
-	else if (m_args.count(g_strVersion) > 0)
-		m_options.input.mode = InputMode::Version;
-	else if (m_args.count(g_strStandardJSON) > 0)
-		m_options.input.mode = InputMode::StandardJson;
-	else if (m_args.count(g_strLSP))
-		m_options.input.mode = InputMode::LanguageServer;
-	else if (m_args.count(g_strAssemble) > 0 || m_args.count(g_strStrictAssembly) > 0 || m_args.count(g_strYul) > 0)
-		m_options.input.mode = InputMode::Assembler;
-	else if (m_args.count(g_strLink) > 0)
-		m_options.input.mode = InputMode::Linker;
-	else if (m_args.count(g_strImportAst) > 0)
-		m_options.input.mode = InputMode::CompilerWithASTImport;
-	else if (m_args.count(g_strImportEvmAssemblerJson) > 0)
-		m_options.input.mode = InputMode::EVMAssemblerJSON;
-	else
-		m_options.input.mode = InputMode::Compiler;
-
-	if (
-		m_options.input.mode == InputMode::Help ||
-		m_options.input.mode == InputMode::License ||
-		m_options.input.mode == InputMode::Version
-	)
-		return;
-
-	std::map<std::string, std::set<InputMode>> validOptionInputModeCombinations = {
-		// TODO: This should eventually contain all options.
-		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strMetadataLiteral, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strNoCBORMetadata, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strMetadataHash, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerContracts, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerDivModNoSlacks, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerEngine, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerInvariants, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerPrintQuery, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerShowProvedSafe, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerShowUnsupported, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerSolvers, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerTimeout, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerBMCLoopIterations, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerContracts, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerTargets, {InputMode::Compiler, InputMode::CompilerWithASTImport}}
-	};
-	std::vector<std::string> invalidOptionsForCurrentInputMode;
-	for (auto const& [optionName, inputModes]: validOptionInputModeCombinations)
-	{
-		if (
-			m_args.count(optionName) > 0 &&
-			inputModes.count(m_options.input.mode) == 0 &&
-			!m_args[optionName].defaulted()
-		)
-			invalidOptionsForCurrentInputMode.push_back(optionName);
-	}
-
-	if (!invalidOptionsForCurrentInputMode.empty())
-		solThrow(
-			CommandLineValidationError,
-			"The following options are not supported in the current input mode: " +
-			joinOptionNames(invalidOptionsForCurrentInputMode)
-		);
-
-	if (m_options.input.mode == InputMode::LanguageServer)
-		return;
-
-	checkMutuallyExclusive({g_strColor, g_strNoColor});
-	checkMutuallyExclusive({g_strStopAfter, g_strGas});
-
-	for (std::string const& option: CompilerOutputs::componentMap() | ranges::views::keys)
-		if (option != CompilerOutputs::componentName(&CompilerOutputs::astCompactJson))
-			checkMutuallyExclusive({g_strStopAfter, option});
-
-	if (m_options.input.mode == InputMode::EVMAssemblerJSON)
-	{
-		static std::set<std::string> const supportedByEvmAsmJsonImport{
-			g_strImportEvmAssemblerJson,
-			CompilerOutputs::componentName(&CompilerOutputs::asm_),
-			CompilerOutputs::componentName(&CompilerOutputs::binary),
-			CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime),
-			CompilerOutputs::componentName(&CompilerOutputs::asmJson),
-			CompilerOutputs::componentName(&CompilerOutputs::opcodes),
-			g_strCombinedJson,
-			g_strInputFile,
-			g_strJsonIndent,
-			g_strPrettyJson,
-			"srcmap",
-			"srcmap-runtime",
-		};
-
-		for (auto const& [optionName, optionValue]: m_args)
-			if (!optionValue.defaulted() && !supportedByEvmAsmJsonImport.count(optionName))
-				solThrow(
-					CommandLineValidationError,
-					fmt::format(
-						"Option --{} is not supported with --{}.",
-						optionName,
-						g_strImportEvmAssemblerJson
-					)
-				);
-	}
-
-	if (
-		m_options.input.mode != InputMode::Compiler &&
-		m_options.input.mode != InputMode::CompilerWithASTImport &&
-		m_options.input.mode != InputMode::EVMAssemblerJSON &&
-		m_options.input.mode != InputMode::Assembler
-	)
-	{
-		if (!m_args[g_strOptimizeRuns].defaulted())
-			solThrow(
-				CommandLineValidationError,
-				"Option --" + g_strOptimizeRuns + " is only valid in compiler and assembler modes."
-			);
-
-		for (std::string const& option: {g_strOptimize, g_strNoOptimizeYul, g_strOptimizeYul, g_strYulOptimizations})
-			if (m_args.count(option) > 0)
-				solThrow(
-					CommandLineValidationError,
-					"Option --" + option + " is only valid in compiler and assembler modes."
-				);
-
-		if (!m_args[g_strDebugInfo].defaulted())
-			solThrow(
-				CommandLineValidationError,
-				"Option --" + g_strDebugInfo + " is only valid in compiler and assembler modes."
-			);
-	}
-
-	m_options.formatting.withErrorIds = m_args.count(g_strErrorIds);
-
-	if (m_args.count(g_strRevertStrings))
-	{
-		std::string revertStringsString = m_args[g_strRevertStrings].as<std::string>();
-		std::optional<RevertStrings> revertStrings = revertStringsFromString(revertStringsString);
-		if (!revertStrings)
-			solThrow(
-				CommandLineValidationError,
-				"Invalid option for --" + g_strRevertStrings + ": " + revertStringsString
-			);
-		if (*revertStrings == RevertStrings::VerboseDebug)
-			solThrow(
-				CommandLineValidationError,
-				"Only \"default\", \"strip\" and \"debug\" are implemented for --" + g_strRevertStrings + " for now."
-			);
-		m_options.output.revertStrings = *revertStrings;
-	}
-
-	if (!m_args[g_strDebugInfo].defaulted())
-	{
-		std::string optionValue = m_args[g_strDebugInfo].as<std::string>();
-		m_options.output.debugInfoSelection = DebugInfoSelection::fromString(optionValue);
-		if (!m_options.output.debugInfoSelection.has_value())
-			solThrow(CommandLineValidationError, "Invalid value for --" + g_strDebugInfo + " option: " + optionValue);
-
-		if (m_options.output.debugInfoSelection->snippet && !m_options.output.debugInfoSelection->location)
-			solThrow(CommandLineValidationError, "To use 'snippet' with --" + g_strDebugInfo + " you must select also 'location'.");
-	}
-
-	parseCombinedJsonOption();
-
-	if (m_args.count(g_strOutputDir))
-		m_options.output.dir = m_args.at(g_strOutputDir).as<std::string>();
-
-	m_options.output.overwriteFiles = (m_args.count(g_strOverwrite) > 0);
-
-	if (m_args.count(g_strPrettyJson) > 0)
-	{
-		m_options.formatting.json.format = util::JsonFormat::Pretty;
-	}
-	if (!m_args[g_strJsonIndent].defaulted())
-	{
-		m_options.formatting.json.format = util::JsonFormat::Pretty;
-		m_options.formatting.json.indent = m_args[g_strJsonIndent].as<uint32_t>();
-	}
-
-	parseOutputSelection();
-
-	m_options.compiler.estimateGas = (m_args.count(g_strGas) > 0);
-
-	if (m_args.count(g_strBasePath))
-		m_options.input.basePath = m_args[g_strBasePath].as<std::string>();
-
-	if (m_args.count(g_strIncludePath) > 0)
-	{
-		if (m_options.input.basePath.empty())
-			solThrow(CommandLineValidationError, "--" + g_strIncludePath + " option requires a non-empty base path.");
-
-		for (std::string const& includePath: m_args[g_strIncludePath].as<std::vector<std::string>>())
-		{
-			if (includePath.empty())
-				solThrow(CommandLineValidationError, "Empty values are not allowed in --" + g_strIncludePath + ".");
-
-			m_options.input.includePaths.push_back(includePath);
-		}
-	}
-
-	checkMutuallyExclusive({g_strNoImportCallback, g_strAllowPaths});
-
-	if (m_args.count(g_strNoImportCallback))
-		m_options.input.noImportCallback = true;
-
-	if (m_args.count(g_strAllowPaths))
-	{
-		std::vector<std::string> paths;
-		for (std::string const& allowedPath: boost::split(paths, m_args[g_strAllowPaths].as<std::string>(), boost::is_any_of(",")))
-			if (!allowedPath.empty())
-				m_options.input.allowedDirectories.insert(allowedPath);
-	}
-
-	if (m_args.count(g_strStopAfter))
-	{
-		if (m_args[g_strStopAfter].as<std::string>() != "parsing")
-			solThrow(CommandLineValidationError, "Valid options for --" + g_strStopAfter + " are: \"parsing\".\n");
-		else
-			m_options.output.stopAfter = CompilerStack::State::Parsed;
-	}
-
-	parseInputPathsAndRemappings();
-
-	if (m_options.input.mode == InputMode::StandardJson)
-		return;
-
-	if (m_args.count(g_strLibraries))
-		for (std::string const& library: m_args[g_strLibraries].as<std::vector<std::string>>())
-			parseLibraryOption(library);
-
-	if (m_options.input.mode == InputMode::Linker)
-		return;
-
-	if (m_args.count(g_strEVMVersion))
-	{
-		std::string versionOptionStr = m_args[g_strEVMVersion].as<std::string>();
-		std::optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
-		if (!versionOption)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEVMVersion + ": " + versionOptionStr);
-		m_options.output.evmVersion = *versionOption;
-	}
-
-	if (m_args.count(g_strEOFVersion))
-	{
-		// Request as uint64_t, since uint8_t will be parsed as character by boost.
-		uint64_t versionOption = m_args[g_strEOFVersion].as<uint64_t>();
-		if (versionOption != 1)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEOFVersion + ": " + std::to_string(versionOption));
-		m_options.output.eofVersion = 1;
-	}
-
-	if (m_args.count(g_strNoOptimizeYul) > 0 && m_args.count(g_strOptimizeYul) > 0)
-		solThrow(
-			CommandLineValidationError,
-			"Options --" + g_strOptimizeYul + " and --" + g_strNoOptimizeYul + " cannot be used together."
-		);
-
-	m_options.optimizer.optimizeEvmasm = (m_args.count(g_strOptimize) > 0);
-	m_options.optimizer.optimizeYul = (
-		(m_args.count(g_strOptimize) > 0 && m_args.count(g_strNoOptimizeYul) == 0) ||
-		m_args.count(g_strOptimizeYul) > 0
-	);
-	if (!m_args[g_strOptimizeRuns].defaulted())
-		m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
-
-	if (m_args.count(g_strYulOptimizations))
-	{
-		OptimiserSettings optimiserSettings = m_options.optimiserSettings();
-		if (!optimiserSettings.runYulOptimiser)
-			solThrow(CommandLineValidationError, "--" + g_strYulOptimizations + " is invalid if Yul optimizer is disabled");
-
-		try
-		{
-			yul::OptimiserSuite::validateSequence(m_args[g_strYulOptimizations].as<std::string>());
-		}
-		catch (yul::OptimizerException const& _exception)
-		{
-			solThrow(
-				CommandLineValidationError,
-				"Invalid optimizer step sequence in --" + g_strYulOptimizations + ": " + _exception.what()
-			);
-		}
-
-		m_options.optimizer.yulSteps = m_args[g_strYulOptimizations].as<std::string>();
-	}
-
-	if (m_options.input.mode == InputMode::Assembler)
-	{
-		std::vector<std::string> const nonAssemblyModeOptions = {
-			// TODO: The list is not complete. Add more.
-			g_strOutputDir,
-			g_strGas,
-			g_strCombinedJson,
-		};
-		if (countEnabledOptions(nonAssemblyModeOptions) >= 1)
-		{
-			auto optionEnabled = [&](std::string const& name){ return m_args.count(name) > 0; };
-			auto enabledOptions = nonAssemblyModeOptions | ranges::views::filter(optionEnabled) | ranges::to_vector;
-
-			std::string message = "The following options are invalid in assembly mode: " + joinOptionNames(enabledOptions) + ".";
-			solThrow(CommandLineValidationError, message);
-		}
-
-		// switch to assembly mode
-		using Input = yul::YulStack::Language;
-		using Machine = yul::YulStack::Machine;
-		m_options.assembly.inputLanguage = m_args.count(g_strYul) ? Input::Yul : (m_args.count(g_strStrictAssembly) ? Input::StrictAssembly : Input::Assembly);
-
-		if (m_args.count(g_strMachine))
-		{
-			std::string machine = m_args[g_strMachine].as<std::string>();
-			if (machine == g_strEVM)
-				m_options.assembly.targetMachine = Machine::EVM;
-			else
-				solThrow(CommandLineValidationError, "Invalid option for --" + g_strMachine + ": " + machine);
-		}
-		if (m_args.count(g_strYulDialect))
-		{
-			std::string dialect = m_args[g_strYulDialect].as<std::string>();
-			if (dialect == g_strEVM)
-				m_options.assembly.inputLanguage = Input::StrictAssembly;
-			else
-				solThrow(CommandLineValidationError, "Invalid option for --" + g_strYulDialect + ": " + dialect);
-		}
-		if (
-				(m_options.optimizer.optimizeEvmasm || m_options.optimizer.optimizeYul) &&
-				m_options.assembly.inputLanguage != Input::StrictAssembly
-			)
-			solThrow(
-				CommandLineValidationError,
-				"Optimizer can only be used for strict assembly. Use --"  + g_strStrictAssembly + "."
-			);
-		return;
-	}
-	else if (countEnabledOptions({g_strYulDialect, g_strMachine}) >= 1)
-		solThrow(
-			CommandLineValidationError,
-			"--" + g_strYulDialect + " and --" + g_strMachine + " are only valid in assembly mode."
-		);
-
-	if (m_args.count(g_strMetadataHash))
-	{
-		std::string hashStr = m_args[g_strMetadataHash].as<std::string>();
-		if (hashStr == g_strIPFS)
-			m_options.metadata.hash = CompilerStack::MetadataHash::IPFS;
-		else if (hashStr == g_strSwarm)
-			m_options.metadata.hash = CompilerStack::MetadataHash::Bzzr1;
-		else if (hashStr == g_strNone)
-			m_options.metadata.hash = CompilerStack::MetadataHash::None;
-		else
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strMetadataHash + ": " + hashStr);
-	}
-
-	if (m_args.count(g_strNoCBORMetadata))
-	{
-		if (
-			m_args.count(g_strMetadataHash) &&
-			m_options.metadata.hash != CompilerStack::MetadataHash::None
-		)
-			solThrow(
-				CommandLineValidationError,
-				"Cannot specify a metadata hashing method when --" +
-				g_strNoCBORMetadata + " is set."
-			);
-
-		m_options.metadata.format = CompilerStack::MetadataFormat::NoMetadata;
-	}
-
-	if (m_args.count(g_strModelCheckerContracts))
-	{
-		std::string contractsStr = m_args[g_strModelCheckerContracts].as<std::string>();
-		std::optional<ModelCheckerContracts> contracts = ModelCheckerContracts::fromString(contractsStr);
-		if (!contracts)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerContracts + ": " + contractsStr);
-		m_options.modelChecker.settings.contracts = std::move(*contracts);
-	}
-
-	if (m_args.count(g_strModelCheckerDivModNoSlacks))
-		m_options.modelChecker.settings.divModNoSlacks = true;
-
-	if (m_args.count(g_strModelCheckerEngine))
-	{
-		std::string engineStr = m_args[g_strModelCheckerEngine].as<std::string>();
-		std::optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(engineStr);
-		if (!engine)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerEngine + ": " + engineStr);
-		m_options.modelChecker.settings.engine = *engine;
-	}
-
-	if (m_args.count(g_strModelCheckerExtCalls))
-	{
-		std::string mode = m_args[g_strModelCheckerExtCalls].as<std::string>();
-		std::optional<ModelCheckerExtCalls> extCallsMode = ModelCheckerExtCalls::fromString(mode);
-		if (!extCallsMode)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerExtCalls + ": " + mode);
-		m_options.modelChecker.settings.externalCalls = *extCallsMode;
-	}
-
-	if (m_args.count(g_strModelCheckerInvariants))
-	{
-		std::string invsStr = m_args[g_strModelCheckerInvariants].as<std::string>();
-		std::optional<ModelCheckerInvariants> invs = ModelCheckerInvariants::fromString(invsStr);
-		if (!invs)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerInvariants + ": " + invsStr);
-		m_options.modelChecker.settings.invariants = *invs;
-	}
-
-	if (m_args.count(g_strModelCheckerShowProvedSafe))
-		m_options.modelChecker.settings.showProvedSafe = true;
-
-	if (m_args.count(g_strModelCheckerShowUnproved))
-		m_options.modelChecker.settings.showUnproved = true;
-
-	if (m_args.count(g_strModelCheckerShowUnsupported))
-		m_options.modelChecker.settings.showUnsupported = true;
-
-	if (m_args.count(g_strModelCheckerSolvers))
-	{
-		std::string solversStr = m_args[g_strModelCheckerSolvers].as<std::string>();
-		std::optional<smtutil::SMTSolverChoice> solvers = smtutil::SMTSolverChoice::fromString(solversStr);
-		if (!solvers)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerSolvers + ": " + solversStr);
-		m_options.modelChecker.settings.solvers = *solvers;
-	}
-
-	if (m_args.count(g_strModelCheckerPrintQuery))
-	{
-		if (!(m_options.modelChecker.settings.solvers == smtutil::SMTSolverChoice::SMTLIB2()))
-			solThrow(CommandLineValidationError, "Only SMTLib2 solver can be enabled to print queries");
-		m_options.modelChecker.settings.printQuery = true;
-	}
-
-	if (m_args.count(g_strModelCheckerTargets))
-	{
-		std::string targetsStr = m_args[g_strModelCheckerTargets].as<std::string>();
-		std::optional<ModelCheckerTargets> targets = ModelCheckerTargets::fromString(targetsStr);
-		if (!targets)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerTargets + ": " + targetsStr);
-		m_options.modelChecker.settings.targets = *targets;
-	}
-
-	if (m_args.count(g_strModelCheckerTimeout))
-		m_options.modelChecker.settings.timeout = m_args[g_strModelCheckerTimeout].as<unsigned>();
-
-	if (m_args.count(g_strModelCheckerBMCLoopIterations))
-	{
-		if (!m_options.modelChecker.settings.engine.bmc)
-			solThrow(CommandLineValidationError, "BMC loop unrolling requires the BMC engine to be enabled");
-		m_options.modelChecker.settings.bmcLoopIterations = m_args[g_strModelCheckerBMCLoopIterations].as<unsigned>();
-	}
-
-	m_options.metadata.literalSources = (m_args.count(g_strMetadataLiteral) > 0);
-	m_options.modelChecker.initialize =
-		m_args.count(g_strModelCheckerContracts) ||
-		m_args.count(g_strModelCheckerDivModNoSlacks) ||
-		m_args.count(g_strModelCheckerEngine) ||
-		m_args.count(g_strModelCheckerExtCalls) ||
-		m_args.count(g_strModelCheckerInvariants) ||
-		m_args.count(g_strModelCheckerShowProvedSafe) ||
-		m_args.count(g_strModelCheckerShowUnproved) ||
-		m_args.count(g_strModelCheckerShowUnsupported) ||
-		m_args.count(g_strModelCheckerSolvers) ||
-		m_args.count(g_strModelCheckerTargets) ||
-		m_args.count(g_strModelCheckerTimeout);
-	m_options.output.viaIR = (m_args.count(g_strExperimentalViaIR) > 0 || m_args.count(g_strViaIR) > 0);
-
-	solAssert(
-		m_options.input.mode == InputMode::Compiler ||
-		m_options.input.mode == InputMode::CompilerWithASTImport ||
-		m_options.input.mode == InputMode::EVMAssemblerJSON
-	);
-}
-
-void CommandLineParser::parseCombinedJsonOption()
-{
-	if (!m_args.count(g_strCombinedJson))
-		return;
-
-	std::set<std::string> requests;
-	for (std::string const& item: boost::split(requests, m_args[g_strCombinedJson].as<std::string>(), boost::is_any_of(",")))
-		if (CombinedJsonRequests::componentMap().count(item) == 0)
-			solThrow(CommandLineValidationError, "Invalid option to --" + g_strCombinedJson + ": " + item);
-
-	m_options.compiler.combinedJsonRequests = CombinedJsonRequests{};
-	for (auto&& [componentName, component]: CombinedJsonRequests::componentMap())
-		m_options.compiler.combinedJsonRequests.value().*component = (requests.count(componentName) > 0);
-
-	if (m_options.input.mode == InputMode::EVMAssemblerJSON && m_options.compiler.combinedJsonRequests.has_value())
-	{
-		static bool CombinedJsonRequests::* invalidOptions[]{
-			&CombinedJsonRequests::abi,
-			&CombinedJsonRequests::ast,
-			&CombinedJsonRequests::funDebug,
-			&CombinedJsonRequests::funDebugRuntime,
-			&CombinedJsonRequests::generatedSources,
-			&CombinedJsonRequests::generatedSourcesRuntime,
-			&CombinedJsonRequests::metadata,
-			&CombinedJsonRequests::natspecDev,
-			&CombinedJsonRequests::natspecUser,
-			&CombinedJsonRequests::signatureHashes,
-			&CombinedJsonRequests::storageLayout
-		};
-
-		for (auto const invalidOption: invalidOptions)
-			if (m_options.compiler.combinedJsonRequests.value().*invalidOption)
-				solThrow(
-					CommandLineValidationError,
-					fmt::format(
-						"The --{} {} output is not available in EVM assembly import mode.",
-						g_strCombinedJson,
-						CombinedJsonRequests::componentName(invalidOption)
-					)
-				);
-	}
-}
-
-size_t CommandLineParser::countEnabledOptions(std::vector<std::string> const& _optionNames) const
-{
-	size_t count = 0;
-	for (std::string const& _option: _optionNames)
-		count += m_args.count(_option);
-
-	return count;
-}
-
-std::string CommandLineParser::joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator)
-{
-	return util::joinHumanReadable(
-		_optionNames | ranges::views::transform([](std::string const& _option){ return "--" + _option; }),
-		_separator
-	);
-}
-
-} // namespace solidity::frontend
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
deleted file mode 100644
index b95973562e51..000000000000
--- a/solc/CommandLineParser.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Validates and parses command-line options into an internal representation.
- */
-#pragma once
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <libsolidity/interface/FileReader.h>
-#include <libsolidity/interface/ImportRemapper.h>
-
-#include <libyul/YulStack.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/JSON.h>
-
-#include <boost/program_options.hpp>
-#include <boost/filesystem/path.hpp>
-
-#include <map>
-#include <memory>
-#include <optional>
-#include <ostream>
-#include <set>
-#include <string>
-#include <vector>
-
-namespace solidity::frontend
-{
-
-enum class InputMode
-{
-	Help,
-	License,
-	Version,
-	Compiler,
-	CompilerWithASTImport,
-	StandardJson,
-	Linker,
-	Assembler,
-	LanguageServer,
-	EVMAssemblerJSON
-};
-
-struct CompilerOutputs
-{
-	bool operator!=(CompilerOutputs const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(CompilerOutputs const& _other) const noexcept;
-	friend std::ostream& operator<<(std::ostream& _out, CompilerOutputs const& _requests);
-
-	static std::string const& componentName(bool CompilerOutputs::* _component);
-	static auto const& componentMap()
-	{
-		static std::map<std::string, bool CompilerOutputs::*> const components = {
-			{"ast-compact-json", &CompilerOutputs::astCompactJson},
-			{"asm", &CompilerOutputs::asm_},
-			{"asm-json", &CompilerOutputs::asmJson},
-			{"opcodes", &CompilerOutputs::opcodes},
-			{"bin", &CompilerOutputs::binary},
-			{"bin-runtime", &CompilerOutputs::binaryRuntime},
-			{"abi", &CompilerOutputs::abi},
-			{"ir", &CompilerOutputs::ir},
-			{"ir-ast-json", &CompilerOutputs::irAstJson},
-			{"ir-optimized", &CompilerOutputs::irOptimized},
-			{"ir-optimized-ast-json", &CompilerOutputs::irOptimizedAstJson},
-			{"hashes", &CompilerOutputs::signatureHashes},
-			{"userdoc", &CompilerOutputs::natspecUser},
-			{"devdoc", &CompilerOutputs::natspecDev},
-			{"metadata", &CompilerOutputs::metadata},
-			{"storage-layout", &CompilerOutputs::storageLayout},
-		};
-		return components;
-	}
-
-	bool astCompactJson = false;
-	bool asm_ = false;
-	bool asmJson = false;
-	bool opcodes = false;
-	bool binary = false;
-	bool binaryRuntime = false;
-	bool abi = false;
-	bool ir = false;
-	bool irAstJson = false;
-	bool irOptimized = false;
-	bool irOptimizedAstJson = false;
-	bool signatureHashes = false;
-	bool natspecUser = false;
-	bool natspecDev = false;
-	bool metadata = false;
-	bool storageLayout = false;
-};
-
-struct CombinedJsonRequests
-{
-	bool operator!=(CombinedJsonRequests const& _other) const noexcept { return !(*this == _other); }
-	bool operator==(CombinedJsonRequests const& _other) const noexcept;
-	friend std::ostream& operator<<(std::ostream& _out, CombinedJsonRequests const& _requests);
-
-	static std::string const& componentName(bool CombinedJsonRequests::* _component);
-	static auto const& componentMap()
-	{
-		static std::map<std::string, bool CombinedJsonRequests::*> const components = {
-			{"abi", &CombinedJsonRequests::abi},
-			{"metadata", &CombinedJsonRequests::metadata},
-			{"bin", &CombinedJsonRequests::binary},
-			{"bin-runtime", &CombinedJsonRequests::binaryRuntime},
-			{"opcodes", &CombinedJsonRequests::opcodes},
-			{"asm", &CombinedJsonRequests::asm_},
-			{"storage-layout", &CombinedJsonRequests::storageLayout},
-			{"generated-sources", &CombinedJsonRequests::generatedSources},
-			{"generated-sources-runtime", &CombinedJsonRequests::generatedSourcesRuntime},
-			{"srcmap", &CombinedJsonRequests::srcMap},
-			{"srcmap-runtime", &CombinedJsonRequests::srcMapRuntime},
-			{"function-debug", &CombinedJsonRequests::funDebug},
-			{"function-debug-runtime", &CombinedJsonRequests::funDebugRuntime},
-			{"hashes", &CombinedJsonRequests::signatureHashes},
-			{"devdoc", &CombinedJsonRequests::natspecDev},
-			{"userdoc", &CombinedJsonRequests::natspecUser},
-			{"ast", &CombinedJsonRequests::ast},
-		};
-		return components;
-	}
-
-	bool abi = false;
-	bool metadata = false;
-	bool binary = false;
-	bool binaryRuntime = false;
-	bool opcodes = false;
-	bool asm_ = false;
-	bool storageLayout = false;
-	bool generatedSources = false;
-	bool generatedSourcesRuntime = false;
-	bool srcMap = false;
-	bool srcMapRuntime = false;
-	bool funDebug = false;
-	bool funDebugRuntime = false;
-	bool signatureHashes = false;
-	bool natspecDev = false;
-	bool natspecUser = false;
-	bool ast = false;
-};
-
-struct CommandLineOptions
-{
-	bool operator==(CommandLineOptions const& _other) const noexcept;
-	bool operator!=(CommandLineOptions const& _other) const noexcept { return !(*this == _other); }
-
-	OptimiserSettings optimiserSettings() const;
-
-	struct
-	{
-		InputMode mode = InputMode::Compiler;
-		std::set<boost::filesystem::path> paths;
-		std::vector<ImportRemapper::Remapping> remappings;
-		bool addStdin = false;
-		boost::filesystem::path basePath = "";
-		std::vector<boost::filesystem::path> includePaths;
-		FileReader::FileSystemPathSet allowedDirectories;
-		bool ignoreMissingFiles = false;
-		bool noImportCallback = false;
-	} input;
-
-	struct
-	{
-		boost::filesystem::path dir;
-		bool overwriteFiles = false;
-		langutil::EVMVersion evmVersion;
-		bool viaIR = false;
-		RevertStrings revertStrings = RevertStrings::Default;
-		std::optional<langutil::DebugInfoSelection> debugInfoSelection;
-		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
-		std::optional<uint8_t> eofVersion;
-	} output;
-
-	struct
-	{
-		yul::YulStack::Machine targetMachine = yul::YulStack::Machine::EVM;
-		yul::YulStack::Language inputLanguage = yul::YulStack::Language::StrictAssembly;
-	} assembly;
-
-	struct
-	{
-		std::map<std::string, util::h160> libraries; // library name -> address
-	} linker;
-
-	struct
-	{
-		util::JsonFormat json;
-		std::optional<bool> coloredOutput;
-		bool withErrorIds = false;
-	} formatting;
-
-	struct
-	{
-		CompilerOutputs outputs;
-		bool estimateGas = false;
-		std::optional<CombinedJsonRequests> combinedJsonRequests;
-	} compiler;
-
-	struct
-	{
-		CompilerStack::MetadataFormat format = CompilerStack::defaultMetadataFormat();
-		CompilerStack::MetadataHash hash = CompilerStack::MetadataHash::IPFS;
-		bool literalSources = false;
-	} metadata;
-
-	struct
-	{
-		bool optimizeEvmasm = false;
-		bool optimizeYul = false;
-		std::optional<unsigned> expectedExecutionsPerDeployment;
-		std::optional<std::string> yulSteps;
-	} optimizer;
-
-	struct
-	{
-		bool initialize = false;
-		ModelCheckerSettings settings;
-	} modelChecker;
-};
-
-/// Parses the command-line arguments and produces a filled-out CommandLineOptions structure.
-/// Validates provided values and reports errors by throwing @p CommandLineValidationErrors.
-class CommandLineParser
-{
-public:
-	/// Parses the command-line arguments and fills out the internal CommandLineOptions structure.
-	/// @throws CommandLineValidationError if the arguments cannot be properly parsed or are invalid.
-	/// When an exception is thrown, the @p CommandLineOptions may be only partially filled out.
-	void parse(int _argc, char const* const* _argv);
-
-	CommandLineOptions const& options() const { return m_options; }
-
-	static void printHelp(std::ostream& _out) { _out << optionsDescription(true /* _forHelp */); }
-
-private:
-	/// @returns a specification of all named command-line options accepted by the compiler.
-	/// The object can be used to parse command-line arguments or to generate the help screen.
-	static boost::program_options::options_description optionsDescription(bool _forHelp = false);
-
-	/// @returns a specification of all positional command-line arguments accepted by the compiler.
-	/// The object can be used to parse command-line arguments or to generate the help screen.
-	static boost::program_options::positional_options_description positionalOptionsDescription();
-
-	/// Uses boost::program_options to parse the command-line arguments and leaves the result in @a m_args.
-	/// Also handles the arguments that result in information being printed followed by immediate exit.
-	/// @returns false if parsing fails due to syntactical errors or the arguments not matching the description.
-	void parseArgs(int _argc, char const* const* _argv);
-
-	/// Validates parsed arguments stored in @a m_args and fills out the internal CommandLineOptions
-	/// structure.
-	/// @throws CommandLineValidationError in case of validation errors.
-	void processArgs();
-
-	/// Parses the value supplied to --combined-json.
-	/// @throws CommandLineValidationError in case of validation errors.
-	void parseCombinedJsonOption();
-
-	/// Parses the names of the input files, remappings. Does not check if the files actually exist.
-	/// @throws CommandLineValidationError in case of validation errors.
-	void parseInputPathsAndRemappings();
-
-	/// Tries to read from the file @a _input or interprets @a _input literally if that fails.
-	/// It then tries to parse the contents and appends to @a m_options.libraries.
-	/// @throws CommandLineValidationError in case of validation errors.
-	void parseLibraryOption(std::string const& _input);
-
-	void parseOutputSelection();
-
-	void checkMutuallyExclusive(std::vector<std::string> const& _optionNames);
-	size_t countEnabledOptions(std::vector<std::string> const& _optionNames) const;
-	static std::string joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator = ", ");
-
-	CommandLineOptions m_options;
-
-	/// Map of command-line arguments produced by boost::program_options.
-	/// Serves as input for filling out m_options.
-	boost::program_options::variables_map m_args;
-};
-
-} // namespace solidity::frontend
diff --git a/solc/Exceptions.h b/solc/Exceptions.h
deleted file mode 100644
index 39a464b9e589..000000000000
--- a/solc/Exceptions.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Exceptions used by the command-line interface.
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-
-namespace solidity::frontend
-{
-
-struct CommandLineError: virtual util::Exception {};
-struct CommandLineExecutionError: virtual CommandLineError {};
-struct CommandLineValidationError: virtual CommandLineError {};
-struct CommandLineOutputError: virtual CommandLineError {};
-
-}
diff --git a/solc/main.cpp b/solc/main.cpp
deleted file mode 100644
index 4237f9ac6d28..000000000000
--- a/solc/main.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Solidity commandline compiler.
- */
-
-#include <solc/CommandLineInterface.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/exception/all.hpp>
-
-#include <iostream>
-
-using namespace solidity;
-
-
-int main(int argc, char** argv)
-{
-	try
-	{
-		solidity::frontend::CommandLineInterface cli(std::cin, std::cout, std::cerr);
-		return cli.run(argc, argv) ? 0 : 1;
-	}
-	catch (smtutil::SMTLogicError const& _exception)
-	{
-		std::cerr << "SMT logic error:" << std::endl;
-		std::cerr << boost::diagnostic_information(_exception);
-		return 2;
-	}
-	catch (langutil::UnimplementedFeatureError const& _exception)
-	{
-		std::cerr << "Unimplemented feature:" << std::endl;
-		std::cerr << boost::diagnostic_information(_exception);
-		return 2;
-	}
-	catch (langutil::InternalCompilerError const& _exception)
-	{
-		std::cerr << "Internal compiler error:" << std::endl;
-		std::cerr << boost::diagnostic_information(_exception);
-		return 2;
-	}
-	catch (...)
-	{
-		std::cerr << "Uncaught exception:" << std::endl;
-		std::cerr << boost::current_exception_diagnostic_information() << std::endl;
-		return 2;
-	}
-}
diff --git a/test/.solhint.json b/test/.solhint.json
deleted file mode 100644
index b15f97815adc..000000000000
--- a/test/.solhint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": "solhint:default",
-    "plugins": [],
-    "rules": {
-        "compiler-fixed": "off",
-        "no-inline-assembly": "off"
-    }
-}
diff --git a/test/.solhintignore b/test/.solhintignore
deleted file mode 100644
index ce864af2089d..000000000000
--- a/test/.solhintignore
+++ /dev/null
@@ -1 +0,0 @@
-*contributing_rst*
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index f32a14d9183e..000000000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,222 +0,0 @@
-set(sources
-    soltest.cpp
-    Common.cpp
-    Common.h
-    CommonSyntaxTest.cpp
-    CommonSyntaxTest.h
-    EVMHost.cpp
-    EVMHost.h
-    ExecutionFramework.cpp
-    ExecutionFramework.h
-    FilesystemUtils.cpp
-    FilesystemUtils.h
-    InteractiveTests.h
-    Metadata.cpp
-    Metadata.h
-    TestCase.cpp
-    TestCase.h
-    TestCaseReader.cpp
-    TestCaseReader.h
-)
-detect_stray_source_files("${sources}" ".")
-
-set(contracts_sources
-    contracts/AuctionRegistrar.cpp
-    contracts/ContractInterface.h
-    contracts/Wallet.cpp
-)
-detect_stray_source_files("${contracts_sources}" "contracts/")
-
-set(libsolutil_sources
-    libsolutil/Checksum.cpp
-    libsolutil/CommonData.cpp
-    libsolutil/CommonIO.cpp
-    libsolutil/FixedHash.cpp
-    libsolutil/FunctionSelector.cpp
-    libsolutil/IpfsHash.cpp
-    libsolutil/IterateReplacing.cpp
-    libsolutil/JSON.cpp
-    libsolutil/Keccak256.cpp
-    libsolutil/LazyInit.cpp
-    libsolutil/LEB128.cpp
-    libsolutil/StringUtils.cpp
-    libsolutil/SwarmHash.cpp
-    libsolutil/TemporaryDirectoryTest.cpp
-    libsolutil/UTF8.cpp
-    libsolutil/Whiskers.cpp
-)
-detect_stray_source_files("${libsolutil_sources}" "libsolutil/")
-
-set(libevmasm_sources
-    libevmasm/Assembler.cpp
-    libevmasm/Optimiser.cpp
-)
-detect_stray_source_files("${libevmasm_sources}" "libevmasm/")
-
-set(liblangutil_sources
-    liblangutil/CharStream.cpp
-    liblangutil/Scanner.cpp
-    liblangutil/SourceLocation.cpp
-)
-detect_stray_source_files("${liblangutil_sources}" "liblangutil/")
-
-set(libsolidity_sources
-    libsolidity/ABIDecoderTests.cpp
-    libsolidity/ABIEncoderTests.cpp
-    libsolidity/ABIJsonTest.cpp
-    libsolidity/ABIJsonTest.h
-    libsolidity/ABITestsCommon.h
-    libsolidity/AnalysisFramework.cpp
-    libsolidity/AnalysisFramework.h
-    libsolidity/Assembly.cpp
-    libsolidity/ASTJSONTest.cpp
-    libsolidity/ASTJSONTest.h
-    libsolidity/ErrorCheck.cpp
-    libsolidity/ErrorCheck.h
-    libsolidity/GasCosts.cpp
-    libsolidity/GasMeter.cpp
-    libsolidity/GasTest.cpp
-    libsolidity/GasTest.h
-    libsolidity/Imports.cpp
-    libsolidity/InlineAssembly.cpp
-    libsolidity/LibSolc.cpp
-    libsolidity/Metadata.cpp
-    libsolidity/MemoryGuardTest.cpp
-    libsolidity/MemoryGuardTest.h
-    libsolidity/NatspecJSONTest.cpp
-    libsolidity/NatspecJSONTest.h
-    libsolidity/SemanticTest.cpp
-    libsolidity/SemanticTest.h
-    libsolidity/SemVerMatcher.cpp
-    libsolidity/SMTCheckerTest.cpp
-    libsolidity/SMTCheckerTest.h
-    libsolidity/SolidityCompiler.cpp
-    libsolidity/SolidityEndToEndTest.cpp
-    libsolidity/SolidityExecutionFramework.cpp
-    libsolidity/SolidityExecutionFramework.h
-    libsolidity/SolidityExpressionCompiler.cpp
-    libsolidity/SolidityNameAndTypeResolution.cpp
-    libsolidity/SolidityOptimizer.cpp
-    libsolidity/SolidityParser.cpp
-    libsolidity/SolidityTypes.cpp
-    libsolidity/StandardCompiler.cpp
-    libsolidity/SyntaxTest.cpp
-    libsolidity/SyntaxTest.h
-    libsolidity/ViewPureChecker.cpp
-    libsolidity/analysis/FunctionCallGraph.cpp
-    libsolidity/interface/FileReader.cpp
-    libsolidity/ASTPropertyTest.h
-    libsolidity/ASTPropertyTest.cpp
-)
-detect_stray_source_files("${libsolidity_sources}" "libsolidity/")
-
-set(libsolidity_util_sources
-    libsolidity/util/BytesUtils.cpp
-    libsolidity/util/BytesUtilsTests.cpp
-    libsolidity/util/BytesUtils.h
-    libsolidity/util/Common.cpp
-    libsolidity/util/Common.h
-    libsolidity/util/ContractABIUtils.cpp
-    libsolidity/util/ContractABIUtils.h
-    libsolidity/util/SoltestErrors.h
-    libsolidity/util/SoltestTypes.h
-    libsolidity/util/TestFileParser.cpp
-    libsolidity/util/TestFileParser.h
-    libsolidity/util/TestFileParserTests.cpp
-    libsolidity/util/TestFunctionCall.cpp
-    libsolidity/util/TestFunctionCall.h
-    libsolidity/util/TestFunctionCallTests.cpp
-)
-detect_stray_source_files("${libsolidity_util_sources}" "libsolidity/util/")
-
-set(libyul_sources
-    libyul/Common.cpp
-    libyul/Common.h
-    libyul/CompilabilityChecker.cpp
-    libyul/ControlFlowGraphTest.cpp
-    libyul/ControlFlowGraphTest.h
-    libyul/ControlFlowSideEffectsTest.cpp
-    libyul/ControlFlowSideEffectsTest.h
-    libyul/EVMCodeTransformTest.cpp
-    libyul/EVMCodeTransformTest.h
-    libyul/FunctionSideEffects.cpp
-    libyul/FunctionSideEffects.h
-    libyul/Inliner.cpp
-    libyul/KnowledgeBaseTest.cpp
-    libyul/Metrics.cpp
-    libyul/ObjectCompilerTest.cpp
-    libyul/ObjectCompilerTest.h
-    libyul/ObjectParser.cpp
-    libyul/Parser.cpp
-    libyul/StackLayoutGeneratorTest.cpp
-    libyul/StackLayoutGeneratorTest.h
-    libyul/StackShufflingTest.cpp
-    libyul/StackShufflingTest.h
-    libyul/SyntaxTest.h
-    libyul/SyntaxTest.cpp
-    libyul/YulInterpreterTest.cpp
-    libyul/YulInterpreterTest.h
-    libyul/YulOptimizerTest.cpp
-    libyul/YulOptimizerTest.h
-    libyul/YulOptimizerTestCommon.cpp
-    libyul/YulOptimizerTestCommon.h
-)
-detect_stray_source_files("${libyul_sources}" "libyul/")
-
-set(solcli_sources
-    solc/Common.cpp
-    solc/Common.h
-    solc/CommandLineInterface.cpp
-    solc/CommandLineInterfaceAllowPaths.cpp
-    solc/CommandLineParser.cpp
-)
-detect_stray_source_files("${solcli_sources}" "solc/")
-
-set(yul_phaser_sources
-    yulPhaser/TestHelpers.h
-    yulPhaser/TestHelpers.cpp
-    yulPhaser/TestHelpersTest.cpp
-    yulPhaser/Common.cpp
-    yulPhaser/Chromosome.cpp
-    yulPhaser/FitnessMetrics.cpp
-    yulPhaser/AlgorithmRunner.cpp
-    yulPhaser/GeneticAlgorithms.cpp
-    yulPhaser/Mutations.cpp
-    yulPhaser/PairSelections.cpp
-    yulPhaser/Phaser.cpp
-    yulPhaser/Population.cpp
-    yulPhaser/Program.cpp
-    yulPhaser/ProgramCache.cpp
-    yulPhaser/Selections.cpp
-    yulPhaser/SimulationRNG.cpp
-)
-detect_stray_source_files("${yul_phaser_sources}" "yulPhaser/")
-
-add_executable(soltest ${sources}
-    ${contracts_sources}
-    ${libsolutil_sources}
-    ${liblangutil_sources}
-    ${libevmasm_sources}
-    ${libyul_sources}
-    ${libsolidity_sources}
-    ${libsolidity_util_sources}
-    ${solcli_sources}
-    ${yul_phaser_sources}
-)
-target_link_libraries(soltest PRIVATE solcli libsolc yul solidity smtutil solutil phaser Boost::boost yulInterpreter evmasm Boost::filesystem Boost::program_options Boost::unit_test_framework evmc)
-
-
-# Special compilation flag for Visual Studio (version 2019 at least affected)
-# in order to compile SolidityEndToEndTest.cpp, which is quite huge.
-# We can remove this flag once we've extracted the tests.
-# TODO: Remove this option as soon as we have reduced the SLoC's in SolidityEndToEndTest.cpp
-if (MSVC)
-    target_compile_options(soltest PUBLIC "/bigobj")
-endif()
-
-if (NOT Boost_USE_STATIC_LIBS)
-    target_compile_definitions(soltest PUBLIC -DBOOST_TEST_DYN_LINK)
-endif()
-
-add_subdirectory(tools)
-add_subdirectory(evmc)
diff --git a/test/Common.cpp b/test/Common.cpp
deleted file mode 100644
index 72e4d13e8f6f..000000000000
--- a/test/Common.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <stdexcept>
-#include <iostream>
-#include <test/Common.h>
-#include <test/EVMHost.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/Assertions.h>
-#include <libsolutil/StringUtils.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
-#include <range/v3/all.hpp>
-
-namespace fs = boost::filesystem;
-namespace po = boost::program_options;
-
-using namespace std;
-
-namespace solidity::test
-{
-
-namespace
-{
-
-/// If non-empty returns the value of the env. variable ETH_TEST_PATH, otherwise
-/// it tries to find a path that contains the directories "libsolidity/syntaxTests"
-/// and returns it if found.
-/// The routine searches in the current directory, and inside the "test" directory
-/// starting from the current directory and up to three levels up.
-/// @returns the path of the first match or an empty path if not found.
-boost::filesystem::path testPath()
-{
-	if (auto path = getenv("ETH_TEST_PATH"))
-		return path;
-
-	auto const searchPath =
-	{
-		fs::current_path() / ".." / ".." / ".." / "test",
-		fs::current_path() / ".." / ".." / "test",
-		fs::current_path() / ".." / "test",
-		fs::current_path() / "test",
-		fs::current_path()
-	};
-	for (auto const& basePath: searchPath)
-	{
-		fs::path syntaxTestPath = basePath / "libsolidity" / "syntaxTests";
-		if (fs::exists(syntaxTestPath) && fs::is_directory(syntaxTestPath))
-			return basePath;
-	}
-	return {};
-}
-
-std::optional<fs::path> findInDefaultPath(std::string const& lib_name)
-{
-	auto const searchPath =
-	{
-		fs::current_path() / "deps",
-		fs::current_path() / "deps" / "lib",
-		fs::current_path() / ".." / "deps",
-		fs::current_path() / ".." / "deps" / "lib",
-		fs::current_path() / ".." / ".." / "deps",
-		fs::current_path() / ".." / ".." / "deps" / "lib",
-		fs::current_path()
-	};
-	for (auto const& basePath: searchPath)
-	{
-		fs::path p = basePath / lib_name;
-		if (fs::exists(p))
-			return p;
-	}
-	return std::nullopt;
-}
-
-}
-
-CommonOptions::CommonOptions(std::string _caption):
-	options(_caption,
-		po::options_description::m_default_line_length,
-		po::options_description::m_default_line_length - 23
-	)
-{
-
-}
-
-void CommonOptions::addOptions()
-{
-	options.add_options()
-		("evm-version", po::value(&evmVersionString), "which EVM version to use")
-		// "eof-version" is declared as uint64_t, since uint8_t will be parsed as character by boost.
-		("eof-version", po::value<uint64_t>()->implicit_value(1u), "which EOF version to use")
-		("testpath", po::value<fs::path>(&this->testPath)->default_value(solidity::test::testPath()), "path to test files")
-		("vm", po::value<std::vector<fs::path>>(&vmPaths), "path to evmc library, can be supplied multiple times.")
-		("batches", po::value<size_t>(&this->batches)->default_value(1), "set number of batches to split the tests into")
-		("selected-batch", po::value<size_t>(&this->selectedBatch)->default_value(0), "zero-based number of batch to execute")
-		("no-semantic-tests", po::bool_switch(&disableSemanticTests)->default_value(disableSemanticTests), "disable semantic tests")
-		("no-smt", po::bool_switch(&disableSMT)->default_value(disableSMT), "disable SMT checker")
-		("optimize", po::bool_switch(&optimize)->default_value(optimize), "enables optimization")
-		("enforce-gas-cost", po::value<bool>(&enforceGasTest)->default_value(enforceGasTest)->implicit_value(true), "Enforce checking gas cost in semantic tests.")
-		("enforce-gas-cost-min-value", po::value(&enforceGasTestMinValue)->default_value(enforceGasTestMinValue), "Threshold value to enforce adding gas checks to a test.")
-		("abiencoderv1", po::bool_switch(&useABIEncoderV1)->default_value(useABIEncoderV1), "enables abi encoder v1")
-		("show-messages", po::bool_switch(&showMessages)->default_value(showMessages), "enables message output")
-		("show-metadata", po::bool_switch(&showMetadata)->default_value(showMetadata), "enables metadata output");
-}
-
-void CommonOptions::validate() const
-{
-	assertThrow(
-		!testPath.empty(),
-		ConfigException,
-		"No test path specified. The --testpath argument must not be empty when given."
-	);
-	assertThrow(
-		fs::exists(testPath),
-		ConfigException,
-		"Invalid test path specified."
-	);
-	assertThrow(
-		batches > 0,
-		ConfigException,
-		"Batches needs to be at least 1."
-	);
-	assertThrow(
-		selectedBatch < batches,
-		ConfigException,
-		"Selected batch has to be less than number of batches."
-	);
-
-	if (enforceGasTest)
-	{
-		assertThrow(
-			evmVersion() == langutil::EVMVersion{},
-			ConfigException,
-			"Gas costs can only be enforced on latest evm version."
-		);
-		assertThrow(
-			useABIEncoderV1 == false,
-			ConfigException,
-			"Gas costs can only be enforced on abi encoder v2."
-		);
-	}
-}
-
-bool CommonOptions::parse(int argc, char const* const* argv)
-{
-	po::variables_map arguments;
-	addOptions();
-
-	try
-	{
-		po::command_line_parser cmdLineParser(argc, argv);
-		cmdLineParser.options(options);
-		auto parsedOptions = cmdLineParser.run();
-		po::store(parsedOptions, arguments);
-		po::notify(arguments);
-		if (arguments.count("eof-version"))
-		{
-			// Request as uint64_t, since uint8_t will be parsed as character by boost.
-			uint64_t eofVersion = arguments["eof-version"].as<uint64_t>();
-			if (eofVersion != 1)
-				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EOF version: " + to_string(eofVersion)));
-			m_eofVersion = 1;
-		}
-
-		for (auto const& parsedOption: parsedOptions.options)
-			if (parsedOption.position_key >= 0)
-			{
-				if (
-					parsedOption.original_tokens.empty() ||
-					(parsedOption.original_tokens.size() == 1 && parsedOption.original_tokens.front().empty())
-				)
-					continue; // ignore empty options
-				std::stringstream errorMessage;
-				errorMessage << "Unrecognized option: ";
-				for (auto const& token: parsedOption.original_tokens)
-					errorMessage << token;
-				BOOST_THROW_EXCEPTION(std::runtime_error(errorMessage.str()));
-			}
-	}
-	catch (po::error const& exception)
-	{
-		solThrow(ConfigException, exception.what());
-	}
-
-	if (vmPaths.empty())
-	{
-		if (auto envPath = getenv("ETH_EVMONE"))
-			vmPaths.emplace_back(envPath);
-		else if (auto repoPath = findInDefaultPath(evmoneFilename))
-			vmPaths.emplace_back(*repoPath);
-		else
-			vmPaths.emplace_back(evmoneFilename);
-	}
-
-	return true;
-}
-
-string CommonOptions::toString(vector<string> const& _selectedOptions) const
-{
-	if (_selectedOptions.empty())
-		return "";
-
-	auto boolToString = [](bool _value) -> string { return _value ? "true" : "false"; };
-	// Using std::map to avoid if-else/switch-case block
-	map<string, string> optionValueMap = {
-		{"evmVersion", evmVersion().name()},
-		{"optimize", boolToString(optimize)},
-		{"useABIEncoderV1", boolToString(useABIEncoderV1)},
-		{"batch", to_string(selectedBatch + 1) + "/" + to_string(batches)},
-		{"enforceGasTest", boolToString(enforceGasTest)},
-		{"enforceGasTestMinValue", enforceGasTestMinValue.str()},
-		{"disableSemanticTests", boolToString(disableSemanticTests)},
-		{"disableSMT", boolToString(disableSMT)},
-		{"showMessages", boolToString(showMessages)},
-		{"showMetadata", boolToString(showMetadata)}
-	};
-
-	soltestAssert(ranges::all_of(_selectedOptions, [&optionValueMap](string const& _option) { return optionValueMap.count(_option) > 0; }));
-
-	vector<string> optionsWithValues = _selectedOptions |
-		ranges::views::transform([&optionValueMap](string const& _option) { return _option + "=" + optionValueMap.at(_option); }) |
-		ranges::to<vector>();
-
-	return solidity::util::joinHumanReadable(optionsWithValues);
-}
-
-void CommonOptions::printSelectedOptions(ostream& _stream, string const& _linePrefix, vector<string> const& _selectedOptions) const
-{
-	_stream << _linePrefix << "Run Settings: " << toString(_selectedOptions) << endl;
-}
-
-langutil::EVMVersion CommonOptions::evmVersion() const
-{
-	if (!evmVersionString.empty())
-	{
-		auto version = langutil::EVMVersion::fromString(evmVersionString);
-		if (!version)
-			BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EVM version: " + evmVersionString));
-		return *version;
-	}
-	else
-		return langutil::EVMVersion();
-}
-
-CommonOptions const& CommonOptions::get()
-{
-	if (!m_singleton)
-		BOOST_THROW_EXCEPTION(std::runtime_error("Options not yet constructed!"));
-
-	return *m_singleton;
-}
-
-void CommonOptions::setSingleton(std::unique_ptr<CommonOptions const>&& _instance)
-{
-	m_singleton = std::move(_instance);
-}
-
-std::unique_ptr<CommonOptions const> CommonOptions::m_singleton = nullptr;
-
-bool isValidSemanticTestPath(boost::filesystem::path const& _testPath)
-{
-	bool insideSemanticTests = false;
-	fs::path testPathPrefix;
-	for (auto const& element: _testPath)
-	{
-		testPathPrefix /= element;
-		if (boost::ends_with(canonical(testPathPrefix).generic_string(), "/test/libsolidity/semanticTests"))
-			insideSemanticTests = true;
-		if (insideSemanticTests && boost::starts_with(element.string(), "_"))
-			return false;
-	}
-	return true;
-}
-
-bool loadVMs(CommonOptions const& _options)
-{
-	if (_options.disableSemanticTests)
-		return true;
-
-	bool evmSupported = solidity::test::EVMHost::checkVmPaths(_options.vmPaths);
-	if (!_options.disableSemanticTests && !evmSupported)
-	{
-		std::cerr << "Unable to find " << solidity::test::evmoneFilename;
-		std::cerr << ". Please disable semantics tests with --no-semantic-tests or provide a path using --vm <path>." << std::endl;
-		std::cerr << "You can download it at" << std::endl;
-		std::cerr << solidity::test::evmoneDownloadLink << std::endl;
-		return false;
-	}
-	return true;
-}
-
-}
diff --git a/test/Common.h b/test/Common.h
deleted file mode 100644
index d82ff9c6b71f..000000000000
--- a/test/Common.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/Numeric.h>
-
-#include <test/evmc/evmc.h>
-
-#include <boost/filesystem/path.hpp>
-#include <boost/program_options.hpp>
-
-namespace solidity::test
-{
-
-#ifdef _WIN32
-static constexpr auto evmoneFilename = "evmone.dll";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip";
-#elif defined(__APPLE__)
-static constexpr auto evmoneFilename = "libevmone.dylib";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-darwin-x86_64.tar.gz";
-#else
-static constexpr auto evmoneFilename = "libevmone.so";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz";
-#endif
-
-struct ConfigException: public util::Exception {};
-
-struct CommonOptions
-{
-	/// Noncopyable.
-	CommonOptions(CommonOptions const&) = delete;
-	CommonOptions& operator=(CommonOptions const&) = delete;
-
-	std::vector<boost::filesystem::path> vmPaths;
-	boost::filesystem::path testPath;
-	bool optimize = false;
-	bool enforceGasTest = false;
-	u256 enforceGasTestMinValue = 100000;
-	bool disableSemanticTests = false;
-	bool disableSMT = false;
-	bool useABIEncoderV1 = false;
-	bool showMessages = false;
-	bool showMetadata = false;
-	size_t batches = 1;
-	size_t selectedBatch = 0;
-
-	langutil::EVMVersion evmVersion() const;
-	std::optional<uint8_t> eofVersion() const { return m_eofVersion; }
-
-	virtual void addOptions();
-	// @returns true if the program should continue, false if it should exit immediately without
-	// reporting an error.
-	// Throws ConfigException or std::runtime_error if parsing fails.
-	virtual bool parse(int argc, char const* const* argv);
-	// Throws a ConfigException on error
-	virtual void validate() const;
-
-	/// @returns string with a key=value list of the options separated by comma
-	/// Ex.: "evmVersion=london, optimize=true, useABIEncoderV1=false"
-	virtual std::string toString(std::vector<std::string> const& _selectedOptions) const;
-	/// Helper to print the value of settings used
-	virtual void printSelectedOptions(std::ostream& _stream, std::string const& _linePrefix, std::vector<std::string> const& _selectedOptions) const;
-
-	static CommonOptions const& get();
-	static void setSingleton(std::unique_ptr<CommonOptions const>&& _instance);
-
-	CommonOptions(std::string caption = "");
-	virtual ~CommonOptions() {}
-
-protected:
-	boost::program_options::options_description options;
-
-private:
-	std::string evmVersionString;
-	std::optional<uint8_t> m_eofVersion;
-	static std::unique_ptr<CommonOptions const> m_singleton;
-};
-
-/// @return true if it is ok to treat the file located under the specified path as a semantic test.
-/// I.e. if the test is located in the semantic test directory and is not excluded due to being a part of external sources.
-/// Note: @p _testPath can be relative but must include at least the `/test/libsolidity/semanticTests/` part
-bool isValidSemanticTestPath(boost::filesystem::path const& _testPath);
-
-bool loadVMs(CommonOptions const& _options);
-
-/**
- * Component to help with splitting up all tests into batches.
- */
-class Batcher
-{
-public:
-	Batcher(size_t _offset, size_t _batches):
-		m_offset(_offset),
-		m_batches(_batches)
-	{
-		solAssert(m_batches > 0 && m_offset < m_batches);
-	}
-	Batcher(Batcher const&) = delete;
-	Batcher& operator=(Batcher const&) = delete;
-
-	bool checkAndAdvance() { return (m_counter++) % m_batches == m_offset; }
-
-private:
-	size_t const m_offset;
-	size_t const m_batches;
-	size_t m_counter = 0;
-};
-
-}
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
deleted file mode 100644
index 0dedd1fb043b..000000000000
--- a/test/CommonSyntaxTest.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/CommonSyntaxTest.h>
-#include <test/Common.h>
-#include <test/TestCase.h>
-
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/throw_exception.hpp>
-
-#include <fstream>
-#include <memory>
-#include <stdexcept>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::util::formatting;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity::test;
-using namespace boost::unit_test;
-namespace fs = boost::filesystem;
-
-namespace
-{
-
-int parseUnsignedInteger(string::iterator& _it, string::iterator _end)
-{
-	if (_it == _end || !util::isDigit(*_it))
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid test expectation. Source location expected."));
-	int result = 0;
-	while (_it != _end && util::isDigit(*_it))
-	{
-		result *= 10;
-		result += *_it - '0';
-		++_it;
-	}
-	return result;
-}
-
-}
-
-CommonSyntaxTest::CommonSyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion):
-	EVMVersionRestrictedTestCase(_filename),
-	m_sources(m_reader.sources()),
-	m_expectations(parseExpectations(m_reader.stream())),
-	m_evmVersion(_evmVersion)
-{
-}
-
-TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	parseCustomExpectations(m_reader.stream());
-	parseAndAnalyze();
-
-	return conclude(_stream, _linePrefix, _formatted);
-}
-
-TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	if (expectationsMatch())
-		return TestResult::Success;
-
-	printExpectationAndError(_stream, _linePrefix, _formatted);
-	return TestResult::Failure;
-}
-
-void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	string nextIndentLevel = _linePrefix + "  ";
-	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
-	printExpectedResult(_stream, nextIndentLevel, _formatted);
-	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
-	printObtainedResult(_stream, nextIndentLevel, _formatted);
-}
-
-void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, bool _formatted) const
-{
-	if (m_sources.sources.empty())
-		return;
-
-	assert(m_sources.externalSources.empty());
-	bool outputSourceNames = (m_sources.sources.size() != 1 || !m_sources.sources.begin()->first.empty());
-
-	for (auto const& [name, source]: m_sources.sources)
-		if (_formatted)
-		{
-			if (source.empty())
-				continue;
-
-			if (outputSourceNames)
-				_stream << _linePrefix << util::formatting::CYAN << "==== Source: " << name << " ====" << util::formatting::RESET << endl;
-			vector<char const*> sourceFormatting(source.length(), util::formatting::RESET);
-			for (auto const& error: m_errorList)
-				if (error.sourceName == name && error.locationStart >= 0 && error.locationEnd >= 0)
-				{
-					assert(static_cast<size_t>(error.locationStart) <= source.length());
-					assert(static_cast<size_t>(error.locationEnd) <= source.length());
-					for (int i = error.locationStart; i < error.locationEnd; i++)
-					{
-						char const*& cellFormat = sourceFormatting[static_cast<size_t>(i)];
-						char const* infoBgColor = SourceReferenceFormatter::errorHighlightColor(Error::Severity::Info);
-
-						if (
-							(error.type != Error::Type::Warning && error.type != Error::Type::Info) ||
-							(error.type == Error::Type::Warning && (cellFormat == RESET || cellFormat == infoBgColor)) ||
-							(error.type == Error::Type::Info && cellFormat == RESET)
-						)
-							cellFormat = SourceReferenceFormatter::errorHighlightColor(Error::errorSeverity(error.type));
-					}
-				}
-
-			_stream << _linePrefix << sourceFormatting.front() << source.front();
-			for (size_t i = 1; i < source.length(); i++)
-			{
-				if (sourceFormatting[i] != sourceFormatting[i - 1])
-					_stream << sourceFormatting[i];
-				if (source[i] != '\n')
-					_stream << source[i];
-				else
-				{
-					_stream << util::formatting::RESET << endl;
-					if (i + 1 < source.length())
-						_stream << _linePrefix << sourceFormatting[i];
-				}
-			}
-			_stream << util::formatting::RESET;
-		}
-		else
-		{
-			if (outputSourceNames)
-				printPrefixed(_stream, "==== Source: " + name + " ====", _linePrefix);
-			printPrefixed(_stream, source, _linePrefix);
-		}
-}
-
-void CommonSyntaxTest::parseCustomExpectations(istream& _stream)
-{
-	string remainingExpectations = boost::trim_copy(readUntilEnd(_stream));
-	soltestAssert(
-		remainingExpectations.empty(),
-		"Found custom expectations not supported by the test case:\n" + remainingExpectations
-	);
-}
-
-bool CommonSyntaxTest::expectationsMatch()
-{
-	return m_expectations == m_errorList;
-}
-
-void CommonSyntaxTest::printExpectedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
-{
-	printErrorList(_stream, m_expectations, _linePrefix, _formatted);
-}
-
-void CommonSyntaxTest::printObtainedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
-{
-	printErrorList(_stream, m_errorList, _linePrefix, _formatted);
-}
-
-void CommonSyntaxTest::printErrorList(
-	ostream& _stream,
-	vector<SyntaxTestError> const& _errorList,
-	string const& _linePrefix,
-	bool _formatted
-)
-{
-	if (_errorList.empty())
-	{
-		if (_formatted)
-			util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
-	}
-	else
-		for (auto const& error: _errorList)
-		{
-			{
-				util::AnsiColorized scope(
-					_stream,
-					_formatted,
-					{BOLD, SourceReferenceFormatter::errorTextColor(Error::errorSeverity(error.type))}
-				);
-				_stream << _linePrefix << Error::formatErrorType(error.type);
-				if (error.errorId.has_value())
-					_stream << ' ' << error.errorId->error;
-				_stream << ": ";
-			}
-			if (!error.sourceName.empty() || error.locationStart >= 0 || error.locationEnd >= 0)
-			{
-				_stream << "(";
-				if (!error.sourceName.empty())
-					_stream << error.sourceName << ":";
-				if (error.locationStart >= 0)
-					_stream << error.locationStart;
-				_stream << "-";
-				if (error.locationEnd >= 0)
-					_stream << error.locationEnd;
-				_stream << "): ";
-			}
-			_stream << error.message << endl;
-		}
-}
-
-string CommonSyntaxTest::errorMessage(util::Exception const& _e)
-{
-	if (_e.comment() && !_e.comment()->empty())
-		return boost::replace_all_copy(*_e.comment(), "\n", "\\n");
-	else
-		return "NONE";
-}
-
-vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
-{
-	static string const customExpectationsDelimiter("// ----");
-
-	vector<SyntaxTestError> expectations;
-	string line;
-	while (getline(_stream, line))
-	{
-		auto it = line.begin();
-
-		// Anything below the delimiter is left up to the derived class to process in a custom way.
-		// The delimiter is optional and identical to the one that starts error expectations in
-		// TestCaseReader::parseSourcesAndSettingsWithLineNumber().
-		if (boost::algorithm::starts_with(line, customExpectationsDelimiter))
-			break;
-
-		skipSlashes(it, line.end());
-		skipWhitespace(it, line.end());
-
-		if (it == line.end()) continue;
-
-		auto typeBegin = it;
-		while (it != line.end() && isalpha(*it, locale::classic()))
-			++it;
-
-		string errorTypeStr(typeBegin, it);
-		optional<Error::Type> errorType = Error::parseErrorType(errorTypeStr);
-		if (!errorType.has_value())
-			BOOST_THROW_EXCEPTION(runtime_error("Invalid error type: " + errorTypeStr));
-
-		skipWhitespace(it, line.end());
-
-		optional<ErrorId> errorId;
-		if (it != line.end() && util::isDigit(*it))
-			errorId = ErrorId{static_cast<unsigned long long>(parseUnsignedInteger(it, line.end()))};
-
-		expect(it, line.end(), ':');
-		skipWhitespace(it, line.end());
-
-		int locationStart = -1;
-		int locationEnd = -1;
-		std::string sourceName;
-
-		if (it != line.end() && *it == '(')
-		{
-			++it;
-			if (it != line.end() && !util::isDigit(*it))
-			{
-				auto sourceNameStart = it;
-				while (it != line.end() && *it != ':')
-					++it;
-				sourceName = std::string(sourceNameStart, it);
-				expect(it, line.end(), ':');
-			}
-			locationStart = parseUnsignedInteger(it, line.end());
-			expect(it, line.end(), '-');
-			locationEnd = parseUnsignedInteger(it, line.end());
-			expect(it, line.end(), ')');
-			expect(it, line.end(), ':');
-		}
-
-		skipWhitespace(it, line.end());
-
-		string errorMessage(it, line.end());
-		expectations.emplace_back(SyntaxTestError{
-			errorType.value(),
-			std::move(errorId),
-			std::move(errorMessage),
-			std::move(sourceName),
-			locationStart,
-			locationEnd
-		});
-	}
-	return expectations;
-}
diff --git a/test/CommonSyntaxTest.h b/test/CommonSyntaxTest.h
deleted file mode 100644
index fb46c37a6401..000000000000
--- a/test/CommonSyntaxTest.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/TestCase.h>
-#include <test/TestCaseReader.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/AnsiColorized.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::test
-{
-
-struct SyntaxTestError
-{
-	langutil::Error::Type type;
-	std::optional<langutil::ErrorId> errorId;
-	std::string message;
-	std::string sourceName;
-	int locationStart = -1;
-	int locationEnd = -1;
-	bool operator==(SyntaxTestError const& _rhs) const
-	{
-		return type == _rhs.type &&
-			errorId == _rhs.errorId &&
-			message == _rhs.message &&
-			sourceName == _rhs.sourceName &&
-			locationStart == _rhs.locationStart &&
-			locationEnd == _rhs.locationEnd;
-	}
-};
-
-
-class CommonSyntaxTest: public frontend::test::EVMVersionRestrictedTestCase
-{
-public:
-	CommonSyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
-
-	void printSource(std::ostream& _stream, std::string const &_linePrefix = "", bool _formatted = false) const override;
-	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override
-	{
-		printObtainedResult(_stream, _linePrefix, false);
-	}
-
-	static std::string errorMessage(util::Exception const& _e);
-protected:
-	/// Should be implemented by those derived test cases that want to allow extra expectations
-	/// after the error/warning expectations. The default implementation does not allow them and
-	/// fails instead.
-	/// @param _stream Input stream positioned at the beginning of the extra expectations.
-	virtual void parseCustomExpectations(std::istream& _stream);
-
-	virtual void parseAndAnalyze() = 0;
-
-	/// Should return true if obtained values match expectations.
-	/// The default implementation only compares the error list. Derived classes that support
-	/// custom expectations should override this to include them in the comparison.
-	virtual bool expectationsMatch();
-
-	virtual void printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const;
-	virtual void printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const;
-
-	static void printErrorList(
-		std::ostream& _stream,
-		std::vector<SyntaxTestError> const& _errors,
-		std::string const& _linePrefix,
-		bool _formatted = false
-	);
-
-	TestResult conclude(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false);
-	void printExpectationAndError(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false);
-
-	static std::vector<SyntaxTestError> parseExpectations(std::istream& _stream);
-
-	frontend::test::SourceMap m_sources;
-	std::vector<SyntaxTestError> m_expectations;
-	std::vector<SyntaxTestError> m_errorList;
-	langutil::EVMVersion const m_evmVersion;
-};
-
-}
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
deleted file mode 100644
index 81005547d2de..000000000000
--- a/test/EVMHost.cpp
+++ /dev/null
@@ -1,1248 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * EVM execution host, i.e. component that implements a simulated Ethereum blockchain
- * for testing purposes.
- */
-
-#include <test/EVMHost.h>
-
-#include <test/evmc/loader.h>
-
-#include <libevmasm/GasMeter.h>
-
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/Assertions.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/picosha2.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::test;
-using namespace evmc::literals;
-
-evmc::VM& EVMHost::getVM(string const& _path)
-{
-	static evmc::VM NullVM{nullptr};
-	static map<string, unique_ptr<evmc::VM>> vms;
-	if (vms.count(_path) == 0)
-	{
-		evmc_loader_error_code errorCode = {};
-		auto vm = evmc::VM{evmc_load_and_configure(_path.c_str(), &errorCode)};
-		if (vm && errorCode == EVMC_LOADER_SUCCESS)
-		{
-			if (vm.get_capabilities() & (EVMC_CAPABILITY_EVM1))
-				vms[_path] = make_unique<evmc::VM>(evmc::VM(std::move(vm)));
-			else
-				cerr << "VM loaded does not support EVM1" << endl;
-		}
-		else
-		{
-			cerr << "Error loading VM from " << _path;
-			if (char const* errorMsg = evmc_last_error_msg())
-				cerr << ":" << endl << errorMsg;
-			cerr << endl;
-		}
-	}
-
-	if (vms.count(_path) > 0)
-		return *vms[_path];
-
-	return NullVM;
-}
-
-bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
-{
-	bool evmVmFound = false;
-	for (auto const& path: _vmPaths)
-	{
-		evmc::VM& vm = EVMHost::getVM(path.string());
-		if (!vm)
-			continue;
-
-		if (vm.has_capability(EVMC_CAPABILITY_EVM1))
-		{
-			if (evmVmFound)
-				BOOST_THROW_EXCEPTION(runtime_error("Multiple evm1 evmc vms defined. Please only define one evm1 evmc vm."));
-			evmVmFound = true;
-		}
-	}
-	return evmVmFound;
-}
-
-EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
-	m_vm(_vm),
-	m_evmVersion(_evmVersion)
-{
-	if (!m_vm)
-	{
-		cerr << "Unable to find evmone library" << endl;
-		assertThrow(false, Exception, "");
-	}
-
-	if (_evmVersion == langutil::EVMVersion::homestead())
-		m_evmRevision = EVMC_HOMESTEAD;
-	else if (_evmVersion == langutil::EVMVersion::tangerineWhistle())
-		m_evmRevision = EVMC_TANGERINE_WHISTLE;
-	else if (_evmVersion == langutil::EVMVersion::spuriousDragon())
-		m_evmRevision = EVMC_SPURIOUS_DRAGON;
-	else if (_evmVersion == langutil::EVMVersion::byzantium())
-		m_evmRevision = EVMC_BYZANTIUM;
-	else if (_evmVersion == langutil::EVMVersion::constantinople())
-		m_evmRevision = EVMC_CONSTANTINOPLE;
-	else if (_evmVersion == langutil::EVMVersion::petersburg())
-		m_evmRevision = EVMC_PETERSBURG;
-	else if (_evmVersion == langutil::EVMVersion::istanbul())
-		m_evmRevision = EVMC_ISTANBUL;
-	else if (_evmVersion == langutil::EVMVersion::berlin())
-		m_evmRevision = EVMC_BERLIN;
-	else if (_evmVersion == langutil::EVMVersion::london())
-		m_evmRevision = EVMC_LONDON;
-	else if (_evmVersion == langutil::EVMVersion::paris())
-		m_evmRevision = EVMC_PARIS;
-	else if (_evmVersion == langutil::EVMVersion::shanghai())
-		m_evmRevision = EVMC_SHANGHAI;
-	else
-		assertThrow(false, Exception, "Unsupported EVM version");
-
-	if (m_evmRevision >= EVMC_PARIS)
-		// This is the value from the merge block.
-		tx_context.block_prev_randao = 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777_bytes32;
-	else
-		tx_context.block_prev_randao = evmc::uint256be{200000000};
-	tx_context.block_gas_limit = 20000000;
-	tx_context.block_coinbase = 0x7878787878787878787878787878787878787878_address;
-	tx_context.tx_gas_price = evmc::uint256be{3000000000};
-	tx_context.tx_origin = 0x9292929292929292929292929292929292929292_address;
-	// Mainnet according to EIP-155
-	tx_context.chain_id = evmc::uint256be{1};
-	// The minimum value of basefee
-	tx_context.block_base_fee = evmc::bytes32{7};
-
-	// Reserve space for recording calls.
-	if (!recorded_calls.capacity())
-		recorded_calls.reserve(max_recorded_calls);
-
-	reset();
-}
-
-void EVMHost::reset()
-{
-	accounts.clear();
-	// Clear self destruct records
-	recorded_selfdestructs.clear();
-	// Clear call records
-	recorded_calls.clear();
-	// Clear EIP-2929 account access indicator
-	recorded_account_accesses.clear();
-
-	// Mark all precompiled contracts as existing. Existing here means to have a balance (as per EIP-161).
-	// NOTE: keep this in sync with `EVMHost::call` below.
-	//
-	// A lot of precompile addresses had a balance before they became valid addresses for precompiles.
-	// For example all the precompile addresses allocated in Byzantium had a 1 wei balance sent to them
-	// roughly 22 days before the update went live.
-	for (unsigned precompiledAddress = 1; precompiledAddress <= 8; precompiledAddress++)
-	{
-		evmc::address address{precompiledAddress};
-		// 1wei
-		accounts[address].balance = evmc::uint256be{1};
-		// Set according to EIP-1052.
-		if (precompiledAddress < 5 || m_evmVersion >= langutil::EVMVersion::byzantium())
-			accounts[address].codehash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470_bytes32;
-	}
-}
-
-void EVMHost::newTransactionFrame()
-{
-	// Clear EIP-2929 account access indicator
-	recorded_account_accesses.clear();
-
-	for (auto& [address, account]: accounts)
-		for (auto& [slot, value]: account.storage)
-		{
-			value.access_status = EVMC_ACCESS_COLD; // Clear EIP-2929 storage access indicator
-			value.original = value.current;			// Clear EIP-2200 dirty slot
-		}
-	// Process selfdestruct list
-	for (auto& [address, _]: recorded_selfdestructs)
-		accounts.erase(address);
-	recorded_selfdestructs.clear();
-}
-
-void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept
-{
-	assertThrow(u256(convertFromEVMC(_sender.balance)) >= _value, Exception, "Insufficient balance for transfer");
-	_sender.balance = convertToEVMC(u256(convertFromEVMC(_sender.balance)) - _value);
-	_recipient.balance = convertToEVMC(u256(convertFromEVMC(_recipient.balance)) + _value);
-}
-
-bool EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
-{
-	// TODO actual selfdestruct is even more complicated.
-
-	transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
-
-	// Record self destructs. Clearing will be done in newTransactionFrame().
-	return MockedHost::selfdestruct(_addr, _beneficiary);
-}
-
-void EVMHost::recordCalls(evmc_message const& _message) noexcept
-{
-	if (recorded_calls.size() < max_recorded_calls)
-		recorded_calls.emplace_back(_message);
-}
-
-// NOTE: this is used for both internal and external calls.
-// External calls are triggered from ExecutionFramework and contain only EVMC_CREATE or EVMC_CALL.
-evmc::Result EVMHost::call(evmc_message const& _message) noexcept
-{
-	recordCalls(_message);
-	if (_message.recipient == 0x0000000000000000000000000000000000000001_address)
-		return precompileECRecover(_message);
-	else if (_message.recipient == 0x0000000000000000000000000000000000000002_address)
-		return precompileSha256(_message);
-	else if (_message.recipient == 0x0000000000000000000000000000000000000003_address)
-		return precompileRipeMD160(_message);
-	else if (_message.recipient == 0x0000000000000000000000000000000000000004_address)
-		return precompileIdentity(_message);
-	else if (_message.recipient == 0x0000000000000000000000000000000000000005_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-		return precompileModExp(_message);
-	else if (_message.recipient == 0x0000000000000000000000000000000000000006_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-	{
-		if (m_evmVersion <= langutil::EVMVersion::istanbul())
-			return precompileALTBN128G1Add<EVMC_ISTANBUL>(_message);
-		else
-			return precompileALTBN128G1Add<EVMC_LONDON>(_message);
-	}
-	else if (_message.recipient == 0x0000000000000000000000000000000000000007_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-	{
-		if (m_evmVersion <= langutil::EVMVersion::istanbul())
-			return precompileALTBN128G1Mul<EVMC_ISTANBUL>(_message);
-		else
-			return precompileALTBN128G1Mul<EVMC_LONDON>(_message);
-	}
-	else if (_message.recipient == 0x0000000000000000000000000000000000000008_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-	{
-		if (m_evmVersion <= langutil::EVMVersion::istanbul())
-			return precompileALTBN128PairingProduct<EVMC_ISTANBUL>(_message);
-		else
-			return precompileALTBN128PairingProduct<EVMC_LONDON>(_message);
-	}
-	else if (_message.recipient == 0x0000000000000000000000000000000000000009_address && m_evmVersion >= langutil::EVMVersion::istanbul())
-		return precompileBlake2f(_message);
-
-	auto const stateBackup = accounts;
-
-	u256 value{convertFromEVMC(_message.value)};
-	auto& sender = accounts[_message.sender];
-
-	evmc::bytes code;
-
-	evmc_message message = _message;
-	if (message.depth == 0)
-	{
-		message.gas -= message.kind == EVMC_CREATE ? evmasm::GasCosts::txCreateGas : evmasm::GasCosts::txGas;
-		for (size_t i = 0; i < message.input_size; ++i)
-			message.gas -= message.input_data[i] == 0 ? evmasm::GasCosts::txDataZeroGas : evmasm::GasCosts::txDataNonZeroGas(m_evmVersion);
-		if (message.gas < 0)
-		{
-			evmc::Result result;
-			result.status_code = EVMC_OUT_OF_GAS;
-			accounts = stateBackup;
-			return result;
-		}
-	}
-
-	if (message.kind == EVMC_CREATE)
-	{
-		// TODO is the nonce incremented on failure, too?
-		// NOTE: nonce for creation from contracts starts at 1
-		// TODO: check if sender is an EOA and do not pre-increment
-		sender.nonce++;
-
-		auto encodeRlpInteger = [](int value) -> bytes {
-			if (value == 0) {
-				return bytes{128};
-			} else if (value <= 127) {
-				return bytes{static_cast<uint8_t>(value)};
-			} else if (value <= 0xff) {
-				return bytes{128 + 1, static_cast<uint8_t>(value)};
-			} else if (value <= 0xffff) {
-				return bytes{128 + 55 + 2, static_cast<uint8_t>(value >> 8), static_cast<uint8_t>(value)};
-			} else {
-				assertThrow(false, Exception, "Can only encode RLP numbers <= 0xffff");
-			}
-		};
-
-		bytes encodedNonce = encodeRlpInteger(sender.nonce);
-
-		h160 createAddress(keccak256(
-			bytes{static_cast<uint8_t>(0xc0 + 21 + encodedNonce.size())} +
-			bytes{0x94} +
-			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
-			encodedNonce
-		), h160::AlignRight);
-
-		message.recipient = convertToEVMC(createAddress);
-		assertThrow(accounts.count(message.recipient) == 0, Exception, "Account cannot exist");
-
-		code = evmc::bytes(message.input_data, message.input_data + message.input_size);
-	}
-	else if (message.kind == EVMC_CREATE2)
-	{
-		h160 createAddress(keccak256(
-			bytes{0xff} +
-			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
-			bytes(begin(message.create2_salt.bytes), end(message.create2_salt.bytes)) +
-			keccak256(bytes(message.input_data, message.input_data + message.input_size)).asBytes()
-		), h160::AlignRight);
-
-		message.recipient = convertToEVMC(createAddress);
-		if (accounts.count(message.recipient) && (
-			accounts[message.recipient].nonce > 0 ||
-			!accounts[message.recipient].code.empty()
-		))
-		{
-			evmc::Result result;
-			result.status_code = EVMC_OUT_OF_GAS;
-			accounts = stateBackup;
-			return result;
-		}
-
-		code = evmc::bytes(message.input_data, message.input_data + message.input_size);
-	}
-	else
-		code = accounts[message.code_address].code;
-
-	auto& destination = accounts[message.recipient];
-
-	if (value != 0 && message.kind != EVMC_DELEGATECALL && message.kind != EVMC_CALLCODE)
-	{
-		if (value > convertFromEVMC(sender.balance))
-		{
-			evmc::Result result;
-			result.status_code = EVMC_INSUFFICIENT_BALANCE;
-			accounts = stateBackup;
-			return result;
-		}
-		transfer(sender, destination, value);
-	}
-
-	// Populate the access access list (enabled since Berlin).
-	// Note, this will also properly touch the created address.
-	// TODO: support a user supplied access list too
-	if (m_evmRevision >= EVMC_BERLIN)
-	{
-		access_account(message.sender);
-		access_account(message.recipient);
-
-		// EIP-3651 rule
-		if (m_evmRevision >= EVMC_SHANGHAI)
-			access_account(tx_context.block_coinbase);
-	}
-
-	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
-	{
-		message.input_data = nullptr;
-		message.input_size = 0;
-	}
-	evmc::Result result = m_vm.execute(*this, m_evmRevision, message, code.data(), code.size());
-
-	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
-	{
-		result.gas_left -= static_cast<int64_t>(evmasm::GasCosts::createDataGas * result.output_size);
-		if (result.gas_left < 0)
-		{
-			result.gas_left = 0;
-			result.status_code = EVMC_OUT_OF_GAS;
-			// TODO clear some fields?
-		}
-		else
-		{
-			result.create_address = message.recipient;
-			destination.code = evmc::bytes(result.output_data, result.output_data + result.output_size);
-			destination.codehash = convertToEVMC(keccak256({result.output_data, result.output_size}));
-		}
-	}
-
-	if (result.status_code != EVMC_SUCCESS)
-		accounts = stateBackup;
-
-	return result;
-}
-
-evmc::bytes32 EVMHost::get_block_hash(int64_t _number) const noexcept
-{
-	return convertToEVMC(u256("0x3737373737373737373737373737373737373737373737373737373737373737") + _number);
-}
-
-h160 EVMHost::convertFromEVMC(evmc::address const& _addr)
-{
-	return h160(bytes(begin(_addr.bytes), end(_addr.bytes)));
-}
-
-evmc::address EVMHost::convertToEVMC(h160 const& _addr)
-{
-	evmc::address a;
-	for (unsigned i = 0; i < 20; ++i)
-		a.bytes[i] = _addr[i];
-	return a;
-}
-
-h256 EVMHost::convertFromEVMC(evmc::bytes32 const& _data)
-{
-	return h256(bytes(begin(_data.bytes), end(_data.bytes)));
-}
-
-evmc::bytes32 EVMHost::convertToEVMC(h256 const& _data)
-{
-	evmc::bytes32 d;
-	for (unsigned i = 0; i < 32; ++i)
-		d.bytes[i] = _data[i];
-	return d;
-}
-
-evmc::Result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
-{
-	// NOTE this is a partial implementation for some inputs.
-
-	// Fixed cost of 3000 gas.
-	constexpr int64_t gas_cost = 3000;
-
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
-		{
-			fromHex(
-				"18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c"
-				"000000000000000000000000000000000000000000000000000000000000001c"
-				"73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f"
-				"eeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549"
-			),
-			{
-				fromHex("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad"
-				"000000000000000000000000000000000000000000000000000000000000001c"
-				"debaaa0cddb321b2dcaaf846d39605de7b97e77ba6106587855b9106cb104215"
-				"61a22d94fa8b8a687ff9c911c844d1c016d1a685a9166858f9c7c1bc85128aca"
-			),
-			{
-				fromHex("0000000000000000000000008743523d96a1b2cbe0c6909653a56da18ed484af"),
-				gas_cost
-			}
-		}
-	};
-	evmc::Result result = precompileGeneric(_message, inputOutput);
-	// ECRecover will return success with empty response in case of failure
-	if (result.status_code != EVMC_SUCCESS && result.status_code != EVMC_OUT_OF_GAS)
-		return resultWithGas(_message.gas, gas_cost, {});
-	return result;
-}
-
-evmc::Result EVMHost::precompileSha256(evmc_message const& _message) noexcept
-{
-	// static data so that we do not need a release routine...
-	bytes static hash;
-	hash = picosha2::hash256(bytes(
-		_message.input_data,
-		_message.input_data + _message.input_size
-	));
-
-	// Base 60 gas + 12 gas / word.
-	int64_t gas_cost = 60 + 12 * ((static_cast<int64_t>(_message.input_size) + 31) / 32);
-
-	return resultWithGas(_message.gas, gas_cost, hash);
-}
-
-evmc::Result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
-{
-	// NOTE this is a partial implementation for some inputs.
-
-	// Base 600 gas + 120 gas / word.
-	constexpr auto calc_cost = [](int64_t size) -> int64_t {
-		return 600 + 120 * ((size + 31) / 32);
-	};
-
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
-		{
-			bytes{},
-			{
-				fromHex("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31"),
-				calc_cost(0)
-			}
-		},
-		{
-			fromHex("0000000000000000000000000000000000000000000000000000000000000004"),
-			{
-				fromHex("0000000000000000000000001b0f3c404d12075c68c938f9f60ebea4f74941a0"),
-				calc_cost(32)
-			}
-		},
-		{
-			fromHex("0000000000000000000000000000000000000000000000000000000000000005"),
-			{
-				fromHex("000000000000000000000000ee54aa84fc32d8fed5a5fe160442ae84626829d9"),
-				calc_cost(32)
-			}
-		},
-		{
-			fromHex("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
-			{
-				fromHex("0000000000000000000000001cf4e77f5966e13e109703cd8a0df7ceda7f3dc3"),
-				calc_cost(32)
-			}
-		},
-		{
-			fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("000000000000000000000000f93175303eba2a7b372174fc9330237f5ad202fc"),
-				calc_cost(32)
-			}
-		},
-		{
-			fromHex(
-				"0800000000000000000000000000000000000000000000000000000000000000"
-				"0401000000000000000000000000000000000000000000000000000000000000"
-				"0000000400000000000000000000000000000000000000000000000000000000"
-				"00000100"
-			),
-			{
-				fromHex("000000000000000000000000f93175303eba2a7b372174fc9330237f5ad202fc"),
-				calc_cost(100)
-			}
-		},
-		{
-			fromHex(
-				"0800000000000000000000000000000000000000000000000000000000000000"
-				"0501000000000000000000000000000000000000000000000000000000000000"
-				"0000000500000000000000000000000000000000000000000000000000000000"
-				"00000100"
-			),
-			{
-				fromHex("0000000000000000000000004f4fc112e2bfbe0d38f896a46629e08e2fcfad5"),
-				calc_cost(100)
-			}
-		},
-		{
-			fromHex(
-				"08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-				"ff010000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-				"ffffffff00000000000000000000000000000000000000000000000000000000"
-				"00000100"
-			),
-			{
-				fromHex("000000000000000000000000c0a2e4b1f3ff766a9a0089e7a410391730872495"),
-				calc_cost(100)
-			}
-		},
-		{
-			fromHex(
-				"6162636465666768696a6b6c6d6e6f707172737475767778797a414243444546"
-				"4748494a4b4c4d4e4f505152535455565758595a303132333435363738393f21"
-			),
-			{
-				fromHex("00000000000000000000000036c6b90a49e17d4c1e1b0e634ec74124d9b207da"),
-				calc_cost(64)
-			}
-		},
-		{
-			fromHex("6162636465666768696a6b6c6d6e6f707172737475767778797a414243444546"),
-			{
-				fromHex("000000000000000000000000ac5ab22e07b0fb80c69b6207902f725e2507e546"),
-				calc_cost(32)
-			}
-		}
-	};
-	return precompileGeneric(_message, inputOutput);
-}
-
-evmc::Result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
-{
-	// static data so that we do not need a release routine...
-	bytes static data;
-	data = bytes(_message.input_data, _message.input_data + _message.input_size);
-
-	// Base 15 gas + 3 gas / word.
-	int64_t gas_cost = 15 + 3 * ((static_cast<int64_t>(_message.input_size) + 31) / 32);
-
-	return resultWithGas(_message.gas, gas_cost, data);
-}
-
-evmc::Result EVMHost::precompileModExp(evmc_message const&) noexcept
-{
-	// TODO implement
-	return resultWithFailure();
-}
-
-template <evmc_revision Revision>
-evmc::Result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
-{
-	// NOTE this is a partial implementation for some inputs.
-
-	// Fixed 500 or 150 gas.
-	int64_t gas_cost = (Revision < EVMC_ISTANBUL) ? 500 : 150;
-
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
-		{
-			fromHex(
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d5012"
-				"02254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d5012"
-					"02254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"0000000000000000000000000000000000000000000000000000000000000002"
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"0000000000000000000000000000000000000000000000000000000000000002"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd3"
-					"15ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"0000000000000000000000000000000000000000000000000000000000000002"
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"0000000000000000000000000000000000000000000000000000000000000000"
-					"0000000000000000000000000000000000000000000000000000000000000000"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"10b4876441e14a6be92a7fe66550848c01c676a12ac31d7cc13b21f49c4307c8"
-				"09f5528bdb0ef9354837a0f4b4c9da973bd5b805d359976f719ab0b74e0a7368"
-				"28d3c57516712e7843a5b3cfa7d7274a037943f5bd57c227620ad207728e4283"
-				"2795fa9df21d4b8b329a45bae120f1fd9df9049ecacaa9dd1eca18bc6a55cd2f"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"16aed5ed486df6b2fb38015ded41400009ed4f34bef65b87b1f90f47052f8d94"
-					"16dabf21b3f25b9665269d98dc17b1da6118251dc0b403ae50e96dfe91239375"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d5012"
-				"02254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"
-				"1644e84fef7b7fdc98254f0654580173307a3bc44db990581e7ab55a22446dcf"
-				"28c2916b7e875692b195831945805438fcd30d2693d8a80cf8c88ec6ef4c315d"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"1e018816fc9bbd91313301ae9c254bb7d64d6cd54f3b49b92925e43e256b5faa"
-					"1d1f2259c715327bedb42c095af6c0267e4e1be836b4e04b3f0502552f93cca9"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"16aed5ed486df6b2fb38015ded41400009ed4f34bef65b87b1f90f47052f8d94"
-				"16dabf21b3f25b9665269d98dc17b1da6118251dc0b403ae50e96dfe91239375"
-				"25ff95a3abccf32adc6a4c3c8caddca67723d8ada802e9b9f612e3ddb40b2005"
-				"0d82b09bb4ec927bbf182bdc402790429322b7e2f285f2aad8ea135cbf7143d8"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"29d160febeef9770d47a32ee3b763850eb0594844fa57dd31b8ed02c78fdb797"
-					"2c7cdf62c2498486fd52646e577a06723ce97737b3c958262d78c4a413661e8a"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"18014701594179c6b9ccae848e3d15c1f76f8a68b8092578296520e46c9bae0c"
-				"1b5ed0e9e8f3ff35589ea81a45cf63887d4a92c099a3be1d97b26f0db96323dd"
-				"16a1d378d1a98cf5383cdc512011234287ca43b6a078d1842d5c58c5b1f475cc"
-				"1309377a7026d08ca1529eab74381a7e0d3a4b79d80bacec207cd52fc8e3769c"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"2583ed10e418133e44619c336f1be5ddae9e20d634a7683d9661401c750d7df4"
-					"0185fbba22de9e698262925665735dbc4d6e8288bc3fc39fae10ca58e16e77f7"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f59"
-				"3034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41"
-				"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
-				"16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"1496064626ba8bffeb7805f0d16143a65649bb0850333ea512c03fcdaf31e254"
-					"07b4f210ab542533f1ee5633ae4406cd16c63494b537ce3f1cf4afff6f76a48f"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"1e018816fc9bbd91313301ae9c254bb7d64d6cd54f3b49b92925e43e256b5faa"
-				"1d1f2259c715327bedb42c095af6c0267e4e1be836b4e04b3f0502552f93cca9"
-				"2364294faf6b89fedeede9986aa777c4f6c2f5c4a4559ee93dfec9b7b94ef80b"
-				"05aeae62655ea23865ae6661ae371a55c12098703d0f2301f4223e708c92efc6"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"2801b21090cbc48409e352647f3857134d373f81741f9d5e3d432f336d76f517"
-					"13cf106acf943c2a331de21c7d5e3351354e7412f2dba2918483a6593a6828d4"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"2583ed10e418133e44619c336f1be5ddae9e20d634a7683d9661401c750d7df4"
-				"0185fbba22de9e698262925665735dbc4d6e8288bc3fc39fae10ca58e16e77f7"
-				"258f1faa356e470cca19c928afa5ceed6215c756912af5725b8db5777cc8f3b6"
-				"175ced8a58d0c132c2b95ba14c16dde93e7f7789214116ff69da6f44daa966e6"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"10b4876441e14a6be92a7fe66550848c01c676a12ac31d7cc13b21f49c4307c8"
-					"09f5528bdb0ef9354837a0f4b4c9da973bd5b805d359976f719ab0b74e0a7368"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"26dcfbc2e0bc9d82efb4acd73cb3e99730e27e10177fcfb78b6399a4bfcdf391"
-				"27c440dbd5053253a3a692f9bf89b9b6e9612127cf97db1e11ffa9679acc933b"
-				"1496064626ba8bffeb7805f0d16143a65649bb0850333ea512c03fcdaf31e254"
-				"07b4f210ab542533f1ee5633ae4406cd16c63494b537ce3f1cf4afff6f76a48f"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008"
-					"1e396bc242de0214898b0f68035f53ad5a6f96c6c8390ac56ed6ec9561d23159"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"26dcfbc2e0bc9d82efb4acd73cb3e99730e27e10177fcfb78b6399a4bfcdf391"
-				"27c440dbd5053253a3a692f9bf89b9b6e9612127cf97db1e11ffa9679acc933b"
-				"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f59"
-				"3034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a"
-					"29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed3021"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"27231d5cdd0011259ff75678cf5a8f7840c22cb71d52b25e21e071205e8d9bc4"
-				"26dd3d225c9a71476db0cf834232eba84020f3073c6d20c519963e0b98f235e1"
-				"2174f0221490cd9c15b0387f3251ec3d49517a51c37a8076eac12afb4a95a707"
-				"1d1c3fcd3161e2a417b4df0955f02db1fffa9005210fb30c5aa3755307e9d1f5"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"18014701594179c6b9ccae848e3d15c1f76f8a68b8092578296520e46c9bae0c"
-					"1b5ed0e9e8f3ff35589ea81a45cf63887d4a92c099a3be1d97b26f0db96323dd"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"2801b21090cbc48409e352647f3857134d373f81741f9d5e3d432f336d76f517"
-				"13cf106acf943c2a331de21c7d5e3351354e7412f2dba2918483a6593a6828d4"
-				"2a49621e12910cd90f3e731083d454255bf1c533d6e15b8699156778d0f27f5d"
-				"2590ee31824548d159aa2d22296bf149d564c0872f41b89b7dc5c6e6e3cd1c4d"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"27231d5cdd0011259ff75678cf5a8f7840c22cb71d52b25e21e071205e8d9bc4"
-					"26dd3d225c9a71476db0cf834232eba84020f3073c6d20c519963e0b98f235e1"
-				),
-				gas_cost
-			}
-		},
-		{
-			fromHex(
-				"29d160febeef9770d47a32ee3b763850eb0594844fa57dd31b8ed02c78fdb797"
-				"2c7cdf62c2498486fd52646e577a06723ce97737b3c958262d78c4a413661e8a"
-				"0aee46a7ea6e80a3675026dfa84019deee2a2dedb1bbe11d7fe124cb3efb4b5a"
-				"044747b6e9176e13ede3a4dfd0d33ccca6321b9acd23bf3683a60adc0366ebaf"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			),
-			{
-				fromHex(
-					"26dcfbc2e0bc9d82efb4acd73cb3e99730e27e10177fcfb78b6399a4bfcdf391"
-					"27c440dbd5053253a3a692f9bf89b9b6e9612127cf97db1e11ffa9679acc933b"
-				),
-				gas_cost
-			}
-		}
-	};
-	return precompileGeneric(_message, inputOutput);
-}
-
-template <evmc_revision Revision>
-evmc::Result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noexcept
-{
-	// NOTE this is a partial implementation for some inputs.
-
-	// Fixed 40000 or 6000 gas.
-	int64_t gas_cost = (Revision < EVMC_ISTANBUL) ? 40000 : 6000;
-
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
-		{
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("09b54f111d3b2d1b2fe1ae9669b3db3d7bf93b70f00647e65c849275de6dc7fe18b2e77c63a3e400d6d1f1fbc6e1a1167bbca603d34d03edea231eb0ab7b14b4030f7b0c405c888aff922307ea2cd1c70f64664bab76899500341f4260a209290000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("16a1d378d1a98cf5383cdc512011234287ca43b6a078d1842d5c58c5b1f475cc1309377a7026d08ca1529eab74381a7e0d3a4b79d80bacec207cd52fc8e3769c"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("0a6de0e2240aa253f46ce0da883b61976e3588146e01c9d8976548c145fe6e4a04fbaa3a4aed4bb77f30ebb07a3ec1c7d77a7f2edd75636babfeff97b1ea686e1551dcd4965285ef049512d2d30cbfc1a91acd5baad4a6e19e22e93176197f170000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("28d3c57516712e7843a5b3cfa7d7274a037943f5bd57c227620ad207728e42832795fa9df21d4b8b329a45bae120f1fd9df9049ecacaa9dd1eca18bc6a55cd2f"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("0c54b42137b67cc268cbb53ac62b00ecead23984092b494a88befe58445a244a18e3723d37fae9262d58b548a0575f59d9c3266db7afb4d5739555837f6b8b3e0c692b41f1acc961f6ea83bae2c3a1a55c54f766c63ba76989f52c149c17b5e70000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("258f1faa356e470cca19c928afa5ceed6215c756912af5725b8db5777cc8f3b6175ced8a58d0c132c2b95ba14c16dde93e7f7789214116ff69da6f44daa966e6"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("0f103f14a584d4203c27c26155b2c955f8dfa816980b24ba824e1972d6486a5d0c4165133b9f5be17c804203af781bcf168da7386620479f9b885ecbcd27b17b0ea71d0abb524cac7cfff5323e1d0b14ab705842426c978f96753ccce258ed930000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("2a49621e12910cd90f3e731083d454255bf1c533d6e15b8699156778d0f27f5d2590ee31824548d159aa2d22296bf149d564c0872f41b89b7dc5c6e6e3cd1c4d"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("111e2e2a5f8828f80ddad08f9f74db56dac1cc16c1cb278036f79a84cf7a116f1d7d62e192b219b9808faa906c5ced871788f6339e8d91b83ac1343e20a16b3000000000000000000000000000000000000000e40800000000000000008cdcbc0000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("25ff95a3abccf32adc6a4c3c8caddca67723d8ada802e9b9f612e3ddb40b20050d82b09bb4ec927bbf182bdc402790429322b7e2f285f2aad8ea135cbf7143d8"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("17d5d09b4146424bff7e6fb01487c477bbfcd0cdbbc92d5d6457aae0b6717cc502b5636903efbf46db9235bbe74045d21c138897fda32e079040db1a16c1a7a11887420878c0c8e37605291c626585eabbec8d8b97a848fe8d58a37b004583510000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("2364294faf6b89fedeede9986aa777c4f6c2f5c4a4559ee93dfec9b7b94ef80b05aeae62655ea23865ae6661ae371a55c12098703d0f2301f4223e708c92efc6"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("1c36e713d4d54e3a9644dffca1fc524be4868f66572516025a61ca542539d43f042dcc4525b82dfb242b09cb21909d5c22643dcdbe98c4d082cc2877e96b24db016086cc934d5cab679c6991a4efcedbab26d7e4fb23b6a1ad4e6b5c2fb59ce50000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("1644e84fef7b7fdc98254f0654580173307a3bc44db990581e7ab55a22446dcf28c2916b7e875692b195831945805438fcd30d2693d8a80cf8c88ec6ef4c315d"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("1e39e9f0f91fa7ff8047ffd90de08785777fe61c0e3434e728fce4cf35047ddc2e0b64d75ebfa86d7f8f8e08abbe2e7ae6e0a1c0b34d028f19fa56e9450527cb1eec35a0e955cad4bee5846ae0f1d0b742d8636b278450c534e38e06a60509f90000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d501202254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"),
-				gas_cost
-			}
-		},
-		{
-			fromHex("232063b584fb76c8d07995bee3a38fa7565405f3549c6a918ddaa90ab971e7f82ac9b135a81d96425c92d02296322ad56ffb16299633233e4880f95aafa7fda70689c3dc4311426ee11707866b2cbdf9751dacd07245bf99d2113d3f5a8cac470000000000000000000000000000000000000000000000000000000000000000"),
-			{
-				fromHex("2174f0221490cd9c15b0387f3251ec3d49517a51c37a8076eac12afb4a95a7071d1c3fcd3161e2a417b4df0955f02db1fffa9005210fb30c5aa3755307e9d1f5"),
-				gas_cost
-			}
-		}
-	};
-	return precompileGeneric(_message, inputOutput);
-}
-
-template <evmc_revision Revision>
-evmc::Result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
-{
-	// Base + per pairing gas.
-	constexpr auto calc_cost = [](unsigned points) -> int64_t {
-		// Number of 192-byte points.
-		return (Revision < EVMC_ISTANBUL) ?
-			(100000 + 80000 * points):
-			(45000 + 34000 * points);
-	};
-
-	// NOTE this is a partial implementation for some inputs.
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
-		{
-			fromHex(
-				"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa9"
-				"01e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
-				"0a09ccf561b55fd99d1c1208dee1162457b57ac5af3759d50671e510e428b2a1"
-				"2e539c423b302d13f4e5773c603948eaf5db5df8ae8a9a9113708390a06410d8"
-				"19b763513924a736e4eebd0d78c91c1bc1d657fee4214057d21414011cfcc763"
-				"2f8d9f9ab83727c77a2fec063cb7b6e5eb23044ccf535ad49d46d394fb6f6bf6"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(2)
-			}
-		},
-		{
-			fromHex(
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"0000000000000000000000000000000000000000000000000000000000000002"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-				"0000000000000000000000000000000000000000000000000000000000000001"
-				"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(2)
-			}
-		},
-		{
-			fromHex(
-				"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f59"
-				"3034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41"
-				"209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf7"
-				"04bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a41678"
-				"2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d"
-				"120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550"
-				"111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c"
-				"2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(2)
-			}
-		},
-		{
-			fromHex(
-				"2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc02"
-				"03d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db84"
-				"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
-				"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
-				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
-				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
-				"06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db9"
-				"22160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(2)
-			}
-		},
-		{
-			fromHex(
-				"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
-				"16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba"
-				"2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb"
-				"01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb3"
-				"14a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713"
-				"178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee24590"
-				"1b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b8"
-				"11d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(2)
-			}
-		},
-		{
-			fromHex(
-				"2f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6"
-				"068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b72"
-				"25f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb1"
-				"22acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d"
-				"065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf68"
-				"06d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb"
-				"186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008"
-				"122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee"
-				"1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e"
-				"283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39"
-				"140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e"
-				"0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd4"
-				"15794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f21"
-				"1b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da"
-				"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
-				"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
-				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
-				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(3)
-			}
-		},
-		{
-			fromHex(
-				"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a"
-				"29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed3021"
-				"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
-				"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
-				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
-				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
-				"1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c1"
-				"1073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869"
-				"217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac29"
-				"0a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c"
-				"26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a9855"
-				"2fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d7"
-				"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
-				"198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d"
-				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
-				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
-				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
-				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-			),
-			{
-				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-				calc_cost(3)
-			}
-		}
-	};
-	return precompileGeneric(_message, inputOutput);
-}
-
-evmc::Result EVMHost::precompileBlake2f(evmc_message const&) noexcept
-{
-	// TODO implement
-	return resultWithFailure();
-}
-
-evmc::Result EVMHost::precompileGeneric(
-	evmc_message const& _message,
-	map<bytes, EVMPrecompileOutput> const& _inOut) noexcept
-{
-	bytes input(_message.input_data, _message.input_data + _message.input_size);
-	if (_inOut.count(input))
-	{
-		auto const& ret = _inOut.at(input);
-		return resultWithGas(_message.gas, ret.gas_used, ret.output);
-	}
-	else
-		return resultWithFailure();
-}
-
-evmc::Result EVMHost::resultWithFailure() noexcept
-{
-	evmc::Result result;
-	result.status_code = EVMC_FAILURE;
-	return result;
-}
-
-evmc::Result EVMHost::resultWithGas(
-	int64_t gas_limit,
-	int64_t gas_required,
-	bytes const& _data
-) noexcept
-{
-	evmc::Result result;
-	if (gas_limit < gas_required)
-	{
-		result.status_code = EVMC_OUT_OF_GAS;
-		result.gas_left = 0;
-	}
-	else
-	{
-		result.status_code = EVMC_SUCCESS;
-		result.gas_left = gas_limit - gas_required;
-	}
-	result.output_data = _data.empty() ? nullptr : _data.data();
-	result.output_size = _data.size();
-	return result;
-}
-
-StorageMap const& EVMHost::get_address_storage(evmc::address const& _addr)
-{
-	assertThrow(account_exists(_addr), Exception, "Account does not exist.");
-	return accounts[_addr].storage;
-}
-
-string EVMHostPrinter::state()
-{
-	// Print state and execution trace.
-	if (m_host.account_exists(m_account))
-	{
-		storage();
-		balance();
-	}
-	else
-		selfdestructRecords();
-
-	callRecords();
-	return m_stateStream.str();
-}
-
-void EVMHostPrinter::storage()
-{
-	for (auto const& [slot, value]: m_host.get_address_storage(m_account))
-		if (m_host.get_storage(m_account, slot))
-			m_stateStream << "  "
-				<< m_host.convertFromEVMC(slot)
-				<< ": "
-				<< m_host.convertFromEVMC(value.current)
-				<< endl;
-}
-
-void EVMHostPrinter::balance()
-{
-	m_stateStream << "BALANCE "
-		<< m_host.convertFromEVMC(m_host.get_balance(m_account))
-		<< endl;
-}
-
-void EVMHostPrinter::selfdestructRecords()
-{
-	for (auto const& record: m_host.recorded_selfdestructs)
-		for (auto const& beneficiary: record.second)
-			m_stateStream << "SELFDESTRUCT"
-				<< " BENEFICIARY "
-				<< m_host.convertFromEVMC(beneficiary)
-				<< endl;
-}
-
-void EVMHostPrinter::callRecords()
-{
-	static auto constexpr callKind = [](evmc_call_kind _kind) -> string
-	{
-		switch (_kind)
-		{
-			case evmc_call_kind::EVMC_CALL:
-				return "CALL";
-			case evmc_call_kind::EVMC_DELEGATECALL:
-				return "DELEGATECALL";
-			case evmc_call_kind::EVMC_CALLCODE:
-				return "CALLCODE";
-			case evmc_call_kind::EVMC_CREATE:
-				return "CREATE";
-			case evmc_call_kind::EVMC_CREATE2:
-				return "CREATE2";
-			default:
-				assertThrow(false, Exception, "Invalid call kind.");
-		}
-	};
-
-	for (auto const& record: m_host.recorded_calls)
-		m_stateStream << callKind(record.kind)
-			<< " VALUE "
-			<< m_host.convertFromEVMC(record.value)
-			<< endl;
-}
diff --git a/test/EVMHost.h b/test/EVMHost.h
deleted file mode 100644
index 967adc2486aa..000000000000
--- a/test/EVMHost.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * EVM execution host, i.e. component that implements a simulated Ethereum blockchain
- * for testing purposes.
- */
-
-#pragma once
-
-#include <test/evmc/mocked_host.hpp>
-#include <test/evmc/evmc.hpp>
-#include <test/evmc/evmc.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/FixedHash.h>
-
-#include <boost/filesystem.hpp>
-
-namespace solidity::test
-{
-using Address = util::h160;
-using StorageMap = std::map<evmc::bytes32, evmc::StorageValue>;
-
-struct EVMPrecompileOutput {
-	bytes const output;
-	int64_t gas_used;
-};
-
-class EVMHost: public evmc::MockedHost
-{
-public:
-	// Verbatim features of MockedHost.
-	using MockedHost::account_exists;
-	using MockedHost::get_storage;
-	using MockedHost::set_storage;
-	using MockedHost::get_balance;
-	using MockedHost::get_code_size;
-	using MockedHost::get_code_hash;
-	using MockedHost::copy_code;
-	using MockedHost::get_tx_context;
-	using MockedHost::emit_log;
-	using MockedHost::access_account;
-	using MockedHost::access_storage;
-
-	// Modified features of MockedHost.
-	bool selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
-	evmc::Result call(evmc_message const& _message) noexcept final;
-	evmc::bytes32 get_block_hash(int64_t number) const noexcept final;
-
-	// Solidity testing specific features.
-
-	/// Tries to dynamically load an evmc vm supporting evm1 and caches the loaded VM.
-	/// @returns vmc::VM(nullptr) on failure.
-	static evmc::VM& getVM(std::string const& _path = {});
-
-	/// Tries to load all defined evmc vm shared libraries.
-	/// @param _vmPaths paths to multiple evmc shared libraries.
-	/// @throw Exception if multiple evm1 vms where loaded.
-	/// @returns true, if an evmc vm supporting evm1 was loaded properly,
-	static bool checkVmPaths(std::vector<boost::filesystem::path> const& _vmPaths);
-
-	explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm);
-
-	/// Reset entire state (including accounts).
-	void reset();
-
-	/// Start new block.
-	void newBlock()
-	{
-		tx_context.block_number++;
-		tx_context.block_timestamp += 15;
-		recorded_logs.clear();
-		newTransactionFrame();
-	}
-
-	/// @returns contents of storage at @param _addr.
-	StorageMap const& get_address_storage(evmc::address const& _addr);
-
-	static Address convertFromEVMC(evmc::address const& _addr);
-	static evmc::address convertToEVMC(Address const& _addr);
-	static util::h256 convertFromEVMC(evmc::bytes32 const& _data);
-	static evmc::bytes32 convertToEVMC(util::h256 const& _data);
-private:
-	/// Transfer value between accounts. Checks for sufficient balance.
-	void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept;
-
-	/// Start a new transaction frame.
-	/// This will perform selfdestructs, apply storage status changes across all accounts,
-	/// and clear account/storage access indicator for EIP-2929.
-	void newTransactionFrame();
-
-	/// Records calls made via @param _message.
-	void recordCalls(evmc_message const& _message) noexcept;
-
-	static evmc::Result precompileECRecover(evmc_message const& _message) noexcept;
-	static evmc::Result precompileSha256(evmc_message const& _message) noexcept;
-	static evmc::Result precompileRipeMD160(evmc_message const& _message) noexcept;
-	static evmc::Result precompileIdentity(evmc_message const& _message) noexcept;
-	static evmc::Result precompileModExp(evmc_message const& _message) noexcept;
-	template <evmc_revision Revision>
-	static evmc::Result precompileALTBN128G1Add(evmc_message const& _message) noexcept;
-	template <evmc_revision Revision>
-	static evmc::Result precompileALTBN128G1Mul(evmc_message const& _message) noexcept;
-	template <evmc_revision Revision>
-	static evmc::Result precompileALTBN128PairingProduct(evmc_message const& _message) noexcept;
-	static evmc::Result precompileBlake2f(evmc_message const& _message) noexcept;
-	static evmc::Result precompileGeneric(evmc_message const& _message, std::map<bytes, EVMPrecompileOutput> const& _inOut) noexcept;
-	/// @returns a result object with gas usage and result data taken from @a _data.
-	/// The outcome will be a failure if the limit < required.
-	/// @note The return value is only valid as long as @a _data is alive!
-	static evmc::Result resultWithGas(int64_t gas_limit, int64_t gas_required, bytes const& _data) noexcept;
-	static evmc::Result resultWithFailure() noexcept;
-
-	evmc::VM& m_vm;
-	/// EVM version requested by the testing tool
-	langutil::EVMVersion m_evmVersion;
-	/// EVM version requested from EVMC (matches the above)
-	evmc_revision m_evmRevision;
-};
-
-class EVMHostPrinter
-{
-public:
-	/// Constructs a host printer object for state at @param _address.
-	explicit EVMHostPrinter(EVMHost& _host, evmc::address _address):
-		m_host(_host),
-		m_account(_address)
-	{}
-	/// @returns state at account maintained by host.
-	std::string state();
-private:
-	/// Outputs storage at account to stateStream.
-	void storage();
-	/// Outputs call records for account to stateStream.
-	void callRecords();
-	/// Outputs balance of account to stateStream.
-	void balance();
-	/// Outputs self-destruct record for account to stateStream.
-	void selfdestructRecords();
-
-	std::ostringstream m_stateStream;
-	EVMHost& m_host;
-	evmc::address m_account;
-};
-
-}
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
deleted file mode 100644
index a18a73de06b8..000000000000
--- a/test/ExecutionFramework.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Framework for executing contracts and testing them using RPC.
- */
-
-#include <test/ExecutionFramework.h>
-
-#include <test/EVMHost.h>
-
-#include <test/evmc/evmc.hpp>
-
-#include <test/libsolidity/util/SoltestTypes.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/test/framework.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <range/v3/range.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <cstdlib>
-#include <limits>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::test;
-using namespace solidity::frontend::test;
-
-ExecutionFramework::ExecutionFramework():
-	ExecutionFramework(solidity::test::CommonOptions::get().evmVersion(), solidity::test::CommonOptions::get().vmPaths)
-{
-}
-
-ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion, vector<boost::filesystem::path> const& _vmPaths):
-	m_evmVersion(_evmVersion),
-	m_optimiserSettings(solidity::frontend::OptimiserSettings::minimal()),
-	m_showMessages(solidity::test::CommonOptions::get().showMessages),
-	m_vmPaths(_vmPaths)
-{
-	if (solidity::test::CommonOptions::get().optimize)
-		m_optimiserSettings = solidity::frontend::OptimiserSettings::standard();
-	selectVM(evmc_capabilities::EVMC_CAPABILITY_EVM1);
-}
-
-void ExecutionFramework::selectVM(evmc_capabilities _cap)
-{
-	m_evmcHost.reset();
-	for (auto const& path: m_vmPaths)
-	{
-		evmc::VM& vm = EVMHost::getVM(path.string());
-		if (vm.has_capability(_cap))
-		{
-			m_evmcHost = make_unique<EVMHost>(m_evmVersion, vm);
-			break;
-		}
-	}
-	solAssert(m_evmcHost != nullptr, "");
-	reset();
-}
-
-void ExecutionFramework::reset()
-{
-	m_evmcHost->reset();
-	for (size_t i = 0; i < 10; i++)
-		m_evmcHost->accounts[EVMHost::convertToEVMC(account(i))].balance =
-			EVMHost::convertToEVMC(u256(1) << 100);
-}
-
-std::pair<bool, string> ExecutionFramework::compareAndCreateMessage(
-	bytes const& _result,
-	bytes const& _expectation
-)
-{
-	if (_result == _expectation)
-		return std::make_pair(true, std::string{});
-	std::string message =
-			"Invalid encoded data\n"
-			"   Result                                                           Expectation\n";
-	auto resultHex = boost::replace_all_copy(util::toHex(_result), "0", ".");
-	auto expectedHex = boost::replace_all_copy(util::toHex(_expectation), "0", ".");
-	for (size_t i = 0; i < std::max(resultHex.size(), expectedHex.size()); i += 0x40)
-	{
-		std::string result{i >= resultHex.size() ? string{} : resultHex.substr(i, 0x40)};
-		std::string expected{i > expectedHex.size() ? string{} : expectedHex.substr(i, 0x40)};
-		message +=
-			(result == expected ? "   " : " X ") +
-			result +
-			std::string(0x41 - result.size(), ' ') +
-			expected +
-			"\n";
-	}
-	return make_pair(false, message);
-}
-
-bytes ExecutionFramework::panicData(util::PanicCode _code)
-{
-	return
-		m_evmVersion.supportsReturndata() ?
-		toCompactBigEndian(selectorFromSignatureU32("Panic(uint256)"), 4) + encode(u256(static_cast<unsigned>(_code))) :
-		bytes();
-}
-
-u256 ExecutionFramework::gasLimit() const
-{
-	return {m_evmcHost->tx_context.block_gas_limit};
-}
-
-u256 ExecutionFramework::gasPrice() const
-{
-	// here and below we use "return u256{....}" instead of just "return {....}"
-	// to please MSVC and avoid unexpected
-	// warning C4927 : illegal conversion; more than one user - defined conversion has been implicitly applied
-	return u256{EVMHost::convertFromEVMC(m_evmcHost->tx_context.tx_gas_price)};
-}
-
-u256 ExecutionFramework::blockHash(u256 const& _number) const
-{
-	return u256{EVMHost::convertFromEVMC(
-		m_evmcHost->get_block_hash(static_cast<int64_t>(_number & numeric_limits<uint64_t>::max()))
-	)};
-}
-
-u256 ExecutionFramework::blockNumber() const
-{
-	return m_evmcHost->tx_context.block_number;
-}
-
-void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256 const& _value)
-{
-	m_evmcHost->newBlock();
-
-	if (m_showMessages)
-	{
-		if (_isCreation)
-			cout << "CREATE " << m_sender.hex() << ":" << endl;
-		else
-			cout << "CALL   " << m_sender.hex() << " -> " << m_contractAddress.hex() << ":" << endl;
-		if (_value > 0)
-			cout << " value: " << _value << endl;
-		cout << " in:      " << util::toHex(_data) << endl;
-	}
-	evmc_message message{};
-	message.input_data = _data.data();
-	message.input_size = _data.size();
-	message.sender = EVMHost::convertToEVMC(m_sender);
-	message.value = EVMHost::convertToEVMC(_value);
-
-	if (_isCreation)
-	{
-		message.kind = EVMC_CREATE;
-		message.recipient = {};
-		message.code_address = {};
-	}
-	else
-	{
-		message.kind = EVMC_CALL;
-		message.recipient = EVMHost::convertToEVMC(m_contractAddress);
-		message.code_address = message.recipient;
-	}
-
-	message.gas = InitialGas.convert_to<int64_t>();
-
-	evmc::Result result = m_evmcHost->call(message);
-
-	m_output = bytes(result.output_data, result.output_data + result.output_size);
-	if (_isCreation)
-		m_contractAddress = EVMHost::convertFromEVMC(result.create_address);
-
-	unsigned const refundRatio = (m_evmVersion >= langutil::EVMVersion::london() ? 5 : 2);
-	auto const totalGasUsed = InitialGas - result.gas_left;
-	auto const gasRefund = min(u256(result.gas_refund), totalGasUsed / refundRatio);
-
-	m_gasUsed = totalGasUsed - gasRefund;
-	m_transactionSuccessful = (result.status_code == EVMC_SUCCESS);
-
-	if (m_showMessages)
-	{
-		cout << " out:                       " << util::toHex(m_output) << endl;
-		cout << " result:                    " << static_cast<size_t>(result.status_code) << endl;
-		cout << " gas used:                  " << m_gasUsed.str() << endl;
-		cout << " gas used (without refund): " << totalGasUsed.str() << endl;
-		cout << " gas refund (total):        " << result.gas_refund << endl;
-		cout << " gas refund (bound):        " << gasRefund.str() << endl;
-	}
-}
-
-void ExecutionFramework::sendEther(h160 const& _addr, u256 const& _amount)
-{
-	m_evmcHost->newBlock();
-
-	if (m_showMessages)
-	{
-		cout << "SEND_ETHER   " << m_sender.hex() << " -> " << _addr.hex() << ":" << endl;
-		if (_amount > 0)
-			cout << " value: " << _amount << endl;
-	}
-	evmc_message message{};
-	message.sender = EVMHost::convertToEVMC(m_sender);
-	message.value = EVMHost::convertToEVMC(_amount);
-	message.kind = EVMC_CALL;
-	message.recipient = EVMHost::convertToEVMC(_addr);
-	message.code_address = message.recipient;
-	message.gas = InitialGas.convert_to<int64_t>();
-
-	m_evmcHost->call(message);
-}
-
-size_t ExecutionFramework::currentTimestamp()
-{
-	return static_cast<size_t>(m_evmcHost->tx_context.block_timestamp);
-}
-
-size_t ExecutionFramework::blockTimestamp(u256 _block)
-{
-	if (_block > blockNumber())
-		return 0;
-	else
-		return static_cast<size_t>((currentTimestamp() / blockNumber()) * _block);
-}
-
-h160 ExecutionFramework::account(size_t _idx)
-{
-	return h160(h256(u256{"0x1212121212121212121212121212120000000012"} + _idx * 0x1000), h160::AlignRight);
-}
-
-bool ExecutionFramework::addressHasCode(h160 const& _addr) const
-{
-	return m_evmcHost->get_code_size(EVMHost::convertToEVMC(_addr)) != 0;
-}
-
-size_t ExecutionFramework::numLogs() const
-{
-	return m_evmcHost->recorded_logs.size();
-}
-
-size_t ExecutionFramework::numLogTopics(size_t _logIdx) const
-{
-	return m_evmcHost->recorded_logs.at(_logIdx).topics.size();
-}
-
-h256 ExecutionFramework::logTopic(size_t _logIdx, size_t _topicIdx) const
-{
-	return EVMHost::convertFromEVMC(m_evmcHost->recorded_logs.at(_logIdx).topics.at(_topicIdx));
-}
-
-h160 ExecutionFramework::logAddress(size_t _logIdx) const
-{
-	return EVMHost::convertFromEVMC(m_evmcHost->recorded_logs.at(_logIdx).creator);
-}
-
-bytes ExecutionFramework::logData(size_t _logIdx) const
-{
-	auto const& data = m_evmcHost->recorded_logs.at(_logIdx).data;
-	// TODO: Return a copy of log data, because this is expected from REQUIRE_LOG_DATA(),
-	//       but reference type like string_view would be preferable.
-	return {data.begin(), data.end()};
-}
-
-u256 ExecutionFramework::balanceAt(h160 const& _addr) const
-{
-	return u256(EVMHost::convertFromEVMC(m_evmcHost->get_balance(EVMHost::convertToEVMC(_addr))));
-}
-
-bool ExecutionFramework::storageEmpty(h160 const& _addr) const
-{
-	const auto it = m_evmcHost->accounts.find(EVMHost::convertToEVMC(_addr));
-	if (it != m_evmcHost->accounts.end())
-	{
-		for (auto const& entry: it->second.storage)
-			if (entry.second.current != evmc::bytes32{})
-				return false;
-	}
-	return true;
-}
-
-vector<solidity::frontend::test::LogRecord> ExecutionFramework::recordedLogs() const
-{
-	vector<LogRecord> logs;
-	for (evmc::MockedHost::log_record const& logRecord: m_evmcHost->recorded_logs)
-		logs.emplace_back(
-			EVMHost::convertFromEVMC(logRecord.creator),
-			bytes{logRecord.data.begin(), logRecord.data.end()},
-			logRecord.topics | ranges::views::transform([](evmc::bytes32 _bytes) { return EVMHost::convertFromEVMC(_bytes); }) | ranges::to<vector>
-		);
-	return logs;
-}
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
deleted file mode 100644
index 27ceb4f28033..000000000000
--- a/test/ExecutionFramework.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Framework for executing contracts and testing them using RPC.
- */
-
-#pragma once
-
-#include <test/Common.h>
-#include <test/EVMHost.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-#include <libsolidity/interface/DebugSettings.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/ErrorCodes.h>
-
-#include <functional>
-
-#include <boost/rational.hpp>
-#include <boost/test/unit_test.hpp>
-
-namespace solidity::frontend::test
-{
-struct LogRecord;
-} // namespace solidity::frontend::test
-
-namespace solidity::test
-{
-using rational = boost::rational<bigint>;
-
-// The ether and gwei denominations; here for ease of use where needed within code.
-static u256 const gwei = u256(1) << 9;
-static u256 const ether = u256(1) << 18;
-class ExecutionFramework
-{
-
-public:
-	ExecutionFramework();
-	ExecutionFramework(langutil::EVMVersion _evmVersion, std::vector<boost::filesystem::path> const& _vmPaths);
-	virtual ~ExecutionFramework() = default;
-
-	virtual bytes const& compileAndRunWithoutCheck(
-		std::map<std::string, std::string> const& _sourceCode,
-		u256 const& _value = 0,
-		std::string const& _contractName = "",
-		bytes const& _arguments = {},
-		std::map<std::string, util::h160> const& _libraryAddresses = {},
-		std::optional<std::string> const& _sourceName = std::nullopt
-	) = 0;
-
-	bytes const& compileAndRun(
-		std::string const& _sourceCode,
-		u256 const& _value = 0,
-		std::string const& _contractName = "",
-		bytes const& _arguments = {},
-		std::map<std::string, util::h160> const& _libraryAddresses = {}
-	)
-	{
-		compileAndRunWithoutCheck(
-			{{"", _sourceCode}},
-			_value,
-			_contractName,
-			_arguments,
-			_libraryAddresses
-		);
-		BOOST_REQUIRE(m_transactionSuccessful);
-		BOOST_REQUIRE(!m_output.empty());
-		return m_output;
-	}
-
-	bytes const& callFallbackWithValue(u256 const& _value)
-	{
-		sendMessage(bytes(), false, _value);
-		return m_output;
-	}
-
-	bytes const & callFallback()
-	{
-		return callFallbackWithValue(0);
-	}
-
-	bytes const& callLowLevel(bytes const& _data, u256 const& _value)
-	{
-		sendMessage(_data, false, _value);
-		return m_output;
-	}
-
-	bytes const& callContractFunctionWithValueNoEncoding(std::string _sig, u256 const& _value, bytes const& _arguments)
-	{
-		sendMessage(util::selectorFromSignatureH32(_sig).asBytes() + _arguments, false, _value);
-		return m_output;
-	}
-
-	bytes const& callContractFunctionNoEncoding(std::string _sig, bytes const& _arguments)
-	{
-		return callContractFunctionWithValueNoEncoding(_sig, 0, _arguments);
-	}
-
-	template <class... Args>
-	bytes const& callContractFunctionWithValue(std::string _sig, u256 const& _value, Args const&... _arguments)
-	{
-		return callContractFunctionWithValueNoEncoding(_sig, _value, encodeArgs(_arguments...));
-	}
-
-	template <class... Args>
-	bytes const& callContractFunction(std::string _sig, Args const&... _arguments)
-	{
-		return callContractFunctionWithValue(_sig, 0, _arguments...);
-	}
-
-	template <class CppFunction, class... Args>
-	void testContractAgainstCpp(std::string _sig, CppFunction const& _cppFunction, Args const&... _arguments)
-	{
-		bytes contractResult = callContractFunction(_sig, _arguments...);
-		bytes cppResult = callCppAndEncodeResult(_cppFunction, _arguments...);
-		BOOST_CHECK_MESSAGE(
-			contractResult == cppResult,
-			"Computed values do not match.\nContract: " +
-				util::toHex(contractResult) +
-				"\nC++:      " +
-				util::toHex(cppResult)
-		);
-	}
-
-	template <class CppFunction, class... Args>
-	void testContractAgainstCppOnRange(std::string _sig, CppFunction const& _cppFunction, u256 const& _rangeStart, u256 const& _rangeEnd)
-	{
-		for (u256 argument = _rangeStart; argument < _rangeEnd; ++argument)
-		{
-			bytes contractResult = callContractFunction(_sig, argument);
-			bytes cppResult = callCppAndEncodeResult(_cppFunction, argument);
-			BOOST_CHECK_MESSAGE(
-				contractResult == cppResult,
-				"Computed values do not match.\nContract: " +
-					util::toHex(contractResult) +
-					"\nC++:      " +
-					util::toHex(cppResult) +
-					"\nArgument: " +
-					util::toHex(encode(argument))
-			);
-		}
-	}
-
-	static std::pair<bool, std::string> compareAndCreateMessage(bytes const& _result, bytes const& _expectation);
-
-	static bytes encode(bool _value) { return encode(uint8_t(_value)); }
-	static bytes encode(int _value) { return encode(u256(_value)); }
-	static bytes encode(size_t _value) { return encode(u256(_value)); }
-	static bytes encode(char const* _value) { return encode(std::string(_value)); }
-	static bytes encode(uint8_t _value) { return bytes(31, 0) + bytes{_value}; }
-	static bytes encode(u256 const& _value) { return toBigEndian(_value); }
-	/// @returns the fixed-point encoding of a rational number with a given
-	/// number of fractional bits.
-	static bytes encode(std::pair<rational, int> const& _valueAndPrecision)
-	{
-		rational const& value = _valueAndPrecision.first;
-		int fractionalBits = _valueAndPrecision.second;
-		return encode(u256((value.numerator() << fractionalBits) / value.denominator()));
-	}
-	static bytes encode(util::h256 const& _value) { return _value.asBytes(); }
-	static bytes encode(util::h160 const& _value) { return encode(util::h256(_value, util::h256::AlignRight)); }
-	static bytes encode(bytes const& _value, bool _padLeft = true)
-	{
-		bytes padding = bytes((32 - _value.size() % 32) % 32, 0);
-		return _padLeft ? padding + _value : _value + padding;
-	}
-	static bytes encode(std::string const& _value) { return encode(util::asBytes(_value), false); }
-	template <class T>
-	static bytes encode(std::vector<T> const& _value)
-	{
-		bytes ret;
-		for (auto const& v: _value)
-			ret += encode(v);
-		return ret;
-	}
-
-	template <class FirstArg, class... Args>
-	static bytes encodeArgs(FirstArg const& _firstArg, Args const&... _followingArgs)
-	{
-		return encode(_firstArg) + encodeArgs(_followingArgs...);
-	}
-	static bytes encodeArgs()
-	{
-		return bytes();
-	}
-	/// @returns error returndata corresponding to the Panic(uint256) error code,
-	/// if REVERT is supported by the current EVM version and the empty string otherwise.
-	bytes panicData(util::PanicCode _code);
-
-	//@todo might be extended in the future
-	template <class Arg>
-	static bytes encodeDyn(Arg const& _arg)
-	{
-		return encodeArgs(u256(0x20), u256(_arg.size()), _arg);
-	}
-
-	u256 gasLimit() const;
-	u256 gasPrice() const;
-	u256 blockHash(u256 const& _blockNumber) const;
-	u256 blockNumber() const;
-
-	template<typename Range>
-	static bytes encodeArray(bool _dynamicallySized, bool _dynamicallyEncoded, Range const& _elements)
-	{
-		bytes result;
-		if (_dynamicallySized)
-			result += encode(u256(_elements.size()));
-		if (_dynamicallyEncoded)
-		{
-			u256 offset = u256(_elements.size()) * 32;
-			std::vector<bytes> subEncodings;
-			for (auto const& element: _elements)
-			{
-				result += encode(offset);
-				subEncodings.emplace_back(encode(element));
-				offset += subEncodings.back().size();
-			}
-			for (auto const& subEncoding: subEncodings)
-				result += subEncoding;
-		}
-		else
-			for (auto const& element: _elements)
-				result += encode(element);
-		return result;
-	}
-
-	util::h160 setAccount(size_t _accountNumber)
-	{
-		m_sender = account(_accountNumber);
-		return m_sender;
-	}
-
-	size_t numLogs() const;
-	size_t numLogTopics(size_t _logIdx) const;
-	util::h256 logTopic(size_t _logIdx, size_t _topicIdx) const;
-	util::h160 logAddress(size_t _logIdx) const;
-	bytes logData(size_t _logIdx) const;
-
-private:
-	template <class CppFunction, class... Args>
-	auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
-	-> typename std::enable_if<std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
-	{
-		_cppFunction(_arguments...);
-		return bytes();
-	}
-	template <class CppFunction, class... Args>
-	auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
-	-> typename std::enable_if<!std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
-	{
-		return encode(_cppFunction(_arguments...));
-	}
-
-protected:
-	u256 const InitialGas = 100000000;
-
-	void selectVM(evmc_capabilities _cap = evmc_capabilities::EVMC_CAPABILITY_EVM1);
-	void reset();
-
-	void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0);
-	void sendEther(util::h160 const& _to, u256 const& _value);
-	size_t currentTimestamp();
-	size_t blockTimestamp(u256 _number);
-
-	/// @returns the (potentially newly created) _ith address.
-	util::h160 account(size_t _i);
-
-	u256 balanceAt(util::h160 const& _addr) const;
-	bool storageEmpty(util::h160 const& _addr) const;
-	bool addressHasCode(util::h160 const& _addr) const;
-
-	std::vector<frontend::test::LogRecord> recordedLogs() const;
-
-	langutil::EVMVersion m_evmVersion;
-	solidity::frontend::RevertStrings m_revertStrings = solidity::frontend::RevertStrings::Default;
-	solidity::frontend::OptimiserSettings m_optimiserSettings = solidity::frontend::OptimiserSettings::minimal();
-	bool m_showMessages = false;
-	std::unique_ptr<EVMHost> m_evmcHost;
-
-	std::vector<boost::filesystem::path> m_vmPaths;
-
-	bool m_transactionSuccessful = true;
-	util::h160 m_sender = account(0);
-	util::h160 m_contractAddress;
-	bytes m_output;
-	u256 m_gasUsed;
-};
-
-#define ABI_CHECK(result, expectation) do { \
-	auto abiCheckResult = ExecutionFramework::compareAndCreateMessage((result), (expectation)); \
-	BOOST_CHECK_MESSAGE(abiCheckResult.first, abiCheckResult.second); \
-} while (0)
-
-
-} // end namespaces
diff --git a/test/FilesystemUtils.cpp b/test/FilesystemUtils.cpp
deleted file mode 100644
index 7506d677ecfb..000000000000
--- a/test/FilesystemUtils.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/FilesystemUtils.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <fstream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::test;
-
-void solidity::test::createFilesWithParentDirs(set<boost::filesystem::path> const& _paths, string const& _content)
-{
-	for (boost::filesystem::path const& path: _paths)
-	{
-		if (!path.parent_path().empty())
-			boost::filesystem::create_directories(path.parent_path());
-
-		// Use binary mode to avoid line ending conversion on Windows.
-		ofstream newFile(path.string(), std::ofstream::binary);
-		newFile << _content;
-
-		if (newFile.fail() || !boost::filesystem::exists(path))
-			BOOST_THROW_EXCEPTION(runtime_error("Failed to create an empty file: \"" + path.string() + "\"."));
-	}
-}
-
-void solidity::test::createFileWithContent(boost::filesystem::path const& _path, string const& _content)
-{
-	if (boost::filesystem::is_regular_file(_path))
-		BOOST_THROW_EXCEPTION(runtime_error("File already exists: \"" + _path.string() + "\".")); \
-
-	// Use binary mode to avoid line ending conversion on Windows.
-	ofstream newFile(_path.string(), std::ofstream::binary);
-	if (newFile.fail() || !boost::filesystem::is_regular_file(_path))
-		BOOST_THROW_EXCEPTION(runtime_error("Failed to create a file: \"" + _path.string() + "\".")); \
-
-	newFile << _content;
-}
-
-bool solidity::test::createSymlinkIfSupportedByFilesystem(
-	boost::filesystem::path _targetPath,
-	boost::filesystem::path const& _linkName,
-	bool _directorySymlink
-)
-{
-	boost::system::error_code symlinkCreationError;
-
-	// NOTE: On Windows / works as a separator in a symlink target only if the target is absolute.
-	// Convert path separators to native ones to avoid this problem.
-	_targetPath.make_preferred();
-
-	if (_directorySymlink)
-		boost::filesystem::create_directory_symlink(_targetPath, _linkName, symlinkCreationError);
-	else
-		boost::filesystem::create_symlink(_targetPath, _linkName, symlinkCreationError);
-
-	if (!symlinkCreationError)
-		return true;
-	else if (
-		symlinkCreationError == boost::system::errc::not_supported ||
-		symlinkCreationError == boost::system::errc::operation_not_supported
-	)
-		return false;
-	else
-		BOOST_THROW_EXCEPTION(runtime_error(
-			"Failed to create a symbolic link: \"" + _linkName.string() + "\""
-			" -> " + _targetPath.string() + "\"."
-			" " + symlinkCreationError.message() + "."
-		));
-}
diff --git a/test/FilesystemUtils.h b/test/FilesystemUtils.h
deleted file mode 100644
index 731260505ddf..000000000000
--- a/test/FilesystemUtils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Helpers for common filesystem operations used in multiple tests.
- */
-
-#pragma once
-
-#include <boost/filesystem.hpp>
-
-#include <set>
-#include <string>
-
-namespace solidity::test
-{
-
-/// Creates all the specified files and fills them with the specifiedcontent. Creates their parent
-/// directories if they do not exist. Throws an exception if any part of the operation does not succeed.
-void createFilesWithParentDirs(std::set<boost::filesystem::path> const& _paths, std::string const& _content = "");
-
-/// Creates a file with the exact content specified in the second argument.
-/// Throws an exception if the file already exists or if the parent directory of the file does not.
-void createFileWithContent(boost::filesystem::path const& _path, std::string const& _content);
-
-/// Creates a symlink between two paths.
-/// The target does not have to exist.
-/// If @p directorySymlink is true, indicate to the operating system that this is a directory
-/// symlink. On some systems (e.g. Windows) it's possible to create a non-directory symlink pointing
-/// at a directory, which makes such a symlinks unusable.
-/// @returns true if the symlink has been successfully created, false if the filesystem does not
-/// support symlinks.
-/// Throws an exception of the operation fails for a different reason.
-bool createSymlinkIfSupportedByFilesystem(
-	boost::filesystem::path _targetPath,
-	boost::filesystem::path const& _linkName,
-	bool _directorySymlink
-);
-
-}
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
deleted file mode 100644
index 5021d801b3ce..000000000000
--- a/test/InteractiveTests.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-#include <test/libsolidity/ABIJsonTest.h>
-#include <test/libsolidity/ASTJSONTest.h>
-#include <test/libsolidity/ASTPropertyTest.h>
-#include <test/libsolidity/GasTest.h>
-#include <test/libsolidity/MemoryGuardTest.h>
-#include <test/libsolidity/NatspecJSONTest.h>
-#include <test/libsolidity/SyntaxTest.h>
-#include <test/libsolidity/SemanticTest.h>
-#include <test/libsolidity/SMTCheckerTest.h>
-#include <test/libyul/ControlFlowGraphTest.h>
-#include <test/libyul/EVMCodeTransformTest.h>
-#include <test/libyul/YulOptimizerTest.h>
-#include <test/libyul/YulInterpreterTest.h>
-#include <test/libyul/ObjectCompilerTest.h>
-#include <test/libyul/ControlFlowSideEffectsTest.h>
-#include <test/libyul/FunctionSideEffects.h>
-#include <test/libyul/StackLayoutGeneratorTest.h>
-#include <test/libyul/StackShufflingTest.h>
-#include <test/libyul/SyntaxTest.h>
-
-#include <boost/filesystem.hpp>
-
-namespace solidity::frontend::test
-{
-
-/** Container for all information regarding a testsuite */
-struct Testsuite
-{
-	char const* title;
-	boost::filesystem::path const path;
-	boost::filesystem::path const subpath;
-	bool smt;
-	bool needsVM;
-	TestCase::TestCaseCreator testCaseCreator;
-	std::vector<std::string> labels{};
-};
-
-
-/// Array of testsuits that can be run interactively as well as automatically
-Testsuite const g_interactiveTestsuites[] = {
-/*
-	Title                   Path           Subpath                SMT   NeedsVM Creator function */
-	{"Yul Optimizer",          "libyul",      "yulOptimizerTests",     false, false, &yul::test::YulOptimizerTest::create},
-	{"Yul Interpreter",        "libyul",      "yulInterpreterTests",   false, false, &yul::test::YulInterpreterTest::create},
-	{"Yul Object Compiler",    "libyul",      "objectCompiler",        false, false, &yul::test::ObjectCompilerTest::create},
-	{"Yul Control Flow Graph", "libyul",      "yulControlFlowGraph",   false, false, &yul::test::ControlFlowGraphTest::create},
-	{"Yul Stack Layout",       "libyul",      "yulStackLayout",        false, false, &yul::test::StackLayoutGeneratorTest::create},
-	{"Yul Stack Shuffling",    "libyul",      "yulStackShuffling",     false, false, &yul::test::StackShufflingTest::create},
-	{"Control Flow Side Effects","libyul",    "controlFlowSideEffects",false, false, &yul::test::ControlFlowSideEffectsTest::create},
-	{"Function Side Effects",  "libyul",      "functionSideEffects",   false, false, &yul::test::FunctionSideEffects::create},
-	{"Yul Syntax",             "libyul",      "yulSyntaxTests",        false, false, &yul::test::SyntaxTest::create},
-	{"EVM Code Transform",     "libyul",      "evmCodeTransform",      false, false, &yul::test::EVMCodeTransformTest::create, {"nooptions"}},
-	{"Syntax",                 "libsolidity", "syntaxTests",           false, false, &SyntaxTest::create},
-	{"Semantic",               "libsolidity", "semanticTests",         false, true,  &SemanticTest::create},
-	{"JSON AST",               "libsolidity", "ASTJSON",               false, false, &ASTJSONTest::create},
-	{"JSON ABI",               "libsolidity", "ABIJson",               false, false, &ABIJsonTest::create},
-	{"JSON Natspec",           "libsolidity", "natspecJSON",           false, false, &NatspecJSONTest::create},
-	{"SMT Checker",            "libsolidity", "smtCheckerTests",       true,  false, &SMTCheckerTest::create},
-	{"Gas Estimates",          "libsolidity", "gasTests",              false, false, &GasTest::create},
-	{"Memory Guard",           "libsolidity", "memoryGuardTests",      false, false, &MemoryGuardTest::create},
-	{"AST Properties",         "libsolidity", "astPropertyTests",      false, false, &ASTPropertyTest::create},
-};
-
-}
diff --git a/test/Metadata.cpp b/test/Metadata.cpp
deleted file mode 100644
index 88a1f7b42f08..000000000000
--- a/test/Metadata.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Metadata processing helpers.
- */
-
-#include <string>
-#include <iostream>
-#include <libsolutil/Assertions.h>
-#include <libsolutil/CommonData.h>
-#include <test/Metadata.h>
-
-using namespace std;
-
-namespace solidity::test
-{
-
-bytes onlyMetadata(bytes const& _bytecode)
-{
-	size_t size = _bytecode.size();
-	if (size < 5)
-		return bytes{};
-	size_t metadataSize = (static_cast<size_t>(_bytecode[size - 2]) << 8ul) + static_cast<size_t>(_bytecode[size - 1]);
-	if (size < (metadataSize + 2))
-		return bytes{};
-	// Sanity check: assume the first byte is a fixed-size CBOR array with 1, 2 or 3 entries
-	unsigned char firstByte = _bytecode[size - metadataSize - 2];
-	if (firstByte != 0xa1 && firstByte != 0xa2 && firstByte != 0xa3)
-		return bytes{};
-	return bytes(_bytecode.end() - static_cast<ptrdiff_t>(metadataSize) - 2, _bytecode.end() - 2);
-}
-
-bytes bytecodeSansMetadata(bytes const& _bytecode)
-{
-	size_t metadataSize = onlyMetadata(_bytecode).size();
-	if (metadataSize == 0)
-		return bytes{};
-	return bytes(_bytecode.begin(), _bytecode.end() - static_cast<ptrdiff_t>(metadataSize) - 2);
-}
-
-string bytecodeSansMetadata(string const& _bytecode)
-{
-	return util::toHex(bytecodeSansMetadata(fromHex(_bytecode, util::WhenError::Throw)));
-}
-
-DEV_SIMPLE_EXCEPTION(CBORException);
-
-class TinyCBORParser
-{
-public:
-	explicit TinyCBORParser(bytes const& _metadata): m_pos(0), m_metadata(_metadata)
-	{
-		assertThrow((m_pos + 1) < _metadata.size(), CBORException, "Input too short.");
-	}
-	unsigned mapItemCount()
-	{
-		assertThrow(nextType() == MajorType::Map, CBORException, "Fixed-length map expected.");
-		return readLength();
-	}
-	string readKey()
-	{
-		return readString();
-	}
-	string readValue()
-	{
-		switch(nextType())
-		{
-			case MajorType::ByteString:
-				return util::toHex(readBytes(readLength()));
-			case MajorType::TextString:
-				return readString();
-			case MajorType::SimpleData:
-			{
-				unsigned value = nextImmediate();
-				m_pos++;
-				if (value == 20)
-					return "false";
-				else if (value == 21)
-					return "true";
-				else
-				{
-					assertThrow(false, CBORException, "Unsupported simple value (not a boolean).");
-					return ""; // unreachable, but prevents compiler warning.
-				}
-			}
-			default:
-				assertThrow(false, CBORException, "Unsupported value type.");
-		}
-	}
-private:
-	enum class MajorType
-	{
-		ByteString,
-		TextString,
-		Map,
-		SimpleData
-	};
-	MajorType nextType() const
-	{
-		unsigned value = (m_metadata.at(m_pos) >> 5) & 0x7;
-		switch (value)
-		{
-			case 2: return MajorType::ByteString;
-			case 3: return MajorType::TextString;
-			case 5: return MajorType::Map;
-			case 7: return MajorType::SimpleData;
-			default: assertThrow(false, CBORException, "Unsupported major type.");
-		}
-	}
-	unsigned nextImmediate() const { return m_metadata.at(m_pos) & 0x1f; }
-	unsigned readLength()
-	{
-		unsigned length = m_metadata.at(m_pos++) & 0x1f;
-		if (length < 24)
-			return length;
-		if (length == 24)
-			return m_metadata.at(m_pos++);
-		// Unsupported length kind. (Only by this parser.)
-		assertThrow(false, CBORException, string("Unsupported length ") + to_string(length));
-	}
-	bytes readBytes(unsigned length)
-	{
-		bytes ret{m_metadata.begin() + static_cast<int>(m_pos), m_metadata.begin() + static_cast<int>(m_pos + length)};
-		m_pos += length;
-		return ret;
-	}
-	string readString()
-	{
-		// Expect a text string.
-		assertThrow(nextType() == MajorType::TextString, CBORException, "String expected.");
-		bytes tmp{readBytes(readLength())};
-		return string{tmp.begin(), tmp.end()};
-	}
-	unsigned m_pos;
-	bytes const& m_metadata;
-};
-
-std::optional<map<string, string>> parseCBORMetadata(bytes const& _metadata)
-{
-	try
-	{
-		TinyCBORParser parser(_metadata);
-		map<string, string> ret;
-		unsigned count = parser.mapItemCount();
-		for (unsigned i = 0; i < count; i++)
-		{
-			string key = parser.readKey();
-			string value = parser.readValue();
-			ret[std::move(key)] = std::move(value);
-		}
-		return ret;
-	}
-	catch (CBORException const&)
-	{
-		return {};
-	}
-}
-
-bool isValidMetadata(string const& _serialisedMetadata)
-{
-	Json::Value metadata;
-	if (!util::jsonParseStrict(_serialisedMetadata, metadata))
-		return false;
-
-	return isValidMetadata(metadata);
-}
-
-bool isValidMetadata(Json::Value const& _metadata)
-{
-	if (
-		!_metadata.isObject() ||
-		!_metadata.isMember("version") ||
-		!_metadata.isMember("language") ||
-		!_metadata.isMember("compiler") ||
-		!_metadata.isMember("settings") ||
-		!_metadata.isMember("sources") ||
-		!_metadata.isMember("output") ||
-		!_metadata["settings"].isMember("evmVersion") ||
-		!_metadata["settings"].isMember("metadata") ||
-		!_metadata["settings"]["metadata"].isMember("bytecodeHash")
-	)
-		return false;
-
-	if (!_metadata["version"].isNumeric() || _metadata["version"] != 1)
-		return false;
-
-	if (!_metadata["language"].isString() || _metadata["language"].asString() != "Solidity")
-		return false;
-
-	/// @TODO add more strict checks
-
-	return true;
-}
-
-} // end namespaces
diff --git a/test/Metadata.h b/test/Metadata.h
deleted file mode 100644
index 86b43e245f18..000000000000
--- a/test/Metadata.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Metadata processing helpers.
- */
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/JSON.h>
-
-#include <map>
-#include <optional>
-#include <string>
-
-namespace solidity::test
-{
-
-/// Returns only the CBOR metadata.
-bytes onlyMetadata(bytes const& _bytecode);
-
-/// Returns the bytecode with the metadata hash stripped out.
-bytes bytecodeSansMetadata(bytes const& _bytecode);
-
-/// Returns the bytecode with the metadata hash stripped out.
-/// Throws exception on invalid hex string.
-std::string bytecodeSansMetadata(std::string const& _bytecode);
-
-/// Parse CBOR metadata into a map. Expects the input CBOR to be a
-/// fixed length map, with each key being a string. The values
-/// are parsed as follows:
-/// - strings into strings
-/// - bytes into hex strings
-/// - booleans into "true"/"false" strings
-/// - everything else is invalid
-std::optional<std::map<std::string, std::string>> parseCBORMetadata(bytes const& _metadata);
-
-/// Expects a serialised metadata JSON and returns true if the content is valid metadata.
-bool isValidMetadata(std::string const& _serialisedMetadata);
-
-/// Expects a deserialised metadata JSON and returns true if the content is valid metadata.
-bool isValidMetadata(Json::Value const& _metadata);
-
-} // end namespaces
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
deleted file mode 100644
index 51608bd4a374..000000000000
--- a/test/TestCase.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/Common.h>
-#include <test/TestCase.h>
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <iostream>
-#include <stdexcept>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity::util;
-
-void TestCase::printSettings(ostream& _stream, const string& _linePrefix, const bool)
-{
-	auto& settings = m_reader.settings();
-	if (settings.empty())
-		return;
-
-	_stream << _linePrefix << "// ====" << endl;
-	for (auto const& setting: settings)
-		_stream << _linePrefix << "// " << setting.first << ": " << setting.second << endl;
-}
-
-void TestCase::printUpdatedSettings(std::ostream& _stream, std::string const& _linePrefix)
-{
-	printSettings(_stream, _linePrefix);
-}
-
-bool TestCase::isTestFilename(boost::filesystem::path const& _filename)
-{
-	string extension = _filename.extension().string();
-	return (extension == ".sol" || extension == ".yul" || extension == ".stack") &&
-		   !boost::starts_with(_filename.string(), "~") &&
-			!boost::starts_with(_filename.string(), ".");
-}
-
-bool TestCase::shouldRun()
-{
-	m_reader.ensureAllSettingsRead();
-	return m_shouldRun;
-}
-
-void TestCase::expect(string::iterator& _it, string::iterator _end, string::value_type _c)
-{
-	if (_it == _end || *_it != _c)
-		BOOST_THROW_EXCEPTION(runtime_error(string("Invalid test expectation. Expected: \"") + _c + "\"."));
-	++_it;
-}
-
-void TestCase::printSource(ostream& _stream, string const& _linePrefix, bool const) const
-{
-	printPrefixed(_stream, m_source, _linePrefix);
-}
-
-void TestCase::printUpdatedExpectations(ostream& _stream, string const& _linePrefix) const
-{
-	printPrefixed(_stream, m_obtainedResult, _linePrefix);
-}
-
-TestCase::TestResult TestCase::checkResult(std::ostream& _stream, const std::string& _linePrefix, bool const _formatted)
-{
-	if (m_expectation != m_obtainedResult)
-	{
-		string nextIndentLevel = _linePrefix + "  ";
-		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
-			<< _linePrefix << "Expected result:" << endl;
-		// TODO could compute a simple diff with highlighted lines
-		printPrefixed(_stream, m_expectation, nextIndentLevel);
-		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
-			<< _linePrefix << "Obtained result:" << endl;
-		printPrefixed(_stream, m_obtainedResult, nextIndentLevel);
-		return TestResult::Failure;
-	}
-	return TestResult::Success;
-}
-
-EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(string const& _filename):
-	TestCase(_filename)
-{
-	string versionString = m_reader.stringSetting("EVMVersion", "any");
-	if (versionString == "any")
-		return;
-
-	string comparator;
-	size_t versionBegin = 0;
-	for (auto character: versionString)
-		if (!isalpha(character, locale::classic()))
-		{
-			comparator += character;
-			versionBegin++;
-		}
-		else
-			break;
-
-	versionString = versionString.substr(versionBegin);
-	std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(versionString);
-	if (!version)
-		BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM version: \"" + versionString + "\""});
-
-	langutil::EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	bool comparisonResult;
-	if (comparator == ">")
-		comparisonResult = evmVersion > version;
-	else if (comparator == ">=")
-		comparisonResult = evmVersion >= version;
-	else if (comparator == "<")
-		comparisonResult = evmVersion < version;
-	else if (comparator == "<=")
-		comparisonResult = evmVersion <= version;
-	else if (comparator == "=")
-		comparisonResult = evmVersion == version;
-	else if (comparator == "!")
-		comparisonResult = !(evmVersion == version);
-	else
-		BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM comparator: \"" + comparator + "\""});
-
-	if (!comparisonResult)
-		m_shouldRun = false;
-}
diff --git a/test/TestCase.h b/test/TestCase.h
deleted file mode 100644
index 301dbfb658e4..000000000000
--- a/test/TestCase.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCaseReader.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <boost/filesystem.hpp>
-
-#include <string>
-
-namespace solidity::frontend::test
-{
-
-/**
- * Common superclass of anything that can be run via isoltest.
- */
-class TestCase
-{
-public:
-	struct Config
-	{
-		std::string filename;
-		langutil::EVMVersion evmVersion;
-		std::optional<uint8_t> eofVersion;
-		std::vector<boost::filesystem::path> vmPaths;
-		bool enforceGasCost = false;
-		u256 enforceGasCostMinValue;
-	};
-
-	enum class TestResult { Success, Failure, FatalError };
-
-	using TestCaseCreator = std::unique_ptr<TestCase>(*)(Config const&);
-
-	virtual ~TestCase() = default;
-
-	/// Runs the test case.
-	/// Outputs error messages to @arg _stream. Each line of output is prefixed with @arg _linePrefix.
-	/// Optionally, color-coding can be enabled (if @arg _formatted is set to true).
-	/// @returns true, if the test case succeeds, false otherwise
-	virtual TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) = 0;
-
-	/// Outputs the test contract to @arg _stream.
-	/// Each line of output is prefixed with @arg _linePrefix.
-	/// If @arg _formatted is true, color-coding may be used to indicate
-	/// error locations in the contract, if applicable.
-	virtual void printSource(std::ostream &_stream, std::string const &_linePrefix = "", bool const _formatted = false) const;
-	/// Outputs settings.
-	virtual void printSettings(std::ostream &_stream, std::string const &_linePrefix = "", bool const _formatted = false);
-	/// Outputs updated settings
-	virtual void printUpdatedSettings(std::ostream& _stream, std::string const& _linePrefix = "");
-	/// Outputs test expectations to @arg _stream that match the actual results of the test.
-	/// Each line of output is prefixed with @arg _linePrefix.
-	virtual void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const;
-
-	static bool isTestFilename(boost::filesystem::path const& _filename);
-
-	/// Returns true, if the test case is supported in the current environment and false
-	/// otherwise which causes this test to be skipped.
-	/// This might check e.g. for restrictions on the EVM version.
-	/// The function throws an exception if there are unread settings.
-	bool shouldRun();
-
-protected:
-	// Used by ASTJSONTest, the only TestCase class with a custom parser of the test files.
-	TestCase() = default;
-
-	TestCase(std::string const& _filename): m_reader(_filename) {}
-
-	static void expect(std::string::iterator& _it, std::string::iterator _end, std::string::value_type _c);
-
-	template<typename IteratorType>
-	static void skipWhitespace(IteratorType& _it, IteratorType _end)
-	{
-		while (_it != _end && std::isspace<char>(*_it, std::locale::classic()))
-			++_it;
-	}
-
-	template<typename IteratorType>
-	static void skipSlashes(IteratorType& _it, IteratorType _end)
-	{
-		while (_it != _end && *_it == '/')
-			++_it;
-	}
-
-	TestCase::TestResult checkResult(std::ostream& _stream, const std::string& _linePrefix, bool const _formatted);
-
-	std::string m_source;
-	std::string m_obtainedResult;
-	std::string m_expectation;
-
-	TestCaseReader m_reader;
-	bool m_shouldRun = true;
-};
-
-class EVMVersionRestrictedTestCase: public TestCase
-{
-protected:
-	EVMVersionRestrictedTestCase(std::string const& _filename);
-};
-
-}
diff --git a/test/TestCaseReader.cpp b/test/TestCaseReader.cpp
deleted file mode 100644
index 7ad752ef816e..000000000000
--- a/test/TestCaseReader.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/TestCaseReader.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-
-using namespace std;
-using namespace solidity::frontend::test;
-
-namespace fs = boost::filesystem;
-
-TestCaseReader::TestCaseReader(string const& _filename): m_fileStream(_filename), m_fileName(_filename)
-{
-	if (!m_fileStream)
-		BOOST_THROW_EXCEPTION(runtime_error("Cannot open file: \"" + _filename + "\"."));
-	m_fileStream.exceptions(ios::badbit);
-
-	tie(m_sources, m_lineNumber) = parseSourcesAndSettingsWithLineNumber(m_fileStream);
-	m_unreadSettings = m_settings;
-}
-
-TestCaseReader::TestCaseReader(istringstream const& _str)
-{
-	tie(m_sources, m_lineNumber) = parseSourcesAndSettingsWithLineNumber(
-		static_cast<istream&>(const_cast<istringstream&>(_str))
-	);
-}
-
-string const& TestCaseReader::source() const
-{
-	if (m_sources.sources.size() != 1)
-		BOOST_THROW_EXCEPTION(runtime_error("Expected single source definition, but got multiple sources."));
-	return m_sources.sources.at(m_sources.mainSourceFile);
-}
-
-string TestCaseReader::simpleExpectations()
-{
-	return parseSimpleExpectations(m_fileStream);
-}
-
-bool TestCaseReader::boolSetting(std::string const& _name, bool _defaultValue)
-{
-	if (m_settings.count(_name) == 0)
-		return _defaultValue;
-
-	m_unreadSettings.erase(_name);
-	string value = m_settings.at(_name);
-	if (value == "false")
-		return false;
-	if (value == "true")
-		return true;
-
-	BOOST_THROW_EXCEPTION(runtime_error("Invalid Boolean value: " + value + "."));
-}
-
-size_t TestCaseReader::sizetSetting(std::string const& _name, size_t _defaultValue)
-{
-	if (m_settings.count(_name) == 0)
-		return _defaultValue;
-
-	m_unreadSettings.erase(_name);
-
-	static_assert(sizeof(unsigned long) <= sizeof(size_t));
-	return stoul(m_settings.at(_name));
-}
-
-string TestCaseReader::stringSetting(string const& _name, string const& _defaultValue)
-{
-	if (m_settings.count(_name) == 0)
-		return _defaultValue;
-
-	m_unreadSettings.erase(_name);
-	return m_settings.at(_name);
-}
-
-void TestCaseReader::ensureAllSettingsRead() const
-{
-	if (!m_unreadSettings.empty())
-		BOOST_THROW_EXCEPTION(runtime_error(
-			"Unknown setting(s): " +
-			util::joinHumanReadable(m_unreadSettings | ranges::views::keys)
-		));
-}
-
-pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(istream& _stream)
-{
-	map<string, string> sources;
-	map<string, boost::filesystem::path> externalSources;
-	string currentSourceName;
-	string currentSource;
-	string line;
-	size_t lineNumber = 1;
-	static string const externalSourceDelimiterStart("==== ExternalSource:");
-	static string const sourceDelimiterStart("==== Source:");
-	static string const sourceDelimiterEnd("====");
-	static string const comment("// ");
-	static string const settingsDelimiter("// ====");
-	static string const expectationsDelimiter("// ----");
-	bool sourcePart = true;
-	while (getline(_stream, line))
-	{
-		lineNumber++;
-
-		// Anything below the delimiter is left up to the test case to process in a custom way.
-		if (boost::algorithm::starts_with(line, expectationsDelimiter))
-			break;
-
-		if (boost::algorithm::starts_with(line, settingsDelimiter))
-			sourcePart = false;
-		else if (sourcePart)
-		{
-			if (boost::algorithm::starts_with(line, sourceDelimiterStart) && boost::algorithm::ends_with(line, sourceDelimiterEnd))
-			{
-				if (!(currentSourceName.empty() && currentSource.empty()))
-					sources[currentSourceName] = std::move(currentSource);
-				currentSource = {};
-				currentSourceName = boost::trim_copy(line.substr(
-					sourceDelimiterStart.size(),
-					line.size() - sourceDelimiterEnd.size() - sourceDelimiterStart.size()
-				));
-				if (sources.count(currentSourceName))
-					BOOST_THROW_EXCEPTION(runtime_error("Multiple definitions of test source \"" + currentSourceName + "\"."));
-			}
-			else if (boost::algorithm::starts_with(line, externalSourceDelimiterStart) && boost::algorithm::ends_with(line, sourceDelimiterEnd))
-			{
-				string externalSourceString = boost::trim_copy(line.substr(
-					externalSourceDelimiterStart.size(),
-					line.size() - sourceDelimiterEnd.size() - externalSourceDelimiterStart.size()
-				));
-
-				string externalSourceName;
-				size_t remappingPos = externalSourceString.find('=');
-				// Does the external source define a remapping?
-				if (remappingPos != string::npos)
-				{
-					externalSourceName = boost::trim_copy(externalSourceString.substr(0, remappingPos));
-					externalSourceString = boost::trim_copy(externalSourceString.substr(remappingPos + 1));
-				}
-				else
-					externalSourceName = externalSourceString;
-
-				soltestAssert(!externalSourceName.empty(), "");
-				fs::path externalSourceTarget(externalSourceString);
-				fs::path testCaseParentDir = m_fileName.parent_path();
-				if (!externalSourceTarget.is_relative() || !externalSourceTarget.root_path().empty())
-					// NOTE: UNC paths (ones starting with // or \\) are considered relative by Boost
-					// since they have an empty root directory (but non-empty root name).
-					BOOST_THROW_EXCEPTION(runtime_error("External Source paths need to be relative to the location of the test case."));
-				fs::path externalSourceFullPath = testCaseParentDir / externalSourceTarget;
-				string externalSourceContent;
-				if (!fs::exists(externalSourceFullPath))
-					BOOST_THROW_EXCEPTION(runtime_error("External Source '" + externalSourceTarget.string() + "' not found."));
-				else
-					externalSourceContent = util::readFileAsString(externalSourceFullPath);
-
-				if (sources.count(externalSourceName))
-					BOOST_THROW_EXCEPTION(runtime_error("Multiple definitions of test source \"" + externalSourceName + "\"."));
-				sources[externalSourceName] = externalSourceContent;
-				externalSources[externalSourceName] = externalSourceTarget;
-			}
-			else
-				currentSource += line + "\n";
-		}
-		else if (boost::algorithm::starts_with(line, comment))
-		{
-			size_t colon = line.find(':');
-			if (colon == string::npos)
-				BOOST_THROW_EXCEPTION(runtime_error(string("Expected \":\" inside setting.")));
-			string key = line.substr(comment.size(), colon - comment.size());
-			string value = line.substr(colon + 1);
-			boost::algorithm::trim(key);
-			boost::algorithm::trim(value);
-			m_settings[key] = value;
-		}
-		else
-			BOOST_THROW_EXCEPTION(runtime_error(string("Expected \"//\" or \"// ---\" to terminate settings and source.")));
-	}
-	// Register the last source as the main one
-	sources[currentSourceName] = currentSource;
-	return {{std::move(sources), std::move(externalSources), std::move(currentSourceName)}, lineNumber};
-}
-
-string TestCaseReader::parseSimpleExpectations(istream& _file)
-{
-	string result;
-	string line;
-	while (getline(_file, line))
-		if (boost::algorithm::starts_with(line, "// "))
-			result += line.substr(3) + "\n";
-		else if (line == "//")
-			result += "\n";
-		else
-			BOOST_THROW_EXCEPTION(runtime_error("Test expectations must start with \"// \"."));
-	return result;
-}
diff --git a/test/TestCaseReader.h b/test/TestCaseReader.h
deleted file mode 100644
index d1ef95be3c2c..000000000000
--- a/test/TestCaseReader.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/StringUtils.h>
-
-#include <range/v3/view/map.hpp>
-
-#include <boost/filesystem.hpp>
-#include <boost/throw_exception.hpp>
-
-#include <fstream>
-#include <map>
-#include <string>
-
-namespace solidity::frontend::test
-{
-
-/**
- * A map for registering source names that also contains the main source name in a test case.
- */
-struct SourceMap
-{
-	std::map<std::string, std::string> sources;
-	std::map<std::string, boost::filesystem::path> externalSources;
-	std::string mainSourceFile;
-};
-
-/**
- * A reader for test case data file, which parses source, settings and (optionally) simple expectations.
- */
-class TestCaseReader
-{
-public:
-	TestCaseReader() = default;
-	explicit TestCaseReader(std::string const& _filename);
-	explicit TestCaseReader(std::istringstream const& _testCode);
-
-	SourceMap const& sources() const { return m_sources; }
-	std::string const& source() const;
-	std::size_t lineNumber() const { return m_lineNumber; }
-	std::map<std::string, std::string> const& settings() const { return m_settings; }
-	std::ifstream& stream() { return m_fileStream; }
-
-	std::string simpleExpectations();
-
-	bool boolSetting(std::string const& _name, bool _defaultValue);
-	size_t sizetSetting(std::string const& _name, size_t _defaultValue);
-	std::string stringSetting(std::string const& _name, std::string const& _defaultValue);
-
-	template <typename E>
-	E enumSetting(std::string const& _name, std::map<std::string, E> const& _choices, std::string const& _defaultChoice);
-
-	void ensureAllSettingsRead() const;
-
-private:
-	std::pair<SourceMap, std::size_t> parseSourcesAndSettingsWithLineNumber(std::istream& _file);
-	static std::string parseSimpleExpectations(std::istream& _file);
-
-	std::ifstream m_fileStream;
-	boost::filesystem::path m_fileName;
-	SourceMap m_sources;
-	std::size_t m_lineNumber = 0;
-	std::map<std::string, std::string> m_settings;
-	std::map<std::string, std::string> m_unreadSettings; ///< tracks which settings are left unread
-};
-
-template <typename E>
-E TestCaseReader::enumSetting(std::string const& _name, std::map<std::string, E> const& _choices, std::string const& _defaultChoice)
-{
-	soltestAssert(_choices.count(_defaultChoice) > 0, "");
-
-	std::string value = stringSetting(_name, _defaultChoice);
-
-	if (_choices.count(value) == 0)
-		BOOST_THROW_EXCEPTION(std::runtime_error(
-			"Invalid Enum value: " + value + ". Available choices: " + util::joinHumanReadable(_choices | ranges::views::keys) + "."
-		));
-
-	return _choices.at(value);
-}
-
-}
diff --git a/test/benchmarks/OptimizorClub.sol b/test/benchmarks/OptimizorClub.sol
deleted file mode 100644
index c21d42e65fae..000000000000
--- a/test/benchmarks/OptimizorClub.sol
+++ /dev/null
@@ -1,782 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-// Compressed form of https://github.com/OptimizorClub/optimizor and its dependencies
-
-library Base64 {
-    bytes private constant TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    function encode(bytes memory data) internal pure returns (string memory result) {
-        uint256 len = data.length;
-        if (len == 0) return "";
-        uint256 encodedLen;
-        unchecked {
-            encodedLen = 4 * ((len + 2) / 3);
-        }
-        unchecked {
-            result = new string(encodedLen + 32);
-        }
-        bytes memory table = TABLE;
-        assembly ("memory-safe") {
-            let tablePtr := add(table, 1)
-            let resultPtr := add(result, 32)
-            for { let i := 0 } lt(i, len) {} {
-                i := add(i, 3)
-                let input := and(mload(add(data, i)), 0xffffff)
-                let out := mload(add(tablePtr, and(shr(18, input), 0x3F)))
-                out := shl(8, out)
-                out := add(out, and(mload(add(tablePtr, and(shr(12, input), 0x3F))), 0xFF))
-                out := shl(8, out)
-                out := add(out, and(mload(add(tablePtr, and(shr(6, input), 0x3F))), 0xFF))
-                out := shl(8, out)
-                out := add(out, and(mload(add(tablePtr, and(input, 0x3F))), 0xFF))
-                out := shl(224, out)
-                mstore(resultPtr, out)
-                resultPtr := add(resultPtr, 4)
-            }
-            switch mod(len, 3)
-            case 1 { mstore(sub(resultPtr, 2), shl(240, 0x3d3d)) }
-            case 2 { mstore(sub(resultPtr, 1), shl(248, 0x3d)) }
-            mstore(result, encodedLen)
-        }
-        return result;
-    }
-}
-library Puretea {
-    function isMutating(bytes memory code) internal pure returns (bool) {
-        return check(code, 0xe43f0000000000000000001fffffffffffffffff0fff01ffffff00013fff0fff);
-    }
-    function isView(bytes memory code) internal pure returns (bool) {
-        return check(code, 0x640800000000000000000000ffffffffffffffff0fdf01ffffff00013fff0fff);
-    }
-    function isPureGlobal(bytes memory code) internal pure returns (bool) {
-        return check(code, 0x600800000000000000000000ffffffffffffffff0fdf01ff67ff00013fff0fff);
-    }
-    function isPureLocal(bytes memory code) internal pure returns (bool) {
-        return check(code, 0x600800000000000000000000ffffffffffffffff0fcf01ffffff00013fff0fff);
-    }
-    function check(bytes memory _code, uint256 _mask) internal pure returns (bool satisfied) {
-        assembly ("memory-safe") {
-            function matchesMask(mask, opcode) -> ret {
-                ret := and(mask, shl(opcode, 1))
-            }
-            function isPush(opcode) -> ret {
-                ret := and(gt(opcode, 0x5f), lt(opcode, 0x80))
-            }
-            function perform(mask, code) -> ret {
-                for {
-                    let offset := add(code, 32)
-                    let end := add(offset, mload(code ))
-                } lt(offset, end) {
-                    offset := add(offset, 1)
-                } {
-                    let opcode := byte(0, mload(offset))
-                    if iszero(matchesMask(mask, opcode)) {
-                        leave
-                    }
-                    if isPush(opcode) {
-                        let immLen := sub(opcode, 0x5f)
-                        offset := add(offset, immLen)
-                        if iszero(lt(offset, end)) {
-                            leave
-                        }
-                    }
-                }
-                ret := 1
-            }
-            satisfied := perform(_mask, _code)
-        }
-    }
-}
-abstract contract PurityChecker {
-    uint256 private constant acceptedOpcodesMask = 0x600800000000000000000000ffffffffffffffff0fdf01ff67ff00013fff0fff;
-    function check(address account) external view returns (bool) {
-        return Puretea.check(account.code, acceptedOpcodesMask);
-    }
-}
-interface IChallenge {
-    function run(address target, uint256 seed) external view returns (uint32);
-    function svg(uint256 tokenId) external view returns (string memory);
-    function name() external view returns (string memory);
-    function description() external view returns (string memory);
-}
-struct TokenDetails {
-    uint256 challengeId;
-    IChallenge challenge;
-    uint32 leaderGas;
-    uint32 leaderSolutionId;
-    address leaderSolver;
-    address leaderOwner;
-    address leaderSubmission;
-    uint32 gas;
-    uint32 solutionId;
-    uint32 rank;
-    uint32 improvementPercentage;
-    address solver;
-    address owner;
-    address submission;
-}
-library HexString {
-    error HexLengthInsufficient();
-    bytes16 private constant ALPHABET = "0123456789abcdef";
-    function toHexStringNoPrefix(uint256 value, uint256 length) internal pure returns (string memory) {
-        bytes memory buffer = new bytes(2 * length);
-        unchecked {
-            for (uint256 i = buffer.length; i > 0; --i) {
-                buffer[i - 1] = ALPHABET[value & 0xf];
-                value >>= 4;
-            }
-        }
-        if (value != 0) revert HexLengthInsufficient();
-        return string(buffer);
-    }
-    function toHexString(uint256 value, uint256 length) internal pure returns (string memory) {
-        bytes memory buffer = new bytes(2 * length + 2);
-        buffer[0] = "0";
-        buffer[1] = "x";
-        unchecked {
-            for (uint256 i = 2 * length + 1; i > 1; --i) {
-                buffer[i] = ALPHABET[value & 0xf];
-                value >>= 4;
-            }
-        }
-        if (value != 0) revert HexLengthInsufficient();
-        return string(buffer);
-    }
-}
-function packTokenId(uint256 challengeId, uint32 solutionId) pure returns (uint256) {
-    return (challengeId << 32) | solutionId;
-}
-function unpackTokenId(uint256 tokenId) pure returns (uint256 challengeId, uint32 solutionId) {
-    challengeId = tokenId >> 32;
-    solutionId = uint32(tokenId);
-}
-library NFTSVG {
-    struct SVGParams {
-        string projectName;
-        string challengeName;
-        string solverAddr;
-        string challengeAddr;
-        uint256 gasUsed;
-        uint256 gasOpti;
-        uint256 tokenId;
-        uint32 rank;
-        uint32 participants;
-        string color;
-        uint256 x1;
-        uint256 y1;
-        uint256 x2;
-        uint256 y2;
-        uint256 x3;
-        uint256 y3;
-    }
-    function generateSVG(SVGParams memory params, string memory challengeSVG)
-        internal
-        pure
-        returns (string memory svg)
-    {
-        return string.concat(
-            generateSVGDefs(params),
-            generateSVGBorderText(params.projectName, params.challengeName, params.solverAddr, params.challengeAddr),
-            generateSVGCardMantle(params.challengeName, params.rank, params.participants),
-            generateRankBorder(params.rank),
-            generateSvgCurve(challengeSVG),
-            generateSVGPositionDataAndLocationCurve(LibString.toString(params.tokenId), params.gasUsed, params.gasOpti),
-            generateOptimizorIcon(),
-            "</svg>"
-        );
-    }
-    function generateSVGDefs(SVGParams memory params) private pure returns (string memory svg) {
-        svg = string.concat(
-            '<svg width="290" height="500" viewBox="0 0 290 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">'
-            "<defs>"
-            '<filter id="icon"><feImage result="icon" xlink:href="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTY2LjU5NyIgaGVpZ2h0PSIxMjguOTQxIiB2aWV3Qm94PSIwIDAgNDQuMDc5IDM0LjExNiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMjAuNzkzIDEzLjMyMWgtLjYyM1YxMi43aC02LjIyNXYuNjIyaC42MjJ2LjYyM2gtLjYyMnYuNjIyaC0uNjIzdi0uNjIySDEyLjd2Ni4yMjVoLjYyMnYuNjIzaC42MjN2LjYyMmg2LjIyNXYtLjYyMmguNjIzdi0uNjIzaC42MjJ2LTYuMjI1aC0uNjIyem0tMy43MzUgNS42MDN2LTQuMzU4aDEuODY3djQuMzU4em0xMy42OTgtNi4yMjVoLTYuODQ4di42MjJoLjYyM3YuNjIzaC0uNjIzdi42MjJoLS42MjJ2LS42MjJoLS42MjN2Ni4yMjVoLjYyM3YuNjIzaC42MjJ2LjYyMmg2Ljg0OHYtLjYyMmguNjIydi0xLjI0NWgtLjYyMnYtLjYyM0gyNy4wMnYtNC4zNThoMy43MzV2LS42MjJoLjYyMnYtLjYyM2gtLjYyMnoiIHN0eWxlPSJmaWxsOiM2NjYiLz48L3N2Zz4="/></filter>'
-            '<filter id="f1"><feImage result="p0" xlink:href="data:image/svg+xml;base64,',
-            Base64.encode(
-                bytes(
-                    string.concat(
-                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><rect width='290' height='500' fill='#",
-                        params.color,
-                        "'/></svg>"
-                    )
-                )
-            ),
-            '"/><feImage result="p1" xlink:href="data:image/svg+xml;base64,',
-            Base64.encode(
-                bytes(
-                    string.concat(
-                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><circle cx='",
-                        LibString.toString(params.x1),
-                        "' cy='",
-                        LibString.toString(params.y1),
-                        "' r='120' fill='#",
-                        params.color,
-                        "'/></svg>"
-                    )
-                )
-            ),
-            '"/><feImage result="p2" xlink:href="data:image/svg+xml;base64,',
-            Base64.encode(
-                bytes(
-                    string.concat(
-                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><circle cx='",
-                        LibString.toString(params.x2),
-                        "' cy='",
-                        LibString.toString(params.y2),
-                        "' r='120' fill='#",
-                        params.color,
-                        "'/></svg>"
-                    )
-                )
-            ),
-            '" />',
-            '<feImage result="p3" xlink:href="data:image/svg+xml;base64,',
-            Base64.encode(
-                bytes(
-                    string.concat(
-                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><circle cx='",
-                        LibString.toString(params.x3),
-                        "' cy='",
-                        LibString.toString(params.y3),
-                        "' r='100' fill='#",
-                        params.color,
-                        "'/></svg>"
-                    )
-                )
-            ),
-            '"/><feBlend mode="overlay" in="p0" in2="p1"/><feBlend mode="exclusion" in2="p2"/><feBlend mode="overlay" in2="p3" result="blendOut"/><feGaussianBlur '
-            'in="blendOut" stdDeviation="42"/></filter><clipPath id="corners"><rect width="290" height="500" rx="42" ry="42"/></clipPath>'
-            '<path id="text-path-a" d="M40 12 H250 A28 28 0 0 1 278 40 V460 A28 28 0 0 1 250 488 H40 A28 28 0 0 1 12 460 V40 A28 28 0 0 1 40 12 z"/>'
-            '<path id="minimap" d="M234 444C234 457.949 242.21 463 253 463"/>'
-            '<filter id="top-region-blur"><feGaussianBlur in="SourceGraphic" stdDeviation="24"/></filter>'
-            '<linearGradient id="grad-up" x1="1" x2="0" y1="1" y2="0"><stop offset="0.0" stop-color="#fff" stop-opacity="1"/>'
-            '<stop offset=".9" stop-color="#fff" stop-opacity="0"/></linearGradient>'
-            '<linearGradient id="grad-down" x1="0" x2="1" y1="0" y2="1"><stop offset="0.0" stop-color="#fff" stop-opacity="1"/><stop offset="0.9" stop-color="#fff" stop-opacity="0"/></linearGradient>'
-            '<mask id="fade-up" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="url(#grad-up)"/></mask>'
-            '<mask id="fade-down" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="url(#grad-down)"/></mask>'
-            '<mask id="none" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="#fff"/></mask>'
-            '<linearGradient id="grad-symbol"><stop offset="0.7" stop-color="#fff" stop-opacity="1"/><stop offset=".95" stop-color="#fff" stop-opacity="0"/></linearGradient>'
-            '<mask id="fade-symbol" maskContentUnits="userSpaceOnUse"><rect width="290" height="200" fill="url(#grad-symbol)"/></mask></defs>'
-            '<g clip-path="url(#corners)">' '<rect fill="',
-            params.color,
-            '" x="0" y="0" width="290" height="500"/>'
-            '<rect style="filter: url(#f1)" x="0" y="0" width="290" height="500"/>'
-            '<g style="filter:url(#top-region-blur); transform:scale(1.5); transform-origin:center top;">'
-            '<rect fill="none" x="0" y="0" width="290" height="500"/>'
-            '<ellipse cx="50%" cy="0" rx="180" ry="120" fill="#000" opacity="0.85"/></g>'
-            '<rect x="0" y="0" width="290" height="500" rx="42" ry="42" fill="rgba(0,0,0,0)" stroke="rgba(255,255,255,0.2)"/></g>'
-        );
-    }
-    function generateSVGBorderText(
-        string memory projectName,
-        string memory challengeName,
-        string memory solverAddr,
-        string memory challengeAddr
-    ) private pure returns (string memory svg) {
-        svg = string.concat(
-            '<text text-rendering="optimizeSpeed">'
-            '<textPath startOffset="-100%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
-            challengeName,
-            unicode" • ",
-            challengeAddr,
-            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s" repeatCount="indefinite"/>'
-            '</textPath> <textPath startOffset="0%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
-            challengeName,
-            unicode" • ",
-            challengeAddr,
-            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s" repeatCount="indefinite"/></textPath>'
-            '<textPath startOffset="50%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
-            projectName,
-            unicode" • ",
-            solverAddr,
-            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s"'
-            ' repeatCount="indefinite"/></textPath><textPath startOffset="-50%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
-            projectName,
-            unicode" • ",
-            solverAddr,
-            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s" repeatCount="indefinite"/></textPath></text>'
-        );
-    }
-    function generateSVGCardMantle(string memory challengeName, uint32 rank, uint32 participants)
-        private
-        pure
-        returns (string memory svg)
-    {
-        svg = string.concat(
-            '<g mask="url(#fade-symbol)"><rect fill="none" x="0" y="0" width="290" height="200"/><text y="70" x="32" fill="#fff" font-family="\'Courier New\', monospace" font-weight="200" font-size="28px">',
-            challengeName,
-            '</text><text y="115" x="32" fill="#fff" font-family="\'Courier New\', monospace" font-weight="200" font-size="20px">'
-            "Rank ",
-            LibString.toString(rank),
-            " of ",
-            LibString.toString(participants),
-            "</text></g>"
-        );
-    }
-    function generateRankBorder(uint32 rank) private pure returns (string memory svg) {
-        string memory color;
-        if (rank == 1) {
-            color = "rgba(255,215,0,1.0)";
-        } else if (rank == 2) {
-            color = "rgba(255,255,255,1.0)";
-        } else if (rank == 3) {
-            color = "rgba(205,127,50,1.0)";
-        } else {
-            color = "rgba(255,255,255,0.2)";
-        }
-        svg = string.concat(
-            '<rect x="16" y="16" width="258" height="468" rx="26" ry="26" fill="rgba(0,0,0,0)" stroke="', color, '"/>'
-        );
-    }
-    function generateSvgCurve(string memory challengeSVG) private pure returns (string memory svg) {
-        svg = string.concat('<g mask="url(#none)"', ' style="transform:translate(30px,130px)">', challengeSVG, "</g>");
-    }
-    function generateSVGPositionDataAndLocationCurve(string memory tokenId, uint256 gasUsed, uint256 gasOpti)
-        private
-        pure
-        returns (string memory svg)
-    {
-        string memory gasUsedStr = LibString.toString(gasUsed);
-        string memory gasOptiStr = LibString.toString(gasOpti);
-        uint256 str1length = bytes(tokenId).length + 4;
-        uint256 str2length = bytes(gasUsedStr).length + 10;
-        uint256 str3length = bytes(gasOptiStr).length + 14;
-        svg = string.concat(
-            '<g font-family="\'Courier New\', monospace" font-size="12" fill="#fff">'
-            '<g style="transform:translate(29px, 384px)">' '<rect width="',
-            LibString.toString(uint256(7 * (str1length + 4))),
-            string.concat('" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>' '<text x="12" y="17"><tspan fill="#999">ID: </tspan>'),
-            tokenId,
-            "</text></g>" '<g style="transform:translate(29px, 414px)">' '<rect width="',
-            LibString.toString(uint256(7 * (str2length + 4))),
-            '" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>'
-            '<text x="12" y="17"><tspan fill="#999">Gas used: </tspan>',
-            gasUsedStr,
-            "</text></g>" '<g style="transform:translate(29px, 444px)">' '<rect width="',
-            LibString.toString(uint256(7 * (str3length + 4))),
-            '" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>'
-            '<text x="12" y="17"><tspan fill="#999">Improvement: </tspan>',
-            gasOptiStr,
-            "%" "</text></g></g>"
-        );
-    }
-    function generateOptimizorIcon() private pure returns (string memory svg) {
-        return
-        '<g style="transform:translate(180px, 365px)"><rect style="filter: url(#icon)" x="0" y="0" width="83" height="64"/></g>';
-    }
-    function getCircleCoord(address tokenAddress, uint256 offset, uint256 tokenId) internal pure returns (uint8) {
-        unchecked {
-            return uint8((((uint256(uint160(tokenAddress)) >> offset) & 0xFF) * tokenId) % 255);
-        }
-    }
-}
-library LibString {
-    function toString(uint256 value) internal pure returns (string memory str) {
-        assembly {
-            let newFreeMemoryPointer := add(mload(0x40), 160)
-            mstore(0x40, newFreeMemoryPointer)
-            str := sub(newFreeMemoryPointer, 32)
-            mstore(str, 0)
-            let end := str
-            for { let temp := value } 1 {} {
-                str := sub(str, 1)
-                mstore8(str, add(48, mod(temp, 10)))
-                temp := div(temp, 10)
-                if iszero(temp) { break }
-            }
-            let length := sub(end, str)
-            str := sub(str, 32)
-            mstore(str, length)
-        }
-    }
-}
-abstract contract Owned {
-    event OwnershipTransferred(address indexed user, address indexed newOwner);
-    address public owner;
-    modifier onlyOwner() virtual {
-        require(msg.sender == owner, "UNAUTHORIZED");
-        _;
-    }
-    constructor(address _owner) {
-        owner = _owner;
-        emit OwnershipTransferred(address(0), _owner);
-    }
-    function transferOwnership(address newOwner) public virtual onlyOwner {
-        owner = newOwner;
-        emit OwnershipTransferred(msg.sender, newOwner);
-    }
-}
-abstract contract ERC721 {
-    event Transfer(address indexed from, address indexed to, uint256 indexed id);
-    event Approval(address indexed owner, address indexed spender, uint256 indexed id);
-    event ApprovalForAll(address indexed owner, address indexed operator, bool approved);
-    string public name;
-    string public symbol;
-    function tokenURI(uint256 id) public view virtual returns (string memory);
-    mapping(uint256 => address) internal _ownerOf;
-    mapping(address => uint256) internal _balanceOf;
-    function ownerOf(uint256 id) public view virtual returns (address owner) {
-        require((owner = _ownerOf[id]) != address(0), "NOT_MINTED");
-    }
-    function balanceOf(address owner) public view virtual returns (uint256) {
-        require(owner != address(0), "ZERO_ADDRESS");
-        return _balanceOf[owner];
-    }
-    mapping(uint256 => address) public getApproved;
-    mapping(address => mapping(address => bool)) public isApprovedForAll;
-    constructor(string memory _name, string memory _symbol) {
-        name = _name;
-        symbol = _symbol;
-    }
-    function approve(address spender, uint256 id) public virtual {
-        address owner = _ownerOf[id];
-        require(msg.sender == owner || isApprovedForAll[owner][msg.sender], "NOT_AUTHORIZED");
-        getApproved[id] = spender;
-        emit Approval(owner, spender, id);
-    }
-    function setApprovalForAll(address operator, bool approved) public virtual {
-        isApprovedForAll[msg.sender][operator] = approved;
-        emit ApprovalForAll(msg.sender, operator, approved);
-    }
-    function transferFrom(
-        address from,
-        address to,
-        uint256 id
-    ) public virtual {
-        require(from == _ownerOf[id], "WRONG_FROM");
-        require(to != address(0), "INVALID_RECIPIENT");
-        require(
-            msg.sender == from || isApprovedForAll[from][msg.sender] || msg.sender == getApproved[id],
-            "NOT_AUTHORIZED"
-        );
-        unchecked {
-            _balanceOf[from]--;
-            _balanceOf[to]++;
-        }
-        _ownerOf[id] = to;
-        delete getApproved[id];
-        emit Transfer(from, to, id);
-    }
-    function safeTransferFrom(
-        address from,
-        address to,
-        uint256 id
-    ) public virtual {
-        transferFrom(from, to, id);
-        require(
-            to.code.length == 0 ||
-                ERC721TokenReceiver(to).onERC721Received(msg.sender, from, id, "") ==
-                ERC721TokenReceiver.onERC721Received.selector,
-            "UNSAFE_RECIPIENT"
-        );
-    }
-    function safeTransferFrom(
-        address from,
-        address to,
-        uint256 id,
-        bytes calldata data
-    ) public virtual {
-        transferFrom(from, to, id);
-        require(
-            to.code.length == 0 ||
-                ERC721TokenReceiver(to).onERC721Received(msg.sender, from, id, data) ==
-                ERC721TokenReceiver.onERC721Received.selector,
-            "UNSAFE_RECIPIENT"
-        );
-    }
-    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
-        return
-            interfaceId == 0x01ffc9a7 ||
-            interfaceId == 0x80ac58cd ||
-            interfaceId == 0x5b5e139f;
-    }
-    function _mint(address to, uint256 id) internal virtual {
-        require(to != address(0), "INVALID_RECIPIENT");
-        require(_ownerOf[id] == address(0), "ALREADY_MINTED");
-        unchecked {
-            _balanceOf[to]++;
-        }
-        _ownerOf[id] = to;
-        emit Transfer(address(0), to, id);
-    }
-    function _burn(uint256 id) internal virtual {
-        address owner = _ownerOf[id];
-        require(owner != address(0), "NOT_MINTED");
-        unchecked {
-            _balanceOf[owner]--;
-        }
-        delete _ownerOf[id];
-        delete getApproved[id];
-        emit Transfer(owner, address(0), id);
-    }
-    function _safeMint(address to, uint256 id) internal virtual {
-        _mint(to, id);
-        require(
-            to.code.length == 0 ||
-                ERC721TokenReceiver(to).onERC721Received(msg.sender, address(0), id, "") ==
-                ERC721TokenReceiver.onERC721Received.selector,
-            "UNSAFE_RECIPIENT"
-        );
-    }
-    function _safeMint(
-        address to,
-        uint256 id,
-        bytes memory data
-    ) internal virtual {
-        _mint(to, id);
-        require(
-            to.code.length == 0 ||
-                ERC721TokenReceiver(to).onERC721Received(msg.sender, address(0), id, data) ==
-                ERC721TokenReceiver.onERC721Received.selector,
-            "UNSAFE_RECIPIENT"
-        );
-    }
-}
-abstract contract ERC721TokenReceiver {
-    function onERC721Received(
-        address,
-        address,
-        uint256,
-        bytes calldata
-    ) external virtual returns (bytes4) {
-        return ERC721TokenReceiver.onERC721Received.selector;
-    }
-}
-abstract contract OptimizorNFT is ERC721 {
-    error InvalidSolutionId(uint256 challengeId, uint32 solutionId);
-    error ChallengeNotFound(uint256 challengeId);
-    struct ChallengeInfo {
-        IChallenge target;
-        uint32 solutions;
-    }
-    struct ExtraDetails {
-        address code;
-        address solver;
-        uint32 gas;
-    }
-    mapping(uint256 => ChallengeInfo) public challenges;
-    mapping(uint256 => ExtraDetails) public extraDetails;
-    constructor() ERC721("Optimizor Club", "OC") {}
-    function contractURI() external pure returns (string memory) {
-        return
-        "data:application/json;base64,eyJuYW1lIjoiT3B0aW1pem9yIENsdWIiLCJkZXNjcmlwdGlvbiI6IlRoZSBPcHRpbWl6b3IgQ2x1YiBORlQgY29sbGVjdGlvbiByZXdhcmRzIGdhcyBlZmZpY2llbnQgcGVvcGxlIGFuZCBtYWNoaW5lcyBieSBtaW50aW5nIG5ldyBpdGVtcyB3aGVuZXZlciBhIGNoZWFwZXIgc29sdXRpb24gaXMgc3VibWl0dGVkIGZvciBhIGNlcnRhaW4gY2hhbGxlbmdlLiIsImltYWdlIjoiZGF0YTppbWFnZS9zdmcreG1sO2Jhc2U2NCxQSE4yWnlCM2FXUjBhRDBpTVRZMkxqVTVOeUlnYUdWcFoyaDBQU0l4TWpndU9UUXhJaUIyYVdWM1FtOTRQU0l3SURBZ05EUXVNRGM1SURNMExqRXhOaUlnZUcxc2JuTTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURBdmMzWm5JajQ4Y0dGMGFDQmtQU0pOTWpBdU56a3pJREV6TGpNeU1XZ3RMall5TTFZeE1pNDNhQzAyTGpJeU5YWXVOakl5YUM0Mk1qSjJMall5TTJndExqWXlNbll1TmpJeWFDMHVOakl6ZGkwdU5qSXlTREV5TGpkMk5pNHlNalZvTGpZeU1uWXVOakl6YUM0Mk1qTjJMall5TW1nMkxqSXlOWFl0TGpZeU1tZ3VOakl6ZGkwdU5qSXphQzQyTWpKMkxUWXVNakkxYUMwdU5qSXllbTB0TXk0M016VWdOUzQyTUROMkxUUXVNelU0YURFdU9EWTNkalF1TXpVNGVtMHhNeTQyT1RndE5pNHlNalZvTFRZdU9EUTRkaTQyTWpKb0xqWXlNM1l1TmpJemFDMHVOakl6ZGk0Mk1qSm9MUzQyTWpKMkxTNDJNakpvTFM0Mk1qTjJOaTR5TWpWb0xqWXlNM1l1TmpJemFDNDJNakoyTGpZeU1tZzJMamcwT0hZdExqWXlNbWd1TmpJeWRpMHhMakkwTldndExqWXlNbll0TGpZeU0wZ3lOeTR3TW5ZdE5DNHpOVGhvTXk0M016VjJMUzQyTWpKb0xqWXlNbll0TGpZeU0yZ3RMall5TW5vaUlITjBlV3hsUFNKbWFXeHNPaU0yTmpZaUx6NDhMM04yWno0PSIsImV4dGVybmFsX2xpbmsiOiJodHRwczovL29wdGltaXpvci5jbHViLyJ9";
-    }
-    function tokenDetails(uint256 tokenId) public view returns (TokenDetails memory) {
-        (uint256 challengeId, uint32 solutionId) = unpackTokenId(tokenId);
-        if (solutionId == 0) revert InvalidSolutionId(challengeId, solutionId);
-        ChallengeInfo storage chl = challenges[challengeId];
-        if (address(chl.target) == address(0)) revert ChallengeNotFound(challengeId);
-        if (solutionId > chl.solutions) revert InvalidSolutionId(challengeId, solutionId);
-        ExtraDetails storage details = extraDetails[tokenId];
-        uint256 leaderTokenId = packTokenId(challengeId, chl.solutions);
-        ExtraDetails storage leaderDetails = extraDetails[leaderTokenId];
-        uint32 leaderSolutionId = chl.solutions;
-        uint32 rank = leaderSolutionId - solutionId + 1;
-        uint32 percentage = 0;
-        if (solutionId > 1) {
-            ExtraDetails storage prevDetails = extraDetails[tokenId - 1];
-            percentage = (details.gas * 100) / prevDetails.gas;
-        }
-        return TokenDetails({
-            challengeId: challengeId,
-            challenge: chl.target,
-            leaderGas: leaderDetails.gas,
-            leaderSolutionId: leaderSolutionId,
-            leaderSolver: leaderDetails.solver,
-            leaderOwner: _ownerOf[leaderTokenId],
-            leaderSubmission: leaderDetails.code,
-            gas: details.gas,
-            solutionId: solutionId,
-            rank: rank,
-            improvementPercentage: percentage,
-            solver: details.solver,
-            owner: _ownerOf[tokenId],
-            submission: details.code
-        });
-    }
-    function tokenURI(uint256 tokenId) public view override returns (string memory) {
-        TokenDetails memory details = tokenDetails(tokenId);
-        string memory description = string.concat(details.challenge.description(), "\\n\\n", leaderboardString(tokenId));
-        return string.concat(
-            "data:application/json;base64,",
-            Base64.encode(
-                bytes(
-                    string.concat(
-                        '{"name":"Optimizor Club: ',
-                        details.challenge.name(),
-                        '","description":"',
-                        description,
-                        '","attributes":',
-                        attributesJSON(details),
-                        ',"image":"data:image/svg+xml;base64,',
-                        Base64.encode(bytes(svg(tokenId, details))),
-                        '"}'
-                    )
-                )
-            )
-        );
-    }
-    function leaderboard(uint256 tokenId) public view returns (address[] memory board) {
-        (uint256 challengeId,) = unpackTokenId(tokenId);
-        uint32 winners = challenges[challengeId].solutions;
-        board = new address[](winners);
-        unchecked {
-            for (uint32 i = 1; i <= winners; ++i) {
-                ExtraDetails storage details = extraDetails[packTokenId(challengeId, i)];
-                board[i - 1] = details.solver;
-            }
-        }
-    }
-    function leaderboardString(uint256 tokenId) private view returns (string memory) {
-        address[] memory leaders = leaderboard(tokenId);
-        string memory leadersStr = "";
-        uint256 lIdx = leaders.length;
-        unchecked {
-            for (uint256 i = 0; i < leaders.length; ++i) {
-                leadersStr = string.concat(
-                    "\\n",
-                    LibString.toString(lIdx),
-                    ". ",
-                    HexString.toHexString(uint256(uint160(leaders[i])), 20),
-                    leadersStr
-                );
-                --lIdx;
-            }
-        }
-        return string.concat("Leaderboard:\\n", leadersStr);
-    }
-    function attributesJSON(TokenDetails memory details) private view returns (string memory attributes) {
-        uint32 rank = details.rank;
-        attributes = string.concat(
-            '[{"trait_type":"Challenge","value":"',
-            details.challenge.name(),
-            '"},{"trait_type":"Gas used","value":',
-            LibString.toString(details.gas),
-            ',"display_type":"number"},{"trait_type":"Code size","value":',
-            LibString.toString(details.submission.code.length),
-            ',"display_type":"number"},{"trait_type":"Improvement percentage","value":"',
-            LibString.toString(details.improvementPercentage),
-            '%"},{"trait_type":"Solver","value":"',
-            HexString.toHexString(uint256(uint160(details.solver)), 20),
-            '"},{"trait_type":"Rank","value":',
-            LibString.toString(rank),
-            ',"display_type":"number"},{"trait_type":"Leader","value":"',
-            (rank == 1) ? "Yes" : "No",
-            '"},{"trait_type":"Top 3","value":"',
-            (rank <= 3) ? "Yes" : "No",
-            '"},{"trait_type":"Top 10","value":"',
-            (rank <= 10) ? "Yes" : "No",
-            '"}]'
-        );
-    }
-    function scale(uint8 value, uint256 minOut, uint256 maxOut) private pure returns (uint256) {
-        unchecked {
-            return ((uint256(value) * (maxOut - minOut)) / 255) + minOut;
-        }
-    }
-    function svg(uint256 tokenId, TokenDetails memory details) private view returns (string memory) {
-        uint256 gradRgb = 0;
-        if (details.rank > 10) {
-            gradRgb = 0xbebebe;
-        } else if (details.rank > 3) {
-            uint256 fRank;
-            uint256 init = 40;
-            uint256 factor = 15;
-            unchecked {
-                fRank = init + details.rank * factor;
-            }
-            gradRgb = (uint256(fRank) << 16) | (uint256(fRank) << 8) | uint256(fRank);
-        }
-        NFTSVG.SVGParams memory svgParams = NFTSVG.SVGParams({
-            projectName: "Optimizor Club",
-            challengeName: details.challenge.name(),
-            solverAddr: HexString.toHexString(uint256(uint160(address(details.owner))), 20),
-            challengeAddr: HexString.toHexString(uint256(uint160(address(details.challenge))), 20),
-            gasUsed: details.gas,
-            gasOpti: details.improvementPercentage,
-            tokenId: tokenId,
-            rank: details.rank,
-            participants: details.leaderSolutionId,
-            color: HexString.toHexStringNoPrefix(gradRgb, 3),
-            x1: scale(NFTSVG.getCircleCoord(address(details.challenge), 16, tokenId), 16, 274),
-            y1: scale(NFTSVG.getCircleCoord(address(details.solver), 16, tokenId), 100, 484),
-            x2: scale(NFTSVG.getCircleCoord(address(details.challenge), 32, tokenId), 16, 274),
-            y2: scale(NFTSVG.getCircleCoord(address(details.solver), 32, tokenId), 100, 484),
-            x3: scale(NFTSVG.getCircleCoord(address(details.challenge), 48, tokenId), 16, 274),
-            y3: scale(NFTSVG.getCircleCoord(address(details.solver), 48, tokenId), 100, 484)
-        });
-        return NFTSVG.generateSVG(svgParams, details.challenge.svg(tokenId));
-    }
-}
-abstract contract OptimizorAdmin is OptimizorNFT, Owned {
-    PurityChecker public purityChecker;
-    error ChallengeExists(uint256 challengeId);
-    event PurityCheckerUpdated(PurityChecker newPurityChecker);
-    event ChallengeAdded(uint256 challengeId, IChallenge);
-    constructor(PurityChecker _purityChecker) Owned(msg.sender) {
-        updatePurityChecker(_purityChecker);
-    }
-    function updatePurityChecker(PurityChecker _purityChecker) public onlyOwner {
-        purityChecker = _purityChecker;
-        emit PurityCheckerUpdated(_purityChecker);
-    }
-    function addChallenge(uint256 id, IChallenge challenge) external onlyOwner {
-        ChallengeInfo storage chl = challenges[id];
-        if (address(chl.target) != address(0)) {
-            revert ChallengeExists(id);
-        }
-        chl.target = challenge;
-        emit ChallengeAdded(id, challenge);
-    }
-}
-uint256 constant EPOCH = 64;
-contract Optimizor is OptimizorAdmin {
-    struct Submission {
-        address sender;
-        uint96 blockNumber;
-    }
-    mapping(bytes32 => Submission) public submissions;
-    error CodeAlreadySubmitted();
-    error TooEarlyToChallenge();
-    error InvalidRecipient();
-    error CodeNotSubmitted();
-    error NotPure();
-    error NotOptimizor();
-    constructor(PurityChecker _purityChecker) OptimizorAdmin(_purityChecker) {}
-    function commit(bytes32 key) external {
-        if (submissions[key].sender != address(0)) {
-            revert CodeAlreadySubmitted();
-        }
-        submissions[key] = Submission({sender: msg.sender, blockNumber: uint96(block.number)});
-    }
-    function challenge(uint256 id, address target, address recipient, uint256 salt) external {
-        ChallengeInfo storage chl = challenges[id];
-        bytes32 key = keccak256(abi.encode(msg.sender, target.codehash, salt));
-        if (submissions[key].blockNumber + EPOCH >= block.number) {
-            revert TooEarlyToChallenge();
-        }
-        if (submissions[key].sender == address(0)) {
-            revert CodeNotSubmitted();
-        }
-        if (address(chl.target) == address(0)) {
-            revert ChallengeNotFound(id);
-        }
-        if (recipient == address(0)) {
-            revert InvalidRecipient();
-        }
-        if (!purityChecker.check(target)) {
-            revert NotPure();
-        }
-        uint32 gas = chl.target.run(target, block.difficulty);
-        uint256 leaderTokenId = packTokenId(id, chl.solutions);
-        uint32 leaderGas = extraDetails[leaderTokenId].gas;
-        if ((leaderGas != 0) && (leaderGas <= gas)) {
-            revert NotOptimizor();
-        }
-        unchecked {
-            ++chl.solutions;
-        }
-        uint256 tokenId = packTokenId(id, chl.solutions);
-        ERC721._mint(recipient, tokenId);
-        extraDetails[tokenId] = ExtraDetails(target, recipient, gas);
-    }
-}
\ No newline at end of file
diff --git a/test/benchmarks/chains.sol b/test/benchmarks/chains.sol
deleted file mode 100644
index 344cfff2ce31..000000000000
--- a/test/benchmarks/chains.sol
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-// This is an adapted version of StdCheats by foundry:
-// https://github.com/foundry-rs/forge-std/blob/master/src/StdCheats.sol
-contract StdCheatsSafe {
-    struct Chain {
-        string name;
-        uint256 chainId;
-        string rpcUrl;
-    }
-
-    struct Chains {
-        Chain Anvil;
-        Chain Hardhat;
-        Chain Mainnet;
-        Chain Goerli;
-        Chain Sepolia;
-        Chain Optimism;
-        Chain OptimismGoerli;
-        Chain ArbitrumOne;
-        Chain ArbitrumOneGoerli;
-        Chain ArbitrumNova;
-        Chain Polygon;
-        Chain PolygonMumbai;
-        Chain Avalanche;
-        Chain AvalancheFuji;
-        Chain BnbSmartChain;
-        Chain BnbSmartChainTestnet;
-        Chain GnosisChain;
-    }
-
-    Chains stdChains;
-
-    function f(string[2][] memory rpcs) public returns (uint256) {
-        stdChains = Chains({
-            Anvil: Chain("Anvil", 31337, "http://127.0.0.1:8545"),
-            Hardhat: Chain("Hardhat", 31337, "http://127.0.0.1:8545"),
-            Mainnet: Chain("Mainnet", 1, "https://api.mycryptoapi.com/eth"),
-            Goerli: Chain("Goerli", 5, "https://goerli.infura.io/v3/84842078b09946638c03157f83405213"),
-            Sepolia: Chain("Sepolia", 11155111, "https://rpc.sepolia.dev"),
-            Optimism: Chain("Optimism", 10, "https://mainnet.optimism.io"),
-            OptimismGoerli: Chain("OptimismGoerli", 420, "https://goerli.optimism.io"),
-            ArbitrumOne: Chain("ArbitrumOne", 42161, "https://arb1.arbitrum.io/rpc"),
-            ArbitrumOneGoerli: Chain("ArbitrumOneGoerli", 421613, "https://goerli-rollup.arbitrum.io/rpc"),
-            ArbitrumNova: Chain("ArbitrumNova", 42170, "https://nova.arbitrum.io/rpc"),
-            Polygon: Chain("Polygon", 137, "https://polygon-rpc.com"),
-            PolygonMumbai: Chain("PolygonMumbai", 80001, "https://rpc-mumbai.matic.today"),
-            Avalanche: Chain("Avalanche", 43114, "https://api.avax.network/ext/bc/C/rpc"),
-            AvalancheFuji: Chain("AvalancheFuji", 43113, "https://api.avax-test.network/ext/bc/C/rpc"),
-            BnbSmartChain: Chain("BnbSmartChain", 56, "https://bsc-dataseed1.binance.org"),
-            BnbSmartChainTestnet: Chain("BnbSmartChainTestnet", 97, "https://data-seed-prebsc-1-s1.binance.org:8545"),
-            GnosisChain: Chain("GnosisChain", 100, "https://rpc.gnosischain.com")
-        });
-
-        for (uint256 i = 0; i < rpcs.length; i++) {
-            (string memory name, string memory rpcUrl) = (rpcs[i][0], rpcs[i][1]);
-            // forgefmt: disable-start
-            if (isEqual(name, "anvil")) stdChains.Anvil.rpcUrl = rpcUrl;
-            else if (isEqual(name, "hardhat")) stdChains.Hardhat.rpcUrl = rpcUrl;
-            else if (isEqual(name, "mainnet")) stdChains.Mainnet.rpcUrl = rpcUrl;
-            else if (isEqual(name, "goerli")) stdChains.Goerli.rpcUrl = rpcUrl;
-            else if (isEqual(name, "sepolia")) stdChains.Sepolia.rpcUrl = rpcUrl;
-            else if (isEqual(name, "optimism")) stdChains.Optimism.rpcUrl = rpcUrl;
-            else if (isEqual(name, "optimism_goerli", "optimism-goerli")) stdChains.OptimismGoerli.rpcUrl = rpcUrl;
-            else if (isEqual(name, "arbitrum_one", "arbitrum-one")) stdChains.ArbitrumOne.rpcUrl = rpcUrl;
-            else if (isEqual(name, "arbitrum_one_goerli", "arbitrum-one-goerli")) stdChains.ArbitrumOneGoerli.rpcUrl = rpcUrl;
-            else if (isEqual(name, "arbitrum_nova", "arbitrum-nova")) stdChains.ArbitrumNova.rpcUrl = rpcUrl;
-            else if (isEqual(name, "polygon")) stdChains.Polygon.rpcUrl = rpcUrl;
-            else if (isEqual(name, "polygon_mumbai", "polygon-mumbai")) stdChains.PolygonMumbai.rpcUrl = rpcUrl;
-            else if (isEqual(name, "avalanche")) stdChains.Avalanche.rpcUrl = rpcUrl;
-            else if (isEqual(name, "avalanche_fuji", "avalanche-fuji")) stdChains.AvalancheFuji.rpcUrl = rpcUrl;
-            else if (isEqual(name, "bnb_smart_chain", "bnb-smart-chain")) stdChains.BnbSmartChain.rpcUrl = rpcUrl;
-            else if (isEqual(name, "bnb_smart_chain_testnet", "bnb-smart-chain-testnet")) stdChains.BnbSmartChainTestnet.rpcUrl = rpcUrl;
-            else if (isEqual(name, "gnosis_chain", "gnosis-chain")) stdChains.GnosisChain.rpcUrl = rpcUrl;
-            // forgefmt: disable-end
-        }
-        return 0;
-    }
-
-    function isEqual(string memory a, string memory b) private pure returns (bool) {
-        return keccak256(abi.encode(a)) == keccak256(abi.encode(b));
-    }
-
-    function isEqual(string memory a, string memory b, string memory c) private pure returns (bool) {
-        return keccak256(abi.encode(a)) == keccak256(abi.encode(b))
-            || keccak256(abi.encode(a)) == keccak256(abi.encode(c));
-    }
-}
-
-
diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
deleted file mode 100755
index ef1c146f00c8..000000000000
--- a/test/benchmarks/run.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script to run optimizer performance tests.
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -euo pipefail
-
-REPO_ROOT=$(cd "$(dirname "$0")/../../" && pwd)
-SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-
-output_dir=$(mktemp -d -t solc-benchmark-XXXXXX)
-result_legacy_file="${output_dir}/benchmark-legacy.txt"
-result_via_ir_file="${output_dir}/benchmark-via-ir.txt"
-warnings_and_errors_file="${output_dir}/benchmark-warn-err.txt"
-
-function cleanup() {
-    rm -r "${output_dir}"
-    exit
-}
-
-trap cleanup SIGINT SIGTERM
-
-solc="${SOLIDITY_BUILD_DIR}/solc/solc"
-benchmarks_dir="${REPO_ROOT}/test/benchmarks"
-benchmarks=("chains.sol" "OptimizorClub.sol" "verifier.sol")
-time_bin_path=$(type -P time)
-
-for input_file in "${benchmarks[@]}"
-do
-    input_path="${benchmarks_dir}/${input_file}"
-
-    solc_command_legacy=("${solc}" --optimize --bin --color "${input_path}")
-    solc_command_via_ir=("${solc}" --via-ir --optimize --bin --color "${input_path}")
-
-    # Legacy can fail.
-    "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null 2>>"${warnings_and_errors_file}"
-    "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null 2>>"${warnings_and_errors_file}"
-
-    time_legacy=$(<"${result_legacy_file}")
-    time_via_ir=$(<"${result_via_ir_file}")
-
-    echo "======================================================="
-    echo "            ${input_file}"
-    echo "-------------------------------------------------------"
-    echo "legacy pipeline took ${time_legacy} seconds to execute."
-    echo "via-ir pipeline took ${time_via_ir} seconds to execute."
-    echo "======================================================="
-done
-
-echo
-echo "======================================================="
-echo "Warnings and errors generated during run:"
-echo "======================================================="
-echo "$(<"${warnings_and_errors_file}")"
-
-cleanup
-
diff --git a/test/benchmarks/verifier.sol b/test/benchmarks/verifier.sol
deleted file mode 100644
index dcfc97abf79e..000000000000
--- a/test/benchmarks/verifier.sol
+++ /dev/null
@@ -1,208 +0,0 @@
-// This file is MIT Licensed.
-//
-// Copyright 2017 Christian Reitwiessner
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-pragma solidity ^0.8.0;
-library Pairing {
-    struct G1Point {
-        uint X;
-        uint Y;
-    }
-    // Encoding of field elements is: X[0] * z + X[1]
-    struct G2Point {
-        uint[2] X;
-        uint[2] Y;
-    }
-    /// @return the generator of G1
-    function P1() pure internal returns (G1Point memory) {
-        return G1Point(1, 2);
-    }
-    /// @return the generator of G2
-    function P2() pure internal returns (G2Point memory) {
-        return G2Point(
-            [10857046999023057135944570762232829481370756359578518086990519993285655852781,
-             11559732032986387107991004021392285783925812861821192530917403151452391805634],
-            [8495653923123431417604973247489272438418190587263600148770280649306958101930,
-             4082367875863433681332203403145435568316851327593401208105741076214120093531]
-        );
-    }
-    /// @return the negation of p, i.e. p.addition(p.negate()) should be zero.
-    function negate(G1Point memory p) pure internal returns (G1Point memory) {
-        // The prime q in the base field F_q for G1
-        uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
-        if (p.X == 0 && p.Y == 0)
-            return G1Point(0, 0);
-        return G1Point(p.X, q - (p.Y % q));
-    }
-    /// @return r the sum of two points of G1
-    function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) {
-        uint[4] memory input;
-        input[0] = p1.X;
-        input[1] = p1.Y;
-        input[2] = p2.X;
-        input[3] = p2.Y;
-        bool success;
-        assembly {
-            success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60)
-            // Use "invalid" to make gas estimation work
-            switch success case 0 { invalid() }
-        }
-        require(success);
-    }
-
-
-    /// @return r the product of a point on G1 and a scalar, i.e.
-    /// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p.
-    function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) {
-        uint[3] memory input;
-        input[0] = p.X;
-        input[1] = p.Y;
-        input[2] = s;
-        bool success;
-        assembly {
-            success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60)
-            // Use "invalid" to make gas estimation work
-            switch success case 0 { invalid() }
-        }
-        require (success);
-    }
-    /// @return the result of computing the pairing check
-    /// e(p1[0], p2[0]) *  .... * e(p1[n], p2[n]) == 1
-    /// For example pairing([P1(), P1().negate()], [P2(), P2()]) should
-    /// return true.
-    function pairing(G1Point[] memory p1, G2Point[] memory p2) internal view returns (bool) {
-        require(p1.length == p2.length);
-        uint elements = p1.length;
-        uint inputSize = elements * 6;
-        uint[] memory input = new uint[](inputSize);
-        for (uint i = 0; i < elements; i++)
-        {
-            input[i * 6 + 0] = p1[i].X;
-            input[i * 6 + 1] = p1[i].Y;
-            input[i * 6 + 2] = p2[i].X[1];
-            input[i * 6 + 3] = p2[i].X[0];
-            input[i * 6 + 4] = p2[i].Y[1];
-            input[i * 6 + 5] = p2[i].Y[0];
-        }
-        uint[1] memory out;
-        bool success;
-        assembly {
-            success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20)
-            // Use "invalid" to make gas estimation work
-            switch success case 0 { invalid() }
-        }
-        require(success);
-        return out[0] != 0;
-    }
-    /// Convenience method for a pairing check for two pairs.
-    function pairingProd2(G1Point memory a1, G2Point memory a2, G1Point memory b1, G2Point memory b2) internal view returns (bool) {
-        G1Point[] memory p1 = new G1Point[](2);
-        G2Point[] memory p2 = new G2Point[](2);
-        p1[0] = a1;
-        p1[1] = b1;
-        p2[0] = a2;
-        p2[1] = b2;
-        return pairing(p1, p2);
-    }
-    /// Convenience method for a pairing check for three pairs.
-    function pairingProd3(
-            G1Point memory a1, G2Point memory a2,
-            G1Point memory b1, G2Point memory b2,
-            G1Point memory c1, G2Point memory c2
-    ) internal view returns (bool) {
-        G1Point[] memory p1 = new G1Point[](3);
-        G2Point[] memory p2 = new G2Point[](3);
-        p1[0] = a1;
-        p1[1] = b1;
-        p1[2] = c1;
-        p2[0] = a2;
-        p2[1] = b2;
-        p2[2] = c2;
-        return pairing(p1, p2);
-    }
-    /// Convenience method for a pairing check for four pairs.
-    function pairingProd4(
-            G1Point memory a1, G2Point memory a2,
-            G1Point memory b1, G2Point memory b2,
-            G1Point memory c1, G2Point memory c2,
-            G1Point memory d1, G2Point memory d2
-    ) internal view returns (bool) {
-        G1Point[] memory p1 = new G1Point[](4);
-        G2Point[] memory p2 = new G2Point[](4);
-        p1[0] = a1;
-        p1[1] = b1;
-        p1[2] = c1;
-        p1[3] = d1;
-        p2[0] = a2;
-        p2[1] = b2;
-        p2[2] = c2;
-        p2[3] = d2;
-        return pairing(p1, p2);
-    }
-}
-
-contract Verifier {
-    using Pairing for *;
-    struct VerifyingKey {
-        Pairing.G1Point alpha;
-        Pairing.G2Point beta;
-        Pairing.G2Point gamma;
-        Pairing.G2Point delta;
-        Pairing.G1Point[] gamma_abc;
-    }
-    struct Proof {
-        Pairing.G1Point a;
-        Pairing.G2Point b;
-        Pairing.G1Point c;
-    }
-    function verifyingKey() pure internal returns (VerifyingKey memory vk) {
-        vk.alpha = Pairing.G1Point(uint256(0x1e19a8a58ad52243374aeded373b7e89656ea339b9fa8ace98dd5fb221885ea2), uint256(0x2e66a9a67f1a9060a51da039c91c3402d1f46b71bbf10c7348ac4f13c3906736));
-        vk.beta = Pairing.G2Point([uint256(0x1ca3e556290187c64a1057061f419a078dc71353f6af1066c03d7e1448bbc119), uint256(0x2bbc1b80e59743b489ec811b4ebf30a1ff540c2c37ced63d360b94f92f0a41fb)], [uint256(0x07eceb98d2fb10fa7363b45f51aa3d3ef3d511b482790645039a2562e2070f30), uint256(0x1c3e076d2aaf914abd6a49b72c4205669d3d1cbe4a4bf97b9ee49ac0fbbdbda9)]);
-        vk.gamma = Pairing.G2Point([uint256(0x222c0019521d3e52881431be17cacaf8a7379398dd0833f60a2ac45f1c3fcd42), uint256(0x1018dbb94cd920bd55af4e2b12a9f740c6b38748a163b5dbd37c5ef6cf74708f)], [uint256(0x18bf34dc86b549a92f316f7a32070a3ce45a0f38fa45dda1162c4b6498baf286), uint256(0x12848d5a670b6102d5bd45d2b8250d50361001ea335ff6a1405a52504c22b8ac)]);
-        vk.delta = Pairing.G2Point([uint256(0x13b8e16c40a6a299ea42107a97f881f9fa89986dcd5234ecb6919caf756ac1cb), uint256(0x25b64e4978690cd7cb531dbab0119148c96f5fc0c984c0cafb290bb75f033a09)], [uint256(0x1758eaa970929deff5e96e5852d21790c32591dbb13bc63e3df046f0271479a4), uint256(0x14d0b4222ad1710c6330e4bd8ad8f0d7b8f4cff0a37793d53001800e49f41192)]);
-        vk.gamma_abc = new Pairing.G1Point[](9);
-        vk.gamma_abc[0] = Pairing.G1Point(uint256(0x0925dc800d3a577859439a049f8ed0ae7a37dcd36652de478d662c08907a7626), uint256(0x1f7f76e299220ebf3da17bb415d25e6574e142391972dbd1513cf81341975cb5));
-        vk.gamma_abc[1] = Pairing.G1Point(uint256(0x0e67dddfd91adad72376c56cbd98d5cfa4df5217d6115ff26ec741d0154f0bd8), uint256(0x0b97b2ddfdf4c31916d98e384bee3b24bfa0fc59a21ab489153f4dcd1a9a48ca));
-        vk.gamma_abc[2] = Pairing.G1Point(uint256(0x1416b354665883cbbc5f5541012d1f8dd87ebb4415b3ee431be0804fff290bbf), uint256(0x1a284dd2eff43e6cb5aaea43dd9bee022ef0c91d90d0803cf5f7e4677e94a271));
-        vk.gamma_abc[3] = Pairing.G1Point(uint256(0x2526852e7f009b4afa1fe0e1d30334c6e516fac223866b81a830b472164bdfe7), uint256(0x28adf6fbe54ba40afa91555c18477ad3a2f0a460f68d55a15b4e0c264b9c11c2));
-        vk.gamma_abc[4] = Pairing.G1Point(uint256(0x22feae4a12bfb751638cd76b2373e84884ba4adef575ea14ed50c5954d31d410), uint256(0x108c3da0ffd7eda1fe7789e41693146beb979bd1644b19bbd517742ca3841348));
-        vk.gamma_abc[5] = Pairing.G1Point(uint256(0x081477a5c52f41533cf6ca4f778ab922d59ba44b5a5e3fbdbf34ed8dc1a47a8d), uint256(0x0f2624780bd75b9f6c47f7bee582d02f1f983529b8aa9493ca848e38f2ec8447));
-        vk.gamma_abc[6] = Pairing.G1Point(uint256(0x0603e7413c605d1e9b9352a62f0208e2bbd247d3cf3b3721f72c3a9407d679b9), uint256(0x0ce2d2dca8ae14ac4fd2f3fd89e602cdb45de815cf3ba183a25a47d877d9f6f5));
-        vk.gamma_abc[7] = Pairing.G1Point(uint256(0x05bbe6b58285021fb843123971f8e2cfdd207b02c0aef5923ffe7ac841ee0cc9), uint256(0x2da1d3c2049546a7b46aaf89a8a7de493470087ce9af8ba37673f5ee8c35eb1b));
-        vk.gamma_abc[8] = Pairing.G1Point(uint256(0x2c721270df9ba8884d309140f3a4b150a8e53a6c9d09bd8fc7c9aa3c4901aa8d), uint256(0x0de2cb1684759e693e855711fa1c381ae737e463447c3817df507a02064b470f));
-    }
-    function verify(uint[] memory input, Proof memory proof) internal view returns (uint) {
-        uint256 snark_scalar_field = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
-        VerifyingKey memory vk = verifyingKey();
-        require(input.length + 1 == vk.gamma_abc.length);
-        // Compute the linear combination vk_x
-        Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0);
-        for (uint i = 0; i < input.length; i++) {
-            require(input[i] < snark_scalar_field);
-            vk_x = Pairing.addition(vk_x, Pairing.scalar_mul(vk.gamma_abc[i + 1], input[i]));
-        }
-        vk_x = Pairing.addition(vk_x, vk.gamma_abc[0]);
-        if(!Pairing.pairingProd4(
-             proof.a, proof.b,
-             Pairing.negate(vk_x), vk.gamma,
-             Pairing.negate(proof.c), vk.delta,
-             Pairing.negate(vk.alpha), vk.beta)) return 1;
-        return 0;
-    }
-    function verifyTx(
-            Proof memory proof, uint[8] memory input
-        ) public view returns (bool r) {
-        uint[] memory inputValues = new uint[](8);
-
-        for(uint i = 0; i < input.length; i++){
-            inputValues[i] = input[i];
-        }
-        if (verify(inputValues, proof) == 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/test/buglistTests.js b/test/buglistTests.js
deleted file mode 100755
index f24f0cb689a2..000000000000
--- a/test/buglistTests.js
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-var util = require('util')
-var exec = util.promisify(require('child_process').exec)
-var mktemp = require('mktemp');
-var download = require('download')
-var JSONPath = require('JSONPath')
-var fs = require('fs')
-var bugs = JSON.parse(fs.readFileSync(__dirname + '/../docs/bugs.json', 'utf8'))
-
-var bugsByName = {}
-for (var i in bugs)
-{
-    if (bugs[i].name in bugsByName)
-    {
-        throw "Duplicate bug name: " + bugs[i].name
-    }
-    bugsByName[bugs[i].name] = bugs[i]
-}
-
-var tests = fs.readFileSync(__dirname + '/buglist_test_vectors.md', 'utf8')
-
-var testVectorParser = /\s*#\s+(\S+)\s+## buggy\n([^#]*)## fine\n([^#]*)/g
-
-runTests()
-
-async function runTests()
-{
-	var result;
-	while ((result = testVectorParser.exec(tests)) !== null)
-	{
-		var name = result[1]
-		var buggy = result[2].split('\n--\n')
-		var fine = result[3].split('\n--\n')
-		console.log("Testing " + name + " with " + buggy.length + " buggy and " + fine.length + " fine instances")
-
-		try {
-			await checkRegex(name, buggy, fine)
-			await checkJSONPath(name, buggy, fine)
-		} catch (err) {
-			console.error("Error: " + err)
-		}
-	}
-}
-
-function checkRegex(name, buggy, fine)
-{
-    return new Promise(function(resolve, reject) {
-		var regexStr = bugsByName[name].check['regex-source']
-		if (regexStr !== undefined)
-		{
-			var regex = RegExp(regexStr)
-			for (var i in buggy)
-			{
-				if (!regex.exec(buggy[i]))
-				{
-					reject("Bug " + name + ": Buggy source does not match: " + buggy[i])
-				}
-			}
-			for (var i in fine)
-			{
-				if (regex.exec(fine[i]))
-				{
-					reject("Bug " + name + ": Non-buggy source matches: " + fine[i])
-				}
-			}
-		}
-		resolve()
-	})
-}
-
-async function checkJSONPath(name, buggy, fine)
-{
-	var jsonPath = bugsByName[name].check['ast-compact-json-path']
-	if (jsonPath !== undefined)
-	{
-		var url = "http://github.com/ethereum/solidity/releases/download/v" + bugsByName[name].introduced + "/solc-static-linux"
-		try {
-			var tmpdir = await mktemp.createDir('XXXXX')
-			var binary = tmpdir + "/solc-static-linux"
-			await download(url, tmpdir)
-			exec("chmod +x " + binary)
-			for (var i in buggy)
-			{
-				var result = await checkJsonPathTest(buggy[i], tmpdir, binary, jsonPath, i)
-				if (!result)
-					throw "Bug " + name + ": Buggy source does not contain path: " + buggy[i]
-			}
-			for (var i in fine)
-			{
-				var result = await checkJsonPathTest(fine[i], tmpdir, binary, jsonPath, i + buggy.length)
-				if (result)
-					throw "Bug " + name + ": Non-buggy source contains path: " + fine[i]
-			}
-			exec("rm -r " + tmpdir)
-		} catch (err) {
-			throw err
-		}
-	}
-}
-
-function checkJsonPathTest(code, tmpdir, binary, query, idx) {
-    return new Promise(function(resolve, reject) {
-        var solFile = tmpdir + "/jsonPath" + idx + ".sol"
-        var astFile = tmpdir + "/ast" + idx + ".json"
-        writeFilePromise(solFile, code)
-        .then(() => {
-            return exec(binary + " --ast-compact-json " + solFile + " > " + astFile)
-        })
-        .then(() => {
-            var jsonRE = /(\{[\s\S]*\})/
-            var ast = JSON.parse(jsonRE.exec(fs.readFileSync(astFile, 'utf8'))[0])
-            var result = JSONPath({json: ast, path: query})
-            if (result.length > 0)
-                resolve(true)
-            else
-                resolve(false)
-        })
-        .catch((err) => {
-            reject(err)
-        })
-    })
-}
-
-function writeFilePromise(filename, data) {
-    return new Promise(function(resolve, reject) {
-        fs.writeFile(filename, data, 'utf8', function(err) {
-            if (err) reject(err)
-            else resolve(data)
-        })
-    })
-}
diff --git a/test/buglist_test_vectors.md b/test/buglist_test_vectors.md
deleted file mode 100644
index e683f4818496..000000000000
--- a/test/buglist_test_vectors.md
+++ /dev/null
@@ -1,148 +0,0 @@
-# NestedArrayFunctionCallDecoder
-
-## buggy
-
-function f() pure returns (uint[2][2]) { }
-
---
-
-function f() returns (uint[2][2] a) { }
-
---
-
-function f() returns (uint x, uint[200][2] a) { }
-
---
-
-function f() returns (uint[200][2] a, uint x) { }
-
---
-
-function f() returns (uint[200][2] a, uint x);
-
---
-
-function f() returns (
-    uint
-    [
-    200
-    ]
-    [2]
-    a, uint x);
-
---
-
-function f() returns (
-    uint
-    [
-    ContractName.ConstantName
-    ]
-    [2]
-    a, uint x);
-
-## fine
-
-function f() returns (uint[2]) { }
-
---
-
-function f() public pure returns (uint[2][] a) { }
-
---
-
-function f() public pure returns (uint[ 2 ] [ ]  a) { }
-
---
-
-function f() public pure  returns (uint x, uint[] a) { }
-
---
-
-function f(uint[2][2]) { }
-
---
-
-function f() m(uint[2][2]) { }
-
---
-
-function f() returns (uint, uint) { uint[2][2] memory x; }
-
-# ExpExponentCleanup
-
-## buggy
-
-x ** y
-
---
-
-x ** uint8(y)
-
---
-
-x**y
-
-## fine
-
-x ** 2
-
---
-
-x**2
-
---
-
-x**200
-
---
-
-/** bla **/
-
---
-
-/**/
-
-# EventStructWrongData
-
-## buggy
-
-pragma experimental ABIEncoderV2;
-contract C
-{
-	struct S { uint x; }
-	event E(S);
-	event F(S);
-	enum A { B, C }
-	event G(A);
-	function f(S s);
-}
-
---
-
-pragma experimental ABIEncoderV2;
-contract C
-{
-	struct S { uint x; }
-	event E(S indexed);
-	event F(uint, S, bool);
-}
-
-## fine
-
-pragma experimental ABIEncoderV2;
-contract C
-{
-	struct S { uint x; }
-	enum A { B, C }
-	event G(A);
-}
-
---
-
-pragma experimental ABIEncoderV2;
-contract C
-{
-	struct S { uint x; }
-	function f(S s);
-	S s1;
-}
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
deleted file mode 100755
index 3166cd6b5dd0..000000000000
--- a/test/cmdlineTests.sh
+++ /dev/null
@@ -1,425 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script to run commandline Solidity tests.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -eo pipefail
-
-## GLOBAL VARIABLES
-
-REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
-SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-export REPO_ROOT SOLIDITY_BUILD_DIR
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-pushd "${REPO_ROOT}/test/cmdlineTests" > /dev/null
-autoupdate=false
-no_smt=false
-declare -a included_test_patterns
-declare -a excluded_test_patterns
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        --update)
-            autoupdate=true
-            shift
-            ;;
-        --no-smt)
-            no_smt=true
-            shift
-            ;;
-        --exclude)
-            [[ $2 != '' ]] || fail "No pattern given to --exclude option or the pattern is empty."
-            excluded_test_patterns+=("$2")
-            shift
-            shift
-            ;;
-        *)
-            included_test_patterns+=("$1")
-            shift
-            ;;
-    esac
-done
-
-(( ${#included_test_patterns[@]} > 0 )) || included_test_patterns+=('*')
-
-test_name_filter=('(' -name "${included_test_patterns[0]}")
-for pattern in "${included_test_patterns[@]:1}"
-do
-    test_name_filter+=(-or -name "$pattern")
-done
-test_name_filter+=(')')
-
-for pattern in "${excluded_test_patterns[@]}"
-do
-    test_name_filter+=(-and -not -name "$pattern")
-done
-
-# NOTE: We want leading symbols in names to affect the sort order but without
-# LC_COLLATE=C sort seems to ignore them.
-# shellcheck disable=SC2207 # We do not support test names containing spaces.
-selected_tests=($(find . -mindepth 1 -maxdepth 1 -type d "${test_name_filter[@]}" | cut -c 3- | LC_COLLATE=C sort))
-
-if (( ${#selected_tests[@]} == 0 ))
-then
-    printWarning "The pattern '${test_name_filter[*]}' did not match any tests."
-    exit 0;
-else
-    test_count=$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)
-    printLog "Selected ${#selected_tests[@]} out of ${test_count} tests."
-fi
-
-popd > /dev/null
-
-case "$OSTYPE" in
-    msys)
-        SOLC="${SOLIDITY_BUILD_DIR}/solc/Release/solc.exe"
-
-        # prevents msys2 path translation for a remapping test
-        export MSYS2_ARG_CONV_EXCL="="
-        ;;
-    *)
-        SOLC="${SOLIDITY_BUILD_DIR}/solc/solc"
-        ;;
-esac
-echo "Using solc binary at ${SOLC}"
-export SOLC
-
-INTERACTIVE=true
-if ! tty -s || [ "$CI" ]
-then
-    INTERACTIVE=false
-fi
-
-# extend stack size in case we run via ASAN
-if [[ -n "${CIRCLECI}" ]] || [[ -n "$CI" ]]
-then
-    ulimit -s 16384
-    ulimit -a
-fi
-
-## FUNCTIONS
-
-function update_expectation {
-    local newExpectation="${1}"
-    local expectationFile="${2}"
-
-    if [[ $newExpectation == '' || $newExpectation == '0' && $expectationFile == */exit ]]
-    then
-        if [[ -f $expectationFile ]]
-        then
-            rm "$expectationFile"
-        fi
-        return
-    fi
-
-    echo "$newExpectation" > "$expectationFile"
-    printLog "File $expectationFile updated to match the expectation."
-}
-
-function ask_expectation_update
-{
-    if [[ $INTERACTIVE == true ]]
-    then
-        local newExpectation="${1}"
-        local expectationFile="${2}"
-
-        if [[ $autoupdate == true ]]
-        then
-            update_expectation "$newExpectation" "$expectationFile"
-        else
-            local editor="${FCEDIT:-${VISUAL:-${EDITOR:-vi}}}"
-
-            while true
-            do
-                read -r -n 1 -p "(e)dit/(u)pdate expectations/(s)kip/(q)uit? "
-                echo
-                case $REPLY in
-                    e*) "$editor" "$expectationFile"; break;;
-                    u*) update_expectation "$newExpectation" "$expectationFile"; break;;
-                    s*) return;;
-                    q*) fail;;
-                esac
-            done
-        fi
-    else
-        [[ $INTERACTIVE == false ]] || assertFail
-        fail
-    fi
-}
-
-# General helper function for testing SOLC behaviour, based on file name, compile opts, exit code, stdout and stderr.
-# An failure is expected.
-function test_solc_behaviour
-{
-    local filename="${1}"
-    local solc_args
-    IFS=" " read -r -a solc_args <<< "${2}"
-    local solc_stdin="${3}"
-    [ -z "$solc_stdin"  ] && solc_stdin="/dev/stdin"
-    local stdout_expected="${4}"
-    local exit_code_expected="${5}"
-    local exit_code_expectation_file="${6}"
-    local stderr_expected="${7}"
-    local stdout_expectation_file="${8}" # the file to write to when user chooses to update stdout expectation
-    local stderr_expectation_file="${9}" # the file to write to when user chooses to update stderr expectation
-    local stdout_path; stdout_path=$(mktemp -t "cmdline-test-stdout-XXXXXX")
-    local stderr_path; stderr_path=$(mktemp -t "cmdline-test-stderr-XXXXXX")
-
-    # shellcheck disable=SC2064
-    trap "rm -f $stdout_path $stderr_path" EXIT
-
-    if [[ "$exit_code_expected" = "" ]]
-    then
-        exit_code_expected="0"
-    fi
-
-    [[ $filename == "" ]] || solc_args+=("$filename")
-
-    local solc_command="$SOLC ${solc_args[*]} <$solc_stdin"
-    set +e
-    "$SOLC" "${solc_args[@]}" <"$solc_stdin" >"$stdout_path" 2>"$stderr_path"
-    exitCode=$?
-    set -e
-
-    if [[ " ${solc_args[*]} " == *" --standard-json "* ]] && [[ -s $stdout_path ]]
-    then
-        python3 - <<EOF
-import re, sys
-json = open("$stdout_path", "r").read()
-json = re.sub(r"{[^{}]*Warning: This is a pre-release compiler version[^{}]*},?", "", json)
-json = re.sub(r"\"errors\":\s*\[\s*\],?","\n" if json[1] == " " else "",json)       # Remove "errors" array if it's not empty
-json = re.sub("\n\\s*\n", "\n", json)                                               # Remove trailing whitespace
-json = re.sub(r"},(\n{0,1})\n*(\s*(]|}))", r"}\1\2", json)                          # Remove trailing comma
-open("$stdout_path", "w").write(json)
-EOF
-        sed -i.bak -E -e 's/ Consider adding \\"pragma solidity \^[0-9.]*;\\"//g' "$stdout_path"
-        sed -i.bak -E -e 's/\"opcodes\":[[:space:]]*\"[^"]+\"/\"opcodes\":\"<OPCODES REMOVED>\"/g' "$stdout_path"
-        sed -i.bak -E -e 's/\"sourceMap\":[[:space:]]*\"[0-9:;-]+\"/\"sourceMap\":\"<SOURCEMAP REMOVED>\"/g' "$stdout_path"
-
-        # Remove bytecode (but not linker references).
-        sed -i.bak -E -e 's/(\"object\":[[:space:]]*\")[0-9a-f]+([^"]*\")/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
-        # shellcheck disable=SC2016
-        sed -i.bak -E -e 's/(\"object\":[[:space:]]*\"[^"]+\$__)[0-9a-f]+(\")/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
-        # shellcheck disable=SC2016
-        sed -i.bak -E -e 's/([0-9a-f]{34}\$__)[0-9a-f]+(__\$[0-9a-f]{17})/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
-        # Remove metadata in assembly output (see below about the magic numbers)
-        sed -i.bak -E -e 's/"[0-9a-f]+64697066735822[0-9a-f]+64736f6c63[0-9a-f]+/"<BYTECODE REMOVED>/g' "$stdout_path"
-
-        # Replace escaped newlines by actual newlines for readability
-        # shellcheck disable=SC1003
-        sed -i.bak -E -e 's/\\n/\'$'\n/g' "$stdout_path"
-        sed -i.bak -e 's/\(^[ ]*auxdata:[[:space:]]\)0x[0-9a-f]*$/\1<AUXDATA REMOVED>/' "$stdout_path"
-        sed -i.bak -e 's/\(\\"version\\":[ ]*\\"\)[^"\\]*\(\\"\)/\1<VERSION REMOVED>\2/' "$stdout_path"
-        rm "$stdout_path.bak"
-    else
-        sed -i.bak -e '/^Warning: This is a pre-release compiler version, please do not use it in production./,+1d' "$stderr_path"
-        sed -i.bak -e '/^Compiler run successful, no output requested\.$/d' "$stderr_path"
-        sed -i.bak -e '/^Warning (3805): This is a pre-release compiler version, please do not use it in production./,+1d' "$stderr_path"
-        sed -i.bak -e 's/\(^[ ]*auxdata: \)0x[0-9a-f]*$/\1<AUXDATA REMOVED>/' "$stdout_path"
-        sed -i.bak -e 's/ Consider adding "pragma .*$//' "$stderr_path"
-        sed -i.bak -e 's/\(Unimplemented feature error.* in \).*$/\1<FILENAME REMOVED>/' "$stderr_path"
-        sed -i.bak -e 's/"version":[ ]*"[^"]*"/"version": "<VERSION REMOVED>"/' "$stdout_path"
-    if [[ $stdout_expectation_file != "" &&  $stderr_expectation_file != "" ]]
-    then
-        sed -i.bak -e '/^Compiler run successful\. No contracts to compile\.$/d' "$stdout_path"
-        sed -i.bak -e '/^Compiler run successful\. No output generated\.$/d' "$stdout_path"
-    fi
-
-        # Remove bytecode (but not linker references). Since non-JSON output is unstructured,
-        # use metadata markers for detection to have some confidence that it's actually bytecode
-        # and not some random word.
-        # 64697066735822 = hex encoding of 0x64 'i' 'p' 'f' 's' 0x58 0x22
-        # 64736f6c63     = hex encoding of 0x64 's' 'o' 'l' 'c'
-        sed -i.bak -E -e 's/[0-9a-f]*64697066735822[0-9a-f]+64736f6c63[0-9a-f]+/<BYTECODE REMOVED>/g' "$stdout_path"
-        # shellcheck disable=SC2016
-        sed -i.bak -E -e 's/([0-9a-f]{17}\$__)[0-9a-f]+(__\$[0-9a-f]{17})/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
-        # shellcheck disable=SC2016
-        sed -i.bak -E -e 's/[0-9a-f]+((__\$[0-9a-f]{34}\$__)*<BYTECODE REMOVED>)/<BYTECODE REMOVED>\1/g' "$stdout_path"
-
-        # Remove trailing empty lines. Needs a line break to make OSX sed happy.
-        sed -i.bak -e '1{/^$/d
-}' "$stderr_path"
-        rm "$stderr_path.bak" "$stdout_path.bak"
-    fi
-    # Remove path to cpp file
-    sed -i.bak -e 's/^\(Exception while assembling:\).*/\1/' "$stderr_path"
-    # Remove exception class name.
-    sed -i.bak -e 's/^\(Dynamic exception type:\).*/\1/' "$stderr_path"
-    rm "$stderr_path.bak"
-
-    if [[ $exitCode -ne "$exit_code_expected" ]]
-    then
-        printError "Incorrect exit code. Expected $exit_code_expected but got $exitCode."
-
-        [[ $exit_code_expectation_file != "" ]] && ask_expectation_update "$exitCode" "$exit_code_expectation_file"
-        [[ $exit_code_expectation_file == "" ]] && fail
-    fi
-
-    if [[ "$(cat "$stdout_path")" != "${stdout_expected}" ]]
-    then
-        printError "Incorrect output on stdout received. Expected:"
-        echo -e "${stdout_expected}"
-
-        printError "But got:"
-        echo -e "$(cat "$stdout_path")"
-
-        printError "When running $solc_command"
-
-        [[ $stdout_expectation_file != "" ]] && ask_expectation_update "$(cat "$stdout_path")" "$stdout_expectation_file"
-        [[ $stdout_expectation_file == "" ]] && fail
-    fi
-
-    if [[ "$(cat "$stderr_path")" != "${stderr_expected}" ]]
-    then
-        printError "Incorrect output on stderr received. Expected:"
-        echo -e "${stderr_expected}"
-
-        printError "But got:"
-        echo -e "$(cat "$stderr_path")"
-
-        printError "When running $solc_command"
-
-        [[ $stderr_expectation_file != "" ]] && ask_expectation_update "$(cat "$stderr_path")" "$stderr_expectation_file"
-        [[ $stderr_expectation_file == "" ]] && fail
-    fi
-
-    rm "$stdout_path" "$stderr_path"
-}
-
-
-## RUN
-
-printTask "Testing passing files that are not found..."
-test_solc_behaviour "file_not_found.sol" "" "" "" 1 "" "Error: \"file_not_found.sol\" is not found." "" ""
-
-printTask "Testing passing files that are not files..."
-test_solc_behaviour "." "" "" "" 1 "" "Error: \".\" is not a valid file." "" ""
-
-printTask "Testing passing empty remappings..."
-test_solc_behaviour "${0}" "=/some/remapping/target" "" "" 1 "" "Error: Invalid remapping: \"=/some/remapping/target\"." "" ""
-test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "" "Error: Invalid remapping: \"ctx:=/some/remapping/target\"." "" ""
-
-printTask "Running general commandline tests..."
-(
-    cd "$REPO_ROOT"/test/cmdlineTests/
-    for tdir in "${selected_tests[@]}"
-    do
-        if ! [[ -d $tdir ]]
-        then
-            fail "Test directory not found: $tdir"
-        fi
-
-        printTask " - ${tdir}"
-
-        if [[ $(ls -A "$tdir") == "" ]]
-        then
-            printWarning "   ---> skipped (test dir empty)"
-            continue
-        fi
-
-        # Strip trailing slash from $tdir.
-        tdir=$(basename "${tdir}")
-        if [[ $no_smt == true ]]
-        then
-            if [[ $tdir =~ .*model_checker_.* ]]
-            then
-                printWarning "   ---> skipped (SMT test)"
-                continue
-            fi
-        fi
-
-        scriptFiles="$(ls -1 "${tdir}/test."* 2> /dev/null || true)"
-        scriptCount="$(echo "${scriptFiles}" | wc -w)"
-
-        inputFiles="$(ls -1 "${tdir}/input."* 2> /dev/null || true)"
-        inputCount="$(echo "${inputFiles}" | wc -w)"
-        (( inputCount <= 1 )) || fail "Ambiguous input. Found input files in multiple formats:"$'\n'"${inputFiles}"
-        (( scriptCount <= 1 )) || fail "Ambiguous input. Found script files in multiple formats:"$'\n'"${scriptFiles}"
-        (( inputCount == 0 || scriptCount == 0 )) || fail "Ambiguous input. Found both input and script files:"$'\n'"${inputFiles}"$'\n'"${scriptFiles}"
-
-        if (( scriptCount == 1 ))
-        then
-            if ! "$scriptFiles"
-            then
-                fail "Test script ${scriptFiles} failed."
-            fi
-
-            continue
-        fi
-
-        # Use printf to get rid of the trailing newline
-        inputFile=$(printf "%s" "${inputFiles}")
-
-        if [ "${inputFile}" = "${tdir}/input.json" ]
-        then
-            ! [ -e "${tdir}/stdin" ] || fail "Found a file called 'stdin' but redirecting standard input in JSON mode is not allowed."
-
-            stdin="${inputFile}"
-            inputFile=""
-            stdout="$(cat "${tdir}/output.json" 2>/dev/null || true)"
-            stdoutExpectationFile="${tdir}/output.json"
-            prettyPrintFlags=""
-            if [[ ! -f "${tdir}/no-pretty-print" ]]
-            then
-                prettyPrintFlags="--pretty-json --json-indent 4"
-            fi
-
-            command_args="--standard-json ${prettyPrintFlags} "$(cat "${tdir}/args" 2>/dev/null || true)
-        else
-            if [ -e "${tdir}/stdin" ]
-            then
-                stdin="${tdir}/stdin"
-                [ -f "${tdir}/stdin" ] || fail "'stdin' is not a regular file."
-            else
-                stdin=""
-            fi
-
-            stdout="$(cat "${tdir}/output" 2>/dev/null || true)"
-            stdoutExpectationFile="${tdir}/output"
-            command_args=$(cat "${tdir}/args" 2>/dev/null || true)
-        fi
-        exitCodeExpectationFile="${tdir}/exit"
-        exitCode=$(cat "$exitCodeExpectationFile" 2>/dev/null || true)
-        err="$(cat "${tdir}/err" 2>/dev/null || true)"
-        stderrExpectationFile="${tdir}/err"
-        test_solc_behaviour "$inputFile" \
-                            "$command_args" \
-                            "$stdin" \
-                            "$stdout" \
-                            "$exitCode" \
-                            "$exitCodeExpectationFile" \
-                            "$err" \
-                            "$stdoutExpectationFile" \
-                            "$stderrExpectationFile"
-    done
-)
-
-echo "Commandline tests successful."
diff --git a/test/cmdlineTests/abiencoderv2_no_warning/args b/test/cmdlineTests/abiencoderv2_no_warning/args
deleted file mode 100644
index 40469d358c56..000000000000
--- a/test/cmdlineTests/abiencoderv2_no_warning/args
+++ /dev/null
@@ -1 +0,0 @@
---hashes
\ No newline at end of file
diff --git a/test/cmdlineTests/abiencoderv2_no_warning/err b/test/cmdlineTests/abiencoderv2_no_warning/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/abiencoderv2_no_warning/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/abiencoderv2_no_warning/input.sol b/test/cmdlineTests/abiencoderv2_no_warning/input.sol
deleted file mode 100644
index 5a1dc985b4bd..000000000000
--- a/test/cmdlineTests/abiencoderv2_no_warning/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C {
-    struct S { uint x; }
-    function f(S memory) public pure {
-    }
-}
diff --git a/test/cmdlineTests/abiencoderv2_no_warning/output b/test/cmdlineTests/abiencoderv2_no_warning/output
deleted file mode 100644
index 33f8d2e1fa8f..000000000000
--- a/test/cmdlineTests/abiencoderv2_no_warning/output
+++ /dev/null
@@ -1,4 +0,0 @@
-
-======= abiencoderv2_no_warning/input.sol:C =======
-Function signatures:
-3fc03eeb: f((uint256))
diff --git a/test/cmdlineTests/asm_json/args b/test/cmdlineTests/asm_json/args
deleted file mode 100644
index dd9e77b16f5a..000000000000
--- a/test/cmdlineTests/asm_json/args
+++ /dev/null
@@ -1 +0,0 @@
---asm-json --pretty-json
diff --git a/test/cmdlineTests/asm_json/input.sol b/test/cmdlineTests/asm_json/input.sol
deleted file mode 100644
index da3a08d7f199..000000000000
--- a/test/cmdlineTests/asm_json/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f(uint x) public pure {
-        x += 42;
-        require(x > 100);
-    }
-}
diff --git a/test/cmdlineTests/asm_json/output b/test/cmdlineTests/asm_json/output
deleted file mode 100644
index f6a0a4b19053..000000000000
--- a/test/cmdlineTests/asm_json/output
+++ /dev/null
@@ -1,1578 +0,0 @@
-
-======= asm_json/input.sol:C =======
-EVM assembly:
-{
-  ".code":
-  [
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH",
-      "source": 0,
-      "value": "80"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH",
-      "source": 0,
-      "value": "40"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "MSTORE",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "CALLVALUE",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "DUP1",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "ISZERO",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH [tag]",
-      "source": 0,
-      "value": "1"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "JUMPI",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH",
-      "source": 0,
-      "value": "0"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "DUP1",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "REVERT",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "tag",
-      "source": 0,
-      "value": "1"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "JUMPDEST",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "POP",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH #[$]",
-      "source": 0,
-      "value": "0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "DUP1",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH [$]",
-      "source": 0,
-      "value": "0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH",
-      "source": 0,
-      "value": "0"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "CODECOPY",
-      "source": 0
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "PUSH",
-      "source": 0,
-      "value": "0"
-    },
-    {
-      "begin": 60,
-      "end": 160,
-      "name": "RETURN",
-      "source": 0
-    }
-  ],
-  ".data":
-  {
-    "0":
-    {
-      ".auxdata": "<BYTECODE REMOVED>",
-      ".code":
-      [
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "80"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "40"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "MSTORE",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "CALLVALUE",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "DUP1",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "ISZERO",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "1"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "JUMPI",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "0"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "DUP1",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "REVERT",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "tag",
-          "source": 0,
-          "value": "1"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "POP",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "4"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "CALLDATASIZE",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "LT",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "2"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "JUMPI",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "0"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "CALLDATALOAD",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "E0"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "SHR",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "DUP1",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "B3DE648B"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "EQ",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "3"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "JUMPI",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "tag",
-          "source": 0,
-          "value": "2"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "PUSH",
-          "source": 0,
-          "value": "0"
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "DUP1",
-          "source": 0
-        },
-        {
-          "begin": 60,
-          "end": 160,
-          "name": "REVERT",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "tag",
-          "source": 0,
-          "value": "3"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "4"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "PUSH",
-          "source": 0,
-          "value": "4"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "DUP1",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "CALLDATASIZE",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "SUB",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "DUP2",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "ADD",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "SWAP1",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "5"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "SWAP2",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "SWAP1",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "6"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "tag",
-          "source": 0,
-          "value": "5"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "7"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "tag",
-          "source": 0,
-          "value": "4"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "STOP",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "tag",
-          "source": 0,
-          "value": "7"
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 123,
-          "end": 125,
-          "name": "PUSH",
-          "source": 0,
-          "value": "2A"
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "DUP2",
-          "source": 0
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "9"
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "SWAP2",
-          "source": 0
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "SWAP1",
-          "source": 0
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "10"
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 0
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "tag",
-          "source": 0,
-          "value": "9"
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "SWAP1",
-          "source": 0
-        },
-        {
-          "begin": 118,
-          "end": 125,
-          "name": "POP",
-          "source": 0
-        },
-        {
-          "begin": 147,
-          "end": 150,
-          "name": "PUSH",
-          "source": 0,
-          "value": "64"
-        },
-        {
-          "begin": 143,
-          "end": 144,
-          "name": "DUP2",
-          "source": 0
-        },
-        {
-          "begin": 143,
-          "end": 150,
-          "name": "GT",
-          "source": 0
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "PUSH [tag]",
-          "source": 0,
-          "value": "11"
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "JUMPI",
-          "source": 0
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "PUSH",
-          "source": 0,
-          "value": "0"
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "DUP1",
-          "source": 0
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "REVERT",
-          "source": 0
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "tag",
-          "source": 0,
-          "value": "11"
-        },
-        {
-          "begin": 135,
-          "end": 151,
-          "name": "JUMPDEST",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "name": "POP",
-          "source": 0
-        },
-        {
-          "begin": 77,
-          "end": 158,
-          "jumpType": "[out]",
-          "name": "JUMP",
-          "source": 0
-        },
-        {
-          "begin": 88,
-          "end": 205,
-          "name": "tag",
-          "source": 1,
-          "value": "13"
-        },
-        {
-          "begin": 88,
-          "end": 205,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 197,
-          "end": 198,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 194,
-          "end": 195,
-          "name": "DUP1",
-          "source": 1
-        },
-        {
-          "begin": 187,
-          "end": 199,
-          "name": "REVERT",
-          "source": 1
-        },
-        {
-          "begin": 334,
-          "end": 411,
-          "name": "tag",
-          "source": 1,
-          "value": "15"
-        },
-        {
-          "begin": 334,
-          "end": 411,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 371,
-          "end": 378,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 400,
-          "end": 405,
-          "name": "DUP2",
-          "source": 1
-        },
-        {
-          "begin": 389,
-          "end": 405,
-          "name": "SWAP1",
-          "source": 1
-        },
-        {
-          "begin": 389,
-          "end": 405,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 334,
-          "end": 411,
-          "name": "SWAP2",
-          "source": 1
-        },
-        {
-          "begin": 334,
-          "end": 411,
-          "name": "SWAP1",
-          "source": 1
-        },
-        {
-          "begin": 334,
-          "end": 411,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 334,
-          "end": 411,
-          "jumpType": "[out]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 417,
-          "end": 539,
-          "name": "tag",
-          "source": 1,
-          "value": "16"
-        },
-        {
-          "begin": 417,
-          "end": 539,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 490,
-          "end": 514,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "25"
-        },
-        {
-          "begin": 508,
-          "end": 513,
-          "name": "DUP2",
-          "source": 1
-        },
-        {
-          "begin": 490,
-          "end": 514,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "15"
-        },
-        {
-          "begin": 490,
-          "end": 514,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 490,
-          "end": 514,
-          "name": "tag",
-          "source": 1,
-          "value": "25"
-        },
-        {
-          "begin": 490,
-          "end": 514,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 483,
-          "end": 488,
-          "name": "DUP2",
-          "source": 1
-        },
-        {
-          "begin": 480,
-          "end": 515,
-          "name": "EQ",
-          "source": 1
-        },
-        {
-          "begin": 470,
-          "end": 533,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "26"
-        },
-        {
-          "begin": 470,
-          "end": 533,
-          "name": "JUMPI",
-          "source": 1
-        },
-        {
-          "begin": 529,
-          "end": 530,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 526,
-          "end": 527,
-          "name": "DUP1",
-          "source": 1
-        },
-        {
-          "begin": 519,
-          "end": 531,
-          "name": "REVERT",
-          "source": 1
-        },
-        {
-          "begin": 470,
-          "end": 533,
-          "name": "tag",
-          "source": 1,
-          "value": "26"
-        },
-        {
-          "begin": 470,
-          "end": 533,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 417,
-          "end": 539,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 417,
-          "end": 539,
-          "jumpType": "[out]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "name": "tag",
-          "source": 1,
-          "value": "17"
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 591,
-          "end": 596,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 629,
-          "end": 635,
-          "name": "DUP2",
-          "source": 1
-        },
-        {
-          "begin": 616,
-          "end": 636,
-          "name": "CALLDATALOAD",
-          "source": 1
-        },
-        {
-          "begin": 607,
-          "end": 636,
-          "name": "SWAP1",
-          "source": 1
-        },
-        {
-          "begin": 607,
-          "end": 636,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 645,
-          "end": 678,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "28"
-        },
-        {
-          "begin": 672,
-          "end": 677,
-          "name": "DUP2",
-          "source": 1
-        },
-        {
-          "begin": 645,
-          "end": 678,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "16"
-        },
-        {
-          "begin": 645,
-          "end": 678,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 645,
-          "end": 678,
-          "name": "tag",
-          "source": 1,
-          "value": "28"
-        },
-        {
-          "begin": 645,
-          "end": 678,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "name": "SWAP3",
-          "source": 1
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "name": "SWAP2",
-          "source": 1
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 545,
-          "end": 684,
-          "jumpType": "[out]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "name": "tag",
-          "source": 1,
-          "value": "6"
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 749,
-          "end": 755,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 798,
-          "end": 800,
-          "name": "PUSH",
-          "source": 1,
-          "value": "20"
-        },
-        {
-          "begin": 786,
-          "end": 795,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 777,
-          "end": 784,
-          "name": "DUP5",
-          "source": 1
-        },
-        {
-          "begin": 773,
-          "end": 796,
-          "name": "SUB",
-          "source": 1
-        },
-        {
-          "begin": 769,
-          "end": 801,
-          "name": "SLT",
-          "source": 1
-        },
-        {
-          "begin": 766,
-          "end": 885,
-          "name": "ISZERO",
-          "source": 1
-        },
-        {
-          "begin": 766,
-          "end": 885,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "30"
-        },
-        {
-          "begin": 766,
-          "end": 885,
-          "name": "JUMPI",
-          "source": 1
-        },
-        {
-          "begin": 804,
-          "end": 883,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "31"
-        },
-        {
-          "begin": 804,
-          "end": 883,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "13"
-        },
-        {
-          "begin": 804,
-          "end": 883,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 804,
-          "end": 883,
-          "name": "tag",
-          "source": 1,
-          "value": "31"
-        },
-        {
-          "begin": 804,
-          "end": 883,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 766,
-          "end": 885,
-          "name": "tag",
-          "source": 1,
-          "value": "30"
-        },
-        {
-          "begin": 766,
-          "end": 885,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 924,
-          "end": 925,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 949,
-          "end": 1002,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "32"
-        },
-        {
-          "begin": 994,
-          "end": 1001,
-          "name": "DUP5",
-          "source": 1
-        },
-        {
-          "begin": 985,
-          "end": 991,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 974,
-          "end": 983,
-          "name": "DUP6",
-          "source": 1
-        },
-        {
-          "begin": 970,
-          "end": 992,
-          "name": "ADD",
-          "source": 1
-        },
-        {
-          "begin": 949,
-          "end": 1002,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "17"
-        },
-        {
-          "begin": 949,
-          "end": 1002,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 949,
-          "end": 1002,
-          "name": "tag",
-          "source": 1,
-          "value": "32"
-        },
-        {
-          "begin": 949,
-          "end": 1002,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 939,
-          "end": 1002,
-          "name": "SWAP2",
-          "source": 1
-        },
-        {
-          "begin": 939,
-          "end": 1002,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 895,
-          "end": 1012,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "name": "SWAP3",
-          "source": 1
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "name": "SWAP2",
-          "source": 1
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 690,
-          "end": 1019,
-          "jumpType": "[out]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 1025,
-          "end": 1205,
-          "name": "tag",
-          "source": 1,
-          "value": "18"
-        },
-        {
-          "begin": 1025,
-          "end": 1205,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 1073,
-          "end": 1150,
-          "name": "PUSH",
-          "source": 1,
-          "value": "4E487B7100000000000000000000000000000000000000000000000000000000"
-        },
-        {
-          "begin": 1070,
-          "end": 1071,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 1063,
-          "end": 1151,
-          "name": "MSTORE",
-          "source": 1
-        },
-        {
-          "begin": 1170,
-          "end": 1174,
-          "name": "PUSH",
-          "source": 1,
-          "value": "11"
-        },
-        {
-          "begin": 1167,
-          "end": 1168,
-          "name": "PUSH",
-          "source": 1,
-          "value": "4"
-        },
-        {
-          "begin": 1160,
-          "end": 1175,
-          "name": "MSTORE",
-          "source": 1
-        },
-        {
-          "begin": 1194,
-          "end": 1198,
-          "name": "PUSH",
-          "source": 1,
-          "value": "24"
-        },
-        {
-          "begin": 1191,
-          "end": 1192,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 1184,
-          "end": 1199,
-          "name": "REVERT",
-          "source": 1
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "name": "tag",
-          "source": 1,
-          "value": "10"
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 1251,
-          "end": 1254,
-          "name": "PUSH",
-          "source": 1,
-          "value": "0"
-        },
-        {
-          "begin": 1270,
-          "end": 1290,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "35"
-        },
-        {
-          "begin": 1288,
-          "end": 1289,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 1270,
-          "end": 1290,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "15"
-        },
-        {
-          "begin": 1270,
-          "end": 1290,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 1270,
-          "end": 1290,
-          "name": "tag",
-          "source": 1,
-          "value": "35"
-        },
-        {
-          "begin": 1270,
-          "end": 1290,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 1265,
-          "end": 1290,
-          "name": "SWAP2",
-          "source": 1
-        },
-        {
-          "begin": 1265,
-          "end": 1290,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 1304,
-          "end": 1324,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "36"
-        },
-        {
-          "begin": 1322,
-          "end": 1323,
-          "name": "DUP4",
-          "source": 1
-        },
-        {
-          "begin": 1304,
-          "end": 1324,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "15"
-        },
-        {
-          "begin": 1304,
-          "end": 1324,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 1304,
-          "end": 1324,
-          "name": "tag",
-          "source": 1,
-          "value": "36"
-        },
-        {
-          "begin": 1304,
-          "end": 1324,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 1299,
-          "end": 1324,
-          "name": "SWAP3",
-          "source": 1
-        },
-        {
-          "begin": 1299,
-          "end": 1324,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 1347,
-          "end": 1348,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 1344,
-          "end": 1345,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 1340,
-          "end": 1349,
-          "name": "ADD",
-          "source": 1
-        },
-        {
-          "begin": 1333,
-          "end": 1349,
-          "name": "SWAP1",
-          "source": 1
-        },
-        {
-          "begin": 1333,
-          "end": 1349,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 1368,
-          "end": 1371,
-          "name": "DUP1",
-          "source": 1
-        },
-        {
-          "begin": 1365,
-          "end": 1366,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 1362,
-          "end": 1372,
-          "name": "GT",
-          "source": 1
-        },
-        {
-          "begin": 1359,
-          "end": 1395,
-          "name": "ISZERO",
-          "source": 1
-        },
-        {
-          "begin": 1359,
-          "end": 1395,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "37"
-        },
-        {
-          "begin": 1359,
-          "end": 1395,
-          "name": "JUMPI",
-          "source": 1
-        },
-        {
-          "begin": 1375,
-          "end": 1393,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "38"
-        },
-        {
-          "begin": 1375,
-          "end": 1393,
-          "name": "PUSH [tag]",
-          "source": 1,
-          "value": "18"
-        },
-        {
-          "begin": 1375,
-          "end": 1393,
-          "jumpType": "[in]",
-          "name": "JUMP",
-          "source": 1
-        },
-        {
-          "begin": 1375,
-          "end": 1393,
-          "name": "tag",
-          "source": 1,
-          "value": "38"
-        },
-        {
-          "begin": 1375,
-          "end": 1393,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 1359,
-          "end": 1395,
-          "name": "tag",
-          "source": 1,
-          "value": "37"
-        },
-        {
-          "begin": 1359,
-          "end": 1395,
-          "name": "JUMPDEST",
-          "source": 1
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "name": "SWAP3",
-          "source": 1
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "name": "SWAP2",
-          "source": 1
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "name": "POP",
-          "source": 1
-        },
-        {
-          "begin": 1211,
-          "end": 1402,
-          "jumpType": "[out]",
-          "name": "JUMP",
-          "source": 1
-        }
-      ]
-    }
-  },
-  "sourceList":
-  [
-    "asm_json/input.sol",
-    "#utility.yul"
-  ]
-}
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/args b/test/cmdlineTests/asm_json_import_all_valid_flags/args
deleted file mode 100644
index e6010eac3b05..000000000000
--- a/test/cmdlineTests/asm_json_import_all_valid_flags/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4 --combined-json bin,bin-runtime,opcodes,asm,srcmap,srcmap-runtime --asm --bin --bin-runtime --asm-json --import-asm-json -
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/output b/test/cmdlineTests/asm_json_import_all_valid_flags/output
deleted file mode 100644
index 7b8aa0297982..000000000000
--- a/test/cmdlineTests/asm_json_import_all_valid_flags/output
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "contracts":
-    {
-        "<stdin>":
-        {
-            "asm":
-            {
-                ".code":
-                [
-                    {
-                        "begin": 0,
-                        "end": 0,
-                        "name": "PUSH",
-                        "source": -1,
-                        "value": "0"
-                    }
-                ],
-                ".data":
-                {
-                    "0":
-                    {
-                        ".code":
-                        [
-                            {
-                                "begin": 0,
-                                "end": 0,
-                                "name": "PUSH",
-                                "source": -1,
-                                "value": "1"
-                            }
-                        ]
-                    }
-                },
-                "sourceList":
-                [
-                    "contract.sol",
-                    "#utility.yul"
-                ]
-            },
-            "bin": "5ffe",
-            "bin-runtime": "6001",
-            "opcodes": "PUSH0 INVALID ",
-            "srcmap": "0:0::-:0",
-            "srcmap-runtime": "0:0::-:0"
-        }
-    },
-    "sourceList":
-    [
-        "contract.sol",
-        "#utility.yul"
-    ],
-    "version": "<VERSION REMOVED>"
-}
-Binary:
-5ffe
-Binary of the runtime part:
-6001
-EVM assembly:
-{
-    ".code":
-    [
-        {
-            "begin": 0,
-            "end": 0,
-            "name": "PUSH",
-            "source": -1,
-            "value": "0"
-        }
-    ],
-    ".data":
-    {
-        "0":
-        {
-            ".code":
-            [
-                {
-                    "begin": 0,
-                    "end": 0,
-                    "name": "PUSH",
-                    "source": -1,
-                    "value": "1"
-                }
-            ]
-        }
-    },
-    "sourceList":
-    [
-        "contract.sol",
-        "#utility.yul"
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/stdin b/test/cmdlineTests/asm_json_import_all_valid_flags/stdin
deleted file mode 100644
index 1a707b786744..000000000000
--- a/test/cmdlineTests/asm_json_import_all_valid_flags/stdin
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "0": {
-            ".code": [
-                {
-                    "name": "PUSH",
-                    "value": "1"
-                }
-            ]
-        }
-    },
-    "sourceList": [
-        "contract.sol",
-        "#utility.yul"
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
deleted file mode 100644
index 3d19f83d668f..000000000000
--- a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
+++ /dev/null
@@ -1,6 +0,0 @@
-Opcodes:
-PREVRANDAO PREVRANDAO 
-EVM assembly:
-    /*   */
-  prevrandao
-  prevrandao
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin
deleted file mode 100644
index f6cc546647c3..000000000000
--- a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    ".code": [
-        {"name": "DIFFICULTY"},
-        {"name": "PREVRANDAO"}
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
deleted file mode 100644
index 873465aa1f3f..000000000000
--- a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
+++ /dev/null
@@ -1,57 +0,0 @@
-Opcodes:
-PUSH0 INVALID 
-EVM assembly:
-    /*   */
-  0x00
-stop
-
-sub_0: assembly {
-}
-
-sub_1: assembly {
-}
-
-sub_2: assembly {
-}
-
-sub_3: assembly {
-}
-
-sub_4: assembly {
-}
-
-sub_5: assembly {
-}
-
-sub_6: assembly {
-}
-
-sub_7: assembly {
-}
-
-sub_8: assembly {
-}
-
-sub_9: assembly {
-}
-
-sub_10: assembly {
-}
-
-sub_11: assembly {
-}
-
-sub_12: assembly {
-}
-
-sub_13: assembly {
-}
-
-sub_14: assembly {
-}
-
-sub_15: assembly {
-}
-
-sub_16: assembly {
-}
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin
deleted file mode 100644
index 70c89a2347b9..000000000000
--- a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "0": {".code": []},
-        "1": {".code": []},
-        "2": {".code": []},
-        "3": {".code": []},
-        "4": {".code": []},
-        "5": {".code": []},
-        "6": {".code": []},
-        "7": {".code": []},
-        "8": {".code": []},
-        "9": {".code": []},
-        "a": {".code": []},
-        "b": {".code": []},
-        "c": {".code": []},
-        "d": {".code": []},
-        "e": {".code": []},
-        "f": {".code": []},
-        "10": {".code": []}
-    }
-}
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err
deleted file mode 100644
index 8e3458bd6b60..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: The value for key '0' inside '.data' is not a valid hexadecimal string.
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin
deleted file mode 100644
index 6c1673694318..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "0": "no-hex-string"
-    }
-}
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/args b/test/cmdlineTests/asm_json_import_invalid_data_not_object/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_object/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/err b/test/cmdlineTests/asm_json_import_invalid_data_not_object/err
deleted file mode 100644
index ddcfeca7d45b..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_object/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: The value of key '0' inside '.data' is neither a hex string nor an object.
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit b/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin b/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin
deleted file mode 100644
index 29cc24aada13..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    ".code": [
-        {
-          "name": "PUSH",
-          "value": "0"
-        }
-    ],
-    ".data": {
-        "0": [0, 1, 2, 3]
-    }
-}
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err
deleted file mode 100644
index e553029e60a0..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: Member 'jumpType' set on instruction different from JUMP or JUMPI (was set on instruction 'PUSH')
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin
deleted file mode 100644
index 2df5445d6336..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0",
-            "jumpType": "[in]"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/args b/test/cmdlineTests/asm_json_import_invalid_value/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_value/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/err b/test/cmdlineTests/asm_json_import_invalid_value/err
deleted file mode 100644
index 67723f82d228..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_value/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: Member 'value' defined for instruction 'DIFFICULTY', but the instruction does not need a value.
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/exit b/test/cmdlineTests/asm_json_import_invalid_value/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_value/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/stdin b/test/cmdlineTests/asm_json_import_invalid_value/stdin
deleted file mode 100644
index 6252ff695cbd..000000000000
--- a/test/cmdlineTests/asm_json_import_invalid_value/stdin
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "DIFFICULTY",
-            "value": "0"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/args b/test/cmdlineTests/asm_json_import_missing_subobject_indices/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_missing_subobject_indices/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/err b/test/cmdlineTests/asm_json_import_missing_subobject_indices/err
deleted file mode 100644
index 1decd6dda6ce..000000000000
--- a/test/cmdlineTests/asm_json_import_missing_subobject_indices/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: Invalid subassembly indices in '.data'. Not all numbers between 0 and 8 are present.
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit b/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin b/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin
deleted file mode 100644
index 6832823ebdda..000000000000
--- a/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "2": {".code": []},
-        "0": {".code": []},
-        "4": {".code": []},
-        "5": {".code": []},
-        "7": {".code": []},
-        "6": {".code": []},
-        "9": {".code": []},
-        "1": {".code": []},
-        "8": {".code": []}
-    }
-}
diff --git a/test/cmdlineTests/asm_json_import_no_value/args b/test/cmdlineTests/asm_json_import_no_value/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_no_value/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_no_value/err b/test/cmdlineTests/asm_json_import_no_value/err
deleted file mode 100644
index 02428d99a874..000000000000
--- a/test/cmdlineTests/asm_json_import_no_value/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: Member 'value' is missing for instruction 'PUSH', but the instruction needs a value.
diff --git a/test/cmdlineTests/asm_json_import_no_value/exit b/test/cmdlineTests/asm_json_import_no_value/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_no_value/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_no_value/stdin b/test/cmdlineTests/asm_json_import_no_value/stdin
deleted file mode 100644
index 99ab122c90e4..000000000000
--- a/test/cmdlineTests/asm_json_import_no_value/stdin
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    ".code": [
-        {"name": "PUSH"}
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/args b/test/cmdlineTests/asm_json_import_non_unique_sources/args
deleted file mode 100644
index d27cc7bb214e..000000000000
--- a/test/cmdlineTests/asm_json_import_non_unique_sources/args
+++ /dev/null
@@ -1 +0,0 @@
---asm-json --import-asm-json -
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/err b/test/cmdlineTests/asm_json_import_non_unique_sources/err
deleted file mode 100644
index 78eadfc0b532..000000000000
--- a/test/cmdlineTests/asm_json_import_non_unique_sources/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: Items in 'sourceList' array are not unique.
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/exit b/test/cmdlineTests/asm_json_import_non_unique_sources/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_non_unique_sources/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/stdin b/test/cmdlineTests/asm_json_import_non_unique_sources/stdin
deleted file mode 100644
index 431d5a6468c6..000000000000
--- a/test/cmdlineTests/asm_json_import_non_unique_sources/stdin
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "0": {
-          ".code": [
-              {
-                  "name": "PUSH",
-                  "value": "1"
-              }
-          ]
-        }
-    },
-    "sourceList": [
-        "contract.sol",
-        "contract.sol",
-        "#utility.yul"
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/args b/test/cmdlineTests/asm_json_import_optimize_not_supported/args
deleted file mode 100644
index f649e9740882..000000000000
--- a/test/cmdlineTests/asm_json_import_optimize_not_supported/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/err b/test/cmdlineTests/asm_json_import_optimize_not_supported/err
deleted file mode 100644
index 8f42dca78694..000000000000
--- a/test/cmdlineTests/asm_json_import_optimize_not_supported/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize is not supported with --import-asm-json.
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/exit b/test/cmdlineTests/asm_json_import_optimize_not_supported/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_optimize_not_supported/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin b/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin
deleted file mode 100644
index f6cc546647c3..000000000000
--- a/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    ".code": [
-        {"name": "DIFFICULTY"},
-        {"name": "PREVRANDAO"}
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/args b/test/cmdlineTests/asm_json_import_out_of_range_data_index/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_out_of_range_data_index/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/err b/test/cmdlineTests/asm_json_import_out_of_range_data_index/err
deleted file mode 100644
index 08c766c3a82f..000000000000
--- a/test/cmdlineTests/asm_json_import_out_of_range_data_index/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: The key '18446744073709551615' inside '.data' is out of the supported integer range.
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit b/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin b/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin
deleted file mode 100644
index 3e8f88970e8b..000000000000
--- a/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "18446744073709551615": {
-            ".code": []
-        }
-    }
-}
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/args b/test/cmdlineTests/asm_json_import_random_order_data_index/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_random_order_data_index/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/output b/test/cmdlineTests/asm_json_import_random_order_data_index/output
deleted file mode 100644
index b23848e5ddcb..000000000000
--- a/test/cmdlineTests/asm_json_import_random_order_data_index/output
+++ /dev/null
@@ -1,35 +0,0 @@
-Opcodes:
-PUSH0 INVALID 
-EVM assembly:
-    /*   */
-  0x00
-stop
-
-sub_0: assembly {
-}
-
-sub_1: assembly {
-    stop
-
-    sub_0: assembly {
-    }
-
-    sub_1: assembly {
-    }
-
-    sub_2: assembly {
-    }
-}
-
-sub_2: assembly {
-    stop
-
-    sub_0: assembly {
-    }
-
-    sub_1: assembly {
-    }
-}
-
-sub_3: assembly {
-}
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/stdin b/test/cmdlineTests/asm_json_import_random_order_data_index/stdin
deleted file mode 100644
index c695de5cd441..000000000000
--- a/test/cmdlineTests/asm_json_import_random_order_data_index/stdin
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "PUSH",
-            "value": "0"
-        }
-    ],
-    ".data": {
-        "2": {
-            ".code": [],
-            ".data": {
-                "1": {".code": []},
-                "0": {".code": []}
-            }
-        },
-        "0": {".code": []},
-        "1": {
-            ".code": [],
-            ".data": {
-                "1": {".code": []},
-                "2": {".code": []},
-                "0": {".code": []}
-            }
-        },
-        "3": {".code": []}
-    }
-}
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/args b/test/cmdlineTests/asm_json_import_unrecognized_field/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_unrecognized_field/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/err b/test/cmdlineTests/asm_json_import_unrecognized_field/err
deleted file mode 100644
index 35b7fc9f6faf..000000000000
--- a/test/cmdlineTests/asm_json_import_unrecognized_field/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: Unknown member '_name'. Valid members are: begin, end, jumpType, modifierDepth, name, source, value.
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/exit b/test/cmdlineTests/asm_json_import_unrecognized_field/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_unrecognized_field/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/stdin b/test/cmdlineTests/asm_json_import_unrecognized_field/stdin
deleted file mode 100644
index c1dc7cd84d60..000000000000
--- a/test/cmdlineTests/asm_json_import_unrecognized_field/stdin
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    ".code": [
-        {"_name": "DIFFICULTY"}
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/args b/test/cmdlineTests/asm_json_import_untagged_jumpdest/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_untagged_jumpdest/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/err b/test/cmdlineTests/asm_json_import_untagged_jumpdest/err
deleted file mode 100644
index f31c32fef8d0..000000000000
--- a/test/cmdlineTests/asm_json_import_untagged_jumpdest/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Assembly Import Error: JUMPDEST instruction without a tag
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit b/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin b/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin
deleted file mode 100644
index beaa19be5543..000000000000
--- a/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    ".code": [
-        {
-            "name": "tag",
-            "value": "0x00"
-        },
-        {"name": "JUMPDEST"},
-        {"name": "JUMPDEST"}
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_verbatim/args b/test/cmdlineTests/asm_json_import_verbatim/args
deleted file mode 100644
index 2b4b3a1534b7..000000000000
--- a/test/cmdlineTests/asm_json_import_verbatim/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_verbatim/output b/test/cmdlineTests/asm_json_import_verbatim/output
deleted file mode 100644
index 50b8a4ce948f..000000000000
--- a/test/cmdlineTests/asm_json_import_verbatim/output
+++ /dev/null
@@ -1,58 +0,0 @@
-Opcodes:
-PUSH0 CALLDATALOAD PUSH1 0x14 DUP1 DUP3 SSTORE PUSH1 0x20 CALLDATALOAD ISZERO PUSH1 0x1C JUMPI DUP1 DUP3 SSTORE PUSH0 DUP1 PUSH0 DUP1 PUSH0 DUP1 STATICCALL POP PUSH25 0x797A5B80825550500000000000000000000000000000000000 
-EVM assembly:
-    /* "<stdin>":28:29    */
-  0x00
-    /* "<stdin>":15:30  [... */
-  calldataload
-    /* "<stdin>":44:46  n" */
-  0x14
-    /* "<stdin>":61:62    */
-  dup1
-    /* "<stdin>":58:59    */
-  dup3
-    /* "<stdin>":51:63  ... */
-  sstore
-    /* "<stdin>":84:86     */
-  0x20
-    /* "<stdin>":71:87  29,... */
-  calldataload
-    /* "<stdin>":68:188  ": 29,... */
-  iszero
-  tag_1
-  jumpi
-    /* "<stdin>":108:109    */
-  dup1
-    /* "<stdin>":105:106    */
-  dup3
-    /* "<stdin>":98:110  SH",... */
-  sstore
-    /* "<stdin>":149:150  " */
-  0x00
-    /* "<stdin>":146:147  " */
-  dup1
-    /* "<stdin>":143:144  l */
-  0x00
-    /* "<stdin>":140:141  " */
-  dup1
-    /* "<stdin>":137:138    */
-  0x00
-    /* "<stdin>":134:135    */
-  dup1
-    /* "<stdin>":123:151  : 0,... */
-  staticcall
-    /* "<stdin>":119:152  rce": 0,... */
-  pop
-    /* "<stdin>":161:182  },... */
-  verbatimbytecode_78797a
-    /* "<stdin>":68:188  ": 29,... */
-tag_1:
-    /* "<stdin>":203:204    */
-  dup1
-    /* "<stdin>":200:201    */
-  dup3
-    /* "<stdin>":193:205  : 15,... */
-  sstore
-    /* "<stdin>":0:207  {... */
-  pop
-  pop
diff --git a/test/cmdlineTests/asm_json_import_verbatim/stdin b/test/cmdlineTests/asm_json_import_verbatim/stdin
deleted file mode 100644
index df4b0ce08268..000000000000
--- a/test/cmdlineTests/asm_json_import_verbatim/stdin
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-    ".code": [
-        {
-            "begin": 28,
-            "end": 29,
-            "name": "PUSH",
-            "source": 0,
-            "value": "0"
-        },
-        {
-            "begin": 15,
-            "end": 30,
-            "name": "CALLDATALOAD",
-            "source": 0
-        },
-        {
-            "begin": 44,
-            "end": 46,
-            "name": "PUSH",
-            "source": 0,
-            "value": "14"
-        },
-        {
-            "begin": 61,
-            "end": 62,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 58,
-            "end": 59,
-            "name": "DUP3",
-            "source": 0
-        },
-        {
-            "begin": 51,
-            "end": 63,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 84,
-            "end": 86,
-            "name": "PUSH",
-            "source": 0,
-            "value": "20"
-        },
-        {
-            "begin": 71,
-            "end": 87,
-            "name": "CALLDATALOAD",
-            "source": 0
-        },
-        {
-            "begin": 68,
-            "end": 188,
-            "name": "ISZERO",
-            "source": 0
-        },
-        {
-            "begin": 68,
-            "end": 188,
-            "name": "PUSH [tag]",
-            "source": 0,
-            "value": "1"
-        },
-        {
-            "begin": 68,
-            "end": 188,
-            "name": "JUMPI",
-            "source": 0
-        },
-        {
-            "begin": 108,
-            "end": 109,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 105,
-            "end": 106,
-            "name": "DUP3",
-            "source": 0
-        },
-        {
-            "begin": 98,
-            "end": 110,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 149,
-            "end": 150,
-            "name": "PUSH",
-            "source": 0,
-            "value": "0"
-        },
-        {
-            "begin": 146,
-            "end": 147,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 143,
-            "end": 144,
-            "name": "PUSH",
-            "source": 0,
-            "value": "0"
-        },
-        {
-            "begin": 140,
-            "end": 141,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 137,
-            "end": 138,
-            "name": "PUSH",
-            "source": 0,
-            "value": "0"
-        },
-        {
-            "begin": 134,
-            "end": 135,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 123,
-            "end": 151,
-            "name": "STATICCALL",
-            "source": 0
-        },
-        {
-            "begin": 119,
-            "end": 152,
-            "name": "POP",
-            "source": 0
-        },
-        {
-            "begin": 161,
-            "end": 182,
-            "name": "VERBATIM",
-            "source": 0,
-            "value": "78797a"
-        },
-        {
-            "begin": 68,
-            "end": 188,
-            "name": "tag",
-            "source": 0,
-            "value": "1"
-        },
-        {
-            "begin": 68,
-            "end": 188,
-            "name": "JUMPDEST",
-            "source": 0
-        },
-        {
-            "begin": 203,
-            "end": 204,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 200,
-            "end": 201,
-            "name": "DUP3",
-            "source": 0
-        },
-        {
-            "begin": 193,
-            "end": 205,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 0,
-            "end": 207,
-            "name": "POP",
-            "source": 0
-        },
-        {
-            "begin": 0,
-            "end": 207,
-            "name": "POP",
-            "source": 0
-        }
-    ],
-    "sourceList": [
-        "<stdin>"
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/args b/test/cmdlineTests/asm_json_import_yul_more_subobjects/args
deleted file mode 100644
index 58dfc8cc7348..000000000000
--- a/test/cmdlineTests/asm_json_import_yul_more_subobjects/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/output b/test/cmdlineTests/asm_json_import_yul_more_subobjects/output
deleted file mode 100644
index 81aa5b938705..000000000000
--- a/test/cmdlineTests/asm_json_import_yul_more_subobjects/output
+++ /dev/null
@@ -1,2 +0,0 @@
-Opcodes:
-PUSH1 0x1E PUSH0 SSTORE PUSH1 0x1A PUSH1 0x1 SSTORE PUSH1 0x15 PUSH1 0x2 SSTORE PUSH1 0x1 PUSH1 0x3 SSTORE PUSH1 0x1 PUSH1 0x4 SSTORE PUSH1 0x1 PUSH1 0x5 SSTORE INVALID 
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin b/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin
deleted file mode 100644
index 1820bcf52273..000000000000
--- a/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin
+++ /dev/null
@@ -1,348 +0,0 @@
-{
-    ".code": [
-        {
-            "begin": 37,
-            "end": 51,
-            "name": "PUSHSIZE",
-            "source": 0
-        },
-        {
-            "begin": 34,
-            "end": 35,
-            "name": "PUSH",
-            "source": 0,
-            "value": "0"
-        },
-        {
-            "begin": 27,
-            "end": 52,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 67,
-            "end": 81,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "0000000000000000000000000000000000000000000000000000000000000000"
-        },
-        {
-            "begin": 64,
-            "end": 65,
-            "name": "PUSH",
-            "source": 0,
-            "value": "1"
-        },
-        {
-            "begin": 57,
-            "end": 82,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 97,
-            "end": 114,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
-        },
-        {
-            "begin": 94,
-            "end": 95,
-            "name": "PUSH",
-            "source": 0,
-            "value": "2"
-        },
-        {
-            "begin": 87,
-            "end": 115,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 130,
-            "end": 152,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
-        },
-        {
-            "begin": 127,
-            "end": 128,
-            "name": "PUSH",
-            "source": 0,
-            "value": "3"
-        },
-        {
-            "begin": 120,
-            "end": 153,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 168,
-            "end": 190,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
-        },
-        {
-            "begin": 165,
-            "end": 166,
-            "name": "PUSH",
-            "source": 0,
-            "value": "4"
-        },
-        {
-            "begin": 158,
-            "end": 191,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 206,
-            "end": 228,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffc"
-        },
-        {
-            "begin": 203,
-            "end": 204,
-            "name": "PUSH",
-            "source": 0,
-            "value": "5"
-        },
-        {
-            "begin": 196,
-            "end": 229,
-            "name": "SSTORE",
-            "source": 0
-        }
-    ],
-    ".data": {
-        "0": {
-            ".code": [
-                {
-                    "begin": 278,
-                    "end": 292,
-                    "name": "PUSHSIZE",
-                    "source": 0
-                },
-                {
-                    "begin": 275,
-                    "end": 276,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "6"
-                },
-                {
-                    "begin": 268,
-                    "end": 293,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 310,
-                    "end": 324,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
-                },
-                {
-                    "begin": 307,
-                    "end": 308,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "7"
-                },
-                {
-                    "begin": 300,
-                    "end": 325,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 342,
-                    "end": 361,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
-                },
-                {
-                    "begin": 339,
-                    "end": 340,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "8"
-                },
-                {
-                    "begin": 332,
-                    "end": 362,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 379,
-                    "end": 398,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
-                },
-                {
-                    "begin": 376,
-                    "end": 377,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "9"
-                },
-                {
-                    "begin": 369,
-                    "end": 399,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 417,
-                    "end": 436,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
-                },
-                {
-                    "begin": 413,
-                    "end": 415,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "A"
-                },
-                {
-                    "begin": 406,
-                    "end": 437,
-                    "name": "SSTORE",
-                    "source": 0
-                }
-            ],
-            ".data": {
-                "0": {
-                    ".code": [
-                        {
-                            "begin": 494,
-                            "end": 508,
-                            "name": "PUSHSIZE",
-                            "source": 0
-                        },
-                        {
-                            "begin": 490,
-                            "end": 492,
-                            "name": "PUSH",
-                            "source": 0,
-                            "value": "B"
-                        },
-                        {
-                            "begin": 483,
-                            "end": 509,
-                            "name": "SSTORE",
-                            "source": 0
-                        },
-                        {
-                            "begin": 529,
-                            "end": 545,
-                            "name": "PUSH #[$]",
-                            "source": 0,
-                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
-                        },
-                        {
-                            "begin": 525,
-                            "end": 527,
-                            "name": "PUSH",
-                            "source": 0,
-                            "value": "C"
-                        },
-                        {
-                            "begin": 518,
-                            "end": 546,
-                            "name": "SSTORE",
-                            "source": 0
-                        },
-                        {
-                            "begin": 566,
-                            "end": 582,
-                            "name": "PUSH #[$]",
-                            "source": 0,
-                            "value": "0000000000000000000000000000000000000000000000000000000000000001"
-                        },
-                        {
-                            "begin": 562,
-                            "end": 564,
-                            "name": "PUSH",
-                            "source": 0,
-                            "value": "D"
-                        },
-                        {
-                            "begin": 555,
-                            "end": 583,
-                            "name": "SSTORE",
-                            "source": 0
-                        },
-                        {
-                            "begin": 603,
-                            "end": 619,
-                            "name": "PUSH #[$]",
-                            "source": 0,
-                            "value": "0000000000000000000000000000000000000000000000000000000000000002"
-                        },
-                        {
-                            "begin": 599,
-                            "end": 601,
-                            "name": "PUSH",
-                            "source": 0,
-                            "value": "E"
-                        },
-                        {
-                            "begin": 592,
-                            "end": 620,
-                            "name": "SSTORE",
-                            "source": 0
-                        }
-                    ],
-                    ".data": {
-                        "0": {
-                            ".code": [
-                                {
-                                    "begin": 676,
-                                    "end": 685,
-                                    "name": "INVALID",
-                                    "source": 0
-                                }
-                            ]
-                        },
-                        "1": {
-                            ".code": [
-                                {
-                                    "begin": 751,
-                                    "end": 760,
-                                    "name": "INVALID",
-                                    "source": 0
-                                }
-                            ]
-                        },
-                        "2": {
-                            ".code": [
-                                {
-                                    "begin": 826,
-                                    "end": 835,
-                                    "name": "INVALID",
-                                    "source": 0
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sourceList": [
-        "<stdin>"
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/args b/test/cmdlineTests/asm_json_import_yul_subobjects/args
deleted file mode 100644
index 58dfc8cc7348..000000000000
--- a/test/cmdlineTests/asm_json_import_yul_subobjects/args
+++ /dev/null
@@ -1 +0,0 @@
---import-asm-json - --opcodes
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/output b/test/cmdlineTests/asm_json_import_yul_subobjects/output
deleted file mode 100644
index 6aa2d0f64d90..000000000000
--- a/test/cmdlineTests/asm_json_import_yul_subobjects/output
+++ /dev/null
@@ -1,2 +0,0 @@
-Opcodes:
-PUSH0 DUP1 SSTORE PUSH1 0x6A PUSH1 0x1 SSTORE PUSH1 0x31 PUSH1 0x2 SSTORE PUSH1 0x2C PUSH1 0x3 SSTORE PUSH1 0x5E PUSH1 0x4 SSTORE PUSH1 0xC PUSH1 0x5 SSTORE PUSH1 0x5D PUSH1 0x6 SSTORE PUSH1 0x1 PUSH1 0x7 SSTORE PUSH1 0x5D PUSH1 0x8 SSTORE PUSH1 0x1 PUSH1 0x9 SSTORE INVALID PUSH1 0x1F PUSH1 0xA SSTORE PUSH1 0xC PUSH1 0xB SSTORE PUSH1 0x2B PUSH1 0xC SSTORE PUSH1 0x1 PUSH1 0xD SSTORE PUSH1 0x2B PUSH1 0xE SSTORE PUSH1 0x1 PUSH1 0xF SSTORE INVALID PUSH1 0xB PUSH1 0x10 SSTORE PUSH1 0x1 PUSH1 0x11 SSTORE INVALID INVALID INVALID INVALID PUSH1 0xB PUSH1 0x10 SSTORE PUSH1 0x1 PUSH1 0x11 SSTORE INVALID INVALID 
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/stdin b/test/cmdlineTests/asm_json_import_yul_subobjects/stdin
deleted file mode 100644
index 0c8cdcf41f4a..000000000000
--- a/test/cmdlineTests/asm_json_import_yul_subobjects/stdin
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-    ".code": [
-        {
-            "begin": 36,
-            "end": 51,
-            "name": "PUSH",
-            "source": 0,
-            "value": "0"
-        },
-        {
-            "begin": 33,
-            "end": 34,
-            "name": "DUP1",
-            "source": 0
-        },
-        {
-            "begin": 26,
-            "end": 52,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 67,
-            "end": 80,
-            "name": "PUSHSIZE",
-            "source": 0
-        },
-        {
-            "begin": 64,
-            "end": 65,
-            "name": "PUSH",
-            "source": 0,
-            "value": "1"
-        },
-        {
-            "begin": 57,
-            "end": 81,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 96,
-            "end": 111,
-            "name": "PUSH [$]",
-            "source": 0,
-            "value": "0000000000000000000000000000000000000000000000000000000000000000"
-        },
-        {
-            "begin": 93,
-            "end": 94,
-            "name": "PUSH",
-            "source": 0,
-            "value": "2"
-        },
-        {
-            "begin": 86,
-            "end": 112,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 127,
-            "end": 140,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "0000000000000000000000000000000000000000000000000000000000000000"
-        },
-        {
-            "begin": 124,
-            "end": 125,
-            "name": "PUSH",
-            "source": 0,
-            "value": "3"
-        },
-        {
-            "begin": 117,
-            "end": 141,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 156,
-            "end": 173,
-            "name": "PUSH [$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
-        },
-        {
-            "begin": 153,
-            "end": 154,
-            "name": "PUSH",
-            "source": 0,
-            "value": "4"
-        },
-        {
-            "begin": 146,
-            "end": 174,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 189,
-            "end": 204,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
-        },
-        {
-            "begin": 186,
-            "end": 187,
-            "name": "PUSH",
-            "source": 0,
-            "value": "5"
-        },
-        {
-            "begin": 179,
-            "end": 205,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 220,
-            "end": 237,
-            "name": "PUSH [$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
-        },
-        {
-            "begin": 217,
-            "end": 218,
-            "name": "PUSH",
-            "source": 0,
-            "value": "6"
-        },
-        {
-            "begin": 210,
-            "end": 238,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 253,
-            "end": 268,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
-        },
-        {
-            "begin": 250,
-            "end": 251,
-            "name": "PUSH",
-            "source": 0,
-            "value": "7"
-        },
-        {
-            "begin": 243,
-            "end": 269,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 284,
-            "end": 303,
-            "name": "PUSH [$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
-        },
-        {
-            "begin": 281,
-            "end": 282,
-            "name": "PUSH",
-            "source": 0,
-            "value": "8"
-        },
-        {
-            "begin": 274,
-            "end": 304,
-            "name": "SSTORE",
-            "source": 0
-        },
-        {
-            "begin": 319,
-            "end": 336,
-            "name": "PUSH #[$]",
-            "source": 0,
-            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
-        },
-        {
-            "begin": 316,
-            "end": 317,
-            "name": "PUSH",
-            "source": 0,
-            "value": "9"
-        },
-        {
-            "begin": 309,
-            "end": 337,
-            "name": "SSTORE",
-            "source": 0
-        }
-    ],
-    ".data": {
-        "0": {
-            ".code": [
-                {
-                    "begin": 418,
-                    "end": 433,
-                    "name": "PUSH [$]",
-                    "source": 0,
-                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
-                },
-                {
-                    "begin": 414,
-                    "end": 416,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "A"
-                },
-                {
-                    "begin": 407,
-                    "end": 434,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 452,
-                    "end": 465,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
-                },
-                {
-                    "begin": 448,
-                    "end": 450,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "B"
-                },
-                {
-                    "begin": 441,
-                    "end": 466,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 484,
-                    "end": 499,
-                    "name": "PUSH [$]",
-                    "source": 0,
-                    "value": "0000000000000000000000000000000000000000000000000000000000000001"
-                },
-                {
-                    "begin": 480,
-                    "end": 482,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "C"
-                },
-                {
-                    "begin": 473,
-                    "end": 500,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 518,
-                    "end": 531,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "0000000000000000000000000000000000000000000000000000000000000001"
-                },
-                {
-                    "begin": 514,
-                    "end": 516,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "D"
-                },
-                {
-                    "begin": 507,
-                    "end": 532,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 550,
-                    "end": 567,
-                    "name": "PUSH [$]",
-                    "source": 0,
-                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
-                },
-                {
-                    "begin": 546,
-                    "end": 548,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "E"
-                },
-                {
-                    "begin": 539,
-                    "end": 568,
-                    "name": "SSTORE",
-                    "source": 0
-                },
-                {
-                    "begin": 586,
-                    "end": 601,
-                    "name": "PUSH #[$]",
-                    "source": 0,
-                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
-                },
-                {
-                    "begin": 582,
-                    "end": 584,
-                    "name": "PUSH",
-                    "source": 0,
-                    "value": "F"
-                },
-                {
-                    "begin": 575,
-                    "end": 602,
-                    "name": "SSTORE",
-                    "source": 0
-                }
-            ],
-            ".data": {
-                "0": {
-                    ".code": [
-                        {
-                            "begin": 658,
-                            "end": 673,
-                            "name": "PUSH [$]",
-                            "source": 0,
-                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
-                        },
-                        {
-                            "begin": 654,
-                            "end": 656,
-                            "name": "PUSH",
-                            "source": 0,
-                            "value": "10"
-                        },
-                        {
-                            "begin": 647,
-                            "end": 674,
-                            "name": "SSTORE",
-                            "source": 0
-                        },
-                        {
-                            "begin": 694,
-                            "end": 707,
-                            "name": "PUSH #[$]",
-                            "source": 0,
-                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
-                        },
-                        {
-                            "begin": 690,
-                            "end": 692,
-                            "name": "PUSH",
-                            "source": 0,
-                            "value": "11"
-                        },
-                        {
-                            "begin": 683,
-                            "end": 708,
-                            "name": "SSTORE",
-                            "source": 0
-                        }
-                    ],
-                    ".data": {
-                        "0": {
-                            ".code": [
-                                {
-                                    "begin": 761,
-                                    "end": 770,
-                                    "name": "INVALID",
-                                    "source": 0
-                                }
-                            ]
-                        }
-                    }
-                },
-                "1": {
-                    ".code": [
-                        {
-                            "begin": 833,
-                            "end": 842,
-                            "name": "INVALID",
-                            "source": 0
-                        }
-                    ]
-                }
-            }
-        },
-        "ACAF3289D7B601CBD114FB36C4D29C85BBFD5E133F14CB355C3FD8D99367964F": "48656c6c6f2c20576f726c6421"
-    },
-    "sourceList": [
-        "<stdin>"
-    ]
-}
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/args b/test/cmdlineTests/asm_json_no_pretty_print/args
deleted file mode 100644
index 8f47136920e9..000000000000
--- a/test/cmdlineTests/asm_json_no_pretty_print/args
+++ /dev/null
@@ -1 +0,0 @@
---asm-json
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/input.sol b/test/cmdlineTests/asm_json_no_pretty_print/input.sol
deleted file mode 100644
index da3a08d7f199..000000000000
--- a/test/cmdlineTests/asm_json_no_pretty_print/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f(uint x) public pure {
-        x += 42;
-        require(x > 100);
-    }
-}
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/output b/test/cmdlineTests/asm_json_no_pretty_print/output
deleted file mode 100644
index b713097bbc4c..000000000000
--- a/test/cmdlineTests/asm_json_no_pretty_print/output
+++ /dev/null
@@ -1,4 +0,0 @@
-
-======= asm_json_no_pretty_print/input.sol:C =======
-EVM assembly:
-{".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH #[$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH [$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CODECOPY","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"RETURN","source":0}],".data":{"0":{".auxdata":"<BYTECODE REMOVED>",".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"4"},{"begin":60,"end":160,"name":"CALLDATASIZE","source":0},{"begin":60,"end":160,"name":"LT","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CALLDATALOAD","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"E0"},{"begin":60,"end":160,"name":"SHR","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"B3DE648B"},{"begin":60,"end":160,"name":"EQ","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"3"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"3"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"4"},{"begin":77,"end":158,"name":"PUSH","source":0,"value":"4"},{"begin":77,"end":158,"name":"DUP1","source":0},{"begin":77,"end":158,"name":"CALLDATASIZE","source":0},{"begin":77,"end":158,"name":"SUB","source":0},{"begin":77,"end":158,"name":"DUP2","source":0},{"begin":77,"end":158,"name":"ADD","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"5"},{"begin":77,"end":158,"name":"SWAP2","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"6"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"5"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"7"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"4"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"STOP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"7"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":123,"end":125,"name":"PUSH","source":0,"value":"2A"},{"begin":118,"end":125,"name":"DUP2","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"9"},{"begin":118,"end":125,"name":"SWAP2","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"10"},{"begin":118,"end":125,"jumpType":"[in]","name":"JUMP","source":0},{"begin":118,"end":125,"name":"tag","source":0,"value":"9"},{"begin":118,"end":125,"name":"JUMPDEST","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"POP","source":0},{"begin":147,"end":150,"name":"PUSH","source":0,"value":"64"},{"begin":143,"end":144,"name":"DUP2","source":0},{"begin":143,"end":150,"name":"GT","source":0},{"begin":135,"end":151,"name":"PUSH [tag]","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPI","source":0},{"begin":135,"end":151,"name":"PUSH","source":0,"value":"0"},{"begin":135,"end":151,"name":"DUP1","source":0},{"begin":135,"end":151,"name":"REVERT","source":0},{"begin":135,"end":151,"name":"tag","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"POP","source":0},{"begin":77,"end":158,"jumpType":"[out]","name":"JUMP","source":0},{"begin":88,"end":205,"name":"tag","source":1,"value":"13"},{"begin":88,"end":205,"name":"JUMPDEST","source":1},{"begin":197,"end":198,"name":"PUSH","source":1,"value":"0"},{"begin":194,"end":195,"name":"DUP1","source":1},{"begin":187,"end":199,"name":"REVERT","source":1},{"begin":334,"end":411,"name":"tag","source":1,"value":"15"},{"begin":334,"end":411,"name":"JUMPDEST","source":1},{"begin":371,"end":378,"name":"PUSH","source":1,"value":"0"},{"begin":400,"end":405,"name":"DUP2","source":1},{"begin":389,"end":405,"name":"SWAP1","source":1},{"begin":389,"end":405,"name":"POP","source":1},{"begin":334,"end":411,"name":"SWAP2","source":1},{"begin":334,"end":411,"name":"SWAP1","source":1},{"begin":334,"end":411,"name":"POP","source":1},{"begin":334,"end":411,"jumpType":"[out]","name":"JUMP","source":1},{"begin":417,"end":539,"name":"tag","source":1,"value":"16"},{"begin":417,"end":539,"name":"JUMPDEST","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"25"},{"begin":508,"end":513,"name":"DUP2","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":490,"end":514,"jumpType":"[in]","name":"JUMP","source":1},{"begin":490,"end":514,"name":"tag","source":1,"value":"25"},{"begin":490,"end":514,"name":"JUMPDEST","source":1},{"begin":483,"end":488,"name":"DUP2","source":1},{"begin":480,"end":515,"name":"EQ","source":1},{"begin":470,"end":533,"name":"PUSH [tag]","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPI","source":1},{"begin":529,"end":530,"name":"PUSH","source":1,"value":"0"},{"begin":526,"end":527,"name":"DUP1","source":1},{"begin":519,"end":531,"name":"REVERT","source":1},{"begin":470,"end":533,"name":"tag","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPDEST","source":1},{"begin":417,"end":539,"name":"POP","source":1},{"begin":417,"end":539,"jumpType":"[out]","name":"JUMP","source":1},{"begin":545,"end":684,"name":"tag","source":1,"value":"17"},{"begin":545,"end":684,"name":"JUMPDEST","source":1},{"begin":591,"end":596,"name":"PUSH","source":1,"value":"0"},{"begin":629,"end":635,"name":"DUP2","source":1},{"begin":616,"end":636,"name":"CALLDATALOAD","source":1},{"begin":607,"end":636,"name":"SWAP1","source":1},{"begin":607,"end":636,"name":"POP","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"28"},{"begin":672,"end":677,"name":"DUP2","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"16"},{"begin":645,"end":678,"jumpType":"[in]","name":"JUMP","source":1},{"begin":645,"end":678,"name":"tag","source":1,"value":"28"},{"begin":645,"end":678,"name":"JUMPDEST","source":1},{"begin":545,"end":684,"name":"SWAP3","source":1},{"begin":545,"end":684,"name":"SWAP2","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"jumpType":"[out]","name":"JUMP","source":1},{"begin":690,"end":1019,"name":"tag","source":1,"value":"6"},{"begin":690,"end":1019,"name":"JUMPDEST","source":1},{"begin":749,"end":755,"name":"PUSH","source":1,"value":"0"},{"begin":798,"end":800,"name":"PUSH","source":1,"value":"20"},{"begin":786,"end":795,"name":"DUP3","source":1},{"begin":777,"end":784,"name":"DUP5","source":1},{"begin":773,"end":796,"name":"SUB","source":1},{"begin":769,"end":801,"name":"SLT","source":1},{"begin":766,"end":885,"name":"ISZERO","source":1},{"begin":766,"end":885,"name":"PUSH [tag]","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPI","source":1},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"31"},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"13"},{"begin":804,"end":883,"jumpType":"[in]","name":"JUMP","source":1},{"begin":804,"end":883,"name":"tag","source":1,"value":"31"},{"begin":804,"end":883,"name":"JUMPDEST","source":1},{"begin":766,"end":885,"name":"tag","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPDEST","source":1},{"begin":924,"end":925,"name":"PUSH","source":1,"value":"0"},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"32"},{"begin":994,"end":1001,"name":"DUP5","source":1},{"begin":985,"end":991,"name":"DUP3","source":1},{"begin":974,"end":983,"name":"DUP6","source":1},{"begin":970,"end":992,"name":"ADD","source":1},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"17"},{"begin":949,"end":1002,"jumpType":"[in]","name":"JUMP","source":1},{"begin":949,"end":1002,"name":"tag","source":1,"value":"32"},{"begin":949,"end":1002,"name":"JUMPDEST","source":1},{"begin":939,"end":1002,"name":"SWAP2","source":1},{"begin":939,"end":1002,"name":"POP","source":1},{"begin":895,"end":1012,"name":"POP","source":1},{"begin":690,"end":1019,"name":"SWAP3","source":1},{"begin":690,"end":1019,"name":"SWAP2","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"jumpType":"[out]","name":"JUMP","source":1},{"begin":1025,"end":1205,"name":"tag","source":1,"value":"18"},{"begin":1025,"end":1205,"name":"JUMPDEST","source":1},{"begin":1073,"end":1150,"name":"PUSH","source":1,"value":"4E487B7100000000000000000000000000000000000000000000000000000000"},{"begin":1070,"end":1071,"name":"PUSH","source":1,"value":"0"},{"begin":1063,"end":1151,"name":"MSTORE","source":1},{"begin":1170,"end":1174,"name":"PUSH","source":1,"value":"11"},{"begin":1167,"end":1168,"name":"PUSH","source":1,"value":"4"},{"begin":1160,"end":1175,"name":"MSTORE","source":1},{"begin":1194,"end":1198,"name":"PUSH","source":1,"value":"24"},{"begin":1191,"end":1192,"name":"PUSH","source":1,"value":"0"},{"begin":1184,"end":1199,"name":"REVERT","source":1},{"begin":1211,"end":1402,"name":"tag","source":1,"value":"10"},{"begin":1211,"end":1402,"name":"JUMPDEST","source":1},{"begin":1251,"end":1254,"name":"PUSH","source":1,"value":"0"},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"35"},{"begin":1288,"end":1289,"name":"DUP3","source":1},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1270,"end":1290,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1270,"end":1290,"name":"tag","source":1,"value":"35"},{"begin":1270,"end":1290,"name":"JUMPDEST","source":1},{"begin":1265,"end":1290,"name":"SWAP2","source":1},{"begin":1265,"end":1290,"name":"POP","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"36"},{"begin":1322,"end":1323,"name":"DUP4","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1304,"end":1324,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1304,"end":1324,"name":"tag","source":1,"value":"36"},{"begin":1304,"end":1324,"name":"JUMPDEST","source":1},{"begin":1299,"end":1324,"name":"SWAP3","source":1},{"begin":1299,"end":1324,"name":"POP","source":1},{"begin":1347,"end":1348,"name":"DUP3","source":1},{"begin":1344,"end":1345,"name":"DUP3","source":1},{"begin":1340,"end":1349,"name":"ADD","source":1},{"begin":1333,"end":1349,"name":"SWAP1","source":1},{"begin":1333,"end":1349,"name":"POP","source":1},{"begin":1368,"end":1371,"name":"DUP1","source":1},{"begin":1365,"end":1366,"name":"DUP3","source":1},{"begin":1362,"end":1372,"name":"GT","source":1},{"begin":1359,"end":1395,"name":"ISZERO","source":1},{"begin":1359,"end":1395,"name":"PUSH [tag]","source":1,"value":"37"},{"begin":1359,"end":1395,"name":"JUMPI","source":1},{"begin":1375,"end":1393,"name":"PUSH [tag]","source":1,"value":"38"},{"begin":1375,"end":1393,"name":"PUSH [tag]","source":1,"value":"18"},{"begin":1375,"end":1393,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1375,"end":1393,"name":"tag","source":1,"value":"38"},{"begin":1375,"end":1393,"name":"JUMPDEST","source":1},{"begin":1359,"end":1395,"name":"tag","source":1,"value":"37"},{"begin":1359,"end":1395,"name":"JUMPDEST","source":1},{"begin":1211,"end":1402,"name":"SWAP3","source":1},{"begin":1211,"end":1402,"name":"SWAP2","source":1},{"begin":1211,"end":1402,"name":"POP","source":1},{"begin":1211,"end":1402,"name":"POP","source":1},{"begin":1211,"end":1402,"jumpType":"[out]","name":"JUMP","source":1}]}},"sourceList":["asm_json_no_pretty_print/input.sol","#utility.yul"]}
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/args b/test/cmdlineTests/ast_compact_json_no_pretty_json/args
deleted file mode 100644
index f60d99b44250..000000000000
--- a/test/cmdlineTests/ast_compact_json_no_pretty_json/args
+++ /dev/null
@@ -1 +0,0 @@
---ast-compact-json --allow-paths .
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol b/test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol
deleted file mode 100644
index f123f6c8bee3..000000000000
--- a/test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {}
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/output b/test/cmdlineTests/ast_compact_json_no_pretty_json/output
deleted file mode 100644
index fb79fd524e24..000000000000
--- a/test/cmdlineTests/ast_compact_json_no_pretty_json/output
+++ /dev/null
@@ -1,5 +0,0 @@
-JSON AST (compact format):
-
-
-======= ast_compact_json_no_pretty_json/input.sol =======
-{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[],"usedEvents":[]}],"src":"36:38:0"}
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/args b/test/cmdlineTests/ast_compact_json_with_base_path/args
deleted file mode 100644
index a30ef24c0ed0..000000000000
--- a/test/cmdlineTests/ast_compact_json_with_base_path/args
+++ /dev/null
@@ -1 +0,0 @@
---ast-compact-json --pretty-json --base-path . --allow-paths .
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/c.sol b/test/cmdlineTests/ast_compact_json_with_base_path/c.sol
deleted file mode 100644
index f123f6c8bee3..000000000000
--- a/test/cmdlineTests/ast_compact_json_with_base_path/c.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {}
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/input.sol b/test/cmdlineTests/ast_compact_json_with_base_path/input.sol
deleted file mode 100644
index 07f8848fc35b..000000000000
--- a/test/cmdlineTests/ast_compact_json_with_base_path/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-import "./c.sol";
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/output b/test/cmdlineTests/ast_compact_json_with_base_path/output
deleted file mode 100644
index 5c5c6ffd5123..000000000000
--- a/test/cmdlineTests/ast_compact_json_with_base_path/output
+++ /dev/null
@@ -1,94 +0,0 @@
-JSON AST (compact format):
-
-
-======= ast_compact_json_with_base_path/c.sol =======
-{
-  "absolutePath": "ast_compact_json_with_base_path/c.sol",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 4,
-      "literals":
-      [
-        "solidity",
-        ">=",
-        "0.0"
-      ],
-      "nodeType": "PragmaDirective",
-      "src": "36:22:0"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "69:1:0",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 6,
-      "src": "60:13:0",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "36:38:0"
-}
-======= ast_compact_json_with_base_path/input.sol =======
-{
-  "absolutePath": "ast_compact_json_with_base_path/input.sol",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 3,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 1,
-      "literals":
-      [
-        "solidity",
-        ">=",
-        "0.0"
-      ],
-      "nodeType": "PragmaDirective",
-      "src": "36:22:1"
-    },
-    {
-      "absolutePath": "ast_compact_json_with_base_path/c.sol",
-      "file": "./c.sol",
-      "id": 2,
-      "nameLocation": "-1:-1:-1",
-      "nodeType": "ImportDirective",
-      "scope": 3,
-      "sourceUnit": 6,
-      "src": "60:17:1",
-      "symbolAliases": [],
-      "unitAlias": ""
-    }
-  ],
-  "src": "36:42:1"
-}
diff --git a/test/cmdlineTests/ast_ir/args b/test/cmdlineTests/ast_ir/args
deleted file mode 100644
index d254bff83d54..000000000000
--- a/test/cmdlineTests/ast_ir/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-ast-json --ir-optimized-ast-json --optimize --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/ast_ir/input.sol b/test/cmdlineTests/ast_ir/input.sol
deleted file mode 100644
index f123f6c8bee3..000000000000
--- a/test/cmdlineTests/ast_ir/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {}
diff --git a/test/cmdlineTests/ast_ir/output b/test/cmdlineTests/ast_ir/output
deleted file mode 100644
index cca31349e868..000000000000
--- a/test/cmdlineTests/ast_ir/output
+++ /dev/null
@@ -1,1078 +0,0 @@
-IR AST:
-{
-    "code":
-    {
-        "block":
-        {
-            "nativeSrc": "59:790:0",
-            "nodeType": "YulBlock",
-            "src": "-1:-1:0",
-            "statements":
-            [
-                {
-                    "expression":
-                    {
-                        "arguments":
-                        [
-                            {
-                                "kind": "number",
-                                "nativeSrc": "118:2:0",
-                                "nodeType": "YulLiteral",
-                                "src": "60:13:0",
-                                "type": "",
-                                "value": "64"
-                            },
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "kind": "number",
-                                        "nativeSrc": "134:3:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "128"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "memoryguard",
-                                    "nativeSrc": "122:11:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "122:16:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            }
-                        ],
-                        "functionName":
-                        {
-                            "name": "mstore",
-                            "nativeSrc": "111:6:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:13:0"
-                        },
-                        "nativeSrc": "111:28:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:13:0"
-                    },
-                    "nativeSrc": "111:28:0",
-                    "nodeType": "YulExpressionStatement",
-                    "src": "60:13:0"
-                },
-                {
-                    "body":
-                    {
-                        "nativeSrc": "163:83:0",
-                        "nodeType": "YulBlock",
-                        "src": "60:13:0",
-                        "statements":
-                        [
-                            {
-                                "expression":
-                                {
-                                    "arguments": [],
-                                    "functionName":
-                                    {
-                                        "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                        "nativeSrc": "165:77:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    },
-                                    "nativeSrc": "165:79:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "165:79:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "60:13:0"
-                            }
-                        ]
-                    },
-                    "condition":
-                    {
-                        "arguments": [],
-                        "functionName":
-                        {
-                            "name": "callvalue",
-                            "nativeSrc": "151:9:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:13:0"
-                        },
-                        "nativeSrc": "151:11:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:13:0"
-                    },
-                    "nativeSrc": "148:98:0",
-                    "nodeType": "YulIf",
-                    "src": "60:13:0"
-                },
-                {
-                    "expression":
-                    {
-                        "arguments": [],
-                        "functionName":
-                        {
-                            "name": "constructor_C_2",
-                            "nativeSrc": "256:15:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:13:0"
-                        },
-                        "nativeSrc": "256:17:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:13:0"
-                    },
-                    "nativeSrc": "256:17:0",
-                    "nodeType": "YulExpressionStatement",
-                    "src": "60:13:0"
-                },
-                {
-                    "nativeSrc": "283:30:0",
-                    "nodeType": "YulVariableDeclaration",
-                    "src": "60:13:0",
-                    "value":
-                    {
-                        "arguments": [],
-                        "functionName":
-                        {
-                            "name": "allocate_unbounded",
-                            "nativeSrc": "293:18:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:13:0"
-                        },
-                        "nativeSrc": "293:20:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:13:0"
-                    },
-                    "variables":
-                    [
-                        {
-                            "name": "_1",
-                            "nativeSrc": "287:2:0",
-                            "nodeType": "YulTypedName",
-                            "src": "60:13:0",
-                            "type": ""
-                        }
-                    ]
-                },
-                {
-                    "expression":
-                    {
-                        "arguments":
-                        [
-                            {
-                                "name": "_1",
-                                "nativeSrc": "331:2:0",
-                                "nodeType": "YulIdentifier",
-                                "src": "60:13:0"
-                            },
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "hexValue": "435f325f6465706c6f796564",
-                                        "kind": "string",
-                                        "nativeSrc": "346:14:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "C_2_deployed"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "dataoffset",
-                                    "nativeSrc": "335:10:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "335:26:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "hexValue": "435f325f6465706c6f796564",
-                                        "kind": "string",
-                                        "nativeSrc": "372:14:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "C_2_deployed"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "datasize",
-                                    "nativeSrc": "363:8:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "363:24:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            }
-                        ],
-                        "functionName":
-                        {
-                            "name": "codecopy",
-                            "nativeSrc": "322:8:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:13:0"
-                        },
-                        "nativeSrc": "322:66:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:13:0"
-                    },
-                    "nativeSrc": "322:66:0",
-                    "nodeType": "YulExpressionStatement",
-                    "src": "60:13:0"
-                },
-                {
-                    "expression":
-                    {
-                        "arguments":
-                        [
-                            {
-                                "name": "_1",
-                                "nativeSrc": "405:2:0",
-                                "nodeType": "YulIdentifier",
-                                "src": "60:13:0"
-                            },
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "hexValue": "435f325f6465706c6f796564",
-                                        "kind": "string",
-                                        "nativeSrc": "418:14:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "C_2_deployed"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "datasize",
-                                    "nativeSrc": "409:8:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "409:24:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            }
-                        ],
-                        "functionName":
-                        {
-                            "name": "return",
-                            "nativeSrc": "398:6:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:13:0"
-                        },
-                        "nativeSrc": "398:36:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:13:0"
-                    },
-                    "nativeSrc": "398:36:0",
-                    "nodeType": "YulExpressionStatement",
-                    "src": "60:13:0"
-                },
-                {
-                    "body":
-                    {
-                        "nativeSrc": "484:43:0",
-                        "nodeType": "YulBlock",
-                        "src": "60:13:0",
-                        "statements":
-                        [
-                            {
-                                "nativeSrc": "498:19:0",
-                                "nodeType": "YulAssignment",
-                                "src": "60:13:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "514:2:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "60:13:0",
-                                            "type": "",
-                                            "value": "64"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "mload",
-                                        "nativeSrc": "508:5:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    },
-                                    "nativeSrc": "508:9:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "60:13:0"
-                                },
-                                "variableNames":
-                                [
-                                    {
-                                        "name": "memPtr",
-                                        "nativeSrc": "498:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    "name": "allocate_unbounded",
-                    "nativeSrc": "444:83:0",
-                    "nodeType": "YulFunctionDefinition",
-                    "returnVariables":
-                    [
-                        {
-                            "name": "memPtr",
-                            "nativeSrc": "477:6:0",
-                            "nodeType": "YulTypedName",
-                            "src": "60:13:0",
-                            "type": ""
-                        }
-                    ],
-                    "src": "60:13:0"
-                },
-                {
-                    "body":
-                    {
-                        "nativeSrc": "626:36:0",
-                        "nodeType": "YulBlock",
-                        "src": "60:13:0",
-                        "statements":
-                        [
-                            {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "647:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "60:13:0",
-                                            "type": "",
-                                            "value": "0"
-                                        },
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "650:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "60:13:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "revert",
-                                        "nativeSrc": "640:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    },
-                                    "nativeSrc": "640:12:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "640:12:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "60:13:0"
-                            }
-                        ]
-                    },
-                    "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                    "nativeSrc": "537:125:0",
-                    "nodeType": "YulFunctionDefinition",
-                    "src": "60:13:0"
-                },
-                {
-                    "body":
-                    {
-                        "nativeSrc": "741:59:0",
-                        "nodeType": "YulBlock",
-                        "src": "60:13:0",
-                        "statements": []
-                    },
-                    "name": "constructor_C_2",
-                    "nativeSrc": "714:86:0",
-                    "nodeType": "YulFunctionDefinition",
-                    "src": "60:13:0"
-                }
-            ]
-        },
-        "nodeType": "YulCode"
-    },
-    "name": "C_2",
-    "nodeType": "YulObject",
-    "subObjects":
-    [
-        {
-            "code":
-            {
-                "block":
-                {
-                    "nativeSrc": "929:588:0",
-                    "nodeType": "YulBlock",
-                    "src": "-1:-1:0",
-                    "statements":
-                    [
-                        {
-                            "expression":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "kind": "number",
-                                        "nativeSrc": "996:2:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "64"
-                                    },
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "kind": "number",
-                                                "nativeSrc": "1012:3:0",
-                                                "nodeType": "YulLiteral",
-                                                "src": "60:13:0",
-                                                "type": "",
-                                                "value": "128"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "memoryguard",
-                                            "nativeSrc": "1000:11:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "60:13:0"
-                                        },
-                                        "nativeSrc": "1000:16:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "60:13:0"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "mstore",
-                                    "nativeSrc": "989:6:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "989:28:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "nativeSrc": "989:28:0",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "60:13:0"
-                        },
-                        {
-                            "expression":
-                            {
-                                "arguments": [],
-                                "functionName":
-                                {
-                                    "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                    "nativeSrc": "1031:77:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "1031:79:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "nativeSrc": "1031:79:0",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "60:13:0"
-                        },
-                        {
-                            "body":
-                            {
-                                "nativeSrc": "1177:77:0",
-                                "nodeType": "YulBlock",
-                                "src": "60:13:0",
-                                "statements":
-                                [
-                                    {
-                                        "nativeSrc": "1195:44:0",
-                                        "nodeType": "YulAssignment",
-                                        "src": "60:13:0",
-                                        "value":
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "1228:3:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "60:13:0",
-                                                    "type": "",
-                                                    "value": "224"
-                                                },
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "1233:5:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "60:13:0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "shr",
-                                                "nativeSrc": "1224:3:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "60:13:0"
-                                            },
-                                            "nativeSrc": "1224:15:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "60:13:0"
-                                        },
-                                        "variableNames":
-                                        [
-                                            {
-                                                "name": "newValue",
-                                                "nativeSrc": "1195:8:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "60:13:0"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            },
-                            "name": "shift_right_224_unsigned",
-                            "nativeSrc": "1124:130:0",
-                            "nodeType": "YulFunctionDefinition",
-                            "parameters":
-                            [
-                                {
-                                    "name": "value",
-                                    "nativeSrc": "1158:5:0",
-                                    "nodeType": "YulTypedName",
-                                    "src": "60:13:0",
-                                    "type": ""
-                                }
-                            ],
-                            "returnVariables":
-                            [
-                                {
-                                    "name": "newValue",
-                                    "nativeSrc": "1168:8:0",
-                                    "nodeType": "YulTypedName",
-                                    "src": "60:13:0",
-                                    "type": ""
-                                }
-                            ],
-                            "src": "60:13:0"
-                        },
-                        {
-                            "body":
-                            {
-                                "nativeSrc": "1308:51:0",
-                                "nodeType": "YulBlock",
-                                "src": "60:13:0",
-                                "statements":
-                                [
-                                    {
-                                        "nativeSrc": "1326:19:0",
-                                        "nodeType": "YulAssignment",
-                                        "src": "60:13:0",
-                                        "value":
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "1342:2:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "60:13:0",
-                                                    "type": "",
-                                                    "value": "64"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "mload",
-                                                "nativeSrc": "1336:5:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "60:13:0"
-                                            },
-                                            "nativeSrc": "1336:9:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "60:13:0"
-                                        },
-                                        "variableNames":
-                                        [
-                                            {
-                                                "name": "memPtr",
-                                                "nativeSrc": "1326:6:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "60:13:0"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            },
-                            "name": "allocate_unbounded",
-                            "nativeSrc": "1268:91:0",
-                            "nodeType": "YulFunctionDefinition",
-                            "returnVariables":
-                            [
-                                {
-                                    "name": "memPtr",
-                                    "nativeSrc": "1301:6:0",
-                                    "nodeType": "YulTypedName",
-                                    "src": "60:13:0",
-                                    "type": ""
-                                }
-                            ],
-                            "src": "60:13:0"
-                        },
-                        {
-                            "body":
-                            {
-                                "nativeSrc": "1462:44:0",
-                                "nodeType": "YulBlock",
-                                "src": "60:13:0",
-                                "statements":
-                                [
-                                    {
-                                        "expression":
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "1487:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "60:13:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "1490:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "60:13:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "revert",
-                                                "nativeSrc": "1480:6:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "60:13:0"
-                                            },
-                                            "nativeSrc": "1480:12:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "60:13:0"
-                                        },
-                                        "nativeSrc": "1480:12:0",
-                                        "nodeType": "YulExpressionStatement",
-                                        "src": "60:13:0"
-                                    }
-                                ]
-                            },
-                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                            "nativeSrc": "1373:133:0",
-                            "nodeType": "YulFunctionDefinition",
-                            "src": "60:13:0"
-                        }
-                    ]
-                },
-                "nodeType": "YulCode"
-            },
-            "name": "C_2_deployed",
-            "nodeType": "YulObject",
-            "subObjects":
-            [
-                {
-                    "nodeType": "YulData",
-                    "value": "<BYTECODE REMOVED>"
-                }
-            ]
-        }
-    ]
-}
-Optimized IR AST:
-{
-    "code":
-    {
-        "block":
-        {
-            "nativeSrc": "59:790:0",
-            "nodeType": "YulBlock",
-            "src": "-1:-1:0",
-            "statements":
-            [
-                {
-                    "nativeSrc": "59:790:0",
-                    "nodeType": "YulBlock",
-                    "src": "-1:-1:0",
-                    "statements":
-                    [
-                        {
-                            "nativeSrc": "122:16:0",
-                            "nodeType": "YulVariableDeclaration",
-                            "src": "60:13:0",
-                            "value":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "kind": "number",
-                                        "nativeSrc": "134:3:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "0x80"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "memoryguard",
-                                    "nativeSrc": "122:11:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "122:16:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "variables":
-                            [
-                                {
-                                    "name": "_1",
-                                    "nativeSrc": "122:16:0",
-                                    "nodeType": "YulTypedName",
-                                    "src": "60:13:0",
-                                    "type": ""
-                                }
-                            ]
-                        },
-                        {
-                            "expression":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "kind": "number",
-                                        "nativeSrc": "118:2:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "64"
-                                    },
-                                    {
-                                        "name": "_1",
-                                        "nativeSrc": "122:16:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "mstore",
-                                    "nativeSrc": "111:6:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "111:28:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "nativeSrc": "111:28:0",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "60:13:0"
-                        },
-                        {
-                            "body":
-                            {
-                                "nativeSrc": "163:83:0",
-                                "nodeType": "YulBlock",
-                                "src": "60:13:0",
-                                "statements":
-                                [
-                                    {
-                                        "expression":
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "650:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "60:13:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "650:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "60:13:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "revert",
-                                                "nativeSrc": "640:6:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "60:13:0"
-                                            },
-                                            "nativeSrc": "640:12:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "60:13:0"
-                                        },
-                                        "nativeSrc": "640:12:0",
-                                        "nodeType": "YulExpressionStatement",
-                                        "src": "60:13:0"
-                                    }
-                                ]
-                            },
-                            "condition":
-                            {
-                                "arguments": [],
-                                "functionName":
-                                {
-                                    "name": "callvalue",
-                                    "nativeSrc": "151:9:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "151:11:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "nativeSrc": "148:98:0",
-                            "nodeType": "YulIf",
-                            "src": "60:13:0"
-                        },
-                        {
-                            "nativeSrc": "363:24:0",
-                            "nodeType": "YulVariableDeclaration",
-                            "src": "60:13:0",
-                            "value":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "hexValue": "435f325f6465706c6f796564",
-                                        "kind": "string",
-                                        "nativeSrc": "372:14:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:13:0",
-                                        "type": "",
-                                        "value": "C_2_deployed"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "datasize",
-                                    "nativeSrc": "363:8:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "363:24:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "variables":
-                            [
-                                {
-                                    "name": "_2",
-                                    "nativeSrc": "363:24:0",
-                                    "nodeType": "YulTypedName",
-                                    "src": "60:13:0",
-                                    "type": ""
-                                }
-                            ]
-                        },
-                        {
-                            "expression":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "name": "_1",
-                                        "nativeSrc": "331:2:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    },
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "hexValue": "435f325f6465706c6f796564",
-                                                "kind": "string",
-                                                "nativeSrc": "346:14:0",
-                                                "nodeType": "YulLiteral",
-                                                "src": "60:13:0",
-                                                "type": "",
-                                                "value": "C_2_deployed"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "dataoffset",
-                                            "nativeSrc": "335:10:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "60:13:0"
-                                        },
-                                        "nativeSrc": "335:26:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "60:13:0"
-                                    },
-                                    {
-                                        "name": "_2",
-                                        "nativeSrc": "363:24:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "codecopy",
-                                    "nativeSrc": "322:8:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "322:66:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "nativeSrc": "322:66:0",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "60:13:0"
-                        },
-                        {
-                            "expression":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "name": "_1",
-                                        "nativeSrc": "405:2:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    },
-                                    {
-                                        "name": "_2",
-                                        "nativeSrc": "409:24:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "60:13:0"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "return",
-                                    "nativeSrc": "398:6:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:13:0"
-                                },
-                                "nativeSrc": "398:36:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:13:0"
-                            },
-                            "nativeSrc": "398:36:0",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "60:13:0"
-                        }
-                    ]
-                }
-            ]
-        },
-        "nodeType": "YulCode"
-    },
-    "name": "C_2",
-    "nodeType": "YulObject",
-    "subObjects":
-    [
-        {
-            "code":
-            {
-                "block":
-                {
-                    "nativeSrc": "929:588:0",
-                    "nodeType": "YulBlock",
-                    "src": "-1:-1:0",
-                    "statements":
-                    [
-                        {
-                            "nativeSrc": "929:588:0",
-                            "nodeType": "YulBlock",
-                            "src": "-1:-1:0",
-                            "statements":
-                            [
-                                {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "kind": "number",
-                                                "nativeSrc": "1490:1:0",
-                                                "nodeType": "YulLiteral",
-                                                "src": "60:13:0",
-                                                "type": "",
-                                                "value": "0"
-                                            },
-                                            {
-                                                "kind": "number",
-                                                "nativeSrc": "1490:1:0",
-                                                "nodeType": "YulLiteral",
-                                                "src": "60:13:0",
-                                                "type": "",
-                                                "value": "0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "revert",
-                                            "nativeSrc": "1480:6:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "60:13:0"
-                                        },
-                                        "nativeSrc": "1480:12:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "60:13:0"
-                                    },
-                                    "nativeSrc": "1480:12:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "60:13:0"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                "nodeType": "YulCode"
-            },
-            "name": "C_2_deployed",
-            "nodeType": "YulObject",
-            "subObjects":
-            [
-                {
-                    "nodeType": "YulData",
-                    "value": "<BYTECODE REMOVED>"
-                }
-            ]
-        }
-    ]
-}
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/args b/test/cmdlineTests/ast_json_import_wrong_evmVersion/args
deleted file mode 100644
index d8fddfec65db..000000000000
--- a/test/cmdlineTests/ast_json_import_wrong_evmVersion/args
+++ /dev/null
@@ -1 +0,0 @@
---evm-version=homestead --import-ast --combined-json ast --pretty-json
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/err b/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
deleted file mode 100644
index b969e349df4d..000000000000
--- a/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: Support for EVM versions older than constantinople is deprecated and will be removed in the future.
-Error: Failed to import AST: Imported tree evm version differs from configured evm version!
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/exit b/test/cmdlineTests/ast_json_import_wrong_evmVersion/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/ast_json_import_wrong_evmVersion/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol b/test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol
deleted file mode 100644
index 4f8eb2c7972c..000000000000
--- a/test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "contracts":
-  {
-    "test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol:C": {}
-  },
-  "sourceList":
-  [
-    "test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol"
-  ],
-  "sources":
-  {
-    "test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol":
-    {
-      "AST":
-      {
-        "absolutePath": "test/cmdlineTests/ast_json_import_wrong_evmVersion/input.sol",
-        "exportedSymbols":
-        {
-          "C":
-          [
-            7
-          ]
-        },
-        "id": 8,
-        "nodeType": "SourceUnit",
-        "nodes":
-        [
-          {
-            "id": 1,
-            "literals":
-            [
-              "solidity",
-              ">=",
-              "0.0"
-            ],
-            "nodeType": "PragmaDirective",
-            "src": "0:22:0"
-          },
-          {
-            "abstract": false,
-            "baseContracts": [],
-            "contractDependencies": [],
-            "contractKind": "contract",
-            "documentation": null,
-            "fullyImplemented": true,
-            "id": 7,
-            "linearizedBaseContracts":
-            [
-              7
-            ],
-            "name": "C",
-            "nameLocation": "27:1:0",
-            "nodeType": "ContractDefinition",
-            "nodes":
-            [
-              {
-                "body":
-                {
-                  "id": 5,
-                  "nodeType": "Block",
-                  "src": "65:21:0",
-                  "statements":
-                  [
-                    {
-                      "AST":
-                      {
-                        "nodeType": "YulBlock",
-                        "src": "78:2:0",
-                        "statements": []
-                      },
-                      "evmVersion": "istanbul",
-                      "externalReferences": [],
-                      "id": 4,
-                      "nodeType": "InlineAssembly",
-                      "src": "69:11:0"
-                    }
-                  ]
-                },
-                "documentation": null,
-                "functionSelector": "26121ff0",
-                "id": 6,
-                "implemented": true,
-                "kind": "function",
-                "modifiers": [],
-                "name": "f",
-                "nameLocation": "45:4:0",
-                "nodeType": "FunctionDefinition",
-                "overrides": null,
-                "parameters":
-                {
-                  "id": 2,
-                  "nodeType": "ParameterList",
-                  "parameters": [],
-                  "src": "50:2:0"
-                },
-                "returnParameters":
-                {
-                  "id": 3,
-                  "nodeType": "ParameterList",
-                  "parameters": [],
-                  "src": "65:0:0"
-                },
-                "scope": 7,
-                "src": "40:46:0",
-                "stateMutability": "pure",
-                "virtual": false,
-                "visibility": "public"
-              }
-            ],
-            "scope": 8,
-            "src": "23:65:0"
-          }
-        ],
-        "src": "0:89:0"
-      }
-    }
-  },
-  "version": "0.6.2-develop.2020.1.14+commit.e8556fa1.mod.Linux.g++"
-}
diff --git a/test/cmdlineTests/combined_json_abi/args b/test/cmdlineTests/combined_json_abi/args
deleted file mode 100644
index f2ed65c2e46b..000000000000
--- a/test/cmdlineTests/combined_json_abi/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json abi --pretty-json --json-indent 3
diff --git a/test/cmdlineTests/combined_json_abi/input.sol b/test/cmdlineTests/combined_json_abi/input.sol
deleted file mode 100644
index 625af568280c..000000000000
--- a/test/cmdlineTests/combined_json_abi/input.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {}
diff --git a/test/cmdlineTests/combined_json_abi/output b/test/cmdlineTests/combined_json_abi/output
deleted file mode 100644
index c775c6d72ca1..000000000000
--- a/test/cmdlineTests/combined_json_abi/output
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "contracts":
-   {
-      "combined_json_abi/input.sol:C":
-      {
-         "abi": []
-      }
-   },
-   "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/combined_json_generated_sources/args b/test/cmdlineTests/combined_json_generated_sources/args
deleted file mode 100644
index 425ca0a0ba75..000000000000
--- a/test/cmdlineTests/combined_json_generated_sources/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json generated-sources,generated-sources-runtime --pretty-json
diff --git a/test/cmdlineTests/combined_json_generated_sources/input.sol b/test/cmdlineTests/combined_json_generated_sources/input.sol
deleted file mode 100644
index b99390dee168..000000000000
--- a/test/cmdlineTests/combined_json_generated_sources/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C {
-  function f(uint[] calldata) pure external {}
-}
diff --git a/test/cmdlineTests/combined_json_generated_sources/output b/test/cmdlineTests/combined_json_generated_sources/output
deleted file mode 100644
index 5ef9078d6e80..000000000000
--- a/test/cmdlineTests/combined_json_generated_sources/output
+++ /dev/null
@@ -1,1080 +0,0 @@
-{
-  "contracts":
-  {
-    "combined_json_generated_sources/input.sol:C":
-    {
-      "generated-sources": [],
-      "generated-sources-runtime":
-      [
-        {
-          "ast":
-          {
-            "nativeSrc": "0:1856:1",
-            "nodeType": "YulBlock",
-            "src": "0:1856:1",
-            "statements":
-            [
-              {
-                "body":
-                {
-                  "nativeSrc": "47:35:1",
-                  "nodeType": "YulBlock",
-                  "src": "47:35:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "57:19:1",
-                      "nodeType": "YulAssignment",
-                      "src": "57:19:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "kind": "number",
-                            "nativeSrc": "73:2:1",
-                            "nodeType": "YulLiteral",
-                            "src": "73:2:1",
-                            "type": "",
-                            "value": "64"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "mload",
-                          "nativeSrc": "67:5:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "67:5:1"
-                        },
-                        "nativeSrc": "67:9:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "67:9:1"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "memPtr",
-                          "nativeSrc": "57:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "57:6:1"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "name": "allocate_unbounded",
-                "nativeSrc": "7:75:1",
-                "nodeType": "YulFunctionDefinition",
-                "returnVariables":
-                [
-                  {
-                    "name": "memPtr",
-                    "nativeSrc": "40:6:1",
-                    "nodeType": "YulTypedName",
-                    "src": "40:6:1",
-                    "type": ""
-                  }
-                ],
-                "src": "7:75:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "177:28:1",
-                  "nodeType": "YulBlock",
-                  "src": "177:28:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "kind": "number",
-                            "nativeSrc": "194:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "194:1:1",
-                            "type": "",
-                            "value": "0"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "197:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "197:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "revert",
-                          "nativeSrc": "187:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "187:6:1"
-                        },
-                        "nativeSrc": "187:12:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "187:12:1"
-                      },
-                      "nativeSrc": "187:12:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "187:12:1"
-                    }
-                  ]
-                },
-                "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
-                "nativeSrc": "88:117:1",
-                "nodeType": "YulFunctionDefinition",
-                "src": "88:117:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "300:28:1",
-                  "nodeType": "YulBlock",
-                  "src": "300:28:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "kind": "number",
-                            "nativeSrc": "317:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "317:1:1",
-                            "type": "",
-                            "value": "0"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "320:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "320:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "revert",
-                          "nativeSrc": "310:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "310:6:1"
-                        },
-                        "nativeSrc": "310:12:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "310:12:1"
-                      },
-                      "nativeSrc": "310:12:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "310:12:1"
-                    }
-                  ]
-                },
-                "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
-                "nativeSrc": "211:117:1",
-                "nodeType": "YulFunctionDefinition",
-                "src": "211:117:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "423:28:1",
-                  "nodeType": "YulBlock",
-                  "src": "423:28:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "kind": "number",
-                            "nativeSrc": "440:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "440:1:1",
-                            "type": "",
-                            "value": "0"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "443:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "443:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "revert",
-                          "nativeSrc": "433:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "433:6:1"
-                        },
-                        "nativeSrc": "433:12:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "433:12:1"
-                      },
-                      "nativeSrc": "433:12:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "433:12:1"
-                    }
-                  ]
-                },
-                "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
-                "nativeSrc": "334:117:1",
-                "nodeType": "YulFunctionDefinition",
-                "src": "334:117:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "546:28:1",
-                  "nodeType": "YulBlock",
-                  "src": "546:28:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "kind": "number",
-                            "nativeSrc": "563:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "563:1:1",
-                            "type": "",
-                            "value": "0"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "566:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "566:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "revert",
-                          "nativeSrc": "556:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "556:6:1"
-                        },
-                        "nativeSrc": "556:12:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "556:12:1"
-                      },
-                      "nativeSrc": "556:12:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "556:12:1"
-                    }
-                  ]
-                },
-                "name": "revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490",
-                "nativeSrc": "457:117:1",
-                "nodeType": "YulFunctionDefinition",
-                "src": "457:117:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "669:28:1",
-                  "nodeType": "YulBlock",
-                  "src": "669:28:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "kind": "number",
-                            "nativeSrc": "686:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "686:1:1",
-                            "type": "",
-                            "value": "0"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "689:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "689:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "revert",
-                          "nativeSrc": "679:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "679:6:1"
-                        },
-                        "nativeSrc": "679:12:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "679:12:1"
-                      },
-                      "nativeSrc": "679:12:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "679:12:1"
-                    }
-                  ]
-                },
-                "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
-                "nativeSrc": "580:117:1",
-                "nodeType": "YulFunctionDefinition",
-                "src": "580:117:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "810:478:1",
-                  "nodeType": "YulBlock",
-                  "src": "810:478:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "859:83:1",
-                        "nodeType": "YulBlock",
-                        "src": "859:83:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments": [],
-                              "functionName":
-                              {
-                                "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
-                                "nativeSrc": "861:77:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "861:77:1"
-                              },
-                              "nativeSrc": "861:79:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "861:79:1"
-                            },
-                            "nativeSrc": "861:79:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "861:79:1"
-                          }
-                        ]
-                      },
-                      "condition":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "arguments":
-                            [
-                              {
-                                "arguments":
-                                [
-                                  {
-                                    "name": "offset",
-                                    "nativeSrc": "838:6:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "838:6:1"
-                                  },
-                                  {
-                                    "kind": "number",
-                                    "nativeSrc": "846:4:1",
-                                    "nodeType": "YulLiteral",
-                                    "src": "846:4:1",
-                                    "type": "",
-                                    "value": "0x1f"
-                                  }
-                                ],
-                                "functionName":
-                                {
-                                  "name": "add",
-                                  "nativeSrc": "834:3:1",
-                                  "nodeType": "YulIdentifier",
-                                  "src": "834:3:1"
-                                },
-                                "nativeSrc": "834:17:1",
-                                "nodeType": "YulFunctionCall",
-                                "src": "834:17:1"
-                              },
-                              {
-                                "name": "end",
-                                "nativeSrc": "853:3:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "853:3:1"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "slt",
-                              "nativeSrc": "830:3:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "830:3:1"
-                            },
-                            "nativeSrc": "830:27:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "830:27:1"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "iszero",
-                          "nativeSrc": "823:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "823:6:1"
-                        },
-                        "nativeSrc": "823:35:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "823:35:1"
-                      },
-                      "nativeSrc": "820:122:1",
-                      "nodeType": "YulIf",
-                      "src": "820:122:1"
-                    },
-                    {
-                      "nativeSrc": "951:30:1",
-                      "nodeType": "YulAssignment",
-                      "src": "951:30:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "name": "offset",
-                            "nativeSrc": "974:6:1",
-                            "nodeType": "YulIdentifier",
-                            "src": "974:6:1"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "calldataload",
-                          "nativeSrc": "961:12:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "961:12:1"
-                        },
-                        "nativeSrc": "961:20:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "961:20:1"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "length",
-                          "nativeSrc": "951:6:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "951:6:1"
-                        }
-                      ]
-                    },
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "1024:83:1",
-                        "nodeType": "YulBlock",
-                        "src": "1024:83:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments": [],
-                              "functionName":
-                              {
-                                "name": "revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490",
-                                "nativeSrc": "1026:77:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1026:77:1"
-                              },
-                              "nativeSrc": "1026:79:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "1026:79:1"
-                            },
-                            "nativeSrc": "1026:79:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "1026:79:1"
-                          }
-                        ]
-                      },
-                      "condition":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "name": "length",
-                            "nativeSrc": "996:6:1",
-                            "nodeType": "YulIdentifier",
-                            "src": "996:6:1"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "1004:18:1",
-                            "nodeType": "YulLiteral",
-                            "src": "1004:18:1",
-                            "type": "",
-                            "value": "0xffffffffffffffff"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "gt",
-                          "nativeSrc": "993:2:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "993:2:1"
-                        },
-                        "nativeSrc": "993:30:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "993:30:1"
-                      },
-                      "nativeSrc": "990:117:1",
-                      "nodeType": "YulIf",
-                      "src": "990:117:1"
-                    },
-                    {
-                      "nativeSrc": "1116:29:1",
-                      "nodeType": "YulAssignment",
-                      "src": "1116:29:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "name": "offset",
-                            "nativeSrc": "1132:6:1",
-                            "nodeType": "YulIdentifier",
-                            "src": "1132:6:1"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "1140:4:1",
-                            "nodeType": "YulLiteral",
-                            "src": "1140:4:1",
-                            "type": "",
-                            "value": "0x20"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "add",
-                          "nativeSrc": "1128:3:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "1128:3:1"
-                        },
-                        "nativeSrc": "1128:17:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "1128:17:1"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "arrayPos",
-                          "nativeSrc": "1116:8:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "1116:8:1"
-                        }
-                      ]
-                    },
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "1199:83:1",
-                        "nodeType": "YulBlock",
-                        "src": "1199:83:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments": [],
-                              "functionName":
-                              {
-                                "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
-                                "nativeSrc": "1201:77:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1201:77:1"
-                              },
-                              "nativeSrc": "1201:79:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "1201:79:1"
-                            },
-                            "nativeSrc": "1201:79:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "1201:79:1"
-                          }
-                        ]
-                      },
-                      "condition":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "arguments":
-                            [
-                              {
-                                "name": "arrayPos",
-                                "nativeSrc": "1164:8:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1164:8:1"
-                              },
-                              {
-                                "arguments":
-                                [
-                                  {
-                                    "name": "length",
-                                    "nativeSrc": "1178:6:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1178:6:1"
-                                  },
-                                  {
-                                    "kind": "number",
-                                    "nativeSrc": "1186:4:1",
-                                    "nodeType": "YulLiteral",
-                                    "src": "1186:4:1",
-                                    "type": "",
-                                    "value": "0x20"
-                                  }
-                                ],
-                                "functionName":
-                                {
-                                  "name": "mul",
-                                  "nativeSrc": "1174:3:1",
-                                  "nodeType": "YulIdentifier",
-                                  "src": "1174:3:1"
-                                },
-                                "nativeSrc": "1174:17:1",
-                                "nodeType": "YulFunctionCall",
-                                "src": "1174:17:1"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "add",
-                              "nativeSrc": "1160:3:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1160:3:1"
-                            },
-                            "nativeSrc": "1160:32:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "1160:32:1"
-                          },
-                          {
-                            "name": "end",
-                            "nativeSrc": "1194:3:1",
-                            "nodeType": "YulIdentifier",
-                            "src": "1194:3:1"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "gt",
-                          "nativeSrc": "1157:2:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "1157:2:1"
-                        },
-                        "nativeSrc": "1157:41:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "1157:41:1"
-                      },
-                      "nativeSrc": "1154:128:1",
-                      "nodeType": "YulIf",
-                      "src": "1154:128:1"
-                    }
-                  ]
-                },
-                "name": "abi_decode_t_array$_t_uint256_$dyn_calldata_ptr",
-                "nativeSrc": "720:568:1",
-                "nodeType": "YulFunctionDefinition",
-                "parameters":
-                [
-                  {
-                    "name": "offset",
-                    "nativeSrc": "777:6:1",
-                    "nodeType": "YulTypedName",
-                    "src": "777:6:1",
-                    "type": ""
-                  },
-                  {
-                    "name": "end",
-                    "nativeSrc": "785:3:1",
-                    "nodeType": "YulTypedName",
-                    "src": "785:3:1",
-                    "type": ""
-                  }
-                ],
-                "returnVariables":
-                [
-                  {
-                    "name": "arrayPos",
-                    "nativeSrc": "793:8:1",
-                    "nodeType": "YulTypedName",
-                    "src": "793:8:1",
-                    "type": ""
-                  },
-                  {
-                    "name": "length",
-                    "nativeSrc": "803:6:1",
-                    "nodeType": "YulTypedName",
-                    "src": "803:6:1",
-                    "type": ""
-                  }
-                ],
-                "src": "720:568:1"
-              },
-              {
-                "body":
-                {
-                  "nativeSrc": "1395:458:1",
-                  "nodeType": "YulBlock",
-                  "src": "1395:458:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "1441:83:1",
-                        "nodeType": "YulBlock",
-                        "src": "1441:83:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments": [],
-                              "functionName":
-                              {
-                                "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
-                                "nativeSrc": "1443:77:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1443:77:1"
-                              },
-                              "nativeSrc": "1443:79:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "1443:79:1"
-                            },
-                            "nativeSrc": "1443:79:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "1443:79:1"
-                          }
-                        ]
-                      },
-                      "condition":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "arguments":
-                            [
-                              {
-                                "name": "dataEnd",
-                                "nativeSrc": "1416:7:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1416:7:1"
-                              },
-                              {
-                                "name": "headStart",
-                                "nativeSrc": "1425:9:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1425:9:1"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "sub",
-                              "nativeSrc": "1412:3:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1412:3:1"
-                            },
-                            "nativeSrc": "1412:23:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "1412:23:1"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "1437:2:1",
-                            "nodeType": "YulLiteral",
-                            "src": "1437:2:1",
-                            "type": "",
-                            "value": "32"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "slt",
-                          "nativeSrc": "1408:3:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "1408:3:1"
-                        },
-                        "nativeSrc": "1408:32:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "1408:32:1"
-                      },
-                      "nativeSrc": "1405:119:1",
-                      "nodeType": "YulIf",
-                      "src": "1405:119:1"
-                    },
-                    {
-                      "nativeSrc": "1534:312:1",
-                      "nodeType": "YulBlock",
-                      "src": "1534:312:1",
-                      "statements":
-                      [
-                        {
-                          "nativeSrc": "1549:45:1",
-                          "nodeType": "YulVariableDeclaration",
-                          "src": "1549:45:1",
-                          "value":
-                          {
-                            "arguments":
-                            [
-                              {
-                                "arguments":
-                                [
-                                  {
-                                    "name": "headStart",
-                                    "nativeSrc": "1580:9:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1580:9:1"
-                                  },
-                                  {
-                                    "kind": "number",
-                                    "nativeSrc": "1591:1:1",
-                                    "nodeType": "YulLiteral",
-                                    "src": "1591:1:1",
-                                    "type": "",
-                                    "value": "0"
-                                  }
-                                ],
-                                "functionName":
-                                {
-                                  "name": "add",
-                                  "nativeSrc": "1576:3:1",
-                                  "nodeType": "YulIdentifier",
-                                  "src": "1576:3:1"
-                                },
-                                "nativeSrc": "1576:17:1",
-                                "nodeType": "YulFunctionCall",
-                                "src": "1576:17:1"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "calldataload",
-                              "nativeSrc": "1563:12:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1563:12:1"
-                            },
-                            "nativeSrc": "1563:31:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "1563:31:1"
-                          },
-                          "variables":
-                          [
-                            {
-                              "name": "offset",
-                              "nativeSrc": "1553:6:1",
-                              "nodeType": "YulTypedName",
-                              "src": "1553:6:1",
-                              "type": ""
-                            }
-                          ]
-                        },
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "1641:83:1",
-                            "nodeType": "YulBlock",
-                            "src": "1641:83:1",
-                            "statements":
-                            [
-                              {
-                                "expression":
-                                {
-                                  "arguments": [],
-                                  "functionName":
-                                  {
-                                    "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
-                                    "nativeSrc": "1643:77:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1643:77:1"
-                                  },
-                                  "nativeSrc": "1643:79:1",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "1643:79:1"
-                                },
-                                "nativeSrc": "1643:79:1",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "1643:79:1"
-                              }
-                            ]
-                          },
-                          "condition":
-                          {
-                            "arguments":
-                            [
-                              {
-                                "name": "offset",
-                                "nativeSrc": "1613:6:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1613:6:1"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "1621:18:1",
-                                "nodeType": "YulLiteral",
-                                "src": "1621:18:1",
-                                "type": "",
-                                "value": "0xffffffffffffffff"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "gt",
-                              "nativeSrc": "1610:2:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1610:2:1"
-                            },
-                            "nativeSrc": "1610:30:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "1610:30:1"
-                          },
-                          "nativeSrc": "1607:117:1",
-                          "nodeType": "YulIf",
-                          "src": "1607:117:1"
-                        },
-                        {
-                          "nativeSrc": "1738:98:1",
-                          "nodeType": "YulAssignment",
-                          "src": "1738:98:1",
-                          "value":
-                          {
-                            "arguments":
-                            [
-                              {
-                                "arguments":
-                                [
-                                  {
-                                    "name": "headStart",
-                                    "nativeSrc": "1808:9:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1808:9:1"
-                                  },
-                                  {
-                                    "name": "offset",
-                                    "nativeSrc": "1819:6:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1819:6:1"
-                                  }
-                                ],
-                                "functionName":
-                                {
-                                  "name": "add",
-                                  "nativeSrc": "1804:3:1",
-                                  "nodeType": "YulIdentifier",
-                                  "src": "1804:3:1"
-                                },
-                                "nativeSrc": "1804:22:1",
-                                "nodeType": "YulFunctionCall",
-                                "src": "1804:22:1"
-                              },
-                              {
-                                "name": "dataEnd",
-                                "nativeSrc": "1828:7:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "1828:7:1"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "abi_decode_t_array$_t_uint256_$dyn_calldata_ptr",
-                              "nativeSrc": "1756:47:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1756:47:1"
-                            },
-                            "nativeSrc": "1756:80:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "1756:80:1"
-                          },
-                          "variableNames":
-                          [
-                            {
-                              "name": "value0",
-                              "nativeSrc": "1738:6:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1738:6:1"
-                            },
-                            {
-                              "name": "value1",
-                              "nativeSrc": "1746:6:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "1746:6:1"
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr",
-                "nativeSrc": "1294:559:1",
-                "nodeType": "YulFunctionDefinition",
-                "parameters":
-                [
-                  {
-                    "name": "headStart",
-                    "nativeSrc": "1357:9:1",
-                    "nodeType": "YulTypedName",
-                    "src": "1357:9:1",
-                    "type": ""
-                  },
-                  {
-                    "name": "dataEnd",
-                    "nativeSrc": "1368:7:1",
-                    "nodeType": "YulTypedName",
-                    "src": "1368:7:1",
-                    "type": ""
-                  }
-                ],
-                "returnVariables":
-                [
-                  {
-                    "name": "value0",
-                    "nativeSrc": "1380:6:1",
-                    "nodeType": "YulTypedName",
-                    "src": "1380:6:1",
-                    "type": ""
-                  },
-                  {
-                    "name": "value1",
-                    "nativeSrc": "1388:6:1",
-                    "nodeType": "YulTypedName",
-                    "src": "1388:6:1",
-                    "type": ""
-                  }
-                ],
-                "src": "1294:559:1"
-              }
-            ]
-          },
-          "contents": "{\n\n    function allocate_unbounded() -> memPtr {\n        memPtr := mload(64)\n    }\n\n    function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {\n        revert(0, 0)\n    }\n\n    function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {\n        revert(0, 0)\n    }\n\n    function revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() {\n        revert(0, 0)\n    }\n\n    function revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490() {\n        revert(0, 0)\n    }\n\n    function revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef() {\n        revert(0, 0)\n    }\n\n    // uint256[]\n    function abi_decode_t_array$_t_uint256_$dyn_calldata_ptr(offset, end) -> arrayPos, length {\n        if iszero(slt(add(offset, 0x1f), end)) { revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() }\n        length := calldataload(offset)\n        if gt(length, 0xffffffffffffffff) { revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490() }\n        arrayPos := add(offset, 0x20)\n        if gt(add(arrayPos, mul(length, 0x20)), end) { revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef() }\n    }\n\n    function abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr(headStart, dataEnd) -> value0, value1 {\n        if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }\n\n        {\n\n            let offset := calldataload(add(headStart, 0))\n            if gt(offset, 0xffffffffffffffff) { revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() }\n\n            value0, value1 := abi_decode_t_array$_t_uint256_$dyn_calldata_ptr(add(headStart, offset), dataEnd)\n        }\n\n    }\n\n}\n",
-          "id": 1,
-          "language": "Yul",
-          "name": "#utility.yul"
-        }
-      ]
-    }
-  },
-  "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/combined_json_no_pretty_print/args b/test/cmdlineTests/combined_json_no_pretty_print/args
deleted file mode 100644
index 92b15646550d..000000000000
--- a/test/cmdlineTests/combined_json_no_pretty_print/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json abi
diff --git a/test/cmdlineTests/combined_json_no_pretty_print/input.sol b/test/cmdlineTests/combined_json_no_pretty_print/input.sol
deleted file mode 100644
index 625af568280c..000000000000
--- a/test/cmdlineTests/combined_json_no_pretty_print/input.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {}
diff --git a/test/cmdlineTests/combined_json_no_pretty_print/output b/test/cmdlineTests/combined_json_no_pretty_print/output
deleted file mode 100644
index 081dc4fa4eca..000000000000
--- a/test/cmdlineTests/combined_json_no_pretty_print/output
+++ /dev/null
@@ -1 +0,0 @@
-{"contracts":{"combined_json_no_pretty_print/input.sol:C":{"abi":[]}},"version": "<VERSION REMOVED>"}
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/args b/test/cmdlineTests/combined_json_stop_after_parsing/args
deleted file mode 100644
index 692bfd79eaeb..000000000000
--- a/test/cmdlineTests/combined_json_stop_after_parsing/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4 --stop-after parsing --combined-json abi,asm,ast,bin,bin-runtime,devdoc,function-debug,function-debug-runtime,generated-sources,generated-sources-runtime,hashes,metadata,opcodes,srcmap,srcmap-runtime,storage-layout,userdoc
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/input.sol b/test/cmdlineTests/combined_json_stop_after_parsing/input.sol
deleted file mode 100644
index a3a86cc8d317..000000000000
--- a/test/cmdlineTests/combined_json_stop_after_parsing/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {}
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/output b/test/cmdlineTests/combined_json_stop_after_parsing/output
deleted file mode 100644
index 32cdd019b859..000000000000
--- a/test/cmdlineTests/combined_json_stop_after_parsing/output
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "contracts":
-    {
-        "combined_json_stop_after_parsing/input.sol:C": {}
-    },
-    "sourceList":
-    [
-        "combined_json_stop_after_parsing/input.sol"
-    ],
-    "sources":
-    {
-        "combined_json_stop_after_parsing/input.sol":
-        {
-            "AST":
-            {
-                "absolutePath": "combined_json_stop_after_parsing/input.sol",
-                "id": 3,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            "*"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:18:0"
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "id": 2,
-                        "name": "C",
-                        "nameLocation": "65:1:0",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [],
-                        "src": "56:13:0",
-                        "usedErrors": [],
-                        "usedEvents": []
-                    }
-                ],
-                "src": "36:34:0"
-            },
-            "id": 0
-        }
-    },
-    "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/combined_json_with_base_path/args b/test/cmdlineTests/combined_json_with_base_path/args
deleted file mode 100644
index 4e1f48462b3d..000000000000
--- a/test/cmdlineTests/combined_json_with_base_path/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json ast --pretty-json --base-path . --allow-paths .
diff --git a/test/cmdlineTests/combined_json_with_base_path/c.sol b/test/cmdlineTests/combined_json_with_base_path/c.sol
deleted file mode 100644
index f123f6c8bee3..000000000000
--- a/test/cmdlineTests/combined_json_with_base_path/c.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {}
diff --git a/test/cmdlineTests/combined_json_with_base_path/input.sol b/test/cmdlineTests/combined_json_with_base_path/input.sol
deleted file mode 100644
index 07f8848fc35b..000000000000
--- a/test/cmdlineTests/combined_json_with_base_path/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-import "./c.sol";
diff --git a/test/cmdlineTests/combined_json_with_base_path/output b/test/cmdlineTests/combined_json_with_base_path/output
deleted file mode 100644
index ec9bbcbcb22e..000000000000
--- a/test/cmdlineTests/combined_json_with_base_path/output
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "contracts":
-  {
-    "combined_json_with_base_path/c.sol:C": {}
-  },
-  "sourceList":
-  [
-    "combined_json_with_base_path/c.sol",
-    "combined_json_with_base_path/input.sol"
-  ],
-  "sources":
-  {
-    "combined_json_with_base_path/c.sol":
-    {
-      "AST":
-      {
-        "absolutePath": "combined_json_with_base_path/c.sol",
-        "exportedSymbols":
-        {
-          "C":
-          [
-            5
-          ]
-        },
-        "id": 6,
-        "license": "GPL-3.0",
-        "nodeType": "SourceUnit",
-        "nodes":
-        [
-          {
-            "id": 4,
-            "literals":
-            [
-              "solidity",
-              ">=",
-              "0.0"
-            ],
-            "nodeType": "PragmaDirective",
-            "src": "36:22:0"
-          },
-          {
-            "abstract": false,
-            "baseContracts": [],
-            "canonicalName": "C",
-            "contractDependencies": [],
-            "contractKind": "contract",
-            "fullyImplemented": true,
-            "id": 5,
-            "linearizedBaseContracts":
-            [
-              5
-            ],
-            "name": "C",
-            "nameLocation": "69:1:0",
-            "nodeType": "ContractDefinition",
-            "nodes": [],
-            "scope": 6,
-            "src": "60:13:0",
-            "usedErrors": [],
-            "usedEvents": []
-          }
-        ],
-        "src": "36:38:0"
-      },
-      "id": 0
-    },
-    "combined_json_with_base_path/input.sol":
-    {
-      "AST":
-      {
-        "absolutePath": "combined_json_with_base_path/input.sol",
-        "exportedSymbols":
-        {
-          "C":
-          [
-            5
-          ]
-        },
-        "id": 3,
-        "license": "GPL-3.0",
-        "nodeType": "SourceUnit",
-        "nodes":
-        [
-          {
-            "id": 1,
-            "literals":
-            [
-              "solidity",
-              ">=",
-              "0.0"
-            ],
-            "nodeType": "PragmaDirective",
-            "src": "36:22:1"
-          },
-          {
-            "absolutePath": "combined_json_with_base_path/c.sol",
-            "file": "./c.sol",
-            "id": 2,
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "ImportDirective",
-            "scope": 3,
-            "sourceUnit": 6,
-            "src": "60:17:1",
-            "symbolAliases": [],
-            "unitAlias": ""
-          }
-        ],
-        "src": "36:42:1"
-      },
-      "id": 1
-    }
-  },
-  "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/combined_json_with_devdoc/args b/test/cmdlineTests/combined_json_with_devdoc/args
deleted file mode 100644
index dc55cdec72ba..000000000000
--- a/test/cmdlineTests/combined_json_with_devdoc/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json devdoc --pretty-json --allow-paths .
diff --git a/test/cmdlineTests/combined_json_with_devdoc/input.sol b/test/cmdlineTests/combined_json_with_devdoc/input.sol
deleted file mode 100644
index 6787b59b174b..000000000000
--- a/test/cmdlineTests/combined_json_with_devdoc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-/// @dev This is devdoc.
-contract C {}
-
-/// And this is a notice.
-contract D {}
diff --git a/test/cmdlineTests/combined_json_with_devdoc/output b/test/cmdlineTests/combined_json_with_devdoc/output
deleted file mode 100644
index d3df44a90d17..000000000000
--- a/test/cmdlineTests/combined_json_with_devdoc/output
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "contracts":
-  {
-    "combined_json_with_devdoc/input.sol:C":
-    {
-      "devdoc":
-      {
-        "details": "This is devdoc.",
-        "kind": "dev",
-        "methods": {},
-        "version": 1
-      }
-    },
-    "combined_json_with_devdoc/input.sol:D":
-    {
-      "devdoc":
-      {
-        "kind": "dev",
-        "methods": {},
-        "version": 1
-      }
-    }
-  },
-  "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/combined_json_with_userdoc/args b/test/cmdlineTests/combined_json_with_userdoc/args
deleted file mode 100644
index b7c2697aa491..000000000000
--- a/test/cmdlineTests/combined_json_with_userdoc/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json userdoc --pretty-json --allow-paths .
diff --git a/test/cmdlineTests/combined_json_with_userdoc/input.sol b/test/cmdlineTests/combined_json_with_userdoc/input.sol
deleted file mode 100644
index c6d37c8d40cd..000000000000
--- a/test/cmdlineTests/combined_json_with_userdoc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-/// @notice Description for users.
-contract C {}
-
-/// @dev Description for developers.
-contract D {}
diff --git a/test/cmdlineTests/combined_json_with_userdoc/output b/test/cmdlineTests/combined_json_with_userdoc/output
deleted file mode 100644
index 650981d67c4f..000000000000
--- a/test/cmdlineTests/combined_json_with_userdoc/output
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "contracts":
-  {
-    "combined_json_with_userdoc/input.sol:C":
-    {
-      "userdoc":
-      {
-        "kind": "user",
-        "methods": {},
-        "notice": "Description for users.",
-        "version": 1
-      }
-    },
-    "combined_json_with_userdoc/input.sol:D":
-    {
-      "userdoc":
-      {
-        "kind": "user",
-        "methods": {},
-        "version": 1
-      }
-    }
-  },
-  "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/constant_optimizer_yul/args b/test/cmdlineTests/constant_optimizer_yul/args
deleted file mode 100644
index c42a0fcddb8e..000000000000
--- a/test/cmdlineTests/constant_optimizer_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --ir-optimized --optimize-runs 1000000
diff --git a/test/cmdlineTests/constant_optimizer_yul/err b/test/cmdlineTests/constant_optimizer_yul/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/constant_optimizer_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/constant_optimizer_yul/input.sol b/test/cmdlineTests/constant_optimizer_yul/input.sol
deleted file mode 100644
index b3ce6632b8cf..000000000000
--- a/test/cmdlineTests/constant_optimizer_yul/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-v3
-pragma solidity >= 0.0.0;
-contract C {
-    constructor () {
-        assembly {
-            // This shl should not be evaluated for all values of optimize-runs
-            sstore(0, shl(180, 1))
-        }
-    }
-    fallback() external {
-        assembly {
-            // This shl would be evaluated for high values of optimize-runs
-            sstore(0, shl(180, 1))
-        }
-    }
-}
diff --git a/test/cmdlineTests/constant_optimizer_yul/output b/test/cmdlineTests/constant_optimizer_yul/output
deleted file mode 100644
index 9c7faa732272..000000000000
--- a/test/cmdlineTests/constant_optimizer_yul/output
+++ /dev/null
@@ -1,32 +0,0 @@
-Optimized IR:
-/// @use-src 0:"constant_optimizer_yul/input.sol"
-object "C_12" {
-    code {
-        {
-            /// @src 0:61:418  "contract C {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            /// @src 0:103:238  "assembly {..."
-            sstore(0, shl(180, 1))
-            /// @src 0:61:418  "contract C {..."
-            let _2 := datasize("C_12_deployed")
-            codecopy(_1, dataoffset("C_12_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"constant_optimizer_yul/input.sol"
-    object "C_12_deployed" {
-        code {
-            {
-                /// @src 0:61:418  "contract C {..."
-                if callvalue() { revert(0, 0) }
-                /// @src 0:279:410  "assembly {..."
-                sstore(0, 0x1000000000000000000000000000000000000000000000)
-                /// @src 0:61:418  "contract C {..."
-                stop()
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/args b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/args
deleted file mode 100644
index 77f60c7468f9..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/args
+++ /dev/null
@@ -1 +0,0 @@
---ir --ir-optimized --asm --optimize --debug-info all
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/input.sol b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/input.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/input.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
deleted file mode 100644
index a232fed8fc3b..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ /dev/null
@@ -1,204 +0,0 @@
-
-======= debug_info_in_yul_and_evm_asm_print_all/input.sol:C =======
-EVM assembly:
-    /* "debug_info_in_yul_and_evm_asm_print_all/input.sol":60:101  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "debug_info_in_yul_and_evm_asm_print_all/input.sol":60:101  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "debug_info_in_yul_and_evm_asm_print_all/input.sol":77:99  function f() public {} */
-    tag_3:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
-
-IR:
-
-/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
-object "C_6" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_6()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
-
-        return(_1, datasize("C_6_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:60:101  "contract C {..."
-        function constructor_C_6() {
-
-            /// @src 0:60:101  "contract C {..."
-
-        }
-        /// @src 0:60:101  "contract C {..."
-
-    }
-    /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
-    object "C_6_deployed" {
-        code {
-            /// @src 0:60:101  "contract C {..."
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            /// @ast-id 5
-            /// @src 0:77:99  "function f() public {}"
-            function fun_f_5() {
-
-            }
-            /// @src 0:60:101  "contract C {..."
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
-
-
-Optimized IR:
-/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
-object "C_6" {
-    code {
-        {
-            /// @src 0:60:101  "contract C {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_6_deployed")
-            codecopy(_1, dataoffset("C_6_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
-    object "C_6_deployed" {
-        code {
-            {
-                /// @src 0:60:101  "contract C {..."
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/args b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/args
deleted file mode 100644
index e0c752a3a65d..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/args
+++ /dev/null
@@ -1 +0,0 @@
---ir --ir-optimized --asm --optimize --debug-info location,all,none
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err
deleted file mode 100644
index ce13452cc80c..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid value for --debug-info option: location,all,none
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/exit b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/input.sol b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/input.sol
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/args b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/args
deleted file mode 100644
index 6b47cc2c31f2..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/args
+++ /dev/null
@@ -1 +0,0 @@
---ir --ir-optimized --asm --optimize --debug-info location
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/input.sol b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/input.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/input.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
deleted file mode 100644
index 00a6b290f826..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ /dev/null
@@ -1,203 +0,0 @@
-
-======= debug_info_in_yul_and_evm_asm_print_location_only/input.sol:C =======
-EVM assembly:
-    /* "debug_info_in_yul_and_evm_asm_print_location_only/input.sol":60:101 */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "debug_info_in_yul_and_evm_asm_print_location_only/input.sol":60:101 */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "debug_info_in_yul_and_evm_asm_print_location_only/input.sol":77:99 */
-    tag_3:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
-
-IR:
-
-/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
-object "C_6" {
-    code {
-        /// @src 0:60:101
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_6()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
-
-        return(_1, datasize("C_6_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:60:101
-        function constructor_C_6() {
-
-            /// @src 0:60:101
-
-        }
-        /// @src 0:60:101
-
-    }
-    /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
-    object "C_6_deployed" {
-        code {
-            /// @src 0:60:101
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            /// @src 0:77:99
-            function fun_f_5() {
-
-            }
-            /// @src 0:60:101
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
-
-
-Optimized IR:
-/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
-object "C_6" {
-    code {
-        {
-            /// @src 0:60:101
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_6_deployed")
-            codecopy(_1, dataoffset("C_6_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
-    object "C_6_deployed" {
-        code {
-            {
-                /// @src 0:60:101
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/args b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/args
deleted file mode 100644
index 89896f68a711..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/args
+++ /dev/null
@@ -1 +0,0 @@
---ir --ir-optimized --asm --optimize --debug-info none
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/input.sol b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/input.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/input.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
deleted file mode 100644
index c8715df15051..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ /dev/null
@@ -1,192 +0,0 @@
-
-======= debug_info_in_yul_and_evm_asm_print_none/input.sol:C =======
-EVM assembly:
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-    tag_3:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
-
-IR:
-
-/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
-object "C_6" {
-    code {
-
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_6()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
-
-        return(_1, datasize("C_6_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        function constructor_C_6() {
-
-        }
-
-    }
-    /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
-    object "C_6_deployed" {
-        code {
-
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function fun_f_5() {
-
-            }
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
-
-
-Optimized IR:
-/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
-object "C_6" {
-    code {
-        {
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_6_deployed")
-            codecopy(_1, dataoffset("C_6_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
-    object "C_6_deployed" {
-        code {
-            {
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/args b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/args
deleted file mode 100644
index 9f1e80de2f66..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/args
+++ /dev/null
@@ -1 +0,0 @@
---ir --ir-optimized --asm --optimize --debug-info snippet
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err
deleted file mode 100644
index e4abc6129d0f..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: To use 'snippet' with --debug-info you must select also 'location'.
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/exit b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/input.sol b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/input.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/input.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/args b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/args
deleted file mode 100644
index 7282a28fe614..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --ir --optimize
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/input.sol b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/input.sol
deleted file mode 100644
index 598f3b280adf..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/input.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-
-// Intentionally badly wrapped and commented in weird places to get source locations inside code
-// snippets in generated Yul. Also contains stuff that could break the assembly if not escaped properly.
-
-contract C {} contract D /** @src 0:96:165  "contract D {..." */ {
-    function f() /* @use-src 0:"input.sol", 1:"#utility.yul" @ast-id 15 */ public returns (string memory) { C c = new /// @src 0:149:156  "new C()"
-        C(); c;
-        string memory s = "/*"; s; return "/** @src 0:96:165  \"contract D {...\" */"
-        ;
-    }
-}
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
deleted file mode 100644
index 94dfb864262a..000000000000
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ /dev/null
@@ -1,527 +0,0 @@
-IR:
-
-/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-object "C_2" {
-    code {
-        /// @src 0:265:278  "contract C {}"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_2()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_2_deployed"), datasize("C_2_deployed"))
-
-        return(_1, datasize("C_2_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:265:278  "contract C {}"
-        function constructor_C_2() {
-
-            /// @src 0:265:278  "contract C {}"
-
-        }
-        /// @src 0:265:278  "contract C {}"
-
-    }
-    /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-    object "C_2_deployed" {
-        code {
-            /// @src 0:265:278  "contract C {}"
-            mstore(64, memoryguard(128))
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
-
-
-Optimized IR:
-/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-object "C_2" {
-    code {
-        {
-            /// @src 0:265:278  "contract C {}"
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_2_deployed")
-            codecopy(_1, dataoffset("C_2_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-    object "C_2_deployed" {
-        code {
-            {
-                /// @src 0:265:278  "contract C {}"
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
-
-IR:
-
-/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-object "D_27" {
-    code {
-        /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_D_27()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("D_27_deployed"), datasize("D_27_deployed"))
-
-        return(_1, datasize("D_27_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-        function constructor_D_27() {
-
-            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-
-        }
-        /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-
-    }
-    /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-    object "D_27_deployed" {
-        code {
-            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_26()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function array_length_t_string_memory_ptr(value) -> length {
-
-                length := mload(value)
-
-            }
-
-            function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {
-                mstore(pos, length)
-                updated_pos := add(pos, 0x20)
-            }
-
-            function copy_memory_to_memory_with_cleanup(src, dst, length) {
-                let i := 0
-                for { } lt(i, length) { i := add(i, 32) }
-                {
-                    mstore(add(dst, i), mload(add(src, i)))
-                }
-                mstore(add(dst, length), 0)
-            }
-
-            function round_up_to_mul_of_32(value) -> result {
-                result := and(add(value, 31), not(31))
-            }
-
-            function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value, pos) -> end {
-                let length := array_length_t_string_memory_ptr(value)
-                pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length)
-                copy_memory_to_memory_with_cleanup(add(value, 0x20), pos, length)
-                end := add(pos, round_up_to_mul_of_32(length))
-            }
-
-            function abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                mstore(add(headStart, 0), sub(tail, headStart))
-                tail := abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value0,  tail)
-
-            }
-
-            function external_fun_f_26() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_26()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_string_memory_ptr() -> ret {
-                ret := 96
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function revert_forward_1() {
-                let pos := allocate_unbounded()
-                returndatacopy(pos, 0, returndatasize())
-                revert(pos, returndatasize())
-            }
-
-            function finalize_allocation(memPtr, size) {
-                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-                // protect against overflow
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-
-            function allocate_memory(size) -> memPtr {
-                memPtr := allocate_unbounded()
-                finalize_allocation(memPtr, size)
-            }
-
-            function array_allocation_size_t_string_memory_ptr(length) -> size {
-                // Make sure we can allocate memory without overflow
-                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
-
-                size := round_up_to_mul_of_32(length)
-
-                // add length slot
-                size := add(size, 0x20)
-
-            }
-
-            function allocate_memory_array_t_string_memory_ptr(length) -> memPtr {
-                let allocSize := array_allocation_size_t_string_memory_ptr(length)
-                memPtr := allocate_memory(allocSize)
-
-                mstore(memPtr, length)
-
-            }
-
-            function store_literal_in_memory_c077635d0709aa1fd7cea2045028c270f982d687d1647e48e759eec32ec54a50(memPtr) {
-
-                mstore(add(memPtr, 0), "/*")
-
-            }
-
-            function copy_literal_to_memory_c077635d0709aa1fd7cea2045028c270f982d687d1647e48e759eec32ec54a50() -> memPtr {
-                memPtr := allocate_memory_array_t_string_memory_ptr(2)
-                store_literal_in_memory_c077635d0709aa1fd7cea2045028c270f982d687d1647e48e759eec32ec54a50(add(memPtr, 32))
-            }
-
-            function convert_t_stringliteral_c077635d0709aa1fd7cea2045028c270f982d687d1647e48e759eec32ec54a50_to_t_string_memory_ptr() -> converted {
-                converted := copy_literal_to_memory_c077635d0709aa1fd7cea2045028c270f982d687d1647e48e759eec32ec54a50()
-            }
-
-            function store_literal_in_memory_5bde9a896e3f09acac1496d16642fcdd887d2a000bf1ab18bdff3f17b91e320b(memPtr) {
-
-                mstore(add(memPtr, 0), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
-
-                mstore(add(memPtr, 32), 0x2e2e2e22202a2f00000000000000000000000000000000000000000000000000)
-
-            }
-
-            function copy_literal_to_memory_5bde9a896e3f09acac1496d16642fcdd887d2a000bf1ab18bdff3f17b91e320b() -> memPtr {
-                memPtr := allocate_memory_array_t_string_memory_ptr(39)
-                store_literal_in_memory_5bde9a896e3f09acac1496d16642fcdd887d2a000bf1ab18bdff3f17b91e320b(add(memPtr, 32))
-            }
-
-            function convert_t_stringliteral_5bde9a896e3f09acac1496d16642fcdd887d2a000bf1ab18bdff3f17b91e320b_to_t_string_memory_ptr() -> converted {
-                converted := copy_literal_to_memory_5bde9a896e3f09acac1496d16642fcdd887d2a000bf1ab18bdff3f17b91e320b()
-            }
-
-            /// @ast-id 26
-            /// @src 0:336:597  "function f() /* @use-src 0:\"input.sol\", 1:\"#utility.yul\" @ast-id 15 *\/ public returns (string memory) { C c = new /// @src 0:149:156  \"new C()\"..."
-            function fun_f_26() -> var__5_mpos {
-                /// @src 0:423:436  "string memory"
-                let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr()
-                var__5_mpos := zero_t_string_memory_ptr_1_mpos
-
-                /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                let _2 := allocate_unbounded()
-                let _3 := add(_2, datasize("C_2"))
-                if or(gt(_3, 0xffffffffffffffff), lt(_3, _2)) { panic_error_0x41() }
-                datacopy(_2, dataoffset("C_2"), datasize("C_2"))
-                _3 := abi_encode_tuple__to__fromStack(_3)
-
-                let expr_13_address := create(0, _2, sub(_3, _2))
-
-                if iszero(expr_13_address) { revert_forward_1() }
-
-                /// @src 0:440:491  "C c = new /// @src 0:149:156  \"new C()\"..."
-                let var_c_9_address := expr_13_address
-                /// @src 0:493:494  "c"
-                let _4_address := var_c_9_address
-                let expr_15_address := _4_address
-                /// @src 0:504:526  "string memory s = \"/*\""
-                let var_s_18_mpos := convert_t_stringliteral_c077635d0709aa1fd7cea2045028c270f982d687d1647e48e759eec32ec54a50_to_t_string_memory_ptr()
-                /// @src 0:528:529  "s"
-                let _5_mpos := var_s_18_mpos
-                let expr_21_mpos := _5_mpos
-                /// @src 0:531:581  "return \"/** @src 0:96:165  \\\"contract D {...\\\" *\/\""
-                var__5_mpos := convert_t_stringliteral_5bde9a896e3f09acac1496d16642fcdd887d2a000bf1ab18bdff3f17b91e320b_to_t_string_memory_ptr()
-                leave
-
-            }
-            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-
-        }
-
-        /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-        object "C_2" {
-            code {
-                /// @src 0:265:278  "contract C {}"
-                mstore(64, memoryguard(128))
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-                constructor_C_2()
-
-                let _1 := allocate_unbounded()
-                codecopy(_1, dataoffset("C_2_deployed"), datasize("C_2_deployed"))
-
-                return(_1, datasize("C_2_deployed"))
-
-                function allocate_unbounded() -> memPtr {
-                    memPtr := mload(64)
-                }
-
-                function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                    revert(0, 0)
-                }
-
-                /// @src 0:265:278  "contract C {}"
-                function constructor_C_2() {
-
-                    /// @src 0:265:278  "contract C {}"
-
-                }
-                /// @src 0:265:278  "contract C {}"
-
-            }
-            /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-            object "C_2_deployed" {
-                code {
-                    /// @src 0:265:278  "contract C {}"
-                    mstore(64, memoryguard(128))
-
-                    revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-                    function shift_right_224_unsigned(value) -> newValue {
-                        newValue :=
-
-                        shr(224, value)
-
-                    }
-
-                    function allocate_unbounded() -> memPtr {
-                        memPtr := mload(64)
-                    }
-
-                    function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                        revert(0, 0)
-                    }
-
-                }
-
-                data ".metadata" hex"<BYTECODE REMOVED>"
-            }
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
-
-
-Optimized IR:
-/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-object "D_27" {
-    code {
-        {
-            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("D_27_deployed")
-            codecopy(_1, dataoffset("D_27_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-    object "D_27_deployed" {
-        code {
-            {
-                /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                let _1 := memoryguard(0x80)
-                let _2 := 64
-                mstore(_2, _1)
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        let _3 := datasize("C_2")
-                        let _4 := add(_1, _3)
-                        let _5 := 0xffffffffffffffff
-                        if or(gt(_4, _5), lt(_4, _1))
-                        {
-                            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x41)
-                            revert(0, 0x24)
-                        }
-                        /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        datacopy(_1, dataoffset("C_2"), _3)
-                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ 0, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _1, sub(_4, _1)))
-                        {
-                            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                            let pos := mload(_2)
-                            returndatacopy(pos, 0, returndatasize())
-                            revert(pos, returndatasize())
-                        }
-                        let memPtr := mload(_2)
-                        let newFreePtr := add(memPtr, _2)
-                        if or(gt(newFreePtr, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x41)
-                            revert(0, 0x24)
-                        }
-                        mstore(_2, newFreePtr)
-                        mstore(memPtr, 2)
-                        let _6 := 32
-                        mstore(add(memPtr, _6), "/*")
-                        let memPtr_1 := mload(_2)
-                        let newFreePtr_1 := add(memPtr_1, 96)
-                        if or(gt(newFreePtr_1, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x41)
-                            revert(0, 0x24)
-                        }
-                        mstore(_2, newFreePtr_1)
-                        mstore(memPtr_1, 39)
-                        mstore(add(memPtr_1, _6), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
-                        mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
-                        let memPos := mload(_2)
-                        mstore(memPos, _6)
-                        let length := mload(memPtr_1)
-                        mstore(add(memPos, _6), length)
-                        let i := 0
-                        for { } lt(i, length) { i := add(i, _6) }
-                        {
-                            mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _6)))
-                        }
-                        mstore(add(add(memPos, length), _2), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-        object "C_2" {
-            code {
-                {
-                    /// @src 0:265:278  "contract C {}"
-                    let _1 := memoryguard(0x80)
-                    mstore(64, _1)
-                    if callvalue() { revert(0, 0) }
-                    let _2 := datasize("C_2_deployed")
-                    codecopy(_1, dataoffset("C_2_deployed"), _2)
-                    return(_1, _2)
-                }
-            }
-            /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
-            object "C_2_deployed" {
-                code {
-                    {
-                        /// @src 0:265:278  "contract C {}"
-                        revert(0, 0)
-                    }
-                }
-                data ".metadata" hex"<BYTECODE REMOVED>"
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/dup_opt_peephole/args b/test/cmdlineTests/dup_opt_peephole/args
deleted file mode 100644
index d3047670e161..000000000000
--- a/test/cmdlineTests/dup_opt_peephole/args
+++ /dev/null
@@ -1 +0,0 @@
---asm
\ No newline at end of file
diff --git a/test/cmdlineTests/dup_opt_peephole/input.sol b/test/cmdlineTests/dup_opt_peephole/input.sol
deleted file mode 100644
index c8752d4a19b1..000000000000
--- a/test/cmdlineTests/dup_opt_peephole/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-	fallback() external {
-		assembly {
-			let x := calldataload(0)
-			x := x
-			sstore(0, x)
-		}
-	}
-}
diff --git a/test/cmdlineTests/dup_opt_peephole/output b/test/cmdlineTests/dup_opt_peephole/output
deleted file mode 100644
index 2f75f2bdda9f..000000000000
--- a/test/cmdlineTests/dup_opt_peephole/output
+++ /dev/null
@@ -1,52 +0,0 @@
-
-======= dup_opt_peephole/input.sol:C =======
-EVM assembly:
-    /* "dup_opt_peephole/input.sol":60:171  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "dup_opt_peephole/input.sol":60:171  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_3
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_3:
-      pop
-        /* "dup_opt_peephole/input.sol":134:135  0 */
-      0x00
-        /* "dup_opt_peephole/input.sol":121:136  calldataload(0) */
-      calldataload
-        /* "dup_opt_peephole/input.sol":160:161  x */
-      dup1
-        /* "dup_opt_peephole/input.sol":157:158  0 */
-      0x00
-        /* "dup_opt_peephole/input.sol":150:162  sstore(0, x) */
-      sstore
-        /* "dup_opt_peephole/input.sol":107:166  {... */
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/error_codes/args b/test/cmdlineTests/error_codes/args
deleted file mode 100644
index 330f811c7ac6..000000000000
--- a/test/cmdlineTests/error_codes/args
+++ /dev/null
@@ -1 +0,0 @@
---error-codes
diff --git a/test/cmdlineTests/error_codes/err b/test/cmdlineTests/error_codes/err
deleted file mode 100644
index a10362a863a8..000000000000
--- a/test/cmdlineTests/error_codes/err
+++ /dev/null
@@ -1,29 +0,0 @@
-Warning (1878): SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
---> error_codes/input.sol
-
-Error (4937): No visibility specified. Did you intend to add "public"?
- --> error_codes/input.sol:2:5:
-  |
-2 |     function f() {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Warning (3420): Source file does not specify required compiler version!
---> error_codes/input.sol
-
-Error (4247): Expression has to be an lvalue.
- --> error_codes/input.sol:3:9:
-  |
-3 |         2=0;
-  |         ^
-
-Error (7407): Type int_const 0 is not implicitly convertible to expected type int_const 2.
- --> error_codes/input.sol:3:11:
-  |
-3 |         2=0;
-  |           ^
-
-Error (2614): Indexed expression has to be a type, mapping or array (is literal_string "")
- --> error_codes/input.sol:4:9:
-  |
-4 |         ""[2];
-  |         ^^
diff --git a/test/cmdlineTests/error_codes/exit b/test/cmdlineTests/error_codes/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/error_codes/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/error_codes/input.sol b/test/cmdlineTests/error_codes/input.sol
deleted file mode 100644
index 5ea2800c567c..000000000000
--- a/test/cmdlineTests/error_codes/input.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() {
-        2=0;
-        ""[2];
-    }
-}
diff --git a/test/cmdlineTests/events_in_abi/args b/test/cmdlineTests/events_in_abi/args
deleted file mode 100644
index d27d3ef127f1..000000000000
--- a/test/cmdlineTests/events_in_abi/args
+++ /dev/null
@@ -1 +0,0 @@
---abi --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/events_in_abi/input.sol b/test/cmdlineTests/events_in_abi/input.sol
deleted file mode 100644
index a0d91d2e2efe..000000000000
--- a/test/cmdlineTests/events_in_abi/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-library L {
-    event e1(uint b);
-}
-
-function f() {
-    emit L.e1(5);
-}
-
-contract C {
-    event e1(uint indexed a);
-    function g() public {
-        f();
-    }
-}
diff --git a/test/cmdlineTests/events_in_abi/output b/test/cmdlineTests/events_in_abi/output
deleted file mode 100644
index 6c18a17521f0..000000000000
--- a/test/cmdlineTests/events_in_abi/output
+++ /dev/null
@@ -1,59 +0,0 @@
-
-======= events_in_abi/input.sol:C =======
-Contract JSON ABI
-[
-    {
-        "anonymous": false,
-        "inputs":
-        [
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "b",
-                "type": "uint256"
-            }
-        ],
-        "name": "e1",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs":
-        [
-            {
-                "indexed": true,
-                "internalType": "uint256",
-                "name": "a",
-                "type": "uint256"
-            }
-        ],
-        "name": "e1",
-        "type": "event"
-    },
-    {
-        "inputs": [],
-        "name": "g",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]
-
-======= events_in_abi/input.sol:L =======
-Contract JSON ABI
-[
-    {
-        "anonymous": false,
-        "inputs":
-        [
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "b",
-                "type": "uint256"
-            }
-        ],
-        "name": "e1",
-        "type": "event"
-    }
-]
diff --git a/test/cmdlineTests/evm_version_byzantium/args b/test/cmdlineTests/evm_version_byzantium/args
deleted file mode 100644
index 3a732cc015ea..000000000000
--- a/test/cmdlineTests/evm_version_byzantium/args
+++ /dev/null
@@ -1 +0,0 @@
---evm-version byzantium
diff --git a/test/cmdlineTests/evm_version_byzantium/err b/test/cmdlineTests/evm_version_byzantium/err
deleted file mode 100644
index accbb596cb25..000000000000
--- a/test/cmdlineTests/evm_version_byzantium/err
+++ /dev/null
@@ -1,3 +0,0 @@
-Warning: Support for EVM versions older than constantinople is deprecated and will be removed in the future.
-Warning: Source file does not specify required compiler version!
---> evm_version_byzantium/input.sol
diff --git a/test/cmdlineTests/evm_version_byzantium/input.sol b/test/cmdlineTests/evm_version_byzantium/input.sol
deleted file mode 100644
index ea448e289900..000000000000
--- a/test/cmdlineTests/evm_version_byzantium/input.sol
+++ /dev/null
@@ -1 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
diff --git a/test/cmdlineTests/evm_version_constantinople/args b/test/cmdlineTests/evm_version_constantinople/args
deleted file mode 100644
index fa2c596e37ff..000000000000
--- a/test/cmdlineTests/evm_version_constantinople/args
+++ /dev/null
@@ -1 +0,0 @@
---evm-version constantinople
diff --git a/test/cmdlineTests/evm_version_constantinople/err b/test/cmdlineTests/evm_version_constantinople/err
deleted file mode 100644
index 69f328f54efd..000000000000
--- a/test/cmdlineTests/evm_version_constantinople/err
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: Source file does not specify required compiler version!
---> evm_version_constantinople/input.sol
diff --git a/test/cmdlineTests/evm_version_constantinople/input.sol b/test/cmdlineTests/evm_version_constantinople/input.sol
deleted file mode 100644
index ea448e289900..000000000000
--- a/test/cmdlineTests/evm_version_constantinople/input.sol
+++ /dev/null
@@ -1 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/args b/test/cmdlineTests/evmasm_difficulty_post_paris/args
deleted file mode 100644
index a0588fcfc224..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_post_paris/args
+++ /dev/null
@@ -1 +0,0 @@
---no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version paris
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/err b/test/cmdlineTests/evmasm_difficulty_post_paris/err
deleted file mode 100644
index d8210184e1b0..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_post_paris/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
- --> evmasm_difficulty_post_paris/input.sol:6:21:
-  |
-6 |         uint256 x = block.difficulty;
-  |                     ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/input.sol b/test/cmdlineTests/evmasm_difficulty_post_paris/input.sol
deleted file mode 100644
index e81c034e7867..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_post_paris/input.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-
-contract C {
-    constructor() payable {
-        uint256 x = block.difficulty;
-        assembly {
-            sstore(0, x)
-            stop()
-        }
-    }
-
-    fallback() external payable {
-        assembly {
-            stop()
-        }
-    }
-}
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/output b/test/cmdlineTests/evmasm_difficulty_post_paris/output
deleted file mode 100644
index f8c1611e0274..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_post_paris/output
+++ /dev/null
@@ -1,13 +0,0 @@
-
-======= evmasm_difficulty_post_paris/input.sol:C =======
-EVM assembly:
-  sstore(0x00, prevrandao)
-  stop
-stop
-
-sub_0: assembly {
-      stop
-}
-
-Opcodes:
-PREVRANDAO PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/evmasm_difficulty_pre_paris/args b/test/cmdlineTests/evmasm_difficulty_pre_paris/args
deleted file mode 100644
index 67d6f9a650d2..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_pre_paris/args
+++ /dev/null
@@ -1 +0,0 @@
---no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version london
diff --git a/test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol b/test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol
deleted file mode 100644
index e81c034e7867..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-
-contract C {
-    constructor() payable {
-        uint256 x = block.difficulty;
-        assembly {
-            sstore(0, x)
-            stop()
-        }
-    }
-
-    fallback() external payable {
-        assembly {
-            stop()
-        }
-    }
-}
diff --git a/test/cmdlineTests/evmasm_difficulty_pre_paris/output b/test/cmdlineTests/evmasm_difficulty_pre_paris/output
deleted file mode 100644
index ad75355f5bcb..000000000000
--- a/test/cmdlineTests/evmasm_difficulty_pre_paris/output
+++ /dev/null
@@ -1,13 +0,0 @@
-
-======= evmasm_difficulty_pre_paris/input.sol:C =======
-EVM assembly:
-  sstore(0x00, difficulty)
-  stop
-stop
-
-sub_0: assembly {
-      stop
-}
-
-Opcodes:
-DIFFICULTY PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/evmasm_prevrandao_post_paris/args b/test/cmdlineTests/evmasm_prevrandao_post_paris/args
deleted file mode 100644
index a0588fcfc224..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_post_paris/args
+++ /dev/null
@@ -1 +0,0 @@
---no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version paris
diff --git a/test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol b/test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol
deleted file mode 100644
index 707d12d745e8..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-
-contract C {
-    constructor() payable {
-        uint256 x = block.prevrandao;
-        assembly {
-            sstore(0, x)
-            stop()
-        }
-    }
-
-    fallback() external payable {
-        assembly {
-            stop()
-        }
-    }
-}
diff --git a/test/cmdlineTests/evmasm_prevrandao_post_paris/output b/test/cmdlineTests/evmasm_prevrandao_post_paris/output
deleted file mode 100644
index 47c85bb50fcd..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_post_paris/output
+++ /dev/null
@@ -1,13 +0,0 @@
-
-======= evmasm_prevrandao_post_paris/input.sol:C =======
-EVM assembly:
-  sstore(0x00, prevrandao)
-  stop
-stop
-
-sub_0: assembly {
-      stop
-}
-
-Opcodes:
-PREVRANDAO PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/args b/test/cmdlineTests/evmasm_prevrandao_pre_paris/args
deleted file mode 100644
index 67d6f9a650d2..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_pre_paris/args
+++ /dev/null
@@ -1 +0,0 @@
---no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version london
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/err b/test/cmdlineTests/evmasm_prevrandao_pre_paris/err
deleted file mode 100644
index 5970ec202066..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_pre_paris/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: "prevrandao" is not supported by the VM version and will be treated as "difficulty".
- --> evmasm_prevrandao_pre_paris/input.sol:6:21:
-  |
-6 |         uint256 x = block.prevrandao;
-  |                     ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol b/test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol
deleted file mode 100644
index 707d12d745e8..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-
-contract C {
-    constructor() payable {
-        uint256 x = block.prevrandao;
-        assembly {
-            sstore(0, x)
-            stop()
-        }
-    }
-
-    fallback() external payable {
-        assembly {
-            stop()
-        }
-    }
-}
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/output b/test/cmdlineTests/evmasm_prevrandao_pre_paris/output
deleted file mode 100644
index e41148a8331a..000000000000
--- a/test/cmdlineTests/evmasm_prevrandao_pre_paris/output
+++ /dev/null
@@ -1,13 +0,0 @@
-
-======= evmasm_prevrandao_pre_paris/input.sol:C =======
-EVM assembly:
-  sstore(0x00, difficulty)
-  stop
-stop
-
-sub_0: assembly {
-      stop
-}
-
-Opcodes:
-DIFFICULTY PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/exp_base_literal/args b/test/cmdlineTests/exp_base_literal/args
deleted file mode 100644
index cdda9bc05f2d..000000000000
--- a/test/cmdlineTests/exp_base_literal/args
+++ /dev/null
@@ -1 +0,0 @@
---ir
diff --git a/test/cmdlineTests/exp_base_literal/err b/test/cmdlineTests/exp_base_literal/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/exp_base_literal/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/exp_base_literal/input.sol b/test/cmdlineTests/exp_base_literal/input.sol
deleted file mode 100644
index 1c8408413e86..000000000000
--- a/test/cmdlineTests/exp_base_literal/input.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity > 0.7.1;
-pragma abicoder v2;
-
-contract C {
-	function f(uint a, uint b, uint c, uint d) public pure returns (uint, int, uint, uint) {
-		uint w = 2**a;
-		int x = (-2)**b;
-		uint y = 10**c;
-		uint z = (2**256 -1 )**d;
-
-		// Special cases: 0, 1, and -1
-		w = (0)**a;
-		x = (-1)**b;
-		y = 1**c;
-
-		return (w, x, y, z);
-	}
-}
diff --git a/test/cmdlineTests/exp_base_literal/output b/test/cmdlineTests/exp_base_literal/output
deleted file mode 100644
index 24e5d29be756..000000000000
--- a/test/cmdlineTests/exp_base_literal/output
+++ /dev/null
@@ -1,422 +0,0 @@
-IR:
-
-/// @use-src 0:"exp_base_literal/input.sol"
-object "C_81" {
-    code {
-        /// @src 0:82:370  "contract C {..."
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_81()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_81_deployed"), datasize("C_81_deployed"))
-
-        return(_1, datasize("C_81_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:82:370  "contract C {..."
-        function constructor_C_81() {
-
-            /// @src 0:82:370  "contract C {..."
-
-        }
-        /// @src 0:82:370  "contract C {..."
-
-    }
-    /// @use-src 0:"exp_base_literal/input.sol"
-    object "C_81_deployed" {
-        code {
-            /// @src 0:82:370  "contract C {..."
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x70cb9605
-                {
-                    // f(uint256,uint256,uint256,uint256)
-
-                    external_fun_f_80()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-                revert(0, 0)
-            }
-
-            function cleanup_t_uint256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function validator_revert_t_uint256(value) {
-                if iszero(eq(value, cleanup_t_uint256(value))) { revert(0, 0) }
-            }
-
-            function abi_decode_t_uint256(offset, end) -> value {
-                value := calldataload(offset)
-                validator_revert_t_uint256(value)
-            }
-
-            function abi_decode_tuple_t_uint256t_uint256t_uint256t_uint256(headStart, dataEnd) -> value0, value1, value2, value3 {
-                if slt(sub(dataEnd, headStart), 128) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-                {
-
-                    let offset := 0
-
-                    value0 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-                }
-
-                {
-
-                    let offset := 32
-
-                    value1 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-                }
-
-                {
-
-                    let offset := 64
-
-                    value2 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-                }
-
-                {
-
-                    let offset := 96
-
-                    value3 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-                }
-
-            }
-
-            function abi_encode_t_uint256_to_t_uint256_fromStack(value, pos) {
-                mstore(pos, cleanup_t_uint256(value))
-            }
-
-            function cleanup_t_int256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function abi_encode_t_int256_to_t_int256_fromStack(value, pos) {
-                mstore(pos, cleanup_t_int256(value))
-            }
-
-            function abi_encode_tuple_t_uint256_t_int256_t_uint256_t_uint256__to_t_uint256_t_int256_t_uint256_t_uint256__fromStack(headStart , value0, value1, value2, value3) -> tail {
-                tail := add(headStart, 128)
-
-                abi_encode_t_uint256_to_t_uint256_fromStack(value0,  add(headStart, 0))
-
-                abi_encode_t_int256_to_t_int256_fromStack(value1,  add(headStart, 32))
-
-                abi_encode_t_uint256_to_t_uint256_fromStack(value2,  add(headStart, 64))
-
-                abi_encode_t_uint256_to_t_uint256_fromStack(value3,  add(headStart, 96))
-
-            }
-
-            function external_fun_f_80() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                let param_0, param_1, param_2, param_3 :=  abi_decode_tuple_t_uint256t_uint256t_uint256t_uint256(4, calldatasize())
-                let ret_0, ret_1, ret_2, ret_3 :=  fun_f_80(param_0, param_1, param_2, param_3)
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_uint256_t_int256_t_uint256_t_uint256__to_t_uint256_t_int256_t_uint256_t_uint256__fromStack(memPos , ret_0, ret_1, ret_2, ret_3)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_uint256() -> ret {
-                ret := 0
-            }
-
-            function zero_value_for_split_t_int256() -> ret {
-                ret := 0
-            }
-
-            function cleanup_t_rational_2_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function identity(value) -> ret {
-                ret := value
-            }
-
-            function convert_t_rational_2_by_1_to_t_uint256(value) -> converted {
-                converted := cleanup_t_uint256(identity(cleanup_t_rational_2_by_1(value)))
-            }
-
-            function panic_error_0x11() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-
-            function checked_exp_t_rational_2_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                if gt(exponent, 255) { panic_error_0x11() }
-
-                power := exp(2, exponent)
-            }
-
-            function cleanup_t_rational_minus_2_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function convert_t_rational_minus_2_by_1_to_t_int256(value) -> converted {
-                converted := cleanup_t_int256(identity(cleanup_t_rational_minus_2_by_1(value)))
-            }
-
-            function checked_exp_t_rational_minus_2_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                if gt(exponent, 255) { panic_error_0x11() }
-
-                power := exp(115792089237316195423570985008687907853269984665640564039457584007913129639934, exponent)
-            }
-
-            function cleanup_t_rational_10_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function convert_t_rational_10_by_1_to_t_uint256(value) -> converted {
-                converted := cleanup_t_uint256(identity(cleanup_t_rational_10_by_1(value)))
-            }
-
-            function checked_exp_t_rational_10_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                if gt(exponent, 77) { panic_error_0x11() }
-
-                power := exp(10, exponent)
-            }
-
-            function cleanup_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function convert_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_to_t_uint256(value) -> converted {
-                converted := cleanup_t_uint256(identity(cleanup_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1(value)))
-            }
-
-            function checked_exp_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                if gt(exponent, 1) { panic_error_0x11() }
-
-                power := exp(115792089237316195423570985008687907853269984665640564039457584007913129639935, exponent)
-            }
-
-            function cleanup_t_rational_0_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function convert_t_rational_0_by_1_to_t_uint256(value) -> converted {
-                converted := cleanup_t_uint256(identity(cleanup_t_rational_0_by_1(value)))
-            }
-
-            function checked_exp_t_rational_0_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                power := exp(0, exponent)
-            }
-
-            function cleanup_t_rational_minus_1_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function convert_t_rational_minus_1_by_1_to_t_int256(value) -> converted {
-                converted := cleanup_t_int256(identity(cleanup_t_rational_minus_1_by_1(value)))
-            }
-
-            function checked_exp_t_rational_minus_1_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                power := exp(115792089237316195423570985008687907853269984665640564039457584007913129639935, exponent)
-            }
-
-            function cleanup_t_rational_1_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function convert_t_rational_1_by_1_to_t_uint256(value) -> converted {
-                converted := cleanup_t_uint256(identity(cleanup_t_rational_1_by_1(value)))
-            }
-
-            function checked_exp_t_rational_1_by_1_t_uint256(exponent) -> power {
-                exponent := cleanup_t_uint256(exponent)
-
-                power := exp(1, exponent)
-            }
-
-            /// @ast-id 80
-            /// @src 0:96:368  "function f(uint a, uint b, uint c, uint d) public pure returns (uint, int, uint, uint) {..."
-            function fun_f_80(var_a_4, var_b_6, var_c_8, var_d_10) -> var__13, var__15, var__17, var__19 {
-                /// @src 0:160:164  "uint"
-                let zero_t_uint256_1 := zero_value_for_split_t_uint256()
-                var__13 := zero_t_uint256_1
-                /// @src 0:166:169  "int"
-                let zero_t_int256_2 := zero_value_for_split_t_int256()
-                var__15 := zero_t_int256_2
-                /// @src 0:171:175  "uint"
-                let zero_t_uint256_3 := zero_value_for_split_t_uint256()
-                var__17 := zero_t_uint256_3
-                /// @src 0:177:181  "uint"
-                let zero_t_uint256_4 := zero_value_for_split_t_uint256()
-                var__19 := zero_t_uint256_4
-
-                /// @src 0:196:197  "2"
-                let expr_23 := 0x02
-                /// @src 0:199:200  "a"
-                let _5 := var_a_4
-                let expr_24 := _5
-                /// @src 0:196:200  "2**a"
-                let _6 := convert_t_rational_2_by_1_to_t_uint256(expr_23)
-                let expr_25 := checked_exp_t_rational_2_by_1_t_uint256(expr_24)
-                /// @src 0:187:200  "uint w = 2**a"
-                let var_w_22 := expr_25
-                /// @src 0:213:215  "-2"
-                let expr_30 := 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-                /// @src 0:212:216  "(-2)"
-                let expr_31 := expr_30
-                /// @src 0:218:219  "b"
-                let _7 := var_b_6
-                let expr_32 := _7
-                /// @src 0:212:219  "(-2)**b"
-                let _8 := convert_t_rational_minus_2_by_1_to_t_int256(expr_31)
-                let expr_33 := checked_exp_t_rational_minus_2_by_1_t_uint256(expr_32)
-                /// @src 0:204:219  "int x = (-2)**b"
-                let var_x_28 := expr_33
-                /// @src 0:232:234  "10"
-                let expr_37 := 0x0a
-                /// @src 0:236:237  "c"
-                let _9 := var_c_8
-                let expr_38 := _9
-                /// @src 0:232:237  "10**c"
-                let _10 := convert_t_rational_10_by_1_to_t_uint256(expr_37)
-                let expr_39 := checked_exp_t_rational_10_by_1_t_uint256(expr_38)
-                /// @src 0:223:237  "uint y = 10**c"
-                let var_y_36 := expr_39
-                /// @src 0:251:260  "2**256 -1"
-                let expr_47 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                /// @src 0:250:262  "(2**256 -1 )"
-                let expr_48 := expr_47
-                /// @src 0:264:265  "d"
-                let _11 := var_d_10
-                let expr_49 := _11
-                /// @src 0:250:265  "(2**256 -1 )**d"
-                let _12 := convert_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_to_t_uint256(expr_48)
-                let expr_50 := checked_exp_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_t_uint256(expr_49)
-                /// @src 0:241:265  "uint z = (2**256 -1 )**d"
-                let var_z_42 := expr_50
-                /// @src 0:308:309  "0"
-                let expr_53 := 0x00
-                /// @src 0:307:310  "(0)"
-                let expr_54 := expr_53
-                /// @src 0:312:313  "a"
-                let _13 := var_a_4
-                let expr_55 := _13
-                /// @src 0:307:313  "(0)**a"
-                let _14 := convert_t_rational_0_by_1_to_t_uint256(expr_54)
-                let expr_56 := checked_exp_t_rational_0_by_1_t_uint256(expr_55)
-                /// @src 0:303:313  "w = (0)**a"
-                var_w_22 := expr_56
-                let expr_57 := expr_56
-                /// @src 0:322:324  "-1"
-                let expr_61 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                /// @src 0:321:325  "(-1)"
-                let expr_62 := expr_61
-                /// @src 0:327:328  "b"
-                let _15 := var_b_6
-                let expr_63 := _15
-                /// @src 0:321:328  "(-1)**b"
-                let _16 := convert_t_rational_minus_1_by_1_to_t_int256(expr_62)
-                let expr_64 := checked_exp_t_rational_minus_1_by_1_t_uint256(expr_63)
-                /// @src 0:317:328  "x = (-1)**b"
-                var_x_28 := expr_64
-                let expr_65 := expr_64
-                /// @src 0:336:337  "1"
-                let expr_68 := 0x01
-                /// @src 0:339:340  "c"
-                let _17 := var_c_8
-                let expr_69 := _17
-                /// @src 0:336:340  "1**c"
-                let _18 := convert_t_rational_1_by_1_to_t_uint256(expr_68)
-                let expr_70 := checked_exp_t_rational_1_by_1_t_uint256(expr_69)
-                /// @src 0:332:340  "y = 1**c"
-                var_y_36 := expr_70
-                let expr_71 := expr_70
-                /// @src 0:353:354  "w"
-                let _19 := var_w_22
-                let expr_73 := _19
-                /// @src 0:352:364  "(w, x, y, z)"
-                let expr_77_component_1 := expr_73
-                /// @src 0:356:357  "x"
-                let _20 := var_x_28
-                let expr_74 := _20
-                /// @src 0:352:364  "(w, x, y, z)"
-                let expr_77_component_2 := expr_74
-                /// @src 0:359:360  "y"
-                let _21 := var_y_36
-                let expr_75 := _21
-                /// @src 0:352:364  "(w, x, y, z)"
-                let expr_77_component_3 := expr_75
-                /// @src 0:362:363  "z"
-                let _22 := var_z_42
-                let expr_76 := _22
-                /// @src 0:352:364  "(w, x, y, z)"
-                let expr_77_component_4 := expr_76
-                /// @src 0:345:364  "return (w, x, y, z)"
-                var__13 := expr_77_component_1
-                var__15 := expr_77_component_2
-                var__17 := expr_77_component_3
-                var__19 := expr_77_component_4
-                leave
-
-            }
-            /// @src 0:82:370  "contract C {..."
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
diff --git a/test/cmdlineTests/function_debug_info/args b/test/cmdlineTests/function_debug_info/args
deleted file mode 100644
index ff730a4ce02f..000000000000
--- a/test/cmdlineTests/function_debug_info/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --combined-json function-debug,function-debug-runtime --pretty-json
diff --git a/test/cmdlineTests/function_debug_info/err b/test/cmdlineTests/function_debug_info/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/function_debug_info/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/function_debug_info/input.sol b/test/cmdlineTests/function_debug_info/input.sol
deleted file mode 100644
index 7b4c59676965..000000000000
--- a/test/cmdlineTests/function_debug_info/input.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity >=0.0;
-// SPDX-License-Identifier: GPL-3.0
-contract C {
-    function f(uint[] calldata x) pure external returns (uint) { return x[0]; }
-    // This will be optimized out
-    function g() pure internal {}
-    mapping(uint => uint) public t;
-    constructor(uint x) {
-        t[0] = x;
-    }
-}
diff --git a/test/cmdlineTests/function_debug_info/output b/test/cmdlineTests/function_debug_info/output
deleted file mode 100644
index b9ca3f3c40ec..000000000000
--- a/test/cmdlineTests/function_debug_info/output
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "contracts":
-  {
-    "function_debug_info/input.sol:C":
-    {
-      "function-debug":
-      {
-        "@_34":
-        {
-          "id": 34,
-          "parameterSlots": 1,
-          "returnSlots": 0
-        },
-        "abi_decode_tuple_t_uint256_fromMemory":
-        {
-          "entryPoint": 92,
-          "parameterSlots": 2,
-          "returnSlots": 1
-        }
-      },
-      "function-debug-runtime":
-      {
-        "@f_14":
-        {
-          "entryPoint": 124,
-          "id": 14,
-          "parameterSlots": 2,
-          "returnSlots": 1
-        },
-        "@t_22":
-        {
-          "id": 22,
-          "parameterSlots": 0,
-          "returnSlots": 0
-        },
-        "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr":
-        {
-          "entryPoint": 158,
-          "parameterSlots": 2,
-          "returnSlots": 2
-        },
-        "abi_decode_tuple_t_uint256":
-        {
-          "entryPoint": 269,
-          "parameterSlots": 2,
-          "returnSlots": 1
-        },
-        "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":
-        {
-          "parameterSlots": 2,
-          "returnSlots": 1
-        },
-        "panic_error_0x32":
-        {
-          "entryPoint": 292,
-          "parameterSlots": 0,
-          "returnSlots": 0
-        }
-      }
-    }
-  },
-  "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/function_debug_info_via_yul/args b/test/cmdlineTests/function_debug_info_via_yul/args
deleted file mode 100644
index 7b0bf90f1428..000000000000
--- a/test/cmdlineTests/function_debug_info_via_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---via-ir --optimize --combined-json function-debug,function-debug-runtime --pretty-json
diff --git a/test/cmdlineTests/function_debug_info_via_yul/err b/test/cmdlineTests/function_debug_info_via_yul/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/function_debug_info_via_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/function_debug_info_via_yul/input.sol b/test/cmdlineTests/function_debug_info_via_yul/input.sol
deleted file mode 100644
index 23040af0fe72..000000000000
--- a/test/cmdlineTests/function_debug_info_via_yul/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma solidity >=0.0;
-// SPDX-License-Identifier: GPL-3.0
-contract C {
-    function f(uint[] calldata x) pure external returns (uint) { return x[0]; }
-    // This will be optimized out
-    function g() pure internal {}
-}
diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
deleted file mode 100644
index 5af245ce4afa..000000000000
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "contracts":
-  {
-    "function_debug_info_via_yul/input.sol:C":
-    {
-      "function-debug": {},
-      "function-debug-runtime": {}
-    }
-  },
-  "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/hashes/args b/test/cmdlineTests/hashes/args
deleted file mode 100644
index 40469d358c56..000000000000
--- a/test/cmdlineTests/hashes/args
+++ /dev/null
@@ -1 +0,0 @@
---hashes
\ No newline at end of file
diff --git a/test/cmdlineTests/hashes/input.sol b/test/cmdlineTests/hashes/input.sol
deleted file mode 100644
index 1f5c758f719d..000000000000
--- a/test/cmdlineTests/hashes/input.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-error fileLevelError(uint z);
-
-library L {
-	event libraryEvent(uint r);
-	error libraryError(uint r);
-	error libraryErrorUnused(uint u);
-	event libraryEventUnused(uint u);
-}
-
-contract C {
-	struct S { uint x; }
-
-	event ev(uint y);
-	event anon_ev(uint y) anonymous;
-
-	error err(uint z, uint w);
-
-	function f(S memory s) public {
-		emit L.libraryEvent(3);
-		if (s.x > 1)
-			revert fileLevelError(3);
-		else
-			revert L.libraryError(4);
-	}
-}
diff --git a/test/cmdlineTests/hashes/output b/test/cmdlineTests/hashes/output
deleted file mode 100644
index b010456d3901..000000000000
--- a/test/cmdlineTests/hashes/output
+++ /dev/null
@@ -1,24 +0,0 @@
-
-======= hashes/input.sol:C =======
-Function signatures:
-3fc03eeb: f((uint256))
-
-Error signatures:
-619a0bb7: err(uint256,uint256)
-82b5f64f: fileLevelError(uint256)
-8c41f45c: libraryError(uint256)
-
-Event signatures:
-2d4dd5fe18ada5a020a9f5591539a8dc3010a5c074ba6a70e1c956659f02786a: ev(uint256)
-81f3fb02f88d32d3bb08c80c9a622ca3b3223292f131c6ad049811f9a8a606dc: libraryEvent(uint256)
-
-======= hashes/input.sol:L =======
-Function signatures:
-
-Error signatures:
-8c41f45c: libraryError(uint256)
-c61c03f5: libraryErrorUnused(uint256)
-
-Event signatures:
-81f3fb02f88d32d3bb08c80c9a622ca3b3223292f131c6ad049811f9a8a606dc: libraryEvent(uint256)
-0a994ad3600197f16ffe1ea1101caea3174efe5ebd9ba9a75d6d5524c5de28cd: libraryEventUnused(uint256)
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/args b/test/cmdlineTests/inline_assembly_function_name_clash/args
deleted file mode 100644
index a4e76abf25c4..000000000000
--- a/test/cmdlineTests/inline_assembly_function_name_clash/args
+++ /dev/null
@@ -1 +0,0 @@
---via-ir --combined-json function-debug-runtime --pretty-json --json-indent 4
\ No newline at end of file
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/err b/test/cmdlineTests/inline_assembly_function_name_clash/err
deleted file mode 100644
index 5284ffe5ca89..000000000000
--- a/test/cmdlineTests/inline_assembly_function_name_clash/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
---> inline_assembly_function_name_clash/input.sol
-
-Warning: Source file does not specify required compiler version!
---> inline_assembly_function_name_clash/input.sol
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/input.sol b/test/cmdlineTests/inline_assembly_function_name_clash/input.sol
deleted file mode 100644
index 55032c56ed46..000000000000
--- a/test/cmdlineTests/inline_assembly_function_name_clash/input.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-  uint x;
-  modifier m() {
-    uint t;
-    assembly {
-      function f() -> x { x := 8 }
-      t := f()
-    }
-    x = t;
-    _;
-  }
-  function f() m m public returns (uint r) {
-    assembly { function f() -> x { x := 1 } r := f() }
-  }
-  function g() m m public returns (uint r) {
-    assembly { function f() -> x { x := 2 } r := f() }
-  }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
deleted file mode 100644
index 8becb87ae06f..000000000000
--- a/test/cmdlineTests/inline_assembly_function_name_clash/output
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-    "contracts":
-    {
-        "inline_assembly_function_name_clash/input.sol:C":
-        {
-            "function-debug-runtime":
-            {
-                "abi_decode":
-                {
-                    "entryPoint": 80,
-                    "parameterSlots": 2,
-                    "returnSlots": 0
-                },
-                "abi_encode_uint256":
-                {
-                    "entryPoint": 111,
-                    "parameterSlots": 2,
-                    "returnSlots": 1
-                },
-                "abi_encode_uint256_to_uint256":
-                {
-                    "entryPoint": 98,
-                    "parameterSlots": 2,
-                    "returnSlots": 0
-                },
-                "allocate_unbounded":
-                {
-                    "entryPoint": 66,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "cleanup_uint256":
-                {
-                    "entryPoint": 95,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "convert_uint256_to_uint256":
-                {
-                    "entryPoint": 276,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "external_fun_f":
-                {
-                    "entryPoint": 132,
-                    "parameterSlots": 0,
-                    "returnSlots": 0
-                },
-                "external_fun_g":
-                {
-                    "entryPoint": 185,
-                    "parameterSlots": 0,
-                    "returnSlots": 0
-                },
-                "fun_f":
-                {
-                    "entryPoint": 442,
-                    "id": 25,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "fun_f_inner":
-                {
-                    "entryPoint": 430,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "fun_g":
-                {
-                    "entryPoint": 564,
-                    "id": 36,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "fun_g_inner":
-                {
-                    "entryPoint": 552,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "identity":
-                {
-                    "entryPoint": 273,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "modifier_m":
-                {
-                    "entryPoint": 509,
-                    "id": 14,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "modifier_m_17":
-                {
-                    "entryPoint": 344,
-                    "id": 14,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "modifier_m_19":
-                {
-                    "entryPoint": 387,
-                    "id": 14,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "modifier_m_28":
-                {
-                    "entryPoint": 466,
-                    "id": 14,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "prepare_store_uint256":
-                {
-                    "entryPoint": 304,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
-                {
-                    "entryPoint": 238,
-                    "parameterSlots": 0,
-                    "returnSlots": 0
-                },
-                "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
-                {
-                    "entryPoint": 72,
-                    "parameterSlots": 0,
-                    "returnSlots": 0
-                },
-                "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
-                {
-                    "entryPoint": 76,
-                    "parameterSlots": 0,
-                    "returnSlots": 0
-                },
-                "shift_left":
-                {
-                    "entryPoint": 246,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "shift_right_unsigned":
-                {
-                    "entryPoint": 60,
-                    "parameterSlots": 1,
-                    "returnSlots": 1
-                },
-                "update_byte_slice_shift":
-                {
-                    "entryPoint": 251,
-                    "parameterSlots": 2,
-                    "returnSlots": 1
-                },
-                "update_storage_value_offsett_uint256_to_uint256":
-                {
-                    "entryPoint": 307,
-                    "parameterSlots": 2,
-                    "returnSlots": 0
-                },
-                "usr$f":
-                {
-                    "entryPoint": 339,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "usr$f_17":
-                {
-                    "entryPoint": 382,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "usr$f_22":
-                {
-                    "entryPoint": 425,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "usr$f_26":
-                {
-                    "entryPoint": 461,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "usr$f_32":
-                {
-                    "entryPoint": 504,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "usr$f_37":
-                {
-                    "entryPoint": 547,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                },
-                "zero_value_for_split_uint256":
-                {
-                    "entryPoint": 242,
-                    "parameterSlots": 0,
-                    "returnSlots": 1
-                }
-            }
-        }
-    },
-    "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/args b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/args
deleted file mode 100644
index cae21e7207e0..000000000000
--- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize
\ No newline at end of file
diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/input.sol b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/input.sol
deleted file mode 100644
index 097a2fbe9687..000000000000
--- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.6.0;
-pragma abicoder v2;
-
-contract C {
-    constructor() {}
-}
-contract D is C {
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
deleted file mode 100644
index 84fd9d0bc35f..000000000000
--- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
+++ /dev/null
@@ -1,51 +0,0 @@
-Optimized IR:
-/// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
-object "C_7" {
-    code {
-        {
-            /// @src 0:82:117  "contract C {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_7_deployed")
-            codecopy(_1, dataoffset("C_7_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
-    object "C_7_deployed" {
-        code {
-            {
-                /// @src 0:82:117  "contract C {..."
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
-
-Optimized IR:
-/// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
-object "D_10" {
-    code {
-        {
-            /// @src 0:118:137  "contract D is C {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("D_10_deployed")
-            codecopy(_1, dataoffset("D_10_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
-    object "D_10_deployed" {
-        code {
-            {
-                /// @src 0:118:137  "contract D is C {..."
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/ir_compiler_subobjects/args b/test/cmdlineTests/ir_compiler_subobjects/args
deleted file mode 100644
index cae21e7207e0..000000000000
--- a/test/cmdlineTests/ir_compiler_subobjects/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize
\ No newline at end of file
diff --git a/test/cmdlineTests/ir_compiler_subobjects/err b/test/cmdlineTests/ir_compiler_subobjects/err
deleted file mode 100644
index b300ec124361..000000000000
--- a/test/cmdlineTests/ir_compiler_subobjects/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: Unused local variable.
- --> ir_compiler_subobjects/input.sol:8:9:
-  |
-8 |         C c = new C();
-  |         ^^^
diff --git a/test/cmdlineTests/ir_compiler_subobjects/input.sol b/test/cmdlineTests/ir_compiler_subobjects/input.sol
deleted file mode 100644
index bad0fe74f8f0..000000000000
--- a/test/cmdlineTests/ir_compiler_subobjects/input.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.6.0;
-pragma abicoder v2;
-
-contract C {}
-contract D {
-    function f() public {
-        C c = new C();
-    }
-}
diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output
deleted file mode 100644
index 39ef53f5529b..000000000000
--- a/test/cmdlineTests/ir_compiler_subobjects/output
+++ /dev/null
@@ -1,105 +0,0 @@
-Optimized IR:
-/// @use-src 0:"ir_compiler_subobjects/input.sol"
-object "C_3" {
-    code {
-        {
-            /// @src 0:82:95  "contract C {}"
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_3_deployed")
-            codecopy(_1, dataoffset("C_3_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"ir_compiler_subobjects/input.sol"
-    object "C_3_deployed" {
-        code {
-            {
-                /// @src 0:82:95  "contract C {}"
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
-
-Optimized IR:
-/// @use-src 0:"ir_compiler_subobjects/input.sol"
-object "D_16" {
-    code {
-        {
-            /// @src 0:96:165  "contract D {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("D_16_deployed")
-            codecopy(_1, dataoffset("D_16_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"ir_compiler_subobjects/input.sol"
-    object "D_16_deployed" {
-        code {
-            {
-                /// @src 0:96:165  "contract D {..."
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:149:156  "new C()"
-                        let _2 := datasize("C_3")
-                        let _3 := add(_1, _2)
-                        if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
-                        {
-                            /// @src 0:96:165  "contract D {..."
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x41)
-                            revert(0, 0x24)
-                        }
-                        /// @src 0:149:156  "new C()"
-                        datacopy(_1, dataoffset("C_3"), _2)
-                        if iszero(create(/** @src 0:96:165  "contract D {..." */ 0, /** @src 0:149:156  "new C()" */ _1, sub(_3, _1)))
-                        {
-                            /// @src 0:96:165  "contract D {..."
-                            let pos := mload(64)
-                            returndatacopy(pos, 0, returndatasize())
-                            revert(pos, returndatasize())
-                        }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        /// @use-src 0:"ir_compiler_subobjects/input.sol"
-        object "C_3" {
-            code {
-                {
-                    /// @src 0:82:95  "contract C {}"
-                    let _1 := memoryguard(0x80)
-                    mstore(64, _1)
-                    if callvalue() { revert(0, 0) }
-                    let _2 := datasize("C_3_deployed")
-                    codecopy(_1, dataoffset("C_3_deployed"), _2)
-                    return(_1, _2)
-                }
-            }
-            /// @use-src 0:"ir_compiler_subobjects/input.sol"
-            object "C_3_deployed" {
-                code {
-                    {
-                        /// @src 0:82:95  "contract C {}"
-                        revert(0, 0)
-                    }
-                }
-                data ".metadata" hex"<BYTECODE REMOVED>"
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/args b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/args
deleted file mode 100644
index cae21e7207e0..000000000000
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize
\ No newline at end of file
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol
deleted file mode 100644
index 67e1632e982c..000000000000
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-pragma abicoder v2;
-
-contract D {
-    constructor() { assembly { mstore(0,0) } }
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
deleted file mode 100644
index 5c822949a409..000000000000
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ /dev/null
@@ -1,32 +0,0 @@
-Optimized IR:
-/// @use-src 0:"ir_with_assembly_no_memoryguard_creation/input.sol"
-object "D_12" {
-    code {
-        {
-            /// @src 0:82:175  "contract D {..."
-            if callvalue() { revert(0, 0) }
-            let _1 := datasize("D_12_deployed")
-            codecopy(128, dataoffset("D_12_deployed"), _1)
-            return(128, _1)
-        }
-    }
-    /// @use-src 0:"ir_with_assembly_no_memoryguard_creation/input.sol"
-    object "D_12_deployed" {
-        code {
-            {
-                /// @src 0:82:175  "contract D {..."
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/args b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/args
deleted file mode 100644
index cae21e7207e0..000000000000
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize
\ No newline at end of file
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol
deleted file mode 100644
index 26c0bfa9824f..000000000000
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-pragma abicoder v2;
-
-contract D {
-    function f() public pure {
-        assembly { mstore(0,0) }
-    }
-}
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
deleted file mode 100644
index f6be1493ec79..000000000000
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ /dev/null
@@ -1,34 +0,0 @@
-Optimized IR:
-/// @use-src 0:"ir_with_assembly_no_memoryguard_runtime/input.sol"
-object "D_8" {
-    code {
-        {
-            /// @src 0:82:166  "contract D {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("D_8_deployed")
-            codecopy(_1, dataoffset("D_8_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"ir_with_assembly_no_memoryguard_runtime/input.sol"
-    object "D_8_deployed" {
-        code {
-            {
-                /// @src 0:82:166  "contract D {..."
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/args b/test/cmdlineTests/keccak_optimization_deploy_code/args
deleted file mode 100644
index c5da41705a15..000000000000
--- a/test/cmdlineTests/keccak_optimization_deploy_code/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --optimize-runs 50000
diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/err b/test/cmdlineTests/keccak_optimization_deploy_code/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/keccak_optimization_deploy_code/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/input.sol b/test/cmdlineTests/keccak_optimization_deploy_code/input.sol
deleted file mode 100644
index 671351e6720c..000000000000
--- a/test/cmdlineTests/keccak_optimization_deploy_code/input.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-v3
-pragma solidity >= 0.0.0;
-
-contract C {
-    constructor() {
-        assembly {
-            mstore(0, 100)
-            // because this is part of deploy code, the keccak will not be evaluated
-            sstore(0, keccak256(0, 32))
-        }
-    }
-
-    fallback() external {
-        assembly {
-            mstore(0, 100)
-            // The keccak here would be evaluated
-            sstore(0, keccak256(0, 32))
-        }
-
-    }
-}
diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/output b/test/cmdlineTests/keccak_optimization_deploy_code/output
deleted file mode 100644
index 8b89ea5b6329..000000000000
--- a/test/cmdlineTests/keccak_optimization_deploy_code/output
+++ /dev/null
@@ -1,31 +0,0 @@
-Optimized IR:
-/// @use-src 0:"keccak_optimization_deploy_code/input.sol"
-object "C_12" {
-    code {
-        {
-            /// @src 0:62:463  "contract C {..."
-            if callvalue() { revert(0, 0) }
-            /// @src 0:103:275  "assembly {..."
-            mstore(0, 100)
-            sstore(0, keccak256(0, 32))
-            /// @src 0:62:463  "contract C {..."
-            let _1 := datasize("C_12_deployed")
-            codecopy(128, dataoffset("C_12_deployed"), _1)
-            return(128, _1)
-        }
-    }
-    /// @use-src 0:"keccak_optimization_deploy_code/input.sol"
-    object "C_12_deployed" {
-        code {
-            {
-                /// @src 0:62:463  "contract C {..."
-                if callvalue() { revert(0, 0) }
-                /// @src 0:317:454  "assembly {..."
-                sstore(0, 17385872270140913825666367956517731270094621555228275961425792378517567244498)
-                /// @src 0:62:463  "contract C {..."
-                stop()
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/args b/test/cmdlineTests/keccak_optimization_low_runs/args
deleted file mode 100644
index 3e162407f6c1..000000000000
--- a/test/cmdlineTests/keccak_optimization_low_runs/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --optimize-runs 1
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/err b/test/cmdlineTests/keccak_optimization_low_runs/err
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/keccak_optimization_low_runs/err
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/input.sol b/test/cmdlineTests/keccak_optimization_low_runs/input.sol
deleted file mode 100644
index cc791b3646b9..000000000000
--- a/test/cmdlineTests/keccak_optimization_low_runs/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-v3
-pragma solidity >= 0.0.0;
-
-contract C {
-    fallback() external {
-        assembly {
-            mstore(0, 100)
-            // because of the low runs value, the constant will not be optimized
-            sstore(0, keccak256(0, 32))
-        }
-    }
-}
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/output b/test/cmdlineTests/keccak_optimization_low_runs/output
deleted file mode 100644
index c308d737b2f5..000000000000
--- a/test/cmdlineTests/keccak_optimization_low_runs/output
+++ /dev/null
@@ -1,30 +0,0 @@
-Optimized IR:
-/// @use-src 0:"keccak_optimization_low_runs/input.sol"
-object "C_7" {
-    code {
-        {
-            /// @src 0:62:285  "contract C {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_7_deployed")
-            codecopy(_1, dataoffset("C_7_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"keccak_optimization_low_runs/input.sol"
-    object "C_7_deployed" {
-        code {
-            {
-                /// @src 0:62:285  "contract C {..."
-                if callvalue() { revert(0, 0) }
-                /// @src 0:109:277  "assembly {..."
-                mstore(0, 100)
-                sstore(0, keccak256(0, 32))
-                /// @src 0:62:285  "contract C {..."
-                stop()
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/args b/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/args
deleted file mode 100644
index fbab96f26bc9..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---no-optimize-yul --link --libraries input.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err b/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err
deleted file mode 100644
index 1205089d41ec..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --no-optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/exit b/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/input.bin b/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/input.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize/args b/test/cmdlineTests/linker_mode_invalid_option_optimize/args
deleted file mode 100644
index bddcf43f617f..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --link --libraries input.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize/err b/test/cmdlineTests/linker_mode_invalid_option_optimize/err
deleted file mode 100644
index da724d56a58f..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize/exit b/test/cmdlineTests/linker_mode_invalid_option_optimize/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize/input.bin b/test/cmdlineTests/linker_mode_invalid_option_optimize/input.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/args b/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/args
deleted file mode 100644
index a6de8f8c42a1..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize-runs 1000 --link --libraries input.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err b/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err
deleted file mode 100644
index a625ad498916..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize-runs is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/exit b/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/input.bin b/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/input.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/args b/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/args
deleted file mode 100644
index 50eac81594e0..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize-yul --link --libraries input.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err b/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err
deleted file mode 100644
index 6d3a9306645b..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/exit b/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/input.bin b/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/input.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/args b/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/args
deleted file mode 100644
index 1dc92992bb69..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/args
+++ /dev/null
@@ -1 +0,0 @@
---yul-optimizations a --link --libraries input.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err b/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err
deleted file mode 100644
index f0db47ef9dcf..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --yul-optimizations is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/exit b/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/input.bin b/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/input.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/args b/test/cmdlineTests/linker_mode_output_selection_invalid/args
deleted file mode 100644
index 6c5b1680bc18..000000000000
--- a/test/cmdlineTests/linker_mode_output_selection_invalid/args
+++ /dev/null
@@ -1 +0,0 @@
---link --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/err b/test/cmdlineTests/linker_mode_output_selection_invalid/err
deleted file mode 100644
index 5ca7497883af..000000000000
--- a/test/cmdlineTests/linker_mode_output_selection_invalid/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: The following outputs are not supported in linker mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/exit b/test/cmdlineTests/linker_mode_output_selection_invalid/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linker_mode_output_selection_invalid/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/input.bin b/test/cmdlineTests/linker_mode_output_selection_invalid/input.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/linking_qualified_library_name/args b/test/cmdlineTests/linking_qualified_library_name/args
deleted file mode 100644
index dc996f46e236..000000000000
--- a/test/cmdlineTests/linking_qualified_library_name/args
+++ /dev/null
@@ -1 +0,0 @@
-linking_qualified_library_name/contract1.sol --bin --libraries linking_qualified_library_name/math.sol:Log:0x7777777777777777777777777777777777777777
diff --git a/test/cmdlineTests/linking_qualified_library_name/contract1.sol b/test/cmdlineTests/linking_qualified_library_name/contract1.sol
deleted file mode 100644
index aedea65faaa7..000000000000
--- a/test/cmdlineTests/linking_qualified_library_name/contract1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-import "linking_qualified_library_name/math.sol";
-
-contract C {
-    function foo() public {
-        Log.log10();
-    }
-}
diff --git a/test/cmdlineTests/linking_qualified_library_name/math.sol b/test/cmdlineTests/linking_qualified_library_name/math.sol
deleted file mode 100644
index 62f00ec340f3..000000000000
--- a/test/cmdlineTests/linking_qualified_library_name/math.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-library Log {
-    function log10() external {}
-}
diff --git a/test/cmdlineTests/linking_qualified_library_name/output b/test/cmdlineTests/linking_qualified_library_name/output
deleted file mode 100644
index 834874bf8e87..000000000000
--- a/test/cmdlineTests/linking_qualified_library_name/output
+++ /dev/null
@@ -1,8 +0,0 @@
-
-======= linking_qualified_library_name/contract1.sol:C =======
-Binary:
-<BYTECODE REMOVED>
-
-======= linking_qualified_library_name/math.sol:Log =======
-Binary:
-<BYTECODE REMOVED>
diff --git a/test/cmdlineTests/linking_solidity/args b/test/cmdlineTests/linking_solidity/args
deleted file mode 100644
index 9a958527fd71..000000000000
--- a/test/cmdlineTests/linking_solidity/args
+++ /dev/null
@@ -1 +0,0 @@
---bin --bin-runtime --libraries linking_solidity/input.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linking_solidity/input.sol b/test/cmdlineTests/linking_solidity/input.sol
deleted file mode 100644
index eb06631bbee4..000000000000
--- a/test/cmdlineTests/linking_solidity/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-library L {
-    function f() external {}
-}
-
-contract C {
-    function foo() public {
-        L.f();
-    }
-}
diff --git a/test/cmdlineTests/linking_solidity/output b/test/cmdlineTests/linking_solidity/output
deleted file mode 100644
index 307b131b5af3..000000000000
--- a/test/cmdlineTests/linking_solidity/output
+++ /dev/null
@@ -1,12 +0,0 @@
-
-======= linking_solidity/input.sol:C =======
-Binary:
-<BYTECODE REMOVED>
-Binary of the runtime part:
-<BYTECODE REMOVED>
-
-======= linking_solidity/input.sol:L =======
-Binary:
-<BYTECODE REMOVED>
-Binary of the runtime part:
-<BYTECODE REMOVED>
diff --git a/test/cmdlineTests/linking_solidity_unresolved_references/args b/test/cmdlineTests/linking_solidity_unresolved_references/args
deleted file mode 100644
index 8909b2779174..000000000000
--- a/test/cmdlineTests/linking_solidity_unresolved_references/args
+++ /dev/null
@@ -1 +0,0 @@
---bin --bin-runtime --libraries linking_solidity_unresolved_references/input.sol:L1=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linking_solidity_unresolved_references/input.sol b/test/cmdlineTests/linking_solidity_unresolved_references/input.sol
deleted file mode 100644
index 2a5f673058d3..000000000000
--- a/test/cmdlineTests/linking_solidity_unresolved_references/input.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-library L1 {
-    function f() external {}
-}
-
-library L2 {
-    function f() external {}
-}
-
-contract C {
-    function foo() public {
-        L1.f();
-        L2.f();
-        L1.f();
-        L2.f();
-        L1.f();
-    }
-}
diff --git a/test/cmdlineTests/linking_solidity_unresolved_references/output b/test/cmdlineTests/linking_solidity_unresolved_references/output
deleted file mode 100644
index f42191f51e0b..000000000000
--- a/test/cmdlineTests/linking_solidity_unresolved_references/output
+++ /dev/null
@@ -1,24 +0,0 @@
-
-======= linking_solidity_unresolved_references/input.sol:C =======
-Binary:
-<BYTECODE REMOVED>__$8ef13d1c56d5343bf69cf9444272079aa5$__<BYTECODE REMOVED>__$8ef13d1c56d5343bf69cf9444272079aa5$__<BYTECODE REMOVED>
-
-// $8ef13d1c56d5343bf69cf9444272079aa5$ -> linking_solidity_unresolved_references/input.sol:L2
-// $8ef13d1c56d5343bf69cf9444272079aa5$ -> linking_solidity_unresolved_references/input.sol:L2
-Binary of the runtime part:
-<BYTECODE REMOVED>__$8ef13d1c56d5343bf69cf9444272079aa5$__<BYTECODE REMOVED>__$8ef13d1c56d5343bf69cf9444272079aa5$__<BYTECODE REMOVED>
-
-// $8ef13d1c56d5343bf69cf9444272079aa5$ -> linking_solidity_unresolved_references/input.sol:L2
-// $8ef13d1c56d5343bf69cf9444272079aa5$ -> linking_solidity_unresolved_references/input.sol:L2
-
-======= linking_solidity_unresolved_references/input.sol:L1 =======
-Binary:
-<BYTECODE REMOVED>
-Binary of the runtime part:
-<BYTECODE REMOVED>
-
-======= linking_solidity_unresolved_references/input.sol:L2 =======
-Binary:
-<BYTECODE REMOVED>
-Binary of the runtime part:
-<BYTECODE REMOVED>
diff --git a/test/cmdlineTests/linking_standard_solidity/input.json b/test/cmdlineTests/linking_standard_solidity/input.json
deleted file mode 100644
index 921aa501805b..000000000000
--- a/test/cmdlineTests/linking_standard_solidity/input.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {
-			"content": "
-				// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-
-				library L {
-					function f() external {}
-				}
-
-				contract C {
-					function foo() public {
-						L.f();
-					}
-				}
-			"
-		}
-	},
-	"settings": {
-		"libraries": {
-			"A": {
-				"L": "0x1234567890123456789012345678901234567890"
-			}
-		},
-		"outputSelection": {
-			"*": {
-				"C": ["evm.bytecode.object", "evm.bytecode.linkReferences"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/linking_standard_solidity/output.json b/test/cmdlineTests/linking_standard_solidity/output.json
deleted file mode 100644
index 83813d806b01..000000000000
--- a/test/cmdlineTests/linking_standard_solidity/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/input.json b/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/input.json
deleted file mode 100644
index d96e65c5fe34..000000000000
--- a/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/input.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A\"B": {
-			"content": "
-				// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-
-				library L {
-					function f() external {}
-				}
-
-				contract C {
-					function foo() public {
-						L.f();
-					}
-				}
-			"
-		}
-	},
-	"settings": {
-		"libraries": {
-			"A\"B": {
-				"L": "0x1234567890123456789012345678901234567890"
-			}
-		},
-		"outputSelection": {
-			"*": {
-				"C": ["evm.bytecode.object", "evm.bytecode.linkReferences"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json b/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json
deleted file mode 100644
index 38e0a1b5aa18..000000000000
--- a/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "contracts":
-    {
-        "A\"B":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A\"B":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/linking_standard_solidity_unresolved_references/input.json b/test/cmdlineTests/linking_standard_solidity_unresolved_references/input.json
deleted file mode 100644
index 9a6ce25a7631..000000000000
--- a/test/cmdlineTests/linking_standard_solidity_unresolved_references/input.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {
-			"content": "
-				// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-
-				library L1 {
-					function f() external {}
-				}
-
-				library L2 {
-					function f() external {}
-				}
-
-				contract C {
-					function foo() public {
-						L1.f();
-						L2.f();
-						L1.f();
-						L2.f();
-						L1.f();
-					}
-				}
-			"
-		}
-	},
-	"settings": {
-		"libraries": {
-			"A": {
-				"L1": "0x1234567890123456789012345678901234567890"
-			}
-		},
-		"outputSelection": {
-			"*": {
-				"C": ["evm.bytecode.object", "evm.bytecode.linkReferences"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json b/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
deleted file mode 100644
index 169e99961e93..000000000000
--- a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences":
-                        {
-                            "A":
-                            {
-                                "L2":
-                                [
-                                    {
-                                        "length": 20,
-                                        "start": 174
-                                    },
-                                    {
-                                        "length": 20,
-                                        "start": 350
-                                    }
-                                ]
-                            }
-                        },
-                        "object": "<BYTECODE REMOVED>__$622b2f540b6a16ff5db7bea656ad8fcf4f$__<BYTECODE REMOVED>__$622b2f540b6a16ff5db7bea656ad8fcf4f$__<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/linking_standard_yul/input.json b/test/cmdlineTests/linking_standard_yul/input.json
deleted file mode 100644
index 80fb2d6adcea..000000000000
--- a/test/cmdlineTests/linking_standard_yul/input.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"A": {
-			"content": "object \"a\" { code { let addr := linkersymbol(\"contract/test.sol:L\") sstore(0, addr) } }"
-		}
-	},
-	"settings": {
-		"libraries": {
-			"contract/test.sol": {
-				"L": "0x1234567890123456789012345678901234567890"
-			}
-		},
-		"outputSelection": {
-			"*": {
-				"*": ["evm.bytecode.object", "evm.bytecode.linkReferences"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/linking_standard_yul/output.json b/test/cmdlineTests/linking_standard_yul/output.json
deleted file mode 100644
index b9059bdfd622..000000000000
--- a/test/cmdlineTests/linking_standard_yul/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "a":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/input.json b/test/cmdlineTests/linking_standard_yul_quote_in_file_name/input.json
deleted file mode 100644
index 2a0c59a81faa..000000000000
--- a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/input.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"A": {
-			"content": "object \"a\" { code { let addr := linkersymbol(\"contract/test\\\".sol:L\") sstore(0, addr) } }"
-		}
-	},
-	"settings": {
-		"libraries": {
-			"contract/test\".sol": {
-				"L": "0x1234567890123456789012345678901234567890"
-			}
-		},
-		"outputSelection": {
-			"*": {
-				"*": ["evm.bytecode.object", "evm.bytecode.linkReferences"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json b/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
deleted file mode 100644
index b9059bdfd622..000000000000
--- a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "a":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/linking_standard_yul_unresolved_references/input.json b/test/cmdlineTests/linking_standard_yul_unresolved_references/input.json
deleted file mode 100644
index 220ac9ce1a0e..000000000000
--- a/test/cmdlineTests/linking_standard_yul_unresolved_references/input.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"A": {
-			"content": "object \"a\" { code { let addr1 := linkersymbol(\"contract/test.sol:L1\") let addr2 := linkersymbol(\"contract/test.sol:L2\") sstore(0, addr1) sstore(1, addr2) } }"
-		}
-	},
-	"settings": {
-		"libraries": {
-			"contract/test.sol": {
-				"L1": "0x1234567890123456789012345678901234567890"
-			}
-		},
-		"outputSelection": {
-			"*": {
-				"*": ["evm.bytecode.object", "evm.bytecode.linkReferences"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json b/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
deleted file mode 100644
index ac1250cd4c74..000000000000
--- a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "a":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences":
-                        {
-                            "contract/test.sol":
-                            {
-                                "L2":
-                                [
-                                    {
-                                        "length": 20,
-                                        "start": 22
-                                    }
-                                ]
-                            }
-                        },
-                        "object": "<BYTECODE REMOVED>__$fb58009a6b1ecea3b9d99bedd645df4ec3$__<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly/args b/test/cmdlineTests/linking_strict_assembly/args
deleted file mode 100644
index 1388594ab1ac..000000000000
--- a/test/cmdlineTests/linking_strict_assembly/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries contract/test.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linking_strict_assembly/input.yul b/test/cmdlineTests/linking_strict_assembly/input.yul
deleted file mode 100644
index ec3f1e077613..000000000000
--- a/test/cmdlineTests/linking_strict_assembly/input.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol("contract/test.sol:L")
-        sstore(0, addr)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly/output b/test/cmdlineTests/linking_strict_assembly/output
deleted file mode 100644
index 29a8abdfaea8..000000000000
--- a/test/cmdlineTests/linking_strict_assembly/output
+++ /dev/null
@@ -1,26 +0,0 @@
-
-======= linking_strict_assembly/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr := linkersymbol("contract/test.sol:L")
-            sstore(0, addr)
-        }
-    }
-}
-
-
-Binary representation:
-7312345678901234567890123456789012345678905f5500
-
-Text representation:
-    /* "linking_strict_assembly/input.yul":44:79   */
-  linkerSymbol("f919ba91ac99f96129544b80b9516b27a80e376b9dc693819d0b18b7e0395612")
-    /* "linking_strict_assembly/input.yul":95:96   */
-  0x00
-    /* "linking_strict_assembly/input.yul":88:103   */
-  sstore
-    /* "linking_strict_assembly/input.yul":22:109   */
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/args b/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/args
deleted file mode 100644
index 186eeedb3f2c..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries library.sol:L=0x1234567890123456789012345678901234567890,library.sol:L=0x0987654321098765432109876543210987654321
diff --git a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err b/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err
deleted file mode 100644
index 9d4ca2c185f7..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Address specified more than once for library "library.sol:L".
diff --git a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/exit b/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/input.yul b/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/input.yul
deleted file mode 100644
index d0b6077be210..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/input.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol("library.sol:L")
-        sstore(0, addr)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/args b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/args
deleted file mode 100644
index 1c8721f244a8..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries :L=0x1234567890123456789012345678901234567890 --debug-info none
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/input.yul b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/input.yul
deleted file mode 100644
index e5c134b87fb0..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/input.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol(":L")
-        sstore(0, addr)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
deleted file mode 100644
index e4fa4fcbd9ab..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
+++ /dev/null
@@ -1,22 +0,0 @@
-
-======= linking_strict_assembly_qualified_library_qualified_reference/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr := linkersymbol(":L")
-            sstore(0, addr)
-        }
-    }
-}
-
-
-Binary representation:
-7312345678901234567890123456789012345678905f5500
-
-Text representation:
-  linkerSymbol("20a18a9bf97d889dcf77111b674da319a4e9e3e05d3f4df9e0bf5c588dd4f0f8")
-  0x00
-  sstore
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/args b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/args
deleted file mode 100644
index 1c8721f244a8..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries :L=0x1234567890123456789012345678901234567890 --debug-info none
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/input.yul b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/input.yul
deleted file mode 100644
index fcfab5bcf582..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/input.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol("L")
-        sstore(0, addr)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
deleted file mode 100644
index ebf7f6542c52..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
+++ /dev/null
@@ -1,22 +0,0 @@
-
-======= linking_strict_assembly_qualified_library_unqualified_reference/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr := linkersymbol("L")
-            sstore(0, addr)
-        }
-    }
-}
-
-
-Binary representation:
-73__$8aa64f937099b65a4febc243a5ae0f2d64$__5f5500
-
-Text representation:
-  linkerSymbol("8aa64f937099b65a4febc243a5ae0f2d6416bb9e473c30dd29c1ee498fb7c5a8")
-  0x00
-  sstore
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/args b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/args
deleted file mode 100644
index 304a7975b89e..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries library1.sol:L=0x1111111111111111111111111111111111111111,library2.sol:L=0x2222222222222222222222222222222222222222
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/input.yul b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/input.yul
deleted file mode 100644
index 1d4cfa367715..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/input.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "a" {
-    code {
-        let addr1 := linkersymbol("library1.sol:L")
-        let addr2 := linkersymbol("library2.sol:L")
-        sstore(0, addr1)
-        sstore(1, addr2)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
deleted file mode 100644
index 4aecfc6b26b1..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
+++ /dev/null
@@ -1,36 +0,0 @@
-
-======= linking_strict_assembly_same_library_name_different_files/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr1 := linkersymbol("library1.sol:L")
-            let addr2 := linkersymbol("library2.sol:L")
-            sstore(0, addr1)
-            sstore(1, addr2)
-        }
-    }
-}
-
-
-Binary representation:
-731111111111111111111111111111111111111111732222222222222222222222222222222222222222905f5560015500
-
-Text representation:
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":45:75   */
-  linkerSymbol("f3ffc10c396a7cc41ae954b050792839d20947bf73497d30c49a9fda1ea477ec")
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":97:127   */
-  linkerSymbol("c3523432985587641d17c68161d2f700c57aaf4ed21cda4f25d76193c831f97f")
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":136:152   */
-  swap1
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":143:144   */
-  0x00
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":136:152   */
-  sstore
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":168:169   */
-  0x01
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":161:177   */
-  sstore
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":22:183   */
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/args b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/args
deleted file mode 100644
index 12e6cd1231fc..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries library1.sol:L=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul
deleted file mode 100644
index 1d4cfa367715..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "a" {
-    code {
-        let addr1 := linkersymbol("library1.sol:L")
-        let addr2 := linkersymbol("library2.sol:L")
-        sstore(0, addr1)
-        sstore(1, addr2)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
deleted file mode 100644
index 10a7fe7fe067..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
+++ /dev/null
@@ -1,36 +0,0 @@
-
-======= linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr1 := linkersymbol("library1.sol:L")
-            let addr2 := linkersymbol("library2.sol:L")
-            sstore(0, addr1)
-            sstore(1, addr2)
-        }
-    }
-}
-
-
-Binary representation:
-73123456789012345678901234567890123456789073__$c3523432985587641d17c68161d2f700c5$__905f5560015500
-
-Text representation:
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":45:75   */
-  linkerSymbol("f3ffc10c396a7cc41ae954b050792839d20947bf73497d30c49a9fda1ea477ec")
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":97:127   */
-  linkerSymbol("c3523432985587641d17c68161d2f700c57aaf4ed21cda4f25d76193c831f97f")
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":136:152   */
-  swap1
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":143:144   */
-  0x00
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":136:152   */
-  sstore
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":168:169   */
-  0x01
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":161:177   */
-  sstore
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":22:183   */
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/args b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/args
deleted file mode 100644
index c8299b9b6104..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries L=0x1234567890123456789012345678901234567890 --debug-info none
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/input.yul b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/input.yul
deleted file mode 100644
index e5c134b87fb0..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/input.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol(":L")
-        sstore(0, addr)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
deleted file mode 100644
index aaf03d0733b4..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
+++ /dev/null
@@ -1,22 +0,0 @@
-
-======= linking_strict_assembly_unqualified_library_qualified_reference/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr := linkersymbol(":L")
-            sstore(0, addr)
-        }
-    }
-}
-
-
-Binary representation:
-73__$20a18a9bf97d889dcf77111b674da319a4$__5f5500
-
-Text representation:
-  linkerSymbol("20a18a9bf97d889dcf77111b674da319a4e9e3e05d3f4df9e0bf5c588dd4f0f8")
-  0x00
-  sstore
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/args b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/args
deleted file mode 100644
index c8299b9b6104..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries L=0x1234567890123456789012345678901234567890 --debug-info none
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/input.yul b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/input.yul
deleted file mode 100644
index fcfab5bcf582..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/input.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol("L")
-        sstore(0, addr)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
deleted file mode 100644
index d91d89f5ca69..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
+++ /dev/null
@@ -1,22 +0,0 @@
-
-======= linking_strict_assembly_unqualified_library_unqualified_reference/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr := linkersymbol("L")
-            sstore(0, addr)
-        }
-    }
-}
-
-
-Binary representation:
-7312345678901234567890123456789012345678905f5500
-
-Text representation:
-  linkerSymbol("8aa64f937099b65a4febc243a5ae0f2d6416bb9e473c30dd29c1ee498fb7c5a8")
-  0x00
-  sstore
-  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/args b/test/cmdlineTests/linking_strict_assembly_unresolved_references/args
deleted file mode 100644
index da00d1fd8f16..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --libraries contract/test.sol:L1=0x1234567890123456789012345678901234567890
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/input.yul b/test/cmdlineTests/linking_strict_assembly_unresolved_references/input.yul
deleted file mode 100644
index fc5d05a8bb71..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/input.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "a" {
-    code {
-        let addr1 := linkersymbol("contract/test.sol:L1")
-        let addr2 := linkersymbol("contract/test.sol:L2")
-        sstore(0, addr1)
-        sstore(1, addr2)
-    }
-}
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
deleted file mode 100644
index a110db5a3e4e..000000000000
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
+++ /dev/null
@@ -1,36 +0,0 @@
-
-======= linking_strict_assembly_unresolved_references/input.yul (EVM) =======
-
-Pretty printed source:
-object "a" {
-    code {
-        {
-            let addr1 := linkersymbol("contract/test.sol:L1")
-            let addr2 := linkersymbol("contract/test.sol:L2")
-            sstore(0, addr1)
-            sstore(1, addr2)
-        }
-    }
-}
-
-
-Binary representation:
-73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__905f5560015500
-
-Text representation:
-    /* "linking_strict_assembly_unresolved_references/input.yul":45:81   */
-  linkerSymbol("05b0326038374a21e0895480a58bda0768cdcc04c8d18f154362d1ca5223d245")
-    /* "linking_strict_assembly_unresolved_references/input.yul":103:139   */
-  linkerSymbol("fb58009a6b1ecea3b9d99bedd645df4ec308f17bc0087e5f39d078f77f809177")
-    /* "linking_strict_assembly_unresolved_references/input.yul":148:164   */
-  swap1
-    /* "linking_strict_assembly_unresolved_references/input.yul":155:156   */
-  0x00
-    /* "linking_strict_assembly_unresolved_references/input.yul":148:164   */
-  sstore
-    /* "linking_strict_assembly_unresolved_references/input.yul":180:181   */
-  0x01
-    /* "linking_strict_assembly_unresolved_references/input.yul":173:189   */
-  sstore
-    /* "linking_strict_assembly_unresolved_references/input.yul":22:195   */
-  stop
diff --git a/test/cmdlineTests/linking_unqualified_library_name/args b/test/cmdlineTests/linking_unqualified_library_name/args
deleted file mode 100644
index 6118acf02caf..000000000000
--- a/test/cmdlineTests/linking_unqualified_library_name/args
+++ /dev/null
@@ -1 +0,0 @@
-linking_unqualified_library_name/contract1.sol linking_unqualified_library_name/contract2.sol --bin --libraries Log:0x7777777777777777777777777777777777777777
diff --git a/test/cmdlineTests/linking_unqualified_library_name/contract1.sol b/test/cmdlineTests/linking_unqualified_library_name/contract1.sol
deleted file mode 100644
index 38e43f9d493e..000000000000
--- a/test/cmdlineTests/linking_unqualified_library_name/contract1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-
-import "linking_unqualified_library_name/error.sol";
-
-contract C {
-    function foo() public {
-        Log.print();
-    }
-}
diff --git a/test/cmdlineTests/linking_unqualified_library_name/contract2.sol b/test/cmdlineTests/linking_unqualified_library_name/contract2.sol
deleted file mode 100644
index 6ddb8ad6e286..000000000000
--- a/test/cmdlineTests/linking_unqualified_library_name/contract2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-import "linking_unqualified_library_name/math.sol";
-
-contract C {
-    function foo() public {
-        Log.log10();
-    }
-}
diff --git a/test/cmdlineTests/linking_unqualified_library_name/error.sol b/test/cmdlineTests/linking_unqualified_library_name/error.sol
deleted file mode 100644
index ec29bda35913..000000000000
--- a/test/cmdlineTests/linking_unqualified_library_name/error.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-library Log {
-    function print() external {}
-}
diff --git a/test/cmdlineTests/linking_unqualified_library_name/math.sol b/test/cmdlineTests/linking_unqualified_library_name/math.sol
deleted file mode 100644
index 62f00ec340f3..000000000000
--- a/test/cmdlineTests/linking_unqualified_library_name/math.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-library Log {
-    function log10() external {}
-}
diff --git a/test/cmdlineTests/linking_unqualified_library_name/output b/test/cmdlineTests/linking_unqualified_library_name/output
deleted file mode 100644
index be64a93c9bbc..000000000000
--- a/test/cmdlineTests/linking_unqualified_library_name/output
+++ /dev/null
@@ -1,20 +0,0 @@
-
-======= linking_unqualified_library_name/contract1.sol:C =======
-Binary:
-<BYTECODE REMOVED>__$cdf6d5ab08a9335b02e7c2475aa27d04fa$__<BYTECODE REMOVED>
-
-// $cdf6d5ab08a9335b02e7c2475aa27d04fa$ -> linking_unqualified_library_name/error.sol:Log
-
-======= linking_unqualified_library_name/contract2.sol:C =======
-Binary:
-<BYTECODE REMOVED>__$22584241c2fc4f2884d5222245463779a8$__<BYTECODE REMOVED>
-
-// $22584241c2fc4f2884d5222245463779a8$ -> linking_unqualified_library_name/math.sol:Log
-
-======= linking_unqualified_library_name/error.sol:Log =======
-Binary:
-<BYTECODE REMOVED>
-
-======= linking_unqualified_library_name/math.sol:Log =======
-Binary:
-<BYTECODE REMOVED>
diff --git a/test/cmdlineTests/message_format/err b/test/cmdlineTests/message_format/err
deleted file mode 100644
index eee8267e25f3..000000000000
--- a/test/cmdlineTests/message_format/err
+++ /dev/null
@@ -1,50 +0,0 @@
-Warning: Source file does not specify required compiler version!
---> message_format/input.sol
-
-Warning: Unused local variable.
- --> message_format/input.sol:9:27:
-  |
-9 |     function f() public { int x; }
-  |                           ^^^^^
-
-Warning: Unused local variable.
-  --> message_format/input.sol:10:27:
-   |
-10 |     function g() public { int x; }
-   |                           ^^^^^
-
-Warning: Unused local variable.
-  --> message_format/input.sol:99:14:
-   |
-99 |         /**/ int a; /**/
-   |              ^^^^^
-
-Warning: Unused local variable.
-   --> message_format/input.sol:100:14:
-    |
-100 |         /**/ int b; /**/
-    |              ^^^^^
-
-Warning: Unused local variable.
-   --> message_format/input.sol:101:14:
-    |
-101 |         /**/ int c; /**/
-    |              ^^^^^
-
-Warning: Function state mutability can be restricted to pure
- --> message_format/input.sol:9:5:
-  |
-9 |     function f() public { int x; }
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Warning: Function state mutability can be restricted to pure
-  --> message_format/input.sol:10:5:
-   |
-10 |     function g() public { int x; }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Warning: Function state mutability can be restricted to pure
-  --> message_format/input.sol:11:5:
-   |
-11 |     function h() public {
-   |     ^ (Relevant source part starts here and spans across multiple lines).
diff --git a/test/cmdlineTests/message_format/input.sol b/test/cmdlineTests/message_format/input.sol
deleted file mode 100644
index cbb51c9d6203..000000000000
--- a/test/cmdlineTests/message_format/input.sol
+++ /dev/null
@@ -1,103 +0,0 @@
-// checks that error messages around power-or-10 lines are formatted correctly
-// SPDX-License-Identifier: GPL-3.0
-
-
-
-
-
-contract C {
-    function f() public { int x; }
-    function g() public { int x; }
-    function h() public {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        /**/ int a; /**/
-        /**/ int b; /**/
-        /**/ int c; /**/
-    }
-}
diff --git a/test/cmdlineTests/message_format_utf8/err b/test/cmdlineTests/message_format_utf8/err
deleted file mode 100644
index 58d45127cb3d..000000000000
--- a/test/cmdlineTests/message_format_utf8/err
+++ /dev/null
@@ -1,29 +0,0 @@
-Warning: Statement has no effect.
- --> message_format_utf8/input.sol:5:51:
-  |
-5 | /* ©©©©ﾩ©©©©© 2017 */ constructor () { unicode"©©©©ﾩ©©©©©" ; }
-  |                                        ^^^^^^^^^^^^^^^^^^^
-
-Warning: Statement has no effect.
- --> message_format_utf8/input.sol:9:25:
-  |
-9 |                         unicode"S = π × r²";
-  |                         ^^^^^^^^^^^^^^^^^^^
-
-Warning: Statement has no effect.
-  --> message_format_utf8/input.sol:10:39:
-   |
-10 | /* ₀�₂₃₄����� */		unicode"∑ 1/n! ≈ 2.7";                 // tabs in-between
-   |                 		^^^^^^^^^^^^^^^^^^^^^
-
-Warning: Statement has no effect.
-  --> message_format_utf8/input.sol:11:30:
-   |
-11 | /* Ŀ�ŗėɯ ïƥ�ʉɱ */		unicode"μὴ		χεῖ�ον		βέλτιστον"; // tabs in-between and inside
-   |                  		^^^^^^^^^^		^^^^^^		^^^^^^^^^^
-
-Warning: Function state mutability can be restricted to pure
-  --> message_format_utf8/input.sol:15:2:
-   |
-15 | 	function selector() public returns(uint) { // starts with tab
-   | 	^ (Relevant source part starts here and spans across multiple lines).
diff --git a/test/cmdlineTests/message_format_utf8/input.sol b/test/cmdlineTests/message_format_utf8/input.sol
deleted file mode 100644
index d16aa8753c0e..000000000000
--- a/test/cmdlineTests/message_format_utf8/input.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract Foo {
-/* ©©©©ﾩ©©©©© 2017 */ constructor () { unicode"©©©©ﾩ©©©©©" ; }
-
-    function f() public pure {
-
-                        unicode"S = π × r²";
-/* ₀�₂₃₄����� */		unicode"∑ 1/n! ≈ 2.7";                 // tabs in-between
-/* Ŀ�ŗėɯ ïƥ�ʉɱ */		unicode"μὴ		χεῖ�ον		βέλτιστον"; // tabs in-between and inside
-
-    }
-
-	function selector() public returns(uint) { // starts with tab
-		return 0;
-	}
-}
diff --git a/test/cmdlineTests/metadata/args b/test/cmdlineTests/metadata/args
deleted file mode 100644
index 5cbfceb4723f..000000000000
--- a/test/cmdlineTests/metadata/args
+++ /dev/null
@@ -1 +0,0 @@
---metadata
diff --git a/test/cmdlineTests/metadata/input.sol b/test/cmdlineTests/metadata/input.sol
deleted file mode 100644
index a3a86cc8d317..000000000000
--- a/test/cmdlineTests/metadata/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {}
diff --git a/test/cmdlineTests/metadata/output b/test/cmdlineTests/metadata/output
deleted file mode 100644
index bf1e750c95f0..000000000000
--- a/test/cmdlineTests/metadata/output
+++ /dev/null
@@ -1,4 +0,0 @@
-
-======= metadata/input.sol:C =======
-Metadata:
-{"compiler":{"version": "<VERSION REMOVED>"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"metadata/input.sol":"C"},"evmVersion":"shanghai","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"metadata/input.sol":{"keccak256":"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0","license":"GPL-3.0","urls":["bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2","dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS"]}},"version":1}
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations/args b/test/cmdlineTests/model_checker_bmc_loop_iterations/args
deleted file mode 100644
index 3761421e91b8..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-bmc-loop-iterations 3
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations/err b/test/cmdlineTests/model_checker_bmc_loop_iterations/err
deleted file mode 100644
index cbb2b0f9daca..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations/err
+++ /dev/null
@@ -1,11 +0,0 @@
-Warning: BMC: Assertion violation happens here.
-  --> model_checker_bmc_loop_iterations/input.sol:10:3:
-   |
-10 | 		assert(x == 3);
-   | 		^^^^^^^^^^^^^^
-Note: Counterexample:
-  x = 2
-
-Note: Callstack:
-Note: False negatives are possible when unrolling loops.
-This is due to the possibility that the BMC loop iteration setting is smaller than the actual number of iterations needed to complete a loop.
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol b/test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol
deleted file mode 100644
index 3722e46cfcef..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		do {
-			++x;
-		} while (x < 2);
-		assert(x == 3);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args
deleted file mode 100644
index 32b6eb05b088..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-bmc-loop-iterations bmc
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
deleted file mode 100644
index fb8800438a27..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: the argument ('bmc') for option '--model-checker-bmc-loop-iterations' is invalid
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit
deleted file mode 100644
index 56a6051ca2b0..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/input.sol b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/input.sol
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args
deleted file mode 100644
index aad7e026c645..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-bmc-loop-iterations
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
deleted file mode 100644
index 1bd45b6c6f57..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: the argument ('model_checker_bmc_loop_iterations_no_argument/input.sol') for option '--model-checker-bmc-loop-iterations' is invalid
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit
deleted file mode 100644
index 56a6051ca2b0..000000000000
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/input.sol b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/input.sol
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/model_checker_contracts_all/args b/test/cmdlineTests/model_checker_contracts_all/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_contracts_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_contracts_all/err b/test/cmdlineTests/model_checker_contracts_all/err
deleted file mode 100644
index 57b620b49b68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_all/err
+++ /dev/null
@@ -1,25 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-B.constructor()
-B.f(0)
- --> model_checker_contracts_all/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-A.constructor()
-A.g(0)
-  --> model_checker_contracts_all/input.sol:10:3:
-   |
-10 | 		assert(y > 0);
-   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_contracts_all/input.sol b/test/cmdlineTests/model_checker_contracts_all/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_all/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_all_explicit/args b/test/cmdlineTests/model_checker_contracts_all_explicit/args
deleted file mode 100644
index 6e6bee97aed8..000000000000
--- a/test/cmdlineTests/model_checker_contracts_all_explicit/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts model_checker_contracts_all_explicit/input.sol:B,model_checker_contracts_all_explicit/input.sol:A
diff --git a/test/cmdlineTests/model_checker_contracts_all_explicit/err b/test/cmdlineTests/model_checker_contracts_all_explicit/err
deleted file mode 100644
index 003c0dffe018..000000000000
--- a/test/cmdlineTests/model_checker_contracts_all_explicit/err
+++ /dev/null
@@ -1,25 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-B.constructor()
-B.f(0)
- --> model_checker_contracts_all_explicit/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-A.constructor()
-A.g(0)
-  --> model_checker_contracts_all_explicit/input.sol:10:3:
-   |
-10 | 		assert(y > 0);
-   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_contracts_all_explicit/input.sol b/test/cmdlineTests/model_checker_contracts_all_explicit/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_all_explicit/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_contract_missing/args b/test/cmdlineTests/model_checker_contracts_contract_missing/args
deleted file mode 100644
index 113dadc1d96f..000000000000
--- a/test/cmdlineTests/model_checker_contracts_contract_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts model_checker_contracts_inexistent_contract/input.sol:
diff --git a/test/cmdlineTests/model_checker_contracts_contract_missing/err b/test/cmdlineTests/model_checker_contracts_contract_missing/err
deleted file mode 100644
index 08587a8121dd..000000000000
--- a/test/cmdlineTests/model_checker_contracts_contract_missing/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-contracts: model_checker_contracts_inexistent_contract/input.sol:
diff --git a/test/cmdlineTests/model_checker_contracts_contract_missing/exit b/test/cmdlineTests/model_checker_contracts_contract_missing/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_contracts_contract_missing/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_contracts_contract_missing/input.sol b/test/cmdlineTests/model_checker_contracts_contract_missing/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_contract_missing/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_empty_contract/args b/test/cmdlineTests/model_checker_contracts_empty_contract/args
deleted file mode 100644
index 61fe954765ee..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_contract/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts a.sol:
diff --git a/test/cmdlineTests/model_checker_contracts_empty_contract/err b/test/cmdlineTests/model_checker_contracts_empty_contract/err
deleted file mode 100644
index 2d6a65028e76..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_contract/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-contracts: a.sol:
diff --git a/test/cmdlineTests/model_checker_contracts_empty_contract/exit b/test/cmdlineTests/model_checker_contracts_empty_contract/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_contract/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_contracts_empty_contract/input.sol b/test/cmdlineTests/model_checker_contracts_empty_contract/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_contract/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_empty_source/args b/test/cmdlineTests/model_checker_contracts_empty_source/args
deleted file mode 100644
index c230bd8b8e06..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_source/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts :A
diff --git a/test/cmdlineTests/model_checker_contracts_empty_source/err b/test/cmdlineTests/model_checker_contracts_empty_source/err
deleted file mode 100644
index 8357fbd89d1b..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_source/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-contracts: :A
diff --git a/test/cmdlineTests/model_checker_contracts_empty_source/exit b/test/cmdlineTests/model_checker_contracts_empty_source/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_source/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_contracts_empty_source/input.sol b/test/cmdlineTests/model_checker_contracts_empty_source/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_empty_source/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_contract/args b/test/cmdlineTests/model_checker_contracts_inexistent_contract/args
deleted file mode 100644
index b3c44af85b87..000000000000
--- a/test/cmdlineTests/model_checker_contracts_inexistent_contract/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts model_checker_contracts_inexistent_contract/input.sol:C
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_contract/err b/test/cmdlineTests/model_checker_contracts_inexistent_contract/err
deleted file mode 100644
index 00b97763f340..000000000000
--- a/test/cmdlineTests/model_checker_contracts_inexistent_contract/err
+++ /dev/null
@@ -1,27 +0,0 @@
-Warning: Requested contract "C" does not exist in source "model_checker_contracts_inexistent_contract/input.sol".
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-B.constructor()
-B.f(0)
- --> model_checker_contracts_inexistent_contract/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-A.constructor()
-A.g(0)
-  --> model_checker_contracts_inexistent_contract/input.sol:10:3:
-   |
-10 | 		assert(y > 0);
-   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_contract/input.sol b/test/cmdlineTests/model_checker_contracts_inexistent_contract/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_inexistent_contract/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_source/args b/test/cmdlineTests/model_checker_contracts_inexistent_source/args
deleted file mode 100644
index 6d91ecc34355..000000000000
--- a/test/cmdlineTests/model_checker_contracts_inexistent_source/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts model_checker_contracts_inexistent_source/A.sol:A
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_source/err b/test/cmdlineTests/model_checker_contracts_inexistent_source/err
deleted file mode 100644
index 218588ad83d2..000000000000
--- a/test/cmdlineTests/model_checker_contracts_inexistent_source/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Requested source "model_checker_contracts_inexistent_source/A.sol" does not exist.
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_source/input.sol b/test/cmdlineTests/model_checker_contracts_inexistent_source/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_inexistent_source/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_one_contract_missing/args b/test/cmdlineTests/model_checker_contracts_one_contract_missing/args
deleted file mode 100644
index 7ea3d3f04610..000000000000
--- a/test/cmdlineTests/model_checker_contracts_one_contract_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts model_checker_contracts_all_explicit/input.sol:,model_checker_contracts_all_explicit/input.sol:A
diff --git a/test/cmdlineTests/model_checker_contracts_one_contract_missing/err b/test/cmdlineTests/model_checker_contracts_one_contract_missing/err
deleted file mode 100644
index d4e93bcd705e..000000000000
--- a/test/cmdlineTests/model_checker_contracts_one_contract_missing/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-contracts: model_checker_contracts_all_explicit/input.sol:,model_checker_contracts_all_explicit/input.sol:A
diff --git a/test/cmdlineTests/model_checker_contracts_one_contract_missing/exit b/test/cmdlineTests/model_checker_contracts_one_contract_missing/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_contracts_one_contract_missing/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_contracts_one_contract_missing/input.sol b/test/cmdlineTests/model_checker_contracts_one_contract_missing/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_one_contract_missing/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_only_one/args b/test/cmdlineTests/model_checker_contracts_only_one/args
deleted file mode 100644
index ae76a81d6735..000000000000
--- a/test/cmdlineTests/model_checker_contracts_only_one/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts model_checker_contracts_only_one/input.sol:A
diff --git a/test/cmdlineTests/model_checker_contracts_only_one/err b/test/cmdlineTests/model_checker_contracts_only_one/err
deleted file mode 100644
index 2088e19c7a2f..000000000000
--- a/test/cmdlineTests/model_checker_contracts_only_one/err
+++ /dev/null
@@ -1,25 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-B.constructor()
-B.f(0)
- --> model_checker_contracts_only_one/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-A.constructor()
-A.g(0)
-  --> model_checker_contracts_only_one/input.sol:10:3:
-   |
-10 | 		assert(y > 0);
-   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_contracts_only_one/input.sol b/test/cmdlineTests/model_checker_contracts_only_one/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_only_one/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_contracts_source_missing/args b/test/cmdlineTests/model_checker_contracts_source_missing/args
deleted file mode 100644
index 37f091bf5592..000000000000
--- a/test/cmdlineTests/model_checker_contracts_source_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-contracts :C
diff --git a/test/cmdlineTests/model_checker_contracts_source_missing/err b/test/cmdlineTests/model_checker_contracts_source_missing/err
deleted file mode 100644
index a6baa3efd194..000000000000
--- a/test/cmdlineTests/model_checker_contracts_source_missing/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-contracts: :C
diff --git a/test/cmdlineTests/model_checker_contracts_source_missing/exit b/test/cmdlineTests/model_checker_contracts_source_missing/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_contracts_source_missing/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_contracts_source_missing/input.sol b/test/cmdlineTests/model_checker_contracts_source_missing/input.sol
deleted file mode 100644
index 52b71f2e5d68..000000000000
--- a/test/cmdlineTests/model_checker_contracts_source_missing/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract B {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
-contract A is B {
-    function g(uint y) public pure {
-		assert(y > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_all/args b/test/cmdlineTests/model_checker_divModSlacks_default_all/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_all/err b/test/cmdlineTests/model_checker_divModSlacks_default_all/err
deleted file mode 100644
index 4ad4ce384755..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_all/err
+++ /dev/null
@@ -1 +0,0 @@
-Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_all/input.sol b/test/cmdlineTests/model_checker_divModSlacks_default_all/input.sol
deleted file mode 100644
index 4dcb4cb2898d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_all/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-	function f(uint a, uint b) public pure returns (uint, uint) {
-		require(b != 0);
-		return (a / b, a % b);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/args b/test/cmdlineTests/model_checker_divModSlacks_default_bmc/args
deleted file mode 100644
index 549f20236336..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/err b/test/cmdlineTests/model_checker_divModSlacks_default_bmc/err
deleted file mode 100644
index d849d45f9cca..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/err
+++ /dev/null
@@ -1 +0,0 @@
-Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/input.sol b/test/cmdlineTests/model_checker_divModSlacks_default_bmc/input.sol
deleted file mode 100644
index 4dcb4cb2898d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-	function f(uint a, uint b) public pure returns (uint, uint) {
-		require(b != 0);
-		return (a / b, a % b);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_chc/args b/test/cmdlineTests/model_checker_divModSlacks_default_chc/args
deleted file mode 100644
index 7458a47d35b9..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_chc/err b/test/cmdlineTests/model_checker_divModSlacks_default_chc/err
deleted file mode 100644
index 4ad4ce384755..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_chc/err
+++ /dev/null
@@ -1 +0,0 @@
-Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_chc/input.sol b/test/cmdlineTests/model_checker_divModSlacks_default_chc/input.sol
deleted file mode 100644
index 4dcb4cb2898d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_default_chc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-	function f(uint a, uint b) public pure returns (uint, uint) {
-		require(b != 0);
-		return (a / b, a % b);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_all/args b/test/cmdlineTests/model_checker_divModSlacks_false_all/args
deleted file mode 100644
index 75bfbf194d5d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-div-mod-no-slacks
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_all/err b/test/cmdlineTests/model_checker_divModSlacks_false_all/err
deleted file mode 100644
index 8de36b1ee4e8..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_all/err
+++ /dev/null
@@ -1,15 +0,0 @@
-Warning: CHC: Error trying to invoke SMT solver.
- --> model_checker_divModSlacks_false_all/input.sol:6:11:
-  |
-6 | 		return (a / b, a % b);
-  | 		        ^^^^^
-
-Warning: CHC: Error trying to invoke SMT solver.
- --> model_checker_divModSlacks_false_all/input.sol:6:18:
-  |
-6 | 		return (a / b, a % b);
-  | 		               ^^^^^
-
-Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_all/input.sol b/test/cmdlineTests/model_checker_divModSlacks_false_all/input.sol
deleted file mode 100644
index 4dcb4cb2898d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_all/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-	function f(uint a, uint b) public pure returns (uint, uint) {
-		require(b != 0);
-		return (a / b, a % b);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/args b/test/cmdlineTests/model_checker_divModSlacks_false_bmc/args
deleted file mode 100644
index 2579bdc1e4d5..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-div-mod-no-slacks
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/err b/test/cmdlineTests/model_checker_divModSlacks_false_bmc/err
deleted file mode 100644
index d849d45f9cca..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/err
+++ /dev/null
@@ -1 +0,0 @@
-Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/input.sol b/test/cmdlineTests/model_checker_divModSlacks_false_bmc/input.sol
deleted file mode 100644
index 4dcb4cb2898d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-	function f(uint a, uint b) public pure returns (uint, uint) {
-		require(b != 0);
-		return (a / b, a % b);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_chc/args b/test/cmdlineTests/model_checker_divModSlacks_false_chc/args
deleted file mode 100644
index b0679b1c6f93..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-div-mod-no-slacks
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_chc/err b/test/cmdlineTests/model_checker_divModSlacks_false_chc/err
deleted file mode 100644
index 56cca82c0832..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_chc/err
+++ /dev/null
@@ -1,13 +0,0 @@
-Warning: CHC: Error trying to invoke SMT solver.
- --> model_checker_divModSlacks_false_chc/input.sol:6:11:
-  |
-6 | 		return (a / b, a % b);
-  | 		        ^^^^^
-
-Warning: CHC: Error trying to invoke SMT solver.
- --> model_checker_divModSlacks_false_chc/input.sol:6:18:
-  |
-6 | 		return (a / b, a % b);
-  | 		               ^^^^^
-
-Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_chc/input.sol b/test/cmdlineTests/model_checker_divModSlacks_false_chc/input.sol
deleted file mode 100644
index 4dcb4cb2898d..000000000000
--- a/test/cmdlineTests/model_checker_divModSlacks_false_chc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-	function f(uint a, uint b) public pure returns (uint, uint) {
-		require(b != 0);
-		return (a / b, a % b);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_engine_all/args b/test/cmdlineTests/model_checker_engine_all/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_engine_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_engine_all/err b/test/cmdlineTests/model_checker_engine_all/err
deleted file mode 100644
index 12614fd55f82..000000000000
--- a/test/cmdlineTests/model_checker_engine_all/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-test.constructor()
-test.f(0)
- --> model_checker_engine_all/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_engine_all/input.sol b/test/cmdlineTests/model_checker_engine_all/input.sol
deleted file mode 100644
index d29659d11753..000000000000
--- a/test/cmdlineTests/model_checker_engine_all/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_engine_bmc/args b/test/cmdlineTests/model_checker_engine_bmc/args
deleted file mode 100644
index 549f20236336..000000000000
--- a/test/cmdlineTests/model_checker_engine_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_engine_bmc/err b/test/cmdlineTests/model_checker_engine_bmc/err
deleted file mode 100644
index ed46539d6510..000000000000
--- a/test/cmdlineTests/model_checker_engine_bmc/err
+++ /dev/null
@@ -1,10 +0,0 @@
-Warning: BMC: Assertion violation happens here.
- --> model_checker_engine_bmc/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_engine_bmc/input.sol b/test/cmdlineTests/model_checker_engine_bmc/input.sol
deleted file mode 100644
index d29659d11753..000000000000
--- a/test/cmdlineTests/model_checker_engine_bmc/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_engine_chc/args b/test/cmdlineTests/model_checker_engine_chc/args
deleted file mode 100644
index 7458a47d35b9..000000000000
--- a/test/cmdlineTests/model_checker_engine_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_engine_chc/err b/test/cmdlineTests/model_checker_engine_chc/err
deleted file mode 100644
index 95198fa2027a..000000000000
--- a/test/cmdlineTests/model_checker_engine_chc/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-test.constructor()
-test.f(0)
- --> model_checker_engine_chc/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_engine_chc/input.sol b/test/cmdlineTests/model_checker_engine_chc/input.sol
deleted file mode 100644
index d29659d11753..000000000000
--- a/test/cmdlineTests/model_checker_engine_chc/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-    function f(uint x) public pure {
-		assert(x > 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_engine_none/args b/test/cmdlineTests/model_checker_engine_none/args
deleted file mode 100644
index cac942cb23b4..000000000000
--- a/test/cmdlineTests/model_checker_engine_none/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine none
diff --git a/test/cmdlineTests/model_checker_engine_none/input.sol b/test/cmdlineTests/model_checker_engine_none/input.sol
deleted file mode 100644
index 6f361b952d46..000000000000
--- a/test/cmdlineTests/model_checker_engine_none/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/args b/test/cmdlineTests/model_checker_ext_calls_empty_arg/args
deleted file mode 100644
index b0c065ef7b5a..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_empty_arg/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-ext-calls
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/err b/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
deleted file mode 100644
index e530a206ac22..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: No input files given. If you wish to use the standard input please specify "-" explicitly.
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/exit b/test/cmdlineTests/model_checker_ext_calls_empty_arg/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_empty_arg/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol b/test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol
deleted file mode 100644
index bd341cea6058..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract Ext {
-	function f() public view returns (uint) {
-		return 42;
-	}
-}
-
-contract test {
-	function g(Ext e) public view {
-		uint x = e.f();
-		assert(x == 42);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/args b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/args
deleted file mode 100644
index a6240ee19fbb..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-ext-calls trusted
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
deleted file mode 100644
index e9c2d70a9739..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
+++ /dev/null
@@ -1,7 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_ext_calls_trusted_chc/input.sol:5:2:
-  |
-5 | 	function f() public view returns (uint) {
-  | 	^ (Relevant source part starts here and spans across multiple lines).
-
-Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol
deleted file mode 100644
index bd341cea6058..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract Ext {
-	function f() public view returns (uint) {
-		return 42;
-	}
-}
-
-contract test {
-	function g(Ext e) public view {
-		uint x = e.f();
-		assert(x == 42);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args
deleted file mode 100644
index e249f0250329..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-ext-calls untrusted
diff --git a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err
deleted file mode 100644
index b06333e43bd5..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-e = 0
-x = 1
-
-Transaction trace:
-test.constructor()
-test.g(0)
-    e.f() -- untrusted external call
-  --> model_checker_ext_calls_untrusted_chc/input.sol:11:3:
-   |
-11 | 		assert(x == 0);
-   | 		^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol
deleted file mode 100644
index 0d28d1c18bb8..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-abstract contract Ext {
-	function f() virtual public view returns (uint);
-}
-
-contract test {
-	function g(Ext e) public view {
-		uint x = e.f();
-		assert(x == 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/args b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/args
deleted file mode 100644
index 478aa5e1d3a9..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-ext-calls what
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
deleted file mode 100644
index ec664c28433b..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-ext-calls: what
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol
deleted file mode 100644
index bd341cea6058..000000000000
--- a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract Ext {
-	function f() public view returns (uint) {
-		return 42;
-	}
-}
-
-contract test {
-	function g(Ext e) public view {
-		uint x = e.f();
-		assert(x == 42);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_all/args b/test/cmdlineTests/model_checker_invariants_all/args
deleted file mode 100644
index 389acc64786d..000000000000
--- a/test/cmdlineTests/model_checker_invariants_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-invariants all
diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
deleted file mode 100644
index 347f40325d14..000000000000
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: Return value of low-level calls not used.
- --> model_checker_invariants_all/input.sol:6:3:
-  |
-6 | 		_a.call("");
-  | 		^^^^^^^^^^^
-
-Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
-Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
-(!(x >= 1) || true)
-Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_all/input.sol b/test/cmdlineTests/model_checker_invariants_all/input.sol
deleted file mode 100644
index 8b90cb3c1324..000000000000
--- a/test/cmdlineTests/model_checker_invariants_all/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint x;
-    function f(address _a) public {
-		_a.call("");
-		assert(x == 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_contract/args b/test/cmdlineTests/model_checker_invariants_contract/args
deleted file mode 100644
index e856a73b9c69..000000000000
--- a/test/cmdlineTests/model_checker_invariants_contract/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-invariants contract
diff --git a/test/cmdlineTests/model_checker_invariants_contract/err b/test/cmdlineTests/model_checker_invariants_contract/err
deleted file mode 100644
index f6b01e9b2cbf..000000000000
--- a/test/cmdlineTests/model_checker_invariants_contract/err
+++ /dev/null
@@ -1,4 +0,0 @@
-Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
-Info: Contract invariant(s) for model_checker_invariants_contract/input.sol:test:
-(!(x >= 1) || true)
diff --git a/test/cmdlineTests/model_checker_invariants_contract/input.sol b/test/cmdlineTests/model_checker_invariants_contract/input.sol
deleted file mode 100644
index 3a857d4848c9..000000000000
--- a/test/cmdlineTests/model_checker_invariants_contract/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint x;
-    function f() public view {
-		assert(x < 10);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/args b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/args
deleted file mode 100644
index 90591a5ae203..000000000000
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-invariants contract,reentrancy
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
deleted file mode 100644
index c6d149f15a40..000000000000
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: Return value of low-level calls not used.
- --> model_checker_invariants_contract_reentrancy/input.sol:6:3:
-  |
-6 | 		_a.call("");
-  | 		^^^^^^^^^^^
-
-Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
-Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
-(!(x >= 1) || true)
-Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
deleted file mode 100644
index 8b90cb3c1324..000000000000
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint x;
-    function f(address _a) public {
-		_a.call("");
-		assert(x == 0);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/args b/test/cmdlineTests/model_checker_invariants_reentrancy/args
deleted file mode 100644
index 904defe84b57..000000000000
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-invariants reentrancy
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/err b/test/cmdlineTests/model_checker_invariants_reentrancy/err
deleted file mode 100644
index bdd19fa18fa9..000000000000
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: Return value of low-level calls not used.
- --> model_checker_invariants_reentrancy/input.sol:6:3:
-  |
-6 | 		_a.call("");
-  | 		^^^^^^^^^^^
-
-Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
-Info: Reentrancy property(ies) for model_checker_invariants_reentrancy/input.sol:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/input.sol b/test/cmdlineTests/model_checker_invariants_reentrancy/input.sol
deleted file mode 100644
index f21d4d4c8f46..000000000000
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint x;
-    function f(address _a) public {
-		_a.call("");
-		assert(x < 10);
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/args b/test/cmdlineTests/model_checker_invariants_wrong/args
deleted file mode 100644
index ae601a044440..000000000000
--- a/test/cmdlineTests/model_checker_invariants_wrong/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-invariants what
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/err b/test/cmdlineTests/model_checker_invariants_wrong/err
deleted file mode 100644
index a9ed1d375197..000000000000
--- a/test/cmdlineTests/model_checker_invariants_wrong/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-invariants: what
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/exit b/test/cmdlineTests/model_checker_invariants_wrong/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_invariants_wrong/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/input.sol b/test/cmdlineTests/model_checker_invariants_wrong/input.sol
deleted file mode 100644
index 17bf3b749c35..000000000000
--- a/test/cmdlineTests/model_checker_invariants_wrong/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint x;
-	function g() public view {
-		assert(x < 10);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_print_query_all/args b/test/cmdlineTests/model_checker_print_query_all/args
deleted file mode 100644
index d0b07d5aff9b..000000000000
--- a/test/cmdlineTests/model_checker_print_query_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-print-query --model-checker-solvers smtlib2 --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_print_query_all/err b/test/cmdlineTests/model_checker_print_query_all/err
deleted file mode 100644
index 1a04042cd778..000000000000
--- a/test/cmdlineTests/model_checker_print_query_all/err
+++ /dev/null
@@ -1,165 +0,0 @@
-Info: CHC: Requested query:
-(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-
-
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-
-Info: BMC: Requested query:
-(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_5_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_4| () Int)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-
-
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_all/input.sol b/test/cmdlineTests/model_checker_print_query_all/input.sol
deleted file mode 100644
index eb4cd572ae22..000000000000
--- a/test/cmdlineTests/model_checker_print_query_all/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		assert(x == 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/args b/test/cmdlineTests/model_checker_print_query_bmc/args
deleted file mode 100644
index d13bdc43b3b3..000000000000
--- a/test/cmdlineTests/model_checker_print_query_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-print-query --model-checker-solvers smtlib2
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/err b/test/cmdlineTests/model_checker_print_query_bmc/err
deleted file mode 100644
index 1a59f87b0d95..000000000000
--- a/test/cmdlineTests/model_checker_print_query_bmc/err
+++ /dev/null
@@ -1,32 +0,0 @@
-Info: BMC: Requested query:
-(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-
-
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/input.sol b/test/cmdlineTests/model_checker_print_query_bmc/input.sol
deleted file mode 100644
index eb4cd572ae22..000000000000
--- a/test/cmdlineTests/model_checker_print_query_bmc/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		assert(x == 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_print_query_chc/args b/test/cmdlineTests/model_checker_print_query_chc/args
deleted file mode 100644
index 752709efbb5c..000000000000
--- a/test/cmdlineTests/model_checker_print_query_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-print-query --model-checker-solvers smtlib2 --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_print_query_chc/err b/test/cmdlineTests/model_checker_print_query_chc/err
deleted file mode 100644
index 1dd7f0c98828..000000000000
--- a/test/cmdlineTests/model_checker_print_query_chc/err
+++ /dev/null
@@ -1,129 +0,0 @@
-Info: CHC: Requested query:
-(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-
-
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_chc/input.sol b/test/cmdlineTests/model_checker_print_query_chc/input.sol
deleted file mode 100644
index eb4cd572ae22..000000000000
--- a/test/cmdlineTests/model_checker_print_query_chc/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		assert(x == 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args
deleted file mode 100644
index 12b7c324584b..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-print-query --model-checker-solvers z3
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
deleted file mode 100644
index 1e2296446199..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol
deleted file mode 100644
index eb4cd572ae22..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		assert(x == 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args
deleted file mode 100644
index e3a8c32d4716..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-print-query --model-checker-solvers z3
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
deleted file mode 100644
index 1e2296446199..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol
deleted file mode 100644
index eb4cd572ae22..000000000000
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		assert(x == 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/args b/test/cmdlineTests/model_checker_print_query_superflous_solver/args
deleted file mode 100644
index 64e5d88728ea..000000000000
--- a/test/cmdlineTests/model_checker_print_query_superflous_solver/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-print-query --model-checker-solvers z3,smtlib2
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/err b/test/cmdlineTests/model_checker_print_query_superflous_solver/err
deleted file mode 100644
index 1e2296446199..000000000000
--- a/test/cmdlineTests/model_checker_print_query_superflous_solver/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/exit b/test/cmdlineTests/model_checker_print_query_superflous_solver/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_print_query_superflous_solver/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol b/test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol
deleted file mode 100644
index eb4cd572ae22..000000000000
--- a/test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		assert(x == 0);
-	}
-}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err
deleted file mode 100644
index b896b21bc7f9..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err
+++ /dev/null
@@ -1,7 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_show_proved_safe_default_all_engines/input.sol:4:5:
-  |
-4 |     function f(uint8 x) public {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol
deleted file mode 100644
index ea7397027786..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f(uint8 x) public {
-        assert(x >= 0);
-        assert(x < 1000);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args
deleted file mode 100644
index 549f20236336..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err
deleted file mode 100644
index f4a2d33e053b..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err
+++ /dev/null
@@ -1,7 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_show_proved_safe_default_bmc/input.sol:4:5:
-  |
-4 |     function f(uint8 x) public {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol
deleted file mode 100644
index ea7397027786..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f(uint8 x) public {
-        assert(x >= 0);
-        assert(x < 1000);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/args b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/args
deleted file mode 100644
index 7458a47d35b9..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/err b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/err
deleted file mode 100644
index ab73c6bf56cd..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/err
+++ /dev/null
@@ -1,7 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_show_proved_safe_default_chc/input.sol:4:5:
-  |
-4 |     function f(uint8 x) public {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol
deleted file mode 100644
index ea7397027786..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f(uint8 x) public {
-        assert(x >= 0);
-        assert(x < 1000);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args
deleted file mode 100644
index ea8cde3e6f70..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-show-proved-safe
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err
deleted file mode 100644
index 297eb497a34d..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err
+++ /dev/null
@@ -1,17 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_show_proved_safe_true_all_engines/input.sol:4:5:
-  |
-4 |     function f(uint8 x) public {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Info: CHC: Assertion violation check is safe!
- --> model_checker_show_proved_safe_true_all_engines/input.sol:5:9:
-  |
-5 |         assert(x >= 0);
-  |         ^^^^^^^^^^^^^^
-
-Info: CHC: Assertion violation check is safe!
- --> model_checker_show_proved_safe_true_all_engines/input.sol:6:9:
-  |
-6 |         assert(x < 1000);
-  |         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol
deleted file mode 100644
index ea7397027786..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f(uint8 x) public {
-        assert(x >= 0);
-        assert(x < 1000);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args
deleted file mode 100644
index 83385f6ba859..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-show-proved-safe
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err
deleted file mode 100644
index bcec557f61ae..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err
+++ /dev/null
@@ -1,17 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_show_proved_safe_true_bmc/input.sol:4:5:
-  |
-4 |     function f(uint8 x) public {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Info: BMC: Assertion violation check is safe!
- --> model_checker_show_proved_safe_true_bmc/input.sol:5:9:
-  |
-5 |         assert(x >= 0);
-  |         ^^^^^^^^^^^^^^
-
-Info: BMC: Assertion violation check is safe!
- --> model_checker_show_proved_safe_true_bmc/input.sol:6:9:
-  |
-6 |         assert(x < 1000);
-  |         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol
deleted file mode 100644
index ea7397027786..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f(uint8 x) public {
-        assert(x >= 0);
-        assert(x < 1000);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/args b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/args
deleted file mode 100644
index b49ef31bc5b9..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-show-proved-safe
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/err b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/err
deleted file mode 100644
index fc14f494676f..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/err
+++ /dev/null
@@ -1,17 +0,0 @@
-Warning: Function state mutability can be restricted to pure
- --> model_checker_show_proved_safe_true_chc/input.sol:4:5:
-  |
-4 |     function f(uint8 x) public {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Info: CHC: Assertion violation check is safe!
- --> model_checker_show_proved_safe_true_chc/input.sol:5:9:
-  |
-5 |         assert(x >= 0);
-  |         ^^^^^^^^^^^^^^
-
-Info: CHC: Assertion violation check is safe!
- --> model_checker_show_proved_safe_true_chc/input.sol:6:9:
-  |
-6 |         assert(x < 1000);
-  |         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol
deleted file mode 100644
index ea7397027786..000000000000
--- a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f(uint8 x) public {
-        assert(x >= 0);
-        assert(x < 1000);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_all_engines/args b/test/cmdlineTests/model_checker_show_unproved_default_all_engines/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_all_engines/err b/test/cmdlineTests/model_checker_show_unproved_default_all_engines/err
deleted file mode 100644
index 45c38ef3594a..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_all_engines/err
+++ /dev/null
@@ -1,3 +0,0 @@
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_all_engines/input.sol b/test/cmdlineTests/model_checker_show_unproved_default_all_engines/input.sol
deleted file mode 100644
index 567c9cd2bcc2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_all_engines/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_bmc/args b/test/cmdlineTests/model_checker_show_unproved_default_bmc/args
deleted file mode 100644
index 549f20236336..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_bmc/err b/test/cmdlineTests/model_checker_show_unproved_default_bmc/err
deleted file mode 100644
index f8d0af2f4f72..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_bmc/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_bmc/input.sol b/test/cmdlineTests/model_checker_show_unproved_default_bmc/input.sol
deleted file mode 100644
index 567c9cd2bcc2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_bmc/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_chc/args b/test/cmdlineTests/model_checker_show_unproved_default_chc/args
deleted file mode 100644
index 7458a47d35b9..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_chc/err b/test/cmdlineTests/model_checker_show_unproved_default_chc/err
deleted file mode 100644
index 77083185f9c8..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_chc/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/cmdlineTests/model_checker_show_unproved_default_chc/input.sol b/test/cmdlineTests/model_checker_show_unproved_default_chc/input.sol
deleted file mode 100644
index 567c9cd2bcc2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_default_chc/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_all_engines/args b/test/cmdlineTests/model_checker_show_unproved_true_all_engines/args
deleted file mode 100644
index fbc67f1eefb0..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-show-unproved
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_all_engines/err b/test/cmdlineTests/model_checker_show_unproved_true_all_engines/err
deleted file mode 100644
index 83864075dd74..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_all_engines/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation might happen here.
-  --> model_checker_show_unproved_true_all_engines/input.sol:10:9:
-   |
-10 |         assert(s.x > 0);
-   |         ^^^^^^^^^^^^^^^
-
-Warning: BMC: Assertion violation might happen here.
-  --> model_checker_show_unproved_true_all_engines/input.sol:10:9:
-   |
-10 |         assert(s.x > 0);
-   |         ^^^^^^^^^^^^^^^
-Note:
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_all_engines/input.sol b/test/cmdlineTests/model_checker_show_unproved_true_all_engines/input.sol
deleted file mode 100644
index 567c9cd2bcc2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_all_engines/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_bmc/args b/test/cmdlineTests/model_checker_show_unproved_true_bmc/args
deleted file mode 100644
index 319afff3ff85..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-show-unproved
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_bmc/err b/test/cmdlineTests/model_checker_show_unproved_true_bmc/err
deleted file mode 100644
index 84ada7873b07..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_bmc/err
+++ /dev/null
@@ -1,6 +0,0 @@
-Warning: BMC: Assertion violation might happen here.
-  --> model_checker_show_unproved_true_bmc/input.sol:10:9:
-   |
-10 |         assert(s.x > 0);
-   |         ^^^^^^^^^^^^^^^
-Note:
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_bmc/input.sol b/test/cmdlineTests/model_checker_show_unproved_true_bmc/input.sol
deleted file mode 100644
index 567c9cd2bcc2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_bmc/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_chc/args b/test/cmdlineTests/model_checker_show_unproved_true_chc/args
deleted file mode 100644
index cf2a733722ea..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-show-unproved
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_chc/err b/test/cmdlineTests/model_checker_show_unproved_true_chc/err
deleted file mode 100644
index 8274f4b463f2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_chc/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: CHC: Assertion violation might happen here.
-  --> model_checker_show_unproved_true_chc/input.sol:10:9:
-   |
-10 |         assert(s.x > 0);
-   |         ^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unproved_true_chc/input.sol b/test/cmdlineTests/model_checker_show_unproved_true_chc/input.sol
deleted file mode 100644
index 567c9cd2bcc2..000000000000
--- a/test/cmdlineTests/model_checker_show_unproved_true_chc/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err
deleted file mode 100644
index 578846b36228..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol
deleted file mode 100644
index 72a8049c1722..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() external pure {
-        assembly {}
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/args b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/args
deleted file mode 100644
index 549f20236336..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/err b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/err
deleted file mode 100644
index 578846b36228..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol
deleted file mode 100644
index 72a8049c1722..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() external pure {
-        assembly {}
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_chc/args b/test/cmdlineTests/model_checker_show_unsupported_default_chc/args
deleted file mode 100644
index 7458a47d35b9..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_chc/err b/test/cmdlineTests/model_checker_show_unsupported_default_chc/err
deleted file mode 100644
index 578846b36228..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_chc/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol
deleted file mode 100644
index 72a8049c1722..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() external pure {
-        assembly {}
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args
deleted file mode 100644
index c0e876742bec..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-show-unsupported
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err
deleted file mode 100644
index 53c664ffc764..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
- --> model_checker_show_unsupported_true_all_engines/input.sol:5:9:
-  |
-5 |         assembly {}
-  |         ^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol
deleted file mode 100644
index 72a8049c1722..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() external pure {
-        assembly {}
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/args b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/args
deleted file mode 100644
index ab152ae20833..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-show-unsupported
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/err b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/err
deleted file mode 100644
index 013a7b0f118c..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
- --> model_checker_show_unsupported_true_bmc/input.sol:5:9:
-  |
-5 |         assembly {}
-  |         ^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol
deleted file mode 100644
index 72a8049c1722..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() external pure {
-        assembly {}
-    }
-}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_chc/args b/test/cmdlineTests/model_checker_show_unsupported_true_chc/args
deleted file mode 100644
index 16821838d75b..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-show-unsupported
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_chc/err b/test/cmdlineTests/model_checker_show_unsupported_true_chc/err
deleted file mode 100644
index 8dad0cc65bce..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_chc/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
- --> model_checker_show_unsupported_true_chc/input.sol:5:9:
-  |
-5 |         assembly {}
-  |         ^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol
deleted file mode 100644
index 72a8049c1722..000000000000
--- a/test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() external pure {
-        assembly {}
-    }
-}
diff --git a/test/cmdlineTests/model_checker_solvers_smtlib2/args b/test/cmdlineTests/model_checker_solvers_smtlib2/args
deleted file mode 100644
index 3d90e9161e1a..000000000000
--- a/test/cmdlineTests/model_checker_solvers_smtlib2/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-solvers smtlib2
diff --git a/test/cmdlineTests/model_checker_solvers_smtlib2/err b/test/cmdlineTests/model_checker_solvers_smtlib2/err
deleted file mode 100644
index 3aa9893489bc..000000000000
--- a/test/cmdlineTests/model_checker_solvers_smtlib2/err
+++ /dev/null
@@ -1,7 +0,0 @@
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_solvers_smtlib2/input.sol b/test/cmdlineTests/model_checker_solvers_smtlib2/input.sol
deleted file mode 100644
index 7d05ef6e5f3e..000000000000
--- a/test/cmdlineTests/model_checker_solvers_smtlib2/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_solvers_wrong/args b/test/cmdlineTests/model_checker_solvers_wrong/args
deleted file mode 100644
index 542502ee3c19..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-solvers ultraSolver
diff --git a/test/cmdlineTests/model_checker_solvers_wrong/err b/test/cmdlineTests/model_checker_solvers_wrong/err
deleted file mode 100644
index 3493055ac832..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-solvers: ultraSolver
diff --git a/test/cmdlineTests/model_checker_solvers_wrong/exit b/test/cmdlineTests/model_checker_solvers_wrong/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_solvers_wrong/input.sol b/test/cmdlineTests/model_checker_solvers_wrong/input.sol
deleted file mode 100644
index 7d05ef6e5f3e..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_solvers_wrong2/args b/test/cmdlineTests/model_checker_solvers_wrong2/args
deleted file mode 100644
index a20c99800794..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong2/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-solvers z3, smtlib2
diff --git a/test/cmdlineTests/model_checker_solvers_wrong2/err b/test/cmdlineTests/model_checker_solvers_wrong2/err
deleted file mode 100644
index a3f121085388..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong2/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: "smtlib2" is not found.
diff --git a/test/cmdlineTests/model_checker_solvers_wrong2/exit b/test/cmdlineTests/model_checker_solvers_wrong2/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong2/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_solvers_wrong2/input.sol b/test/cmdlineTests/model_checker_solvers_wrong2/input.sol
deleted file mode 100644
index 7d05ef6e5f3e..000000000000
--- a/test/cmdlineTests/model_checker_solvers_wrong2/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_solvers_z3/args b/test/cmdlineTests/model_checker_solvers_z3/args
deleted file mode 100644
index ff27293ea572..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-solvers z3
diff --git a/test/cmdlineTests/model_checker_solvers_z3/err b/test/cmdlineTests/model_checker_solvers_z3/err
deleted file mode 100644
index 67349d8e17fe..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-test.constructor()
-test.f(0)
- --> model_checker_solvers_z3/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_solvers_z3/input.sol b/test/cmdlineTests/model_checker_solvers_z3/input.sol
deleted file mode 100644
index 7d05ef6e5f3e..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_solvers_z3_implicit/args b/test/cmdlineTests/model_checker_solvers_z3_implicit/args
deleted file mode 100644
index 5aeb1490ed43..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3_implicit/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_solvers_z3_implicit/err b/test/cmdlineTests/model_checker_solvers_z3_implicit/err
deleted file mode 100644
index 98d61828d9c1..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3_implicit/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-test.constructor()
-test.f(0)
- --> model_checker_solvers_z3_implicit/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_solvers_z3_implicit/input.sol b/test/cmdlineTests/model_checker_solvers_z3_implicit/input.sol
deleted file mode 100644
index 7d05ef6e5f3e..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3_implicit/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_solvers_z3_smtlib2/args b/test/cmdlineTests/model_checker_solvers_z3_smtlib2/args
deleted file mode 100644
index 889888874169..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3_smtlib2/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-solvers z3,smtlib2
diff --git a/test/cmdlineTests/model_checker_solvers_z3_smtlib2/err b/test/cmdlineTests/model_checker_solvers_z3_smtlib2/err
deleted file mode 100644
index 5699afcdeb3a..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3_smtlib2/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-test.constructor()
-test.f(0)
- --> model_checker_solvers_z3_smtlib2/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_solvers_z3_smtlib2/input.sol b/test/cmdlineTests/model_checker_solvers_z3_smtlib2/input.sol
deleted file mode 100644
index 7d05ef6e5f3e..000000000000
--- a/test/cmdlineTests/model_checker_solvers_z3_smtlib2/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_all_all_engines/args b/test/cmdlineTests/model_checker_targets_all_all_engines/args
deleted file mode 100644
index aac8a1a2761b..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-targets all
diff --git a/test/cmdlineTests/model_checker_targets_all_all_engines/err b/test/cmdlineTests/model_checker_targets_all_all_engines/err
deleted file mode 100644
index cc8a8ea33d1c..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_all_engines/err
+++ /dev/null
@@ -1,108 +0,0 @@
-Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> model_checker_targets_all_all_engines/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-
-Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> model_checker_targets_all_all_engines/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-
-Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
- --> model_checker_targets_all_all_engines/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_all_all_engines/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-
-Warning: CHC: Empty array "pop" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_all_all_engines/input.sol:12:3:
-   |
-12 | 		arr.pop();
-   | 		^^^^^^^^^
-
-Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_all_all_engines/input.sol:13:3:
-   |
-13 | 		arr[x];
-   | 		^^^^^^
-
-Warning: BMC: Condition is always true.
- --> model_checker_targets_all_all_engines/input.sol:6:11:
-  |
-6 | 		require(x >= 0);
-  | 		        ^^^^^^
-Note: Callstack:
-
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_all_all_engines/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_all_all_engines/input.sol b/test/cmdlineTests/model_checker_targets_all_all_engines/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_all_engines/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_all_bmc/args b/test/cmdlineTests/model_checker_targets_all_bmc/args
deleted file mode 100644
index 19e3de4f65a6..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets all
diff --git a/test/cmdlineTests/model_checker_targets_all_bmc/err b/test/cmdlineTests/model_checker_targets_all_bmc/err
deleted file mode 100644
index 27a51a67bd63..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_bmc/err
+++ /dev/null
@@ -1,69 +0,0 @@
-Warning: BMC: Condition is always true.
- --> model_checker_targets_all_bmc/input.sol:6:11:
-  |
-6 | 		require(x >= 0);
-  | 		        ^^^^^^
-Note: Callstack:
-
-Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> model_checker_targets_all_bmc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> model_checker_targets_all_bmc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Division by zero happens here.
- --> model_checker_targets_all_bmc/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-Note: Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_all_bmc/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Assertion violation happens here.
-  --> model_checker_targets_all_bmc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_all_bmc/input.sol b/test/cmdlineTests/model_checker_targets_all_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_all_chc/args b/test/cmdlineTests/model_checker_targets_all_chc/args
deleted file mode 100644
index f1b07923f586..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets all
diff --git a/test/cmdlineTests/model_checker_targets_all_chc/err b/test/cmdlineTests/model_checker_targets_all_chc/err
deleted file mode 100644
index d0404ecfb6b9..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_chc/err
+++ /dev/null
@@ -1,89 +0,0 @@
-Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> model_checker_targets_all_chc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-
-Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> model_checker_targets_all_chc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-
-Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
- --> model_checker_targets_all_chc/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_all_chc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-
-Warning: CHC: Empty array "pop" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_all_chc/input.sol:12:3:
-   |
-12 | 		arr.pop();
-   | 		^^^^^^^^^
-
-Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_all_chc/input.sol:13:3:
-   |
-13 | 		arr[x];
-   | 		^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_all_chc/input.sol b/test/cmdlineTests/model_checker_targets_all_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_all_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_assert_bmc/args b/test/cmdlineTests/model_checker_targets_assert_bmc/args
deleted file mode 100644
index c2feb5423a4e..000000000000
--- a/test/cmdlineTests/model_checker_targets_assert_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets assert
diff --git a/test/cmdlineTests/model_checker_targets_assert_bmc/err b/test/cmdlineTests/model_checker_targets_assert_bmc/err
deleted file mode 100644
index 90486bf792d9..000000000000
--- a/test/cmdlineTests/model_checker_targets_assert_bmc/err
+++ /dev/null
@@ -1,11 +0,0 @@
-Warning: BMC: Assertion violation happens here.
-  --> model_checker_targets_assert_bmc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_assert_bmc/input.sol b/test/cmdlineTests/model_checker_targets_assert_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_assert_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_assert_chc/args b/test/cmdlineTests/model_checker_targets_assert_chc/args
deleted file mode 100644
index 2378362b6dfe..000000000000
--- a/test/cmdlineTests/model_checker_targets_assert_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets assert
diff --git a/test/cmdlineTests/model_checker_targets_assert_chc/err b/test/cmdlineTests/model_checker_targets_assert_chc/err
deleted file mode 100644
index 1bf48bfa9abb..000000000000
--- a/test/cmdlineTests/model_checker_targets_assert_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_assert_chc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_assert_chc/input.sol b/test/cmdlineTests/model_checker_targets_assert_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_assert_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_balance_bmc/args b/test/cmdlineTests/model_checker_targets_balance_bmc/args
deleted file mode 100644
index 8ac17d26042f..000000000000
--- a/test/cmdlineTests/model_checker_targets_balance_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets balance
diff --git a/test/cmdlineTests/model_checker_targets_balance_bmc/err b/test/cmdlineTests/model_checker_targets_balance_bmc/err
deleted file mode 100644
index 39a8aac56df7..000000000000
--- a/test/cmdlineTests/model_checker_targets_balance_bmc/err
+++ /dev/null
@@ -1,11 +0,0 @@
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_balance_bmc/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_balance_bmc/input.sol b/test/cmdlineTests/model_checker_targets_balance_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_balance_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_balance_chc/args b/test/cmdlineTests/model_checker_targets_balance_chc/args
deleted file mode 100644
index e96d1ee9b24b..000000000000
--- a/test/cmdlineTests/model_checker_targets_balance_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets balance
diff --git a/test/cmdlineTests/model_checker_targets_balance_chc/input.sol b/test/cmdlineTests/model_checker_targets_balance_chc/input.sol
deleted file mode 100644
index 4b521b3deba1..000000000000
--- a/test/cmdlineTests/model_checker_targets_balance_chc/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
diff --git a/test/cmdlineTests/model_checker_targets_constant_condition_bmc/args b/test/cmdlineTests/model_checker_targets_constant_condition_bmc/args
deleted file mode 100644
index 6946dfa32dc1..000000000000
--- a/test/cmdlineTests/model_checker_targets_constant_condition_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets constantCondition
diff --git a/test/cmdlineTests/model_checker_targets_constant_condition_bmc/err b/test/cmdlineTests/model_checker_targets_constant_condition_bmc/err
deleted file mode 100644
index 6a376dd7ea5b..000000000000
--- a/test/cmdlineTests/model_checker_targets_constant_condition_bmc/err
+++ /dev/null
@@ -1,6 +0,0 @@
-Warning: BMC: Condition is always true.
- --> model_checker_targets_constant_condition_bmc/input.sol:6:11:
-  |
-6 | 		require(x >= 0);
-  | 		        ^^^^^^
-Note: Callstack:
diff --git a/test/cmdlineTests/model_checker_targets_constant_condition_bmc/input.sol b/test/cmdlineTests/model_checker_targets_constant_condition_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_constant_condition_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_constant_condition_chc/args b/test/cmdlineTests/model_checker_targets_constant_condition_chc/args
deleted file mode 100644
index 5e3385d2604b..000000000000
--- a/test/cmdlineTests/model_checker_targets_constant_condition_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets constantCondition
diff --git a/test/cmdlineTests/model_checker_targets_constant_condition_chc/input.sol b/test/cmdlineTests/model_checker_targets_constant_condition_chc/input.sol
deleted file mode 100644
index 4b521b3deba1..000000000000
--- a/test/cmdlineTests/model_checker_targets_constant_condition_chc/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
diff --git a/test/cmdlineTests/model_checker_targets_default_all_engines/args b/test/cmdlineTests/model_checker_targets_default_all_engines/args
deleted file mode 100644
index 950e7de30634..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_all_engines/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-targets default
diff --git a/test/cmdlineTests/model_checker_targets_default_all_engines/err b/test/cmdlineTests/model_checker_targets_default_all_engines/err
deleted file mode 100644
index c1fe2f5b3e59..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_all_engines/err
+++ /dev/null
@@ -1,78 +0,0 @@
-Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
- --> model_checker_targets_default_all_engines/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_default_all_engines/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-
-Warning: CHC: Empty array "pop" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_default_all_engines/input.sol:12:3:
-   |
-12 | 		arr.pop();
-   | 		^^^^^^^^^
-
-Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_default_all_engines/input.sol:13:3:
-   |
-13 | 		arr[x];
-   | 		^^^^^^
-
-Warning: BMC: Condition is always true.
- --> model_checker_targets_default_all_engines/input.sol:6:11:
-  |
-6 | 		require(x >= 0);
-  | 		        ^^^^^^
-Note: Callstack:
-
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_default_all_engines/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_default_all_engines/input.sol b/test/cmdlineTests/model_checker_targets_default_all_engines/input.sol
deleted file mode 100644
index ddeb1d125363..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_all_engines/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_default_bmc/args b/test/cmdlineTests/model_checker_targets_default_bmc/args
deleted file mode 100644
index a979c9f87289..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets default
diff --git a/test/cmdlineTests/model_checker_targets_default_bmc/err b/test/cmdlineTests/model_checker_targets_default_bmc/err
deleted file mode 100644
index 1122be36b061..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_bmc/err
+++ /dev/null
@@ -1,43 +0,0 @@
-Warning: BMC: Condition is always true.
- --> model_checker_targets_default_bmc/input.sol:6:11:
-  |
-6 | 		require(x >= 0);
-  | 		        ^^^^^^
-Note: Callstack:
-
-Warning: BMC: Division by zero happens here.
- --> model_checker_targets_default_bmc/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-Note: Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_default_bmc/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Assertion violation happens here.
-  --> model_checker_targets_default_bmc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_default_bmc/input.sol b/test/cmdlineTests/model_checker_targets_default_bmc/input.sol
deleted file mode 100644
index ddeb1d125363..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_default_chc/args b/test/cmdlineTests/model_checker_targets_default_chc/args
deleted file mode 100644
index e715594f88d7..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets default
diff --git a/test/cmdlineTests/model_checker_targets_default_chc/err b/test/cmdlineTests/model_checker_targets_default_chc/err
deleted file mode 100644
index bd2aa0b4de1d..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_chc/err
+++ /dev/null
@@ -1,59 +0,0 @@
-Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
- --> model_checker_targets_default_chc/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_default_chc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-
-Warning: CHC: Empty array "pop" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_default_chc/input.sol:12:3:
-   |
-12 | 		arr.pop();
-   | 		^^^^^^^^^
-
-Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_default_chc/input.sol:13:3:
-   |
-13 | 		arr[x];
-   | 		^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_default_chc/input.sol b/test/cmdlineTests/model_checker_targets_default_chc/input.sol
deleted file mode 100644
index ddeb1d125363..000000000000
--- a/test/cmdlineTests/model_checker_targets_default_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/args b/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/args
deleted file mode 100644
index 30959921a66e..000000000000
--- a/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets divByZero
diff --git a/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/err b/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/err
deleted file mode 100644
index bcf2c0c83a18..000000000000
--- a/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: BMC: Division by zero happens here.
- --> model_checker_targets_div_by_zero_bmc/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
-Note: Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/input.sol b/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_div_by_zero_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_div_by_zero_chc/args b/test/cmdlineTests/model_checker_targets_div_by_zero_chc/args
deleted file mode 100644
index b1fe70fc8b63..000000000000
--- a/test/cmdlineTests/model_checker_targets_div_by_zero_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets divByZero
diff --git a/test/cmdlineTests/model_checker_targets_div_by_zero_chc/err b/test/cmdlineTests/model_checker_targets_div_by_zero_chc/err
deleted file mode 100644
index 3156dd90bd3f..000000000000
--- a/test/cmdlineTests/model_checker_targets_div_by_zero_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
- --> model_checker_targets_div_by_zero_chc/input.sol:9:3:
-  |
-9 | 		2 / x;
-  | 		^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_div_by_zero_chc/input.sol b/test/cmdlineTests/model_checker_targets_div_by_zero_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_div_by_zero_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_error/args b/test/cmdlineTests/model_checker_targets_error/args
deleted file mode 100644
index 19eb0536355d..000000000000
--- a/test/cmdlineTests/model_checker_targets_error/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-targets aaa,bbb
diff --git a/test/cmdlineTests/model_checker_targets_error/err b/test/cmdlineTests/model_checker_targets_error/err
deleted file mode 100644
index 63fa000a7d4d..000000000000
--- a/test/cmdlineTests/model_checker_targets_error/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid option for --model-checker-targets: aaa,bbb
diff --git a/test/cmdlineTests/model_checker_targets_error/exit b/test/cmdlineTests/model_checker_targets_error/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/model_checker_targets_error/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/model_checker_targets_error/input.sol b/test/cmdlineTests/model_checker_targets_error/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_error/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_out_of_bounds_bmc/args b/test/cmdlineTests/model_checker_targets_out_of_bounds_bmc/args
deleted file mode 100644
index 328962c007ca..000000000000
--- a/test/cmdlineTests/model_checker_targets_out_of_bounds_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets outOfBounds
diff --git a/test/cmdlineTests/model_checker_targets_out_of_bounds_bmc/input.sol b/test/cmdlineTests/model_checker_targets_out_of_bounds_bmc/input.sol
deleted file mode 100644
index 4b521b3deba1..000000000000
--- a/test/cmdlineTests/model_checker_targets_out_of_bounds_bmc/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
diff --git a/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/args b/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/args
deleted file mode 100644
index 77822911332b..000000000000
--- a/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets outOfBounds
diff --git a/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/err b/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/err
deleted file mode 100644
index b4426a80e351..000000000000
--- a/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_out_of_bounds_chc/input.sol:13:3:
-   |
-13 | 		arr[x];
-   | 		^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/input.sol b/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_out_of_bounds_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_overflow_bmc/args b/test/cmdlineTests/model_checker_targets_overflow_bmc/args
deleted file mode 100644
index 83c6c2bb5e8f..000000000000
--- a/test/cmdlineTests/model_checker_targets_overflow_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets overflow
diff --git a/test/cmdlineTests/model_checker_targets_overflow_bmc/err b/test/cmdlineTests/model_checker_targets_overflow_bmc/err
deleted file mode 100644
index f2f475c304e8..000000000000
--- a/test/cmdlineTests/model_checker_targets_overflow_bmc/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> model_checker_targets_overflow_bmc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_overflow_bmc/input.sol b/test/cmdlineTests/model_checker_targets_overflow_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_overflow_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_overflow_chc/args b/test/cmdlineTests/model_checker_targets_overflow_chc/args
deleted file mode 100644
index f7278bf9b64b..000000000000
--- a/test/cmdlineTests/model_checker_targets_overflow_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets overflow
diff --git a/test/cmdlineTests/model_checker_targets_overflow_chc/err b/test/cmdlineTests/model_checker_targets_overflow_chc/err
deleted file mode 100644
index e7f98ff4dc7a..000000000000
--- a/test/cmdlineTests/model_checker_targets_overflow_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> model_checker_targets_overflow_chc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_overflow_chc/input.sol b/test/cmdlineTests/model_checker_targets_overflow_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_overflow_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_pop_empty_bmc/args b/test/cmdlineTests/model_checker_targets_pop_empty_bmc/args
deleted file mode 100644
index 7c749e056733..000000000000
--- a/test/cmdlineTests/model_checker_targets_pop_empty_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets popEmptyArray
diff --git a/test/cmdlineTests/model_checker_targets_pop_empty_bmc/input.sol b/test/cmdlineTests/model_checker_targets_pop_empty_bmc/input.sol
deleted file mode 100644
index 4b521b3deba1..000000000000
--- a/test/cmdlineTests/model_checker_targets_pop_empty_bmc/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract test {
-	uint[] arr;
-	function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-	}
-}
diff --git a/test/cmdlineTests/model_checker_targets_pop_empty_chc/args b/test/cmdlineTests/model_checker_targets_pop_empty_chc/args
deleted file mode 100644
index 6a03fffb4468..000000000000
--- a/test/cmdlineTests/model_checker_targets_pop_empty_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets popEmptyArray
diff --git a/test/cmdlineTests/model_checker_targets_pop_empty_chc/err b/test/cmdlineTests/model_checker_targets_pop_empty_chc/err
deleted file mode 100644
index d3478a700420..000000000000
--- a/test/cmdlineTests/model_checker_targets_pop_empty_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Empty array "pop" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_pop_empty_chc/input.sol:12:3:
-   |
-12 | 		arr.pop();
-   | 		^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_pop_empty_chc/input.sol b/test/cmdlineTests/model_checker_targets_pop_empty_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_pop_empty_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_underflow_bmc/args b/test/cmdlineTests/model_checker_targets_underflow_bmc/args
deleted file mode 100644
index 7a15bcf95810..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets underflow
diff --git a/test/cmdlineTests/model_checker_targets_underflow_bmc/err b/test/cmdlineTests/model_checker_targets_underflow_bmc/err
deleted file mode 100644
index 2162bec3aac9..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_bmc/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> model_checker_targets_underflow_bmc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_underflow_bmc/input.sol b/test/cmdlineTests/model_checker_targets_underflow_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_underflow_chc/args b/test/cmdlineTests/model_checker_targets_underflow_chc/args
deleted file mode 100644
index 39be417ebe32..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets underflow
diff --git a/test/cmdlineTests/model_checker_targets_underflow_chc/err b/test/cmdlineTests/model_checker_targets_underflow_chc/err
deleted file mode 100644
index 448b0e25ca7c..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_chc/err
+++ /dev/null
@@ -1,14 +0,0 @@
-Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> model_checker_targets_underflow_chc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
diff --git a/test/cmdlineTests/model_checker_targets_underflow_chc/input.sol b/test/cmdlineTests/model_checker_targets_underflow_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/args b/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/args
deleted file mode 100644
index 14531cfb7484..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets underflow,overflow,assert
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/err b/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/err
deleted file mode 100644
index 9712b8cb7614..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/err
+++ /dev/null
@@ -1,37 +0,0 @@
-Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> model_checker_targets_underflow_overflow_assert_bmc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> model_checker_targets_underflow_overflow_assert_bmc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Assertion violation happens here.
-  --> model_checker_targets_underflow_overflow_assert_bmc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/input.sol b/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/args b/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/args
deleted file mode 100644
index 4746af88ebd0..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets underflow,overflow,assert
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/err b/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/err
deleted file mode 100644
index a0fbbe61a543..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/err
+++ /dev/null
@@ -1,44 +0,0 @@
-Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> model_checker_targets_underflow_overflow_assert_chc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-
-Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> model_checker_targets_underflow_overflow_assert_chc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> model_checker_targets_underflow_overflow_assert_chc/input.sol:11:3:
-   |
-11 | 		assert(x > 0);
-   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/input.sol b/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_assert_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/args b/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/args
deleted file mode 100644
index 79347251b4b7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-targets underflow,overflow
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/err b/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/err
deleted file mode 100644
index f3675ac5acbe..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/err
+++ /dev/null
@@ -1,25 +0,0 @@
-Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> model_checker_targets_underflow_overflow_bmc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> model_checker_targets_underflow_overflow_bmc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/input.sol b/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_bmc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/args b/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/args
deleted file mode 100644
index 45f9fdc8eb1c..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-targets underflow,overflow
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/err b/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/err
deleted file mode 100644
index 0dcfb1c254a3..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/err
+++ /dev/null
@@ -1,29 +0,0 @@
-Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> model_checker_targets_underflow_overflow_chc/input.sol:7:3:
-  |
-7 | 		--x;
-  | 		^^^
-
-Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> model_checker_targets_underflow_overflow_chc/input.sol:8:3:
-  |
-8 | 		x + type(uint).max;
-  | 		^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/input.sol b/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/input.sol
deleted file mode 100644
index 33b5bfab3ff7..000000000000
--- a/test/cmdlineTests/model_checker_targets_underflow_overflow_chc/input.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	uint[] arr;
-    function f(address payable a, uint x) public {
-		require(x >= 0);
-		--x;
-		x + type(uint).max;
-		2 / x;
-		a.transfer(x);
-		assert(x > 0);
-		arr.pop();
-		arr[x];
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_timeout_all/args b/test/cmdlineTests/model_checker_timeout_all/args
deleted file mode 100644
index aad2104724ae..000000000000
--- a/test/cmdlineTests/model_checker_timeout_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_timeout_all/err b/test/cmdlineTests/model_checker_timeout_all/err
deleted file mode 100644
index 651dc83b88e1..000000000000
--- a/test/cmdlineTests/model_checker_timeout_all/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/cmdlineTests/model_checker_timeout_all/input.sol b/test/cmdlineTests/model_checker_timeout_all/input.sol
deleted file mode 100644
index dfe33fc87620..000000000000
--- a/test/cmdlineTests/model_checker_timeout_all/input.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x, uint y, uint k) public pure {
-		require(k > 0);
-		require(x % k == 0);
-		require(y % k == 0);
-		uint r = mulmod(x, y, k);
-		assert(r % k == 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_timeout_bmc/args b/test/cmdlineTests/model_checker_timeout_bmc/args
deleted file mode 100644
index 6c50b2711409..000000000000
--- a/test/cmdlineTests/model_checker_timeout_bmc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine bmc --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_timeout_bmc/err b/test/cmdlineTests/model_checker_timeout_bmc/err
deleted file mode 100644
index eb20e7eff52d..000000000000
--- a/test/cmdlineTests/model_checker_timeout_bmc/err
+++ /dev/null
@@ -1,3 +0,0 @@
-Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Info: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_timeout_bmc/input.sol b/test/cmdlineTests/model_checker_timeout_bmc/input.sol
deleted file mode 100644
index dfe33fc87620..000000000000
--- a/test/cmdlineTests/model_checker_timeout_bmc/input.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x, uint y, uint k) public pure {
-		require(k > 0);
-		require(x % k == 0);
-		require(y % k == 0);
-		uint r = mulmod(x, y, k);
-		assert(r % k == 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_timeout_chc/args b/test/cmdlineTests/model_checker_timeout_chc/args
deleted file mode 100644
index 8e3a1efb7e02..000000000000
--- a/test/cmdlineTests/model_checker_timeout_chc/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine chc --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_timeout_chc/err b/test/cmdlineTests/model_checker_timeout_chc/err
deleted file mode 100644
index f6ca5c2af96f..000000000000
--- a/test/cmdlineTests/model_checker_timeout_chc/err
+++ /dev/null
@@ -1,3 +0,0 @@
-Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_timeout_chc/input.sol b/test/cmdlineTests/model_checker_timeout_chc/input.sol
deleted file mode 100644
index dfe33fc87620..000000000000
--- a/test/cmdlineTests/model_checker_timeout_chc/input.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x, uint y, uint k) public pure {
-		require(k > 0);
-		require(x % k == 0);
-		require(y % k == 0);
-		uint r = mulmod(x, y, k);
-		assert(r % k == 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/name_simplifier/args b/test/cmdlineTests/name_simplifier/args
deleted file mode 100644
index 2ce860510241..000000000000
--- a/test/cmdlineTests/name_simplifier/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --ir-optimized
diff --git a/test/cmdlineTests/name_simplifier/input.sol b/test/cmdlineTests/name_simplifier/input.sol
deleted file mode 100644
index 39034e27564f..000000000000
--- a/test/cmdlineTests/name_simplifier/input.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-// The point of this test is to check that the
-// AST IDs are removed from the optimized IR
-// so that they do not have a big effect on the
-// optimizer if it has a bug that makes it
-// depen on the actual identifiers.
-
-struct S { uint x; }
-struct T { uint[2] y; }
-
-contract C {
-	S[2] values;
-	T t;
-
-	function sumArray(S[] memory _s) public returns (uint, string memory) {
-		values[0].x = _s[0].x;
-		t.y[0] = _s[1].x;
-		return (t.y[0], "longstringlongstringlongstringlongstringlongstringlongstringlongstringlongstringlongstringlongstring");
-	}
-}
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
deleted file mode 100644
index ed4c6e5c02e9..000000000000
--- a/test/cmdlineTests/name_simplifier/output
+++ /dev/null
@@ -1,125 +0,0 @@
-Optimized IR:
-/// @use-src 0:"name_simplifier/input.sol"
-object "C_59" {
-    code {
-        {
-            /// @src 0:346:625  "contract C {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_59_deployed")
-            codecopy(_1, dataoffset("C_59_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"name_simplifier/input.sol"
-    object "C_59_deployed" {
-        code {
-            {
-                /// @src 0:346:625  "contract C {..."
-                let _1 := memoryguard(0x80)
-                let _2 := 4
-                if iszero(lt(calldatasize(), _2))
-                {
-                    if eq(0xf8eddcc6, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        let _3 := 32
-                        if slt(add(calldatasize(), not(3)), _3) { revert(0, 0) }
-                        let offset := calldataload(_2)
-                        let _4 := 0xffffffffffffffff
-                        if gt(offset, _4) { revert(0, 0) }
-                        if iszero(slt(add(offset, 35), calldatasize())) { revert(0, 0) }
-                        let _5 := calldataload(add(_2, offset))
-                        let _6 := 36
-                        if gt(_5, _4)
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x41)
-                            revert(0, _6)
-                        }
-                        let _7 := shl(5, _5)
-                        let _8 := not(31)
-                        let newFreePtr := add(_1, and(add(_7, 63), _8))
-                        if or(gt(newFreePtr, _4), lt(newFreePtr, _1))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x41)
-                            revert(0, _6)
-                        }
-                        let _9 := 64
-                        mstore(_9, newFreePtr)
-                        let dst := _1
-                        mstore(_1, _5)
-                        dst := add(_1, _3)
-                        let dst_1 := dst
-                        let srcEnd := add(add(offset, _7), _6)
-                        if gt(srcEnd, calldatasize()) { revert(0, 0) }
-                        let src := add(offset, _6)
-                        for { } lt(src, srcEnd) { src := add(src, _3) }
-                        {
-                            if slt(sub(calldatasize(), src), _3) { revert(0, 0) }
-                            let memPtr := mload(_9)
-                            let newFreePtr_1 := add(memPtr, _3)
-                            if or(gt(newFreePtr_1, _4), lt(newFreePtr_1, memPtr))
-                            {
-                                mstore(0, shl(224, 0x4e487b71))
-                                mstore(_2, 0x41)
-                                revert(0, _6)
-                            }
-                            mstore(_9, newFreePtr_1)
-                            mstore(memPtr, calldataload(src))
-                            mstore(dst, memPtr)
-                            dst := add(dst, _3)
-                        }
-                        if iszero(mload(_1))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x32)
-                            revert(0, _6)
-                        }
-                        sstore(0, mload(/** @src 0:469:474  "_s[0]" */ mload(dst_1)))
-                        /// @src 0:346:625  "contract C {..."
-                        if iszero(lt(/** @src 0:492:493  "1" */ 0x01, /** @src 0:346:625  "contract C {..." */ mload(_1)))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x32)
-                            revert(0, _6)
-                        }
-                        let _10 := mload(/** @src 0:489:494  "_s[1]" */ mload(/** @src 0:346:625  "contract C {..." */ add(_1, _9)))
-                        sstore(0x02, _10)
-                        let memPtr_1 := mload(_9)
-                        let newFreePtr_2 := add(memPtr_1, 160)
-                        if or(gt(newFreePtr_2, _4), lt(newFreePtr_2, memPtr_1))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x41)
-                            revert(0, _6)
-                        }
-                        mstore(_9, newFreePtr_2)
-                        mstore(memPtr_1, 100)
-                        mstore(add(memPtr_1, _3), "longstringlongstringlongstringlo")
-                        mstore(add(memPtr_1, _9), "ngstringlongstringlongstringlong")
-                        let _11 := 96
-                        mstore(add(memPtr_1, 96), "stringlongstringlongstringlongst")
-                        mstore(add(memPtr_1, 128), "ring")
-                        let memPos := mload(_9)
-                        mstore(memPos, _10)
-                        mstore(add(memPos, _3), _9)
-                        let length := mload(memPtr_1)
-                        mstore(add(memPos, _9), length)
-                        let i := 0
-                        for { } lt(i, length) { i := add(i, _3) }
-                        {
-                            mstore(add(add(memPos, i), _11), mload(add(add(memPtr_1, i), _3)))
-                        }
-                        mstore(add(add(memPos, length), 96), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), 96))
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/no_cbor_metadata/args b/test/cmdlineTests/no_cbor_metadata/args
deleted file mode 100644
index 428810db52c1..000000000000
--- a/test/cmdlineTests/no_cbor_metadata/args
+++ /dev/null
@@ -1 +0,0 @@
---no-cbor-metadata --bin --via-ir --optimize
diff --git a/test/cmdlineTests/no_cbor_metadata/input.sol b/test/cmdlineTests/no_cbor_metadata/input.sol
deleted file mode 100644
index 4ed3a2455af8..000000000000
--- a/test/cmdlineTests/no_cbor_metadata/input.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0.0;
-
-// NOTE: The expected output would be the binary with no metadata.
-// The commandline tests would replace bytecode with metadata in it with
-// <BYTECODE REMOVED>
-// Therefore, not having that means success!
-
-contract C {
-}
diff --git a/test/cmdlineTests/no_cbor_metadata/output b/test/cmdlineTests/no_cbor_metadata/output
deleted file mode 100644
index 0328ece3f27c..000000000000
--- a/test/cmdlineTests/no_cbor_metadata/output
+++ /dev/null
@@ -1,4 +0,0 @@
-
-======= no_cbor_metadata/input.sol:C =======
-Binary:
-608080604052346013576003908160188239f35b5f80fdfe5f80fd
diff --git a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/args b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/args
deleted file mode 100644
index eb524931d964..000000000000
--- a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/args
+++ /dev/null
@@ -1 +0,0 @@
---no-cbor-metadata --metadata-hash ipfs
diff --git a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
deleted file mode 100644
index fc5787c56259..000000000000
--- a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Cannot specify a metadata hashing method when --no-cbor-metadata is set.
diff --git a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/exit b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/input.sol b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/input.sol
deleted file mode 100644
index f22a20f189ac..000000000000
--- a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/input.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0.0;
-
-contract Empty {}
-
-contract C {
-    function f() external returns (bytes memory, bytes memory){
-        return (type(Empty).creationCode, type(Empty).runtimeCode);
-    }
-}
diff --git a/test/cmdlineTests/no_contract_combined_json/args b/test/cmdlineTests/no_contract_combined_json/args
deleted file mode 100644
index 8d81d1c0f2b4..000000000000
--- a/test/cmdlineTests/no_contract_combined_json/args
+++ /dev/null
@@ -1 +0,0 @@
---combined-json ast --pretty-json --json-indent 4
\ No newline at end of file
diff --git a/test/cmdlineTests/no_contract_combined_json/input.sol b/test/cmdlineTests/no_contract_combined_json/input.sol
deleted file mode 100644
index b926e9263b96..000000000000
--- a/test/cmdlineTests/no_contract_combined_json/input.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
\ No newline at end of file
diff --git a/test/cmdlineTests/no_contract_combined_json/output b/test/cmdlineTests/no_contract_combined_json/output
deleted file mode 100644
index e0caa6fa1acc..000000000000
--- a/test/cmdlineTests/no_contract_combined_json/output
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "sourceList":
-    [
-        "no_contract_combined_json/input.sol"
-    ],
-    "sources":
-    {
-        "no_contract_combined_json/input.sol":
-        {
-            "AST":
-            {
-                "absolutePath": "no_contract_combined_json/input.sol",
-                "exportedSymbols": {},
-                "id": 2,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            ">=",
-                            "0.0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:22:0"
-                    }
-                ],
-                "src": "36:22:0"
-            },
-            "id": 0
-        }
-    },
-    "version": "<VERSION REMOVED>"
-}
diff --git a/test/cmdlineTests/no_import_callback/args b/test/cmdlineTests/no_import_callback/args
deleted file mode 100644
index e816120d0db6..000000000000
--- a/test/cmdlineTests/no_import_callback/args
+++ /dev/null
@@ -1 +0,0 @@
---no-import-callback no_import_callback/contract_1.sol
diff --git a/test/cmdlineTests/no_import_callback/contract_1.sol b/test/cmdlineTests/no_import_callback/contract_1.sol
deleted file mode 100644
index 36b2470cd3d2..000000000000
--- a/test/cmdlineTests/no_import_callback/contract_1.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-import "contract_2.sol";
diff --git a/test/cmdlineTests/no_import_callback/contract_2.sol b/test/cmdlineTests/no_import_callback/contract_2.sol
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/no_import_callback/err b/test/cmdlineTests/no_import_callback/err
deleted file mode 100644
index 45690e34c8f2..000000000000
--- a/test/cmdlineTests/no_import_callback/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Source "contract_2.sol" not found: No import callback.
- --> no_import_callback/contract_1.sol:4:1:
-  |
-4 | import "contract_2.sol";
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/no_import_callback/exit b/test/cmdlineTests/no_import_callback/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/no_import_callback/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/object_compiler/args b/test/cmdlineTests/object_compiler/args
deleted file mode 100644
index 20fe41eb5b9f..000000000000
--- a/test/cmdlineTests/object_compiler/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize
diff --git a/test/cmdlineTests/object_compiler/input.yul b/test/cmdlineTests/object_compiler/input.yul
deleted file mode 100644
index b0332f5dcecb..000000000000
--- a/test/cmdlineTests/object_compiler/input.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-object "MyContract" {
-  code {
-    // this is the constructor.
-    // store the creator in the first storage slot
-    sstore(0, caller())
-    // now return the runtime code using the special functions
-    datacopy(0, dataoffset("Runtime"), datasize("Runtime"))
-    return(0, datasize("Runtime"))
-  }
-  object "Runtime" {
-    code {
-      // runtime - just return the creator
-      mstore(0, sload(0))
-      return(0, 0x20)
-    }
-  }
-}
diff --git a/test/cmdlineTests/object_compiler/output b/test/cmdlineTests/object_compiler/output
deleted file mode 100644
index 5dd572272a6a..000000000000
--- a/test/cmdlineTests/object_compiler/output
+++ /dev/null
@@ -1,65 +0,0 @@
-
-======= object_compiler/input.yul (EVM) =======
-
-Pretty printed source:
-object "MyContract" {
-    code {
-        {
-            sstore(0, caller())
-            let _1 := datasize("Runtime")
-            datacopy(0, dataoffset("Runtime"), _1)
-            return(0, _1)
-        }
-    }
-    object "Runtime" {
-        code {
-            {
-                mstore(0, sload(0))
-                return(0, 0x20)
-            }
-        }
-    }
-}
-
-
-Binary representation:
-335f55600880600d5f395ff3fe5f545f5260205ff3
-
-Text representation:
-    /* "object_compiler/input.yul":128:136   */
-  caller
-    /* "object_compiler/input.yul":125:126   */
-  0x00
-    /* "object_compiler/input.yul":118:137   */
-  sstore
-    /* "object_compiler/input.yul":240:259   */
-  dataSize(sub_0)
-    /* "object_compiler/input.yul":217:238   */
-  dup1
-  dataOffset(sub_0)
-    /* "object_compiler/input.yul":125:126   */
-  0x00
-    /* "object_compiler/input.yul":205:260   */
-  codecopy
-    /* "object_compiler/input.yul":125:126   */
-  0x00
-    /* "object_compiler/input.yul":265:295   */
-  return
-stop
-
-sub_0: assembly {
-        /* "object_compiler/input.yul":397:398   */
-      0x00
-        /* "object_compiler/input.yul":391:399   */
-      sload
-        /* "object_compiler/input.yul":397:398   */
-      0x00
-        /* "object_compiler/input.yul":381:400   */
-      mstore
-        /* "object_compiler/input.yul":417:421   */
-      0x20
-        /* "object_compiler/input.yul":397:398   */
-      0x00
-        /* "object_compiler/input.yul":407:422   */
-      return
-}
diff --git a/test/cmdlineTests/optimize_full_storage_write/args b/test/cmdlineTests/optimize_full_storage_write/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimize_full_storage_write/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimize_full_storage_write/input.sol b/test/cmdlineTests/optimize_full_storage_write/input.sol
deleted file mode 100644
index 46db5ad3c6c3..000000000000
--- a/test/cmdlineTests/optimize_full_storage_write/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract OptimizeFullSlotWrite {
-	uint64[4] nums;
-	function f() public {
-		nums[0] = 11111;
-		nums[1] = 22222;
-		nums[2] = 33333;
-		nums[3] = 44444;
-	}
-}
diff --git a/test/cmdlineTests/optimize_full_storage_write/output b/test/cmdlineTests/optimize_full_storage_write/output
deleted file mode 100644
index 1a73220308cb..000000000000
--- a/test/cmdlineTests/optimize_full_storage_write/output
+++ /dev/null
@@ -1,64 +0,0 @@
-
-======= optimize_full_storage_write/input.sol:OptimizeFullSlotWrite =======
-EVM assembly:
-    /* "optimize_full_storage_write/input.sol":60:213  contract OptimizeFullSlotWrite {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimize_full_storage_write/input.sol":60:213  contract OptimizeFullSlotWrite {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimize_full_storage_write/input.sol":111:211  function f() public {... */
-    tag_3:
-      tag_4
-        /* "optimize_full_storage_write/input.sol":192:207  nums[3] = 44444 */
-      0xad9c000000000000823500000000000056ce0000000000002b67
-        /* "optimize_full_storage_write/input.sol":135:139  nums */
-      0x00
-        /* "optimize_full_storage_write/input.sol":192:207  nums[3] = 44444 */
-      sstore
-        /* "optimize_full_storage_write/input.sol":111:211  function f() public {... */
-      jump
-    tag_4:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_BlockDeDuplicator/args b/test/cmdlineTests/optimizer_BlockDeDuplicator/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_BlockDeDuplicator/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_BlockDeDuplicator/err b/test/cmdlineTests/optimizer_BlockDeDuplicator/err
deleted file mode 100644
index e29fc4fc3fd7..000000000000
--- a/test/cmdlineTests/optimizer_BlockDeDuplicator/err
+++ /dev/null
@@ -1,11 +0,0 @@
-Warning: Statement has no effect.
- --> optimizer_BlockDeDuplicator/input.sol:7:27:
-  |
-7 |     function f() public { true ? 1 : 3;}
-  |                           ^^^^^^^^^^^^
-
-Warning: Function state mutability can be restricted to pure
- --> optimizer_BlockDeDuplicator/input.sol:7:5:
-  |
-7 |     function f() public { true ? 1 : 3;}
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/optimizer_BlockDeDuplicator/input.sol b/test/cmdlineTests/optimizer_BlockDeDuplicator/input.sol
deleted file mode 100644
index 3f75fa240a8e..000000000000
--- a/test/cmdlineTests/optimizer_BlockDeDuplicator/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function fun_x() public {}
-    function fun_() public {}
-    function f() public { true ? 1 : 3;}
-    function() r = true ? fun_x : f;
-}
diff --git a/test/cmdlineTests/optimizer_BlockDeDuplicator/output b/test/cmdlineTests/optimizer_BlockDeDuplicator/output
deleted file mode 100644
index ddf17bdae9e5..000000000000
--- a/test/cmdlineTests/optimizer_BlockDeDuplicator/output
+++ /dev/null
@@ -1,87 +0,0 @@
-
-======= optimizer_BlockDeDuplicator/input.sol:C =======
-EVM assembly:
-    /* "optimizer_BlockDeDuplicator/input.sol":60:213  contract C {... */
-  mstore(0x40, 0x80)
-    /* "optimizer_BlockDeDuplicator/input.sol":179:210  function() r = true ? fun_x : f */
-  0x00
-  dup1
-  sload
-  not(sub(shl(0x40, 0x01), 0x01))
-  and
-    /* "optimizer_BlockDeDuplicator/input.sol":201:206  fun_x */
-  or(tag_0_7, shl(0x20, tag_2))
-  sub(shl(0x40, 0x01), 0x01)
-    /* "optimizer_BlockDeDuplicator/input.sol":179:210  function() r = true ? fun_x : f */
-  and
-  or
-  swap1
-  sstore
-    /* "optimizer_BlockDeDuplicator/input.sol":60:213  contract C {... */
-  callvalue
-  dup1
-  iszero
-  tag_5
-  jumpi
-  0x00
-  dup1
-  revert
-tag_5:
-  pop
-  jump(tag_6)
-    /* "optimizer_BlockDeDuplicator/input.sol":138:174  function f() public { true ? 1 : 3;} */
-tag_2:
-  jump	// out
-    /* "optimizer_BlockDeDuplicator/input.sol":60:213  contract C {... */
-tag_6:
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_BlockDeDuplicator/input.sol":60:213  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-      dup1
-      0x2e1fb2bc
-      eq
-      tag_3
-      jumpi
-      dup1
-      0x4753a67d
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_BlockDeDuplicator/input.sol":138:174  function f() public { true ? 1 : 3;} */
-    tag_3:
-      stop
-    tag_7:
-      jump	// out
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_array_sload/args b/test/cmdlineTests/optimizer_array_sload/args
deleted file mode 100644
index 2ce860510241..000000000000
--- a/test/cmdlineTests/optimizer_array_sload/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --ir-optimized
diff --git a/test/cmdlineTests/optimizer_array_sload/input.sol b/test/cmdlineTests/optimizer_array_sload/input.sol
deleted file mode 100644
index 94f42219a48b..000000000000
--- a/test/cmdlineTests/optimizer_array_sload/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract Arraysum {
-	uint256[] values;
-
-	function sumArray() public view returns(uint sum) {
-		sum = 0;
-		// The optimizer should read the length of the array only once, because
-		// LoopInvariantCodeMotion can move the `sload` corresponding to the length outside of the
-		// loop.
-		for(uint i = 0; i < values.length; i++)
-			sum += values[i];
-	}
-}
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
deleted file mode 100644
index b32d421d0717..000000000000
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ /dev/null
@@ -1,65 +0,0 @@
-Optimized IR:
-/// @use-src 0:"optimizer_array_sload/input.sol"
-object "Arraysum_34" {
-    code {
-        {
-            /// @src 0:80:429  "contract Arraysum {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("Arraysum_34_deployed")
-            codecopy(_1, dataoffset("Arraysum_34_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"optimizer_array_sload/input.sol"
-    object "Arraysum_34_deployed" {
-        code {
-            {
-                /// @src 0:80:429  "contract Arraysum {..."
-                mstore(64, memoryguard(0x80))
-                let _1 := 4
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x81d73423, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let var_sum := 0
-                        /// @src 0:368:378  "uint i = 0"
-                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ 0
-                        let _2 := sload(0)
-                        /// @src 0:364:423  "for(uint i = 0; i < values.length; i++)..."
-                        for { }
-                        /** @src 0:380:397  "i < values.length" */ lt(var_i, _2)
-                        /// @src 0:368:378  "uint i = 0"
-                        {
-                            /// @src 0:399:402  "i++"
-                            var_i := /** @src 0:80:429  "contract Arraysum {..." */ add(/** @src 0:399:402  "i++" */ var_i, /** @src 0:80:429  "contract Arraysum {..." */ 1)
-                        }
-                        /// @src 0:399:402  "i++"
-                        {
-                            /// @src 0:80:429  "contract Arraysum {..."
-                            mstore(0, 0)
-                            let sum := add(var_sum, sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i)))
-                            if gt(var_sum, sum)
-                            {
-                                mstore(0, shl(224, 0x4e487b71))
-                                mstore(_1, 0x11)
-                                revert(0, 0x24)
-                            }
-                            /// @src 0:407:423  "sum += values[i]"
-                            var_sum := sum
-                        }
-                        /// @src 0:80:429  "contract Arraysum {..."
-                        let memPos := mload(64)
-                        mstore(memPos, var_sum)
-                        return(memPos, 32)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args
deleted file mode 100644
index ce566d3e0d9e..000000000000
--- a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize-yul --no-optimize-yul
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
deleted file mode 100644
index b8fc39145ed8..000000000000
--- a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Options --optimize-yul and --no-optimize-yul cannot be used together.
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol
deleted file mode 100644
index a32f63f78ff2..000000000000
--- a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
diff --git a/test/cmdlineTests/optimizer_inliner_add/args b/test/cmdlineTests/optimizer_inliner_add/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_inliner_add/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_inliner_add/input.sol b/test/cmdlineTests/optimizer_inliner_add/input.sol
deleted file mode 100644
index e90663844964..000000000000
--- a/test/cmdlineTests/optimizer_inliner_add/input.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-function unsafe_add(uint x, uint y) pure returns (uint)
-{
-    unchecked {
-        return x + y;
-    }
-}
-
-contract C {
-    function f() public pure {
-        for(uint x = 0; x < 10; x = unsafe_add(x, unsafe_add(x, 1)))
-        {
-        }
-    }
-}
diff --git a/test/cmdlineTests/optimizer_inliner_add/output b/test/cmdlineTests/optimizer_inliner_add/output
deleted file mode 100644
index 648d20fe8ee5..000000000000
--- a/test/cmdlineTests/optimizer_inliner_add/output
+++ /dev/null
@@ -1,86 +0,0 @@
-
-======= optimizer_inliner_add/input.sol:C =======
-EVM assembly:
-    /* "optimizer_inliner_add/input.sol":165:305  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_inliner_add/input.sol":165:305  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_inliner_add/input.sol":182:303  function f() public pure {... */
-    tag_3:
-      tag_4
-      tag_5
-      jump	// in
-    tag_4:
-      stop
-    tag_5:
-        /* "optimizer_inliner_add/input.sol":221:227  uint x */
-      0x00
-        /* "optimizer_inliner_add/input.sol":217:297  for(uint x = 0; x < 10; x = unsafe_add(x, unsafe_add(x, 1)))... */
-    tag_7:
-        /* "optimizer_inliner_add/input.sol":237:239  10 */
-      0x0a
-        /* "optimizer_inliner_add/input.sol":233:234  x */
-      dup2
-        /* "optimizer_inliner_add/input.sol":233:239  x < 10 */
-      lt
-        /* "optimizer_inliner_add/input.sol":217:297  for(uint x = 0; x < 10; x = unsafe_add(x, unsafe_add(x, 1)))... */
-      iszero
-      tag_8
-      jumpi
-        /* "optimizer_inliner_add/input.sol":149:154  x + y */
-      dup1
-      add
-        /* "optimizer_inliner_add/input.sol":273:274  1 */
-      0x01
-        /* "optimizer_inliner_add/input.sol":149:154  x + y */
-      add
-        /* "optimizer_inliner_add/input.sol":217:297  for(uint x = 0; x < 10; x = unsafe_add(x, unsafe_add(x, 1)))... */
-      jump(tag_7)
-    tag_8:
-      pop
-        /* "optimizer_inliner_add/input.sol":182:303  function f() public pure {... */
-      jump	// out
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_inliner_call_from_constructor/args b/test/cmdlineTests/optimizer_inliner_call_from_constructor/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_inliner_call_from_constructor/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_inliner_call_from_constructor/input.sol b/test/cmdlineTests/optimizer_inliner_call_from_constructor/input.sol
deleted file mode 100644
index 1ee1c00888d8..000000000000
--- a/test/cmdlineTests/optimizer_inliner_call_from_constructor/input.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    uint x;
-    constructor() { x = a(); }
-    function a() public pure returns (uint) { return f(); } // this should be inlined
-    function f() internal pure returns (uint) { return 6; }
-}
diff --git a/test/cmdlineTests/optimizer_inliner_call_from_constructor/output b/test/cmdlineTests/optimizer_inliner_call_from_constructor/output
deleted file mode 100644
index 86c09e27edd9..000000000000
--- a/test/cmdlineTests/optimizer_inliner_call_from_constructor/output
+++ /dev/null
@@ -1,80 +0,0 @@
-
-======= optimizer_inliner_call_from_constructor/input.sol:C =======
-EVM assembly:
-    /* "optimizer_inliner_call_from_constructor/input.sol":60:263  contract C {... */
-  mstore(0x40, 0x80)
-    /* "optimizer_inliner_call_from_constructor/input.sol":89:115  constructor() { x = a(); } */
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-    /* "optimizer_inliner_call_from_constructor/input.sol":257:258  6 */
-  0x06
-    /* "optimizer_inliner_call_from_constructor/input.sol":105:106  x */
-  0x00
-    /* "optimizer_inliner_call_from_constructor/input.sol":105:112  x = a() */
-  sstore
-    /* "optimizer_inliner_call_from_constructor/input.sol":60:263  contract C {... */
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_inliner_call_from_constructor/input.sol":60:263  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x0dbe671f
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_inliner_call_from_constructor/input.sol":120:175  function a() public pure returns (uint) { return f(); } */
-    tag_3:
-        /* "optimizer_inliner_call_from_constructor/input.sol":257:258  6 */
-      0x06
-        /* "optimizer_inliner_call_from_constructor/input.sol":120:175  function a() public pure returns (uint) { return f(); } */
-      mload(0x40)
-        /* "#utility.yul":160:185   */
-      swap1
-      dup2
-      mstore
-        /* "#utility.yul":148:150   */
-      0x20
-        /* "#utility.yul":133:151   */
-      add
-        /* "optimizer_inliner_call_from_constructor/input.sol":120:175  function a() public pure returns (uint) { return f(); } */
-      mload(0x40)
-      dup1
-      swap2
-      sub
-      swap1
-      return
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference/args b/test/cmdlineTests/optimizer_inliner_dynamic_reference/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference/input.sol b/test/cmdlineTests/optimizer_inliner_dynamic_reference/input.sol
deleted file mode 100644
index f6a92fbca872..000000000000
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference/input.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function() internal view returns (uint) x;
-
-    function g() public { x = f; }
-    function a() public pure returns (uint) { return f(); } // this should be inlined
-    function h() public view returns (uint) { return x() + 1; }
-    function f() internal pure returns (uint) { return 6; }
-}
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference/output b/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
deleted file mode 100644
index 2ddef4d7689e..000000000000
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
+++ /dev/null
@@ -1,223 +0,0 @@
-
-======= optimizer_inliner_dynamic_reference/input.sol:C =======
-EVM assembly:
-    /* "optimizer_inliner_dynamic_reference/input.sol":60:367  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_inliner_dynamic_reference/input.sol":60:367  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x0dbe671f
-      eq
-      tag_3
-      jumpi
-      dup1
-      0xb8c9d365
-      eq
-      tag_4
-      jumpi
-      dup1
-      0xe2179b8e
-      eq
-      tag_5
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_inliner_dynamic_reference/input.sol":160:215  function a() public pure returns (uint) { return f(); } */
-    tag_3:
-        /* "optimizer_inliner_dynamic_reference/input.sol":361:362  6 */
-      0x06
-        /* "optimizer_inliner_dynamic_reference/input.sol":160:215  function a() public pure returns (uint) { return f(); } */
-    tag_6:
-      mload(0x40)
-        /* "#utility.yul":160:185   */
-      swap1
-      dup2
-      mstore
-        /* "#utility.yul":148:150   */
-      0x20
-        /* "#utility.yul":133:151   */
-      add
-        /* "optimizer_inliner_dynamic_reference/input.sol":160:215  function a() public pure returns (uint) { return f(); } */
-      mload(0x40)
-      dup1
-      swap2
-      sub
-      swap1
-      return
-        /* "optimizer_inliner_dynamic_reference/input.sol":246:305  function h() public view returns (uint) { return x() + 1; } */
-    tag_4:
-      tag_6
-      tag_11
-      jump	// in
-        /* "optimizer_inliner_dynamic_reference/input.sol":125:155  function g() public { x = f; } */
-    tag_5:
-        /* "optimizer_inliner_dynamic_reference/input.sol":147:148  x */
-      0x00
-        /* "optimizer_inliner_dynamic_reference/input.sol":147:152  x = f */
-      dup1
-      sload
-      not(0xffffffffffffffff)
-      and
-        /* "optimizer_inliner_dynamic_reference/input.sol":151:152  f */
-      tag_17
-        /* "optimizer_inliner_dynamic_reference/input.sol":147:152  x = f */
-      or
-      swap1
-      sstore
-        /* "optimizer_inliner_dynamic_reference/input.sol":125:155  function g() public { x = f; } */
-      stop
-        /* "optimizer_inliner_dynamic_reference/input.sol":209:212  f() */
-    tag_16:
-        /* "optimizer_inliner_dynamic_reference/input.sol":202:212  return f() */
-      swap1
-      pop
-        /* "optimizer_inliner_dynamic_reference/input.sol":160:215  function a() public pure returns (uint) { return f(); } */
-      swap1
-      jump	// out
-        /* "optimizer_inliner_dynamic_reference/input.sol":246:305  function h() public view returns (uint) { return x() + 1; } */
-    tag_11:
-        /* "optimizer_inliner_dynamic_reference/input.sol":280:284  uint */
-      0x00
-        /* "optimizer_inliner_dynamic_reference/input.sol":295:296  x */
-      dup1
-      sload
-        /* "optimizer_inliner_dynamic_reference/input.sol":295:298  x() */
-      tag_19
-      swap1
-        /* "optimizer_inliner_dynamic_reference/input.sol":295:296  x */
-      dup1
-      iszero
-      tag_20
-      mul
-      or
-        /* "optimizer_inliner_dynamic_reference/input.sol":295:298  x() */
-      0xffffffff
-      and
-      jump	// in
-    tag_19:
-        /* "optimizer_inliner_dynamic_reference/input.sol":295:302  x() + 1 */
-      tag_16
-      swap1
-        /* "optimizer_inliner_dynamic_reference/input.sol":301:302  1 */
-      0x01
-        /* "optimizer_inliner_dynamic_reference/input.sol":295:302  x() + 1 */
-      tag_22
-      jump	// in
-        /* "optimizer_inliner_dynamic_reference/input.sol":310:365  function f() internal pure returns (uint) { return 6; } */
-    tag_17:
-        /* "optimizer_inliner_dynamic_reference/input.sol":361:362  6 */
-      0x06
-      swap1
-        /* "optimizer_inliner_dynamic_reference/input.sol":310:365  function f() internal pure returns (uint) { return 6; } */
-      jump	// out
-    tag_20:
-      tag_25
-      tag_26
-      jump	// in
-    tag_25:
-      jump	// out
-        /* "#utility.yul":196:418   */
-    tag_22:
-        /* "#utility.yul":261:270   */
-      dup1
-      dup3
-      add
-        /* "#utility.yul":282:292   */
-      dup1
-      dup3
-      gt
-        /* "#utility.yul":279:412   */
-      iszero
-      tag_30
-      jumpi
-        /* "#utility.yul":334:344   */
-      0x4e487b71
-        /* "#utility.yul":329:332   */
-      0xe0
-        /* "#utility.yul":325:345   */
-      shl
-        /* "#utility.yul":322:323   */
-      0x00
-        /* "#utility.yul":315:346   */
-      mstore
-        /* "#utility.yul":369:373   */
-      0x11
-        /* "#utility.yul":366:367   */
-      0x04
-        /* "#utility.yul":359:374   */
-      mstore
-        /* "#utility.yul":397:401   */
-      0x24
-        /* "#utility.yul":394:395   */
-      0x00
-        /* "#utility.yul":387:402   */
-      revert
-        /* "#utility.yul":279:412   */
-    tag_30:
-        /* "#utility.yul":196:418   */
-      swap3
-      swap2
-      pop
-      pop
-      jump	// out
-        /* "#utility.yul":423:550   */
-    tag_26:
-        /* "#utility.yul":484:494   */
-      0x4e487b71
-        /* "#utility.yul":479:482   */
-      0xe0
-        /* "#utility.yul":475:495   */
-      shl
-        /* "#utility.yul":472:473   */
-      0x00
-        /* "#utility.yul":465:496   */
-      mstore
-        /* "#utility.yul":515:519   */
-      0x51
-        /* "#utility.yul":512:513   */
-      0x04
-        /* "#utility.yul":505:520   */
-      mstore
-        /* "#utility.yul":539:543   */
-      0x24
-        /* "#utility.yul":536:537   */
-      0x00
-        /* "#utility.yul":529:544   */
-      revert
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/args b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/input.sol b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/input.sol
deleted file mode 100644
index 573648cfd3ce..000000000000
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/input.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    constructor() { x = f; }
-    function() internal view returns (uint) x;
-
-    function a() public pure returns (uint) { return f(); } // this should be inlined
-    function h() public view returns (uint) { return x() + 1; }
-    function f() internal pure returns (uint) { return 6; }
-}
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
deleted file mode 100644
index edc93c0becb0..000000000000
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
+++ /dev/null
@@ -1,228 +0,0 @@
-
-======= optimizer_inliner_dynamic_reference_constructor/input.sol:C =======
-EVM assembly:
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":60:361  contract C {... */
-  mstore(0x40, 0x80)
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":77:101  constructor() { x = f; } */
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":93:94  x */
-  0x00
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":93:98  x = f */
-  dup1
-  sload
-  not(sub(shl(0x40, 0x01), 0x01))
-  and
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":97:98  f */
-  or(tag_0_12, shl(0x20, tag_4))
-  sub(shl(0x40, 0x01), 0x01)
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":93:98  x = f */
-  and
-  or
-  swap1
-  sstore
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":60:361  contract C {... */
-  jump(tag_5)
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":304:359  function f() internal pure returns (uint) { return 6; } */
-tag_4:
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":355:356  6 */
-  0x06
-  swap1
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":304:359  function f() internal pure returns (uint) { return 6; } */
-  jump	// out
-    /* "optimizer_inliner_dynamic_reference_constructor/input.sol":60:361  contract C {... */
-tag_5:
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":60:361  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x0dbe671f
-      eq
-      tag_3
-      jumpi
-      dup1
-      0xb8c9d365
-      eq
-      tag_4
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":154:209  function a() public pure returns (uint) { return f(); } */
-    tag_3:
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":355:356  6 */
-      0x06
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":154:209  function a() public pure returns (uint) { return f(); } */
-    tag_5:
-      mload(0x40)
-        /* "#utility.yul":160:185   */
-      swap1
-      dup2
-      mstore
-        /* "#utility.yul":148:150   */
-      0x20
-        /* "#utility.yul":133:151   */
-      add
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":154:209  function a() public pure returns (uint) { return f(); } */
-      mload(0x40)
-      dup1
-      swap2
-      sub
-      swap1
-      return
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":240:299  function h() public view returns (uint) { return x() + 1; } */
-    tag_4:
-      tag_5
-      tag_10
-      jump	// in
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":203:206  f() */
-    tag_14:
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":196:206  return f() */
-      swap1
-      pop
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":154:209  function a() public pure returns (uint) { return f(); } */
-      swap1
-      jump	// out
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":240:299  function h() public view returns (uint) { return x() + 1; } */
-    tag_10:
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":274:278  uint */
-      0x00
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":289:290  x */
-      dup1
-      sload
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":289:292  x() */
-      tag_16
-      swap1
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":289:290  x */
-      dup1
-      iszero
-      tag_17
-      mul
-      or
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":289:292  x() */
-      0xffffffff
-      and
-      jump	// in
-    tag_16:
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":289:296  x() + 1 */
-      tag_14
-      swap1
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":295:296  1 */
-      0x01
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":289:296  x() + 1 */
-      tag_19
-      jump	// in
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":304:359  function f() internal pure returns (uint) { return 6; } */
-    tag_12:
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":355:356  6 */
-      0x06
-      swap1
-        /* "optimizer_inliner_dynamic_reference_constructor/input.sol":304:359  function f() internal pure returns (uint) { return 6; } */
-      jump	// out
-    tag_17:
-      tag_21
-      tag_22
-      jump	// in
-    tag_21:
-      jump	// out
-        /* "#utility.yul":196:418   */
-    tag_19:
-        /* "#utility.yul":261:270   */
-      dup1
-      dup3
-      add
-        /* "#utility.yul":282:292   */
-      dup1
-      dup3
-      gt
-        /* "#utility.yul":279:412   */
-      iszero
-      tag_26
-      jumpi
-        /* "#utility.yul":334:344   */
-      0x4e487b71
-        /* "#utility.yul":329:332   */
-      0xe0
-        /* "#utility.yul":325:345   */
-      shl
-        /* "#utility.yul":322:323   */
-      0x00
-        /* "#utility.yul":315:346   */
-      mstore
-        /* "#utility.yul":369:373   */
-      0x11
-        /* "#utility.yul":366:367   */
-      0x04
-        /* "#utility.yul":359:374   */
-      mstore
-        /* "#utility.yul":397:401   */
-      0x24
-        /* "#utility.yul":394:395   */
-      0x00
-        /* "#utility.yul":387:402   */
-      revert
-        /* "#utility.yul":279:412   */
-    tag_26:
-        /* "#utility.yul":196:418   */
-      swap3
-      swap2
-      pop
-      pop
-      jump	// out
-        /* "#utility.yul":423:550   */
-    tag_22:
-        /* "#utility.yul":484:494   */
-      0x4e487b71
-        /* "#utility.yul":479:482   */
-      0xe0
-        /* "#utility.yul":475:495   */
-      shl
-        /* "#utility.yul":472:473   */
-      0x00
-        /* "#utility.yul":465:496   */
-      mstore
-        /* "#utility.yul":515:519   */
-      0x51
-        /* "#utility.yul":512:513   */
-      0x04
-        /* "#utility.yul":505:520   */
-      mstore
-        /* "#utility.yul":539:543   */
-      0x24
-        /* "#utility.yul":536:537   */
-      0x00
-        /* "#utility.yul":529:544   */
-      revert
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_inliner_inc/args b/test/cmdlineTests/optimizer_inliner_inc/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_inliner_inc/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_inliner_inc/input.sol b/test/cmdlineTests/optimizer_inliner_inc/input.sol
deleted file mode 100644
index f4f011aaba54..000000000000
--- a/test/cmdlineTests/optimizer_inliner_inc/input.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-function unsafe_inc(uint x) pure returns (uint)
-{
-    unchecked {
-        return x + 1;
-    }
-}
-
-contract C {
-    function f() public pure {
-        for(uint x = 0; x < 10; x = unsafe_inc(x))
-        {
-        }
-    }
-}
diff --git a/test/cmdlineTests/optimizer_inliner_inc/output b/test/cmdlineTests/optimizer_inliner_inc/output
deleted file mode 100644
index 04f5f745a2fa..000000000000
--- a/test/cmdlineTests/optimizer_inliner_inc/output
+++ /dev/null
@@ -1,83 +0,0 @@
-
-======= optimizer_inliner_inc/input.sol:C =======
-EVM assembly:
-    /* "optimizer_inliner_inc/input.sol":157:279  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_inliner_inc/input.sol":157:279  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_inliner_inc/input.sol":174:277  function f() public pure {... */
-    tag_3:
-      tag_4
-      tag_5
-      jump	// in
-    tag_4:
-      stop
-    tag_5:
-        /* "optimizer_inliner_inc/input.sol":213:219  uint x */
-      0x00
-        /* "optimizer_inliner_inc/input.sol":209:271  for(uint x = 0; x < 10; x = unsafe_inc(x))... */
-    tag_7:
-        /* "optimizer_inliner_inc/input.sol":229:231  10 */
-      0x0a
-        /* "optimizer_inliner_inc/input.sol":225:226  x */
-      dup2
-        /* "optimizer_inliner_inc/input.sol":225:231  x < 10 */
-      lt
-        /* "optimizer_inliner_inc/input.sol":209:271  for(uint x = 0; x < 10; x = unsafe_inc(x))... */
-      iszero
-      tag_8
-      jumpi
-        /* "optimizer_inliner_inc/input.sol":145:146  1 */
-      0x01
-        /* "optimizer_inliner_inc/input.sol":141:146  x + 1 */
-      add
-        /* "optimizer_inliner_inc/input.sol":209:271  for(uint x = 0; x < 10; x = unsafe_inc(x))... */
-      jump(tag_7)
-    tag_8:
-      pop
-        /* "optimizer_inliner_inc/input.sol":174:277  function f() public pure {... */
-      jump	// out
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_inliner_multireturn/args b/test/cmdlineTests/optimizer_inliner_multireturn/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_inliner_multireturn/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_inliner_multireturn/input.sol b/test/cmdlineTests/optimizer_inliner_multireturn/input.sol
deleted file mode 100644
index 19da9f7c5531..000000000000
--- a/test/cmdlineTests/optimizer_inliner_multireturn/input.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-function test(uint x) pure returns (uint, uint)
-{
-    unchecked {
-        return (x + 1, x);
-    }
-}
-
-contract C {
-    function f() public pure {
-        for((uint x, uint y) = (0, 1); x < 10; (x, y) = test(x))
-        {
-        }
-    }
-}
diff --git a/test/cmdlineTests/optimizer_inliner_multireturn/output b/test/cmdlineTests/optimizer_inliner_multireturn/output
deleted file mode 100644
index ca7b0abdf3a1..000000000000
--- a/test/cmdlineTests/optimizer_inliner_multireturn/output
+++ /dev/null
@@ -1,89 +0,0 @@
-
-======= optimizer_inliner_multireturn/input.sol:C =======
-EVM assembly:
-    /* "optimizer_inliner_multireturn/input.sol":162:298  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_inliner_multireturn/input.sol":162:298  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* "optimizer_inliner_multireturn/input.sol":179:296  function f() public pure {... */
-    tag_3:
-      tag_4
-      tag_5
-      jump	// in
-    tag_4:
-      stop
-    tag_5:
-        /* "optimizer_inliner_multireturn/input.sol":219:225  uint x */
-      0x00
-        /* "optimizer_inliner_multireturn/input.sol":241:242  1 */
-      0x01
-        /* "optimizer_inliner_multireturn/input.sol":214:290  for((uint x, uint y) = (0, 1); x < 10; (x, y) = test(x))... */
-    tag_7:
-        /* "optimizer_inliner_multireturn/input.sol":249:251  10 */
-      0x0a
-        /* "optimizer_inliner_multireturn/input.sol":245:246  x */
-      dup3
-        /* "optimizer_inliner_multireturn/input.sol":245:251  x < 10 */
-      lt
-        /* "optimizer_inliner_multireturn/input.sol":214:290  for((uint x, uint y) = (0, 1); x < 10; (x, y) = test(x))... */
-      iszero
-      tag_8
-      jumpi
-      pop
-        /* "optimizer_inliner_multireturn/input.sol":146:147  1 */
-      0x01
-        /* "optimizer_inliner_multireturn/input.sol":142:147  x + 1 */
-      dup2
-      add
-      swap1
-        /* "optimizer_inliner_multireturn/input.sol":214:290  for((uint x, uint y) = (0, 1); x < 10; (x, y) = test(x))... */
-      jump(tag_7)
-    tag_8:
-      pop
-      pop
-        /* "optimizer_inliner_multireturn/input.sol":179:296  function f() public pure {... */
-      jump	// out
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/optimizer_user_yul/args b/test/cmdlineTests/optimizer_user_yul/args
deleted file mode 100644
index a73dc7c21878..000000000000
--- a/test/cmdlineTests/optimizer_user_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --asm
diff --git a/test/cmdlineTests/optimizer_user_yul/input.sol b/test/cmdlineTests/optimizer_user_yul/input.sol
deleted file mode 100644
index f43ccc755d78..000000000000
--- a/test/cmdlineTests/optimizer_user_yul/input.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	constructor() payable
-	{
-		int a;
-
-		// Can't be optimized due to external reference "a"
-		assembly
-		{
-			let x,y,z
-
-			sstore(0, 1)
-
-			for { } sload(4) { } {
-				z := exp(x, y)
-			}
-
-			a := 2
-		}
-
-		// Can be optimized due to no external references
-		assembly
-		{
-			let x,y,z
-
-			sstore(2, 3)
-
-			for { } sload(5) { } {
-				// Expected to be optimized out for yulOptimizer, but not for
-				// old optimizer
-				z := exp(x, y)
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/optimizer_user_yul/output b/test/cmdlineTests/optimizer_user_yul/output
deleted file mode 100644
index 689e82ddb4e4..000000000000
--- a/test/cmdlineTests/optimizer_user_yul/output
+++ /dev/null
@@ -1,86 +0,0 @@
-
-======= optimizer_user_yul/input.sol:C =======
-EVM assembly:
-    /* "optimizer_user_yul/input.sol":60:518  contract C... */
-  mstore(0x40, 0x80)
-    /* "optimizer_user_yul/input.sol":101:106  int a */
-  0x00
-    /* "optimizer_user_yul/input.sol":181:190  let x,y,z */
-  dup1
-  0x00
-  dup1
-    /* "optimizer_user_yul/input.sol":205:206  1 */
-  0x01
-    /* "optimizer_user_yul/input.sol":202:203  0 */
-  0x00
-    /* "optimizer_user_yul/input.sol":195:207  sstore(0, 1) */
-  sstore
-    /* "optimizer_user_yul/input.sol":212:258  for { } sload(4) { } {... */
-tag_3:
-    /* "optimizer_user_yul/input.sol":226:227  4 */
-  0x04
-    /* "optimizer_user_yul/input.sol":220:228  sload(4) */
-  sload
-    /* "optimizer_user_yul/input.sol":212:258  for { } sload(4) { } {... */
-  iszero
-  tag_5
-  jumpi
-  pop
-    /* "optimizer_user_yul/input.sol":244:253  exp(x, y) */
-  dup1
-  dup3
-  exp
-    /* "optimizer_user_yul/input.sol":212:258  for { } sload(4) { } {... */
-  jump(tag_3)
-tag_5:
-    /* "optimizer_user_yul/input.sol":216:219  { } */
-  pop
-  pop
-  pop
-    /* "optimizer_user_yul/input.sol":268:269  2 */
-  0x02
-    /* "optimizer_user_yul/input.sol":263:269  a := 2 */
-  swap1
-  pop
-    /* "optimizer_user_yul/input.sol":369:370  3 */
-  0x03
-    /* "optimizer_user_yul/input.sol":366:367  2 */
-  0x02
-    /* "optimizer_user_yul/input.sol":359:371  sstore(2, 3) */
-  sstore
-    /* "optimizer_user_yul/input.sol":390:391  5 */
-  0x05
-    /* "optimizer_user_yul/input.sol":384:392  sload(5) */
-  sload
-  iszero
-    /* "optimizer_user_yul/input.sol":376:509  for { } sload(5) { } {... */
-tag_6:
-    /* "optimizer_user_yul/input.sol":384:392  sload(5) */
-  dup1
-    /* "optimizer_user_yul/input.sol":376:509  for { } sload(5) { } {... */
-  iszero
-  tag_6
-  jumpi
-    /* "optimizer_user_yul/input.sol":380:383  { } */
-  pop
-    /* "optimizer_user_yul/input.sol":340:513  {... */
-  pop
-    /* "optimizer_user_yul/input.sol":60:518  contract C... */
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* "optimizer_user_yul/input.sol":60:518  contract C... */
-      mstore(0x40, 0x80)
-      0x00
-      dup1
-      revert
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/output_selection_all_A1/input.json b/test/cmdlineTests/output_selection_all_A1/input.json
deleted file mode 100644
index 02c04eb2dfd0..000000000000
--- a/test/cmdlineTests/output_selection_all_A1/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "*": {
-    "A1": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_all_A1/output.json b/test/cmdlineTests/output_selection_all_A1/output.json
deleted file mode 100644
index b21b632bdc88..000000000000
--- a/test/cmdlineTests/output_selection_all_A1/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        },
-        "b.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/output_selection_all_A2/input.json b/test/cmdlineTests/output_selection_all_A2/input.json
deleted file mode 100644
index 791d787d5e60..000000000000
--- a/test/cmdlineTests/output_selection_all_A2/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "*": {
-    "A2": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_all_A2/output.json b/test/cmdlineTests/output_selection_all_A2/output.json
deleted file mode 100644
index c33941c2f9e5..000000000000
--- a/test/cmdlineTests/output_selection_all_A2/output.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/output_selection_all_blank/input.json b/test/cmdlineTests/output_selection_all_blank/input.json
deleted file mode 100644
index e65c7ff44ab8..000000000000
--- a/test/cmdlineTests/output_selection_all_blank/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "": {
-    "": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_all_blank/output.json b/test/cmdlineTests/output_selection_all_blank/output.json
deleted file mode 100644
index b4c60911cb64..000000000000
--- a/test/cmdlineTests/output_selection_all_blank/output.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/output_selection_all_star/input.json b/test/cmdlineTests/output_selection_all_star/input.json
deleted file mode 100644
index 9c475aa08c61..000000000000
--- a/test/cmdlineTests/output_selection_all_star/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "*": {
-    "*": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_all_star/output.json b/test/cmdlineTests/output_selection_all_star/output.json
deleted file mode 100644
index f709636212b6..000000000000
--- a/test/cmdlineTests/output_selection_all_star/output.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            },
-            "A2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        },
-        "b.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            },
-            "B2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/output_selection_single_A1/input.json b/test/cmdlineTests/output_selection_single_A1/input.json
deleted file mode 100644
index 964f3f065990..000000000000
--- a/test/cmdlineTests/output_selection_single_A1/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "a.sol": {
-    "A1": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_single_A1/output.json b/test/cmdlineTests/output_selection_single_A1/output.json
deleted file mode 100644
index ab44a2d540a4..000000000000
--- a/test/cmdlineTests/output_selection_single_A1/output.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/output_selection_single_B1/input.json b/test/cmdlineTests/output_selection_single_B1/input.json
deleted file mode 100644
index 216d3f08b38b..000000000000
--- a/test/cmdlineTests/output_selection_single_B1/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "b.sol": {
-    "B2": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_single_B1/output.json b/test/cmdlineTests/output_selection_single_B1/output.json
deleted file mode 100644
index ffaf266b4d06..000000000000
--- a/test/cmdlineTests/output_selection_single_B1/output.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "contracts":
-    {
-        "b.sol":
-        {
-            "B2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/output_selection_single_all/input.json b/test/cmdlineTests/output_selection_single_all/input.json
deleted file mode 100644
index ae8304f02cad..000000000000
--- a/test/cmdlineTests/output_selection_single_all/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
-  },
-  "b.sol": {
-   "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A1 { function b(uint x) public pure { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "a.sol": {
-    "*": [
-     "evm.bytecode.object"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/output_selection_single_all/output.json b/test/cmdlineTests/output_selection_single_all/output.json
deleted file mode 100644
index 52d04cb18ddf..000000000000
--- a/test/cmdlineTests/output_selection_single_all/output.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            },
-            "A2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        },
-        "b.sol":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/pretty_json_indent_only/args b/test/cmdlineTests/pretty_json_indent_only/args
deleted file mode 100644
index 10c94a50c7ef..000000000000
--- a/test/cmdlineTests/pretty_json_indent_only/args
+++ /dev/null
@@ -1 +0,0 @@
---json-indent 7
diff --git a/test/cmdlineTests/pretty_json_indent_only/input.json b/test/cmdlineTests/pretty_json_indent_only/input.json
deleted file mode 100644
index e9dc4cf381a7..000000000000
--- a/test/cmdlineTests/pretty_json_indent_only/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C {}"
-		}
-	}
-}
diff --git a/test/cmdlineTests/pretty_json_indent_only/no-pretty-print b/test/cmdlineTests/pretty_json_indent_only/no-pretty-print
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/pretty_json_indent_only/output b/test/cmdlineTests/pretty_json_indent_only/output
deleted file mode 100644
index 8b137891791f..000000000000
--- a/test/cmdlineTests/pretty_json_indent_only/output
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/pretty_json_indent_only/output.json b/test/cmdlineTests/pretty_json_indent_only/output.json
deleted file mode 100644
index 80d51c4f1f2f..000000000000
--- a/test/cmdlineTests/pretty_json_indent_only/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "sources":
-       {
-              "A":
-              {
-                     "id": 0
-              }
-       }
-}
diff --git a/test/cmdlineTests/pretty_json_standard/args b/test/cmdlineTests/pretty_json_standard/args
deleted file mode 100644
index d13a8ac44a0b..000000000000
--- a/test/cmdlineTests/pretty_json_standard/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json
diff --git a/test/cmdlineTests/pretty_json_standard/input.json b/test/cmdlineTests/pretty_json_standard/input.json
deleted file mode 100644
index e9dc4cf381a7..000000000000
--- a/test/cmdlineTests/pretty_json_standard/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C {}"
-		}
-	}
-}
diff --git a/test/cmdlineTests/pretty_json_standard/no-pretty-print b/test/cmdlineTests/pretty_json_standard/no-pretty-print
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/pretty_json_standard/output.json b/test/cmdlineTests/pretty_json_standard/output.json
deleted file mode 100644
index 29185e758349..000000000000
--- a/test/cmdlineTests/pretty_json_standard/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "sources":
-  {
-    "A":
-    {
-      "id": 0
-    }
-  }
-}
diff --git a/test/cmdlineTests/pretty_json_standard_indent/args b/test/cmdlineTests/pretty_json_standard_indent/args
deleted file mode 100644
index 54a84919ffcb..000000000000
--- a/test/cmdlineTests/pretty_json_standard_indent/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 7
diff --git a/test/cmdlineTests/pretty_json_standard_indent/input.json b/test/cmdlineTests/pretty_json_standard_indent/input.json
deleted file mode 100644
index df5bb3dfc5ed..000000000000
--- a/test/cmdlineTests/pretty_json_standard_indent/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/pretty_json_standard_indent/no-pretty-print b/test/cmdlineTests/pretty_json_standard_indent/no-pretty-print
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/pretty_json_standard_indent/output b/test/cmdlineTests/pretty_json_standard_indent/output
deleted file mode 100644
index 80d51c4f1f2f..000000000000
--- a/test/cmdlineTests/pretty_json_standard_indent/output
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "sources":
-       {
-              "A":
-              {
-                     "id": 0
-              }
-       }
-}
diff --git a/test/cmdlineTests/pretty_json_standard_indent/output.json b/test/cmdlineTests/pretty_json_standard_indent/output.json
deleted file mode 100644
index 80d51c4f1f2f..000000000000
--- a/test/cmdlineTests/pretty_json_standard_indent/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "sources":
-       {
-              "A":
-              {
-                     "id": 0
-              }
-       }
-}
diff --git a/test/cmdlineTests/require_overload/err b/test/cmdlineTests/require_overload/err
deleted file mode 100644
index 4c33672d4a27..000000000000
--- a/test/cmdlineTests/require_overload/err
+++ /dev/null
@@ -1,7 +0,0 @@
-Error: No matching declaration found after argument-dependent lookup.
- --> require_overload/input.sol:5:9:
-  |
-5 |         require(this);
-  |         ^^^^^^^
-Note: Candidate: function require(bool)
-Note: Candidate: function require(bool, string memory)
diff --git a/test/cmdlineTests/require_overload/exit b/test/cmdlineTests/require_overload/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/require_overload/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/require_overload/input.sol b/test/cmdlineTests/require_overload/input.sol
deleted file mode 100644
index b927c043ccae..000000000000
--- a/test/cmdlineTests/require_overload/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract C {
-    function f() public pure {
-        require(this);
-    }
-}
diff --git a/test/cmdlineTests/revert_strings/args b/test/cmdlineTests/revert_strings/args
deleted file mode 100644
index be92d13e12eb..000000000000
--- a/test/cmdlineTests/revert_strings/args
+++ /dev/null
@@ -1 +0,0 @@
---revert-strings debug --ir
\ No newline at end of file
diff --git a/test/cmdlineTests/revert_strings/input.sol b/test/cmdlineTests/revert_strings/input.sol
deleted file mode 100644
index 3d47829468b9..000000000000
--- a/test/cmdlineTests/revert_strings/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma solidity >=0.0;
-// SPDX-License-Identifier: GPL-3.0
-contract C {
-    enum E { X }
-    function f(uint[][] memory, E e) public pure {
-    }
-}
diff --git a/test/cmdlineTests/revert_strings/output b/test/cmdlineTests/revert_strings/output
deleted file mode 100644
index 0f16ff9d0f8f..000000000000
--- a/test/cmdlineTests/revert_strings/output
+++ /dev/null
@@ -1,371 +0,0 @@
-IR:
-
-/// @use-src 0:"revert_strings/input.sol"
-object "C_15" {
-    code {
-        /// @src 0:59:147  "contract C {..."
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_15()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_15_deployed"), datasize("C_15_deployed"))
-
-        return(_1, datasize("C_15_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-
-            let start := allocate_unbounded()
-            let pos := start
-            mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-            pos := add(pos, 4)
-            mstore(pos, 0x20)
-            pos := add(pos, 0x20)
-            mstore(pos, 34)
-            pos := add(pos, 0x20)
-
-            mstore(add(pos, 0), "Ether sent to non-payable functi")
-
-            mstore(add(pos, 32), "on")
-
-            revert(start, 132)
-
-        }
-
-        /// @src 0:59:147  "contract C {..."
-        function constructor_C_15() {
-
-            /// @src 0:59:147  "contract C {..."
-
-        }
-        /// @src 0:59:147  "contract C {..."
-
-    }
-    /// @use-src 0:"revert_strings/input.sol"
-    object "C_15_deployed" {
-        code {
-            /// @src 0:59:147  "contract C {..."
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x02e8cd18
-                {
-                    // f(uint256[][],uint8)
-
-                    external_fun_f_14()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-
-                let start := allocate_unbounded()
-                let pos := start
-                mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-                pos := add(pos, 4)
-                mstore(pos, 0x20)
-                pos := add(pos, 0x20)
-                mstore(pos, 34)
-                pos := add(pos, 0x20)
-
-                mstore(add(pos, 0), "Ether sent to non-payable functi")
-
-                mstore(add(pos, 32), "on")
-
-                revert(start, 132)
-
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-
-                let start := allocate_unbounded()
-                let pos := start
-                mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-                pos := add(pos, 4)
-                mstore(pos, 0x20)
-                pos := add(pos, 0x20)
-                mstore(pos, 34)
-                pos := add(pos, 0x20)
-
-                mstore(add(pos, 0), "ABI decoding: tuple data too sho")
-
-                mstore(add(pos, 32), "rt")
-
-                revert(start, 132)
-
-            }
-
-            function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-
-                let start := allocate_unbounded()
-                let pos := start
-                mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-                pos := add(pos, 4)
-                mstore(pos, 0x20)
-                pos := add(pos, 0x20)
-                mstore(pos, 34)
-                pos := add(pos, 0x20)
-
-                mstore(add(pos, 0), "ABI decoding: invalid tuple offs")
-
-                mstore(add(pos, 32), "et")
-
-                revert(start, 132)
-
-            }
-
-            function revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() {
-
-                let start := allocate_unbounded()
-                let pos := start
-                mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-                pos := add(pos, 4)
-                mstore(pos, 0x20)
-                pos := add(pos, 0x20)
-                mstore(pos, 43)
-                pos := add(pos, 0x20)
-
-                mstore(add(pos, 0), "ABI decoding: invalid calldata a")
-
-                mstore(add(pos, 32), "rray offset")
-
-                revert(start, 132)
-
-            }
-
-            function round_up_to_mul_of_32(value) -> result {
-                result := and(add(value, 31), not(31))
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function finalize_allocation(memPtr, size) {
-                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-                // protect against overflow
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-
-            function allocate_memory(size) -> memPtr {
-                memPtr := allocate_unbounded()
-                finalize_allocation(memPtr, size)
-            }
-
-            function array_allocation_size_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr(length) -> size {
-                // Make sure we can allocate memory without overflow
-                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
-
-                size := mul(length, 0x20)
-
-                // add length slot
-                size := add(size, 0x20)
-
-            }
-
-            function revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef() {
-
-                let start := allocate_unbounded()
-                let pos := start
-                mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-                pos := add(pos, 4)
-                mstore(pos, 0x20)
-                pos := add(pos, 0x20)
-                mstore(pos, 43)
-                pos := add(pos, 0x20)
-
-                mstore(add(pos, 0), "ABI decoding: invalid calldata a")
-
-                mstore(add(pos, 32), "rray stride")
-
-                revert(start, 132)
-
-            }
-
-            function array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length) -> size {
-                // Make sure we can allocate memory without overflow
-                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
-
-                size := mul(length, 0x20)
-
-                // add length slot
-                size := add(size, 0x20)
-
-            }
-
-            function cleanup_t_uint256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function validator_revert_t_uint256(value) {
-                if iszero(eq(value, cleanup_t_uint256(value))) { revert(0, 0) }
-            }
-
-            function abi_decode_t_uint256(offset, end) -> value {
-                value := calldataload(offset)
-                validator_revert_t_uint256(value)
-            }
-
-            // uint256[]
-            function abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr(offset, length, end) -> array {
-                array := allocate_memory(array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length))
-                let dst := array
-
-                mstore(array, length)
-                dst := add(array, 0x20)
-
-                let srcEnd := add(offset, mul(length, 0x20))
-                if gt(srcEnd, end) {
-                    revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef()
-                }
-                for { let src := offset } lt(src, srcEnd) { src := add(src, 0x20) }
-                {
-
-                    let elementPos := src
-
-                    mstore(dst, abi_decode_t_uint256(elementPos, end))
-                    dst := add(dst, 0x20)
-                }
-            }
-
-            // uint256[]
-            function abi_decode_t_array$_t_uint256_$dyn_memory_ptr(offset, end) -> array {
-                if iszero(slt(add(offset, 0x1f), end)) { revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() }
-                let length := calldataload(offset)
-                array := abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr(add(offset, 0x20), length, end)
-            }
-
-            // uint256[][]
-            function abi_decode_available_length_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr(offset, length, end) -> array {
-                array := allocate_memory(array_allocation_size_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr(length))
-                let dst := array
-
-                mstore(array, length)
-                dst := add(array, 0x20)
-
-                let srcEnd := add(offset, mul(length, 0x20))
-                if gt(srcEnd, end) {
-                    revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef()
-                }
-                for { let src := offset } lt(src, srcEnd) { src := add(src, 0x20) }
-                {
-
-                    let innerOffset := calldataload(src)
-                    if gt(innerOffset, 0xffffffffffffffff) { revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() }
-                    let elementPos := add(offset, innerOffset)
-
-                    mstore(dst, abi_decode_t_array$_t_uint256_$dyn_memory_ptr(elementPos, end))
-                    dst := add(dst, 0x20)
-                }
-            }
-
-            // uint256[][]
-            function abi_decode_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr(offset, end) -> array {
-                if iszero(slt(add(offset, 0x1f), end)) { revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() }
-                let length := calldataload(offset)
-                array := abi_decode_available_length_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr(add(offset, 0x20), length, end)
-            }
-
-            function validator_revert_t_enum$_E_$3(value) {
-                if iszero(lt(value, 1)) { revert(0, 0) }
-            }
-
-            function abi_decode_t_enum$_E_$3(offset, end) -> value {
-                value := calldataload(offset)
-                validator_revert_t_enum$_E_$3(value)
-            }
-
-            function abi_decode_tuple_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptrt_enum$_E_$3(headStart, dataEnd) -> value0, value1 {
-                if slt(sub(dataEnd, headStart), 64) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-                {
-
-                    let offset := calldataload(add(headStart, 0))
-                    if gt(offset, 0xffffffffffffffff) { revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() }
-
-                    value0 := abi_decode_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
-                }
-
-                {
-
-                    let offset := 32
-
-                    value1 := abi_decode_t_enum$_E_$3(add(headStart, offset), dataEnd)
-                }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_14() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                let param_0, param_1 :=  abi_decode_tuple_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptrt_enum$_E_$3(4, calldatasize())
-                fun_f_14(param_0, param_1)
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-
-                let start := allocate_unbounded()
-                let pos := start
-                mstore(pos, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
-                pos := add(pos, 4)
-                mstore(pos, 0x20)
-                pos := add(pos, 0x20)
-                mstore(pos, 53)
-                pos := add(pos, 0x20)
-
-                mstore(add(pos, 0), "Contract does not have fallback ")
-
-                mstore(add(pos, 32), "nor receive functions")
-
-                revert(start, 132)
-
-            }
-
-            /// @ast-id 14
-            /// @src 0:93:145  "function f(uint[][] memory, E e) public pure {..."
-            function fun_f_14(var__7_mpos, var_e_10) {
-
-            }
-            /// @src 0:59:147  "contract C {..."
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/args b/test/cmdlineTests/standard_cli_output_selection_invalid/args
deleted file mode 100644
index 691b7fa54acd..000000000000
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/args
+++ /dev/null
@@ -1 +0,0 @@
---ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/err b/test/cmdlineTests/standard_cli_output_selection_invalid/err
deleted file mode 100644
index cdbcdd1585f8..000000000000
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/exit b/test/cmdlineTests/standard_cli_output_selection_invalid/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/input.json b/test/cmdlineTests/standard_cli_output_selection_invalid/input.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json
deleted file mode 100644
index c1a7209b3e3e..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"C":
-		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\n\ncontract C\n{\n	int constant constVar = 41;\n	int immutable immutVar = 42;\n	int public stateVar;\n\n	constructor(int _init)\n	{\n		stateVar = _init;\n	}\n\n	function f() external pure returns (int)\n	{\n		return constVar + immutVar;\n	}\n	modifier m()\n	{\n		stateVar++;\n		_;\n	}\n	function f2() m public returns (int)\n	{\n		return stateVar + this.f() + immutVar;\n	}\n}\n"
-		},
-		"D":
-		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\nimport \"C\";\n\ncontract D is C(3)\n{\n	constructor(int _init2)\n	{\n		stateVar += _init2;\n	}\n}\n"
-		}
-	},
-	"settings":
-	{
-		"viaIR": true,
-		"optimizer": { "enabled": true },
-
-		"outputSelection":
-		{
-			"*": { "*": ["evm.assembly"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
deleted file mode 100644
index 143ad92c304a..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ /dev/null
@@ -1,730 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"C\":79:428  contract C... */
-  0xa0
-  jumpi(tag_5, callvalue)
-  0x1f
-  bytecodeSize
-  codesize
-  dup2
-  swap1
-  sub
-  swap2
-  dup3
-  add
-  not(0x1f)
-  and
-  dup4
-  add
-  swap2
-  sub(shl(0x40, 0x01), 0x01)
-  dup4
-  gt
-  dup5
-  dup5
-  lt
-  or
-  tag_3
-  jumpi
-  dup1
-  dup5
-  swap3
-  0x20
-  swap5
-  0x40
-  mstore
-  dup4
-  codecopy
-  dup2
-  add
-  sub
-  slt
-  tag_5
-  jumpi
-  mload
-    /* \"C\":147:149  42 */
-  mstore(0x80, 0x2a)
-  0x00
-    /* \"C\":79:428  contract C... */
-  sstore
-  mload(0x40)
-  dataSize(sub_0)
-  swap1
-  dup2
-  dataOffset(sub_0)
-  dup3
-  codecopy
-    /* \"C\":147:149  42 */
-  0x80
-    /* \"C\":79:428  contract C... */
-  mload
-  dup2
-  assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-  return
-tag_5:
-  0x00
-  dup1
-  revert
-tag_3:
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x41)
-  revert(0x00, 0x24)
-stop
-
-sub_0: assembly {
-        /* \"C\":79:428  contract C... */
-      0x80
-      0x40
-      swap1
-      dup1
-      dup3
-      mstore
-      jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
-      0x00
-      dup1
-      revert
-    tag_2:
-      shr(0xe0, calldataload(0x00))
-      swap1
-      dup2
-      0x26121ff0
-      eq
-      tag_4
-      jumpi
-      pop
-      dup1
-      0x793816ec
-      eq
-      tag_6
-      jumpi
-      0x9942ec6f
-      eq
-      tag_8
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_8:
-      jumpi(tag_26, callvalue)
-      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-      sload(0x00)
-      sub(shl(0xff, 0x01), 0x01)
-      dup2
-      eq
-      tag_14
-      jumpi
-      0x01
-      add
-      0x00
-      dup2
-      swap1
-      sstore
-      dup2
-      mload
-      shl(0xe4, 0x026121ff)
-        /* \"C\":403:411  this.f() */
-      dup2
-      mstore
-        /* \"C\":79:428  contract C... */
-      swap2
-      swap1
-        /* \"C\":403:411  this.f() */
-      0x20
-        /* \"C\":79:428  contract C... */
-      dup4
-      0x04
-      dup2
-        /* \"C\":403:407  this */
-      address
-        /* \"C\":403:411  this.f() */
-      gas
-      staticcall
-      swap3
-      dup4
-      iszero
-      tag_16
-      jumpi
-        /* \"C\":79:428  contract C... */
-      0x00
-        /* \"C\":403:411  this.f() */
-      swap4
-      tag_18
-      jumpi
-        /* \"C\":79:428  contract C... */
-    tag_19:
-        /* \"C\":392:411  stateVar + this.f() */
-      pop
-      tag_20
-        /* \"C\":403:411  this.f() */
-      0x20
-        /* \"C\":392:411  stateVar + this.f() */
-      swap4
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_21
-        /* \"C\":392:411  stateVar + this.f() */
-      swap3
-      tag_1
-      jump\t// in
-    tag_20:
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      swap1
-      tag_1
-      jump\t// in
-    tag_21:
-        /* \"C\":79:428  contract C... */
-      swap1
-      mload
-      swap1
-      dup2
-      mstore
-      return
-        /* \"C\":403:411  this.f() */
-    tag_18:
-      swap3
-      pop
-      0x20
-      jumpi(tag_22, gt(0x20, returndatasize))
-    tag_23:
-        /* \"C\":79:428  contract C... */
-      0x1f
-      dup2
-      add
-      not(0x1f)
-      and
-      dup5
-      add
-      0xffffffffffffffff
-      dup2
-      gt
-      dup6
-      dup3
-      lt
-      or
-      tag_24
-      jumpi
-        /* \"C\":403:411  this.f() */
-      0x20
-        /* \"C\":79:428  contract C... */
-      swap2
-      dup6
-      swap2
-      dup6
-      mstore
-        /* \"C\":403:411  this.f() */
-      dup2
-      add
-        /* \"C\":79:428  contract C... */
-      sub
-      slt
-      tag_26
-      jumpi
-      swap2
-      mload
-      swap2
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_20
-        /* \"C\":403:411  this.f() */
-      jump(tag_19)
-        /* \"C\":79:428  contract C... */
-    tag_26:
-      0x00
-      dup1
-      revert
-    tag_24:
-        /* \"C\":117:119  41 */
-      shl(0xe0, 0x4e487b71)
-        /* \"C\":79:428  contract C... */
-      0x00
-      mstore
-      mstore(0x04, 0x41)
-      revert(0x00, 0x24)
-        /* \"C\":403:411  this.f() */
-    tag_22:
-      pop
-      returndatasize
-      jump(tag_23)
-    tag_16:
-        /* \"C\":79:428  contract C... */
-      dup3
-      mload
-      returndatasize
-      0x00
-      dup3
-      returndatacopy
-      returndatasize
-      swap1
-      revert
-    tag_14:
-        /* \"C\":117:119  41 */
-      shl(0xe0, 0x4e487b71)
-        /* \"C\":79:428  contract C... */
-      0x00
-        /* \"C\":117:119  41 */
-      mstore
-      0x11
-        /* \"C\":79:428  contract C... */
-      0x04
-        /* \"C\":117:119  41 */
-      mstore
-      0x24
-        /* \"C\":79:428  contract C... */
-      0x00
-        /* \"C\":117:119  41 */
-      revert
-        /* \"C\":79:428  contract C... */
-    tag_6:
-      pop
-      jumpi(tag_26, callvalue)
-      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-      0x20
-      swap1
-      sload(0x00)
-      swap1
-      mload
-      swap1
-      dup2
-      mstore
-      return
-    tag_4:
-      jumpi(tag_26, callvalue)
-      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":117:119  41 */
-      swap1
-      dup2
-      0x29
-      add
-      swap2
-      dup3
-      slt
-      0x01
-      and
-      tag_14
-      jumpi
-        /* \"C\":79:428  contract C... */
-      0x20
-      swap2
-      dup2
-      mstore
-      return
-        /* \"C\":117:119  41 */
-    tag_1:
-      swap2
-      swap1
-      swap2
-      0x00
-      dup4
-      dup3
-      add
-      swap4
-      dup5
-      slt
-      swap2
-      slt
-      swap1
-      dup1
-      iszero
-      dup3
-      and
-      swap2
-      iszero
-      and
-      or
-      tag_14
-      jumpi
-      jump\t// out
-
-    auxdata: <AUXDATA REMOVED>
-}
-"
-                }
-            }
-        },
-        "D":
-        {
-            "D":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"D\":91:166  contract D is C(3)... */
-  0xa0
-  jumpi(tag_5, callvalue)
-  0x1f
-  bytecodeSize
-  codesize
-  dup2
-  swap1
-  sub
-  swap2
-  dup3
-  add
-  not(0x1f)
-  and
-  dup4
-  add
-  swap2
-  sub(shl(0x40, 0x01), 0x01)
-  dup4
-  gt
-  dup5
-  dup5
-  lt
-  or
-  tag_3
-  jumpi
-  dup1
-  dup5
-  swap3
-  0x20
-  swap5
-  0x40
-  mstore
-  dup4
-  codecopy
-  dup2
-  add
-  sub
-  slt
-  tag_5
-  jumpi
-  mload
-    /* \"C\":147:149  42 */
-  mstore(0x80, 0x2a)
-    /* \"D\":91:166  contract D is C(3)... */
-  dup1
-    /* \"D\":107:108  3 */
-  0x03
-    /* \"D\":91:166  contract D is C(3)... */
-  add
-  swap1
-  dup2
-  slt
-  0x01
-  and
-  tag_7
-  jumpi
-  0x00
-  sstore
-  mload(0x40)
-  dataSize(sub_0)
-  swap1
-  dup2
-  dataOffset(sub_0)
-  dup3
-  codecopy
-    /* \"C\":147:149  42 */
-  0x80
-    /* \"D\":91:166  contract D is C(3)... */
-  mload
-  dup2
-  assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-  return
-tag_7:
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x11)
-  revert(0x00, 0x24)
-tag_5:
-  0x00
-  dup1
-  revert
-tag_3:
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x41)
-  revert(0x00, 0x24)
-stop
-
-sub_0: assembly {
-        /* \"D\":91:166  contract D is C(3)... */
-      0x80
-      0x40
-      swap1
-      dup1
-      dup3
-      mstore
-      jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
-      0x00
-      dup1
-      revert
-    tag_2:
-      shr(0xe0, calldataload(0x00))
-      swap1
-      dup2
-      0x26121ff0
-      eq
-      tag_4
-      jumpi
-      pop
-      dup1
-      0x793816ec
-      eq
-      tag_6
-      jumpi
-      0x9942ec6f
-      eq
-      tag_8
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_8:
-      jumpi(tag_26, callvalue)
-      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-      sload(0x00)
-      sub(shl(0xff, 0x01), 0x01)
-      dup2
-      eq
-      tag_14
-      jumpi
-      0x01
-      add
-      0x00
-      dup2
-      swap1
-      sstore
-      dup2
-      mload
-      shl(0xe4, 0x026121ff)
-        /* \"C\":403:411  this.f() */
-      dup2
-      mstore
-        /* \"D\":91:166  contract D is C(3)... */
-      swap2
-      swap1
-        /* \"C\":403:411  this.f() */
-      0x20
-        /* \"D\":91:166  contract D is C(3)... */
-      dup4
-      0x04
-      dup2
-        /* \"C\":403:407  this */
-      address
-        /* \"C\":403:411  this.f() */
-      gas
-      staticcall
-      swap3
-      dup4
-      iszero
-      tag_16
-      jumpi
-        /* \"D\":91:166  contract D is C(3)... */
-      0x00
-        /* \"C\":403:411  this.f() */
-      swap4
-      tag_18
-      jumpi
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_19:
-        /* \"C\":392:411  stateVar + this.f() */
-      pop
-      tag_20
-        /* \"C\":403:411  this.f() */
-      0x20
-        /* \"C\":392:411  stateVar + this.f() */
-      swap4
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_21
-        /* \"C\":392:411  stateVar + this.f() */
-      swap3
-      tag_1
-      jump\t// in
-    tag_20:
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      swap1
-      tag_1
-      jump\t// in
-    tag_21:
-        /* \"D\":91:166  contract D is C(3)... */
-      swap1
-      mload
-      swap1
-      dup2
-      mstore
-      return
-        /* \"C\":403:411  this.f() */
-    tag_18:
-      swap3
-      pop
-      0x20
-      jumpi(tag_22, gt(0x20, returndatasize))
-    tag_23:
-        /* \"D\":91:166  contract D is C(3)... */
-      0x1f
-      dup2
-      add
-      not(0x1f)
-      and
-      dup5
-      add
-      0xffffffffffffffff
-      dup2
-      gt
-      dup6
-      dup3
-      lt
-      or
-      tag_24
-      jumpi
-        /* \"C\":403:411  this.f() */
-      0x20
-        /* \"D\":91:166  contract D is C(3)... */
-      swap2
-      dup6
-      swap2
-      dup6
-      mstore
-        /* \"C\":403:411  this.f() */
-      dup2
-      add
-        /* \"D\":91:166  contract D is C(3)... */
-      sub
-      slt
-      tag_26
-      jumpi
-      swap2
-      mload
-      swap2
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_20
-        /* \"C\":403:411  this.f() */
-      jump(tag_19)
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_26:
-      0x00
-      dup1
-      revert
-    tag_24:
-        /* \"C\":117:119  41 */
-      shl(0xe0, 0x4e487b71)
-        /* \"D\":91:166  contract D is C(3)... */
-      0x00
-      mstore
-      mstore(0x04, 0x41)
-      revert(0x00, 0x24)
-        /* \"C\":403:411  this.f() */
-    tag_22:
-      pop
-      returndatasize
-      jump(tag_23)
-    tag_16:
-        /* \"D\":91:166  contract D is C(3)... */
-      dup3
-      mload
-      returndatasize
-      0x00
-      dup3
-      returndatacopy
-      returndatasize
-      swap1
-      revert
-    tag_14:
-        /* \"C\":117:119  41 */
-      shl(0xe0, 0x4e487b71)
-        /* \"D\":91:166  contract D is C(3)... */
-      0x00
-        /* \"C\":117:119  41 */
-      mstore
-      0x11
-        /* \"D\":91:166  contract D is C(3)... */
-      0x04
-        /* \"C\":117:119  41 */
-      mstore
-      0x24
-        /* \"D\":91:166  contract D is C(3)... */
-      0x00
-        /* \"C\":117:119  41 */
-      revert
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_6:
-      pop
-      jumpi(tag_26, callvalue)
-      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-      0x20
-      swap1
-      sload(0x00)
-      swap1
-      mload
-      swap1
-      dup2
-      mstore
-      return
-    tag_4:
-      jumpi(tag_26, callvalue)
-      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":117:119  41 */
-      swap1
-      dup2
-      0x29
-      add
-      swap2
-      dup3
-      slt
-      0x01
-      and
-      tag_14
-      jumpi
-        /* \"D\":91:166  contract D is C(3)... */
-      0x20
-      swap2
-      dup2
-      mstore
-      return
-        /* \"C\":117:119  41 */
-    tag_1:
-      swap2
-      swap1
-      swap2
-      0x00
-      dup4
-      dup3
-      add
-      swap4
-      dup5
-      slt
-      swap2
-      slt
-      swap1
-      dup1
-      iszero
-      dup3
-      and
-      swap2
-      iszero
-      and
-      or
-      tag_14
-      jumpi
-      jump\t// out
-
-    auxdata: <AUXDATA REMOVED>
-}
-"
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        },
-        "D":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/in.sol b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/in.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/input.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/input.json
deleted file mode 100644
index 3059e1ecd3e3..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_debug_info_in_yul_and_evm_asm_print_all/in.sol"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": ["*"]},
-		"optimizer": {"enabled": true},
-		"outputSelection": {
-			"*": {"*": ["ir", "irOptimized", "evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
deleted file mode 100644
index ee958b55b029..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"C\":60:101  contract C {... */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* \"C\":60:101  contract C {... */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* \"C\":77:99  function f() public {} */
-    tag_3:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
-"
-                },
-                "ir": "
-/// @use-src 0:\"C\"
-object \"C_6\" {
-    code {
-        /// @src 0:60:101  \"contract C {...\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_6()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\"))
-
-        return(_1, datasize(\"C_6_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:60:101  \"contract C {...\"
-        function constructor_C_6() {
-
-            /// @src 0:60:101  \"contract C {...\"
-
-        }
-        /// @src 0:60:101  \"contract C {...\"
-
-    }
-    /// @use-src 0:\"C\"
-    object \"C_6_deployed\" {
-        code {
-            /// @src 0:60:101  \"contract C {...\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            /// @ast-id 5
-            /// @src 0:77:99  \"function f() public {}\"
-            function fun_f_5() {
-
-            }
-            /// @src 0:60:101  \"contract C {...\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-",
-                "irOptimized": "/// @use-src 0:\"C\"
-object \"C_6\" {
-    code {
-        {
-            /// @src 0:60:101  \"contract C {...\"
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize(\"C_6_deployed\")
-            codecopy(_1, dataoffset(\"C_6_deployed\"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:\"C\"
-    object \"C_6_deployed\" {
-        code {
-            {
-                /// @src 0:60:101  \"contract C {...\"
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/in.sol b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/in.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/input.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/input.json
deleted file mode 100644
index 8e338322b0c7..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_debug_info_in_yul_and_evm_asm_print_location_only/in.sol"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": ["location"]},
-		"optimizer": {"enabled": true},
-		"outputSelection": {
-			"*": {"*": ["ir", "irOptimized", "evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
deleted file mode 100644
index 007b7fc62bad..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"C\":60:101 */
-  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-        /* \"C\":60:101 */
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-        /* \"C\":77:99 */
-    tag_3:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
-"
-                },
-                "ir": "
-/// @use-src 0:\"C\"
-object \"C_6\" {
-    code {
-        /// @src 0:60:101
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_6()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\"))
-
-        return(_1, datasize(\"C_6_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:60:101
-        function constructor_C_6() {
-
-            /// @src 0:60:101
-
-        }
-        /// @src 0:60:101
-
-    }
-    /// @use-src 0:\"C\"
-    object \"C_6_deployed\" {
-        code {
-            /// @src 0:60:101
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            /// @src 0:77:99
-            function fun_f_5() {
-
-            }
-            /// @src 0:60:101
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-",
-                "irOptimized": "/// @use-src 0:\"C\"
-object \"C_6\" {
-    code {
-        {
-            /// @src 0:60:101
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize(\"C_6_deployed\")
-            codecopy(_1, dataoffset(\"C_6_deployed\"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:\"C\"
-    object \"C_6_deployed\" {
-        code {
-            {
-                /// @src 0:60:101
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/in.sol b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/in.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/input.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/input.json
deleted file mode 100644
index c9184d944bfd..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_debug_info_in_yul_and_evm_asm_print_none/in.sol"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": []},
-		"optimizer": {"enabled": true},
-		"outputSelection": {
-			"*": {"*": ["ir", "irOptimized", "evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
deleted file mode 100644
index 884da9eb9715..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "assembly": "  mstore(0x40, 0x80)
-  callvalue
-  dup1
-  iszero
-  tag_1
-  jumpi
-  0x00
-  dup1
-  revert
-tag_1:
-  pop
-  dataSize(sub_0)
-  dup1
-  dataOffset(sub_0)
-  0x00
-  codecopy
-  0x00
-  return
-stop
-
-sub_0: assembly {
-      mstore(0x40, 0x80)
-      callvalue
-      dup1
-      iszero
-      tag_1
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_1:
-      pop
-      jumpi(tag_2, lt(calldatasize, 0x04))
-      shr(0xe0, calldataload(0x00))
-      dup1
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
-    tag_2:
-      0x00
-      dup1
-      revert
-    tag_3:
-      stop
-
-    auxdata: <AUXDATA REMOVED>
-}
-"
-                },
-                "ir": "
-/// @use-src 0:\"C\"
-object \"C_6\" {
-    code {
-
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_6()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\"))
-
-        return(_1, datasize(\"C_6_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        function constructor_C_6() {
-
-        }
-
-    }
-    /// @use-src 0:\"C\"
-    object \"C_6_deployed\" {
-        code {
-
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function fun_f_5() {
-
-            }
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-",
-                "irOptimized": "/// @use-src 0:\"C\"
-object \"C_6\" {
-    code {
-        {
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize(\"C_6_deployed\")
-            codecopy(_1, dataoffset(\"C_6_deployed\"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:\"C\"
-    object \"C_6_deployed\" {
-        code {
-            {
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/in.sol b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/in.sol
deleted file mode 100644
index 415509ef9aef..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/input.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/input.json
deleted file mode 100644
index 962688913096..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_debug_info_in_yul_and_evm_asm_print_snippet_only/in.sol"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": ["snippet"]},
-		"optimizer": {"enabled": true},
-		"outputSelection": {
-			"*": {"*": ["ir", "irOptimized", "evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json
deleted file mode 100644
index fb7f199a75cf..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "To use 'snippet' with settings.debug.debugInfo you must select also 'location'.",
-            "message": "To use 'snippet' with settings.debug.debugInfo you must select also 'location'.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/input.json b/test/cmdlineTests/standard_debug_info_in_yul_location/input.json
deleted file mode 100644
index 8ba84239afd9..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"C":
-		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\n\ncontract C\n{\n	int public constant constVar = 41;\n	int immutable immutVar = 42;\n	int public stateVar;\n\n	constructor(int _init)\n	{\n		stateVar = _init;\n	}\n\n	function f() external pure returns (int)\n	{\n		return constVar + immutVar;\n	}\n	modifier m()\n	{\n		stateVar++;\n		_;\n	}\n	function f2() m public returns (int)\n	{\n		return stateVar + this.f() + immutVar;\n	}\n}\n"
-		},
-		"D":
-		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\nimport \"C\";\n\ncontract D is C(3)\n{\n	constructor(int _init2)\n	{\n		stateVar += _init2;\n	}\n}\n"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir", "irOptimized"] }
-		},
-		"optimizer": { "enabled": true }
-	}
-}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
deleted file mode 100644
index 2671162722e0..000000000000
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ /dev/null
@@ -1,1629 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"C\"
-object \"C_54\" {
-    code {
-        /// @src 0:79:435  \"contract C...\"
-        mstore(64, memoryguard(160))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        let _1 := copy_arguments_for_constructor_20_object_C_54()
-        constructor_C_54(_1)
-
-        let _2 := allocate_unbounded()
-        codecopy(_2, dataoffset(\"C_54_deployed\"), datasize(\"C_54_deployed\"))
-
-        setimmutable(_2, \"8\", mload(128))
-
-        return(_2, datasize(\"C_54_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        function round_up_to_mul_of_32(value) -> result {
-            result := and(add(value, 31), not(31))
-        }
-
-        function panic_error_0x41() {
-            mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-            mstore(4, 0x41)
-            revert(0, 0x24)
-        }
-
-        function finalize_allocation(memPtr, size) {
-            let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-            // protect against overflow
-            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-            mstore(64, newFreePtr)
-        }
-
-        function allocate_memory(size) -> memPtr {
-            memPtr := allocate_unbounded()
-            finalize_allocation(memPtr, size)
-        }
-
-        function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-            revert(0, 0)
-        }
-
-        function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-            revert(0, 0)
-        }
-
-        function cleanup_t_int256(value) -> cleaned {
-            cleaned := value
-        }
-
-        function validator_revert_t_int256(value) {
-            if iszero(eq(value, cleanup_t_int256(value))) { revert(0, 0) }
-        }
-
-        function abi_decode_t_int256_fromMemory(offset, end) -> value {
-            value := mload(offset)
-            validator_revert_t_int256(value)
-        }
-
-        function abi_decode_tuple_t_int256_fromMemory(headStart, dataEnd) -> value0 {
-            if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            {
-
-                let offset := 0
-
-                value0 := abi_decode_t_int256_fromMemory(add(headStart, offset), dataEnd)
-            }
-
-        }
-
-        function copy_arguments_for_constructor_20_object_C_54() -> ret_param_0 {
-            let programSize := datasize(\"C_54\")
-            let argSize := sub(codesize(), programSize)
-
-            let memoryDataOffset := allocate_memory(argSize)
-            codecopy(memoryDataOffset, programSize, argSize)
-
-            ret_param_0 := abi_decode_tuple_t_int256_fromMemory(memoryDataOffset, add(memoryDataOffset, argSize))
-        }
-
-        function cleanup_t_rational_42_by_1(value) -> cleaned {
-            cleaned := value
-        }
-
-        function identity(value) -> ret {
-            ret := value
-        }
-
-        function convert_t_rational_42_by_1_to_t_int256(value) -> converted {
-            converted := cleanup_t_int256(identity(cleanup_t_rational_42_by_1(value)))
-        }
-
-        function shift_left_0(value) -> newValue {
-            newValue :=
-
-            shl(0, value)
-
-        }
-
-        function update_byte_slice_32_shift_0(value, toInsert) -> result {
-            let mask := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-            toInsert := shift_left_0(toInsert)
-            value := and(value, not(mask))
-            result := or(value, and(toInsert, mask))
-        }
-
-        function convert_t_int256_to_t_int256(value) -> converted {
-            converted := cleanup_t_int256(identity(cleanup_t_int256(value)))
-        }
-
-        function prepare_store_t_int256(value) -> ret {
-            ret := value
-        }
-
-        function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
-            let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
-            sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
-        }
-
-        /// @ast-id 20
-        /// @src 0:182:230  \"constructor(int _init)...\"
-        function constructor_C_54(var__init_12) {
-
-            /// @src 0:182:230  \"constructor(int _init)...\"
-
-            /// @src 0:154:156  \"42\"
-            let expr_7 := 0x2a
-            let _3 := convert_t_rational_42_by_1_to_t_int256(expr_7)
-            mstore(128, _3)
-
-            /// @src 0:221:226  \"_init\"
-            let _4 := var__init_12
-            let expr_16 := _4
-            /// @src 0:210:226  \"stateVar = _init\"
-            update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
-            let expr_17 := expr_16
-
-        }
-        /// @src 0:79:435  \"contract C...\"
-
-    }
-    /// @use-src 0:\"C\"
-    object \"C_54_deployed\" {
-        code {
-            /// @src 0:79:435  \"contract C...\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_30()
-                }
-
-                case 0x793816ec
-                {
-                    // stateVar()
-
-                    external_fun_stateVar_10()
-                }
-
-                case 0x9942ec6f
-                {
-                    // f2()
-
-                    external_fun_f2_53()
-                }
-
-                case 0xa00b982b
-                {
-                    // constVar()
-
-                    external_fun_constVar_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function cleanup_t_int256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function abi_encode_t_int256_to_t_int256_fromStack(value, pos) {
-                mstore(pos, cleanup_t_int256(value))
-            }
-
-            function abi_encode_tuple_t_int256__to_t_int256__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                abi_encode_t_int256_to_t_int256_fromStack(value0,  add(headStart, 0))
-
-            }
-
-            function external_fun_f_30() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_30()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function shift_right_unsigned_dynamic(bits, value) -> newValue {
-                newValue :=
-
-                shr(bits, value)
-
-            }
-
-            function cleanup_from_storage_t_int256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function extract_from_storage_value_dynamict_int256(slot_value, offset) -> value {
-                value := cleanup_from_storage_t_int256(shift_right_unsigned_dynamic(mul(offset, 8), slot_value))
-            }
-
-            function read_from_storage_split_dynamic_t_int256(slot, offset) -> value {
-                value := extract_from_storage_value_dynamict_int256(sload(slot), offset)
-
-            }
-
-            /// @ast-id 10
-            /// @src 0:159:178  \"int public stateVar\"
-            function getter_fun_stateVar_10() -> ret {
-
-                let slot := 0
-                let offset := 0
-
-                ret := read_from_storage_split_dynamic_t_int256(slot, offset)
-
-            }
-            /// @src 0:79:435  \"contract C...\"
-
-            function external_fun_stateVar_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  getter_fun_stateVar_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function external_fun_f2_53() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f2_53()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function cleanup_t_rational_41_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function identity(value) -> ret {
-                ret := value
-            }
-
-            function convert_t_rational_41_by_1_to_t_int256(value) -> converted {
-                converted := cleanup_t_int256(identity(cleanup_t_rational_41_by_1(value)))
-            }
-
-            /// @src 0:93:126  \"int public constant constVar = 41\"
-            function constant_constVar_5() -> ret {
-                /// @src 0:124:126  \"41\"
-                let expr_4 := 0x29
-                let _1 := convert_t_rational_41_by_1_to_t_int256(expr_4)
-
-                ret := _1
-            }
-
-            /// @ast-id 5
-            /// @src 0:93:126  \"int public constant constVar = 41\"
-            function getter_fun_constVar_5() -> ret_0 {
-                ret_0 := constant_constVar_5()
-            }
-            /// @src 0:79:435  \"contract C...\"
-
-            function external_fun_constVar_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  getter_fun_constVar_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_int256() -> ret {
-                ret := 0
-            }
-
-            function panic_error_0x11() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-
-            function checked_add_t_int256(x, y) -> sum {
-                x := cleanup_t_int256(x)
-                y := cleanup_t_int256(y)
-                sum := add(x, y)
-
-                // overflow, if x >= 0 and sum < y
-                // underflow, if x < 0 and sum >= y
-                if or(
-                    and(iszero(slt(x, 0)), slt(sum, y)),
-                    and(slt(x, 0), iszero(slt(sum, y)))
-                ) { panic_error_0x11() }
-
-            }
-
-            /// @ast-id 30
-            /// @src 0:233:309  \"function f() external pure returns (int)...\"
-            function fun_f_30() -> var__23 {
-                /// @src 0:269:272  \"int\"
-                let zero_t_int256_2 := zero_value_for_split_t_int256()
-                var__23 := zero_t_int256_2
-
-                /// @src 0:286:294  \"constVar\"
-                let expr_25 := constant_constVar_5()
-                /// @src 0:297:305  \"immutVar\"
-                let _3 := loadimmutable(\"8\")
-                let expr_26 := _3
-                /// @src 0:286:305  \"constVar + immutVar\"
-                let expr_27 := checked_add_t_int256(expr_25, expr_26)
-
-                /// @src 0:279:305  \"return constVar + immutVar\"
-                var__23 := expr_27
-                leave
-
-            }
-            /// @src 0:79:435  \"contract C...\"
-
-            function shift_right_0_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(0, value)
-
-            }
-
-            function extract_from_storage_value_offset_0t_int256(slot_value) -> value {
-                value := cleanup_from_storage_t_int256(shift_right_0_unsigned(slot_value))
-            }
-
-            function read_from_storage_split_offset_0_t_int256(slot) -> value {
-                value := extract_from_storage_value_offset_0t_int256(sload(slot))
-
-            }
-
-            function increment_t_int256(value) -> ret {
-                value := cleanup_t_int256(value)
-                if eq(value, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) { panic_error_0x11() }
-                ret := add(value, 1)
-            }
-
-            function shift_left_0(value) -> newValue {
-                newValue :=
-
-                shl(0, value)
-
-            }
-
-            function update_byte_slice_32_shift_0(value, toInsert) -> result {
-                let mask := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                toInsert := shift_left_0(toInsert)
-                value := and(value, not(mask))
-                result := or(value, and(toInsert, mask))
-            }
-
-            function convert_t_int256_to_t_int256(value) -> converted {
-                converted := cleanup_t_int256(identity(cleanup_t_int256(value)))
-            }
-
-            function prepare_store_t_int256(value) -> ret {
-                ret := value
-            }
-
-            function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
-                let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
-                sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
-            }
-
-            /// @ast-id 37
-            /// @src 0:311:348  \"modifier m()...\"
-            function modifier_m_40(var__42) -> _5 {
-                _5 := var__42
-
-                /// @src 0:329:339  \"stateVar++\"
-                let _7 := read_from_storage_split_offset_0_t_int256(0x00)
-                let _6 := increment_t_int256(_7)
-                update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
-                let expr_33 := _7
-                /// @src 0:343:344  \"_\"
-                _5 := fun_f2_53_inner(var__42)
-
-            }
-            /// @src 0:79:435  \"contract C...\"
-
-            function cleanup_t_uint160(value) -> cleaned {
-                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
-            }
-
-            function convert_t_uint160_to_t_uint160(value) -> converted {
-                converted := cleanup_t_uint160(identity(cleanup_t_uint160(value)))
-            }
-
-            function convert_t_uint160_to_t_address(value) -> converted {
-                converted := convert_t_uint160_to_t_uint160(value)
-            }
-
-            function convert_t_contract$_C_$54_to_t_address(value) -> converted {
-                converted := convert_t_uint160_to_t_address(value)
-            }
-
-            function revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() {
-                revert(0, 0)
-            }
-
-            function round_up_to_mul_of_32(value) -> result {
-                result := and(add(value, 31), not(31))
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function finalize_allocation(memPtr, size) {
-                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-                // protect against overflow
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-
-            function shift_left_224(value) -> newValue {
-                newValue :=
-
-                shl(224, value)
-
-            }
-
-            function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-                revert(0, 0)
-            }
-
-            function validator_revert_t_int256(value) {
-                if iszero(eq(value, cleanup_t_int256(value))) { revert(0, 0) }
-            }
-
-            function abi_decode_t_int256_fromMemory(offset, end) -> value {
-                value := mload(offset)
-                validator_revert_t_int256(value)
-            }
-
-            function abi_decode_tuple_t_int256_fromMemory(headStart, dataEnd) -> value0 {
-                if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-                {
-
-                    let offset := 0
-
-                    value0 := abi_decode_t_int256_fromMemory(add(headStart, offset), dataEnd)
-                }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function revert_forward_1() {
-                let pos := allocate_unbounded()
-                returndatacopy(pos, 0, returndatasize())
-                revert(pos, returndatasize())
-            }
-
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
-            function fun_f2_53_inner(_8) -> var__42 {
-                var__42 := _8
-
-                /// @src 0:399:407  \"stateVar\"
-                let _9 := read_from_storage_split_offset_0_t_int256(0x00)
-                let expr_44 := _9
-                /// @src 0:410:414  \"this\"
-                let expr_45_address := address()
-                /// @src 0:410:416  \"this.f\"
-                let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address)
-                let expr_46_functionSelector := 0x26121ff0
-                /// @src 0:410:418  \"this.f()\"
-
-                // storage for arguments and returned data
-                let _10 := allocate_unbounded()
-                mstore(_10, shift_left_224(expr_46_functionSelector))
-                let _11 := abi_encode_tuple__to__fromStack(add(_10, 4) )
-
-                let _12 := staticcall(gas(), expr_46_address,  _10, sub(_11, _10), _10, 32)
-
-                if iszero(_12) { revert_forward_1() }
-
-                let expr_47
-                if _12 {
-
-                    let _13 := 32
-
-                    if gt(_13, returndatasize()) {
-                        _13 := returndatasize()
-                    }
-
-                    // update freeMemoryPointer according to dynamic return size
-                    finalize_allocation(_10, _13)
-
-                    // decode return parameters from external try-call into retVars
-                    expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, _13))
-                }
-                /// @src 0:399:418  \"stateVar + this.f()\"
-                let expr_48 := checked_add_t_int256(expr_44, expr_47)
-
-                /// @src 0:421:429  \"immutVar\"
-                let _14 := loadimmutable(\"8\")
-                let expr_49 := _14
-                /// @src 0:399:429  \"stateVar + this.f() + immutVar\"
-                let expr_50 := checked_add_t_int256(expr_48, expr_49)
-
-                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
-                var__42 := expr_50
-                leave
-
-            }
-            /// @src 0:79:435  \"contract C...\"
-
-            /// @ast-id 53
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
-            function fun_f2_53() -> var__42 {
-                /// @src 0:382:385  \"int\"
-                let zero_t_int256_4 := zero_value_for_split_t_int256()
-                var__42 := zero_t_int256_4
-
-                var__42 := modifier_m_40(var__42)
-            }
-            /// @src 0:79:435  \"contract C...\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-",
-                "irOptimized": "/// @use-src 0:\"C\"
-object \"C_54\" {
-    code {
-        {
-            /// @src 0:79:435  \"contract C...\"
-            let _1 := memoryguard(0xa0)
-            if callvalue() { revert(0, 0) }
-            let programSize := datasize(\"C_54\")
-            let argSize := sub(codesize(), programSize)
-            let newFreePtr := add(_1, and(add(argSize, 31), not(31)))
-            if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, _1))
-            {
-                mstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ shl(224, 0x4e487b71))
-                mstore(4, 0x41)
-                revert(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ 0x24)
-            }
-            mstore(64, newFreePtr)
-            codecopy(_1, programSize, argSize)
-            if slt(sub(add(_1, argSize), _1), 32)
-            {
-                revert(/** @src -1:-1:-1 */ 0, 0)
-            }
-            /// @src 0:79:435  \"contract C...\"
-            let value := mload(_1)
-            /// @src 0:154:156  \"42\"
-            mstore(128, 0x2a)
-            /// @src 0:79:435  \"contract C...\"
-            sstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ value)
-            let _2 := mload(64)
-            let _3 := datasize(\"C_54_deployed\")
-            codecopy(_2, dataoffset(\"C_54_deployed\"), _3)
-            setimmutable(_2, \"8\", mload(/** @src 0:154:156  \"42\" */ 128))
-            /// @src 0:79:435  \"contract C...\"
-            return(_2, _3)
-        }
-    }
-    /// @use-src 0:\"C\"
-    object \"C_54_deployed\" {
-        code {
-            {
-                /// @src 0:79:435  \"contract C...\"
-                let _1 := memoryguard(0x80)
-                let _2 := 64
-                mstore(_2, _1)
-                if iszero(lt(calldatasize(), 4))
-                {
-                    switch shr(224, calldataload(0))
-                    case 0x26121ff0 {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:297:305  \"immutVar\"
-                        let _3 := loadimmutable(\"8\")
-                        /// @src 0:79:435  \"contract C...\"
-                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _3)
-                        if and(1, slt(sum, _3))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x11)
-                            revert(0, 0x24)
-                        }
-                        mstore(_1, sum)
-                        return(_1, 32)
-                    }
-                    case 0x793816ec {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let _4 := sload(0)
-                        let memPos := mload(_2)
-                        mstore(memPos, _4)
-                        return(memPos, 32)
-                    }
-                    case 0x9942ec6f {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let _5 := sload(0)
-                        if eq(_5, sub(shl(255, 1), 1))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x11)
-                            revert(0, 0x24)
-                        }
-                        let ret := add(_5, 1)
-                        sstore(0, ret)
-                        /// @src 0:410:418  \"this.f()\"
-                        let _6 := /** @src 0:79:435  \"contract C...\" */ mload(_2)
-                        /// @src 0:410:418  \"this.f()\"
-                        mstore(_6, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
-                        /// @src 0:410:418  \"this.f()\"
-                        let _7 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _6, /** @src 0:79:435  \"contract C...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _6, 32)
-                        if iszero(_7)
-                        {
-                            /// @src 0:79:435  \"contract C...\"
-                            let pos := mload(_2)
-                            returndatacopy(pos, 0, returndatasize())
-                            revert(pos, returndatasize())
-                        }
-                        /// @src 0:410:418  \"this.f()\"
-                        let expr := /** @src 0:79:435  \"contract C...\" */ 0
-                        /// @src 0:410:418  \"this.f()\"
-                        if _7
-                        {
-                            let _8 := 32
-                            if gt(32, returndatasize()) { _8 := returndatasize() }
-                            /// @src 0:79:435  \"contract C...\"
-                            let newFreePtr := add(_6, and(add(_8, 31), not(31)))
-                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
-                            {
-                                mstore(0, shl(224, 0x4e487b71))
-                                mstore(4, 0x41)
-                                revert(0, 0x24)
-                            }
-                            mstore(_2, newFreePtr)
-                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_6, _8), /** @src 0:79:435  \"contract C...\" */ _6), /** @src 0:410:418  \"this.f()\" */ 32)
-                            /// @src 0:79:435  \"contract C...\"
-                            { revert(0, 0) }
-                            /// @src 0:410:418  \"this.f()\"
-                            expr := /** @src 0:79:435  \"contract C...\" */ mload(_6)
-                        }
-                        /// @src 0:399:418  \"stateVar + this.f()\"
-                        let expr_1 := checked_add_int256(ret, expr)
-                        /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
-                        let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
-                        /// @src 0:79:435  \"contract C...\"
-                        let memPos_1 := mload(_2)
-                        mstore(memPos_1, var)
-                        return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
-                    }
-                    case /** @src 0:79:435  \"contract C...\" */ 0xa00b982b {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let memPos_2 := mload(_2)
-                        mstore(memPos_2, /** @src 0:124:126  \"41\" */ 0x29)
-                        /// @src 0:79:435  \"contract C...\"
-                        return(memPos_2, 32)
-                    }
-                }
-                revert(0, 0)
-            }
-            function checked_add_int256(x, y) -> sum
-            {
-                sum := add(x, y)
-                let _1 := slt(sum, y)
-                let _2 := slt(x, 0)
-                if or(and(iszero(_2), _1), and(_2, iszero(_1)))
-                {
-                    mstore(0, shl(224, 0x4e487b71))
-                    mstore(4, 0x11)
-                    revert(0, 0x24)
-                }
-            }
-        }
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-}
-"
-            }
-        },
-        "D":
-        {
-            "D":
-            {
-                "ir": "
-/// @use-src 0:\"C\", 1:\"D\"
-object \"D_72\" {
-    code {
-        /// @src 1:91:166  \"contract D is C(3)...\"
-        mstore(64, memoryguard(160))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        let _1 := copy_arguments_for_constructor_71_object_D_72()
-        constructor_D_72(_1)
-
-        let _2 := allocate_unbounded()
-        codecopy(_2, dataoffset(\"D_72_deployed\"), datasize(\"D_72_deployed\"))
-
-        setimmutable(_2, \"8\", mload(128))
-
-        return(_2, datasize(\"D_72_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        function round_up_to_mul_of_32(value) -> result {
-            result := and(add(value, 31), not(31))
-        }
-
-        function panic_error_0x41() {
-            mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-            mstore(4, 0x41)
-            revert(0, 0x24)
-        }
-
-        function finalize_allocation(memPtr, size) {
-            let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-            // protect against overflow
-            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-            mstore(64, newFreePtr)
-        }
-
-        function allocate_memory(size) -> memPtr {
-            memPtr := allocate_unbounded()
-            finalize_allocation(memPtr, size)
-        }
-
-        function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-            revert(0, 0)
-        }
-
-        function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-            revert(0, 0)
-        }
-
-        function cleanup_t_int256(value) -> cleaned {
-            cleaned := value
-        }
-
-        function validator_revert_t_int256(value) {
-            if iszero(eq(value, cleanup_t_int256(value))) { revert(0, 0) }
-        }
-
-        function abi_decode_t_int256_fromMemory(offset, end) -> value {
-            value := mload(offset)
-            validator_revert_t_int256(value)
-        }
-
-        function abi_decode_tuple_t_int256_fromMemory(headStart, dataEnd) -> value0 {
-            if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            {
-
-                let offset := 0
-
-                value0 := abi_decode_t_int256_fromMemory(add(headStart, offset), dataEnd)
-            }
-
-        }
-
-        function copy_arguments_for_constructor_71_object_D_72() -> ret_param_0 {
-            let programSize := datasize(\"D_72\")
-            let argSize := sub(codesize(), programSize)
-
-            let memoryDataOffset := allocate_memory(argSize)
-            codecopy(memoryDataOffset, programSize, argSize)
-
-            ret_param_0 := abi_decode_tuple_t_int256_fromMemory(memoryDataOffset, add(memoryDataOffset, argSize))
-        }
-
-        function cleanup_t_rational_3_by_1(value) -> cleaned {
-            cleaned := value
-        }
-
-        function identity(value) -> ret {
-            ret := value
-        }
-
-        function convert_t_rational_3_by_1_to_t_int256(value) -> converted {
-            converted := cleanup_t_int256(identity(cleanup_t_rational_3_by_1(value)))
-        }
-
-        function shift_right_0_unsigned(value) -> newValue {
-            newValue :=
-
-            shr(0, value)
-
-        }
-
-        function cleanup_from_storage_t_int256(value) -> cleaned {
-            cleaned := value
-        }
-
-        function extract_from_storage_value_offset_0t_int256(slot_value) -> value {
-            value := cleanup_from_storage_t_int256(shift_right_0_unsigned(slot_value))
-        }
-
-        function read_from_storage_split_offset_0_t_int256(slot) -> value {
-            value := extract_from_storage_value_offset_0t_int256(sload(slot))
-
-        }
-
-        function panic_error_0x11() {
-            mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-            mstore(4, 0x11)
-            revert(0, 0x24)
-        }
-
-        function checked_add_t_int256(x, y) -> sum {
-            x := cleanup_t_int256(x)
-            y := cleanup_t_int256(y)
-            sum := add(x, y)
-
-            // overflow, if x >= 0 and sum < y
-            // underflow, if x < 0 and sum >= y
-            if or(
-                and(iszero(slt(x, 0)), slt(sum, y)),
-                and(slt(x, 0), iszero(slt(sum, y)))
-            ) { panic_error_0x11() }
-
-        }
-
-        function shift_left_0(value) -> newValue {
-            newValue :=
-
-            shl(0, value)
-
-        }
-
-        function update_byte_slice_32_shift_0(value, toInsert) -> result {
-            let mask := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-            toInsert := shift_left_0(toInsert)
-            value := and(value, not(mask))
-            result := or(value, and(toInsert, mask))
-        }
-
-        function convert_t_int256_to_t_int256(value) -> converted {
-            converted := cleanup_t_int256(identity(cleanup_t_int256(value)))
-        }
-
-        function prepare_store_t_int256(value) -> ret {
-            ret := value
-        }
-
-        function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
-            let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
-            sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
-        }
-
-        /// @ast-id 71
-        /// @src 1:113:164  \"constructor(int _init2)...\"
-        function constructor_D_72(var__init2_63) {
-            /// @src 1:107:108  \"3\"
-            let expr_60 := 0x03
-            let _3 := convert_t_rational_3_by_1_to_t_int256(expr_60)
-
-            /// @src 1:113:164  \"constructor(int _init2)...\"
-            constructor_C_54(_3)
-
-            /// @src 1:154:160  \"_init2\"
-            let _4 := var__init2_63
-            let expr_67 := _4
-            /// @src 1:142:160  \"stateVar += _init2\"
-            let _5 := read_from_storage_split_offset_0_t_int256(0x00)
-            let expr_68 := checked_add_t_int256(_5, expr_67)
-
-            update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_68)
-
-        }
-        /// @src 1:91:166  \"contract D is C(3)...\"
-
-        function cleanup_t_rational_42_by_1(value) -> cleaned {
-            cleaned := value
-        }
-
-        function convert_t_rational_42_by_1_to_t_int256(value) -> converted {
-            converted := cleanup_t_int256(identity(cleanup_t_rational_42_by_1(value)))
-        }
-
-        /// @ast-id 20
-        /// @src 0:182:230  \"constructor(int _init)...\"
-        function constructor_C_54(var__init_12) {
-
-            /// @src 0:182:230  \"constructor(int _init)...\"
-
-            /// @src 0:154:156  \"42\"
-            let expr_7 := 0x2a
-            let _6 := convert_t_rational_42_by_1_to_t_int256(expr_7)
-            mstore(128, _6)
-
-            /// @src 0:221:226  \"_init\"
-            let _7 := var__init_12
-            let expr_16 := _7
-            /// @src 0:210:226  \"stateVar = _init\"
-            update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
-            let expr_17 := expr_16
-
-        }
-        /// @src 1:91:166  \"contract D is C(3)...\"
-
-    }
-    /// @use-src 0:\"C\", 1:\"D\"
-    object \"D_72_deployed\" {
-        code {
-            /// @src 1:91:166  \"contract D is C(3)...\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_30()
-                }
-
-                case 0x793816ec
-                {
-                    // stateVar()
-
-                    external_fun_stateVar_10()
-                }
-
-                case 0x9942ec6f
-                {
-                    // f2()
-
-                    external_fun_f2_53()
-                }
-
-                case 0xa00b982b
-                {
-                    // constVar()
-
-                    external_fun_constVar_5()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function cleanup_t_int256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function abi_encode_t_int256_to_t_int256_fromStack(value, pos) {
-                mstore(pos, cleanup_t_int256(value))
-            }
-
-            function abi_encode_tuple_t_int256__to_t_int256__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                abi_encode_t_int256_to_t_int256_fromStack(value0,  add(headStart, 0))
-
-            }
-
-            function external_fun_f_30() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_30()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function shift_right_unsigned_dynamic(bits, value) -> newValue {
-                newValue :=
-
-                shr(bits, value)
-
-            }
-
-            function cleanup_from_storage_t_int256(value) -> cleaned {
-                cleaned := value
-            }
-
-            function extract_from_storage_value_dynamict_int256(slot_value, offset) -> value {
-                value := cleanup_from_storage_t_int256(shift_right_unsigned_dynamic(mul(offset, 8), slot_value))
-            }
-
-            function read_from_storage_split_dynamic_t_int256(slot, offset) -> value {
-                value := extract_from_storage_value_dynamict_int256(sload(slot), offset)
-
-            }
-
-            /// @ast-id 10
-            /// @src 0:159:178  \"int public stateVar\"
-            function getter_fun_stateVar_10() -> ret {
-
-                let slot := 0
-                let offset := 0
-
-                ret := read_from_storage_split_dynamic_t_int256(slot, offset)
-
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-
-            function external_fun_stateVar_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  getter_fun_stateVar_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function external_fun_f2_53() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f2_53()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function cleanup_t_rational_41_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function identity(value) -> ret {
-                ret := value
-            }
-
-            function convert_t_rational_41_by_1_to_t_int256(value) -> converted {
-                converted := cleanup_t_int256(identity(cleanup_t_rational_41_by_1(value)))
-            }
-
-            /// @src 0:93:126  \"int public constant constVar = 41\"
-            function constant_constVar_5() -> ret {
-                /// @src 0:124:126  \"41\"
-                let expr_4 := 0x29
-                let _1 := convert_t_rational_41_by_1_to_t_int256(expr_4)
-
-                ret := _1
-            }
-
-            /// @ast-id 5
-            /// @src 0:93:126  \"int public constant constVar = 41\"
-            function getter_fun_constVar_5() -> ret_0 {
-                ret_0 := constant_constVar_5()
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-
-            function external_fun_constVar_5() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  getter_fun_constVar_5()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_int256() -> ret {
-                ret := 0
-            }
-
-            function panic_error_0x11() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-
-            function checked_add_t_int256(x, y) -> sum {
-                x := cleanup_t_int256(x)
-                y := cleanup_t_int256(y)
-                sum := add(x, y)
-
-                // overflow, if x >= 0 and sum < y
-                // underflow, if x < 0 and sum >= y
-                if or(
-                    and(iszero(slt(x, 0)), slt(sum, y)),
-                    and(slt(x, 0), iszero(slt(sum, y)))
-                ) { panic_error_0x11() }
-
-            }
-
-            /// @ast-id 30
-            /// @src 0:233:309  \"function f() external pure returns (int)...\"
-            function fun_f_30() -> var__23 {
-                /// @src 0:269:272  \"int\"
-                let zero_t_int256_2 := zero_value_for_split_t_int256()
-                var__23 := zero_t_int256_2
-
-                /// @src 0:286:294  \"constVar\"
-                let expr_25 := constant_constVar_5()
-                /// @src 0:297:305  \"immutVar\"
-                let _3 := loadimmutable(\"8\")
-                let expr_26 := _3
-                /// @src 0:286:305  \"constVar + immutVar\"
-                let expr_27 := checked_add_t_int256(expr_25, expr_26)
-
-                /// @src 0:279:305  \"return constVar + immutVar\"
-                var__23 := expr_27
-                leave
-
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-
-            function shift_right_0_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(0, value)
-
-            }
-
-            function extract_from_storage_value_offset_0t_int256(slot_value) -> value {
-                value := cleanup_from_storage_t_int256(shift_right_0_unsigned(slot_value))
-            }
-
-            function read_from_storage_split_offset_0_t_int256(slot) -> value {
-                value := extract_from_storage_value_offset_0t_int256(sload(slot))
-
-            }
-
-            function increment_t_int256(value) -> ret {
-                value := cleanup_t_int256(value)
-                if eq(value, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) { panic_error_0x11() }
-                ret := add(value, 1)
-            }
-
-            function shift_left_0(value) -> newValue {
-                newValue :=
-
-                shl(0, value)
-
-            }
-
-            function update_byte_slice_32_shift_0(value, toInsert) -> result {
-                let mask := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                toInsert := shift_left_0(toInsert)
-                value := and(value, not(mask))
-                result := or(value, and(toInsert, mask))
-            }
-
-            function convert_t_int256_to_t_int256(value) -> converted {
-                converted := cleanup_t_int256(identity(cleanup_t_int256(value)))
-            }
-
-            function prepare_store_t_int256(value) -> ret {
-                ret := value
-            }
-
-            function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
-                let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
-                sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
-            }
-
-            /// @ast-id 37
-            /// @src 0:311:348  \"modifier m()...\"
-            function modifier_m_40(var__42) -> _5 {
-                _5 := var__42
-
-                /// @src 0:329:339  \"stateVar++\"
-                let _7 := read_from_storage_split_offset_0_t_int256(0x00)
-                let _6 := increment_t_int256(_7)
-                update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
-                let expr_33 := _7
-                /// @src 0:343:344  \"_\"
-                _5 := fun_f2_53_inner(var__42)
-
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-
-            function cleanup_t_uint160(value) -> cleaned {
-                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
-            }
-
-            function convert_t_uint160_to_t_uint160(value) -> converted {
-                converted := cleanup_t_uint160(identity(cleanup_t_uint160(value)))
-            }
-
-            function convert_t_uint160_to_t_address(value) -> converted {
-                converted := convert_t_uint160_to_t_uint160(value)
-            }
-
-            function convert_t_contract$_C_$54_to_t_address(value) -> converted {
-                converted := convert_t_uint160_to_t_address(value)
-            }
-
-            function revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() {
-                revert(0, 0)
-            }
-
-            function round_up_to_mul_of_32(value) -> result {
-                result := and(add(value, 31), not(31))
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function finalize_allocation(memPtr, size) {
-                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-                // protect against overflow
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-
-            function shift_left_224(value) -> newValue {
-                newValue :=
-
-                shl(224, value)
-
-            }
-
-            function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-                revert(0, 0)
-            }
-
-            function validator_revert_t_int256(value) {
-                if iszero(eq(value, cleanup_t_int256(value))) { revert(0, 0) }
-            }
-
-            function abi_decode_t_int256_fromMemory(offset, end) -> value {
-                value := mload(offset)
-                validator_revert_t_int256(value)
-            }
-
-            function abi_decode_tuple_t_int256_fromMemory(headStart, dataEnd) -> value0 {
-                if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-                {
-
-                    let offset := 0
-
-                    value0 := abi_decode_t_int256_fromMemory(add(headStart, offset), dataEnd)
-                }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function revert_forward_1() {
-                let pos := allocate_unbounded()
-                returndatacopy(pos, 0, returndatasize())
-                revert(pos, returndatasize())
-            }
-
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
-            function fun_f2_53_inner(_8) -> var__42 {
-                var__42 := _8
-
-                /// @src 0:399:407  \"stateVar\"
-                let _9 := read_from_storage_split_offset_0_t_int256(0x00)
-                let expr_44 := _9
-                /// @src 0:410:414  \"this\"
-                let expr_45_address := address()
-                /// @src 0:410:416  \"this.f\"
-                let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address)
-                let expr_46_functionSelector := 0x26121ff0
-                /// @src 0:410:418  \"this.f()\"
-
-                // storage for arguments and returned data
-                let _10 := allocate_unbounded()
-                mstore(_10, shift_left_224(expr_46_functionSelector))
-                let _11 := abi_encode_tuple__to__fromStack(add(_10, 4) )
-
-                let _12 := staticcall(gas(), expr_46_address,  _10, sub(_11, _10), _10, 32)
-
-                if iszero(_12) { revert_forward_1() }
-
-                let expr_47
-                if _12 {
-
-                    let _13 := 32
-
-                    if gt(_13, returndatasize()) {
-                        _13 := returndatasize()
-                    }
-
-                    // update freeMemoryPointer according to dynamic return size
-                    finalize_allocation(_10, _13)
-
-                    // decode return parameters from external try-call into retVars
-                    expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, _13))
-                }
-                /// @src 0:399:418  \"stateVar + this.f()\"
-                let expr_48 := checked_add_t_int256(expr_44, expr_47)
-
-                /// @src 0:421:429  \"immutVar\"
-                let _14 := loadimmutable(\"8\")
-                let expr_49 := _14
-                /// @src 0:399:429  \"stateVar + this.f() + immutVar\"
-                let expr_50 := checked_add_t_int256(expr_48, expr_49)
-
-                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
-                var__42 := expr_50
-                leave
-
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-
-            /// @ast-id 53
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
-            function fun_f2_53() -> var__42 {
-                /// @src 0:382:385  \"int\"
-                let zero_t_int256_4 := zero_value_for_split_t_int256()
-                var__42 := zero_t_int256_4
-
-                var__42 := modifier_m_40(var__42)
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-",
-                "irOptimized": "/// @use-src 0:\"C\", 1:\"D\"
-object \"D_72\" {
-    code {
-        {
-            /// @src 1:91:166  \"contract D is C(3)...\"
-            let _1 := memoryguard(0xa0)
-            if callvalue() { revert(0, 0) }
-            let programSize := datasize(\"D_72\")
-            let argSize := sub(codesize(), programSize)
-            let newFreePtr := add(_1, and(add(argSize, 31), not(31)))
-            if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, _1))
-            {
-                mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
-                mstore(4, 0x41)
-                revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x24)
-            }
-            mstore(64, newFreePtr)
-            codecopy(_1, programSize, argSize)
-            if slt(sub(add(_1, argSize), _1), 32)
-            {
-                revert(/** @src -1:-1:-1 */ 0, 0)
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
-            let value := mload(_1)
-            /// @src 0:154:156  \"42\"
-            mstore(128, 0x2a)
-            /// @src 1:91:166  \"contract D is C(3)...\"
-            let sum := add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ value)
-            if and(1, slt(sum, value))
-            {
-                mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x24)
-            }
-            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ sum)
-            let _2 := mload(64)
-            let _3 := datasize(\"D_72_deployed\")
-            codecopy(_2, dataoffset(\"D_72_deployed\"), _3)
-            setimmutable(_2, \"8\", mload(/** @src 0:154:156  \"42\" */ 128))
-            /// @src 1:91:166  \"contract D is C(3)...\"
-            return(_2, _3)
-        }
-    }
-    /// @use-src 0:\"C\", 1:\"D\"
-    object \"D_72_deployed\" {
-        code {
-            {
-                /// @src 1:91:166  \"contract D is C(3)...\"
-                let _1 := memoryguard(0x80)
-                let _2 := 64
-                mstore(_2, _1)
-                if iszero(lt(calldatasize(), 4))
-                {
-                    switch shr(224, calldataload(0))
-                    case 0x26121ff0 {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:297:305  \"immutVar\"
-                        let _3 := loadimmutable(\"8\")
-                        /// @src 1:91:166  \"contract D is C(3)...\"
-                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _3)
-                        if and(1, slt(sum, _3))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x11)
-                            revert(0, 0x24)
-                        }
-                        mstore(_1, sum)
-                        return(_1, 32)
-                    }
-                    case 0x793816ec {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let _4 := sload(0)
-                        let memPos := mload(_2)
-                        mstore(memPos, _4)
-                        return(memPos, 32)
-                    }
-                    case 0x9942ec6f {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let _5 := sload(0)
-                        if eq(_5, sub(shl(255, 1), 1))
-                        {
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x11)
-                            revert(0, 0x24)
-                        }
-                        let ret := add(_5, 1)
-                        sstore(0, ret)
-                        /// @src 0:410:418  \"this.f()\"
-                        let _6 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_2)
-                        /// @src 0:410:418  \"this.f()\"
-                        mstore(_6, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
-                        /// @src 0:410:418  \"this.f()\"
-                        let _7 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _6, /** @src 1:91:166  \"contract D is C(3)...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _6, 32)
-                        if iszero(_7)
-                        {
-                            /// @src 1:91:166  \"contract D is C(3)...\"
-                            let pos := mload(_2)
-                            returndatacopy(pos, 0, returndatasize())
-                            revert(pos, returndatasize())
-                        }
-                        /// @src 0:410:418  \"this.f()\"
-                        let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ 0
-                        /// @src 0:410:418  \"this.f()\"
-                        if _7
-                        {
-                            let _8 := 32
-                            if gt(32, returndatasize()) { _8 := returndatasize() }
-                            /// @src 1:91:166  \"contract D is C(3)...\"
-                            let newFreePtr := add(_6, and(add(_8, 31), not(31)))
-                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
-                            {
-                                mstore(0, shl(224, 0x4e487b71))
-                                mstore(4, 0x41)
-                                revert(0, 0x24)
-                            }
-                            mstore(_2, newFreePtr)
-                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_6, _8), /** @src 1:91:166  \"contract D is C(3)...\" */ _6), /** @src 0:410:418  \"this.f()\" */ 32)
-                            /// @src 1:91:166  \"contract D is C(3)...\"
-                            { revert(0, 0) }
-                            /// @src 0:410:418  \"this.f()\"
-                            expr := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_6)
-                        }
-                        /// @src 0:399:418  \"stateVar + this.f()\"
-                        let expr_1 := checked_add_int256(ret, expr)
-                        /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
-                        let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
-                        /// @src 1:91:166  \"contract D is C(3)...\"
-                        let memPos_1 := mload(_2)
-                        mstore(memPos_1, var)
-                        return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
-                    }
-                    case /** @src 1:91:166  \"contract D is C(3)...\" */ 0xa00b982b {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let memPos_2 := mload(_2)
-                        mstore(memPos_2, /** @src 0:124:126  \"41\" */ 0x29)
-                        /// @src 1:91:166  \"contract D is C(3)...\"
-                        return(memPos_2, 32)
-                    }
-                }
-                revert(0, 0)
-            }
-            function checked_add_int256(x, y) -> sum
-            {
-                sum := add(x, y)
-                let _1 := slt(sum, y)
-                let _2 := slt(x, 0)
-                if or(and(iszero(_2), _1), and(_2, iszero(_1)))
-                {
-                    mstore(0, shl(224, 0x4e487b71))
-                    mstore(4, 0x11)
-                    revert(0, 0x24)
-                }
-            }
-        }
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        },
-        "D":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_default_success/input.json b/test/cmdlineTests/standard_default_success/input.json
deleted file mode 100644
index 47a36711397b..000000000000
--- a/test/cmdlineTests/standard_default_success/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_default_success/output.json b/test/cmdlineTests/standard_default_success/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_default_success/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_empty_file_name/input.json b/test/cmdlineTests/standard_empty_file_name/input.json
deleted file mode 100644
index 209f994c5c41..000000000000
--- a/test/cmdlineTests/standard_empty_file_name/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; import {A} from \".\";"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_empty_file_name/output.json b/test/cmdlineTests/standard_empty_file_name/output.json
deleted file mode 100644
index 4e4d84c41c75..000000000000
--- a/test/cmdlineTests/standard_empty_file_name/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2904",
-            "formattedMessage": "DeclarationError: Declaration \"A\" not found in \"\" (referenced as \".\").
-
-",
-            "message": "Declaration \"A\" not found in \"\" (referenced as \".\").",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 79,
-                "file": "",
-                "start": 59
-            },
-            "type": "DeclarationError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_evm_version_byzantium/input.json b/test/cmdlineTests/standard_evm_version_byzantium/input.json
deleted file mode 100644
index 9f9c06f8f723..000000000000
--- a/test/cmdlineTests/standard_evm_version_byzantium/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"input.sol": {"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
-	},
-	"settings": {
-		"evmVersion": "byzantium"
-	}
-}
diff --git a/test/cmdlineTests/standard_evm_version_byzantium/output.json b/test/cmdlineTests/standard_evm_version_byzantium/output.json
deleted file mode 100644
index b2428b105060..000000000000
--- a/test/cmdlineTests/standard_evm_version_byzantium/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
-            "message": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "input.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_evm_version_constantinople/input.json b/test/cmdlineTests/standard_evm_version_constantinople/input.json
deleted file mode 100644
index 965c38979388..000000000000
--- a/test/cmdlineTests/standard_evm_version_constantinople/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"input.sol": {"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
-	},
-	"settings": {
-		"evmVersion": "constantinople"
-	}
-}
diff --git a/test/cmdlineTests/standard_evm_version_constantinople/output.json b/test/cmdlineTests/standard_evm_version_constantinople/output.json
deleted file mode 100644
index 1ce414a4cc79..000000000000
--- a/test/cmdlineTests/standard_evm_version_constantinople/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "input.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_file_not_found/args b/test/cmdlineTests/standard_file_not_found/args
deleted file mode 100644
index ee8e7c840b69..000000000000
--- a/test/cmdlineTests/standard_file_not_found/args
+++ /dev/null
@@ -1 +0,0 @@
---standard-json input.sol
diff --git a/test/cmdlineTests/standard_file_not_found/err b/test/cmdlineTests/standard_file_not_found/err
deleted file mode 100644
index 2ae0ecf4b2a6..000000000000
--- a/test/cmdlineTests/standard_file_not_found/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: "input.sol" is not found.
diff --git a/test/cmdlineTests/standard_file_not_found/exit b/test/cmdlineTests/standard_file_not_found/exit
deleted file mode 100644
index 56a6051ca2b0..000000000000
--- a/test/cmdlineTests/standard_file_not_found/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_function_debug_info/input.json b/test/cmdlineTests/standard_function_debug_info/input.json
deleted file mode 100644
index 653c6115111d..000000000000
--- a/test/cmdlineTests/standard_function_debug_info/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "a.sol": {
-            "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract A { function f(uint[] memory x) public pure returns (uint256) { return x[0] + x[1];} }"
-        }
-    },
-    "settings": {
-        "outputSelection": {
-            "*": {
-                "A": [
-                    "evm.deployedBytecode.functionDebugData",
-                    "evm.bytecode.functionDebugData"
-                ]
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_function_debug_info/output.json b/test/cmdlineTests/standard_function_debug_info/output.json
deleted file mode 100644
index bbbb6b96faf3..000000000000
--- a/test/cmdlineTests/standard_function_debug_info/output.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "functionDebugData": {}
-                    },
-                    "deployedBytecode":
-                    {
-                        "functionDebugData":
-                        {
-                            "@f_19":
-                            {
-                                "entryPoint": 93,
-                                "id": 19,
-                                "parameterSlots": 1,
-                                "returnSlots": 1
-                            },
-                            "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
-                                "entryPoint": 421,
-                                "id": null,
-                                "parameterSlots": 3,
-                                "returnSlots": 1
-                            },
-                            "abi_decode_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
-                                "entryPoint": 525,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 1
-                            },
-                            "abi_decode_t_uint256":
-                            {
-                                "entryPoint": 401,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 1
-                            },
-                            "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
-                                "entryPoint": 570,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 1
-                            },
-                            "abi_encode_t_uint256_to_t_uint256_fromStack":
-                            {
-                                "entryPoint": 641,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 0
-                            },
-                            "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":
-                            {
-                                "entryPoint": 656,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 1
-                            },
-                            "allocate_memory":
-                            {
-                                "entryPoint": 297,
-                                "id": null,
-                                "parameterSlots": 1,
-                                "returnSlots": 1
-                            },
-                            "allocate_unbounded":
-                            {
-                                "entryPoint": 166,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 1
-                            },
-                            "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
-                                "entryPoint": 323,
-                                "id": null,
-                                "parameterSlots": 1,
-                                "returnSlots": 1
-                            },
-                            "checked_add_t_uint256":
-                            {
-                                "entryPoint": 771,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 1
-                            },
-                            "cleanup_t_uint256":
-                            {
-                                "entryPoint": 370,
-                                "id": null,
-                                "parameterSlots": 1,
-                                "returnSlots": 1
-                            },
-                            "finalize_allocation":
-                            {
-                                "entryPoint": 248,
-                                "id": null,
-                                "parameterSlots": 2,
-                                "returnSlots": 0
-                            },
-                            "panic_error_0x11":
-                            {
-                                "entryPoint": 726,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "panic_error_0x32":
-                            {
-                                "entryPoint": 681,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "panic_error_0x41":
-                            {
-                                "entryPoint": 203,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":
-                            {
-                                "entryPoint": 183,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":
-                            {
-                                "entryPoint": 366,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":
-                            {
-                                "entryPoint": 179,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
-                            {
-                                "entryPoint": 175,
-                                "id": null,
-                                "parameterSlots": 0,
-                                "returnSlots": 0
-                            },
-                            "round_up_to_mul_of_32":
-                            {
-                                "entryPoint": 187,
-                                "id": null,
-                                "parameterSlots": 1,
-                                "returnSlots": 1
-                            },
-                            "validator_revert_t_uint256":
-                            {
-                                "entryPoint": 379,
-                                "id": null,
-                                "parameterSlots": 1,
-                                "returnSlots": 0
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_generatedSources/input.json b/test/cmdlineTests/standard_generatedSources/input.json
deleted file mode 100644
index a179db435bd2..000000000000
--- a/test/cmdlineTests/standard_generatedSources/input.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "// SPDX-License-Identifier: GPL-3.0\npragma abicoder v2; contract A { function f(uint[] memory) public view returns (uint256) { } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "*": {
-    "A": [
-     "evm.bytecode.object",
-     "evm.deployedBytecode.generatedSources",
-     "evm.bytecode.generatedSources"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/standard_generatedSources/output.json b/test/cmdlineTests/standard_generatedSources/output.json
deleted file mode 100644
index 350d108991bd..000000000000
--- a/test/cmdlineTests/standard_generatedSources/output.json
+++ /dev/null
@@ -1,2873 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "generatedSources": [],
-                        "object": "<BYTECODE REMOVED>"
-                    },
-                    "deployedBytecode":
-                    {
-                        "generatedSources":
-                        [
-                            {
-                                "ast":
-                                {
-                                    "nativeSrc": "0:3989:1",
-                                    "nodeType": "YulBlock",
-                                    "src": "0:3989:1",
-                                    "statements":
-                                    [
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "47:35:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "47:35:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "57:19:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "57:19:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "73:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "73:2:1",
-                                                                    "type": "",
-                                                                    "value": "64"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mload",
-                                                                "nativeSrc": "67:5:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "67:5:1"
-                                                            },
-                                                            "nativeSrc": "67:9:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "67:9:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "memPtr",
-                                                                "nativeSrc": "57:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "57:6:1"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "allocate_unbounded",
-                                            "nativeSrc": "7:75:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "memPtr",
-                                                    "nativeSrc": "40:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "40:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "7:75:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "177:28:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "177:28:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "194:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "194:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "197:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "197:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "187:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "187:6:1"
-                                                            },
-                                                            "nativeSrc": "187:12:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "187:12:1"
-                                                        },
-                                                        "nativeSrc": "187:12:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "187:12:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
-                                            "nativeSrc": "88:117:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "88:117:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "300:28:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "300:28:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "317:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "317:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "320:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "320:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "310:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "310:6:1"
-                                                            },
-                                                            "nativeSrc": "310:12:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "310:12:1"
-                                                        },
-                                                        "nativeSrc": "310:12:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "310:12:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
-                                            "nativeSrc": "211:117:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "211:117:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "423:28:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "423:28:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "440:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "440:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "443:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "443:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "433:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "433:6:1"
-                                                            },
-                                                            "nativeSrc": "433:12:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "433:12:1"
-                                                        },
-                                                        "nativeSrc": "433:12:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "433:12:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
-                                            "nativeSrc": "334:117:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "334:117:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "505:54:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "505:54:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "515:38:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "515:38:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "value",
-                                                                            "nativeSrc": "533:5:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "533:5:1"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "540:2:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "540:2:1",
-                                                                            "type": "",
-                                                                            "value": "31"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "add",
-                                                                        "nativeSrc": "529:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "529:3:1"
-                                                                    },
-                                                                    "nativeSrc": "529:14:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "529:14:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "549:2:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "549:2:1",
-                                                                            "type": "",
-                                                                            "value": "31"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "not",
-                                                                        "nativeSrc": "545:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "545:3:1"
-                                                                    },
-                                                                    "nativeSrc": "545:7:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "545:7:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "and",
-                                                                "nativeSrc": "525:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "525:3:1"
-                                                            },
-                                                            "nativeSrc": "525:28:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "525:28:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "result",
-                                                                "nativeSrc": "515:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "515:6:1"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "round_up_to_mul_of_32",
-                                            "nativeSrc": "457:102:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "488:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "488:5:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "result",
-                                                    "nativeSrc": "498:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "498:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "457:102:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "593:152:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "593:152:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "610:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "610:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "613:77:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "613:77:1",
-                                                                    "type": "",
-                                                                    "value": "35408467139433450592217433187231851964531694900788300625387963629091585785856"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "603:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "603:6:1"
-                                                            },
-                                                            "nativeSrc": "603:88:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "603:88:1"
-                                                        },
-                                                        "nativeSrc": "603:88:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "603:88:1"
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "707:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "707:1:1",
-                                                                    "type": "",
-                                                                    "value": "4"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "710:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "710:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x41"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "700:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "700:6:1"
-                                                            },
-                                                            "nativeSrc": "700:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "700:15:1"
-                                                        },
-                                                        "nativeSrc": "700:15:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "700:15:1"
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "731:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "731:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "734:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "734:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x24"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "724:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "724:6:1"
-                                                            },
-                                                            "nativeSrc": "724:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "724:15:1"
-                                                        },
-                                                        "nativeSrc": "724:15:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "724:15:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "panic_error_0x41",
-                                            "nativeSrc": "565:180:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "565:180:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "794:238:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "794:238:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "804:58:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "804:58:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "memPtr",
-                                                                    "nativeSrc": "826:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "826:6:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "size",
-                                                                            "nativeSrc": "856:4:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "856:4:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "round_up_to_mul_of_32",
-                                                                        "nativeSrc": "834:21:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "834:21:1"
-                                                                    },
-                                                                    "nativeSrc": "834:27:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "834:27:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "822:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "822:3:1"
-                                                            },
-                                                            "nativeSrc": "822:40:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "822:40:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "newFreePtr",
-                                                                "nativeSrc": "808:10:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "808:10:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "973:22:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "973:22:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "panic_error_0x41",
-                                                                            "nativeSrc": "975:16:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "975:16:1"
-                                                                        },
-                                                                        "nativeSrc": "975:18:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "975:18:1"
-                                                                    },
-                                                                    "nativeSrc": "975:18:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "975:18:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "newFreePtr",
-                                                                            "nativeSrc": "916:10:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "916:10:1"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "928:18:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "928:18:1",
-                                                                            "type": "",
-                                                                            "value": "0xffffffffffffffff"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "gt",
-                                                                        "nativeSrc": "913:2:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "913:2:1"
-                                                                    },
-                                                                    "nativeSrc": "913:34:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "913:34:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "newFreePtr",
-                                                                            "nativeSrc": "952:10:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "952:10:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "memPtr",
-                                                                            "nativeSrc": "964:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "964:6:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "lt",
-                                                                        "nativeSrc": "949:2:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "949:2:1"
-                                                                    },
-                                                                    "nativeSrc": "949:22:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "949:22:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "or",
-                                                                "nativeSrc": "910:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "910:2:1"
-                                                            },
-                                                            "nativeSrc": "910:62:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "910:62:1"
-                                                        },
-                                                        "nativeSrc": "907:88:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "907:88:1"
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1011:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1011:2:1",
-                                                                    "type": "",
-                                                                    "value": "64"
-                                                                },
-                                                                {
-                                                                    "name": "newFreePtr",
-                                                                    "nativeSrc": "1015:10:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1015:10:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "1004:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1004:6:1"
-                                                            },
-                                                            "nativeSrc": "1004:22:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1004:22:1"
-                                                        },
-                                                        "nativeSrc": "1004:22:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "1004:22:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "finalize_allocation",
-                                            "nativeSrc": "751:281:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "memPtr",
-                                                    "nativeSrc": "780:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "780:6:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "size",
-                                                    "nativeSrc": "788:4:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "788:4:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "751:281:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1079:88:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1079:88:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1089:30:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1089:30:1",
-                                                        "value":
-                                                        {
-                                                            "arguments": [],
-                                                            "functionName":
-                                                            {
-                                                                "name": "allocate_unbounded",
-                                                                "nativeSrc": "1099:18:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1099:18:1"
-                                                            },
-                                                            "nativeSrc": "1099:20:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1099:20:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "memPtr",
-                                                                "nativeSrc": "1089:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1089:6:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "memPtr",
-                                                                    "nativeSrc": "1148:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1148:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "size",
-                                                                    "nativeSrc": "1156:4:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1156:4:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "finalize_allocation",
-                                                                "nativeSrc": "1128:19:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1128:19:1"
-                                                            },
-                                                            "nativeSrc": "1128:33:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1128:33:1"
-                                                        },
-                                                        "nativeSrc": "1128:33:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "1128:33:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "allocate_memory",
-                                            "nativeSrc": "1038:129:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "size",
-                                                    "nativeSrc": "1063:4:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1063:4:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "memPtr",
-                                                    "nativeSrc": "1072:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1072:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1038:129:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1255:229:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1255:229:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "1360:22:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "1360:22:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "panic_error_0x41",
-                                                                            "nativeSrc": "1362:16:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1362:16:1"
-                                                                        },
-                                                                        "nativeSrc": "1362:18:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "1362:18:1"
-                                                                    },
-                                                                    "nativeSrc": "1362:18:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "1362:18:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "length",
-                                                                    "nativeSrc": "1332:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1332:6:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1340:18:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1340:18:1",
-                                                                    "type": "",
-                                                                    "value": "0xffffffffffffffff"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "gt",
-                                                                "nativeSrc": "1329:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1329:2:1"
-                                                            },
-                                                            "nativeSrc": "1329:30:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1329:30:1"
-                                                        },
-                                                        "nativeSrc": "1326:56:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "1326:56:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "1392:25:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1392:25:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "length",
-                                                                    "nativeSrc": "1404:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1404:6:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1412:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1412:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x20"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mul",
-                                                                "nativeSrc": "1400:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1400:3:1"
-                                                            },
-                                                            "nativeSrc": "1400:17:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1400:17:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "size",
-                                                                "nativeSrc": "1392:4:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1392:4:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "1454:23:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1454:23:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "size",
-                                                                    "nativeSrc": "1466:4:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1466:4:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1472:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1472:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x20"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "1462:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1462:3:1"
-                                                            },
-                                                            "nativeSrc": "1462:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1462:15:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "size",
-                                                                "nativeSrc": "1454:4:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1454:4:1"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
-                                            "nativeSrc": "1173:311:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "length",
-                                                    "nativeSrc": "1239:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1239:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "size",
-                                                    "nativeSrc": "1250:4:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1250:4:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1173:311:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1579:28:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1579:28:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1596:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1596:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1599:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1599:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "1589:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1589:6:1"
-                                                            },
-                                                            "nativeSrc": "1589:12:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1589:12:1"
-                                                        },
-                                                        "nativeSrc": "1589:12:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "1589:12:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
-                                            "nativeSrc": "1490:117:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "1490:117:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1658:32:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1658:32:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1668:16:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1668:16:1",
-                                                        "value":
-                                                        {
-                                                            "name": "value",
-                                                            "nativeSrc": "1679:5:1",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "1679:5:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "cleaned",
-                                                                "nativeSrc": "1668:7:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1668:7:1"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "cleanup_t_uint256",
-                                            "nativeSrc": "1613:77:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "1640:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1640:5:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "cleaned",
-                                                    "nativeSrc": "1650:7:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1650:7:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1613:77:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1739:79:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1739:79:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "1796:16:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "1796:16:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "1805:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "1805:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "1808:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "1808:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert",
-                                                                            "nativeSrc": "1798:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1798:6:1"
-                                                                        },
-                                                                        "nativeSrc": "1798:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "1798:12:1"
-                                                                    },
-                                                                    "nativeSrc": "1798:12:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "1798:12:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "value",
-                                                                            "nativeSrc": "1762:5:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1762:5:1"
-                                                                        },
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "name": "value",
-                                                                                    "nativeSrc": "1787:5:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "1787:5:1"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "cleanup_t_uint256",
-                                                                                "nativeSrc": "1769:17:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1769:17:1"
-                                                                            },
-                                                                            "nativeSrc": "1769:24:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "1769:24:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "eq",
-                                                                        "nativeSrc": "1759:2:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "1759:2:1"
-                                                                    },
-                                                                    "nativeSrc": "1759:35:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "1759:35:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "iszero",
-                                                                "nativeSrc": "1752:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1752:6:1"
-                                                            },
-                                                            "nativeSrc": "1752:43:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1752:43:1"
-                                                        },
-                                                        "nativeSrc": "1749:63:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "1749:63:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "validator_revert_t_uint256",
-                                            "nativeSrc": "1696:122:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "1732:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1732:5:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1696:122:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1876:87:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1876:87:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1886:29:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1886:29:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "offset",
-                                                                    "nativeSrc": "1908:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1908:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "calldataload",
-                                                                "nativeSrc": "1895:12:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1895:12:1"
-                                                            },
-                                                            "nativeSrc": "1895:20:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1895:20:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "value",
-                                                                "nativeSrc": "1886:5:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1886:5:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "value",
-                                                                    "nativeSrc": "1951:5:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1951:5:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "validator_revert_t_uint256",
-                                                                "nativeSrc": "1924:26:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1924:26:1"
-                                                            },
-                                                            "nativeSrc": "1924:33:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1924:33:1"
-                                                        },
-                                                        "nativeSrc": "1924:33:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "1924:33:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_decode_t_uint256",
-                                            "nativeSrc": "1824:139:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "offset",
-                                                    "nativeSrc": "1854:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1854:6:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "end",
-                                                    "nativeSrc": "1862:3:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1862:3:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "1870:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1870:5:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1824:139:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "2088:608:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "2088:608:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "2098:90:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "2098:90:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "length",
-                                                                            "nativeSrc": "2180:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2180:6:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
-                                                                        "nativeSrc": "2123:56:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "2123:56:1"
-                                                                    },
-                                                                    "nativeSrc": "2123:64:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "2123:64:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "allocate_memory",
-                                                                "nativeSrc": "2107:15:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2107:15:1"
-                                                            },
-                                                            "nativeSrc": "2107:81:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2107:81:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "array",
-                                                                "nativeSrc": "2098:5:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2098:5:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "2197:16:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "2197:16:1",
-                                                        "value":
-                                                        {
-                                                            "name": "array",
-                                                            "nativeSrc": "2208:5:1",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "2208:5:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "dst",
-                                                                "nativeSrc": "2201:3:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "2201:3:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "array",
-                                                                    "nativeSrc": "2230:5:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2230:5:1"
-                                                                },
-                                                                {
-                                                                    "name": "length",
-                                                                    "nativeSrc": "2237:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2237:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "2223:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2223:6:1"
-                                                            },
-                                                            "nativeSrc": "2223:21:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2223:21:1"
-                                                        },
-                                                        "nativeSrc": "2223:21:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "2223:21:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "2253:23:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "2253:23:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "array",
-                                                                    "nativeSrc": "2264:5:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2264:5:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "2271:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "2271:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x20"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "2260:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2260:3:1"
-                                                            },
-                                                            "nativeSrc": "2260:16:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2260:16:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "dst",
-                                                                "nativeSrc": "2253:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2253:3:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "2286:44:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "2286:44:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "offset",
-                                                                    "nativeSrc": "2304:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2304:6:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "length",
-                                                                            "nativeSrc": "2316:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2316:6:1"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "2324:4:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "2324:4:1",
-                                                                            "type": "",
-                                                                            "value": "0x20"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "mul",
-                                                                        "nativeSrc": "2312:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "2312:3:1"
-                                                                    },
-                                                                    "nativeSrc": "2312:17:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "2312:17:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "2300:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2300:3:1"
-                                                            },
-                                                            "nativeSrc": "2300:30:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2300:30:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "srcEnd",
-                                                                "nativeSrc": "2290:6:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "2290:6:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "2358:103:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "2358:103:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
-                                                                            "nativeSrc": "2372:77:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2372:77:1"
-                                                                        },
-                                                                        "nativeSrc": "2372:79:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "2372:79:1"
-                                                                    },
-                                                                    "nativeSrc": "2372:79:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "2372:79:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "srcEnd",
-                                                                    "nativeSrc": "2345:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2345:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "end",
-                                                                    "nativeSrc": "2353:3:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2353:3:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "gt",
-                                                                "nativeSrc": "2342:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2342:2:1"
-                                                            },
-                                                            "nativeSrc": "2342:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2342:15:1"
-                                                        },
-                                                        "nativeSrc": "2339:122:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "2339:122:1"
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "2546:144:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "2546:144:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "nativeSrc": "2561:21:1",
-                                                                    "nodeType": "YulVariableDeclaration",
-                                                                    "src": "2561:21:1",
-                                                                    "value":
-                                                                    {
-                                                                        "name": "src",
-                                                                        "nativeSrc": "2579:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "2579:3:1"
-                                                                    },
-                                                                    "variables":
-                                                                    [
-                                                                        {
-                                                                            "name": "elementPos",
-                                                                            "nativeSrc": "2565:10:1",
-                                                                            "nodeType": "YulTypedName",
-                                                                            "src": "2565:10:1",
-                                                                            "type": ""
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "name": "dst",
-                                                                                "nativeSrc": "2603:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "2603:3:1"
-                                                                            },
-                                                                            {
-                                                                                "arguments":
-                                                                                [
-                                                                                    {
-                                                                                        "name": "elementPos",
-                                                                                        "nativeSrc": "2629:10:1",
-                                                                                        "nodeType": "YulIdentifier",
-                                                                                        "src": "2629:10:1"
-                                                                                    },
-                                                                                    {
-                                                                                        "name": "end",
-                                                                                        "nativeSrc": "2641:3:1",
-                                                                                        "nodeType": "YulIdentifier",
-                                                                                        "src": "2641:3:1"
-                                                                                    }
-                                                                                ],
-                                                                                "functionName":
-                                                                                {
-                                                                                    "name": "abi_decode_t_uint256",
-                                                                                    "nativeSrc": "2608:20:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "2608:20:1"
-                                                                                },
-                                                                                "nativeSrc": "2608:37:1",
-                                                                                "nodeType": "YulFunctionCall",
-                                                                                "src": "2608:37:1"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "mstore",
-                                                                            "nativeSrc": "2596:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2596:6:1"
-                                                                        },
-                                                                        "nativeSrc": "2596:50:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "2596:50:1"
-                                                                    },
-                                                                    "nativeSrc": "2596:50:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "2596:50:1"
-                                                                },
-                                                                {
-                                                                    "nativeSrc": "2659:21:1",
-                                                                    "nodeType": "YulAssignment",
-                                                                    "src": "2659:21:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "name": "dst",
-                                                                                "nativeSrc": "2670:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "2670:3:1"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "2675:4:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "2675:4:1",
-                                                                                "type": "",
-                                                                                "value": "0x20"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "add",
-                                                                            "nativeSrc": "2666:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2666:3:1"
-                                                                        },
-                                                                        "nativeSrc": "2666:14:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "2666:14:1"
-                                                                    },
-                                                                    "variableNames":
-                                                                    [
-                                                                        {
-                                                                            "name": "dst",
-                                                                            "nativeSrc": "2659:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2659:3:1"
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "src",
-                                                                    "nativeSrc": "2499:3:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2499:3:1"
-                                                                },
-                                                                {
-                                                                    "name": "srcEnd",
-                                                                    "nativeSrc": "2504:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2504:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "lt",
-                                                                "nativeSrc": "2496:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2496:2:1"
-                                                            },
-                                                            "nativeSrc": "2496:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2496:15:1"
-                                                        },
-                                                        "nativeSrc": "2470:220:1",
-                                                        "nodeType": "YulForLoop",
-                                                        "post":
-                                                        {
-                                                            "nativeSrc": "2512:25:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "2512:25:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "nativeSrc": "2514:21:1",
-                                                                    "nodeType": "YulAssignment",
-                                                                    "src": "2514:21:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "name": "src",
-                                                                                "nativeSrc": "2525:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "2525:3:1"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "2530:4:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "2530:4:1",
-                                                                                "type": "",
-                                                                                "value": "0x20"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "add",
-                                                                            "nativeSrc": "2521:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2521:3:1"
-                                                                        },
-                                                                        "nativeSrc": "2521:14:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "2521:14:1"
-                                                                    },
-                                                                    "variableNames":
-                                                                    [
-                                                                        {
-                                                                            "name": "src",
-                                                                            "nativeSrc": "2514:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2514:3:1"
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        },
-                                                        "pre":
-                                                        {
-                                                            "nativeSrc": "2474:21:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "2474:21:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "nativeSrc": "2476:17:1",
-                                                                    "nodeType": "YulVariableDeclaration",
-                                                                    "src": "2476:17:1",
-                                                                    "value":
-                                                                    {
-                                                                        "name": "offset",
-                                                                        "nativeSrc": "2487:6:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "2487:6:1"
-                                                                    },
-                                                                    "variables":
-                                                                    [
-                                                                        {
-                                                                            "name": "src",
-                                                                            "nativeSrc": "2480:3:1",
-                                                                            "nodeType": "YulTypedName",
-                                                                            "src": "2480:3:1",
-                                                                            "type": ""
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        },
-                                                        "src": "2470:220:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
-                                            "nativeSrc": "1986:710:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "offset",
-                                                    "nativeSrc": "2058:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2058:6:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "length",
-                                                    "nativeSrc": "2066:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2066:6:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "end",
-                                                    "nativeSrc": "2074:3:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2074:3:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "array",
-                                                    "nativeSrc": "2082:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2082:5:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1986:710:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "2796:293:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "2796:293:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "2845:83:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "2845:83:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
-                                                                            "nativeSrc": "2847:77:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2847:77:1"
-                                                                        },
-                                                                        "nativeSrc": "2847:79:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "2847:79:1"
-                                                                    },
-                                                                    "nativeSrc": "2847:79:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "2847:79:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "name": "offset",
-                                                                                    "nativeSrc": "2824:6:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "2824:6:1"
-                                                                                },
-                                                                                {
-                                                                                    "kind": "number",
-                                                                                    "nativeSrc": "2832:4:1",
-                                                                                    "nodeType": "YulLiteral",
-                                                                                    "src": "2832:4:1",
-                                                                                    "type": "",
-                                                                                    "value": "0x1f"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "add",
-                                                                                "nativeSrc": "2820:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "2820:3:1"
-                                                                            },
-                                                                            "nativeSrc": "2820:17:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "2820:17:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "end",
-                                                                            "nativeSrc": "2839:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "2839:3:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "slt",
-                                                                        "nativeSrc": "2816:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "2816:3:1"
-                                                                    },
-                                                                    "nativeSrc": "2816:27:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "2816:27:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "iszero",
-                                                                "nativeSrc": "2809:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2809:6:1"
-                                                            },
-                                                            "nativeSrc": "2809:35:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2809:35:1"
-                                                        },
-                                                        "nativeSrc": "2806:122:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "2806:122:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "2937:34:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "2937:34:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "offset",
-                                                                    "nativeSrc": "2964:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "2964:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "calldataload",
-                                                                "nativeSrc": "2951:12:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2951:12:1"
-                                                            },
-                                                            "nativeSrc": "2951:20:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2951:20:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "length",
-                                                                "nativeSrc": "2941:6:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "2941:6:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "2980:103:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "2980:103:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "offset",
-                                                                            "nativeSrc": "3056:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3056:6:1"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "3064:4:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "3064:4:1",
-                                                                            "type": "",
-                                                                            "value": "0x20"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "add",
-                                                                        "nativeSrc": "3052:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3052:3:1"
-                                                                    },
-                                                                    "nativeSrc": "3052:17:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3052:17:1"
-                                                                },
-                                                                {
-                                                                    "name": "length",
-                                                                    "nativeSrc": "3071:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "3071:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "end",
-                                                                    "nativeSrc": "3079:3:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "3079:3:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
-                                                                "nativeSrc": "2989:62:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2989:62:1"
-                                                            },
-                                                            "nativeSrc": "2989:94:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "2989:94:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "array",
-                                                                "nativeSrc": "2980:5:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "2980:5:1"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
-                                            "nativeSrc": "2719:370:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "offset",
-                                                    "nativeSrc": "2774:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2774:6:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "end",
-                                                    "nativeSrc": "2782:3:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2782:3:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "array",
-                                                    "nativeSrc": "2790:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "2790:5:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "2719:370:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "3186:448:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "3186:448:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "3232:83:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "3232:83:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
-                                                                            "nativeSrc": "3234:77:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3234:77:1"
-                                                                        },
-                                                                        "nativeSrc": "3234:79:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "3234:79:1"
-                                                                    },
-                                                                    "nativeSrc": "3234:79:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "3234:79:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "dataEnd",
-                                                                            "nativeSrc": "3207:7:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3207:7:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "headStart",
-                                                                            "nativeSrc": "3216:9:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3216:9:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "sub",
-                                                                        "nativeSrc": "3203:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3203:3:1"
-                                                                    },
-                                                                    "nativeSrc": "3203:23:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3203:23:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "3228:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "3228:2:1",
-                                                                    "type": "",
-                                                                    "value": "32"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "slt",
-                                                                "nativeSrc": "3199:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "3199:3:1"
-                                                            },
-                                                            "nativeSrc": "3199:32:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "3199:32:1"
-                                                        },
-                                                        "nativeSrc": "3196:119:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "3196:119:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "3325:302:1",
-                                                        "nodeType": "YulBlock",
-                                                        "src": "3325:302:1",
-                                                        "statements":
-                                                        [
-                                                            {
-                                                                "nativeSrc": "3340:45:1",
-                                                                "nodeType": "YulVariableDeclaration",
-                                                                "src": "3340:45:1",
-                                                                "value":
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "name": "headStart",
-                                                                                    "nativeSrc": "3371:9:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "3371:9:1"
-                                                                                },
-                                                                                {
-                                                                                    "kind": "number",
-                                                                                    "nativeSrc": "3382:1:1",
-                                                                                    "nodeType": "YulLiteral",
-                                                                                    "src": "3382:1:1",
-                                                                                    "type": "",
-                                                                                    "value": "0"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "add",
-                                                                                "nativeSrc": "3367:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "3367:3:1"
-                                                                            },
-                                                                            "nativeSrc": "3367:17:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "3367:17:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "calldataload",
-                                                                        "nativeSrc": "3354:12:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3354:12:1"
-                                                                    },
-                                                                    "nativeSrc": "3354:31:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3354:31:1"
-                                                                },
-                                                                "variables":
-                                                                [
-                                                                    {
-                                                                        "name": "offset",
-                                                                        "nativeSrc": "3344:6:1",
-                                                                        "nodeType": "YulTypedName",
-                                                                        "src": "3344:6:1",
-                                                                        "type": ""
-                                                                    }
-                                                                ]
-                                                            },
-                                                            {
-                                                                "body":
-                                                                {
-                                                                    "nativeSrc": "3432:83:1",
-                                                                    "nodeType": "YulBlock",
-                                                                    "src": "3432:83:1",
-                                                                    "statements":
-                                                                    [
-                                                                        {
-                                                                            "expression":
-                                                                            {
-                                                                                "arguments": [],
-                                                                                "functionName":
-                                                                                {
-                                                                                    "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
-                                                                                    "nativeSrc": "3434:77:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "3434:77:1"
-                                                                                },
-                                                                                "nativeSrc": "3434:79:1",
-                                                                                "nodeType": "YulFunctionCall",
-                                                                                "src": "3434:79:1"
-                                                                            },
-                                                                            "nativeSrc": "3434:79:1",
-                                                                            "nodeType": "YulExpressionStatement",
-                                                                            "src": "3434:79:1"
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                "condition":
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "offset",
-                                                                            "nativeSrc": "3404:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3404:6:1"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "3412:18:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "3412:18:1",
-                                                                            "type": "",
-                                                                            "value": "0xffffffffffffffff"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "gt",
-                                                                        "nativeSrc": "3401:2:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3401:2:1"
-                                                                    },
-                                                                    "nativeSrc": "3401:30:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3401:30:1"
-                                                                },
-                                                                "nativeSrc": "3398:117:1",
-                                                                "nodeType": "YulIf",
-                                                                "src": "3398:117:1"
-                                                            },
-                                                            {
-                                                                "nativeSrc": "3529:88:1",
-                                                                "nodeType": "YulAssignment",
-                                                                "src": "3529:88:1",
-                                                                "value":
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "name": "headStart",
-                                                                                    "nativeSrc": "3589:9:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "3589:9:1"
-                                                                                },
-                                                                                {
-                                                                                    "name": "offset",
-                                                                                    "nativeSrc": "3600:6:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "3600:6:1"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "add",
-                                                                                "nativeSrc": "3585:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "3585:3:1"
-                                                                            },
-                                                                            "nativeSrc": "3585:22:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "3585:22:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "dataEnd",
-                                                                            "nativeSrc": "3609:7:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3609:7:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
-                                                                        "nativeSrc": "3539:45:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3539:45:1"
-                                                                    },
-                                                                    "nativeSrc": "3539:78:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3539:78:1"
-                                                                },
-                                                                "variableNames":
-                                                                [
-                                                                    {
-                                                                        "name": "value0",
-                                                                        "nativeSrc": "3529:6:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3529:6:1"
-                                                                    }
-                                                                ]
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
-                                            "nativeSrc": "3095:539:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "headStart",
-                                                    "nativeSrc": "3156:9:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3156:9:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "dataEnd",
-                                                    "nativeSrc": "3167:7:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3167:7:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "value0",
-                                                    "nativeSrc": "3179:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3179:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "3095:539:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "3705:53:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "3705:53:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "pos",
-                                                                    "nativeSrc": "3722:3:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "3722:3:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "value",
-                                                                            "nativeSrc": "3745:5:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3745:5:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "cleanup_t_uint256",
-                                                                        "nativeSrc": "3727:17:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3727:17:1"
-                                                                    },
-                                                                    "nativeSrc": "3727:24:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3727:24:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "3715:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "3715:6:1"
-                                                            },
-                                                            "nativeSrc": "3715:37:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "3715:37:1"
-                                                        },
-                                                        "nativeSrc": "3715:37:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "3715:37:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
-                                            "nativeSrc": "3640:118:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "3693:5:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3693:5:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "pos",
-                                                    "nativeSrc": "3700:3:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3700:3:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "3640:118:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "3862:124:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "3862:124:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "3872:26:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "3872:26:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "headStart",
-                                                                    "nativeSrc": "3884:9:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "3884:9:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "3895:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "3895:2:1",
-                                                                    "type": "",
-                                                                    "value": "32"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "3880:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "3880:3:1"
-                                                            },
-                                                            "nativeSrc": "3880:18:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "3880:18:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "tail",
-                                                                "nativeSrc": "3872:4:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "3872:4:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "value0",
-                                                                    "nativeSrc": "3952:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "3952:6:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "headStart",
-                                                                            "nativeSrc": "3965:9:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "3965:9:1"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "3976:1:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "3976:1:1",
-                                                                            "type": "",
-                                                                            "value": "0"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "add",
-                                                                        "nativeSrc": "3961:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "3961:3:1"
-                                                                    },
-                                                                    "nativeSrc": "3961:17:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "3961:17:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
-                                                                "nativeSrc": "3908:43:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "3908:43:1"
-                                                            },
-                                                            "nativeSrc": "3908:71:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "3908:71:1"
-                                                        },
-                                                        "nativeSrc": "3908:71:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "3908:71:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
-                                            "nativeSrc": "3764:222:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "headStart",
-                                                    "nativeSrc": "3834:9:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3834:9:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "value0",
-                                                    "nativeSrc": "3846:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3846:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "tail",
-                                                    "nativeSrc": "3857:4:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "3857:4:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "3764:222:1"
-                                        }
-                                    ]
-                                },
-                                "contents": "{
-
-    function allocate_unbounded() -> memPtr {
-        memPtr := mload(64)
-    }
-
-    function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-        revert(0, 0)
-    }
-
-    function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
-        revert(0, 0)
-    }
-
-    function revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() {
-        revert(0, 0)
-    }
-
-    function round_up_to_mul_of_32(value) -> result {
-        result := and(add(value, 31), not(31))
-    }
-
-    function panic_error_0x41() {
-        mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-        mstore(4, 0x41)
-        revert(0, 0x24)
-    }
-
-    function finalize_allocation(memPtr, size) {
-        let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-        // protect against overflow
-        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-        mstore(64, newFreePtr)
-    }
-
-    function allocate_memory(size) -> memPtr {
-        memPtr := allocate_unbounded()
-        finalize_allocation(memPtr, size)
-    }
-
-    function array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length) -> size {
-        // Make sure we can allocate memory without overflow
-        if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
-
-        size := mul(length, 0x20)
-
-        // add length slot
-        size := add(size, 0x20)
-
-    }
-
-    function revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef() {
-        revert(0, 0)
-    }
-
-    function cleanup_t_uint256(value) -> cleaned {
-        cleaned := value
-    }
-
-    function validator_revert_t_uint256(value) {
-        if iszero(eq(value, cleanup_t_uint256(value))) { revert(0, 0) }
-    }
-
-    function abi_decode_t_uint256(offset, end) -> value {
-        value := calldataload(offset)
-        validator_revert_t_uint256(value)
-    }
-
-    // uint256[]
-    function abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr(offset, length, end) -> array {
-        array := allocate_memory(array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length))
-        let dst := array
-
-        mstore(array, length)
-        dst := add(array, 0x20)
-
-        let srcEnd := add(offset, mul(length, 0x20))
-        if gt(srcEnd, end) {
-            revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef()
-        }
-        for { let src := offset } lt(src, srcEnd) { src := add(src, 0x20) }
-        {
-
-            let elementPos := src
-
-            mstore(dst, abi_decode_t_uint256(elementPos, end))
-            dst := add(dst, 0x20)
-        }
-    }
-
-    // uint256[]
-    function abi_decode_t_array$_t_uint256_$dyn_memory_ptr(offset, end) -> array {
-        if iszero(slt(add(offset, 0x1f), end)) { revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() }
-        let length := calldataload(offset)
-        array := abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr(add(offset, 0x20), length, end)
-    }
-
-    function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr(headStart, dataEnd) -> value0 {
-        if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-        {
-
-            let offset := calldataload(add(headStart, 0))
-            if gt(offset, 0xffffffffffffffff) { revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() }
-
-            value0 := abi_decode_t_array$_t_uint256_$dyn_memory_ptr(add(headStart, offset), dataEnd)
-        }
-
-    }
-
-    function abi_encode_t_uint256_to_t_uint256_fromStack(value, pos) {
-        mstore(pos, cleanup_t_uint256(value))
-    }
-
-    function abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed(headStart , value0) -> tail {
-        tail := add(headStart, 32)
-
-        abi_encode_t_uint256_to_t_uint256_fromStack(value0,  add(headStart, 0))
-
-    }
-
-}
-",
-                                "id": 1,
-                                "language": "Yul",
-                                "name": "#utility.yul"
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3420",
-            "formattedMessage": "Warning: Source file does not specify required compiler version!
---> a.sol
-
-",
-            "message": "Source file does not specify required compiler version!",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": -1,
-                "file": "a.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_immutable_references/input.json b/test/cmdlineTests/standard_immutable_references/input.json
deleted file mode 100644
index dd3a77a8d491..000000000000
--- a/test/cmdlineTests/standard_immutable_references/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { uint256 immutable x = 1 + 3; function f() public pure returns (uint256) { return x; } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "outputSelection": {
-   "*": {
-    "A": [
-     "evm.deployedBytecode.immutableReferences"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/standard_immutable_references/output.json b/test/cmdlineTests/standard_immutable_references/output.json
deleted file mode 100644
index e25a911fff6e..000000000000
--- a/test/cmdlineTests/standard_immutable_references/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "deployedBytecode":
-                    {
-                        "immutableReferences":
-                        {
-                            "6":
-                            [
-                                {
-                                    "length": 32,
-                                    "start": 75
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_import_ast/input.json b/test/cmdlineTests/standard_import_ast/input.json
deleted file mode 100644
index 5ae7a5297d29..000000000000
--- a/test/cmdlineTests/standard_import_ast/input.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-	"language": "SolidityAST",
-	"sources": {
-		"A": {
-			"ast": {
-				"absolutePath": "A",
-				"exportedSymbols": {
-					"C": [
-						6
-					]
-				},
-				"id": 7,
-				"license": "GPL-3.0",
-				"nodeType": "SourceUnit",
-				"nodes": [
-					{
-						"id": 1,
-						"literals": [
-							"solidity",
-							">=",
-							"0.0"
-						],
-						"nodeType": "PragmaDirective",
-						"src": "36:22:0"
-					},
-					{
-						"abstract": false,
-						"baseContracts": [],
-						"canonicalName": "C",
-						"contractDependencies": [],
-						"contractKind": "contract",
-						"fullyImplemented": true,
-						"id": 6,
-						"linearizedBaseContracts": [
-							6
-						],
-						"name": "C",
-						"nameLocation": "68:1:0",
-						"nodeType": "ContractDefinition",
-						"nodes": [
-							{
-								"body": {
-									"id": 4,
-									"nodeType": "Block",
-									"src": "97:2:0",
-									"statements": []
-								},
-								"functionSelector": "26121ff0",
-								"id": 5,
-								"implemented": true,
-								"kind": "function",
-								"modifiers": [],
-								"name": "f",
-								"nameLocation": "81:1:0",
-								"nodeType": "FunctionDefinition",
-								"parameters": {
-									"id": 2,
-									"nodeType": "ParameterList",
-									"parameters": [],
-									"src": "82:2:0"
-								},
-								"returnParameters": {
-									"id": 3,
-									"nodeType": "ParameterList",
-									"parameters": [],
-									"src": "97:0:0"
-								},
-								"scope": 6,
-								"src": "72:27:0",
-								"stateMutability": "pure",
-								"virtual": false,
-								"visibility": "public"
-							}
-						],
-						"scope": 7,
-						"src": "59:42:0",
-						"usedErrors": []
-					}
-				],
-				"src": "36:65:0"
-			},
-			"id": 0
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"*": {
-				"": [
-					"ast"
-				]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_import_ast/output.json b/test/cmdlineTests/standard_import_ast/output.json
deleted file mode 100644
index 6ecac5ca364d..000000000000
--- a/test/cmdlineTests/standard_import_ast/output.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
-                        6
-                    ]
-                },
-                "id": 7,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            ">=",
-                            "0.0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:22:0"
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "canonicalName": "C",
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "fullyImplemented": true,
-                        "id": 6,
-                        "linearizedBaseContracts":
-                        [
-                            6
-                        ],
-                        "name": "C",
-                        "nameLocation": "68:1:0",
-                        "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
-                            {
-                                "body":
-                                {
-                                    "id": 4,
-                                    "nodeType": "Block",
-                                    "src": "97:2:0",
-                                    "statements": []
-                                },
-                                "functionSelector": "26121ff0",
-                                "id": 5,
-                                "implemented": true,
-                                "kind": "function",
-                                "modifiers": [],
-                                "name": "f",
-                                "nameLocation": "81:1:0",
-                                "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
-                                    "id": 2,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "82:2:0"
-                                },
-                                "returnParameters":
-                                {
-                                    "id": 3,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "97:0:0"
-                                },
-                                "scope": 6,
-                                "src": "72:27:0",
-                                "stateMutability": "pure",
-                                "virtual": false,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 7,
-                        "src": "59:42:0",
-                        "usedErrors": [],
-                        "usedEvents": []
-                    }
-                ],
-                "src": "36:65:0"
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_import_ast_select_bytecode/input.json b/test/cmdlineTests/standard_import_ast_select_bytecode/input.json
deleted file mode 100644
index 6458cb7e151e..000000000000
--- a/test/cmdlineTests/standard_import_ast_select_bytecode/input.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "language": "SolidityAST",
-  "sources": {
-    "A": {
-      "ast": {
-        "absolutePath": "empty_contract.sol",
-        "exportedSymbols": {
-          "test": [
-            1
-          ]
-        },
-        "id": 2,
-        "nodeType": "SourceUnit",
-        "nodes": [
-          {
-            "abstract": false,
-            "baseContracts": [],
-            "canonicalName": "test",
-            "contractDependencies": [],
-            "contractKind": "contract",
-            "fullyImplemented": true,
-            "id": 1,
-            "linearizedBaseContracts": [
-              1
-            ],
-            "name": "test",
-            "nameLocation": "9:4:0",
-            "nodeType": "ContractDefinition",
-            "nodes": [],
-            "scope": 2,
-            "src": "0:17:0",
-            "usedErrors": []
-          }
-        ],
-        "src": "0:124:0"
-      },
-      "id": 0
-    }
-  },
-  "settings": {
-    "outputSelection": {
-      "*": {
-        "*": [
-          "evm.bytecode",
-          "evm.bytecode.sourceMap"
-        ]
-      }
-    }
-  }
-}
diff --git a/test/cmdlineTests/standard_import_ast_select_bytecode/output.json b/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
deleted file mode 100644
index 0fca3f2715a3..000000000000
--- a/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "test":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/args b/test/cmdlineTests/standard_invalid_option_no_optimize_yul/args
deleted file mode 100644
index de395419be2a..000000000000
--- a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---no-optimize-yul
diff --git a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err b/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err
deleted file mode 100644
index 1205089d41ec..000000000000
--- a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --no-optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/exit b/test/cmdlineTests/standard_invalid_option_no_optimize_yul/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/input.json b/test/cmdlineTests/standard_invalid_option_no_optimize_yul/input.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_invalid_option_optimize/args b/test/cmdlineTests/standard_invalid_option_optimize/args
deleted file mode 100644
index 0ba259dbff7d..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize
diff --git a/test/cmdlineTests/standard_invalid_option_optimize/err b/test/cmdlineTests/standard_invalid_option_optimize/err
deleted file mode 100644
index da724d56a58f..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_optimize/exit b/test/cmdlineTests/standard_invalid_option_optimize/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/standard_invalid_option_optimize/input.json b/test/cmdlineTests/standard_invalid_option_optimize/input.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_runs/args b/test/cmdlineTests/standard_invalid_option_optimize_runs/args
deleted file mode 100644
index c9d29f5347a4..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize_runs/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize-runs 1000
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_runs/err b/test/cmdlineTests/standard_invalid_option_optimize_runs/err
deleted file mode 100644
index a625ad498916..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize_runs/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize-runs is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_runs/exit b/test/cmdlineTests/standard_invalid_option_optimize_runs/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize_runs/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_runs/input.json b/test/cmdlineTests/standard_invalid_option_optimize_runs/input.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_yul/args b/test/cmdlineTests/standard_invalid_option_optimize_yul/args
deleted file mode 100644
index 9625ac425fca..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize-yul
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_yul/err b/test/cmdlineTests/standard_invalid_option_optimize_yul/err
deleted file mode 100644
index 6d3a9306645b..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_yul/exit b/test/cmdlineTests/standard_invalid_option_optimize_yul/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/standard_invalid_option_optimize_yul/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_yul/input.json b/test/cmdlineTests/standard_invalid_option_optimize_yul/input.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_invalid_option_yul_optimizations/args b/test/cmdlineTests/standard_invalid_option_yul_optimizations/args
deleted file mode 100644
index f72079a37645..000000000000
--- a/test/cmdlineTests/standard_invalid_option_yul_optimizations/args
+++ /dev/null
@@ -1 +0,0 @@
---yul-optimizations a
diff --git a/test/cmdlineTests/standard_invalid_option_yul_optimizations/err b/test/cmdlineTests/standard_invalid_option_yul_optimizations/err
deleted file mode 100644
index f0db47ef9dcf..000000000000
--- a/test/cmdlineTests/standard_invalid_option_yul_optimizations/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Option --yul-optimizations is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_yul_optimizations/exit b/test/cmdlineTests/standard_invalid_option_yul_optimizations/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/standard_invalid_option_yul_optimizations/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/standard_invalid_option_yul_optimizations/input.json b/test/cmdlineTests/standard_invalid_option_yul_optimizations/input.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/in.sol b/test/cmdlineTests/standard_irOptimized_ast_requested/in.sol
deleted file mode 100644
index a3a86cc8d317..000000000000
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/in.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {}
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/input.json b/test/cmdlineTests/standard_irOptimized_ast_requested/input.json
deleted file mode 100644
index fd16983068aa..000000000000
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_irOptimized_ast_requested/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {"*": {"*": ["irOptimizedAst"]}}
-	}
-}
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
deleted file mode 100644
index 200b653ff443..000000000000
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
+++ /dev/null
@@ -1,571 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "irOptimizedAst":
-                {
-                    "code":
-                    {
-                        "block":
-                        {
-                            "nativeSrc": "44:790:0",
-                            "nodeType": "YulBlock",
-                            "src": "-1:-1:0",
-                            "statements":
-                            [
-                                {
-                                    "nativeSrc": "44:790:0",
-                                    "nodeType": "YulBlock",
-                                    "src": "-1:-1:0",
-                                    "statements":
-                                    [
-                                        {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "kind": "number",
-                                                        "nativeSrc": "103:2:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "64"
-                                                    },
-                                                    {
-                                                        "arguments":
-                                                        [
-                                                            {
-                                                                "kind": "number",
-                                                                "nativeSrc": "119:3:0",
-                                                                "nodeType": "YulLiteral",
-                                                                "src": "56:13:0",
-                                                                "type": "",
-                                                                "value": "0x80"
-                                                            }
-                                                        ],
-                                                        "functionName":
-                                                        {
-                                                            "name": "memoryguard",
-                                                            "nativeSrc": "107:11:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "107:16:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "mstore",
-                                                    "nativeSrc": "96:6:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "96:28:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "96:28:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "148:83:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments": [],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                                                "nativeSrc": "150:77:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "150:79:0",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "150:79:0",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ]
-                                            },
-                                            "condition":
-                                            {
-                                                "arguments": [],
-                                                "functionName":
-                                                {
-                                                    "name": "callvalue",
-                                                    "nativeSrc": "136:9:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "136:11:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "133:98:0",
-                                            "nodeType": "YulIf",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "nativeSrc": "268:30:0",
-                                            "nodeType": "YulVariableDeclaration",
-                                            "src": "56:13:0",
-                                            "value":
-                                            {
-                                                "arguments": [],
-                                                "functionName":
-                                                {
-                                                    "name": "allocate_unbounded",
-                                                    "nativeSrc": "278:18:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "278:20:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "variables":
-                                            [
-                                                {
-                                                    "name": "_1",
-                                                    "nativeSrc": "272:2:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "name": "_1",
-                                                        "nativeSrc": "316:2:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    {
-                                                        "arguments":
-                                                        [
-                                                            {
-                                                                "hexValue": "435f325f6465706c6f796564",
-                                                                "kind": "string",
-                                                                "nativeSrc": "331:14:0",
-                                                                "nodeType": "YulLiteral",
-                                                                "src": "56:13:0",
-                                                                "type": "",
-                                                                "value": "C_2_deployed"
-                                                            }
-                                                        ],
-                                                        "functionName":
-                                                        {
-                                                            "name": "dataoffset",
-                                                            "nativeSrc": "320:10:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "320:26:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    {
-                                                        "arguments":
-                                                        [
-                                                            {
-                                                                "hexValue": "435f325f6465706c6f796564",
-                                                                "kind": "string",
-                                                                "nativeSrc": "357:14:0",
-                                                                "nodeType": "YulLiteral",
-                                                                "src": "56:13:0",
-                                                                "type": "",
-                                                                "value": "C_2_deployed"
-                                                            }
-                                                        ],
-                                                        "functionName":
-                                                        {
-                                                            "name": "datasize",
-                                                            "nativeSrc": "348:8:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "348:24:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "codecopy",
-                                                    "nativeSrc": "307:8:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "307:66:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "307:66:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "name": "_1",
-                                                        "nativeSrc": "390:2:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    {
-                                                        "arguments":
-                                                        [
-                                                            {
-                                                                "hexValue": "435f325f6465706c6f796564",
-                                                                "kind": "string",
-                                                                "nativeSrc": "403:14:0",
-                                                                "nodeType": "YulLiteral",
-                                                                "src": "56:13:0",
-                                                                "type": "",
-                                                                "value": "C_2_deployed"
-                                                            }
-                                                        ],
-                                                        "functionName":
-                                                        {
-                                                            "name": "datasize",
-                                                            "nativeSrc": "394:8:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "394:24:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "return",
-                                                    "nativeSrc": "383:6:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "383:36:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "383:36:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "469:43:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements":
-                                        [
-                                            {
-                                                "nativeSrc": "483:19:0",
-                                                "nodeType": "YulAssignment",
-                                                "src": "56:13:0",
-                                                "value":
-                                                {
-                                                    "arguments":
-                                                    [
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "499:2:0",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "56:13:0",
-                                                            "type": "",
-                                                            "value": "64"
-                                                        }
-                                                    ],
-                                                    "functionName":
-                                                    {
-                                                        "name": "mload",
-                                                        "nativeSrc": "493:5:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "493:9:0",
-                                                    "nodeType": "YulFunctionCall",
-                                                    "src": "56:13:0"
-                                                },
-                                                "variableNames":
-                                                [
-                                                    {
-                                                        "name": "memPtr",
-                                                        "nativeSrc": "483:6:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ]
-                                            }
-                                        ]
-                                    },
-                                    "name": "allocate_unbounded",
-                                    "nativeSrc": "429:83:0",
-                                    "nodeType": "YulFunctionDefinition",
-                                    "returnVariables":
-                                    [
-                                        {
-                                            "name": "memPtr",
-                                            "nativeSrc": "462:6:0",
-                                            "nodeType": "YulTypedName",
-                                            "src": "56:13:0",
-                                            "type": ""
-                                        }
-                                    ],
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "611:36:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements":
-                                        [
-                                            {
-                                                "expression":
-                                                {
-                                                    "arguments":
-                                                    [
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "632:1:0",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "56:13:0",
-                                                            "type": "",
-                                                            "value": "0"
-                                                        },
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "635:1:0",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "56:13:0",
-                                                            "type": "",
-                                                            "value": "0"
-                                                        }
-                                                    ],
-                                                    "functionName":
-                                                    {
-                                                        "name": "revert",
-                                                        "nativeSrc": "625:6:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "625:12:0",
-                                                    "nodeType": "YulFunctionCall",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "625:12:0",
-                                                "nodeType": "YulExpressionStatement",
-                                                "src": "56:13:0"
-                                            }
-                                        ]
-                                    },
-                                    "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                    "nativeSrc": "522:125:0",
-                                    "nodeType": "YulFunctionDefinition",
-                                    "src": "56:13:0"
-                                }
-                            ]
-                        },
-                        "nodeType": "YulCode"
-                    },
-                    "name": "C_2",
-                    "nodeType": "YulObject",
-                    "subObjects":
-                    [
-                        {
-                            "code":
-                            {
-                                "block":
-                                {
-                                    "nativeSrc": "899:588:0",
-                                    "nodeType": "YulBlock",
-                                    "src": "-1:-1:0",
-                                    "statements":
-                                    [
-                                        {
-                                            "nativeSrc": "899:588:0",
-                                            "nodeType": "YulBlock",
-                                            "src": "-1:-1:0",
-                                            "statements":
-                                            [
-                                                {
-                                                    "expression":
-                                                    {
-                                                        "arguments":
-                                                        [
-                                                            {
-                                                                "kind": "number",
-                                                                "nativeSrc": "966:2:0",
-                                                                "nodeType": "YulLiteral",
-                                                                "src": "56:13:0",
-                                                                "type": "",
-                                                                "value": "64"
-                                                            },
-                                                            {
-                                                                "arguments":
-                                                                [
-                                                                    {
-                                                                        "kind": "number",
-                                                                        "nativeSrc": "982:3:0",
-                                                                        "nodeType": "YulLiteral",
-                                                                        "src": "56:13:0",
-                                                                        "type": "",
-                                                                        "value": "0x80"
-                                                                    }
-                                                                ],
-                                                                "functionName":
-                                                                {
-                                                                    "name": "memoryguard",
-                                                                    "nativeSrc": "970:11:0",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "56:13:0"
-                                                                },
-                                                                "nativeSrc": "970:16:0",
-                                                                "nodeType": "YulFunctionCall",
-                                                                "src": "56:13:0"
-                                                            }
-                                                        ],
-                                                        "functionName":
-                                                        {
-                                                            "name": "mstore",
-                                                            "nativeSrc": "959:6:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "959:28:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "959:28:0",
-                                                    "nodeType": "YulExpressionStatement",
-                                                    "src": "56:13:0"
-                                                },
-                                                {
-                                                    "expression":
-                                                    {
-                                                        "arguments": [],
-                                                        "functionName":
-                                                        {
-                                                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                                            "nativeSrc": "1001:77:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "1001:79:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "1001:79:0",
-                                                    "nodeType": "YulExpressionStatement",
-                                                    "src": "56:13:0"
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1432:44:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1457:1:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1460:1:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "1450:6:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "1450:12:0",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "1450:12:0",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                            "nativeSrc": "1343:133:0",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "56:13:0"
-                                        }
-                                    ]
-                                },
-                                "nodeType": "YulCode"
-                            },
-                            "name": "C_2_deployed",
-                            "nodeType": "YulObject",
-                            "subObjects":
-                            [
-                                {
-                                    "nodeType": "YulData",
-                                    "value": "<BYTECODE REMOVED>"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_irOptimized_requested/input.json b/test/cmdlineTests/standard_irOptimized_requested/input.json
deleted file mode 100644
index 48e5c7b0a2db..000000000000
--- a/test/cmdlineTests/standard_irOptimized_requested/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["irOptimized"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
deleted file mode 100644
index 88ce6489578e..000000000000
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "irOptimized": "/// @use-src 0:\"A\"
-object \"C_7\" {
-    code {
-        {
-            /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-            mstore(64, memoryguard(0x80))
-            if callvalue()
-            {
-                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            }
-            let _1 := allocate_unbounded()
-            codecopy(_1, dataoffset(\"C_7_deployed\"), datasize(\"C_7_deployed\"))
-            return(_1, datasize(\"C_7_deployed\"))
-        }
-        function allocate_unbounded() -> memPtr
-        { memPtr := mload(64) }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-    }
-    /// @use-src 0:\"A\"
-    object \"C_7_deployed\" {
-        code {
-            {
-                /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-                mstore(64, memoryguard(0x80))
-                if iszero(lt(calldatasize(), 4))
-                {
-                    let selector := shift_right_unsigned(calldataload(0))
-                    switch selector
-                    case 0x26121ff0 { external_fun_f() }
-                    default { }
-                }
-                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            }
-            function shift_right_unsigned(value) -> newValue
-            { newValue := shr(224, value) }
-            function allocate_unbounded() -> memPtr
-            { memPtr := mload(64) }
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            { revert(0, 0) }
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
-            { revert(0, 0) }
-            function abi_decode(headStart, dataEnd)
-            {
-                if slt(sub(dataEnd, headStart), 0)
-                {
-                    revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
-                }
-            }
-            function abi_encode_tuple(headStart) -> tail
-            { tail := add(headStart, 0) }
-            function external_fun_f()
-            {
-                if callvalue()
-                {
-                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-                }
-                abi_decode(4, calldatasize())
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple(memPos)
-                return(memPos, sub(memEnd, memPos))
-            }
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            { revert(0, 0) }
-        }
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_ir_ast_requested/in.sol b/test/cmdlineTests/standard_ir_ast_requested/in.sol
deleted file mode 100644
index a3a86cc8d317..000000000000
--- a/test/cmdlineTests/standard_ir_ast_requested/in.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {}
diff --git a/test/cmdlineTests/standard_ir_ast_requested/input.json b/test/cmdlineTests/standard_ir_ast_requested/input.json
deleted file mode 100644
index 1cb1083a2ef6..000000000000
--- a/test/cmdlineTests/standard_ir_ast_requested/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_ir_ast_requested/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {"*": {"*": ["irAst"]}}
-	}
-}
diff --git a/test/cmdlineTests/standard_ir_ast_requested/output.json b/test/cmdlineTests/standard_ir_ast_requested/output.json
deleted file mode 100644
index f949d7b30cb2..000000000000
--- a/test/cmdlineTests/standard_ir_ast_requested/output.json
+++ /dev/null
@@ -1,729 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "irAst":
-                {
-                    "code":
-                    {
-                        "block":
-                        {
-                            "nativeSrc": "44:790:0",
-                            "nodeType": "YulBlock",
-                            "src": "-1:-1:0",
-                            "statements":
-                            [
-                                {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "kind": "number",
-                                                "nativeSrc": "103:2:0",
-                                                "nodeType": "YulLiteral",
-                                                "src": "56:13:0",
-                                                "type": "",
-                                                "value": "64"
-                                            },
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "kind": "number",
-                                                        "nativeSrc": "119:3:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "128"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "memoryguard",
-                                                    "nativeSrc": "107:11:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "107:16:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "mstore",
-                                            "nativeSrc": "96:6:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "96:28:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "96:28:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "148:83:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements":
-                                        [
-                                            {
-                                                "expression":
-                                                {
-                                                    "arguments": [],
-                                                    "functionName":
-                                                    {
-                                                        "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                                        "nativeSrc": "150:77:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "150:79:0",
-                                                    "nodeType": "YulFunctionCall",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "150:79:0",
-                                                "nodeType": "YulExpressionStatement",
-                                                "src": "56:13:0"
-                                            }
-                                        ]
-                                    },
-                                    "condition":
-                                    {
-                                        "arguments": [],
-                                        "functionName":
-                                        {
-                                            "name": "callvalue",
-                                            "nativeSrc": "136:9:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "136:11:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "133:98:0",
-                                    "nodeType": "YulIf",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "expression":
-                                    {
-                                        "arguments": [],
-                                        "functionName":
-                                        {
-                                            "name": "constructor_C_2",
-                                            "nativeSrc": "241:15:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "241:17:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "241:17:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "nativeSrc": "268:30:0",
-                                    "nodeType": "YulVariableDeclaration",
-                                    "src": "56:13:0",
-                                    "value":
-                                    {
-                                        "arguments": [],
-                                        "functionName":
-                                        {
-                                            "name": "allocate_unbounded",
-                                            "nativeSrc": "278:18:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "278:20:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "variables":
-                                    [
-                                        {
-                                            "name": "_1",
-                                            "nativeSrc": "272:2:0",
-                                            "nodeType": "YulTypedName",
-                                            "src": "56:13:0",
-                                            "type": ""
-                                        }
-                                    ]
-                                },
-                                {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "name": "_1",
-                                                "nativeSrc": "316:2:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "56:13:0"
-                                            },
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "hexValue": "435f325f6465706c6f796564",
-                                                        "kind": "string",
-                                                        "nativeSrc": "331:14:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "C_2_deployed"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "dataoffset",
-                                                    "nativeSrc": "320:10:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "320:26:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "hexValue": "435f325f6465706c6f796564",
-                                                        "kind": "string",
-                                                        "nativeSrc": "357:14:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "C_2_deployed"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "datasize",
-                                                    "nativeSrc": "348:8:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "348:24:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "codecopy",
-                                            "nativeSrc": "307:8:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "307:66:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "307:66:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "name": "_1",
-                                                "nativeSrc": "390:2:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "56:13:0"
-                                            },
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "hexValue": "435f325f6465706c6f796564",
-                                                        "kind": "string",
-                                                        "nativeSrc": "403:14:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "C_2_deployed"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "datasize",
-                                                    "nativeSrc": "394:8:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "394:24:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "return",
-                                            "nativeSrc": "383:6:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "383:36:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "383:36:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "469:43:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements":
-                                        [
-                                            {
-                                                "nativeSrc": "483:19:0",
-                                                "nodeType": "YulAssignment",
-                                                "src": "56:13:0",
-                                                "value":
-                                                {
-                                                    "arguments":
-                                                    [
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "499:2:0",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "56:13:0",
-                                                            "type": "",
-                                                            "value": "64"
-                                                        }
-                                                    ],
-                                                    "functionName":
-                                                    {
-                                                        "name": "mload",
-                                                        "nativeSrc": "493:5:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "493:9:0",
-                                                    "nodeType": "YulFunctionCall",
-                                                    "src": "56:13:0"
-                                                },
-                                                "variableNames":
-                                                [
-                                                    {
-                                                        "name": "memPtr",
-                                                        "nativeSrc": "483:6:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ]
-                                            }
-                                        ]
-                                    },
-                                    "name": "allocate_unbounded",
-                                    "nativeSrc": "429:83:0",
-                                    "nodeType": "YulFunctionDefinition",
-                                    "returnVariables":
-                                    [
-                                        {
-                                            "name": "memPtr",
-                                            "nativeSrc": "462:6:0",
-                                            "nodeType": "YulTypedName",
-                                            "src": "56:13:0",
-                                            "type": ""
-                                        }
-                                    ],
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "611:36:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements":
-                                        [
-                                            {
-                                                "expression":
-                                                {
-                                                    "arguments":
-                                                    [
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "632:1:0",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "56:13:0",
-                                                            "type": "",
-                                                            "value": "0"
-                                                        },
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "635:1:0",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "56:13:0",
-                                                            "type": "",
-                                                            "value": "0"
-                                                        }
-                                                    ],
-                                                    "functionName":
-                                                    {
-                                                        "name": "revert",
-                                                        "nativeSrc": "625:6:0",
-                                                        "nodeType": "YulIdentifier",
-                                                        "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "625:12:0",
-                                                    "nodeType": "YulFunctionCall",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "625:12:0",
-                                                "nodeType": "YulExpressionStatement",
-                                                "src": "56:13:0"
-                                            }
-                                        ]
-                                    },
-                                    "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                    "nativeSrc": "522:125:0",
-                                    "nodeType": "YulFunctionDefinition",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "726:59:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements": []
-                                    },
-                                    "name": "constructor_C_2",
-                                    "nativeSrc": "699:86:0",
-                                    "nodeType": "YulFunctionDefinition",
-                                    "src": "56:13:0"
-                                }
-                            ]
-                        },
-                        "nodeType": "YulCode"
-                    },
-                    "name": "C_2",
-                    "nodeType": "YulObject",
-                    "subObjects":
-                    [
-                        {
-                            "code":
-                            {
-                                "block":
-                                {
-                                    "nativeSrc": "899:588:0",
-                                    "nodeType": "YulBlock",
-                                    "src": "-1:-1:0",
-                                    "statements":
-                                    [
-                                        {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "kind": "number",
-                                                        "nativeSrc": "966:2:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "64"
-                                                    },
-                                                    {
-                                                        "arguments":
-                                                        [
-                                                            {
-                                                                "kind": "number",
-                                                                "nativeSrc": "982:3:0",
-                                                                "nodeType": "YulLiteral",
-                                                                "src": "56:13:0",
-                                                                "type": "",
-                                                                "value": "128"
-                                                            }
-                                                        ],
-                                                        "functionName":
-                                                        {
-                                                            "name": "memoryguard",
-                                                            "nativeSrc": "970:11:0",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "970:16:0",
-                                                        "nodeType": "YulFunctionCall",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "mstore",
-                                                    "nativeSrc": "959:6:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "959:28:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "959:28:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "expression":
-                                            {
-                                                "arguments": [],
-                                                "functionName":
-                                                {
-                                                    "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                                    "nativeSrc": "1001:77:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "1001:79:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "1001:79:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1147:77:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1165:44:0",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "56:13:0",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1198:3:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "224"
-                                                                },
-                                                                {
-                                                                    "name": "value",
-                                                                    "nativeSrc": "1203:5:0",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "56:13:0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "shr",
-                                                                "nativeSrc": "1194:3:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "1194:15:0",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "newValue",
-                                                                "nativeSrc": "1165:8:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "shift_right_224_unsigned",
-                                            "nativeSrc": "1094:130:0",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "value",
-                                                    "nativeSrc": "1128:5:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "newValue",
-                                                    "nativeSrc": "1138:8:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1278:51:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1296:19:0",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "56:13:0",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1312:2:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "64"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mload",
-                                                                "nativeSrc": "1306:5:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "1306:9:0",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "memPtr",
-                                                                "nativeSrc": "1296:6:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "allocate_unbounded",
-                                            "nativeSrc": "1238:91:0",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "memPtr",
-                                                    "nativeSrc": "1271:6:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1432:44:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1457:1:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1460:1:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "1450:6:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "1450:12:0",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "nativeSrc": "1450:12:0",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "56:13:0"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                            "nativeSrc": "1343:133:0",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "56:13:0"
-                                        }
-                                    ]
-                                },
-                                "nodeType": "YulCode"
-                            },
-                            "name": "C_2_deployed",
-                            "nodeType": "YulObject",
-                            "subObjects":
-                            [
-                                {
-                                    "nodeType": "YulData",
-                                    "value": "<BYTECODE REMOVED>"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_ir_requested/input.json b/test/cmdlineTests/standard_ir_requested/input.json
deleted file mode 100644
index 6eb5295c53c4..000000000000
--- a/test/cmdlineTests/standard_ir_requested/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_ir_requested/output.json b/test/cmdlineTests/standard_ir_requested/output.json
deleted file mode 100644
index ab38f0a58921..000000000000
--- a/test/cmdlineTests/standard_ir_requested/output.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_7\" {
-    code {
-        /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_7()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_7_deployed\"), datasize(\"C_7_deployed\"))
-
-        return(_1, datasize(\"C_7_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-        function constructor_C_7() {
-
-            /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-
-        }
-        /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_7_deployed\" {
-        code {
-            /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_6()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_6() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_6()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            /// @ast-id 6
-            /// @src 0:92:119  \"function f() public pure {}\"
-            function fun_f_6() {
-
-            }
-            /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/input.json b/test/cmdlineTests/standard_json_no_pretty_print/input.json
deleted file mode 100644
index e9dc4cf381a7..000000000000
--- a/test/cmdlineTests/standard_json_no_pretty_print/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C {}"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/no-pretty-print b/test/cmdlineTests/standard_json_no_pretty_print/no-pretty-print
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/output.json b/test/cmdlineTests/standard_json_no_pretty_print/output.json
deleted file mode 100644
index 59b90c8cc98e..000000000000
--- a/test/cmdlineTests/standard_json_no_pretty_print/output.json
+++ /dev/null
@@ -1 +0,0 @@
-{"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_metadata/args b/test/cmdlineTests/standard_metadata/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_metadata/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_metadata/in.sol b/test/cmdlineTests/standard_metadata/in.sol
deleted file mode 100644
index a3a86cc8d317..000000000000
--- a/test/cmdlineTests/standard_metadata/in.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {}
diff --git a/test/cmdlineTests/standard_metadata/input.json b/test/cmdlineTests/standard_metadata/input.json
deleted file mode 100644
index ae4bfe8f5965..000000000000
--- a/test/cmdlineTests/standard_metadata/input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_metadata/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {
-			"*": {"*": ["metadata"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_metadata/output.json b/test/cmdlineTests/standard_metadata/output.json
deleted file mode 100644
index 4429466676d1..000000000000
--- a/test/cmdlineTests/standard_metadata/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"C\":\"C\"},\"evmVersion\":\"shanghai\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"C\":{\"keccak256\":\"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2\",\"dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS\"]}},\"version\":1}"
-            }
-        }
-    },
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested/input.json b/test/cmdlineTests/standard_method_identifiers_requested/input.json
deleted file mode 100644
index c7a770fb4411..000000000000
--- a/test/cmdlineTests/standard_method_identifiers_requested/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["evm.methodIdentifiers"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested/output.json b/test/cmdlineTests/standard_method_identifiers_requested/output.json
deleted file mode 100644
index 35d4f5002508..000000000000
--- a/test/cmdlineTests/standard_method_identifiers_requested/output.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "methodIdentifiers":
-                    {
-                        "f()": "26121ff0"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested_empty/input.json b/test/cmdlineTests/standard_method_identifiers_requested_empty/input.json
deleted file mode 100644
index 28b9699b51ff..000000000000
--- a/test/cmdlineTests/standard_method_identifiers_requested_empty/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["evm.methodIdentifiers"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json b/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
deleted file mode 100644
index f90a33351b35..000000000000
--- a/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "methodIdentifiers": {}
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_missing_key_useLiteralContent/input.json b/test/cmdlineTests/standard_missing_key_useLiteralContent/input.json
deleted file mode 100644
index 459f991b4832..000000000000
--- a/test/cmdlineTests/standard_missing_key_useLiteralContent/input.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true,
-			"runs": 200
-		},
-		"evmVersion": "byzantium",
-		"metadata": {}
-	}
-}
diff --git a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json b/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
deleted file mode 100644
index f3a09c9e7bfb..000000000000
--- a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
-            "message": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json
deleted file mode 100644
index e7d2d09bb5ae..000000000000
--- a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-			pragma solidity >=0.0;
-			contract C
-			{
-				function f(uint x) public pure {
-					require(x == 0);
-					do {
-						++x;
-					} while (x < 2);
-					assert(x == 2);
-				}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-            "bmcLoopIterations": 3
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
deleted file mode 100644
index 139b0825bc47..000000000000
--- a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json
deleted file mode 100644
index 8c5fa65cd906..000000000000
--- a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-			pragma solidity >=0.0;
-			contract C
-			{
-				function f(uint x) public pure {
-					require(x == 0);
-					do {
-						++x;
-					} while (x < 2);
-					assert(x == 2);
-				}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-            "bmcLoopIterations": "bmc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json
deleted file mode 100644
index 971973d85c0c..000000000000
--- a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.bmcLoopIterations must be an unsigned integer.",
-            "message": "settings.modelChecker.bmcLoopIterations must be an unsigned integer.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all/input.json b/test/cmdlineTests/standard_model_checker_contracts_all/input.json
deleted file mode 100644
index 6bd9f66b1a03..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_all/input.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all/output.json b/test/cmdlineTests/standard_model_checker_contracts_all/output.json
deleted file mode 100644
index b4bfd66b8489..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_all/output.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)
- --> Source:5:7:
-  |
-5 | \t\t\t\t\t\tassert(y > 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 137,
-                "file": "Source",
-                "start": 124
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)
-  --> Source:10:7:
-   |
-10 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 231,
-                "file": "Source",
-                "start": 218
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/input.json b/test/cmdlineTests/standard_model_checker_contracts_all_explicit/input.json
deleted file mode 100644
index c1b631f10252..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": ["A", "B"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json b/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
deleted file mode 100644
index b4bfd66b8489..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)
- --> Source:5:7:
-  |
-5 | \t\t\t\t\t\tassert(y > 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 137,
-                "file": "Source",
-                "start": 124
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)
-  --> Source:10:7:
-   |
-10 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 231,
-                "file": "Source",
-                "start": 218
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_array/input.json b/test/cmdlineTests/standard_model_checker_contracts_empty_array/input.json
deleted file mode 100644
index 9b0ea52f0718..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_array/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": []
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json b/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
deleted file mode 100644
index ada440ad3880..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Source contracts must be a non-empty array.",
-            "message": "Source contracts must be a non-empty array.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/input.json b/test/cmdlineTests/standard_model_checker_contracts_empty_contract/input.json
deleted file mode 100644
index e9f86e61e20c..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": [""]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json b/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
deleted file mode 100644
index c3b171e99e4f..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Contract name cannot be empty.",
-            "message": "Contract name cannot be empty.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_source/input.json b/test/cmdlineTests/standard_model_checker_contracts_empty_source/input.json
deleted file mode 100644
index 2cc4273c7f5c..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_source/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"": ["A"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json b/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
deleted file mode 100644
index 98dcc1afadfb..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Source name cannot be empty.",
-            "message": "Source name cannot be empty.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/input.json b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/input.json
deleted file mode 100644
index f267a0c225b2..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": ["C"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
deleted file mode 100644
index 7ff30950c1ba..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7400",
-            "formattedMessage": "Warning: Requested contract \"C\" does not exist in source \"Source\".
-
-",
-            "message": "Requested contract \"C\" does not exist in source \"Source\".",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)
- --> Source:5:7:
-  |
-5 | \t\t\t\t\t\tassert(y > 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 137,
-                "file": "Source",
-                "start": 124
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)
-  --> Source:10:7:
-   |
-10 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 231,
-                "file": "Source",
-                "start": 218
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_multi_source/input.json b/test/cmdlineTests/standard_model_checker_contracts_multi_source/input.json
deleted file mode 100644
index a3c08cd3dcad..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_multi_source/input.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		},
-		"Source2":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				import 'Source';
-				contract C is A {
-					function h(uint z) public pure {
-						assert(z > 100);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": ["A"], "Source2": ["C"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json b/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
deleted file mode 100644
index cb18875e1bf4..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)
- --> Source:5:7:
-  |
-5 | \t\t\t\t\t\tassert(y > 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 137,
-                "file": "Source",
-                "start": 124
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)
-  --> Source:10:7:
-   |
-10 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 231,
-                "file": "Source",
-                "start": 218
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-z = 0
-
-Transaction trace:
-C.constructor()
-C.h(0)
- --> Source2:6:7:
-  |
-6 | \t\t\t\t\t\tassert(z > 100);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-z = 0
-
-Transaction trace:
-C.constructor()
-C.h(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 165,
-                "file": "Source2",
-                "start": 150
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        },
-        "Source2":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_only_one/input.json b/test/cmdlineTests/standard_model_checker_contracts_only_one/input.json
deleted file mode 100644
index a82a34bcdbbe..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_only_one/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": ["A"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json b/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
deleted file mode 100644
index b4bfd66b8489..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)
- --> Source:5:7:
-  |
-5 | \t\t\t\t\t\tassert(y > 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-y = 0
-
-Transaction trace:
-B.constructor()
-B.g(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 137,
-                "file": "Source",
-                "start": 124
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)
-  --> Source:10:7:
-   |
-10 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-A.constructor()
-A.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 231,
-                "file": "Source",
-                "start": 218
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/input.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/input.json
deleted file mode 100644
index 622cdd3a0eda..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Sourceee": ["A"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json
deleted file mode 100644
index d38ad1b599ef..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "9134",
-            "formattedMessage": "Warning: Requested source \"Sourceee\" does not exist.
-
-",
-            "message": "Requested source \"Sourceee\" does not exist.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "Source":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/input.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/input.json
deleted file mode 100644
index 462baa9b1c27..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts": 2
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json
deleted file mode 100644
index 98365d1bf8a6..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.contracts is not a JSON object.",
-            "message": "settings.modelChecker.contracts is not a JSON object.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/input.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/input.json
deleted file mode 100644
index 72b454a8840e..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": 2
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json
deleted file mode 100644
index 567db80afe4e..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Source contracts must be an array.",
-            "message": "Source contracts must be an array.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/input.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/input.json
deleted file mode 100644
index de19e0fb00b8..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/input.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"Source":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0
-				pragma solidity >=0.0;
-				contract B {
-					function g(uint y) public pure {
-						assert(y > 0);
-					}
-				}
-				contract A is B {
-					function f(uint x) public pure {
-						assert(x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"contracts":
-			{
-				"Source": [2]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json
deleted file mode 100644
index 30d4c2dcf098..000000000000
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Every contract in settings.modelChecker.contracts must be a string.",
-            "message": "Every contract in settings.modelChecker.contracts must be a string.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/input.json
deleted file mode 100644
index 7ede51865cc1..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
deleted file mode 100644
index b8637143b07c..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/input.json
deleted file mode 100644
index ccb4839bb731..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
deleted file mode 100644
index a6ce9b3c96f9..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/input.json
deleted file mode 100644
index e33e9770618b..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
deleted file mode 100644
index b8637143b07c..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/input.json
deleted file mode 100644
index efa209cf9bcc..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"divModNoSlacks": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
deleted file mode 100644
index f7ecf690d82a..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1218",
-            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
- --> A:7:15:
-  |
-7 | \t\t\t\t\t\treturn (a / b, a % b);
-  | \t\t\t\t\t\t        ^^^^^
-
-",
-            "message": "CHC: Error trying to invoke SMT solver.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 182,
-                "file": "A",
-                "start": 177
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1218",
-            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
- --> A:7:22:
-  |
-7 | \t\t\t\t\t\treturn (a / b, a % b);
-  | \t\t\t\t\t\t               ^^^^^
-
-",
-            "message": "CHC: Error trying to invoke SMT solver.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 189,
-                "file": "A",
-                "start": 184
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/input.json
deleted file mode 100644
index 167b849f41b4..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"divModNoSlacks": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
deleted file mode 100644
index a6ce9b3c96f9..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/input.json
deleted file mode 100644
index ac29b462ba4f..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"divModNoSlacks": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
deleted file mode 100644
index fccd15838fc8..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1218",
-            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
- --> A:7:15:
-  |
-7 | \t\t\t\t\t\treturn (a / b, a % b);
-  | \t\t\t\t\t\t        ^^^^^
-
-",
-            "message": "CHC: Error trying to invoke SMT solver.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 182,
-                "file": "A",
-                "start": 177
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1218",
-            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
- --> A:7:22:
-  |
-7 | \t\t\t\t\t\treturn (a / b, a % b);
-  | \t\t\t\t\t\t               ^^^^^
-
-",
-            "message": "CHC: Error trying to invoke SMT solver.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 189,
-                "file": "A",
-                "start": 184
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/input.json b/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/input.json
deleted file mode 100644
index 09be5d735c7d..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C {
-					function f(uint a, uint b) public pure returns (uint, uint) {
-						require(b != 0);
-						return (a / b, a % b);
-					}
-			}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"divModNoSlacks": 42
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
deleted file mode 100644
index 457fb1ba0cc8..000000000000
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.divModNoSlacks must be a Boolean.",
-            "message": "settings.modelChecker.divModNoSlacks must be a Boolean.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_all/input.json b/test/cmdlineTests/standard_model_checker_engine_all/input.json
deleted file mode 100644
index db9f2232deb4..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_all/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_all/output.json b/test/cmdlineTests/standard_model_checker_engine_all/output.json
deleted file mode 100644
index 2a2c394fdd72..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_all/output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)
- --> A:4:47:
-  |
-4 | contract C { function f(uint x) public pure { assert(x > 0); } }
-  |                                               ^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 119,
-                "file": "A",
-                "start": 106
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_bmc/input.json b/test/cmdlineTests/standard_model_checker_engine_bmc/input.json
deleted file mode 100644
index 56a2b8fac82a..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_bmc/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json b/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
deleted file mode 100644
index 75e679ef473d..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4661",
-            "formattedMessage": "Warning: BMC: Assertion violation happens here.
- --> A:4:47:
-  |
-4 | contract C { function f(uint x) public pure { assert(x > 0); } }
-  |                                               ^^^^^^^^^^^^^
-Note: Counterexample:
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 119,
-                "file": "A",
-                "start": 106
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_chc/input.json b/test/cmdlineTests/standard_model_checker_engine_chc/input.json
deleted file mode 100644
index 76a46d556162..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_chc/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_chc/output.json b/test/cmdlineTests/standard_model_checker_engine_chc/output.json
deleted file mode 100644
index 2a2c394fdd72..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_chc/output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)
- --> A:4:47:
-  |
-4 | contract C { function f(uint x) public pure { assert(x > 0); } }
-  |                                               ^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 119,
-                "file": "A",
-                "start": 106
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_none/input.json b/test/cmdlineTests/standard_model_checker_engine_none/input.json
deleted file mode 100644
index 014f1af64966..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_none/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "none"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_engine_none/output.json b/test/cmdlineTests/standard_model_checker_engine_none/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_model_checker_engine_none/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json
deleted file mode 100644
index 073516ddbda2..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
-					contract Ext {
-						function f() public view returns (uint) {
-							return 42;
-						}
-					}
-
-					contract test {
-						function g(Ext e) public view {
-							uint x = e.f();
-							assert(x == 42);
-						}
-					}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"extCalls": ""
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
deleted file mode 100644
index 4e214a37b2db..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid model checker extCalls requested.",
-            "message": "Invalid model checker extCalls requested.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json
deleted file mode 100644
index a03b77f2bbba..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
-					contract Ext {
-						function f() public view returns (uint) {
-							return 42;
-						}
-					}
-
-					contract test {
-						function g(Ext e) public view {
-							uint x = e.f();
-							assert(x == 42);
-						}
-					}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"extCalls": "trusted"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
deleted file mode 100644
index 7f3993410144..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:4:7:
-  |
-4 | \t\t\t\t\t\tfunction f() public view returns (uint) {
-  | \t\t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 152,
-                "file": "A",
-                "start": 85
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json
deleted file mode 100644
index 9fadd08fabff..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
-					abstract contract Ext {
-						function f() virtual public view returns (uint);
-					}
-
-					contract test {
-						function g(Ext e) public view {
-							uint x = e.f();
-							assert(x == 0);
-						}
-					}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"extCalls": "untrusted"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
deleted file mode 100644
index c6b072a85863..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-e = 0
-x = 1
-
-Transaction trace:
-test.constructor()
-test.g(0)
-    e.f() -- untrusted external call
-  --> A:10:8:
-   |
-10 | \t\t\t\t\t\t\tassert(x == 0);
-   | \t\t\t\t\t\t\t^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-e = 0
-x = 1
-
-Transaction trace:
-test.constructor()
-test.g(0)
-    e.f() -- untrusted external call",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 254,
-                "file": "A",
-                "start": 240
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json
deleted file mode 100644
index 15113c5ad879..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
-					contract Ext {
-						function f() public view returns (uint) {
-							return 42;
-						}
-					}
-
-					contract test {
-						function g(Ext e) public view {
-							uint x = e.f();
-							assert(x == 42);
-						}
-					}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"extCalls": "what"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json
deleted file mode 100644
index 4e214a37b2db..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid model checker extCalls requested.",
-            "message": "Invalid model checker extCalls requested.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json
deleted file mode 100644
index cda245e7ff25..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
-					contract Ext {
-						function f() public view returns (uint) {
-							return 42;
-						}
-					}
-
-					contract test {
-						function g(Ext e) public view {
-							uint x = e.f();
-							assert(x == 42);
-						}
-					}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"extCalls": 2
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json
deleted file mode 100644
index e869637ed125..000000000000
--- a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.extCalls must be a string.",
-            "message": "settings.modelChecker.extCalls must be a string.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/input.json b/test/cmdlineTests/standard_model_checker_invariants_contract/input.json
deleted file mode 100644
index d47c93de2a4a..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint x;
-					function f() public view {
-						assert(x < 10);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"invariants": ["contract"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
deleted file mode 100644
index 314b66aae4ae..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "1180",
-            "formattedMessage": "Info: Contract invariant(s) for A:test:
-(!(x >= 1) || true)
-
-
-",
-            "message": "Contract invariant(s) for A:test:
-(!(x >= 1) || true)
-",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
deleted file mode 100644
index 38f658653641..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint x;
-					function f(address _a) public {
-						_a.call(\"\");
-						assert(x == 10);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"invariants": ["contract", "reentrancy"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
deleted file mode 100644
index 5a83ba7ac752..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "9302",
-            "formattedMessage": "Warning: Return value of low-level calls not used.
- --> A:7:7:
-  |
-7 | \t\t\t\t\t\t_a.call(\"\");
-  | \t\t\t\t\t\t^^^^^^^^^^^
-
-",
-            "message": "Return value of low-level calls not used.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 143,
-                "file": "A",
-                "start": 132
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-x = 0
-_a = 0x0
-
-Transaction trace:
-test.constructor()
-State: x = 0
-test.f(0x0)
-    _a.call(\"\") -- untrusted external call
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\tassert(x == 10);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-x = 0
-_a = 0x0
-
-Transaction trace:
-test.constructor()
-State: x = 0
-test.f(0x0)
-    _a.call(\"\") -- untrusted external call",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 166,
-                "file": "A",
-                "start": 151
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json
deleted file mode 100644
index 1f98000b0ec3..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint x;
-					function f(address _a) public {
-						_a.call(\"\");
-						assert(x < 10);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"invariants": ["reentrancy"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
deleted file mode 100644
index feb586a3e32b..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "9302",
-            "formattedMessage": "Warning: Return value of low-level calls not used.
- --> A:7:7:
-  |
-7 | \t\t\t\t\t\t_a.call(\"\");
-  | \t\t\t\t\t\t^^^^^^^^^^^
-
-",
-            "message": "Return value of low-level calls not used.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 143,
-                "file": "A",
-                "start": 132
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "1180",
-            "formattedMessage": "Info: Reentrancy property(ies) for A:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
-
-
-",
-            "message": "Reentrancy property(ies) for A:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
-",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json
deleted file mode 100644
index e8ee6aba637a..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint x;
-					function f() public view {
-						assert(x < 10);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"invariants": ["what"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
deleted file mode 100644
index 45fcfbe984ce..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid model checker invariants requested.",
-            "message": "Invalid model checker invariants requested.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json
deleted file mode 100644
index 54fc96d46ce5..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint x;
-					function f() public view {
-						assert(x < 10);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"invariants": [2]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
deleted file mode 100644
index d1992e464d6e..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Every invariant type in settings.modelChecker.invariants must be a string.",
-            "message": "Every invariant type in settings.modelChecker.invariants must be a string.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json
deleted file mode 100644
index f7522e6e5e8c..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint x;
-					function f() public view {
-						assert(x < 10);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"invariants": 2
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
deleted file mode 100644
index 078edfc1d8e3..000000000000
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.invariants must be an array.",
-            "message": "settings.modelChecker.invariants must be an array.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/input.json b/test/cmdlineTests/standard_model_checker_print_query_all/input.json
deleted file mode 100644
index 67fc5d8c792c..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_all/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
-                contract C
-                {
-                    function f() public pure {
-                        uint x = 0;
-                        assert(x == 0);
-                    }
-                }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-            "printQuery": true,
-			"solvers": ["smtlib2"],
-			"timeout": 1000
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/output.json b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
deleted file mode 100644
index b8e11ced7301..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_all/output.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x1880095c52d8681601c6821e4a5c29740649509af99947bce54102546dd3376a": "(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-",
-            "0xcbfcc2413b217c6564ee01f322c9ca1f34fd79d19961dc3e62aa9c2e5dcb6efc": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_5_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_4| () Int)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-"
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2339",
-            "formattedMessage": "Info: CHC: Requested query:
-(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-
-
-",
-            "message": "CHC: Requested query:
-(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "3996",
-            "formattedMessage": "Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-
-",
-            "message": "CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6240",
-            "formattedMessage": "Info: BMC: Requested query:
-(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_5_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_4| () Int)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-
-
-",
-            "message": "BMC: Requested query:
-(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_5_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_4| () Int)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "8084",
-            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
-
-",
-            "message": "BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/input.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/input.json
deleted file mode 100644
index 7957a58e3e4f..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_bmc/input.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
-                contract C
-                {
-                    function f() public pure {
-                        uint x = 0;
-                        assert(x == 0);
-                    }
-                }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-            "printQuery": true,
-			"solvers": ["smtlib2"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
deleted file mode 100644
index f7b4dc7e2871..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x8704a7b848b706ef33cbfc06e4f185636f568a29621126b7244355dd0de956bb": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-"
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6240",
-            "formattedMessage": "Info: BMC: Requested query:
-(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-
-
-",
-            "message": "BMC: Requested query:
-(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_5_0| () Int)
-(declare-fun |expr_6_0| () Int)
-(declare-fun |x_5_1| () Int)
-(declare-fun |expr_9_0| () Int)
-(declare-fun |expr_10_0| () Int)
-(declare-fun |expr_11_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_5_1))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "8084",
-            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
-
-",
-            "message": "BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/input.json b/test/cmdlineTests/standard_model_checker_print_query_chc/input.json
deleted file mode 100644
index d5801ef260fd..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_chc/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
-                contract C
-                {
-                    function f() public pure {
-                        uint x = 0;
-                        assert(x == 0);
-                    }
-                }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-            "printQuery": true,
-			"solvers": ["smtlib2"],
-			"timeout": 1000
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
deleted file mode 100644
index 9ef925b205a2..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
+++ /dev/null
@@ -1,420 +0,0 @@
-{
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x1880095c52d8681601c6821e4a5c29740649509af99947bce54102546dd3376a": "(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-"
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2339",
-            "formattedMessage": "Info: CHC: Requested query:
-(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-
-
-",
-            "message": "CHC: Requested query:
-(set-option :timeout 1000)
-(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
-(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
-
-
-(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "3996",
-            "formattedMessage": "Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-
-",
-            "message": "CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json
deleted file mode 100644
index 97822c2bde6f..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
-                contract C
-                {
-                    function f() public pure {
-                        uint x = 0;
-                        assert(x == 0);
-                    }
-                }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-            "printQuery": 17
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
deleted file mode 100644
index 00c389f7a433..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.printQuery must be a Boolean value.",
-            "message": "settings.modelChecker.printQuery must be a Boolean value.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json b/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json
deleted file mode 100644
index 0159c256e6ed..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
-                contract C
-                {
-                    function f() public pure {
-                        uint x = 0;
-                        assert(x == 0);
-                    }
-                }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-            "printQuery": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json b/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json
deleted file mode 100644
index 42d4b5b2db8a..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Only SMTLib2 solver can be enabled to print queries",
-            "message": "Only SMTLib2 solver can be enabled to print queries",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json
deleted file mode 100644
index 9ebda00174b4..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
-                contract C
-                {
-                    function f() public pure {
-                        uint x = 0;
-                        assert(x == 0);
-                    }
-                }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-            "printQuery": true,
-            "solvers": ["smtlib2", "z3"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json
deleted file mode 100644
index 42d4b5b2db8a..000000000000
--- a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Only SMTLib2 solver can be enabled to print queries",
-            "message": "Only SMTLib2 solver can be enabled to print queries",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json
deleted file mode 100644
index 0d6db0964244..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json
deleted file mode 100644
index b8118ba16a5d..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json
deleted file mode 100644
index e60b02312138..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json
deleted file mode 100644
index eb6ed6e27705..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json
deleted file mode 100644
index 9f3abdf55359..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json
deleted file mode 100644
index b8118ba16a5d..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json
deleted file mode 100644
index 37f4ce655a7a..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showProvedSafe": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json
deleted file mode 100644
index b8118ba16a5d..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json
deleted file mode 100644
index cc48fefdfc2c..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"showProvedSafe": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json
deleted file mode 100644
index eb6ed6e27705..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json
deleted file mode 100644
index e8a47469cd52..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"showProvedSafe": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json
deleted file mode 100644
index b8118ba16a5d..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json
deleted file mode 100644
index baf5f6195a91..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showProvedSafe": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json
deleted file mode 100644
index 8482298559ec..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "9576",
-            "formattedMessage": "Info: CHC: Assertion violation check is safe!
- --> A:6:7:
-  |
-6 | \t\t\t\t\t\tassert(x >= 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation check is safe!",
-            "severity": "info",
-            "sourceLocation":
-            {
-                "end": 130,
-                "file": "A",
-                "start": 116
-            },
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "9576",
-            "formattedMessage": "Info: CHC: Assertion violation check is safe!
- --> A:7:7:
-  |
-7 | \t\t\t\t\t\tassert(x < 1000);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation check is safe!",
-            "severity": "info",
-            "sourceLocation":
-            {
-                "end": 154,
-                "file": "A",
-                "start": 138
-            },
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json
deleted file mode 100644
index 20948ed9dba2..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"showProvedSafe": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json
deleted file mode 100644
index 20ddce1fd542..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2961",
-            "formattedMessage": "Info: BMC: Assertion violation check is safe!
- --> A:6:7:
-  |
-6 | \t\t\t\t\t\tassert(x >= 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^
-
-",
-            "message": "BMC: Assertion violation check is safe!",
-            "severity": "info",
-            "sourceLocation":
-            {
-                "end": 130,
-                "file": "A",
-                "start": 116
-            },
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "2961",
-            "formattedMessage": "Info: BMC: Assertion violation check is safe!
- --> A:7:7:
-  |
-7 | \t\t\t\t\t\tassert(x < 1000);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^
-
-",
-            "message": "BMC: Assertion violation check is safe!",
-            "severity": "info",
-            "sourceLocation":
-            {
-                "end": 154,
-                "file": "A",
-                "start": 138
-            },
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json
deleted file mode 100644
index 5fb18aac9eee..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"showProvedSafe": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json
deleted file mode 100644
index 8482298559ec..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2018",
-            "formattedMessage": "Warning: Function state mutability can be restricted to pure
- --> A:5:6:
-  |
-5 | \t\t\t\t\tfunction f(uint8 x) public {
-  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
-
-",
-            "message": "Function state mutability can be restricted to pure",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 162,
-                "file": "A",
-                "start": 81
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "9576",
-            "formattedMessage": "Info: CHC: Assertion violation check is safe!
- --> A:6:7:
-  |
-6 | \t\t\t\t\t\tassert(x >= 0);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation check is safe!",
-            "severity": "info",
-            "sourceLocation":
-            {
-                "end": 130,
-                "file": "A",
-                "start": 116
-            },
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "9576",
-            "formattedMessage": "Info: CHC: Assertion violation check is safe!
- --> A:7:7:
-  |
-7 | \t\t\t\t\t\tassert(x < 1000);
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation check is safe!",
-            "severity": "info",
-            "sourceLocation":
-            {
-                "end": 154,
-                "file": "A",
-                "start": 138
-            },
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json
deleted file mode 100644
index eea83e140e59..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f(uint8 x) public {
-						assert(x >= 0);
-						assert(x < 1000);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showProvedSafe": "aaa"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json
deleted file mode 100644
index 7c8ccff6e2e5..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.showProvedSafe must be a Boolean value.",
-            "message": "settings.modelChecker.showProvedSafe must be a Boolean value.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/input.json
deleted file mode 100644
index 18a8b21fc688..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/input.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
deleted file mode 100644
index fb599d21d2e4..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/input.json
deleted file mode 100644
index d7396dd98b43..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnproved": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
deleted file mode 100644
index fb599d21d2e4..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/input.json
deleted file mode 100644
index c9ee3258e30e..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"showUnproved": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
deleted file mode 100644
index 4554ec69e93a..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/input.json
deleted file mode 100644
index fe662e80c1b7..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"showUnproved": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json
deleted file mode 100644
index 7f0e676cb818..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/input.json
deleted file mode 100644
index 3f9bb715e934..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnproved": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
deleted file mode 100644
index ecb157f88fbc..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation might happen here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\tassert(s.x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation might happen here.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 201,
-                "file": "A",
-                "start": 186
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "7812",
-            "formattedMessage": "Warning: BMC: Assertion violation might happen here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\tassert(s.x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^^^
-Note:
-
-",
-            "message": "BMC: Assertion violation might happen here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 201,
-                "file": "A",
-                "start": 186
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/input.json
deleted file mode 100644
index 2f367ae80e0a..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"showUnproved": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
deleted file mode 100644
index 116af8dce28c..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7812",
-            "formattedMessage": "Warning: BMC: Assertion violation might happen here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\tassert(s.x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^^^
-Note:
-
-",
-            "message": "BMC: Assertion violation might happen here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 201,
-                "file": "A",
-                "start": 186
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/input.json
deleted file mode 100644
index f81688b711ed..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"showUnproved": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json
deleted file mode 100644
index 58956287fd52..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation might happen here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\tassert(s.x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation might happen here.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 201,
-                "file": "A",
-                "start": 186
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/input.json b/test/cmdlineTests/standard_model_checker_show_unproved_wrong/input.json
deleted file mode 100644
index bdaec9b3ec02..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnproved": "aaa"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
deleted file mode 100644
index a9342cddfbb7..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.showUnproved must be a Boolean value.",
-            "message": "settings.modelChecker.showUnproved must be a Boolean value.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json
deleted file mode 100644
index c307217c6bd5..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json
deleted file mode 100644
index 23cf80defb86..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5724",
-            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
-
-",
-            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json
deleted file mode 100644
index 668a60e007ad..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
deleted file mode 100644
index 23cf80defb86..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5724",
-            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
-
-",
-            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json
deleted file mode 100644
index 360235eb4df2..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
deleted file mode 100644
index 23cf80defb86..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5724",
-            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
-
-",
-            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json
deleted file mode 100644
index 10092aa6f256..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnsupported": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json
deleted file mode 100644
index 23cf80defb86..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5724",
-            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
-
-",
-            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json
deleted file mode 100644
index e3a42c295f8c..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					struct S {
-						uint x;
-					}
-					S s;
-					function f(bool b) public {
-						s.x |= b ? 1 : 2;
-						assert(s.x > 0);
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnsupported": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json
deleted file mode 100644
index fb599d21d2e4..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json
deleted file mode 100644
index 7d15e6d7f96c..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"showUnsupported": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
deleted file mode 100644
index 23cf80defb86..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5724",
-            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
-
-",
-            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json
deleted file mode 100644
index 4d5a79c6dbae..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"showUnsupported": false
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
deleted file mode 100644
index 23cf80defb86..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5724",
-            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
-
-",
-            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json
deleted file mode 100644
index c1fbeab1b9c2..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnsupported": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json
deleted file mode 100644
index 13d327d40547..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7737",
-            "formattedMessage": "Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
- --> A:6:7:
-  |
-6 | \t\t\t\t\t\tassembly {}
-  | \t\t\t\t\t\t^^^^^^^^^^^
-
-",
-            "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 127,
-                "file": "A",
-                "start": 116
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json
deleted file mode 100644
index 38e5cb7a7114..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"showUnsupported": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
deleted file mode 100644
index 13d327d40547..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7737",
-            "formattedMessage": "Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
- --> A:6:7:
-  |
-6 | \t\t\t\t\t\tassembly {}
-  | \t\t\t\t\t\t^^^^^^^^^^^
-
-",
-            "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 127,
-                "file": "A",
-                "start": 116
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json
deleted file mode 100644
index f84ca46106f9..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"showUnsupported": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
deleted file mode 100644
index 13d327d40547..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7737",
-            "formattedMessage": "Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
- --> A:6:7:
-  |
-6 | \t\t\t\t\t\tassembly {}
-  | \t\t\t\t\t\t^^^^^^^^^^^
-
-",
-            "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 127,
-                "file": "A",
-                "start": 116
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json
deleted file mode 100644
index 9fa8f5a5932f..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					function f() external pure {
-						assembly {}
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"showUnsupported": "aaa"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
deleted file mode 100644
index 997b005ef7ee..000000000000
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.showUnsupported must be a Boolean value.",
-            "message": "settings.modelChecker.showUnsupported must be a Boolean value.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/input.json b/test/cmdlineTests/standard_model_checker_solvers_none/input.json
deleted file mode 100644
index 07cbb88ac0f3..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_none/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"solvers": []
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/output.json b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
deleted file mode 100644
index e5d356ce5a9d..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_none/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7649",
-            "formattedMessage": "Warning: CHC analysis was not possible since no Horn solver was found and enabled. The accepted solvers for CHC are Eldarica and z3.
-
-",
-            "message": "CHC analysis was not possible since no Horn solver was found and enabled. The accepted solvers for CHC are Eldarica and z3.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "7710",
-            "formattedMessage": "Warning: BMC analysis was not possible since no SMT solver was found and enabled. The accepted solvers for BMC are cvc4 and z3.
-
-",
-            "message": "BMC analysis was not possible since no SMT solver was found and enabled. The accepted solvers for BMC are cvc4 and z3.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/input.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/input.json
deleted file mode 100644
index 8903ec0167cd..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"solvers": ["smtlib2"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
deleted file mode 100644
index ebeca53f5ba3..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x75b95497d56c30e254a59358d72ddd4e78f9e90db621cfe677e85d05b2252411": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |expr_7_0| () Int)
-(declare-fun |expr_8_0| () Int)
-(declare-fun |expr_9_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> (and true true) true) (and (= expr_8_0 0) (and (=> (and true true) (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_0) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))) (not expr_9_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0xe3dc20257e2b1bd9c6eb77b75913ec3a5752be174e0fd56af16d9fc95afa1b15": "(set-logic HORN)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |interface_0_C_14_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_14_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
-(=> (= error_0 0) (nondet_interface_1_C_14_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |summary_4_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (and (and (nondet_interface_1_C_14_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 x_3_0 state_2 x_3_1))) (nondet_interface_1_C_14_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |block_6_f_12_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(block_5_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_5_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true)) true) (block_6_f_12_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(declare-fun |block_7_return_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_6_f_12_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> true true) (and (= expr_8_0 0) (and (=> true (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_1) (and (and (>= x_3_1 0) (<= x_3_1 115792089237316195423570985008687907853269984665640564039457584007913129639935)) true))))))) (and (and true (not expr_9_1)) (= error_1 1))) (block_8_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (block_8_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (summary_3_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_6_f_12_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= error_1 error_0) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> true true) (and (= expr_8_0 0) (and (=> true (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_1) (and (and (>= x_3_1 0) (<= x_3_1 115792089237316195423570985008687907853269984665640564039457584007913129639935)) true)))))))) true) (block_7_return_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_7_return_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) true) true) (summary_3_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(declare-fun |block_9_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(block_9_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (block_9_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (summary_3_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 x_3_1 state_3 x_3_2) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true))))))) true) (summary_4_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_3 x_3_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (interface_0_C_14_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (= error_0 0))) (interface_0_C_14_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (contract_initializer_entry_11_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (contract_initializer_after_init_12_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (summary_constructor_2_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_14_0 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3_0| () Bool)
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (interface_0_C_14_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (= error_0 1))) error_target_3_0)))
-
-
-
-(assert
-(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> error_target_3_0 false)))
-(check-sat)
-"
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "3996",
-            "formattedMessage": "Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-
-",
-            "message": "CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "8084",
-            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
-
-",
-            "message": "BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_z3/input.json b/test/cmdlineTests/standard_model_checker_solvers_z3/input.json
deleted file mode 100644
index 91db9ad7f673..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_z3/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"solvers": ["z3"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_z3/output.json b/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
deleted file mode 100644
index 2a2c394fdd72..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)
- --> A:4:47:
-  |
-4 | contract C { function f(uint x) public pure { assert(x > 0); } }
-  |                                               ^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 119,
-                "file": "A",
-                "start": 106
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/input.json b/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/input.json
deleted file mode 100644
index 19913a5622be..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"solvers": ["z3", "smtlib2"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
deleted file mode 100644
index 2a2c394fdd72..000000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)
- --> A:4:47:
-  |
-4 | contract C { function f(uint x) public pure { assert(x > 0); } }
-  |                                               ^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 119,
-                "file": "A",
-                "start": 106
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/input.json
deleted file mode 100644
index 988417824124..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["assert"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
deleted file mode 100644
index 18452ccbc985..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4661",
-            "formattedMessage": "Warning: BMC: Assertion violation happens here.
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_assert_chc/input.json
deleted file mode 100644
index a9a7b3fcdb92..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_assert_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["assert"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
deleted file mode 100644
index 5c43fe6b54d8..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/input.json
deleted file mode 100644
index 4e6c84dbb9c1..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["balance"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
deleted file mode 100644
index 9ee51daba1fb..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1236",
-            "formattedMessage": "Warning: BMC: Insufficient funds happens here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\ta.transfer(x);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Insufficient funds happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 237,
-                "file": "A",
-                "start": 224
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_balance_chc/input.json
deleted file mode 100644
index 4973a059790e..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_balance_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["balance"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/input.json
deleted file mode 100644
index dd97baae9a24..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["constantCondition"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
deleted file mode 100644
index 94ba81c2bea4..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6838",
-            "formattedMessage": "Warning: BMC: Condition is always true.
- --> A:7:15:
-  |
-7 | \t\t\t\t\t\trequire(x >= 0);
-  | \t\t\t\t\t\t        ^^^^^^
-Note: Callstack:
-
-",
-            "message": "BMC: Condition is always true.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Callstack:"
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 165,
-                "file": "A",
-                "start": 159
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/input.json
deleted file mode 100644
index 365ca122be50..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["constantCondition"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/input.json b/test/cmdlineTests/standard_model_checker_targets_default_all_engines/input.json
deleted file mode 100644
index 0d913f0ba25a..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
deleted file mode 100644
index 4c967fa5d0ae..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
+++ /dev/null
@@ -1,232 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4281",
-            "formattedMessage": "Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:10:7:
-   |
-10 | \t\t\t\t\t\t2 / x;
-   | \t\t\t\t\t\t^^^^^
-
-",
-            "message": "CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 216,
-                "file": "A",
-                "start": 211
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2529",
-            "formattedMessage": "Warning: CHC: Empty array \"pop\" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:13:7:
-   |
-13 | \t\t\t\t\t\tarr.pop();
-   | \t\t\t\t\t\t^^^^^^^^^
-
-",
-            "message": "CHC: Empty array \"pop\" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 275,
-                "file": "A",
-                "start": 266
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6368",
-            "formattedMessage": "Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:14:7:
-   |
-14 | \t\t\t\t\t\tarr[x];
-   | \t\t\t\t\t\t^^^^^^
-
-",
-            "message": "CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 289,
-                "file": "A",
-                "start": 283
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6838",
-            "formattedMessage": "Warning: BMC: Condition is always true.
- --> A:7:15:
-  |
-7 | \t\t\t\t\t\trequire(x >= 0);
-  | \t\t\t\t\t\t        ^^^^^^
-Note: Callstack:
-
-",
-            "message": "BMC: Condition is always true.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Callstack:"
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 165,
-                "file": "A",
-                "start": 159
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1236",
-            "formattedMessage": "Warning: BMC: Insufficient funds happens here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\ta.transfer(x);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Insufficient funds happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 237,
-                "file": "A",
-                "start": 224
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_default_bmc/input.json
deleted file mode 100644
index d0a068185ad0..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_default_bmc/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
deleted file mode 100644
index 1be99ca4556c..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6838",
-            "formattedMessage": "Warning: BMC: Condition is always true.
- --> A:7:15:
-  |
-7 | \t\t\t\t\t\trequire(x >= 0);
-  | \t\t\t\t\t\t        ^^^^^^
-Note: Callstack:
-
-",
-            "message": "BMC: Condition is always true.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Callstack:"
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 165,
-                "file": "A",
-                "start": 159
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "3046",
-            "formattedMessage": "Warning: BMC: Division by zero happens here.
-  --> A:10:7:
-   |
-10 | \t\t\t\t\t\t2 / x;
-   | \t\t\t\t\t\t^^^^^
-Note: Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Division by zero happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 216,
-                "file": "A",
-                "start": 211
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1236",
-            "formattedMessage": "Warning: BMC: Insufficient funds happens here.
-  --> A:11:7:
-   |
-11 | \t\t\t\t\t\ta.transfer(x);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Insufficient funds happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 237,
-                "file": "A",
-                "start": 224
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "4661",
-            "formattedMessage": "Warning: BMC: Assertion violation happens here.
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_default_chc/input.json
deleted file mode 100644
index d030e0388fa0..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_default_chc/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
deleted file mode 100644
index c3df366c990d..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4281",
-            "formattedMessage": "Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:10:7:
-   |
-10 | \t\t\t\t\t\t2 / x;
-   | \t\t\t\t\t\t^^^^^
-
-",
-            "message": "CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 216,
-                "file": "A",
-                "start": 211
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2529",
-            "formattedMessage": "Warning: CHC: Empty array \"pop\" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:13:7:
-   |
-13 | \t\t\t\t\t\tarr.pop();
-   | \t\t\t\t\t\t^^^^^^^^^
-
-",
-            "message": "CHC: Empty array \"pop\" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 275,
-                "file": "A",
-                "start": 266
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6368",
-            "formattedMessage": "Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:14:7:
-   |
-14 | \t\t\t\t\t\tarr[x];
-   | \t\t\t\t\t\t^^^^^^
-
-",
-            "message": "CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 289,
-                "file": "A",
-                "start": 283
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/input.json
deleted file mode 100644
index 53750a1ec598..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["divByZero"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
deleted file mode 100644
index 05ce12ca2c2b..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3046",
-            "formattedMessage": "Warning: BMC: Division by zero happens here.
-  --> A:10:7:
-   |
-10 | \t\t\t\t\t\t2 / x;
-   | \t\t\t\t\t\t^^^^^
-Note: Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Division by zero happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = 0
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 216,
-                "file": "A",
-                "start": 211
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/input.json
deleted file mode 100644
index 1c7af8d5c1f7..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["divByZero"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json
deleted file mode 100644
index 5c09175e7297..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4281",
-            "formattedMessage": "Warning: CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:10:7:
-   |
-10 | \t\t\t\t\t\t2 / x;
-   | \t\t\t\t\t\t^^^^^
-
-",
-            "message": "CHC: Division by zero happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 216,
-                "file": "A",
-                "start": 211
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_empty_array/input.json b/test/cmdlineTests/standard_model_checker_targets_empty_array/input.json
deleted file mode 100644
index cb51e490582a..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_empty_array/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"targets": []
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json b/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
deleted file mode 100644
index 312af9741c32..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.targets must be a non-empty array.",
-            "message": "settings.modelChecker.targets must be a non-empty array.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/input.json
deleted file mode 100644
index 3ae757542cde..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["outOfBounds"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/input.json
deleted file mode 100644
index cd0ba6d13594..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["outOfBounds"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json
deleted file mode 100644
index b87480e74b4c..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6368",
-            "formattedMessage": "Warning: CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:14:7:
-   |
-14 | \t\t\t\t\t\tarr[x];
-   | \t\t\t\t\t\t^^^^^^
-
-",
-            "message": "CHC: Out of bounds access happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 289,
-                "file": "A",
-                "start": 283
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/input.json
deleted file mode 100644
index de63c4a62bc8..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["overflow"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
deleted file mode 100644
index 09c1cdb5f10a..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2661",
-            "formattedMessage": "Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> A:9:7:
-  |
-9 | \t\t\t\t\t\tx + type(uint).max;
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 203,
-                "file": "A",
-                "start": 185
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_overflow_chc/input.json
deleted file mode 100644
index 522d2480ca57..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["overflow"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
deleted file mode 100644
index b700a938ed14..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4984",
-            "formattedMessage": "Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> A:9:7:
-  |
-9 | \t\t\t\t\t\tx + type(uint).max;
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 203,
-                "file": "A",
-                "start": 185
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/input.json
deleted file mode 100644
index 40f3718cebae..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["popEmptyArray"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/input.json
deleted file mode 100644
index 7d2dc69e31eb..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["popEmptyArray"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json
deleted file mode 100644
index c670bb4f6088..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2529",
-            "formattedMessage": "Warning: CHC: Empty array \"pop\" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:13:7:
-   |
-13 | \t\t\t\t\t\tarr.pop();
-   | \t\t\t\t\t\t^^^^^^^^^
-
-",
-            "message": "CHC: Empty array \"pop\" happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 275,
-                "file": "A",
-                "start": 266
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/input.json
deleted file mode 100644
index 4bd8eded44a3..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["underflow"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
deleted file mode 100644
index c656eda21a9c..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4144",
-            "formattedMessage": "Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\t--x;
-  | \t\t\t\t\t\t^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Underflow (resulting value less than 0) happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 177,
-                "file": "A",
-                "start": 174
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_underflow_chc/input.json
deleted file mode 100644
index ca33d2fdcc66..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["underflow"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
deleted file mode 100644
index 600d7fe6b842..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3944",
-            "formattedMessage": "Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\t--x;
-  | \t\t\t\t\t\t^^^
-
-",
-            "message": "CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 177,
-                "file": "A",
-                "start": 174
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/input.json
deleted file mode 100644
index 835a9d46b4d9..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["underflow", "overflow", "assert"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
deleted file mode 100644
index 004b98128e2c..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4144",
-            "formattedMessage": "Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\t--x;
-  | \t\t\t\t\t\t^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Underflow (resulting value less than 0) happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 177,
-                "file": "A",
-                "start": 174
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2661",
-            "formattedMessage": "Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> A:9:7:
-  |
-9 | \t\t\t\t\t\tx + type(uint).max;
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 203,
-                "file": "A",
-                "start": 185
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "4661",
-            "formattedMessage": "Warning: BMC: Assertion violation happens here.
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/input.json
deleted file mode 100644
index 50f0e82dc583..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["underflow", "overflow", "assert"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json
deleted file mode 100644
index 5afeeaa9407e..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3944",
-            "formattedMessage": "Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\t--x;
-  | \t\t\t\t\t\t^^^
-
-",
-            "message": "CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 177,
-                "file": "A",
-                "start": 174
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "4984",
-            "formattedMessage": "Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> A:9:7:
-  |
-9 | \t\t\t\t\t\tx + type(uint).max;
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 203,
-                "file": "A",
-                "start": 185
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)
-  --> A:12:7:
-   |
-12 | \t\t\t\t\t\tassert(x > 0);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 1)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "A",
-                "start": 245
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/input.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/input.json
deleted file mode 100644
index c8bae009ddd4..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"targets": ["underflow", "overflow"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
deleted file mode 100644
index 8a9452a7b83d..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "4144",
-            "formattedMessage": "Warning: BMC: Underflow (resulting value less than 0) happens here.
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\t--x;
-  | \t\t\t\t\t\t^^^
-Note: Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Underflow (resulting value less than 0) happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = (- 1)
-  a = 0
-  x = 0
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 177,
-                "file": "A",
-                "start": 174
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "2661",
-            "formattedMessage": "Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
- --> A:9:7:
-  |
-9 | \t\t\t\t\t\tx + type(uint).max;
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
-Note: Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-
-Note: Callstack:
-Note:
-
-",
-            "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
-            "secondarySourceLocations":
-            [
-                {
-                    "message": "Counterexample:
-  <result> = 2**256
-  a = 0
-  x = 1
-"
-                },
-                {
-                    "message": "Callstack:"
-                },
-                {
-                    "message": ""
-                }
-            ],
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 203,
-                "file": "A",
-                "start": 185
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/input.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/input.json
deleted file mode 100644
index 9fc834fd860f..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"targets": ["underflow", "overflow"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json
deleted file mode 100644
index 9a07b669ad3b..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3944",
-            "formattedMessage": "Warning: CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)
- --> A:8:7:
-  |
-8 | \t\t\t\t\t\t--x;
-  | \t\t\t\t\t\t^^^
-
-",
-            "message": "CHC: Underflow (resulting value less than 0) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 0
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 177,
-                "file": "A",
-                "start": 174
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "4984",
-            "formattedMessage": "Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)
- --> A:9:7:
-  |
-9 | \t\t\t\t\t\tx + type(uint).max;
-  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-Counterexample:
-arr = []
-a = 0x0
-x = 1
-
-Transaction trace:
-test.constructor()
-State: arr = []
-test.f(0x0, 2)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 203,
-                "file": "A",
-                "start": 185
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/input.json b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/input.json
deleted file mode 100644
index a89271975cac..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"targets": [2]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json
deleted file mode 100644
index 6e2af863ec69..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Every target in settings.modelChecker.targets must be a string.",
-            "message": "Every target in settings.modelChecker.targets must be a string.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/input.json b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/input.json
deleted file mode 100644
index 136ce0978f91..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"targets": "assert"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json
deleted file mode 100644
index c1e7759b5c10..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.targets must be an array.",
-            "message": "settings.modelChecker.targets must be an array.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/input.json b/test/cmdlineTests/standard_model_checker_targets_wrong_targets/input.json
deleted file mode 100644
index 1788fb6d5508..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/input.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
-					uint[] arr;
-					function f(address payable a, uint x) public {
-						require(x >= 0);
-						--x;
-						x + type(uint).max;
-						2 / x;
-						a.transfer(x);
-						assert(x > 0);
-						arr.pop();
-						arr[x];
-					}
-				}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"targets": ["aaa", "bbb"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json b/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
deleted file mode 100644
index d0bf7f56daba..000000000000
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid model checker targets requested.",
-            "message": "Invalid model checker targets requested.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_all/input.json b/test/cmdlineTests/standard_model_checker_timeout_all/input.json
deleted file mode 100644
index 72c7423753e4..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_all/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"timeout": 1000
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_all/output.json b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
deleted file mode 100644
index 73b117145445..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_all/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        },
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_bmc/input.json b/test/cmdlineTests/standard_model_checker_timeout_bmc/input.json
deleted file mode 100644
index 94b70a354bbb..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_bmc/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "bmc",
-			"timeout": 1000
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
deleted file mode 100644
index a709ec062c79..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2788",
-            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "6002",
-            "formattedMessage": "Info: BMC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "BMC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_chc/input.json b/test/cmdlineTests/standard_model_checker_timeout_chc/input.json
deleted file mode 100644
index 156f9580d0cf..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_chc/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"timeout": 1000
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json b/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
deleted file mode 100644
index 553a1b93b62b..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "5840",
-            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-",
-            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
-            "severity": "warning",
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1391",
-            "formattedMessage": "Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
-
-",
-            "message": "CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
-            "severity": "info",
-            "type": "Info"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/input.json b/test/cmdlineTests/standard_model_checker_timeout_wrong_key/input.json
deleted file mode 100644
index bcfdaf832027..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "chc",
-			"atimeout": 1
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json b/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
deleted file mode 100644
index 137562f4196b..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"atimeout\"",
-            "message": "Unknown key \"atimeout\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/input.json b/test/cmdlineTests/standard_model_checker_timeout_wrong_value/input.json
deleted file mode 100644
index 52187cc88c80..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all",
-			"timeout": "asd"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json b/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
deleted file mode 100644
index ce630905c6c8..000000000000
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "settings.modelChecker.timeout must be an unsigned integer.",
-            "message": "settings.modelChecker.timeout must be an unsigned integer.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_no_append_cbor/input.json b/test/cmdlineTests/standard_no_append_cbor/input.json
deleted file mode 100644
index 493325506dda..000000000000
--- a/test/cmdlineTests/standard_no_append_cbor/input.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {}"
-		}
-	},
-	"settings":
-	{
-		"viaIR": true,
-		"optimizer": {
-			"enabled": true
-		},
-		"metadata":
-		{
-			"appendCBOR": false
-		},
-		"outputSelection":
-		{
-			"A":
-			{
-				"test": ["evm.bytecode"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_no_append_cbor/output.json b/test/cmdlineTests/standard_no_append_cbor/output.json
deleted file mode 100644
index 0fca3f2715a3..000000000000
--- a/test/cmdlineTests/standard_no_append_cbor/output.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "test":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/input.json b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/input.json
deleted file mode 100644
index f12e45bf2fa9..000000000000
--- a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/input.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {}"
-		}
-	},
-	"settings":
-	{
-		"viaIR": true,
-		"optimizer": {
-			"enabled": true
-		},
-		"metadata":
-		{
-			"appendCBOR": false,
-			"bytecodeHash": "ipfs"
-		},
-		"outputSelection":
-		{
-			"A":
-			{
-				"test": ["evm.bytecode"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json
deleted file mode 100644
index 0c264f898a87..000000000000
--- a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "When the parameter \"appendCBOR\" is set to false, the parameter \"bytecodeHash\" cannot be set to \"ipfs\". The parameter \"bytecodeHash\" should either be skipped, or set to \"none\".",
-            "message": "When the parameter \"appendCBOR\" is set to false, the parameter \"bytecodeHash\" cannot be set to \"ipfs\". The parameter \"bytecodeHash\" should either be skipped, or set to \"none\".",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_no_import_callback/B.sol b/test/cmdlineTests/standard_no_import_callback/B.sol
deleted file mode 100644
index 4bf9ea143b54..000000000000
--- a/test/cmdlineTests/standard_no_import_callback/B.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
diff --git a/test/cmdlineTests/standard_no_import_callback/args b/test/cmdlineTests/standard_no_import_callback/args
deleted file mode 100644
index b8edaa4247f1..000000000000
--- a/test/cmdlineTests/standard_no_import_callback/args
+++ /dev/null
@@ -1 +0,0 @@
---no-import-callback
diff --git a/test/cmdlineTests/standard_no_import_callback/input.json b/test/cmdlineTests/standard_no_import_callback/input.json
deleted file mode 100644
index 229b5fb379a1..000000000000
--- a/test/cmdlineTests/standard_no_import_callback/input.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {
-            "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; import 'standard_no_import_callback/B.sol';"
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_no_import_callback/output.json b/test/cmdlineTests/standard_no_import_callback/output.json
deleted file mode 100644
index a4e2d8d3a2bf..000000000000
--- a/test/cmdlineTests/standard_no_import_callback/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6275",
-            "formattedMessage": "ParserError: Source \"standard_no_import_callback/B.sol\" not found: No import callback.
- --> A:2:24:
-  |
-2 | pragma solidity >=0.0; import 'standard_no_import_callback/B.sol';
-  |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-",
-            "message": "Source \"standard_no_import_callback/B.sol\" not found: No import callback.",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 102,
-                "file": "A",
-                "start": 59
-            },
-            "type": "ParserError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_only_ast_requested/input.json b/test/cmdlineTests/standard_only_ast_requested/input.json
deleted file mode 100644
index 56409a9a1fae..000000000000
--- a/test/cmdlineTests/standard_only_ast_requested/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "": ["ast"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_only_ast_requested/output.json b/test/cmdlineTests/standard_only_ast_requested/output.json
deleted file mode 100644
index 6ecac5ca364d..000000000000
--- a/test/cmdlineTests/standard_only_ast_requested/output.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
-                        6
-                    ]
-                },
-                "id": 7,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            ">=",
-                            "0.0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:22:0"
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "canonicalName": "C",
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "fullyImplemented": true,
-                        "id": 6,
-                        "linearizedBaseContracts":
-                        [
-                            6
-                        ],
-                        "name": "C",
-                        "nameLocation": "68:1:0",
-                        "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
-                            {
-                                "body":
-                                {
-                                    "id": 4,
-                                    "nodeType": "Block",
-                                    "src": "97:2:0",
-                                    "statements": []
-                                },
-                                "functionSelector": "26121ff0",
-                                "id": 5,
-                                "implemented": true,
-                                "kind": "function",
-                                "modifiers": [],
-                                "name": "f",
-                                "nameLocation": "81:1:0",
-                                "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
-                                    "id": 2,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "82:2:0"
-                                },
-                                "returnParameters":
-                                {
-                                    "id": 3,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "97:0:0"
-                                },
-                                "scope": 6,
-                                "src": "72:27:0",
-                                "stateMutability": "pure",
-                                "virtual": false,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 7,
-                        "src": "59:42:0",
-                        "usedErrors": [],
-                        "usedEvents": []
-                    }
-                ],
-                "src": "36:65:0"
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_generatedSources/input.json b/test/cmdlineTests/standard_optimizer_generatedSources/input.json
deleted file mode 100644
index b38114fadeb5..000000000000
--- a/test/cmdlineTests/standard_optimizer_generatedSources/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "language": "Solidity",
- "sources": {
-  "a.sol": {
-   "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma abicoder v2; contract A { function f(uint[] memory) public view returns (uint256) { } }"
-  }
- },
- "settings": {
-  "evmVersion": "petersburg",
-  "optimizer": { "enabled": true },
-  "outputSelection": {
-   "*": {
-    "A": [
-     "evm.bytecode.object",
-     "evm.deployedBytecode.generatedSources",
-     "evm.bytecode.generatedSources"
-    ]
-   }
-  }
- }
-}
diff --git a/test/cmdlineTests/standard_optimizer_generatedSources/output.json b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
deleted file mode 100644
index da2c31cbee25..000000000000
--- a/test/cmdlineTests/standard_optimizer_generatedSources/output.json
+++ /dev/null
@@ -1,1747 +0,0 @@
-{
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "generatedSources": [],
-                        "object": "<BYTECODE REMOVED>"
-                    },
-                    "deployedBytecode":
-                    {
-                        "generatedSources":
-                        [
-                            {
-                                "ast":
-                                {
-                                    "nativeSrc": "0:1445:1",
-                                    "nodeType": "YulBlock",
-                                    "src": "0:1445:1",
-                                    "statements":
-                                    [
-                                        {
-                                            "nativeSrc": "6:3:1",
-                                            "nodeType": "YulBlock",
-                                            "src": "6:3:1",
-                                            "statements": []
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "46:95:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "46:95:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "63:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "63:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "70:3:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "70:3:1",
-                                                                            "type": "",
-                                                                            "value": "224"
-                                                                        },
-                                                                        {
-                                                                            "kind": "number",
-                                                                            "nativeSrc": "75:10:1",
-                                                                            "nodeType": "YulLiteral",
-                                                                            "src": "75:10:1",
-                                                                            "type": "",
-                                                                            "value": "0x4e487b71"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "shl",
-                                                                        "nativeSrc": "66:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "66:3:1"
-                                                                    },
-                                                                    "nativeSrc": "66:20:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "66:20:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "56:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:6:1"
-                                                            },
-                                                            "nativeSrc": "56:31:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:31:1"
-                                                        },
-                                                        "nativeSrc": "56:31:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "56:31:1"
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "103:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "103:1:1",
-                                                                    "type": "",
-                                                                    "value": "4"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "106:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "106:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x41"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "96:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "96:6:1"
-                                                            },
-                                                            "nativeSrc": "96:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "96:15:1"
-                                                        },
-                                                        "nativeSrc": "96:15:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "96:15:1"
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "127:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "127:1:1",
-                                                                    "type": "",
-                                                                    "value": "0"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "130:4:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "130:4:1",
-                                                                    "type": "",
-                                                                    "value": "0x24"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "revert",
-                                                                "nativeSrc": "120:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "120:6:1"
-                                                            },
-                                                            "nativeSrc": "120:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "120:15:1"
-                                                        },
-                                                        "nativeSrc": "120:15:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "120:15:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "panic_error_0x41",
-                                            "nativeSrc": "14:127:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "src": "14:127:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "241:1020:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "241:1020:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "251:12:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "251:12:1",
-                                                        "value":
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "261:2:1",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "261:2:1",
-                                                            "type": "",
-                                                            "value": "32"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "_1",
-                                                                "nativeSrc": "255:2:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "255:2:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "308:16:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "308:16:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "317:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "317:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "320:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "320:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert",
-                                                                            "nativeSrc": "310:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "310:6:1"
-                                                                        },
-                                                                        "nativeSrc": "310:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "310:12:1"
-                                                                    },
-                                                                    "nativeSrc": "310:12:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "310:12:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "dataEnd",
-                                                                            "nativeSrc": "283:7:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "283:7:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "headStart",
-                                                                            "nativeSrc": "292:9:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "292:9:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "sub",
-                                                                        "nativeSrc": "279:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "279:3:1"
-                                                                    },
-                                                                    "nativeSrc": "279:23:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "279:23:1"
-                                                                },
-                                                                {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "304:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "304:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "slt",
-                                                                "nativeSrc": "275:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "275:3:1"
-                                                            },
-                                                            "nativeSrc": "275:32:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "275:32:1"
-                                                        },
-                                                        "nativeSrc": "272:52:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "272:52:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "333:37:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "333:37:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "headStart",
-                                                                    "nativeSrc": "360:9:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "360:9:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "calldataload",
-                                                                "nativeSrc": "347:12:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "347:12:1"
-                                                            },
-                                                            "nativeSrc": "347:23:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "347:23:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "offset",
-                                                                "nativeSrc": "337:6:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "337:6:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "379:28:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "379:28:1",
-                                                        "value":
-                                                        {
-                                                            "kind": "number",
-                                                            "nativeSrc": "389:18:1",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "389:18:1",
-                                                            "type": "",
-                                                            "value": "0xffffffffffffffff"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "_2",
-                                                                "nativeSrc": "383:2:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "383:2:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "434:16:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "434:16:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "443:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "443:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "446:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "446:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert",
-                                                                            "nativeSrc": "436:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "436:6:1"
-                                                                        },
-                                                                        "nativeSrc": "436:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "436:12:1"
-                                                                    },
-                                                                    "nativeSrc": "436:12:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "436:12:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "offset",
-                                                                    "nativeSrc": "422:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "422:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "_2",
-                                                                    "nativeSrc": "430:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "430:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "gt",
-                                                                "nativeSrc": "419:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "419:2:1"
-                                                            },
-                                                            "nativeSrc": "419:14:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "419:14:1"
-                                                        },
-                                                        "nativeSrc": "416:34:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "416:34:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "459:32:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "459:32:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "headStart",
-                                                                    "nativeSrc": "473:9:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "473:9:1"
-                                                                },
-                                                                {
-                                                                    "name": "offset",
-                                                                    "nativeSrc": "484:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "484:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "469:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "469:3:1"
-                                                            },
-                                                            "nativeSrc": "469:22:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "469:22:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "_3",
-                                                                "nativeSrc": "463:2:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "463:2:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "539:16:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "539:16:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "548:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "548:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "551:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "551:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert",
-                                                                            "nativeSrc": "541:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "541:6:1"
-                                                                        },
-                                                                        "nativeSrc": "541:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "541:12:1"
-                                                                    },
-                                                                    "nativeSrc": "541:12:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "541:12:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "name": "_3",
-                                                                                    "nativeSrc": "518:2:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "518:2:1"
-                                                                                },
-                                                                                {
-                                                                                    "kind": "number",
-                                                                                    "nativeSrc": "522:4:1",
-                                                                                    "nodeType": "YulLiteral",
-                                                                                    "src": "522:4:1",
-                                                                                    "type": "",
-                                                                                    "value": "0x1f"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "add",
-                                                                                "nativeSrc": "514:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "514:3:1"
-                                                                            },
-                                                                            "nativeSrc": "514:13:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "514:13:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "dataEnd",
-                                                                            "nativeSrc": "529:7:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "529:7:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "slt",
-                                                                        "nativeSrc": "510:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "510:3:1"
-                                                                    },
-                                                                    "nativeSrc": "510:27:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "510:27:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "iszero",
-                                                                "nativeSrc": "503:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "503:6:1"
-                                                            },
-                                                            "nativeSrc": "503:35:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "503:35:1"
-                                                        },
-                                                        "nativeSrc": "500:55:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "500:55:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "564:26:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "564:26:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "_3",
-                                                                    "nativeSrc": "587:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "587:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "calldataload",
-                                                                "nativeSrc": "574:12:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "574:12:1"
-                                                            },
-                                                            "nativeSrc": "574:16:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "574:16:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "_4",
-                                                                "nativeSrc": "568:2:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "568:2:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "613:22:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "613:22:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "panic_error_0x41",
-                                                                            "nativeSrc": "615:16:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "615:16:1"
-                                                                        },
-                                                                        "nativeSrc": "615:18:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "615:18:1"
-                                                                    },
-                                                                    "nativeSrc": "615:18:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "615:18:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "_4",
-                                                                    "nativeSrc": "605:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "605:2:1"
-                                                                },
-                                                                {
-                                                                    "name": "_2",
-                                                                    "nativeSrc": "609:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "609:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "gt",
-                                                                "nativeSrc": "602:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "602:2:1"
-                                                            },
-                                                            "nativeSrc": "602:10:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "602:10:1"
-                                                        },
-                                                        "nativeSrc": "599:36:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "599:36:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "644:20:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "644:20:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "658:1:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "658:1:1",
-                                                                    "type": "",
-                                                                    "value": "5"
-                                                                },
-                                                                {
-                                                                    "name": "_4",
-                                                                    "nativeSrc": "661:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "661:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "shl",
-                                                                "nativeSrc": "654:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "654:3:1"
-                                                            },
-                                                            "nativeSrc": "654:10:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "654:10:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "_5",
-                                                                "nativeSrc": "648:2:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "648:2:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "673:23:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "673:23:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "693:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "693:2:1",
-                                                                    "type": "",
-                                                                    "value": "64"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mload",
-                                                                "nativeSrc": "687:5:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "687:5:1"
-                                                            },
-                                                            "nativeSrc": "687:9:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "687:9:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "memPtr",
-                                                                "nativeSrc": "677:6:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "677:6:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "705:56:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "705:56:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "memPtr",
-                                                                    "nativeSrc": "727:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "727:6:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "name": "_5",
-                                                                                    "nativeSrc": "743:2:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "743:2:1"
-                                                                                },
-                                                                                {
-                                                                                    "kind": "number",
-                                                                                    "nativeSrc": "747:2:1",
-                                                                                    "nodeType": "YulLiteral",
-                                                                                    "src": "747:2:1",
-                                                                                    "type": "",
-                                                                                    "value": "63"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "add",
-                                                                                "nativeSrc": "739:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "739:3:1"
-                                                                            },
-                                                                            "nativeSrc": "739:11:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "739:11:1"
-                                                                        },
-                                                                        {
-                                                                            "arguments":
-                                                                            [
-                                                                                {
-                                                                                    "kind": "number",
-                                                                                    "nativeSrc": "756:2:1",
-                                                                                    "nodeType": "YulLiteral",
-                                                                                    "src": "756:2:1",
-                                                                                    "type": "",
-                                                                                    "value": "31"
-                                                                                }
-                                                                            ],
-                                                                            "functionName":
-                                                                            {
-                                                                                "name": "not",
-                                                                                "nativeSrc": "752:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "752:3:1"
-                                                                            },
-                                                                            "nativeSrc": "752:7:1",
-                                                                            "nodeType": "YulFunctionCall",
-                                                                            "src": "752:7:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "and",
-                                                                        "nativeSrc": "735:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "735:3:1"
-                                                                    },
-                                                                    "nativeSrc": "735:25:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "735:25:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "723:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "723:3:1"
-                                                            },
-                                                            "nativeSrc": "723:38:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "723:38:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "newFreePtr",
-                                                                "nativeSrc": "709:10:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "709:10:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "820:22:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "820:22:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments": [],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "panic_error_0x41",
-                                                                            "nativeSrc": "822:16:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "822:16:1"
-                                                                        },
-                                                                        "nativeSrc": "822:18:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "822:18:1"
-                                                                    },
-                                                                    "nativeSrc": "822:18:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "822:18:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "newFreePtr",
-                                                                            "nativeSrc": "779:10:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "779:10:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "_2",
-                                                                            "nativeSrc": "791:2:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "791:2:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "gt",
-                                                                        "nativeSrc": "776:2:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "776:2:1"
-                                                                    },
-                                                                    "nativeSrc": "776:18:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "776:18:1"
-                                                                },
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "newFreePtr",
-                                                                            "nativeSrc": "799:10:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "799:10:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "memPtr",
-                                                                            "nativeSrc": "811:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "811:6:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "lt",
-                                                                        "nativeSrc": "796:2:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "796:2:1"
-                                                                    },
-                                                                    "nativeSrc": "796:22:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "796:22:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "or",
-                                                                "nativeSrc": "773:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "773:2:1"
-                                                            },
-                                                            "nativeSrc": "773:46:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "773:46:1"
-                                                        },
-                                                        "nativeSrc": "770:72:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "770:72:1"
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "858:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "858:2:1",
-                                                                    "type": "",
-                                                                    "value": "64"
-                                                                },
-                                                                {
-                                                                    "name": "newFreePtr",
-                                                                    "nativeSrc": "862:10:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "862:10:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "851:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "851:6:1"
-                                                            },
-                                                            "nativeSrc": "851:22:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "851:22:1"
-                                                        },
-                                                        "nativeSrc": "851:22:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "851:22:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "882:17:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "882:17:1",
-                                                        "value":
-                                                        {
-                                                            "name": "memPtr",
-                                                            "nativeSrc": "893:6:1",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "893:6:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "dst",
-                                                                "nativeSrc": "886:3:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "886:3:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "memPtr",
-                                                                    "nativeSrc": "915:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "915:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "_4",
-                                                                    "nativeSrc": "923:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "923:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "908:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "908:6:1"
-                                                            },
-                                                            "nativeSrc": "908:18:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "908:18:1"
-                                                        },
-                                                        "nativeSrc": "908:18:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "908:18:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "935:22:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "935:22:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "memPtr",
-                                                                    "nativeSrc": "946:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "946:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "954:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "954:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "942:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "942:3:1"
-                                                            },
-                                                            "nativeSrc": "942:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "942:15:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "dst",
-                                                                "nativeSrc": "935:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "935:3:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "966:34:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "966:34:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "arguments":
-                                                                    [
-                                                                        {
-                                                                            "name": "_3",
-                                                                            "nativeSrc": "988:2:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "988:2:1"
-                                                                        },
-                                                                        {
-                                                                            "name": "_5",
-                                                                            "nativeSrc": "992:2:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "992:2:1"
-                                                                        }
-                                                                    ],
-                                                                    "functionName":
-                                                                    {
-                                                                        "name": "add",
-                                                                        "nativeSrc": "984:3:1",
-                                                                        "nodeType": "YulIdentifier",
-                                                                        "src": "984:3:1"
-                                                                    },
-                                                                    "nativeSrc": "984:11:1",
-                                                                    "nodeType": "YulFunctionCall",
-                                                                    "src": "984:11:1"
-                                                                },
-                                                                {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "997:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "997:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "980:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "980:3:1"
-                                                            },
-                                                            "nativeSrc": "980:20:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "980:20:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "srcEnd",
-                                                                "nativeSrc": "970:6:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "970:6:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "1032:16:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "1032:16:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "1041:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "1041:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            },
-                                                                            {
-                                                                                "kind": "number",
-                                                                                "nativeSrc": "1044:1:1",
-                                                                                "nodeType": "YulLiteral",
-                                                                                "src": "1044:1:1",
-                                                                                "type": "",
-                                                                                "value": "0"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "revert",
-                                                                            "nativeSrc": "1034:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1034:6:1"
-                                                                        },
-                                                                        "nativeSrc": "1034:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "1034:12:1"
-                                                                    },
-                                                                    "nativeSrc": "1034:12:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "1034:12:1"
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "srcEnd",
-                                                                    "nativeSrc": "1015:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1015:6:1"
-                                                                },
-                                                                {
-                                                                    "name": "dataEnd",
-                                                                    "nativeSrc": "1023:7:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1023:7:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "gt",
-                                                                "nativeSrc": "1012:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1012:2:1"
-                                                            },
-                                                            "nativeSrc": "1012:19:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1012:19:1"
-                                                        },
-                                                        "nativeSrc": "1009:39:1",
-                                                        "nodeType": "YulIf",
-                                                        "src": "1009:39:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "1057:22:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "1057:22:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "_3",
-                                                                    "nativeSrc": "1072:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1072:2:1"
-                                                                },
-                                                                {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "1076:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1076:2:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "1068:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1068:3:1"
-                                                            },
-                                                            "nativeSrc": "1068:11:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1068:11:1"
-                                                        },
-                                                        "variables":
-                                                        [
-                                                            {
-                                                                "name": "src",
-                                                                "nativeSrc": "1061:3:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "1061:3:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "body":
-                                                        {
-                                                            "nativeSrc": "1144:86:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "1144:86:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "name": "dst",
-                                                                                "nativeSrc": "1165:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1165:3:1"
-                                                                            },
-                                                                            {
-                                                                                "arguments":
-                                                                                [
-                                                                                    {
-                                                                                        "name": "src",
-                                                                                        "nativeSrc": "1183:3:1",
-                                                                                        "nodeType": "YulIdentifier",
-                                                                                        "src": "1183:3:1"
-                                                                                    }
-                                                                                ],
-                                                                                "functionName":
-                                                                                {
-                                                                                    "name": "calldataload",
-                                                                                    "nativeSrc": "1170:12:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "1170:12:1"
-                                                                                },
-                                                                                "nativeSrc": "1170:17:1",
-                                                                                "nodeType": "YulFunctionCall",
-                                                                                "src": "1170:17:1"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "mstore",
-                                                                            "nativeSrc": "1158:6:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1158:6:1"
-                                                                        },
-                                                                        "nativeSrc": "1158:30:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "1158:30:1"
-                                                                    },
-                                                                    "nativeSrc": "1158:30:1",
-                                                                    "nodeType": "YulExpressionStatement",
-                                                                    "src": "1158:30:1"
-                                                                },
-                                                                {
-                                                                    "nativeSrc": "1201:19:1",
-                                                                    "nodeType": "YulAssignment",
-                                                                    "src": "1201:19:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "name": "dst",
-                                                                                "nativeSrc": "1212:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1212:3:1"
-                                                                            },
-                                                                            {
-                                                                                "name": "_1",
-                                                                                "nativeSrc": "1217:2:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1217:2:1"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "add",
-                                                                            "nativeSrc": "1208:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1208:3:1"
-                                                                        },
-                                                                        "nativeSrc": "1208:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "1208:12:1"
-                                                                    },
-                                                                    "variableNames":
-                                                                    [
-                                                                        {
-                                                                            "name": "dst",
-                                                                            "nativeSrc": "1201:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1201:3:1"
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "src",
-                                                                    "nativeSrc": "1099:3:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1099:3:1"
-                                                                },
-                                                                {
-                                                                    "name": "srcEnd",
-                                                                    "nativeSrc": "1104:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1104:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "lt",
-                                                                "nativeSrc": "1096:2:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1096:2:1"
-                                                            },
-                                                            "nativeSrc": "1096:15:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1096:15:1"
-                                                        },
-                                                        "nativeSrc": "1088:142:1",
-                                                        "nodeType": "YulForLoop",
-                                                        "post":
-                                                        {
-                                                            "nativeSrc": "1112:23:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "1112:23:1",
-                                                            "statements":
-                                                            [
-                                                                {
-                                                                    "nativeSrc": "1114:19:1",
-                                                                    "nodeType": "YulAssignment",
-                                                                    "src": "1114:19:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
-                                                                            {
-                                                                                "name": "src",
-                                                                                "nativeSrc": "1125:3:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1125:3:1"
-                                                                            },
-                                                                            {
-                                                                                "name": "_1",
-                                                                                "nativeSrc": "1130:2:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1130:2:1"
-                                                                            }
-                                                                        ],
-                                                                        "functionName":
-                                                                        {
-                                                                            "name": "add",
-                                                                            "nativeSrc": "1121:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1121:3:1"
-                                                                        },
-                                                                        "nativeSrc": "1121:12:1",
-                                                                        "nodeType": "YulFunctionCall",
-                                                                        "src": "1121:12:1"
-                                                                    },
-                                                                    "variableNames":
-                                                                    [
-                                                                        {
-                                                                            "name": "src",
-                                                                            "nativeSrc": "1114:3:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "1114:3:1"
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        },
-                                                        "pre":
-                                                        {
-                                                            "nativeSrc": "1092:3:1",
-                                                            "nodeType": "YulBlock",
-                                                            "src": "1092:3:1",
-                                                            "statements": []
-                                                        },
-                                                        "src": "1088:142:1"
-                                                    },
-                                                    {
-                                                        "nativeSrc": "1239:16:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1239:16:1",
-                                                        "value":
-                                                        {
-                                                            "name": "memPtr",
-                                                            "nativeSrc": "1249:6:1",
-                                                            "nodeType": "YulIdentifier",
-                                                            "src": "1249:6:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "value0",
-                                                                "nativeSrc": "1239:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1239:6:1"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
-                                            "nativeSrc": "146:1115:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "headStart",
-                                                    "nativeSrc": "207:9:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "207:9:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "dataEnd",
-                                                    "nativeSrc": "218:7:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "218:7:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "value0",
-                                                    "nativeSrc": "230:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "230:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "146:1115:1"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1367:76:1",
-                                                "nodeType": "YulBlock",
-                                                "src": "1367:76:1",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1377:26:1",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "1377:26:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "headStart",
-                                                                    "nativeSrc": "1389:9:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1389:9:1"
-                                                                },
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1400:2:1",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "1400:2:1",
-                                                                    "type": "",
-                                                                    "value": "32"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "add",
-                                                                "nativeSrc": "1385:3:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1385:3:1"
-                                                            },
-                                                            "nativeSrc": "1385:18:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1385:18:1"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "tail",
-                                                                "nativeSrc": "1377:4:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1377:4:1"
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "name": "headStart",
-                                                                    "nativeSrc": "1419:9:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1419:9:1"
-                                                                },
-                                                                {
-                                                                    "name": "value0",
-                                                                    "nativeSrc": "1430:6:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1430:6:1"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mstore",
-                                                                "nativeSrc": "1412:6:1",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "1412:6:1"
-                                                            },
-                                                            "nativeSrc": "1412:25:1",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "1412:25:1"
-                                                        },
-                                                        "nativeSrc": "1412:25:1",
-                                                        "nodeType": "YulExpressionStatement",
-                                                        "src": "1412:25:1"
-                                                    }
-                                                ]
-                                            },
-                                            "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
-                                            "nativeSrc": "1266:177:1",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
-                                                {
-                                                    "name": "headStart",
-                                                    "nativeSrc": "1336:9:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1336:9:1",
-                                                    "type": ""
-                                                },
-                                                {
-                                                    "name": "value0",
-                                                    "nativeSrc": "1347:6:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1347:6:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "tail",
-                                                    "nativeSrc": "1358:4:1",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "1358:4:1",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "1266:177:1"
-                                        }
-                                    ]
-                                },
-                                "contents": "{
-    { }
-    function panic_error_0x41()
-    {
-        mstore(0, shl(224, 0x4e487b71))
-        mstore(4, 0x41)
-        revert(0, 0x24)
-    }
-    function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr(headStart, dataEnd) -> value0
-    {
-        let _1 := 32
-        if slt(sub(dataEnd, headStart), _1) { revert(0, 0) }
-        let offset := calldataload(headStart)
-        let _2 := 0xffffffffffffffff
-        if gt(offset, _2) { revert(0, 0) }
-        let _3 := add(headStart, offset)
-        if iszero(slt(add(_3, 0x1f), dataEnd)) { revert(0, 0) }
-        let _4 := calldataload(_3)
-        if gt(_4, _2) { panic_error_0x41() }
-        let _5 := shl(5, _4)
-        let memPtr := mload(64)
-        let newFreePtr := add(memPtr, and(add(_5, 63), not(31)))
-        if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-        mstore(64, newFreePtr)
-        let dst := memPtr
-        mstore(memPtr, _4)
-        dst := add(memPtr, _1)
-        let srcEnd := add(add(_3, _5), _1)
-        if gt(srcEnd, dataEnd) { revert(0, 0) }
-        let src := add(_3, _1)
-        for { } lt(src, srcEnd) { src := add(src, _1) }
-        {
-            mstore(dst, calldataload(src))
-            dst := add(dst, _1)
-        }
-        value0 := memPtr
-    }
-    function abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed(headStart, value0) -> tail
-    {
-        tail := add(headStart, 32)
-        mstore(headStart, value0)
-    }
-}",
-                                "id": 1,
-                                "language": "Yul",
-                                "name": "#utility.yul"
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "a.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_detail_type/in.sol b/test/cmdlineTests/standard_optimizer_invalid_detail_type/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_detail_type/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_detail_type/input.json b/test/cmdlineTests/standard_optimizer_invalid_detail_type/input.json
deleted file mode 100644
index 5d65bb2e2269..000000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_detail_type/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_invalid_detail_type/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {"details": {"peephole": 7}}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json b/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json
deleted file mode 100644
index 2601dea6c3d1..000000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.optimizer.details.peephole\" must be Boolean",
-            "message": "\"settings.optimizer.details.peephole\" must be Boolean",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_details/in.sol b/test/cmdlineTests/standard_optimizer_invalid_details/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_details/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_details/input.json b/test/cmdlineTests/standard_optimizer_invalid_details/input.json
deleted file mode 100644
index dbab578d6175..000000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_details/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_invalid_details/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {"details": {"notThere": true}}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_details/output.json b/test/cmdlineTests/standard_optimizer_invalid_details/output.json
deleted file mode 100644
index c7dfaf3142f9..000000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_details/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"notThere\"",
-            "message": "Unknown key \"notThere\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_no_yul/in.sol b/test/cmdlineTests/standard_optimizer_no_yul/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_no_yul/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_no_yul/input.json b/test/cmdlineTests/standard_optimizer_no_yul/input.json
deleted file mode 100644
index 42ab767be632..000000000000
--- a/test/cmdlineTests/standard_optimizer_no_yul/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_no_yul/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"enabled": true,
-			"details": {"yul": false}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_no_yul/output.json b/test/cmdlineTests/standard_optimizer_no_yul/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_no_yul/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yul/in.sol b/test/cmdlineTests/standard_optimizer_yul/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yul/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yul/input.json b/test/cmdlineTests/standard_optimizer_yul/input.json
deleted file mode 100644
index cf40ef970bbb..000000000000
--- a/test/cmdlineTests/standard_optimizer_yul/input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yul/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"enabled": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yul/output.json b/test/cmdlineTests/standard_optimizer_yul/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yul/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails/input.json b/test/cmdlineTests/standard_optimizer_yulDetails/input.json
deleted file mode 100644
index 6cdf504fd854..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails/output.json b/test/cmdlineTests/standard_optimizer_yulDetails/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_no_object/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_no_object/input.json
deleted file mode 100644
index 4aba68350fb6..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_no_object/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": 7
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json
deleted file mode 100644
index 86a0c86986fc..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.optimizer.details.yulDetails\" must be an object",
-            "message": "\"settings.optimizer.details.yulDetails\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/input.json
deleted file mode 100644
index 584b8bf83e42..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul"
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/input.json
deleted file mode 100644
index 48de0cce3f51..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "abcdefg{hijklmno}pqr[st]uvwxyz"
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json
deleted file mode 100644
index d4f6ef3a7e55..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json
deleted file mode 100644
index 5be769f7676a..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol"]}
-    },
-    "settings": {
-        "optimizer": {
-            "details": {
-                "yul": true,
-                "yulDetails": {
-                    "optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xar:rscLM\n]\njmuljuljul VcTOcul jmul"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
deleted file mode 100644
index f44ca7e2e589..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup sequence delimiter cannot be placed inside the brackets",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup sequence delimiter cannot be placed inside the brackets",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json
deleted file mode 100644
index 0bddd9d9dc23..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol"]}
-    },
-    "settings": {
-        "optimizer": {
-            "details": {
-                "yul": true,
-                "yulDetails": {
-                    "optimizerSteps": "dhfoDgvu:lfnTUtnIf\n[    xarrscLM\n]\njmuljulj:ul VcTOcul jmul"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
deleted file mode 100644
index 16cba14d70c6..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many cleanup sequence delimiters",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many cleanup sequence delimiters",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/input.json
deleted file mode 100644
index 2baf7a7235fc..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_nested_brackets/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]"
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/input.json
deleted file mode 100644
index 1c055d91545e..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[a]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json
deleted file mode 100644
index e06e14205db0..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Brackets nested too deep",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Brackets nested too deep",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/input.json
deleted file mode 100644
index e6f2abaa2847..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_type/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": 42
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json
deleted file mode 100644
index d6f9a9df8560..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.optimizer.details.optimizerSteps\" must be a string",
-            "message": "\"settings.optimizer.details.optimizerSteps\" must be a string",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/input.json
deleted file mode 100644
index e3cd50027b17..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "a]a]["
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json
deleted file mode 100644
index 316529b0d9c8..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/input.json
deleted file mode 100644
index 6cf7a233479c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "a[a]["
-				}
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json
deleted file mode 100644
index 316529b0d9c8..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json
deleted file mode 100644
index b557a9662d8e..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
-    },
-    "settings": {
-        "optimizer": {
-            "details": {
-                "yul": true,
-                "yulDetails": {
-                    "optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul:fDnTOc"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
deleted file mode 100644
index 0903ccfebd44..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
-    },
-    "settings": {
-        "optimizer": {
-            "details": {
-                "yul": true,
-                "yulDetails": {
-                    "optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul:"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
deleted file mode 100644
index 4086aff9fb14..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
-    },
-    "settings": {
-        "optimizer": {
-            "details": {
-                "yul": true,
-                "yulDetails": {
-                    "optimizerSteps": ":dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
deleted file mode 100644
index 4f66682223c3..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
-    },
-    "settings": {
-        "optimizer": {
-            "details": {
-                "yul": true,
-                "yulDetails": {
-                    "optimizerSteps": ":"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
deleted file mode 100644
index acf3b74ef1de..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/in.sol
deleted file mode 100644
index 9e5350072a2c..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/input.json
deleted file mode 100644
index abd8cc0c8bac..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_without_yul/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {"details": {"yulDetails": 7}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
deleted file mode 100644
index 4e6d7b6f4ddc..000000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"Providing yulDetails requires Yul optimizer to be enabled.",
-            "message": "\"Providing yulDetails requires Yul optimizer to be enabled.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol
deleted file mode 100644
index b31d640322ad..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {
-    // This will trigger a fatal error at the analysis stage, of the kind that terminates analysis
-    // immediately without letting the current step finish.
-    constructor(uint[] storage) {}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json
deleted file mode 100644
index b640f033dc46..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_outputs_on_analysis_error_fatal/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {
-			"*": {
-				"*": ["*"],
-				"": ["*"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
deleted file mode 100644
index 51d12668fb13..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3644",
-            "formattedMessage": "TypeError: This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
- --> C:7:17:
-  |
-7 |     constructor(uint[] storage) {}
-  |                 ^^^^^^^^^^^^^^
-
-",
-            "message": "This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 258,
-                "file": "C",
-                "start": 244
-            },
-            "type": "TypeError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol
deleted file mode 100644
index 6c8bb3938b76..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-// This will trigger a fatal error at the analysis stage, of the kind that lets the current
-// analysis steps finish but terminates analysis after immediately after that step.
-function f(uint immutable x) {}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json
deleted file mode 100644
index 0214e00e8406..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_outputs_on_analysis_error_fatal_after_current_step/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {
-			"*": {
-				"*": ["*"],
-				"": ["*"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
deleted file mode 100644
index d47ded5d4018..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "8297",
-            "formattedMessage": "DeclarationError: The \"immutable\" keyword can only be used for state variables.
- --> C:6:12:
-  |
-6 | function f(uint immutable x) {}
-  |            ^^^^^^^^^^^^^^^^
-
-",
-            "message": "The \"immutable\" keyword can only be used for state variables.",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 259,
-                "file": "C",
-                "start": 243
-            },
-            "type": "DeclarationError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol
deleted file mode 100644
index 050f5ad43673..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {
-    // This will trigger a non-fatal error at the analysis stage.
-    // With this kind of error we still run subsequent analysis stages.
-    uint x;
-    string y = x;
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json
deleted file mode 100644
index 904ebc5bf287..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_outputs_on_analysis_error_non_fatal/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {
-			"*": {
-				"*": ["*"],
-				"": ["*"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
deleted file mode 100644
index 2f3aaae4420c..000000000000
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7407",
-            "formattedMessage": "TypeError: Type uint256 is not implicitly convertible to expected type string storage ref.
- --> C:8:16:
-  |
-8 |     string y = x;
-  |                ^
-
-",
-            "message": "Type uint256 is not implicitly convertible to expected type string storage ref.",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 235,
-                "file": "C",
-                "start": 234
-            },
-            "type": "TypeError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/args b/test/cmdlineTests/standard_outputs_on_compilation_error/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/in.sol b/test/cmdlineTests/standard_outputs_on_compilation_error/in.sol
deleted file mode 100644
index 1d5118b87287..000000000000
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/in.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {
-    // This will trigger an error at the compilation stage.
-    // CodeGenerationError due to immutable initialization in constructor being optimized out.
-    uint immutable public x;
-
-    constructor() {
-        x = 0;
-        while (true) {}
-    }
-}
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/input.json b/test/cmdlineTests/standard_outputs_on_compilation_error/input.json
deleted file mode 100644
index 855f007689b8..000000000000
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/input.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_outputs_on_compilation_error/in.sol"]}
-	},
-	"settings": {
-		"optimizer": {"enabled": true},
-		"outputSelection": {
-			"*": {
-				"*": ["*"],
-				"": ["*"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
deleted file mode 100644
index ac01fb1eba9c..000000000000
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "abi":
-                [
-                    {
-                        "inputs": [],
-                        "stateMutability": "nonpayable",
-                        "type": "constructor"
-                    },
-                    {
-                        "inputs": [],
-                        "name": "x",
-                        "outputs":
-                        [
-                            {
-                                "internalType": "uint256",
-                                "name": "",
-                                "type": "uint256"
-                            }
-                        ],
-                        "stateMutability": "view",
-                        "type": "function"
-                    }
-                ],
-                "devdoc":
-                {
-                    "kind": "dev",
-                    "methods": {},
-                    "version": 1
-                },
-                "evm":
-                {
-                    "methodIdentifiers":
-                    {
-                        "x()": "0c55699c"
-                    }
-                },
-                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"x\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"C\":\"C\"},\"evmVersion\":\"shanghai\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"C\":{\"keccak256\":\"0x67a13ebd685e4c6f792e71eb747dac57edb99e94d04d841ee6c979ae517934ce\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://665b000da768823654f680d02686c1e59d682a0b3882e43a77fed9f80ce64ae8\",\"dweb:/ipfs/QmVnKvuidH6KiCdNQpoAQUtDbB8hXkafVLXWMNitUcxnqC\"]}},\"version\":1}",
-                "storageLayout":
-                {
-                    "storage": [],
-                    "types": null
-                },
-                "userdoc":
-                {
-                    "kind": "user",
-                    "methods": {},
-                    "version": 1
-                }
-            }
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "1284",
-            "formattedMessage": "CodeGenerationError: Some immutables were read from but never assigned, possibly because of optimization.
-
-",
-            "message": "Some immutables were read from but never assigned, possibly because of optimization.",
-            "severity": "error",
-            "type": "CodeGenerationError"
-        }
-    ],
-    "sources":
-    {
-        "C":
-        {
-            "ast":
-            {
-                "absolutePath": "C",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
-                        15
-                    ]
-                },
-                "id": 16,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            "*"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:18:0"
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "canonicalName": "C",
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "fullyImplemented": true,
-                        "id": 15,
-                        "linearizedBaseContracts":
-                        [
-                            15
-                        ],
-                        "name": "C",
-                        "nameLocation": "65:1:0",
-                        "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
-                            {
-                                "constant": false,
-                                "functionSelector": "0c55699c",
-                                "id": 3,
-                                "mutability": "immutable",
-                                "name": "x",
-                                "nameLocation": "250:1:0",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 15,
-                                "src": "228:23:0",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions":
-                                {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                },
-                                "typeName":
-                                {
-                                    "id": 2,
-                                    "name": "uint",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "228:4:0",
-                                    "typeDescriptions":
-                                    {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    }
-                                },
-                                "visibility": "public"
-                            },
-                            {
-                                "body":
-                                {
-                                    "id": 13,
-                                    "nodeType": "Block",
-                                    "src": "272:46:0",
-                                    "statements":
-                                    [
-                                        {
-                                            "expression":
-                                            {
-                                                "id": 8,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftHandSide":
-                                                {
-                                                    "id": 6,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 3,
-                                                    "src": "282:1:0",
-                                                    "typeDescriptions":
-                                                    {
-                                                        "typeIdentifier": "t_uint256",
-                                                        "typeString": "uint256"
-                                                    }
-                                                },
-                                                "nodeType": "Assignment",
-                                                "operator": "=",
-                                                "rightHandSide":
-                                                {
-                                                    "hexValue": "30",
-                                                    "id": 7,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "286:1:0",
-                                                    "typeDescriptions":
-                                                    {
-                                                        "typeIdentifier": "t_rational_0_by_1",
-                                                        "typeString": "int_const 0"
-                                                    },
-                                                    "value": "0"
-                                                },
-                                                "src": "282:5:0",
-                                                "typeDescriptions":
-                                                {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "id": 9,
-                                            "nodeType": "ExpressionStatement",
-                                            "src": "282:5:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "id": 11,
-                                                "nodeType": "Block",
-                                                "src": "310:2:0",
-                                                "statements": []
-                                            },
-                                            "condition":
-                                            {
-                                                "hexValue": "74727565",
-                                                "id": 10,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": true,
-                                                "kind": "bool",
-                                                "lValueRequested": false,
-                                                "nodeType": "Literal",
-                                                "src": "304:4:0",
-                                                "typeDescriptions":
-                                                {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                },
-                                                "value": "true"
-                                            },
-                                            "id": 12,
-                                            "nodeType": "WhileStatement",
-                                            "src": "297:15:0"
-                                        }
-                                    ]
-                                },
-                                "id": 14,
-                                "implemented": true,
-                                "kind": "constructor",
-                                "modifiers": [],
-                                "name": "",
-                                "nameLocation": "-1:-1:-1",
-                                "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
-                                    "id": 4,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "269:2:0"
-                                },
-                                "returnParameters":
-                                {
-                                    "id": 5,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "272:0:0"
-                                },
-                                "scope": 15,
-                                "src": "258:60:0",
-                                "stateMutability": "nonpayable",
-                                "virtual": false,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 16,
-                        "src": "56:264:0",
-                        "usedErrors": [],
-                        "usedEvents": []
-                    }
-                ],
-                "src": "36:285:0"
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/args b/test/cmdlineTests/standard_outputs_on_parsing_error/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_outputs_on_parsing_error/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/in.sol b/test/cmdlineTests/standard_outputs_on_parsing_error/in.sol
deleted file mode 100644
index a4d891c1b25a..000000000000
--- a/test/cmdlineTests/standard_outputs_on_parsing_error/in.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-// This will trigger an error at the parsing stage
-contract C {}}
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/input.json b/test/cmdlineTests/standard_outputs_on_parsing_error/input.json
deleted file mode 100644
index a0d00c4e9e39..000000000000
--- a/test/cmdlineTests/standard_outputs_on_parsing_error/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_outputs_on_parsing_error/in.sol"]}
-	},
-	"settings": {
-		"outputSelection": {
-			"*": {
-				"*": ["*"],
-				"": ["*"]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/output.json b/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
deleted file mode 100644
index 8c1f6c0dbe28..000000000000
--- a/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "7858",
-            "formattedMessage": "ParserError: Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
- --> C:5:14:
-  |
-5 | contract C {}}
-  |              ^
-
-",
-            "message": "Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 121,
-                "file": "C",
-                "start": 120
-            },
-            "type": "ParserError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/input.json b/test/cmdlineTests/standard_parsing_import_absolute_paths/input.json
deleted file mode 100644
index 9ec5150b45b5..000000000000
--- a/test/cmdlineTests/standard_parsing_import_absolute_paths/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "/project/../C.sol": {"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\nimport \"../L.sol\";"},
-        "/lib/L.sol": {"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\n"}
-    },
-    "settings": {
-        "stopAfter": "parsing",
-        "remappings": [":/project/=/lib/"],
-        "outputSelection": {"*": {"": ["ast"]}}
-    }
-}
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json b/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
deleted file mode 100644
index 1982561ef2a2..000000000000
--- a/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "sources":
-    {
-        "/lib/L.sol":
-        {
-            "ast":
-            {
-                "absolutePath": "/lib/L.sol",
-                "id": 2,
-                "license": "GPL-2.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            ">=",
-                            "0.0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "35:22:0"
-                    }
-                ],
-                "src": "35:23:0"
-            },
-            "id": 0
-        },
-        "/project/../C.sol":
-        {
-            "ast":
-            {
-                "absolutePath": "/project/../C.sol",
-                "id": 5,
-                "license": "GPL-2.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 3,
-                        "literals":
-                        [
-                            "solidity",
-                            ">=",
-                            "0.0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "35:22:1"
-                    },
-                    {
-                        "absolutePath": "/lib/L.sol",
-                        "file": "../L.sol",
-                        "id": 4,
-                        "nameLocation": "-1:-1:-1",
-                        "nodeType": "ImportDirective",
-                        "src": "58:18:1",
-                        "symbolAliases": [],
-                        "unitAlias": ""
-                    }
-                ],
-                "src": "35:41:1"
-            },
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_secondary_source_location/input.json b/test/cmdlineTests/standard_secondary_source_location/input.json
deleted file mode 100644
index e429265b429f..000000000000
--- a/test/cmdlineTests/standard_secondary_source_location/input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract A { constructor(uint) {} } contract B is A(2) { } contract C is A(3) {} contract D is B, C {}"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_secondary_source_location/output.json b/test/cmdlineTests/standard_secondary_source_location/output.json
deleted file mode 100644
index 6423769aab15..000000000000
--- a/test/cmdlineTests/standard_secondary_source_location/output.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3364",
-            "formattedMessage": "DeclarationError: Base constructor arguments given twice.
- --> A:2:105:
-  |
-2 | pragma solidity >=0.0; contract A { constructor(uint) {} } contract B is A(2) { } contract C is A(3) {} contract D is B, C {}
-  |                                                                                                         ^^^^^^^^^^^^^^^^^^^^^
-Note: First constructor call is here:
- --> A:2:74:
-  |
-2 | pragma solidity >=0.0; contract A { constructor(uint) {} } contract B is A(2) { } contract C is A(3) {} contract D is B, C {}
-  |                                                                          ^^^^
-Note: Second constructor call is here:
- --> A:2:97:
-  |
-2 | pragma solidity >=0.0; contract A { constructor(uint) {} } contract B is A(2) { } contract C is A(3) {} contract D is B, C {}
-  |                                                                                                 ^^^^
-
-",
-            "message": "Base constructor arguments given twice.",
-            "secondarySourceLocations":
-            [
-                {
-                    "end": 112,
-                    "file": "A",
-                    "message": "First constructor call is here:",
-                    "start": 108
-                },
-                {
-                    "end": 135,
-                    "file": "A",
-                    "message": "Second constructor call is here:",
-                    "start": 131
-                }
-            ],
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 160,
-                "file": "A",
-                "start": 139
-            },
-            "type": "DeclarationError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/args b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol
deleted file mode 100644
index e78a24ff786e..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-import "A";
-
-contract C {}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json
deleted file mode 100644
index 34f157495034..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_stop_after_parsing_ast_requested/in.sol"]}
-	},
-	"settings": {
-		"stopAfter": "parsing",
-		"outputSelection": {
-			"*": {"": ["ast"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
deleted file mode 100644
index 6907d4780f58..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "sources":
-    {
-        "C":
-        {
-            "ast":
-            {
-                "absolutePath": "C",
-                "id": 4,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            "*"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:18:0"
-                    },
-                    {
-                        "absolutePath": "A",
-                        "file": "A",
-                        "id": 2,
-                        "nameLocation": "-1:-1:-1",
-                        "nodeType": "ImportDirective",
-                        "src": "56:11:0",
-                        "symbolAliases": [],
-                        "unitAlias": ""
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "id": 3,
-                        "name": "C",
-                        "nameLocation": "78:1:0",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [],
-                        "src": "69:13:0",
-                        "usedErrors": [],
-                        "usedEvents": []
-                    }
-                ],
-                "src": "36:47:0"
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol
deleted file mode 100644
index e78a24ff786e..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-import "A";
-
-contract C {}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json
deleted file mode 100644
index 7ef3d37fd305..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_stop_after_parsing_bytecode_requested/in.sol"]}
-	},
-	"settings": {
-		"stopAfter": "parsing",
-		"outputSelection": {
-			"*": {"*": ["evm.bytecode.object"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
deleted file mode 100644
index 37195309631d..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Requested output selection conflicts with \"settings.stopAfter\".",
-            "message": "Requested output selection conflicts with \"settings.stopAfter\".",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol
deleted file mode 100644
index 978517b3c23f..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-import "A";
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json
deleted file mode 100644
index ac4d623c7103..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"C": {"urls": ["standard_stop_after_parsing_non_binary_output_requested/in.sol"]}
-	},
-	"settings": {
-		"stopAfter": "parsing",
-		"outputSelection": {
-			"*": {"*": [
-				"abi",
-				"devdoc",
-				"userdoc",
-				"metadata",
-				"storageLayout",
-				"evm.methodIdentifiers"
-			]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json
deleted file mode 100644
index 5b64763be82f..000000000000
--- a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sources":
-    {
-        "C":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/contract.sol b/test/cmdlineTests/standard_urls_existing_and_missing/contract.sol
deleted file mode 100644
index a32f63f78ff2..000000000000
--- a/test/cmdlineTests/standard_urls_existing_and_missing/contract.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/input.json b/test/cmdlineTests/standard_urls_existing_and_missing/input.json
deleted file mode 100644
index 686e8128eca2..000000000000
--- a/test/cmdlineTests/standard_urls_existing_and_missing/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "url_not_found.sol": {
-            "urls": [
-                "standard_urls_existing_and_missing/non-existent-contract-1.sol",
-                "standard_urls_existing_and_missing/contract.sol",
-                "standard_urls_existing_and_missing/non-existent-contract-2.sol"
-            ]
-        }
-    },
-    "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
-}
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/output.json b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
deleted file mode 100644
index 87db5f4db78e..000000000000
--- a/test/cmdlineTests/standard_urls_existing_and_missing/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "url_not_found.sol":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_urls_missing/contract.sol b/test/cmdlineTests/standard_urls_missing/contract.sol
deleted file mode 100644
index a32f63f78ff2..000000000000
--- a/test/cmdlineTests/standard_urls_missing/contract.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
diff --git a/test/cmdlineTests/standard_urls_missing/input.json b/test/cmdlineTests/standard_urls_missing/input.json
deleted file mode 100644
index fecc50eb03a6..000000000000
--- a/test/cmdlineTests/standard_urls_missing/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "language": "Solidity",
-    "sources": {
-        "url_not_found.sol": {
-            "urls": [
-                "standard_urls_missing/non-existent-contract-1.sol",
-                "standard_urls_missing/non-existent-contract.sol",
-                "standard_urls_missing/non-existent-contract-2.sol"
-            ]
-        }
-    },
-    "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
-}
diff --git a/test/cmdlineTests/standard_urls_missing/output.json b/test/cmdlineTests/standard_urls_missing/output.json
deleted file mode 100644
index 267618ee9330..000000000000
--- a/test/cmdlineTests/standard_urls_missing/output.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        },
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        },
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/cmdlineTests/standard_viair_requested/input.json b/test/cmdlineTests/standard_viair_requested/input.json
deleted file mode 100644
index 76ae807a615c..000000000000
--- a/test/cmdlineTests/standard_viair_requested/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C {} contract D { function f() public { C c = new C(); } }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true
-		},
-		"outputSelection":
-		{
-			"*": { "*": ["ir", "evm.bytecode.object", "evm.bytecode.generatedSources", "evm.deployedBytecode.object"] }
-		},
-		"viaIR": true
-	}
-}
diff --git a/test/cmdlineTests/standard_viair_requested/output.json b/test/cmdlineTests/standard_viair_requested/output.json
deleted file mode 100644
index 3e459c56f959..000000000000
--- a/test/cmdlineTests/standard_viair_requested/output.json
+++ /dev/null
@@ -1,332 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "generatedSources": [],
-                        "object": "<BYTECODE REMOVED>"
-                    },
-                    "deployedBytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                },
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_3\" {
-    code {
-        /// @src 0:79:92  \"contract C {}\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_3()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_3_deployed\"), datasize(\"C_3_deployed\"))
-
-        return(_1, datasize(\"C_3_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:79:92  \"contract C {}\"
-        function constructor_C_3() {
-
-            /// @src 0:79:92  \"contract C {}\"
-
-        }
-        /// @src 0:79:92  \"contract C {}\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_3_deployed\" {
-        code {
-            /// @src 0:79:92  \"contract C {}\"
-            mstore(64, memoryguard(128))
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            },
-            "D":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "generatedSources": [],
-                        "object": "<BYTECODE REMOVED>"
-                    },
-                    "deployedBytecode":
-                    {
-                        "object": "<BYTECODE REMOVED>"
-                    }
-                },
-                "ir": "
-/// @use-src 0:\"A\"
-object \"D_16\" {
-    code {
-        /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_D_16()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"D_16_deployed\"), datasize(\"D_16_deployed\"))
-
-        return(_1, datasize(\"D_16_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-        function constructor_D_16() {
-
-            /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-
-        }
-        /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"D_16_deployed\" {
-        code {
-            /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_15()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
-                tail := add(headStart, 0)
-
-            }
-
-            function external_fun_f_15() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_15()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function revert_forward_1() {
-                let pos := allocate_unbounded()
-                returndatacopy(pos, 0, returndatasize())
-                revert(pos, returndatasize())
-            }
-
-            /// @ast-id 15
-            /// @src 0:106:144  \"function f() public { C c = new C(); }\"
-            function fun_f_15() {
-
-                /// @src 0:134:141  \"new C()\"
-                let _1 := allocate_unbounded()
-                let _2 := add(_1, datasize(\"C_3\"))
-                if or(gt(_2, 0xffffffffffffffff), lt(_2, _1)) { panic_error_0x41() }
-                datacopy(_1, dataoffset(\"C_3\"), datasize(\"C_3\"))
-                _2 := abi_encode_tuple__to__fromStack(_2)
-
-                let expr_12_address := create(0, _1, sub(_2, _1))
-
-                if iszero(expr_12_address) { revert_forward_1() }
-
-                /// @src 0:128:141  \"C c = new C()\"
-                let var_c_8_address := expr_12_address
-
-            }
-            /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-
-        }
-
-        /// @use-src 0:\"A\"
-        object \"C_3\" {
-            code {
-                /// @src 0:79:92  \"contract C {}\"
-                mstore(64, memoryguard(128))
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-                constructor_C_3()
-
-                let _1 := allocate_unbounded()
-                codecopy(_1, dataoffset(\"C_3_deployed\"), datasize(\"C_3_deployed\"))
-
-                return(_1, datasize(\"C_3_deployed\"))
-
-                function allocate_unbounded() -> memPtr {
-                    memPtr := mload(64)
-                }
-
-                function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                    revert(0, 0)
-                }
-
-                /// @src 0:79:92  \"contract C {}\"
-                function constructor_C_3() {
-
-                    /// @src 0:79:92  \"contract C {}\"
-
-                }
-                /// @src 0:79:92  \"contract C {}\"
-
-            }
-            /// @use-src 0:\"A\"
-            object \"C_3_deployed\" {
-                code {
-                    /// @src 0:79:92  \"contract C {}\"
-                    mstore(64, memoryguard(128))
-
-                    revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-                    function shift_right_224_unsigned(value) -> newValue {
-                        newValue :=
-
-                        shr(224, value)
-
-                    }
-
-                    function allocate_unbounded() -> memPtr {
-                        memPtr := mload(64)
-                    }
-
-                    function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                        revert(0, 0)
-                    }
-
-                }
-
-                data \".metadata\" hex\"<BYTECODE REMOVED>\"
-            }
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "2072",
-            "formattedMessage": "Warning: Unused local variable.
- --> A:2:93:
-  |
-2 | pragma solidity >=0.0; pragma abicoder v2; contract C {} contract D { function f() public { C c = new C(); } }
-  |                                                                                             ^^^
-
-",
-            "message": "Unused local variable.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 131,
-                "file": "A",
-                "start": 128
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
deleted file mode 100644
index 0843460ed2e2..000000000000
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"auxiliaryInput":
-	{
-		"key1": "test"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
deleted file mode 100644
index 1e846d19c708..000000000000
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"key1\"",
-            "message": "Unknown key \"key1\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/input.json b/test/cmdlineTests/standard_wrong_key_metadata/input.json
deleted file mode 100644
index a52d45004b57..000000000000
--- a/test/cmdlineTests/standard_wrong_key_metadata/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-			"key1": "test",
-      		"useLiteralContent": true
-    	}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/output.json b/test/cmdlineTests/standard_wrong_key_metadata/output.json
deleted file mode 100644
index 1e846d19c708..000000000000
--- a/test/cmdlineTests/standard_wrong_key_metadata/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"key1\"",
-            "message": "Unknown key \"key1\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/input.json b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
deleted file mode 100644
index 945c1e3460ee..000000000000
--- a/test/cmdlineTests/standard_wrong_key_optimizer/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"key1": "test",
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-      		"useLiteralContent": true
-    	}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/output.json b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
deleted file mode 100644
index 1e846d19c708..000000000000
--- a/test/cmdlineTests/standard_wrong_key_optimizer/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"key1\"",
-            "message": "Unknown key \"key1\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_key_root/input.json b/test/cmdlineTests/standard_wrong_key_root/input.json
deleted file mode 100644
index 2fb1a656b696..000000000000
--- a/test/cmdlineTests/standard_wrong_key_root/input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"key1": "test",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_root/output.json b/test/cmdlineTests/standard_wrong_key_root/output.json
deleted file mode 100644
index 1e846d19c708..000000000000
--- a/test/cmdlineTests/standard_wrong_key_root/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"key1\"",
-            "message": "Unknown key \"key1\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_key_settings/input.json b/test/cmdlineTests/standard_wrong_key_settings/input.json
deleted file mode 100644
index 8f0e1d06b96e..000000000000
--- a/test/cmdlineTests/standard_wrong_key_settings/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-      		"useLiteralContent": true
-    	},
-		"key1": "test"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_settings/output.json b/test/cmdlineTests/standard_wrong_key_settings/output.json
deleted file mode 100644
index 1e846d19c708..000000000000
--- a/test/cmdlineTests/standard_wrong_key_settings/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"key1\"",
-            "message": "Unknown key \"key1\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_key_source/input.json b/test/cmdlineTests/standard_wrong_key_source/input.json
deleted file mode 100644
index f4b0f560aae5..000000000000
--- a/test/cmdlineTests/standard_wrong_key_source/input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"key1": "test",
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_source/output.json b/test/cmdlineTests/standard_wrong_key_source/output.json
deleted file mode 100644
index 1e846d19c708..000000000000
--- a/test/cmdlineTests/standard_wrong_key_source/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Unknown key \"key1\"",
-            "message": "Unknown key \"key1\"",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
deleted file mode 100644
index 895aa80ee014..000000000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"auxiliaryInput": [1, 2, 3]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
deleted file mode 100644
index 877ecad4dce6..000000000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"auxiliaryInput\" must be an object",
-            "message": "\"auxiliaryInput\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
deleted file mode 100644
index b20db84dd7a7..000000000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "ast" ]
-			}
-		}
-	},
-	"auxiliaryInput":
-	{
-		"smtlib2responses": "not an object"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
deleted file mode 100644
index c28238145e4c..000000000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"auxiliaryInput.smtlib2responses\" must be an object.",
-            "message": "\"auxiliaryInput.smtlib2responses\" must be an object.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
deleted file mode 100644
index fc69602b8470..000000000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "ast" ]
-			}
-		}
-	},
-	"auxiliaryInput":
-	{
-		"smtlib2responses":
-		{
-			"abc": ["not a string"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
deleted file mode 100644
index 6676998c6cca..000000000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"smtlib2Responses.abc\" must be a string.",
-            "message": "\"smtlib2Responses.abc\" must be a string.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/input.json b/test/cmdlineTests/standard_wrong_type_metadata/input.json
deleted file mode 100644
index 0d459ef37773..000000000000
--- a/test/cmdlineTests/standard_wrong_type_metadata/input.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true,
-			"runs": 200
-		},
-		"evmVersion": "byzantium",
-		"metadata": ["meta1", "meta2", "meta3"]
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/output.json b/test/cmdlineTests/standard_wrong_type_metadata/output.json
deleted file mode 100644
index df9f8cae37ad..000000000000
--- a/test/cmdlineTests/standard_wrong_type_metadata/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.metadata\" must be an object",
-            "message": "\"settings.metadata\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/input.json b/test/cmdlineTests/standard_wrong_type_optimizer/input.json
deleted file mode 100644
index f623628e9fd4..000000000000
--- a/test/cmdlineTests/standard_wrong_type_optimizer/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": 1,
-		"evmVersion": "byzantium",
-		"metadata": {
-			"useLiteralContent": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/output.json b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
deleted file mode 100644
index d7ce30326b92..000000000000
--- a/test/cmdlineTests/standard_wrong_type_optimizer/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.optimizer\" must be an object",
-            "message": "\"settings.optimizer\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/input.json b/test/cmdlineTests/standard_wrong_type_output_selection/input.json
deleted file mode 100644
index 1a3763e92f51..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection/input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": "not an object"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/output.json b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
deleted file mode 100644
index d7d8f563fde5..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.outputSelection\" must be an object",
-            "message": "\"settings.outputSelection\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
deleted file mode 100644
index 73e1e6060a37..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": "it's a contract, but not an array!",
-				"": [ "ast" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
deleted file mode 100644
index 5a35419ef94d..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.outputSelection.fileA.A\" must be a string array",
-            "message": "\"settings.outputSelection.fileA.A\" must be a string array",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json b/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
deleted file mode 100644
index 25b53f0e64ba..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": "awesome file!"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
deleted file mode 100644
index 888efc75b01c..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.outputSelection.fileA\" must be an object",
-            "message": "\"settings.outputSelection.fileA\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json b/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
deleted file mode 100644
index 9a6cdbe5fe6e..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ 1, 2, 3 ,4],
-				"": [ "ast" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
deleted file mode 100644
index 5a35419ef94d..000000000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.outputSelection.fileA.A\" must be a string array",
-            "message": "\"settings.outputSelection.fileA.A\" must be a string array",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/input.json b/test/cmdlineTests/standard_wrong_type_remappings/input.json
deleted file mode 100644
index a2f13d0f7726..000000000000
--- a/test/cmdlineTests/standard_wrong_type_remappings/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "ast" ]
-			}
-		},
-		"remappings": "not an object"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/output.json b/test/cmdlineTests/standard_wrong_type_remappings/output.json
deleted file mode 100644
index b94919077e18..000000000000
--- a/test/cmdlineTests/standard_wrong_type_remappings/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.remappings\" must be an array of strings.",
-            "message": "\"settings.remappings\" must be an array of strings.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
deleted file mode 100644
index 0b03d984deb5..000000000000
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "ast" ]
-			}
-		},
-		"remappings": [1, 2 ,3 ,4]
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
deleted file mode 100644
index d083c85be340..000000000000
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.remappings\" must be an array of strings",
-            "message": "\"settings.remappings\" must be an array of strings",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_root/input.json b/test/cmdlineTests/standard_wrong_type_root/input.json
deleted file mode 100644
index 4763607a575f..000000000000
--- a/test/cmdlineTests/standard_wrong_type_root/input.json
+++ /dev/null
@@ -1 +0,0 @@
-["abc"]
diff --git a/test/cmdlineTests/standard_wrong_type_root/output.json b/test/cmdlineTests/standard_wrong_type_root/output.json
deleted file mode 100644
index da8fefdf5944..000000000000
--- a/test/cmdlineTests/standard_wrong_type_root/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Input is not a JSON object.",
-            "message": "Input is not a JSON object.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_settings/input.json b/test/cmdlineTests/standard_wrong_type_settings/input.json
deleted file mode 100644
index 638f57a76247..000000000000
--- a/test/cmdlineTests/standard_wrong_type_settings/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	[
-		{
-			"optimizer": {
-				"enabled": true,
-				"runs": 200
-			},
-			"evmVersion": "byzantium",
-			"metadata": {
-				"useLiteralContent": true
-			}
-		}
-	]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_settings/output.json b/test/cmdlineTests/standard_wrong_type_settings/output.json
deleted file mode 100644
index a25071c85884..000000000000
--- a/test/cmdlineTests/standard_wrong_type_settings/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings\" must be an object",
-            "message": "\"settings\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_source/input.json b/test/cmdlineTests/standard_wrong_type_source/input.json
deleted file mode 100644
index f8c72996b4ba..000000000000
--- a/test/cmdlineTests/standard_wrong_type_source/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A": "not an object :o",
-		"B": [1, 2, 3],
-		"C":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_source/output.json b/test/cmdlineTests/standard_wrong_type_source/output.json
deleted file mode 100644
index 98496c64333d..000000000000
--- a/test/cmdlineTests/standard_wrong_type_source/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"sources.A\" must be an object",
-            "message": "\"sources.A\" must be an object",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_sources/input.json b/test/cmdlineTests/standard_wrong_type_sources/input.json
deleted file mode 100644
index 76e1ae7d0867..000000000000
--- a/test/cmdlineTests/standard_wrong_type_sources/input.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": ["source1", "source2", "source3"]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_sources/output.json b/test/cmdlineTests/standard_wrong_type_sources/output.json
deleted file mode 100644
index 3f5f51fcebc3..000000000000
--- a/test/cmdlineTests/standard_wrong_type_sources/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"sources\" is not a JSON object.",
-            "message": "\"sources\" is not a JSON object.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_useLiteralContent/input.json b/test/cmdlineTests/standard_wrong_type_useLiteralContent/input.json
deleted file mode 100644
index b96a17564071..000000000000
--- a/test/cmdlineTests/standard_wrong_type_useLiteralContent/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true,
-			"runs": 200
-		},
-		"evmVersion": "byzantium",
-		"metadata": {
-			"useLiteralContent": "literalContent"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json b/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
deleted file mode 100644
index 7135c9856258..000000000000
--- a/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "\"settings.metadata.useLiteralContent\" must be Boolean",
-            "message": "\"settings.metadata.useLiteralContent\" must be Boolean",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul/input.json b/test/cmdlineTests/standard_yul/input.json
deleted file mode 100644
index fb26c9751390..000000000000
--- a/test/cmdlineTests/standard_yul/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
deleted file mode 100644
index c1b22726fb84..000000000000
--- a/test/cmdlineTests/standard_yul/output.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":38:39   */
-  0x00
-    /* \"A\":11:19   */
-  dup1
-  dup1
-  mload
-    /* \"A\":27:36   */
-  add
-    /* \"A\":20:40   */
-  sstore
-    /* \"A\":0:42   */
-  stop
-",
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                },
-                "ir": "object \"object\" {
-    code {
-        let x := mload(0)
-        sstore(add(x, 0), 0)
-    }
-}
-",
-                "irOptimized": "object \"object\" {
-    code {
-        {
-            let x := mload(0)
-            sstore(add(x, 0), 0)
-        }
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
-                        "nativeSrc": "0:42:0",
-                        "nodeType": "YulBlock",
-                        "src": "0:42:0",
-                        "statements":
-                        [
-                            {
-                                "nativeSrc": "2:17:0",
-                                "nodeType": "YulVariableDeclaration",
-                                "src": "2:17:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "17:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "17:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "mload",
-                                        "nativeSrc": "11:5:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "11:5:0"
-                                    },
-                                    "nativeSrc": "11:8:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "11:8:0"
-                                },
-                                "variables":
-                                [
-                                    {
-                                        "name": "x",
-                                        "nativeSrc": "6:1:0",
-                                        "nodeType": "YulTypedName",
-                                        "src": "6:1:0",
-                                        "type": ""
-                                    }
-                                ]
-                            },
-                            {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "name": "x",
-                                                    "nativeSrc": "31:1:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "31:1:0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "34:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "34:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "add",
-                                                "nativeSrc": "27:3:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "27:3:0"
-                                            },
-                                            "nativeSrc": "27:9:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "27:9:0"
-                                        },
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "38:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "38:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "sstore",
-                                        "nativeSrc": "20:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "20:6:0"
-                                    },
-                                    "nativeSrc": "20:20:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "20:20:0"
-                                },
-                                "nativeSrc": "20:20:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "20:20:0"
-                            }
-                        ]
-                    },
-                    "nodeType": "YulCode"
-                },
-                "name": "object",
-                "nodeType": "YulObject",
-                "subObjects": []
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/args b/test/cmdlineTests/standard_yul_debug_info_print_all/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/input.json b/test/cmdlineTests/standard_yul_debug_info_print_all/input.json
deleted file mode 100644
index 1e6ed81a43a5..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"C": {"urls": ["standard_yul_debug_info_print_all/in.yul"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": ["*"]},
-		"outputSelection": {
-			"*": {"*": ["evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
deleted file mode 100644
index 9d675a06918d..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C_6_deployed":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"input.sol\":60:101   */
-  mstore(0x40, 0x80)
-  tag_2
-  tag_1
-  jump\t// in
-tag_2:
-  stop
-    /* \"input.sol\":77:99   */
-tag_1:
-  sstore(0x00, 0x2a)
-  jump\t// out
-"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/args b/test/cmdlineTests/standard_yul_debug_info_print_location_only/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/input.json b/test/cmdlineTests/standard_yul_debug_info_print_location_only/input.json
deleted file mode 100644
index 867bc6e705ff..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"C": {"urls": ["standard_yul_debug_info_print_location_only/in.yul"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": ["location"]},
-		"outputSelection": {
-			"*": {"*": ["evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
deleted file mode 100644
index 8cbbd326c71e..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C_6_deployed":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"input.sol\":60:101 */
-  mstore(0x40, 0x80)
-  tag_2
-  tag_1
-  jump\t// in
-tag_2:
-  stop
-    /* \"input.sol\":77:99 */
-tag_1:
-  sstore(0x00, 0x2a)
-  jump\t// out
-"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/args b/test/cmdlineTests/standard_yul_debug_info_print_none/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/input.json b/test/cmdlineTests/standard_yul_debug_info_print_none/input.json
deleted file mode 100644
index 705cf3879e4e..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"C": {"urls": ["standard_yul_debug_info_print_none/in.yul"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": []},
-		"outputSelection": {
-			"*": {"*": ["evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
deleted file mode 100644
index d1e4cff4cb3d..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "contracts":
-    {
-        "C":
-        {
-            "C_6_deployed":
-            {
-                "evm":
-                {
-                    "assembly": "  mstore(0x40, 0x80)
-  tag_2
-  tag_1
-  jump\t// in
-tag_2:
-  stop
-tag_1:
-  sstore(0x00, 0x2a)
-  jump\t// out
-"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/input.json b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/input.json
deleted file mode 100644
index ee247218f33e..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/input.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"C": {"urls": ["standard_yul_debug_info_print_snippet_only/in.yul"]}
-	},
-	"settings": {
-		"debug": {"debugInfo": ["snippet"]},
-		"outputSelection": {
-			"*": {"*": ["evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json
deleted file mode 100644
index fb7f199a75cf..000000000000
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "To use 'snippet' with settings.debug.debugInfo you must select also 'location'.",
-            "message": "To use 'snippet' with settings.debug.debugInfo you must select also 'location'.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul_embedded_object_name/input.json b/test/cmdlineTests/standard_yul_embedded_object_name/input.json
deleted file mode 100644
index 49761d2531f7..000000000000
--- a/test/cmdlineTests/standard_yul_embedded_object_name/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "object \"NamedObject\" { code { let x := dataoffset(\"DataName\") sstore(add(x, 0), 0) } data \"DataName\" \"abc\" object \"OtherObject\" { code { revert(0, 0) } } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"A": { "OtherObject": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_embedded_object_name/output.json b/test/cmdlineTests/standard_yul_embedded_object_name/output.json
deleted file mode 100644
index 2c63c0851048..000000000000
--- a/test/cmdlineTests/standard_yul_embedded_object_name/output.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/test/cmdlineTests/standard_yul_evm_version_byzantium/input.json b/test/cmdlineTests/standard_yul_evm_version_byzantium/input.json
deleted file mode 100644
index f51ffed84cc6..000000000000
--- a/test/cmdlineTests/standard_yul_evm_version_byzantium/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"input.yul": {"content": "{}"}
-	},
-	"settings": {
-		"evmVersion": "byzantium"
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json b/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
deleted file mode 100644
index 9fff562796b2..000000000000
--- a/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
-            "message": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul_evm_version_constantinople/input.json b/test/cmdlineTests/standard_yul_evm_version_constantinople/input.json
deleted file mode 100644
index 9b0043cfe753..000000000000
--- a/test/cmdlineTests/standard_yul_evm_version_constantinople/input.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"input.yul": {"content": "{}"}
-	},
-	"settings": {
-		"evmVersion": "constantinople"
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_evm_version_constantinople/output.json b/test/cmdlineTests/standard_yul_evm_version_constantinople/output.json
deleted file mode 100644
index 2c63c0851048..000000000000
--- a/test/cmdlineTests/standard_yul_evm_version_constantinople/output.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/test/cmdlineTests/standard_yul_immutable_references/input.json b/test/cmdlineTests/standard_yul_immutable_references/input.json
deleted file mode 100644
index aedbae8683d3..000000000000
--- a/test/cmdlineTests/standard_yul_immutable_references/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "object \"YulTest\" {  code {    let size := datasize(\"runtime\")    datacopy(0, dataoffset(\"runtime\"), size)    setimmutable(0, \"test\", 1)    return(0, size)  }  object \"runtime\" {    code {      mstore(0, loadimmutable(\"test\"))      return(0, 0x20)    }  }}"
-		}
-	},
-	"settings":
-	{
-		"outputSelection": {
-			"A": {
-				"*": [
-					"evm.deployedBytecode.immutableReferences",
-					"evm.bytecode",
-					"evm.deployedBytecode"
-				]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_immutable_references/output.json b/test/cmdlineTests/standard_yul_immutable_references/output.json
deleted file mode 100644
index 1f75e8ad20b1..000000000000
--- a/test/cmdlineTests/standard_yul_immutable_references/output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "YulTest":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    },
-                    "deployedBytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "immutableReferences":
-                        {
-                            "test":
-                            [
-                                {
-                                    "length": 32,
-                                    "start": 1
-                                }
-                            ]
-                        },
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_invalid_object_name/input.json b/test/cmdlineTests/standard_yul_invalid_object_name/input.json
deleted file mode 100644
index 715075310e7b..000000000000
--- a/test/cmdlineTests/standard_yul_invalid_object_name/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"A": { "OtherObject": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_invalid_object_name/output.json b/test/cmdlineTests/standard_yul_invalid_object_name/output.json
deleted file mode 100644
index 2c63c0851048..000000000000
--- a/test/cmdlineTests/standard_yul_invalid_object_name/output.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/test/cmdlineTests/standard_yul_multiple_files/input.json b/test/cmdlineTests/standard_yul_multiple_files/input.json
deleted file mode 100644
index d63a218f0c65..000000000000
--- a/test/cmdlineTests/standard_yul_multiple_files/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		},
-		"B":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_multiple_files/output.json b/test/cmdlineTests/standard_yul_multiple_files/output.json
deleted file mode 100644
index cdef28c267cf..000000000000
--- a/test/cmdlineTests/standard_yul_multiple_files/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Yul mode only supports exactly one input file.",
-            "message": "Yul mode only supports exactly one input file.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul_multiple_files_selected/input.json b/test/cmdlineTests/standard_yul_multiple_files_selected/input.json
deleted file mode 100644
index faf1ead488e8..000000000000
--- a/test/cmdlineTests/standard_yul_multiple_files_selected/input.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		},
-		"B":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"B": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_multiple_files_selected/output.json b/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
deleted file mode 100644
index cdef28c267cf..000000000000
--- a/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Yul mode only supports exactly one input file.",
-            "message": "Yul mode only supports exactly one input file.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul_object/input.json b/test/cmdlineTests/standard_yul_object/input.json
deleted file mode 100644
index 29391e84acb0..000000000000
--- a/test/cmdlineTests/standard_yul_object/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "object \"NamedObject\" { code { let x := dataoffset(\"DataName\") sstore(add(x, 0), 0) } data \"DataName\" \"abc\" }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
deleted file mode 100644
index 1404cd3aa7df..000000000000
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "NamedObject":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":80:81   */
-  0x00
-    /* \"A\":39:61   */
-  dup1
-  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-    /* \"A\":69:78   */
-  add
-    /* \"A\":62:82   */
-  sstore
-    /* \"A\":28:84   */
-  stop
-stop
-data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
-",
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                },
-                "ir": "object \"NamedObject\" {
-    code {
-        let x := dataoffset(\"DataName\")
-        sstore(add(x, 0), 0)
-    }
-    data \"DataName\" hex\"616263\"
-}
-",
-                "irOptimized": "object \"NamedObject\" {
-    code {
-        {
-            let x := dataoffset(\"DataName\")
-            sstore(add(x, 0), 0)
-        }
-    }
-    data \"DataName\" hex\"616263\"
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
-                        "nativeSrc": "28:56:0",
-                        "nodeType": "YulBlock",
-                        "src": "28:56:0",
-                        "statements":
-                        [
-                            {
-                                "nativeSrc": "30:31:0",
-                                "nodeType": "YulVariableDeclaration",
-                                "src": "30:31:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "hexValue": "446174614e616d65",
-                                            "kind": "string",
-                                            "nativeSrc": "50:10:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "50:10:0",
-                                            "type": "",
-                                            "value": "DataName"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "dataoffset",
-                                        "nativeSrc": "39:10:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "39:10:0"
-                                    },
-                                    "nativeSrc": "39:22:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "39:22:0"
-                                },
-                                "variables":
-                                [
-                                    {
-                                        "name": "x",
-                                        "nativeSrc": "34:1:0",
-                                        "nodeType": "YulTypedName",
-                                        "src": "34:1:0",
-                                        "type": ""
-                                    }
-                                ]
-                            },
-                            {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "name": "x",
-                                                    "nativeSrc": "73:1:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "73:1:0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "76:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "76:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "add",
-                                                "nativeSrc": "69:3:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "69:3:0"
-                                            },
-                                            "nativeSrc": "69:9:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "69:9:0"
-                                        },
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "80:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "80:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "sstore",
-                                        "nativeSrc": "62:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "62:6:0"
-                                    },
-                                    "nativeSrc": "62:20:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "62:20:0"
-                                },
-                                "nativeSrc": "62:20:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "62:20:0"
-                            }
-                        ]
-                    },
-                    "nodeType": "YulCode"
-                },
-                "name": "NamedObject",
-                "nodeType": "YulObject",
-                "subObjects":
-                [
-                    {
-                        "nodeType": "YulData",
-                        "value": "616263"
-                    }
-                ]
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_object_invalid_sub/input.json b/test/cmdlineTests/standard_yul_object_invalid_sub/input.json
deleted file mode 100644
index ccc142d254c1..000000000000
--- a/test/cmdlineTests/standard_yul_object_invalid_sub/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "object \"NamedObject\" { code { let x := dataoffset(\"NamedObject.\") sstore(add(x, 0), 0) } object \"OtherObject\" { code { revert(0, 0) } } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_yul_object_invalid_sub/output.json b/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
deleted file mode 100644
index 98522145a6e0..000000000000
--- a/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "TypeError: Unknown data object \"NamedObject.\".
- --> A:1:51:
-  |
-1 | object \"NamedObject\" { code { let x := dataoffset(\"NamedObject.\") sstore(add(x, 0), 0) } object \"OtherObject\" { code { revert(0, 0) } } }
-  |                                                   ^^^^^^^^^^^^^^
-
-",
-            "message": "Unknown data object \"NamedObject.\".",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 64,
-                "file": "A",
-                "start": 50
-            },
-            "type": "TypeError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul_object_name/input.json b/test/cmdlineTests/standard_yul_object_name/input.json
deleted file mode 100644
index ccc1db2d41b1..000000000000
--- a/test/cmdlineTests/standard_yul_object_name/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "object \"NamedObject\" { code { let x := dataoffset(\"DataName\") sstore(add(x, 0), 0) } data \"DataName\" \"abc\" object \"OtherObject\" { code { revert(0, 0) } } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"A": { "NamedObject": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
deleted file mode 100644
index 6803c322d194..000000000000
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "NamedObject":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":80:81   */
-  0x00
-    /* \"A\":39:61   */
-  dup1
-  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-    /* \"A\":69:78   */
-  add
-    /* \"A\":62:82   */
-  sstore
-    /* \"A\":28:84   */
-  stop
-stop
-data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
-
-sub_0: assembly {
-        /* \"A\":147:148   */
-      0x00
-        /* \"A\":137:149   */
-      dup1
-      revert
-}
-",
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    },
-                    "deployedBytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "immutableReferences": {},
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                },
-                "ir": "object \"NamedObject\" {
-    code {
-        let x := dataoffset(\"DataName\")
-        sstore(add(x, 0), 0)
-    }
-    data \"DataName\" hex\"616263\"
-    object \"OtherObject\" {
-        code { revert(0, 0) }
-    }
-}
-",
-                "irOptimized": "object \"NamedObject\" {
-    code {
-        {
-            let x := dataoffset(\"DataName\")
-            sstore(add(x, 0), 0)
-        }
-    }
-    data \"DataName\" hex\"616263\"
-    object \"OtherObject\" {
-        code { { revert(0, 0) } }
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
-                        "nativeSrc": "28:56:0",
-                        "nodeType": "YulBlock",
-                        "src": "28:56:0",
-                        "statements":
-                        [
-                            {
-                                "nativeSrc": "30:31:0",
-                                "nodeType": "YulVariableDeclaration",
-                                "src": "30:31:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "hexValue": "446174614e616d65",
-                                            "kind": "string",
-                                            "nativeSrc": "50:10:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "50:10:0",
-                                            "type": "",
-                                            "value": "DataName"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "dataoffset",
-                                        "nativeSrc": "39:10:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "39:10:0"
-                                    },
-                                    "nativeSrc": "39:22:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "39:22:0"
-                                },
-                                "variables":
-                                [
-                                    {
-                                        "name": "x",
-                                        "nativeSrc": "34:1:0",
-                                        "nodeType": "YulTypedName",
-                                        "src": "34:1:0",
-                                        "type": ""
-                                    }
-                                ]
-                            },
-                            {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "name": "x",
-                                                    "nativeSrc": "73:1:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "73:1:0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "76:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "76:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "add",
-                                                "nativeSrc": "69:3:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "69:3:0"
-                                            },
-                                            "nativeSrc": "69:9:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "69:9:0"
-                                        },
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "80:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "80:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "sstore",
-                                        "nativeSrc": "62:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "62:6:0"
-                                    },
-                                    "nativeSrc": "62:20:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "62:20:0"
-                                },
-                                "nativeSrc": "62:20:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "62:20:0"
-                            }
-                        ]
-                    },
-                    "nodeType": "YulCode"
-                },
-                "name": "NamedObject",
-                "nodeType": "YulObject",
-                "subObjects":
-                [
-                    {
-                        "nodeType": "YulData",
-                        "value": "616263"
-                    },
-                    {
-                        "code":
-                        {
-                            "block":
-                            {
-                                "nativeSrc": "135:16:0",
-                                "nodeType": "YulBlock",
-                                "src": "135:16:0",
-                                "statements":
-                                [
-                                    {
-                                        "expression":
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "144:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "144:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "147:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "147:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "revert",
-                                                "nativeSrc": "137:6:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "137:6:0"
-                                            },
-                                            "nativeSrc": "137:12:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "137:12:0"
-                                        },
-                                        "nativeSrc": "137:12:0",
-                                        "nodeType": "YulExpressionStatement",
-                                        "src": "137:12:0"
-                                    }
-                                ]
-                            },
-                            "nodeType": "YulCode"
-                        },
-                        "name": "OtherObject",
-                        "nodeType": "YulObject",
-                        "subObjects": []
-                    }
-                ]
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/input.json b/test/cmdlineTests/standard_yul_optimiserSteps/input.json
deleted file mode 100644
index 1015496f9364..000000000000
--- a/test/cmdlineTests/standard_yul_optimiserSteps/input.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true,
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"optimizerSteps": "dhfoDgvulfnTUtnIf"
-				}
-			}
-		},
-		"outputSelection":
-		{
-			"*": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
deleted file mode 100644
index 85a34261f02b..000000000000
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":38:39   */
-  0x00
-    /* \"A\":11:19   */
-  dup1
-  mload
-    /* \"A\":20:40   */
-  sstore
-    /* \"A\":0:42   */
-  stop
-",
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                },
-                "ir": "object \"object\" {
-    code {
-        let x := mload(0)
-        sstore(add(x, 0), 0)
-    }
-}
-",
-                "irOptimized": "object \"object\" {
-    code {
-        {
-            let x := mload(0)
-            sstore(add(x, 0), 0)
-        }
-    }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
-                        "nativeSrc": "0:42:0",
-                        "nodeType": "YulBlock",
-                        "src": "0:42:0",
-                        "statements":
-                        [
-                            {
-                                "nativeSrc": "2:17:0",
-                                "nodeType": "YulVariableDeclaration",
-                                "src": "2:17:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "17:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "17:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "mload",
-                                        "nativeSrc": "11:5:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "11:5:0"
-                                    },
-                                    "nativeSrc": "11:8:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "11:8:0"
-                                },
-                                "variables":
-                                [
-                                    {
-                                        "name": "x",
-                                        "nativeSrc": "6:1:0",
-                                        "nodeType": "YulTypedName",
-                                        "src": "6:1:0",
-                                        "type": ""
-                                    }
-                                ]
-                            },
-                            {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "name": "x",
-                                                    "nativeSrc": "31:1:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "31:1:0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "34:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "34:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "add",
-                                                "nativeSrc": "27:3:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "27:3:0"
-                                            },
-                                            "nativeSrc": "27:9:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "27:9:0"
-                                        },
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "38:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "38:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "sstore",
-                                        "nativeSrc": "20:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "20:6:0"
-                                    },
-                                    "nativeSrc": "20:20:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "20:20:0"
-                                },
-                                "nativeSrc": "20:20:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "20:20:0"
-                            }
-                        ]
-                    },
-                    "nodeType": "YulCode"
-                },
-                "name": "object",
-                "nodeType": "YulObject",
-                "subObjects": []
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_optimized/input.json b/test/cmdlineTests/standard_yul_optimized/input.json
deleted file mode 100644
index 97611e5fbc91..000000000000
--- a/test/cmdlineTests/standard_yul_optimized/input.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{ let x := mload(0) sstore(add(x, 0), 0) }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true,
-			"details": {
-				"yul": true
-			}
-		},
-		"outputSelection":
-		{
-			"*": { "*": ["*"], "": [ "*" ] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
deleted file mode 100644
index d580ef6ae01f..000000000000
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":17:18   */
-  0x00
-    /* \"A\":11:19   */
-  dup1
-  mload
-    /* \"A\":20:40   */
-  sstore
-    /* \"A\":0:42   */
-  stop
-",
-                    "bytecode":
-                    {
-                        "functionDebugData": {},
-                        "generatedSources": [],
-                        "linkReferences": {},
-                        "object": "<BYTECODE REMOVED>",
-                        "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>"
-                    }
-                },
-                "ir": "object \"object\" {
-    code {
-        let x := mload(0)
-        sstore(add(x, 0), 0)
-    }
-}
-",
-                "irOptimized": "object \"object\" {
-    code { { sstore(mload(0), 0) } }
-}
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
-                        "nativeSrc": "0:42:0",
-                        "nodeType": "YulBlock",
-                        "src": "0:42:0",
-                        "statements":
-                        [
-                            {
-                                "nativeSrc": "2:17:0",
-                                "nodeType": "YulVariableDeclaration",
-                                "src": "2:17:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "17:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "17:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "mload",
-                                        "nativeSrc": "11:5:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "11:5:0"
-                                    },
-                                    "nativeSrc": "11:8:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "11:8:0"
-                                },
-                                "variables":
-                                [
-                                    {
-                                        "name": "x",
-                                        "nativeSrc": "6:1:0",
-                                        "nodeType": "YulTypedName",
-                                        "src": "6:1:0",
-                                        "type": ""
-                                    }
-                                ]
-                            },
-                            {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
-                                        {
-                                            "arguments":
-                                            [
-                                                {
-                                                    "name": "x",
-                                                    "nativeSrc": "31:1:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "31:1:0"
-                                                },
-                                                {
-                                                    "kind": "number",
-                                                    "nativeSrc": "34:1:0",
-                                                    "nodeType": "YulLiteral",
-                                                    "src": "34:1:0",
-                                                    "type": "",
-                                                    "value": "0"
-                                                }
-                                            ],
-                                            "functionName":
-                                            {
-                                                "name": "add",
-                                                "nativeSrc": "27:3:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "27:3:0"
-                                            },
-                                            "nativeSrc": "27:9:0",
-                                            "nodeType": "YulFunctionCall",
-                                            "src": "27:9:0"
-                                        },
-                                        {
-                                            "kind": "number",
-                                            "nativeSrc": "38:1:0",
-                                            "nodeType": "YulLiteral",
-                                            "src": "38:1:0",
-                                            "type": "",
-                                            "value": "0"
-                                        }
-                                    ],
-                                    "functionName":
-                                    {
-                                        "name": "sstore",
-                                        "nativeSrc": "20:6:0",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "20:6:0"
-                                    },
-                                    "nativeSrc": "20:20:0",
-                                    "nodeType": "YulFunctionCall",
-                                    "src": "20:20:0"
-                                },
-                                "nativeSrc": "20:20:0",
-                                "nodeType": "YulExpressionStatement",
-                                "src": "20:20:0"
-                            }
-                        ]
-                    },
-                    "nodeType": "YulCode"
-                },
-                "name": "object",
-                "nodeType": "YulObject",
-                "subObjects": []
-            },
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_single_file_via_urls/args b/test/cmdlineTests/standard_yul_single_file_via_urls/args
deleted file mode 100644
index 18532c5a6d3f..000000000000
--- a/test/cmdlineTests/standard_yul_single_file_via_urls/args
+++ /dev/null
@@ -1 +0,0 @@
---allow-paths .
diff --git a/test/cmdlineTests/standard_yul_single_file_via_urls/input.json b/test/cmdlineTests/standard_yul_single_file_via_urls/input.json
deleted file mode 100644
index 0f4da43fc66d..000000000000
--- a/test/cmdlineTests/standard_yul_single_file_via_urls/input.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"language": "Yul",
-	"sources": {
-		"C": {"urls": ["in.yul"]}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_single_file_via_urls/output.json b/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
deleted file mode 100644
index a97057c88994..000000000000
--- a/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"in.yul\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"in.yul\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        },
-        {
-            "component": "general",
-            "formattedMessage": "Yul mode only supports exactly one input file.",
-            "message": "Yul mode only supports exactly one input file.",
-            "severity": "error",
-            "type": "JSONError"
-        }
-    ]
-}
diff --git a/test/cmdlineTests/standard_yul_stack_opt/input.json b/test/cmdlineTests/standard_yul_stack_opt/input.json
deleted file mode 100644
index 064fc2a8403f..000000000000
--- a/test/cmdlineTests/standard_yul_stack_opt/input.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{
-	{
-		let x := 1
-		sstore(0, x)
-	}
-	{
-		let y := 2
-		sstore(32, y)
-	}
-}"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": false,
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"stackAllocation": true,
-					"optimizerSteps": "c"
-				}
-			}
-		},
-		"outputSelection":
-		{
-			"*": {"*": ["evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_stack_opt/output.json b/test/cmdlineTests/standard_yul_stack_opt/output.json
deleted file mode 100644
index e10ef0c1724f..000000000000
--- a/test/cmdlineTests/standard_yul_stack_opt/output.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":16:17   */
-  0x01
-    /* \"A\":27:28   */
-  0x00
-    /* \"A\":20:32   */
-  sstore
-    /* \"A\":50:51   */
-  0x02
-    /* \"A\":61:63   */
-  0x20
-    /* \"A\":54:67   */
-  sstore
-    /* \"A\":0:72   */
-  stop
-"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/input.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/input.json
deleted file mode 100644
index 6ed532c7328d..000000000000
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/input.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"language": "Yul",
-	"sources":
-	{
-		"A":
-		{
-			"content": "{
-	{
-		let x := 1
-		sstore(0, x)
-	}
-	{
-		let y := 2
-		sstore(32, y)
-	}
-}"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": false,
-			"details": {
-				"yul": true,
-				"yulDetails": {
-					"stackAllocation": false,
-					"optimizerSteps": "c"
-				}
-			}
-		},
-		"outputSelection":
-		{
-			"*": {"*": ["evm.assembly"]}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
deleted file mode 100644
index 8d58cf320415..000000000000
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
-                    "assembly": "    /* \"A\":16:17   */
-  0x01
-    /* \"A\":27:28   */
-  0x00
-    /* \"A\":20:32   */
-  sstore
-    /* \"A\":50:51   */
-  0x02
-    /* \"A\":61:63   */
-  0x20
-    /* \"A\":54:67   */
-  sstore
-"
-                }
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/stdin/args b/test/cmdlineTests/stdin/args
deleted file mode 100644
index 39cdd0ded6df..000000000000
--- a/test/cmdlineTests/stdin/args
+++ /dev/null
@@ -1 +0,0 @@
--
diff --git a/test/cmdlineTests/stdin/stdin b/test/cmdlineTests/stdin/stdin
deleted file mode 100644
index f123f6c8bee3..000000000000
--- a/test/cmdlineTests/stdin/stdin
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {}
diff --git a/test/cmdlineTests/stop_after_parsing_abi/args b/test/cmdlineTests/stop_after_parsing_abi/args
deleted file mode 100644
index 9ec9f63e43f1..000000000000
--- a/test/cmdlineTests/stop_after_parsing_abi/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4 --stop-after parsing --abi
diff --git a/test/cmdlineTests/stop_after_parsing_abi/err b/test/cmdlineTests/stop_after_parsing_abi/err
deleted file mode 100644
index ae3fb5d0ac62..000000000000
--- a/test/cmdlineTests/stop_after_parsing_abi/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: The following options are mutually exclusive: --stop-after, --abi. Select at most one.
diff --git a/test/cmdlineTests/stop_after_parsing_abi/exit b/test/cmdlineTests/stop_after_parsing_abi/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/stop_after_parsing_abi/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/stop_after_parsing_abi/input.sol b/test/cmdlineTests/stop_after_parsing_abi/input.sol
deleted file mode 100644
index 978517b3c23f..000000000000
--- a/test/cmdlineTests/stop_after_parsing_abi/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-import "A";
-
-contract C {
-    function f() public {}
-}
diff --git a/test/cmdlineTests/stop_after_parsing_ast/args b/test/cmdlineTests/stop_after_parsing_ast/args
deleted file mode 100644
index 72df9974ab43..000000000000
--- a/test/cmdlineTests/stop_after_parsing_ast/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4 --stop-after parsing --ast-compact-json
diff --git a/test/cmdlineTests/stop_after_parsing_ast/input.sol b/test/cmdlineTests/stop_after_parsing_ast/input.sol
deleted file mode 100644
index e78a24ff786e..000000000000
--- a/test/cmdlineTests/stop_after_parsing_ast/input.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-import "A";
-
-contract C {}
diff --git a/test/cmdlineTests/stop_after_parsing_ast/output b/test/cmdlineTests/stop_after_parsing_ast/output
deleted file mode 100644
index 163941860401..000000000000
--- a/test/cmdlineTests/stop_after_parsing_ast/output
+++ /dev/null
@@ -1,48 +0,0 @@
-JSON AST (compact format):
-
-
-======= stop_after_parsing_ast/input.sol =======
-{
-    "absolutePath": "stop_after_parsing_ast/input.sol",
-    "id": 4,
-    "license": "GPL-3.0",
-    "nodeType": "SourceUnit",
-    "nodes":
-    [
-        {
-            "id": 1,
-            "literals":
-            [
-                "solidity",
-                "*"
-            ],
-            "nodeType": "PragmaDirective",
-            "src": "36:18:0"
-        },
-        {
-            "absolutePath": "A",
-            "file": "A",
-            "id": 2,
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "ImportDirective",
-            "src": "56:11:0",
-            "symbolAliases": [],
-            "unitAlias": ""
-        },
-        {
-            "abstract": false,
-            "baseContracts": [],
-            "contractDependencies": [],
-            "contractKind": "contract",
-            "id": 3,
-            "name": "C",
-            "nameLocation": "78:1:0",
-            "nodeType": "ContractDefinition",
-            "nodes": [],
-            "src": "69:13:0",
-            "usedErrors": [],
-            "usedEvents": []
-        }
-    ],
-    "src": "36:47:0"
-}
diff --git a/test/cmdlineTests/storage_layout_bytes/input.json b/test/cmdlineTests/storage_layout_bytes/input.json
deleted file mode 100644
index 711527f00fdd..000000000000
--- a/test/cmdlineTests/storage_layout_bytes/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { bytes s1 = \"test\"; bytes s2; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_bytes/output.json b/test/cmdlineTests/storage_layout_bytes/output.json
deleted file mode 100644
index c2ca7813c672..000000000000
--- a/test/cmdlineTests/storage_layout_bytes/output.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 4,
-                            "contract": "fileA:A",
-                            "label": "s1",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_bytes_storage"
-                        },
-                        {
-                            "astId": 6,
-                            "contract": "fileA:A",
-                            "label": "s2",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_bytes_storage"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_bytes_storage":
-                        {
-                            "encoding": "bytes",
-                            "label": "bytes",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_dyn_array/input.json b/test/cmdlineTests/storage_layout_dyn_array/input.json
deleted file mode 100644
index d334360573f8..000000000000
--- a/test/cmdlineTests/storage_layout_dyn_array/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { uint[] array1; bool[] array2; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_dyn_array/output.json b/test/cmdlineTests/storage_layout_dyn_array/output.json
deleted file mode 100644
index fa7ed04bad1b..000000000000
--- a/test/cmdlineTests/storage_layout_dyn_array/output.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 4,
-                            "contract": "fileA:A",
-                            "label": "array1",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_array(t_uint256)dyn_storage"
-                        },
-                        {
-                            "astId": 7,
-                            "contract": "fileA:A",
-                            "label": "array2",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_array(t_bool)dyn_storage"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_array(t_bool)dyn_storage":
-                        {
-                            "base": "t_bool",
-                            "encoding": "dynamic_array",
-                            "label": "bool[]",
-                            "numberOfBytes": "32"
-                        },
-                        "t_array(t_uint256)dyn_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "dynamic_array",
-                            "label": "uint256[]",
-                            "numberOfBytes": "32"
-                        },
-                        "t_bool":
-                        {
-                            "encoding": "inplace",
-                            "label": "bool",
-                            "numberOfBytes": "1"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_many/input.json b/test/cmdlineTests/storage_layout_many/input.json
deleted file mode 100644
index 6424f189ce53..000000000000
--- a/test/cmdlineTests/storage_layout_many/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { struct S { uint128 a; uint128 b; uint[2] staticArray; uint[] dynArray; } uint x; uint y; S s; address addr; mapping (uint => mapping (address => bool)) map; uint[] array; string s1; bytes b1; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_many/output.json b/test/cmdlineTests/storage_layout_many/output.json
deleted file mode 100644
index 68cb00682477..000000000000
--- a/test/cmdlineTests/storage_layout_many/output.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 15,
-                            "contract": "fileA:A",
-                            "label": "x",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 17,
-                            "contract": "fileA:A",
-                            "label": "y",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 20,
-                            "contract": "fileA:A",
-                            "label": "s",
-                            "offset": 0,
-                            "slot": "2",
-                            "type": "t_struct(S)13_storage"
-                        },
-                        {
-                            "astId": 22,
-                            "contract": "fileA:A",
-                            "label": "addr",
-                            "offset": 0,
-                            "slot": "6",
-                            "type": "t_address"
-                        },
-                        {
-                            "astId": 28,
-                            "contract": "fileA:A",
-                            "label": "map",
-                            "offset": 0,
-                            "slot": "7",
-                            "type": "t_mapping(t_uint256,t_mapping(t_address,t_bool))"
-                        },
-                        {
-                            "astId": 31,
-                            "contract": "fileA:A",
-                            "label": "array",
-                            "offset": 0,
-                            "slot": "8",
-                            "type": "t_array(t_uint256)dyn_storage"
-                        },
-                        {
-                            "astId": 33,
-                            "contract": "fileA:A",
-                            "label": "s1",
-                            "offset": 0,
-                            "slot": "9",
-                            "type": "t_string_storage"
-                        },
-                        {
-                            "astId": 35,
-                            "contract": "fileA:A",
-                            "label": "b1",
-                            "offset": 0,
-                            "slot": "10",
-                            "type": "t_bytes_storage"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_address":
-                        {
-                            "encoding": "inplace",
-                            "label": "address",
-                            "numberOfBytes": "20"
-                        },
-                        "t_array(t_uint256)2_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "inplace",
-                            "label": "uint256[2]",
-                            "numberOfBytes": "64"
-                        },
-                        "t_array(t_uint256)dyn_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "dynamic_array",
-                            "label": "uint256[]",
-                            "numberOfBytes": "32"
-                        },
-                        "t_bool":
-                        {
-                            "encoding": "inplace",
-                            "label": "bool",
-                            "numberOfBytes": "1"
-                        },
-                        "t_bytes_storage":
-                        {
-                            "encoding": "bytes",
-                            "label": "bytes",
-                            "numberOfBytes": "32"
-                        },
-                        "t_mapping(t_address,t_bool)":
-                        {
-                            "encoding": "mapping",
-                            "key": "t_address",
-                            "label": "mapping(address => bool)",
-                            "numberOfBytes": "32",
-                            "value": "t_bool"
-                        },
-                        "t_mapping(t_uint256,t_mapping(t_address,t_bool))":
-                        {
-                            "encoding": "mapping",
-                            "key": "t_uint256",
-                            "label": "mapping(uint256 => mapping(address => bool))",
-                            "numberOfBytes": "32",
-                            "value": "t_mapping(t_address,t_bool)"
-                        },
-                        "t_string_storage":
-                        {
-                            "encoding": "bytes",
-                            "label": "string",
-                            "numberOfBytes": "32"
-                        },
-                        "t_struct(S)13_storage":
-                        {
-                            "encoding": "inplace",
-                            "label": "struct A.S",
-                            "members":
-                            [
-                                {
-                                    "astId": 3,
-                                    "contract": "fileA:A",
-                                    "label": "a",
-                                    "offset": 0,
-                                    "slot": "0",
-                                    "type": "t_uint128"
-                                },
-                                {
-                                    "astId": 5,
-                                    "contract": "fileA:A",
-                                    "label": "b",
-                                    "offset": 16,
-                                    "slot": "0",
-                                    "type": "t_uint128"
-                                },
-                                {
-                                    "astId": 9,
-                                    "contract": "fileA:A",
-                                    "label": "staticArray",
-                                    "offset": 0,
-                                    "slot": "1",
-                                    "type": "t_array(t_uint256)2_storage"
-                                },
-                                {
-                                    "astId": 12,
-                                    "contract": "fileA:A",
-                                    "label": "dynArray",
-                                    "offset": 0,
-                                    "slot": "3",
-                                    "type": "t_array(t_uint256)dyn_storage"
-                                }
-                            ],
-                            "numberOfBytes": "128"
-                        },
-                        "t_uint128":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint128",
-                            "numberOfBytes": "16"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_mapping/input.json b/test/cmdlineTests/storage_layout_mapping/input.json
deleted file mode 100644
index 21787fe99d29..000000000000
--- a/test/cmdlineTests/storage_layout_mapping/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { uint x; uint y; mapping (uint => mapping (address => bool)) map; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_mapping/output.json b/test/cmdlineTests/storage_layout_mapping/output.json
deleted file mode 100644
index 8d13fb34b45d..000000000000
--- a/test/cmdlineTests/storage_layout_mapping/output.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 3,
-                            "contract": "fileA:A",
-                            "label": "x",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 5,
-                            "contract": "fileA:A",
-                            "label": "y",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 11,
-                            "contract": "fileA:A",
-                            "label": "map",
-                            "offset": 0,
-                            "slot": "2",
-                            "type": "t_mapping(t_uint256,t_mapping(t_address,t_bool))"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_address":
-                        {
-                            "encoding": "inplace",
-                            "label": "address",
-                            "numberOfBytes": "20"
-                        },
-                        "t_bool":
-                        {
-                            "encoding": "inplace",
-                            "label": "bool",
-                            "numberOfBytes": "1"
-                        },
-                        "t_mapping(t_address,t_bool)":
-                        {
-                            "encoding": "mapping",
-                            "key": "t_address",
-                            "label": "mapping(address => bool)",
-                            "numberOfBytes": "32",
-                            "value": "t_bool"
-                        },
-                        "t_mapping(t_uint256,t_mapping(t_address,t_bool))":
-                        {
-                            "encoding": "mapping",
-                            "key": "t_uint256",
-                            "label": "mapping(uint256 => mapping(address => bool))",
-                            "numberOfBytes": "32",
-                            "value": "t_mapping(t_address,t_bool)"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_smoke/input.json b/test/cmdlineTests/storage_layout_smoke/input.json
deleted file mode 100644
index 5980e6115be7..000000000000
--- a/test/cmdlineTests/storage_layout_smoke/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_smoke/output.json b/test/cmdlineTests/storage_layout_smoke/output.json
deleted file mode 100644
index 9fe46bb673c5..000000000000
--- a/test/cmdlineTests/storage_layout_smoke/output.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage": [],
-                    "types": null
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_smoke_two_contracts/input.json b/test/cmdlineTests/storage_layout_smoke_two_contracts/input.json
deleted file mode 100644
index b7309612b13a..000000000000
--- a/test/cmdlineTests/storage_layout_smoke_two_contracts/input.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
-		},
-		"fileB": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { uint x; uint y; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json b/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
deleted file mode 100644
index fc4e422a5e72..000000000000
--- a/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage": [],
-                    "types": null
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        },
-        "fileB":
-        {
-            "id": 1
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_string/input.json b/test/cmdlineTests/storage_layout_string/input.json
deleted file mode 100644
index d14a71d87639..000000000000
--- a/test/cmdlineTests/storage_layout_string/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { string s1 = \"test\"; string s2; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_string/output.json b/test/cmdlineTests/storage_layout_string/output.json
deleted file mode 100644
index 20c6f64ccd3a..000000000000
--- a/test/cmdlineTests/storage_layout_string/output.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 4,
-                            "contract": "fileA:A",
-                            "label": "s1",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_string_storage"
-                        },
-                        {
-                            "astId": 6,
-                            "contract": "fileA:A",
-                            "label": "s2",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_string_storage"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_string_storage":
-                        {
-                            "encoding": "bytes",
-                            "label": "string",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_struct/input.json b/test/cmdlineTests/storage_layout_struct/input.json
deleted file mode 100644
index a392cd9e53da..000000000000
--- a/test/cmdlineTests/storage_layout_struct/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { struct S { uint a; uint b; uint[2] staticArray; uint[] dynArray; } uint x; uint y; S s; address addr; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_struct/output.json b/test/cmdlineTests/storage_layout_struct/output.json
deleted file mode 100644
index f682d9634a3d..000000000000
--- a/test/cmdlineTests/storage_layout_struct/output.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 15,
-                            "contract": "fileA:A",
-                            "label": "x",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 17,
-                            "contract": "fileA:A",
-                            "label": "y",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 20,
-                            "contract": "fileA:A",
-                            "label": "s",
-                            "offset": 0,
-                            "slot": "2",
-                            "type": "t_struct(S)13_storage"
-                        },
-                        {
-                            "astId": 22,
-                            "contract": "fileA:A",
-                            "label": "addr",
-                            "offset": 0,
-                            "slot": "7",
-                            "type": "t_address"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_address":
-                        {
-                            "encoding": "inplace",
-                            "label": "address",
-                            "numberOfBytes": "20"
-                        },
-                        "t_array(t_uint256)2_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "inplace",
-                            "label": "uint256[2]",
-                            "numberOfBytes": "64"
-                        },
-                        "t_array(t_uint256)dyn_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "dynamic_array",
-                            "label": "uint256[]",
-                            "numberOfBytes": "32"
-                        },
-                        "t_struct(S)13_storage":
-                        {
-                            "encoding": "inplace",
-                            "label": "struct A.S",
-                            "members":
-                            [
-                                {
-                                    "astId": 3,
-                                    "contract": "fileA:A",
-                                    "label": "a",
-                                    "offset": 0,
-                                    "slot": "0",
-                                    "type": "t_uint256"
-                                },
-                                {
-                                    "astId": 5,
-                                    "contract": "fileA:A",
-                                    "label": "b",
-                                    "offset": 0,
-                                    "slot": "1",
-                                    "type": "t_uint256"
-                                },
-                                {
-                                    "astId": 9,
-                                    "contract": "fileA:A",
-                                    "label": "staticArray",
-                                    "offset": 0,
-                                    "slot": "2",
-                                    "type": "t_array(t_uint256)2_storage"
-                                },
-                                {
-                                    "astId": 12,
-                                    "contract": "fileA:A",
-                                    "label": "dynArray",
-                                    "offset": 0,
-                                    "slot": "4",
-                                    "type": "t_array(t_uint256)dyn_storage"
-                                }
-                            ],
-                            "numberOfBytes": "160"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_struct_packed/input.json b/test/cmdlineTests/storage_layout_struct_packed/input.json
deleted file mode 100644
index 32be56207775..000000000000
--- a/test/cmdlineTests/storage_layout_struct_packed/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { struct S { uint128 a; uint128 b; uint[2] staticArray; uint[] dynArray; } uint x; uint y; S s; address addr; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_struct_packed/output.json b/test/cmdlineTests/storage_layout_struct_packed/output.json
deleted file mode 100644
index 7731bd2230d3..000000000000
--- a/test/cmdlineTests/storage_layout_struct_packed/output.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 15,
-                            "contract": "fileA:A",
-                            "label": "x",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 17,
-                            "contract": "fileA:A",
-                            "label": "y",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 20,
-                            "contract": "fileA:A",
-                            "label": "s",
-                            "offset": 0,
-                            "slot": "2",
-                            "type": "t_struct(S)13_storage"
-                        },
-                        {
-                            "astId": 22,
-                            "contract": "fileA:A",
-                            "label": "addr",
-                            "offset": 0,
-                            "slot": "6",
-                            "type": "t_address"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_address":
-                        {
-                            "encoding": "inplace",
-                            "label": "address",
-                            "numberOfBytes": "20"
-                        },
-                        "t_array(t_uint256)2_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "inplace",
-                            "label": "uint256[2]",
-                            "numberOfBytes": "64"
-                        },
-                        "t_array(t_uint256)dyn_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "dynamic_array",
-                            "label": "uint256[]",
-                            "numberOfBytes": "32"
-                        },
-                        "t_struct(S)13_storage":
-                        {
-                            "encoding": "inplace",
-                            "label": "struct A.S",
-                            "members":
-                            [
-                                {
-                                    "astId": 3,
-                                    "contract": "fileA:A",
-                                    "label": "a",
-                                    "offset": 0,
-                                    "slot": "0",
-                                    "type": "t_uint128"
-                                },
-                                {
-                                    "astId": 5,
-                                    "contract": "fileA:A",
-                                    "label": "b",
-                                    "offset": 16,
-                                    "slot": "0",
-                                    "type": "t_uint128"
-                                },
-                                {
-                                    "astId": 9,
-                                    "contract": "fileA:A",
-                                    "label": "staticArray",
-                                    "offset": 0,
-                                    "slot": "1",
-                                    "type": "t_array(t_uint256)2_storage"
-                                },
-                                {
-                                    "astId": 12,
-                                    "contract": "fileA:A",
-                                    "label": "dynArray",
-                                    "offset": 0,
-                                    "slot": "3",
-                                    "type": "t_array(t_uint256)dyn_storage"
-                                }
-                            ],
-                            "numberOfBytes": "128"
-                        },
-                        "t_uint128":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint128",
-                            "numberOfBytes": "16"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_user_defined/args b/test/cmdlineTests/storage_layout_user_defined/args
deleted file mode 100644
index 0538465fe7bc..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined/args
+++ /dev/null
@@ -1 +0,0 @@
---storage-layout --pretty-json
diff --git a/test/cmdlineTests/storage_layout_user_defined/err b/test/cmdlineTests/storage_layout_user_defined/err
deleted file mode 100644
index a9b5f07b19a0..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined/err
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: Source file does not specify required compiler version!
---> storage_layout_user_defined/input.sol
diff --git a/test/cmdlineTests/storage_layout_user_defined/input.sol b/test/cmdlineTests/storage_layout_user_defined/input.sol
deleted file mode 100644
index f070200811a9..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL v3
-type MyInt128 is int128;
-type MyInt8 is int8;
-contract C {
-    // slot 0
-    MyInt128 a;
-    MyInt128 b;
-    // slot 1
-    MyInt128 c;
-    MyInt8 d;
-    MyInt8 e;
-    MyInt8 f;
-    MyInt8 g;
-    // slot 2
-    MyInt8 h;
-}
diff --git a/test/cmdlineTests/storage_layout_user_defined/output b/test/cmdlineTests/storage_layout_user_defined/output
deleted file mode 100644
index f79b8413e664..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined/output
+++ /dev/null
@@ -1,87 +0,0 @@
-
-======= storage_layout_user_defined/input.sol:C =======
-Contract Storage Layout:
-{
-  "storage":
-  [
-    {
-      "astId": 7,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "a",
-      "offset": 0,
-      "slot": "0",
-      "type": "t_userDefinedValueType(MyInt128)2"
-    },
-    {
-      "astId": 10,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "b",
-      "offset": 16,
-      "slot": "0",
-      "type": "t_userDefinedValueType(MyInt128)2"
-    },
-    {
-      "astId": 13,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "c",
-      "offset": 0,
-      "slot": "1",
-      "type": "t_userDefinedValueType(MyInt128)2"
-    },
-    {
-      "astId": 16,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "d",
-      "offset": 16,
-      "slot": "1",
-      "type": "t_userDefinedValueType(MyInt8)4"
-    },
-    {
-      "astId": 19,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "e",
-      "offset": 17,
-      "slot": "1",
-      "type": "t_userDefinedValueType(MyInt8)4"
-    },
-    {
-      "astId": 22,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "f",
-      "offset": 18,
-      "slot": "1",
-      "type": "t_userDefinedValueType(MyInt8)4"
-    },
-    {
-      "astId": 25,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "g",
-      "offset": 19,
-      "slot": "1",
-      "type": "t_userDefinedValueType(MyInt8)4"
-    },
-    {
-      "astId": 28,
-      "contract": "storage_layout_user_defined/input.sol:C",
-      "label": "h",
-      "offset": 20,
-      "slot": "1",
-      "type": "t_userDefinedValueType(MyInt8)4"
-    }
-  ],
-  "types":
-  {
-    "t_userDefinedValueType(MyInt128)2":
-    {
-      "encoding": "inplace",
-      "label": "MyInt128",
-      "numberOfBytes": "16"
-    },
-    "t_userDefinedValueType(MyInt8)4":
-    {
-      "encoding": "inplace",
-      "label": "MyInt8",
-      "numberOfBytes": "1"
-    }
-  }
-}
diff --git a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args
deleted file mode 100644
index f69ac4e39ccb..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args
+++ /dev/null
@@ -1 +0,0 @@
---storage-layout
diff --git a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol
deleted file mode 100644
index c80f7c736698..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL v3
-pragma solidity >=0.0;
-
-contract C {}
diff --git a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output
deleted file mode 100644
index 1be4da0b6ee9..000000000000
--- a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output
+++ /dev/null
@@ -1,4 +0,0 @@
-
-======= storage_layout_user_defined_no_pretty_print/input.sol:C =======
-Contract Storage Layout:
-{"storage":[]}
diff --git a/test/cmdlineTests/storage_layout_value_types/input.json b/test/cmdlineTests/storage_layout_value_types/input.json
deleted file mode 100644
index 96335f45c427..000000000000
--- a/test/cmdlineTests/storage_layout_value_types/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { uint x; uint y; address addr; uint[2] array; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_value_types/output.json b/test/cmdlineTests/storage_layout_value_types/output.json
deleted file mode 100644
index 10fbd762b5d2..000000000000
--- a/test/cmdlineTests/storage_layout_value_types/output.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 3,
-                            "contract": "fileA:A",
-                            "label": "x",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 5,
-                            "contract": "fileA:A",
-                            "label": "y",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_uint256"
-                        },
-                        {
-                            "astId": 7,
-                            "contract": "fileA:A",
-                            "label": "addr",
-                            "offset": 0,
-                            "slot": "2",
-                            "type": "t_address"
-                        },
-                        {
-                            "astId": 11,
-                            "contract": "fileA:A",
-                            "label": "array",
-                            "offset": 0,
-                            "slot": "3",
-                            "type": "t_array(t_uint256)2_storage"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_address":
-                        {
-                            "encoding": "inplace",
-                            "label": "address",
-                            "numberOfBytes": "20"
-                        },
-                        "t_array(t_uint256)2_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "inplace",
-                            "label": "uint256[2]",
-                            "numberOfBytes": "64"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/storage_layout_value_types_packed/input.json b/test/cmdlineTests/storage_layout_value_types_packed/input.json
deleted file mode 100644
index a16ddb5625f3..000000000000
--- a/test/cmdlineTests/storage_layout_value_types_packed/input.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { uint64 x; uint128 y; uint128 z; address addr; uint[2] array; }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "storageLayout" ],
-				"": [ "storageLayout" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/storage_layout_value_types_packed/output.json b/test/cmdlineTests/storage_layout_value_types_packed/output.json
deleted file mode 100644
index eefb69e667e4..000000000000
--- a/test/cmdlineTests/storage_layout_value_types_packed/output.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
-                        {
-                            "astId": 3,
-                            "contract": "fileA:A",
-                            "label": "x",
-                            "offset": 0,
-                            "slot": "0",
-                            "type": "t_uint64"
-                        },
-                        {
-                            "astId": 5,
-                            "contract": "fileA:A",
-                            "label": "y",
-                            "offset": 8,
-                            "slot": "0",
-                            "type": "t_uint128"
-                        },
-                        {
-                            "astId": 7,
-                            "contract": "fileA:A",
-                            "label": "z",
-                            "offset": 0,
-                            "slot": "1",
-                            "type": "t_uint128"
-                        },
-                        {
-                            "astId": 9,
-                            "contract": "fileA:A",
-                            "label": "addr",
-                            "offset": 0,
-                            "slot": "2",
-                            "type": "t_address"
-                        },
-                        {
-                            "astId": 13,
-                            "contract": "fileA:A",
-                            "label": "array",
-                            "offset": 0,
-                            "slot": "3",
-                            "type": "t_array(t_uint256)2_storage"
-                        }
-                    ],
-                    "types":
-                    {
-                        "t_address":
-                        {
-                            "encoding": "inplace",
-                            "label": "address",
-                            "numberOfBytes": "20"
-                        },
-                        "t_array(t_uint256)2_storage":
-                        {
-                            "base": "t_uint256",
-                            "encoding": "inplace",
-                            "label": "uint256[2]",
-                            "numberOfBytes": "64"
-                        },
-                        "t_uint128":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint128",
-                            "numberOfBytes": "16"
-                        },
-                        "t_uint256":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint256",
-                            "numberOfBytes": "32"
-                        },
-                        "t_uint64":
-                        {
-                            "encoding": "inplace",
-                            "label": "uint64",
-                            "numberOfBytes": "8"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "fileA":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/args b/test/cmdlineTests/strict_asm_ast_compact_json/args
deleted file mode 100644
index 091ceb769aa2..000000000000
--- a/test/cmdlineTests/strict_asm_ast_compact_json/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --ast-compact-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/input.yul b/test/cmdlineTests/strict_asm_ast_compact_json/input.yul
deleted file mode 100644
index 6d1ebe21b989..000000000000
--- a/test/cmdlineTests/strict_asm_ast_compact_json/input.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/output b/test/cmdlineTests/strict_asm_ast_compact_json/output
deleted file mode 100644
index 98afddcfa9d7..000000000000
--- a/test/cmdlineTests/strict_asm_ast_compact_json/output
+++ /dev/null
@@ -1,67 +0,0 @@
-
-======= strict_asm_ast_compact_json/input.yul (EVM) =======
-AST:
-
-{
-    "code":
-    {
-        "block":
-        {
-            "nativeSrc": "60:246:0",
-            "nodeType": "YulBlock",
-            "src": "-1:-1:0",
-            "statements":
-            [
-                {
-                    "nativeSrc": "60:246:0",
-                    "nodeType": "YulBlock",
-                    "src": "-1:-1:0",
-                    "statements":
-                    [
-                        {
-                            "expression":
-                            {
-                                "arguments":
-                                [
-                                    {
-                                        "kind": "number",
-                                        "nativeSrc": "122:2:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:41:0",
-                                        "type": "",
-                                        "value": "64"
-                                    },
-                                    {
-                                        "kind": "number",
-                                        "nativeSrc": "126:3:0",
-                                        "nodeType": "YulLiteral",
-                                        "src": "60:41:0",
-                                        "type": "",
-                                        "value": "128"
-                                    }
-                                ],
-                                "functionName":
-                                {
-                                    "name": "mstore",
-                                    "nativeSrc": "115:6:0",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "60:41:0"
-                                },
-                                "nativeSrc": "115:15:0",
-                                "nodeType": "YulFunctionCall",
-                                "src": "60:41:0"
-                            },
-                            "nativeSrc": "115:15:0",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "60:41:0"
-                        }
-                    ]
-                }
-            ]
-        },
-        "nodeType": "YulCode"
-    },
-    "name": "C_6_deployed",
-    "nodeType": "YulObject",
-    "subObjects": []
-}
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/args b/test/cmdlineTests/strict_asm_debug_info_print_all/args
deleted file mode 100644
index cfe8a15a2c7f..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info all
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/output b/test/cmdlineTests/strict_asm_debug_info_print_all/output
deleted file mode 100644
index 0e58baf578e6..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/output
+++ /dev/null
@@ -1,34 +0,0 @@
-
-======= strict_asm_debug_info_print_all/input.yul (EVM) =======
-
-Pretty printed source:
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        {
-            /// @src 0:60:101
-            mstore(64, 128)
-            fun_f()
-        }
-        /// @src 0:77:99
-        function fun_f()
-        { sstore(0, 42) }
-    }
-}
-
-
-Binary representation:
-6080604052600a600c565b005b602a5f5556
-
-Text representation:
-    /* "input.sol":60:101   */
-  mstore(0x40, 0x80)
-  tag_2
-  tag_1
-  jump	// in
-tag_2:
-  stop
-    /* "input.sol":77:99   */
-tag_1:
-  sstore(0x00, 0x2a)
-  jump	// out
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/args b/test/cmdlineTests/strict_asm_debug_info_print_location_only/args
deleted file mode 100644
index 0d6ad325bb9e..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info location
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/output b/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
deleted file mode 100644
index 17d2f50e2e15..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
+++ /dev/null
@@ -1,34 +0,0 @@
-
-======= strict_asm_debug_info_print_location_only/input.yul (EVM) =======
-
-Pretty printed source:
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        {
-            /// @src 0:60:101
-            mstore(64, 128)
-            fun_f()
-        }
-        /// @src 0:77:99
-        function fun_f()
-        { sstore(0, 42) }
-    }
-}
-
-
-Binary representation:
-6080604052600a600c565b005b602a5f5556
-
-Text representation:
-    /* "input.sol":60:101 */
-  mstore(0x40, 0x80)
-  tag_2
-  tag_1
-  jump	// in
-tag_2:
-  stop
-    /* "input.sol":77:99 */
-tag_1:
-  sstore(0x00, 0x2a)
-  jump	// out
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/args b/test/cmdlineTests/strict_asm_debug_info_print_none/args
deleted file mode 100644
index 7e891dd86b95..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info none
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/output b/test/cmdlineTests/strict_asm_debug_info_print_none/output
deleted file mode 100644
index 51f779490ab7..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/output
+++ /dev/null
@@ -1,30 +0,0 @@
-
-======= strict_asm_debug_info_print_none/input.yul (EVM) =======
-
-Pretty printed source:
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        {
-            mstore(64, 128)
-            fun_f()
-        }
-        function fun_f()
-        { sstore(0, 42) }
-    }
-}
-
-
-Binary representation:
-6080604052600a600c565b005b602a5f5556
-
-Text representation:
-  mstore(0x40, 0x80)
-  tag_2
-  tag_1
-  jump	// in
-tag_2:
-  stop
-tag_1:
-  sstore(0x00, 0x2a)
-  jump	// out
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/args b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/args
deleted file mode 100644
index 362fd65151d8..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info snippet
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err
deleted file mode 100644
index e4abc6129d0f..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: To use 'snippet' with --debug-info you must select also 'location'.
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/exit b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul
deleted file mode 100644
index aa564d00ce86..000000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C_6_deployed" {
-    code {
-        /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
-
-        // f()
-        fun_f_5()
-
-        /// @src 0:77:99  "function f() public {}"
-        function fun_f_5() {
-            sstore(0, 42)
-        }
-        /// @src 0:60:101  "contract C {..."
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/args b/test/cmdlineTests/strict_asm_evm_version_byzantium/args
deleted file mode 100644
index 468f02fa7730..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_byzantium/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --evm-version byzantium
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/err b/test/cmdlineTests/strict_asm_evm_version_byzantium/err
deleted file mode 100644
index 603b329dc23e..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_byzantium/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Support for EVM versions older than constantinople is deprecated and will be removed in the future.
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul b/test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul
deleted file mode 100644
index 0967ef424bce..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/output b/test/cmdlineTests/strict_asm_evm_version_byzantium/output
deleted file mode 100644
index 3a23390a4039..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_byzantium/output
+++ /dev/null
@@ -1,15 +0,0 @@
-
-======= strict_asm_evm_version_byzantium/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code { { } }
-}
-
-
-Binary representation:
-00
-
-Text representation:
-    /* "strict_asm_evm_version_byzantium/input.yul":0:2   */
-  stop
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/args b/test/cmdlineTests/strict_asm_evm_version_constantinople/args
deleted file mode 100644
index a59b0eb0b3b7..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_constantinople/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --evm-version constantinople
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul b/test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul
deleted file mode 100644
index 0967ef424bce..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/output b/test/cmdlineTests/strict_asm_evm_version_constantinople/output
deleted file mode 100644
index c8febd6f1757..000000000000
--- a/test/cmdlineTests/strict_asm_evm_version_constantinople/output
+++ /dev/null
@@ -1,15 +0,0 @@
-
-======= strict_asm_evm_version_constantinople/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code { { } }
-}
-
-
-Binary representation:
-00
-
-Text representation:
-    /* "strict_asm_evm_version_constantinople/input.yul":0:2   */
-  stop
diff --git a/test/cmdlineTests/strict_asm_invalid_option_output_dir/args b/test/cmdlineTests/strict_asm_invalid_option_output_dir/args
deleted file mode 100644
index ba341ccc5de8..000000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_output_dir/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --output-dir /tmp/
diff --git a/test/cmdlineTests/strict_asm_invalid_option_output_dir/err b/test/cmdlineTests/strict_asm_invalid_option_output_dir/err
deleted file mode 100644
index 2aa3fd766dba..000000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_output_dir/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: The following options are invalid in assembly mode: --output-dir.
diff --git a/test/cmdlineTests/strict_asm_invalid_option_output_dir/exit b/test/cmdlineTests/strict_asm_invalid_option_output_dir/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_output_dir/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_invalid_option_output_dir/input.yul b/test/cmdlineTests/strict_asm_invalid_option_output_dir/input.yul
deleted file mode 100644
index f21cd2b7e038..000000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_output_dir/input.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    sstore(0, 1)
-}
diff --git a/test/cmdlineTests/strict_asm_jump/args b/test/cmdlineTests/strict_asm_jump/args
deleted file mode 100644
index e1e6ff62e9ec..000000000000
--- a/test/cmdlineTests/strict_asm_jump/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly
\ No newline at end of file
diff --git a/test/cmdlineTests/strict_asm_jump/err b/test/cmdlineTests/strict_asm_jump/err
deleted file mode 100644
index c0001f382533..000000000000
--- a/test/cmdlineTests/strict_asm_jump/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Function "jump" not found.
- --> strict_asm_jump/input.yul:1:3:
-  |
-1 | { jump(1) }
-  |   ^^^^
diff --git a/test/cmdlineTests/strict_asm_jump/exit b/test/cmdlineTests/strict_asm_jump/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_jump/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_jump/input.yul b/test/cmdlineTests/strict_asm_jump/input.yul
deleted file mode 100644
index 0f791eeca5bf..000000000000
--- a/test/cmdlineTests/strict_asm_jump/input.yul
+++ /dev/null
@@ -1 +0,0 @@
-{ jump(1) }
\ No newline at end of file
diff --git a/test/cmdlineTests/strict_asm_msize_with_optimizer/args b/test/cmdlineTests/strict_asm_msize_with_optimizer/args
deleted file mode 100644
index f1cb61514f3b..000000000000
--- a/test/cmdlineTests/strict_asm_msize_with_optimizer/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info none --optimize
diff --git a/test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul b/test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul
deleted file mode 100644
index ccff7a32f45b..000000000000
--- a/test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f() -> x {
-        x := mload(0)
-    }
-
-    // In pure Yul optimization in presence of msize is allowed.
-    // Everything in this file should get optimized out.
-    pop(msize())
-
-    let x := 0
-    let y := x
-    mstore(0, f())
-}
diff --git a/test/cmdlineTests/strict_asm_msize_with_optimizer/output b/test/cmdlineTests/strict_asm_msize_with_optimizer/output
deleted file mode 100644
index fbc1e69fac24..000000000000
--- a/test/cmdlineTests/strict_asm_msize_with_optimizer/output
+++ /dev/null
@@ -1,14 +0,0 @@
-
-======= strict_asm_msize_with_optimizer/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code { { } }
-}
-
-
-Binary representation:
-00
-
-Text representation:
-  stop
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/args b/test/cmdlineTests/strict_asm_msize_without_optimizer/args
deleted file mode 100644
index 7e891dd86b95..000000000000
--- a/test/cmdlineTests/strict_asm_msize_without_optimizer/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info none
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul b/test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul
deleted file mode 100644
index e787c40097c2..000000000000
--- a/test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f() -> x {
-        x := mload(0)
-    }
-
-    // In pure Yul without optimizer presence of msize disables stack optimization.
-    // This file should remain untouched when passed through the optimizer.
-    pop(msize())
-
-    let x := 0
-    let y := x
-    mstore(0, f())
-}
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/output b/test/cmdlineTests/strict_asm_msize_without_optimizer/output
deleted file mode 100644
index fabd2e874a5b..000000000000
--- a/test/cmdlineTests/strict_asm_msize_without_optimizer/output
+++ /dev/null
@@ -1,40 +0,0 @@
-
-======= strict_asm_msize_without_optimizer/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        function f() -> x
-        { x := mload(0) }
-        pop(msize())
-        let x := 0
-        let y := x
-        mstore(0, f())
-    }
-}
-
-
-Binary representation:
-600b565b5f8051905090565b5f8060136003565b5f525050
-
-Text representation:
-  jump(tag_2)
-tag_1:
-  0x00
-  dup1
-  mload
-  swap1
-  pop
-  swap1
-  jump	// out
-tag_2:
-  0x00
-  dup1
-  tag_4
-  tag_1
-  jump	// in
-tag_4:
-  0x00
-  mstore
-  pop
-  pop
diff --git a/test/cmdlineTests/strict_asm_only_cr/args b/test/cmdlineTests/strict_asm_only_cr/args
deleted file mode 100644
index 2c89c24e0a35..000000000000
--- a/test/cmdlineTests/strict_asm_only_cr/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly
diff --git a/test/cmdlineTests/strict_asm_only_cr/err b/test/cmdlineTests/strict_asm_only_cr/err
deleted file mode 100644
index 0879e4f212db..000000000000
--- a/test/cmdlineTests/strict_asm_only_cr/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Expected keyword "object".
- --> strict_asm_only_cr/input.yul:1:2:
-  |
-1 | 
-  | ^
diff --git a/test/cmdlineTests/strict_asm_only_cr/exit b/test/cmdlineTests/strict_asm_only_cr/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_only_cr/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_only_cr/input.yul b/test/cmdlineTests/strict_asm_only_cr/input.yul
deleted file mode 100644
index 67c329761145..000000000000
--- a/test/cmdlineTests/strict_asm_only_cr/input.yul
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args
deleted file mode 100644
index cbefff3e9bf3..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize-yul --no-optimize-yul
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
deleted file mode 100644
index b8fc39145ed8..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Options --optimize-yul and --no-optimize-yul cannot be used together.
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul
deleted file mode 100644
index 0967ef424bce..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/args b/test/cmdlineTests/strict_asm_optimizer_steps/args
deleted file mode 100644
index ade406ee4bb2..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_steps/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize --yul-optimizations dhfoDgvulfnTUtnIf
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/input.yul b/test/cmdlineTests/strict_asm_optimizer_steps/input.yul
deleted file mode 100644
index 18214a31d09d..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_steps/input.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-object "C_6" {
-    code {
-        mstore(64, 128)
-        if callvalue() { revert(0, 0) }
-        codecopy(0, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
-        return(0, datasize("C_6_deployed"))
-    }
-    object "C_6_deployed" {
-        code {
-            {
-                mstore(64, 128)
-                if iszero(lt(calldatasize(), 4))
-                {
-                    let selector := shift_right_224_unsigned(calldataload(0))
-                    pop(selector)
-                }
-                sstore(0, iszero(calldatasize()))
-                revert(0, 0)
-            }
-
-            function shift_right_224_unsigned(value) -> newValue
-            {
-                newValue := shr(224, value)
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/output b/test/cmdlineTests/strict_asm_optimizer_steps/output
deleted file mode 100644
index c10fb02fb9a9..000000000000
--- a/test/cmdlineTests/strict_asm_optimizer_steps/output
+++ /dev/null
@@ -1,84 +0,0 @@
-
-======= strict_asm_optimizer_steps/input.yul (EVM) =======
-
-Pretty printed source:
-object "C_6" {
-    code {
-        {
-            mstore(64, 128)
-            if callvalue() { revert(0, 0) }
-            codecopy(0, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
-            return(0, datasize("C_6_deployed"))
-        }
-    }
-    object "C_6_deployed" {
-        code {
-            {
-                mstore(64, 128)
-                sstore(0, iszero(calldatasize()))
-                revert(0, 0)
-            }
-        }
-    }
-}
-
-
-Binary representation:
-608060405234601357600c60185f39600c5ff35b5f80fdfe608060405236155f555f80fd
-
-Text representation:
-    /* "strict_asm_optimizer_steps/input.yul":45:48   */
-  0x80
-    /* "strict_asm_optimizer_steps/input.yul":41:43   */
-  0x40
-    /* "strict_asm_optimizer_steps/input.yul":34:49   */
-  mstore
-    /* "strict_asm_optimizer_steps/input.yul":61:72   */
-  callvalue
-    /* "strict_asm_optimizer_steps/input.yul":58:89   */
-  tag_1
-  jumpi
-    /* "strict_asm_optimizer_steps/input.yul":138:162   */
-  dataSize(sub_0)
-    /* "strict_asm_optimizer_steps/input.yul":110:136   */
-  dataOffset(sub_0)
-    /* "strict_asm_optimizer_steps/input.yul":107:108   */
-  0x00
-    /* "strict_asm_optimizer_steps/input.yul":98:163   */
-  codecopy
-    /* "strict_asm_optimizer_steps/input.yul":182:206   */
-  dataSize(sub_0)
-    /* "strict_asm_optimizer_steps/input.yul":179:180   */
-  0x00
-    /* "strict_asm_optimizer_steps/input.yul":172:207   */
-  return
-    /* "strict_asm_optimizer_steps/input.yul":73:89   */
-tag_1:
-    /* "strict_asm_optimizer_steps/input.yul":85:86   */
-  0x00
-    /* "strict_asm_optimizer_steps/input.yul":75:87   */
-  dup1
-  revert
-stop
-
-sub_0: assembly {
-        /* "strict_asm_optimizer_steps/input.yul":298:301   */
-      0x80
-        /* "strict_asm_optimizer_steps/input.yul":294:296   */
-      0x40
-        /* "strict_asm_optimizer_steps/input.yul":287:302   */
-      mstore
-        /* "strict_asm_optimizer_steps/input.yul":533:547   */
-      calldatasize
-        /* "strict_asm_optimizer_steps/input.yul":526:548   */
-      iszero
-        /* "strict_asm_optimizer_steps/input.yul":523:524   */
-      0x00
-        /* "strict_asm_optimizer_steps/input.yul":516:549   */
-      sstore
-        /* "strict_asm_optimizer_steps/input.yul":576:577   */
-      0x00
-        /* "strict_asm_optimizer_steps/input.yul":566:578   */
-      dup1
-      revert
-}
diff --git a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args
deleted file mode 100644
index 9efe91f61f29..000000000000
--- a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args
+++ /dev/null
@@ -1 +0,0 @@
---yul-dialect evm --machine evm
diff --git a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err
deleted file mode 100644
index dd58c6e8693e..000000000000
--- a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: --yul-dialect and --machine are only valid in assembly mode.
diff --git a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/exit b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/input.sol b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/args b/test/cmdlineTests/strict_asm_output_selection_asm_only/args
deleted file mode 100644
index eff0311702c5..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_asm_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize --asm
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
deleted file mode 100644
index 4fa5ef66f8da..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/output b/test/cmdlineTests/strict_asm_output_selection_asm_only/output
deleted file mode 100644
index abe2143d3f89..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_asm_only/output
+++ /dev/null
@@ -1,12 +0,0 @@
-
-======= strict_asm_output_selection_asm_only/input.yul (EVM) =======
-
-Text representation:
-    /* "strict_asm_output_selection_asm_only/input.yul":15:17   */
-  0x2a
-    /* "strict_asm_output_selection_asm_only/input.yul":29:30   */
-  0x00
-    /* "strict_asm_output_selection_asm_only/input.yul":22:34   */
-  sstore
-    /* "strict_asm_output_selection_asm_only/input.yul":0:36   */
-  stop
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/args b/test/cmdlineTests/strict_asm_output_selection_bin_only/args
deleted file mode 100644
index 73ca2cca294d..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_bin_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize --bin
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
deleted file mode 100644
index 4fa5ef66f8da..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/output b/test/cmdlineTests/strict_asm_output_selection_bin_only/output
deleted file mode 100644
index 86d249576805..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_bin_only/output
+++ /dev/null
@@ -1,5 +0,0 @@
-
-======= strict_asm_output_selection_bin_only/input.yul (EVM) =======
-
-Binary representation:
-602a5f5500
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/args b/test/cmdlineTests/strict_asm_output_selection_invalid/args
deleted file mode 100644
index daeb64aae98b..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/err b/test/cmdlineTests/strict_asm_output_selection_invalid/err
deleted file mode 100644
index 81d6eff8ae72..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: The following outputs are not supported in assembler mode: --abi, --asm-json, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/exit b/test/cmdlineTests/strict_asm_output_selection_invalid/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/input.yul b/test/cmdlineTests/strict_asm_output_selection_invalid/input.yul
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
deleted file mode 100644
index 90b16d1f0e12..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
deleted file mode 100644
index 4fa5ef66f8da..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output
deleted file mode 100644
index 1fa4b72c7e2b..000000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output
+++ /dev/null
@@ -1,7 +0,0 @@
-
-======= strict_asm_output_selection_ir_optimized_only/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code { { sstore(0, 42) } }
-}
diff --git a/test/cmdlineTests/structured_documentation_source_location/err b/test/cmdlineTests/structured_documentation_source_location/err
deleted file mode 100644
index 1f69adf4f63d..000000000000
--- a/test/cmdlineTests/structured_documentation_source_location/err
+++ /dev/null
@@ -1,11 +0,0 @@
-Error: Documentation tag "@return No value returned" does not contain the name of its return parameter.
- --> structured_documentation_source_location/input.sol:4:5:
-  |
-4 |     /// @param id Some identifier
-  |     ^ (Relevant source part starts here and spans across multiple lines).
-
-Error: Documentation tag "@return No value returned" does not contain the name of its return parameter.
- --> structured_documentation_source_location/input.sol:8:5:
-  |
-8 |     /// @return No value returned
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/structured_documentation_source_location/exit b/test/cmdlineTests/structured_documentation_source_location/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/structured_documentation_source_location/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/structured_documentation_source_location/input.sol b/test/cmdlineTests/structured_documentation_source_location/input.sol
deleted file mode 100644
index 399c2b8b89bd..000000000000
--- a/test/cmdlineTests/structured_documentation_source_location/input.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0;
-abstract contract C {
-    /// @param id Some identifier
-    /// @return No value returned
-    function vote(uint id) public virtual returns (uint value);
-
-    /// @return No value returned
-    function unvote(uint id) public virtual returns (uint value);
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/too_long_line/err b/test/cmdlineTests/too_long_line/err
deleted file mode 100644
index 25620bd4c5e2..000000000000
--- a/test/cmdlineTests/too_long_line/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Identifier not found or not unique.
- --> too_long_line/input.sol:5:164:
-  |
-5 |  ... ffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string  ...
-  |                                         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/too_long_line/exit b/test/cmdlineTests/too_long_line/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line/input.sol b/test/cmdlineTests/too_long_line/input.sol
deleted file mode 100644
index c4be6acd9137..000000000000
--- a/test/cmdlineTests/too_long_line/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-   function ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_both_sides_short/err b/test/cmdlineTests/too_long_line_both_sides_short/err
deleted file mode 100644
index 5992d6ea9387..000000000000
--- a/test/cmdlineTests/too_long_line_both_sides_short/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Identifier not found or not unique.
- --> too_long_line_both_sides_short/input.sol:5:15:
-  |
-5 |    function f(announcementTypeXXXXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
-  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/too_long_line_both_sides_short/exit b/test/cmdlineTests/too_long_line_both_sides_short/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line_both_sides_short/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_both_sides_short/input.sol b/test/cmdlineTests/too_long_line_both_sides_short/input.sol
deleted file mode 100644
index 255a175cd7f5..000000000000
--- a/test/cmdlineTests/too_long_line_both_sides_short/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-   function f(announcementTypeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
-       string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_edge_in/err b/test/cmdlineTests/too_long_line_edge_in/err
deleted file mode 100644
index 1d96ea4cdc03..000000000000
--- a/test/cmdlineTests/too_long_line_edge_in/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Identifier not found or not unique.
- --> too_long_line_edge_in/input.sol:5:36:
-  |
-5 |    function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
-  |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/too_long_line_edge_in/exit b/test/cmdlineTests/too_long_line_edge_in/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line_edge_in/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_edge_in/input.sol b/test/cmdlineTests/too_long_line_edge_in/input.sol
deleted file mode 100644
index 1ab67a98166d..000000000000
--- a/test/cmdlineTests/too_long_line_edge_in/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-   function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_edge_out/err b/test/cmdlineTests/too_long_line_edge_out/err
deleted file mode 100644
index 3b3b4ee490b9..000000000000
--- a/test/cmdlineTests/too_long_line_edge_out/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Identifier not found or not unique.
- --> too_long_line_edge_out/input.sol:5:37:
-  |
-5 |  ...   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external  ...
-  |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/too_long_line_edge_out/exit b/test/cmdlineTests/too_long_line_edge_out/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line_edge_out/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_edge_out/input.sol b/test/cmdlineTests/too_long_line_edge_out/input.sol
deleted file mode 100644
index e364a0dac257..000000000000
--- a/test/cmdlineTests/too_long_line_edge_out/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_left_short/err b/test/cmdlineTests/too_long_line_left_short/err
deleted file mode 100644
index 4f2359739076..000000000000
--- a/test/cmdlineTests/too_long_line_left_short/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Identifier not found or not unique.
- --> too_long_line_left_short/input.sol:5:15:
-  |
-5 |    function f(announcementType Type, string Announcement, string  ...
-  |               ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/too_long_line_left_short/exit b/test/cmdlineTests/too_long_line_left_short/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line_left_short/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_left_short/input.sol b/test/cmdlineTests/too_long_line_left_short/input.sol
deleted file mode 100644
index 6c53fdb46b52..000000000000
--- a/test/cmdlineTests/too_long_line_left_short/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-   function f(announcementType Type, string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_multiline/err b/test/cmdlineTests/too_long_line_multiline/err
deleted file mode 100644
index 4523938c6ee7..000000000000
--- a/test/cmdlineTests/too_long_line_multiline/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: No visibility specified. Did you intend to add "public"?
- --> too_long_line_multiline/input.sol:5:5:
-  |
-5 |     function f() returns (bytes1 _b, by ... _b7, bytes22 _b22, bytes32 _b32)  {
-  |     ^ (Relevant source part starts here and spans across multiple lines).
diff --git a/test/cmdlineTests/too_long_line_multiline/exit b/test/cmdlineTests/too_long_line_multiline/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line_multiline/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_multiline/input.sol b/test/cmdlineTests/too_long_line_multiline/input.sol
deleted file mode 100644
index 585d87318559..000000000000
--- a/test/cmdlineTests/too_long_line_multiline/input.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-    function f() returns (bytes1 _b, bytes2 _b2, bytes3 _b3, bytes memory _blit, bytes5 _b5, bytes6 _b6, string memory _str, bytes7 _b7, bytes22 _b22, bytes32 _b32)  {
-        _b = 0x12;
-        _b2 = 0x1223;
-        _b5 = hex"043245";
-        _b6 = hex"2345532532";
-        _b7 = hex"03252353253253";
-        _b22 = hex"325235235325325325235325";
-        _b32 = hex"032523532532523532523532523532";
-        _blit = hex"123498";
-        _str = "heidy";
-    }
-}
diff --git a/test/cmdlineTests/too_long_line_right_short/err b/test/cmdlineTests/too_long_line_right_short/err
deleted file mode 100644
index 7aa26ff074c5..000000000000
--- a/test/cmdlineTests/too_long_line_right_short/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Identifier not found or not unique.
- --> too_long_line_right_short/input.sol:5:164:
-  |
-5 |  ... ffffffffffffffffffffffffffffffffff(announcementType Type,
-  |                                         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/too_long_line_right_short/exit b/test/cmdlineTests/too_long_line_right_short/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/too_long_line_right_short/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_right_short/input.sol b/test/cmdlineTests/too_long_line_right_short/input.sol
deleted file mode 100644
index 8bf6a887a213..000000000000
--- a/test/cmdlineTests/too_long_line_right_short/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C {
-   function ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff(announcementType Type,
-       string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/viair_abicoder_v1/args b/test/cmdlineTests/viair_abicoder_v1/args
deleted file mode 100644
index e869749f234a..000000000000
--- a/test/cmdlineTests/viair_abicoder_v1/args
+++ /dev/null
@@ -1 +0,0 @@
---ir --error-codes
diff --git a/test/cmdlineTests/viair_abicoder_v1/err b/test/cmdlineTests/viair_abicoder_v1/err
deleted file mode 100644
index 55f8ba4b91b3..000000000000
--- a/test/cmdlineTests/viair_abicoder_v1/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning (2066): Contract requests the ABI coder v1, which is incompatible with the IR. Using ABI coder v2 instead.
- --> viair_abicoder_v1/input.sol:4:1:
-  |
-4 | contract test {
-  | ^ (Relevant source part starts here and spans across multiple lines).
diff --git a/test/cmdlineTests/viair_abicoder_v1/input.sol b/test/cmdlineTests/viair_abicoder_v1/input.sol
deleted file mode 100644
index 198e40e16a69..000000000000
--- a/test/cmdlineTests/viair_abicoder_v1/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v1;
-contract test {
-    function f() public pure returns (bool) {
-        return true;
-    }
-}
diff --git a/test/cmdlineTests/viair_abicoder_v1/output b/test/cmdlineTests/viair_abicoder_v1/output
deleted file mode 100644
index 1c4d6c90e260..000000000000
--- a/test/cmdlineTests/viair_abicoder_v1/output
+++ /dev/null
@@ -1,136 +0,0 @@
-IR:
-
-/// @use-src 0:"viair_abicoder_v1/input.sol"
-object "test_11" {
-    code {
-        /// @src 0:79:169  "contract test {..."
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_test_11()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("test_11_deployed"), datasize("test_11_deployed"))
-
-        return(_1, datasize("test_11_deployed"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:79:169  "contract test {..."
-        function constructor_test_11() {
-
-            /// @src 0:79:169  "contract test {..."
-
-        }
-        /// @src 0:79:169  "contract test {..."
-
-    }
-    /// @use-src 0:"viair_abicoder_v1/input.sol"
-    object "test_11_deployed" {
-        code {
-            /// @src 0:79:169  "contract test {..."
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_10()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function cleanup_t_bool(value) -> cleaned {
-                cleaned := iszero(iszero(value))
-            }
-
-            function abi_encode_t_bool_to_t_bool_fromStack(value, pos) {
-                mstore(pos, cleanup_t_bool(value))
-            }
-
-            function abi_encode_tuple_t_bool__to_t_bool__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                abi_encode_t_bool_to_t_bool_fromStack(value0,  add(headStart, 0))
-
-            }
-
-            function external_fun_f_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_bool__to_t_bool__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_bool() -> ret {
-                ret := 0
-            }
-
-            /// @ast-id 10
-            /// @src 0:99:167  "function f() public pure returns (bool) {..."
-            function fun_f_10() -> var__5 {
-                /// @src 0:133:137  "bool"
-                let zero_t_bool_1 := zero_value_for_split_t_bool()
-                var__5 := zero_t_bool_1
-
-                /// @src 0:156:160  "true"
-                let expr_7 := 0x01
-                /// @src 0:149:160  "return true"
-                var__5 := expr_7
-                leave
-
-            }
-            /// @src 0:79:169  "contract test {..."
-
-        }
-
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-
-}
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/args b/test/cmdlineTests/viair_msize_without_optimizer/args
deleted file mode 100644
index 3b9da15f9798..000000000000
--- a/test/cmdlineTests/viair_msize_without_optimizer/args
+++ /dev/null
@@ -1 +0,0 @@
---via-ir --ir-optimized --asm --debug-info none
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/input.sol b/test/cmdlineTests/viair_msize_without_optimizer/input.sol
deleted file mode 100644
index e70ba17fb224..000000000000
--- a/test/cmdlineTests/viair_msize_without_optimizer/input.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity *;
-
-contract C {
-    function f() pure public {
-        assembly ("memory-safe") {
-            function f() -> x {
-                x := mload(0)
-            }
-
-            // Presence of msize disables all Yul optimizations, including the minimal steps or
-            // stack optimization that would normally be performed even with the optimizer nominally disabled.
-            // This block should remain untouched when passed through the optimizer.
-            pop(msize())
-
-            let x := 0
-            let y := x
-            mstore(0, f())
-        }
-    }
-}
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/output b/test/cmdlineTests/viair_msize_without_optimizer/output
deleted file mode 100644
index b54f8a3f5647..000000000000
--- a/test/cmdlineTests/viair_msize_without_optimizer/output
+++ /dev/null
@@ -1,261 +0,0 @@
-
-======= viair_msize_without_optimizer/input.sol:C =======
-EVM assembly:
-  mstore(0x40, 0x80)
-  jumpi(tag_4, iszero(callvalue))
-  tag_5
-  tag_2
-  jump	// in
-tag_5:
-tag_4:
-  tag_6
-  tag_3
-  jump	// in
-tag_6:
-  tag_7
-  tag_1
-  jump	// in
-tag_7:
-  dataSize(sub_0)
-  dataOffset(sub_0)
-  dup3
-  codecopy
-  dataSize(sub_0)
-  dup2
-  return
-tag_1:
-  0x00
-  mload(0x40)
-  swap1
-  pop
-  swap1
-  jump	// out
-tag_2:
-  0x00
-  dup1
-  revert
-tag_3:
-  jump	// out
-stop
-
-sub_0: assembly {
-      mstore(0x40, 0x80)
-      jumpi(tag_10, lt(calldatasize, 0x04))
-      tag_11
-      calldataload(0x00)
-      tag_1
-      jump	// in
-    tag_11:
-      dup1
-      0x26121ff0
-      dup2
-      sub
-      tag_12
-      jumpi
-      tag_14
-      tag_7
-      jump	// in
-    tag_14:
-    tag_12:
-      pop
-      pop
-    tag_10:
-      tag_15
-      tag_8
-      jump	// in
-    tag_15:
-      jump(tag_16)
-    tag_1:
-      0x00
-      dup2
-      0xe0
-      shr
-      swap1
-      pop
-      swap2
-      swap1
-      pop
-      jump	// out
-    tag_2:
-      0x00
-      mload(0x40)
-      swap1
-      pop
-      swap1
-      jump	// out
-    tag_3:
-      0x00
-      dup1
-      revert
-    tag_4:
-      0x00
-      dup1
-      revert
-    tag_5:
-      0x00
-      dup2
-      dup4
-      sub
-      slt
-      iszero
-      tag_22
-      jumpi
-      tag_23
-      tag_4
-      jump	// in
-    tag_23:
-    tag_22:
-      pop
-      pop
-      jump	// out
-    tag_6:
-      0x00
-      dup1
-      dup3
-      add
-      swap1
-      pop
-      swap2
-      swap1
-      pop
-      jump	// out
-    tag_7:
-      jumpi(tag_26, iszero(callvalue))
-      tag_27
-      tag_3
-      jump	// in
-    tag_27:
-    tag_26:
-      tag_28
-      calldatasize
-      0x04
-      tag_5
-      jump	// in
-    tag_28:
-      tag_29
-      tag_9
-      jump	// in
-    tag_29:
-      tag_30
-      tag_2
-      jump	// in
-    tag_30:
-      tag_31
-      dup2
-      tag_6
-      jump	// in
-    tag_31:
-      dup2
-      dup2
-      sub
-      dup3
-      return
-    tag_8:
-      0x00
-      dup1
-      revert
-    tag_9:
-      jump(tag_35)
-    tag_34:
-      0x00
-      dup1
-      mload
-      swap1
-      pop
-      swap1
-      jump	// out
-    tag_35:
-      0x00
-      dup1
-      tag_37
-      tag_34
-      jump	// in
-    tag_37:
-      0x00
-      mstore
-      pop
-      pop
-      jump	// out
-    tag_16:
-
-    auxdata: <AUXDATA REMOVED>
-}
-
-Optimized IR:
-/// @use-src 0:"viair_msize_without_optimizer/input.sol"
-object "C_7" {
-    code {
-        mstore(64, memoryguard(128))
-        if callvalue()
-        {
-            revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        }
-        constructor_C_7()
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
-        return(_1, datasize("C_7_deployed"))
-        function allocate_unbounded() -> memPtr
-        { memPtr := mload(64) }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-        function constructor_C_7()
-        { }
-    }
-    /// @use-src 0:"viair_msize_without_optimizer/input.sol"
-    object "C_7_deployed" {
-        code {
-            mstore(64, memoryguard(128))
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-                case 0x26121ff0 { external_fun_f_6() }
-                default { }
-            }
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            function shift_right_224_unsigned(value) -> newValue
-            { newValue := shr(224, value) }
-            function allocate_unbounded() -> memPtr
-            { memPtr := mload(64) }
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            { revert(0, 0) }
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
-            { revert(0, 0) }
-            function abi_decode_tuple_(headStart, dataEnd)
-            {
-                if slt(sub(dataEnd, headStart), 0)
-                {
-                    revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
-                }
-            }
-            function abi_encode_tuple__to__fromStack(headStart) -> tail
-            { tail := add(headStart, 0) }
-            function external_fun_f_6()
-            {
-                if callvalue()
-                {
-                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-                }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_6()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos)
-                return(memPos, sub(memEnd, memPos))
-            }
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            { revert(0, 0) }
-            function fun_f_6()
-            {
-                {
-                    function usr$f() -> usr$x
-                    { usr$x := mload(0) }
-                    pop(msize())
-                    let usr$x := 0
-                    let usr$y := usr$x
-                    mstore(0, usr$f())
-                }
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/viair_subobject_optimization/args b/test/cmdlineTests/viair_subobject_optimization/args
deleted file mode 100644
index 51e6fa5196d2..000000000000
--- a/test/cmdlineTests/viair_subobject_optimization/args
+++ /dev/null
@@ -1 +0,0 @@
---experimental-via-ir --optimize --asm
\ No newline at end of file
diff --git a/test/cmdlineTests/viair_subobject_optimization/input.sol b/test/cmdlineTests/viair_subobject_optimization/input.sol
deleted file mode 100644
index 74549134a6fd..000000000000
--- a/test/cmdlineTests/viair_subobject_optimization/input.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >0.0.0;
-
-contract C {
-  constructor(uint x) {
-    // In earlier versions of the compiler, the resulting assembly pushed the constant
-    // 0xFFFFFFFFFFFFFFFF42 directly in the subassembly of D, while it was optimized to
-    // ``sub(shl(0x48, 0x01), 0xbe)`` when C was compiled in isolation.
-    // Now the assembly is expected to contain two instances of ``sub(shl(0x48, 0x01), 0xbe)``,
-    // one in the creation code of ``C`` directly, one in a subassembly of ``D``.
-    // The constant 0xFFFFFFFFFFFFFFFF42 should not occur in the assembly output at all.
-    if (x == 0xFFFFFFFFFFFFFFFF42)
-      revert();
-  }
-}
-contract D {
-  function f() public pure returns (bytes memory) {
-    return type(C).creationCode;
-  }
-}
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
deleted file mode 100644
index 4804d138434c..000000000000
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ /dev/null
@@ -1,317 +0,0 @@
-
-======= viair_subobject_optimization/input.sol:C =======
-EVM assembly:
-    /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-  0x80
-  jumpi(tag_7, callvalue)
-  0x1f
-  bytecodeSize
-  codesize
-  dup2
-  swap1
-  sub
-  swap2
-  dup3
-  add
-  not(0x1f)
-  and
-  dup4
-  add
-  swap2
-  sub(shl(0x40, 0x01), 0x01)
-  dup4
-  gt
-  dup5
-  dup5
-  lt
-  or
-  tag_3
-  jumpi
-  dup1
-  dup5
-  swap3
-  0x20
-  swap5
-  0x40
-  mstore
-  dup4
-  codecopy
-  dup2
-  add
-  sub
-  slt
-  tag_7
-  jumpi
-  mload
-  sub(shl(0x48, 0x01), 0xbe)
-    /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
-  eq
-    /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
-  tag_7
-  jumpi
-    /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-  mload(0x40)
-  dataSize(sub_0)
-  swap1
-  dup2
-  dataOffset(sub_0)
-  dup3
-  codecopy
-  return
-    /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
-tag_7:
-  0x00
-    /* "viair_subobject_optimization/input.sol":653:661  revert() */
-  dup1
-  revert
-    /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-tag_3:
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x41)
-  revert(0x00, 0x24)
-stop
-
-sub_0: assembly {
-        /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-      0x00
-      dup1
-      revert
-
-    auxdata: <AUXDATA REMOVED>
-}
-
-
-======= viair_subobject_optimization/input.sol:D =======
-EVM assembly:
-    /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-  0x80
-  dup1
-  0x40
-  mstore
-  jumpi(tag_1, callvalue)
-  dataSize(sub_0)
-  swap1
-  dup2
-  dataOffset(sub_0)
-  dup3
-  codecopy
-  return
-tag_1:
-  0x00
-  dup1
-  revert
-stop
-
-sub_0: assembly {
-        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      0x80
-      jumpi(tag_1, iszero(lt(calldatasize, 0x04)))
-      0x00
-      dup1
-      revert
-    tag_1:
-      jumpi(tag_3, eq(0x26121ff0, shr(0xe0, calldataload(0x00))))
-      0x00
-      dup1
-      revert
-    tag_3:
-      jumpi(tag_7, callvalue)
-      jumpi(tag_7, slt(add(not(0x03), calldatasize), 0x00))
-      not(0x1f)
-        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      dataSize(sub_0)
-        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      0x3f
-      dup2
-      add
-      dup3
-      and
-      dup4
-      add
-      swap1
-      dup4
-      dup3
-      lt
-      0xffffffffffffffff
-      dup4
-      gt
-      or
-      tag_9
-      jumpi
-      swap3
-      swap1
-      0x40
-      swap1
-      0x40
-      mstore
-        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      dup4
-      dup3
-      mstore
-      0x20
-      swap4
-      dataOffset(sub_0)
-      0x20
-      dup5
-      add
-      codecopy
-        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      mload(0x40)
-      swap4
-      dup5
-      swap3
-        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      0x20
-        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup5
-      mstore
-      dup1
-      mload
-      swap3
-      dup4
-        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      0x20
-        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup7
-      add
-      mstore
-      0x00
-    tag_11:
-      dup5
-      dup2
-      lt
-      tag_12
-      jumpi
-      dup6
-      0x40
-      dup2
-      dup10
-      0x1f
-      dup10
-      0x00
-      dup6
-      dup3
-      dup7
-      add
-      add
-      mstore
-      add
-      and
-      dup2
-      add
-      sub
-      add
-      swap1
-      return
-    tag_12:
-      dup3
-      dup2
-      add
-      dup5
-      add
-      mload
-      dup9
-      dup3
-      add
-      dup4
-      add
-      mstore
-      dup8
-      swap6
-      pop
-      dup4
-      add
-      jump(tag_11)
-    tag_9:
-      mstore(0x00, shl(0xe0, 0x4e487b71))
-      mstore(0x04, 0x41)
-      revert(0x00, 0x24)
-    tag_7:
-      0x00
-      dup1
-      revert
-    stop
-
-    sub_0: assembly {
-            /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-          0x80
-          jumpi(tag_7, callvalue)
-          0x1f
-          bytecodeSize
-          codesize
-          dup2
-          swap1
-          sub
-          swap2
-          dup3
-          add
-          not(0x1f)
-          and
-          dup4
-          add
-          swap2
-          sub(shl(0x40, 0x01), 0x01)
-          dup4
-          gt
-          dup5
-          dup5
-          lt
-          or
-          tag_3
-          jumpi
-          dup1
-          dup5
-          swap3
-          0x20
-          swap5
-          0x40
-          mstore
-          dup4
-          codecopy
-          dup2
-          add
-          sub
-          slt
-          tag_7
-          jumpi
-          mload
-          sub(shl(0x48, 0x01), 0xbe)
-            /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
-          eq
-            /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
-          tag_7
-          jumpi
-            /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-          mload(0x40)
-          dataSize(sub_0)
-          swap1
-          dup2
-          dataOffset(sub_0)
-          dup3
-          codecopy
-          return
-            /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
-        tag_7:
-          0x00
-            /* "viair_subobject_optimization/input.sol":653:661  revert() */
-          dup1
-          revert
-            /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-        tag_3:
-          mstore(0x00, shl(0xe0, 0x4e487b71))
-          mstore(0x04, 0x41)
-          revert(0x00, 0x24)
-        stop
-
-        sub_0: assembly {
-                /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-              0x00
-              dup1
-              revert
-
-            auxdata: <AUXDATA REMOVED>
-        }
-    }
-
-    auxdata: <AUXDATA REMOVED>
-}
diff --git a/test/cmdlineTests/viair_subobjects/args b/test/cmdlineTests/viair_subobjects/args
deleted file mode 100644
index 5331d83ac444..000000000000
--- a/test/cmdlineTests/viair_subobjects/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --via-ir --optimize --bin --bin-runtime
\ No newline at end of file
diff --git a/test/cmdlineTests/viair_subobjects/err b/test/cmdlineTests/viair_subobjects/err
deleted file mode 100644
index 5046525bef7a..000000000000
--- a/test/cmdlineTests/viair_subobjects/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Warning: Unused local variable.
- --> viair_subobjects/input.sol:8:9:
-  |
-8 |         C c = new C();
-  |         ^^^
diff --git a/test/cmdlineTests/viair_subobjects/input.sol b/test/cmdlineTests/viair_subobjects/input.sol
deleted file mode 100644
index bad0fe74f8f0..000000000000
--- a/test/cmdlineTests/viair_subobjects/input.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.6.0;
-pragma abicoder v2;
-
-contract C {}
-contract D {
-    function f() public {
-        C c = new C();
-    }
-}
diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output
deleted file mode 100644
index 7a6bc8e6570b..000000000000
--- a/test/cmdlineTests/viair_subobjects/output
+++ /dev/null
@@ -1,117 +0,0 @@
-
-======= viair_subobjects/input.sol:C =======
-Binary:
-<BYTECODE REMOVED>
-Binary of the runtime part:
-<BYTECODE REMOVED>
-Optimized IR:
-/// @use-src 0:"viair_subobjects/input.sol"
-object "C_3" {
-    code {
-        {
-            /// @src 0:82:95  "contract C {}"
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("C_3_deployed")
-            codecopy(_1, dataoffset("C_3_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"viair_subobjects/input.sol"
-    object "C_3_deployed" {
-        code {
-            {
-                /// @src 0:82:95  "contract C {}"
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
-
-
-======= viair_subobjects/input.sol:D =======
-Binary:
-<BYTECODE REMOVED>
-Binary of the runtime part:
-<BYTECODE REMOVED>
-Optimized IR:
-/// @use-src 0:"viair_subobjects/input.sol"
-object "D_16" {
-    code {
-        {
-            /// @src 0:96:165  "contract D {..."
-            let _1 := memoryguard(0x80)
-            mstore(64, _1)
-            if callvalue() { revert(0, 0) }
-            let _2 := datasize("D_16_deployed")
-            codecopy(_1, dataoffset("D_16_deployed"), _2)
-            return(_1, _2)
-        }
-    }
-    /// @use-src 0:"viair_subobjects/input.sol"
-    object "D_16_deployed" {
-        code {
-            {
-                /// @src 0:96:165  "contract D {..."
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
-                if iszero(lt(calldatasize(), 4))
-                {
-                    if eq(0x26121ff0, shr(224, calldataload(0)))
-                    {
-                        if callvalue() { revert(0, 0) }
-                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:149:156  "new C()"
-                        let _2 := datasize("C_3")
-                        let _3 := add(_1, _2)
-                        if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
-                        {
-                            /// @src 0:96:165  "contract D {..."
-                            mstore(0, shl(224, 0x4e487b71))
-                            mstore(4, 0x41)
-                            revert(0, 0x24)
-                        }
-                        /// @src 0:149:156  "new C()"
-                        datacopy(_1, dataoffset("C_3"), _2)
-                        if iszero(create(/** @src 0:96:165  "contract D {..." */ 0, /** @src 0:149:156  "new C()" */ _1, sub(_3, _1)))
-                        {
-                            /// @src 0:96:165  "contract D {..."
-                            let pos := mload(64)
-                            returndatacopy(pos, 0, returndatasize())
-                            revert(pos, returndatasize())
-                        }
-                        return(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-        }
-        /// @use-src 0:"viair_subobjects/input.sol"
-        object "C_3" {
-            code {
-                {
-                    /// @src 0:82:95  "contract C {}"
-                    let _1 := memoryguard(0x80)
-                    mstore(64, _1)
-                    if callvalue() { revert(0, 0) }
-                    let _2 := datasize("C_3_deployed")
-                    codecopy(_1, dataoffset("C_3_deployed"), _2)
-                    return(_1, _2)
-                }
-            }
-            /// @use-src 0:"viair_subobjects/input.sol"
-            object "C_3_deployed" {
-                code {
-                    {
-                        /// @src 0:82:95  "contract C {}"
-                        revert(0, 0)
-                    }
-                }
-                data ".metadata" hex"<BYTECODE REMOVED>"
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_function_name_clashes/args b/test/cmdlineTests/yul_function_name_clashes/args
deleted file mode 100644
index 903cc6eb4154..000000000000
--- a/test/cmdlineTests/yul_function_name_clashes/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --debug-info none
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_function_name_clashes/input.yul b/test/cmdlineTests/yul_function_name_clashes/input.yul
deleted file mode 100644
index 0ede2d25e3ec..000000000000
--- a/test/cmdlineTests/yul_function_name_clashes/input.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-object "object" {
-    code {
-        let a
-        let b
-        {
-            function z() -> y
-            { y := calldataload(0) }
-            a := z()
-        }
-        {
-            function z() -> y
-            { y := calldataload(0x20) }
-            b := z()
-        }
-        sstore(a, b)
-    }
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_function_name_clashes/output b/test/cmdlineTests/yul_function_name_clashes/output
deleted file mode 100644
index 2c54b6f50893..000000000000
--- a/test/cmdlineTests/yul_function_name_clashes/output
+++ /dev/null
@@ -1,46 +0,0 @@
-
-======= yul_function_name_clashes/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        {
-            let a
-            let b
-            a := z()
-            b := z_1()
-            sstore(a, b)
-        }
-        function z() -> y
-        { y := calldataload(0) }
-        function z_1() -> y
-        { y := calldataload(0x20) }
-    }
-}
-
-
-Binary representation:
-6005600f565b600b6014565b9055005b5f3590565b6020359056
-
-Text representation:
-  tag_3
-  tag_1
-  jump	// in
-tag_3:
-  tag_4
-  tag_2
-  jump	// in
-tag_4:
-  swap1
-  sstore
-  stop
-tag_1:
-  0x00
-  calldataload
-  swap1
-  jump	// out
-tag_2:
-  0x20
-  calldataload
-  swap1
-  jump	// out
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/args b/test/cmdlineTests/yul_function_name_clashes_different_params/args
deleted file mode 100644
index 2c89c24e0a35..000000000000
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/input.yul b/test/cmdlineTests/yul_function_name_clashes_different_params/input.yul
deleted file mode 100644
index e27ca014ab13..000000000000
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/input.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-object "object" {
-    code {
-        let a
-        let b
-        {
-            function z() -> y
-            { y := calldataload(0) }
-            a := z()
-        }
-        {
-            function z(r) -> y
-            { y := calldataload(r) }
-            b := z(0x70)
-        }
-        sstore(a, b)
-    }
-}
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/output b/test/cmdlineTests/yul_function_name_clashes_different_params/output
deleted file mode 100644
index 22cee64c1f48..000000000000
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/output
+++ /dev/null
@@ -1,59 +0,0 @@
-
-======= yul_function_name_clashes_different_params/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        {
-            let a
-            let b
-            a := z()
-            b := z_1(0x70)
-            sstore(a, b)
-        }
-        function z() -> y
-        { y := calldataload(0) }
-        function z_1(r) -> y
-        { y := calldataload(r) }
-    }
-}
-
-
-Binary representation:
-60056011565b600d60706016565b9055005b5f3590565b359056
-
-Text representation:
-    /* "yul_function_name_clashes_different_params/input.yul":151:154   */
-  tag_3
-  tag_1
-  jump	// in
-tag_3:
-    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
-  tag_4
-    /* "yul_function_name_clashes_different_params/input.yul":262:266   */
-  0x70
-    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
-  tag_2
-  jump	// in
-tag_4:
-    /* "yul_function_name_clashes_different_params/input.yul":286:298   */
-  swap1
-  sstore
-    /* "yul_function_name_clashes_different_params/input.yul":27:304   */
-  stop
-    /* "yul_function_name_clashes_different_params/input.yul":79:133   */
-tag_1:
-    /* "yul_function_name_clashes_different_params/input.yul":129:130   */
-  0x00
-    /* "yul_function_name_clashes_different_params/input.yul":116:131   */
-  calldataload
-    /* "yul_function_name_clashes_different_params/input.yul":79:133   */
-  swap1
-  jump	// out
-    /* "yul_function_name_clashes_different_params/input.yul":187:242   */
-tag_2:
-    /* "yul_function_name_clashes_different_params/input.yul":225:240   */
-  calldataload
-    /* "yul_function_name_clashes_different_params/input.yul":187:242   */
-  swap1
-  jump	// out
diff --git a/test/cmdlineTests/yul_optimize_runs/args b/test/cmdlineTests/yul_optimize_runs/args
deleted file mode 100644
index 033abe3bbbfd..000000000000
--- a/test/cmdlineTests/yul_optimize_runs/args
+++ /dev/null
@@ -1 +0,0 @@
---yul --yul-dialect evm --optimize --optimize-runs 10000
diff --git a/test/cmdlineTests/yul_optimize_runs/input.yul b/test/cmdlineTests/yul_optimize_runs/input.yul
deleted file mode 100644
index 6088853e604f..000000000000
--- a/test/cmdlineTests/yul_optimize_runs/input.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-object "RunsTest1" {
-    code {
-        // Deploy the contract
-        datacopy(0, dataoffset("Runtime_deployed"), datasize("Runtime_deployed"))
-        return(0, datasize("Runtime_deployed"))
-    }
-    object "Runtime_deployed" {
-        code {
-            let funcSel := shl(224, 0xabc12345)
-            sstore(0, funcSel)
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
deleted file mode 100644
index b7fcabaaca48..000000000000
--- a/test/cmdlineTests/yul_optimize_runs/output
+++ /dev/null
@@ -1,51 +0,0 @@
-
-======= yul_optimize_runs/input.yul (EVM) =======
-
-Pretty printed source:
-object "RunsTest1" {
-    code {
-        {
-            let _1 := datasize("Runtime_deployed")
-            datacopy(0, dataoffset("Runtime_deployed"), _1)
-            return(0, _1)
-        }
-    }
-    object "Runtime_deployed" {
-        code {
-            {
-                sstore(0, 0xabc1234500000000000000000000000000000000000000000000000000000000)
-            }
-        }
-    }
-}
-
-
-Binary representation:
-602480600a5f395ff3fe7fabc12345000000000000000000000000000000000000000000000000000000005f5500
-
-Text representation:
-    /* "yul_optimize_runs/input.yul":115:143   */
-  dataSize(sub_0)
-    /* "yul_optimize_runs/input.yul":83:113   */
-  dup1
-  dataOffset(sub_0)
-    /* "yul_optimize_runs/input.yul":80:81   */
-  0x00
-    /* "yul_optimize_runs/input.yul":71:144   */
-  codecopy
-    /* "yul_optimize_runs/input.yul":80:81   */
-  0x00
-    /* "yul_optimize_runs/input.yul":153:192   */
-  return
-stop
-
-sub_0: assembly {
-        /* "yul_optimize_runs/input.yul":273:293   */
-      0xabc1234500000000000000000000000000000000000000000000000000000000
-        /* "yul_optimize_runs/input.yul":313:314   */
-      0x00
-        /* "yul_optimize_runs/input.yul":306:324   */
-      sstore
-        /* "yul_optimize_runs/input.yul":244:334   */
-      stop
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps/args b/test/cmdlineTests/yul_optimizer_steps/args
deleted file mode 100644
index 1f84565de294..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations dhfoDgvulfnTUtnIf
diff --git a/test/cmdlineTests/yul_optimizer_steps/input.sol b/test/cmdlineTests/yul_optimizer_steps/input.sol
deleted file mode 100644
index 260b21cd57f3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C
-{
-	constructor() {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps/output b/test/cmdlineTests/yul_optimizer_steps/output
deleted file mode 100644
index bb68a48fa809..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps/output
+++ /dev/null
@@ -1,34 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps/input.sol"
-object "C_7" {
-    code {
-        {
-            /// @src 0:80:112  "contract C..."
-            mstore(64, memoryguard(0x80))
-            if callvalue()
-            {
-                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            }
-            let _1 := allocate_unbounded()
-            codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
-            return(_1, datasize("C_7_deployed"))
-        }
-        function allocate_unbounded() -> memPtr
-        { memPtr := mload(64) }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-    }
-    /// @use-src 0:"yul_optimizer_steps/input.sol"
-    object "C_7_deployed" {
-        code {
-            {
-                /// @src 0:80:112  "contract C..."
-                mstore(64, memoryguard(0x80))
-                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            }
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            { revert(0, 0) }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/args b/test/cmdlineTests/yul_optimizer_steps_disabled/args
deleted file mode 100644
index 449d8191c131..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --yul-optimizations dhfoDgvulfnTUtnIf
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/err b/test/cmdlineTests/yul_optimizer_steps_disabled/err
deleted file mode 100644
index a557351ea247..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: --yul-optimizations is invalid if Yul optimizer is disabled
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/exit b/test/cmdlineTests/yul_optimizer_steps_disabled/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/input.sol b/test/cmdlineTests/yul_optimizer_steps_disabled/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/args b/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/args
deleted file mode 100644
index e10815d812c9..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations abcdefg{hijklmno}pqr[st]uvwxyz
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err b/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err
deleted file mode 100644
index 49669b1f6748..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid optimizer step sequence in --yul-optimizations: 'b' is not a valid step abbreviation
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/exit b/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/input.sol b/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/args b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/args
deleted file mode 100644
index 4b536761fdaf..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/input.sol b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
deleted file mode 100644
index 9687abf643b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
+++ /dev/null
@@ -1,79 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps_nested_brackets/input.sol"
-object "C_6" {
-    code {
-        {
-            /// @src 0:60:103  "contract C..."
-            mstore(64, memoryguard(0x80))
-            if callvalue()
-            {
-                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            }
-            let _1 := allocate_unbounded()
-            codecopy(_1, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
-            return(_1, datasize("C_6_deployed"))
-        }
-        function allocate_unbounded() -> memPtr
-        {
-            let memPtr_1 := mload(64)
-            memPtr := memPtr_1
-        }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-    }
-    /// @use-src 0:"yul_optimizer_steps_nested_brackets/input.sol"
-    object "C_6_deployed" {
-        code {
-            {
-                /// @src 0:60:103  "contract C..."
-                mstore(64, memoryguard(0x80))
-                if iszero(lt(calldatasize(), 4))
-                {
-                    let selector := shift_right_unsigned(calldataload(0))
-                    if eq(0x26121ff0, selector) { external_fun_f() }
-                }
-                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            }
-            function shift_right_unsigned(value) -> newValue
-            {
-                let newValue_1 := shr(224, value)
-                newValue := newValue_1
-            }
-            function allocate_unbounded() -> memPtr
-            {
-                let memPtr_1 := mload(64)
-                memPtr := memPtr_1
-            }
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            { revert(0, 0) }
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
-            { revert(0, 0) }
-            function abi_decode(headStart, dataEnd)
-            {
-                if slt(sub(dataEnd, headStart), 0)
-                {
-                    revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
-                }
-            }
-            function abi_encode_tuple(headStart) -> tail
-            {
-                let tail_1 := add(headStart, 0)
-                tail := tail_1
-            }
-            function external_fun_f()
-            {
-                if callvalue()
-                {
-                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-                }
-                abi_decode(4, calldatasize())
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple(memPos)
-                return(memPos, sub(memEnd, memPos))
-            }
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            { revert(0, 0) }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/args b/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/args
deleted file mode 100644
index b2ff99d3ff61..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[a]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
diff --git a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err b/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err
deleted file mode 100644
index a28e8cff1846..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid optimizer step sequence in --yul-optimizations: Brackets nested too deep
diff --git a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/exit b/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/input.sol b/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/args b/test/cmdlineTests/yul_optimizer_steps_short_sequence/args
deleted file mode 100644
index ba2f47ebe2b2..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_short_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations iDu
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol
deleted file mode 100644
index 2d82716f083e..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C {
-    constructor() payable {
-        assembly ("memory-safe") {
-            let a := 0
-            revert(0, a)
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/output b/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
deleted file mode 100644
index dc77ce3c53e7..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
+++ /dev/null
@@ -1,23 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps_short_sequence/input.sol"
-object "C_8" {
-    code {
-        {
-            /// @src 0:80:221  "contract C {..."
-            mstore(64, memoryguard(0x80))
-            /// @src 0:129:213  "assembly (\"memory-safe\") {..."
-            revert(0, 0)
-        }
-    }
-    /// @use-src 0:"yul_optimizer_steps_short_sequence/input.sol"
-    object "C_8_deployed" {
-        code {
-            {
-                /// @src 0:80:221  "contract C {..."
-                mstore(64, memoryguard(0x80))
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/args b/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/args
deleted file mode 100644
index 04933d213e09..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations a]a][
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err b/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err
deleted file mode 100644
index dda1e8c14407..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid optimizer step sequence in --yul-optimizations: Unbalanced brackets
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/exit b/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/input.sol b/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/args b/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/args
deleted file mode 100644
index d0f68f8c4c04..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations a[a][
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err b/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err
deleted file mode 100644
index dda1e8c14407..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Invalid optimizer step sequence in --yul-optimizations: Unbalanced brackets
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/exit b/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/exit
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/input.sol b/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/input.sol
deleted file mode 100644
index 6923ca7023b3..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-	function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args
deleted file mode 100644
index 6673a776a70b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations iDu:
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
deleted file mode 100644
index fc9ba5baf68b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C {
-    constructor() payable {
-        assembly ("memory-safe") {
-            let a := 0
-            // Without the cleanup sequence this will not be simplified to ``revert(a, a)``.
-            revert(0, a)
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
deleted file mode 100644
index 01641c53bc30..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
+++ /dev/null
@@ -1,24 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps_with_empty_cleanup_sequence/input.sol"
-object "C_8" {
-    code {
-        {
-            /// @src 0:80:314  "contract C {..."
-            mstore(64, memoryguard(0x80))
-            /// @src 0:129:306  "assembly (\"memory-safe\") {..."
-            let usr$a := 0
-            revert(0, usr$a)
-        }
-    }
-    /// @use-src 0:"yul_optimizer_steps_with_empty_cleanup_sequence/input.sol"
-    object "C_8_deployed" {
-        code {
-            {
-                /// @src 0:80:314  "contract C {..."
-                mstore(64, memoryguard(0x80))
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args
deleted file mode 100644
index b5d1d3c659c4..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations :iDu
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
deleted file mode 100644
index fc9ba5baf68b..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C {
-    constructor() payable {
-        assembly ("memory-safe") {
-            let a := 0
-            // Without the cleanup sequence this will not be simplified to ``revert(a, a)``.
-            revert(0, a)
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
deleted file mode 100644
index b13e6e2823ff..000000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
+++ /dev/null
@@ -1,24 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps_with_empty_optimization_sequence/input.sol"
-object "C_8" {
-    code {
-        {
-            /// @src 0:80:314  "contract C {..."
-            mstore(64, memoryguard(0x80))
-            /// @src 0:129:306  "assembly (\"memory-safe\") {..."
-            let usr$a := 0
-            revert(0, usr$a)
-        }
-    }
-    /// @use-src 0:"yul_optimizer_steps_with_empty_optimization_sequence/input.sol"
-    object "C_8_deployed" {
-        code {
-            {
-                /// @src 0:80:314  "contract C {..."
-                mstore(64, memoryguard(0x80))
-                revert(0, 0)
-            }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii/input.json b/test/cmdlineTests/yul_string_format_ascii/input.json
deleted file mode 100644
index 7b86b65cdac9..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() external pure returns (string memory) { return \"abcabc\"; } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
deleted file mode 100644
index aa830d1abe9d..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ /dev/null
@@ -1,229 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_11\" {
-    code {
-        /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_11()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_11_deployed\"), datasize(\"C_11_deployed\"))
-
-        return(_1, datasize(\"C_11_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-        function constructor_C_11() {
-
-            /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-
-        }
-        /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_11_deployed\" {
-        code {
-            /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_10()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function array_length_t_string_memory_ptr(value) -> length {
-
-                length := mload(value)
-
-            }
-
-            function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {
-                mstore(pos, length)
-                updated_pos := add(pos, 0x20)
-            }
-
-            function copy_memory_to_memory_with_cleanup(src, dst, length) {
-                let i := 0
-                for { } lt(i, length) { i := add(i, 32) }
-                {
-                    mstore(add(dst, i), mload(add(src, i)))
-                }
-                mstore(add(dst, length), 0)
-            }
-
-            function round_up_to_mul_of_32(value) -> result {
-                result := and(add(value, 31), not(31))
-            }
-
-            function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value, pos) -> end {
-                let length := array_length_t_string_memory_ptr(value)
-                pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length)
-                copy_memory_to_memory_with_cleanup(add(value, 0x20), pos, length)
-                end := add(pos, round_up_to_mul_of_32(length))
-            }
-
-            function abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                mstore(add(headStart, 0), sub(tail, headStart))
-                tail := abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value0,  tail)
-
-            }
-
-            function external_fun_f_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_string_memory_ptr() -> ret {
-                ret := 96
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function finalize_allocation(memPtr, size) {
-                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-                // protect against overflow
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-
-            function allocate_memory(size) -> memPtr {
-                memPtr := allocate_unbounded()
-                finalize_allocation(memPtr, size)
-            }
-
-            function array_allocation_size_t_string_memory_ptr(length) -> size {
-                // Make sure we can allocate memory without overflow
-                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
-
-                size := round_up_to_mul_of_32(length)
-
-                // add length slot
-                size := add(size, 0x20)
-
-            }
-
-            function allocate_memory_array_t_string_memory_ptr(length) -> memPtr {
-                let allocSize := array_allocation_size_t_string_memory_ptr(length)
-                memPtr := allocate_memory(allocSize)
-
-                mstore(memPtr, length)
-
-            }
-
-            function store_literal_in_memory_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21(memPtr) {
-
-                mstore(add(memPtr, 0), \"abcabc\")
-
-            }
-
-            function copy_literal_to_memory_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21() -> memPtr {
-                memPtr := allocate_memory_array_t_string_memory_ptr(6)
-                store_literal_in_memory_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21(add(memPtr, 32))
-            }
-
-            function convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_string_memory_ptr() -> converted {
-                converted := copy_literal_to_memory_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21()
-            }
-
-            /// @ast-id 10
-            /// @src 0:91:162  \"function f() external pure returns (string memory) { return \\\"abcabc\\\"; }\"
-            function fun_f_10() -> var__5_mpos {
-                /// @src 0:127:140  \"string memory\"
-                let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr()
-                var__5_mpos := zero_t_string_memory_ptr_1_mpos
-
-                /// @src 0:144:159  \"return \\\"abcabc\\\"\"
-                var__5_mpos := convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_string_memory_ptr()
-                leave
-
-            }
-            /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32/input.json b/test/cmdlineTests/yul_string_format_ascii_bytes32/input.json
deleted file mode 100644
index cb9318f33eb4..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() external pure returns (bytes32) { return \"abcabc\"; } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
deleted file mode 100644
index bfe775ca40c5..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_11\" {
-    code {
-        /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_11()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_11_deployed\"), datasize(\"C_11_deployed\"))
-
-        return(_1, datasize(\"C_11_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-        function constructor_C_11() {
-
-            /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-
-        }
-        /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_11_deployed\" {
-        code {
-            /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_10()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function cleanup_t_bytes32(value) -> cleaned {
-                cleaned := value
-            }
-
-            function abi_encode_t_bytes32_to_t_bytes32_fromStack(value, pos) {
-                mstore(pos, cleanup_t_bytes32(value))
-            }
-
-            function abi_encode_tuple_t_bytes32__to_t_bytes32__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                abi_encode_t_bytes32_to_t_bytes32_fromStack(value0,  add(headStart, 0))
-
-            }
-
-            function external_fun_f_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_bytes32__to_t_bytes32__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_bytes32() -> ret {
-                ret := 0
-            }
-
-            function convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_bytes32() -> converted {
-                converted := 0x6162636162630000000000000000000000000000000000000000000000000000
-            }
-
-            /// @ast-id 10
-            /// @src 0:91:156  \"function f() external pure returns (bytes32) { return \\\"abcabc\\\"; }\"
-            function fun_f_10() -> var__5 {
-                /// @src 0:127:134  \"bytes32\"
-                let zero_t_bytes32_1 := zero_value_for_split_t_bytes32()
-                var__5 := zero_t_bytes32_1
-
-                /// @src 0:138:153  \"return \\\"abcabc\\\"\"
-                var__5 := convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_bytes32()
-                leave
-
-            }
-            /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/input.json b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/input.json
deleted file mode 100644
index fa45bb24083b..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() external pure returns (bytes4) { return 0x61626364; } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
deleted file mode 100644
index f4b14aadcfc5..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_11\" {
-    code {
-        /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_11()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_11_deployed\"), datasize(\"C_11_deployed\"))
-
-        return(_1, datasize(\"C_11_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-        function constructor_C_11() {
-
-            /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-
-        }
-        /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_11_deployed\" {
-        code {
-            /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_10()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function cleanup_t_bytes4(value) -> cleaned {
-                cleaned := and(value, 0xffffffff00000000000000000000000000000000000000000000000000000000)
-            }
-
-            function abi_encode_t_bytes4_to_t_bytes4_fromStack(value, pos) {
-                mstore(pos, cleanup_t_bytes4(value))
-            }
-
-            function abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                abi_encode_t_bytes4_to_t_bytes4_fromStack(value0,  add(headStart, 0))
-
-            }
-
-            function external_fun_f_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_bytes4() -> ret {
-                ret := 0
-            }
-
-            function cleanup_t_rational_1633837924_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function shift_left_224(value) -> newValue {
-                newValue :=
-
-                shl(224, value)
-
-            }
-
-            function convert_t_rational_1633837924_by_1_to_t_bytes4(value) -> converted {
-                converted := cleanup_t_bytes4(shift_left_224(cleanup_t_rational_1633837924_by_1(value)))
-            }
-
-            /// @ast-id 10
-            /// @src 0:91:157  \"function f() external pure returns (bytes4) { return 0x61626364; }\"
-            function fun_f_10() -> var__5 {
-                /// @src 0:127:133  \"bytes4\"
-                let zero_t_bytes4_1 := zero_value_for_split_t_bytes4()
-                var__5 := zero_t_bytes4_1
-
-                /// @src 0:144:154  \"0x61626364\"
-                let expr_7 := 0x61626364
-                /// @src 0:137:154  \"return 0x61626364\"
-                var__5 := convert_t_rational_1633837924_by_1_to_t_bytes4(expr_7)
-                leave
-
-            }
-            /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/input.json b/test/cmdlineTests/yul_string_format_ascii_long/input.json
deleted file mode 100644
index b55efa9137df..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii_long/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() external pure returns (string memory) { return \"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\"; } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
deleted file mode 100644
index 348e5a0b578c..000000000000
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_11\" {
-    code {
-        /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_11()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_11_deployed\"), datasize(\"C_11_deployed\"))
-
-        return(_1, datasize(\"C_11_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-        function constructor_C_11() {
-
-            /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-
-        }
-        /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_11_deployed\" {
-        code {
-            /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_10()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function array_length_t_string_memory_ptr(value) -> length {
-
-                length := mload(value)
-
-            }
-
-            function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {
-                mstore(pos, length)
-                updated_pos := add(pos, 0x20)
-            }
-
-            function copy_memory_to_memory_with_cleanup(src, dst, length) {
-                let i := 0
-                for { } lt(i, length) { i := add(i, 32) }
-                {
-                    mstore(add(dst, i), mload(add(src, i)))
-                }
-                mstore(add(dst, length), 0)
-            }
-
-            function round_up_to_mul_of_32(value) -> result {
-                result := and(add(value, 31), not(31))
-            }
-
-            function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value, pos) -> end {
-                let length := array_length_t_string_memory_ptr(value)
-                pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length)
-                copy_memory_to_memory_with_cleanup(add(value, 0x20), pos, length)
-                end := add(pos, round_up_to_mul_of_32(length))
-            }
-
-            function abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                mstore(add(headStart, 0), sub(tail, headStart))
-                tail := abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value0,  tail)
-
-            }
-
-            function external_fun_f_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_string_memory_ptr() -> ret {
-                ret := 96
-            }
-
-            function panic_error_0x41() {
-                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-
-            function finalize_allocation(memPtr, size) {
-                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
-                // protect against overflow
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-
-            function allocate_memory(size) -> memPtr {
-                memPtr := allocate_unbounded()
-                finalize_allocation(memPtr, size)
-            }
-
-            function array_allocation_size_t_string_memory_ptr(length) -> size {
-                // Make sure we can allocate memory without overflow
-                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
-
-                size := round_up_to_mul_of_32(length)
-
-                // add length slot
-                size := add(size, 0x20)
-
-            }
-
-            function allocate_memory_array_t_string_memory_ptr(length) -> memPtr {
-                let allocSize := array_allocation_size_t_string_memory_ptr(length)
-                memPtr := allocate_memory(allocSize)
-
-                mstore(memPtr, length)
-
-            }
-
-            function store_literal_in_memory_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571(memPtr) {
-
-                mstore(add(memPtr, 0), \"abcdabcdcafecafeabcdabcdcafecafe\")
-
-                mstore(add(memPtr, 32), \"ffffzzzzoooo0123456789,.<,>.?:;'\")
-
-                mstore(add(memPtr, 64), \"[{]}|`~!@#$%^&*()-_=+\")
-
-            }
-
-            function copy_literal_to_memory_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571() -> memPtr {
-                memPtr := allocate_memory_array_t_string_memory_ptr(85)
-                store_literal_in_memory_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571(add(memPtr, 32))
-            }
-
-            function convert_t_stringliteral_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571_to_t_string_memory_ptr() -> converted {
-                converted := copy_literal_to_memory_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571()
-            }
-
-            /// @ast-id 10
-            /// @src 0:91:241  \"function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; }\"
-            function fun_f_10() -> var__5_mpos {
-                /// @src 0:127:140  \"string memory\"
-                let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr()
-                var__5_mpos := zero_t_string_memory_ptr_1_mpos
-
-                /// @src 0:144:238  \"return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"\"
-                var__5_mpos := convert_t_stringliteral_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571_to_t_string_memory_ptr()
-                leave
-
-            }
-            /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_string_format_hex/input.json b/test/cmdlineTests/yul_string_format_hex/input.json
deleted file mode 100644
index 51d3dcdffe7a..000000000000
--- a/test/cmdlineTests/yul_string_format_hex/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["ir"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/yul_string_format_hex/output.json b/test/cmdlineTests/yul_string_format_hex/output.json
deleted file mode 100644
index 5568fc7a0d1e..000000000000
--- a/test/cmdlineTests/yul_string_format_hex/output.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ir": "
-/// @use-src 0:\"A\"
-object \"C_11\" {
-    code {
-        /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-        mstore(64, memoryguard(128))
-        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-
-        constructor_C_11()
-
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_11_deployed\"), datasize(\"C_11_deployed\"))
-
-        return(_1, datasize(\"C_11_deployed\"))
-
-        function allocate_unbounded() -> memPtr {
-            memPtr := mload(64)
-        }
-
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-            revert(0, 0)
-        }
-
-        /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-        function constructor_C_11() {
-
-            /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-
-        }
-        /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-
-    }
-    /// @use-src 0:\"A\"
-    object \"C_11_deployed\" {
-        code {
-            /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-            mstore(64, memoryguard(128))
-
-            if iszero(lt(calldatasize(), 4))
-            {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-
-                case 0x26121ff0
-                {
-                    // f()
-
-                    external_fun_f_10()
-                }
-
-                default {}
-            }
-
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-
-            function shift_right_224_unsigned(value) -> newValue {
-                newValue :=
-
-                shr(224, value)
-
-            }
-
-            function allocate_unbounded() -> memPtr {
-                memPtr := mload(64)
-            }
-
-            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
-                revert(0, 0)
-            }
-
-            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() {
-                revert(0, 0)
-            }
-
-            function abi_decode_tuple_(headStart, dataEnd)   {
-                if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
-
-            }
-
-            function cleanup_t_bytes4(value) -> cleaned {
-                cleaned := and(value, 0xffffffff00000000000000000000000000000000000000000000000000000000)
-            }
-
-            function abi_encode_t_bytes4_to_t_bytes4_fromStack(value, pos) {
-                mstore(pos, cleanup_t_bytes4(value))
-            }
-
-            function abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(headStart , value0) -> tail {
-                tail := add(headStart, 32)
-
-                abi_encode_t_bytes4_to_t_bytes4_fromStack(value0,  add(headStart, 0))
-
-            }
-
-            function external_fun_f_10() {
-
-                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                abi_decode_tuple_(4, calldatasize())
-                let ret_0 :=  fun_f_10()
-                let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
-                return(memPos, sub(memEnd, memPos))
-
-            }
-
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
-                revert(0, 0)
-            }
-
-            function zero_value_for_split_t_bytes4() -> ret {
-                ret := 0
-            }
-
-            function cleanup_t_rational_2864434397_by_1(value) -> cleaned {
-                cleaned := value
-            }
-
-            function shift_left_224(value) -> newValue {
-                newValue :=
-
-                shl(224, value)
-
-            }
-
-            function convert_t_rational_2864434397_by_1_to_t_bytes4(value) -> converted {
-                converted := cleanup_t_bytes4(shift_left_224(cleanup_t_rational_2864434397_by_1(value)))
-            }
-
-            /// @ast-id 10
-            /// @src 0:91:157  \"function f() external pure returns (bytes4) { return 0xaabbccdd; }\"
-            function fun_f_10() -> var__5 {
-                /// @src 0:127:133  \"bytes4\"
-                let zero_t_bytes4_1 := zero_value_for_split_t_bytes4()
-                var__5 := zero_t_bytes4_1
-
-                /// @src 0:144:154  \"0xaabbccdd\"
-                let expr_7 := 0xaabbccdd
-                /// @src 0:137:154  \"return 0xaabbccdd\"
-                var__5 := convert_t_rational_2864434397_by_1_to_t_bytes4(expr_7)
-                leave
-
-            }
-            /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-
-        }
-
-        data \".metadata\" hex\"<BYTECODE REMOVED>\"
-    }
-
-}
-
-"
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/yul_verbatim/args b/test/cmdlineTests/yul_verbatim/args
deleted file mode 100644
index 2c89c24e0a35..000000000000
--- a/test/cmdlineTests/yul_verbatim/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly
diff --git a/test/cmdlineTests/yul_verbatim/input.yul b/test/cmdlineTests/yul_verbatim/input.yul
deleted file mode 100644
index 182cdc75ddc9..000000000000
--- a/test/cmdlineTests/yul_verbatim/input.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    let x := 2
-    let y := sub(x, 2)
-    let t := verbatim_2i_1o("abc", x, y)
-    sstore(t, x)
-    let r := verbatim_0i_1o("def")
-    verbatim_0i_0o("xyz")
-    // more than 32 bytes
-    verbatim_0i_0o(hex"01020304050607090001020304050607090001020304050607090001020102030405060709000102030405060709000102030405060709000102")
-    r := 9
-}
diff --git a/test/cmdlineTests/yul_verbatim/output b/test/cmdlineTests/yul_verbatim/output
deleted file mode 100644
index 60fc7e6d1f46..000000000000
--- a/test/cmdlineTests/yul_verbatim/output
+++ /dev/null
@@ -1,58 +0,0 @@
-
-======= yul_verbatim/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        let x := 2
-        let y := sub(x, 2)
-        let t := verbatim_2i_1o("abc", x, y)
-        sstore(t, x)
-        let r := verbatim_0i_1o("def")
-        verbatim_0i_0o("xyz")
-        verbatim_0i_0o("\x01\x02\x03\x04\x05\x06\x07\t\x00\x01\x02\x03\x04\x05\x06\x07\t\x00\x01\x02\x03\x04\x05\x06\x07\t\x00\x01\x02\x01\x02\x03\x04\x05\x06\x07\t\x00\x01\x02\x03\x04\x05\x06\x07\t\x00\x01\x02\x03\x04\x05\x06\x07\t\x00\x01\x02")
-        r := 9
-    }
-}
-
-
-Binary representation:
-6002808103808261626382815564656678797a010203040506070900010203040506070900010203040506070900010201020304050607090001020304050607090001020304050607090001026009905050505050
-
-Text representation:
-    /* "yul_verbatim/input.yul":15:16   */
-  0x02
-    /* "yul_verbatim/input.yul":37:38   */
-  dup1
-    /* "yul_verbatim/input.yul":34:35   */
-  dup2
-    /* "yul_verbatim/input.yul":30:39   */
-  sub
-    /* "yul_verbatim/input.yul":78:79   */
-  dup1
-    /* "yul_verbatim/input.yul":75:76   */
-  dup3
-    /* "yul_verbatim/input.yul":53:80   */
-  verbatimbytecode_616263
-    /* "yul_verbatim/input.yul":95:96   */
-  dup3
-    /* "yul_verbatim/input.yul":92:93   */
-  dup2
-    /* "yul_verbatim/input.yul":85:97   */
-  sstore
-    /* "yul_verbatim/input.yul":111:132   */
-  verbatimbytecode_646566
-    /* "yul_verbatim/input.yul":137:158   */
-  verbatimbytecode_78797a
-    /* "yul_verbatim/input.yul":189:326   */
-  verbatimbytecode_01020304050607090001020304050607090001020304050607090001020102030405060709000102030405060709000102030405060709000102
-    /* "yul_verbatim/input.yul":336:337   */
-  0x09
-    /* "yul_verbatim/input.yul":331:337   */
-  swap1
-  pop
-    /* "yul_verbatim/input.yul":0:339   */
-  pop
-  pop
-  pop
-  pop
diff --git a/test/cmdlineTests/yul_verbatim_msize/args b/test/cmdlineTests/yul_verbatim_msize/args
deleted file mode 100644
index 9c4127880767..000000000000
--- a/test/cmdlineTests/yul_verbatim_msize/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_verbatim_msize/input.yul b/test/cmdlineTests/yul_verbatim_msize/input.yul
deleted file mode 100644
index c9294e258662..000000000000
--- a/test/cmdlineTests/yul_verbatim_msize/input.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    // The optimizer assumes verbatim could contain msize,
-    // so it cannot optimize the mload away.
-    let x := mload(0x2000)
-    verbatim_0i_0o("aa")
-    sstore(0, 2)
-}
diff --git a/test/cmdlineTests/yul_verbatim_msize/output b/test/cmdlineTests/yul_verbatim_msize/output
deleted file mode 100644
index 22259fff71a1..000000000000
--- a/test/cmdlineTests/yul_verbatim_msize/output
+++ /dev/null
@@ -1,34 +0,0 @@
-
-======= yul_verbatim_msize/input.yul (EVM) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        {
-            pop(mload(0x2000))
-            verbatim_0i_0o("aa")
-            sstore(0, 2)
-        }
-    }
-}
-
-
-Binary representation:
-6120005150616160025f5500
-
-Text representation:
-    /* "yul_verbatim_msize/input.yul":125:131   */
-  0x2000
-    /* "yul_verbatim_msize/input.yul":119:132   */
-  mload
-  pop
-    /* "yul_verbatim_msize/input.yul":137:157   */
-  verbatimbytecode_6161
-    /* "yul_verbatim_msize/input.yul":172:173   */
-  0x02
-    /* "yul_verbatim_msize/input.yul":169:170   */
-  0x00
-    /* "yul_verbatim_msize/input.yul":162:174   */
-  sstore
-    /* "yul_verbatim_msize/input.yul":0:176   */
-  stop
diff --git a/test/cmdlineTests/~assembler_modes/test.sh b/test/cmdlineTests/~assembler_modes/test.sh
deleted file mode 100755
index 5ca1bb40f82b..000000000000
--- a/test/cmdlineTests/~assembler_modes/test.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-function test_solc_assembly_output
-{
-    local input="${1}"
-    local expected="${2}"
-    IFS=" " read -r -a solc_args <<< "${3}"
-
-    local expected_object="object \"object\" { code ${expected} }"
-
-    output=$(echo "${input}" | msg_on_error --no-stderr "$SOLC" - "${solc_args[@]}")
-    empty=$(echo "$output" | tr '\n' ' ' | tr -s ' ' | sed -ne "/${expected_object}/p")
-    if [ -z "$empty" ]
-    then
-        printError "Incorrect assembly output. Expected: "
-        >&2 echo -e "${expected}"
-        printError "with arguments ${solc_args[*]}, but got:"
-        >&2 echo "${output}"
-        fail
-    fi
-}
-
-echo '{}' | msg_on_error --silent "$SOLC" - --assemble
-echo '{}' | msg_on_error --silent "$SOLC" - --yul
-echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
-
-# Test options above in conjunction with --optimize.
-# Using both, --assemble and --optimize should fail.
-echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
-echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
-
-# Test yul and strict assembly output
-# Non-empty code results in non-empty binary representation with optimizations turned off,
-# while it results in empty binary representation with optimizations turned on.
-test_solc_assembly_output "{ let x:u256 := 0:u256 mstore(0, x) }" "{ { let x := 0 mstore(0, x) } }" "--yul"
-test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) mstore(0, x) }" "{ { let x := bitnot(7) mstore(0, x) } }" "--yul"
-test_solc_assembly_output "{ let t:bool := not(true) if t { mstore(0, 1) } }" "{ { let t:bool := not(true) if t { mstore(0, 1) } } }" "--yul"
-test_solc_assembly_output "{ let x := 0 mstore(0, x) }" "{ { let x := 0 mstore(0, x) } }" "--strict-assembly"
-test_solc_assembly_output "{ let x := 0 mstore(0, x) }" "{ { } }" "--strict-assembly --optimize"
diff --git a/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh b/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
deleted file mode 100755
index e6a69d28b249..000000000000
--- a/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-"$REPO_ROOT/test/stopAfterParseTests.sh"
diff --git a/test/cmdlineTests/~ast_import_export/test.sh b/test/cmdlineTests/~ast_import_export/test.sh
deleted file mode 100755
index ff3ab8811387..000000000000
--- a/test/cmdlineTests/~ast_import_export/test.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-ast-import-export-XXXXXX")
-cd "$SOLTMPDIR"
-if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
-then
-    rm -r "$SOLTMPDIR"
-    fail
-fi
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol b/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol
deleted file mode 100644
index 43099c7a3642..000000000000
--- a/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-==== Source: A.sol ====
-import "@/D.sol";
-import "B.sol";
-
-contract A is B {
-    function a() public pure {
-        e();
-    }
-}
-
-==== Source: B.sol ====
-import "C.sol";
-
-abstract contract B is C {}
-
-==== Source: C.sol ====
-abstract contract C {
-    function c() public pure returns (uint) {
-        return 0;
-    }
-}
-
-==== Source: @/D.sol ====
-import "@/E.sol";
-
-==== Source: @/E.sol ====
-function e() pure returns (bytes memory returndata) {
-    return "";
-}
diff --git a/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py b/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py
deleted file mode 100755
index 32be181e5ad2..000000000000
--- a/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-from pathlib import Path
-from textwrap import dedent
-
-# pylint: disable=wrong-import-position
-PROJECT_ROOT = Path(__file__).parents[3]
-sys.path.insert(0, str(PROJECT_ROOT / 'scripts'))
-
-from common.cmdline_helpers import add_preamble
-from common.cmdline_helpers import inside_temporary_dir
-from common.cmdline_helpers import save_bytecode
-from common.cmdline_helpers import solc_bin_report
-from common.git_helpers import git_diff
-from splitSources import split_sources
-
-
-@inside_temporary_dir(Path(__file__).parent.name)
-def test_bytecode_equivalence():
-    source_file_path = Path(__file__).parent / 'inputs.sol'
-    split_sources(source_file_path, suppress_output=True)
-    add_preamble(Path.cwd())
-
-    solc_binary = os.environ.get('SOLC')
-    if solc_binary is None:
-        raise RuntimeError(dedent("""\
-            `solc` compiler not found.
-            Please ensure you set the SOLC environment variable
-            with the correct path to the compiler's binary.
-        """))
-
-    # Whether a file is passed to the compiler explicitly or only discovered when traversing imports
-    # may affect the order in which files are processed and result in different AST IDs.
-    # This, however, must not result in different bytecode being generated.
-    save_bytecode(Path('A.bin'), solc_bin_report(solc_binary, [Path('A.sol')], via_ir=True))
-    save_bytecode(Path('AB.bin'), solc_bin_report(solc_binary, [Path('A.sol'), Path('B.sol')], via_ir=True))
-    return git_diff(Path('A.bin'), Path('AB.bin'))
-
-
-if __name__ == '__main__':
-    sys.exit(test_bytecode_equivalence())
diff --git a/test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh b/test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh
deleted file mode 100755
index 4a7fe05b8b8e..000000000000
--- a/test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-function test_cli_and_standard_json_equivalence
-{
-    (( $# == 5 )) || assertFail
-    local cli_options="$1"
-    local selected_cli_output="$2"
-    local standard_json_settings="$3"
-    local selected_standard_json_output="$4"
-    local input_file_relative_path="$5"
-
-    # CLI normalizes paths, Standard JSON uses them as is. Using paths that would change under this
-    # normalization will make the comparison fail. To avoid this use already normalized paths.
-    # The sanity check below should reject most of these by disallowing absolute paths, relative
-    # paths with ./ or ../ segments and paths with redundant slashes, but keep in mind it's not foolproof.
-    [[ $input_file_relative_path =~ ^/|^\.$|\./|^\.\.$|\.\./|// ]] && assertfail
-
-    local cli_output standard_json_output
-    cli_output=$(
-        # shellcheck disable=SC2086 # Intentionally unquoted. May contain multiple options.
-        msg_on_error --no-stderr \
-            "$SOLC" $cli_options "$selected_cli_output" "$input_file_relative_path"
-    )
-    standard_json_output=$(
-        singleContractOutputViaStandardJSON \
-            Solidity \
-            "$selected_standard_json_output" \
-            "$standard_json_settings" \
-            "$input_file_relative_path"
-    )
-
-    diff_values \
-        "$(echo "$cli_output" | stripCLIDecorations | stripEmptyLines)" \
-        "$(echo "$standard_json_output" | stripEmptyLines)" \
-        --ignore-space-change \
-        --ignore-blank-lines
-}
-
-cd "$REPO_ROOT"
-
-printTask "    - --optimize vs optimizer.enabled: true (--asm output)"
-test_cli_and_standard_json_equivalence \
-    '--optimize' \
-    '--asm' \
-    '"optimizer": {"enabled": true}' \
-    'evm.assembly' \
-    "test/libsolidity/semanticTests/various/erc20.sol"
-
-printTask "    - --optimize-yul vs optimizer.details.yul: true (--asm output)"
-test_cli_and_standard_json_equivalence \
-    '--optimize-yul' \
-    '--asm' \
-    '"optimizer": {"enabled": false, "details": {"yul": true}}' \
-    'evm.assembly' \
-    "test/libsolidity/semanticTests/various/erc20.sol"
diff --git a/test/cmdlineTests/~compilation_tests/test.sh b/test/cmdlineTests/~compilation_tests/test.sh
deleted file mode 100755
index d411c5ce85e5..000000000000
--- a/test/cmdlineTests/~compilation_tests/test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-cd "$REPO_ROOT"/test/compilationTests/
-for dir in */
-do
-    echo "    - $dir"
-    cd "$dir"
-    # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
-    compileFull --expect-warnings $(find . -name '*.sol')
-    cd ..
-done
diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
deleted file mode 100755
index 1acf5e8a7a4f..000000000000
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-docs-examples-XXXXXX")
-cd "$SOLTMPDIR"
-
-"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-
-developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
-
-for f in *.yul *.sol
-do
-    # The contributors guide uses syntax tests, but we cannot
-    # really handle them here.
-    if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
-    then
-        continue
-    fi
-    echo "    - Compiling example $f"
-
-    opts=()
-    # We expect errors if explicitly stated, or if imports
-    # are used (in the style guide)
-    if grep -E "// This will not compile" "$f" >/dev/null ||
-        sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
-    then
-        opts=(--expect-errors)
-    fi
-    if grep "// This will report a warning" "$f" >/dev/null
-    then
-        opts+=(--expect-warnings)
-    fi
-    if grep "// This may report a warning" "$f" >/dev/null
-    then
-        opts+=(--ignore-warnings)
-    fi
-
-    # Disable the version pragma in code snippets that only work with the current development version.
-    # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
-    sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
-    compileFull "${opts[@]}" "$SOLTMPDIR/$f"
-done
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~evmasm_import_export/test.sh b/test/cmdlineTests/~evmasm_import_export/test.sh
deleted file mode 100755
index f1ef07af8dcb..000000000000
--- a/test/cmdlineTests/~evmasm_import_export/test.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-evmasm-import-export-XXXXXX")
-cd "$SOLTMPDIR"
-if ! "$REPO_ROOT/scripts/ASTImportTest.sh" evm-assembly
-then
-    rm -r "$SOLTMPDIR"
-    fail
-fi
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~library_checksum/test.sh b/test/cmdlineTests/~library_checksum/test.sh
deleted file mode 100755
index bb5fbf51de2f..000000000000
--- a/test/cmdlineTests/~library_checksum/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries a=0x90f20564390eAe531E810af625A22f51385Cd222
-echo '' | "$SOLC" - --link --libraries a=0x80f20564390eAe531E810af625A22f51385Cd222 &>/dev/null && \
-    fail "solc --link did not reject a library address with an invalid checksum."
-
-exit 0
diff --git a/test/cmdlineTests/~library_long_names/test.sh b/test/cmdlineTests/~library_long_names/test.sh
deleted file mode 100755
index ad3008cdd5ea..000000000000
--- a/test/cmdlineTests/~library_long_names/test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname=0x90f20564390eAe531E810af625A22f51385Cd222
diff --git a/test/cmdlineTests/~linking/test.sh b/test/cmdlineTests/~linking/test.sh
deleted file mode 100755
index ad7d9e173614..000000000000
--- a/test/cmdlineTests/~linking/test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-linking-XXXXXX")
-cd "$SOLTMPDIR"
-
-echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
-msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
-
-# Explanation and placeholder should be there
-grep -q '//' C.bin && grep -q '__' C.bin
-
-# But not in library file.
-grep -q -v '[/_]' L.bin
-
-# Now link
-printf "    "
-msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
-
-# Now the placeholder and explanation should be gone.
-grep -q -v '[/_]' C.bin
-
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul b/test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul
deleted file mode 100644
index 2ed2f27ff0e5..000000000000
--- a/test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-object "C" {
-    code {}
-
-    object "C_deployed" {
-        code {
-            main(0, 0)
-
-            function main(a, b) {
-                for {} 1 {}
-                {
-                    if iszero(a) { break }
-
-                    let mid := avg(a, a)
-                    switch a
-                    case 0 {
-                        a := mid
-                    }
-                    default {
-                        sstore(0, mid)
-                    }
-                }
-            }
-
-            function avg(x, y) -> var {
-                let __placeholder__ := add(x, y)
-                var := add(__placeholder__, __placeholder__)
-            }
-        }
-    }
-}
diff --git a/test/cmdlineTests/~name_dependent_cse_bug/test.sh b/test/cmdlineTests/~name_dependent_cse_bug/test.sh
deleted file mode 100755
index 96c3ac23ed97..000000000000
--- a/test/cmdlineTests/~name_dependent_cse_bug/test.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-
-# This is a regression test against https://github.com/ethereum/solidity/issues/14494
-# Due to the bug, a decision about which variable to use to replace a subexpression in CSE would
-# depend on sorting order of variable names. A variable not being used as a replacement could lead
-# to it being unused in general and removed by Unused Pruner. This would show up as a difference
-# in the bytecode.
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
-
-function assemble_with_variable_name {
-    local input_file="$1"
-    local variable_name="$2"
-
-    sed -e "s|__placeholder__|${variable_name}|g" "$input_file" | msg_on_error --no-stderr \
-        "$SOLC" --strict-assembly - --optimize --debug-info none |
-            stripCLIDecorations
-}
-
-diff_values \
-    "$(assemble_with_variable_name "${SCRIPT_DIR}/cse_bug.yul" _1)" \
-    "$(assemble_with_variable_name "${SCRIPT_DIR}/cse_bug.yul" _2)"
diff --git a/test/cmdlineTests/~overwriting_files/test.sh b/test/cmdlineTests/~overwriting_files/test.sh
deleted file mode 100755
index acb8a7aca29e..000000000000
--- a/test/cmdlineTests/~overwriting_files/test.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-overwriting-files-XXXXXX")
-
-# First time it works
-echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-
-# Second time it fails
-echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
-    fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
-
-# Unless we force
-echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
deleted file mode 100755
index 2d2312fd1586..000000000000
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-soljson-via-fuzzer-XXXXXX")
-cd "$SOLTMPDIR"
-
-"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
-"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-
-echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
-echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
-
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~standard_input/test.sh b/test/cmdlineTests/~standard_input/test.sh
deleted file mode 100755
index 4aab34be1fee..000000000000
--- a/test/cmdlineTests/~standard_input/test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-set +e
-output=$("$SOLC" --bin 2>&1)
-result=$?
-set -e
-
-# This should fail
-if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
-then
-    fail "Incorrect response to empty input arg list: $output"
-fi
-
-# The contract should be compiled
-if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
-then
-    fail "Failed to compile a simple contract from standard input"
-fi
-
-# This should not fail
-echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
-    "$SOLC" --ast-compact-json -
diff --git a/test/cmdlineTests/~unknown_options/test.sh b/test/cmdlineTests/~unknown_options/test.sh
deleted file mode 100755
index 373a849d281a..000000000000
--- a/test/cmdlineTests/~unknown_options/test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-set +e
-output=$("$SOLC" --allow=test 2>&1)
-failed=$?
-set -e
-
-if [[ $output != "Error: unrecognised option '--allow=test'" ]] || (( failed == 0 ))
-then
-    fail "Incorrect response to unknown options: $output"
-fi
diff --git a/test/cmdlineTests/~update_bugs_by_version/test.sh b/test/cmdlineTests/~update_bugs_by_version/test.sh
deleted file mode 100755
index 6ec1d069bcba..000000000000
--- a/test/cmdlineTests/~update_bugs_by_version/test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-SOLTMPDIR=$(mktemp -d -t "cmdline-test-update-bugs-by-version-XXXXXX")
-
-cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
-"${REPO_ROOT}/scripts/update_bugs_by_version.py"
-
-diff --unified "${SOLTMPDIR}/original_bugs_by_version.json" "${REPO_ROOT}/docs/bugs_by_version.json" || \
-    fail "The bug list in bugs_by_version.json was out of date and has been updated. Please investigate and submit a bugfix if necessary."
-
-rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
deleted file mode 100755
index d663bef858c5..000000000000
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-# shellcheck source=scripts/common_cmdline.sh
-source "${REPO_ROOT}/scripts/common_cmdline.sh"
-
-function test_via_ir_equivalence()
-{
-    (( $# <= 2 )) || fail "This function accepts at most two arguments."
-    local solidity_file="$1"
-    local optimize_flag="$2"
-    [[ $optimize_flag == --optimize || $optimize_flag == "" ]] || assertFail "The second argument must be --optimize if present."
-
-    local output_file_prefix
-    output_file_prefix=$(basename "$solidity_file" .sol)
-
-    SOLTMPDIR=$(mktemp -d -t "cmdline-test-via-ir-equivalence-${output_file_prefix}-XXXXXX")
-    pushd "$SOLTMPDIR" > /dev/null
-
-    local optimizer_flags=()
-    [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
-    [[ $optimize_flag == "" ]] || output_file_prefix+="_optimize"
-
-    msg_on_error --no-stderr \
-        "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-            stripCLIDecorations |
-            split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
-
-    local asm_output_two_stage asm_output_via_ir
-
-    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
-        asm_output_two_stage+=$(
-            msg_on_error --no-stderr \
-                "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" --no-optimize-yul "$yul_file" |
-                    stripCLIDecorations
-        )
-    done
-
-    asm_output_via_ir=$(
-        msg_on_error --no-stderr \
-            "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-                stripCLIDecorations
-    )
-
-    diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
-
-    local bin_output_two_stage bin_output_via_ir
-
-    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
-        bin_output_two_stage+=$(
-            msg_on_error --no-stderr \
-                "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" --no-optimize-yul |
-                    stripCLIDecorations
-        )
-    done
-
-    bin_output_via_ir=$(
-        msg_on_error --no-stderr \
-            "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" | stripCLIDecorations
-    )
-
-    diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
-
-    popd > /dev/null
-    rm -r "$SOLTMPDIR"
-}
-
-externalContracts=(
-    externalTests/solc-js/DAO/TokenCreation.sol
-    libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
-    libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
-    libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
-    libsolidity/semanticTests/externalContracts/deposit_contract.sol
-    libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-    libsolidity/semanticTests/externalContracts/snark.sol
-)
-
-requiresOptimizer=(
-    externalTests/solc-js/DAO/TokenCreation.sol
-    libsolidity/semanticTests/externalContracts/deposit_contract.sol
-    libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-    libsolidity/semanticTests/externalContracts/snark.sol
-)
-
-for contractFile in "${externalContracts[@]}"
-do
-    if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
-    then
-        printTask "    - ${contractFile}"
-        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
-    fi
-
-    printTask "    - ${contractFile} (optimized)"
-    test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
-done
diff --git a/test/compilationTests/MultiSigWallet/Factory.sol b/test/compilationTests/MultiSigWallet/Factory.sol
deleted file mode 100644
index f37d230f6354..000000000000
--- a/test/compilationTests/MultiSigWallet/Factory.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract Factory {
-
-    event ContractInstantiation(address sender, address instantiation);
-
-    mapping(address => bool) public isInstantiation;
-    mapping(address => address[]) public instantiations;
-
-    /// @dev Returns number of instantiations by creator.
-    /// @param creator Contract creator.
-    /// @return Returns number of instantiations by creator.
-    function getInstantiationCount(address creator)
-        public
-        view
-        returns (uint)
-    {
-        return instantiations[creator].length;
-    }
-
-    /// @dev Registers contract in factory registry.
-    /// @param instantiation Address of contract instantiation.
-    function register(address instantiation)
-        internal
-    {
-        isInstantiation[instantiation] = true;
-        instantiations[msg.sender].push(instantiation);
-        emit ContractInstantiation(msg.sender, instantiation);
-    }
-}
diff --git a/test/compilationTests/MultiSigWallet/LICENSE b/test/compilationTests/MultiSigWallet/LICENSE
deleted file mode 100644
index 94a9ed024d38..000000000000
--- a/test/compilationTests/MultiSigWallet/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
deleted file mode 100644
index 6f1b8a975e8d..000000000000
--- a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
+++ /dev/null
@@ -1,366 +0,0 @@
-pragma solidity >=0.0;
-
-
-/// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.
-/// @author Stefan George - <stefan.george@consensys.net>
-contract MultiSigWallet {
-
-    uint constant public MAX_OWNER_COUNT = 50;
-
-    event Confirmation(address indexed sender, uint indexed transactionId);
-    event Revocation(address indexed sender, uint indexed transactionId);
-    event Submission(uint indexed transactionId);
-    event Execution(uint indexed transactionId);
-    event ExecutionFailure(uint indexed transactionId);
-    event Deposit(address indexed sender, uint value);
-    event OwnerAddition(address indexed owner);
-    event OwnerRemoval(address indexed owner);
-    event RequirementChange(uint required);
-
-    mapping (uint => Transaction) public transactions;
-    mapping (uint => mapping (address => bool)) public confirmations;
-    mapping (address => bool) public isOwner;
-    address[] public owners;
-    uint public required;
-    uint public transactionCount;
-
-    struct Transaction {
-        address destination;
-        uint value;
-        bytes data;
-        bool executed;
-    }
-
-    modifier onlyWallet() {
-        if (msg.sender != address(this))
-            revert();
-        _;
-    }
-
-    modifier ownerDoesNotExist(address owner) {
-        if (isOwner[owner])
-            revert();
-        _;
-    }
-
-    modifier ownerExists(address owner) {
-        if (!isOwner[owner])
-            revert();
-        _;
-    }
-
-    modifier transactionExists(uint transactionId) {
-        if (transactions[transactionId].destination == address(0))
-            revert();
-        _;
-    }
-
-    modifier confirmed(uint transactionId, address owner) {
-        if (!confirmations[transactionId][owner])
-            revert();
-        _;
-    }
-
-    modifier notConfirmed(uint transactionId, address owner) {
-        if (confirmations[transactionId][owner])
-            revert();
-        _;
-    }
-
-    modifier notExecuted(uint transactionId) {
-        if (transactions[transactionId].executed)
-            revert();
-        _;
-    }
-
-    modifier notNull(address _address) {
-        if (_address == address(0))
-            revert();
-        _;
-    }
-
-    modifier validRequirement(uint ownerCount, uint _required) {
-        if (   ownerCount > MAX_OWNER_COUNT
-            || _required > ownerCount
-            || _required == 0
-            || ownerCount == 0)
-            revert();
-        _;
-    }
-
-    /// @dev Contract constructor sets initial owners and required number of confirmations.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    constructor(address[] memory _owners, uint _required)
-        validRequirement(_owners.length, _required)
-    {
-        for (uint i=0; i<_owners.length; i++) {
-            if (isOwner[_owners[i]] || _owners[i] == address(0))
-                revert();
-            isOwner[_owners[i]] = true;
-        }
-        owners = _owners;
-        required = _required;
-    }
-
-    /// @dev Receive function allows to deposit ether.
-    receive()
-        external
-        payable
-    {
-        if (msg.value > 0)
-            emit Deposit(msg.sender, msg.value);
-    }
-
-    /*
-     * Public functions
-     */
-
-    /// @dev Allows to add a new owner. Transaction has to be sent by wallet.
-    /// @param owner Address of new owner.
-    function addOwner(address owner)
-        public
-        onlyWallet
-        ownerDoesNotExist(owner)
-        notNull(owner)
-        validRequirement(owners.length + 1, required)
-    {
-        isOwner[owner] = true;
-        owners.push(owner);
-        emit OwnerAddition(owner);
-    }
-
-    /// @dev Allows to remove an owner. Transaction has to be sent by wallet.
-    /// @param owner Address of owner.
-    function removeOwner(address owner)
-        public
-        onlyWallet
-        ownerExists(owner)
-    {
-        isOwner[owner] = false;
-        for (uint i=0; i<owners.length - 1; i++)
-            if (owners[i] == owner) {
-                owners[i] = owners[owners.length - 1];
-                break;
-            }
-        owners.pop();
-        if (required > owners.length)
-            changeRequirement(owners.length);
-        emit OwnerRemoval(owner);
-    }
-
-    /// @dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.
-    /// @param owner Address of owner to be replaced.
-    /// @param owner Address of new owner.
-    function replaceOwner(address owner, address newOwner)
-        public
-        onlyWallet
-        ownerExists(owner)
-        ownerDoesNotExist(newOwner)
-    {
-        for (uint i=0; i<owners.length; i++)
-            if (owners[i] == owner) {
-                owners[i] = newOwner;
-                break;
-            }
-        isOwner[owner] = false;
-        isOwner[newOwner] = true;
-        emit OwnerRemoval(owner);
-        emit OwnerAddition(newOwner);
-    }
-
-    /// @dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.
-    /// @param _required Number of required confirmations.
-    function changeRequirement(uint _required)
-        public
-        onlyWallet
-        validRequirement(owners.length, _required)
-    {
-        required = _required;
-        emit RequirementChange(_required);
-    }
-
-    /// @dev Allows an owner to submit and confirm a transaction.
-    /// @param destination Transaction target address.
-    /// @param value Transaction ether value.
-    /// @param data Transaction data payload.
-    /// @return transactionId Returns transaction ID.
-    function submitTransaction(address destination, uint value, bytes memory data)
-        public
-        returns (uint transactionId)
-    {
-        transactionId = addTransaction(destination, value, data);
-        confirmTransaction(transactionId);
-    }
-
-    /// @dev Allows an owner to confirm a transaction.
-    /// @param transactionId Transaction ID.
-    function confirmTransaction(uint transactionId)
-        public
-        ownerExists(msg.sender)
-        transactionExists(transactionId)
-        notConfirmed(transactionId, msg.sender)
-    {
-        confirmations[transactionId][msg.sender] = true;
-        emit Confirmation(msg.sender, transactionId);
-        executeTransaction(transactionId);
-    }
-
-    /// @dev Allows an owner to revoke a confirmation for a transaction.
-    /// @param transactionId Transaction ID.
-    function revokeConfirmation(uint transactionId)
-        public
-        ownerExists(msg.sender)
-        confirmed(transactionId, msg.sender)
-        notExecuted(transactionId)
-    {
-        confirmations[transactionId][msg.sender] = false;
-        emit Revocation(msg.sender, transactionId);
-    }
-
-    /// @dev Allows anyone to execute a confirmed transaction.
-    /// @param transactionId Transaction ID.
-    function executeTransaction(uint transactionId)
-        virtual
-        public
-        notExecuted(transactionId)
-    {
-        if (isConfirmed(transactionId)) {
-            Transaction storage transaction = transactions[transactionId];
-            (transaction.executed,) = transaction.destination.call{value: transaction.value}(transaction.data);
-            if (transaction.executed)
-                emit Execution(transactionId);
-            else
-                emit ExecutionFailure(transactionId);
-        }
-    }
-
-    /// @dev Returns the confirmation status of a transaction.
-    /// @param transactionId Transaction ID.
-    /// @return Confirmation status.
-    function isConfirmed(uint transactionId)
-        public
-        view
-        returns (bool)
-    {
-        uint count = 0;
-        for (uint i=0; i<owners.length; i++) {
-            if (confirmations[transactionId][owners[i]])
-                count += 1;
-            if (count == required)
-                return true;
-        }
-        return false;
-    }
-
-    /*
-     * Web3 call functions
-     */
-    /// @dev Returns number of confirmations of a transaction.
-    /// @param transactionId Transaction ID.
-    /// @return count Number of confirmations.
-    function getConfirmationCount(uint transactionId)
-        public
-        view
-        returns (uint count)
-    {
-        for (uint i=0; i<owners.length; i++)
-            if (confirmations[transactionId][owners[i]])
-                count += 1;
-    }
-
-    /// @dev Returns total number of transactions after filers are applied.
-    /// @param pending Include pending transactions.
-    /// @param executed Include executed transactions.
-    /// @return count Total number of transactions after filters are applied.
-    function getTransactionCount(bool pending, bool executed)
-        public
-        view
-        returns (uint count)
-    {
-        for (uint i=0; i<transactionCount; i++)
-            if (   pending && !transactions[i].executed
-                || executed && transactions[i].executed)
-                count += 1;
-    }
-
-    /// @dev Returns list of owners.
-    /// @return List of owner addresses.
-    function getOwners()
-        public
-        view
-        returns (address[] memory)
-    {
-        return owners;
-    }
-
-    /// @dev Returns array with owner addresses, which confirmed transaction.
-    /// @param transactionId Transaction ID.
-    /// @return _confirmations Returns array of owner addresses.
-    function getConfirmations(uint transactionId)
-        public
-        view
-        returns (address[] memory _confirmations)
-    {
-        address[] memory confirmationsTemp = new address[](owners.length);
-        uint count = 0;
-        uint i;
-        for (i=0; i<owners.length; i++)
-            if (confirmations[transactionId][owners[i]]) {
-                confirmationsTemp[count] = owners[i];
-                count += 1;
-            }
-        _confirmations = new address[](count);
-        for (i=0; i<count; i++)
-            _confirmations[i] = confirmationsTemp[i];
-    }
-
-    /// @dev Returns list of transaction IDs in defined range.
-    /// @param from Index start position of transaction array.
-    /// @param to Index end position of transaction array.
-    /// @param pending Include pending transactions.
-    /// @param executed Include executed transactions.
-    /// @return _transactionIds Returns array of transaction IDs.
-    function getTransactionIds(uint from, uint to, bool pending, bool executed)
-        public
-        view
-        returns (uint[] memory _transactionIds)
-    {
-        uint[] memory transactionIdsTemp = new uint[](transactionCount);
-        uint count = 0;
-        uint i;
-        for (i=0; i<transactionCount; i++)
-            if (   pending && !transactions[i].executed
-                || executed && transactions[i].executed)
-            {
-                transactionIdsTemp[count] = i;
-                count += 1;
-            }
-        _transactionIds = new uint[](to - from);
-        for (i=from; i<to; i++)
-            _transactionIds[i - from] = transactionIdsTemp[i];
-    }
-    /*
-     * Internal functions
-     */
-    /// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.
-    /// @param destination Transaction target address.
-    /// @param value Transaction ether value.
-    /// @param data Transaction data payload.
-    /// @return transactionId Returns transaction ID.
-    function addTransaction(address destination, uint value, bytes memory data)
-        internal
-        notNull(destination)
-        returns (uint transactionId)
-    {
-        transactionId = transactionCount;
-        transactions[transactionId] = Transaction({
-            destination: destination,
-            value: value,
-            data: data,
-            executed: false
-        });
-        transactionCount += 1;
-        emit Submission(transactionId);
-    }
-}
\ No newline at end of file
diff --git a/test/compilationTests/MultiSigWallet/MultiSigWalletFactory.sol b/test/compilationTests/MultiSigWallet/MultiSigWalletFactory.sol
deleted file mode 100644
index 4b3c2372877c..000000000000
--- a/test/compilationTests/MultiSigWallet/MultiSigWalletFactory.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma solidity >=0.0;
-import "Factory.sol";
-import "MultiSigWallet.sol";
-
-
-/// @title Multisignature wallet factory - Allows creation of multisig wallet.
-/// @author Stefan George - <stefan.george@consensys.net>
-contract MultiSigWalletFactory is Factory {
-
-    /// @dev Allows verified creation of multisignature wallet.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    /// @return wallet Returns wallet address.
-    function create(address[] memory _owners, uint _required)
-        public
-        returns (address wallet)
-    {
-        wallet = address(new MultiSigWallet(_owners, _required));
-        register(wallet);
-    }
-}
diff --git a/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol b/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol
deleted file mode 100644
index 6207f9764b5e..000000000000
--- a/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol
+++ /dev/null
@@ -1,96 +0,0 @@
-pragma solidity >=0.0;
-import "MultiSigWallet.sol";
-
-
-/// @title Multisignature wallet with daily limit - Allows an owner to withdraw a daily limit without multisig.
-/// @author Stefan George - <stefan.george@consensys.net>
-contract MultiSigWalletWithDailyLimit is MultiSigWallet {
-
-    event DailyLimitChange(uint dailyLimit);
-
-    uint public dailyLimit;
-    uint public lastDay;
-    uint public spentToday;
-
-    /*
-     * Public functions
-     */
-    /// @dev Contract constructor sets initial owners, required number of confirmations and daily withdraw limit.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    /// @param _dailyLimit Amount in wei, which can be withdrawn without confirmations on a daily basis.
-    constructor(address[] memory _owners, uint _required, uint _dailyLimit)
-        MultiSigWallet(_owners, _required)
-    {
-        dailyLimit = _dailyLimit;
-    }
-
-    /// @dev Allows to change the daily limit. Transaction has to be sent by wallet.
-    /// @param _dailyLimit Amount in wei.
-    function changeDailyLimit(uint _dailyLimit)
-        public
-        onlyWallet
-    {
-        dailyLimit = _dailyLimit;
-        emit DailyLimitChange(_dailyLimit);
-    }
-
-    /// @dev Allows anyone to execute a confirmed transaction or ether withdraws until daily limit is reached.
-    /// @param transactionId Transaction ID.
-    function executeTransaction(uint transactionId)
-        public
-        override
-        notExecuted(transactionId)
-    {
-        Transaction storage tx = transactions[transactionId];
-        bool confirmed = isConfirmed(transactionId);
-        if (confirmed || tx.data.length == 0 && isUnderLimit(tx.value)) {
-            if (!confirmed)
-                spentToday += tx.value;
-            (tx.executed,) = tx.destination.call{value: tx.value}(tx.data);
-            if (tx.executed)
-                emit Execution(transactionId);
-            else {
-                emit ExecutionFailure(transactionId);
-                if (!confirmed)
-                    spentToday -= tx.value;
-            }
-        }
-    }
-
-    /*
-     * Internal functions
-     */
-    /// @dev Returns if amount is within daily limit and resets spentToday after one day.
-    /// @param amount Amount to withdraw.
-    /// @return Returns if amount is under daily limit.
-    function isUnderLimit(uint amount)
-        internal
-        returns (bool)
-    {
-        if (block.timestamp > lastDay + 24 hours) {
-            lastDay = block.timestamp;
-            spentToday = 0;
-        }
-        if (spentToday + amount > dailyLimit || spentToday + amount < spentToday)
-            return false;
-        return true;
-    }
-
-    /*
-     * Web3 call functions
-     */
-    /// @dev Returns maximum withdraw amount.
-    /// @return Returns amount.
-    function calcMaxWithdraw()
-        public
-        view
-        returns (uint)
-    {
-        if (block.timestamp > lastDay + 24 hours)
-            return dailyLimit;
-        if (dailyLimit < spentToday)
-            return 0;
-        return dailyLimit - spentToday;
-    }
-}
diff --git a/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimitFactory.sol b/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimitFactory.sol
deleted file mode 100644
index 362399092110..000000000000
--- a/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimitFactory.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma solidity >=0.0;
-import "Factory.sol";
-import "MultiSigWalletWithDailyLimit.sol";
-
-
-/// @title Multisignature wallet factory for daily limit version - Allows creation of multisig wallet.
-/// @author Stefan George - <stefan.george@consensys.net>
-contract MultiSigWalletWithDailyLimitFactory is Factory {
-
-    /// @dev Allows verified creation of multisignature wallet.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    /// @param _dailyLimit Amount in wei, which can be withdrawn without confirmations on a daily basis.
-    /// @return wallet Returns wallet address.
-    function create(address[] memory _owners, uint _required, uint _dailyLimit)
-        public
-        returns (address wallet)
-    {
-        wallet = address(new MultiSigWalletWithDailyLimit(_owners, _required, _dailyLimit));
-        register(wallet);
-    }
-}
diff --git a/test/compilationTests/MultiSigWallet/README.md b/test/compilationTests/MultiSigWallet/README.md
deleted file mode 100644
index 2d96f3a1ac73..000000000000
--- a/test/compilationTests/MultiSigWallet/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-MultiSigWallet contracts, originally from
-
-https://github.com/ConsenSys/MultiSigWallet
diff --git a/test/compilationTests/MultiSigWallet/TestToken.sol b/test/compilationTests/MultiSigWallet/TestToken.sol
deleted file mode 100644
index c9dd64f7cec8..000000000000
--- a/test/compilationTests/MultiSigWallet/TestToken.sol
+++ /dev/null
@@ -1,76 +0,0 @@
-pragma solidity >=0.0;
-
-
-/// @title Test token contract - Allows testing of token transfers with multisig wallet.
-contract TestToken {
-
-    event Transfer(address indexed from, address indexed to, uint256 value);
-    event Approval(address indexed owner, address indexed spender, uint256 value);
-
-    mapping (address => uint256) balances;
-    mapping (address => mapping (address => uint256)) allowed;
-    uint256 public totalSupply;
-
-    string constant public name = "Test Token";
-    string constant public symbol = "TT";
-    uint8 constant public decimals = 1;
-
-    function issueTokens(address _to, uint256 _value)
-        public
-    {
-        balances[_to] += _value;
-        totalSupply += _value;
-    }
-
-    function transfer(address _to, uint256 _value)
-        public
-        returns (bool success)
-    {
-        if (balances[msg.sender] < _value) {
-            revert();
-        }
-        balances[msg.sender] -= _value;
-        balances[_to] += _value;
-        emit Transfer(msg.sender, _to, _value);
-        return true;
-    }
-
-    function transferFrom(address _from, address _to, uint256 _value)
-        public
-        returns (bool success)
-    {
-        if (balances[_from] < _value || allowed[_from][msg.sender] < _value) {
-            revert();
-        }
-        balances[_to] += _value;
-        balances[_from] -= _value;
-        allowed[_from][msg.sender] -= _value;
-        emit Transfer(_from, _to, _value);
-        return true;
-    }
-
-    function approve(address _spender, uint256 _value)
-        public
-        returns (bool success)
-    {
-        allowed[msg.sender][_spender] = _value;
-        emit Approval(msg.sender, _spender, _value);
-        return true;
-    }
-
-    function allowance(address _owner, address _spender)
-        view
-        public
-        returns (uint256 remaining)
-    {
-        return allowed[_owner][_spender];
-    }
-
-    function balanceOf(address _owner)
-        view
-        public
-        returns (uint256 balance)
-    {
-        return balances[_owner];
-    }
-}
diff --git a/test/compilationTests/README.md b/test/compilationTests/README.md
deleted file mode 100644
index c827b348f7b2..000000000000
--- a/test/compilationTests/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory contains various Solidity contract source code files
-that are compiled as part of the regular tests.
-
-These contracts are externally contributed and their presence in this
-repository does not make any statement about their quality or usefulness.
diff --git a/test/compilationTests/corion/LICENSE b/test/compilationTests/corion/LICENSE
deleted file mode 100644
index 9cecc1d4669e..000000000000
--- a/test/compilationTests/corion/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/test/compilationTests/corion/README.md b/test/compilationTests/corion/README.md
deleted file mode 100644
index f0bb8ea8b96e..000000000000
--- a/test/compilationTests/corion/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-CORION contracts, originally from
-
-https://github.com/CORIONplatform/solidity
diff --git a/test/compilationTests/corion/announcementTypes.sol b/test/compilationTests/corion/announcementTypes.sol
deleted file mode 100644
index 1619e18247b5..000000000000
--- a/test/compilationTests/corion/announcementTypes.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-pragma solidity >=0.0;
-
-contract announcementTypes {
-
-    enum announcementType {
-        /*
-            type of announcements
-        */
-        newModule,
-        dropModule,
-        replaceModule,
-        replaceModuleHandler,
-        question,
-        transactionFeeRate,
-        transactionFeeMin,
-        transactionFeeMax,
-        transactionFeeBurn,
-        providerPublicFunds,
-        providerPrivateFunds,
-        providerPrivateClientLimit,
-        providerPublicMinRate,
-        providerPublicMaxRate,
-        providerPrivateMinRate,
-        providerPrivateMaxRate,
-        providerGasProtect,
-        providerInterestMinFunds,
-        providerRentRate,
-        schellingRoundBlockDelay,
-        schellingCheckRounds,
-        schellingCheckAboves,
-        schellingRate,
-        publisherMinAnnouncementDelay,
-        publisherOppositeRate
-    }
-}
\ No newline at end of file
diff --git a/test/compilationTests/corion/ico.sol b/test/compilationTests/corion/ico.sol
deleted file mode 100644
index 36510ea65843..000000000000
--- a/test/compilationTests/corion/ico.sol
+++ /dev/null
@@ -1,376 +0,0 @@
-pragma solidity >=0.0;
-
-import "./safeMath.sol";
-import "./token.sol";
-import "./premium.sol";
-import "./moduleHandler.sol";
-
-contract ico is safeMath {
-
-    struct icoLevels_s {
-        uint256 block;
-        uint8 rate;
-    }
-    struct affiliate_s {
-        uint256 weight;
-        uint256 paid;
-    }
-    struct interest_s {
-        uint256 amount;
-        bool empty;
-    }
-    struct brought_s {
-        uint256 eth;
-        uint256 cor;
-        uint256 corp;
-    }
-
-    uint256 constant oneSegment = 40320;
-
-    address payable public owner;
-    address payable public tokenAddr;
-    address payable public premiumAddr;
-    uint256 public startBlock;
-    uint256 public icoDelay;
-    address payable public foundationAddress;
-    address public icoEtcPriceAddr;
-    uint256 public icoExchangeRate;
-    uint256 public icoExchangeRateSetBlock;
-    uint256 constant icoExchangeRateM = 1e4;
-    uint256 constant interestOnICO   = 25;
-    uint256 constant interestOnICOM  = 1e3;
-    uint256 constant interestBlockDelay = 720;
-    uint256 constant exchangeRateDelay = 125;
-    bool public aborted;
-    bool public closed;
-    icoLevels_s[] public icoLevels;
-    mapping (address => affiliate_s) public affiliate;
-    mapping (address => brought_s) public brought;
-    mapping (address => mapping(uint256 => interest_s)) public interestDB;
-    uint256 public totalMint;
-    uint256 public totalPremiumMint;
-
-    constructor(address payable foundation, address priceSet, uint256 exchangeRate, uint256 startBlockNum, address[] memory genesisAddr, uint256[] memory genesisValue) {
-        /*
-            Installation function.
-
-            @foundation     The ETC address of the foundation
-            @priceSet       The address which will be able to make changes on the rate later on.
-            @exchangeRate   The current ETC/USD rate multiplied by 1e4. For example: 2.5 USD/ETC = 25000
-            @startBlockNum  The height (level) of the beginning of the ICO. If it is 0 then it will be the current array’s height.
-            @genesisAddr    Array of Genesis addresses
-            @genesisValue   Array of balance of genesis addresses
-        */
-        foundationAddress = foundation;
-        icoExchangeRate = exchangeRate;
-        icoExchangeRateSetBlock = block.number + exchangeRateDelay;
-        icoEtcPriceAddr = priceSet;
-        owner = payable(msg.sender);
-        if ( startBlockNum > 0 ) {
-            require( startBlockNum >= block.number );
-            startBlock = startBlockNum;
-        } else {
-            startBlock = block.number;
-        }
-        icoLevels.push(icoLevels_s(startBlock + oneSegment * 1, 3));
-        icoLevels.push(icoLevels_s(startBlock + oneSegment / 7, 5));
-        icoLevels.push(icoLevels_s(startBlock, 10));
-        icoDelay = startBlock + oneSegment * 3;
-        for ( uint256 a=0 ; a<genesisAddr.length ; a++ ) {
-            interestDB[genesisAddr[a]][0].amount = genesisValue[a];
-        }
-    }
-
-    function ICObonus() public view returns(uint256 bonus) {
-        /*
-            Query of current bonus
-
-            @bonus  Bonus %
-        */
-        for ( uint8 a=0 ; a<icoLevels.length ; a++ ) {
-            if ( block.number > icoLevels[a].block ) {
-                return icoLevels[a].rate;
-            }
-        }
-    }
-
-    function setInterestDB(address addr, uint256 balance) external returns(bool success) {
-        /*
-            Setting interest database. It can be requested by Token contract only.
-            A database has to be built in order  that after ICO closed everybody can get their compound interest on their capital accumulated
-
-            @addr       Sender
-            @balance    Quantity
-
-            @success    Was the process successful or not
-        */
-        require( msg.sender == tokenAddr );
-        uint256 _num = (block.number - startBlock) / interestBlockDelay;
-        interestDB[addr][_num].amount = balance;
-        if ( balance == 0 ) {
-            interestDB[addr][_num].empty = true;
-        }
-        return true;
-    }
-
-    function checkInterest(address addr) public view returns(uint256 amount) {
-        /*
-            Query of compound interest
-
-            @addr       Address
-
-            @amount     Amount of compound interest
-        */
-        uint256 _lastBal;
-        uint256 _tamount;
-        bool _empty;
-        interest_s memory _idb;
-        uint256 _to = (block.number - startBlock) / interestBlockDelay;
-
-        if ( _to == 0 || aborted ) { return 0; }
-
-        for ( uint256 r=0 ; r < _to ; r++ ) {
-            if ( r*interestBlockDelay+startBlock >= icoDelay ) { break; }
-            _idb = interestDB[addr][r];
-            if ( _idb.amount > 0 ) {
-                if ( _empty ) {
-                    _lastBal = _idb.amount + amount;
-                } else {
-                    _lastBal = _idb.amount;
-                }
-            }
-            if ( _idb.empty ) {
-                _lastBal = 0;
-                _empty = _idb.empty;
-            }
-            _lastBal += _tamount;
-            _tamount = _lastBal * interestOnICO / interestOnICOM / 100;
-            amount += _tamount;
-        }
-    }
-
-    function getInterest(address beneficiary) external {
-        /*
-            Request of  compound interest. This is deleted  from the database after the ICO closed and following the query of the compound interest.
-
-            @beneficiary    Beneficiary who will receive the interest
-        */
-        uint256 _lastBal;
-        uint256 _tamount;
-        uint256 _amount;
-        bool _empty;
-        interest_s memory _idb;
-        address _addr = beneficiary;
-        uint256 _to = (block.number - startBlock) / interestBlockDelay;
-        if ( _addr == address(0x00) ) { _addr = msg.sender; }
-
-        require( block.number > icoDelay );
-        require( ! aborted );
-
-        for ( uint256 r=0 ; r < _to ; r++ ) {
-            if ( r*interestBlockDelay+startBlock >= icoDelay ) { break; }
-            _idb = interestDB[msg.sender][r];
-            if ( _idb.amount > 0 ) {
-                if ( _empty ) {
-                    _lastBal = _idb.amount + _amount;
-                } else {
-                    _lastBal = _idb.amount;
-                }
-            }
-            if ( _idb.empty ) {
-                _lastBal = 0;
-                _empty = _idb.empty;
-            }
-            _lastBal += _tamount;
-            _tamount = _lastBal * interestOnICO / interestOnICOM / 100;
-            _amount += _tamount;
-            delete interestDB[msg.sender][r];
-        }
-
-        require( _amount > 0 );
-        token(tokenAddr).mint(_addr, _amount);
-    }
-
-    function setICOEthPrice(uint256 value) external {
-        /*
-            Setting of the ICO ETC USD rates which can only be called by a pre-defined address.
-            After this function is completed till the call of the next function (which is at least an exchangeRateDelay array) this rate counts.
-            With this process avoiding the sudden rate changes.
-
-            @value  The ETC/USD rate multiplied by 1e4. For example: 2.5 USD/ETC = 25000
-        */
-        require( isICO() );
-        require( icoEtcPriceAddr == msg.sender );
-        require( icoExchangeRateSetBlock < block.number);
-        icoExchangeRateSetBlock = block.number + exchangeRateDelay;
-        icoExchangeRate = value;
-    }
-
-    function extendICO() external {
-        /*
-            Extend the period of the ICO with one segment.
-
-            It is only possible during the ICO and only callable by the owner.
-        */
-        require( isICO() );
-        require( msg.sender == owner );
-        icoDelay += oneSegment;
-    }
-
-    function closeICO() external {
-        /*
-            Closing the ICO.
-            It is only possible when the ICO period passed and only by the owner.
-            The 96% of the whole amount of the token is generated to the address of the foundation.
-            Ethers which are situated in this contract will be sent to the address of the foundation.
-        */
-        require( msg.sender == owner );
-        require( block.number > icoDelay );
-        require( ! closed );
-        closed = true;
-        require( ! aborted );
-        require( token(tokenAddr).mint(foundationAddress, token(tokenAddr).totalSupply() * 96 / 100) );
-        require( premium(premiumAddr).mint(foundationAddress, totalMint / 5000 - totalPremiumMint) );
-        require( foundationAddress.send(address(this).balance) );
-        require( token(tokenAddr).closeIco() );
-        require( premium(premiumAddr).closeIco() );
-    }
-
-    function abortICO() external {
-        /*
-            Withdrawal of the ICO.
-            It is only possible during the ICO period.
-            Only callable by the owner.
-            After this process only the receiveFunds function will be available for the customers.
-        */
-        require( isICO() );
-        require( msg.sender == owner );
-        aborted = true;
-    }
-
-    function connectTokens(address payable tokenContractAddr, address payable premiumContractAddr) external {
-        /*
-            Installation function which joins the two token contracts with this contract.
-            Only callable by the owner
-
-            @tokenContractAddr      Address of the corion token contract.
-            @premiumContractAddr    Address of the corion premium token contract
-        */
-        require( msg.sender == owner );
-        require( tokenAddr == address(0x00) && premiumAddr == address(0x00) );
-        tokenAddr = tokenContractAddr;
-        premiumAddr = premiumContractAddr;
-    }
-
-    function receiveFunds() external {
-        /*
-            Refund the amount which was purchased during the ICO period.
-            This one is only callable if the ICO is withdrawn.
-            In this case the address gets back the 90% of the amount which was spent for token during the ICO period.
-        */
-        require( aborted );
-        require( brought[msg.sender].eth > 0 );
-        uint256 _val = brought[msg.sender].eth * 90 / 100;
-        delete brought[msg.sender];
-        require( payable(msg.sender).send(_val) );
-    }
-
-    receive () external payable {
-        /*
-            Callback function. Simply calls the buy function as a beneficiary and there is no affiliate address.
-            If they call the contract without any function then this process will be taken place.
-        */
-        require( isICO() );
-        require( buy(payable(msg.sender), address(0x00)) );
-    }
-
-    function buy(address payable beneficiaryAddress, address affilateAddress) public payable returns (bool success) {
-        /*
-            Buying a token
-
-            If there is not at least 0.2 ether balance on the beneficiaryAddress then the amount of the ether which was intended for the purchase will be reduced by 0.2 and that will be sent to the address of the beneficiary.
-            From the remaining amount calculate the reward with the help of the getIcoReward function.
-            Only that affiliate address is valid which has some token on it’s account.
-            If there is a valid affiliate address then calculate and credit the reward as well in the following way:
-            With more than 1e12 token contract credit 5% reward based on the calculation that how many tokens did they buy when he was added as an affiliate.
-                More than 1e11 token: 4%
-                More than 1e10 token: 3%
-                More than 1e9 token: 2% below 1%
-            @beneficiaryAddress     The address of the accredited where the token will be sent.
-            @affilateAddress        The address of the person who offered who will get the referral reward. It can not be equal with the beneficiaryAddress.
-        */
-        require( isICO() );
-        if ( beneficiaryAddress == address(0x00)) { beneficiaryAddress = payable(msg.sender); }
-        if ( beneficiaryAddress == affilateAddress ) {
-            affilateAddress = address(0x00);
-        }
-        uint256 _value = msg.value;
-        if ( beneficiaryAddress.balance < 0.2 ether ) {
-            require( beneficiaryAddress.send(0.2 ether) );
-            _value = safeSub(_value, 0.2 ether);
-        }
-        uint256 _reward = getIcoReward(_value);
-        require( _reward > 0 );
-        require( token(tokenAddr).mint(beneficiaryAddress, _reward) );
-        brought[beneficiaryAddress].eth = safeAdd(brought[beneficiaryAddress].eth, _value);
-        brought[beneficiaryAddress].cor = safeAdd(brought[beneficiaryAddress].cor, _reward);
-        totalMint = safeAdd(totalMint, _reward);
-        require( foundationAddress.send(_value * 10 / 100) );
-        uint256 extra;
-        if ( affilateAddress != address(0x00) && ( brought[affilateAddress].eth > 0 || interestDB[affilateAddress][0].amount > 0 ) ) {
-            affiliate[affilateAddress].weight = safeAdd(affiliate[affilateAddress].weight, _reward);
-            extra = affiliate[affilateAddress].weight;
-            uint256 rate;
-            if (extra >= 1e12) {
-                rate = 5;
-            } else if (extra >= 1e11) {
-                rate = 4;
-            } else if (extra >= 1e10) {
-                rate = 3;
-            } else if (extra >= 1e9) {
-                rate = 2;
-            } else {
-                rate = 1;
-            }
-            extra = safeSub(extra * rate / 100, affiliate[affilateAddress].paid);
-            affiliate[affilateAddress].paid = safeAdd(affiliate[affilateAddress].paid, extra);
-            token(tokenAddr).mint(affilateAddress, extra);
-        }
-        checkPremium(beneficiaryAddress);
-        emit EICO(beneficiaryAddress, _reward, affilateAddress, extra);
-        return true;
-    }
-
-    function checkPremium(address owner) internal {
-        /*
-            Crediting the premium token
-
-            @owner The corion token balance of this address will be set based on the calculation which shows that how many times can be the amount of the purchased tokens divided by 5000. So after each 5000 token we give 1 premium token.
-        */
-        uint256 _reward = (brought[owner].cor / 5e9) - brought[owner].corp;
-        if ( _reward > 0 ) {
-            require( premium(premiumAddr).mint(owner, _reward) );
-            brought[owner].corp = safeAdd(brought[owner].corp, _reward);
-            totalPremiumMint = safeAdd(totalPremiumMint, _reward);
-        }
-    }
-
-    function getIcoReward(uint256 value) public view returns (uint256 reward) {
-        /*
-            Expected token volume at token purchase
-
-            @value The amount of ether for the purchase
-            @reward Amount of the token
-                x = (value * 1e6 * USD_ETC_exchange rate / 1e4 / 1e18) * bonus percentage
-                2.700000 token = (1e18 * 1e6 * 22500 / 1e4 / 1e18) * 1.20
-        */
-        reward = (value * 1e6 * icoExchangeRate / icoExchangeRateM / 1 ether) * (ICObonus() + 100) / 100;
-        if ( reward < 5e6) { return 0; }
-    }
-
-    function isICO() public view returns (bool success) {
-        return startBlock <= block.number && block.number <= icoDelay && ( ! aborted ) && ( ! closed );
-    }
-
-    event EICO(address indexed Address, uint256 indexed value, address Affiliate, uint256 AffilateValue);
-}
diff --git a/test/compilationTests/corion/module.sol b/test/compilationTests/corion/module.sol
deleted file mode 100644
index 1b52639d1d4e..000000000000
--- a/test/compilationTests/corion/module.sol
+++ /dev/null
@@ -1,146 +0,0 @@
-pragma solidity >=0.0;
-
-contract abstractModuleHandler {
-    function transfer(address payable from, address payable to, uint256 value, bool fee) external returns (bool success) {}
-    function balanceOf(address payable owner) public view returns (bool success, uint256 value) {}
-}
-
-contract module {
-    /*
-        Module
-    */
-
-    enum status {
-        New,
-        Connected,
-        Disconnected,
-        Disabled
-    }
-
-    status public moduleStatus;
-    uint256 public disabledUntil;
-    address payable public moduleHandlerAddress;
-
-    function disableModule(bool forever) external onlyForModuleHandler returns (bool success) {
-        _disableModule(forever);
-        return true;
-    }
-    function _disableModule(bool forever) internal {
-        /*
-            Disable the module for one week, if the forever true then for forever.
-            This function calls the Publisher module.
-
-            @forever    For forever or not
-        */
-        if ( forever ) { moduleStatus = status.Disabled; }
-        else { disabledUntil = block.number + 5760; }
-    }
-
-    function replaceModuleHandler(address payable newModuleHandlerAddress) external onlyForModuleHandler returns (bool success) {
-        _replaceModuleHandler(newModuleHandlerAddress);
-        return true;
-    }
-    function _replaceModuleHandler(address payable newModuleHandlerAddress) internal {
-        /*
-            Replace the ModuleHandler address.
-            This function calls the Publisher module.
-
-            @newModuleHandlerAddress    New module handler address
-        */
-        require( moduleStatus == status.Connected );
-        moduleHandlerAddress = newModuleHandlerAddress;
-    }
-
-    function connectModule() virtual external onlyForModuleHandler returns (bool success) {
-        _connectModule();
-        return true;
-    }
-    function _connectModule() internal {
-        /*
-            Registering and/or connecting-to ModuleHandler.
-            This function is called by ModuleHandler load or by Publisher.
-        */
-        require( moduleStatus == status.New );
-        moduleStatus = status.Connected;
-    }
-
-    function disconnectModule() external onlyForModuleHandler returns (bool success) {
-        _disconnectModule();
-        return true;
-    }
-    function _disconnectModule() internal {
-        /*
-            Disconnect the module from the ModuleHandler.
-            This function calls the Publisher module.
-        */
-        require( moduleStatus != status.New && moduleStatus != status.Disconnected );
-        moduleStatus = status.Disconnected;
-    }
-
-    function replaceModule(address payable newModuleAddress) virtual external onlyForModuleHandler returns (bool success) {
-        _replaceModule(newModuleAddress);
-        return true;
-    }
-    function _replaceModule(address payable newModuleAddress) internal {
-        /*
-            Replace the module for an another new module.
-            This function calls the Publisher module.
-            We send every Token and ether to the new module.
-
-            @newModuleAddress   New module handler address
-        */
-        require( moduleStatus != status.New && moduleStatus != status.Disconnected);
-        (bool _success, uint256 _balance) = abstractModuleHandler(moduleHandlerAddress).balanceOf(payable(this));
-        require( _success );
-        if ( _balance > 0 ) {
-            require( abstractModuleHandler(moduleHandlerAddress).transfer(payable(this), newModuleAddress, _balance, false) );
-        }
-        if ( address(this).balance > 0 ) {
-            require( newModuleAddress.send(address(this).balance) );
-        }
-        moduleStatus = status.Disconnected;
-    }
-
-    function transferEvent(address payable from, address payable to, uint256
-value) virtual external onlyForModuleHandler returns (bool success) {
-        return true;
-    }
-    function newSchellingRoundEvent(uint256 roundID, uint256 reward) virtual external onlyForModuleHandler returns (bool success) {
-        return true;
-    }
-
-    function registerModuleHandler(address payable _moduleHandlerAddress) internal {
-        /*
-            Module constructor function for registering ModuleHandler address.
-        */
-        moduleHandlerAddress = _moduleHandlerAddress;
-    }
-    function isModuleHandler(address payable addr) internal returns (bool ret) {
-        /*
-            Test for ModuleHandler address.
-            If the module is not connected then returns always false.
-
-            @addr   Address to check
-
-            @ret    This is the module handler address or not
-        */
-        if ( moduleHandlerAddress == address(0x00) ) { return true; }
-        if ( moduleStatus != status.Connected ) { return false; }
-        return addr == moduleHandlerAddress;
-    }
-    function isActive() public view returns (bool success, bool active) {
-        /*
-            Check self for ready for functions or not.
-
-            @success    Function call was successful or not
-            @active     Ready for functions or not
-        */
-        return (true, moduleStatus == status.Connected && block.number >= disabledUntil);
-    }
-    modifier onlyForModuleHandler() {
-        require( msg.sender == moduleHandlerAddress );
-        _;
-    }
-    receive() external payable {
-    }
-}
diff --git a/test/compilationTests/corion/moduleHandler.sol b/test/compilationTests/corion/moduleHandler.sol
deleted file mode 100644
index e8e65760c8a7..000000000000
--- a/test/compilationTests/corion/moduleHandler.sol
+++ /dev/null
@@ -1,448 +0,0 @@
-pragma solidity >=0.0;
-
-import "./module.sol";
-import "./announcementTypes.sol";
-import "./multiOwner.sol";
-
-import "./publisher.sol";
-import "./token.sol";
-import "./provider.sol";
-import "./schelling.sol";
-import "./premium.sol";
-import "./ico.sol";
-
-contract abstractModule {
-    function connectModule() external returns (bool success) {}
-    function disconnectModule() external returns (bool success) {}
-    function replaceModule(address addr) external returns (bool success) {}
-    function disableModule(bool forever) external returns (bool success) {}
-    function isActive() public view returns (bool success) {}
-    function replaceModuleHandler(address newHandler) external returns (bool success) {}
-    function transferEvent(address from, address to, uint256 value) external returns (bool success) {}
-    function newSchellingRoundEvent(uint256 roundID, uint256 reward) external returns (bool success) {}
-}
-
-contract moduleHandler is multiOwner, announcementTypes {
-
-    struct modules_s {
-        address payable addr;
-        bytes32 name;
-        bool schellingEvent;
-        bool transferEvent;
-    }
-
-    modules_s[] public modules;
-    address public foundationAddress;
-    uint256 debugModeUntil = block.number + 1000000;
-
-
-    constructor(address[] memory newOwners) multiOwner(newOwners) {}
-    function load(address payable foundation, bool forReplace, address payable Token, address payable Premium, address payable Publisher, address payable Schelling, address payable Provider) public {
-        /*
-            Loading modulest to ModuleHandler.
-
-            This module can be called only once and only by the owner, if every single module and its database are already put on the blockchain.
-            If forReaplace is true, than the ModuleHandler will be replaced. Before the publishing of its replace, the new contract must be already on the blockchain.
-
-            @foundation     Address of foundation.
-            @forReplace     Is it for replace or not. If not, it will be connected to the module.
-            @Token          address of token.
-            @Publisher      address of publisher.
-            @Schelling      address of Schelling.
-            @Provider       address of provider
-        */
-        require( owners[msg.sender] );
-        require( modules.length == 0 );
-        foundationAddress = foundation;
-        addModule( modules_s(Token,      keccak256('Token'),      false, false),  ! forReplace);
-        addModule( modules_s(Premium,    keccak256('Premium'),    false, false),  ! forReplace);
-        addModule( modules_s(Publisher,  keccak256('Publisher'),  false, true),   ! forReplace);
-        addModule( modules_s(Schelling,  keccak256('Schelling'),  false, true),   ! forReplace);
-        addModule( modules_s(Provider,   keccak256('Provider'),   true, true),    ! forReplace);
-    }
-    function addModule(modules_s memory input, bool call) internal {
-        /*
-            Inside function for registration of the modules in the database.
-            If the call is false, won't happen any direct call.
-
-            @input  _Structure of module.
-            @call   Is connect to the module or not.
-        */
-        if ( call ) { require( abstractModule(input.addr).connectModule() ); }
-        (bool success, bool found, uint256 id) = getModuleIDByAddress(input.addr);
-        require( success && ! found );
-        (success, found, id) = getModuleIDByHash(input.name);
-        require( success && ! found );
-        (success, found, id) = getModuleIDByAddress(address(0x00));
-        require( success );
-        if ( ! found ) {
-            id = modules.length;
-            modules.push();
-        }
-        modules[id] = input;
-    }
-    function getModuleAddressByName(string memory name) public view returns( bool success, bool found, address addr ) {
-        /*
-            Search by name for module. The result is an Ethereum address.
-
-            @name       Name of module.
-            @addr       Address of module.
-            @found      Is there any result.
-            @success    Was the transaction successful or not.
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName(name);
-        if ( _success && _found ) { return (true, true, modules[_id].addr); }
-        return (true, false, address(0x00));
-    }
-    function getModuleIDByHash(bytes32 hashOfName) public view returns( bool success, bool found, uint256 id ) {
-        /*
-            Search by hash of name in the module array. The result is an index array.
-
-            @name       Name of module.
-            @id         Index of module.
-            @found      Was there any result or not.
-        */
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            if ( modules[a].name == hashOfName ) {
-                return (true, true, a);
-            }
-        }
-        return (true, false, 0);
-    }
-    function getModuleIDByName(string memory name) public view returns( bool success, bool found, uint256 id ) {
-        /*
-            Search by name for module. The result is an index array.
-
-            @name       Name of module.
-            @id         Index of module.
-            @found      Was there any result or not.
-        */
-        bytes32 _name = keccak256(bytes(name));
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            if ( modules[a].name == _name ) {
-                return (true, true, a);
-            }
-        }
-        return (true, false, 0);
-    }
-    function getModuleIDByAddress(address addr) public view returns( bool success, bool found, uint256 id ) {
-        /*
-            Search by ethereum address for module. The result is an index array.
-
-            @name       Name of module.
-            @id         Index of module.
-            @found      Was there any result or not.
-        */
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            if ( modules[a].addr == addr ) {
-                return (true, true, a);
-            }
-        }
-        return (true, false, 0);
-    }
-    function replaceModule(string calldata name, address payable addr, bool callCallback) external returns (bool success) {
-        /*
-            Module replace, can be called only by the Publisher contract.
-
-            @name           Name of module.
-            @addr           Address of module.
-            @bool           Was there any result or not.
-            @callCallback   Call the replaceable module to confirm replacement or not.
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success );
-        if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
-            require( block.number < debugModeUntil );
-            if ( ! insertAndCheckDo(calcDoHash("replaceModule", keccak256(abi.encodePacked(name, addr, callCallback)))) ) {
-                return true;
-            }
-        }
-        (_success, _found, _id) = getModuleIDByName(name);
-        require( _success && _found );
-        if ( callCallback ) {
-            require( abstractModule(modules[_id].addr).replaceModule(addr) );
-        }
-        require( abstractModule(addr).connectModule() );
-        modules[_id].addr = addr;
-        return true;
-    }
-
-    function callReplaceCallback(string calldata moduleName, address newModule) external returns (bool success) {
-        require( block.number < debugModeUntil );
-        if ( ! insertAndCheckDo(calcDoHash("callReplaceCallback", keccak256(abi.encodePacked(moduleName, newModule)))) ) {
-            return true;
-        }
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName(moduleName);
-        require( _success);
-        require( abstractModule(modules[_id].addr).replaceModule(newModule) );
-        return true;
-    }
-
-    function newModule(string calldata name, address payable addr, bool schellingEvent, bool transferEvent) external returns (bool success) {
-        /*
-            Adding new module to the database. Can be called only by the Publisher contract.
-
-            @name               Name of module.
-            @addr               Address of module.
-            @schellingEvent     Gets it new Schelling round notification?
-            @transferEvent      Gets it new transaction notification?
-            @bool               Was there any result or not.
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success );
-        if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
-            require( block.number < debugModeUntil );
-            if ( ! insertAndCheckDo(calcDoHash("newModule", keccak256(abi.encodePacked(name, addr, schellingEvent, transferEvent)))) ) {
-                return true;
-            }
-        }
-        addModule( modules_s(addr, keccak256(bytes(name)), schellingEvent, transferEvent), true);
-        return true;
-    }
-    function dropModule(string calldata name, bool callCallback) external returns (bool success) {
-        /*
-            Deleting module from the database. Can be called only by the Publisher contract.
-
-            @name           Name of module to delete.
-            @bool           Was the function successful?
-            @callCallback   Call the replaceable module to confirm replacement or not.
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success );
-        if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
-            require( block.number < debugModeUntil );
-            if ( ! insertAndCheckDo(calcDoHash("replaceModule", keccak256(abi.encodePacked(name, callCallback)))) ) {
-                return true;
-            }
-        }
-        (_success, _found, _id) = getModuleIDByName(name);
-        require( _success && _found );
-        if( callCallback ) {
-            abstractModule(modules[_id].addr).disableModule(true);
-        }
-        delete modules[_id];
-        return true;
-    }
-
-    function callDisableCallback(string calldata moduleName) external returns (bool success) {
-        require( block.number < debugModeUntil );
-        if ( ! insertAndCheckDo(calcDoHash("callDisableCallback", keccak256(bytes(moduleName)))) ) {
-            return true;
-        }
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName(moduleName);
-        require( _success);
-        require( abstractModule(modules[_id].addr).disableModule(true) );
-        return true;
-    }
-
-    function broadcastTransfer(address from, address to, uint256 value) external returns (bool success) {
-        /*
-            Announcing transactions for the modules.
-
-            Can be called only by the token module.
-            Only the configured modules get notifications.( transferEvent )
-
-            @from       from who.
-            @to         to who.
-            @value      amount.
-            @bool       Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success && _found && modules[_id].name == keccak256('Token') );
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            if ( modules[a].transferEvent && abstractModule(modules[a].addr).isActive() ) {
-                require( abstractModule(modules[a].addr).transferEvent(from, to, value) );
-            }
-        }
-        return true;
-    }
-    function broadcastSchellingRound(uint256 roundID, uint256 reward) external returns (bool success) {
-        /*
-            Announcing new Schelling round for the modules.
-            Can be called only by the Schelling module.
-            Only the configured modules get notifications( schellingEvent ).
-
-            @roundID        Number of Schelling round.
-            @reward         Coin emission in this Schelling round.
-            @bool           Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success && _found && modules[_id].name == keccak256('Schelling') );
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            if ( modules[a].schellingEvent && abstractModule(modules[a].addr).isActive() ) {
-                require( abstractModule(modules[a].addr).newSchellingRoundEvent(roundID, reward) );
-            }
-        }
-        return true;
-    }
-    function replaceModuleHandler(address newHandler) external returns (bool success) {
-        /*
-            Replacing ModuleHandler.
-
-            Can be called only by the publisher.
-            Every module will be informed about the ModuleHandler replacement.
-
-            @newHandler     Address of the new ModuleHandler.
-            @bool           Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success );
-        if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
-            require( block.number < debugModeUntil );
-            if ( ! insertAndCheckDo(calcDoHash("replaceModuleHandler", keccak256(abi.encodePacked(newHandler)))) ) {
-                return true;
-            }
-        }
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            require( abstractModule(modules[a].addr).replaceModuleHandler(newHandler) );
-        }
-        return true;
-    }
-    function balanceOf(address owner) public view returns (bool success, uint256 value) {
-        /*
-            Query of token balance.
-
-            @owner     address
-            @value      balance.
-            @success    was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        return (true, token(modules[_id].addr).balanceOf(owner));
-    }
-    function totalSupply() public view returns (bool success, uint256 value) {
-        /*
-            Query of the whole token amount.
-
-            @value      amount.
-            @success    was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        return (true, token(modules[_id].addr).totalSupply());
-    }
-    function isICO() public view returns (bool success, bool ico) {
-        /*
-            Query of ICO state
-
-            @ico        Is ICO in progress?.
-            @success    was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        return (true, token(modules[_id].addr).isICO());
-    }
-    function getCurrentSchellingRoundID() public view returns (bool success, uint256 round) {
-        /*
-            Query of number of the actual Schelling round.
-
-            @round      Schelling round.
-            @success    was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByName('Schelling');
-        require( _success && _found );
-        return (true, schelling(modules[_id].addr).getCurrentSchellingRoundID());
-    }
-    function mint(address to, uint256 value) external returns (bool success) {
-        /*
-            Token emission request. Can be called only by the provider.
-
-            @to         Place of new token
-            @value      Token amount
-
-            @success    Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success && _found && modules[_id].name == keccak256('Provider') );
-        (_success, _found, _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        require( token(modules[_id].addr).mint(to, value) );
-        return true;
-    }
-    function transfer(address from, address to, uint256 value, bool fee) external returns (bool success) {
-        /*
-            Token transaction request. Can be called only by a module.
-
-            @from       from who.
-            @to         To who.
-            @value      Token amount.
-            @fee        Transaction fee will be charged or not?
-            @success    Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success && _found );
-        (_success, _found, _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        require( token(modules[_id].addr).transferFromByModule(from, to, value, fee) );
-        return true;
-    }
-    function processTransactionFee(address from, uint256 value) external returns (bool success) {
-        /*
-            Token transaction fee. Can be called only by the provider.
-
-            @from       From who.
-            @value      Token amount.
-            @success    Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success && _found && modules[_id].name == keccak256('Provider') );
-        (_success, _found, _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        require( token(modules[_id].addr).processTransactionFee(from, value) );
-        return true;
-    }
-    function burn(address from, uint256 value) external returns (bool success) {
-        /*
-            Token burn. Can be called only by Schelling.
-
-            @from       From who.
-            @value      Token amount.
-            @success    Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success && _found && modules[_id].name == keccak256('Schelling') );
-        (_success, _found, _id) = getModuleIDByName('Token');
-        require( _success && _found );
-        require( token(modules[_id].addr).burn(from, value) );
-        return true;
-    }
-    function configureModule(string calldata moduleName, announcementType aType, uint256 value) external returns (bool success) {
-        /*
-            Changing configuration of a module. Can be called only by Publisher or while debug mode by owners.
-
-            @moduleName Module name which will be configured
-            @aType      Type of variable (announcementType).
-            @value      New value
-            @success    Was the function successful?
-        */
-        (bool _success, bool _found, uint256 _id) = getModuleIDByAddress(msg.sender);
-        require( _success );
-        if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
-            require( block.number < debugModeUntil );
-            if ( ! insertAndCheckDo(calcDoHash("configureModule", keccak256(abi.encodePacked(moduleName, aType, value)))) ) {
-                return true;
-            }
-        }
-        (_success, _found, _id) = getModuleIDByName(moduleName);
-        require( _success && _found );
-        require( schelling(modules[_id].addr).configure(aType, value) );
-        return true;
-    }
-    function freezing(bool forever) external {
-        /*
-            Freezing CORION Platform. Can be called only by the owner.
-            Freeze can not be recalled!
-
-            @forever    Is it forever or not?
-        */
-        require( owners[msg.sender] );
-        if ( forever ) {
-            if ( ! insertAndCheckDo(calcDoHash("freezing", keccak256(abi.encodePacked(forever)))) ) {
-                return;
-            }
-        }
-        for ( uint256 a=0 ; a<modules.length ; a++ ) {
-            require( abstractModule(modules[a].addr).disableModule(forever) );
-        }
-    }
-}
diff --git a/test/compilationTests/corion/multiOwner.sol b/test/compilationTests/corion/multiOwner.sol
deleted file mode 100644
index cad0ce7a8667..000000000000
--- a/test/compilationTests/corion/multiOwner.sol
+++ /dev/null
@@ -1,83 +0,0 @@
-pragma solidity >=0.0;
-
-import "./safeMath.sol";
-
-contract multiOwner is safeMath {
-
-    mapping(address => bool) public owners;
-    uint256 public ownerCount;
-
-    mapping(bytes32 => address[]) public doDB;
-
-    /*
-        Constructor
-    */
-    constructor(address[] memory newOwners) {
-        for ( uint256 a=0 ; a<newOwners.length ; a++ ) {
-            _addOwner(newOwners[a]);
-        }
-    }
-    /*
-        Externals
-    */
-    function insertOwner(address addr) external {
-        if ( insertAndCheckDo(calcDoHash("insertOwner", keccak256(abi.encodePacked(addr)))) ) {
-            _addOwner(addr);
-        }
-    }
-    function dropOwner(address addr) external {
-        if ( insertAndCheckDo(calcDoHash("dropOwner", keccak256(abi.encodePacked(addr)))) ) {
-            _delOwner(addr);
-        }
-    }
-    function cancelDo(bytes32 doHash) external {
-        if ( insertAndCheckDo(calcDoHash("cancelDo", doHash)) ) {
-            delete doDB[doHash];
-        }
-    }
-    /*
-        Constants
-    */
-    function ownersForChange() public view returns (uint256 owners) {
-        return ownerCount * 75 / 100;
-    }
-    function calcDoHash(string memory job, bytes32 data) public pure returns (bytes32 hash) {
-        return keccak256(abi.encodePacked(job, data));
-    }
-    function validDoHash(bytes32 doHash) public view returns (bool valid) {
-        return doDB[doHash].length > 0;
-    }
-    /*
-        Internals
-    */
-    function insertAndCheckDo(bytes32 doHash) internal returns (bool success) {
-        require( owners[msg.sender] );
-        if (doDB[doHash].length >= ownersForChange()) {
-            delete doDB[doHash];
-            return true;
-        }
-        for ( uint256 a=0 ; a<doDB[doHash].length ; a++ ) {
-            require( doDB[doHash][a] != msg.sender );
-        }
-        if ( doDB[doHash].length+1 >= ownersForChange() ) {
-            delete doDB[doHash];
-            return true;
-        } else {
-            doDB[doHash].push(msg.sender);
-            return false;
-        }
-    }
-    /*
-        Privates
-    */
-    function _addOwner(address addr) private {
-        if ( owners[addr] ) { return; }
-        owners[addr] = true;
-        ownerCount = safeAdd(ownerCount, 1);
-    }
-    function _delOwner(address addr) private {
-        if ( ! owners[addr] ) { return; }
-        delete owners[addr];
-        ownerCount = safeSub(ownerCount, 1);
-    }
-}
diff --git a/test/compilationTests/corion/owned.sol b/test/compilationTests/corion/owned.sol
deleted file mode 100644
index f273e3b531b1..000000000000
--- a/test/compilationTests/corion/owned.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-pragma solidity >=0.0;
-
-contract ownedDB {
-    address private owner;
-
-    function replaceOwner(address newOwner) external returns(bool) {
-        /*
-            Owner replace.
-
-            @newOwner   Address of new owner.
-        */
-        require( isOwner() );
-        owner = newOwner;
-        return true;
-    }
-
-    function isOwner() internal returns(bool) {
-        /*
-            Check of owner address.
-
-            @bool   Owner has called the contract or not
-        */
-        if ( owner == address(0x00) ) {
-            return true;
-        }
-        return owner == msg.sender;
-    }
-}
diff --git a/test/compilationTests/corion/premium.sol b/test/compilationTests/corion/premium.sol
deleted file mode 100644
index 8603b959006b..000000000000
--- a/test/compilationTests/corion/premium.sol
+++ /dev/null
@@ -1,346 +0,0 @@
-pragma solidity >=0.0;
-
-import "./safeMath.sol";
-import "./tokenDB.sol";
-import "./module.sol";
-
-contract thirdPartyPContractAbstract {
-    function receiveCorionPremiumToken(address, uint256, bytes calldata) external returns (bool, uint256) {}
-    function approvedCorionPremiumToken(address, uint256, bytes calldata) external returns (bool) {}
-}
-
-contract ptokenDB is tokenDB {}
-
-/**
- *
- * @title Corion Platform Premium Token
- * @author iFA @ Corion Platform
- *
- */
-contract premium is module, safeMath {
-    function replaceModule(address payable addr) external override returns (bool success) {
-        require( super.isModuleHandler(payable(msg.sender)) );
-        require( db.replaceOwner(addr) );
-        super._replaceModule(addr);
-        return true;
-    }
-    modifier isReady {
-        (bool _success, bool _active) = super.isActive();
-        require( _success && _active );
-        _;
-    }
-
-    string public name = "Corion Premium";
-    string public symbol = "CORP";
-    uint8 public decimals = 0;
-
-    address public icoAddr;
-    tokenDB public db;
-    bool    public  isICO;
-
-    mapping(address => bool) public genesis;
-
-    constructor(bool forReplace, address payable moduleHandler, address dbAddress, address icoContractAddr, address[] memory genesisAddr, uint256[] memory genesisValue) {
-        /*
-            Setup function.
-            If an ICOaddress is defined then the balance of the genesis addresses will be set as well.
-
-            @forReplace         This address will be replaced with the old one or not.
-            @moduleHandler      Modulhandler’s address
-            @dbAddress          Address of database
-            @icoContractAddr    Address of ico contract.
-            @genesisAddr        Array of the genesis addresses.
-            @genesisValue       Array of the balance of the genesis addresses
-        */
-        super.registerModuleHandler(moduleHandler);
-        require( dbAddress != address(0x00) );
-        db = ptokenDB(dbAddress);
-        if ( ! forReplace ) {
-            require( db.replaceOwner(address(this)) );
-            isICO = true;
-            icoAddr = icoContractAddr;
-            assert( genesisAddr.length == genesisValue.length );
-            for ( uint256 a=0 ; a<genesisAddr.length ; a++ ) {
-                genesis[genesisAddr[a]] = true;
-                require( db.increase(genesisAddr[a], genesisValue[a]) );
-                emit Mint(genesisAddr[a], genesisValue[a]);
-            }
-        }
-    }
-
-    function closeIco() external returns (bool success) {
-        /*
-            Finishing the ICO. Can be invited only by an ICO contract.
-
-            @success    If the function was successful.
-        */
-        require( isICO );
-        isICO = false;
-        return true;
-    }
-
-    /**
-     * @notice `msg.sender` approves `spender` to spend `amount` tokens on its behalf.
-     * @param spender The address of the account able to transfer the tokens
-     * @param amount The amount of tokens to be approved for transfer
-     * @param nonce The transaction count of the authorised address
-     * @return success True if the approval was successful
-     */
-    function approve(address spender, uint256 amount, uint256 nonce) isReady external returns (bool success) {
-        /*
-            Authorize another address to use an exact amount of the principal’s balance.
-
-            @spender    Address of authorised party
-            @amount     Token quantity
-            @nonce      Transaction count
-
-            @success    Was the Function successful?
-        */
-        _approve(spender, amount, nonce);
-        return true;
-    }
-
-    /**
-     * @notice `msg.sender` approves `spender` to spend `amount` tokens on its behalf and notify the spender from your approve with your `extraData` data.
-     * @param spender The address of the account able to transfer the tokens
-     * @param amount The amount of tokens to be approved for transfer
-     * @param nonce The transaction count of the authorised address
-     * @param extraData Data to give forward to the receiver
-     * @return success True if the approval was successful
-     */
-    function approveAndCall(address spender, uint256 amount, uint256 nonce, bytes calldata extraData) isReady external returns (bool success) {
-        /*
-            Authorize another address to use an exact amount of the principal’s balance.
-            After the transaction the approvedCorionPremiumToken function of the address will be called with the given data.
-
-            @spender        Authorized address
-            @amount         Token quantity
-            @extraData      Extra data to be received by the receiver
-            @nonce          Transaction count
-
-            @success         Was the Function successful?
-        */
-        _approve(spender, amount, nonce);
-        require( thirdPartyPContractAbstract(spender).approvedCorionPremiumToken(msg.sender, amount, extraData) );
-        return true;
-    }
-
-    function _approve(address spender, uint256 amount, uint256 nonce) isReady internal {
-        /*
-            Inner function to authorize another address to use an exact amount of the principal’s balance.
-            If the transaction count not match the authorise fails.
-
-            @spender    Address of authorised party
-            @amount     Token quantity
-            @nonce      Transaction count
-        */
-        require( msg.sender != spender );
-        require( db.balanceOf(msg.sender) >= amount );
-        require( db.setAllowance(msg.sender, spender, amount, nonce) );
-        emit Approval(msg.sender, spender, amount);
-    }
-
-    function allowance(address owner, address spender) public view returns (uint256 remaining, uint256 nonce) {
-        /*
-            Get the quantity of tokens given to be used
-
-            @owner          Authorising address
-            @spender        Authorised address
-
-            @remaining      Tokens to be spent
-            @nonce          Transaction count
-        */
-        (bool _success, uint256 _remaining, uint256 _nonce) = db.getAllowance(owner, spender);
-        require( _success );
-        return (_remaining, _nonce);
-    }
-
-    /**
-     * @notice Send `amount` Corion tokens to `to` from `msg.sender`
-     * @param to The address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @return success Whether the transfer was successful or not
-     */
-    function transfer(address to, uint256 amount) isReady external returns (bool success) {
-        /*
-            Launch a transaction where the token is sent from the sender’s address to the receiver’s address.
-            Transaction fee is going to be added as well.
-            If the receiver is not a natural address but also a person then she/he will be invited as well.
-
-            @to         For who
-            @amount     Amount
-
-            @success    Was the function successful?
-        */
-        bytes memory _data;
-        if ( isContract(to) ) {
-            transferToContract(msg.sender, to, amount, _data);
-        } else {
-            _transfer(msg.sender, to, amount);
-        }
-        emit Transfer(msg.sender, to, amount, _data);
-        return true;
-    }
-
-    /**
-     * @notice Send `amount` tokens to `to` from `from` on the condition it is approved by `from`
-     * @param from The address holding the tokens being transferred
-     * @param to The address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @return success True if the transfer was successful
-     */
-    function transferFrom(address from, address to, uint256 amount) isReady external returns (bool success) {
-        /*
-            Launch a transaction where we transfer from a given address to another one. It can only be called by an address which was allowed before.
-            Transaction fee will be charged too.
-            If the receiver is not a natural address but also a person then she/he will be invited as well
-
-            @from       From who?
-            @to         For who?
-            @amount     Amount
-
-            @success    If the function was successful.
-        */
-        if ( from != msg.sender ) {
-            (bool _success, uint256 _reamining, uint256 _nonce) = db.getAllowance(from, msg.sender);
-            require( _success );
-            _reamining = safeSub(_reamining, amount);
-            _nonce = safeAdd(_nonce, 1);
-            require( db.setAllowance(from, msg.sender, _reamining, _nonce) );
-            emit AllowanceUsed(msg.sender, from, amount);
-        }
-        bytes memory _data;
-        if ( isContract(to) ) {
-            transferToContract(from, to, amount, _data);
-        } else {
-            _transfer( from, to, amount);
-        }
-        emit Transfer(from, to, amount, _data);
-        return true;
-    }
-
-    /**
-     * @notice Send `amount` Corion tokens to `to` from `msg.sender` and notify the receiver from your transaction with your `extraData` data
-     * @param to The contract address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @param extraData Data to give forward to the receiver
-     * @return success Whether the transfer was successful or not
-     */
-    function transfer(address to, uint256 amount, bytes calldata extraData) isReady external returns (bool success) {
-        /*
-            Launch a transaction where we transfer from a given address to another one.
-            After thetransaction the approvedCorionPremiumToken function of the receiver’s address is going to be called with the given data.
-
-            @to         For who?
-            @amount     Amount
-            @extraData  Extra data that will be given to the receiver
-
-            @success    If the function was successful.
-        */
-        if ( isContract(to) ) {
-            transferToContract(msg.sender, to, amount, extraData);
-        } else {
-            _transfer( msg.sender, to, amount);
-        }
-        emit Transfer(msg.sender, to, amount, extraData);
-        return true;
-    }
-
-    function transferToContract(address from, address to, uint256 amount, bytes memory extraData) internal {
-        /*
-            Inner function in order to transact a contract.
-
-            @to             For who?
-            @amount         Amount
-            @extraData      Extra data that will be given to the receiver
-        */
-        _transfer(from, to, amount);
-        (bool _success, uint256 _back) = thirdPartyPContractAbstract(to).receiveCorionPremiumToken(from, amount, extraData);
-        require( _success );
-        require( amount > _back );
-        if ( _back > 0 ) {
-            _transfer(to, from, _back);
-        }
-    }
-
-    function _transfer(address from, address to, uint256 amount) isReady internal {
-        /*
-            Inner function to launch a transaction.
-            During the ICO transactions are only possible from the genesis address.
-            0xa636a97578d26a3b76b060bbc18226d954cf3757 address is blacklisted.
-
-            @from      From how?
-            @to        For who?
-            @amount    Amount
-        */
-        require( from != address(0x00) && to != address(0x00) && to != 0xa636A97578d26A3b76B060Bbc18226d954cf3757 );
-        require( ( ! isICO) || genesis[from] );
-        require( db.decrease(from, amount) );
-        require( db.increase(to, amount) );
-    }
-
-    function mint(address owner, uint256 value) external returns (bool success) {
-        /*
-            Generating tokens. It can be called only by ICO contract.
-
-            @owner      Address
-            @value      Amount.
-
-            @success    Was the Function successful?
-        */
-        require( msg.sender == icoAddr || isICO );
-        _mint(owner, value);
-        return true;
-    }
-
-    function _mint(address owner, uint256 value) isReady internal {
-        /*
-            Inner function to create a token.
-
-            @owner     Address of crediting the token.
-            @value     Amount
-        */
-        require( db.increase(owner, value) );
-        emit Mint(owner, value);
-    }
-
-    function isContract(address addr) internal returns (bool success) {
-        /*
-            Inner function in order to check if the given address is a natural address or a contract.
-
-            @addr       The address which is needed to be checked.
-
-            @success    Is the address crontact or not
-        */
-        uint256 _codeLength;
-        assembly {
-            _codeLength := extcodesize(addr)
-        }
-        return _codeLength > 0;
-    }
-
-    function balanceOf(address owner) public view returns (uint256 value) {
-        /*
-            Token balance query
-
-            @owner      Address
-            @value      Balance of address
-        */
-        return db.balanceOf(owner);
-    }
-
-    function totalSupply() public view returns (uint256 value) {
-        /*
-            Total token quantity query
-
-            @value      Total token quantity
-        */
-        return db.totalSupply();
-    }
-
-    event AllowanceUsed(address indexed spender, address indexed owner, uint256 indexed value);
-    event Mint(address indexed addr, uint256 indexed value);
-    event Burn(address indexed addr, uint256 indexed value);
-    event Approval(address indexed _owner, address indexed _spender, uint256 _value);
-    event Transfer(address indexed _from, address indexed _to, uint256 _value, bytes _extraData);
-}
diff --git a/test/compilationTests/corion/provider.sol b/test/compilationTests/corion/provider.sol
deleted file mode 100644
index 524390b2ed3a..000000000000
--- a/test/compilationTests/corion/provider.sol
+++ /dev/null
@@ -1,799 +0,0 @@
-pragma solidity >=0.0;
-
-import "./module.sol";
-import "./moduleHandler.sol";
-import "./safeMath.sol";
-import "./announcementTypes.sol";
-
-contract provider is module, safeMath, announcementTypes {
-    /*
-        module callbacks
-    */
-    function connectModule() external override returns (bool success) {
-        require( super.isModuleHandler(payable(msg.sender)) );
-        super._connectModule();
-        (bool _success, uint256 currentSchellingRound) = moduleHandler(moduleHandlerAddress).getCurrentSchellingRoundID();
-        require( _success );
-        return true;
-    }
-    function transferEvent(address payable from, address payable to, uint256 value) external override returns (bool success) {
-        /*
-            Transaction completed. This function is only available for the modulehandler.
-            It should be checked if the sender or the acceptor does not connect to the provider or it is not a provider itself if so than the change should be recorded.
-
-            @from       From whom?
-            @to         For who?
-            @value      amount
-            @bool       Was the function successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        transferEvent_(from, value, true);
-        transferEvent_(to, value, false);
-        return true;
-    }
-    function newSchellingRoundEvent(uint256 roundID, uint256 reward) external override returns (bool success) {
-        /*
-            New schelling round. This function is only available for the moduleHandler.
-            We are recording the new schelling round and we are storing the whole current quantity of the tokens.
-            We generate a reward quantity of tokens directed to the providers address. The collected interest will be transferred from this contract.
-
-            @roundID        Number of the schelling round.
-            @reward         token emission
-            @bool           Was the function successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        globalFunds[roundID].reward = reward;
-        globalFunds[roundID].supply = globalFunds[roundID-1].supply;
-        currentSchellingRound = roundID;
-        require( moduleHandler(moduleHandlerAddress).mint(address(this), reward) );
-        return true;
-    }
-    modifier isReady {
-        (bool _success, bool _active) = super.isActive();
-        require( _success && _active );
-        _;
-    }
-    /*
-        Provider module
-    */
-    uint256 private minFundsForPublic   = 3000;
-    uint256 private minFundsForPrivate  = 8000;
-    uint256 private privateProviderLimit  = 250;
-    uint8 private publicMinRate     = 30;
-    uint8 private privateMinRate    = 0;
-    uint8 private publicMaxRate     = 70;
-    uint8 private privateMaxRate    = 100;
-    uint256 private gasProtectMaxRounds = 630;
-    uint256 private interestMinFunds = 25000;
-    uint256 private rentRate = 20;
-
-    struct _rate {
-        uint8 value;
-        bool valid;
-    }
-    struct __providers {
-        address admin;
-        string name;
-        string website;
-        string country;
-        string info;
-        bool isForRent;
-        mapping(uint256 => _rate) rateHistory;
-        uint8 currentRate;
-        bool priv;
-        uint256 clientsCount;
-        mapping(address => bool) allowedUsers;
-        mapping(uint256 => uint256) supply;
-        uint256 lastSupplyID;
-        mapping(uint256 => uint256) ownSupply;
-        uint256 lastOwnSupplyID;
-        uint256 paidUpTo;
-        uint8 lastPaidRate;
-        uint256 create;
-        uint256 close;
-        bool valid;
-    }
-    struct _providers {
-        mapping(uint256 => __providers) data;
-        uint256 currentHeight;
-    }
-    mapping(address => _providers) private providers;
-
-    struct _globalFunds {
-        uint256 reward;
-        uint256 supply;
-    }
-    mapping(uint256 => _globalFunds) private globalFunds;
-
-    struct _client{
-        address providerAddress;
-        uint256 providerHeight;
-        uint256 providerConnected;
-        uint8 lastRate;
-        mapping(uint256 => uint256) supply;
-        uint256 lastSupplyID;
-        uint256 paidUpTo;
-    }
-    mapping(address => _client) private clients;
-
-    uint256 private currentSchellingRound = 1;
-
-    constructor(address payable _moduleHandler) {
-        /*
-            Install function.
-
-            @_moduleHandler     Address of the moduleHandler.
-        */
-        super.registerModuleHandler(_moduleHandler);
-    }
-    function configure(announcementType a, uint256 b) external returns(bool) {
-        /*
-            Configuration of the provider. Can be invited just by the moduleHandler.
-
-            @a      Type of the setting
-            @b      value
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        if      ( a == announcementType.providerPublicFunds )          { minFundsForPublic = b; }
-        else if ( a == announcementType.providerPrivateFunds )         { minFundsForPrivate = b; }
-        else if ( a == announcementType.providerPrivateClientLimit )   { privateProviderLimit = b; }
-        else if ( a == announcementType.providerPublicMinRate )        { publicMinRate = uint8(b); }
-        else if ( a == announcementType.providerPublicMaxRate )        { publicMaxRate = uint8(b); }
-        else if ( a == announcementType.providerPrivateMinRate )       { privateMinRate = uint8(b); }
-        else if ( a == announcementType.providerPrivateMaxRate )       { privateMaxRate = uint8(b); }
-        else if ( a == announcementType.providerGasProtect )           { gasProtectMaxRounds = b; }
-        else if ( a == announcementType.providerInterestMinFunds )     { interestMinFunds = b; }
-        else if ( a == announcementType.providerRentRate )             { rentRate = b; }
-        else { return false; }
-        return true;
-    }
-    function getUserDetails(address payable addr, uint256 schellingRound) public view returns (address ProviderAddress, uint256 ProviderHeight, uint256 ConnectedOn, uint256 value) {
-        /*
-            Collecting the data of the client.
-
-            @addr               Address of the client.
-            @schellingRound     Number of the schelling round. If it is not defined then the current one.
-            @ProviderAddress    Address of the provider the one where connected to
-            @ProviderHeight     The height (level) of the provider where is connected.
-            @ConnectedOn        Time of connection
-            @value              Quantity of the client’s token
-        */
-        if ( schellingRound == 0 ) {
-            schellingRound = currentSchellingRound;
-        }
-        if ( clients[addr].providerAddress != address(0x00) ) {
-            ProviderAddress = clients[addr].providerAddress;
-            ProviderHeight  = clients[addr].providerHeight;
-            ConnectedOn     = clients[addr].providerConnected;
-            value           = clients[addr].supply[schellingRound];
-        }
-    }
-    function rightForInterest(uint256 value, bool priv) internal view returns (bool) {
-        /*
-            the share from the token emission.
-            In case is a private provider it has to be checked if it has enough connected capital to be able to accept share from the token emission.
-            The provider’s account counts as a capital for the emission as well.
-
-            @value      amount of the connected capital
-            @priv       Is the provider private or not?
-            @bool       Gets the share from the token emission.
-        */
-        if ( priv ) {
-            return ( value >= interestMinFunds );
-        }
-        return true;
-    }
-    function setRightForInterest(uint256 oldValue, uint256 newValue, bool priv) internal {
-        /*
-            It checks if the provider has enough connected captital to be able to get from the token emission.
-            In case the provider is not able to get the share from the token emission then the connected capital will not count to the value of the globalFunds, to the current schelling round.
-
-            @oldValue       old
-            @newValue       new
-            @priv           Is the provider private?
-        */
-        bool a = rightForInterest(oldValue, priv);
-        bool b = rightForInterest(newValue, priv);
-        if ( a && b ) {
-            globalFunds[currentSchellingRound].supply = globalFunds[currentSchellingRound].supply - oldValue + newValue;
-        } else if ( a && ! b ) {
-            globalFunds[currentSchellingRound].supply -= oldValue;
-        } else if ( ! a && b ) {
-            globalFunds[currentSchellingRound].supply += newValue;
-        }
-    }
-    function checkCorrectRate(bool priv, uint8 rate) internal returns(bool) {
-        /*
-            Inner function which checks if the amount of interest what is given by the provider is fits to the criteria.
-
-            @priv       Is the provider private or not?
-            @rate       Percentage/rate of the interest
-            @bool       Correct or not?
-        */
-        return ( ! priv && ( rate >= publicMinRate && rate <= publicMaxRate ) ) ||
-                ( priv && ( rate >= privateMinRate && rate <= privateMaxRate ) );
-    }
-    function createProvider(bool priv, string calldata name, string calldata website, string calldata country, string calldata info, uint8 rate, bool isForRent, address payable admin) isReady external {
-        /*
-            Creating a provider.
-            During the ICO its not allowed to create provider.
-            To one address only one provider can belong to.
-            Address, how is connected to the provider can not create a provider.
-            For opening, has to have enough capital.
-            All the functions of the provider except of the closing are going to be handled by the admin.
-            The provider can be start as a rent as well, in this case the isForRent has to be true/correct. In case it runs as a rent the 20% of the profit will belong to the leser and the rest goes to the admin.
-
-            @priv           Privat szolgaltato e. Is private provider?
-            @name           Provider’s name.
-            @website        Provider’s website
-            @country        Provider’s country
-            @info           Provider’s short introduction.
-            @rate           Rate of the emission what is going to be transferred to the client by the provider.
-            @isForRent      is for Rent or not?
-            @admin          The admin’s address
-        */
-        require( ! providers[msg.sender].data[providers[msg.sender].currentHeight].valid );
-        require( clients[msg.sender].providerAddress == address(0x00) );
-        require( ! checkICO() );
-        if ( priv ) {
-            require( getTokenBalance(msg.sender) >= minFundsForPrivate );
-        } else {
-            require( getTokenBalance(msg.sender) >= minFundsForPublic );
-        }
-        require( checkCorrectRate(priv, rate) );
-
-        providers[msg.sender].currentHeight++;
-        uint256 currHeight = providers[msg.sender].currentHeight;
-        providers[msg.sender].data[currHeight].valid           = true;
-        if ( admin == address(0x00) ) {
-            providers[msg.sender].data[currHeight].admin      = msg.sender;
-        } else {
-            providers[msg.sender].data[currHeight].admin      = admin;
-        }
-        providers[msg.sender].data[currHeight].name            = name;
-        providers[msg.sender].data[currHeight].website         = website;
-        providers[msg.sender].data[currHeight].isForRent       = isForRent;
-        providers[msg.sender].data[currHeight].country         = country;
-        providers[msg.sender].data[currHeight].info            = info;
-        providers[msg.sender].data[currHeight].currentRate     = rate;
-        providers[msg.sender].data[currHeight].create          = block.timestamp;
-        providers[msg.sender].data[currHeight].lastPaidRate    = rate;
-        providers[msg.sender].data[currHeight].priv            = priv;
-        providers[msg.sender].data[currHeight].lastSupplyID    = currentSchellingRound;
-        providers[msg.sender].data[currHeight].paidUpTo        = currentSchellingRound;
-        if ( priv ) {
-            providers[msg.sender].data[currHeight].supply[currentSchellingRound]        = getTokenBalance(msg.sender);
-            providers[msg.sender].data[currHeight].ownSupply[currentSchellingRound]     = getTokenBalance(msg.sender);
-            providers[msg.sender].data[currHeight].lastOwnSupplyID                      = currentSchellingRound;
-        } else {
-            delete providers[msg.sender].data[currHeight].supply[currentSchellingRound];
-        }
-        emit EProviderOpen(msg.sender, currHeight);
-    }
-    function setProviderDetails(address payable addr, string calldata website, string calldata country, string calldata info, uint8 rate, address payable admin) isReady external {
-        /*
-            Modifying the data of the provider.
-            This can only be invited by the provider’s admin.
-            The emission rate is only valid for the next schelling round for this one it is not.
-            The admin can only be changed by the address of the provider.
-
-            @addr               Address of the provider.
-            @website            Website.
-            @admin              The new address of the admin. If we do not want to set it then we should enter 0X00.
-            @country            Country
-            @info               Short intro.
-            @rate               Rate of the emission what will be given to the client.
-        */
-        uint256 currHeight = providers[addr].currentHeight;
-        require( providers[addr].data[currHeight].valid );
-        require( checkCorrectRate(providers[addr].data[currHeight].priv, rate) );
-        require( providers[addr].data[currHeight].admin == msg.sender || msg.sender == addr );
-        if ( admin != address(0x00) ) {
-            require( msg.sender == addr );
-            providers[addr].data[currHeight].admin = admin;
-        }
-        providers[addr].data[currHeight].rateHistory[currentSchellingRound] = _rate( rate, true );
-        providers[addr].data[currHeight].website         = website;
-        providers[addr].data[currHeight].country         = country;
-        providers[addr].data[currHeight].info            = info;
-        providers[addr].data[currHeight].currentRate     = rate;
-        emit EProviderDetailsChanged(addr, currHeight, website, country, info, rate, admin);
-    }
-    function getProviderInfo(address addr, uint256 height) public view returns (string memory name, string memory website, string memory country, string memory info, uint256 create) {
-        /*
-            for the infos of the provider.
-            In case the height is unknown then the system will use the last known height.
-
-            @addr           Addr of the provider
-            @height         Height
-            @name           Name of the provider.
-            @website        Website of the provider.
-            @country        Country of the provider.
-            @info           Short intro of the provider.
-            @create         Timestamp of creating the provider
-        */
-        if ( height == 0 ) {
-            height = providers[addr].currentHeight;
-        }
-        name            = providers[addr].data[height].name;
-        website         = providers[addr].data[height].website;
-        country         = providers[addr].data[height].country;
-        info            = providers[addr].data[height].info;
-        create          = providers[addr].data[height].create;
-    }
-    function getProviderDetails(address payable addr, uint256 height) public view returns (uint8 rate, bool isForRent, uint256 clientsCount, bool priv, bool getInterest, bool valid) {
-        /*
-            Asking for the data of the provider.
-            In case the height is unknown then the system will use the last known height.
-
-            @addr           Address of the provider
-            @height         Height
-            @rate           The rate of the emission which will be transferred to the client.
-            @isForRent      Rent or not.
-            @clientsCount   Number of the clients.
-            @priv           Private or not?
-            @getInterest    Does get from the token emission?
-            @valid          Is an active provider?
-        */
-        if ( height == 0 ) {
-            height = providers[addr].currentHeight;
-        }
-        rate            = providers[addr].data[height].currentRate;
-        isForRent       = providers[addr].data[height].isForRent;
-        clientsCount    = providers[addr].data[height].clientsCount;
-        priv            = providers[addr].data[height].priv;
-        getInterest     = rightForInterest(getProviderCurrentSupply(addr), providers[addr].data[height].priv );
-        valid           = providers[addr].data[height].valid;
-    }
-    function getProviderCurrentSupply(address addr) internal view returns (uint256) {
-        /*
-            Inner function for polling the current height and the current quantity of the connected capital of the schelling round.
-
-            @addr           Provider’s address.
-            @uint256        Amount of the connected capital
-        */
-        return providers[addr].data[providers[addr].currentHeight].supply[currentSchellingRound];
-    }
-    function closeProvider() isReady external {
-        /*
-            Closing and deactivating the provider.
-            It is only possible to close that active provider which is owned by the sender itself after calling the whole share of the emission.
-            Whom were connected to the provider those clients will have to disconnect after they’ve called their share of emission which was not called before.
-        */
-        uint256 currHeight = providers[msg.sender].currentHeight;
-        require( providers[msg.sender].data[currHeight].valid );
-        require( providers[msg.sender].data[currHeight].paidUpTo == currentSchellingRound );
-
-        providers[msg.sender].data[currHeight].valid = false;
-        providers[msg.sender].data[currHeight].close = currentSchellingRound;
-        setRightForInterest(getProviderCurrentSupply(msg.sender), 0, providers[msg.sender].data[currHeight].priv);
-        emit EProviderClose(msg.sender, currHeight);
-    }
-    function allowUsers(address provider, address[] calldata addr) isReady external {
-        /*
-            Permission of the user to be able to connect to the provider.
-            This can only be invited by the provider’s admin.
-            With this kind of call only 100 address can be permitted.
-
-            @addr       Array of the addresses for whom the connection is allowed.
-        */
-        uint256 currHeight = providers[provider].currentHeight;
-        require( providers[provider].data[currHeight].valid );
-        require( providers[provider].data[currHeight].priv );
-        require( providers[provider].data[currHeight].admin == msg.sender );
-        require( addr.length <= 100 );
-
-        for ( uint256 a=0 ; a<addr.length ; a++ ) {
-            providers[provider].data[currHeight].allowedUsers[addr[a]] = true;
-        }
-    }
-    function disallowUsers(address provider, address[] calldata addr) isReady external {
-        /*
-            Disable of the user not to be able to connect to the provider.
-            It is can called only for the admin of the provider.
-            With this kind of call only 100 address can be permitted.
-
-            @addr      Array of the addresses for whom the connection is allowed.
-        */
-        uint256 currHeight = providers[provider].currentHeight;
-        require( providers[provider].data[currHeight].valid );
-        require( providers[provider].data[currHeight].priv );
-        require( providers[provider].data[currHeight].admin == msg.sender );
-        require( addr.length <= 100 );
-
-        for ( uint256 a=0 ; a<addr.length ; a++ ) {
-            delete providers[provider].data[currHeight].allowedUsers[addr[a]];
-        }
-    }
-    function joinProvider(address provider) isReady external {
-        /*
-            Connection to the provider.
-            Providers can not connect to other providers.
-            If is a client at any provider, then it is not possible to connect to other provider one.
-            It is only possible to connect to valid and active providers.
-            If is an active provider then the client can only connect, if address is permitted at the provider (Whitelist).
-            At private providers, the number of the client is restricted. If it reaches the limit no further clients are allowed to connect.
-            This process has a transaction fee based on the senders whole token quantity.
-
-            @provider       Address of the provider.
-        */
-        uint256 currHeight = providers[provider].currentHeight;
-        require( ! providers[msg.sender].data[currHeight].valid );
-        require( clients[msg.sender].providerAddress == address(0x00) );
-        require( providers[provider].data[currHeight].valid );
-        if ( providers[provider].data[currHeight].priv ) {
-            require( providers[provider].data[currHeight].allowedUsers[msg.sender] &&
-                     providers[provider].data[currHeight].clientsCount < privateProviderLimit );
-        }
-        uint256 bal = getTokenBalance(msg.sender);
-        require( moduleHandler(moduleHandlerAddress).processTransactionFee(msg.sender, bal) );
-
-        checkFloatingSupply(provider, currHeight, false, bal);
-        providers[provider].data[currHeight].clientsCount++;
-        clients[msg.sender].providerAddress = provider;
-        clients[msg.sender].providerHeight = currHeight;
-        clients[msg.sender].supply[currentSchellingRound] = bal;
-        clients[msg.sender].lastSupplyID = currentSchellingRound;
-        clients[msg.sender].paidUpTo = currentSchellingRound;
-        clients[msg.sender].lastRate = providers[provider].data[currHeight].currentRate;
-        clients[msg.sender].providerConnected = block.timestamp;
-        emit ENewClient(msg.sender, provider, currHeight, bal);
-    }
-    function partProvider() isReady external {
-        /*
-            Disconnecting from the provider.
-            Before disconnecting we should poll our share from the token emission even if there was nothing factually.
-            It is only possible to disconnect those providers who were connected by us before.
-        */
-        address provider = clients[msg.sender].providerAddress;
-        require( provider != address(0x00) );
-        uint256 currHeight = clients[msg.sender].providerHeight;
-        bool providerHasClosed = false;
-        if ( providers[provider].data[currHeight].close > 0 ) {
-            providerHasClosed = true;
-            require( clients[msg.sender].paidUpTo == providers[provider].data[currHeight].close );
-        } else {
-            require( clients[msg.sender].paidUpTo == currentSchellingRound );
-        }
-
-        uint256 bal = getTokenBalance(msg.sender);
-        if ( ! providerHasClosed ) {
-            providers[provider].data[currHeight].clientsCount--;
-            checkFloatingSupply(provider, currHeight, true, bal);
-        }
-        delete clients[msg.sender].providerAddress;
-        delete clients[msg.sender].providerHeight;
-        delete clients[msg.sender].lastSupplyID;
-        delete clients[msg.sender].paidUpTo;
-        delete clients[msg.sender].lastRate;
-        delete clients[msg.sender].providerConnected;
-        emit EClientLost(msg.sender, provider, currHeight, bal);
-    }
-    function checkReward(address addr) public returns (uint256 reward) {
-        /*
-            Polling the share from the token emission for clients and for providers.
-
-            @addr           The address want to check.
-            @reward         Accumulated amount.
-        */
-        if ( providers[addr].data[providers[addr].currentHeight].valid ) {
-            uint256 a;
-            (reward, a) = getProviderReward(addr, 0);
-        } else if ( clients[addr].providerAddress != address(0x00) ) {
-            reward = getClientReward(0);
-        }
-    }
-    function getReward(address beneficiary, uint256 limit, address provider) isReady external returns (uint256 reward) {
-        /*
-            Polling the share from the token emission token emission for clients and for providers.
-
-            It is optionally possible to give an address of a beneficiary for whom we can transfer the accumulated amount. In case we don’t enter any address then the amount will be transferred to the caller’s address.
-            As the interest should be checked at each schelling round in order to get the share from that so to avoid the overflow of the gas the number of the check-rounds should be limited.
-            Opcionalisan megadhato az ellenorzes koreinek szama. It is possible to enter optionally the number of the check-rounds.  If it is 0 then it is automatic.
-            Provider variable should only be entered if the real owner of the provider is not the caller’s address.
-            In case the client/provider was far behind then it is possible that this function should be called several times to check the total generated schelling rounds and to collect the share.
-            If is neither a client nor a provider then the function is not available.
-            The tokens will be sent to the beneficiary from the address of the provider without any transaction fees.
-
-            @beneficiary        Address of the beneficiary
-            @limit              Quota of the check-rounds.
-            @provider           Address of the provider
-            @reward             Accumulated amount from the previous rounds.
-        */
-        uint256 _limit = limit;
-        address _beneficiary = beneficiary;
-        address _provider = provider;
-        if ( _limit == 0 ) { _limit = gasProtectMaxRounds; }
-        if ( _beneficiary == address(0x00) ) { _beneficiary = msg.sender; }
-        if ( _provider == address(0x00) ) { _provider = msg.sender; }
-        uint256 clientReward;
-        uint256 providerReward;
-        if ( providers[_provider].data[providers[_provider].currentHeight].valid ) {
-            require( providers[_provider].data[providers[_provider].currentHeight].admin == msg.sender || msg.sender == _provider );
-            (providerReward, clientReward) = getProviderReward(_provider, _limit);
-        } else if ( clients[msg.sender].providerAddress != address(0x00) ) {
-            clientReward = getClientReward(_limit);
-        } else {
-            revert();
-        }
-        if ( clientReward > 0 ) {
-            require( moduleHandler(moduleHandlerAddress).transfer(address(this), _beneficiary, clientReward, false) );
-        }
-        if ( providerReward > 0 ) {
-            require( moduleHandler(moduleHandlerAddress).transfer(address(this), provider, providerReward, false) );
-        }
-        emit EReward(msg.sender, provider, clientReward, providerReward);
-    }
-    function getClientReward(uint256 limit) internal returns (uint256 reward) {
-        /*
-            Inner function for the client in order to collect the share from the token emission
-
-            @limit          Quota of checking the schelling-rounds.
-            @reward         Collected token amount from the checked rounds.
-        */
-        uint256 value;
-        uint256 steps;
-        address provAddr;
-        uint256 provHeight;
-        bool interest = false;
-        uint256 a;
-        uint8 rate = clients[msg.sender].lastRate;
-        for ( a = (clients[msg.sender].paidUpTo + 1) ; a <= currentSchellingRound ; a++ ) {
-            if (globalFunds[a].reward > 0 && globalFunds[a].supply > 0) {
-                provAddr = clients[msg.sender].providerAddress;
-                provHeight = clients[msg.sender].providerHeight;
-                if ( providers[provAddr].data[provHeight].rateHistory[a].valid ) {
-                    rate = providers[provAddr].data[provHeight].rateHistory[a].value;
-                }
-                if ( rate > 0 ) {
-                    if ( a > providers[provAddr].data[provHeight].lastSupplyID ) {
-                        interest = rightForInterest(providers[provAddr].data[provHeight].supply[providers[provAddr].data[provHeight].lastSupplyID], providers[provAddr].data[provHeight].priv);
-                    } else {
-                        interest = rightForInterest(providers[provAddr].data[provHeight].supply[a], providers[provAddr].data[provHeight].priv);
-                    }
-                    if ( interest ) {
-                        if ( limit > 0 && steps > limit ) {
-                            a--;
-                            break;
-                        }
-                        if (clients[msg.sender].lastSupplyID < a) {
-                            value = clients[msg.sender].supply[clients[msg.sender].lastSupplyID];
-                        } else {
-                            value = clients[msg.sender].supply[a];
-                        }
-                        if ( globalFunds[a].supply > 0) {
-                            reward += value * globalFunds[a].reward / globalFunds[a].supply * uint256(rate) / 100;
-                        }
-                        steps++;
-                    }
-                }
-            }
-        }
-        clients[msg.sender].lastRate = rate;
-        clients[msg.sender].paidUpTo = a-1;
-    }
-    function getProviderReward(address addr, uint256 limit) internal returns (uint256 providerReward, uint256 adminReward) {
-        /*
-            Inner function for the provider in order to collect the share from the token emission
-            @addr               Address of the provider.
-            @limit              Quota of the check-rounds.
-            @providerReward     The reward of the provider’s address from the checked rounds.
-            @adminReward        Admin’s reward from the checked rounds.
-        */
-        uint256 reward;
-        uint256 ownReward;
-        uint256 value;
-        uint256 steps;
-        uint256 currHeight = providers[addr].currentHeight;
-        uint256 LTSID = providers[addr].data[currHeight].lastSupplyID;
-        uint256 a;
-        uint8 rate = providers[addr].data[currHeight].lastPaidRate;
-        for ( a = (providers[addr].data[currHeight].paidUpTo + 1) ; a <= currentSchellingRound ; a++ ) {
-            if (globalFunds[a].reward > 0 && globalFunds[a].supply > 0) {
-                if ( providers[addr].data[currHeight].rateHistory[a].valid ) {
-                    rate = providers[addr].data[currHeight].rateHistory[a].value;
-                }
-                if ( rate > 0 ) {
-                    if ( ( a > LTSID && rightForInterest(providers[addr].data[currHeight].supply[LTSID], providers[addr].data[currHeight].priv) ||
-                        rightForInterest(providers[addr].data[currHeight].supply[a], providers[addr].data[currHeight].priv) ) ) {
-                        if ( limit > 0 && steps > limit ) {
-                            a--;
-                            break;
-                        }
-                        if ( LTSID < a ) {
-                            value = providers[addr].data[currHeight].supply[LTSID];
-                        } else {
-                            value = providers[addr].data[currHeight].supply[a];
-                        }
-                        if ( globalFunds[a].supply > 0) {
-                            reward += value * globalFunds[a].reward / globalFunds[a].supply * ( 100 - uint256(rate) ) / 100;
-                            if ( providers[addr].data[currHeight].priv ) {
-                                LTSID = providers[addr].data[currHeight].lastOwnSupplyID;
-                                if ( LTSID < a ) {
-                                    value = providers[addr].data[currHeight].ownSupply[LTSID];
-                                } else {
-                                    value = providers[addr].data[currHeight].ownSupply[a];
-                                }
-                                ownReward += value * globalFunds[a].reward / globalFunds[a].supply;
-                            }
-                        }
-                        steps++;
-                    }
-                }
-            }
-        }
-        providers[addr].data[currHeight].lastPaidRate = uint8(rate);
-        providers[addr].data[currHeight].paidUpTo = a-1;
-        if ( providers[addr].data[currHeight].isForRent ) {
-            providerReward = reward * rentRate / 100;
-            adminReward = reward - providerReward;
-            if ( providers[addr].data[currHeight].priv ) { providerReward += ownReward; }
-        } else {
-            providerReward = reward + ownReward;
-        }
-    }
-    function checkFloatingSupply(address providerAddress, uint256 providerHeight, bool neg, uint256 value) internal {
-        /*
-            Inner function for updating the database when some token change has happened.
-            In this case we are checking if despite the changes the provider is still entitled to the token emission. In case the legitimacy changes then the global supply should be set as well.
-
-            @providerAddress        Provider address.
-            @providerHeight         Provider height.
-            @neg                    the change was negative or not
-            @value                  Rate of the change
-        */
-        uint256 LSID = providers[providerAddress].data[providerHeight].lastSupplyID;
-        if ( currentSchellingRound != LSID ) {
-            if ( neg ) {
-                setRightForInterest(
-                    providers[providerAddress].data[providerHeight].supply[LSID],
-                    providers[providerAddress].data[providerHeight].supply[LSID] - value,
-                    providers[providerAddress].data[providerHeight].priv
-                );
-                providers[providerAddress].data[providerHeight].supply[currentSchellingRound] = providers[providerAddress].data[providerHeight].supply[LSID] - value;
-            } else {
-                setRightForInterest(
-                    providers[providerAddress].data[providerHeight].supply[LSID],
-                    providers[providerAddress].data[providerHeight].supply[LSID] + value,
-                    providers[providerAddress].data[providerHeight].priv
-                );
-                providers[providerAddress].data[providerHeight].supply[currentSchellingRound] = providers[providerAddress].data[providerHeight].supply[LSID] + value;
-            }
-            providers[providerAddress].data[providerHeight].lastSupplyID = currentSchellingRound;
-        } else {
-            if ( neg ) {
-                setRightForInterest(
-                    getProviderCurrentSupply(providerAddress),
-                    getProviderCurrentSupply(providerAddress) - value,
-                    providers[providerAddress].data[providerHeight].priv
-                );
-                providers[providerAddress].data[providerHeight].supply[currentSchellingRound] -= value;
-            } else {
-                setRightForInterest(
-                    getProviderCurrentSupply(providerAddress),
-                    getProviderCurrentSupply(providerAddress) + value,
-                    providers[providerAddress].data[providerHeight].priv
-                );
-                providers[providerAddress].data[providerHeight].supply[currentSchellingRound] += value;
-            }
-        }
-    }
-    function checkFloatingOwnSupply(address providerAddress, uint256 providerHeight, bool neg, uint256 value) internal {
-        /*
-            Inner function for updating the database in case token change has happened.
-            In this case we check if the provider despite the changes is still entitled to the token emission.
-            We just call this only if the private provider and it’s own capital bears emission.
-
-            @providerAddress        Provider address.
-            @providerHeight         Provider height.
-            @neg                    Was the change negative?
-            @value                  Rate of the change.
-        */
-        uint256 LSID = providers[providerAddress].data[providerHeight].lastOwnSupplyID;
-        if ( currentSchellingRound != LSID ) {
-            if ( neg ) {
-                setRightForInterest(
-                    providers[providerAddress].data[providerHeight].ownSupply[LSID],
-                    providers[providerAddress].data[providerHeight].ownSupply[LSID] - value,
-                    true
-                );
-                providers[providerAddress].data[providerHeight].ownSupply[currentSchellingRound] = providers[providerAddress].data[providerHeight].ownSupply[LSID] - value;
-            } else {
-                setRightForInterest(
-                    providers[providerAddress].data[providerHeight].ownSupply[LSID],
-                    providers[providerAddress].data[providerHeight].ownSupply[LSID] + value,
-                    true
-                );
-                providers[providerAddress].data[providerHeight].ownSupply[currentSchellingRound] = providers[providerAddress].data[providerHeight].ownSupply[LSID] + value;
-            }
-            providers[providerAddress].data[providerHeight].lastOwnSupplyID = currentSchellingRound;
-        } else {
-            if ( neg ) {
-                setRightForInterest(
-                    getProviderCurrentSupply(providerAddress),
-                    getProviderCurrentSupply(providerAddress) - value,
-                    true
-                );
-                providers[providerAddress].data[providerHeight].ownSupply[currentSchellingRound] -= value;
-            } else {
-                setRightForInterest(
-                    getProviderCurrentSupply(providerAddress),
-                    getProviderCurrentSupply(providerAddress) + value,
-                    true
-                );
-                providers[providerAddress].data[providerHeight].ownSupply[currentSchellingRound] += value;
-            }
-        }
-    }
-    function TEMath(uint256 a, uint256 b, bool neg) internal returns (uint256) {
-        /*
-            Inner function for the changes of the numbers
-
-            @a      First number
-            @b      2nd number
-            @neg    Operation with numbers. If it is TRUE then subtraction, if it is FALSE then addition.
-        */
-        if ( neg ) { return a-b; }
-        else { return a+b; }
-    }
-    function transferEvent_(address addr, uint256 value, bool neg) internal {
-        /*
-            Inner function for perceiving the changes of the balance and updating the database.
-            If the address is a provider and the balance is decreasing than can not let it go under the minimum level.
-
-            @addr       The address where the change happened.
-            @value      Rate of the change.
-            @neg        ype of the change. If it is TRUE then the balance has been decreased if it is FALSE then it has been increased.
-        */
-        if ( clients[addr].providerAddress != address(0x00) ) {
-            checkFloatingSupply(clients[addr].providerAddress, providers[clients[addr].providerAddress].currentHeight, ! neg, value);
-            if (clients[addr].lastSupplyID != currentSchellingRound) {
-                clients[addr].supply[currentSchellingRound] = TEMath(clients[addr].supply[clients[addr].lastSupplyID], value, neg);
-                clients[addr].lastSupplyID = currentSchellingRound;
-            } else {
-                clients[addr].supply[currentSchellingRound] = TEMath(clients[addr].supply[currentSchellingRound], value, neg);
-            }
-        } else if ( providers[addr].data[providers[addr].currentHeight].valid ) {
-            uint256 currentHeight = providers[addr].currentHeight;
-            if ( neg ) {
-                uint256 balance = getTokenBalance(addr);
-                if ( providers[addr].data[currentHeight].priv ) {
-                    require( balance-value >= minFundsForPrivate );
-                } else {
-                    require( balance-value >= minFundsForPublic );
-                }
-            }
-            if ( providers[addr].data[currentHeight].priv ) {
-                checkFloatingOwnSupply(addr, currentHeight, ! neg, value);
-            }
-        }
-    }
-    function getTokenBalance(address addr) internal returns (uint256 balance) {
-        /*
-            Inner function in order to poll the token balance of the address.
-
-            @addr       Address
-
-            @balance    Balance of the address.
-        */
-        (bool _success, uint256 _balance) = moduleHandler(moduleHandlerAddress).balanceOf(addr);
-        require( _success );
-        return _balance;
-    }
-    function checkICO() internal returns (bool isICO) {
-        /*
-            Inner function to check the ICO status.
-
-            @isICO      Is the ICO in process or not?
-        */
-        (bool _success, bool _isICO) = moduleHandler(moduleHandlerAddress).isICO();
-        require( _success );
-        return _isICO;
-    }
-    event EProviderOpen(address addr, uint256 height);
-    event EClientLost(address indexed client, address indexed provider, uint256 height, uint256 indexed value);
-    event ENewClient(address indexed client, address indexed provider, uint256 height, uint256 indexed value);
-    event EProviderClose(address indexed addr, uint256 height);
-    event EProviderDetailsChanged(address indexed addr, uint256 height, string website, string country, string info, uint8 rate, address admin);
-    event EReward(address indexed client, address indexed provider, uint256 clientreward, uint256 providerReward);
-}
diff --git a/test/compilationTests/corion/publisher.sol b/test/compilationTests/corion/publisher.sol
deleted file mode 100644
index 311e8d92e725..000000000000
--- a/test/compilationTests/corion/publisher.sol
+++ /dev/null
@@ -1,278 +0,0 @@
-pragma solidity >=0.0;
-
-import "./announcementTypes.sol";
-import "./module.sol";
-import "./moduleHandler.sol";
-import "./safeMath.sol";
-
-contract publisher is announcementTypes, module, safeMath {
-    /*
-        module callbacks
-    */
-    function transferEvent(address payable from, address payable to, uint256 value) external override returns (bool success) {
-        /*
-            Transaction completed. This function is available only for moduleHandler
-            If a transaction is carried out from or to an address which participated in the objection of an announcement, its objection purport is automatically set
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        uint256 announcementID;
-		uint256 a;
-		// need reverse lookup
-        for ( a=0 ; a<opponents[from].length ; a++ ) {
-            announcementID = opponents[msg.sender][a];
-            if ( announcements[announcementID].end < block.number && announcements[announcementID].open ) {
-                announcements[announcementID].oppositionWeight = safeSub(announcements[a].oppositionWeight, value);
-            }
-        }
-        for ( a=0 ; a<opponents[to].length ; a++ ) {
-            announcementID = opponents[msg.sender][a];
-            if ( announcements[announcementID].end < block.number && announcements[announcementID].open ) {
-                announcements[announcementID].oppositionWeight = safeAdd(announcements[a].oppositionWeight, value);
-            }
-        }
-        return true;
-    }
-
-    /*
-        Pool
-    */
-
-    uint256 public  minAnnouncementDelay = 40320;
-    uint256 public minAnnouncementDelayOnICO = 17280;
-    uint8 public oppositeRate = 33;
-
-    struct announcements_s {
-        announcementType Type;
-        uint256 start;
-        uint256 end;
-        bool open;
-        string announcement;
-        string link;
-        bool oppositable;
-        uint256 oppositionWeight;
-        bool result;
-
-        string _str;
-        uint256 _uint;
-        address payable _addr;
-    }
-    mapping(uint256 => announcements_s) public announcements;
-    uint256 announcementsLength = 1;
-
-    mapping (address => uint256[]) public opponents;
-
-    constructor(address payable moduleHandler) {
-        /*
-            Installation function.  The installer will be registered in the admin list automatically
-
-            @moduleHandler      Address of moduleHandler
-        */
-        super.registerModuleHandler(moduleHandler);
-    }
-
-    function Announcements(uint256 id) public view returns (uint256 Type, uint256 Start, uint256 End, bool Closed, string memory Announcement, string memory Link, bool Opposited, string memory _str, uint256 _uint, address _addr) {
-        /*
-            Announcement data query
-
-            @id             Its identification
-
-            @Type           Subject of announcement
-            @Start          Height of announcement block
-            @End            Planned completion of announcement
-            @Closed         Closed or not
-            @Announcement   Announcement text
-            @Link           Link  perhaps to a Forum
-            @Opposited      Objected or not
-            @_str           Text value
-            @_uint          Number value
-            @_addr          Address value
-        */
-        Type = uint256(announcements[id].Type);
-        Start = announcements[id].start;
-        End = announcements[id].end;
-        Closed = ! announcements[id].open;
-        Announcement = announcements[id].announcement;
-        Link = announcements[id].link;
-        if ( checkOpposited(announcements[id].oppositionWeight, announcements[id].oppositable) ) {
-            Opposited = true;
-        }
-        _str = announcements[id]._str;
-        _uint = announcements[id]._uint;
-        _addr = announcements[id]._addr;
-    }
-
-    function checkOpposited(uint256 weight, bool oppositable) public view returns (bool success) {
-        /*
-            Veto check
-
-            @weight         Purport of objections so far
-            @oppositable    Opposable at all
-
-            @success        Opposed or not
-        */
-        if ( ! oppositable ) { return false; }
-        (bool _success, uint256 _amount) = moduleHandler(moduleHandlerAddress).totalSupply();
-        require( _success );
-        return _amount * oppositeRate / 100 > weight;
-    }
-
-    function newAnnouncement(announcementType Type, string calldata Announcement, string calldata Link, bool Oppositable, string calldata _str, uint256 _uint, address payable _addr) onlyOwner external {
-        /*
-            New announcement. Can be called  only by those in the admin list
-
-            @Type           Topic of announcement
-            @Start          height of announcement block
-            @End            planned completion of announcement
-            @Closed         Completed or not
-            @Announcement   Announcement text
-            @Link           link to a Forum
-            @Opposition     opposed or not
-            @_str           text box
-            @_uint          number box
-            @_addr          address box
-        */
-        announcementsLength++;
-        announcements[announcementsLength].Type = Type;
-        announcements[announcementsLength].start = block.number;
-        if ( checkICO() ) {
-            announcements[announcementsLength].end = block.number + minAnnouncementDelayOnICO;
-        } else {
-            announcements[announcementsLength].end = block.number + minAnnouncementDelay;
-        }
-        announcements[announcementsLength].open = true;
-        announcements[announcementsLength].announcement = Announcement;
-        announcements[announcementsLength].link = Link;
-        announcements[announcementsLength].oppositable = Oppositable;
-        announcements[announcementsLength].oppositionWeight = 0;
-        announcements[announcementsLength].result = false;
-        announcements[announcementsLength]._str = _str;
-        announcements[announcementsLength]._uint = _uint;
-        announcements[announcementsLength]._addr = _addr;
-        emit ENewAnnouncement(announcementsLength, Type);
-    }
-
-    function closeAnnouncement(uint256 id) onlyOwner external {
-        /*
-            Close announcement. It can be closed only by those in the admin list. Windup is allowed only after the announcement is completed.
-
-            @id     Announcement identification
-        */
-        require( announcements[id].open && announcements[id].end < block.number );
-        if ( ! checkOpposited(announcements[id].oppositionWeight, announcements[id].oppositable) ) {
-            announcements[id].result = true;
-            if ( announcements[id].Type == announcementType.newModule ) {
-                require( moduleHandler(moduleHandlerAddress).newModule(announcements[id]._str, announcements[id]._addr, true, true) );
-            } else if ( announcements[id].Type == announcementType.dropModule ) {
-                require( moduleHandler(moduleHandlerAddress).dropModule(announcements[id]._str, true) );
-            } else if ( announcements[id].Type == announcementType.replaceModule ) {
-                require( moduleHandler(moduleHandlerAddress).replaceModule(announcements[id]._str, announcements[id]._addr, true) );
-            } else if ( announcements[id].Type == announcementType.replaceModuleHandler) {
-                require( moduleHandler(moduleHandlerAddress).replaceModuleHandler(announcements[id]._addr) );
-            } else if ( announcements[id].Type == announcementType.transactionFeeRate ||
-                        announcements[id].Type == announcementType.transactionFeeMin ||
-                        announcements[id].Type == announcementType.transactionFeeMax ||
-                        announcements[id].Type == announcementType.transactionFeeBurn ) {
-                require( moduleHandler(moduleHandlerAddress).configureModule("token", announcements[id].Type, announcements[id]._uint) );
-            } else if ( announcements[id].Type == announcementType.providerPublicFunds ||
-                        announcements[id].Type == announcementType.providerPrivateFunds ||
-                        announcements[id].Type == announcementType.providerPrivateClientLimit ||
-                        announcements[id].Type == announcementType.providerPublicMinRate ||
-                        announcements[id].Type == announcementType.providerPublicMaxRate ||
-                        announcements[id].Type == announcementType.providerPrivateMinRate ||
-                        announcements[id].Type == announcementType.providerPrivateMaxRate ||
-                        announcements[id].Type == announcementType.providerGasProtect ||
-                        announcements[id].Type == announcementType.providerInterestMinFunds ||
-                        announcements[id].Type == announcementType.providerRentRate ) {
-                require( moduleHandler(moduleHandlerAddress).configureModule("provider", announcements[id].Type, announcements[id]._uint) );
-            } else if ( announcements[id].Type == announcementType.schellingRoundBlockDelay ||
-                        announcements[id].Type == announcementType.schellingCheckRounds ||
-                        announcements[id].Type == announcementType.schellingCheckAboves ||
-                        announcements[id].Type == announcementType.schellingRate ) {
-                require( moduleHandler(moduleHandlerAddress).configureModule("schelling", announcements[id].Type, announcements[id]._uint) );
-            } else if ( announcements[id].Type == announcementType.publisherMinAnnouncementDelay) {
-                minAnnouncementDelay = announcements[id]._uint;
-            } else if ( announcements[id].Type == announcementType.publisherOppositeRate) {
-                oppositeRate = uint8(announcements[id]._uint);
-            }
-        }
-        announcements[id].end = block.number;
-        announcements[id].open = false;
-    }
-
-    function oppositeAnnouncement(uint256 id) external {
-        /*
-            Opposition of announcement
-            If announcement is opposable, anyone owning a token can oppose it
-            Opposition is automatically with the total amount of tokens
-            If the quantity of his tokens changes, the purport of his opposition changes automatically
-            The prime time is the windup  of the announcement, because this is the moment when the number of tokens in opposition are counted.
-            One address is entitled to be in oppositon only once. An opposition cannot be withdrawn.
-            Running announcements can be opposed only.
-
-            @id     Announcement identification
-        */
-        uint256 newArrayID = 0;
-        bool foundEmptyArrayID = false;
-        require( announcements[id].open );
-        require( announcements[id].oppositable );
-        for ( uint256 a=0 ; a<opponents[msg.sender].length ; a++ ) {
-            require( opponents[msg.sender][a] != id );
-            if ( ! announcements[opponents[msg.sender][a]].open) {
-                delete opponents[msg.sender][a];
-                if ( ! foundEmptyArrayID ) {
-                    foundEmptyArrayID = true;
-                    newArrayID = a;
-                }
-            }
-            if ( ! foundEmptyArrayID ) {
-                foundEmptyArrayID = true;
-                newArrayID = a;
-            }
-        }
-        (bool _success, uint256 _balance) = moduleHandler(moduleHandlerAddress).balanceOf(msg.sender);
-        require( _success );
-        require( _balance > 0);
-        if ( foundEmptyArrayID ) {
-            opponents[msg.sender][newArrayID] = id;
-        } else {
-            opponents[msg.sender].push(id);
-        }
-        announcements[id].oppositionWeight += _balance;
-        emit EOppositeAnnouncement(id, msg.sender, _balance);
-    }
-
-    function invalidateAnnouncement(uint256 id) onlyOwner external {
-        /*
-            Withdraw announcement. Only those in the admin list can withdraw it.
-
-            @id     Announcement identification
-        */
-        require( announcements[id].open );
-        announcements[id].end = block.number;
-        announcements[id].open = false;
-        emit EInvalidateAnnouncement(id);
-    }
-
-    modifier onlyOwner() {
-        /*
-            Only the owner  is allowed to call it.
-        */
-        require( moduleHandler(moduleHandlerAddress).owners(msg.sender) );
-        _;
-    }
-
-    function checkICO() internal returns (bool isICO) {
-        /*
-            Inner function to check the ICO status.
-            @bool       Is the ICO in process or not?
-        */
-        (bool _success, bool _isICO) = moduleHandler(moduleHandlerAddress).isICO();
-        require( _success );
-        return _isICO;
-    }
-
-    event ENewAnnouncement(uint256 id, announcementType typ);
-    event EOppositeAnnouncement(uint256 id, address addr, uint256 value);
-    event EInvalidateAnnouncement(uint256 id);
-    event ECloseAnnouncement(uint256 id);
-}
diff --git a/test/compilationTests/corion/safeMath.sol b/test/compilationTests/corion/safeMath.sol
deleted file mode 100644
index 3e7e5578939e..000000000000
--- a/test/compilationTests/corion/safeMath.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma solidity >=0.0;
-
-contract safeMath {
-    function safeAdd(uint256 a, uint256 b) internal returns(uint256) {
-        /*
-            Biztonsagos hozzadas. Tulcsordulas elleni vedelem.
-            A vegeredmeny nem lehet kevesebb mint az @a, ha igen megall a kod.
-
-            @a          Amihez hozzaadni kell
-            @b          Amennyit hozzaadni kell.
-            @uint256    Vegeredmeny.
-        */
-        if ( b > 0 ) {
-            assert( a + b > a );
-        }
-        return a + b;
-    }
-
-    function safeSub(uint256 a, uint256 b) internal returns(uint256) {
-        /*
-            Biztonsagos kivonas. Tulcsordulas elleni vedelem.
-            A vegeredmeny nem lehet tobb mint az @a, ha igen megall a kod.
-
-            @a          Amibol kivonni kell.
-            @b          Amennyit kivonni kell.
-            @uint256    Vegeredmeny.
-        */
-        if ( b > 0 ) {
-            assert( a - b < a );
-        }
-        return a - b;
-    }
-}
\ No newline at end of file
diff --git a/test/compilationTests/corion/schelling.sol b/test/compilationTests/corion/schelling.sol
deleted file mode 100644
index 2503748b8b5c..000000000000
--- a/test/compilationTests/corion/schelling.sol
+++ /dev/null
@@ -1,579 +0,0 @@
-pragma solidity >=0.0;
-
-import "./announcementTypes.sol";
-import "./module.sol";
-import "./moduleHandler.sol";
-import "./safeMath.sol";
-
-contract schellingVars {
-    /*
-        Common enumerations and structures of the Schelling and Database contract.
-    */
-    enum voterStatus {
-        base,
-        afterPrepareVote,
-        afterSendVoteOk,
-        afterSendVoteBad
-    }
-    struct _rounds {
-        uint256 totalAboveWeight;
-        uint256 totalBelowWeight;
-        uint256 reward;
-        uint256 blockHeight;
-        bool voted;
-    }
-    struct _voter {
-        uint256 roundID;
-        bytes32 hash;
-        voterStatus status;
-        bool voteResult;
-        uint256 rewards;
-    }
-}
-
-contract schellingDB is safeMath, schellingVars {
-    /*
-        Schelling database contract.
-    */
-    address private owner;
-    function replaceOwner(address newOwner) external returns(bool) {
-        require( owner == address(0x00) || msg.sender == owner );
-        owner = newOwner;
-        return true;
-    }
-    modifier isOwner { require( msg.sender == owner ); _; }
-    /*
-        Constructor
-    */
-    constructor() {
-        rounds.push();
-        rounds.push();
-        rounds[0].blockHeight = block.number;
-        currentSchellingRound = 1;
-    }
-    /*
-        Funds
-    */
-    mapping(address => uint256) private funds;
-    function getFunds(address _owner) public view returns(bool, uint256) {
-        return (true, funds[_owner]);
-    }
-    function setFunds(address _owner, uint256 _amount) isOwner external returns(bool) {
-        funds[_owner] = _amount;
-        return true;
-    }
-    /*
-        Rounds
-    */
-    _rounds[] private rounds;
-    function getRound(uint256 _id) public view returns(bool, uint256, uint256, uint256, uint256, bool) {
-        if ( rounds.length <= _id ) { return (false, 0, 0, 0, 0, false); }
-        else { return (true, rounds[_id].totalAboveWeight, rounds[_id].totalBelowWeight, rounds[_id].reward, rounds[_id].blockHeight, rounds[_id].voted); }
-    }
-    function pushRound(uint256 _totalAboveWeight, uint256 _totalBelowWeight, uint256 _reward, uint256 _blockHeight, bool _voted) isOwner external returns(bool, uint256) {
-        rounds.push(_rounds(_totalAboveWeight, _totalBelowWeight, _reward, _blockHeight, _voted));
-        return (true, rounds.length);
-    }
-    function setRound(uint256 _id, uint256 _totalAboveWeight, uint256 _totalBelowWeight, uint256 _reward, uint256 _blockHeight, bool _voted) isOwner external returns(bool) {
-        rounds[_id] = _rounds(_totalAboveWeight, _totalBelowWeight, _reward, _blockHeight, _voted);
-        return true;
-    }
-    function getCurrentRound() public view returns(bool, uint256) {
-        return (true, rounds.length-1);
-    }
-    /*
-        Voter
-    */
-    mapping(address => _voter) private voter;
-    function getVoter(address _owner) public view returns(bool success, uint256 roundID,
-        bytes32 hash, voterStatus status, bool voteResult, uint256 rewards) {
-        roundID         = voter[_owner].roundID;
-        hash            = voter[_owner].hash;
-        status          = voter[_owner].status;
-        voteResult      = voter[_owner].voteResult;
-        rewards         = voter[_owner].rewards;
-        success         = true;
-    }
-    function setVoter(address _owner, uint256 _roundID, bytes32 _hash, voterStatus _status, bool _voteResult, uint256 _rewards) isOwner external returns(bool) {
-        voter[_owner] = _voter(
-            _roundID,
-            _hash,
-            _status,
-            _voteResult,
-            _rewards
-            );
-        return true;
-    }
-    /*
-        Schelling Token emission
-    */
-    mapping(uint256 => uint256) private schellingExpansion;
-    function getSchellingExpansion(uint256 _id) public view returns(bool, uint256) {
-        return (true, schellingExpansion[_id]);
-    }
-    function setSchellingExpansion(uint256 _id, uint256 _expansion) isOwner external returns(bool) {
-        schellingExpansion[_id] = _expansion;
-        return true;
-    }
-    /*
-        Current Schelling Round
-    */
-    uint256 private currentSchellingRound;
-    function setCurrentSchellingRound(uint256 _id) isOwner external returns(bool) {
-        currentSchellingRound = _id;
-        return true;
-    }
-    function getCurrentSchellingRound() public view returns(bool, uint256) {
-        return (true, currentSchellingRound);
-    }
-}
-
-contract schelling is module, announcementTypes, schellingVars {
-    /*
-        Schelling contract
-    */
-    /*
-        module callbacks
-    */
-    function replaceModule(address payable addr) external override returns (bool) {
-        require( super.isModuleHandler(payable(msg.sender)) );
-        require( db.replaceOwner(addr) );
-        super._replaceModule(addr);
-        return true;
-    }
-    function transferEvent(address payable from, address payable to, uint256 value) external override returns (bool) {
-        /*
-            Transaction completed. This function can be called only by the ModuleHandler.
-            If this contract is the receiver, the amount will be added to the prize pool of the current round.
-
-            @from      From who
-            @to        To who
-            @value     Amount
-            @bool      Was the transaction successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        if ( to == address(this) ) {
-            uint256 currentRound = getCurrentRound();
-            schellingVars._rounds memory round = getRound(currentRound);
-            round.reward += value;
-            setRound(currentRound, round);
-        }
-        return true;
-    }
-    modifier isReady {
-        (bool _success, bool _active) = super.isActive();
-        require( _success && _active );
-        _;
-    }
-    /*
-        Schelling database functions.
-    */
-    function getFunds(address addr) internal returns (uint256) {
-        (bool a, uint256 b) = db.getFunds(addr);
-        require( a );
-        return b;
-    }
-    function setFunds(address addr, uint256 amount) internal {
-        require( db.setFunds(addr, amount) );
-    }
-    function setVoter(address owner, _voter memory voter) internal {
-        require( db.setVoter(owner,
-            voter.roundID,
-            voter.hash,
-            voter.status,
-            voter.voteResult,
-            voter.rewards
-            ) );
-    }
-    function getVoter(address addr) internal view returns (_voter memory) {
-        (bool a, uint256 b, bytes32 c, schellingVars.voterStatus d, bool e, uint256 f) = db.getVoter(addr);
-        require( a );
-        return _voter(b, c, d, e, f);
-    }
-    function setRound(uint256 id, _rounds memory round) internal {
-        require( db.setRound(id,
-            round.totalAboveWeight,
-            round.totalBelowWeight,
-            round.reward,
-            round.blockHeight,
-            round.voted
-            ) );
-    }
-    function pushRound(_rounds memory round) internal returns (uint256) {
-        (bool a, uint256 b) = db.pushRound(
-            round.totalAboveWeight,
-            round.totalBelowWeight,
-            round.reward,
-            round.blockHeight,
-            round.voted
-            );
-        require( a );
-        return b;
-    }
-    function getRound(uint256 id) internal returns (_rounds memory) {
-        (bool a, uint256 b, uint256 c, uint256 d, uint256 e, bool f) = db.getRound(id);
-        require( a );
-        return _rounds(b, c, d, e, f);
-    }
-    function getCurrentRound() internal returns (uint256) {
-        (bool a, uint256 b) = db.getCurrentRound();
-        require( a );
-        return b;
-    }
-    function setCurrentSchellingRound(uint256 id) internal {
-        require( db.setCurrentSchellingRound(id) );
-    }
-    function getCurrentSchellingRound() internal view returns(uint256) {
-        (bool a, uint256 b) = db.getCurrentSchellingRound();
-        require( a );
-        return b;
-    }
-    function setSchellingExpansion(uint256 id, uint256 amount) internal {
-        require( db.setSchellingExpansion(id, amount) );
-    }
-    function getSchellingExpansion(uint256 id) internal view returns(uint256) {
-        (bool a, uint256 b) = db.getSchellingExpansion(id);
-        require( a );
-        return b;
-    }
-    /*
-        Schelling module
-    */
-    uint256 private roundBlockDelay     = 720;
-    uint8 private interestCheckRounds   = 7;
-    uint8 private interestCheckAboves   = 4;
-    uint256 private interestRate        = 300;
-    uint256 private interestRateM       = 1e3;
-
-    bytes1 public aboveChar = 0x31;
-    bytes1 public belowChar = 0x30;
-    schellingDB private db;
-
-    constructor(address payable _moduleHandler, address _db, bool _forReplace) {
-        /*
-            Installation function.
-
-            @_moduleHandler         Address of ModuleHandler.
-            @_db                    Address of the database.
-            @_forReplace            This address will be replaced with the old one or not.
-            @_icoExpansionAddress   This address can turn schelling runds during ICO.
-        */
-        db = schellingDB(_db);
-        super.registerModuleHandler(_moduleHandler);
-        if ( ! _forReplace ) {
-            require( db.replaceOwner(address(this)) );
-        }
-    }
-    function configure(announcementType a, uint256 b) external returns(bool) {
-        /*
-            Can be called only by the ModuleHandler.
-
-            @a      Sort of configuration
-            @b      Value
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        if      ( a == announcementType.schellingRoundBlockDelay )     { roundBlockDelay = b; }
-        else if ( a == announcementType.schellingCheckRounds )         { interestCheckRounds = uint8(b); }
-        else if ( a == announcementType.schellingCheckAboves )         { interestCheckAboves = uint8(b); }
-        else if ( a == announcementType.schellingRate )                { interestRate = b; }
-        else { return false; }
-        return true;
-    }
-    function prepareVote(bytes32 votehash, uint256 roundID) isReady noContract external {
-        /*
-            Initializing manual vote.
-            Only the hash of vote will be sent. (Envelope sending).
-            The address must be in default state, that is there are no vote in progress.
-            Votes can be sent only on the actually Schelling round.
-
-            @votehash               Hash of the vote
-            @roundID                Number of Schelling round
-        */
-        nextRound();
-
-        uint256 currentRound = getCurrentRound();
-        schellingVars._rounds memory round = getRound(currentRound);
-        _voter memory voter;
-        uint256 funds;
-
-        require( roundID == currentRound );
-
-        voter = getVoter(msg.sender);
-        funds = getFunds(msg.sender);
-
-        require( funds > 0 );
-        require( voter.status == voterStatus.base );
-        voter.roundID = currentRound;
-        voter.hash = votehash;
-        voter.status = voterStatus.afterPrepareVote;
-
-        setVoter(msg.sender, voter);
-        round.voted = true;
-
-        setRound(currentRound, round);
-    }
-    function sendVote(string calldata vote) isReady noContract external {
-        /*
-            Check vote (Envelope opening)
-            Only the sent “envelopes� can be opened.
-            Envelope opening only in the next Schelling round.
-            If the vote invalid, the deposit will be lost.
-            If the “envelope� was opened later than 1,5 Schelling round, the vote is automatically invalid, and deposit can be lost.
-            Lost deposits will be 100% burned.
-
-            @vote      Hash of the content of the vote.
-        */
-        nextRound();
-
-        uint256 currentRound = getCurrentRound();
-        _rounds memory round;
-        _voter memory voter;
-        uint256 funds;
-
-        bool lostEverything;
-        voter = getVoter(msg.sender);
-        round = getRound(voter.roundID);
-        funds = getFunds(msg.sender);
-
-        require( voter.status == voterStatus.afterPrepareVote );
-        require( voter.roundID < currentRound );
-        if ( keccak256(bytes(vote)) == voter.hash ) {
-            delete voter.hash;
-            if (round.blockHeight+roundBlockDelay/2 >= block.number) {
-                if ( bytes(vote)[0] == aboveChar ) {
-                    voter.status = voterStatus.afterSendVoteOk;
-                    round.totalAboveWeight += funds;
-                    voter.voteResult = true;
-                } else if ( bytes(vote)[0] == belowChar ) {
-                    voter.status = voterStatus.afterSendVoteOk;
-                    round.totalBelowWeight += funds;
-                } else { lostEverything = true; }
-            } else {
-                voter.status = voterStatus.afterSendVoteBad;
-            }
-        } else { lostEverything = true; }
-        if ( lostEverything ) {
-            require( moduleHandler(moduleHandlerAddress).burn(address(this), funds) );
-            delete funds;
-            delete voter.status;
-        }
-
-        setVoter(msg.sender, voter);
-        setRound(voter.roundID, round);
-        setFunds(msg.sender, funds);
-    }
-    function checkVote() isReady noContract external {
-        /*
-            Checking votes.
-            Vote checking only after the envelope opening Schelling round.
-            Deposit will be lost, if the vote wrong, or invalid.
-            The right votes take share of deposits.
-        */
-        nextRound();
-
-        uint256 currentRound = getCurrentRound();
-        _rounds memory round;
-        _voter memory voter;
-        uint256 funds;
-
-        voter = getVoter(msg.sender);
-        round = getRound(voter.roundID);
-        funds = getFunds(msg.sender);
-
-        require( voter.status == voterStatus.afterSendVoteOk ||
-            voter.status == voterStatus.afterSendVoteBad );
-        if ( round.blockHeight+roundBlockDelay/2 <= block.number ) {
-            if ( isWinner(round, voter.voteResult) && voter.status == voterStatus.afterSendVoteOk ) {
-                voter.rewards += funds * round.reward / getRoundWeight(round.totalAboveWeight, round.totalBelowWeight);
-            } else {
-                require( moduleHandler(moduleHandlerAddress).burn(address(this), funds) );
-                delete funds;
-            }
-            delete voter.status;
-            delete voter.roundID;
-        } else { revert(); }
-
-        setVoter(msg.sender, voter);
-        setFunds(msg.sender, funds);
-    }
-    function getRewards(address beneficiary) isReady noContract external {
-        /*
-            Redeem of prize.
-            The prizes will be collected here, and with this function can be transferred to the account of the user.
-            Optionally there can be an address of a beneficiary added, which address the prize will be sent to. Without beneficiary, the owner is the default address.
-            Prize will be sent from the Schelling address without any transaction fee.
-
-            @beneficiary        Address of the beneficiary
-        */
-        schellingVars._voter memory voter = getVoter(msg.sender);
-        uint256 funds = getFunds(msg.sender);
-
-        address _beneficiary = msg.sender;
-        if (beneficiary != address(0x00)) { _beneficiary = beneficiary; }
-        uint256 reward;
-        require( voter.rewards > 0 );
-        require( voter.status == voterStatus.base );
-        reward = voter.rewards;
-        delete voter.rewards;
-        require( moduleHandler(moduleHandlerAddress).transfer(address(this), _beneficiary, reward, false) );
-
-        setVoter(msg.sender, voter);
-    }
-    function checkReward() public view returns (uint256 reward) {
-        /*
-            Withdraw of the amount of the prize (it’s only information).
-
-            @reward         Prize
-        */
-        schellingVars._voter memory voter = getVoter(msg.sender);
-        return voter.rewards;
-    }
-    function nextRound() internal returns (bool) {
-        /*
-            Inside function, checks the time of the Schelling round and if its needed, creates a new Schelling round.
-        */
-        uint256 currentRound = getCurrentRound();
-        _rounds memory round = getRound(currentRound);
-        _rounds memory newRound;
-        _rounds memory prevRound;
-        uint256 currentSchellingRound = getCurrentSchellingRound();
-
-        if ( round.blockHeight+roundBlockDelay > block.number) { return false; }
-
-        newRound.blockHeight = block.number;
-        if ( ! round.voted ) {
-            newRound.reward = round.reward;
-        }
-        uint256 above;
-        for ( uint256 a=currentRound ; a>=currentRound-interestCheckRounds ; a-- ) {
-            if (a == 0) { break; }
-            prevRound = getRound(a);
-            if ( prevRound.totalAboveWeight > prevRound.totalBelowWeight ) { above++; }
-        }
-        uint256 expansion;
-        if ( above >= interestCheckAboves ) {
-            expansion = getTotalSupply() * interestRate / interestRateM / 100;
-        }
-
-        currentSchellingRound++;
-
-        pushRound(newRound);
-        setSchellingExpansion(currentSchellingRound, expansion);
-        require( moduleHandler(moduleHandlerAddress).broadcastSchellingRound(currentSchellingRound, expansion) );
-        return true;
-    }
-    function addFunds(uint256 amount) isReady noContract external {
-        /*
-            Deposit taking.
-            Every participant entry with his own deposit.
-            In case of wrong vote only this amount of deposit will be burn.
-            The deposit will be sent to the address of Schelling, charged with transaction fee.
-
-            @amount          Amount of deposit.
-        */
-        _voter memory voter = getVoter(msg.sender);
-        uint256 funds = getFunds(msg.sender);
-
-        (bool a, bool b) = moduleHandler(moduleHandlerAddress).isICO();
-        require( b && b );
-        require( voter.status == voterStatus.base );
-        require( amount > 0 );
-        require( moduleHandler(moduleHandlerAddress).transfer(msg.sender, address(this), amount, true) );
-        funds += amount;
-
-        setFunds(msg.sender, funds);
-    }
-    function getFunds() isReady noContract external {
-        /*
-            Deposit withdrawn.
-            If the deposit isn’t lost, it can be withdrawn.
-            By withdrawn, the deposit will be sent from Schelling address to the users address, charged with transaction fee..
-        */
-        _voter memory voter = getVoter(msg.sender);
-        uint256 funds = getFunds(msg.sender);
-
-        require( funds > 0 );
-        require( voter.status == voterStatus.base );
-        setFunds(msg.sender, 0);
-
-        require( moduleHandler(moduleHandlerAddress).transfer(address(this), msg.sender, funds, true) );
-    }
-    function getCurrentSchellingRoundID() public view returns (uint256) {
-        /*
-            Number of actual Schelling round.
-
-            @uint256        Schelling round.
-        */
-        return getCurrentSchellingRound();
-    }
-    function getSchellingRound(uint256 id) public view returns (uint256 expansion) {
-        /*
-            Amount of token emission of the Schelling round.
-
-            @id             Number of Schelling round
-            @expansion      Amount of token emission
-        */
-        return getSchellingExpansion(id);
-    }
-    function getRoundWeight(uint256 aboveW, uint256 belowW) internal returns (uint256) {
-        /*
-            Inside function for calculating the weights of the votes.
-
-            @aboveW     Weight of votes: ABOVE
-            @belowW     Weight of votes: BELOW
-            @uint256    Calculatet weight
-        */
-        if ( aboveW == belowW ) {
-            return aboveW + belowW;
-        } else if ( aboveW > belowW ) {
-            return aboveW;
-        } else if ( aboveW < belowW) {
-            return belowW;
-        }
-    }
-    function isWinner(_rounds memory round, bool aboveVote) internal returns (bool) {
-        /*
-            Inside function for calculating the result of the game.
-
-            @round      Structure of Schelling round.
-            @aboveVote  Is the vote = ABOVE or not
-            @bool       Result
-        */
-        if ( round.totalAboveWeight == round.totalBelowWeight ||
-            ( round.totalAboveWeight > round.totalBelowWeight && aboveVote ) ) {
-            return true;
-        }
-        return false;
-    }
-
-    function getTotalSupply() internal returns (uint256 amount) {
-        /*
-            Inside function for querying the whole amount of the tokens.
-
-            @uint256        Whole token amount
-        */
-        (bool _success, uint256 _amount) = moduleHandler(moduleHandlerAddress).totalSupply();
-        require( _success );
-        return _amount;
-    }
-
-    function getTokenBalance(address addr) internal returns (uint256 balance) {
-        /*
-            Inner function in order to poll the token balance of the address.
-
-            @addr       Address
-
-            @balance    Balance of the address.
-        */
-        (bool _success, uint256 _balance) = moduleHandler(moduleHandlerAddress).balanceOf(addr);
-        require( _success );
-        return _balance;
-    }
-
-    modifier noContract {
-        /*
-            Contract can’t call this function, only a natural address.
-        */
-        require( msg.sender == tx.origin ); _;
-    }
-}
diff --git a/test/compilationTests/corion/token.sol b/test/compilationTests/corion/token.sol
deleted file mode 100644
index 58c3e8cb4033..000000000000
--- a/test/compilationTests/corion/token.sol
+++ /dev/null
@@ -1,519 +0,0 @@
-pragma solidity >=0.0;
-
-import "./announcementTypes.sol";
-import "./safeMath.sol";
-import "./module.sol";
-import "./moduleHandler.sol";
-import "./tokenDB.sol";
-
-contract thirdPartyContractAbstract {
-    function receiveCorionToken(address, uint256, bytes calldata) external returns (bool, uint256) {}
-    function approvedCorionToken(address, uint256, bytes calldata) external returns (bool) {}
-}
-
-/**
- *
- * @title Corion Platform Token
- * @author iFA @ Corion Platform
- *
- */
-contract token is safeMath, module, announcementTypes {
-    /*
-        module callbacks
-    */
-    function replaceModule(address payable addr) external override returns (bool success) {
-        require( super.isModuleHandler(payable(msg.sender)) );
-        require( db.replaceOwner(addr) );
-        super._replaceModule(addr);
-        return true;
-    }
-    modifier isReady {
-        (bool _success, bool _active) = super.isActive();
-        require( _success && _active );
-        _;
-    }
-
-    string public name = "Corion";
-    string public symbol = "COR";
-    uint8 public decimals = 6;
-
-    tokenDB public db;
-    address payable public icoAddr;
-    uint256 public transactionFeeRate      = 20;
-    uint256 public transactionFeeRateM     = 1e3;
-    uint256 public transactionFeeMin       =   20000;
-    uint256 public transactionFeeMax       = 5000000;
-    uint256 public transactionFeeBurn      = 80;
-    address payable public exchangeAddress;
-    bool    public isICO                   = true;
-
-    mapping(address => bool) public genesis;
-
-    constructor(bool forReplace, address payable moduleHandler, address dbAddr, address payable icoContractAddr, address payable exchangeContractAddress, address payable[] memory genesisAddr, uint256[] memory genesisValue) payable {
-        /*
-            Installation function
-
-            When _icoAddr is defined, 0.2 ether has to be attached  as many times  as many genesis addresses are given
-
-            @forReplace                 This address will be replaced with the old one or not.
-            @moduleHandler              Modulhandler's address
-            @dbAddr                     Address of database
-            @icoContractAddr            Address of ICO contract
-            @exchangeContractAddress    Address of Market in order to buy gas during ICO
-            @genesisAddr                Array of Genesis addresses
-            @genesisValue               Array of balance of genesis addresses
-        */
-        super.registerModuleHandler(moduleHandler);
-        require( dbAddr != address(0x00) );
-        require( icoContractAddr != address(0x00) );
-        require( exchangeContractAddress != address(0x00) );
-        db = tokenDB(dbAddr);
-        icoAddr = icoContractAddr;
-        exchangeAddress = exchangeContractAddress;
-        isICO = ! forReplace;
-        if ( ! forReplace ) {
-            require( db.replaceOwner(address(this)) );
-            assert( genesisAddr.length == genesisValue.length );
-            require( address(this).balance >= genesisAddr.length * 0.2 ether );
-            for ( uint256 a=0 ; a<genesisAddr.length ; a++ ) {
-                genesis[genesisAddr[a]] = true;
-                require( db.increase(genesisAddr[a], genesisValue[a]) );
-                if ( ! genesisAddr[a].send(0.2 ether) ) {}
-                emit Mint(genesisAddr[a], genesisValue[a]);
-            }
-        }
-    }
-
-    function closeIco() external returns (bool success) {
-        /*
-            ICO finished. It can be called only by ICO contract
-
-            @success    Was the Function successful?
-        */
-        require( msg.sender == icoAddr );
-        isICO = false;
-        return true;
-    }
-
-    /**
-     * @notice `msg.sender` approves `spender` to spend `amount` tokens on its behalf.
-     * @param spender The address of the account able to transfer the tokens
-     * @param amount The amount of tokens to be approved for transfer
-     * @param nonce The transaction count of the authorised address
-     * @return success True if the approval was successful
-     */
-    function approve(address spender, uint256 amount, uint256 nonce) isReady external returns (bool success) {
-        /*
-            Authorise another address to use a certain quantity of the authorising owner’s balance
-
-            @spender            Address of authorised party
-            @amount             Token quantity
-            @nonce              Transaction count
-
-            @success            Was the Function successful?
-        */
-        _approve(spender, amount, nonce);
-        return true;
-    }
-
-    /**
-     * @notice `msg.sender` approves `spender` to spend `amount` tokens on its behalf and notify the spender from your approve with your `extraData` data.
-     * @param spender The address of the account able to transfer the tokens
-     * @param amount The amount of tokens to be approved for transfer
-     * @param nonce The transaction count of the authorised address
-     * @param extraData Data to give forward to the receiver
-     * @return success True if the approval was successful
-     */
-    function approveAndCall(address spender, uint256 amount, uint256 nonce, bytes calldata extraData) isReady external returns (bool success) {
-        /*
-            Authorise another address to use a certain quantity of the authorising  owner’s balance
-            Following the transaction the receiver address `approvedCorionToken` function is called by the given data
-
-            @spender            Authorized address
-            @amount             Token quantity
-            @extraData          Extra data to be received by the receiver
-            @nonce              Transaction count
-
-            @success            Was the Function successful?
-        */
-        _approve(spender, amount, nonce);
-        require( thirdPartyContractAbstract(spender).approvedCorionToken(msg.sender, amount, extraData) );
-        return true;
-    }
-
-    function _approve(address spender, uint256 amount, uint256 nonce) internal {
-        /*
-            Internal Function to authorise another address to use a certain quantity of the authorising owner’s balance.
-            If the transaction count not match the authorise fails.
-
-            @spender           Address of authorised party
-            @amount            Token quantity
-            @nonce             Transaction count
-        */
-        require( msg.sender != spender );
-        require( db.balanceOf(msg.sender) >= amount );
-        require( db.setAllowance(msg.sender, spender, amount, nonce) );
-        emit Approval(msg.sender, spender, amount);
-    }
-
-    function allowance(address owner, address spender) public view returns (uint256 remaining, uint256 nonce) {
-        /*
-            Get the quantity of tokens given to be used
-
-            @owner         Authorising address
-            @spender       Authorised address
-
-            @remaining     Tokens to be spent
-            @nonce         Transaction count
-        */
-        (bool _success, uint256 _remaining, uint256 _nonce) = db.getAllowance(owner, spender);
-        require( _success );
-        return (_remaining, _nonce);
-    }
-
-    /**
-     * @notice Send `amount` Corion tokens to `to` from `msg.sender`
-     * @param to The address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @return success Whether the transfer was successful or not
-     */
-    function transfer(address to, uint256 amount) isReady external returns (bool success) {
-        /*
-            Start transaction, token is sent from caller’s address to receiver’s address
-            Transaction fee is to be deducted.
-            If receiver is not a natural address but a person, he will be called
-
-            @to         To who
-            @amount     Quantity
-
-            @success    Was the Function successful?
-        */
-        bytes memory _data;
-        if ( isContract(to) ) {
-            _transferToContract(msg.sender, to, amount, _data);
-        } else {
-            _transfer( msg.sender, to, amount, true);
-        }
-        emit Transfer(msg.sender, to, amount, _data);
-        return true;
-    }
-
-    /**
-     * @notice Send `amount` tokens to `to` from `from` on the condition it is approved by `from`
-     * @param from The address holding the tokens being transferred
-     * @param to The address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @return success True if the transfer was successful
-     */
-    function transferFrom(address from, address to, uint256 amount) isReady external returns (bool success) {
-        /*
-            Start transaction to send a quantity from a given address to another address. (approve / allowance). This can be called only by the address approved in advance
-            Transaction fee is to be deducted
-            If receiver is not a natural address but a person, he will be called
-
-            @from       From who.
-            @to         To who
-            @amount     Quantity
-
-            @success    Was the Function successful?
-        */
-        if ( from != msg.sender ) {
-            (bool _success, uint256 _reamining, uint256 _nonce) = db.getAllowance(from, msg.sender);
-            require( _success );
-            _reamining = safeSub(_reamining, amount);
-            _nonce = safeAdd(_nonce, 1);
-            require( db.setAllowance(from, msg.sender, _reamining, _nonce) );
-            emit AllowanceUsed(msg.sender, from, amount);
-        }
-        bytes memory _data;
-        if ( isContract(to) ) {
-            _transferToContract(from, to, amount, _data);
-        } else {
-            _transfer( from, to, amount, true);
-        }
-        emit Transfer(from, to, amount, _data);
-        return true;
-    }
-
-    /**
-     * @notice Send `amount` tokens to `to` from `from` on the condition it is approved by `from`
-     * @param from The address holding the tokens being transferred
-     * @param to The address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @return success True if the transfer was successful
-     */
-    function transferFromByModule(address from, address to, uint256 amount, bool fee) isReady external returns (bool success) {
-        /*
-            Start transaction to send a quantity from a given address to another address
-            Only ModuleHandler can call it
-
-            @from       From who
-            @to         To who.
-            @amount     Quantity
-            @fee        Deduct transaction fee - yes or no?
-
-            @success    Was the Function successful?
-        */
-        bytes memory _data;
-        require( super.isModuleHandler(payable(msg.sender)) );
-        _transfer( from, to, amount, fee);
-        emit Transfer(from, to, amount, _data);
-        return true;
-    }
-
-    /**
-     * @notice Send `amount` Corion tokens to `to` from `msg.sender` and notify the receiver from your transaction with your `extraData` data
-     * @param to The contract address of the recipient
-     * @param amount The amount of tokens to be transferred
-     * @param extraData Data to give forward to the receiver
-     * @return success Whether the transfer was successful or not
-     */
-    function transfer(address to, uint256 amount, bytes calldata extraData) isReady external returns (bool success) {
-        /*
-            Start transaction to send a quantity from a given address to another address
-            After transaction the function `receiveCorionToken`of the receiver is called  by the given data
-            When sending an amount, it is possible the total amount cannot be processed, the remaining amount is sent back with no fee charged
-
-            @to             To who.
-            @amount         Quantity
-            @extraData      Extra data the receiver will get
-
-            @success        Was the Function successful?
-        */
-        if ( isContract(to) ) {
-            _transferToContract(msg.sender, to, amount, extraData);
-        } else {
-            _transfer( msg.sender, to, amount, true);
-        }
-        emit Transfer(msg.sender, to, amount, extraData);
-        return true;
-    }
-
-    function _transferToContract(address from, address to, uint256 amount, bytes memory extraData) internal {
-        /*
-            Internal function to start transactions to a contract
-
-            @from           From who
-            @to             To who.
-            @amount         Quantity
-            @extraData      Extra data the receiver will get
-        */
-        _transfer(from, to, amount, exchangeAddress == to);
-        (bool _success, uint256 _back) = thirdPartyContractAbstract(to).receiveCorionToken(from, amount, extraData);
-        require( _success );
-        require( amount > _back );
-        if ( _back > 0 ) {
-            _transfer(to, from, _back, false);
-        }
-        _processTransactionFee(from, amount - _back);
-    }
-
-    function _transfer(address from, address to, uint256 amount, bool fee) internal {
-        /*
-            Internal function to start transactions. When Tokens are sent, transaction fee is charged
-            During ICO transactions are allowed only from genesis addresses.
-            After sending the tokens, the ModuleHandler is notified and it will broadcast the fact among members
-
-            The 0xa636a97578d26a3b76b060bbc18226d954cf3757 address are blacklisted.
-
-            @from       From who
-            @to         To who
-            @amount     Quantity
-            @fee        Deduct transaction fee - yes or no?
-        */
-        if( fee ) {
-            (bool success, uint256 _fee) = getTransactionFee(amount);
-            require( success );
-            require( db.balanceOf(from) >= amount + _fee );
-        }
-        require( from != address(0x00) && to != address(0x00) && to != 0xa636A97578d26A3b76B060Bbc18226d954cf3757 );
-        require( ( ! isICO) || genesis[from] );
-        require( db.decrease(from, amount) );
-        require( db.increase(to, amount) );
-        if ( fee ) { _processTransactionFee(from, amount); }
-        if ( isICO ) {
-            require( ico(icoAddr).setInterestDB(from, db.balanceOf(from)) );
-            require( ico(icoAddr).setInterestDB(to, db.balanceOf(to)) );
-        }
-        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(from, to, amount) );
-    }
-
-    /**
-     * @notice Transaction fee will be deduced from `owner` for transacting `value`
-     * @param owner The address where will the transaction fee deduced
-     * @param value The base for calculating the fee
-     * @return success True if the transfer was successful
-     */
-    function processTransactionFee(address owner, uint256 value) isReady external returns (bool success) {
-        /*
-            Charge transaction fee. It can be called only by moduleHandler
-
-            @owner      From who.
-            @value      Quantity to calculate the fee
-
-            @success    Was the Function successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        _processTransactionFee(owner, value);
-        return true;
-    }
-
-    function _processTransactionFee(address owner, uint256 value) internal {
-        /*
-            Internal function to charge the transaction fee. A certain quantity is burnt, the rest is sent to the Schelling game prize pool.
-            No transaction fee during ICO.
-
-            @owner      From who
-            @value      Quantity to calculate the fee
-        */
-        if ( isICO ) { return; }
-        (bool _success, uint256 _fee) = getTransactionFee(value);
-        require( _success );
-        uint256 _forBurn = _fee * transactionFeeBurn / 100;
-        uint256 _forSchelling = _fee - _forBurn;
-        bool _found;
-        address _schellingAddr;
-        (_success, _found, _schellingAddr) = moduleHandler(moduleHandlerAddress).getModuleAddressByName('Schelling');
-        require( _success );
-        if ( _schellingAddr != address(0x00) && _found) {
-            require( db.decrease(owner, _forSchelling) );
-            require( db.increase(_schellingAddr, _forSchelling) );
-            _burn(owner, _forBurn);
-            bytes memory _data;
-            emit Transfer(owner, _schellingAddr, _forSchelling, _data);
-            require( moduleHandler(moduleHandlerAddress).broadcastTransfer(owner, _schellingAddr, _forSchelling) );
-        } else {
-            _burn(owner, _fee);
-        }
-    }
-
-    function getTransactionFee(uint256 value) public view returns (bool success, uint256 fee) {
-        /*
-            Transaction fee query.
-
-            @value      Quantity to calculate the fee
-
-            @success    Was the Function successful?
-            @fee        Amount of Transaction fee
-        */
-        if ( isICO ) { return (true, 0); }
-        fee = value * transactionFeeRate / transactionFeeRateM / 100;
-        if ( fee > transactionFeeMax ) { fee = transactionFeeMax; }
-        else if ( fee < transactionFeeMin ) { fee = transactionFeeMin; }
-        return (true, fee);
-    }
-
-    function mint(address owner, uint256 value) isReady external returns (bool success) {
-        /*
-            Generating tokens. It can be called only by ICO contract or the moduleHandler.
-
-            @owner      Address
-            @value      Amount.
-
-            @success    Was the Function successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) || msg.sender == icoAddr );
-        _mint(owner, value);
-        return true;
-    }
-
-    function _mint(address owner, uint256 value) internal {
-        /*
-            Internal function to generate tokens
-
-            @owner     Token is credited to this address
-            @value     Quantity
-        */
-        require( db.increase(owner, value) );
-        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(address(0x00), owner, value) );
-        if ( isICO ) {
-            require( ico(icoAddr).setInterestDB(owner, db.balanceOf(owner)) );
-        }
-        emit Mint(owner, value);
-    }
-
-    function burn(address owner, uint256 value) isReady external returns (bool success) {
-        /*
-            Burning the token. Can call only modulehandler
-
-            @owner     Burn the token from this address
-            @value     Quantity
-
-            @success    Was the Function successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        _burn(owner, value);
-        return true;
-    }
-
-    function _burn(address owner, uint256 value) internal {
-        /*
-            Internal function to burn the token
-
-            @owner     Burn the token from this address
-            @value     Quantity
-        */
-        require( db.decrease(owner, value) );
-        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(owner, address(0x00), value) );
-        emit Burn(owner, value);
-    }
-
-    function isContract(address addr) internal returns (bool success) {
-        /*
-            Internal function to check if the given address is natural, or a contract
-
-            @addr       Address to be checked
-
-            @success    Is the address crontact or not
-        */
-        uint256 _codeLength;
-        assembly {
-            _codeLength := extcodesize(addr)
-        }
-        return _codeLength > 0;
-    }
-
-    function balanceOf(address owner) public view returns (uint256 value) {
-        /*
-            Token balance query
-
-            @owner      Address
-
-            @value      Balance of address
-        */
-        return db.balanceOf(owner);
-    }
-
-    function totalSupply() public view returns (uint256 value) {
-        /*
-            Total token quantity query
-
-            @value      Total token quantity
-        */
-        return db.totalSupply();
-    }
-
-    function configure(announcementType aType, uint256 value) isReady external returns(bool success) {
-        /*
-            Token settings configuration.It  can be call only by moduleHandler
-
-            @aType      Type of setting
-            @value      Value
-
-            @success    Was the Function successful?
-        */
-        require( super.isModuleHandler(payable(msg.sender)) );
-        if      ( aType == announcementType.transactionFeeRate )    { transactionFeeRate = value; }
-        else if ( aType == announcementType.transactionFeeMin )     { transactionFeeMin = value; }
-        else if ( aType == announcementType.transactionFeeMax )     { transactionFeeMax = value; }
-        else if ( aType == announcementType.transactionFeeBurn )    { transactionFeeBurn = value; }
-        else { return false; }
-        return true;
-    }
-
-    event AllowanceUsed(address indexed spender, address indexed owner, uint256 indexed value);
-    event Mint(address indexed addr, uint256 indexed value);
-    event Burn(address indexed addr, uint256 indexed value);
-    event Approval(address indexed _owner, address indexed _spender, uint256 _value);
-    event Transfer(address indexed _from, address indexed _to, uint256 indexed _value, bytes _extraData);
-}
diff --git a/test/compilationTests/corion/tokenDB.sol b/test/compilationTests/corion/tokenDB.sol
deleted file mode 100644
index a77a1efa0dbc..000000000000
--- a/test/compilationTests/corion/tokenDB.sol
+++ /dev/null
@@ -1,77 +0,0 @@
-pragma solidity >=0.0;
-
-import "./safeMath.sol";
-import "./owned.sol";
-
-contract tokenDB is safeMath, ownedDB {
-
-    struct allowance_s {
-        uint256 amount;
-        uint256 nonce;
-    }
-
-    mapping(address => mapping(address => allowance_s)) public allowance;
-    mapping (address => uint256) public balanceOf;
-    uint256 public totalSupply;
-
-    function increase(address owner, uint256 value) external returns(bool success) {
-        /*
-            Increase of balance of the address in database. Only owner can call it.
-
-            @owner          Address
-            @value          Quantity
-
-            @success        Was the Function successful?
-        */
-        require( isOwner() );
-        balanceOf[owner] = safeAdd(balanceOf[owner], value);
-        totalSupply = safeAdd(totalSupply, value);
-        return true;
-    }
-
-    function decrease(address owner, uint256 value) external returns(bool success) {
-        /*
-            Decrease of balance of the address in database. Only owner can call it.
-
-            @owner          Address
-            @value          Quantity
-
-            @success        Was the Function successful?
-        */
-        require( isOwner() );
-        balanceOf[owner] = safeSub(balanceOf[owner], value);
-        totalSupply = safeSub(totalSupply, value);
-        return true;
-    }
-
-    function setAllowance(address owner, address spender, uint256 amount, uint256 nonce) external returns(bool success) {
-        /*
-            Set allowance in the database. Only owner can call it.
-
-            @owner          Owner address
-            @spender        Spender address
-            @amount         Amount to set
-            @nonce          Transaction count
-
-            @success        Was the Function successful?
-        */
-        require( isOwner() );
-        allowance[owner][spender].amount = amount;
-        allowance[owner][spender].nonce = nonce;
-        return true;
-    }
-
-    function getAllowance(address owner, address spender) public view returns(bool success, uint256 remaining, uint256 nonce) {
-        /*
-            Get allowance from the database.
-
-            @owner          Owner address
-            @spender        Spender address
-
-            @success        Was the Function successful?
-            @remaining      Remaining amount of the allowance
-            @nonce          Transaction count
-        */
-        return ( true, allowance[owner][spender].amount, allowance[owner][spender].nonce );
-    }
-}
diff --git a/test/compilationTests/gnosis/Events/CategoricalEvent.sol b/test/compilationTests/gnosis/Events/CategoricalEvent.sol
deleted file mode 100644
index e3cd0edc7b4c..000000000000
--- a/test/compilationTests/gnosis/Events/CategoricalEvent.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-pragma solidity >=0.0;
-import "../Events/Event.sol";
-
-
-/// @title Categorical event contract - Categorical events resolve to an outcome from a set of outcomes
-/// @author Stefan George - <stefan@gnosis.pm>
-contract CategoricalEvent is Event {
-
-    /*
-     *  Public functions
-     */
-    /// @dev Contract constructor validates and sets basic event properties
-    /// @param _collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param _oracle Oracle contract used to resolve the event
-    /// @param outcomeCount Number of event outcomes
-    constructor(
-        Token _collateralToken,
-        Oracle _oracle,
-        uint8 outcomeCount
-    )
-        Event(_collateralToken, _oracle, outcomeCount)
-    {
-
-    }
-
-    /// @dev Exchanges sender's winning outcome tokens for collateral tokens
-    /// @return winnings Sender's winnings
-    function redeemWinnings()
-        public
-        override
-        returns (uint winnings)
-    {
-        // Winning outcome has to be set
-        require(isOutcomeSet);
-        // Calculate winnings
-        winnings = outcomeTokens[uint(outcome)].balanceOf(msg.sender);
-        // Revoke tokens from winning outcome
-        outcomeTokens[uint(outcome)].revoke(msg.sender, winnings);
-        // Payout winnings
-        require(collateralToken.transfer(msg.sender, winnings));
-        emit WinningsRedemption(msg.sender, winnings);
-    }
-
-    /// @dev Calculates and returns event hash
-    /// @return Event hash
-    function getEventHash()
-        public
-        override
-        view
-        returns (bytes32)
-    {
-        return keccak256(abi.encodePacked(collateralToken, oracle, outcomeTokens.length));
-    }
-}
diff --git a/test/compilationTests/gnosis/Events/Event.sol b/test/compilationTests/gnosis/Events/Event.sol
deleted file mode 100644
index 4b5bb24d0daf..000000000000
--- a/test/compilationTests/gnosis/Events/Event.sol
+++ /dev/null
@@ -1,127 +0,0 @@
-pragma solidity >=0.0;
-import "../Tokens/Token.sol";
-import "../Tokens/OutcomeToken.sol";
-import "../Oracles/Oracle.sol";
-
-
-/// @title Event contract - Provide basic functionality required by different event types
-/// @author Stefan George - <stefan@gnosis.pm>
-abstract contract Event {
-
-    /*
-     *  Events
-     */
-    event OutcomeTokenCreation(OutcomeToken outcomeToken, uint8 index);
-    event OutcomeTokenSetIssuance(address indexed buyer, uint collateralTokenCount);
-    event OutcomeTokenSetRevocation(address indexed seller, uint outcomeTokenCount);
-    event OutcomeAssignment(int outcome);
-    event WinningsRedemption(address indexed receiver, uint winnings);
-
-    /*
-     *  Storage
-     */
-    Token public collateralToken;
-    Oracle public oracle;
-    bool public isOutcomeSet;
-    int public outcome;
-    OutcomeToken[] public outcomeTokens;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Contract constructor validates and sets basic event properties
-    /// @param _collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param _oracle Oracle contract used to resolve the event
-    /// @param outcomeCount Number of event outcomes
-    constructor(Token _collateralToken, Oracle _oracle, uint8 outcomeCount)
-    {
-        // Validate input
-        require(address(_collateralToken) != address(0) && address(_oracle) != address(0) && outcomeCount >= 2);
-        collateralToken = _collateralToken;
-        oracle = _oracle;
-        // Create an outcome token for each outcome
-        for (uint8 i = 0; i < outcomeCount; i++) {
-            OutcomeToken outcomeToken = new OutcomeToken();
-            outcomeTokens.push(outcomeToken);
-            emit OutcomeTokenCreation(outcomeToken, i);
-        }
-    }
-
-    /// @dev Buys equal number of tokens of all outcomes, exchanging collateral tokens and sets of outcome tokens 1:1
-    /// @param collateralTokenCount Number of collateral tokens
-    function buyAllOutcomes(uint collateralTokenCount)
-        public
-    {
-        // Transfer collateral tokens to events contract
-        require(collateralToken.transferFrom(msg.sender, address(this), collateralTokenCount));
-        // Issue new outcome tokens to sender
-        for (uint8 i = 0; i < outcomeTokens.length; i++)
-            outcomeTokens[i].issue(msg.sender, collateralTokenCount);
-        emit OutcomeTokenSetIssuance(msg.sender, collateralTokenCount);
-    }
-
-    /// @dev Sells equal number of tokens of all outcomes, exchanging collateral tokens and sets of outcome tokens 1:1
-    /// @param outcomeTokenCount Number of outcome tokens
-    function sellAllOutcomes(uint outcomeTokenCount)
-        public
-    {
-        // Revoke sender's outcome tokens of all outcomes
-        for (uint8 i = 0; i < outcomeTokens.length; i++)
-            outcomeTokens[i].revoke(msg.sender, outcomeTokenCount);
-        // Transfer collateral tokens to sender
-        require(collateralToken.transfer(msg.sender, outcomeTokenCount));
-        emit OutcomeTokenSetRevocation(msg.sender, outcomeTokenCount);
-    }
-
-    /// @dev Sets winning event outcome
-    function setOutcome()
-        public
-    {
-        // Winning outcome is not set yet in event contract but in oracle contract
-        require(!isOutcomeSet && oracle.isOutcomeSet());
-        // Set winning outcome
-        outcome = oracle.getOutcome();
-        isOutcomeSet = true;
-        emit OutcomeAssignment(outcome);
-    }
-
-    /// @dev Returns outcome count
-    /// @return Outcome count
-    function getOutcomeCount()
-        public
-        view
-        returns (uint8)
-    {
-        return uint8(outcomeTokens.length);
-    }
-
-    /// @dev Returns outcome tokens array
-    /// @return Outcome tokens
-    function getOutcomeTokens()
-        public
-        view
-        returns (OutcomeToken[] memory)
-    {
-        return outcomeTokens;
-    }
-
-    /// @dev Returns the amount of outcome tokens held by owner
-    /// @return outcomeTokenDistribution Outcome token distribution
-    function getOutcomeTokenDistribution(address owner)
-        public
-        view
-        returns (uint[] memory outcomeTokenDistribution)
-    {
-        outcomeTokenDistribution = new uint[](outcomeTokens.length);
-        for (uint8 i = 0; i < outcomeTokenDistribution.length; i++)
-            outcomeTokenDistribution[i] = outcomeTokens[i].balanceOf(owner);
-    }
-
-    /// @dev Calculates and returns event hash
-    /// @return Event hash
-    function getEventHash() virtual public view returns (bytes32);
-
-    /// @dev Exchanges sender's winning outcome tokens for collateral tokens
-    /// @return Sender's winnings
-    function redeemWinnings() virtual public returns (uint);
-}
diff --git a/test/compilationTests/gnosis/Events/EventFactory.sol b/test/compilationTests/gnosis/Events/EventFactory.sol
deleted file mode 100644
index 9c3f9e8cdd17..000000000000
--- a/test/compilationTests/gnosis/Events/EventFactory.sol
+++ /dev/null
@@ -1,79 +0,0 @@
-pragma solidity >=0.0;
-import "../Events/CategoricalEvent.sol";
-import "../Events/ScalarEvent.sol";
-
-
-/// @title Event factory contract - Allows creation of categorical and scalar events
-/// @author Stefan George - <stefan@gnosis.pm>
-contract EventFactory {
-
-    /*
-     *  Events
-     */
-    event CategoricalEventCreation(address indexed creator, CategoricalEvent categoricalEvent, Token collateralToken, Oracle oracle, uint8 outcomeCount);
-    event ScalarEventCreation(address indexed creator, ScalarEvent scalarEvent, Token collateralToken, Oracle oracle, int lowerBound, int upperBound);
-
-    /*
-     *  Storage
-     */
-    mapping (bytes32 => CategoricalEvent) public categoricalEvents;
-    mapping (bytes32 => ScalarEvent) public scalarEvents;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new categorical event and adds it to the event mapping
-    /// @param collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param oracle Oracle contract used to resolve the event
-    /// @param outcomeCount Number of event outcomes
-    /// @return eventContract Event contract
-    function createCategoricalEvent(
-        Token collateralToken,
-        Oracle oracle,
-        uint8 outcomeCount
-    )
-        public
-        returns (CategoricalEvent eventContract)
-    {
-        bytes32 eventHash = keccak256(abi.encodePacked(collateralToken, oracle, outcomeCount));
-        // Event should not exist yet
-        require(address(categoricalEvents[eventHash]) == address(0));
-        // Create event
-        eventContract = new CategoricalEvent(
-            collateralToken,
-            oracle,
-            outcomeCount
-        );
-        categoricalEvents[eventHash] = eventContract;
-        emit CategoricalEventCreation(msg.sender, eventContract, collateralToken, oracle, outcomeCount);
-    }
-
-    /// @dev Creates a new scalar event and adds it to the event mapping
-    /// @param collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param oracle Oracle contract used to resolve the event
-    /// @param lowerBound Lower bound for event outcome
-    /// @param upperBound Lower bound for event outcome
-    /// @return eventContract Event contract
-    function createScalarEvent(
-        Token collateralToken,
-        Oracle oracle,
-        int lowerBound,
-        int upperBound
-    )
-        public
-        returns (ScalarEvent eventContract)
-    {
-        bytes32 eventHash = keccak256(abi.encodePacked(collateralToken, oracle, lowerBound, upperBound));
-        // Event should not exist yet
-        require(address(scalarEvents[eventHash]) == address(0));
-        // Create event
-        eventContract = new ScalarEvent(
-            collateralToken,
-            oracle,
-            lowerBound,
-            upperBound
-        );
-        scalarEvents[eventHash] = eventContract;
-        emit ScalarEventCreation(msg.sender, eventContract, collateralToken, oracle, lowerBound, upperBound);
-    }
-}
diff --git a/test/compilationTests/gnosis/Events/ScalarEvent.sol b/test/compilationTests/gnosis/Events/ScalarEvent.sol
deleted file mode 100644
index f918c822aa35..000000000000
--- a/test/compilationTests/gnosis/Events/ScalarEvent.sol
+++ /dev/null
@@ -1,88 +0,0 @@
-pragma solidity >=0.0;
-import "../Events/Event.sol";
-
-
-/// @title Scalar event contract - Scalar events resolve to a number within a range
-/// @author Stefan George - <stefan@gnosis.pm>
-contract ScalarEvent is Event {
-    using Math for *;
-
-    /*
-     *  Constants
-     */
-    uint8 public constant SHORT = 0;
-    uint8 public constant LONG = 1;
-    uint24 public constant OUTCOME_RANGE = 1000000;
-
-    /*
-     *  Storage
-     */
-    int public lowerBound;
-    int public upperBound;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Contract constructor validates and sets basic event properties
-    /// @param _collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param _oracle Oracle contract used to resolve the event
-    /// @param _lowerBound Lower bound for event outcome
-    /// @param _upperBound Lower bound for event outcome
-    constructor(
-        Token _collateralToken,
-        Oracle _oracle,
-        int _lowerBound,
-        int _upperBound
-    )
-        Event(_collateralToken, _oracle, 2)
-    {
-        // Validate bounds
-        require(_upperBound > _lowerBound);
-        lowerBound = _lowerBound;
-        upperBound = _upperBound;
-    }
-
-    /// @dev Exchanges sender's winning outcome tokens for collateral tokens
-    /// @return winnings Sender's winnings
-    function redeemWinnings()
-        public
-        override
-        returns (uint winnings)
-    {
-        // Winning outcome has to be set
-        require(isOutcomeSet);
-        // Calculate winnings
-        uint24 convertedWinningOutcome;
-        // Outcome is lower than defined lower bound
-        if (outcome < lowerBound)
-            convertedWinningOutcome = 0;
-        // Outcome is higher than defined upper bound
-        else if (outcome > upperBound)
-            convertedWinningOutcome = OUTCOME_RANGE;
-        // Map outcome to outcome range
-        else
-            convertedWinningOutcome = uint24(uint(int(uint(OUTCOME_RANGE)) * (outcome - lowerBound) / (upperBound - lowerBound)));
-        uint factorShort = OUTCOME_RANGE - convertedWinningOutcome;
-        uint factorLong = OUTCOME_RANGE - factorShort;
-        uint shortOutcomeTokenCount = outcomeTokens[SHORT].balanceOf(msg.sender);
-        uint longOutcomeTokenCount = outcomeTokens[LONG].balanceOf(msg.sender);
-        winnings = shortOutcomeTokenCount.mul(factorShort).add(longOutcomeTokenCount.mul(factorLong)) / OUTCOME_RANGE;
-        // Revoke all outcome tokens
-        outcomeTokens[SHORT].revoke(msg.sender, shortOutcomeTokenCount);
-        outcomeTokens[LONG].revoke(msg.sender, longOutcomeTokenCount);
-        // Payout winnings to sender
-        require(collateralToken.transfer(msg.sender, winnings));
-        emit WinningsRedemption(msg.sender, winnings);
-    }
-
-    /// @dev Calculates and returns event hash
-    /// @return Event hash
-    function getEventHash()
-        public
-        override
-        view
-        returns (bytes32)
-    {
-        return keccak256(abi.encodePacked(collateralToken, oracle, lowerBound, upperBound));
-    }
-}
diff --git a/test/compilationTests/gnosis/LICENSE b/test/compilationTests/gnosis/LICENSE
deleted file mode 100644
index 0f2001b5908b..000000000000
--- a/test/compilationTests/gnosis/LICENSE
+++ /dev/null
@@ -1,675 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    Decentralized prediction markets and decentralized oracle system
-    #Copyright (C) 2015 Forecast Foundation OU, full GPL notice in LICENSE
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    Decentralized prediction markets and decentralized oracle system
-    Copyright (C) 2015 Forecast Foundation OU
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol b/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol
deleted file mode 100644
index b64392b0d215..000000000000
--- a/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol
+++ /dev/null
@@ -1,185 +0,0 @@
-pragma solidity >=0.0;
-import "../Utils/Math.sol";
-import "../MarketMakers/MarketMaker.sol";
-
-
-/// @title LMSR market maker contract - Calculates share prices based on share distribution and initial funding
-/// @author Alan Lu - <alan.lu@gnosis.pm>
-contract LMSRMarketMaker is MarketMaker {
-    using Math for *;
-
-    /*
-     *  Constants
-     */
-    uint constant ONE = 0x10000000000000000;
-    int constant EXP_LIMIT = 2352680790717288641401;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Returns cost to buy given number of outcome tokens
-    /// @param market Market contract
-    /// @param outcomeTokenIndex Index of outcome to buy
-    /// @param outcomeTokenCount Number of outcome tokens to buy
-    /// @return cost Cost
-    function calcCost(Market market, uint8 outcomeTokenIndex, uint outcomeTokenCount)
-        public
-        override
-        view
-        returns (uint cost)
-    {
-        require(market.eventContract().getOutcomeCount() > 1);
-        int[] memory netOutcomeTokensSold = getNetOutcomeTokensSold(market);
-        // Calculate cost level based on net outcome token balances
-        int logN = Math.ln(netOutcomeTokensSold.length * ONE);
-        uint funding = market.funding();
-        int costLevelBefore = calcCostLevel(logN, netOutcomeTokensSold, funding);
-        // Add outcome token count to net outcome token balance
-        require(int(outcomeTokenCount) >= 0);
-        netOutcomeTokensSold[outcomeTokenIndex] = netOutcomeTokensSold[outcomeTokenIndex].add(int(outcomeTokenCount));
-        // Calculate cost level after balance was updated
-        int costLevelAfter = calcCostLevel(logN, netOutcomeTokensSold, funding);
-        // Calculate cost as cost level difference
-        require(costLevelAfter >= costLevelBefore);
-        cost = uint(costLevelAfter - costLevelBefore);
-        // Take the ceiling to account for rounding
-        if (cost / ONE * ONE == cost)
-            cost /= ONE;
-        else
-            // Integer division by ONE ensures there is room to (+ 1)
-            cost = cost / ONE + 1;
-        // Make sure cost is not bigger than 1 per share
-        if (cost > outcomeTokenCount)
-            cost = outcomeTokenCount;
-    }
-
-    /// @dev Returns profit for selling given number of outcome tokens
-    /// @param market Market contract
-    /// @param outcomeTokenIndex Index of outcome to sell
-    /// @param outcomeTokenCount Number of outcome tokens to sell
-    /// @return profit Profit
-    function calcProfit(Market market, uint8 outcomeTokenIndex, uint outcomeTokenCount)
-        public
-        override
-        view
-        returns (uint profit)
-    {
-        require(market.eventContract().getOutcomeCount() > 1);
-        int[] memory netOutcomeTokensSold = getNetOutcomeTokensSold(market);
-        // Calculate cost level based on net outcome token balances
-        int logN = Math.ln(netOutcomeTokensSold.length * ONE);
-        uint funding = market.funding();
-        int costLevelBefore = calcCostLevel(logN, netOutcomeTokensSold, funding);
-        // Subtract outcome token count from the net outcome token balance
-        require(int(outcomeTokenCount) >= 0);
-        netOutcomeTokensSold[outcomeTokenIndex] = netOutcomeTokensSold[outcomeTokenIndex].sub(int(outcomeTokenCount));
-        // Calculate cost level after balance was updated
-        int costLevelAfter = calcCostLevel(logN, netOutcomeTokensSold, funding);
-        // Calculate profit as cost level difference
-        require(costLevelBefore >= costLevelAfter);
-        // Take the floor
-        profit = uint(costLevelBefore - costLevelAfter) / ONE;
-    }
-
-    /// @dev Returns marginal price of an outcome
-    /// @param market Market contract
-    /// @param outcomeTokenIndex Index of outcome to determine marginal price of
-    /// @return price Marginal price of an outcome as a fixed point number
-    function calcMarginalPrice(Market market, uint8 outcomeTokenIndex)
-        public
-        override
-        view
-        returns (uint price)
-    {
-        require(market.eventContract().getOutcomeCount() > 1);
-        int[] memory netOutcomeTokensSold = getNetOutcomeTokensSold(market);
-        int logN = Math.ln(netOutcomeTokensSold.length * ONE);
-        uint funding = market.funding();
-        // The price function is exp(quantities[i]/b) / sum(exp(q/b) for q in quantities)
-        // To avoid overflow, calculate with
-        // exp(quantities[i]/b - offset) / sum(exp(q/b - offset) for q in quantities)
-        (uint256 sum, , uint256 outcomeExpTerm) = sumExpOffset(logN, netOutcomeTokensSold, funding, outcomeTokenIndex);
-        return outcomeExpTerm / (sum / ONE);
-    }
-
-    /*
-     *  Private functions
-     */
-    /// @dev Calculates the result of the LMSR cost function which is used to
-    ///      derive prices from the market state
-    /// @param logN Logarithm of the number of outcomes
-    /// @param netOutcomeTokensSold Net outcome tokens sold by market
-    /// @param funding Initial funding for market
-    /// @return costLevel Cost level
-    function calcCostLevel(int logN, int[] memory netOutcomeTokensSold, uint funding)
-        private
-        view
-        returns(int costLevel)
-    {
-        // The cost function is C = b * log(sum(exp(q/b) for q in quantities)).
-        // To avoid overflow, we need to calc with an exponent offset:
-        // C = b * (offset + log(sum(exp(q/b - offset) for q in quantities)))
-        (uint256 sum, int256 offset, ) = sumExpOffset(logN, netOutcomeTokensSold, funding, 0);
-        costLevel = Math.ln(sum);
-        costLevel = costLevel.add(offset);
-        costLevel = (costLevel.mul(int(ONE)) / logN).mul(int(funding));
-    }
-
-    /// @dev Calculates sum(exp(q/b - offset) for q in quantities), where offset is set
-    ///      so that the sum fits in 248-256 bits
-    /// @param logN Logarithm of the number of outcomes
-    /// @param netOutcomeTokensSold Net outcome tokens sold by market
-    /// @param funding Initial funding for market
-    /// @param outcomeIndex Index of exponential term to extract (for use by marginal price function)
-    /// @return sum The sum of the outcomes
-    /// @return offset The offset that is used for all
-    /// @return outcomeExpTerm The summand associated with the supplied index
-    function sumExpOffset(int logN, int[] memory netOutcomeTokensSold, uint funding, uint8 outcomeIndex)
-        private
-        view
-        returns (uint sum, int offset, uint outcomeExpTerm)
-    {
-        // Naive calculation of this causes an overflow
-        // since anything above a bit over 133*ONE supplied to exp will explode
-        // as exp(133) just about fits into 192 bits of whole number data.
-
-        // The choice of this offset is subject to another limit:
-        // computing the inner sum successfully.
-        // Since the index is 8 bits, there has to be 8 bits of headroom for
-        // each summand, meaning q/b - offset <= exponential_limit,
-        // where that limit can be found with `mp.floor(mp.log((2**248 - 1) / ONE) * ONE)`
-        // That is what EXP_LIMIT is set to: it is about 127.5
-
-        // finally, if the distribution looks like [BIG, tiny, tiny...], using a
-        // BIG offset will cause the tiny quantities to go really negative
-        // causing the associated exponentials to vanish.
-
-        int maxQuantity = Math.max(netOutcomeTokensSold);
-        require(logN >= 0 && int(funding) >= 0);
-        offset = maxQuantity.mul(logN) / int(funding);
-        offset = offset.sub(EXP_LIMIT);
-        uint term;
-        for (uint8 i = 0; i < netOutcomeTokensSold.length; i++) {
-            term = Math.exp((netOutcomeTokensSold[i].mul(logN) / int(funding)).sub(offset));
-            if (i == outcomeIndex)
-                outcomeExpTerm = term;
-            sum = sum.add(term);
-        }
-    }
-
-    /// @dev Gets net outcome tokens sold by market. Since all sets of outcome tokens are backed by
-    ///      corresponding collateral tokens, the net quantity of a token sold by the market is the
-    ///      number of collateral tokens (which is the same as the number of outcome tokens the
-    ///      market created) subtracted by the quantity of that token held by the market.
-    /// @param market Market contract
-    /// @return quantities Net outcome tokens sold by market
-    function getNetOutcomeTokensSold(Market market)
-        private
-        view
-        returns (int[] memory quantities)
-    {
-        quantities = new int[](market.eventContract().getOutcomeCount());
-        for (uint8 i = 0; i < quantities.length; i++)
-            quantities[i] = market.netOutcomeTokensSold(i);
-    }
-}
diff --git a/test/compilationTests/gnosis/MarketMakers/MarketMaker.sol b/test/compilationTests/gnosis/MarketMakers/MarketMaker.sol
deleted file mode 100644
index c407ae8ce005..000000000000
--- a/test/compilationTests/gnosis/MarketMakers/MarketMaker.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma solidity >=0.0;
-import "../Markets/Market.sol";
-
-
-/// @title Abstract market maker contract - Functions to be implemented by market maker contracts
-abstract contract MarketMaker {
-
-    /*
-     *  Public functions
-     */
-    function calcCost(Market market, uint8 outcomeTokenIndex, uint outcomeTokenCount) virtual public view returns (uint);
-    function calcProfit(Market market, uint8 outcomeTokenIndex, uint outcomeTokenCount) virtual public view returns (uint);
-    function calcMarginalPrice(Market market, uint8 outcomeTokenIndex) virtual public view returns (uint);
-}
diff --git a/test/compilationTests/gnosis/Markets/Campaign.sol b/test/compilationTests/gnosis/Markets/Campaign.sol
deleted file mode 100644
index 450a381704e2..000000000000
--- a/test/compilationTests/gnosis/Markets/Campaign.sol
+++ /dev/null
@@ -1,175 +0,0 @@
-pragma solidity >=0.0;
-import "../Events/Event.sol";
-import "../Markets/StandardMarketFactory.sol";
-import "../Utils/Math.sol";
-
-
-/// @title Campaign contract - Allows to crowdfund a market
-/// @author Stefan George - <stefan@gnosis.pm>
-contract Campaign {
-    using Math for *;
-
-    /*
-     *  Events
-     */
-    event CampaignFunding(address indexed sender, uint funding);
-    event CampaignRefund(address indexed sender, uint refund);
-    event MarketCreation(Market indexed market);
-    event MarketClosing();
-    event FeeWithdrawal(address indexed receiver, uint fees);
-
-     /*
-     *  Constants
-     */
-    uint24 public constant FEE_RANGE = 1000000; // 100%
-
-    /*
-     *  Storage
-     */
-    Event public eventContract;
-    MarketFactory public marketFactory;
-    MarketMaker public marketMaker;
-    Market public market;
-    uint24 public fee;
-    uint public funding;
-    uint public deadline;
-    uint public finalBalance;
-    mapping (address => uint) public contributions;
-    Stages public stage;
-
-    enum Stages {
-        AuctionStarted,
-        AuctionSuccessful,
-        AuctionFailed,
-        MarketCreated,
-        MarketClosed
-    }
-
-    /*
-     *  Modifiers
-     */
-    modifier atStage(Stages _stage) {
-        // Contract has to be in given stage
-        require(stage == _stage);
-        _;
-    }
-
-    modifier timedTransitions() {
-        if (stage == Stages.AuctionStarted && deadline < block.timestamp)
-            stage = Stages.AuctionFailed;
-        _;
-    }
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor validates and sets campaign properties
-    /// @param _eventContract Event contract
-    /// @param _marketFactory Market factory contract
-    /// @param _marketMaker Market maker contract
-    /// @param _fee Market fee
-    /// @param _funding Initial funding for market
-    /// @param _deadline Campaign deadline
-    constructor(
-        Event _eventContract,
-        MarketFactory _marketFactory,
-        MarketMaker _marketMaker,
-        uint24 _fee,
-        uint _funding,
-        uint _deadline
-    )
-    {
-        // Validate input
-        require(   address(_eventContract) != address(0)
-                && address(_marketFactory) != address(0)
-                && address(_marketMaker) != address(0)
-                && _fee < FEE_RANGE
-                && _funding > 0
-                && block.timestamp < _deadline);
-        eventContract = _eventContract;
-        marketFactory = _marketFactory;
-        marketMaker = _marketMaker;
-        fee = _fee;
-        funding = _funding;
-        deadline = _deadline;
-    }
-
-    /// @dev Allows to contribute to required market funding
-    /// @param amount Amount of collateral tokens
-    function fund(uint amount)
-        public
-        timedTransitions
-        atStage(Stages.AuctionStarted)
-    {
-        uint raisedAmount = eventContract.collateralToken().balanceOf(address(this));
-        uint maxAmount = funding.sub(raisedAmount);
-        if (maxAmount < amount)
-            amount = maxAmount;
-        // Collect collateral tokens
-        require(eventContract.collateralToken().transferFrom(msg.sender, address(this), amount));
-        contributions[msg.sender] = contributions[msg.sender].add(amount);
-        if (amount == maxAmount)
-            stage = Stages.AuctionSuccessful;
-        emit CampaignFunding(msg.sender, amount);
-    }
-
-    /// @dev Withdraws refund amount
-    /// @return refundAmount Refund amount
-    function refund()
-        public
-        timedTransitions
-        atStage(Stages.AuctionFailed)
-        returns (uint refundAmount)
-    {
-        refundAmount = contributions[msg.sender];
-        contributions[msg.sender] = 0;
-        // Refund collateral tokens
-        require(eventContract.collateralToken().transfer(msg.sender, refundAmount));
-        emit CampaignRefund(msg.sender, refundAmount);
-    }
-
-    /// @dev Allows to create market after successful funding
-    /// @return Market address
-    function createMarket()
-        public
-        timedTransitions
-        atStage(Stages.AuctionSuccessful)
-        returns (Market)
-    {
-        market = marketFactory.createMarket(eventContract, marketMaker, fee);
-        require(eventContract.collateralToken().approve(address(market), funding));
-        market.fund(funding);
-        stage = Stages.MarketCreated;
-        emit MarketCreation(market);
-        return market;
-    }
-
-    /// @dev Allows to withdraw fees from market contract to campaign contract
-    function closeMarket()
-        public
-        atStage(Stages.MarketCreated)
-    {
-        // Winning outcome should be set
-        require(eventContract.isOutcomeSet());
-        market.close();
-        market.withdrawFees();
-        eventContract.redeemWinnings();
-        finalBalance = eventContract.collateralToken().balanceOf(address(this));
-        stage = Stages.MarketClosed;
-        emit MarketClosing();
-    }
-
-    /// @dev Allows to withdraw fees from campaign contract to contributor
-    /// @return fees Fee amount
-    function withdrawFees()
-        public
-        atStage(Stages.MarketClosed)
-        returns (uint fees)
-    {
-        fees = finalBalance.mul(contributions[msg.sender]) / funding;
-        contributions[msg.sender] = 0;
-        // Send fee share to contributor
-        require(eventContract.collateralToken().transfer(msg.sender, fees));
-        emit FeeWithdrawal(msg.sender, fees);
-    }
-}
diff --git a/test/compilationTests/gnosis/Markets/CampaignFactory.sol b/test/compilationTests/gnosis/Markets/CampaignFactory.sol
deleted file mode 100644
index 56cf94ddb39f..000000000000
--- a/test/compilationTests/gnosis/Markets/CampaignFactory.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-pragma solidity >=0.0;
-import "../Markets/Campaign.sol";
-
-
-/// @title Campaign factory contract - Allows to create campaign contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract CampaignFactory {
-
-    /*
-     *  Events
-     */
-    event CampaignCreation(address indexed creator, Campaign campaign, Event eventContract, MarketFactory marketFactory, MarketMaker marketMaker, uint24 fee, uint funding, uint deadline);
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new campaign contract
-    /// @param eventContract Event contract
-    /// @param marketFactory Market factory contract
-    /// @param marketMaker Market maker contract
-    /// @param fee Market fee
-    /// @param funding Initial funding for market
-    /// @param deadline Campaign deadline
-    /// @return campaign Market contract
-    function createCampaigns(
-        Event eventContract,
-        MarketFactory marketFactory,
-        MarketMaker marketMaker,
-        uint24 fee,
-        uint funding,
-        uint deadline
-    )
-        public
-        returns (Campaign campaign)
-    {
-        campaign = new Campaign(eventContract, marketFactory, marketMaker, fee, funding, deadline);
-        emit CampaignCreation(msg.sender, campaign, eventContract, marketFactory, marketMaker, fee, funding, deadline);
-    }
-}
diff --git a/test/compilationTests/gnosis/Markets/Market.sol b/test/compilationTests/gnosis/Markets/Market.sol
deleted file mode 100644
index ff7df7ff2ead..000000000000
--- a/test/compilationTests/gnosis/Markets/Market.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-pragma solidity >=0.0;
-import "../Events/Event.sol";
-import "../MarketMakers/MarketMaker.sol";
-
-
-/// @title Abstract market contract - Functions to be implemented by market contracts
-abstract contract Market {
-
-    /*
-     *  Events
-     */
-    event MarketFunding(uint funding);
-    event MarketClosing();
-    event FeeWithdrawal(uint fees);
-    event OutcomeTokenPurchase(address indexed buyer, uint8 outcomeTokenIndex, uint outcomeTokenCount, uint cost);
-    event OutcomeTokenSale(address indexed seller, uint8 outcomeTokenIndex, uint outcomeTokenCount, uint profit);
-    event OutcomeTokenShortSale(address indexed buyer, uint8 outcomeTokenIndex, uint outcomeTokenCount, uint cost);
-
-    /*
-     *  Storage
-     */
-    address public creator;
-    uint public createdAtBlock;
-    Event public eventContract;
-    MarketMaker public marketMaker;
-    uint24 public fee;
-    uint public funding;
-    int[] public netOutcomeTokensSold;
-    Stages public stage;
-
-    enum Stages {
-        MarketCreated,
-        MarketFunded,
-        MarketClosed
-    }
-
-    /*
-     *  Public functions
-     */
-    function fund(uint _funding) virtual public;
-    function close() virtual public;
-    function withdrawFees() virtual public returns (uint);
-    function buy(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint maxCost) virtual public returns (uint);
-    function sell(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint minProfit) virtual public returns (uint);
-    function shortSell(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint minProfit) virtual public returns (uint);
-    function calcMarketFee(uint outcomeTokenCost) virtual public view returns (uint);
-}
diff --git a/test/compilationTests/gnosis/Markets/MarketFactory.sol b/test/compilationTests/gnosis/Markets/MarketFactory.sol
deleted file mode 100644
index 2849f4bdf87c..000000000000
--- a/test/compilationTests/gnosis/Markets/MarketFactory.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma solidity >=0.0;
-import "../Events/Event.sol";
-import "../MarketMakers/MarketMaker.sol";
-import "../Markets/Market.sol";
-
-
-/// @title Abstract market factory contract - Functions to be implemented by market factories
-abstract contract MarketFactory {
-
-    /*
-     *  Events
-     */
-    event MarketCreation(address indexed creator, Market market, Event eventContract, MarketMaker marketMaker, uint24 fee);
-
-    /*
-     *  Public functions
-     */
-    function createMarket(Event eventContract, MarketMaker marketMaker, uint24
-fee) virtual public returns (Market);
-}
diff --git a/test/compilationTests/gnosis/Markets/StandardMarket.sol b/test/compilationTests/gnosis/Markets/StandardMarket.sol
deleted file mode 100644
index 5e476a86fafb..000000000000
--- a/test/compilationTests/gnosis/Markets/StandardMarket.sol
+++ /dev/null
@@ -1,200 +0,0 @@
-pragma solidity >=0.0;
-import "../Markets/Market.sol";
-import "../Tokens/Token.sol";
-import "../Events/Event.sol";
-import "../MarketMakers/MarketMaker.sol";
-
-
-/// @title Market factory contract - Allows to create market contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract StandardMarket is Market {
-    using Math for *;
-
-    /*
-     *  Constants
-     */
-    uint24 public constant FEE_RANGE = 1000000; // 100%
-
-    /*
-     *  Modifiers
-     */
-    modifier isCreator () {
-        // Only creator is allowed to proceed
-        require(msg.sender == creator);
-        _;
-    }
-
-    modifier atStage(Stages _stage) {
-        // Contract has to be in given stage
-        require(stage == _stage);
-        _;
-    }
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor validates and sets market properties
-    /// @param _creator Market creator
-    /// @param _eventContract Event contract
-    /// @param _marketMaker Market maker contract
-    /// @param _fee Market fee
-    constructor(address _creator, Event _eventContract, MarketMaker _marketMaker, uint24 _fee)
-    {
-        // Validate inputs
-        require(address(_eventContract) != address(0) && address(_marketMaker) != address(0) && _fee < FEE_RANGE);
-        creator = _creator;
-        createdAtBlock = block.number;
-        eventContract = _eventContract;
-        netOutcomeTokensSold = new int[](eventContract.getOutcomeCount());
-        fee = _fee;
-        marketMaker = _marketMaker;
-        stage = Stages.MarketCreated;
-    }
-
-    /// @dev Allows to fund the market with collateral tokens converting them into outcome tokens
-    /// @param _funding Funding amount
-    function fund(uint _funding)
-        public
-        override
-        isCreator
-        atStage(Stages.MarketCreated)
-    {
-        // Request collateral tokens and allow event contract to transfer them to buy all outcomes
-        require(   eventContract.collateralToken().transferFrom(msg.sender, address(this), _funding)
-                && eventContract.collateralToken().approve(address(eventContract), _funding));
-        eventContract.buyAllOutcomes(_funding);
-        funding = _funding;
-        stage = Stages.MarketFunded;
-        emit MarketFunding(funding);
-    }
-
-    /// @dev Allows market creator to close the markets by transferring all remaining outcome tokens to the creator
-    function close()
-        override
-        public
-        isCreator
-        atStage(Stages.MarketFunded)
-    {
-        uint8 outcomeCount = eventContract.getOutcomeCount();
-        for (uint8 i = 0; i < outcomeCount; i++)
-            require(eventContract.outcomeTokens(i).transfer(creator, eventContract.outcomeTokens(i).balanceOf(address(this))));
-        stage = Stages.MarketClosed;
-        emit MarketClosing();
-    }
-
-    /// @dev Allows market creator to withdraw fees generated by trades
-    /// @return fees Fee amount
-    function withdrawFees()
-        public
-        override
-        isCreator
-        returns (uint fees)
-    {
-        fees = eventContract.collateralToken().balanceOf(address(this));
-        // Transfer fees
-        require(eventContract.collateralToken().transfer(creator, fees));
-        emit FeeWithdrawal(fees);
-    }
-
-    /// @dev Allows to buy outcome tokens from market maker
-    /// @param outcomeTokenIndex Index of the outcome token to buy
-    /// @param outcomeTokenCount Amount of outcome tokens to buy
-    /// @param maxCost The maximum cost in collateral tokens to pay for outcome tokens
-    /// @return cost Cost in collateral tokens
-    function buy(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint maxCost)
-        public
-        override
-        atStage(Stages.MarketFunded)
-        returns (uint cost)
-    {
-        // Calculate cost to buy outcome tokens
-        uint outcomeTokenCost = marketMaker.calcCost(this, outcomeTokenIndex, outcomeTokenCount);
-        // Calculate fees charged by market
-        uint fees = calcMarketFee(outcomeTokenCost);
-        cost = outcomeTokenCost.add(fees);
-        // Check cost doesn't exceed max cost
-        require(cost > 0 && cost <= maxCost);
-        // Transfer tokens to markets contract and buy all outcomes
-        require(   eventContract.collateralToken().transferFrom(msg.sender, address(this), cost)
-                && eventContract.collateralToken().approve(address(eventContract), outcomeTokenCost));
-        // Buy all outcomes
-        eventContract.buyAllOutcomes(outcomeTokenCost);
-        // Transfer outcome tokens to buyer
-        require(eventContract.outcomeTokens(outcomeTokenIndex).transfer(msg.sender, outcomeTokenCount));
-        // Add outcome token count to market maker net balance
-        require(int(outcomeTokenCount) >= 0);
-        netOutcomeTokensSold[outcomeTokenIndex] = netOutcomeTokensSold[outcomeTokenIndex].add(int(outcomeTokenCount));
-        emit OutcomeTokenPurchase(msg.sender, outcomeTokenIndex, outcomeTokenCount, cost);
-    }
-
-    /// @dev Allows to sell outcome tokens to market maker
-    /// @param outcomeTokenIndex Index of the outcome token to sell
-    /// @param outcomeTokenCount Amount of outcome tokens to sell
-    /// @param minProfit The minimum profit in collateral tokens to earn for outcome tokens
-    /// @return profit Profit in collateral tokens
-    function sell(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint minProfit)
-        public
-        override
-        atStage(Stages.MarketFunded)
-        returns (uint profit)
-    {
-        // Calculate profit for selling outcome tokens
-        uint outcomeTokenProfit = marketMaker.calcProfit(this, outcomeTokenIndex, outcomeTokenCount);
-        // Calculate fee charged by market
-        uint fees = calcMarketFee(outcomeTokenProfit);
-        profit = outcomeTokenProfit.sub(fees);
-        // Check profit is not too low
-        require(profit > 0 && profit >= minProfit);
-        // Transfer outcome tokens to markets contract to sell all outcomes
-        require(eventContract.outcomeTokens(outcomeTokenIndex).transferFrom(msg.sender, address(this), outcomeTokenCount));
-        // Sell all outcomes
-        eventContract.sellAllOutcomes(outcomeTokenProfit);
-        // Transfer profit to seller
-        require(eventContract.collateralToken().transfer(msg.sender, profit));
-        // Subtract outcome token count from market maker net balance
-        require(int(outcomeTokenCount) >= 0);
-        netOutcomeTokensSold[outcomeTokenIndex] = netOutcomeTokensSold[outcomeTokenIndex].sub(int(outcomeTokenCount));
-        emit OutcomeTokenSale(msg.sender, outcomeTokenIndex, outcomeTokenCount, profit);
-    }
-
-    /// @dev Buys all outcomes, then sells all shares of selected outcome which were bought, keeping
-    ///      shares of all other outcome tokens.
-    /// @param outcomeTokenIndex Index of the outcome token to short sell
-    /// @param outcomeTokenCount Amount of outcome tokens to short sell
-    /// @param minProfit The minimum profit in collateral tokens to earn for short sold outcome tokens
-    /// @return cost Cost to short sell outcome in collateral tokens
-    function shortSell(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint minProfit)
-        public
-        override
-        returns (uint cost)
-    {
-        // Buy all outcomes
-        require(   eventContract.collateralToken().transferFrom(msg.sender, address(this), outcomeTokenCount)
-                && eventContract.collateralToken().approve(address(eventContract), outcomeTokenCount));
-        eventContract.buyAllOutcomes(outcomeTokenCount);
-        // Short sell selected outcome
-        eventContract.outcomeTokens(outcomeTokenIndex).approve(address(this), outcomeTokenCount);
-        uint profit = this.sell(outcomeTokenIndex, outcomeTokenCount, minProfit);
-        cost = outcomeTokenCount - profit;
-        // Transfer outcome tokens to buyer
-        uint8 outcomeCount = eventContract.getOutcomeCount();
-        for (uint8 i = 0; i < outcomeCount; i++)
-            if (i != outcomeTokenIndex)
-                require(eventContract.outcomeTokens(i).transfer(msg.sender, outcomeTokenCount));
-        // Send change back to buyer
-        require(eventContract.collateralToken().transfer(msg.sender, profit));
-        emit OutcomeTokenShortSale(msg.sender, outcomeTokenIndex, outcomeTokenCount, cost);
-    }
-
-    /// @dev Calculates fee to be paid to market maker
-    /// @param outcomeTokenCost Cost for buying outcome tokens
-    /// @return Fee for trade
-    function calcMarketFee(uint outcomeTokenCost)
-        public
-        override
-        view
-        returns (uint)
-    {
-        return outcomeTokenCost * fee / FEE_RANGE;
-    }
-}
diff --git a/test/compilationTests/gnosis/Markets/StandardMarketFactory.sol b/test/compilationTests/gnosis/Markets/StandardMarketFactory.sol
deleted file mode 100644
index e2d93336ca16..000000000000
--- a/test/compilationTests/gnosis/Markets/StandardMarketFactory.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma solidity >=0.0;
-import "../Markets/MarketFactory.sol";
-import "../Markets/StandardMarket.sol";
-
-
-/// @title Market factory contract - Allows to create market contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract StandardMarketFactory is MarketFactory {
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new market contract
-    /// @param eventContract Event contract
-    /// @param marketMaker Market maker contract
-    /// @param fee Market fee
-    /// @return market Market contract
-    function createMarket(Event eventContract, MarketMaker marketMaker, uint24 fee)
-        public
-        override
-        returns (Market market)
-    {
-        market = new StandardMarket(msg.sender, eventContract, marketMaker, fee);
-        emit MarketCreation(msg.sender, market, eventContract, marketMaker, fee);
-    }
-}
diff --git a/test/compilationTests/gnosis/Migrations.sol b/test/compilationTests/gnosis/Migrations.sol
deleted file mode 100644
index 9d37ef688abe..000000000000
--- a/test/compilationTests/gnosis/Migrations.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma solidity >=0.0;
-
-contract Migrations {
-  address public owner;
-  uint public last_completed_migration;
-
-  modifier restricted() {
-    if (msg.sender == owner) _;
-  }
-
-  constructor() {
-    owner = msg.sender;
-  }
-
-  function setCompleted(uint completed) public restricted {
-    last_completed_migration = completed;
-  }
-
-  function upgrade(address new_address) public restricted {
-    Migrations upgraded = Migrations(new_address);
-    upgraded.setCompleted(last_completed_migration);
-  }
-}
diff --git a/test/compilationTests/gnosis/Oracles/CentralizedOracle.sol b/test/compilationTests/gnosis/Oracles/CentralizedOracle.sol
deleted file mode 100644
index 08df083050c0..000000000000
--- a/test/compilationTests/gnosis/Oracles/CentralizedOracle.sol
+++ /dev/null
@@ -1,91 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/Oracle.sol";
-
-
-/// @title Centralized oracle contract - Allows the contract owner to set an outcome
-/// @author Stefan George - <stefan@gnosis.pm>
-contract CentralizedOracle is Oracle {
-
-    /*
-     *  Events
-     */
-    event OwnerReplacement(address indexed newOwner);
-    event OutcomeAssignment(int outcome);
-
-    /*
-     *  Storage
-     */
-    address public owner;
-    bytes public ipfsHash;
-    bool public isSet;
-    int public outcome;
-
-    /*
-     *  Modifiers
-     */
-    modifier isOwner () {
-        // Only owner is allowed to proceed
-        require(msg.sender == owner);
-        _;
-    }
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor sets owner address and IPFS hash
-    /// @param _ipfsHash Hash identifying off chain event description
-    constructor(address _owner, bytes memory _ipfsHash)
-    {
-        // Description hash cannot be null
-        require(_ipfsHash.length == 46);
-        owner = _owner;
-        ipfsHash = _ipfsHash;
-    }
-
-    /// @dev Replaces owner
-    /// @param newOwner New owner
-    function replaceOwner(address newOwner)
-        public
-        isOwner
-    {
-        // Result is not set yet
-        require(!isSet);
-        owner = newOwner;
-        emit OwnerReplacement(newOwner);
-    }
-
-    /// @dev Sets event outcome
-    /// @param _outcome Event outcome
-    function setOutcome(int _outcome)
-        public
-        isOwner
-    {
-        // Result is not set yet
-        require(!isSet);
-        isSet = true;
-        outcome = _outcome;
-        emit OutcomeAssignment(_outcome);
-    }
-
-    /// @dev Returns if winning outcome is set
-    /// @return Is outcome set?
-    function isOutcomeSet()
-        public
-        override
-        view
-        returns (bool)
-    {
-        return isSet;
-    }
-
-    /// @dev Returns outcome
-    /// @return Outcome
-    function getOutcome()
-        public
-        override
-        view
-        returns (int)
-    {
-        return outcome;
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/CentralizedOracleFactory.sol b/test/compilationTests/gnosis/Oracles/CentralizedOracleFactory.sol
deleted file mode 100644
index be8be82769cc..000000000000
--- a/test/compilationTests/gnosis/Oracles/CentralizedOracleFactory.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/CentralizedOracle.sol";
-
-
-/// @title Centralized oracle factory contract - Allows to create centralized oracle contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract CentralizedOracleFactory {
-
-    /*
-     *  Events
-     */
-    event CentralizedOracleCreation(address indexed creator, CentralizedOracle centralizedOracle, bytes ipfsHash);
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new centralized oracle contract
-    /// @param ipfsHash Hash identifying off chain event description
-    /// @return centralizedOracle Oracle contract
-    function createCentralizedOracle(bytes memory ipfsHash)
-        public
-        returns (CentralizedOracle centralizedOracle)
-    {
-        centralizedOracle = new CentralizedOracle(msg.sender, ipfsHash);
-        emit CentralizedOracleCreation(msg.sender, centralizedOracle, ipfsHash);
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/DifficultyOracle.sol b/test/compilationTests/gnosis/Oracles/DifficultyOracle.sol
deleted file mode 100644
index b94f5b64bf35..000000000000
--- a/test/compilationTests/gnosis/Oracles/DifficultyOracle.sol
+++ /dev/null
@@ -1,64 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/Oracle.sol";
-
-
-/// @title Difficulty oracle contract - Oracle to resolve difficulty events at given block
-/// @author Stefan George - <stefan@gnosis.pm>
-contract DifficultyOracle is Oracle {
-
-    /*
-     *  Events
-     */
-    event OutcomeAssignment(uint difficulty);
-
-    /*
-     *  Storage
-     */
-    uint public blockNumber;
-    uint public difficulty;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Contract constructor validates and sets target block number
-    /// @param _blockNumber Target block number
-    constructor(uint _blockNumber)
-    {
-        // Block has to be in the future
-        require(_blockNumber > block.number);
-        blockNumber = _blockNumber;
-    }
-
-    /// @dev Sets difficulty as winning outcome for specified block
-    function setOutcome()
-        public
-    {
-        // Block number was reached and outcome was not set yet
-        require(block.number >= blockNumber && difficulty == 0);
-        difficulty = block.difficulty;
-        emit OutcomeAssignment(difficulty);
-    }
-
-    /// @dev Returns if difficulty is set
-    /// @return Is outcome set?
-    function isOutcomeSet()
-        public
-        override
-        view
-        returns (bool)
-    {
-        // Difficulty is always bigger than 0
-        return difficulty > 0;
-    }
-
-    /// @dev Returns difficulty
-    /// @return Outcome
-    function getOutcome()
-        public
-        override
-        view
-        returns (int)
-    {
-        return int(difficulty);
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/DifficultyOracleFactory.sol b/test/compilationTests/gnosis/Oracles/DifficultyOracleFactory.sol
deleted file mode 100644
index d2215fc8c5b7..000000000000
--- a/test/compilationTests/gnosis/Oracles/DifficultyOracleFactory.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/DifficultyOracle.sol";
-
-
-/// @title Difficulty oracle factory contract - Allows to create difficulty oracle contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract DifficultyOracleFactory {
-
-    /*
-     *  Events
-     */
-    event DifficultyOracleCreation(address indexed creator, DifficultyOracle difficultyOracle, uint blockNumber);
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new difficulty oracle contract
-    /// @param blockNumber Target block number
-    /// @return difficultyOracle Oracle contract
-    function createDifficultyOracle(uint blockNumber)
-        public
-        returns (DifficultyOracle difficultyOracle)
-    {
-        difficultyOracle = new DifficultyOracle(blockNumber);
-        emit DifficultyOracleCreation(msg.sender, difficultyOracle, blockNumber);
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/FutarchyOracle.sol b/test/compilationTests/gnosis/Oracles/FutarchyOracle.sol
deleted file mode 100644
index 89b418b73e9f..000000000000
--- a/test/compilationTests/gnosis/Oracles/FutarchyOracle.sol
+++ /dev/null
@@ -1,170 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/Oracle.sol";
-import "../Events/EventFactory.sol";
-import "../Markets/MarketFactory.sol";
-
-
-/// @title Futarchy oracle contract - Allows to create an oracle based on market behaviour
-/// @author Stefan George - <stefan@gnosis.pm>
-contract FutarchyOracle is Oracle {
-    using Math for *;
-
-    /*
-     *  Events
-     */
-    event FutarchyFunding(uint funding);
-    event FutarchyClosing();
-    event OutcomeAssignment(uint winningMarketIndex);
-
-    /*
-     *  Constants
-     */
-    uint8 public constant LONG = 1;
-
-    /*
-     *  Storage
-     */
-    address creator;
-    Market[] public markets;
-    CategoricalEvent public categoricalEvent;
-    uint public deadline;
-    uint public winningMarketIndex;
-    bool public isSet;
-
-    /*
-     *  Modifiers
-     */
-    modifier isCreator () {
-        // Only creator is allowed to proceed
-        require(msg.sender == creator);
-        _;
-    }
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor creates events and markets for futarchy oracle
-    /// @param _creator Oracle creator
-    /// @param eventFactory Event factory contract
-    /// @param collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param oracle Oracle contract used to resolve the event
-    /// @param outcomeCount Number of event outcomes
-    /// @param lowerBound Lower bound for event outcome
-    /// @param upperBound Lower bound for event outcome
-    /// @param marketFactory Market factory contract
-    /// @param marketMaker Market maker contract
-    /// @param fee Market fee
-    /// @param _deadline Decision deadline
-    constructor(
-        address _creator,
-        EventFactory eventFactory,
-        Token collateralToken,
-        Oracle oracle,
-        uint8 outcomeCount,
-        int lowerBound,
-        int upperBound,
-        MarketFactory marketFactory,
-        MarketMaker marketMaker,
-        uint24 fee,
-        uint _deadline
-    )
-    {
-        // Deadline is in the future
-        require(_deadline > block.timestamp);
-        // Create decision event
-        categoricalEvent = eventFactory.createCategoricalEvent(collateralToken, this, outcomeCount);
-        // Create outcome events
-        for (uint8 i = 0; i < categoricalEvent.getOutcomeCount(); i++) {
-            ScalarEvent scalarEvent = eventFactory.createScalarEvent(
-                categoricalEvent.outcomeTokens(i),
-                oracle,
-                lowerBound,
-                upperBound
-            );
-            markets.push(marketFactory.createMarket(scalarEvent, marketMaker, fee));
-        }
-        creator = _creator;
-        deadline = _deadline;
-    }
-
-    /// @dev Funds all markets with equal amount of funding
-    /// @param funding Amount of funding
-    function fund(uint funding)
-        public
-        isCreator
-    {
-        // Buy all outcomes
-        require(   categoricalEvent.collateralToken().transferFrom(creator, address(this), funding)
-                && categoricalEvent.collateralToken().approve(address(categoricalEvent), funding));
-        categoricalEvent.buyAllOutcomes(funding);
-        // Fund each market with outcome tokens from categorical event
-        for (uint8 i = 0; i < markets.length; i++) {
-            Market market = markets[i];
-            // Approve funding for market
-            require(market.eventContract().collateralToken().approve(address(market), funding));
-            market.fund(funding);
-        }
-        emit FutarchyFunding(funding);
-    }
-
-    /// @dev Closes market for winning outcome and redeems winnings and sends all collateral tokens to creator
-    function close()
-        public
-        isCreator
-    {
-        // Winning outcome has to be set
-        Market market = markets[uint(getOutcome())];
-        require(categoricalEvent.isOutcomeSet() && market.eventContract().isOutcomeSet());
-        // Close market and transfer all outcome tokens from winning outcome to this contract
-        market.close();
-        market.eventContract().redeemWinnings();
-        market.withdrawFees();
-        // Redeem collateral token for winning outcome tokens and transfer collateral tokens to creator
-        categoricalEvent.redeemWinnings();
-        require(categoricalEvent.collateralToken().transfer(creator, categoricalEvent.collateralToken().balanceOf(address(this))));
-        emit FutarchyClosing();
-    }
-
-    /// @dev Allows to set the oracle outcome based on the market with largest long position
-    function setOutcome()
-        public
-    {
-        // Outcome is not set yet and deadline has passed
-        require(!isSet && deadline <= block.timestamp);
-        // Find market with highest marginal price for long outcome tokens
-        uint highestMarginalPrice = markets[0].marketMaker().calcMarginalPrice(markets[0], LONG);
-        uint highestIndex = 0;
-        for (uint8 i = 1; i < markets.length; i++) {
-            uint marginalPrice = markets[i].marketMaker().calcMarginalPrice(markets[i], LONG);
-            if (marginalPrice > highestMarginalPrice) {
-                highestMarginalPrice = marginalPrice;
-                highestIndex = i;
-            }
-        }
-        winningMarketIndex = highestIndex;
-        isSet = true;
-        emit OutcomeAssignment(winningMarketIndex);
-    }
-
-    /// @dev Returns if winning outcome is set
-    /// @return Is outcome set?
-    function isOutcomeSet()
-        public
-        override
-        view
-        returns (bool)
-    {
-        return isSet;
-    }
-
-    /// @dev Returns winning outcome
-    /// @return Outcome
-    function getOutcome()
-        public
-        override
-        view
-        returns (int)
-    {
-        return int(winningMarketIndex);
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol b/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol
deleted file mode 100644
index a6438379b195..000000000000
--- a/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol
+++ /dev/null
@@ -1,94 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/FutarchyOracle.sol";
-
-
-/// @title Futarchy oracle factory contract - Allows to create Futarchy oracle contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract FutarchyOracleFactory {
-
-    /*
-     *  Events
-     */
-    event FutarchyOracleCreation(
-        address indexed creator,
-        FutarchyOracle futarchyOracle,
-        Token collateralToken,
-        Oracle oracle,
-        uint8 outcomeCount,
-        int lowerBound,
-        int upperBound,
-        MarketFactory marketFactory,
-        MarketMaker marketMaker,
-        uint24 fee,
-        uint deadline
-    );
-
-    /*
-     *  Storage
-     */
-    EventFactory eventFactory;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor sets event factory contract
-    /// @param _eventFactory Event factory contract
-    constructor(EventFactory _eventFactory)
-    {
-        require(address(_eventFactory) != address(0));
-        eventFactory = _eventFactory;
-    }
-
-    /// @dev Creates a new Futarchy oracle contract
-    /// @param collateralToken Tokens used as collateral in exchange for outcome tokens
-    /// @param oracle Oracle contract used to resolve the event
-    /// @param outcomeCount Number of event outcomes
-    /// @param lowerBound Lower bound for event outcome
-    /// @param upperBound Lower bound for event outcome
-    /// @param marketFactory Market factory contract
-    /// @param marketMaker Market maker contract
-    /// @param fee Market fee
-    /// @param deadline Decision deadline
-    /// @return futarchyOracle Oracle contract
-    function createFutarchyOracle(
-        Token collateralToken,
-        Oracle oracle,
-        uint8 outcomeCount,
-        int lowerBound,
-        int upperBound,
-        MarketFactory marketFactory,
-        MarketMaker marketMaker,
-        uint24 fee,
-        uint deadline
-    )
-        public
-        returns (FutarchyOracle futarchyOracle)
-    {
-        futarchyOracle = new FutarchyOracle(
-            msg.sender,
-            eventFactory,
-            collateralToken,
-            oracle,
-            outcomeCount,
-            lowerBound,
-            upperBound,
-            marketFactory,
-            marketMaker,
-            fee,
-            deadline
-        );
-        emit FutarchyOracleCreation(
-            msg.sender,
-            futarchyOracle,
-            collateralToken,
-            oracle,
-            outcomeCount,
-            lowerBound,
-            upperBound,
-            marketFactory,
-            marketMaker,
-            fee,
-            deadline
-        );
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/MajorityOracle.sol b/test/compilationTests/gnosis/Oracles/MajorityOracle.sol
deleted file mode 100644
index 854088fa4411..000000000000
--- a/test/compilationTests/gnosis/Oracles/MajorityOracle.sol
+++ /dev/null
@@ -1,91 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/Oracle.sol";
-
-
-/// @title Majority oracle contract - Allows to resolve an event based on multiple oracles with majority vote
-/// @author Stefan George - <stefan@gnosis.pm>
-contract MajorityOracle is Oracle {
-
-    /*
-     *  Storage
-     */
-    Oracle[] public oracles;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Allows to create an oracle for a majority vote based on other oracles
-    /// @param _oracles List of oracles taking part in the majority vote
-    constructor(Oracle[] memory _oracles)
-    {
-        // At least 2 oracles should be defined
-        require(_oracles.length > 2);
-        for (uint i = 0; i < _oracles.length; i++)
-            // Oracle address cannot be null
-            require(address(_oracles[i]) != address(0));
-        oracles = _oracles;
-    }
-
-    /// @dev Allows to registers oracles for a majority vote
-    /// @return outcomeSet Is outcome set?
-    /// @return outcome Outcome
-    function getStatusAndOutcome()
-        public
-        view
-        returns (bool outcomeSet, int outcome)
-    {
-        uint i;
-        int[] memory outcomes = new int[](oracles.length);
-        uint[] memory validations = new uint[](oracles.length);
-        for (i = 0; i < oracles.length; i++)
-            if (oracles[i].isOutcomeSet()) {
-                int _outcome = oracles[i].getOutcome();
-                for (uint j = 0; j <= i; j++)
-                    if (_outcome == outcomes[j]) {
-                        validations[j] += 1;
-                        break;
-                    }
-                    else if (validations[j] == 0) {
-                        outcomes[j] = _outcome;
-                        validations[j] = 1;
-                        break;
-                    }
-            }
-        uint outcomeValidations = 0;
-        uint outcomeIndex = 0;
-        for (i = 0; i < oracles.length; i++)
-            if (validations[i] > outcomeValidations) {
-                outcomeValidations = validations[i];
-                outcomeIndex = i;
-            }
-        // There is a majority vote
-        if (outcomeValidations * 2 > oracles.length) {
-            outcomeSet = true;
-            outcome = outcomes[outcomeIndex];
-        }
-    }
-
-    /// @dev Returns if winning outcome is set
-    /// @return Is outcome set?
-    function isOutcomeSet()
-        public
-        override
-        view
-        returns (bool)
-    {
-        (bool outcomeSet, ) = getStatusAndOutcome();
-        return outcomeSet;
-    }
-
-    /// @dev Returns winning outcome
-    /// @return Outcome
-    function getOutcome()
-        public
-        override
-        view
-        returns (int)
-    {
-        (, int winningOutcome) = getStatusAndOutcome();
-        return winningOutcome;
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/MajorityOracleFactory.sol b/test/compilationTests/gnosis/Oracles/MajorityOracleFactory.sol
deleted file mode 100644
index 22e3c43a66e2..000000000000
--- a/test/compilationTests/gnosis/Oracles/MajorityOracleFactory.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/MajorityOracle.sol";
-
-
-/// @title Majority oracle factory contract - Allows to create majority oracle contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract MajorityOracleFactory {
-
-    /*
-     *  Events
-     */
-    event MajorityOracleCreation(address indexed creator, MajorityOracle majorityOracle, Oracle[] oracles);
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new majority oracle contract
-    /// @param oracles List of oracles taking part in the majority vote
-    /// @return majorityOracle Oracle contract
-    function createMajorityOracle(Oracle[] memory oracles)
-        public
-        returns (MajorityOracle majorityOracle)
-    {
-        majorityOracle = new MajorityOracle(oracles);
-        emit MajorityOracleCreation(msg.sender, majorityOracle, oracles);
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/Oracle.sol b/test/compilationTests/gnosis/Oracles/Oracle.sol
deleted file mode 100644
index 9f4c403ec143..000000000000
--- a/test/compilationTests/gnosis/Oracles/Oracle.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma solidity >=0.0;
-
-
-/// @title Abstract oracle contract - Functions to be implemented by oracles
-abstract contract Oracle {
-
-    function isOutcomeSet() virtual public view returns (bool);
-    function getOutcome() virtual public view returns (int);
-}
diff --git a/test/compilationTests/gnosis/Oracles/SignedMessageOracle.sol b/test/compilationTests/gnosis/Oracles/SignedMessageOracle.sol
deleted file mode 100644
index 7b56a107ee58..000000000000
--- a/test/compilationTests/gnosis/Oracles/SignedMessageOracle.sol
+++ /dev/null
@@ -1,103 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/Oracle.sol";
-
-
-/// @title Signed message oracle contract - Allows to set an outcome with a signed message
-/// @author Stefan George - <stefan@gnosis.pm>
-contract SignedMessageOracle is Oracle {
-
-    /*
-     *  Events
-     */
-    event SignerReplacement(address indexed newSigner);
-    event OutcomeAssignment(int outcome);
-
-    /*
-     *  Storage
-     */
-    address public signer;
-    bytes32 public descriptionHash;
-    uint nonce;
-    bool public isSet;
-    int public outcome;
-
-    /*
-     *  Modifiers
-     */
-    modifier isSigner () {
-        // Only signer is allowed to proceed
-        require(msg.sender == signer);
-        _;
-    }
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor sets signer address based on signature
-    /// @param _descriptionHash Hash identifying off chain event description
-    /// @param v Signature parameter
-    /// @param r Signature parameter
-    /// @param s Signature parameter
-    constructor(bytes32 _descriptionHash, uint8 v, bytes32 r, bytes32 s)
-    {
-        signer = ecrecover(_descriptionHash, v, r, s);
-        descriptionHash = _descriptionHash;
-    }
-
-    /// @dev Replaces signer
-    /// @param newSigner New signer
-    /// @param _nonce Unique nonce to prevent replay attacks
-    /// @param v Signature parameter
-    /// @param r Signature parameter
-    /// @param s Signature parameter
-    function replaceSigner(address newSigner, uint _nonce, uint8 v, bytes32 r, bytes32 s)
-        public
-        isSigner
-    {
-        // Result is not set yet and nonce and signer are valid
-        require(   !isSet
-                && _nonce > nonce
-                && signer == ecrecover(keccak256(abi.encodePacked(descriptionHash, newSigner, _nonce)), v, r, s));
-        nonce = _nonce;
-        signer = newSigner;
-        emit SignerReplacement(newSigner);
-    }
-
-    /// @dev Sets outcome based on signed message
-    /// @param _outcome Signed event outcome
-    /// @param v Signature parameter
-    /// @param r Signature parameter
-    /// @param s Signature parameter
-    function setOutcome(int _outcome, uint8 v, bytes32 r, bytes32 s)
-        public
-    {
-        // Result is not set yet and signer is valid
-        require(   !isSet
-                && signer == ecrecover(keccak256(abi.encodePacked(descriptionHash, _outcome)), v, r, s));
-        isSet = true;
-        outcome = _outcome;
-        emit OutcomeAssignment(_outcome);
-    }
-
-    /// @dev Returns if winning outcome
-    /// @return Is outcome set?
-    function isOutcomeSet()
-        public
-        override
-        view
-        returns (bool)
-    {
-        return isSet;
-    }
-
-    /// @dev Returns winning outcome
-    /// @return Outcome
-    function getOutcome()
-        public
-        override
-        view
-        returns (int)
-    {
-        return outcome;
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/SignedMessageOracleFactory.sol b/test/compilationTests/gnosis/Oracles/SignedMessageOracleFactory.sol
deleted file mode 100644
index 33bffef03f7c..000000000000
--- a/test/compilationTests/gnosis/Oracles/SignedMessageOracleFactory.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/SignedMessageOracle.sol";
-
-
-/// @title Signed message oracle factory contract - Allows to create signed message oracle contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract SignedMessageOracleFactory {
-
-    /*
-     *  Events
-     */
-    event SignedMessageOracleCreation(address indexed creator, SignedMessageOracle signedMessageOracle, address oracle);
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new signed message oracle contract
-    /// @param descriptionHash Hash identifying off chain event description
-    /// @param v Signature parameter
-    /// @param r Signature parameter
-    /// @param s Signature parameter
-    /// @return signedMessageOracle Oracle contract
-    function createSignedMessageOracle(bytes32 descriptionHash, uint8 v, bytes32 r, bytes32 s)
-        public
-        returns (SignedMessageOracle signedMessageOracle)
-    {
-        signedMessageOracle = new SignedMessageOracle(descriptionHash, v, r, s);
-        address oracle = ecrecover(descriptionHash, v, r, s);
-        emit SignedMessageOracleCreation(msg.sender, signedMessageOracle, oracle);
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/UltimateOracle.sol b/test/compilationTests/gnosis/Oracles/UltimateOracle.sol
deleted file mode 100644
index 9fc7a0cc9d7b..000000000000
--- a/test/compilationTests/gnosis/Oracles/UltimateOracle.sol
+++ /dev/null
@@ -1,196 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/Oracle.sol";
-import "../Tokens/Token.sol";
-import "../Utils/Math.sol";
-
-
-/// @title Ultimate oracle contract - Allows to swap oracle result for ultimate oracle result
-/// @author Stefan George - <stefan@gnosis.pm>
-contract UltimateOracle is Oracle {
-    using Math for *;
-
-    /*
-     *  Events
-     */
-    event ForwardedOracleOutcomeAssignment(int outcome);
-    event OutcomeChallenge(address indexed sender, int outcome);
-    event OutcomeVote(address indexed sender, int outcome, uint amount);
-    event Withdrawal(address indexed sender, uint amount);
-
-    /*
-     *  Storage
-     */
-    Oracle public forwardedOracle;
-    Token public collateralToken;
-    uint8 public spreadMultiplier;
-    uint public challengePeriod;
-    uint public challengeAmount;
-    uint public frontRunnerPeriod;
-
-    int public forwardedOutcome;
-    uint public forwardedOutcomeSetTimestamp;
-    int public frontRunner;
-    uint public frontRunnerSetTimestamp;
-
-    uint public totalAmount;
-    mapping (int => uint) public totalOutcomeAmounts;
-    mapping (address => mapping (int => uint)) public outcomeAmounts;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor sets ultimate oracle properties
-    /// @param _forwardedOracle Oracle address
-    /// @param _collateralToken Collateral token address
-    /// @param _spreadMultiplier Defines the spread as a multiple of the money bet on other outcomes
-    /// @param _challengePeriod Time to challenge oracle outcome
-    /// @param _challengeAmount Amount to challenge the outcome
-    /// @param _frontRunnerPeriod Time to overbid the front-runner
-    constructor(
-        Oracle _forwardedOracle,
-        Token _collateralToken,
-        uint8 _spreadMultiplier,
-        uint _challengePeriod,
-        uint _challengeAmount,
-        uint _frontRunnerPeriod
-    )
-    {
-        // Validate inputs
-        require(   address(_forwardedOracle) != address(0)
-                && address(_collateralToken) != address(0)
-                && _spreadMultiplier >= 2
-                && _challengePeriod > 0
-                && _challengeAmount > 0
-                && _frontRunnerPeriod > 0);
-        forwardedOracle = _forwardedOracle;
-        collateralToken = _collateralToken;
-        spreadMultiplier = _spreadMultiplier;
-        challengePeriod = _challengePeriod;
-        challengeAmount = _challengeAmount;
-        frontRunnerPeriod = _frontRunnerPeriod;
-    }
-
-    /// @dev Allows to set oracle outcome
-    function setForwardedOutcome()
-        public
-    {
-        // There was no challenge and the outcome was not set yet in the ultimate oracle but in the forwarded oracle
-        require(   !isChallenged()
-                && forwardedOutcomeSetTimestamp == 0
-                && forwardedOracle.isOutcomeSet());
-        forwardedOutcome = forwardedOracle.getOutcome();
-        forwardedOutcomeSetTimestamp = block.timestamp;
-        emit ForwardedOracleOutcomeAssignment(forwardedOutcome);
-    }
-
-    /// @dev Allows to challenge the oracle outcome
-    /// @param _outcome Outcome to bid on
-    function challengeOutcome(int _outcome)
-        public
-    {
-        // There was no challenge yet or the challenge period expired
-        require(   !isChallenged()
-                && !isChallengePeriodOver()
-                && collateralToken.transferFrom(msg.sender, address(this), challengeAmount));
-        outcomeAmounts[msg.sender][_outcome] = challengeAmount;
-        totalOutcomeAmounts[_outcome] = challengeAmount;
-        totalAmount = challengeAmount;
-        frontRunner = _outcome;
-        frontRunnerSetTimestamp = block.timestamp;
-        emit OutcomeChallenge(msg.sender, _outcome);
-    }
-
-    /// @dev Allows to challenge the oracle outcome
-    /// @param _outcome Outcome to bid on
-    /// @param amount Amount to bid
-    function voteForOutcome(int _outcome, uint amount)
-        public
-    {
-        uint maxAmount = (totalAmount - totalOutcomeAmounts[_outcome]).mul(spreadMultiplier);
-        if (amount > maxAmount)
-            amount = maxAmount;
-        // Outcome is challenged and front runner period is not over yet and tokens can be transferred
-        require(   isChallenged()
-                && !isFrontRunnerPeriodOver()
-                && collateralToken.transferFrom(msg.sender, address(this), amount));
-        outcomeAmounts[msg.sender][_outcome] = outcomeAmounts[msg.sender][_outcome].add(amount);
-        totalOutcomeAmounts[_outcome] = totalOutcomeAmounts[_outcome].add(amount);
-        totalAmount = totalAmount.add(amount);
-        if (_outcome != frontRunner && totalOutcomeAmounts[_outcome] > totalOutcomeAmounts[frontRunner])
-        {
-            frontRunner = _outcome;
-            frontRunnerSetTimestamp = block.timestamp;
-        }
-        emit OutcomeVote(msg.sender, _outcome, amount);
-    }
-
-    /// @dev Withdraws winnings for user
-    /// @return amount Winnings
-    function withdraw()
-        public
-        returns (uint amount)
-    {
-        // Outcome was challenged and ultimate outcome decided
-        require(isFrontRunnerPeriodOver());
-        amount = totalAmount.mul(outcomeAmounts[msg.sender][frontRunner]) / totalOutcomeAmounts[frontRunner];
-        outcomeAmounts[msg.sender][frontRunner] = 0;
-        // Transfer earnings to contributor
-        require(collateralToken.transfer(msg.sender, amount));
-        emit Withdrawal(msg.sender, amount);
-    }
-
-    /// @dev Checks if time to challenge the outcome is over
-    /// @return Is challenge period over?
-    function isChallengePeriodOver()
-        public
-        view
-        returns (bool)
-    {
-        return forwardedOutcomeSetTimestamp != 0 && (block.timestamp).sub(forwardedOutcomeSetTimestamp) > challengePeriod;
-    }
-
-    /// @dev Checks if time to overbid the front runner is over
-    /// @return Is front runner period over?
-    function isFrontRunnerPeriodOver()
-        public
-        view
-        returns (bool)
-    {
-        return frontRunnerSetTimestamp != 0 && (block.timestamp).sub(frontRunnerSetTimestamp) > frontRunnerPeriod;
-    }
-
-    /// @dev Checks if outcome was challenged
-    /// @return Is challenged?
-    function isChallenged()
-        public
-        view
-        returns (bool)
-    {
-        return frontRunnerSetTimestamp != 0;
-    }
-
-    /// @dev Returns if winning outcome is set
-    /// @return Is outcome set?
-    function isOutcomeSet()
-        public
-        override
-        view
-        returns (bool)
-    {
-        return    isChallengePeriodOver() && !isChallenged()
-               || isFrontRunnerPeriodOver();
-    }
-
-    /// @dev Returns winning outcome
-    /// @return Outcome
-    function getOutcome()
-        public
-        override
-        view
-        returns (int)
-    {
-        if (isFrontRunnerPeriodOver())
-            return frontRunner;
-        return forwardedOutcome;
-    }
-}
diff --git a/test/compilationTests/gnosis/Oracles/UltimateOracleFactory.sol b/test/compilationTests/gnosis/Oracles/UltimateOracleFactory.sol
deleted file mode 100644
index 7c1e16d53322..000000000000
--- a/test/compilationTests/gnosis/Oracles/UltimateOracleFactory.sol
+++ /dev/null
@@ -1,64 +0,0 @@
-pragma solidity >=0.0;
-import "../Oracles/UltimateOracle.sol";
-
-
-/// @title Ultimate oracle factory contract - Allows to create ultimate oracle contracts
-/// @author Stefan George - <stefan@gnosis.pm>
-contract UltimateOracleFactory {
-
-    /*
-     *  Events
-     */
-    event UltimateOracleCreation(
-        address indexed creator,
-        UltimateOracle ultimateOracle,
-        Oracle oracle,
-        Token collateralToken,
-        uint8 spreadMultiplier,
-        uint challengePeriod,
-        uint challengeAmount,
-        uint frontRunnerPeriod
-    );
-
-    /*
-     *  Public functions
-     */
-    /// @dev Creates a new ultimate Oracle contract
-    /// @param oracle Oracle address
-    /// @param collateralToken Collateral token address
-    /// @param spreadMultiplier Defines the spread as a multiple of the money bet on other outcomes
-    /// @param challengePeriod Time to challenge oracle outcome
-    /// @param challengeAmount Amount to challenge the outcome
-    /// @param frontRunnerPeriod Time to overbid the front-runner
-    /// @return ultimateOracle Oracle contract
-    function createUltimateOracle(
-        Oracle oracle,
-        Token collateralToken,
-        uint8 spreadMultiplier,
-        uint challengePeriod,
-        uint challengeAmount,
-        uint frontRunnerPeriod
-    )
-        public
-        returns (UltimateOracle ultimateOracle)
-    {
-        ultimateOracle = new UltimateOracle(
-            oracle,
-            collateralToken,
-            spreadMultiplier,
-            challengePeriod,
-            challengeAmount,
-            frontRunnerPeriod
-        );
-        emit UltimateOracleCreation(
-            msg.sender,
-            ultimateOracle,
-            oracle,
-            collateralToken,
-            spreadMultiplier,
-            challengePeriod,
-            challengeAmount,
-            frontRunnerPeriod
-        );
-    }
-}
diff --git a/test/compilationTests/gnosis/README.md b/test/compilationTests/gnosis/README.md
deleted file mode 100644
index e939cd261834..000000000000
--- a/test/compilationTests/gnosis/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Gnosis contracts, originally from
-
-https://github.com/gnosis/gnosis-contracts
diff --git a/test/compilationTests/gnosis/Tokens/EtherToken.sol b/test/compilationTests/gnosis/Tokens/EtherToken.sol
deleted file mode 100644
index 8552c72bed2d..000000000000
--- a/test/compilationTests/gnosis/Tokens/EtherToken.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-pragma solidity >=0.0;
-import "../Tokens/StandardToken.sol";
-
-
-/// @title Token contract - Token exchanging Ether 1:1
-/// @author Stefan George - <stefan@gnosis.pm>
-contract EtherToken is StandardToken {
-    using Math for *;
-
-    /*
-     *  Events
-     */
-    event Deposit(address indexed sender, uint value);
-    event Withdrawal(address indexed receiver, uint value);
-
-    /*
-     *  Constants
-     */
-    string public constant name = "Ether Token";
-    string public constant symbol = "ETH";
-    uint8 public constant decimals = 18;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Buys tokens with Ether, exchanging them 1:1
-    function deposit()
-        public
-        payable
-    {
-        balances[msg.sender] = balances[msg.sender].add(msg.value);
-        totalTokens = totalTokens.add(msg.value);
-        emit Deposit(msg.sender, msg.value);
-    }
-
-    /// @dev Sells tokens in exchange for Ether, exchanging them 1:1
-    /// @param value Number of tokens to sell
-    function withdraw(uint value)
-        public
-    {
-        // Balance covers value
-        balances[msg.sender] = balances[msg.sender].sub(value);
-        totalTokens = totalTokens.sub(value);
-        payable(msg.sender).transfer(value);
-        emit Withdrawal(msg.sender, value);
-    }
-}
diff --git a/test/compilationTests/gnosis/Tokens/OutcomeToken.sol b/test/compilationTests/gnosis/Tokens/OutcomeToken.sol
deleted file mode 100644
index ed63541db23c..000000000000
--- a/test/compilationTests/gnosis/Tokens/OutcomeToken.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-pragma solidity >=0.0;
-import "../Tokens/StandardToken.sol";
-
-
-/// @title Outcome token contract - Issuing and revoking outcome tokens
-/// @author Stefan George - <stefan@gnosis.pm>
-contract OutcomeToken is StandardToken {
-    using Math for *;
-
-    /*
-     *  Events
-     */
-    event Issuance(address indexed owner, uint amount);
-    event Revocation(address indexed owner, uint amount);
-
-    /*
-     *  Storage
-     */
-    address public eventContract;
-
-    /*
-     *  Modifiers
-     */
-    modifier isEventContract () {
-        // Only event contract is allowed to proceed
-        require(msg.sender == eventContract);
-        _;
-    }
-
-    /*
-     *  Public functions
-     */
-    /// @dev Constructor sets events contract address
-    constructor()
-    {
-        eventContract = msg.sender;
-    }
-
-    /// @dev Events contract issues new tokens for address. Returns success
-    /// @param _for Address of receiver
-    /// @param outcomeTokenCount Number of tokens to issue
-    function issue(address _for, uint outcomeTokenCount)
-        public
-        isEventContract
-    {
-        balances[_for] = balances[_for].add(outcomeTokenCount);
-        totalTokens = totalTokens.add(outcomeTokenCount);
-        emit Issuance(_for, outcomeTokenCount);
-    }
-
-    /// @dev Events contract revokes tokens for address. Returns success
-    /// @param _for Address of token holder
-    /// @param outcomeTokenCount Number of tokens to revoke
-    function revoke(address _for, uint outcomeTokenCount)
-        public
-        isEventContract
-    {
-        balances[_for] = balances[_for].sub(outcomeTokenCount);
-        totalTokens = totalTokens.sub(outcomeTokenCount);
-        emit Revocation(_for, outcomeTokenCount);
-    }
-}
diff --git a/test/compilationTests/gnosis/Tokens/StandardToken.sol b/test/compilationTests/gnosis/Tokens/StandardToken.sol
deleted file mode 100644
index b7073115ab20..000000000000
--- a/test/compilationTests/gnosis/Tokens/StandardToken.sol
+++ /dev/null
@@ -1,108 +0,0 @@
-pragma solidity >=0.0;
-import "../Tokens/Token.sol";
-import "../Utils/Math.sol";
-
-
-/// @title Standard token contract with overflow protection
-contract StandardToken is Token {
-    using Math for *;
-
-    /*
-     *  Storage
-     */
-    mapping (address => uint) balances;
-    mapping (address => mapping (address => uint)) allowances;
-    uint totalTokens;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Transfers sender's tokens to a given address. Returns success
-    /// @param to Address of token receiver
-    /// @param value Number of tokens to transfer
-    /// @return Was transfer successful?
-    function transfer(address to, uint value)
-        public
-        override
-        returns (bool)
-    {
-        if (   !balances[msg.sender].safeToSub(value)
-            || !balances[to].safeToAdd(value))
-            return false;
-        balances[msg.sender] -= value;
-        balances[to] += value;
-        emit Transfer(msg.sender, to, value);
-        return true;
-    }
-
-    /// @dev Allows allowed third party to transfer tokens from one address to another. Returns success
-    /// @param from Address from where tokens are withdrawn
-    /// @param to Address to where tokens are sent
-    /// @param value Number of tokens to transfer
-    /// @return Was transfer successful?
-    function transferFrom(address from, address to, uint value)
-        public
-        override
-        returns (bool)
-    {
-        if (   !balances[from].safeToSub(value)
-            || !allowances[from][msg.sender].safeToSub(value)
-            || !balances[to].safeToAdd(value))
-            return false;
-        balances[from] -= value;
-        allowances[from][msg.sender] -= value;
-        balances[to] += value;
-        emit Transfer(from, to, value);
-        return true;
-    }
-
-    /// @dev Sets approved amount of tokens for spender. Returns success
-    /// @param spender Address of allowed account
-    /// @param value Number of approved tokens
-    /// @return Was approval successful?
-    function approve(address spender, uint value)
-        public
-        override
-        returns (bool)
-    {
-        allowances[msg.sender][spender] = value;
-        emit Approval(msg.sender, spender, value);
-        return true;
-    }
-
-    /// @dev Returns number of allowed tokens for given address
-    /// @param owner Address of token owner
-    /// @param spender Address of token spender
-    /// @return Remaining allowance for spender
-    function allowance(address owner, address spender)
-        public
-        override
-        view
-        returns (uint)
-    {
-        return allowances[owner][spender];
-    }
-
-    /// @dev Returns number of tokens owned by given address
-    /// @param owner Address of token owner
-    /// @return Balance of owner
-    function balanceOf(address owner)
-        public
-        override
-        view
-        returns (uint)
-    {
-        return balances[owner];
-    }
-
-    /// @dev Returns total supply of tokens
-    /// @return Total supply
-    function totalSupply()
-        public
-        override
-        view
-        returns (uint)
-    {
-        return totalTokens;
-    }
-}
diff --git a/test/compilationTests/gnosis/Tokens/Token.sol b/test/compilationTests/gnosis/Tokens/Token.sol
deleted file mode 100644
index 7241094d6d9a..000000000000
--- a/test/compilationTests/gnosis/Tokens/Token.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-/// Implements ERC 20 Token standard: https://github.com/ethereum/EIPs/issues/20
-pragma solidity >=0.0;
-
-
-/// @title Abstract token contract - Functions to be implemented by token contracts
-abstract contract Token {
-
-    /*
-     *  Events
-     */
-    event Transfer(address indexed from, address indexed to, uint value);
-    event Approval(address indexed owner, address indexed spender, uint value);
-
-    /*
-     *  Public functions
-     */
-    function transfer(address to, uint value) virtual public returns (bool);
-    function transferFrom(address from, address to, uint value) virtual public returns (bool);
-    function approve(address spender, uint value) virtual public returns (bool);
-    function balanceOf(address owner) virtual public view returns (uint);
-    function allowance(address owner, address spender) virtual public view returns (uint);
-    function totalSupply() virtual public view returns (uint);
-}
diff --git a/test/compilationTests/gnosis/Utils/Math.sol b/test/compilationTests/gnosis/Utils/Math.sol
deleted file mode 100644
index bcae29b6a87a..000000000000
--- a/test/compilationTests/gnosis/Utils/Math.sol
+++ /dev/null
@@ -1,340 +0,0 @@
-pragma solidity >=0.0;
-
-
-/// @title Math library - Allows calculation of logarithmic and exponential functions
-/// @author Alan Lu - <alan.lu@gnosis.pm>
-/// @author Stefan George - <stefan@gnosis.pm>
-library Math {
-
-    /*
-     *  Constants
-     */
-    // This is equal to 1 in our calculations
-    uint public constant ONE =  0x10000000000000000;
-    uint public constant LN2 = 0xb17217f7d1cf79ac;
-    uint public constant LOG2_E = 0x171547652b82fe177;
-
-    /*
-     *  Public functions
-     */
-    /// @dev Returns natural exponential function value of given x
-    /// @param x x
-    /// @return e**x
-    function exp(int x)
-        public
-        pure
-        returns (uint)
-    {
-        // revert if x is > MAX_POWER, where
-        // MAX_POWER = int(mp.floor(mp.log(mpf(2**256 - 1) / ONE) * ONE))
-        require(x <= 2454971259878909886679);
-        // return 0 if exp(x) is tiny, using
-        // MIN_POWER = int(mp.floor(mp.log(mpf(1) / ONE) * ONE))
-        if (x < -818323753292969962227)
-            return 0;
-        // Transform so that e^x -> 2^x
-        x = x * int(ONE) / int(LN2);
-        // 2^x = 2^whole(x) * 2^frac(x)
-        //       ^^^^^^^^^^ is a bit shift
-        // so Taylor expand on z = frac(x)
-        int shift;
-        uint z;
-        if (x >= 0) {
-            shift = x / int(ONE);
-            z = uint(x % int(ONE));
-        }
-        else {
-            shift = x / int(ONE) - 1;
-            z = ONE - uint(-x % int(ONE));
-        }
-        // 2^x = 1 + (ln 2) x + (ln 2)^2/2! x^2 + ...
-        //
-        // Can generate the z coefficients using mpmath and the following lines
-        // >>> from mpmath import mp
-        // >>> mp.dps = 100
-        // >>> ONE =  0x10000000000000000
-        // >>> print('\n'.join(hex(int(mp.log(2)**i / mp.factorial(i) * ONE)) for i in range(1, 7)))
-        // 0xb17217f7d1cf79ab
-        // 0x3d7f7bff058b1d50
-        // 0xe35846b82505fc5
-        // 0x276556df749cee5
-        // 0x5761ff9e299cc4
-        // 0xa184897c363c3
-        uint zpow = z;
-        uint result = ONE;
-        result += 0xb17217f7d1cf79ab * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x3d7f7bff058b1d50 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0xe35846b82505fc5 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x276556df749cee5 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x5761ff9e299cc4 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0xa184897c363c3 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0xffe5fe2c4586 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x162c0223a5c8 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x1b5253d395e * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x1e4cf5158b * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x1e8cac735 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x1c3bd650 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x1816193 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x131496 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0xe1b7 * zpow / ONE;
-        zpow = zpow * z / ONE;
-        result += 0x9c7 * zpow / ONE;
-        if (shift >= 0) {
-            if (result >> uint(256 - shift) > 0)
-                return (2 ** 256 - 1);
-            return result << uint(shift);
-        }
-        else
-            return result >> uint(-shift);
-    }
-
-    /// @dev Returns natural logarithm value of given x
-    /// @param x x
-    /// @return ln(x)
-    function ln(uint x)
-        public
-        pure
-        returns (int)
-    {
-        require(x > 0);
-        // binary search for floor(log2(x))
-        int ilog2 = floorLog2(x);
-        int z;
-        if (ilog2 < 0)
-            z = int(x << uint(-ilog2));
-        else
-            z = int(x >> uint(ilog2));
-        // z = x * 2^-⌊log₂x⌋
-        // so 1 <= z < 2
-        // and ln z = ln x - ⌊log₂x⌋/log₂e
-        // so just compute ln z using artanh series
-        // and calculate ln x from that
-        int term = (z - int(ONE)) * int(ONE) / (z + int(ONE));
-        int halflnz = term;
-        int termpow = term * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 3;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 5;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 7;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 9;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 11;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 13;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 15;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 17;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 19;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 21;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 23;
-        termpow = termpow * term / int(ONE) * term / int(ONE);
-        halflnz += termpow / 25;
-        return (ilog2 * int(ONE)) * int(ONE) / int(LOG2_E) + 2 * halflnz;
-    }
-
-    /// @dev Returns base 2 logarithm value of given x
-    /// @param x x
-    /// @return lo logarithmic value
-    function floorLog2(uint x)
-        public
-        pure
-        returns (int lo)
-    {
-        lo = -64;
-        int hi = 193;
-        // I use a shift here instead of / 2 because it floors instead of rounding towards 0
-        int mid = (hi + lo) >> 1;
-        while((lo + 1) < hi) {
-            if (mid < 0 && x << uint(-mid) < ONE || mid >= 0 && x >> uint(mid) < ONE)
-                hi = mid;
-            else
-                lo = mid;
-            mid = (hi + lo) >> 1;
-        }
-    }
-
-    /// @dev Returns maximum of an array
-    /// @param nums Numbers to look through
-    /// @return max Maximum number
-    function max(int[] memory nums)
-        public
-        pure
-        returns (int max)
-    {
-        require(nums.length > 0);
-        max = -2**255;
-        for (uint i = 0; i < nums.length; i++)
-            if (nums[i] > max)
-                max = nums[i];
-    }
-
-    /// @dev Returns whether an add operation causes an overflow
-    /// @param a First addend
-    /// @param b Second addend
-    /// @return Did no overflow occur?
-    function safeToAdd(uint a, uint b)
-        public
-        pure
-        returns (bool)
-    {
-        return a + b >= a;
-    }
-
-    /// @dev Returns whether a subtraction operation causes an underflow
-    /// @param a Minuend
-    /// @param b Subtrahend
-    /// @return Did no underflow occur?
-    function safeToSub(uint a, uint b)
-        public
-        pure
-        returns (bool)
-    {
-        return a >= b;
-    }
-
-    /// @dev Returns whether a multiply operation causes an overflow
-    /// @param a First factor
-    /// @param b Second factor
-    /// @return Did no overflow occur?
-    function safeToMul(uint a, uint b)
-        public
-        pure
-        returns (bool)
-    {
-        return b == 0 || a * b / b == a;
-    }
-
-    /// @dev Returns sum if no overflow occurred
-    /// @param a First addend
-    /// @param b Second addend
-    /// @return Sum
-    function add(uint a, uint b)
-        public
-        pure
-        returns (uint)
-    {
-        require(safeToAdd(a, b));
-        return a + b;
-    }
-
-    /// @dev Returns difference if no overflow occurred
-    /// @param a Minuend
-    /// @param b Subtrahend
-    /// @return Difference
-    function sub(uint a, uint b)
-        public
-        pure
-        returns (uint)
-    {
-        require(safeToSub(a, b));
-        return a - b;
-    }
-
-    /// @dev Returns product if no overflow occurred
-    /// @param a First factor
-    /// @param b Second factor
-    /// @return Product
-    function mul(uint a, uint b)
-        public
-        pure
-        returns (uint)
-    {
-        require(safeToMul(a, b));
-        return a * b;
-    }
-
-    /// @dev Returns whether an add operation causes an overflow
-    /// @param a First addend
-    /// @param b Second addend
-    /// @return Did no overflow occur?
-    function safeToAdd(int a, int b)
-        public
-        pure
-        returns (bool)
-    {
-        return (b >= 0 && a + b >= a) || (b < 0 && a + b < a);
-    }
-
-    /// @dev Returns whether a subtraction operation causes an underflow
-    /// @param a Minuend
-    /// @param b Subtrahend
-    /// @return Did no underflow occur?
-    function safeToSub(int a, int b)
-        public
-        pure
-        returns (bool)
-    {
-        return (b >= 0 && a - b <= a) || (b < 0 && a - b > a);
-    }
-
-    /// @dev Returns whether a multiply operation causes an overflow
-    /// @param a First factor
-    /// @param b Second factor
-    /// @return Did no overflow occur?
-    function safeToMul(int a, int b)
-        public
-        pure
-        returns (bool)
-    {
-        return (b == 0) || (a * b / b == a);
-    }
-
-    /// @dev Returns sum if no overflow occurred
-    /// @param a First addend
-    /// @param b Second addend
-    /// @return Sum
-    function add(int a, int b)
-        public
-        pure
-        returns (int)
-    {
-        require(safeToAdd(a, b));
-        return a + b;
-    }
-
-    /// @dev Returns difference if no overflow occurred
-    /// @param a Minuend
-    /// @param b Subtrahend
-    /// @return Difference
-    function sub(int a, int b)
-        public
-        pure
-        returns (int)
-    {
-        require(safeToSub(a, b));
-        return a - b;
-    }
-
-    /// @dev Returns product if no overflow occurred
-    /// @param a First factor
-    /// @param b Second factor
-    /// @return Product
-    function mul(int a, int b)
-        public
-        pure
-        returns (int)
-    {
-        require(safeToMul(a, b));
-        return a * b;
-    }
-}
diff --git a/test/compilationTests/milestonetracker/LICENSE b/test/compilationTests/milestonetracker/LICENSE
deleted file mode 100644
index 733c072369ca..000000000000
--- a/test/compilationTests/milestonetracker/LICENSE
+++ /dev/null
@@ -1,675 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
diff --git a/test/compilationTests/milestonetracker/MilestoneTracker.sol b/test/compilationTests/milestonetracker/MilestoneTracker.sol
deleted file mode 100644
index 2aee9f4cf443..000000000000
--- a/test/compilationTests/milestonetracker/MilestoneTracker.sol
+++ /dev/null
@@ -1,367 +0,0 @@
-pragma solidity >=0.0;
-
-/*
-    Copyright 2016, Jordi Baylina
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/// @title MilestoneTracker Contract
-/// @author Jordi Baylina
-/// @dev This contract tracks the
-
-
-/// is rules the relation between a donor and a recipient
-///  in order to guaranty to the donor that the job will be done and to guaranty
-///  to the recipient that he will be paid
-
-
-/// @dev We use the RLP library to decode RLP so that the donor can approve one
-///  set of milestone changes at a time.
-///  https://github.com/androlo/standard-contracts/blob/master/contracts/src/codec/RLP.sol
-import "RLP.sol";
-
-
-
-/// @dev This contract allows for `recipient` to set and modify milestones
-contract MilestoneTracker {
-    using RLP for RLP.RLPItem;
-    using RLP for RLP.Iterator;
-    using RLP for bytes;
-
-    struct Milestone {
-        string description;     // Description of this milestone
-        string url;             // A link to more information (swarm gateway)
-        uint minCompletionDate; // Earliest UNIX time the milestone can be paid
-        uint maxCompletionDate; // Latest UNIX time the milestone can be paid
-        address milestoneLeadLink;
-                                // Similar to `recipient`but for this milestone
-        address reviewer;       // Can reject the completion of this milestone
-        uint reviewTime;        // How many seconds the reviewer has to review
-        address paymentSource;  // Where the milestone payment is sent from
-        bytes payData;          // Data defining how much ether is sent where
-
-        MilestoneStatus status; // Current status of the milestone
-                                // (Completed, AuthorizedForPayment...)
-        uint doneTime;          // UNIX time when the milestone was marked DONE
-    }
-
-    // The list of all the milestones.
-    Milestone[] public milestones;
-
-    address public recipient;   // Calls functions in the name of the recipient
-    address public donor;       // Calls functions in the name of the donor
-    address public arbitrator;  // Calls functions in the name of the arbitrator
-
-    enum MilestoneStatus {
-        AcceptedAndInProgress,
-        Completed,
-        AuthorizedForPayment,
-        Canceled
-    }
-
-    // True if the campaign has been canceled
-    bool public campaignCanceled;
-
-    // True if an approval on a change to `milestones` is a pending
-    bool public changingMilestones;
-
-    // The pending change to `milestones` encoded in RLP
-    bytes public proposedMilestones;
-
-
-    /// @dev The following modifiers only allow specific roles to call functions
-    /// with these modifiers
-    modifier onlyRecipient { if (msg.sender !=  recipient) revert(); _; }
-    modifier onlyArbitrator { if (msg.sender != arbitrator) revert(); _; }
-    modifier onlyDonor { if (msg.sender != donor) revert(); _; }
-
-    /// @dev The following modifiers prevent functions from being called if the
-    /// campaign has been canceled or if new milestones are being proposed
-    modifier campaignNotCanceled { if (campaignCanceled) revert(); _; }
-    modifier notChanging { if (changingMilestones) revert(); _; }
-
- // @dev Events to make the payment movements easy to find on the blockchain
-    event NewMilestoneListProposed();
-    event NewMilestoneListUnproposed();
-    event NewMilestoneListAccepted();
-    event ProposalStatusChanged(uint idProposal, MilestoneStatus newProposal);
-    event CampaignCanceled();
-
-
-///////////
-// Constructor
-///////////
-
-    /// @notice The Constructor creates the Milestone contract on the blockchain
-    /// @param _arbitrator Address assigned to be the arbitrator
-    /// @param _donor Address assigned to be the donor
-    /// @param _recipient Address assigned to be the recipient
-    constructor (
-        address _arbitrator,
-        address _donor,
-        address _recipient
-    ) {
-        arbitrator = _arbitrator;
-        donor = _donor;
-        recipient = _recipient;
-    }
-
-
-/////////
-// Helper functions
-/////////
-
-    /// @return The number of milestones ever created even if they were canceled
-    function numberOfMilestones() public view returns (uint) {
-        return milestones.length;
-    }
-
-
-////////
-// Change players
-////////
-
-    /// @notice `onlyArbitrator` Reassigns the arbitrator to a new address
-    /// @param _newArbitrator The new arbitrator
-    function changeArbitrator(address _newArbitrator) public onlyArbitrator {
-        arbitrator = _newArbitrator;
-    }
-
-    /// @notice `onlyDonor` Reassigns the `donor` to a new address
-    /// @param _newDonor The new donor
-    function changeDonor(address _newDonor) public onlyDonor {
-        donor = _newDonor;
-    }
-
-    /// @notice `onlyRecipient` Reassigns the `recipient` to a new address
-    /// @param _newRecipient The new recipient
-    function changeRecipient(address _newRecipient) public onlyRecipient {
-        recipient = _newRecipient;
-    }
-
-
-////////////
-// Creation and modification of Milestones
-////////////
-
-    /// @notice `onlyRecipient` Proposes new milestones or changes old
-    ///  milestones, this will require a user interface to be built up to
-    ///  support this functionality as asks for RLP encoded bytecode to be
-    ///  generated, until this interface is built you can use this script:
-    ///  https://github.com/Giveth/milestonetracker/blob/master/js/milestonetracker_helper.js
-    ///  the functions milestones2bytes and bytes2milestones will enable the
-    ///  recipient to encode and decode a list of milestones, also see
-    ///  https://github.com/Giveth/milestonetracker/blob/master/README.md
-    /// @param _newMilestones The RLP encoded list of milestones; each milestone
-    ///  has these fields:
-    ///       string description,
-    ///       string url,
-    ///       uint minCompletionDate,  // seconds since 1/1/1970 (UNIX time)
-    ///       uint maxCompletionDate,  // seconds since 1/1/1970 (UNIX time)
-    ///       address milestoneLeadLink,
-    ///       address reviewer,
-    ///       uint reviewTime
-    ///       address paymentSource,
-    ///       bytes payData,
-    function proposeMilestones(bytes memory _newMilestones
-    ) public onlyRecipient campaignNotCanceled {
-        proposedMilestones = _newMilestones;
-        changingMilestones = true;
-        emit NewMilestoneListProposed();
-    }
-
-
-////////////
-// Normal actions that will change the state of the milestones
-////////////
-
-    /// @notice `onlyRecipient` Cancels the proposed milestones and reactivates
-    ///  the previous set of milestones
-    function unproposeMilestones() public onlyRecipient campaignNotCanceled {
-        delete proposedMilestones;
-        changingMilestones = false;
-        emit NewMilestoneListUnproposed();
-    }
-
-    /// @notice `onlyDonor` Approves the proposed milestone list
-    /// @param _hashProposals The keccak256() of the proposed milestone list's
-    ///  bytecode; this confirms that the `donor` knows the set of milestones
-    ///  they are approving
-    function acceptProposedMilestones(bytes32 _hashProposals
-    ) public onlyDonor campaignNotCanceled {
-
-        uint i;
-
-        if (!changingMilestones) revert();
-        if (keccak256(proposedMilestones) != _hashProposals) revert();
-
-        // Cancel all the unfinished milestones
-        for (i=0; i<milestones.length; i++) {
-            if (milestones[i].status != MilestoneStatus.AuthorizedForPayment) {
-                milestones[i].status = MilestoneStatus.Canceled;
-            }
-        }
-        // Decode the RLP encoded milestones and add them to the milestones list
-        bytes memory mProposedMilestones = proposedMilestones;
-
-        RLP.RLPItem memory itmProposals = mProposedMilestones.toRLPItem(true);
-
-        if (!itmProposals.isList()) revert();
-
-        RLP.Iterator memory itrProposals = itmProposals.iterator();
-
-        while(itrProposals.hasNext()) {
-
-
-            RLP.RLPItem memory itmProposal = itrProposals.next();
-
-            Milestone storage milestone = milestones.push();
-
-            if (!itmProposal.isList()) revert();
-
-            RLP.Iterator memory itrProposal = itmProposal.iterator();
-
-            milestone.description = itrProposal.next().toAscii();
-            milestone.url = itrProposal.next().toAscii();
-            milestone.minCompletionDate = itrProposal.next().toUint();
-            milestone.maxCompletionDate = itrProposal.next().toUint();
-            milestone.milestoneLeadLink = itrProposal.next().toAddress();
-            milestone.reviewer = itrProposal.next().toAddress();
-            milestone.reviewTime = itrProposal.next().toUint();
-            milestone.paymentSource = itrProposal.next().toAddress();
-            milestone.payData = itrProposal.next().toData();
-
-            milestone.status = MilestoneStatus.AcceptedAndInProgress;
-
-        }
-
-        delete proposedMilestones;
-        changingMilestones = false;
-        emit NewMilestoneListAccepted();
-    }
-
-    /// @notice `onlyRecipientOrLeadLink`Marks a milestone as DONE and
-    ///  ready for review
-    /// @param _idMilestone ID of the milestone that has been completed
-    function markMilestoneComplete(uint _idMilestone)
-        public campaignNotCanceled notChanging
-    {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        if (  (msg.sender != milestone.milestoneLeadLink)
-            &&(msg.sender != recipient))
-            revert();
-        if (milestone.status != MilestoneStatus.AcceptedAndInProgress) revert();
-        if (block.timestamp < milestone.minCompletionDate) revert();
-        if (block.timestamp > milestone.maxCompletionDate) revert();
-        milestone.status = MilestoneStatus.Completed;
-        milestone.doneTime = block.timestamp;
-        emit ProposalStatusChanged(_idMilestone, milestone.status);
-    }
-
-    /// @notice `onlyReviewer` Approves a specific milestone
-    /// @param _idMilestone ID of the milestone that is approved
-    function approveCompletedMilestone(uint _idMilestone)
-        public campaignNotCanceled notChanging
-    {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        if ((msg.sender != milestone.reviewer) ||
-            (milestone.status != MilestoneStatus.Completed)) revert();
-
-        authorizePayment(_idMilestone);
-    }
-
-    /// @notice `onlyReviewer` Rejects a specific milestone's completion and
-    ///  reverts the `milestone.status` back to the `AcceptedAndInProgress`
-    ///  state
-    /// @param _idMilestone ID of the milestone that is being rejected
-    function rejectMilestone(uint _idMilestone)
-        public campaignNotCanceled notChanging
-    {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        if ((msg.sender != milestone.reviewer) ||
-            (milestone.status != MilestoneStatus.Completed)) revert();
-
-        milestone.status = MilestoneStatus.AcceptedAndInProgress;
-        emit ProposalStatusChanged(_idMilestone, milestone.status);
-    }
-
-    /// @notice `onlyRecipientOrLeadLink` Sends the milestone payment as
-    ///  specified in `payData`; the recipient can only call this after the
-    ///  `reviewTime` has elapsed
-    /// @param _idMilestone ID of the milestone to be paid out
-    function requestMilestonePayment(uint _idMilestone
-        ) public campaignNotCanceled notChanging {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        if (  (msg.sender != milestone.milestoneLeadLink)
-            &&(msg.sender != recipient))
-            revert();
-        if  ((milestone.status != MilestoneStatus.Completed) ||
-             (block.timestamp < milestone.doneTime + milestone.reviewTime))
-            revert();
-
-        authorizePayment(_idMilestone);
-    }
-
-    /// @notice `onlyRecipient` Cancels a previously accepted milestone
-    /// @param _idMilestone ID of the milestone to be canceled
-    function cancelMilestone(uint _idMilestone)
-        public onlyRecipient campaignNotCanceled notChanging
-    {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        if  ((milestone.status != MilestoneStatus.AcceptedAndInProgress) &&
-             (milestone.status != MilestoneStatus.Completed))
-            revert();
-
-        milestone.status = MilestoneStatus.Canceled;
-        emit ProposalStatusChanged(_idMilestone, milestone.status);
-    }
-
-    /// @notice `onlyArbitrator` Forces a milestone to be paid out as long as it
-    /// has not been paid or canceled
-    /// @param _idMilestone ID of the milestone to be paid out
-    function arbitrateApproveMilestone(uint _idMilestone
-    ) public onlyArbitrator campaignNotCanceled notChanging {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        if  ((milestone.status != MilestoneStatus.AcceptedAndInProgress) &&
-             (milestone.status != MilestoneStatus.Completed))
-           revert();
-        authorizePayment(_idMilestone);
-    }
-
-    /// @notice `onlyArbitrator` Cancels the entire campaign voiding all
-    ///  milestones.
-    function arbitrateCancelCampaign() public onlyArbitrator campaignNotCanceled {
-        campaignCanceled = true;
-        emit CampaignCanceled();
-    }
-
-    // @dev This internal function is executed when the milestone is paid out
-    function authorizePayment(uint _idMilestone) internal {
-        if (_idMilestone >= milestones.length) revert();
-        Milestone storage milestone = milestones[_idMilestone];
-        // Recheck again to not pay twice
-        if (milestone.status == MilestoneStatus.AuthorizedForPayment) revert();
-        milestone.status = MilestoneStatus.AuthorizedForPayment;
-        (bool success,) = milestone.paymentSource.call{value: 0}(milestone.payData);
-        require(success);
-        emit ProposalStatusChanged(_idMilestone, milestone.status);
-    }
-}
diff --git a/test/compilationTests/milestonetracker/README.md b/test/compilationTests/milestonetracker/README.md
deleted file mode 100644
index 84fb980eafdd..000000000000
--- a/test/compilationTests/milestonetracker/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Giveth milestone tracker, originally from
-
-https://github.com/Giveth/milestonetracker/
diff --git a/test/compilationTests/milestonetracker/RLP.sol b/test/compilationTests/milestonetracker/RLP.sol
deleted file mode 100644
index 03aea6eb7dbf..000000000000
--- a/test/compilationTests/milestonetracker/RLP.sol
+++ /dev/null
@@ -1,411 +0,0 @@
-pragma solidity >=0.0;
-
-/**
-* @title RLPReader
-*
-* RLPReader is used to read and parse RLP encoded data in memory.
-*
-* @author Andreas Olofsson (androlo1980@gmail.com)
-*/
-library RLP {
-
- uint constant DATA_SHORT_START = 0x80;
- uint constant DATA_LONG_START = 0xB8;
- uint constant LIST_SHORT_START = 0xC0;
- uint constant LIST_LONG_START = 0xF8;
-
- uint constant DATA_LONG_OFFSET = 0xB7;
- uint constant LIST_LONG_OFFSET = 0xF7;
-
-
- struct RLPItem {
-     uint _unsafe_memPtr;    // Pointer to the RLP-encoded bytes.
-     uint _unsafe_length;    // Number of bytes. This is the full length of the string.
- }
-
- struct Iterator {
-     RLPItem _unsafe_item;   // Item that's being iterated over.
-     uint _unsafe_nextPtr;   // Position of the next item in the list.
- }
-
- /* Iterator */
-
- function next(Iterator memory self) internal view returns (RLPItem memory subItem) {
-     if(hasNext(self)) {
-         uint ptr = self._unsafe_nextPtr;
-         uint itemLength = _itemLength(ptr);
-         subItem._unsafe_memPtr = ptr;
-         subItem._unsafe_length = itemLength;
-         self._unsafe_nextPtr = ptr + itemLength;
-     }
-     else
-         revert();
- }
-
- function next(Iterator memory self, bool strict) internal view returns (RLPItem memory subItem) {
-     subItem = next(self);
-     if(strict && !_validate(subItem))
-         revert();
- }
-
- function hasNext(Iterator memory self) internal view returns (bool) {
-     RLPItem memory item = self._unsafe_item;
-     return self._unsafe_nextPtr < item._unsafe_memPtr + item._unsafe_length;
- }
-
- /* RLPItem */
-
- /// @dev Creates an RLPItem from an array of RLP encoded bytes.
- /// @param self The RLP encoded bytes.
- /// @return An RLPItem
- function toRLPItem(bytes memory self) internal view returns (RLPItem memory) {
-     uint len = self.length;
-     if (len == 0) {
-         return RLPItem(0, 0);
-     }
-     uint memPtr;
-     assembly {
-         memPtr := add(self, 0x20)
-     }
-     return RLPItem(memPtr, len);
- }
-
- /// @dev Creates an RLPItem from an array of RLP encoded bytes.
- /// @param self The RLP encoded bytes.
- /// @param strict Will throw if the data is not RLP encoded.
- /// @return An RLPItem
- function toRLPItem(bytes memory self, bool strict) internal view returns (RLPItem memory) {
-     RLPItem memory item = toRLPItem(self);
-     if(strict) {
-         uint len = self.length;
-         if(_payloadOffset(item) > len)
-             revert();
-         if(_itemLength(item._unsafe_memPtr) != len)
-             revert();
-         if(!_validate(item))
-             revert();
-     }
-     return item;
- }
-
- /// @dev Check if the RLP item is null.
- /// @param self The RLP item.
- /// @return ret 'true' if the item is null.
- function isNull(RLPItem memory self) internal view returns (bool ret) {
-     return self._unsafe_length == 0;
- }
-
- /// @dev Check if the RLP item is a list.
- /// @param self The RLP item.
- /// @return ret 'true' if the item is a list.
- function isList(RLPItem memory self) internal view returns (bool ret) {
-     if (self._unsafe_length == 0)
-         return false;
-     uint memPtr = self._unsafe_memPtr;
-     assembly {
-         ret := iszero(lt(byte(0, mload(memPtr)), 0xC0))
-     }
- }
-
- /// @dev Check if the RLP item is data.
- /// @param self The RLP item.
- /// @return ret 'true' if the item is data.
- function isData(RLPItem memory self) internal view returns (bool ret) {
-     if (self._unsafe_length == 0)
-         return false;
-     uint memPtr = self._unsafe_memPtr;
-     assembly {
-         ret := lt(byte(0, mload(memPtr)), 0xC0)
-     }
- }
-
- /// @dev Check if the RLP item is empty (string or list).
- /// @param self The RLP item.
- /// @return ret 'true' if the item is null.
- function isEmpty(RLPItem memory self) internal view returns (bool ret) {
-     if(isNull(self))
-         return false;
-     uint b0;
-     uint memPtr = self._unsafe_memPtr;
-     assembly {
-         b0 := byte(0, mload(memPtr))
-     }
-     return (b0 == DATA_SHORT_START || b0 == LIST_SHORT_START);
- }
-
- /// @dev Get the number of items in an RLP encoded list.
- /// @param self The RLP item.
- /// @return The number of items.
- function items(RLPItem memory self) internal view returns (uint) {
-     if (!isList(self))
-         return 0;
-     uint b0;
-     uint memPtr = self._unsafe_memPtr;
-     assembly {
-         b0 := byte(0, mload(memPtr))
-     }
-     uint pos = memPtr + _payloadOffset(self);
-     uint last = memPtr + self._unsafe_length - 1;
-     uint itms;
-     while(pos <= last) {
-         pos += _itemLength(pos);
-         itms++;
-     }
-     return itms;
- }
-
- /// @dev Create an iterator.
- /// @param self The RLP item.
- /// @return it An 'Iterator' over the item.
- function iterator(RLPItem memory self) internal view returns (Iterator memory it) {
-     if (!isList(self))
-         revert();
-     uint ptr = self._unsafe_memPtr + _payloadOffset(self);
-     it._unsafe_item = self;
-     it._unsafe_nextPtr = ptr;
- }
-
- /// @dev Return the RLP encoded bytes.
- /// @param self The RLPItem.
- /// @return bts The bytes.
- function toBytes(RLPItem memory self) internal returns (bytes memory bts) {
-     uint len = self._unsafe_length;
-     if (len != 0)
-     {
-         bts = new bytes(len);
-         _copyToBytes(self._unsafe_memPtr, bts, len);
-     }
- }
-
- /// @dev Decode an RLPItem into bytes. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return bts The decoded string.
- function toData(RLPItem memory self) internal returns (bytes memory bts) {
-     if(!isData(self))
-         revert();
-     (uint rStartPos, uint len) = _decode(self);
-     bts = new bytes(len);
-     _copyToBytes(rStartPos, bts, len);
- }
-
- /// @dev Get the list of sub-items from an RLP encoded list.
- /// Warning: This is inefficient, as it requires that the list is read twice.
- /// @param self The RLP item.
- /// @return list Array of RLPItems.
- function toList(RLPItem memory self) internal view returns (RLPItem[] memory list) {
-     if(!isList(self))
-         revert();
-     uint numItems = items(self);
-     list = new RLPItem[](numItems);
-     Iterator memory it = iterator(self);
-     uint idx;
-     while(hasNext(it)) {
-         list[idx] = next(it);
-         idx++;
-     }
- }
-
- /// @dev Decode an RLPItem into an ascii string. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return str The decoded string.
- function toAscii(RLPItem memory self) internal returns (string memory str) {
-     if(!isData(self))
-         revert();
-     (uint rStartPos, uint len) = _decode(self);
-     bytes memory bts = new bytes(len);
-     _copyToBytes(rStartPos, bts, len);
-     str = string(bts);
- }
-
- /// @dev Decode an RLPItem into a uint. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return data The decoded string.
- function toUint(RLPItem memory self) internal view returns (uint data) {
-     if(!isData(self))
-         revert();
-     (uint rStartPos, uint len) = _decode(self);
-     if (len > 32 || len == 0)
-         revert();
-     assembly {
-         data := div(mload(rStartPos), exp(256, sub(32, len)))
-     }
- }
-
- /// @dev Decode an RLPItem into a boolean. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return data The decoded string.
- function toBool(RLPItem memory self) internal view returns (bool data) {
-     if(!isData(self))
-         revert();
-     (uint rStartPos, uint len) = _decode(self);
-     if (len != 1)
-         revert();
-     uint temp;
-     assembly {
-         temp := byte(0, mload(rStartPos))
-     }
-     if (temp > 1)
-         revert();
-     return temp == 1 ? true : false;
- }
-
- /// @dev Decode an RLPItem into a byte. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return data The decoded string.
- function toByte(RLPItem memory self) internal view returns (bytes1 data) {
-     if(!isData(self))
-         revert();
-     (uint rStartPos, uint len) = _decode(self);
-     if (len != 1)
-         revert();
-     uint8 temp;
-     assembly {
-         temp := byte(0, mload(rStartPos))
-     }
-     return bytes1(temp);
- }
-
- /// @dev Decode an RLPItem into an int. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return data The decoded string.
- function toInt(RLPItem memory self) internal view returns (int data) {
-     return int(toUint(self));
- }
-
- /// @dev Decode an RLPItem into a bytes32. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return data The decoded string.
- function toBytes32(RLPItem memory self) internal view returns (bytes32 data) {
-     return bytes32(toUint(self));
- }
-
- /// @dev Decode an RLPItem into an address. This will not work if the
- /// RLPItem is a list.
- /// @param self The RLPItem.
- /// @return data The decoded string.
- function toAddress(RLPItem memory self) internal view returns (address data) {
-     if(!isData(self))
-         revert();
-     (uint rStartPos, uint len) = _decode(self);
-     if (len != 20)
-         revert();
-     assembly {
-         data := div(mload(rStartPos), exp(256, 12))
-     }
- }
-
- // Get the payload offset.
- function _payloadOffset(RLPItem memory self) private view returns (uint) {
-     if(self._unsafe_length == 0)
-         return 0;
-     uint b0;
-     uint memPtr = self._unsafe_memPtr;
-     assembly {
-         b0 := byte(0, mload(memPtr))
-     }
-     if(b0 < DATA_SHORT_START)
-         return 0;
-     if(b0 < DATA_LONG_START || (b0 >= LIST_SHORT_START && b0 < LIST_LONG_START))
-         return 1;
-     if(b0 < LIST_SHORT_START)
-         return b0 - DATA_LONG_OFFSET + 1;
-     return b0 - LIST_LONG_OFFSET + 1;
- }
-
- // Get the full length of an RLP item.
- function _itemLength(uint memPtr) private view returns (uint len) {
-     uint b0;
-     assembly {
-         b0 := byte(0, mload(memPtr))
-     }
-     if (b0 < DATA_SHORT_START)
-         len = 1;
-     else if (b0 < DATA_LONG_START)
-         len = b0 - DATA_SHORT_START + 1;
-     else if (b0 < LIST_SHORT_START) {
-         assembly {
-             let bLen := sub(b0, 0xB7) // bytes length (DATA_LONG_OFFSET)
-             let dLen := div(mload(add(memPtr, 1)), exp(256, sub(32, bLen))) // data length
-             len := add(1, add(bLen, dLen)) // total length
-         }
-     }
-     else if (b0 < LIST_LONG_START)
-         len = b0 - LIST_SHORT_START + 1;
-     else {
-         assembly {
-             let bLen := sub(b0, 0xF7) // bytes length (LIST_LONG_OFFSET)
-             let dLen := div(mload(add(memPtr, 1)), exp(256, sub(32, bLen))) // data length
-             len := add(1, add(bLen, dLen)) // total length
-         }
-     }
- }
-
- // Get start position and length of the data.
- function _decode(RLPItem memory self) private view returns (uint memPtr, uint len) {
-     if(!isData(self))
-         revert();
-     uint b0;
-     uint start = self._unsafe_memPtr;
-     assembly {
-         b0 := byte(0, mload(start))
-     }
-     if (b0 < DATA_SHORT_START) {
-         memPtr = start;
-         len = 1;
-     }
-     else if (b0 < DATA_LONG_START) {
-         len = self._unsafe_length - 1;
-         memPtr = start + 1;
-     } else {
-         uint bLen;
-         assembly {
-             bLen := sub(b0, 0xB7) // DATA_LONG_OFFSET
-         }
-         len = self._unsafe_length - 1 - bLen;
-         memPtr = start + bLen + 1;
-     }
- }
-
- // Assumes that enough memory has been allocated to store in target.
- function _copyToBytes(uint btsPtr, bytes memory tgt, uint btsLen) private {
-     // Exploiting the fact that 'tgt' was the last thing to be allocated,
-     // we can write entire words, and just overwrite any excess.
-     assembly {
-         {
-                 let words := div(add(btsLen, 31), 32)
-                 let rOffset := btsPtr
-                 let wOffset := add(tgt, 0x20)
-
-                 // Start at arr + 0x20
-                 for { let i := 0 } not(eq(i, words)) { i := add(i, 1) }
-                 {
-                     let offset := mul(i, 0x20)
-                     mstore(add(wOffset, offset), mload(add(rOffset, offset)))
-                 }
-                 mstore(add(tgt, add(0x20, mload(tgt))), 0)
-         }
-     }
- }
-
- // Check that an RLP item is valid.
-     function _validate(RLPItem memory self) private view returns (bool ret) {
-         // Check that RLP is well-formed.
-         uint b0;
-         uint b1;
-         uint memPtr = self._unsafe_memPtr;
-         assembly {
-             b0 := byte(0, mload(memPtr))
-             b1 := byte(1, mload(memPtr))
-         }
-         if(b0 == DATA_SHORT_START + 1 && b1 < DATA_SHORT_START)
-             return false;
-         return true;
-     }
-}
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
deleted file mode 100644
index 8d0b1ccb640d..000000000000
--- a/test/contracts/AuctionRegistrar.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Tests for a fixed fee registrar contract.
- */
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <test/contracts/ContractInterface.h>
-#include <test/EVMHost.h>
-
-#include <libsolutil/LazyInit.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-#include <optional>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-static char const* registrarCode = R"DELIMITER(
-pragma solidity >=0.7.0 <0.9.0;
-
-abstract contract NameRegister {
-	function addr(string memory _name) public virtual view returns (address o_owner);
-	function name(address _owner) public view virtual returns (string memory o_name);
-}
-
-abstract contract Registrar is NameRegister {
-	event Changed(string indexed name);
-	event PrimaryChanged(string indexed name, address indexed addr);
-
-	function owner(string memory _name) public view virtual returns (address o_owner);
-	function addr(string memory _name) public virtual override view returns (address o_address);
-	function subRegistrar(string memory _name) public virtual view returns (address o_subRegistrar);
-	function content(string memory _name) public virtual view returns (bytes32 o_content);
-
-	function name(address _owner) public virtual override view returns (string memory o_name);
-}
-
-abstract contract AuctionSystem {
-	event AuctionEnded(string indexed _name, address _winner);
-	event NewBid(string indexed _name, address _bidder, uint _value);
-
-	/// Function that is called once an auction ends.
-	function onAuctionEnd(string memory _name) internal virtual;
-
-	function bid(string memory _name, address payable _bidder, uint _value) internal {
-		Auction storage auction = m_auctions[_name];
-		if (auction.endDate > 0 && block.timestamp > auction.endDate)
-		{
-			emit AuctionEnded(_name, auction.highestBidder);
-			onAuctionEnd(_name);
-			delete m_auctions[_name];
-			return;
-		}
-		if (msg.value > auction.highestBid)
-		{
-			// new bid on auction
-			auction.secondHighestBid = auction.highestBid;
-			auction.sumOfBids += _value;
-			auction.highestBid = _value;
-			auction.highestBidder = _bidder;
-			auction.endDate = block.timestamp + c_biddingTime;
-
-			emit NewBid(_name, _bidder, _value);
-		}
-	}
-
-	uint constant c_biddingTime = 7 days;
-
-	struct Auction {
-		address payable highestBidder;
-		uint highestBid;
-		uint secondHighestBid;
-		uint sumOfBids;
-		uint endDate;
-	}
-	mapping(string => Auction) m_auctions;
-}
-
-contract GlobalRegistrar is Registrar, AuctionSystem {
-	struct Record {
-		address payable owner;
-		address primary;
-		address subRegistrar;
-		bytes32 content;
-		uint renewalDate;
-	}
-
-	uint constant c_renewalInterval = 365 days;
-	uint constant c_freeBytes = 12;
-
-	constructor() {
-		// TODO: Populate with hall-of-fame.
-	}
-
-	function onAuctionEnd(string memory _name) internal override {
-		Auction storage auction = m_auctions[_name];
-		Record storage record = m_toRecord[_name];
-		address previousOwner = record.owner;
-		record.renewalDate = block.timestamp + c_renewalInterval;
-		record.owner = auction.highestBidder;
-		emit Changed(_name);
-		if (previousOwner != 0x0000000000000000000000000000000000000000) {
-			if (!record.owner.send(auction.sumOfBids - auction.highestBid / 100))
-				revert();
-		} else {
-			if (!auction.highestBidder.send(auction.highestBid - auction.secondHighestBid))
-				revert();
-		}
-	}
-
-	function reserve(string calldata _name) external payable {
-		if (bytes(_name).length == 0)
-			revert();
-		bool needAuction = requiresAuction(_name);
-		if (needAuction)
-		{
-			if (block.timestamp < m_toRecord[_name].renewalDate)
-				revert();
-			bid(_name, payable(msg.sender), msg.value);
-		} else {
-			Record storage record = m_toRecord[_name];
-			if (record.owner != 0x0000000000000000000000000000000000000000)
-				revert();
-			m_toRecord[_name].owner = payable(msg.sender);
-			emit Changed(_name);
-		}
-	}
-
-	function requiresAuction(string memory _name) internal returns (bool) {
-		return bytes(_name).length < c_freeBytes;
-	}
-
-	modifier onlyrecordowner(string memory _name) { if (m_toRecord[_name].owner == msg.sender) _; }
-
-	function transfer(string memory _name, address payable _newOwner) onlyrecordowner(_name) public {
-		m_toRecord[_name].owner = _newOwner;
-		emit Changed(_name);
-	}
-
-	function disown(string memory _name) onlyrecordowner(_name) public {
-		if (stringsEqual(m_toName[m_toRecord[_name].primary], _name))
-		{
-			emit PrimaryChanged(_name, m_toRecord[_name].primary);
-			m_toName[m_toRecord[_name].primary] = "";
-		}
-		delete m_toRecord[_name];
-		emit Changed(_name);
-	}
-
-	function setAddress(string memory _name, address _a, bool _primary) onlyrecordowner(_name) public {
-		m_toRecord[_name].primary = _a;
-		if (_primary)
-		{
-			emit PrimaryChanged(_name, _a);
-			m_toName[_a] = _name;
-		}
-		emit Changed(_name);
-	}
-	function setSubRegistrar(string memory _name, address _registrar) onlyrecordowner(_name) public {
-		m_toRecord[_name].subRegistrar = _registrar;
-		emit Changed(_name);
-	}
-	function setContent(string memory _name, bytes32 _content) onlyrecordowner(_name) public {
-		m_toRecord[_name].content = _content;
-		emit Changed(_name);
-	}
-
-	function stringsEqual(string storage _a, string memory _b) internal returns (bool) {
-		bytes storage a = bytes(_a);
-		bytes memory b = bytes(_b);
-		if (a.length != b.length)
-			return false;
-		// @todo unroll this loop
-		for (uint i = 0; i < a.length; i ++)
-			if (a[i] != b[i])
-				return false;
-		return true;
-	}
-
-	function owner(string memory _name) public override view returns (address) { return m_toRecord[_name].owner; }
-	function addr(string memory _name) public override view returns (address) { return m_toRecord[_name].primary; }
-	function subRegistrar(string memory _name) public override view returns (address) { return m_toRecord[_name].subRegistrar; }
-	function content(string memory _name) public override view returns (bytes32) { return m_toRecord[_name].content; }
-	function name(address _addr) public override view returns (string memory o_name) { return m_toName[_addr]; }
-
-	mapping (address => string) m_toName;
-	mapping (string => Record) m_toRecord;
-}
-)DELIMITER";
-
-static LazyInit<bytes> s_compiledRegistrar;
-
-class AuctionRegistrarTestFramework: public SolidityExecutionFramework
-{
-protected:
-	void deployRegistrar()
-	{
-		bytes const& compiled = s_compiledRegistrar.init([&]{
-			return compileContract(registrarCode, "GlobalRegistrar");
-		});
-
-		sendMessage(compiled, true);
-		BOOST_REQUIRE(m_transactionSuccessful);
-		BOOST_REQUIRE(!m_output.empty());
-	}
-
-	class RegistrarInterface: public ContractInterface
-	{
-	public:
-		RegistrarInterface(SolidityExecutionFramework& _framework): ContractInterface(_framework) {}
-		void reserve(std::string const& _name)
-		{
-			callString("reserve", _name);
-		}
-		h160 owner(std::string const& _name)
-		{
-			return callStringReturnsAddress("owner", _name);
-		}
-		void setAddress(std::string const& _name, h160 const& _address, bool _primary)
-		{
-			callStringAddressBool("setAddress", _name, _address, _primary);
-		}
-		h160 addr(std::string const& _name)
-		{
-			return callStringReturnsAddress("addr", _name);
-		}
-		std::string name(h160 const& _addr)
-		{
-			return callAddressReturnsString("name", _addr);
-		}
-		void setSubRegistrar(std::string const& _name, h160 const& _address)
-		{
-			callStringAddress("setSubRegistrar", _name, _address);
-		}
-		h160 subRegistrar(std::string const& _name)
-		{
-			return callStringReturnsAddress("subRegistrar", _name);
-		}
-		void setContent(std::string const& _name, h256 const& _content)
-		{
-			callStringBytes32("setContent", _name, _content);
-		}
-		h256 content(std::string const& _name)
-		{
-			return callStringReturnsBytes32("content", _name);
-		}
-		void transfer(std::string const& _name, h160 const& _target)
-		{
-			return callStringAddress("transfer", _name, _target);
-		}
-		void disown(std::string const& _name)
-		{
-			return callString("disown", _name);
-		}
-	};
-
-	int64_t const m_biddingTime = 7 * 24 * 3600;
-};
-
-}
-
-/// This is a test suite that tests optimised code!
-BOOST_FIXTURE_TEST_SUITE(SolidityAuctionRegistrar, AuctionRegistrarTestFramework)
-
-BOOST_AUTO_TEST_CASE(creation)
-{
-	deployRegistrar();
-}
-
-BOOST_AUTO_TEST_CASE(reserve)
-{
-	// Test that reserving works for long strings
-	deployRegistrar();
-	std::vector<std::string> names{"abcabcabcabcabc", "defdefdefdefdef", "ghighighighighighighighighighighighighighighi"};
-
-	RegistrarInterface registrar(*this);
-
-	// should not work
-	registrar.reserve("");
-	BOOST_CHECK_EQUAL(registrar.owner(""), h160{});
-
-	for (auto const& name: names)
-	{
-		registrar.reserve(name);
-		BOOST_CHECK_EQUAL(registrar.owner(name), m_sender);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(double_reserve_long)
-{
-	// Test that it is not possible to re-reserve from a different address.
-	deployRegistrar();
-	std::string name = "abcabcabcabcabcabcabcabcabcabca";
-	RegistrarInterface registrar(*this);
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), m_sender);
-
-	sendEther(account(1), u256(10) * ether);
-	m_sender = account(1);
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), account(0));
-}
-
-BOOST_AUTO_TEST_CASE(properties)
-{
-	// Test setting and retrieving  the various properties works.
-	deployRegistrar();
-	RegistrarInterface registrar(*this);
-	std::string names[] = {"abcaeouoeuaoeuaoeu", "defncboagufra,fui", "ghagpyajfbcuajouhaeoi"};
-	size_t addr = 0x9872543;
-	size_t count = 1;
-	for (std::string const& name: names)
-	{
-		m_sender = account(0);
-		sendEther(account(count), u256(20) * ether);
-		m_sender = account(count);
-		auto sender = m_sender;
-		addr += count;
-		// setting by sender works
-		registrar.reserve(name);
-		BOOST_CHECK_EQUAL(registrar.owner(name), sender);
-		registrar.setAddress(name, h160(addr), true);
-		BOOST_CHECK_EQUAL(registrar.addr(name), h160(addr));
-		registrar.setSubRegistrar(name, h160(addr + 20));
-		BOOST_CHECK_EQUAL(registrar.subRegistrar(name), h160(addr + 20));
-		registrar.setContent(name, h256(u256(addr + 90)));
-		BOOST_CHECK_EQUAL(registrar.content(name), h256(u256(addr + 90)));
-
-		// but not by someone else
-		m_sender = account(count - 1);
-		BOOST_CHECK_EQUAL(registrar.owner(name), sender);
-		registrar.setAddress(name, h160(addr + 1), true);
-		BOOST_CHECK_EQUAL(registrar.addr(name), h160(addr));
-		registrar.setSubRegistrar(name, h160(addr + 20 + 1));
-		BOOST_CHECK_EQUAL(registrar.subRegistrar(name), h160(addr + 20));
-		registrar.setContent(name, h256(u256(addr + 90 + 1)));
-		BOOST_CHECK_EQUAL(registrar.content(name), h256(u256(addr + 90)));
-		count++;
-	}
-}
-
-BOOST_AUTO_TEST_CASE(transfer)
-{
-	deployRegistrar();
-	std::string name = "abcaoeguaoucaeoduceo";
-	RegistrarInterface registrar(*this);
-	registrar.reserve(name);
-	registrar.setContent(name, h256(u256(123)));
-	registrar.transfer(name, h160(555));
-	BOOST_CHECK_EQUAL(registrar.owner(name), h160(555));
-	BOOST_CHECK_EQUAL(registrar.content(name), h256(u256(123)));
-}
-
-BOOST_AUTO_TEST_CASE(disown)
-{
-	deployRegistrar();
-	std::string name = "abcaoeguaoucaeoduceo";
-
-	RegistrarInterface registrar(*this);
-	registrar.reserve(name);
-	registrar.setContent(name, h256(u256(123)));
-	registrar.setAddress(name, h160(124), true);
-	registrar.setSubRegistrar(name, h160(125));
-	BOOST_CHECK_EQUAL(registrar.name(h160(124)), name);
-
-	// someone else tries disowning
-	sendEther(account(1), u256(10) * ether);
-	m_sender = account(1);
-	registrar.disown(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), account(0));
-
-	m_sender = account(0);
-	registrar.disown(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), h160());
-	BOOST_CHECK_EQUAL(registrar.addr(name), h160());
-	BOOST_CHECK_EQUAL(registrar.subRegistrar(name), h160());
-	BOOST_CHECK_EQUAL(registrar.content(name), h256());
-	BOOST_CHECK_EQUAL(registrar.name(h160(124)), "");
-}
-
-BOOST_AUTO_TEST_CASE(auction_simple)
-{
-	deployRegistrar();
-	std::string name = "x";
-
-	RegistrarInterface registrar(*this);
-	// initiate auction
-	registrar.setNextValue(8);
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), h160());
-	// "wait" until auction end
-
-	m_evmcHost->tx_context.block_timestamp += m_biddingTime + 10;
-	// trigger auction again
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), m_sender);
-}
-
-BOOST_AUTO_TEST_CASE(auction_bidding)
-{
-	deployRegistrar();
-	std::string name = "x";
-
-	unsigned startTime = 0x776347e2;
-	m_evmcHost->tx_context.block_timestamp = startTime;
-
-	RegistrarInterface registrar(*this);
-	// initiate auction
-	registrar.setNextValue(8);
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), h160());
-	// overbid self
-	m_evmcHost->tx_context.block_timestamp = startTime + m_biddingTime - 10;
-	registrar.setNextValue(12);
-	registrar.reserve(name);
-	// another bid by someone else
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	m_evmcHost->tx_context.block_timestamp = startTime + 2 * m_biddingTime - 50;
-	registrar.setNextValue(13);
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), h160());
-	// end auction by first bidder (which is not highest) trying to overbid again (too late)
-	m_sender = account(0);
-	m_evmcHost->tx_context.block_timestamp = startTime + 4 * m_biddingTime;
-	registrar.setNextValue(20);
-	registrar.reserve(name);
-	BOOST_CHECK_EQUAL(registrar.owner(name), account(1));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/contracts/ContractInterface.h b/test/contracts/ContractInterface.h
deleted file mode 100644
index e50227670e01..000000000000
--- a/test/contracts/ContractInterface.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <boost/test/unit_test.hpp>
-#include <test/ExecutionFramework.h>
-
-#include <functional>
-
-namespace solidity::test
-{
-
-class ContractInterface
-{
-public:
-	ContractInterface(ExecutionFramework& _framework): m_framework(_framework) {}
-
-	void setNextValue(u256 const& _value) { m_nextValue = _value; }
-
-protected:
-	template <class... Args>
-	bytes const& call(std::string const& _sig, Args const&... _arguments)
-	{
-		auto const& ret = m_framework.callContractFunctionWithValue(_sig, m_nextValue, _arguments...);
-		m_nextValue = 0;
-		return ret;
-	}
-
-	void callString(std::string const& _name, std::string const& _arg)
-	{
-		BOOST_CHECK(call(_name + "(string)", u256(0x20), _arg.length(), _arg).empty());
-	}
-
-	void callStringAddress(std::string const& _name, std::string const& _arg1, util::h160 const& _arg2)
-	{
-		BOOST_CHECK(call(_name + "(string,address)", u256(0x40), _arg2, _arg1.length(), _arg1).empty());
-	}
-
-	void callStringAddressBool(std::string const& _name, std::string const& _arg1, util::h160 const& _arg2, bool _arg3)
-	{
-		BOOST_CHECK(call(_name + "(string,address,bool)", u256(0x60), _arg2, _arg3, _arg1.length(), _arg1).empty());
-	}
-
-	void callStringBytes32(std::string const& _name, std::string const& _arg1, util::h256 const& _arg2)
-	{
-		BOOST_CHECK(call(_name + "(string,bytes32)", u256(0x40), _arg2, _arg1.length(), _arg1).empty());
-	}
-
-	util::h160 callStringReturnsAddress(std::string const& _name, std::string const& _arg)
-	{
-		bytes const& ret = call(_name + "(string)", u256(0x20), _arg.length(), _arg);
-		BOOST_REQUIRE(ret.size() == 0x20);
-		BOOST_CHECK(std::count(ret.begin(), ret.begin() + 12, 0) == 12);
-		bytes const addr{ret.begin() + 12, ret.end()};
-		return util::h160(addr);
-	}
-
-	std::string callAddressReturnsString(std::string const& _name, util::h160 const& _arg)
-	{
-		bytesConstRef const ret(&call(_name + "(address)", _arg));
-		BOOST_REQUIRE(ret.size() >= 0x40);
-		u256 offset(util::h256(ret.cropped(0, 0x20)));
-		BOOST_REQUIRE_EQUAL(offset, 0x20);
-		u256 len(util::h256(ret.cropped(0x20, 0x20)));
-		BOOST_REQUIRE_EQUAL(ret.size(), 0x40 + ((len + 0x1f) / 0x20) * 0x20);
-		return ret.cropped(0x40, size_t(len)).toString();
-	}
-
-	util::h256 callStringReturnsBytes32(std::string const& _name, std::string const& _arg)
-	{
-		bytes const& ret = call(_name + "(string)", u256(0x20), _arg.length(), _arg);
-		BOOST_REQUIRE(ret.size() == 0x20);
-		return util::h256(ret);
-	}
-
-private:
-	u256 m_nextValue;
-	ExecutionFramework& m_framework;
-};
-
-} // end namespaces
-
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
deleted file mode 100644
index db9119deebeb..000000000000
--- a/test/contracts/Wallet.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Tests for a (comparatively) complex multisig wallet contract.
- */
-
-#include <libsolutil/LazyInit.h>
-
-#include <string>
-#include <tuple>
-#include <optional>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4535) // calling _set_se_translator requires /EHa
-#endif
-#include <boost/test/unit_test.hpp>
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-
-using namespace solidity::test;
-using namespace solidity::util;
-
-namespace solidity::frontend::test
-{
-static char const* walletCode = R"DELIMITER(
-//sol Wallet
-// Multi-sig, daily-limited account proxy/wallet.
-// @authors:
-// Gav Wood <g@ethdev.com>
-// inheritable "property" contract that enables methods to be protected by requiring the acquiescence of either a
-// single, or, crucially, each of a number of, designated owners.
-// usage:
-// use modifiers onlyowner (just own owned) or onlymanyowners(hash), whereby the same hash must be provided by
-// some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the
-// interior is executed.
-
-pragma solidity >=0.4.0 <0.9.0;
-
-contract multiowned {
-
-	// TYPES
-
-	// struct for the status of a pending operation.
-	struct PendingState {
-		uint yetNeeded;
-		uint ownersDone;
-		uint index;
-	}
-
-	// EVENTS
-
-	// this contract only has five types of events: it can accept a confirmation, in which case
-	// we record owner and operation (hash) alongside it.
-	event Confirmation(address owner, bytes32 operation);
-	event Revoke(address owner, bytes32 operation);
-	// some others are in the case of an owner changing.
-	event OwnerChanged(address oldOwner, address newOwner);
-	event OwnerAdded(address newOwner);
-	event OwnerRemoved(address oldOwner);
-	// the last one is emitted if the required signatures change
-	event RequirementChanged(uint newRequirement);
-
-	// MODIFIERS
-
-	// simple single-sig function modifier.
-	modifier onlyowner {
-		if (isOwner(msg.sender))
-			_;
-	}
-	// multi-sig function modifier: the operation must have an intrinsic hash in order
-	// that later attempts can be realised as the same underlying operation and
-	// thus count as confirmations.
-	modifier onlymanyowners(bytes32 _operation) {
-		if (confirmAndCheck(_operation))
-			_;
-	}
-
-	// METHODS
-
-	// constructor is given number of sigs required to do protected "onlymanyowners" transactions
-	// as well as the selection of addresses capable of confirming them.
-	constructor(address[] memory _owners, uint _required) {
-		m_numOwners = _owners.length + 1;
-		m_owners[1] = uint160(msg.sender);
-		m_ownerIndex[uint160(msg.sender)] = 1;
-		for (uint i = 0; i < _owners.length; ++i)
-		{
-			m_owners[2 + i] = uint160(_owners[i]);
-			m_ownerIndex[uint160(_owners[i])] = 2 + i;
-		}
-		m_required = _required;
-	}
-
-	// Revokes a prior confirmation of the given operation
-	function revoke(bytes32 _operation) external {
-		uint ownerIndex = m_ownerIndex[uint160(msg.sender)];
-		// make sure they're an owner
-		if (ownerIndex == 0) return;
-		uint ownerIndexBit = 2**ownerIndex;
-		PendingState storage pending = m_pending[_operation];
-		if (pending.ownersDone & ownerIndexBit > 0) {
-			pending.yetNeeded++;
-			pending.ownersDone -= ownerIndexBit;
-			emit Revoke(msg.sender, _operation);
-		}
-	}
-
-	// Replaces an owner `_from` with another `_to`.
-	function changeOwner(address _from, address _to) onlymanyowners(keccak256(msg.data)) public virtual {
-		if (isOwner(_to)) return;
-		uint ownerIndex = m_ownerIndex[uint160(_from)];
-		if (ownerIndex == 0) return;
-
-		clearPending();
-		m_owners[ownerIndex] = uint160(_to);
-		m_ownerIndex[uint160(_from)] = 0;
-		m_ownerIndex[uint160(_to)] = ownerIndex;
-		emit OwnerChanged(_from, _to);
-	}
-
-	function addOwner(address _owner) onlymanyowners(keccak256(msg.data)) external {
-		if (isOwner(_owner)) return;
-
-		clearPending();
-		if (m_numOwners >= c_maxOwners)
-			reorganizeOwners();
-		if (m_numOwners >= c_maxOwners)
-			return;
-		m_numOwners++;
-		m_owners[m_numOwners] = uint160(_owner);
-		m_ownerIndex[uint160(_owner)] = m_numOwners;
-		emit OwnerAdded(_owner);
-	}
-
-	function removeOwner(address _owner) onlymanyowners(keccak256(msg.data)) external {
-		uint ownerIndex = m_ownerIndex[uint160(_owner)];
-		if (ownerIndex == 0) return;
-		if (m_required > m_numOwners - 1) return;
-
-		m_owners[ownerIndex] = 0;
-		m_ownerIndex[uint160(_owner)] = 0;
-		clearPending();
-		reorganizeOwners(); //make sure m_numOwner is equal to the number of owners and always points to the optimal free slot
-		emit OwnerRemoved(_owner);
-	}
-
-	function changeRequirement(uint _newRequired) onlymanyowners(keccak256(msg.data)) external {
-		if (_newRequired > m_numOwners) return;
-		m_required = _newRequired;
-		clearPending();
-		emit RequirementChanged(_newRequired);
-	}
-
-	function isOwner(address _addr) public returns (bool) {
-		return m_ownerIndex[uint160(_addr)] > 0;
-	}
-
-	function hasConfirmed(bytes32 _operation, address _owner) public view returns (bool) {
-		PendingState storage pending = m_pending[_operation];
-		uint ownerIndex = m_ownerIndex[uint160(_owner)];
-
-		// make sure they're an owner
-		if (ownerIndex == 0) return false;
-
-		// determine the bit to set for this owner.
-		uint ownerIndexBit = 2**ownerIndex;
-		if (pending.ownersDone & ownerIndexBit == 0) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	// INTERNAL METHODS
-
-	function confirmAndCheck(bytes32 _operation) internal returns (bool) {
-		// determine what index the present sender is:
-		uint ownerIndex = m_ownerIndex[uint160(msg.sender)];
-		// make sure they're an owner
-		if (ownerIndex == 0) return false;
-
-		PendingState storage pending = m_pending[_operation];
-		// if we're not yet working on this operation, switch over and reset the confirmation status.
-		if (pending.yetNeeded == 0) {
-			// reset count of confirmations needed.
-			pending.yetNeeded = m_required;
-			// reset which owners have confirmed (none) - set our bitmap to 0.
-			pending.ownersDone = 0;
-			m_pendingIndex.push(_operation);
-			pending.index = m_pendingIndex.length - 1;
-		}
-		// determine the bit to set for this owner.
-		uint ownerIndexBit = 2**ownerIndex;
-		// make sure we (the message sender) haven't confirmed this operation previously.
-		if (pending.ownersDone & ownerIndexBit == 0) {
-			emit Confirmation(msg.sender, _operation);
-			// ok - check if count is enough to go ahead.
-			if (pending.yetNeeded <= 1) {
-				// enough confirmations: reset and run interior.
-				delete m_pendingIndex[m_pending[_operation].index];
-				delete m_pending[_operation];
-				return true;
-			}
-			else
-			{
-				// not enough: record that this owner in particular confirmed.
-				pending.yetNeeded--;
-				pending.ownersDone |= ownerIndexBit;
-				return false;
-			}
-		}
-	}
-
-	function reorganizeOwners() private returns (bool) {
-		uint free = 1;
-		while (free < m_numOwners)
-		{
-			while (free < m_numOwners && m_owners[free] != 0) free++;
-			while (m_numOwners > 1 && m_owners[m_numOwners] == 0) m_numOwners--;
-			if (free < m_numOwners && m_owners[m_numOwners] != 0 && m_owners[free] == 0)
-			{
-				m_owners[free] = m_owners[m_numOwners];
-				m_ownerIndex[m_owners[free]] = free;
-				m_owners[m_numOwners] = 0;
-			}
-		}
-	}
-
-	function clearPending() internal virtual {
-		uint length = m_pendingIndex.length;
-		for (uint i = 0; i < length; ++i)
-			if (m_pendingIndex[i] != 0)
-				delete m_pending[m_pendingIndex[i]];
-		delete m_pendingIndex;
-	}
-
-	// FIELDS
-
-	// the number of owners that must confirm the same operation before it is run.
-	uint public m_required;
-	// pointer used to find a free slot in m_owners
-	uint public m_numOwners;
-
-	// list of owners
-	uint[256] m_owners;
-	uint constant c_maxOwners = 250;
-	// index on the list of owners to allow reverse lookup
-	mapping(uint => uint) m_ownerIndex;
-	// the ongoing operations.
-	mapping(bytes32 => PendingState) m_pending;
-	bytes32[] m_pendingIndex;
-}
-
-// inheritable "property" contract that enables methods to be protected by placing a linear limit (specifiable)
-// on a particular resource per calendar day. is multiowned to allow the limit to be altered. resource that method
-// uses is specified in the modifier.
-abstract contract daylimit is multiowned {
-
-	// MODIFIERS
-
-	// simple modifier for daily limit.
-	modifier limitedDaily(uint _value) {
-		if (underLimit(_value))
-			_;
-	}
-
-	// METHODS
-
-	// constructor - stores initial daily limit and records the present day's index.
-	constructor(uint _limit) {
-		m_dailyLimit = _limit;
-		m_lastDay = today();
-	}
-	// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
-	function setDailyLimit(uint _newLimit) onlymanyowners(keccak256(msg.data)) external {
-		m_dailyLimit = _newLimit;
-	}
-	// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
-	function resetSpentToday() onlymanyowners(keccak256(msg.data)) external {
-		m_spentToday = 0;
-	}
-
-	// INTERNAL METHODS
-
-	// checks to see if there is at least `_value` left from the daily limit today. if there is, subtracts it and
-	// returns true. otherwise just returns false.
-	function underLimit(uint _value) internal onlyowner returns (bool) {
-		// reset the spend limit if we're on a different day to last time.
-		if (today() > m_lastDay) {
-			m_spentToday = 0;
-			m_lastDay = today();
-		}
-		// check to see if there's enough left - if so, subtract and return true.
-		if (m_spentToday + _value >= m_spentToday && m_spentToday + _value <= m_dailyLimit) {
-			m_spentToday += _value;
-			return true;
-		}
-		return false;
-	}
-	// determines today's index.
-	function today() private view returns (uint) { return block.timestamp / 1 days; }
-
-	// FIELDS
-
-	uint public m_dailyLimit;
-	uint m_spentToday;
-	uint m_lastDay;
-}
-
-// interface contract for multisig proxy contracts; see below for docs.
-abstract contract multisig {
-
-	// EVENTS
-
-	// logged events:
-	// Funds has arrived into the wallet (record how much).
-	event Deposit(address from, uint value);
-	// Single transaction going out of the wallet (record who signed for it, how much, and to whom it's going).
-	event SingleTransact(address owner, uint value, address to, bytes data);
-	// Multi-sig transaction going out of the wallet (record who signed for it last, the operation hash, how much, and to whom it's going).
-	event MultiTransact(address owner, bytes32 operation, uint value, address to, bytes data);
-	// Confirmation still needed for a transaction.
-	event ConfirmationNeeded(bytes32 operation, address initiator, uint value, address to, bytes data);
-
-	// FUNCTIONS
-
-	// TODO: document
-	function changeOwner(address _from, address _to) public virtual;
-	function execute(address _to, uint _value, bytes calldata _data) external virtual returns (bytes32);
-	function confirm(bytes32 _h) public virtual returns (bool);
-}
-
-// usage:
-// bytes32 h = Wallet(w).from(oneOwner).transact(to, value, data);
-// Wallet(w).from(anotherOwner).confirm(h);
-contract Wallet is multisig, multiowned, daylimit {
-
-	// TYPES
-
-	// Transaction structure to remember details of transaction lest it need be saved for a later call.
-	struct Transaction {
-		address to;
-		uint value;
-		bytes data;
-	}
-
-	// METHODS
-
-	// constructor - just pass on the owner array to the multiowned and
-	// the limit to daylimit
-	constructor(address[] memory _owners, uint _required, uint _daylimit) payable
-			multiowned(_owners, _required) daylimit(_daylimit) {
-	}
-
-	function changeOwner(address _from, address _to) public override(multiowned, multisig) {
-		multiowned.changeOwner(_from, _to);
-	}
-	// destroys the contract sending everything to `_to`.
-	function shutdown(address payable _to) onlymanyowners(keccak256(msg.data)) external {
-		selfdestruct(_to);
-	}
-
-	// gets called for plain ether transfers
-	receive() external payable {
-		// did we actually receive value?
-		if (msg.value > 0)
-			emit Deposit(msg.sender, msg.value);
-	}
-
-	// Outside-visible transact entry point. Executes transaction immediately if below daily spend limit.
-	// If not, goes into multisig process. We provide a hash on return to allow the sender to provide
-	// shortcuts for the other confirmations (allowing them to avoid replicating the _to, _value
-	// and _data arguments). They still get the option of using them if they want, anyways.
-	function execute(address _to, uint _value, bytes calldata _data) external override onlyowner returns (bytes32 _r) {
-		// first, take the opportunity to check that we're under the daily limit.
-		if (underLimit(_value)) {
-			emit SingleTransact(msg.sender, _value, _to, _data);
-			// yes - just execute the call.
-			_to.call{value: _value}(_data);
-			return 0;
-		}
-		// determine our operation hash.
-		_r = keccak256(abi.encodePacked(msg.data, block.number));
-		if (!confirm(_r) && m_txs[_r].to == 0x0000000000000000000000000000000000000000) {
-			m_txs[_r].to = _to;
-			m_txs[_r].value = _value;
-			m_txs[_r].data = _data;
-			emit ConfirmationNeeded(_r, msg.sender, _value, _to, _data);
-		}
-	}
-
-	// confirm a transaction through just the hash. we use the previous transactions map, m_txs, in order
-	// to determine the body of the transaction from the hash provided.
-	function confirm(bytes32 _h) onlymanyowners(_h) public override returns (bool) {
-		if (m_txs[_h].to != 0x0000000000000000000000000000000000000000) {
-			m_txs[_h].to.call{value: m_txs[_h].value}(m_txs[_h].data);
-			emit MultiTransact(msg.sender, _h, m_txs[_h].value, m_txs[_h].to, m_txs[_h].data);
-			delete m_txs[_h];
-			return true;
-		}
-	}
-
-	// INTERNAL METHODS
-
-	function clearPending() internal override {
-		uint length = m_pendingIndex.length;
-		for (uint i = 0; i < length; ++i)
-			delete m_txs[m_pendingIndex[i]];
-		super.clearPending();
-	}
-
-	// FIELDS
-
-	// pending transactions we have at present.
-	mapping (bytes32 => Transaction) m_txs;
-}
-)DELIMITER";
-
-static LazyInit<bytes> s_compiledWallet;
-
-class WalletTestFramework: public SolidityExecutionFramework
-{
-protected:
-	void deployWallet(
-		u256 const& _value = 0,
-		std::vector<h160> const& _owners = std::vector<h160>{},
-		u256 _required = 1,
-		u256 _dailyLimit = 0
-	)
-	{
-		bytes const& compiled = s_compiledWallet.init([&]{
-			return compileContract(walletCode, "Wallet");
-		});
-
-		bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners);
-		sendMessage(compiled + args, true, _value);
-		BOOST_REQUIRE(m_transactionSuccessful);
-		BOOST_REQUIRE(!m_output.empty());
-	}
-};
-
-/// This is a test suite that tests optimised code!
-BOOST_FIXTURE_TEST_SUITE(SolidityWallet, WalletTestFramework)
-
-BOOST_AUTO_TEST_CASE(creation)
-{
-	deployWallet(200);
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", m_sender) == encodeArgs(true));
-	bool v2 = !solidity::test::CommonOptions::get().useABIEncoderV1;
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(~0)) == (v2 ? encodeArgs() : encodeArgs(false)));
-}
-
-BOOST_AUTO_TEST_CASE(add_owners)
-{
-	deployWallet(200);
-	h160 originalOwner = m_sender;
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(1)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", account(1)) == encodeArgs(true));
-	// now let the new owner add someone
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x13)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x13)) == encodeArgs(true));
-	// and check that a non-owner cannot add a new owner
-	m_sender = account(0);
-	sendEther(account(2), 10 * ether);
-	m_sender = account(2);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x20)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x20)) == encodeArgs(false));
-	// finally check that all the owners are there
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", originalOwner) == encodeArgs(true));
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", account(1)) == encodeArgs(true));
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x13)) == encodeArgs(true));
-}
-
-BOOST_AUTO_TEST_CASE(change_owners)
-{
-	deployWallet(200);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x12)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x12)) == encodeArgs(true));
-	BOOST_REQUIRE(callContractFunction("changeOwner(address,address)", h160(0x12), h160(0x13)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x12)) == encodeArgs(false));
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x13)) == encodeArgs(true));
-}
-
-BOOST_AUTO_TEST_CASE(remove_owner)
-{
-	deployWallet(200);
-	// add 10 owners
-	for (unsigned i = 0; i < 10; ++i)
-	{
-		BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x12 + i)) == encodeArgs());
-		BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x12 + i)) == encodeArgs(true));
-	}
-	// check they are there again
-	for (unsigned i = 0; i < 10; ++i)
-		BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x12 + i)) == encodeArgs(true));
-	// remove the odd owners
-	for (unsigned i = 0; i < 10; ++i)
-		if (i % 2 == 1)
-			BOOST_REQUIRE(callContractFunction("removeOwner(address)", h160(0x12 + i)) == encodeArgs());
-	// check the result
-	for (unsigned i = 0; i < 10; ++i)
-		BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x12 + i)) == encodeArgs(i % 2 == 0));
-	// add them again
-	for (unsigned i = 0; i < 10; ++i)
-		if (i % 2 == 1)
-			BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x12 + i)) == encodeArgs());
-	// check everyone is there
-	for (unsigned i = 0; i < 10; ++i)
-		BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x12 + i)) == encodeArgs(true));
-}
-
-BOOST_AUTO_TEST_CASE(initial_owners)
-{
-	std::vector<h160> owners{
-		h160("0x42c56279432962a17176998a4747d1b4d6ed4367"),
-		h160("0xd4d4669f5ba9f4c27d38ef02a358c339b5560c47"),
-		h160("0xe6716f9544a56c530d868e4bfbacb172315bdead"),
-		h160("0x775e18be7a50a0abb8a4e82b1bd697d79f31fe04"),
-		h160("0xf4dd5c3794f1fd0cdc0327a83aa472609c806e99"),
-		h160("0x4c9113886af165b2de069d6e99430647e94a9fff"),
-		h160("0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4")
-	};
-	deployWallet(0, owners, 4, 2);
-	BOOST_CHECK(callContractFunction("m_numOwners()") == encodeArgs(u256(8)));
-	BOOST_CHECK(callContractFunction("isOwner(address)", m_sender) == encodeArgs(true));
-	for (h160 const& owner: owners)
-	{
-		BOOST_CHECK(callContractFunction("isOwner(address)", owner) == encodeArgs(true));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(multisig_value_transfer)
-{
-	deployWallet(200);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(1)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(2)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(3)) == encodeArgs());
-	// 4 owners, set required to 3
-	BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
-	h160 destination = h160("0x5c6d6026d3fb35cd7175fd0054ae8df50d8f8b41");
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	auto ophash = callContractFunction("execute(address,uint256,bytes)", destination, 100, 0x60, 0x00);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(2), 10 * ether);
-	m_sender = account(2);
-	callContractFunction("confirm(bytes32)", ophash);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(3), 10 * ether);
-	m_sender = account(3);
-	callContractFunction("confirm(bytes32)", ophash);
-	// now it should go through
-	BOOST_CHECK_EQUAL(balanceAt(destination), 100);
-}
-
-BOOST_AUTO_TEST_CASE(revoke_addOwner)
-{
-	deployWallet();
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(1)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(2)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(3)) == encodeArgs());
-	// 4 owners, set required to 3
-	BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
-	// add a new owner
-	h160 deployer = m_sender;
-	h256 opHash = util::keccak256(util::selectorFromSignatureH32("addOwner(address)").asBytes() + h256(0x33).asBytes());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x33)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x33)) == encodeArgs(false));
-	m_sender = account(0);
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x33)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x33)) == encodeArgs(false));
-	// revoke one confirmation
-	m_sender = deployer;
-	BOOST_REQUIRE(callContractFunction("revoke(bytes32)", opHash) == encodeArgs());
-	m_sender = account(0);
-	sendEther(account(2), 10 * ether);
-	m_sender = account(2);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x33)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x33)) == encodeArgs(false));
-	m_sender = account(0);
-	sendEther(account(3), 10 * ether);
-	m_sender = account(3);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x33)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x33)) == encodeArgs(true));
-}
-
-BOOST_AUTO_TEST_CASE(revoke_transaction)
-{
-	deployWallet(200);
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(1)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(2)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(3)) == encodeArgs());
-	// 4 owners, set required to 3
-	BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
-	// create a transaction
-	h160 deployer = m_sender;
-	h160 destination = h160("0x5c6d6026d3fb35cd7175fd0054ae8df50d8f8b41");
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	auto opHash = callContractFunction("execute(address,uint256,bytes)", destination, 100, 0x60, 0x00);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(2), 10 * ether);
-	m_sender = account(2);
-	callContractFunction("confirm(bytes32)", opHash);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	BOOST_REQUIRE(callContractFunction("revoke(bytes32)", opHash) == encodeArgs());
-	m_sender = deployer;
-	callContractFunction("confirm(bytes32)", opHash);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	m_sender = account(0);
-	sendEther(account(3), 10 * ether);
-	m_sender = account(3);
-	callContractFunction("confirm(bytes32)", opHash);
-	// now it should go through
-	BOOST_CHECK_EQUAL(balanceAt(destination), 100);
-}
-
-BOOST_AUTO_TEST_CASE(daylimit)
-{
-	deployWallet(200);
-	BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(0)));
-	BOOST_REQUIRE(callContractFunction("setDailyLimit(uint256)", u256(100)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(100)));
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(1)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(2)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("addOwner(address)", account(3)) == encodeArgs());
-	// 4 owners, set required to 3
-	BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
-
-	// try to send tx over daylimit
-	h160 destination = h160("0x5c6d6026d3fb35cd7175fd0054ae8df50d8f8b41");
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	sendEther(account(1), 10 * ether);
-	m_sender = account(1);
-	BOOST_REQUIRE(
-		callContractFunction("execute(address,uint256,bytes)", destination, 150, 0x60, 0x00) !=
-		encodeArgs(u256(0))
-	);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	// try to send tx under daylimit by stranger
-	m_sender = account(0);
-	sendEther(account(4), 10 * ether);
-	m_sender = account(4);
-	BOOST_REQUIRE(
-		callContractFunction("execute(address,uint256,bytes)", destination, 90, 0x60, 0x00) ==
-		encodeArgs(u256(0))
-	);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 0);
-	// now send below limit by owner
-	m_sender = account(0);
-	sendEther(account(1), 10 * ether);
-	BOOST_REQUIRE(
-		callContractFunction("execute(address,uint256,bytes)", destination, 90, 0x60, 0x00) ==
-		encodeArgs(u256(0))
-	);
-	BOOST_CHECK_EQUAL(balanceAt(destination), 90);
-}
-
-BOOST_AUTO_TEST_CASE(daylimit_constructor)
-{
-	deployWallet(200, {}, 1, 20);
-	BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(20)));
-	BOOST_REQUIRE(callContractFunction("setDailyLimit(uint256)", u256(30)) == encodeArgs());
-	BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(30)));
-}
-
-//@todo test data calls
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/docsCodeStyle.sh b/test/docsCodeStyle.sh
deleted file mode 100755
index 675828d7e138..000000000000
--- a/test/docsCodeStyle.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-## GLOBAL VARIABLES
-
-REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
-
-## FUNCTIONS
-
-if [ "$CIRCLECI" ]
-then
-    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
-    function printError { echo "$(tput setaf 1)$1$(tput setaf 7)"; }
-else
-    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
-    function printError { echo "$(tput setaf 1)$1$(tput sgr0)"; }
-fi
-
-printTask "Checking docs examples style"
-SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-
-    if npm -v >/dev/null 2>&1; then
-        if npm list -g | grep solhint >/dev/null 2>&1; then
-            echo "node is installed, setting up solhint"
-            cp "$REPO_ROOT"/test/.solhint.json "$SOLTMPDIR"/.solhint.json
-            cp "$REPO_ROOT"/test/.solhintignore "$SOLTMPDIR"/.solhintignore
-
-            for f in *.sol
-            do
-                echo "$f"
-                # Only report errors
-                solhint -f unix "$SOLTMPDIR/$f"
-            done
-        else
-            echo "node is installed, but not solhint"
-            exit 1
-        fi
-    else
-        echo "node not installed, skipping docs style checker"
-        exit 1
-    fi
-)
-rm -rf "$SOLTMPDIR"
-echo "Done."
diff --git a/test/evmc/CMakeLists.txt b/test/evmc/CMakeLists.txt
deleted file mode 100644
index b49b85a29a25..000000000000
--- a/test/evmc/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# EVMC: Ethereum Client-VM Connector API.
-# Copyright 2016-2019 The EVMC Authors.
-# Licensed under the Apache License, Version 2.0.
-
-
-add_library(evmc_loader STATIC loader.h loader.c)
-set_target_properties(evmc_loader PROPERTIES LINKER_LANGUAGE C)
-target_link_libraries(evmc_loader INTERFACE ${CMAKE_DL_LIBS})
-target_include_directories(evmc_loader PUBLIC ${PROJECT_SOURCE_DIR}/test/)
-set_target_properties(evmc_loader PROPERTIES
-    POSITION_INDEPENDENT_CODE TRUE
-)
-
-add_library(evmc INTERFACE)
-target_sources(evmc INTERFACE
-    ${PROJECT_SOURCE_DIR}/test/evmc/evmc.h
-    ${PROJECT_SOURCE_DIR}/test/evmc/evmc.hpp
-    ${PROJECT_SOURCE_DIR}/test/evmc/helpers.h
-    ${PROJECT_SOURCE_DIR}/test/evmc/utils.h
-)
-target_include_directories(evmc INTERFACE ${PROJECT_SOURCE_DIR}/test/)
-target_link_libraries(evmc INTERFACE evmc_loader)
diff --git a/test/evmc/LICENSE b/test/evmc/LICENSE
deleted file mode 100644
index d64569567334..000000000000
--- a/test/evmc/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/test/evmc/README.md b/test/evmc/README.md
deleted file mode 100644
index cdddb3444083..000000000000
--- a/test/evmc/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# EVMC
-
-This is an import of [EVMC](https://github.com/ethereum/evmc) version [10.1.0](https://github.com/ethereum/evmc/releases/tag/v10.1.0).
-
-Important: The `MockedAccount.storage` is changed to a `map` from `unordered_map` as ordering is important for fuzzing.
diff --git a/test/evmc/evmc.h b/test/evmc/evmc.h
deleted file mode 100644
index 60c3aeecc978..000000000000
--- a/test/evmc/evmc.h
+++ /dev/null
@@ -1,1154 +0,0 @@
-/**
- * EVMC: Ethereum Client-VM Connector API
- *
- * @copyright
- * Copyright 2016 The EVMC Authors.
- * Licensed under the Apache License, Version 2.0.
- *
- * @defgroup EVMC EVMC
- * @{
- */
-#ifndef EVMC_H
-#define EVMC_H
-
-#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 6)
-/**
- * Portable declaration of "deprecated" attribute.
- *
- * Available for clang and GCC 6+ compilers. The older GCC compilers know
- * this attribute, but it cannot be applied to enum elements.
- */
-#define EVMC_DEPRECATED __attribute__((deprecated))
-#else
-#define EVMC_DEPRECATED
-#endif
-
-
-#include <stdbool.h> /* Definition of bool, true and false. */
-#include <stddef.h>  /* Definition of size_t. */
-#include <stdint.h>  /* Definition of int64_t, uint64_t. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* BEGIN Python CFFI declarations */
-
-enum
-{
-    /**
-     * The EVMC ABI version number of the interface declared in this file.
-     *
-     * The EVMC ABI version always equals the major version number of the EVMC project.
-     * The Host SHOULD check if the ABI versions match when dynamically loading VMs.
-     *
-     * @see @ref versioning
-     */
-    EVMC_ABI_VERSION = 10
-};
-
-
-/**
- * The fixed size array of 32 bytes.
- *
- * 32 bytes of data capable of storing e.g. 256-bit hashes.
- */
-typedef struct evmc_bytes32
-{
-    /** The 32 bytes. */
-    uint8_t bytes[32];
-} evmc_bytes32;
-
-/**
- * The alias for evmc_bytes32 to represent a big-endian 256-bit integer.
- */
-typedef struct evmc_bytes32 evmc_uint256be;
-
-/** Big-endian 160-bit hash suitable for keeping an Ethereum address. */
-typedef struct evmc_address
-{
-    /** The 20 bytes of the hash. */
-    uint8_t bytes[20];
-} evmc_address;
-
-/** The kind of call-like instruction. */
-enum evmc_call_kind
-{
-    EVMC_CALL = 0,         /**< Request CALL. */
-    EVMC_DELEGATECALL = 1, /**< Request DELEGATECALL. Valid since Homestead.
-                                The value param ignored. */
-    EVMC_CALLCODE = 2,     /**< Request CALLCODE. */
-    EVMC_CREATE = 3,       /**< Request CREATE. */
-    EVMC_CREATE2 = 4       /**< Request CREATE2. Valid since Constantinople.*/
-};
-
-/** The flags for ::evmc_message. */
-enum evmc_flags
-{
-    EVMC_STATIC = 1 /**< Static call mode. */
-};
-
-/**
- * The message describing an EVM call, including a zero-depth calls from a transaction origin.
- *
- * Most of the fields are modelled by the section 8. Message Call of the Ethereum Yellow Paper.
- */
-struct evmc_message
-{
-    /** The kind of the call. For zero-depth calls ::EVMC_CALL SHOULD be used. */
-    enum evmc_call_kind kind;
-
-    /**
-     * Additional flags modifying the call execution behavior.
-     * In the current version the only valid values are ::EVMC_STATIC or 0.
-     */
-    uint32_t flags;
-
-    /**
-     * The present depth of the message call stack.
-     *
-     * Defined as `e` in the Yellow Paper.
-     */
-    int32_t depth;
-
-    /**
-     * The amount of gas available to the message execution.
-     *
-     * Defined as `g` in the Yellow Paper.
-     */
-    int64_t gas;
-
-    /**
-     * The recipient of the message.
-     *
-     * This is the address of the account which storage/balance/nonce is going to be modified
-     * by the message execution. In case of ::EVMC_CALL, this is also the account where the
-     * message value evmc_message::value is going to be transferred.
-     * For ::EVMC_CALLCODE or ::EVMC_DELEGATECALL, this may be different from
-     * the evmc_message::code_address.
-     *
-     * Defined as `r` in the Yellow Paper.
-     */
-    evmc_address recipient;
-
-    /**
-     * The sender of the message.
-     *
-     * The address of the sender of a message call defined as `s` in the Yellow Paper.
-     * This must be the message recipient of the message at the previous (lower) depth,
-     * except for the ::EVMC_DELEGATECALL where recipient is the 2 levels above the present depth.
-     * At the depth 0 this must be the transaction origin.
-     */
-    evmc_address sender;
-
-    /**
-     * The message input data.
-     *
-     * The arbitrary length byte array of the input data of the call,
-     * defined as `d` in the Yellow Paper.
-     * This MAY be NULL.
-     */
-    const uint8_t* input_data;
-
-    /**
-     * The size of the message input data.
-     *
-     * If input_data is NULL this MUST be 0.
-     */
-    size_t input_size;
-
-    /**
-     * The amount of Ether transferred with the message.
-     *
-     * This is transferred value for ::EVMC_CALL or apparent value for ::EVMC_DELEGATECALL.
-     * Defined as `v` or `v~` in the Yellow Paper.
-     */
-    evmc_uint256be value;
-
-    /**
-     * The optional value used in new contract address construction.
-     *
-     * Needed only for a Host to calculate created address when kind is ::EVMC_CREATE2.
-     * Ignored in evmc_execute_fn().
-     */
-    evmc_bytes32 create2_salt;
-
-    /**
-     * The address of the code to be executed.
-     *
-     * For ::EVMC_CALLCODE or ::EVMC_DELEGATECALL this may be different from
-     * the evmc_message::recipient.
-     * Not required when invoking evmc_execute_fn(), only when invoking evmc_call_fn().
-     * Ignored if kind is ::EVMC_CREATE or ::EVMC_CREATE2.
-     *
-     * In case of ::EVMC_CAPABILITY_PRECOMPILES implementation, this fields should be inspected
-     * to identify the requested precompile.
-     *
-     * Defined as `c` in the Yellow Paper.
-     */
-    evmc_address code_address;
-};
-
-
-/** The transaction and block data for execution. */
-struct evmc_tx_context
-{
-    evmc_uint256be tx_gas_price;      /**< The transaction gas price. */
-    evmc_address tx_origin;           /**< The transaction origin account. */
-    evmc_address block_coinbase;      /**< The miner of the block. */
-    int64_t block_number;             /**< The block number. */
-    int64_t block_timestamp;          /**< The block timestamp. */
-    int64_t block_gas_limit;          /**< The block gas limit. */
-    evmc_uint256be block_prev_randao; /**< The block previous RANDAO (EIP-4399). */
-    evmc_uint256be chain_id;          /**< The blockchain's ChainID. */
-    evmc_uint256be block_base_fee;    /**< The block base fee per gas (EIP-1559, EIP-3198). */
-};
-
-/**
- * @struct evmc_host_context
- * The opaque data type representing the Host execution context.
- * @see evmc_execute_fn().
- */
-struct evmc_host_context;
-
-/**
- * Get transaction context callback function.
- *
- *  This callback function is used by an EVM to retrieve the transaction and
- *  block context.
- *
- *  @param      context  The pointer to the Host execution context.
- *  @return              The transaction context.
- */
-typedef struct evmc_tx_context (*evmc_get_tx_context_fn)(struct evmc_host_context* context);
-
-/**
- * Get block hash callback function.
- *
- * This callback function is used by a VM to query the hash of the header of the given block.
- * If the information about the requested block is not available, then this is signalled by
- * returning null bytes.
- *
- * @param context  The pointer to the Host execution context.
- * @param number   The block number.
- * @return         The block hash or null bytes
- *                 if the information about the block is not available.
- */
-typedef evmc_bytes32 (*evmc_get_block_hash_fn)(struct evmc_host_context* context, int64_t number);
-
-/**
- * The execution status code.
- *
- * Successful execution is represented by ::EVMC_SUCCESS having value 0.
- *
- * Positive values represent failures defined by VM specifications with generic
- * ::EVMC_FAILURE code of value 1.
- *
- * Status codes with negative values represent VM internal errors
- * not provided by EVM specifications. These errors MUST not be passed back
- * to the caller. They MAY be handled by the Client in predefined manner
- * (see e.g. ::EVMC_REJECTED), otherwise internal errors are not recoverable.
- * The generic representant of errors is ::EVMC_INTERNAL_ERROR but
- * an EVM implementation MAY return negative status codes that are not defined
- * in the EVMC documentation.
- *
- * @note
- * In case new status codes are needed, please create an issue or pull request
- * in the EVMC repository (https://github.com/ethereum/evmc).
- */
-enum evmc_status_code
-{
-    /** Execution finished with success. */
-    EVMC_SUCCESS = 0,
-
-    /** Generic execution failure. */
-    EVMC_FAILURE = 1,
-
-    /**
-     * Execution terminated with REVERT opcode.
-     *
-     * In this case the amount of gas left MAY be non-zero and additional output
-     * data MAY be provided in ::evmc_result.
-     */
-    EVMC_REVERT = 2,
-
-    /** The execution has run out of gas. */
-    EVMC_OUT_OF_GAS = 3,
-
-    /**
-     * The designated INVALID instruction has been hit during execution.
-     *
-     * The EIP-141 (https://github.com/ethereum/EIPs/blob/master/EIPS/eip-141.md)
-     * defines the instruction 0xfe as INVALID instruction to indicate execution
-     * abortion coming from high-level languages. This status code is reported
-     * in case this INVALID instruction has been encountered.
-     */
-    EVMC_INVALID_INSTRUCTION = 4,
-
-    /** An undefined instruction has been encountered. */
-    EVMC_UNDEFINED_INSTRUCTION = 5,
-
-    /**
-     * The execution has attempted to put more items on the EVM stack
-     * than the specified limit.
-     */
-    EVMC_STACK_OVERFLOW = 6,
-
-    /** Execution of an opcode has required more items on the EVM stack. */
-    EVMC_STACK_UNDERFLOW = 7,
-
-    /** Execution has violated the jump destination restrictions. */
-    EVMC_BAD_JUMP_DESTINATION = 8,
-
-    /**
-     * Tried to read outside memory bounds.
-     *
-     * An example is RETURNDATACOPY reading past the available buffer.
-     */
-    EVMC_INVALID_MEMORY_ACCESS = 9,
-
-    /** Call depth has exceeded the limit (if any) */
-    EVMC_CALL_DEPTH_EXCEEDED = 10,
-
-    /** Tried to execute an operation which is restricted in static mode. */
-    EVMC_STATIC_MODE_VIOLATION = 11,
-
-    /**
-     * A call to a precompiled or system contract has ended with a failure.
-     *
-     * An example: elliptic curve functions handed invalid EC points.
-     */
-    EVMC_PRECOMPILE_FAILURE = 12,
-
-    /**
-     * Contract validation has failed (e.g. due to EVM 1.5 jump validity,
-     * Casper's purity checker or ewasm contract rules).
-     */
-    EVMC_CONTRACT_VALIDATION_FAILURE = 13,
-
-    /**
-     * An argument to a state accessing method has a value outside of the
-     * accepted range of values.
-     */
-    EVMC_ARGUMENT_OUT_OF_RANGE = 14,
-
-    /**
-     * A WebAssembly `unreachable` instruction has been hit during execution.
-     */
-    EVMC_WASM_UNREACHABLE_INSTRUCTION = 15,
-
-    /**
-     * A WebAssembly trap has been hit during execution. This can be for many
-     * reasons, including division by zero, validation errors, etc.
-     */
-    EVMC_WASM_TRAP = 16,
-
-    /** The caller does not have enough funds for value transfer. */
-    EVMC_INSUFFICIENT_BALANCE = 17,
-
-    /** EVM implementation generic internal error. */
-    EVMC_INTERNAL_ERROR = -1,
-
-    /**
-     * The execution of the given code and/or message has been rejected
-     * by the EVM implementation.
-     *
-     * This error SHOULD be used to signal that the EVM is not able to or
-     * willing to execute the given code type or message.
-     * If an EVM returns the ::EVMC_REJECTED status code,
-     * the Client MAY try to execute it in other EVM implementation.
-     * For example, the Client tries running a code in the EVM 1.5. If the
-     * code is not supported there, the execution falls back to the EVM 1.0.
-     */
-    EVMC_REJECTED = -2,
-
-    /** The VM failed to allocate the amount of memory needed for execution. */
-    EVMC_OUT_OF_MEMORY = -3
-};
-
-/* Forward declaration. */
-struct evmc_result;
-
-/**
- * Releases resources assigned to an execution result.
- *
- * This function releases memory (and other resources, if any) assigned to the
- * specified execution result making the result object invalid.
- *
- * @param result  The execution result which resources are to be released. The
- *                result itself it not modified by this function, but becomes
- *                invalid and user MUST discard it as well.
- *                This MUST NOT be NULL.
- *
- * @note
- * The result is passed by pointer to avoid (shallow) copy of the ::evmc_result
- * struct. Think of this as the best possible C language approximation to
- * passing objects by reference.
- */
-typedef void (*evmc_release_result_fn)(const struct evmc_result* result);
-
-/** The EVM code execution result. */
-struct evmc_result
-{
-    /** The execution status code. */
-    enum evmc_status_code status_code;
-
-    /**
-     * The amount of gas left after the execution.
-     *
-     * If evmc_result::status_code is neither ::EVMC_SUCCESS nor ::EVMC_REVERT
-     * the value MUST be 0.
-     */
-    int64_t gas_left;
-
-    /**
-     * The refunded gas accumulated from this execution and its sub-calls.
-     *
-     * The transaction gas refund limit is not applied.
-     * If evmc_result::status_code is other than ::EVMC_SUCCESS the value MUST be 0.
-     */
-    int64_t gas_refund;
-
-    /**
-     * The reference to output data.
-     *
-     * The output contains data coming from RETURN opcode (iff evmc_result::code
-     * field is ::EVMC_SUCCESS) or from REVERT opcode.
-     *
-     * The memory containing the output data is owned by EVM and has to be
-     * freed with evmc_result::release().
-     *
-     * This pointer MAY be NULL.
-     * If evmc_result::output_size is 0 this pointer MUST NOT be dereferenced.
-     */
-    const uint8_t* output_data;
-
-    /**
-     * The size of the output data.
-     *
-     * If evmc_result::output_data is NULL this MUST be 0.
-     */
-    size_t output_size;
-
-    /**
-     * The method releasing all resources associated with the result object.
-     *
-     * This method (function pointer) is optional (MAY be NULL) and MAY be set
-     * by the VM implementation. If set it MUST be called by the user once to
-     * release memory and other resources associated with the result object.
-     * Once the resources are released the result object MUST NOT be used again.
-     *
-     * The suggested code pattern for releasing execution results:
-     * @code
-     * struct evmc_result result = ...;
-     * if (result.release)
-     *     result.release(&result);
-     * @endcode
-     *
-     * @note
-     * It works similarly to C++ virtual destructor. Attaching the release
-     * function to the result itself allows VM composition.
-     */
-    evmc_release_result_fn release;
-
-    /**
-     * The address of the possibly created contract.
-     *
-     * The create address may be provided even though the contract creation has failed
-     * (evmc_result::status_code is not ::EVMC_SUCCESS). This is useful in situations
-     * when the address is observable, e.g. access to it remains warm.
-     * In all other cases the address MUST be null bytes.
-     */
-    evmc_address create_address;
-
-    /**
-     * Reserved data that MAY be used by a evmc_result object creator.
-     *
-     * This reserved 4 bytes together with 20 bytes from create_address form
-     * 24 bytes of memory called "optional data" within evmc_result struct
-     * to be optionally used by the evmc_result object creator.
-     *
-     * @see evmc_result_optional_data, evmc_get_optional_data().
-     *
-     * Also extends the size of the evmc_result to 64 bytes (full cache line).
-     */
-    uint8_t padding[4];
-};
-
-
-/**
- * Check account existence callback function.
- *
- * This callback function is used by the VM to check if
- * there exists an account at given address.
- * @param context  The pointer to the Host execution context.
- * @param address  The address of the account the query is about.
- * @return         true if exists, false otherwise.
- */
-typedef bool (*evmc_account_exists_fn)(struct evmc_host_context* context,
-                                       const evmc_address* address);
-
-/**
- * Get storage callback function.
- *
- * This callback function is used by a VM to query the given account storage entry.
- *
- * @param context  The Host execution context.
- * @param address  The address of the account.
- * @param key      The index of the account's storage entry.
- * @return         The storage value at the given storage key or null bytes
- *                 if the account does not exist.
- */
-typedef evmc_bytes32 (*evmc_get_storage_fn)(struct evmc_host_context* context,
-                                            const evmc_address* address,
-                                            const evmc_bytes32* key);
-
-
-/**
- * The effect of an attempt to modify a contract storage item.
- *
- * See @ref storagestatus for additional information about design of this enum
- * and analysis of the specification.
- *
- * For the purpose of explaining the meaning of each element, the following
- * notation is used:
- * - 0 is zero value,
- * - X != 0 (X is any value other than 0),
- * - Y != 0, Y != X,  (Y is any value other than X and 0),
- * - Z != 0, Z != X, Z != X (Z is any value other than Y and X and 0),
- * - the "o -> c -> v" triple describes the change status in the context of:
- *   - o: original value (cold value before a transaction started),
- *   - c: current storage value,
- *   - v: new storage value to be set.
- *
- * The order of elements follows EIPs introducing net storage gas costs:
- * - EIP-2200: https://eips.ethereum.org/EIPS/eip-2200,
- * - EIP-1283: https://eips.ethereum.org/EIPS/eip-1283.
- */
-enum evmc_storage_status
-{
-    /**
-     * The new/same value is assigned to the storage item without affecting the cost structure.
-     *
-     * The storage value item is either:
-     * - left unchanged (c == v) or
-     * - the dirty value (o != c) is modified again (c != v).
-     * This is the group of cases related to minimal gas cost of only accessing warm storage.
-     * 0|X   -> 0 -> 0 (current value unchanged)
-     * 0|X|Y -> Y -> Y (current value unchanged)
-     * 0|X   -> Y -> Z (modified previously added/modified value)
-     *
-     * This is "catch all remaining" status. I.e. if all other statuses are correctly matched
-     * this status should be assigned to all remaining cases.
-     */
-    EVMC_STORAGE_ASSIGNED = 0,
-
-    /**
-     * A new storage item is added by changing
-     * the current clean zero to a nonzero value.
-     * 0 -> 0 -> Z
-     */
-    EVMC_STORAGE_ADDED = 1,
-
-    /**
-     * A storage item is deleted by changing
-     * the current clean nonzero to the zero value.
-     * X -> X -> 0
-     */
-    EVMC_STORAGE_DELETED = 2,
-
-    /**
-     * A storage item is modified by changing
-     * the current clean nonzero to other nonzero value.
-     * X -> X -> Z
-     */
-    EVMC_STORAGE_MODIFIED = 3,
-
-    /**
-     * A storage item is added by changing
-     * the current dirty zero to a nonzero value other than the original value.
-     * X -> 0 -> Z
-     */
-    EVMC_STORAGE_DELETED_ADDED = 4,
-
-    /**
-     * A storage item is deleted by changing
-     * the current dirty nonzero to the zero value and the original value is not zero.
-     * X -> Y -> 0
-     */
-    EVMC_STORAGE_MODIFIED_DELETED = 5,
-
-    /**
-     * A storage item is added by changing
-     * the current dirty zero to the original value.
-     * X -> 0 -> X
-     */
-    EVMC_STORAGE_DELETED_RESTORED = 6,
-
-    /**
-     * A storage item is deleted by changing
-     * the current dirty nonzero to the original zero value.
-     * 0 -> Y -> 0
-     */
-    EVMC_STORAGE_ADDED_DELETED = 7,
-
-    /**
-     * A storage item is modified by changing
-     * the current dirty nonzero to the original nonzero value other than the current value.
-     * X -> Y -> X
-     */
-    EVMC_STORAGE_MODIFIED_RESTORED = 8
-};
-
-
-/**
- * Set storage callback function.
- *
- * This callback function is used by a VM to update the given account storage entry.
- * The VM MUST make sure that the account exists. This requirement is only a formality because
- * VM implementations only modify storage of the account of the current execution context
- * (i.e. referenced by evmc_message::recipient).
- *
- * @param context  The pointer to the Host execution context.
- * @param address  The address of the account.
- * @param key      The index of the storage entry.
- * @param value    The value to be stored.
- * @return         The effect on the storage item.
- */
-typedef enum evmc_storage_status (*evmc_set_storage_fn)(struct evmc_host_context* context,
-                                                        const evmc_address* address,
-                                                        const evmc_bytes32* key,
-                                                        const evmc_bytes32* value);
-
-/**
- * Get balance callback function.
- *
- * This callback function is used by a VM to query the balance of the given account.
- *
- * @param context  The pointer to the Host execution context.
- * @param address  The address of the account.
- * @return         The balance of the given account or 0 if the account does not exist.
- */
-typedef evmc_uint256be (*evmc_get_balance_fn)(struct evmc_host_context* context,
-                                              const evmc_address* address);
-
-/**
- * Get code size callback function.
- *
- * This callback function is used by a VM to get the size of the code stored
- * in the account at the given address.
- *
- * @param context  The pointer to the Host execution context.
- * @param address  The address of the account.
- * @return         The size of the code in the account or 0 if the account does not exist.
- */
-typedef size_t (*evmc_get_code_size_fn)(struct evmc_host_context* context,
-                                        const evmc_address* address);
-
-/**
- * Get code hash callback function.
- *
- * This callback function is used by a VM to get the keccak256 hash of the code stored
- * in the account at the given address. For existing accounts not having a code, this
- * function returns keccak256 hash of empty data.
- *
- * @param context  The pointer to the Host execution context.
- * @param address  The address of the account.
- * @return         The hash of the code in the account or null bytes if the account does not exist.
- */
-typedef evmc_bytes32 (*evmc_get_code_hash_fn)(struct evmc_host_context* context,
-                                              const evmc_address* address);
-
-/**
- * Copy code callback function.
- *
- * This callback function is used by an EVM to request a copy of the code
- * of the given account to the memory buffer provided by the EVM.
- * The Client MUST copy the requested code, starting with the given offset,
- * to the provided memory buffer up to the size of the buffer or the size of
- * the code, whichever is smaller.
- *
- * @param context      The pointer to the Host execution context. See ::evmc_host_context.
- * @param address      The address of the account.
- * @param code_offset  The offset of the code to copy.
- * @param buffer_data  The pointer to the memory buffer allocated by the EVM
- *                     to store a copy of the requested code.
- * @param buffer_size  The size of the memory buffer.
- * @return             The number of bytes copied to the buffer by the Client.
- */
-typedef size_t (*evmc_copy_code_fn)(struct evmc_host_context* context,
-                                    const evmc_address* address,
-                                    size_t code_offset,
-                                    uint8_t* buffer_data,
-                                    size_t buffer_size);
-
-/**
- * Selfdestruct callback function.
- *
- * This callback function is used by an EVM to SELFDESTRUCT given contract.
- * The execution of the contract will not be stopped, that is up to the EVM.
- *
- * @param context      The pointer to the Host execution context. See ::evmc_host_context.
- * @param address      The address of the contract to be selfdestructed.
- * @param beneficiary  The address where the remaining ETH is going to be transferred.
- * @return             The information if the given address has not been registered as
- *                     selfdestructed yet. True if registered for the first time, false otherwise.
- */
-typedef bool (*evmc_selfdestruct_fn)(struct evmc_host_context* context,
-                                     const evmc_address* address,
-                                     const evmc_address* beneficiary);
-
-/**
- * Log callback function.
- *
- * This callback function is used by an EVM to inform about a LOG that happened
- * during an EVM bytecode execution.
- *
- * @param context       The pointer to the Host execution context. See ::evmc_host_context.
- * @param address       The address of the contract that generated the log.
- * @param data          The pointer to unindexed data attached to the log.
- * @param data_size     The length of the data.
- * @param topics        The pointer to the array of topics attached to the log.
- * @param topics_count  The number of the topics. Valid values are between 0 and 4 inclusively.
- */
-typedef void (*evmc_emit_log_fn)(struct evmc_host_context* context,
-                                 const evmc_address* address,
-                                 const uint8_t* data,
-                                 size_t data_size,
-                                 const evmc_bytes32 topics[],
-                                 size_t topics_count);
-
-/**
- * Access status per EIP-2929: Gas cost increases for state access opcodes.
- */
-enum evmc_access_status
-{
-    /**
-     * The entry hasn't been accessed before – it's the first access.
-     */
-    EVMC_ACCESS_COLD = 0,
-
-    /**
-     * The entry is already in accessed_addresses or accessed_storage_keys.
-     */
-    EVMC_ACCESS_WARM = 1
-};
-
-/**
- * Access account callback function.
- *
- * This callback function is used by a VM to add the given address
- * to accessed_addresses substate (EIP-2929).
- *
- * @param context  The Host execution context.
- * @param address  The address of the account.
- * @return         EVMC_ACCESS_WARM if accessed_addresses already contained the address
- *                 or EVMC_ACCESS_COLD otherwise.
- */
-typedef enum evmc_access_status (*evmc_access_account_fn)(struct evmc_host_context* context,
-                                                          const evmc_address* address);
-
-/**
- * Access storage callback function.
- *
- * This callback function is used by a VM to add the given account storage entry
- * to accessed_storage_keys substate (EIP-2929).
- *
- * @param context  The Host execution context.
- * @param address  The address of the account.
- * @param key      The index of the account's storage entry.
- * @return         EVMC_ACCESS_WARM if accessed_storage_keys already contained the key
- *                 or EVMC_ACCESS_COLD otherwise.
- */
-typedef enum evmc_access_status (*evmc_access_storage_fn)(struct evmc_host_context* context,
-                                                          const evmc_address* address,
-                                                          const evmc_bytes32* key);
-
-/**
- * Pointer to the callback function supporting EVM calls.
- *
- * @param context  The pointer to the Host execution context.
- * @param msg      The call parameters.
- * @return         The result of the call.
- */
-typedef struct evmc_result (*evmc_call_fn)(struct evmc_host_context* context,
-                                           const struct evmc_message* msg);
-
-/**
- * The Host interface.
- *
- * The set of all callback functions expected by VM instances. This is C
- * realisation of vtable for OOP interface (only virtual methods, no data).
- * Host implementations SHOULD create constant singletons of this (similarly
- * to vtables) to lower the maintenance and memory management cost.
- */
-struct evmc_host_interface
-{
-    /** Check account existence callback function. */
-    evmc_account_exists_fn account_exists;
-
-    /** Get storage callback function. */
-    evmc_get_storage_fn get_storage;
-
-    /** Set storage callback function. */
-    evmc_set_storage_fn set_storage;
-
-    /** Get balance callback function. */
-    evmc_get_balance_fn get_balance;
-
-    /** Get code size callback function. */
-    evmc_get_code_size_fn get_code_size;
-
-    /** Get code hash callback function. */
-    evmc_get_code_hash_fn get_code_hash;
-
-    /** Copy code callback function. */
-    evmc_copy_code_fn copy_code;
-
-    /** Selfdestruct callback function. */
-    evmc_selfdestruct_fn selfdestruct;
-
-    /** Call callback function. */
-    evmc_call_fn call;
-
-    /** Get transaction context callback function. */
-    evmc_get_tx_context_fn get_tx_context;
-
-    /** Get block hash callback function. */
-    evmc_get_block_hash_fn get_block_hash;
-
-    /** Emit log callback function. */
-    evmc_emit_log_fn emit_log;
-
-    /** Access account callback function. */
-    evmc_access_account_fn access_account;
-
-    /** Access storage callback function. */
-    evmc_access_storage_fn access_storage;
-};
-
-
-/* Forward declaration. */
-struct evmc_vm;
-
-/**
- * Destroys the VM instance.
- *
- * @param vm  The VM instance to be destroyed.
- */
-typedef void (*evmc_destroy_fn)(struct evmc_vm* vm);
-
-/**
- * Possible outcomes of evmc_set_option.
- */
-enum evmc_set_option_result
-{
-    EVMC_SET_OPTION_SUCCESS = 0,
-    EVMC_SET_OPTION_INVALID_NAME = 1,
-    EVMC_SET_OPTION_INVALID_VALUE = 2
-};
-
-/**
- * Configures the VM instance.
- *
- * Allows modifying options of the VM instance.
- * Options:
- * - code cache behavior: on, off, read-only, ...
- * - optimizations,
- *
- * @param vm     The VM instance to be configured.
- * @param name   The option name. NULL-terminated string. Cannot be NULL.
- * @param value  The new option value. NULL-terminated string. Cannot be NULL.
- * @return       The outcome of the operation.
- */
-typedef enum evmc_set_option_result (*evmc_set_option_fn)(struct evmc_vm* vm,
-                                                          char const* name,
-                                                          char const* value);
-
-
-/**
- * EVM revision.
- *
- * The revision of the EVM specification based on the Ethereum
- * upgrade / hard fork codenames.
- */
-enum evmc_revision
-{
-    /**
-     * The Frontier revision.
-     *
-     * The one Ethereum launched with.
-     */
-    EVMC_FRONTIER = 0,
-
-    /**
-     * The Homestead revision.
-     *
-     * https://eips.ethereum.org/EIPS/eip-606
-     */
-    EVMC_HOMESTEAD = 1,
-
-    /**
-     * The Tangerine Whistle revision.
-     *
-     * https://eips.ethereum.org/EIPS/eip-608
-     */
-    EVMC_TANGERINE_WHISTLE = 2,
-
-    /**
-     * The Spurious Dragon revision.
-     *
-     * https://eips.ethereum.org/EIPS/eip-607
-     */
-    EVMC_SPURIOUS_DRAGON = 3,
-
-    /**
-     * The Byzantium revision.
-     *
-     * https://eips.ethereum.org/EIPS/eip-609
-     */
-    EVMC_BYZANTIUM = 4,
-
-    /**
-     * The Constantinople revision.
-     *
-     * https://eips.ethereum.org/EIPS/eip-1013
-     */
-    EVMC_CONSTANTINOPLE = 5,
-
-    /**
-     * The Petersburg revision.
-     *
-     * Other names: Constantinople2, ConstantinopleFix.
-     *
-     * https://eips.ethereum.org/EIPS/eip-1716
-     */
-    EVMC_PETERSBURG = 6,
-
-    /**
-     * The Istanbul revision.
-     *
-     * https://eips.ethereum.org/EIPS/eip-1679
-     */
-    EVMC_ISTANBUL = 7,
-
-    /**
-     * The Berlin revision.
-     *
-     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/berlin.md
-     */
-    EVMC_BERLIN = 8,
-
-    /**
-     * The London revision.
-     *
-     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/london.md
-     */
-    EVMC_LONDON = 9,
-
-    /**
-     * The Paris revision (aka The Merge).
-     *
-     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/paris.md
-     */
-    EVMC_PARIS = 10,
-
-    /**
-     * The Shanghai revision.
-     *
-     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md
-     */
-    EVMC_SHANGHAI = 11,
-
-    /**
-     * The Cancun revision.
-     *
-     * The future next revision after Shanghai.
-     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/cancun.md
-     */
-    EVMC_CANCUN = 12,
-
-    /**
-     * The Prague revision.
-     *
-     * The future next revision after Cancun.
-     */
-    EVMC_PRAGUE = 13,
-
-    /** The maximum EVM revision supported. */
-    EVMC_MAX_REVISION = EVMC_PRAGUE,
-
-    /**
-     * The latest known EVM revision with finalized specification.
-     *
-     * This is handy for EVM tools to always use the latest revision available.
-     */
-    EVMC_LATEST_STABLE_REVISION = EVMC_SHANGHAI
-};
-
-
-/**
- * Executes the given code using the input from the message.
- *
- * This function MAY be invoked multiple times for a single VM instance.
- *
- * @param vm         The VM instance. This argument MUST NOT be NULL.
- * @param host       The Host interface. This argument MUST NOT be NULL unless
- *                   the @p vm has the ::EVMC_CAPABILITY_PRECOMPILES capability.
- * @param context    The opaque pointer to the Host execution context.
- *                   This argument MAY be NULL. The VM MUST pass the same
- *                   pointer to the methods of the @p host interface.
- *                   The VM MUST NOT dereference the pointer.
- * @param rev        The requested EVM specification revision.
- * @param msg        The call parameters. See ::evmc_message. This argument MUST NOT be NULL.
- * @param code       The reference to the code to be executed. This argument MAY be NULL.
- * @param code_size  The length of the code. If @p code is NULL this argument MUST be 0.
- * @return           The execution result.
- */
-typedef struct evmc_result (*evmc_execute_fn)(struct evmc_vm* vm,
-                                              const struct evmc_host_interface* host,
-                                              struct evmc_host_context* context,
-                                              enum evmc_revision rev,
-                                              const struct evmc_message* msg,
-                                              uint8_t const* code,
-                                              size_t code_size);
-
-/**
- * Possible capabilities of a VM.
- */
-enum evmc_capabilities
-{
-    /**
-     * The VM is capable of executing EVM1 bytecode.
-     */
-    EVMC_CAPABILITY_EVM1 = (1u << 0),
-
-    /**
-     * The VM is capable of executing ewasm bytecode.
-     */
-    EVMC_CAPABILITY_EWASM = (1u << 1),
-
-    /**
-     * The VM is capable of executing the precompiled contracts
-     * defined for the range of code addresses.
-     *
-     * The EIP-1352 (https://eips.ethereum.org/EIPS/eip-1352) specifies
-     * the range 0x000...0000 - 0x000...ffff of addresses
-     * reserved for precompiled and system contracts.
-     *
-     * This capability is **experimental** and MAY be removed without notice.
-     */
-    EVMC_CAPABILITY_PRECOMPILES = (1u << 2)
-};
-
-/**
- * Alias for unsigned integer representing a set of bit flags of EVMC capabilities.
- *
- * @see evmc_capabilities
- */
-typedef uint32_t evmc_capabilities_flagset;
-
-/**
- * Return the supported capabilities of the VM instance.
- *
- * This function MAY be invoked multiple times for a single VM instance,
- * and its value MAY be influenced by calls to evmc_vm::set_option.
- *
- * @param vm  The VM instance.
- * @return    The supported capabilities of the VM. @see evmc_capabilities.
- */
-typedef evmc_capabilities_flagset (*evmc_get_capabilities_fn)(struct evmc_vm* vm);
-
-
-/**
- * The VM instance.
- *
- * Defines the base struct of the VM implementation.
- */
-struct evmc_vm
-{
-    /**
-     * EVMC ABI version implemented by the VM instance.
-     *
-     * Can be used to detect ABI incompatibilities.
-     * The EVMC ABI version represented by this file is in ::EVMC_ABI_VERSION.
-     */
-    const int abi_version;
-
-    /**
-     * The name of the EVMC VM implementation.
-     *
-     * It MUST be a NULL-terminated not empty string.
-     * The content MUST be UTF-8 encoded (this implies ASCII encoding is also allowed).
-     */
-    const char* name;
-
-    /**
-     * The version of the EVMC VM implementation, e.g. "1.2.3b4".
-     *
-     * It MUST be a NULL-terminated not empty string.
-     * The content MUST be UTF-8 encoded (this implies ASCII encoding is also allowed).
-     */
-    const char* version;
-
-    /**
-     * Pointer to function destroying the VM instance.
-     *
-     * This is a mandatory method and MUST NOT be set to NULL.
-     */
-    evmc_destroy_fn destroy;
-
-    /**
-     * Pointer to function executing a code by the VM instance.
-     *
-     * This is a mandatory method and MUST NOT be set to NULL.
-     */
-    evmc_execute_fn execute;
-
-    /**
-     * A method returning capabilities supported by the VM instance.
-     *
-     * The value returned MAY change when different options are set via the set_option() method.
-     *
-     * A Client SHOULD only rely on the value returned if it has queried it after
-     * it has called the set_option().
-     *
-     * This is a mandatory method and MUST NOT be set to NULL.
-     */
-    evmc_get_capabilities_fn get_capabilities;
-
-    /**
-     * Optional pointer to function modifying VM's options.
-     *
-     * If the VM does not support this feature the pointer can be NULL.
-     */
-    evmc_set_option_fn set_option;
-};
-
-/* END Python CFFI declarations */
-
-#ifdef EVMC_DOCUMENTATION
-/**
- * Example of a function creating an instance of an example EVM implementation.
- *
- * Each EVM implementation MUST provide a function returning an EVM instance.
- * The function SHOULD be named `evmc_create_<vm-name>(void)`. If the VM name contains hyphens
- * replaces them with underscores in the function names.
- *
- * @par Binaries naming convention
- * For VMs distributed as shared libraries, the name of the library SHOULD match the VM name.
- * The convetional library filename prefixes and extensions SHOULD be ignored by the Client.
- * For example, the shared library with the "beta-interpreter" implementation may be named
- * `libbeta-interpreter.so`.
- *
- * @return  The VM instance or NULL indicating instance creation failure.
- */
-struct evmc_vm* evmc_create_example_vm(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/** @} */
diff --git a/test/evmc/evmc.hpp b/test/evmc/evmc.hpp
deleted file mode 100644
index a29f802d27a7..000000000000
--- a/test/evmc/evmc.hpp
+++ /dev/null
@@ -1,916 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-#pragma once
-
-#include <evmc/evmc.h>
-#include <evmc/helpers.h>
-#include <evmc/hex.hpp>
-
-#include <functional>
-#include <initializer_list>
-#include <ostream>
-#include <string_view>
-#include <utility>
-
-static_assert(EVMC_LATEST_STABLE_REVISION <= EVMC_MAX_REVISION,
-              "latest stable revision ill-defined");
-
-/// EVMC C++ API - wrappers and bindings for C++
-/// @ingroup cpp
-namespace evmc
-{
-/// String view of uint8_t chars.
-using bytes_view = std::basic_string_view<uint8_t>;
-
-/// The big-endian 160-bit hash suitable for keeping an Ethereum address.
-///
-/// This type wraps C ::evmc_address to make sure objects of this type are always initialized.
-struct address : evmc_address
-{
-    /// Default and converting constructor.
-    ///
-    /// Initializes bytes to zeros if not other @p init value provided.
-    constexpr address(evmc_address init = {}) noexcept : evmc_address{init} {}
-
-    /// Converting constructor from unsigned integer value.
-    ///
-    /// This constructor assigns the @p v value to the last 8 bytes [12:19]
-    /// in big-endian order.
-    constexpr explicit address(uint64_t v) noexcept
-      : evmc_address{{0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      static_cast<uint8_t>(v >> 56),
-                      static_cast<uint8_t>(v >> 48),
-                      static_cast<uint8_t>(v >> 40),
-                      static_cast<uint8_t>(v >> 32),
-                      static_cast<uint8_t>(v >> 24),
-                      static_cast<uint8_t>(v >> 16),
-                      static_cast<uint8_t>(v >> 8),
-                      static_cast<uint8_t>(v >> 0)}}
-    {}
-
-    /// Explicit operator converting to bool.
-    inline constexpr explicit operator bool() const noexcept;
-
-    /// Implicit operator converting to bytes_view.
-    inline constexpr operator bytes_view() const noexcept { return {bytes, sizeof(bytes)}; }
-};
-
-/// The fixed size array of 32 bytes for storing 256-bit EVM values.
-///
-/// This type wraps C ::evmc_bytes32 to make sure objects of this type are always initialized.
-struct bytes32 : evmc_bytes32
-{
-    /// Default and converting constructor.
-    ///
-    /// Initializes bytes to zeros if not other @p init value provided.
-    constexpr bytes32(evmc_bytes32 init = {}) noexcept : evmc_bytes32{init} {}
-
-    /// Converting constructor from unsigned integer value.
-    ///
-    /// This constructor assigns the @p v value to the last 8 bytes [24:31]
-    /// in big-endian order.
-    constexpr explicit bytes32(uint64_t v) noexcept
-      : evmc_bytes32{{0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      0,
-                      static_cast<uint8_t>(v >> 56),
-                      static_cast<uint8_t>(v >> 48),
-                      static_cast<uint8_t>(v >> 40),
-                      static_cast<uint8_t>(v >> 32),
-                      static_cast<uint8_t>(v >> 24),
-                      static_cast<uint8_t>(v >> 16),
-                      static_cast<uint8_t>(v >> 8),
-                      static_cast<uint8_t>(v >> 0)}}
-    {}
-
-    /// Explicit operator converting to bool.
-    inline constexpr explicit operator bool() const noexcept;
-
-    /// Implicit operator converting to bytes_view.
-    inline constexpr operator bytes_view() const noexcept { return {bytes, sizeof(bytes)}; }
-};
-
-/// The alias for evmc::bytes32 to represent a big-endian 256-bit integer.
-using uint256be = bytes32;
-
-
-/// Loads 64 bits / 8 bytes of data from the given @p data array in big-endian order.
-inline constexpr uint64_t load64be(const uint8_t* data) noexcept
-{
-    return (uint64_t{data[0]} << 56) | (uint64_t{data[1]} << 48) | (uint64_t{data[2]} << 40) |
-           (uint64_t{data[3]} << 32) | (uint64_t{data[4]} << 24) | (uint64_t{data[5]} << 16) |
-           (uint64_t{data[6]} << 8) | uint64_t{data[7]};
-}
-
-/// Loads 64 bits / 8 bytes of data from the given @p data array in little-endian order.
-inline constexpr uint64_t load64le(const uint8_t* data) noexcept
-{
-    return uint64_t{data[0]} | (uint64_t{data[1]} << 8) | (uint64_t{data[2]} << 16) |
-           (uint64_t{data[3]} << 24) | (uint64_t{data[4]} << 32) | (uint64_t{data[5]} << 40) |
-           (uint64_t{data[6]} << 48) | (uint64_t{data[7]} << 56);
-}
-
-/// Loads 32 bits / 4 bytes of data from the given @p data array in big-endian order.
-inline constexpr uint32_t load32be(const uint8_t* data) noexcept
-{
-    return (uint32_t{data[0]} << 24) | (uint32_t{data[1]} << 16) | (uint32_t{data[2]} << 8) |
-           uint32_t{data[3]};
-}
-
-/// Loads 32 bits / 4 bytes of data from the given @p data array in little-endian order.
-inline constexpr uint32_t load32le(const uint8_t* data) noexcept
-{
-    return uint32_t{data[0]} | (uint32_t{data[1]} << 8) | (uint32_t{data[2]} << 16) |
-           (uint32_t{data[3]} << 24);
-}
-
-namespace fnv
-{
-constexpr auto prime = 0x100000001b3;              ///< The 64-bit FNV prime number.
-constexpr auto offset_basis = 0xcbf29ce484222325;  ///< The 64-bit FNV offset basis.
-
-/// The hashing transformation for 64-bit inputs based on the FNV-1a formula.
-inline constexpr uint64_t fnv1a_by64(uint64_t h, uint64_t x) noexcept
-{
-    return (h ^ x) * prime;
-}
-}  // namespace fnv
-
-
-/// The "equal to" comparison operator for the evmc::address type.
-inline constexpr bool operator==(const address& a, const address& b) noexcept
-{
-    return load64le(&a.bytes[0]) == load64le(&b.bytes[0]) &&
-           load64le(&a.bytes[8]) == load64le(&b.bytes[8]) &&
-           load32le(&a.bytes[16]) == load32le(&b.bytes[16]);
-}
-
-/// The "not equal to" comparison operator for the evmc::address type.
-inline constexpr bool operator!=(const address& a, const address& b) noexcept
-{
-    return !(a == b);
-}
-
-/// The "less than" comparison operator for the evmc::address type.
-inline constexpr bool operator<(const address& a, const address& b) noexcept
-{
-    return load64be(&a.bytes[0]) < load64be(&b.bytes[0]) ||
-           (load64be(&a.bytes[0]) == load64be(&b.bytes[0]) &&
-            (load64be(&a.bytes[8]) < load64be(&b.bytes[8]) ||
-             (load64be(&a.bytes[8]) == load64be(&b.bytes[8]) &&
-              load32be(&a.bytes[16]) < load32be(&b.bytes[16]))));
-}
-
-/// The "greater than" comparison operator for the evmc::address type.
-inline constexpr bool operator>(const address& a, const address& b) noexcept
-{
-    return b < a;
-}
-
-/// The "less than or equal to" comparison operator for the evmc::address type.
-inline constexpr bool operator<=(const address& a, const address& b) noexcept
-{
-    return !(b < a);
-}
-
-/// The "greater than or equal to" comparison operator for the evmc::address type.
-inline constexpr bool operator>=(const address& a, const address& b) noexcept
-{
-    return !(a < b);
-}
-
-/// The "equal to" comparison operator for the evmc::bytes32 type.
-inline constexpr bool operator==(const bytes32& a, const bytes32& b) noexcept
-{
-    return load64le(&a.bytes[0]) == load64le(&b.bytes[0]) &&
-           load64le(&a.bytes[8]) == load64le(&b.bytes[8]) &&
-           load64le(&a.bytes[16]) == load64le(&b.bytes[16]) &&
-           load64le(&a.bytes[24]) == load64le(&b.bytes[24]);
-}
-
-/// The "not equal to" comparison operator for the evmc::bytes32 type.
-inline constexpr bool operator!=(const bytes32& a, const bytes32& b) noexcept
-{
-    return !(a == b);
-}
-
-/// The "less than" comparison operator for the evmc::bytes32 type.
-inline constexpr bool operator<(const bytes32& a, const bytes32& b) noexcept
-{
-    return load64be(&a.bytes[0]) < load64be(&b.bytes[0]) ||
-           (load64be(&a.bytes[0]) == load64be(&b.bytes[0]) &&
-            (load64be(&a.bytes[8]) < load64be(&b.bytes[8]) ||
-             (load64be(&a.bytes[8]) == load64be(&b.bytes[8]) &&
-              (load64be(&a.bytes[16]) < load64be(&b.bytes[16]) ||
-               (load64be(&a.bytes[16]) == load64be(&b.bytes[16]) &&
-                load64be(&a.bytes[24]) < load64be(&b.bytes[24]))))));
-}
-
-/// The "greater than" comparison operator for the evmc::bytes32 type.
-inline constexpr bool operator>(const bytes32& a, const bytes32& b) noexcept
-{
-    return b < a;
-}
-
-/// The "less than or equal to" comparison operator for the evmc::bytes32 type.
-inline constexpr bool operator<=(const bytes32& a, const bytes32& b) noexcept
-{
-    return !(b < a);
-}
-
-/// The "greater than or equal to" comparison operator for the evmc::bytes32 type.
-inline constexpr bool operator>=(const bytes32& a, const bytes32& b) noexcept
-{
-    return !(a < b);
-}
-
-/// Checks if the given address is the zero address.
-inline constexpr bool is_zero(const address& a) noexcept
-{
-    return a == address{};
-}
-
-inline constexpr address::operator bool() const noexcept
-{
-    return !is_zero(*this);
-}
-
-/// Checks if the given bytes32 object has all zero bytes.
-inline constexpr bool is_zero(const bytes32& a) noexcept
-{
-    return a == bytes32{};
-}
-
-inline constexpr bytes32::operator bool() const noexcept
-{
-    return !is_zero(*this);
-}
-
-namespace literals
-{
-/// Converts a raw literal into value of type T.
-///
-/// This function is expected to be used on literals in constexpr context only.
-/// In case the input is invalid the std::terminate() is called.
-/// TODO(c++20): Use consteval.
-template <typename T>
-constexpr T parse(std::string_view s) noexcept
-{
-    return from_hex<T>(s).value();
-}
-
-/// Literal for evmc::address.
-constexpr address operator""_address(const char* s) noexcept
-{
-    return parse<address>(s);
-}
-
-/// Literal for evmc::bytes32.
-constexpr bytes32 operator""_bytes32(const char* s) noexcept
-{
-    return parse<bytes32>(s);
-}
-}  // namespace literals
-
-using namespace literals;
-
-
-/// @copydoc evmc_status_code_to_string
-inline const char* to_string(evmc_status_code status_code) noexcept
-{
-    return evmc_status_code_to_string(status_code);
-}
-
-/// @copydoc evmc_revision_to_string
-inline const char* to_string(evmc_revision rev) noexcept
-{
-    return evmc_revision_to_string(rev);
-}
-
-
-/// Alias for evmc_make_result().
-constexpr auto make_result = evmc_make_result;
-
-/// @copydoc evmc_result
-///
-/// This is a RAII wrapper for evmc_result and objects of this type
-/// automatically release attached resources.
-class Result : private evmc_result
-{
-public:
-    using evmc_result::create_address;
-    using evmc_result::gas_left;
-    using evmc_result::gas_refund;
-    using evmc_result::output_data;
-    using evmc_result::output_size;
-    using evmc_result::status_code;
-
-    /// Creates the result from the provided arguments.
-    ///
-    /// The provided output is copied to memory allocated with malloc()
-    /// and the evmc_result::release function is set to one invoking free().
-    ///
-    /// @param _status_code  The status code.
-    /// @param _gas_left     The amount of gas left.
-    /// @param _gas_refund   The amount of refunded gas.
-    /// @param _output_data  The pointer to the output.
-    /// @param _output_size  The output size.
-    explicit Result(evmc_status_code _status_code,
-                    int64_t _gas_left,
-                    int64_t _gas_refund,
-                    const uint8_t* _output_data,
-                    size_t _output_size) noexcept
-      : evmc_result{make_result(_status_code, _gas_left, _gas_refund, _output_data, _output_size)}
-    {}
-
-    /// Creates the result without output.
-    ///
-    /// @param _status_code  The status code.
-    /// @param _gas_left     The amount of gas left.
-    /// @param _gas_refund   The amount of refunded gas.
-    explicit Result(evmc_status_code _status_code = EVMC_INTERNAL_ERROR,
-                    int64_t _gas_left = 0,
-                    int64_t _gas_refund = 0) noexcept
-      : evmc_result{make_result(_status_code, _gas_left, _gas_refund, nullptr, 0)}
-    {}
-
-    /// Creates the result of contract creation.
-    ///
-    /// @param _status_code     The status code.
-    /// @param _gas_left        The amount of gas left.
-    /// @param _gas_refund      The amount of refunded gas.
-    /// @param _create_address  The address of the possibly created account.
-    explicit Result(evmc_status_code _status_code,
-                    int64_t _gas_left,
-                    int64_t _gas_refund,
-                    const evmc_address& _create_address) noexcept
-      : evmc_result{make_result(_status_code, _gas_left, _gas_refund, nullptr, 0)}
-    {
-        create_address = _create_address;
-    }
-
-    /// Converting constructor from raw evmc_result.
-    ///
-    /// This object takes ownership of the resources of @p res.
-    explicit Result(const evmc_result& res) noexcept : evmc_result{res} {}
-
-    /// Destructor responsible for automatically releasing attached resources.
-    ~Result() noexcept
-    {
-        if (release != nullptr)
-            release(this);
-    }
-
-    /// Move constructor.
-    Result(Result&& other) noexcept : evmc_result{other}
-    {
-        other.release = nullptr;  // Disable releasing of the rvalue object.
-    }
-
-    /// Move assignment operator.
-    ///
-    /// The self-assignment MUST never happen.
-    ///
-    /// @param other The other result object.
-    /// @return      The reference to the left-hand side object.
-    Result& operator=(Result&& other) noexcept
-    {
-        this->~Result();                           // Release this object.
-        static_cast<evmc_result&>(*this) = other;  // Copy data.
-        other.release = nullptr;                   // Disable releasing of the rvalue object.
-        return *this;
-    }
-
-    /// Access the result object as a referenced to ::evmc_result.
-    evmc_result& raw() noexcept { return *this; }
-
-    /// Access the result object as a const referenced to ::evmc_result.
-    const evmc_result& raw() const noexcept { return *this; }
-
-    /// Releases the ownership and returns the raw copy of evmc_result.
-    ///
-    /// This method drops the ownership of the result
-    /// (result's resources are not going to be released when this object is destructed).
-    /// It is the caller's responsibility having the returned copy of the result to release it.
-    /// This object MUST NOT be used after this method is invoked.
-    ///
-    /// @return  The copy of this object converted to raw evmc_result.
-    evmc_result release_raw() noexcept
-    {
-        const auto out = evmc_result{*this};  // Copy data.
-        this->release = nullptr;              // Disable releasing of this object.
-        return out;
-    }
-};
-
-
-/// The EVMC Host interface
-class HostInterface
-{
-public:
-    virtual ~HostInterface() noexcept = default;
-
-    /// @copydoc evmc_host_interface::account_exists
-    virtual bool account_exists(const address& addr) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::get_storage
-    virtual bytes32 get_storage(const address& addr, const bytes32& key) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::set_storage
-    virtual evmc_storage_status set_storage(const address& addr,
-                                            const bytes32& key,
-                                            const bytes32& value) noexcept = 0;
-
-    /// @copydoc evmc_host_interface::get_balance
-    virtual uint256be get_balance(const address& addr) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::get_code_size
-    virtual size_t get_code_size(const address& addr) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::get_code_hash
-    virtual bytes32 get_code_hash(const address& addr) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::copy_code
-    virtual size_t copy_code(const address& addr,
-                             size_t code_offset,
-                             uint8_t* buffer_data,
-                             size_t buffer_size) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::selfdestruct
-    virtual bool selfdestruct(const address& addr, const address& beneficiary) noexcept = 0;
-
-    /// @copydoc evmc_host_interface::call
-    virtual Result call(const evmc_message& msg) noexcept = 0;
-
-    /// @copydoc evmc_host_interface::get_tx_context
-    virtual evmc_tx_context get_tx_context() const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::get_block_hash
-    virtual bytes32 get_block_hash(int64_t block_number) const noexcept = 0;
-
-    /// @copydoc evmc_host_interface::emit_log
-    virtual void emit_log(const address& addr,
-                          const uint8_t* data,
-                          size_t data_size,
-                          const bytes32 topics[],
-                          size_t num_topics) noexcept = 0;
-
-    /// @copydoc evmc_host_interface::access_account
-    virtual evmc_access_status access_account(const address& addr) noexcept = 0;
-
-    /// @copydoc evmc_host_interface::access_storage
-    virtual evmc_access_status access_storage(const address& addr, const bytes32& key) noexcept = 0;
-};
-
-
-/// Wrapper around EVMC host context / host interface.
-///
-/// To be used by VM implementations as better alternative to using ::evmc_host_context directly.
-class HostContext : public HostInterface
-{
-    const evmc_host_interface* host = nullptr;
-    evmc_host_context* context = nullptr;
-
-public:
-    /// Default constructor for null Host context.
-    HostContext() = default;
-
-    /// Constructor from the EVMC Host primitives.
-    /// @param interface  The reference to the Host interface.
-    /// @param ctx        The pointer to the Host context object. This parameter MAY be null.
-    HostContext(const evmc_host_interface& interface, evmc_host_context* ctx) noexcept
-      : host{&interface}, context{ctx}
-    {}
-
-    bool account_exists(const address& address) const noexcept final
-    {
-        return host->account_exists(context, &address);
-    }
-
-    bytes32 get_storage(const address& address, const bytes32& key) const noexcept final
-    {
-        return host->get_storage(context, &address, &key);
-    }
-
-    evmc_storage_status set_storage(const address& address,
-                                    const bytes32& key,
-                                    const bytes32& value) noexcept final
-    {
-        return host->set_storage(context, &address, &key, &value);
-    }
-
-    uint256be get_balance(const address& address) const noexcept final
-    {
-        return host->get_balance(context, &address);
-    }
-
-    size_t get_code_size(const address& address) const noexcept final
-    {
-        return host->get_code_size(context, &address);
-    }
-
-    bytes32 get_code_hash(const address& address) const noexcept final
-    {
-        return host->get_code_hash(context, &address);
-    }
-
-    size_t copy_code(const address& address,
-                     size_t code_offset,
-                     uint8_t* buffer_data,
-                     size_t buffer_size) const noexcept final
-    {
-        return host->copy_code(context, &address, code_offset, buffer_data, buffer_size);
-    }
-
-    bool selfdestruct(const address& addr, const address& beneficiary) noexcept final
-    {
-        return host->selfdestruct(context, &addr, &beneficiary);
-    }
-
-    Result call(const evmc_message& message) noexcept final
-    {
-        return Result{host->call(context, &message)};
-    }
-
-    /// @copydoc HostInterface::get_tx_context()
-    evmc_tx_context get_tx_context() const noexcept final { return host->get_tx_context(context); }
-
-    bytes32 get_block_hash(int64_t number) const noexcept final
-    {
-        return host->get_block_hash(context, number);
-    }
-
-    void emit_log(const address& addr,
-                  const uint8_t* data,
-                  size_t data_size,
-                  const bytes32 topics[],
-                  size_t topics_count) noexcept final
-    {
-        host->emit_log(context, &addr, data, data_size, topics, topics_count);
-    }
-
-    evmc_access_status access_account(const address& address) noexcept final
-    {
-        return host->access_account(context, &address);
-    }
-
-    evmc_access_status access_storage(const address& address, const bytes32& key) noexcept final
-    {
-        return host->access_storage(context, &address, &key);
-    }
-};
-
-
-/// Abstract class to be used by Host implementations.
-///
-/// When implementing EVMC Host, you can directly inherit from the evmc::Host class.
-/// This way your implementation will be simpler by avoiding manual handling
-/// of the ::evmc_host_context and the ::evmc_host_interface.
-class Host : public HostInterface
-{
-public:
-    /// Provides access to the global host interface.
-    /// @returns  Reference to the host interface object.
-    static const evmc_host_interface& get_interface() noexcept;
-
-    /// Converts the Host object to the opaque host context pointer.
-    /// @returns  Pointer to evmc_host_context.
-    evmc_host_context* to_context() noexcept { return reinterpret_cast<evmc_host_context*>(this); }
-
-    /// Converts the opaque host context pointer back to the original Host object.
-    /// @tparam DerivedClass  The class derived from the Host class.
-    /// @param context        The opaque host context pointer.
-    /// @returns              The pointer to DerivedClass.
-    template <typename DerivedClass = Host>
-    static DerivedClass* from_context(evmc_host_context* context) noexcept
-    {
-        // Get pointer of the Host base class.
-        auto* h = reinterpret_cast<Host*>(context);
-
-        // Additional downcast, only possible if DerivedClass inherits from Host.
-        return static_cast<DerivedClass*>(h);
-    }
-};
-
-
-/// @copybrief evmc_vm
-///
-/// This is a RAII wrapper for evmc_vm, and object of this type
-/// automatically destroys the VM instance.
-class VM
-{
-public:
-    VM() noexcept = default;
-
-    /// Converting constructor from evmc_vm.
-    explicit VM(evmc_vm* vm) noexcept : m_instance{vm} {}
-
-    /// Destructor responsible for automatically destroying the VM instance.
-    ~VM() noexcept
-    {
-        if (m_instance != nullptr)
-            m_instance->destroy(m_instance);
-    }
-
-    VM(const VM&) = delete;
-    VM& operator=(const VM&) = delete;
-
-    /// Move constructor.
-    VM(VM&& other) noexcept : m_instance{other.m_instance} { other.m_instance = nullptr; }
-
-    /// Move assignment operator.
-    VM& operator=(VM&& other) noexcept
-    {
-        this->~VM();
-        m_instance = other.m_instance;
-        other.m_instance = nullptr;
-        return *this;
-    }
-
-    /// The constructor that captures a VM instance and configures the instance
-    /// with the provided list of options.
-    inline VM(evmc_vm* vm,
-              std::initializer_list<std::pair<const char*, const char*>> options) noexcept;
-
-    /// Checks if contains a valid pointer to the VM instance.
-    explicit operator bool() const noexcept { return m_instance != nullptr; }
-
-    /// Checks whenever the VM instance is ABI compatible with the current EVMC API.
-    bool is_abi_compatible() const noexcept { return m_instance->abi_version == EVMC_ABI_VERSION; }
-
-    /// @copydoc evmc_vm::name
-    char const* name() const noexcept { return m_instance->name; }
-
-    /// @copydoc evmc_vm::version
-    char const* version() const noexcept { return m_instance->version; }
-
-    /// Checks if the VM has the given capability.
-    bool has_capability(evmc_capabilities capability) const noexcept
-    {
-        return (get_capabilities() & static_cast<evmc_capabilities_flagset>(capability)) != 0;
-    }
-
-    /// @copydoc evmc_vm::get_capabilities
-    evmc_capabilities_flagset get_capabilities() const noexcept
-    {
-        return m_instance->get_capabilities(m_instance);
-    }
-
-    /// @copydoc evmc_set_option()
-    evmc_set_option_result set_option(const char name[], const char value[]) noexcept
-    {
-        return evmc_set_option(m_instance, name, value);
-    }
-
-    /// @copydoc evmc_execute()
-    Result execute(const evmc_host_interface& host,
-                   evmc_host_context* ctx,
-                   evmc_revision rev,
-                   const evmc_message& msg,
-                   const uint8_t* code,
-                   size_t code_size) noexcept
-    {
-        return Result{m_instance->execute(m_instance, &host, ctx, rev, &msg, code, code_size)};
-    }
-
-    /// Convenient variant of the VM::execute() that takes reference to evmc::Host class.
-    Result execute(Host& host,
-                   evmc_revision rev,
-                   const evmc_message& msg,
-                   const uint8_t* code,
-                   size_t code_size) noexcept
-    {
-        return execute(Host::get_interface(), host.to_context(), rev, msg, code, code_size);
-    }
-
-    /// Executes code without the Host context.
-    ///
-    /// The same as
-    /// execute(const evmc_host_interface&, evmc_host_context*, evmc_revision,
-    ///         const evmc_message&, const uint8_t*, size_t),
-    /// but without providing the Host context and interface.
-    /// This method is for experimental precompiles support where execution is
-    /// guaranteed not to require any Host access.
-    Result execute(evmc_revision rev,
-                   const evmc_message& msg,
-                   const uint8_t* code,
-                   size_t code_size) noexcept
-    {
-        return Result{
-            m_instance->execute(m_instance, nullptr, nullptr, rev, &msg, code, code_size)};
-    }
-
-    /// Returns the pointer to C EVMC struct representing the VM.
-    ///
-    /// Gives access to the C EVMC VM struct to allow advanced interaction with the VM not supported
-    /// by the C++ interface. Use as the last resort.
-    /// This object still owns the VM after returning the pointer. The returned pointer MAY be null.
-    evmc_vm* get_raw_pointer() const noexcept { return m_instance; }
-
-private:
-    evmc_vm* m_instance = nullptr;
-};
-
-inline VM::VM(evmc_vm* vm,
-              std::initializer_list<std::pair<const char*, const char*>> options) noexcept
-  : m_instance{vm}
-{
-    // This constructor is implemented outside of the class definition to workaround a doxygen bug.
-    for (const auto& option : options)
-        set_option(option.first, option.second);
-}
-
-
-namespace internal
-{
-inline bool account_exists(evmc_host_context* h, const evmc_address* addr) noexcept
-{
-    return Host::from_context(h)->account_exists(*addr);
-}
-
-inline evmc_bytes32 get_storage(evmc_host_context* h,
-                                const evmc_address* addr,
-                                const evmc_bytes32* key) noexcept
-{
-    return Host::from_context(h)->get_storage(*addr, *key);
-}
-
-inline evmc_storage_status set_storage(evmc_host_context* h,
-                                       const evmc_address* addr,
-                                       const evmc_bytes32* key,
-                                       const evmc_bytes32* value) noexcept
-{
-    return Host::from_context(h)->set_storage(*addr, *key, *value);
-}
-
-inline evmc_uint256be get_balance(evmc_host_context* h, const evmc_address* addr) noexcept
-{
-    return Host::from_context(h)->get_balance(*addr);
-}
-
-inline size_t get_code_size(evmc_host_context* h, const evmc_address* addr) noexcept
-{
-    return Host::from_context(h)->get_code_size(*addr);
-}
-
-inline evmc_bytes32 get_code_hash(evmc_host_context* h, const evmc_address* addr) noexcept
-{
-    return Host::from_context(h)->get_code_hash(*addr);
-}
-
-inline size_t copy_code(evmc_host_context* h,
-                        const evmc_address* addr,
-                        size_t code_offset,
-                        uint8_t* buffer_data,
-                        size_t buffer_size) noexcept
-{
-    return Host::from_context(h)->copy_code(*addr, code_offset, buffer_data, buffer_size);
-}
-
-inline bool selfdestruct(evmc_host_context* h,
-                         const evmc_address* addr,
-                         const evmc_address* beneficiary) noexcept
-{
-    return Host::from_context(h)->selfdestruct(*addr, *beneficiary);
-}
-
-inline evmc_result call(evmc_host_context* h, const evmc_message* msg) noexcept
-{
-    return Host::from_context(h)->call(*msg).release_raw();
-}
-
-inline evmc_tx_context get_tx_context(evmc_host_context* h) noexcept
-{
-    return Host::from_context(h)->get_tx_context();
-}
-
-inline evmc_bytes32 get_block_hash(evmc_host_context* h, int64_t block_number) noexcept
-{
-    return Host::from_context(h)->get_block_hash(block_number);
-}
-
-inline void emit_log(evmc_host_context* h,
-                     const evmc_address* addr,
-                     const uint8_t* data,
-                     size_t data_size,
-                     const evmc_bytes32 topics[],
-                     size_t num_topics) noexcept
-{
-    Host::from_context(h)->emit_log(*addr, data, data_size, static_cast<const bytes32*>(topics),
-                                    num_topics);
-}
-
-inline evmc_access_status access_account(evmc_host_context* h, const evmc_address* addr) noexcept
-{
-    return Host::from_context(h)->access_account(*addr);
-}
-
-inline evmc_access_status access_storage(evmc_host_context* h,
-                                         const evmc_address* addr,
-                                         const evmc_bytes32* key) noexcept
-{
-    return Host::from_context(h)->access_storage(*addr, *key);
-}
-}  // namespace internal
-
-inline const evmc_host_interface& Host::get_interface() noexcept
-{
-    static constexpr evmc_host_interface interface = {
-        ::evmc::internal::account_exists, ::evmc::internal::get_storage,
-        ::evmc::internal::set_storage,    ::evmc::internal::get_balance,
-        ::evmc::internal::get_code_size,  ::evmc::internal::get_code_hash,
-        ::evmc::internal::copy_code,      ::evmc::internal::selfdestruct,
-        ::evmc::internal::call,           ::evmc::internal::get_tx_context,
-        ::evmc::internal::get_block_hash, ::evmc::internal::emit_log,
-        ::evmc::internal::access_account, ::evmc::internal::access_storage,
-    };
-    return interface;
-}
-}  // namespace evmc
-
-
-/// "Stream out" operator implementation for ::evmc_status_code.
-///
-/// @note This is defined in global namespace to match ::evmc_status_code definition and allow
-///       convenient operator overloading usage.
-inline std::ostream& operator<<(std::ostream& os, evmc_status_code status_code)
-{
-    return os << evmc::to_string(status_code);
-}
-
-/// "Stream out" operator implementation for ::evmc_revision.
-///
-/// @note This is defined in global namespace to match ::evmc_revision definition and allow
-///       convenient operator overloading usage.
-inline std::ostream& operator<<(std::ostream& os, evmc_revision rev)
-{
-    return os << evmc::to_string(rev);
-}
-
-namespace std
-{
-/// Hash operator template specialization for evmc::address. Needed for unordered containers.
-template <>
-struct hash<evmc::address>
-{
-    /// Hash operator using FNV1a-based folding.
-    constexpr size_t operator()(const evmc::address& s) const noexcept
-    {
-        using namespace evmc;
-        using namespace fnv;
-        return static_cast<size_t>(fnv1a_by64(
-            fnv1a_by64(fnv1a_by64(fnv::offset_basis, load64le(&s.bytes[0])), load64le(&s.bytes[8])),
-            load32le(&s.bytes[16])));
-    }
-};
-
-/// Hash operator template specialization for evmc::bytes32. Needed for unordered containers.
-template <>
-struct hash<evmc::bytes32>
-{
-    /// Hash operator using FNV1a-based folding.
-    constexpr size_t operator()(const evmc::bytes32& s) const noexcept
-    {
-        using namespace evmc;
-        using namespace fnv;
-        return static_cast<size_t>(
-            fnv1a_by64(fnv1a_by64(fnv1a_by64(fnv1a_by64(fnv::offset_basis, load64le(&s.bytes[0])),
-                                             load64le(&s.bytes[8])),
-                                  load64le(&s.bytes[16])),
-                       load64le(&s.bytes[24])));
-    }
-};
-}  // namespace std
diff --git a/test/evmc/filter_iterator.hpp b/test/evmc/filter_iterator.hpp
deleted file mode 100644
index 0a349fc93aef..000000000000
--- a/test/evmc/filter_iterator.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2022 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-#pragma once
-
-#include <iterator>
-
-namespace evmc
-{
-/// The constexpr variant of std::isspace().
-inline constexpr bool isspace(char ch) noexcept
-{
-    // Implementation taken from LLVM's libc.
-    return ch == ' ' || (static_cast<unsigned>(ch) - '\t') < 5;
-}
-
-/// Checks if a character is not a white space.
-inline constexpr bool is_not_space(char ch) noexcept
-{
-    return !isspace(ch);
-}
-
-/// The filter iterator adaptor creates a view of an iterator range in which some elements of the
-/// range are skipped. A predicate function controls which elements are skipped. When the predicate
-/// is applied to an element, if it returns true then the element is retained and if it returns
-/// false then the element is skipped over. When skipping over elements, it is necessary for the
-/// filter adaptor to know when to stop so as to avoid going past the end of the underlying range.
-/// A filter iterator is therefore constructed with pair of iterators indicating the range of
-/// elements in the unfiltered sequence to be traversed.
-///
-/// Similar to boost::filter_iterator.
-template <typename BaseIterator,
-          bool predicate(typename std::iterator_traits<BaseIterator>::value_type) noexcept>
-struct filter_iterator
-{
-    /// The iterator difference type.
-    using difference_type = typename std::iterator_traits<BaseIterator>::difference_type;
-
-    /// The iterator value type.
-    using value_type = typename std::iterator_traits<BaseIterator>::value_type;
-
-    /// The iterator pointer type.
-    using pointer = typename std::iterator_traits<BaseIterator>::pointer;
-
-    /// The iterator reference type.
-    using reference = typename std::iterator_traits<BaseIterator>::reference;
-
-    /// The iterator category.
-    using iterator_category = std::input_iterator_tag;
-
-private:
-    BaseIterator base;
-    BaseIterator base_end;
-    value_type value;
-
-    constexpr void forward_to_next_value() noexcept
-    {
-        for (; base != base_end; ++base)
-        {
-            value = *base;
-            if (predicate(value))
-                break;
-        }
-    }
-
-public:
-    /// The constructor of the base iterator pair.
-    constexpr filter_iterator(BaseIterator it, BaseIterator end) noexcept : base{it}, base_end{end}
-    {
-        forward_to_next_value();
-    }
-
-    /// The dereference operator.
-    constexpr auto operator*() noexcept
-    {
-        // We should not read from an input base iterator twice. So the only read is in
-        // forward_to_next_value() and here we return the cached value.
-        return value;
-    }
-
-    /// The increment operator.
-    constexpr void operator++() noexcept
-    {
-        ++base;
-        forward_to_next_value();
-    }
-
-    /// The equality operator.
-    constexpr bool operator==(const filter_iterator& o) const noexcept { return base == o.base; }
-
-    /// The inequality operator.
-    constexpr bool operator!=(const filter_iterator& o) const noexcept { return base != o.base; }
-};
-
-/// The input filter iterator which skips whitespace characters from the base input iterator.
-template <typename BaseIterator>
-struct skip_space_iterator : filter_iterator<BaseIterator, is_not_space>
-{
-    using filter_iterator<BaseIterator, is_not_space>::filter_iterator;
-};
-
-/// Class template argument deduction guide.
-template <typename BaseIterator>
-skip_space_iterator(BaseIterator, BaseIterator) -> skip_space_iterator<BaseIterator>;
-}  // namespace evmc
diff --git a/test/evmc/helpers.h b/test/evmc/helpers.h
deleted file mode 100644
index 683567ef13ff..000000000000
--- a/test/evmc/helpers.h
+++ /dev/null
@@ -1,315 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-
-/**
- * EVMC Helpers
- *
- * A collection of C helper functions for invoking a VM instance methods.
- * These are convenient for languages where invoking function pointers
- * is "ugly" or impossible (such as Go).
- *
- * @defgroup helpers EVMC Helpers
- * @{
- */
-#pragma once
-
-#include <evmc/evmc.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#endif
-
-/**
- * Returns true if the VM has a compatible ABI version.
- */
-static inline bool evmc_is_abi_compatible(struct evmc_vm* vm)
-{
-    return vm->abi_version == EVMC_ABI_VERSION;
-}
-
-/**
- * Returns the name of the VM.
- */
-static inline const char* evmc_vm_name(struct evmc_vm* vm)
-{
-    return vm->name;
-}
-
-/**
- * Returns the version of the VM.
- */
-static inline const char* evmc_vm_version(struct evmc_vm* vm)
-{
-    return vm->version;
-}
-
-/**
- * Checks if the VM has the given capability.
- *
- * @see evmc_get_capabilities_fn
- */
-static inline bool evmc_vm_has_capability(struct evmc_vm* vm, enum evmc_capabilities capability)
-{
-    return (vm->get_capabilities(vm) & (evmc_capabilities_flagset)capability) != 0;
-}
-
-/**
- * Destroys the VM instance.
- *
- * @see evmc_destroy_fn
- */
-static inline void evmc_destroy(struct evmc_vm* vm)
-{
-    vm->destroy(vm);
-}
-
-/**
- * Sets the option for the VM, if the feature is supported by the VM.
- *
- * @see evmc_set_option_fn
- */
-static inline enum evmc_set_option_result evmc_set_option(struct evmc_vm* vm,
-                                                          char const* name,
-                                                          char const* value)
-{
-    if (vm->set_option)
-        return vm->set_option(vm, name, value);
-    return EVMC_SET_OPTION_INVALID_NAME;
-}
-
-/**
- * Executes code in the VM instance.
- *
- * @see evmc_execute_fn.
- */
-static inline struct evmc_result evmc_execute(struct evmc_vm* vm,
-                                              const struct evmc_host_interface* host,
-                                              struct evmc_host_context* context,
-                                              enum evmc_revision rev,
-                                              const struct evmc_message* msg,
-                                              uint8_t const* code,
-                                              size_t code_size)
-{
-    return vm->execute(vm, host, context, rev, msg, code, code_size);
-}
-
-/// The evmc_result release function using free() for releasing the memory.
-///
-/// This function is used in the evmc_make_result(),
-/// but may be also used in other case if convenient.
-///
-/// @param result The result object.
-static void evmc_free_result_memory(const struct evmc_result* result)
-{
-    free((uint8_t*)result->output_data);
-}
-
-/// Creates the result from the provided arguments.
-///
-/// The provided output is copied to memory allocated with malloc()
-/// and the evmc_result::release function is set to one invoking free().
-///
-/// In case of memory allocation failure, the result has all fields zeroed
-/// and only evmc_result::status_code is set to ::EVMC_OUT_OF_MEMORY internal error.
-///
-/// @param status_code  The status code.
-/// @param gas_left     The amount of gas left.
-/// @param gas_refund   The amount of refunded gas.
-/// @param output_data  The pointer to the output.
-/// @param output_size  The output size.
-static inline struct evmc_result evmc_make_result(enum evmc_status_code status_code,
-                                                  int64_t gas_left,
-                                                  int64_t gas_refund,
-                                                  const uint8_t* output_data,
-                                                  size_t output_size)
-{
-    struct evmc_result result;
-    memset(&result, 0, sizeof(result));
-
-    if (output_size != 0)
-    {
-        uint8_t* buffer = (uint8_t*)malloc(output_size);
-
-        if (!buffer)
-        {
-            result.status_code = EVMC_OUT_OF_MEMORY;
-            return result;
-        }
-
-        memcpy(buffer, output_data, output_size);
-        result.output_data = buffer;
-        result.output_size = output_size;
-        result.release = evmc_free_result_memory;
-    }
-
-    result.status_code = status_code;
-    result.gas_left = gas_left;
-    result.gas_refund = gas_refund;
-    return result;
-}
-
-/**
- * Releases the resources allocated to the execution result.
- *
- * @param result  The result object to be released. MUST NOT be NULL.
- *
- * @see evmc_result::release() evmc_release_result_fn
- */
-static inline void evmc_release_result(struct evmc_result* result)
-{
-    if (result->release)
-        result->release(result);
-}
-
-
-/**
- * Helpers for optional storage of evmc_result.
- *
- * In some contexts (i.e. evmc_result::create_address is unused) objects of
- * type evmc_result contains a memory storage that MAY be used by the object
- * owner. This group defines helper types and functions for accessing
- * the optional storage.
- *
- * @defgroup result_optional_storage Result Optional Storage
- * @{
- */
-
-/**
- * The union representing evmc_result "optional storage".
- *
- * The evmc_result struct contains 24 bytes of optional storage that can be
- * reused by the object creator if the object does not contain
- * evmc_result::create_address.
- *
- * A VM implementation MAY use this memory to keep additional data
- * when returning result from evmc_execute_fn().
- * The host application MAY use this memory to keep additional data
- * when returning result of performed calls from evmc_call_fn().
- *
- * @see evmc_get_optional_storage(), evmc_get_const_optional_storage().
- */
-union evmc_result_optional_storage
-{
-    uint8_t bytes[24]; /**< 24 bytes of optional storage. */
-    void* pointer;     /**< Optional pointer. */
-};
-
-/** Provides read-write access to evmc_result "optional storage". */
-static inline union evmc_result_optional_storage* evmc_get_optional_storage(
-    struct evmc_result* result)
-{
-    return (union evmc_result_optional_storage*)&result->create_address;
-}
-
-/** Provides read-only access to evmc_result "optional storage". */
-static inline const union evmc_result_optional_storage* evmc_get_const_optional_storage(
-    const struct evmc_result* result)
-{
-    return (const union evmc_result_optional_storage*)&result->create_address;
-}
-
-/** @} */
-
-/** Returns text representation of the ::evmc_status_code. */
-static inline const char* evmc_status_code_to_string(enum evmc_status_code status_code)
-{
-    switch (status_code)
-    {
-    case EVMC_SUCCESS:
-        return "success";
-    case EVMC_FAILURE:
-        return "failure";
-    case EVMC_REVERT:
-        return "revert";
-    case EVMC_OUT_OF_GAS:
-        return "out of gas";
-    case EVMC_INVALID_INSTRUCTION:
-        return "invalid instruction";
-    case EVMC_UNDEFINED_INSTRUCTION:
-        return "undefined instruction";
-    case EVMC_STACK_OVERFLOW:
-        return "stack overflow";
-    case EVMC_STACK_UNDERFLOW:
-        return "stack underflow";
-    case EVMC_BAD_JUMP_DESTINATION:
-        return "bad jump destination";
-    case EVMC_INVALID_MEMORY_ACCESS:
-        return "invalid memory access";
-    case EVMC_CALL_DEPTH_EXCEEDED:
-        return "call depth exceeded";
-    case EVMC_STATIC_MODE_VIOLATION:
-        return "static mode violation";
-    case EVMC_PRECOMPILE_FAILURE:
-        return "precompile failure";
-    case EVMC_CONTRACT_VALIDATION_FAILURE:
-        return "contract validation failure";
-    case EVMC_ARGUMENT_OUT_OF_RANGE:
-        return "argument out of range";
-    case EVMC_WASM_UNREACHABLE_INSTRUCTION:
-        return "wasm unreachable instruction";
-    case EVMC_WASM_TRAP:
-        return "wasm trap";
-    case EVMC_INSUFFICIENT_BALANCE:
-        return "insufficient balance";
-    case EVMC_INTERNAL_ERROR:
-        return "internal error";
-    case EVMC_REJECTED:
-        return "rejected";
-    case EVMC_OUT_OF_MEMORY:
-        return "out of memory";
-    }
-    return "<unknown>";
-}
-
-/** Returns the name of the ::evmc_revision. */
-static inline const char* evmc_revision_to_string(enum evmc_revision rev)
-{
-    switch (rev)
-    {
-    case EVMC_FRONTIER:
-        return "Frontier";
-    case EVMC_HOMESTEAD:
-        return "Homestead";
-    case EVMC_TANGERINE_WHISTLE:
-        return "Tangerine Whistle";
-    case EVMC_SPURIOUS_DRAGON:
-        return "Spurious Dragon";
-    case EVMC_BYZANTIUM:
-        return "Byzantium";
-    case EVMC_CONSTANTINOPLE:
-        return "Constantinople";
-    case EVMC_PETERSBURG:
-        return "Petersburg";
-    case EVMC_ISTANBUL:
-        return "Istanbul";
-    case EVMC_BERLIN:
-        return "Berlin";
-    case EVMC_LONDON:
-        return "London";
-    case EVMC_PARIS:
-        return "Paris";
-    case EVMC_SHANGHAI:
-        return "Shanghai";
-    case EVMC_CANCUN:
-        return "Cancun";
-    case EVMC_PRAGUE:
-        return "Prague";
-    }
-    return "<unknown>";
-}
-
-/** @} */
-
-#ifdef __cplusplus
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-}  // extern "C"
-#endif
diff --git a/test/evmc/hex.hpp b/test/evmc/hex.hpp
deleted file mode 100644
index 31bbe519534e..000000000000
--- a/test/evmc/hex.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2021 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-#pragma once
-
-#include <evmc/filter_iterator.hpp>
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <string_view>
-
-namespace evmc
-{
-/// String of uint8_t chars.
-using bytes = std::basic_string<uint8_t>;
-
-/// String view of uint8_t chars.
-using bytes_view = std::basic_string_view<uint8_t>;
-
-
-/// Encode a byte to a hex string.
-inline std::string hex(uint8_t b) noexcept
-{
-    static constexpr auto hex_digits = "0123456789abcdef";
-    return {hex_digits[b >> 4], hex_digits[b & 0xf]};
-}
-
-/// Encodes bytes as hex string.
-inline std::string hex(bytes_view bs)
-{
-    std::string str;
-    str.reserve(bs.size() * 2);
-    for (const auto b : bs)
-        str += hex(b);
-    return str;
-}
-
-namespace internal
-{
-/// Extracts the nibble value out of a hex digit.
-/// Returns -1 in case of invalid hex digit.
-inline constexpr int from_hex_digit(char h) noexcept
-{
-    if (h >= '0' && h <= '9')
-        return h - '0';
-    else if (h >= 'a' && h <= 'f')
-        return h - 'a' + 10;
-    else if (h >= 'A' && h <= 'F')
-        return h - 'A' + 10;
-    else
-        return -1;
-}
-}  // namespace internal
-
-/// Decodes hex-encoded sequence of characters.
-///
-/// It is guaranteed that the output will not be longer than half of the input length.
-///
-/// @param begin  The input begin iterator. It only must satisfy input iterator concept.
-/// @param end    The input end iterator. It only must satisfy input iterator concept.
-/// @param out    The output iterator. It must satisfy output iterator concept.
-/// @return       True if successful, false if input is invalid hex.
-template <typename InputIt, typename OutputIt>
-inline constexpr bool from_hex(InputIt begin, InputIt end, OutputIt out) noexcept
-{
-    int hi_nibble = -1;  // Init with invalid value, should never be used.
-    size_t i = 0;
-    for (auto it = begin; it != end; ++it, ++i)
-    {
-        const auto h = *it;
-        const int v = evmc::internal::from_hex_digit(h);
-        if (v < 0)
-        {
-            if (i == 1 && hi_nibble == 0 && h == 'x')  // 0x prefix
-                continue;
-            return false;
-        }
-
-        if (i % 2 == 0)
-            hi_nibble = v << 4;
-        else
-            *out++ = static_cast<uint8_t>(hi_nibble | v);
-    }
-
-    return i % 2 == 0;
-}
-
-/// Validates hex encoded string.
-///
-/// @return  True if the input is valid hex.
-inline bool validate_hex(std::string_view hex) noexcept
-{
-    struct noop_output_iterator
-    {
-        uint8_t sink = {};
-        uint8_t& operator*() noexcept { return sink; }
-        noop_output_iterator operator++(int) noexcept { return *this; }  // NOLINT(cert-dcl21-cpp)
-    };
-
-    return from_hex(hex.begin(), hex.end(), noop_output_iterator{});
-}
-
-/// Decodes hex encoded string to bytes.
-///
-/// In case the input is invalid the returned value is std::nullopt.
-/// This can happen if a non-hex digit or odd number of digits is encountered.
-inline std::optional<bytes> from_hex(std::string_view hex)
-{
-    bytes bs;
-    bs.reserve(hex.size() / 2);
-    if (!from_hex(hex.begin(), hex.end(), std::back_inserter(bs)))
-        return {};
-    return bs;
-}
-
-/// Decodes hex-encoded string into custom type T with .bytes array of uint8_t.
-///
-/// When the input is smaller than the result type, the result is padded with zeros on the left
-/// (the result bytes of lowest indices are filled with zeros).
-/// TODO: Support optional left alignment.
-template <typename T>
-constexpr std::optional<T> from_hex(std::string_view s) noexcept
-{
-    // Omit the optional 0x prefix.
-    if (s.size() >= 2 && s[0] == '0' && s[1] == 'x')
-        s.remove_prefix(2);
-
-    T r{};  // The T must have .bytes array. This may be lifted if std::bit_cast is available.
-    constexpr auto num_out_bytes = std::size(r.bytes);
-    const auto num_in_bytes = s.length() / 2;
-    if (num_in_bytes > num_out_bytes)
-        return {};
-    if (!from_hex(s.begin(), s.end(), &r.bytes[num_out_bytes - num_in_bytes]))
-        return {};
-    return r;
-}
-
-/// Decodes hex encoded string to bytes. The whitespace in the input is ignored.
-///
-/// In case the input is invalid the returned value is std::nullopt.
-/// This can happen if a non-hex digit or odd number of digits is encountered.
-/// The whitespace (as defined by std::isspace) in the input is ignored.
-template <typename InputIterator>
-std::optional<bytes> from_spaced_hex(InputIterator begin, InputIterator end) noexcept
-{
-    bytes bs;
-    if (!from_hex(skip_space_iterator{begin, end}, skip_space_iterator{end, end},
-                  std::back_inserter(bs)))
-        return {};
-    return bs;
-}
-
-/// @copydoc from_spaced_hex
-inline std::optional<bytes> from_spaced_hex(std::string_view hex) noexcept
-{
-    return from_spaced_hex(hex.begin(), hex.end());
-}
-}  // namespace evmc
diff --git a/test/evmc/loader.c b/test/evmc/loader.c
deleted file mode 100644
index 141b1d4f61af..000000000000
--- a/test/evmc/loader.c
+++ /dev/null
@@ -1,322 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-
-#include <evmc/loader.h>
-
-#include <evmc/evmc.h>
-#include <evmc/helpers.h>
-
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#if defined(EVMC_LOADER_MOCK)
-#include "../../test/unittests/loader_mock.h"
-#elif defined(_WIN32)
-#include <Windows.h>
-#define DLL_HANDLE HMODULE
-#define DLL_OPEN(filename) LoadLibrary(filename)
-#define DLL_CLOSE(handle) FreeLibrary(handle)
-#define DLL_GET_CREATE_FN(handle, name) (evmc_create_fn)(uintptr_t) GetProcAddress(handle, name)
-#define DLL_GET_ERROR_MSG() NULL
-#else
-#include <dlfcn.h>
-#define DLL_HANDLE void*
-#define DLL_OPEN(filename) dlopen(filename, RTLD_LAZY)
-#define DLL_CLOSE(handle) dlclose(handle)
-// NOLINTNEXTLINE(performance-no-int-to-ptr)
-#define DLL_GET_CREATE_FN(handle, name) (evmc_create_fn)(uintptr_t) dlsym(handle, name)
-#define DLL_GET_ERROR_MSG() dlerror()
-#endif
-
-#ifdef __has_attribute
-#if __has_attribute(format)
-#define ATTR_FORMAT(archetype, string_index, first_to_check) \
-    __attribute__((format(archetype, string_index, first_to_check)))
-#endif
-#endif
-
-#ifndef ATTR_FORMAT
-#define ATTR_FORMAT(...)
-#endif
-
-/*
- * Limited variant of strcpy_s().
- */
-#if !defined(EVMC_LOADER_MOCK)
-static
-#endif
-    int
-    strcpy_sx(char* dest, size_t destsz, const char* src)
-{
-    size_t len = strlen(src);
-    if (len >= destsz)
-    {
-        // The input src will not fit into the dest buffer.
-        // Set the first byte of the dest to null to make it effectively empty string
-        // and return error.
-        dest[0] = 0;
-        return 1;
-    }
-    // NOLINTNEXTLINE(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
-    memcpy(dest, src, len);
-    dest[len] = 0;
-    return 0;
-}
-
-enum
-{
-    PATH_MAX_LENGTH = 4096,
-    LAST_ERROR_MSG_BUFFER_SIZE = 511
-};
-
-static const char* last_error_msg = NULL;
-
-// Buffer for formatted error messages.
-// It has one null byte extra to avoid buffer read overflow during concurrent access.
-static char last_error_msg_buffer[LAST_ERROR_MSG_BUFFER_SIZE + 1];
-
-ATTR_FORMAT(printf, 2, 3)
-static enum evmc_loader_error_code set_error(enum evmc_loader_error_code error_code,
-                                             const char* format,
-                                             ...)
-{
-    va_list args;
-    va_start(args, format);
-    // NOLINTNEXTLINE(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
-    if (vsnprintf(last_error_msg_buffer, LAST_ERROR_MSG_BUFFER_SIZE, format, args) <
-        LAST_ERROR_MSG_BUFFER_SIZE)
-        last_error_msg = last_error_msg_buffer;
-    va_end(args);
-    return error_code;
-}
-
-
-evmc_create_fn evmc_load(const char* filename, enum evmc_loader_error_code* error_code)
-{
-    last_error_msg = NULL;  // Reset last error.
-    enum evmc_loader_error_code ec = EVMC_LOADER_SUCCESS;
-    evmc_create_fn create_fn = NULL;
-
-    if (!filename)
-    {
-        ec = set_error(EVMC_LOADER_INVALID_ARGUMENT, "invalid argument: file name cannot be null");
-        goto exit;
-    }
-
-    const size_t length = strlen(filename);
-    if (length == 0)
-    {
-        ec = set_error(EVMC_LOADER_INVALID_ARGUMENT, "invalid argument: file name cannot be empty");
-        goto exit;
-    }
-    else if (length > PATH_MAX_LENGTH)
-    {
-        ec = set_error(EVMC_LOADER_INVALID_ARGUMENT,
-                       "invalid argument: file name is too long (%d, maximum allowed length is %d)",
-                       (int)length, PATH_MAX_LENGTH);
-        goto exit;
-    }
-
-    DLL_HANDLE handle = DLL_OPEN(filename);
-    if (!handle)
-    {
-        // Get error message if available.
-        last_error_msg = DLL_GET_ERROR_MSG();
-        if (last_error_msg)
-            ec = EVMC_LOADER_CANNOT_OPEN;
-        else
-            ec = set_error(EVMC_LOADER_CANNOT_OPEN, "cannot open %s", filename);
-        goto exit;
-    }
-
-    // Create name buffer with the prefix.
-    const char prefix[] = "evmc_create_";
-    const size_t prefix_length = strlen(prefix);
-    char prefixed_name[sizeof(prefix) + PATH_MAX_LENGTH];
-    strcpy_sx(prefixed_name, sizeof(prefixed_name), prefix);
-
-    // Find filename in the path.
-    const char* sep_pos = strrchr(filename, '/');
-#ifdef _WIN32
-    // On Windows check also Windows classic path separator.
-    const char* sep_pos_windows = strrchr(filename, '\\');
-    sep_pos = sep_pos_windows > sep_pos ? sep_pos_windows : sep_pos;
-#endif
-    const char* name_pos = sep_pos ? sep_pos + 1 : filename;
-
-    // Skip "lib" prefix if present.
-    const char lib_prefix[] = "lib";
-    const size_t lib_prefix_length = strlen(lib_prefix);
-    if (strncmp(name_pos, lib_prefix, lib_prefix_length) == 0)
-        name_pos += lib_prefix_length;
-
-    char* base_name = prefixed_name + prefix_length;
-    strcpy_sx(base_name, PATH_MAX_LENGTH, name_pos);
-
-    // Trim all file extensions.
-    char* ext_pos = strchr(prefixed_name, '.');
-    if (ext_pos)
-        *ext_pos = 0;
-
-    // Replace all "-" with "_".
-    char* dash_pos = base_name;
-    while ((dash_pos = strchr(dash_pos, '-')) != NULL)
-        *dash_pos++ = '_';
-
-    // Search for the built function name.
-    create_fn = DLL_GET_CREATE_FN(handle, prefixed_name);
-
-    if (!create_fn)
-        create_fn = DLL_GET_CREATE_FN(handle, "evmc_create");
-
-    if (!create_fn)
-    {
-        DLL_CLOSE(handle);
-        ec = set_error(EVMC_LOADER_SYMBOL_NOT_FOUND, "EVMC create function not found in %s",
-                       filename);
-    }
-
-exit:
-    if (error_code)
-        *error_code = ec;
-    return create_fn;
-}
-
-const char* evmc_last_error_msg(void)
-{
-    const char* m = last_error_msg;
-    last_error_msg = NULL;
-    return m;
-}
-
-struct evmc_vm* evmc_load_and_create(const char* filename, enum evmc_loader_error_code* error_code)
-{
-    // First load the DLL. This also resets the last_error_msg;
-    evmc_create_fn create_fn = evmc_load(filename, error_code);
-
-    if (!create_fn)
-        return NULL;
-
-    enum evmc_loader_error_code ec = EVMC_LOADER_SUCCESS;
-
-    struct evmc_vm* vm = create_fn();
-    if (!vm)
-    {
-        ec = set_error(EVMC_LOADER_VM_CREATION_FAILURE, "creating EVMC VM of %s has failed",
-                       filename);
-        goto exit;
-    }
-
-    if (!evmc_is_abi_compatible(vm))
-    {
-        ec = set_error(EVMC_LOADER_ABI_VERSION_MISMATCH,
-                       "EVMC ABI version %d of %s mismatches the expected version %d",
-                       vm->abi_version, filename, EVMC_ABI_VERSION);
-        evmc_destroy(vm);
-        vm = NULL;
-        goto exit;
-    }
-
-exit:
-    if (error_code)
-        *error_code = ec;
-
-    return vm;
-}
-
-/// Gets the token delimited by @p delim character of the string pointed by the @p str_ptr.
-/// If the delimiter is not found, the whole string is returned.
-/// The @p str_ptr is also slided after the delimiter or to the string end
-/// if the delimiter is not found (in this case the @p str_ptr points to an empty string).
-static char* get_token(char** str_ptr, char delim)
-{
-    char* str = *str_ptr;
-    char* delim_pos = strchr(str, delim);
-    if (delim_pos)
-    {
-        // If the delimiter is found, null it to get null-terminated prefix
-        // and slide the str_ptr after the delimiter.
-        *delim_pos = '\0';
-        *str_ptr = delim_pos + 1;
-    }
-    else
-    {
-        // Otherwise, slide the str_ptr to the end and return the whole string as the prefix.
-        *str_ptr += strlen(str);
-    }
-    return str;
-}
-
-struct evmc_vm* evmc_load_and_configure(const char* config, enum evmc_loader_error_code* error_code)
-{
-    enum evmc_loader_error_code ec = EVMC_LOADER_SUCCESS;
-    struct evmc_vm* vm = NULL;
-
-    char config_copy_buffer[PATH_MAX_LENGTH];
-    if (strcpy_sx(config_copy_buffer, sizeof(config_copy_buffer), config) != 0)
-    {
-        ec = set_error(EVMC_LOADER_INVALID_ARGUMENT,
-                       "invalid argument: configuration is too long (maximum allowed length is %d)",
-                       (int)sizeof(config_copy_buffer));
-        goto exit;
-    }
-
-    char* options = config_copy_buffer;
-    const char* path = get_token(&options, ',');
-
-    vm = evmc_load_and_create(path, error_code);
-    if (!vm)
-        return NULL;
-
-    while (strlen(options) != 0)
-    {
-        if (vm->set_option == NULL)
-        {
-            ec = set_error(EVMC_LOADER_INVALID_OPTION_NAME, "%s (%s) does not support any options",
-                           vm->name, path);
-            goto exit;
-        }
-
-        char* option = get_token(&options, ',');
-
-        // Slit option into name and value by taking the name token.
-        // The option variable will have the value, can be empty.
-        const char* name = get_token(&option, '=');
-
-        enum evmc_set_option_result r = vm->set_option(vm, name, option);
-        switch (r)
-        {
-        case EVMC_SET_OPTION_SUCCESS:
-            break;
-        case EVMC_SET_OPTION_INVALID_NAME:
-            ec = set_error(EVMC_LOADER_INVALID_OPTION_NAME, "%s (%s): unknown option '%s'",
-                           vm->name, path, name);
-            goto exit;
-        case EVMC_SET_OPTION_INVALID_VALUE:
-            ec = set_error(EVMC_LOADER_INVALID_OPTION_VALUE,
-                           "%s (%s): unsupported value '%s' for option '%s'", vm->name, path,
-                           option, name);
-            goto exit;
-
-        default:
-            ec = set_error(EVMC_LOADER_INVALID_OPTION_VALUE,
-                           "%s (%s): unknown error when setting value '%s' for option '%s'",
-                           vm->name, path, option, name);
-            goto exit;
-        }
-    }
-
-exit:
-    if (error_code)
-        *error_code = ec;
-
-    if (ec == EVMC_LOADER_SUCCESS)
-        return vm;
-
-    if (vm)
-        evmc_destroy(vm);
-    return NULL;
-}
diff --git a/test/evmc/loader.h b/test/evmc/loader.h
deleted file mode 100644
index c5ee7e3ae29c..000000000000
--- a/test/evmc/loader.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-
-/**
- * EVMC Loader Library
- *
- * The EVMC Loader Library supports loading VMs implemented as Dynamically Loaded Libraries
- * (DLLs, shared objects).
- *
- * @defgroup loader EVMC Loader
- * @{
- */
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** The function pointer type for EVMC create functions. */
-typedef struct evmc_vm* (*evmc_create_fn)(void);
-
-/// Error codes for the EVMC loader.
-///
-/// Objects of this type SHOULD be initialized with ::EVMC_LOADER_UNSPECIFIED_ERROR
-/// before passing to the EVMC loader.
-enum evmc_loader_error_code
-{
-    /** The loader succeeded. */
-    EVMC_LOADER_SUCCESS = 0,
-
-    /** The loader cannot open the given file name. */
-    EVMC_LOADER_CANNOT_OPEN = 1,
-
-    /** The VM create function not found. */
-    EVMC_LOADER_SYMBOL_NOT_FOUND = 2,
-
-    /** The invalid argument value provided. */
-    EVMC_LOADER_INVALID_ARGUMENT = 3,
-
-    /** The creation of a VM instance has failed. */
-    EVMC_LOADER_VM_CREATION_FAILURE = 4,
-
-    /** The ABI version of the VM instance has mismatched. */
-    EVMC_LOADER_ABI_VERSION_MISMATCH = 5,
-
-    /** The VM option is invalid. */
-    EVMC_LOADER_INVALID_OPTION_NAME = 6,
-
-    /** The VM option value is invalid. */
-    EVMC_LOADER_INVALID_OPTION_VALUE = 7,
-
-    /// This error value will be never returned by the EVMC loader,
-    /// but can be used by users to init evmc_loader_error_code objects.
-    EVMC_LOADER_UNSPECIFIED_ERROR = -1
-};
-
-/**
- * Dynamically loads the EVMC module with a VM implementation.
- *
- * This function tries to open a dynamically loaded library (DLL) at the given `filename`.
- * On UNIX-like systems dlopen() function is used. On Windows LoadLibrary() function is used.
- *
- * If the file does not exist or is not a valid shared library the ::EVMC_LOADER_CANNOT_OPEN error
- * code is signaled and NULL is returned.
- *
- * After the DLL is successfully loaded the function tries to find the EVM create function in the
- * library. The `filename` is used to guess the EVM name and the name of the create function.
- * The create function name is constructed by the following rules. Consider example path:
- * "/ethereum/libexample-interpreter.so.1.0".
- * - the filename is taken from the path:
- *   "libexample-interpreter.so.1.0",
- * - the "lib" prefix and all file extensions are stripped from the name:
- *   "example-interpreter"
- * - all "-" are replaced with "_" to construct _base name_:
- *   "example_interpreter",
- * - the function name "evmc_create_" + _base name_ is searched in the library:
- *   "evmc_create_example_interpreter",
- * - if the function is not found, the function name "evmc_create" is searched in the library.
- *
- * If the create function is found in the library, the pointer to the function is returned.
- * Otherwise, the ::EVMC_LOADER_SYMBOL_NOT_FOUND error code is signaled and NULL is returned.
- *
- * It is safe to call this function with the same filename argument multiple times
- * (the DLL is not going to be loaded multiple times).
- *
- * @param filename    The null terminated path (absolute or relative) to an EVMC module
- *                    (dynamically loaded library) containing the VM implementation.
- *                    If the value is NULL, an empty C-string or longer than the path maximum length
- *                    the ::EVMC_LOADER_INVALID_ARGUMENT is signaled.
- * @param error_code  The pointer to the error code. If not NULL the value is set to
- *                    ::EVMC_LOADER_SUCCESS on success or any other error code as described above.
- * @return            The pointer to the EVM create function or NULL in case of error.
- */
-evmc_create_fn evmc_load(const char* filename, enum evmc_loader_error_code* error_code);
-
-/**
- * Dynamically loads the EVMC module and creates the VM instance.
- *
- * This is a macro for creating the VM instance with the function returned from evmc_load().
- * The function signals the same errors as evmc_load() and additionally:
- * - ::EVMC_LOADER_VM_CREATION_FAILURE when the create function returns NULL,
- * - ::EVMC_LOADER_ABI_VERSION_MISMATCH when the created VM instance has ABI version different
- *   from the ABI version of this library (::EVMC_ABI_VERSION).
- *
- * It is safe to call this function with the same filename argument multiple times:
- * the DLL is not going to be loaded multiple times, but the function will return new VM instance
- * each time.
- *
- * @param filename    The null terminated path (absolute or relative) to an EVMC module
- *                    (dynamically loaded library) containing the VM implementation.
- *                    If the value is NULL, an empty C-string or longer than the path maximum length
- *                    the ::EVMC_LOADER_INVALID_ARGUMENT is signaled.
- * @param error_code  The pointer to the error code. If not NULL the value is set to
- *                    ::EVMC_LOADER_SUCCESS on success or any other error code as described above.
- * @return            The pointer to the created VM or NULL in case of error.
- */
-struct evmc_vm* evmc_load_and_create(const char* filename, enum evmc_loader_error_code* error_code);
-
-/**
- * Dynamically loads the EVMC module, then creates and configures the VM instance.
- *
- * This function performs the following actions atomically:
- * - loads the EVMC module (as evmc_load()),
- * - creates the VM instance,
- * - configures the VM instance with options provided in the @p config parameter.
- *
- * The configuration string (@p config) has the following syntax:
- *
- *     <path> ("," <option-name> ["=" <option-value>])*
- *
- * In this syntax, an option without a value can be specified (`,option,`)
- * as a shortcut for using empty value (`,option=,`).
- *
- * Options are passed to a VM in the order they are specified in the configuration string.
- * It is up to the VM implementation how to handle duplicated options and other conflicts.
- *
- * Example configuration string:
- *
- *     ./modules/vm.so,engine=compiler,trace,verbosity=2
- *
- * The function signals the same errors as evmc_load_and_create() and additionally:
- * - ::EVMC_LOADER_INVALID_OPTION_NAME
- *   when the provided options list contains an option unknown for the VM,
- * - ::EVMC_LOADER_INVALID_OPTION_VALUE
- *   when there exists unsupported value for a given VM option.
-
- *
- * @param config      The path to the EVMC module with additional configuration options.
- * @param error_code  The pointer to the error code. If not NULL the value is set to
- *                    ::EVMC_LOADER_SUCCESS on success or any other error code as described above.
- * @return            The pointer to the created VM or NULL in case of error.
- */
-struct evmc_vm* evmc_load_and_configure(const char* config,
-                                        enum evmc_loader_error_code* error_code);
-
-/**
- * Returns the human-readable message describing the most recent error
- * that occurred in EVMC loading since the last call to this function.
- *
- * In case any loading function returned ::EVMC_LOADER_SUCCESS this function always returns NULL.
- * In case of error code other than success returned, this function MAY return the error message.
- * Calling this function "consumes" the error message and the function will return NULL
- * from subsequent invocations.
- * This function is not thread-safe.
- *
- * @return Error message or NULL if no additional information is available.
- *         The returned pointer MUST NOT be freed by the caller.
- */
-const char* evmc_last_error_msg(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
diff --git a/test/evmc/mocked_host.hpp b/test/evmc/mocked_host.hpp
deleted file mode 100644
index 173b793ac7a6..000000000000
--- a/test/evmc/mocked_host.hpp
+++ /dev/null
@@ -1,481 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2019 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-#pragma once
-
-#include <evmc/evmc.hpp>
-#include <algorithm>
-#include <cassert>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-namespace evmc
-{
-/// The string of bytes.
-using bytes = std::basic_string<uint8_t>;
-
-/// Extended value (with original value and access flag) for account storage.
-struct StorageValue
-{
-    /// The current storage value.
-    bytes32 current;
-
-    /// The original storage value.
-    bytes32 original;
-
-    /// Is the storage key cold or warm.
-    evmc_access_status access_status = EVMC_ACCESS_COLD;
-
-    /// Default constructor.
-    StorageValue() noexcept = default;
-
-    /// Constructor sets the current and original to the same value. Optional access status.
-    StorageValue(const bytes32& _value,  // NOLINT(hicpp-explicit-conversions)
-                 evmc_access_status _access_status = EVMC_ACCESS_COLD) noexcept
-      : current{_value}, original{_value}, access_status{_access_status}
-    {}
-
-    /// Constructor with original value and optional access status
-    StorageValue(const bytes32& _value,
-                 const bytes32& _original,
-                 evmc_access_status _access_status = EVMC_ACCESS_COLD) noexcept
-      : current{_value}, original{_original}, access_status{_access_status}
-    {}
-};
-
-/// Mocked account.
-struct MockedAccount
-{
-    /// The account nonce.
-    int nonce = 0;
-
-    /// The account code.
-    bytes code;
-
-    /// The code hash. Can be a value not related to the actual code.
-    bytes32 codehash;
-
-    /// The account balance.
-    uint256be balance;
-
-    /// The account storage map.
-    std::map<bytes32, StorageValue> storage;
-
-    /// Helper method for setting balance by numeric type.
-    void set_balance(uint64_t x) noexcept
-    {
-        balance = uint256be{};
-        for (std::size_t i = 0; i < sizeof(x); ++i)
-            balance.bytes[sizeof(balance) - 1 - i] = static_cast<uint8_t>(x >> (8 * i));
-    }
-};
-
-/// Mocked EVMC Host implementation.
-class MockedHost : public Host
-{
-public:
-    /// LOG record.
-    struct log_record
-    {
-        /// The address of the account which created the log.
-        address creator;
-
-        /// The data attached to the log.
-        bytes data;
-
-        /// The log topics.
-        std::vector<bytes32> topics;
-
-        /// Equal operator.
-        bool operator==(const log_record& other) const noexcept
-        {
-            return creator == other.creator && data == other.data && topics == other.topics;
-        }
-    };
-
-    /// The set of all accounts in the Host, organized by their addresses.
-    std::unordered_map<address, MockedAccount> accounts;
-
-    /// The EVMC transaction context to be returned by get_tx_context().
-    evmc_tx_context tx_context = {};
-
-    /// The block header hash value to be returned by get_block_hash().
-    bytes32 block_hash = {};
-
-    /// The call result to be returned by the call() method.
-    evmc_result call_result = {};
-
-    /// The record of all block numbers for which get_block_hash() was called.
-    mutable std::vector<int64_t> recorded_blockhashes;
-
-    /// The record of all account accesses.
-    mutable std::vector<address> recorded_account_accesses;
-
-    /// The maximum number of entries in recorded_account_accesses record.
-    /// This is arbitrary value useful in fuzzing when we don't want the record to explode.
-    static constexpr auto max_recorded_account_accesses = 200;
-
-    /// The record of all call messages requested in the call() method.
-    std::vector<evmc_message> recorded_calls;
-
-    /// The maximum number of entries in recorded_calls record.
-    /// This is arbitrary value useful in fuzzing when we don't want the record to explode.
-    static constexpr auto max_recorded_calls = 100;
-
-    /// The record of all LOGs passed to the emit_log() method.
-    std::vector<log_record> recorded_logs;
-
-    /// The record of all SELFDESTRUCTs from the selfdestruct() method
-    /// as a map selfdestructed_address => [beneficiary1, beneficiary2, ...].
-    std::unordered_map<address, std::vector<address>> recorded_selfdestructs;
-
-private:
-    /// The copy of call inputs for the recorded_calls record.
-    std::vector<bytes> m_recorded_calls_inputs;
-
-    /// Record an account access.
-    /// @param addr  The address of the accessed account.
-    void record_account_access(const address& addr) const
-    {
-        if (recorded_account_accesses.empty())
-            recorded_account_accesses.reserve(max_recorded_account_accesses);
-
-        if (recorded_account_accesses.size() < max_recorded_account_accesses)
-            recorded_account_accesses.emplace_back(addr);
-    }
-
-public:
-    /// Returns true if an account exists (EVMC Host method).
-    bool account_exists(const address& addr) const noexcept override
-    {
-        record_account_access(addr);
-        return accounts.count(addr) != 0;
-    }
-
-    /// Get the account's storage value at the given key (EVMC Host method).
-    bytes32 get_storage(const address& addr, const bytes32& key) const noexcept override
-    {
-        record_account_access(addr);
-
-        const auto account_iter = accounts.find(addr);
-        if (account_iter == accounts.end())
-            return {};
-
-        const auto storage_iter = account_iter->second.storage.find(key);
-        if (storage_iter != account_iter->second.storage.end())
-            return storage_iter->second.current;
-        return {};
-    }
-
-    /// Set the account's storage value (EVMC Host method).
-    evmc_storage_status set_storage(const address& addr,
-                                    const bytes32& key,
-                                    const bytes32& value) noexcept override
-    {
-        record_account_access(addr);
-
-        // Get the reference to the storage entry value.
-        // This will create the account in case it was not present.
-        // This is convenient for unit testing and standalone EVM execution to preserve the
-        // storage values after the execution terminates.
-        auto& s = accounts[addr].storage[key];
-
-        // Follow the EIP-2200 specification as closely as possible.
-        // https://eips.ethereum.org/EIPS/eip-2200
-        // Warning: this is not the most efficient implementation. The storage status can be
-        // figured out by combining only 4 checks:
-        // - original != current (dirty)
-        // - original == value (restored)
-        // - current != 0
-        // - value != 0
-        const auto status = [&original = s.original, &current = s.current, &value]() {
-            // Clause 1 is irrelevant:
-            // 1. "If gasleft is less than or equal to gas stipend,
-            //    fail the current call frame with ‘out of gas’ exception"
-
-            // 2. "If current value equals new value (this is a no-op)"
-            if (current == value)
-            {
-                // "SLOAD_GAS is deducted"
-                return EVMC_STORAGE_ASSIGNED;
-            }
-            // 3. "If current value does not equal new value"
-            else
-            {
-                // 3.1. "If original value equals current value
-                //      (this storage slot has not been changed by the current execution context)"
-                if (original == current)
-                {
-                    // 3.1.1 "If original value is 0"
-                    if (is_zero(original))
-                    {
-                        // "SSTORE_SET_GAS is deducted"
-                        return EVMC_STORAGE_ADDED;
-                    }
-                    // 3.1.2 "Otherwise"
-                    else
-                    {
-                        // "SSTORE_RESET_GAS gas is deducted"
-                        auto st = EVMC_STORAGE_MODIFIED;
-
-                        // "If new value is 0"
-                        if (is_zero(value))
-                        {
-                            // "add SSTORE_CLEARS_SCHEDULE gas to refund counter"
-                            st = EVMC_STORAGE_DELETED;
-                        }
-
-                        return st;
-                    }
-                }
-                // 3.2. "If original value does not equal current value
-                //      (this storage slot is dirty),
-                //      SLOAD_GAS gas is deducted.
-                //      Apply both of the following clauses."
-                else
-                {
-                    // Because we need to apply "both following clauses"
-                    // we first collect information which clause is triggered
-                    // then assign status code to combination of these clauses.
-                    enum
-                    {
-                        None = 0,
-                        RemoveClearsSchedule = 1 << 0,
-                        AddClearsSchedule = 1 << 1,
-                        RestoredBySet = 1 << 2,
-                        RestoredByReset = 1 << 3,
-                    };
-                    int triggered_clauses = None;
-
-                    // 3.2.1. "If original value is not 0"
-                    if (!is_zero(original))
-                    {
-                        // 3.2.1.1. "If current value is 0"
-                        if (is_zero(current))
-                        {
-                            // "(also means that new value is not 0)"
-                            assert(!is_zero(value));
-                            // "remove SSTORE_CLEARS_SCHEDULE gas from refund counter"
-                            triggered_clauses |= RemoveClearsSchedule;
-                        }
-                        // 3.2.1.2. "If new value is 0"
-                        if (is_zero(value))
-                        {
-                            // "(also means that current value is not 0)"
-                            assert(!is_zero(current));
-                            // "add SSTORE_CLEARS_SCHEDULE gas to refund counter"
-                            triggered_clauses |= AddClearsSchedule;
-                        }
-                    }
-
-                    // 3.2.2. "If original value equals new value (this storage slot is reset)"
-                    // Except: we use term 'storage slot restored'.
-                    if (original == value)
-                    {
-                        // 3.2.2.1. "If original value is 0"
-                        if (is_zero(original))
-                        {
-                            // "add SSTORE_SET_GAS - SLOAD_GAS to refund counter"
-                            triggered_clauses |= RestoredBySet;
-                        }
-                        // 3.2.2.2. "Otherwise"
-                        else
-                        {
-                            // "add SSTORE_RESET_GAS - SLOAD_GAS gas to refund counter"
-                            triggered_clauses |= RestoredByReset;
-                        }
-                    }
-
-                    switch (triggered_clauses)
-                    {
-                    case RemoveClearsSchedule:
-                        return EVMC_STORAGE_DELETED_ADDED;
-                    case AddClearsSchedule:
-                        return EVMC_STORAGE_MODIFIED_DELETED;
-                    case RemoveClearsSchedule | RestoredByReset:
-                        return EVMC_STORAGE_DELETED_RESTORED;
-                    case RestoredBySet:
-                        return EVMC_STORAGE_ADDED_DELETED;
-                    case RestoredByReset:
-                        return EVMC_STORAGE_MODIFIED_RESTORED;
-                    case None:
-                        return EVMC_STORAGE_ASSIGNED;
-                    default:
-                        assert(false);  // Other combinations are impossible.
-                        return evmc_storage_status{};
-                    }
-                }
-            }
-        }();
-
-        s.current = value;  // Finally update the current storage value.
-        return status;
-    }
-
-    /// Get the account's balance (EVMC Host method).
-    uint256be get_balance(const address& addr) const noexcept override
-    {
-        record_account_access(addr);
-        const auto it = accounts.find(addr);
-        if (it == accounts.end())
-            return {};
-
-        return it->second.balance;
-    }
-
-    /// Get the account's code size (EVMC host method).
-    size_t get_code_size(const address& addr) const noexcept override
-    {
-        record_account_access(addr);
-        const auto it = accounts.find(addr);
-        if (it == accounts.end())
-            return 0;
-        return it->second.code.size();
-    }
-
-    /// Get the account's code hash (EVMC host method).
-    bytes32 get_code_hash(const address& addr) const noexcept override
-    {
-        record_account_access(addr);
-        const auto it = accounts.find(addr);
-        if (it == accounts.end())
-            return {};
-        return it->second.codehash;
-    }
-
-    /// Copy the account's code to the given buffer (EVMC host method).
-    size_t copy_code(const address& addr,
-                     size_t code_offset,
-                     uint8_t* buffer_data,
-                     size_t buffer_size) const noexcept override
-    {
-        record_account_access(addr);
-        const auto it = accounts.find(addr);
-        if (it == accounts.end())
-            return 0;
-
-        const auto& code = it->second.code;
-
-        if (code_offset >= code.size())
-            return 0;
-
-        const auto n = std::min(buffer_size, code.size() - code_offset);
-
-        if (n > 0)
-            std::copy_n(&code[code_offset], n, buffer_data);
-        return n;
-    }
-
-    /// Selfdestruct the account (EVMC host method).
-    bool selfdestruct(const address& addr, const address& beneficiary) noexcept override
-    {
-        record_account_access(addr);
-        auto& beneficiaries = recorded_selfdestructs[addr];
-        beneficiaries.emplace_back(beneficiary);
-        return beneficiaries.size() == 1;
-    }
-
-    /// Call/create other contract (EVMC host method).
-    Result call(const evmc_message& msg) noexcept override
-    {
-        record_account_access(msg.recipient);
-
-        if (recorded_calls.empty())
-        {
-            recorded_calls.reserve(max_recorded_calls);
-            m_recorded_calls_inputs.reserve(max_recorded_calls);  // Iterators will not invalidate.
-        }
-
-        if (recorded_calls.size() < max_recorded_calls)
-        {
-            recorded_calls.emplace_back(msg);
-            auto& call_msg = recorded_calls.back();
-            if (call_msg.input_size > 0)
-            {
-                m_recorded_calls_inputs.emplace_back(call_msg.input_data, call_msg.input_size);
-                const auto& input_copy = m_recorded_calls_inputs.back();
-                call_msg.input_data = input_copy.data();
-            }
-        }
-        return Result{call_result};
-    }
-
-    /// Get transaction context (EVMC host method).
-    evmc_tx_context get_tx_context() const noexcept override { return tx_context; }
-
-    /// Get the block header hash (EVMC host method).
-    bytes32 get_block_hash(int64_t block_number) const noexcept override
-    {
-        recorded_blockhashes.emplace_back(block_number);
-        return block_hash;
-    }
-
-    /// Emit LOG (EVMC host method).
-    void emit_log(const address& addr,
-                  const uint8_t* data,
-                  size_t data_size,
-                  const bytes32 topics[],
-                  size_t topics_count) noexcept override
-    {
-        recorded_logs.push_back({addr, {data, data_size}, {topics, topics + topics_count}});
-    }
-
-    /// Record an account access.
-    ///
-    /// This method is required by EIP-2929 introduced in ::EVMC_BERLIN. It will record the account
-    /// access in MockedHost::recorded_account_accesses and return previous access status.
-    /// This methods returns ::EVMC_ACCESS_WARM for known addresses of precompiles.
-    /// The EIP-2929 specifies that evmc_message::sender and evmc_message::recipient are always
-    /// ::EVMC_ACCESS_WARM. Therefore, you should init the MockedHost with:
-    ///
-    ///     mocked_host.access_account(msg.sender);
-    ///     mocked_host.access_account(msg.recipient);
-    ///
-    /// The same way you can mock transaction access list (EIP-2930) for account addresses.
-    ///
-    /// @param addr  The address of the accessed account.
-    /// @returns     The ::EVMC_ACCESS_WARM if the account has been accessed before,
-    ///              the ::EVMC_ACCESS_COLD otherwise.
-    evmc_access_status access_account(const address& addr) noexcept override
-    {
-        // Check if the address have been already accessed.
-        const auto already_accessed =
-            std::find(recorded_account_accesses.begin(), recorded_account_accesses.end(), addr) !=
-            recorded_account_accesses.end();
-
-        record_account_access(addr);
-
-        // Accessing precompiled contracts is always warm.
-        if (addr >= 0x0000000000000000000000000000000000000001_address &&
-            addr <= 0x0000000000000000000000000000000000000009_address)
-            return EVMC_ACCESS_WARM;
-
-        return already_accessed ? EVMC_ACCESS_WARM : EVMC_ACCESS_COLD;
-    }
-
-    /// Access the account's storage value at the given key.
-    ///
-    /// This method is required by EIP-2929 introduced in ::EVMC_BERLIN. In records
-    /// that the given account's storage key has been access and returns the
-    /// previous access status. To mock storage access list (EIP-2930), you can
-    /// pre-init account's storage values with the ::EVMC_ACCESS_WARM flag:
-    ///
-    ///     mocked_host.accounts[msg.recipient].storage[key] = {value,
-    ///     EVMC_ACCESS_WARM};
-    ///
-    /// @param addr  The account address.
-    /// @param key   The account's storage key.
-    /// @return      The ::EVMC_ACCESS_WARM if the storage key has been accessed
-    /// before,
-    ///              the ::EVMC_ACCESS_COLD otherwise.
-    evmc_access_status access_storage(const address& addr, const bytes32& key) noexcept override
-    {
-        auto& value = accounts[addr].storage[key];
-        const auto access_status = value.access_status;
-        value.access_status = EVMC_ACCESS_WARM;
-        return access_status;
-    }
-};
-}  // namespace evmc
diff --git a/test/evmc/utils.h b/test/evmc/utils.h
deleted file mode 100644
index 8b8f742af1cc..000000000000
--- a/test/evmc/utils.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 The EVMC Authors.
-// Licensed under the Apache License, Version 2.0.
-
-#pragma once
-
-/**
- * @file
- * A collection of helper macros to handle some non-portable features of C/C++ compilers.
- *
- * @addtogroup helpers
- * @{
- */
-
-/**
- * @def EVMC_EXPORT
- * Marks a function to be exported from a shared library.
- */
-#if defined _MSC_VER || defined __MINGW32__
-#define EVMC_EXPORT __declspec(dllexport)
-#else
-#define EVMC_EXPORT __attribute__((visibility("default")))
-#endif
-
-/**
- * @def EVMC_NOEXCEPT
- * Safe way of marking a function with `noexcept` C++ specifier.
- */
-#ifdef __cplusplus
-#define EVMC_NOEXCEPT noexcept
-#else
-#define EVMC_NOEXCEPT
-#endif
-
-/** @} */
diff --git a/test/externalTests/README.md b/test/externalTests/README.md
deleted file mode 100644
index 8df5b4dfe043..000000000000
--- a/test/externalTests/README.md
+++ /dev/null
@@ -1,93 +0,0 @@
-## Solidity external tests
-This directory contains scripts for compiling some of the popular open-source projects using the
-current version of the compiler and running their test suites.
-
-Since projects often do not use the latest compiler, we keep a fork of each of these projects
-at https://github.com/solidity-external-tests/. If changes are needed to make a project work with the
-latest version of the compiler, they are maintained as a branch on top of the upstream master branch.
-This is especially important for testing our `breaking` branch because we can not realistically expect
-external projects to be instantly compatible with a compiler version that has not been released yet.
-Applying necessary changes ourselves gives us confidence that breaking changes are sane and that
-these projects *can* be upgraded at all.
-
-### Recommended workflow
-
-#### Adding a new external project
-1. If the upstream code cannot be compiled without modifications, create a fork of the repository
-   in https://github.com/solidity-external-tests/.
-2. In our fork, remove all the branches except for main one (`master`, `develop`, `main`, etc).
-    This branch is going to be always kept up to date with the upstream repository and should not
-    contain any extra commits.
-    - If the project is not up to date with the latest compiler version but has a branch that is,
-        try to use that branch instead.
-3. In our fork, create a new branch named after the main branch and the compiler version from our
- `develop` branch.
-     E.g. if the latest Solidity version is 0.7.5 and the main branch of the external project
-     is called `master`, create `master_070`. This is where we will be adding our own commits.
-4. Create a script for compiling/testing the project and put it in `test/externalTests/` in the
-    Solidity repository.
-    - The script should apply workarounds necessary to make the project actually use the compiler
-        binary it receives as a parameter and possibly add generic workarounds that should
-        work across different versions of the upstream project.
-    - Very specific workarounds that may easily break with every upstream change are better done as
-        commits in the newly added branch in the fork instead.
-5. List the script in `test/externalTests.sh`.
-6. Add the script to CircleCI configuration. Make sure to add both a compilation-only run and one that
-    also executes the test suite. If the latter takes a significant amount of time (say, more than
-    15 minutes) make it run nightly rather than on every PR.
-7. Make sure that tests pass both on `develop` and on `breaking`. If the compiler from `breaking`
-    branch will not work without additional changes, add another branch, called after it in turn,
-    and add necessary workarounds there. Continuing the example above, the new branch would be
-    called `master_080` and should be rebased on top of `master_070`.
-    - The fewer commits in these branches, the better. Ideally, any changes needed to make the compiler
-        work should be submitted upstream and our scripts should be using the upstream repository
-        directly.
-
-#### Updating external projects for a PR that introduces breaking changes in the compiler
-If a PR to our `breaking` branch introduces changes that will make an external project no longer
-compile or pass its tests, the fork needs to be modified (or created if it does not yet exist):
-- If a branch specific to the compiler version from `breaking` does not exist yet:
-    1. Create the branch. It should be based on the version-specific branch used on `develop`.
-    2. Make your PR modify the project script in `test/externalScripts/` to use the new branch.
-    3. You are free to add any changes you need in the new branch since it will not interfere with
-        tests on `breaking`.
-    4. Work on your PR until it is approved and merged into `breaking`.
-- If the branch already exists and our CI depends on it:
-    1. If the external project after your changes can still work with `breaking` even without your PR or
-        if you know that the PR is straightforward and will be merged immediately without interfering
-        with tests on `breaking` for a significant amount of time, you can just push your modifications
-        to the branch directly and skip straight to steps 4. and 6.
-    2. Create a PR in the fork, targeting the existing version-specific branch.
-    3. In your PR to `breaking`, modify the corresponding script in `test/externalScripts/` to
-        use the branch from your PR in the fork.
-    4. Work on your PR until it is approved and ready to merge.
-    5. Merge the PR in the fork.
-    6. Discard your changes to the script and merge your PR into `breaking`.
-
-#### Pulling upstream changes into a fork
-1. Pull changes directly into the main branch in the fork. This should be straightforward thanks to
-    it not containing any of our customizations.
-2. If the project has been updated to a newer Solidity version, abandon the current version-specific
-    branch used on `develop` (but do not delete it) and create a new one corresponding to the newer
-    version. Then update project script in `test/externalTests/` to use the new branch. E.g. if `develop` uses
-    `master_050` and the project has been updated to use Solidity 0.7.3, create `master_070`.
-3. Otherwise, rebase the current version-specific branch on the main branch of the fork. This may require
-    tweaking some of the commits to apply our fixes in new places.
-4. If we have a separate branch for `breaking`, rebase it on top of the one used on `develop`.
-
-The above is the workflow to use when the update is straightforward and looks safe. In that case it is
-fine to just modify the branches directly. If this is not the case, it is recommended to first perform the
-operation on copies of these version-specific branches and test them by creating PRs on `develop` and
-`breaking` to see if tests pass. The PRs should just modify project scripts in `test/externalScripts/`
-to use the updated copies of the branches and can be discarded afterwards without being merged.
-
-#### Changes needed after a breaking release of the compiler
-When a non-backwards-compatible version becomes the most recent release, `breaking` branch
-gets merged into `develop` which automatically results in a switch to the newer version-specific
-branches if they exist. If no changes on our part were necessary, it is completely fine to keep using
-e.g. the `master_060` of an external project in Solidity 0.8.x.
-
-Since each project is handled separately, this approach may result in a mix of version-specific branches
-between different external projects. For example, in one project we could could have `master_050` on
-both `develop` and `breaking` and in another `breaking` could use `master_080` while `develop` still
-uses `master_060`.
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
deleted file mode 100755
index 30f0ec9240b9..000000000000
--- a/test/externalTests/bleeps.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npm run compile; }
-# NOTE: `npm run test` runs `mocha` which seems to disable the gas reporter.
-function test_fn { HARDHAT_DEPLOY_FIXTURE=true npx --no hardhat --no-compile test; }
-
-function bleeps_test
-{
-    local repo="https://github.com/wighawag/bleeps"
-    local ref_type=branch
-    local ref=main
-    local config_file="hardhat.config.ts"
-    local config_var=config
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with: "YulException: Variable expr_15509_mpos is 4 too deep in the stack". No memoryguard was present.
-        #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable expr_15260_mpos is 4 too deep in the stack". No memoryguard was present.
-        ir-optimize-evm+yul
-        #legacy-no-optimize        # Compilation fails with: "CompilerError: Stack too deep, try removing local variables."
-        #legacy-optimize-evm-only  # Compilation fails with: "CompilerError: Stack too deep, try removing local variables."
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    pushd "common-lib/"
-    neutralize_package_json_hooks
-    npm install
-    npm run build
-    popd
-
-    pushd "contracts/"
-    sed -i 's|"bleeps-common": "workspace:\*",|"bleeps-common": "file:../common-lib/",|g' package.json
-
-    sed -i 's/function() public/fallback() external/g' src/externals/WETH9.sol
-    sed -i 's/this\.balance/address(this).balance/g' src/externals/WETH9.sol
-    sed -i 's/uint(-1)/type(uint).max/g' src/externals/WETH9.sol
-    sed -i 's/msg\.sender\.transfer(/payable(msg.sender).transfer(/g' src/externals/WETH9.sol
-    sed -i 's/^\s*\(Deposit\|Withdrawal\|Approval\|Transfer\)(/emit \1(/g' src/externals/WETH9.sol
-
-    # This test does not currently pass due to an upstream problem.
-    # TODO: Remove this line when https://github.com/wighawag/bleeps/issues/2 is fixed
-    rm test/BleepsDAO.governor.test.ts
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    npm install npm-run-all
-    npm install
-
-    # Causes a test failure with hardhat 2.11.0 (latest at the moment of writing this)
-    # TODO: Remove when https://github.com/wighawag/bleeps/issues/4 is resolved
-    npm install hardhat@2.10.2
-
-    # TODO: Bleeps depends on OpenZeppelin 4.3.2, which is affected by
-    # https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3293.
-    # Forcing OZ >= 4.6.0 fixes this but it also causes a lot of unrelated compilation errors.
-    # Remove this when Bleeps gets updated to support newer OpenZeppelin.
-    perl -i -0pe \
-        "s/(function hashProposal\(\n        address\[\] )calldata( targets,\n        uint256\[\] )calldata( values,\n        bytes\[\] )calldata( calldatas,)/\1memory\2memory\3memory\4/g" \
-        node_modules/@openzeppelin/contracts/governance/IGovernor.sol
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat bleeps "$repo" "$preset"
-    done
-
-    popd
-}
-
-external_test Bleeps bleeps_test
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
deleted file mode 100755
index 44ea1a511ac6..000000000000
--- a/test/externalTests/brink.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn hardhat-compile; }
-function test_fn { SNAPSHOT_UPDATE=1 npx --no hardhat test; }
-
-function brink_test
-{
-    local repo="https://github.com/brinktrade/brink-core"
-    local ref_type=branch
-    local ref=master
-    local config_file="hardhat.config.js"
-    local config_var=""
-    local extra_settings="metadata: {bytecodeHash: 'none'}"
-    local extra_optimizer_settings="runs: 800"
-
-    local compile_only_presets=(
-        ir-no-optimize             # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
-        ir-optimize-evm-only       # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
-        ir-optimize-evm+yul        # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
-        legacy-optimize-evm+yul    # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
-        legacy-no-optimize         # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
-        legacy-optimize-evm-only   # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # TODO: Remove this when Brink merges https://github.com/brinktrade/brink-core/pull/52
-    sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" src/Test/MockEIP1271Validator.sol
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
-    yarn install
-    yarn add hardhat-gas-reporter
-
-    # TODO: Remove when https://github.com/brinktrade/brink-core/issues/48 is fixed.
-    yarn add chai
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var" "$extra_settings" "$extra_optimizer_settings"
-        store_benchmark_report hardhat brink "$repo" "$preset"
-    done
-}
-
-external_test Brink brink_test
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
deleted file mode 100755
index 4d5080730f80..000000000000
--- a/test/externalTests/chainlink.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn compile; }
-function test_fn { yarn test; }
-
-function chainlink_test
-{
-    local repo="https://github.com/solidity-external-tests/chainlink"
-    local ref_type=branch
-    local ref=develop_080
-    local config_file="hardhat.config.ts"
-    local config_var=config
-
-    local compile_only_presets=(
-        legacy-no-optimize        # Tests crash on a machine with 8 GB of RAM in CI "FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory"
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable expr_10724_mpos is 2 too deep in the stack". No memoryguard was present.
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable expr_1891_mpos is 2 too deep in the stack". No memoryguard was present.
-        ir-optimize-evm+yul
-        legacy-optimize-evm-only  # NOTE: This requires >= 4 GB RAM in CI not to crash
-        legacy-optimize-evm+yul   # NOTE: This requires >= 4 GB RAM in CI not to crash
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    cd "contracts/"
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i "s|\(it\)\(('reverts'\)|\1.skip\2|g" test/v0.6/BasicConsumer.test.ts
-    sed -i "s|\(it\)\(('has a reasonable gas cost \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.6/BasicConsumer.test.ts
-    sed -i "s|\(describe\)\(('#add[^']*'\)|\1.skip\2|g" test/v0.6/Chainlink.test.ts
-    sed -i "s|\(it\)\(('throws'\)|\1.skip\2|g" test/v0.6/SignedSafeMath.test.ts
-    sed -i "s|\(it\)\(('reverts when not enough LINK in the contract'\)|\1.skip\2|g" test/v0.*/VRFD20.test.ts
-    sed -i "s|\(it\)\(('errors while parsing invalid cron strings'\)|\1.skip\2|g" test/v0.8/Cron.test.ts
-    sed -i "s|\(it\)\(('reverts if the amount passed in data mismatches actual amount sent'\)|\1.skip\2|g" test/v0.8/KeeperRegistrar.test.ts
-    sed -i "s|\(it\)\(('reverts if the sender passed in data mismatches actual sender'\)|\1.skip\2|g" test/v0.8/KeeperRegistrar.test.ts
-    sed -i "s|\(it\)\(('reverts if the admin address is 0x0000...'\)|\1.skip\2|g" test/v0.8/KeeperRegistrar.test.ts
-    sed -i "s|\(it\)\(('reverts if not called with more or less than 32 bytes'\)|\1.skip\2|g" test/v0.8/KeeperRegistry.test.ts
-    sed -i "s|\(context\)\(('when permissions are not set'\)|\1.skip\2|g" test/v0.8/KeeperRegistry.test.ts
-
-    # In some cases Hardhat does not detect revert reasons properly via IR.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i "s|\(it\)\(('does not allow the specified address to start new rounds'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
-    sed -i "s|\(describe\)\(('when called by a stranger'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
-    sed -i "s|\(describe\)\(('if the access control is turned on'\)|\1.skip\2|g" test/v0.*/Flags.test.ts
-    sed -i "s|\(it\)\(('respects the access controls of #getFlag'\)|\1.skip\2|g" test/v0.*/Flags.test.ts
-    sed -i "s|\(describe\)\(('setting 0 authorized senders'\)|\1.skip\2|g" test/v0.7/AuthorizedForwarder.test.ts
-    sed -i "s|\(it\)\(('cannot add an authorized node'\)|\1.skip\2|g" test/v0.7/AuthorizedForwarder.test.ts
-    sed -i "s|\(it\)\(('should disallow reads on AggregatorV2V3Interface functions when consuming contract is not whitelisted'\)|\1.skip\2|g" test/v0.8/dev/ArbitrumSequencerUptimeFeed.test.ts
-    sed -i "s|\(it\)\(('should not be callable by non-owners'\)|\1.skip\2|g" test/v0.8/dev/CrossDomainOwnable.test.ts
-    sed -i "s|\(it\)\(('should not be callable by non pending-owners'\)|\1.skip\2|g" test/v0.8/dev/CrossDomainOwnable.test.ts
-    sed -i "s|\(it\)\(('cannot add a consumer to a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
-    sed -i "s|\(it\)\(('cannot remove a consumer from a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
-    sed -i "s|\(it\)\(('cannot remove a consumer after it is already removed'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
-    sed -i "s|\(it\)\(('fails to fulfill without being a valid consumer'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
-    # TODO: check why these two are needed due to this PR.
-    sed -i "s|\(it\)\(('cannot fund a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
-    sed -i "s|\(it\)\(('can cancel a subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
-
-
-    # Disable tests with hard-coded gas expectations.
-    sed -i "s|\(it\)\(('not use too much gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
-    sed -i "s|\(it\)\(('has a large enough gas overhead to cover upkeeps that use all their gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.*/KeeperRegistry*.test.ts
-    sed -i "s|\(it\)\(('only pays .\+'\)|\1.skip\2|g" test/v0.*/KeeperRegistry*.test.ts
-    sed -i "s|\(it\)\(('uses a specific amount of gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.8/ValidatorProxy.test.ts
-    sed -i "s|\(describe\)\(('Gas costs'\)|\1.skip\2|g" test/v0.8/dev/ArbitrumSequencerUptimeFeed.test.ts
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    name_hardhat_default_export "$config_file" "$config_var"
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-    yarn install
-    yarn add hardhat-gas-reporter
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat chainlink "$repo" "$preset"
-    done
-}
-
-external_test Chainlink chainlink_test
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
deleted file mode 100755
index 402865107a8d..000000000000
--- a/test/externalTests/colony.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn run provision:token:contracts; }
-function test_fn { yarn run test:contracts; }
-
-function colony_test
-{
-    local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
-    local ref_type=branch
-    local ref="develop_080"
-    local config_file="truffle.js"
-
-    local compile_only_presets=(
-        ir-no-optimize            # Compiles but tests run out of gas
-        ir-optimize-evm-only      # Compiles but tests run out of gas
-        legacy-no-optimize        # Compiles but tests run out of gas
-        legacy-optimize-evm-only  # Compiles but tests run out of gas
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-optimize-evm+yul
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
-
-    neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
-    yarn install
-    git submodule update --init
-
-    cd lib
-    rm -Rf dappsys
-    git clone https://github.com/solidity-external-tests/dappsys-monolithic.git -b master_080 dappsys
-    cd ..
-
-    replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
-
-    for preset in $SELECTED_PRESETS; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
-        store_benchmark_report truffle colony "$repo" "$preset"
-    done
-}
-
-external_test ColonyNetworks colony_test
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
deleted file mode 100755
index 94e622d10c5a..000000000000
--- a/test/externalTests/elementfi.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npm run build; }
-function test_fn { npm run test; }
-
-function elementfi_test
-{
-    local repo="https://github.com/element-fi/elf-contracts"
-    local ref_type=branch
-    local ref=main
-    local config_file="hardhat.config.ts"
-    local config_var=config
-
-    local compile_only_presets=(
-        # ElementFi's test suite is hard-coded for Mainnet forked via alchemy.io.
-        # Locally we can only compile.
-        ir-no-optimize
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    chmod +x scripts/load-balancer-contracts.sh
-    scripts/load-balancer-contracts.sh
-
-    # Balancer contracts require 0.7.x. Patch them for 0.8.x.
-    pushd contracts/balancer-core-v2
-    sed -i 's|uint256(address(this))|uint256(uint160(address(this)))|g' test/MockPoolFactory.sol
-    sed -i 's|uint256(address(this))|uint256(uint160(address(this)))|g' vault/ProtocolFeesCollector.sol
-    sed -i 's|uint256(address(this))|uint256(uint160(address(this)))|g' vault/VaultAuthorization.sol
-    sed -i 's|msg\.sender\.sendValue(excess)|payable(msg.sender).sendValue(excess)|g' vault/AssetTransfersHandler.sol
-    sed -i 's|msg\.sender\.transfer(wad)|payable(msg.sender).transfer(wad)|g' test/WETH.sol
-    sed -i 's|int256(-amountsOut\[i\])|-int256(amountsOut[i])|g' test/MockVault.sol
-    sed -i 's|int256(-amount)|-int256(amount)|g' vault/AssetManagers.sol
-    sed -i 's|uint256(-1)|type(uint256).max|g' pools/BalancerPoolToken.sol
-    sed -i 's|uint256(-1)|type(uint256).max|g' test/WETH.sol
-    sed -i 's|IERC20(0)|IERC20(address(0))|g' pools/BasePool.sol
-    sed -i 's|IERC20(0)|IERC20(address(0))|g' vault/balances/TwoTokenPoolsBalance.sol
-    sed -i 's|IERC20(0)|IERC20(address(0))|g' vault/FlashLoans.sol
-    sed -i 's|IERC20(0)|IERC20(address(0))|g' vault/PoolTokens.sol
-    sed -i 's|uint256(msg\.sender)|uint256(uint160(msg.sender))|g' pools/BasePool.sol
-    sed -i 's|uint256(msg\.sender)|uint256(uint160(msg.sender))|g' pools/weighted/WeightedPool2Tokens.sol
-    sed -i 's|address(uint256(_data))|address(uint160(uint256(_data)))|g' lib/openzeppelin/Create2.sol
-    sed -i 's|address(uint256(poolId) >> (12 \* 8))|address(uint160(uint256(poolId) >> (12 * 8)))|g' vault/PoolRegistry.sol
-    sed -i 's|bytes32(uint256(pool))|bytes32(uint256(uint160(pool)))|g' vault/PoolRegistry.sol
-    popd
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i 's|it(\("fails to withdraw more shares than in balance"\)|it.skip(\1|g' test/compoundAssetProxyTest.ts
-    sed -i 's|it(\("should prevent withdrawal of Principal Tokens and Interest Tokens before the tranche expires "\)|it.skip(\1|g' test/trancheTest.ts
-    sed -i 's|it(\("should prevent withdrawal of more Principal Tokens and Interest Tokens than the user has"\)|it.skip(\1|g' test/trancheTest.ts
-
-    # This test file is very flaky. There's one particular cases that fails randomly (see
-    # https://github.com/element-fi/elf-contracts/issues/240) but some others also depends on an external
-    # service which makes tests time out when that service is down.
-    # "ProviderError: Too Many Requests error received from eth-mainnet.alchemyapi.io"
-    rm test/mockERC20YearnVaultTest.ts
-
-    # Several tests fail unless we use the exact versions hard-coded in package-lock.json
-    #neutralize_package_lock
-
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-    npm install
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat elementfi "$repo" "$preset"
-    done
-}
-
-external_test ElementFi elementfi_test
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
deleted file mode 100755
index aee291a1a468..000000000000
--- a/test/externalTests/ens.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn build; }
-function test_fn { yarn test; }
-
-function ens_test
-{
-    local repo="https://github.com/ensdomains/ens-contracts.git"
-    local ref_type=commit
-    local ref="083d29a2c50cd0a8307386abf8fadc217b256256"
-    local config_file="hardhat.config.js"
-
-    local compile_only_presets=(
-        ir-no-optimize            # FIXME: Tests fail with "Error: cannot estimate gas; transaction may fail or may require manual gas limit"
-        legacy-no-optimize        # Compiles but tests fail to deploy GovernorCompatibilityBravo (code too large).
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-optimize-evm-only
-        ir-optimize-evm+yul       # Needs memory-safe inline assembly patch
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
-    yarn install
-
-    replace_version_pragmas
-    neutralize_packaged_contracts
-
-    # In some cases Hardhat does not detect revert reasons properly via IR.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i "s|it\(('Does not allow wrapping a name you do not own',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('can set fuses and then burn ability to burn fuses',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('can set fuses and burn canSetResolver and canSetTTL',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if CANNOT_TRANSFER is burned\.',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if CANNOT_SET_RESOLVER is burned\.\?',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if CANNOT_SET_TTL is burned\.\?',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if CREATE_SUBDOMAIN is burned and is a new subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if REPLACE_SUBDOMAIN is burned and is an existing subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if CANNOT_CREATE_SUBDOMAIN is burned and is a new subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    sed -i "s|it\(('Cannot be called if PARENT_CANNOT_CONTROL is burned and is an existing subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-
-    find . -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
-        store_benchmark_report hardhat ens "$repo" "$preset"
-    done
-}
-
-external_test ENS ens_test
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
deleted file mode 100755
index 80f18e702d92..000000000000
--- a/test/externalTests/euler.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npm run compile; }
-function test_fn {
-    # The default timeout of 20000 ms is too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765).
-    TEST_TIMEOUT=100000 npx --no hardhat --no-compile test
-}
-
-function euler_test
-{
-    local repo="https://github.com/euler-xyz/euler-contracts"
-    local ref_type=branch
-    local ref="master"
-    local config_file="hardhat.config.js"
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_v_mpos is 4 too deep in the stack". No memoryguard was present.
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_v_mpos is 4 too deep in the stack". No memoryguard was present.
-        ir-optimize-evm+yul
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-        legacy-no-optimize
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i "/expectError: 'JUNK_UPGRADE_TEST_FAILURE'/d" test/moduleUpgrade.js
-    sed -i "/et\.expect(errMsg)\.to\.contain('e\/collateral-violation');/d" test/flashLoanNative.js
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
-    force_hardhat_unlimited_contract_size "$config_file"
-    npm install
-    replace_version_pragmas
-    neutralize_packaged_contracts
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
-        store_benchmark_report hardhat euler "$repo" "$preset"
-    done
-}
-
-external_test Euler euler_test
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
deleted file mode 100755
index 5f7ea4876527..000000000000
--- a/test/externalTests/gnosis.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npm run build; }
-function test_fn { npm test; }
-
-function gnosis_safe_test
-{
-    local repo="https://github.com/safe-global/safe-contracts.git"
-    local ref_type=branch
-    local ref=main
-    local config_file="hardhat.config.ts"
-    local config_var=userConfig
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with "YulException: Variable var_txHash is 1 too deep in the stack". No memoryguard was present.
-        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_txHash is 1 too deep in the stack". No memoryguard was present.
-        # TODO: Uncomment the preset below when the issue: https://github.com/safe-global/safe-contracts/issues/544 is solved.
-        #ir-optimize-evm+yul       # Compilation fails with "YulException: Cannot swap Variable var_operation with Variable _1: too deep in the stack by 4 slots."
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
-
-    # NOTE: The patterns below intentionally have hard-coded versions.
-    # When the upstream updates them, there's a chance we can just remove the regex.
-    sed -i 's|"@gnosis\.pm/mock-contract": "\^4\.0\.0"|"@gnosis.pm/mock-contract": "github:solidity-external-tests/mock-contract#master_080"|g' package.json
-    sed -i 's|"@openzeppelin/contracts": "\^3\.4\.0"|"@openzeppelin/contracts": "^4.0.0"|g' package.json
-
-    # Disable two tests failing due to Hardhat's heuristics not yet updated to handle solc 0.8.10.
-    # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2451).
-    sed -i "s|\(it\)\((\"should revert if called directly\"\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i "s|\(it\)\((\"should not allow to call setup on singleton\"\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
-    sed -i "s|\(it\)\((\"can be used only via DELEGATECALL opcode\"\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
-    sed -i "s|it\((\"can only be called from Safe itself\"\)|it.skip\1|g" test/libraries/Migration.spec.ts
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    npm install
-    npm install hardhat-gas-reporter
-
-    replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat gnosis "$repo" "$preset"
-    done
-}
-
-external_test Gnosis-Safe gnosis_safe_test
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
deleted file mode 100755
index bbb442226f62..000000000000
--- a/test/externalTests/gp2.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn run build; }
-function test_fn { yarn test; }
-
-function gp2_test
-{
-    local repo="https://github.com/cowprotocol/contracts.git"
-    local ref_type=branch
-    local ref=main
-    local config_file="hardhat.config.ts"
-    local config_var="config"
-
-    local compile_only_presets=(
-        ir-no-optimize            # Tests fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
-        legacy-no-optimize        # Tests fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    name_hardhat_default_export "$config_file" "$config_var"
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-    yarn
-
-    # Workaround for error caused by the last release of hardhat-waffle@2.0.6 that bumps ethereum-waffle
-    # to version 4.0.10 and breaks gp2 build with the following error:
-    #
-    #  Cannot find module 'ethereum-waffle/dist/cjs/src/deployContract'
-    #
-    # See: https://github.com/NomicFoundation/hardhat-waffle/commit/83ee9cb36ee59d0bedacbbd00043f030af104ad0
-    yarn add '@nomiclabs/hardhat-waffle@2.0.5'
-
-    # Some dependencies come with pre-built artifacts. We want to build from scratch.
-    rm -r node_modules/@gnosis.pm/safe-contracts/build/
-
-    # FIXME: One of the E2E tests tries to import artifacts from Gnosis Safe. We should rebuild them
-    # but it's not that easy because @gnosis.pm/safe-contracts does not come with Hardhat config.
-    rm test/e2e/contractOrdersWithGnosisSafe.test.ts
-
-    # Patch contracts for 0.8.x compatibility.
-    # NOTE: I'm patching OpenZeppelin as well instead of installing OZ 4.0 because it requires less
-    # work. The project imports files that were moved to different locations in 4.0.
-    sed -i 's|uint256(-1)|type(uint256).max|g' src/contracts/GPv2Settlement.sol
-    sed -i 's|return msg\.sender;|return payable(msg.sender);|g' node_modules/@openzeppelin/contracts/utils/Context.sol
-    perl -i -0pe \
-        "s/uint256 (executedBuyAmount = \(-tokenDeltas\[trade.buyTokenIndex\]\)\n\s+.toUint256\(\);)/uint256 executedBuyAmount; unchecked \{\1\}/g" \
-        src/contracts/GPv2Settlement.sol
-
-    # This test is not supposed to work. The compiler is supposed to enforce zero padding since
-    # at least 0.5.8 (see https://github.com/ethereum/solidity/pull/5815). For some reason the
-    # test worked on 0.7.6 but no longer works on 0.8.x.
-    sed -i 's|it\(("invalid EVM transaction encoding does not change order hash"\)|it.skip\1|g' test/GPv2Signing.test.ts
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i 's|it\(("should revert when encoding invalid flags"\)|it.skip\1|g' test/GPv2Trade.test.ts
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat gp2 "$repo" "$preset"
-    done
-}
-
-external_test Gnosis-Protocol-V2 gp2_test
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
deleted file mode 100755
index 8d8dc34e212d..000000000000
--- a/test/externalTests/perpetual-pools.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn build; }
-function test_fn { yarn test; }
-
-function perpetual_pools_test
-{
-    local repo="https://github.com/solidity-external-tests/perpetual-pools-contracts"
-    local ref_type=branch
-    local ref=pools-v2
-    local config_file="hardhat.config.ts"
-    local config_var="config"
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-no-optimize
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i 's|\(it\)\(("Should not allow commits that are too large"\)|\1.skip\2|g' test/PoolCommitter/commit.spec.ts
-    sed -i 's|\(it\)\(("Should not allow for too many commitments (that bring amount over a user'\''s balance)"\)|\1.skip\2|g' test/PoolCommitter/commit.spec.ts
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-    yarn install
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat perpetual-pools "$repo" "$preset"
-    done
-}
-
-external_test Tracer-Perpetual-Pools perpetual_pools_test
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
deleted file mode 100755
index 3f7141d9bade..000000000000
--- a/test/externalTests/pool-together.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn compile; }
-function test_fn { yarn test; }
-
-function pool_together_test
-{
-    local repo="https://github.com/pooltogether/v4-core"
-    local ref_type=branch
-    local ref=master
-    local config_file="hardhat.config.ts"
-    local config_var="config"
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-no-optimize
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i "s|it\(('should fail to return value if value passed does not fit in [0-9]\+ bits'\)|it.skip\1|g" test/libraries/ExtendedSafeCast.test.ts
-    sed -i "s|it\(('should require an rng to be requested'\)|it.skip\1|g" test/DrawBeacon.test.ts
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    yarn install
-
-    # These come with already compiled artifacts. We want them recompiled with latest compiler.
-    rm -r node_modules/@pooltogether/yield-source-interface/artifacts/
-    rm -r node_modules/@pooltogether/uniform-random-number/artifacts/
-    rm -r node_modules/@pooltogether/owner-manager-contracts/artifacts/
-
-    replace_version_pragmas
-    neutralize_packaged_contracts
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat pool-together "$repo" "$preset"
-    done
-}
-
-external_test Pool-Together-V4 pool_together_test
diff --git a/test/externalTests/prb-math.py b/test/externalTests/prb-math.py
deleted file mode 100755
index 0a4ce8ff9565..000000000000
--- a/test/externalTests/prb-math.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-# ------------------------------------------------------------------------------
-
-import sys
-from pathlib import Path
-
-# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
-# pragma pylint: disable=import-error,wrong-import-position
-PROJECT_ROOT = Path(__file__).parents[2]
-sys.path.insert(0, f"{PROJECT_ROOT}/scripts/externalTests")
-
-from runners.base import run_test
-from runners.base import TestConfig
-from runners.foundry import FoundryRunner
-from test_helpers import SettingsPreset
-
-test_config = TestConfig(
-    name="PRBMath",
-    repo_url="https://github.com/PaulRBerg/prb-math.git",
-    ref_type="branch",
-    ref="main",
-    compile_only_presets=[
-        # pylint: disable=line-too-long
-        # SettingsPreset.IR_NO_OPTIMIZE,       # Error: Yul exception:Variable expr_15699_address is 2 slot(s) too deep inside the stack. Stack too deep.
-        # SettingsPreset.IR_OPTIMIZE_EVM_ONLY, # Error: Yul exception:Variable expr_15699_address is 2 slot(s) too deep inside the stack. Stack too deep.
-    ],
-    settings_presets=[
-        SettingsPreset.LEGACY_NO_OPTIMIZE,
-        SettingsPreset.LEGACY_OPTIMIZE_EVM_ONLY,
-        SettingsPreset.LEGACY_OPTIMIZE_EVM_YUL,
-        SettingsPreset.IR_OPTIMIZE_EVM_YUL,
-    ],
-)
-
-sys.exit(run_test(FoundryRunner(argv=sys.argv[1:], config=test_config)))
diff --git a/test/externalTests/solc-js/DAO/DAO.sol b/test/externalTests/solc-js/DAO/DAO.sol
deleted file mode 100644
index 45778a3fcddc..000000000000
--- a/test/externalTests/solc-js/DAO/DAO.sol
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
-This file is part of the DAO.
-
-The DAO is free software: you can redistribute it and/or modify
-it under the terms of the GNU lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The DAO is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU lesser General Public License for more details.
-
-You should have received a copy of the GNU lesser General Public License
-along with the DAO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
-Standard smart contract for a Decentralized Autonomous Organization (DAO)
-to automate organizational governance and decision-making.
-*/
-
-import "./TokenCreation.sol";
-import "./ManagedAccount.sol";
-
-abstract contract DAOInterface {
-
-    // The amount of days for which people who try to participate in the
-    // creation by calling the fallback function will still get their ether back
-    uint constant creationGracePeriod = 40 days;
-    // The minimum debate period that a generic proposal can have
-    uint constant minProposalDebatePeriod = 2 weeks;
-    // The minimum debate period that a split proposal can have
-    uint constant minSplitDebatePeriod = 1 weeks;
-    // Period of days inside which it's possible to execute a DAO split
-    uint constant splitExecutionPeriod = 27 days;
-    // Period of time after which the minimum Quorum is halved
-    uint constant quorumHalvingPeriod = 25 weeks;
-    // Period after which a proposal is closed
-    // (used in the case `executeProposal` fails because it throws)
-    uint constant executeProposalPeriod = 10 days;
-    // Denotes the maximum proposal deposit that can be given. It is given as
-    // a fraction of total Ether spent plus balance of the DAO
-    uint constant maxDepositDivisor = 100;
-
-    // Proposals to spend the DAO's ether or to choose a new Curator
-    Proposal[] public proposals;
-    // The quorum needed for each proposal is partially calculated by
-    // totalSupply / minQuorumDivisor
-    uint public minQuorumDivisor;
-    // The unix time of the last time quorum was reached on a proposal
-    uint public lastTimeMinQuorumMet;
-
-    // Address of the curator
-    address payable public curator;
-    // The whitelist: List of addresses the DAO is allowed to send ether to
-    mapping (address => bool) public allowedRecipients;
-
-    // Tracks the addresses that own Reward Tokens. Those addresses can only be
-    // DAOs that have split from the original DAO. Conceptually, Reward Tokens
-    // represent the proportion of the rewards that the DAO has the right to
-    // receive. These Reward Tokens are generated when the DAO spends ether.
-    mapping (address => uint) public rewardToken;
-    // Total supply of rewardToken
-    uint public totalRewardToken;
-
-    // The account used to manage the rewards which are to be distributed to the
-    // DAO Token Holders of this DAO
-    ManagedAccount public rewardAccount;
-
-    // The account used to manage the rewards which are to be distributed to
-    // any DAO that holds Reward Tokens
-    ManagedAccount public DAOrewardAccount;
-
-    // Amount of rewards (in wei) already paid out to a certain DAO
-    mapping (address => uint) public DAOpaidOut;
-
-    // Amount of rewards (in wei) already paid out to a certain address
-    mapping (address => uint) public paidOut;
-    // Map of addresses blocked during a vote (not allowed to transfer DAO
-    // tokens). The address points to the proposal ID.
-    mapping (address => uint) public blocked;
-
-    // The minimum deposit (in wei) required to submit any proposal that is not
-    // requesting a new Curator (no deposit is required for splits)
-    uint public proposalDeposit;
-
-    // the accumulated sum of all current proposal deposits
-    uint sumOfProposalDeposits;
-
-    // Contract that is able to create a new DAO (with the same code as
-    // this one), used for splits
-    DAO_Creator public daoCreator;
-
-    // A proposal with `newCurator == false` represents a transaction
-    // to be issued by this DAO
-    // A proposal with `newCurator == true` represents a DAO split
-    struct Proposal {
-        // The address where the `amount` will go to if the proposal is accepted
-        // or if `newCurator` is true, the proposed Curator of
-        // the new DAO).
-        address payable recipient;
-        // The amount to transfer to `recipient` if the proposal is accepted.
-        uint amount;
-        // A plain text description of the proposal
-        string description;
-        // A unix timestamp, denoting the end of the voting period
-        uint votingDeadline;
-        // True if the proposal's votes have yet to be counted, otherwise False
-        bool open;
-        // True if quorum has been reached, the votes have been counted, and
-        // the majority said yes
-        bool proposalPassed;
-        // A hash to check validity of a proposal
-        bytes32 proposalHash;
-        // Deposit in wei the creator added when submitting their proposal. It
-        // is taken from the msg.value of a newProposal call.
-        uint proposalDeposit;
-        // True if this proposal is to assign a new Curator
-        bool newCurator;
-        // Data needed for splitting the DAO
-        SplitData[] splitData;
-        // Number of Tokens in favor of the proposal
-        uint yea;
-        // Number of Tokens opposed to the proposal
-        uint nay;
-        // Simple mapping to check if a shareholder has voted for it
-        mapping (address => bool) votedYes;
-        // Simple mapping to check if a shareholder has voted against it
-        mapping (address => bool) votedNo;
-        // Address of the shareholder who created the proposal
-        address payable creator;
-    }
-
-    // Used only in the case of a newCurator proposal.
-    struct SplitData {
-        // The balance of the current DAO minus the deposit at the time of split
-        uint splitBalance;
-        // The total amount of DAO Tokens in existence at the time of split.
-        uint totalSupply;
-        // Amount of Reward Tokens owned by the DAO at the time of split.
-        uint rewardToken;
-        // The new DAO contract created at the time of split.
-        DAO newDAO;
-    }
-
-    /// @dev Constructor setting the Curator and the address
-    /// for the contract able to create another DAO as well as the parameters
-    /// for the DAO Token Creation
-    /// @param _curator The Curator
-    /// @param _daoCreator The contract able to (re)create this DAO
-    /// @param _proposalDeposit The deposit to be paid for a regular proposal
-    /// @param _minTokensToCreate Minimum required wei-equivalent tokens
-    ///        to be created for a successful DAO Token Creation
-    /// @param _closingTime Date (in Unix time) of the end of the DAO Token Creation
-    /// @param _privateCreation If zero the DAO Token Creation is open to public, a
-    /// non-zero address means that the DAO Token Creation is only for the address
-    /// @param _tokenName The name that the DAO's token will have
-    /// @param _tokenSymbol The ticker symbol that this DAO token should have
-    /// @param _decimalPlaces The number of decimal places that the token is
-    ///        counted from.
-    // This is the constructor: it can not be overloaded so it is commented out
-    //  function DAO(
-        //  address payable _curator,
-        //  DAO_Creator _daoCreator,
-        //  uint _proposalDeposit,
-        //  uint _minTokensToCreate,
-        //  uint _closingTime,
-        //  address _privateCreation
-        //  string _tokenName,
-        //  string _tokenSymbol,
-        //  uint8 _decimalPlaces
-    //  );
-
-    /// @notice Create Token with `msg.sender` as the beneficiary
-    receive() virtual external payable;
-
-
-    /// @dev This function is used to send ether back
-    /// to the DAO, it can also be used to receive payments that should not be
-    /// counted as rewards (donations, grants, etc.)
-    /// @return Whether the DAO received the ether successfully
-    function receiveEther() public virtual returns (bool);
-
-    /// @notice `msg.sender` creates a proposal to send `_amount` Wei to
-    /// `_recipient` with the transaction data `_transactionData`. If
-    /// `_newCurator` is true, then this is a proposal that splits the
-    /// DAO and sets `_recipient` as the new DAO's Curator.
-    /// @param _recipient Address of the recipient of the proposed transaction
-    /// @param _amount Amount of wei to be sent with the proposed transaction
-    /// @param _description String describing the proposal
-    /// @param _transactionData Data of the proposed transaction
-    /// @param _debatingPeriod Time used for debating a proposal, at least 2
-    /// weeks for a regular proposal, 10 days for new Curator proposal
-    /// @param _newCurator Bool defining whether this proposal is about
-    /// a new Curator or not
-    /// @return _proposalID The proposal ID. Needed for voting on the proposal
-    function newProposal(
-        address payable _recipient,
-        uint _amount,
-        string memory _description,
-        bytes memory _transactionData,
-        uint _debatingPeriod,
-        bool _newCurator
-    ) public virtual payable returns (uint _proposalID);
-
-    /// @notice Check that the proposal with the ID `_proposalID` matches the
-    /// transaction which sends `_amount` with data `_transactionData`
-    /// to `_recipient`
-    /// @param _proposalID The proposal ID
-    /// @param _recipient The recipient of the proposed transaction
-    /// @param _amount The amount of wei to be sent in the proposed transaction
-    /// @param _transactionData The data of the proposed transaction
-    /// @return _codeChecksOut Whether the proposal ID matches the transaction data or not
-    function checkProposalCode(
-        uint _proposalID,
-        address payable _recipient,
-        uint _amount,
-        bytes memory _transactionData
-    ) public virtual view returns (bool _codeChecksOut);
-
-    /// @notice Vote on proposal `_proposalID` with `_supportsProposal`
-    /// @param _proposalID The proposal ID
-    /// @param _supportsProposal Yes/No - support of the proposal
-    /// @return _voteID The vote ID.
-    function vote(
-        uint _proposalID,
-        bool _supportsProposal
-    ) public virtual returns (uint _voteID);
-
-    /// @notice Checks whether proposal `_proposalID` with transaction data
-    /// `_transactionData` has been voted for or rejected, and executes the
-    /// transaction in the case it has been voted for.
-    /// @param _proposalID The proposal ID
-    /// @param _transactionData The data of the proposed transaction
-    /// @return _success Whether the proposed transaction has been executed or not
-    function executeProposal(
-        uint _proposalID,
-        bytes memory _transactionData
-    ) public virtual returns (bool _success);
-
-    /// @notice ATTENTION! I confirm to move my remaining ether to a new DAO
-    /// with `_newCurator` as the new Curator, as has been
-    /// proposed in proposal `_proposalID`. This will burn my tokens. This can
-    /// not be undone and will split the DAO into two DAO's, with two
-    /// different underlying tokens.
-    /// @param _proposalID The proposal ID
-    /// @param _newCurator The new Curator of the new DAO
-    /// @dev This function, when called for the first time for this proposal,
-    /// will create a new DAO and send the sender's portion of the remaining
-    /// ether and Reward Tokens to the new DAO. It will also burn the DAO Tokens
-    /// of the sender.
-    function splitDAO(
-        uint _proposalID,
-        address payable _newCurator
-    ) public virtual returns (bool _success);
-
-    /// @dev can only be called by the DAO itself through a proposal
-    /// updates the contract of the DAO by sending all ether and rewardTokens
-    /// to the new DAO. The new DAO needs to be approved by the Curator
-    /// @param _newContract the address of the new contract
-    function newContract(address payable _newContract) virtual public;
-
-
-    /// @notice Add a new possible recipient `_recipient` to the whitelist so
-    /// that the DAO can send transactions to them (using proposals)
-    /// @param _recipient New recipient address
-    /// @dev Can only be called by the current Curator
-    /// @return _success Whether successful or not
-    function changeAllowedRecipients(address _recipient, bool _allowed) virtual external returns (bool _success);
-
-
-    /// @notice Change the minimum deposit required to submit a proposal
-    /// @param _proposalDeposit The new proposal deposit
-    /// @dev Can only be called by this DAO (through proposals with the
-    /// recipient being this DAO itself)
-    function changeProposalDeposit(uint _proposalDeposit) virtual external;
-
-    /// @notice Move rewards from the DAORewards managed account
-    /// @param _toMembers If true rewards are moved to the actual reward account
-    ///                   for the DAO. If not then it's moved to the DAO itself
-    /// @return _success Whether the call was successful
-    function retrieveDAOReward(bool _toMembers) virtual external returns (bool _success);
-
-    /// @notice Get my portion of the reward that was sent to `rewardAccount`
-    /// @return _success Whether the call was successful
-    function getMyReward() public virtual returns (bool _success);
-
-    /// @notice Withdraw `_account`'s portion of the reward from `rewardAccount`
-    /// to `_account`'s balance
-    /// @return _success Whether the call was successful
-    function withdrawRewardFor(address payable _account) internal virtual returns (bool _success);
-
-    /// @notice Send `_amount` tokens to `_to` from `msg.sender`. Prior to this
-    /// getMyReward() is called.
-    /// @param _to The address of the recipient
-    /// @param _amount The amount of tokens to be transferred
-    /// @return success Whether the transfer was successful or not
-    function transferWithoutReward(address _to, uint256 _amount) public virtual returns (bool success);
-
-    /// @notice Send `_amount` tokens to `_to` from `_from` on the condition it
-    /// is approved by `_from`. Prior to this getMyReward() is called.
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _amount The amount of tokens to be transferred
-    /// @return success Whether the transfer was successful or not
-    function transferFromWithoutReward(
-        address payable _from,
-        address _to,
-        uint256 _amount
-    ) public virtual returns (bool success);
-
-    /// @notice Doubles the 'minQuorumDivisor' in the case quorum has not been
-    /// achieved in 52 weeks
-    /// @return _success Whether the change was successful or not
-    function halveMinQuorum() public virtual returns (bool _success);
-
-    /// @return _numberOfProposals total number of proposals ever created
-    function numberOfProposals() public virtual view returns (uint _numberOfProposals);
-
-    /// @param _proposalID Id of the new curator proposal
-    /// @return _newDAO Address of the new DAO
-    function getNewDAOAddress(uint _proposalID) public virtual view returns (address _newDAO);
-
-    /// @param _account The address of the account which is checked.
-    /// @return Whether the account is blocked (not allowed to transfer tokens) or not.
-    function isBlocked(address _account) internal virtual returns (bool);
-
-    /// @notice If the caller is blocked by a proposal whose voting deadline
-    /// has exprired then unblock him.
-    /// @return Whether the account is blocked (not allowed to transfer tokens) or not.
-    function unblockMe() public virtual returns (bool);
-
-    event ProposalAdded(
-        uint indexed proposalID,
-        address recipient,
-        uint amount,
-        bool newCurator,
-        string description
-    );
-    event Voted(uint indexed proposalID, bool position, address indexed voter);
-    event ProposalTallied(uint indexed proposalID, bool result, uint quorum);
-    event NewCurator(address indexed _newCurator);
-    event AllowedRecipientChanged(address indexed _recipient, bool _allowed);
-}
-
-// The DAO contract itself
-contract DAO is DAOInterface, Token, TokenCreation {
-
-    // Modifier that allows only shareholders to vote and create new proposals
-    modifier onlyTokenholders {
-        if (balanceOf(msg.sender) == 0) revert();
-            _;
-    }
-
-    constructor(
-        address payable _curator,
-        DAO_Creator _daoCreator,
-        uint _proposalDeposit,
-        uint _minTokensToCreate,
-        uint _closingTime,
-        address _privateCreation,
-        string memory _tokenName,
-        string memory _tokenSymbol,
-        uint8 _decimalPlaces
-    ) TokenCreation(
-        _minTokensToCreate,
-        _closingTime,
-        _privateCreation,
-        _tokenName,
-        _tokenSymbol,
-        _decimalPlaces) public {
-
-        curator = _curator;
-        daoCreator = _daoCreator;
-        proposalDeposit = _proposalDeposit;
-        rewardAccount = new ManagedAccount(address(this), false);
-        DAOrewardAccount = new ManagedAccount(address(this), false);
-        if (address(rewardAccount) == 0x0000000000000000000000000000000000000000)
-            revert();
-        if (address(DAOrewardAccount) == 0x0000000000000000000000000000000000000000)
-            revert();
-        lastTimeMinQuorumMet = block.timestamp;
-        minQuorumDivisor = 5; // sets the minimal quorum to 20%
-        proposals.push(); // avoids a proposal with ID 0 because it is used
-
-        allowedRecipients[address(this)] = true;
-        allowedRecipients[curator] = true;
-    }
-
-    receive() external payable override(DAOInterface, TokenCreation) {
-        if (block.timestamp < closingTime + creationGracePeriod && msg.sender != address(extraBalance))
-            createTokenProxy(payable(msg.sender));
-        else
-            receiveEther();
-    }
-
-
-    function receiveEther() public override returns (bool) {
-        return true;
-    }
-
-
-    function newProposal(
-        address payable _recipient,
-        uint _amount,
-        string memory _description,
-        bytes memory _transactionData,
-        uint _debatingPeriod,
-        bool _newCurator
-    ) onlyTokenholders public override payable returns (uint _proposalID) {
-
-        // Sanity check
-        if (_newCurator && (
-            _amount != 0
-            || _transactionData.length != 0
-            || _recipient == curator
-            || msg.value > 0
-            || _debatingPeriod < minSplitDebatePeriod)) {
-            revert();
-        } else if (
-            !_newCurator
-            && (!isRecipientAllowed(_recipient) || (_debatingPeriod <  minProposalDebatePeriod))
-        ) {
-            revert();
-        }
-
-        if (_debatingPeriod > 8 weeks)
-            revert();
-
-        if (!isFueled
-            || block.timestamp < closingTime
-            || (msg.value < proposalDeposit && !_newCurator)) {
-
-            revert();
-        }
-
-        if (block.timestamp + _debatingPeriod < block.timestamp) // prevents overflow
-            revert();
-
-        // to prevent a 51% attacker to convert the ether into deposit
-        if (msg.sender == address(this))
-            revert();
-
-        // to prevent curator from halving quorum before first proposal
-        if (proposals.length == 1) // initial length is 1 (see constructor)
-            lastTimeMinQuorumMet = block.timestamp;
-
-        Proposal storage p = proposals.push();
-         _proposalID = proposals.length - 1;
-        p.recipient = _recipient;
-        p.amount = _amount;
-        p.description = _description;
-        p.proposalHash = keccak256(abi.encodePacked(_recipient, _amount, _transactionData));
-        p.votingDeadline = block.timestamp + _debatingPeriod;
-        p.open = true;
-        //p.proposalPassed = False; // that's default
-        p.newCurator = _newCurator;
-        if (_newCurator)
-            p.splitData.push();
-        p.creator = payable(msg.sender);
-        p.proposalDeposit = msg.value;
-
-        sumOfProposalDeposits += msg.value;
-
-        emit ProposalAdded(
-            _proposalID,
-            _recipient,
-            _amount,
-            _newCurator,
-            _description
-        );
-    }
-
-
-    function checkProposalCode(
-        uint _proposalID,
-        address payable _recipient,
-        uint _amount,
-        bytes memory _transactionData
-    ) public override view returns (bool _codeChecksOut) {
-        Proposal storage p = proposals[_proposalID];
-        return p.proposalHash == keccak256(abi.encodePacked(_recipient, _amount, _transactionData));
-    }
-
-
-    function vote(
-        uint _proposalID,
-        bool _supportsProposal
-    ) onlyTokenholders public override returns (uint _voteID) {
-
-        Proposal storage p = proposals[_proposalID];
-        if (p.votedYes[msg.sender]
-            || p.votedNo[msg.sender]
-            || block.timestamp >= p.votingDeadline) {
-
-            revert();
-        }
-
-        if (_supportsProposal) {
-            p.yea += balances[msg.sender];
-            p.votedYes[msg.sender] = true;
-        } else {
-            p.nay += balances[msg.sender];
-            p.votedNo[msg.sender] = true;
-        }
-
-        if (blocked[msg.sender] == 0) {
-            blocked[msg.sender] = _proposalID;
-        } else if (p.votingDeadline > proposals[blocked[msg.sender]].votingDeadline) {
-            // this proposal's voting deadline is further into the future than
-            // the proposal that blocks the sender so make it the blocker
-            blocked[msg.sender] = _proposalID;
-        }
-
-        emit Voted(_proposalID, _supportsProposal, msg.sender);
-    }
-
-
-    function executeProposal(
-        uint _proposalID,
-        bytes memory _transactionData
-    ) public override returns (bool _success) {
-
-        Proposal storage p = proposals[_proposalID];
-
-        uint waitPeriod = p.newCurator
-            ? splitExecutionPeriod
-            : executeProposalPeriod;
-        // If we are over deadline and waiting period, assert proposal is closed
-        if (p.open && block.timestamp > p.votingDeadline + waitPeriod) {
-            closeProposal(_proposalID);
-            return false;
-        }
-
-        // Check if the proposal can be executed
-        if (block.timestamp < p.votingDeadline  // has the voting deadline arrived?
-            // Have the votes been counted?
-            || !p.open
-            || p.proposalPassed // anyone trying to call us recursively?
-            // Does the transaction code match the proposal?
-            || p.proposalHash != keccak256(abi.encodePacked(p.recipient, p.amount, _transactionData))) {
-
-            revert();
-        }
-
-        // If the curator removed the recipient from the whitelist, close the proposal
-        // in order to free the deposit and allow unblocking of voters
-        if (!isRecipientAllowed(p.recipient)) {
-            closeProposal(_proposalID);
-            p.creator.send(p.proposalDeposit);
-            return false;
-        }
-
-        bool proposalCheck = true;
-
-        if (p.amount > actualBalance())
-            proposalCheck = false;
-
-        uint quorum = p.yea + p.nay;
-
-        // require 53% for calling newContract()
-        if (_transactionData.length >= 4 && _transactionData[0] == 0x68
-            && _transactionData[1] == 0x37 && _transactionData[2] == 0xff
-            && _transactionData[3] == 0x1e
-            && quorum < minQuorum(actualBalance() + rewardToken[address(this)])) {
-
-                proposalCheck = false;
-        }
-
-        if (quorum >= minQuorum(p.amount)) {
-            if (!p.creator.send(p.proposalDeposit))
-                revert();
-
-            lastTimeMinQuorumMet = block.timestamp;
-            // set the minQuorum to 20% again, in the case it has been reached
-            if (quorum > totalSupply / 5)
-                minQuorumDivisor = 5;
-        }
-
-        // Execute result
-        if (quorum >= minQuorum(p.amount) && p.yea > p.nay && proposalCheck) {
-            // we are setting this here before the CALL() value transfer to
-            // assure that in the case of a malicious recipient contract trying
-            // to call executeProposal() recursively money can't be transferred
-            // multiple times out of the DAO
-            p.proposalPassed = true;
-
-            (bool success,) = p.recipient.call{value: p.amount}(_transactionData);
-            if (!success)
-                revert();
-
-            _success = true;
-
-            // only create reward tokens when ether is not sent to the DAO itself and
-            // related addresses. Proxy addresses should be forbidden by the curator.
-            if (p.recipient != address(this) && p.recipient != address(rewardAccount)
-                && p.recipient != address(DAOrewardAccount)
-                && p.recipient != address(extraBalance)
-                && p.recipient != address(curator)) {
-
-                rewardToken[address(this)] += p.amount;
-                totalRewardToken += p.amount;
-            }
-        }
-
-        closeProposal(_proposalID);
-
-        // Initiate event
-        emit ProposalTallied(_proposalID, _success, quorum);
-    }
-
-
-    function closeProposal(uint _proposalID) internal {
-        Proposal storage p = proposals[_proposalID];
-        if (p.open)
-            sumOfProposalDeposits -= p.proposalDeposit;
-        p.open = false;
-    }
-
-    function splitDAO(
-        uint _proposalID,
-        address payable _newCurator
-    ) onlyTokenholders public override returns (bool _success) {
-
-        Proposal storage p = proposals[_proposalID];
-
-        // Sanity check
-
-        if (block.timestamp < p.votingDeadline  // has the voting deadline arrived?
-            //The request for a split expires XX days after the voting deadline
-            || block.timestamp > p.votingDeadline + splitExecutionPeriod
-            // Does the new Curator address match?
-            || p.recipient != _newCurator
-            // Is it a new curator proposal?
-            || !p.newCurator
-            // Have you voted for this split?
-            || !p.votedYes[msg.sender]
-            // Did you already vote on another proposal?
-            || (blocked[msg.sender] != _proposalID && blocked[msg.sender] != 0) )  {
-
-            revert();
-        }
-
-        // If the new DAO doesn't exist yet, create the new DAO and store the
-        // current split data
-        if (address(p.splitData[0].newDAO) == 0x0000000000000000000000000000000000000000) {
-            p.splitData[0].newDAO = createNewDAO(_newCurator);
-            // Call depth limit reached, etc.
-            if (address(p.splitData[0].newDAO) == 0x0000000000000000000000000000000000000000)
-                revert();
-            // should never happen
-            if (address(this).balance < sumOfProposalDeposits)
-                revert();
-            p.splitData[0].splitBalance = actualBalance();
-            p.splitData[0].rewardToken = rewardToken[address(this)];
-            p.splitData[0].totalSupply = totalSupply;
-            p.proposalPassed = true;
-        }
-
-        // Move ether and assign new Tokens
-        uint fundsToBeMoved =
-            (balances[msg.sender] * p.splitData[0].splitBalance) /
-            p.splitData[0].totalSupply;
-        if (p.splitData[0].newDAO.createTokenProxy{value: fundsToBeMoved}(payable(msg.sender)) == false)
-            revert();
-
-
-        // Assign reward rights to new DAO
-        uint rewardTokenToBeMoved =
-            (balances[msg.sender] * p.splitData[0].rewardToken) /
-            p.splitData[0].totalSupply;
-
-        uint paidOutToBeMoved = DAOpaidOut[address(this)] * rewardTokenToBeMoved /
-            rewardToken[address(this)];
-
-        rewardToken[address(p.splitData[0].newDAO)] += rewardTokenToBeMoved;
-        if (rewardToken[address(this)] < rewardTokenToBeMoved)
-            revert();
-        rewardToken[address(this)] -= rewardTokenToBeMoved;
-
-        DAOpaidOut[address(p.splitData[0].newDAO)] += paidOutToBeMoved;
-        if (DAOpaidOut[address(this)] < paidOutToBeMoved)
-            revert();
-        DAOpaidOut[address(this)] -= paidOutToBeMoved;
-
-        // Burn DAO Tokens
-        emit Transfer(msg.sender, 0x0000000000000000000000000000000000000000, balances[msg.sender]);
-        withdrawRewardFor(payable(msg.sender)); // be nice, and get his rewards
-        totalSupply -= balances[msg.sender];
-        balances[msg.sender] = 0;
-        paidOut[msg.sender] = 0;
-        return true;
-    }
-
-    function newContract(address payable _newContract) public override {
-        if (msg.sender != address(this) || !allowedRecipients[_newContract]) return;
-        // move all ether
-        (bool success,) = _newContract.call{value: address(this).balance}("");
-        if (!success) {
-            revert();
-        }
-
-        //move all reward tokens
-        rewardToken[_newContract] += rewardToken[address(this)];
-        rewardToken[address(this)] = 0;
-        DAOpaidOut[_newContract] += DAOpaidOut[address(this)];
-        DAOpaidOut[address(this)] = 0;
-    }
-
-
-    function retrieveDAOReward(bool _toMembers) external override returns (bool _success) {
-        DAO dao = DAO(payable(msg.sender));
-
-        if ((rewardToken[msg.sender] * DAOrewardAccount.accumulatedInput()) /
-            totalRewardToken < DAOpaidOut[msg.sender])
-            revert();
-
-        uint reward =
-            (rewardToken[msg.sender] * DAOrewardAccount.accumulatedInput()) /
-            totalRewardToken - DAOpaidOut[msg.sender];
-
-        reward = address(DAOrewardAccount).balance < reward ? address(DAOrewardAccount).balance : reward;
-
-        if(_toMembers) {
-            if (!DAOrewardAccount.payOut(payable(dao.rewardAccount()), reward))
-                revert();
-            }
-        else {
-            if (!DAOrewardAccount.payOut(payable(dao), reward))
-                revert();
-        }
-        DAOpaidOut[msg.sender] += reward;
-        return true;
-    }
-
-    function getMyReward() public override returns (bool _success) {
-        return withdrawRewardFor(payable(msg.sender));
-    }
-
-
-    function withdrawRewardFor(address payable _account) noEther internal
-override returns (bool _success) {
-        if ((balanceOf(_account) * rewardAccount.accumulatedInput()) / totalSupply < paidOut[_account])
-            revert();
-
-        uint reward =
-            (balanceOf(_account) * rewardAccount.accumulatedInput()) / totalSupply - paidOut[_account];
-
-        reward = address(rewardAccount).balance < reward ? address(rewardAccount).balance : reward;
-
-        if (!rewardAccount.payOut(_account, reward))
-            revert();
-        paidOut[_account] += reward;
-        return true;
-    }
-
-
-    function transfer(address _to, uint256 _value) public override returns (bool success) {
-        if (isFueled
-            && block.timestamp > closingTime
-            && !isBlocked(msg.sender)
-            && _to != address(this)
-            && transferPaidOut(msg.sender, _to, _value)
-            && super.transfer(_to, _value)) {
-
-            return true;
-        } else {
-            revert();
-        }
-    }
-
-
-    function transferWithoutReward(address _to, uint256 _value) public override returns (bool success) {
-        if (!getMyReward())
-            revert();
-        return transfer(_to, _value);
-    }
-
-
-    function transferFrom(address _from, address _to, uint256 _value) public
-override returns (bool success) {
-        if (isFueled
-            && block.timestamp > closingTime
-            && !isBlocked(_from)
-            && _to != address(this)
-            && transferPaidOut(_from, _to, _value)
-            && super.transferFrom(_from, _to, _value)) {
-
-            return true;
-        } else {
-            revert();
-        }
-    }
-
-
-    function transferFromWithoutReward(
-        address payable _from,
-        address _to,
-        uint256 _value
-    ) public override returns (bool success) {
-
-        if (!withdrawRewardFor(_from))
-            revert();
-        return transferFrom(_from, _to, _value);
-    }
-
-
-    function transferPaidOut(
-        address _from,
-        address _to,
-        uint256 _value
-    ) internal returns (bool success) {
-
-        uint transferPaidOut = paidOut[_from] * _value / balanceOf(_from);
-        if (transferPaidOut > paidOut[_from])
-            revert();
-        paidOut[_from] -= transferPaidOut;
-        paidOut[_to] += transferPaidOut;
-        return true;
-    }
-
-
-    function changeProposalDeposit(uint _proposalDeposit) external override {
-        if (msg.sender != address(this) || _proposalDeposit > (actualBalance() + rewardToken[address(this)])
-            / maxDepositDivisor) {
-
-            revert();
-        }
-        proposalDeposit = _proposalDeposit;
-    }
-
-
-    function changeAllowedRecipients(address _recipient, bool _allowed) external
-override returns (bool _success) {
-        if (msg.sender != curator)
-            revert();
-        allowedRecipients[_recipient] = _allowed;
-        emit AllowedRecipientChanged(_recipient, _allowed);
-        return true;
-    }
-
-
-    function isRecipientAllowed(address _recipient) internal returns (bool _isAllowed) {
-        if (allowedRecipients[_recipient]
-            || (_recipient == address(extraBalance)
-                // only allowed when at least the amount held in the
-                // extraBalance account has been spent from the DAO
-                && totalRewardToken > extraBalance.accumulatedInput()))
-            return true;
-        else
-            return false;
-    }
-
-    function actualBalance() public view returns (uint _actualBalance) {
-        return address(this).balance - sumOfProposalDeposits;
-    }
-
-
-    function minQuorum(uint _value) internal view returns (uint _minQuorum) {
-        // minimum of 20% and maximum of 53.33%
-        return totalSupply / minQuorumDivisor +
-            (_value * totalSupply) / (3 * (actualBalance() + rewardToken[address(this)]));
-    }
-
-
-    function halveMinQuorum() public override returns (bool _success) {
-        // this can only be called after `quorumHalvingPeriod` has passed or at anytime after
-        // fueling by the curator with a delay of at least `minProposalDebatePeriod`
-        // between the calls
-        if ((lastTimeMinQuorumMet < (block.timestamp - quorumHalvingPeriod) || msg.sender == curator)
-            && lastTimeMinQuorumMet < (block.timestamp - minProposalDebatePeriod)
-            && block.timestamp >= closingTime
-            && proposals.length > 1) {
-            lastTimeMinQuorumMet = block.timestamp;
-            minQuorumDivisor *= 2;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function createNewDAO(address payable _newCurator) internal returns (DAO _newDAO) {
-        emit NewCurator(_newCurator);
-        return daoCreator.createDAO(
-            _newCurator,
-            0,
-            0,
-            block.timestamp + splitExecutionPeriod,
-            name,
-            symbol,
-            decimals
-        );
-    }
-
-    function numberOfProposals() public view override returns (uint _numberOfProposals) {
-        // Don't count index 0. It's used by isBlocked() and exists from start
-        return proposals.length - 1;
-    }
-
-    function getNewDAOAddress(uint _proposalID) public override view returns (address _newDAO) {
-        return address(proposals[_proposalID].splitData[0].newDAO);
-    }
-
-    function isBlocked(address _account) internal override returns (bool) {
-        if (blocked[_account] == 0)
-            return false;
-        Proposal storage p = proposals[blocked[_account]];
-        if (block.timestamp > p.votingDeadline) {
-            blocked[_account] = 0;
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    function unblockMe() public override returns (bool) {
-        return isBlocked(msg.sender);
-    }
-}
-
-contract DAO_Creator {
-    function createDAO(
-        address payable _curator,
-        uint _proposalDeposit,
-        uint _minTokensToCreate,
-        uint _closingTime,
-        string memory _tokenName,
-        string memory _tokenSymbol,
-        uint8 _decimalPlaces
-    ) public returns (DAO _newDAO) {
-
-        return new DAO(
-            _curator,
-            DAO_Creator(this),
-            _proposalDeposit,
-            _minTokensToCreate,
-            _closingTime,
-            msg.sender,
-            _tokenName,
-            _tokenSymbol,
-            _decimalPlaces
-        );
-    }
-}
diff --git a/test/externalTests/solc-js/DAO/ManagedAccount.sol b/test/externalTests/solc-js/DAO/ManagedAccount.sol
deleted file mode 100644
index 879de9587718..000000000000
--- a/test/externalTests/solc-js/DAO/ManagedAccount.sol
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-This file is part of the DAO.
-
-The DAO is free software: you can redistribute it and/or modify
-it under the terms of the GNU lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The DAO is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU lesser General Public License for more details.
-
-You should have received a copy of the GNU lesser General Public License
-along with the DAO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
-Basic account, used by the DAO contract to separately manage both the rewards
-and the extraBalance accounts.
-*/
-
-abstract contract ManagedAccountInterface {
-    // The only address with permission to withdraw from this account
-    address public owner;
-    // If true, only the owner of the account can receive ether from it
-    bool public payOwnerOnly;
-    // The sum of ether (in wei) which has been sent to this contract
-    uint public accumulatedInput;
-
-    /// @notice Sends `_amount` of wei to _recipient
-    /// @param _amount The amount of wei to send to `_recipient`
-    /// @param _recipient The address to receive `_amount` of wei
-    /// @return True if the send completed
-    function payOut(address payable _recipient, uint _amount) public virtual returns (bool);
-
-    event PayOut(address indexed _recipient, uint _amount);
-}
-
-
-contract ManagedAccount is ManagedAccountInterface{
-
-    // The constructor sets the owner of the account
-    constructor(address _owner, bool _payOwnerOnly) {
-        owner = _owner;
-        payOwnerOnly = _payOwnerOnly;
-    }
-
-    // When the contract receives a transaction without data this is called.
-    // It counts the amount of ether it receives and stores it in
-    // accumulatedInput.
-    receive() external payable {
-        accumulatedInput += msg.value;
-    }
-
-    function payOut(address payable _recipient, uint _amount) public override returns (bool) {
-        if (msg.sender != owner || (payOwnerOnly && _recipient != owner))
-            revert();
-        (bool success,) = _recipient.call{value: _amount}("");
-        if (success) {
-            emit PayOut(_recipient, _amount);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/test/externalTests/solc-js/DAO/Token.sol b/test/externalTests/solc-js/DAO/Token.sol
deleted file mode 100644
index 0e566830f3e9..000000000000
--- a/test/externalTests/solc-js/DAO/Token.sol
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-This file is part of the DAO.
-
-The DAO is free software: you can redistribute it and/or modify
-it under the terms of the GNU lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The DAO is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU lesser General Public License for more details.
-
-You should have received a copy of the GNU lesser General Public License
-along with the DAO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
-Basic, standardized Token contract with no "premine". Defines the functions to
-check token balances, send tokens, send tokens on behalf of a 3rd party and the
-corresponding approval process. Tokens need to be created by a derived
-contract (e.g. TokenCreation.sol).
-
-Thank you ConsenSys, this contract originated from:
-https://github.com/ConsenSys/Tokens/blob/master/Token_Contracts/contracts/Standard_Token.sol
-Which is itself based on the Ethereum standardized contract APIs:
-https://github.com/ethereum/wiki/wiki/Standardized_Contract_APIs
-*/
-
-/// @title Standard Token Contract.
-
-abstract contract TokenInterface {
-    mapping (address => uint256) balances;
-    mapping (address => mapping (address => uint256)) allowed;
-
-    /// Public variables of the token, all used for display
-    string public name;
-    string public symbol;
-    uint8 public decimals;
-    string public standard = 'Token 0.1';
-
-    /// Total amount of tokens
-    uint256 public totalSupply;
-
-    /// @param _owner The address from which the balance will be retrieved
-    /// @return balance The balance
-    function balanceOf(address _owner) public virtual view returns (uint256 balance);
-
-    /// @notice Send `_amount` tokens to `_to` from `msg.sender`
-    /// @param _to The address of the recipient
-    /// @param _amount The amount of tokens to be transferred
-    /// @return success Whether the transfer was successful or not
-    function transfer(address _to, uint256 _amount) public virtual returns (bool success);
-
-    /// @notice Send `_amount` tokens to `_to` from `_from` on the condition it
-    /// is approved by `_from`
-    /// @param _from The address of the origin of the transfer
-    /// @param _to The address of the recipient
-    /// @param _amount The amount of tokens to be transferred
-    /// @return success Whether the transfer was successful or not
-    function transferFrom(address _from, address _to, uint256 _amount) public
-virtual returns (bool success);
-
-    /// @notice `msg.sender` approves `_spender` to spend `_amount` tokens on
-    /// its behalf
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @param _amount The amount of tokens to be approved for transfer
-    /// @return success Whether the approval was successful or not
-    function approve(address _spender, uint256 _amount) public virtual returns (bool success);
-
-    /// @param _owner The address of the account owning tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @return remaining Amount of remaining tokens of _owner that _spender is allowed
-    /// to spend
-    function allowance(
-        address _owner,
-        address _spender
-    ) public virtual view returns (uint256 remaining);
-
-    event Transfer(address indexed _from, address indexed _to, uint256 _amount);
-    event Approval(
-        address indexed _owner,
-        address indexed _spender,
-        uint256 _amount
-    );
-}
-
-abstract contract tokenRecipient {
-    function receiveApproval(address _from, uint256 _value, address _token, bytes memory _extraData) public virtual;
-}
-
-contract Token is TokenInterface {
-    // Protects users by preventing the execution of method calls that
-    // inadvertently also transferred ether
-    modifier noEther() {if (msg.value > 0) revert(); _; }
-
-    function balanceOf(address _owner) public override view returns (uint256 balance) {
-        return balances[_owner];
-    }
-
-    function transfer(address _to, uint256 _amount) public virtual override returns (bool success) {
-        if (balances[msg.sender] >= _amount && _amount > 0) {
-            balances[msg.sender] -= _amount;
-            balances[_to] += _amount;
-            emit Transfer(msg.sender, _to, _amount);
-            return true;
-        } else {
-           return false;
-        }
-    }
-
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _amount
-    ) public virtual override returns (bool success) {
-
-        if (balances[_from] >= _amount
-            && allowed[_from][msg.sender] >= _amount
-            && _amount > 0) {
-
-            balances[_to] += _amount;
-            balances[_from] -= _amount;
-            allowed[_from][msg.sender] -= _amount;
-            emit Transfer(_from, _to, _amount);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function approve(address _spender, uint256 _amount) public override returns (bool success) {
-        allowed[msg.sender][_spender] = _amount;
-        emit Approval(msg.sender, _spender, _amount);
-        return true;
-    }
-
-    /// Allow another contract to spend some tokens in your behalf
-    function approveAndCall(address _spender, uint256 _value, bytes memory _extraData)
-        public returns (bool success) {
-        allowed[msg.sender][_spender] = _value;
-        tokenRecipient spender = tokenRecipient(_spender);
-        spender.receiveApproval(msg.sender, _value, address(this), _extraData);
-        return true;
-    }
-
-    function allowance(address _owner, address _spender) public override view returns (uint256 remaining) {
-        return allowed[_owner][_spender];
-    }
-}
diff --git a/test/externalTests/solc-js/DAO/TokenCreation.sol b/test/externalTests/solc-js/DAO/TokenCreation.sol
deleted file mode 100644
index 64abf86ca1fe..000000000000
--- a/test/externalTests/solc-js/DAO/TokenCreation.sol
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-This file is part of the DAO.
-
-The DAO is free software: you can redistribute it and/or modify
-it under the terms of the GNU lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The DAO is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU lesser General Public License for more details.
-
-You should have received a copy of the GNU lesser General Public License
-along with the DAO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
- * Token Creation contract, used by the DAO to create its tokens and initialize
- * its ether. Feel free to modify the divisor method to implement different
- * Token Creation parameters
-*/
-
-import "./Token.sol";
-import "./ManagedAccount.sol";
-
-abstract contract TokenCreationInterface {
-
-    // End of token creation, in Unix time
-    uint public closingTime;
-    // Minimum fueling goal of the token creation, denominated in tokens to
-    // be created
-    uint public minTokensToCreate;
-    // True if the DAO reached its minimum fueling goal, false otherwise
-    bool public isFueled;
-    // For DAO splits - if privateCreation is 0, then it is a public token
-    // creation, otherwise only the address stored in privateCreation is
-    // allowed to create tokens
-    address public privateCreation;
-    // hold extra ether which has been sent after the DAO token
-    // creation rate has increased
-    ManagedAccount public extraBalance;
-    // tracks the amount of wei given from each contributor (used for refund)
-    mapping (address => uint256) weiGiven;
-
-    /// @dev Constructor setting the minimum fueling goal and the
-    /// end of the Token Creation
-    /// @param _minTokensToCreate Minimum fueling goal in number of
-    ///        Tokens to be created
-    /// @param _closingTime Date (in Unix time) of the end of the Token Creation
-    /// @param _privateCreation Zero means that the creation is public.  A
-    /// non-zero address represents the only address that can create Tokens
-    /// (the address can also create Tokens on behalf of other accounts)
-    // This is the constructor: it can not be overloaded so it is commented out
-    //  function TokenCreation(
-        //  uint _minTokensTocreate,
-        //  uint _closingTime,
-        //  address _privateCreation
-        //  string _tokenName,
-        //  string _tokenSymbol,
-        //  uint _decimalPlaces
-    //  );
-
-    /// @notice Create Token with `_tokenHolder` as the initial owner of the Token
-    /// @param _tokenHolder The address of the Tokens's recipient
-    /// @return success Whether the token creation was successful
-    function createTokenProxy(address payable _tokenHolder) payable virtual public returns (bool success);
-
-    /// @notice Refund `msg.sender` in the case the Token Creation did
-    /// not reach its minimum fueling goal
-    function refund() virtual public;
-
-    /// @return divisor The divisor used to calculate the token creation rate during
-    /// the creation phase
-    function divisor() public virtual view returns (uint divisor);
-
-    event FuelingToDate(uint value);
-    event CreatedToken(address indexed to, uint amount);
-    event Refund(address indexed to, uint value);
-}
-
-
-contract TokenCreation is TokenCreationInterface, Token {
-    constructor(
-        uint _minTokensToCreate,
-        uint _closingTime,
-        address _privateCreation,
-        string memory _tokenName,
-        string memory _tokenSymbol,
-        uint8 _decimalPlaces) public {
-
-        closingTime = _closingTime;
-        minTokensToCreate = _minTokensToCreate;
-        privateCreation = _privateCreation;
-        extraBalance = new ManagedAccount(address(this), true);
-        name = _tokenName;
-        symbol = _tokenSymbol;
-        decimals = _decimalPlaces;
-
-    }
-
-    function createTokenProxy(address payable _tokenHolder) payable public
-override returns (bool success) {
-        if (block.timestamp < closingTime && msg.value > 0
-            && (privateCreation == 0x0000000000000000000000000000000000000000 || privateCreation == msg.sender)) {
-
-            uint token = (msg.value * 20) / divisor();
-            address(extraBalance).call{value: msg.value - token}("");
-            balances[_tokenHolder] += token;
-            totalSupply += token;
-            weiGiven[_tokenHolder] += msg.value;
-            emit CreatedToken(_tokenHolder, token);
-            if (totalSupply >= minTokensToCreate && !isFueled) {
-                isFueled = true;
-                emit FuelingToDate(totalSupply);
-            }
-            return true;
-        }
-        revert();
-    }
-
-    function refund() public override {
-        if (block.timestamp > closingTime && !isFueled) {
-            // Get extraBalance - will only succeed when called for the first time
-            if (address(extraBalance).balance >= extraBalance.accumulatedInput())
-                extraBalance.payOut(payable(this), extraBalance.accumulatedInput());
-
-            // Execute refund
-            (bool success,) = msg.sender.call{value: weiGiven[msg.sender]}("");
-            if (success) {
-                emit Refund(msg.sender, weiGiven[msg.sender]);
-                totalSupply -= balances[msg.sender];
-                balances[msg.sender] = 0;
-                weiGiven[msg.sender] = 0;
-            }
-        }
-    }
-
-    function divisor() public override view returns (uint divisor) {
-        // The number of (base unit) tokens per wei is calculated
-        // as `msg.value` * 20 / `divisor`
-        // The fueling period starts with a 1:1 ratio
-        if (closingTime - 2 weeks > block.timestamp) {
-            return 20;
-        // Followed by 10 days with a daily creation rate increase of 5%
-        } else if (closingTime - 4 days > block.timestamp) {
-            return (20 + (block.timestamp - (closingTime - 2 weeks)) / (1 days));
-        // The last 4 days there is a constant creation rate ratio of 1:1.5
-        } else {
-            return 30;
-        }
-    }
-    receive() external virtual payable {
-    }
-}
diff --git a/test/externalTests/solc-js/determinism.js b/test/externalTests/solc-js/determinism.js
deleted file mode 100644
index 7f8dc4dcd25d..000000000000
--- a/test/externalTests/solc-js/determinism.js
+++ /dev/null
@@ -1,45 +0,0 @@
-const tape = require('tape');
-const fs = require('fs');
-const solc = require('../index.js');
-
-tape('Deterministic Compilation', function (t) {
-  t.test('DAO', function (st) {
-    const input = {};
-    let prevBytecode = null;
-    const testdir = 'test/DAO/';
-    const files = ['DAO.sol', 'Token.sol', 'TokenCreation.sol', 'ManagedAccount.sol'];
-    let i;
-    for (i in files) {
-      const file = files[i];
-      input[file] = { content: fs.readFileSync(testdir + file, 'utf8') };
-    }
-    for (i = 0; i < 10; i++) {
-      const output = JSON.parse(solc.compile(JSON.stringify({
-        language: 'Solidity',
-        settings: {
-          optimizer: {
-            enabled: true
-          },
-          outputSelection: {
-            '*': {
-              '*': ['evm.bytecode']
-            }
-          }
-        },
-        sources: input
-      })));
-      st.ok(output);
-      st.ok(output.contracts);
-      st.ok(output.contracts['DAO.sol']);
-      st.ok(output.contracts['DAO.sol'].DAO);
-      st.ok(output.contracts['DAO.sol'].DAO.evm.bytecode.object);
-      const bytecode = output.contracts['DAO.sol'].DAO.evm.bytecode.object;
-      st.ok(bytecode.length > 0);
-      if (prevBytecode !== null) {
-        st.equal(prevBytecode, bytecode);
-      }
-      prevBytecode = bytecode;
-    }
-    st.end();
-  });
-});
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
deleted file mode 100755
index af325326c2db..000000000000
--- a/test/externalTests/solc-js/solc-js.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-SOLJSON="$1"
-VERSION="$2"
-SOLCJS_CHECKOUT="$3" # optional
-
-[[ $SOLJSON != "" && -f "$SOLJSON" && $VERSION != "" ]] || fail "Usage: $0 <path to soljson.js> <version> [<path to solc-js>]"
-
-function solcjs_test
-{
-    TEST_DIR=$(pwd)
-    SOLCJS_INPUT_DIR="$TEST_DIR"/test/externalTests/solc-js
-
-    # set up solc-js on the branch specified
-    setup_solc "$DIR" solcjs "$SOLJSON" master solc/ "$SOLCJS_CHECKOUT"
-    cd solc/
-
-    printLog "Updating index.js file..."
-    echo "require('./determinism.js');" >> test/index.js
-
-    printLog "Copying determinism.js..."
-    cp -f "$SOLCJS_INPUT_DIR/determinism.js" test/
-
-    printLog "Copying contracts..."
-    cp -Rf "$SOLCJS_INPUT_DIR/DAO" test/
-
-    printLog "Copying SMTChecker tests..."
-    # We do not copy all tests because that takes too long.
-    cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests/external_calls test/smtCheckerTests/
-    cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests/loops test/smtCheckerTests/
-    cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests/invariants test/smtCheckerTests/
-
-    # Update version (needed for some tests)
-    echo "Updating package.json to version $VERSION"
-    npm version --allow-same-version --no-git-tag-version "$VERSION"
-
-    replace_version_pragmas
-
-    printLog "Running test function..."
-    npm test
-}
-
-external_test solc-js solcjs_test
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
deleted file mode 100755
index d8d94eb3c101..000000000000
--- a/test/externalTests/trident.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2021 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn build; }
-
-function test_fn {
-    # shellcheck disable=SC2046
-    TS_NODE_TRANSPILE_ONLY=1 npx hardhat test --no-compile $(
-        # TODO: We need to skip Migration.test.ts because it fails and makes other tests fail too.
-        # Replace this with `yarn test` once https://github.com/sushiswap/trident/issues/283 is fixed.
-        find test/ -name "*.test.ts" ! -path "test/Migration.test.ts" | LC_ALL=C sort
-    )
-}
-
-function trident_test
-{
-    local repo="https://github.com/sushiswap/trident"
-    local ref_type=commit
-    # FIXME: Switch back to master branch when https://github.com/sushiswap/trident/issues/303 gets fixed.
-    local ref="0cab5ae884cc9a41223d52791be775c3a053cb26" # master as of 2021-12-16
-    local config_file="hardhat.config.ts"
-    local config_var=config
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-no-optimize
-        ir-optimize-evm-only
-        ir-optimize-evm+yul        # Needs memory-safe inline assembly patch
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # TODO: Currently tests work only with the exact versions from yarn.lock.
-    # Re-enable this when https://github.com/sushiswap/trident/issues/284 is fixed.
-    #neutralize_package_lock
-
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    yarn install
-
-    replace_version_pragmas
-    force_solc_modules "${DIR}/solc"
-
-    # BentoBoxV1Flat.sol requires a few small tweaks to compile on 0.8.x.
-    # TODO: Remove once https://github.com/sushiswap/trident/pull/282 gets merged.
-    sed -i 's|uint128(-1)|type(uint128).max|g' contracts/flat/BentoBoxV1Flat.sol
-    sed -i 's|uint64(-1)|type(uint64).max|g' contracts/flat/BentoBoxV1Flat.sol
-    sed -i 's|uint32(-1)|type(uint32).max|g' contracts/flat/BentoBoxV1Flat.sol
-    sed -i 's|IERC20(0)|IERC20(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
-    sed -i 's|IStrategy(0)|IStrategy(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
-    find contracts -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
-
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i 's|it\(("Reverts on direct deployment via factory"\)|it.skip\1|g' test/MasterDeployer.test.ts
-
-    # @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
-    # version check. It's not used by tests so we can remove it.
-    rm -r node_modules/@sushiswap/core/
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat trident "$repo" "$preset"
-    done
-}
-
-external_test Trident trident_test
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
deleted file mode 100755
index 8d2551b61920..000000000000
--- a/test/externalTests/uniswap.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn compile; }
-function test_fn { UPDATE_SNAPSHOT=1 npx hardhat test; }
-
-function uniswap_test
-{
-    local repo="https://github.com/solidity-external-tests/uniswap-v3-core.git"
-    local ref_type=branch
-    local ref=main_080
-    local config_file="hardhat.config.ts"
-    local config_var=config
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-no-optimize
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i "s|it\(('underpay zero for one and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('pay in the wrong token zero for one and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('underpay zero for one and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('pay in the wrong token zero for one and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('underpay one for zero and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('pay in the wrong token one for zero and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('underpay one for zero and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-    sed -i "s|it\(('pay in the wrong token one for zero and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
-
-    neutralize_package_json_hooks
-    name_hardhat_default_export "$config_file" "$config_var"
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-
-    # Force latest versions of everything except Hardhat and some of its dependencies.
-    # - Hardhat 2.2.0 pulled in by yarn.lock is too old because it can't decode Panics caused by overflow/underflow.
-    # - Hardhat 2.5.0+ won't work because of error messages hard-coded in test expectations. E.g.
-    #   "revert SPL" is expected but the message is "reverted with reason string 'SPL'" in 2.5.0.
-    # - Newer versions of ethereumjs/tx have an issue with 'gteHardfork()' method.
-    neutralize_package_lock
-
-    yarn install
-    yarn add hardhat-gas-reporter
-
-    # With ethers.js 5.6.2 many tests for revert messages fail.
-    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
-    yarn add ethers@5.6.1
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat uniswap "$repo" "$preset"
-    done
-}
-
-external_test Uniswap-V3 uniswap_test
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
deleted file mode 100755
index 7a4353af578e..000000000000
--- a/test/externalTests/yield-liquidator.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npm run build; }
-function test_fn { npm run test; }
-
-function yield_liquidator_test
-{
-    local repo="https://github.com/yieldprotocol/yield-liquidator-v2"
-    local ref_type=branch
-    local ref="master"
-    local config_file="hardhat.config.ts"
-    local config_var="module.exports"
-
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-no-optimize
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-        legacy-no-optimize
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-    npm install
-
-    # The contract below is not used in any test and it depends on ISwapRouter which does not exists
-    # in the main repository.
-    # See: https://github.com/yieldprotocol/yield-liquidator-v2/blob/9a49d9a0e9398f6a6c07bad531e77d1001a1166f/src/swap_router.rs#L94
-    rm --force contracts/.YvBasicFlashLiquidator.sol
-
-    replace_version_pragmas
-    neutralize_packaged_contracts
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat yield_liquidator "$repo" "$preset"
-    done
-}
-
-external_test Yield-Liquidator-V2 yield_liquidator_test
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
deleted file mode 100755
index 54d753347573..000000000000
--- a/test/externalTests/zeppelin.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2019 solidity contributors.
-#------------------------------------------------------------------------------
-
-# Disable shellcheck errors on quoted special chars like backticks. Too many false-positives.
-# shellcheck disable=SC2016
-
-set -e
-# Temporary(?) fix to up the heap limit for node in order to prevent 'out of heap errors'
-export NODE_OPTIONS="--max-old-space-size=4096"
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npm run compile; }
-function test_fn { npm test; }
-
-function zeppelin_test
-{
-    local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
-    local ref_type=branch
-    local ref="master"
-    local config_file="hardhat.config.js"
-
-    local compile_only_presets=(
-        #ir-no-optimize           # Compilation fails with "Contract initcode size is 49410 bytes and exceeds 49152 bytes (a limit introduced in Shanghai)."
-        ir-optimize-evm-only      # FIXME: A few tests fail with "Transaction: ... exited with an error (status 0) after consuming all gas."
-)
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-optimize-evm+yul
-        legacy-no-optimize
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove the lines below when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3750).
-    sed -i "s|it(\('proxy admin cannot call delegated functions',\)|it.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
-    sed -i "s|describe(\('when the given implementation is the zero address'\)|describe.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
-    sed -i "s|describe(\('when the new proposed admin is the zero address'\)|describe.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
-    # In some cases Hardhat does not detect revert reasons properly via IR.
-    sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js
-    sed -i "s|it(\('cannot cancel invalid operation'\)|it.skip(\1|g" test/governance/TimelockController.test.js
-    sed -i "s|it(\('cannot call onlyInitializable function outside the scope of an initializable function'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
-    sed -i "s|it(\('reverts when sending non-zero amounts'\)|it.skip(\1|g" test/utils/Address.test.js
-    sed -i "s|it(\('reverts when sending more than the balance'\)|it.skip(\1|g" test/utils/Address.test.js
-    sed -i "s|it(\('fails deploying a contract if the bytecode length is zero'\)|it.skip(\1|g" test/utils/Create2.test.js
-    sed -i "s|it(\('fails deploying a contract if factory contract does not have sufficient balance'\)|it.skip(\1|g" test/utils/Create2.test.js
-    sed -i "s|it(\('reverts when casting -1'\)|it.skip(\1|g" test/utils/math/SafeCast.test.js
-    sed -i 's|it(\(`reverts when casting [^`]\+`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
-    sed -i "s|it(\('reverts if index is greater than supply'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|it(\('burns all tokens'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
-    sed -i "s|it(\('reverting initialization function'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
-    sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
-    sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/utils/ReentrancyGuard.test.js
-
-    # TODO: Remove when hardhat properly handle reverts of custom errors with via-ir enabled
-    # and/or open-zeppelin fix https://github.com/OpenZeppelin/openzeppelin-contracts/issues/4349
-    sed -i "s|it(\('cannot nest reinitializers'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
-    sed -i "s|it(\('prevents re-initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
-    sed -i "s|it(\('can lock contract after initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
-    sed -i "s|it(\('calling upgradeTo on the implementation reverts'\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
-    sed -i "s|it(\('calling upgradeToAndCall on the implementation reverts'\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
-    sed -i "s|it(\('calling upgradeTo from a contract that is not an ERC1967 proxy\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
-    sed -i "s|it(\('calling upgradeToAndCall from a contract that is not an ERC1967 proxy\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
-
-    # Here only the testToInt(248) and testToInt(256) cases fail so change the loop range to skip them
-    sed -i "s|range(8, 256, 8)\(.forEach(bits => testToInt(bits));\)|range(8, 240, 8)\1|" test/utils/math/SafeCast.test.js
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
-    npm install
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
-        store_benchmark_report hardhat zeppelin "$repo" "$preset"
-    done
-}
-
-external_test Zeppelin zeppelin_test
diff --git a/test/external_tests.py b/test/external_tests.py
deleted file mode 100755
index a7b8e87e8324..000000000000
--- a/test/external_tests.py
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/env python3
-
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2023 solidity contributors.
-# ------------------------------------------------------------------------------
-
-from argparse import ArgumentParser, Namespace
-import os
-from pathlib import Path
-import sys
-import subprocess
-
-EXTERNAL_TESTS_DIR = Path(__file__).parent / "externalTests"
-
-
-class ExternalTestNotFound(Exception):
-    pass
-
-
-def detect_external_tests() -> dict:
-    return {
-        file_path.stem: file_path
-        for file_path in Path(EXTERNAL_TESTS_DIR).iterdir()
-        if file_path.is_file() and file_path.suffix in (".sh", ".py")
-    }
-
-
-def display_available_external_tests(_):
-    print("Available external tests:")
-    print(*detect_external_tests().keys())
-
-
-def run_test_scripts(solc_binary_type: str, solc_binary_path: Path, tests: dict):
-    for test_name, test_script_path in tests.items():
-        print(f"Running {test_name} external test...")
-        subprocess.run(
-            [test_script_path, solc_binary_type, solc_binary_path],
-            check=True
-        )
-
-
-def run_external_tests(args: dict):
-    solc_binary_type = args["solc_binary_type"]
-    solc_binary_path = args["solc_binary_path"]
-
-    all_test_scripts = detect_external_tests()
-    selected_tests = args["selected_tests"]
-    if args["run_all"]:
-        assert len(selected_tests) == 0
-        run_test_scripts(solc_binary_type, solc_binary_path, all_test_scripts)
-        return
-
-    if len(selected_tests) == 0:
-        raise ExternalTestNotFound(
-            "External test was not selected. Please use --run or --run-all option"
-        )
-
-    unrecognized_tests = set(selected_tests) - set(all_test_scripts.keys())
-    if unrecognized_tests != set():
-        raise ExternalTestNotFound(
-            f"External test(s) not found: {', '.join(unrecognized_tests)}"
-        )
-    run_test_scripts(
-        solc_binary_type,
-        solc_binary_path,
-        {k: all_test_scripts[k] for k in selected_tests},
-    )
-
-
-def parse_commandline() -> Namespace:
-    script_description = "Script to run external Solidity tests."
-
-    parser = ArgumentParser(description=script_description)
-    subparser = parser.add_subparsers()
-    list_command = subparser.add_parser(
-        "list",
-        help="List all available external tests.",
-    )
-    list_command.set_defaults(cmd=display_available_external_tests)
-
-    run_command = subparser.add_parser(
-        "test",
-        help="Run external tests.",
-    )
-    run_command.set_defaults(cmd=run_external_tests)
-
-    run_command.add_argument(
-        "--solc-binary-type",
-        dest="solc_binary_type",
-        type=str,
-        required=True,
-        choices=["native", "solcjs"],
-        help="Type of the solidity compiler binary to be used.",
-    )
-    run_command.add_argument(
-        "--solc-binary-path",
-        dest="solc_binary_path",
-        type=Path,
-        required=True,
-        help="Path to the solidity compiler binary.",
-    )
-
-    running_mode = run_command.add_mutually_exclusive_group()
-    running_mode.add_argument(
-        "--run",
-        metavar="TEST_NAME",
-        dest="selected_tests",
-        nargs="+",
-        default=[],
-        help="List of one or more external tests to run (separated by sapce).",
-    )
-    running_mode.add_argument(
-        "--run-all",
-        dest="run_all",
-        default=False,
-        action="store_true",
-        help="Run all available external tests.",
-    )
-
-    return parser.parse_args()
-
-
-def main():
-    try:
-        args = parse_commandline()
-        args.cmd(vars(args))
-        return os.EX_OK
-    except ExternalTestNotFound as exception:
-        print(f"Error: {exception}", file=sys.stderr)
-        return os.EX_NOINPUT
-    except RuntimeError as exception:
-        print(f"Error: {exception}", file=sys.stderr)
-        return 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/test/formal/README.md b/test/formal/README.md
deleted file mode 100644
index 83bd79e76dda..000000000000
--- a/test/formal/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-The Solidity compiler implements several [optimization rules](https://github.com/ethereum/solidity/blob/develop/libevmasm/RuleList.h).
-
-This directory contains an effort to formally prove the correctness of those rules in:
-
-- HOL with [EthIsabelle](https://github.com/ekpyron/eth-isabelle)
-- FOL with SMT solvers using [Integers and BitVectors](http://smtlib.cs.uiowa.edu/theories.shtml)
diff --git a/test/formal/and_distributed_over_shl.py b/test/formal/and_distributed_over_shl.py
deleted file mode 100644
index ba1b379cf051..000000000000
--- a/test/formal/and_distributed_over_shl.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from opcodes import AND, SHL
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-AND(SHL(Z,X), SHL(Z,Y)) -> SHL(Z, AND(X,Y))
-"""
-
-rule = Rule()
-
-n_bits = 128
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-Z = BitVec('Z', n_bits)
-
-# Non optimized result
-nonopt = AND(SHL(Z,X), SHL(Z,Y))
-
-# Optimized result
-opt = SHL(Z, AND(X,Y))
-
-rule.check(nonopt, opt)
diff --git a/test/formal/byte_big.py b/test/formal/byte_big.py
deleted file mode 100644
index 8e6dfd7ef5a2..000000000000
--- a/test/formal/byte_big.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from opcodes import BYTE
-from rule import Rule
-from z3 import BitVec
-
-"""
-byte(A, X) -> 0
-given A >= WordSize / 8
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-
-rule.require(A >= n_bits / 8)
-rule.check(BYTE(A, X), 0)
diff --git a/test/formal/byte_equivalence.py b/test/formal/byte_equivalence.py
deleted file mode 100644
index c607eca4c483..000000000000
--- a/test/formal/byte_equivalence.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from opcodes import BYTE
-from rule import Rule
-from z3 import BitVec, BitVecVal, Concat, Extract
-
-"""
-Checks that the byte opcode (implemented using shift) is equivalent to a
-canonical definition of byte using extract.
-"""
-
-rule = Rule()
-
-n_bits = 256
-x = BitVec('X', n_bits)
-
-for i in range(0, 32):
-    # For Byte, i = 0 corresponds to most significant bit
-    # But for extract i = 0 corresponds to the least significant bit
-    lsb = 31 - i
-    rule.check(
-        BYTE(BitVecVal(i, n_bits), x),
-        Concat(BitVecVal(0, n_bits - 8), Extract(8 * lsb + 7, 8 * lsb, x))
-    )
diff --git a/test/formal/checked_int_add.py b/test/formal/checked_int_add.py
deleted file mode 100644
index c83ff6056f8e..000000000000
--- a/test/formal/checked_int_add.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from opcodes import AND, ISZERO, SGT, SLT, ADD
-from rule import Rule
-from util import BVSignedMax, BVSignedMin, BVSignedUpCast
-from z3 import BitVec, BVAddNoOverflow, BVAddNoUnderflow, Not
-
-"""
-Overflow checked signed integer addition.
-"""
-
-n_bits = 256
-type_bits = 8
-
-while type_bits <= n_bits:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow and underflow conditions
-	actual_overflow = Not(BVAddNoOverflow(X_short, Y_short, True))
-	actual_underflow = Not(BVAddNoUnderflow(X_short, Y_short))
-
-	# cast to full n_bits values
-	X = BVSignedUpCast(X_short, n_bits)
-	Y = BVSignedUpCast(Y_short, n_bits)
-	sum_ = ADD(X, Y)
-
-	# Constants
-	maxValue = BVSignedMax(type_bits, n_bits)
-	minValue = BVSignedMin(type_bits, n_bits)
-
-	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntAddFunction
-	if type_bits == 256:
-		overflow_check = AND(ISZERO(SLT(X, 0)), SLT(sum_, Y))
-		underflow_check = AND(SLT(X, 0), ISZERO(SLT(sum_, Y)))
-	else:
-		overflow_check = SGT(sum_, maxValue)
-		underflow_check = SLT(sum_, minValue)
-
-	type_bits += 8
-
-	rule.check(actual_overflow, overflow_check != 0)
-	rule.check(actual_underflow, underflow_check != 0)
diff --git a/test/formal/checked_int_div.py b/test/formal/checked_int_div.py
deleted file mode 100644
index 4c9d4e8290af..000000000000
--- a/test/formal/checked_int_div.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from opcodes import AND, EQ, SUB
-from rule import Rule
-from util import BVSignedMin, BVSignedUpCast
-from z3 import BitVec, BVSDivNoOverflow, Not
-
-"""
-Overflow checked signed integer division.
-"""
-
-n_bits = 256
-type_bits = 8
-
-while type_bits <= n_bits:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow conditions
-	actual_overflow = Not(BVSDivNoOverflow(X_short, Y_short))
-
-	# cast to full n_bits values
-	X = BVSignedUpCast(X_short, n_bits)
-	Y = BVSignedUpCast(Y_short, n_bits)
-
-	# Constants
-	minValue = BVSignedMin(type_bits, n_bits)
-
-	# Overflow check in YulUtilFunction::overflowCheckedIntDivFunction
-	overflow_check = AND(EQ(X, minValue), EQ(Y, SUB(0, 1)))
-
-	rule.check(actual_overflow, overflow_check != 0)
-
-	type_bits *= 2
diff --git a/test/formal/checked_int_mul_12.py b/test/formal/checked_int_mul_12.py
deleted file mode 100644
index ea13f01940ef..000000000000
--- a/test/formal/checked_int_mul_12.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from opcodes import AND, SDIV, MUL, EQ, ISZERO, OR, SLT
-from rule import Rule
-from util import BVSignedUpCast, BVSignedMin, BVSignedCleanupFunction
-from z3 import BVMulNoOverflow, BVMulNoUnderflow, BitVec, Not, Or
-
-"""
-Overflow checked signed integer multiplication.
-"""
-
-# Approximation with 16-bit base types.
-n_bits = 12
-
-for type_bits in [4, 6, 8, 12]:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow and underflow conditions
-	actual_overflow = Not(BVMulNoOverflow(X_short, Y_short, True))
-	actual_underflow = Not(BVMulNoUnderflow(X_short, Y_short))
-
-	# cast to full n_bits values
-	X = BVSignedUpCast(X_short, n_bits)
-	Y = BVSignedUpCast(Y_short, n_bits)
-	product_raw = MUL(X, Y)
-	#remove any overflown bits
-	product = BVSignedCleanupFunction(product_raw, type_bits)
-
-	# Constants
-	min_value = BVSignedMin(type_bits, n_bits)
-
-	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntMulFunction
-	if type_bits > n_bits / 2:
-		sol_overflow_check_1 = ISZERO(OR(ISZERO(X), EQ(Y, SDIV(product, X))))
-		if type_bits == n_bits:
-			sol_overflow_check_2 = AND(SLT(X, 0), EQ(Y, min_value))
-			sol_overflow_check = Or(sol_overflow_check_1 != 0, sol_overflow_check_2 != 0)
-		else:
-			sol_overflow_check = (sol_overflow_check_1 != 0)
-	else:
-		sol_overflow_check = (ISZERO(EQ(product, product_raw)) != 0)
-
-	rule.check(Or(actual_overflow, actual_underflow), sol_overflow_check)
diff --git a/test/formal/checked_int_sub.py b/test/formal/checked_int_sub.py
deleted file mode 100644
index aafd46d53085..000000000000
--- a/test/formal/checked_int_sub.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from opcodes import AND, ISZERO, SLT, SGT, SUB
-from rule import Rule
-from util import BVSignedMax, BVSignedMin, BVSignedUpCast
-from z3 import BitVec, BVSubNoOverflow, BVSubNoUnderflow, Not
-
-"""
-Overflow checked signed integer subtraction.
-"""
-
-n_bits = 256
-type_bits = 8
-
-while type_bits <= n_bits:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow and underflow conditions
-	actual_overflow = Not(BVSubNoOverflow(X_short, Y_short))
-	actual_underflow = Not(BVSubNoUnderflow(X_short, Y_short, True))
-
-	# cast to full n_bits values
-	X = BVSignedUpCast(X_short, n_bits)
-	Y = BVSignedUpCast(Y_short, n_bits)
-	diff = SUB(X, Y)
-
-	# Constants
-	maxValue = BVSignedMax(type_bits, n_bits)
-	minValue = BVSignedMin(type_bits, n_bits)
-
-	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntSubFunction
-	if type_bits == 256:
-		underflow_check = AND(ISZERO(SLT(Y, 0)), SGT(diff, X))
-		overflow_check = AND(SLT(Y, 0), SLT(diff, X))
-	else:
-		underflow_check = SLT(diff, minValue)
-		overflow_check = SGT(diff, maxValue)
-
-	type_bits += 8
-
-	rule.check(actual_underflow, underflow_check != 0)
-	rule.check(actual_overflow, overflow_check != 0)
diff --git a/test/formal/checked_uint_add.py b/test/formal/checked_uint_add.py
deleted file mode 100644
index 45b242833dd0..000000000000
--- a/test/formal/checked_uint_add.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from opcodes import GT, ADD
-from rule import Rule
-from util import BVUnsignedMax, BVUnsignedUpCast
-from z3 import BitVec, BVAddNoOverflow, Not
-
-"""
-Overflow checked unsigned integer addition.
-"""
-
-n_bits = 256
-type_bits = 8
-
-while type_bits <= n_bits:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow condition
-	actual_overflow = Not(BVAddNoOverflow(X_short, Y_short, False))
-
-	# cast to full n_bits values
-	X = BVUnsignedUpCast(X_short, n_bits)
-	Y = BVUnsignedUpCast(Y_short, n_bits)
-	sum_ = ADD(X, Y)
-
-	# Constants
-	maxValue = BVUnsignedMax(type_bits, n_bits)
-
-	# Overflow check in YulUtilFunction::overflowCheckedIntAddFunction
-	if type_bits == 256:
-		overflow_check = GT(X, sum_)
-	else:
-		overflow_check = GT(sum_, maxValue)
-
-	type_bits += 8
-
-	rule.check(overflow_check != 0, actual_overflow)
diff --git a/test/formal/checked_uint_mul_12.py b/test/formal/checked_uint_mul_12.py
deleted file mode 100644
index a386fcfa4fc1..000000000000
--- a/test/formal/checked_uint_mul_12.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from opcodes import ISZERO, DIV, MUL, EQ, OR
-from rule import Rule
-from util import BVUnsignedUpCast, BVUnsignedCleanupFunction
-from z3 import BitVec, Not, BVMulNoOverflow
-
-"""
-Overflow checked unsigned integer multiplication.
-"""
-
-# Approximation with 16-bit base types.
-n_bits = 12
-
-for type_bits in [4, 6, 8, 12]:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow condition
-	actual_overflow = Not(BVMulNoOverflow(X_short, Y_short, False))
-
-	# cast to full n_bits values
-	X = BVUnsignedUpCast(X_short, n_bits)
-	Y = BVUnsignedUpCast(Y_short, n_bits)
-	product_raw = MUL(X, Y)
-	#remove any overflown bits
-	product = BVUnsignedCleanupFunction(product_raw, type_bits)
-
-	# Overflow check in YulUtilFunction::overflowCheckedIntMulFunctions
-	if type_bits > n_bits / 2:
-		overflow_check = ISZERO(OR(ISZERO(X), EQ(Y, DIV(product, X))))
-	else:
-		overflow_check = ISZERO(EQ(product, product_raw))
-
-	rule.check(overflow_check != 0, actual_overflow)
diff --git a/test/formal/checked_uint_sub.py b/test/formal/checked_uint_sub.py
deleted file mode 100644
index 40a72686e405..000000000000
--- a/test/formal/checked_uint_sub.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from opcodes import SUB, GT
-from rule import Rule
-from util import BVUnsignedMax, BVUnsignedUpCast
-from z3 import BVSubNoUnderflow, BitVec, Not
-
-"""
-Overflow checked unsigned integer subtraction.
-"""
-
-n_bits = 256
-type_bits = 8
-
-while type_bits <= n_bits:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow condition
-	actual_overflow = Not(BVSubNoUnderflow(X_short, Y_short, False))
-
-	# cast to full n_bits values
-	X = BVUnsignedUpCast(X_short, n_bits)
-	Y = BVUnsignedUpCast(Y_short, n_bits)
-	diff = SUB(X, Y)
-
-	# Constants
-	maxValue = BVUnsignedMax(type_bits, n_bits)
-
-	# Overflow check in YulUtilFunction::overflowCheckedIntSubFunction
-	if type_bits == 256:
-		overflow_check = GT(diff, X)
-	else:
-		overflow_check = GT(diff, maxValue)
-
-	type_bits += 8
-
-	rule.check(overflow_check != 0, actual_overflow)
diff --git a/test/formal/combine_byte_shl.py b/test/formal/combine_byte_shl.py
deleted file mode 100644
index f492cc18f654..000000000000
--- a/test/formal/combine_byte_shl.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from opcodes import BYTE, SHL
-from rule import Rule
-from z3 import BitVec, ULE
-
-"""
-byte(A, shl(B, X))
-given B % 8 == 0 && A <= 32 && B <= 256
-->
-byte(A + B / 8, X)
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Non optimized result
-nonopt = BYTE(A, SHL(B, X))
-# Optimized result
-opt = BYTE(A + B / 8, X)
-
-rule.require(B % 8 == 0)
-rule.require(ULE(A, 32))
-rule.require(ULE(B, 256))
-
-rule.check(nonopt, opt)
diff --git a/test/formal/combine_byte_shr_1.py b/test/formal/combine_byte_shr_1.py
deleted file mode 100644
index 788319aa2065..000000000000
--- a/test/formal/combine_byte_shr_1.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from opcodes import BYTE, DIV, SHR
-from rule import Rule
-from z3 import BitVec, UGE, ULE, ULT
-
-"""
-byte(A, shr(B, X))
-given B % 8 == 0 && A < n_bits/8 && B <= n_bits && A >= B / 8
-->
-byte(A - B / 8, X)
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Non optimized result
-nonopt = BYTE(A, SHR(B, X))
-# Optimized result
-opt = BYTE(A - B / 8, X)
-
-rule.require(B % 8 == 0)
-rule.require(ULT(A, n_bits/8))
-rule.require(ULE(B, n_bits))
-rule.require(UGE(A, DIV(B,8)))
-
-rule.check(nonopt, opt)
diff --git a/test/formal/combine_byte_shr_2.py b/test/formal/combine_byte_shr_2.py
deleted file mode 100644
index d969c301bc4b..000000000000
--- a/test/formal/combine_byte_shr_2.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from opcodes import BYTE, SHR, DIV
-from rule import Rule
-from z3 import BitVec, ULT
-
-"""
-byte(A, shr(B, X))
-given A < B / 8
-->
-0
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Non optimized result
-nonopt = BYTE(A, SHR(B, X))
-# Optimized result
-opt = 0
-
-rule.require(ULT(A, DIV(B,8)))
-
-rule.check(nonopt, opt)
diff --git a/test/formal/combine_div_shl_one_32.py b/test/formal/combine_div_shl_one_32.py
deleted file mode 100644
index 5cca7288b64c..000000000000
--- a/test/formal/combine_div_shl_one_32.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from opcodes import DIV, SHL, SHR
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-DIV(X, SHL(Y, 1)) -> SHR(Y, X)
-Requirements:
-"""
-
-rule = Rule()
-
-n_bits = 32
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-
-# Non optimized result
-nonopt = DIV(X, SHL(Y, 1))
-
-# Optimized result
-opt = SHR(Y, X)
-
-rule.check(nonopt, opt)
diff --git a/test/formal/combine_mul_shl_one_64.py b/test/formal/combine_mul_shl_one_64.py
deleted file mode 100644
index 169cc5be0582..000000000000
--- a/test/formal/combine_mul_shl_one_64.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from opcodes import SHL, MUL
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-MUL(X, SHL(Y, 1)) -> SHL(Y, X)
-MUL(SHL(X, 1), Y) -> SHL(X, Y)
-Requirements:
-"""
-
-rule = Rule()
-
-n_bits = 64
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-
-# Requirements
-
-# Non optimized result
-nonopt_1 = MUL(X, SHL(Y, 1))
-nonopt_2 = MUL(SHL(X, 1), Y)
-
-# Optimized result
-opt_1 = SHL(Y, X)
-opt_2 = SHL(X, Y)
-
-rule.check(nonopt_1, opt_1)
-rule.check(nonopt_2, opt_2)
diff --git a/test/formal/combine_shl_shr_by_constant_64.py b/test/formal/combine_shl_shr_by_constant_64.py
deleted file mode 100644
index 4d8e6a1f8bdc..000000000000
--- a/test/formal/combine_shl_shr_by_constant_64.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from opcodes import AND, SHL, SHR
-from rule import Rule
-from z3 import BitVec, BitVecVal, If, Int2BV, IntVal, UGT, ULT
-
-"""
-Rule:
-mask = shlWorkaround(u256(-1), unsigned(A.d())) >> unsigned(B.d())
-SHR(B, SHL(A, X)) -> AND(SH[L/R]([B - A / A - B], X), Mask)
-Requirements:
-A < BitWidth
-B < BitWidth
-"""
-
-rule = Rule()
-
-n_bits = 64
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Constants
-BitWidth = BitVecVal(n_bits, n_bits)
-
-# Requirements
-rule.require(ULT(A, BitWidth))
-rule.require(ULT(B, BitWidth))
-
-# Non optimized result
-nonopt = SHR(B, SHL(A, X))
-
-# Optimized result
-Mask = SHR(B, SHL(A, Int2BV(IntVal(-1), n_bits)))
-opt = If(
-	UGT(A, B),
-	AND(SHL(A - B, X), Mask),
-		If(
-			UGT(B, A),
-			AND(SHR(B - A, X), Mask),
-			AND(X, Mask)
-		)
-	)
-
-rule.check(nonopt, opt)
diff --git a/test/formal/combine_shr_shl_by_constant_64.py b/test/formal/combine_shr_shl_by_constant_64.py
deleted file mode 100644
index 5bc8525742d7..000000000000
--- a/test/formal/combine_shr_shl_by_constant_64.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from opcodes import AND, SHL, SHR
-from rule import Rule
-from z3 import BitVec, BitVecVal, If, Int2BV, IntVal, UGT, ULT
-
-"""
-Rule:
-mask = shlWorkaround(u256(-1) >> unsigned(A.d()), unsigned(B.d()))
-SHL(B, SHR(A, X)) -> AND(SH[L/R]([B - A / A - B], X), Mask)
-Requirements:
-A < BitWidth
-B < BitWidth
-"""
-
-rule = Rule()
-
-n_bits = 64
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Constants
-BitWidth = BitVecVal(n_bits, n_bits)
-
-# Requirements
-rule.require(ULT(A, BitWidth))
-rule.require(ULT(B, BitWidth))
-
-# Non optimized result
-nonopt = SHL(B, SHR(A, X))
-
-# Optimized result
-Mask = SHL(B, SHR(A, Int2BV(IntVal(-1), n_bits)))
-opt = If(
-	UGT(A, B),
-	AND(SHR(A - B, X), Mask),
-		If(
-			UGT(B, A),
-			AND(SHL(B - A, X), Mask),
-			AND(X, Mask)
-		)
-	)
-
-rule.check(nonopt, opt)
diff --git a/test/formal/eq_sub.py b/test/formal/eq_sub.py
deleted file mode 100644
index 76808bc3bcb0..000000000000
--- a/test/formal/eq_sub.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from opcodes import EQ, ISZERO, SUB
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-ISZERO(SUB(X, Y)) -> EQ(X, Y)
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-
-# Non optimized result
-nonopt = ISZERO(SUB(X, Y))
-
-# Optimized result
-opt = EQ(X, Y)
-
-rule.check(nonopt, opt)
diff --git a/test/formal/exp_neg_one.py b/test/formal/exp_neg_one.py
deleted file mode 100644
index 4dffb88b0726..000000000000
--- a/test/formal/exp_neg_one.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from opcodes import AND, ISZERO, MOD, SUB
-from rule import Rule
-from util import BVUnsignedMax
-from z3 import BitVec, BitVecVal, If
-
-"""
-Checking conversion of exp(-1, X) to sub(isZero(and(X, 1)), and(X, 1))
-"""
-
-rule = Rule()
-n_bits = 256
-
-X = BitVec('X', n_bits)
-
-exp_neg_one = If(MOD(X, 2) == 0, BitVecVal(1, n_bits), BVUnsignedMax(n_bits, n_bits))
-
-rule.check(SUB(ISZERO(AND(X, 1)), AND(X, 1)), exp_neg_one)
diff --git a/test/formal/exp_to_shl.py b/test/formal/exp_to_shl.py
deleted file mode 100644
index 499cf7c2fda0..000000000000
--- a/test/formal/exp_to_shl.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from opcodes import SHL
-from rule import Rule
-from z3 import BitVec, If
-
-"""
-Checking conversion of exp(2, X) to shl(X, 1)
-"""
-
-rule = Rule()
-n_bits = 256
-
-# Proof of exp(2, X) = shl(X, 1) by induction:
-#
-# Base case: X = 0, exp(2, 0) = 1 = 1 = shl(0, 1)
-# Inductive step: assuming exp(2, X) = shl(X, 1) for X <= N
-#                 to prove: exp(2, N + 1) = shl(N + 1, 1)
-#
-# Notice that exp(2, N + 1) = 2 * exp(2, N) mod 2**256
-# since exp(2, N) = shl(N, 1), it is enough to show that
-# 2 * shl(N, 1) mod 2**256 = shl(N + 1, 1)
-#
-# Also note that N + 1 < 2**256
-
-N = BitVec('N', n_bits)
-inductive_step = 2 * SHL(N, 1)
-
-rule.check(
-    inductive_step,
-    If(
-        N == 2**256 - 1,
-        0,
-        SHL(N + 1, 1)
-    )
-)
diff --git a/test/formal/mod_add_to_addmod.py b/test/formal/mod_add_to_addmod.py
deleted file mode 100644
index 60093b7fed06..000000000000
--- a/test/formal/mod_add_to_addmod.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from opcodes import MOD, ADD, ADDMOD
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-MOD(ADD(X, Y), A) -> ADDMOD(X, Y, A)
-given
-    A > 0
-    A & (A - 1) == 0
-"""
-
-rule = Rule()
-
-n_bits = 32
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-
-# Non optimized result
-nonopt = MOD(ADD(X, Y), A)
-
-# Optimized result
-opt = ADDMOD(X, Y, A)
-
-rule.require(A > 0)
-rule.require(((A & (A - 1)) == 0))
-
-rule.check(nonopt, opt)
diff --git a/test/formal/mod_mul_to_mulmod.py b/test/formal/mod_mul_to_mulmod.py
deleted file mode 100644
index 812f341ea850..000000000000
--- a/test/formal/mod_mul_to_mulmod.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from opcodes import MOD, MUL, MULMOD
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-MOD(MUL(X, Y), A) -> MULMOD(X, Y, A)
-given
-    A > 0
-    A & (A - 1) == 0
-"""
-
-rule = Rule()
-
-n_bits = 8
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-
-# Non optimized result
-nonopt = MOD(MUL(X, Y), A)
-
-# Optimized result
-opt = MULMOD(X, Y, A)
-
-rule.require(A > 0)
-rule.require(((A & (A - 1)) == 0))
-
-rule.check(nonopt, opt)
diff --git a/test/formal/move_and_across_shl_128.py b/test/formal/move_and_across_shl_128.py
deleted file mode 100644
index 9e689b71efc3..000000000000
--- a/test/formal/move_and_across_shl_128.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from opcodes import AND, SHL
-from rule import Rule
-from z3 import BitVec, BitVecVal, ULT
-
-"""
-Rule:
-SHL(B, AND(X, A)) -> AND(SHL(B, X), A << B)
-SHL(B, AND(A, X)) -> AND(SHL(B, X), A << B)
-Requirements:
-B < BitWidth
-"""
-
-rule = Rule()
-
-n_bits = 128
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Constants
-BitWidth = BitVecVal(n_bits, n_bits)
-
-# Requirements
-rule.require(ULT(B, BitWidth))
-
-# Non optimized result
-nonopt_1 = SHL(B, AND(X, A))
-nonopt_2 = SHL(B, AND(A, X))
-
-# Optimized result
-Mask = SHL(B, A)
-opt = AND(SHL(B, X), Mask)
-
-rule.check(nonopt_1, opt)
-rule.check(nonopt_2, opt)
diff --git a/test/formal/move_and_across_shr_128.py b/test/formal/move_and_across_shr_128.py
deleted file mode 100644
index 592dc7742fc0..000000000000
--- a/test/formal/move_and_across_shr_128.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from opcodes import AND, SHR
-from rule import Rule
-from z3 import BitVec, BitVecVal, ULT
-
-"""
-Rule:
-SHR(B, AND(X, A)) -> AND(SHR(B, X), A >> B)
-SHR(B, AND(A, X)) -> AND(SHR(B, X), A >> B)
-Requirements:
-B < BitWidth
-"""
-
-rule = Rule()
-
-n_bits = 128
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Constants
-BitWidth = BitVecVal(n_bits, n_bits)
-
-# Requirements
-rule.require(ULT(B, BitWidth))
-
-# Non optimized result
-nonopt_1 = SHR(B, AND(X, A))
-nonopt_2 = SHR(B, AND(A, X))
-
-# Optimized result
-Mask = SHR(B, A)
-opt = AND(SHR(B, X), Mask)
-
-rule.check(nonopt_1, opt)
-rule.check(nonopt_2, opt)
diff --git a/test/formal/move_and_inside_or.py b/test/formal/move_and_inside_or.py
deleted file mode 100644
index 48ec20dbad7e..000000000000
--- a/test/formal/move_and_inside_or.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from opcodes import AND, OR
-from rule import Rule
-from z3 import BitVec
-
-
-"""
-Rule:
-AND(OR(AND(X, A), Y), B) -> OR(AND(X, A & B), AND(Y, B))
-"""
-
-rule = Rule()
-
-# bit width is irrelevant
-n_bits = 128
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-# Non optimized result, explicit form
-nonopt = AND(OR(AND(X, A), Y), B)
-
-# Optimized result
-opt = OR(AND(X, A & B), AND(Y, B))
-
-rule.check(nonopt, opt)
-
-# Now the forms as they are constructod in the code.
-for inner in [AND(X, A), AND(A, X)]:
-    for second in [OR(inner, Y), OR(Y, inner)]:
-        rule.check(AND(second, B), opt)
-        rule.check(AND(B, second), opt)
diff --git a/test/formal/opcodes.py b/test/formal/opcodes.py
deleted file mode 100644
index e091e7847b99..000000000000
--- a/test/formal/opcodes.py
+++ /dev/null
@@ -1,87 +0,0 @@
-from z3 import BitVecVal, BV2Int, If, LShR, UDiv, ULT, UGT, URem, ZeroExt, Extract
-
-def ADD(x, y):
-	return x + y
-
-def MUL(x, y):
-	return x * y
-
-def SUB(x, y):
-	return x - y
-
-def DIV(x, y):
-	return If(y == 0, 0, UDiv(x, y))
-
-def SDIV(x, y):
-	return If(y == 0, 0, x / y)
-
-def MOD(x, y):
-	return If(y == 0, 0, URem(x, y))
-
-def MULMOD(x, y, m):
-	return If(m == 0, 0, Extract(x.size() - 1, 0, URem(ZeroExt(x.size(), x) * ZeroExt(x.size(), y), ZeroExt(m.size(), m))))
-
-def ADDMOD(x, y, m):
-	return If(m == 0, 0, Extract(x.size() - 1, 0, URem(ZeroExt(1, x) + ZeroExt(1, y), ZeroExt(1, m))))
-
-def SMOD(x, y):
-	return If(y == 0, 0, x % y)
-
-def LT(x, y):
-	return If(ULT(x, y), BitVecVal(1, x.size()), BitVecVal(0, x.size()))
-
-def GT(x, y):
-	return If(UGT(x, y), BitVecVal(1, x.size()), BitVecVal(0, x.size()))
-
-def SLT(x, y):
-	return If(x < y, BitVecVal(1, x.size()), BitVecVal(0, x.size()))
-
-def SGT(x, y):
-	return If(x > y, BitVecVal(1, x.size()), BitVecVal(0, x.size()))
-
-def EQ(x, y):
-	return If(x == y, BitVecVal(1, x.size()), BitVecVal(0, x.size()))
-
-def ISZERO(x):
-	return If(x == 0, BitVecVal(1, x.size()), BitVecVal(0, x.size()))
-
-def AND(x, y):
-	return x & y
-
-def OR(x, y):
-	return x | y
-
-def NOT(x):
-	return ~(x)
-
-def SHL(x, y):
-	return y << x
-
-def SHR(x, y):
-	return LShR(y, x)
-
-def SAR(x, y):
-	return y >> x
-
-def BYTE(i, x):
-	bit = (i + 1) * 8
-	return If(
-		UGT(i, x.size() / 8 - 1),
-		BitVecVal(0, x.size()),
-		(LShR(x, (x.size() - bit))) & 0xff
-	)
-
-def SIGNEXTEND(i, x):
-	bitBV = i * 8 + 7
-	bitInt = BV2Int(i) * 8 + 7
-	test = BitVecVal(1, x.size()) << bitBV
-	mask = test - 1
-	return If(
-		bitInt >= x.size(),
-		x,
-		If(
-			(x & test) == 0,
-			x & mask,
-			x | ~mask
-		)
-	)
diff --git a/test/formal/redundant_store_unrelated.py b/test/formal/redundant_store_unrelated.py
deleted file mode 100644
index 2961d0099cba..000000000000
--- a/test/formal/redundant_store_unrelated.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import sys
-from z3 import Solver, Int, unsat
-
-"""
-Tests that the conditions inside RedundantStoreEliminator::knownUnrelated
-only return "unrelated" incorrectly if one of the operation reverts
-due to large memory access.
-"""
-
-n_bits = 256
-
-solver = Solver()
-solver.set("timeout", 60000)
-
-def restrict(x):
-    solver.add(x >= 0)
-    solver.add(x < 2**n_bits)
-
-def restrictedInt(x):
-    var = Int(x)
-    restrict(var)
-    return var
-
-start1 = restrictedInt('start1')
-length1 = restrictedInt('length1')
-start2 = restrictedInt('start2')
-length2 = restrictedInt('length2')
-
-k = Int('k')
-diff = Int('diff')
-solver.add(diff == start2 - start1 + k * 2**n_bits)
-restrict(diff)
-# diff is the result of sub(start2, start1) in EVM
-
-# These are the conditions in the code.
-solver.add(diff >= length1)
-solver.add(diff <= 2**(n_bits-1))
-
-# We check that the two conditions are conflicting:
-# - overlap
-# - start1 is small
-
-# Overlap:
-# x is a potential point where the memory operations
-# overlap.
-# Note that we do not use wrapping arithmetic
-# here, because it is not done in the EVM either.
-# For example calldatacopy(2**256 - 2, 0, 10)
-# (copy 10 bytes from calldata position zero to memory
-# position 2**256 - 2) would not write to memory position
-# zero either.
-x = Int('x')
-solver.add(start1 <= x)
-solver.add(x < start1 + length1)
-solver.add(start2 <= x)
-solver.add(x < start2 + length2)
-
-# start1 is "small":
-solver.add(start1 < 2**(n_bits-1))
-
-if solver.check() != unsat:
-  print("Expected unsat but got something else")
-  sys.exit(1)
diff --git a/test/formal/repeated_and.py b/test/formal/repeated_and.py
deleted file mode 100644
index 2376ca34ffd8..000000000000
--- a/test/formal/repeated_and.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from opcodes import AND
-from rule import Rule
-from z3 import BitVec, BitVecVal
-
-"""
-Rule:
-AND(AND(X, Y), Y) -> AND(X, Y)
-AND(Y, AND(X, Y)) -> AND(X, Y)
-AND(AND(Y, X), Y) -> AND(Y, X)
-AND(Y, AND(Y, X)) -> AND(Y, X)
-Requirements:
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-
-# Constants
-BitWidth = BitVecVal(n_bits, n_bits)
-
-# Requirements
-
-# Non optimized result
-nonopt_1 = AND(AND(X, Y), Y)
-nonopt_2 = AND(Y, AND(X, Y))
-nonopt_3 = AND(AND(Y, X), Y)
-nonopt_4 = AND(Y, AND(Y, X))
-
-# Optimized result
-opt_1 = AND(X, Y)
-opt_2 = AND(Y, X)
-
-rule.check(nonopt_1, opt_1)
-rule.check(nonopt_2, opt_1)
-rule.check(nonopt_3, opt_2)
-rule.check(nonopt_4, opt_2)
diff --git a/test/formal/repeated_or.py b/test/formal/repeated_or.py
deleted file mode 100644
index ba18e39aa83d..000000000000
--- a/test/formal/repeated_or.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from opcodes import OR
-from rule import Rule
-from z3 import BitVec, BitVecVal
-
-"""
-Rule:
-OR(OR(X, Y), Y) -> OR(X, Y)
-OR(Y, OR(X, Y)) -> OR(X, Y)
-OR(OR(Y, X), Y) -> OR(Y, X)
-OR(Y, OR(Y, X)) -> OR(Y, X)
-Requirements:
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-
-# Constants
-BitWidth = BitVecVal(n_bits, n_bits)
-
-# Requirements
-
-# Non optimized result
-nonopt_1 = OR(OR(X, Y), Y)
-nonopt_2 = OR(Y, OR(X, Y))
-nonopt_3 = OR(OR(Y, X), Y)
-nonopt_4 = OR(Y, OR(Y, X))
-
-# Optimized result
-opt_1 = OR(X, Y)
-opt_2 = OR(Y, X)
-
-rule.check(nonopt_1, opt_1)
-rule.check(nonopt_2, opt_1)
-rule.check(nonopt_3, opt_2)
-rule.check(nonopt_4, opt_2)
diff --git a/test/formal/replace_mul_by_shift.py b/test/formal/replace_mul_by_shift.py
deleted file mode 100644
index 3805af0dc419..000000000000
--- a/test/formal/replace_mul_by_shift.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from opcodes import DIV, MUL, SHL, SHR
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rule:
-MUL(X, A) -> SHL(k, X)
-MUL(A, X) -> SHL(k, X)
-DIV(X, A) -> SHR(k, X)
-Requirements:
-A == 1 << K
-"""
-
-rule = Rule()
-
-n_bits = 32
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-K = BitVec('K', n_bits)
-
-# Requirements
-rule.require(A == SHL(K, 1))
-
-# Non optimized result
-nonopt_1 = MUL(X, A)
-nonopt_2 = MUL(A, X)
-nonopt_3 = DIV(X, A)
-
-# Optimized result
-opt_1 = SHL(K, X)
-opt_2 = SHL(K, X)
-opt_3 = SHR(K, X)
-
-rule.check(nonopt_1, opt_1)
-rule.check(nonopt_2, opt_2)
-rule.check(nonopt_3, opt_3)
diff --git a/test/formal/rule.py b/test/formal/rule.py
deleted file mode 100644
index 8fbf006883c5..000000000000
--- a/test/formal/rule.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import sys
-
-from z3 import sat, Solver, unknown, unsat
-
-class Rule:
-	def __init__(self):
-		self.requirements = []
-		self.constraints = []
-		self.solver = Solver()
-		self.setTimeout(60000)
-
-	def setTimeout(self, _t):
-		self.solver.set("timeout", _t)
-
-	def __lshift__(self, _c):
-		self.constraints.append(_c)
-
-	def require(self, _r):
-		self.requirements.append(_r)
-
-	def check(self, _nonopt, _opt):
-		self.solver.add(self.requirements)
-		result = self.solver.check()
-
-		if result == unknown:
-			self.error('Unable to satisfy requirements.')
-		elif result == unsat:
-			self.error('Requirements are unsatisfiable.')
-
-		self.solver.push()
-		self.solver.add(self.constraints)
-		self.solver.add(_nonopt != _opt)
-
-		result = self.solver.check()
-		if result == unknown:
-			self.error('Unable to prove rule.')
-		elif result == sat:
-			m = self.solver.model()
-			self.error('Rule is incorrect.\nModel: ' + str(m))
-		self.solver.pop()
-
-	@classmethod
-	def error(cls, msg):
-		print(msg)
-		sys.exit(1)
diff --git a/test/formal/shl_workaround_8.py b/test/formal/shl_workaround_8.py
deleted file mode 100644
index 19248574aa05..000000000000
--- a/test/formal/shl_workaround_8.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from opcodes import SHL
-from rule import Rule
-from z3 import BitVec, BV2Int, Int2BV, IntVal
-
-"""
-Shift left workaround that Solidity implements
-due to a bug in Boost.
-"""
-
-rule = Rule()
-
-n_bits = 8
-bigint_bits = 16
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', bigint_bits)
-
-# Compute workaround
-workaround = Int2BV(
-	BV2Int(
-		(Int2BV(BV2Int(X), bigint_bits) << Int2BV(BV2Int(A), bigint_bits)) &
-		Int2BV(BV2Int(Int2BV(IntVal(-1), n_bits)), bigint_bits)
-	), n_bits
-)
-
-rule.check(workaround, SHL(A, X))
diff --git a/test/formal/signed_integer_cleanup_function.py b/test/formal/signed_integer_cleanup_function.py
deleted file mode 100644
index 2b7b0e440ba9..000000000000
--- a/test/formal/signed_integer_cleanup_function.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from opcodes import SIGNEXTEND
-from rule import Rule
-from util import BVSignedCleanupFunction, BVSignedUpCast
-from z3 import BitVec, BitVecVal, Concat
-
-"""
-Overflow checked signed integer multiplication.
-"""
-
-n_bits = 256
-
-# Check that YulUtilFunction::cleanupFunction cleanup matches BVSignedCleanupFunction
-for type_bits in range(8,256,8):
-
-	rule = Rule()
-
-	# Input vars
-	X = BitVec('X', n_bits)
-	arg = BitVecVal(type_bits / 8 - 1, n_bits)
-
-	cleaned_reference = BVSignedCleanupFunction(X, type_bits)
-	cleaned = SIGNEXTEND(arg, X)
-
-	rule.check(cleaned, cleaned_reference)
-
-
-# Check that BVSignedCleanupFunction properly cleans up values.
-for type_bits in range(8,256,8):
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	dirt = BitVec('dirt', n_bits - type_bits)
-
-	X = BVSignedUpCast(X_short, n_bits)
-	X_dirty = Concat(dirt, X_short)
-	X_cleaned = BVSignedCleanupFunction(X_dirty, type_bits)
-
-
-	rule.check(X, X_cleaned)
diff --git a/test/formal/signextend.py b/test/formal/signextend.py
deleted file mode 100644
index ed285345deae..000000000000
--- a/test/formal/signextend.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from opcodes import SIGNEXTEND
-from rule import Rule
-from z3 import BitVec, BitVecVal, If, UGE, ULT
-
-"""
-Rule:
-1) SIGNEXTEND(A, X) -> X if A >= Pattern::WordSize / 8 - 1;
-
-2) SIGNEXTEND(X, SIGNEXTEND(X, Y)) -> SIGNEXTEND(X, Y)
-
-3) SIGNEXTEND(A, SIGNEXTEND(B, X)) -> SIGNEXTEND(min(A, B), X)
-"""
-
-n_bits = 128
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-rule1 = Rule()
-# Requirements
-rule1.require(UGE(A, BitVecVal(n_bits // 8 - 1, n_bits)))
-rule1.check(SIGNEXTEND(A, X), X)
-
-rule2 = Rule()
-rule2.check(
-    SIGNEXTEND(X, SIGNEXTEND(X, Y)),
-    SIGNEXTEND(X, Y)
-)
-
-rule3 = Rule()
-rule3.check(
-    SIGNEXTEND(A, SIGNEXTEND(B, X)),
-    SIGNEXTEND(If(ULT(A, B), A, B), X)
-)
diff --git a/test/formal/signextend_and.py b/test/formal/signextend_and.py
deleted file mode 100644
index 91fc143497a3..000000000000
--- a/test/formal/signextend_and.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from opcodes import SIGNEXTEND, AND
-from rule import Rule
-from z3 import BitVec, BitVecVal, ULT
-
-"""
-Rule:
-AND(A, SIGNEXTEND(B, X)) -> AND(A, X)
-given
-    B < WordSize / 8 - 1 AND
-    A & (1 << ((B + 1) * 8) - 1) == A
-"""
-
-n_bits = 128
-
-# Input vars
-X = BitVec('X', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-rule = Rule()
-# Requirements
-rule.require(ULT(B, BitVecVal(n_bits // 8 - 1, n_bits)))
-rule.require((A & ((BitVecVal(1, n_bits) << ((B + 1) * 8)) - 1)) == A)
-rule.check(
-    AND(A, SIGNEXTEND(B, X)),
-    AND(A, X)
-)
diff --git a/test/formal/signextend_equivalence.py b/test/formal/signextend_equivalence.py
deleted file mode 100644
index 3b8386e54742..000000000000
--- a/test/formal/signextend_equivalence.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from opcodes import SIGNEXTEND
-from rule import Rule
-from z3 import BitVec, BitVecVal, Extract, SignExt, UGT
-
-"""
-Checking the implementation of SIGNEXTEND using Z3's native SignExt and Extract
-"""
-
-rule = Rule()
-n_bits = 256
-
-x = BitVec('X', n_bits)
-
-def SIGNEXTEND_native(i, x):
-    return SignExt(256 - 8 * i - 8, Extract(8 * i + 7, 0, x))
-
-for i in range(0, 32):
-    rule.check(
-        SIGNEXTEND(BitVecVal(i, n_bits), x),
-        SIGNEXTEND_native(i, x)
-    )
-
-i = BitVec('I', n_bits)
-rule.require(UGT(i, BitVecVal(31, n_bits)))
-rule.check(SIGNEXTEND(i, x), x)
diff --git a/test/formal/signextend_shl.py b/test/formal/signextend_shl.py
deleted file mode 100644
index 18b1baea1abb..000000000000
--- a/test/formal/signextend_shl.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from opcodes import SHL, SIGNEXTEND
-from rule import Rule
-from z3 import BitVec, LShR, ULE
-
-"""
-Rule:
-SHL(A, SIGNEXTEND(B, X)) -> SIGNEXTEND((A >> 3) + B, SHL(A, X))
-given return A & 7 == 0  AND  A <= WordSize  AND  B <= WordSize / 8
-"""
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-rule = Rule()
-rule.require(A & 7 == 0)
-rule.require(ULE(A, n_bits))
-rule.require(ULE(B, n_bits / 8))
-rule.check(
-    SHL(A, SIGNEXTEND(B, X)),
-    SIGNEXTEND(LShR(A, 3) + B, SHL(A, X))
-)
diff --git a/test/formal/signextend_shr.py b/test/formal/signextend_shr.py
deleted file mode 100644
index a763314cd022..000000000000
--- a/test/formal/signextend_shr.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from opcodes import SIGNEXTEND, SAR, SHR
-from rule import Rule
-from z3 import BitVec,  BitVecVal, ULE
-
-"""
-Rule:
-SIGNEXTEND(A, SHR(B, X)) -> SAR(B, X)
-given
-    B % 8 == 0 AND
-    A <= WordSize AND
-    B <= wordSize AND
-    (WordSize - B) / 8 == A + 1
-"""
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-B = BitVec('B', n_bits)
-
-rule = Rule()
-rule.require(B % 8 == 0)
-rule.require(ULE(A, n_bits))
-rule.require(ULE(B, n_bits))
-rule.require((BitVecVal(n_bits, n_bits) - B) / 8 == A + 1)
-rule.check(
-    SIGNEXTEND(A, SHR(B, X)),
-    SAR(B, X)
-)
diff --git a/test/formal/sub_not_zero_x_to_not_x_256.py b/test/formal/sub_not_zero_x_to_not_x_256.py
deleted file mode 100644
index d8f1282ec5b1..000000000000
--- a/test/formal/sub_not_zero_x_to_not_x_256.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from opcodes import NOT, SUB
-from rule import Rule
-from z3 import BitVec, BitVecVal
-
-"""
-Rule:
-SUB(~0, X) -> NOT(X)
-Requirements:
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-
-# Constants
-ZERO = BitVecVal(0, n_bits)
-
-# Non optimized result
-nonopt = SUB(~ZERO, X)
-
-# Optimized result
-opt = NOT(X)
-
-rule.check(nonopt, opt)
diff --git a/test/formal/sub_sub.py b/test/formal/sub_sub.py
deleted file mode 100644
index 6439410850a6..000000000000
--- a/test/formal/sub_sub.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from opcodes import ADD, SUB
-from rule import Rule
-from z3 import BitVec
-
-"""
-Rules:
-SUB(SUB(X, A), Y) -> SUB(SUB(X, Y), A)
-SUB(SUB(A, X), Y) -> SUB(A, ADD(X, Y))
-SUB(X, SUB(Y, A)) -> ADD(SUB(X, Y), A)
-SUB(X, SUB(A, Y)) -> ADD(ADD(X, Y), -A)
-"""
-
-rule = Rule()
-
-n_bits = 256
-
-# Input vars
-X = BitVec('X', n_bits)
-Y = BitVec('Y', n_bits)
-A = BitVec('A', n_bits)
-
-rule.check(
-    SUB(SUB(X, A), Y),
-    SUB(SUB(X, Y), A)
-)
-rule.check(
-    SUB(SUB(A, X), Y),
-    SUB(A, ADD(X, Y))
-)
-rule.check(
-    SUB(X, SUB(Y, A)),
-    ADD(SUB(X, Y), A)
-)
-rule.check(
-    SUB(X, SUB(A, Y)),
-    ADD(ADD(X, Y), SUB(0, A))
-)
diff --git a/test/formal/unsigned_integer_cleanup_function.py b/test/formal/unsigned_integer_cleanup_function.py
deleted file mode 100644
index 42296f89ba23..000000000000
--- a/test/formal/unsigned_integer_cleanup_function.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from opcodes import AND
-from rule import Rule
-from util import BVUnsignedCleanupFunction, BVUnsignedUpCast
-from z3 import BitVec, BitVecVal, Concat
-
-"""
-Overflow checked unsigned integer multiplication.
-"""
-
-n_bits = 256
-
-# Check that YulUtilFunction::cleanupFunction cleanup matches BVUnsignedCleanupFunction
-for type_bits in range(8,256,8):
-
-	rule = Rule()
-
-	# Input vars
-	X = BitVec('X', n_bits)
-	mask = BitVecVal((1 << type_bits) - 1, n_bits)
-
-	cleaned_reference = BVUnsignedCleanupFunction(X, type_bits)
-	cleaned = AND(X, mask)
-
-	rule.check(cleaned, cleaned_reference)
-
-# Check that BVUnsignedCleanupFunction properly cleans up values.
-for type_bits in range(8,256,8):
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	dirt = BitVec('dirt', n_bits - type_bits)
-
-	X = BVUnsignedUpCast(X_short, n_bits)
-	X_dirty = Concat(dirt, X_short)
-	X_cleaned = BVUnsignedCleanupFunction(X_dirty, type_bits)
-
-
-	rule.check(X, X_cleaned)
diff --git a/test/formal/util.py b/test/formal/util.py
deleted file mode 100644
index 8fc261fdcff0..000000000000
--- a/test/formal/util.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from z3 import BitVecVal, Concat, If
-
-def BVUnsignedUpCast(x, n_bits):
-	assert x.size() <= n_bits
-	if x.size() < n_bits:
-		return Concat(BitVecVal(0, n_bits - x.size()), x)
-	else:
-		return x
-
-def BVUnsignedMax(type_bits, n_bits):
-	assert type_bits <= n_bits
-	return BitVecVal((1 << type_bits) - 1, n_bits)
-
-def BVSignedUpCast(x, n_bits):
-	assert x.size() <= n_bits
-	if x.size() < n_bits:
-		return Concat(If(x < 0, BitVecVal(-1, n_bits - x.size()), BitVecVal(0, n_bits - x.size())), x)
-	else:
-		return x
-
-def BVSignedMax(type_bits, n_bits):
-	assert type_bits <= n_bits
-	return BitVecVal((1 << (type_bits - 1)) - 1, n_bits)
-
-def BVSignedMin(type_bits, n_bits):
-	assert type_bits <= n_bits
-	return BitVecVal(-(1 << (type_bits - 1)), n_bits)
-
-def BVSignedCleanupFunction(x, type_bits):
-	assert x.size() >= type_bits
-	sign_mask = BitVecVal(1, x.size()) << (type_bits - 1)
-	bit_mask = (BitVecVal(1, x.size()) << type_bits) - 1
-	return If(
-		x & sign_mask == 0,
-		x & bit_mask,
-		x | ~bit_mask
-	)
-
-def BVUnsignedCleanupFunction(x, type_bits):
-	assert x.size() >= type_bits
-	bit_mask = (BitVecVal(1, x.size()) << type_bits) - 1
-	return x & bit_mask
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
deleted file mode 100644
index 2b01ae03c7ec..000000000000
--- a/test/libevmasm/Assembler.cpp
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Alex Beregszaszi
- * @date 2018
- * Tests for the assembler.
- */
-#include <test/Common.h>
-
-#include <libevmasm/Assembly.h>
-#include <libsolutil/JSON.h>
-#include <libevmasm/Disassemble.h>
-#include <libyul/Exceptions.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <tuple>
-
-using namespace solidity::langutil;
-using namespace solidity::evmasm;
-using namespace std::string_literals;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-	void checkCompilation(evmasm::Assembly const& _assembly)
-	{
-		LinkerObject output = _assembly.assemble();
-		BOOST_CHECK(output.bytecode.size() > 0);
-		BOOST_CHECK(output.toHex().length() > 0);
-	}
-}
-
-BOOST_AUTO_TEST_SUITE(Assembler)
-
-BOOST_AUTO_TEST_CASE(all_assembly_items)
-{
-	std::map<std::string, unsigned> indices = {
-		{ "root.asm", 0 },
-		{ "sub.asm", 1 },
-		{ "verbatim.asm", 2 }
-	};
-	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	Assembly _assembly{evmVersion, false, {}};
-	auto root_asm = std::make_shared<std::string>("root.asm");
-	_assembly.setSourceLocation({1, 3, root_asm});
-
-	Assembly _subAsm{evmVersion, false, {}};
-	auto sub_asm = std::make_shared<std::string>("sub.asm");
-	_subAsm.setSourceLocation({6, 8, sub_asm});
-
-	Assembly _verbatimAsm(evmVersion, true, "");
-	auto verbatim_asm = std::make_shared<std::string>("verbatim.asm");
-	_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
-
-	// PushImmutable
-	_subAsm.appendImmutable("someImmutable");
-	_subAsm.append(AssemblyItem(PushTag, 0));
-	_subAsm.append(Instruction::INVALID);
-	std::shared_ptr<Assembly> _subAsmPtr = std::make_shared<Assembly>(_subAsm);
-
-	_verbatimAsm.appendVerbatim({0xff,0xff}, 0, 0);
-	_verbatimAsm.appendVerbatim({0x74, 0x65, 0x73, 0x74}, 0, 1);
-	_verbatimAsm.append(Instruction::MSTORE);
-	std::shared_ptr<Assembly> _verbatimAsmPtr = std::make_shared<Assembly>(_verbatimAsm);
-
-	// Tag
-	auto tag = _assembly.newTag();
-	_assembly.append(tag);
-	// Operation
-	_assembly.append(u256(1));
-	_assembly.append(u256(2));
-	// Push
-	auto keccak256 = AssemblyItem(Instruction::KECCAK256);
-	_assembly.m_currentModifierDepth = 1;
-	_assembly.append(keccak256);
-	_assembly.m_currentModifierDepth = 0;
-	// PushProgramSize
-	_assembly.appendProgramSize();
-	// PushLibraryAddress
-	_assembly.appendLibraryAddress("someLibrary");
-	// PushTag + Operation
-	_assembly.appendJump(tag);
-	// PushData
-	_assembly.append(bytes{0x1, 0x2, 0x3, 0x4});
-	// PushSubSize
-	auto sub = _assembly.appendSubroutine(_subAsmPtr);
-	// PushSub
-	_assembly.pushSubroutineOffset(static_cast<size_t>(sub.data()));
-	// PushSubSize
-	auto verbatim_sub = _assembly.appendSubroutine(_verbatimAsmPtr);
-	// PushSub
-	_assembly.pushSubroutineOffset(static_cast<size_t>(verbatim_sub.data()));
-	// PushDeployTimeAddress
-	_assembly.append(PushDeployTimeAddress);
-	// AssignImmutable.
-	// Note that since there is no reference to "someOtherImmutable", this will just compile to two POPs in the hex output.
-	_assembly.appendImmutableAssignment("someOtherImmutable");
-	_assembly.append(u256(2));
-	_assembly.appendImmutableAssignment("someImmutable");
-	// Operation
-	_assembly.append(Instruction::STOP);
-	_assembly.appendToAuxiliaryData(bytes{0x42, 0x66});
-	_assembly.appendToAuxiliaryData(bytes{0xee, 0xaa});
-
-	_assembly.m_currentModifierDepth = 2;
-	_assembly.appendJump(tag);
-	_assembly.m_currentModifierDepth = 0;
-
-	checkCompilation(_assembly);
-
-	BOOST_CHECK_EQUAL(
-		_assembly.assemble().toHex(),
-		"5b6001600220607f73__$bf005014d9d0f534b8fcb268bd84c491a2$__"
-		"60005660776024604c600760707300000000000000000000000000000000000000005050"
-		"600260010152"
-		"006000"
-		"56fe"
-		"7f0000000000000000000000000000000000000000000000000000000000000000"
-		"6000feffff7465737452010203044266eeaa"
-	);
-	BOOST_CHECK_EQUAL(
-		_assembly.assemblyString(),
-		"    /* \"root.asm\":1:3   */\n"
-		"tag_1:\n"
-		"  keccak256(0x02, 0x01)\n"
-		"  bytecodeSize\n"
-		"  linkerSymbol(\"bf005014d9d0f534b8fcb268bd84c491a2380f4acd260d1ccfe9cd8201f7e994\")\n"
-		"  jump(tag_1)\n"
-		"  data_a6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b\n"
-		"  dataSize(sub_0)\n"
-		"  dataOffset(sub_0)\n"
-		"  dataSize(sub_1)\n"
-		"  dataOffset(sub_1)\n"
-		"  deployTimeAddress()\n"
-		"  assignImmutable(\"0xc3978657661c4d8e32e3d5f42597c009f0d3859e9f9d0d94325268f9799e2bfb\")\n"
-		"  0x02\n"
-		"  assignImmutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
-		"  stop\n"
-		"  jump(tag_1)\n"
-		"stop\n"
-		"data_a6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b 01020304\n"
-		"\n"
-		"sub_0: assembly {\n"
-		"        /* \"sub.asm\":6:8   */\n"
-		"      immutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
-		"      tag_0\n"
-		"      invalid\n"
-		"}\n"
-		"\n"
-		"sub_1: assembly {\n"
-		"        /* \"verbatim.asm\":8:18   */\n"
-		"      verbatimbytecode_ffff\n"
-		"      verbatimbytecode_74657374\n"
-		"      mstore\n"
-		"}\n"
-		"\n"
-		"auxdata: 0x4266eeaa\n"
-	);
-	std::string json{
-		"{\".auxdata\":\"4266eeaa\",\".code\":["
-		"{\"begin\":1,\"end\":3,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"JUMPDEST\",\"source\":0},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"1\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2\"},"
-		"{\"begin\":1,\"end\":3,\"modifierDepth\":1,\"name\":\"KECCAK256\",\"source\":0},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSHSIZE\",\"source\":0},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSHLIB\",\"source\":0,\"value\":\"someLibrary\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [tag]\",\"source\":0,\"value\":\"1\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"JUMP\",\"source\":0},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH data\",\"source\":0,\"value\":\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000001\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000001\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSHDEPLOYADDRESS\",\"source\":0},"
-		"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someOtherImmutable\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someImmutable\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"STOP\",\"source\":0},"
-		"{\"begin\":1,\"end\":3,\"modifierDepth\":2,\"name\":\"PUSH [tag]\",\"source\":0,\"value\":\"1\"},{\"begin\":1,\"end\":3,\"modifierDepth\":2,\"name\":\"JUMP\",\"source\":0}"
-		"],\".data\":{\"0\":{\".code\":["
-		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
-		"{\"begin\":6,\"end\":8,\"name\":\"PUSH [ErrorTag]\",\"source\":1},"
-		"{\"begin\":6,\"end\":8,\"name\":\"INVALID\",\"source\":1}"
-		"]},"
-		"\"1\":{\".code\":["
-		"{\"begin\":8,\"end\":18,\"name\":\"VERBATIM\",\"source\":2,\"value\":\"ffff\"},"
-		"{\"begin\":8,\"end\":18,\"name\":\"VERBATIM\",\"source\":2,\"value\":\"74657374\"},"
-		"{\"begin\":8,\"end\":18,\"name\":\"MSTORE\",\"source\":2}"
-		"]},\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\":\"01020304\"},\"sourceList\":[\"root.asm\",\"sub.asm\",\"verbatim.asm\"]}"
-	};
-	Json::Value jsonValue;
-	BOOST_CHECK(util::jsonParseStrict(json, jsonValue));
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assembly.assemblyJSON(indices)), util::jsonCompactPrint(jsonValue));
-}
-
-BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
-{
-	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	// Tests for 1, 2, 3 number of immutables.
-	for (int numImmutables = 1; numImmutables <= 3; ++numImmutables)
-	{
-		BOOST_TEST_MESSAGE("NumImmutables: "s + std::to_string(numImmutables));
-		// Tests for the cases 1, 2, 3 occurrences of an immutable reference.
-		for (int numActualRefs = 1; numActualRefs <= 3; ++numActualRefs)
-		{
-			BOOST_TEST_MESSAGE("NumActualRefs: "s + std::to_string(numActualRefs));
-			auto const NumExpectedMappings =
-				(
-					2 +                        // PUSH <a> PUSH <b>
-					(numActualRefs - 1) * 5 +  // DUP DUP PUSH <n> ADD MSTORE
-					3                          // PUSH <n> ADD MSTORE
-				) * numImmutables;
-
-			auto constexpr NumSubs = 1;
-			auto constexpr NumOpcodesWithoutMappings =
-				NumSubs +                  // PUSH <addr> for every sub assembly
-				1;                         // INVALID
-
-			auto assemblyName = std::make_shared<std::string>("root.asm");
-			auto subName = std::make_shared<std::string>("sub.asm");
-
-			std::map<std::string, unsigned> indices = {
-				{ *assemblyName, 0 },
-				{ *subName, 1 }
-			};
-
-			auto subAsm = std::make_shared<Assembly>(evmVersion, false, std::string{});
-			for (char i = 0; i < numImmutables; ++i)
-			{
-				for (int r = 0; r < numActualRefs; ++r)
-				{
-					subAsm->setSourceLocation(SourceLocation{10*i, 10*i + 6 + r, subName});
-					subAsm->appendImmutable(std::string(1, char('a' + i))); // "a", "b", ...
-				}
-			}
-
-			Assembly assembly{evmVersion, true, {}};
-			for (char i = 1; i <= numImmutables; ++i)
-			{
-				assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName});
-				assembly.append(u256(0x71));              // immutble value
-				assembly.append(u256(0));                 // target... modules?
-				assembly.appendImmutableAssignment(std::string(1, char('a' + i - 1)));
-			}
-
-			assembly.appendSubroutine(subAsm);
-
-			checkCompilation(assembly);
-
-			std::string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.items(), indices);
-			auto const numberOfMappings = std::count(sourceMappings.begin(), sourceMappings.end(), ';');
-
-			LinkerObject const& obj = assembly.assemble();
-			std::string const disassembly = disassemble(obj.bytecode, evmVersion, "\n");
-			auto const numberOfOpcodes = std::count(disassembly.begin(), disassembly.end(), '\n');
-
-			#if 0 // {{{ debug prints
-			{
-				LinkerObject const& subObj = assembly.sub(0).assemble();
-				std::string const subDisassembly = disassemble(subObj.bytecode, "\n");
-				std::cout << '\n';
-				std::cout << "### immutables: " << numImmutables << ", refs: " << numActualRefs << '\n';
-				std::cout << " - srcmap: \"" << sourceMappings << "\"\n";
-				std::cout << " - src mappings: " << numberOfMappings << '\n';
-				std::cout << " - opcodes: " << numberOfOpcodes << '\n';
-				std::cout << " - subs: " << assembly.numSubs() << '\n';
-				std::cout << " - sub opcodes " << std::count(subDisassembly.begin(), subDisassembly.end(), '\n') << '\n';
-				std::cout << " - sub srcmaps " << AssemblyItem::computeSourceMapping(subAsm->items(), indices) << '\n';
-				std::cout << " - main bytecode:\n\t" << disassemble(obj.bytecode, "\n\t");
-				std::cout << "\r - sub bytecode:\n\t" << disassemble(subObj.bytecode, "\n\t");
-			}
-			#endif // }}}
-
-			BOOST_REQUIRE_EQUAL(NumExpectedMappings, numberOfMappings);
-			BOOST_REQUIRE_EQUAL(NumExpectedMappings, numberOfOpcodes - NumOpcodesWithoutMappings);
-		}
-	}
-}
-
-BOOST_AUTO_TEST_CASE(immutable)
-{
-	std::map<std::string, unsigned> indices = {
-		{ "root.asm", 0 },
-		{ "sub.asm", 1 }
-	};
-	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	Assembly _assembly{evmVersion, true, {}};
-	auto root_asm = std::make_shared<std::string>("root.asm");
-	_assembly.setSourceLocation({1, 3, root_asm});
-
-	Assembly _subAsm{evmVersion, false, {}};
-	auto sub_asm = std::make_shared<std::string>("sub.asm");
-	_subAsm.setSourceLocation({6, 8, sub_asm});
-	_subAsm.appendImmutable("someImmutable");
-	_subAsm.appendImmutable("someOtherImmutable");
-	_subAsm.appendImmutable("someImmutable");
-	std::shared_ptr<Assembly> _subAsmPtr = std::make_shared<Assembly>(_subAsm);
-
-	_assembly.append(u256(42));
-	_assembly.append(u256(0));
-	_assembly.appendImmutableAssignment("someImmutable");
-	_assembly.append(u256(23));
-	_assembly.append(u256(0));
-	_assembly.appendImmutableAssignment("someOtherImmutable");
-
-	auto sub = _assembly.appendSubroutine(_subAsmPtr);
-	_assembly.pushSubroutineOffset(static_cast<size_t>(sub.data()));
-
-	checkCompilation(_assembly);
-
-	std::string genericPush0 = evmVersion.hasPush0() ? "5f" : "6000";
-	// PUSH1 0x1b v/s PUSH1 0x19
-	std::string dataOffset = evmVersion.hasPush0() ? "6019" : "601b" ;
-
-	BOOST_CHECK_EQUAL(
-		_assembly.assemble().toHex(),
-		// root.asm
-		// assign "someImmutable"
-		"602a" + // PUSH1 42 - value for someImmutable
-		genericPush0 + // PUSH1 0 - offset of code into which to insert the immutable
-		"8181" // DUP2 DUP2
-		"6001" // PUSH1 1 - offset of first someImmutable in sub_0
-		"01" // ADD - add offset of immutable to offset of code
-		"52" // MSTORE
-		"6043" // PUSH1 67 - offset of second someImmutable in sub_0
-		"01" // ADD - add offset of immutable to offset of code
-		"52" // MSTORE
-		// assign "someOtherImmutable"
-		"6017" + // PUSH1 23 - value for someOtherImmutable
-		genericPush0 + // PUSH1 0 - offset of code into which to insert the immutable
-		"6022" // PUSH1 34 - offset of someOtherImmutable in sub_0
-		"01" // ADD - add offset of immutable to offset of code
-		"52" // MSTORE
-		"6063" + // PUSH1 0x63 - dataSize(sub_0)
-		dataOffset +  // PUSH1 0x23 - dataOffset(sub_0)
-		"fe" // INVALID
-		// end of root.asm
-		// sub.asm
-		"7f0000000000000000000000000000000000000000000000000000000000000000" // PUSHIMMUTABLE someImmutable - data at offset 1
-		"7f0000000000000000000000000000000000000000000000000000000000000000" // PUSHIMMUTABLE someOtherImmutable - data at offset 34
-		"7f0000000000000000000000000000000000000000000000000000000000000000" // PUSHIMMUTABLE someImmutable - data at offset 67
-	);
-	BOOST_CHECK_EQUAL(
-		_assembly.assemblyString(),
-		"    /* \"root.asm\":1:3   */\n"
-		"  0x2a\n"
-		"  0x00\n"
-		"  assignImmutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
-		"  0x17\n"
-		"  0x00\n"
-		"  assignImmutable(\"0xc3978657661c4d8e32e3d5f42597c009f0d3859e9f9d0d94325268f9799e2bfb\")\n"
-		"  dataSize(sub_0)\n"
-		"  dataOffset(sub_0)\n"
-		"stop\n"
-		"\n"
-		"sub_0: assembly {\n"
-		"        /* \"sub.asm\":6:8   */\n"
-		"      immutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
-		"      immutable(\"0xc3978657661c4d8e32e3d5f42597c009f0d3859e9f9d0d94325268f9799e2bfb\")\n"
-		"      immutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
-		"}\n"
-	);
-	BOOST_CHECK_EQUAL(
-		util::jsonCompactPrint(_assembly.assemblyJSON(indices)),
-		"{\".code\":["
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2A\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someImmutable\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"17\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someOtherImmutable\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"}"
-		"],\".data\":{\"0\":{\".code\":["
-		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
-		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someOtherImmutable\"},"
-		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"}"
-		"]}},\"sourceList\":[\"root.asm\",\"sub.asm\"]}"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(subobject_encode_decode)
-{
-	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	Assembly assembly{evmVersion, true, {}};
-
-	std::shared_ptr<Assembly> subAsmPtr = std::make_shared<Assembly>(evmVersion, false, std::string{});
-	std::shared_ptr<Assembly> subSubAsmPtr = std::make_shared<Assembly>(evmVersion, false, std::string{});
-
-	assembly.appendSubroutine(subAsmPtr);
-	subAsmPtr->appendSubroutine(subSubAsmPtr);
-
-	BOOST_CHECK(assembly.encodeSubPath({0}) == 0);
-	BOOST_REQUIRE_THROW(assembly.encodeSubPath({1}), solidity::evmasm::AssemblyException);
-	BOOST_REQUIRE_THROW(assembly.decodeSubPath(1), solidity::evmasm::AssemblyException);
-
-	std::vector<size_t> subPath{0, 0};
-	BOOST_CHECK(assembly.decodeSubPath(assembly.encodeSubPath(subPath)) == subPath);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
deleted file mode 100644
index e1795d391ce2..000000000000
--- a/test/libevmasm/Optimiser.cpp
+++ /dev/null
@@ -1,1920 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Tests for the Solidity optimizer.
- */
-
-#include <test/Common.h>
-
-#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmasm/PeepholeOptimiser.h>
-#include <libevmasm/Inliner.h>
-#include <libevmasm/JumpdestRemover.h>
-#include <libevmasm/ControlFlowGraph.h>
-#include <libevmasm/BlockDeduplicator.h>
-#include <libevmasm/Assembly.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <range/v3/algorithm/any_of.hpp>
-
-#include <string>
-#include <tuple>
-#include <memory>
-
-using namespace solidity::langutil;
-using namespace solidity::evmasm;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-	AssemblyItems addDummyLocations(AssemblyItems const& _input)
-	{
-		// add dummy locations to each item so that we can check that they are not deleted
-		AssemblyItems input = _input;
-		for (AssemblyItem& item: input)
-			item.setLocation({1, 3, nullptr});
-		return input;
-	}
-
-	evmasm::KnownState createInitialState(AssemblyItems const& _input)
-	{
-		evmasm::KnownState state;
-		for (auto const& item: addDummyLocations(_input))
-			state.feedItem(item, true);
-		return state;
-	}
-
-	AssemblyItems CSE(AssemblyItems const& _input, evmasm::KnownState const& _state = evmasm::KnownState())
-	{
-		AssemblyItems input = addDummyLocations(_input);
-
-		bool usesMsize = ranges::any_of(_input, [](AssemblyItem const& _i) {
-			return _i == AssemblyItem{Instruction::MSIZE} || _i.type() == VerbatimBytecode;
-		});
-		evmasm::CommonSubexpressionEliminator cse(_state);
-		BOOST_REQUIRE(cse.feedItems(input.begin(), input.end(), usesMsize) == input.end());
-		AssemblyItems output = cse.getOptimizedItems();
-
-		for (AssemblyItem const& item: output)
-		{
-			BOOST_CHECK(item == Instruction::POP || item.location().isValid());
-		}
-		return output;
-	}
-
-	void checkCSE(
-		AssemblyItems const& _input,
-		AssemblyItems const& _expectation,
-		KnownState const& _state = evmasm::KnownState()
-	)
-	{
-		AssemblyItems output = CSE(_input, _state);
-		BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
-	}
-
-	/// In contrast to the function `CSE`, this function doesn't finish the CSE optimization on an
-	/// instruction that breaks CSE Analysis block. Copied from Assembly.cpp
-	AssemblyItems fullCSE(AssemblyItems const& _input)
-	{
-		AssemblyItems optimisedItems;
-
-		bool usesMSize = ranges::any_of(_input, [](AssemblyItem const& _i) {
-			return _i == AssemblyItem{Instruction::MSIZE} || _i.type() == VerbatimBytecode;
-		});
-
-		auto iter = _input.begin();
-		while (iter != _input.end())
-		{
-			KnownState emptyState;
-			CommonSubexpressionEliminator eliminator{emptyState};
-			auto orig = iter;
-			iter = eliminator.feedItems(iter, _input.end(), usesMSize);
-			bool shouldReplace = false;
-			AssemblyItems optimisedChunk;
-			optimisedChunk = eliminator.getOptimizedItems();
-			shouldReplace = (optimisedChunk.size() < static_cast<size_t>(iter - orig));
-			if (shouldReplace)
-				optimisedItems += optimisedChunk;
-			else
-				copy(orig, iter, back_inserter(optimisedItems));
-		}
-
-		return optimisedItems;
-	}
-
-	void checkFullCSE(
-		AssemblyItems const& _input,
-		AssemblyItems const& _expectation
-	)
-	{
-		AssemblyItems output = fullCSE(_input);
-		BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
-	}
-
-	AssemblyItems CFG(AssemblyItems const& _input)
-	{
-		AssemblyItems output = _input;
-		// Running it four times should be enough for these tests.
-		for (unsigned i = 0; i < 4; ++i)
-		{
-			ControlFlowGraph cfg(output);
-			AssemblyItems optItems;
-			for (BasicBlock const& block: cfg.optimisedBlocks())
-				copy(output.begin() + static_cast<int>(block.begin), output.begin() + static_cast<int>(block.end),
-					 back_inserter(optItems));
-			output = std::move(optItems);
-		}
-		return output;
-	}
-
-	void checkCFG(AssemblyItems const& _input, AssemblyItems const& _expectation)
-	{
-		AssemblyItems output = CFG(_input);
-		BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
-	}
-}
-
-BOOST_AUTO_TEST_SUITE(Optimiser)
-
-BOOST_AUTO_TEST_CASE(cse_push_immutable_same)
-{
-	AssemblyItem pushImmutable{PushImmutable, 0x1234};
-	checkCSE({pushImmutable, pushImmutable}, {pushImmutable, Instruction::DUP1});
-}
-
-BOOST_AUTO_TEST_CASE(cse_push_immutable_different)
-{
-	AssemblyItems input{{PushImmutable, 0x1234},{PushImmutable, 0xABCD}};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_assign_immutable)
-{
-	{
-		AssemblyItems input{u256(0x42), {AssignImmutable, 0x1234}};
-		checkCSE(input, input);
-	}
-	{
-		AssemblyItems input{{AssignImmutable, 0x1234}};
-		checkCSE(input, input);
-	}
-}
-
-
-BOOST_AUTO_TEST_CASE(cse_assign_immutable_breaks)
-{
-	AssemblyItems input = addDummyLocations(AssemblyItems{
-		u256(0x42),
-		{AssignImmutable, 0x1234},
-		Instruction::ORIGIN
-	});
-
-	evmasm::CommonSubexpressionEliminator cse{evmasm::KnownState()};
-	// Make sure CSE breaks after AssignImmutable.
-	BOOST_REQUIRE(cse.feedItems(input.begin(), input.end(), false) == input.begin() + 2);
-}
-
-BOOST_AUTO_TEST_CASE(cse_intermediate_swap)
-{
-	evmasm::KnownState state;
-	evmasm::CommonSubexpressionEliminator cse(state);
-	AssemblyItems input{
-		Instruction::SWAP1, Instruction::POP, Instruction::ADD, u256(0), Instruction::SWAP1,
-		Instruction::SLOAD, Instruction::SWAP1, u256(100), Instruction::EXP, Instruction::SWAP1,
-		Instruction::DIV, u256(0xff), Instruction::AND
-	};
-	BOOST_REQUIRE(cse.feedItems(input.begin(), input.end(), false) == input.end());
-	AssemblyItems output = cse.getOptimizedItems();
-	BOOST_CHECK(!output.empty());
-}
-
-BOOST_AUTO_TEST_CASE(cse_negative_stack_access)
-{
-	AssemblyItems input{Instruction::DUP2, u256(0)};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_negative_stack_end)
-{
-	AssemblyItems input{Instruction::ADD};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_intermediate_negative_stack)
-{
-	AssemblyItems input{Instruction::ADD, u256(1), Instruction::DUP1};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_pop)
-{
-	checkCSE({Instruction::POP}, {Instruction::POP});
-}
-
-BOOST_AUTO_TEST_CASE(cse_unneeded_items)
-{
-	AssemblyItems input{
-		Instruction::ADD,
-		Instruction::SWAP1,
-		Instruction::POP,
-		u256(7),
-		u256(8),
-	};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_constant_addition)
-{
-	AssemblyItems input{u256(7), u256(8), Instruction::ADD};
-	checkCSE(input, {u256(7 + 8)});
-}
-
-BOOST_AUTO_TEST_CASE(cse_invariants)
-{
-	AssemblyItems input{
-		Instruction::DUP1,
-		Instruction::DUP1,
-		u256(0),
-		Instruction::OR,
-		Instruction::OR
-	};
-	checkCSE(input, {Instruction::DUP1});
-}
-
-BOOST_AUTO_TEST_CASE(cse_subself)
-{
-	checkCSE({Instruction::DUP1, Instruction::SUB}, {Instruction::POP, u256(0)});
-}
-
-BOOST_AUTO_TEST_CASE(cse_subother)
-{
-	checkCSE({Instruction::SUB}, {Instruction::SUB});
-}
-
-BOOST_AUTO_TEST_CASE(cse_double_negation)
-{
-	checkCSE({Instruction::DUP5, Instruction::NOT, Instruction::NOT}, {Instruction::DUP5});
-}
-
-BOOST_AUTO_TEST_CASE(cse_double_iszero)
-{
-	checkCSE({Instruction::GT, Instruction::ISZERO, Instruction::ISZERO}, {Instruction::GT});
-	checkCSE({Instruction::GT, Instruction::ISZERO}, {Instruction::GT, Instruction::ISZERO});
-	checkCSE(
-		{Instruction::ISZERO, Instruction::ISZERO, Instruction::ISZERO},
-		{Instruction::ISZERO}
-	);
-}
-
-BOOST_AUTO_TEST_CASE(cse_associativity)
-{
-	AssemblyItems input{
-		Instruction::DUP1,
-		Instruction::DUP1,
-		u256(0),
-		Instruction::OR,
-		Instruction::OR
-	};
-	checkCSE(input, {Instruction::DUP1});
-}
-
-BOOST_AUTO_TEST_CASE(cse_associativity2)
-{
-	AssemblyItems input{
-		u256(0),
-		Instruction::DUP2,
-		u256(2),
-		u256(1),
-		Instruction::DUP6,
-		Instruction::ADD,
-		u256(2),
-		Instruction::ADD,
-		Instruction::ADD,
-		Instruction::ADD,
-		Instruction::ADD
-	};
-	checkCSE(input, {Instruction::DUP2, Instruction::DUP2, Instruction::ADD, u256(5), Instruction::ADD});
-}
-
-BOOST_AUTO_TEST_CASE(cse_double_shift_right_overflow)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
-	{
-		AssemblyItems input{
-			Instruction::CALLVALUE,
-			u256(2),
-			Instruction::SHR,
-			u256(-1),
-			Instruction::SHR
-		};
-		checkCSE(input, {u256(0)});
-	}
-}
-
-BOOST_AUTO_TEST_CASE(cse_double_shift_left_overflow)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
-	{
-		AssemblyItems input{
-			Instruction::DUP1,
-			u256(2),
-			Instruction::SHL,
-			u256(-1),
-			Instruction::SHL
-		};
-		checkCSE(input, {u256(0)});
-	}
-}
-
-BOOST_AUTO_TEST_CASE(cse_byte_ordering_bug)
-{
-	AssemblyItems input{
-		u256(31),
-		Instruction::CALLVALUE,
-		Instruction::BYTE
-	};
-	checkCSE(input, {u256(31), Instruction::CALLVALUE, Instruction::BYTE});
-}
-
-BOOST_AUTO_TEST_CASE(cse_byte_ordering_fix)
-{
-	AssemblyItems input{
-		Instruction::CALLVALUE,
-		u256(31),
-		Instruction::BYTE
-	};
-	checkCSE(input, {u256(0xff), Instruction::CALLVALUE, Instruction::AND});
-}
-
-BOOST_AUTO_TEST_CASE(cse_storage)
-{
-	AssemblyItems input{
-		u256(0),
-		Instruction::SLOAD,
-		u256(0),
-		Instruction::SLOAD,
-		Instruction::ADD,
-		u256(0),
-		Instruction::SSTORE
-	};
-	checkCSE(input, {
-		u256(0),
-		Instruction::DUP1,
-		Instruction::SLOAD,
-		Instruction::DUP1,
-		Instruction::ADD,
-		Instruction::SWAP1,
-		Instruction::SSTORE
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_noninterleaved_storage)
-{
-	// two stores to the same location should be replaced by only one store, even if we
-	// read in the meantime
-	AssemblyItems input{
-		u256(7),
-		Instruction::DUP2,
-		Instruction::SSTORE,
-		Instruction::DUP1,
-		Instruction::SLOAD,
-		u256(8),
-		Instruction::DUP3,
-		Instruction::SSTORE
-	};
-	checkCSE(input, {
-		u256(8),
-		Instruction::DUP2,
-		Instruction::SSTORE,
-		u256(7)
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage)
-{
-	// stores and reads to/from two unknown locations, should not optimize away the first store
-	AssemblyItems input{
-		u256(7),
-		Instruction::DUP2,
-		Instruction::SSTORE, // store to "DUP1"
-		Instruction::DUP2,
-		Instruction::SLOAD, // read from "DUP2", might be equal to "DUP1"
-		u256(0),
-		Instruction::DUP3,
-		Instruction::SSTORE // store different value to "DUP1"
-	};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage_same_value)
-{
-	// stores and reads to/from two unknown locations, should not optimize away the first store
-	// but it should optimize away the second, since we already know the value will be the same
-	AssemblyItems input{
-		u256(7),
-		Instruction::DUP2,
-		Instruction::SSTORE, // store to "DUP1"
-		Instruction::DUP2,
-		Instruction::SLOAD, // read from "DUP2", might be equal to "DUP1"
-		u256(6),
-		u256(1),
-		Instruction::ADD,
-		Instruction::DUP3,
-		Instruction::SSTORE // store same value to "DUP1"
-	};
-	checkCSE(input, {
-		u256(7),
-		Instruction::DUP2,
-		Instruction::SSTORE,
-		Instruction::DUP2,
-		Instruction::SLOAD
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage_at_known_location)
-{
-	// stores and reads to/from two known locations, should optimize away the first store,
-	// because we know that the location is different
-	AssemblyItems input{
-		u256(0x70),
-		u256(1),
-		Instruction::SSTORE, // store to 1
-		u256(2),
-		Instruction::SLOAD, // read from 2, is different from 1
-		u256(0x90),
-		u256(1),
-		Instruction::SSTORE // store different value at 1
-	};
-	checkCSE(input, {
-		u256(2),
-		Instruction::SLOAD,
-		u256(0x90),
-		u256(1),
-		Instruction::SSTORE
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_interleaved_storage_at_known_location_offset)
-{
-	// stores and reads to/from two locations which are known to be different,
-	// should optimize away the first store, because we know that the location is different
-	AssemblyItems input{
-		u256(0x70),
-		Instruction::DUP2,
-		u256(1),
-		Instruction::ADD,
-		Instruction::SSTORE, // store to "DUP1"+1
-		Instruction::DUP1,
-		u256(2),
-		Instruction::ADD,
-		Instruction::SLOAD, // read from "DUP1"+2, is different from "DUP1"+1
-		u256(0x90),
-		Instruction::DUP3,
-		u256(1),
-		Instruction::ADD,
-		Instruction::SSTORE // store different value at "DUP1"+1
-	};
-	checkCSE(input, {
-		u256(2),
-		Instruction::DUP2,
-		Instruction::ADD,
-		Instruction::SLOAD,
-		u256(0x90),
-		u256(1),
-		Instruction::DUP4,
-		Instruction::ADD,
-		Instruction::SSTORE
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_deep_stack)
-{
-	AssemblyItems input{
-		Instruction::ADD,
-		Instruction::SWAP1,
-		Instruction::POP,
-		Instruction::SWAP8,
-		Instruction::POP,
-		Instruction::SWAP8,
-		Instruction::POP,
-		Instruction::SWAP8,
-		Instruction::SWAP5,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-	};
-	checkCSE(input, {
-		Instruction::SWAP4,
-		Instruction::SWAP12,
-		Instruction::SWAP3,
-		Instruction::SWAP11,
-		Instruction::POP,
-		Instruction::SWAP1,
-		Instruction::SWAP3,
-		Instruction::ADD,
-		Instruction::SWAP8,
-		Instruction::POP,
-		Instruction::SWAP6,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-		Instruction::POP,
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_jumpi_no_jump)
-{
-	AssemblyItems input{
-		u256(0),
-		u256(1),
-		Instruction::DUP2,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI
-	};
-	checkCSE(input, {
-		u256(0),
-		u256(1)
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_jumpi_jump)
-{
-	AssemblyItems input{
-		u256(1),
-		u256(1),
-		Instruction::DUP2,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI
-	};
-	checkCSE(input, {
-		u256(1),
-		Instruction::DUP1,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_empty_keccak256)
-{
-	AssemblyItems input{
-		u256(0),
-		Instruction::DUP2,
-		Instruction::KECCAK256
-	};
-	checkCSE(input, {
-		u256(util::keccak256(bytesConstRef()))
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_partial_keccak256)
-{
-	AssemblyItems input{
-		u256(0xabcd) << (256 - 16),
-		u256(0),
-		Instruction::MSTORE,
-		u256(2),
-		u256(0),
-		Instruction::KECCAK256
-	};
-	checkCSE(input, {
-		u256(0xabcd) << (256 - 16),
-		u256(0),
-		Instruction::MSTORE,
-		u256(util::keccak256(bytes{0xab, 0xcd}))
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_location)
-{
-	// Keccak-256 twice from same dynamic location
-	AssemblyItems input{
-		Instruction::DUP2,
-		Instruction::DUP1,
-		Instruction::MSTORE,
-		u256(64),
-		Instruction::DUP2,
-		Instruction::KECCAK256,
-		u256(64),
-		Instruction::DUP3,
-		Instruction::KECCAK256
-	};
-	checkCSE(input, {
-		Instruction::DUP2,
-		Instruction::DUP1,
-		Instruction::MSTORE,
-		u256(64),
-		Instruction::DUP2,
-		Instruction::KECCAK256,
-		Instruction::DUP1
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content)
-{
-	// Keccak-256 twice from different dynamic location but with same content
-	AssemblyItems input{
-		Instruction::DUP1,
-		u256(0x80),
-		Instruction::MSTORE, // m[128] = DUP1
-		u256(0x20),
-		u256(0x80),
-		Instruction::KECCAK256, // keccak256(m[128..(128+32)])
-		Instruction::DUP2,
-		u256(12),
-		Instruction::MSTORE, // m[12] = DUP1
-		u256(0x20),
-		u256(12),
-		Instruction::KECCAK256 // keccak256(m[12..(12+32)])
-	};
-	checkCSE(input, {
-		u256(0x80),
-		Instruction::DUP2,
-		Instruction::DUP2,
-		Instruction::MSTORE,
-		u256(0x20),
-		Instruction::SWAP1,
-		Instruction::KECCAK256,
-		u256(12),
-		Instruction::DUP3,
-		Instruction::SWAP1,
-		Instruction::MSTORE,
-		Instruction::DUP1
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content_dynamic_store_in_between)
-{
-	// Keccak-256 twice from different dynamic location but with same content,
-	// dynamic mstore in between, which forces us to re-calculate the hash
-	AssemblyItems input{
-		u256(0x80),
-		Instruction::DUP2,
-		Instruction::DUP2,
-		Instruction::MSTORE, // m[128] = DUP1
-		u256(0x20),
-		Instruction::DUP1,
-		Instruction::DUP3,
-		Instruction::KECCAK256, // keccak256(m[128..(128+32)])
-		u256(12),
-		Instruction::DUP5,
-		Instruction::DUP2,
-		Instruction::MSTORE, // m[12] = DUP1
-		Instruction::DUP12,
-		Instruction::DUP14,
-		Instruction::MSTORE, // destroys memory knowledge
-		Instruction::SWAP2,
-		Instruction::SWAP1,
-		Instruction::SWAP2,
-		Instruction::KECCAK256 // keccak256(m[12..(12+32)])
-	};
-	checkCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content_noninterfering_store_in_between)
-{
-	// Keccak-256 twice from different dynamic location but with same content,
-	// dynamic mstore in between, but does not force us to re-calculate the hash
-	AssemblyItems input{
-		u256(0x80),
-		Instruction::DUP2,
-		Instruction::DUP2,
-		Instruction::MSTORE, // m[128] = DUP1
-		u256(0x20),
-		Instruction::DUP1,
-		Instruction::DUP3,
-		Instruction::KECCAK256, // keccak256(m[128..(128+32)])
-		u256(12),
-		Instruction::DUP5,
-		Instruction::DUP2,
-		Instruction::MSTORE, // m[12] = DUP1
-		Instruction::DUP12,
-		u256(12 + 32),
-		Instruction::MSTORE, // does not destroy memory knowledge
-		Instruction::DUP13,
-		u256(128 - 32),
-		Instruction::MSTORE, // does not destroy memory knowledge
-		u256(0x20),
-		u256(12),
-		Instruction::KECCAK256 // keccak256(m[12..(12+32)])
-	};
-	// if this changes too often, only count the number of SHA3 and MSTORE instructions
-	AssemblyItems output = CSE(input);
-	BOOST_CHECK_EQUAL(4, count(output.begin(), output.end(), AssemblyItem(Instruction::MSTORE)));
-	BOOST_CHECK_EQUAL(1, count(output.begin(), output.end(), AssemblyItem(Instruction::KECCAK256)));
-}
-
-BOOST_AUTO_TEST_CASE(cse_with_initially_known_stack)
-{
-	evmasm::KnownState state = createInitialState(AssemblyItems{
-		u256(0x12),
-		u256(0x20),
-		Instruction::ADD
-	});
-	AssemblyItems input{
-		u256(0x12 + 0x20)
-	};
-	checkCSE(input, AssemblyItems{Instruction::DUP1}, state);
-}
-
-BOOST_AUTO_TEST_CASE(cse_equality_on_initially_known_stack)
-{
-	evmasm::KnownState state = createInitialState(AssemblyItems{Instruction::DUP1});
-	AssemblyItems input{
-		Instruction::EQ
-	};
-	AssemblyItems output = CSE(input, state);
-	// check that it directly pushes 1 (true)
-	BOOST_CHECK(find(output.begin(), output.end(), AssemblyItem(u256(1))) != output.end());
-}
-
-BOOST_AUTO_TEST_CASE(cse_access_previous_sequence)
-{
-	// Tests that the code generator detects whether it tries to access SLOAD instructions
-	// from a sequenced expression which is not in its scope.
-	evmasm::KnownState state = createInitialState(AssemblyItems{
-		u256(0),
-		Instruction::SLOAD,
-		u256(1),
-		Instruction::ADD,
-		u256(0),
-		Instruction::SSTORE
-	});
-	// now stored: val_1 + 1 (value at sequence 1)
-	// if in the following instructions, the SLOAD cresolves to "val_1 + 1",
-	// this cannot be generated because we cannot load from sequence 1 anymore.
-	AssemblyItems input{
-		u256(0),
-		Instruction::SLOAD,
-	};
-	BOOST_CHECK_THROW(CSE(input, state), StackTooDeepException);
-	// @todo for now, this throws an exception, but it should recover to the following
-	// (or an even better version) at some point:
-	// 0, SLOAD, 1, ADD, SSTORE, 0 SLOAD
-}
-
-BOOST_AUTO_TEST_CASE(cse_optimise_return)
-{
-	checkCSE(
-		AssemblyItems{u256(0), u256(7), Instruction::RETURN},
-		AssemblyItems{Instruction::STOP}
-	);
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_remove_unused)
-{
-	// remove parts of the code that are unused
-	AssemblyItems input{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		u256(7),
-		AssemblyItem(Tag, 1),
-	};
-	checkCFG(input, {});
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_remove_unused_loop)
-{
-	AssemblyItems input{
-		AssemblyItem(PushTag, 3),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(7),
-		AssemblyItem(PushTag, 2),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(8),
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 3),
-		u256(11)
-	};
-	checkCFG(input, {u256(11)});
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_reconnect_single_jump_source)
-{
-	// move code that has only one unconditional jump source
-	AssemblyItems input{
-		u256(1),
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(2),
-		AssemblyItem(PushTag, 3),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(3),
-		AssemblyItem(PushTag, 2),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 3),
-		u256(4),
-	};
-	checkCFG(input, {u256(1), u256(3), u256(2), u256(4)});
-}
-
-BOOST_AUTO_TEST_CASE(control_flow_graph_do_not_remove_returned_to)
-{
-	// do not remove parts that are "returned to"
-	AssemblyItems input{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(2)
-	};
-	checkCFG(input, {u256(2)});
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator)
-{
-	AssemblyItems input{
-		AssemblyItem(PushTag, 2),
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 3),
-		u256(6),
-		Instruction::SWAP3,
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(6),
-		Instruction::SWAP3,
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(6),
-		Instruction::SWAP3,
-		Instruction::JUMP,
-		AssemblyItem(Tag, 3)
-	};
-	BlockDeduplicator deduplicator(input);
-	deduplicator.deduplicate();
-
-	std::set<u256> pushTags;
-	for (AssemblyItem const& item: input)
-		if (item.type() == PushTag)
-			pushTags.insert(item.data());
-	BOOST_CHECK_EQUAL(pushTags.size(), 2);
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator_assign_immutable_same)
-{
-	AssemblyItems blocks{
-		AssemblyItem(Tag, 1),
-		u256(42),
-		AssemblyItem{AssignImmutable, 0x1234},
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(42),
-		AssemblyItem{AssignImmutable, 0x1234},
-		Instruction::JUMP
-	};
-
-	AssemblyItems input = AssemblyItems{
-		AssemblyItem(PushTag, 2),
-		AssemblyItem(PushTag, 1),
-	} + blocks;
-	AssemblyItems output = AssemblyItems{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 1),
-	} + blocks;
-	BlockDeduplicator deduplicator(input);
-	deduplicator.deduplicate();
-	BOOST_CHECK_EQUAL_COLLECTIONS(input.begin(), input.end(), output.begin(), output.end());
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator_assign_immutable_different_value)
-{
-	AssemblyItems input{
-		AssemblyItem(PushTag, 2),
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(Tag, 1),
-		u256(42),
-		AssemblyItem{AssignImmutable, 0x1234},
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(23),
-		AssemblyItem{AssignImmutable, 0x1234},
-		Instruction::JUMP
-	};
-	BlockDeduplicator deduplicator(input);
-	BOOST_CHECK(!deduplicator.deduplicate());
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator_assign_immutable_different_hash)
-{
-	AssemblyItems input{
-		AssemblyItem(PushTag, 2),
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(Tag, 1),
-		u256(42),
-		AssemblyItem{AssignImmutable, 0x1234},
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(42),
-		AssemblyItem{AssignImmutable, 0xABCD},
-		Instruction::JUMP
-	};
-	BlockDeduplicator deduplicator(input);
-	BOOST_CHECK(!deduplicator.deduplicate());
-}
-
-BOOST_AUTO_TEST_CASE(block_deduplicator_loops)
-{
-	AssemblyItems input{
-		u256(0),
-		Instruction::SLOAD,
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		Instruction::JUMPI,
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(5),
-		u256(6),
-		Instruction::SSTORE,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(5),
-		u256(6),
-		Instruction::SSTORE,
-		AssemblyItem(PushTag, 2),
-		Instruction::JUMP,
-	};
-	BlockDeduplicator deduplicator(input);
-	deduplicator.deduplicate();
-
-	std::set<u256> pushTags;
-	for (AssemblyItem const& item: input)
-		if (item.type() == PushTag)
-			pushTags.insert(item.data());
-	BOOST_CHECK_EQUAL(pushTags.size(), 1);
-}
-
-BOOST_AUTO_TEST_CASE(clear_unreachable_code)
-{
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		u256(0),
-		Instruction::SLOAD,
-		AssemblyItem(Tag, 2),
-		u256(5),
-		u256(6),
-		Instruction::SSTORE,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		u256(5),
-		u256(6)
-	};
-	AssemblyItems expectation{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 2),
-		u256(5),
-		u256(6),
-		Instruction::SSTORE,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP
-	};
-	PeepholeOptimiser peepOpt(items);
-	BOOST_REQUIRE(peepOpt.optimise());
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(peephole_double_push)
-{
-	AssemblyItems items{
-		u256(0),
-		u256(0),
-		u256(5),
-		u256(5),
-		u256(4),
-		u256(5)
-	};
-	AssemblyItems expectation{
-		u256(0),
-		Instruction::DUP1,
-		u256(5),
-		Instruction::DUP1,
-		u256(4),
-		u256(5)
-	};
-	PeepholeOptimiser peepOpt(items);
-	BOOST_REQUIRE(peepOpt.optimise());
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(peephole_pop_calldatasize)
-{
-	AssemblyItems items{
-		u256(4),
-		Instruction::CALLDATASIZE,
-		Instruction::LT,
-		Instruction::POP
-	};
-	PeepholeOptimiser peepOpt(items);
-	for (size_t i = 0; i < 3; i++)
-		BOOST_CHECK(peepOpt.optimise());
-	BOOST_CHECK(items.empty());
-}
-
-BOOST_AUTO_TEST_CASE(peephole_commutative_swap1)
-{
-	std::vector<Instruction> ops{
-		Instruction::ADD,
-		Instruction::MUL,
-		Instruction::EQ,
-		Instruction::AND,
-		Instruction::OR,
-		Instruction::XOR
-	};
-	for (Instruction const op: ops)
-	{
-		AssemblyItems items{
-			u256(1),
-			u256(2),
-			Instruction::SWAP1,
-			op,
-			u256(4),
-			u256(5)
-		};
-		AssemblyItems expectation{
-			u256(1),
-			u256(2),
-			op,
-			u256(4),
-			u256(5)
-		};
-		PeepholeOptimiser peepOpt(items);
-		BOOST_REQUIRE(peepOpt.optimise());
-		BOOST_CHECK_EQUAL_COLLECTIONS(
-			items.begin(), items.end(),
-			expectation.begin(), expectation.end()
-		);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(peephole_noncommutative_swap1)
-{
-	// NOTE: not comprehensive
-	std::vector<Instruction> ops{
-		Instruction::SUB,
-		Instruction::DIV,
-		Instruction::SDIV,
-		Instruction::MOD,
-		Instruction::SMOD,
-		Instruction::EXP
-	};
-	for (Instruction const op: ops)
-	{
-		AssemblyItems items{
-			u256(1),
-			u256(2),
-			Instruction::SWAP1,
-			op,
-			u256(4),
-			u256(5)
-		};
-		AssemblyItems expectation{
-			u256(1),
-			u256(2),
-			Instruction::SWAP1,
-			op,
-			u256(4),
-			u256(5)
-		};
-		PeepholeOptimiser peepOpt(items);
-		BOOST_REQUIRE(!peepOpt.optimise());
-		BOOST_CHECK_EQUAL_COLLECTIONS(
-			items.begin(), items.end(),
-			expectation.begin(), expectation.end()
-		);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(peephole_swap_comparison)
-{
-	std::map<Instruction, Instruction> swappableOps{
-		{ Instruction::LT, Instruction::GT },
-		{ Instruction::GT, Instruction::LT },
-		{ Instruction::SLT, Instruction::SGT },
-		{ Instruction::SGT, Instruction::SLT }
-	};
-
-	for (auto const& op: swappableOps)
-	{
-		AssemblyItems items{
-			u256(1),
-			u256(2),
-			Instruction::SWAP1,
-			op.first,
-			u256(4),
-			u256(5)
-		};
-		AssemblyItems expectation{
-			u256(1),
-			u256(2),
-			op.second,
-			u256(4),
-			u256(5)
-		};
-		PeepholeOptimiser peepOpt(items);
-		BOOST_REQUIRE(peepOpt.optimise());
-		BOOST_CHECK_EQUAL_COLLECTIONS(
-			items.begin(), items.end(),
-			expectation.begin(), expectation.end()
-		);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(peephole_truthy_and)
-{
-	AssemblyItems items{
-		AssemblyItem(Tag, 1),
-		Instruction::BALANCE,
-		u256(0),
-		Instruction::NOT,
-		Instruction::AND,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI
-	};
-	AssemblyItems expectation{
-		AssemblyItem(Tag, 1),
-		Instruction::BALANCE,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI
-	};
-	PeepholeOptimiser peepOpt(items);
-	BOOST_REQUIRE(peepOpt.optimise());
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-
-BOOST_AUTO_TEST_CASE(peephole_iszero_iszero_jumpi)
-{
-	AssemblyItems items{
-		AssemblyItem(Tag, 1),
-		u256(0),
-		Instruction::CALLDATALOAD,
-		Instruction::ISZERO,
-		Instruction::ISZERO,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI,
-		u256(0),
-		u256(0x20),
-		Instruction::RETURN
-	};
-	AssemblyItems expectation{
-		AssemblyItem(Tag, 1),
-		u256(0),
-		Instruction::CALLDATALOAD,
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI,
-		u256(0),
-		u256(0x20),
-		Instruction::RETURN
-	};
-	PeepholeOptimiser peepOpt(items);
-	BOOST_REQUIRE(peepOpt.optimise());
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-	  items.begin(), items.end(),
-	  expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(jumpdest_removal)
-{
-	AssemblyItems items{
-		AssemblyItem(Tag, 2),
-		AssemblyItem(PushTag, 1),
-		u256(5),
-		AssemblyItem(Tag, 10),
-		AssemblyItem(Tag, 3),
-		u256(6),
-		AssemblyItem(Tag, 1),
-		Instruction::JUMP,
-	};
-	AssemblyItems expectation{
-		AssemblyItem(PushTag, 1),
-		u256(5),
-		u256(6),
-		AssemblyItem(Tag, 1),
-		Instruction::JUMP
-	};
-	JumpdestRemover jdr(items);
-	BOOST_REQUIRE(jdr.optimise({}));
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
-{
-	// This tests that tags from subassemblies are not removed
-	// if they are referenced by a super-assembly. Furthermore,
-	// tag unifications (due to block deduplication) is also
-	// visible at the super-assembly.
-
-	Assembly::OptimiserSettings settings;
-	settings.runInliner = false;
-	settings.runJumpdestRemover = true;
-	settings.runPeephole = true;
-	settings.runDeduplicate = true;
-	settings.runCSE = true;
-	settings.runConstantOptimiser = true;
-	settings.evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
-
-	Assembly main{settings.evmVersion, false, {}};
-	AssemblyPointer sub = std::make_shared<Assembly>(settings.evmVersion, true, std::string{});
-
-	sub->append(u256(1));
-	auto t1 = sub->newTag();
-	sub->append(t1);
-	sub->append(u256(2));
-	sub->append(Instruction::JUMP);
-	auto t2 = sub->newTag();
-	sub->append(t2); // Identical to T1, will be unified
-	sub->append(u256(2));
-	sub->append(Instruction::JUMP);
-	auto t3 = sub->newTag();
-	sub->append(t3);
-	auto t4 = sub->newTag();
-	sub->append(t4);
-	auto t5 = sub->newTag();
-	sub->append(t5); // This will be removed
-	sub->append(u256(7));
-	sub->append(t4.pushTag());
-	sub->append(Instruction::JUMP);
-
-	size_t subId = static_cast<size_t>(main.appendSubroutine(sub).data());
-	main.append(t1.toSubAssemblyTag(subId));
-	main.append(t1.toSubAssemblyTag(subId));
-	main.append(u256(8));
-
-	main.optimise(settings);
-
-	AssemblyItems expectationMain{
-		AssemblyItem(PushSubSize, 0),
-		t1.toSubAssemblyTag(subId).pushTag(),
-		t1.toSubAssemblyTag(subId).pushTag(),
-		u256(8)
-	};
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		main.items().begin(), main.items().end(),
-		expectationMain.begin(), expectationMain.end()
-	);
-
-	AssemblyItems expectationSub{
-		u256(1), t1.tag(), u256(2), Instruction::JUMP, t4.tag(), u256(7), t4.pushTag(), Instruction::JUMP
-	};
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		sub->items().begin(), sub->items().end(),
-		expectationSub.begin(), expectationSub.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(cse_sub_zero)
-{
-	checkCSE({
-		u256(0),
-		Instruction::DUP2,
-		Instruction::SUB
-	}, {
-		Instruction::DUP1
-	});
-
-	checkCSE({
-		Instruction::DUP1,
-		u256(0),
-		Instruction::SUB
-	}, {
-		u256(0),
-		Instruction::DUP2,
-		Instruction::SWAP1,
-		Instruction::SUB
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_simple_verbatim)
-{
-	auto verbatim = AssemblyItem{bytes{1, 2, 3, 4, 5}, 0, 0};
-	AssemblyItems input{verbatim};
-	checkCSE(input, input);
-	checkFullCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_mload_pop)
-{
-	AssemblyItems input{
-		u256(1000),
-		Instruction::MLOAD,
-		Instruction::POP,
-	};
-
-	AssemblyItems output{
-	};
-
-	checkCSE(input, output);
-	checkFullCSE(input, output);
-}
-
-BOOST_AUTO_TEST_CASE(cse_verbatim_mload)
-{
-	auto verbatim = AssemblyItem{bytes{1, 2, 3, 4, 5}, 0, 0};
-	AssemblyItems input{
-		u256(1000),
-		Instruction::MLOAD,	// Should not be removed
-		Instruction::POP,
-		verbatim,
-		u256(1000),
-		Instruction::MLOAD,	// Should not be removed
-		Instruction::POP,
-	};
-
-	checkFullCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_sload_verbatim_dup)
-{
-	auto verbatim = AssemblyItem{bytes{1, 2, 3, 4, 5}, 0, 0};
-	AssemblyItems input{
-		u256(0),
-		Instruction::SLOAD,
-		u256(0),
-		Instruction::SLOAD,
-		verbatim
-	};
-
-	AssemblyItems output{
-		u256(0),
-		Instruction::SLOAD,
-		Instruction::DUP1,
-		verbatim
-	};
-
-	checkCSE(input, output);
-	checkFullCSE(input, output);
-}
-
-BOOST_AUTO_TEST_CASE(cse_verbatim_sload_sideeffect)
-{
-	auto verbatim = AssemblyItem{bytes{1, 2, 3, 4, 5}, 0, 0};
-	AssemblyItems input{
-		u256(0),
-		Instruction::SLOAD,
-		verbatim,
-		u256(0),
-		Instruction::SLOAD,
-	};
-
-	checkFullCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(cse_verbatim_eq)
-{
-	auto verbatim = AssemblyItem{bytes{1, 2, 3, 4, 5}, 0, 0};
-	AssemblyItems input{
-		u256(0),
-		Instruction::SLOAD,
-		verbatim,
-		Instruction::DUP1,
-		Instruction::EQ
-	};
-
-	checkFullCSE(input, input);
-}
-
-BOOST_AUTO_TEST_CASE(verbatim_knownstate)
-{
-	KnownState state = createInitialState(AssemblyItems{
-			Instruction::DUP1,
-			Instruction::DUP2,
-			Instruction::DUP3,
-			Instruction::DUP4
-		});
-	std::map<int, unsigned> const& stackElements = state.stackElements();
-
-	BOOST_CHECK(state.stackHeight() == 4);
-	// One more than stack height because of the initial unknown element.
-	BOOST_CHECK(stackElements.size() == 5);
-	BOOST_CHECK(stackElements.count(0));
-	unsigned initialElement = stackElements.at(0);
-	// Check if all the DUPs were correctly matched to the same class.
-	for (auto const& height: {1, 2, 3, 4})
-		BOOST_CHECK(stackElements.at(height) == initialElement);
-
-	auto verbatim2i5o = AssemblyItem{bytes{1, 2, 3, 4, 5}, 2, 5};
-	state.feedItem(verbatim2i5o);
-
-	BOOST_CHECK(state.stackHeight() == 7);
-	// Stack elements
-	// Before verbatim: {{0, x}, {1, x}, {2, x}, {3, x}, {4, x}}
-	// After verbatim: {{0, x}, {1, x}, {2, x}, {3, a}, {4, b}, {5, c}, {6, d}, {7, e}}
-	BOOST_CHECK(stackElements.size() == 8);
-
-	for (auto const& height: {1, 2})
-		BOOST_CHECK(stackElements.at(height) == initialElement);
-
-	for (auto const& height: {3, 4, 5, 6, 7})
-		BOOST_CHECK(stackElements.at(height) != initialElement);
-
-	for (auto const& height1: {3, 4, 5, 6, 7})
-		for (auto const& height2: {3, 4, 5, 6, 7})
-			if (height1 < height2)
-				BOOST_CHECK(stackElements.at(height1) != stackElements.at(height2));
-}
-
-BOOST_AUTO_TEST_CASE(cse_remove_redundant_shift_masking)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
-		return;
-
-	for (unsigned i = 1; i < 256; i++)
-	{
-		checkCSE({
-			u256(boost::multiprecision::pow(u256(2), i) - 1),
-			Instruction::CALLVALUE,
-			u256(256-i),
-			Instruction::SHR,
-			Instruction::AND
-		}, {
-			Instruction::CALLVALUE,
-			u256(256-i),
-			Instruction::SHR,
-		});
-
-		checkCSE({
-			Instruction::CALLVALUE,
-			u256(256-i),
-			Instruction::SHR,
-			u256(boost::multiprecision::pow(u256(2), i)-1),
-			Instruction::AND
-		}, {
-			Instruction::CALLVALUE,
-			u256(256-i),
-			Instruction::SHR,
-		});
-	}
-
-	// Check that opt. does NOT trigger
-	for (unsigned i = 1; i < 255; i++)
-	{
-		checkCSE({
-			u256(boost::multiprecision::pow(u256(2), i) - 1),
-			Instruction::CALLVALUE,
-			u256(255-i),
-			Instruction::SHR,
-			Instruction::AND
-		}, { // Opt. did some reordering
-			Instruction::CALLVALUE,
-			u256(255-i),
-			Instruction::SHR,
-			u256(boost::multiprecision::pow(u256(2), i)-1),
-			Instruction::AND
-		});
-
-		checkCSE({
-			Instruction::CALLVALUE,
-			u256(255-i),
-			Instruction::SHR,
-			u256(boost::multiprecision::pow(u256(2), i)-1),
-			Instruction::AND
-		}, { // Opt. did some reordering
-			u256(boost::multiprecision::pow(u256(2), i)-1),
-			Instruction::CALLVALUE,
-			u256(255-i),
-			Instruction::SHR,
-			Instruction::AND
-		});
-	}
-
-	//(x >> (31*8)) & 0xffffffff
-	checkCSE({
-		Instruction::CALLVALUE,
-		u256(31*8),
-		Instruction::SHR,
-		u256(0xffffffff),
-		Instruction::AND
-	}, {
-		Instruction::CALLVALUE,
-		u256(31*8),
-		Instruction::SHR
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_remove_unwanted_masking_of_address)
-{
-	std::vector<Instruction> ops{
-		Instruction::ADDRESS,
-		Instruction::CALLER,
-		Instruction::ORIGIN,
-		Instruction::COINBASE
-	};
-	for (auto const& op: ops)
-	{
-		checkCSE({
-			u256("0xffffffffffffffffffffffffffffffffffffffff"),
-			op,
-			Instruction::AND
-		}, {
-			op
-		});
-
-		checkCSE({
-			op,
-			u256("0xffffffffffffffffffffffffffffffffffffffff"),
-			Instruction::AND
-		}, {
-			op
-		});
-
-		// do not remove mask for other masking
-		checkCSE({
-			u256(1234),
-			op,
-			Instruction::AND
-		}, {
-			op,
-			u256(1234),
-			Instruction::AND
-		});
-
-		checkCSE({
-			op,
-			u256(1234),
-			Instruction::AND
-		}, {
-			u256(1234),
-			op,
-			Instruction::AND
-		});
-	}
-
-	// leave other opcodes untouched
-	checkCSE({
-		u256("0xffffffffffffffffffffffffffffffffffffffff"),
-		Instruction::CALLVALUE,
-		Instruction::AND
-	}, {
-		Instruction::CALLVALUE,
-		u256("0xffffffffffffffffffffffffffffffffffffffff"),
-		Instruction::AND
-	});
-
-	checkCSE({
-		Instruction::CALLVALUE,
-		u256("0xffffffffffffffffffffffffffffffffffffffff"),
-		Instruction::AND
-	}, {
-		u256("0xffffffffffffffffffffffffffffffffffffffff"),
-		Instruction::CALLVALUE,
-		Instruction::AND
-	});
-}
-
-BOOST_AUTO_TEST_CASE(cse_replace_too_large_shift)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
-		return;
-
-	checkCSE({
-		Instruction::CALLVALUE,
-		u256(299),
-		Instruction::SHL
-	}, {
-		u256(0)
-	});
-
-	checkCSE({
-		Instruction::CALLVALUE,
-		u256(299),
-		Instruction::SHR
-	}, {
-		u256(0)
-	});
-
-	checkCSE({
-		Instruction::CALLVALUE,
-		u256(255),
-		Instruction::SHL
-	}, {
-		Instruction::CALLVALUE,
-		u256(255),
-		Instruction::SHL
-	});
-
-	checkCSE({
-		Instruction::CALLVALUE,
-		u256(255),
-		Instruction::SHR
-	}, {
-		Instruction::CALLVALUE,
-		u256(255),
-		Instruction::SHR
-	});
-}
-
-BOOST_AUTO_TEST_CASE(inliner)
-{
-	AssemblyItem jumpInto{Instruction::JUMP};
-	jumpInto.setJumpType(AssemblyItem::JumpType::IntoFunction);
-	AssemblyItem jumpOutOf{Instruction::JUMP};
-	jumpOutOf.setJumpType(AssemblyItem::JumpType::OutOfFunction);
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		jumpInto,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-		Instruction::CALLVALUE,
-		Instruction::SWAP1,
-		jumpOutOf,
-	};
-	AssemblyItems expectation{
-		AssemblyItem(PushTag, 1),
-		Instruction::CALLVALUE,
-		Instruction::SWAP1,
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-		Instruction::CALLVALUE,
-		Instruction::SWAP1,
-		jumpOutOf,
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-
-BOOST_AUTO_TEST_CASE(inliner_no_inline_type)
-{
-	// Will not inline due to jump types.
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-		Instruction::CALLVALUE,
-		Instruction::SWAP1,
-		Instruction::JUMP,
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		items.begin(), items.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_no_inline)
-{
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::CALLVALUE,
-		Instruction::JUMPI,
-		Instruction::JUMP,
-	};
-	AssemblyItems expectation{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::CALLVALUE,
-		Instruction::JUMPI,
-		Instruction::JUMP,
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-
-BOOST_AUTO_TEST_CASE(inliner_single_jump)
-{
-	AssemblyItem jumpInto{Instruction::JUMP};
-	jumpInto.setJumpType(AssemblyItem::JumpType::IntoFunction);
-	AssemblyItem jumpOutOf{Instruction::JUMP};
-	jumpOutOf.setJumpType(AssemblyItem::JumpType::OutOfFunction);
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		jumpInto,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-		jumpOutOf,
-	};
-	AssemblyItems expectation{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-		jumpOutOf,
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_end_of_bytecode)
-{
-	AssemblyItem jumpInto{Instruction::JUMP};
-	jumpInto.setJumpType(AssemblyItem::JumpType::IntoFunction);
-	// Cannot inline, since the block at Tag_2 does not end in a jump.
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		jumpInto,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		items.begin(), items.end()
-	);
-}
-
-
-BOOST_AUTO_TEST_CASE(inliner_cse_break)
-{
-	AssemblyItem jumpInto{Instruction::JUMP};
-	jumpInto.setJumpType(AssemblyItem::JumpType::IntoFunction);
-	AssemblyItem jumpOutOf{Instruction::JUMP};
-	jumpOutOf.setJumpType(AssemblyItem::JumpType::OutOfFunction);
-	// Could be inlined, but we only consider non-CSE-breaking blocks ending in JUMP so far.
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		AssemblyItem(PushTag, 2),
-		jumpInto,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP,
-		AssemblyItem(Tag, 2),
-		Instruction::STOP, // CSE breaking instruction
-		jumpOutOf
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		items.begin(), items.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_stop)
-{
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP
-	};
-	AssemblyItems expectation{
-		Instruction::STOP,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_stop_jumpi)
-{
-	// Because of `jumpi`, will not be inlined.
-	AssemblyItems items{
-		u256(1),
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMPI,
-		AssemblyItem(Tag, 1),
-		Instruction::STOP
-	};
-	AssemblyItems expectation = items;
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_revert)
-{
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(0),
-		Instruction::DUP1,
-		Instruction::REVERT
-	};
-	AssemblyItems expectation{
-		u256(0),
-		Instruction::DUP1,
-		Instruction::REVERT,
-		AssemblyItem(Tag, 1),
-		u256(0),
-		Instruction::DUP1,
-		Instruction::REVERT
-	};
-
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_revert_increased_datagas)
-{
-	// Inlining this would increase data gas (5 bytes v/s 4 bytes), therefore, skipped.
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		u256(0),
-		u256(0),
-		Instruction::REVERT
-	};
-
-	AssemblyItems expectation = items;
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-BOOST_AUTO_TEST_CASE(inliner_invalid)
-{
-	AssemblyItems items{
-		AssemblyItem(PushTag, 1),
-		Instruction::JUMP,
-		AssemblyItem(Tag, 1),
-		Instruction::INVALID
-	};
-
-	AssemblyItems expectation = {
-		Instruction::INVALID,
-		AssemblyItem(Tag, 1),
-		Instruction::INVALID
-	};
-	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
-	BOOST_CHECK_EQUAL_COLLECTIONS(
-		items.begin(), items.end(),
-		expectation.begin(), expectation.end()
-	);
-}
-
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/liblangutil/CharStream.cpp b/test/liblangutil/CharStream.cpp
deleted file mode 100644
index 07df23ab6ef4..000000000000
--- a/test/liblangutil/CharStream.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Rocky Bernstein <rocky.bernstein@consensys.net>
- * @date 2019
- * Unit tests for the CharStream class.
- */
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/Exceptions.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::test;
-
-namespace boost::test_tools::tt_detail
-{
-
-template<>
-struct print_log_value<std::optional<int>>
-{
-	void operator()(std::ostream& _out, std::optional<int> const& _value) const
-	{
-		_out << (_value ? to_string(*_value) : "[std::nullopt]");
-	}
-};
-
-template<>
-struct print_log_value<std::nullopt_t>
-{
-	void operator()(std::ostream& _out, std::nullopt_t const&) const
-	{
-		_out << "[std::nullopt]";
-	}
-};
-
-} // namespace boost::test_tools::tt_detail
-
-
-namespace solidity::langutil::test
-{
-
-BOOST_AUTO_TEST_SUITE(CharStreamTest)
-
-BOOST_AUTO_TEST_CASE(test_fail)
-{
-	auto const source = std::make_shared<CharStream>("now is the time for testing", "source");
-
-	BOOST_CHECK('n' == source->get());
-	BOOST_CHECK('n' == source->get());
-	BOOST_CHECK('o' == source->advanceAndGet());
-	BOOST_CHECK('n' == source->rollback(1));
-	BOOST_CHECK('w' == source->setPosition(2));
-	BOOST_REQUIRE_THROW(
-		source->setPosition(200),
-		::solidity::langutil::InternalCompilerError
-	);
-}
-
-namespace
-{
-std::optional<int> toPosition(int _line, int _column, std::string const& _text)
-{
-	return CharStream{_text, "source"}.translateLineColumnToPosition(
-		LineColumn{_line, _column}
-	);
-}
-
-}
-
-BOOST_AUTO_TEST_CASE(translateLineColumnToPosition)
-{
-	BOOST_CHECK_EQUAL(toPosition(-1, 0, "ABC"), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(0, -1, "ABC"), std::nullopt);
-
-	BOOST_CHECK_EQUAL(toPosition(0, 0, ""), 0);
-	BOOST_CHECK_EQUAL(toPosition(1, 0, ""), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(0, 1, ""), std::nullopt);
-
-	// With last line containing no LF
-	BOOST_CHECK_EQUAL(toPosition(0, 0, "ABC"), 0);
-	BOOST_CHECK_EQUAL(toPosition(0, 1, "ABC"), 1);
-	BOOST_CHECK_EQUAL(toPosition(0, 2, "ABC"), 2);
-	BOOST_CHECK_EQUAL(toPosition(0, 3, "ABC"), 3);
-	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC"), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC"), std::nullopt);
-
-	BOOST_CHECK_EQUAL(toPosition(0, 3, "ABC\nDEF"), 3);
-	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC\nDEF"), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC\nDEF"), 4);
-	BOOST_CHECK_EQUAL(toPosition(1, 1, "ABC\nDEF"), 5);
-	BOOST_CHECK_EQUAL(toPosition(1, 2, "ABC\nDEF"), 6);
-	BOOST_CHECK_EQUAL(toPosition(1, 3, "ABC\nDEF"), 7);
-	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF"), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF"), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF"), std::nullopt);
-
-	// With last line containing LF
-	BOOST_CHECK_EQUAL(toPosition(0, 0, "ABC\nDEF\n"), 0);
-	BOOST_CHECK_EQUAL(toPosition(0, 1, "ABC\nDEF\n"), 1);
-	BOOST_CHECK_EQUAL(toPosition(0, 2, "ABC\nDEF\n"), 2);
-
-	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC\nDEF\n"), 4);
-	BOOST_CHECK_EQUAL(toPosition(1, 1, "ABC\nDEF\n"), 5);
-	BOOST_CHECK_EQUAL(toPosition(1, 2, "ABC\nDEF\n"), 6);
-	BOOST_CHECK_EQUAL(toPosition(1, 3, "ABC\nDEF\n"), 7);
-	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF\n"), std::nullopt);
-	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF\n"), 8);
-	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\n"), std::nullopt);
-
-	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF\nGHI\n"), 8);
-	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\nGHI\n"), 9);
-	BOOST_CHECK_EQUAL(toPosition(2, 2, "ABC\nDEF\nGHI\n"), 10);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/liblangutil/Scanner.cpp b/test/liblangutil/Scanner.cpp
deleted file mode 100644
index 8c961a3bab6a..000000000000
--- a/test/liblangutil/Scanner.cpp
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Unit tests for the solidity scanner.
- */
-
-#include <liblangutil/Scanner.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::langutil;
-using namespace std::string_literals;
-
-namespace solidity::langutil::test
-{
-
-BOOST_AUTO_TEST_SUITE(ScannerTest)
-
-BOOST_AUTO_TEST_CASE(test_empty)
-{
-	CharStream stream{};
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	CharStream stream("function break;765  \t  \"string1\",'string2'\nidentifier1", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Break);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "765");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "string1");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "string2");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "identifier1");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(assembly_assign)
-{
-	CharStream stream("let a := 1", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Let);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssemblyAssign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "1");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(assembly_multiple_assign)
-{
-	CharStream stream("let a, b, c := 1", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Let);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssemblyAssign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "1");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(string_printable)
-{
-	for (unsigned v = 0x20; v < 0x7e; v++) {
-		std::string lit{static_cast<char>(v)};
-		// Escape \ and " (since we are quoting with ")
-		if (v == '\\' || v == '"')
-			lit = std::string{'\\'} + lit;
-		CharStream stream("  { \"" + lit + "\"", "");
-		Scanner scanner(stream);
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string{static_cast<char>(v)});
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-	// Special case of unescaped " for strings quoted with '
-	CharStream stream("  { '\"'", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "\"");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(string_nonprintable)
-{
-	for (unsigned v = 0; v < 0xff; v++) {
-		// Skip the valid ones
-		if (v >= 0x20 && v <= 0x7e)
-			continue;
-		std::string lit{static_cast<char>(v)};
-		CharStream stream("  { \"" + lit + "\"", "");
-		Scanner scanner(stream);
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-		if (v == '\n' || v == '\v' || v == '\f' || v == '\r')
-			BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalStringEndQuote);
-		else
-			BOOST_CHECK_EQUAL(scanner.currentError(),ScannerError::UnicodeCharacterInNonUnicodeString);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(string_escapes)
-{
-	CharStream stream("  { \"a\\x61\"", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "aa");
-}
-
-BOOST_AUTO_TEST_CASE(string_escapes_all)
-{
-	CharStream stream("  { \"a\\x61\\n\\r\\t\"", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "aa\n\r\t");
-}
-
-struct TestScanner
-{
-	std::unique_ptr<CharStream> stream;
-	std::unique_ptr<Scanner> scanner;
-	explicit TestScanner(std::string _text) { reset(std::move(_text)); }
-
-	void reset(std::string _text)
-	{
-		stream = std::make_unique<CharStream>(std::move(_text), "");
-		scanner = std::make_unique<Scanner>(*stream);
-	}
-
-	decltype(auto) currentToken() { return scanner->currentToken(); }
-	decltype(auto) next() { return scanner->next(); }
-	decltype(auto) currentError() { return scanner->currentError(); }
-	decltype(auto) currentLiteral() { return scanner->currentLiteral(); }
-	decltype(auto) currentCommentLiteral() { return scanner->currentCommentLiteral(); }
-	decltype(auto) currentLocation() { return scanner->currentLocation(); }
-};
-
-BOOST_AUTO_TEST_CASE(string_escapes_legal_before_080)
-{
-	TestScanner scanner("  { \"a\\b");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalEscapeSequence);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
-	scanner.reset("  { \"a\\f");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalEscapeSequence);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
-	scanner.reset("  { \"a\\v");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalEscapeSequence);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
-}
-
-BOOST_AUTO_TEST_CASE(string_escapes_with_zero)
-{
-	TestScanner scanner("  { \"a\\x61\\x00abc\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("aa\0abc", 6));
-}
-
-BOOST_AUTO_TEST_CASE(string_escape_illegal)
-{
-	CharStream stream(" bla \"\\x6rf\" (illegalescape)", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalEscapeSequence);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
-	// TODO recovery from illegal tokens should be improved
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(hex_numbers)
-{
-	TestScanner scanner("var x = 0x765432536763762734623472346;");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "0x765432536763762734623472346");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("0x1234");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "0x1234");
-	scanner.reset("0X1234");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-}
-
-BOOST_AUTO_TEST_CASE(octal_numbers)
-{
-	TestScanner scanner("07");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-	scanner.reset("007");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-	scanner.reset("-07");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	scanner.reset("-.07");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	scanner.reset("0");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	scanner.reset("0.1");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-}
-
-BOOST_AUTO_TEST_CASE(scientific_notation)
-{
-	CharStream stream("var x = 2e10;", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "2e10");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(leading_dot_in_identifier)
-{
-	TestScanner scanner("function .a(");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("function .a(");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(middle_dot_in_identifier)
-{
-	TestScanner scanner("function a..a(");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("function a...a(");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(trailing_dot_in_identifier)
-{
-	TestScanner scanner("function a.(");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("function a.(");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(trailing_dot_in_numbers)
-{
-	TestScanner scanner("2.5");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("2.5e10");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset(".5");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset(".5e10");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("2.");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_decimal_is_identifier)
-{
-	// Actual error is caught by SyntaxChecker.
-	CharStream stream("_1.2", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_decimal_after_dot_illegal)
-{
-	// Actual error is caught by SyntaxChecker.
-	TestScanner scanner("1._2");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-
-	scanner.reset("1._");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_exp_are_identifier)
-{
-	// Actual error is caught by SyntaxChecker.
-	CharStream stream("_1e2", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_exp_after_e_illegal)
-{
-	// Actual error is caught by SyntaxChecker.
-	CharStream stream("1e_2", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "1e_2");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_hex_illegal)
-{
-	CharStream stream("0x_abc", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(fixed_number_invalid_underscore_front)
-{
-	// Actual error is caught by SyntaxChecker.
-	CharStream stream("12._1234_1234", "");
-	Scanner scanner(stream);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(number_literals_with_trailing_underscore_at_eos)
-{
-	// Actual error is caught by SyntaxChecker.
-	TestScanner scanner("0x123_");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-
-	scanner.reset("123_");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-
-	scanner.reset("12.34_");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(negative_numbers)
-{
-	TestScanner scanner("var x = -.2 + -0x78 + -7.3 + 8.9 + 2e-2;");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), ".2");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Add);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "0x78");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Add);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "7.3");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Add);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "8.9");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Add);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "2e-2");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(locations)
-{
-	TestScanner scanner("function_identifier has ; -0x743/*comment*/\n ident //comment");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().start, 0);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().end, 19);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().start, 20);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().end, 23);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().start, 24);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().end, 25);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().start, 27);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().end, 32);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().start, 45);
-	BOOST_CHECK_EQUAL(scanner.currentLocation().end, 50);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(ambiguities)
-{
-	// test scanning of some operators which need look-ahead
-	TestScanner scanner("<=" "<" "+ +=a++ =>" "<<" ">>" " >>=" ">>>" ">>>=" " >>>>>=><<=");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LessThanOrEqual);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LessThan);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Add);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssignAdd);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Inc);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::DoubleArrow);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SHL);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SAR);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssignSar);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SHR);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssignShr);
-	// the last "monster" token combination
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SHR);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssignSar);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssignShl);
-}
-
-BOOST_AUTO_TEST_CASE(documentation_comments_parsed_begin)
-{
-	TestScanner scanner("/// Send $(value / 1000) chocolates to the user");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "Send $(value / 1000) chocolates to the user");
-}
-
-BOOST_AUTO_TEST_CASE(multiline_documentation_comments_parsed_begin)
-{
-	TestScanner scanner("/** Send $(value / 1000) chocolates to the user*/");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "Send $(value / 1000) chocolates to the user");
-}
-
-BOOST_AUTO_TEST_CASE(documentation_comments_parsed)
-{
-	TestScanner scanner("some other tokens /// Send $(value / 1000) chocolates to the user");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "Send $(value / 1000) chocolates to the user");
-}
-
-BOOST_AUTO_TEST_CASE(multiline_documentation_comments_parsed)
-{
-	TestScanner scanner("some other tokens /**\n"
-						"* Send $(value / 1000) chocolates to the user\n"
-						"*/");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), " Send $(value / 1000) chocolates to the user");
-}
-
-BOOST_AUTO_TEST_CASE(multiline_documentation_no_stars)
-{
-	TestScanner scanner("some other tokens /**\n"
-						" Send $(value / 1000) chocolates to the user\n"
-						"*/");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "Send $(value / 1000) chocolates to the user");
-}
-
-BOOST_AUTO_TEST_CASE(multiline_documentation_whitespace_hell)
-{
-	TestScanner scanner("some other tokens /** \t \r \n"
-						"\t \r  * Send $(value / 1000) chocolates to the user\n"
-						"*/");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), " Send $(value / 1000) chocolates to the user");
-}
-
-BOOST_AUTO_TEST_CASE(comment_before_eos)
-{
-	TestScanner scanner("//");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-}
-
-BOOST_AUTO_TEST_CASE(documentation_comment_before_eos)
-{
-	TestScanner scanner("///");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-}
-
-BOOST_AUTO_TEST_CASE(empty_multiline_comment)
-{
-	TestScanner scanner("/**/");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-}
-
-BOOST_AUTO_TEST_CASE(empty_multiline_documentation_comment_before_eos)
-{
-	TestScanner scanner("/***/");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::EOS);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-}
-
-BOOST_AUTO_TEST_CASE(comments_mixed_in_sequence)
-{
-	TestScanner scanner("hello_world ///documentation comment \n"
-						"//simple comment \n"
-						"<<");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SHL);
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "documentation comment ");
-}
-
-BOOST_AUTO_TEST_CASE(ether_subdenominations)
-{
-	TestScanner scanner("wei gwei ether");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::SubWei);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubGwei);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubEther);
-}
-
-BOOST_AUTO_TEST_CASE(time_subdenominations)
-{
-	TestScanner scanner("seconds minutes hours days weeks years");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::SubSecond);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubMinute);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubHour);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubDay);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubWeek);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::SubYear);
-}
-
-BOOST_AUTO_TEST_CASE(empty_comment)
-{
-	TestScanner scanner("//\ncontract{}");
-	BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Contract);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RBrace);
-
-}
-
-// Unicode string escapes
-
-BOOST_AUTO_TEST_CASE(valid_unicode_string_escape)
-{
-	TestScanner scanner("{ \"\\u00DAnicode\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("\xC3\x9Anicode", 8));
-}
-
-BOOST_AUTO_TEST_CASE(valid_unicode_string_escape_7f)
-{
-	TestScanner scanner("{ \"\\u007Fnicode\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("\x7Fnicode", 7));
-}
-
-BOOST_AUTO_TEST_CASE(valid_unicode_string_escape_7ff)
-{
-	TestScanner scanner("{ \"\\u07FFnicode\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("\xDF\xBFnicode", 8));
-}
-
-BOOST_AUTO_TEST_CASE(valid_unicode_string_escape_ffff)
-{
-	TestScanner scanner("{ \"\\uFFFFnicode\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("\xEF\xBF\xBFnicode", 9));
-}
-
-BOOST_AUTO_TEST_CASE(invalid_short_unicode_string_escape)
-{
-	TestScanner scanner("{ \"\\uFFnicode\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
-
-// Unicode string literal
-
-BOOST_AUTO_TEST_CASE(unicode_prefix_only)
-{
-	TestScanner scanner("{ unicode");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-	scanner.reset("{ unicode");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "unicode");
-}
-
-BOOST_AUTO_TEST_CASE(unicode_invalid_space)
-{
-	TestScanner scanner("{ unicode ");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-}
-
-BOOST_AUTO_TEST_CASE(unicode_invalid_token)
-{
-	TestScanner scanner("{ unicode test");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-	scanner.reset("{ unicode test");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "unicode");
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), "test");
-}
-
-BOOST_AUTO_TEST_CASE(valid_unicode_literal)
-{
-	TestScanner scanner("{ unicode\"Hello 😃\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::UnicodeStringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("Hello \xf0\x9f\x98\x83", 10));
-}
-
-BOOST_AUTO_TEST_CASE(valid_nonprintable_in_unicode_literal)
-{
-	// Non-printable characters are allowed in unicode strings...
-	TestScanner scanner("{ unicode\"Hello \007😃\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::UnicodeStringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("Hello \x07\xf0\x9f\x98\x83", 11));
-}
-
-// Hex string literal
-
-BOOST_AUTO_TEST_CASE(hex_prefix_only)
-{
-	TestScanner scanner("{ hex");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-	scanner.reset("{ hex");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-}
-
-BOOST_AUTO_TEST_CASE(hex_invalid_space)
-{
-	TestScanner scanner("{ hex ");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-}
-
-BOOST_AUTO_TEST_CASE(hex_invalid_token)
-{
-	TestScanner scanner("{ hex test");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-	scanner.reset("{ hex test");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
-}
-
-BOOST_AUTO_TEST_CASE(valid_hex_literal)
-{
-	TestScanner scanner("{ hex\"00112233FF\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::HexStringLiteral);
-	BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string("\x00\x11\x22\x33\xFF", 5));
-}
-
-BOOST_AUTO_TEST_CASE(invalid_short_hex_literal)
-{
-	TestScanner scanner("{ hex\"00112233F\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalHexString);
-}
-
-BOOST_AUTO_TEST_CASE(invalid_hex_literal_with_space)
-{
-	TestScanner scanner("{ hex\"00112233FF \"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalHexString);
-}
-
-BOOST_AUTO_TEST_CASE(invalid_hex_literal_with_wrong_quotes)
-{
-	TestScanner scanner("{ hex\"00112233FF'");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalHexString);
-}
-
-BOOST_AUTO_TEST_CASE(invalid_hex_literal_nonhex_string)
-{
-	TestScanner scanner("{ hex\"hello\"");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalHexString);
-}
-
-// Comments
-
-BOOST_AUTO_TEST_CASE(invalid_multiline_comment_close)
-{
-	// This used to parse as "comment", "identifier"
-	TestScanner scanner("/** / x");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(multiline_doc_comment_at_eos)
-{
-	// This used to parse as "whitespace"
-	TestScanner scanner("/**");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(multiline_comment_at_eos)
-{
-	TestScanner scanner("/*");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(regular_line_break_in_single_line_comment)
-{
-	for (auto const& nl: {"\r", "\n", "\r\n"})
-	{
-		TestScanner scanner("// abc " + std::string(nl) + " def ");
-		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_single_line_comment)
-{
-	for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
-	{
-		TestScanner scanner("// abc " + std::string(nl) + " def ");
-		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		for (size_t i = 0; i < std::string(nl).size() - 1; i++)
-			BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(regular_line_breaks_in_single_line_doc_comment)
-{
-	for (auto const& nl: {"\r", "\n", "\r\n"})
-	{
-		TestScanner scanner("/// abc " + std::string(nl) + " def ");
-		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "abc ");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(regular_line_breaks_in_multiline_doc_comment)
-{
-	// Test CR, LF, CRLF as line valid terminators for code comments.
-	// Any accepted non-LF is being canonicalized to LF.
-	for (auto const& nl : {"\r"s, "\n"s, "\r\n"s})
-	{
-		TestScanner scanner{"/// Hello" + nl + "/// World" + nl + "ident"};
-		auto const& lit = scanner.currentCommentLiteral();
-		BOOST_CHECK_EQUAL(lit, "Hello\n World");
-		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "Hello\n World");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "ident");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_single_line_doc_comment)
-{
-	for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
-	{
-		TestScanner scanner("/// abc " + std::string(nl) + " def ");
-		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "abc ");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		for (size_t i = 0; i < std::string(nl).size() - 1; i++)
-			BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(regular_line_breaks_in_strings)
-{
-	for (auto const& nl: {"\r"s, "\n"s, "\r\n"s})
-	{
-		TestScanner scanner("\"abc " + nl + " def\"");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_strings)
-{
-	for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
-	{
-		TestScanner scanner("\"abc " + std::string(nl) + " def\"");
-		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		for (size_t i = 0; i < std::string(nl).size(); i++)
-			BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
-		BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(solidity_keywords)
-{
-	// These are tokens which have a different meaning in Yul.
-	std::string keywords = "return byte bool address var in true false leave switch case default";
-	TestScanner scanner(keywords);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Return);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Byte);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Bool);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Address);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Var);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::In);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::TrueLiteral);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::FalseLiteral);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Switch);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Case);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Default);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset(keywords);
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::TrueLiteral);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::FalseLiteral);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Leave);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Switch);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Case);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Default);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(yul_keyword_like)
-{
-	TestScanner scanner("leave.function");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("leave.function");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(yul_identifier_with_dots)
-{
-	TestScanner scanner("mystorage.slot := 1");
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Period);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssemblyAssign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset("mystorage.slot := 1");
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::AssemblyAssign);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(yul_function)
-{
-	std::string sig = "function f(a, b) -> x, y";
-	TestScanner scanner(sig);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RightArrow);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset(sig);
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RightArrow);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(yul_function_with_whitespace)
-{
-	std::string sig = "function f (a, b) - > x, y";
-	TestScanner scanner(sig);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-	scanner.reset(sig);
-	scanner.scanner->setScannerMode(ScannerKind::Yul);
-	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/liblangutil/SourceLocation.cpp b/test/liblangutil/SourceLocation.cpp
deleted file mode 100644
index c8457dd0656e..000000000000
--- a/test/liblangutil/SourceLocation.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Yoichi Hirai <yoichi@ethereum.org>
- * @date 2016
- * Unit tests for the SourceLocation class.
- */
-
-#include <liblangutil/SourceLocation.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-namespace solidity::langutil::test
-{
-
-BOOST_AUTO_TEST_SUITE(SourceLocationTest)
-
-BOOST_AUTO_TEST_CASE(test_fail)
-{
-	auto const source = std::make_shared<std::string>("source");
-	auto const sourceA = std::make_shared<std::string>("sourceA");
-	auto const sourceB = std::make_shared<std::string>("sourceB");
-
-	BOOST_CHECK(SourceLocation{} == SourceLocation{});
-	BOOST_CHECK((SourceLocation{0, 3, sourceA} != SourceLocation{0, 3, sourceB}));
-	BOOST_CHECK((SourceLocation{0, 3, source} == SourceLocation{0, 3, source}));
-	BOOST_CHECK((SourceLocation{3, 7, source}.contains(SourceLocation{4, 6, source})));
-	BOOST_CHECK((!SourceLocation{3, 7, sourceA}.contains(SourceLocation{4, 6, sourceB})));
-	BOOST_CHECK((SourceLocation{3, 7, sourceA} < SourceLocation{4, 6, sourceB}));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/ABIDecoderTests.cpp b/test/libsolidity/ABIDecoderTests.cpp
deleted file mode 100644
index e8ffcad27eb8..000000000000
--- a/test/libsolidity/ABIDecoderTests.cpp
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for Solidity's ABI decoder.
- */
-
-#include <functional>
-#include <string>
-#include <tuple>
-#include <boost/test/unit_test.hpp>
-#include <liblangutil/Exceptions.h>
-#include <test/libsolidity/SolidityExecutionFramework.h>
-
-#include <test/libsolidity/ABITestsCommon.h>
-
-using namespace std::placeholders;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-BOOST_FIXTURE_TEST_SUITE(ABIDecoderTest, SolidityExecutionFramework)
-
-BOOST_AUTO_TEST_CASE(value_types)
-{
-	std::string sourceCode = R"(
-		contract C {
-			function f(uint a, uint16 b, uint24 c, int24 d, bytes3 x, bool e, C g) public returns (uint) {
-				if (a != 1) return 1;
-				if (b != 2) return 2;
-				if (c != 3) return 3;
-				if (d != 4) return 4;
-				if (x != "abc") return 5;
-				if (e != true) return 6;
-				if (g != this) return 7;
-				return 20;
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction(
-			"f(uint256,uint16,uint24,int24,bytes3,bool,address)",
-			1, 2, 3, 4, std::string("abc"), true, m_contractAddress
-		), encodeArgs(u256(20)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(decode_from_memory_simple)
-{
-	std::string sourceCode = R"(
-		contract C {
-			uint public _a;
-			uint[] public _b;
-			constructor(uint a, uint[] memory b) {
-				_a = a;
-				_b = b;
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode, 0, "C", encodeArgs(
-			7, 0x40,
-			// b
-			3, 0x21, 0x22, 0x23
-		));
-		ABI_CHECK(callContractFunction("_a()"), encodeArgs(7));
-		ABI_CHECK(callContractFunction("_b(uint256)", 0), encodeArgs(0x21));
-		ABI_CHECK(callContractFunction("_b(uint256)", 1), encodeArgs(0x22));
-		ABI_CHECK(callContractFunction("_b(uint256)", 2), encodeArgs(0x23));
-		ABI_CHECK(callContractFunction("_b(uint256)", 3), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_CASE(decode_function_type)
-{
-	std::string sourceCode = R"(
-		contract D {
-			function () external returns (uint) public _a;
-			constructor(function () external returns (uint) a) {
-				_a = a;
-			}
-		}
-		contract C {
-			function f() public returns (uint) {
-				return 3;
-			}
-			function g(function () external returns (uint) _f) public returns (uint) {
-				return _f();
-			}
-			// uses "decode from memory"
-			function test1() public returns (uint) {
-				D d = new D(this.f);
-				return d._a()();
-			}
-			// uses "decode from calldata"
-			function test2() public returns (uint) {
-				return this.g(this.f);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("test1()"), encodeArgs(3));
-		ABI_CHECK(callContractFunction("test2()"), encodeArgs(3));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(decode_function_type_array)
-{
-	std::string sourceCode = R"(
-		contract D {
-			function () external returns (uint)[] public _a;
-			constructor(function () external returns (uint)[] memory a) {
-				_a = a;
-			}
-		}
-		contract E {
-			function () external returns (uint)[3] public _a;
-			constructor(function () external returns (uint)[3] memory a) {
-				_a = a;
-			}
-		}
-		contract C {
-			function f1() public returns (uint) {
-				return 1;
-			}
-			function f2() public returns (uint) {
-				return 2;
-			}
-			function f3() public returns (uint) {
-				return 3;
-			}
-			function g(function () external returns (uint)[] memory _f, uint i) public returns (uint) {
-				return _f[i]();
-			}
-			function h(function () external returns (uint)[3] memory _f, uint i) public returns (uint) {
-				return _f[i]();
-			}
-			// uses "decode from memory"
-			function test1_dynamic() public returns (uint) {
-				function () external returns (uint)[] memory x = new function() external returns (uint)[](4);
-				x[0] = this.f1;
-				x[1] = this.f2;
-				x[2] = this.f3;
-				D d = new D(x);
-				return d._a(2)();
-			}
-			function test1_static() public returns (uint) {
-				E e = new E([this.f1, this.f2, this.f3]);
-				return e._a(2)();
-			}
-			// uses "decode from calldata"
-			function test2_dynamic() public returns (uint) {
-				function () external returns (uint)[] memory x = new function() external returns (uint)[](3);
-				x[0] = this.f1;
-				x[1] = this.f2;
-				x[2] = this.f3;
-				return this.g(x, 0);
-			}
-			function test2_static() public returns (uint) {
-				return this.h([this.f1, this.f2, this.f3], 0);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("test1_static()"), encodeArgs(3));
-		ABI_CHECK(callContractFunction("test1_dynamic()"), encodeArgs(3));
-		ABI_CHECK(callContractFunction("test2_static()"), encodeArgs(1));
-		ABI_CHECK(callContractFunction("test2_dynamic()"), encodeArgs(1));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(decode_from_memory_complex)
-{
-	std::string sourceCode = R"(
-		contract C {
-			uint public _a;
-			uint[] public _b;
-			bytes[2] public _c;
-			constructor(uint a, uint[] memory b, bytes[2] memory c) {
-				_a = a;
-				_b = b;
-				_c = c;
-			}
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C", encodeArgs(
-			7, 0x60, 7 * 0x20,
-			// b
-			3, 0x21, 0x22, 0x23,
-			// c
-			0x40, 0x80,
-			8, std::string("abcdefgh"),
-			52, std::string("ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")
-		));
-		ABI_CHECK(callContractFunction("_a()"), encodeArgs(7));
-		ABI_CHECK(callContractFunction("_b(uint256)", 0), encodeArgs(0x21));
-		ABI_CHECK(callContractFunction("_b(uint256)", 1), encodeArgs(0x22));
-		ABI_CHECK(callContractFunction("_b(uint256)", 2), encodeArgs(0x23));
-		ABI_CHECK(callContractFunction("_b(uint256)", 3), encodeArgs());
-		ABI_CHECK(callContractFunction("_c(uint256)", 0), encodeArgs(0x20, 8, std::string("abcdefgh")));
-		ABI_CHECK(callContractFunction("_c(uint256)", 1), encodeArgs(0x20, 52, std::string("ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")));
-		ABI_CHECK(callContractFunction("_c(uint256)", 2), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_CASE(short_input_value_type)
-{
-	std::string sourceCode = R"(
-		contract C {
-			function f(uint a, uint b) public pure returns (uint) { return a; }
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction("f(uint256,uint256)", 1, 2), encodeArgs(1));
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256,uint256)", bytes(64, 0)), encodeArgs(0));
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256,uint256)", bytes(63, 0)), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_CASE(short_input_array)
-{
-	std::string sourceCode = R"(
-		contract C {
-			function f(uint[] memory a) public pure returns (uint) { return 7; }
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256[])", encodeArgs(0x20, 0)), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256[])", encodeArgs(0x20, 1)), encodeArgs());
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256[])", encodeArgs(0x20, 1) + bytes(31, 0)), encodeArgs());
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256[])", encodeArgs(0x20, 1) + bytes(32, 0)), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("f(uint256[])", encodeArgs(0x20, 2, 5, 6)), encodeArgs(7));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(short_dynamic_input_array)
-{
-	std::string sourceCode = R"(
-		contract C {
-			function f(bytes[1] memory a) public pure returns (uint) { return 7; }
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunctionNoEncoding("f(bytes[1])", encodeArgs(0x20)), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_CASE(short_input_bytes)
-{
-	std::string sourceCode = R"(
-		contract C {
-			function e(bytes memory a) public pure returns (uint) { return 7; }
-			function f(bytes[] memory a) public pure returns (uint) { return 7; }
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunctionNoEncoding("e(bytes)", encodeArgs(0x20, 7) + bytes(5, 0)), encodeArgs());
-		ABI_CHECK(callContractFunctionNoEncoding("e(bytes)", encodeArgs(0x20, 7) + bytes(6, 0)), encodeArgs());
-		ABI_CHECK(callContractFunctionNoEncoding("e(bytes)", encodeArgs(0x20, 7) + bytes(7, 0)), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("e(bytes)", encodeArgs(0x20, 7) + bytes(8, 0)), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("f(bytes[])", encodeArgs(0x20, 1, 0x20, 7) + bytes(5, 0)), encodeArgs());
-		ABI_CHECK(callContractFunctionNoEncoding("f(bytes[])", encodeArgs(0x20, 1, 0x20, 7) + bytes(6, 0)), encodeArgs());
-		ABI_CHECK(callContractFunctionNoEncoding("f(bytes[])", encodeArgs(0x20, 1, 0x20, 7) + bytes(7, 0)), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("f(bytes[])", encodeArgs(0x20, 1, 0x20, 7) + bytes(8, 0)), encodeArgs(7));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(validation_int_inside_arrays)
-{
-	std::string sourceCode = R"(
-		contract C {
-			enum E { A, B }
-			function f(uint16[] memory a) public pure returns (uint r) { assembly { r := mload(add(a, 0x20)) } }
-			function g(int16[] memory a) public pure returns (uint r) { assembly { r := mload(add(a, 0x20)) } }
-			function h(E[] memory a) public pure returns (uint r) { assembly { r := mload(add(a, 0x20)) } }
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, 7), encodeArgs(7));
-		ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, 7), encodeArgs(7));
-		ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, u256("0xffff")), encodeArgs(u256("0xffff")));
-		ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, u256("0xffff")), encodeArgs());
-		ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, u256("0x1ffff")), encodeArgs());
-		ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, u256("0x10fff")), encodeArgs());
-		ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 0), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 1), encodeArgs(u256(1)));
-		ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 2), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_CASE(validation_function_type)
-{
-	std::string sourceCode = R"(
-		contract C {
-			function f(function () external) public pure returns (uint r) { r = 1; }
-			function g(function () external[] memory) public pure returns (uint r) { r = 2; }
-			function h(function () external[] calldata) external pure returns (uint r) { r = 3; }
-			function i(function () external[] calldata a) external pure returns (uint r) { a[0]; r = 4; }
-		}
-	)";
-	bool newDecoder = false;
-	std::string validFun{"01234567890123456789abcd"};
-	std::string invalidFun{"01234567890123456789abcdX"};
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction("f(function)", validFun), encodeArgs(1));
-		ABI_CHECK(callContractFunction("f(function)", invalidFun), newDecoder ? bytes{} : encodeArgs(1));
-		ABI_CHECK(callContractFunction("g(function[])", 0x20, 1, validFun), encodeArgs(2));
-		ABI_CHECK(callContractFunction("g(function[])", 0x20, 1, invalidFun), newDecoder ? bytes{} : encodeArgs(2));
-		ABI_CHECK(callContractFunction("h(function[])", 0x20, 1, validFun), encodeArgs(3));
-		// No failure because the data is not accessed.
-		ABI_CHECK(callContractFunction("h(function[])", 0x20, 1, invalidFun), encodeArgs(3));
-		ABI_CHECK(callContractFunction("i(function[])", 0x20, 1, validFun), encodeArgs(4));
-		ABI_CHECK(callContractFunction("i(function[])", 0x20, 1, invalidFun), newDecoder ? bytes{} : encodeArgs(4));
-		newDecoder = true;
-	)
-}
-
-BOOST_AUTO_TEST_CASE(struct_short)
-{
-	std::string sourceCode = R"(
-		contract C {
-			struct S { int a; uint b; bytes16 c; }
-			function f(S memory s) public pure returns (S memory q) {
-				q = s;
-			}
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(
-			callContractFunction("f((int256,uint256,bytes16))", 0xff010, 0xff0002, "abcd"),
-			encodeArgs(0xff010, 0xff0002, "abcd")
-		);
-		ABI_CHECK(
-			callContractFunctionNoEncoding("f((int256,uint256,bytes16))", encodeArgs(0xff010, 0xff0002) + bytes(32, 0)),
-			encodeArgs(0xff010, 0xff0002, 0)
-		);
-		ABI_CHECK(
-			callContractFunctionNoEncoding("f((int256,uint256,bytes16))", encodeArgs(0xff010, 0xff0002) + bytes(31, 0)),
-			encodeArgs()
-		);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(complex_struct)
-{
-	std::string sourceCode = R"(
-		contract C {
-			enum E {A, B, C}
-			struct T { uint x; E e; uint8 y; }
-			struct S { C c; T[] t;}
-			function f(uint a, S[2] memory s1, S[] memory s2, uint b) public returns
-					(uint r1, C r2, uint r3, uint r4, C r5, uint r6, E r7, uint8 r8) {
-				r1 = a;
-				r2 = s1[0].c;
-				r3 = b;
-				r4 = s2.length;
-				r5 = s2[1].c;
-				r6 = s2[1].t.length;
-				r7 = s2[1].t[1].e;
-				r8 = s2[1].t[1].y;
-			}
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C");
-		std::string sig = "f(uint256,(address,(uint256,uint8,uint8)[])[2],(address,(uint256,uint8,uint8)[])[],uint256)";
-		bytes args = encodeArgs(
-			7, 0x80, 0x1e0, 8,
-			// S[2] s1
-			0x40,
-			0x100,
-			// S s1[0]
-			m_contractAddress,
-			0x40,
-			// T s1[0].t
-			1, // length
-			// s1[0].t[0]
-			0x11, 1, 0x12,
-			// S s1[1]
-			0, 0x40,
-			// T s1[1].t
-			0,
-			// S[] s2 (0x1e0)
-			2, // length
-			0x40, 0xa0,
-			// S s2[0]
-			0, 0x40, 0,
-			// S s2[1]
-			0x1234, 0x40,
-			// s2[1].t
-			3, // length
-			0, 0, 0,
-			0x21, 2, 0x22,
-			0, 0, 0
-		);
-		ABI_CHECK(callContractFunction(sig, args), encodeArgs(7, m_contractAddress, 8, 2, 0x1234, 3, 2, 0x22));
-		// invalid enum value
-		args.data()[0x20 * 28] = 3;
-		ABI_CHECK(callContractFunction(sig, args), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/ABIEncoderTests.cpp b/test/libsolidity/ABIEncoderTests.cpp
deleted file mode 100644
index a56d9e5c75dc..000000000000
--- a/test/libsolidity/ABIEncoderTests.cpp
+++ /dev/null
@@ -1,788 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for Solidity's ABI encoder.
- */
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-
-#include <test/libsolidity/ABITestsCommon.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <functional>
-#include <string>
-#include <tuple>
-
-using namespace std::placeholders;
-using namespace solidity::util;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-#define REQUIRE_LOG_DATA(DATA) do { \
-	BOOST_REQUIRE_EQUAL(numLogs(), 1); \
-	BOOST_CHECK_EQUAL(logAddress(0), m_contractAddress); \
-	ABI_CHECK(logData(0), DATA); \
-} while (false)
-
-BOOST_FIXTURE_TEST_SUITE(ABIEncoderTest, SolidityExecutionFramework)
-
-BOOST_AUTO_TEST_CASE(value_types)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(uint a, uint16 b, uint24 c, int24 d, bytes3 x, bool, C);
-			function f() public {
-				bytes6 x = hex"1bababababa2";
-				bool b;
-				assembly { b := 7 }
-				C c;
-				assembly { c := sub(0, 5) }
-				emit E(10, uint16(type(uint).max - 1), uint24(uint(0x12121212)), int24(int256(-1)), bytes3(x), b, c);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			10, u256(65534), u256(0x121212), u256(-1), std::string("\x1b\xab\xab"), true, h160("fffffffffffffffffffffffffffffffffffffffb")
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(string_literal)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(string, bytes20, string);
-			function f() public {
-				emit E("abcdef", "abcde", "abcdefabcdefgehabcabcasdfjklabcdefabcedefghabcabcasdfjklabcdefabcdefghabcabcasdfjklabcdeefabcdefghabcabcasdefjklabcdefabcdefghabcabcasdfjkl");
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			0x60, std::string("abcde"), 0xa0,
-			6, std::string("abcdef"),
-			0x8b, std::string("abcdefabcdefgehabcabcasdfjklabcdefabcedefghabcabcasdfjklabcdefabcdefghabcabcasdfjklabcdeefabcdefghabcabcasdefjklabcdefabcdefghabcabcasdfjkl")
-		));
-	)
-}
-
-
-BOOST_AUTO_TEST_CASE(enum_type_cleanup)
-{
-	std::string sourceCode = R"(
-		contract C {
-			enum E { A, B }
-			function f(uint x) public returns (E en) {
-				assembly { en := x }
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		BOOST_CHECK(callContractFunction("f(uint256)", 0) == encodeArgs(0));
-		BOOST_CHECK(callContractFunction("f(uint256)", 1) == encodeArgs(1));
-		BOOST_CHECK(callContractFunction("f(uint256)", 2) == panicData(PanicCode::EnumConversionError));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(conversion)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(bytes4, bytes4, uint16, uint8, int16, int8);
-			function f() public {
-				bytes2 x; assembly { x := 0xf1f2f3f400000000000000000000000000000000000000000000000000000000 }
-				uint8 a;
-				uint16 b = 0x1ff;
-				int8 c;
-				int16 d;
-				assembly { a := sub(0, 1) c := 0x0101ff d := 0xff01 }
-				emit E(bytes4(uint32(10)), x, a, uint8(b), c, int8(d));
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			std::string(3, 0) + std::string("\x0a"), std::string("\xf1\xf2"),
-			0xff, 0xff, u256(-1), u256(1)
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(memory_array_one_dim)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(uint a, int16[] b, uint c);
-			function f() public {
-				int16[] memory x = new int16[](3);
-				assembly {
-					for { let i := 0 } lt(i, 3) { i := add(i, 1) } {
-						mstore(add(x, mul(add(i, 1), 0x20)), add(0xfffffffe, i))
-					}
-				}
-				emit E(10, x, 11);
-			}
-		}
-	)";
-
-	if (solidity::test::CommonOptions::get().useABIEncoderV1)
-	{
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		// The old encoder does not clean array elements.
-		REQUIRE_LOG_DATA(encodeArgs(10, 0x60, 11, 3, u256("0xfffffffe"), u256("0xffffffff"), u256("0x100000000")));
-	}
-
-	NEW_ENCODER(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(10, 0x60, 11, 3, u256(-2), u256(-1), u256(0)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(memory_array_two_dim)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(uint a, int16[][2] b, uint c);
-			function f() public {
-				int16[][2] memory x;
-				x[0] = new int16[](3);
-				x[1] = new int16[](2);
-				x[0][0] = 7;
-				x[0][1] = int16(int(0x010203040506));
-				x[0][2] = -1;
-				x[1][0] = 4;
-				x[1][1] = 5;
-				emit E(10, x, 11);
-			}
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(10, 0x60, 11, 0x40, 0xc0, 3, 7, 0x0506, u256(-1), 2, 4, 5));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(memory_byte_array)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(uint a, bytes[] b, uint c);
-			function f() public {
-				bytes[] memory x = new bytes[](2);
-				x[0] = "abcabcdefghjklmnopqrsuvwabcdefgijklmnopqrstuwabcdefgijklmnoprstuvw";
-				x[1] = "abcdefghijklmnopqrtuvwabcfghijklmnopqstuvwabcdeghijklmopqrstuvw";
-				emit E(10, x, 11);
-			}
-		}
-	)";
-	NEW_ENCODER(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			10, 0x60, 11,
-			2, 0x40, 0xc0,
-			66, std::string("abcabcdefghjklmnopqrsuvwabcdefgijklmnopqrstuwabcdefgijklmnoprstuvw"),
-			63, std::string("abcdefghijklmnopqrtuvwabcfghijklmnopqstuvwabcdeghijklmopqrstuvw")
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(storage_byte_array)
-{
-	std::string sourceCode = R"(
-		contract C {
-			bytes short;
-			bytes long;
-			event E(bytes s, bytes l);
-			function f() public {
-				short = "123456789012345678901234567890a";
-				long = "ffff123456789012345678901234567890afffffffff123456789012345678901234567890a";
-				emit E(short, long);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			0x40, 0x80,
-			31, std::string("123456789012345678901234567890a"),
-			75, std::string("ffff123456789012345678901234567890afffffffff123456789012345678901234567890a")
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(storage_array)
-{
-	std::string sourceCode = R"(
-		contract C {
-			address[3] addr;
-			event E(address[3] a);
-			function f() public {
-				assembly {
-					sstore(0, sub(0, 1))
-					sstore(1, sub(0, 2))
-					sstore(2, sub(0, 3))
-				}
-				emit E(addr);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			h160("ffffffffffffffffffffffffffffffffffffffff"),
-			h160("fffffffffffffffffffffffffffffffffffffffe"),
-			h160("fffffffffffffffffffffffffffffffffffffffd")
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(storage_array_dyn)
-{
-	std::string sourceCode = R"(
-		contract C {
-			address[] addr;
-			event E(address[] a);
-			function f() public {
-				addr.push(0x0000000000000000000000000000000000000001);
-				addr.push(0x0000000000000000000000000000000000000002);
-				addr.push(0x0000000000000000000000000000000000000003);
-				emit E(addr);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			0x20,
-			3,
-			h160("0000000000000000000000000000000000000001"),
-			h160("0000000000000000000000000000000000000002"),
-			h160("0000000000000000000000000000000000000003")
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(storage_array_compact)
-{
-	std::string sourceCode = R"(
-		contract C {
-			int72[] x;
-			event E(int72[]);
-			function f() public {
-				x.push(-1);
-				x.push(2);
-				x.push(-3);
-				x.push(4);
-				x.push(-5);
-				x.push(6);
-				x.push(-7);
-				x.push(8);
-				emit E(x);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f()");
-		REQUIRE_LOG_DATA(encodeArgs(
-			0x20, 8, u256(-1), 2, u256(-3), 4, u256(-5), 6, u256(-7), 8
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(external_function)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(function(uint) external returns (uint), function(uint) external returns (uint));
-			function(uint) external returns (uint) g;
-			function f(uint) public returns (uint) {
-				g = this.f;
-				emit E(this.f, g);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f(uint256)", u256(0));
-		std::string functionIdF = asString(m_contractAddress.ref()) + asString(util::selectorFromSignatureH32("f(uint256)").ref());
-		REQUIRE_LOG_DATA(encodeArgs(functionIdF, functionIdF));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(external_function_cleanup)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(function(uint) external returns (uint), function(uint) external returns (uint));
-			// This test relies on the fact that g is stored in slot zero.
-			function(uint) external returns (uint) g;
-			function f(uint) public returns (uint) {
-				function(uint) external returns (uint)[1] memory h;
-				assembly { sstore(0, sub(0, 1)) mstore(h, sub(0, 1)) }
-				emit E(h[0], g);
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f(uint256)", u256(0));
-		REQUIRE_LOG_DATA(encodeArgs(std::string(24, char(-1)), std::string(24, char(-1))));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(calldata)
-{
-	std::string sourceCode = R"(
-		contract C {
-			event E(bytes);
-			function f(bytes calldata a) external {
-				emit E(a);
-			}
-		}
-	)";
-	std::string s("abcdef");
-	std::string t("abcdefgggggggggggggggggggggggggggggggggggggggghhheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeggg");
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		callContractFunction("f(bytes)", 0x20, s.size(), s);
-		REQUIRE_LOG_DATA(encodeArgs(0x20, s.size(), s));
-		callContractFunction("f(bytes)", 0x20, t.size(), t);
-		REQUIRE_LOG_DATA(encodeArgs(0x20, t.size(), t));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(function_name_collision)
-{
-	// This tests a collision between a function name used by inline assembly
-	// and by the ABI encoder
-	std::string sourceCode = R"(
-		contract C {
-			function f(uint x) public returns (uint) {
-				assembly {
-					function abi_encode_t_uint256_to_t_uint256() {
-						mstore(0, 7)
-						return(0, 0x20)
-					}
-					switch x
-					case 0 { abi_encode_t_uint256_to_t_uint256() }
-				}
-				return 1;
-			}
-		}
-	)";
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode);
-		BOOST_CHECK(callContractFunction("f(uint256)", encodeArgs(0)) == encodeArgs(7));
-		BOOST_CHECK(callContractFunction("f(uint256)", encodeArgs(1)) == encodeArgs(1));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(structs)
-{
-	std::string sourceCode = R"(
-		contract C {
-			struct S { uint16 a; uint16 b; T[] sub; uint16 c; }
-			struct T { uint64[2] x; }
-			S s;
-			event e(uint16, S);
-			function f() public returns (uint, S memory) {
-				uint16 x = 7;
-				s.a = 8;
-				s.b = 9;
-				s.c = 10;
-				s.sub.push();
-				s.sub.push();
-				s.sub.push();
-				s.sub[0].x[0] = 11;
-				s.sub[1].x[0] = 12;
-				s.sub[2].x[1] = 13;
-				emit e(x, s);
-				return (x, s);
-			}
-		}
-	)";
-
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C");
-		bytes encoded = encodeArgs(
-			u256(7), 0x40,
-			8, 9, 0x80, 10,
-			3,
-			11, 0,
-			12, 0,
-			0, 13
-		);
-		BOOST_CHECK(callContractFunction("f()") == encoded);
-		REQUIRE_LOG_DATA(encoded);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), keccak256(std::string("e(uint16,(uint16,uint16,(uint64[2])[],uint16))")));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(structs2)
-{
-	std::string sourceCode = R"(
-		contract C {
-			enum E {A, B, C}
-			struct T { uint x; E e; uint8 y; }
-			struct S { C c; T[] t;}
-			function f() public returns (uint a, S[2] memory s1, S[] memory s2, uint b) {
-				a = 7;
-				b = 8;
-				s1[0].c = this;
-				s1[0].t = new T[](1);
-				s1[0].t[0].x = 0x11;
-				s1[0].t[0].e = E.B;
-				s1[0].t[0].y = 0x12;
-				s2 = new S[](2);
-				s2[1].c = C(address(0x1234));
-				s2[1].t = new T[](3);
-				s2[1].t[1].x = 0x21;
-				s2[1].t[1].e = E.C;
-				s2[1].t[1].y = 0x22;
-			}
-		}
-	)";
-
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(
-			7, 0x80, 0x1e0, 8,
-			// S[2] s1
-			0x40,
-			0x100,
-			// S s1[0]
-			m_contractAddress,
-			0x40,
-			// T s1[0].t
-			1, // length
-			// s1[0].t[0]
-			0x11, 1, 0x12,
-			// S s1[1]
-			0, 0x40,
-			// T s1[1].t
-			0,
-			// S[] s2 (0x1e0)
-			2, // length
-			0x40, 0xa0,
-			// S s2[0]
-			0, 0x40, 0,
-			// S s2[1]
-			0x1234, 0x40,
-			// s2[1].t
-			3, // length
-			0, 0, 0,
-			0x21, 2, 0x22,
-			0, 0, 0
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bool_arrays)
-{
-	std::string sourceCode = R"(
-		contract C {
-			bool[] x;
-			bool[4] y;
-			event E(bool[], bool[4]);
-			function f() public returns (bool[] memory, bool[4] memory) {
-				x.push(true);
-				x.push(false);
-				x.push(true);
-				x.push(false);
-				y[0] = true;
-				y[1] = false;
-				y[2] = true;
-				y[3] = false;
-				emit E(x, y);
-				return (x, y); // this copies to memory first
-			}
-		}
-	)";
-
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode, 0, "C");
-		bytes encoded = encodeArgs(
-			0xa0, 1, 0, 1, 0,
-			4, 1, 0, 1, 0
-		);
-		ABI_CHECK(callContractFunction("f()"), encoded);
-		REQUIRE_LOG_DATA(encoded);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bool_arrays_split)
-{
-	std::string sourceCode = R"(
-		contract C {
-			bool[] x;
-			bool[4] y;
-			event E(bool[], bool[4]);
-			function store() public {
-				x.push(true);
-				x.push(false);
-				x.push(true);
-				x.push(false);
-				y[0] = true;
-				y[1] = false;
-				y[2] = true;
-				y[3] = false;
-			}
-			function f() public returns (bool[] memory, bool[4] memory) {
-				emit E(x, y);
-				return (x, y); // this copies to memory first
-			}
-		}
-	)";
-
-	BOTH_ENCODERS(
-		compileAndRun(sourceCode, 0, "C");
-		bytes encoded = encodeArgs(
-			0xa0, 1, 0, 1, 0,
-			4, 1, 0, 1, 0
-		);
-		ABI_CHECK(callContractFunction("store()"), bytes{});
-		ABI_CHECK(callContractFunction("f()"), encoded);
-		REQUIRE_LOG_DATA(encoded);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bytesNN_arrays)
-{
-	// This tests that encoding packed arrays from storage work correctly.
-	std::string sourceCode = R"(
-		contract C {
-			bytes8[] x;
-			bytesWIDTH[SIZE] y;
-			event E(bytes8[], bytesWIDTH[SIZE]);
-			function store() public {
-				x.push("abc");
-				x.push("def");
-				for (uint i = 0; i < y.length; i ++)
-					y[i] = bytesWIDTH(uintUINTWIDTH(i + 1));
-			}
-			function f() public returns (bytes8[] memory, bytesWIDTH[SIZE] memory) {
-				emit E(x, y);
-				return (x, y); // this copies to memory first
-			}
-		}
-	)";
-
-	BOTH_ENCODERS(
-		for (size_t size = 1; size < 15; size++)
-		{
-			for (size_t width: {1u, 2u, 4u, 5u, 7u, 15u, 16u, 17u, 31u, 32u})
-			{
-				std::string source = boost::algorithm::replace_all_copy(sourceCode, "SIZE", std::to_string(size));
-				source = boost::algorithm::replace_all_copy(source, "UINTWIDTH", std::to_string(width * 8));
-				source = boost::algorithm::replace_all_copy(source, "WIDTH", std::to_string(width));
-				compileAndRun(source, 0, "C");
-				ABI_CHECK(callContractFunction("store()"), bytes{});
-				std::vector<u256> arr;
-				for (size_t i = 0; i < size; i ++)
-					arr.emplace_back(u256(i + 1) << (8 * (32 - width)));
-				bytes encoded = encodeArgs(
-					0x20 * (1 + size), arr,
-					2, "abc", "def"
-				);
-				ABI_CHECK(callContractFunction("f()"), encoded);
-				REQUIRE_LOG_DATA(encoded);
-			}
-		}
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bytesNN_arrays_dyn)
-{
-	// This tests that encoding packed arrays from storage work correctly.
-	std::string sourceCode = R"(
-		contract C {
-			bytes8[] x;
-			bytesWIDTH[] y;
-			event E(bytesWIDTH[], bytes8[]);
-			function store() public {
-				x.push("abc");
-				x.push("def");
-				for (uint i = 0; i < SIZE; i ++)
-					y.push(bytesWIDTH(uintUINTWIDTH(i + 1)));
-			}
-			function f() public returns (bytesWIDTH[] memory, bytes8[] memory) {
-				emit E(y, x);
-				return (y, x); // this copies to memory first
-			}
-		}
-	)";
-
-	BOTH_ENCODERS(
-		for (size_t size = 0; size < 15; size++)
-		{
-			for (size_t width: {1u, 2u, 4u, 5u, 7u, 15u, 16u, 17u, 31u, 32u})
-			{
-				std::string source = boost::algorithm::replace_all_copy(sourceCode, "SIZE", std::to_string(size));
-				source = boost::algorithm::replace_all_copy(source, "UINTWIDTH", std::to_string(width * 8));
-				source = boost::algorithm::replace_all_copy(source, "WIDTH", std::to_string(width));
-				compileAndRun(source, 0, "C");
-				ABI_CHECK(callContractFunction("store()"), bytes{});
-				std::vector<u256> arr;
-				for (size_t i = 0; i < size; i ++)
-					arr.emplace_back(u256(i + 1) << (8 * (32 - width)));
-				bytes encoded = encodeArgs(
-					0x20 * 2, 0x20 * (3 + size),
-					size, arr,
-					2, "abc", "def"
-				);
-				ABI_CHECK(callContractFunction("f()"), encoded);
-				REQUIRE_LOG_DATA(encoded);
-			}
-		}
-	)
-}
-
-BOOST_AUTO_TEST_CASE(packed_structs)
-{
-	std::string sourceCode = R"(
-		contract C {
-			struct S { bool a; int8 b; function() external g; bytes3 d; int8 e; }
-			S s;
-			event E(S);
-			function store() public {
-				s.a = false;
-				s.b = -5;
-				s.g = this.g;
-				s.d = 0x010203;
-				s.e = -3;
-			}
-			function f() public returns (S memory) {
-				emit E(s);
-				return s; // this copies to memory first
-			}
-			function g() public pure {}
-		}
-	)";
-
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("store()"), bytes{});
-		bytes fun = m_contractAddress.asBytes() + fromHex("0xe2179b8e");
-		bytes encoded = encodeArgs(
-			0, u256(-5), asString(fun), "\x01\x02\x03", u256(-3)
-		);
-		ABI_CHECK(callContractFunction("f()"), encoded);
-		REQUIRE_LOG_DATA(encoded);
-	)
-}
-
-
-BOOST_AUTO_TEST_CASE(struct_in_constructor)
-{
-	std::string sourceCode = R"(
-		contract C {
-			struct S {
-				string a;
-				uint8 b;
-				string c;
-			}
-			S public x;
-			constructor(S memory s) { x = s; }
-		}
-	)";
-
-	NEW_ENCODER(
-		compileAndRun(sourceCode, 0, "C", encodeArgs(0x20, 0x60, 0x03, 0x80, 0x00, 0x00));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(0x60, 0x03, 0x80, 0x00, 0x00));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(struct_in_constructor_indirect)
-{
-	std::string sourceCode = R"(
-		contract C {
-			struct S {
-				string a;
-				uint8 b;
-				string c;
-			}
-			S public x;
-			constructor(S memory s) { x = s; }
-		}
-
-		contract D {
-			function f() public returns (string memory, uint8, string memory) {
-				C.S memory s;
-				s.a = "abc";
-				s.b = 7;
-				s.c = "def";
-				C c = new C(s);
-				return c.x();
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		NEW_ENCODER(
-			compileAndRun(sourceCode, 0, "D");
-			ABI_CHECK(callContractFunction("f()"), encodeArgs(0x60, 7, 0xa0, 3, "abc", 3, "def"));
-		)
-	}
-}
-
-BOOST_AUTO_TEST_CASE(struct_in_constructor_data_short)
-{
-	std::string sourceCode = R"(
-		contract C {
-			struct S {
-				string a;
-				uint8 b;
-				string c;
-			}
-			S public x;
-			constructor(S memory s) { x = s; }
-		}
-	)";
-
-	NEW_ENCODER(
-		BOOST_CHECK(
-			compileAndRunWithoutCheck({{"", sourceCode}}, 0, "C", encodeArgs(0x20, 0x60, 0x03, 0x80, 0x00)).empty()
-		);
-	)
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/ABIJson/basic_test.sol b/test/libsolidity/ABIJson/basic_test.sol
deleted file mode 100644
index 37c833bcfa29..000000000000
--- a/test/libsolidity/ABIJson/basic_test.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract test {
-	function f(uint a) public returns (uint d) { return a * 7; }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/constructor_abi.sol b/test/libsolidity/ABIJson/constructor_abi.sol
deleted file mode 100644
index ae07c9401138..000000000000
--- a/test/libsolidity/ABIJson/constructor_abi.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract test {
-    constructor(uint param1, test param2, bool param3) {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "param1",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "contract test",
-//         "name": "param2",
-//         "type": "address"
-//       },
-//       {
-//         "internalType": "bool",
-//         "name": "param3",
-//         "type": "bool"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "constructor"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/empty_contract.sol b/test/libsolidity/ABIJson/empty_contract.sol
deleted file mode 100644
index 4e3951f68ef5..000000000000
--- a/test/libsolidity/ABIJson/empty_contract.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test { }
-// ----
-//     :test
-// []
diff --git a/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol b/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol
deleted file mode 100644
index d412e755acff..000000000000
--- a/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract test {
-    function f(uint, uint k) public returns (uint ret_k, uint ret_g) {
-        uint g = 8;
-        ret_k = k;
-        ret_g = g;
-    }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "uint256",
-//         "name": "k",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "ret_k",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "uint256",
-//         "name": "ret_g",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/empty_name_return_parameters.sol b/test/libsolidity/ABIJson/empty_name_return_parameters.sol
deleted file mode 100644
index 1415276fdce9..000000000000
--- a/test/libsolidity/ABIJson/empty_name_return_parameters.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract test {
-    function f(uint k) public returns (uint) {
-        return k;
-    }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "k",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/errors.sol b/test/libsolidity/ABIJson/errors.sol
deleted file mode 100644
index 91c76ce6f44b..000000000000
--- a/test/libsolidity/ABIJson/errors.sol
+++ /dev/null
@@ -1,93 +0,0 @@
-error FreeError();
-contract X {
-    error E(uint);
-    error E2(uint a, uint b);
-    error E4(uint a, bytes[][] c);
-    struct S { uint x; }
-    error E5(S t);
-    function f() public pure {
-        revert FreeError();
-    }
-}
-// ----
-//     :X
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "E",
-//     "type": "error"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "E2",
-//     "type": "error"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "bytes[][]",
-//         "name": "c",
-//         "type": "bytes[][]"
-//       }
-//     ],
-//     "name": "E4",
-//     "type": "error"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256",
-//             "name": "x",
-//             "type": "uint256"
-//           }
-//         ],
-//         "internalType": "struct X.S",
-//         "name": "t",
-//         "type": "tuple"
-//       }
-//     ],
-//     "name": "E5",
-//     "type": "error"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "FreeError",
-//     "type": "error"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "pure",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/errors_referenced.sol b/test/libsolidity/ABIJson/errors_referenced.sol
deleted file mode 100644
index ecb5b1003e2a..000000000000
--- a/test/libsolidity/ABIJson/errors_referenced.sol
+++ /dev/null
@@ -1,94 +0,0 @@
-error E1();
-function f() {
-    revert E1();
-}
-contract C {
-    // unreferenced but inherited
-    error E2();
-}
-contract D {
-    // referenced
-    error E3(uint);
-}
-contract X is C {
-    // unreferenced but defined
-    error E3();
-    function g(uint x) public {
-        if (x == 0)
-            f();
-        else if (x == 2)
-            revert D.E3(1);
-    }
-}
-// ----
-//     :C
-// [
-//   {
-//     "inputs": [],
-//     "name": "E2",
-//     "type": "error"
-//   }
-// ]
-//
-//
-//     :D
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "E3",
-//     "type": "error"
-//   }
-// ]
-//
-//
-//     :X
-// [
-//   {
-//     "inputs": [],
-//     "name": "E1",
-//     "type": "error"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "E2",
-//     "type": "error"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "E3",
-//     "type": "error"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "E3",
-//     "type": "error"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "x",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "g",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/event_emited_in_base_contract.sol b/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
deleted file mode 100644
index f9c3d2019cbe..000000000000
--- a/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
+++ /dev/null
@@ -1,71 +0,0 @@
-library   L { event E(uint8); }
-
-contract B {
-    constructor() {
-        emit L.E(0);
-    }
-}
-
-contract C is B {}
-
-// ----
-//     :B
-// [
-//   {
-//     "inputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "constructor"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint8",
-//         "name": "",
-//         "type": "uint8"
-//       }
-//     ],
-//     "name": "E",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :C
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint8",
-//         "name": "",
-//         "type": "uint8"
-//       }
-//     ],
-//     "name": "E",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :L
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint8",
-//         "name": "",
-//         "type": "uint8"
-//       }
-//     ],
-//     "name": "E",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol b/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
deleted file mode 100644
index 30c115669752..000000000000
--- a/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
+++ /dev/null
@@ -1,112 +0,0 @@
-interface I {
-    event Event(uint256 value);
-}
-contract C {
-    event Event(address indexed sender);
-}
-contract D {
-    event Event(address indexed sender);
-    function test(address sender) public {
-        emit I.Event(1);
-        emit C.Event(msg.sender);
-        emit Event(msg.sender);
-    }
-}
-// ----
-//     :C
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": true,
-//         "internalType": "address",
-//         "name": "sender",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :D
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "value",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": true,
-//         "internalType": "address",
-//         "name": "sender",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": true,
-//         "internalType": "address",
-//         "name": "sender",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "address",
-//         "name": "sender",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "test",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
-//
-//
-//     :I
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "value",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/event_file_level.sol b/test/libsolidity/ABIJson/event_file_level.sol
deleted file mode 100644
index 5b5c39a82c68..000000000000
--- a/test/libsolidity/ABIJson/event_file_level.sol
+++ /dev/null
@@ -1,107 +0,0 @@
-event Event();
-event Event(uint);
-
-event UnusedEvent();
-
-function f() {
-    emit Event();
-}
-
-contract C {
-    function c_main() public {
-        emit Event(42);
-        f();
-    }
-}
-
-contract D is C {
-    event Event(string);
-
-    function d_main() public {
-        emit Event("abc");
-    }
-}
-// ----
-//     :C
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "c_main",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
-//
-//
-//     :D
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "string",
-//         "name": "",
-//         "type": "string"
-//       }
-//     ],
-//     "name": "Event",
-//     "type": "event"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "c_main",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "d_main",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol b/test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol
deleted file mode 100644
index 6a930589d542..000000000000
--- a/test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract C {
-    event e();
-    function f() public {
-        emit e();
-    }
-}
-
-contract D {
-    C c;
-    constructor() {
-        c = new C();
-        c.f();
-    }
-}
-
-// ----
-//     :C
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
-//
-//
-//     :D
-// [
-//   {
-//     "inputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "constructor"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/event_inheritance.sol b/test/libsolidity/ABIJson/event_inheritance.sol
deleted file mode 100644
index e4a8aeea4e0a..000000000000
--- a/test/libsolidity/ABIJson/event_inheritance.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-interface B {
-    event EB();
-}
-
-contract C is B {
-    event EC();
-}
-
-contract D is C {
-    event ED();
-}
-
-// ----
-//     :B
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "EB",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :C
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "EB",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "EC",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :D
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "EB",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "EC",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "ED",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/event_structs.sol b/test/libsolidity/ABIJson/event_structs.sol
deleted file mode 100644
index 83431907a7dd..000000000000
--- a/test/libsolidity/ABIJson/event_structs.sol
+++ /dev/null
@@ -1,64 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { uint a; T[] sub; bytes b; }
-    struct T { uint[2] x; }
-    event E(T t, S s);
-}
-// ----
-//     :C
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256[2]",
-//             "name": "x",
-//             "type": "uint256[2]"
-//           }
-//         ],
-//         "indexed": false,
-//         "internalType": "struct C.T",
-//         "name": "t",
-//         "type": "tuple"
-//       },
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256",
-//             "name": "a",
-//             "type": "uint256"
-//           },
-//           {
-//             "components":
-//             [
-//               {
-//                 "internalType": "uint256[2]",
-//                 "name": "x",
-//                 "type": "uint256[2]"
-//               }
-//             ],
-//             "internalType": "struct C.T[]",
-//             "name": "sub",
-//             "type": "tuple[]"
-//           },
-//           {
-//             "internalType": "bytes",
-//             "name": "b",
-//             "type": "bytes"
-//           }
-//         ],
-//         "indexed": false,
-//         "internalType": "struct C.S",
-//         "name": "s",
-//         "type": "tuple"
-//       }
-//     ],
-//     "name": "E",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/events.sol b/test/libsolidity/ABIJson/events.sol
deleted file mode 100644
index bab6a743652e..000000000000
--- a/test/libsolidity/ABIJson/events.sol
+++ /dev/null
@@ -1,78 +0,0 @@
-contract test {
-    function f(uint a) public returns (uint d) { return a * 7; }
-    event e1(uint b, address indexed c);
-    event e2();
-    event e2(uint a);
-    event e3() anonymous;
-}
-// ----
-//     :test
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       },
-//       {
-//         "indexed": true,
-//         "internalType": "address",
-//         "name": "c",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "e1",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e2",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "e2",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": true,
-//     "inputs": [],
-//     "name": "e3",
-//     "type": "event"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/events_anonymous.sol b/test/libsolidity/ABIJson/events_anonymous.sol
deleted file mode 100644
index 0941a8809204..000000000000
--- a/test/libsolidity/ABIJson/events_anonymous.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    event e() anonymous;
-}
-// ----
-//     :test
-// [
-//   {
-//     "anonymous": true,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/events_indirect.sol b/test/libsolidity/ABIJson/events_indirect.sol
deleted file mode 100644
index 86368028ccc2..000000000000
--- a/test/libsolidity/ABIJson/events_indirect.sol
+++ /dev/null
@@ -1,88 +0,0 @@
-library L {
-    event e1(uint b);
-    event e2();
-    event e2(uint a);
-    event e3() anonymous;
-}
-contract test {
-    function f() public {
-        emit L.e1(1);
-        emit L.e3();
-    }
-}
-// ----
-//     :L
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "e1",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e2",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "e2",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": true,
-//     "inputs": [],
-//     "name": "e3",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :test
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": false,
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "e1",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": true,
-//     "inputs": [],
-//     "name": "e3",
-//     "type": "event"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/events_repetitions.sol b/test/libsolidity/ABIJson/events_repetitions.sol
deleted file mode 100644
index 8dd980a6a1a5..000000000000
--- a/test/libsolidity/ABIJson/events_repetitions.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-library L {
-	event e();
-}
-contract C {
-	constructor() {
-		emit L.e();
-	}
-	function f() public {
-		emit L.e();
-	}
-}
-
-// ----
-//     :C
-// [
-//   {
-//     "inputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "constructor"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
-//
-//
-//     :L
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/function_type.sol b/test/libsolidity/ABIJson/function_type.sol
deleted file mode 100644
index 51e36b92b5da..000000000000
--- a/test/libsolidity/ABIJson/function_type.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract test {
-    function g(function(uint) external returns (uint) x) public {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "function (uint256) external returns (uint256)",
-//         "name": "x",
-//         "type": "function"
-//       }
-//     ],
-//     "name": "g",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/function_type_extended.sol b/test/libsolidity/ABIJson/function_type_extended.sol
deleted file mode 100644
index 6257bb4c47ed..000000000000
--- a/test/libsolidity/ABIJson/function_type_extended.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract test {
-    function g(function(test) external returns (test[] memory) x) public {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "function (contract test) external returns (contract test[])",
-//         "name": "x",
-//         "type": "function"
-//       }
-//     ],
-//     "name": "g",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/global_struct.sol b/test/libsolidity/ABIJson/global_struct.sol
deleted file mode 100644
index 11ce8246feab..000000000000
--- a/test/libsolidity/ABIJson/global_struct.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-pragma abicoder               v2;
-struct S { uint a; }
-contract C {
-    function f(S calldata s) external view {}
-    function g(S memory s) public view {}
-}
-// ----
-//     :C
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256",
-//             "name": "a",
-//             "type": "uint256"
-//           }
-//         ],
-//         "internalType": "struct S",
-//         "name": "s",
-//         "type": "tuple"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256",
-//             "name": "a",
-//             "type": "uint256"
-//           }
-//         ],
-//         "internalType": "struct S",
-//         "name": "s",
-//         "type": "tuple"
-//       }
-//     ],
-//     "name": "g",
-//     "outputs": [],
-//     "stateMutability": "view",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/include_fallback_function.sol b/test/libsolidity/ABIJson/include_fallback_function.sol
deleted file mode 100644
index 6accdeb4eb04..000000000000
--- a/test/libsolidity/ABIJson/include_fallback_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    fallback() external {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "stateMutability": "nonpayable",
-//     "type": "fallback"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/inherited.sol b/test/libsolidity/ABIJson/inherited.sol
deleted file mode 100644
index cdd8296d8efc..000000000000
--- a/test/libsolidity/ABIJson/inherited.sol
+++ /dev/null
@@ -1,122 +0,0 @@
-contract Base {
-    function baseFunction(uint p) public returns (uint i) { return p; }
-    event baseEvent(bytes32 indexed evtArgBase);
-}
-contract Derived is Base {
-    function derivedFunction(bytes32 p) public returns (bytes32 i) { return p; }
-    event derivedEvent(uint indexed evtArgDerived);
-}
-// ----
-//     :Base
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": true,
-//         "internalType": "bytes32",
-//         "name": "evtArgBase",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "name": "baseEvent",
-//     "type": "event"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "p",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "baseFunction",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "i",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
-//
-//
-//     :Derived
-// [
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": true,
-//         "internalType": "bytes32",
-//         "name": "evtArgBase",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "name": "baseEvent",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs":
-//     [
-//       {
-//         "indexed": true,
-//         "internalType": "uint256",
-//         "name": "evtArgDerived",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "derivedEvent",
-//     "type": "event"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "p",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "baseFunction",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "i",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "bytes32",
-//         "name": "p",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "name": "derivedFunction",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "bytes32",
-//         "name": "i",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/internal_constructor.sol b/test/libsolidity/ABIJson/internal_constructor.sol
deleted file mode 100644
index 47c783b5d8a8..000000000000
--- a/test/libsolidity/ABIJson/internal_constructor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// bug #8712
-abstract contract B {
-    uint immutable x;
-    constructor(function() internal returns(uint) fp) {
-        x = fp(); }
-}
-// ----
-//     :B
-// []
diff --git a/test/libsolidity/ABIJson/library_function.sol b/test/libsolidity/ABIJson/library_function.sol
deleted file mode 100644
index 5fe404e95b39..000000000000
--- a/test/libsolidity/ABIJson/library_function.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract X {}
-library test {
-    struct StructType { uint a; }
-    function f(StructType storage b, uint[] storage c, X d) public returns (uint[] memory e, StructType storage f) { f = f; }
-    function f1(uint[] memory c, X d) public pure returns (uint[] memory e) {  }
-}
-// ----
-//     :X
-// []
-//
-//
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256[]",
-//         "name": "c",
-//         "type": "uint256[]"
-//       },
-//       {
-//         "internalType": "contract X",
-//         "name": "d",
-//         "type": "X"
-//       }
-//     ],
-//     "name": "f1",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256[]",
-//         "name": "e",
-//         "type": "uint256[]"
-//       }
-//     ],
-//     "stateMutability": "pure",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/mapping.sol b/test/libsolidity/ABIJson/mapping.sol
deleted file mode 100644
index e84b716f2a43..000000000000
--- a/test/libsolidity/ABIJson/mapping.sol
+++ /dev/null
@@ -1,77 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address spender => uint value)) public allowance;
-    mapping(bytes32 => address sender) public commits;
-    mapping(bytes32 => bytes32) public something;
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "address",
-//         "name": "owner",
-//         "type": "address"
-//       },
-//       {
-//         "internalType": "address",
-//         "name": "spender",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "allowance",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "value",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "bytes32",
-//         "name": "",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "name": "commits",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "address",
-//         "name": "sender",
-//         "type": "address"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "bytes32",
-//         "name": "",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "name": "something",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "bytes32",
-//         "name": "",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/multiple_methods.sol b/test/libsolidity/ABIJson/multiple_methods.sol
deleted file mode 100644
index f4738e6ea16e..000000000000
--- a/test/libsolidity/ABIJson/multiple_methods.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract test {
-    function f(uint a) public returns (uint d) { return a * 7; }
-    function g(uint b) public returns (uint e) { return b * 8; }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "g",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "e",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/multiple_methods_order.sol b/test/libsolidity/ABIJson/multiple_methods_order.sol
deleted file mode 100644
index 606c80db3ce6..000000000000
--- a/test/libsolidity/ABIJson/multiple_methods_order.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-// methods are expected to be in alphabetical order
-contract test {
-    function f(uint a) public returns (uint d) { return a * 7; }
-    function c(uint b) public returns (uint e) { return b * 8; }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "c",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "e",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/multiple_params.sol b/test/libsolidity/ABIJson/multiple_params.sol
deleted file mode 100644
index e223fc3eb590..000000000000
--- a/test/libsolidity/ABIJson/multiple_params.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract test {
-    function f(uint a, uint b) public returns (uint d) { return a + b; }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/payable_constructor_abi.sol b/test/libsolidity/ABIJson/payable_constructor_abi.sol
deleted file mode 100644
index 579e83efb10f..000000000000
--- a/test/libsolidity/ABIJson/payable_constructor_abi.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract test {
-    constructor(uint param1, test param2, bool param3) payable {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "param1",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "contract test",
-//         "name": "param2",
-//         "type": "address"
-//       },
-//       {
-//         "internalType": "bool",
-//         "name": "param3",
-//         "type": "bool"
-//       }
-//     ],
-//     "stateMutability": "payable",
-//     "type": "constructor"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/payable_fallback_function.sol b/test/libsolidity/ABIJson/payable_fallback_function.sol
deleted file mode 100644
index 06def7a9fee9..000000000000
--- a/test/libsolidity/ABIJson/payable_fallback_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    fallback () external payable {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "stateMutability": "payable",
-//     "type": "fallback"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/payable_function.sol b/test/libsolidity/ABIJson/payable_function.sol
deleted file mode 100644
index e9d7dbe4147b..000000000000
--- a/test/libsolidity/ABIJson/payable_function.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract test {
-    function f() public {}
-    function g() public payable {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "g",
-//     "outputs": [],
-//     "stateMutability": "payable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/pure_function.sol b/test/libsolidity/ABIJson/pure_function.sol
deleted file mode 100644
index c98431eb2a4e..000000000000
--- a/test/libsolidity/ABIJson/pure_function.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract test {
-    function foo(uint a, uint b) public returns (uint d) { return a + b; }
-    function boo(uint32 a) public pure returns (uint b) { return a * 4; }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint32",
-//         "name": "a",
-//         "type": "uint32"
-//       }
-//     ],
-//     "name": "boo",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "pure",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "foo",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/receive_ether_and_fallback_function.sol b/test/libsolidity/ABIJson/receive_ether_and_fallback_function.sol
deleted file mode 100644
index 0fde77b2259b..000000000000
--- a/test/libsolidity/ABIJson/receive_ether_and_fallback_function.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    receive() external payable {}
-    fallback() external {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "stateMutability": "nonpayable",
-//     "type": "fallback"
-//   },
-//   {
-//     "stateMutability": "payable",
-//     "type": "receive"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/receive_ether_function.sol b/test/libsolidity/ABIJson/receive_ether_function.sol
deleted file mode 100644
index b957682f20c8..000000000000
--- a/test/libsolidity/ABIJson/receive_ether_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    receive() external payable {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "stateMutability": "payable",
-//     "type": "receive"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/return_param_in_abi.sol b/test/libsolidity/ABIJson/return_param_in_abi.sol
deleted file mode 100644
index 23995d62a323..000000000000
--- a/test/libsolidity/ABIJson/return_param_in_abi.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-// bug #1801
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor(ActionChoices param) {}
-    function ret() public returns (ActionChoices) {
-        ActionChoices action = ActionChoices.GoLeft;
-        return action;
-    }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "enum test.ActionChoices",
-//         "name": "param",
-//         "type": "uint8"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "constructor"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "ret",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "enum test.ActionChoices",
-//         "name": "",
-//         "type": "uint8"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/return_structs.sol b/test/libsolidity/ABIJson/return_structs.sol
deleted file mode 100644
index 9a1e493d5087..000000000000
--- a/test/libsolidity/ABIJson/return_structs.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { uint a; T[] sub; }
-    struct T { uint[2] x; }
-    function f() public returns (uint x, S memory s) {
-    }
-}
-// ----
-//     :C
-// [
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "x",
-//         "type": "uint256"
-//       },
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256",
-//             "name": "a",
-//             "type": "uint256"
-//           },
-//           {
-//             "components":
-//             [
-//               {
-//                 "internalType": "uint256[2]",
-//                 "name": "x",
-//                 "type": "uint256[2]"
-//               }
-//             ],
-//             "internalType": "struct C.T[]",
-//             "name": "sub",
-//             "type": "tuple[]"
-//           }
-//         ],
-//         "internalType": "struct C.S",
-//         "name": "s",
-//         "type": "tuple"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/return_structs_with_contracts.sol b/test/libsolidity/ABIJson/return_structs_with_contracts.sol
deleted file mode 100644
index 135c3295f766..000000000000
--- a/test/libsolidity/ABIJson/return_structs_with_contracts.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { C[] x; C y; }
-    function f() public returns (S memory s, C c) {
-    }
-}
-// ----
-//     :C
-// [
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs":
-//     [
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "contract C[]",
-//             "name": "x",
-//             "type": "address[]"
-//           },
-//           {
-//             "internalType": "contract C",
-//             "name": "y",
-//             "type": "address"
-//           }
-//         ],
-//         "internalType": "struct C.S",
-//         "name": "s",
-//         "type": "tuple"
-//       },
-//       {
-//         "internalType": "contract C",
-//         "name": "c",
-//         "type": "address"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/same_event_defined_twice.sol b/test/libsolidity/ABIJson/same_event_defined_twice.sol
deleted file mode 100644
index 9a65e61d69a2..000000000000
--- a/test/libsolidity/ABIJson/same_event_defined_twice.sol
+++ /dev/null
@@ -1,61 +0,0 @@
-library L1 { event e(); }
-library L2 { event e(); }
-contract C {
-	constructor() {
-		emit L1.e();
-	}
-	function f() public {
-		emit L2.e();
-	}
-}
-
-// ----
-//     :C
-// [
-//   {
-//     "inputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "constructor"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   },
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
-//
-//
-//     :L1
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   }
-// ]
-//
-//
-//     :L2
-// [
-//   {
-//     "anonymous": false,
-//     "inputs": [],
-//     "name": "e",
-//     "type": "event"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/structs_and_arrays.sol b/test/libsolidity/ABIJson/structs_and_arrays.sol
deleted file mode 100644
index b2c6bc0ad971..000000000000
--- a/test/libsolidity/ABIJson/structs_and_arrays.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-// bug #1801
-contract test {
-    function f(string calldata a, bytes calldata b, uint[] calldata c) external {}
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "string",
-//         "name": "a",
-//         "type": "string"
-//       },
-//       {
-//         "internalType": "bytes",
-//         "name": "b",
-//         "type": "bytes"
-//       },
-//       {
-//         "internalType": "uint256[]",
-//         "name": "c",
-//         "type": "uint256[]"
-//       }
-//     ],
-//     "name": "f",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/structs_in_libraries.sol b/test/libsolidity/ABIJson/structs_in_libraries.sol
deleted file mode 100644
index 3f278337f0bc..000000000000
--- a/test/libsolidity/ABIJson/structs_in_libraries.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-pragma abicoder               v2;
-library L {
-    struct S { uint a; T[] sub; bytes b; }
-    struct T { uint[2] x; }
-    function f(L.S storage s) public view {}
-    function g(L.S memory s) public view {}
-}
-// ----
-//     :L
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "components":
-//         [
-//           {
-//             "internalType": "uint256",
-//             "name": "a",
-//             "type": "uint256"
-//           },
-//           {
-//             "components":
-//             [
-//               {
-//                 "internalType": "uint256[2]",
-//                 "name": "x",
-//                 "type": "uint256[2]"
-//               }
-//             ],
-//             "internalType": "struct L.T[]",
-//             "name": "sub",
-//             "type": "tuple[]"
-//           },
-//           {
-//             "internalType": "bytes",
-//             "name": "b",
-//             "type": "bytes"
-//           }
-//         ],
-//         "internalType": "struct L.S",
-//         "name": "s",
-//         "type": "tuple"
-//       }
-//     ],
-//     "name": "g",
-//     "outputs": [],
-//     "stateMutability": "view",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/user_defined_value_type.sol b/test/libsolidity/ABIJson/user_defined_value_type.sol
deleted file mode 100644
index 3bd034e6a9b0..000000000000
--- a/test/libsolidity/ABIJson/user_defined_value_type.sol
+++ /dev/null
@@ -1,173 +0,0 @@
-type MyInt is int;
-type MyByte1 is bytes1;
-contract C {
-    type MyAddress is address;
-    type MyUInt8 is uint8;
-    type MyBytes32 is bytes32;
-
-    MyInt public myInt;
-    MyByte1 public myByte1;
-    MyAddress public myAddress;
-    MyUInt8 public myUInt8;
-    MyBytes32 public myBytes32;
-
-    function setMyInt(MyInt a) external {
-        myInt = a;
-    }
-    function setMyByte1(MyByte1 a) external {
-        myByte1 = a;
-    }
-    function setMyAddress(MyAddress a) external {
-        myAddress = a;
-    }
-    function setMyUInt8(MyUInt8 a) external {
-        myUInt8 = a;
-    }
-    function setMyBytes32(MyBytes32 a) external {
-        myBytes32 = a;
-    }
-}
-// ----
-//     :C
-// [
-//   {
-//     "inputs": [],
-//     "name": "myAddress",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "C.MyAddress",
-//         "name": "",
-//         "type": "address"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "myByte1",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "MyByte1",
-//         "name": "",
-//         "type": "bytes1"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "myBytes32",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "C.MyBytes32",
-//         "name": "",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "myInt",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "MyInt",
-//         "name": "",
-//         "type": "int256"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs": [],
-//     "name": "myUInt8",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "C.MyUInt8",
-//         "name": "",
-//         "type": "uint8"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "C.MyAddress",
-//         "name": "a",
-//         "type": "address"
-//       }
-//     ],
-//     "name": "setMyAddress",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "MyByte1",
-//         "name": "a",
-//         "type": "bytes1"
-//       }
-//     ],
-//     "name": "setMyByte1",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "C.MyBytes32",
-//         "name": "a",
-//         "type": "bytes32"
-//       }
-//     ],
-//     "name": "setMyBytes32",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "MyInt",
-//         "name": "a",
-//         "type": "int256"
-//       }
-//     ],
-//     "name": "setMyInt",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "C.MyUInt8",
-//         "name": "a",
-//         "type": "uint8"
-//       }
-//     ],
-//     "name": "setMyUInt8",
-//     "outputs": [],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJson/view_function.sol b/test/libsolidity/ABIJson/view_function.sol
deleted file mode 100644
index d5f54ecdeefe..000000000000
--- a/test/libsolidity/ABIJson/view_function.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract test {
-    function foo(uint a, uint b) public returns (uint d) { return a + b; }
-    function boo(uint32 a) public view returns(uint b) { return a * 4; }
-}
-// ----
-//     :test
-// [
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint32",
-//         "name": "a",
-//         "type": "uint32"
-//       }
-//     ],
-//     "name": "boo",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "view",
-//     "type": "function"
-//   },
-//   {
-//     "inputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "a",
-//         "type": "uint256"
-//       },
-//       {
-//         "internalType": "uint256",
-//         "name": "b",
-//         "type": "uint256"
-//       }
-//     ],
-//     "name": "foo",
-//     "outputs":
-//     [
-//       {
-//         "internalType": "uint256",
-//         "name": "d",
-//         "type": "uint256"
-//       }
-//     ],
-//     "stateMutability": "nonpayable",
-//     "type": "function"
-//   }
-// ]
diff --git a/test/libsolidity/ABIJsonTest.cpp b/test/libsolidity/ABIJsonTest.cpp
deleted file mode 100644
index 803445b96ea6..000000000000
--- a/test/libsolidity/ABIJsonTest.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- */
-/**
- * Unit tests for the solidity compiler ABI JSON Interface output.
- */
-
-#include <test/libsolidity/ABIJsonTest.h>
-
-#include <test/Common.h>
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolutil/JSON.h>
-#include <libsolutil/AnsiColorized.h>
-
-#include <fstream>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-
-ABIJsonTest::ABIJsonTest(std::string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult ABIJsonTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
-{
-	CompilerStack compiler;
-
-	compiler.setSources({{
-		"",
-		"pragma solidity >=0.0;\n// SPDX-License-Identifier: GPL-3.0\n" + m_source
-	}});
-	compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-	if (!compiler.parseAndAnalyze())
-		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing contract failed"));
-
-	m_obtainedResult.clear();
-	bool first = true;
-	for (std::string const& contractName: compiler.contractNames())
-	{
-		if (!first)
-			m_obtainedResult += "\n\n";
-		m_obtainedResult += "    " + contractName + "\n";
-		m_obtainedResult += jsonPrettyPrint(compiler.contractABI(contractName)) + "\n";
-		first = false;
-	}
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libsolidity/ABIJsonTest.h b/test/libsolidity/ABIJsonTest.h
deleted file mode 100644
index 0cc7e674e796..000000000000
--- a/test/libsolidity/ABIJsonTest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the solidity compiler ABI JSON Interface output.
- */
-
-#pragma once
-
-#include <test/TestCase.h>
-
-#include <string>
-
-namespace solidity::frontend::test
-{
-
-
-class ABIJsonTest: public TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{ return std::make_unique<ABIJsonTest>(_config.filename); }
-	ABIJsonTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-};
-
-}
diff --git a/test/libsolidity/ABITestsCommon.h b/test/libsolidity/ABITestsCommon.h
deleted file mode 100644
index 67c344985e6c..000000000000
--- a/test/libsolidity/ABITestsCommon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <string>
-
-namespace solidity::frontend::test
-{
-
-#define NEW_ENCODER(CODE) \
-{ \
-	std::string sourceCodeTmp = sourceCode; \
-	sourceCode = "pragma abicoder v2;\n" + sourceCode; \
-	{ CODE } \
-	sourceCode = sourceCodeTmp; \
-}
-
-#define OLD_ENCODER(CODE) \
-{ \
-	std::string sourceCodeTmp = sourceCode; \
-	sourceCode = "pragma abicoder v1;\n" + sourceCode; \
-	{ CODE } \
-	sourceCode = sourceCodeTmp; \
-}
-
-#define BOTH_ENCODERS(CODE) \
-{ \
-	OLD_ENCODER(CODE) \
-	NEW_ENCODER(CODE) \
-}
-
-} // end namespaces
diff --git a/test/libsolidity/ASTJSON/abstract_contract.json b/test/libsolidity/ASTJSON/abstract_contract.json
deleted file mode 100644
index 48c20b43584d..000000000000
--- a/test/libsolidity/ASTJSON/abstract_contract.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": true,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "18:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "37:4:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "34:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "scope": 5,
-          "src": "23:18:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        }
-      ],
-      "scope": 6,
-      "src": "0:43:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:44:1"
-}
diff --git a/test/libsolidity/ASTJSON/abstract_contract.sol b/test/libsolidity/ASTJSON/abstract_contract.sol
deleted file mode 100644
index 3ef96612f5fb..000000000000
--- a/test/libsolidity/ASTJSON/abstract_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract C {
-	constructor() {
-	}
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json b/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
deleted file mode 100644
index d9ba04e6cfd0..000000000000
--- a/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": true,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "18:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "37:4:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "34:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "src": "23:18:1",
-          "stateMutability": "nonpayable",
-          "virtual": false
-        }
-      ],
-      "src": "0:43:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:44:1"
-}
diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
deleted file mode 100644
index adf79823ec30..000000000000
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ /dev/null
@@ -1,579 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      39
-    ]
-  },
-  "id": 40,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 39,
-      "linearizedBaseContracts":
-      [
-        39
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "functionSelector": "97682884",
-          "id": 4,
-          "mutability": "mutable",
-          "name": "m",
-          "nameLocation": "60:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 39,
-          "src": "17:44:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
-            "typeString": "mapping(address => address payable)"
-          },
-          "typeName":
-          {
-            "id": 3,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 1,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "25:7:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_address",
-                "typeString": "address"
-              }
-            },
-            "nodeType": "Mapping",
-            "src": "17:35:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
-              "typeString": "mapping(address => address payable)"
-            },
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 2,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "36:15:1",
-              "stateMutability": "payable",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_address_payable",
-                "typeString": "address payable"
-              }
-            }
-          },
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 37,
-            "nodeType": "Block",
-            "src": "134:122:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  12
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 12,
-                    "mutability": "mutable",
-                    "name": "a",
-                    "nameLocation": "160:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 37,
-                    "src": "144:17:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address_payable",
-                      "typeString": "address payable"
-                    },
-                    "typeName":
-                    {
-                      "id": 11,
-                      "name": "address",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "144:15:1",
-                      "stateMutability": "payable",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_address_payable",
-                        "typeString": "address payable"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 16,
-                "initialValue":
-                {
-                  "baseExpression":
-                  {
-                    "id": 13,
-                    "name": "m",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 4,
-                    "src": "164:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
-                      "typeString": "mapping(address => address payable)"
-                    }
-                  },
-                  "id": 15,
-                  "indexExpression":
-                  {
-                    "id": 14,
-                    "name": "arg",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 6,
-                    "src": "166:3:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address_payable",
-                      "typeString": "address payable"
-                    }
-                  },
-                  "isConstant": false,
-                  "isLValue": true,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "nodeType": "IndexAccess",
-                  "src": "164:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address_payable",
-                    "typeString": "address payable"
-                  }
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "144:26:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 19,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftHandSide":
-                  {
-                    "id": 17,
-                    "name": "r",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 9,
-                    "src": "180:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address_payable",
-                      "typeString": "address payable"
-                    }
-                  },
-                  "nodeType": "Assignment",
-                  "operator": "=",
-                  "rightHandSide":
-                  {
-                    "id": 18,
-                    "name": "arg",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 6,
-                    "src": "184:3:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address_payable",
-                      "typeString": "address payable"
-                    }
-                  },
-                  "src": "180:7:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address_payable",
-                    "typeString": "address payable"
-                  }
-                },
-                "id": 20,
-                "nodeType": "ExpressionStatement",
-                "src": "180:7:1"
-              },
-              {
-                "assignments":
-                [
-                  22
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 22,
-                    "mutability": "mutable",
-                    "name": "c",
-                    "nameLocation": "205:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 37,
-                    "src": "197:9:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address",
-                      "typeString": "address"
-                    },
-                    "typeName":
-                    {
-                      "id": 21,
-                      "name": "address",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "197:7:1",
-                      "stateMutability": "nonpayable",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 27,
-                "initialValue":
-                {
-                  "arguments":
-                  [
-                    {
-                      "id": 25,
-                      "name": "this",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": -28,
-                      "src": "217:4:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_contract$_C_$39",
-                        "typeString": "contract C"
-                      }
-                    }
-                  ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
-                      {
-                        "typeIdentifier": "t_contract$_C_$39",
-                        "typeString": "contract C"
-                      }
-                    ],
-                    "id": 24,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "lValueRequested": false,
-                    "nodeType": "ElementaryTypeNameExpression",
-                    "src": "209:7:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_type$_t_address_$",
-                      "typeString": "type(address)"
-                    },
-                    "typeName":
-                    {
-                      "id": 23,
-                      "name": "address",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "209:7:1",
-                      "typeDescriptions": {}
-                    }
-                  },
-                  "id": 26,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "typeConversion",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "209:13:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address",
-                    "typeString": "address"
-                  }
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "197:25:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 35,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftHandSide":
-                  {
-                    "baseExpression":
-                    {
-                      "id": 28,
-                      "name": "m",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 4,
-                      "src": "232:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
-                        "typeString": "mapping(address => address payable)"
-                      }
-                    },
-                    "id": 30,
-                    "indexExpression":
-                    {
-                      "id": 29,
-                      "name": "c",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 22,
-                      "src": "234:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      }
-                    },
-                    "isConstant": false,
-                    "isLValue": true,
-                    "isPure": false,
-                    "lValueRequested": true,
-                    "nodeType": "IndexAccess",
-                    "src": "232:4:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address_payable",
-                      "typeString": "address payable"
-                    }
-                  },
-                  "nodeType": "Assignment",
-                  "operator": "=",
-                  "rightHandSide":
-                  {
-                    "arguments":
-                    [
-                      {
-                        "hexValue": "30",
-                        "id": 33,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "kind": "number",
-                        "lValueRequested": false,
-                        "nodeType": "Literal",
-                        "src": "247:1:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_rational_0_by_1",
-                          "typeString": "int_const 0"
-                        },
-                        "value": "0"
-                      }
-                    ],
-                    "expression":
-                    {
-                      "argumentTypes":
-                      [
-                        {
-                          "typeIdentifier": "t_rational_0_by_1",
-                          "typeString": "int_const 0"
-                        }
-                      ],
-                      "id": 32,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": true,
-                      "lValueRequested": false,
-                      "nodeType": "ElementaryTypeNameExpression",
-                      "src": "239:8:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_type$_t_address_payable_$",
-                        "typeString": "type(address payable)"
-                      },
-                      "typeName":
-                      {
-                        "id": 31,
-                        "name": "address",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "239:8:1",
-                        "stateMutability": "payable",
-                        "typeDescriptions": {}
-                      }
-                    },
-                    "id": 34,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "typeConversion",
-                    "lValueRequested": false,
-                    "nameLocations": [],
-                    "names": [],
-                    "nodeType": "FunctionCall",
-                    "src": "239:10:1",
-                    "tryCall": false,
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_address_payable",
-                      "typeString": "address payable"
-                    }
-                  },
-                  "src": "232:17:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address_payable",
-                    "typeString": "address payable"
-                  }
-                },
-                "id": 36,
-                "nodeType": "ExpressionStatement",
-                "src": "232:17:1"
-              }
-            ]
-          },
-          "functionSelector": "fc68521a",
-          "id": 38,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "76:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 6,
-                "mutability": "mutable",
-                "name": "arg",
-                "nameLocation": "94:3:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 38,
-                "src": "78:19:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_address_payable",
-                  "typeString": "address payable"
-                },
-                "typeName":
-                {
-                  "id": 5,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "78:15:1",
-                  "stateMutability": "payable",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address_payable",
-                    "typeString": "address payable"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "77:21:1"
-          },
-          "returnParameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 9,
-                "mutability": "mutable",
-                "name": "r",
-                "nameLocation": "131:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 38,
-                "src": "115:17:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_address_payable",
-                  "typeString": "address payable"
-                },
-                "typeName":
-                {
-                  "id": 8,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "115:15:1",
-                  "stateMutability": "payable",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address_payable",
-                    "typeString": "address payable"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "114:19:1"
-          },
-          "scope": 39,
-          "src": "67:189:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 40,
-      "src": "0:258:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:259:1"
-}
diff --git a/test/libsolidity/ASTJSON/address_payable.sol b/test/libsolidity/ASTJSON/address_payable.sol
deleted file mode 100644
index f9ebb124ebaf..000000000000
--- a/test/libsolidity/ASTJSON/address_payable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    mapping(address => address payable) public m;
-    function f(address payable arg) public returns (address payable r) {
-        address payable a = m[arg];
-        r = arg;
-        address c = address(this);
-        m[c] = payable(0);
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
deleted file mode 100644
index 02b809cc96da..000000000000
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ /dev/null
@@ -1,386 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 40,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 39,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 4,
-          "mutability": "mutable",
-          "name": "m",
-          "nameLocation": "60:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "17:44:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 3,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 1,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "25:7:1",
-              "typeDescriptions": {}
-            },
-            "nodeType": "Mapping",
-            "src": "17:35:1",
-            "typeDescriptions": {},
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 2,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "36:15:1",
-              "stateMutability": "payable",
-              "typeDescriptions": {}
-            }
-          },
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 37,
-            "nodeType": "Block",
-            "src": "134:122:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  12
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 12,
-                    "mutability": "mutable",
-                    "name": "a",
-                    "nameLocation": "160:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "144:17:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 11,
-                      "name": "address",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "144:15:1",
-                      "stateMutability": "payable",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 16,
-                "initialValue":
-                {
-                  "baseExpression":
-                  {
-                    "id": 13,
-                    "name": "m",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "164:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 15,
-                  "indexExpression":
-                  {
-                    "id": 14,
-                    "name": "arg",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "166:3:1",
-                    "typeDescriptions": {}
-                  },
-                  "nodeType": "IndexAccess",
-                  "src": "164:6:1",
-                  "typeDescriptions": {}
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "144:26:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 19,
-                  "leftHandSide":
-                  {
-                    "id": 17,
-                    "name": "r",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "180:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "nodeType": "Assignment",
-                  "operator": "=",
-                  "rightHandSide":
-                  {
-                    "id": 18,
-                    "name": "arg",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "184:3:1",
-                    "typeDescriptions": {}
-                  },
-                  "src": "180:7:1",
-                  "typeDescriptions": {}
-                },
-                "id": 20,
-                "nodeType": "ExpressionStatement",
-                "src": "180:7:1"
-              },
-              {
-                "assignments":
-                [
-                  22
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 22,
-                    "mutability": "mutable",
-                    "name": "c",
-                    "nameLocation": "205:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "197:9:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 21,
-                      "name": "address",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "197:7:1",
-                      "stateMutability": "nonpayable",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 27,
-                "initialValue":
-                {
-                  "arguments":
-                  [
-                    {
-                      "id": 25,
-                      "name": "this",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "217:4:1",
-                      "typeDescriptions": {}
-                    }
-                  ],
-                  "expression":
-                  {
-                    "id": 24,
-                    "nodeType": "ElementaryTypeNameExpression",
-                    "src": "209:7:1",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 23,
-                      "name": "address",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "209:7:1",
-                      "typeDescriptions": {}
-                    }
-                  },
-                  "id": 26,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "209:13:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "197:25:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 35,
-                  "leftHandSide":
-                  {
-                    "baseExpression":
-                    {
-                      "id": 28,
-                      "name": "m",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "232:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "id": 30,
-                    "indexExpression":
-                    {
-                      "id": 29,
-                      "name": "c",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "234:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "nodeType": "IndexAccess",
-                    "src": "232:4:1",
-                    "typeDescriptions": {}
-                  },
-                  "nodeType": "Assignment",
-                  "operator": "=",
-                  "rightHandSide":
-                  {
-                    "arguments":
-                    [
-                      {
-                        "hexValue": "30",
-                        "id": 33,
-                        "kind": "number",
-                        "nodeType": "Literal",
-                        "src": "247:1:1",
-                        "typeDescriptions": {},
-                        "value": "0"
-                      }
-                    ],
-                    "expression":
-                    {
-                      "id": 32,
-                      "nodeType": "ElementaryTypeNameExpression",
-                      "src": "239:8:1",
-                      "typeDescriptions": {},
-                      "typeName":
-                      {
-                        "id": 31,
-                        "name": "address",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "239:8:1",
-                        "stateMutability": "payable",
-                        "typeDescriptions": {}
-                      }
-                    },
-                    "id": 34,
-                    "nameLocations": [],
-                    "names": [],
-                    "nodeType": "FunctionCall",
-                    "src": "239:10:1",
-                    "tryCall": false,
-                    "typeDescriptions": {}
-                  },
-                  "src": "232:17:1",
-                  "typeDescriptions": {}
-                },
-                "id": 36,
-                "nodeType": "ExpressionStatement",
-                "src": "232:17:1"
-              }
-            ]
-          },
-          "id": 38,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "76:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 6,
-                "mutability": "mutable",
-                "name": "arg",
-                "nameLocation": "94:3:1",
-                "nodeType": "VariableDeclaration",
-                "src": "78:19:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 5,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "78:15:1",
-                  "stateMutability": "payable",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "77:21:1"
-          },
-          "returnParameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 9,
-                "mutability": "mutable",
-                "name": "r",
-                "nameLocation": "131:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "115:17:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 8,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "115:15:1",
-                  "stateMutability": "payable",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "114:19:1"
-          },
-          "src": "67:189:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:258:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:259:1"
-}
diff --git a/test/libsolidity/ASTJSON/array_type_name.json b/test/libsolidity/ASTJSON/array_type_name.json
deleted file mode 100644
index 1cd97e1765a3..000000000000
--- a/test/libsolidity/ASTJSON/array_type_name.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      4
-    ]
-  },
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 4,
-      "linearizedBaseContracts":
-      [
-        4
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "i",
-          "nameLocation": "20:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 4,
-          "src": "13:8:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_array$_t_uint256_$dyn_storage",
-            "typeString": "uint256[]"
-          },
-          "typeName":
-          {
-            "baseType":
-            {
-              "id": 1,
-              "name": "uint",
-              "nodeType": "ElementaryTypeName",
-              "src": "13:4:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_uint256",
-                "typeString": "uint256"
-              }
-            },
-            "id": 2,
-            "nodeType": "ArrayTypeName",
-            "src": "13:6:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-              "typeString": "uint256[]"
-            }
-          },
-          "visibility": "internal"
-        }
-      ],
-      "scope": 5,
-      "src": "0:24:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:25:1"
-}
diff --git a/test/libsolidity/ASTJSON/array_type_name.sol b/test/libsolidity/ASTJSON/array_type_name.sol
deleted file mode 100644
index 97ed03510af6..000000000000
--- a/test/libsolidity/ASTJSON/array_type_name.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { uint[] i; }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/array_type_name_parseOnly.json b/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
deleted file mode 100644
index 1e0b72ca07f2..000000000000
--- a/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 4,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "i",
-          "nameLocation": "20:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "13:8:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "baseType":
-            {
-              "id": 1,
-              "name": "uint",
-              "nodeType": "ElementaryTypeName",
-              "src": "13:4:1",
-              "typeDescriptions": {}
-            },
-            "id": 2,
-            "nodeType": "ArrayTypeName",
-            "src": "13:6:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        }
-      ],
-      "src": "0:24:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:25:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/call.json b/test/libsolidity/ASTJSON/assembly/call.json
deleted file mode 100644
index d92cf05fe8e4..000000000000
--- a/test/libsolidity/ASTJSON/assembly/call.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "37:59:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "56:34:1",
-                  "nodeType": "YulBlock",
-                  "src": "56:34:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "arguments":
-                            [
-                              {
-                                "kind": "number",
-                                "nativeSrc": "67:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "67:1:1",
-                                "type": "",
-                                "value": "0"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "70:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "70:1:1",
-                                "type": "",
-                                "value": "1"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "73:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "73:1:1",
-                                "type": "",
-                                "value": "2"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "76:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "76:1:1",
-                                "type": "",
-                                "value": "3"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "79:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "79:1:1",
-                                "type": "",
-                                "value": "4"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "82:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "82:1:1",
-                                "type": "",
-                                "value": "5"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "85:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "85:1:1",
-                                "type": "",
-                                "value": "6"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "call",
-                              "nativeSrc": "62:4:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "62:4:1"
-                            },
-                            "nativeSrc": "62:25:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "62:25:1"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "pop",
-                          "nativeSrc": "58:3:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "58:3:1"
-                        },
-                        "nativeSrc": "58:30:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "58:30:1"
-                      },
-                      "nativeSrc": "58:30:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "58:30:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "47:43:1"
-              }
-            ]
-          },
-          "functionSelector": "b582ec5f",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "j",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "scope": 6,
-          "src": "17:79:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:98:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:99:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/call.sol b/test/libsolidity/ASTJSON/assembly/call.sol
deleted file mode 100644
index 1735fd7f7e22..000000000000
--- a/test/libsolidity/ASTJSON/assembly/call.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function j() public {
-        assembly { pop(call(0, 1, 2, 3, 4, 5, 6)) }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/call_legacy.json b/test/libsolidity/ASTJSON/assembly/call_legacy.json
deleted file mode 100644
index 2902873faba4..000000000000
--- a/test/libsolidity/ASTJSON/assembly/call_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "b582ec5f",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "j",
-            "scope": 6,
-            "stateMutability": "nonpayable",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "37:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{\n    pop(call(0, 1, 2, 3, 4, 5, 6))\n}"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "47:43:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "37:59:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:79:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:98:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:99:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
deleted file mode 100644
index 803a1e4f5f1e..000000000000
--- a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "37:59:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "56:34:1",
-                  "nodeType": "YulBlock",
-                  "src": "56:34:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "arguments":
-                            [
-                              {
-                                "kind": "number",
-                                "nativeSrc": "67:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "67:1:1",
-                                "type": "",
-                                "value": "0"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "70:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "70:1:1",
-                                "type": "",
-                                "value": "1"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "73:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "73:1:1",
-                                "type": "",
-                                "value": "2"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "76:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "76:1:1",
-                                "type": "",
-                                "value": "3"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "79:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "79:1:1",
-                                "type": "",
-                                "value": "4"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "82:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "82:1:1",
-                                "type": "",
-                                "value": "5"
-                              },
-                              {
-                                "kind": "number",
-                                "nativeSrc": "85:1:1",
-                                "nodeType": "YulLiteral",
-                                "src": "85:1:1",
-                                "type": "",
-                                "value": "6"
-                              }
-                            ],
-                            "functionName":
-                            {
-                              "name": "call",
-                              "nativeSrc": "62:4:1",
-                              "nodeType": "YulIdentifier",
-                              "src": "62:4:1"
-                            },
-                            "nativeSrc": "62:25:1",
-                            "nodeType": "YulFunctionCall",
-                            "src": "62:25:1"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "pop",
-                          "nativeSrc": "58:3:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "58:3:1"
-                        },
-                        "nativeSrc": "58:30:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "58:30:1"
-                      },
-                      "nativeSrc": "58:30:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "58:30:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "47:43:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "j",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "src": "17:79:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:98:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:99:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.json b/test/libsolidity/ASTJSON/assembly/empty_block.json
deleted file mode 100644
index 3ec3c2eec018..000000000000
--- a/test/libsolidity/ASTJSON/assembly/empty_block.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:31:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:6:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:6:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "63:2:1",
-                      "nodeType": "YulBlock",
-                      "src": "63:2:1",
-                      "statements": []
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:15:1"
-              }
-            ]
-          },
-          "functionSelector": "e2179b8e",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 6,
-          "src": "17:56:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:75:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:76:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.sol b/test/libsolidity/ASTJSON/assembly/empty_block.sol
deleted file mode 100644
index 33bb796ea615..000000000000
--- a/test/libsolidity/ASTJSON/assembly/empty_block.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function g() view public {
-        assembly { {} }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block_legacy.json b/test/libsolidity/ASTJSON/assembly/empty_block_legacy.json
deleted file mode 100644
index 54811bf1a618..000000000000
--- a/test/libsolidity/ASTJSON/assembly/empty_block_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "e2179b8e",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "g",
-            "scope": 6,
-            "stateMutability": "view",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "42:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{ { } }"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "52:15:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "42:31:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:56:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:75:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:76:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
deleted file mode 100644
index ee8e7b7330fb..000000000000
--- a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:31:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:6:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:6:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "63:2:1",
-                      "nodeType": "YulBlock",
-                      "src": "63:2:1",
-                      "statements": []
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:15:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:56:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:75:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:76:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/function.json b/test/libsolidity/ASTJSON/assembly/function.json
deleted file mode 100644
index a3b908ac18b9..000000000000
--- a/test/libsolidity/ASTJSON/assembly/function.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:68:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:43:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:43:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "76:22:1",
-                        "nodeType": "YulBlock",
-                        "src": "76:22:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments":
-                              [
-                                {
-                                  "arguments":
-                                  [
-                                    {
-                                      "kind": "number",
-                                      "nativeSrc": "92:2:1",
-                                      "nodeType": "YulLiteral",
-                                      "src": "92:2:1",
-                                      "type": "",
-                                      "value": "20"
-                                    }
-                                  ],
-                                  "functionName":
-                                  {
-                                    "name": "blockhash",
-                                    "nativeSrc": "82:9:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "82:9:1"
-                                  },
-                                  "nativeSrc": "82:13:1",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "82:13:1"
-                                }
-                              ],
-                              "functionName":
-                              {
-                                "name": "pop",
-                                "nativeSrc": "78:3:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "78:3:1"
-                              },
-                              "nativeSrc": "78:18:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "78:18:1"
-                            },
-                            "nativeSrc": "78:18:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "78:18:1"
-                          }
-                        ]
-                      },
-                      "name": "g",
-                      "nativeSrc": "63:35:1",
-                      "nodeType": "YulFunctionDefinition",
-                      "src": "63:35:1"
-                    },
-                    {
-                      "expression":
-                      {
-                        "arguments": [],
-                        "functionName":
-                        {
-                          "name": "g",
-                          "nativeSrc": "99:1:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "99:1:1"
-                        },
-                        "nativeSrc": "99:3:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "99:3:1"
-                      },
-                      "nativeSrc": "99:3:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "99:3:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:52:1"
-              }
-            ]
-          },
-          "functionSelector": "b8c9d365",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "h",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 6,
-          "src": "17:93:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:112:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:113:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/function.sol b/test/libsolidity/ASTJSON/assembly/function.sol
deleted file mode 100644
index 1edf2f2de24d..000000000000
--- a/test/libsolidity/ASTJSON/assembly/function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function h() view public {
-        assembly { function g() { pop(blockhash(20)) } g() }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/function_legacy.json b/test/libsolidity/ASTJSON/assembly/function_legacy.json
deleted file mode 100644
index 940a4b6ac94d..000000000000
--- a/test/libsolidity/ASTJSON/assembly/function_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "b8c9d365",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "h",
-            "scope": 6,
-            "stateMutability": "view",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "42:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{\n    function g()\n    { pop(blockhash(20)) }\n    g()\n}"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "52:52:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "42:68:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:93:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:112:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:113:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
deleted file mode 100644
index 04f5c2721b70..000000000000
--- a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:68:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:43:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:43:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "76:22:1",
-                        "nodeType": "YulBlock",
-                        "src": "76:22:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments":
-                              [
-                                {
-                                  "arguments":
-                                  [
-                                    {
-                                      "kind": "number",
-                                      "nativeSrc": "92:2:1",
-                                      "nodeType": "YulLiteral",
-                                      "src": "92:2:1",
-                                      "type": "",
-                                      "value": "20"
-                                    }
-                                  ],
-                                  "functionName":
-                                  {
-                                    "name": "blockhash",
-                                    "nativeSrc": "82:9:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "82:9:1"
-                                  },
-                                  "nativeSrc": "82:13:1",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "82:13:1"
-                                }
-                              ],
-                              "functionName":
-                              {
-                                "name": "pop",
-                                "nativeSrc": "78:3:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "78:3:1"
-                              },
-                              "nativeSrc": "78:18:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "78:18:1"
-                            },
-                            "nativeSrc": "78:18:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "78:18:1"
-                          }
-                        ]
-                      },
-                      "name": "g",
-                      "nativeSrc": "63:35:1",
-                      "nodeType": "YulFunctionDefinition",
-                      "src": "63:35:1"
-                    },
-                    {
-                      "expression":
-                      {
-                        "arguments": [],
-                        "functionName":
-                        {
-                          "name": "g",
-                          "nativeSrc": "99:1:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "99:1:1"
-                        },
-                        "nativeSrc": "99:3:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "99:3:1"
-                      },
-                      "nativeSrc": "99:3:1",
-                      "nodeType": "YulExpressionStatement",
-                      "src": "99:3:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:52:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "h",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:93:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:112:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:113:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/leave.json b/test/libsolidity/ASTJSON/assembly/leave.json
deleted file mode 100644
index 51c94f542c76..000000000000
--- a/test/libsolidity/ASTJSON/assembly/leave.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "37:51:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "56:26:1",
-                  "nodeType": "YulBlock",
-                  "src": "56:26:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "71:9:1",
-                        "nodeType": "YulBlock",
-                        "src": "71:9:1",
-                        "statements":
-                        [
-                          {
-                            "nativeSrc": "73:5:1",
-                            "nodeType": "YulLeave",
-                            "src": "73:5:1"
-                          }
-                        ]
-                      },
-                      "name": "f",
-                      "nativeSrc": "58:22:1",
-                      "nodeType": "YulFunctionDefinition",
-                      "src": "58:22:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "47:35:1"
-              }
-            ]
-          },
-          "functionSelector": "ece866b9",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "l",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "scope": 6,
-          "src": "17:71:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:90:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:91:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/leave.sol b/test/libsolidity/ASTJSON/assembly/leave.sol
deleted file mode 100644
index 39f1cafedb22..000000000000
--- a/test/libsolidity/ASTJSON/assembly/leave.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function l() public {
-        assembly { function f() { leave } }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/leave_legacy.json b/test/libsolidity/ASTJSON/assembly/leave_legacy.json
deleted file mode 100644
index fa71bcba0482..000000000000
--- a/test/libsolidity/ASTJSON/assembly/leave_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "ece866b9",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "l",
-            "scope": 6,
-            "stateMutability": "nonpayable",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "37:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{\n    function f()\n    { leave }\n}"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "47:35:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "37:51:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:71:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:90:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:91:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
deleted file mode 100644
index ee34743eac32..000000000000
--- a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "37:51:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "56:26:1",
-                  "nodeType": "YulBlock",
-                  "src": "56:26:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "71:9:1",
-                        "nodeType": "YulBlock",
-                        "src": "71:9:1",
-                        "statements":
-                        [
-                          {
-                            "nativeSrc": "73:5:1",
-                            "nodeType": "YulLeave",
-                            "src": "73:5:1"
-                          }
-                        ]
-                      },
-                      "name": "f",
-                      "nativeSrc": "58:22:1",
-                      "nodeType": "YulFunctionDefinition",
-                      "src": "58:22:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "47:35:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "l",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "src": "17:71:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:90:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:91:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/loop.json b/test/libsolidity/ASTJSON/assembly/loop.json
deleted file mode 100644
index d3d20992d772..000000000000
--- a/test/libsolidity/ASTJSON/assembly/loop.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:74:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:49:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:49:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "90:18:1",
-                        "nodeType": "YulBlock",
-                        "src": "90:18:1",
-                        "statements":
-                        [
-                          {
-                            "nativeSrc": "92:5:1",
-                            "nodeType": "YulBreak",
-                            "src": "92:5:1"
-                          },
-                          {
-                            "nativeSrc": "98:8:1",
-                            "nodeType": "YulContinue",
-                            "src": "98:8:1"
-                          }
-                        ]
-                      },
-                      "condition":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "70:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "70:1:1",
-                        "type": "",
-                        "value": "1"
-                      },
-                      "nativeSrc": "63:45:1",
-                      "nodeType": "YulForLoop",
-                      "post":
-                      {
-                        "nativeSrc": "72:17:1",
-                        "nodeType": "YulBlock",
-                        "src": "72:17:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments":
-                              [
-                                {
-                                  "arguments":
-                                  [
-                                    {
-                                      "kind": "number",
-                                      "nativeSrc": "84:1:1",
-                                      "nodeType": "YulLiteral",
-                                      "src": "84:1:1",
-                                      "type": "",
-                                      "value": "0"
-                                    }
-                                  ],
-                                  "functionName":
-                                  {
-                                    "name": "sload",
-                                    "nativeSrc": "78:5:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "78:5:1"
-                                  },
-                                  "nativeSrc": "78:8:1",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "78:8:1"
-                                }
-                              ],
-                              "functionName":
-                              {
-                                "name": "pop",
-                                "nativeSrc": "74:3:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "74:3:1"
-                              },
-                              "nativeSrc": "74:13:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "74:13:1"
-                            },
-                            "nativeSrc": "74:13:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "74:13:1"
-                          }
-                        ]
-                      },
-                      "pre":
-                      {
-                        "nativeSrc": "67:2:1",
-                        "nodeType": "YulBlock",
-                        "src": "67:2:1",
-                        "statements": []
-                      },
-                      "src": "63:45:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:58:1"
-              }
-            ]
-          },
-          "functionSelector": "e2179b8e",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 6,
-          "src": "17:99:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:118:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:119:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/loop.sol b/test/libsolidity/ASTJSON/assembly/loop.sol
deleted file mode 100644
index baa45e62c489..000000000000
--- a/test/libsolidity/ASTJSON/assembly/loop.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function g() view public {
-        assembly { for {} 1 { pop(sload(0)) } { break continue } }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/loop_legacy.json b/test/libsolidity/ASTJSON/assembly/loop_legacy.json
deleted file mode 100644
index 84890475f851..000000000000
--- a/test/libsolidity/ASTJSON/assembly/loop_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "e2179b8e",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "g",
-            "scope": 6,
-            "stateMutability": "view",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "42:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{\n    for { } 1 { pop(sload(0)) }\n    {\n        break\n        continue\n    }\n}"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "52:58:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "42:74:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:99:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:118:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:119:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
deleted file mode 100644
index 24dbbdc4eaf8..000000000000
--- a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:74:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:49:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:49:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "90:18:1",
-                        "nodeType": "YulBlock",
-                        "src": "90:18:1",
-                        "statements":
-                        [
-                          {
-                            "nativeSrc": "92:5:1",
-                            "nodeType": "YulBreak",
-                            "src": "92:5:1"
-                          },
-                          {
-                            "nativeSrc": "98:8:1",
-                            "nodeType": "YulContinue",
-                            "src": "98:8:1"
-                          }
-                        ]
-                      },
-                      "condition":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "70:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "70:1:1",
-                        "type": "",
-                        "value": "1"
-                      },
-                      "nativeSrc": "63:45:1",
-                      "nodeType": "YulForLoop",
-                      "post":
-                      {
-                        "nativeSrc": "72:17:1",
-                        "nodeType": "YulBlock",
-                        "src": "72:17:1",
-                        "statements":
-                        [
-                          {
-                            "expression":
-                            {
-                              "arguments":
-                              [
-                                {
-                                  "arguments":
-                                  [
-                                    {
-                                      "kind": "number",
-                                      "nativeSrc": "84:1:1",
-                                      "nodeType": "YulLiteral",
-                                      "src": "84:1:1",
-                                      "type": "",
-                                      "value": "0"
-                                    }
-                                  ],
-                                  "functionName":
-                                  {
-                                    "name": "sload",
-                                    "nativeSrc": "78:5:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "78:5:1"
-                                  },
-                                  "nativeSrc": "78:8:1",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "78:8:1"
-                                }
-                              ],
-                              "functionName":
-                              {
-                                "name": "pop",
-                                "nativeSrc": "74:3:1",
-                                "nodeType": "YulIdentifier",
-                                "src": "74:3:1"
-                              },
-                              "nativeSrc": "74:13:1",
-                              "nodeType": "YulFunctionCall",
-                              "src": "74:13:1"
-                            },
-                            "nativeSrc": "74:13:1",
-                            "nodeType": "YulExpressionStatement",
-                            "src": "74:13:1"
-                          }
-                        ]
-                      },
-                      "pre":
-                      {
-                        "nativeSrc": "67:2:1",
-                        "nodeType": "YulBlock",
-                        "src": "67:2:1",
-                        "statements": []
-                      },
-                      "src": "63:45:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:58:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:99:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:118:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:119:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.json b/test/libsolidity/ASTJSON/assembly/nested_functions.json
deleted file mode 100644
index 3c9fd53ec03c..000000000000
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      8
-    ]
-  },
-  "id": 9,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 8,
-      "linearizedBaseContracts":
-      [
-        8
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 6,
-            "nodeType": "Block",
-            "src": "57:95:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "72:76:1",
-                  "nodeType": "YulBlock",
-                  "src": "72:76:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "94:35:1",
-                        "nodeType": "YulBlock",
-                        "src": "94:35:1",
-                        "statements":
-                        [
-                          {
-                            "body":
-                            {
-                              "nativeSrc": "118:3:1",
-                              "nodeType": "YulBlock",
-                              "src": "118:3:1",
-                              "statements": []
-                            },
-                            "name": "f2",
-                            "nativeSrc": "104:17:1",
-                            "nodeType": "YulFunctionDefinition",
-                            "src": "104:17:1"
-                          }
-                        ]
-                      },
-                      "name": "f1",
-                      "nativeSrc": "80:49:1",
-                      "nodeType": "YulFunctionDefinition",
-                      "src": "80:49:1"
-                    },
-                    {
-                      "nativeSrc": "136:6:1",
-                      "nodeType": "YulAssignment",
-                      "src": "136:6:1",
-                      "value":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "141:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "141:1:1",
-                        "type": "",
-                        "value": "2"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "136:1:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "136:1:1"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
-                  {
-                    "declaration": 3,
-                    "isOffset": false,
-                    "isSlot": false,
-                    "src": "136:1:1",
-                    "valueSize": 1
-                  }
-                ],
-                "id": 5,
-                "nodeType": "InlineAssembly",
-                "src": "63:85:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 7,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "24:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "25:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 3,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "54:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 7,
-                "src": "49:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 2,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "49:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "48:8:1"
-          },
-          "scope": 8,
-          "src": "15:137:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 9,
-      "src": "0:154:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:155:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.sol b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
deleted file mode 100644
index 42479fa94ad3..000000000000
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure returns (uint x) {
-    assembly {
-      function f1() {
-        function f2() { }
-      }
-      x := 2
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_legacy.json b/test/libsolidity/ASTJSON/assembly/nested_functions_legacy.json
deleted file mode 100644
index 4f6f98fed8ca..000000000000
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_legacy.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        8
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "linearizedBaseContracts":
-        [
-          8
-        ],
-        "name": "C",
-        "scope": 9
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "f",
-            "scope": 8,
-            "stateMutability": "pure",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "25:2:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "constant": false,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "scope": 7,
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "visibility": "internal"
-                  },
-                  "children":
-                  [
-                    {
-                      "attributes":
-                      {
-                        "name": "uint"
-                      },
-                      "id": 2,
-                      "name": "ElementaryTypeName",
-                      "src": "49:4:1"
-                    }
-                  ],
-                  "id": 3,
-                  "name": "VariableDeclaration",
-                  "src": "49:6:1"
-                }
-              ],
-              "id": 4,
-              "name": "ParameterList",
-              "src": "48:8:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{\n    function f1()\n    {\n        function f2()\n        { }\n        x := 2\n    }\n}"
-                  },
-                  "children": [],
-                  "id": 5,
-                  "name": "InlineAssembly",
-                  "src": "63:87:1"
-                }
-              ],
-              "id": 6,
-              "name": "Block",
-              "src": "57:97:1"
-            }
-          ],
-          "id": 7,
-          "name": "FunctionDefinition",
-          "src": "15:139:1"
-        }
-      ],
-      "id": 8,
-      "name": "ContractDefinition",
-      "src": "0:156:1"
-    }
-  ],
-  "id": 9,
-  "name": "SourceUnit",
-  "src": "0:157:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
deleted file mode 100644
index b924b42cfd0e..000000000000
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 9,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 8,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 6,
-            "nodeType": "Block",
-            "src": "57:95:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "72:76:1",
-                  "nodeType": "YulBlock",
-                  "src": "72:76:1",
-                  "statements":
-                  [
-                    {
-                      "body":
-                      {
-                        "nativeSrc": "94:35:1",
-                        "nodeType": "YulBlock",
-                        "src": "94:35:1",
-                        "statements":
-                        [
-                          {
-                            "body":
-                            {
-                              "nativeSrc": "118:3:1",
-                              "nodeType": "YulBlock",
-                              "src": "118:3:1",
-                              "statements": []
-                            },
-                            "name": "f2",
-                            "nativeSrc": "104:17:1",
-                            "nodeType": "YulFunctionDefinition",
-                            "src": "104:17:1"
-                          }
-                        ]
-                      },
-                      "name": "f1",
-                      "nativeSrc": "80:49:1",
-                      "nodeType": "YulFunctionDefinition",
-                      "src": "80:49:1"
-                    },
-                    {
-                      "nativeSrc": "136:6:1",
-                      "nodeType": "YulAssignment",
-                      "src": "136:6:1",
-                      "value":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "141:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "141:1:1",
-                        "type": "",
-                        "value": "2"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "136:1:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "136:1:1"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 5,
-                "nodeType": "InlineAssembly",
-                "src": "63:85:1"
-              }
-            ]
-          },
-          "id": 7,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "24:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "25:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 3,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "54:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "49:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 2,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "49:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "48:8:1"
-          },
-          "src": "15:137:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:154:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:155:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.json b/test/libsolidity/ASTJSON/assembly/slot_offset.json
deleted file mode 100644
index 799239b3afc6..000000000000
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.json
+++ /dev/null
@@ -1,263 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      12
-    ]
-  },
-  "id": 13,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 12,
-      "linearizedBaseContracts":
-      [
-        12
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "canonicalName": "C.S",
-          "id": 3,
-          "members":
-          [
-            {
-              "constant": false,
-              "id": 2,
-              "mutability": "mutable",
-              "name": "x",
-              "nameLocation": "33:1:1",
-              "nodeType": "VariableDeclaration",
-              "scope": 3,
-              "src": "28:6:1",
-              "stateVariable": false,
-              "storageLocation": "default",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_uint256",
-                "typeString": "uint256"
-              },
-              "typeName":
-              {
-                "id": 1,
-                "name": "uint",
-                "nodeType": "ElementaryTypeName",
-                "src": "28:4:1",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                }
-              },
-              "visibility": "internal"
-            }
-          ],
-          "name": "S",
-          "nameLocation": "24:1:1",
-          "nodeType": "StructDefinition",
-          "scope": 12,
-          "src": "17:20:1",
-          "visibility": "public"
-        },
-        {
-          "constant": false,
-          "id": 6,
-          "mutability": "mutable",
-          "name": "s",
-          "nameLocation": "44:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 12,
-          "src": "42:3:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_struct$_S_$3_storage",
-            "typeString": "struct C.S"
-          },
-          "typeName":
-          {
-            "id": 5,
-            "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
-              "id": 4,
-              "name": "S",
-              "nameLocations":
-              [
-                "42:1:1"
-              ],
-              "nodeType": "IdentifierPath",
-              "referencedDeclaration": 3,
-              "src": "42:1:1"
-            },
-            "referencedDeclaration": 3,
-            "src": "42:1:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_struct$_S_$3_storage_ptr",
-              "typeString": "struct C.S"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 10,
-            "nodeType": "Block",
-            "src": "76:70:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "95:45:1",
-                  "nodeType": "YulBlock",
-                  "src": "95:45:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "97:17:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "97:17:1",
-                      "value":
-                      {
-                        "name": "s.offset",
-                        "nativeSrc": "106:8:1",
-                        "nodeType": "YulIdentifier",
-                        "src": "106:8:1"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "101:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "101:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "nativeSrc": "115:23:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "115:23:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "name": "s.slot",
-                            "nativeSrc": "128:6:1",
-                            "nodeType": "YulIdentifier",
-                            "src": "128:6:1"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "136:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "136:1:1",
-                            "type": "",
-                            "value": "2"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "mul",
-                          "nativeSrc": "124:3:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "124:3:1"
-                        },
-                        "nativeSrc": "124:14:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "124:14:1"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "y",
-                          "nativeSrc": "119:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "119:1:1",
-                          "type": ""
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
-                  {
-                    "declaration": 6,
-                    "isOffset": true,
-                    "isSlot": false,
-                    "src": "106:8:1",
-                    "suffix": "offset",
-                    "valueSize": 1
-                  },
-                  {
-                    "declaration": 6,
-                    "isOffset": false,
-                    "isSlot": true,
-                    "src": "128:6:1",
-                    "suffix": "slot",
-                    "valueSize": 1
-                  }
-                ],
-                "id": 9,
-                "nodeType": "InlineAssembly",
-                "src": "86:54:1"
-              }
-            ]
-          },
-          "functionSelector": "ffae15ba",
-          "id": 11,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "e",
-          "nameLocation": "60:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "61:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "76:0:1"
-          },
-          "scope": 12,
-          "src": "51:95:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 13,
-      "src": "0:148:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:149:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.sol b/test/libsolidity/ASTJSON/assembly/slot_offset.sol
deleted file mode 100644
index 0cc2b07c116b..000000000000
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct S { uint x; }
-    S s;
-    function e() pure public {
-        assembly { let x := s.offset let y := mul(s.slot, 2) }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset_legacy.json b/test/libsolidity/ASTJSON/assembly/slot_offset_legacy.json
deleted file mode 100644
index 330bb07be515..000000000000
--- a/test/libsolidity/ASTJSON/assembly/slot_offset_legacy.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        12
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          12
-        ],
-        "name": "C",
-        "scope": 13
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "canonicalName": "C.S",
-            "name": "S",
-            "scope": 12,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "constant": false,
-                "mutability": "mutable",
-                "name": "x",
-                "scope": 3,
-                "stateVariable": false,
-                "storageLocation": "default",
-                "type": "uint256",
-                "visibility": "internal"
-              },
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "name": "uint",
-                    "type": "uint256"
-                  },
-                  "id": 1,
-                  "name": "ElementaryTypeName",
-                  "src": "28:4:1"
-                }
-              ],
-              "id": 2,
-              "name": "VariableDeclaration",
-              "src": "28:6:1"
-            }
-          ],
-          "id": 3,
-          "name": "StructDefinition",
-          "src": "17:20:1"
-        },
-        {
-          "attributes":
-          {
-            "constant": false,
-            "mutability": "mutable",
-            "name": "s",
-            "scope": 12,
-            "stateVariable": true,
-            "storageLocation": "default",
-            "type": "struct C.S",
-            "visibility": "internal"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "referencedDeclaration": 3,
-                "type": "struct C.S"
-              },
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "name": "S",
-                    "referencedDeclaration": 3
-                  },
-                  "id": 4,
-                  "name": "IdentifierPath",
-                  "src": "42:1:1"
-                }
-              ],
-              "id": 5,
-              "name": "UserDefinedTypeName",
-              "src": "42:1:1"
-            }
-          ],
-          "id": 6,
-          "name": "VariableDeclaration",
-          "src": "42:3:1"
-        },
-        {
-          "attributes":
-          {
-            "functionSelector": "ffae15ba",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "e",
-            "scope": 12,
-            "stateMutability": "pure",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 7,
-              "name": "ParameterList",
-              "src": "61:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 8,
-              "name": "ParameterList",
-              "src": "76:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      {
-                        "declaration": 6,
-                        "isOffset": true,
-                        "isSlot": false,
-                        "src": "106:8:1",
-                        "suffix": "offset",
-                        "valueSize": 1
-                      },
-                      {
-                        "declaration": 6,
-                        "isOffset": false,
-                        "isSlot": true,
-                        "src": "128:6:1",
-                        "suffix": "slot",
-                        "valueSize": 1
-                      }
-                    ],
-                    "operations": "{\n    let x := s.offset\n    let y := mul(s.slot, 2)\n}"
-                  },
-                  "children": [],
-                  "id": 9,
-                  "name": "InlineAssembly",
-                  "src": "86:54:1"
-                }
-              ],
-              "id": 10,
-              "name": "Block",
-              "src": "76:70:1"
-            }
-          ],
-          "id": 11,
-          "name": "FunctionDefinition",
-          "src": "51:95:1"
-        }
-      ],
-      "id": 12,
-      "name": "ContractDefinition",
-      "src": "0:148:1"
-    }
-  ],
-  "id": 13,
-  "name": "SourceUnit",
-  "src": "0:149:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
deleted file mode 100644
index ef8dc8b0adb8..000000000000
--- a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 13,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 12,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 3,
-          "members":
-          [
-            {
-              "constant": false,
-              "id": 2,
-              "mutability": "mutable",
-              "name": "x",
-              "nameLocation": "33:1:1",
-              "nodeType": "VariableDeclaration",
-              "src": "28:6:1",
-              "stateVariable": false,
-              "storageLocation": "default",
-              "typeDescriptions": {},
-              "typeName":
-              {
-                "id": 1,
-                "name": "uint",
-                "nodeType": "ElementaryTypeName",
-                "src": "28:4:1",
-                "typeDescriptions": {}
-              },
-              "visibility": "internal"
-            }
-          ],
-          "name": "S",
-          "nameLocation": "24:1:1",
-          "nodeType": "StructDefinition",
-          "src": "17:20:1",
-          "visibility": "public"
-        },
-        {
-          "constant": false,
-          "id": 6,
-          "mutability": "mutable",
-          "name": "s",
-          "nameLocation": "44:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "42:3:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 5,
-            "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
-              "id": 4,
-              "name": "S",
-              "nameLocations":
-              [
-                "42:1:1"
-              ],
-              "nodeType": "IdentifierPath",
-              "src": "42:1:1"
-            },
-            "src": "42:1:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 10,
-            "nodeType": "Block",
-            "src": "76:70:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "95:45:1",
-                  "nodeType": "YulBlock",
-                  "src": "95:45:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "97:17:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "97:17:1",
-                      "value":
-                      {
-                        "name": "s.offset",
-                        "nativeSrc": "106:8:1",
-                        "nodeType": "YulIdentifier",
-                        "src": "106:8:1"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "101:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "101:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "nativeSrc": "115:23:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "115:23:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
-                          {
-                            "name": "s.slot",
-                            "nativeSrc": "128:6:1",
-                            "nodeType": "YulIdentifier",
-                            "src": "128:6:1"
-                          },
-                          {
-                            "kind": "number",
-                            "nativeSrc": "136:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "136:1:1",
-                            "type": "",
-                            "value": "2"
-                          }
-                        ],
-                        "functionName":
-                        {
-                          "name": "mul",
-                          "nativeSrc": "124:3:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "124:3:1"
-                        },
-                        "nativeSrc": "124:14:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "124:14:1"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "y",
-                          "nativeSrc": "119:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "119:1:1",
-                          "type": ""
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 9,
-                "nodeType": "InlineAssembly",
-                "src": "86:54:1"
-              }
-            ]
-          },
-          "id": 11,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "e",
-          "nameLocation": "60:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "61:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "76:0:1"
-          },
-          "src": "51:95:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:148:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:149:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.json b/test/libsolidity/ASTJSON/assembly/stringlit.json
deleted file mode 100644
index ab27a3d16ff6..000000000000
--- a/test/libsolidity/ASTJSON/assembly/stringlit.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "37:43:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "56:18:1",
-                  "nodeType": "YulBlock",
-                  "src": "56:18:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "58:14:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "58:14:1",
-                      "value":
-                      {
-                        "hexValue": "616263",
-                        "kind": "string",
-                        "nativeSrc": "67:5:1",
-                        "nodeType": "YulLiteral",
-                        "src": "67:5:1",
-                        "type": "",
-                        "value": "abc"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "62:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "62:1:1",
-                          "type": ""
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "47:27:1"
-              }
-            ]
-          },
-          "functionSelector": "5a2ee019",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "m",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "scope": 6,
-          "src": "17:63:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:82:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:83:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.sol b/test/libsolidity/ASTJSON/assembly/stringlit.sol
deleted file mode 100644
index 6f5278ac17f1..000000000000
--- a/test/libsolidity/ASTJSON/assembly/stringlit.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function m() public {
-        assembly { let x := "abc" }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit_legacy.json b/test/libsolidity/ASTJSON/assembly/stringlit_legacy.json
deleted file mode 100644
index 325d25274a9a..000000000000
--- a/test/libsolidity/ASTJSON/assembly/stringlit_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "5a2ee019",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "m",
-            "scope": 6,
-            "stateMutability": "nonpayable",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "37:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{ let x := \"abc\" }"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "47:27:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "37:43:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:63:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:82:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:83:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
deleted file mode 100644
index 3cb2a907287d..000000000000
--- a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "37:43:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "56:18:1",
-                  "nodeType": "YulBlock",
-                  "src": "56:18:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "58:14:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "58:14:1",
-                      "value":
-                      {
-                        "hexValue": "616263",
-                        "kind": "string",
-                        "nativeSrc": "67:5:1",
-                        "nodeType": "YulLiteral",
-                        "src": "67:5:1",
-                        "type": "",
-                        "value": "abc"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "62:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "62:1:1",
-                          "type": ""
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "47:27:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "m",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "37:0:1"
-          },
-          "src": "17:63:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:82:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:83:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/switch.json b/test/libsolidity/ASTJSON/assembly/switch.json
deleted file mode 100644
index 99c69e048bfb..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:154:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:129:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:129:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "75:10:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "75:10:1",
-                      "value":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "84:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "84:1:1",
-                        "type": "",
-                        "value": "0"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "v",
-                          "nativeSrc": "79:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "79:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "cases":
-                      [
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "139:10:1",
-                            "nodeType": "YulBlock",
-                            "src": "139:10:1",
-                            "statements":
-                            [
-                              {
-                                "nativeSrc": "141:6:1",
-                                "nodeType": "YulAssignment",
-                                "src": "141:6:1",
-                                "value":
-                                {
-                                  "kind": "number",
-                                  "nativeSrc": "146:1:1",
-                                  "nodeType": "YulLiteral",
-                                  "src": "146:1:1",
-                                  "type": "",
-                                  "value": "1"
-                                },
-                                "variableNames":
-                                [
-                                  {
-                                    "name": "v",
-                                    "nativeSrc": "141:1:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "141:1:1"
-                                  }
-                                ]
-                              }
-                            ]
-                          },
-                          "nativeSrc": "132:17:1",
-                          "nodeType": "YulCase",
-                          "src": "132:17:1",
-                          "value":
-                          {
-                            "kind": "number",
-                            "nativeSrc": "137:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "137:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        },
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "170:10:1",
-                            "nodeType": "YulBlock",
-                            "src": "170:10:1",
-                            "statements":
-                            [
-                              {
-                                "nativeSrc": "172:6:1",
-                                "nodeType": "YulAssignment",
-                                "src": "172:6:1",
-                                "value":
-                                {
-                                  "kind": "number",
-                                  "nativeSrc": "177:1:1",
-                                  "nodeType": "YulLiteral",
-                                  "src": "177:1:1",
-                                  "type": "",
-                                  "value": "2"
-                                },
-                                "variableNames":
-                                [
-                                  {
-                                    "name": "v",
-                                    "nativeSrc": "172:1:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "172:1:1"
-                                  }
-                                ]
-                              }
-                            ]
-                          },
-                          "nativeSrc": "162:18:1",
-                          "nodeType": "YulCase",
-                          "src": "162:18:1",
-                          "value": "default"
-                        }
-                      ],
-                      "expression":
-                      {
-                        "arguments": [],
-                        "functionName":
-                        {
-                          "name": "calldatasize",
-                          "nativeSrc": "105:12:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "105:12:1"
-                        },
-                        "nativeSrc": "105:14:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "105:14:1"
-                      },
-                      "nativeSrc": "98:82:1",
-                      "nodeType": "YulSwitch",
-                      "src": "98:82:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:138:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 6,
-          "src": "17:179:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:198:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:199:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/switch.sol b/test/libsolidity/ASTJSON/assembly/switch.sol
deleted file mode 100644
index a7a23d26aac3..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            let v := 0
-            switch calldatasize()
-            case 0 { v := 1 }
-            default { v := 2 }
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.json b/test/libsolidity/ASTJSON/assembly/switch_default.json
deleted file mode 100644
index 07f804f3cb74..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch_default.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:58:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:33:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:33:1",
-                  "statements":
-                  [
-                    {
-                      "cases":
-                      [
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "79:2:1",
-                            "nodeType": "YulBlock",
-                            "src": "79:2:1",
-                            "statements": []
-                          },
-                          "nativeSrc": "72:9:1",
-                          "nodeType": "YulCase",
-                          "src": "72:9:1",
-                          "value":
-                          {
-                            "kind": "number",
-                            "nativeSrc": "77:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "77:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        },
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "90:2:1",
-                            "nodeType": "YulBlock",
-                            "src": "90:2:1",
-                            "statements": []
-                          },
-                          "nativeSrc": "82:10:1",
-                          "nodeType": "YulCase",
-                          "src": "82:10:1",
-                          "value": "default"
-                        }
-                      ],
-                      "expression":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "70:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "70:1:1",
-                        "type": "",
-                        "value": "0"
-                      },
-                      "nativeSrc": "63:29:1",
-                      "nodeType": "YulSwitch",
-                      "src": "63:29:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:42:1"
-              }
-            ]
-          },
-          "functionSelector": "e2179b8e",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 6,
-          "src": "17:83:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:102:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:103:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.sol b/test/libsolidity/ASTJSON/assembly/switch_default.sol
deleted file mode 100644
index 0760bb7dfdb7..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch_default.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function g() view public {
-        assembly { switch 0 case 0 {} default {} }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default_legacy.json b/test/libsolidity/ASTJSON/assembly/switch_default_legacy.json
deleted file mode 100644
index 324330f863c8..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch_default_legacy.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "e2179b8e",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "g",
-            "scope": 6,
-            "stateMutability": "view",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "42:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      null
-                    ],
-                    "operations": "{\n    switch 0\n    case 0 { }\n    default { }\n}"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "52:42:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "42:58:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:83:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:102:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:103:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
deleted file mode 100644
index 2ec302770814..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:58:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:33:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:33:1",
-                  "statements":
-                  [
-                    {
-                      "cases":
-                      [
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "79:2:1",
-                            "nodeType": "YulBlock",
-                            "src": "79:2:1",
-                            "statements": []
-                          },
-                          "nativeSrc": "72:9:1",
-                          "nodeType": "YulCase",
-                          "src": "72:9:1",
-                          "value":
-                          {
-                            "kind": "number",
-                            "nativeSrc": "77:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "77:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        },
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "90:2:1",
-                            "nodeType": "YulBlock",
-                            "src": "90:2:1",
-                            "statements": []
-                          },
-                          "nativeSrc": "82:10:1",
-                          "nodeType": "YulCase",
-                          "src": "82:10:1",
-                          "value": "default"
-                        }
-                      ],
-                      "expression":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "70:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "70:1:1",
-                        "type": "",
-                        "value": "0"
-                      },
-                      "nativeSrc": "63:29:1",
-                      "nodeType": "YulSwitch",
-                      "src": "63:29:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:42:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:83:1",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:102:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:103:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/switch_legacy.json b/test/libsolidity/ASTJSON/assembly/switch_legacy.json
deleted file mode 100644
index de1a1478b5bd..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch_legacy.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        6
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "linearizedBaseContracts":
-        [
-          6
-        ],
-        "name": "C",
-        "scope": 7
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "f",
-            "scope": 6,
-            "stateMutability": "pure",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "42:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      {
-                        "declaration": 5,
-                        "isOffset": false,
-                        "isSlot": false,
-                        "src": "141:1:1",
-                        "valueSize": 18446744073709551615
-                      },
-                      {
-                        "declaration": 5,
-                        "isOffset": false,
-                        "isSlot": false,
-                        "src": "172:1:1",
-                        "valueSize": 18446744073709551615
-                      }
-                    ],
-                    "operations": "{\n    let f := 0\n    switch calldatasize()\n    case 0 { f := 1 }\n    default { f := 2 }\n}"
-                  },
-                  "children": [],
-                  "id": 3,
-                  "name": "InlineAssembly",
-                  "src": "52:138:1"
-                }
-              ],
-              "id": 4,
-              "name": "Block",
-              "src": "42:154:1"
-            }
-          ],
-          "id": 5,
-          "name": "FunctionDefinition",
-          "src": "17:179:1"
-        }
-      ],
-      "id": 6,
-      "name": "ContractDefinition",
-      "src": "0:198:1"
-    }
-  ],
-  "id": 7,
-  "name": "SourceUnit",
-  "src": "0:199:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
deleted file mode 100644
index 2412ea48dd0c..000000000000
--- a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "42:154:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "61:129:1",
-                  "nodeType": "YulBlock",
-                  "src": "61:129:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "75:10:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "75:10:1",
-                      "value":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "84:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "84:1:1",
-                        "type": "",
-                        "value": "0"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "v",
-                          "nativeSrc": "79:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "79:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "cases":
-                      [
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "139:10:1",
-                            "nodeType": "YulBlock",
-                            "src": "139:10:1",
-                            "statements":
-                            [
-                              {
-                                "nativeSrc": "141:6:1",
-                                "nodeType": "YulAssignment",
-                                "src": "141:6:1",
-                                "value":
-                                {
-                                  "kind": "number",
-                                  "nativeSrc": "146:1:1",
-                                  "nodeType": "YulLiteral",
-                                  "src": "146:1:1",
-                                  "type": "",
-                                  "value": "1"
-                                },
-                                "variableNames":
-                                [
-                                  {
-                                    "name": "v",
-                                    "nativeSrc": "141:1:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "141:1:1"
-                                  }
-                                ]
-                              }
-                            ]
-                          },
-                          "nativeSrc": "132:17:1",
-                          "nodeType": "YulCase",
-                          "src": "132:17:1",
-                          "value":
-                          {
-                            "kind": "number",
-                            "nativeSrc": "137:1:1",
-                            "nodeType": "YulLiteral",
-                            "src": "137:1:1",
-                            "type": "",
-                            "value": "0"
-                          }
-                        },
-                        {
-                          "body":
-                          {
-                            "nativeSrc": "170:10:1",
-                            "nodeType": "YulBlock",
-                            "src": "170:10:1",
-                            "statements":
-                            [
-                              {
-                                "nativeSrc": "172:6:1",
-                                "nodeType": "YulAssignment",
-                                "src": "172:6:1",
-                                "value":
-                                {
-                                  "kind": "number",
-                                  "nativeSrc": "177:1:1",
-                                  "nodeType": "YulLiteral",
-                                  "src": "177:1:1",
-                                  "type": "",
-                                  "value": "2"
-                                },
-                                "variableNames":
-                                [
-                                  {
-                                    "name": "v",
-                                    "nativeSrc": "172:1:1",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "172:1:1"
-                                  }
-                                ]
-                              }
-                            ]
-                          },
-                          "nativeSrc": "162:18:1",
-                          "nodeType": "YulCase",
-                          "src": "162:18:1",
-                          "value": "default"
-                        }
-                      ],
-                      "expression":
-                      {
-                        "arguments": [],
-                        "functionName":
-                        {
-                          "name": "calldatasize",
-                          "nativeSrc": "105:12:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "105:12:1"
-                        },
-                        "nativeSrc": "105:14:1",
-                        "nodeType": "YulFunctionCall",
-                        "src": "105:14:1"
-                      },
-                      "nativeSrc": "98:82:1",
-                      "nodeType": "YulSwitch",
-                      "src": "98:82:1"
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "52:138:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:179:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:198:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:199:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.json b/test/libsolidity/ASTJSON/assembly/var_access.json
deleted file mode 100644
index ae7845815fa2..000000000000
--- a/test/libsolidity/ASTJSON/assembly/var_access.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      9
-    ]
-  },
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 9,
-      "linearizedBaseContracts":
-      [
-        9
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "42:51:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "57:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 7,
-                    "src": "52:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "52:4:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 5,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "52:6:1"
-              },
-              {
-                "AST":
-                {
-                  "nativeSrc": "77:10:1",
-                  "nodeType": "YulBlock",
-                  "src": "77:10:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "79:6:1",
-                      "nodeType": "YulAssignment",
-                      "src": "79:6:1",
-                      "value":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "84:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "84:1:1",
-                        "type": "",
-                        "value": "7"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "79:1:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "79:1:1"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
-                  {
-                    "declaration": 4,
-                    "isOffset": false,
-                    "isSlot": false,
-                    "src": "79:1:1",
-                    "valueSize": 1
-                  }
-                ],
-                "id": 6,
-                "nodeType": "InlineAssembly",
-                "src": "68:19:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 8,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 9,
-          "src": "17:76:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 10,
-      "src": "0:95:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:96:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.sol b/test/libsolidity/ASTJSON/assembly/var_access.sol
deleted file mode 100644
index e4b7423fde04..000000000000
--- a/test/libsolidity/ASTJSON/assembly/var_access.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        uint x;
-        assembly { x := 7 }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/assembly/var_access_legacy.json b/test/libsolidity/ASTJSON/assembly/var_access_legacy.json
deleted file mode 100644
index fcd798ad9b1f..000000000000
--- a/test/libsolidity/ASTJSON/assembly/var_access_legacy.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  "attributes":
-  {
-    "absolutePath": "a",
-    "exportedSymbols":
-    {
-      "C":
-      [
-        9
-      ]
-    }
-  },
-  "children":
-  [
-    {
-      "attributes":
-      {
-        "abstract": false,
-        "baseContracts":
-        [
-          null
-        ],
-        "contractDependencies":
-        [
-          null
-        ],
-        "contractKind": "contract",
-        "fullyImplemented": true,
-        "linearizedBaseContracts":
-        [
-          9
-        ],
-        "name": "C",
-        "scope": 10
-      },
-      "children":
-      [
-        {
-          "attributes":
-          {
-            "functionSelector": "26121ff0",
-            "implemented": true,
-            "isConstructor": false,
-            "kind": "function",
-            "modifiers":
-            [
-              null
-            ],
-            "name": "f",
-            "scope": 9,
-            "stateMutability": "pure",
-            "virtual": false,
-            "visibility": "public"
-          },
-          "children":
-          [
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 1,
-              "name": "ParameterList",
-              "src": "27:2:1"
-            },
-            {
-              "attributes":
-              {
-                "parameters":
-                [
-                  null
-                ]
-              },
-              "children": [],
-              "id": 2,
-              "name": "ParameterList",
-              "src": "42:0:1"
-            },
-            {
-              "children":
-              [
-                {
-                  "attributes":
-                  {
-                    "assignments":
-                    [
-                      4
-                    ]
-                  },
-                  "children":
-                  [
-                    {
-                      "attributes":
-                      {
-                        "constant": false,
-                        "mutability": "mutable",
-                        "name": "x",
-                        "scope": 7,
-                        "stateVariable": false,
-                        "storageLocation": "default",
-                        "type": "uint256",
-                        "visibility": "internal"
-                      },
-                      "children":
-                      [
-                        {
-                          "attributes":
-                          {
-                            "name": "uint",
-                            "type": "uint256"
-                          },
-                          "id": 3,
-                          "name": "ElementaryTypeName",
-                          "src": "52:4:1"
-                        }
-                      ],
-                      "id": 4,
-                      "name": "VariableDeclaration",
-                      "src": "52:6:1"
-                    }
-                  ],
-                  "id": 5,
-                  "name": "VariableDeclarationStatement",
-                  "src": "52:6:1"
-                },
-                {
-                  "attributes":
-                  {
-                    "evmVersion": %EVMVERSION%,
-                    "externalReferences":
-                    [
-                      {
-                        "declaration": 4,
-                        "isOffset": false,
-                        "isSlot": false,
-                        "src": "79:1:1",
-                        "valueSize": 1
-                      }
-                    ],
-                    "operations": "{ x := 7 }"
-                  },
-                  "children": [],
-                  "id": 6,
-                  "name": "InlineAssembly",
-                  "src": "68:19:1"
-                }
-              ],
-              "id": 7,
-              "name": "Block",
-              "src": "42:51:1"
-            }
-          ],
-          "id": 8,
-          "name": "FunctionDefinition",
-          "src": "17:76:1"
-        }
-      ],
-      "id": 9,
-      "name": "ContractDefinition",
-      "src": "0:95:1"
-    }
-  ],
-  "id": 10,
-  "name": "SourceUnit",
-  "src": "0:96:1"
-}
diff --git a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
deleted file mode 100644
index ca3fcf92c91e..000000000000
--- a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 9,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "42:51:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "57:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "52:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "52:4:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 5,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "52:6:1"
-              },
-              {
-                "AST":
-                {
-                  "nativeSrc": "77:10:1",
-                  "nodeType": "YulBlock",
-                  "src": "77:10:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "79:6:1",
-                      "nodeType": "YulAssignment",
-                      "src": "79:6:1",
-                      "value":
-                      {
-                        "kind": "number",
-                        "nativeSrc": "84:1:1",
-                        "nodeType": "YulLiteral",
-                        "src": "84:1:1",
-                        "type": "",
-                        "value": "7"
-                      },
-                      "variableNames":
-                      [
-                        {
-                          "name": "x",
-                          "nativeSrc": "79:1:1",
-                          "nodeType": "YulIdentifier",
-                          "src": "79:1:1"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 6,
-                "nodeType": "InlineAssembly",
-                "src": "68:19:1"
-              }
-            ]
-          },
-          "id": 8,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:76:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:95:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:96:1"
-}
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
deleted file mode 100644
index 07886a166338..000000000000
--- a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
+++ /dev/null
@@ -1,1027 +0,0 @@
-[
-{
-  "absolutePath": "L",
-  "exportedSymbols":
-  {
-    "L":
-    [
-      78
-    ],
-    "free1":
-    [
-      65
-    ],
-    "free2":
-    [
-      69
-    ]
-  },
-  "id": 79,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "body":
-      {
-        "id": 64,
-        "nodeType": "Block",
-        "src": "17:2:1",
-        "statements": []
-      },
-      "id": 65,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "free1",
-      "nameLocation": "9:5:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 62,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "14:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 63,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "17:0:1"
-      },
-      "scope": 79,
-      "src": "0:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "body":
-      {
-        "id": 68,
-        "nodeType": "Block",
-        "src": "37:2:1",
-        "statements": []
-      },
-      "id": 69,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "free2",
-      "nameLocation": "29:5:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 66,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "34:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 67,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "37:0:1"
-      },
-      "scope": 79,
-      "src": "20:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "L",
-      "contractDependencies": [],
-      "contractKind": "library",
-      "fullyImplemented": true,
-      "id": 78,
-      "linearizedBaseContracts":
-      [
-        78
-      ],
-      "name": "L",
-      "nameLocation": "48:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 72,
-            "nodeType": "Block",
-            "src": "78:2:1",
-            "statements": []
-          },
-          "id": 73,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "65:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 70,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "66:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 71,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "78:0:1"
-          },
-          "scope": 78,
-          "src": "56:24:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 76,
-            "nodeType": "Block",
-            "src": "107:2:1",
-            "statements": []
-          },
-          "id": 77,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "h",
-          "nameLocation": "94:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 74,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "95:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 75,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "107:0:1"
-          },
-          "scope": 78,
-          "src": "85:24:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        }
-      ],
-      "scope": 79,
-      "src": "40:71:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:112:1"
-},
-{
-  "absolutePath": "A",
-  "exportedSymbols":
-  {
-    "A":
-    [
-      22
-    ],
-    "B":
-    [
-      37
-    ],
-    "L":
-    [
-      78
-    ],
-    "free1":
-    [
-      65
-    ],
-    "free2":
-    [
-      69
-    ]
-  },
-  "id": 38,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "absolutePath": "L",
-      "file": "L",
-      "id": 1,
-      "nameLocation": "-1:-1:-1",
-      "nodeType": "ImportDirective",
-      "scope": 38,
-      "sourceUnit": 79,
-      "src": "0:11:2",
-      "symbolAliases": [],
-      "unitAlias": ""
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "A",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 22,
-      "internalFunctionIDs":
-      {
-        "69": 1,
-        "73": 2,
-        "77": 3
-      },
-      "linearizedBaseContracts":
-      [
-        22
-      ],
-      "name": "A",
-      "nameLocation": "21:1:2",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 20,
-            "nodeType": "Block",
-            "src": "49:60:2",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 4,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 78,
-                          "src": "60:1:2",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 6,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "62:1:2",
-                        "memberName": "g",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 73,
-                        "src": "60:3:2",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 7,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "59:5:2",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 8,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "59:7:2",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 9,
-                "nodeType": "ExpressionStatement",
-                "src": "59:7:2"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 10,
-                        "name": "free2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 69,
-                        "src": "77:5:2",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 11,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "76:7:2",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 12,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "76:9:2",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 13,
-                "nodeType": "ExpressionStatement",
-                "src": "76:9:2"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 14,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 78,
-                          "src": "96:1:2",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 16,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "98:1:2",
-                        "memberName": "h",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 77,
-                        "src": "96:3:2",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 17,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "95:5:2",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 18,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "95:7:2",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 19,
-                "nodeType": "ExpressionStatement",
-                "src": "95:7:2"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 21,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "38:1:2",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "39:2:2"
-          },
-          "returnParameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "49:0:2"
-          },
-          "scope": 22,
-          "src": "29:80:2",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 38,
-      "src": "12:99:2",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "B",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 37,
-      "internalFunctionIDs":
-      {
-        "69": 1,
-        "77": 2
-      },
-      "linearizedBaseContracts":
-      [
-        37
-      ],
-      "name": "B",
-      "nameLocation": "121:1:2",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 35,
-            "nodeType": "Block",
-            "src": "149:43:2",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 25,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 78,
-                          "src": "160:1:2",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 27,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "162:1:2",
-                        "memberName": "h",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 77,
-                        "src": "160:3:2",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 28,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "159:5:2",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 29,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "159:7:2",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 30,
-                "nodeType": "ExpressionStatement",
-                "src": "159:7:2"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 31,
-                        "name": "free2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 69,
-                        "src": "177:5:2",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 32,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "176:7:2",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 33,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "176:9:2",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 34,
-                "nodeType": "ExpressionStatement",
-                "src": "176:9:2"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 36,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "138:1:2",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 23,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "139:2:2"
-          },
-          "returnParameters":
-          {
-            "id": 24,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "149:0:2"
-          },
-          "scope": 37,
-          "src": "129:63:2",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 38,
-      "src": "112:82:2",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:195:2"
-},
-{
-  "absolutePath": "C",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      60
-    ],
-    "L":
-    [
-      78
-    ],
-    "free1":
-    [
-      65
-    ],
-    "free2":
-    [
-      69
-    ]
-  },
-  "id": 61,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "absolutePath": "L",
-      "file": "L",
-      "id": 39,
-      "nameLocation": "-1:-1:-1",
-      "nodeType": "ImportDirective",
-      "scope": 61,
-      "sourceUnit": 79,
-      "src": "0:11:3",
-      "symbolAliases": [],
-      "unitAlias": ""
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 60,
-      "internalFunctionIDs":
-      {
-        "69": 1,
-        "73": 2,
-        "77": 3
-      },
-      "linearizedBaseContracts":
-      [
-        60
-      ],
-      "name": "C",
-      "nameLocation": "21:1:3",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 58,
-            "nodeType": "Block",
-            "src": "49:60:3",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 42,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 78,
-                          "src": "60:1:3",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 44,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "62:1:3",
-                        "memberName": "g",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 73,
-                        "src": "60:3:3",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 45,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "59:5:3",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 46,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "59:7:3",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 47,
-                "nodeType": "ExpressionStatement",
-                "src": "59:7:3"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 48,
-                        "name": "free2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 69,
-                        "src": "77:5:3",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 49,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "76:7:3",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 50,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "76:9:3",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 51,
-                "nodeType": "ExpressionStatement",
-                "src": "76:9:3"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 52,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 78,
-                          "src": "96:1:3",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 54,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "98:1:3",
-                        "memberName": "h",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 77,
-                        "src": "96:3:3",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 55,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "95:5:3",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 56,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "95:7:3",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 57,
-                "nodeType": "ExpressionStatement",
-                "src": "95:7:3"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 59,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "38:1:3",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 40,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "39:2:3"
-          },
-          "returnParameters":
-          {
-            "id": 41,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "49:0:3"
-          },
-          "scope": 60,
-          "src": "29:80:3",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 61,
-      "src": "12:99:3",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:112:3"
-}
-]
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
deleted file mode 100644
index 6e0b28c82ac3..000000000000
--- a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-==== Source: L ====
-
-function free1() {}
-function free2() {}
-library L {
-    function g() internal {}
-    function h() internal {}
-}
-
-==== Source: A ====
-
-import "L";
-contract A {
-    function f() public {
-        (L.g)();
-        (free2)();
-        (L.h)();
-    }
-}
-contract B {
-    function f() public {
-        (L.h)();
-        (free2)();
-    }
-}
-
-==== Source: C ====
-
-import "L";
-contract C {
-    function f() public {
-        (L.g)();
-        (free2)();
-        (L.h)();
-    }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
deleted file mode 100644
index d452f2d99fec..000000000000
--- a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
+++ /dev/null
@@ -1,1562 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      128
-    ],
-    "D":
-    [
-      141
-    ],
-    "L":
-    [
-      53
-    ],
-    "free1":
-    [
-      4
-    ],
-    "free2":
-    [
-      8
-    ],
-    "free3":
-    [
-      12
-    ]
-  },
-  "id": 142,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "body":
-      {
-        "id": 3,
-        "nodeType": "Block",
-        "src": "17:2:1",
-        "statements": []
-      },
-      "id": 4,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "free1",
-      "nameLocation": "9:5:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 1,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "14:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 2,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "17:0:1"
-      },
-      "scope": 142,
-      "src": "0:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "body":
-      {
-        "id": 7,
-        "nodeType": "Block",
-        "src": "37:2:1",
-        "statements": []
-      },
-      "id": 8,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "free2",
-      "nameLocation": "29:5:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 5,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "34:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 6,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "37:0:1"
-      },
-      "scope": 142,
-      "src": "20:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "body":
-      {
-        "id": 11,
-        "nodeType": "Block",
-        "src": "57:2:1",
-        "statements": []
-      },
-      "id": 12,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "free3",
-      "nameLocation": "49:5:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 9,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "54:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 10,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "57:0:1"
-      },
-      "scope": 142,
-      "src": "40:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "L",
-      "contractDependencies": [],
-      "contractKind": "library",
-      "fullyImplemented": true,
-      "id": 53,
-      "internalFunctionIDs":
-      {
-        "20": 3,
-        "24": 4,
-        "4": 1,
-        "8": 2
-      },
-      "linearizedBaseContracts":
-      [
-        53
-      ],
-      "name": "L",
-      "nameLocation": "68:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 15,
-            "nodeType": "Block",
-            "src": "100:2:1",
-            "statements": []
-          },
-          "functionSelector": "cf9f23b5",
-          "id": 16,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "ext",
-          "nameLocation": "85:3:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "88:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "100:0:1"
-          },
-          "scope": 53,
-          "src": "76:26:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "external"
-        },
-        {
-          "body":
-          {
-            "id": 19,
-            "nodeType": "Block",
-            "src": "132:2:1",
-            "statements": []
-          },
-          "id": 20,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "inr1",
-          "nameLocation": "116:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 17,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "120:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 18,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "132:0:1"
-          },
-          "scope": 53,
-          "src": "107:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 23,
-            "nodeType": "Block",
-            "src": "164:2:1",
-            "statements": []
-          },
-          "id": 24,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "inr2",
-          "nameLocation": "148:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 21,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "152:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 22,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "164:0:1"
-          },
-          "scope": 53,
-          "src": "139:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 27,
-            "nodeType": "Block",
-            "src": "196:2:1",
-            "statements": []
-          },
-          "id": 28,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "inr3",
-          "nameLocation": "180:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 25,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "184:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 26,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "196:0:1"
-          },
-          "scope": 53,
-          "src": "171:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 39,
-            "nodeType": "Block",
-            "src": "228:51:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "id": 31,
-                  "name": "free1",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 4,
-                  "src": "238:5:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 32,
-                "nodeType": "ExpressionStatement",
-                "src": "238:5:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 33,
-                  "name": "inr1",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 20,
-                  "src": "253:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 34,
-                "nodeType": "ExpressionStatement",
-                "src": "253:4:1"
-              },
-              {
-                "expression":
-                {
-                  "expression":
-                  {
-                    "id": 35,
-                    "name": "L",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 53,
-                    "src": "267:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_type$_t_contract$_L_$53_$",
-                      "typeString": "type(library L)"
-                    }
-                  },
-                  "id": 37,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "memberLocation": "269:3:1",
-                  "memberName": "ext",
-                  "nodeType": "MemberAccess",
-                  "referencedDeclaration": 16,
-                  "src": "267:5:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 38,
-                "nodeType": "ExpressionStatement",
-                "src": "267:5:1"
-              }
-            ]
-          },
-          "functionSelector": "71907f17",
-          "id": 40,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "access",
-          "nameLocation": "212:6:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 29,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "218:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 30,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "228:0:1"
-          },
-          "scope": 53,
-          "src": "203:76:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 51,
-            "nodeType": "Block",
-            "src": "313:44:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 43,
-                        "name": "free2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 8,
-                        "src": "324:5:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 44,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "323:7:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 45,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "323:9:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 46,
-                "nodeType": "ExpressionStatement",
-                "src": "323:9:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 47,
-                        "name": "inr2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 24,
-                        "src": "343:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 48,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "342:6:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 49,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "342:8:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 50,
-                "nodeType": "ExpressionStatement",
-                "src": "342:8:1"
-              }
-            ]
-          },
-          "functionSelector": "4228dae0",
-          "id": 52,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "expression",
-          "nameLocation": "293:10:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 41,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "303:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 42,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "313:0:1"
-          },
-          "scope": 53,
-          "src": "284:73:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 142,
-      "src": "60:299:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 128,
-      "internalFunctionIDs":
-      {
-        "20": 3,
-        "24": 4,
-        "4": 1,
-        "69": 5,
-        "73": 6,
-        "8": 2
-      },
-      "linearizedBaseContracts":
-      [
-        128
-      ],
-      "name": "C",
-      "nameLocation": "369:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 56,
-            "nodeType": "Block",
-            "src": "402:2:1",
-            "statements": []
-          },
-          "functionSelector": "05b07a6b",
-          "id": 57,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "ext1",
-          "nameLocation": "386:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 54,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "390:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 55,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "402:0:1"
-          },
-          "scope": 128,
-          "src": "377:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "external"
-        },
-        {
-          "body":
-          {
-            "id": 60,
-            "nodeType": "Block",
-            "src": "434:2:1",
-            "statements": []
-          },
-          "functionSelector": "5aa6e183",
-          "id": 61,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "ext2",
-          "nameLocation": "418:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 58,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "422:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 59,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "434:0:1"
-          },
-          "scope": 128,
-          "src": "409:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "external"
-        },
-        {
-          "body":
-          {
-            "id": 64,
-            "nodeType": "Block",
-            "src": "466:2:1",
-            "statements": []
-          },
-          "functionSelector": "0a77b8ef",
-          "id": 65,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "ext3",
-          "nameLocation": "450:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 62,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "454:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 63,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "466:0:1"
-          },
-          "scope": 128,
-          "src": "441:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "external"
-        },
-        {
-          "body":
-          {
-            "id": 68,
-            "nodeType": "Block",
-            "src": "498:2:1",
-            "statements": []
-          },
-          "id": 69,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "inr1",
-          "nameLocation": "482:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 66,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "486:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 67,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "498:0:1"
-          },
-          "scope": 128,
-          "src": "473:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 72,
-            "nodeType": "Block",
-            "src": "530:2:1",
-            "statements": []
-          },
-          "id": 73,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "inr2",
-          "nameLocation": "514:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 70,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "518:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 71,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "530:0:1"
-          },
-          "scope": 128,
-          "src": "505:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 76,
-            "nodeType": "Block",
-            "src": "562:2:1",
-            "statements": []
-          },
-          "id": 77,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "inr3",
-          "nameLocation": "546:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 74,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "550:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 75,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "562:0:1"
-          },
-          "scope": 128,
-          "src": "537:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 96,
-            "nodeType": "Block",
-            "src": "594:86:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "expression":
-                  {
-                    "id": 80,
-                    "name": "this",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": -28,
-                    "src": "604:4:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_contract$_C_$128",
-                      "typeString": "contract C"
-                    }
-                  },
-                  "id": 82,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "memberLocation": "609:4:1",
-                  "memberName": "ext1",
-                  "nodeType": "MemberAccess",
-                  "referencedDeclaration": 57,
-                  "src": "604:9:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
-                    "typeString": "function () external"
-                  }
-                },
-                "id": 83,
-                "nodeType": "ExpressionStatement",
-                "src": "604:9:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 84,
-                  "name": "inr1",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 69,
-                  "src": "623:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 85,
-                "nodeType": "ExpressionStatement",
-                "src": "623:4:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 86,
-                  "name": "free1",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 4,
-                  "src": "637:5:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 87,
-                "nodeType": "ExpressionStatement",
-                "src": "637:5:1"
-              },
-              {
-                "expression":
-                {
-                  "expression":
-                  {
-                    "id": 88,
-                    "name": "L",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 53,
-                    "src": "652:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_type$_t_contract$_L_$53_$",
-                      "typeString": "type(library L)"
-                    }
-                  },
-                  "id": 90,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "memberLocation": "654:4:1",
-                  "memberName": "inr1",
-                  "nodeType": "MemberAccess",
-                  "referencedDeclaration": 20,
-                  "src": "652:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 91,
-                "nodeType": "ExpressionStatement",
-                "src": "652:6:1"
-              },
-              {
-                "expression":
-                {
-                  "expression":
-                  {
-                    "id": 92,
-                    "name": "L",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 53,
-                    "src": "668:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_type$_t_contract$_L_$53_$",
-                      "typeString": "type(library L)"
-                    }
-                  },
-                  "id": 94,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "memberLocation": "670:3:1",
-                  "memberName": "ext",
-                  "nodeType": "MemberAccess",
-                  "referencedDeclaration": 16,
-                  "src": "668:5:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
-                    "typeString": "function ()"
-                  }
-                },
-                "id": 95,
-                "nodeType": "ExpressionStatement",
-                "src": "668:5:1"
-              }
-            ]
-          },
-          "functionSelector": "71907f17",
-          "id": 97,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "access",
-          "nameLocation": "578:6:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 78,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "584:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 79,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "594:0:1"
-          },
-          "scope": 128,
-          "src": "569:111:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 126,
-            "nodeType": "Block",
-            "src": "714:106:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 100,
-                          "name": "this",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": -28,
-                          "src": "725:4:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_contract$_C_$128",
-                            "typeString": "contract C"
-                          }
-                        },
-                        "id": 102,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "730:4:1",
-                        "memberName": "ext2",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 61,
-                        "src": "725:9:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
-                          "typeString": "function () external"
-                        }
-                      }
-                    ],
-                    "id": 103,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "724:11:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
-                      "typeString": "function () external"
-                    }
-                  },
-                  "id": 104,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "724:13:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 105,
-                "nodeType": "ExpressionStatement",
-                "src": "724:13:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 106,
-                        "name": "inr2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 73,
-                        "src": "748:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 107,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "747:6:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 108,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "747:8:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 109,
-                "nodeType": "ExpressionStatement",
-                "src": "747:8:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "id": 110,
-                        "name": "free2",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 8,
-                        "src": "766:5:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 111,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "765:7:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 112,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "765:9:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 113,
-                "nodeType": "ExpressionStatement",
-                "src": "765:9:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 114,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 53,
-                          "src": "785:1:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$53_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 116,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "787:4:1",
-                        "memberName": "inr2",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 24,
-                        "src": "785:6:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 117,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "784:8:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 118,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "784:10:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 119,
-                "nodeType": "ExpressionStatement",
-                "src": "784:10:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "components":
-                    [
-                      {
-                        "expression":
-                        {
-                          "id": 120,
-                          "name": "L",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 53,
-                          "src": "805:1:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_type$_t_contract$_L_$53_$",
-                            "typeString": "type(library L)"
-                          }
-                        },
-                        "id": 122,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "807:3:1",
-                        "memberName": "ext",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 16,
-                        "src": "805:5:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
-                          "typeString": "function ()"
-                        }
-                      }
-                    ],
-                    "id": 123,
-                    "isConstant": false,
-                    "isInlineArray": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "TupleExpression",
-                    "src": "804:7:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 124,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "804:9:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 125,
-                "nodeType": "ExpressionStatement",
-                "src": "804:9:1"
-              }
-            ]
-          },
-          "functionSelector": "4228dae0",
-          "id": 127,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "expression",
-          "nameLocation": "694:10:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 98,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "704:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 99,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "714:0:1"
-          },
-          "scope": 128,
-          "src": "685:135:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 142,
-      "src": "360:462:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 129,
-            "name": "C",
-            "nameLocations":
-            [
-              "837:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 128,
-            "src": "837:1:1"
-          },
-          "id": 130,
-          "nodeType": "InheritanceSpecifier",
-          "src": "837:1:1"
-        }
-      ],
-      "canonicalName": "D",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 141,
-      "internalFunctionIDs":
-      {
-        "20": 3,
-        "24": 4,
-        "4": 1,
-        "69": 5,
-        "73": 6,
-        "8": 2
-      },
-      "linearizedBaseContracts":
-      [
-        141,
-        128
-      ],
-      "name": "D",
-      "nameLocation": "832:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 139,
-            "nodeType": "Block",
-            "src": "859:47:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "id": 133,
-                    "name": "access",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 97,
-                    "src": "869:6:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 134,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "869:8:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 135,
-                "nodeType": "ExpressionStatement",
-                "src": "869:8:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "id": 136,
-                    "name": "expression",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 127,
-                    "src": "887:10:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 137,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "887:12:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 138,
-                "nodeType": "ExpressionStatement",
-                "src": "887:12:1"
-              }
-            ]
-          },
-          "id": 140,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 131,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "856:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 132,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "859:0:1"
-          },
-          "scope": 141,
-          "src": "845:61:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 142,
-      "src": "823:85:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:909:1"
-}
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.sol b/test/libsolidity/ASTJSON/ast_internal_function_id_export.sol
deleted file mode 100644
index 100897b71f03..000000000000
--- a/test/libsolidity/ASTJSON/ast_internal_function_id_export.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-function free1() {}
-function free2() {}
-function free3() {}
-library L {
-    function ext() external {}
-    function inr1() internal {}
-    function inr2() internal {}
-    function inr3() internal {}
-    function access() public {
-        free1;
-        inr1;
-        L.ext;
-    }
-    function expression() public {
-        (free2)();
-        (inr2)();
-    }
-}
-contract C {
-    function ext1() external {}
-    function ext2() external {}
-    function ext3() external {}
-    function inr1() internal {}
-    function inr2() internal {}
-    function inr3() internal {}
-    function access() public {
-        this.ext1;
-        inr1;
-        free1;
-        L.inr1;
-        L.ext;
-    }
-    function expression() public {
-        (this.ext2)();
-        (inr2)();
-        (free2)();
-        (L.inr2)();
-        (L.ext)();
-    }
-}
-contract D is C {
-    constructor() {
-        access();
-        expression();
-    }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/base_constructor_call.json b/test/libsolidity/ASTJSON/base_constructor_call.json
deleted file mode 100644
index 2c3c68c40d3a..000000000000
--- a/test/libsolidity/ASTJSON/base_constructor_call.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
-      7
-    ],
-    "C":
-    [
-      17
-    ]
-  },
-  "id": 18,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "A",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 7,
-      "linearizedBaseContracts":
-      [
-        7
-      ],
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 5,
-            "nodeType": "Block",
-            "src": "31:2:1",
-            "statements": []
-          },
-          "id": 6,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "scope": 6,
-                "src": "25:4:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "25:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "24:6:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "31:0:1"
-          },
-          "scope": 7,
-          "src": "13:20:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 18,
-      "src": "0:35:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 8,
-            "name": "A",
-            "nameLocations":
-            [
-              "50:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 7,
-            "src": "50:1:1"
-          },
-          "id": 9,
-          "nodeType": "InheritanceSpecifier",
-          "src": "50:1:1"
-        }
-      ],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 17,
-      "linearizedBaseContracts":
-      [
-        17,
-        7
-      ],
-      "name": "C",
-      "nameLocation": "45:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 15,
-            "nodeType": "Block",
-            "src": "73:2:1",
-            "statements": []
-          },
-          "id": 16,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers":
-          [
-            {
-              "arguments":
-              [
-                {
-                  "hexValue": "32",
-                  "id": 12,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "number",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "70:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_2_by_1",
-                    "typeString": "int_const 2"
-                  },
-                  "value": "2"
-                }
-              ],
-              "id": 13,
-              "kind": "baseConstructorSpecifier",
-              "modifierName":
-              {
-                "id": 11,
-                "name": "A",
-                "nameLocations":
-                [
-                  "68:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 7,
-                "src": "68:1:1"
-              },
-              "nodeType": "ModifierInvocation",
-              "src": "68:4:1"
-            }
-          ],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "65:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "73:0:1"
-          },
-          "scope": 17,
-          "src": "54:21:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 18,
-      "src": "36:41:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:78:1"
-}
diff --git a/test/libsolidity/ASTJSON/base_constructor_call.sol b/test/libsolidity/ASTJSON/base_constructor_call.sol
deleted file mode 100644
index 9e3b82259964..000000000000
--- a/test/libsolidity/ASTJSON/base_constructor_call.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { constructor(uint) {} }
-contract C is A { constructor() A(2) {} }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
deleted file mode 100644
index 730a05178c62..000000000000
--- a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 18,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 7,
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 5,
-            "nodeType": "Block",
-            "src": "31:2:1",
-            "statements": []
-          },
-          "id": 6,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "src": "25:4:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "25:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "24:6:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "31:0:1"
-          },
-          "src": "13:20:1",
-          "stateMutability": "nonpayable",
-          "virtual": false
-        }
-      ],
-      "src": "0:35:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 8,
-            "name": "A",
-            "nameLocations":
-            [
-              "50:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "50:1:1"
-          },
-          "id": 9,
-          "nodeType": "InheritanceSpecifier",
-          "src": "50:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 17,
-      "name": "C",
-      "nameLocation": "45:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 15,
-            "nodeType": "Block",
-            "src": "73:2:1",
-            "statements": []
-          },
-          "id": 16,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers":
-          [
-            {
-              "arguments":
-              [
-                {
-                  "hexValue": "32",
-                  "id": 12,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "70:1:1",
-                  "typeDescriptions": {},
-                  "value": "2"
-                }
-              ],
-              "id": 13,
-              "modifierName":
-              {
-                "id": 11,
-                "name": "A",
-                "nameLocations":
-                [
-                  "68:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "68:1:1"
-              },
-              "nodeType": "ModifierInvocation",
-              "src": "68:4:1"
-            }
-          ],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "65:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "73:0:1"
-          },
-          "src": "54:21:1",
-          "stateMutability": "nonpayable",
-          "virtual": false
-        }
-      ],
-      "src": "36:41:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:78:1"
-}
diff --git a/test/libsolidity/ASTJSON/constructor.json b/test/libsolidity/ASTJSON/constructor.json
deleted file mode 100644
index 53e622b5ddab..000000000000
--- a/test/libsolidity/ASTJSON/constructor.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "28:4:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "25:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "28:0:1"
-          },
-          "scope": 5,
-          "src": "14:18:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 6,
-      "src": "0:34:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:35:1"
-}
diff --git a/test/libsolidity/ASTJSON/constructor.sol b/test/libsolidity/ASTJSON/constructor.sol
deleted file mode 100644
index b48aa1be342a..000000000000
--- a/test/libsolidity/ASTJSON/constructor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	constructor() {
-	}
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/constructor_parseOnly.json b/test/libsolidity/ASTJSON/constructor_parseOnly.json
deleted file mode 100644
index 9b1d4cfc4460..000000000000
--- a/test/libsolidity/ASTJSON/constructor_parseOnly.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "28:4:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "25:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "28:0:1"
-          },
-          "src": "14:18:1",
-          "stateMutability": "nonpayable",
-          "virtual": false
-        }
-      ],
-      "src": "0:34:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:35:1"
-}
diff --git a/test/libsolidity/ASTJSON/contract_dep_order.json b/test/libsolidity/ASTJSON/contract_dep_order.json
deleted file mode 100644
index 67eff600b68f..000000000000
--- a/test/libsolidity/ASTJSON/contract_dep_order.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
-      1
-    ],
-    "B":
-    [
-      4
-    ],
-    "C":
-    [
-      7
-    ],
-    "D":
-    [
-      10
-    ],
-    "E":
-    [
-      13
-    ]
-  },
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "A",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 1,
-      "linearizedBaseContracts":
-      [
-        1
-      ],
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 14,
-      "src": "0:14:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 2,
-            "name": "A",
-            "nameLocations":
-            [
-              "29:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 1,
-            "src": "29:1:1"
-          },
-          "id": 3,
-          "nodeType": "InheritanceSpecifier",
-          "src": "29:1:1"
-        }
-      ],
-      "canonicalName": "B",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 4,
-      "linearizedBaseContracts":
-      [
-        4,
-        1
-      ],
-      "name": "B",
-      "nameLocation": "24:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 14,
-      "src": "15:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 5,
-            "name": "B",
-            "nameLocations":
-            [
-              "49:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 4,
-            "src": "49:1:1"
-          },
-          "id": 6,
-          "nodeType": "InheritanceSpecifier",
-          "src": "49:1:1"
-        }
-      ],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 7,
-      "linearizedBaseContracts":
-      [
-        7,
-        4,
-        1
-      ],
-      "name": "C",
-      "nameLocation": "44:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 14,
-      "src": "35:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 8,
-            "name": "C",
-            "nameLocations":
-            [
-              "69:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 7,
-            "src": "69:1:1"
-          },
-          "id": 9,
-          "nodeType": "InheritanceSpecifier",
-          "src": "69:1:1"
-        }
-      ],
-      "canonicalName": "D",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 10,
-      "linearizedBaseContracts":
-      [
-        10,
-        7,
-        4,
-        1
-      ],
-      "name": "D",
-      "nameLocation": "64:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 14,
-      "src": "55:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 11,
-            "name": "D",
-            "nameLocations":
-            [
-              "89:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 10,
-            "src": "89:1:1"
-          },
-          "id": 12,
-          "nodeType": "InheritanceSpecifier",
-          "src": "89:1:1"
-        }
-      ],
-      "canonicalName": "E",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 13,
-      "linearizedBaseContracts":
-      [
-        13,
-        10,
-        7,
-        4,
-        1
-      ],
-      "name": "E",
-      "nameLocation": "84:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 14,
-      "src": "75:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:95:1"
-}
diff --git a/test/libsolidity/ASTJSON/contract_dep_order.sol b/test/libsolidity/ASTJSON/contract_dep_order.sol
deleted file mode 100644
index 7558e01dc075..000000000000
--- a/test/libsolidity/ASTJSON/contract_dep_order.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A { }
-contract B is A { }
-contract C is B { }
-contract D is C { }
-contract E is D { }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
deleted file mode 100644
index ba8c377cf7cd..000000000000
--- a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 1,
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "0:14:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 2,
-            "name": "A",
-            "nameLocations":
-            [
-              "29:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "29:1:1"
-          },
-          "id": 3,
-          "nodeType": "InheritanceSpecifier",
-          "src": "29:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 4,
-      "name": "B",
-      "nameLocation": "24:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "15:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 5,
-            "name": "B",
-            "nameLocations":
-            [
-              "49:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "49:1:1"
-          },
-          "id": 6,
-          "nodeType": "InheritanceSpecifier",
-          "src": "49:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 7,
-      "name": "C",
-      "nameLocation": "44:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "35:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 8,
-            "name": "C",
-            "nameLocations":
-            [
-              "69:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "69:1:1"
-          },
-          "id": 9,
-          "nodeType": "InheritanceSpecifier",
-          "src": "69:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 10,
-      "name": "D",
-      "nameLocation": "64:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "55:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 11,
-            "name": "D",
-            "nameLocations":
-            [
-              "89:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "89:1:1"
-          },
-          "id": 12,
-          "nodeType": "InheritanceSpecifier",
-          "src": "89:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 13,
-      "name": "E",
-      "nameLocation": "84:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "75:19:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:95:1"
-}
diff --git a/test/libsolidity/ASTJSON/documentation.json b/test/libsolidity/ASTJSON/documentation.json
deleted file mode 100644
index 43224bc64d1d..000000000000
--- a/test/libsolidity/ASTJSON/documentation.json
+++ /dev/null
@@ -1,273 +0,0 @@
-[
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      2
-    ]
-  },
-  "id": 3,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "documentation":
-      {
-        "id": 1,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:27:1",
-        "text": "This contract is empty"
-      },
-      "fullyImplemented": true,
-      "id": 2,
-      "linearizedBaseContracts":
-      [
-        2
-      ],
-      "name": "C",
-      "nameLocation": "37:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 3,
-      "src": "28:13:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "28:14:1"
-},
-{
-  "absolutePath": "b",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "documentation":
-      {
-        "id": 4,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:61:2",
-        "text": "This contract is empty\nand has a line-breaking comment."
-      },
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "71:1:2",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 6,
-      "src": "62:13:2",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "62:14:2"
-},
-{
-  "absolutePath": "c",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      23
-    ]
-  },
-  "id": 24,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 23,
-      "linearizedBaseContracts":
-      [
-        23
-      ],
-      "name": "C",
-      "nameLocation": "9:1:3",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "documentation":
-          {
-            "id": 7,
-            "nodeType": "StructuredDocumentation",
-            "src": "15:32:3",
-            "text": "Some comment on state var."
-          },
-          "functionSelector": "c19d93fb",
-          "id": 9,
-          "mutability": "mutable",
-          "name": "state",
-          "nameLocation": "60:5:3",
-          "nodeType": "VariableDeclaration",
-          "scope": 23,
-          "src": "48:17:3",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 8,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "48:4:3",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "visibility": "public"
-        },
-        {
-          "anonymous": false,
-          "documentation":
-          {
-            "id": 10,
-            "nodeType": "StructuredDocumentation",
-            "src": "69:26:3",
-            "text": "Some comment on Evt."
-          },
-          "eventSelector": "a69007916fc1145953e5a7032d7c3eab4b8e2f33ec59b0f71e732904eeede3a4",
-          "id": 12,
-          "name": "Evt",
-          "nameLocation": "102:3:3",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "105:2:3"
-          },
-          "src": "96:12:3"
-        },
-        {
-          "body":
-          {
-            "id": 16,
-            "nodeType": "Block",
-            "src": "153:6:3",
-            "statements":
-            [
-              {
-                "id": 15,
-                "nodeType": "PlaceholderStatement",
-                "src": "155:1:3"
-              }
-            ]
-          },
-          "documentation":
-          {
-            "id": 13,
-            "nodeType": "StructuredDocumentation",
-            "src": "111:26:3",
-            "text": "Some comment on mod."
-          },
-          "id": 17,
-          "name": "mod",
-          "nameLocation": "147:3:3",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "150:2:3"
-          },
-          "src": "138:21:3",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 21,
-            "nodeType": "Block",
-            "src": "209:2:3",
-            "statements": []
-          },
-          "documentation":
-          {
-            "id": 18,
-            "nodeType": "StructuredDocumentation",
-            "src": "162:25:3",
-            "text": "Some comment on fn."
-          },
-          "functionSelector": "a4a2c40b",
-          "id": 22,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "fn",
-          "nameLocation": "197:2:3",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 19,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "199:2:3"
-          },
-          "returnParameters":
-          {
-            "id": 20,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "209:0:3"
-          },
-          "scope": 23,
-          "src": "188:23:3",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 24,
-      "src": "0:213:3",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        12
-      ]
-    }
-  ],
-  "src": "0:214:3"
-}
-]
diff --git a/test/libsolidity/ASTJSON/documentation.sol b/test/libsolidity/ASTJSON/documentation.sol
deleted file mode 100644
index 6bbf4042af60..000000000000
--- a/test/libsolidity/ASTJSON/documentation.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: a ====
-
-/**This contract is empty*/ contract C {}
-
-==== Source: b ====
-
-/**This contract is empty
- and has a line-breaking comment.*/
-contract C {}
-
-==== Source: c ====
-
-contract C {
-  /** Some comment on state var.*/ uint public state;
-  /** Some comment on Evt.*/ event Evt();
-  /** Some comment on mod.*/ modifier mod() { _; }
-  /** Some comment on fn.*/ function fn() public {}
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.json b/test/libsolidity/ASTJSON/documentation_local_variable.json
deleted file mode 100644
index 62d76e782c2b..000000000000
--- a/test/libsolidity/ASTJSON/documentation_local_variable.json
+++ /dev/null
@@ -1,493 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      41
-    ]
-  },
-  "id": 42,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 41,
-      "linearizedBaseContracts":
-      [
-        41
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 26,
-            "nodeType": "Block",
-            "src": "42:330:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  5
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 5,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "114:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 26,
-                    "src": "109:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "typeName":
-                    {
-                      "id": 4,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "109:4:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "documentation": "Documentation for x; will appear in ast json",
-                "id": 7,
-                "initialValue":
-                {
-                  "hexValue": "31",
-                  "id": 6,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "number",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "118:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_1_by_1",
-                    "typeString": "int_const 1"
-                  },
-                  "value": "1"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "109:10:1"
-              },
-              {
-                "body":
-                {
-                  "id": 24,
-                  "nodeType": "Block",
-                  "src": "270:96:1",
-                  "statements":
-                  [
-                    {
-                      "assignments":
-                      [
-                        21
-                      ],
-                      "declarations":
-                      [
-                        {
-                          "constant": false,
-                          "id": 21,
-                          "mutability": "mutable",
-                          "name": "j",
-                          "nameLocation": "350:1:1",
-                          "nodeType": "VariableDeclaration",
-                          "scope": 24,
-                          "src": "345:6:1",
-                          "stateVariable": false,
-                          "storageLocation": "default",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          },
-                          "typeName":
-                          {
-                            "id": 20,
-                            "name": "uint",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "345:4:1",
-                            "typeDescriptions":
-                            {
-                              "typeIdentifier": "t_uint256",
-                              "typeString": "uint256"
-                            }
-                          },
-                          "visibility": "internal"
-                        }
-                      ],
-                      "documentation": "documentation for j; will appear in ast json",
-                      "id": 23,
-                      "initialValue":
-                      {
-                        "hexValue": "30",
-                        "id": 22,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "kind": "number",
-                        "lValueRequested": false,
-                        "nodeType": "Literal",
-                        "src": "354:1:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_rational_0_by_1",
-                          "typeString": "int_const 0"
-                        },
-                        "value": "0"
-                      },
-                      "nodeType": "VariableDeclarationStatement",
-                      "src": "345:10:1"
-                    }
-                  ]
-                },
-                "condition":
-                {
-                  "commonType":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  },
-                  "id": 15,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftExpression":
-                  {
-                    "id": 13,
-                    "name": "i",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 10,
-                    "src": "236:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "<",
-                  "rightExpression":
-                  {
-                    "hexValue": "3130",
-                    "id": 14,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "240:2:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_10_by_1",
-                      "typeString": "int_const 10"
-                    },
-                    "value": "10"
-                  },
-                  "src": "236:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_bool",
-                    "typeString": "bool"
-                  }
-                },
-                "id": 25,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
-                    10
-                  ],
-                  "declarations":
-                  [
-                    {
-                      "constant": false,
-                      "id": 10,
-                      "mutability": "mutable",
-                      "name": "i",
-                      "nameLocation": "217:1:1",
-                      "nodeType": "VariableDeclaration",
-                      "scope": 25,
-                      "src": "212:6:1",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      },
-                      "typeName":
-                      {
-                        "id": 9,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "212:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 12,
-                  "initialValue":
-                  {
-                    "hexValue": "30",
-                    "id": 11,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "221:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_0_by_1",
-                      "typeString": "int_const 0"
-                    },
-                    "value": "0"
-                  },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "212:10:1"
-                },
-                "isSimpleCounterLoop": true,
-                "loopExpression":
-                {
-                  "expression":
-                  {
-                    "id": 17,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "UnaryOperation",
-                    "operator": "++",
-                    "prefix": true,
-                    "src": "256:3:1",
-                    "subExpression":
-                    {
-                      "id": 16,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 10,
-                      "src": "258:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "id": 18,
-                  "nodeType": "ExpressionStatement",
-                  "src": "256:3:1"
-                },
-                "nodeType": "ForStatement",
-                "src": "129:237:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 27,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 41,
-          "src": "17:355:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 39,
-            "nodeType": "Block",
-            "src": "662:2:1",
-            "statements": []
-          },
-          "functionSelector": "191157d1",
-          "id": 40,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "386:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 37,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 30,
-                "mutability": "mutable",
-                "name": "param1",
-                "nameLocation": "468:6:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 40,
-                "src": "463:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 29,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "463:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              },
-              {
-                "constant": false,
-                "id": 33,
-                "mutability": "mutable",
-                "name": "param2",
-                "nameLocation": "555:6:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 40,
-                "src": "550:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 32,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "550:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              },
-              {
-                "constant": false,
-                "id": 36,
-                "mutability": "mutable",
-                "name": "param3",
-                "nameLocation": "642:6:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 40,
-                "src": "637:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 35,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "637:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "387:267:1"
-          },
-          "returnParameters":
-          {
-            "id": 38,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "662:0:1"
-          },
-          "scope": 41,
-          "src": "377:287:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 42,
-      "src": "0:666:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:667:1"
-}
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.sol b/test/libsolidity/ASTJSON/documentation_local_variable.sol
deleted file mode 100644
index b21602d9280b..000000000000
--- a/test/libsolidity/ASTJSON/documentation_local_variable.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    function f() public pure {
-        /// Documentation for x; will appear in ast json
-        uint x = 1;
-        for (
-            /// documentation for i; will not appear in ast json
-            uint i = 0;
-            i < 10;
-            ++i
-        ) {
-            /// documentation for j; will appear in ast json
-            uint j = 0;
-        }
-    }
-    function g(
-        /// documentation for param1; will not appear in ast json
-        uint param1,
-        /// documentation for param2; will not appear in ast json
-        uint param2,
-        /// documentation for param3; will not appear in ast json
-        uint param3
-    ) public {}
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json b/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
deleted file mode 100644
index 8725838394e8..000000000000
--- a/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
+++ /dev/null
@@ -1,358 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 42,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 41,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 26,
-            "nodeType": "Block",
-            "src": "42:330:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  5
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 5,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "114:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "109:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 4,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "109:4:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "documentation": "Documentation for x; will appear in ast json",
-                "id": 7,
-                "initialValue":
-                {
-                  "hexValue": "31",
-                  "id": 6,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "118:1:1",
-                  "typeDescriptions": {},
-                  "value": "1"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "109:10:1"
-              },
-              {
-                "body":
-                {
-                  "id": 24,
-                  "nodeType": "Block",
-                  "src": "270:96:1",
-                  "statements":
-                  [
-                    {
-                      "assignments":
-                      [
-                        21
-                      ],
-                      "declarations":
-                      [
-                        {
-                          "constant": false,
-                          "id": 21,
-                          "mutability": "mutable",
-                          "name": "j",
-                          "nameLocation": "350:1:1",
-                          "nodeType": "VariableDeclaration",
-                          "src": "345:6:1",
-                          "stateVariable": false,
-                          "storageLocation": "default",
-                          "typeDescriptions": {},
-                          "typeName":
-                          {
-                            "id": 20,
-                            "name": "uint",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "345:4:1",
-                            "typeDescriptions": {}
-                          },
-                          "visibility": "internal"
-                        }
-                      ],
-                      "documentation": "documentation for j; will appear in ast json",
-                      "id": 23,
-                      "initialValue":
-                      {
-                        "hexValue": "30",
-                        "id": 22,
-                        "kind": "number",
-                        "nodeType": "Literal",
-                        "src": "354:1:1",
-                        "typeDescriptions": {},
-                        "value": "0"
-                      },
-                      "nodeType": "VariableDeclarationStatement",
-                      "src": "345:10:1"
-                    }
-                  ]
-                },
-                "condition":
-                {
-                  "commonType": {},
-                  "id": 15,
-                  "leftExpression":
-                  {
-                    "id": 13,
-                    "name": "i",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "236:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "<",
-                  "rightExpression":
-                  {
-                    "hexValue": "3130",
-                    "id": 14,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "240:2:1",
-                    "typeDescriptions": {},
-                    "value": "10"
-                  },
-                  "src": "236:6:1",
-                  "typeDescriptions": {}
-                },
-                "id": 25,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
-                    10
-                  ],
-                  "declarations":
-                  [
-                    {
-                      "constant": false,
-                      "id": 10,
-                      "mutability": "mutable",
-                      "name": "i",
-                      "nameLocation": "217:1:1",
-                      "nodeType": "VariableDeclaration",
-                      "src": "212:6:1",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions": {},
-                      "typeName":
-                      {
-                        "id": 9,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "212:4:1",
-                        "typeDescriptions": {}
-                      },
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 12,
-                  "initialValue":
-                  {
-                    "hexValue": "30",
-                    "id": 11,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "221:1:1",
-                    "typeDescriptions": {},
-                    "value": "0"
-                  },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "212:10:1"
-                },
-                "loopExpression":
-                {
-                  "expression":
-                  {
-                    "id": 17,
-                    "nodeType": "UnaryOperation",
-                    "operator": "++",
-                    "prefix": true,
-                    "src": "256:3:1",
-                    "subExpression":
-                    {
-                      "id": 16,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "258:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "typeDescriptions": {}
-                  },
-                  "id": 18,
-                  "nodeType": "ExpressionStatement",
-                  "src": "256:3:1"
-                },
-                "nodeType": "ForStatement",
-                "src": "129:237:1"
-              }
-            ]
-          },
-          "id": 27,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "17:355:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 39,
-            "nodeType": "Block",
-            "src": "662:2:1",
-            "statements": []
-          },
-          "id": 40,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "386:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 37,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 30,
-                "mutability": "mutable",
-                "name": "param1",
-                "nameLocation": "468:6:1",
-                "nodeType": "VariableDeclaration",
-                "src": "463:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 29,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "463:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              },
-              {
-                "constant": false,
-                "id": 33,
-                "mutability": "mutable",
-                "name": "param2",
-                "nameLocation": "555:6:1",
-                "nodeType": "VariableDeclaration",
-                "src": "550:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 32,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "550:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              },
-              {
-                "constant": false,
-                "id": 36,
-                "mutability": "mutable",
-                "name": "param3",
-                "nameLocation": "642:6:1",
-                "nodeType": "VariableDeclaration",
-                "src": "637:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 35,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "637:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "387:267:1"
-          },
-          "returnParameters":
-          {
-            "id": 38,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "662:0:1"
-          },
-          "src": "377:287:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:666:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:667:1"
-}
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.json b/test/libsolidity/ASTJSON/documentation_on_statements.json
deleted file mode 100644
index cc4a1ef3c166..000000000000
--- a/test/libsolidity/ASTJSON/documentation_on_statements.json
+++ /dev/null
@@ -1,378 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      27
-    ]
-  },
-  "id": 28,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 27,
-      "linearizedBaseContracts":
-      [
-        27
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 2,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "50:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 27,
-          "src": "45:6:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 1,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "45:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 25,
-            "nodeType": "Block",
-            "src": "99:229:1",
-            "statements":
-            [
-              {
-                "body":
-                {
-                  "id": 21,
-                  "nodeType": "Block",
-                  "src": "156:66:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "id": 19,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "leftHandSide":
-                        {
-                          "id": 17,
-                          "name": "x",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 5,
-                          "src": "205:1:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
-                        },
-                        "nodeType": "Assignment",
-                        "operator": "*=",
-                        "rightHandSide":
-                        {
-                          "hexValue": "32",
-                          "id": 18,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": true,
-                          "kind": "number",
-                          "lValueRequested": false,
-                          "nodeType": "Literal",
-                          "src": "210:1:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_rational_2_by_1",
-                            "typeString": "int_const 2"
-                          },
-                          "value": "2"
-                        },
-                        "src": "205:6:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "id": 20,
-                      "nodeType": "ExpressionStatement",
-                      "src": "205:6:1"
-                    }
-                  ]
-                },
-                "condition":
-                {
-                  "commonType":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  },
-                  "id": 13,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftExpression":
-                  {
-                    "id": 11,
-                    "name": "i",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 8,
-                    "src": "143:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "<",
-                  "rightExpression":
-                  {
-                    "hexValue": "3230",
-                    "id": 12,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "147:2:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_20_by_1",
-                      "typeString": "int_const 20"
-                    },
-                    "value": "20"
-                  },
-                  "src": "143:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_bool",
-                    "typeString": "bool"
-                  }
-                },
-                "id": 22,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
-                    8
-                  ],
-                  "declarations":
-                  [
-                    {
-                      "constant": false,
-                      "id": 8,
-                      "mutability": "mutable",
-                      "name": "i",
-                      "nameLocation": "136:1:1",
-                      "nodeType": "VariableDeclaration",
-                      "scope": 22,
-                      "src": "131:6:1",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      },
-                      "typeName":
-                      {
-                        "id": 7,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "131:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 10,
-                  "initialValue":
-                  {
-                    "hexValue": "30",
-                    "id": 9,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "140:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_0_by_1",
-                      "typeString": "int_const 0"
-                    },
-                    "value": "0"
-                  },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "131:10:1"
-                },
-                "isSimpleCounterLoop": true,
-                "loopExpression":
-                {
-                  "expression":
-                  {
-                    "id": 15,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "UnaryOperation",
-                    "operator": "++",
-                    "prefix": false,
-                    "src": "151:3:1",
-                    "subExpression":
-                    {
-                      "id": 14,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 8,
-                      "src": "151:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "id": 16,
-                  "nodeType": "ExpressionStatement",
-                  "src": "151:3:1"
-                },
-                "nodeType": "ForStatement",
-                "src": "126:96:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 23,
-                  "name": "x",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 5,
-                  "src": "320:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "functionReturnParameters": 6,
-                "id": 24,
-                "nodeType": "Return",
-                "src": "313:8:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 26,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "66:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "67:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 5,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "96:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 26,
-                "src": "91:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 4,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "91:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "90:8:1"
-          },
-          "scope": 27,
-          "src": "57:271:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 28,
-      "src": "0:330:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:331:1"
-}
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.sol b/test/libsolidity/ASTJSON/documentation_on_statements.sol
deleted file mode 100644
index 235fa3d20bb4..000000000000
--- a/test/libsolidity/ASTJSON/documentation_on_statements.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    // this is not exported
-    uint a;
-    function f() public pure returns (uint x) {
-        // test2
-        for (uint i = 0; i < 20; i++) {
-            // not exported either
-            x *= 2;
-        }
-        // nor is this because they are all
-        // not using the triple-slash
-        return x;
-    }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json b/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
deleted file mode 100644
index 3872027cbb54..000000000000
--- a/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
+++ /dev/null
@@ -1,261 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 28,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 27,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 2,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "50:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "45:6:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 1,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "45:4:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 25,
-            "nodeType": "Block",
-            "src": "99:229:1",
-            "statements":
-            [
-              {
-                "body":
-                {
-                  "id": 21,
-                  "nodeType": "Block",
-                  "src": "156:66:1",
-                  "statements":
-                  [
-                    {
-                      "expression":
-                      {
-                        "id": 19,
-                        "leftHandSide":
-                        {
-                          "id": 17,
-                          "name": "x",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "src": "205:1:1",
-                          "typeDescriptions": {}
-                        },
-                        "nodeType": "Assignment",
-                        "operator": "*=",
-                        "rightHandSide":
-                        {
-                          "hexValue": "32",
-                          "id": 18,
-                          "kind": "number",
-                          "nodeType": "Literal",
-                          "src": "210:1:1",
-                          "typeDescriptions": {},
-                          "value": "2"
-                        },
-                        "src": "205:6:1",
-                        "typeDescriptions": {}
-                      },
-                      "id": 20,
-                      "nodeType": "ExpressionStatement",
-                      "src": "205:6:1"
-                    }
-                  ]
-                },
-                "condition":
-                {
-                  "commonType": {},
-                  "id": 13,
-                  "leftExpression":
-                  {
-                    "id": 11,
-                    "name": "i",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "143:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "<",
-                  "rightExpression":
-                  {
-                    "hexValue": "3230",
-                    "id": 12,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "147:2:1",
-                    "typeDescriptions": {},
-                    "value": "20"
-                  },
-                  "src": "143:6:1",
-                  "typeDescriptions": {}
-                },
-                "id": 22,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
-                    8
-                  ],
-                  "declarations":
-                  [
-                    {
-                      "constant": false,
-                      "id": 8,
-                      "mutability": "mutable",
-                      "name": "i",
-                      "nameLocation": "136:1:1",
-                      "nodeType": "VariableDeclaration",
-                      "src": "131:6:1",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions": {},
-                      "typeName":
-                      {
-                        "id": 7,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "131:4:1",
-                        "typeDescriptions": {}
-                      },
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 10,
-                  "initialValue":
-                  {
-                    "hexValue": "30",
-                    "id": 9,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "140:1:1",
-                    "typeDescriptions": {},
-                    "value": "0"
-                  },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "131:10:1"
-                },
-                "loopExpression":
-                {
-                  "expression":
-                  {
-                    "id": 15,
-                    "nodeType": "UnaryOperation",
-                    "operator": "++",
-                    "prefix": false,
-                    "src": "151:3:1",
-                    "subExpression":
-                    {
-                      "id": 14,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "151:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "typeDescriptions": {}
-                  },
-                  "id": 16,
-                  "nodeType": "ExpressionStatement",
-                  "src": "151:3:1"
-                },
-                "nodeType": "ForStatement",
-                "src": "126:96:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 23,
-                  "name": "x",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "src": "320:1:1",
-                  "typeDescriptions": {}
-                },
-                "id": 24,
-                "nodeType": "Return",
-                "src": "313:8:1"
-              }
-            ]
-          },
-          "id": 26,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "66:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "67:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 5,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "96:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "91:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 4,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "91:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "90:8:1"
-          },
-          "src": "57:271:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:330:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:331:1"
-}
diff --git a/test/libsolidity/ASTJSON/documentation_parseOnly.json b/test/libsolidity/ASTJSON/documentation_parseOnly.json
deleted file mode 100644
index 7f446279b613..000000000000
--- a/test/libsolidity/ASTJSON/documentation_parseOnly.json
+++ /dev/null
@@ -1,208 +0,0 @@
-[
-{
-  "absolutePath": "a",
-  "id": 3,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "documentation":
-      {
-        "id": 1,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:27:1",
-        "text": "This contract is empty"
-      },
-      "id": 2,
-      "name": "C",
-      "nameLocation": "37:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "28:13:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "28:14:1"
-},
-{
-  "absolutePath": "b",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "documentation":
-      {
-        "id": 4,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:61:2",
-        "text": "This contract is empty\nand has a line-breaking comment."
-      },
-      "id": 5,
-      "name": "C",
-      "nameLocation": "71:1:2",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "62:13:2",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "62:14:2"
-},
-{
-  "absolutePath": "c",
-  "id": 24,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 23,
-      "name": "C",
-      "nameLocation": "9:1:3",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 9,
-          "mutability": "mutable",
-          "name": "state",
-          "nameLocation": "60:5:3",
-          "nodeType": "VariableDeclaration",
-          "src": "48:17:3",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 8,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "48:4:3",
-            "typeDescriptions": {}
-          },
-          "visibility": "public"
-        },
-        {
-          "anonymous": false,
-          "documentation":
-          {
-            "id": 10,
-            "nodeType": "StructuredDocumentation",
-            "src": "69:26:3",
-            "text": "Some comment on Evt."
-          },
-          "id": 12,
-          "name": "Evt",
-          "nameLocation": "102:3:3",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "105:2:3"
-          },
-          "src": "96:12:3"
-        },
-        {
-          "body":
-          {
-            "id": 16,
-            "nodeType": "Block",
-            "src": "153:6:3",
-            "statements":
-            [
-              {
-                "id": 15,
-                "nodeType": "PlaceholderStatement",
-                "src": "155:1:3"
-              }
-            ]
-          },
-          "documentation":
-          {
-            "id": 13,
-            "nodeType": "StructuredDocumentation",
-            "src": "111:26:3",
-            "text": "Some comment on mod."
-          },
-          "id": 17,
-          "name": "mod",
-          "nameLocation": "147:3:3",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "150:2:3"
-          },
-          "src": "138:21:3",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 21,
-            "nodeType": "Block",
-            "src": "209:2:3",
-            "statements": []
-          },
-          "documentation":
-          {
-            "id": 18,
-            "nodeType": "StructuredDocumentation",
-            "src": "162:25:3",
-            "text": "Some comment on fn."
-          },
-          "id": 22,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "fn",
-          "nameLocation": "197:2:3",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 19,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "199:2:3"
-          },
-          "returnParameters":
-          {
-            "id": 20,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "209:0:3"
-          },
-          "src": "188:23:3",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:213:3",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:214:3"
-}
-]
diff --git a/test/libsolidity/ASTJSON/documentation_triple.json b/test/libsolidity/ASTJSON/documentation_triple.json
deleted file mode 100644
index cd44bd4eb60d..000000000000
--- a/test/libsolidity/ASTJSON/documentation_triple.json
+++ /dev/null
@@ -1,388 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      28
-    ]
-  },
-  "id": 29,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 28,
-      "linearizedBaseContracts":
-      [
-        28
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "documentation":
-          {
-            "id": 1,
-            "nodeType": "StructuredDocumentation",
-            "src": "17:8:1",
-            "text": "test"
-          },
-          "id": 3,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "35:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 28,
-          "src": "30:6:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 2,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "30:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 26,
-            "nodeType": "Block",
-            "src": "84:181:1",
-            "statements":
-            [
-              {
-                "body":
-                {
-                  "id": 22,
-                  "nodeType": "Block",
-                  "src": "142:75:1",
-                  "statements":
-                  [
-                    {
-                      "documentation": "tee\n s \"t\" 3",
-                      "expression":
-                      {
-                        "id": 20,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "leftHandSide":
-                        {
-                          "id": 18,
-                          "name": "x",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 6,
-                          "src": "200:1:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
-                        },
-                        "nodeType": "Assignment",
-                        "operator": "*=",
-                        "rightHandSide":
-                        {
-                          "hexValue": "32",
-                          "id": 19,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": true,
-                          "kind": "number",
-                          "lValueRequested": false,
-                          "nodeType": "Literal",
-                          "src": "205:1:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_rational_2_by_1",
-                            "typeString": "int_const 2"
-                          },
-                          "value": "2"
-                        },
-                        "src": "200:6:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "id": 21,
-                      "nodeType": "ExpressionStatement",
-                      "src": "200:6:1"
-                    }
-                  ]
-                },
-                "condition":
-                {
-                  "commonType":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  },
-                  "id": 14,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftExpression":
-                  {
-                    "id": 12,
-                    "name": "i",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 9,
-                    "src": "129:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "<",
-                  "rightExpression":
-                  {
-                    "hexValue": "3230",
-                    "id": 13,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "133:2:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_20_by_1",
-                      "typeString": "int_const 20"
-                    },
-                    "value": "20"
-                  },
-                  "src": "129:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_bool",
-                    "typeString": "bool"
-                  }
-                },
-                "documentation": "test2",
-                "id": 23,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
-                    9
-                  ],
-                  "declarations":
-                  [
-                    {
-                      "constant": false,
-                      "id": 9,
-                      "mutability": "mutable",
-                      "name": "i",
-                      "nameLocation": "122:1:1",
-                      "nodeType": "VariableDeclaration",
-                      "scope": 23,
-                      "src": "117:6:1",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      },
-                      "typeName":
-                      {
-                        "id": 8,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "117:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 11,
-                  "initialValue":
-                  {
-                    "hexValue": "30",
-                    "id": 10,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "126:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_0_by_1",
-                      "typeString": "int_const 0"
-                    },
-                    "value": "0"
-                  },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "117:10:1"
-                },
-                "isSimpleCounterLoop": true,
-                "loopExpression":
-                {
-                  "expression":
-                  {
-                    "id": 16,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "UnaryOperation",
-                    "operator": "++",
-                    "prefix": false,
-                    "src": "137:3:1",
-                    "subExpression":
-                    {
-                      "id": 15,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 9,
-                      "src": "137:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "id": 17,
-                  "nodeType": "ExpressionStatement",
-                  "src": "137:3:1"
-                },
-                "nodeType": "ForStatement",
-                "src": "112:105:1"
-              },
-              {
-                "documentation": "tes \"t4\" ",
-                "expression":
-                {
-                  "id": 24,
-                  "name": "x",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 6,
-                  "src": "257:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "functionReturnParameters": 7,
-                "id": 25,
-                "nodeType": "Return",
-                "src": "250:8:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 27,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "51:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "52:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 6,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "81:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 27,
-                "src": "76:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 5,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "76:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "75:8:1"
-          },
-          "scope": 28,
-          "src": "42:223:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 29,
-      "src": "0:267:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:268:1"
-}
diff --git a/test/libsolidity/ASTJSON/documentation_triple.sol b/test/libsolidity/ASTJSON/documentation_triple.sol
deleted file mode 100644
index 578933d9c74e..000000000000
--- a/test/libsolidity/ASTJSON/documentation_triple.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    /// test
-    uint a;
-    function f() public pure returns (uint x) {
-        /// test2
-        for (uint i = 0; i < 20; i++) {
-            /// tee
-            /// s "t" 3
-            x *= 2;
-        }
-        /** tes "t4" */
-        return x;
-    }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json b/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
deleted file mode 100644
index 5ccc2631ca99..000000000000
--- a/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 29,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 28,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "35:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "30:6:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 2,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "30:4:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 26,
-            "nodeType": "Block",
-            "src": "84:181:1",
-            "statements":
-            [
-              {
-                "body":
-                {
-                  "id": 22,
-                  "nodeType": "Block",
-                  "src": "142:75:1",
-                  "statements":
-                  [
-                    {
-                      "documentation": "tee\n s \"t\" 3",
-                      "expression":
-                      {
-                        "id": 20,
-                        "leftHandSide":
-                        {
-                          "id": 18,
-                          "name": "x",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "src": "200:1:1",
-                          "typeDescriptions": {}
-                        },
-                        "nodeType": "Assignment",
-                        "operator": "*=",
-                        "rightHandSide":
-                        {
-                          "hexValue": "32",
-                          "id": 19,
-                          "kind": "number",
-                          "nodeType": "Literal",
-                          "src": "205:1:1",
-                          "typeDescriptions": {},
-                          "value": "2"
-                        },
-                        "src": "200:6:1",
-                        "typeDescriptions": {}
-                      },
-                      "id": 21,
-                      "nodeType": "ExpressionStatement",
-                      "src": "200:6:1"
-                    }
-                  ]
-                },
-                "condition":
-                {
-                  "commonType": {},
-                  "id": 14,
-                  "leftExpression":
-                  {
-                    "id": 12,
-                    "name": "i",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "129:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "<",
-                  "rightExpression":
-                  {
-                    "hexValue": "3230",
-                    "id": 13,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "133:2:1",
-                    "typeDescriptions": {},
-                    "value": "20"
-                  },
-                  "src": "129:6:1",
-                  "typeDescriptions": {}
-                },
-                "documentation": "test2",
-                "id": 23,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
-                    9
-                  ],
-                  "declarations":
-                  [
-                    {
-                      "constant": false,
-                      "id": 9,
-                      "mutability": "mutable",
-                      "name": "i",
-                      "nameLocation": "122:1:1",
-                      "nodeType": "VariableDeclaration",
-                      "src": "117:6:1",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions": {},
-                      "typeName":
-                      {
-                        "id": 8,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "117:4:1",
-                        "typeDescriptions": {}
-                      },
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 11,
-                  "initialValue":
-                  {
-                    "hexValue": "30",
-                    "id": 10,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "126:1:1",
-                    "typeDescriptions": {},
-                    "value": "0"
-                  },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "117:10:1"
-                },
-                "loopExpression":
-                {
-                  "expression":
-                  {
-                    "id": 16,
-                    "nodeType": "UnaryOperation",
-                    "operator": "++",
-                    "prefix": false,
-                    "src": "137:3:1",
-                    "subExpression":
-                    {
-                      "id": 15,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "137:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "typeDescriptions": {}
-                  },
-                  "id": 17,
-                  "nodeType": "ExpressionStatement",
-                  "src": "137:3:1"
-                },
-                "nodeType": "ForStatement",
-                "src": "112:105:1"
-              },
-              {
-                "documentation": "tes \"t4\" ",
-                "expression":
-                {
-                  "id": 24,
-                  "name": "x",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "src": "257:1:1",
-                  "typeDescriptions": {}
-                },
-                "id": 25,
-                "nodeType": "Return",
-                "src": "250:8:1"
-              }
-            ]
-          },
-          "id": 27,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "51:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "52:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 6,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "81:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "76:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 5,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "76:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "75:8:1"
-          },
-          "src": "42:223:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:267:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:268:1"
-}
diff --git a/test/libsolidity/ASTJSON/enum_natspec.json b/test/libsolidity/ASTJSON/enum_natspec.json
deleted file mode 100644
index f3cc7b8df8aa..000000000000
--- a/test/libsolidity/ASTJSON/enum_natspec.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "Color":
-    [
-      4
-    ]
-  },
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "Color",
-      "documentation":
-      {
-        "id": 1,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:112:1",
-        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
-      },
-      "id": 4,
-      "members":
-      [
-        {
-          "id": 2,
-          "name": "Red",
-          "nameLocation": "129:3:1",
-          "nodeType": "EnumValue",
-          "src": "129:3:1"
-        },
-        {
-          "id": 3,
-          "name": "Green",
-          "nameLocation": "138:5:1",
-          "nodeType": "EnumValue",
-          "src": "138:5:1"
-        }
-      ],
-      "name": "Color",
-      "nameLocation": "117:5:1",
-      "nodeType": "EnumDefinition",
-      "src": "112:33:1"
-    }
-  ],
-  "src": "112:34:1"
-}
diff --git a/test/libsolidity/ASTJSON/enum_natspec.sol b/test/libsolidity/ASTJSON/enum_natspec.sol
deleted file mode 100644
index b9663fa9e6d0..000000000000
--- a/test/libsolidity/ASTJSON/enum_natspec.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-/// @title example of title
-/// @author example of author
-/// @notice example of notice
-/// @dev example of dev
-enum Color {
-    Red,
-    Green
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json b/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
deleted file mode 100644
index b5a38af6c449..000000000000
--- a/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "documentation":
-      {
-        "id": 1,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:112:1",
-        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
-      },
-      "id": 4,
-      "members":
-      [
-        {
-          "id": 2,
-          "name": "Red",
-          "nameLocation": "129:3:1",
-          "nodeType": "EnumValue",
-          "src": "129:3:1"
-        },
-        {
-          "id": 3,
-          "name": "Green",
-          "nameLocation": "138:5:1",
-          "nodeType": "EnumValue",
-          "src": "138:5:1"
-        }
-      ],
-      "name": "Color",
-      "nameLocation": "117:5:1",
-      "nodeType": "EnumDefinition",
-      "src": "112:33:1"
-    }
-  ],
-  "src": "112:34:1"
-}
diff --git a/test/libsolidity/ASTJSON/enum_value.json b/test/libsolidity/ASTJSON/enum_value.json
deleted file mode 100644
index 31615f657b6a..000000000000
--- a/test/libsolidity/ASTJSON/enum_value.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      4
-    ]
-  },
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 4,
-      "linearizedBaseContracts":
-      [
-        4
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "canonicalName": "C.E",
-          "id": 3,
-          "members":
-          [
-            {
-              "id": 1,
-              "name": "A",
-              "nameLocation": "22:1:1",
-              "nodeType": "EnumValue",
-              "src": "22:1:1"
-            },
-            {
-              "id": 2,
-              "name": "B",
-              "nameLocation": "25:1:1",
-              "nodeType": "EnumValue",
-              "src": "25:1:1"
-            }
-          ],
-          "name": "E",
-          "nameLocation": "18:1:1",
-          "nodeType": "EnumDefinition",
-          "src": "13:15:1"
-        }
-      ],
-      "scope": 5,
-      "src": "0:30:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:31:1"
-}
diff --git a/test/libsolidity/ASTJSON/enum_value.sol b/test/libsolidity/ASTJSON/enum_value.sol
deleted file mode 100644
index 37e450f223d7..000000000000
--- a/test/libsolidity/ASTJSON/enum_value.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { enum E { A, B } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration.json b/test/libsolidity/ASTJSON/enum_value_declaration.json
deleted file mode 100644
index acdcc736e25e..000000000000
--- a/test/libsolidity/ASTJSON/enum_value_declaration.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
-      3
-    ],
-    "f":
-    [
-      13
-    ]
-  },
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "A",
-      "id": 3,
-      "members":
-      [
-        {
-          "id": 1,
-          "name": "X",
-          "nameLocation": "9:1:1",
-          "nodeType": "EnumValue",
-          "src": "9:1:1"
-        },
-        {
-          "id": 2,
-          "name": "Y",
-          "nameLocation": "12:1:1",
-          "nodeType": "EnumValue",
-          "src": "12:1:1"
-        }
-      ],
-      "name": "A",
-      "nameLocation": "5:1:1",
-      "nodeType": "EnumDefinition",
-      "src": "0:15:1"
-    },
-    {
-      "body":
-      {
-        "id": 12,
-        "nodeType": "Block",
-        "src": "46:15:1",
-        "statements":
-        [
-          {
-            "expression":
-            {
-              "expression":
-              {
-                "id": 9,
-                "name": "A",
-                "nodeType": "Identifier",
-                "overloadedDeclarations": [],
-                "referencedDeclaration": 3,
-                "src": "55:1:1",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_type$_t_enum$_A_$3_$",
-                  "typeString": "type(enum A)"
-                }
-              },
-              "id": 10,
-              "isConstant": false,
-              "isLValue": false,
-              "isPure": true,
-              "lValueRequested": false,
-              "memberLocation": "57:1:1",
-              "memberName": "X",
-              "nodeType": "MemberAccess",
-              "referencedDeclaration": 1,
-              "src": "55:3:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_enum$_A_$3",
-                "typeString": "enum A"
-              }
-            },
-            "functionReturnParameters": 8,
-            "id": 11,
-            "nodeType": "Return",
-            "src": "48:10:1"
-          }
-        ]
-      },
-      "id": 13,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "25:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 4,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "26:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 8,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 7,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 13,
-            "src": "43:1:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_enum$_A_$3",
-              "typeString": "enum A"
-            },
-            "typeName":
-            {
-              "id": 6,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 5,
-                "name": "A",
-                "nameLocations":
-                [
-                  "43:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 3,
-                "src": "43:1:1"
-              },
-              "referencedDeclaration": 3,
-              "src": "43:1:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_enum$_A_$3",
-                "typeString": "enum A"
-              }
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "42:3:1"
-      },
-      "scope": 14,
-      "src": "16:45:1",
-      "stateMutability": "pure",
-      "virtual": false,
-      "visibility": "internal"
-    }
-  ],
-  "src": "0:62:1"
-}
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration.sol b/test/libsolidity/ASTJSON/enum_value_declaration.sol
deleted file mode 100644
index 1fb98b3e8b25..000000000000
--- a/test/libsolidity/ASTJSON/enum_value_declaration.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-enum A { X, Y }
-function f() pure returns (A) { return A.X; }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
deleted file mode 100644
index 8fa574fa74d6..000000000000
--- a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 3,
-      "members":
-      [
-        {
-          "id": 1,
-          "name": "X",
-          "nameLocation": "9:1:1",
-          "nodeType": "EnumValue",
-          "src": "9:1:1"
-        },
-        {
-          "id": 2,
-          "name": "Y",
-          "nameLocation": "12:1:1",
-          "nodeType": "EnumValue",
-          "src": "12:1:1"
-        }
-      ],
-      "name": "A",
-      "nameLocation": "5:1:1",
-      "nodeType": "EnumDefinition",
-      "src": "0:15:1"
-    },
-    {
-      "body":
-      {
-        "id": 12,
-        "nodeType": "Block",
-        "src": "46:15:1",
-        "statements":
-        [
-          {
-            "expression":
-            {
-              "expression":
-              {
-                "id": 9,
-                "name": "A",
-                "nodeType": "Identifier",
-                "overloadedDeclarations": [],
-                "src": "55:1:1",
-                "typeDescriptions": {}
-              },
-              "id": 10,
-              "memberLocation": "57:1:1",
-              "memberName": "X",
-              "nodeType": "MemberAccess",
-              "src": "55:3:1",
-              "typeDescriptions": {}
-            },
-            "id": 11,
-            "nodeType": "Return",
-            "src": "48:10:1"
-          }
-        ]
-      },
-      "id": 13,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "25:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 4,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "26:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 8,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 7,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "src": "43:1:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions": {},
-            "typeName":
-            {
-              "id": 6,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 5,
-                "name": "A",
-                "nameLocations":
-                [
-                  "43:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "43:1:1"
-              },
-              "src": "43:1:1",
-              "typeDescriptions": {}
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "42:3:1"
-      },
-      "src": "16:45:1",
-      "stateMutability": "pure",
-      "virtual": false,
-      "visibility": "internal"
-    }
-  ],
-  "src": "0:62:1"
-}
diff --git a/test/libsolidity/ASTJSON/enum_value_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_parseOnly.json
deleted file mode 100644
index 006e2db36077..000000000000
--- a/test/libsolidity/ASTJSON/enum_value_parseOnly.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 4,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 3,
-          "members":
-          [
-            {
-              "id": 1,
-              "name": "A",
-              "nameLocation": "22:1:1",
-              "nodeType": "EnumValue",
-              "src": "22:1:1"
-            },
-            {
-              "id": 2,
-              "name": "B",
-              "nameLocation": "25:1:1",
-              "nodeType": "EnumValue",
-              "src": "25:1:1"
-            }
-          ],
-          "name": "E",
-          "nameLocation": "18:1:1",
-          "nodeType": "EnumDefinition",
-          "src": "13:15:1"
-        }
-      ],
-      "src": "0:30:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:31:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_aggregated_contract.json b/test/libsolidity/ASTJSON/event_aggregated_contract.json
deleted file mode 100644
index e312320c126a..000000000000
--- a/test/libsolidity/ASTJSON/event_aggregated_contract.json
+++ /dev/null
@@ -1,398 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      10
-    ],
-    "D":
-    [
-      30
-    ]
-  },
-  "id": 31,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 10,
-      "linearizedBaseContracts":
-      [
-        10
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "ffae15ba29768297c9b951e2e14bc33dc84599d1572acc234266fc70392babc8",
-          "id": 2,
-          "name": "e",
-          "nameLocation": "23:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "24:2:1"
-          },
-          "src": "17:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 8,
-            "nodeType": "Block",
-            "src": "52:25:1",
-            "statements":
-            [
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "id": 5,
-                    "name": "e",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 2,
-                    "src": "67:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 6,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "67:3:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 7,
-                "nodeType": "EmitStatement",
-                "src": "62:8:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 9,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "41:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "52:0:1"
-          },
-          "scope": 10,
-          "src": "32:45:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 31,
-      "src": "0:79:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "D",
-      "contractDependencies":
-      [
-        10
-      ],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 30,
-      "linearizedBaseContracts":
-      [
-        30
-      ],
-      "name": "D",
-      "nameLocation": "89:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 13,
-          "mutability": "mutable",
-          "name": "c",
-          "nameLocation": "99:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 30,
-          "src": "97:3:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_contract$_C_$10",
-            "typeString": "contract C"
-          },
-          "typeName":
-          {
-            "id": 12,
-            "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
-              "id": 11,
-              "name": "C",
-              "nameLocations":
-              [
-                "97:1:1"
-              ],
-              "nodeType": "IdentifierPath",
-              "referencedDeclaration": 10,
-              "src": "97:1:1"
-            },
-            "referencedDeclaration": 10,
-            "src": "97:1:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_contract$_C_$10",
-              "typeString": "contract C"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 28,
-            "nodeType": "Block",
-            "src": "120:43:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "id": 21,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftHandSide":
-                  {
-                    "id": 16,
-                    "name": "c",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 13,
-                    "src": "130:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_contract$_C_$10",
-                      "typeString": "contract C"
-                    }
-                  },
-                  "nodeType": "Assignment",
-                  "operator": "=",
-                  "rightHandSide":
-                  {
-                    "arguments": [],
-                    "expression":
-                    {
-                      "argumentTypes": [],
-                      "id": 19,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "nodeType": "NewExpression",
-                      "src": "134:5:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_C_$10_$",
-                        "typeString": "function () returns (contract C)"
-                      },
-                      "typeName":
-                      {
-                        "id": 18,
-                        "nodeType": "UserDefinedTypeName",
-                        "pathNode":
-                        {
-                          "id": 17,
-                          "name": "C",
-                          "nameLocations":
-                          [
-                            "138:1:1"
-                          ],
-                          "nodeType": "IdentifierPath",
-                          "referencedDeclaration": 10,
-                          "src": "138:1:1"
-                        },
-                        "referencedDeclaration": 10,
-                        "src": "138:1:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_contract$_C_$10",
-                          "typeString": "contract C"
-                        }
-                      }
-                    },
-                    "id": 20,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "kind": "functionCall",
-                    "lValueRequested": false,
-                    "nameLocations": [],
-                    "names": [],
-                    "nodeType": "FunctionCall",
-                    "src": "134:7:1",
-                    "tryCall": false,
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_contract$_C_$10",
-                      "typeString": "contract C"
-                    }
-                  },
-                  "src": "130:11:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_contract$_C_$10",
-                    "typeString": "contract C"
-                  }
-                },
-                "id": 22,
-                "nodeType": "ExpressionStatement",
-                "src": "130:11:1"
-              },
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "expression":
-                    {
-                      "id": 23,
-                      "name": "c",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 13,
-                      "src": "151:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_contract$_C_$10",
-                        "typeString": "contract C"
-                      }
-                    },
-                    "id": 25,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "memberLocation": "153:1:1",
-                    "memberName": "f",
-                    "nodeType": "MemberAccess",
-                    "referencedDeclaration": 9,
-                    "src": "151:3:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
-                      "typeString": "function () external"
-                    }
-                  },
-                  "id": 26,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "151:5:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 27,
-                "nodeType": "ExpressionStatement",
-                "src": "151:5:1"
-              }
-            ]
-          },
-          "id": 29,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "117:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 15,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "120:0:1"
-          },
-          "scope": 30,
-          "src": "106:57:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 31,
-      "src": "80:85:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:166:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_aggregated_contract.sol b/test/libsolidity/ASTJSON/event_aggregated_contract.sol
deleted file mode 100644
index b8fe2b27610b..000000000000
--- a/test/libsolidity/ASTJSON/event_aggregated_contract.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    event e();
-    function f() public {
-        emit e();
-    }
-}
-contract D {
-    C c;
-    constructor() {
-        c = new C();
-        c.f();
-    }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/event_definition.json b/test/libsolidity/ASTJSON/event_definition.json
deleted file mode 100644
index b59164fcb049..000000000000
--- a/test/libsolidity/ASTJSON/event_definition.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      3
-    ]
-  },
-  "id": 4,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 3,
-      "linearizedBaseContracts":
-      [
-        3
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
-          "id": 2,
-          "name": "E",
-          "nameLocation": "19:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "20:2:1"
-          },
-          "src": "13:10:1"
-        }
-      ],
-      "scope": 4,
-      "src": "0:25:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2
-      ]
-    }
-  ],
-  "src": "0:26:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_definition.sol b/test/libsolidity/ASTJSON/event_definition.sol
deleted file mode 100644
index 9fa7eaeb5379..000000000000
--- a/test/libsolidity/ASTJSON/event_definition.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { event E(); }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/event_definition_parseOnly.json b/test/libsolidity/ASTJSON/event_definition_parseOnly.json
deleted file mode 100644
index 9116b3d2da28..000000000000
--- a/test/libsolidity/ASTJSON/event_definition_parseOnly.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 4,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 3,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "id": 2,
-          "name": "E",
-          "nameLocation": "19:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "20:2:1"
-          },
-          "src": "13:10:1"
-        }
-      ],
-      "src": "0:25:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:26:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
deleted file mode 100644
index 6b183b493111..000000000000
--- a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
+++ /dev/null
@@ -1,289 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "B":
-    [
-      16
-    ],
-    "C":
-    [
-      19
-    ],
-    "L":
-    [
-      5
-    ]
-  },
-  "id": 20,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "L",
-      "contractDependencies": [],
-      "contractKind": "library",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "L",
-      "nameLocation": "10:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "870e3024466c178150e2490c7cfb455e33c0db877113af040f89189d07946664",
-          "id": 4,
-          "name": "E",
-          "nameLocation": "20:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "indexed": false,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "scope": 4,
-                "src": "22:5:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint8",
-                  "typeString": "uint8"
-                },
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint8",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "22:5:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint8",
-                    "typeString": "uint8"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "21:7:1"
-          },
-          "src": "14:15:1"
-        }
-      ],
-      "scope": 20,
-      "src": "0:31:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        4
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "B",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 16,
-      "linearizedBaseContracts":
-      [
-        16
-      ],
-      "name": "B",
-      "nameLocation": "41:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 14,
-            "nodeType": "Block",
-            "src": "63:28:1",
-            "statements":
-            [
-              {
-                "eventCall":
-                {
-                  "arguments":
-                  [
-                    {
-                      "hexValue": "30",
-                      "id": 11,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": true,
-                      "kind": "number",
-                      "lValueRequested": false,
-                      "nodeType": "Literal",
-                      "src": "82:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_rational_0_by_1",
-                        "typeString": "int_const 0"
-                      },
-                      "value": "0"
-                    }
-                  ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
-                      {
-                        "typeIdentifier": "t_rational_0_by_1",
-                        "typeString": "int_const 0"
-                      }
-                    ],
-                    "expression":
-                    {
-                      "id": 8,
-                      "name": "L",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 5,
-                      "src": "78:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_type$_t_contract$_L_$5_$",
-                        "typeString": "type(library L)"
-                      }
-                    },
-                    "id": 10,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "memberLocation": "80:1:1",
-                    "memberName": "E",
-                    "nodeType": "MemberAccess",
-                    "referencedDeclaration": 4,
-                    "src": "78:3:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_event_nonpayable$_t_uint8_$returns$__$",
-                      "typeString": "function (uint8)"
-                    }
-                  },
-                  "id": 12,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "78:6:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 13,
-                "nodeType": "EmitStatement",
-                "src": "73:11:1"
-              }
-            ]
-          },
-          "id": 15,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "60:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "63:0:1"
-          },
-          "scope": 16,
-          "src": "49:42:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 20,
-      "src": "32:61:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        4
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 17,
-            "name": "B",
-            "nameLocations":
-            [
-              "108:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 16,
-            "src": "108:1:1"
-          },
-          "id": 18,
-          "nodeType": "InheritanceSpecifier",
-          "src": "108:1:1"
-        }
-      ],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 19,
-      "linearizedBaseContracts":
-      [
-        19,
-        16
-      ],
-      "name": "C",
-      "nameLocation": "103:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 20,
-      "src": "94:18:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        4
-      ]
-    }
-  ],
-  "src": "0:113:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_emited_in_base_contract.sol b/test/libsolidity/ASTJSON/event_emited_in_base_contract.sol
deleted file mode 100644
index 30380323323a..000000000000
--- a/test/libsolidity/ASTJSON/event_emited_in_base_contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library   L { event E(uint8); }
-contract B {
-    constructor() {
-        emit L.E(0);
-    }
-}
-contract C is B {}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
deleted file mode 100644
index 2d70e2f9feb8..000000000000
--- a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
+++ /dev/null
@@ -1,289 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ],
-    "D":
-    [
-      19
-    ]
-  },
-  "id": 20,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "bd1155618a34fd53d1a2de9f705f42f3582842cba0b985b25c59888d86e0c929",
-          "id": 4,
-          "name": "E",
-          "nameLocation": "23:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "indexed": true,
-                "mutability": "mutable",
-                "name": "sender",
-                "nameLocation": "41:6:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 4,
-                "src": "25:22:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_address",
-                  "typeString": "address"
-                },
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "25:7:1",
-                  "stateMutability": "nonpayable",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address",
-                    "typeString": "address"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "24:24:1"
-          },
-          "src": "17:32:1"
-        }
-      ],
-      "scope": 20,
-      "src": "0:51:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        4
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "D",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 19,
-      "linearizedBaseContracts":
-      [
-        19
-      ],
-      "name": "D",
-      "nameLocation": "61:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 17,
-            "nodeType": "Block",
-            "src": "106:37:1",
-            "statements":
-            [
-              {
-                "eventCall":
-                {
-                  "arguments":
-                  [
-                    {
-                      "expression":
-                      {
-                        "id": 13,
-                        "name": "msg",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": -15,
-                        "src": "125:3:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_magic_message",
-                          "typeString": "msg"
-                        }
-                      },
-                      "id": 14,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "memberLocation": "129:6:1",
-                      "memberName": "sender",
-                      "nodeType": "MemberAccess",
-                      "src": "125:10:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      }
-                    }
-                  ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
-                      {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      }
-                    ],
-                    "expression":
-                    {
-                      "id": 10,
-                      "name": "C",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 5,
-                      "src": "121:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_type$_t_contract$_C_$5_$",
-                        "typeString": "type(contract C)"
-                      }
-                    },
-                    "id": 12,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "memberLocation": "123:1:1",
-                    "memberName": "E",
-                    "nodeType": "MemberAccess",
-                    "referencedDeclaration": 4,
-                    "src": "121:3:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
-                      "typeString": "function (address)"
-                    }
-                  },
-                  "id": 15,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "121:15:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 16,
-                "nodeType": "EmitStatement",
-                "src": "116:20:1"
-              }
-            ]
-          },
-          "functionSelector": "bb29998e",
-          "id": 18,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "test",
-          "nameLocation": "78:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 7,
-                "mutability": "mutable",
-                "name": "sender",
-                "nameLocation": "91:6:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 18,
-                "src": "83:14:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_address",
-                  "typeString": "address"
-                },
-                "typeName":
-                {
-                  "id": 6,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "83:7:1",
-                  "stateMutability": "nonpayable",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_address",
-                    "typeString": "address"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "82:16:1"
-          },
-          "returnParameters":
-          {
-            "id": 9,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "106:0:1"
-          },
-          "scope": 19,
-          "src": "69:74:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 20,
-      "src": "52:93:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        4
-      ]
-    }
-  ],
-  "src": "0:146:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol
deleted file mode 100644
index 6cad968f6bed..000000000000
--- a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    event E(address indexed sender);
-}
-contract D {
-    function test(address sender) public {
-        emit C.E(msg.sender);
-    }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
deleted file mode 100644
index b6c0ca5e0315..000000000000
--- a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 20,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "id": 4,
-          "name": "E",
-          "nameLocation": "23:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "indexed": true,
-                "mutability": "mutable",
-                "name": "sender",
-                "nameLocation": "41:6:1",
-                "nodeType": "VariableDeclaration",
-                "src": "25:22:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "25:7:1",
-                  "stateMutability": "nonpayable",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "24:24:1"
-          },
-          "src": "17:32:1"
-        }
-      ],
-      "src": "0:51:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 19,
-      "name": "D",
-      "nameLocation": "61:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 17,
-            "nodeType": "Block",
-            "src": "106:37:1",
-            "statements":
-            [
-              {
-                "eventCall":
-                {
-                  "arguments":
-                  [
-                    {
-                      "expression":
-                      {
-                        "id": 13,
-                        "name": "msg",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "src": "125:3:1",
-                        "typeDescriptions": {}
-                      },
-                      "id": 14,
-                      "memberLocation": "129:6:1",
-                      "memberName": "sender",
-                      "nodeType": "MemberAccess",
-                      "src": "125:10:1",
-                      "typeDescriptions": {}
-                    }
-                  ],
-                  "expression":
-                  {
-                    "expression":
-                    {
-                      "id": 10,
-                      "name": "C",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "121:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "id": 12,
-                    "memberLocation": "123:1:1",
-                    "memberName": "E",
-                    "nodeType": "MemberAccess",
-                    "src": "121:3:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 15,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "121:15:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 16,
-                "nodeType": "EmitStatement",
-                "src": "116:20:1"
-              }
-            ]
-          },
-          "id": 18,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "test",
-          "nameLocation": "78:4:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 7,
-                "mutability": "mutable",
-                "name": "sender",
-                "nameLocation": "91:6:1",
-                "nodeType": "VariableDeclaration",
-                "src": "83:14:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 6,
-                  "name": "address",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "83:7:1",
-                  "stateMutability": "nonpayable",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "82:16:1"
-          },
-          "returnParameters":
-          {
-            "id": 9,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "106:0:1"
-          },
-          "src": "69:74:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "52:93:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:146:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_inheritance.json b/test/libsolidity/ASTJSON/event_inheritance.json
deleted file mode 100644
index afa79e916c3c..000000000000
--- a/test/libsolidity/ASTJSON/event_inheritance.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "B":
-    [
-      3
-    ],
-    "C":
-    [
-      8
-    ],
-    "D":
-    [
-      13
-    ]
-  },
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "B",
-      "contractDependencies": [],
-      "contractKind": "interface",
-      "fullyImplemented": true,
-      "id": 3,
-      "linearizedBaseContracts":
-      [
-        3
-      ],
-      "name": "B",
-      "nameLocation": "10:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "dbec0351ad6bb0c1f07ea56e236e3e692fde2259f0165fd422f241da339b7e4f",
-          "id": 2,
-          "name": "EB",
-          "nameLocation": "24:2:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "26:2:1"
-          },
-          "src": "18:11:1"
-        }
-      ],
-      "scope": 14,
-      "src": "0:31:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 4,
-            "name": "B",
-            "nameLocations":
-            [
-              "46:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 3,
-            "src": "46:1:1"
-          },
-          "id": 5,
-          "nodeType": "InheritanceSpecifier",
-          "src": "46:1:1"
-        }
-      ],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 8,
-      "linearizedBaseContracts":
-      [
-        8,
-        3
-      ],
-      "name": "C",
-      "nameLocation": "41:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "a08b3367d3fa83ea27f8951ffb5d9d160cbfadbd80816b47f677e7699d76f5a0",
-          "id": 7,
-          "name": "EC",
-          "nameLocation": "60:2:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "62:2:1"
-          },
-          "src": "54:11:1"
-        }
-      ],
-      "scope": 14,
-      "src": "32:35:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2,
-        7
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 9,
-            "name": "C",
-            "nameLocations":
-            [
-              "82:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 8,
-            "src": "82:1:1"
-          },
-          "id": 10,
-          "nodeType": "InheritanceSpecifier",
-          "src": "82:1:1"
-        }
-      ],
-      "canonicalName": "D",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 13,
-      "linearizedBaseContracts":
-      [
-        13,
-        8,
-        3
-      ],
-      "name": "D",
-      "nameLocation": "77:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "caa54b91a2314ab89b39714b1cd283762e53a2f59cfb997d6770e2824c39db0d",
-          "id": 12,
-          "name": "ED",
-          "nameLocation": "96:2:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "98:2:1"
-          },
-          "src": "90:11:1"
-        }
-      ],
-      "scope": 14,
-      "src": "68:35:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2,
-        7,
-        12
-      ]
-    }
-  ],
-  "src": "0:104:1"
-}
diff --git a/test/libsolidity/ASTJSON/event_inheritance.sol b/test/libsolidity/ASTJSON/event_inheritance.sol
deleted file mode 100644
index 72687375337d..000000000000
--- a/test/libsolidity/ASTJSON/event_inheritance.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface B {
-    event EB();
-}
-contract C is B {
-    event EC();
-}
-contract D is C {
-    event ED();
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
deleted file mode 100644
index 6fe58c39c168..000000000000
--- a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    event E(function() internal);
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
deleted file mode 100644
index 3ff426cb2230..000000000000
--- a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 8,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 7,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "id": 6,
-          "name": "E",
-          "nameLocation": "23:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 5,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 4,
-                "indexed": false,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "src": "25:20:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 3,
-                  "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
-                    "id": 1,
-                    "nodeType": "ParameterList",
-                    "parameters": [],
-                    "src": "33:2:1"
-                  },
-                  "returnParameterTypes":
-                  {
-                    "id": 2,
-                    "nodeType": "ParameterList",
-                    "parameters": [],
-                    "src": "44:0:1"
-                  },
-                  "src": "25:20:1",
-                  "stateMutability": "nonpayable",
-                  "typeDescriptions": {},
-                  "visibility": "internal"
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "24:21:1"
-          },
-          "src": "17:29:1"
-        }
-      ],
-      "src": "0:48:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:49:1"
-}
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing.sol b/test/libsolidity/ASTJSON/fail_after_parsing.sol
deleted file mode 100644
index 882b4c950267..000000000000
--- a/test/libsolidity/ASTJSON/fail_after_parsing.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-function g() public;
-
-interface I {
-    struct S { S s; }
-
-    function f(E storage e) {
-        error E;
-        emit E();
-
-        ++c;
-        uint calldata c = 123.4;
-    }
-}
-// ----
-// failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
deleted file mode 100644
index f1d958617427..000000000000
--- a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
+++ /dev/null
@@ -1,297 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 30,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 3,
-      "implemented": false,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "g",
-      "nameLocation": "9:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 1,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "10:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 2,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "19:0:1"
-      },
-      "src": "0:20:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "public"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "interface",
-      "id": 29,
-      "name": "I",
-      "nameLocation": "31:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 7,
-          "members":
-          [
-            {
-              "constant": false,
-              "id": 6,
-              "mutability": "mutable",
-              "name": "s",
-              "nameLocation": "52:1:1",
-              "nodeType": "VariableDeclaration",
-              "src": "50:3:1",
-              "stateVariable": false,
-              "storageLocation": "default",
-              "typeDescriptions": {},
-              "typeName":
-              {
-                "id": 5,
-                "nodeType": "UserDefinedTypeName",
-                "pathNode":
-                {
-                  "id": 4,
-                  "name": "S",
-                  "nameLocations":
-                  [
-                    "50:1:1"
-                  ],
-                  "nodeType": "IdentifierPath",
-                  "src": "50:1:1"
-                },
-                "src": "50:1:1",
-                "typeDescriptions": {}
-              },
-              "visibility": "internal"
-            }
-          ],
-          "name": "S",
-          "nameLocation": "46:1:1",
-          "nodeType": "StructDefinition",
-          "src": "39:17:1",
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 27,
-            "nodeType": "Block",
-            "src": "85:88:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  15
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 15,
-                    "mutability": "mutable",
-                    "name": "E",
-                    "nameLocation": "101:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "95:7:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 14,
-                      "nodeType": "UserDefinedTypeName",
-                      "pathNode":
-                      {
-                        "id": 13,
-                        "name": "error",
-                        "nameLocations":
-                        [
-                          "95:5:1"
-                        ],
-                        "nodeType": "IdentifierPath",
-                        "src": "95:5:1"
-                      },
-                      "src": "95:5:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 16,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "95:7:1"
-              },
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "id": 17,
-                    "name": "E",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "117:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 18,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "117:3:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 19,
-                "nodeType": "EmitStatement",
-                "src": "112:8:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 21,
-                  "nodeType": "UnaryOperation",
-                  "operator": "++",
-                  "prefix": true,
-                  "src": "130:3:1",
-                  "subExpression":
-                  {
-                    "id": 20,
-                    "name": "c",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "132:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "typeDescriptions": {}
-                },
-                "id": 22,
-                "nodeType": "ExpressionStatement",
-                "src": "130:3:1"
-              },
-              {
-                "assignments":
-                [
-                  24
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 24,
-                    "mutability": "mutable",
-                    "name": "c",
-                    "nameLocation": "157:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "143:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "calldata",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 23,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "143:4:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 26,
-                "initialValue":
-                {
-                  "hexValue": "3132332e34",
-                  "id": 25,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "161:5:1",
-                  "typeDescriptions": {},
-                  "value": "123.4"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "143:23:1"
-              }
-            ]
-          },
-          "id": 28,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "70:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 10,
-                "mutability": "mutable",
-                "name": "e",
-                "nameLocation": "82:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "72:11:1",
-                "stateVariable": false,
-                "storageLocation": "storage",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 9,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 8,
-                    "name": "E",
-                    "nameLocations":
-                    [
-                      "72:1:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "src": "72:1:1"
-                  },
-                  "src": "72:1:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "71:13:1"
-          },
-          "returnParameters":
-          {
-            "id": 12,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "85:0:1"
-          },
-          "src": "61:112:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "21:154:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:176:1"
-}
diff --git a/test/libsolidity/ASTJSON/fallback.json b/test/libsolidity/ASTJSON/fallback.json
deleted file mode 100644
index f68c72ce6600..000000000000
--- a/test/libsolidity/ASTJSON/fallback.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "43:5:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "fallback",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "43:0:1"
-          },
-          "scope": 5,
-          "src": "15:33:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "scope": 6,
-      "src": "0:50:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:51:1"
-}
diff --git a/test/libsolidity/ASTJSON/fallback.sol b/test/libsolidity/ASTJSON/fallback.sol
deleted file mode 100644
index 170e77958c97..000000000000
--- a/test/libsolidity/ASTJSON/fallback.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  fallback() external payable {
-  }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether.json b/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
deleted file mode 100644
index f41559d2a640..000000000000
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      9
-    ]
-  },
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 9,
-      "linearizedBaseContracts":
-      [
-        9
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "42:5:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "receive",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "22:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 9,
-          "src": "15:32:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        },
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "78:5:1",
-            "statements": []
-          },
-          "id": 8,
-          "implemented": true,
-          "kind": "fallback",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 5,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "58:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "78:0:1"
-          },
-          "scope": 9,
-          "src": "50:33:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "scope": 10,
-      "src": "0:85:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:86:1"
-}
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol b/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
deleted file mode 100644
index 7eb712582db6..000000000000
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  receive() external payable {
-  }
-  fallback() external payable {
-  }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json b/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
deleted file mode 100644
index 215bf3a83bd9..000000000000
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 9,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "42:5:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "receive",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "22:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "15:32:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        },
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "78:5:1",
-            "statements": []
-          },
-          "id": 8,
-          "implemented": true,
-          "kind": "fallback",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 5,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "58:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "78:0:1"
-          },
-          "src": "50:33:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "src": "0:85:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:86:1"
-}
diff --git a/test/libsolidity/ASTJSON/fallback_parseOnly.json b/test/libsolidity/ASTJSON/fallback_parseOnly.json
deleted file mode 100644
index eb81fafbe930..000000000000
--- a/test/libsolidity/ASTJSON/fallback_parseOnly.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "43:5:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "fallback",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "43:0:1"
-          },
-          "src": "15:33:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "src": "0:50:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:51:1"
-}
diff --git a/test/libsolidity/ASTJSON/fallback_payable.json b/test/libsolidity/ASTJSON/fallback_payable.json
deleted file mode 100644
index 790351764550..000000000000
--- a/test/libsolidity/ASTJSON/fallback_payable.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "34:2:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "fallback",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "22:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "34:0:1"
-          },
-          "scope": 5,
-          "src": "14:22:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "scope": 6,
-      "src": "0:38:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:39:1"
-}
diff --git a/test/libsolidity/ASTJSON/fallback_payable.sol b/test/libsolidity/ASTJSON/fallback_payable.sol
deleted file mode 100644
index 7eff747af373..000000000000
--- a/test/libsolidity/ASTJSON/fallback_payable.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-	fallback() external {}
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json b/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
deleted file mode 100644
index e1810828a39d..000000000000
--- a/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "34:2:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "fallback",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "22:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "34:0:1"
-          },
-          "src": "14:22:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "src": "0:38:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:39:1"
-}
diff --git a/test/libsolidity/ASTJSON/function_type.json b/test/libsolidity/ASTJSON/function_type.json
deleted file mode 100644
index e1a5156cf77d..000000000000
--- a/test/libsolidity/ASTJSON/function_type.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      17
-    ]
-  },
-  "id": 18,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 17,
-      "linearizedBaseContracts":
-      [
-        17
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 15,
-            "nodeType": "Block",
-            "src": "127:2:1",
-            "statements": []
-          },
-          "functionSelector": "d6cd4974",
-          "id": 16,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 6,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "67:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 16,
-                "src": "24:44:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_function_external_payable$__$returns$_t_uint256_$",
-                  "typeString": "function () payable external returns (uint256)"
-                },
-                "typeName":
-                {
-                  "id": 5,
-                  "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
-                    "id": 1,
-                    "nodeType": "ParameterList",
-                    "parameters": [],
-                    "src": "32:2:1"
-                  },
-                  "returnParameterTypes":
-                  {
-                    "id": 4,
-                    "nodeType": "ParameterList",
-                    "parameters":
-                    [
-                      {
-                        "constant": false,
-                        "id": 3,
-                        "mutability": "mutable",
-                        "name": "",
-                        "nameLocation": "-1:-1:-1",
-                        "nodeType": "VariableDeclaration",
-                        "scope": 5,
-                        "src": "61:4:1",
-                        "stateVariable": false,
-                        "storageLocation": "default",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        },
-                        "typeName":
-                        {
-                          "id": 2,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "61:4:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
-                        },
-                        "visibility": "internal"
-                      }
-                    ],
-                    "src": "60:6:1"
-                  },
-                  "src": "24:44:1",
-                  "stateMutability": "payable",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_external_payable$__$returns$_t_uint256_$",
-                    "typeString": "function () payable external returns (uint256)"
-                  },
-                  "visibility": "external"
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "23:46:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 13,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "scope": 16,
-                "src": "86:40:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
-                  "typeString": "function () view external returns (uint256)"
-                },
-                "typeName":
-                {
-                  "id": 12,
-                  "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
-                    "id": 8,
-                    "nodeType": "ParameterList",
-                    "parameters": [],
-                    "src": "94:2:1"
-                  },
-                  "returnParameterTypes":
-                  {
-                    "id": 11,
-                    "nodeType": "ParameterList",
-                    "parameters":
-                    [
-                      {
-                        "constant": false,
-                        "id": 10,
-                        "mutability": "mutable",
-                        "name": "",
-                        "nameLocation": "-1:-1:-1",
-                        "nodeType": "VariableDeclaration",
-                        "scope": 12,
-                        "src": "120:4:1",
-                        "stateVariable": false,
-                        "storageLocation": "default",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        },
-                        "typeName":
-                        {
-                          "id": 9,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "120:4:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
-                        },
-                        "visibility": "internal"
-                      }
-                    ],
-                    "src": "119:6:1"
-                  },
-                  "src": "86:40:1",
-                  "stateMutability": "view",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
-                    "typeString": "function () view external returns (uint256)"
-                  },
-                  "visibility": "external"
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "85:41:1"
-          },
-          "scope": 17,
-          "src": "13:116:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 18,
-      "src": "0:131:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:132:1"
-}
diff --git a/test/libsolidity/ASTJSON/function_type.sol b/test/libsolidity/ASTJSON/function_type.sol
deleted file mode 100644
index 176cea37400b..000000000000
--- a/test/libsolidity/ASTJSON/function_type.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function f(function() external payable returns (uint) x) public returns (function() external view returns (uint)) {} }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/function_type_parseOnly.json b/test/libsolidity/ASTJSON/function_type_parseOnly.json
deleted file mode 100644
index 64b09d5d9d9b..000000000000
--- a/test/libsolidity/ASTJSON/function_type_parseOnly.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 18,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 17,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 15,
-            "nodeType": "Block",
-            "src": "127:2:1",
-            "statements": []
-          },
-          "id": 16,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 6,
-                "mutability": "mutable",
-                "name": "x",
-                "nameLocation": "67:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "24:44:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 5,
-                  "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
-                    "id": 1,
-                    "nodeType": "ParameterList",
-                    "parameters": [],
-                    "src": "32:2:1"
-                  },
-                  "returnParameterTypes":
-                  {
-                    "id": 4,
-                    "nodeType": "ParameterList",
-                    "parameters":
-                    [
-                      {
-                        "constant": false,
-                        "id": 3,
-                        "mutability": "mutable",
-                        "name": "",
-                        "nameLocation": "-1:-1:-1",
-                        "nodeType": "VariableDeclaration",
-                        "src": "61:4:1",
-                        "stateVariable": false,
-                        "storageLocation": "default",
-                        "typeDescriptions": {},
-                        "typeName":
-                        {
-                          "id": 2,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "61:4:1",
-                          "typeDescriptions": {}
-                        },
-                        "visibility": "internal"
-                      }
-                    ],
-                    "src": "60:6:1"
-                  },
-                  "src": "24:44:1",
-                  "stateMutability": "payable",
-                  "typeDescriptions": {},
-                  "visibility": "external"
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "23:46:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 13,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "src": "86:40:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 12,
-                  "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
-                    "id": 8,
-                    "nodeType": "ParameterList",
-                    "parameters": [],
-                    "src": "94:2:1"
-                  },
-                  "returnParameterTypes":
-                  {
-                    "id": 11,
-                    "nodeType": "ParameterList",
-                    "parameters":
-                    [
-                      {
-                        "constant": false,
-                        "id": 10,
-                        "mutability": "mutable",
-                        "name": "",
-                        "nameLocation": "-1:-1:-1",
-                        "nodeType": "VariableDeclaration",
-                        "src": "120:4:1",
-                        "stateVariable": false,
-                        "storageLocation": "default",
-                        "typeDescriptions": {},
-                        "typeName":
-                        {
-                          "id": 9,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "120:4:1",
-                          "typeDescriptions": {}
-                        },
-                        "visibility": "internal"
-                      }
-                    ],
-                    "src": "119:6:1"
-                  },
-                  "src": "86:40:1",
-                  "stateMutability": "view",
-                  "typeDescriptions": {},
-                  "visibility": "external"
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "85:41:1"
-          },
-          "src": "13:116:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:131:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:132:1"
-}
diff --git a/test/libsolidity/ASTJSON/global_enum.json b/test/libsolidity/ASTJSON/global_enum.json
deleted file mode 100644
index 0b673cffbf9d..000000000000
--- a/test/libsolidity/ASTJSON/global_enum.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "E":
-    [
-      2
-    ]
-  },
-  "id": 3,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "E",
-      "id": 2,
-      "members":
-      [
-        {
-          "id": 1,
-          "name": "A",
-          "nameLocation": "9:1:1",
-          "nodeType": "EnumValue",
-          "src": "9:1:1"
-        }
-      ],
-      "name": "E",
-      "nameLocation": "5:1:1",
-      "nodeType": "EnumDefinition",
-      "src": "0:12:1"
-    }
-  ],
-  "src": "0:13:1"
-}
diff --git a/test/libsolidity/ASTJSON/global_enum.sol b/test/libsolidity/ASTJSON/global_enum.sol
deleted file mode 100644
index a9c72e0c0116..000000000000
--- a/test/libsolidity/ASTJSON/global_enum.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-enum E { A }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/global_enum_parseOnly.json b/test/libsolidity/ASTJSON/global_enum_parseOnly.json
deleted file mode 100644
index 887d5997cd05..000000000000
--- a/test/libsolidity/ASTJSON/global_enum_parseOnly.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 3,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 2,
-      "members":
-      [
-        {
-          "id": 1,
-          "name": "A",
-          "nameLocation": "9:1:1",
-          "nodeType": "EnumValue",
-          "src": "9:1:1"
-        }
-      ],
-      "name": "E",
-      "nameLocation": "5:1:1",
-      "nodeType": "EnumDefinition",
-      "src": "0:12:1"
-    }
-  ],
-  "src": "0:13:1"
-}
diff --git a/test/libsolidity/ASTJSON/global_struct.json b/test/libsolidity/ASTJSON/global_struct.json
deleted file mode 100644
index 2c14a5e41446..000000000000
--- a/test/libsolidity/ASTJSON/global_struct.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "S":
-    [
-      3
-    ]
-  },
-  "id": 4,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "S",
-      "id": 3,
-      "members":
-      [
-        {
-          "constant": false,
-          "id": 2,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "19:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 3,
-          "src": "11:9:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 1,
-            "name": "uint256",
-            "nodeType": "ElementaryTypeName",
-            "src": "11:7:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "visibility": "internal"
-        }
-      ],
-      "name": "S",
-      "nameLocation": "7:1:1",
-      "nodeType": "StructDefinition",
-      "scope": 4,
-      "src": "0:23:1",
-      "visibility": "public"
-    }
-  ],
-  "src": "0:24:1"
-}
diff --git a/test/libsolidity/ASTJSON/global_struct.sol b/test/libsolidity/ASTJSON/global_struct.sol
deleted file mode 100644
index 4c2d002a419b..000000000000
--- a/test/libsolidity/ASTJSON/global_struct.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-struct S { uint256 a; }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/global_struct_parseOnly.json b/test/libsolidity/ASTJSON/global_struct_parseOnly.json
deleted file mode 100644
index 418cb79faf12..000000000000
--- a/test/libsolidity/ASTJSON/global_struct_parseOnly.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 4,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 3,
-      "members":
-      [
-        {
-          "constant": false,
-          "id": 2,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "19:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "11:9:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 1,
-            "name": "uint256",
-            "nodeType": "ElementaryTypeName",
-            "src": "11:7:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        }
-      ],
-      "name": "S",
-      "nameLocation": "7:1:1",
-      "nodeType": "StructDefinition",
-      "src": "0:23:1",
-      "visibility": "public"
-    }
-  ],
-  "src": "0:24:1"
-}
diff --git a/test/libsolidity/ASTJSON/indirect_event.json b/test/libsolidity/ASTJSON/indirect_event.json
deleted file mode 100644
index fcbe81756275..000000000000
--- a/test/libsolidity/ASTJSON/indirect_event.json
+++ /dev/null
@@ -1,319 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      25
-    ],
-    "L":
-    [
-      10
-    ]
-  },
-  "id": 26,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "L",
-      "contractDependencies": [],
-      "contractKind": "library",
-      "fullyImplemented": true,
-      "id": 10,
-      "linearizedBaseContracts":
-      [
-        10
-      ],
-      "name": "L",
-      "nameLocation": "44:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
-          "id": 2,
-          "name": "E",
-          "nameLocation": "58:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "59:2:1"
-          },
-          "src": "52:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 8,
-            "nodeType": "Block",
-            "src": "89:13:1",
-            "statements":
-            [
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "id": 5,
-                    "name": "E",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 2,
-                    "src": "96:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 6,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "96:3:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 7,
-                "nodeType": "EmitStatement",
-                "src": "91:8:1"
-              }
-            ]
-          },
-          "id": 9,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "76:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "77:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "89:0:1"
-          },
-          "scope": 10,
-          "src": "67:35:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        }
-      ],
-      "scope": 26,
-      "src": "36:68:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2
-      ]
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 25,
-      "linearizedBaseContracts":
-      [
-        25
-      ],
-      "name": "C",
-      "nameLocation": "114:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "eventSelector": "70a5d861ef9816388422765f41d618eb3abdf490acb37354b539729e37b09f0e",
-          "id": 12,
-          "name": "H",
-          "nameLocation": "128:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "129:2:1"
-          },
-          "src": "122:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 23,
-            "nodeType": "Block",
-            "src": "157:20:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "expression":
-                    {
-                      "id": 15,
-                      "name": "L",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 10,
-                      "src": "159:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_type$_t_contract$_L_$10_$",
-                        "typeString": "type(library L)"
-                      }
-                    },
-                    "id": 17,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "memberLocation": "161:1:1",
-                    "memberName": "f",
-                    "nodeType": "MemberAccess",
-                    "referencedDeclaration": 9,
-                    "src": "159:3:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 18,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "159:5:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 19,
-                "nodeType": "ExpressionStatement",
-                "src": "159:5:1"
-              },
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "id": 20,
-                    "name": "H",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 12,
-                    "src": "171:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
-                    }
-                  },
-                  "id": 21,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "171:3:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 22,
-                "nodeType": "EmitStatement",
-                "src": "166:8:1"
-              }
-            ]
-          },
-          "functionSelector": "e2179b8e",
-          "id": 24,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "146:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "147:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "157:0:1"
-          },
-          "scope": 25,
-          "src": "137:40:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 26,
-      "src": "105:74:1",
-      "usedErrors": [],
-      "usedEvents":
-      [
-        2,
-        12
-      ]
-    }
-  ],
-  "src": "36:144:1"
-}
diff --git a/test/libsolidity/ASTJSON/indirect_event.sol b/test/libsolidity/ASTJSON/indirect_event.sol
deleted file mode 100644
index c4bba01c208c..000000000000
--- a/test/libsolidity/ASTJSON/indirect_event.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-library L {
-    event E();
-    function f() internal { emit E(); }
-}
-contract C {
-    event H();
-    function g() public { L.f(); emit H(); }
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/indirect_event_parseOnly.json b/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
deleted file mode 100644
index 17ca036d3259..000000000000
--- a/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 26,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "library",
-      "id": 10,
-      "name": "L",
-      "nameLocation": "44:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "id": 2,
-          "name": "E",
-          "nameLocation": "58:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "59:2:1"
-          },
-          "src": "52:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 8,
-            "nodeType": "Block",
-            "src": "89:13:1",
-            "statements":
-            [
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "id": 5,
-                    "name": "E",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "96:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 6,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "96:3:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 7,
-                "nodeType": "EmitStatement",
-                "src": "91:8:1"
-              }
-            ]
-          },
-          "id": 9,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "76:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "77:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "89:0:1"
-          },
-          "src": "67:35:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "internal"
-        }
-      ],
-      "src": "36:68:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 25,
-      "name": "C",
-      "nameLocation": "114:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "anonymous": false,
-          "id": 12,
-          "name": "H",
-          "nameLocation": "128:1:1",
-          "nodeType": "EventDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "129:2:1"
-          },
-          "src": "122:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 23,
-            "nodeType": "Block",
-            "src": "157:20:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "expression":
-                    {
-                      "id": 15,
-                      "name": "L",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "src": "159:1:1",
-                      "typeDescriptions": {}
-                    },
-                    "id": 17,
-                    "memberLocation": "161:1:1",
-                    "memberName": "f",
-                    "nodeType": "MemberAccess",
-                    "src": "159:3:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 18,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "159:5:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 19,
-                "nodeType": "ExpressionStatement",
-                "src": "159:5:1"
-              },
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "id": 20,
-                    "name": "H",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "171:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 21,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "171:3:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 22,
-                "nodeType": "EmitStatement",
-                "src": "166:8:1"
-              }
-            ]
-          },
-          "id": 24,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "g",
-          "nameLocation": "146:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "147:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 14,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "157:0:1"
-          },
-          "src": "137:40:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "105:74:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "36:144:1"
-}
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier.json b/test/libsolidity/ASTJSON/inheritance_specifier.json
deleted file mode 100644
index ae210c949620..000000000000
--- a/test/libsolidity/ASTJSON/inheritance_specifier.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C1":
-    [
-      1
-    ],
-    "C2":
-    [
-      4
-    ]
-  },
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C1",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 1,
-      "linearizedBaseContracts":
-      [
-        1
-      ],
-      "name": "C1",
-      "nameLocation": "9:2:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 5,
-      "src": "0:14:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 2,
-            "name": "C1",
-            "nameLocations":
-            [
-              "30:2:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 1,
-            "src": "30:2:1"
-          },
-          "id": 3,
-          "nodeType": "InheritanceSpecifier",
-          "src": "30:2:1"
-        }
-      ],
-      "canonicalName": "C2",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 4,
-      "linearizedBaseContracts":
-      [
-        4,
-        1
-      ],
-      "name": "C2",
-      "nameLocation": "24:2:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 5,
-      "src": "15:20:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:36:1"
-}
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier.sol b/test/libsolidity/ASTJSON/inheritance_specifier.sol
deleted file mode 100644
index 0809cbe7973a..000000000000
--- a/test/libsolidity/ASTJSON/inheritance_specifier.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C1 {} contract C2 is C1 {}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
deleted file mode 100644
index 171391b36d5e..000000000000
--- a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 5,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 1,
-      "name": "C1",
-      "nameLocation": "9:2:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "0:14:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 2,
-            "name": "C1",
-            "nameLocations":
-            [
-              "30:2:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "30:2:1"
-          },
-          "id": 3,
-          "nodeType": "InheritanceSpecifier",
-          "src": "30:2:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 4,
-      "name": "C2",
-      "nameLocation": "24:2:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "15:20:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:36:1"
-}
diff --git a/test/libsolidity/ASTJSON/license.json b/test/libsolidity/ASTJSON/license.json
deleted file mode 100644
index 4c0882637f2d..000000000000
--- a/test/libsolidity/ASTJSON/license.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      1
-    ]
-  },
-  "id": 2,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 1,
-      "linearizedBaseContracts":
-      [
-        1
-      ],
-      "name": "C",
-      "nameLocation": "45:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 2,
-      "src": "36:13:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "36:14:1"
-}
diff --git a/test/libsolidity/ASTJSON/license.sol b/test/libsolidity/ASTJSON/license.sol
deleted file mode 100644
index 92ffb8fa642f..000000000000
--- a/test/libsolidity/ASTJSON/license.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-contract C {}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/license_parseOnly.json b/test/libsolidity/ASTJSON/license_parseOnly.json
deleted file mode 100644
index f2958f15ffad..000000000000
--- a/test/libsolidity/ASTJSON/license_parseOnly.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 2,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 1,
-      "name": "C",
-      "nameLocation": "45:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "36:13:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "36:14:1"
-}
diff --git a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json b/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
deleted file mode 100644
index 9bcd5e8fd9f2..000000000000
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
-      11
-    ]
-  },
-  "id": 12,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "c",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 11,
-      "linearizedBaseContracts":
-      [
-        11
-      ],
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 9,
-            "nodeType": "Block",
-            "src": "33:19:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "a",
-                    "nameLocation": "40:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 9,
-                    "src": "35:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:4:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 8,
-                "initialValue":
-                {
-                  "commonType":
-                  {
-                    "typeIdentifier": "t_rational_5_by_1",
-                    "typeString": "int_const 5"
-                  },
-                  "id": 7,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "lValueRequested": false,
-                  "leftExpression":
-                  {
-                    "hexValue": "32",
-                    "id": 5,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "44:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_2_by_1",
-                      "typeString": "int_const 2"
-                    },
-                    "value": "2"
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "+",
-                  "rightExpression":
-                  {
-                    "hexValue": "33",
-                    "id": 6,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "kind": "number",
-                    "lValueRequested": false,
-                    "nodeType": "Literal",
-                    "src": "48:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_rational_3_by_1",
-                      "typeString": "int_const 3"
-                    },
-                    "value": "3"
-                  },
-                  "src": "44:5:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_5_by_1",
-                    "typeString": "int_const 5"
-                  }
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:14:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 10,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 11,
-          "src": "13:39:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 12,
-      "src": "0:54:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:55:1"
-}
diff --git a/test/libsolidity/ASTJSON/long_type_name_binary_operation.sol b/test/libsolidity/ASTJSON/long_type_name_binary_operation.sol
deleted file mode 100644
index 745b14ae8b22..000000000000
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract c { function f() public { uint a = 2 + 3; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json b/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
deleted file mode 100644
index 2cb372dd26ac..000000000000
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 12,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 11,
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 9,
-            "nodeType": "Block",
-            "src": "33:19:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "a",
-                    "nameLocation": "40:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:4:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 8,
-                "initialValue":
-                {
-                  "commonType": {},
-                  "id": 7,
-                  "leftExpression":
-                  {
-                    "hexValue": "32",
-                    "id": 5,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "44:1:1",
-                    "typeDescriptions": {},
-                    "value": "2"
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "+",
-                  "rightExpression":
-                  {
-                    "hexValue": "33",
-                    "id": 6,
-                    "kind": "number",
-                    "nodeType": "Literal",
-                    "src": "48:1:1",
-                    "typeDescriptions": {},
-                    "value": "3"
-                  },
-                  "src": "44:5:1",
-                  "typeDescriptions": {}
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:14:1"
-              }
-            ]
-          },
-          "id": 10,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:39:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:54:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:55:1"
-}
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier.json b/test/libsolidity/ASTJSON/long_type_name_identifier.json
deleted file mode 100644
index c22aeb40c28b..000000000000
--- a/test/libsolidity/ASTJSON/long_type_name_identifier.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
-      15
-    ]
-  },
-  "id": 16,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "c",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 15,
-      "linearizedBaseContracts":
-      [
-        15
-      ],
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "20:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 15,
-          "src": "13:8:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_array$_t_uint256_$dyn_storage",
-            "typeString": "uint256[]"
-          },
-          "typeName":
-          {
-            "baseType":
-            {
-              "id": 1,
-              "name": "uint",
-              "nodeType": "ElementaryTypeName",
-              "src": "13:4:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_uint256",
-                "typeString": "uint256"
-              }
-            },
-            "id": 2,
-            "nodeType": "ArrayTypeName",
-            "src": "13:6:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-              "typeString": "uint256[]"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 13,
-            "nodeType": "Block",
-            "src": "43:25:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  10
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 10,
-                    "mutability": "mutable",
-                    "name": "b",
-                    "nameLocation": "60:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 13,
-                    "src": "45:16:1",
-                    "stateVariable": false,
-                    "storageLocation": "storage",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                      "typeString": "uint256[]"
-                    },
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "id": 8,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "45:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "id": 9,
-                      "nodeType": "ArrayTypeName",
-                      "src": "45:6:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                        "typeString": "uint256[]"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 12,
-                "initialValue":
-                {
-                  "id": 11,
-                  "name": "a",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "referencedDeclaration": 3,
-                  "src": "64:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_array$_t_uint256_$dyn_storage",
-                    "typeString": "uint256[] storage ref"
-                  }
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "45:20:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 14,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "32:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 5,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "43:0:1"
-          },
-          "scope": 15,
-          "src": "23:45:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 16,
-      "src": "0:70:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:71:1"
-}
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier.sol b/test/libsolidity/ASTJSON/long_type_name_identifier.sol
deleted file mode 100644
index 60193cebb0c8..000000000000
--- a/test/libsolidity/ASTJSON/long_type_name_identifier.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract c { uint[] a; function f() public { uint[] storage b = a; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json b/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
deleted file mode 100644
index 1bf50bed601c..000000000000
--- a/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 16,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 15,
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "20:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "13:8:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "baseType":
-            {
-              "id": 1,
-              "name": "uint",
-              "nodeType": "ElementaryTypeName",
-              "src": "13:4:1",
-              "typeDescriptions": {}
-            },
-            "id": 2,
-            "nodeType": "ArrayTypeName",
-            "src": "13:6:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 13,
-            "nodeType": "Block",
-            "src": "43:25:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  10
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 10,
-                    "mutability": "mutable",
-                    "name": "b",
-                    "nameLocation": "60:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "45:16:1",
-                    "stateVariable": false,
-                    "storageLocation": "storage",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "id": 8,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "45:4:1",
-                        "typeDescriptions": {}
-                      },
-                      "id": 9,
-                      "nodeType": "ArrayTypeName",
-                      "src": "45:6:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 12,
-                "initialValue":
-                {
-                  "id": 11,
-                  "name": "a",
-                  "nodeType": "Identifier",
-                  "overloadedDeclarations": [],
-                  "src": "64:1:1",
-                  "typeDescriptions": {}
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "45:20:1"
-              }
-            ]
-          },
-          "id": 14,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "32:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 4,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 5,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "43:0:1"
-          },
-          "src": "23:45:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:70:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:71:1"
-}
diff --git a/test/libsolidity/ASTJSON/mappings.json b/test/libsolidity/ASTJSON/mappings.json
deleted file mode 100644
index 81bf19db1a85..000000000000
--- a/test/libsolidity/ASTJSON/mappings.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      23
-    ]
-  },
-  "id": 24,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 23,
-      "linearizedBaseContracts":
-      [
-        23
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "canonicalName": "C.E",
-          "id": 4,
-          "members":
-          [
-            {
-              "id": 1,
-              "name": "A",
-              "nameLocation": "26:1:1",
-              "nodeType": "EnumValue",
-              "src": "26:1:1"
-            },
-            {
-              "id": 2,
-              "name": "B",
-              "nameLocation": "29:1:1",
-              "nodeType": "EnumValue",
-              "src": "29:1:1"
-            },
-            {
-              "id": 3,
-              "name": "C",
-              "nameLocation": "32:1:1",
-              "nodeType": "EnumValue",
-              "src": "32:1:1"
-            }
-          ],
-          "name": "E",
-          "nameLocation": "22:1:1",
-          "nodeType": "EnumDefinition",
-          "src": "17:18:1"
-        },
-        {
-          "constant": false,
-          "id": 9,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "59:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 23,
-          "src": "40:20:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_mapping$_t_contract$_C_$23_$_t_bool_$",
-            "typeString": "mapping(contract C => bool)"
-          },
-          "typeName":
-          {
-            "id": 8,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 6,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 5,
-                "name": "C",
-                "nameLocations":
-                [
-                  "48:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 23,
-                "src": "48:1:1"
-              },
-              "referencedDeclaration": 23,
-              "src": "48:1:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_contract$_C_$23",
-                "typeString": "contract C"
-              }
-            },
-            "nodeType": "Mapping",
-            "src": "40:18:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_mapping$_t_contract$_C_$23_$_t_bool_$",
-              "typeString": "mapping(contract C => bool)"
-            },
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 7,
-              "name": "bool",
-              "nodeType": "ElementaryTypeName",
-              "src": "53:4:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_bool",
-                "typeString": "bool"
-              }
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 13,
-          "mutability": "mutable",
-          "name": "b",
-          "nameLocation": "91:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 23,
-          "src": "66:26:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
-            "typeString": "mapping(address => bool)"
-          },
-          "typeName":
-          {
-            "id": 12,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 10,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "74:7:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_address",
-                "typeString": "address"
-              }
-            },
-            "nodeType": "Mapping",
-            "src": "66:24:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
-              "typeString": "mapping(address => bool)"
-            },
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 11,
-              "name": "bool",
-              "nodeType": "ElementaryTypeName",
-              "src": "85:4:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_bool",
-                "typeString": "bool"
-              }
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 18,
-          "mutability": "mutable",
-          "name": "c",
-          "nameLocation": "117:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 23,
-          "src": "98:20:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_mapping$_t_enum$_E_$4_$_t_bool_$",
-            "typeString": "mapping(enum C.E => bool)"
-          },
-          "typeName":
-          {
-            "id": 17,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 15,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 14,
-                "name": "E",
-                "nameLocations":
-                [
-                  "106:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 4,
-                "src": "106:1:1"
-              },
-              "referencedDeclaration": 4,
-              "src": "106:1:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_enum$_E_$4",
-                "typeString": "enum C.E"
-              }
-            },
-            "nodeType": "Mapping",
-            "src": "98:18:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_mapping$_t_enum$_E_$4_$_t_bool_$",
-              "typeString": "mapping(enum C.E => bool)"
-            },
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 16,
-              "name": "bool",
-              "nodeType": "ElementaryTypeName",
-              "src": "111:4:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_bool",
-                "typeString": "bool"
-              }
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 22,
-          "mutability": "mutable",
-          "name": "d",
-          "nameLocation": "169:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 23,
-          "src": "124:46:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
-            "typeString": "mapping(address => uint256)"
-          },
-          "typeName":
-          {
-            "id": 21,
-            "keyName": "keyAddress",
-            "keyNameLocation": "140:10:1",
-            "keyType":
-            {
-              "id": 19,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "132:7:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_address",
-                "typeString": "address"
-              }
-            },
-            "nodeType": "Mapping",
-            "src": "124:44:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
-              "typeString": "mapping(address => uint256)"
-            },
-            "valueName": "value",
-            "valueNameLocation": "162:5:1",
-            "valueType":
-            {
-              "id": 20,
-              "name": "uint256",
-              "nodeType": "ElementaryTypeName",
-              "src": "154:7:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_uint256",
-                "typeString": "uint256"
-              }
-            }
-          },
-          "visibility": "internal"
-        }
-      ],
-      "scope": 24,
-      "src": "0:173:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:174:1"
-}
diff --git a/test/libsolidity/ASTJSON/mappings.sol b/test/libsolidity/ASTJSON/mappings.sol
deleted file mode 100644
index 5412ca601eb9..000000000000
--- a/test/libsolidity/ASTJSON/mappings.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    enum E { A, B, C }
-    mapping(C => bool) a;
-    mapping(address => bool) b;
-    mapping(E => bool) c;
-    mapping(address keyAddress => uint256 value) d;
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/mappings_parseOnly.json b/test/libsolidity/ASTJSON/mappings_parseOnly.json
deleted file mode 100644
index 84cfb4004a4d..000000000000
--- a/test/libsolidity/ASTJSON/mappings_parseOnly.json
+++ /dev/null
@@ -1,236 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 24,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 23,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 4,
-          "members":
-          [
-            {
-              "id": 1,
-              "name": "A",
-              "nameLocation": "26:1:1",
-              "nodeType": "EnumValue",
-              "src": "26:1:1"
-            },
-            {
-              "id": 2,
-              "name": "B",
-              "nameLocation": "29:1:1",
-              "nodeType": "EnumValue",
-              "src": "29:1:1"
-            },
-            {
-              "id": 3,
-              "name": "C",
-              "nameLocation": "32:1:1",
-              "nodeType": "EnumValue",
-              "src": "32:1:1"
-            }
-          ],
-          "name": "E",
-          "nameLocation": "22:1:1",
-          "nodeType": "EnumDefinition",
-          "src": "17:18:1"
-        },
-        {
-          "constant": false,
-          "id": 9,
-          "mutability": "mutable",
-          "name": "a",
-          "nameLocation": "59:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "40:20:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 8,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 6,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 5,
-                "name": "C",
-                "nameLocations":
-                [
-                  "48:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "48:1:1"
-              },
-              "src": "48:1:1",
-              "typeDescriptions": {}
-            },
-            "nodeType": "Mapping",
-            "src": "40:18:1",
-            "typeDescriptions": {},
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 7,
-              "name": "bool",
-              "nodeType": "ElementaryTypeName",
-              "src": "53:4:1",
-              "typeDescriptions": {}
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 13,
-          "mutability": "mutable",
-          "name": "b",
-          "nameLocation": "91:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "66:26:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 12,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 10,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "74:7:1",
-              "typeDescriptions": {}
-            },
-            "nodeType": "Mapping",
-            "src": "66:24:1",
-            "typeDescriptions": {},
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 11,
-              "name": "bool",
-              "nodeType": "ElementaryTypeName",
-              "src": "85:4:1",
-              "typeDescriptions": {}
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 18,
-          "mutability": "mutable",
-          "name": "c",
-          "nameLocation": "117:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "98:20:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 17,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 15,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 14,
-                "name": "E",
-                "nameLocations":
-                [
-                  "106:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "106:1:1"
-              },
-              "src": "106:1:1",
-              "typeDescriptions": {}
-            },
-            "nodeType": "Mapping",
-            "src": "98:18:1",
-            "typeDescriptions": {},
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 16,
-              "name": "bool",
-              "nodeType": "ElementaryTypeName",
-              "src": "111:4:1",
-              "typeDescriptions": {}
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 22,
-          "mutability": "mutable",
-          "name": "d",
-          "nameLocation": "169:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "124:46:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 21,
-            "keyName": "keyAddress",
-            "keyNameLocation": "140:10:1",
-            "keyType":
-            {
-              "id": 19,
-              "name": "address",
-              "nodeType": "ElementaryTypeName",
-              "src": "132:7:1",
-              "typeDescriptions": {}
-            },
-            "nodeType": "Mapping",
-            "src": "124:44:1",
-            "typeDescriptions": {},
-            "valueName": "value",
-            "valueNameLocation": "162:5:1",
-            "valueType":
-            {
-              "id": 20,
-              "name": "uint256",
-              "nodeType": "ElementaryTypeName",
-              "src": "154:7:1",
-              "typeDescriptions": {}
-            }
-          },
-          "visibility": "internal"
-        }
-      ],
-      "src": "0:173:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:174:1"
-}
diff --git a/test/libsolidity/ASTJSON/modifier_definition.json b/test/libsolidity/ASTJSON/modifier_definition.json
deleted file mode 100644
index 30ebcb7c20b2..000000000000
--- a/test/libsolidity/ASTJSON/modifier_definition.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      14
-    ]
-  },
-  "id": 15,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 14,
-      "linearizedBaseContracts":
-      [
-        14
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 5,
-            "nodeType": "Block",
-            "src": "32:6:1",
-            "statements":
-            [
-              {
-                "id": 4,
-                "nodeType": "PlaceholderStatement",
-                "src": "34:1:1"
-              }
-            ]
-          },
-          "id": 6,
-          "name": "M",
-          "nameLocation": "22:1:1",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "mutability": "mutable",
-                "name": "i",
-                "nameLocation": "29:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 6,
-                "src": "24:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "24:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "23:8:1"
-          },
-          "src": "13:25:1",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 12,
-            "nodeType": "Block",
-            "src": "64:2:1",
-            "statements": []
-          },
-          "functionSelector": "28811f59",
-          "id": 13,
-          "implemented": true,
-          "kind": "function",
-          "modifiers":
-          [
-            {
-              "arguments":
-              [
-                {
-                  "hexValue": "31",
-                  "id": 9,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "number",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "54:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_1_by_1",
-                    "typeString": "int_const 1"
-                  },
-                  "value": "1"
-                }
-              ],
-              "id": 10,
-              "kind": "modifierInvocation",
-              "modifierName":
-              {
-                "id": 8,
-                "name": "M",
-                "nameLocations":
-                [
-                  "52:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 6,
-                "src": "52:1:1"
-              },
-              "nodeType": "ModifierInvocation",
-              "src": "52:4:1"
-            }
-          ],
-          "name": "F",
-          "nameLocation": "48:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "49:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "64:0:1"
-          },
-          "scope": 14,
-          "src": "39:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 15,
-      "src": "0:68:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:69:1"
-}
diff --git a/test/libsolidity/ASTJSON/modifier_definition.sol b/test/libsolidity/ASTJSON/modifier_definition.sol
deleted file mode 100644
index 1dcdb59468ca..000000000000
--- a/test/libsolidity/ASTJSON/modifier_definition.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { modifier M(uint i) { _; } function F() M(1) public {} }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
deleted file mode 100644
index f8067952a28c..000000000000
--- a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 15,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 14,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 5,
-            "nodeType": "Block",
-            "src": "32:6:1",
-            "statements":
-            [
-              {
-                "id": 4,
-                "nodeType": "PlaceholderStatement",
-                "src": "34:1:1"
-              }
-            ]
-          },
-          "id": 6,
-          "name": "M",
-          "nameLocation": "22:1:1",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "mutability": "mutable",
-                "name": "i",
-                "nameLocation": "29:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "24:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "24:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "23:8:1"
-          },
-          "src": "13:25:1",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 12,
-            "nodeType": "Block",
-            "src": "64:2:1",
-            "statements": []
-          },
-          "id": 13,
-          "implemented": true,
-          "kind": "function",
-          "modifiers":
-          [
-            {
-              "arguments":
-              [
-                {
-                  "hexValue": "31",
-                  "id": 9,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "54:1:1",
-                  "typeDescriptions": {},
-                  "value": "1"
-                }
-              ],
-              "id": 10,
-              "modifierName":
-              {
-                "id": 8,
-                "name": "M",
-                "nameLocations":
-                [
-                  "52:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "52:1:1"
-              },
-              "nodeType": "ModifierInvocation",
-              "src": "52:4:1"
-            }
-          ],
-          "name": "F",
-          "nameLocation": "48:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "49:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "64:0:1"
-          },
-          "src": "39:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:68:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:69:1"
-}
diff --git a/test/libsolidity/ASTJSON/modifier_invocation.json b/test/libsolidity/ASTJSON/modifier_invocation.json
deleted file mode 100644
index 30ebcb7c20b2..000000000000
--- a/test/libsolidity/ASTJSON/modifier_invocation.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      14
-    ]
-  },
-  "id": 15,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 14,
-      "linearizedBaseContracts":
-      [
-        14
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 5,
-            "nodeType": "Block",
-            "src": "32:6:1",
-            "statements":
-            [
-              {
-                "id": 4,
-                "nodeType": "PlaceholderStatement",
-                "src": "34:1:1"
-              }
-            ]
-          },
-          "id": 6,
-          "name": "M",
-          "nameLocation": "22:1:1",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "mutability": "mutable",
-                "name": "i",
-                "nameLocation": "29:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 6,
-                "src": "24:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "24:4:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "23:8:1"
-          },
-          "src": "13:25:1",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 12,
-            "nodeType": "Block",
-            "src": "64:2:1",
-            "statements": []
-          },
-          "functionSelector": "28811f59",
-          "id": 13,
-          "implemented": true,
-          "kind": "function",
-          "modifiers":
-          [
-            {
-              "arguments":
-              [
-                {
-                  "hexValue": "31",
-                  "id": 9,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "number",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "54:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_1_by_1",
-                    "typeString": "int_const 1"
-                  },
-                  "value": "1"
-                }
-              ],
-              "id": 10,
-              "kind": "modifierInvocation",
-              "modifierName":
-              {
-                "id": 8,
-                "name": "M",
-                "nameLocations":
-                [
-                  "52:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 6,
-                "src": "52:1:1"
-              },
-              "nodeType": "ModifierInvocation",
-              "src": "52:4:1"
-            }
-          ],
-          "name": "F",
-          "nameLocation": "48:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "49:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "64:0:1"
-          },
-          "scope": 14,
-          "src": "39:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 15,
-      "src": "0:68:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:69:1"
-}
diff --git a/test/libsolidity/ASTJSON/modifier_invocation.sol b/test/libsolidity/ASTJSON/modifier_invocation.sol
deleted file mode 100644
index 1dcdb59468ca..000000000000
--- a/test/libsolidity/ASTJSON/modifier_invocation.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { modifier M(uint i) { _; } function F() M(1) public {} }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
deleted file mode 100644
index f8067952a28c..000000000000
--- a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 15,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 14,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 5,
-            "nodeType": "Block",
-            "src": "32:6:1",
-            "statements":
-            [
-              {
-                "id": 4,
-                "nodeType": "PlaceholderStatement",
-                "src": "34:1:1"
-              }
-            ]
-          },
-          "id": 6,
-          "name": "M",
-          "nameLocation": "22:1:1",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 2,
-                "mutability": "mutable",
-                "name": "i",
-                "nameLocation": "29:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "24:6:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 1,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "24:4:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "23:8:1"
-          },
-          "src": "13:25:1",
-          "virtual": false,
-          "visibility": "internal"
-        },
-        {
-          "body":
-          {
-            "id": 12,
-            "nodeType": "Block",
-            "src": "64:2:1",
-            "statements": []
-          },
-          "id": 13,
-          "implemented": true,
-          "kind": "function",
-          "modifiers":
-          [
-            {
-              "arguments":
-              [
-                {
-                  "hexValue": "31",
-                  "id": 9,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "54:1:1",
-                  "typeDescriptions": {},
-                  "value": "1"
-                }
-              ],
-              "id": 10,
-              "modifierName":
-              {
-                "id": 8,
-                "name": "M",
-                "nameLocations":
-                [
-                  "52:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "52:1:1"
-              },
-              "nodeType": "ModifierInvocation",
-              "src": "52:4:1"
-            }
-          ],
-          "name": "F",
-          "nameLocation": "48:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "49:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "64:0:1"
-          },
-          "src": "39:27:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:68:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:69:1"
-}
diff --git a/test/libsolidity/ASTJSON/mutability.json b/test/libsolidity/ASTJSON/mutability.json
deleted file mode 100644
index b6318d84e5e9..000000000000
--- a/test/libsolidity/ASTJSON/mutability.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      10
-    ]
-  },
-  "id": 11,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 10,
-      "linearizedBaseContracts":
-      [
-        10
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "functionSelector": "0dbe671f",
-          "id": 3,
-          "mutability": "immutable",
-          "name": "a",
-          "nameLocation": "39:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 10,
-          "src": "17:27:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 1,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "17:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "value":
-          {
-            "hexValue": "34",
-            "id": 2,
-            "isConstant": false,
-            "isLValue": false,
-            "isPure": true,
-            "kind": "number",
-            "lValueRequested": false,
-            "nodeType": "Literal",
-            "src": "43:1:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_rational_4_by_1",
-              "typeString": "int_const 4"
-            },
-            "value": "4"
-          },
-          "visibility": "public"
-        },
-        {
-          "constant": true,
-          "functionSelector": "4df7e3d0",
-          "id": 6,
-          "mutability": "constant",
-          "name": "b",
-          "nameLocation": "71:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 10,
-          "src": "50:26:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 4,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "50:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "value":
-          {
-            "hexValue": "32",
-            "id": 5,
-            "isConstant": false,
-            "isLValue": false,
-            "isPure": true,
-            "kind": "number",
-            "lValueRequested": false,
-            "nodeType": "Literal",
-            "src": "75:1:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_rational_2_by_1",
-              "typeString": "int_const 2"
-            },
-            "value": "2"
-          },
-          "visibility": "public"
-        },
-        {
-          "constant": false,
-          "functionSelector": "c3da42b8",
-          "id": 9,
-          "mutability": "mutable",
-          "name": "c",
-          "nameLocation": "94:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 10,
-          "src": "82:17:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 7,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "82:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "value":
-          {
-            "hexValue": "33",
-            "id": 8,
-            "isConstant": false,
-            "isLValue": false,
-            "isPure": true,
-            "kind": "number",
-            "lValueRequested": false,
-            "nodeType": "Literal",
-            "src": "98:1:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_rational_3_by_1",
-              "typeString": "int_const 3"
-            },
-            "value": "3"
-          },
-          "visibility": "public"
-        }
-      ],
-      "scope": 11,
-      "src": "0:102:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:103:1"
-}
diff --git a/test/libsolidity/ASTJSON/mutability.sol b/test/libsolidity/ASTJSON/mutability.sol
deleted file mode 100644
index 3f67c29e0981..000000000000
--- a/test/libsolidity/ASTJSON/mutability.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C
-{
-    uint public immutable a = 4;
-    uint public constant b = 2;
-    uint public c = 3;
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/mutability_parseOnly.json b/test/libsolidity/ASTJSON/mutability_parseOnly.json
deleted file mode 100644
index 637f8e11416c..000000000000
--- a/test/libsolidity/ASTJSON/mutability_parseOnly.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 11,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 10,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "immutable",
-          "name": "a",
-          "nameLocation": "39:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "17:27:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 1,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "17:4:1",
-            "typeDescriptions": {}
-          },
-          "value":
-          {
-            "hexValue": "34",
-            "id": 2,
-            "kind": "number",
-            "nodeType": "Literal",
-            "src": "43:1:1",
-            "typeDescriptions": {},
-            "value": "4"
-          },
-          "visibility": "public"
-        },
-        {
-          "constant": true,
-          "id": 6,
-          "mutability": "constant",
-          "name": "b",
-          "nameLocation": "71:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "50:26:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 4,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "50:4:1",
-            "typeDescriptions": {}
-          },
-          "value":
-          {
-            "hexValue": "32",
-            "id": 5,
-            "kind": "number",
-            "nodeType": "Literal",
-            "src": "75:1:1",
-            "typeDescriptions": {},
-            "value": "2"
-          },
-          "visibility": "public"
-        },
-        {
-          "constant": false,
-          "id": 9,
-          "mutability": "mutable",
-          "name": "c",
-          "nameLocation": "94:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "82:17:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 7,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "82:4:1",
-            "typeDescriptions": {}
-          },
-          "value":
-          {
-            "hexValue": "33",
-            "id": 8,
-            "kind": "number",
-            "nodeType": "Literal",
-            "src": "98:1:1",
-            "typeDescriptions": {},
-            "value": "3"
-          },
-          "visibility": "public"
-        }
-      ],
-      "src": "0:102:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:103:1"
-}
diff --git a/test/libsolidity/ASTJSON/non_utf8.json b/test/libsolidity/ASTJSON/non_utf8.json
deleted file mode 100644
index 0058e56eb322..000000000000
--- a/test/libsolidity/ASTJSON/non_utf8.json
+++ /dev/null
@@ -1,238 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      15
-    ]
-  },
-  "id": 16,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 15,
-      "linearizedBaseContracts":
-      [
-        15
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 13,
-            "nodeType": "Block",
-            "src": "33:45:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 13,
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_string_memory_ptr",
-                      "typeString": "string"
-                    },
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_string_storage_ptr",
-                        "typeString": "string"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 12,
-                "initialValue":
-                {
-                  "arguments":
-                  [
-                    {
-                      "arguments":
-                      [
-                        {
-                          "hexValue": "ff",
-                          "id": 9,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": true,
-                          "kind": "hexString",
-                          "lValueRequested": false,
-                          "nodeType": "Literal",
-                          "src": "66:7:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
-                            "typeString": "literal_string hex\"ff\""
-                          }
-                        }
-                      ],
-                      "expression":
-                      {
-                        "argumentTypes":
-                        [
-                          {
-                            "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
-                            "typeString": "literal_string hex\"ff\""
-                          }
-                        ],
-                        "id": 8,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "lValueRequested": false,
-                        "nodeType": "ElementaryTypeNameExpression",
-                        "src": "60:5:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_type$_t_bytes_storage_ptr_$",
-                          "typeString": "type(bytes storage pointer)"
-                        },
-                        "typeName":
-                        {
-                          "id": 7,
-                          "name": "bytes",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "60:5:1",
-                          "typeDescriptions": {}
-                        }
-                      },
-                      "id": 10,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": true,
-                      "kind": "typeConversion",
-                      "lValueRequested": false,
-                      "nameLocations": [],
-                      "names": [],
-                      "nodeType": "FunctionCall",
-                      "src": "60:14:1",
-                      "tryCall": false,
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_bytes_memory_ptr",
-                        "typeString": "bytes memory"
-                      }
-                    }
-                  ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
-                      {
-                        "typeIdentifier": "t_bytes_memory_ptr",
-                        "typeString": "bytes memory"
-                      }
-                    ],
-                    "id": 6,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": true,
-                    "lValueRequested": false,
-                    "nodeType": "ElementaryTypeNameExpression",
-                    "src": "53:6:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_type$_t_string_storage_ptr_$",
-                      "typeString": "type(string storage pointer)"
-                    },
-                    "typeName":
-                    {
-                      "id": 5,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "53:6:1",
-                      "typeDescriptions": {}
-                    }
-                  },
-                  "id": 11,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "typeConversion",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "53:22:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_string_memory_ptr",
-                    "typeString": "string memory"
-                  }
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:40:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 14,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 15,
-          "src": "13:65:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 16,
-      "src": "0:80:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:81:1"
-}
diff --git a/test/libsolidity/ASTJSON/non_utf8.sol b/test/libsolidity/ASTJSON/non_utf8.sol
deleted file mode 100644
index 0f14102ccefd..000000000000
--- a/test/libsolidity/ASTJSON/non_utf8.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function f() public { string memory x = string(bytes(hex"ff")); } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
deleted file mode 100644
index bbc350f96dfe..000000000000
--- a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 16,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 15,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 13,
-            "nodeType": "Block",
-            "src": "33:45:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 12,
-                "initialValue":
-                {
-                  "arguments":
-                  [
-                    {
-                      "arguments":
-                      [
-                        {
-                          "hexValue": "ff",
-                          "id": 9,
-                          "kind": "hexString",
-                          "nodeType": "Literal",
-                          "src": "66:7:1",
-                          "typeDescriptions": {}
-                        }
-                      ],
-                      "expression":
-                      {
-                        "id": 8,
-                        "nodeType": "ElementaryTypeNameExpression",
-                        "src": "60:5:1",
-                        "typeDescriptions": {},
-                        "typeName":
-                        {
-                          "id": 7,
-                          "name": "bytes",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "60:5:1",
-                          "typeDescriptions": {}
-                        }
-                      },
-                      "id": 10,
-                      "nameLocations": [],
-                      "names": [],
-                      "nodeType": "FunctionCall",
-                      "src": "60:14:1",
-                      "tryCall": false,
-                      "typeDescriptions": {}
-                    }
-                  ],
-                  "expression":
-                  {
-                    "id": 6,
-                    "nodeType": "ElementaryTypeNameExpression",
-                    "src": "53:6:1",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 5,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "53:6:1",
-                      "typeDescriptions": {}
-                    }
-                  },
-                  "id": 11,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "53:22:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:40:1"
-              }
-            ]
-          },
-          "id": 14,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:65:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:80:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:81:1"
-}
diff --git a/test/libsolidity/ASTJSON/not_existing_import.sol b/test/libsolidity/ASTJSON/not_existing_import.sol
deleted file mode 100644
index ad3c100c499b..000000000000
--- a/test/libsolidity/ASTJSON/not_existing_import.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-import "notexisting.sol" as NotExisting;
-contract C is NotExisting.X
-{
-	NotExisting.SomeStruct public myStruct;
-	constructor() {}
-}
-// ----
-// failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
deleted file mode 100644
index ea08150fd372..000000000000
--- a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 12,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "absolutePath": "notexisting.sol",
-      "file": "notexisting.sol",
-      "id": 1,
-      "nameLocation": "28:11:1",
-      "nodeType": "ImportDirective",
-      "src": "0:40:1",
-      "symbolAliases": [],
-      "unitAlias": "NotExisting"
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 2,
-            "name": "NotExisting.X",
-            "nameLocations":
-            [
-              "55:11:1",
-              "67:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "55:13:1"
-          },
-          "id": 3,
-          "nodeType": "InheritanceSpecifier",
-          "src": "55:13:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 11,
-      "name": "C",
-      "nameLocation": "50:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 6,
-          "mutability": "mutable",
-          "name": "myStruct",
-          "nameLocation": "102:8:1",
-          "nodeType": "VariableDeclaration",
-          "src": "72:38:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 5,
-            "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
-              "id": 4,
-              "name": "NotExisting.SomeStruct",
-              "nameLocations":
-              [
-                "72:11:1",
-                "84:10:1"
-              ],
-              "nodeType": "IdentifierPath",
-              "src": "72:22:1"
-            },
-            "src": "72:22:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 9,
-            "nodeType": "Block",
-            "src": "127:2:1",
-            "statements": []
-          },
-          "id": 10,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "124:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "127:0:1"
-          },
-          "src": "113:16:1",
-          "stateMutability": "nonpayable",
-          "virtual": false
-        }
-      ],
-      "src": "41:90:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:132:1"
-}
diff --git a/test/libsolidity/ASTJSON/override.json b/test/libsolidity/ASTJSON/override.json
deleted file mode 100644
index 35d36eac4e9f..000000000000
--- a/test/libsolidity/ASTJSON/override.json
+++ /dev/null
@@ -1,340 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
-      5
-    ],
-    "B":
-    [
-      16
-    ],
-    "C":
-    [
-      29
-    ]
-  },
-  "id": 30,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "A",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "44:2:1",
-            "statements": []
-          },
-          "functionSelector": "a399b6a2",
-          "id": 4,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "faa",
-          "nameLocation": "23:3:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "26:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "44:0:1"
-          },
-          "scope": 5,
-          "src": "14:32:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "scope": 30,
-      "src": "0:48:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": true,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 6,
-            "name": "A",
-            "nameLocations":
-            [
-              "72:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 5,
-            "src": "72:1:1"
-          },
-          "id": 7,
-          "nodeType": "InheritanceSpecifier",
-          "src": "72:1:1"
-        }
-      ],
-      "canonicalName": "B",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": false,
-      "id": 16,
-      "linearizedBaseContracts":
-      [
-        16,
-        5
-      ],
-      "name": "B",
-      "nameLocation": "67:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "functionSelector": "c2985578",
-          "id": 10,
-          "implemented": false,
-          "kind": "function",
-          "modifiers": [],
-          "name": "foo",
-          "nameLocation": "86:3:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "89:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 9,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "106:0:1"
-          },
-          "scope": 16,
-          "src": "77:30:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        },
-        {
-          "baseFunctions":
-          [
-            4
-          ],
-          "body":
-          {
-            "id": 14,
-            "nodeType": "Block",
-            "src": "148:2:1",
-            "statements": []
-          },
-          "functionSelector": "a399b6a2",
-          "id": 15,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "faa",
-          "nameLocation": "118:3:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 12,
-            "nodeType": "OverrideSpecifier",
-            "overrides": [],
-            "src": "139:8:1"
-          },
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "121:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "148:0:1"
-          },
-          "scope": 16,
-          "src": "109:41:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "scope": 30,
-      "src": "49:103:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 17,
-            "name": "B",
-            "nameLocations":
-            [
-              "167:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 16,
-            "src": "167:1:1"
-          },
-          "id": 18,
-          "nodeType": "InheritanceSpecifier",
-          "src": "167:1:1"
-        }
-      ],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 29,
-      "linearizedBaseContracts":
-      [
-        29,
-        16,
-        5
-      ],
-      "name": "C",
-      "nameLocation": "162:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "baseFunctions":
-          [
-            10
-          ],
-          "body":
-          {
-            "id": 22,
-            "nodeType": "Block",
-            "src": "203:3:1",
-            "statements": []
-          },
-          "functionSelector": "c2985578",
-          "id": 23,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "foo",
-          "nameLocation": "181:3:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 20,
-            "nodeType": "OverrideSpecifier",
-            "overrides": [],
-            "src": "194:8:1"
-          },
-          "parameters":
-          {
-            "id": 19,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "184:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 21,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "203:0:1"
-          },
-          "scope": 29,
-          "src": "172:34:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "baseFunctions":
-          [
-            15
-          ],
-          "body":
-          {
-            "id": 27,
-            "nodeType": "Block",
-            "src": "239:3:1",
-            "statements": []
-          },
-          "functionSelector": "a399b6a2",
-          "id": 28,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "faa",
-          "nameLocation": "217:3:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 25,
-            "nodeType": "OverrideSpecifier",
-            "overrides": [],
-            "src": "230:8:1"
-          },
-          "parameters":
-          {
-            "id": 24,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "220:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 26,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "239:0:1"
-          },
-          "scope": 29,
-          "src": "208:34:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 30,
-      "src": "153:91:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:245:1"
-}
diff --git a/test/libsolidity/ASTJSON/override.sol b/test/libsolidity/ASTJSON/override.sol
deleted file mode 100644
index a03244985744..000000000000
--- a/test/libsolidity/ASTJSON/override.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-	function faa() public virtual {}
-}
-abstract contract B is A {
-	function foo() public virtual;
-	function faa() public virtual override {}
-}
-contract C is B {
-	function foo() public override { }
-	function faa() public override { }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/override_parseOnly.json b/test/libsolidity/ASTJSON/override_parseOnly.json
deleted file mode 100644
index 3a927f5f2f12..000000000000
--- a/test/libsolidity/ASTJSON/override_parseOnly.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 30,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "44:2:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "faa",
-          "nameLocation": "23:3:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "26:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "44:0:1"
-          },
-          "src": "14:32:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:48:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": true,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 6,
-            "name": "A",
-            "nameLocations":
-            [
-              "72:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "72:1:1"
-          },
-          "id": 7,
-          "nodeType": "InheritanceSpecifier",
-          "src": "72:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 16,
-      "name": "B",
-      "nameLocation": "67:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 10,
-          "implemented": false,
-          "kind": "function",
-          "modifiers": [],
-          "name": "foo",
-          "nameLocation": "86:3:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "89:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 9,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "106:0:1"
-          },
-          "src": "77:30:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 14,
-            "nodeType": "Block",
-            "src": "148:2:1",
-            "statements": []
-          },
-          "id": 15,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "faa",
-          "nameLocation": "118:3:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 12,
-            "nodeType": "OverrideSpecifier",
-            "overrides": [],
-            "src": "139:8:1"
-          },
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "121:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "148:0:1"
-          },
-          "src": "109:41:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "src": "49:103:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 17,
-            "name": "B",
-            "nameLocations":
-            [
-              "167:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "167:1:1"
-          },
-          "id": 18,
-          "nodeType": "InheritanceSpecifier",
-          "src": "167:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 29,
-      "name": "C",
-      "nameLocation": "162:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 22,
-            "nodeType": "Block",
-            "src": "203:3:1",
-            "statements": []
-          },
-          "id": 23,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "foo",
-          "nameLocation": "181:3:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 20,
-            "nodeType": "OverrideSpecifier",
-            "overrides": [],
-            "src": "194:8:1"
-          },
-          "parameters":
-          {
-            "id": 19,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "184:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 21,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "203:0:1"
-          },
-          "src": "172:34:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 27,
-            "nodeType": "Block",
-            "src": "239:3:1",
-            "statements": []
-          },
-          "id": 28,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "faa",
-          "nameLocation": "217:3:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 25,
-            "nodeType": "OverrideSpecifier",
-            "overrides": [],
-            "src": "230:8:1"
-          },
-          "parameters":
-          {
-            "id": 24,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "220:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 26,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "239:0:1"
-          },
-          "src": "208:34:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "153:91:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:245:1"
-}
diff --git a/test/libsolidity/ASTJSON/placeholder_statement.json b/test/libsolidity/ASTJSON/placeholder_statement.json
deleted file mode 100644
index 96a46c1484c3..000000000000
--- a/test/libsolidity/ASTJSON/placeholder_statement.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "24:6:1",
-            "statements":
-            [
-              {
-                "id": 2,
-                "nodeType": "PlaceholderStatement",
-                "src": "26:1:1"
-              }
-            ]
-          },
-          "id": 4,
-          "name": "M",
-          "nameLocation": "22:1:1",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "24:0:1"
-          },
-          "src": "13:17:1",
-          "virtual": false,
-          "visibility": "internal"
-        }
-      ],
-      "scope": 6,
-      "src": "0:32:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:33:1"
-}
diff --git a/test/libsolidity/ASTJSON/placeholder_statement.sol b/test/libsolidity/ASTJSON/placeholder_statement.sol
deleted file mode 100644
index 22a719fa42f7..000000000000
--- a/test/libsolidity/ASTJSON/placeholder_statement.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { modifier M { _; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json b/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
deleted file mode 100644
index 8af17040246f..000000000000
--- a/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "24:6:1",
-            "statements":
-            [
-              {
-                "id": 2,
-                "nodeType": "PlaceholderStatement",
-                "src": "26:1:1"
-              }
-            ]
-          },
-          "id": 4,
-          "name": "M",
-          "nameLocation": "22:1:1",
-          "nodeType": "ModifierDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "24:0:1"
-          },
-          "src": "13:17:1",
-          "virtual": false,
-          "visibility": "internal"
-        }
-      ],
-      "src": "0:32:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:33:1"
-}
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
deleted file mode 100644
index bb5b771a6c74..000000000000
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma experimental solidity;
-// ====
-// EVMVersion: >=constantinople
-// ----
-// failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
deleted file mode 100644
index b1ac937a2427..000000000000
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "absolutePath": "a",
-  "experimentalSolidity": true,
-  "id": 2,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 1,
-      "literals":
-      [
-        "experimental",
-        "solidity"
-      ],
-      "nodeType": "PragmaDirective",
-      "src": "0:29:1"
-    }
-  ],
-  "src": "0:70:1"
-}
diff --git a/test/libsolidity/ASTJSON/receive_ether.json b/test/libsolidity/ASTJSON/receive_ether.json
deleted file mode 100644
index 2790493993ee..000000000000
--- a/test/libsolidity/ASTJSON/receive_ether.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      5
-    ]
-  },
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "42:5:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "receive",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "22:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "scope": 5,
-          "src": "15:32:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "scope": 6,
-      "src": "0:49:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:50:1"
-}
diff --git a/test/libsolidity/ASTJSON/receive_ether.sol b/test/libsolidity/ASTJSON/receive_ether.sol
deleted file mode 100644
index 1e59dc1317bc..000000000000
--- a/test/libsolidity/ASTJSON/receive_ether.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  receive() external payable {
-  }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/receive_ether_parseOnly.json b/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
deleted file mode 100644
index f9aede155ec7..000000000000
--- a/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 6,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "42:5:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "receive",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "22:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "42:0:1"
-          },
-          "src": "15:32:1",
-          "stateMutability": "payable",
-          "virtual": false,
-          "visibility": "external"
-        }
-      ],
-      "src": "0:49:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:50:1"
-}
diff --git a/test/libsolidity/ASTJSON/short_type_name.json b/test/libsolidity/ASTJSON/short_type_name.json
deleted file mode 100644
index 1c1138cbafb3..000000000000
--- a/test/libsolidity/ASTJSON/short_type_name.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
-      11
-    ]
-  },
-  "id": 12,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "c",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 11,
-      "linearizedBaseContracts":
-      [
-        11
-      ],
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 9,
-            "nodeType": "Block",
-            "src": "33:20:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  7
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 7,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 9,
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
-                      "typeString": "uint256[]"
-                    },
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "id": 5,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "35:4:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
-                      },
-                      "id": 6,
-                      "nodeType": "ArrayTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                        "typeString": "uint256[]"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 8,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:15:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 10,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 11,
-          "src": "13:40:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 12,
-      "src": "0:55:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:56:1"
-}
diff --git a/test/libsolidity/ASTJSON/short_type_name.sol b/test/libsolidity/ASTJSON/short_type_name.sol
deleted file mode 100644
index 077e715b9c60..000000000000
--- a/test/libsolidity/ASTJSON/short_type_name.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract c { function f() public { uint[] memory x; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/short_type_name_parseOnly.json b/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
deleted file mode 100644
index 3c4acfa775ed..000000000000
--- a/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 12,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 11,
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 9,
-            "nodeType": "Block",
-            "src": "33:20:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  7
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 7,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "id": 5,
-                        "name": "uint",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "35:4:1",
-                        "typeDescriptions": {}
-                      },
-                      "id": 6,
-                      "nodeType": "ArrayTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 8,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:15:1"
-              }
-            ]
-          },
-          "id": 10,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:40:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:55:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:56:1"
-}
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref.json b/test/libsolidity/ASTJSON/short_type_name_ref.json
deleted file mode 100644
index 447b1e5b7705..000000000000
--- a/test/libsolidity/ASTJSON/short_type_name_ref.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
-      12
-    ]
-  },
-  "id": 13,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "c",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 12,
-      "linearizedBaseContracts":
-      [
-        12
-      ],
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 10,
-            "nodeType": "Block",
-            "src": "33:25:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  8
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 8,
-                    "mutability": "mutable",
-                    "name": "rows",
-                    "nameLocation": "51:4:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 10,
-                    "src": "35:20:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr",
-                      "typeString": "uint256[][]"
-                    },
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "baseType":
-                        {
-                          "id": 5,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "35:4:1",
-                          "typeDescriptions":
-                          {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
-                        },
-                        "id": 6,
-                        "nodeType": "ArrayTypeName",
-                        "src": "35:6:1",
-                        "typeDescriptions":
-                        {
-                          "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                          "typeString": "uint256[]"
-                        }
-                      },
-                      "id": 7,
-                      "nodeType": "ArrayTypeName",
-                      "src": "35:8:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_array$_t_array$_t_uint256_$dyn_storage_$dyn_storage_ptr",
-                        "typeString": "uint256[][]"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 9,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:20:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 11,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 12,
-          "src": "13:45:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 13,
-      "src": "0:60:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:61:1"
-}
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref.sol b/test/libsolidity/ASTJSON/short_type_name_ref.sol
deleted file mode 100644
index 9128d69d6975..000000000000
--- a/test/libsolidity/ASTJSON/short_type_name_ref.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract c { function f() public { uint[][] memory rows; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json b/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
deleted file mode 100644
index 07c782d47bb4..000000000000
--- a/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 13,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 12,
-      "name": "c",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 10,
-            "nodeType": "Block",
-            "src": "33:25:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  8
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 8,
-                    "mutability": "mutable",
-                    "name": "rows",
-                    "nameLocation": "51:4:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:20:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "baseType":
-                        {
-                          "id": 5,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "35:4:1",
-                          "typeDescriptions": {}
-                        },
-                        "id": 6,
-                        "nodeType": "ArrayTypeName",
-                        "src": "35:6:1",
-                        "typeDescriptions": {}
-                      },
-                      "id": 7,
-                      "nodeType": "ArrayTypeName",
-                      "src": "35:8:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 9,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:20:1"
-              }
-            ]
-          },
-          "id": 11,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:45:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:60:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:61:1"
-}
diff --git a/test/libsolidity/ASTJSON/smoke.json b/test/libsolidity/ASTJSON/smoke.json
deleted file mode 100644
index d3b114bbcba4..000000000000
--- a/test/libsolidity/ASTJSON/smoke.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      1
-    ]
-  },
-  "id": 2,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 1,
-      "linearizedBaseContracts":
-      [
-        1
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 2,
-      "src": "0:13:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:14:1"
-}
diff --git a/test/libsolidity/ASTJSON/smoke.sol b/test/libsolidity/ASTJSON/smoke.sol
deleted file mode 100644
index 3796bf807fd8..000000000000
--- a/test/libsolidity/ASTJSON/smoke.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C {}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/smoke_parseOnly.json b/test/libsolidity/ASTJSON/smoke_parseOnly.json
deleted file mode 100644
index 1160fea91e75..000000000000
--- a/test/libsolidity/ASTJSON/smoke_parseOnly.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 2,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 1,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "0:13:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:14:1"
-}
diff --git a/test/libsolidity/ASTJSON/source_location.json b/test/libsolidity/ASTJSON/source_location.json
deleted file mode 100644
index caeaf027ab3f..000000000000
--- a/test/libsolidity/ASTJSON/source_location.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      12
-    ]
-  },
-  "id": 13,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 12,
-      "linearizedBaseContracts":
-      [
-        12
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 10,
-            "nodeType": "Block",
-            "src": "33:20:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "40:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 10,
-                    "src": "35:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:4:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 6,
-                "initialValue":
-                {
-                  "hexValue": "32",
-                  "id": 5,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "number",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "44:1:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_2_by_1",
-                    "typeString": "int_const 2"
-                  },
-                  "value": "2"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:10:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 8,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "nodeType": "UnaryOperation",
-                  "operator": "++",
-                  "prefix": false,
-                  "src": "47:3:1",
-                  "subExpression":
-                  {
-                    "id": 7,
-                    "name": "x",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 4,
-                    "src": "47:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "id": 9,
-                "nodeType": "ExpressionStatement",
-                "src": "47:3:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 11,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 12,
-          "src": "13:40:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 13,
-      "src": "0:55:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:56:1"
-}
diff --git a/test/libsolidity/ASTJSON/source_location.sol b/test/libsolidity/ASTJSON/source_location.sol
deleted file mode 100644
index 756998e43a83..000000000000
--- a/test/libsolidity/ASTJSON/source_location.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function f() public { uint x = 2; x++; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/source_location_parseOnly.json b/test/libsolidity/ASTJSON/source_location_parseOnly.json
deleted file mode 100644
index ec25111bd349..000000000000
--- a/test/libsolidity/ASTJSON/source_location_parseOnly.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 13,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 12,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 10,
-            "nodeType": "Block",
-            "src": "33:20:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "40:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:6:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:4:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 6,
-                "initialValue":
-                {
-                  "hexValue": "32",
-                  "id": 5,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "44:1:1",
-                  "typeDescriptions": {},
-                  "value": "2"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:10:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 8,
-                  "nodeType": "UnaryOperation",
-                  "operator": "++",
-                  "prefix": false,
-                  "src": "47:3:1",
-                  "subExpression":
-                  {
-                    "id": 7,
-                    "name": "x",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "47:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "typeDescriptions": {}
-                },
-                "id": 9,
-                "nodeType": "ExpressionStatement",
-                "src": "47:3:1"
-              }
-            ]
-          },
-          "id": 11,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:40:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:55:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:56:1"
-}
diff --git a/test/libsolidity/ASTJSON/string.json b/test/libsolidity/ASTJSON/string.json
deleted file mode 100644
index c7706e3bfc01..000000000000
--- a/test/libsolidity/ASTJSON/string.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      9
-    ]
-  },
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 9,
-      "linearizedBaseContracts":
-      [
-        9
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "33:36:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 7,
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_string_memory_ptr",
-                      "typeString": "string"
-                    },
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_string_storage_ptr",
-                        "typeString": "string"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 6,
-                "initialValue":
-                {
-                  "hexValue": "48656c6c6f20576f726c64",
-                  "id": 5,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "string",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "53:13:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_stringliteral_592fa743889fc7f92ac2a37bb1f5ba1daf2a5c84741ca0e0061d243a2e6707ba",
-                    "typeString": "literal_string \"Hello World\""
-                  },
-                  "value": "Hello World"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:31:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 8,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 9,
-          "src": "13:56:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 10,
-      "src": "0:71:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:72:1"
-}
diff --git a/test/libsolidity/ASTJSON/string.sol b/test/libsolidity/ASTJSON/string.sol
deleted file mode 100644
index a0a213475d7e..000000000000
--- a/test/libsolidity/ASTJSON/string.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function f() public { string memory x = "Hello World"; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/string_parseOnly.json b/test/libsolidity/ASTJSON/string_parseOnly.json
deleted file mode 100644
index 5f97eb1f917e..000000000000
--- a/test/libsolidity/ASTJSON/string_parseOnly.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 9,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "33:36:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 6,
-                "initialValue":
-                {
-                  "hexValue": "48656c6c6f20576f726c64",
-                  "id": 5,
-                  "kind": "string",
-                  "nodeType": "Literal",
-                  "src": "53:13:1",
-                  "typeDescriptions": {},
-                  "value": "Hello World"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:31:1"
-              }
-            ]
-          },
-          "id": 8,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:56:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:71:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:72:1"
-}
diff --git a/test/libsolidity/ASTJSON/struct_natspec.json b/test/libsolidity/ASTJSON/struct_natspec.json
deleted file mode 100644
index d8b38a8033d3..000000000000
--- a/test/libsolidity/ASTJSON/struct_natspec.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "Example":
-    [
-      8
-    ]
-  },
-  "id": 9,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "Example",
-      "documentation":
-      {
-        "id": 1,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:112:1",
-        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
-      },
-      "id": 8,
-      "members":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "text",
-          "nameLocation": "140:4:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 8,
-          "src": "133:11:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_string_storage_ptr",
-            "typeString": "string"
-          },
-          "typeName":
-          {
-            "id": 2,
-            "name": "string",
-            "nodeType": "ElementaryTypeName",
-            "src": "133:6:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_string_storage_ptr",
-              "typeString": "string"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 5,
-          "mutability": "mutable",
-          "name": "valid",
-          "nameLocation": "155:5:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 8,
-          "src": "150:10:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_bool",
-            "typeString": "bool"
-          },
-          "typeName":
-          {
-            "id": 4,
-            "name": "bool",
-            "nodeType": "ElementaryTypeName",
-            "src": "150:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_bool",
-              "typeString": "bool"
-            }
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 7,
-          "mutability": "mutable",
-          "name": "value",
-          "nameLocation": "174:5:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 8,
-          "src": "166:13:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_uint256",
-            "typeString": "uint256"
-          },
-          "typeName":
-          {
-            "id": 6,
-            "name": "uint256",
-            "nodeType": "ElementaryTypeName",
-            "src": "166:7:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          },
-          "visibility": "internal"
-        }
-      ],
-      "name": "Example",
-      "nameLocation": "119:7:1",
-      "nodeType": "StructDefinition",
-      "scope": 9,
-      "src": "112:70:1",
-      "visibility": "public"
-    }
-  ],
-  "src": "112:71:1"
-}
diff --git a/test/libsolidity/ASTJSON/struct_natspec.sol b/test/libsolidity/ASTJSON/struct_natspec.sol
deleted file mode 100644
index c9e279f6b867..000000000000
--- a/test/libsolidity/ASTJSON/struct_natspec.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-/// @title example of title
-/// @author example of author
-/// @notice example of notice
-/// @dev example of dev
-struct Example {
-    string text;
-    bool valid;
-    uint256 value;
-}
-
-// ----
diff --git a/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json b/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
deleted file mode 100644
index b80aaf377cb8..000000000000
--- a/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 9,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "documentation":
-      {
-        "id": 1,
-        "nodeType": "StructuredDocumentation",
-        "src": "0:112:1",
-        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
-      },
-      "id": 8,
-      "members":
-      [
-        {
-          "constant": false,
-          "id": 3,
-          "mutability": "mutable",
-          "name": "text",
-          "nameLocation": "140:4:1",
-          "nodeType": "VariableDeclaration",
-          "src": "133:11:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 2,
-            "name": "string",
-            "nodeType": "ElementaryTypeName",
-            "src": "133:6:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 5,
-          "mutability": "mutable",
-          "name": "valid",
-          "nameLocation": "155:5:1",
-          "nodeType": "VariableDeclaration",
-          "src": "150:10:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 4,
-            "name": "bool",
-            "nodeType": "ElementaryTypeName",
-            "src": "150:4:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        },
-        {
-          "constant": false,
-          "id": 7,
-          "mutability": "mutable",
-          "name": "value",
-          "nameLocation": "174:5:1",
-          "nodeType": "VariableDeclaration",
-          "src": "166:13:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 6,
-            "name": "uint256",
-            "nodeType": "ElementaryTypeName",
-            "src": "166:7:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "internal"
-        }
-      ],
-      "name": "Example",
-      "nameLocation": "119:7:1",
-      "nodeType": "StructDefinition",
-      "src": "112:70:1",
-      "visibility": "public"
-    }
-  ],
-  "src": "112:71:1"
-}
diff --git a/test/libsolidity/ASTJSON/two_base_functions.json b/test/libsolidity/ASTJSON/two_base_functions.json
deleted file mode 100644
index 0ed997a32fa3..000000000000
--- a/test/libsolidity/ASTJSON/two_base_functions.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
-      5
-    ],
-    "B":
-    [
-      10
-    ],
-    "C":
-    [
-      22
-    ]
-  },
-  "id": 23,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "A",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 5,
-      "linearizedBaseContracts":
-      [
-        5
-      ],
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "45:2:1",
-            "statements": []
-          },
-          "functionSelector": "26121ff0",
-          "id": 4,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "45:0:1"
-          },
-          "scope": 5,
-          "src": "17:30:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "scope": 23,
-      "src": "0:49:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "B",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 10,
-      "linearizedBaseContracts":
-      [
-        10
-      ],
-      "name": "B",
-      "nameLocation": "59:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 8,
-            "nodeType": "Block",
-            "src": "95:2:1",
-            "statements": []
-          },
-          "functionSelector": "26121ff0",
-          "id": 9,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "76:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "77:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "95:0:1"
-          },
-          "scope": 10,
-          "src": "67:30:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "scope": 23,
-      "src": "50:49:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 11,
-            "name": "A",
-            "nameLocations":
-            [
-              "114:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 5,
-            "src": "114:1:1"
-          },
-          "id": 12,
-          "nodeType": "InheritanceSpecifier",
-          "src": "114:1:1"
-        },
-        {
-          "baseName":
-          {
-            "id": 13,
-            "name": "B",
-            "nameLocations":
-            [
-              "117:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 10,
-            "src": "117:1:1"
-          },
-          "id": 14,
-          "nodeType": "InheritanceSpecifier",
-          "src": "117:1:1"
-        }
-      ],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 22,
-      "linearizedBaseContracts":
-      [
-        22,
-        10,
-        5
-      ],
-      "name": "C",
-      "nameLocation": "109:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "baseFunctions":
-          [
-            4,
-            9
-          ],
-          "body":
-          {
-            "id": 20,
-            "nodeType": "Block",
-            "src": "160:2:1",
-            "statements": []
-          },
-          "functionSelector": "26121ff0",
-          "id": 21,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "134:1:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 18,
-            "nodeType": "OverrideSpecifier",
-            "overrides":
-            [
-              {
-                "id": 16,
-                "name": "A",
-                "nameLocations":
-                [
-                  "154:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 5,
-                "src": "154:1:1"
-              },
-              {
-                "id": 17,
-                "name": "B",
-                "nameLocations":
-                [
-                  "157:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 10,
-                "src": "157:1:1"
-              }
-            ],
-            "src": "145:14:1"
-          },
-          "parameters":
-          {
-            "id": 15,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "135:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 19,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "160:0:1"
-          },
-          "scope": 22,
-          "src": "125:37:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 23,
-      "src": "100:64:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:165:1"
-}
diff --git a/test/libsolidity/ASTJSON/two_base_functions.sol b/test/libsolidity/ASTJSON/two_base_functions.sol
deleted file mode 100644
index 0a00bcc14505..000000000000
--- a/test/libsolidity/ASTJSON/two_base_functions.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    function f() public virtual {}
-}
-contract B {
-    function f() public virtual {}
-}
-contract C is A, B {
-    function f() public override(A, B) {}
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
deleted file mode 100644
index e448be836bf8..000000000000
--- a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 23,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 5,
-      "name": "A",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 3,
-            "nodeType": "Block",
-            "src": "45:2:1",
-            "statements": []
-          },
-          "id": 4,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "26:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "27:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "45:0:1"
-          },
-          "src": "17:30:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:49:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 10,
-      "name": "B",
-      "nameLocation": "59:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 8,
-            "nodeType": "Block",
-            "src": "95:2:1",
-            "statements": []
-          },
-          "id": 9,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "76:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 6,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "77:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "95:0:1"
-          },
-          "src": "67:30:1",
-          "stateMutability": "nonpayable",
-          "virtual": true,
-          "visibility": "public"
-        }
-      ],
-      "src": "50:49:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 11,
-            "name": "A",
-            "nameLocations":
-            [
-              "114:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "114:1:1"
-          },
-          "id": 12,
-          "nodeType": "InheritanceSpecifier",
-          "src": "114:1:1"
-        },
-        {
-          "baseName":
-          {
-            "id": 13,
-            "name": "B",
-            "nameLocations":
-            [
-              "117:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "117:1:1"
-          },
-          "id": 14,
-          "nodeType": "InheritanceSpecifier",
-          "src": "117:1:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 22,
-      "name": "C",
-      "nameLocation": "109:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 20,
-            "nodeType": "Block",
-            "src": "160:2:1",
-            "statements": []
-          },
-          "id": 21,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "134:1:1",
-          "nodeType": "FunctionDefinition",
-          "overrides":
-          {
-            "id": 18,
-            "nodeType": "OverrideSpecifier",
-            "overrides":
-            [
-              {
-                "id": 16,
-                "name": "A",
-                "nameLocations":
-                [
-                  "154:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "154:1:1"
-              },
-              {
-                "id": 17,
-                "name": "B",
-                "nameLocations":
-                [
-                  "157:1:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "157:1:1"
-              }
-            ],
-            "src": "145:14:1"
-          },
-          "parameters":
-          {
-            "id": 15,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "135:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 19,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "160:0:1"
-          },
-          "src": "125:37:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "100:64:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:165:1"
-}
diff --git a/test/libsolidity/ASTJSON/unicode.json b/test/libsolidity/ASTJSON/unicode.json
deleted file mode 100644
index 0ff1426f17e2..000000000000
--- a/test/libsolidity/ASTJSON/unicode.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      9
-    ]
-  },
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 9,
-      "linearizedBaseContracts":
-      [
-        9
-      ],
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "33:42:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 7,
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_string_memory_ptr",
-                      "typeString": "string"
-                    },
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_string_storage_ptr",
-                        "typeString": "string"
-                      }
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 6,
-                "initialValue":
-                {
-                  "hexValue": "48656c6c6f20f09f9883",
-                  "id": 5,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "unicodeString",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "53:19:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_stringliteral_cd7a99177cebb3d14b8cc54e313dbf76867c71cd6fbb9a33ce3870dc80e9992b",
-                    "typeString": "literal_string hex\"48656c6c6f20f09f9883\""
-                  },
-                  "value": "Hello \ud83d\ude03"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:37:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 8,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "scope": 9,
-          "src": "13:62:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 10,
-      "src": "0:77:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:78:1"
-}
diff --git a/test/libsolidity/ASTJSON/unicode.sol b/test/libsolidity/ASTJSON/unicode.sol
deleted file mode 100644
index ca172bf25d11..000000000000
--- a/test/libsolidity/ASTJSON/unicode.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function f() public { string memory x = unicode"Hello 😃"; } }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/unicode_parseOnly.json b/test/libsolidity/ASTJSON/unicode_parseOnly.json
deleted file mode 100644
index c8fb780c40cc..000000000000
--- a/test/libsolidity/ASTJSON/unicode_parseOnly.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 10,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 9,
-      "name": "C",
-      "nameLocation": "9:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 7,
-            "nodeType": "Block",
-            "src": "33:42:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  4
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 4,
-                    "mutability": "mutable",
-                    "name": "x",
-                    "nameLocation": "49:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "src": "35:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "memory",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 3,
-                      "name": "string",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "35:6:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 6,
-                "initialValue":
-                {
-                  "hexValue": "48656c6c6f20f09f9883",
-                  "id": 5,
-                  "kind": "unicodeString",
-                  "nodeType": "Literal",
-                  "src": "53:19:1",
-                  "typeDescriptions": {},
-                  "value": "Hello \ud83d\ude03"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "35:37:1"
-              }
-            ]
-          },
-          "id": 8,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "22:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "23:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "33:0:1"
-          },
-          "src": "13:62:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:77:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:78:1"
-}
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
deleted file mode 100644
index 12a59f9cbf10..000000000000
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ /dev/null
@@ -1,236 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      19
-    ],
-    "X":
-    [
-      2
-    ],
-    "f":
-    [
-      9
-    ]
-  },
-  "id": 20,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "errorSelector": "c1599bd9",
-      "id": 2,
-      "name": "X",
-      "nameLocation": "6:1:1",
-      "nodeType": "ErrorDefinition",
-      "parameters":
-      {
-        "id": 1,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "7:2:1"
-      },
-      "src": "0:10:1"
-    },
-    {
-      "body":
-      {
-        "id": 8,
-        "nodeType": "Block",
-        "src": "29:15:1",
-        "statements":
-        [
-          {
-            "errorCall":
-            {
-              "arguments": [],
-              "expression":
-              {
-                "argumentTypes": [],
-                "id": 5,
-                "name": "X",
-                "nodeType": "Identifier",
-                "overloadedDeclarations": [],
-                "referencedDeclaration": 2,
-                "src": "38:1:1",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_function_error_pure$__$returns$__$",
-                  "typeString": "function () pure"
-                }
-              },
-              "id": 6,
-              "isConstant": false,
-              "isLValue": false,
-              "isPure": false,
-              "kind": "functionCall",
-              "lValueRequested": false,
-              "nameLocations": [],
-              "names": [],
-              "nodeType": "FunctionCall",
-              "src": "38:3:1",
-              "tryCall": false,
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_tuple$__$",
-                "typeString": "tuple()"
-              }
-            },
-            "id": 7,
-            "nodeType": "RevertStatement",
-            "src": "31:10:1"
-          }
-        ]
-      },
-      "id": 9,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "20:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 3,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "21:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 4,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "29:0:1"
-      },
-      "scope": 20,
-      "src": "11:33:1",
-      "stateMutability": "pure",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 19,
-      "linearizedBaseContracts":
-      [
-        19
-      ],
-      "name": "C",
-      "nameLocation": "54:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "errorSelector": "2bc80f3a",
-          "id": 11,
-          "name": "T",
-          "nameLocation": "68:1:1",
-          "nodeType": "ErrorDefinition",
-          "parameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "69:2:1"
-          },
-          "src": "62:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 17,
-            "nodeType": "Block",
-            "src": "97:8:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "argumentTypes": [],
-                    "id": 14,
-                    "name": "f",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 9,
-                    "src": "99:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_function_internal_pure$__$returns$__$",
-                      "typeString": "function () pure"
-                    }
-                  },
-                  "id": 15,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "kind": "functionCall",
-                  "lValueRequested": false,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "99:3:1",
-                  "tryCall": false,
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_tuple$__$",
-                    "typeString": "tuple()"
-                  }
-                },
-                "id": 16,
-                "nodeType": "ExpressionStatement",
-                "src": "99:3:1"
-              }
-            ]
-          },
-          "functionSelector": "b8c9d365",
-          "id": 18,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "h",
-          "nameLocation": "86:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 12,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "87:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "97:0:1"
-          },
-          "scope": 19,
-          "src": "77:28:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 20,
-      "src": "45:62:1",
-      "usedErrors":
-      [
-        2,
-        11
-      ],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:108:1"
-}
diff --git a/test/libsolidity/ASTJSON/used_errors.sol b/test/libsolidity/ASTJSON/used_errors.sol
deleted file mode 100644
index 97f7a27f48e2..000000000000
--- a/test/libsolidity/ASTJSON/used_errors.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-error X();
-function f() pure { revert X(); }
-contract C {
-    error T();
-    function h() public { f(); }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/used_errors_parseOnly.json b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
deleted file mode 100644
index 115ea2aee567..000000000000
--- a/test/libsolidity/ASTJSON/used_errors_parseOnly.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 20,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 2,
-      "name": "X",
-      "nameLocation": "6:1:1",
-      "nodeType": "ErrorDefinition",
-      "parameters":
-      {
-        "id": 1,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "7:2:1"
-      },
-      "src": "0:10:1"
-    },
-    {
-      "body":
-      {
-        "id": 8,
-        "nodeType": "Block",
-        "src": "29:15:1",
-        "statements":
-        [
-          {
-            "errorCall":
-            {
-              "arguments": [],
-              "expression":
-              {
-                "id": 5,
-                "name": "X",
-                "nodeType": "Identifier",
-                "overloadedDeclarations": [],
-                "src": "38:1:1",
-                "typeDescriptions": {}
-              },
-              "id": 6,
-              "nameLocations": [],
-              "names": [],
-              "nodeType": "FunctionCall",
-              "src": "38:3:1",
-              "tryCall": false,
-              "typeDescriptions": {}
-            },
-            "id": 7,
-            "nodeType": "RevertStatement",
-            "src": "31:10:1"
-          }
-        ]
-      },
-      "id": 9,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "20:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 3,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "21:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 4,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "29:0:1"
-      },
-      "src": "11:33:1",
-      "stateMutability": "pure",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 19,
-      "name": "C",
-      "nameLocation": "54:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 11,
-          "name": "T",
-          "nameLocation": "68:1:1",
-          "nodeType": "ErrorDefinition",
-          "parameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "69:2:1"
-          },
-          "src": "62:10:1"
-        },
-        {
-          "body":
-          {
-            "id": 17,
-            "nodeType": "Block",
-            "src": "97:8:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "id": 14,
-                    "name": "f",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "99:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 15,
-                  "nameLocations": [],
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "99:3:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 16,
-                "nodeType": "ExpressionStatement",
-                "src": "99:3:1"
-              }
-            ]
-          },
-          "id": 18,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "h",
-          "nameLocation": "86:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 12,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "87:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "97:0:1"
-          },
-          "src": "77:28:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "45:62:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:108:1"
-}
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.json b/test/libsolidity/ASTJSON/userDefinedValueType.json
deleted file mode 100644
index adf1172f05a9..000000000000
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ /dev/null
@@ -1,360 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      27
-    ],
-    "MyAddress":
-    [
-      2
-    ],
-    "MyUInt":
-    [
-      4
-    ],
-    "f":
-    [
-      16
-    ]
-  },
-  "id": 28,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "MyAddress",
-      "id": 2,
-      "name": "MyAddress",
-      "nameLocation": "5:9:1",
-      "nodeType": "UserDefinedValueTypeDefinition",
-      "src": "0:26:1",
-      "underlyingType":
-      {
-        "id": 1,
-        "name": "address",
-        "nodeType": "ElementaryTypeName",
-        "src": "18:7:1",
-        "stateMutability": "nonpayable",
-        "typeDescriptions":
-        {
-          "typeIdentifier": "t_address",
-          "typeString": "address"
-        }
-      }
-    },
-    {
-      "canonicalName": "MyUInt",
-      "id": 4,
-      "name": "MyUInt",
-      "nameLocation": "32:6:1",
-      "nodeType": "UserDefinedValueTypeDefinition",
-      "src": "27:20:1",
-      "underlyingType":
-      {
-        "id": 3,
-        "name": "uint",
-        "nodeType": "ElementaryTypeName",
-        "src": "42:4:1",
-        "typeDescriptions":
-        {
-          "typeIdentifier": "t_uint256",
-          "typeString": "uint256"
-        }
-      }
-    },
-    {
-      "body":
-      {
-        "id": 15,
-        "nodeType": "Block",
-        "src": "61:34:1",
-        "statements":
-        [
-          {
-            "assignments":
-            [
-              9
-            ],
-            "declarations":
-            [
-              {
-                "constant": false,
-                "id": 9,
-                "mutability": "mutable",
-                "name": "a",
-                "nameLocation": "77:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 15,
-                "src": "67:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_userDefinedValueType$_MyAddress_$2",
-                  "typeString": "MyAddress"
-                },
-                "typeName":
-                {
-                  "id": 8,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 7,
-                    "name": "MyAddress",
-                    "nameLocations":
-                    [
-                      "67:9:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "referencedDeclaration": 2,
-                    "src": "67:9:1"
-                  },
-                  "referencedDeclaration": 2,
-                  "src": "67:9:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_MyAddress_$2",
-                    "typeString": "MyAddress"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "id": 10,
-            "nodeType": "VariableDeclarationStatement",
-            "src": "67:11:1"
-          },
-          {
-            "assignments":
-            [
-              13
-            ],
-            "declarations":
-            [
-              {
-                "constant": false,
-                "id": 13,
-                "mutability": "mutable",
-                "name": "b",
-                "nameLocation": "91:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 15,
-                "src": "84:8:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_userDefinedValueType$_MyUInt_$4",
-                  "typeString": "MyUInt"
-                },
-                "typeName":
-                {
-                  "id": 12,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 11,
-                    "name": "MyUInt",
-                    "nameLocations":
-                    [
-                      "84:6:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "referencedDeclaration": 4,
-                    "src": "84:6:1"
-                  },
-                  "referencedDeclaration": 4,
-                  "src": "84:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_MyUInt_$4",
-                    "typeString": "MyUInt"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "id": 14,
-            "nodeType": "VariableDeclarationStatement",
-            "src": "84:8:1"
-          }
-        ]
-      },
-      "id": 16,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "57:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 5,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "58:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 6,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "61:0:1"
-      },
-      "scope": 28,
-      "src": "48:47:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 27,
-      "linearizedBaseContracts":
-      [
-        27
-      ],
-      "name": "C",
-      "nameLocation": "105:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "canonicalName": "C.MyAddress",
-          "id": 18,
-          "name": "MyAddress",
-          "nameLocation": "118:9:1",
-          "nodeType": "UserDefinedValueTypeDefinition",
-          "src": "113:26:1",
-          "underlyingType":
-          {
-            "id": 17,
-            "name": "address",
-            "nodeType": "ElementaryTypeName",
-            "src": "131:7:1",
-            "stateMutability": "nonpayable",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_address",
-              "typeString": "address"
-            }
-          }
-        },
-        {
-          "canonicalName": "C.MyUInt",
-          "id": 20,
-          "name": "MyUInt",
-          "nameLocation": "149:6:1",
-          "nodeType": "UserDefinedValueTypeDefinition",
-          "src": "144:20:1",
-          "underlyingType":
-          {
-            "id": 19,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "159:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          }
-        },
-        {
-          "constant": false,
-          "functionSelector": "97682884",
-          "id": 26,
-          "mutability": "mutable",
-          "name": "m",
-          "nameLocation": "205:1:1",
-          "nodeType": "VariableDeclaration",
-          "scope": 27,
-          "src": "169:37:1",
-          "stateVariable": true,
-          "storageLocation": "default",
-          "typeDescriptions":
-          {
-            "typeIdentifier": "t_mapping$_t_userDefinedValueType$_MyAddress_$18_$_t_userDefinedValueType$_MyUInt_$20_$",
-            "typeString": "mapping(C.MyAddress => C.MyUInt)"
-          },
-          "typeName":
-          {
-            "id": 25,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 22,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 21,
-                "name": "MyAddress",
-                "nameLocations":
-                [
-                  "177:9:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 18,
-                "src": "177:9:1"
-              },
-              "referencedDeclaration": 18,
-              "src": "177:9:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_MyAddress_$18",
-                "typeString": "C.MyAddress"
-              }
-            },
-            "nodeType": "Mapping",
-            "src": "169:28:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_mapping$_t_userDefinedValueType$_MyAddress_$18_$_t_userDefinedValueType$_MyUInt_$20_$",
-              "typeString": "mapping(C.MyAddress => C.MyUInt)"
-            },
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 24,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 23,
-                "name": "MyUInt",
-                "nameLocations":
-                [
-                  "190:6:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 20,
-                "src": "190:6:1"
-              },
-              "referencedDeclaration": 20,
-              "src": "190:6:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_MyUInt_$20",
-                "typeString": "C.MyUInt"
-              }
-            }
-          },
-          "visibility": "public"
-        }
-      ],
-      "scope": 28,
-      "src": "96:113:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:210:1"
-}
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.sol b/test/libsolidity/ASTJSON/userDefinedValueType.sol
deleted file mode 100644
index d5ef2e00b9f8..000000000000
--- a/test/libsolidity/ASTJSON/userDefinedValueType.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-type MyAddress is address;
-type MyUInt is uint;
-function f() {
-    MyAddress a;
-    MyUInt b;
-}
-contract C {
-    type MyAddress is address;
-    type MyUInt is uint;
-    mapping(MyAddress => MyUInt) public m;
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
deleted file mode 100644
index 90e48a98276b..000000000000
--- a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 28,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 2,
-      "name": "MyAddress",
-      "nameLocation": "5:9:1",
-      "nodeType": "UserDefinedValueTypeDefinition",
-      "src": "0:26:1",
-      "underlyingType":
-      {
-        "id": 1,
-        "name": "address",
-        "nodeType": "ElementaryTypeName",
-        "src": "18:7:1",
-        "stateMutability": "nonpayable",
-        "typeDescriptions": {}
-      }
-    },
-    {
-      "id": 4,
-      "name": "MyUInt",
-      "nameLocation": "32:6:1",
-      "nodeType": "UserDefinedValueTypeDefinition",
-      "src": "27:20:1",
-      "underlyingType":
-      {
-        "id": 3,
-        "name": "uint",
-        "nodeType": "ElementaryTypeName",
-        "src": "42:4:1",
-        "typeDescriptions": {}
-      }
-    },
-    {
-      "body":
-      {
-        "id": 15,
-        "nodeType": "Block",
-        "src": "61:34:1",
-        "statements":
-        [
-          {
-            "assignments":
-            [
-              9
-            ],
-            "declarations":
-            [
-              {
-                "constant": false,
-                "id": 9,
-                "mutability": "mutable",
-                "name": "a",
-                "nameLocation": "77:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "67:11:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 8,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 7,
-                    "name": "MyAddress",
-                    "nameLocations":
-                    [
-                      "67:9:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "src": "67:9:1"
-                  },
-                  "src": "67:9:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "id": 10,
-            "nodeType": "VariableDeclarationStatement",
-            "src": "67:11:1"
-          },
-          {
-            "assignments":
-            [
-              13
-            ],
-            "declarations":
-            [
-              {
-                "constant": false,
-                "id": 13,
-                "mutability": "mutable",
-                "name": "b",
-                "nameLocation": "91:1:1",
-                "nodeType": "VariableDeclaration",
-                "src": "84:8:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 12,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 11,
-                    "name": "MyUInt",
-                    "nameLocations":
-                    [
-                      "84:6:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "src": "84:6:1"
-                  },
-                  "src": "84:6:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "id": 14,
-            "nodeType": "VariableDeclarationStatement",
-            "src": "84:8:1"
-          }
-        ]
-      },
-      "id": 16,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "57:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 5,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "58:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 6,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "61:0:1"
-      },
-      "src": "48:47:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 27,
-      "name": "C",
-      "nameLocation": "105:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "id": 18,
-          "name": "MyAddress",
-          "nameLocation": "118:9:1",
-          "nodeType": "UserDefinedValueTypeDefinition",
-          "src": "113:26:1",
-          "underlyingType":
-          {
-            "id": 17,
-            "name": "address",
-            "nodeType": "ElementaryTypeName",
-            "src": "131:7:1",
-            "stateMutability": "nonpayable",
-            "typeDescriptions": {}
-          }
-        },
-        {
-          "id": 20,
-          "name": "MyUInt",
-          "nameLocation": "149:6:1",
-          "nodeType": "UserDefinedValueTypeDefinition",
-          "src": "144:20:1",
-          "underlyingType":
-          {
-            "id": 19,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "159:4:1",
-            "typeDescriptions": {}
-          }
-        },
-        {
-          "constant": false,
-          "id": 26,
-          "mutability": "mutable",
-          "name": "m",
-          "nameLocation": "205:1:1",
-          "nodeType": "VariableDeclaration",
-          "src": "169:37:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 25,
-            "keyName": "",
-            "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
-              "id": 22,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 21,
-                "name": "MyAddress",
-                "nameLocations":
-                [
-                  "177:9:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "177:9:1"
-              },
-              "src": "177:9:1",
-              "typeDescriptions": {}
-            },
-            "nodeType": "Mapping",
-            "src": "169:28:1",
-            "typeDescriptions": {},
-            "valueName": "",
-            "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
-              "id": 24,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 23,
-                "name": "MyUInt",
-                "nameLocations":
-                [
-                  "190:6:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "src": "190:6:1"
-              },
-              "src": "190:6:1",
-              "typeDescriptions": {}
-            }
-          },
-          "visibility": "public"
-        }
-      ],
-      "src": "96:113:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:210:1"
-}
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.json b/test/libsolidity/ASTJSON/user_defined_operator.json
deleted file mode 100644
index ed72de49dd28..000000000000
--- a/test/libsolidity/ASTJSON/user_defined_operator.json
+++ /dev/null
@@ -1,664 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      49
-    ],
-    "I8":
-    [
-      2
-    ],
-    "sub":
-    [
-      20
-    ],
-    "unsub":
-    [
-      30
-    ]
-  },
-  "id": 50,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "canonicalName": "I8",
-      "id": 2,
-      "name": "I8",
-      "nameLocation": "5:2:1",
-      "nodeType": "UserDefinedValueTypeDefinition",
-      "src": "0:16:1",
-      "underlyingType":
-      {
-        "id": 1,
-        "name": "int8",
-        "nodeType": "ElementaryTypeName",
-        "src": "11:4:1",
-        "typeDescriptions":
-        {
-          "typeIdentifier": "t_int8",
-          "typeString": "int8"
-        }
-      }
-    },
-    {
-      "functionList":
-      [
-        {
-          "definition":
-          {
-            "id": 3,
-            "name": "sub",
-            "nameLocations":
-            [
-              "24:3:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 20,
-            "src": "24:3:1"
-          },
-          "operator": "-"
-        },
-        {
-          "definition":
-          {
-            "id": 4,
-            "name": "unsub",
-            "nameLocations":
-            [
-              "34:5:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 30,
-            "src": "34:5:1"
-          },
-          "operator": "-"
-        }
-      ],
-      "global": true,
-      "id": 7,
-      "nodeType": "UsingForDirective",
-      "src": "17:43:1",
-      "typeName":
-      {
-        "id": 6,
-        "nodeType": "UserDefinedTypeName",
-        "pathNode":
-        {
-          "id": 5,
-          "name": "I8",
-          "nameLocations":
-          [
-            "50:2:1"
-          ],
-          "nodeType": "IdentifierPath",
-          "referencedDeclaration": 2,
-          "src": "50:2:1"
-        },
-        "referencedDeclaration": 2,
-        "src": "50:2:1",
-        "typeDescriptions":
-        {
-          "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-          "typeString": "I8"
-        }
-      }
-    },
-    {
-      "body":
-      {
-        "id": 19,
-        "nodeType": "Block",
-        "src": "100:2:1",
-        "statements": []
-      },
-      "id": 20,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "sub",
-      "nameLocation": "70:3:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 14,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 10,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 20,
-            "src": "74:2:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-              "typeString": "I8"
-            },
-            "typeName":
-            {
-              "id": 9,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 8,
-                "name": "I8",
-                "nameLocations":
-                [
-                  "74:2:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 2,
-                "src": "74:2:1"
-              },
-              "referencedDeclaration": 2,
-              "src": "74:2:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                "typeString": "I8"
-              }
-            },
-            "visibility": "internal"
-          },
-          {
-            "constant": false,
-            "id": 13,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 20,
-            "src": "78:2:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-              "typeString": "I8"
-            },
-            "typeName":
-            {
-              "id": 12,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 11,
-                "name": "I8",
-                "nameLocations":
-                [
-                  "78:2:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 2,
-                "src": "78:2:1"
-              },
-              "referencedDeclaration": 2,
-              "src": "78:2:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                "typeString": "I8"
-              }
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "73:8:1"
-      },
-      "returnParameters":
-      {
-        "id": 18,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 17,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 20,
-            "src": "96:2:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-              "typeString": "I8"
-            },
-            "typeName":
-            {
-              "id": 16,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 15,
-                "name": "I8",
-                "nameLocations":
-                [
-                  "96:2:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 2,
-                "src": "96:2:1"
-              },
-              "referencedDeclaration": 2,
-              "src": "96:2:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                "typeString": "I8"
-              }
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "95:4:1"
-      },
-      "scope": 50,
-      "src": "61:41:1",
-      "stateMutability": "pure",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "body":
-      {
-        "id": 29,
-        "nodeType": "Block",
-        "src": "140:2:1",
-        "statements": []
-      },
-      "id": 30,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "unsub",
-      "nameLocation": "112:5:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 24,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 23,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 30,
-            "src": "118:2:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-              "typeString": "I8"
-            },
-            "typeName":
-            {
-              "id": 22,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 21,
-                "name": "I8",
-                "nameLocations":
-                [
-                  "118:2:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 2,
-                "src": "118:2:1"
-              },
-              "referencedDeclaration": 2,
-              "src": "118:2:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                "typeString": "I8"
-              }
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "117:4:1"
-      },
-      "returnParameters":
-      {
-        "id": 28,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 27,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 30,
-            "src": "136:2:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-              "typeString": "I8"
-            },
-            "typeName":
-            {
-              "id": 26,
-              "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
-                "id": 25,
-                "name": "I8",
-                "nameLocations":
-                [
-                  "136:2:1"
-                ],
-                "nodeType": "IdentifierPath",
-                "referencedDeclaration": 2,
-                "src": "136:2:1"
-              },
-              "referencedDeclaration": 2,
-              "src": "136:2:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                "typeString": "I8"
-              }
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "135:4:1"
-      },
-      "scope": 50,
-      "src": "103:39:1",
-      "stateMutability": "pure",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 49,
-      "linearizedBaseContracts":
-      [
-        49
-      ],
-      "name": "C",
-      "nameLocation": "152:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 47,
-            "nodeType": "Block",
-            "src": "208:30:1",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "commonType":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                    "typeString": "I8"
-                  },
-                  "function": 20,
-                  "id": 45,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": false,
-                  "lValueRequested": false,
-                  "leftExpression":
-                  {
-                    "function": 30,
-                    "id": 43,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "nodeType": "UnaryOperation",
-                    "operator": "-",
-                    "prefix": true,
-                    "src": "225:2:1",
-                    "subExpression":
-                    {
-                      "id": 42,
-                      "name": "a",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 33,
-                      "src": "226:1:1",
-                      "typeDescriptions":
-                      {
-                        "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                        "typeString": "I8"
-                      }
-                    },
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                      "typeString": "I8"
-                    }
-                  },
-                  "nodeType": "BinaryOperation",
-                  "operator": "-",
-                  "rightExpression":
-                  {
-                    "id": 44,
-                    "name": "b",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "referencedDeclaration": 36,
-                    "src": "230:1:1",
-                    "typeDescriptions":
-                    {
-                      "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                      "typeString": "I8"
-                    }
-                  },
-                  "src": "225:6:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                    "typeString": "I8"
-                  }
-                },
-                "functionReturnParameters": 41,
-                "id": 46,
-                "nodeType": "Return",
-                "src": "218:13:1"
-              }
-            ]
-          },
-          "functionSelector": "ac9fe858",
-          "id": 48,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "169:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 37,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 33,
-                "mutability": "mutable",
-                "name": "a",
-                "nameLocation": "174:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 48,
-                "src": "171:4:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                  "typeString": "I8"
-                },
-                "typeName":
-                {
-                  "id": 32,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 31,
-                    "name": "I8",
-                    "nameLocations":
-                    [
-                      "171:2:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "referencedDeclaration": 2,
-                    "src": "171:2:1"
-                  },
-                  "referencedDeclaration": 2,
-                  "src": "171:2:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                    "typeString": "I8"
-                  }
-                },
-                "visibility": "internal"
-              },
-              {
-                "constant": false,
-                "id": 36,
-                "mutability": "mutable",
-                "name": "b",
-                "nameLocation": "180:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 48,
-                "src": "177:4:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                  "typeString": "I8"
-                },
-                "typeName":
-                {
-                  "id": 35,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 34,
-                    "name": "I8",
-                    "nameLocations":
-                    [
-                      "177:2:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "referencedDeclaration": 2,
-                    "src": "177:2:1"
-                  },
-                  "referencedDeclaration": 2,
-                  "src": "177:2:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                    "typeString": "I8"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "170:12:1"
-          },
-          "returnParameters":
-          {
-            "id": 41,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 40,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "scope": 48,
-                "src": "204:2:1",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                  "typeString": "I8"
-                },
-                "typeName":
-                {
-                  "id": 39,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 38,
-                    "name": "I8",
-                    "nameLocations":
-                    [
-                      "204:2:1"
-                    ],
-                    "nodeType": "IdentifierPath",
-                    "referencedDeclaration": 2,
-                    "src": "204:2:1"
-                  },
-                  "referencedDeclaration": 2,
-                  "src": "204:2:1",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
-                    "typeString": "I8"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "203:4:1"
-          },
-          "scope": 49,
-          "src": "160:78:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 50,
-      "src": "143:97:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:241:1"
-}
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.sol b/test/libsolidity/ASTJSON/user_defined_operator.sol
deleted file mode 100644
index bfbdf7b9bf83..000000000000
--- a/test/libsolidity/ASTJSON/user_defined_operator.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-type I8 is int8;
-using {sub as -, unsub as -} for I8 global;
-function sub(I8, I8) pure returns (I8) {}
-function unsub(I8) pure returns (I8) {}
-contract C {
-    function f(I8 a, I8 b) public pure returns (I8) {
-        return -a - b;
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/using_for_directive.json b/test/libsolidity/ASTJSON/using_for_directive.json
deleted file mode 100644
index f3094980ff12..000000000000
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
-      13
-    ],
-    "L":
-    [
-      4
-    ],
-    "f":
-    [
-      10
-    ]
-  },
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "functionList":
-      [
-        {
-          "function":
-          {
-            "id": 1,
-            "name": "f",
-            "nameLocations":
-            [
-              "7:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 10,
-            "src": "7:1:1"
-          }
-        }
-      ],
-      "global": false,
-      "id": 3,
-      "nodeType": "UsingForDirective",
-      "src": "0:19:1",
-      "typeName":
-      {
-        "id": 2,
-        "name": "uint",
-        "nodeType": "ElementaryTypeName",
-        "src": "14:4:1",
-        "typeDescriptions":
-        {
-          "typeIdentifier": "t_uint256",
-          "typeString": "uint256"
-        }
-      }
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "L",
-      "contractDependencies": [],
-      "contractKind": "library",
-      "fullyImplemented": true,
-      "id": 4,
-      "linearizedBaseContracts":
-      [
-        4
-      ],
-      "name": "L",
-      "nameLocation": "28:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "scope": 14,
-      "src": "20:12:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "body":
-      {
-        "id": 9,
-        "nodeType": "Block",
-        "src": "50:2:1",
-        "statements": []
-      },
-      "id": 10,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "42:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 7,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 6,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "scope": 10,
-            "src": "44:4:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            },
-            "typeName":
-            {
-              "id": 5,
-              "name": "uint",
-              "nodeType": "ElementaryTypeName",
-              "src": "44:4:1",
-              "typeDescriptions":
-              {
-                "typeIdentifier": "t_uint256",
-                "typeString": "uint256"
-              }
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "43:6:1"
-      },
-      "returnParameters":
-      {
-        "id": 8,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "50:0:1"
-      },
-      "scope": 14,
-      "src": "33:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "C",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 13,
-      "linearizedBaseContracts":
-      [
-        13
-      ],
-      "name": "C",
-      "nameLocation": "62:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "global": false,
-          "id": 12,
-          "libraryName":
-          {
-            "id": 11,
-            "name": "L",
-            "nameLocations":
-            [
-              "72:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "referencedDeclaration": 4,
-            "src": "72:1:1"
-          },
-          "nodeType": "UsingForDirective",
-          "src": "66:14:1"
-        }
-      ],
-      "scope": 14,
-      "src": "53:29:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:83:1"
-}
diff --git a/test/libsolidity/ASTJSON/using_for_directive.sol b/test/libsolidity/ASTJSON/using_for_directive.sol
deleted file mode 100644
index 30e40252a403..000000000000
--- a/test/libsolidity/ASTJSON/using_for_directive.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-using {f} for uint;
-library L {}
-function f(uint) {}
-contract C { using L for *; }
-
-// ----
diff --git a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
deleted file mode 100644
index 9360227d435e..000000000000
--- a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 14,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "functionList":
-      [
-        {
-          "function":
-          {
-            "id": 1,
-            "name": "f",
-            "nameLocations":
-            [
-              "7:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "7:1:1"
-          }
-        }
-      ],
-      "global": false,
-      "id": 3,
-      "nodeType": "UsingForDirective",
-      "src": "0:19:1",
-      "typeName":
-      {
-        "id": 2,
-        "name": "uint",
-        "nodeType": "ElementaryTypeName",
-        "src": "14:4:1",
-        "typeDescriptions": {}
-      }
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "library",
-      "id": 4,
-      "name": "L",
-      "nameLocation": "28:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes": [],
-      "src": "20:12:1",
-      "usedErrors": [],
-      "usedEvents": []
-    },
-    {
-      "body":
-      {
-        "id": 9,
-        "nodeType": "Block",
-        "src": "50:2:1",
-        "statements": []
-      },
-      "id": 10,
-      "implemented": true,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "f",
-      "nameLocation": "42:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 7,
-        "nodeType": "ParameterList",
-        "parameters":
-        [
-          {
-            "constant": false,
-            "id": 6,
-            "mutability": "mutable",
-            "name": "",
-            "nameLocation": "-1:-1:-1",
-            "nodeType": "VariableDeclaration",
-            "src": "44:4:1",
-            "stateVariable": false,
-            "storageLocation": "default",
-            "typeDescriptions": {},
-            "typeName":
-            {
-              "id": 5,
-              "name": "uint",
-              "nodeType": "ElementaryTypeName",
-              "src": "44:4:1",
-              "typeDescriptions": {}
-            },
-            "visibility": "internal"
-          }
-        ],
-        "src": "43:6:1"
-      },
-      "returnParameters":
-      {
-        "id": 8,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "50:0:1"
-      },
-      "src": "33:19:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "internal"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 13,
-      "name": "C",
-      "nameLocation": "62:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "global": false,
-          "id": 12,
-          "libraryName":
-          {
-            "id": 11,
-            "name": "L",
-            "nameLocations":
-            [
-              "72:1:1"
-            ],
-            "nodeType": "IdentifierPath",
-            "src": "72:1:1"
-          },
-          "nodeType": "UsingForDirective",
-          "src": "66:14:1"
-        }
-      ],
-      "src": "53:29:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:83:1"
-}
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.json b/test/libsolidity/ASTJSON/yul_hex_literal.json
deleted file mode 100644
index 0498289c6729..000000000000
--- a/test/libsolidity/ASTJSON/yul_hex_literal.json
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "Sample":
-    [
-      6
-    ]
-  },
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "Sample",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 6,
-      "linearizedBaseContracts":
-      [
-        6
-      ],
-      "name": "Sample",
-      "nameLocation": "9:6:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "47:167:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "66:142:1",
-                  "nodeType": "YulBlock",
-                  "src": "66:142:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "80:15:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "80:15:1",
-                      "value":
-                      {
-                        "hexValue": "74657374",
-                        "kind": "string",
-                        "nativeSrc": "89:6:1",
-                        "nodeType": "YulLiteral",
-                        "src": "89:6:1",
-                        "type": "",
-                        "value": "test"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "a",
-                          "nativeSrc": "84:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "84:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "nativeSrc": "108:54:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "108:54:1",
-                      "value":
-                      {
-                        "hexValue": "112233445566778899aabbccddeeff6677889900",
-                        "kind": "string",
-                        "nativeSrc": "117:45:1",
-                        "nodeType": "YulLiteral",
-                        "src": "117:45:1",
-                        "type": ""
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "b",
-                          "nativeSrc": "112:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "112:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "nativeSrc": "175:23:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "175:23:1",
-                      "value":
-                      {
-                        "hexValue": "1234abcd",
-                        "kind": "string",
-                        "nativeSrc": "184:14:1",
-                        "nodeType": "YulLiteral",
-                        "src": "184:14:1",
-                        "type": ""
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "c",
-                          "nativeSrc": "179:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "179:1:1",
-                          "type": ""
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "57:151:1"
-              }
-            ]
-          },
-          "functionSelector": "26121ff0",
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "31:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "32:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "47:0:1"
-          },
-          "scope": 6,
-          "src": "22:192:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 7,
-      "src": "0:216:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:217:1"
-}
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.sol b/test/libsolidity/ASTJSON/yul_hex_literal.sol
deleted file mode 100644
index c3b57a8fe8d2..000000000000
--- a/test/libsolidity/ASTJSON/yul_hex_literal.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Sample {
-    function f() public pure {
-        assembly {
-            let a := "test"
-            let b := hex"112233445566778899aabbccddeeff6677889900"
-            let c := hex"1234_abcd"
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
deleted file mode 100644
index 023c13cc7423..000000000000
--- a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 7,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 6,
-      "name": "Sample",
-      "nameLocation": "9:6:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 4,
-            "nodeType": "Block",
-            "src": "47:167:1",
-            "statements":
-            [
-              {
-                "AST":
-                {
-                  "nativeSrc": "66:142:1",
-                  "nodeType": "YulBlock",
-                  "src": "66:142:1",
-                  "statements":
-                  [
-                    {
-                      "nativeSrc": "80:15:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "80:15:1",
-                      "value":
-                      {
-                        "hexValue": "74657374",
-                        "kind": "string",
-                        "nativeSrc": "89:6:1",
-                        "nodeType": "YulLiteral",
-                        "src": "89:6:1",
-                        "type": "",
-                        "value": "test"
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "a",
-                          "nativeSrc": "84:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "84:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "nativeSrc": "108:54:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "108:54:1",
-                      "value":
-                      {
-                        "hexValue": "112233445566778899aabbccddeeff6677889900",
-                        "kind": "string",
-                        "nativeSrc": "117:45:1",
-                        "nodeType": "YulLiteral",
-                        "src": "117:45:1",
-                        "type": ""
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "b",
-                          "nativeSrc": "112:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "112:1:1",
-                          "type": ""
-                        }
-                      ]
-                    },
-                    {
-                      "nativeSrc": "175:23:1",
-                      "nodeType": "YulVariableDeclaration",
-                      "src": "175:23:1",
-                      "value":
-                      {
-                        "hexValue": "1234abcd",
-                        "kind": "string",
-                        "nativeSrc": "184:14:1",
-                        "nodeType": "YulLiteral",
-                        "src": "184:14:1",
-                        "type": ""
-                      },
-                      "variables":
-                      [
-                        {
-                          "name": "c",
-                          "nativeSrc": "179:1:1",
-                          "nodeType": "YulTypedName",
-                          "src": "179:1:1",
-                          "type": ""
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
-                "id": 3,
-                "nodeType": "InlineAssembly",
-                "src": "57:151:1"
-              }
-            ]
-          },
-          "id": 5,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "31:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 1,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "32:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "47:0:1"
-          },
-          "src": "22:192:1",
-          "stateMutability": "pure",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "src": "0:216:1",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "0:217:1"
-}
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
deleted file mode 100644
index daf4a9ea44e2..000000000000
--- a/test/libsolidity/ASTJSONTest.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <libsolidity/ast/ASTJsonExporter.h>
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/JSON.h>
-
-#include <test/Common.h>
-#include <test/libsolidity/ASTJSONTest.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/throw_exception.hpp>
-
-#include <fstream>
-#include <memory>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity::util::formatting;
-using namespace solidity::util;
-namespace fs = boost::filesystem;
-using namespace boost::unit_test;
-using namespace std::string_literals;
-
-namespace
-{
-
-std::string const sourceDelimiter("==== Source: ");
-
-std::string compilerStateToString(CompilerStack::State _state)
-{
-	switch (_state)
-	{
-		case CompilerStack::State::Empty: return "Empty";
-		case CompilerStack::State::SourcesSet: return "SourcesSet";
-		case CompilerStack::State::Parsed: return "Parsed";
-		case CompilerStack::State::ParsedAndImported: return "ParsedAndImported";
-		case CompilerStack::State::AnalysisSuccessful: return "AnalysisSuccessful";
-		case CompilerStack::State::CompilationSuccessful: return "CompilationSuccessful";
-	}
-	soltestAssert(false, "Unexpected value of state parameter");
-}
-
-CompilerStack::State stringToCompilerState(const std::string& _state)
-{
-	for (unsigned int i = CompilerStack::State::Empty; i <= CompilerStack::State::CompilationSuccessful; ++i)
-	{
-		if (_state == compilerStateToString(CompilerStack::State(i)))
-			return CompilerStack::State(i);
-	}
-	BOOST_THROW_EXCEPTION(std::runtime_error("Unsupported compiler state (" + _state + ") in test contract file"));
-}
-
-void replaceVersionWithTag(std::string& _input)
-{
-	boost::algorithm::replace_all(
-		_input,
-		"\"" + solidity::test::CommonOptions::get().evmVersion().name() + "\"",
-		"%EVMVERSION%"
-	);
-}
-
-void replaceTagWithVersion(std::string& _input)
-{
-	boost::algorithm::replace_all(
-		_input,
-		"%EVMVERSION%",
-		"\"" + solidity::test::CommonOptions::get().evmVersion().name() + "\""
-	);
-}
-
-}
-
-void ASTJSONTest::generateTestVariants(std::string const& _filename)
-{
-	std::string_view baseName = _filename;
-	baseName.remove_suffix(4);
-
-	const std::vector<CompilerStack::State> variantCompileStates = {
-		CompilerStack::State::Parsed,
-		CompilerStack::State::AnalysisSuccessful,
-	};
-
-	for (const auto state: variantCompileStates)
-	{
-		auto variant = TestVariant(baseName, state);
-		if (boost::filesystem::exists(variant.astFilename()))
-		{
-			variant.expectation = readFileAsString(variant.astFilename());
-			boost::replace_all(variant.expectation, "\r\n", "\n");
-			m_variants.push_back(variant);
-		}
-	}
-}
-
-void ASTJSONTest::fillSources(std::string const& _filename)
-{
-	std::ifstream file(_filename);
-	if (!file)
-		BOOST_THROW_EXCEPTION(std::runtime_error("Cannot open test contract: \"" + _filename + "\"."));
-	file.exceptions(std::ios::badbit);
-
-	std::string sourceName;
-	std::string source;
-	std::string line;
-	std::string const delimiter("// ----");
-	std::string const failMarker("// failAfter:");
-	while (getline(file, line))
-	{
-		if (boost::algorithm::starts_with(line, sourceDelimiter))
-		{
-			if (!sourceName.empty())
-				m_sources.emplace_back(sourceName, source);
-
-			sourceName = line.substr(
-				sourceDelimiter.size(),
-				line.size() - " ===="s.size() - sourceDelimiter.size()
-			);
-			source = std::string();
-		}
-		else if (boost::algorithm::starts_with(line, failMarker))
-		{
-			std::string state = line.substr(failMarker.size());
-			boost::algorithm::trim(state);
-			if (m_expectedFailAfter.has_value())
-				BOOST_THROW_EXCEPTION(std::runtime_error("Duplicated \"failAfter\" directive"));
-			m_expectedFailAfter = stringToCompilerState(state);
-
-		}
-		else if (!line.empty() && !boost::algorithm::starts_with(line, delimiter))
-			source += line + "\n";
-	}
-	m_sources.emplace_back(sourceName.empty() ? "a" : sourceName, source);
-	file.close();
-}
-
-void ASTJSONTest::validateTestConfiguration() const
-{
-	if (m_variants.empty())
-		BOOST_THROW_EXCEPTION(std::runtime_error("No file with expected result found."));
-
-	if (m_expectedFailAfter.has_value())
-	{
-		auto unexpectedTestVariant = std::find_if(
-			m_variants.begin(), m_variants.end(),
-			[failAfter = m_expectedFailAfter](TestVariant v) { return v.stopAfter > failAfter; }
-		);
-
-		if (unexpectedTestVariant != m_variants.end())
-			BOOST_THROW_EXCEPTION(
-				std::runtime_error(
-					std::string("Unexpected JSON file: ") + unexpectedTestVariant->astFilename() +
-					" in \"failAfter: " +
-					compilerStateToString(m_expectedFailAfter.value()) + "\" scenario."
-				)
-			);
-	}
-}
-
-ASTJSONTest::ASTJSONTest(std::string const& _filename):
-	EVMVersionRestrictedTestCase(_filename)
-{
-	if (!boost::algorithm::ends_with(_filename, ".sol"))
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
-
-	generateTestVariants(_filename);
-	fillSources(_filename);
-	validateTestConfiguration();
-}
-
-TestCase::TestResult ASTJSONTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
-{
-	CompilerStack c;
-
-	StringMap sources;
-	std::map<std::string, unsigned> sourceIndices;
-	for (size_t i = 0; i < m_sources.size(); i++)
-	{
-		sources[m_sources[i].first] = m_sources[i].second;
-		sourceIndices[m_sources[i].first] = static_cast<unsigned>(i + 1);
-	}
-
-	bool resultsMatch = true;
-
-	for (TestVariant& variant: m_variants)
-	{
-		c.reset();
-		c.setSources(sources);
-		c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-
-		if (!c.parseAndAnalyze(variant.stopAfter))
-		{
-			if (!m_expectedFailAfter.has_value() || m_expectedFailAfter.value() + 1 != c.state())
-			{
-				SourceReferenceFormatter formatter(_stream, c, _formatted, false);
-				formatter.printErrorInformation(c.errors());
-				return TestResult::FatalError;
-			}
-		}
-
-		resultsMatch = resultsMatch && runTest(
-			variant,
-			sourceIndices,
-			c,
-			_stream,
-			_linePrefix,
-			_formatted
-		);
-	}
-
-	return resultsMatch ? TestResult::Success : TestResult::Failure;
-}
-
-bool ASTJSONTest::runTest(
-	TestVariant& _variant,
-	std::map<std::string, unsigned> const& _sourceIndices,
-	CompilerStack& _compiler,
-	std::ostream& _stream,
-	std::string const& _linePrefix,
-	bool const _formatted
-)
-{
-	if (m_sources.size() > 1)
-		_variant.result += "[\n";
-
-	for (size_t i = 0; i < m_sources.size(); i++)
-	{
-		std::ostringstream result;
-		ASTJsonExporter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first), JsonFormat{ JsonFormat::Pretty });
-		_variant.result += result.str();
-		if (i != m_sources.size() - 1)
-			_variant.result += ",";
-		_variant.result += "\n";
-	}
-
-	if (m_sources.size() > 1)
-		_variant.result += "]\n";
-
-	replaceTagWithVersion(_variant.expectation);
-
-	if (_variant.expectation != _variant.result)
-	{
-		std::string nextIndentLevel = _linePrefix + "  ";
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
-			_linePrefix <<
-			"Expected result" <<
-			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
-			std::endl;
-		printPrefixed(_stream, _variant.expectation, nextIndentLevel);
-		_stream << std::endl;
-
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
-			_linePrefix <<
-			"Obtained result" <<
-			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
-			std::endl;
-		printPrefixed(_stream, _variant.result, nextIndentLevel);
-		_stream << std::endl;
-		return false;
-	}
-
-	return true;
-}
-
-void ASTJSONTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool const) const
-{
-	for (auto const& source: m_sources)
-	{
-		if (m_sources.size() > 1 || source.first != "a")
-			printPrefixed(_stream, sourceDelimiter + source.first + " ====\n", _linePrefix);
-		printPrefixed(_stream, source.second, _linePrefix);
-		_stream << std::endl;
-	}
-}
-
-void ASTJSONTest::printUpdatedExpectations(std::ostream&, std::string const&) const
-{
-	for (TestVariant const& variant: m_variants)
-		updateExpectation(
-			variant.astFilename(),
-			variant.result,
-			variant.name().empty() ? "" : variant.name() + " "
-		);
-}
-
-void ASTJSONTest::updateExpectation(std::string const& _filename, std::string const& _expectation, std::string const& _variant) const
-{
-	std::ofstream file(_filename.c_str());
-	if (!file) BOOST_THROW_EXCEPTION(std::runtime_error("Cannot write " + _variant + "AST expectation to \"" + _filename + "\"."));
-	file.exceptions(std::ios::badbit);
-
-	std::string replacedResult = _expectation;
-	replaceVersionWithTag(replacedResult);
-
-	file << replacedResult;
-	file.flush();
-	file.close();
-}
diff --git a/test/libsolidity/ASTJSONTest.h b/test/libsolidity/ASTJSONTest.h
deleted file mode 100644
index 1e74b62fec8e..000000000000
--- a/test/libsolidity/ASTJSONTest.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <test/TestCase.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend
-{
-class CompilerStack;
-}
-
-namespace solidity::frontend::test
-{
-
-class ASTJSONTest: public EVMVersionRestrictedTestCase
-{
-public:
-	struct TestVariant
-	{
-		TestVariant(std::string_view _baseName, CompilerStack::State _stopAfter):
-			baseName(_baseName),
-			stopAfter(_stopAfter)
-		{}
-
-		std::string name() const
-		{
-			return stopAfter == CompilerStack::State::Parsed ? "parseOnly" : "";
-		}
-
-		std::string astFilename() const
-		{
-			return std::string(baseName) +
-				(name().empty() ? "" : "_") +
-				name() +
-				".json";
-		}
-
-		std::string baseName;
-		CompilerStack::State stopAfter;
-		std::string result;
-		std::string expectation;
-	};
-
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<ASTJSONTest>(_config.filename);
-	}
-	ASTJSONTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-
-	void printSource(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) const override;
-	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
-private:
-	bool runTest(
-		TestVariant& _testVariant,
-		std::map<std::string, unsigned> const& _sourceIndices,
-		CompilerStack& _compiler,
-		std::ostream& _stream,
-		std::string const& _linePrefix = "",
-		bool const _formatted = false
-	);
-	void updateExpectation(
-		std::string const& _filename,
-		std::string const& _expectation,
-		std::string const& _variant
-	) const;
-
-	void generateTestVariants(std::string const& _filename);
-	void fillSources(std::string const& _filename);
-	void validateTestConfiguration() const;
-
-	std::vector<TestVariant> m_variants;
-	std::optional<CompilerStack::State> m_expectedFailAfter;
-
-	std::vector<std::pair<std::string, std::string>> m_sources;
-};
-
-}
diff --git a/test/libsolidity/ASTPropertyTest.cpp b/test/libsolidity/ASTPropertyTest.cpp
deleted file mode 100644
index 8dc2c2930bfc..000000000000
--- a/test/libsolidity/ASTPropertyTest.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/ASTPropertyTest.h>
-#include <test/Common.h>
-
-#include <libsolidity/ast/ASTJsonExporter.h>
-#include <libsolidity/interface/CompilerStack.h>
-
-#include <liblangutil/Common.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <libsolutil/JSON.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/throw_exception.hpp>
-
-#include <range/v3/algorithm/find_if.hpp>
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/split.hpp>
-
-#include <queue>
-
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity;
-using namespace std::string_literals;
-
-ASTPropertyTest::ASTPropertyTest(std::string const& _filename):
-	TestCase(_filename)
-{
-	if (!boost::algorithm::ends_with(_filename, ".sol"))
-		BOOST_THROW_EXCEPTION(std::runtime_error("Not a Solidity file: \"" + _filename + "\"."));
-
-	m_source = m_reader.source();
-	readExpectations();
-	soltestAssert(m_tests.size() > 0, "No tests specified in " + _filename);
-}
-
-std::string ASTPropertyTest::formatExpectations(bool _obtainedResult)
-{
-	std::string expectations;
-	for (std::string const& testId: m_testOrder)
-	{
-		soltestAssert(m_tests.count(testId) > 0);
-		expectations +=
-			testId +
-			": " +
-			(_obtainedResult ? m_tests[testId].obtainedValue : m_tests[testId].expectedValue)
-			+ "\n";
-	}
-	return expectations;
-}
-
-std::vector<StringPair> ASTPropertyTest::readKeyValuePairs(std::string const& _input)
-{
-	std::vector<StringPair> result;
-	for (std::string line: _input | ranges::views::split('\n') | ranges::to<std::vector<std::string>>)
-	{
-		boost::trim(line);
-		if (line.empty())
-			continue;
-
-		soltestAssert(
-			ranges::all_of(line, [](char c) { return isprint(c); }),
-			"Non-printable character(s) found in property test: " + line
-		);
-
-		auto colonPosition = line.find_first_of(':');
-		soltestAssert(colonPosition != std::string::npos, "Property test is missing a colon: " + line);
-
-		StringPair pair{
-			boost::trim_copy(line.substr(0, colonPosition)),
-			boost::trim_copy(line.substr(colonPosition + 1))
-		};
-		soltestAssert(!std::get<0>(pair).empty() != false, "Empty key in property test: " + line);
-		soltestAssert(!std::get<1>(pair).empty() != false, "Empty value in property test: " + line);
-
-		result.push_back(pair);
-	}
-	return result;
-}
-
-void ASTPropertyTest::readExpectations()
-{
-	for (auto const& [testId, testExpectation]: readKeyValuePairs(m_reader.simpleExpectations()))
-	{
-		soltestAssert(m_tests.count(testId) == 0, "More than one expectation for test \"" + testId + "\"");
-		m_tests.emplace(testId, Test{"", testExpectation, ""});
-		m_testOrder.push_back(testId);
-	}
-	m_expectation = formatExpectations(false /* _obtainedResult */);
-}
-
-void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
-{
-	std::queue<Json::Value> nodesToVisit;
-	nodesToVisit.push(_astJson);
-
-	while (!nodesToVisit.empty())
-	{
-		Json::Value& node = nodesToVisit.front();
-
-		if (node.isArray())
-			for (auto&& member: node)
-				nodesToVisit.push(member);
-		else if (node.isObject())
-			for (std::string const& memberName: node.getMemberNames())
-			{
-				if (memberName != "documentation")
-				{
-					nodesToVisit.push(node[memberName]);
-					continue;
-				}
-
-				std::string nodeDocstring = node["documentation"].isObject() ?
-					node["documentation"]["text"].asString() :
-					node["documentation"].asString();
-				soltestAssert(!nodeDocstring.empty());
-
-				std::vector<StringPair> pairs = readKeyValuePairs(nodeDocstring);
-				if (pairs.empty())
-					continue;
-
-				for (auto const& [testId, testedProperty]: pairs)
-				{
-					soltestAssert(
-						m_tests.count(testId) > 0,
-						"Test \"" + testId + "\" does not have a corresponding expected value."
-					);
-					soltestAssert(
-						m_tests[testId].property.empty(),
-						"Test \"" + testId + "\" was already defined before."
-					);
-					m_tests[testId].property = testedProperty;
-
-					soltestAssert(node.isMember("nodeType"));
-					std::optional<Json::Value> propertyNode = jsonValueByPath(node, testedProperty);
-					soltestAssert(
-						propertyNode.has_value(),
-						node["nodeType"].asString() + " node does not have a property named \""s + testedProperty + "\""
-					);
-					soltestAssert(
-						!propertyNode->isObject() && !propertyNode->isArray(),
-						"Property \"" + testedProperty + "\" is an object or an array."
-					);
-					m_tests[testId].obtainedValue = propertyNode->asString();
-				}
-			}
-
-		nodesToVisit.pop();
-	}
-
-	auto firstTestWithoutProperty = ranges::find_if(
-		m_tests,
-		[&](auto const& _testCase) { return _testCase.second.property.empty(); }
-	);
-	soltestAssert(
-		firstTestWithoutProperty == ranges::end(m_tests),
-		"AST property not defined for test \"" + firstTestWithoutProperty->first + "\""
-	);
-
-	m_obtainedResult = formatExpectations(true /* _obtainedResult */);
-}
-
-TestCase::TestResult ASTPropertyTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
-{
-	CompilerStack compiler;
-
-	compiler.setSources({{
-		"A",
-		"pragma solidity >=0.0;\n// SPDX-License-Identifier: GPL-3.0\n" + m_source
-	}});
-	compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-	if (!compiler.parseAndAnalyze())
-		BOOST_THROW_EXCEPTION(std::runtime_error(
-			"Parsing contract failed" +
-			SourceReferenceFormatter::formatErrorInformation(compiler.errors(), compiler, _formatted)
-		));
-
-	Json::Value astJson = ASTJsonExporter(compiler.state()).toJson(compiler.ast("A"));
-	soltestAssert(astJson);
-
-	extractTestsFromAST(astJson);
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libsolidity/ASTPropertyTest.h b/test/libsolidity/ASTPropertyTest.h
deleted file mode 100644
index e4cec05280b5..000000000000
--- a/test/libsolidity/ASTPropertyTest.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-#include <libsolutil/JSON.h>
-
-#include <string>
-#include <vector>
-
-namespace solidity::frontend
-{
-class CompilerStack;
-}
-
-namespace solidity::frontend::test
-{
-
-using StringPair = std::pair<std::string, std::string>;
-
-class ASTPropertyTest: public TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<ASTPropertyTest>(_config.filename);
-	}
-	ASTPropertyTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-
-private:
-	struct Test
-	{
-		std::string property;
-		std::string expectedValue;
-		std::string obtainedValue;
-	};
-
-	void readExpectations();
-	std::vector<StringPair> readKeyValuePairs(std::string const& _input);
-	void extractTestsFromAST(Json::Value const& _astJson);
-	std::string formatExpectations(bool _obtainedResult = true);
-
-	std::vector<std::string> m_testOrder;
-	std::map<std::string, Test> m_tests;
-};
-
-}
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
deleted file mode 100644
index dc52ffc1c6b5..000000000000
--- a/test/libsolidity/AnalysisFramework.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Framework for testing features from the analysis phase of compiler.
- */
-
-#include <test/libsolidity/AnalysisFramework.h>
-
-#include <test/libsolidity/util/Common.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-#include <test/Common.h>
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <liblangutil/Scanner.h>
-
-#include <libsolutil/FunctionSelector.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-
-std::pair<SourceUnit const*, ErrorList> AnalysisFramework::runAnalysisAndExpectNoParsingErrors(
-	std::string const& _source,
-	bool _includeWarningsAndInfos,
-	bool _addPreamble,
-	bool _allowMultiple
-)
-{
-	runFramework(_addPreamble ? withPreamble(_source) : _source, PipelineStage::Analysis);
-
-	if (!stageSuccessful(PipelineStage::Parsing))
-		BOOST_FAIL("Parsing contract failed in analysis test suite:" + formatErrors(m_compiler->errors()));
-
-	ErrorList errors = filteredErrors(_includeWarningsAndInfos);
-	if (errors.size() > 1 && !_allowMultiple)
-		BOOST_FAIL("Multiple errors found: " + formatErrors(errors));
-
-	return make_pair(&compiler().ast(""), std::move(errors));
-}
-
-bool AnalysisFramework::runFramework(StringMap _sources, PipelineStage _targetStage)
-{
-	resetFramework();
-	m_targetStage = _targetStage;
-	soltestAssert(m_compiler);
-
-	m_compiler->setSources(std::move(_sources));
-	setupCompiler(*m_compiler);
-	executeCompilationPipeline();
-	return pipelineSuccessful();
-}
-
-void AnalysisFramework::resetFramework()
-{
-	compiler().reset();
-	m_targetStage = PipelineStage::Compilation;
-}
-
-std::unique_ptr<CompilerStack> AnalysisFramework::createStack() const
-{
-	return std::make_unique<CompilerStack>();
-}
-
-void AnalysisFramework::setupCompiler(CompilerStack& _compiler)
-{
-	// These are just defaults based on the (global) CLI options.
-	// Technically, every TestCase should override these with values passed to it in TestCase::Config.
-	// In practice TestCase::Config always matches global config so most test cases don't care.
-	_compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	_compiler.setEOFVersion(solidity::test::CommonOptions::get().eofVersion());
-	_compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-}
-
-void AnalysisFramework::executeCompilationPipeline()
-{
-	soltestAssert(m_compiler);
-
-	// If you add a new stage, remember to handle it below.
-	soltestAssert(
-		m_targetStage == PipelineStage::Parsing ||
-		m_targetStage == PipelineStage::Analysis ||
-		m_targetStage == PipelineStage::Compilation
-	);
-
-	bool parsingSuccessful = m_compiler->parse();
-	soltestAssert(parsingSuccessful || !filteredErrors(false /* _includeWarningsAndInfos */).empty());
-	if (!parsingSuccessful || stageSuccessful(m_targetStage))
-		return;
-
-	bool analysisSuccessful = m_compiler->analyze();
-	soltestAssert(analysisSuccessful || !filteredErrors(false /* _includeWarningsAndInfos */).empty());
-	if (!analysisSuccessful || stageSuccessful(m_targetStage))
-		return;
-
-	bool compilationSuccessful = m_compiler->compile();
-	soltestAssert(compilationSuccessful || !filteredErrors(false /* _includeWarningsAndInfos */).empty());
-	soltestAssert(stageSuccessful(m_targetStage) == compilationSuccessful);
-}
-
-ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _includeWarningsAndInfos) const
-{
-	ErrorList errors;
-	for (auto const& currentError: _errorList)
-	{
-		solAssert(currentError->comment(), "");
-		if (!Error::isError(currentError->type()))
-		{
-			if (!_includeWarningsAndInfos)
-				continue;
-			bool ignoreWarningsAndInfos = false;
-			for (auto const& filter: m_warningsToFilter)
-				if (currentError->comment()->find(filter) == 0)
-				{
-					ignoreWarningsAndInfos = true;
-					break;
-				}
-			if (ignoreWarningsAndInfos)
-				continue;
-		}
-
-		std::shared_ptr<Error const> newError = currentError;
-		for (auto const& messagePrefix: m_messagesToCut)
-			if (currentError->comment()->find(messagePrefix) == 0)
-			{
-				SourceLocation const* location = currentError->sourceLocation();
-				// sufficient for now, but in future we might clone the error completely, including the secondary location
-				newError = std::make_shared<Error>(
-					currentError->errorId(),
-					currentError->type(),
-					messagePrefix + " ....",
-					location ? *location : SourceLocation()
-				);
-				break;
-			}
-
-		errors.emplace_back(newError);
-	}
-
-	return errors;
-}
-
-bool AnalysisFramework::stageSuccessful(PipelineStage _stage) const
-{
-	switch (_stage) {
-		case PipelineStage::Parsing: return compiler().state() >= CompilerStack::Parsed;
-		case PipelineStage::Analysis: return compiler().state() >= CompilerStack::AnalysisSuccessful;
-		case PipelineStage::Compilation: return compiler().state() >= CompilerStack::CompilationSuccessful;
-	}
-	unreachable();
-}
-
-ErrorList AnalysisFramework::runAnalysisAndExpectError(
-	std::string const& _source,
-	bool _includeWarningsAndInfos,
-	bool _allowMultiple
-)
-{
-	auto [ast, errors] = runAnalysisAndExpectNoParsingErrors(_source, _includeWarningsAndInfos, true, _allowMultiple);
-	BOOST_REQUIRE(!errors.empty());
-	BOOST_REQUIRE_MESSAGE(ast, "Expected error, but no error happened.");
-	return errors;
-}
-
-std::string AnalysisFramework::formatErrors(
-	langutil::ErrorList const& _errors,
-	bool _colored,
-	bool _withErrorIds
-) const
-{
-	return SourceReferenceFormatter::formatErrorInformation(
-		_errors,
-		*m_compiler,
-		_colored,
-		_withErrorIds
-	);
-}
-
-std::string AnalysisFramework::formatError(
-	Error const& _error,
-	bool _colored,
-	bool _withErrorIds
-) const
-{
-	return SourceReferenceFormatter::formatErrorInformation(
-		_error,
-		*m_compiler,
-		_colored,
-		_withErrorIds
-	);
-}
-
-ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, std::string const& _name)
-{
-	ContractDefinition* contract = nullptr;
-
-	for (std::shared_ptr<ASTNode> const& node: _source.nodes())
-		if ((contract = dynamic_cast<ContractDefinition*>(node.get())) && contract->name() == _name)
-			return contract;
-
-	return nullptr;
-}
-
-FunctionTypePointer AnalysisFramework::retrieveFunctionBySignature(
-	ContractDefinition const& _contract,
-	std::string const& _signature
-)
-{
-	return _contract.interfaceFunctions()[util::selectorFromSignatureH32(_signature)];
-}
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
deleted file mode 100644
index e7b2c03ec284..000000000000
--- a/test/libsolidity/AnalysisFramework.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Framework for testing features from the analysis phase of compiler.
- */
-
-#pragma once
-
-#include <test/libsolidity/ErrorCheck.h>
-
-#include <libsolidity/interface/CompilerStack.h>
-
-#include <functional>
-#include <string>
-#include <memory>
-
-namespace solidity::frontend
-{
-class Type;
-class FunctionType;
-using FunctionTypePointer = FunctionType const*;
-}
-
-namespace solidity::frontend::test
-{
-
-enum class PipelineStage {
-	Parsing,
-	Analysis,
-	Compilation,
-};
-
-class AnalysisFramework
-{
-
-protected:
-	virtual ~AnalysisFramework() = default;
-
-	/// Runs analysis via runFramework() and returns either an AST or a filtered list of errors.
-	/// Uses Boost test macros to fail if errors do not occur specifically at the analysis stage.
-	///
-	/// @deprecated This is a legacy helper. Use runFramework() directly in new tests.
-	///
-	/// @param _includeWarningsAndInfos Do not remove warning and info messages from the error list.
-	/// @param _addPreamble Apply withPreamble() to @p _source.
-	/// @param _allowMultiple When false, use Boost test macros to fail when there's more
-	///        than one item on the error list.
-	std::pair<SourceUnit const*, langutil::ErrorList> runAnalysisAndExpectNoParsingErrors(
-		std::string const& _source,
-		bool _includeWarningsAndInfos = false,
-		bool _addPreamble = true,
-		bool _allowMultiple = false
-	);
-
-	/// Runs analysis via runAnalysisAndExpectNoParsingErrors() and returns the list of errors.
-	/// Uses Boost test macros to fail if there are no errors.
-	///
-	/// @deprecated This is a legacy helper. Use runFramework() directly in new tests.
-	///
-	/// @param _includeWarningsAndInfos Do not remove warning and info messages from the error list.
-	/// @param _allowMultiple When false, use Boost test macros to fail when there's more
-	///        than one item on the error list.
-	langutil::ErrorList runAnalysisAndExpectError(
-		std::string const& _source,
-		bool _includeWarningsAndInfos = false,
-		bool _allowMultiple = false
-	);
-
-public:
-	/// Runs the full compiler pipeline on specified sources. This is the main function of the
-	/// framework. Resets the stack, configures it and runs either until the first failed stage or
-	/// until the @p _targetStage is reached.
-	/// Afterwards the caller can inspect the stack via @p compiler(). The framework provides a few
-	/// convenience helpers to check the state and error list, in general the caller can freely
-	/// access the stack, including generating outputs if the compilation succeeded.
-	bool runFramework(StringMap _sources, PipelineStage _targetStage = PipelineStage::Compilation);
-	bool runFramework(std::string _source, PipelineStage _targetStage = PipelineStage::Compilation)
-	{
-		return runFramework({{"", std::move(_source)}}, _targetStage);
-	}
-
-	void resetFramework();
-
-	PipelineStage targetStage() const { return m_targetStage; }
-	bool pipelineSuccessful() const { return stageSuccessful(m_targetStage); }
-	bool stageSuccessful(PipelineStage _stage) const;
-
-	std::string formatErrors(
-		langutil::ErrorList const& _errors,
-		bool _colored = false,
-		bool _withErrorIds = false
-	) const;
-	std::string formatError(
-		langutil::Error const& _error,
-		bool _colored = false,
-		bool _withErrorIds = false
-	) const;
-
-	static ContractDefinition const* retrieveContractByName(SourceUnit const& _source, std::string const& _name);
-	static FunctionTypePointer retrieveFunctionBySignature(
-		ContractDefinition const& _contract,
-		std::string const& _signature
-	);
-
-	/// filter out the warnings in m_warningsToFilter or all warnings and infos if _includeWarningsAndInfos is false
-	langutil::ErrorList filterErrors(langutil::ErrorList const& _errorList, bool _includeWarningsAndInfos = true) const;
-	langutil::ErrorList filteredErrors(bool _includeWarningsAndInfos = true) const
-	{
-		return filterErrors(compiler().errors(), _includeWarningsAndInfos);
-	}
-
-	/// @returns reference to lazy-instantiated CompilerStack.
-	solidity::frontend::CompilerStack& compiler()
-	{
-		if (!m_compiler)
-			m_compiler = createStack();
-		return *m_compiler;
-	}
-
-	/// @returns reference to lazy-instantiated CompilerStack.
-	solidity::frontend::CompilerStack const& compiler() const
-	{
-		if (!m_compiler)
-			m_compiler = createStack();
-		return *m_compiler;
-	}
-
-protected:
-	/// Creates a new instance of @p CompilerStack. Override if your test case needs to pass in
-	/// custom constructor arguments.
-	virtual std::unique_ptr<CompilerStack> createStack() const;
-
-	/// Configures @p CompilerStack. The default implementation sets basic parameters based on
-	/// CLI options. Override if your test case needs extra configuration.
-	virtual void setupCompiler(CompilerStack& _compiler);
-
-	/// Executes the requested pipeline stages until @p m_targetStage is reached.
-	/// Stops at the first failed stage.
-	void executeCompilationPipeline();
-
-	std::vector<std::string> m_warningsToFilter = {"This is a pre-release compiler version"};
-	std::vector<std::string> m_messagesToCut = {"Source file requires different compiler version (current compiler is"};
-
-private:
-	mutable std::unique_ptr<solidity::frontend::CompilerStack> m_compiler;
-	PipelineStage m_targetStage = PipelineStage::Compilation;
-};
-
-// Asserts that the compilation down to typechecking
-// emits multiple errors of different types and messages, provided in the second argument.
-#define CHECK_ALLOW_MULTI(text, expectations) \
-do \
-{ \
-	ErrorList errors = runAnalysisAndExpectError((text), true, true); \
-	auto message = searchErrors(errors, (expectations)); \
-	BOOST_CHECK_MESSAGE(message.empty(), message); \
-} while(0)
-
-#define CHECK_ERROR_OR_WARNING(text, typ, substrings, includeWarningsAndInfos, allowMulti) \
-do \
-{ \
-	ErrorList errors = runAnalysisAndExpectError((text), (includeWarningsAndInfos), (allowMulti)); \
-	std::vector<std::pair<Error::Type, std::string>> expectations; \
-	for (auto const& str: substrings) \
-		expectations.emplace_back((Error::Type::typ), str); \
-	auto message = searchErrors(errors, expectations); \
-	BOOST_CHECK_MESSAGE(message.empty(), message); \
-} while(0)
-
-// [checkError(text, type, substring)] asserts that the compilation down to typechecking
-// emits an error of type [type] and with a message containing [substring].
-#define CHECK_ERROR(text, type, substring) \
-CHECK_ERROR_OR_WARNING(text, type, std::vector<std::string>{(substring)}, false, false)
-
-// [checkError(text, type, substring)] asserts that the compilation down to typechecking
-// emits multiple errors of the same type [type] and with a messages containing [substrings].
-// Because of the limitations of the preprocessor, you cannot use {{T1, "abc"}, {T2, "def"}} as arguments,
-// but have to replace them by (std::vector<std::pair<Error::Type, std::string>>{"abc", "def"})
-// (note the parentheses)
-#define CHECK_ERROR_ALLOW_MULTI(text, type, substrings) \
-CHECK_ERROR_OR_WARNING(text, type, substrings, false, true)
-
-// [checkWarning(text, substring)] asserts that the compilation down to typechecking
-// emits a warning and with a message containing [substring].
-#define CHECK_WARNING(text, substring) \
-CHECK_ERROR_OR_WARNING(text, Warning, std::vector<std::string>{(substring)}, true, false)
-
-// [checkWarningAllowMulti(text, substring)] aserts that the compilation down to typechecking
-// emits a warning and with a message containing [substring].
-// Because of the limitations of the preprocessor, you cannot use {"abc", "def"} as arguments,
-// but have to replace them by (std::vector<std::string>{"abc", "def"}) (note the parentheses)
-#define CHECK_WARNING_ALLOW_MULTI(text, substrings) \
-CHECK_ERROR_OR_WARNING(text, Warning, substrings, true, true)
-
-// [checkSuccess(text)] asserts that the compilation down to typechecking succeeds.
-#define CHECK_SUCCESS(text) do { \
-	auto [ast, errors] = runAnalysisAndExpectNoParsingErrors((text)); \
-	BOOST_CHECK(errors.empty()); \
-} while(0)
-
-#define CHECK_SUCCESS_NO_WARNINGS(text) \
-do \
-{ \
-	auto [ast, errors] = runAnalysisAndExpectNoParsingErrors((text), true); \
-	std::string message; \
-	if (!errors.empty()) \
-		message = formatErrors(errors);\
-	BOOST_CHECK_MESSAGE(errors.empty(), message); \
-} \
-while(0)
-
-}
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
deleted file mode 100644
index dcfe49ab48d2..000000000000
--- a/test/libsolidity/Assembly.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Lefteris Karapetsas <lefteris@ethdev.com>
- * @date 2015
- * Unit tests for Assembly Items from evmasm/Assembly.h
- */
-
-#include <test/Common.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <libevmasm/Assembly.h>
-
-#include <liblangutil/CharStream.h>
-
-#include <libsolidity/parsing/Parser.h>
-#include <libsolidity/analysis/DeclarationTypeChecker.h>
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/analysis/Scoper.h>
-#include <libsolidity/codegen/Compiler.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/analysis/TypeChecker.h>
-#include <libsolidity/analysis/SyntaxChecker.h>
-#include <liblangutil/ErrorReporter.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-#include <iostream>
-
-using namespace solidity::langutil;
-using namespace solidity::evmasm;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-
-evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
-{
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	Parser parser(errorReporter, solidity::test::CommonOptions::get().evmVersion());
-	ASTPointer<SourceUnit> sourceUnit;
-	BOOST_REQUIRE_NO_THROW(sourceUnit = parser.parse(*_sourceCode));
-	BOOST_CHECK(!!sourceUnit);
-
-	Scoper::assignScopes(*sourceUnit);
-	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
-	GlobalContext globalContext;
-	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter);
-	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());
-	solAssert(!Error::containsErrors(errorReporter.errors()), "");
-	resolver.registerDeclarations(*sourceUnit);
-	BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*sourceUnit));
-	if (Error::containsErrors(errorReporter.errors()))
-		return AssemblyItems();
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-	{
-		BOOST_REQUIRE_NO_THROW(declarationTypeChecker.check(*node));
-		if (Error::containsErrors(errorReporter.errors()))
-			return AssemblyItems();
-	}
-	TypeChecker checker(solidity::test::CommonOptions::get().evmVersion(), errorReporter);
-	BOOST_REQUIRE_NO_THROW(checker.checkTypeRequirements(*sourceUnit));
-	if (Error::containsErrors(errorReporter.errors()))
-		return AssemblyItems();
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			Compiler compiler(
-				solidity::test::CommonOptions::get().evmVersion(),
-				RevertStrings::Default,
-				solidity::test::CommonOptions::get().optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal()
-			);
-			compiler.compileContract(*contract, std::map<ContractDefinition const*, std::shared_ptr<Compiler const>>{}, bytes());
-
-			return compiler.runtimeAssembly().items();
-		}
-	BOOST_FAIL("No contract found in source.");
-	return AssemblyItems();
-}
-
-void printAssemblyLocations(AssemblyItems const& _items)
-{
-	auto printRepeated = [](SourceLocation const& _loc, size_t _repetitions)
-	{
-		std::cout <<
-			"\t\tvector<SourceLocation>(" <<
-			_repetitions <<
-			", SourceLocation{" <<
-			_loc.start <<
-			", " <<
-			_loc.end <<
-			", make_shared<string>(\"" <<
-			*_loc.sourceName <<
-			"\")}) +" << std::endl;
-	};
-
-	std::vector<SourceLocation> locations;
-	for (auto const& item: _items)
-		locations.push_back(item.location());
-	size_t repetitions = 0;
-	SourceLocation const* previousLoc = nullptr;
-	for (size_t i = 0; i < locations.size(); ++i)
-	{
-		SourceLocation& loc = locations[i];
-		if (previousLoc && *previousLoc == loc)
-			repetitions++;
-		else
-		{
-			if (previousLoc)
-				printRepeated(*previousLoc, repetitions);
-			previousLoc = &loc;
-			repetitions = 1;
-		}
-	}
-	if (previousLoc)
-		printRepeated(*previousLoc, repetitions);
-}
-
-void checkAssemblyLocations(AssemblyItems const& _items, std::vector<SourceLocation> const& _locations)
-{
-	BOOST_CHECK_EQUAL(_items.size(), _locations.size());
-	for (size_t i = 0; i < std::min(_items.size(), _locations.size()); ++i)
-	{
-		if (_items[i].location().start != _locations[i].start ||
-			_items[i].location().end != _locations[i].end)
-		{
-			BOOST_CHECK_MESSAGE(false, "Location mismatch for item " + std::to_string(i) + ". Found the following locations:");
-			printAssemblyLocations(_items);
-			return;
-		}
-	}
-}
-
-
-} // end anonymous namespace
-
-BOOST_AUTO_TEST_SUITE(Assembly)
-
-BOOST_AUTO_TEST_CASE(location_test)
-{
-	std::string sourceCode = R"(
-	pragma abicoder v1;
-	contract test {
-		function f() public returns (uint256 a) {
-			return 16;
-		}
-	}
-	)";
-	AssemblyItems items = compileContract(std::make_shared<CharStream>(sourceCode, ""));
-	std::shared_ptr<std::string> sourceName = std::make_shared<std::string>();
-	bool hasShifts = solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting();
-
-	auto codegenCharStream = std::make_shared<CharStream>("", "--CODEGEN--");
-
-	std::vector<SourceLocation> locations;
-	if (solidity::test::CommonOptions::get().optimize)
-		locations =
-			std::vector<SourceLocation>(31, SourceLocation{23, 103, sourceName}) +
-			std::vector<SourceLocation>(1, SourceLocation{41, 100, sourceName}) +
-			std::vector<SourceLocation>(1, SourceLocation{93, 95, sourceName}) +
-			std::vector<SourceLocation>(15, SourceLocation{41, 100, sourceName});
-	else
-		locations =
-			std::vector<SourceLocation>(hasShifts ? 31 : 32, SourceLocation{23, 103, sourceName}) +
-			std::vector<SourceLocation>(24, SourceLocation{41, 100, sourceName}) +
-			std::vector<SourceLocation>(1, SourceLocation{70, 79, sourceName}) +
-			std::vector<SourceLocation>(1, SourceLocation{93, 95, sourceName}) +
-			std::vector<SourceLocation>(2, SourceLocation{86, 95, sourceName}) +
-			std::vector<SourceLocation>(2, SourceLocation{41, 100, sourceName});
-	checkAssemblyLocations(items, locations);
-}
-
-
-BOOST_AUTO_TEST_CASE(jump_type)
-{
-	auto sourceCode = std::make_shared<CharStream>(R"(
-	pragma abicoder v1;
-	contract C {
-		function f(uint a) public pure returns (uint t) {
-			assembly {
-				function g(x) -> y { if x { leave } y := 8 }
-				t := g(a)
-			}
-		}
-	}
-	)", "");
-	AssemblyItems items = compileContract(sourceCode);
-
-	std::string jumpTypes;
-	for (AssemblyItem const& item: items)
-		if (item.getJumpType() != AssemblyItem::JumpType::Ordinary)
-			jumpTypes += item.getJumpTypeAsString() + "\n";
-
-	if (solidity::test::CommonOptions::get().optimize)
-		BOOST_CHECK_EQUAL(jumpTypes, "[in]\n[out]\n[out]\n[in]\n[out]\n");
-	else
-		BOOST_CHECK_EQUAL(jumpTypes, "[in]\n[out]\n[in]\n[out]\n");
-}
-
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/ErrorCheck.cpp b/test/libsolidity/ErrorCheck.cpp
deleted file mode 100644
index 8f1f05439085..000000000000
--- a/test/libsolidity/ErrorCheck.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file ErrorCheck.cpp
- * @author Yoichi Hirai <i@yoichihirai.com>
- * @date 2016
- */
-
-#include <test/libsolidity/ErrorCheck.h>
-#include <libsolutil/Exceptions.h>
-
-#include <string>
-#include <set>
-#include <iostream>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-
-namespace
-{
-std::string errorMessage(Error const& _e)
-{
-	return _e.comment() ? *_e.comment() : "NONE";
-}
-}
-
-bool solidity::frontend::test::searchErrorMessage(Error const& _err, std::string const& _substr)
-{
-	if (std::string const* errorMessage = _err.comment())
-	{
-		if (errorMessage->find(_substr) == std::string::npos)
-		{
-			std::cout << "Expected message \"" << _substr << "\" but found \"" << *errorMessage << "\".\n";
-			return false;
-		}
-		return true;
-	}
-	else
-		std::cout << "Expected error message but found none." << std::endl;
-	return _substr.empty();
-}
-
-std::string solidity::frontend::test::searchErrors(ErrorList const& _errors, std::vector<std::pair<Error::Type, std::string>> const& _expectations)
-{
-	auto expectations = _expectations;
-	for (auto const& error: _errors)
-	{
-		std::string msg = errorMessage(*error);
-		bool found = false;
-		for (auto it = expectations.begin(); it != expectations.end(); ++it)
-			if (msg.find(it->second) != std::string::npos && error->type() == it->first)
-			{
-				found = true;
-				expectations.erase(it);
-				break;
-			}
-		if (!found)
-			return "Unexpected error: " + Error::formatErrorType(error->type()) + ": " + msg;
-	}
-	if (!expectations.empty())
-	{
-		std::string msg = "Expected error(s) not present:\n";
-		for (auto const& expectation: expectations)
-			msg += expectation.second + "\n";
-		return msg;
-	}
-
-	return "";
-}
diff --git a/test/libsolidity/ErrorCheck.h b/test/libsolidity/ErrorCheck.h
deleted file mode 100644
index e01c2ca52484..000000000000
--- a/test/libsolidity/ErrorCheck.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file ErrorCheck.h
- * @author Yoichi Hirai <i@yoichihirai.com>
- * @date 2016
- */
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-
-#include <vector>
-#include <tuple>
-
-namespace solidity::frontend::test
-{
-
-bool searchErrorMessage(langutil::Error const& _err, std::string const& _substr);
-
-/// Checks that all provided errors are of the given type and have a given substring in their
-/// description.
-/// If the expectations are not met, returns a nonempty description, otherwise an empty string.
-std::string searchErrors(langutil::ErrorList const& _errors, std::vector<std::pair<langutil::Error::Type, std::string>> const& _expectations);
-
-}
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
deleted file mode 100644
index 520732810195..000000000000
--- a/test/libsolidity/GasCosts.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Tests that check that the cost of certain operations stay within range.
- */
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <liblangutil/EVMVersion.h>
-#include <libsolutil/IpfsHash.h>
-#include <libevmasm/GasMeter.h>
-
-#include <cmath>
-
-using namespace solidity::langutil;
-using namespace solidity::langutil;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-#define CHECK_DEPLOY_GAS(_gasNoOpt, _gasOpt, _evmVersion) \
-	do \
-	{ \
-		u256 metaCost = GasMeter::dataGas(m_compiler.cborMetadata(m_compiler.lastContractName()), true, _evmVersion); \
-		u256 gasOpt{_gasOpt}; \
-		u256 gasNoOpt{_gasNoOpt}; \
-		u256 gas = m_optimiserSettings == OptimiserSettings::minimal() ? gasNoOpt : gasOpt; \
-		BOOST_CHECK_MESSAGE( \
-			m_gasUsed >= metaCost, \
-			"Gas used: " + \
-			m_gasUsed.str() + \
-			" is less than the data cost for the cbor metadata: " + \
-			u256(metaCost).str() \
-		); \
-		u256 gasUsed = m_gasUsed - metaCost; \
-		BOOST_CHECK_MESSAGE( \
-			gas == gasUsed, \
-			"Gas used: " + \
-			gasUsed.str() + \
-			" - expected: " + \
-			gas.str() \
-		); \
-	} while(0)
-
-#define CHECK_GAS(_gasNoOpt, _gasOpt, _tolerance) \
-	do \
-	{ \
-		u256 gasOpt{_gasOpt}; \
-		u256 gasNoOpt{_gasNoOpt}; \
-		u256 tolerance{_tolerance}; \
-		u256 gas = m_optimiserSettings == OptimiserSettings::minimal() ? gasNoOpt : gasOpt; \
-		u256 diff = gas < m_gasUsed ? m_gasUsed - gas : gas - m_gasUsed; \
-		BOOST_CHECK_MESSAGE( \
-			diff <= tolerance, \
-			"Gas used: " + \
-			m_gasUsed.str() + \
-			" - expected: " + \
-			gas.str() + \
-			" (tolerance: " + \
-			tolerance.str() + \
-			")" \
-		); \
-	} while(0)
-
-BOOST_FIXTURE_TEST_SUITE(GasCostTests, SolidityExecutionFramework)
-
-BOOST_AUTO_TEST_CASE(string_storage)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f() pure public {
-				require(false, "Not Authorized. This function can only be called by the custodian or owner of this contract");
-			}
-		}
-	)";
-	m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
-	m_appendCBORMetadata = false;
-	compileAndRun(sourceCode);
-
-	auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
-
-	if (evmVersion <= EVMVersion::byzantium())
-	{
-		if (CommonOptions::get().useABIEncoderV1)
-			CHECK_DEPLOY_GAS(133045, 129731, evmVersion);
-		else
-			CHECK_DEPLOY_GAS(144999, 121229, evmVersion);
-	}
-	// This is only correct on >=Constantinople.
-	else if (!CommonOptions::get().useABIEncoderV1)
-	{
-		if (CommonOptions::get().optimize)
-		{
-			// Costs with 0 are cases which cannot be triggered in tests.
-			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(0, 109241, evmVersion);
-			else if (evmVersion < EVMVersion::shanghai())
-				CHECK_DEPLOY_GAS(0, 97697, evmVersion);
-			// Shanghai is cheaper due to `push0`
-			else
-				CHECK_DEPLOY_GAS(0, 97071, evmVersion);
-		}
-		else
-		{
-			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(139013, 123969, evmVersion);
-			else if (evmVersion < EVMVersion::shanghai())
-				CHECK_DEPLOY_GAS(123361, 110969, evmVersion);
-			// Shanghai is cheaper due to `push0`
-			else
-				CHECK_DEPLOY_GAS(121493, 110969, evmVersion);
-		}
-	}
-	else if (evmVersion < EVMVersion::istanbul())
-		CHECK_DEPLOY_GAS(125829, 118559, evmVersion);
-	else if (evmVersion < EVMVersion::shanghai())
-		CHECK_DEPLOY_GAS(114077, 96461, evmVersion);
-	else
-		CHECK_DEPLOY_GAS(114077, 95835, evmVersion);
-
-	if (evmVersion >= EVMVersion::byzantium())
-	{
-		callContractFunction("f()");
-		if (evmVersion == EVMVersion::byzantium())
-			CHECK_GAS(21741, 21522, 20);
-		// This is only correct on >=Constantinople.
-		else if (!CommonOptions::get().useABIEncoderV1)
-		{
-			if (CommonOptions::get().optimize)
-			{
-				if (evmVersion < EVMVersion::istanbul())
-					CHECK_GAS(0, 21526, 20);
-				else
-					CHECK_GAS(0, 21318, 20);
-			}
-			else
-			{
-				if (evmVersion < EVMVersion::istanbul())
-					CHECK_GAS(21736, 21559, 20);
-				else
-					CHECK_GAS(21528, 21351, 20);
-			}
-		}
-		else if (evmVersion < EVMVersion::istanbul())
-			CHECK_GAS(21546, 21526, 20);
-		else
-			CHECK_GAS(21332, 21322, 20);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(single_callvaluecheck)
-{
-	std::string sourceCode = R"(
-		// All functions nonpayable, we can check callvalue at the beginning
-		contract Nonpayable {
-			address a;
-			function f(address b) public {
-				a = b;
-			}
-			function f1(address b) public pure returns (uint c) {
-				return uint160(b) + 2;
-			}
-			function f2(address b) public pure returns (uint) {
-				return uint160(b) + 8;
-			}
-			function f3(address, uint c) pure public returns (uint) {
-				return c - 5;
-			}
-		}
-		// At least on payable function, we cannot do the optimization.
-		contract Payable {
-			address a;
-			function f(address b) public {
-				a = b;
-			}
-			function f1(address b) public pure returns (uint c) {
-				return uint160(b) + 2;
-			}
-			function f2(address b) public pure returns (uint) {
-				return uint160(b) + 8;
-			}
-			function f3(address, uint c) payable public returns (uint) {
-				return c - 5;
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	size_t bytecodeSizeNonpayable = m_compiler.object("Nonpayable").bytecode.size();
-	size_t bytecodeSizePayable = m_compiler.object("Payable").bytecode.size();
-
-	auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	if (evmVersion < EVMVersion::shanghai())
-		BOOST_CHECK_EQUAL(bytecodeSizePayable - bytecodeSizeNonpayable, 26);
-	else
-		BOOST_CHECK_EQUAL(bytecodeSizePayable - bytecodeSizeNonpayable, 24);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
deleted file mode 100644
index be222c400857..000000000000
--- a/test/libsolidity/GasMeter.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Unit tests for the gas estimator.
- */
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <libevmasm/GasMeter.h>
-#include <libevmasm/KnownState.h>
-#include <libevmasm/PathGasMeter.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/GasEstimator.h>
-
-using namespace solidity::langutil;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-
-namespace solidity::frontend::test
-{
-
-class GasMeterTestFramework: public SolidityExecutionFramework
-{
-public:
-	void compile(std::string const& _sourceCode)
-	{
-		m_compiler.reset();
-		m_compiler.setSources({{"", "pragma solidity >=0.0;\n"
-				"// SPDX-License-Identifier: GPL-3.0\n" + _sourceCode}});
-		m_compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-		m_compiler.setEVMVersion(m_evmVersion);
-		BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed");
-	}
-
-	void testCreationTimeGas(std::string const& _sourceCode, u256 const& _tolerance = u256(0))
-	{
-		compileAndRun(_sourceCode);
-		auto state = std::make_shared<KnownState>();
-		PathGasMeter meter(*m_compiler.assemblyItems(m_compiler.lastContractName()), solidity::test::CommonOptions::get().evmVersion());
-		GasMeter::GasConsumption gas = meter.estimateMax(0, state);
-		u256 bytecodeSize(m_compiler.runtimeObject(m_compiler.lastContractName()).bytecode.size());
-		// costs for deployment
-		gas += bytecodeSize * GasCosts::createDataGas;
-		// costs for transaction
-		gas += gasForTransaction(m_compiler.object(m_compiler.lastContractName()).bytecode, true);
-
-		// Skip the tests when we use ABIEncoderV2.
-		// TODO: We should enable this again once the yul optimizer is activated.
-		if (solidity::test::CommonOptions::get().useABIEncoderV1)
-		{
-			BOOST_REQUIRE(!gas.isInfinite);
-			BOOST_CHECK_LE(m_gasUsed, gas.value);
-			BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
-		}
-	}
-
-	/// Compares the gas computed by PathGasMeter for the given signature (but unknown arguments)
-	/// against the actual gas usage computed by the VM on the given set of argument variants.
-	void testRunTimeGas(std::string const& _sig, std::vector<bytes> _argumentVariants, u256 const& _tolerance = u256(0))
-	{
-		u256 gasUsed = 0;
-		GasMeter::GasConsumption gas;
-		util::FixedHash<4> hash = util::selectorFromSignatureH32(_sig);
-		for (bytes const& arguments: _argumentVariants)
-		{
-			sendMessage(hash.asBytes() + arguments, false, 0);
-			BOOST_CHECK(m_transactionSuccessful);
-			gasUsed = std::max(gasUsed, m_gasUsed);
-			gas = std::max(gas, gasForTransaction(hash.asBytes() + arguments, false));
-		}
-
-		gas += GasEstimator(solidity::test::CommonOptions::get().evmVersion()).functionalEstimation(
-			*m_compiler.runtimeAssemblyItems(m_compiler.lastContractName()),
-			_sig
-		);
-		// Skip the tests when we use ABIEncoderV2.
-		// TODO: We should enable this again once the yul optimizer is activated.
-		if (solidity::test::CommonOptions::get().useABIEncoderV1)
-		{
-			BOOST_REQUIRE(!gas.isInfinite);
-			BOOST_CHECK_LE(m_gasUsed, gas.value);
-			BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
-		}
-	}
-
-	static GasMeter::GasConsumption gasForTransaction(bytes const& _data, bool _isCreation)
-	{
-		auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
-		GasMeter::GasConsumption gas = _isCreation ? GasCosts::txCreateGas : GasCosts::txGas;
-		for (auto i: _data)
-			gas += i != 0 ? GasCosts::txDataNonZeroGas(evmVersion) : GasCosts::txDataZeroGas;
-		return gas;
-	}
-};
-
-BOOST_FIXTURE_TEST_SUITE(GasMeterTests, GasMeterTestFramework)
-
-BOOST_AUTO_TEST_CASE(simple_contract)
-{
-	// Tests a simple "deploy contract" code without constructor. The actual contract is not relevant.
-	char const* sourceCode = R"(
-		contract test {
-			bytes32 public shaValue;
-			function f(uint a) public {
-				shaValue = keccak256(abi.encodePacked(a));
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(store_keccak256)
-{
-	char const* sourceCode = R"(
-		contract test {
-			bytes32 public shaValue;
-			constructor() {
-				shaValue = keccak256(abi.encodePacked(this));
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(updating_store)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint data;
-			uint data2;
-			constructor() {
-				data = 1;
-				data = 2;
-				data2 = 0;
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode, m_evmVersion < langutil::EVMVersion::constantinople() ? u256(0) : u256(9600));
-}
-
-BOOST_AUTO_TEST_CASE(branches)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint data;
-			uint data2;
-			function f(uint x) public {
-				if (x > 7)
-					data2 = 1;
-				else
-					data = 1;
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode, 1);
-	testRunTimeGas("f(uint256)", std::vector<bytes>{encodeArgs(2), encodeArgs(8)}, 1);
-}
-
-BOOST_AUTO_TEST_CASE(function_calls)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint data;
-			uint data2;
-			function f(uint x) public {
-				if (x > 7)
-					{ unchecked { data2 = g(x**8) + 1; } }
-				else
-					data = 1;
-			}
-			function g(uint x) internal returns (uint) {
-				return data2;
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	// In f, data2 is accessed twice, so there is a reduction of 2200 to 100 in actual costs.
-	// However, GasMeter always assumes cold costs.
-	testRunTimeGas(
-		"f(uint256)",
-		std::vector<bytes>{encodeArgs(2), encodeArgs(8)},
-		m_evmVersion < EVMVersion::berlin() ?
-		u256(0) :
-		u256(2100)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multiple_external_functions)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint data;
-			uint data2;
-			function f(uint x) public {
-				if (x > 7)
-					{ unchecked { data2 = g(x**8) + 1; } }
-				else
-					data = 1;
-			}
-			function g(uint x) public returns (uint) {
-				return data2;
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	// In f, data2 is accessed twice, so there is a reduction of 2200 to 100 in actual costs.
-	// However, GasMeter always assumes cold costs.
-	testRunTimeGas(
-		"f(uint256)",
-		std::vector<bytes>{encodeArgs(2), encodeArgs(8)},
-		m_evmVersion < EVMVersion::berlin() ?
-		u256(0) :
-		u256(2100)
-	);
-
-	testRunTimeGas("g(uint256)", std::vector<bytes>{encodeArgs(2)});
-}
-
-BOOST_AUTO_TEST_CASE(exponent_size)
-{
-	char const* sourceCode = R"(
-		contract A {
-			function f(uint x) public returns (uint) {
-				unchecked { return x ** 0; }
-			}
-			function g(uint x) public returns (uint) {
-				unchecked { return x ** 0x100; }
-			}
-			function h(uint x) public returns (uint) {
-				unchecked { return x ** 0x10000; }
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	testRunTimeGas("f(uint256)", std::vector<bytes>{encodeArgs(2)});
-	testRunTimeGas("g(uint256)", std::vector<bytes>{encodeArgs(2)});
-	testRunTimeGas("h(uint256)", std::vector<bytes>{encodeArgs(2)});
-}
-
-BOOST_AUTO_TEST_CASE(balance_gas)
-{
-	char const* sourceCode = R"(
-		contract A {
-			function lookup_balance(address a) public returns (uint) {
-				return a.balance;
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	testRunTimeGas("lookup_balance(address)", std::vector<bytes>{encodeArgs(2), encodeArgs(100)});
-}
-
-BOOST_AUTO_TEST_CASE(extcodesize_gas)
-{
-	char const* sourceCode = R"(
-		contract A {
-			function f() public returns (uint _s) {
-				assembly {
-					_s := extcodesize(0x30)
-				}
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	testRunTimeGas("f()", std::vector<bytes>{encodeArgs()});
-}
-
-BOOST_AUTO_TEST_CASE(regular_functions_exclude_fallback)
-{
-	// A bug in the estimator caused the costs for a specific function
-	// to always include the costs for the fallback.
-	char const* sourceCode = R"(
-		contract A {
-			uint public x;
-			fallback() external { x = 2; }
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	testRunTimeGas("x()", std::vector<bytes>{encodeArgs()});
-}
-
-BOOST_AUTO_TEST_CASE(complex_control_flow)
-{
-	// This crashed the gas estimator previously (or took a very long time).
-	// Now we do not follow branches if they start out with lower gas costs than the ones
-	// we previously considered. This of course reduces accuracy.
-	char const* sourceCode = R"(
-		contract log {
-			function ln(int128 x) public pure returns (int128 result) {
-				unchecked {
-					int128 t = x / 256;
-					int128 y = 5545177;
-					x = t;
-					t = x * 16; if (t <= 1000000) { x = t; y = y - 2772588; }
-					t = x * 4; if (t <= 1000000) { x = t; y = y - 1386294; }
-					t = x * 2; if (t <= 1000000) { x = t; y = y - 693147; }
-					t = x + x / 2; if (t <= 1000000) { x = t; y = y - 405465; }
-					t = x + x / 4; if (t <= 1000000) { x = t; y = y - 223144; }
-					t = x + x / 8; if (t <= 1000000) { x = t; y = y - 117783; }
-					t = x + x / 16; if (t <= 1000000) { x = t; y = y - 60624; }
-					t = x + x / 32; if (t <= 1000000) { x = t; y = y - 30771; }
-					t = x + x / 64; if (t <= 1000000) { x = t; y = y - 15504; }
-					t = x + x / 128; if (t <= 1000000) { x = t; y = y - 7782; }
-					t = x + x / 256; if (t <= 1000000) { x = t; y = y - 3898; }
-					t = x + x / 512; if (t <= 1000000) { x = t; y = y - 1951; }
-					t = x + x / 1024; if (t <= 1000000) { x = t; y = y - 976; }
-					t = x + x / 2048; if (t <= 1000000) { x = t; y = y - 488; }
-					t = x + x / 4096; if (t <= 1000000) { x = t; y = y - 244; }
-					t = x + x / 8192; if (t <= 1000000) { x = t; y = y - 122; }
-					t = x + x / 16384; if (t <= 1000000) { x = t; y = y - 61; }
-					t = x + x / 32768; if (t <= 1000000) { x = t; y = y - 31; }
-					t = x + x / 65536; if (t <= 1000000) { y = y - 15; }
-					return y;
-				}
-			}
-		}
-	)";
-	testCreationTimeGas(sourceCode);
-	// max gas is used for small x
-	testRunTimeGas("ln(int128)", std::vector<bytes>{encodeArgs(0), encodeArgs(10), encodeArgs(105), encodeArgs(30000)});
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
deleted file mode 100644
index 73aa780e4d32..000000000000
--- a/test/libsolidity/GasTest.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/GasTest.h>
-#include <test/libsolidity/util/Common.h>
-#include <test/Common.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/JSON.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/throw_exception.hpp>
-#include <fstream>
-#include <stdexcept>
-
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity;
-using namespace boost::unit_test;
-
-GasTest::GasTest(std::string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_optimise = m_reader.boolSetting("optimize", false);
-	m_optimiseYul = m_reader.boolSetting("optimize-yul", false);
-	m_optimiseRuns = m_reader.sizetSetting("optimize-runs", OptimiserSettings{}.expectedExecutionsPerDeployment);
-	parseExpectations(m_reader.stream());
-}
-
-void GasTest::parseExpectations(std::istream& _stream)
-{
-	std::map<std::string, std::string>* currentKind = nullptr;
-	std::string line;
-
-	while (getline(_stream, line))
-		if (!boost::starts_with(line, "// "))
-			BOOST_THROW_EXCEPTION(std::runtime_error("Invalid expectation: expected \"// \"."));
-		else if (boost::ends_with(line, ":"))
-		{
-			std::string kind = line.substr(3, line.length() - 4);
-			boost::trim(kind);
-			currentKind = &m_expectations[std::move(kind)];
-		}
-		else if (!currentKind)
-			BOOST_THROW_EXCEPTION(std::runtime_error("No function kind specified. Expected \"creation:\", \"external:\" or \"internal:\"."));
-		else
-		{
-			auto it = line.begin() + 3;
-			skipWhitespace(it, line.end());
-			auto functionNameBegin = it;
-			while (it != line.end() && *it != ':')
-				++it;
-			std::string functionName(functionNameBegin, it);
-			if (functionName == "fallback")
-				functionName.clear();
-			expect(it, line.end(), ':');
-			skipWhitespace(it, line.end());
-			if (it == line.end())
-				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid expectation: expected gas cost."));
-			(*currentKind)[functionName] = std::string(it, line.end());
-		}
-}
-
-void GasTest::printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const
-{
-	Json::Value estimates = compiler().gasEstimates(compiler().lastContractName());
-	for (auto groupIt = estimates.begin(); groupIt != estimates.end(); ++groupIt)
-	{
-		_stream << _linePrefix << groupIt.key().asString() << ":" << std::endl;
-		for (auto it = groupIt->begin(); it != groupIt->end(); ++it)
-		{
-			_stream << _linePrefix << "  ";
-			if (it.key().asString().empty())
-				_stream << "fallback";
-			else
-				_stream << it.key().asString();
-			_stream << ": " << it->asString() << std::endl;
-		}
-	}
-}
-
-void GasTest::setupCompiler(CompilerStack& _compiler)
-{
-	AnalysisFramework::setupCompiler(_compiler);
-
-	// Prerelease CBOR metadata varies in size due to changing version numbers and build dates.
-	// This leads to volatile creation cost estimates. Therefore we force the compiler to
-	// release mode for testing gas estimates.
-	_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
-	OptimiserSettings settings = m_optimise ? OptimiserSettings::standard() : OptimiserSettings::minimal();
-	if (m_optimiseYul)
-	{
-		settings.runYulOptimiser = m_optimise;
-		settings.optimizeStackAllocation = m_optimise;
-	}
-	settings.expectedExecutionsPerDeployment = m_optimiseRuns;
-	_compiler.setOptimiserSettings(settings);
-
-	// Intentionally ignoring EVM version specified on the command line.
-	// Gas expectations are only valid for the default version.
-	_compiler.setEVMVersion(EVMVersion{});
-}
-
-TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
-{
-	if (!runFramework(withPreamble(m_source), PipelineStage::Compilation))
-	{
-		_stream << formatErrors(filteredErrors(), _formatted);
-		return TestResult::FatalError;
-	}
-
-	Json::Value estimateGroups = compiler().gasEstimates(compiler().lastContractName());
-	if (
-		m_expectations.size() == estimateGroups.size() &&
-		boost::all(m_expectations, [&](auto const& expectations) {
-		auto const& estimates = estimateGroups[expectations.first];
-		return estimates.size() == expectations.second.size() &&
-			boost::all(expectations.second, [&](auto const& entry) {
-				return entry.second == estimates[entry.first].asString();
-			});
-		})
-	)
-		return TestResult::Success;
-	else
-	{
-		_stream << _linePrefix << "Expected:" << std::endl;
-		for (auto const& expectations: m_expectations)
-		{
-			_stream << _linePrefix << "  " << expectations.first << ":" << std::endl;
-			for (auto const& entry: expectations.second)
-				_stream << _linePrefix
-					<< "    "
-					<< (entry.first.empty() ? "fallback" : entry.first)
-					<< ": "
-					<< entry.second
-					<< std::endl;
-		}
-		_stream << _linePrefix << "Obtained:" << std::endl;
-		printUpdatedExpectations(_stream, _linePrefix + "  ");
-		return TestResult::Failure;
-	}
-}
diff --git a/test/libsolidity/GasTest.h b/test/libsolidity/GasTest.h
deleted file mode 100644
index 1337ae3f6f07..000000000000
--- a/test/libsolidity/GasTest.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/TestCase.h>
-#include <liblangutil/Exceptions.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend::test
-{
-
-class GasTest: AnalysisFramework, public TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{ return std::make_unique<GasTest>(_config.filename); }
-	GasTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
-
-	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
-
-protected:
-	void setupCompiler(CompilerStack& _compiler) override;
-
-private:
-	void parseExpectations(std::istream& _stream);
-
-	bool m_optimise = false;
-	bool m_optimiseYul = false;
-	size_t m_optimiseRuns = OptimiserSettings{}.expectedExecutionsPerDeployment;
-	std::map<std::string, std::map<std::string, std::string>> m_expectations;
-};
-
-}
diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp
deleted file mode 100644
index 5f094d157923..000000000000
--- a/test/libsolidity/Imports.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Tests for high level features like import.
- */
-
-#include <test/libsolidity/ErrorCheck.h>
-#include <test/Common.h>
-
-#include <liblangutil/Exceptions.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/ImportRemapper.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(SolidityImports)
-
-BOOST_AUTO_TEST_CASE(remappings)
-{
-	CompilerStack c;
-	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"", "s", "s_1.4.6"},{"", "t", "Tee"}});
-	c.setSources({
-		{"a", "import \"s/s.sol\"; contract A is S {} pragma solidity >=0.0;"},
-		{"b", "import \"t/tee.sol\"; contract A is Tee {} pragma solidity >=0.0;"},
-		{"s_1.4.6/s.sol", "contract S {} pragma solidity >=0.0;"},
-		{"Tee/tee.sol", "contract Tee {} pragma solidity >=0.0;"}
-	});
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	BOOST_CHECK(c.compile());
-}
-
-BOOST_AUTO_TEST_CASE(context_dependent_remappings)
-{
-	CompilerStack c;
-	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"a", "s", "s_1.4.6"}, {"b", "s", "s_1.4.7"}});
-	c.setSources({
-		{"a/a.sol", "import \"s/s.sol\"; contract A is SSix {} pragma solidity >=0.0;"},
-		{"b/b.sol", "import \"s/s.sol\"; contract B is SSeven {} pragma solidity >=0.0;"},
-		{"s_1.4.6/s.sol", "contract SSix {} pragma solidity >=0.0;"},
-		{"s_1.4.7/s.sol", "contract SSeven {} pragma solidity >=0.0;"}
-	});
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	BOOST_CHECK(c.compile());
-}
-
-BOOST_AUTO_TEST_CASE(context_dependent_remappings_ensure_default_and_module_preserved)
-{
-	CompilerStack c;
-	c.setRemappings(std::vector<ImportRemapper::Remapping>{
-		{"", "foo", "vendor/foo_2.0.0"},
-		{"vendor/bar", "foo", "vendor/foo_1.0.0"},
-		{"", "bar", "vendor/bar"}
-	});
-	c.setSources({
-		{"main.sol", "import \"foo/foo.sol\"; import {Bar} from \"bar/bar.sol\"; contract Main is Foo2, Bar {} pragma solidity >=0.0;"},
-		{"vendor/bar/bar.sol", "import \"foo/foo.sol\"; contract Bar {Foo1 foo;} pragma solidity >=0.0;"},
-		{"vendor/foo_1.0.0/foo.sol", "contract Foo1 {} pragma solidity >=0.0;"},
-		{"vendor/foo_2.0.0/foo.sol", "contract Foo2 {} pragma solidity >=0.0;"}
-	});
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	BOOST_CHECK(c.compile());
-}
-
-BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_1)
-{
-	CompilerStack c;
-	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"a", "x/y/z", "d"}, {"a/b", "x", "e"}});
-	c.setSources({
-		{"a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"},
-		{"a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"},
-		{"d/z.sol", "contract D {} pragma solidity >=0.0;"},
-		{"e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"}
-	});
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	BOOST_CHECK(c.compile());
-}
-
-BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_2)
-{
-	CompilerStack c;
-	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"a/b", "x", "e"}, {"a", "x/y/z", "d"}});
-	c.setSources({
-		{"a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"},
-		{"a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"},
-		{"d/z.sol", "contract D {} pragma solidity >=0.0;"},
-		{"e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"}
-	});
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	BOOST_CHECK(c.compile());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
deleted file mode 100644
index 1c848d600d01..000000000000
--- a/test/libsolidity/InlineAssembly.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Unit tests for inline assembly.
- */
-
-#include <test/Common.h>
-
-#include <test/libsolidity/ErrorCheck.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <libyul/YulStack.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libevmasm/Assembly.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <memory>
-#include <optional>
-#include <string>
-
-using namespace solidity::langutil;
-using namespace solidity::yul;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-
-std::optional<Error> parseAndReturnFirstError(
-	std::string const& _source,
-	bool _assemble = false,
-	bool _allowWarnings = true,
-	YulStack::Language _language = YulStack::Language::Assembly,
-	YulStack::Machine _machine = YulStack::Machine::EVM
-)
-{
-	YulStack stack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		_language,
-		solidity::frontend::OptimiserSettings::none(),
-		DebugInfoSelection::None()
-	);
-	bool success = false;
-	try
-	{
-		success = stack.parseAndAnalyze("", _source);
-		if (success && _assemble)
-			stack.assemble(_machine);
-	}
-	catch (FatalError const&)
-	{
-		BOOST_FAIL("Fatal error leaked.");
-		success = false;
-	}
-	std::shared_ptr<Error const> error;
-	for (auto const& e: stack.errors())
-	{
-		if (_allowWarnings && e->type() == Error::Type::Warning)
-			continue;
-		if (error)
-			BOOST_FAIL(
-				"Found more than one error:\n" +
-				SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack)
-			);
-		error = e;
-	}
-	if (!success)
-		BOOST_REQUIRE(error);
-	if (error)
-		return *error;
-	return {};
-}
-
-bool successParse(
-	std::string const& _source,
-	bool _assemble = false,
-	bool _allowWarnings = true,
-	YulStack::Language _language = YulStack::Language::Assembly,
-	YulStack::Machine _machine = YulStack::Machine::EVM
-)
-{
-	return !parseAndReturnFirstError(_source, _assemble, _allowWarnings, _language, _machine);
-}
-
-bool successAssemble(std::string const& _source, bool _allowWarnings = true, YulStack::Language _language = YulStack::Language::Assembly)
-{
-	return
-		successParse(_source, true, _allowWarnings, _language, YulStack::Machine::EVM);
-}
-
-Error expectError(
-	std::string const& _source,
-	bool _assemble,
-	bool _allowWarnings = false,
-	YulStack::Language _language = YulStack::Language::Assembly
-)
-{
-
-	auto error = parseAndReturnFirstError(_source, _assemble, _allowWarnings, _language);
-	BOOST_REQUIRE(error);
-	return *error;
-}
-
-void parsePrintCompare(std::string const& _source, bool _canWarn = false)
-{
-	YulStack stack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		YulStack::Language::Assembly,
-		OptimiserSettings::none(),
-		DebugInfoSelection::None()
-	);
-	BOOST_REQUIRE(stack.parseAndAnalyze("", _source));
-	if (_canWarn)
-		BOOST_REQUIRE(!Error::containsErrors(stack.errors()));
-	else
-		BOOST_REQUIRE(stack.errors().empty());
-	std::string expectation = "object \"object\" {\n    code " + boost::replace_all_copy(_source, "\n", "\n    ") + "\n}\n";
-	BOOST_CHECK_EQUAL(stack.print(), expectation);
-}
-
-}
-
-#define CHECK_ERROR_LANG(text, assemble, typ, substring, warnings, language) \
-do \
-{ \
-	Error err = expectError((text), (assemble), warnings, (language)); \
-	BOOST_CHECK(err.type() == (Error::Type::typ)); \
-	BOOST_CHECK(searchErrorMessage(err, (substring))); \
-} while(0)
-
-#define CHECK_ERROR(text, assemble, typ, substring, warnings) \
-CHECK_ERROR_LANG(text, assemble, typ, substring, warnings, YulStack::Language::Assembly)
-
-#define CHECK_PARSE_ERROR(text, type, substring) \
-CHECK_ERROR(text, false, type, substring, false)
-
-#define CHECK_PARSE_WARNING(text, type, substring) \
-CHECK_ERROR(text, false, type, substring, false)
-
-#define CHECK_ASSEMBLE_ERROR(text, type, substring) \
-CHECK_ERROR(text, true, type, substring, false)
-
-#define CHECK_STRICT_ERROR(text, type, substring) \
-CHECK_ERROR_LANG(text, false, type, substring, false, YulStack::Language::StrictAssembly)
-
-#define CHECK_STRICT_WARNING(text, type, substring) \
-CHECK_ERROR(text, false, type, substring, false, YulStack::Language::StrictAssembly)
-
-#define SUCCESS_STRICT(text) \
-do { successParse((text), false, false, YulStack::Language::StrictAssembly); } while (false)
-
-
-BOOST_AUTO_TEST_SUITE(SolidityInlineAssembly)
-
-BOOST_AUTO_TEST_SUITE(Printing) // {{{
-
-BOOST_AUTO_TEST_CASE(print_smoke)
-{
-	parsePrintCompare("{ }");
-}
-
-BOOST_AUTO_TEST_CASE(print_instructions)
-{
-	parsePrintCompare("{ pop(7) }");
-}
-
-BOOST_AUTO_TEST_CASE(print_subblock)
-{
-	parsePrintCompare("{ { pop(7) } }");
-}
-
-BOOST_AUTO_TEST_CASE(print_functional)
-{
-	parsePrintCompare("{ let x := mul(sload(0x12), 7) }");
-}
-
-BOOST_AUTO_TEST_CASE(print_assignments)
-{
-	parsePrintCompare("{\n    let x := mul(2, 3)\n    pop(7)\n    x := add(1, 2)\n}");
-}
-
-BOOST_AUTO_TEST_CASE(print_multi_assignments)
-{
-	parsePrintCompare("{\n    function f() -> x, y\n    { }\n    let x, y := f()\n}");
-}
-
-BOOST_AUTO_TEST_CASE(print_string_literals)
-{
-	parsePrintCompare("{ let x := \"\\n'\\xab\\x95\\\"\" }");
-}
-
-BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
-{
-	std::string source = "{ let x := \"\\u1bac\" }";
-	std::string parsed = "object \"object\" {\n    code { let x := \"\\xe1\\xae\\xac\" }\n}\n";
-	YulStack stack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		YulStack::Language::Assembly,
-		OptimiserSettings::none(),
-		DebugInfoSelection::None()
-	);
-	BOOST_REQUIRE(stack.parseAndAnalyze("", source));
-	BOOST_REQUIRE(stack.errors().empty());
-	BOOST_CHECK_EQUAL(stack.print(), parsed);
-
-	std::string parsedInner = "{ let x := \"\\xe1\\xae\\xac\" }";
-	parsePrintCompare(parsedInner);
-}
-
-BOOST_AUTO_TEST_CASE(print_if)
-{
-	parsePrintCompare("{ if 2 { pop(mload(0)) } }");
-}
-
-BOOST_AUTO_TEST_CASE(print_switch)
-{
-	parsePrintCompare("{\n    switch 42\n    case 1 { }\n    case 2 { }\n    default { }\n}");
-}
-
-BOOST_AUTO_TEST_CASE(print_for)
-{
-	parsePrintCompare("{\n    let ret := 5\n    for { let i := 1 } lt(i, 15) { i := add(i, 1) }\n    { ret := mul(ret, i) }\n}");
-}
-
-BOOST_AUTO_TEST_CASE(function_definitions_multiple_args)
-{
-	parsePrintCompare("{\n    function f(a, d)\n    { mstore(a, d) }\n    function g(a, d) -> x, y\n    { }\n}");
-}
-
-BOOST_AUTO_TEST_CASE(function_calls)
-{
-	std::string source = R"({
-	function y()
-	{ }
-	function f(a) -> b
-	{ }
-	function g(a, b, c)
-	{ }
-	g(1, mul(2, address()), f(mul(2, caller())))
-	y()
-})";
-	boost::replace_all(source, "\t", "    ");
-	parsePrintCompare(source);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-// }}}
-
-BOOST_AUTO_TEST_SUITE(Analysis) // {{{
-
-BOOST_AUTO_TEST_CASE(string_literals)
-{
-	BOOST_CHECK(successAssemble("{ let x := \"12345678901234567890123456789012\" }"));
-}
-
-BOOST_AUTO_TEST_CASE(oversize_string_literals)
-{
-	CHECK_ASSEMBLE_ERROR("{ let x := \"123456789012345678901234567890123\" }", TypeError, "String literal too long");
-}
-
-BOOST_AUTO_TEST_CASE(magic_variables)
-{
-	CHECK_ASSEMBLE_ERROR("{ pop(this) }", DeclarationError, "Identifier \"this\" not found");
-	CHECK_ASSEMBLE_ERROR("{ pop(ecrecover) }", DeclarationError, "Identifier \"ecrecover\" not found");
-	BOOST_CHECK(successAssemble("{ let ecrecover := 1 pop(ecrecover) }"));
-}
-
-BOOST_AUTO_TEST_CASE(stack_variables)
-{
-	BOOST_CHECK(successAssemble("{ let y := 3 { let z := 2 { let x := y } } }"));
-}
-
-BOOST_AUTO_TEST_CASE(designated_invalid_instruction)
-{
-	BOOST_CHECK(successAssemble("{ invalid() }"));
-}
-
-BOOST_AUTO_TEST_CASE(inline_assembly_shadowed_instruction_declaration)
-{
-	CHECK_ASSEMBLE_ERROR("{ let gas := 1 }", ParserError, "Cannot use builtin");
-}
-
-BOOST_AUTO_TEST_CASE(revert)
-{
-	BOOST_CHECK(successAssemble("{ revert(0, 0) }"));
-}
-
-BOOST_AUTO_TEST_CASE(large_constant)
-{
-	auto source = R"({
-		switch mul(1, 2)
-		case 0x0000000000000000000000000000000000000000000000000000000026121ff0 {
-		}
-	})";
-	BOOST_CHECK(successAssemble(source));
-}
-
-BOOST_AUTO_TEST_CASE(keccak256)
-{
-	BOOST_CHECK(successAssemble("{ pop(keccak256(0, 0)) }"));
-}
-
-BOOST_AUTO_TEST_CASE(returndatasize)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-		return;
-	BOOST_CHECK(successAssemble("{ let r := returndatasize() }"));
-}
-
-BOOST_AUTO_TEST_CASE(returndatacopy)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-		return;
-	BOOST_CHECK(successAssemble("{ returndatacopy(0, 32, 64) }"));
-}
-
-BOOST_AUTO_TEST_CASE(staticcall)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-		return;
-	BOOST_CHECK(successAssemble("{ pop(staticcall(10000, 0x123, 64, 0x10, 128, 0x10)) }"));
-}
-
-BOOST_AUTO_TEST_CASE(create2)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().hasCreate2())
-		return;
-	BOOST_CHECK(successAssemble("{ pop(create2(10, 0x123, 32, 64)) }"));
-}
-
-BOOST_AUTO_TEST_CASE(shift)
-{
-	if (!solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
-		return;
-	BOOST_CHECK(successAssemble("{ pop(shl(10, 32)) }"));
-	BOOST_CHECK(successAssemble("{ pop(shr(10, 32)) }"));
-	BOOST_CHECK(successAssemble("{ pop(sar(10, 32)) }"));
-}
-
-BOOST_AUTO_TEST_CASE(shift_constantinople_warning)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
-		return;
-	CHECK_PARSE_WARNING("{ shl(10, 32) }", TypeError, "The \"shl\" instruction is only available for Constantinople-compatible VMs");
-	CHECK_PARSE_WARNING("{ shr(10, 32) }", TypeError, "The \"shr\" instruction is only available for Constantinople-compatible VMs");
-	CHECK_PARSE_WARNING("{ sar(10, 32) }", TypeError, "The \"sar\" instruction is only available for Constantinople-compatible VMs");
-}
-
-BOOST_AUTO_TEST_SUITE_END() // }}}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/LibSolc.cpp b/test/libsolidity/LibSolc.cpp
deleted file mode 100644
index 1a7a6ba69633..000000000000
--- a/test/libsolidity/LibSolc.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Unit tests for libsolc/libsolc.cpp.
- */
-
-#include <string>
-#include <boost/test/unit_test.hpp>
-#include <libsolutil/JSON.h>
-#include <libsolidity/interface/ReadFile.h>
-#include <libsolidity/interface/Version.h>
-#include <libsolc/libsolc.h>
-
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-
-/// TODO: share this between StandardCompiler.cpp
-/// Helper to match a specific error type and message
-bool containsError(Json::Value const& _compilerResult, std::string const& _type, std::string const& _message)
-{
-	if (!_compilerResult.isMember("errors"))
-		return false;
-
-	for (auto const& error: _compilerResult["errors"])
-	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["type"].isString());
-		BOOST_REQUIRE(error["message"].isString());
-		if ((error["type"].asString() == _type) && (error["message"].asString() == _message))
-			return true;
-	}
-
-	return false;
-}
-
-Json::Value compile(std::string const& _input, CStyleReadFileCallback _callback = nullptr)
-{
-	char* output_ptr = solidity_compile(_input.c_str(), _callback, nullptr);
-	std::string output(output_ptr);
-	solidity_free(output_ptr);
-	solidity_reset();
-	Json::Value ret;
-	BOOST_REQUIRE(util::jsonParseStrict(output, ret));
-	return ret;
-}
-
-char* stringToSolidity(std::string const& _input)
-{
-	char* ptr = solidity_alloc(_input.length());
-	BOOST_REQUIRE(ptr != nullptr);
-	std::memcpy(ptr, _input.c_str(), _input.length());
-	return ptr;
-}
-
-} // end anonymous namespace
-
-BOOST_AUTO_TEST_SUITE(LibSolc)
-
-BOOST_AUTO_TEST_CASE(read_version)
-{
-	std::string output(solidity_version());
-	BOOST_CHECK(output.find(VersionString) == 0);
-}
-
-BOOST_AUTO_TEST_CASE(read_license)
-{
-	std::string output(solidity_license());
-	BOOST_CHECK(output.find("GNU GENERAL PUBLIC LICENSE") != std::string::npos);
-}
-
-BOOST_AUTO_TEST_CASE(standard_compilation)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_REQUIRE(result.isObject());
-
-	// Only tests some assumptions. The StandardCompiler is tested properly in another suite.
-	BOOST_CHECK(result.isMember("sources"));
-	// This used to test that it is a member, but we did not actually request any output,
-	// so there should not be a contract member.
-	BOOST_CHECK(!result.isMember("contracts"));
-}
-
-BOOST_AUTO_TEST_CASE(missing_callback)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"fileA": {
-				"content": "import \"missing.sol\"; contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_REQUIRE(result.isObject());
-
-	BOOST_CHECK(containsError(result, "ParserError", "Source \"missing.sol\" not found: File not supplied initially."));
-}
-
-BOOST_AUTO_TEST_CASE(with_callback)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"fileA": {
-				"content": "import \"found.sol\"; import \"notfound.sol\"; contract A { }"
-			}
-		}
-	}
-	)";
-
-	CStyleReadFileCallback callback{
-		[](void* _context, char const* _kind, char const* _path, char** o_contents, char** o_error)
-		{
-			// Passed in a nullptr in the compile() helper above.
-			BOOST_REQUIRE(_context == nullptr);
-			// Caller frees the pointers.
-			BOOST_REQUIRE(std::string(_kind) == ReadCallback::kindString(ReadCallback::Kind::ReadFile));
-			if (std::string(_path) == "found.sol")
-			{
-				static std::string content{"import \"missing.sol\"; contract B {}"};
-				*o_contents = stringToSolidity(content);
-				*o_error = nullptr;
-			}
-			else if (std::string(_path) == "missing.sol")
-			{
-				static std::string errorMsg{"Missing file."};
-				*o_error = stringToSolidity(errorMsg);
-				*o_contents = nullptr;
-			}
-			else
-			{
-				*o_error = nullptr;
-				*o_contents = nullptr;
-			}
-		}
-	};
-
-	Json::Value result = compile(input, callback);
-	BOOST_REQUIRE(result.isObject());
-
-	// This ensures that "found.sol" was properly loaded which triggered the second import statement.
-	BOOST_CHECK(containsError(result, "ParserError", "Source \"missing.sol\" not found: Missing file."));
-
-	// This should be placed due to the missing "notfound.sol" which sets both pointers to null.
-	BOOST_CHECK(containsError(result, "ParserError", "Source \"notfound.sol\" not found: Callback not supported."));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
deleted file mode 100644
index 2d8cc564bd07..000000000000
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/MemoryGuardTest.h>
-
-#include <test/libyul/Common.h>
-#include <libsolidity/codegen/ir/Common.h>
-#include <libsolutil/Algorithms.h>
-#include <libyul/Object.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/optimiser/FunctionCallFinder.h>
-#include <fstream>
-#include <memory>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::util::formatting;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace yul;
-
-void MemoryGuardTest::setupCompiler(CompilerStack& _compiler)
-{
-	AnalysisFramework::setupCompiler(_compiler);
-
-	_compiler.setViaIR(true);
-	_compiler.setOptimiserSettings(OptimiserSettings::none());
-}
-
-TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
-{
-	if (!runFramework(m_source, PipelineStage::Compilation))
-	{
-		_stream << formatErrors(filteredErrors(), _formatted);
-		return TestResult::FatalError;
-	}
-
-	m_obtainedResult.clear();
-	for (std::string contractName: compiler().contractNames())
-	{
-		ErrorList errors;
-		auto [object, analysisInfo] = yul::test::parse(
-			compiler().yulIR(contractName),
-			EVMDialect::strictAssemblyForEVMObjects({}),
-			errors
-		);
-
-		if (!object || !analysisInfo || Error::containsErrors(errors))
-		{
-			AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing IR." << std::endl;
-			return TestResult::FatalError;
-		}
-
-		auto handleObject = [&](std::string const& _kind, Object const& _object) {
-			m_obtainedResult += contractName + "(" + _kind + ") " + (FunctionCallFinder::run(
-				*_object.code,
-				"memoryguard"_yulstring
-			).empty() ? "false" : "true") + "\n";
-		};
-		handleObject("creation", *object);
-		size_t deployedIndex = object->subIndexByName.at(
-			YulString(IRNames::deployedObject(compiler().contractDefinition(contractName)))
-		);
-		handleObject("runtime", dynamic_cast<Object const&>(*object->subObjects[deployedIndex]));
-	}
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libsolidity/MemoryGuardTest.h b/test/libsolidity/MemoryGuardTest.h
deleted file mode 100644
index ec6fe5e5b907..000000000000
--- a/test/libsolidity/MemoryGuardTest.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/TestCase.h>
-#include <test/CommonSyntaxTest.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/AnsiColorized.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend::test
-{
-
-using solidity::test::SyntaxTestError;
-
-class MemoryGuardTest: public AnalysisFramework, public TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<MemoryGuardTest>(_config.filename);
-	}
-	MemoryGuardTest(std::string const& _filename): TestCase(_filename)
-	{
-		m_source = m_reader.source();
-		m_expectation = m_reader.simpleExpectations();
-	}
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
-
-protected:
-	void setupCompiler(CompilerStack& _compiler) override;
-};
-
-}
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
deleted file mode 100644
index 029419af11c5..000000000000
--- a/test/libsolidity/Metadata.cpp
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- */
-/**
- * @date 2017
- * Unit tests for the metadata output.
- */
-
-#include <test/Metadata.h>
-#include <test/Common.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/Version.h>
-#include <libsolutil/SwarmHash.h>
-#include <libsolutil/IpfsHash.h>
-#include <libsolutil/JSON.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-
-std::map<std::string, std::string> requireParsedCBORMetadata(bytes const& _bytecode, CompilerStack::MetadataFormat _metadataFormat)
-{
-	bytes cborMetadata = solidity::test::onlyMetadata(_bytecode);
-	if (_metadataFormat != CompilerStack::MetadataFormat::NoMetadata)
-	{
-		BOOST_REQUIRE(!cborMetadata.empty());
-		std::optional<std::map<std::string, std::string>> tmp = solidity::test::parseCBORMetadata(cborMetadata);
-		BOOST_REQUIRE(tmp);
-		return *tmp;
-	}
-	BOOST_REQUIRE(cborMetadata.empty());
-	return {};
-}
-
-std::optional<std::string> compileAndCheckLicenseMetadata(std::string const& _contractName, char const* _sourceCode)
-{
-	CompilerStack compilerStack;
-	compilerStack.setSources({{"A.sol", _sourceCode}});
-	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-
-	std::string const& serialisedMetadata = compilerStack.metadata(_contractName);
-	Json::Value metadata;
-	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
-	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-	BOOST_CHECK_EQUAL(metadata["sources"].size(), 1);
-	BOOST_REQUIRE(metadata["sources"].isMember("A.sol"));
-
-	if (metadata["sources"]["A.sol"].isMember("license"))
-	{
-		BOOST_REQUIRE(metadata["sources"]["A.sol"]["license"].isString());
-		return metadata["sources"]["A.sol"]["license"].asString();
-	}
-	else
-		return std::nullopt;
-}
-
-}
-
-BOOST_AUTO_TEST_SUITE(Metadata)
-
-BOOST_AUTO_TEST_CASE(metadata_stamp)
-{
-	// Check that the metadata stamp is at the end of the runtime bytecode.
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		pragma experimental __testOnlyAnalysis;
-		contract test {
-			function g(function(uint) external returns (uint) x) public {}
-		}
-	)";
-	for (auto metadataFormat: std::set<CompilerStack::MetadataFormat>{
-		CompilerStack::MetadataFormat::NoMetadata,
-		CompilerStack::MetadataFormat::WithReleaseVersionTag,
-		CompilerStack::MetadataFormat::WithPrereleaseVersionTag
-	})
-		for (auto metadataHash: std::set<CompilerStack::MetadataHash>{
-			CompilerStack::MetadataHash::IPFS,
-			CompilerStack::MetadataHash::Bzzr1,
-			CompilerStack::MetadataHash::None
-		})
-		{
-			CompilerStack compilerStack;
-			compilerStack.setMetadataFormat(metadataFormat);
-			compilerStack.setSources({{"", sourceCode}});
-			compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-			compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-			compilerStack.setMetadataHash(metadataHash);
-			BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-			bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-			std::string const& metadata = compilerStack.metadata("test");
-			BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-			auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
-			if (metadataHash == CompilerStack::MetadataHash::None)
-				BOOST_CHECK(cborMetadata.size() == (metadataFormat == CompilerStack::MetadataFormat::NoMetadata ? 0 : 1));
-			else
-			{
-				bytes hash;
-				std::string hashMethod;
-				if (metadataHash == CompilerStack::MetadataHash::IPFS)
-				{
-					hash = util::ipfsHash(metadata);
-					BOOST_REQUIRE(hash.size() == 34);
-					hashMethod = "ipfs";
-				}
-				else
-				{
-					hash = util::bzzr1Hash(metadata).asBytes();
-					BOOST_REQUIRE(hash.size() == 32);
-					hashMethod = "bzzr1";
-				}
-
-				if (metadataFormat != CompilerStack::MetadataFormat::NoMetadata)
-				{
-					BOOST_CHECK(cborMetadata.size() == 2);
-					BOOST_CHECK(cborMetadata.count(hashMethod) == 1);
-					BOOST_CHECK(cborMetadata.at(hashMethod) == util::toHex(hash));
-				}
-			}
-
-			if (metadataFormat == CompilerStack::MetadataFormat::NoMetadata)
-				BOOST_CHECK(cborMetadata.count("solc") == 0);
-			else
-			{
-				BOOST_CHECK(cborMetadata.count("solc") == 1);
-				if (metadataFormat == CompilerStack::MetadataFormat::WithReleaseVersionTag)
-					BOOST_CHECK(cborMetadata.at("solc") == util::toHex(VersionCompactBytes));
-				else
-					BOOST_CHECK(cborMetadata.at("solc") == VersionStringStrict);
-			}
-		}
-}
-
-BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
-{
-	// Check that the metadata stamp is at the end of the runtime bytecode.
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		pragma experimental __test;
-		contract test {
-			function g(function(uint) external returns (uint) x) public {}
-		}
-	)";
-	for (auto metadataFormat: std::set<CompilerStack::MetadataFormat>{
-			CompilerStack::MetadataFormat::NoMetadata,
-			CompilerStack::MetadataFormat::WithReleaseVersionTag,
-			CompilerStack::MetadataFormat::WithPrereleaseVersionTag
-	})
-		for (auto metadataHash: std::set<CompilerStack::MetadataHash>{
-			CompilerStack::MetadataHash::IPFS,
-			CompilerStack::MetadataHash::Bzzr1,
-			CompilerStack::MetadataHash::None
-		})
-		{
-			CompilerStack compilerStack;
-			compilerStack.setMetadataFormat(metadataFormat);
-			compilerStack.setSources({{"", sourceCode}});
-			compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-			compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-			compilerStack.setMetadataHash(metadataHash);
-			BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-			bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-			std::string const& metadata = compilerStack.metadata("test");
-			BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-			auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
-			if (metadataHash == CompilerStack::MetadataHash::None)
-				BOOST_CHECK(cborMetadata.size() == (metadataFormat == CompilerStack::MetadataFormat::NoMetadata ? 0 : 2));
-			else
-			{
-				bytes hash;
-				std::string hashMethod;
-				if (metadataHash == CompilerStack::MetadataHash::IPFS)
-				{
-					hash = util::ipfsHash(metadata);
-					BOOST_REQUIRE(hash.size() == 34);
-					hashMethod = "ipfs";
-				}
-				else
-				{
-					hash = util::bzzr1Hash(metadata).asBytes();
-					BOOST_REQUIRE(hash.size() == 32);
-					hashMethod = "bzzr1";
-				}
-
-				if (metadataFormat != CompilerStack::MetadataFormat::NoMetadata)
-				{
-					BOOST_CHECK(cborMetadata.size() == 3);
-					BOOST_CHECK(cborMetadata.count(hashMethod) == 1);
-					BOOST_CHECK(cborMetadata.at(hashMethod) == util::toHex(hash));
-				}
-			}
-
-			if (metadataFormat == CompilerStack::MetadataFormat::NoMetadata)
-				BOOST_CHECK(cborMetadata.count("solc") == 0);
-			else
-			{
-				BOOST_CHECK(cborMetadata.count("solc") == 1);
-				if (metadataFormat == CompilerStack::MetadataFormat::WithReleaseVersionTag)
-					BOOST_CHECK(cborMetadata.at("solc") == util::toHex(VersionCompactBytes));
-				else
-					BOOST_CHECK(cborMetadata.at("solc") == VersionStringStrict);
-				BOOST_CHECK(cborMetadata.count("experimental") == 1);
-				BOOST_CHECK(cborMetadata.at("experimental") == "true");
-			}
-		}
-}
-
-BOOST_AUTO_TEST_CASE(metadata_eof_experimental)
-{
-	// Check that setting an EOF version results in the experimental flag being set.
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		contract test {
-			function g(function(uint) external returns (uint) x) public {}
-		}
-	)";
-	for (auto metadataFormat: std::set<CompilerStack::MetadataFormat>{
-		CompilerStack::MetadataFormat::NoMetadata,
-		CompilerStack::MetadataFormat::WithReleaseVersionTag,
-		CompilerStack::MetadataFormat::WithPrereleaseVersionTag
-	})
-	{
-		CompilerStack compilerStack;
-		compilerStack.setMetadataFormat(metadataFormat);
-		compilerStack.setSources({{"", sourceCode}});
-		compilerStack.setEVMVersion({});
-		compilerStack.setViaIR(true);
-		compilerStack.setEOFVersion(1);
-		compilerStack.setOptimiserSettings(true);
-		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-		bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-		std::string const& metadata = compilerStack.metadata("test");
-		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-		auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
-
-		if (metadataFormat == CompilerStack::MetadataFormat::NoMetadata)
-			BOOST_CHECK(cborMetadata.count("experimental") == 0);
-		else
-		{
-			BOOST_CHECK(cborMetadata.count("experimental") == 1);
-			BOOST_CHECK(cborMetadata.at("experimental") == "true");
-		}
-	}
-}
-
-BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
-{
-	CompilerStack compilerStack;
-	char const* sourceCodeA = R"(
-		pragma solidity >=0.0;
-		contract A {
-			function g(function(uint) external returns (uint) x) public {}
-		}
-	)";
-	char const* sourceCodeB = R"(
-		pragma solidity >=0.0;
-		contract B {
-			function g(function(uint) external returns (uint) x) public {}
-		}
-	)";
-	compilerStack.setSources({
-		{"A", sourceCodeA},
-		{"B", sourceCodeB},
-	});
-	compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-
-	std::string const& serialisedMetadata = compilerStack.metadata("A");
-	Json::Value metadata;
-	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
-	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-	BOOST_CHECK_EQUAL(metadata["sources"].size(), 1);
-	BOOST_CHECK(metadata["sources"].isMember("A"));
-}
-
-BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
-{
-	CompilerStack compilerStack;
-	char const* sourceCodeA = R"(
-		pragma solidity >=0.0;
-		contract A {
-			function g(function(uint) external returns (uint) x) public virtual {}
-		}
-	)";
-	char const* sourceCodeB = R"(
-		pragma solidity >=0.0;
-		import "./A";
-		contract B is A {
-			function g(function(uint) external returns (uint) x) public virtual override {}
-		}
-	)";
-	char const* sourceCodeC = R"(
-		pragma solidity >=0.0;
-		import "./B";
-		contract C is B {
-			function g(function(uint) external returns (uint) x) public override {}
-		}
-	)";
-	compilerStack.setSources({
-		{"A", sourceCodeA},
-		{"B", sourceCodeB},
-		{"C", sourceCodeC}
-	});
-	compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-
-	std::string const& serialisedMetadata = compilerStack.metadata("C");
-	Json::Value metadata;
-	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
-	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-	BOOST_CHECK_EQUAL(metadata["sources"].size(), 3);
-	BOOST_CHECK(metadata["sources"].isMember("A"));
-	BOOST_CHECK(metadata["sources"].isMember("B"));
-	BOOST_CHECK(metadata["sources"].isMember("C"));
-}
-
-BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
-{
-	// Check that the metadata contains "useLiteralContent"
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		contract test {
-		}
-	)";
-
-	auto check = [](char const* _src, bool _literal)
-	{
-		CompilerStack compilerStack;
-		compilerStack.setSources({{"", _src}});
-		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-		compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-		compilerStack.useMetadataLiteralSources(_literal);
-		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-		std::string metadata_str = compilerStack.metadata("test");
-		Json::Value metadata;
-		BOOST_REQUIRE(util::jsonParseStrict(metadata_str, metadata));
-		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-		BOOST_CHECK(metadata.isMember("settings"));
-		BOOST_CHECK(metadata["settings"].isMember("metadata"));
-		BOOST_CHECK(metadata["settings"]["metadata"].isMember("bytecodeHash"));
-		if (_literal)
-		{
-			BOOST_CHECK(metadata["settings"]["metadata"].isMember("useLiteralContent"));
-			BOOST_CHECK(metadata["settings"]["metadata"]["useLiteralContent"].asBool());
-		}
-	};
-
-	check(sourceCode, true);
-	check(sourceCode, false);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_viair)
-{
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		contract test {
-		}
-	)";
-
-	auto check = [](char const* _src, bool _viaIR)
-	{
-		CompilerStack compilerStack;
-		compilerStack.setSources({{"", _src}});
-		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-		compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-		compilerStack.setViaIR(_viaIR);
-		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-
-		Json::Value metadata;
-		BOOST_REQUIRE(util::jsonParseStrict(compilerStack.metadata("test"), metadata));
-		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-		BOOST_CHECK(metadata.isMember("settings"));
-		if (_viaIR)
-		{
-			BOOST_CHECK(metadata["settings"].isMember("viaIR"));
-			BOOST_CHECK(metadata["settings"]["viaIR"].asBool());
-		}
-		else
-			BOOST_CHECK(!metadata["settings"].isMember("viaIR"));
-
-		BOOST_CHECK(compilerStack.cborMetadata("test") == compilerStack.cborMetadata("test", _viaIR));
-		BOOST_CHECK(compilerStack.cborMetadata("test") != compilerStack.cborMetadata("test", !_viaIR));
-
-		std::map<std::string, std::string> const parsedCBORMetadata = requireParsedCBORMetadata(
-			compilerStack.runtimeObject("test").bytecode,
-			CompilerStack::MetadataFormat::WithReleaseVersionTag
-		);
-
-		BOOST_CHECK(parsedCBORMetadata.count("experimental") == 0);
-	};
-
-	check(sourceCode, true);
-	check(sourceCode, false);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_revert_strings)
-{
-	CompilerStack compilerStack;
-	char const* sourceCodeA = R"(
-		pragma solidity >=0.0;
-		contract A {
-		}
-	)";
-	compilerStack.setSources({{"A", sourceCodeA}});
-	compilerStack.setRevertStringBehaviour(RevertStrings::Strip);
-	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-
-	std::string const& serialisedMetadata = compilerStack.metadata("A");
-	Json::Value metadata;
-	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
-	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-
-	BOOST_CHECK_EQUAL(metadata["settings"]["debug"]["revertStrings"], "strip");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
-{
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		contract C {
-		}
-	)";
-
-	std::vector<std::tuple<std::string, std::string>> sequences =
-	{
-		// {"<optimizer sequence>", "<optimizer cleanup sequence>"}
-		{"", ""},
-		{"", "fDn"},
-		{"dhfoDgvulfnTUtnIf", "" },
-		{"dhfoDgvulfnTUtnIf", "fDn"}
-	};
-
-	auto check = [sourceCode](std::string const& _optimizerSequence, std::string const& _optimizerCleanupSequence)
-	{
-		OptimiserSettings optimizerSettings = OptimiserSettings::minimal();
-		optimizerSettings.runYulOptimiser = true;
-		optimizerSettings.yulOptimiserSteps = _optimizerSequence;
-		optimizerSettings.yulOptimiserCleanupSteps = _optimizerCleanupSequence;
-		CompilerStack compilerStack;
-		compilerStack.setSources({{"", sourceCode}});
-		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-		compilerStack.setOptimiserSettings(optimizerSettings);
-
-		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-
-		std::string const& serialisedMetadata = compilerStack.metadata("C");
-		Json::Value metadata;
-		BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
-		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-		BOOST_CHECK(metadata["settings"]["optimizer"].isMember("details"));
-		BOOST_CHECK(metadata["settings"]["optimizer"]["details"].isMember("yulDetails"));
-		BOOST_CHECK(metadata["settings"]["optimizer"]["details"]["yulDetails"].isMember("optimizerSteps"));
-
-		std::string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].asString();
-		std::string const expectedMetadataOptimiserSteps = _optimizerSequence + ":" + _optimizerCleanupSequence;
-		BOOST_CHECK_EQUAL(metadataOptimizerSteps, expectedMetadataOptimiserSteps);
-	};
-
-	for (auto const& [sequence, cleanupSequence] : sequences)
-		check(sequence, cleanupSequence);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_missing)
-{
-	char const* sourceCode = R"(
-		pragma solidity >=0.0;
-		contract C {
-		}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_gpl3)
-{
-	// Can't use a raw string here due to the stylechecker.
-	char const* sourceCode =
-		"// NOTE: we also add trailing whitespace after the license, to see it is trimmed.\n"
-		"// SPDX-License-Identifier: GPL-3.0    \n"
-		"pragma solidity >=0.0;\n"
-		"contract C {\n"
-		"}\n";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_whitespace_before_spdx)
-{
-	char const* sourceCode = R"(
-		//     SPDX-License-Identifier: GPL-3.0
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_whitespace_after_colon)
-{
-	char const* sourceCode = R"(
-		// SPDX-License-Identifier:    GPL-3.0
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_gpl3_or_apache2)
-{
-	char const* sourceCode = R"(
-		// SPDX-License-Identifier: GPL-3.0 OR Apache-2.0
-		pragma solidity >=0.0;
-		contract C {
-		}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0 OR Apache-2.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_bidi_marks)
-{
-	char const* sourceCode =
-		"// \xE2\x80\xAE""0.3-LPG :reifitnedI-esneciL-XDPS\xE2\x80\xAC\n"
-		"// NOTE: The text above is reversed using Unicode directional marks. In raw form it would look like this:\n"
-		"// <LRO>0.3-LPG :reifitnedI-esneciL-XDPS<PDF>\n"
-		"contract C {}\n";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_bottom)
-{
-	char const* sourceCode = R"(
-		contract C {}
-		// SPDX-License-Identifier: GPL-3.0
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_cr_endings)
-{
-	char const* sourceCode =
-		"// SPDX-License-Identifier: GPL-3.0\r"
-		"contract C {}\r";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_crlf_endings)
-{
-	char const* sourceCode =
-		"// SPDX-License-Identifier: GPL-3.0\r\n"
-		"contract C {}\r\n";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_in_string)
-{
-	char const* sourceCode = R"(
-		contract C {
-			bytes license = "// SPDX-License-Identifier: GPL-3.0";
-		}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_in_contract)
-{
-	char const* sourceCode = R"(
-		contract C {
-		// SPDX-License-Identifier: GPL-3.0
-		}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_missing_colon)
-{
-	char const* sourceCode = R"(
-		// SPDX-License-Identifier GPL-3.0
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_multiline)
-{
-	char const* sourceCode = R"(
-		/* SPDX-License-Identifier: GPL-3.0 */
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_natspec)
-{
-	char const* sourceCode = R"(
-		/// SPDX-License-Identifier: GPL-3.0
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_natspec_multiline)
-{
-	char const* sourceCode = R"(
-		/** SPDX-License-Identifier: GPL-3.0 */
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_no_whitespace_multiline)
-{
-	char const* sourceCode = R"(
-		/*SPDX-License-Identifier:GPL-3.0*/
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_nonempty_line)
-{
-	char const* sourceCode = R"(
-		pragma solidity >= 0.0; // SPDX-License-Identifier: GPL-3.0
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_CASE(metadata_license_no_whitespace)
-{
-	char const* sourceCode = R"(
-		//SPDX-License-Identifier:GPL-3.0
-		contract C {}
-	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == "GPL-3.0");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/NatspecJSONTest.cpp b/test/libsolidity/NatspecJSONTest.cpp
deleted file mode 100644
index 9f1ba1d7de00..000000000000
--- a/test/libsolidity/NatspecJSONTest.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- */
-/**
- * Unit tests for the solidity compiler ABI JSON Interface output.
- */
-
-#include <test/libsolidity/NatspecJSONTest.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <fmt/format.h>
-
-#include <vector>
-
-using namespace solidity::frontend::test;
-using namespace solidity::util;
-using namespace std::string_literals;
-
-std::ostream& solidity::frontend::test::operator<<(std::ostream& _output, NatspecJSONKind _kind)
-{
-	switch (_kind) {
-	case NatspecJSONKind::Devdoc: _output << "devdoc"; break;
-	case NatspecJSONKind::Userdoc: _output << "userdoc"; break;
-	}
-	return _output;
-}
-
-std::unique_ptr<TestCase> NatspecJSONTest::create(Config const& _config)
-{
-	return std::make_unique<NatspecJSONTest>(_config.filename, _config.evmVersion);
-}
-
-void NatspecJSONTest::parseCustomExpectations(std::istream& _stream)
-{
-	soltestAssert(m_expectedNatspecJSON.empty());
-
-	// We expect a series of expectations in the following format:
-	//
-	//     // <qualified contract name> <devdoc|userdoc>
-	//     // <json>
-
-	std::string line;
-	while (getline(_stream, line))
-	{
-		std::string_view strippedLine = expectLinePrefix(line);
-		if (strippedLine.empty())
-			continue;
-
-		auto [contractName, kind] = parseExpectationHeader(strippedLine);
-
-		std::string rawJSON = extractExpectationJSON(_stream);
-		std::string jsonErrors;
-		Json::Value parsedJSON;
-		bool jsonParsingSuccessful = jsonParseStrict(rawJSON, parsedJSON, &jsonErrors);
-		if (!jsonParsingSuccessful)
-			BOOST_THROW_EXCEPTION(std::runtime_error(fmt::format(
-				"Malformed JSON in {} expectation for contract {}.\n"
-				"Note that JSON expectations must be pretty-printed to be split correctly. "
-				"The object is assumed to and at the first unindented closing brace.\n"
-				"{}",
-				toString(kind),
-				contractName,
-				rawJSON
-			)));
-
-		m_expectedNatspecJSON[std::string(contractName)][kind] = parsedJSON;
-	}
-}
-
-bool NatspecJSONTest::expectationsMatch()
-{
-	// NOTE: Comparing pretty printed Json::Values to avoid using its operator==, which fails to
-	// compare equal numbers as equal. For example, for 'version' field the value is sometimes int,
-	// sometimes uint and they compare as different even when both are 1.
-	return
-		SyntaxTest::expectationsMatch() &&
-		prettyPrinted(obtainedNatspec()) == prettyPrinted(m_expectedNatspecJSON);
-}
-
-void NatspecJSONTest::printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
-{
-	SyntaxTest::printExpectedResult(_stream, _linePrefix, _formatted);
-	if (!m_expectedNatspecJSON.empty())
-	{
-		_stream << _linePrefix << "----" << std::endl;
-		printPrefixed(_stream, formatNatspecExpectations(m_expectedNatspecJSON), _linePrefix);
-	}
-
-}
-
-void NatspecJSONTest::printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
-{
-	SyntaxTest::printObtainedResult(_stream, _linePrefix, _formatted);
-
-	NatspecMap natspecJSON = obtainedNatspec();
-	if (!natspecJSON.empty())
-	{
-		_stream << _linePrefix << "----" << std::endl;
-		// TODO: Diff both versions and highlight differences.
-		// We should have a helper for doing that in newly defined test cases without much effort.
-		printPrefixed(_stream, formatNatspecExpectations(natspecJSON), _linePrefix);
-	}
-}
-
-std::tuple<std::string_view, NatspecJSONKind> NatspecJSONTest::parseExpectationHeader(std::string_view _line)
-{
-	for (NatspecJSONKind kind: {NatspecJSONKind::Devdoc, NatspecJSONKind::Userdoc})
-	{
-		std::string kindSuffix = " " + toString(kind);
-		if (boost::algorithm::ends_with(_line, kindSuffix))
-			return {_line.substr(0, _line.size() - kindSuffix.size()), kind};
-	}
-
-	BOOST_THROW_EXCEPTION(std::runtime_error(
-		"Natspec kind (devdoc/userdoc) not present in the expectation: "s.append(_line)
-	));
-}
-
-std::string NatspecJSONTest::extractExpectationJSON(std::istream& _stream)
-{
-	std::string rawJSON;
-	std::string line;
-	while (getline(_stream, line))
-	{
-		std::string_view strippedLine = expectLinePrefix(line);
-		rawJSON += strippedLine;
-		rawJSON += "\n";
-
-		if (boost::algorithm::starts_with(strippedLine, "}"))
-			break;
-	}
-
-	return rawJSON;
-}
-
-std::string_view NatspecJSONTest::expectLinePrefix(std::string_view _line)
-{
-	size_t startPosition = 0;
-	if (!boost::algorithm::starts_with(_line, "//"))
-		BOOST_THROW_EXCEPTION(std::runtime_error(
-			"Expectation line is not a comment: "s.append(_line)
-		));
-
-	startPosition += 2;
-	if (startPosition < _line.size() && _line[startPosition] == ' ')
-		++startPosition;
-
-	return _line.substr(startPosition, _line.size() - startPosition);
-}
-
-std::string NatspecJSONTest::formatNatspecExpectations(NatspecMap const& _expectations) const
-{
-	std::string output;
-	bool first = true;
-	// NOTE: Not sorting explicitly because CompilerStack seems to put contracts roughly in the
-	// order in which they appear in the source, which is much better than alphabetical order.
-	for (auto const& [contractName, expectationsForAllKinds]: _expectations)
-		for (auto const& [jsonKind, natspecJSON]: expectationsForAllKinds)
-		{
-			if (!first)
-				output += "\n\n";
-			first = false;
-
-			output += contractName + " " + toString(jsonKind) + "\n";
-			output += jsonPrint(natspecJSON, {JsonFormat::Pretty, 4});
-		}
-
-	return output;
-}
-
-NatspecMap NatspecJSONTest::obtainedNatspec() const
-{
-	if (compiler().state() < CompilerStack::AnalysisSuccessful)
-		return {};
-
-	NatspecMap result;
-	for (std::string contractName: compiler().contractNames())
-	{
-		result[contractName][NatspecJSONKind::Devdoc]  = compiler().natspecDev(contractName);
-		result[contractName][NatspecJSONKind::Userdoc] = compiler().natspecUser(contractName);
-	}
-
-	return result;
-}
-
-SerializedNatspecMap NatspecJSONTest::prettyPrinted(NatspecMap const& _expectations) const
-{
-	SerializedNatspecMap result;
-	for (auto const& [contractName, expectationsForAllKinds]: _expectations)
-		for (auto const& [jsonKind, natspecJSON]: expectationsForAllKinds)
-			result[contractName][jsonKind] = jsonPrint(natspecJSON, {JsonFormat::Pretty, 4});
-
-	return result;
-}
diff --git a/test/libsolidity/NatspecJSONTest.h b/test/libsolidity/NatspecJSONTest.h
deleted file mode 100644
index 762b88d10659..000000000000
--- a/test/libsolidity/NatspecJSONTest.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the Natspec userdoc and devdoc JSON output.
- */
-
-#pragma once
-
-#include <test/libsolidity/SyntaxTest.h>
-
-#include <libsolutil/JSON.h>
-
-#include <istream>
-#include <map>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <string_view>
-#include <tuple>
-
-namespace solidity::frontend::test
-{
-
-enum class NatspecJSONKind
-{
-	Devdoc,
-	Userdoc,
-};
-
-std::ostream& operator<<(std::ostream& _output, NatspecJSONKind _kind);
-
-using NatspecMap = std::map<std::string, std::map<NatspecJSONKind, Json::Value>>;
-using SerializedNatspecMap = std::map<std::string, std::map<NatspecJSONKind, std::string>>;
-
-class NatspecJSONTest: public SyntaxTest
-{
-public:
-
-	static std::unique_ptr<TestCase> create(Config const& _config);
-
-	NatspecJSONTest(std::string const& _filename, langutil::EVMVersion _evmVersion):
-		SyntaxTest(
-			_filename,
-			_evmVersion,
-			langutil::Error::Severity::Error // _minSeverity
-		)
-	{}
-
-protected:
-	void parseCustomExpectations(std::istream& _stream) override;
-	bool expectationsMatch() override;
-	void printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const override;
-	void printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const override;
-
-	NatspecMap m_expectedNatspecJSON;
-
-private:
-	static std::tuple<std::string_view, NatspecJSONKind> parseExpectationHeader(std::string_view _line);
-	static std::string extractExpectationJSON(std::istream& _stream);
-	static std::string_view expectLinePrefix(std::string_view _line);
-
-	std::string formatNatspecExpectations(NatspecMap const& _expectations) const;
-	SerializedNatspecMap prettyPrinted(NatspecMap const& _expectations) const;
-	NatspecMap obtainedNatspec() const;
-};
-
-}
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
deleted file mode 100644
index 893ccb0f1537..000000000000
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/SMTCheckerTest.h>
-#include <test/Common.h>
-
-#include <range/v3/action/remove_if.hpp>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-
-SMTCheckerTest::SMTCheckerTest(std::string const& _filename): SyntaxTest(_filename, EVMVersion{})
-{
-	auto contract = m_reader.stringSetting("SMTContract", "");
-	if (!contract.empty())
-		m_modelCheckerSettings.contracts.contracts[""] = {contract};
-
-	auto extCallsMode = ModelCheckerExtCalls::fromString(m_reader.stringSetting("SMTExtCalls", "untrusted"));
-	if (extCallsMode)
-		m_modelCheckerSettings.externalCalls = *extCallsMode;
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT external calls mode."));
-
-	auto const& showUnproved = m_reader.stringSetting("SMTShowUnproved", "yes");
-	if (showUnproved == "no")
-		m_modelCheckerSettings.showUnproved = false;
-	else if (showUnproved == "yes")
-		m_modelCheckerSettings.showUnproved = true;
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT \"show unproved\" choice."));
-
-	auto const& showUnsupported = m_reader.stringSetting("SMTShowUnsupported", "yes");
-	if (showUnsupported == "no")
-		m_modelCheckerSettings.showUnsupported = false;
-	else if (showUnsupported == "yes")
-		m_modelCheckerSettings.showUnsupported = true;
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT \"show unsupported\" choice."));
-
-	m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
-	auto const& choice = m_reader.stringSetting("SMTSolvers", "z3");
-	if (choice == "none")
-		m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
-	else if (!m_modelCheckerSettings.solvers.setSolver(choice))
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT solver choice."));
-
-	m_modelCheckerSettings.solvers &= ModelChecker::availableSolvers();
-
-	/// Underflow and Overflow are not enabled by default for Solidity >=0.8.7,
-	/// so we explicitly enable all targets for the tests,
-	/// if the targets were not explicitly set by the test.
-	auto targets = ModelCheckerTargets::fromString(m_reader.stringSetting("SMTTargets", "all"));
-	if (targets)
-		m_modelCheckerSettings.targets = *targets;
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT targets."));
-
-	auto engine = ModelCheckerEngine::fromString(m_reader.stringSetting("SMTEngine", "all"));
-	if (engine)
-		m_modelCheckerSettings.engine = *engine;
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT engine choice."));
-
-	if (m_modelCheckerSettings.solvers.none() || m_modelCheckerSettings.engine.none())
-		m_shouldRun = false;
-
-	auto const& ignoreCex = m_reader.stringSetting("SMTIgnoreCex", "yes");
-	if (ignoreCex == "no")
-		m_ignoreCex = false;
-	else if (ignoreCex == "yes")
-		m_ignoreCex = true;
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT counterexample choice."));
-
-	static auto removeInv = [](std::vector<SyntaxTestError>&& errors) {
-		std::vector<SyntaxTestError> filtered;
-		for (auto&& e: errors)
-			if (e.errorId != 1180_error)
-				filtered.emplace_back(e);
-		return filtered;
-	};
-	if (m_modelCheckerSettings.invariants.invariants.empty())
-		m_expectations = removeInv(std::move(m_expectations));
-
-	auto const& ignoreInv = m_reader.stringSetting("SMTIgnoreInv", "yes");
-	if (ignoreInv == "no")
-		m_modelCheckerSettings.invariants = ModelCheckerInvariants::All();
-	else if (ignoreInv == "yes")
-		m_modelCheckerSettings.invariants = ModelCheckerInvariants::None();
-	else
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT invariant choice."));
-
-	auto const& ignoreOSSetting = m_reader.stringSetting("SMTIgnoreOS", "none");
-	for (std::string const& os: ignoreOSSetting | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
-	{
-#ifdef __APPLE__
-		if (os == "macos")
-			m_shouldRun = false;
-#elif _WIN32
-		if (os == "windows")
-			m_shouldRun = false;
-#elif __linux__
-		if (os == "linux")
-			m_shouldRun = false;
-#endif
-	}
-
-	auto const& bmcLoopIterations = m_reader.sizetSetting("BMCLoopIterations", 1);
-	m_modelCheckerSettings.bmcLoopIterations = std::optional<unsigned>{bmcLoopIterations};
-}
-
-void SMTCheckerTest::setupCompiler(CompilerStack& _compiler)
-{
-	SyntaxTest::setupCompiler(_compiler);
-
-	_compiler.setModelCheckerSettings(m_modelCheckerSettings);
-}
-
-void SMTCheckerTest::filterObtainedErrors()
-{
-	SyntaxTest::filterObtainedErrors();
-	m_unfilteredErrorList = m_errorList;
-
-	static auto removeCex = [](std::vector<SyntaxTestError>& errors) {
-		for (auto& e: errors)
-			if (
-				auto cexPos = e.message.find("\\nCounterexample");
-				cexPos != std::string::npos
-			)
-				e.message = e.message.substr(0, cexPos);
-	};
-
-	if (m_ignoreCex)
-	{
-		removeCex(m_expectations);
-		removeCex(m_errorList);
-	}
-}
-
-void SMTCheckerTest::printUpdatedExpectations(std::ostream &_stream, const std::string &_linePrefix) const {
-	if (!m_unfilteredErrorList.empty())
-		printErrorList(_stream, m_unfilteredErrorList, _linePrefix, false);
-	else
-		CommonSyntaxTest::printUpdatedExpectations(_stream, _linePrefix);
-}
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
deleted file mode 100644
index d42572dc5b29..000000000000
--- a/test/libsolidity/SMTCheckerTest.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/libsolidity/SyntaxTest.h>
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <libsolidity/formal/ModelChecker.h>
-
-#include <string>
-
-namespace solidity::frontend::test
-{
-
-class SMTCheckerTest: public SyntaxTest
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<SMTCheckerTest>(_config.filename);
-	}
-	SMTCheckerTest(std::string const& _filename);
-
-	void setupCompiler(CompilerStack& _compiler) override;
-	void filterObtainedErrors() override;
-
-	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
-
-protected:
-	/*
-	Options that can be set in the test:
-	SMTEngine: `all`, `chc`, `bmc`, `none`, where the default is `all`.
-		Set in m_modelCheckerSettings.
-	SMTIgnoreCex: `yes`, `no`, where the default is `no`.
-		Set in m_ignoreCex.
-	SMTIgnoreInv: `yes`, `no`, where the default is `no`.
-		Set in m_modelCheckerSettings.
-	SMTShowUnproved: `yes`, `no`, where the default is `yes`.
-		Set in m_modelCheckerSettings.
-	SMTSolvers: `all`, `cvc4`, `z3`, `none`, where the default is `all`.
-		Set in m_modelCheckerSettings.
-	BMCLoopIterations: number of loop iterations for BMC engine, the default is 1.
-		Set in m_modelCheckerSettings.
-	*/
-
-	ModelCheckerSettings m_modelCheckerSettings;
-
-	bool m_ignoreCex = false;
-
-	std::vector<SyntaxTestError> m_unfilteredErrorList;
-};
-
-}
diff --git a/test/libsolidity/SemVerMatcher.cpp b/test/libsolidity/SemVerMatcher.cpp
deleted file mode 100644
index c2fedc2d4aac..000000000000
--- a/test/libsolidity/SemVerMatcher.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <chris@ethereum.org>
- * @date 2016
- * Unit tests for the semantic versioning matcher.
- */
-
-#include <string>
-#include <vector>
-#include <tuple>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SemVerHandler.h>
-#include <test/Common.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(SemVerMatcher)
-
-namespace
-{
-
-SemVerMatchExpression parseExpression(std::string const& _input)
-{
-	CharStream stream(_input, "");
-	Scanner scanner{stream};
-	std::vector<std::string> literals;
-	std::vector<Token> tokens;
-	while (scanner.currentToken() != Token::EOS)
-	{
-		auto token = scanner.currentToken();
-		std::string literal = scanner.currentLiteral();
-		if (literal.empty() && TokenTraits::toString(token))
-			literal = TokenTraits::toString(token);
-		literals.push_back(literal);
-		tokens.push_back(token);
-		scanner.next();
-	}
-
-	try
-	{
-		auto matchExpression = SemVerMatchExpressionParser(tokens, literals).parse();
-
-		BOOST_CHECK_MESSAGE(
-			matchExpression.isValid(),
-			"Expression \"" + _input + "\" did not parse properly."
-		);
-
-		return matchExpression;
-	}
-	catch (SemVerError const&)
-	{
-		// Ignored, since a test case should have a parsable version
-		soltestAssert(false);
-	}
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-}
-
-BOOST_AUTO_TEST_CASE(exception_on_invalid_version_in_semverversion_constructor)
-{
-	BOOST_CHECK_EXCEPTION(
-		SemVerVersion version("1.2"),
-		SemVerError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == "Invalid versionString: 1.2"); return true; }
-	);
-
-	BOOST_CHECK_EXCEPTION(
-		SemVerVersion version("-1.2.0"),
-		SemVerError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == "Invalid versionString: -1.2.0"); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(positive_range)
-{
-	// Positive range tests
-	std::vector<std::pair<std::string, std::string>> tests = {
-		{"*", "1.2.3-foo"},
-		{"1.0.0 - 2.0.0", "1.2.3"},
-		{"1.0.0", "1.0.0"},
-		{"1.0", "1.0.0"},
-		{"1", "1.0.0"},
-		{">=*", "0.2.4"},
-		{"*", "1.2.3"},
-		{">=1.0.0", "1.0.0"},
-		{">=1.0.0", "1.0.1"},
-		{">=1.0.0", "1.1.0"},
-		{">1.0.0", "1.0.1"},
-		{">1.0.0", "1.1.0"},
-		{"<=2.0.0", "2.0.0"},
-		{"<=2.0.0", "1.9999.9999"},
-		{"<=2.0.0", "0.2.9"},
-		{"<2.0.0", "1.9999.9999"},
-		{"<2.0.0", "0.2.9"},
-		{"<1.0", "1.0.0-pre"},
-		{"<1", "1.0.0-pre"},
-		{">= 1.0.0", "1.0.0"},
-		{">=  1.0.0", "1.0.1"},
-		{">=   1.0.0", "1.1.0"},
-		{"> 1.0.0", "1.0.1"},
-		{">  1.0.0", "1.1.0"},
-		{"<=   2.0.0", "2.0.0"},
-		{"<= 2.0.0", "1.9999.9999"},
-		{"<=  2.0.0", "0.2.9"},
-		{"<    2.0.0", "1.9999.9999"},
-		{"<\t2.0.0", "0.2.9"},
-		{">=0.1.97", "0.1.97"},
-		{"0.1.20 || 1.2.4", "1.2.4"},
-		{">=0.2.3 || <0.0.1", "0.0.0"},
-		{">=0.2.3 || <0.0.1", "0.2.3"},
-		{">=0.2.3 || <0.0.1", "0.2.4"},
-		{"\"2.x.x\"", "2.1.3"},
-		{"1.2.x", "1.2.3"},
-		{"\"1.2.x\" || \"2.x\"", "2.1.3"},
-		{"\"1.2.x\" || \"2.x\"", "1.2.3"},
-		{"x", "1.2.3"},
-		{"2.*.*", "2.1.3"},
-		{"1.2.*", "1.2.3"},
-		{"1.2.* || 2.*", "2.1.3"},
-		{"1.2.* || 2.*", "1.2.3"},
-		{"*", "1.2.3"},
-		{"2", "2.1.2"},
-		{"2.3", "2.3.1"},
-		{"~2.4", "2.4.0"}, // >=2.4.0 <2.5.0
-		{"~2.4", "2.4.5"},
-		{"~1", "1.2.3"}, // >=1.0.0 <2.0.0
-		{"~1.0", "1.0.2"}, // >=1.0.0 <1.1.0,
-		{"~ 1.0", "1.0.2"},
-		{"~ 1.0.3", "1.0.12"},
-		{">=1", "1.0.0"},
-		{">= 1", "1.0.0"},
-		{"<1.2", "1.1.1"},
-		{"< 1.2", "1.1.1"},
-		{"=0.7.x", "0.7.2"},
-		{"<=0.7.x", "0.7.2"},
-		{">=0.7.x", "0.7.2"},
-		{"<=0.7.x", "0.6.2"},
-		{"~1.2.1 >=1.2.3", "1.2.3"},
-		{"~1.2.1 =1.2.3", "1.2.3"},
-		{"~1.2.1 1.2.3", "1.2.3"},
-		{"~1.2.1 >=1.2.3 1.2.3", "1.2.3"},
-		{"~1.2.1 1.2.3 >=1.2.3", "1.2.3"},
-		{">=\"1.2.1\" 1.2.3", "1.2.3"},
-		{"1.2.3 >=1.2.1", "1.2.3"},
-		{">=1.2.3 >=1.2.1", "1.2.3"},
-		{">=1.2.1 >=1.2.3", "1.2.3"},
-		{">=1.2", "1.2.8"},
-		{"^1.2.3", "1.8.1"},
-		{"^0.1.2", "0.1.2"},
-		{"^0.1", "0.1.2"},
-		{"^1.2", "1.4.2"},
-		{"^1.2", "1.2.0"},
-		{"^1", "1.2.0"},
-		{"<=1.2.3", "1.2.3-beta"},
-		{">1.2", "1.3.0-beta"},
-		{"<1.2.3", "1.2.3-beta"},
-		{"^1.2 ^1", "1.4.2"},
-		{"^0", "0.5.1"},
-		{"^0", "0.1.1"},
-	};
-	for (auto const& t: tests)
-	{
-		SemVerVersion version(t.second);
-		SemVerMatchExpression matchExpression = parseExpression(t.first);
-		BOOST_CHECK_MESSAGE(
-			matchExpression.matches(version),
-			"Version \"" + t.second + "\" did not satisfy expression \"" + t.first + "\""
-		);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(negative_range)
-{
-	// Negative range tests
-	std::vector<std::pair<std::string, std::string>> tests = {
-		{"^0^1", "0.0.0"},
-		{"^0^1", "1.0.0"},
-		{"1.0.0 - 2.0.0", "2.2.3"},
-		{"1.0", "1.0.0-pre"},
-		{"1", "1.0.0-pre"},
-		{"^1.2.3", "1.2.3-pre"},
-		{"^1.2", "1.2.0-pre"},
-		{"^1.2", "1.2.1-pre"},
-		{"^1.2.3", "1.2.3-beta"},
-		{"=0.7.x", "0.7.0-asdf"},
-		{">=0.7.x", "0.7.0-asdf"},
-		{"1.0.0", "1.0.1"},
-		{">=1.0.0", "0.0.0"},
-		{">=1.0.0", "0.0.1"},
-		{">=1.0.0", "0.1.0"},
-		{">1.0.0", "0.0.1"},
-		{">1.0.0", "0.1.0"},
-		{"<=2.0.0", "3.0.0"},
-		{"<=2.0.0", "2.9999.9999"},
-		{"<=2.0.0", "2.2.9"},
-		{"<2.0.0", "2.9999.9999"},
-		{"<2.0.0", "2.2.9"},
-		{">=0.1.97", "0.1.93"},
-		{"0.1.20 || 1.2.4", "1.2.3"},
-		{">=0.2.3 || <0.0.1", "0.0.3"},
-		{">=0.2.3 || <0.0.1", "0.2.2"},
-		{"\"2.x.x\"", "1.1.3"},
-		{"\"2.x.x\"", "3.1.3"},
-		{"1.2.x", "1.3.3"},
-		{"\"1.2.x\" || \"2.x\"", "3.1.3"},
-		{"\"1.2.x\" || \"2.x\"", "1.1.3"},
-		{"2.*.*", "1.1.3"},
-		{"2.*.*", "3.1.3"},
-		{"1.2.*", "1.3.3"},
-		{"1.2.* || 2.*", "3.1.3"},
-		{"1.2.* || 2.*", "1.1.3"},
-		{"2", "1.1.2"},
-		{"2.3", "2.4.1"},
-		{"~2.4", "2.5.0"}, // >=2.4.0 <2.5.0
-		{"~2.4", "2.3.9"},
-		{"~1", "0.2.3"}, // >=1.0.0 <2.0.0
-		{"~1.0", "1.1.0"}, // >=1.0.0 <1.1.0
-		{"<1", "1.0.0"},
-		{">=1.2", "1.1.1"},
-		{"=0.7.x", "0.8.2"},
-		{">=0.7.x", "0.6.2"},
-		{"<0.7.x", "0.7.2"},
-		{"=1.2.3", "1.2.3-beta"},
-		{">1.2", "1.2.8"},
-		{"^1.2.3", "2.0.0-alpha"},
-		{"^0.6", "0.6.2-alpha"},
-		{"^0.6", "0.6.0-alpha"},
-		{"^1.2", "1.2.1-pre"},
-		{"^1.2.3", "1.2.2"},
-		{"^1", "1.2.0-pre"},
-		{"^1", "1.2.0-pre"},
-		{"^1.2", "1.1.9"},
-		{"^0", "0.5.1-pre"},
-		{"^0", "0.0.0-pre"},
-		{"^0", "1.0.0"},
-	};
-	for (auto const& t: tests)
-	{
-		SemVerVersion version(t.second);
-		auto matchExpression = parseExpression(t.first);
-		BOOST_CHECK_MESSAGE(
-			!matchExpression.matches(version),
-			"Version \"" + t.second + "\" did satisfy expression \"" + t.first + "\" " +
-			"(although it should not)"
-		);
-	}
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
deleted file mode 100644
index 25113b689d17..000000000000
--- a/test/libsolidity/SemanticTest.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <test/libsolidity/SemanticTest.h>
-
-#include <libsolutil/Whiskers.h>
-#include <libyul/Exceptions.h>
-#include <test/Common.h>
-#include <test/libsolidity/util/BytesUtils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/throw_exception.hpp>
-
-#include <algorithm>
-#include <cctype>
-#include <fstream>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::util::formatting;
-using namespace solidity::frontend::test;
-using namespace boost::algorithm;
-using namespace boost::unit_test;
-using namespace std::string_literals;
-namespace fs = boost::filesystem;
-
-std::ostream& solidity::frontend::test::operator<<(std::ostream& _output, RequiresYulOptimizer _requiresYulOptimizer)
-{
-	switch (_requiresYulOptimizer)
-	{
-	case RequiresYulOptimizer::False: _output << "false"; break;
-	case RequiresYulOptimizer::MinimalStack: _output << "minimalStack"; break;
-	case RequiresYulOptimizer::Full: _output << "full"; break;
-	}
-	return _output;
-}
-
-SemanticTest::SemanticTest(
-	std::string const& _filename,
-	langutil::EVMVersion _evmVersion,
-	std::optional<uint8_t> _eofVersion,
-	std::vector<boost::filesystem::path> const& _vmPaths,
-	bool _enforceGasCost,
-	u256 _enforceGasCostMinValue
-):
-	SolidityExecutionFramework(_evmVersion, _eofVersion, _vmPaths, false),
-	EVMVersionRestrictedTestCase(_filename),
-	m_sources(m_reader.sources()),
-	m_lineOffset(m_reader.lineNumber()),
-	m_builtins(makeBuiltins()),
-	m_sideEffectHooks(makeSideEffectHooks()),
-	m_enforceGasCost(_enforceGasCost),
-	m_enforceGasCostMinValue(std::move(_enforceGasCostMinValue))
-{
-	static std::set<std::string> const compileViaYulAllowedValues{"also", "true", "false"};
-	static std::set<std::string> const yulRunTriggers{"also", "true"};
-	static std::set<std::string> const legacyRunTriggers{"also", "false", "default"};
-
-	m_requiresYulOptimizer = m_reader.enumSetting<RequiresYulOptimizer>(
-		"requiresYulOptimizer",
-		{
-			{toString(RequiresYulOptimizer::False), RequiresYulOptimizer::False},
-			{toString(RequiresYulOptimizer::MinimalStack), RequiresYulOptimizer::MinimalStack},
-			{toString(RequiresYulOptimizer::Full), RequiresYulOptimizer::Full},
-		},
-		toString(RequiresYulOptimizer::False)
-	);
-
-	m_runWithABIEncoderV1Only = m_reader.boolSetting("ABIEncoderV1Only", false);
-	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
-		m_shouldRun = false;
-
-	std::string compileViaYul = m_reader.stringSetting("compileViaYul", "also");
-	if (m_runWithABIEncoderV1Only && compileViaYul != "false")
-		BOOST_THROW_EXCEPTION(std::runtime_error(
-			"ABIEncoderV1Only tests cannot be run via yul, "
-			"so they need to also specify ``compileViaYul: false``"
-		));
-	if (!util::contains(compileViaYulAllowedValues, compileViaYul))
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + compileViaYul + "."));
-	m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul);
-	m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul);
-
-	auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default"));
-	soltestAssert(revertStrings, "Invalid revertStrings setting.");
-	m_revertStrings = revertStrings.value();
-
-	m_allowNonExistingFunctions = m_reader.boolSetting("allowNonExistingFunctions", false);
-
-	parseExpectations(m_reader.stream());
-	soltestAssert(!m_tests.empty(), "No tests specified in " + _filename);
-
-	if (m_enforceGasCost)
-	{
-		m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
-		m_compiler.setMetadataHash(CompilerStack::MetadataHash::None);
-	}
-}
-
-std::map<std::string, Builtin> SemanticTest::makeBuiltins()
-{
-	return {
-		{
-			"isoltest_builtin_test",
-			[](FunctionCall const&) -> std::optional<bytes>
-			{
-				return toBigEndian(u256(0x1234));
-			}
-		},
-		{
-			"isoltest_side_effects_test",
-			[](FunctionCall const& _call) -> std::optional<bytes>
-			{
-				if (_call.arguments.parameters.empty())
-					return toBigEndian(0);
-				else
-					return _call.arguments.rawBytes();
-			}
-		},
-		{
-			"balance",
-			[this](FunctionCall const& _call) -> std::optional<bytes>
-			{
-				soltestAssert(_call.arguments.parameters.size() <= 1, "Account address expected.");
-				h160 address;
-				if (_call.arguments.parameters.size() == 1)
-					address = h160(_call.arguments.parameters.at(0).rawString);
-				else
-					address = m_contractAddress;
-				return toBigEndian(balanceAt(address));
-			}
-		},
-		{
-			"storageEmpty",
-			[this](FunctionCall const& _call) -> std::optional<bytes>
-			{
-				soltestAssert(_call.arguments.parameters.empty(), "No arguments expected.");
-				return toBigEndian(u256(storageEmpty(m_contractAddress) ? 1 : 0));
-		 	}
-		},
-		{
-			"account",
-			[this](FunctionCall const& _call) -> std::optional<bytes>
-			{
-				soltestAssert(_call.arguments.parameters.size() == 1, "Account number expected.");
-				size_t accountNumber = static_cast<size_t>(stoi(_call.arguments.parameters.at(0).rawString));
-				// Need to pad it to 32-bytes to workaround limitations in BytesUtils::formatHex.
-				return toBigEndian(h256(ExecutionFramework::setAccount(accountNumber).asBytes(), h256::AlignRight));
-			}
-		},
-	};
-}
-
-std::vector<SideEffectHook> SemanticTest::makeSideEffectHooks() const
-{
-	using namespace std::placeholders;
-	return {
-		[](FunctionCall const& _call) -> std::vector<std::string>
-		{
-			if (_call.signature == "isoltest_side_effects_test")
-			{
-				std::vector<std::string> result;
-				for (auto const& argument: _call.arguments.parameters)
-					result.emplace_back(util::toHex(argument.rawBytes));
-				return result;
-			}
-			return {};
-		},
-		bind(&SemanticTest::eventSideEffectHook, this, _1)
-	};
-}
-
-std::string SemanticTest::formatEventParameter(std::optional<AnnotatedEventSignature> _signature, bool _indexed, size_t _index, bytes const& _data)
-{
-	auto isPrintableASCII = [](bytes const& s)
-	{
-		bool zeroes = true;
-		for (auto c: s)
-		{
-			if (static_cast<unsigned>(c) != 0x00)
-			{
-				zeroes = false;
-				if (static_cast<unsigned>(c) <= 0x1f || static_cast<unsigned>(c) >= 0x7f)
-					return false;
-			} else
-				break;
-		}
-		return !zeroes;
-	};
-
-	ABIType abiType(ABIType::Type::Hex);
-	if (isPrintableASCII(_data))
-		abiType = ABIType(ABIType::Type::String);
-	if (_signature.has_value())
-	{
-		std::vector<std::string> const& types = _indexed ? _signature->indexedTypes : _signature->nonIndexedTypes;
-		if (_index < types.size())
-		{
-			if (types.at(_index) == "bool")
-				abiType = ABIType(ABIType::Type::Boolean);
-		}
-	}
-	return BytesUtils::formatBytes(_data, abiType);
-}
-
-std::vector<std::string> SemanticTest::eventSideEffectHook(FunctionCall const&) const
-{
-	std::vector<std::string> sideEffects;
-	std::vector<LogRecord> recordedLogs = ExecutionFramework::recordedLogs();
-	for (LogRecord const& log: recordedLogs)
-	{
-		std::optional<AnnotatedEventSignature> eventSignature;
-		if (!log.topics.empty())
-			eventSignature = matchEvent(log.topics[0]);
-		std::stringstream sideEffect;
-		sideEffect << "emit ";
-		if (eventSignature.has_value())
-			sideEffect << eventSignature.value().signature;
-		else
-			sideEffect << "<anonymous>";
-
-		if (m_contractAddress != log.creator)
-			sideEffect << " from 0x" << log.creator;
-
-		std::vector<std::string> eventStrings;
-		size_t index{0};
-		for (h256 const& topic: log.topics)
-		{
-			if (!eventSignature.has_value() || index != 0)
-				eventStrings.push_back("#" + formatEventParameter(eventSignature, true, index, topic.asBytes()));
-			++index;
-		}
-
-		soltestAssert(log.data.size() % 32 == 0, "");
-		for (size_t index = 0; index < log.data.size() / 32; ++index)
-		{
-			auto begin = log.data.begin() + static_cast<long>(index * 32);
-			bytes const& data = bytes{begin, begin + 32};
-			eventStrings.emplace_back(formatEventParameter(eventSignature, false, index, data));
-		}
-
-		if (!eventStrings.empty())
-			sideEffect << ": ";
-		sideEffect << joinHumanReadable(eventStrings);
-		sideEffects.emplace_back(sideEffect.str());
-	}
-	return sideEffects;
-}
-
-std::optional<AnnotatedEventSignature> SemanticTest::matchEvent(util::h256 const& hash) const
-{
-	std::optional<AnnotatedEventSignature> result;
-	for (std::string& contractName: m_compiler.contractNames())
-	{
-		ContractDefinition const& contract = m_compiler.contractDefinition(contractName);
-		for (EventDefinition const* event: contract.events() + contract.usedInterfaceEvents())
-		{
-			FunctionTypePointer eventFunctionType = event->functionType(true);
-			if (!event->isAnonymous() && keccak256(eventFunctionType->externalSignature()) == hash)
-			{
-				AnnotatedEventSignature eventInfo;
-				eventInfo.signature = eventFunctionType->externalSignature();
-				for (auto const& param: event->parameters())
-					if (param->isIndexed())
-						eventInfo.indexedTypes.emplace_back(param->type()->toString(true));
-					else
-						eventInfo.nonIndexedTypes.emplace_back(param->type()->toString(true));
-				result = eventInfo;
-			}
-		}
-	}
-	return result;
-}
-
-frontend::OptimiserSettings SemanticTest::optimizerSettingsFor(RequiresYulOptimizer _requiresYulOptimizer)
-{
-	switch (_requiresYulOptimizer)
-	{
-	case RequiresYulOptimizer::False:
-		return OptimiserSettings::minimal();
-	case RequiresYulOptimizer::MinimalStack:
-	{
-		OptimiserSettings settings = OptimiserSettings::minimal();
-		settings.runYulOptimiser = true;
-		settings.yulOptimiserSteps = "uljmul jmul";
-		return settings;
-	}
-	case RequiresYulOptimizer::Full:
-		return OptimiserSettings::full();
-	}
-	unreachable();
-}
-
-TestCase::TestResult SemanticTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
-{
-	TestResult result = TestResult::Success;
-
-	if (m_testCaseWantsLegacyRun && !m_eofVersion.has_value())
-		result = runTest(_stream, _linePrefix, _formatted, false /* _isYulRun */);
-
-	if (m_testCaseWantsYulRun && result == TestResult::Success)
-	{
-		if (solidity::test::CommonOptions::get().optimize)
-			result = runTest(_stream, _linePrefix, _formatted, true /* _isYulRun */);
-		else
-			result = tryRunTestWithYulOptimizer(_stream, _linePrefix, _formatted);
-	}
-
-	if (result != TestResult::Success)
-		solidity::test::CommonOptions::get().printSelectedOptions(
-			_stream,
-			_linePrefix,
-			{"evmVersion", "optimize", "useABIEncoderV1", "batch"}
-		);
-
-	return result;
-}
-
-TestCase::TestResult SemanticTest::runTest(
-	std::ostream& _stream,
-	std::string const& _linePrefix,
-	bool _formatted,
-	bool _isYulRun
-)
-{
-	bool success = true;
-	m_gasCostFailure = false;
-
-	selectVM(evmc_capabilities::EVMC_CAPABILITY_EVM1);
-
-	reset();
-
-	m_compileViaYul = _isYulRun;
-
-	if (_isYulRun)
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Running via Yul: " << std::endl;
-
-	for (TestFunctionCall& test: m_tests)
-		test.reset();
-
-	std::map<std::string, solidity::test::Address> libraries;
-
-	bool constructed = false;
-
-	for (TestFunctionCall& test: m_tests)
-	{
-		if (constructed)
-		{
-			soltestAssert(
-				test.call().kind != FunctionCall::Kind::Library,
-				"Libraries have to be deployed before any other call."
-			);
-			soltestAssert(
-				test.call().kind != FunctionCall::Kind::Constructor,
-				"Constructor has to be the first function call expect for library deployments."
-			);
-		}
-		else if (test.call().kind == FunctionCall::Kind::Library)
-		{
-			soltestAssert(
-				deploy(test.call().signature, 0, {}, libraries) && m_transactionSuccessful,
-				"Failed to deploy library " + test.call().signature);
-			// For convenience, in semantic tests we assume that an unqualified name like `L` is equivalent to one
-			// with an empty source unit name (`:L`). This is fine because the compiler never uses unqualified
-			// names in the Yul code it produces and does not allow `linkersymbol()` at all in inline assembly.
-			libraries[test.call().libraryFile + ":" + test.call().signature] = m_contractAddress;
-			continue;
-		}
-		else
-		{
-			if (test.call().kind == FunctionCall::Kind::Constructor)
-				deploy("", test.call().value.value, test.call().arguments.rawBytes(), libraries);
-			else
-				soltestAssert(deploy("", 0, bytes(), libraries), "Failed to deploy contract.");
-			constructed = true;
-		}
-
-		if (test.call().kind == FunctionCall::Kind::Constructor)
-		{
-			if (m_transactionSuccessful == test.call().expectations.failure)
-				success = false;
-			if (success && !checkGasCostExpectation(test, _isYulRun))
-			{
-				success = false;
-				m_gasCostFailure = true;
-			}
-
-			test.setFailure(!m_transactionSuccessful);
-			test.setRawBytes(bytes());
-		}
-		else
-		{
-			bytes output;
-			if (test.call().kind == FunctionCall::Kind::LowLevel)
-				output = callLowLevel(test.call().arguments.rawBytes(), test.call().value.value);
-			else if (test.call().kind == FunctionCall::Kind::Builtin)
-			{
-				std::optional<bytes> builtinOutput = m_builtins.at(test.call().signature)(test.call());
-				if (builtinOutput.has_value())
-				{
-					m_transactionSuccessful = true;
-					output = builtinOutput.value();
-				}
-				else
-					m_transactionSuccessful = false;
-			}
-			else
-			{
-				soltestAssert(
-					m_allowNonExistingFunctions ||
-					m_compiler.interfaceSymbols(m_compiler.lastContractName(m_sources.mainSourceFile))["methods"].isMember(test.call().signature),
-					"The function " + test.call().signature + " is not known to the compiler"
-				);
-
-				output = callContractFunctionWithValueNoEncoding(
-					test.call().signature,
-					test.call().value.value,
-					test.call().arguments.rawBytes()
-				);
-			}
-
-			bool outputMismatch = (output != test.call().expectations.rawBytes());
-			if (!outputMismatch && !checkGasCostExpectation(test, _isYulRun))
-			{
-				success = false;
-				m_gasCostFailure = true;
-			}
-
-			// Pre byzantium, it was not possible to return failure data, so we disregard
-			// output mismatch for those EVM versions.
-			if (test.call().expectations.failure && !m_transactionSuccessful && !m_evmVersion.supportsReturndata())
-				outputMismatch = false;
-			if (m_transactionSuccessful != !test.call().expectations.failure || outputMismatch)
-				success = false;
-
-			test.setFailure(!m_transactionSuccessful);
-			test.setRawBytes(std::move(output));
-			if (test.call().kind != FunctionCall::Kind::LowLevel)
-				test.setContractABI(m_compiler.contractABI(m_compiler.lastContractName(m_sources.mainSourceFile)));
-		}
-
-		std::vector<std::string> effects;
-		for (SideEffectHook const& hook: m_sideEffectHooks)
-			effects += hook(test.call());
-		test.setSideEffects(std::move(effects));
-
-		success &= test.call().expectedSideEffects == test.call().actualSideEffects;
-	}
-
-	if (!success)
-	{
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << std::endl;
-		for (TestFunctionCall const& test: m_tests)
-		{
-			ErrorReporter errorReporter;
-			_stream << test.format(
-				errorReporter,
-				_linePrefix,
-				TestFunctionCall::RenderMode::ExpectedValuesExpectedGas,
-				_formatted,
-				/* _interactivePrint */ true
-			) << std::endl;
-			_stream << errorReporter.format(_linePrefix, _formatted);
-		}
-		_stream << std::endl;
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << std::endl;
-		for (TestFunctionCall const& test: m_tests)
-		{
-			ErrorReporter errorReporter;
-			_stream << test.format(
-				errorReporter,
-				_linePrefix,
-				m_gasCostFailure ? TestFunctionCall::RenderMode::ExpectedValuesActualGas : TestFunctionCall::RenderMode::ActualValuesExpectedGas,
-				_formatted,
-				/* _interactivePrint */ true
-			) << std::endl;
-			_stream << errorReporter.format(_linePrefix, _formatted);
-		}
-		AnsiColorized(_stream, _formatted, {BOLD, RED})
-			<< _linePrefix << std::endl
-			<< _linePrefix << "Attention: Updates on the test will apply the detected format displayed." << std::endl;
-		if (_isYulRun && m_testCaseWantsLegacyRun)
-		{
-			_stream << _linePrefix << std::endl << _linePrefix;
-			AnsiColorized(_stream, _formatted, {RED_BACKGROUND}) << "Note that the test passed without Yul.";
-			_stream << std::endl;
-		}
-		else if (!_isYulRun && m_testCaseWantsYulRun)
-			AnsiColorized(_stream, _formatted, {BOLD, YELLOW})
-				<< _linePrefix << std::endl
-				<< _linePrefix << "Note that the test also has to pass via Yul." << std::endl;
-		return TestResult::Failure;
-	}
-
-	return TestResult::Success;
-}
-
-TestCase::TestResult SemanticTest::tryRunTestWithYulOptimizer(
-	std::ostream& _stream,
-	std::string const& _linePrefix,
-	bool _formatted
-)
-{
-	TestResult result{};
-	for (auto requiresYulOptimizer: {
-		RequiresYulOptimizer::False,
-		RequiresYulOptimizer::MinimalStack,
-		RequiresYulOptimizer::Full,
-	})
-	{
-		ScopedSaveAndRestore optimizerSettings(
-			m_optimiserSettings,
-			optimizerSettingsFor(requiresYulOptimizer)
-		);
-
-		try
-		{
-			result = runTest(_stream, _linePrefix, _formatted, true /* _isYulRun */);
-		}
-		catch (yul::StackTooDeepError const&)
-		{
-			if (requiresYulOptimizer == RequiresYulOptimizer::Full)
-				throw;
-			else
-				continue;
-		}
-
-		if (m_requiresYulOptimizer != requiresYulOptimizer && result != TestResult::FatalError)
-		{
-			soltestAssert(result == TestResult::Success || result == TestResult::Failure);
-
-			AnsiColorized(_stream, _formatted, {BOLD, YELLOW})
-				<< _linePrefix << std::endl
-				<< _linePrefix << "requiresYulOptimizer is set to " << m_requiresYulOptimizer
-				<< " but should be " << requiresYulOptimizer << std::endl;
-			m_requiresYulOptimizer = requiresYulOptimizer;
-			return TestResult::Failure;
-		}
-
-		return result;
-	}
-	unreachable();
-}
-
-bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _compileViaYul) const
-{
-	std::string setting =
-		(_compileViaYul ? "ir"s : "legacy"s) +
-		(m_optimiserSettings == OptimiserSettings::full() ? "Optimized" : "");
-
-	// We don't check gas if enforce gas cost is not active
-	// or test is run with abi encoder v1 only
-	// or gas used less than threshold for enforcing feature
-	// or the test has used up all available gas (test will fail anyway)
-	// or setting is "ir" and it's not included in expectations
-	// or if the called function is an isoltest builtin e.g. `smokeTest` or `storageEmpty`
-	if (
-		!m_enforceGasCost ||
-		m_gasUsed < m_enforceGasCostMinValue ||
-		m_gasUsed >= InitialGas ||
-		(setting == "ir" && io_test.call().expectations.gasUsed.count(setting) == 0) ||
-		io_test.call().kind == FunctionCall::Kind::Builtin
-	)
-		return true;
-
-	solAssert(!m_runWithABIEncoderV1Only, "");
-
-	io_test.setGasCost(setting, m_gasUsed);
-	return
-		io_test.call().expectations.gasUsed.count(setting) > 0 &&
-		m_gasUsed == io_test.call().expectations.gasUsed.at(setting);
-}
-
-void SemanticTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
-{
-	if (m_sources.sources.empty())
-		return;
-
-	bool outputNames = (m_sources.sources.size() - m_sources.externalSources.size() != 1 || !m_sources.sources.begin()->first.empty());
-
-	std::set<std::string> externals;
-	for (auto const& [name, path]: m_sources.externalSources)
-	{
-		externals.insert(name);
-		std::string externalSource;
-		if (name == path)
-			externalSource = name;
-		else
-			externalSource = name + "=" + path.generic_string();
-
-		if (_formatted)
-			_stream << _linePrefix  << formatting::CYAN << "==== ExternalSource: " << externalSource << " ===="s << formatting::RESET << std::endl;
-		else
-			_stream << _linePrefix << "==== ExternalSource: " << externalSource << " ===="s << std::endl;
-	}
-
-	for (auto const& [name, source]: m_sources.sources)
-		if (externals.find(name) == externals.end())
-		{
-			if (_formatted)
-			{
-				if (source.empty())
-					continue;
-
-				if (outputNames)
-					_stream << _linePrefix << formatting::CYAN << "==== Source: " << name
-							<< " ====" << formatting::RESET << std::endl;
-
-				std::vector<char const*> sourceFormatting(source.length(), formatting::RESET);
-				_stream << _linePrefix << sourceFormatting.front() << source.front();
-				for (size_t i = 1; i < source.length(); i++)
-				{
-					if (sourceFormatting[i] != sourceFormatting[i - 1])
-						_stream << sourceFormatting[i];
-					if (source[i] != '\n')
-						_stream << source[i];
-					else
-					{
-						_stream << formatting::RESET << std::endl;
-						if (i + 1 < source.length())
-							_stream << _linePrefix << sourceFormatting[i];
-					}
-				}
-				_stream << formatting::RESET;
-			}
-			else
-			{
-				if (outputNames)
-					printPrefixed(_stream, "==== Source: " + name + " ====", _linePrefix);
-				printPrefixed(_stream, source, _linePrefix);
-			}
-		}
-}
-
-void SemanticTest::printUpdatedExpectations(std::ostream& _stream, std::string const&) const
-{
-	for (TestFunctionCall const& test: m_tests)
-		_stream << test.format(
-			"",
-			m_gasCostFailure ? TestFunctionCall::RenderMode::ExpectedValuesActualGas : TestFunctionCall::RenderMode::ActualValuesExpectedGas,
-			/* _highlight = */ false
-		) << std::endl;
-}
-
-void SemanticTest::printUpdatedSettings(std::ostream& _stream, std::string const& _linePrefix)
-{
-	auto& settings = m_reader.settings();
-	if (settings.empty() && m_requiresYulOptimizer == RequiresYulOptimizer::False)
-		return;
-
-	_stream << _linePrefix << "// ====" << std::endl;
-	if (m_requiresYulOptimizer != RequiresYulOptimizer::False)
-		_stream << _linePrefix << "// requiresYulOptimizer: " << m_requiresYulOptimizer << std::endl;
-
-	for (auto const& [settingName, settingValue]: settings)
-		if (settingName != "requiresYulOptimizer")
-			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< std::endl;
-}
-
-void SemanticTest::parseExpectations(std::istream& _stream)
-{
-	m_tests += TestFileParser{_stream, m_builtins}.parseFunctionCalls(m_lineOffset);
-}
-
-bool SemanticTest::deploy(
-	std::string const& _contractName,
-	u256 const& _value,
-	bytes const& _arguments,
-	std::map<std::string, solidity::test::Address> const& _libraries
-)
-{
-	auto output = compileAndRunWithoutCheck(m_sources.sources, _value, _contractName, _arguments, _libraries, m_sources.mainSourceFile);
-	return !output.empty() && m_transactionSuccessful;
-}
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
deleted file mode 100644
index efc2b59030e6..000000000000
--- a/test/libsolidity/SemanticTest.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <test/libsolidity/util/TestFileParser.h>
-#include <test/libsolidity/util/TestFunctionCall.h>
-#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/TestCase.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/AnsiColorized.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend::test
-{
-
-struct AnnotatedEventSignature
-{
-	std::string signature;
-	std::vector<std::string> indexedTypes;
-	std::vector<std::string> nonIndexedTypes;
-};
-
-enum class RequiresYulOptimizer
-{
-	False,
-	MinimalStack,
-	Full,
-};
-
-std::ostream& operator<<(std::ostream& _output, RequiresYulOptimizer _requiresYulOptimizer);
-
-/**
- * Class that represents a semantic test (or end-to-end test) and allows running it as part of the
- * boost unit test environment or isoltest. It reads the Solidity source and an additional comment
- * section from the given file. This comment section should define a set of functions to be called
- * and an expected result they return after being executed.
- */
-class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrictedTestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _options)
-	{
-		return std::make_unique<SemanticTest>(
-			_options.filename,
-			_options.evmVersion,
-			_options.eofVersion,
-			_options.vmPaths,
-			_options.enforceGasCost,
-			_options.enforceGasCostMinValue
-		);
-	}
-
-	explicit SemanticTest(
-		std::string const& _filename,
-		langutil::EVMVersion _evmVersion,
-		std::optional<uint8_t> _eofVersion,
-		std::vector<boost::filesystem::path> const& _vmPaths,
-		bool _enforceGasCost = false,
-		u256 _enforceGasCostMinValue = 100000
-	);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
-	void printSource(std::ostream &_stream, std::string const& _linePrefix = "", bool _formatted = false) const override;
-	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix = "") const override;
-	void printUpdatedSettings(std::ostream& _stream, std::string const& _linePrefix = "") override;
-
-	/// Instantiates a test file parser that parses the additional comment section at the end of
-	/// the input stream \param _stream. Each function call is represented using a `FunctionCallTest`
-	/// and added to the list of call to be executed when `run()` is called.
-	/// Throws if parsing expectations failed.
-	void parseExpectations(std::istream& _stream);
-
-	/// Compiles and deploys currently held source.
-	/// Returns true if deployment was successful, false otherwise.
-	bool deploy(std::string const& _contractName, u256 const& _value, bytes const& _arguments, std::map<std::string, solidity::test::Address> const& _libraries = {});
-
-private:
-	TestResult runTest(
-		std::ostream& _stream,
-		std::string const& _linePrefix,
-		bool _formatted,
-		bool _isYulRun
-	);
-	TestResult tryRunTestWithYulOptimizer(
-		std::ostream& _stream,
-		std::string const& _linePrefix,
-		bool _formatted
-	);
-	bool checkGasCostExpectation(TestFunctionCall& io_test, bool _compileViaYul) const;
-	std::map<std::string, Builtin> makeBuiltins();
-	std::vector<SideEffectHook> makeSideEffectHooks() const;
-	std::vector<std::string> eventSideEffectHook(FunctionCall const&) const;
-	std::optional<AnnotatedEventSignature> matchEvent(util::h256 const& hash) const;
-	static std::string formatEventParameter(std::optional<AnnotatedEventSignature> _signature, bool _indexed, size_t _index, bytes const& _data);
-
-	OptimiserSettings optimizerSettingsFor(RequiresYulOptimizer _requiresYulOptimizer);
-
-	SourceMap m_sources;
-	std::size_t m_lineOffset;
-	std::vector<TestFunctionCall> m_tests;
-	std::map<std::string, Builtin> const m_builtins;
-	std::vector<SideEffectHook> const m_sideEffectHooks;
-	bool m_testCaseWantsYulRun = true;
-	bool m_testCaseWantsLegacyRun = true;
-	bool m_runWithABIEncoderV1Only = false;
-	bool m_allowNonExistingFunctions = false;
-	bool m_gasCostFailure = false;
-	bool m_enforceGasCost = false;
-	RequiresYulOptimizer m_requiresYulOptimizer{};
-	u256 m_enforceGasCostMinValue;
-};
-
-}
diff --git a/test/libsolidity/SolidityCompiler.cpp b/test/libsolidity/SolidityCompiler.cpp
deleted file mode 100644
index 7cb95a99d0bc..000000000000
--- a/test/libsolidity/SolidityCompiler.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
- */
-/**
- * Unit tests for the compiler itself.
- */
-
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/Metadata.h>
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::frontend::test
-{
-
-class SolidityCompilerFixture: protected AnalysisFramework
-{
-	void setupCompiler(CompilerStack& _compiler) override
-	{
-		AnalysisFramework::setupCompiler(_compiler);
-
-		// FIXME: This test was probably supposed to respect CommonOptions::get().optimize but
-		// due to a bug it was always running with optimizer disabled and it does not pass with it.
-		_compiler.setOptimiserSettings(false);
-	}
-};
-
-BOOST_FIXTURE_TEST_SUITE(SolidityCompiler, SolidityCompilerFixture)
-
-BOOST_AUTO_TEST_CASE(does_not_include_creation_time_only_internal_functions)
-{
-	char const* sourceCode = R"(
-		contract C {
-			uint x;
-			constructor() { f(); }
-			function f() internal { unchecked { for (uint i = 0; i < 10; ++i) x += 3 + i; } }
-		}
-	)";
-
-	runFramework(sourceCode, PipelineStage::Compilation);
-	BOOST_REQUIRE_MESSAGE(
-		pipelineSuccessful(),
-		"Contract compilation failed:\n" + formatErrors(filteredErrors(), true /* _colored */)
-	);
-
-	bytes const& creationBytecode = solidity::test::bytecodeSansMetadata(compiler().object("C").bytecode);
-	bytes const& runtimeBytecode = solidity::test::bytecodeSansMetadata(compiler().runtimeObject("C").bytecode);
-	BOOST_CHECK(creationBytecode.size() >= 90);
-	BOOST_CHECK(creationBytecode.size() <= 120);
-	auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	unsigned threshold = evmVersion.hasPush0() ? 9 : 10;
-	BOOST_CHECK(runtimeBytecode.size() >= threshold);
-	BOOST_CHECK(runtimeBytecode.size() <= 30);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
deleted file mode 100644
index e34df0307c79..000000000000
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ /dev/null
@@ -1,3842 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @author Gav Wood <g@ethdev.com>
- * @date 2014
- * Unit tests for the solidity expression compiler, testing the behaviour of the code.
- */
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-
-#include <test/Common.h>
-#include <test/EVMHost.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libevmasm/Assembly.h>
-
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/ErrorCodes.h>
-
-#include <libyul/Exceptions.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <range/v3/view/transform.hpp>
-
-#include <functional>
-#include <numeric>
-#include <string>
-#include <tuple>
-
-using namespace std::placeholders;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::test;
-using namespace solidity::langutil;
-
-#define ALSO_VIA_YUL(CODE)                                      \
-{                                                               \
-	m_compileViaYul = false;                                    \
-	RUN_AND_RERUN_WITH_OPTIMIZER_ON_STACK_ERROR(CODE)           \
-                                                                \
-	m_compileViaYul = true;                                     \
-	reset();                                                    \
-	RUN_AND_RERUN_WITH_OPTIMIZER_ON_STACK_ERROR(CODE)           \
-}
-
-#define RUN_AND_RERUN_WITH_OPTIMIZER_ON_STACK_ERROR(CODE)       \
-{                                                               \
-	try                                                         \
-	{ CODE }                                                    \
-	catch (yul::StackTooDeepError const&)                       \
-	{                                                           \
-		if (m_optimiserSettings == OptimiserSettings::full())   \
-			throw;                                              \
-                                                                \
-		reset();                                                \
-		m_optimiserSettings = OptimiserSettings::full();        \
-		{ CODE }                                                \
-	}                                                           \
-}
-
-
-namespace solidity::frontend::test
-{
-
-struct SolidityEndToEndTestExecutionFramework: public SolidityExecutionFramework
-{
-};
-
-BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, SolidityEndToEndTestExecutionFramework)
-
-BOOST_AUTO_TEST_CASE(creation_code_optimizer)
-{
-	std::string codeC = R"(
-		contract C {
-			constructor(uint x) {
-			if (x == 0xFFFFFFFFFFFFFFFF42)
-				revert();
-			}
-		}
-	)";
-	std::string codeD = R"(
-		contract D {
-			function f() public pure returns (bytes memory) {
-				return type(C).creationCode;
-			}
-		}
-	)";
-
-	m_metadataHash = CompilerStack::MetadataHash::None;
-	ALSO_VIA_YUL({
-		bytes bytecodeC = compileContract(codeC);
-		reset();
-		compileAndRun(codeC + codeD);
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0x20, bytecodeC.size()) + encode(bytecodeC, false));
-	})
-}
-
-unsigned constexpr roundTo32(unsigned _num)
-{
-	return (_num + 31) / 32 * 32;
-}
-
-BOOST_AUTO_TEST_CASE(exp_operator)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint a) public returns(uint d) { return 2 ** a; }
-		}
-	)";
-	compileAndRun(sourceCode);
-	testContractAgainstCppOnRange("f(uint256)", [](u256 const& a) -> u256 { return u256(1 << a.convert_to<int>()); }, 0, 16);
-}
-
-BOOST_AUTO_TEST_CASE(exp_zero)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint a) public returns(uint d) { return a ** 0; }
-		}
-	)";
-	compileAndRun(sourceCode);
-	testContractAgainstCppOnRange("f(uint256)", [](u256 const&) -> u256 { return u256(1); }, 0, 16);
-}
-
-/* TODO let's add this back when I figure out the correct type conversion.
-BOOST_AUTO_TEST_CASE(conditional_expression_string_literal)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(bool cond) public returns (bytes32) {
-				return cond ? "true" : "false";
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	ABI_CHECK(callContractFunction("f(bool)", true), encodeArgs(string("true", 4)));
-	ABI_CHECK(callContractFunction("f(bool)", false), encodeArgs(string("false", 5)));
-}
-*/
-
-BOOST_AUTO_TEST_CASE(recursive_calls)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint n) public returns(uint nfac) {
-				if (n <= 1) return 1;
-				else return n * f(n - 1);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		std::function<u256(u256)> recursive_calls_cpp = [&recursive_calls_cpp](u256 const& n) -> u256
-		{
-			if (n <= 1)
-				return 1;
-			else
-				return n * recursive_calls_cpp(n - 1);
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", recursive_calls_cpp, 0, 5);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(while_loop)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint n) public returns(uint nfac) {
-				nfac = 1;
-				uint i = 2;
-				while (i <= n) nfac *= i++;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto while_loop_cpp = [](u256 const& n) -> u256
-		{
-			u256 nfac = 1;
-			u256 i = 2;
-			while (i <= n)
-				nfac *= i++;
-
-			return nfac;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", while_loop_cpp, 0, 5);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(do_while_loop)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint n) public returns(uint nfac) {
-				nfac = 1;
-				uint i = 2;
-				do { nfac *= i++; } while (i <= n);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto do_while_loop_cpp = [](u256 const& n) -> u256
-		{
-			u256 nfac = 1;
-			u256 i = 2;
-			do
-			{
-				nfac *= i++;
-			}
-			while (i <= n);
-
-			return nfac;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", do_while_loop_cpp, 0, 5);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(do_while_loop_multiple_local_vars)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint x) public pure returns(uint r) {
-				uint i = 0;
-				do
-				{
-					uint z = x * 2;
-					if (z < 4) break;
-					else {
-						uint k = z + 1;
-						if (k < 8) {
-							x++;
-							continue;
-						}
-					}
-					if (z > 12) return 0;
-					x++;
-					i++;
-				} while (true);
-				return 42;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto do_while = [](u256 n) -> u256
-		{
-			u256 i = 0;
-			do
-			{
-				u256 z = n * 2;
-				if (z < 4) break;
-				else {
-					u256 k = z + 1;
-					if (k < 8) {
-						n++;
-						continue;
-					}
-				}
-				if (z > 12) return 0;
-				n++;
-				i++;
-			} while (true);
-			return 42;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", do_while, 0, 12);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(nested_loops)
-{
-	// tests that break and continue statements in nested loops jump to the correct place
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint x) public returns(uint y) {
-				while (x > 1) {
-					if (x == 10) break;
-					while (x > 5) {
-						if (x == 8) break;
-						x--;
-						if (x == 6) continue;
-						return x;
-					}
-					x--;
-					if (x == 3) continue;
-					break;
-				}
-				return x;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto nested_loops_cpp = [](u256 n) -> u256
-		{
-			while (n > 1)
-			{
-				if (n == 10)
-					break;
-				while (n > 5)
-				{
-					if (n == 8)
-						break;
-					n--;
-					if (n == 6)
-						continue;
-					return n;
-				}
-				n--;
-				if (n == 3)
-					continue;
-				break;
-			}
-
-			return n;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", nested_loops_cpp, 0, 12);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(nested_loops_multiple_local_vars)
-{
-	// tests that break and continue statements in nested loops jump to the correct place
-	// and free local variables properly
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint x) public returns(uint y) {
-				while (x > 0) {
-					uint z = x + 10;
-					uint k = z + 1;
-					if (k > 20) {
-						break;
-						uint p = 100;
-						k += p;
-					}
-					if (k > 15) {
-						x--;
-						continue;
-						uint t = 1000;
-						x += t;
-					}
-					while (k > 10) {
-						uint m = k - 1;
-						if (m == 10) return x;
-						return k;
-						uint h = 10000;
-						z += h;
-					}
-					x--;
-					break;
-				}
-				return x;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto nested_loops_cpp = [](u256 n) -> u256
-		{
-			while (n > 0)
-			{
-				u256 z = n + 10;
-				u256 k = z + 1;
-				if (k > 20) break;
-				if (k > 15) {
-					n--;
-					continue;
-				}
-				while (k > 10)
-				{
-					u256 m = k - 1;
-					if (m == 10) return n;
-					return k;
-				}
-				n--;
-				break;
-			}
-
-			return n;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", nested_loops_cpp, 0, 12);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(for_loop_multiple_local_vars)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint x) public pure returns(uint r) {
-				for (uint i = 0; i < 12; i++)
-				{
-					uint z = x + 1;
-					if (z < 4) break;
-					else {
-						uint k = z * 2;
-						if (i + k < 10) {
-							x++;
-							continue;
-						}
-					}
-					if (z > 8) return 0;
-					x++;
-				}
-				return 42;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto for_loop = [](u256 n) -> u256
-		{
-			for (u256 i = 0; i < 12; i++)
-			{
-				u256 z = n + 1;
-				if (z < 4) break;
-				else {
-					u256 k = z * 2;
-					if (i + k < 10) {
-						n++;
-						continue;
-					}
-				}
-				if (z > 8) return 0;
-				n++;
-			}
-			return 42;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", for_loop, 0, 12);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(nested_for_loop_multiple_local_vars)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint x) public pure returns(uint r) {
-				for (uint i = 0; i < 5; i++)
-				{
-					uint z = x + 1;
-					if (z < 3) {
-						break;
-						uint p = z + 2;
-					}
-					for (uint j = 0; j < 5; j++)
-					{
-						uint k = z * 2;
-						if (j + k < 8) {
-							x++;
-							continue;
-							uint t = z * 3;
-						}
-						x++;
-						if (x > 20) {
-							return 84;
-							uint h = x + 42;
-						}
-					}
-					if (x > 30) {
-						return 42;
-						uint b = 0xcafe;
-					}
-				}
-				return 42;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto for_loop = [](u256 n) -> u256
-		{
-			for (u256 i = 0; i < 5; i++)
-			{
-				u256 z = n + 1;
-				if (z < 3) break;
-				for (u256 j = 0; j < 5; j++)
-				{
-					u256 k = z * 2;
-					if (j + k < 8) {
-						n++;
-						continue;
-					}
-					n++;
-					if (n > 20) return 84;
-				}
-				if (n > 30) return 42;
-			}
-			return 42;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", for_loop, 0, 12);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(for_loop)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint n) public returns(uint nfac) {
-				nfac = 1;
-				uint i;
-				for (i = 2; i <= n; i++)
-					nfac *= i;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto for_loop_cpp = [](u256 const& n) -> u256
-		{
-			u256 nfac = 1;
-			for (auto i = 2; i <= n; i++)
-				nfac *= i;
-			return nfac;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", for_loop_cpp, 0, 5);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(for_loop_simple_init_expr)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint n) public returns(uint nfac) {
-				nfac = 1;
-				uint256 i;
-				for (i = 2; i <= n; i++)
-					nfac *= i;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto for_loop_simple_init_expr_cpp = [](u256 const& n) -> u256
-		{
-			u256 nfac = 1;
-			u256 i;
-			for (i = 2; i <= n; i++)
-				nfac *= i;
-			return nfac;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", for_loop_simple_init_expr_cpp, 0, 5);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(for_loop_break_continue)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint n) public returns (uint r)
-			{
-				uint i = 1;
-				uint k = 0;
-				for (i *= 5; k < n; i *= 7)
-				{
-					k++;
-					i += 4;
-					if (n % 3 == 0)
-						break;
-					i += 9;
-					if (n % 2 == 0)
-						continue;
-					i += 19;
-				}
-				return i;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto breakContinue = [](u256 const& n) -> u256
-		{
-			u256 i = 1;
-			u256 k = 0;
-			for (i *= 5; k < n; i *= 7)
-			{
-				k++;
-				i += 4;
-				if (n % 3 == 0)
-					break;
-				i += 9;
-				if (n % 2 == 0)
-					continue;
-				i += 19;
-			}
-			return i;
-		};
-
-		testContractAgainstCppOnRange("f(uint256)", breakContinue, 0, 10);
-	);
-}
-
-BOOST_AUTO_TEST_CASE(short_circuiting)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function run(uint x) public returns(uint y) {
-				x == 0 || ((x = 8) > 0);
-				return x;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		auto short_circuiting_cpp = [](u256 n) -> u256
-		{
-			(void)(n == 0 || (n = 8) > 0);
-			return n;
-		};
-
-		testContractAgainstCppOnRange("run(uint256)", short_circuiting_cpp, 0, 2);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(high_bits_cleaning)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function run() public returns(uint256 y) {
-				unchecked {
-					uint32 t = uint32(0xffffffff);
-					uint32 x = t + 10;
-					if (x >= 0xffffffff) return 0;
-					return x;
-				}
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	auto high_bits_cleaning_cpp = []() -> u256
-	{
-		uint32_t t = uint32_t(0xffffffff);
-		uint32_t x = t + 10;
-		if (x >= 0xffffffff)
-			return 0;
-		return x;
-	};
-	testContractAgainstCpp("run()", high_bits_cleaning_cpp);
-}
-
-BOOST_AUTO_TEST_CASE(sign_extension)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function run() public returns(uint256 y) {
-				unchecked {
-					int64 x = -int32(int64(0xff));
-					if (x >= 0xff) return 0;
-					return 0 - uint256(int256(x));
-				}
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	auto sign_extension_cpp = []() -> u256
-	{
-		int64_t x = -int32_t(0xff);
-		if (x >= 0xff)
-			return 0;
-		return u256(x) * -1;
-	};
-	testContractAgainstCpp("run()", sign_extension_cpp);
-}
-
-BOOST_AUTO_TEST_CASE(small_unsigned_types)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function run() public returns(uint256 y) {
-				unchecked {
-					uint32 t = uint32(0xffffff);
-					uint32 x = t * 0xffffff;
-					return x / 0x100;
-				}
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	auto small_unsigned_types_cpp = []() -> u256
-	{
-		uint32_t t = uint32_t(0xffffff);
-		uint32_t x = t * 0xffffff;
-		return x / 0x100;
-	};
-	testContractAgainstCpp("run()", small_unsigned_types_cpp);
-}
-
-BOOST_AUTO_TEST_CASE(mapping_state_inc_dec)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint value;
-			mapping(uint => uint) table;
-			function f(uint x) public returns (uint y) {
-				value = x;
-				if (x > 0) table[++value] = 8;
-				if (x > 1) value--;
-				if (x > 2) table[value]++;
-				table[value] += 10;
-				return --table[value++];
-			}
-		}
-	)";
-
-	u256 value;
-	std::map<u256, u256> table;
-	auto f = [&](u256 const& _x) -> u256
-	{
-		value = _x;
-		if (_x > 0)
-			table[++value] = 8;
-		if (_x > 1)
-			value --;
-		if (_x > 2)
-			table[value]++;
-		table[value] += 10;
-		return --table[value++];
-	};
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		value = 0;
-		table.clear();
-
-		testContractAgainstCppOnRange("f(uint256)", f, 0, 5);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(multi_level_mapping)
-{
-	char const* sourceCode = R"(
-		contract test {
-			mapping(uint => mapping(uint => uint)) table;
-			function f(uint x, uint y, uint z) public returns (uint w) {
-				if (z == 0) return table[x][y];
-				else return table[x][y] = z;
-			}
-		}
-	)";
-	std::map<u256, std::map<u256, u256>> table;
-	auto f = [&](u256 const& _x, u256 const& _y, u256 const& _z) -> u256
-	{
-		if (_z == 0) return table[_x][_y];
-		else return table[_x][_y] = _z;
-	};
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		table.clear();
-
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(4), u256(5), u256(0));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(5), u256(4), u256(0));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(4), u256(5), u256(9));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(4), u256(5), u256(0));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(5), u256(4), u256(0));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(5), u256(4), u256(7));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(4), u256(5), u256(0));
-		testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(5), u256(4), u256(0));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(constructor)
-{
-	char const* sourceCode = R"(
-		contract test {
-			mapping(uint => uint) data;
-			constructor() {
-				data[7] = 8;
-			}
-			function get(uint key) public returns (uint value) {
-				return data[key];
-			}
-		}
-	)";
-
-	std::map<u256, uint8_t> data;
-	data[7] = 8;
-	auto get = [&](u256 const& _x) -> u256
-	{
-		return data[_x];
-	};
-
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		testContractAgainstCpp("get(uint256)", get, u256(6));
-		testContractAgainstCpp("get(uint256)", get, u256(7));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(send_ether)
-{
-	char const* sourceCode = R"(
-		contract test {
-			constructor() payable {}
-			function a(address payable addr, uint amount) public returns (uint ret) {
-				addr.send(amount);
-				return address(this).balance;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		u256 amount(250);
-		compileAndRun(sourceCode, amount + 1);
-		h160 address(23);
-		ABI_CHECK(callContractFunction("a(address,uint256)", address, amount), encodeArgs(1));
-		BOOST_CHECK_EQUAL(balanceAt(address), amount);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(transfer_ether)
-{
-	char const* sourceCode = R"(
-		contract A {
-			constructor() payable {}
-			function a(address payable addr, uint amount) public returns (uint) {
-				addr.transfer(amount);
-				return address(this).balance;
-			}
-			function b(address payable addr, uint amount) public {
-				addr.transfer(amount);
-			}
-		}
-
-		contract B {
-		}
-
-		contract C {
-			receive () external payable {
-				revert();
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "B");
-		h160 const nonPayableRecipient = m_contractAddress;
-		compileAndRun(sourceCode, 0, "C");
-		h160 const oogRecipient = m_contractAddress;
-		compileAndRun(sourceCode, 20, "A");
-		h160 payableRecipient(23);
-		ABI_CHECK(callContractFunction("a(address,uint256)", payableRecipient, 10), encodeArgs(10));
-		BOOST_CHECK_EQUAL(balanceAt(payableRecipient), 10);
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
-		ABI_CHECK(callContractFunction("b(address,uint256)", nonPayableRecipient, 10), encodeArgs());
-		ABI_CHECK(callContractFunction("b(address,uint256)", oogRecipient, 10), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_CASE(inter_contract_calls)
-{
-	char const* sourceCode = R"(
-		contract Helper {
-			function multiply(uint a, uint b) public returns (uint c) {
-				return a * b;
-			}
-		}
-		contract Main {
-			Helper h;
-			function callHelper(uint a, uint b) public returns (uint c) {
-				return h.multiply(a, b);
-			}
-			function getHelper() public returns (address haddress) {
-				return address(h);
-			}
-			function setHelper(address haddress) public {
-				h = Helper(haddress);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 0, "Main");
-	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
-	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	u256 a(3456789);
-	u256 b("0x282837623374623234aa74");
-	BOOST_REQUIRE(callContractFunction("callHelper(uint256,uint256)", a, b) == encodeArgs(a * b));
-}
-
-BOOST_AUTO_TEST_CASE(inter_contract_calls_with_complex_parameters)
-{
-	char const* sourceCode = R"(
-		contract Helper {
-			function sel(uint a, bool select, uint b) public returns (uint c) {
-				if (select) return a; else return b;
-			}
-		}
-		contract Main {
-			Helper h;
-			function callHelper(uint a, bool select, uint b) public returns (uint c) {
-				return h.sel(a, select, b) * 3;
-			}
-			function getHelper() public returns (address haddress) {
-				return address(h);
-			}
-			function setHelper(address haddress) public {
-				h = Helper(haddress);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 0, "Main");
-	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
-	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	u256 a(3456789);
-	u256 b("0x282837623374623234aa74");
-	BOOST_REQUIRE(callContractFunction("callHelper(uint256,bool,uint256)", a, true, b) == encodeArgs(a * 3));
-	BOOST_REQUIRE(callContractFunction("callHelper(uint256,bool,uint256)", a, false, b) == encodeArgs(b * 3));
-}
-
-BOOST_AUTO_TEST_CASE(inter_contract_calls_accessing_this)
-{
-	char const* sourceCode = R"(
-		contract Helper {
-			function getAddress() public returns (address addr) {
-				return address(this);
-			}
-		}
-		contract Main {
-			Helper h;
-			function callHelper() public returns (address addr) {
-				return h.getAddress();
-			}
-			function getHelper() public returns (address addr) {
-				return address(h);
-			}
-			function setHelper(address addr) public {
-				h = Helper(addr);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 0, "Main");
-	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
-	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	BOOST_REQUIRE(callContractFunction("callHelper()") == encodeArgs(c_helperAddress));
-}
-
-BOOST_AUTO_TEST_CASE(calls_to_this)
-{
-	char const* sourceCode = R"(
-		contract Helper {
-			function invoke(uint a, uint b) public returns (uint c) {
-				return this.multiply(a, b, 10);
-			}
-			function multiply(uint a, uint b, uint8 c) public returns (uint ret) {
-				return a * b + c;
-			}
-		}
-		contract Main {
-			Helper h;
-			function callHelper(uint a, uint b) public returns (uint ret) {
-				return h.invoke(a, b);
-			}
-			function getHelper() public returns (address addr) {
-				return address(h);
-			}
-			function setHelper(address addr) public {
-				h = Helper(addr);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 0, "Main");
-	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
-	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	u256 a(3456789);
-	u256 b("0x282837623374623234aa74");
-	BOOST_REQUIRE(callContractFunction("callHelper(uint256,uint256)", a, b) == encodeArgs(a * b + 10));
-}
-
-BOOST_AUTO_TEST_CASE(inter_contract_calls_with_local_vars)
-{
-	// note that a reference to another contract's function occupies two stack slots,
-	// so this tests correct stack slot allocation
-	char const* sourceCode = R"(
-		contract Helper {
-			function multiply(uint a, uint b) public returns (uint c) {
-				return a * b;
-			}
-		}
-		contract Main {
-			Helper h;
-			function callHelper(uint a, uint b) public returns (uint c) {
-				uint8 y = 9;
-				uint256 ret = h.multiply(a, b);
-				return ret + y;
-			}
-			function getHelper() public returns (address haddress) {
-				return address(h);
-			}
-			function setHelper(address haddress) public {
-				h = Helper(haddress);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 0, "Main");
-	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
-	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	u256 a(3456789);
-	u256 b("0x282837623374623234aa74");
-	BOOST_REQUIRE(callContractFunction("callHelper(uint256,uint256)", a, b) == encodeArgs(a * b + 9));
-}
-
-BOOST_AUTO_TEST_CASE(fixed_bytes_in_calls)
-{
-	char const* sourceCode = R"(
-		contract Helper {
-			function invoke(bytes3 x, bool stop) public returns (bytes4 ret) {
-				return x;
-			}
-		}
-		contract Main {
-			Helper h;
-			function callHelper(bytes2 x, bool stop) public returns (bytes5 ret) {
-				return h.invoke(x, stop);
-			}
-			function getHelper() public returns (address addr) {
-				return address(h);
-			}
-			function setHelper(address addr) public {
-				h = Helper(addr);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 0, "Main");
-	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
-	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	ABI_CHECK(callContractFunction("callHelper(bytes2,bool)", std::string("\0a", 2), true), encodeArgs(std::string("\0a\0\0\0", 5)));
-}
-
-BOOST_AUTO_TEST_CASE(constructor_with_long_arguments)
-{
-	char const* sourceCode = R"(
-		contract Main {
-			string public a;
-			string public b;
-
-			constructor(string memory _a, string memory _b) {
-				a = _a;
-				b = _b;
-			}
-		}
-	)";
-	std::string a = "01234567890123gabddunaouhdaoneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012cdef";
-	std::string b = "AUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PY";
-
-	compileAndRun(sourceCode, 0, "Main", encodeArgs(
-		u256(0x40),
-		u256(0x40 + 0x20 + ((a.length() + 31) / 32) * 32),
-		u256(a.length()),
-		a,
-		u256(b.length()),
-		b
-	));
-	ABI_CHECK(callContractFunction("a()"), encodeDyn(a));
-	ABI_CHECK(callContractFunction("b()"), encodeDyn(b));
-}
-
-BOOST_AUTO_TEST_CASE(contracts_as_addresses)
-{
-	char const* sourceCode = R"(
-		contract helper {
-			receive() external payable { } // can receive ether
-		}
-		contract test {
-			helper h;
-			constructor() payable { h = new helper(); payable(h).send(5); }
-			function getBalance() public returns (uint256 myBalance, uint256 helperBalance) {
-				myBalance = address(this).balance;
-				helperBalance = address(h).balance;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 20);
-	BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 20 - 5);
-	BOOST_REQUIRE(callContractFunction("getBalance()") == encodeArgs(u256(20 - 5), u256(5)));
-}
-
-BOOST_AUTO_TEST_CASE(blockhash)
-{
-	char const* sourceCode = R"(
-		contract C {
-			uint256 counter;
-			function g() public returns (bool) { counter++; return true; }
-			function f() public returns (bytes32[] memory r) {
-				r = new bytes32[](259);
-				for (uint i = 0; i < 259; i++) {
-					unchecked {
-						r[i] = blockhash(block.number - 257 + i);
-					}
-				}
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	// generate a sufficient amount of blocks
-	while (blockNumber() < u256(255))
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(true));
-
-	std::vector<u256> hashes;
-	// ``blockhash()`` is only valid for the last 256 blocks, otherwise zero
-	hashes.emplace_back(0);
-	for (u256 i = blockNumber() - u256(255); i <= blockNumber(); i++)
-		hashes.emplace_back(blockHash(i));
-	// the current block hash is not yet known at execution time and therefore zero
-	hashes.emplace_back(0);
-	// future block hashes are zero
-	hashes.emplace_back(0);
-
-	ABI_CHECK(callContractFunction("f()"), encodeDyn(hashes));
-}
-
-BOOST_AUTO_TEST_CASE(internal_constructor)
-{
-	char const* sourceCode = R"(
-		abstract contract C {
-			constructor() {}
-		}
-	)";
-	// via yul disabled because it will throw an error instead of
-	// returning empty bytecode.
-	BOOST_CHECK(compileAndRunWithoutCheck({{"", sourceCode}}, 0, "C").empty());
-}
-
-BOOST_AUTO_TEST_CASE(default_fallback_throws)
-{
-	char const* sourceCode = R"YY(
-		contract A {
-			function f() public returns (bool) {
-				(bool success,) = address(this).call("");
-				return success;
-			}
-		}
-	)YY";
-	compileAndRun(sourceCode);
-	ABI_CHECK(callContractFunction("f()"), encodeArgs(0));
-
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-	{
-		char const* sourceCode = R"YY(
-			contract A {
-				function f() public returns (bool) {
-					(bool success, bytes memory data) = address(this).staticcall("");
-					assert(data.length == 0);
-					return success;
-				}
-			}
-		)YY";
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(empty_name_input_parameter_with_named_one)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint, uint k) public returns(uint ret_k, uint ret_g){
-				uint g = 8;
-				ret_k = k;
-				ret_g = g;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		BOOST_CHECK(callContractFunction("f(uint256,uint256)", 5, 9) != encodeArgs(5, 8));
-		ABI_CHECK(callContractFunction("f(uint256,uint256)", 5, 9), encodeArgs(9, 8));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(generic_call)
-{
-	char const* sourceCode = R"**(
-			contract receiver {
-				uint public received;
-				function recv(uint256 x) public payable { received = x; }
-			}
-			contract sender {
-				constructor() payable {}
-				function doSend(address rec) public returns (uint d)
-				{
-					bytes4 signature = bytes4(bytes32(keccak256("recv(uint256)")));
-					rec.call{value: 2}(abi.encodeWithSelector(signature, 23));
-					return receiver(rec).received();
-				}
-			}
-	)**";
-	compileAndRun(sourceCode, 0, "receiver");
-	h160 const c_receiverAddress = m_contractAddress;
-	compileAndRun(sourceCode, 50, "sender");
-	BOOST_REQUIRE(callContractFunction("doSend(address)", c_receiverAddress) == encodeArgs(23));
-	BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 50 - 2);
-}
-
-BOOST_AUTO_TEST_CASE(generic_delegatecall)
-{
-	char const* sourceCode = R"**(
-			contract Receiver {
-				uint public received;
-				address public sender;
-				uint public value;
-				constructor() payable {}
-				function recv(uint256 x) public payable { received = x; sender = msg.sender; value = msg.value; }
-			}
-			contract Sender {
-				uint public received;
-				address public sender;
-				uint public value;
-				constructor() payable {}
-				function doSend(address rec) public payable
-				{
-					bytes4 signature = bytes4(bytes32(keccak256("recv(uint256)")));
-					(bool success,) = rec.delegatecall(abi.encodeWithSelector(signature, 23));
-					success;
-				}
-			}
-	)**";
-
-	for (auto v2: {false, true})
-	{
-		std::string source = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n" + std::string(sourceCode);
-
-		compileAndRun(source, 0, "Receiver");
-		h160 const c_receiverAddress = m_contractAddress;
-		compileAndRun(source, 50, "Sender");
-		h160 const c_senderAddress = m_contractAddress;
-		BOOST_CHECK(m_sender != c_senderAddress); // just for sanity
-		ABI_CHECK(callContractFunctionWithValue("doSend(address)", 11, c_receiverAddress), encodeArgs());
-		ABI_CHECK(callContractFunction("received()"), encodeArgs(u256(23)));
-		ABI_CHECK(callContractFunction("sender()"), encodeArgs(m_sender));
-		ABI_CHECK(callContractFunction("value()"), encodeArgs(u256(11)));
-		m_contractAddress = c_receiverAddress;
-		ABI_CHECK(callContractFunction("received()"), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("sender()"), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("value()"), encodeArgs(u256(0)));
-		BOOST_CHECK(storageEmpty(c_receiverAddress));
-		BOOST_CHECK(!storageEmpty(c_senderAddress));
-		BOOST_CHECK_EQUAL(balanceAt(c_receiverAddress), 0);
-		BOOST_CHECK_EQUAL(balanceAt(c_senderAddress), 50 + 11);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(generic_staticcall)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-	{
-		char const* sourceCode = R"**(
-				contract A {
-					uint public x;
-					constructor() { x = 42; }
-					function pureFunction(uint256 p) public pure returns (uint256) { return p; }
-					function viewFunction(uint256 p) public view returns (uint256) { return p + x; }
-					function nonpayableFunction(uint256 p) public returns (uint256) { x = p; return x; }
-					function assertFunction(uint256 p) public view returns (uint256) { assert(x == p); return x; }
-				}
-				contract C {
-					function f(address a) public view returns (bool, bytes memory)
-					{
-						return a.staticcall(abi.encodeWithSignature("pureFunction(uint256)", 23));
-					}
-					function g(address a) public view returns (bool, bytes memory)
-					{
-						return a.staticcall(abi.encodeWithSignature("viewFunction(uint256)", 23));
-					}
-					function h(address a) public view returns (bool, bytes memory)
-					{
-						return a.staticcall(abi.encodeWithSignature("nonpayableFunction(uint256)", 23));
-					}
-					function i(address a, uint256 v) public view returns (bool, bytes memory)
-					{
-						return a.staticcall(abi.encodeWithSignature("assertFunction(uint256)", v));
-					}
-				}
-		)**";
-		compileAndRun(sourceCode, 0, "A");
-		h160 const c_addressA = m_contractAddress;
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("f(address)", c_addressA), encodeArgs(true, 0x40, 0x20, 23));
-		ABI_CHECK(callContractFunction("g(address)", c_addressA), encodeArgs(true, 0x40, 0x20, 23 + 42));
-		ABI_CHECK(callContractFunction("h(address)", c_addressA), encodeArgs(false, 0x40, 0x00));
-		ABI_CHECK(callContractFunction("i(address,uint256)", c_addressA, 42), encodeArgs(true, 0x40, 0x20, 42));
-		ABI_CHECK(callContractFunction("i(address,uint256)", c_addressA, 23), encodeArgs(false, 0x40, 0x24) + panicData(PanicCode::Assert) + bytes(32 - 4, 0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(library_call_protection)
-{
-	// This tests code that reverts a call if it is a direct call to a library
-	// as opposed to a delegatecall.
-	char const* sourceCode = R"(
-		library Lib {
-			struct S { uint x; }
-			// a direct call to this should revert
-			function np(S storage s) public returns (address) { s.x = 3; return msg.sender; }
-			// a direct call to this is fine
-			function v(S storage) public view returns (address) { return msg.sender; }
-			// a direct call to this is fine
-			function pu() public pure returns (uint) { return 2; }
-		}
-		contract Test {
-			Lib.S public s;
-			function np() public returns (address) { return Lib.np(s); }
-			function v() public view returns (address) { return Lib.v(s); }
-			function pu() public pure returns (uint) { return Lib.pu(); }
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "Lib");
-		ABI_CHECK(callContractFunction("np(Lib.S storage)", 0), encodeArgs());
-		ABI_CHECK(callContractFunction("v(Lib.S storage)", 0), encodeArgs(m_sender));
-		ABI_CHECK(callContractFunction("pu()"), encodeArgs(2));
-		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("s()"), encodeArgs(0));
-		ABI_CHECK(callContractFunction("np()"), encodeArgs(m_sender));
-		ABI_CHECK(callContractFunction("s()"), encodeArgs(3));
-		ABI_CHECK(callContractFunction("v()"), encodeArgs(m_sender));
-		ABI_CHECK(callContractFunction("pu()"), encodeArgs(2));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bytes_from_calldata_to_memory)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f() public returns (bytes32) {
-				return keccak256(abi.encodePacked("abc", msg.data));
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		bytes calldata1 = util::selectorFromSignatureH32("f()").asBytes() + bytes(61, 0x22) + bytes(12, 0x12);
-		sendMessage(calldata1, false);
-		BOOST_CHECK(m_transactionSuccessful);
-		BOOST_CHECK(m_output == encodeArgs(util::keccak256(bytes{'a', 'b', 'c'} + calldata1)));
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_forward_bytes_length)
-{
-	char const* sourceCode = R"(
-		contract receiver {
-			uint public calledLength;
-			fallback() external { calledLength = msg.data.length; }
-		}
-		contract sender {
-			receiver rec;
-			constructor() { rec = new receiver(); }
-			function viaCalldata() public returns (uint) {
-				(bool success,) = address(rec).call(msg.data);
-				require(success);
-				return rec.calledLength();
-			}
-			function viaMemory() public returns (uint) {
-				bytes memory x = msg.data;
-				(bool success,) = address(rec).call(x);
-				require(success);
-				return rec.calledLength();
-			}
-			bytes s;
-			function viaStorage() public returns (uint) {
-				s = msg.data;
-				(bool success,) = address(rec).call(s);
-				require(success);
-				return rec.calledLength();
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "sender");
-
-		// No additional data, just function selector
-		ABI_CHECK(callContractFunction("viaCalldata()"), encodeArgs(4));
-		ABI_CHECK(callContractFunction("viaMemory()"), encodeArgs(4));
-		ABI_CHECK(callContractFunction("viaStorage()"), encodeArgs(4));
-
-		// Some additional unpadded data
-		bytes unpadded = asBytes(std::string("abc"));
-		ABI_CHECK(callContractFunctionNoEncoding("viaCalldata()", unpadded), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("viaMemory()", unpadded), encodeArgs(7));
-		ABI_CHECK(callContractFunctionNoEncoding("viaStorage()", unpadded), encodeArgs(7));
-	);
-}
-
-BOOST_AUTO_TEST_CASE(copying_bytes_multiassign)
-{
-	char const* sourceCode = R"(
-		contract receiver {
-			uint public received;
-			function recv(uint x) public { received += x + 1; }
-			fallback() external { received = 0x80; }
-		}
-		contract sender {
-			constructor() { rec = new receiver(); }
-			fallback() external { savedData1 = savedData2 = msg.data; }
-			function forward(bool selector) public returns (bool) {
-				if (selector) { address(rec).call(savedData1); delete savedData1; }
-				else { address(rec).call(savedData2); delete savedData2; }
-				return true;
-			}
-			function val() public returns (uint) { return rec.received(); }
-			receiver rec;
-			bytes savedData1;
-			bytes savedData2;
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "sender");
-		ABI_CHECK(callContractFunction("recv(uint256)", 7), bytes());
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(0));
-		ABI_CHECK(callContractFunction("forward(bool)", true), encodeArgs(true));
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(8));
-		ABI_CHECK(callContractFunction("forward(bool)", false), encodeArgs(true));
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(16));
-		ABI_CHECK(callContractFunction("forward(bool)", true), encodeArgs(true));
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(0x80));
-	);
-}
-
-BOOST_AUTO_TEST_CASE(copy_from_calldata_removes_bytes_data)
-{
-	char const* sourceCode = R"(
-		contract c {
-			function set() public returns (bool) { data = msg.data; return true; }
-			fallback() external { data = msg.data; }
-			bytes data;
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction("set()", 1, 2, 3, 4, 5), encodeArgs(true));
-		BOOST_CHECK(!storageEmpty(m_contractAddress));
-		sendMessage(bytes(), false);
-		BOOST_CHECK(m_transactionSuccessful);
-		BOOST_CHECK(m_output.empty());
-		BOOST_CHECK(storageEmpty(m_contractAddress));
-	);
-}
-
-BOOST_AUTO_TEST_CASE(struct_referencing)
-{
-	static char const* sourceCode = R"(
-		pragma abicoder v2;
-		interface I {
-			struct S { uint a; }
-		}
-		library L {
-			struct S { uint b; uint a; }
-			function f() public pure returns (S memory) {
-				S memory s;
-				s.a = 3;
-				return s;
-			}
-			function g() public pure returns (I.S memory) {
-				I.S memory s;
-				s.a = 4;
-				return s;
-			}
-			// argument-dependent lookup tests
-			function a(I.S memory) public pure returns (uint) { return 1; }
-			function a(S memory) public pure returns (uint) { return 2; }
-		}
-		contract C is I {
-			function f() public pure returns (S memory) {
-				S memory s;
-				s.a = 1;
-				return s;
-			}
-			function g() public pure returns (I.S memory) {
-				I.S memory s;
-				s.a = 2;
-				return s;
-			}
-			function h() public pure returns (L.S memory) {
-				L.S memory s;
-				s.a = 5;
-				return s;
-			}
-			function x() public pure returns (L.S memory) {
-				return L.f();
-			}
-			function y() public pure returns (I.S memory) {
-				return L.g();
-			}
-			function a1() public pure returns (uint) { S memory s; return L.a(s); }
-			function a2() public pure returns (uint) { L.S memory s; return L.a(s); }
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "L");
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 3));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(4));
-		compileAndRun(sourceCode, 0, "C", bytes(), std::map<std::string, h160>{ {":L", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(1));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(2));
-		ABI_CHECK(callContractFunction("h()"), encodeArgs(0, 5));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(0, 3));
-		ABI_CHECK(callContractFunction("y()"), encodeArgs(4));
-		ABI_CHECK(callContractFunction("a1()"), encodeArgs(1));
-		ABI_CHECK(callContractFunction("a2()"), encodeArgs(2));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(enum_referencing)
-{
-	char const* sourceCode = R"(
-		interface I {
-			enum Direction { A, B, Left, Right }
-		}
-		library L {
-			enum Direction { Left, Right }
-			function f() public pure returns (Direction) {
-				return Direction.Right;
-			}
-			function g() public pure returns (I.Direction) {
-				return I.Direction.Right;
-			}
-		}
-		contract C is I {
-			function f() public pure returns (Direction) {
-				return Direction.Right;
-			}
-			function g() public pure returns (I.Direction) {
-				return I.Direction.Right;
-			}
-			function h() public pure returns (L.Direction) {
-				return L.Direction.Right;
-			}
-			function x() public pure returns (L.Direction) {
-				return L.f();
-			}
-			function y() public pure returns (I.Direction) {
-				return L.g();
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "L");
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(1));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(3));
-		compileAndRun(sourceCode, 0, "C", bytes(), std::map<std::string, h160>{{":L", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(3));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(3));
-		ABI_CHECK(callContractFunction("h()"), encodeArgs(1));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(1));
-		ABI_CHECK(callContractFunction("y()"), encodeArgs(3));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bytes_in_arguments)
-{
-	char const* sourceCode = R"(
-		contract c {
-			uint result;
-			function f(uint a, uint b) public { result += a + b; }
-			function g(uint a) public { result *= a; }
-			function test(uint a, bytes calldata data1, bytes calldata data2, uint b) external returns (uint r_a, uint r, uint r_b, uint l) {
-				r_a = a;
-				address(this).call(data1);
-				address(this).call(data2);
-				r = result;
-				r_b = b;
-				l = data1.length;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-
-		std::string innercalldata1 = asString(util::selectorFromSignatureH32("f(uint256,uint256)").asBytes() + encodeArgs(8, 9));
-		std::string innercalldata2 = asString(util::selectorFromSignatureH32("g(uint256)").asBytes() + encodeArgs(3));
-		bytes calldata = encodeArgs(
-			12, 32 * 4, u256(32 * 4 + 32 + (innercalldata1.length() + 31) / 32 * 32), 13,
-			u256(innercalldata1.length()), innercalldata1,
-			u256(innercalldata2.length()), innercalldata2);
-		ABI_CHECK(
-			callContractFunction("test(uint256,bytes,bytes,uint256)", calldata),
-			encodeArgs(12, (8 + 9) * 3, 13, u256(innercalldata1.length()))
-		);
-	);
-}
-
-BOOST_AUTO_TEST_CASE(array_copy_storage_abi)
-{
-	// NOTE: This does not really test copying from storage to ABI directly,
-	// because it will always copy to memory first.
-	char const* sourceCode = R"(
-		pragma abicoder v2;
-		contract c {
-			uint8[] x;
-			uint16[] y;
-			uint24[] z;
-			uint24[][] w;
-			function test1() public returns (uint8[] memory) {
-				for (uint i = 0; i < 101; ++i)
-					x.push(uint8(i));
-				return x;
-			}
-			function test2() public returns (uint16[] memory) {
-				for (uint i = 0; i < 101; ++i)
-					y.push(uint16(i));
-				return y;
-			}
-			function test3() public returns (uint24[] memory) {
-				for (uint i = 0; i < 101; ++i)
-					z.push(uint24(i));
-				return z;
-			}
-			function test4() public returns (uint24[][] memory) {
-				w = new uint24[][](5);
-				for (uint i = 0; i < 5; ++i)
-					for (uint j = 0; j < 101; ++j)
-						w[i].push(uint24(j));
-				return w;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode);
-		bytes valueSequence;
-		for (size_t i = 0; i < 101; ++i)
-			valueSequence += toBigEndian(u256(i));
-		ABI_CHECK(callContractFunction("test1()"), encodeArgs(0x20, 101) + valueSequence);
-		ABI_CHECK(callContractFunction("test2()"), encodeArgs(0x20, 101) + valueSequence);
-		ABI_CHECK(callContractFunction("test3()"), encodeArgs(0x20, 101) + valueSequence);
-		ABI_CHECK(callContractFunction("test4()"),
-			encodeArgs(0x20, 5, 0xa0, 0xa0 + 102 * 32 * 1, 0xa0 + 102 * 32 * 2, 0xa0 + 102 * 32 * 3, 0xa0 + 102 * 32 * 4) +
-			encodeArgs(101) + valueSequence +
-			encodeArgs(101) + valueSequence +
-			encodeArgs(101) + valueSequence +
-			encodeArgs(101) + valueSequence +
-			encodeArgs(101) + valueSequence
-		);
-	);
-}
-
-//BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars)
-//{
-//	char const* sourceCode = R"(
-//		contract C {
-//			uint[3] constant x = [uint(1), 2, 3];
-//			uint constant y = x[0] + x[1] + x[2];
-//			function f() public returns (uint) { return y; }
-//		}
-//	)";
-//	compileAndRun(sourceCode);
-//	ABI_CHECK(callContractFunction("f()"), encodeArgs(1 + 2 + 3));
-//}
-
-// Disabled until https://github.com/ethereum/solidity/issues/715 is implemented
-//BOOST_AUTO_TEST_CASE(constant_struct)
-//{
-//	char const* sourceCode = R"(
-//		contract C {
-//			struct S { uint x; uint[] y; }
-//			S constant x = S(5, new uint[](4));
-//			function f() public returns (uint) { return x.x; }
-//		}
-//	)";
-//	compileAndRun(sourceCode);
-//	ABI_CHECK(callContractFunction("f()"), encodeArgs(5));
-//}
-
-BOOST_AUTO_TEST_CASE(evm_exceptions_in_constructor_out_of_baund)
-{
-	char const* sourceCode = R"(
-		contract A {
-			uint public test = 1;
-			uint[3] arr;
-			constructor()
-			{
-				uint index = 5;
-				test = arr[index];
-				++test;
-			}
-		}
-	)";
-	ABI_CHECK(compileAndRunWithoutCheck({{"", sourceCode}}, 0, "A"), panicData(PanicCode::ArrayOutOfBounds));
-	BOOST_CHECK(!m_transactionSuccessful);
-}
-
-BOOST_AUTO_TEST_CASE(failing_send)
-{
-	char const* sourceCode = R"(
-		contract Helper {
-			uint[] data;
-			fallback () external {
-				data[9]; // trigger exception
-			}
-		}
-		contract Main {
-			constructor() payable {}
-			function callHelper(address payable _a) public returns (bool r, uint bal) {
-				r = !_a.send(5);
-				bal = address(this).balance;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Helper");
-	h160 const c_helperAddress = m_contractAddress;
-	compileAndRun(sourceCode, 20, "Main");
-	BOOST_REQUIRE(callContractFunction("callHelper(address)", c_helperAddress) == encodeArgs(true, 20));
-}
-
-BOOST_AUTO_TEST_CASE(return_multiple_strings_of_various_sizes)
-{
-	char const* sourceCode = R"(
-		contract Main {
-			string public s1;
-			string public s2;
-			function set(string calldata _s1, uint x, string calldata _s2) external returns (uint) {
-				s1 = _s1;
-				s2 = _s2;
-				return x;
-			}
-			function get() public returns (string memory r1, string memory r2) {
-				r1 = s1;
-				r2 = s2;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Main");
-	std::string s1(
-		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
-		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
-		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
-		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
-	);
-	std::string s2(
-		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
-		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
-		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
-		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
-		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
-	);
-	std::vector<size_t> lengths{0, 30, 32, 63, 64, 65, 210, 300};
-	for (auto l1: lengths)
-		for (auto l2: lengths)
-		{
-			bytes dyn1 = encodeArgs(u256(l1), s1.substr(0, l1));
-			bytes dyn2 = encodeArgs(u256(l2), s2.substr(0, l2));
-			bytes args = encodeArgs(u256(0x60), u256(l1), u256(0x60 + dyn1.size())) + dyn1 + dyn2;
-			BOOST_REQUIRE(
-				callContractFunction("set(string,uint256,string)", asString(args)) ==
-				encodeArgs(u256(l1))
-			);
-			bytes result = encodeArgs(u256(0x40), u256(0x40 + dyn1.size())) + dyn1 + dyn2;
-			ABI_CHECK(callContractFunction("get()"), result);
-			ABI_CHECK(callContractFunction("s1()"), encodeArgs(0x20) + dyn1);
-			ABI_CHECK(callContractFunction("s2()"), encodeArgs(0x20) + dyn2);
-		}
-}
-
-BOOST_AUTO_TEST_CASE(accessor_involving_strings)
-{
-	char const* sourceCode = R"(
-		contract Main {
-			struct stringData { string a; uint b; string c; }
-			mapping(uint => stringData[]) public data;
-			function set(uint x, uint y, string calldata a, uint b, string calldata c) external returns (bool) {
-				while (data[x].length < y + 1)
-					data[x].push();
-				data[x][y].a = a;
-				data[x][y].b = b;
-				data[x][y].c = c;
-				return true;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Main");
-	std::string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-	std::string s2("ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ");
-	bytes s1Data = encodeArgs(u256(s1.length()), s1);
-	bytes s2Data = encodeArgs(u256(s2.length()), s2);
-	u256 b = 765;
-	u256 x = 7;
-	u256 y = 123;
-	bytes args = encodeArgs(x, y, u256(0xa0), b, u256(0xa0 + s1Data.size()), s1Data, s2Data);
-	bytes result = encodeArgs(u256(0x60), b, u256(0x60 + s1Data.size()), s1Data, s2Data);
-	BOOST_REQUIRE(callContractFunction("set(uint256,uint256,string,uint256,string)", asString(args)) == encodeArgs(true));
-	BOOST_REQUIRE(callContractFunction("data(uint256,uint256)", x, y) == result);
-}
-
-BOOST_AUTO_TEST_CASE(bytes_in_function_calls)
-{
-	char const* sourceCode = R"(
-		contract Main {
-			string public s1;
-			string public s2;
-			function set(string memory _s1, uint x, string memory _s2) public returns (uint) {
-				s1 = _s1;
-				s2 = _s2;
-				return x;
-			}
-			function setIndirectFromMemory(string memory _s1, uint x, string memory _s2) public returns (uint) {
-				return this.set(_s1, x, _s2);
-			}
-			function setIndirectFromCalldata(string calldata _s1, uint x, string calldata _s2) external returns (uint) {
-				return this.set(_s1, x, _s2);
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Main");
-	std::string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-	std::string s2("ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ");
-	std::vector<size_t> lengths{0, 31, 64, 65};
-	for (auto l1: lengths)
-		for (auto l2: lengths)
-		{
-			bytes dyn1 = encodeArgs(u256(l1), s1.substr(0, l1));
-			bytes dyn2 = encodeArgs(u256(l2), s2.substr(0, l2));
-			bytes args1 = encodeArgs(u256(0x60), u256(l1), u256(0x60 + dyn1.size())) + dyn1 + dyn2;
-			BOOST_REQUIRE(
-				callContractFunction("setIndirectFromMemory(string,uint256,string)", asString(args1)) ==
-				encodeArgs(u256(l1))
-			);
-			ABI_CHECK(callContractFunction("s1()"), encodeArgs(0x20) + dyn1);
-			ABI_CHECK(callContractFunction("s2()"), encodeArgs(0x20) + dyn2);
-			// swapped
-			bytes args2 = encodeArgs(u256(0x60), u256(l1), u256(0x60 + dyn2.size())) + dyn2 + dyn1;
-			BOOST_REQUIRE(
-				callContractFunction("setIndirectFromCalldata(string,uint256,string)", asString(args2)) ==
-				encodeArgs(u256(l1))
-			);
-			ABI_CHECK(callContractFunction("s1()"), encodeArgs(0x20) + dyn2);
-			ABI_CHECK(callContractFunction("s2()"), encodeArgs(0x20) + dyn1);
-		}
-}
-
-BOOST_AUTO_TEST_CASE(return_bytes_internal)
-{
-	char const* sourceCode = R"(
-		contract Main {
-			bytes s1;
-			function doSet(bytes memory _s1) public returns (bytes memory _r1) {
-				s1 = _s1;
-				_r1 = s1;
-			}
-			function set(bytes calldata _s1) external returns (uint _r, bytes memory _r1) {
-				_r1 = doSet(_s1);
-				_r = _r1.length;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Main");
-	std::string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-	std::vector<size_t> lengths{0, 31, 64, 65};
-	for (auto l1: lengths)
-	{
-		bytes dyn1 = encodeArgs(u256(l1), s1.substr(0, l1));
-		bytes args1 = encodeArgs(u256(0x20)) + dyn1;
-		BOOST_REQUIRE(
-			callContractFunction("set(bytes)", asString(args1)) ==
-			encodeArgs(u256(l1), u256(0x40)) + dyn1
-		);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(calldata_struct_short)
-{
-	char const* sourceCode = R"(
-		pragma abicoder v2;
-		contract C {
-			struct S { uint256 a; uint256 b; }
-			function f(S calldata) external pure returns (uint256) {
-				return msg.data.length;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-
-	// double check that the valid case goes through
-	ABI_CHECK(callContractFunction("f((uint256,uint256))", u256(1), u256(2)), encodeArgs(0x44));
-
-	ABI_CHECK(callContractFunctionNoEncoding("f((uint256,uint256))", bytes(63,0)), encodeArgs());
-	ABI_CHECK(callContractFunctionNoEncoding("f((uint256,uint256))", bytes(33,0)), encodeArgs());
-	ABI_CHECK(callContractFunctionNoEncoding("f((uint256,uint256))", bytes(32,0)), encodeArgs());
-	ABI_CHECK(callContractFunctionNoEncoding("f((uint256,uint256))", bytes(31,0)), encodeArgs());
-	ABI_CHECK(callContractFunctionNoEncoding("f((uint256,uint256))", bytes()), encodeArgs());
-}
-
-BOOST_AUTO_TEST_CASE(calldata_struct_function_type)
-{
-	char const* sourceCode = R"(
-		pragma abicoder v2;
-		contract C {
-			struct S { function (uint) external returns (uint) fn; }
-			function f(S calldata s) external returns (uint256) {
-				return s.fn(42);
-			}
-			function g(uint256 a) external returns (uint256) {
-				return a * 3;
-			}
-			function h(uint256 a) external returns (uint256) {
-				return 23;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-
-	bytes fn_C_g = m_contractAddress.asBytes() + util::selectorFromSignatureH32("g(uint256)").asBytes() + bytes(8,0);
-	bytes fn_C_h = m_contractAddress.asBytes() + util::selectorFromSignatureH32("h(uint256)").asBytes() + bytes(8,0);
-	ABI_CHECK(callContractFunctionNoEncoding("f((function))", fn_C_g), encodeArgs(42 * 3));
-	ABI_CHECK(callContractFunctionNoEncoding("f((function))", fn_C_h), encodeArgs(23));
-}
-
-BOOST_AUTO_TEST_CASE(calldata_array_dynamic_three_dimensional)
-{
-	std::vector<std::vector<std::vector<u256>>> data {
-		{
-			{ 0x010A01, 0x010A02, 0x010A03 },
-			{ 0x010B01, 0x010B02, 0x010B03 }
-		},
-		{
-			{ 0x020A01, 0x020A02, 0x020A03 },
-			{ 0x020B01, 0x020B02, 0x020B03 }
-		}
-	};
-
-	for (bool outerDynamicallySized: { true, false })
-	for (bool middleDynamicallySized: { true, false })
-	for (bool innerDynamicallySized: { true, false })
-	{
-		// only test dynamically encoded arrays
-		if (!outerDynamicallySized && !middleDynamicallySized && !innerDynamicallySized)
-			continue;
-
-		std::string arrayType = "uint256";
-		arrayType += innerDynamicallySized ? "[]" : "[3]";
-		arrayType += middleDynamicallySized ? "[]" : "[2]";
-		arrayType += outerDynamicallySized ? "[]" : "[2]";
-
-		std::string sourceCode = R"(
-			pragma abicoder v2;
-			contract C {
-				function test()" + arrayType + R"( calldata a) external returns (uint256) {
-					return a.length;
-				}
-				function test()" + arrayType + R"( calldata a, uint256 i) external returns (uint256) {
-					return a[i].length;
-				}
-				function test()" + arrayType + R"( calldata a, uint256 i, uint256 j) external returns (uint256) {
-					return a[i][j].length;
-				}
-				function test()" + arrayType + R"( calldata a, uint256 i, uint256 j, uint256 k) external returns (uint256) {
-					return a[i][j][k];
-				}
-				function reenc()" + arrayType + R"( calldata a, uint256 i, uint256 j, uint256 k) external returns (uint256) {
-					return this.test(a, i, j, k);
-				}
-			}
-		)";
-		compileAndRun(sourceCode, 0, "C");
-
-		bytes encoding = encodeArray(
-			outerDynamicallySized,
-			middleDynamicallySized || innerDynamicallySized,
-			data | ranges::views::transform([&](auto const& _middleData) {
-				return encodeArray(
-					middleDynamicallySized,
-					innerDynamicallySized,
-					_middleData | ranges::views::transform([&](auto const& _values) {
-						return encodeArray(innerDynamicallySized, false, _values);
-					})
-				);
-			})
-		);
-
-		ABI_CHECK(callContractFunction("test(" + arrayType + ")", 0x20, encoding), encodeArgs(data.size()));
-		for (size_t i = 0; i < data.size(); i++)
-		{
-			ABI_CHECK(callContractFunction("test(" + arrayType + ",uint256)", 0x40, i, encoding), encodeArgs(data[i].size()));
-			for (size_t j = 0; j < data[i].size(); j++)
-			{
-				ABI_CHECK(callContractFunction("test(" + arrayType + ",uint256,uint256)", 0x60, i, j, encoding), encodeArgs(data[i][j].size()));
-				for (size_t k = 0; k < data[i][j].size(); k++)
-				{
-					ABI_CHECK(callContractFunction("test(" + arrayType + ",uint256,uint256,uint256)", 0x80, i, j, k, encoding), encodeArgs(data[i][j][k]));
-					ABI_CHECK(callContractFunction("reenc(" + arrayType + ",uint256,uint256,uint256)", 0x80, i, j, k, encoding), encodeArgs(data[i][j][k]));
-				}
-				ABI_CHECK(callContractFunction("test(" + arrayType + ",uint256,uint256,uint256)", 0x80, i, j, data[i][j].size(), encoding), panicData(PanicCode::ArrayOutOfBounds));
-			}
-			ABI_CHECK(callContractFunction("test(" + arrayType + ",uint256,uint256)", 0x60, i, data[i].size(), encoding), panicData(PanicCode::ArrayOutOfBounds));
-		}
-		ABI_CHECK(callContractFunction("test(" + arrayType + ",uint256)", 0x40, data.size(), encoding), panicData(PanicCode::ArrayOutOfBounds));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(literal_strings)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			string public long;
-			string public medium;
-			string public short;
-			string public empty;
-			function f() public returns (string memory) {
-				long = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-				medium = "01234567890123456789012345678901234567890123456789012345678901234567890123456789";
-				short = "123";
-				empty = "";
-				return "Hello, World!";
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Test");
-	std::string longStr = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-	std::string medium = "01234567890123456789012345678901234567890123456789012345678901234567890123456789";
-	std::string shortStr = "123";
-	std::string hello = "Hello, World!";
-
-	ABI_CHECK(callContractFunction("f()"), encodeDyn(hello));
-	ABI_CHECK(callContractFunction("long()"), encodeDyn(longStr));
-	ABI_CHECK(callContractFunction("medium()"), encodeDyn(medium));
-	ABI_CHECK(callContractFunction("short()"), encodeDyn(shortStr));
-	ABI_CHECK(callContractFunction("empty()"), encodeDyn(std::string()));
-}
-
-BOOST_AUTO_TEST_CASE(initialise_string_constant)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			string public short = "abcdef";
-			string public long = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Test");
-	std::string longStr = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-	std::string shortStr = "abcdef";
-
-	ABI_CHECK(callContractFunction("long()"), encodeDyn(longStr));
-	ABI_CHECK(callContractFunction("short()"), encodeDyn(shortStr));
-}
-
-BOOST_AUTO_TEST_CASE(string_as_mapping_key)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			mapping(string => uint) data;
-			function set(string memory _s, uint _v) public { data[_s] = _v; }
-			function get(string memory _s) public returns (uint) { return data[_s]; }
-		}
-	)";
-
-	std::vector<std::string> strings{
-		"Hello, World!",
-		"Hello,                            World!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1111",
-		"",
-		"1"
-	};
-
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "Test");
-		for (unsigned i = 0; i < strings.size(); i++)
-			ABI_CHECK(callContractFunction(
-				"set(string,uint256)",
-				u256(0x40),
-				u256(7 + i),
-				u256(strings[i].size()),
-				strings[i]
-			), encodeArgs());
-		for (unsigned i = 0; i < strings.size(); i++)
-			ABI_CHECK(callContractFunction(
-				"get(string)",
-				u256(0x20),
-				u256(strings[i].size()),
-				strings[i]
-			), encodeArgs(u256(7 + i)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(string_as_public_mapping_key)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			mapping(string => uint) public data;
-			function set(string memory _s, uint _v) public { data[_s] = _v; }
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Test");
-	std::vector<std::string> strings{
-		"Hello, World!",
-		"Hello,                            World!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1111",
-		"",
-		"1"
-	};
-	for (unsigned i = 0; i < strings.size(); i++)
-		ABI_CHECK(callContractFunction(
-			"set(string,uint256)",
-			u256(0x40),
-			u256(7 + i),
-			u256(strings[i].size()),
-			strings[i]
-		), encodeArgs());
-	for (unsigned i = 0; i < strings.size(); i++)
-		ABI_CHECK(callContractFunction(
-			"data(string)",
-			u256(0x20),
-			u256(strings[i].size()),
-			strings[i]
-		), encodeArgs(u256(7 + i)));
-}
-
-BOOST_AUTO_TEST_CASE(nested_string_as_public_mapping_key)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			mapping(string => mapping(string => uint)) public data;
-			function set(string memory _s, string memory _s2, uint _v) public {
-				data[_s][_s2] = _v; }
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Test");
-	std::vector<std::string> strings{
-		"Hello, World!",
-		"Hello,                            World!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1111",
-		"",
-		"1",
-		"last one"
-	};
-	for (unsigned i = 0; i + 1 < strings.size(); i++)
-		ABI_CHECK(callContractFunction(
-			"set(string,string,uint256)",
-			u256(0x60),
-			u256(roundTo32(static_cast<unsigned>(0x80 + strings[i].size()))),
-			u256(7 + i),
-			u256(strings[i].size()),
-			strings[i],
-			u256(strings[i+1].size()),
-			strings[i+1]
-		), encodeArgs());
-	for (unsigned i = 0; i + 1 < strings.size(); i++)
-		ABI_CHECK(callContractFunction(
-			"data(string,string)",
-			u256(0x40),
-			u256(roundTo32(static_cast<unsigned>(0x60 + strings[i].size()))),
-			u256(strings[i].size()),
-			strings[i],
-			u256(strings[i+1].size()),
-			strings[i+1]
-		), encodeArgs(u256(7 + i)));
-}
-
-BOOST_AUTO_TEST_CASE(nested_mixed_string_as_public_mapping_key)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			mapping(string =>
-				mapping(int =>
-					mapping(address =>
-						mapping(bytes => int)))) public data;
-
-			function set(
-				string memory _s1,
-				int _s2,
-				address _s3,
-				bytes memory _s4,
-				int _value
-			) public
-			{
-				data[_s1][_s2][_s3][_s4] = _value;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Test");
-
-	struct Index
-	{
-		std::string s1;
-		int s2;
-		int s3;
-		std::string s4;
-	};
-
-	std::vector<Index> data{
-		{ "aabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcbc", 4, 23, "efg" },
-		{ "tiaron", 456, 63245, "908apzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapz" },
-		{ "", 2345, 12934, "665i65i65i65i65i65i65i65i65i65i65i65i65i65i65i65i65i65i5iart" },
-		{ "¡¿…", 9781, 8148, "" },
-		{ "�ν♀♀ω₂₃♀", 929608, 303030, "" }
-	};
-
-	for (size_t i = 0; i + 1 < data.size(); i++)
-		ABI_CHECK(callContractFunction(
-			"set(string,int256,address,bytes,int256)",
-			u256(0xA0),
-			u256(data[i].s2),
-			u256(data[i].s3),
-			u256(roundTo32(static_cast<unsigned>(0xC0 + data[i].s1.size()))),
-			u256(i - 3),
-			u256(data[i].s1.size()),
-			data[i].s1,
-			u256(data[i].s4.size()),
-			data[i].s4
-		), encodeArgs());
-	for (size_t i = 0; i + 1 < data.size(); i++)
-		ABI_CHECK(callContractFunction(
-			"data(string,int256,address,bytes)",
-			u256(0x80),
-			u256(data[i].s2),
-			u256(data[i].s3),
-			u256(roundTo32(static_cast<unsigned>(0xA0 + data[i].s1.size()))),
-			u256(data[i].s1.size()),
-			data[i].s1,
-			u256(data[i].s4.size()),
-			data[i].s4
-		), encodeArgs(u256(i - 3)));
-}
-
-BOOST_AUTO_TEST_CASE(library_call)
-{
-	char const* sourceCode = R"(
-		library Lib { function m(uint x, uint y) public returns (uint) { return x * y; } }
-		contract Test {
-			function f(uint x) public returns (uint) {
-				return Lib.m(x, 9);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(uint256)", u256(33)), encodeArgs(u256(33) * 9));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(library_function_external)
-{
-	char const* sourceCode = R"(
-		library Lib { function m(bytes calldata b) external pure returns (bytes1) { return b[2]; } }
-		contract Test {
-			function f(bytes memory b) public pure returns (bytes1) {
-				return Lib.m(b);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(bytes)", u256(0x20), u256(5), "abcde"), encodeArgs("c"));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(using_library_mappings_external)
-{
-	char const* libSourceCode = R"(
-			library Lib {
-				function set(mapping(uint => uint) storage m, uint key, uint value) external
-				{
-					m[key] = value * 2;
-				}
-			}
-		)";
-	char const* sourceCode = R"(
-			library Lib {
-				function set(mapping(uint => uint) storage m, uint key, uint value) external {}
-			}
-			contract Test {
-				mapping(uint => uint) m1;
-				mapping(uint => uint) m2;
-				function f() public returns (uint, uint, uint, uint, uint, uint)
-				{
-					Lib.set(m1, 0, 1);
-					Lib.set(m1, 2, 42);
-					Lib.set(m2, 0, 23);
-					Lib.set(m2, 2, 99);
-					return (m1[0], m1[1], m1[2], m2[0], m2[1], m2[2]);
-				}
-			}
-		)";
-	for (auto v2: {false, true})
-	{
-		std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
-		compileAndRun(prefix + libSourceCode, 0, "Lib");
-		compileAndRun(prefix + sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(2), u256(0), u256(84), u256(46), u256(0), u256(198)));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(short_strings)
-{
-	// This test verifies that the byte array encoding that combines length and data works
-	// correctly.
-	char const* sourceCode = R"(
-		contract A {
-			bytes public data1 = "123";
-			bytes data2;
-			function lengthChange() public returns (uint)
-			{
-				// store constant in short and long string
-				data1 = "123";
-				if (!equal(data1, "123")) return 1;
-				data2 = "12345678901234567890123456789012345678901234567890a";
-				if (data2[17] != "8") return 3;
-				if (data2.length != 51) return 4;
-				if (data2[data2.length - 1] != "a") return 5;
-				// change length: short -> short
-				while (data1.length < 5)
-					data1.push();
-				if (data1.length != 5) return 6;
-				data1[4] = "4";
-				if (data1[0] != "1") return 7;
-				if (data1[4] != "4") return 8;
-				// change length: short -> long
-				while (data1.length < 80)
-					data1.push();
-				if (data1.length != 80) return 9;
-				while (data1.length > 70)
-					data1.pop();
-				if (data1.length != 70) return 9;
-				if (data1[0] != "1") return 10;
-				if (data1[4] != "4") return 11;
-				for (uint i = 0; i < data1.length; i ++)
-					data1[i] = bytes1(uint8(i * 3));
-				if (uint8(data1[4]) != 4 * 3) return 12;
-				if (uint8(data1[67]) != 67 * 3) return 13;
-				// change length: long -> short
-				while (data1.length > 22)
-					data1.pop();
-				if (data1.length != 22) return 14;
-				if (uint8(data1[21]) != 21 * 3) return 15;
-				if (uint8(data1[2]) != 2 * 3) return 16;
-				// change length: short -> shorter
-				while (data1.length > 19)
-					data1.pop();
-				if (data1.length != 19) return 17;
-				if (uint8(data1[7]) != 7 * 3) return 18;
-				// and now again to original size
-				while (data1.length < 22)
-					data1.push();
-				if (data1.length != 22) return 19;
-				if (data1[21] != 0) return 20;
-				while (data1.length > 0)
-					data1.pop();
-				while (data2.length > 0)
-					data2.pop();
-			}
-			function copy() public returns (uint) {
-				bytes memory x = "123";
-				bytes memory y = "012345678901234567890123456789012345678901234567890123456789";
-				bytes memory z = "1234567";
-				data1 = x;
-				data2 = y;
-				if (!equal(data1, x)) return 1;
-				if (!equal(data2, y)) return 2;
-				// lengthen
-				data1 = y;
-				if (!equal(data1, y)) return 3;
-				// shorten
-				data1 = x;
-				if (!equal(data1, x)) return 4;
-				// change while keeping short
-				data1 = z;
-				if (!equal(data1, z)) return 5;
-				// copy storage -> storage
-				data1 = x;
-				data2 = y;
-				// lengthen
-				data1 = data2;
-				if (!equal(data1, y)) return 6;
-				// shorten
-				data1 = x;
-				data2 = data1;
-				if (!equal(data2, x)) return 7;
-				bytes memory c = data2;
-				data1 = c;
-				if (!equal(data1, x)) return 8;
-				data1 = "";
-				data2 = "";
-			}
-			function deleteElements() public returns (uint) {
-				data1 = "01234";
-				delete data1[2];
-				if (data1[2] != 0) return 1;
-				if (data1[0] != "0") return 2;
-				if (data1[3] != "3") return 3;
-				delete data1;
-				if (data1.length != 0) return 4;
-			}
-
-			function equal(bytes storage a, bytes memory b) internal returns (bool) {
-				if (a.length != b.length) return false;
-				for (uint i = 0; i < a.length; ++i) if (a[i] != b[i]) return false;
-				return true;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "A");
-		ABI_CHECK(callContractFunction("data1()"), encodeDyn(std::string("123")));
-		ABI_CHECK(callContractFunction("lengthChange()"), encodeArgs(u256(0)));
-		BOOST_CHECK(storageEmpty(m_contractAddress));
-		ABI_CHECK(callContractFunction("deleteElements()"), encodeArgs(u256(0)));
-		BOOST_CHECK(storageEmpty(m_contractAddress));
-		ABI_CHECK(callContractFunction("copy()"), encodeArgs(u256(0)));
-		BOOST_CHECK(storageEmpty(m_contractAddress));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(calldata_offset)
-{
-	// This tests a specific bug that was caused by not using the correct memory offset in the
-	// calldata unpacker.
-	char const* sourceCode = R"(
-		contract CB
-		{
-			address[] _arr;
-			string public last = "nd";
-			constructor(address[] memory guardians)
-			{
-				_arr = guardians;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "CB", encodeArgs(u256(0x20), u256(0x00)));
-	ABI_CHECK(callContractFunction("last()", encodeArgs()), encodeDyn(std::string("nd")));
-}
-
-BOOST_AUTO_TEST_CASE(reject_ether_sent_to_library)
-{
-	char const* sourceCode = R"(
-		library lib {}
-		contract c {
-			constructor() payable {}
-			function f(address payable x) public returns (bool) {
-				return x.send(1);
-			}
-			receive () external payable {}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "lib");
-		Address libraryAddress = m_contractAddress;
-		compileAndRun(sourceCode, 10, "c");
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
-		BOOST_CHECK_EQUAL(balanceAt(libraryAddress), 0);
-		ABI_CHECK(callContractFunction("f(address)", encodeArgs(libraryAddress)), encodeArgs(false));
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
-		BOOST_CHECK_EQUAL(balanceAt(libraryAddress), 0);
-		ABI_CHECK(callContractFunction("f(address)", encodeArgs(m_contractAddress)), encodeArgs(true));
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
-		BOOST_CHECK_EQUAL(balanceAt(libraryAddress), 0);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(create_memory_array_allocation_size)
-{
-	// Check allocation size of byte array. Should be 32 plus length rounded up to next
-	// multiple of 32
-	char const* sourceCode = R"(
-		contract C {
-			function f() public pure returns (uint d1, uint d2, uint d3, uint memsize) {
-				bytes memory b1 = new bytes(31);
-				bytes memory b2 = new bytes(32);
-				bytes memory b3 = new bytes(256);
-				bytes memory b4 = new bytes(31);
-				assembly {
-					d1 := sub(b2, b1)
-					d2 := sub(b3, b2)
-					d3 := sub(b4, b3)
-					memsize := msize()
-				}
-			}
-		}
-	)";
-	if (!m_optimiserSettings.runYulOptimiser)
-	{
-		compileAndRun(sourceCode);
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0x40, 0x40, 0x20 + 256, 0x260));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(inline_long_string_return)
-{
-		char const* sourceCode = R"(
-		contract C {
-			function f() public returns (string memory) {
-				return (["somethingShort", "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"][1]);
-			}
-		}
-	)";
-
-	std::string strLong = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("f()"), encodeDyn(strLong));
-}
-
-BOOST_AUTO_TEST_CASE(index_access_with_type_conversion)
-{
-	// Test for a bug where higher order bits cleanup was not done for array index access.
-	char const* sourceCode = R"(
-			contract C {
-				function f(uint x) public returns (uint[256] memory r){
-					r[uint8(x)] = 2;
-				}
-			}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-	// neither of the two should throw due to out-of-bounds access
-	BOOST_CHECK(callContractFunction("f(uint256)", u256(0x01)).size() == 256 * 32);
-	BOOST_CHECK(callContractFunction("f(uint256)", u256(0x101)).size() == 256 * 32);
-}
-
-BOOST_AUTO_TEST_CASE(correctly_initialize_memory_array_in_constructor)
-{
-	// Memory arrays are initialized using calldatacopy past the size of the calldata.
-	// This test checks that it also works in the constructor context.
-	char const* sourceCode = R"(
-		contract C {
-			bool public success;
-			constructor() {
-				// Make memory dirty.
-				assembly {
-					for { let i := 0 } lt(i, 64) { i := add(i, 1) } {
-						mstore(msize(), not(0))
-					}
-				}
-				uint16[3] memory c;
-				require(c[0] == 0 && c[1] == 0 && c[2] == 0);
-				uint16[] memory x = new uint16[](3);
-				require(x[0] == 0 && x[1] == 0 && x[2] == 0);
-				success = true;
-			}
-		}
-	)";
-	// Cannot run against yul optimizer because of msize
-	if (!m_optimiserSettings.runYulOptimiser)
-	{
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("success()"), encodeArgs(u256(1)));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(mutex)
-{
-	char const* sourceCode = R"(
-		contract mutexed {
-			bool locked;
-			modifier protected {
-				if (locked) revert();
-				locked = true;
-				_;
-				locked = false;
-			}
-		}
-		contract Fund is mutexed {
-			uint shares;
-			constructor() payable { shares = msg.value; }
-			function withdraw(uint amount) public protected returns (uint) {
-				// NOTE: It is very bad practice to write this function this way.
-				// Please refer to the documentation of how to do this properly.
-				if (amount > shares) revert();
-				(bool success,) = msg.sender.call{value: amount}("");
-				require(success);
-				shares -= amount;
-				return shares;
-			}
-			function withdrawUnprotected(uint amount) public returns (uint) {
-				// NOTE: It is very bad practice to write this function this way.
-				// Please refer to the documentation of how to do this properly.
-				if (amount > shares) revert();
-				(bool success,) = msg.sender.call{value: amount}("");
-				require(success);
-				shares -= amount;
-				return shares;
-			}
-		}
-		contract Attacker {
-			Fund public fund;
-			uint callDepth;
-			bool protected;
-			function setProtected(bool _protected) public { protected = _protected; }
-			constructor(Fund _fund) { fund = _fund; }
-			function attack() public returns (uint) {
-				callDepth = 0;
-				return attackInternal();
-			}
-			function attackInternal() internal returns (uint) {
-				if (protected)
-					return fund.withdraw(10);
-				else
-					return fund.withdrawUnprotected(10);
-			}
-			fallback() external payable {
-				callDepth++;
-				if (callDepth < 4)
-					attackInternal();
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 500, "Fund");
-	h160 const fund = m_contractAddress;
-	BOOST_CHECK_EQUAL(balanceAt(fund), 500);
-	compileAndRun(sourceCode, 0, "Attacker", encodeArgs(fund));
-	ABI_CHECK(callContractFunction("setProtected(bool)", true), encodeArgs());
-	ABI_CHECK(callContractFunction("attack()"), encodeArgs());
-	BOOST_CHECK_EQUAL(balanceAt(fund), 500);
-	ABI_CHECK(callContractFunction("setProtected(bool)", false), encodeArgs());
-	ABI_CHECK(callContractFunction("attack()"), encodeArgs(u256(460)));
-	BOOST_CHECK_EQUAL(balanceAt(fund), 460);
-}
-
-BOOST_AUTO_TEST_CASE(payable_function)
-{
-	char const* sourceCode = R"(
-		contract C {
-			uint public a;
-			function f() payable public returns (uint) {
-				return msg.value;
-			}
-			fallback() external payable {
-				a = msg.value + 1;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunctionWithValue("f()", 27), encodeArgs(u256(27)));
-	BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 27);
-	ABI_CHECK(callContractFunctionWithValue("", 27), encodeArgs());
-	BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 27 + 27);
-	ABI_CHECK(callContractFunction("a()"), encodeArgs(u256(28)));
-	BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 27 + 27);
-}
-
-BOOST_AUTO_TEST_CASE(non_payable_throw)
-{
-	char const* sourceCode = R"(
-		contract C {
-			uint public a;
-			function f() public returns (uint) {
-				return msgvalue();
-			}
-			function msgvalue() internal returns (uint) {
-				return msg.value;
-			}
-			fallback() external {
-				update();
-			}
-			function update() internal {
-				a = msg.value + 1;
-			}
-
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunctionWithValue("f()", 27), encodeArgs());
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 0);
-		ABI_CHECK(callContractFunction(""), encodeArgs());
-		ABI_CHECK(callContractFunction("a()"), encodeArgs(u256(1)));
-		ABI_CHECK(callContractFunctionWithValue("", 27), encodeArgs());
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 0);
-		ABI_CHECK(callContractFunction("a()"), encodeArgs(u256(1)));
-		ABI_CHECK(callContractFunctionWithValue("a()", 27), encodeArgs());
-		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 0);
-	)
-}
-
-BOOST_AUTO_TEST_CASE(mem_resize_is_not_paid_at_call)
-{
-	// This tests that memory resize for return values is not paid during the call, which would
-	// make the gas calculation overly complex. We access the end of the output area before
-	// the call is made.
-	// Tests that this also survives the optimizer.
-	char const* sourceCode = R"(
-		contract C {
-			function f() public returns (uint[200] memory) {}
-		}
-		contract D {
-			function f(C c) public returns (uint) { c.f(); return 7; }
-		}
-	)";
-
-	compileAndRun(sourceCode, 0, "C");
-	h160 const cAddr = m_contractAddress;
-	compileAndRun(sourceCode, 0, "D");
-	ABI_CHECK(callContractFunction("f(address)", cAddr), encodeArgs(u256(7)));
-}
-
-BOOST_AUTO_TEST_CASE(receive_external_function_type)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function g() public returns (uint) { return 7; }
-			function f(function() external returns (uint) g) public returns (uint) {
-				return g();
-			}
-		}
-	)";
-
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction(
-			"f(function)",
-			m_contractAddress.asBytes() + util::selectorFromSignatureH32("g()").asBytes() + bytes(32 - 4 - 20, 0)
-		), encodeArgs(u256(7)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(return_external_function_type)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function g() public {}
-			function f() public returns (function() external) {
-				return this.g;
-			}
-		}
-	)";
-
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(
-		callContractFunction("f()"),
-		m_contractAddress.asBytes() + util::selectorFromSignatureH32("g()").asBytes() + bytes(32 - 4 - 20, 0)
-	);
-}
-
-// TODO: store attached internal library functions
-
-BOOST_AUTO_TEST_CASE(shift_bytes)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function left(bytes20 x, uint8 y) public returns (bytes20) {
-				return x << y;
-			}
-			function right(bytes20 x, uint8 y) public returns (bytes20) {
-				return x >> y;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("left(bytes20,uint8)", "12345678901234567890", 8 * 8), encodeArgs("901234567890" + std::string(8, 0)));
-	ABI_CHECK(callContractFunction("right(bytes20,uint8)", "12345678901234567890", 8 * 8), encodeArgs(std::string(8, 0) + "123456789012"));
-}
-
-BOOST_AUTO_TEST_CASE(contracts_separated_with_comment)
-{
-	char const* sourceCode = R"(
-		contract C1 {}
-		/**
-		**/
-		contract C2 {}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "C1");
-		compileAndRun(sourceCode, 0, "C2");
-	)
-}
-
-BOOST_AUTO_TEST_CASE(include_creation_bytecode_only_once)
-{
-	char const* sourceCode = R"(
-		contract D {
-			bytes a = hex"1237651237125387136581271652831736512837126583171583712358126123765123712538713658127165283173651283712658317158371235812612376512371253871365812716528317365128371265831715837123581261237651237125387136581271652831736512837126583171583712358126";
-			bytes b = hex"1237651237125327136581271252831736512837126583171383712358126123765125712538713658127165253173651283712658357158371235812612376512371a5387136581271652a317365128371265a317158371235812612a765123712538a13658127165a83173651283712a58317158371235a126";
-			constructor(uint) {}
-		}
-		contract Double {
-			function f() public {
-				new D(2);
-			}
-			function g() public {
-				new D(3);
-			}
-		}
-		contract Single {
-			function f() public {
-				new D(2);
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	BOOST_CHECK_LE(
-		double(m_compiler.object("Double").bytecode.size()),
-		1.2 * double(m_compiler.object("Single").bytecode.size())
-	);
-}
-
-BOOST_AUTO_TEST_CASE(revert_with_cause)
-{
-	char const* sourceCode = R"(
-		contract D {
-			string constant msg1 = "test1234567890123456789012345678901234567890";
-			string msg2 = "test1234567890123456789012345678901234567890";
-			function f() public {
-				revert("test123");
-			}
-			function g() public {
-				revert("test1234567890123456789012345678901234567890");
-			}
-			function h() public {
-				revert(msg1);
-			}
-			function i() public {
-				revert(msg2);
-			}
-			function j() public {
-				string memory msg3 = "test1234567890123456789012345678901234567890";
-				revert(msg3);
-			}
-		}
-		contract C {
-			D d = new D();
-			function forward(address target, bytes memory data) internal returns (bool success, bytes memory retval) {
-				uint retsize;
-				assembly {
-					success := call(not(0), target, 0, add(data, 0x20), mload(data), 0, 0)
-					retsize := returndatasize()
-				}
-				retval = new bytes(retsize);
-				assembly {
-					returndatacopy(add(retval, 0x20), 0, returndatasize())
-				}
-			}
-			function f() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function g() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function h() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function i() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function j() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		compileAndRun(sourceCode, 0, "C");
-		bytes const errorSignature = bytes{0x08, 0xc3, 0x79, 0xa0};
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 7, "test123") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(0, 0x40, 0x84) + errorSignature + encodeArgs(0x20, 44, "test1234567890123456789012345678901234567890") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("h()"), encodeArgs(0, 0x40, 0x84) + errorSignature + encodeArgs(0x20, 44, "test1234567890123456789012345678901234567890") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("i()"), encodeArgs(0, 0x40, 0x84) + errorSignature + encodeArgs(0x20, 44, "test1234567890123456789012345678901234567890") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("j()"), encodeArgs(0, 0x40, 0x84) + errorSignature + encodeArgs(0x20, 44, "test1234567890123456789012345678901234567890") + bytes(28, 0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(require_with_message)
-{
-	char const* sourceCode = R"(
-		contract D {
-			bool flag = false;
-			string storageError = "abc";
-			string constant constantError = "abc";
-			function f(uint x) public {
-				require(x > 7, "failed");
-			}
-			function g() public {
-				// As a side-effect of internalFun, the flag will be set to true
-				// (even if the condition is true),
-				// but it will only throw in the next evaluation.
-				bool flagCopy = flag;
-				require(flagCopy == false, internalFun());
-			}
-			function internalFun() public returns (string memory) {
-				flag = true;
-				return "only on second run";
-			}
-			function h() public {
-				require(false, storageError);
-			}
-			function i() public {
-				require(false, constantError);
-			}
-			function j() public {
-				string memory errMsg = "msg";
-				require(false, errMsg);
-			}
-		}
-		contract C {
-			D d = new D();
-			function forward(address target, bytes memory data) internal returns (bool success, bytes memory retval) {
-				uint retsize;
-				assembly {
-					success := call(not(0), target, 0, add(data, 0x20), mload(data), 0, 0)
-					retsize := returndatasize()
-				}
-				retval = new bytes(retsize);
-				assembly {
-					returndatacopy(add(retval, 0x20), 0, returndatasize())
-				}
-			}
-			function f(uint x) public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function g() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function h() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function i() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function j() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		compileAndRun(sourceCode, 0, "C");
-		bytes const errorSignature = bytes{0x08, 0xc3, 0x79, 0xa0};
-		ABI_CHECK(callContractFunction("f(uint256)", 8), encodeArgs(1, 0x40, 0));
-		ABI_CHECK(callContractFunction("f(uint256)", 5), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 6, "failed") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(1, 0x40, 0));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 18, "only on second run") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("h()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 3, "abc") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("i()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 3, "abc") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("j()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 3, "msg") + bytes(28, 0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(bubble_up_error_messages)
-{
-	char const* sourceCode = R"(
-		contract D {
-			function f() public {
-				revert("message");
-			}
-			function g() public {
-				this.f();
-			}
-		}
-		contract C {
-			D d = new D();
-			function forward(address target, bytes memory data) internal returns (bool success, bytes memory retval) {
-				uint retsize;
-				assembly {
-					success := call(not(0), target, 0, add(data, 0x20), mload(data), 0, 0)
-					retsize := returndatasize()
-				}
-				retval = new bytes(retsize);
-				assembly {
-					returndatacopy(add(retval, 0x20), 0, returndatasize())
-				}
-			}
-			function f() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-			function g() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		compileAndRun(sourceCode, 0, "C");
-		bytes const errorSignature = bytes{0x08, 0xc3, 0x79, 0xa0};
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 7, "message") + bytes(28, 0));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 7, "message") + bytes(28, 0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_transfer)
-{
-	char const* sourceCode = R"(
-		contract D {
-			receive() external payable {
-				revert("message");
-			}
-			function f() public {
-				payable(this).transfer(0);
-			}
-		}
-		contract C {
-			D d = new D();
-			function forward(address target, bytes memory data) internal returns (bool success, bytes memory retval) {
-				uint retsize;
-				assembly {
-					success := call(not(0), target, 0, add(data, 0x20), mload(data), 0, 0)
-					retsize := returndatasize()
-				}
-				retval = new bytes(retsize);
-				assembly {
-					returndatacopy(add(retval, 0x20), 0, returndatasize())
-				}
-			}
-			function f() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		compileAndRun(sourceCode, 0, "C");
-		bytes const errorSignature = bytes{0x08, 0xc3, 0x79, 0xa0};
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 7, "message") + bytes(28, 0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_create)
-{
-	char const* sourceCode = R"(
-		contract E {
-			constructor() {
-				revert("message");
-			}
-		}
-		contract D {
-			function f() public {
-				E x = new E();
-			}
-		}
-		contract C {
-			D d = new D();
-			function forward(address target, bytes memory data) internal returns (bool success, bytes memory retval) {
-				uint retsize;
-				assembly {
-					success := call(not(0), target, 0, add(data, 0x20), mload(data), 0, 0)
-					retsize := returndatasize()
-				}
-				retval = new bytes(retsize);
-				assembly {
-					returndatacopy(add(retval, 0x20), 0, returndatasize())
-				}
-			}
-			function f() public returns (bool, bytes memory) {
-				return forward(address(d), msg.data);
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		compileAndRun(sourceCode, 0, "C");
-		bytes const errorSignature = bytes{0x08, 0xc3, 0x79, 0xa0};
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x64) + errorSignature + encodeArgs(0x20, 7, "message") + bytes(28, 0));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(interface_contract)
-{
-	char const* sourceCode = R"(
-		interface I {
-			event A();
-			function f() external returns (bool);
-			fallback() external payable;
-		}
-
-		contract A is I {
-			function f() public override returns (bool) {
-				return g();
-			}
-
-			function g() public returns (bool) {
-				return true;
-			}
-
-			fallback() override external payable {
-			}
-		}
-
-		contract C {
-			function f(address payable _interfaceAddress) public returns (bool) {
-				I i = I(_interfaceAddress);
-				return i.f();
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "A");
-	h160 const recipient = m_contractAddress;
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("f(address)", recipient), encodeArgs(true));
-}
-
-BOOST_AUTO_TEST_CASE(bare_call_invalid_address)
-{
-	char const* sourceCode = R"YY(
-		contract C {
-			/// Calling into non-existent account is successful (creates the account)
-			function f() external returns (bool) {
-				(bool success,) = address(0x4242).call("");
-				return success;
-			}
-			function h() external returns (bool) {
-				(bool success,) = address(0x4242).delegatecall("");
-				return success;
-			}
-		}
-	)YY";
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(1)));
-	ABI_CHECK(callContractFunction("h()"), encodeArgs(u256(1)));
-
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-	{
-		char const* sourceCode = R"YY(
-			contract C {
-				function f() external returns (bool, bytes memory) {
-					return address(0x4242).staticcall("");
-				}
-			}
-		)YY";
-		compileAndRun(sourceCode, 0, "C");
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(1), 0x40, 0x00));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(bare_call_return_data)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		std::vector<std::string> calltypes = {"call", "delegatecall"};
-		if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-			calltypes.emplace_back("staticcall");
-		for (std::string const& calltype: calltypes)
-		{
-			std::string sourceCode = R"DELIMITER(
-				contract A {
-					constructor() {
-					}
-					function return_bool() public pure returns(bool) {
-						return true;
-					}
-					function return_int32() public pure returns(int32) {
-						return -32;
-					}
-					function return_uint32() public pure returns(uint32) {
-						return 0x3232;
-					}
-					function return_int256() public pure returns(int256) {
-						return -256;
-					}
-					function return_uint256() public pure returns(uint256) {
-						return 0x256256;
-					}
-					function return_bytes4() public pure returns(bytes4) {
-						return 0xabcd0012;
-					}
-					function return_multi() public pure returns(bool, uint32, bytes4) {
-						return (false, 0x3232, 0xabcd0012);
-					}
-					function return_bytes() public pure returns(bytes memory b) {
-						b = new bytes(2);
-						b[0] = 0x42;
-						b[1] = 0x21;
-					}
-				}
-				contract C {
-					A addr;
-					constructor() {
-						addr = new A();
-					}
-					function f(string memory signature) public returns (bool, bytes memory) {
-						return address(addr).)DELIMITER" + calltype + R"DELIMITER((abi.encodeWithSignature(signature));
-					}
-					function check_bool() external returns (bool) {
-						(bool success, bytes memory data) = f("return_bool()");
-						assert(success);
-						bool a = abi.decode(data, (bool));
-						assert(a);
-						return true;
-					}
-					function check_int32() external returns (bool) {
-						(bool success, bytes memory data) = f("return_int32()");
-						assert(success);
-						int32 a = abi.decode(data, (int32));
-						assert(a == -32);
-						return true;
-					}
-					function check_uint32() external returns (bool) {
-						(bool success, bytes memory data) = f("return_uint32()");
-						assert(success);
-						uint32 a = abi.decode(data, (uint32));
-						assert(a == 0x3232);
-						return true;
-					}
-					function check_int256() external returns (bool) {
-						(bool success, bytes memory data) = f("return_int256()");
-						assert(success);
-						int256 a = abi.decode(data, (int256));
-						assert(a == -256);
-						return true;
-					}
-					function check_uint256() external returns (bool) {
-						(bool success, bytes memory data) = f("return_uint256()");
-						assert(success);
-						uint256 a = abi.decode(data, (uint256));
-						assert(a == 0x256256);
-						return true;
-					}
-					function check_bytes4() external returns (bool) {
-						(bool success, bytes memory data) = f("return_bytes4()");
-						assert(success);
-						bytes4 a = abi.decode(data, (bytes4));
-						assert(a == 0xabcd0012);
-						return true;
-					}
-					function check_multi() external returns (bool) {
-						(bool success, bytes memory data) = f("return_multi()");
-						assert(success);
-						(bool a, uint32 b, bytes4 c) = abi.decode(data, (bool, uint32, bytes4));
-						assert(a == false && b == 0x3232 && c == 0xabcd0012);
-						return true;
-					}
-					function check_bytes() external returns (bool) {
-						(bool success, bytes memory data) = f("return_bytes()");
-						assert(success);
-						(bytes memory d) = abi.decode(data, (bytes));
-						assert(d.length == 2 && d[0] == 0x42 && d[1] == 0x21);
-						return true;
-					}
-				}
-			)DELIMITER";
-			ALSO_VIA_YUL(
-				compileAndRun(sourceCode, 0, "C");
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_bool()"))), encodeArgs(true, 0x40, 0x20, true));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_int32()"))), encodeArgs(true, 0x40, 0x20, u256(-32)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_uint32()"))), encodeArgs(true, 0x40, 0x20, u256(0x3232)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_int256()"))), encodeArgs(true, 0x40, 0x20, u256(-256)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_uint256()"))), encodeArgs(true, 0x40, 0x20, u256(0x256256)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_bytes4()"))), encodeArgs(true, 0x40, 0x20, u256(0xabcd0012) << (28*8)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_multi()"))), encodeArgs(true, 0x40, 0x60, false, u256(0x3232), u256(0xabcd0012) << (28*8)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_bytes()"))), encodeArgs(true, 0x40, 0x60, 0x20, 0x02, encode(bytes{0x42,0x21}, false)));
-				ABI_CHECK(callContractFunction("check_bool()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_int32()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_uint32()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_int256()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_uint256()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_bytes4()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_multi()"), encodeArgs(true));
-				ABI_CHECK(callContractFunction("check_bytes()"), encodeArgs(true));
-			)
-		}
-	}
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePacked)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f0() public pure returns (bytes memory) {
-				return abi.encodePacked();
-			}
-			function f1() public pure returns (bytes memory) {
-				return abi.encodePacked(uint8(1), uint8(2));
-			}
-			function f2() public pure returns (bytes memory) {
-				string memory x = "abc";
-				return abi.encodePacked(uint8(1), x, uint8(2));
-			}
-			function f3() public pure returns (bytes memory r) {
-				// test that memory is properly allocated
-				string memory x = "abc";
-				r = abi.encodePacked(uint8(1), x, uint8(2));
-				bytes memory y = "def";
-				require(y[0] == "d");
-				y[0] = "e";
-				require(y[0] == "e");
-			}
-			function f4() public pure returns (bytes memory) {
-				string memory x = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
-				return abi.encodePacked(uint16(0x0701), x, uint16(0x1201));
-			}
-			function f_literal() public pure returns (bytes memory) {
-				return abi.encodePacked(uint8(0x01), "abc", uint8(0x02));
-			}
-			function f_calldata() public pure returns (bytes memory) {
-				return abi.encodePacked(uint8(0x01), msg.data, uint8(0x02));
-			}
-		}
-	)";
-	for (auto v2: {false, true})
-	{
-		ALSO_VIA_YUL(
-			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
-			compileAndRun(prefix + sourceCode, 0, "C");
-			ABI_CHECK(callContractFunction("f0()"), encodeArgs(0x20, 0));
-			ABI_CHECK(callContractFunction("f1()"), encodeArgs(0x20, 2, "\x01\x02"));
-			ABI_CHECK(callContractFunction("f2()"), encodeArgs(0x20, 5, "\x01" "abc" "\x02"));
-			ABI_CHECK(callContractFunction("f3()"), encodeArgs(0x20, 5, "\x01" "abc" "\x02"));
-			ABI_CHECK(callContractFunction("f4()"), encodeArgs(0x20, 2 + 26 + 26 + 2, "\x07\x01" "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" "\x12\x01"));
-			ABI_CHECK(callContractFunction("f_literal()"), encodeArgs(0x20, 5, "\x01" "abc" "\x02"));
-			ABI_CHECK(callContractFunction("f_calldata()"), encodeArgs(0x20, 6, "\x01" "\xa5\xbf\xa1\xee" "\x02"));
-		)
-	}
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePacked_from_storage)
-{
-	char const* sourceCode = R"(
-		contract C {
-			uint24[9] small_fixed;
-			int24[9] small_fixed_signed;
-			uint24[] small_dyn;
-			uint248[5] large_fixed;
-			uint248[] large_dyn;
-			bytes bytes_storage;
-			function sf() public returns (bytes memory) {
-				small_fixed[0] = 0xfffff1;
-				small_fixed[2] = 0xfffff2;
-				small_fixed[5] = 0xfffff3;
-				small_fixed[8] = 0xfffff4;
-				return abi.encodePacked(uint8(0x01), small_fixed, uint8(0x02));
-			}
-			function sd() public returns (bytes memory) {
-				small_dyn.push(0xfffff1);
-				small_dyn.push(0x00);
-				small_dyn.push(0xfffff2);
-				small_dyn.push(0x00);
-				small_dyn.push(0x00);
-				small_dyn.push(0xfffff3);
-				small_dyn.push(0x00);
-				small_dyn.push(0x00);
-				small_dyn.push(0xfffff4);
-				return abi.encodePacked(uint8(0x01), small_dyn, uint8(0x02));
-			}
-			function sfs() public returns (bytes memory) {
-				small_fixed_signed[0] = -2;
-				small_fixed_signed[2] = 0xffff2;
-				small_fixed_signed[5] = -200;
-				small_fixed_signed[8] = 0xffff4;
-				return abi.encodePacked(uint8(0x01), small_fixed_signed, uint8(0x02));
-			}
-			function lf() public returns (bytes memory) {
-				large_fixed[0] = 2**248-1;
-				large_fixed[1] = 0xfffff2;
-				large_fixed[2] = 2**248-2;
-				large_fixed[4] = 0xfffff4;
-				return abi.encodePacked(uint8(0x01), large_fixed, uint8(0x02));
-			}
-			function ld() public returns (bytes memory) {
-				large_dyn.push(2**248-1);
-				large_dyn.push(0xfffff2);
-				large_dyn.push(2**248-2);
-				large_dyn.push(0);
-				large_dyn.push(0xfffff4);
-				return abi.encodePacked(uint8(0x01), large_dyn, uint8(0x02));
-			}
-			function bytes_short() public returns (bytes memory) {
-				bytes_storage = "abcd";
-				return abi.encodePacked(uint8(0x01), bytes_storage, uint8(0x02));
-			}
-			function bytes_long() public returns (bytes memory) {
-				bytes_storage = "0123456789012345678901234567890123456789";
-				return abi.encodePacked(uint8(0x01), bytes_storage, uint8(0x02));
-			}
-		}
-	)";
-	for (auto v2: {false, true})
-	{
-		ALSO_VIA_YUL(
-			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
-			compileAndRun(prefix + sourceCode, 0, "C");
-			bytes payload = encodeArgs(0xfffff1, 0, 0xfffff2, 0, 0, 0xfffff3, 0, 0, 0xfffff4);
-			bytes encoded = encodeArgs(0x20, 0x122, "\x01" + asString(payload) + "\x02");
-			ABI_CHECK(callContractFunction("sf()"), encoded);
-			ABI_CHECK(callContractFunction("sd()"), encoded);
-			ABI_CHECK(callContractFunction("sfs()"), encodeArgs(0x20, 0x122, "\x01" + asString(encodeArgs(
-				u256(-2), 0, 0xffff2, 0, 0, u256(-200), 0, 0, 0xffff4
-			)) + "\x02"));
-			payload = encodeArgs(
-				u256("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
-				0xfffff2,
-				u256("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"),
-				0,
-				0xfffff4
-			);
-			ABI_CHECK(callContractFunction("lf()"), encodeArgs(0x20, 5 * 32 + 2, "\x01" + asString(encodeArgs(payload)) + "\x02"));
-			ABI_CHECK(callContractFunction("ld()"), encodeArgs(0x20, 5 * 32 + 2, "\x01" + asString(encodeArgs(payload)) + "\x02"));
-			ABI_CHECK(callContractFunction("bytes_short()"), encodeArgs(0x20, 6, "\x01" "abcd\x02"));
-			ABI_CHECK(callContractFunction("bytes_long()"), encodeArgs(0x20, 42, "\x01" "0123456789012345678901234567890123456789\x02"));
-		)
-	}
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePacked_from_memory)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function sf() public pure returns (bytes memory) {
-				uint24[9] memory small_fixed;
-				small_fixed[0] = 0xfffff1;
-				small_fixed[2] = 0xfffff2;
-				small_fixed[5] = 0xfffff3;
-				small_fixed[8] = 0xfffff4;
-				return abi.encodePacked(uint8(0x01), small_fixed, uint8(0x02));
-			}
-			function sd() public pure returns (bytes memory) {
-				uint24[] memory small_dyn = new uint24[](9);
-				small_dyn[0] = 0xfffff1;
-				small_dyn[2] = 0xfffff2;
-				small_dyn[5] = 0xfffff3;
-				small_dyn[8] = 0xfffff4;
-				return abi.encodePacked(uint8(0x01), small_dyn, uint8(0x02));
-			}
-			function sfs() public pure returns (bytes memory) {
-				int24[9] memory small_fixed_signed;
-				small_fixed_signed[0] = -2;
-				small_fixed_signed[2] = 0xffff2;
-				small_fixed_signed[5] = -200;
-				small_fixed_signed[8] = 0xffff4;
-				return abi.encodePacked(uint8(0x01), small_fixed_signed, uint8(0x02));
-			}
-			function lf() public pure returns (bytes memory) {
-				uint248[5] memory large_fixed;
-				large_fixed[0] = 2**248-1;
-				large_fixed[1] = 0xfffff2;
-				large_fixed[2] = 2**248-2;
-				large_fixed[4] = 0xfffff4;
-				return abi.encodePacked(uint8(0x01), large_fixed, uint8(0x02));
-			}
-			function ld() public pure returns (bytes memory) {
-				uint248[] memory large_dyn = new uint248[](5);
-				large_dyn[0] = 2**248-1;
-				large_dyn[1] = 0xfffff2;
-				large_dyn[2] = 2**248-2;
-				large_dyn[4] = 0xfffff4;
-				return abi.encodePacked(uint8(0x01), large_dyn, uint8(0x02));
-			}
-		}
-	)";
-	for (auto v2: {false, true})
-	{
-		ALSO_VIA_YUL(
-			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
-			compileAndRun(prefix + sourceCode, 0, "C");
-			bytes payload = encodeArgs(0xfffff1, 0, 0xfffff2, 0, 0, 0xfffff3, 0, 0, 0xfffff4);
-			bytes encoded = encodeArgs(0x20, 0x122, "\x01" + asString(payload) + "\x02");
-			ABI_CHECK(callContractFunction("sf()"), encoded);
-			ABI_CHECK(callContractFunction("sd()"), encoded);
-			ABI_CHECK(callContractFunction("sfs()"), encodeArgs(0x20, 0x122, "\x01" + asString(encodeArgs(
-				u256(-2), 0, 0xffff2, 0, 0, u256(-200), 0, 0, 0xffff4
-			)) + "\x02"));
-			payload = encodeArgs(
-				u256("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
-				0xfffff2,
-				u256("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"),
-				0,
-				0xfffff4
-			);
-			ABI_CHECK(callContractFunction("lf()"), encodeArgs(0x20, 5 * 32 + 2, "\x01" + asString(encodeArgs(payload)) + "\x02"));
-			ABI_CHECK(callContractFunction("ld()"), encodeArgs(0x20, 5 * 32 + 2, "\x01" + asString(encodeArgs(payload)) + "\x02"));
-		)
-	}
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePacked_functionPtr)
-{
-	char const* sourceCode = R"(
-		contract C {
-			C other = C(0x1112131400000000000011121314000000000087);
-			function testDirect() public view returns (bytes memory) {
-				return abi.encodePacked(uint8(8), other.f, uint8(2));
-			}
-			function testFixedArray() public view returns (bytes memory) {
-				function () external pure returns (bytes memory)[1] memory x;
-				x[0] = other.f;
-				return abi.encodePacked(uint8(8), x, uint8(2));
-			}
-			function testDynamicArray() public view returns (bytes memory) {
-				function () external pure returns (bytes memory)[] memory x = new function() external pure returns (bytes memory)[](1);
-				x[0] = other.f;
-				return abi.encodePacked(uint8(8), x, uint8(2));
-			}
-			function f() public pure returns (bytes memory) {}
-		}
-	)";
-	for (auto v2: {false, true})
-	{
-		ALSO_VIA_YUL(
-			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
-			compileAndRun(prefix + sourceCode, 0, "C");
-			std::string directEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "02"));
-			ABI_CHECK(callContractFunction("testDirect()"), encodeArgs(0x20, directEncoding.size(), directEncoding));
-			std::string arrayEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "0000000000000000" "02"));
-			ABI_CHECK(callContractFunction("testFixedArray()"), encodeArgs(0x20, arrayEncoding.size(), arrayEncoding));
-			ABI_CHECK(callContractFunction("testDynamicArray()"), encodeArgs(0x20, arrayEncoding.size(), arrayEncoding));
-		)
-	}
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePackedV2_structs)
-{
-	char const* sourceCode = R"(
-		pragma abicoder v2;
-		contract C {
-			struct S {
-				uint8 a;
-				int16 b;
-				uint8[2] c;
-				int16[] d;
-			}
-			S s;
-			event E(S indexed);
-			constructor() {
-				s.a = 0x12;
-				s.b = -7;
-				s.c[0] = 2;
-				s.c[1] = 3;
-				s.d.push(-7);
-				s.d.push(-8);
-			}
-			function testStorage() public {
-				emit E(s);
-			}
-			function testMemory() public {
-				S memory m = s;
-				emit E(m);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "C");
-		bytes structEnc = encodeArgs(int(0x12), u256(-7), int(2), int(3), u256(-7), u256(-8));
-		ABI_CHECK(callContractFunction("testStorage()"), encodeArgs());
-		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E((uint8,int16,uint8[2],int16[]))")));
-		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(structEnc)));
-		ABI_CHECK(callContractFunction("testMemory()"), encodeArgs());
-		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E((uint8,int16,uint8[2],int16[]))")));
-		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(structEnc)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePackedV2_nestedArray)
-{
-	char const* sourceCode = R"(
-		pragma abicoder v2;
-		contract C {
-			struct S {
-				uint8 a;
-				int16 b;
-			}
-			event E(S[2][][3] indexed);
-			function testNestedArrays() public {
-				S[2][][3] memory x;
-				x[1] = new S[2][](2);
-				x[1][0][0].a = 1;
-				x[1][0][0].b = 2;
-				x[1][0][1].a = 3;
-				x[1][1][1].b = 4;
-				emit E(x);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "C");
-		bytes structEnc = encodeArgs(1, 2, 3, 0, 0, 0, 0, 4);
-		ABI_CHECK(callContractFunction("testNestedArrays()"), encodeArgs());
-		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E((uint8,int16)[2][][3])")));
-		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(structEnc)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(abi_encodePackedV2_arrayOfStrings)
-{
-	char const* sourceCode = R"(
-		pragma abicoder v2;
-		contract C {
-			string[] x;
-			event E(string[] indexed);
-			constructor() {
-				x.push("abc");
-				x.push("0123456789012345678901234567890123456789");
-			}
-			function testStorage() public {
-				emit E(x);
-			}
-			function testMemory() public {
-				string[] memory y = x;
-				emit E(y);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "C");
-		bytes arrayEncoding = encodeArgs("abc", "0123456789012345678901234567890123456789");
-		ABI_CHECK(callContractFunction("testStorage()"), encodeArgs());
-		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E(string[])")));
-		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(arrayEncoding)));
-		ABI_CHECK(callContractFunction("testMemory()"), encodeArgs());
-		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E(string[])")));
-		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(arrayEncoding)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(code_access)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function lengths() public pure returns (bool) {
-				uint crLen = type(D).creationCode.length;
-				uint runLen = type(D).runtimeCode.length;
-				require(runLen < crLen);
-				require(crLen >= 0x20);
-				require(runLen >= 0x20);
-				return true;
-			}
-			function creation() public pure returns (bytes memory) {
-				return type(D).creationCode;
-			}
-			function runtime() public pure returns (bytes memory) {
-				return type(D).runtimeCode;
-			}
-			function runtimeAllocCheck() public pure returns (bytes memory) {
-				uint[] memory a = new uint[](2);
-				bytes memory c = type(D).runtimeCode;
-				uint[] memory b = new uint[](2);
-				a[0] = 0x1111;
-				a[1] = 0x2222;
-				b[0] = 0x3333;
-				b[1] = 0x4444;
-				return c;
-			}
-		}
-		contract D {
-			function f() public pure returns (uint) { return 7; }
-		}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("lengths()"), encodeArgs(true));
-	bytes codeCreation = callContractFunction("creation()");
-	bytes codeRuntime1 = callContractFunction("runtime()");
-	bytes codeRuntime2 = callContractFunction("runtimeAllocCheck()");
-	ABI_CHECK(codeRuntime1, codeRuntime2);
-}
-
-BOOST_AUTO_TEST_CASE(contract_name)
-{
-	char const* sourceCode = R"(
-		contract C {
-			string public nameAccessor = type(C).name;
-			string public constant constantNameAccessor = type(C).name;
-
-			function name() public virtual pure returns (string memory) {
-				return type(C).name;
-			}
-		}
-		contract D is C {
-			function name() public override pure returns (string memory) {
-				return type(D).name;
-			}
-			function name2() public pure returns (string memory) {
-				return type(C).name;
-			}
-		}
-		contract ThisIsAVeryLongContractNameExceeding256bits {
-			string public nameAccessor = type(ThisIsAVeryLongContractNameExceeding256bits).name;
-			string public constant constantNameAccessor = type(ThisIsAVeryLongContractNameExceeding256bits).name;
-
-			function name() public pure returns (string memory) {
-				return type(ThisIsAVeryLongContractNameExceeding256bits).name;
-			}
-		}
-	)";
-
-	compileAndRun(sourceCode, 0, "C");
-	bytes argsC = encodeArgs(u256(0x20), u256(1), "C");
-	ABI_CHECK(callContractFunction("name()"), argsC);
-	ABI_CHECK(callContractFunction("nameAccessor()"), argsC);
-	ABI_CHECK(callContractFunction("constantNameAccessor()"), argsC);
-
-	compileAndRun(sourceCode, 0, "D");
-	bytes argsD = encodeArgs(u256(0x20), u256(1), "D");
-	ABI_CHECK(callContractFunction("name()"), argsD);
-	ABI_CHECK(callContractFunction("name2()"), argsC);
-
-	std::string longName = "ThisIsAVeryLongContractNameExceeding256bits";
-	compileAndRun(sourceCode, 0, longName);
-	bytes argsLong = encodeArgs(u256(0x20), u256(longName.length()), longName);
-	ABI_CHECK(callContractFunction("name()"), argsLong);
-	ABI_CHECK(callContractFunction("nameAccessor()"), argsLong);
-	ABI_CHECK(callContractFunction("constantNameAccessor()"), argsLong);
-}
-
-BOOST_AUTO_TEST_CASE(event_wrong_abi_name)
-{
-	char const* sourceCode = R"(
-		library ClientReceipt {
-			event Deposit(Test indexed _from, bytes32 indexed _id, uint _value);
-			function deposit(bytes32 _id) public {
-				Test a;
-				emit Deposit(a, _id, msg.value);
-			}
-		}
-		contract Test {
-			function f() public {
-				ClientReceipt.deposit("123");
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		compileAndRun(sourceCode, 0, "ClientReceipt", bytes());
-		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":ClientReceipt", m_contractAddress}});
-
-		callContractFunction("f()");
-		BOOST_REQUIRE_EQUAL(numLogs(), 1);
-		BOOST_CHECK_EQUAL(logAddress(0), m_contractAddress);
-		BOOST_REQUIRE_EQUAL(numLogTopics(0), 3);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("Deposit(address,bytes32,uint256)")));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(dirty_scratch_space_prior_to_constant_optimiser)
-{
-	char const* sourceCode = R"(
-		contract C {
-			event X(uint);
-			constructor() {
-				assembly {
-					// make scratch space dirty
-					mstore(0, 0x4242424242424242424242424242424242424242424242424242424242424242)
-				}
-				uint x = 0x0000000000001234123412431234123412412342112341234124312341234124;
-				// This is just to create many instances of x
-				unchecked { emit X(x + f() * g(tx.origin) ^ h(block.number)); }
-				assembly {
-					// make scratch space dirty
-					mstore(0, 0x4242424242424242424242424242424242424242424242424242424242424242)
-				}
-				emit X(x);
-			}
-			function f() internal pure returns (uint) {
-				return 0x0000000000001234123412431234123412412342112341234124312341234124;
-			}
-			function g(address a) internal pure returns (uint) {
-				unchecked { return uint(uint160(a)) * 0x0000000000001234123412431234123412412342112341234124312341234124; }
-			}
-			function h(uint a) internal pure returns (uint) {
-				unchecked { return a * 0x0000000000001234123412431234123412412342112341234124312341234124; }
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "C");
-	BOOST_REQUIRE_EQUAL(numLogs(), 2);
-	BOOST_CHECK_EQUAL(logAddress(1), m_contractAddress);
-	ABI_CHECK(
-		logData(1),
-		encodeArgs(u256("0x0000000000001234123412431234123412412342112341234124312341234124"))
-	);
-}
-
-BOOST_AUTO_TEST_CASE(strip_reason_strings)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f(bool _x) public pure returns (uint) {
-				require(_x, "some reason");
-				return 7;
-			}
-			function g(bool _x) public pure returns (uint) {
-				string memory x = "some indirect reason";
-				require(_x, x);
-				return 8;
-			}
-			function f1(bool _x) public pure returns (uint) {
-				if (!_x) revert( /* */ "some reason" /* */ );
-				return 9;
-			}
-			function g1(bool _x) public pure returns (uint) {
-				string memory x = "some indirect reason";
-				if (!_x) revert(x);
-				return 10;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		m_revertStrings = RevertStrings::Default;
-		compileAndRun(sourceCode, 0, "C");
-
-		if (
-			m_optimiserSettings == OptimiserSettings::minimal() ||
-			m_optimiserSettings == OptimiserSettings::none()
-		)
-			// check that the reason string IS part of the binary.
-			BOOST_CHECK(util::toHex(m_output).find("736f6d6520726561736f6e") != std::string::npos);
-
-		m_revertStrings = RevertStrings::Strip;
-		compileAndRun(sourceCode, 0, "C");
-		// check that the reason string is NOT part of the binary.
-		BOOST_CHECK(util::toHex(m_output).find("736f6d6520726561736f6e") == std::string::npos);
-
-		ABI_CHECK(callContractFunction("f(bool)", true), encodeArgs(7));
-		ABI_CHECK(callContractFunction("f(bool)", false), encodeArgs());
-		ABI_CHECK(callContractFunction("g(bool)", true), encodeArgs(8));
-		ABI_CHECK(callContractFunction("g(bool)", false), encodeArgs());
-		ABI_CHECK(callContractFunction("f1(bool)", true), encodeArgs(9));
-		ABI_CHECK(callContractFunction("f1(bool)", false), encodeArgs());
-		ABI_CHECK(callContractFunction("g1(bool)", true), encodeArgs(10));
-		ABI_CHECK(callContractFunction("g1(bool)", false), encodeArgs());
-	)
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
deleted file mode 100644
index 27fb39c1217e..000000000000
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Framework for executing Solidity contracts and testing them against C++ implementation.
- */
-
-#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <test/libsolidity/util/Common.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <libyul/Exceptions.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <boost/test/framework.hpp>
-
-#include <cstdlib>
-#include <iostream>
-
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity::langutil;
-using namespace solidity::test;
-
-bytes SolidityExecutionFramework::multiSourceCompileContract(
-	std::map<std::string, std::string> const& _sourceCode,
-	std::optional<std::string> const& _mainSourceName,
-	std::string const& _contractName,
-	std::map<std::string, Address> const& _libraryAddresses
-)
-{
-	if (_mainSourceName.has_value())
-		solAssert(_sourceCode.find(_mainSourceName.value()) != _sourceCode.end(), "");
-
-	m_compiler.reset();
-	m_compiler.setSources(withPreamble(
-		_sourceCode,
-		solidity::test::CommonOptions::get().useABIEncoderV1 // _addAbicoderV1Pragma
-	));
-	m_compiler.setLibraries(_libraryAddresses);
-	m_compiler.setRevertStringBehaviour(m_revertStrings);
-	m_compiler.setEVMVersion(m_evmVersion);
-	m_compiler.setEOFVersion(m_eofVersion);
-	m_compiler.setOptimiserSettings(m_optimiserSettings);
-	m_compiler.enableEvmBytecodeGeneration(true);
-	m_compiler.setViaIR(m_compileViaYul);
-	m_compiler.setRevertStringBehaviour(m_revertStrings);
-	if (!m_appendCBORMetadata) {
-		m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
-	}
-	m_compiler.setMetadataHash(m_metadataHash);
-
-	if (!m_compiler.compile())
-	{
-		// The testing framework expects an exception for
-		// "unimplemented" yul IR generation.
-		if (m_compileViaYul)
-			for (auto const& error: m_compiler.errors())
-				if (error->type() == langutil::Error::Type::CodeGenerationError)
-					BOOST_THROW_EXCEPTION(*error);
-		langutil::SourceReferenceFormatter{std::cerr, m_compiler, true, false}
-			.printErrorInformation(m_compiler.errors());
-		BOOST_ERROR("Compiling contract failed");
-	}
-	std::string contractName(_contractName.empty() ? m_compiler.lastContractName(_mainSourceName) : _contractName);
-	evmasm::LinkerObject obj = m_compiler.object(contractName);
-	BOOST_REQUIRE(obj.linkReferences.empty());
-	if (m_showMetadata)
-		std::cout << "metadata: " << m_compiler.metadata(contractName) << std::endl;
-	return obj.bytecode;
-}
-
-bytes SolidityExecutionFramework::compileContract(
-	std::string const& _sourceCode,
-	std::string const& _contractName,
-	std::map<std::string, Address> const& _libraryAddresses
-)
-{
-	return multiSourceCompileContract(
-		{{"", _sourceCode}},
-		std::nullopt,
-		_contractName,
-		_libraryAddresses
-	);
-}
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
deleted file mode 100644
index f91ba758f08b..000000000000
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Framework for executing Solidity contracts and testing them against C++ implementation.
- */
-
-#pragma once
-
-#include <functional>
-
-#include <test/ExecutionFramework.h>
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/DebugSettings.h>
-
-#include <libyul/YulStack.h>
-
-namespace solidity::frontend::test
-{
-
-class SolidityExecutionFramework: public solidity::test::ExecutionFramework
-{
-
-public:
-	SolidityExecutionFramework(): m_showMetadata(solidity::test::CommonOptions::get().showMetadata) {}
-	explicit SolidityExecutionFramework(
-		langutil::EVMVersion _evmVersion,
-		std::optional<uint8_t> _eofVersion,
-		std::vector<boost::filesystem::path> const& _vmPaths,
-		bool _appendCBORMetadata = true
-	):
-		ExecutionFramework(_evmVersion, _vmPaths),
-		m_eofVersion(_eofVersion),
-		m_showMetadata(solidity::test::CommonOptions::get().showMetadata),
-		m_appendCBORMetadata(_appendCBORMetadata)
-	{}
-
-	bytes const& compileAndRunWithoutCheck(
-		std::map<std::string, std::string> const& _sourceCode,
-		u256 const& _value = 0,
-		std::string const& _contractName = "",
-		bytes const& _arguments = {},
-		std::map<std::string, solidity::test::Address> const& _libraryAddresses = {},
-		std::optional<std::string> const& _sourceName = std::nullopt
-	) override
-	{
-		bytes bytecode = multiSourceCompileContract(_sourceCode, _sourceName, _contractName, _libraryAddresses);
-		sendMessage(bytecode + _arguments, true, _value);
-		return m_output;
-	}
-
-	bytes compileContract(
-		std::string const& _sourceCode,
-		std::string const& _contractName = "",
-		std::map<std::string, solidity::test::Address> const& _libraryAddresses = {}
-	);
-
-	bytes multiSourceCompileContract(
-		std::map<std::string, std::string> const& _sources,
-		std::optional<std::string> const& _mainSourceName = std::nullopt,
-		std::string const& _contractName = "",
-		std::map<std::string, solidity::test::Address> const& _libraryAddresses = {}
-	);
-
-protected:
-	using CompilerStack = solidity::frontend::CompilerStack;
-	std::optional<uint8_t> m_eofVersion;
-	CompilerStack m_compiler;
-	bool m_compileViaYul = false;
-	bool m_showMetadata = false;
-	bool m_appendCBORMetadata = true;
-	CompilerStack::MetadataHash m_metadataHash = CompilerStack::MetadataHash::IPFS;
-	RevertStrings m_revertStrings = RevertStrings::Default;
-};
-
-} // end namespaces
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
deleted file mode 100644
index b05d28a8403f..000000000000
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Unit tests for the solidity expression compiler.
- */
-
-#include <string>
-
-#include <liblangutil/Scanner.h>
-#include <libsolidity/parsing/Parser.h>
-#include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <libsolidity/analysis/Scoper.h>
-#include <libsolidity/analysis/SyntaxChecker.h>
-#include <libsolidity/analysis/DeclarationTypeChecker.h>
-#include <libsolidity/codegen/CompilerContext.h>
-#include <libsolidity/codegen/ExpressionCompiler.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/analysis/TypeChecker.h>
-#include <liblangutil/ErrorReporter.h>
-#include <libevmasm/LinkerObject.h>
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::evmasm;
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-
-/// Helper class that extracts the first expression in an AST.
-class FirstExpressionExtractor: private ASTVisitor
-{
-public:
-	FirstExpressionExtractor(ASTNode& _node): m_expression(nullptr) { _node.accept(*this); }
-	Expression* expression() const { return m_expression; }
-private:
-	bool visit(Assignment& _expression) override { return checkExpression(_expression); }
-	bool visit(UnaryOperation& _expression) override { return checkExpression(_expression); }
-	bool visit(BinaryOperation& _expression) override { return checkExpression(_expression); }
-	bool visit(FunctionCall& _expression) override { return checkExpression(_expression); }
-	bool visit(MemberAccess& _expression) override { return checkExpression(_expression); }
-	bool visit(IndexAccess& _expression) override { return checkExpression(_expression); }
-	bool visit(Identifier& _expression) override { return checkExpression(_expression); }
-	bool visit(ElementaryTypeNameExpression& _expression) override { return checkExpression(_expression); }
-	bool visit(Literal& _expression) override { return checkExpression(_expression); }
-	bool checkExpression(Expression& _expression)
-	{
-		if (m_expression == nullptr)
-			m_expression = &_expression;
-		return false;
-	}
-private:
-	Expression* m_expression;
-};
-
-Declaration const& resolveDeclaration(
-	SourceUnit const& _sourceUnit,
-	std::vector<std::string> const& _namespacedName,
-	NameAndTypeResolver const& _resolver
-)
-{
-	ASTNode const* scope = &_sourceUnit;
-	// bracers are required, cause msvc couldn't handle this macro in for statement
-	for (std::string const& namePart: _namespacedName)
-	{
-		auto declarations = _resolver.resolveName(namePart, scope);
-		BOOST_REQUIRE(!declarations.empty());
-		BOOST_REQUIRE(scope = *declarations.begin());
-	}
-	BOOST_REQUIRE(scope);
-	return dynamic_cast<Declaration const&>(*scope);
-}
-
-bytes compileFirstExpression(
-	std::string const& _sourceCode,
-	std::vector<std::vector<std::string>> _functions = {},
-	std::vector<std::vector<std::string>> _localVariables = {}
-)
-{
-	std::string sourceCode = "pragma solidity >=0.0; // SPDX-License-Identifier: GPL-3\n" + _sourceCode;
-	CharStream stream(sourceCode, "");
-
-	ASTPointer<SourceUnit> sourceUnit;
-	try
-	{
-		ErrorList errors;
-		ErrorReporter errorReporter(errors);
-		sourceUnit = Parser(errorReporter, solidity::test::CommonOptions::get().evmVersion()).parse(stream);
-		if (!sourceUnit)
-			return bytes();
-	}
-	catch (boost::exception const& _e)
-	{
-		std::string msg = "Parsing source code failed with:\n" + boost::diagnostic_information(_e);
-		BOOST_FAIL(msg);
-	}
-	catch (...)
-	{
-		std::string msg = "Parsing source code failed with:\n" + boost::current_exception_diagnostic_information();
-		BOOST_FAIL(msg);
-	}
-
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	GlobalContext globalContext;
-	Scoper::assignScopes(*sourceUnit);
-	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
-	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter);
-	resolver.registerDeclarations(*sourceUnit);
-	BOOST_REQUIRE_MESSAGE(resolver.resolveNamesAndTypes(*sourceUnit), "Resolving names failed");
-	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		BOOST_REQUIRE(declarationTypeChecker.check(*node));
-	TypeChecker typeChecker(solidity::test::CommonOptions::get().evmVersion(), errorReporter);
-	BOOST_REQUIRE(typeChecker.checkTypeRequirements(*sourceUnit));
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			FirstExpressionExtractor extractor(*contract);
-			BOOST_REQUIRE(extractor.expression() != nullptr);
-
-			CompilerContext context(
-				solidity::test::CommonOptions::get().evmVersion(),
-				RevertStrings::Default
-			);
-			context.resetVisitedNodes(contract);
-			context.setMostDerivedContract(*contract);
-			context.setArithmetic(Arithmetic::Wrapping);
-			size_t parametersSize = _localVariables.size(); // assume they are all one slot on the stack
-			context.adjustStackOffset(static_cast<int>(parametersSize));
-			for (std::vector<std::string> const& variable: _localVariables)
-				context.addVariable(
-					dynamic_cast<VariableDeclaration const&>(resolveDeclaration(*sourceUnit, variable, resolver)),
-					static_cast<unsigned>(parametersSize--)
-				);
-
-			ExpressionCompiler(
-				context,
-				solidity::test::CommonOptions::get().optimize
-			).compile(*extractor.expression());
-
-			for (std::vector<std::string> const& function: _functions)
-				context << context.functionEntryLabel(dynamic_cast<FunctionDefinition const&>(
-					resolveDeclaration(*sourceUnit, function, resolver)
-				));
-
-			context.appendMissingLowLevelFunctions();
-			// NOTE: We intentionally disable optimisations for utility functions to simplify the tests
-			context.appendYulUtilityFunctions({});
-			BOOST_REQUIRE(context.appendYulUtilityFunctionsRan());
-
-			BOOST_REQUIRE(context.assemblyPtr());
-			LinkerObject const& object = context.assemblyPtr()->assemble();
-			BOOST_REQUIRE(object.immutableReferences.empty());
-			bytes instructions = object.bytecode;
-			// debug
-			// cout << evmasm::disassemble(instructions) << endl;
-			return instructions;
-		}
-	BOOST_FAIL("No contract found in source.");
-	return bytes();
-}
-
-} // end anonymous namespace
-
-BOOST_AUTO_TEST_SUITE(SolidityExpressionCompiler)
-
-BOOST_AUTO_TEST_CASE(literal_true)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { bool x = true; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation({uint8_t(Instruction::PUSH1), 0x1});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(literal_false)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { bool x = false; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation = solidity::test::CommonOptions::get().evmVersion().hasPush0() ?
-		bytes{uint8_t(Instruction::PUSH0)} :
-		bytes{uint8_t(Instruction::PUSH1), 0x0};
-
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(int_literal)
-{
-	char const* sourceCode = R"(
-		contract test {
-		  function f() public { uint x = 0x12345678901234567890; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation({uint8_t(Instruction::PUSH10), 0x12, 0x34, 0x56, 0x78, 0x90,
-													   0x12, 0x34, 0x56, 0x78, 0x90});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(int_with_wei_ether_subdenomination)
-{
-	char const* sourceCode = R"(
-		contract test {
-			constructor() {
-				 uint x = 1 wei;
-			}
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation({uint8_t(Instruction::PUSH1), 0x1});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(int_with_gwei_ether_subdenomination)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public {
-				uint x = 1 gwei;
-			}
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation({uint8_t(Instruction::PUSH4), 0x3b, 0x9a, 0xca, 0x00});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(int_with_ether_ether_subdenomination)
-{
-	char const* sourceCode = R"(
-		contract test {
-			constructor() {
-				 uint x = 1 ether;
-			}
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation({uint8_t(Instruction::PUSH8), 0xd, 0xe0, 0xb6, 0xb3, 0xa7, 0x64, 0x00, 0x00});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(comparison)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { bool x = (0x10aa < 0x11aa) != true; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation;
-	if (solidity::test::CommonOptions::get().optimize)
-		expectation = {
-			uint8_t(Instruction::PUSH2), 0x11, 0xaa,
-			uint8_t(Instruction::PUSH2), 0x10, 0xaa,
-			uint8_t(Instruction::LT), uint8_t(Instruction::ISZERO), uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::PUSH1), 0x1,
-			uint8_t(Instruction::ISZERO), uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::EQ),
-			uint8_t(Instruction::ISZERO)
-		};
-	else
-		expectation = {
-			uint8_t(Instruction::PUSH1), 0x1, uint8_t(Instruction::ISZERO), uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::PUSH2), 0x11, 0xaa,
-			uint8_t(Instruction::PUSH2), 0x10, 0xaa,
-			uint8_t(Instruction::LT), uint8_t(Instruction::ISZERO), uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::EQ),
-			uint8_t(Instruction::ISZERO)
-		};
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(short_circuiting)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { bool x = true != (4 <= 8 + 10 || 9 != 2); }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation{
-		uint8_t(Instruction::PUSH1), 0x12, // 8 + 10
-		uint8_t(Instruction::PUSH1), 0x4,
-		uint8_t(Instruction::GT),
-		uint8_t(Instruction::ISZERO), // after this we have 4 <= 8 + 10
-		uint8_t(Instruction::DUP1),
-		uint8_t(Instruction::PUSH1), 0x11,
-		uint8_t(Instruction::JUMPI), // short-circuit if it is true
-		uint8_t(Instruction::POP),
-		uint8_t(Instruction::PUSH1), 0x2,
-		uint8_t(Instruction::PUSH1), 0x9,
-		uint8_t(Instruction::EQ),
-		uint8_t(Instruction::ISZERO), // after this we have 9 != 2
-		uint8_t(Instruction::JUMPDEST),
-		uint8_t(Instruction::ISZERO), uint8_t(Instruction::ISZERO),
-		uint8_t(Instruction::PUSH1), 0x1, uint8_t(Instruction::ISZERO), uint8_t(Instruction::ISZERO),
-		uint8_t(Instruction::EQ),
-		uint8_t(Instruction::ISZERO)
-	};
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(arithmetic)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint y) public { unchecked { ((((((((y ^ 8) & 7) | 6) - 5) + 4) % 3) / 2) * 1); } }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "y"}});
-	bool hasPush0 = solidity::test::CommonOptions::get().evmVersion().hasPush0();
-	bytes push0Bytes = hasPush0 ?
-		bytes{uint8_t(Instruction::PUSH0)} :
-		bytes{uint8_t(Instruction::PUSH1), 0x0};
-	uint8_t size = hasPush0 ? 0x65: 0x67;
-	bytes panic =
-		bytes{
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::PUSH32)
-		} +
-		util::fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") +
-		  push0Bytes +
-		bytes{
-			uint8_t(Instruction::MSTORE),
-			uint8_t(Instruction::PUSH1), 0x12,
-			uint8_t(Instruction::PUSH1), 0x4,
-			uint8_t(Instruction::MSTORE),
-			uint8_t(Instruction::PUSH1), 0x24
-		} +
-		push0Bytes +
-		bytes{
-			uint8_t(Instruction::REVERT),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::JUMP),
-			uint8_t(Instruction::JUMPDEST)
-		};
-
-	bytes expectation;
-	if (solidity::test::CommonOptions::get().optimize)
-		expectation = bytes{
-			uint8_t(Instruction::PUSH1), 0x2,
-			uint8_t(Instruction::PUSH1), 0x3,
-			uint8_t(Instruction::PUSH1), 0x5,
-			uint8_t(Instruction::DUP4),
-			uint8_t(Instruction::PUSH1), 0x8,
-			uint8_t(Instruction::XOR),
-			uint8_t(Instruction::PUSH1), 0x7,
-			uint8_t(Instruction::AND),
-			uint8_t(Instruction::PUSH1), 0x6,
-			uint8_t(Instruction::OR),
-			uint8_t(Instruction::SUB),
-			uint8_t(Instruction::PUSH1), 0x4,
-			uint8_t(Instruction::ADD),
-			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::PUSH1), 0x20,
-			uint8_t(Instruction::JUMPI),
-			uint8_t(Instruction::PUSH1), 0x1f,
-			uint8_t(Instruction::PUSH1), 0x36,
-			uint8_t(Instruction::JUMP),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::MOD),
-			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::PUSH1), 0x2e,
-			uint8_t(Instruction::JUMPI),
-			uint8_t(Instruction::PUSH1), 0x2d,
-			uint8_t(Instruction::PUSH1), 0x36,
-			uint8_t(Instruction::JUMP),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::DIV),
-			uint8_t(Instruction::PUSH1), 0x1,
-			uint8_t(Instruction::MUL),
-			uint8_t(Instruction::PUSH1), size,
-			uint8_t(Instruction::JUMP)
-		} + panic;
-	else
-		expectation = bytes{
-			uint8_t(Instruction::PUSH1), 0x1,
-			uint8_t(Instruction::PUSH1), 0x2,
-			uint8_t(Instruction::PUSH1), 0x3,
-			uint8_t(Instruction::PUSH1), 0x4,
-			uint8_t(Instruction::PUSH1), 0x5,
-			uint8_t(Instruction::PUSH1), 0x6,
-			uint8_t(Instruction::PUSH1), 0x7,
-			uint8_t(Instruction::PUSH1), 0x8,
-			uint8_t(Instruction::DUP9),
-			uint8_t(Instruction::XOR),
-			uint8_t(Instruction::AND),
-			uint8_t(Instruction::OR),
-			uint8_t(Instruction::SUB),
-			uint8_t(Instruction::ADD),
-			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::PUSH1), 0x22,
-			uint8_t(Instruction::JUMPI),
-			uint8_t(Instruction::PUSH1), 0x21,
-			uint8_t(Instruction::PUSH1), 0x36,
-			uint8_t(Instruction::JUMP),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::MOD),
-			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::ISZERO),
-			uint8_t(Instruction::PUSH1), 0x30,
-			uint8_t(Instruction::JUMPI),
-			uint8_t(Instruction::PUSH1), 0x2f,
-			uint8_t(Instruction::PUSH1), 0x36,
-			uint8_t(Instruction::JUMP),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::JUMPDEST),
-			uint8_t(Instruction::DIV),
-			uint8_t(Instruction::MUL),
-			uint8_t(Instruction::PUSH1), size,
-			uint8_t(Instruction::JUMP)
-		} + panic;
-
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(unary_operators)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(int y) public { unchecked { !(~- y == 2); } }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "y"}});
-
-	bytes push0Bytes = solidity::test::CommonOptions::get().evmVersion().hasPush0() ?
-		bytes{uint8_t(Instruction::PUSH0)} :
-		bytes{uint8_t(Instruction::PUSH1), 0x0};
-
-	bytes expectation;
-	if (solidity::test::CommonOptions::get().optimize)
-		expectation = bytes{
-			uint8_t(Instruction::DUP1),
-		} +
-		push0Bytes +
-		bytes{
-			uint8_t(Instruction::SUB),
-			uint8_t(Instruction::NOT),
-			uint8_t(Instruction::PUSH1), 0x2,
-			uint8_t(Instruction::EQ),
-			uint8_t(Instruction::ISZERO)
-		};
-	else
-		expectation = bytes{
-			uint8_t(Instruction::PUSH1), 0x2,
-			uint8_t(Instruction::DUP2),
-		} +
-		push0Bytes +
-		bytes{
-			uint8_t(Instruction::SUB),
-			uint8_t(Instruction::NOT),
-			uint8_t(Instruction::EQ),
-			uint8_t(Instruction::ISZERO)
-		};
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(unary_inc_dec)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint a) public returns (uint x) { unchecked { x = --a ^ (a-- ^ (++a ^ a++)); } }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "a"}, {"test", "f", "x"}});
-
-	// Stack: a, x
-	bytes expectation{
-		uint8_t(Instruction::DUP2),
-		uint8_t(Instruction::DUP1),
-		uint8_t(Instruction::PUSH1), 0x1,
-		uint8_t(Instruction::ADD),
-		// Stack here: a x a (a+1)
-		uint8_t(Instruction::SWAP3),
-		uint8_t(Instruction::POP), // first ++
-		// Stack here: (a+1) x a
-		uint8_t(Instruction::DUP3),
-		uint8_t(Instruction::PUSH1), 0x1,
-		uint8_t(Instruction::ADD),
-		// Stack here: (a+1) x a (a+2)
-		uint8_t(Instruction::SWAP3),
-		uint8_t(Instruction::POP),
-		// Stack here: (a+2) x a
-		uint8_t(Instruction::DUP3), // second ++
-		uint8_t(Instruction::XOR),
-		// Stack here: (a+2) x a^(a+2)
-		uint8_t(Instruction::DUP3),
-		uint8_t(Instruction::DUP1),
-		uint8_t(Instruction::PUSH1), 0x1,
-		uint8_t(Instruction::SWAP1),
-		uint8_t(Instruction::SUB),
-		// Stack here: (a+2) x a^(a+2) (a+2) (a+1)
-		uint8_t(Instruction::SWAP4),
-		uint8_t(Instruction::POP), // first --
-		uint8_t(Instruction::XOR),
-		// Stack here: (a+1) x a^(a+2)^(a+2)
-		uint8_t(Instruction::DUP3),
-		uint8_t(Instruction::PUSH1), 0x1,
-		uint8_t(Instruction::SWAP1),
-		uint8_t(Instruction::SUB),
-		// Stack here: (a+1) x a^(a+2)^(a+2) a
-		uint8_t(Instruction::SWAP3),
-		uint8_t(Instruction::POP), // second ++
-		// Stack here: a x a^(a+2)^(a+2)
-		uint8_t(Instruction::DUP3), // will change
-		uint8_t(Instruction::XOR),
-		uint8_t(Instruction::SWAP1),
-		uint8_t(Instruction::POP),
-		uint8_t(Instruction::DUP1)
-	};
-	// Stack here: a x a^(a+2)^(a+2)^a
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(assignment)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint a, uint b) public { unchecked { (a += b) * 2; } }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "a"}, {"test", "f", "b"}});
-
-	// Stack: a, b
-	bytes expectation;
-	if (solidity::test::CommonOptions::get().optimize)
-		expectation = {
-			uint8_t(Instruction::DUP1),
-			uint8_t(Instruction::DUP3),
-			uint8_t(Instruction::ADD),
-			uint8_t(Instruction::SWAP2),
-			uint8_t(Instruction::POP),
-			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::PUSH1), 0x2,
-			uint8_t(Instruction::MUL)
-		};
-	else
-		expectation = {
-			uint8_t(Instruction::PUSH1), 0x2,
-			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::DUP4),
-			uint8_t(Instruction::ADD),
-			// Stack here: a b 2 a+b
-			uint8_t(Instruction::SWAP3),
-			uint8_t(Instruction::POP),
-			uint8_t(Instruction::DUP3),
-			// Stack here: a+b b 2 a+b
-			uint8_t(Instruction::MUL)
-		};
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(negative_literals_8bits)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { int8 x = -0x80; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation(bytes({uint8_t(Instruction::PUSH32)}) + bytes(31, 0xff) + bytes(1, 0x80));
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(negative_literals_16bits)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { int64 x = ~0xabc; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation(bytes({uint8_t(Instruction::PUSH32)}) + bytes(30, 0xff) + bytes{0xf5, 0x43});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(intermediately_overflowing_literals)
-{
-	// first literal itself is too large for 256 bits but it fits after all constant operations
-	// have been applied
-	char const* sourceCode = R"(
-		contract test {
-			function f() public { uint8 x = (0x00ffffffffffffffffffffffffffffffffffffffff * 0xffffffffffffffffffffffffff01) & 0xbf; }
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode);
-
-	bytes expectation(bytes({uint8_t(Instruction::PUSH1), 0xbf}));
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(blockhash)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public {
-				blockhash(3);
-			}
-		}
-	)";
-
-	bytes code = compileFirstExpression(sourceCode, {}, {});
-
-	bytes expectation({uint8_t(Instruction::PUSH1), 0x03,
-					   uint8_t(Instruction::BLOCKHASH)});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(gas_left)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public returns (uint256 val) {
-				return gasleft();
-			}
-		}
-	)";
-	bytes code = compileFirstExpression(sourceCode, {}, {});
-
-	bytes expectation = bytes({uint8_t(Instruction::GAS)});
-	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-}
-
-BOOST_AUTO_TEST_CASE(selfbalance)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f() public returns (uint) {
-				return address(this).balance;
-			}
-		}
-	)";
-
-	bytes code = compileFirstExpression(sourceCode, {}, {});
-
-	if (solidity::test::CommonOptions::get().evmVersion().hasSelfBalance())
-	{
-		bytes expectation({uint8_t(Instruction::SELFBALANCE)});
-		BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
-	}
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
deleted file mode 100644
index 4104d70c87b5..000000000000
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Unit tests for the name and type resolution of the solidity parser.
- */
-
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <test/Common.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <libsolutil/Keccak256.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-BOOST_FIXTURE_TEST_SUITE(SolidityNameAndTypeResolution, AnalysisFramework)
-
-BOOST_AUTO_TEST_CASE(function_no_implementation)
-{
-	char const* text = R"(
-		abstract contract test {
-			function functionName(bytes32 input) public virtual returns (bytes32 out);
-		}
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
-	ContractDefinition* contract = dynamic_cast<ContractDefinition*>(nodes[1].get());
-	BOOST_REQUIRE(contract);
-	BOOST_CHECK(!contract->annotation().unimplementedDeclarations->empty());
-	BOOST_CHECK(!contract->definedFunctions()[0]->isImplemented());
-}
-
-BOOST_AUTO_TEST_CASE(abstract_contract)
-{
-	char const* text = R"(
-		abstract contract base { function foo() public virtual; }
-		contract derived is base { function foo() public override {} }
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
-	ContractDefinition* base = dynamic_cast<ContractDefinition*>(nodes[1].get());
-	ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
-	BOOST_REQUIRE(base);
-	BOOST_CHECK(!base->annotation().unimplementedDeclarations->empty());
-	BOOST_CHECK(!base->definedFunctions()[0]->isImplemented());
-	BOOST_REQUIRE(derived);
-	BOOST_CHECK(derived->annotation().unimplementedDeclarations->empty());
-	BOOST_CHECK(derived->definedFunctions()[0]->isImplemented());
-}
-
-BOOST_AUTO_TEST_CASE(abstract_contract_with_overload)
-{
-	char const* text = R"(
-		abstract contract base { function foo(bool) public virtual; }
-		abstract contract derived is base { function foo(uint) public {} }
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
-	ContractDefinition* base = dynamic_cast<ContractDefinition*>(nodes[1].get());
-	ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
-	BOOST_REQUIRE(base);
-	BOOST_CHECK(!base->annotation().unimplementedDeclarations->empty());
-	BOOST_REQUIRE(derived);
-	BOOST_CHECK(!derived->annotation().unimplementedDeclarations->empty());
-}
-
-BOOST_AUTO_TEST_CASE(implement_abstract_via_constructor)
-{
-	char const* text = R"(
-		abstract contract base { function foo() public virtual; }
-		abstract contract foo is base { constructor() {} }
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
-	BOOST_CHECK_EQUAL(nodes.size(), 3);
-	ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
-	BOOST_REQUIRE(derived);
-	BOOST_CHECK(!derived->annotation().unimplementedDeclarations->empty());
-}
-
-BOOST_AUTO_TEST_CASE(function_canonical_signature)
-{
-	char const* text = R"(
-		contract Test {
-			function foo(uint256 arg1, uint64 arg2, bool arg3) public returns (uint256 ret) {
-				ret = arg1 + arg2;
-			}
-		}
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			BOOST_CHECK_EQUAL("foo(uint256,uint64,bool)", functions[0]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(function_canonical_signature_type_aliases)
-{
-	char const* text = R"(
-		contract Test {
-			function boo(uint, bytes32, address) public returns (uint ret) {
-				ret = 5;
-			}
-		}
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			if (functions.empty())
-				continue;
-			BOOST_CHECK_EQUAL("boo(uint256,bytes32,address)", functions[0]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(function_external_types)
-{
-	char const* text = R"(
-		contract C {
-			uint a;
-		}
-		contract Test {
-			function boo(uint, bool, bytes8, bool[2] calldata, uint[] calldata, C, address[] calldata) external returns (uint ret) {
-				ret = 5;
-			}
-		}
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			if (functions.empty())
-				continue;
-			BOOST_CHECK_EQUAL("boo(uint256,bool,bytes8,bool[2],uint256[],address,address[])", functions[0]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(enum_external_type)
-{
-	char const* text = R"(
-		// test for bug #1801
-		contract Test {
-			enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-			function boo(ActionChoices enumArg) external returns (uint ret) {
-				ret = 5;
-			}
-		}
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			if (functions.empty())
-				continue;
-			BOOST_CHECK_EQUAL("boo(uint8)", functions[0]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(external_struct_signatures)
-{
-	char const* text = R"(
-		pragma abicoder v2;
-		contract Test {
-			enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-			struct Simple { uint i; }
-			struct Nested { X[2][] a; uint y; }
-			struct X { bytes32 x; Test t; Simple[] s; }
-			function f(ActionChoices, uint, Simple calldata) external {}
-			function g(Test, Nested calldata) external {}
-			function h(function(Nested memory) external returns (uint)[] calldata) external {}
-			function i(Nested[] calldata) external {}
-		}
-	)";
-	// Ignore analysis errors. This test only checks that correct signatures
-	// are generated for external structs, but they are not yet supported
-	// in code generation and therefore cause an error in the TypeChecker.
-	SourceUnit const* sourceUnit = runAnalysisAndExpectNoParsingErrors(text, false, true, true).first;
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			BOOST_REQUIRE(!functions.empty());
-			BOOST_CHECK_EQUAL("f(uint8,uint256,(uint256))", functions[0]->externalSignature());
-			BOOST_CHECK_EQUAL("g(address,((bytes32,address,(uint256)[])[2][],uint256))", functions[1]->externalSignature());
-			BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature());
-			BOOST_CHECK_EQUAL("i(((bytes32,address,(uint256)[])[2][],uint256)[])", functions[3]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(external_struct_signatures_in_libraries)
-{
-	char const* text = R"(
-		pragma abicoder v2;
-		library Test {
-			enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-			struct Simple { uint i; }
-			struct Nested { X[2][] a; uint y; }
-			struct X { bytes32 x; Test t; Simple[] s; }
-			function f(ActionChoices, uint, Simple calldata) external {}
-			function g(Test, Nested calldata) external {}
-			function h(function(Nested memory) external returns (uint)[] calldata) external {}
-			function i(Nested[] calldata) external {}
-		}
-	)";
-	// Ignore analysis errors. This test only checks that correct signatures
-	// are generated for external structs, but calldata structs are not yet supported
-	// in code generation and therefore cause an error in the TypeChecker.
-	SourceUnit const* sourceUnit = runAnalysisAndExpectNoParsingErrors(text, false, true, true).first;
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			BOOST_REQUIRE(!functions.empty());
-			BOOST_CHECK_EQUAL("f(Test.ActionChoices,uint256,Test.Simple)", functions[0]->externalSignature());
-			BOOST_CHECK_EQUAL("g(Test,Test.Nested)", functions[1]->externalSignature());
-			BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature());
-			BOOST_CHECK_EQUAL("i(Test.Nested[])", functions[3]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(struct_with_mapping_in_library)
-{
-	char const* text = R"(
-		library Test {
-			struct Nested { mapping(uint => uint)[2][] a; uint y; }
-			struct X { Nested n; }
-			function f(X storage x) external {}
-		}
-	)";
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-		{
-			auto functions = contract->definedFunctions();
-			BOOST_REQUIRE(!functions.empty());
-			BOOST_CHECK_EQUAL("f(Test.X storage)", functions[0]->externalSignature());
-		}
-}
-
-BOOST_AUTO_TEST_CASE(state_variable_accessors)
-{
-	char const* text = R"(
-		contract test {
-			function fun() public {
-				uint64(2);
-			}
-			uint256 public foo;
-			mapping(uint=>bytes4) public map;
-			mapping(uint=>mapping(uint=>bytes4)) public multiple_map;
-		}
-	)";
-
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	ContractDefinition const* contract;
-	BOOST_REQUIRE((contract = retrieveContractByName(*sourceUnit, "test")) != nullptr);
-	FunctionTypePointer function = retrieveFunctionBySignature(*contract, "foo()");
-	BOOST_REQUIRE(function && function->hasDeclaration());
-	auto returnParams = function->returnParameterTypes();
-	BOOST_CHECK_EQUAL(returnParams.at(0)->canonicalName(), "uint256");
-	BOOST_CHECK(function->stateMutability() == StateMutability::View);
-
-	function = retrieveFunctionBySignature(*contract, "map(uint256)");
-	BOOST_REQUIRE(function && function->hasDeclaration());
-	auto params = function->parameterTypes();
-	BOOST_CHECK_EQUAL(params.at(0)->canonicalName(), "uint256");
-	returnParams = function->returnParameterTypes();
-	BOOST_CHECK_EQUAL(returnParams.at(0)->canonicalName(), "bytes4");
-	BOOST_CHECK(function->stateMutability() == StateMutability::View);
-
-	function = retrieveFunctionBySignature(*contract, "multiple_map(uint256,uint256)");
-	BOOST_REQUIRE(function && function->hasDeclaration());
-	params = function->parameterTypes();
-	BOOST_CHECK_EQUAL(params.at(0)->canonicalName(), "uint256");
-	BOOST_CHECK_EQUAL(params.at(1)->canonicalName(), "uint256");
-	returnParams = function->returnParameterTypes();
-	BOOST_CHECK_EQUAL(returnParams.at(0)->canonicalName(), "bytes4");
-	BOOST_CHECK(function->stateMutability() == StateMutability::View);
-}
-
-BOOST_AUTO_TEST_CASE(private_state_variable)
-{
-	char const* text = R"(
-		contract test {
-			function fun() public {
-				uint64(2);
-			}
-			uint256 private foo;
-			uint256 internal bar;
-		}
-	)";
-
-	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
-	soltestAssert(sourceUnit);
-	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
-
-	ContractDefinition const* contract;
-	BOOST_CHECK((contract = retrieveContractByName(*sourceUnit, "test")) != nullptr);
-	FunctionTypePointer function;
-	function = retrieveFunctionBySignature(*contract, "foo()");
-	BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of a private variable should not exist");
-	function = retrieveFunctionBySignature(*contract, "bar()");
-	BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of an internal variable should not exist");
-}
-
-BOOST_AUTO_TEST_CASE(string)
-{
-	char const* sourceCode = R"(
-		contract C {
-			string s;
-			function f(string calldata x) external { s = x; }
-		}
-	)";
-	CHECK_SUCCESS(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dynamic_return_types_not_possible)
-{
-	char const* sourceCode = R"(
-		abstract contract C {
-			function f(uint) public virtual returns (string memory);
-			function g() public {
-				string memory x = this.f(2);
-				// we can assign to x but it is not usable.
-				bytes(x).length;
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion() == EVMVersion::homestead())
-		CHECK_ERROR(sourceCode, TypeError, "Type inaccessible dynamic type is not implicitly convertible to expected type string memory.");
-	else
-		CHECK_SUCCESS_NO_WARNINGS(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(warn_nonpresent_pragma)
-{
-	char const* text = R"(
-		// SPDX-License-Identifier: GPL-3.0
-		contract C {}
-	)";
-	auto sourceAndError = runAnalysisAndExpectNoParsingErrors(text, true, false);
-	BOOST_REQUIRE(!sourceAndError.second.empty());
-	BOOST_REQUIRE(!!sourceAndError.first);
-	BOOST_CHECK(searchErrorMessage(*sourceAndError.second.front(), "Source file does not specify required compiler version!"));
-}
-
-BOOST_AUTO_TEST_CASE(getter_is_memory_type)
-{
-	char const* text = R"(
-		contract C {
-			struct S { string m; }
-			string[] public x;
-			S[] public y;
-		}
-	)";
-	CHECK_SUCCESS_NO_WARNINGS(text);
-	// Check that the getters return a memory strings, not a storage strings.
-	ContractDefinition const& c = dynamic_cast<ContractDefinition const&>(*compiler().ast("").nodes().at(1));
-	BOOST_CHECK(c.interfaceFunctions().size() == 2);
-	for (auto const& f: c.interfaceFunctions())
-	{
-		auto const& retType = f.second->returnParameterTypes().at(0);
-		BOOST_CHECK(retType->dataStoredIn(DataLocation::Memory));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(address_staticcall)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f() public view returns(bool) {
-				(bool success,) = address(0x4242).staticcall("");
-				return success;
-			}
-		}
-	)";
-
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-		CHECK_SUCCESS_NO_WARNINGS(sourceCode);
-	else
-		CHECK_ERROR(sourceCode, TypeError, "\"staticcall\" is not supported by the VM version.");
-}
-
-BOOST_AUTO_TEST_CASE(address_staticcall_value)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-	{
-		char const* sourceCode = R"(
-			contract C {
-				function f() public view {
-					address(0x4242).staticcall.value;
-				}
-			}
-		)";
-		CHECK_ERROR(sourceCode, TypeError, "Member \"value\" is only available for payable functions.");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(address_call_full_return_type)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f() public {
-				(bool success, bytes memory m) = address(0x4242).call("");
-				success; m;
-			}
-		}
-	)";
-
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-		CHECK_SUCCESS_NO_WARNINGS(sourceCode);
-	else
-		CHECK_ERROR(sourceCode, TypeError, "Type inaccessible dynamic type is not implicitly convertible to expected type bytes memory.");
-}
-
-BOOST_AUTO_TEST_CASE(address_delegatecall_full_return_type)
-{
-	char const* sourceCode = R"(
-		contract C {
-			function f() public {
-				(bool success, bytes memory m) = address(0x4242).delegatecall("");
-				success; m;
-			}
-		}
-	)";
-
-	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-		CHECK_SUCCESS_NO_WARNINGS(sourceCode);
-	else
-		CHECK_ERROR(sourceCode, TypeError, "Type inaccessible dynamic type is not implicitly convertible to expected type bytes memory.");
-}
-
-
-BOOST_AUTO_TEST_CASE(address_staticcall_full_return_type)
-{
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-	{
-		char const* sourceCode = R"(
-			contract C {
-				function f() public view {
-					(bool success, bytes memory m) = address(0x4242).staticcall("");
-					success; m;
-				}
-			}
-		)";
-
-		CHECK_SUCCESS_NO_WARNINGS(sourceCode);
-	}
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
deleted file mode 100644
index 27f1a7e847bb..000000000000
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ /dev/null
@@ -1,729 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Tests for the Solidity optimizer.
- */
-
-#include <test/Metadata.h>
-#include <test/libsolidity/SolidityExecutionFramework.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/Disassemble.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <chrono>
-#include <string>
-#include <tuple>
-#include <memory>
-#include <limits>
-
-using namespace solidity::util;
-using namespace solidity::evmasm;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-class OptimizerTestFramework: public SolidityExecutionFramework
-{
-public:
-	bytes const& compileAndRunWithOptimizer(
-		std::string const& _sourceCode,
-		u256 const& _value = 0,
-		std::string const& _contractName = "",
-		bool const _optimize = true,
-		unsigned const _optimizeRuns = 200
-	)
-	{
-		OptimiserSettings previousSettings = std::move(m_optimiserSettings);
-		// This uses "none" / "full" while most other test frameworks use
-		// "minimal" / "standard".
-		m_optimiserSettings = _optimize ? OptimiserSettings::full() : OptimiserSettings::none();
-		m_optimiserSettings.expectedExecutionsPerDeployment = _optimizeRuns;
-		bytes const& ret = compileAndRun(_sourceCode, _value, _contractName);
-		m_optimiserSettings = std::move(previousSettings);
-		return ret;
-	}
-
-	/// Compiles the source code with and without optimizing.
-	void compileBothVersions(
-		std::string const& _sourceCode,
-		u256 const& _value = 0,
-		std::string const& _contractName = "",
-		unsigned const _optimizeRuns = 200
-	)
-	{
-		m_nonOptimizedBytecode = compileAndRunWithOptimizer("pragma solidity >=0.0;\n" + _sourceCode, _value, _contractName, false, _optimizeRuns);
-		m_nonOptimizedContract = m_contractAddress;
-		m_optimizedBytecode = compileAndRunWithOptimizer("pragma solidity >=0.0;\n" + _sourceCode, _value, _contractName, true, _optimizeRuns);
-		size_t nonOptimizedSize = numInstructions(m_nonOptimizedBytecode);
-		size_t optimizedSize = numInstructions(m_optimizedBytecode);
-		BOOST_CHECK_MESSAGE(
-			_optimizeRuns < 50 || optimizedSize < nonOptimizedSize,
-			std::string("Optimizer did not reduce bytecode size. Non-optimized size: ") +
-			std::to_string(nonOptimizedSize) + " - optimized size: " +
-			std::to_string(optimizedSize)
-		);
-		m_optimizedContract = m_contractAddress;
-	}
-
-	template <class... Args>
-	void compareVersions(std::string _sig, Args const&... _arguments)
-	{
-		m_contractAddress = m_nonOptimizedContract;
-		bytes nonOptimizedOutput = callContractFunction(_sig, _arguments...);
-		m_gasUsedNonOptimized = m_gasUsed;
-		m_contractAddress = m_optimizedContract;
-		bytes optimizedOutput = callContractFunction(_sig, _arguments...);
-		m_gasUsedOptimized = m_gasUsed;
-		BOOST_CHECK_MESSAGE(!optimizedOutput.empty(), "No optimized output for " + _sig);
-		BOOST_CHECK_MESSAGE(!nonOptimizedOutput.empty(), "No un-optimized output for " + _sig);
-		BOOST_CHECK_MESSAGE(nonOptimizedOutput == optimizedOutput, "Computed values do not match."
-							"\nNon-Optimized: " + util::toHex(nonOptimizedOutput) +
-							"\nOptimized:     " + util::toHex(optimizedOutput));
-	}
-
-	/// @returns the number of instructions in the given bytecode, not taking the metadata hash
-	/// into account.
-	size_t numInstructions(bytes const& _bytecode, std::optional<Instruction> _which = std::optional<Instruction>{})
-	{
-		bytes realCode = bytecodeSansMetadata(_bytecode);
-		BOOST_REQUIRE_MESSAGE(!realCode.empty(), "Invalid or missing metadata in bytecode.");
-		size_t instructions = 0;
-		evmasm::eachInstruction(realCode, m_evmVersion, [&](Instruction _instr, u256 const&) {
-			if (!_which || *_which == _instr)
-				instructions++;
-		});
-		return instructions;
-	}
-
-protected:
-	u256 m_gasUsedOptimized;
-	u256 m_gasUsedNonOptimized;
-	bytes m_nonOptimizedBytecode;
-	bytes m_optimizedBytecode;
-	h160 m_optimizedContract;
-	h160 m_nonOptimizedContract;
-};
-
-BOOST_FIXTURE_TEST_SUITE(SolidityOptimizer, OptimizerTestFramework)
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint a) public returns (uint b) {
-				return a;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", u256(7));
-}
-
-BOOST_AUTO_TEST_CASE(identities)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f(int a) public returns (int b) {
-				return int(0) | (int(1) * (int(0) ^ (0 + a)));
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(int256)", u256(0x12334664));
-}
-
-BOOST_AUTO_TEST_CASE(unused_expressions)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint data;
-			function f() public returns (uint a, uint b) {
-				10 + 20;
-				data;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f()");
-}
-
-BOOST_AUTO_TEST_CASE(constant_folding_both_sides)
-{
-	// if constants involving the same associative and commutative operator are applied from both
-	// sides, the operator should be applied only once, because the expression compiler pushes
-	// literals as late as possible
-	char const* sourceCode = R"(
-		contract test {
-			function f(uint x) public returns (uint y) {
-				return 98 ^ (7 * ((1 | (x | 1000)) * 40) ^ 102);
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", 7);
-}
-
-BOOST_AUTO_TEST_CASE(storage_access)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint8[40] data;
-			function f(uint x) public returns (uint y) {
-				data[2] = data[7] = uint8(x);
-				data[4] = data[2] * 10 + data[3];
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", 7);
-}
-
-BOOST_AUTO_TEST_CASE(array_copy)
-{
-	char const* sourceCode = R"(
-		contract test {
-			bytes2[] data1;
-			bytes5[] data2;
-			function f(uint x) public returns (uint l, uint y) {
-				for (uint i = 0; i < msg.data.length; i++)
-					data1.push();
-				for (uint i = 0; i < msg.data.length; ++i)
-					data1[i] = msg.data[i];
-				data2 = data1;
-				l = data2.length;
-				y = uint(uint40(data2[x]));
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", 0);
-	compareVersions("f(uint256)", 10);
-	compareVersions("f(uint256)", 35);
-}
-
-BOOST_AUTO_TEST_CASE(function_calls)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function f1(uint x) public returns (uint) { unchecked { return x*x; } }
-			function f(uint x) public returns (uint) { unchecked { return f1(7+x) - this.f1(x**9); } }
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", 0);
-	compareVersions("f(uint256)", 10);
-	compareVersions("f(uint256)", 36);
-}
-
-BOOST_AUTO_TEST_CASE(storage_write_in_loops)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint d;
-			function f(uint a) public returns (uint r) {
-				uint x = d;
-				for (uint i = 1; i < a * a; i++) {
-					r = d;
-					d = i;
-				}
-
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", 0);
-	compareVersions("f(uint256)", 10);
-	compareVersions("f(uint256)", 36);
-}
-
-// Test disabled with https://github.com/ethereum/solidity/pull/762
-// Information in joining branches is not retained anymore.
-BOOST_AUTO_TEST_CASE(retain_information_in_branches)
-{
-	// This tests that the optimizer knows that we already have "z == keccak256(abi.encodePacked(y))" inside both branches.
-	char const* sourceCode = R"(
-		contract c {
-			bytes32 d;
-			uint a;
-			function f(uint x, bytes32 y) public returns (uint r_a, bytes32 r_d) {
-				bytes32 z = keccak256(abi.encodePacked(y));
-				if (x > 8) {
-					z = keccak256(abi.encodePacked(y));
-					a = x;
-				} else {
-					z = keccak256(abi.encodePacked(y));
-					a = x;
-				}
-				r_a = a;
-				r_d = d;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256,bytes32)", 0, "abc");
-	compareVersions("f(uint256,bytes32)", 8, "def");
-	compareVersions("f(uint256,bytes32)", 10, "ghi");
-
-	bytes optimizedBytecode = compileAndRunWithOptimizer(sourceCode, 0, "c", true);
-	size_t numSHA3s = 0;
-	eachInstruction(optimizedBytecode, m_evmVersion, [&](Instruction _instr, u256 const&) {
-		if (_instr == Instruction::KECCAK256)
-			numSHA3s++;
-	});
-// TEST DISABLED - OPTIMIZER IS NOT EFFECTIVE ON THIS ONE ANYMORE
-//	BOOST_CHECK_EQUAL(1, numSHA3s);
-}
-
-BOOST_AUTO_TEST_CASE(store_tags_as_unions)
-{
-	// This calls the same function from two sources and both calls have a certain Keccak-256 on
-	// the stack at the same position.
-	// Without storing tags as unions, the return from the shared function would not know where to
-	// jump and thus all jumpdests are forced to clear their state and we do not know about the
-	// sha3 anymore.
-	// Note that, for now, this only works if the functions have the same number of return
-	// parameters since otherwise, the return jump addresses are at different stack positions
-	// which triggers the "unknown jump target" situation.
-	char const* sourceCode = R"(
-		contract test {
-			bytes32 data;
-			function f(uint x, bytes32 y) external returns (uint r_a, bytes32 r_d) {
-				r_d = keccak256(abi.encodePacked(y));
-				shared(y);
-				r_d = keccak256(abi.encodePacked(y));
-				r_a = 5;
-			}
-			function g(uint x, bytes32 y) external returns (uint r_a, bytes32 r_d) {
-				r_d = keccak256(abi.encodePacked(y));
-				shared(y);
-				r_d = bytes32(uint(keccak256(abi.encodePacked(y))) + 2);
-				r_a = 7;
-			}
-			function shared(bytes32 y) internal {
-				data = keccak256(abi.encodePacked(y));
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256,bytes32)", 7, "abc");
-
-	bytes optimizedBytecode = compileAndRunWithOptimizer(sourceCode, 0, "test", true);
-	size_t numSHA3s = 0;
-	eachInstruction(optimizedBytecode, m_evmVersion, [&](Instruction _instr, u256 const&) {
-		if (_instr == Instruction::KECCAK256)
-			numSHA3s++;
-	});
-// TEST DISABLED UNTIL 93693404 IS IMPLEMENTED
-//	BOOST_CHECK_EQUAL(2, numSHA3s);
-}
-
-BOOST_AUTO_TEST_CASE(incorrect_storage_access_bug)
-{
-	// This bug appeared because a Keccak-256 operation with too low sequence number was used,
-	// resulting in memory not being rewritten before the Keccak-256. The fix was to
-	// take the max of the min sequence numbers when merging the states.
-	char const* sourceCode = R"(
-		contract C
-		{
-			mapping(uint => uint) data;
-			function f() public returns (uint)
-			{
-				if (data[block.timestamp] == 0)
-					data[type(uint).max - 6] = 5;
-				return data[block.timestamp];
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f()");
-}
-
-BOOST_AUTO_TEST_CASE(sequence_number_for_calls)
-{
-	// This is a test for a bug that was present because we did not increment the sequence
-	// number for CALLs - CALLs can read and write from memory (and DELEGATECALLs can do the same
-	// to storage), so the sequence number should be incremented.
-	char const* sourceCode = R"(
-		contract test {
-			function f(string memory a, string memory b) public returns (bool) { return sha256(bytes(a)) == sha256(bytes(b)); }
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(string,string)", 0x40, 0x80, 3, "abc", 3, "def");
-}
-
-BOOST_AUTO_TEST_CASE(computing_constants)
-{
-	char const* sourceCode = R"(
-		contract C {
-			uint m_a;
-			uint m_b;
-			uint m_c;
-			uint m_d;
-			constructor() {
-				set();
-			}
-			function set() public returns (uint) {
-				m_a = 0x77abc0000000000000000000000000000000000000000000000000000000001;
-				m_b = 0x817416927846239487123469187231298734162934871263941234127518276;
-				g();
-				return 1;
-			}
-			function g() public {
-				m_b = 0x817416927846239487123469187231298734162934871263941234127518276;
-				m_c = 0x817416927846239487123469187231298734162934871263941234127518276;
-				h();
-			}
-			function h() public {
-				m_d = 0xff05694900000000000000000000000000000000000000000000000000000000;
-			}
-			function get() public returns (uint ra, uint rb, uint rc, uint rd) {
-				ra = m_a;
-				rb = m_b;
-				rc = m_c;
-				rd = m_d;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode, 0, "C", 1);
-	compareVersions("get()");
-	compareVersions("set()");
-	compareVersions("get()");
-
-	bytes optimizedBytecode = compileAndRunWithOptimizer(sourceCode, 0, "C", true, 1);
-	bytes complicatedConstant = toBigEndian(u256("0x817416927846239487123469187231298734162934871263941234127518276"));
-	unsigned occurrences = 0;
-	for (auto iter = optimizedBytecode.cbegin(); iter < optimizedBytecode.cend(); ++occurrences)
-	{
-		iter = search(iter, optimizedBytecode.cend(), complicatedConstant.cbegin(), complicatedConstant.cend());
-		if (iter < optimizedBytecode.cend())
-			++iter;
-	}
-	BOOST_CHECK_EQUAL(2, occurrences);
-
-	bytes constantWithZeros = toBigEndian(u256("0x77abc0000000000000000000000000000000000000000000000000000000001"));
-	BOOST_CHECK(search(
-		optimizedBytecode.cbegin(),
-		optimizedBytecode.cend(),
-		constantWithZeros.cbegin(),
-		constantWithZeros.cend()
-	) == optimizedBytecode.cend());
-}
-
-
-BOOST_AUTO_TEST_CASE(constant_optimization_early_exit)
-{
-	// This tests that the constant optimizer does not try to find the best representation
-	// indefinitely but instead stops after some number of iterations.
-	char const* sourceCode = R"(
-	contract HexEncoding {
-		function hexEncodeTest(address addr) public returns (bytes32 ret) {
-			uint x = uint(uint160(addr)) / 2**32;
-
-			// Nibble interleave
-			x = x & 0x00000000000000000000000000000000ffffffffffffffffffffffffffffffff;
-			x = (x | (x * 2**64)) & 0x0000000000000000ffffffffffffffff0000000000000000ffffffffffffffff;
-			x = (x | (x * 2**32)) & 0x00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff;
-			x = (x | (x * 2**16)) & 0x0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff;
-			x = (x | (x * 2** 8)) & 0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff;
-			x = (x | (x * 2** 4)) & 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f;
-
-			// Hex encode
-			uint h = (x & 0x0808080808080808080808080808080808080808080808080808080808080808) / 8;
-			uint i = (x & 0x0404040404040404040404040404040404040404040404040404040404040404) / 4;
-			uint j = (x & 0x0202020202020202020202020202020202020202020202020202020202020202) / 2;
-			x = x + (h & (i | j)) * 0x27 + 0x3030303030303030303030303030303030303030303030303030303030303030;
-
-			// Store and load next batch
-			assembly {
-				mstore(0, x)
-			}
-			x = uint160(addr) * 2**96;
-
-			// Nibble interleave
-			x = x & 0x00000000000000000000000000000000ffffffffffffffffffffffffffffffff;
-			x = (x | (x * 2**64)) & 0x0000000000000000ffffffffffffffff0000000000000000ffffffffffffffff;
-			x = (x | (x * 2**32)) & 0x00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff;
-			x = (x | (x * 2**16)) & 0x0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff;
-			x = (x | (x * 2** 8)) & 0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff;
-			x = (x | (x * 2** 4)) & 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f;
-
-			// Hex encode
-			h = (x & 0x0808080808080808080808080808080808080808080808080808080808080808) / 8;
-			i = (x & 0x0404040404040404040404040404040404040404040404040404040404040404) / 4;
-			j = (x & 0x0202020202020202020202020202020202020202020202020202020202020202) / 2;
-			x = x + (h & (i | j)) * 0x27 + 0x3030303030303030303030303030303030303030303030303030303030303030;
-
-			// Store and hash
-			assembly {
-				mstore(32, x)
-				ret := keccak256(0, 40)
-			}
-		}
-	}
-	)";
-	auto start = std::chrono::steady_clock::now();
-	compileBothVersions(sourceCode);
-	double duration = std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count();
-	// Since run time on an ASan build is not really realistic, we disable this test for those builds.
-	size_t maxDuration = 20;
-#if !defined(__SANITIZE_ADDRESS__) && defined(__has_feature)
-#if __has_feature(address_sanitizer)
-#define __SANITIZE_ADDRESS__ 1
-#endif
-#endif
-#if __SANITIZE_ADDRESS__
-	maxDuration = std::numeric_limits<size_t>::max();
-	BOOST_TEST_MESSAGE("Disabled constant optimizer run time check for address sanitizer build.");
-#endif
-	BOOST_CHECK_MESSAGE(duration <= double(maxDuration), "Compilation of constants took longer than 20 seconds.");
-	compareVersions("hexEncodeTest(address)", u256(0x123456789));
-}
-
-BOOST_AUTO_TEST_CASE(inconsistency)
-{
-	// This is a test of a bug in the optimizer.
-	char const* sourceCode = R"(
-		contract Inconsistency {
-			struct Value {
-				uint badnum;
-				uint number;
-			}
-
-			struct Container {
-				uint[] valueIndices;
-				Value[] values;
-			}
-
-			Container[] containers;
-			uint[] valueIndices;
-			uint INDEX_ZERO = 0;
-			uint  debug;
-
-			// Called with params: containerIndex=0, valueIndex=0
-			function levelIII(uint containerIndex, uint valueIndex) private {
-				Container storage container = containers[containerIndex];
-				Value storage value = container.values[valueIndex];
-				debug = container.valueIndices[value.number];
-			}
-			function levelII() private {
-				for (uint i = 0; i < valueIndices.length; i++) {
-					levelIII(INDEX_ZERO, valueIndices[i]);
-				}
-			}
-
-			function trigger() public returns (uint) {
-				Container storage container = containers.push();
-
-				container.values.push(Value({
-					badnum: 9000,
-					number: 0
-				}));
-
-				container.valueIndices.push();
-				valueIndices.push();
-
-				levelII();
-				return debug;
-			}
-
-			function DoNotCallButDoNotDelete() public {
-				levelII();
-				levelIII(1, 2);
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("trigger()");
-}
-
-BOOST_AUTO_TEST_CASE(dead_code_elimination_across_assemblies)
-{
-	// This tests that a runtime-function that is stored in storage in the constructor
-	// is not removed as part of dead code elimination.
-	char const* sourceCode = R"(
-		contract DCE {
-			function () internal returns (uint) stored;
-			constructor() {
-				stored = f;
-			}
-			function f() internal returns (uint) { return 7; }
-			function test() public returns (uint) { return stored(); }
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("test()");
-}
-
-BOOST_AUTO_TEST_CASE(invalid_state_at_control_flow_join)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			uint256 public totalSupply = 100;
-			function f() public returns (uint r) {
-				if (false)
-					r = totalSupply;
-				totalSupply -= 10;
-			}
-			function test() public returns (uint) {
-				f();
-				return this.totalSupply();
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("test()");
-}
-
-BOOST_AUTO_TEST_CASE(init_empty_dynamic_arrays)
-{
-	// This is not so much an optimizer test, but rather a test
-	// that allocating empty arrays is implemented efficiently.
-	// In particular, initializing a dynamic memory array does
-	// not use any memory.
-	char const* sourceCode = R"(
-		contract Test {
-			function f() public pure returns (uint r) {
-				uint[][] memory x = new uint[][](20000);
-				return x.length;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f()");
-	BOOST_CHECK_LE(m_gasUsedNonOptimized, 1900000);
-	BOOST_CHECK_LE(1600000, m_gasUsedNonOptimized);
-}
-
-BOOST_AUTO_TEST_CASE(optimise_multi_stores)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			struct S { uint16 a; uint16 b; uint16[3] c; uint[] dyn; }
-			uint padding;
-			S[] s;
-			function f() public returns (uint16, uint16, uint16[3] memory, uint) {
-				uint16[3] memory c;
-				c[0] = 7;
-				c[1] = 8;
-				c[2] = 9;
-				s.push(S(1, 2, c, new uint[](4)));
-				return (s[0].a, s[0].b, s[0].c, s[0].dyn[2]);
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f()");
-	BOOST_CHECK_EQUAL(numInstructions(m_nonOptimizedBytecode, Instruction::SSTORE), 8);
-	BOOST_CHECK_EQUAL(numInstructions(m_optimizedBytecode, Instruction::SSTORE), 7);
-}
-
-BOOST_AUTO_TEST_CASE(optimise_constant_to_codecopy)
-{
-	char const* sourceCode = R"(
-		contract C {
-			// We use the state variable so that the functions won't be deemed identical
-			// and be optimised out to the same implementation.
-			uint a;
-			function f() public returns (uint) {
-				a = 1;
-				// This cannot be represented well with the `CalculateMethod`,
-				// hence the decision will be between `LiteralMethod` and `CopyMethod`.
-				return 0x1234123412431234123412412342112341234124312341234124;
-			}
-			function g() public returns (uint) {
-				a = 2;
-				return 0x1234123412431234123412412342112341234124312341234124;
-			}
-			function h() public returns (uint) {
-				a = 3;
-				return 0x1234123412431234123412412342112341234124312341234124;
-			}
-			function i() public returns (uint) {
-				a = 4;
-				return 0x1234123412431234123412412342112341234124312341234124;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode, 0, "C", 50);
-	compareVersions("f()");
-	compareVersions("g()");
-	compareVersions("h()");
-	compareVersions("i()");
-	// This is counting in the deployed code.
-	BOOST_CHECK_EQUAL(numInstructions(m_nonOptimizedBytecode, Instruction::CODECOPY), 0);
-	BOOST_CHECK_EQUAL(numInstructions(m_optimizedBytecode, Instruction::CODECOPY), 4);
-}
-
-BOOST_AUTO_TEST_CASE(byte_access)
-{
-	char const* sourceCode = R"(
-		contract C
-		{
-			function f(bytes32 x) public returns (bytes1 r)
-			{
-				assembly { r := and(byte(x, 31), 0xff) }
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(bytes32)", u256("0x1223344556677889900112233445566778899001122334455667788990011223"));
-}
-
-BOOST_AUTO_TEST_CASE(shift_optimizer_bug)
-{
-	char const* sourceCode = R"(
-		contract C
-		{
-			function f(uint x) public returns (uint)
-			{
-				return (x << 1) << type(uint).max;
-			}
-			function g(uint x) public returns (uint)
-			{
-				return (x >> 1) >> type(uint).max;
-			}
-		}
-	)";
-	compileBothVersions(sourceCode);
-	compareVersions("f(uint256)", 7);
-	compareVersions("g(uint256)", u256(-1));
-}
-
-BOOST_AUTO_TEST_CASE(avoid_double_cleanup)
-{
-	char const* sourceCode = R"(
-		contract C {
-			receive() external payable {
-				abi.encodePacked(uint200(0));
-			}
-		}
-	)";
-	compileBothVersions(sourceCode, 0, "C", 50);
-	// Check that there is no double AND instruction in the resulting code
-	BOOST_CHECK_EQUAL(numInstructions(m_nonOptimizedBytecode, Instruction::AND), 1);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
deleted file mode 100644
index e0f010c49e17..000000000000
--- a/test/libsolidity/SolidityParser.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2014
- * Unit tests for the solidity parser.
- */
-
-#include <string>
-#include <memory>
-#include <liblangutil/Scanner.h>
-#include <libsolidity/parsing/Parser.h>
-#include <liblangutil/ErrorReporter.h>
-#include <test/Common.h>
-#include <test/libsolidity/ErrorCheck.h>
-#include <libsolidity/ast/ASTVisitor.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList& _errors)
-{
-	ErrorReporter errorReporter(_errors);
-	auto charStream = CharStream(_source, "");
-	ASTPointer<SourceUnit> sourceUnit = Parser(
-		errorReporter,
-		solidity::test::CommonOptions::get().evmVersion()
-	).parse(charStream);
-	if (!sourceUnit)
-		return ASTPointer<ContractDefinition>();
-	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ASTPointer<ContractDefinition> contract = std::dynamic_pointer_cast<ContractDefinition>(node))
-			return contract;
-	BOOST_FAIL("No contract found in source.");
-	return ASTPointer<ContractDefinition>();
-}
-
-bool successParse(std::string const& _source)
-{
-	ErrorList errors;
-	try
-	{
-		auto sourceUnit = parseText(_source, errors);
-		if (!sourceUnit)
-			return false;
-	}
-	catch (FatalError const& /*_exception*/)
-	{
-		if (Error::containsErrorOfType(errors, Error::Type::ParserError))
-			return false;
-	}
-	if (Error::containsErrorOfType(errors, Error::Type::ParserError))
-		return false;
-
-	BOOST_CHECK(!Error::containsErrors(errors));
-	return true;
-}
-
-Error getError(std::string const& _source)
-{
-	ErrorList errors;
-	try
-	{
-		parseText(_source, errors);
-	}
-	catch (FatalError const& /*_exception*/)
-	{
-		// no-op
-	}
-	Error const* error = Error::containsErrorOfType(errors, Error::Type::ParserError);
-	BOOST_REQUIRE(error);
-	return *error;
-}
-
-void checkFunctionNatspec(
-	FunctionDefinition const* _function,
-	std::string const& _expectedDoc
-)
-{
-	auto doc = _function->documentation()->text();
-	BOOST_CHECK_MESSAGE(doc != nullptr, "Function does not have Natspec Doc as expected");
-	BOOST_CHECK_EQUAL(*doc, _expectedDoc);
-}
-
-}
-
-#define CHECK_PARSE_ERROR(source, substring) \
-do \
-{\
-	Error err = getError((source)); \
-	BOOST_CHECK(searchErrorMessage(err, (substring))); \
-}\
-while(0)
-
-
-BOOST_AUTO_TEST_SUITE(SolidityParser)
-
-BOOST_AUTO_TEST_CASE(reserved_keywords)
-{
-	BOOST_CHECK(!TokenTraits::isReservedKeyword(Token::Identifier));
-	BOOST_CHECK(TokenTraits::isReservedKeyword(Token::After));
-	BOOST_CHECK(!TokenTraits::isReservedKeyword(Token::Unchecked));
-	BOOST_CHECK(TokenTraits::isReservedKeyword(Token::Var));
-	BOOST_CHECK(TokenTraits::isReservedKeyword(Token::Reference));
-	BOOST_CHECK(!TokenTraits::isReservedKeyword(Token::Illegal));
-}
-
-BOOST_AUTO_TEST_CASE(function_natspec_documentation)
-{
-	char const* text = R"(
-		contract test {
-			uint256 stateVar;
-			/// This is a test function
-			function functionName(bytes32 input) public returns (bytes32 out) {}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	FunctionDefinition const* function = nullptr;
-	auto functions = contract->definedFunctions();
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	checkFunctionNatspec(function, "This is a test function");
-}
-
-BOOST_AUTO_TEST_CASE(function_normal_comments)
-{
-	FunctionDefinition const* function = nullptr;
-	char const* text = R"(
-		contract test {
-			uint256 stateVar;
-			// We won't see this comment
-			function functionName(bytes32 input) public returns (bytes32 out) {}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	auto functions = contract->definedFunctions();
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	BOOST_CHECK_MESSAGE(function->documentation() == nullptr,
-						"Should not have gotten a Natspecc comment for this function");
-}
-
-BOOST_AUTO_TEST_CASE(multiple_functions_natspec_documentation)
-{
-	FunctionDefinition const* function = nullptr;
-	char const* text = R"(
-		contract test {
-			uint256 stateVar;
-			/// This is test function 1
-			function functionName1(bytes32 input) public returns (bytes32 out) {}
-			/// This is test function 2
-			function functionName2(bytes32 input) public returns (bytes32 out) {}
-			// nothing to see here
-			function functionName3(bytes32 input) public returns (bytes32 out) {}
-			/// This is test function 4
-			function functionName4(bytes32 input) public returns (bytes32 out) {}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	auto functions = contract->definedFunctions();
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	checkFunctionNatspec(function, "This is test function 1");
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(1), "Failed to retrieve function");
-	checkFunctionNatspec(function, "This is test function 2");
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(2), "Failed to retrieve function");
-	BOOST_CHECK_MESSAGE(function->documentation() == nullptr,
-						"Should not have gotten natspec comment for functionName3()");
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(3), "Failed to retrieve function");
-	checkFunctionNatspec(function, "This is test function 4");
-}
-
-BOOST_AUTO_TEST_CASE(multiline_function_documentation)
-{
-	FunctionDefinition const* function = nullptr;
-	char const* text = R"(
-		contract test {
-			uint256 stateVar;
-			/// This is a test function
-			/// and it has 2 lines
-			function functionName1(bytes32 input) public returns (bytes32 out) {}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	auto functions = contract->definedFunctions();
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	checkFunctionNatspec(function, "This is a test function\n"
-						 " and it has 2 lines");
-}
-
-BOOST_AUTO_TEST_CASE(natspec_comment_in_function_body)
-{
-	FunctionDefinition const* function = nullptr;
-	char const* text = R"(
-		contract test {
-			/// fun1 description
-			function fun1(uint256 a) {
-				uint b;
-				// I should not interfere with actual natspec comments (natspec comments on local variables not allowed anymore)
-				uint256 c;
-				mapping(address=>bytes32) d;
-				bytes7 name = "Solidity";
-			}
-			/// This is a test function
-			/// and it has 2 lines
-			function fun(bytes32 input) public returns (bytes32 out) {}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	auto functions = contract->definedFunctions();
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	checkFunctionNatspec(function, "fun1 description");
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(1), "Failed to retrieve function");
-	checkFunctionNatspec(function, "This is a test function\n"
-						 " and it has 2 lines");
-}
-
-BOOST_AUTO_TEST_CASE(natspec_docstring_between_keyword_and_signature)
-{
-	FunctionDefinition const* function = nullptr;
-	char const* text = R"(
-		contract test {
-			uint256 stateVar;
-			function ///I am in the wrong place
-			fun1(uint256 a) {
-				uint b;
-				// I should not interfere with actual natspec comments (natspec comments on local variables not allowed anymore)
-				uint256 c;
-				mapping(address=>bytes32) d;
-				bytes7 name = "Solidity";
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	auto functions = contract->definedFunctions();
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	BOOST_CHECK_MESSAGE(!function->documentation(),
-						"Shouldn't get natspec docstring for this function");
-}
-
-BOOST_AUTO_TEST_CASE(natspec_docstring_after_signature)
-{
-	FunctionDefinition const* function = nullptr;
-	char const* text = R"(
-		contract test {
-			uint256 stateVar;
-			function fun1(uint256 a) {
-				// I should have been above the function signature (natspec comments on local variables not allowed anymore)
-				uint b;
-				// I should not interfere with actual natspec comments (natspec comments on local variables not allowed anymore)
-				uint256 c;
-				mapping(address=>bytes32) d;
-				bytes7 name = "Solidity";
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-	ErrorList errors;
-	ASTPointer<ContractDefinition> contract = parseText(text, errors);
-	auto functions = contract->definedFunctions();
-
-	BOOST_REQUIRE_MESSAGE(function = functions.at(0), "Failed to retrieve function");
-	BOOST_CHECK_MESSAGE(!function->documentation(),
-						"Shouldn't get natspec docstring for this function");
-}
-
-BOOST_AUTO_TEST_CASE(variable_definition)
-{
-	char const* text = R"(
-		contract test {
-			function fun(uint256 a) {
-				uint b;
-				uint256 c;
-				mapping(address=>bytes32) d;
-				customtype varname;
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(variable_definition_with_initialization)
-{
-	char const* text = R"(
-		contract test {
-			function fun(uint256 a) {
-				uint b = 2;
-				uint256 c = 0x87;
-				mapping(address=>bytes32) d;
-				bytes7 name = "Solidity";
-				customtype varname;
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(operator_expression)
-{
-	char const* text = R"(
-		contract test {
-			function fun(uint256 a) {
-				uint256 x = (1 + 4) || false && (1 - 12) + -9;
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(complex_expression)
-{
-	char const* text = R"(
-		contract test {
-			function fun(uint256 a) {
-				uint256 x = (1 + 4).member(++67)[a/=9] || true;
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(statement_starting_with_type_conversion)
-{
-	char const* text = R"(
-		contract test {
-			function fun() {
-				uint64(2);
-				uint64[7](3);
-				uint64[](3);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(type_conversion_to_dynamic_array)
-{
-	char const* text = R"(
-		contract test {
-			function fun() {
-				uint x = uint64[](3);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(import_directive)
-{
-	char const* text = R"(
-		import "abc";
-		contract test {
-			function fun() {
-				uint64(2);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(multiple_contracts)
-{
-	char const* text = R"(
-		contract test {
-			function fun() {
-				uint64(2);
-			}
-		}
-		contract test2 {
-			function fun() {
-				uint64(2);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(multiple_contracts_and_imports)
-{
-	char const* text = R"(
-		import "abc";
-		contract test {
-			function fun() {
-				uint64(2);
-			}
-		}
-		import "def";
-		contract test2 {
-			function fun() {
-				uint64(2);
-			}
-		}
-		import "ghi";
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(contract_inheritance)
-{
-	char const* text = R"(
-		contract base {
-			function fun() {
-				uint64(2);
-			}
-		}
-		contract derived is base {
-			function fun() {
-				uint64(2);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(contract_multiple_inheritance)
-{
-	char const* text = R"(
-		contract base {
-			function fun() {
-				uint64(2);
-			}
-		}
-		contract derived is base, nonExisting {
-			function fun() {
-				uint64(2);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(contract_multiple_inheritance_with_arguments)
-{
-	char const* text = R"(
-		contract base {
-			function fun() {
-				uint64(2);
-			}
-		}
-		contract derived is base(2), nonExisting("abc", "def", base.fun()) {
-			function fun() {
-				uint64(2);
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(keyword_is_reserved)
-{
-	auto keywords = {
-		"after",
-		"alias",
-		"apply",
-		"auto",
-		"byte",
-		"case",
-		"copyof",
-		"default",
-		"define",
-		"final",
-		"implements",
-		"in",
-		"inline",
-		"let",
-		"macro",
-		"match",
-		"mutable",
-		"null",
-		"of",
-		"partial",
-		"promise",
-		"reference",
-		"relocatable",
-		"sealed",
-		"sizeof",
-		"static",
-		"supports",
-		"switch",
-		"typedef",
-		"typeof",
-		"var"
-	};
-
-	BOOST_CHECK_EQUAL(std::size(keywords), static_cast<int>(Token::Var) - static_cast<int>(Token::After) + 1);
-
-	for (auto const& keyword: keywords)
-	{
-		auto text = std::string("contract ") + keyword + " {}";
-		CHECK_PARSE_ERROR(text.c_str(), std::string("Expected identifier but got reserved keyword '") + keyword + "'");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(member_access_parser_ambiguity)
-{
-	char const* text = R"(
-		contract C {
-			struct S { uint a; uint b; uint[][][] c; }
-			function f() {
-				C.S x;
-				C.S memory y;
-				C.S[10] memory z;
-				C.S[10](x);
-				x.a = 2;
-				x.c[1][2][3] = 9;
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(using_for)
-{
-	char const* text = R"(
-		contract C {
-			struct s { uint a; }
-			using LibraryName for uint;
-			using Library2 for *;
-			using Lib for s;
-			function f() {
-			}
-		}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(complex_import)
-{
-	char const* text = R"(
-		import "abc" as x;
-		import * as x from "abc";
-		import {a as b, c as d, f} from "def";
-		contract x {}
-	)";
-	BOOST_CHECK(successParse(text));
-}
-
-BOOST_AUTO_TEST_CASE(inline_asm_end_location)
-{
-	auto sourceCode = std::string(R"(
-	contract C {
-		function f() public pure returns (uint y) {
-			uint a;
-			assembly { a := 0x12345678 }
-			uint z = a;
-			y = z;
-		}
-	}
-	)");
-	ErrorList errors;
-	auto contract = parseText(sourceCode, errors);
-
-	class CheckInlineAsmLocation: public ASTConstVisitor
-	{
-	public:
-		explicit CheckInlineAsmLocation(std::string _sourceCode): m_sourceCode(_sourceCode) {}
-		bool visited = false;
-		bool visit(InlineAssembly const& _inlineAsm) override
-		{
-			auto loc = _inlineAsm.location();
-			auto asmStr = m_sourceCode.substr(static_cast<size_t>(loc.start), static_cast<size_t>(loc.end - loc.start));
-			BOOST_CHECK_EQUAL(asmStr, "assembly { a := 0x12345678 }");
-			visited = true;
-
-			return false;
-		}
-		std::string m_sourceCode;
-	};
-
-	CheckInlineAsmLocation visitor{sourceCode};
-	contract->accept(visitor);
-
-	BOOST_CHECK_MESSAGE(visitor.visited, "No inline asm block found?!");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
deleted file mode 100644
index e4523292f6da..000000000000
--- a/test/libsolidity/SolidityTypes.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @author Christian <c@ethdev.com>
- * @date 2015
- * Unit tests for the type system of Solidity.
- */
-
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolidity/ast/AST.h>
-#include <libsolutil/Keccak256.h>
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(SolidityTypes)
-
-BOOST_AUTO_TEST_CASE(int_types)
-{
-	BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::Int, 0, 0)) == *TypeProvider::integer(256, IntegerType::Modifier::Signed));
-	for (unsigned i = 8; i <= 256; i += 8)
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::IntM, i, 0)) == *TypeProvider::integer(i, IntegerType::Modifier::Signed));
-}
-
-BOOST_AUTO_TEST_CASE(uint_types)
-{
-	BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::UInt, 0, 0)) == *TypeProvider::integer(256, IntegerType::Modifier::Unsigned));
-	for (unsigned i = 8; i <= 256; i += 8)
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::UIntM, i, 0)) == *TypeProvider::integer(i, IntegerType::Modifier::Unsigned));
-}
-
-BOOST_AUTO_TEST_CASE(byte_types)
-{
-	for (unsigned i = 1; i <= 32; i++)
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::BytesM, i, 0)) == *TypeProvider::fixedBytes(i));
-}
-
-BOOST_AUTO_TEST_CASE(fixed_types)
-{
-	BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::Fixed, 0, 0)) == *TypeProvider::fixedPoint(128, 18, FixedPointType::Modifier::Signed));
-	for (unsigned i = 8; i <= 256; i += 8)
-	{
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::FixedMxN, i, 0)) == *TypeProvider::fixedPoint(i, 0, FixedPointType::Modifier::Signed));
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::FixedMxN, i, 2)) == *TypeProvider::fixedPoint(i, 2, FixedPointType::Modifier::Signed));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(ufixed_types)
-{
-	BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::UFixed, 0, 0)) == *TypeProvider::fixedPoint(128, 18, FixedPointType::Modifier::Unsigned));
-	for (unsigned i = 8; i <= 256; i += 8)
-	{
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::UFixedMxN, i, 0)) == *TypeProvider::fixedPoint(i, 0, FixedPointType::Modifier::Unsigned));
-		BOOST_CHECK(*TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken(Token::UFixedMxN, i, 2)) == *TypeProvider::fixedPoint(i, 2, FixedPointType::Modifier::Unsigned));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(storage_layout_simple)
-{
-	MemberList members(MemberList::MemberMap({
-		{"first", TypeProvider::fromElementaryTypeName("uint128")},
-		{"second", TypeProvider::fromElementaryTypeName("uint120")},
-		{"wraps", TypeProvider::fromElementaryTypeName("uint16")}
-	}));
-	BOOST_REQUIRE_EQUAL(u256(2), members.storageSize());
-	BOOST_REQUIRE(members.memberStorageOffset("first") != nullptr);
-	BOOST_REQUIRE(members.memberStorageOffset("second") != nullptr);
-	BOOST_REQUIRE(members.memberStorageOffset("wraps") != nullptr);
-	BOOST_CHECK(*members.memberStorageOffset("first") == std::make_pair(u256(0), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("second") == std::make_pair(u256(0), unsigned(16)));
-	BOOST_CHECK(*members.memberStorageOffset("wraps") == std::make_pair(u256(1), unsigned(0)));
-}
-
-BOOST_AUTO_TEST_CASE(storage_layout_mapping)
-{
-	MemberList members(MemberList::MemberMap({
-		{"first", TypeProvider::fromElementaryTypeName("uint128")},
-		{"second", TypeProvider::mapping(
-			TypeProvider::fromElementaryTypeName("uint8"),
-			"",
-			TypeProvider::fromElementaryTypeName("uint8"),
-			""
-		)},
-		{"third", TypeProvider::fromElementaryTypeName("uint16")},
-		{"final", TypeProvider::mapping(
-			TypeProvider::fromElementaryTypeName("uint8"),
-			"",
-			TypeProvider::fromElementaryTypeName("uint8"),
-			""
-		)},
-	}));
-	BOOST_REQUIRE_EQUAL(u256(4), members.storageSize());
-	BOOST_REQUIRE(members.memberStorageOffset("first") != nullptr);
-	BOOST_REQUIRE(members.memberStorageOffset("second") != nullptr);
-	BOOST_REQUIRE(members.memberStorageOffset("third") != nullptr);
-	BOOST_REQUIRE(members.memberStorageOffset("final") != nullptr);
-	BOOST_CHECK(*members.memberStorageOffset("first") == std::make_pair(u256(0), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("second") == std::make_pair(u256(1), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("third") == std::make_pair(u256(2), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("final") == std::make_pair(u256(3), unsigned(0)));
-}
-
-BOOST_AUTO_TEST_CASE(storage_layout_arrays)
-{
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(1), 32).storageSize() == 1);
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(1), 33).storageSize() == 2);
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(2), 31).storageSize() == 2);
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(7), 8).storageSize() == 2);
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(7), 9).storageSize() == 3);
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(31), 9).storageSize() == 9);
-	BOOST_CHECK(ArrayType(DataLocation::Storage, TypeProvider::fixedBytes(32), 9).storageSize() == 9);
-}
-
-BOOST_AUTO_TEST_CASE(type_identifier_escaping)
-{
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier("("), "$_");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier(")"), "_$");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier(","), "_$_");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier("$"), "$$$");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier(")$("), "_$$$$$_");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier("()"), "$__$");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier("(,)"), "$__$__$");
-	BOOST_CHECK_EQUAL(Type::escapeIdentifier("(,$,)"), "$__$_$$$_$__$");
-	BOOST_CHECK_EQUAL(
-		Type::escapeIdentifier("((__(_$_$$,__($$,,,$$),$,,,)))$$,$$"),
-		"$_$___$__$$$_$$$$$$_$___$_$$$$$$_$__$__$_$$$$$$_$_$_$$$_$__$__$__$_$_$$$$$$$_$_$$$$$$"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(type_identifiers)
-{
-	int64_t id = 0;
-
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("uint128")->identifier(), "t_uint128");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("int128")->identifier(), "t_int128");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("address")->identifier(), "t_address");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("uint8")->identifier(), "t_uint8");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("ufixed64x2")->identifier(), "t_ufixed64x2");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("fixed128x8")->identifier(), "t_fixed128x8");
-	BOOST_CHECK_EQUAL(RationalNumberType(rational(7, 1)).identifier(), "t_rational_7_by_1");
-	BOOST_CHECK_EQUAL(RationalNumberType(rational(200, 77)).identifier(), "t_rational_200_by_77");
-	BOOST_CHECK_EQUAL(RationalNumberType(rational(2 * 200, 2 * 77)).identifier(), "t_rational_200_by_77");
-	BOOST_CHECK_EQUAL(RationalNumberType(rational(-2 * 200, 2 * 77)).identifier(), "t_rational_minus_200_by_77");
-	BOOST_CHECK_EQUAL(
-		StringLiteralType(Literal(++id, SourceLocation{}, Token::StringLiteral, std::make_shared<std::string>("abc - def"))).identifier(),
-		 "t_stringliteral_196a9142ee0d40e274a6482393c762b16dd8315713207365e1e13d8d85b74fc4"
-	);
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes1")->identifier(), "t_bytes1");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes8")->identifier(), "t_bytes8");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes32")->identifier(), "t_bytes32");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bool")->identifier(), "t_bool");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes")->identifier(), "t_bytes_storage_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes memory")->identifier(), "t_bytes_memory_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes storage")->identifier(), "t_bytes_storage_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes calldata")->identifier(), "t_bytes_calldata_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("string")->identifier(), "t_string_storage_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("string memory")->identifier(), "t_string_memory_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("string storage")->identifier(), "t_string_storage_ptr");
-	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("string calldata")->identifier(), "t_string_calldata_ptr");
-	ArrayType largeintArray(DataLocation::Memory, TypeProvider::fromElementaryTypeName("int128"), u256("2535301200456458802993406410752"));
-	BOOST_CHECK_EQUAL(largeintArray.identifier(), "t_array$_t_int128_$2535301200456458802993406410752_memory_ptr");
-	Type const* stringArray = TypeProvider::array(DataLocation::Storage, TypeProvider::fromElementaryTypeName("string"), u256("20"));
-	Type const* multiArray = TypeProvider::array(DataLocation::Storage, stringArray);
-	BOOST_CHECK_EQUAL(multiArray->identifier(), "t_array$_t_array$_t_string_storage_$20_storage_$dyn_storage_ptr");
-
-	ContractDefinition c(++id, SourceLocation{}, std::make_shared<std::string>("MyContract$"), SourceLocation{}, {}, {}, {}, ContractKind::Contract);
-	BOOST_CHECK_EQUAL(c.type()->identifier(), "t_type$_t_contract$_MyContract$$$_$2_$");
-	BOOST_CHECK_EQUAL(ContractType(c, true).identifier(), "t_super$_MyContract$$$_$2");
-
-	StructDefinition s(++id, {}, std::make_shared<std::string>("Struct"), {}, {}, {});
-	s.annotation().recursive = false;
-	BOOST_CHECK_EQUAL(s.type()->identifier(), "t_type$_t_struct$_Struct_$3_storage_ptr_$");
-
-	EnumDefinition e(++id, {}, std::make_shared<std::string>("Enum"), {}, {}, {});
-	BOOST_CHECK_EQUAL(e.type()->identifier(), "t_type$_t_enum$_Enum_$4_$");
-
-	TupleType t({e.type(), s.type(), stringArray, nullptr});
-	BOOST_CHECK_EQUAL(t.identifier(), "t_tuple$_t_type$_t_enum$_Enum_$4_$_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_t_array$_t_string_storage_$20_storage_ptr_$__$");
-
-	Type const* keccak256fun = TypeProvider::function(strings{}, strings{}, FunctionType::Kind::KECCAK256);
-	BOOST_CHECK_EQUAL(keccak256fun->identifier(), "t_function_keccak256_nonpayable$__$returns$__$");
-
-	FunctionType metaFun(TypePointers{keccak256fun}, TypePointers{s.type()}, strings{""}, strings{""});
-	BOOST_CHECK_EQUAL(metaFun.identifier(), "t_function_internal_nonpayable$_t_function_keccak256_nonpayable$__$returns$__$_$returns$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$");
-
-	Type const* m = TypeProvider::mapping(TypeProvider::fromElementaryTypeName("bytes32"), "", s.type(), "");
-	MappingType m2(TypeProvider::fromElementaryTypeName("uint64"), "", m, "");
-	BOOST_CHECK_EQUAL(m2.identifier(), "t_mapping$_t_uint64_$_t_mapping$_t_bytes32_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_$");
-
-	// TypeType is tested with contract
-
-	auto emptyParams = std::make_shared<ParameterList>(++id, SourceLocation(), std::vector<ASTPointer<VariableDeclaration>>());
-	ModifierDefinition mod(++id, SourceLocation{}, std::make_shared<std::string>("modif"), SourceLocation{}, {}, emptyParams, {}, {}, {});
-	BOOST_CHECK_EQUAL(ModifierType(mod).identifier(), "t_modifier$__$");
-
-	SourceUnit su(++id, {}, {}, {}, {});
-	BOOST_CHECK_EQUAL(ModuleType(su).identifier(), "t_module_7");
-	BOOST_CHECK_EQUAL(MagicType(MagicType::Kind::Block).identifier(), "t_magic_block");
-	BOOST_CHECK_EQUAL(MagicType(MagicType::Kind::Message).identifier(), "t_magic_message");
-	BOOST_CHECK_EQUAL(MagicType(MagicType::Kind::Transaction).identifier(), "t_magic_transaction");
-
-	BOOST_CHECK_EQUAL(InaccessibleDynamicType().identifier(), "t_inaccessible");
-}
-
-BOOST_AUTO_TEST_CASE(encoded_sizes)
-{
-	BOOST_CHECK_EQUAL(IntegerType(16).calldataEncodedSize(true), 32);
-	BOOST_CHECK_EQUAL(IntegerType(16).calldataEncodedSize(false), 2);
-
-	BOOST_CHECK_EQUAL(FixedBytesType(16).calldataEncodedSize(true), 32);
-	BOOST_CHECK_EQUAL(FixedBytesType(16).calldataEncodedSize(false), 16);
-
-	BOOST_CHECK_EQUAL(BoolType().calldataEncodedSize(true), 32);
-	BOOST_CHECK_EQUAL(BoolType().calldataEncodedSize(false), 1);
-
-	ArrayType const* uint24Array = TypeProvider::array(
-		DataLocation::Memory,
-		TypeProvider::uint(24),
-		9
-	);
-	BOOST_CHECK_EQUAL(uint24Array->calldataEncodedSize(true), 9 * 32);
-	BOOST_CHECK_EQUAL(uint24Array->calldataEncodedSize(false), 9 * 32);
-
-	ArrayType twoDimArray(DataLocation::Memory, uint24Array, 3);
-	BOOST_CHECK_EQUAL(twoDimArray.calldataEncodedSize(true),  9 * 3 * 32);
-	BOOST_CHECK_EQUAL(twoDimArray.calldataEncodedSize(false), 9 * 3 * 32);
-}
-
-BOOST_AUTO_TEST_CASE(helper_bool_result)
-{
-	BoolResult r1{true};
-	BoolResult r2 = BoolResult::err("Failure.");
-	r1.merge(r2, std::logical_and<bool>());
-	BOOST_REQUIRE_EQUAL(r1.get(), false);
-	BOOST_REQUIRE_EQUAL(r1.message(), "Failure.");
-
-	BoolResult r3{false};
-	BoolResult r4{true};
-	r3.merge(r4, std::logical_and<bool>());
-	BOOST_REQUIRE_EQUAL(r3.get(), false);
-	BOOST_REQUIRE_EQUAL(r3.message(), "");
-
-	BoolResult r5{true};
-	BoolResult r6{true};
-	r5.merge(r6, std::logical_and<bool>());
-	BOOST_REQUIRE_EQUAL(r5.get(), true);
-	BOOST_REQUIRE_EQUAL(r5.message(), "");
-}
-
-BOOST_AUTO_TEST_CASE(helper_string_result)
-{
-	using StringResult = util::Result<std::string>;
-
-	StringResult r1{std::string{"Success"}};
-	StringResult r2 = StringResult::err("Failure");
-
-	BOOST_REQUIRE_EQUAL(r1.get(), "Success");
-	BOOST_REQUIRE_EQUAL(r2.get(), "");
-
-	r1.merge(r2, [](std::string const&, std::string const& _rhs) { return _rhs; });
-
-	BOOST_REQUIRE_EQUAL(r1.get(), "");
-	BOOST_REQUIRE_EQUAL(r1.message(), "Failure");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
deleted file mode 100644
index 4971ce3cd1cf..000000000000
--- a/test/libsolidity/StandardCompiler.cpp
+++ /dev/null
@@ -1,1786 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Unit tests for interface/StandardCompiler.h.
- */
-
-#include <string>
-#include <boost/test/unit_test.hpp>
-#include <libsolidity/interface/OptimiserSettings.h>
-#include <libsolidity/interface/StandardCompiler.h>
-#include <libsolidity/interface/Version.h>
-#include <libsolutil/JSON.h>
-#include <libsolutil/CommonData.h>
-#include <test/Metadata.h>
-
-#include <algorithm>
-#include <set>
-
-using namespace solidity::evmasm;
-using namespace std::string_literals;
-
-namespace solidity::frontend::test
-{
-
-namespace
-{
-
-langutil::Error::Severity str2Severity(std::string const& _cat)
-{
-	std::map<std::string, langutil::Error::Severity> cats{
-		{"info", langutil::Error::Severity::Info},
-		{"Info", langutil::Error::Severity::Info},
-		{"warning", langutil::Error::Severity::Warning},
-		{"Warning", langutil::Error::Severity::Warning},
-		{"error", langutil::Error::Severity::Error},
-		{"Error", langutil::Error::Severity::Error}
-	};
-	return cats.at(_cat);
-}
-
-/// Helper to match a specific error type and message
-bool containsError(Json::Value const& _compilerResult, std::string const& _type, std::string const& _message)
-{
-	if (!_compilerResult.isMember("errors"))
-		return false;
-
-	for (auto const& error: _compilerResult["errors"])
-	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["type"].isString());
-		BOOST_REQUIRE(error["message"].isString());
-		if ((error["type"].asString() == _type) && (error["message"].asString() == _message))
-			return true;
-	}
-
-	return false;
-}
-
-bool containsAtMostWarnings(Json::Value const& _compilerResult)
-{
-	if (!_compilerResult.isMember("errors"))
-		return true;
-
-	for (auto const& error: _compilerResult["errors"])
-	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["severity"].isString());
-		if (langutil::Error::isError(str2Severity(error["severity"].asString())))
-			return false;
-	}
-
-	return true;
-}
-
-Json::Value getContractResult(Json::Value const& _compilerResult, std::string const& _file, std::string const& _name)
-{
-	if (
-		!_compilerResult["contracts"].isObject() ||
-		!_compilerResult["contracts"][_file].isObject() ||
-		!_compilerResult["contracts"][_file][_name].isObject()
-	)
-		return Json::Value();
-	return _compilerResult["contracts"][_file][_name];
-}
-
-void checkLinkReferencesSchema(Json::Value const& _contractResult)
-{
-	BOOST_TEST_REQUIRE(_contractResult.isObject());
-	BOOST_TEST_REQUIRE(_contractResult["evm"]["bytecode"].isObject());
-
-	Json::Value const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
-	BOOST_TEST_REQUIRE(linkReferenceResult.isObject());
-
-	for (std::string const& fileName: linkReferenceResult.getMemberNames())
-	{
-		BOOST_TEST_REQUIRE(linkReferenceResult[fileName].isObject());
-		for (std::string const& libraryName: linkReferenceResult[fileName].getMemberNames())
-		{
-			BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName].isArray());
-			BOOST_TEST_REQUIRE(!linkReferenceResult[fileName][libraryName].empty());
-			for (int i = 0; i < static_cast<int>(linkReferenceResult.size()); ++i)
-			{
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i].isObject());
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i].size() == 2);
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i]["length"].isUInt());
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i]["start"].isUInt());
-			}
-		}
-	}
-}
-
-void expectLinkReferences(Json::Value const& _contractResult, std::map<std::string, std::set<std::string>> const& _expectedLinkReferences)
-{
-	checkLinkReferencesSchema(_contractResult);
-
-	Json::Value const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
-	BOOST_TEST(linkReferenceResult.size() == _expectedLinkReferences.size());
-
-	for (auto const& [fileName, libraries]: _expectedLinkReferences)
-	{
-		BOOST_TEST(linkReferenceResult.isMember(fileName));
-		BOOST_TEST(linkReferenceResult[fileName].size() == libraries.size());
-		for (std::string const& libraryName: libraries)
-			BOOST_TEST(linkReferenceResult[fileName].isMember(libraryName));
-	}
-}
-
-Json::Value compile(std::string _input)
-{
-	StandardCompiler compiler;
-	std::string output = compiler.compile(std::move(_input));
-	Json::Value ret;
-	BOOST_REQUIRE(util::jsonParseStrict(output, ret));
-	return ret;
-}
-
-} // end anonymous namespace
-
-BOOST_AUTO_TEST_SUITE(StandardCompiler)
-
-BOOST_AUTO_TEST_CASE(assume_object_input)
-{
-	Json::Value result;
-
-	/// Use the native JSON interface of StandardCompiler to trigger these
-	frontend::StandardCompiler compiler;
-	result = compiler.compile(Json::Value());
-	BOOST_CHECK(containsError(result, "JSONError", "Input is not a JSON object."));
-	result = compiler.compile(Json::Value("INVALID"));
-	BOOST_CHECK(containsError(result, "JSONError", "Input is not a JSON object."));
-
-	/// Use the string interface of StandardCompiler to trigger these
-	result = compile("");
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n* Line 1, Column 1\n  A valid JSON document must be either an array or an object value.\n"));
-	result = compile("invalid");
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n* Line 1, Column 2\n  Extra non-whitespace after JSON value.\n"));
-	result = compile("\"invalid\"");
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 1, Column 1\n  A valid JSON document must be either an array or an object value.\n"));
-	BOOST_CHECK(!containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n"));
-	result = compile("{}");
-	BOOST_CHECK(!containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n"));
-	BOOST_CHECK(!containsAtMostWarnings(result));
-}
-
-BOOST_AUTO_TEST_CASE(invalid_language)
-{
-	char const* input = R"(
-	{
-		"language": "INVALID",
-		"sources": { "name": { "content": "abc" } }
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Only \"Solidity\", \"Yul\" or \"SolidityAST\" is supported as a language."));
-}
-
-BOOST_AUTO_TEST_CASE(valid_language)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity"
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(!containsError(result, "JSONError", "Only \"Solidity\" or \"Yul\" is supported as a language."));
-}
-
-BOOST_AUTO_TEST_CASE(no_sources)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity"
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "No input sources specified."));
-}
-
-BOOST_AUTO_TEST_CASE(no_sources_empty_object)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "No input sources specified."));
-}
-
-BOOST_AUTO_TEST_CASE(no_sources_empty_array)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": []
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "\"sources\" is not a JSON object."));
-}
-
-BOOST_AUTO_TEST_CASE(sources_is_array)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": ["aa", "bb"]
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "\"sources\" is not a JSON object."));
-}
-
-BOOST_AUTO_TEST_CASE(unexpected_trailing_test)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"A": {
-				"content": "contract A { function f() {} }"
-			}
-		}
-	}
-	}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 10, Column 2\n  Extra non-whitespace after JSON value.\n"));
-}
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_enabled_not_boolean)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"optimizer": {
-				"enabled": "wrong"
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "The \"enabled\" setting must be a Boolean."));
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_runs_not_a_number)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"optimizer": {
-				"enabled": true,
-				"runs": "not a number"
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "The \"runs\" setting must be an unsigned number."));
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_runs_not_an_unsigned_number)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"optimizer": {
-				"enabled": true,
-				"runs": -1
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "The \"runs\" setting must be an unsigned number."));
-}
-
-BOOST_AUTO_TEST_CASE(basic_compilation)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		},
-		"settings": {
-			"outputSelection": {
-				"fileA": {
-					"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-					"": [ "ast" ]
-				}
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-	BOOST_CHECK(contract["devdoc"].isObject());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["devdoc"]), R"({"kind":"dev","methods":{},"version":1})");
-	BOOST_CHECK(contract["userdoc"].isObject());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["userdoc"]), R"({"kind":"user","methods":{},"version":1})");
-	BOOST_CHECK(contract["evm"].isObject());
-	/// @TODO check evm.methodIdentifiers, legacyAssembly, bytecode, deployedBytecode
-	BOOST_CHECK(contract["evm"]["bytecode"].isObject());
-	BOOST_CHECK(contract["evm"]["bytecode"]["object"].isString());
-	BOOST_CHECK_EQUAL(
-		solidity::test::bytecodeSansMetadata(contract["evm"]["bytecode"]["object"].asString()),
-		std::string("6080604052348015600e575f80fd5b5060") +
-		(VersionIsRelease ? "3e" : util::toHex(bytes{uint8_t(60 + VersionStringStrict.size())})) +
-		"80601a5f395ff3fe60806040525f80fdfe"
-	);
-	BOOST_CHECK(contract["evm"]["assembly"].isString());
-	BOOST_CHECK(contract["evm"]["assembly"].asString().find(
-		"    /* \"fileA\":0:14  contract A { } */\n  mstore(0x40, 0x80)\n  "
-		"callvalue\n  dup1\n  "
-		"iszero\n  tag_1\n  jumpi\n  "
-		"0x00\n  "
-		"dup1\n  revert\n"
-		"tag_1:\n  pop\n  dataSize(sub_0)\n  dup1\n  "
-		"dataOffset(sub_0)\n  0x00\n  codecopy\n  0x00\n  return\nstop\n\nsub_0: assembly {\n        "
-		"/* \"fileA\":0:14  contract A { } */\n      mstore(0x40, 0x80)\n      "
-		"0x00\n      "
-		"dup1\n      revert\n\n    auxdata: 0xa26469706673582212"
-	) == 0);
-	BOOST_CHECK(contract["evm"]["gasEstimates"].isObject());
-	BOOST_CHECK_EQUAL(contract["evm"]["gasEstimates"].size(), 1);
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"].isObject());
-	BOOST_CHECK_EQUAL(contract["evm"]["gasEstimates"]["creation"].size(), 3);
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["codeDepositCost"].isString());
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["executionCost"].isString());
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["totalCost"].isString());
-	BOOST_CHECK_EQUAL(
-		u256(contract["evm"]["gasEstimates"]["creation"]["codeDepositCost"].asString()) +
-		u256(contract["evm"]["gasEstimates"]["creation"]["executionCost"].asString()),
-		u256(contract["evm"]["gasEstimates"]["creation"]["totalCost"].asString())
-	);
-	// Lets take the top level `.code` section (the "deployer code"), that should expose most of the features of
-	// the assembly JSON. What we want to check here is Operation, Push, PushTag, PushSub, PushSubSize and Tag.
-	BOOST_CHECK(contract["evm"]["legacyAssembly"].isObject());
-	BOOST_CHECK(contract["evm"]["legacyAssembly"][".code"].isArray());
-	BOOST_CHECK_EQUAL(
-		util::jsonCompactPrint(contract["evm"]["legacyAssembly"][".code"]),
-		"[{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"80\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"40\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"MSTORE\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"CALLVALUE\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"DUP1\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"ISZERO\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH [tag]\",\"source\":0,\"value\":\"1\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"JUMPI\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"DUP1\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"REVERT\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"JUMPDEST\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"POP\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"DUP1\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"CODECOPY\",\"source\":0},"
-		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"RETURN\",\"source\":0}]"
-	);
-	BOOST_CHECK(contract["metadata"].isString());
-	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].asString()));
-	BOOST_CHECK(result["sources"].isObject());
-	BOOST_CHECK(result["sources"]["fileA"].isObject());
-	BOOST_CHECK(result["sources"]["fileA"]["ast"].isObject());
-	BOOST_CHECK_EQUAL(
-		util::jsonCompactPrint(result["sources"]["fileA"]["ast"]),
-		"{\"absolutePath\":\"fileA\",\"exportedSymbols\":{\"A\":[1]},\"id\":2,\"nodeType\":\"SourceUnit\",\"nodes\":[{\"abstract\":false,"
-		"\"baseContracts\":[],\"canonicalName\":\"A\",\"contractDependencies\":[],"
-		"\"contractKind\":\"contract\",\"fullyImplemented\":true,\"id\":1,"
-		"\"linearizedBaseContracts\":[1],\"name\":\"A\",\"nameLocation\":\"9:1:0\",\"nodeType\":\"ContractDefinition\",\"nodes\":[],\"scope\":2,"
-		"\"src\":\"0:14:0\",\"usedErrors\":[],\"usedEvents\":[]}],\"src\":\"0:14:0\"}"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(compilation_error)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": {
-					"A": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { function }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(result.isMember("errors"));
-	BOOST_CHECK(result["errors"].size() >= 1);
-	for (auto const& error: result["errors"])
-	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["message"].isString());
-		if (error["message"].asString().find("pre-release compiler") == std::string::npos)
-		{
-			BOOST_CHECK_EQUAL(
-				util::jsonCompactPrint(error),
-				"{\"component\":\"general\",\"errorCode\":\"2314\",\"formattedMessage\":\"ParserError: Expected identifier but got '}'\\n"
-				" --> fileA:1:23:\\n  |\\n1 | contract A { function }\\n  |                       ^\\n\\n\",\"message\":\"Expected identifier but got '}'\","
-				"\"severity\":\"error\",\"sourceLocation\":{\"end\":23,\"file\":\"fileA\",\"start\":22},\"type\":\"ParserError\"}"
-			);
-		}
-	}
-}
-
-BOOST_AUTO_TEST_CASE(output_selection_explicit)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": {
-					"A": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-}
-
-BOOST_AUTO_TEST_CASE(output_selection_all_contracts)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": {
-					"*": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-}
-
-BOOST_AUTO_TEST_CASE(output_selection_all_files_single_contract)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"*": {
-					"A": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-}
-
-BOOST_AUTO_TEST_CASE(output_selection_all_files_all_contracts)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"*": {
-					"*": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-}
-
-BOOST_AUTO_TEST_CASE(output_selection_dependent_contract)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"*": {
-					"A": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract B { } contract A { function f() public { new B(); } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[{\"inputs\":[],\"name\":\"f\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]");
-}
-
-BOOST_AUTO_TEST_CASE(output_selection_dependent_contract_with_import)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"*": {
-					"A": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "import \"fileB\"; contract A { function f() public { new B(); } }"
-			},
-			"fileB": {
-				"content": "contract B { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[{\"inputs\":[],\"name\":\"f\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]");
-}
-
-BOOST_AUTO_TEST_CASE(filename_with_colon)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"http://github.com/ethereum/solidity/std/StandardToken.sol": {
-					"A": [
-						"abi"
-					]
-				}
-			}
-		},
-		"sources": {
-			"http://github.com/ethereum/solidity/std/StandardToken.sol": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "http://github.com/ethereum/solidity/std/StandardToken.sol", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
-	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-}
-
-BOOST_AUTO_TEST_CASE(library_filename_with_colon)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": {
-					"A": [
-						"evm.bytecode"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "import \"git:library.sol\"; contract A { function f() public returns (uint) { return L.g(); } }"
-			},
-			"git:library.sol": {
-				"content": "library L { function g() public returns (uint) { return 1; } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	expectLinkReferences(contract, {{"git:library.sol", {"L"}}});
-}
-
-BOOST_AUTO_TEST_CASE(libraries_invalid_top_level)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"libraries": "42"
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "\"libraries\" is not a JSON object."));
-}
-
-BOOST_AUTO_TEST_CASE(libraries_invalid_entry)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"libraries": {
-				"L": "42"
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Library entry is not a JSON object."));
-}
-
-BOOST_AUTO_TEST_CASE(libraries_invalid_hex)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"libraries": {
-				"library.sol": {
-					"L": "0x4200000000000000000000000000000000000xx1"
-				}
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Invalid library address (\"0x4200000000000000000000000000000000000xx1\") supplied."));
-}
-
-BOOST_AUTO_TEST_CASE(libraries_invalid_length)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"libraries": {
-				"library.sol": {
-					"L1": "0x42",
-					"L2": "0x4200000000000000000000000000000000000001ff"
-				}
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Library address is of invalid length."));
-}
-
-BOOST_AUTO_TEST_CASE(libraries_missing_hex_prefix)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"libraries": {
-				"library.sol": {
-					"L": "4200000000000000000000000000000000000001"
-				}
-			}
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Library address is not prefixed with \"0x\"."));
-}
-
-BOOST_AUTO_TEST_CASE(library_linking)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"libraries": {
-				"library.sol": {
-					"L": "0x4200000000000000000000000000000000000001"
-				}
-			},
-			"outputSelection": {
-				"fileA": {
-					"A": [
-						"evm.bytecode"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "import \"library.sol\"; import \"library2.sol\"; contract A { function f() public returns (uint) { L2.g(); return L.g(); } }"
-			},
-			"library.sol": {
-				"content": "library L { function g() public returns (uint) { return 1; } }"
-			},
-			"library2.sol": {
-				"content": "library L2 { function g() public { } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "A");
-	expectLinkReferences(contractResult, {{"library2.sol", {"L2"}}});
-}
-
-BOOST_AUTO_TEST_CASE(linking_yul)
-{
-	char const* input = R"(
-	{
-		"language": "Yul",
-		"settings": {
-			"libraries": {
-				"fileB": {
-					"L": "0x4200000000000000000000000000000000000001"
-				}
-			},
-			"outputSelection": {
-				"fileA": {
-					"*": [
-						"evm.bytecode.linkReferences"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "object \"a\" { code { let addr := linkersymbol(\"fileB:L\") sstore(0, addr) } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
-	expectLinkReferences(contractResult, {});
-}
-
-BOOST_AUTO_TEST_CASE(linking_yul_empty_link_reference)
-{
-	char const* input = R"(
-	{
-		"language": "Yul",
-		"settings": {
-			"libraries": {
-				"": {
-					"": "0x4200000000000000000000000000000000000001"
-				}
-			},
-			"outputSelection": {
-				"fileA": {
-					"*": [
-						"evm.bytecode.linkReferences"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "object \"a\" { code { let addr := linkersymbol(\"\") sstore(0, addr) } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
-	expectLinkReferences(contractResult, {{"", {""}}});
-}
-
-BOOST_AUTO_TEST_CASE(linking_yul_no_filename_in_link_reference)
-{
-	char const* input = R"(
-	{
-		"language": "Yul",
-		"settings": {
-			"libraries": {
-				"": {
-					"L": "0x4200000000000000000000000000000000000001"
-				}
-			},
-			"outputSelection": {
-				"fileA": {
-					"*": [
-						"evm.bytecode.linkReferences"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "object \"a\" { code { let addr := linkersymbol(\"L\") sstore(0, addr) } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
-	expectLinkReferences(contractResult, {{"", {"L"}}});
-}
-
-BOOST_AUTO_TEST_CASE(linking_yul_same_library_name_different_files)
-{
-	char const* input = R"(
-	{
-		"language": "Yul",
-		"settings": {
-			"libraries": {
-				"fileB": {
-					"L": "0x4200000000000000000000000000000000000001"
-				}
-			},
-			"outputSelection": {
-				"fileA": {
-					"*": [
-						"evm.bytecode.linkReferences"
-					]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "object \"a\" { code { let addr := linkersymbol(\"fileC:L\") sstore(0, addr) } }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
-	expectLinkReferences(contractResult, {{"fileC", {"L"}}});
-}
-
-BOOST_AUTO_TEST_CASE(evm_version)
-{
-	auto inputForVersion = [](std::string const& _version)
-	{
-		return R"(
-			{
-				"language": "Solidity",
-				"sources": { "fileA": { "content": "contract A { }" } },
-				"settings": {
-					)" + _version + R"(
-					"outputSelection": {
-						"fileA": {
-							"A": [ "metadata" ]
-						}
-					}
-				}
-			}
-		)";
-	};
-	Json::Value result;
-	result = compile(inputForVersion("\"evmVersion\": \"homestead\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"homestead\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"tangerineWhistle\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"tangerineWhistle\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"spuriousDragon\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"spuriousDragon\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"byzantium\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"byzantium\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"constantinople\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"constantinople\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"petersburg\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"petersburg\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"istanbul\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"istanbul\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"berlin\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"berlin\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"london\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"paris\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != std::string::npos);
-	result = compile(inputForVersion("\"evmVersion\": \"shanghai\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
-	// test default
-	result = compile(inputForVersion(""));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
-	// test invalid
-	result = compile(inputForVersion("\"evmVersion\": \"invalid\","));
-	BOOST_CHECK(result["errors"][0]["message"].asString() == "Invalid EVM version requested.");
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_settings_default_disabled)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": { "A": [ "metadata" ] }
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(optimizer.isMember("enabled"));
-	BOOST_CHECK(optimizer["enabled"].asBool() == false);
-	BOOST_CHECK(!optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["runs"].asUInt() == 200);
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_settings_default_enabled)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": { "A": [ "metadata" ] }
-			},
-			"optimizer": { "enabled": true }
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(optimizer.isMember("enabled"));
-	BOOST_CHECK(optimizer["enabled"].asBool() == true);
-	BOOST_CHECK(!optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["runs"].asUInt() == 200);
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_settings_details_exactly_as_default_disabled)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": { "A": [ "metadata" ] }
-			},
-			"optimizer": { "details": {
-				"constantOptimizer" : false,
-				"cse" : false,
-				"deduplicate" : false,
-				"jumpdestRemover" : true,
-				"orderLiterals" : false,
-				"peephole" : true
-			} }
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(optimizer.isMember("enabled"));
-	// enabled is switched to false instead!
-	BOOST_CHECK(optimizer["enabled"].asBool() == false);
-	BOOST_CHECK(!optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["runs"].asUInt() == 200);
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": { "A": [ "metadata" ] }
-			},
-			"optimizer": { "runs": 600, "details": {
-				"constantOptimizer" : true,
-				"cse" : false,
-				"deduplicate" : true,
-				"jumpdestRemover" : true,
-				"orderLiterals" : false,
-				"peephole" : true,
-				"yul": true,
-				"inliner": true
-			} }
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(!optimizer.isMember("enabled"));
-	BOOST_CHECK(optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["details"]["constantOptimizer"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["cse"].asBool() == false);
-	BOOST_CHECK(optimizer["details"]["deduplicate"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["jumpdestRemover"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["orderLiterals"].asBool() == false);
-	BOOST_CHECK(optimizer["details"]["peephole"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["yul"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["yulDetails"].isObject());
-	BOOST_CHECK(
-		util::convertContainer<std::set<std::string>>(optimizer["details"]["yulDetails"].getMemberNames()) ==
-		(std::set<std::string>{"stackAllocation", "optimizerSteps"})
-	);
-	BOOST_CHECK(optimizer["details"]["yulDetails"]["stackAllocation"].asBool() == true);
-	BOOST_CHECK(
-		optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
-		OptimiserSettings::DefaultYulOptimiserSteps + ":"s + OptimiserSettings::DefaultYulOptimiserCleanupSteps
- 	);
-	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 10);
-	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
-}
-
-BOOST_AUTO_TEST_CASE(metadata_without_compilation)
-{
-	// NOTE: the contract code here should fail to compile due to "out of stack"
-	// If the metadata is successfully returned, that means no compilation was attempted.
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"fileA": { "A": [ "metadata" ] }
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A {
-  function x(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h, uint i, uint j, uint k, uint l, uint m, uint n, uint o, uint p) pure public {}
-  function y() pure public {
-    uint a; uint b; uint c; uint d; uint e; uint f; uint g; uint h; uint i; uint j; uint k; uint l; uint m; uint n; uint o; uint p;
-    x(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p);
-  }
-}"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].asString()));
-}
-
-
-BOOST_AUTO_TEST_CASE(license_in_metadata)
-{
-	std::string const input = R"(
-			{
-				"language": "Solidity",
-				"sources": {
-					"fileA": { "content": "import \"fileB\"; contract A { } // SPDX-License-Identifier: GPL-3.0 \n" },
-					"fileB": { "content": "import \"fileC\"; /* SPDX-License-Identifier: MIT */ contract B { }" },
-					"fileC": { "content": "import \"fileD\"; /* SPDX-License-Identifier: MIT AND GPL-3.0 */ contract C { }" },
-					"fileD": { "content": "// SPDX-License-Identifier: (GPL-3.0+ OR MIT) AND MIT \n import \"fileE\"; contract D { }" },
-					"fileE": { "content": "import \"fileF\"; /// SPDX-License-Identifier: MIT   \n contract E { }" },
-					"fileF": { "content": "/*\n * SPDX-License-Identifier: MIT\n */ contract F { }" }
-				},
-				"settings": {
-					"outputSelection": {
-						"fileA": {
-							"*": [ "metadata" ]
-						}
-					}
-				}
-			}
-		)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_REQUIRE(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-	BOOST_CHECK_EQUAL(metadata["sources"]["fileA"]["license"], "GPL-3.0");
-	BOOST_CHECK_EQUAL(metadata["sources"]["fileB"]["license"], "MIT");
-	BOOST_CHECK_EQUAL(metadata["sources"]["fileC"]["license"], "MIT AND GPL-3.0");
-	BOOST_CHECK_EQUAL(metadata["sources"]["fileD"]["license"], "(GPL-3.0+ OR MIT) AND MIT");
-	// This is actually part of the docstring, but still picked up
-	// because the source location of the contract does not cover the docstring.
-	BOOST_CHECK_EQUAL(metadata["sources"]["fileE"]["license"], "MIT");
-	BOOST_CHECK_EQUAL(metadata["sources"]["fileF"]["license"], "MIT");
-}
-
-BOOST_AUTO_TEST_CASE(common_pattern)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"outputSelection": {
-				"*": {
-					"*": [ "evm.bytecode.object", "metadata" ]
-				}
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A { function f() pure public {} }"
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].asString()));
-	BOOST_CHECK(contract["evm"]["bytecode"].isObject());
-	BOOST_CHECK(contract["evm"]["bytecode"]["object"].isString());
-}
-
-BOOST_AUTO_TEST_CASE(use_stack_optimization)
-{
-	// NOTE: the contract code here should fail to compile due to "out of stack"
-	// If we enable stack optimization, though, it will compile.
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"optimizer": { "enabled": true, "details": { "yul": true } },
-			"outputSelection": {
-				"fileA": { "A": [ "evm.bytecode.object" ] }
-			}
-		},
-		"sources": {
-			"fileA": {
-				"content": "contract A {
-					function y() public {
-						assembly {
-							function fun() -> a3, b3, c3, d3, e3, f3, g3, h3, i3, j3, k3, l3, m3, n3, o3, p3
-							{
-								let a := 1
-								let b := 1
-								let z3 := 1
-								sstore(a, b)
-								sstore(add(a, 1), b)
-								sstore(add(a, 2), b)
-								sstore(add(a, 3), b)
-								sstore(add(a, 4), b)
-								sstore(add(a, 5), b)
-								sstore(add(a, 6), b)
-								sstore(add(a, 7), b)
-								sstore(add(a, 8), b)
-								sstore(add(a, 9), b)
-								sstore(add(a, 10), b)
-								sstore(add(a, 11), b)
-								sstore(add(a, 12), b)
-							}
-							let a1, b1, c1, d1, e1, f1, g1, h1, i1, j1, k1, l1, m1, n1, o1, p1 := fun()
-							let a2, b2, c2, d2, e2, f2, g2, h2, i2, j2, k2, l2, m2, n2, o2, p2 := fun()
-							sstore(a1, a2)
-						}
-					}
-				}"
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_REQUIRE(contract.isObject());
-	BOOST_REQUIRE(contract["evm"]["bytecode"]["object"].isString());
-	BOOST_CHECK(contract["evm"]["bytecode"]["object"].asString().length() > 20);
-
-	// Now disable stack optimizations and UnusedFunctionParameterPruner (p)
-	// results in "stack too deep"
-	std::string optimiserSteps = OptimiserSettings::DefaultYulOptimiserSteps;
-	optimiserSteps.erase(
-		remove_if(optimiserSteps.begin(), optimiserSteps.end(), [](char ch) { return ch == 'p'; }),
-		optimiserSteps.end()
-	);
-	parsedInput["settings"]["optimizer"]["details"]["yulDetails"]["stackAllocation"] = false;
-	parsedInput["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"] = optimiserSteps;
-
-	result = compiler.compile(parsedInput);
-	BOOST_REQUIRE(result["errors"].isArray());
-	BOOST_CHECK(result["errors"][0]["severity"] == "error");
-	BOOST_REQUIRE(result["errors"][0]["message"].isString());
-	BOOST_CHECK(result["errors"][0]["message"].asString().find("When compiling inline assembly") != std::string::npos);
-	BOOST_CHECK(result["errors"][0]["type"] == "CompilerError");
-}
-
-BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-			"sources":
-		{
-			"A":
-			{
-				"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-			}
-		},
-		"settings":
-		{
-			"outputSelection":
-			{
-				"*": { "C": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_REQUIRE(result["contracts"].isObject());
-	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A"]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A"]["C"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A"]["C"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
-	BOOST_REQUIRE(result["sources"].size() == 1);
-	BOOST_REQUIRE(result["sources"]["A"].isObject());
-
-}
-
-BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_colon_source)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources":
-		{
-			":A":
-			{
-				"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-			}
-		},
-		"settings":
-		{
-			"outputSelection":
-			{
-				"*": { "C": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_REQUIRE(result["contracts"].isObject());
-	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"][":A"].isObject());
-	BOOST_REQUIRE(result["contracts"][":A"].size() == 1);
-	BOOST_REQUIRE(result["contracts"][":A"]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"][":A"]["C"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"][":A"]["C"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
-	BOOST_REQUIRE(result["sources"].size() == 1);
-	BOOST_REQUIRE(result["sources"][":A"].isObject());
-}
-
-BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_empty_source)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources":
-		{
-			"":
-			{
-				"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-			}
-		},
-		"settings":
-		{
-			"outputSelection":
-			{
-				"*": { "C": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_REQUIRE(result["contracts"].isObject());
-	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"][""].isObject());
-	BOOST_REQUIRE(result["contracts"][""].size() == 1);
-	BOOST_REQUIRE(result["contracts"][""]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"][""]["C"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"][""]["C"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
-	BOOST_REQUIRE(result["sources"].size() == 1);
-	BOOST_REQUIRE(result["sources"][""].isObject());
-}
-
-BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_multiple_sources)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources":
-		{
-			"A":
-			{
-				"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-			},
-			"B":
-			{
-				"content": "pragma solidity >=0.0; contract D { function f() public pure {} }"
-			}
-		},
-		"settings":
-		{
-			"outputSelection":
-			{
-				"*": { "D": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_REQUIRE(result["contracts"].isObject());
-	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["B"].isObject());
-	BOOST_REQUIRE(result["contracts"]["B"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["B"]["D"].isObject());
-	BOOST_REQUIRE(result["contracts"]["B"]["D"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"]["B"]["D"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
-	BOOST_REQUIRE(result["sources"].size() == 2);
-	BOOST_REQUIRE(result["sources"]["A"].isObject());
-	BOOST_REQUIRE(result["sources"]["B"].isObject());
-}
-
-BOOST_AUTO_TEST_CASE(stopAfter_invalid_value)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources":
-		{ "": { "content": "pragma solidity >=0.0; contract C { function f() public pure {} }" } },
-		"settings":
-		{
-			"stopAfter": "rrr",
-			"outputSelection":
-			{
-				"*": { "C": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Invalid value for \"settings.stopAfter\". Only valid value is \"parsing\"."));
-}
-
-BOOST_AUTO_TEST_CASE(stopAfter_invalid_type)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources":
-		{ "": { "content": "pragma solidity >=0.0; contract C { function f() public pure {} }" } },
-		"settings":
-		{
-			"stopAfter": 3,
-			"outputSelection":
-			{
-				"*": { "C": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "\"settings.stopAfter\" must be a string."));
-}
-
-BOOST_AUTO_TEST_CASE(stopAfter_bin_conflict)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources":
-		{ "": { "content": "pragma solidity >=0.0; contract C { function f() public pure {} }" } },
-		"settings":
-		{
-			"stopAfter": "parsing",
-			"outputSelection":
-			{
-				"*": { "C": ["evm.bytecode"] }
-			}
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Requested output selection conflicts with \"settings.stopAfter\"."));
-}
-
-BOOST_AUTO_TEST_CASE(stopAfter_ast_output)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"a.sol": {
-				"content": "// SPDX-License-Identifier: GPL-3.0\nimport \"tes32.sol\";\n contract C is X { constructor() {} }"
-			}
-		},
-		"settings": {
-			"stopAfter": "parsing",
-			"outputSelection": { "*": { "": [ "ast" ] } }
-		}
-	}
-	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(result["sources"].isObject());
-	BOOST_CHECK(result["sources"]["a.sol"].isObject());
-	BOOST_CHECK(result["sources"]["a.sol"]["ast"].isObject());
-}
-
-BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"BlockRewardAuRaBase.sol": {
-				"content": " contract Sacrifice { constructor() payable {} } abstract contract BlockRewardAuRaBase { function _transferNativeReward() internal { new Sacrifice(); } function _distributeTokenRewards() internal virtual; } "
-			},
-			"BlockRewardAuRaCoins.sol": {
-				"content": " import \"./BlockRewardAuRaBase.sol\"; contract BlockRewardAuRaCoins is BlockRewardAuRaBase { function transferReward() public { _transferNativeReward(); } function _distributeTokenRewards() internal override {} } "
-			}
-		},
-		"settings": {
-			"outputSelection": {
-				"BlockRewardAuRaCoins.sol": {
-					"BlockRewardAuRaCoins": ["ir", "evm.bytecode.sourceMap"]
-				}
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_REQUIRE(result["contracts"].isObject());
-	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"].isObject());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"].isObject());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["ir"].isString());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
-	BOOST_REQUIRE(result["sources"].size() == 2);
-}
-
-BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract_yul)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"A.sol": {
-				"content": "contract A {} contract B {} contract C { constructor() { new B(); } } contract D {}"
-			}
-		},
-		"settings": {
-			"outputSelection": {
-				"A.sol": {
-					"C": ["ir"]
-				}
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	BOOST_REQUIRE(result["contracts"].isObject());
-	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A.sol"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A.sol"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"]["ir"].isString());
-
-	const std::string& irCode = result["contracts"]["A.sol"]["C"]["ir"].asString();
-
-	// Make sure C and B contracts are deployed
-	BOOST_REQUIRE(irCode.find("object \"C") != std::string::npos);
-	BOOST_REQUIRE(irCode.find("object \"B") != std::string::npos);
-
-	// Make sure A and D are NOT deployed as they were not requested and are not
-	// in any dependency
-	BOOST_REQUIRE(irCode.find("object \"A") == std::string::npos);
-	BOOST_REQUIRE(irCode.find("object \"D") == std::string::npos);
-
-
-	BOOST_REQUIRE(result["sources"].isObject());
-	BOOST_REQUIRE(result["sources"].size() == 1);
-}
-
-BOOST_AUTO_TEST_CASE(source_location_of_bare_block)
-{
-	char const* input = R"(
-	{
-		"language": "Solidity",
-		"sources": {
-			"A.sol": {
-				"content": "contract A { constructor() { uint x = 2; { uint y = 3; } } }"
-			}
-		},
-		"settings": {
-			"outputSelection": {
-				"A.sol": {
-					"A": ["evm.bytecode.sourceMap"]
-				}
-			}
-		}
-	}
-	)";
-
-	Json::Value parsedInput;
-	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
-
-	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
-
-	std::string sourceMap = result["contracts"]["A.sol"]["A"]["evm"]["bytecode"]["sourceMap"].asString();
-
-	// Check that the bare block's source location is referenced.
-	std::string sourceRef =
-		";" +
-		std::to_string(std::string{"contract A { constructor() { uint x = 2; "}.size()) +
-		":" +
-		std::to_string(std::string{"{ uint y = 3; }"}.size());
-	BOOST_REQUIRE(sourceMap.find(sourceRef) != std::string::npos);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
deleted file mode 100644
index 7c4fa8da1e84..000000000000
--- a/test/libsolidity/SyntaxTest.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/SyntaxTest.h>
-
-#include <test/libsolidity/util/Common.h>
-#include <test/Common.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/throw_exception.hpp>
-#include <fstream>
-#include <memory>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::util::formatting;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace boost::unit_test;
-namespace fs = boost::filesystem;
-
-SyntaxTest::SyntaxTest(
-	std::string const& _filename,
-	langutil::EVMVersion _evmVersion,
-	Error::Severity _minSeverity
-):
-	CommonSyntaxTest(_filename, _evmVersion),
-	m_minSeverity(_minSeverity)
-{
-	static std::set<std::string> const compileViaYulAllowedValues{"true", "false"};
-
-	m_compileViaYul = m_reader.stringSetting("compileViaYul", "false");
-	if (!util::contains(compileViaYulAllowedValues, m_compileViaYul))
-		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + m_compileViaYul + "."));
-	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
-}
-
-void SyntaxTest::setupCompiler(CompilerStack& _compiler)
-{
-	AnalysisFramework::setupCompiler(_compiler);
-
-	_compiler.setEVMVersion(m_evmVersion);
-	_compiler.setOptimiserSettings(
-		m_optimiseYul ?
-		OptimiserSettings::full() :
-		OptimiserSettings::minimal()
-	);
-	_compiler.setViaIR(m_compileViaYul == "true");
-	_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
-	_compiler.setMetadataHash(CompilerStack::MetadataHash::None);
-}
-
-void SyntaxTest::parseAndAnalyze()
-{
-	try
-	{
-		runFramework(withPreamble(m_sources.sources), PipelineStage::Compilation);
-		if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis))
-		{
-			ErrorList const& errors = compiler().errors();
-			auto codeGeneretionErrorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
-				return error->type() == Error::Type::CodeGenerationError;
-			});
-			auto errorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
-				return Error::isError(error->type());
-			});
-			// failing compilation after successful analysis is a rare case,
-			// it assumes that errors contain exactly one error, and the error is of type Error::Type::CodeGenerationError
-			if (codeGeneretionErrorCount != 1 || errorCount != 1)
-				BOOST_THROW_EXCEPTION(std::runtime_error("Compilation failed even though analysis was successful."));
-		}
-	}
-	catch (UnimplementedFeatureError const& _e)
-	{
-		m_errorList.emplace_back(SyntaxTestError{
-			Error::Type::UnimplementedFeatureError,
-			std::nullopt,
-			errorMessage(_e),
-			"",
-			-1,
-			-1
-		});
-	}
-
-	filterObtainedErrors();
-}
-
-void SyntaxTest::filterObtainedErrors()
-{
-	for (auto const& currentError: filteredErrors())
-	{
-		if (currentError->severity() < m_minSeverity)
-			continue;
-
-		int locationStart = -1;
-		int locationEnd = -1;
-		std::string sourceName;
-		if (SourceLocation const* location = currentError->sourceLocation())
-		{
-			locationStart = location->start;
-			locationEnd = location->end;
-			solAssert(location->sourceName, "");
-			sourceName = *location->sourceName;
-			if(m_sources.sources.count(sourceName) == 1)
-			{
-				int preambleSize =
-						static_cast<int>(compiler().charStream(sourceName).size()) -
-						static_cast<int>(m_sources.sources[sourceName].size());
-				solAssert(preambleSize >= 0, "");
-
-				// ignore the version & license pragma inserted by the testing tool when calculating locations.
-				if (location->start != -1)
-				{
-					solAssert(location->start >= preambleSize, "");
-					locationStart = location->start - preambleSize;
-				}
-				if (location->end != -1)
-				{
-					solAssert(location->end >= preambleSize, "");
-					locationEnd = location->end - preambleSize;
-				}
-			}
-		}
-		m_errorList.emplace_back(SyntaxTestError{
-			currentError->type(),
-			currentError->errorId(),
-			errorMessage(*currentError),
-			sourceName,
-			locationStart,
-			locationEnd
-		});
-	}
-}
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
deleted file mode 100644
index 95df3c6cd80c..000000000000
--- a/test/libsolidity/SyntaxTest.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/libsolidity/AnalysisFramework.h>
-#include <test/TestCase.h>
-#include <test/CommonSyntaxTest.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/AnsiColorized.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend::test
-{
-
-using solidity::test::SyntaxTestError;
-
-class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxTest
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion);
-	}
-	SyntaxTest(
-		std::string const& _filename,
-		langutil::EVMVersion _evmVersion,
-		langutil::Error::Severity _minSeverity = langutil::Error::Severity::Info
-	);
-
-protected:
-	void setupCompiler(CompilerStack& _compiler) override;
-	void parseAndAnalyze() override;
-	virtual void filterObtainedErrors();
-
-	bool m_optimiseYul{};
-	std::string m_compileViaYul{};
-	langutil::Error::Severity m_minSeverity{};
-};
-
-}
diff --git a/test/libsolidity/ViewPureChecker.cpp b/test/libsolidity/ViewPureChecker.cpp
deleted file mode 100644
index 03b2b421b4eb..000000000000
--- a/test/libsolidity/ViewPureChecker.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Unit tests for the view and pure checker.
- */
-
-#include <test/libsolidity/AnalysisFramework.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-#include <tuple>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-BOOST_FIXTURE_TEST_SUITE(ViewPureChecker, AnalysisFramework)
-
-BOOST_AUTO_TEST_CASE(environment_access)
-{
-	std::vector<std::string> view{
-		"block.coinbase",
-		"block.timestamp",
-		"block.difficulty",
-		"block.number",
-		"block.gaslimit",
-		"blockhash(7)",
-		"gasleft()",
-		"msg.value",
-		"msg.sender",
-		"tx.origin",
-		"tx.gasprice",
-		"this",
-		"address(1).balance",
-	};
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-		view.emplace_back("address(0x4242).staticcall(\"\")");
-
-	// ``block.blockhash`` and ``blockhash`` are tested separately below because their usage will
-	// produce warnings that can't be handled in a generic way.
-	std::vector<std::string> pure{
-		"msg.data",
-		"msg.data[0]",
-		"msg.sig",
-		"msg",
-		"block",
-		"tx"
-	};
-	for (std::string const& x: view)
-	{
-		CHECK_ERROR(
-			"contract C { function f() pure public { " + x + "; } }",
-			TypeError,
-			"Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires \"view\""
-		);
-	}
-	for (std::string const& x: pure)
-	{
-		CHECK_WARNING(
-			"contract C { function f() view public { " + x + "; } }",
-			"Function state mutability can be restricted to pure"
-		);
-	}
-
-	CHECK_WARNING_ALLOW_MULTI(
-		"contract C { function f() view public { blockhash; } }",
-		(std::vector<std::string>{
-			"Function state mutability can be restricted to pure",
-			"Statement has no effect."
-	}));
-
-	CHECK_ERROR(
-		"contract C { function f() view public { block.blockhash; } }",
-		TypeError,
-		"\"block.blockhash()\" has been deprecated in favor of \"blockhash()\""
-	);
-}
-
-BOOST_AUTO_TEST_CASE(address_staticcall)
-{
-	std::string text = R"(
-		contract C {
-			function i() view public returns (bool) {
-				(bool success,) = address(0x4242).staticcall("");
-				return success;
-			}
-		}
-	)";
-	if (!solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-		CHECK_ERROR(text, TypeError, "\"staticcall\" is not supported by the VM version.");
-	else
-		CHECK_SUCCESS_NO_WARNINGS(text);
-}
-
-
-BOOST_AUTO_TEST_CASE(assembly_staticcall)
-{
-	std::string text = R"(
-		contract C {
-			function i() view public {
-				assembly { pop(staticcall(gas(), 1, 2, 3, 4, 5)) }
-			}
-		}
-	)";
-	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
-		CHECK_SUCCESS_NO_WARNINGS(text);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
deleted file mode 100644
index d91932767b22..000000000000
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ /dev/null
@@ -1,2235 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Unit tests for libsolidity/analysis/FunctionCallGraph.h
-
-#include <libsolidity/analysis/FunctionCallGraph.h>
-
-#include <test/Common.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <libsolidity/ast/AST.h>
-#include <libsolidity/interface/CompilerStack.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <range/v3/action/sort.hpp>
-#include <range/v3/algorithm/all_of.hpp>
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/join.hpp>
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/remove_if.hpp>
-#include <range/v3/view/set_algorithm.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <memory>
-#include <ostream>
-#include <set>
-#include <string>
-#include <tuple>
-#include <vector>
-
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace std::string_literals;
-
-using EdgeMap = std::map<
-	CallGraph::Node,
-	std::set<CallGraph::Node, CallGraph::CompareByID>,
-	CallGraph::CompareByID
->;
-using EdgeNames = std::set<std::tuple<std::string, std::string>>;
-using CallGraphMap = std::map<std::string, CallGraph const*>;
-
-namespace
-{
-
-std::unique_ptr<CompilerStack> parseAndAnalyzeContracts(std::string _sourceCode)
-{
-	ReadCallback::Callback fileReader = [](std::string const&, std::string const&)
-	{
-		soltestAssert(false, "For simplicity this test suite supports only files without imports.");
-		return ReadCallback::Result{true, ""};
-	};
-
-	auto compilerStack = std::make_unique<CompilerStack>(fileReader);
-	compilerStack->setSources({{"", _sourceCode}});
-
-	// NOTE: The code in test cases is expected to be correct so we can keep error handling simple
-	// here and just assert that there are no errors.
-	bool success = compilerStack->parseAndAnalyze();
-	soltestAssert(success, "");
-
-	soltestAssert(
-		ranges::all_of(
-			compilerStack->ast("").nodes(),
-			[](auto const& _node){ return !dynamic_cast<ImportDirective const*>(_node.get()); }
-		),
-		"For simplicity this test suite supports only files without imports."
-	);
-
-	return compilerStack;
-}
-
-EdgeNames edgeNames(EdgeMap const& _edgeMap)
-{
-	EdgeNames names;
-
-	for (auto const& [edgeStart, allEnds]: _edgeMap)
-		for (auto const& edgeEnd: allEnds)
-			names.emplace(toString(edgeStart), toString(edgeEnd));
-
-	return names;
-}
-
-std::tuple<CallGraphMap, CallGraphMap> collectGraphs(CompilerStack const& _compilerStack)
-{
-	soltestAssert(_compilerStack.state() >= CompilerStack::State::AnalysisSuccessful);
-
-	std::tuple<CallGraphMap, CallGraphMap> graphs;
-
-	for (std::string const& fullyQualifiedContractName: _compilerStack.contractNames())
-	{
-		soltestAssert(std::get<0>(graphs).count(fullyQualifiedContractName) == 0 && std::get<1>(graphs).count(fullyQualifiedContractName) == 0, "");
-
-		// This relies on two assumptions: (1) CompilerStack received an empty string as a path for
-		// the contract and (2) contracts used in test cases have no imports.
-		soltestAssert(fullyQualifiedContractName.size() > 0 && fullyQualifiedContractName[0] == ':', "");
-		std::string contractName = fullyQualifiedContractName.substr(1);
-
-		std::get<0>(graphs).emplace(contractName, _compilerStack.contractDefinition(fullyQualifiedContractName).annotation().creationCallGraph->get());
-		std::get<1>(graphs).emplace(contractName, _compilerStack.contractDefinition(fullyQualifiedContractName).annotation().deployedCallGraph->get());
-	}
-
-	return graphs;
-}
-
-void checkCallGraphExpectations(
-	CallGraphMap const& _callGraphs,
-	std::map<std::string, EdgeNames> const& _expectedEdges,
-	std::map<std::string, std::set<std::string>> const& _expectedCreatedContractSets = {},
-	std::map<std::string, std::set<std::string>> const& _expectedEmittedEventSets = {}
-)
-{
-	auto getContractName = [](ContractDefinition const* _contract){ return _contract->name(); };
-	auto eventToString = [](EventDefinition const* _event){ return toString(CallGraph::Node(_event)); };
-	auto notEmpty = [](std::set<std::string> const& _set){ return !_set.empty(); };
-
-	soltestAssert(
-		(_expectedCreatedContractSets | ranges::views::values | ranges::views::remove_if(notEmpty)).empty(),
-		"Contracts that are not expected to create other contracts should not be included in _expectedCreatedContractSets."
-	);
-	soltestAssert(
-		(_expectedEdges | ranges::views::keys | ranges::to<std::set>()) == (_callGraphs | ranges::views::keys | ranges::to<std::set>()) &&
-		(ranges::views::set_difference(_expectedCreatedContractSets | ranges::views::keys, _expectedEdges | ranges::views::keys)).empty(),
-		"Contracts listed in expectations do not match contracts actually found in the source file or in other expectations."
-	);
-	for (std::string const& contractName: _expectedEdges | ranges::views::keys)
-	{
-		soltestAssert(
-			(ranges::views::set_difference(valueOrDefault(_expectedCreatedContractSets, contractName, {}), _expectedEdges | ranges::views::keys)).empty(),
-			"Inconsistent expectations: contract expected to be created but not to be present in the source file."
-		);
-	}
-
-	std::map<std::string, EdgeNames> edges;
-	std::map<std::string, std::set<std::string>> createdContractSets;
-	std::map<std::string, std::set<std::string>> emittedEventSets;
-	for (std::string const& contractName: _expectedEdges | ranges::views::keys)
-	{
-		soltestAssert(_callGraphs.at(contractName) != nullptr, "");
-		CallGraph const& callGraph = *_callGraphs.at(contractName);
-
-		edges[contractName] = edgeNames(callGraph.edges);
-		if (!callGraph.bytecodeDependency.empty())
-			createdContractSets[contractName] = callGraph.bytecodeDependency |
-				ranges::views::keys |
-				ranges::views::transform(getContractName) |
-				ranges::to<std::set<std::string>>();
-		if (!callGraph.emittedEvents.empty())
-			emittedEventSets[contractName] = callGraph.emittedEvents |
-				 ranges::views::transform(eventToString) |
-				 ranges::to<std::set<std::string>>();
-	}
-
-	BOOST_CHECK_EQUAL(edges, _expectedEdges);
-	BOOST_CHECK_EQUAL(createdContractSets, _expectedCreatedContractSets);
-	BOOST_CHECK_EQUAL(emittedEventSets, _expectedEmittedEventSets);
-}
-
-std::ostream& operator<<(std::ostream& _out, EdgeNames const& _edgeNames)
-{
-	for (auto const& [from, to]: _edgeNames)
-		_out << "    " << from << " -> " << to << std::endl;
-	return _out;
-}
-
-std::ostream& operator<<(std::ostream& _out, std::set<std::string> const& _set)
-{
-	_out << "{" << (_set | ranges::views::join(", ") | ranges::to<std::string>()) << "}";
-	return _out;
-}
-
-std::ostream& operator<<(std::ostream& _out, std::map<std::string, EdgeNames> const& _edgeSets)
-{
-	// Extra newline for error report readability. Otherwise the first line does not start at the first column.
-	_out << std::endl;
-
-	for (auto const &[contractName, edges]: _edgeSets)
-	{
-		_out << contractName << ":" << std::endl;
-		_out << edges;
-	}
-	return _out;
-}
-
-std::ostream& operator<<(std::ostream& _out, std::map<std::string, std::set<std::string>> const& _map)
-{
-	// Extra newline for error report readability. Otherwise the first line does not start at the first column.
-	_out << std::endl;
-
-	for (auto const &[key, value]: _map)
-		_out << key << ": " << value << std::endl;
-	return _out;
-}
-
-} // namespace
-
-namespace boost::test_tools::tt_detail
-{
-
-// Boost won't find the << operator unless we put it in the std namespace which is illegal.
-// The recommended solution is to overload print_log_value<> struct and make it use our operator.
-
-template<>
-struct print_log_value<EdgeNames>
-{
-	void operator()(std::ostream& _output, EdgeNames const& _edgeNames) { ::operator<<(_output, _edgeNames); }
-};
-
-template<>
-struct print_log_value<std::set<std::string>>
-{
-	void operator()(std::ostream& _output, std::set<std::string> const& _set) { ::operator<<(_output, _set); }
-};
-
-template<>
-struct print_log_value<std::map<std::string, EdgeNames>>
-{
-	void operator()(std::ostream& _output, std::map<std::string, EdgeNames> const& _edgeSets) { ::operator<<(_output, _edgeSets); }
-};
-
-template<>
-struct print_log_value<std::map<std::string, std::set<std::string>>>
-{
-	void operator()(std::ostream& _output, std::map<std::string, std::set<std::string>> const& _map) { ::operator<<(_output, _map); }
-};
-
-} // namespace boost::test_tools::tt_detail
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(FunctionCallGraphTest)
-
-BOOST_AUTO_TEST_CASE(only_definitions)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() {}
-
-		library L {
-			function ext() external {}
-			function pub() public {}
-			function inr() internal {}
-			function prv() private {}
-		}
-
-		contract C {
-			function ext() external {}
-			function pub() public {}
-			function inr() internal {}
-			function prv() private {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-			{"Entry", "function C.pub()"},
-		}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-			{"Entry", "function L.pub()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(ordinary_calls)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() {}
-
-		library L {
-			function ext() external { pub(); inr(); }
-			function pub() public { inr(); }
-			function inr() internal { prv(); }
-			function prv() private { free(); free(); }
-		}
-
-		contract C {
-			function ext() external { pub(); }
-			function pub() public { inr(); prv(); free(); }
-			function inr() internal { prv(); L.inr(); }
-			function prv() private { free(); free(); }
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-			{"Entry", "function C.pub()"},
-			{"function C.ext()", "function C.pub()"},
-			{"function C.pub()", "function C.inr()"},
-			{"function C.pub()", "function C.prv()"},
-			{"function C.pub()", "function free()"},
-			{"function C.inr()", "function C.prv()"},
-			{"function C.inr()", "function L.inr()"},
-			{"function C.prv()", "function free()"},
-			{"function L.inr()", "function L.prv()"},
-			{"function L.prv()", "function free()"},
-		}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-			{"Entry", "function L.pub()"},
-			{"function L.ext()", "function L.pub()"},
-			{"function L.ext()", "function L.inr()"},
-			{"function L.pub()", "function L.inr()"},
-			{"function L.inr()", "function L.prv()"},
-			{"function L.prv()", "function free()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(call_chains_through_externals)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		library L {
-			function ext() external { C(address(0x0)).ext(); }
-			function pub() public {}
-			function inr() internal {}
-			function prv() private {}
-		}
-
-		contract C {
-			function ext() external {}
-			function pub() public {}
-			function inr() internal {}
-			function prv() private {}
-
-			function ext2() external { this.ext(); this.pub(); L.ext(); L.pub(); }
-			function pub2() public { this.ext(); this.pub(); L.ext(); L.pub(); }
-			function pub3() public { C(address(0x0)).ext(); }
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-			{"Entry", "function C.ext2()"},
-			{"Entry", "function C.pub()"},
-			{"Entry", "function C.pub2()"},
-			{"Entry", "function C.pub3()"},
-		}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-			{"Entry", "function L.pub()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(calls_from_constructors)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() returns (uint) {}
-
-		library L {
-			function ext() external {}
-		}
-
-		contract C {
-			constructor() { this.ext(); inr(); L.ext(); free(); }
-
-			function ext() external {}
-			function inr() internal {}
-		}
-
-		contract D {
-			uint a = this.ext();
-			uint b = inr();
-			uint c = free();
-
-			function ext() external returns (uint) {}
-			function inr() internal returns (uint) {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {
-			{"Entry", "constructor of C"},
-			{"constructor of C", "function C.inr()"},
-			{"constructor of C", "function free()"},
-		}},
-		{"D", {
-			{"Entry", "function D.inr()"},
-			{"Entry", "function free()"},
-		}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-		}},
-		{"D", {
-			{"Entry", "function D.ext()"},
-		}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(calls_to_constructors)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() { new D(); }
-
-		library L {
-			function ext() external { new C(); new D(); inr(); }
-			function inr() internal { new C(); new D(); free(); }
-		}
-
-		contract C {
-			constructor() { new D(); }
-
-			function ext() external { new D(); inr(); }
-			function inr() internal { new D(); free(); }
-		}
-
-		contract D {}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {
-			{"Entry", "constructor of C"},
-		}},
-		{"D", {}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-			{"function C.ext()", "function C.inr()"},
-			{"function C.inr()", "function free()"},
-		}},
-		{"D", {}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-			{"function L.ext()", "function L.inr()"},
-			{"function L.inr()", "function free()"},
-		}},
-	};
-
-	std::map<std::string, std::set<std::string>> expectedCreatedContractsAtCreation = {
-		{"C", {"D"}},
-	};
-	std::map<std::string, std::set<std::string>> expectedCreatedContractsAfterDeployment = {
-		{"C", {"D"}},
-		{"L", {"C", "D"}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
-}
-
-BOOST_AUTO_TEST_CASE(inherited_constructors)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() {}
-
-		library L {
-			function ext() external { inr(); }
-			function inr() internal { free(); }
-		}
-
-		contract C {
-			constructor() { inrC(); free(); }
-
-			function extC() external returns (uint) { inrC(); }
-			function inrC() internal returns (uint) { free(); }
-		}
-
-		contract D {
-			constructor() { L.ext(); }
-		}
-
-		contract E is C {
-			uint e2 = this.extE();
-			uint i2 = inrE();
-
-			function extE() external returns (uint) { inrE(); }
-			function inrE() internal returns (uint) { free(); }
-		}
-
-		contract F is C, D(), E {
-			uint e3 = this.extF();
-			uint i3 = inrF();
-
-			constructor() E() C() {}
-
-			function extF() external returns (uint) { inrF(); }
-			function inrF() internal returns (uint) { free(); }
-		}
-
-		contract G is E() {
-			function extG() external returns (uint) { new F(); }
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {
-			{"Entry", "constructor of C"},
-			{"constructor of C", "function C.inrC()"},
-			{"constructor of C", "function free()"},
-			{"function C.inrC()", "function free()"},
-		}},
-		{"D", {
-			{"Entry", "constructor of D"},
-		}},
-		{"E", {
-			{"Entry", "constructor of C"},
-			{"Entry", "function E.inrE()"},
-			{"constructor of C", "function C.inrC()"},
-			{"constructor of C", "function free()"},
-			{"function C.inrC()", "function free()"},
-			{"function E.inrE()", "function free()"},
-		}},
-		{"F", {
-			{"Entry", "constructor of C"},
-			{"Entry", "constructor of D"},
-			{"Entry", "constructor of F"},
-			{"Entry", "function E.inrE()"},
-			{"Entry", "function F.inrF()"},
-			{"constructor of C", "function C.inrC()"},
-			{"constructor of C", "function free()"},
-			{"function C.inrC()", "function free()"},
-			{"function E.inrE()", "function free()"},
-			{"function F.inrF()", "function free()"},
-		}},
-		{"G", {
-			{"Entry", "constructor of C"},
-			{"Entry", "function E.inrE()"},
-			{"constructor of C", "function C.inrC()"},
-			{"constructor of C", "function free()"},
-			{"function C.inrC()", "function free()"},
-			{"function E.inrE()", "function free()"},
-		}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.extC()"},
-			{"function C.extC()", "function C.inrC()"},
-			{"function C.inrC()", "function free()"},
-		}},
-		{"D", {}},
-		{"E", {
-			{"Entry", "function C.extC()"},
-			{"Entry", "function E.extE()"},
-			{"function C.extC()", "function C.inrC()"},
-			{"function E.extE()", "function E.inrE()"},
-			{"function C.inrC()", "function free()"},
-			{"function E.inrE()", "function free()"},
-		}},
-		{"F", {
-			{"Entry", "function C.extC()"},
-			{"Entry", "function E.extE()"},
-			{"Entry", "function F.extF()"},
-			{"function C.extC()", "function C.inrC()"},
-			{"function E.extE()", "function E.inrE()"},
-			{"function F.extF()", "function F.inrF()"},
-			{"function C.inrC()", "function free()"},
-			{"function E.inrE()", "function free()"},
-			{"function F.inrF()", "function free()"},
-		}},
-		{"G", {
-			{"Entry", "function C.extC()"},
-			{"Entry", "function E.extE()"},
-			{"Entry", "function G.extG()"},
-			{"function C.extC()", "function C.inrC()"},
-			{"function E.extE()", "function E.inrE()"},
-			{"function C.inrC()", "function free()"},
-			{"function E.inrE()", "function free()"},
-		}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-			{"function L.ext()", "function L.inr()"},
-			{"function L.inr()", "function free()"},
-		}},
-	};
-
-	std::map<std::string, std::set<std::string>> expectedCreatedContractsAtCreation = {};
-	std::map<std::string, std::set<std::string>> expectedCreatedContractsAfterDeployment = {
-		{"G", {"F"}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
-}
-
-BOOST_AUTO_TEST_CASE(inheritance_specifiers)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function fD() returns (uint) {}
-		function fE() returns (uint) {}
-		function fFD() returns (uint) {}
-		function fFE() returns (uint) {}
-		function fG() returns (uint) {}
-
-		function fVarC() returns (uint) {}
-		function fVarD() returns (uint) {}
-		function fVarE() returns (uint) {}
-		function fVarF() returns (uint) {}
-
-		contract C {
-			uint c = fVarC();
-
-			constructor (uint) {}
-		}
-
-		contract D is C(fD()) {
-			uint d = fVarD();
-
-			constructor (uint) {}
-		}
-
-		abstract contract E is C {
-			uint e = fVarE();
-
-			constructor (uint) {}
-		}
-
-		contract F is D(fFD()), E {
-			uint f = fVarF();
-
-			constructor (uint) E(fFE()) {}
-		}
-
-		contract G is D(fG()), E(fG()) {}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {
-			{"Entry", "constructor of C"},
-			{"Entry", "function fVarC()"},
-		}},
-		{"D", {
-			{"Entry", "constructor of C"},
-			{"Entry", "constructor of D"},
-			{"Entry", "function fVarC()"},
-			{"Entry", "function fVarD()"},
-			{"constructor of D", "function fD()"},
-		}},
-		{"E", {
-			{"Entry", "constructor of C"},
-			{"Entry", "constructor of E"},
-			{"Entry", "function fVarC()"},
-			{"Entry", "function fVarE()"},
-		}},
-		{"F", {
-			{"Entry", "constructor of C"},
-			{"Entry", "constructor of D"},
-			{"Entry", "constructor of E"},
-			{"Entry", "constructor of F"},
-			{"Entry", "function fVarC()"},
-			{"Entry", "function fVarD()"},
-			{"Entry", "function fVarE()"},
-			{"Entry", "function fVarF()"},
-			{"constructor of D", "function fD()"},
-			{"constructor of F", "function fFD()"},
-			{"constructor of F", "function fFE()"},
-		}},
-		{"G", {
-			{"Entry", "constructor of C"},
-			{"Entry", "constructor of D"},
-			{"Entry", "constructor of E"},
-			// G, unlike F, has no constructor so fG() gets an edge from Entry.
-			{"Entry", "function fG()"},
-			{"Entry", "function fVarC()"},
-			{"Entry", "function fVarD()"},
-			{"Entry", "function fVarE()"},
-			{"constructor of D", "function fD()"},
-		}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"E", {}},
-		{"F", {}},
-		{"G", {}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(inherited_functions_virtual_and_super)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			function f() internal {}
-			function g() internal virtual {}
-			function h() internal virtual {}
-
-			function ext() external virtual {}
-		}
-
-		contract D {
-			function h() internal virtual {}
-
-			function ext() external virtual {}
-		}
-
-		contract E is C, D {
-			function g() internal override {}
-			function h() internal override(C, D) {}
-			function i() internal {}
-
-			function ext() external override(C, D) {}
-
-			function callF() external { f(); }
-			function callG() external { g(); }
-			function callH() external { h(); }
-			function callI() external { i(); }
-			function callCF() external { C.f(); }
-			function callCG() external { C.g(); }
-			function callCH() external { C.h(); }
-			function callDH() external { D.h(); }
-			function callEI() external { E.i(); }
-			function callSuperF() external { super.f(); }
-			function callSuperG() external { super.g(); }
-			function callSuperH() external { super.h(); }
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"E", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-		}},
-		{"D", {
-			{"Entry", "function D.ext()"},
-		}},
-		{"E", {
-			{"Entry", "function E.callF()"},
-			{"Entry", "function E.callG()"},
-			{"Entry", "function E.callH()"},
-			{"Entry", "function E.callI()"},
-			{"Entry", "function E.callCF()"},
-			{"Entry", "function E.callCG()"},
-			{"Entry", "function E.callCH()"},
-			{"Entry", "function E.callDH()"},
-			{"Entry", "function E.callEI()"},
-			{"Entry", "function E.callSuperF()"},
-			{"Entry", "function E.callSuperG()"},
-			{"Entry", "function E.callSuperH()"},
-			{"Entry", "function E.ext()"},
-			{"function E.callF()", "function C.f()"},
-			{"function E.callG()", "function E.g()"},
-			{"function E.callH()", "function E.h()"},
-			{"function E.callI()", "function E.i()"},
-			{"function E.callCF()", "function C.f()"},
-			{"function E.callCG()", "function C.g()"},
-			{"function E.callCH()", "function C.h()"},
-			{"function E.callDH()", "function D.h()"},
-			{"function E.callEI()", "function E.i()"},
-			{"function E.callSuperF()", "function C.f()"},
-			{"function E.callSuperG()", "function C.g()"},
-			{"function E.callSuperH()", "function D.h()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(overloaded_functions)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		enum E {E1, E2, E3}
-
-		function free() {}
-		function free(uint) {}
-		function free(bytes memory) {}
-		function free(E) {}
-
-		contract C {
-			function f(E) internal {}
-			function f(bool) external {}
-		}
-
-		contract D is C {
-			function ext1() external { free(); free(123); free("123"); }
-			function ext2() external { f(); f(123); f("123"); }
-			function ext3() external { free(E.E2); f(E.E2); }
-			function ext4() external { this.f(false); }
-
-			function f() internal {}
-			function f(uint) internal {}
-			function f(bytes memory) internal {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.f(bool)"},
-		}},
-		{"D", {
-			{"Entry", "function C.f(bool)"},
-			{"Entry", "function D.ext1()"},
-			{"Entry", "function D.ext2()"},
-			{"Entry", "function D.ext3()"},
-			{"Entry", "function D.ext4()"},
-			{"function D.ext1()", "function free()"},
-			{"function D.ext1()", "function free(uint256)"},
-			{"function D.ext1()", "function free(bytes)"},
-			{"function D.ext2()", "function D.f()"},
-			{"function D.ext2()", "function D.f(uint256)"},
-			{"function D.ext2()", "function D.f(bytes)"},
-			{"function D.ext3()", "function free(enum E)"},
-			{"function D.ext3()", "function C.f(enum E)"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(modifiers)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		library L {
-			modifier m() { g(); _; }
-
-			function f() m internal {}
-			function g() internal {}
-		}
-
-		contract C {
-			modifier m1() virtual { _; }
-
-			function q() m1 internal virtual { L.f(); }
-		}
-
-		contract D is C {
-			modifier m2() { q(); _; new C(); }
-
-			function p() m2 internal { C.q(); }
-			function q() m2 internal override virtual {}
-		}
-
-		contract E is D {
-			modifier m1() override { _; }
-			modifier m3() { p(); _; }
-
-			constructor() D() m1 E.m3 {}
-			function ext() external m1 E.m3 { inr(); }
-			function inr() internal m1 E.m3 { L.f(); }
-
-			function q() internal override {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"L", {}},
-		{"E", {
-			{"Entry", "constructor of E"},
-			{"constructor of E", "modifier E.m1"},
-			{"constructor of E", "modifier E.m3"},
-			{"function C.q()", "modifier E.m1"},
-			{"function C.q()", "function L.f()"},
-			{"function D.p()", "modifier D.m2"},
-			{"function D.p()", "function C.q()"},
-			{"function L.f()", "modifier L.m"},
-			{"modifier L.m", "function L.g()"},
-			{"modifier D.m2", "function E.q()"},
-			{"modifier E.m3", "function D.p()"},
-		}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"L", {}},
-		{"E", {
-			{"Entry", "function E.ext()"},
-			{"function C.q()", "modifier E.m1"},
-			{"function C.q()", "function L.f()"},
-			{"function D.p()", "modifier D.m2"},
-			{"function D.p()", "function C.q()"},
-			{"function L.f()", "modifier L.m"},
-			{"function E.ext()", "function E.inr()"},
-			{"function E.ext()", "modifier E.m1"},
-			{"function E.ext()", "modifier E.m3"},
-			{"function E.inr()", "modifier E.m1"},
-			{"function E.inr()", "modifier E.m3"},
-			{"function E.inr()", "function L.f()"},
-			{"modifier L.m", "function L.g()"},
-			{"modifier D.m2", "function E.q()"},
-			{"modifier E.m3", "function D.p()"},
-		}},
-	};
-
-	std::map<std::string, std::set<std::string>> expectedCreatedContractsAtCreation = {{"E", {"C"}}};
-	std::map<std::string, std::set<std::string>> expectedCreatedContractsAfterDeployment = {{"E", {"C"}}};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
-}
-
-BOOST_AUTO_TEST_CASE(events)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() { emit L.Ev(); }
-
-		library L {
-			event Ev();
-			event Ev(bytes4, string indexed);
-
-			function ext() external { emit Ev(); }
-			function inr() internal { emit Ev(0x12345678, "a"); emit L.Ev(); }
-		}
-
-		contract C {
-			event EvC(uint) anonymous;
-
-			modifier m() { emit EvC(1); _; }
-		}
-
-		contract D is C {
-			event EvD1(uint);
-			event EvD2(uint);
-
-			function ext() m external { emit D.EvD1(1); emit EvC(f()); inr(); }
-			function inr() m internal { emit EvD1(1); emit C.EvC(f()); L.inr(); free(); EvD2; }
-
-			function f() internal returns (uint) {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {}},
-		{"D", {
-			{"Entry", "function D.ext()"},
-			{"function D.ext()", "function D.inr()"},
-			{"function D.ext()", "modifier C.m"},
-			{"function D.ext()", "function D.f()"},
-			{"function D.inr()", "function L.inr()"},
-			{"function D.inr()", "function free()"},
-			{"function D.inr()", "modifier C.m"},
-			{"function D.inr()", "function D.f()"},
-		}},
-		{"L", {
-			{"Entry", "function L.ext()"},
-		}},
-	};
-
-	std::map<std::string, std::set<std::string>> expectedCreationEvents = {};
-	std::map<std::string, std::set<std::string>> expectedDeployedEvents = {
-		{"D", {
-			"event D.EvD1(uint256)",
-			"event C.EvC(uint256)",
-			"event L.Ev(bytes4,string)",
-			"event L.Ev()",
-		}},
-		{"L", {
-			"event L.Ev()",
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, {}, expectedCreationEvents);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, {}, expectedDeployedEvents);
-}
-
-BOOST_AUTO_TEST_CASE(cycles)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free1() { free1(); }
-		function free2() { free3(); }
-		function free3() { free2(); }
-
-		library L {
-			function inr1() internal { inr1(); }
-			function inr2() internal { inr3(); }
-			function inr3() internal { inr2(); }
-		}
-
-		contract C {
-			function virt() internal virtual { virt(); }
-		}
-
-		contract D is C {
-			function init() external { this.ext1(); inr1(); inr2(); L.inr1(); L.inr2(); free1(); free2(); virt(); }
-
-			function ext1() external { this.ext1(); }
-			function ext2() external { this.ext3(); }
-			function ext3() external { this.ext2(); }
-			function inr1() internal { inr1(); }
-			function inr2() internal { inr3(); }
-			function inr3() internal { inr2(); }
-			function inr3(uint) internal {}
-
-			function virt() internal override { C.virt(); }
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"L", {}},
-		{"C", {}},
-		{"D", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"L", {}},
-		{"C", {}},
-		{"D", {
-			{"Entry", "function D.init()"},
-			{"Entry", "function D.ext1()"},
-			{"Entry", "function D.ext2()"},
-			{"Entry", "function D.ext3()"},
-			{"function D.init()", "function D.inr1()"},
-			{"function D.init()", "function D.inr2()"},
-			{"function D.init()", "function D.virt()"},
-			{"function D.init()", "function L.inr1()"},
-			{"function D.init()", "function L.inr2()"},
-			{"function D.init()", "function free1()"},
-			{"function D.init()", "function free2()"},
-			{"function D.inr1()", "function D.inr1()"},
-			{"function D.inr2()", "function D.inr3()"},
-			{"function D.inr3()", "function D.inr2()"},
-			{"function D.virt()", "function C.virt()"},
-			{"function C.virt()", "function D.virt()"},
-			{"function L.inr1()", "function L.inr1()"},
-			{"function L.inr2()", "function L.inr3()"},
-			{"function L.inr3()", "function L.inr2()"},
-			{"function free1()", "function free1()"},
-			{"function free2()", "function free3()"},
-			{"function free3()", "function free2()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(interfaces_and_abstract_contracts)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		interface I {
-			event Ev(uint);
-
-			function ext1() external;
-			function ext2() external;
-		}
-
-		interface J is I {
-			function ext2() external override;
-			function ext3() external;
-		}
-
-		abstract contract C is J {
-			modifier m() virtual;
-
-			function ext3() external override virtual;
-			function ext4() external { inr2();}
-			function inr1() internal virtual;
-			function inr2() m internal { inr1(); this.ext1(); this.ext2(); this.ext3(); }
-		}
-
-		contract D is C {
-			function ext1() public override { emit I.Ev(1); inr1(); inr2(); }
-			function ext2() external override { I(this).ext1(); }
-			function ext3() external override {}
-			function inr1() internal override {}
-
-			modifier m() override { _; }
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"I", {}},
-		{"J", {}},
-		{"C", {}},
-		{"D", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"I", {
-			{"Entry", "function I.ext1()"},
-			{"Entry", "function I.ext2()"},
-		}},
-		{"J", {
-			{"Entry", "function I.ext1()"},
-			{"Entry", "function J.ext2()"},
-			{"Entry", "function J.ext3()"},
-		}},
-		{"C", {
-			{"Entry", "function I.ext1()"},
-			{"Entry", "function J.ext2()"},
-			{"Entry", "function C.ext3()"},
-			{"Entry", "function C.ext4()"},
-			{"function C.ext4()", "function C.inr2()"},
-			{"function C.inr2()", "function C.inr1()"},
-			{"function C.inr2()", "modifier C.m"},
-		}},
-		{"D", {
-			{"Entry", "function D.ext1()"},
-			{"Entry", "function D.ext2()"},
-			{"Entry", "function D.ext3()"},
-			{"Entry", "function C.ext4()"},
-			{"function C.ext4()", "function C.inr2()"},
-			{"function C.inr2()", "function D.inr1()"},
-			{"function C.inr2()", "modifier D.m"},
-			{"function D.ext1()", "function D.inr1()"},
-			{"function D.ext1()", "function C.inr2()"},
-		}},
-	};
-
-	std::map<std::string, std::set<std::string>> expectedCreationEvents = {};
-	std::map<std::string, std::set<std::string>> expectedDeployedEvents = {
-		{"D", {
-			"event I.Ev(uint256)",
-		}},
-	};
-
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, {}, expectedCreationEvents);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, {}, expectedDeployedEvents);
-}
-
-BOOST_AUTO_TEST_CASE(indirect_calls)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free1() {}
-		function free2() {}
-		function free3() {}
-
-		library L {
-			function ext() external {}
-			function inr1() internal {}
-			function inr2() internal {}
-			function inr3() internal {}
-
-			function access() public {
-				free1;
-				inr1;
-				L.ext;
-			}
-
-			function expression() public {
-				(free2)();
-				(inr2)();
-			}
-		}
-
-		contract C {
-			function ext1() external {}
-			function ext2() external {}
-			function ext3() external {}
-			function inr1() internal {}
-			function inr2() internal {}
-			function inr3() internal {}
-
-			function access() public {
-				this.ext1;
-				inr1;
-				free1;
-				L.inr1;
-				L.ext;
-			}
-
-			function expression() public {
-				(this.ext2)();
-				(inr2)();
-				(free2)();
-				(L.inr2)();
-				(L.ext)();
-			}
-		}
-
-		contract D is C {
-			constructor() {
-				access();
-				expression();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"L", {}},
-		{"C", {}},
-		{"D", {
-			{"InternalDispatch", "function L.inr2()"},
-			{"InternalDispatch", "function C.inr1()"},
-			{"InternalDispatch", "function C.inr2()"},
-			{"InternalDispatch", "function free1()"},
-			{"InternalDispatch", "function free2()"},
-			{"InternalDispatch", "function L.inr1()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"Entry", "constructor of D"},
-			{"constructor of D", "function C.access()"},
-			{"constructor of D", "function C.expression()"},
-			{"function C.expression()", "InternalDispatch"},
-		}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"L", {
-			{"InternalDispatch", "function L.inr1()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"InternalDispatch", "function free1()"},
-			{"InternalDispatch", "function free2()"},
-			{"Entry", "function L.ext()"},
-			{"Entry", "function L.access()"},
-			{"Entry", "function L.expression()"},
-			{"function L.expression()", "InternalDispatch"},
-		}},
-		{"C", {
-			{"InternalDispatch", "function C.inr1()"},
-			{"InternalDispatch", "function C.inr2()"},
-			{"InternalDispatch", "function free1()"},
-			{"InternalDispatch", "function free2()"},
-			{"InternalDispatch", "function L.inr1()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"Entry", "function C.ext1()"},
-			{"Entry", "function C.ext2()"},
-			{"Entry", "function C.ext3()"},
-			{"Entry", "function C.access()"},
-			{"Entry", "function C.expression()"},
-			{"function C.expression()", "InternalDispatch"},
-		}},
-		{"D", {
-			{"InternalDispatch", "function L.inr2()"},
-			{"InternalDispatch", "function C.inr1()"},
-			{"InternalDispatch", "function C.inr2()"},
-			{"InternalDispatch", "function free1()"},
-			{"InternalDispatch", "function free2()"},
-			{"InternalDispatch", "function L.inr1()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"Entry", "function C.ext1()"},
-			{"Entry", "function C.ext2()"},
-			{"Entry", "function C.ext3()"},
-			{"Entry", "function C.access()"},
-			{"Entry", "function C.expression()"},
-			{"function C.expression()", "InternalDispatch"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(calls_via_pointers)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free1() {}
-		function free2() {}
-		function free3() {}
-
-		library L {
-			function inr1() internal {}
-			function inr2() internal {}
-			function inr3() internal {}
-
-			function callPtrs(
-				function () external e,
-				function () internal i,
-				function () internal f,
-				function () internal l
-			) internal
-			{
-				e();
-				i();
-				f();
-				l();
-			}
-		}
-
-		contract C {
-			function ext1() external {}
-			function ext2() external {}
-			function ext3() external {}
-			function inr1() internal {}
-			function inr2() internal {}
-			function inr3() internal {}
-
-			function getPtrs2() internal returns (
-				function () external,
-				function () internal,
-				function () internal,
-				function () internal
-			)
-			{
-				return (this.ext2, inr2, free2, L.inr2);
-			}
-
-			function testLocalVars() public {
-				(function () external e, function () i, function () f, function () l) = getPtrs2();
-				L.callPtrs(e, i, f, l);
-			}
-		}
-
-		contract D is C {
-			function () external m_e = this.ext1;
-			function () internal m_i = inr1;
-			function () internal m_f = free1;
-			function () internal m_l = L.inr1;
-			function () internal immutable m_imm = inr1;
-
-			function callStatePtrs() internal {
-				m_e();
-				m_i();
-				m_f();
-				m_l();
-			}
-
-			function updateStatePtrs(
-				function () external e,
-				function () internal i,
-				function () internal f,
-				function () internal l
-			) internal
-			{
-				m_e = e;
-				m_i = i;
-				m_f = f;
-				m_l = l;
-			}
-
-			function testStateVars() public {
-				(function () external e, function () i, function () f, function () l) = getPtrs2();
-				updateStatePtrs(e, i, f, l);
-				callStatePtrs();
-			}
-
-			function testImmutablePtr() public {
-				m_imm();
-			}
-
-			constructor() {
-				testStateVars();
-				testLocalVars();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"L", {}},
-		{"C", {}},
-		{"D", {
-			{"InternalDispatch", "function C.inr1()"},
-			{"InternalDispatch", "function C.inr2()"},
-			{"InternalDispatch", "function L.inr1()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"InternalDispatch", "function free1()"},
-			{"InternalDispatch", "function free2()"},
-			{"Entry", "constructor of D"},
-			{"constructor of D", "function C.testLocalVars()"},
-			{"constructor of D", "function D.testStateVars()"},
-			{"function C.testLocalVars()", "function C.getPtrs2()"},
-			{"function C.testLocalVars()", "function L.callPtrs(function () external,function (),function (),function ())"},
-			{"function D.testStateVars()", "function C.getPtrs2()"},
-			{"function D.testStateVars()", "function D.updateStatePtrs(function () external,function (),function (),function ())"},
-			{"function D.testStateVars()", "function D.callStatePtrs()"},
-			{"function D.callStatePtrs()", "InternalDispatch"},
-			{"function L.callPtrs(function () external,function (),function (),function ())", "InternalDispatch"},
-		}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"L", {}},
-		{"C", {
-			{"InternalDispatch", "function C.inr2()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"InternalDispatch", "function free2()"},
-			{"Entry", "function C.ext1()"},
-			{"Entry", "function C.ext2()"},
-			{"Entry", "function C.ext3()"},
-			{"Entry", "function C.testLocalVars()"},
-			{"function C.testLocalVars()", "function C.getPtrs2()"},
-			{"function C.testLocalVars()", "function L.callPtrs(function () external,function (),function (),function ())"},
-			{"function L.callPtrs(function () external,function (),function (),function ())", "InternalDispatch"},
-		}},
-		{"D", {
-			{"InternalDispatch", "function C.inr1()"},
-			{"InternalDispatch", "function C.inr2()"},
-			{"InternalDispatch", "function L.inr1()"},
-			{"InternalDispatch", "function L.inr2()"},
-			{"InternalDispatch", "function free1()"},
-			{"InternalDispatch", "function free2()"},
-			{"Entry", "function C.ext1()"},
-			{"Entry", "function C.ext2()"},
-			{"Entry", "function C.ext3()"},
-			{"Entry", "function C.testLocalVars()"},
-			{"Entry", "function D.testStateVars()"},
-			{"Entry", "function D.testImmutablePtr()"},
-			{"function C.testLocalVars()", "function C.getPtrs2()"},
-			{"function C.testLocalVars()", "function L.callPtrs(function () external,function (),function (),function ())"},
-			{"function D.testStateVars()", "function C.getPtrs2()"},
-			{"function D.testStateVars()", "function D.updateStatePtrs(function () external,function (),function (),function ())"},
-			{"function D.testStateVars()", "function D.callStatePtrs()"},
-			{"function D.testImmutablePtr()", "InternalDispatch"},
-			{"function D.callStatePtrs()", "InternalDispatch"},
-			{"function L.callPtrs(function () external,function (),function (),function ())", "InternalDispatch"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(pointer_to_overridden_function)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			function f() internal virtual {}
-		}
-
-		contract D is C {
-			function f() internal override {}
-
-			function getF() internal returns (function ()) {
-				return C.f;
-			}
-
-			function getSuperF() internal returns (function ()) {
-				return super.f;
-			}
-
-			function test1() public {
-				getF()();
-			}
-
-			function test2() public {
-				getSuperF()();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {}},
-		{"D", {
-			{"InternalDispatch", "function C.f()"},
-			{"Entry", "function D.test1()"},
-			{"Entry", "function D.test2()"},
-			{"function D.test1()", "function D.getF()"},
-			{"function D.test1()", "InternalDispatch"},
-			{"function D.test2()", "function D.getSuperF()"},
-			{"function D.test2()", "InternalDispatch"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(pointer_to_nonexistent_function)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		interface I {
-			function f() external;
-		}
-
-		abstract contract C is I {
-			function g() internal virtual;
-
-			function getF() internal returns (function () external) { return this.f; }
-			function getG() internal returns (function () internal) { return g; }
-
-			function testInterface() public {
-				getF()();
-				getG()();
-			}
-
-			function testBadPtr() public {
-				function () ptr;
-				ptr();
-			}
-		}
-
-		contract D is C {
-			function f() public override {}
-			function g() internal override {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"I", {}},
-		{"C", {}},
-		{"D", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"I", {
-			{"Entry", "function I.f()"},
-			  }},
-		{"C", {
-			{"InternalDispatch", "function C.g()"},
-			{"Entry", "function C.testInterface()"},
-			{"Entry", "function C.testBadPtr()"},
-			{"Entry", "function I.f()"},
-			{"function C.testInterface()", "function C.getF()"},
-			{"function C.testInterface()", "function C.getG()"},
-			{"function C.testInterface()", "InternalDispatch"},
-			{"function C.testBadPtr()", "InternalDispatch"},
-		}},
-		{"D", {
-			{"InternalDispatch", "function D.g()"},
-			{"Entry", "function C.testInterface()"},
-			{"Entry", "function C.testBadPtr()"},
-			{"Entry", "function D.f()"},
-			{"function C.testInterface()", "function C.getF()"},
-			{"function C.testInterface()", "function C.getG()"},
-			{"function C.testInterface()", "InternalDispatch"},
-			{"function C.testBadPtr()", "InternalDispatch"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(function_self_reference)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			function f() public returns (bool ret) {
-				return f == f;
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.f()"},
-			{"InternalDispatch", "function C.f()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(pointer_cycle)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			function () ptr = f;
-
-			function f() internal { ptr(); }
-
-			function test() public {
-				ptr();
-			}
-		}
-	)"s);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {
-			{"InternalDispatch", "function C.f()"},
-			{"function C.f()", "InternalDispatch"},
-		}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"InternalDispatch", "function C.f()"},
-			{"Entry", "function C.test()"},
-			{"function C.test()", "InternalDispatch"},
-			{"function C.f()", "InternalDispatch"},
-		}},
-	};
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(using_for)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		struct S {
-			uint x;
-		}
-
-		library L {
-			function ext(S memory _s) external {}
-			function inr(S memory _s) internal {}
-		}
-
-		contract C {
-			using L for S;
-
-			function pub() public {
-				S memory s = S(42);
-
-				s.ext();
-				s.inr();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"L", {}},
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"L", {
-			{"Entry", "function L.ext(struct S)"},
-		}},
-		{"C", {
-			{"Entry", "function C.pub()"},
-			{"function C.pub()", "function L.inr(struct S)"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(user_defined_binary_operator)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		type Int is int128;
-		using {add as +} for Int global;
-
-		function add(Int, Int) pure returns (Int) {
-			return Int.wrap(0);
-		}
-
-		contract C {
-			function pub() public {
-				Int.wrap(0) + Int.wrap(1);
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.pub()"},
-			{"function C.pub()", "function add(Int,Int)"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(user_defined_unary_operator)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		type Int is int128;
-		using {sub as -} for Int global;
-
-		function sub(Int) pure returns (Int) {
-			return Int.wrap(0);
-		}
-
-		contract C {
-			function pub() public {
-				-Int.wrap(1);
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.pub()"},
-			{"function C.pub()", "function sub(Int)"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(getters)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			uint public variable;
-			uint[][] public array;
-			mapping(bytes => bytes) public map;
-
-			function test() public {
-				this.variable();
-				this.array(1, 2);
-				this.map("value");
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {{"Entry", "function C.test()"}}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(fallback_and_receive)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			function ext() external {}
-			function inr() internal {}
-
-			fallback() external {
-				this.ext();
-				inr();
-			}
-
-			receive() external payable {
-				this.ext();
-				inr();
-			}
-		}
-
-		contract D {
-			fallback(bytes calldata) external returns (bytes memory) {}
-
-			function test() public {
-				(bool success, bytes memory result) = address(this).call("abc");
-			}
-		}
-
-		contract E is C {}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"E", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "function C.ext()"},
-			{"Entry", "receive of C"},
-			{"Entry", "fallback of C"},
-			{"fallback of C", "function C.inr()"},
-			{"receive of C", "function C.inr()"},
-		}},
-		{"D", {
-			{"Entry", "function D.test()"},
-			{"Entry", "fallback of D"},
-		}},
-		{"E", {
-			{"Entry", "function C.ext()"},
-			{"Entry", "fallback of C"},
-			{"Entry", "receive of C"},
-			{"fallback of C", "function C.inr()"},
-			{"receive of C", "function C.inr()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(virtual_fallback_and_receive)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		contract C {
-			fallback() external virtual {}
-			receive() external payable virtual {}
-		}
-
-		contract D is C {}
-
-		contract E is D {
-			fallback() external virtual override {}
-			receive() external payable virtual override {}
-		}
-
-		contract F is E {
-			fallback() external override {}
-			receive() external payable override {}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"C", {}},
-		{"D", {}},
-		{"E", {}},
-		{"F", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"C", {
-			{"Entry", "receive of C"},
-			{"Entry", "fallback of C"},
-		}},
-		{"D", {
-			{"Entry", "receive of C"},
-			{"Entry", "fallback of C"},
-		}},
-		{"E", {
-			{"Entry", "receive of E"},
-			{"Entry", "fallback of E"},
-		}},
-		{"F", {
-			{"Entry", "receive of F"},
-			{"Entry", "fallback of F"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(builtins)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		interface I {}
-
-		contract C {
-			function accessBuiltin() public payable {
-				abi.decode;
-				abi.encode;
-				abi.encodePacked;
-				abi.encodeWithSelector;
-				abi.encodeWithSignature;
-				block.basefee;
-				block.chainid;
-				block.coinbase;
-				block.difficulty;
-				block.prevrandao;
-				block.gaslimit;
-				block.number;
-				block.timestamp;
-				gasleft;
-				msg.data;
-				msg.sender;
-				msg.value;
-				tx.gasprice;
-				tx.origin;
-				blockhash;
-				keccak256;
-				sha256;
-				ripemd160;
-				ecrecover;
-				addmod;
-				mulmod;
-				this;
-				super;
-				selfdestruct;
-				address(0).balance;
-				address(0).code;
-				address(0).codehash;
-				payable(0).send;
-				payable(0).transfer;
-				address(0).call;
-				address(0).delegatecall;
-				address(0).staticcall;
-				type(C).name;
-				type(I).interfaceId;
-				type(uint).min;
-				type(uint).max;
-				assert;
-			}
-
-			function callBuiltin() public payable {
-				bytes memory data;
-
-				abi.decode(data, (uint));
-				abi.encode(0);
-				abi.encodePacked(data);
-				abi.encodeWithSelector(0x12345678);
-				abi.encodeWithSignature("abc");
-				gasleft();
-				blockhash(0);
-				keccak256(data);
-				sha256(data);
-				ripemd160(data);
-				ecrecover(0x0, 0, 0, 0);
-				addmod(1, 2, 3);
-				mulmod(1, 2, 3);
-				selfdestruct(payable(0));
-				payable(0).send(0);
-				payable(0).transfer(0);
-				address(0).call(data);
-				address(0).delegatecall(data);
-				address(0).staticcall(data);
-				assert(true);
-				require(true);
-				revert();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"I", {}},
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"I", {}},
-		{"C", {
-			{"Entry", "function C.accessBuiltin()"},
-			{"Entry", "function C.callBuiltin()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(conversions_and_struct_array_constructors)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		interface I {}
-
-		enum E {A, B, C}
-
-		struct S {
-			uint a;
-			E b;
-		}
-
-		contract C is I {
-			uint[] u;
-
-			function convert() public payable {
-				uint(0);
-				int(0);
-				bool(true);
-				bytes16(0);
-				payable(address(0));
-				E(0);
-				C(address(C(address(0))));
-				I(C(address(0)));
-
-				bytes memory b;
-				string(b);
-				bytes(b);
-			}
-
-			function create() public payable {
-				S(1, E.A);
-
-				uint[3] memory u3;
-				uint[3](u3);
-				uint[](new uint[](3));
-			}
-
-			function pushPop() public payable {
-				u.push();
-				u.push(1);
-				u.pop();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"I", {}},
-		{"C", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"I", {}},
-		{"C", {
-			{"Entry", "function C.convert()"},
-			{"Entry", "function C.create()"},
-			{"Entry", "function C.pushPop()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(immutable_initialization)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() pure returns (uint) { return 42; }
-
-		contract Base {
-			function ext() external pure returns (uint) { free(); }
-			function inr() internal pure returns (uint) { free(); }
-		}
-
-		contract C is Base {
-			uint immutable extImmutable = this.ext();
-			uint immutable inrImmutable = inr();
-		}
-
-		contract D is Base {
-			uint immutable extImmutable;
-			uint immutable inrImmutable;
-
-			constructor () {
-				extImmutable = this.ext();
-				inrImmutable = inr();
-			}
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"Base", {}},
-		{"C", {
-			{"Entry", "function Base.inr()"},
-			{"function Base.inr()", "function free()"},
-		}},
-		{"D", {
-			{"Entry", "constructor of D"},
-			{"constructor of D", "function Base.inr()"},
-			{"function Base.inr()", "function free()"},
-		}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"Base", {
-			{"Entry", "function Base.ext()"},
-			{"function Base.ext()", "function free()"},
-		}},
-		{"C", {
-			{"Entry", "function Base.ext()"},
-			{"function Base.ext()", "function free()"},
-		}},
-		{"D", {
-			{"Entry", "function Base.ext()"},
-			{"function Base.ext()", "function free()"},
-		}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_CASE(function_selector_access)
-{
-	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
-		function free() pure {}
-
-		bytes4 constant extFreeConst = Base.ext.selector;
-		bytes4 constant pubFreeConst = Base.pub.selector;
-
-		contract Base {
-			function ext() external pure { free(); extFreeConst; }
-			function pub() public pure { free(); pubFreeConst; }
-		}
-
-		contract C is Base {
-			bytes4 constant extConst = Base.ext.selector;
-			bytes4 constant pubConst = Base.pub.selector;
-		}
-
-		contract D is Base {
-			bytes4 immutable extImmutable = Base.ext.selector;
-			bytes4 immutable pubImmutable = Base.pub.selector;
-		}
-
-		contract E is Base {
-			bytes4 extVar = Base.ext.selector;
-			bytes4 pubVar = Base.pub.selector;
-		}
-
-		contract F is Base {
-			function f() public pure returns (bytes4, bytes4) {
-				return (Base.ext.selector, Base.pub.selector);
-			}
-		}
-
-		library L {
-			bytes4 constant extConst = Base.ext.selector;
-			bytes4 constant pubConst = Base.pub.selector;
-		}
-	)"s);
-	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
-
-	std::map<std::string, EdgeNames> expectedCreationEdges = {
-		{"Base", {}},
-		{"C", {}},
-		{"D", {
-			{"InternalDispatch", "function Base.pub()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"E", {
-			{"InternalDispatch", "function Base.pub()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"F", {}},
-		{"L", {}},
-	};
-
-	std::map<std::string, EdgeNames> expectedDeployedEdges = {
-		{"Base", {
-			{"Entry", "function Base.ext()"},
-			{"Entry", "function Base.pub()"},
-			{"function Base.ext()", "function free()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"C", {
-			{"Entry", "function Base.ext()"},
-			{"Entry", "function Base.pub()"},
-			{"function Base.ext()", "function free()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"D", {
-			{"InternalDispatch", "function Base.pub()"},
-			{"Entry", "function Base.ext()"},
-			{"Entry", "function Base.pub()"},
-			{"function Base.ext()", "function free()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"E", {
-			{"InternalDispatch", "function Base.pub()"},
-			{"Entry", "function Base.ext()"},
-			{"Entry", "function Base.pub()"},
-			{"function Base.ext()", "function free()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"F", {
-			{"InternalDispatch", "function Base.pub()"},
-			{"Entry", "function Base.ext()"},
-			{"Entry", "function Base.pub()"},
-			{"Entry", "function F.f()"},
-			{"function Base.ext()", "function free()"},
-			{"function Base.pub()", "function free()"},
-		}},
-		{"L", {}},
-	};
-
-	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace solidity::frontend::test
diff --git a/test/libsolidity/astPropertyTests/blank_test_case.sol b/test/libsolidity/astPropertyTests/blank_test_case.sol
deleted file mode 100644
index fc2fa5809212..000000000000
--- a/test/libsolidity/astPropertyTests/blank_test_case.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-/// TestCase1: name
-contract C {
-    ///
-    ///
-    function f() public pure { }
-}
-// ----
-// TestCase1: C
-//
diff --git a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
deleted file mode 100644
index cfdda3813c0f..000000000000
--- a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
+++ /dev/null
@@ -1,166 +0,0 @@
-type UINT is uint;
-
-function add(UINT x, UINT y) pure returns (UINT) {
-    return UINT.wrap(UINT.unwrap(x) + UINT.unwrap(y));
-}
-
-function lt(UINT x, UINT y) pure returns (bool) {
-    return UINT.unwrap(x) < UINT.unwrap(y);
-}
-
-using {lt as <, add as +} for UINT global;
-
-function g() pure returns (bool) {
-    return false;
-}
-
-function h() pure returns (uint) {
-    return 13;
-}
-
-contract C {
-    uint z = 0;
-
-    function modifyStateVarZ() public returns (uint) {
-        z = type(uint).max;
-        return z;
-    }
-
-    struct S {
-        uint x;
-    }
-
-    function f() public {
-        /// AdditionLoopExpression: isSimpleCounterLoop
-        for(uint i = 0; i < 42; i = i + 1) {
-        }
-        /// ShortHandAdditionLoopExpression: isSimpleCounterLoop
-        for(uint i = 0; i < 42; i += 1) {
-        }
-        /// SimplePreDecrement: isSimpleCounterLoop
-        for(uint i = 42; i > 0; --i) {
-        }
-        /// SimplePosDecrement: isSimpleCounterLoop
-        for(uint i = 42; i > 0; i--) {
-        }
-        /// MultiplicationLoopExpression: isSimpleCounterLoop
-        for(uint i = 1; i < 42; i = i * 2) {
-        }
-        /// CounterIncrementLoopBody: isSimpleCounterLoop
-        for(uint i = 0; i < 42; ++i) {
-            i++;
-        }
-        /// CounterAssignmentLoopBody: isSimpleCounterLoop
-        for(uint i = 0; i < 42; ++i) {
-            i = 43;
-        }
-        /// CounterAssignmentInlineAssemblyLoopBody: isSimpleCounterLoop
-        for(uint i = 0; i < 42; ++i) {
-            assembly {
-                i := add(i, 1)
-            }
-        }
-        uint j = type(uint).max;
-        /// ExternalCounterLoopExpression: isSimpleCounterLoop
-        for (uint i = 0; i < 10; ++j) {
-        }
-        uint x;
-        /// CounterIncrementRHSAssignment: isSimpleCounterLoop
-        for(uint i = 0; i < 10; ++i) {
-            x = i++;
-        }
-        /// NoEffectLoopExpression: isSimpleCounterLoop
-        for(uint i = 0; i < 42; i) {
-        }
-        /// EmptyLoopExpression: isSimpleCounterLoop
-        for(uint i = 0; i < 10; ) {
-        }
-        j = 0;
-        /// EmptyConditionExpression: isSimpleCounterLoop
-        for(uint i = 0; ; ++i) {
-        }
-        uint y = type(uint8).max + 1;
-        /// DifferentCommonTypeCondition: isSimpleCounterLoop
-        for(uint8 i = 0; i < y; ++i) {
-        }
-        /// LessThanOrEqualCondition: isSimpleCounterLoop
-        for(uint i = 0; i <= 10; ++i) {
-        }
-        /// ComplexExpressionCondition: isSimpleCounterLoop
-        for(uint i = 0; (i < 10 || g()); ++i) {
-        }
-        /// FreeFunctionConditionLHS: isSimpleCounterLoop
-        for(uint i = 0; h() < 100; ++i) {
-        }
-        /// FreeFunctionConditionDifferentCommonTypeLHS: isSimpleCounterLoop
-        for(uint8 i = 0; i < h(); ++i) {
-        }
-        /// NonIntegerTypeCondition: isSimpleCounterLoop
-        for(uint i = 0; address(this) < msg.sender; ++i) {
-        }
-        UINT ZERO = UINT.wrap(0);
-        UINT ONE = UINT.wrap(1);
-        UINT TEN = UINT.wrap(10);
-        /// UDVTOperators: isSimpleCounterLoop
-        for(UINT i = ZERO; i < TEN; i = i + ONE) {
-        }
-        /// CounterAssignmentConditionRHS: isSimpleCounterLoop
-        for(uint i = 0; i < (i = i + 1); ++i) {
-        }
-        /// LiteralDifferentCommonTypeConditionRHS: isSimpleCounterLoop
-        for(uint8 i = 0; i < 257 ; ++i) {
-        }
-        /// StateVarCounterModifiedFunctionConditionRHS: isSimpleCounterLoop
-        for (z = 1; z < modifyStateVarZ(); ++z) {
-        }
-        /// StateVarCounterModifiedFunctionLoopBody: isSimpleCounterLoop
-        for (z = 1; z < 2048; ++z) {
-            modifyStateVarZ();
-        }
-        /// NonIntegerCounter: isSimpleCounterLoop
-        for (address i = address(0x123); i < address(this); i = address(0x123 + 1)) {
-        }
-        /// AssemblyAfterAssignmentToCounter: isSimpleCounterLoop
-        for (uint i = 0; i < 42; ++i) {
-            i = type(uint).max;
-            assembly {}
-        }
-        uint k = type(uint).max;
-        /// ExpressionIncrement: isSimpleCounterLoop
-        for (uint i = 0; i < 10; ++(k)) {
-        }
-        S memory s = S(type(uint).max);
-        /// StructMemberAccessIncrement: isSimpleCounterLoop
-        for (uint i = 0; i < 10; ++s.x) {
-        }
-    }
-}
-// ----
-// AdditionLoopExpression: false
-// ShortHandAdditionLoopExpression: false
-// SimplePreDecrement: false
-// SimplePosDecrement: false
-// MultiplicationLoopExpression: false
-// CounterIncrementLoopBody: false
-// CounterAssignmentLoopBody: false
-// CounterAssignmentInlineAssemblyLoopBody: false
-// ExternalCounterLoopExpression: false
-// CounterIncrementRHSAssignment: false
-// NoEffectLoopExpression: false
-// DifferentCommonTypeCondition: false
-// EmptyLoopExpression: false
-// EmptyConditionExpression: false
-// LessThanOrEqualCondition: false
-// ComplexExpressionCondition: false
-// FreeFunctionConditionLHS: false
-// FreeFunctionConditionDifferentCommonTypeLHS: false
-// NonIntegerTypeCondition: false
-// UDVTOperators: false
-// CounterAssignmentConditionRHS: false
-// LiteralDifferentCommonTypeConditionRHS: false
-// StateVarCounterModifiedFunctionConditionRHS: false
-// StateVarCounterModifiedFunctionLoopBody: false
-// NonIntegerCounter: false
-// AssemblyAfterAssignmentToCounter: false
-// ExpressionIncrement: false
-// StructMemberAccessIncrement: false
diff --git a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol
deleted file mode 100644
index c7ab53d2c912..000000000000
--- a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol
+++ /dev/null
@@ -1,72 +0,0 @@
-function h() pure returns (uint) {
-    return 13;
-}
-
-contract C {
-    uint[] dynArray;
-
-    function f() public {
-        /// SimplePreIncrement: isSimpleCounterLoop
-        for(uint i = 0; i < 42; ++i) {
-        }
-        /// SimplePosIncrement: isSimpleCounterLoop
-        for(int i = 0; i < 42; i++) {
-        }
-        uint x;
-        /// CounterReadLoopBody: isSimpleCounterLoop
-        for(uint i = 0; i < 42; i++) {
-            x = i;
-        }
-        /// LocalVarConditionRHS: isSimpleCounterLoop
-        for(uint i = 0; i < x; i++) {
-        }
-        x = 0;
-        /// EmptyInitExpression: isSimpleCounterLoop
-        for(; x < 10; ++x) {
-        }
-        uint[8] memory array;
-        /// StaticArrayLengthConditionRHS: isSimpleCounterLoop
-        for(uint i = 0; i < array.length; i++) {
-        }
-        dynArray.push();
-        /// DynamicArrayLengthConditionRHS: isSimpleCounterLoop
-        for(uint i = 0; i < dynArray.length; i++) {
-            dynArray.push(i);
-        }
-        /// CounterReadInlineAssembly: isSimpleCounterLoop
-        for(uint i = 0; i < 42; ++i) {
-            assembly {
-                x := i
-            }
-        }
-        /// BinaryOperationConditionRHS: isSimpleCounterLoop
-        for(uint i = 0; i < i + 1; i++) {
-        }
-        /// FreeFunctionConditionRHS: isSimpleCounterLoop
-        for(uint i = 0; i < h(); ++i) {
-        }
-    }
-    function functionParamLoopCounter(uint i) public pure {
-        /// FunctionParameterLoopCounter: isSimpleCounterLoop
-        for (i = 0; i < 42; ++i){
-        }
-    }
-    function functionReturnLoopCounter() public pure returns (uint i) {
-        /// FunctionReturnLoopCounter: isSimpleCounterLoop
-        for (i = 0; i < 42; ++i){
-        }
-    }
-}
-// ----
-// SimplePreIncrement: true
-// SimplePosIncrement: true
-// CounterReadLoopBody: true
-// LocalVarConditionRHS: true
-// EmptyInitExpression: true
-// StaticArrayLengthConditionRHS: true
-// DynamicArrayLengthConditionRHS: true
-// CounterReadInlineAssembly: true
-// BinaryOperationConditionRHS: true
-// FreeFunctionConditionRHS: true
-// FunctionParameterLoopCounter: true
-// FunctionReturnLoopCounter: true
diff --git a/test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol b/test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol
deleted file mode 100644
index 09841828f911..000000000000
--- a/test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        /// TestCase1: condition.operator
-        /// TestCase2: initializationExpression.initialValue.value
-        /// TestCase3: loopExpression.expression.subExpression.name
-        for(uint i = 1; i < 42; i++) {
-        }
-    }
-}
-// ----
-// TestCase1: <
-// TestCase2: 1
-// TestCase3: i
diff --git a/test/libsolidity/astPropertyTests/multiple_properties_per_node.sol b/test/libsolidity/astPropertyTests/multiple_properties_per_node.sol
deleted file mode 100644
index c62aa6ac126a..000000000000
--- a/test/libsolidity/astPropertyTests/multiple_properties_per_node.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    /// TestCase1: name
-    /// TestCase2: functionSelector
-    /// TestCase3: visibility
-    function singleFunction() public pure {
-    }
-}
-// ----
-// TestCase1: singleFunction
-// TestCase2: 3d33252c
-// TestCase3: public
diff --git a/test/libsolidity/astPropertyTests/nested_properties.sol b/test/libsolidity/astPropertyTests/nested_properties.sol
deleted file mode 100644
index 324fe64c9ac8..000000000000
--- a/test/libsolidity/astPropertyTests/nested_properties.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public pure {
-        /// TestCase1: condition.operator
-        for(uint i = 0; i < 42; ++i) {
-        }
-        /// TestCase2: initializationExpression.initialValue.value
-        for(uint i = 1; i < 42; i = i * 2) {
-        }
-        /// TestCase3: loopExpression.expression.subExpression.name
-        for(uint i = 0; i < 42; i++) {
-        }
-    }
-}
-// ----
-// TestCase1: <
-// TestCase2: 1
-// TestCase3: i
diff --git a/test/libsolidity/astPropertyTests/property_expectation_with_colon.sol b/test/libsolidity/astPropertyTests/property_expectation_with_colon.sol
deleted file mode 100644
index 7e228a56f428..000000000000
--- a/test/libsolidity/astPropertyTests/property_expectation_with_colon.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-/// TestCase1: nameLocation
-/// TestCase2: src
-contract C {
-    function f() public pure {
-    }
-}
-// ----
-// TestCase1: 115:1:-1
-// TestCase2: 106:51:-1
diff --git a/test/libsolidity/astPropertyTests/simple_properties.sol b/test/libsolidity/astPropertyTests/simple_properties.sol
deleted file mode 100644
index d7485fbecba8..000000000000
--- a/test/libsolidity/astPropertyTests/simple_properties.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-/// TestContractC: name
-contract C {
-    /// TestStateVarX: stateVariable
-    uint x;
-    /// TestFunctionF: visibility
-    function f() public pure {
-    }
-}
-// ----
-// TestContractC: C
-// TestStateVarX: true
-// TestFunctionF: public
diff --git a/test/libsolidity/gasTests/abiv2.sol b/test/libsolidity/gasTests/abiv2.sol
deleted file mode 100644
index aacb333bfeca..000000000000
--- a/test/libsolidity/gasTests/abiv2.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    uint public a;
-    uint[] public b;
-    function f1(uint) public pure returns (uint) { }
-    function f2(uint[] memory, string[] memory, uint16, address) public returns (uint[] memory, uint16[] memory) {}
-    function f3(uint16[] memory, string[] memory, uint16, address) public returns (uint[] memory, uint16[] memory) {}
-    function f4(uint32[] memory, string[12] memory, bytes[2][] memory, address) public returns (uint[] memory, uint16[] memory) {}
-    function f5(address[] memory, string[] memory, bytes memory, address) public returns (uint[] memory, uint16[] memory) {}
-    function f6(uint[30] memory, string[] memory, uint16, address) public returns (uint16[200] memory, uint16[] memory) {}
-    function f7(uint[31] memory, string[20] memory, C, address) public returns (bytes[] memory, uint16[] memory) {}
-    function f8(uint[32] memory, string[] memory, uint32, address) public returns (uint[] memory, uint16[] memory) {}
-}
-// ----
-// creation:
-//   codeDepositCost: 1213200
-//   executionCost: 1259
-//   totalCost: 1214459
-// external:
-//   a(): 2425
-//   b(uint256): infinite
-//   f1(uint256): infinite
-//   f2(uint256[],string[],uint16,address): infinite
-//   f3(uint16[],string[],uint16,address): infinite
-//   f4(uint32[],string[12],bytes[2][],address): infinite
-//   f5(address[],string[],bytes,address): infinite
-//   f6(uint256[30],string[],uint16,address): infinite
-//   f7(uint256[31],string[20],address,address): infinite
-//   f8(uint256[32],string[],uint32,address): infinite
diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
deleted file mode 100644
index 1ab8803d28b2..000000000000
--- a/test/libsolidity/gasTests/abiv2_optimised.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    uint public a;
-    uint[] public b;
-    function f1(uint) public pure returns (uint) { }
-    function f2(uint[] memory, string[] memory, uint16, address) public returns (uint[] memory, uint16[] memory) {}
-    function f3(uint16[] memory, string[] memory, uint16, address) public returns (uint[] memory, uint16[] memory) {}
-    function f4(uint32[] memory, string[12] memory, bytes[2][] memory, address) public returns (uint[] memory, uint16[] memory) {}
-    function f5(address[] memory, string[] memory, bytes memory, address) public returns (uint[] memory, uint16[] memory) {}
-    function f6(uint[30] memory, string[] memory, uint16, address) public returns (uint16[200] memory, uint16[] memory) {}
-    function f7(uint[31] memory, string[20] memory, C, address) public returns (bytes[] memory, uint16[] memory) {}
-    function f8(uint[32] memory, string[] memory, uint32, address) public returns (uint[] memory, uint16[] memory) {}
-}
-// ====
-// optimize: true
-// optimize-yul: true
-// ----
-// creation:
-//   codeDepositCost: 639000
-//   executionCost: 668
-//   totalCost: 639668
-// external:
-//   a(): 2283
-//   b(uint256): 4649
-//   f1(uint256): 304
-//   f2(uint256[],string[],uint16,address): infinite
-//   f3(uint16[],string[],uint16,address): infinite
-//   f4(uint32[],string[12],bytes[2][],address): infinite
-//   f5(address[],string[],bytes,address): infinite
-//   f6(uint256[30],string[],uint16,address): infinite
-//   f7(uint256[31],string[20],address,address): infinite
-//   f8(uint256[32],string[],uint32,address): infinite
diff --git a/test/libsolidity/gasTests/data_storage.sol b/test/libsolidity/gasTests/data_storage.sol
deleted file mode 100644
index 0d24ef505273..000000000000
--- a/test/libsolidity/gasTests/data_storage.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f() pure public {
-        require(false, "1234567890123456789012345678901");
-        require(false, "12345678901234567890123456789012");
-        require(false, "123456789012345678901234567890123");
-        require(false, "1234567890123456789012345678901234");
-        require(false, "12345678901234567890123456789012345");
-        require(false, "123456789012345678901234567890123456");
-        require(false, "123456789012345678901234567890121234567890123456789012345678901");
-        require(false, "1234567890123456789012345678901212345678901234567890123456789012");
-        require(false, "12345678901234567890123456789012123456789012345678901234567890123");
-    }
-}
-// ----
-// creation:
-//   codeDepositCost: 377800
-//   executionCost: 416
-//   totalCost: 378216
-// external:
-//   f(): 421
diff --git a/test/libsolidity/gasTests/dispatch_large.sol b/test/libsolidity/gasTests/dispatch_large.sol
deleted file mode 100644
index e1cce4acd764..000000000000
--- a/test/libsolidity/gasTests/dispatch_large.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-contract Large {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function f4(uint x) public returns (uint) { b[uint8(msg.data[3])] = x; }
-    function f5(uint x) public returns (uint) { b[uint8(msg.data[4])] = x; }
-    function f6(uint x) public returns (uint) { b[uint8(msg.data[5])] = x; }
-    function f7(uint x) public returns (uint) { b[uint8(msg.data[6])] = x; }
-    function f8(uint x) public returns (uint) { b[uint8(msg.data[7])] = x; }
-    function f9(uint x) public returns (uint) { b[uint8(msg.data[8])] = x; }
-    function f0(uint x) public pure returns (uint) { require(x > 10); }
-    function g1(uint x) public payable returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function g2(uint x) public payable returns (uint) { b[uint8(msg.data[1])] = x; }
-    function g3(uint x) public payable returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g4(uint x) public payable returns (uint) { b[uint8(msg.data[3])] = x; }
-    function g5(uint x) public payable returns (uint) { b[uint8(msg.data[4])] = x; }
-    function g6(uint x) public payable returns (uint) { b[uint8(msg.data[5])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-// ----
-// creation:
-//   codeDepositCost: 618400
-//   executionCost: 649
-//   totalCost: 619049
-// external:
-//   a(): 2470
-//   b(uint256): infinite
-//   f0(uint256): infinite
-//   f1(uint256): infinite
-//   f2(uint256): infinite
-//   f3(uint256): infinite
-//   f4(uint256): infinite
-//   f5(uint256): infinite
-//   f6(uint256): infinite
-//   f7(uint256): infinite
-//   f8(uint256): infinite
-//   f9(uint256): infinite
-//   g0(uint256): infinite
-//   g1(uint256): infinite
-//   g2(uint256): infinite
-//   g3(uint256): infinite
-//   g4(uint256): infinite
-//   g5(uint256): infinite
-//   g6(uint256): infinite
-//   g7(uint256): infinite
-//   g8(uint256): infinite
-//   g9(uint256): infinite
diff --git a/test/libsolidity/gasTests/dispatch_large_optimised.sol b/test/libsolidity/gasTests/dispatch_large_optimised.sol
deleted file mode 100644
index 83e55c1a9c1e..000000000000
--- a/test/libsolidity/gasTests/dispatch_large_optimised.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract Large {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function f4(uint x) public returns (uint) { b[uint8(msg.data[3])] = x; }
-    function f5(uint x) public returns (uint) { b[uint8(msg.data[4])] = x; }
-    function f6(uint x) public returns (uint) { b[uint8(msg.data[5])] = x; }
-    function f7(uint x) public returns (uint) { b[uint8(msg.data[6])] = x; }
-    function f8(uint x) public returns (uint) { b[uint8(msg.data[7])] = x; }
-    function f9(uint x) public returns (uint) { b[uint8(msg.data[8])] = x; }
-    function f0(uint x) public pure returns (uint) { require(x > 10); }
-    function g1(uint x) public payable returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function g2(uint x) public payable returns (uint) { b[uint8(msg.data[1])] = x; }
-    function g3(uint x) public payable returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g4(uint x) public payable returns (uint) { b[uint8(msg.data[3])] = x; }
-    function g5(uint x) public payable returns (uint) { b[uint8(msg.data[4])] = x; }
-    function g6(uint x) public payable returns (uint) { b[uint8(msg.data[5])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-// ====
-// optimize: true
-// optimize-runs: 2
-// ----
-// creation:
-//   codeDepositCost: 224600
-//   executionCost: 267
-//   totalCost: 224867
-// external:
-//   a(): 2281
-//   b(uint256): 4934
-//   f0(uint256): 363
-//   f1(uint256): 47002
-//   f2(uint256): 24967
-//   f3(uint256): 25055
-//   f4(uint256): 25033
-//   f5(uint256): 25011
-//   f6(uint256): 24923
-//   f7(uint256): 24703
-//   f8(uint256): 24835
-//   f9(uint256): 24857
-//   g0(uint256): 603
-//   g1(uint256): 46714
-//   g2(uint256): 24701
-//   g3(uint256): 24789
-//   g4(uint256): 24767
-//   g5(uint256): 24855
-//   g6(uint256): 24635
-//   g7(uint256): 24745
-//   g8(uint256): 24723
-//   g9(uint256): 24569
diff --git a/test/libsolidity/gasTests/dispatch_medium.sol b/test/libsolidity/gasTests/dispatch_medium.sol
deleted file mode 100644
index 6bf8f89394fa..000000000000
--- a/test/libsolidity/gasTests/dispatch_medium.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract Medium {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-// ----
-// creation:
-//   codeDepositCost: 259600
-//   executionCost: 298
-//   totalCost: 259898
-// external:
-//   a(): 2447
-//   b(uint256): infinite
-//   f1(uint256): infinite
-//   f2(uint256): infinite
-//   f3(uint256): infinite
-//   g0(uint256): infinite
-//   g7(uint256): infinite
-//   g8(uint256): infinite
-//   g9(uint256): infinite
diff --git a/test/libsolidity/gasTests/dispatch_medium_optimised.sol b/test/libsolidity/gasTests/dispatch_medium_optimised.sol
deleted file mode 100644
index e921fcf125ba..000000000000
--- a/test/libsolidity/gasTests/dispatch_medium_optimised.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract Medium {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-// ====
-// optimize: true
-// optimize-runs: 2
-// ----
-// creation:
-//   codeDepositCost: 126000
-//   executionCost: 169
-//   totalCost: 126169
-// external:
-//   a(): 2281
-//   b(uint256): 4692
-//   f1(uint256): 46782
-//   f2(uint256): 24725
-//   f3(uint256): 24769
-//   g0(uint256): 361
-//   g7(uint256): 24635
-//   g8(uint256): 24613
-//   g9(uint256): 24569
diff --git a/test/libsolidity/gasTests/dispatch_small.sol b/test/libsolidity/gasTests/dispatch_small.sol
deleted file mode 100644
index d2c391582ed5..000000000000
--- a/test/libsolidity/gasTests/dispatch_small.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract Small {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    fallback () external payable {}
-}
-// ----
-// creation:
-//   codeDepositCost: 103800
-//   executionCost: 151
-//   totalCost: 103951
-// external:
-//   fallback: 128
-//   a(): 2402
-//   b(uint256): infinite
-//   f1(uint256): infinite
diff --git a/test/libsolidity/gasTests/dispatch_small_optimised.sol b/test/libsolidity/gasTests/dispatch_small_optimised.sol
deleted file mode 100644
index e20e1d982427..000000000000
--- a/test/libsolidity/gasTests/dispatch_small_optimised.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Small {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    fallback () external payable {}
-}
-// ====
-// optimize: true
-// optimize-runs: 2
-// ----
-// creation:
-//   codeDepositCost: 58200
-//   executionCost: 109
-//   totalCost: 58309
-// external:
-//   fallback: 117
-//   a(): 2259
-//   b(uint256): 4582
-//   f1(uint256): 46716
diff --git a/test/libsolidity/gasTests/exp.sol b/test/libsolidity/gasTests/exp.sol
deleted file mode 100644
index 6ad4dd3bee43..000000000000
--- a/test/libsolidity/gasTests/exp.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function exp_neg_one(uint exponent) public returns(int) {
-		unchecked { return (-1)**exponent; }
-	}
-	function exp_two(uint exponent) public returns(uint) {
-		unchecked { return 2**exponent; }
-	}
-	function exp_zero(uint exponent) public returns(uint) {
-		unchecked { return 0**exponent; }
-	}
-	function exp_one(uint exponent) public returns(uint) {
-		unchecked { return 1**exponent; }
-	}
-}
-// ====
-// optimize: false
-// optimize-yul: false
-// ----
-// creation:
-//   codeDepositCost: 107000
-//   executionCost: 151
-//   totalCost: 107151
-// external:
-//   exp_neg_one(uint256): 2250
-//   exp_one(uint256): infinite
-//   exp_two(uint256): infinite
-//   exp_zero(uint256): infinite
diff --git a/test/libsolidity/gasTests/exp_optimized.sol b/test/libsolidity/gasTests/exp_optimized.sol
deleted file mode 100644
index 982fcd28feb9..000000000000
--- a/test/libsolidity/gasTests/exp_optimized.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function exp_neg_one(uint exponent) public returns(int) {
-		unchecked { return (-1)**exponent; }
-	}
-	function exp_two(uint exponent) public returns(uint) {
-		unchecked { return 2**exponent; }
-	}
-	function exp_zero(uint exponent) public returns(uint) {
-		unchecked { return 0**exponent; }
-	}
-	function exp_one(uint exponent) public returns(uint) {
-		unchecked { return 1**exponent; }
-	}
-}
-// ====
-// optimize: true
-// optimize-yul: true
-// ----
-// creation:
-//   codeDepositCost: 35800
-//   executionCost: 85
-//   totalCost: 35885
-// external:
-//   exp_neg_one(uint256): 1914
-//   exp_one(uint256): 1868
-//   exp_two(uint256): 1846
-//   exp_zero(uint256): 1889
diff --git a/test/libsolidity/gasTests/storage_costs.sol b/test/libsolidity/gasTests/storage_costs.sol
deleted file mode 100644
index afb442ed7f97..000000000000
--- a/test/libsolidity/gasTests/storage_costs.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    uint x;
-    function setX(uint y) public {
-        x = y;
-    }
-    function resetX() public {
-        x = 0;
-    }
-    function readX() public view returns(uint) {
-        return x;
-    }
-}
-// ====
-// optimize: true
-// optimize-yul: true
-// ----
-// creation:
-//   codeDepositCost: 25600
-//   executionCost: 73
-//   totalCost: 25673
-// external:
-//   readX(): 2288
-//   resetX(): 5114
-//   setX(uint256): 22309
diff --git a/test/libsolidity/interface/FileReader.cpp b/test/libsolidity/interface/FileReader.cpp
deleted file mode 100644
index dbb03c23f24f..000000000000
--- a/test/libsolidity/interface/FileReader.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Unit tests for libsolidity/interface/FileReader.h
-
-#include <libsolidity/interface/FileReader.h>
-
-#include <test/Common.h>
-#include <test/FilesystemUtils.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::util;
-using namespace solidity::test;
-
-#define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
-
-namespace solidity::frontend::test
-{
-
-using SymlinkResolution = FileReader::SymlinkResolution;
-
-BOOST_AUTO_TEST_SUITE(FileReaderTest)
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_absolute_path)
-{
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/.", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/./", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/./.", resolveSymlinks), "/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a", resolveSymlinks), "/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/", resolveSymlinks), "/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/.", resolveSymlinks), "/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/./a", resolveSymlinks), "/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/./a/", resolveSymlinks), "/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/./a/.", resolveSymlinks), "/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b", resolveSymlinks), "/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b/", resolveSymlinks), "/a/b/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/./b/", resolveSymlinks), "/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/../a/b/", resolveSymlinks), "/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b/c/..", resolveSymlinks), "/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b/c/../", resolveSymlinks), "/a/b/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b/c/../../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b/c/../../../", resolveSymlinks), "/");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_relative_path)
-{
-	TemporaryDirectory tempDir({"x/y/z"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir.path() / "x/y/z");
-
-	// NOTE: If path to work dir contains symlinks (often the case on macOS), boost might resolve
-	// them, making the path different from tempDirPath.
-	boost::filesystem::path expectedPrefix = boost::filesystem::current_path().parent_path().parent_path().parent_path();
-	// On Windows tempDir.path() normally contains the drive letter while the normalized path should not.
-	expectedPrefix = "/" / expectedPrefix.relative_path();
-	soltestAssert(expectedPrefix.is_absolute() || expectedPrefix.root_path() == "/", "");
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS(".", resolveSymlinks), expectedPrefix / "x/y/z/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./", resolveSymlinks), expectedPrefix / "x/y/z/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS(".//", resolveSymlinks), expectedPrefix / "x/y/z/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("..", resolveSymlinks), expectedPrefix / "x/y");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../", resolveSymlinks), expectedPrefix / "x/y/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("..//", resolveSymlinks), expectedPrefix / "x/y/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a", resolveSymlinks), expectedPrefix / "x/y/z/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/.", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a", resolveSymlinks), expectedPrefix / "x/y/z/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/.", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/./", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/.//", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/./.", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/././", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/././/", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b", resolveSymlinks), expectedPrefix / "x/y/z/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/", resolveSymlinks), expectedPrefix / "x/y/z/a/b/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../a/b", resolveSymlinks), expectedPrefix / "x/y/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../../a/b", resolveSymlinks), expectedPrefix / "x/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("./a/b", resolveSymlinks), expectedPrefix / "x/y/z/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("././a/b", resolveSymlinks), expectedPrefix / "x/y/z/a/b");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/./b/", resolveSymlinks), expectedPrefix / "x/y/z/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/../a/b/", resolveSymlinks), expectedPrefix / "x/y/z/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/c/..", resolveSymlinks), expectedPrefix / "x/y/z/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/c/../", resolveSymlinks), expectedPrefix / "x/y/z/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/c/..//", resolveSymlinks), expectedPrefix / "x/y/z/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/c/../..", resolveSymlinks), expectedPrefix / "x/y/z/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/c/../../", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/b/c/../..//", resolveSymlinks), expectedPrefix / "x/y/z/a/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../../a/.././../p/../q/../a/b", resolveSymlinks), expectedPrefix / "a/b");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_redundant_slashes)
-{
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("///", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("////", resolveSymlinks), "/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("////a/b/", resolveSymlinks), "/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a//b/", resolveSymlinks), "/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a////b/", resolveSymlinks), "/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b//", resolveSymlinks), "/a/b/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/b////", resolveSymlinks), "/a/b/");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_unc_path)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	// On Windows tempDir.path() normally contains the drive letter while the normalized path should not.
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		// UNC paths start with // or \\ followed by a name. They are used for network shares on Windows.
-		// On UNIX systems they are not supported but still treated in a special way.
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/", resolveSymlinks), "//host/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/a/b", resolveSymlinks), "//host/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/a/b/", resolveSymlinks), "//host/a/b/");
-
-#if defined(_WIN32)
-		// On Windows an UNC path can also start with \\ instead of //
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("\\\\host/", resolveSymlinks), "//host/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("\\\\host/a/b", resolveSymlinks), "//host/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("\\\\host/a/b/", resolveSymlinks), "//host/a/b/");
-#else
-		// On UNIX systems it's just a fancy relative path instead
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("\\\\host/", resolveSymlinks), expectedWorkDir / "\\\\host/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("\\\\host/a/b", resolveSymlinks), expectedWorkDir / "\\\\host/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("\\\\host/a/b/", resolveSymlinks), expectedWorkDir / "\\\\host/a/b/");
-#endif
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_root_name_only)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-
-	// A root **path** consists of a directory name (typically / or \) and the root name (drive
-	// letter (C:), UNC host name (//host), etc.). Either can be empty. Root path as a whole may be
-	// an absolute path but root name on its own is considered relative. For example on Windows
-	// C:\ represents the root directory of drive C: but C: on its own refers to the current working
-	// directory.
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		// UNC paths
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//", resolveSymlinks), "//" / expectedWorkDir);
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host", resolveSymlinks), "//host" / expectedWorkDir);
-
-		// On UNIX systems root name is empty.
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("", resolveSymlinks), expectedWorkDir);
-
-#if defined(_WIN32)
-		boost::filesystem::path driveLetter = boost::filesystem::current_path().root_name();
-		soltestAssert(!driveLetter.empty(), "");
-		soltestAssert(driveLetter.is_relative(), "");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS(driveLetter, resolveSymlinks), expectedWorkDir);
-#endif
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_stripping_root_name)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	soltestAssert(boost::filesystem::current_path().is_absolute(), "");
-#if defined(_WIN32)
-	soltestAssert(!boost::filesystem::current_path().root_name().empty(), "");
-#endif
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		boost::filesystem::path workDir = boost::filesystem::current_path();
-
-		boost::filesystem::path normalizedPath = FileReader::normalizeCLIPathForVFS(
-			workDir,
-			resolveSymlinks
-		);
-		BOOST_CHECK_EQUAL(normalizedPath, "/" / workDir.relative_path());
-		BOOST_TEST(normalizedPath.root_name().empty());
-		BOOST_CHECK_EQUAL(normalizedPath.root_directory(), "/");
-
-#if defined(_WIN32)
-		std::string root = workDir.root_path().string();
-		soltestAssert(root.length() == 3 && root[1] == ':' && root[2] == '\\', "");
-
-		for (auto convert: {boost::to_lower_copy<std::string>, boost::to_upper_copy<std::string>})
-		{
-			boost::filesystem::path workDirWin = convert(root, std::locale()) / workDir.relative_path();
-			normalizedPath = FileReader::normalizeCLIPathForVFS(
-				workDirWin,
-				resolveSymlinks
-			);
-			BOOST_CHECK_EQUAL(normalizedPath, "/" / workDir.relative_path());
-			BOOST_TEST(normalizedPath.root_name().empty());
-			BOOST_CHECK_EQUAL(normalizedPath.root_directory(), "/");
-		}
-#endif
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_path_beyond_root)
-{
-	TemporaryWorkingDirectory tempWorkDir("/");
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../.", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../a", resolveSymlinks), "/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../a/..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../a/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../../a", resolveSymlinks), "/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../../a/..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/../../a/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("/a/../../b/../..", resolveSymlinks), "/");
-
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../.", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../a", resolveSymlinks), "/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../a/..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../a/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../../a", resolveSymlinks), "/a");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../../a/..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("../../a/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/../..", resolveSymlinks), "/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("a/../../b/../..", resolveSymlinks), "/");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_case_sensitivity)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	boost::filesystem::path workDirNoSymlinks = boost::filesystem::weakly_canonical(tempDir);
-	boost::filesystem::path expectedPrefix = "/" / workDirNoSymlinks.relative_path();
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		BOOST_TEST(FileReader::normalizeCLIPathForVFS(workDirNoSymlinks / "abc", resolveSymlinks) == expectedPrefix / "abc");
-		BOOST_TEST(FileReader::normalizeCLIPathForVFS(workDirNoSymlinks / "abc", resolveSymlinks) != expectedPrefix / "ABC");
-		BOOST_TEST(FileReader::normalizeCLIPathForVFS(workDirNoSymlinks / "ABC", resolveSymlinks) != expectedPrefix / "abc");
-		BOOST_TEST(FileReader::normalizeCLIPathForVFS(workDirNoSymlinks / "ABC", resolveSymlinks) == expectedPrefix / "ABC");
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_path_separators)
-{
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		// Even on Windows we want / as a separator.
-		BOOST_TEST((
-			FileReader::normalizeCLIPathForVFS("/a/b/c", resolveSymlinks).native() ==
-			boost::filesystem::path("/a/b/c").native()
-		));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_should_not_resolve_symlinks_unless_requested)
-{
-	TemporaryDirectory tempDir({"abc/"}, TEST_CASE_NAME);
-	soltestAssert(tempDir.path().is_absolute(), "");
-
-	if (!createSymlinkIfSupportedByFilesystem(tempDir.path() / "abc", tempDir.path() / "sym", true))
-		return;
-
-	boost::filesystem::path expectedRootPath = FileReader::normalizeCLIRootPathForVFS(tempDir);
-	boost::filesystem::path expectedPrefixWithSymlinks = expectedRootPath / tempDir.path().relative_path();
-	boost::filesystem::path expectedPrefixWithoutSymlinks = expectedRootPath / boost::filesystem::weakly_canonical(tempDir).relative_path();
-
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "sym/contract.sol", SymlinkResolution::Disabled),
-		expectedPrefixWithSymlinks / "sym/contract.sol"
-	);
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "abc/contract.sol", SymlinkResolution::Disabled),
-		expectedPrefixWithSymlinks / "abc/contract.sol"
-	);
-
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "sym/contract.sol", SymlinkResolution::Enabled),
-		expectedPrefixWithoutSymlinks / "abc/contract.sol"
-	);
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "abc/contract.sol", SymlinkResolution::Enabled),
-		expectedPrefixWithoutSymlinks / "abc/contract.sol"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_should_resolve_symlinks_in_workdir_when_path_is_relative)
-{
-	TemporaryDirectory tempDir({"abc/"}, TEST_CASE_NAME);
-	soltestAssert(tempDir.path().is_absolute(), "");
-
-	if (!createSymlinkIfSupportedByFilesystem(tempDir.path() / "abc", tempDir.path() / "sym", true))
-		return;
-
-	TemporaryWorkingDirectory tempWorkDir(tempDir.path() / "sym");
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::weakly_canonical(boost::filesystem::current_path()).relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-
-	boost::filesystem::path expectedPrefix = "/" / tempDir.path().relative_path();
-	soltestAssert(expectedPrefix.is_absolute() || expectedPrefix.root_path() == "/", "");
-
-	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
-	{
-		BOOST_CHECK_EQUAL(
-			FileReader::normalizeCLIPathForVFS("contract.sol", resolveSymlinks),
-			expectedWorkDir / "contract.sol"
-		);
-	}
-
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "sym/contract.sol", SymlinkResolution::Disabled),
-		expectedPrefix / "sym/contract.sol"
-	);
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "abc/contract.sol", SymlinkResolution::Disabled),
-		expectedPrefix / "abc/contract.sol"
-	);
-
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "sym/contract.sol", SymlinkResolution::Enabled),
-		expectedWorkDir / "contract.sol"
-	);
-	BOOST_CHECK_EQUAL(
-		FileReader::normalizeCLIPathForVFS(tempDir.path() / "abc/contract.sol", SymlinkResolution::Enabled),
-		expectedWorkDir / "contract.sol"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(isPathPrefix_file_prefix)
-{
-	BOOST_TEST(FileReader::isPathPrefix("/", "/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/contract.sol", "/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/contract.sol/", "/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/contract.sol/.", "/contract.sol"));
-
-	BOOST_TEST(FileReader::isPathPrefix("/", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/bc", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/bc/def/contract.sol", "/a/bc/def/contract.sol"));
-
-	BOOST_TEST(FileReader::isPathPrefix("/", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/bc", "/a/bc/def/contract.sol"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/bc/def/contract.sol", "/a/bc/def/contract.sol"));
-
-	BOOST_TEST(!FileReader::isPathPrefix("/contract.sol", "/token.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/contract", "/contract.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/contract.sol", "/contract"));
-	BOOST_TEST(!FileReader::isPathPrefix("/contract.so", "/contract.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/contract.sol", "/contract.so"));
-
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/contract.sol", "/a/b/contract.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/contract.sol", "/a/b/c/contract.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/contract.sol", "/a/b/c/d/contract.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/d/contract.sol", "/a/b/c/contract.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/contract.sol", "/contract.sol"));
-}
-
-BOOST_AUTO_TEST_CASE(isPathPrefix_directory_prefix)
-{
-	BOOST_TEST(FileReader::isPathPrefix("/", "/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/", "/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c", "/"));
-
-	BOOST_TEST(FileReader::isPathPrefix("/", "/a/bc/"));
-	BOOST_TEST(FileReader::isPathPrefix("/a", "/a/bc/"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/", "/a/bc/"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/bc", "/a/bc/"));
-	BOOST_TEST(FileReader::isPathPrefix("/a/bc/", "/a/bc/"));
-
-	BOOST_TEST(!FileReader::isPathPrefix("/a", "/b/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/", "/b/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/contract.sol", "/a/b/"));
-
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/", "/a/b/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c", "/a/b/"));
-}
-
-BOOST_AUTO_TEST_CASE(isPathPrefix_unc_path)
-{
-	BOOST_TEST(FileReader::isPathPrefix("//host/a/b/", "//host/a/b/"));
-	BOOST_TEST(FileReader::isPathPrefix("//host/a/b", "//host/a/b/"));
-	BOOST_TEST(FileReader::isPathPrefix("//host/a/", "//host/a/b/"));
-	BOOST_TEST(FileReader::isPathPrefix("//host/a", "//host/a/b/"));
-	BOOST_TEST(FileReader::isPathPrefix("//host/", "//host/a/b/"));
-
-	// NOTE: //host and // cannot be passed to isPathPrefix() because they are considered relative.
-
-	BOOST_TEST(!FileReader::isPathPrefix("//host1/", "//host2/"));
-	BOOST_TEST(!FileReader::isPathPrefix("//host1/a/b/", "//host2/a/b/"));
-
-	BOOST_TEST(!FileReader::isPathPrefix("/a/b/c/", "//a/b/c/"));
-	BOOST_TEST(!FileReader::isPathPrefix("//a/b/c/", "/a/b/c/"));
-}
-
-BOOST_AUTO_TEST_CASE(isPathPrefix_case_sensitivity)
-{
-	BOOST_TEST(!FileReader::isPathPrefix("/a.sol", "/A.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/A.sol", "/a.sol"));
-	BOOST_TEST(!FileReader::isPathPrefix("/A/", "/a/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/", "/A/"));
-	BOOST_TEST(!FileReader::isPathPrefix("/a/BC/def/", "/a/bc/def/contract.sol"));
-}
-
-BOOST_AUTO_TEST_CASE(stripPrefixIfPresent_file_prefix)
-{
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/", "/contract.sol"), "contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/contract.sol", "/contract.sol"), ".");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/contract.sol/", "/contract.sol"), ".");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/contract.sol/.", "/contract.sol"), ".");
-
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/", "/a/bc/def/contract.sol"), "a/bc/def/contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a", "/a/bc/def/contract.sol"), "bc/def/contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/", "/a/bc/def/contract.sol"), "bc/def/contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/bc", "/a/bc/def/contract.sol"), "def/contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/bc/def/", "/a/bc/def/contract.sol"), "contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/bc/def/contract.sol", "/a/bc/def/contract.sol"), ".");
-
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/contract.sol", "/token.sol"), "/token.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/contract", "/contract.sol"), "/contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/contract.sol", "/contract"), "/contract");
-
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/b/c/contract.sol", "/a/b/contract.sol"), "/a/b/contract.sol");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/b/contract.sol", "/a/b/c/contract.sol"), "/a/b/c/contract.sol");
-}
-
-BOOST_AUTO_TEST_CASE(stripPrefixIfPresent_directory_prefix)
-{
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/", "/"), ".");
-
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/", "/a/bc/def/"), "a/bc/def/");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a", "/a/bc/def/"), "bc/def/");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/", "/a/bc/def/"), "bc/def/");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/bc", "/a/bc/def/"), "def/");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/bc/def/", "/a/bc/def/"), ".");
-
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a", "/b/"), "/b/");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/", "/b/"), "/b/");
-
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/b/c/", "/a/b/"), "/a/b/");
-	BOOST_CHECK_EQUAL(FileReader::stripPrefixIfPresent("/a/b/c", "/a/b/"), "/a/b/");
-}
-
-BOOST_AUTO_TEST_CASE(isUNCPath)
-{
-	BOOST_TEST(FileReader::isUNCPath("//"));
-	BOOST_TEST(FileReader::isUNCPath("//root"));
-	BOOST_TEST(FileReader::isUNCPath("//root/"));
-
-#if defined(_WIN32)
-	// On Windows boost sees these as ///, which is equivalent to /
-	BOOST_TEST(!FileReader::isUNCPath("//\\"));
-	BOOST_TEST(!FileReader::isUNCPath("\\\\/"));
-	BOOST_TEST(!FileReader::isUNCPath("\\/\\"));
-
-	BOOST_TEST(FileReader::isUNCPath("\\\\"));
-	BOOST_TEST(FileReader::isUNCPath("\\\\root"));
-	BOOST_TEST(FileReader::isUNCPath("\\\\root/"));
-#else
-	// On UNIX it's actually an UNC path
-	BOOST_TEST(FileReader::isUNCPath("//\\"));
-
-	// On UNIX these are just weird relative directory names consisting only of backslashes.
-	BOOST_TEST(!FileReader::isUNCPath("\\\\/"));
-	BOOST_TEST(!FileReader::isUNCPath("\\/\\"));
-
-	BOOST_TEST(!FileReader::isUNCPath("\\\\"));
-	BOOST_TEST(!FileReader::isUNCPath("\\\\root"));
-	BOOST_TEST(!FileReader::isUNCPath("\\\\root/"));
-#endif
-
-	BOOST_TEST(!FileReader::isUNCPath("\\/"));
-	BOOST_TEST(!FileReader::isUNCPath("/\\"));
-
-	BOOST_TEST(!FileReader::isUNCPath(""));
-	BOOST_TEST(!FileReader::isUNCPath("."));
-	BOOST_TEST(!FileReader::isUNCPath(".."));
-	BOOST_TEST(!FileReader::isUNCPath("/"));
-	BOOST_TEST(!FileReader::isUNCPath("a"));
-	BOOST_TEST(!FileReader::isUNCPath("a/b/c"));
-	BOOST_TEST(!FileReader::isUNCPath("contract.sol"));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace solidity::frontend::test
diff --git a/test/libsolidity/lsp/analyze-full-project/C.sol b/test/libsolidity/lsp/analyze-full-project/C.sol
deleted file mode 100644
index d08ba140e517..000000000000
--- a/test/libsolidity/lsp/analyze-full-project/C.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-}
diff --git a/test/libsolidity/lsp/analyze-full-project/D.sol b/test/libsolidity/lsp/analyze-full-project/D.sol
deleted file mode 100644
index 93c8e92fcfaa..000000000000
--- a/test/libsolidity/lsp/analyze-full-project/D.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract D
-{
-}
diff --git a/test/libsolidity/lsp/analyze-full-project/E.sol b/test/libsolidity/lsp/analyze-full-project/E.sol
deleted file mode 100644
index e0e5d19889c0..000000000000
--- a/test/libsolidity/lsp/analyze-full-project/E.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract E
-{
-}
diff --git a/test/libsolidity/lsp/didChange_template.sol b/test/libsolidity/lsp/didChange_template.sol
deleted file mode 100644
index d08ba140e517..000000000000
--- a/test/libsolidity/lsp/didChange_template.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-}
diff --git a/test/libsolidity/lsp/didOpen_with_import.sol b/test/libsolidity/lsp/didOpen_with_import.sol
deleted file mode 100644
index 93880e2cb87c..000000000000
--- a/test/libsolidity/lsp/didOpen_with_import.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import './goto/lib.sol';
-
-contract C
-{
-    function f(uint a, uint b) public pure returns (uint)
-    {
-        return Lib.add(2 * a, b);
-        //     ^^^^^^^ @diagnostics
-    }
-}
diff --git a/test/libsolidity/lsp/goto/goto_definition.sol b/test/libsolidity/lsp/goto/goto_definition.sol
deleted file mode 100644
index 7415d3866a5d..000000000000
--- a/test/libsolidity/lsp/goto/goto_definition.sol
+++ /dev/null
@@ -1,207 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import "./lib.sol";
-//      ^ @importDirective
-
-interface I
-{
-    function f(uint x) external returns (uint);
-    //       ^ @functionF
-}
-
-contract IA is I
-    //   ^^ @IASymbol
-{
-    function f(uint x) public pure override returns (uint) { return x + 1; }
-}
-
-contract IB is I
-{
-    function f(uint x) public pure override returns (uint) { return x + 2; }
-}
-
-library IntLib
-{
-    function add(int self, int b) public pure returns (int) { return self + b; }
-    //       ^^^ @IntLibAdd
-}
-
-contract C
-{
-    I obj;
-    function virtual_inheritance() public payable
-    {
-        obj = new IA();
-        //        ^ @usingIASymbol
-        obj.f(1); // goto-definition should jump to definition of interface.
-    //      ^ @virtualFunctionLookup
-    }
-
-    using IntLib for *;
-    function using_for(int i) pure public
-    {
-        i.add(5);
- //       ^ @usingIntAdd
-        14.add(4);
-    }
-
-    function useLib(uint n) public payable returns (uint)
-    {
-        return Lib.add(n, 1);
-        //     ^ @LibSymbol
-        //         ^ @LibAddSymbol
-    }
-
-    function enums(Color c) public pure returns (Color d)
-    //             ^ @ColorSymbolInParameter
-    {
-        Color e = Color.Red;
-        //    ^ @eVariableDeclaration
-        //              ^ @RedEnumMemberAccess
-        if (c == e)
-        //       ^ @eVariableAccess
-            d = Color.Green;
-        else
-            d = c;
-    }
-
-    type Price is uint128;
-    //   ^^^^^ @PriceDeclaration
-    function udlTest() public pure returns (uint128)
-    {
-        Price p = Price.wrap(128);
-    //  ^ @PriceSymbol
-    //            ^ @PriceInWrap
-        return Price.unwrap(p);
-    }
-
-    function structCtorTest(uint8 v) public pure returns (uint8 result)
-    {
-        RGBColor memory c = RGBColor(v, 2 * v, 3 * v);
-        //                       ^ @RGBColorCursor
-        result = c.red;
-        int a;
-//      ^^^^^ @unusedLocalVar
-    }
-}
-// ----
-// goto_definition: @unusedLocalVar 2072
-// lib: @diagnostics 2072
-// -> textDocument/definition {
-//     "position": @importDirective
-// }
-// <- [
-//     {
-//         "range": {
-//             "end": {
-//                 "character": 0,
-//                 "line": 0
-//             },
-//             "start": {
-//                 "character": 0,
-//                 "line": 0
-//             }
-//         },
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @usingIASymbol
-// }
-// <- [
-//     {
-//         "range": @IASymbol,
-//         "uri": "goto_definition.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @virtualFunctionLookup
-// }
-// <- [
-//     {
-//         "range": @functionF,
-//         "uri": "goto_definition.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @usingIntAdd
-// }
-// <- [
-//     {
-//         "range": @IntLibAdd,
-//         "uri": "goto_definition.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @LibSymbol
-// }
-// <- [
-//     {
-//         "range": @LibLibrary,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @LibAddSymbol
-// }
-// <- [
-//     {
-//         "range": @addSymbol,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @ColorSymbolInParameter
-// }
-// <- [
-//     {
-//         "range": @ColorEnum,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @RedEnumMemberAccess
-// }
-// <- [
-//     {
-//         "range": @EnumMemberRed,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @eVariableAccess
-// }
-// <- [
-//     {
-//         "range": @eVariableDeclaration,
-//         "uri": "goto_definition.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @PriceSymbol
-// }
-// <- [
-//     {
-//         "range": @PriceDeclaration,
-//         "uri": "goto_definition.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @PriceInWrap
-// }
-// <- [
-//     {
-//         "range": @PriceDeclaration,
-//         "uri": "goto_definition.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @RGBColorCursor
-// }
-// <- [
-//     {
-//         "range": @RGBColorStruct,
-//         "uri": "lib.sol"
-//     }
-// ]
diff --git a/test/libsolidity/lsp/goto/goto_definition_imports.sol b/test/libsolidity/lsp/goto/goto_definition_imports.sol
deleted file mode 100644
index dd0267d710b0..000000000000
--- a/test/libsolidity/lsp/goto/goto_definition_imports.sol
+++ /dev/null
@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import {Weather as Wetter} from "./lib.sol";
-//       ^ @wheatherImportCursor
-import "./lib.sol" as That;
-//                    ^^^^ @ThatImport
-
-contract C
-{
-    function test_symbol_alias() public pure returns (Wetter result)
-                                             //        ^ @WetterCursor
-    {
-        result = Wetter.Sunny;
-    }
-
-    function test_library_alias() public pure returns (That.Color result)
-                                                //     ^ @ThatCursor
-    {
-        That.Color color = That.Color.Red;
-//      ^ @ThatVarCursor   ^ @ThatExpressionCursor
-        result = color;
-    }
-}
-// ----
-// lib: @diagnostics 2072
-// -> textDocument/definition {
-//     "position": @wheatherImportCursor
-// }
-// <- [
-//     {
-//         "range": @whetherEnum,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @WetterCursor
-// }
-// <- [
-//     {
-//         "range": @whetherEnum,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @ThatCursor
-// }
-// <- [
-//     {
-//         "range": @ColorEnum,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @ThatVarCursor
-// }
-// <- [
-//     {
-//         "range": @ColorEnum,
-//         "uri": "lib.sol"
-//     }
-// ]
-// -> textDocument/definition {
-//     "position": @ThatExpressionCursor
-// }
-// <- [
-//     {
-//         "range": @ThatImport,
-//         "uri": "goto_definition_imports.sol"
-//     }
-// ]
diff --git a/test/libsolidity/lsp/goto/lib.sol b/test/libsolidity/lsp/goto/lib.sol
deleted file mode 100644
index c476f2dc276d..000000000000
--- a/test/libsolidity/lsp/goto/lib.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-/// Some Error type E.
-error E(uint, uint);
-
-enum Weather {
-//   ^^^^^^^ @whetherEnum
-    Sunny,
-    Cloudy,
-    Rainy
-}
-
-/// Some custom Color enum type holding 3 colors.
-enum Color {
-//   ^^^^^ @ColorEnum
-    /// Red color.
-    Red,
-//  ^^^ @EnumMemberRed
-    /// Green color.
-    Green,
-    /// Blue color.
-    Blue
-}
-
-library Lib
-//   @  ^^^ @LibLibrary
-{
-    function add(uint a, uint b) public pure returns (uint result)
-// ^( @addFunction
-//           ^^^ @addSymbol
-    {
-        result = a + b;
-    }
-
-// ^) @addFunction
-    function warningWithUnused() public pure
-    {
-        uint unused;
-    //  ^^^^^^^^^^^ @diagnostics
-    }
-}
-
-struct RGBColor
-//     ^^^^^^^^ @RGBColorStruct
-{
-    uint8 red;
-    uint8 green;
-    uint8 blue;
-}
-// ----
-// lib: @diagnostics 2072
diff --git a/test/libsolidity/lsp/goto/publish_diagnostics_1.sol b/test/libsolidity/lsp/goto/publish_diagnostics_1.sol
deleted file mode 100644
index 357de7a353f0..000000000000
--- a/test/libsolidity/lsp/goto/publish_diagnostics_1.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract MyContract
-{
-    constructor()
-    {
-        uint unused; // [Warning 2072] Unused local variable.
-   //   ^^^^^^^^^^^ @unusedVariable
-    }
-}
-
-contract D
-{
-    function main() public payable returns (uint)
-                                       //   ^^^^ @unusedReturnVariable
-    {
-        MyContract c = new MyContract();
-   //   ^^^^^^^^^^^^ @unusedContractVariable
-    }
-}
-// ----
-// publish_diagnostics_1: @unusedReturnVariable 6321 @unusedVariable 2072 @unusedContractVariable 2072
diff --git a/test/libsolidity/lsp/goto/publish_diagnostics_2.sol b/test/libsolidity/lsp/goto/publish_diagnostics_2.sol
deleted file mode 100644
index cf052e7c9cc7..000000000000
--- a/test/libsolidity/lsp/goto/publish_diagnostics_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-    function makeSomeError() public pure returns (uint res)
-    {
-        uint x = "hi";
-    //  ^^^^^^^^^^^^^ @conversionError
-        return;
-     // ^^^^^^^ @argumentsRequired
-        res = 2;
-    }
-}
-
-contract D
-{
-    function main() public payable returns (uint)
-    {
-        C c = new C();
-        return c.makeSomeError(2, 3);
-          //   ^^^^^^^^^^^^^^^^^^^^^ @wrongArgumentsCount
-    }
-}
-// ----
-// publish_diagnostics_2: @conversionError 9574 @argumentsRequired 6777 @wrongArgumentsCount 6160
diff --git a/test/libsolidity/lsp/hover/hover.sol b/test/libsolidity/lsp/hover/hover.sol
deleted file mode 100644
index 154d2326e134..000000000000
--- a/test/libsolidity/lsp/hover/hover.sol
+++ /dev/null
@@ -1,112 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-/// Documenting another contract here.
-contract AnotherContract {}
-
-/// User being documented.
-contract User
-{
-    /// Some enum value.
-    enum SomeEnum
-    {
-        Red,
-        Blue
-    }
-
-    /// publicVariable being documented.
-    SomeEnum public publicVariable;
-//  ^ @Cursor1
-//  ^^^^^^^^ @Cursor1Range
-
-    // not documented
-    mapping(int => User.SomeEnum) someRemapping;
-//                      ^ @Cursor2
-//                      ^^^^^^^^ @Cursor2Range
-
-    /// Documenting the setContract().
-    function setValue(User.SomeEnum _value) public
-//                    ^ @Cursor3
-//                    ^^^^ @Cursor3Range
-    {
-        publicVariable = _value;
-//      ^ @Cursor4
-//      ^^^^^^^^^^^^^^ @Cursor4Range
-    }
-
-    function createAnotherContract() public returns (AnotherContract)
-    {
-        return new AnotherContract();
-//                 ^ @Cursor5
-//                 ^^^^^^^^^^^^^^^ @Cursor5Range
-    }
-}
-// ----
-// -> textDocument/hover {
-//     "position": @Cursor1
-// }
-// <- {
-//     "contents": {
-//         "kind": "markdown",
-//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\nSome enum value.\n\n"
-//     },
-//     "range": {
-//         "end": {
-//             "character": 12,
-//             "line": 17
-//         },
-//         "start": {
-//             "character": 4,
-//             "line": 17
-//         }
-//     }
-// }
-// -> textDocument/hover {
-//     "position": @Cursor2
-// }
-// <- {
-//     "contents": {
-//         "kind": "markdown",
-//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\nSome enum value.\n\n"
-//     },
-//     "range": {
-//         "end": {
-//             "character": 32,
-//             "line": 22
-//         },
-//         "start": {
-//             "character": 24,
-//             "line": 22
-//         }
-//     }
-// }
-// -> textDocument/hover {
-//     "position": @Cursor3
-// }
-// <- {
-//     "contents": {
-//         "kind": "markdown",
-//         "value": "```solidity\ntype(contract User)\n```\n\nUser being documented.\n\n"
-//     },
-//     "range": @Cursor3Range
-// }
-// -> textDocument/hover {
-//     "position": @Cursor4
-// }
-// <- {
-//     "contents": {
-//         "kind": "markdown",
-//         "value": "```solidity\nenum User.SomeEnum\n```\n\n"
-//     },
-//     "range": @Cursor4Range
-// }
-// -> textDocument/hover {
-//     "position": @Cursor5
-// }
-// <- {
-//     "contents": {
-//         "kind": "markdown",
-//         "value": "```solidity\ntype(contract AnotherContract)\n```\n\nDocumenting another contract here.\n\n"
-//     },
-//     "range": @Cursor5Range
-// }
diff --git a/test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol
deleted file mode 100644
index d53d359b1248..000000000000
--- a/test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import "otherlib/second.sol";
-
-contract C
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol
deleted file mode 100644
index 0ab2f9c0956e..000000000000
--- a/test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract B
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested-2/A/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/A/foo.sol
deleted file mode 100644
index 1e31dbd99041..000000000000
--- a/test/libsolidity/lsp/include-paths-nested-2/A/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract A
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested-2/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/foo.sol
deleted file mode 100644
index c589b6ae2c4e..000000000000
--- a/test/libsolidity/lsp/include-paths-nested-2/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract RootContract
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol b/test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol
deleted file mode 100644
index d08ba140e517..000000000000
--- a/test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested/A/B/foo.sol b/test/libsolidity/lsp/include-paths-nested/A/B/foo.sol
deleted file mode 100644
index 0ab2f9c0956e..000000000000
--- a/test/libsolidity/lsp/include-paths-nested/A/B/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract B
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested/A/foo.sol b/test/libsolidity/lsp/include-paths-nested/A/foo.sol
deleted file mode 100644
index 1e31dbd99041..000000000000
--- a/test/libsolidity/lsp/include-paths-nested/A/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract A
-{
-}
diff --git a/test/libsolidity/lsp/include-paths-nested/foo.sol b/test/libsolidity/lsp/include-paths-nested/foo.sol
deleted file mode 100644
index c589b6ae2c4e..000000000000
--- a/test/libsolidity/lsp/include-paths-nested/foo.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract RootContract
-{
-}
diff --git a/test/libsolidity/lsp/include-paths/default_include.sol b/test/libsolidity/lsp/include-paths/default_include.sol
deleted file mode 100644
index 54bc859e050f..000000000000
--- a/test/libsolidity/lsp/include-paths/default_include.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import "my-module/test.sol";
-
-contract MyContract
-{
-    function f(uint a, uint b) public pure returns (uint)
-    {
-        return MyModule.add(a, b);
-    }
-}
-// ----
-// test:
diff --git a/test/libsolidity/lsp/include-paths/file_at_include_path.sol b/test/libsolidity/lsp/include-paths/file_at_include_path.sol
deleted file mode 100644
index ec15e1533d08..000000000000
--- a/test/libsolidity/lsp/include-paths/file_at_include_path.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import "rootlib.sol";
-
-contract MyContract
-{
-}
-// ----
-// rootlib:
diff --git a/test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol b/test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol
deleted file mode 100644
index 8dcefeca2fd7..000000000000
--- a/test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-   import "test.sol";
-// ^^^^^^^^^^^^^^^^^^ @IncludeLocation
-
-contract SomeContract
-{
-}
-// ----
-// file_not_found_in_searchpath: @IncludeLocation 6275
diff --git a/test/libsolidity/lsp/include-paths/using-custom-includes.sol b/test/libsolidity/lsp/include-paths/using-custom-includes.sol
deleted file mode 100644
index 2e2560d0d7c1..000000000000
--- a/test/libsolidity/lsp/include-paths/using-custom-includes.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-   import "otherlib/otherlib.sol";
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @NotFound
-
-contract MyContract
-{
-}
-// ----
-// using-custom-includes: @NotFound 6275
diff --git a/test/libsolidity/lsp/node_modules/my-module/test.sol b/test/libsolidity/lsp/node_modules/my-module/test.sol
deleted file mode 100644
index dffcb719f5cf..000000000000
--- a/test/libsolidity/lsp/node_modules/my-module/test.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-library MyModule
-{
-    function add(uint a, uint b) public pure returns (uint)
-    {
-        return a + b;
-    }
-}
diff --git a/test/libsolidity/lsp/node_modules/rootlib.sol b/test/libsolidity/lsp/node_modules/rootlib.sol
deleted file mode 100644
index cbcf206a0664..000000000000
--- a/test/libsolidity/lsp/node_modules/rootlib.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-library MyRootLib
-{
-}
diff --git a/test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol b/test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol
deleted file mode 100644
index 20a981ff9f1d..000000000000
--- a/test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-library OtherLib
-{
-    function f(uint n) public returns (uint) { return n + 1; }
-}
diff --git a/test/libsolidity/lsp/other-include-dir/otherlib/second.sol b/test/libsolidity/lsp/other-include-dir/otherlib/second.sol
deleted file mode 100644
index 2f32daac268d..000000000000
--- a/test/libsolidity/lsp/other-include-dir/otherlib/second.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-library Second
-{
-    function f(uint n) public pure returns (uint) { return n + 1; }
-}
diff --git a/test/libsolidity/lsp/publish_diagnostics_3.sol b/test/libsolidity/lsp/publish_diagnostics_3.sol
deleted file mode 100644
index 45b418a9039a..000000000000
--- a/test/libsolidity/lsp/publish_diagnostics_3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-abstract contract A {
-    function a() public virtual;
-}
-
-contract B is A
-// ^( @notAbstract
-{
-}
-// ^) @notAbstract
diff --git a/test/libsolidity/lsp/rename/contract.sol b/test/libsolidity/lsp/rename/contract.sol
deleted file mode 100644
index 5bdc14fe6123..000000000000
--- a/test/libsolidity/lsp/rename/contract.sol
+++ /dev/null
@@ -1,307 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract ToRename
-//       ^ @CursorOnContractDefinition
-//       ^^^^^^^^ @ContractInDefinition
-{
-}
-
-contract User
-//       ^^^^ @UserContractInContractTest
-{
-    ToRename public publicVariable;
-//  ^^^^^^^^ @ContractInPublicVariable
-//         ^ @CursorOnPublicVariableType
-
-    ToRename[10] previousContracts;
-//  ^^^^^^^^ @ContractInArrayType
-//   ^ @CursorOnArrayType
-
-    mapping(int => ToRename) contractMapping;
-    //             ^^^^^^^^ @ContractInMapping
-    //              ^ @CursorOnMapping
-
-    function getContract() public returns (ToRename)
-                                  //       ^^^^^^^^ @ContractInReturnParameter
-//                                            ^ @CursorOnReturnParameter
-    {
-        return new ToRename();
-        //         ^^^^^^^^ @ContractInReturnExpression
-//                    ^ @CursorOnReturnExpression
-    }
-
-    function setContract(ToRename _contract) public
-    //                   ^^^^^^^^ @ContractInParameter
-    //                        ^ @CursorOnParameter
-    {
-        publicVariable = _contract;
-    }
-}
-// ----
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnContractDefinition
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnReturnParameter
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnReturnExpression
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnPublicVariableType
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnArrayType
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnMapping
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnParameter
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ]
-//     }
-// }
diff --git a/test/libsolidity/lsp/rename/function.sol b/test/libsolidity/lsp/rename/function.sol
deleted file mode 100644
index 852086c2c785..000000000000
--- a/test/libsolidity/lsp/rename/function.sol
+++ /dev/null
@@ -1,193 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-    function renameMe() public pure returns (int)
-    //       ^^^^^^^^ @FunctionInDefinition
-    //            ^ @CursorInDefinition
-    {
-        return 1;
-    }
-
-    function other() public view
-    {
-        renameMe();
-//      ^^^^^^^^ @FunctionInFunctionSameContract
-//         ^ @CursorInFunctionSameContract
-        this.renameMe();
-     //      ^^^^^^^^ @FunctionInFunctionSameContractExternal
-         //         ^ @CursorInFunctionSameContractExternal
-    }
-}
-
-contract Other
-{
-    C m_contract;
-
-    function other() public view
-    {
-        m_contract.renameMe();
-           //      ^^^^^^^^ @FunctionInFunctionOtherContract
-        //         ^ @CursorInFunctionOtherContract
-    }
-}
-
-function free() pure
-{
-    C local_contract;
-    local_contract.renameMe();
-           //      ^^^^^^^^ @FunctionInFreeFunction
-        //         ^ @CursorInFreeFunction
-}
-// ----
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorInDefinition
-// }
-// <- {
-//     "changes": {
-//         "rename/function.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionOtherContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContractExternal
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorInFunctionOtherContract
-// }
-// <- {
-//     "changes": {
-//         "rename/function.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionOtherContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContractExternal
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorInFunctionSameContractExternal
-// }
-// <- {
-//     "changes": {
-//         "rename/function.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionOtherContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContractExternal
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorInFunctionSameContract
-// }
-// <- {
-//     "changes": {
-//         "rename/function.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionOtherContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContractExternal
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorInFreeFunction
-// }
-// <- {
-//     "changes": {
-//         "rename/function.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionOtherContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContractExternal
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInFunctionSameContract
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FunctionInDefinition
-//             }
-//         ]
-//     }
-// }
diff --git a/test/libsolidity/lsp/rename/functionCall.sol b/test/libsolidity/lsp/rename/functionCall.sol
deleted file mode 100644
index f8417fab9065..000000000000
--- a/test/libsolidity/lsp/rename/functionCall.sol
+++ /dev/null
@@ -1,202 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-    function foo(int a, int b, int c) pure public returns(int)
-    //                      ^ @ParameterB
-    //               ^ @ParameterA
-    //                             ^ @ParameterC
-    {
-        return a + b + c;
-        //         ^ @ParameterBInFoo
-        //     ^ @ParameterAInFoo
-        //             ^ @ParameterCInFoo
-
-    }
-
-    function bar() public view
-    {
-        this.foo({c:1, b:2, a:3});
-        //             ^ @ParameterBInCall
-        //        ^ @ParameterCInCall
-        //                  ^ @ParameterAInCall
-    }
-}
-// ----
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterA
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterAInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterAInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterA
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterAInCall
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterAInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterAInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterA
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterAInFoo
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterAInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterAInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterA
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterC
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterCInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterCInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterC
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterCInCall
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterCInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterCInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterC
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterCInFoo
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterCInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterCInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterC
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterBInCall
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterBInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterBInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterB
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @ParameterBInFoo
-// }
-// <- {
-//     "changes": {
-//         "rename/functionCall.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterBInCall
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterBInFoo
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ParameterB
-//             }
-//         ]
-//     }
-// }
diff --git a/test/libsolidity/lsp/rename/import_directive.sol b/test/libsolidity/lsp/rename/import_directive.sol
deleted file mode 100644
index 70d86f5d0619..000000000000
--- a/test/libsolidity/lsp/rename/import_directive.sol
+++ /dev/null
@@ -1,246 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-import "./contract.sol" as externalFile;
-//                         ^^^^^^^^^^^^ @FileAliasInImportDirective
-//                             ^ @CursorOnFileAliasInImportDirective
-import {ToRename as ExternalContract, User} from "./contract.sol";
-//                  ^^^^^^^^^^^^^^^^ @RenamedContractInImportDirective
-//                         ^ @CursorOnRenamedContractInImportDirective
-//      ^^^^^^^^ @OriginalNameInImportDirective
-//      ^ @CursorOnOriginalNameInImportDirective
-//                                    ^^^^ @UserInImportDirective
-//                                    ^ @CursorOnUserInImportDirective
-
-contract C
-{
-    ExternalContract public externalContract;
-//  ^^^^^^^^^^^^^^^^ @RenamedContractInPublicVariable
-//        ^ @CursorOnRenamedContractInPublicVariable
-    externalFile.ToRename public externalFileContract;
-//  ^^^^^^^^^^^^ @FileAliasInPublicVariable
-//  ^ @CursorOnFileAliasInPublicVariable
-//               ^^^^^^^^ @OriginalNameInPublicVariable
-//                      ^ @CursorOnOriginalNameInPublicVariable
-    User public externalUserContract;
-//  ^^^^ @UserInPublicVariable
-//     ^ @CursorOnUserInPublicVariable
-}
-// ----
-// contract:
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnFileAliasInImportDirective
-// }
-// <- {
-//     "changes": {
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FileAliasInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FileAliasInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnRenamedContractInImportDirective
-// }
-// <- {
-//     "changes": {
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @RenamedContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @RenamedContractInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnOriginalNameInImportDirective
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ],
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @OriginalNameInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @OriginalNameInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnRenamedContractInPublicVariable
-// }
-// <- {
-//     "changes": {
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @RenamedContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @RenamedContractInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnFileAliasInPublicVariable
-// }
-// <- {
-//     "changes": {
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FileAliasInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @FileAliasInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnOriginalNameInPublicVariable
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnExpression
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInReturnParameter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInMapping
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInArrayType
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @ContractInDefinition
-//             }
-//         ],
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @OriginalNameInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @OriginalNameInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnUserInPublicVariable
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @UserContractInContractTest
-//             }
-//         ],
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @UserInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @UserInImportDirective
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnUserInImportDirective
-// }
-// <- {
-//     "changes": {
-//         "rename/contract.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @UserContractInContractTest
-//             }
-//         ],
-//         "rename/import_directive.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @UserInPublicVariable
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @UserInImportDirective
-//             }
-//         ]
-//     }
-// }
diff --git a/test/libsolidity/lsp/rename/variable.sol b/test/libsolidity/lsp/rename/variable.sol
deleted file mode 100644
index a3c08f320229..000000000000
--- a/test/libsolidity/lsp/rename/variable.sol
+++ /dev/null
@@ -1,131 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-    int public renameMe;
-    //         ^^^^^^^^ @VariableInDefinition
-    //         ^ @CursorOnVariableDefinition
-
-    function foo() public returns(int)
-    {
-        renameMe = 1;
-//      ^^^^^^^^ @VariableInFunction
-//             ^ @CursorOnVariableInFunction
-        return this.renameMe();
-//                  ^^^^^^^^ @VariableInGetter
-//                     ^ @CursorOnVariableInGetter
-    }
-}
-
-function freeFunction(C _contract) view returns(int)
-{
-    return _contract.renameMe();
-    //               ^^^^^^^^ @VariableInFreeFunction
-    //                 ^ @CursorOnVariableInFreeFunction
-}
-// ----
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnVariableInFunction
-// }
-// <- {
-//     "changes": {
-//         "rename/variable.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInGetter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnVariableDefinition
-// }
-// <- {
-//     "changes": {
-//         "rename/variable.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInGetter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnVariableInGetter
-// }
-// <- {
-//     "changes": {
-//         "rename/variable.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInGetter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInDefinition
-//             }
-//         ]
-//     }
-// }
-// -> textDocument/rename {
-//     "newName": "Renamed",
-//     "position": @CursorOnVariableInFreeFunction
-// }
-// <- {
-//     "changes": {
-//         "rename/variable.sol": [
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFreeFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInGetter
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInFunction
-//             },
-//             {
-//                 "newText": "Renamed",
-//                 "range": @VariableInDefinition
-//             }
-//         ]
-//     }
-// }
diff --git a/test/libsolidity/lsp/semanticTokens/enums.sol b/test/libsolidity/lsp/semanticTokens/enums.sol
deleted file mode 100644
index 848c08e7fe55..000000000000
--- a/test/libsolidity/lsp/semanticTokens/enums.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-enum Weather {
-    Sunny,
-    Cloudy,
-    Rainy
-}
-
-enum Color {
-    Red,
-    Green,
-    Blue
-}
-
-function getColorEnum() pure returns (Color result)
-{
-    result = Color.Red;
-}
-// ----
-// -> textDocument/semanticTokens/full {
-// }
-// <- {
-//     "data": [
-//         1, 0, 24, 8, 0,
-//         2, 5, 7, 2, 0,
-//         1, 4, 5, 3, 0,
-//         1, 4, 6, 3, 0,
-//         1, 4, 5, 3, 0,
-//         3, 5, 5, 2, 0,
-//         1, 4, 3, 3, 0,
-//         1, 4, 5, 3, 0,
-//         1, 4, 4, 3, 0,
-//         3, 9, 12, 5, 0,
-//         0, 29, 5, 2, 0,
-//         0, 6, 6, 19, 0,
-//         2, 4, 6, 2, 0,
-//         0, 9, 5, 2, 0,
-//         0, 6, 3, 3, 0
-//     ]
-// }
diff --git a/test/libsolidity/lsp/semanticTokens/functions.sol b/test/libsolidity/lsp/semanticTokens/functions.sol
deleted file mode 100644
index a7a53495fddc..000000000000
--- a/test/libsolidity/lsp/semanticTokens/functions.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-library Lib
-{
-    function add(uint a, uint b) public pure returns (uint result)
-    {
-        result = a + b;
-    }
-
-    function warningWithUnused() public pure
-    {
-        uint unused;
-//      ^^^^^^^^^^^ @unusedVariable
-    }
-}
-
-contract Contract
-{
-    function doNothing() pure public returns (bool)
-    {
-        return true;
-    }
-}
-// ----
-// functions: @unusedVariable 2072
-// -> textDocument/semanticTokens/full {
-// }
-// <- {
-//     "data": [
-//         1, 0, 24, 8, 0,
-//         2, 8, 3, 0, 0,
-//         2, 13, 3, 5, 0,
-//         0, 4, 4, 11, 0,
-//         0, 5, 1, 19, 0,
-//         0, 3, 4, 11, 0,
-//         0, 5, 1, 19, 0,
-//         0, 24, 4, 11, 0,
-//         0, 5, 6, 19, 0,
-//         2, 8, 6, 19, 0,
-//         0, 9, 1, 19, 0,
-//         0, 4, 1, 19, 0,
-//         3, 13, 17, 5, 0,
-//         2, 8, 4, 11, 0,
-//         0, 5, 6, 19, 0,
-//         5, 9, 8, 0, 0,
-//         2, 13, 9, 5, 0,
-//         0, 33, 4, 11, 0,
-//         2, 15, 4, 11, 0
-//     ]
-// }
diff --git a/test/libsolidity/lsp/semanticTokens/modifiers.sol b/test/libsolidity/lsp/semanticTokens/modifiers.sol
deleted file mode 100644
index 5a4b5a39c189..000000000000
--- a/test/libsolidity/lsp/semanticTokens/modifiers.sol
+++ /dev/null
@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-contract C
-{
-    bool public locked = false;
-    int public calls = 0;
-    int public totalSum = 0;
-
-    function add(uint a, uint b) lock() monitor(a, b) public returns (uint result)
-    {
-        result = a + b;
-    }
-
-    modifier lock()
-    {
-        require(!locked);
-        locked = true;
-        _;
-        locked = false;
-    }
-
-    modifier monitor(uint a, uint b)
-    {
-        calls++;
-        totalSum = totalSum + a + b;
-        //         ^^^^^^^^^^^^^^^^ @totalSumWarning
-        //         ^^^^^^^^^^^^ @totalSumWarningSub
-        _;
-    }
-}
-// ----
-// modifiers: @totalSumWarningSub 2271 @totalSumWarning 2271
-// -> textDocument/semanticTokens/full {
-// }
-// <- {
-//     "data": [
-//         1, 0, 24, 8, 0,
-//         2, 9, 1, 0, 0,
-//         2, 4, 4, 11, 0,
-//         0, 12, 6, 19, 0,
-//         0, 9, 5, 11, 0,
-//         1, 4, 3, 11, 0,
-//         0, 11, 5, 19, 0,
-//         0, 8, 1, 11, 0,
-//         1, 4, 3, 11, 0,
-//         0, 11, 8, 19, 0,
-//         0, 11, 1, 11, 0,
-//         2, 13, 3, 5, 0,
-//         0, 4, 4, 11, 0,
-//         0, 5, 1, 19, 0,
-//         0, 3, 4, 11, 0,
-//         0, 5, 1, 19, 0,
-//         0, 40, 4, 11, 0,
-//         0, 5, 6, 19, 0,
-//         0, -42, 4, 19, 0,
-//         0, 7, 7, 19, 0,
-//         0, 8, 1, 19, 0,
-//         0, 3, 1, 19, 0,
-//         2, 8, 6, 19, 0,
-//         0, 9, 1, 19, 0,
-//         0, 4, 1, 19, 0,
-//         3, 13, 4, 10, 0,
-//         2, 8, 7, 19, 0,
-//         0, 9, 6, 19, 0,
-//         1, 8, 6, 19, 0,
-//         0, 9, 4, 11, 0,
-//         2, 8, 6, 19, 0,
-//         0, 9, 5, 11, 0,
-//         3, 13, 7, 10, 0,
-//         0, 8, 4, 11, 0,
-//         0, 5, 1, 19, 0,
-//         0, 3, 4, 11, 0,
-//         0, 5, 1, 19, 0,
-//         2, 8, 5, 19, 0,
-//         1, 8, 8, 19, 0,
-//         0, 11, 8, 19, 0,
-//         0, 11, 1, 19, 0,
-//         0, 4, 1, 19, 0
-//     ]
-// }
diff --git a/test/libsolidity/lsp/semanticTokens/structs.sol b/test/libsolidity/lsp/semanticTokens/structs.sol
deleted file mode 100644
index ddbbcf3ce055..000000000000
--- a/test/libsolidity/lsp/semanticTokens/structs.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.0;
-
-struct Tag
-{
-    uint id;
-    string name;
-}
-
-struct RGBColor
-{
-    uint8 red;
-    uint8 green;
-    uint8 blue;
-    Tag tag;
-}
-
-function memberAccess(RGBColor memory color) pure returns(uint)
-{
-    return color.red + color.green + color.blue;
-}
-// ----
-// -> textDocument/semanticTokens/full {
-// }
-// <- {
-//     "data": [
-//         1, 0, 24, 8, 0,
-//         4, 4, 4, 11, 0,
-//         0, 5, 2, 19, 0,
-//         1, 4, 6, 17, 0,
-//         0, 7, 4, 19, 0,
-//         5, 4, 5, 11, 0,
-//         0, 6, 3, 19, 0,
-//         1, 4, 5, 11, 0,
-//         0, 6, 5, 19, 0,
-//         1, 4, 5, 11, 0,
-//         0, 6, 4, 19, 0,
-//         1, 4, 3, 16, 0,
-//         0, 4, 3, 19, 0,
-//         3, 9, 12, 5, 0,
-//         0, 13, 8, 16, 0,
-//         0, 16, 5, 19, 0,
-//         0, 20, 4, 11, 0,
-//         2, 17, 3, 19, 0,
-//         0, 12, 5, 19, 0,
-//         0, 14, 4, 19, 0
-//     ]
-// }
diff --git a/test/libsolidity/memoryGuardTests/comment/constructor_safe_deploy_unsafe.sol b/test/libsolidity/memoryGuardTests/comment/constructor_safe_deploy_unsafe.sol
deleted file mode 100644
index 2ab905ad83b3..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/constructor_safe_deploy_unsafe.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    constructor() {
-        uint256 x;
-        assembly { x := 0 }
-        f();
-    }
-    function f() internal pure {
-        /// @solidity memory-safe-assembly
-        assembly { mstore(0, 0) }
-    }
-    function g() public pure {
-        assembly { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/comment/constructor_unsafe_deploy_safe.sol b/test/libsolidity/memoryGuardTests/comment/constructor_unsafe_deploy_safe.sol
deleted file mode 100644
index 12b7e772f05e..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/constructor_unsafe_deploy_safe.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    constructor() {
-        uint256 x;
-        assembly { x := 0 }
-        f();
-    }
-    function f() internal pure {
-        assembly { mstore(0, 0) }
-    }
-    function g() public pure {
-        /// @solidity memory-safe-assembly
-        assembly { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) false
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/comment/free_function.sol b/test/libsolidity/memoryGuardTests/comment/free_function.sol
deleted file mode 100644
index a417189ed301..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/free_function.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-function safe() pure returns (uint256 x) {
-    assembly { x := 42 }
-    /// @solidity memory-safe-assembly
-    assembly { mstore(0, 0) }
-}
-function unsafe() pure returns (uint256 x) {
-    assembly { pop(mload(0)) }
-}
-contract C {
-    constructor() {
-        unsafe();
-    }
-    function f() public pure {
-        safe();
-    }
-}
-contract D {
-    constructor() {
-        safe();
-    }
-    function f() public pure {
-        unsafe();
-    }
-}
-// ----
-// :C(creation) false
-// :C(runtime) true
-// :D(creation) true
-// :D(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/comment/multi_annotation.sol b/test/libsolidity/memoryGuardTests/comment/multi_annotation.sol
deleted file mode 100644
index 478546b8336c..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/multi_annotation.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    constructor() {
-        /// @solidity memory-safe-assembly    a memory-safe-assembly
-        assembly { mstore(0, 0) }
-    }
-    function f() internal pure {
-        /// @solidity a memory-safe-assembly
-        assembly { mstore(0, 0) }
-        /// @solidity a
-        ///           memory-safe-assembly
-        ///           b
-        assembly { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/comment/multiple_contracts.sol b/test/libsolidity/memoryGuardTests/comment/multiple_contracts.sol
deleted file mode 100644
index 84d2cb4537f6..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/multiple_contracts.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    constructor(uint256 x) {
-        assembly { x := 4 }
-        /// @solidity memory-safe-assembly
-        assembly { mstore(0, 0) }
-    }
-    function f() public pure {
-        assembly { mstore(0,0) }
-    }
-}
-contract D {
-    constructor() {
-        assembly { mstore(0,0) }
-    }
-    function f(uint256 x) public pure {
-        assembly { x := 4 }
-        /// @solidity memory-safe-assembly
-        assembly { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
-// :D(creation) false
-// :D(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_empty.sol b/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_empty.sol
deleted file mode 100644
index 614201deb4c0..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_empty.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() external pure {
-        /// @solidity memory-safe-assembly
-        assembly {}
-        assembly {}
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_unsafe.sol b/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_unsafe.sol
deleted file mode 100644
index 32d19993c0e2..000000000000
--- a/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_unsafe.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() external pure {
-        /// @solidity memory-safe-assembly
-        assembly {}
-        assembly { mstore(0,0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol b/test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol
deleted file mode 100644
index 8c5aa229dcb6..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    constructor() {
-        uint256 x;
-        assembly { x := 0 }
-        f();
-    }
-    function f() internal pure {
-        assembly "evmasm" ("memory-safe") { mstore(0, 0) }
-        assembly ("memory-safe") { mstore(0, 0) }
-    }
-    function g() public pure {
-        assembly { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol b/test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol
deleted file mode 100644
index 595e25914589..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    constructor() {
-        uint256 x;
-        assembly { x := 0 }
-        f();
-    }
-    function f() internal pure {
-        assembly { mstore(0, 0) }
-    }
-    function g() public pure {
-        assembly "evmasm" ("memory-safe") { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) false
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/dialectString/free_function.sol b/test/libsolidity/memoryGuardTests/dialectString/free_function.sol
deleted file mode 100644
index 9e3d2a4b51b4..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/free_function.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-function safe() pure returns (uint256 x) {
-    assembly { x := 42 }
-    assembly "evmasm" ("memory-safe") { mstore(0, 0) }
-}
-function unsafe() pure returns (uint256 x) {
-    assembly { pop(mload(0)) }
-}
-contract C {
-    constructor() {
-        unsafe();
-    }
-    function f() public pure {
-        safe();
-    }
-}
-contract D {
-    constructor() {
-        safe();
-    }
-    function f() public pure {
-        unsafe();
-    }
-}
-// ----
-// :C(creation) false
-// :C(runtime) true
-// :D(creation) true
-// :D(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol b/test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol
deleted file mode 100644
index 2ee227bc69c4..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    constructor(uint256 x) {
-        assembly { x := 4 }
-        assembly "evmasm" ("memory-safe") { mstore(0, 0) }
-    }
-    function f() public pure {
-        assembly { mstore(0,0) }
-    }
-}
-contract D {
-    constructor() {
-        assembly { mstore(0,0) }
-    }
-    function f(uint256 x) public pure {
-        assembly { x := 4 }
-        assembly ("memory-safe") { mstore(0, 0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
-// :D(creation) false
-// :D(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol b/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol
deleted file mode 100644
index ab653be97aff..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() external pure {
-        assembly "evmasm" ("memory-safe") {}
-        assembly {}
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol b/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol
deleted file mode 100644
index 8b865d5b8460..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() external pure {
-        assembly "evmasm" ("memory-safe") {}
-        assembly { mstore(0,0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/stub.sol b/test/libsolidity/memoryGuardTests/dialectString/stub.sol
deleted file mode 100644
index 65f6447c1802..000000000000
--- a/test/libsolidity/memoryGuardTests/dialectString/stub.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {}
-// ----
-// :C(creation) true
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/stub.sol b/test/libsolidity/memoryGuardTests/stub.sol
deleted file mode 100644
index 65f6447c1802..000000000000
--- a/test/libsolidity/memoryGuardTests/stub.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {}
-// ----
-// :C(creation) true
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol b/test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol
deleted file mode 100644
index 8af88d75d038..000000000000
--- a/test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint256 x, uint256 y) public pure returns (uint256 z){
-        assembly { z := add(x, y) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
deleted file mode 100644
index 88f826fdb944..000000000000
--- a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly { mstore(0,0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol
deleted file mode 100644
index c7519a65e03f..000000000000
--- a/test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes memory x;
-        assembly {
-            x := 0
-        }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/natspecJSON/custom.sol b/test/libsolidity/natspecJSON/custom.sol
deleted file mode 100644
index 28073c0bf68e..000000000000
--- a/test/libsolidity/natspecJSON/custom.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-/// @custom:x one two three
-/// @custom:y line
-/// break
-/// @custom:t one
-/// @custom:t two
-contract A {
-    /// @custom:note statevar
-    uint x;
-    /// @custom:since 2014
-    function g(int x) public pure virtual returns (int, int) { return (1, 2); }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "custom:t": "onetwo",
-//     "custom:x": "one two three",
-//     "custom:y": "line break",
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "custom:since": "2014"
-//         }
-//     },
-//     "stateVariables":
-//     {
-//         "x":
-//         {
-//             "custom:note": "statevar"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/custom_inheritance.sol b/test/libsolidity/natspecJSON/custom_inheritance.sol
deleted file mode 100644
index c4a1360fbbc1..000000000000
--- a/test/libsolidity/natspecJSON/custom_inheritance.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract A {
-    /// @custom:since 2014
-    function g(uint x) public pure virtual {}
-}
-contract B is A {
-    function g(uint x) public pure override {}
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(uint256)":
-//         {
-//             "custom:since": "2014"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
deleted file mode 100644
index 422522354481..000000000000
--- a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract test {
-    /// @notice Multiplies `a` by 7
-    /// @dev Multiplies a number by 7
-    function mul(uint a) public returns (uint d) { return a * 7; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256)":
-//         {
-//             "details": "Multiplies a number by 7"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "mul(uint256)":
-//         {
-//             "notice": "Multiplies `a` by 7"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
deleted file mode 100644
index db7447914b38..000000000000
--- a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract test {
-    function mul(uint a) public returns (uint d) {
-        return a * 7;
-    }
-    function sub(int input) public returns (int d) {
-        return input - 3;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_author_at_function.sol b/test/libsolidity/natspecJSON/dev_author_at_function.sol
deleted file mode 100644
index 10a21f753d93..000000000000
--- a/test/libsolidity/natspecJSON/dev_author_at_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-/// @author Lefteris
-/// @title Just a test contract
-contract test {
-    /// @dev Mul function
-    /// @author John Doe
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 6546: (73-119): Documentation tag @author not valid for functions.
diff --git a/test/libsolidity/natspecJSON/dev_constructor.sol b/test/libsolidity/natspecJSON/dev_constructor.sol
deleted file mode 100644
index 9cb1e05affde..000000000000
--- a/test/libsolidity/natspecJSON/dev_constructor.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract test {
-    /// @param a the parameter a is really nice and very useful
-    /// @param second the second parameter is not very useful, it just provides additional confusion
-    constructor(uint a, uint second) { }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "constructor":
-//         {
-//             "params":
-//             {
-//                 "a": "the parameter a is really nice and very useful",
-//                 "second": "the second parameter is not very useful, it just provides additional confusion"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
deleted file mode 100644
index 0954009f985c..000000000000
--- a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-contract test {
-    /// @param a the parameter a is really nice and very useful
-    /// @param second the second parameter is not very useful, it just provides additional confusion
-    constructor(uint a, uint second) { }
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return d The result of the multiplication
-    /// and cookies with nutella
-    function mul(uint a, uint second) public returns(uint d) {
-        return a * 7 + second;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "constructor":
-//         {
-//             "params":
-//             {
-//                 "a": "the parameter a is really nice and very useful",
-//                 "second": "the second parameter is not very useful, it just provides additional confusion"
-//             }
-//         },
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication and cookies with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_return.sol b/test/libsolidity/natspecJSON/dev_constructor_return.sol
deleted file mode 100644
index 4695806d26ba..000000000000
--- a/test/libsolidity/natspecJSON/dev_constructor_return.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    /// @param a the parameter a is really nice and very useful
-    /// @param second the second parameter is not very useful, it just provides additional confusion
-    /// @return return should not work within constructors
-    constructor(uint a, uint second) { }
-}
-
-// ----
-// DocstringParsingError 6546: (20-239): Documentation tag @return not valid for constructor.
-// DocstringParsingError 2604: (20-239): Documentation tag "@return return should not work within constructors" exceeds the number of return parameters.
diff --git a/test/libsolidity/natspecJSON/dev_contract_doc.sol b/test/libsolidity/natspecJSON/dev_contract_doc.sol
deleted file mode 100644
index 3958a01edd43..000000000000
--- a/test/libsolidity/natspecJSON/dev_contract_doc.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-/// @author Lefteris
-/// @title Just a test contract
-contract test {
-    /// @dev Mul function
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "author": "Lefteris",
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Mul function"
-//         }
-//     },
-//     "title": "Just a test contract",
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
deleted file mode 100644
index a60847d7e2c4..000000000000
--- a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract test {
-    /// @dev Mul function
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Mul function"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit.sol b/test/libsolidity/natspecJSON/dev_default_inherit.sol
deleted file mode 100644
index dd65ddfbebaf..000000000000
--- a/test/libsolidity/natspecJSON/dev_default_inherit.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// Second line.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract Middle is ERC20 {
-    function transfer(address to, uint amount) virtual override external returns (bool)
-    {
-    return false;
-    }
-}
-
-contract Token is Middle {
-    function transfer(address to, uint amount) override external returns (bool)
-    {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
deleted file mode 100644
index 89d57d011cfe..000000000000
--- a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-contract C {
-    /// @notice Hello world
-    /// @dev test
-    function x() virtual external returns (uint) {
-        return 1;
-    }
-}
-
-contract D is C {
-    uint public override x;
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "x":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
deleted file mode 100644
index fd83ff1b970a..000000000000
--- a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract test {
-    /// @dev
-    /// Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param second Documentation for the second parameter
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter",
-//                 "second": "Documentation for the second parameter"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name.sol b/test/libsolidity/natspecJSON/dev_different_return_name.sol
deleted file mode 100644
index 7d74cc29453f..000000000000
--- a/test/libsolidity/natspecJSON/dev_different_return_name.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract A {
-    /// @return y value
-    function g(int x) public pure virtual returns (int y) { return x; }
-}
-
-contract B is A {
-    function g(int x) public pure override returns (int z) { return x; }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "y": "value"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "z": "value"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
deleted file mode 100644
index 2a8ba399f4f9..000000000000
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
+++ /dev/null
@@ -1,59 +0,0 @@
-contract A {
-    /// @return a value A
-    /// @return b value B
-    function g(int x) public pure virtual returns (int a, int b) { return (1, 2); }
-}
-
-contract B is A {
-    function g(int x) public pure override returns (int z, int y) { return (1, 2); }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "a": "value A",
-//                 "b": "value B"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "y": "value B",
-//                 "z": "value A"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
deleted file mode 100644
index c41336d8f4f7..000000000000
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
+++ /dev/null
@@ -1,59 +0,0 @@
-contract A {
-    /// @return value A
-    /// @return b value B
-    function g(int x) public pure virtual returns (int, int b) { return (1, 2); }
-}
-
-contract B is A {
-    function g(int x) public pure override returns (int z, int) { return (1, 2); }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "_0": "value A",
-//                 "b": "value B"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "_1": "value B",
-//                 "z": "value A"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
deleted file mode 100644
index 3bf40011faed..000000000000
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
+++ /dev/null
@@ -1,59 +0,0 @@
-contract A {
-    /// @return value A
-    /// @return value B
-    function g(int x) public pure virtual returns (int, int) { return (1, 2); }
-}
-
-contract B is A {
-    function g(int x) public pure override returns (int z, int y) { return (1, 2); }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "_0": "value A",
-//                 "_1": "value B"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "y": "value B",
-//                 "z": "value A"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
deleted file mode 100644
index e02437acedfb..000000000000
--- a/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param second
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 9942: (20-156): No description given for param second
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
deleted file mode 100644
index c8da55d75ebd..000000000000
--- a/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 3335: (20-149): No param name given
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
deleted file mode 100644
index 500092e1d16e..000000000000
--- a/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param se
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 9942: (20-152): No description given for param se
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol b/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
deleted file mode 100644
index 2a99c78a81ec..000000000000
--- a/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param second Documentation for the second parameter
-    /// @return
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 5856: (20-211): Documentation tag "@return " does not contain the name of its return parameter.
diff --git a/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol b/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
deleted file mode 100644
index a2ebc26525ed..000000000000
--- a/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param not_existing Documentation for the second parameter
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 3881: (20-201): Documented parameter "not_existing" not found in the parameter list of the function.
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
deleted file mode 100644
index a8ddb3133183..000000000000
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
+++ /dev/null
@@ -1,98 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 {
-    function transfer(address to, uint amount) virtual external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC21, ERC20 {
-    /// @inheritdoc ERC20
-    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
deleted file mode 100644
index 4c726f552f9c..000000000000
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 is ERC20 {
-    function transfer(address to, uint amount) virtual override external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC20 {
-    /// @inheritdoc ERC20
-    function transfer(address to, uint amount) override external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
deleted file mode 100644
index 38726c7786a2..000000000000
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
+++ /dev/null
@@ -1,122 +0,0 @@
-==== Source: Interfaces.sol ====
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-interface ERC21 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test2
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-==== Source: Testfile.sol ====
-import "Interfaces.sol" as myInterfaces;
-
-contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
-    /// @inheritdoc myInterfaces.ERC20
-    function transfer(address too, uint amount)
-        override(myInterfaces.ERC20, myInterfaces.ERC21) external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// Interfaces.sol:ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// Interfaces.sol:ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// Interfaces.sol:ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test2",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// Interfaces.sol:ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// Testfile.sol:Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// Testfile.sol:Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
deleted file mode 100644
index c69bd4121747..000000000000
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
+++ /dev/null
@@ -1,100 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 {
-    function transfer(address to, uint amount) virtual external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC21, ERC20 {
-    /// @inheritdoc ERC20
-    /// @dev override dev comment
-    /// @notice override notice
-    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "override dev comment",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "override notice"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
deleted file mode 100644
index 6bb49e887af0..000000000000
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 is ERC20 {
-    /// @inheritdoc ERC20
-    /// @dev override dev comment
-    /// @notice override notice
-    function transfer(address to, uint amount) virtual override external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC21 {
-    function transfer(address to, uint amount) override external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "override dev comment",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "override notice"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "override dev comment",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "override notice"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
deleted file mode 100644
index b35a92873a68..000000000000
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-contract B {
-    function x() virtual external returns (uint) {
-        return 1;
-    }
-}
-
-contract C {
-    /// @notice Hello world
-    /// @dev test
-    function x() virtual external returns (uint) {
-        return 1;
-    }
-}
-
-contract D is C, B {
-    /// @inheritdoc C
-    uint public override(C, B) x;
-}
-
-// ----
-// ----
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "x":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
deleted file mode 100644
index a8ab60bd124c..000000000000
--- a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
+++ /dev/null
@@ -1,97 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract Middle is ERC20 {
-    function transfer(address to, uint amount) override virtual external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is Middle {
-    function transfer(address too, uint amount) override external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_comment.sol b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
deleted file mode 100644
index b86bcff92da7..000000000000
--- a/test/libsolidity/natspecJSON/dev_multiline_comment.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract test {
-    /**
-     * @dev Multiplies a number by 7 and adds second parameter
-     * @param a Documentation for the first parameter starts here.
-     * Since it's a really complicated parameter we need 2 lines
-     * @param second Documentation for the second parameter
-     * @return d The result of the multiplication
-     * and cookies with nutella
-     */
-    function mul(uint a, uint second) public returns (uint d) {
-        return a * 7 + second;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication and cookies with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_return.sol b/test/libsolidity/natspecJSON/dev_multiline_return.sol
deleted file mode 100644
index cd3c1df98e1e..000000000000
--- a/test/libsolidity/natspecJSON/dev_multiline_return.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return d The result of the multiplication
-    /// and cookies with nutella
-    function mul(uint a, uint second) public returns (uint d) {
-        return a * 7 + second;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication and cookies with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_functions.sol b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
deleted file mode 100644
index 899fb5e26186..000000000000
--- a/test/libsolidity/natspecJSON/dev_multiple_functions.sol
+++ /dev/null
@@ -1,63 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param second Documentation for the second parameter
-    function mul(uint a, uint second) public returns (uint d) {
-        return a * 7 + second;
-    }
-    /// @dev Divides 2 numbers
-    /// @param input Documentation for the input parameter
-    /// @param div Documentation for the div parameter
-    function divide(uint input, uint div) public returns (uint d) {
-        return input / div;
-    }
-    /// @dev Subtracts 3 from `input`
-    /// @param input Documentation for the input parameter
-    function sub(int input) public returns (int d) {
-        return input - 3;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "divide(uint256,uint256)":
-//         {
-//             "details": "Divides 2 numbers",
-//             "params":
-//             {
-//                 "div": "Documentation for the div parameter",
-//                 "input": "Documentation for the input parameter"
-//             }
-//         },
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter",
-//                 "second": "Documentation for the second parameter"
-//             }
-//         },
-//         "sub(int256)":
-//         {
-//             "details": "Subtracts 3 from `input`",
-//             "params":
-//             {
-//                 "input": "Documentation for the input parameter"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params.sol b/test/libsolidity/natspecJSON/dev_multiple_params.sol
deleted file mode 100644
index 424f368d1d15..000000000000
--- a/test/libsolidity/natspecJSON/dev_multiple_params.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter
-    /// @param second Documentation for the second parameter
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter",
-//                 "second": "Documentation for the second parameter"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
deleted file mode 100644
index 61f45aa6204d..000000000000
--- a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract test {
-  /// @dev	 Multiplies a number by 7 and adds second parameter
-  /// @param 	 a Documentation for the first parameter
-  /// @param	 second			 Documentation for the second parameter
-  function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter",
-//                 "second": "Documentation for the second parameter"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
deleted file mode 100644
index 9bdfd0504bc3..000000000000
--- a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return.sol b/test/libsolidity/natspecJSON/dev_return.sol
deleted file mode 100644
index c978970479d1..000000000000
--- a/test/libsolidity/natspecJSON/dev_return.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return d The result of the multiplication
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
deleted file mode 100644
index b6ae9f2f6e1a..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return
-    /// d The result of the multiplication
-    function mul(uint a, uint second) public returns (uint d) {
-        return a * 7 + second;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
deleted file mode 100644
index 0c93dfdd9f51..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return d The result of the multiplication
-    /// @return f And cookies with nutella
-    function mul(uint a, uint second) public returns (uint d, uint f) {
-        uint mul = a * 7;
-        return (mul, second);
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication",
-//                 "f": "And cookies with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
deleted file mode 100644
index 1d93b4ababfb..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return The result of the multiplication
-    /// @return And cookies with nutella
-    function mul(uint a, uint second) public returns (uint, uint) {
-        uint mul = a * 7;
-        return (mul, second);
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "_0": "The result of the multiplication",
-//                 "_1": "And cookies with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
deleted file mode 100644
index 6147aace7cde..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return The result of the multiplication
-    /// @return _cookies And cookies with nutella
-    function mul(uint a, uint second) public returns (uint, uint _cookies) {
-        uint mul = a * 7;
-        return (mul, second);
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "_0": "The result of the multiplication",
-//                 "_cookies": "And cookies with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
deleted file mode 100644
index 824671ee49ef..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract test {
-    /// @dev Multiplies a number by 7 and adds second parameter
-    /// @param a Documentation for the first parameter starts here.
-    /// Since it's a really complicated parameter we need 2 lines
-    /// @param second Documentation for the second parameter
-    /// @return _cookies And cookies with nutella
-    /// @return The result of the multiplication
-    /// @return _milk And milk with nutella
-    function mul(uint a, uint second) public returns (uint _cookies, uint, uint _milk) {
-        uint mul = a * 7;
-        uint milk = 4;
-        return (mul, second, milk);
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "details": "Multiplies a number by 7 and adds second parameter",
-//             "params":
-//             {
-//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-//                 "second": "Documentation for the second parameter"
-//             },
-//             "returns":
-//             {
-//                 "_1": "The result of the multiplication",
-//                 "_cookies": "And cookies with nutella",
-//                 "_milk": "And milk with nutella"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
deleted file mode 100644
index 1e65a235a4e5..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract A {
-    /// @return a
-    function g(int x) public pure virtual returns (int a) { return 2; }
-}
-
-contract B is A {
-    function g(int x) public pure override returns (int b) { return 2; }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "a": "a"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "g(int256)":
-//         {
-//             "returns":
-//             {
-//                 "b": "a"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_return_no_params.sol b/test/libsolidity/natspecJSON/dev_return_no_params.sol
deleted file mode 100644
index 37442f10a8c6..000000000000
--- a/test/libsolidity/natspecJSON/dev_return_no_params.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract test {
-    /// @return d The result of the multiplication
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "mul(uint256,uint256)":
-//         {
-//             "returns":
-//             {
-//                 "d": "The result of the multiplication"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
deleted file mode 100644
index 019e1a33539f..000000000000
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-interface IThing {
-    /// @return x a number
-    /// @return y another number
-    function value() external view returns (uint128 x, uint128 y);
-}
-
-contract Thing is IThing {
-    struct Value {
-        uint128 x;
-        uint128 y;
-    }
-
-    Value public override value;
-}
-
-// ----
-// ----
-// :IThing devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "value()":
-//         {
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :IThing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Thing devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "value":
-//         {
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Thing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
deleted file mode 100644
index 0acfa70fc667..000000000000
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-interface IThing {
-    /// @return x a number
-    /// @return y another number
-    function value() external view returns (uint128 x, uint128 y);
-}
-
-contract Thing is IThing {
-    struct Value {
-        uint128 a;
-        uint128 b;
-    }
-
-    Value public override value;
-}
-
-// ----
-// ----
-// :IThing devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "value()":
-//         {
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :IThing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Thing devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "value":
-//         {
-//             "returns":
-//             {
-//                 "a": "a number",
-//                 "b": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Thing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
deleted file mode 100644
index 06810957adf7..000000000000
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-interface IThing {
-    ///@return
-    function value(uint) external returns (uint128,uint128);
-}
-
-contract Thing is IThing {
-    struct Value {
-        uint128 x;
-        uint128 A;
-    }
-    mapping(uint=>Value) public override value;
-}
-
-// ----
-// ----
-// :IThing devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "value(uint256)":
-//         {
-//             "returns":
-//             {
-//                 "_0": ""
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :IThing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Thing devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "value":
-//         {
-//             "return": "x ",
-//             "returns":
-//             {
-//                 "x": ""
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Thing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/dev_title_at_function_error.sol b/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
deleted file mode 100644
index 2b18e8076891..000000000000
--- a/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-/// @author Lefteris
-/// @title Just a test contract
-contract test {
-    /// @dev Mul function
-    /// @title I really should not be here
-    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-}
-
-// ----
-// DocstringParsingError 6546: (73-137): Documentation tag @title not valid for functions.
diff --git a/test/libsolidity/natspecJSON/docstring_double_empty.sol b/test/libsolidity/natspecJSON/docstring_double_empty.sol
deleted file mode 100644
index 16222d0ac76f..000000000000
--- a/test/libsolidity/natspecJSON/docstring_double_empty.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-  ///
-  ///
-  function vote(uint id) public {
-  }
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_enum.sol b/test/libsolidity/natspecJSON/docstring_enum.sol
deleted file mode 100644
index d5ace6b14192..000000000000
--- a/test/libsolidity/natspecJSON/docstring_enum.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    /// @title example of title
-    /// @author example of author
-    /// @notice example of notice
-    /// @dev example of dev
-    enum Color {
-        Red,
-        Green
-    }
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol b/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
deleted file mode 100644
index 01e0368d4988..000000000000
--- a/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract contract C {
-    /// @return value The value returned by this function.
-    function vote() public virtual returns (uint value);
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "vote()":
-//         {
-//             "returns":
-//             {
-//                 "value": "The value returned by this function."
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_parameter.sol b/test/libsolidity/natspecJSON/docstring_parameter.sol
deleted file mode 100644
index deacbbcaa51f..000000000000
--- a/test/libsolidity/natspecJSON/docstring_parameter.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    /**
-     * @dev a function
-     * @param _from 5 from address
-     * @param _5to   : to address
-     * @param value: token transfer amount
-     * @param value? token transfer amount
-     */
-    function f(address _from, address _5to, uint256 value) internal {
-    }
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_private_state_variable.sol b/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
deleted file mode 100644
index 2ea1747e0220..000000000000
--- a/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    /// @notice example of notice
-    /// @dev example of dev
-    uint private state;
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "state":
-//         {
-//             "details": "example of dev"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_state_variable.sol b/test/libsolidity/natspecJSON/docstring_state_variable.sol
deleted file mode 100644
index 5627c20602e6..000000000000
--- a/test/libsolidity/natspecJSON/docstring_state_variable.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    /// @notice example of notice
-    /// @dev example of dev
-    uint public state;
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "state":
-//         {
-//             "details": "example of dev"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "state()":
-//         {
-//             "notice": "example of notice"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_struct.sol b/test/libsolidity/natspecJSON/docstring_struct.sol
deleted file mode 100644
index 91e5802dd2a1..000000000000
--- a/test/libsolidity/natspecJSON/docstring_struct.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    /// @title example of title
-    /// @author example of author
-    /// @notice example of notice
-    /// @dev example of dev
-    struct Example {
-        string text;
-        bool valid;
-        uint256 value;
-    }
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/docstring_variable.sol b/test/libsolidity/natspecJSON/docstring_variable.sol
deleted file mode 100644
index 66a143ff8641..000000000000
--- a/test/libsolidity/natspecJSON/docstring_variable.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    function f() public pure returns (uint) {
-        /// @title example of title
-        /// @author example of author
-        /// @notice example of notice
-        /// @dev example of dev
-        /// @param example of param
-        /// @return example of return
-        uint state = 42;
-        return state;
-    }
-}
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
deleted file mode 100644
index 669775131bba..000000000000
--- a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-contract X {
-    /// @notice Userdoc for event E.
-    /// @dev Devdoc for event E.
-    event E();
-}
-
-contract C {
-    function g() public {
-        emit X.E();
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "Devdoc for event E."
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "Userdoc for event E."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :X devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "Devdoc for event E."
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :X userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "Userdoc for event E."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
deleted file mode 100644
index c89091391484..000000000000
--- a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
+++ /dev/null
@@ -1,59 +0,0 @@
-// Tests that emitting an event from contract C in contract D does not inherit natspec from C.E
-
-contract C {
-    /// @notice C.E event
-    /// @dev C.E event
-    event E();
-}
-
-contract D {
-    event E();
-
-    function test() public {
-        emit C.E();
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "C.E event"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "C.E event"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol
deleted file mode 100644
index 6030c27d969e..000000000000
--- a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-contract C {
-    /// @notice C.E event
-    /// @dev C.E event
-    event E(uint256 value);
-}
-
-contract D {
-    /// @notice D.E event
-    /// @dev D.E event
-    event E(uint256 value);
-
-    function test() public {
-        emit C.E(1);
-        emit E(2);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "E(uint256)":
-//         {
-//             "details": "C.E event"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "E(uint256)":
-//         {
-//             "notice": "C.E event"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "events":
-//     {
-//         "E(uint256)":
-//         {
-//             "details": "D.E event"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "events":
-//     {
-//         "E(uint256)":
-//         {
-//             "notice": "D.E event"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_file_level_event.sol b/test/libsolidity/natspecJSON/emit_file_level_event.sol
deleted file mode 100644
index 42c028ec9d7e..000000000000
--- a/test/libsolidity/natspecJSON/emit_file_level_event.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-/// @notice Userdoc for file-level event E.
-/// @dev Devdoc for file-level E.
-event E();
-
-contract C {
-    function f() public {
-        emit E();
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "Devdoc for file-level E."
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "Userdoc for file-level event E."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol b/test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol
deleted file mode 100644
index f8660a274134..000000000000
--- a/test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-/// @notice Userdoc for file-level event E.
-/// @dev Devdoc for file-level E.
-event E();
-
-contract C {
-    function f() public {
-        emit E();
-    }
-}
-
-contract D is C {}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "Devdoc for file-level E."
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "Userdoc for file-level event E."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "Devdoc for file-level E."
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "Userdoc for file-level event E."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol b/test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol
deleted file mode 100644
index 0e0844349a8f..000000000000
--- a/test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-/// @notice Userdoc for file-level event E.
-/// @dev Devdoc for file-level E.
-event E();
-
-contract F {
-    /// @notice Userdoc for event F.E.
-    /// @dev Devdoc for event F.E.
-    event E();
-}
-
-contract C {
-    function f() public {
-        emit E();
-        emit F.E();
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :F devdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "details": "Devdoc for event F.E."
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :F userdoc
-// {
-//     "events":
-//     {
-//         "E()":
-//         {
-//             "notice": "Userdoc for event F.E."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
deleted file mode 100644
index 46c8cadf5d57..000000000000
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
+++ /dev/null
@@ -1,122 +0,0 @@
-library L1 {
-    /// @notice This event is defined in Library L1
-    /// @dev This should not appear in Contract C dev doc
-    event SameSignatureEvent(uint16);
-}
-library L2 {
-    /// @notice This event is defined in Library L2
-    /// @dev This should not appear in Contract C dev doc
-    event SameSignatureEvent(uint16);
-}
-library L3 {
-    /// @notice This event is defined in Library L3
-    /// @dev This should not appear in Contract C dev doc
-    event SameSignatureEvent(uint16);
-}
-contract C {
-    function f() public {
-        emit L1.SameSignatureEvent(0);
-        emit L2.SameSignatureEvent(1);
-        emit L3.SameSignatureEvent(2);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L1 devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L1 userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in Library L1"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L2 devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L2 userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in Library L2"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L3 devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L3 userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in Library L3"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
deleted file mode 100644
index ba51b10c6c20..000000000000
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
+++ /dev/null
@@ -1,90 +0,0 @@
-library L1 {
-    event SameSignatureEvent(uint16);
-}
-library L2 {
-    /// @notice This event is defined in library L2
-    /// @dev This should not appear in Contract C devdoc
-    event SameSignatureEvent(uint16);
-}
-library L3 {
-    event SameSignatureEvent(uint16);
-}
-contract C {
-    function f() public {
-        emit L1.SameSignatureEvent(0);
-        emit L2.SameSignatureEvent(1);
-        emit L3.SameSignatureEvent(2);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L1 devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L1 userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L2 devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in Contract C devdoc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L2 userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in library L2"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L3 devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L3 userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
deleted file mode 100644
index 9b198afde6b9..000000000000
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
+++ /dev/null
@@ -1,104 +0,0 @@
-library L {
-    /// @notice This event is defined in Library L
-    /// @dev This should not appear in Contract C dev doc
-    event SameSignatureEvent(uint16);
-    /// @notice This event is defined in Library L
-    /// @dev This should appear in Contract C dev doc
-    event LibraryEvent(uint32);
-}
-contract C {
-    /// @notice This event is defined in Contract C
-    /// @dev This should appear in Contract C dev doc
-    event SameSignatureEvent(uint16);
-    /// @notice This event is defined in Contract C
-    /// @dev This should appear in contract C dev doc
-    event ContractEvent(uint32);
-    function f() public {
-    emit L.SameSignatureEvent(0);
-    emit SameSignatureEvent(1);
-    emit L.LibraryEvent(2);
-    emit ContractEvent(3);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "ContractEvent(uint32)":
-//         {
-//             "details": "This should appear in contract C dev doc"
-//         },
-//         "LibraryEvent(uint32)":
-//         {
-//             "details": "This should appear in Contract C dev doc"
-//         },
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "ContractEvent(uint32)":
-//         {
-//             "notice": "This event is defined in Contract C"
-//         },
-//         "LibraryEvent(uint32)":
-//         {
-//             "notice": "This event is defined in Library L"
-//         },
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in Contract C"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L devdoc
-// {
-//     "events":
-//     {
-//         "LibraryEvent(uint32)":
-//         {
-//             "details": "This should appear in Contract C dev doc"
-//         },
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L userdoc
-// {
-//     "events":
-//     {
-//         "LibraryEvent(uint32)":
-//         {
-//             "notice": "This event is defined in Library L"
-//         },
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in Library L"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
deleted file mode 100644
index 9bc2f57f302e..000000000000
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
+++ /dev/null
@@ -1,89 +0,0 @@
-library L {
-    /// @notice This event is defined in library L
-    /// @dev This should not appear in contract C devdoc
-    event SameSignatureEvent(uint16);
-    /// @notice This event is defined in library L
-    /// @dev This should appear in contract C devdoc
-    event LibraryEvent(uint32);
-}
-contract C {
-    event SameSignatureEvent(uint16);
-    /// @notice This event is defined in contract C
-    event ContractEvent(uint32);
-    function f() public {
-        emit L.SameSignatureEvent(0);
-        emit SameSignatureEvent(1);
-        emit L.LibraryEvent(2);
-        emit ContractEvent(3);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "LibraryEvent(uint32)":
-//         {
-//             "details": "This should appear in contract C devdoc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "ContractEvent(uint32)":
-//         {
-//             "notice": "This event is defined in contract C"
-//         },
-//         "LibraryEvent(uint32)":
-//         {
-//             "notice": "This event is defined in library L"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L devdoc
-// {
-//     "events":
-//     {
-//         "LibraryEvent(uint32)":
-//         {
-//             "details": "This should appear in contract C devdoc"
-//         },
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in contract C devdoc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L userdoc
-// {
-//     "events":
-//     {
-//         "LibraryEvent(uint32)":
-//         {
-//             "notice": "This event is defined in library L"
-//         },
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in library L"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
deleted file mode 100644
index ecc7ee627959..000000000000
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
+++ /dev/null
@@ -1,102 +0,0 @@
-contract D {
-    /// @notice This event is defined in contract D
-    /// @dev This should appear in Contract C dev doc
-    event SameSignatureEvent(uint16);
-}
-library L {
-    /// @notice This event is defined in Library L
-    /// @dev This should not appear in Contract C
-    event SameSignatureEvent(uint16);
-}
-contract C is D {
-    function f() public {
-        emit L.SameSignatureEvent(0);
-        emit D.SameSignatureEvent(1);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in contract D"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should appear in Contract C dev doc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in contract D"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in Contract C"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in Library L"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
deleted file mode 100644
index a3a6286c5505..000000000000
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
+++ /dev/null
@@ -1,72 +0,0 @@
-contract D {
-    event SameSignatureEvent(uint16);
-}
-library L {
-    /// @notice This event is defined in library L
-    /// @dev This should not appear in contract C devdoc
-    event SameSignatureEvent(uint16);
-}
-contract C is D {
-    function f() public {
-        emit L.SameSignatureEvent(0);
-        emit D.SameSignatureEvent(1);
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L devdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "details": "This should not appear in contract C devdoc"
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :L userdoc
-// {
-//     "events":
-//     {
-//         "SameSignatureEvent(uint16)":
-//         {
-//             "notice": "This event is defined in library L"
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/empty_comment.sol b/test/libsolidity/natspecJSON/empty_comment.sol
deleted file mode 100644
index 4310c26d25f5..000000000000
--- a/test/libsolidity/natspecJSON/empty_comment.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-contract test
-{}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/enum_no_docs.sol b/test/libsolidity/natspecJSON/enum_no_docs.sol
deleted file mode 100644
index 021f7c6b2eca..000000000000
--- a/test/libsolidity/natspecJSON/enum_no_docs.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    /// @title example of title
-    /// @author example of author
-    /// @notice example of notice
-    /// @dev example of dev
-    enum Color {
-        Red,
-        Green
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/error.sol b/test/libsolidity/natspecJSON/error.sol
deleted file mode 100644
index c82412fec488..000000000000
--- a/test/libsolidity/natspecJSON/error.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract test {
-    /// Something failed.
-    /// @dev an error.
-    /// @param a first parameter
-    /// @param b second parameter
-    error E(uint a, uint b);
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "errors":
-//     {
-//         "E(uint256,uint256)":
-//         [
-//             {
-//                 "details": "an error.",
-//                 "params":
-//                 {
-//                     "a": "first parameter",
-//                     "b": "second parameter"
-//                 }
-//             }
-//         ]
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "errors":
-//     {
-//         "E(uint256,uint256)":
-//         [
-//             {
-//                 "notice": "Something failed."
-//             }
-//         ]
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/error_multiple.sol b/test/libsolidity/natspecJSON/error_multiple.sol
deleted file mode 100644
index 205e79a99fa4..000000000000
--- a/test/libsolidity/natspecJSON/error_multiple.sol
+++ /dev/null
@@ -1,107 +0,0 @@
-contract A {
-    /// Something failed.
-    /// @dev an error.
-    /// @param x first parameter
-    /// @param y second parameter
-    error E(uint x, uint y);
-}
-contract test {
-    /// X Something failed.
-    /// @dev X an error.
-    /// @param a X first parameter
-    /// @param b X second parameter
-    error E(uint a, uint b);
-    function f(bool a) public pure {
-        if (a)
-            revert E(1, 2);
-        else
-            revert A.E(5, 6);
-    }
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "errors":
-//     {
-//         "E(uint256,uint256)":
-//         [
-//             {
-//                 "details": "an error.",
-//                 "params":
-//                 {
-//                     "x": "first parameter",
-//                     "y": "second parameter"
-//                 }
-//             }
-//         ]
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "errors":
-//     {
-//         "E(uint256,uint256)":
-//         [
-//             {
-//                 "notice": "Something failed."
-//             }
-//         ]
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test devdoc
-// {
-//     "errors":
-//     {
-//         "E(uint256,uint256)":
-//         [
-//             {
-//                 "details": "an error.",
-//                 "params":
-//                 {
-//                     "x": "first parameter",
-//                     "y": "second parameter"
-//                 }
-//             },
-//             {
-//                 "details": "X an error.",
-//                 "params":
-//                 {
-//                     "a": "X first parameter",
-//                     "b": "X second parameter"
-//                 }
-//             }
-//         ]
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "errors":
-//     {
-//         "E(uint256,uint256)":
-//         [
-//             {
-//                 "notice": "Something failed."
-//             },
-//             {
-//                 "notice": "X Something failed."
-//             }
-//         ]
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/event.sol b/test/libsolidity/natspecJSON/event.sol
deleted file mode 100644
index 9887b021dffd..000000000000
--- a/test/libsolidity/natspecJSON/event.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract ERC20 {
-    /// @notice This event is emitted when a transfer occurs.
-    /// @param from The source account.
-    /// @param to The destination account.
-    /// @param amount The amount.
-    /// @dev A test case!
-    event Transfer(address indexed from, address indexed to, uint amount);
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/event_inheritance.sol b/test/libsolidity/natspecJSON/event_inheritance.sol
deleted file mode 100644
index 7912bd1b5124..000000000000
--- a/test/libsolidity/natspecJSON/event_inheritance.sol
+++ /dev/null
@@ -1,116 +0,0 @@
-contract ERC20 {
-    /// @notice This event is emitted when a transfer occurs.
-    /// @param from The source account.
-    /// @param to The destination account.
-    /// @param amount The amount.
-    /// @dev A test case!
-    event Transfer(address indexed from, address indexed to, uint amount);
-}
-contract A is ERC20 {
-}
-contract B is A {
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC20 devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/event_inheritance_interface.sol b/test/libsolidity/natspecJSON/event_inheritance_interface.sol
deleted file mode 100644
index 8b4137fcc797..000000000000
--- a/test/libsolidity/natspecJSON/event_inheritance_interface.sol
+++ /dev/null
@@ -1,116 +0,0 @@
-interface ERC20 {
-    /// @notice This event is emitted when a transfer occurs.
-    /// @param from The source account.
-    /// @param to The destination account.
-    /// @param amount The amount.
-    /// @dev A test case!
-    event Transfer(address indexed from, address indexed to, uint amount);
-}
-contract A is ERC20 {
-}
-contract B is A {
-}
-
-// ----
-// ----
-// :A devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :A userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC20 devdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "details": "A test case!",
-//             "params":
-//             {
-//                 "amount": "The amount.",
-//                 "from": "The source account.",
-//                 "to": "The destination account."
-//             }
-//         }
-//     },
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "events":
-//     {
-//         "Transfer(address,address,uint256)":
-//         {
-//             "notice": "This event is emitted when a transfer occurs."
-//         }
-//     },
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_author_function.sol b/test/libsolidity/natspecJSON/invalid/docstring_author_function.sol
deleted file mode 100644
index 71db9907bbe0..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_author_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    /// @author author
-    function iHaveAuthor() public pure {}
-}
-// ----
-// DocstringParsingError 6546: (17-35): Documentation tag @author not valid for functions.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol b/test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol
deleted file mode 100644
index e861d31ce75e..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    /// @title title
-    /// @author author
-    uint private state;
-}
-// ----
-// DocstringParsingError 6546: (17-56): Documentation tag @author not valid for non-public state variables.
-// DocstringParsingError 6546: (17-56): Documentation tag @title not valid for non-public state variables.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol b/test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol
deleted file mode 100644
index e77e42c42f52..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    /// @param id
-    function vote(uint id) public {}
-}
-// ----
-// DocstringParsingError 9942: (17-30): No description given for param id
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol b/test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol
deleted file mode 100644
index 56c3d59aabd2..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract contract C {
-    /// @param
-    function vote(uint id) public {}
-}
-// ----
-// DocstringParsingError 3335: (26-36): No param name given
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol b/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol
deleted file mode 100644
index 2517ff381752..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	///@return
-	modifier m22 virtual { _; }
-}
-
-contract D is C {
-	modifier m22 override { _; }
-}
-// ----
-// DocstringParsingError 6546: (14-24): Documentation tag @return not valid for modifiers.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol b/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol
deleted file mode 100644
index 5b81a466001e..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-	/// @return a
-	function g(int x) public virtual { return 2; }
-}
-
-contract B is A {
-	function g(int x) public pure override returns (int b) { return 2; }
-}
-// ----
-// DocstringParsingError 2604: (14-27): Documentation tag "@return a" exceeds the number of return parameters.
-// TypeError 4822: (98-166): Overriding function return types differ.
-// TypeError 8863: (64-72): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol
deleted file mode 100644
index 678872d7a00f..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    /// @inheritdoc X
-    function f() internal {
-    }
-}
-// ----
-// DocstringParsingError 9397: (17-34): Documentation tag @inheritdoc references inexistent contract "X".
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol
deleted file mode 100644
index 4d97ff93d43c..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {
-}
-
-contract C is D {
-    /// @inheritdoc D
-    function f() internal {
-    }
-}
-// ----
-// DocstringParsingError 4682: (38-55): Documentation tag @inheritdoc references contract "D", but the contract does not contain a function that is overridden by this function.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol
deleted file mode 100644
index d00e1e7ea1ac..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract D {
-    struct S { uint a; }
-}
-
-contract C is D {
-    /// @inheritdoc D.S
-    function f() internal {
-    }
-}
-// ----
-// DocstringParsingError 1430: (63-82): Documentation tag @inheritdoc reference "D.S" is not a contract.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol
deleted file mode 100644
index d2c41cd2c287..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    /// @inheritdoc
-    function f() internal {
-    }
-    /// @inheritdoc .
-    function f() internal {
-    }
-    /// @inheritdoc C..f
-    function f() internal {
-    }
-    /// @inheritdoc C.
-    function f() internal {
-    }
-}
-// ----
-// DocstringParsingError 1933: (17-32): Expected contract name following documentation tag @inheritdoc.
-// DocstringParsingError 5967: (71-88): Documentation tag @inheritdoc reference "." is malformed.
-// DocstringParsingError 5967: (127-147): Documentation tag @inheritdoc reference "C..f" is malformed.
-// DocstringParsingError 5967: (186-204): Documentation tag @inheritdoc reference "C." is malformed.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol
deleted file mode 100644
index d59dea2999d3..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract B {}
-
-contract C {
-    /// @inheritdoc B
-    /// @inheritdoc B
-    function f() internal {}
-}
-// ----
-// DocstringParsingError 5142: (32-71): Documentation tag @inheritdoc can only be given once.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol
deleted file mode 100644
index 510f6622fdca..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct S { uint a; }
-    /// @inheritdoc S
-    function f() internal {
-    }
-}
-// ----
-// DocstringParsingError 1430: (42-59): Documentation tag @inheritdoc reference "S" is not a contract.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol b/test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol
deleted file mode 100644
index 6e9ef2e93b9e..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract C {
-    /// @param id Some identifier
-    /// @return No value returned
-    function vote(uint id) public virtual returns (uint value);
-}
-// ----
-// DocstringParsingError 5856: (26-89): Documentation tag "@return No value returned" does not contain the name of its return parameter.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol b/test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol
deleted file mode 100644
index da2d75fe87db..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-  /// @return returns something
-  uint private state;
-}
-// ----
-// DocstringParsingError 6546: (18-47): Documentation tag @return not valid for non-public state variables.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_parameter.sol b/test/libsolidity/natspecJSON/invalid/docstring_parameter.sol
deleted file mode 100644
index 9ea5533470dd..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_parameter.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    /**
-     * @param 5value a value parameter
-     * @param _ a value parameter
-     */
-    function f(uint256 _5value, uint256 _value, uint256 value) internal {
-    }
-}
-// ----
-// DocstringParsingError 3881: (17-101): Documented parameter "" not found in the parameter list of the function.
-// DocstringParsingError 3881: (17-101): Documented parameter "_" not found in the parameter list of the function.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol b/test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol
deleted file mode 100644
index e060a5436b9b..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract contract C {
-    /// @param id Some identifier
-    /// @return No value returned
-    function vote(uint id) public virtual returns (uint value);
-
-    /// @return No value returned
-    function unvote(uint id) public virtual returns (uint value);
-}
-// ----
-// DocstringParsingError 5856: (26-89): Documentation tag "@return No value returned" does not contain the name of its return parameter.
-// DocstringParsingError 5856: (159-188): Documentation tag "@return No value returned" does not contain the name of its return parameter.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol b/test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol
deleted file mode 100644
index bccedd5a4b8e..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-  /// @notice example of notice
-  /// @dev example of dev
-  /// @return returns something
-  /// @return returns something
-  uint public state;
-}
-// ----
-// DocstringParsingError 2604: (18-137): Documentation tag "@return returns something" exceeds the number of return parameters.
diff --git a/test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol b/test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol
deleted file mode 100644
index 111316035cfd..000000000000
--- a/test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract C {
-    /// @param id Some identifier
-    /// @return value Some value
-	/// @return value2 Some value 2
-    function vote(uint id) public virtual returns (uint value);
-}
-// ----
-// DocstringParsingError 2604: (26-121): Documentation tag "@return value2 Some value 2" exceeds the number of return parameters.
diff --git a/test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol b/test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol
deleted file mode 100644
index e7fb1a822fc9..000000000000
--- a/test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract ERC20 {
-	/// @notice This event is emitted when a transfer occurs.
-	/// @param from The source account.
-	/// @param to The destination account.
-	/// @param amount The amount.
-	/// @dev A test case!
-	event Transfer(address indexed from, address indexed to, uint amount);
-}
-
-contract A is ERC20 {
-	/// @inheritdoc ERC20
-	event Transfer();
-}
-
-
-// ----
-// DocstringParsingError 6546: (305-326): Documentation tag @inheritdoc not valid for events.
diff --git a/test/libsolidity/natspecJSON/invalid/invalid_tag.sol b/test/libsolidity/natspecJSON/invalid/invalid_tag.sol
deleted file mode 100644
index 741dc440719c..000000000000
--- a/test/libsolidity/natspecJSON/invalid/invalid_tag.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-/// @a&b test
-contract C {
-	/// @custom:x^y test2
-	function f() public pure {}
-	/// @custom:
-	function g() public pure {}
-	/// @custom:abcDEF
-	function h() public pure {}
-	/// @custom:abc-def
-	function i() public pure {}
-	/// @custom
-	function j() public pure {}
-}
-// ----
-// DocstringParsingError 6546: (0-14): Documentation tag @a&b not valid for contracts.
-// DocstringParsingError 2968: (28-49): Invalid character in custom tag @custom:x^y. Only lowercase letters and "-" are permitted.
-// DocstringParsingError 6564: (80-92): Custom documentation tag must contain a chosen name, i.e. @custom:mytag.
-// DocstringParsingError 2968: (123-141): Invalid character in custom tag @custom:abcDEF. Only lowercase letters and "-" are permitted.
-// DocstringParsingError 6564: (222-233): Custom documentation tag must contain a chosen name, i.e. @custom:mytag.
diff --git a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
deleted file mode 100644
index 4f055b2f04db..000000000000
--- a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract test {
-    /// I do something awesome
-    /// which requires two lines to explain
-    function mul(uint a) public returns (uint d) { return a * 7; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "mul(uint256)":
-//         {
-//             "notice": "I do something awesome which requires two lines to explain"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/notice_without_tag.sol b/test/libsolidity/natspecJSON/notice_without_tag.sol
deleted file mode 100644
index d562993392bf..000000000000
--- a/test/libsolidity/natspecJSON/notice_without_tag.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract test {
-    /// I do something awesome
-    function mul(uint a) public returns (uint d) { return a * 7; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "mul(uint256)":
-//         {
-//             "notice": "I do something awesome"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/private_state_variable.sol b/test/libsolidity/natspecJSON/private_state_variable.sol
deleted file mode 100644
index 7d7707a8de98..000000000000
--- a/test/libsolidity/natspecJSON/private_state_variable.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract test {
-    /// @dev example of dev
-    uint private state;
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "state":
-//         {
-//             "details": "example of dev"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/public_state_variable.sol b/test/libsolidity/natspecJSON/public_state_variable.sol
deleted file mode 100644
index 5fda30cecc45..000000000000
--- a/test/libsolidity/natspecJSON/public_state_variable.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract test {
-    /// @notice example of notice
-    /// @dev example of dev
-    /// @return returns state
-    uint public state;
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "state":
-//         {
-//             "details": "example of dev",
-//             "return": "returns state",
-//             "returns":
-//             {
-//                 "_0": "returns state"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "state()":
-//         {
-//             "notice": "example of notice"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct.sol b/test/libsolidity/natspecJSON/public_state_variable_struct.sol
deleted file mode 100644
index 4382472434a7..000000000000
--- a/test/libsolidity/natspecJSON/public_state_variable_struct.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract Bank {
-    struct Coin {
-        string observeGraphicURL;
-        string reverseGraphicURL;
-    }
-
-    /// @notice Get the n-th coin I own
-    /// @return observeGraphicURL Front pic
-    /// @return reverseGraphicURL Back pic
-    Coin[] public coinStack;
-}
-
-// ----
-// ----
-// :Bank devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "coinStack":
-//         {
-//             "returns":
-//             {
-//                 "observeGraphicURL": "Front pic",
-//                 "reverseGraphicURL": "Back pic"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Bank userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "coinStack(uint256)":
-//         {
-//             "notice": "Get the n-th coin I own"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol b/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
deleted file mode 100644
index 78a6f9eedf68..000000000000
--- a/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract Bank {
-    struct Coin {
-        string obverseGraphicURL;
-        string reverseGraphicURL;
-    }
-
-    /// @notice Get the n-th coin I own
-    /// @return obverseGraphicURL Front pic
-    /// @return obverseGraphicURL Front pic
-    Coin[] public coinStack;
-}
-
-// ----
-// DocstringParsingError 5856: (113-236): Documentation tag "@return obverseGraphicURL Front pic" does not contain the name of its return parameter.
diff --git a/test/libsolidity/natspecJSON/return_param_amount_differs.sol b/test/libsolidity/natspecJSON/return_param_amount_differs.sol
deleted file mode 100644
index 2d18ce8a1b40..000000000000
--- a/test/libsolidity/natspecJSON/return_param_amount_differs.sol
+++ /dev/null
@@ -1,64 +0,0 @@
-interface IThing {
-    /// @return x a number
-    /// @return y another number
-    function value() external view returns (uint128 x, uint128 y);
-}
-
-contract Thing is IThing {
-    struct Value {
-        uint128 x;
-        uint128 y;
-    }
-
-    Value public override value;
-}
-// ----
-// ----
-// :IThing devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "value()":
-//         {
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :IThing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Thing devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "value":
-//         {
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Thing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/return_param_amount_differs2.sol b/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
deleted file mode 100644
index e10802c100bd..000000000000
--- a/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
+++ /dev/null
@@ -1,73 +0,0 @@
-interface IThing {
-    /// @param v value to search for
-    /// @return x a number
-    /// @return y another number
-    function value(uint256 v) external view returns (uint128 x, uint128 y);
-}
-
-contract Thing is IThing {
-    struct Value {
-        uint128 x;
-        uint128 y;
-    }
-
-    mapping(uint256=>Value) public override value;
-}
-// ----
-// ----
-// :IThing devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "value(uint256)":
-//         {
-//             "params":
-//             {
-//                 "v": "value to search for"
-//             },
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :IThing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Thing devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "value":
-//         {
-//             "params":
-//             {
-//                 "v": "value to search for"
-//             },
-//             "returns":
-//             {
-//                 "x": "a number",
-//                 "y": "another number"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Thing userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/slash3_slash3.sol b/test/libsolidity/natspecJSON/slash3_slash3.sol
deleted file mode 100644
index fc8e47f96282..000000000000
--- a/test/libsolidity/natspecJSON/slash3_slash3.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract test {
-    /// @notice lorem
-    /// ipsum
-    function f() public { }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "f()":
-//         {
-//             "notice": "lorem ipsum"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/slash3_slash4.sol b/test/libsolidity/natspecJSON/slash3_slash4.sol
deleted file mode 100644
index c428f5e19aa6..000000000000
--- a/test/libsolidity/natspecJSON/slash3_slash4.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract test {
-    /// @notice lorem
-    //// ipsum
-    function f() public { }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "f()":
-//         {
-//             "notice": "lorem"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/slash4.sol b/test/libsolidity/natspecJSON/slash4.sol
deleted file mode 100644
index 74997524ee8d..000000000000
--- a/test/libsolidity/natspecJSON/slash4.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract test {
-    //// @notice lorem ipsum
-    function f() public { }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/star3.sol b/test/libsolidity/natspecJSON/star3.sol
deleted file mode 100644
index 24e742f8aaa1..000000000000
--- a/test/libsolidity/natspecJSON/star3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract test {
-    /***
-     * @notice lorem ipsum
-     */
-    function f() public { }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/struct_no_docs.sol b/test/libsolidity/natspecJSON/struct_no_docs.sol
deleted file mode 100644
index e29a4b8e9de8..000000000000
--- a/test/libsolidity/natspecJSON/struct_no_docs.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    /// @title example of title
-    /// @author example of author
-    /// @notice example of notice
-    /// @dev example of dev
-    struct Example {
-        string text;
-        bool valid;
-        uint256 value;
-    }
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/unused_file_level_event.sol b/test/libsolidity/natspecJSON/unused_file_level_event.sol
deleted file mode 100644
index 4a621f383b16..000000000000
--- a/test/libsolidity/natspecJSON/unused_file_level_event.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-/// @notice Userdoc for file-level event E.
-/// @dev Devdoc for file-level E.
-event E();
-
-contract C {}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_basic_test.sol b/test/libsolidity/natspecJSON/user_basic_test.sol
deleted file mode 100644
index 0ec21750d773..000000000000
--- a/test/libsolidity/natspecJSON/user_basic_test.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract test {
-    /// @notice Multiplies `a` by 7
-    function mul(uint a) public returns(uint d) { return a * 7; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "mul(uint256)":
-//         {
-//             "notice": "Multiplies `a` by 7"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_constructor.sol b/test/libsolidity/natspecJSON/user_constructor.sol
deleted file mode 100644
index 0dedd30a6964..000000000000
--- a/test/libsolidity/natspecJSON/user_constructor.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract test {
-    /// @notice this is a really nice constructor
-    constructor(uint a, uint second) { }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "constructor":
-//         {
-//             "notice": "this is a really nice constructor"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_constructor_and_function.sol b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
deleted file mode 100644
index 5e8cfd04a397..000000000000
--- a/test/libsolidity/natspecJSON/user_constructor_and_function.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract test {
-    /// @notice this is a really nice constructor
-    constructor(uint a, uint second) { }
-    /// another multiplier
-    function mul(uint a, uint second) public returns(uint d) { return a * 7 + second; }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "constructor":
-//         {
-//             "notice": "this is a really nice constructor"
-//         },
-//         "mul(uint256,uint256)":
-//         {
-//             "notice": "another multiplier"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_default_inherit.sol b/test/libsolidity/natspecJSON/user_default_inherit.sol
deleted file mode 100644
index b4f97cfa3f01..000000000000
--- a/test/libsolidity/natspecJSON/user_default_inherit.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// Second line.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract Middle is ERC20 {
-    function transfer(address to, uint amount) virtual override external returns (bool)
-    {
-        return false;
-    }
-}
-
-contract Token is Middle {
-    function transfer(address to, uint amount) override external returns (bool)
-    {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
deleted file mode 100644
index 89d57d011cfe..000000000000
--- a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-contract C {
-    /// @notice Hello world
-    /// @dev test
-    function x() virtual external returns (uint) {
-        return 1;
-    }
-}
-
-contract D is C {
-    uint public override x;
-}
-
-// ----
-// ----
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "x":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_empty_contract.sol b/test/libsolidity/natspecJSON/user_empty_contract.sol
deleted file mode 100644
index 09f178606b6b..000000000000
--- a/test/libsolidity/natspecJSON/user_empty_contract.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test { }
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
deleted file mode 100644
index aa19fac3afde..000000000000
--- a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract test {
-    ///
-    ///
-    function f() public {
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit.sol b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
deleted file mode 100644
index a8ddb3133183..000000000000
--- a/test/libsolidity/natspecJSON/user_explicit_inherit.sol
+++ /dev/null
@@ -1,98 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 {
-    function transfer(address to, uint amount) virtual external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC21, ERC20 {
-    /// @inheritdoc ERC20
-    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
deleted file mode 100644
index 4c726f552f9c..000000000000
--- a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 is ERC20 {
-    function transfer(address to, uint amount) virtual override external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC20 {
-    /// @inheritdoc ERC20
-    function transfer(address to, uint amount) override external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
deleted file mode 100644
index c69bd4121747..000000000000
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
+++ /dev/null
@@ -1,100 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 {
-    function transfer(address to, uint amount) virtual external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC21, ERC20 {
-    /// @inheritdoc ERC20
-    /// @dev override dev comment
-    /// @notice override notice
-    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "override dev comment",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "override notice"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
deleted file mode 100644
index 6bb49e887af0..000000000000
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract ERC21 is ERC20 {
-    /// @inheritdoc ERC20
-    /// @dev override dev comment
-    /// @notice override notice
-    function transfer(address to, uint amount) virtual override external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is ERC21 {
-    function transfer(address to, uint amount) override external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "override dev comment",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC21 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "override notice"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "override dev comment",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "override notice"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
deleted file mode 100644
index b35a92873a68..000000000000
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-contract B {
-    function x() virtual external returns (uint) {
-        return 1;
-    }
-}
-
-contract C {
-    /// @notice Hello world
-    /// @dev test
-    function x() virtual external returns (uint) {
-        return 1;
-    }
-}
-
-contract D is C, B {
-    /// @inheritdoc C
-    uint public override(C, B) x;
-}
-
-// ----
-// ----
-// :B devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :B userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :C devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :C userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "stateVariables":
-//     {
-//         "x":
-//         {
-//             "details": "test"
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :D userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "x()":
-//         {
-//             "notice": "Hello world"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
deleted file mode 100644
index a8ab60bd124c..000000000000
--- a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
+++ /dev/null
@@ -1,97 +0,0 @@
-interface ERC20 {
-    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
-    /// @dev test
-    /// @param to address to transfer to
-    /// @param amount amount to transfer
-    function transfer(address to, uint amount) external returns (bool);
-}
-
-contract Middle is ERC20 {
-    function transfer(address to, uint amount) override virtual external returns (bool) {
-        return false;
-    }
-}
-
-contract Token is Middle {
-    function transfer(address too, uint amount) override external returns (bool) {
-        return false;
-    }
-}
-
-// ----
-// ----
-// :ERC20 devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :ERC20 userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle devdoc
-// {
-//     "kind": "dev",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "details": "test",
-//             "params":
-//             {
-//                 "amount": "amount to transfer",
-//                 "to": "address to transfer to"
-//             }
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Middle userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "transfer(address,uint256)":
-//         {
-//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-//         }
-//     },
-//     "version": 1
-// }
-//
-// :Token devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :Token userdoc
-// {
-//     "kind": "user",
-//     "methods": {},
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_multiline_comment.sol b/test/libsolidity/natspecJSON/user_multiline_comment.sol
deleted file mode 100644
index 5407c7fe8813..000000000000
--- a/test/libsolidity/natspecJSON/user_multiline_comment.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract test {
-    /// @notice Multiplies `a` by 7
-    /// and then adds `b`
-    function mul_and_add(uint a, uint256 b) public returns (uint256 d) {
-        return (a * 7) + b;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "mul_and_add(uint256,uint256)":
-//         {
-//             "notice": "Multiplies `a` by 7 and then adds `b`"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
deleted file mode 100644
index 12bc050e7bf8..000000000000
--- a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract test {
-    /**
-     *
-     *
-     * @notice hello world
-     */
-    function f() public {
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "f()":
-//         {
-//             "notice": "hello world"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_multiple_functions.sol b/test/libsolidity/natspecJSON/user_multiple_functions.sol
deleted file mode 100644
index 3c6759bd2851..000000000000
--- a/test/libsolidity/natspecJSON/user_multiple_functions.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract test {
-    /// @notice Multiplies `a` by 7 and then adds `b`
-    function mul_and_add(uint a, uint256 b) public returns (uint256 d) {
-        return (a * 7) + b;
-    }
-
-    /// @notice Divides `input` by `div`
-    function divide(uint input, uint div) public returns (uint d) {
-        return input / div;
-    }
-
-    /// @notice Subtracts 3 from `input`
-    function sub(int input) public returns (int d) {
-        return input - 3;
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "divide(uint256,uint256)":
-//         {
-//             "notice": "Divides `input` by `div`"
-//         },
-//         "mul_and_add(uint256,uint256)":
-//         {
-//             "notice": "Multiplies `a` by 7 and then adds `b`"
-//         },
-//         "sub(int256)":
-//         {
-//             "notice": "Subtracts 3 from `input`"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/natspecJSON/user_newline_break.sol b/test/libsolidity/natspecJSON/user_newline_break.sol
deleted file mode 100644
index 7284c8808116..000000000000
--- a/test/libsolidity/natspecJSON/user_newline_break.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract test {
-    ///
-    /// @notice hello
-
-    /// @notice world
-    function f() public {
-    }
-}
-
-// ----
-// ----
-// :test devdoc
-// {
-//     "kind": "dev",
-//     "methods": {},
-//     "version": 1
-// }
-//
-// :test userdoc
-// {
-//     "kind": "user",
-//     "methods":
-//     {
-//         "f()":
-//         {
-//             "notice": "world"
-//         }
-//     },
-//     "version": 1
-// }
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
deleted file mode 100644
index 4d6b92073212..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes calldata data) external pure returns (uint256[] memory) {
-        return abi.decode(data, (uint256[]));
-    }
-}
-// ----
-// f(bytes): 0x20, 0xc0, 0x20, 0x4, 0x3, 0x4, 0x5, 0x6 -> 0x20, 0x4, 0x3, 0x4, 0x5, 0x6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
deleted file mode 100644
index 2624591abeaa..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint16[3] memory a, uint16[2][3] memory b, uint i, uint j, uint k)
-            public pure returns (uint, uint) {
-        return (a[i], b[j][k]);
-    }
-}
-// ----
-// f(uint16[3],uint16[2][3],uint256,uint256,uint256): 1, 2, 3, 11, 12, 21, 22, 31, 32, 1, 2, 1 -> 2, 32
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
deleted file mode 100644
index fd0a59abb8f6..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(bytes calldata data)
-        external
-        pure
-        returns (uint256[2][3] memory)
-    {
-        return abi.decode(data, (uint256[2][3]));
-    }
-}
-// ----
-// f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
deleted file mode 100644
index e228099c4eb3..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(bytes calldata data)
-        external
-        pure
-        returns (uint256[2][3] memory)
-    {
-        return abi.decode(data, (uint256[2][3]));
-    }
-}
-// ----
-// f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
deleted file mode 100644
index c1b91815accf..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes memory data) public pure returns (uint256) {
-        return abi.decode(data, (uint256));
-    }
-}
-// ----
-// f(bytes): 0x20, 0x20, 0x21 -> 33
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
deleted file mode 100644
index 782971c59c5d..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256[] b;
-    }
-
-    function f() public pure returns (S memory) {
-        S memory s;
-        s.a = 8;
-        s.b = new uint256[](3);
-        s.b[0] = 9;
-        s.b[1] = 10;
-        s.b[2] = 11;
-        return abi.decode(abi.encode(s), (S));
-    }
-}
-// ----
-// f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
deleted file mode 100644
index 8bbb77b9aad0..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256[] b;
-    }
-
-    function f(bytes calldata data) external pure returns (S memory) {
-        return abi.decode(data, (S));
-    }
-}
-// ----
-// f(bytes): 0x20, 0xe0, 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc -> 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
deleted file mode 100644
index b4ef43c44172..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    bytes data;
-    struct S {
-        uint256 a;
-        uint256[] b;
-    }
-
-    function f() public returns (S memory) {
-        S memory s;
-        s.a = 8;
-        s.b = new uint256[](3);
-        s.b[0] = 9;
-        s.b[1] = 10;
-        s.b[2] = 11;
-        data = abi.encode(s);
-        return abi.decode(data, (S));
-    }
-}
-// ----
-// f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203149
-// gas legacy: 206263
-// gas legacyOptimized: 203156
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
deleted file mode 100644
index 1e654d281ce0..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-    function f0() public returns (bytes memory) {
-        return abi.encode();
-    }
-
-    function f1() public returns (bytes memory) {
-        return abi.encode(1, 2);
-    }
-
-    function f2() public returns (bytes memory) {
-        string memory x = "abc";
-        return abi.encode(1, x, 2);
-    }
-
-    function f3() public returns (bytes memory r) {
-        // test that memory is properly allocated
-        string memory x = "abc";
-        r = abi.encode(1, x, 2);
-        bytes memory y = "def";
-        require(y[0] == "d");
-        y[0] = "e";
-        require(y[0] == "e");
-    }
-
-    function f4() public returns (bytes memory) {
-        bytes4 x = "abcd";
-        return abi.encode(bytes2(x));
-    }
-}
-// ----
-// f0() -> 0x20, 0x0
-// f1() -> 0x20, 0x40, 0x1, 0x2
-// f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
-// f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
-// f4() -> 0x20, 0x20, "ab"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
deleted file mode 100644
index e34d46b74a42..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    bool x;
-
-    function c(uint256 a, uint256[] memory b) public {
-        require(a == 5);
-        require(b.length == 2);
-        require(b[0] == 6);
-        require(b[1] == 7);
-        x = true;
-    }
-
-    function f() public returns (bool) {
-        uint256 a = 5;
-        uint256[] memory b = new uint256[](2);
-        b[0] = 6;
-        b[1] = 7;
-        (bool success, ) = address(this).call(
-            abi.encodeWithSignature("c(uint256,uint256[])", a, b)
-        );
-        require(success);
-        return x;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
deleted file mode 100644
index f548c50bcf52..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ /dev/null
@@ -1,68 +0,0 @@
-contract C {
-	function enc_packed_bytes(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(data[start:end]);
-	}
-	function enc_packed_bytes_reference(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(bytes(data[start:end]));
-	}
-
-	function enc_bytes(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(data[start:end]);
-	}
-	function enc_bytes_reference(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(bytes(data[start:end]));
-	}
-
-	function enc_uint256(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(x[start:end]);
-	}
-	function enc_uint256_reference(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(x[start:end]);
-	}
-
-	function enc_packed_uint256(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(x[start:end]);
-	}
-	function enc_packed_uint256_reference(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(x[start:end]);
-	}
-
-	function compare(bytes memory x, bytes memory y) internal {
-		assert(x.length == y.length);
-		for (uint i = 0; i < x.length; ++i)
-			assert(x[i] == y[i]);
-	}
-
-	function test_bytes() public {
-		bytes memory test = new bytes(3);
-		test[0] = 0x41; test[1] = 0x42; test[2] = 0x42;
-		for (uint i = 0; i < test.length; i++)
-			for (uint j = i; j <= test.length; j++)
-			{
-				compare(this.enc_packed_bytes(test, i, j), this.enc_packed_bytes_reference(test, i, j));
-				compare(this.enc_bytes(test, i, j), this.enc_bytes_reference(test, i, j));
-			}
-	}
-
-	function test_uint256() public {
-		uint256[] memory test = new uint256[](3);
-		test[0] = 0x41; test[1] = 0x42; test[2] = 0x42;
-		for (uint i = 0; i < test.length; i++)
-			for (uint j = i; j <= test.length; j++)
-			{
-				compare(this.enc_packed_uint256(test, i, j), this.enc_packed_uint256_reference(test, i, j));
-				compare(this.enc_uint256(test, i, j), this.enc_uint256_reference(test, i, j));
-			}
-	}
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// test_bytes() ->
-// gas irOptimized: 321332
-// gas legacy: 319111
-// gas legacyOptimized: 269317
-// test_uint256() ->
-// gas irOptimized: 447646
-// gas legacy: 433627
-// gas legacyOptimized: 365410
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
deleted file mode 100644
index 627f0b0c6b7f..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint256, bytes memory) {
-        bytes memory arg = "abcdefg";
-        return abi.decode(abi.encode(uint256(33), arg), (uint256, bytes));
-    }
-}
-// ----
-// f() -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol
deleted file mode 100644
index 601fb3cbeea5..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f1() public returns (bytes memory) {
-        return abi.encode("");
-    }
-    function f2(string calldata msg) public returns (bytes memory) {
-        return abi.encode(msg);
-    }
-    function g1() public returns (bytes memory) {
-        return abi.encodePacked("");
-    }
-    function g2(string calldata msg) public returns (bytes memory) {
-        return abi.encodePacked(msg);
-    }
-    function h1() public returns (bytes memory) {
-        return abi.encodeWithSelector(0x00000001, "");
-    }
-    function h2(string calldata msg) public returns (bytes memory) {
-        return abi.encodeWithSelector(0x00000001, msg);
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f1() -> 0x20, 0x40, 0x20, 0
-// f2(string): 0x20, 0 -> 0x20, 0x40, 0x20, 0
-// f2(string): 0x20, 0, 0 -> 0x20, 0x40, 0x20, 0
-// g1() -> 32, 0
-// g2(string): 0x20, 0 -> 0x20, 0
-// g2(string): 0x20, 0, 0 -> 0x20, 0
-// h1() -> 0x20, 0x44, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0
-// h2(string): 0x20, 0 -> 0x20, 0x44, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0
-// h2(string): 0x20, 0, 0 -> 0x20, 0x44, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
deleted file mode 100644
index 44cf1ab5b9fd..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// Tests that rational numbers (even negative ones) are encoded properly.
-contract C {
-    function f() public pure returns (bytes memory) {
-        return abi.encode(1, -2);
-    }
-}
-// ----
-// f() -> 0x20, 0x40, 0x1, -2
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol b/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol
deleted file mode 100644
index d9b94ac2e65b..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function f(bool b) public pure returns (bool) { return b; }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(bool): true -> true
-// f(bool): false -> false
-// f(bool): 0x000000 -> false
-// f(bool): 0xffffff -> true
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
deleted file mode 100644
index 9895c666a06d..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint a, bytes memory b, uint c)
-            public pure returns (uint, uint, bytes1, uint) {
-        return (a, b.length, b[3], c);
-    }
-
-    function f_external(uint a, bytes calldata b, uint c)
-            external pure returns (uint, uint, bytes1, uint) {
-        return (a, b.length, b[3], c);
-    }
-}
-// ----
-// f(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
-// f_external(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol b/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
deleted file mode 100644
index 49bee94ea344..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint a, uint[] calldata b, uint c) external pure returns (uint) {
-        return 7;
-    }
-}
-// ----
-// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol
deleted file mode 100644
index 18a4ee1a9ee5..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder v1;
-
-contract C {
-    function f(bool a, bytes calldata b, bytes32[2] calldata c)
-        public
-        returns (bool, bytes calldata, bytes32[2] calldata)
-    {
-        return (a, b, c);
-    }
-}
-// ====
-// compileViaYul: false
-// ----
-// f(bool,bytes,bytes32[2]): true, 0x80, "a", "b", 4, "abcd" -> true, 0x80, "a", "b", 4, "abcd"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol b/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol
deleted file mode 100644
index 262c4412fd7b..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(uint16 a, int16 b, address c, bytes3 d, bool e)
-            public pure returns (uint v, uint w, uint x, uint y, uint z) {
-        assembly { v := a  w := b x := c y := d z := e}
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(uint16,int16,address,bytes3,bool): 1, 2, 3, "a", true -> 1, 2, 3, "a", true
-// f(uint16,int16,address,bytes3,bool): 0xffffff, 0x1ffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "abcd", 1 -> 0xffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0xffffffffffffffffffffffffffffffffffffffff, "abc", true
-// f(uint16,int16,address,bytes3,bool): 0xffffff, 0, 0, "bcd", 1 -> 0xffff, 0, 0, "bcd", true
-// f(uint16,int16,address,bytes3,bool): 0, 0x1ffff, 0, "ab", 1 -> 0, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0, "ab", true
-// f(uint16,int16,address,bytes3,bool): 0, 0, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "ad", 1 -> 0, 0, 0xffffffffffffffffffffffffffffffffffffffff, "ad", true
-// f(uint16,int16,address,bytes3,bool): 0, 0, 0, "abcd", 1 -> 0, 0, 0, "abc", true
-// f(uint16,int16,address,bytes3,bool): 0, 0, 0, "abc", 2 -> 0, 0, 0, "abc", true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
deleted file mode 100644
index 35cb15077abc..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) external returns (uint256 c, uint256 d, uint256 e, uint256 f) {
-        (c, d) = abi.decode(msg.data[4:], (uint256, uint256));
-        e = abi.decode(msg.data[4 : 4 + 32], (uint256));
-        f = abi.decode(msg.data[4 + 32 : 4 + 32 + 32], (uint256));
-    }
-}
-// ----
-// f(uint256,uint256): 42, 23 -> 42, 23, 42, 23
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
deleted file mode 100644
index 7eb9a3885c66..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint a, uint16[] memory b, uint c)
-            public pure returns (uint, uint, uint) {
-        return (b.length, b[a], c);
-    }
-}
-// ----
-// f(uint256,uint16[],uint256): 6, 0x60, 9, 7, 11, 12, 13, 14, 15, 16, 17 -> 7, 17, 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
deleted file mode 100644
index ef2b07cb5213..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    function test(bytes memory buf) public view returns (bool same, bool inplaceDecoded) {
-        (uint256[] memory arr1, uint256[] memory arr2) = abi.decode(buf, (uint256[],uint256[]));
-        assembly {
-            // Check whether arr1 and arr2 end up at the same memory location.
-            // This used to be the case, if both tail pointers in buf pointed to the
-            // same memory region, i.e. this used to be false in the first two, but true
-            // in the last three calls below. The desired behaviour is to always get distinct
-            // memory regions, i.e. this should be false.
-            same := eq(arr1, arr2)
-            // Check whether (given the particular tail pointer of 0x40 for arr1 in the calls below)
-            // arr1 points to the part of buf containing the encoding of arr1.
-            // The position of the encoding of arr1 in buf is at offset 0x20 (length) + 0x40 (tail pointer)
-            // of buf.
-            // This used to be the case for all the test calls below, whereas now arr1 is always copied
-            // from buf to a new memory area. Should always be false.
-            inplaceDecoded := eq(arr1, add(buf, 0x60))
-        }
-    }
-}
-// ----
-// test(bytes): 0x20, 0x80, 0x40, 0x60, 0, 0 -> false, false
-// test(bytes): 0x20, 0xC0, 0x40, 0x80, 1, 0x42, 1, 0x42 -> false, false
-// test(bytes): 0x20, 0x80, 0x40, 0x40, 1, 0x42 -> false, false
-// test(bytes): 0x20, 0x60, 0x40, 0x40, 0 -> false, false
-// test(bytes): 0x20, 0x80, 0x40, 0x40, 1, 0x42 -> false, false
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/enums.sol b/test/libsolidity/semanticTests/abiEncoderV1/enums.sol
deleted file mode 100644
index a51aaebdefb4..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/enums.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-contract C {
-    enum E { A, B }
-    function f(E e) public pure returns (uint x) {
-        assembly { x := e }
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(uint8): 0 -> 0
-// f(uint8): 1 -> 1
-// f(uint8): 2 -> 2
-// f(uint8): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xff
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol b/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
deleted file mode 100644
index f828ab41e88c..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v1;
-
-contract C {
-    function f(uint256[] memory a, bytes calldata b) public returns (bytes memory) {
-        return abi.encode(a, b);
-    }
-
-    function g(uint256[] memory a, bytes calldata b) external returns (bytes memory) {
-        return f(a, b);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[],bytes): 0x40, 0x80, 1, 0xFF, 6, "123456" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xff, 6, "123456"
-// g(uint256[],bytes): 0x40, 0x80, 1, 0xffff, 8, "12345678" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xffff, 8, "12345678"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol b/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
deleted file mode 100644
index dbabfc35b142..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(bytes memory a, bytes calldata b, uint[] memory c)
-        external
-        pure
-        returns (uint, bytes1, uint, bytes1, uint, uint)
-    {
-        return (a.length, a[1], b.length, b[2], c.length, c[3]);
-    }
-    function g() public returns (uint, bytes1, uint, bytes1, uint, uint) {
-        uint[] memory x = new uint[](4);
-        x[3] = 7;
-        return this.f("abc", "def", x);
-    }
-}
-// ----
-// g() -> 3, 0x6200000000000000000000000000000000000000000000000000000000000000, 3, 0x6600000000000000000000000000000000000000000000000000000000000000, 4, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol
deleted file mode 100644
index 24c1b2325a0c..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function dyn() public returns (bytes memory a, uint b, bytes20[] memory c, uint d) {
-		a = "1234567890123456789012345678901234567890";
-		b = type(uint).max;
-		c = new bytes20[](4);
-		c[0] = bytes20(uint160(1234));
-		c[3] = bytes20(uint160(6789));
-		d = 0x1234;
-	}
-	function f() public returns (bytes memory, uint, bytes20[] memory, uint) {
-		return this.dyn();
-	}
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f() -> 0x80, -1, 0xe0, 0x1234, 40, "12345678901234567890123456789012", "34567890", 4, 97767552542602192590433234714624, 0, 0, 537879995309340587922569878831104
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol
deleted file mode 100644
index 191b4e6be6b1..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function dyn(uint x) public returns (bytes memory a) {
-        assembly {
-            mstore(0, 0x20)
-            mstore(0x20, 0x21)
-            return(0, x)
-        }
-    }
-    function f(uint x) public returns (bool) {
-        this.dyn(x);
-        return true;
-    }
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// f(uint256): 0x60 -> true
-// f(uint256): 0x7f -> true
-// f(uint256): 0x80 -> true
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol
deleted file mode 100644
index cfbd003244c3..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function dyn(uint x) public returns (bytes memory a) {
-        assembly {
-            mstore(0, 0x20)
-            mstore(0x20, 0x21)
-            return(0, x)
-        }
-    }
-    function f(uint x) public returns (bool) {
-        this.dyn(x);
-        return true;
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256): 0x60 -> FAILURE
-// f(uint256): 0x61 -> true
-// f(uint256): 0x80 -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol
deleted file mode 100644
index bd12b0a9b356..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function dyn() public returns (bytes memory) {
-        return "1234567890123456789012345678901234567890";
-    }
-    function f() public returns (bytes memory) {
-        return this.dyn();
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f() -> 0x20, 40, "12345678901234567890123456789012", "34567890"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
deleted file mode 100644
index efffab86c1cf..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-library L {
-	struct S { uint x; uint y; }
-	function f(uint[] storage r, S storage s) public returns (uint, uint, uint, uint) {
-		r[2] = 8;
-		s.x = 7;
-		return (r[0], r[1], s.x, s.y);
-	}
-}
-contract C {
-	uint8 x = 3;
-	L.S s;
-	uint[] r;
-	function f() public returns (uint, uint, uint, uint, uint, uint) {
-		r = new uint[](6);
-		r[0] = 1;
-		r[1] = 2;
-		r[2] = 3;
-		s.x = 11;
-		s.y = 12;
-		(uint a, uint b, uint c, uint d) = L.f(r, s);
-		return (r[2], s.x, a, b, c, d);
-	}
-}
-// ----
-// library: L
-// f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 166475
-// gas legacy: 169283
-// gas legacyOptimized: 167248
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
deleted file mode 100644
index 686164de856a..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function enc_packed_bytes(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(data[start:end]);
-	}
-	function enc_packed_bytes_reference(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(bytes(data[start:end]));
-	}
-
-	function enc_bytes(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(data[start:end]);
-	}
-	function enc_bytes_reference(bytes calldata data, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(bytes(data[start:end]));
-	}
-
-	function enc_uint256(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(x[start:end]);
-	}
-	function enc_uint256_reference(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encode(x[start:end]);
-	}
-
-	function enc_packed_uint256(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(x[start:end]);
-	}
-	function enc_packed_uint256_reference(uint256[] calldata x, uint256 start, uint256 end) external returns (bytes memory) {
-		return abi.encodePacked(x[start:end]);
-	}
-
-	function compare(bytes memory x, bytes memory y) internal {
-		assert(x.length == y.length);
-		for (uint i = 0; i < x.length; ++i)
-			assert(x[i] == y[i]);
-	}
-
-	function test_bytes() public {
-		bytes memory test = new bytes(3);
-		test[0] = 0x41; test[1] = 0x42; test[2] = 0x42;
-		for (uint i = 0; i < test.length; i++)
-			for (uint j = i; j <= test.length; j++)
-			{
-				compare(this.enc_packed_bytes(test, i, j), this.enc_packed_bytes_reference(test, i, j));
-				compare(this.enc_bytes(test, i, j), this.enc_bytes_reference(test, i, j));
-			}
-	}
-
-	function test_uint256() public {
-		uint256[] memory test = new uint256[](3);
-		test[0] = 0x41; test[1] = 0x42; test[2] = 0x42;
-		for (uint i = 0; i < test.length; i++)
-			for (uint j = i; j <= test.length; j++)
-			{
-				compare(this.enc_packed_uint256(test, i, j), this.enc_packed_uint256_reference(test, i, j));
-				compare(this.enc_uint256(test, i, j), this.enc_uint256_reference(test, i, j));
-			}
-	}
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// test_bytes() ->
-// gas irOptimized: 321332
-// gas legacy: 319111
-// gas legacyOptimized: 269317
-// test_uint256() ->
-// gas irOptimized: 447646
-// gas legacy: 433627
-// gas legacyOptimized: 365410
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
deleted file mode 100644
index 849c24a91f3c..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// Tests that this will not end up using a "bytes0" type
-// (which would assert)
-pragma abicoder               v2;
-
-
-contract C {
-    function f() public pure returns (bytes memory, bytes memory) {
-        return (abi.encode(""), abi.encodePacked(""));
-    }
-}
-// ----
-// f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
deleted file mode 100644
index edd319d45a39..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// Tests that rational numbers (even negative ones) are encoded properly.
-pragma abicoder               v2;
-
-
-contract C {
-    function f() public pure returns (bytes memory) {
-        return abi.encode(1, -2);
-    }
-}
-// ----
-// f() -> 0x20, 0x40, 0x1, -2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
deleted file mode 100644
index 5e50d5e9a807..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256[] b;
-    }
-
-    function f0() public pure returns (bytes memory) {
-        return abi.encode();
-    }
-
-    function f1() public pure returns (bytes memory) {
-        return abi.encode(1, 2);
-    }
-
-    function f2() public pure returns (bytes memory) {
-        string memory x = "abc";
-        return abi.encode(1, x, 2);
-    }
-
-    function f3() public pure returns (bytes memory r) {
-        // test that memory is properly allocated
-        string memory x = "abc";
-        r = abi.encode(1, x, 2);
-        bytes memory y = "def";
-        require(y[0] == "d");
-        y[0] = "e";
-        require(y[0] == "e");
-    }
-
-    S s;
-
-    function f4() public returns (bytes memory r) {
-        string memory x = "abc";
-        s.a = 7;
-        s.b.push(2);
-        s.b.push(3);
-        r = abi.encode(1, x, s, 2);
-        bytes memory y = "def";
-        require(y[0] == "d");
-        y[0] = "e";
-        require(y[0] == "e");
-    }
-}
-// ----
-// f0() -> 0x20, 0x0
-// f1() -> 0x20, 0x40, 0x1, 0x2
-// f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
-// f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
-// f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 112630
-// gas legacy: 114794
-// gas legacyOptimized: 112572
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
deleted file mode 100644
index 55f7991def80..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-==== Source: A ====
-pragma abicoder v2;
-
-struct Data {
-    uint a;
-    uint[2] b;
-    uint c;
-}
-
-contract A {
-    function get() public view returns (Data memory) {
-        return Data(5, [uint(66), 77], 8);
-    }
-}
-
-contract B {
-    function foo(A _a) public returns (uint) {
-        return _a.get().b[1];
-    }
-}
-==== Source: B ====
-pragma abicoder v1;
-
-import "A";
-
-contract C is B {
-    function test() public returns (uint) {
-        return foo(new A());
-    }
-}
-// ----
-// test() -> 77
-// gas irOptimized: 110348
-// gas legacy: 151866
-// gas legacyOptimized: 110373
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
deleted file mode 100644
index 7de26301205c..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-==== Source: A ====
-pragma abicoder v2;
-
-struct Data {
-    uint value;
-}
-
-contract A {
-    function get() public view returns (Data memory) {
-        return Data(5);
-    }
-}
-
-contract B {
-    uint x = 10;
-    uint y = 10;
-
-    modifier updateStorage() {
-        A a = new A();
-        x = a.get().value;
-        _;
-        y = a.get().value;
-    }
-}
-==== Source: B ====
-pragma abicoder v1;
-
-import "A";
-
-contract C is B {
-    function test()
-        public
-        updateStorage
-        returns (uint, uint)
-    {
-        return (x, y);
-    }
-}
-// ----
-// test() -> 5, 10
-// gas irOptimized: 87337
-// gas legacy: 102651
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol
deleted file mode 100644
index 9e5d57552740..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder v2;
-
-struct T {
-    bytes x;
-    uint[3] y;
-}
-
-contract E {
-    function f(bool a, T calldata b, bytes32[2] calldata c)
-        public
-        returns (bool, T calldata, bytes32[2] calldata)
-    {
-        return (a, b, c);
-    }
-}
-// ----
-// f(bool,(bytes,uint256[3]),bytes32[2]): 1, 0x80, "a", "b", 0x80, 11, 12, 13, 4, "abcd" -> 1, 0x80, "a", "b", 0x80, 11, 12, 13, 4, "abcd"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol b/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
deleted file mode 100644
index e47125707515..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function f(bool b) public pure returns (bool) { return b; }
-}
-// ----
-// f(bool): true -> true
-// f(bool): false -> false
-// f(bool): 0x000000 -> false
-// f(bool): 0xffffff -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
deleted file mode 100644
index 078da3fdc70a..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function f(uint a, bytes memory b, uint c)
-            public pure returns (uint, uint, bytes1, uint) {
-        return (a, b.length, b[3], c);
-    }
-
-    function f_external(uint a, bytes calldata b, uint c)
-            external pure returns (uint, uint, bytes1, uint) {
-        return (a, b.length, b[3], c);
-    }
-}
-// ----
-// f(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
-// f_external(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
deleted file mode 100644
index 22aad67492e8..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function g(uint256[] calldata) external pure returns (bytes memory) {
-        return msg.data;
-    }
-    function f(uint256[][1] calldata s) external view returns (bool) {
-        bytes memory a = this.g(s[0]);
-        uint256[] memory m = s[0];
-        bytes memory b = this.g(m);
-        assert(a.length == b.length);
-        for (uint i = 0; i < a.length; i++)
-            assert(a[i] == b[i]);
-        return true;
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[][1]): 32, 32, 0 -> true
-// f(uint256[][1]): 32, 32, 1, 42 -> true
-// f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 120043
-// gas legacy: 101568
-// gas legacyOptimized: 119092
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol
deleted file mode 100644
index c1208218bdb2..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function g(uint256[] calldata s) external view returns (bytes memory) {
-        return this.f(s);
-    }
-    function h(uint8[] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function i(uint8[] calldata s) external view returns (bytes memory) {
-        return this.h(s);
-    }
-    function j(bytes calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function k(bytes calldata s) external view returns (bytes memory) {
-        return this.j(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[]): 32, 3, 23, 42, 87 -> 32, 160, 32, 3, 23, 42, 87
-// g(uint256[]): 32, 3, 23, 42, 87 -> 32, 160, 32, 3, 23, 42, 87
-// h(uint8[]): 32, 3, 23, 42, 87 -> 32, 160, 32, 3, 23, 42, 87
-// i(uint8[]): 32, 3, 23, 42, 87 -> 32, 160, 32, 3, 23, 42, 87
-// h(uint8[]): 32, 3, 0xFF23, 0x1242, 0xAB87 -> FAILURE
-// i(uint8[]): 32, 3, 0xAB23, 0x1242, 0xFF87 -> FAILURE
-// j(bytes): 32, 3, hex"123456" -> 32, 96, 32, 3, left(0x123456)
-// k(bytes): 32, 3, hex"AB33FF" -> 32, 96, 32, 3, left(0xAB33FF)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol
deleted file mode 100644
index a9e3d8b1532e..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function g(uint256[][2] calldata s, uint256 which) external view returns (bytes memory) {
-        return this.f(s[which]);
-    }
-    function h(uint8[] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function i(uint8[][2] calldata s, uint256 which) external view returns (bytes memory) {
-        return this.h(s[which]);
-    }
-    function j(bytes calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function k(bytes[2] calldata s, uint256 which) external view returns (bytes memory) {
-        return this.j(s[which]);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[]): 32, 3, 42, 23, 87 -> 32, 160, 32, 3, 42, 23, 87
-// g(uint256[][2],uint256): 0x40, 0, 0x40, 0xC0, 3, 42, 23, 87, 4, 11, 13, 17 -> 32, 160, 32, 3, 42, 23, 87
-// g(uint256[][2],uint256): 0x40, 1, 0x40, 0xC0, 3, 42, 23, 87, 4, 11, 13, 17, 27 -> 32, 192, 32, 4, 11, 13, 17, 27
-// h(uint8[]): 32, 3, 42, 23, 87 -> 32, 160, 32, 3, 42, 23, 87
-// i(uint8[][2],uint256): 0x40, 0, 0x40, 0xC0, 3, 42, 23, 87, 4, 11, 13, 17 -> 32, 160, 32, 3, 42, 23, 87
-// i(uint8[][2],uint256): 0x40, 1, 0x40, 0xC0, 3, 42, 23, 87, 4, 11, 13, 17, 27 -> 32, 192, 32, 4, 11, 13, 17, 27
-// j(bytes): 32, 3, hex"AB11FF" -> 32, 96, 32, 3, left(0xAB11FF)
-// k(bytes[2],uint256): 0x40, 0, 0x40, 0x63, 3, hex"AB11FF", 4, hex"FF791432" -> 32, 96, 32, 3, left(0xAB11FF)
-// k(bytes[2],uint256): 0x40, 1, 0x40, 0x63, 3, hex"AB11FF", 4, hex"FF791432" -> 32, 96, 32, 4, left(0xFF791432)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol
deleted file mode 100644
index ecea716bd0b7..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint8[][1][] calldata s) external pure returns (bytes memory) {
-        return msg.data;
-    }
-    function f2(uint256[][2][] calldata s) external pure returns (bytes memory) {
-        return msg.data;
-    }
-    function reenc_f(uint8[][1][] calldata s) external view returns (bytes memory) {
-        return this.f(s);
-    }
-    function reenc_f2(uint256[][2][] calldata s) external view returns (bytes memory) {
-        return this.f2(s);
-    }
-    function g() external returns (bytes memory) {
-        uint8[][1][] memory m = new uint8[][1][](1);
-        m[0][0] = new uint8[](1);
-        m[0][0][0] = 42;
-        return this.f(m);
-    }
-    function h() external returns (bytes memory) {
-        uint8[][1][] memory m = new uint8[][1][](1);
-        m[0][0] = new uint8[](1);
-        m[0][0][0] = 42;
-        return this.reenc_f(m);
-    }
-    function i() external returns (bytes memory) {
-        uint256[][2][] memory m = new uint256[][2][](1);
-        m[0][0] = new uint256[](1);
-        m[0][1] = new uint256[](1);
-        m[0][0][0] = 42;
-        m[0][1][0] = 42;
-        return this.f2(m);
-    }
-    function j() external returns (bytes memory) {
-        uint256[][2][] memory m = new uint256[][2][](1);
-        m[0][0] = new uint256[](1);
-        m[0][1] = new uint256[](1);
-        m[0][0][0] = 42;
-        m[0][1][0] = 42;
-        return this.reenc_f2(m);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// g() -> 32, 196, hex"eccb829a", 32, 1, 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
-// h() -> 32, 196, hex"eccb829a", 32, 1, 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol
deleted file mode 100644
index b15a203f22bf..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    // This case used to be affected by the buggy cleanup due to ABIEncoderV2HeadOverflowWithStaticArrayCleanup bug.
-    function g(uint[] memory a, uint[1] calldata b) public returns (uint[] memory, uint[1] calldata) {
-        return (a, b);
-    }
-}
-
-contract C {
-    function f(uint[] memory a, uint[1] calldata b) public returns (uint[] memory, uint[1] memory) {
-        return L.g(a, b);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x40, 0xff, 0x01, 0xffff
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
deleted file mode 100644
index 2d8095704751..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][2][] calldata x) external returns (uint256) {
-        x[0]; // trigger bounds checks
-        return 23;
-    }
-}
-// ----
-// f(uint256[][2][]): 0x20, 0x01, 0x20, 0x40, 0x60, 0x00, 0x00 -> 23 # this is the common encoding for x.length == 1 && x[0][0].length == 0 && x[0][1].length == 0 #
-// f(uint256[][2][]): 0x20, 0x01, 0x20, 0x00, 0x00 -> 23 # exotic, but still valid encoding #
-// f(uint256[][2][]): 0x20, 0x01, 0x20, 0x00 -> FAILURE # invalid (too short) encoding, but no failure due to this PR #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
deleted file mode 100644
index 170f886402f7..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][2][] calldata x) external returns (uint256) {
-        return 42;
-    }
-    function g(uint256[][2][] calldata x) external returns (uint256) {
-        return this.f(x);
-    }
-}
-// ----
-// g(uint256[][2][]): 0x20, 0x01, 0x20, 0x40, 0x60, 0x00, 0x00 -> 42
-// g(uint256[][2][]): 0x20, 0x01, 0x20, 0x00, 0x00 -> 42
-// g(uint256[][2][]): 0x20, 0x01, 0x20, 0x00 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
deleted file mode 100644
index a52a065e6617..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(function() external returns (uint)[] calldata s) external returns (uint, uint, uint) {
-        assert(s.length == 3);
-        return (s[0](), s[1](), s[2]());
-    }
-    function f_reenc(function() external returns (uint)[] calldata s) external returns (uint, uint, uint) {
-        return this.f(s);
-    }
-    function getter1() external returns (uint) {
-        return 23;
-    }
-    function getter2() external returns (uint) {
-        return 37;
-    }
-    function getter3() external returns (uint) {
-        return 71;
-    }
-    function g(bool reenc) external returns (uint, uint, uint) {
-        function() external returns (uint)[] memory a = new function() external returns (uint)[](3);
-        a[0] = this.getter1;
-        a[1] = this.getter2;
-        a[2] = this.getter3;
-        return reenc ? this.f_reenc(a) : this.f(a);
-    }
-}
-// ----
-// g(bool): false -> 23, 37, 71
-// g(bool): true -> 23, 37, 71
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol
deleted file mode 100644
index b9b3bd145684..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[][] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function g(uint256[][] calldata s) external view returns (bytes memory) {
-        return this.f(s);
-    }
-    function h(uint8[][] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function i(uint8[][] calldata s) external view returns (bytes memory) {
-        return this.h(s);
-    }
-    function j(bytes[] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function k(bytes[] calldata s) external view returns (bytes memory) {
-        return this.j(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 13, 17, 23, 4, 27, 31, 37, 41 -> 32, 416, 32, 2, 64, 192, 3, 13, 17, 23, 4, 27, 31, 37, 41
-// g(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 13, 17, 23, 4, 27, 31, 37, 41 -> 32, 416, 32, 2, 64, 192, 3, 13, 17, 23, 4, 27, 31, 37, 41
-// h(uint8[][]): 0x20, 2, 0x40, 0xC0, 3, 13, 17, 23, 4, 27, 31, 37, 41 -> 32, 416, 32, 2, 64, 192, 3, 13, 17, 23, 4, 27, 31, 37, 41
-// i(uint8[][]): 0x20, 2, 0x40, 0xC0, 3, 13, 17, 23, 4, 27, 31, 37, 41 -> 32, 416, 32, 2, 64, 192, 3, 13, 17, 23, 4, 27, 31, 37, 41
-// j(bytes[]): 0x20, 2, 0x40, 0x63, 3, hex"131723", 4, hex"27313741" -> 32, 256, 32, 2, 64, 128, 3, left(0x131723), 4, left(0x27313741)
-// k(bytes[]): 0x20, 2, 0x40, 0x63, 3, hex"131723", 4, hex"27313741" -> 32, 256, 32, 2, 64, 128, 3, left(0x131723), 4, left(0x27313741)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
deleted file mode 100644
index b8cb0226e13d..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	function f(uint[] calldata) public {}
-}
-// ====
-// revertStrings: debug
-// ----
-// f(uint256[]): 0x20, 0 ->
-// f(uint256[]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x2b, "ABI decoding: invalid calldata a", "rray stride"
-// f(uint256[]): 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x2b, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
deleted file mode 100644
index 7fc08caafb04..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f(uint[] calldata) public {}
-}
-// ----
-// f(uint256[]): 0x20, 0 ->
-// f(uint256[]): 0x20, 1 -> FAILURE
-// f(uint256[]): 0x20, 2 -> FAILURE
-
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol
deleted file mode 100644
index aaf7616ec8ef..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[3] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function g(uint256[3] calldata s) external view returns (bytes memory) {
-        return this.f(s);
-    }
-    function h(uint8[3] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function i(uint8[3] calldata s) external view returns (bytes memory) {
-        return this.h(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
-// g(uint256[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
-// h(uint8[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
-// i(uint8[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
-// h(uint8[3]): 0xFF23, 0x1242, 0xAB87 -> FAILURE
-// i(uint8[3]): 0xAB23, 0x1242, 0xFF87 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol
deleted file mode 100644
index dd59ac8cf6e3..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint8[1][][1] calldata s) external pure returns (bytes memory) {
-        return msg.data;
-    }
-    function f2(uint256[2][][2] calldata s) external pure returns (bytes memory) {
-        return msg.data;
-    }
-    function reenc_f(uint8[1][][1] calldata s) external view returns (bytes memory) {
-        return this.f(s);
-    }
-    function reenc_f2(uint256[2][][2] calldata s) external view returns (bytes memory) {
-        return this.f2(s);
-    }
-    function g() external returns (bytes memory) {
-        uint8[1][][1] memory m = [new uint8[1][](1)];
-        m[0][0][0] = 42;
-        return this.f(m);
-    }
-    function h() external returns (bytes memory) {
-        uint8[1][][1] memory m = [new uint8[1][](1)];
-        m[0][0][0] = 42;
-        return this.reenc_f(m);
-    }
-    function i() external returns (bytes memory) {
-        uint256[2][][2] memory m = [new uint256[2][](1),new uint256[2][](1)];
-        m[0][0][0] = 0x00042;
-        m[0][0][1] = 0x00142;
-        m[1][0][0] = 0x10042;
-        m[1][0][1] = 0x10142;
-        return this.f2(m);
-    }
-    function j() external returns (bytes memory) {
-        uint256[2][][2] memory m = [new uint256[2][](1),new uint256[2][](1)];
-        m[0][0][0] = 0x00042;
-        m[0][0][1] = 0x00142;
-        m[1][0][0] = 0x10042;
-        m[1][0][1] = 0x10142;
-        return this.reenc_f2(m);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// g() -> 32, 132, hex"15cfcc01", 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
-// h() -> 32, 132, hex"15cfcc01", 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
-// i() -> 32, 292, hex"dc0ee233", 32, 64, 160, 1, 0x42, 0x000142, 1, 0x010042, 0x010142, hex"00000000000000000000000000000000000000000000000000000000"
-// j() -> 32, 292, hex"dc0ee233", 32, 64, 160, 1, 0x42, 0x000142, 1, 0x010042, 0x010142, hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol
deleted file mode 100644
index a75e2c2e0dce..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[3] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function g(uint256[3][2] calldata s, uint256 which) external view returns (bytes memory) {
-        return this.f(s[which]);
-    }
-    function h(uint8[3] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function i(uint8[3][2] calldata s, uint256 which) external view returns (bytes memory) {
-        return this.h(s[which]);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
-// g(uint256[3][2],uint256): 23, 42, 87, 123, 142, 187, 0 -> 32, 96, 23, 42, 87
-// g(uint256[3][2],uint256): 23, 42, 87, 123, 142, 187, 1 -> 32, 96, 123, 142, 187
-// h(uint8[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
-// i(uint8[3][2],uint256): 23, 42, 87, 123, 142, 187, 0 -> 32, 96, 23, 42, 87
-// i(uint8[3][2],uint256): 23, 42, 87, 123, 142, 187, 1 -> 32, 96, 123, 142, 187
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol
deleted file mode 100644
index 68dbe88f74a4..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint256[] a; }
-    function f(S[] calldata s) external pure returns (bytes memory) {
-        return abi.encode(s);
-    }
-    function g(S[] calldata s) external view returns (bytes memory) {
-        return this.f(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f((uint256[])[]): 32, 1, 32, 32, 3, 17, 42, 23 -> 32, 256, 32, 1, 32, 32, 3, 17, 42, 23
-// g((uint256[])[]): 32, 1, 32, 32, 3, 17, 42, 23 -> 32, 256, 32, 1, 32, 32, 3, 17, 42, 23
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol
deleted file mode 100644
index 5e43a1c4b1c2..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[] calldata s1, uint256[] calldata s2, bool which) external pure returns (bytes memory) {
-        if (which)
-            return abi.encode(s1);
-        else
-            return abi.encode(s2);
-    }
-    function g(uint256[] calldata s1, uint256[] calldata s2, bool which) external view returns (bytes memory) {
-        return this.f(s1, s2, which);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[],uint256[],bool): 0x60, 0xE0, true, 3, 23, 42, 87, 2, 51, 72 -> 32, 160, 0x20, 3, 23, 42, 87
-// f(uint256[],uint256[],bool): 0x60, 0xE0, false, 3, 23, 42, 87, 2, 51, 72 -> 32, 128, 0x20, 2, 51, 72
-// g(uint256[],uint256[],bool): 0x60, 0xE0, true, 3, 23, 42, 87, 2, 51, 72 -> 32, 160, 0x20, 3, 23, 42, 87
-// g(uint256[],uint256[],bool): 0x60, 0xE0, false, 3, 23, 42, 87, 2, 51, 72 -> 32, 128, 0x20, 2, 51, 72
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol
deleted file mode 100644
index 554c06aa92c4..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint256[3] calldata s1, uint256[2] calldata s2, bool which) external pure returns (bytes memory) {
-        if (which)
-            return abi.encode(s1);
-        else
-            return abi.encode(s2);
-    }
-    function g(uint256[3] calldata s1, uint256[2] calldata s2, bool which) external view returns (bytes memory) {
-        return this.f(s1, s2, which);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[3],uint256[2],bool): 23, 42, 87, 51, 72, true -> 32, 96, 23, 42, 87
-// f(uint256[3],uint256[2],bool): 23, 42, 87, 51, 72, false -> 32, 64, 51, 72
-// g(uint256[3],uint256[2],bool): 23, 42, 87, 51, 72, true -> 32, 96, 23, 42, 87
-// g(uint256[3],uint256[2],bool): 23, 42, 87, 51, 72, false -> 32, 64, 51, 72
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
deleted file mode 100644
index 1fca188a6857..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function f(uint[][] calldata a) public returns (uint[][] memory) {
-        return a;
-    }
-
-    function g(uint[][][] calldata a) public returns (uint[][][] memory) {
-        return a;
-    }
-
-    function h(uint[2][][] calldata a) public returns (uint[2][][] memory) {
-        return a;
-    }
-}
-// ----
-// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
-// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8, 9 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
-// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8 -> FAILURE
-// g(uint256[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8 -> 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
-// g(uint256[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0xa0, 2, 5, 6, 2, 7 -> FAILURE
-// h(uint256[2][][]): 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8 -> 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8
-// h(uint256[2][][]): 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8, 9 -> 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8
-// h(uint256[2][][]): 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
deleted file mode 100644
index 96573fb4baaa..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function f(uint[][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-    function g(uint8[][][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-    function h(uint16[][2][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-    function i(uint16[][][1] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-    function j(uint16[2][][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-}
-// ====
-// revertStrings: debug
-// ----
-// f(uint256[][]): 0x20, 1, 0x20, 0 -> 0x20, 0x80, 0x20, 1, 0x20, 0
-// f(uint256[][]): 0x20, 1, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// f(uint256[][]): 0x20, 1, 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// f(uint256[][]): 0x20, 1, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 0 -> 0x20, 0x01a0, 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 0
-// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access offset"
-// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0 -> 0x20, 0x01e0, 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0
-// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0, 1 -> 0x20, 0x01e0, 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0
-// h(uint16[][2][]): 0x20, 2, 0x40, 0x0120, 0x40, 0x80, 1, 10, 2, 11, 12, 0x40, 0x60, 0, 1, 13 -> 0x20, 0x0200, 0x20, 2, 0x40, 288, 0x40, 0x80, 1, 10, 2, 11, 12, 0x40, 0x60, 0, 1, 13
-// h(uint16[][2][]): 0x20, 2, 0x40, 0x0120, 0x40, 0x80, 1, 10, 2, 11, 12, 0x40, 0x60, 0, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// i(uint16[][][1]): 0x20, 0x20, 2, 0x40, 0x80, 1, 10, 2, 11, 12 -> 0x20, 0x0140, 0x20, 0x20, 2, 0x40, 0x80, 1, 10, 2, 11, 12
-// i(uint16[][][1]): 0x20, 0x20, 2, 0x40, 0x80, 1, 10, 2, 11 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// j(uint16[2][][]): 0x20, 2, 0x40, 0xa0, 1, 0x0a, 11, 2, 12, 13, 14, 15 -> 0x20, 0x0180, 0x20, 2, 0x40, 0xa0, 1, 10, 11, 2, 12, 13, 14, 15
-// j(uint16[2][][]): 0x20, 2, 0x40, 0xa0, 1, 0x0a, 11, 2, 12, 13, 14 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
deleted file mode 100644
index 440f8e14ca50..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	function f(uint[3][] calldata a) public {
-		abi.encode(a);
-	}
-	function f(uint[][3] calldata a) public {
-		abi.encode(a);
-	}
-	function f(uint[2][2] calldata a) public {
-		abi.encode(a);
-	}
-}
-// ----
-// f(uint256[3][]): 0x20, 1, 0x01 -> FAILURE
-// f(uint256[3][]): 0x20, 1, 0x01, 0x02 -> FAILURE
-// f(uint256[3][]): 0x20, 1, 0x01, 0x02, 0x03 ->
-// f(uint256[][3]): 0x20, 0x60, 0x60, 0x60, 3, 0x01 -> FAILURE
-// f(uint256[][3]): 0x20, 0x60, 0x60, 0x60, 3, 0x01, 0x02 -> FAILURE
-// f(uint256[][3]): 0x20, 0x60, 0x60, 0x60, 3, 0x01, 0x02, 0x03 ->
-// f(uint256[2][2]): 0x01 -> FAILURE
-// f(uint256[2][2]): 0x01, 0x02 -> FAILURE
-// f(uint256[2][2]): 0x01, 0x02, 0x03 -> FAILURE
-// f(uint256[2][2]): 0x01, 0x02, 0x03, 0x04 ->
-// f(uint256[2][2]): 0x01, 0x02, 0x03, 0x04, 0x05 ->
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
deleted file mode 100644
index a92336097172..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint[] s;
-    uint[2] n;
-
-    function f_memory(uint[] calldata a, uint[2] calldata b) public returns (uint[] memory, uint[2] memory) {
-        return (a, b);
-    }
-
-    function f_encode(uint[] calldata a, uint[2] calldata b) public returns (bytes memory) {
-        return abi.encode(a, b);
-    }
-
-    function f_which(uint[] calldata a, uint[2] calldata b, uint which) public returns (bytes memory) {
-        return abi.encode(a[which], b[1]);
-    }
-
-    function f_storage(uint[] calldata a, uint[2] calldata b ) public returns (bytes memory) {
-        s = a;
-        n = b;
-        return abi.encode(s);
-    }
-}
-// ----
-// f_memory(uint256[],uint256[2]): 0x20, 1, 2 -> 0x60, 0x01, 0x02, 1, 2
-// f_memory(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x60, 1, 2, 2, 5, 6
-// f_memory(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
-// f_encode(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0xa0, 0x60, 1, 2, 1, 2
-// f_encode(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0xc0, 0x60, 1, 2, 2, 5, 6
-// f_encode(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
-// f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5 -> 0x20, 0x40, 5, 2
-// f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5, 6 -> 0x20, 0x40, 5, 2
-// f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
-// f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
-// gas irOptimized: 111642
-// gas legacy: 112944
-// gas legacyOptimized: 112092
-// f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
-// f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
deleted file mode 100644
index d5a3266f0520..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint[] s;
-    uint[2] n;
-
-    function f_memory(uint[][] calldata a) public returns (uint[][] memory) {
-        return a;
-    }
-
-    function f_encode(uint[][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function f_which(uint[][] calldata a, uint which) public returns (uint[] memory) {
-        return a[which];
-    }
-}
-// ----
-// f_memory(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
-// f_memory(uint256[][]): 0x20, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 1, 2
-// f_memory(uint256[][]): 0x20, 2, 0, 0x60, 2, 1, 2 -> 0x20, 2, 0x40, 0x60, 0, 1, 2
-// f_memory(uint256[][]): 0x20, 2, 0, 0x60, 2, 2, 2 -> FAILURE
-// f_encode(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 0x0140, 0x20, 2, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
-// f_encode(uint256[][]): 0x20, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 0x0120, 0x20, 2, 0x40, 0xa0, 2, 1, 2, 1, 2
-// f_encode(uint256[][]): 0x20, 2, 0, 0x60, 2, 1, 2 -> 0x20, 0xe0, 0x20, 2, 0x40, 0x60, 0, 1, 2
-// f_encode(uint256[][]): 0x20, 2, 0, 0x60, 2, 2, 2 -> FAILURE
-// f_which(uint256[][],uint256): 0x40, 0, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 1, 2
-// f_which(uint256[][],uint256): 0x40, 1, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 1, 2
-// f_which(uint256[][],uint256): 0x40, 0, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 2, 1, 2
-// f_which(uint256[][],uint256): 0x40, 1, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 1, 2
-// f_which(uint256[][],uint256): 0x40, 0, 2, 0, 0x60, 2, 1, 2 -> 0x20, 0
-// f_which(uint256[][],uint256): 0x40, 1, 2, 0, 0x60, 2, 1, 2 -> 0x20, 1, 2
-// f_which(uint256[][],uint256): 0x40, 1, 2, 0, 0x60, 2, 2, 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
deleted file mode 100644
index 347710a30dd2..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct D { uint[] x; }
-    struct S { uint x; }
-
-    function f(D calldata a) public returns (bytes memory){
-        return abi.encode(a);
-    }
-
-    function g(D[2] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function h(D[][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function i(D[2][] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function j(S[] memory a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function k(S[2] memory a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function l(S[][] memory a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-}
-// ----
-// f((uint256[])): 0x20, 0x20, 0 -> 0x20, 0x60, 0x20, 0x20, 0
-// f((uint256[])): 0x20, 0x20, 1 -> FAILURE
-// f((uint256[])): 0x20, 0x20, 2 -> FAILURE
-// f((uint256[])): 0x20, 0x20, 3 -> FAILURE
-// g((uint256[])[2]): 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3 -> 0x20, 0x0140, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3
-// g((uint256[])[2]): 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1 -> FAILURE
-// h((uint256[])[][]): 0x20, 0x02, 0x40, 0x0180, 2, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3, 1, 0x20, 0x20, 1, 1 -> 0x20, 0x0260, 0x20, 2, 0x40, 0x0180, 2, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3, 1, 0x20, 0x20, 1, 1
-// h((uint256[])[][]): 0x20, 0x02, 0x40, 0x0180, 2, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3, 1, 0x20, 0x20, 1 -> FAILURE
-// i((uint256[])[2][]): 0x20, 1, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3 -> 0x20, 0x0180, 0x20, 1, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3
-// i((uint256[])[2][]): 0x20, 1, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1 -> FAILURE
-// j((uint256)[]): 0x20, 2, 1, 2 -> 0x20, 0x80, 0x20, 2, 1, 2
-// j((uint256)[]): 0x20, 2, 1 -> FAILURE
-// k((uint256)[2]): 1, 2 -> 0x20, 0x40, 1, 2
-// k((uint256)[2]): 1 -> FAILURE
-// l((uint256)[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9 -> 0x20, 0x0160, 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9
-// l((uint256)[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9, 10 -> 0x20, 0x0160, 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9
-// l((uint256)[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol
deleted file mode 100644
index f275957c03a4..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint256[] a; }
-
-    function f(S calldata s) external returns (bytes memory) {
-        return abi.encode(s);
-    }
-
-    function g(S calldata s) external returns (bytes memory) {
-        return this.f(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f((uint256[])): 0x20, 0x20, 3, 42, 23, 17 -> 32, 192, 0x20, 0x20, 3, 42, 23, 17
-// g((uint256[])): 0x20, 0x20, 3, 42, 23, 17 -> 32, 192, 0x20, 0x20, 3, 42, 23, 17
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
deleted file mode 100644
index 129373de6631..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct A {
-        uint256 a;
-        uint256[] b;
-    }
-    struct B {
-        A a;
-        uint256 b;
-    }
-    function g(B calldata b) external pure returns(uint256) {
-        return b.b;
-    }
-    function f() public view returns(uint256, uint256) {
-        uint256[] memory arr = new uint256[](20);
-        arr[0] = 31; arr[2] = 84;
-        B memory b = B(A(420, arr), 11);
-        return (b.b, this.g(b));
-    }
-}
-// ----
-// f() -> 11, 11
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol
deleted file mode 100644
index 4c85fe767a96..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint256 a; }
-
-    function f(S calldata s) external returns (bytes memory) {
-        return abi.encode(s);
-    }
-
-    function g(S calldata s) external returns (bytes memory) {
-        return this.f(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f((uint256)): 3 -> 32, 32, 3
-// g((uint256)): 3 -> 32, 32, 3
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
deleted file mode 100644
index 745bebe72891..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S { uint[] a; }
-
-    function f(uint[][] calldata s, uint i, uint j) public pure returns (bytes memory) {
-        return abi.encode(s[i][j]);
-    }
-
-    function g(uint[][][] calldata s, uint i, uint j, uint k) public pure returns (bytes memory) {
-        return abi.encode(s[i][j][k]);
-    }
-
-    function h(uint[][][1] calldata s, uint i) public pure returns (bytes memory) {
-        return abi.encode(s[0][i]);
-    }
-
-    function k(S[][] calldata s, uint i, uint j) public pure returns (bytes memory) {
-        return abi.encode(s[i][j].a);
-    }
-
-    function l(S[2][2] calldata s, uint i, uint j) public pure returns (bytes memory) {
-        return abi.encode(s[i][j].a);
-    }
-}
-// ====
-// revertStrings: debug
-// ----
-// f(uint256[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0x80, 1, 7, 1, 8 -> 0x20, 0x20, 7
-// f(uint256[][],uint256,uint256): 0x60, 1, 0, 2, 0x40, 0x80, 1, 7, 1, 8 -> 0x20, 0x20, 8
-// g(uint256[][][],uint256,uint256,uint256): 0x80, 0, 0, 0, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> 0x20, 0x20, 4
-// g(uint256[][][],uint256,uint256,uint256): 0x80, 1, 0, 1, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> 0x20, 0x20, 6
-// g(uint256[][][],uint256,uint256,uint256): 0x80, 1, 0, 2, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[][][],uint256,uint256,uint256): 0x80, 2, 0, 1, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> FAILURE, hex"4e487b71", 0x32
-// h(uint256[][][1],uint256): 0x40, 1, 0x20, 2, 0x40, 0xA0, 2, 5, 6, 3, 7, 8, 9 -> 0x20, 0xa0, 0x20, 3, 7, 8, 9
-// h(uint256[][][1],uint256): 0x40, 2, 0x20, 2, 0x40, 0xA0, 2, 5, 6, 3, 7, 8, 9 -> FAILURE, hex"4e487b71", 0x32
-// k((uint256[])[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0xe0, 1, 0x20, 0x20, 1, 6, 2, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> 0x20, 0x60, 0x20, 1, 6
-// k((uint256[])[][],uint256,uint256): 0x60, 0, 1, 2, 0x40, 0xe0, 1, 0x20, 0x20, 1, 6, 2, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> FAILURE, hex"4e487b71", 0x32
-// l((uint256[])[2][2],uint256,uint256): 0x60, 1, 1, 0x40, 0x0140, 0x40, 0xa0, 0x20, 1, 5, 0x20, 1, 6, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> 0x20, 0x80, 0x20, 2, 8, 9
-// l((uint256[])[2][2],uint256,uint256): 0x60, 1, 2, 0x40, 0x0140, 0x40, 0xa0, 0x20, 1, 5, 0x20, 1, 6, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
deleted file mode 100644
index 58f68b8cc268..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint[] aTmp;
-    uint[2] bTmp;
-
-    function f_memory(uint[] calldata a) public returns (uint[] memory) {
-        return a;
-    }
-
-    function f_encode(uint[] calldata a) public returns (bytes memory) {
-        return abi.encode(a);
-    }
-
-    function f_storage(uint[] calldata a) public returns (bytes memory) {
-        aTmp = a;
-        return abi.encode(aTmp);
-    }
-
-    function f_index(uint[] calldata a, uint which) public returns (uint) {
-        return a[which];
-    }
-
-    function g_memory(uint[] calldata a, uint[2] calldata b) public returns (uint[] memory, uint[2] memory) {
-        return (a, b);
-    }
-
-    function g_encode(uint[] calldata a, uint[2] calldata b) public returns (bytes memory) {
-        return abi.encode(a, b);
-    }
-
-    function g_storage(uint[] calldata a, uint[2] calldata b) public returns (bytes memory) {
-        aTmp = a;
-        bTmp = b;
-        return abi.encode(aTmp, bTmp);
-    }
-
-    function g_index(uint[] calldata a, uint[2] calldata b, uint which) public returns (uint, uint) {
-        return (a[which], b[0]);
-    }
-}
-// ----
-// f_memory(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0
-// f_memory(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 1, 7
-// f_memory(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
-// f_encode(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0x40, 0x20, 0
-// f_encode(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 0x60, 0x20, 1, 7
-// f_encode(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
-// f_storage(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0x40, 0x20, 0
-// f_storage(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 0x60, 0x20, 1, 7
-// f_storage(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
-// f_index(uint256[],uint256): 0xa0, 0, 9, 9, 9, 2, 7, 8 -> 7
-// f_index(uint256[],uint256): 0xa0, 1, 9, 9, 9, 2, 7, 8 -> 8
-// f_index(uint256[],uint256): 0xa0, 2, 9, 9, 9, 2, 7, 8 -> FAILURE, hex"4e487b71", 0x32
-// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x60, 1, 2, 0
-// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x60, 1, 2, 1, 7
-// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
-// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x20, 0x80, 0x60, 1, 2, 0
-// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x20, 0xa0, 0x60, 1, 2, 1, 7
-// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
-// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x20, 0x80, 0x60, 1, 2, 0
-// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x20, 0xa0, 0x60, 1, 2, 1, 7
-// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
-// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 0, 9, 9, 9, 2, 7, 8 -> 7, 1
-// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7, 8 -> 8, 1
-// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
deleted file mode 100644
index 44a462d1319b..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function g(address x) external pure returns (uint256 r) {
-        assembly { r := x }
-    }
-    function f(uint256 a) external view returns (uint256) {
-        address x;
-        assembly { x := a }
-        return this.g(x);
-    }
-}
-// ----
-// f(uint256): 0 -> 0
-// g(address): 0 -> 0 # test validation as well as sanity check #
-// f(uint256): 1 -> 1
-// g(address): 1 -> 1
-// f(uint256): 2 -> 2
-// g(address): 2 -> 2
-// f(uint256): 0xabcdef0123456789abcdef0123456789abcdefff -> 0xabcdef0123456789abcdef0123456789abcdefff
-// g(address): 0xabcdef0123456789abcdef0123456789abcdefff -> 0xabcdef0123456789abcdef0123456789abcdefff
-// f(uint256): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// g(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// f(uint256): 0x010000000000000000000000000000000000000000 -> 0
-// g(address): 0x010000000000000000000000000000000000000000 -> FAILURE
-// f(uint256): 0x01abcdef0123456789abcdef0123456789abcdefff -> 0xabcdef0123456789abcdef0123456789abcdefff
-// g(address): 0x01abcdef0123456789abcdef0123456789abcdefff -> FAILURE
-// f(uint256): 0x01ffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// g(address): 0x01ffffffffffffffffffffffffffffffffffffffff -> FAILURE
-// f(uint256): -1 -> 0xffffffffffffffffffffffffffffffffffffffff
-// g(address): -1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
deleted file mode 100644
index 8e788ab85d7c..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function gggg(bool x) external pure returns (bool) {
-        return x;
-    }
-    function f(uint256 a) external view returns (bool) {
-        bool x = false;
-        assembly { x := a }
-        return this.gggg(x);
-    }
-}
-// ----
-// f(uint256): 0 -> false
-// gggg(bool): 0 -> false # test validation as well as sanity check #
-// f(uint256): 1 -> true
-// gggg(bool): 1 -> true
-// f(uint256): 2 -> true
-// gggg(bool): 2 -> FAILURE
-// f(uint256): 0x1000 -> true
-// gggg(bool): 0x1000 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
deleted file mode 100644
index 92cffdd8a977..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function gg1(bytes1 x) external pure returns (bytes32) {
-        return x;
-    }
-    function f1(bytes32 a) external view returns (bytes32) {
-        bytes1 x;
-        assembly { x := a }
-        return this.gg1(x);
-    }
-    function gg2(bytes2 x) external pure returns (bytes32) {
-        return x;
-    }
-    function f2(bytes32 a) external view returns (bytes32) {
-        bytes2 x;
-        assembly { x := a }
-        return this.gg2(x);
-    }
-    function gg4(bytes4 x) external pure returns (bytes32) {
-        return x;
-    }
-    function f4(bytes32 a) external view returns (bytes32) {
-        bytes4 x;
-        assembly { x := a }
-        return this.gg4(x);
-    }
-    function gg8(bytes8 x) external pure returns (bytes32) {
-        return x;
-    }
-    function f8(bytes32 a) external view returns (bytes32) {
-        bytes8 x;
-        assembly { x := a }
-        return this.gg8(x);
-    }
-    function g16(bytes16 x) external pure returns (bytes32) {
-        return x;
-    }
-    function f16(bytes32 a) external view returns (bytes32) {
-        bytes16 x;
-        assembly { x := a }
-        return this.g16(x);
-    }
-}
-// ----
-// f1(bytes32): left(0) -> left(0)
-// gg1(bytes1): left(0) -> left(0) # test validation as well as sanity check #
-// f1(bytes32): left(1) -> left(1)
-// gg1(bytes1): left(1) -> left(1)
-// f1(bytes32): left(0xFE) -> left(0xFE)
-// gg1(bytes1): left(0xFE) -> left(0xFE)
-// f1(bytes32): left(0xFF) -> left(0xFF)
-// gg1(bytes1): left(0xFF) -> left(0xFF)
-// f1(bytes32): left(0x0001) -> left(0x00)
-// gg1(bytes1): left(0x0001) -> FAILURE
-// f1(bytes32): left(0x0101) -> left(0x01)
-// gg1(bytes1): left(0x0101) -> FAILURE
-// f1(bytes32): -1 -> left(0xFF)
-// gg1(bytes1): -1 -> FAILURE
-// f2(bytes32): left(0) -> left(0)
-// gg2(bytes2): left(0) -> left(0)
-// f2(bytes32): left(1) -> left(1)
-// gg2(bytes2): left(1) -> left(1)
-// f2(bytes32): left(0xFFFE) -> left(0xFFFE)
-// gg2(bytes2): left(0xFFFE) -> left(0xFFFE)
-// f2(bytes32): left(0xFFFF) -> left(0xFFFF)
-// gg2(bytes2): left(0xFFFF) -> left(0xFFFF)
-// f2(bytes32): left(0x000001) -> left(0x00)
-// gg2(bytes2): left(0x000001) -> FAILURE
-// f2(bytes32): left(0x010001) -> left(0x01)
-// gg2(bytes2): left(0x010001) -> FAILURE
-// f2(bytes32): -1 -> left(0xFFFF)
-// gg2(bytes2): -1 -> FAILURE
-// f4(bytes32): left(0) -> left(0)
-// gg4(bytes4): left(0) -> left(0)
-// f4(bytes32): left(1) -> left(1)
-// gg4(bytes4): left(1) -> left(1)
-// f4(bytes32): left(0xFFFFFFFE) -> left(0xFFFFFFFE)
-// gg4(bytes4): left(0xFFFFFFFE) -> left(0xFFFFFFFE)
-// f4(bytes32): left(0xFFFFFFFF) -> left(0xFFFFFFFF)
-// gg4(bytes4): left(0xFFFFFFFF) -> left(0xFFFFFFFF)
-// f4(bytes32): left(0x0000000001) -> left(0x00)
-// gg4(bytes4): left(0x0000000001) -> FAILURE
-// f4(bytes32): left(0x0100000001) -> left(0x01)
-// gg4(bytes4): left(0x0100000001) -> FAILURE
-// f4(bytes32): -1 -> left(0xFFFFFFFF)
-// gg4(bytes4): -1 -> FAILURE
-// f8(bytes32): left(0) -> left(0)
-// gg8(bytes8): left(0) -> left(0)
-// f8(bytes32): left(1) -> left(1)
-// gg8(bytes8): left(1) -> left(1)
-// f8(bytes32): left(0xFFFFFFFFFFFFFFFE) -> left(0xFFFFFFFFFFFFFFFE)
-// gg8(bytes8): left(0xFFFFFFFFFFFFFFFE) -> left(0xFFFFFFFFFFFFFFFE)
-// f8(bytes32): left(0xFFFFFFFFFFFFFFFF) -> left(0xFFFFFFFFFFFFFFFF)
-// gg8(bytes8): left(0xFFFFFFFFFFFFFFFF) -> left(0xFFFFFFFFFFFFFFFF)
-// f8(bytes32): left(0x000000000000000001) -> left(0x00)
-// gg8(bytes8): left(0x000000000000000001) -> FAILURE
-// f8(bytes32): left(0x010000000000000001) -> left(0x01)
-// gg8(bytes8): left(0x010000000000000001) -> FAILURE
-// f8(bytes32): -1 -> left(0xFFFFFFFFFFFFFFFF)
-// gg8(bytes8): -1 -> FAILURE
-// f16(bytes32): left(0) -> left(0)
-// g16(bytes16): left(0) -> left(0)
-// f16(bytes32): left(1) -> left(1)
-// g16(bytes16): left(1) -> left(1)
-// f16(bytes32): left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE) -> left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE)
-// g16(bytes16): left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE) -> left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE)
-// f16(bytes32): left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) -> left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-// g16(bytes16): left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) -> left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-// f16(bytes32): left(0x0000000000000000000000000000000001) -> left(0x00)
-// g16(bytes16): left(0x0000000000000000000000000000000001) -> FAILURE
-// f16(bytes32): left(0x0100000000000000000000000000000001) -> left(0x01)
-// g16(bytes16): left(0x0100000000000000000000000000000001) -> FAILURE
-// f16(bytes32): -1 -> left(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-// g16(bytes16): -1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
deleted file mode 100644
index 4286f8f07d34..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint16 a, int16 b, address c, bytes3 d, bool e)
-            public pure returns (uint v, uint w, uint x, uint y, uint z) {
-        assembly { v := a  w := b x := c y := d z := e}
-    }
-}
-// ----
-// f(uint16,int16,address,bytes3,bool): 1, 2, 3, "a", true -> 1, 2, 3, "a", true
-// f(uint16,int16,address,bytes3,bool): 0xffffff, 0x1ffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "abcd", 1 -> FAILURE
-// f(uint16,int16,address,bytes3,bool): 0xffffff, 0, 0, "bcd", 1 -> FAILURE
-// f(uint16,int16,address,bytes3,bool): 0, 0x1ffff, 0, "ab", 1 -> FAILURE
-// f(uint16,int16,address,bytes3,bool): 0, 0, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "ad", 1 -> FAILURE
-// f(uint16,int16,address,bytes3,bool): 0, 0, 0, "abcd", 1 -> FAILURE
-// f(uint16,int16,address,bytes3,bool): 0, 0, 0, "abc", 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol
deleted file mode 100644
index 240ec623ff3e..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function ggg(uint8[] calldata s) external pure returns (bytes memory) {
-        s[0]; // only this will validate.
-        return msg.data;
-    }
-    function f(uint256[] calldata a) external returns (bytes memory) {
-        uint8[] memory m = new uint8[](a.length);
-        assembly {
-            calldatacopy(add(m, 0x20), 0x44, mul(calldataload(4), 0x20))
-        }
-        return this.ggg(m);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256[]): 0x20, 2, 1, 1 -> 0x20, 0x84, hex"304a4c23", 0x20, 2, 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
-// ggg(uint8[]): 0x20, 2, 1, 1 -> 0x20, 0x84, hex"304a4c23", 0x20, 2, 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
-// f(uint256[]): 0x20, 2, 0x0101, 0x0101 -> 0x20, 0x84, hex"304a4c23", 0x20, 2, 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
-// ggg(uint8[]): 0x20, 2, 0x0101, 0x0101 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
deleted file mode 100644
index 1ae459d29e7b..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { function() external f; }
-    function ggg(function() external x) external pure returns (uint256 r) {
-        assembly { r := calldataload(4) }
-    }
-    function h(S calldata x) external pure returns (uint256 r) {
-        x.f; // validation only happens here
-        assembly { r := calldataload(4) }
-    }
-    function dummy() external {}
-    function ffff(uint256 a) external view returns (uint256, uint256) {
-        S memory s = S(this.dummy);
-        assembly { mstore(s, a) }
-        return (this.ggg(s.f), this.h(s));
-    }
-}
-// ----
-// ffff(uint256): 0 -> 0, 0
-// ggg(function): 0 -> 0
-// ffff(uint256): "01234567890123456789abcd" -> "01234567890123456789abcd", "01234567890123456789abcd"
-// ggg(function): "01234567890123456789abcd" -> "01234567890123456789abcd"
-// h((function)): "01234567890123456789abcd" -> "01234567890123456789abcd"
-// h((function)): 0 -> 0
-// ffff(uint256): "01234567890123456789abcdX" -> "01234567890123456789abcd", "01234567890123456789abcd"
-// ggg(function): "01234567890123456789abcdX" -> FAILURE
-// h((function)): "01234567890123456789abcdX" -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
deleted file mode 100644
index 8e60d5c336d1..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
+++ /dev/null
@@ -1,155 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function ggg8(int8 x) external pure returns (int256) {
-        return x;
-    }
-    function gg16(int16 x) external pure returns (int256) {
-        return x;
-    }
-    function gg32(int32 x) external pure returns (int256) {
-        return x;
-    }
-    function gg64(int64 x) external pure returns (int256) {
-        return x;
-    }
-    function g128(int128 x) external pure returns (int256) {
-        return x;
-    }
-    function f8(int256 a) external view returns (int256) {
-        int8 x = 0;
-        assembly { x := a }
-        return this.ggg8(x);
-    }
-    function f16(int256 a) external view returns (int256) {
-        int16 x = 0;
-        assembly { x := a }
-        return this.gg16(x);
-    }
-    function f32(int256 a) external view returns (int256) {
-        int32 x = 0;
-        assembly { x := a }
-        return this.gg32(x);
-    }
-    function f64(int256 a) external view returns (int256) {
-        int64 x = 0;
-        assembly { x := a }
-        return this.gg64(x);
-    }
-    function f128(int256 a) external view returns (int256) {
-        int128 x = 0;
-        assembly { x := a }
-        return this.g128(x);
-    }
-}
-// ----
-// f8(int256): 0 -> 0
-// ggg8(int8): 0 -> 0 # test validation as well as sanity check #
-// f8(int256): 1 -> 1
-// ggg8(int8): 1 -> 1
-// f8(int256): -1 -> -1
-// ggg8(int8): -1 -> -1
-// f8(int256): 0x7F -> 0x7F
-// ggg8(int8): 0x7F -> 0x7F
-// f8(int256): 0x80 -> -128
-// ggg8(int8): 0x80 -> FAILURE
-// f8(int256): 0xFE -> -2
-// ggg8(int8): 0xFE -> FAILURE
-// f8(int256): 0xFF -> -1
-// ggg8(int8): 0xFF -> FAILURE
-// f8(int256): 0x0100 -> 0x00
-// ggg8(int8): 0x0100 -> FAILURE
-// f8(int256): 0x0101 -> 0x01
-// ggg8(int8): 0x0101 -> FAILURE
-// f8(int256): 0x01FF -> -1
-// ggg8(int8): 0x01FF -> FAILURE
-// f8(int256): 0x01FE -> -2
-// ggg8(int8): 0x01FE -> FAILURE
-// f16(int256): 0 -> 0
-// gg16(int16): 0 -> 0
-// f16(int256): 1 -> 1
-// gg16(int16): 1 -> 1
-// f16(int256): -1 -> -1
-// gg16(int16): -1 -> -1
-// f16(int256): 0x7FFF -> 0x7FFF
-// gg16(int16): 0x7FFF -> 0x7FFF
-// f16(int256): 0x8000 -> -32768
-// gg16(int16): 0x8000 -> FAILURE
-// f16(int256): 0xFFFE -> -2
-// gg16(int16): 0xFFFE -> FAILURE
-// f16(int256): 0xFFFF -> -1
-// gg16(int16): 0xFFFF -> FAILURE
-// f16(int256): 0x010000 -> 0x00
-// gg16(int16): 0x010000 -> FAILURE
-// f16(int256): 0x010001 -> 0x01
-// gg16(int16): 0x010001 -> FAILURE
-// f16(int256): 0x01FFFF -> -1
-// gg16(int16): 0x01FFFF -> FAILURE
-// f16(int256): 0x01FFFE -> -2
-// gg16(int16): 0x01FFFE -> FAILURE
-// f32(int256): 0 -> 0
-// gg32(int32): 0 -> 0
-// f32(int256): 1 -> 1
-// gg32(int32): 1 -> 1
-// f32(int256): -1 -> -1
-// gg32(int32): -1 -> -1
-// f32(int256): 0x7FFFFFFF -> 0x7FFFFFFF
-// gg32(int32): 0x7FFFFFFF -> 0x7FFFFFFF
-// f32(int256): 0x80000000 -> -2147483648
-// gg32(int32): 0x80000000 -> FAILURE
-// f32(int256): 0xFFFFFFFE -> -2
-// gg32(int32): 0xFFFFFFFE -> FAILURE
-// f32(int256): 0xFFFFFFFF -> -1
-// gg32(int32): 0xFFFFFFFF -> FAILURE
-// f32(int256): 0x0100000000 -> 0x00
-// gg32(int32): 0x0100000000 -> FAILURE
-// f32(int256): 0x0100000001 -> 0x01
-// gg32(int32): 0x0100000001 -> FAILURE
-// f32(int256): 0x01FFFFFFFF -> -1
-// gg32(int32): 0x01FFFFFFFF -> FAILURE
-// f32(int256): 0x01FFFFFFFE -> -2
-// gg32(int32): 0x01FFFFFFFE -> FAILURE
-// f64(int256): 0 -> 0
-// gg64(int64): 0 -> 0
-// f64(int256): 1 -> 1
-// gg64(int64): 1 -> 1
-// f64(int256): -1 -> -1
-// gg64(int64): -1 -> -1
-// f64(int256): 0x7FFFFFFFFFFFFFFF -> 0x7FFFFFFFFFFFFFFF
-// gg64(int64): 0x7FFFFFFFFFFFFFFF -> 0x7FFFFFFFFFFFFFFF
-// f64(int256): 0x8000000000000000 -> -9223372036854775808
-// gg64(int64): 0x8000000000000000 -> FAILURE
-// f64(int256): 0xFFFFFFFFFFFFFFFE -> -2
-// gg64(int64): 0xFFFFFFFFFFFFFFFE -> FAILURE
-// f64(int256): 0xFFFFFFFFFFFFFFFF -> -1
-// gg64(int64): 0xFFFFFFFFFFFFFFFF -> FAILURE
-// f64(int256): 0x010000000000000000 -> 0x00
-// gg64(int64): 0x010000000000000000 -> FAILURE
-// f64(int256): 0x010000000000000001 -> 0x01
-// gg64(int64): 0x010000000000000001 -> FAILURE
-// f64(int256): 0x01FFFFFFFFFFFFFFFF -> -1
-// gg64(int64): 0x01FFFFFFFFFFFFFFFF -> FAILURE
-// f64(int256): 0x01FFFFFFFFFFFFFFFE -> -2
-// gg64(int64): 0x01FFFFFFFFFFFFFFFE -> FAILURE
-// f128(int256): 0 -> 0
-// g128(int128): 0 -> 0
-// f128(int256): 1 -> 1
-// g128(int128): 1 -> 1
-// f128(int256): -1 -> -1
-// g128(int128): -1 -> -1
-// f128(int256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// g128(int128): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// f128(int256): 0x80000000000000000000000000000000 -> -170141183460469231731687303715884105728
-// g128(int128): 0x80000000000000000000000000000000 -> FAILURE
-// f128(int256): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE -> -2
-// g128(int128): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE -> FAILURE
-// f128(int256): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> -1
-// g128(int128): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE
-// f128(int256): 0x0100000000000000000000000000000000 -> 0x00
-// g128(int128): 0x0100000000000000000000000000000000 -> FAILURE
-// f128(int256): 0x0100000000000000000000000000000001 -> 0x01
-// g128(int128): 0x0100000000000000000000000000000001 -> FAILURE
-// f128(int256): 0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> -1
-// g128(int128): 0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE
-// f128(int256): 0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE -> -2
-// g128(int128): 0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol
deleted file mode 100644
index 1cf129529ae2..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    function f(string calldata x) external returns (bytes memory r) {
-        uint mptr;
-        assembly {
-            // dirty memory
-            mptr := mload(0x40)
-            for { let i := mptr } lt(i, add(mptr, 0x0100)) { i := add(i, 32) }
-            {
-                mstore(i, sub(0, 1))
-            }
-        }
-        r = abi.encode(x);
-        assembly {
-            // assert that we dirtied the memory that was encoded to
-            if iszero(eq(mptr, r)) {
-                revert(0, 0)
-            }
-        }
-    }
-    function test() external returns (bytes memory) {
-        return this.f("abc");
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// test() -> 0x20, 0x60, 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol
deleted file mode 100644
index 2a019f5e78d1..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint8 a; bytes1 b; }
-    function gg(S calldata s) external pure returns (bytes memory) {
-        s.a; s.b; // only this will validate.
-        return msg.data;
-    }
-    function f(uint256 a, bytes32 b) public returns (bytes memory) {
-        S memory s = S(2,0x02);
-        assembly {
-            mstore(s, a)
-            mstore(add(s, 0x20), b)
-        }
-        return this.gg(s);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256,bytes32): 1, left(0x01) -> 0x20, 0x44, hex"b63240b0", 1, left(0x01), hex"00000000000000000000000000000000000000000000000000000000"
-// gg((uint8,bytes1)): 1, left(0x01) -> 0x20, 0x44, hex"b63240b0", 1, left(0x01), hex"00000000000000000000000000000000000000000000000000000000"
-// f(uint256,bytes32): 0x0101, left(0x0101) -> 0x20, 0x44, hex"b63240b0", 1, left(0x01), hex"00000000000000000000000000000000000000000000000000000000"
-// gg((uint8,bytes1)): 0x0101, left(0x0101) -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol
deleted file mode 100644
index ce8cbfad54c7..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function gggggggg(uint8[2] calldata s) external pure returns (bytes memory) {
-        s[0]; // only this will validate.
-        return msg.data;
-    }
-    function f(uint256 a, uint256 b) public returns (bytes memory) {
-        uint8[2] memory m = [0,0];
-        assembly {
-            mstore(m, a)
-            mstore(add(m, 0x20), b)
-        }
-        return this.gggggggg(m);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256,uint256): 1, 1 -> 0x20, 0x44, hex"78b86ac6", 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
-// gggggggg(uint8[2]): 1, 1 -> 0x20, 0x44, hex"78b86ac6", 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
-// f(uint256,uint256): 0x0101, 0x0101 -> 0x20, 0x44, hex"78b86ac6", 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
-// gggggggg(uint8[2]): 0x0101, 0x0101 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
deleted file mode 100644
index 9a33edda2908..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function ggg8(uint8 x) external pure returns (uint256) {
-        return x;
-    }
-    function gg16(uint16 x) external pure returns (uint256) {
-        return x;
-    }
-    function gg32(uint32 x) external pure returns (uint256) {
-        return x;
-    }
-    function gg64(uint64 x) external pure returns (uint256) {
-        return x;
-    }
-    function g128(uint128 x) external pure returns (uint256) {
-        return x;
-    }
-    function f8(uint256 a) external view returns (uint256) {
-        uint8 x = 0;
-        assembly { x := a }
-        return this.ggg8(x);
-    }
-    function f16(uint256 a) external view returns (uint256) {
-        uint16 x = 0;
-        assembly { x := a }
-        return this.gg16(x);
-    }
-    function f32(uint256 a) external view returns (uint256) {
-        uint32 x = 0;
-        assembly { x := a }
-        return this.gg32(x);
-    }
-    function f64(uint256 a) external view returns (uint256) {
-        uint64 x = 0;
-        assembly { x := a }
-        return this.gg64(x);
-    }
-    function f128(uint256 a) external view returns (uint256) {
-        uint128 x = 0;
-        assembly { x := a }
-        return this.g128(x);
-    }
-}
-// ----
-// f8(uint256): 0 -> 0
-// ggg8(uint8): 0 -> 0 # test validation as well as sanity check #
-// f8(uint256): 1 -> 1
-// ggg8(uint8): 1 -> 1
-// f8(uint256): 0xFE -> 0xFE
-// ggg8(uint8): 0xFE -> 0xFE
-// f8(uint256): 0xFF -> 0xFF
-// ggg8(uint8): 0xFF -> 0xFF
-// f8(uint256): 0x0100 -> 0x00
-// ggg8(uint8): 0x0100 -> FAILURE
-// f8(uint256): 0x0101 -> 0x01
-// ggg8(uint8): 0x0101 -> FAILURE
-// f8(uint256): -1 -> 0xFF
-// ggg8(uint8): -1 -> FAILURE
-// f16(uint256): 0 -> 0
-// gg16(uint16): 0 -> 0
-// f16(uint256): 1 -> 1
-// gg16(uint16): 1 -> 1
-// f16(uint256): 0xFFFE -> 0xFFFE
-// gg16(uint16): 0xFFFE -> 0xFFFE
-// f16(uint256): 0xFFFF -> 0xFFFF
-// gg16(uint16): 0xFFFF -> 0xFFFF
-// f16(uint256): 0x010000 -> 0x0000
-// gg16(uint16): 0x010000 -> FAILURE
-// f16(uint256): 0x010001 -> 0x0001
-// gg16(uint16): 0x010001 -> FAILURE
-// f16(uint256): -1 -> 0xFFFF
-// gg16(uint16): -1 -> FAILURE
-// f32(uint256): 0 -> 0
-// gg32(uint32): 0 -> 0
-// f32(uint256): 1 -> 1
-// gg32(uint32): 1 -> 1
-// f32(uint256): 0xFFFFFFFE -> 0xFFFFFFFE
-// gg32(uint32): 0xFFFFFFFE -> 0xFFFFFFFE
-// f32(uint256): 0xFFFFFFFF -> 0xFFFFFFFF
-// gg32(uint32): 0xFFFFFFFF -> 0xFFFFFFFF
-// f32(uint256): 0x0100000000 -> 0x00000000
-// gg32(uint32): 0x0100000000 -> FAILURE
-// f32(uint256): 0x0100000001 -> 0x00000001
-// gg32(uint32): 0x0100000001 -> FAILURE
-// f32(uint256): -1 -> 0xFFFFFFFF
-// gg32(uint32): -1 -> FAILURE
-// f64(uint256): 0 -> 0
-// gg64(uint64): 0 -> 0
-// f64(uint256): 1 -> 1
-// gg64(uint64): 1 -> 1
-// f64(uint256): 0xFFFFFFFFFFFFFFFE -> 0xFFFFFFFFFFFFFFFE
-// gg64(uint64): 0xFFFFFFFFFFFFFFFE -> 0xFFFFFFFFFFFFFFFE
-// f64(uint256): 0xFFFFFFFFFFFFFFFF -> 0xFFFFFFFFFFFFFFFF
-// gg64(uint64): 0xFFFFFFFFFFFFFFFF -> 0xFFFFFFFFFFFFFFFF
-// f64(uint256): 0x010000000000000000 -> 0x0000000000000000
-// gg64(uint64): 0x010000000000000000 -> FAILURE
-// f64(uint256): 0x010000000000000001 -> 0x0000000000000001
-// gg64(uint64): 0x010000000000000001 -> FAILURE
-// f64(uint256): -1 -> 0xFFFFFFFFFFFFFFFF
-// gg64(uint64): -1 -> FAILURE
-// f128(uint256): 0 -> 0
-// g128(uint128): 0 -> 0
-// f128(uint256): 1 -> 1
-// g128(uint128): 1 -> 1
-// f128(uint256): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// g128(uint128): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// f128(uint256): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// g128(uint128): 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// f128(uint256): 0x0100000000000000000000000000000000 -> 0x00000000000000000000000000000000
-// g128(uint128): 0x0100000000000000000000000000000000 -> FAILURE
-// f128(uint256): 0x0100000000000000000000000000000001 -> 0x00000000000000000000000000000001
-// g128(uint128): 0x0100000000000000000000000000000001 -> FAILURE
-// f128(uint256): -1 -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// g128(uint128): -1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
deleted file mode 100644
index e8b64a10826c..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(uint a, uint16[] memory b, uint c)
-            public pure returns (uint, uint, uint) {
-        return (b.length, b[a], c);
-    }
-}
-// ----
-// f(uint256,uint16[],uint256): 6, 0x60, 9, 7, 11, 12, 13, 14, 15, 16, 17 -> 7, 17, 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
deleted file mode 100644
index e9816ef14c29..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function f(uint a, uint16[][] memory b, uint[2][][3] memory c, uint d)
-			public pure returns (uint, uint, uint, uint, uint, uint, uint) {
-		return (a, b.length, b[1].length, b[1][1], c[1].length, c[1][1][1], d);
-	}
-	function test() public view returns (uint, uint, uint, uint, uint, uint, uint) {
-		uint16[][] memory b = new uint16[][](3);
-		b[0] = new uint16[](2);
-		b[0][0] = 0x55;
-		b[0][1] = 0x56;
-		b[1] = new uint16[](4);
-		b[1][0] = 0x65;
-		b[1][1] = 0x66;
-		b[1][2] = 0x67;
-		b[1][3] = 0x68;
-
-		uint[2][][3] memory c;
-		c[0] = new uint[2][](1);
-		c[0][0][1] = 0x75;
-		c[1] = new uint[2][](5);
-		c[1][1][1] = 0x85;
-
-		return this.f(12, b, c, 13);
-	}
-}
-// ----
-// test() -> 12, 3, 4, 0x66, 5, 0x85, 13
-// f(uint256,uint16[][],uint256[2][][3],uint256): 12, 0x80, 0x220, 13, 3, 0x60, 0xC0, 0x160, 2, 85, 86, 4, 101, 102, 103, 104, 0, 0x60, 0xC0, 0x220, 1, 0, 117, 5, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0 -> 12, 3, 4, 0x66, 5, 0x85, 13
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/enums.sol b/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
deleted file mode 100644
index 1e323472897f..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    enum E { A, B }
-    function f(E e) public pure returns (uint x) {
-        assembly { x := e }
-    }
-}
-// ----
-// f(uint8): 0 -> 0
-// f(uint8): 1 -> 1
-// f(uint8): 2 -> FAILURE
-// f(uint8): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
deleted file mode 100644
index 3fe54eff57e5..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint256[] memory a, bytes calldata b) public returns (bytes memory) {
-        return abi.encode(a, b);
-    }
-
-    function g(uint256[] memory a, bytes calldata b) external returns (bytes memory) {
-        return f(a, b);
-    }
-}
-// ----
-// f(uint256[],bytes): 0x40, 0x80, 1, 0xFF, 6, "123456" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xff, 6, "123456"
-// g(uint256[],bytes): 0x40, 0x80, 1, 0xffff, 8, "12345678" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xffff, 8, "12345678"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
deleted file mode 100644
index a734103f10d2..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(uint256[] memory a, uint256[1] calldata b) public returns (bytes memory) {
-        return abi.encode(a, b);
-    }
-
-    function g(uint256[] memory a, uint256[1] calldata b) external returns (bytes memory) {
-        return f(a, b);
-    }
-
-    function h(uint256[] memory a, uint256[1] calldata b) external returns (uint256[] memory, uint256[1] calldata) {
-        return (a, b);
-    }
-}
-// ----
-// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x20, 0x80, 0x40, 0xff, 1, 0xffff
-// g(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x20, 0x80, 0x40, 0xff, 1, 0xffff
-// h(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x40, 0xff, 1, 0xffff
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
deleted file mode 100644
index f8beb57030a5..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function f(bytes memory a, bytes calldata b, uint[] memory c)
-        external
-        pure
-        returns (uint, bytes1, uint, bytes1, uint, uint)
-    {
-        return (a.length, a[1], b.length, b[2], c.length, c[3]);
-    }
-    function g() public returns (uint, bytes1, uint, bytes1, uint, uint) {
-        uint[] memory x = new uint[](4);
-        x[3] = 7;
-        return this.f("abc", "def", x);
-    }
-}
-// ----
-// g() -> 3, 0x6200000000000000000000000000000000000000000000000000000000000000, 3, 0x6600000000000000000000000000000000000000000000000000000000000000, 4, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
deleted file mode 100644
index 33075675358e..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma abicoder               v2;
-
-// tests encoding from storage arrays
-
-contract C {
-    uint256[2][] tmp_h;
-    function h(uint256[2][] calldata s) external returns (bytes memory) {
-        tmp_h = s;
-        return abi.encode(tmp_h);
-    }
-    uint256[2][2] tmp_i;
-    function i(uint256[2][2] calldata s) external returns (bytes memory) {
-        tmp_i = s;
-        return abi.encode(tmp_i);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180720
-// gas legacy: 184830
-// gas legacyOptimized: 181493
-// i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112425
-// gas legacy: 115398
-// gas legacyOptimized: 112982
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
deleted file mode 100644
index 5c13d79169df..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { C c; uint[] x; }
-    function f(uint a, S[2] memory s1, uint b) public returns (uint r1, C r2, uint r3) {
-        r1 = a;
-        r2 = s1[0].c;
-        r3 = b;
-    }
-}
-// ----
-// f(uint256,(address,uint256[])[2],uint256): 7, 0x60, 8, 0x40, 0xE0, 0x0, 0x40, 2, 0x11, 0x12, 0x99, 0x40, 4, 0x31, 0x32, 0x34, 0x35 -> 7, 0x0, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
deleted file mode 100644
index c5ab31dc314b..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { C c; }
-    function f(uint a, S[2] memory s1, uint b) public returns (uint r1, C r2, uint r3) {
-        r1 = a;
-        r2 = s1[0].c;
-        r3 = b;
-    }
-}
-// ----
-// f(uint256,(address)[2],uint256): 7, 0, 0, 8 -> 7, 0, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
deleted file mode 100644
index 3217a1734226..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { function () external returns (uint) f; uint b; }
-    function f(S memory s) public returns (uint, uint) {
-        return (s.f(), s.b);
-    }
-    function test() public returns (uint, uint) {
-        return this.f(S(this.g, 3));
-    }
-    function g() public returns (uint) { return 7; }
-}
-// ----
-// test() -> 7, 3
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
deleted file mode 100644
index ce6550d31a34..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { int a; uint b; bytes16 c; }
-    function f(S memory s) public pure returns (S memory q) {
-        q = s;
-    }
-}
-// ----
-// f((int256,uint256,bytes16)): 0xff010, 0xff0002, "abcd" -> 0xff010, 0xff0002, "abcd"
-// f((int256,uint256,bytes16)): 0xff010, 0xff0002, 0x1111222233334444555566667777888800000000000000000000000000000000 -> 0xff010, 0xff0002, left(0x11112222333344445555666677778888)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
deleted file mode 100644
index cf631b8aec79..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint a; uint8 b; uint8 c; bytes2 d; }
-    function f(S memory s) public pure returns (uint a, uint b, uint c, uint d) {
-        a = s.a;
-        b = s.b;
-        c = s.c;
-        d = uint16(s.d);
-    }
-}
-// ----
-// f((uint256,uint8,uint8,bytes2)): 1, 2, 3, "ab" -> 1, 2, 3, 0x6162
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
deleted file mode 100644
index 57e218f7d561..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S { int16 a; uint8 b; bytes2 c; }
-	function f(S memory s) public pure returns (uint a, uint b, uint c) {
-		assembly {
-			a := mload(s)
-			b := mload(add(s, 0x20))
-			c := mload(add(s, 0x40))
-		}
-	}
-}
-// ----
-// f((int16,uint8,bytes2)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab" -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab"
-// f((int16,uint8,bytes2)): 0xff010, 0xff, "ab" -> FAILURE
-// f((int16,uint8,bytes2)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff0002, "ab" -> FAILURE
-// f((int16,uint8,bytes2)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "abcd" -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
deleted file mode 100644
index 8a22b037f6de..000000000000
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { function () external x; }
-    function f(S memory) public pure returns (uint r) { r = 1; }
-    function g(S calldata) external pure returns (uint r) { r = 2; }
-    function h(S calldata s) external pure returns (uint r) { s.x; r = 3; }
-}
-// ----
-// f((function)): "01234567890123456789abcd" -> 1
-// f((function)): "01234567890123456789abcdX" -> FAILURE
-// g((function)): "01234567890123456789abcd" -> 2
-// g((function)): "01234567890123456789abcdX" -> 2
-// h((function)): "01234567890123456789abcd" -> 3
-// h((function)): "01234567890123456789abcdX" -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
deleted file mode 100644
index 6b6e55e02241..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(bytes calldata data)
-        external
-        pure
-        returns (uint256, bytes memory r)
-    {
-        return abi.decode(data, (uint256, bytes));
-    }
-}
-// ----
-// f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
deleted file mode 100644
index 9ae6602f310f..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes memory data) public pure returns (uint256, bytes memory) {
-        return abi.decode(data, (uint256, bytes));
-    }
-}
-// ----
-// f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
deleted file mode 100644
index c06d2b24c457..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    bytes data;
-
-    function f(bytes memory _data) public returns (uint256, bytes memory) {
-        data = _data;
-        return abi.decode(data, (uint256, bytes));
-    }
-}
-// ----
-// f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135661
-// gas legacy: 137278
-// gas legacyOptimized: 136048
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
deleted file mode 100644
index 1edede787853..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-pragma abicoder v2;
-contract C {
-	type UnsignedNumber is uint256;
-	enum Enum { First, Second, Third }
-
-	struct Struct {
-		UnsignedNumber[] dynamicArray;
-		uint256 justAnInt;
-		string name;
-		bytes someBytes;
-		Enum theEnum;
-	}
-
-	function callMeMaybe(Struct calldata _data, int256 _intVal, string memory _nameVal) external pure {
-		assert(_data.dynamicArray.length == 3);
-		assert(UnsignedNumber.unwrap(_data.dynamicArray[0]) == 0);
-		assert(UnsignedNumber.unwrap(_data.dynamicArray[1]) == 1);
-		assert(UnsignedNumber.unwrap(_data.dynamicArray[2]) == 2);
-		assert(_data.justAnInt == 6);
-		assert(keccak256(bytes(_data.name)) == keccak256("StructName"));
-		assert(keccak256(_data.someBytes) == keccak256(bytes("1234")));
-		assert(_data.theEnum == Enum.Second);
-		assert(_intVal == 5);
-		assert(keccak256(bytes(_nameVal)) == keccak256("TestName"));
-	}
-
-	function callExternal() public returns (bool) {
-		Struct memory structToSend;
-		structToSend.dynamicArray = new UnsignedNumber[](3);
-		structToSend.dynamicArray[0] = UnsignedNumber.wrap(0);
-		structToSend.dynamicArray[1] = UnsignedNumber.wrap(1);
-		structToSend.dynamicArray[2] = UnsignedNumber.wrap(2);
-		structToSend.justAnInt = 6;
-		structToSend.name = "StructName";
-		structToSend.someBytes = bytes("1234");
-		structToSend.theEnum = Enum.Second;
-
-		(bool success,) = address(this).call(abi.encodeCall(this.callMeMaybe, (
-			structToSend,
-			5,
-			"TestName"
-		)));
-
-		return success;
-	}
-}
-// ----
-// callExternal() -> true
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
deleted file mode 100644
index 752298fbb059..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-pragma abicoder v2;
-
-contract X {
-    // no "returns" on purpose
-    function a(uint) public pure {}
-    function b(uint) external pure {}
-}
-
-contract Base {
-    function a(uint x) external pure returns (uint) { return x + 1; }
-}
-
-contract C is Base {
-	function test() public view returns (uint r) {
-        bool success;
-        bytes memory result;
-        (success, result) = address(this).staticcall(abi.encodeCall(X.a, 1));
-        require(success && result.length == 32);
-        r += abi.decode(result, (uint));
-        require(r == 2);
-
-        (success, result) = address(this).staticcall(abi.encodeCall(X.b, 10));
-        require(success && result.length == 32);
-        r += abi.decode(result, (uint));
-        require(r == 13);
-
-        (success, result) = address(this).staticcall(abi.encodeCall(Base.a, 100));
-        require(success && result.length == 32);
-        r += abi.decode(result, (uint));
-        require(r == 114);
-
-        (success, result) = address(this).staticcall(abi.encodeCall(this.a, 1000));
-        require(success && result.length == 32);
-        r += abi.decode(result, (uint));
-        require(r == 1115);
-
-        (success, result) = address(this).staticcall(abi.encodeCall(C.b, 10000));
-        require(success && result.length == 32);
-        r += abi.decode(result, (uint));
-        require(r == 11116);
-
-        return r;
-	}
-    function b(uint x) external view returns (uint) {
-        return this.a(x);
-    }
-
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// test() -> 11116
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
deleted file mode 100644
index c54d6083cb96..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
+++ /dev/null
@@ -1,61 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	bool sideEffectRan = false;
-
-	function(uint256, string memory) external fPointer;
-	function fExternal(uint256 p, string memory t) external {}
-	string xstor;
-	function getExternalFunctionPointer() public returns (function(uint256, string memory) external) {
-		sideEffectRan = true;
-		return this.fExternal;
-	}
-
-	function fSignatureFromLiteral() public pure returns (bytes memory) {
-		return abi.encodeWithSignature("fExternal(uint256,string)", 1, "123");
-	}
-	function fSignatureFromLiteralCall() public view returns (bytes memory) {
-		return abi.encodeCall(this.fExternal, (1, "123"));
-	}
-	function fSignatureFromMemory() public pure returns (bytes memory) {
-		string memory x = "fExternal(uint256,string)";
-		return abi.encodeWithSignature(x, 1, "123");
-	}
-	function fSignatureFromMemoryCall() public view returns (bytes memory) {
-		return abi.encodeCall(this.fExternal, (1,"123"));
-	}
-	function fSignatureFromMemorys() public returns (bytes memory) {
-		xstor = "fExternal(uint256,string)";
-		return abi.encodeWithSignature(xstor, 1, "123");
-	}
-	function fPointerCall() public returns(bytes memory) {
-		fPointer = this.fExternal;
-		return abi.encodeCall(fPointer, (1, "123"));
-	}
-	function fLocalPointerCall() public returns(bytes memory) {
-		function(uint256, string memory) external localFunctionPointer = this.fExternal;
-		return abi.encodeCall(localFunctionPointer, (1, "123"));
-	}
-	function fReturnedFunctionPointer() public returns (bytes memory) {
-		return abi.encodeCall(getExternalFunctionPointer(), (1, "123"));
-	}
-
-	function assertConsistentSelectors() public {
-		assert(keccak256(fSignatureFromLiteral()) == keccak256(fSignatureFromLiteralCall()));
-		assert(keccak256(fSignatureFromMemory()) == keccak256(fSignatureFromMemoryCall()));
-		assert(keccak256(fSignatureFromMemoryCall()) == keccak256(fSignatureFromMemorys()));
-		assert(keccak256(fPointerCall()) == keccak256(fSignatureFromLiteral()));
-		assert(keccak256(fLocalPointerCall()) == keccak256(fSignatureFromLiteral()));
-		assert(keccak256(fReturnedFunctionPointer()) == keccak256(fSignatureFromLiteral()));
-	}
-}
-// ----
-// assertConsistentSelectors() ->
-// fSignatureFromLiteral() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fSignatureFromLiteralCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fSignatureFromMemory() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fSignatureFromMemoryCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fSignatureFromMemorys() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fPointerCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fLocalPointerCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
-// fReturnedFunctionPointer() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
deleted file mode 100644
index 5f67174cfcb4..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder v2;
-
-contract D {
-	function something() external pure {}
-}
-
-contract C {
-	function something() external pure {}
-	function test() external returns (bytes4) {
-		function() external[2] memory x;
-		x[0] = this.something;
-		x[1] = (new D()).something;
-		function() external f = x[1];
-		bytes memory a = abi.encodeCall(x[0], ());
-		bytes memory b = abi.encodeCall(x[1], ());
-		bytes memory c = abi.encodeCall(f, ());
-		assert(a.length == 4 && b.length == 4 && c.length == 4);
-		assert(bytes4(a) == bytes4(b));
-		assert(bytes4(a) == bytes4(c));
-		assert(bytes4(a) == f.selector);
-		return bytes4(a);
-	}
-}
-// ----
-// test() -> 0xa7a0d53700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
deleted file mode 100644
index 0ce29f406a55..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	bool sideEffectRan = false;
-
-	function fNoArgs() external {}
-	function fArray(uint[] memory x) external {}
-	function fUint(uint x, uint y) external returns (uint a, uint b) {}
-
-	function fSignatureFromLiteralNoArgs() public pure returns (bytes memory) {
-		return abi.encodeWithSignature("fNoArgs()");
-	}
-	function fPointerNoArgs() public view returns (bytes memory) {
-		return abi.encodeCall(this.fNoArgs, ());
-	}
-
-	function fSignatureFromLiteralArray() public pure returns (bytes memory) {
-		uint[] memory x;
-		return abi.encodeWithSignature("fArray(uint256[])", x);
-	}
-	function fPointerArray() public view returns (bytes memory) {
-		uint[] memory x;
-		return abi.encodeCall(this.fArray, x);
-	}
-
-	function fSignatureFromLiteralUint() public pure returns (bytes memory) {
-		return abi.encodeWithSignature("fUint(uint256,uint256)", 12, 13);
-	}
-	function fPointerUint() public view returns (bytes memory) {
-		return abi.encodeCall(this.fUint, (12,13));
-	}
-
-	function assertConsistentSelectors() public view {
-		assert(keccak256(fSignatureFromLiteralNoArgs()) == keccak256(fPointerNoArgs()));
-		assert(keccak256(fSignatureFromLiteralArray()) == keccak256(fPointerArray()));
-		assert(keccak256(fSignatureFromLiteralUint()) == keccak256(fPointerUint()));
-	}
-}
-// ----
-// assertConsistentSelectors() ->
-// fSignatureFromLiteralNoArgs() -> 0x20, 0x04, 12200448252684243758085936796735499259670113115893304444050964496075123064832
-// fPointerNoArgs() -> 0x20, 4, 12200448252684243758085936796735499259670113115893304444050964496075123064832
-// fSignatureFromLiteralArray() -> 0x20, 0x44, 4612216551196396486909126966576324289294165774260092952932219511233230929920, 862718293348820473429344482784628181556388621521298319395315527974912, 0
-// fPointerArray() -> 0x20, 0x44, 4612216551196396486909126966576324289294165774260092952932219511233230929920, 862718293348820473429344482784628181556388621521298319395315527974912, 0
-// fPointerUint() -> 0x20, 0x44, 30372892641494467502622535050667754357470287521126424526399600764424271429632, 323519360005807677536004181044235568083645733070486869773243322990592, 350479306672958317330671196131255198757282877493027442254346933239808
-// fSignatureFromLiteralUint() -> 0x20, 0x44, 30372892641494467502622535050667754357470287521126424526399600764424271429632, 323519360005807677536004181044235568083645733070486869773243322990592, 350479306672958317330671196131255198757282877493027442254346933239808
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
deleted file mode 100644
index ec1ea14b5918..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function removeSignature(bytes calldata x) external pure returns (bytes memory) {
-		return x[4:];
-	}
-	function g(bytes2, bytes2, bytes2) public {}
-	function h(uint16, uint16) public {}
-	function f() public returns (bytes memory) {
-		uint16 x = 0x1234;
-		return this.removeSignature(abi.encodeCall(this.g, (0x1234, "ab", bytes2(x))));
-	}
-	function f2() public returns (bytes memory) {
-		bytes2 x = 0x1234;
-		return this.removeSignature(abi.encodeCall(this.h, (0x1234, uint16(x))));
-	}
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f() -> 0x20, 0x60, 0x1234000000000000000000000000000000000000000000000000000000000000, 0x6162000000000000000000000000000000000000000000000000000000000000, 0x1234000000000000000000000000000000000000000000000000000000000000
-// f2() -> 0x20, 0x40, 0x1234, 0x1234
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol
deleted file mode 100644
index 9f7216e6bcb4..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder v1;
-// Tests that this will not end up using a "bytes0" type
-// (which would assert)
-contract C {
-    function f() public pure returns (bytes memory, bytes memory) {
-        return (abi.encode(""), abi.encodePacked(""));
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
deleted file mode 100644
index f72de4379bad..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function f0() public pure returns (bytes memory) {
-		return abi.encodeWithSelector(0x12345678);
-	}
-	function f1() public pure returns (bytes memory) {
-		return abi.encodeWithSelector(0x12345678, "abc");
-	}
-	function f2() public pure returns (bytes memory) {
-		bytes4 x = 0x12345678;
-		return abi.encodeWithSelector(x, "abc");
-	}
-	function f3() public pure returns (bytes memory) {
-		bytes4 x = 0x12345678;
-		return abi.encodeWithSelector(x, type(uint).max);
-	}
-}
-// ----
-// f0() -> 0x20, 4, 8234104107246695022420661102507966550300666591269321702959126607540084801536
-// f1() -> 0x20, 0x64, 8234104107246695022420661102507966550300666591269321702959126607540084801536, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f2() -> 0x20, 0x64, 8234104107246695022420661102507966550300666591269321702959126607540084801536, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f3() -> 0x20, 0x24, 0x12345678ffffffffffffffffffffffffffffffffffffffffffffffffffffffff, -26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
deleted file mode 100644
index b23e2dd27e85..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-pragma abicoder v2;
-contract C {
-	function f0() public pure returns (bytes memory) {
-		return abi.encodeWithSelector(0x12345678);
-	}
-	function f1() public pure returns (bytes memory) {
-		return abi.encodeWithSelector(0x12345678, "abc");
-	}
-	function f2() public pure returns (bytes memory) {
-		bytes4 x = 0x12345678;
-		return abi.encodeWithSelector(x, "abc");
-	}
-	function f3() public pure returns (bytes memory) {
-		bytes4 x = 0x12345678;
-		return abi.encodeWithSelector(x, type(uint).max);
-	}
-	struct S { uint a; string b; uint16 c; }
-	function f4() public pure returns (bytes memory) {
-		bytes4 x = 0x12345678;
-		S memory s;
-		s.a = 0x1234567;
-		s.b = "Lorem ipsum dolor sit ethereum........";
-		s.c = 0x1234;
-		return abi.encodeWithSelector(x, type(uint).max, s, uint(3));
-	}
-}
-// ----
-// f0() -> 0x20, 4, 8234104107246695022420661102507966550300666591269321702959126607540084801536
-// f1() -> 0x20, 0x64, 8234104107246695022420661102507966550300666591269321702959126607540084801536, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f2() -> 0x20, 0x64, 8234104107246695022420661102507966550300666591269321702959126607540084801536, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f3() -> 0x20, 0x24, 0x12345678ffffffffffffffffffffffffffffffffffffffffffffffffffffffff, -26959946667150639794667015087019630673637144422540572481103610249216
-// f4() -> 0x20, 292, 0x12345678ffffffffffffffffffffffffffffffffffffffffffffffffffffffff, -26959946667150639794667015087019630673637144422540572481103610249216, 2588154880046461420288033448353884544669165864563894958185946583924736, 80879840001451919384001045261058892020911433267621717443310830747648, 514631493222945105325971421573240365883976325135760395164659172419450175488, 2588154880046461420288033448353884544669165864563894958185946583924736, 125633351468921981443148290305511478939149093009039067761942823761346560, 0x264c6f72656d20697073756d20646f6c6f722073697420657468657265, 53113508339655873314659021564971517366334151400493876485713881232784043802624, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
deleted file mode 100644
index 61a8d0b431b1..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function f0() public pure returns (bytes memory) {
-		return abi.encodeWithSignature("f(uint256)");
-	}
-	function f1() public pure returns (bytes memory) {
-		string memory x = "f(uint256)";
-		return abi.encodeWithSignature(x, "abc");
-	}
-	string xstor;
-	function f1s() public returns (bytes memory) {
-		xstor = "f(uint256)";
-		return abi.encodeWithSignature(xstor, "abc");
-	}
-	function f2() public pure returns (bytes memory r, uint[] memory ar) {
-		string memory x = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
-		uint[] memory y = new uint[](4);
-		y[0] = type(uint).max;
-		y[1] = type(uint).max - 1;
-		y[2] = type(uint).max - 2;
-		y[3] = type(uint).max - 3;
-		r = abi.encodeWithSignature(x, y);
-		// The hash uses temporary memory. This allocation re-uses the memory
-		// and should initialize it properly.
-		ar = new uint[](2);
-	}
-}
-// ----
-// f0() -> 0x20, 4, -34435155370463444793260793355178157075203752403645521721995013737368954863616
-// f1() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f1s() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f2() -> 0x40, 0x0140, 0xc4, -10047825972976160827854069633043429618646681939320956771263895477211642200064, 862718293348820473429344482784628181556388621521298319395315527974912, 0x04ffffffffffffffffffffffffffffffffffffffffffffffffffffffff, -1, -26959946667150639794667015087019630673637144422540572481103610249217, -53919893334301279589334030174039261347274288845081144962207220498433, -107839786668602559178668060348078522694548577690162289924414440996864, 2, 0, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
deleted file mode 100644
index 4020530864a0..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-pragma abicoder v2;
-contract C {
-    function f0() public pure returns (bytes memory) {
-        return abi.encodeWithSignature("f(uint256)");
-    }
-    function f1() public pure returns (bytes memory) {
-        string memory x = "f(uint256)";
-        return abi.encodeWithSignature(x, "abc");
-    }
-    string xstor;
-    function f1s() public returns (bytes memory) {
-        xstor = "f(uint256)";
-        return abi.encodeWithSignature(xstor, "abc");
-    }
-    function f2() public pure returns (bytes memory r, uint[] memory ar) {
-        string memory x = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
-        uint[] memory y = new uint[](4);
-        y[0] = type(uint).max;
-        y[1] = type(uint).max - 1;
-        y[2] = type(uint).max - 2;
-        y[3] = type(uint).max - 3;
-        r = abi.encodeWithSignature(x, y);
-        // The hash uses temporary memory. This allocation re-uses the memory
-        // and should initialize it properly.
-        ar = new uint[](2);
-    }
-    struct S { uint a; string b; uint16 c; }
-    function f4() public pure returns (bytes memory) {
-        S memory s;
-        s.a = 0x1234567;
-        s.b = "Lorem ipsum dolor sit ethereum........";
-        s.c = 0x1234;
-        return abi.encodeWithSignature(s.b, type(uint).max, s, uint(3));
-    }
-}
-// ----
-// f0() -> 0x20, 4, -34435155370463444793260793355178157075203752403645521721995013737368954863616
-// f1() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f1s() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
-// f2() -> 0x40, 0x0140, 0xc4, -10047825972976160827854069633043429618646681939320956771263895477211642200064, 862718293348820473429344482784628181556388621521298319395315527974912, 0x04ffffffffffffffffffffffffffffffffffffffffffffffffffffffff, -1, -26959946667150639794667015087019630673637144422540572481103610249217, -53919893334301279589334030174039261347274288845081144962207220498433, -107839786668602559178668060348078522694548577690162289924414440996864, 2, 0, 0
-// f4() -> 0x20, 292, 0x7c793002ffffffffffffffffffffffffffffffffffffffffffffffffffffffff, -26959946667150639794667015087019630673637144422540572481103610249216, 2588154880046461420288033448353884544669165864563894958185946583924736, 80879840001451919384001045261058892020911433267621717443310830747648, 514631493222945105325971421573240365883976325135760395164659172419450175488, 2588154880046461420288033448353884544669165864563894958185946583924736, 125633351468921981443148290305511478939149093009039067761942823761346560, 0x264c6f72656d20697073756d20646f6c6f722073697420657468657265, 53113508339655873314659021564971517366334151400493876485713881232784043802624, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol b/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
deleted file mode 100644
index 7187ccf5df82..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-  function f(bytes calldata x) public returns (C[] memory) {
-    return abi.decode(x, (C[]));
-  }
-  function g() public returns (bytes memory) {
-    C[] memory c = new C[](3);
-    c[0] = C(address(0x42));
-    c[1] = C(address(0x21));
-    c[2] = C(address(0x23));
-    return abi.encode(c);
-  }
-}
-// ----
-// f(bytes): 0x20, 0xA0, 0x20, 3, 0x01, 0x02, 0x03 -> 0x20, 3, 0x01, 0x02, 0x03
-// g() -> 0x20, 0xa0, 0x20, 3, 0x42, 0x21, 0x23
diff --git a/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol b/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
deleted file mode 100644
index 0e56ecf581f3..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-contract C {
-  function f(bytes calldata x) public returns (C[] memory) {
-    return abi.decode(x, (C[]));
-  }
-  function g() public returns (bytes memory) {
-    C[] memory c = new C[](3);
-    c[0] = C(address(0x42));
-    c[1] = C(address(0x21));
-    c[2] = C(address(0x23));
-    return abi.encode(c);
-  }
-}
-// ----
-// f(bytes): 0x20, 0xA0, 0x20, 3, 0x01, 0x02, 0x03 -> 0x20, 3, 0x01, 0x02, 0x03
-// f(bytes): 0x20, 0x60, 0x20, 1, 0x0102030405060708090a0b0c0d0e0f1011121314 -> 0x20, 1, 0x0102030405060708090a0b0c0d0e0f1011121314
-// f(bytes): 0x20, 0x60, 0x20, 1, 0x0102030405060708090a0b0c0d0e0f101112131415 -> FAILURE
-// g() -> 0x20, 0xa0, 0x20, 3, 0x42, 0x21, 0x23
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
deleted file mode 100644
index 02937aced8da..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma abicoder v2;
-contract Test {
-	struct MemoryUint {
-		uint field;
-	}
-	function test() public pure returns (uint) {
-		uint[] memory before = new uint[](1); // at offset 0x80
-		// Two problems here: The first offset is zero, the second offset is missing.
-		bytes memory corrupt = abi.encode(uint(32), // offset to "tuple"
-										  uint(0)); // bogus first element
-		/*
-		  At this point the free pointer is 0x80 + 64 (size of before) + 32 (length field of corrupt) + 64 (two encoded words)
-
-		  Now let's put random junk into memory immediately after the bogus first element. Our goal is to overflow the read pointer to point to before.
-		  The value read out at this point will be added to beginning of the encoded tuple, AKA corrupt + 64. We need then to write x where:
-		  x + 0x80 + 64 (before) + 32 (length of corrupt) + 32 (first word of corrupt) = 0x80 (mod 2^256)
-		  that is MAX_UINT - 128
-		*/
-		MemoryUint memory afterCorrupt;
-		afterCorrupt.field = uint(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80);
-		before[0] = 123456;
-		uint[][2] memory decoded = abi.decode(corrupt, (uint[][2]));
-		return decoded[1][0];
-	}
-}
-// ----
-// test() -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
deleted file mode 100644
index 0a874914a93d..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-pragma abicoder v2;
-contract Test {
-	struct MemoryTuple {
-		uint field1;
-		uint field2;
-	}
-	function withinArray() public pure returns (uint) {
-		uint[] memory before = new uint[](1);
-		bytes memory corrupt = abi.encode(uint(32),
-										  uint(2));
-		MemoryTuple memory afterCorrupt;
-		before[0] = 123456;
-		/*
-		  As above, but in this case we are adding to:
-		  0x80 + 64 (before) + 32 (length of corrupt) + 32 (offset) + 32 (field pointer)
-		  giving MAX_UINT - 96
-		*/
-		afterCorrupt.field1 = uint(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60);
-		afterCorrupt.field2 = uint(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60);
-		uint[][] memory decoded = abi.decode(corrupt, (uint[][]));
-		/*
-		  Will return 123456 * 2, AKA before has been copied twice
-		 */
-		return decoded[0][0] + decoded[1][0];
-	}
-}
-// ----
-// withinArray() -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
deleted file mode 100644
index a20e9ae49fe1..000000000000
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-contract Test {
-	struct MemoryUint {
-		uint field;
-	}
-	function test() public pure returns (uint) {
-		uint[] memory before = new uint[](1); // at offset 0x80
-		bytes memory corrupt = abi.encode(
-            uint(32),
-            uint(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80),
-            uint(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80)
-        );
-		MemoryUint memory afterCorrupt;
-		afterCorrupt.field = uint(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80);
-		before[0] = 123456;
-		uint[][2] memory decoded = abi.decode(corrupt, (uint[][2]));
-		return decoded[1][0];
-	}
-}
-// ----
-// test() -> FAILURE
diff --git a/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
deleted file mode 100644
index b8def58898a7..000000000000
--- a/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Lotto {
-    uint256 public constant ticketPrice = 555;
-}
-// ----
-// ticketPrice() -> 555
diff --git a/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
deleted file mode 100644
index 51cb8e5e2369..000000000000
--- a/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Lotto {
-    uint256 public ticketPrice = 500;
-}
-// ----
-// ticketPrice() -> 500
diff --git a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
deleted file mode 100644
index e6f703bd7681..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function test() public returns (uint256) {
-        // Note that this only works because computation on literals is done using
-        // unbounded integers.
-        if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) return 1;
-        if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) return 2;
-        return 0;
-    }
-}
-// ----
-// test() -> 0
diff --git a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
deleted file mode 100644
index cd32ceffa039..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f(uint256 d) public pure returns (uint256) {
-        addmod(1, 2, d);
-        return 2;
-    }
-
-    function g(uint256 d) public pure returns (uint256) {
-        mulmod(1, 2, d);
-        return 2;
-    }
-
-    function h() public pure returns (uint256) {
-        mulmod(0, 1, 2);
-        mulmod(1, 0, 2);
-        addmod(0, 1, 2);
-        addmod(1, 0, 2);
-        return 2;
-    }
-}
-// ----
-// f(uint256): 0 -> FAILURE, hex"4e487b71", 0x12
-// g(uint256): 0 -> FAILURE, hex"4e487b71", 0x12
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
deleted file mode 100644
index 7a8504d53178..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public returns (uint y) {
-    unchecked{{
-        uint max = type(uint).max;
-        uint x = max + 1;
-        y = x;
-    }}
-  }
-}
-// ----
-// f() -> 0x00
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
deleted file mode 100644
index 6cc02bd97580..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint public x = msg.value - 10;
-    constructor() payable {}
-}
-
-contract D {
-    function f() public {
-        unchecked {
-            new C();
-        }
-    }
-    function g() public payable returns (uint) {
-        return (new C{value: 11}()).x();
-    }
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x11
-// g(), 100 wei -> 1
-// gas legacy: 100388
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol b/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol
deleted file mode 100644
index 03c2bb567572..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-contract C {
-    // Input is still not checked - this needs ABIEncoderV2!
-    function f(uint16 a, uint16 b) public returns (uint16) {
-        return a + b;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(uint16,uint16): 65534, 0 -> 0xfffe
-// f(uint16,uint16): 65536, 0 -> 0x00
-// f(uint16,uint16): 65535, 0 -> 0xffff
-// f(uint16,uint16): 65535, 1 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol b/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
deleted file mode 100644
index 8a29cb2b23b9..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v2;
-contract C {
-    function f(uint16 a, uint16 b) public returns (uint16) {
-        return a + b;
-    }
-}
-// ----
-// f(uint16,uint16): 65534, 0 -> 0xfffe
-// f(uint16,uint16): 65536, 0 -> FAILURE
-// f(uint16,uint16): 65535, 0 -> 0xffff
-// f(uint16,uint16): 65535, 1 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
deleted file mode 100644
index 420a52cde48e..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function add(uint16 a, uint16 b) public returns (uint16) {
-        return a + b;
-    }
-
-    function f(uint16 a, uint16 b, uint16 c) public returns (uint16) {
-        unchecked { return add(a, b) + c; }
-    }
-}
-// ----
-// f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(uint16,uint16,uint16): 0xe000, 0x1000, 0x1000 -> 0x00
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
deleted file mode 100644
index 42658f83a4f2..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    modifier add(uint16 a, uint16 b) {
-        unchecked { a + b; }
-        _;
-    }
-
-    function f(uint16 a, uint16 b, uint16 c) public add(a, b) returns (uint16) {
-        return b + c;
-    }
-}
-// ----
-// f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> 58626
-// f(uint16,uint16,uint16): 0x1000, 0xe500, 0xe000 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
deleted file mode 100644
index 517c4966e984..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function div(uint256 a, uint256 b) public returns (uint256) {
-        return a / b;
-    }
-
-    function mod(uint256 a, uint256 b) public returns (uint256) {
-        return a % b;
-    }
-}
-// ----
-// div(uint256,uint256): 7, 2 -> 3
-// div(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
-// mod(uint256,uint256): 7, 2 -> 1
-// mod(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
diff --git a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
deleted file mode 100644
index 0ec9f2c79077..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract C {
-    // (2**3)**4 = 4096
-    // 2**(3**4) = 2417851639229258349412352
-    function test_hardcode1(uint a, uint b, uint c) public returns (uint256) {
-        return a**b**c;
-    }
-
-    // (3**2)**2)**2 = 6561
-    // 3**(2**(2**2) = 43046721
-    function test_hardcode2(uint a, uint b, uint c, uint d) public returns (uint256) {
-        return a**b**c**d;
-    }
-
-    function test_invariant(uint a, uint b, uint c) public returns (bool) {
-        return a**b**c == a**(b**c);
-    }
-
-    function test_literal_mix(uint a, uint b) public returns (bool) {
-        return
-            (a**2**b == a**(2**b)) &&
-            (2**a**b == 2**(a**b)) &&
-            (a**b**2 == a**(b**2));
-    }
-
-    function test_other_operators(uint a, uint b) public returns (bool) {
-        return
-            (a**b/25 == (a**b)/25) &&
-            (a**b*3**b == (a**b)*(3**b)) &&
-            (b**a**a/b**a**b == (b**(a**a))/(b**(a**b)));
-     }
-}
-// ----
-// test_hardcode1(uint256,uint256,uint256): 2, 3, 4 -> 2417851639229258349412352
-// test_hardcode2(uint256,uint256,uint256,uint256): 3, 2, 2, 2 -> 43046721
-// test_invariant(uint256,uint256,uint256): 2, 3, 4 -> true
-// test_invariant(uint256,uint256,uint256): 3, 4, 2 -> true
-// test_literal_mix(uint256,uint256): 2, 3 -> true
-// test_other_operators(uint256,uint256): 2, 4 -> true
diff --git a/test/libsolidity/semanticTests/arithmetics/signed_mod.sol b/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
deleted file mode 100644
index 3062562069ce..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f(int a, int b) public pure returns (int) {
-        return a % b;
-    }
-    function g(bool _check) public pure returns (int) {
-        int x = type(int).min;
-        if (_check) {
-            return x / -1;
-        } else {
-            unchecked { return x / -1; }
-        }
-    }
-}
-// ----
-// f(int256,int256): 7, 5 -> 2
-// f(int256,int256): 7, -5 -> 2
-// f(int256,int256): -7, 5 -> -2
-// f(int256,int256): -7, 5 -> -2
-// f(int256,int256): -5, -5 -> 0
-// g(bool): true -> FAILURE, hex"4e487b71", 0x11
-// g(bool): false -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
diff --git a/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol b/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
deleted file mode 100644
index 140506279d0a..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function add(uint16 a, uint16 b) public returns (uint16) {
-        unchecked {
-            return a + b;
-        }
-    }
-
-    function f(uint16 a) public returns (uint16) {
-        return add(a, 0x100) + 0x100;
-    }
-}
-// ----
-// f(uint16): 7 -> 0x0207
-// f(uint16): 0xffff -> 511
-// f(uint16): 0xfeff -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
deleted file mode 100644
index ae91ea278f05..000000000000
--- a/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function div(uint256 a, uint256 b) public returns (uint256) {
-        // Does not disable div by zero check
-        unchecked {
-            return a / b;
-        }
-    }
-
-    function mod(uint256 a, uint256 b) public returns (uint256) {
-        // Does not disable div by zero check
-        unchecked {
-            return a % b;
-        }
-    }
-}
-// ----
-// div(uint256,uint256): 7, 2 -> 3
-// div(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
-// mod(uint256,uint256): 7, 2 -> 1
-// mod(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
diff --git a/test/libsolidity/semanticTests/array/array_2d_assignment.sol b/test/libsolidity/semanticTests/array/array_2d_assignment.sol
deleted file mode 100644
index 9a4093c38a43..000000000000
--- a/test/libsolidity/semanticTests/array/array_2d_assignment.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(uint n) public pure returns (uint) {
-		uint[][] memory a = new uint[][](2);
-		for (uint i = 0; i < 2; ++i)
-			a[i] = new uint[](3);
-		a[1][1] = n;
-		uint[] memory b = a[1];
-		return b[1];
-	}
-}
-// ----
-// f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/array/array_2d_new.sol b/test/libsolidity/semanticTests/array/array_2d_new.sol
deleted file mode 100644
index 13c0ac201c85..000000000000
--- a/test/libsolidity/semanticTests/array/array_2d_new.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(uint n) public pure returns (uint) {
-		uint[][] memory a = new uint[][](2);
-		for (uint i = 0; i < 2; ++i)
-			a[i] = new uint[](3);
-		return a[0][0] = n;
-	}
-}
-// ----
-// f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/array/array_3d_assignment.sol b/test/libsolidity/semanticTests/array/array_3d_assignment.sol
deleted file mode 100644
index f987a17de238..000000000000
--- a/test/libsolidity/semanticTests/array/array_3d_assignment.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f(uint n) public pure returns (uint) {
-		uint[][][] memory a = new uint[][][](2);
-		for (uint i = 0; i < 2; ++i)
-		{
-			a[i] = new uint[][](3);
-			for (uint j = 0; j < 3; ++j)
-				a[i][j] = new uint[](4);
-		}
-		a[1][1][1] = n;
-		uint[][] memory b = a[1];
-		uint[] memory c = b[1];
-		return c[1];
-	}
-}
-// ----
-// f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/array/array_3d_new.sol b/test/libsolidity/semanticTests/array/array_3d_new.sol
deleted file mode 100644
index b4bb4e626f97..000000000000
--- a/test/libsolidity/semanticTests/array/array_3d_new.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(uint n) public pure returns (uint) {
-		uint[][][] memory a = new uint[][][](2);
-		for (uint i = 0; i < 2; ++i)
-		{
-			a[i] = new uint[][](3);
-			for (uint j = 0; j < 3; ++j)
-				a[i][j] = new uint[](4);
-		}
-		return a[1][1][1] = n;
-	}
-}
-// ----
-// f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/array/array_function_pointers.sol b/test/libsolidity/semanticTests/array/array_function_pointers.sol
deleted file mode 100644
index 5d4707ec3ced..000000000000
--- a/test/libsolidity/semanticTests/array/array_function_pointers.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	function f(uint n, uint m) public {
-		function() internal returns (uint)[] memory arr = new function() internal returns (uint)[](n);
-		arr[m]();
-	}
-	function f2(uint n, uint m, uint a, uint b) public {
-		function() internal returns (uint)[][] memory arr = new function() internal returns (uint)[][](n);
-		for (uint i = 0; i < n; ++i)
-			arr[i] = new function() internal returns (uint)[](m);
-		arr[a][b]();
-	}
-	function g(uint n, uint m) public {
-		function() external returns (uint)[] memory arr = new function() external returns (uint)[](n);
-		arr[m]();
-	}
-	function g2(uint n, uint m, uint a, uint b) public {
-		function() external returns (uint)[][] memory arr = new function() external returns (uint)[][](n);
-		for (uint i = 0; i < n; ++i)
-			arr[i] = new function() external returns (uint)[](m);
-		arr[a][b]();
-	}
-}
-// ----
-// f(uint256,uint256): 1823621, 12323 -> FAILURE # Out of gas #
-// f2(uint256,uint256,uint256,uint256): 18723921, 1823621, 123, 12323 -> FAILURE # Out of gas #
-// g(uint256,uint256): 1823621, 12323 -> FAILURE # Out of gas #
-// g2(uint256,uint256,uint256,uint256): 18723921, 1823621, 123, 12323 -> FAILURE # Out of gas #
diff --git a/test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
deleted file mode 100644
index 683eca90310a..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	uint test1;
-	uint test2;
-	uint test3;
-	uint test4;
-	uint test5;
-	uint test6;
-	uint test7;
-	mapping (string => uint) map;
-	function set(string memory s, uint n, uint m, uint a, uint b) public returns (uint) {
-		map[s] = 0;
-		uint[][] memory x = new uint[][](n);
-		for (uint i = 0; i < n; ++i)
-			x[i] = new uint[](m);
-		return x[a][b];
-	}
-}
-// ----
-// set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 0, 0, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 1, 3, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 3, 3, 32, "01234567890123456789012345678901" -> FAILURE, hex"4e487b71", 0x32
-// set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 1, 5, 32, "01234567890123456789012345678901" -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
deleted file mode 100644
index 6113cfeefce0..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint test1;
-	uint test2;
-	uint test3;
-	uint test4;
-	uint test5;
-	uint test6;
-	uint test7;
-	mapping (string => uint) map;
-	function set(string memory s, uint n, uint m) public returns (uint) {
-		map[s] = 0;
-		uint[4][] memory x = new uint[4][](n);
-		return x[m][0];
-	}
-}
-// ----
-// set(string,uint256,uint256): 0x60, 2, 0, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256): 0x60, 2, 1, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256): 0x60, 2, 2, 32, "01234567890123456789012345678901" -> FAILURE, hex"4e487b71", 0x32
-// set(string,uint256,uint256): 0x60, 200, 199, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
deleted file mode 100644
index 13af18a5e531..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint test1;
-	uint test2;
-	uint test3;
-	uint test4;
-	uint test5;
-	uint test6;
-	uint test7;
-	mapping (string => uint) map;
-	function set(string memory s) public returns (uint[3] memory x, uint[2] memory y, uint[] memory z, uint t) {
-		map[s] = 0;
-	}
-}
-// ----
-// set(string): 0x20, 32, "01234567890123456789012345678901" -> 0, 0, 0, 0, 0, 0xe0, 0, 0
diff --git a/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
deleted file mode 100644
index eddf0e720a5b..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint test1;
-	uint test2;
-	uint test3;
-	uint test4;
-	uint test5;
-	uint test6;
-	uint test7;
-	mapping (string => uint) map;
-	function set(string memory s) public returns (uint) {
-		map[s] = 0;
-		uint[3] memory x;
-		return x[2];
-	}
-}
-// ----
-// set(string): 0x20, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
deleted file mode 100644
index 5eeaad7db5d9..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint test1;
-	uint test2;
-	uint test3;
-	uint test4;
-	uint test5;
-	uint test6;
-	uint test7;
-	mapping (string => uint) map;
-	function set(string memory s, uint n, uint a) public returns (uint) {
-		map[s] = 0;
-		uint[] memory x = new uint[](n);
-		return x[a];
-	}
-}
-// ----
-// set(string,uint256,uint256): 0x60, 5, 0, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256): 0x60, 5, 1, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256): 0x60, 5, 4, 32, "01234567890123456789012345678901" -> 0
-// set(string,uint256,uint256): 0x60, 5, 5, 32, "01234567890123456789012345678901" -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_memory_as_parameter.sol b/test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
deleted file mode 100644
index 151fe0894984..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	function test(uint256 len, uint idx) public returns (uint256)
-	{
-		uint[] memory array = new uint[](len);
-		uint result = receiver(array, idx);
-
-		for (uint256 i = 0; i < array.length; i++)
-			require(array[i] == i + 1);
-
-		return result;
-	}
-	function receiver(uint[] memory array, uint idx) public returns (uint256)
-	{
-		for (uint256 i = 0; i < array.length; i++)
-			array[i] = i + 1;
-
-		return array[idx];
-	}
-}
-// ----
-// test(uint256,uint256): 0, 0 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256,uint256): 1, 0 -> 1
-// test(uint256,uint256): 10, 5 -> 6
-// test(uint256,uint256): 10, 50 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_memory_create.sol b/test/libsolidity/semanticTests/array/array_memory_create.sol
deleted file mode 100644
index 91e72bc9af53..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_create.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function create(uint256 len) public returns (uint256)
-	{
-		uint[] memory array = new uint[](len);
-		return array.length;
-	}
-}
-// ----
-// create(uint256): 0 -> 0
-// create(uint256): 7 -> 7
-// create(uint256): 10 -> 10
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
deleted file mode 100644
index d313e7acb234..000000000000
--- a/test/libsolidity/semanticTests/array/array_memory_index_access.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-	function index(uint256 len) public returns (bool)
-	{
-		uint[] memory array = new uint[](len);
-
-		for (uint256 i = 0; i < len; i++)
-			array[i] = i + 1;
-
-		for (uint256 i = 0; i < len; i++)
-			require(array[i] == i + 1, "Unexpected value in array!");
-
-		return array.length == len;
-	}
-	function accessIndex(uint256 len, int256 idx) public returns (uint256)
-	{
-		uint[] memory array = new uint[](len);
-
-		for (uint256 i = 0; i < len; i++)
-			array[i] = i + 1;
-
-		return array[uint256(idx)];
-	}
-}
-// ----
-// index(uint256): 0 -> true
-// index(uint256): 10 -> true
-// index(uint256): 20 -> true
-// index(uint256): 0xFF -> true
-// gas irOptimized: 108291
-// gas legacy: 181523
-// gas legacyOptimized: 117443
-// accessIndex(uint256,int256): 10, 1 -> 2
-// accessIndex(uint256,int256): 10, 0 -> 1
-// accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
-// accessIndex(uint256,int256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
-// accessIndex(uint256,int256): 10, -1 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_push_return_reference.sol b/test/libsolidity/semanticTests/array/array_push_return_reference.sol
deleted file mode 100644
index a7e5454bda0b..000000000000
--- a/test/libsolidity/semanticTests/array/array_push_return_reference.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function test(uint256 v) public {
-        storageArray.push() = v;
-    }
-    function getLength() public view returns (uint256) {
-        return storageArray.length;
-    }
-    function fetch(uint256 a) public view returns (uint256) {
-        return storageArray[a];
-    }
-}
-// ----
-// getLength() -> 0
-// test(uint256): 42 ->
-// getLength() -> 1
-// fetch(uint256): 0 -> 42
-// fetch(uint256): 1 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256): 23 ->
-// getLength() -> 2
-// fetch(uint256): 0 -> 42
-// fetch(uint256): 1 -> 23
-// fetch(uint256): 2 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_push_with_arg.sol b/test/libsolidity/semanticTests/array/array_push_with_arg.sol
deleted file mode 100644
index b143c199ad78..000000000000
--- a/test/libsolidity/semanticTests/array/array_push_with_arg.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function test(uint256 v) public {
-        storageArray.push(v);
-    }
-    function getLength() public view returns (uint256) {
-        return storageArray.length;
-    }
-    function fetch(uint256 a) public view returns (uint256) {
-        return storageArray[a];
-    }
-}
-// ----
-// getLength() -> 0
-// test(uint256): 42 ->
-// getLength() -> 1
-// fetch(uint256): 0 -> 42
-// fetch(uint256): 1 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256): 23 ->
-// getLength() -> 2
-// fetch(uint256): 0 -> 42
-// fetch(uint256): 1 -> 23
-// fetch(uint256): 2 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_access.sol b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
deleted file mode 100644
index 2589e4709dae..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_index_access.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function test_indices(uint256 len) public
-    {
-        while (storageArray.length < len)
-            storageArray.push();
-        while (storageArray.length > len)
-            storageArray.pop();
-        for (uint i = 0; i < len; i++)
-            storageArray[i] = i + 1;
-
-        for (uint i = 0; i < len; i++)
-            require(storageArray[i] == i + 1);
-    }
-}
-// ----
-// test_indices(uint256): 1 ->
-// test_indices(uint256): 129 ->
-// gas irOptimized: 3003025
-// gas legacy: 3038654
-// gas legacyOptimized: 2995964
-// test_indices(uint256): 5 ->
-// gas irOptimized: 576296
-// gas legacy: 573810
-// gas legacyOptimized: 571847
-// test_indices(uint256): 10 ->
-// gas irOptimized: 157009
-// gas legacy: 160108
-// gas legacyOptimized: 156996
-// test_indices(uint256): 15 ->
-// gas irOptimized: 171409
-// gas legacy: 175973
-// gas legacyOptimized: 171596
-// test_indices(uint256): 0xFF ->
-// gas irOptimized: 5645329
-// gas legacy: 5715748
-// gas legacyOptimized: 5632556
-// test_indices(uint256): 1000 ->
-// gas irOptimized: 18068701
-// gas legacy: 18347810
-// gas legacyOptimized: 18037248
-// test_indices(uint256): 129 ->
-// gas irOptimized: 4136840
-// gas legacy: 4140113
-// gas legacyOptimized: 4108272
-// test_indices(uint256): 128 ->
-// gas irOptimized: 395769
-// gas legacy: 433498
-// gas legacyOptimized: 400909
-// test_indices(uint256): 1 ->
-// gas irOptimized: 580232
-// gas legacy: 576715
-// gas legacyOptimized: 575542
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
deleted file mode 100644
index c77aad0a4515..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function test_boundary_check(uint256 len, uint256 access) public returns (uint256)
-    {
-        while(storageArray.length < len)
-            storageArray.push();
-        while(storageArray.length > len)
-            storageArray.pop();
-        return storageArray[access];
-    }
-}
-// ----
-// test_boundary_check(uint256,uint256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
-// test_boundary_check(uint256,uint256): 10, 9 -> 0
-// test_boundary_check(uint256,uint256): 1, 9 -> FAILURE, hex"4e487b71", 0x32
-// test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
-// test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
-// test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 137913
-// gas legacy: 133633
-// gas legacyOptimized: 114354
-// test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 140048
-// gas legacy: 135949
-// gas legacyOptimized: 116533
-// test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
-// test_boundary_check(uint256,uint256): 256, 2 -> 0
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
deleted file mode 100644
index 593358659341..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function test_zeroed_indicies(uint256 len) public
-    {
-        while(storageArray.length < len)
-            storageArray.push();
-        while(storageArray.length > len)
-            storageArray.pop();
-
-        for (uint i = 0; i < len; i++)
-            storageArray[i] = i + 1;
-
-        if (len > 3)
-        {
-            while(storageArray.length > 0)
-                storageArray.pop();
-            while(storageArray.length < 3)
-                storageArray.push();
-
-            for (uint i = 3; i < len; i++)
-            {
-                assembly {
-                    mstore(0, storageArray.slot)
-                    let pos := add(keccak256(0, 0x20), i)
-
-                    if iszero(eq(sload(pos), 0)) {
-                        revert(0, 0)
-                    }
-                }
-            }
-
-        }
-
-        while(storageArray.length > 0)
-            storageArray.pop();
-        while(storageArray.length < len)
-            storageArray.push();
-
-        for (uint i = 0; i < len; i++)
-        {
-            require(storageArray[i] == 0);
-
-            uint256 val = storageArray[i];
-            uint256 check;
-
-            assembly { check := iszero(val) }
-
-            require(check == 1);
-        }
-    }
-}
-// ----
-// test_zeroed_indicies(uint256): 1 ->
-// test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131315
-// gas legacy: 131671
-// gas legacyOptimized: 129994
-// test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 224578
-// gas legacy: 225237
-// gas legacyOptimized: 222359
-// test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 321962
-// gas legacy: 322937
-// gas legacyOptimized: 318919
-// test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5080806
-// gas legacy: 5093941
-// gas legacyOptimized: 5020727
diff --git a/test/libsolidity/semanticTests/array/array_storage_length_access.sol b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
deleted file mode 100644
index 0669a320971d..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_length_access.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function set_get_length(uint256 len) public returns (uint256) {
-        while(storageArray.length < len)
-            storageArray.push();
-        return storageArray.length;
-    }
-}
-// ----
-// set_get_length(uint256): 0 -> 0
-// set_get_length(uint256): 1 -> 1
-// set_get_length(uint256): 10 -> 10
-// set_get_length(uint256): 20 -> 20
-// set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 96690
-// gas legacy: 128571
-// gas legacyOptimized: 110143
-// set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1209119
-// gas legacy: 1689548
-// gas legacyOptimized: 1393535
-// set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol b/test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
deleted file mode 100644
index ed946e19756a..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function popEmpty() public {
-        storageArray.pop();
-    }
-}
-// ====
-// EVMVersion: >=petersburg
-// ----
-// popEmpty() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
deleted file mode 100644
index 80376b423f62..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    uint256[] storageArray;
-    function pushEmpty(uint256 len) public {
-        while(storageArray.length < len)
-            storageArray.push();
-
-        for (uint i = 0; i < len; i++)
-            require(storageArray[i] == 0);
-    }
-}
-// ====
-// EVMVersion: >=petersburg
-// ----
-// pushEmpty(uint256): 128
-// gas irOptimized: 401024
-// gas legacy: 400640
-// gas legacyOptimized: 388804
-// pushEmpty(uint256): 256
-// gas irOptimized: 683700
-// gas legacy: 685108
-// gas legacyOptimized: 671480
-// pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
-// gas irOptimized: 100000000
-// gas legacy: 100000000
-// gas legacyOptimized: 100000000
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
deleted file mode 100644
index 4b5b407eaff5..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    address[] addressArray;
-    function set_get_length(uint256 len) public returns (uint256)
-    {
-        while(addressArray.length < len)
-            addressArray.push();
-        while(addressArray.length > len)
-            addressArray.pop();
-        return addressArray.length;
-    }
-}
-// ====
-// EVMVersion: >=petersburg
-// ----
-// set_get_length(uint256): 0 -> 0
-// set_get_length(uint256): 1 -> 1
-// set_get_length(uint256): 10 -> 10
-// set_get_length(uint256): 20 -> 20
-// set_get_length(uint256): 0 -> 0
-// gas irOptimized: 77628
-// gas legacy: 77730
-// gas legacyOptimized: 77162
-// set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 158881
-// gas legacy: 696850
-// gas legacyOptimized: 134488
-// set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1762213
-// gas legacy: 9857362
-// gas legacyOptimized: 1393660
-// set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
-// gas irOptimized: 100000000
-// gas legacyOptimized: 100000000
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
deleted file mode 100644
index 5befbe2282b2..000000000000
--- a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    uint[] storageArray;
-    function set_get_length(uint256 len) public returns (uint256) {
-        while(storageArray.length < len)
-            storageArray.push();
-        while(storageArray.length > 0)
-            storageArray.pop();
-        return storageArray.length;
-    }
-}
-// ----
-// set_get_length(uint256): 0 -> 0
-// set_get_length(uint256): 1 -> 0
-// set_get_length(uint256): 10 -> 0
-// set_get_length(uint256): 20 -> 0
-// gas irOptimized: 106222
-// gas legacy: 105722
-// gas legacyOptimized: 103508
-// set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 815997
-// gas legacy: 808020
-// gas legacyOptimized: 784467
-// set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12746889
-// gas legacy: 12612192
-// gas legacyOptimized: 12239199
-// set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
deleted file mode 100644
index 95280054aae7..000000000000
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract Test {
-    uint24[3][] public data;
-
-    function set(uint24[3][] memory _data) public returns (uint256) {
-        data = _data;
-        return data.length;
-    }
-
-    function get() public returns (uint24[3][] memory) {
-        return data;
-    }
-}
-// ----
-// set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 186557
-// gas legacy: 211054
-// gas legacyOptimized: 206042
-// data(uint256,uint256): 0x02, 0x02 -> 0x09
-// data(uint256,uint256): 0x05, 0x01 -> 0x11
-// data(uint256,uint256): 0x06, 0x00 -> FAILURE
-// get() -> 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
deleted file mode 100644
index 942c7337aa5a..000000000000
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract c {
-    bytes data;
-    function test_short() public returns (uint256 r) {
-        assembly {
-            sstore(data.slot, 0)
-        }
-        for (uint8 i = 0; i < 15; i++) {
-            data.push(bytes1(i));
-        }
-        assembly {
-            r := sload(data.slot)
-        }
-    }
-
-    function test_long() public returns (uint256 r) {
-        assembly {
-            sstore(data.slot, 0)
-        }
-        for (uint8 i = 0; i < 33; i++) {
-            data.push(bytes1(i));
-        }
-        assembly {
-            r := sload(data.slot)
-        }
-    }
-
-    function test_pop() public returns (uint256 r) {
-        assembly {
-            sstore(data.slot, 0)
-        }
-        for (uint8 i = 0; i < 32; i++) {
-            data.push(bytes1(i));
-        }
-        data.pop();
-        data.pop();
-        assembly {
-            r := sload(data.slot)
-        }
-    }
-}
-// ----
-// storageEmpty -> 1
-// test_short() -> 1780731860627700044960722568376587075150542249149356309979516913770823710
-// gas legacy: 59838
-// gas legacyOptimized: 58606
-// storageEmpty -> 0
-// test_long() -> 67
-// gas irOptimized: 89148
-// gas legacy: 101601
-// gas legacyOptimized: 100477
-// storageEmpty -> 0
-// test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
-// gas legacy: 61930
-// gas legacyOptimized: 59404
-// storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
deleted file mode 100644
index 3e0f02225bce..000000000000
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-// Tests transition between short and long encoding both ways
-contract c {
-    bytes data;
-
-    function test() public returns (uint256) {
-        for (uint8 i = 0; i < 33; i++) {
-            data.push(bytes1(i));
-        }
-        for (uint8 i = 0; i < data.length; i++)
-            if (data[i] != bytes1(i)) return i;
-        data.pop();
-        data.pop();
-        for (uint8 i = 0; i < data.length; i++)
-            if (data[i] != bytes1(i)) return i;
-        return 0;
-    }
-}
-// ----
-// test() -> 0
-// gas irOptimized: 123560
-// gas legacy: 147098
-// gas legacyOptimized: 144200
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
deleted file mode 100644
index 0a3c58b3ac92..000000000000
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract c {
-    function set() public returns (bool) {
-        data = msg.data;
-        return true;
-    }
-
-    function getLength() public returns (uint256) {
-        return data.length;
-    }
-
-    bytes data;
-}
-// ----
-// getLength() -> 0
-// set(): 1, 2 -> true
-// gas irOptimized: 110393
-// gas legacy: 110952
-// gas legacyOptimized: 110576
-// getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_cleanup.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_cleanup.sol
deleted file mode 100644
index d9c55bcc8c36..000000000000
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_cleanup.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    bytes s = "abcdefghabcdefghabcdefghabcdefg";
-
-    function fromMemory(bytes memory m) public returns (bytes16) {
-        assembly { mstore(m, 14) }
-        return bytes16(m);
-    }
-    function fromCalldata(bytes calldata c) external returns (bytes16) {
-        return bytes16(c);
-    }
-    function fromStorage() external returns (bytes32) {
-        return bytes32(s);
-    }
-    function fromSlice(bytes calldata c) external returns (bytes8) {
-        return bytes8(c[0:6]);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// fromMemory(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdef\0\0"
-// fromCalldata(bytes): 0x20, 15, "abcdefghabcdefgh" -> "abcdefghabcdefg\0"
-// fromStorage() -> "abcdefghabcdefghabcdefghabcdefg\0"
-// fromSlice(bytes): 0x20, 15, "abcdefghabcdefgh" -> "abcdef\0\0"
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
deleted file mode 100644
index 4300d8a6f331..000000000000
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    bytes s = "abcdefghabcdefgh";
-    bytes sLong = "abcdefghabcdefghabcdefghabcdefgh";
-
-    function fromMemory(bytes memory m) public returns (bytes16) {
-        return bytes16(m);
-    }
-    function fromCalldata(bytes calldata c) external returns (bytes16) {
-        return bytes16(c);
-    }
-    function fromStorage() external returns (bytes16) {
-        return bytes16(s);
-    }
-    function fromStorageLong() external returns (bytes32) {
-        return bytes32(sLong);
-    }
-    function fromSlice(bytes calldata c) external returns (bytes8) {
-        return bytes8(c[1:9]);
-    }
-}
-// ----
-// fromMemory(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdefgh"
-// fromCalldata(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdefgh"
-// fromStorage() -> "abcdefghabcdefgh"
-// fromStorageLong() -> "abcdefghabcdefghabcdefghabcdefgh"
-// fromSlice(bytes): 0x20, 16, "abcdefghabcdefgh" -> "bcdefgha"
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
deleted file mode 100644
index 04bdd83fc755..000000000000
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    bytes s = "abcdefghabcdefghabcdefghabcdefgha";
-
-    function fromMemory(bytes memory m) public returns (bytes32) {
-        return bytes32(m);
-    }
-    function fromCalldata(bytes calldata c) external returns (bytes32) {
-        return bytes32(c);
-    }
-    function fromStorage() external returns (bytes32) {
-        return bytes32(s);
-    }
-    function fromSlice(bytes calldata c) external returns (bytes32) {
-        return bytes32(c[0:33]);
-    }
-}
-// ----
-// fromMemory(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
-// fromCalldata(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
-// fromStorage() -> "abcdefghabcdefghabcdefghabcdefgh"
-// fromSlice(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
diff --git a/test/libsolidity/semanticTests/array/calldata_array.sol b/test/libsolidity/semanticTests/array/calldata_array.sol
deleted file mode 100644
index c524d06e003b..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(uint256[2] calldata s)
-        external
-        pure
-        returns (uint256 a, uint256 b)
-    {
-        a = s[0];
-        b = s[1];
-    }
-}
-// ----
-// f(uint256[2]): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol b/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
deleted file mode 100644
index d21c40caeef6..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder v2;
-contract Test {
-    function f(uint256[] calldata c) internal returns (uint a, uint b) {
-        return (c.length, c[0]);
-    }
-
-    function g(uint256[] calldata c) external returns (uint a, uint b) {
-        return f(c);
-    }
-
-    function h(uint256[] calldata c, uint start, uint end) external returns (uint a, uint b) {
-        return f(c[start: end]);
-    }
-}
-// ----
-// g(uint256[]): 0x20, 4, 1, 2, 3, 4 -> 4, 1
-// h(uint256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2, 2
diff --git a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
deleted file mode 100644
index dc1d1c31a18b..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(uint256[][] calldata a) external returns (uint256) {
-        return 42;
-    }
-
-    function g(uint256[][] calldata a) external returns (uint256) {
-        a[0];
-        return 42;
-    }
-}
-// ----
-// f(uint256[][]): 0x20, 0x0 -> 42 # valid access stub #
-// f(uint256[][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
-// f(uint256[][]): 0x20, 0x1, 0x20 -> 42 # invalid on outer access #
-// g(uint256[][]): 0x20, 0x1, 0x20 -> FAILURE
-// f(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x42 -> 42 # invalid on inner access #
-// g(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x42 -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
deleted file mode 100644
index 93470f1d22e2..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(uint256[][1][] calldata a) external returns (uint256) {
-        return 42;
-    }
-
-    function g(uint256[][1][] calldata a) external returns (uint256) {
-        a[0];
-        return 42;
-    }
-
-    function h(uint256[][1][] calldata a) external returns (uint256) {
-        a[0][0];
-        return 42;
-    }
-}
-// ----
-// f(uint256[][1][]): 0x20, 0x0 -> 42 # valid access stub #
-// f(uint256[][1][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
-// f(uint256[][1][]): 0x20, 0x1, 0x20 -> 42 # invalid on outer access #
-// g(uint256[][1][]): 0x20, 0x1, 0x20 -> FAILURE
-// f(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> 42 # invalid on inner access #
-// g(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> 42
-// h(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> FAILURE
-// f(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> 42
-// g(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> 42
-// h(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol b/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
deleted file mode 100644
index 006bf2521e32..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-
-    function f(S[] calldata s)
-        external
-        pure
-        returns (uint256 l, uint256 a, uint256 b, uint256 c, uint256 d)
-    {
-        l = s.length;
-        a = s[0].a;
-        b = s[0].b;
-        c = s[1].a;
-        d = s[1].b;
-    }
-}
-// ----
-// f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
deleted file mode 100644
index 69104d383c6e..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function test(uint256[][2] calldata a) external returns (uint256) {
-        return a.length;
-    }
-    function test(uint256[][2] calldata a, uint256 i) external returns (uint256) {
-        return a[i].length;
-    }
-    function test(uint256[][2] calldata a, uint256 i, uint256 j) external returns (uint256) {
-        return a[i][j];
-    }
-    function reenc(uint256[][2] calldata a, uint256 i, uint256 j) external returns (uint256) {
-        return this.test(a, i, j);
-    }
-}
-// ----
-// test(uint256[][2]): 0x20, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 2
-// test(uint256[][2],uint256): 0x40, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 3
-// test(uint256[][2],uint256): 0x40, 1, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 4
-// test(uint256[][2],uint256,uint256): 0x60, 0, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A01
-// reenc(uint256[][2],uint256,uint256): 0x60, 0, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A01
-// test(uint256[][2],uint256,uint256): 0x60, 0, 1, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A02
-// reenc(uint256[][2],uint256,uint256): 0x60, 0, 1, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A02
-// test(uint256[][2],uint256,uint256): 0x60, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A03
-// reenc(uint256[][2],uint256,uint256): 0x60, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A03
-// test(uint256[][2],uint256,uint256): 0x60, 1, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B01
-// reenc(uint256[][2],uint256,uint256): 0x60, 1, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B01
-// test(uint256[][2],uint256,uint256): 0x60, 1, 1, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B02
-// reenc(uint256[][2],uint256,uint256): 0x60, 1, 1, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B02
-// test(uint256[][2],uint256,uint256): 0x60, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B03
-// reenc(uint256[][2],uint256,uint256): 0x60, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B03
-// test(uint256[][2],uint256,uint256): 0x60, 1, 3, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B04
-// reenc(uint256[][2],uint256,uint256): 0x60, 1, 3, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B04
-// test(uint256[][2],uint256,uint256): 0x60, 0, 3, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256[][2],uint256,uint256): 0x60, 1, 4, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256[][2],uint256): 0x40, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
deleted file mode 100644
index e96f492841c6..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function test(uint256[][] calldata a) external returns (uint256) {
-        return a.length;
-    }
-    function test(uint256[][] calldata a, uint256 i) external returns (uint256) {
-        return a[i].length;
-    }
-    function test(uint256[][] calldata a, uint256 i, uint256 j) external returns (uint256) {
-        return a[i][j];
-    }
-    function reenc(uint256[][] calldata a, uint256 i, uint256 j) external returns (uint256) {
-        return this.test(a, i, j);
-    }
-}
-// ----
-// test(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 2
-// test(uint256[][],uint256): 0x40, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 3
-// test(uint256[][],uint256): 0x40, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 4
-// test(uint256[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A01
-// reenc(uint256[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A01
-// test(uint256[][],uint256,uint256): 0x60, 0, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A02
-// reenc(uint256[][],uint256,uint256): 0x60, 0, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A02
-// test(uint256[][],uint256,uint256): 0x60, 0, 2, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A03
-// reenc(uint256[][],uint256,uint256): 0x60, 0, 2, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0A03
-// test(uint256[][],uint256,uint256): 0x60, 1, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B01
-// reenc(uint256[][],uint256,uint256): 0x60, 1, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B01
-// test(uint256[][],uint256,uint256): 0x60, 1, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B02
-// reenc(uint256[][],uint256,uint256): 0x60, 1, 1, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B02
-// test(uint256[][],uint256,uint256): 0x60, 1, 2, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B03
-// reenc(uint256[][],uint256,uint256): 0x60, 1, 2, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B03
-// test(uint256[][],uint256,uint256): 0x60, 1, 3, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B04
-// reenc(uint256[][],uint256,uint256): 0x60, 1, 3, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 0x0B04
-// test(uint256[][],uint256,uint256): 0x60, 0, 3, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256[][],uint256,uint256): 0x60, 1, 4, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> FAILURE, hex"4e487b71", 0x32
-// test(uint256[][],uint256): 0x40, 2, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
deleted file mode 100644
index d6ff4679fe7f..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(bytes[] calldata a, uint256 i) external returns (uint) {
-        return uint8(a[0][i]);
-    }
-}
-// ----
-// f(bytes[],uint256): 0x40, 0, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> 0x61
-// f(bytes[],uint256): 0x40, 1, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> 0x62
-// f(bytes[],uint256): 0x40, 2, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/calldata_slice_access.sol b/test/libsolidity/semanticTests/array/calldata_slice_access.sol
deleted file mode 100644
index 76af2214f429..000000000000
--- a/test/libsolidity/semanticTests/array/calldata_slice_access.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract C {
-    function f(uint256[] calldata x, uint256 start, uint256 end) external pure {
-        x[start:end];
-    }
-    function g(uint256[] calldata x, uint256 start, uint256 end, uint256 index) external pure returns (uint256, uint256, uint256) {
-        return (x[start:end][index], x[start:][0:end-start][index], x[:end][start:][index]);
-    }
-}
-// ----
-// f(uint256[],uint256,uint256): 0x80, 0, 0, 0, 1, 42 ->
-// f(uint256[],uint256,uint256): 0x80, 0, 1, 0, 1, 42 ->
-// f(uint256[],uint256,uint256): 0x80, 0, 2, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 1, 0, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 1, 1, 0, 1, 42 ->
-// f(uint256[],uint256,uint256): 0x80, 1, 2, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 2, 0, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 2, 1, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 2, 2, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 0, 2, 1, 0, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, 1, 2, 0, 2, 42, 23 ->
-// f(uint256[],uint256,uint256): 0x80, 1, 3, 0, 2, 42, 23 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, -1, 0, 0, 1, 42 -> FAILURE
-// f(uint256[],uint256,uint256): 0x80, -1, -1, 0, 1, 42 -> FAILURE
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 0, 1, 42 -> 42, 42, 42
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 1, 1, 42 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 0, 0, 1, 42 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 1, 1, 0, 1, 42 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4201, 0x4201, 0x4201
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 5, 4, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 5, 5, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 1, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4202, 0x4202, 0x4202
-// g(uint256[],uint256,uint256,uint256): 0x80, 1, 5, 3, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
-// g(uint256[],uint256,uint256,uint256): 0x80, 1, 5, 4, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
-// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 5, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4201, 0x4201, 0x4201
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4201, 0x4201, 0x4201
-// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 1, 2, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4202, 0x4202, 0x4202
-// g(uint256[],uint256,uint256,uint256): 0x80, 1, 2, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
-// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
-// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
deleted file mode 100644
index 84c5621161a2..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f(bytes memory a, bytes memory b) public returns (bytes memory) {
-        return bytes.concat(a, b);
-    }
-}
-// ----
-// f(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
-//
-// f(bytes,bytes):
-//   0x40, 0xa0, 64, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef"
-//   ->
-//   0x20, 69, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
-// f(bytes,bytes): 0x40, 0x80, 3, "abc", 3, "def" -> 0x20, 6, "abcdef"
-//
-// f(bytes,bytes):
-//  0x40, 0xa0, 34, "abcdabcdabcdabcdabcdabcdabcdabcd", "ab", 30, "cdabcdabcdabcdabcdabcdabcdabcd"
-//  ->
-//  0x20, 64, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd"
-//
-// f(bytes,bytes):
-//  0x40, 0xa0, 34, "abcdabcdabcdabcdabcdabcdabcdabcd", "ab", 34, "cdabcdabcdabcdabcdabcdabcdabcdab", "cd"
-//  ->
-//  0x20, 68, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", "abcd"
-//
-// f(bytes,bytes):
-//   0x40, 0x80, 3, "abc", 30, "dabcdabcdabcdabcdabcdabcdabcda"
-//   ->
-//   0x20, 33, "abcdabcdabcdabcdabcdabcdabcdabcd", "a"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
deleted file mode 100644
index d6b9e37678a8..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bytes memory a, bytes memory b, bytes memory c) public returns (bytes memory) {
-        return bytes.concat(a, b, c);
-    }
-}
-// ----
-// f(bytes,bytes,bytes): 0x60, 0xa0, 0xe0, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef", 3, "abc" -> 0x20, 40, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdefabc"
-// f(bytes,bytes,bytes): 0x60, 0xa0, 0xe0, 3, "abc", 2, "de", 3, "fgh" -> 0x20, 8, "abcdefgh"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
deleted file mode 100644
index 030a959a5281..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(bytes memory a, bytes memory b) public returns (bytes32) {
-        return keccak256(bytes.concat(a, b));
-    }
-
-    function h(bytes memory a) internal returns (uint256) {
-        return a.length;
-    }
-
-    function g(bytes memory a, bytes memory b) public returns (uint256) {
-        return h(bytes.concat(a, b));
-    }
-}
-// ----
-// f(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x1106e19b6f06d1cce71c2d816754f83dfa5b95df958c5cbf12b7c472320c427c
-// g(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 37
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol
deleted file mode 100644
index a6b7f5737309..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol
+++ /dev/null
@@ -1,73 +0,0 @@
-contract C {
-    bytes s = "bcdef";
-
-    function f(bytes memory a) public returns (bytes memory) {
-        return bytes.concat(a, "bcdef");
-    }
-    function g(bytes calldata a) public returns (bytes memory) {
-        return bytes.concat(a, "abcdefghabcdefghabcdefghabcdefghab");
-    }
-    function h(bytes calldata a) public returns (bytes memory) {
-        return bytes.concat(a, s);
-    }
-    function j(bytes calldata a) public returns (bytes memory) {
-        bytes storage ref = s;
-        return bytes.concat(a, ref, s);
-    }
-    function k(bytes calldata a, string memory b) public returns (bytes memory) {
-        return bytes.concat(a, bytes(b));
-    }
-    function slice(bytes calldata a) public returns (bytes memory) {
-        require(a.length > 2, "");
-        return bytes.concat(a[:2], a[2:]);
-    }
-    function strParam(string calldata a) public returns (bytes memory) {
-        return bytes.concat(bytes(a), "bcdef");
-    }
-    function fixedBytesParam(bytes16 b1, bytes15 b2, bytes31 b3) public returns (
-        bytes memory,
-        bytes memory,
-        bytes memory,
-        bytes memory
-    ) {
-        return (
-            bytes.concat(b1, b2),
-            bytes.concat(b1, b3),
-            bytes.concat(b1, "bcdef"),
-            bytes.concat(b1, s)
-        );
-    }
-    function fixedBytesParam2(bytes calldata c, bytes6 b1, bytes6 b2) public returns (bytes memory, bytes memory) {
-        return (
-            bytes.concat(s, b1, c),
-            bytes.concat(b1, c, b2)
-        );
-    }
-}
-// ====
-// revertStrings: debug
-// ----
-// f(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
-// g(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 66, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdefghabcdefghabcdefghabcdefgh", "ab"
-// h(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
-// j(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 42, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdefbcdef"
-// k(bytes,string): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
-// slice(bytes): 0x20, 4, "abcd" -> 0x20, 4, "abcd"
-// strParam(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
-// fixedBytesParam(bytes16,bytes15,bytes31):
-//  "aabbccddeeffgghh",
-//  "abcdefghabcdefg",
-//  "0123456789012345678901234567890" ->
-//  0x80, 0xc0, 0x120, 0x160,
-//  31, "aabbccddeeffgghhabcdefghabcdefg",
-//  47, "aabbccddeeffgghh0123456789012345", "678901234567890",
-//  21, "aabbccddeeffgghhbcdef",
-//  21, "aabbccddeeffgghhbcdef"
-// fixedBytesParam2(bytes,bytes6,bytes6): 0x60, left(0x010203040506), left(0x0708090A0B0C), 20, left(0x1011121314151617181920212223242526272829) ->
-//   0x40, 0x80,
-//   31, left(0x62636465660102030405061011121314151617181920212223242526272829),
-//   32, 0x01020304050610111213141516171819202122232425262728290708090A0B0C
-// fixedBytesParam2(bytes,bytes6,bytes6): 0x60, left(0x01), left(0x02), 5, left(0x03) ->
-//   0x40, 0x80,
-//   16, left(0x6263646566010000000000030000000000),
-//   17, left(0x010000000000030000000002000000000000)
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
deleted file mode 100644
index 7041ff8513b5..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bytes memory) {
-        return bytes.concat();
-    }
-}
-// ----
-// f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
deleted file mode 100644
index 10d31162cb42..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function f() public returns (bytes memory) {
-        bytes memory b = "";
-        return bytes.concat(
-            bytes.concat(b),
-            bytes.concat(b, b),
-            bytes.concat("", b),
-            bytes.concat(b, "")
-        );
-    }
-
-    function g() public returns (bytes memory) {
-        return bytes.concat("", "abc", hex"", "abc", unicode"");
-    }
-
-    function h() public returns (bytes memory) {
-        bytes memory b = "";
-        return bytes.concat(b, "abc", b, "abc", b);
-    }
-}
-// ----
-// f() -> 0x20, 0
-// g() -> 0x20, 6, "abcabc"
-// h() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
deleted file mode 100644
index f4190322f4b6..000000000000
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes memory a, bytes memory b, bytes memory c) public returns (bytes memory) {
-        return bytes.concat(bytes.concat(a, b), c);
-    }
-}
-// ----
-// f(bytes,bytes,bytes): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
deleted file mode 100644
index ca65f070657c..000000000000
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    uint256 constant LEN = 3;
-    uint256[LEN] public a;
-
-    constructor(uint256[LEN] memory _a) {
-        a = _a;
-    }
-}
-// ----
-// constructor(): 1, 2, 3 ->
-// gas irOptimized: 139656
-// gas legacy: 180517
-// gas legacyOptimized: 150462
-// a(uint256): 0 -> 1
-// a(uint256): 1 -> 2
-// a(uint256): 2 -> 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
deleted file mode 100644
index 80ecd3e1cef4..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract c {
-    uint[9] m_data;
-    uint[] m_data_dyn;
-    uint8[][] m_byte_data;
-    function store(uint[9] calldata a, uint8[3][] calldata b) external returns (uint8) {
-        m_data = a;
-        m_data_dyn = a;
-        m_byte_data = b;
-        return b[3][1]; // note that access and declaration are reversed to each other
-    }
-    function retrieve() public returns (uint a, uint b, uint c, uint d, uint e, uint f, uint g) {
-        a = m_data.length;
-        b = m_data[7];
-        c = m_data_dyn.length;
-        d = m_data_dyn[7];
-        e = m_byte_data.length;
-        f = m_byte_data[3].length;
-        g = m_byte_data[3][1];
-    }
-}
-// ----
-// store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 648315
-// gas legacy: 694356
-// gas legacyOptimized: 693864
-// retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
deleted file mode 100644
index 761feebec9d5..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// Test to see if cleanup is performed properly during array copying
-contract C {
-    uint128[] x;
-    function f() public returns(bool) {
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        uint128[] memory y = new uint128[](1);
-        y[0] = 23;
-        x = y;
-        assembly { sstore(x.slot, 4) }
-
-        assert(x[0] == 23);
-        assert(x[1] == 0);
-
-        assert(x[2] == 0);
-        // Issue 9832: the cleanup was only performed for the first packed type leaving the rest of
-        // the slot dirty.
-        assert(x[3] == 0);
-
-        return true;
-    }
-}
-// ----
-// f() -> true
-// gas irOptimized: 92740
-// gas legacy: 93035
-// gas legacyOptimized: 92257
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
deleted file mode 100644
index 600f00a98110..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-// Issue 9832: Test to see if cleanup is performed properly after array copying
-contract C {
-    uint40[] x;
-    function f() public returns(bool) {
-
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        x.push(42); x.push(42); x.push(42); x.push(42);
-
-        uint40[] memory y = new uint40[](1);
-        y[0] = 23;
-        x = y;
-
-        assembly { sstore(x.slot, 20) }
-
-        assert(x[0] == 23);
-        assert(x[1] == 0);
-        assert(x[2] == 0);
-        assert(x[3] == 0);
-
-        assert(x[4] == 0);
-        assert(x[5] == 0);
-        assert(x[6] == 0);
-        assert(x[7] == 0);
-
-        assert(x[8] == 0);
-        assert(x[9] == 0);
-        assert(x[10] == 0);
-        assert(x[11] == 0);
-
-        assert(x[12] == 0);
-        assert(x[13] == 0);
-        assert(x[14] == 0);
-        assert(x[15] == 0);
-
-        assert(x[16] == 0);
-        assert(x[17] == 0);
-        assert(x[18] == 0);
-        assert(x[19] == 0);
-
-        return true;
-
-    }
-}
-// ----
-// f() -> true
-// gas irOptimized: 117264
-// gas legacy: 124660
-// gas legacyOptimized: 122801
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
deleted file mode 100644
index 0bdcda1d9e7f..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    uint256[] x;
-    function f() public returns(uint256) {
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        uint256[] memory y = new uint256[](1);
-        y[0] = 23;
-        x = y;
-        assembly { sstore(x.slot, 4) }
-        assert(x[1] == 0);
-        assert(x[2] == 0);
-        return x[3];
-    }
-}
-// ----
-// f() -> 0
-// gas irOptimized: 107453
-// gas legacy: 108218
-// gas legacyOptimized: 107625
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
deleted file mode 100644
index 13cb9c28fd26..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract C {
-    uint128[] x;
-    uint64[] x1;
-    uint120[] x2;
-    function f() public returns(uint128) {
-        x.push(42); x.push(42); x.push(42); x.push(42);
-        uint128[] memory y = new uint128[](1);
-        y[0] = 23;
-        x = y;
-        assembly { sstore(x.slot, 4) }
-        assert(x[0] == 23);
-        assert(x[2] == 0);
-        assert(x[3] == 0);
-        return x[1];
-    }
-
-    function g() public returns(uint64) {
-        x1.push(42); x1.push(42); x1.push(42); x1.push(42);
-        uint64[] memory y = new uint64[](1);
-        y[0] = 23;
-        x1 = y;
-        assembly { sstore(x1.slot, 4) }
-        assert(x1[0] == 23);
-        assert(x1[2] == 0);
-        assert(x1[3] == 0);
-        return x1[1];
-    }
-
-    function h() public returns(uint120) {
-        x2.push(42); x2.push(42); x2.push(42); x2.push(42);
-        uint120[] memory y = new uint120[](1);
-        y[0] = 23;
-        x2 = y;
-        assembly { sstore(x2.slot, 4) }
-        assert(x2[0] == 23);
-        assert(x2[2] == 0);
-        assert(x2[3] == 0);
-        return x2[1];
-    }
-}
-// ----
-// f() -> 0
-// gas irOptimized: 92800
-// gas legacy: 93006
-// gas legacyOptimized: 92261
-// g() -> 0
-// h() -> 0
-// gas irOptimized: 92862
-// gas legacy: 93028
-// gas legacyOptimized: 92303
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
deleted file mode 100644
index 6e81269d8a50..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract c {
-    bytes8[] data1; // 4 per slot
-    bytes10[] data2; // 3 per slot
-
-    function test()
-        public
-        returns (bytes10 a, bytes10 b, bytes10 c, bytes10 d, bytes10 e)
-    {
-        data1 = new bytes8[](9);
-        for (uint256 i = 0; i < data1.length; ++i) data1[i] = bytes8(uint64(i));
-        data2 = data1;
-        a = data2[1];
-        b = data2[2];
-        c = data2[3];
-        d = data2[4];
-        e = data2[5];
-    }
-}
-// ----
-// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 207889
-// gas legacy: 220707
-// gas legacyOptimized: 220098
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
deleted file mode 100644
index 385f2ecfbf1e..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract c {
-    uint[3][90][] large;
-    uint[3][3][] small;
-    function test() public returns (uint r) {
-        for (uint i = 0; i < 7; i++) {
-            large.push();
-            small.push();
-        }
-        large[3][2][0] = 2;
-        large[1] = large[3];
-        small[3][2][0] = 2;
-        small[1] = small[2];
-        r = ((
-            small[3][2][0] * 0x100 |
-            small[1][2][0]) * 0x100 |
-            large[3][2][0]) * 0x100 |
-            large[1][2][0];
-        delete small;
-        delete large;
-
-    }
-    function clear() public returns (uint, uint) {
-        for (uint i = 0; i < 7; i++) {
-            large.push();
-            small.push();
-        }
-        small[3][2][0] = 0;
-        large[3][2][0] = 0;
-        while (small.length > 0)
-            small.pop();
-        while (large.length > 0)
-            large.pop();
-        return (small.length, large.length);
-    }
-}
-// ----
-// test() -> 0x02000202
-// gas irOptimized: 4547793
-// gas legacy: 4475396
-// gas legacyOptimized: 4447665
-// storageEmpty -> 1
-// clear() -> 0, 0
-// gas irOptimized: 4474777
-// gas legacy: 4407188
-// gas legacyOptimized: 4381336
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
deleted file mode 100644
index 205920f65c4f..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    uint128[13] unused;
-    uint32[] a;
-    uint32[3] b;
-    function f() public returns (uint32, uint256) {
-        uint32[] memory m = new uint32[](3);
-        m[0] = 1;
-        m[1] = 2;
-        m[2] = 3;
-        a = m;
-        assert(a[0] == m[0]);
-        assert(a[1] == m[1]);
-        assert(a[2] == m[2]);
-        return (a[0], a.length);
-    }
-    function g() public returns (uint32, uint32, uint32) {
-        uint32[3] memory m;
-        m[0] = 1; m[1] = 2; m[2] = 3;
-        a = m;
-        b = m;
-        assert(a[0] == b[0] && a[1] == b[1] && a[2] == b[2]);
-        assert(a.length == b.length);
-        return (a[0], b[1], a[2]);
-    }
-}
-// ----
-// f() -> 1, 3
-// g() -> 1, 2, 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
deleted file mode 100644
index 737e4b32bc1d..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract c {
-    uint256[4][] a;
-    uint256[10][] b;
-    uint256[][] c;
-
-    function test(uint256[2][] calldata d) external returns (uint256) {
-        a = d;
-        b = a;
-        c = b;
-        return c[1][1] | c[1][2] | c[1][3] | c[1][4];
-    }
-}
-// ----
-// test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689656
-// gas legacy: 686178
-// gas legacyOptimized: 685628
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
deleted file mode 100644
index 335afd0ac45e..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-// NOTE: This does not really test copying from storage to ABI directly,
-// because it will always copy to memory first.
-contract c {
-    int16[] x;
-
-    function test() public returns (int16[] memory) {
-        x.push(int16(-1));
-        x.push(int16(-1));
-        x.push(int16(8));
-        x.push(int16(-16));
-        x.push(int16(-2));
-        x.push(int16(6));
-        x.push(int16(8));
-        x.push(int16(-1));
-        return x;
-    }
-}
-// ----
-// test() -> 0x20, 0x8, -1, -1, 8, -16, -2, 6, 8, -1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
deleted file mode 100644
index d477dc6cf978..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract c {
-    uint64[] data1;
-    uint256[] data2;
-
-    function test() public returns (uint256 x, uint256 y) {
-        data2.push(11);
-        data1.push(0);
-        data1.push(1);
-        data1.push(2);
-        data1.push(3);
-        data1.push(4);
-        data2 = data1;
-        assert(data1[0] == data2[0]);
-        x = data2.length;
-        y = data2[4];
-    }
-}
-// ----
-// test() -> 5, 4
-// gas irOptimized: 205044
-// gas legacy: 213863
-// gas legacyOptimized: 212902
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
deleted file mode 100644
index 0571195861b7..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract c {
-    uint48[5][2] data1;
-    uint120[6][3] data2;
-
-    function test() public returns (uint256 x, uint120 y) {
-        data2[0][0] = 11;
-        data2[1][0] = 22;
-        data2[2][0] = 33;
-
-        data1[0][0] = 0;
-        data1[0][1] = 1;
-        data1[0][2] = 2;
-        data1[0][3] = 3;
-        data1[0][4] = 4;
-        data1[1][0] = 3;
-        data2 = data1;
-        assert(data1[0][1] == data2[0][1]);
-        x = data2.length;
-        y = data2[0][4];
-    }
-}
-// ----
-// test() -> 3, 4
-// gas irOptimized: 169565
-// gas legacy: 175424
-// gas legacyOptimized: 172535
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
deleted file mode 100644
index 99dd1ca934ff..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-
-contract c {
-    uint[] data1;
-    uint[] data2;
-    function setData1(uint length, uint index, uint value) public {
-        data1 = new uint[](length);
-        if (index < length)
-            data1[index] = value;
-    }
-    function copyStorageStorage() public { data2 = data1; }
-    function getData2(uint index) public returns (uint len, uint val) {
-        len = data2.length; if (index < len) val = data2[index];
-    }
-}
-// ----
-// setData1(uint256,uint256,uint256): 10, 5, 4 ->
-// copyStorageStorage() ->
-// gas irOptimized: 111348
-// gas legacy: 109272
-// gas legacyOptimized: 109262
-// getData2(uint256): 5 -> 10, 4
-// setData1(uint256,uint256,uint256): 0, 0, 0 ->
-// copyStorageStorage() ->
-// getData2(uint256): 0 -> 0, 0
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
deleted file mode 100644
index 30173409eb77..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract c {
-    uint256[] data1;
-    uint256[] data2;
-
-    function test() public returns (uint256 x, uint256 y) {
-        data2.push(11);
-        data1.push(0);
-        data1.push(1);
-        data1.push(2);
-        data1.push(3);
-        data1.push(4);
-        data2 = data1;
-        assert(data1[0] == data2[0]);
-        x = data2.length;
-        y = data2[4];
-    }
-}
-// ----
-// test() -> 5, 4
-// gas irOptimized: 252929
-// gas legacy: 250892
-// gas legacyOptimized: 250046
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
deleted file mode 100644
index 971469dec64f..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract c {
-    uint256[9] data1;
-    uint256[] data2;
-
-    function test() public returns (uint256 x, uint256 y) {
-        data1[8] = 4;
-        data2 = data1;
-        x = data2.length;
-        y = data2[8];
-    }
-}
-// ----
-// test() -> 9, 4
-// gas irOptimized: 123135
-// gas legacy: 123567
-// gas legacyOptimized: 123202
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
deleted file mode 100644
index 2fccff774e94..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    bytes1[2] data1;
-    bytes2[2] data2;
-    function test() public returns (bytes2, bytes2) {
-        uint i;
-        for (i = 0; i < data1.length; ++i)
-            data1[i] = bytes1(uint8(1 + i));
-        data2 = data1;
-        return (data2[0], data2[1]);
-    }
-}
-// ----
-// test() -> left(0x01), left(0x02)
-// gas legacy: 90001
-// gas legacyOptimized: 89085
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
deleted file mode 100644
index 0d613e5e946b..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract c {
-    uint256[40] data1;
-    uint256[20] data2;
-
-    function test() public returns (uint256 x, uint256 y) {
-        data1[30] = 4;
-        data1[2] = 7;
-        data1[3] = 9;
-        data2[3] = 8;
-        data1 = data2;
-        x = data1[3];
-        y = data1[30]; // should be cleared
-    }
-}
-// ----
-// test() -> 8, 0
-// gas irOptimized: 196259
-// gas legacy: 194843
-// gas legacyOptimized: 194281
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
deleted file mode 100644
index cfb623393c87..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract c {
-    struct Data { uint x; uint y; }
-    Data[] data1;
-    Data[] data2;
-    function test() public returns (uint x, uint y) {
-        while (data1.length < 9)
-            data1.push();
-        data1[8].x = 4;
-        data1[8].y = 5;
-        data2 = data1;
-        x = data2[8].x;
-        y = data2[8].y;
-        while (data1.length > 0)
-            data1.pop();
-        data2 = data1;
-    }
-}
-// ----
-// test() -> 4, 5
-// gas irOptimized: 190694
-// gas legacy: 190852
-// gas legacyOptimized: 189658
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
deleted file mode 100644
index 8bc6b86a294e..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint[] a;
-    function f() public returns (uint, uint) {
-        a.push(1); a.push(0); a.push(0);
-        uint[] memory b = a;
-        return (b[0], b.length);
-    }
-}
-// ----
-// f() -> 1, 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
deleted file mode 100644
index 6bd31ca5af46..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-contract C {
-    uint[][] a;
-
-    function f() public returns (uint[][] memory) {
-        a.push();
-        a.push();
-        a[0].push(0);
-        a[0].push(1);
-        a[1].push(2);
-        a[1].push(3);
-        uint[][] memory m = a;
-        return m;
-    }
-}
-// ----
-// f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161624
-// gas legacy: 162203
-// gas legacyOptimized: 159934
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
deleted file mode 100644
index 10a48a18c574..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract c {
-    bytes1[10] data1;
-    bytes2[32] data2;
-    function test() public returns (uint check, uint res1, uint res2) {
-        uint i;
-        for (i = 0; i < data2.length; ++i)
-            data2[i] = 0xffff;
-        check = uint(uint16(data2[31])) * 0x10000 | uint(uint16(data2[14]));
-        for (i = 0; i < data1.length; ++i)
-            data1[i] = bytes1(uint8(1 + i));
-        data2 = data1;
-        for (i = 0; i < 16; ++i)
-            res1 |= uint(uint16(data2[i])) * 0x10000**i;
-        for (i = 0; i < 16; ++i)
-            res2 |= uint(uint16(data2[16 + i])) * 0x10000**i;
-    }
-}
-// ----
-// test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 100980
-// gas legacy: 158142
-// gas legacyOptimized: 141096
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
deleted file mode 100644
index 0a2bcffce201..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-// since the copy always copies whole slots, we have to make sure that the source size maxes
-// out a whole slot and at the same time there are still elements left in the target at that point
-contract c {
-    bytes8[4] data1; // fits into one slot
-    bytes10[6] data2; // 4 elements need two slots
-
-    function test() public returns (bytes10 r1, bytes10 r2, bytes10 r3) {
-        data1[0] = bytes8(uint64(1));
-        data1[1] = bytes8(uint64(2));
-        data1[2] = bytes8(uint64(3));
-        data1[3] = bytes8(uint64(4));
-        for (uint256 i = 0; i < data2.length; ++i)
-            data2[i] = bytes10(uint80(0xffff00 | (1 + i)));
-        data2 = data1;
-        r1 = data2[3];
-        r2 = data2[4];
-        r3 = data2[5];
-    }
-}
-// ----
-// test() -> 0x04000000000000000000000000000000000000000000000000, 0x0, 0x0
-// gas irOptimized: 93858
-// gas legacy: 97451
-// gas legacyOptimized: 94200
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
deleted file mode 100644
index a839e3bb44b2..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract c {
-    bytes8[9] data1; // 4 per slot
-    bytes17[10] data2; // 1 per slot, no offset counter
-
-    function test()
-        public
-        returns (bytes17 a, bytes17 b, bytes17 c, bytes17 d, bytes17 e)
-    {
-        for (uint256 i = 0; i < data1.length; ++i) data1[i] = bytes8(uint64(i));
-        data2[8] = data2[9] = bytes8(uint64(2));
-        data2 = data1;
-        a = data2[1];
-        b = data2[2];
-        c = data2[3];
-        d = data2[4];
-        e = data2[9];
-    }
-}
-// ----
-// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 273372
-// gas legacy: 282604
-// gas legacyOptimized: 281510
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
deleted file mode 100644
index f9e1cbd27ef1..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract c {
-    bytes9[7] data1; // 3 per slot
-    bytes32[10] data2; // 1 per slot
-
-    function test()
-        public
-        returns (bytes32 a, bytes32 b, bytes32 c, bytes32 d, bytes32 e)
-    {
-        for (uint256 i = 0; i < data1.length; ++i) data1[i] = bytes8(uint64(i));
-        data2[8] = data2[9] = bytes8(uint64(2));
-        data2 = data1;
-        a = data2[1];
-        b = data2[2];
-        c = data2[3];
-        d = data2[4];
-        e = data2[9];
-    }
-}
-// ----
-// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 233118
-// gas legacy: 235697
-// gas legacyOptimized: 235193
diff --git a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
deleted file mode 100644
index b1e8659be8df..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    mapping (uint => uint8[][]) m;
-
-    uint8[][] s;
-
-    constructor() {
-        s = new uint8[][](2);
-
-        s[0] = new uint8[](2);
-        s[0][0] = 10;
-        s[0][1] = 11;
-
-        s[1] = new uint8[](3);
-        s[1][0] = 12;
-        s[1][1] = 13;
-        s[1][2] = 14;
-    }
-
-    function from_storage() public returns (uint8[][] memory) {
-        m[0] = new uint8[][](2);
-        m[0][0] = s[0];
-        m[0][1] = s[1];
-        return m[0];
-    }
-
-
-    function from_storage_ptr() public returns (uint8[][] memory) {
-        uint8[][] storage sPtr = s;
-        m[0] = new uint8[][](2);
-        m[0][0] = sPtr[0];
-        m[0][1] = sPtr[1];
-        return m[0];
-    }
-
-
-    function from_memory() public returns (uint8[][] memory) {
-        uint8[][] memory a = s;
-        m[0] = new uint8[][](2);
-        m[0][0] = a[0];
-        m[0][1] = a[1];
-        return m[0];
-    }
-
-    function from_calldata(uint8[][] calldata _a) public returns (uint8[][] memory) {
-        m[0] = new uint8[][](2);
-        m[0][0] = _a[0];
-        m[0][1] = _a[1];
-        return m[0];
-    }
-}
-// ----
-// from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 150004
-// gas legacy: 150745
-// gas legacyOptimized: 148678
-// from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
deleted file mode 100644
index 8e92d05f744d..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder v2;
-
-contract c {
-    function test1(uint256[][] calldata c) external returns (uint256, uint256) {
-        uint256[][] memory a1 = c;
-        assert(a1[0][0] == c[0][0]);
-        assert(a1[0][1] == c[0][1]);
-        return (a1.length, a1[0][0] + a1[1][1]);
-    }
-
-    function test2(uint256[][2] calldata c) external returns (uint256, uint256) {
-        uint256[][2] memory a2 = c;
-        assert(a2[0][0] == c[0][0]);
-        assert(a2[0][1] == c[0][1]);
-        return (a2[0].length, a2[0][0] + a2[1][1]);
-    }
-
-    function test3(uint256[2][] calldata c) external returns (uint256, uint256) {
-        uint256[2][] memory a3 = c;
-        assert(a3[0][0] == c[0][0]);
-        assert(a3[0][1] == c[0][1]);
-        return (a3.length, a3[0][0] + a3[1][1]);
-    }
-
-    function test4(uint256[2][2] calldata c) external returns (uint256) {
-        uint256[2][2] memory a4 = c;
-        assert(a4[0][0] == c[0][0]);
-        assert(a4[0][1] == c[0][1]);
-        return (a4[0][0] + a4[1][1]);
-    }
-}
-// ----
-// test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// test4(uint256[2][2]): 23, 42, 23, 42 -> 65
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
deleted file mode 100644
index 919e83298675..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-pragma abicoder               v2;
-
-contract c {
-    uint256[][] a1;
-    uint256[][2] a2;
-    uint256[2][] a3;
-    uint256[2][2] a4;
-
-    function test1(uint256[][] calldata c) external returns (uint256, uint256) {
-        a1 = c;
-        assert(a1[0][0] == c[0][0]);
-        assert(a1[0][1] == c[0][1]);
-        return (a1.length, a1[0][0] + a1[1][1]);
-    }
-
-    function test2(uint256[][2] calldata c) external returns (uint256, uint256) {
-        a2 = c;
-        assert(a2[0][0] == c[0][0]);
-        assert(a2[0][1] == c[0][1]);
-        return (a2[0].length, a2[0][0] + a2[1][1]);
-    }
-
-    function test3(uint256[2][] calldata c) external returns (uint256, uint256) {
-        a3 = c;
-        assert(a3[0][0] == c[0][0]);
-        assert(a3[0][1] == c[0][1]);
-        return (a3.length, a3[0][0] + a3[1][1]);
-    }
-
-    function test4(uint256[2][2] calldata c) external returns (uint256) {
-        a4 = c;
-        assert(a4[0][0] == c[0][0]);
-        assert(a4[0][1] == c[0][1]);
-        return (a4[0][0] + a4[1][1]);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 180716
-// test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157544
-// test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134634
-// test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111252
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
deleted file mode 100644
index eb4b1bbb9aab..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-contract Test {
-    uint128[13] unused;
-    uint256[][] a;
-    uint256[4][] b;
-    uint256[2][3] c;
-
-    function test() external returns (uint256) {
-        uint256[][] memory m = new uint256[][](2);
-        m[0] = new uint256[](3);
-        m[0][0] = 7; m[0][1] = 8; m[0][2] = 9;
-        m[1] = new uint256[](4);
-        m[1][1] = 7; m[1][2] = 8; m[1][3] = 9;
-        a = m;
-        return a[0][0] + a[0][1] + a[1][3];
-    }
-
-    function test1() external returns (uint256) {
-        uint256[2][] memory m = new uint256[2][](1);
-        m[0][0] = 1; m[0][1] = 2;
-        b = m;
-        return b[0][0] + b[0][1];
-    }
-
-    function test2() external returns (uint256) {
-        uint256[2][2] memory m;
-        m[0][0] = 1; m[1][1] = 2; m[0][1] = 3;
-        c = m;
-        return c[0][0] + c[1][1] + c[0][1];
-    }
-
-    function test3() external returns (uint256) {
-        uint256[2][3] memory m;
-        m[0][0] = 7; m[1][0] = 8; m[2][0] = 9;
-        m[0][1] = 7; m[1][1] = 8; m[2][1] = 9;
-        a = m;
-        return a[0][0] + a[1][0] + a[2][1];
-    }
-}
-// ----
-// test() -> 24
-// gas irOptimized: 226666
-// gas legacy: 227084
-// gas legacyOptimized: 226529
-// test1() -> 3
-// test2() -> 6
-// test3() -> 24
-// gas irOptimized: 141225
-// gas legacy: 142238
-// gas legacyOptimized: 141365
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
deleted file mode 100644
index ebaada764708..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint256[][] a1;
-    uint256[][2] a2;
-    uint256[2][] a3;
-    uint256[2][2] a4;
-
-    constructor() {
-        a1 = new uint256[][](2);
-        a1[0] = [1, 2];
-        a1[1] = [3, 4, 5];
-
-        a2[0] = [6, 7, 8];
-        a2[1] = [9];
-
-        a3.push([1, 2]);
-        a3.push([3, 4]);
-        a3.push([5, 6]);
-
-        a4 = [[10, 11], [12, 13]];
-    }
-
-    function test1() external returns (uint256[][] memory) {
-        return a1;
-    }
-
-    function test2() external returns (uint256[][2] memory) {
-        return a2;
-    }
-
-    function test3() external returns (uint256[2][] memory) {
-        return a3;
-    }
-
-    function test4() external returns (uint256[2][2] memory) {
-        return a4;
-    }
-}
-// ----
-// test1() -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 3, 3, 4, 5
-// test2() -> 0x20, 0x40, 0xc0, 3, 6, 7, 8, 1, 9
-// test3() -> 0x20, 3, 1, 2, 3, 4, 5, 6
-// test4() -> 10, 11, 12, 13
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
deleted file mode 100644
index 01329504d2a9..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-contract C {
-    function testFunction1() public {}
-    function testFunction2() public {}
-    function testFunction3() public {}
-
-
-    function() external [] externalArray0;
-    function() external [] externalArray1;
-
-    function() internal [] internalArray0;
-    function() internal [] internalArray1;
-
-    constructor() {
-        externalArray0 = new function() external[] (3);
-        externalArray1 = [
-            this.testFunction1,
-            this.testFunction2,
-            this.testFunction3
-        ];
-
-        internalArray0 = new function() internal[] (3);
-        internalArray1 = [
-            testFunction1,
-            testFunction2,
-            testFunction3
-        ];
-    }
-
-    function copyExternalStorageArrayOfFunctionType() external returns (bool) {
-        assert(keccak256(abi.encode(externalArray0)) != keccak256(abi.encode(externalArray1)));
-        externalArray0 = externalArray1;
-        return keccak256(abi.encode(externalArray0)) == keccak256(abi.encode(externalArray1));
-    }
-
-    function copyInternalArrayOfFunctionType() external returns (bool) {
-        internalArray0 = internalArray1;
-        assert(internalArray0.length == 3);
-
-        return
-            internalArray0.length == internalArray1.length &&
-            internalArray0[0] == internalArray1[0] &&
-            internalArray0[1] == internalArray1[1] &&
-            internalArray0[2] == internalArray1[2];
-    }
-}
-// ----
-// copyExternalStorageArrayOfFunctionType() -> true
-// gas irOptimized: 104592
-// gas legacy: 108554
-// gas legacyOptimized: 102413
-// copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
deleted file mode 100644
index 50756d0b0c3d..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract C {
-    function testFunction1() public {}
-    function testFunction2() public view {}
-    function testFunction3() public pure {}
-
-
-    function() external [] externalArray0;
-    function() external [] externalArray1;
-
-    function() internal [] internalArray0;
-    function() internal [] internalArray1;
-
-    constructor() {
-        externalArray0 = new function() external[] (3);
-        externalArray1 = [
-            this.testFunction1,
-            this.testFunction2,
-            this.testFunction3
-        ];
-
-        internalArray0 = new function() internal[] (3);
-        internalArray1 = [
-            testFunction1,
-            testFunction2,
-            testFunction3
-        ];
-    }
-
-
-    function copyExternalStorageArraysOfFunctionType() external returns (bool)
-    {
-        assert(keccak256(abi.encodePacked(externalArray0)) != keccak256(abi.encodePacked(externalArray1)));
-        externalArray0 = externalArray1;
-        return keccak256(abi.encodePacked(externalArray0)) == keccak256(abi.encodePacked(externalArray1));
-    }
-
-    function copyInternalArrayOfFunctionType() external returns (bool)
-    {
-        internalArray0 = internalArray1;
-        assert(internalArray0.length == 3);
-
-        return
-            internalArray0.length == internalArray1.length &&
-            internalArray0[0] == internalArray1[0] &&
-            internalArray0[1] == internalArray1[1] &&
-            internalArray0[2] == internalArray1[2];
-    }
-}
-// ----
-// copyExternalStorageArraysOfFunctionType() -> true
-// gas irOptimized: 104265
-// gas legacy: 108295
-// gas legacyOptimized: 102146
-// copyInternalArrayOfFunctionType() -> true
-// gas legacy: 104178
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
deleted file mode 100644
index a43a941a671c..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint128 a;
-        uint64 b;
-        uint128 c;
-    }
-    function f(S[3] calldata c) public returns (uint128, uint64, uint128) {
-        S[3] memory m = c;
-        return (m[2].a, m[1].b, m[0].c);
-    }
-    function g(S[] calldata c) public returns (uint128, uint64, uint128) {
-        S[] memory m = c;
-        return (m[2].a, m[1].b, m[0].c);
-    }
-}
-// ----
-// f((uint128,uint64,uint128)[3]): 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// g((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
deleted file mode 100644
index 546a6e49e48d..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint128 a;
-        uint64 b;
-        uint128 c;
-    }
-    uint128[137] unused;
-    S[] s;
-    function f(S[] calldata c) public returns (uint128, uint64, uint128) {
-        s = c;
-        return (s[2].a, s[1].b, s[0].c);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 119704
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
deleted file mode 100644
index 38e26e480add..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    struct S {
-        uint128 a;
-        uint64 b;
-        uint128 c;
-    }
-    uint128[137] unused;
-    S[] s;
-    function f() public returns (uint128, uint64, uint128) {
-        S[] memory m = new S[](3);
-        m[2].a = 10;
-        m[1].b = 11;
-        m[0].c = 12;
-        s = m;
-        return (s[2].a, s[1].b, s[0].c);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 10, 11, 12
-// gas irOptimized: 118362
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
deleted file mode 100644
index 482cecccc5dc..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint256[] a;
-    }
-
-    function f(S[] calldata c) external returns (uint256, uint256) {
-        S[] memory s = c;
-        assert(s.length == c.length);
-        for (uint i = 0; i < s.length; i++) {
-            assert(s[i].a.length == c[i].a.length);
-            for (uint j = 0; j < s[i].a.length; j++) {
-                assert(s[i].a[j] == c[i].a[j]);
-            }
-        }
-        return (s[1].a.length, s[1].a[0]);
-    }
-}
-// ----
-// f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
deleted file mode 100644
index c6e6c58765ac..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint256[] a;
-    }
-
-    S[] s;
-
-    function f(S[] calldata c) external returns (uint256, uint256) {
-        s = c;
-        assert(s.length == c.length);
-        for (uint i = 0; i < s.length; i++) {
-            assert(s[i].a.length == c[i].a.length);
-            for (uint j = 0; j < s[i].a.length; j++) {
-                assert(s[i].a[j] == c[i].a[j]);
-            }
-        }
-        return (s[1].a.length, s[1].a[0]);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 326771
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
deleted file mode 100644
index 510e7c9a4a62..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint136 p;
-        uint128[3] b;
-        uint128[] c;
-    }
-
-    S[] s;
-
-    function f() external returns (uint256, uint256, uint128, uint128) {
-        S[] memory m = new S[](3);
-        m[1] = S(0, [uint128(1), 2, 3], new uint128[](3));
-        m[1].c[0] = 1;
-        m[1].c[1] = 2;
-        m[1].c[2] = 3;
-        s = m;
-        assert(s.length == m.length);
-        assert(s[1].b[1] == m[1].b[1]);
-        assert(s[1].c[0] == m[1].c[0]);
-        return (s[1].b.length, s[1].c.length, s[1].b[2], s[1].c[0]);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 3, 3, 3, 1
-// gas irOptimized: 181890
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
deleted file mode 100644
index 5c44ef16a54d..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint8[33] a;
-    uint32[9] b;
-    uint120[3] c;
-
-    function f() public returns (uint8, uint32, uint120) {
-        a[32] = 1; a[31] = 2; a[30] = 3;
-        b[0] = 1; b[1] = 2; b[2] = 3;
-        c[2] = 3; c[1] = 1;
-        return (a[32], b[1], c[2]);
-    }
-}
-// ----
-// f() -> 1, 2, 3
-// gas irOptimized: 131915
-// gas legacy: 134606
-// gas legacyOptimized: 131938
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
deleted file mode 100644
index 50ea19a1eab4..000000000000
--- a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    mapping (uint => uint8[][]) m;
-
-    uint8[][] s;
-
-    constructor() {
-        s = new uint8[][](2);
-
-        s[0] = new uint8[](2);
-        s[0][0] = 10;
-        s[0][1] = 11;
-
-        s[1] = new uint8[](3);
-        s[1][0] = 12;
-        s[1][1] = 13;
-        s[1][2] = 14;
-    }
-
-    function from_storage() public returns (uint8[][] memory) {
-        m[0] = s;
-        return m[0];
-    }
-
-    function from_storage_ptr() public returns (uint8[][] memory) {
-        uint8[][] storage sPtr = s;
-        m[0] = sPtr;
-        return m[0];
-    }
-
-    function from_memory() public returns (uint8[][] memory) {
-        uint8[][] memory a = s;
-        m[0] = a;
-        return m[0];
-    }
-}
-// ----
-// from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 147871
-// gas legacy: 148896
-// gas legacyOptimized: 146901
-// from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
deleted file mode 100644
index 0deb396d3d66..000000000000
--- a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Test {
-    uint24[] public data;
-    function set(uint24[] memory _data) public returns (uint) {
-        data = _data;
-        return data.length;
-    }
-    function get() public returns (uint24[] memory) {
-        return data;
-    }
-}
-// ----
-// set(uint24[]): 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 -> 18
-// gas irOptimized: 99616
-// gas legacy: 103509
-// gas legacyOptimized: 101390
-// data(uint256): 7 -> 8
-// data(uint256): 15 -> 16
-// data(uint256): 18 -> FAILURE
-// get() -> 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol b/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
deleted file mode 100644
index 88cb47a57fb9..000000000000
--- a/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes calldata c) public returns (string calldata s) {
-        return string(c);
-    }
-}
-// ----
-// f(bytes): 0x20, 3, "abc" -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
deleted file mode 100644
index 19e5ddebd443..000000000000
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract c {
-    function set(uint key) public returns (bool) { data[key] = msg.data; return true; }
-    function copy(uint from, uint to) public returns (bool) { data[to] = data[from]; return true; }
-    mapping(uint => bytes) data;
-}
-// ----
-// set(uint256): 1, 2 -> true
-// gas irOptimized: 110558
-// gas legacy: 111312
-// gas legacyOptimized: 110741
-// set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177509
-// gas legacy: 178314
-// gas legacyOptimized: 177716
-// storageEmpty -> 0
-// copy(uint256,uint256): 1, 2 -> true
-// storageEmpty -> 0
-// copy(uint256,uint256): 99, 1 -> true
-// storageEmpty -> 0
-// copy(uint256,uint256): 99, 2 -> true
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
deleted file mode 100644
index d1202e27eb07..000000000000
--- a/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  bytes s;
-  function f() external returns (bytes1) {
-    bytes memory data = "abcd";
-    s = data;
-    return s[0];
-  }
-}
-// ----
-// f() -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
deleted file mode 100644
index 84e11c1384b5..000000000000
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  bytes s = "abcd";
-  function f() external returns (bytes1) {
-    bytes memory data = s;
-    return data[0];
-  }
-}
-// ----
-// f() -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
deleted file mode 100644
index 38dbe52bccde..000000000000
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract c {
-    bytes a;
-    bytes b;
-    function f(uint len) public returns (bytes memory) {
-        bytes memory x = new bytes(len);
-        for (uint i = 0; i < len; i++)
-            x[i] = bytes1(uint8(i));
-        a = x;
-        for (uint i = 0; i < len; i++)
-            assert(a[i] == x[i]);
-        b = a;
-        for (uint i = 0; i < len; i++)
-            assert(b[i] == x[i]);
-        return b;
-    }
-}
-// ----
-// f(uint256): 0 -> 0x20, 0x00
-// f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 104476
-// gas legacy: 112974
-// gas legacyOptimized: 112717
-// f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 118962
-// gas legacy: 129034
-// gas legacyOptimized: 128952
-// f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 125419
-// gas legacy: 136234
-// gas legacyOptimized: 135643
-// f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 129529
-// gas legacy: 148834
-// gas legacyOptimized: 148873
-// f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
-// gas legacy: 59345
-// gas legacyOptimized: 57279
-// f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 421911
-// gas legacy: 459355
-// gas legacyOptimized: 461066
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_1d_array_into_2d_memory_array_element.sol b/test/libsolidity/semanticTests/array/copying/calldata_1d_array_into_2d_memory_array_element.sol
deleted file mode 100644
index e78d5bdd8aa7..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_1d_array_into_2d_memory_array_element.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-// Example from https://github.com/ethereum/solidity/issues/12558
-pragma abicoder v2;
-contract C {
-    function f(uint[] calldata a) external returns (uint[][] memory) {
-        uint[][] memory m = new uint[][](2);
-        m[0] = a;
-
-        return m;
-    }
-}
-contract Test {
-    C immutable c = new C();
-
-    function test() external returns (bool) {
-        uint[] memory arr = new uint[](4);
-
-        arr[0] = 13;
-        arr[1] = 14;
-        arr[2] = 15;
-        arr[3] = 16;
-
-        uint[][] memory ret = c.f(arr);
-        assert(ret.length == 2);
-        assert(ret[0].length == 4);
-        assert(ret[0][0] == 13);
-        assert(ret[0][1] == 14);
-        assert(ret[0][2] == 15);
-        assert(ret[0][3] == 16);
-        assert(ret[1].length == 0);
-
-        return true;
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
deleted file mode 100644
index 192ece49e539..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function g(bytes[2] memory m) internal returns (bytes memory) {
-        return m[0];
-    }
-    function f(bytes[2] calldata c) external returns (bytes memory) {
-        return g(c);
-    }
-}
-// ----
-// f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" -> 0x20, 2, "ab"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
deleted file mode 100644
index 3bdda3045a53..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function g(bytes[2] memory m) internal {
-        assert(m[0].length > 1);
-        assert(m[1].length > 1);
-        assert(m[0][0] == m[1][0]);
-        assert(m[0][1] == m[1][1]);
-    }
-    function f(bytes[2] calldata c) external {
-        g(c);
-    }
-}
-// ----
-// f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" ->
-// f(bytes[2]): 0x20, 0x40, 0x40, 1, "a" -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
deleted file mode 100644
index 706232d589f7..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-  uint256[] s;
-  function f(uint256[] calldata data) external returns (uint) {
-    s = data;
-    return s[0];
-  }
-}
-// ----
-// f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 110968
-// gas legacy: 111551
-// gas legacyOptimized: 111339
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
deleted file mode 100644
index fcf4aca21eaa..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-
-    function f(S[] calldata s)
-        external
-        pure
-        returns (uint256 l, uint256 a, uint256 b, uint256 c, uint256 d)
-    {
-        S[] memory m = s;
-        l = m.length;
-        a = m[0].a;
-        b = m[0].b;
-        c = m[1].a;
-        d = m[1].b;
-    }
-}
-// ----
-// f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
deleted file mode 100644
index ace6550bb87f..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint256[2] calldata c) public returns (uint256, uint256) {
-        uint256[2] memory m1 = c;
-        return (m1[0], m1[1]);
-    }
-}
-// ----
-// f(uint256[2]): 43, 57 -> 43, 57
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
deleted file mode 100644
index e6bf7671a1b0..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    mapping (uint => uint8[][]) m;
-
-    uint8[][] s;
-
-    function from_calldata(uint8[][] calldata _a) public returns (uint8[][] memory) {
-        m[0] = _a;
-        return m[0];
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 139683
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
deleted file mode 100644
index 56be37250a1b..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(bytes[] calldata a)
-        external
-        returns (uint256, uint256, bytes memory)
-    {
-        bytes memory m = a[0];
-        return (a.length, m.length, m);
-    }
-}
-// ----
-// f(bytes[]): 0x20, 0x1, 0x20, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000" -> 0x1, 0x2, 0x60, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000"
-// f(bytes[]): 0x20, 0x1, 0x20, 0x20, hex"7878787878787878787878787878787878787878787878787878787878787878" -> 0x1, 0x20, 0x60, 0x20, hex"7878787878787878787878787878787878787878787878787878787878787878"
-// f(bytes[]): 0x20, 0x1, 0x20, 0x20, hex"7800000000000000000000000000000000000000000000000000000000000061" -> 0x1, 0x20, 0x60, 0x20, hex"7800000000000000000000000000000000000000000000000000000000000061"
-// f(bytes[]): 0x20, 0x1, 0x20, 0x20, hex"6100000000000000000000000000000000000000000000000000000000000078" -> 0x1, 0x20, 0x60, 0x20, hex"6100000000000000000000000000000000000000000000000000000000000078"
-// f(bytes[]): 0x20, 0x1, 0x20, 0x20, hex"616d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d78" -> 0x1, 0x20, 0x60, 0x20, hex"616d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d78"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
deleted file mode 100644
index 2409893e36a4..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  bytes s;
-  function f(bytes calldata data) external returns (bytes1) {
-    s = data;
-    return s[0];
-  }
-}
-// ----
-// f(bytes): 0x20, 0x08, "abcdefgh" -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
deleted file mode 100644
index ff7e9f488b8a..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function f(bytes[] calldata c) external returns (bytes[] memory) {
-        return c;
-    }
-}
-// ----
-// f(bytes[]): 0x20, 2, 0x60, 0x60, 0x20, 2, "ab" -> 0x20, 2, 0x40, 0x80, 2, "ab", 2, "ab"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
deleted file mode 100644
index db6625c8e7bf..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(uint256[][] calldata a)
-        external
-        returns (uint256, uint256[] memory)
-    {
-        uint256[] memory m = a[0];
-        return (a.length, m);
-    }
-}
-// ----
-// f(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x17, 0x2a -> 0x1, 0x40, 0x2, 0x17, 0x2a
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
deleted file mode 100644
index a26936c9d6b1..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v2;
-
-contract Test {
-    struct shouldBug {
-        uint256[][2] deadly;
-    }
-    function killer(uint256[][2] calldata weapon) pure external returns (shouldBug memory) {
-        return shouldBug(weapon);
-    }
-}
-// ----
-// killer(uint256[][2]): 0x20, 0x40, 0x40, 2, 1, 2 -> 0x20, 0x20, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
deleted file mode 100644
index 2fc3b0a0aa09..000000000000
--- a/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    bytes10[] s;
-    function f(bytes8[] calldata c) external returns (uint256, bytes10, bytes10, bytes10) {
-        s = c;
-        return (s.length, s[0], s[1], s[2]);
-    }
-}
-// ----
-// f(bytes8[]): 0x20, 3, "abcd", "bcde", "cdef" -> 3, "abcd", "bcde", "cdef"
diff --git a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
deleted file mode 100644
index d2361dac5462..000000000000
--- a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint32[] s;
-    constructor()
-    {
-        s.push();
-        s.push();
-    }
-    function f() external returns (uint)
-    {
-        (s[1], s) = (4, [0]);
-        s = [0];
-        s.push();
-        return s[1];
-        // used to return 4 via IR.
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 226349
-// gas legacy: 215757
-// gas legacyOptimized: 181760
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
deleted file mode 100644
index 5482f615f241..000000000000
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-pragma abicoder               v2;
-struct S {
-    uint16 x;
-    bytes a;
-    uint16 y;
-    bytes b;
-}
-contract C {
-    uint padding;
-    S data;
-
-    function f() public returns (bytes memory, bytes memory) {
-        S memory x;
-        x.x = 7;
-        x.b = "1234567890123456789012345678901 1234567890123456789012345678901 123456789";
-        x.a = "abcdef";
-        x.y = 9;
-        data = x;
-        return (data.a, data.b);
-    }
-    function g() public returns (bytes memory, bytes memory) {
-        S memory x;
-        x.x = 7;
-        x.b = "12345678923456789";
-        x.a = "1234567890123456789012345678901 1234567890123456789012345678901 123456789";
-        x.y = 9;
-        data = x;
-        return (data.a, data.b);
-    }
-    function h() public returns (bytes memory, bytes memory) {
-        S memory x;
-        data = x;
-        return (data.a, data.b);
-    }
-}
-// ----
-// f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179750
-// gas legacy: 181001
-// gas legacyOptimized: 180018
-// g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106679
-// gas legacy: 109720
-// gas legacyOptimized: 106932
-// h() -> 0x40, 0x60, 0x00, 0x00
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
deleted file mode 100644
index d4599cdb7e58..000000000000
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-function dataslot() pure returns (bytes32) {
-    return keccak256(abi.encode(1));
-}
-
-function readDataSlot(uint offset) view returns (bytes32 r) {
-    bytes32 s = dataslot();
-    assembly { r := sload(add(s, offset)) }
-}
-
-function readDataSlot() view returns (bytes32) {
-    return readDataSlot(0);
-}
-
-function readHead() view returns (bytes32 r) {
-    assembly { r := sload(1) }
-}
-
-contract C {
-    uint padding;
-    bytes data;
-
-    function f() public returns (uint) {
-        bytes32 zero;
-        if (!(readDataSlot() == zero)) return 1;
-        data = "abc";
-        if (!(readDataSlot() == zero)) return 2;
-        data = "1234567890123456789012345678901234567890123456789012345678901234567890";
-        if (!(readDataSlot() != zero)) return 3;
-        if (!(readDataSlot(1) != zero)) return 4;
-        if (!(readDataSlot(2) != zero)) return 5;
-        if (!(readDataSlot(3) == zero)) return 6;
-        if (!(readDataSlot(4) == zero)) return 7;
-        data = "abc";
-        if (!(readDataSlot() == zero)) return 8;
-        if (!(readDataSlot(1) == zero)) return 9;
-        if (!(readDataSlot(2) == zero)) return 10;
-        if (!(readDataSlot(3) == zero)) return 11;
-        data = "1234567890123456789012345678901234567890123456789012345678901234567890";
-        data = "123456789012345678901234567890123456";
-        if (!(readDataSlot() != zero)) return 12;
-        if (!(readDataSlot(1) != zero)) return 13;
-        if (!(readDataSlot(2) == zero)) return 14;
-        if (!(readDataSlot(3) == zero)) return 15;
-        return 0xff;
-    }
-}
-// ----
-// f() -> 0xff
-// gas irOptimized: 143412
-// gas legacy: 153395
-// gas legacyOptimized: 146720
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
deleted file mode 100644
index fb2177901239..000000000000
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function() internal returns (uint)[] x;
-    function() internal returns (uint)[] y;
-
-    function test() public returns (uint256) {
-        x = new function() internal returns (uint)[](10);
-        x[9] = a;
-        y = x;
-        return y[9]();
-    }
-
-    function a() public returns (uint256) {
-        return 7;
-    }
-}
-// ----
-// test() -> 7
-// gas irOptimized: 122455
-// gas legacy: 205176
-// gas legacyOptimized: 204971
diff --git a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
deleted file mode 100644
index 95ba9d8ed8e8..000000000000
--- a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function() internal returns (uint)[20] x;
-    int256 mutex;
-
-    function one() public returns (uint256) {
-        function() internal returns (uint)[20] memory xmem;
-        x = xmem;
-        return 3;
-    }
-
-    function two() public returns (uint256) {
-        if (mutex > 0) return 7;
-        mutex = 1;
-        // If this test fails, it might re-execute this function.
-        x[0]();
-        return 2;
-    }
-}
-// ----
-// one() -> 3
-// gas legacy: 140253
-// gas legacyOptimized: 140093
-// two() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
deleted file mode 100644
index 85c396fb4e12..000000000000
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-
-contract c {
-    function set() public returns (bool) { data1 = msg.data; return true; }
-    function reset() public returns (bool) { data1 = data2; return true; }
-    bytes data1;
-    bytes data2;
-}
-// ----
-// set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177376
-// gas legacy: 177954
-// gas legacyOptimized: 177550
-// storageEmpty -> 0
-// reset() -> true
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
deleted file mode 100644
index 58b5dd045449..000000000000
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract receiver {
-    uint public received;
-    function recv(uint x) public { received += x + 1; }
-    fallback() external { received = 0x80; }
-}
-contract sender {
-    constructor() { rec = new receiver(); }
-    fallback() external { savedData1 = savedData2 = msg.data; }
-    function forward(bool selector) public returns (bool) {
-        if (selector) { address(rec).call(savedData1); delete savedData1; }
-        else { address(rec).call(savedData2); delete savedData2; }
-        return true;
-    }
-    function val() public returns (uint) { return rec.received(); }
-    receiver rec;
-    bytes savedData1;
-    bytes savedData2;
-}
-// ----
-// (): 7 ->
-// gas irOptimized: 110831
-// gas legacy: 111388
-// gas legacyOptimized: 111065
-// val() -> 0
-// forward(bool): true -> true
-// val() -> 0x80
-// forward(bool): false -> true
-// val() -> 0x80
-// forward(bool): true -> true
-// val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol b/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol
deleted file mode 100644
index ca154eee91e0..000000000000
--- a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    bytes x;
-    function f() public returns (uint r) {
-        bytes memory m = "tmp";
-        assembly {
-            mstore(m, 8)
-            mstore(add(m, 32), "deadbeef15dead")
-        }
-        // via yul disabled because this truncates the string.
-        x = m;
-        assembly {
-            r := sload(x.slot)
-        }
-    }
-}
-// ====
-// compileViaYul: false
-// ----
-// f() -> 0x6465616462656566000000000000000000000000000000000000000000000010
diff --git a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol b/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol
deleted file mode 100644
index 3704e36821af..000000000000
--- a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    bytes x;
-    function f() public returns (uint r) {
-        bytes memory m = "tmp";
-        assembly {
-            mstore(m, 8)
-            mstore(add(m, 32), "deadbeef15dead")
-        }
-        x = m;
-        assembly {
-            r := sload(x.slot)
-        }
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 0x6465616462656566000000000000000000000000000000000000000000000010
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
deleted file mode 100644
index ea5625f21d39..000000000000
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[] a;
-        uint8[2] b;
-    }
-
-    S[][][] s1;
-    S[][1][] s2;
-    S[1][][1] s3;
-
-    function test1(S[][][] calldata _a) public returns (S[][] memory){
-        s1.push();
-        s1[0] = _a[0];
-        return s1[0];
-    }
-
-    function test2(S[][1][] calldata _a) public returns (S[][1] memory) {
-        s2.push();
-        s2[0] = _a[0];
-        return s2[0];
-    }
-
-    function test3(S[1][][2] calldata _a) public returns (S[1][] memory) {
-        s3[0] = _a[1];
-        return s3[0];
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 327874
-// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 140879
-// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188535
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
deleted file mode 100644
index 96f24f77da19..000000000000
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[] a;
-        uint8[2] b;
-    }
-
-    S[][][] s1;
-    S[][1][] s2;
-    S[1][][1] s3;
-
-    function test1(S[][][] memory _a) public returns (S[][] memory){
-        s1.push();
-        s1[0] = _a[0];
-        return s1[0];
-    }
-
-    function test2(S[][1][] memory _a) public returns (S[][1] memory) {
-        s2.push();
-        s2[0] = _a[0];
-        return s2[0];
-    }
-
-    function test3(S[1][][2] memory _a) public returns (S[1][] memory) {
-        s3[0] = _a[1];
-        return s3[0];
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 332660
-// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 145150
-// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 192598
diff --git a/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol b/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
deleted file mode 100644
index 45ef42d46760..000000000000
--- a/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    bytes data;
-    bytes otherData;
-    function fromMemory() public returns (bytes1) {
-        bytes memory t;
-        uint[2] memory x;
-        x[0] = type(uint).max;
-        data = t;
-        data.push();
-        return data[0];
-    }
-    function fromCalldata(bytes calldata x) public returns (bytes1) {
-        data = x;
-        data.push();
-        return data[0];
-    }
-    function fromStorage() public returns (bytes1) {
-        // zero-length but dirty higher order bits
-        assembly  { sstore(otherData.slot, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) }
-        data = otherData;
-        data.push();
-        return data[0];
-    }
-}
-// ----
-// fromMemory() -> 0x00
-// fromCalldata(bytes): 0x40, 0x60, 0x00, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// fromStorage() -> 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
deleted file mode 100644
index 275a0fca1b75..000000000000
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract C {
-	string log;
-	function() external[] fs;
-	function() external[] gs;
-
-	function a() external {
-		log = string.concat(log, "[a called]");
-	}
-	function b() external {
-		log = string.concat(log, "[b called]");
-	}
-
-	function f(function() external[] calldata x) external {
-		fs = x;
-	}
-	function g(function() external[] memory x) public {
-		fs = x;
-	}
-	function test() external returns (string memory) {
-		log = "";
-		function() external[] memory x = new function() external[](2);
-		x[0] = this.a;
-		x[1] = this.b;
-		this.f(x);
-		fs[0]();
-		fs[1]();
-		return log;
-	}
-	function test2() external returns (string memory) {
-		log = "";
-		function() external[] memory x = new function() external[](2);
-		x[0] = this.b;
-		x[1] = this.a;
-		g(x);
-		fs[0]();
-		fs[1]();
-		return log;
-	}
-	function test3() external returns (string memory) {
-		log = "";
-		gs = fs;
-		gs[0]();
-		gs[1]();
-		return log;
-	}
-}
-// ----
-// test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116645
-// gas legacy: 118936
-// gas legacyOptimized: 116975
-// test2() -> 0x20, 0x14, "[b called][a called]"
-// test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103246
-// gas legacy: 102745
-// gas legacyOptimized: 101669
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
deleted file mode 100644
index 79882a74b267..000000000000
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    bytes[] s;
-    function f() external returns (uint256) {
-        bytes[] memory m = new bytes[](3);
-        m[0] = "ab"; m[1] = "cde"; m[2] = "fghij";
-        s = m;
-        assert(s.length == m.length);
-        for (uint i = 0; i < s.length; ++i) {
-            assert(s[i].length == m[i].length);
-            for (uint j = 0; j < s[i].length; ++j) {
-                 assert(s[i][j] == m[i][j]);
-            }
-        }
-        return s.length;
-    }
-}
-// ----
-// f() -> 3
-// gas irOptimized: 127422
-// gas legacy: 129050
-// gas legacyOptimized: 128222
diff --git a/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
deleted file mode 100644
index af54de1b99ed..000000000000
--- a/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    bytes10[] s;
-    function f() external returns (uint256, bytes10, bytes10, bytes10) {
-        bytes4[] memory m = new bytes4[](3);
-        m[0] = "abcd";
-        m[1] = "bcde";
-        m[2] = "cdef";
-        s = m;
-        return (s.length, s[0], s[1], s[2]);
-    }
-}
-// ----
-// f() -> 3, "abcd", "bcde", "cdef"
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
deleted file mode 100644
index e3843537fbed..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function test1(uint8[][][] calldata _a) public returns (uint8[][] memory) {
-        return _a[1];
-    }
-
-    function test2(uint8[][1][] calldata _a) public returns (uint8[][1] memory) {
-        return _a[0];
-    }
-
-    function test3(uint8[2][][2] calldata _a) public returns (uint8[2][] memory) {
-        return _a[0];
-    }
-
-    function test4(uint16[][] calldata _a) public returns (uint16[][] memory) {
-        uint16[][][] memory tmp = new uint16[][][](2);
-        tmp[1] = _a;
-        return tmp[1];
-    }
-
-    function test5(uint32[][2] calldata _a) public returns (uint32[][2] memory) {
-        uint32[][2][] memory tmp = new uint32[][2][](1);
-        tmp[0] = _a;
-        return tmp[0];
-    }
-
-    function test6(uint32[2][] calldata _a) public returns (uint32[2][] memory) {
-        uint32[2][][] memory tmp = new uint32[2][][](1);
-        tmp[0] = _a;
-        return tmp[0];
-    }
-}
-// ----
-// test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
-// test3(uint8[2][][2]): 0x20, 0x40, 0xa0, 1, 7, 7, 2, 8, 8, 0x09, 9 -> 0x20, 1, 7, 7
-// test4(uint16[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// test5(uint32[][2]): 0x20, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 0x40, 0x80, 1, 7, 2, 8, 9
-// test6(uint32[2][]): 0x20, 2, 5, 6, 7, 8 -> 0x20, 2, 5, 6, 7, 8
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
deleted file mode 100644
index 5040a72cadb5..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    uint8[2][2] a;
-    uint8[2][2][2] a2;
-
-    function test(uint8[2][2][2] calldata _a) public {
-        a = _a[0];
-        require(a[0][0] == 1);
-        require(a[0][1] == 2);
-        require(a[1][0] == 3);
-        require(a[1][1] == 4);
-    }
-
-    function test2(uint8[2][2] calldata _a) public {
-        a2[0] = _a;
-        require(a2[0][0][0] == 1);
-        require(a2[0][0][1] == 2);
-        require(a2[0][1][0] == 3);
-        require(a2[0][1][1] == 4);
-        require(a2[1][0][0] == 0);
-        require(a2[1][0][1] == 0);
-        require(a2[1][1][0] == 0);
-        require(a2[1][1][1] == 0);
-    }
-}
-// ----
-// test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
-// test2(uint8[2][2]): 1, 2, 3, 4
-// gas irOptimized: 119939
-// gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
deleted file mode 100644
index 3058df842a27..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function test1(uint8[][][] memory _a) public returns (uint8[][] memory) {
-        return _a[1];
-    }
-
-    function test2(uint8[][1][] memory _a) public returns (uint8[][1] memory) {
-        return _a[0];
-    }
-
-    function test3(uint8[2][][2] memory _a) public returns (uint8[2][] memory) {
-        return _a[0];
-    }
-
-    function test4(uint16[][] memory _a) public returns (uint16[][] memory) {
-        uint16[][][] memory tmp = new uint16[][][](2);
-        tmp[1] = _a;
-        return tmp[1];
-    }
-
-    function test5(uint32[][2] memory _a) public returns (uint32[][2] memory) {
-        uint32[][2][] memory tmp = new uint32[][2][](1);
-        tmp[0] = _a;
-        return tmp[0];
-    }
-
-    function test6(uint32[2][] memory _a) public returns (uint32[2][] memory) {
-        uint32[2][][] memory tmp = new uint32[2][][](1);
-        tmp[0] = _a;
-        return tmp[0];
-    }
-}
-// ----
-// test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
-// test3(uint8[2][][2]): 0x20, 0x40, 0xa0, 1, 7, 7, 2, 8, 8, 0x09, 9 -> 0x20, 1, 7, 7
-// test4(uint16[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// test5(uint32[][2]): 0x20, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 0x40, 0x80, 1, 7, 2, 8, 9
-// test6(uint32[2][]): 0x20, 2, 5, 6, 7, 8 -> 0x20, 2, 5, 6, 7, 8
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
deleted file mode 100644
index 2f4b4ca7c9a1..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    uint8[2][2] a1;
-    uint8[2][2][2] a2;
-
-    function test(uint8[2][2][2] memory _a) public {
-        a1 = _a[0];
-        require(a1[0][0] == 1);
-        require(a1[0][1] == 2);
-        require(a1[1][0] == 3);
-        require(a1[1][1] == 4);
-    }
-
-    function test2(uint8[2][2] memory _a) public {
-        a2[0] = _a;
-        require(a2[0][0][0] == 1);
-        require(a2[0][0][1] == 2);
-        require(a2[0][1][0] == 3);
-        require(a2[0][1][1] == 4);
-        require(a2[1][0][0] == 0);
-        require(a2[1][0][1] == 0);
-        require(a2[1][1][0] == 0);
-        require(a2[1][1][1] == 0);
-    }
-}
-// ----
-// test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
-// test2(uint8[2][2]): 1, 2, 3, 4
-// gas irOptimized: 119939
-// gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
deleted file mode 100644
index e30ca769bd42..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
+++ /dev/null
@@ -1,70 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint8[][][] a1 = new uint8[][][](2);
-    uint8[][][2] a2;
-    uint8[][2][] a3 = new uint8[][2][](1);
-    uint8[2][][] a4 = new uint8[2][][](2);
-
-    constructor() {
-        a1[1] = new uint8[][](2);
-        a1[1][0] = [3, 4];
-        a1[1][1] = [5, 6];
-
-        a2[0] = new uint8[][](2);
-        a2[0][0] = [6, 7];
-        a2[0][1] = [8, 9];
-        a2[1] = new uint8[][](2);
-        a2[1][0] = [10, 11];
-
-        a3[0][0] = [3, 4];
-        a3[0][1] = [5, 6];
-
-        a4[0] = new uint8[2][](1);
-        a4[0][0] = [17, 23];
-        a4[1] = new uint8[2][](1);
-        a4[1][0] = [19, 31];
-    }
-
-    function test1() public returns (uint8[][] memory) {
-        return a1[1];
-    }
-
-    function test2() public returns (uint8[][] memory) {
-        return a2[0];
-    }
-
-    function test3() public returns (uint8[][2] memory) {
-        return a3[0];
-    }
-
-    function test4() public returns (uint8[2][] memory) {
-        return a4[1];
-    }
-
-    function test5() public returns (uint8[][][] memory) {
-        uint8[][][] memory tmp = new uint8[][][](3);
-        tmp[1] = a1[1];
-        return tmp;
-    }
-
-    function test6() public returns (uint8[][2][] memory) {
-        uint8[][2][] memory tmp = new uint8[][2][](2);
-        tmp[0] = a3[0];
-        return tmp;
-    }
-
-    function test7() public returns (uint8[2][][] memory) {
-        uint8[2][][] memory tmp = new uint8[2][][](1);
-        tmp[0] = a4[0];
-        return tmp;
-    }
-}
-// ----
-// test1() -> 0x20, 2, 0x40, 0xa0, 2, 3, 4, 2, 5, 6
-// test2() -> 0x20, 2, 0x40, 0xa0, 2, 6, 7, 2, 8, 9
-// test3() -> 0x20, 0x40, 0xa0, 2, 3, 4, 2, 5, 6
-// test4() -> 0x20, 1, 19, 31
-// test5() -> 0x20, 3, 0x60, 0x80, 0x01a0, 0, 2, 0x40, 0xa0, 2, 3, 4, 2, 5, 6, 0
-// test6() -> 0x20, 2, 0x40, 0x0140, 0x40, 0xa0, 2, 3, 4, 2, 5, 6, 0x40, 0x60, 0, 0
-// test7() -> 0x20, 1, 0x20, 1, 17, 23
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
deleted file mode 100644
index f85b8eb9f31b..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
+++ /dev/null
@@ -1,84 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint8[][][] src1 = new uint8[][][](2);
-    uint8[][][2] src2;
-    uint8[][2][] src3 = new uint8[][2][](1);
-    uint8[2][][] src4 = new uint8[2][][](2);
-
-    uint8[][] dst1;
-    uint8[][] dst2;
-    uint8[][2] dst3;
-    uint8[][] dst4;
-
-    constructor() {
-        src1[1] = new uint8[][](2);
-        src1[1][0] = [3, 4];
-        src1[1][1] = [5, 6];
-
-        src2[0] = new uint8[][](2);
-        src2[0][0] = [6, 7];
-        src2[0][1] = [8, 9];
-        src2[1] = new uint8[][](2);
-        src2[1][0] = [10, 11];
-
-        src3[0][0] = [3, 4];
-        src3[0][1] = [5, 6];
-
-        src4[0] = new uint8[2][](1);
-        src4[0][0] = [17, 23];
-        src4[1] = new uint8[2][](1);
-        src4[1][0] = [19, 31];
-    }
-
-    function test1() public {
-        dst1 = src1[1];
-
-        require(dst1.length == 2);
-        require(dst1[0][0] == src1[1][0][0]);
-        require(dst1[0][1] == src1[1][0][1]);
-        require(dst1[1][0] == src1[1][1][0]);
-        require(dst1[1][1] == src1[1][1][1]);
-    }
-
-    function test2() public {
-        dst2 = src2[0];
-
-        require(dst2.length == 2);
-        require(dst2[0][0] == src2[1][0][0]);
-        require(dst2[0][1] == src2[1][0][1]);
-        require(dst2[1][0] == src2[1][1][0]);
-        require(dst2[1][1] == src2[1][1][1]);
-    }
-
-    function test3() public {
-        dst3 = src3[0];
-        require(dst3[0][0] == src3[0][0][0]);
-        require(dst3[0][1] == src3[0][0][1]);
-        require(dst3[1][0] == src3[0][1][0]);
-        require(dst3[1][1] == src3[0][1][1]);
-    }
-
-    function test4() public {
-        dst4 = src4[1];
-        require(dst4.length == 2);
-        require(dst4[0][0] == src4[0][0][0]);
-        require(dst4[0][1] == src4[0][0][1]);
-        require(dst4[1][0] == src4[0][1][0]);
-        require(dst4[1][1] == src4[0][1][1]);
-    }
-}
-// ----
-// test1() ->
-// gas irOptimized: 150468
-// gas legacy: 150949
-// gas legacyOptimized: 150906
-// test2() -> FAILURE
-// gas irOptimized: 150378
-// gas legacy: 150673
-// gas legacyOptimized: 150576
-// test3() ->
-// gas irOptimized: 123762
-// gas legacy: 125333
-// gas legacyOptimized: 125127
-// test4() -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
deleted file mode 100644
index 3d424a7c5976..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8 x;
-        uint8 y;
-    }
-
-    function test1(S[1][2] calldata a) public returns (S[1][2] memory) {
-        return a;
-    }
-
-    function test2(S[1][] calldata a) public returns (S[1][] memory) {
-        return a;
-    }
-
-    function test3(S[][2] calldata a) public returns (S[][2] memory) {
-        return a;
-    }
-}
-// ----
-// test1((uint8,uint8)[1][2]): 1, 2, 3, 4 -> 1, 2, 3, 4
-// test2((uint8,uint8)[1][]): 0x20, 3, 7, 11, 13, 17, 19, 23 -> 0x20, 3, 7, 11, 13, 17, 19, 23
-// test3((uint8,uint8)[][2]): 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19 -> 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
deleted file mode 100644
index 844a86304ee7..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[] a;
-        uint8[2] b;
-    }
-
-    S[][] s1;
-    S[][1] s2;
-    S[1][] s3;
-
-    function test1(S[][] calldata _a) public returns (S[][] memory){
-        s1 = _a;
-        return s1;
-    }
-
-    function test2(S[][1] calldata _a) public returns (S[][1] memory) {
-        s2 = _a;
-        return s2;
-    }
-
-    function test3(S[1][] calldata _a) public returns (S[1][] memory) {
-        s3 = _a;
-        return s3;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 304747
-// test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 116464
-// test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188024
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
deleted file mode 100644
index 6c8da98dd66c..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8 x;
-        uint8 y;
-    }
-
-    function test1(S[1][2] memory a) public returns (S[1][2] memory r) {
-        r = a;
-    }
-
-    function test2(S[1][] memory a) public returns (S[1][] memory r) {
-        r = a;
-    }
-
-    function test3(S[][2] memory a) public returns (S[][2] memory r) {
-        r = a;
-    }
-}
-// ----
-// test1((uint8,uint8)[1][2]): 1, 2, 3, 4 -> 1, 2, 3, 4
-// test2((uint8,uint8)[1][]): 0x20, 3, 7, 11, 13, 17, 19, 23 -> 0x20, 3, 7, 11, 13, 17, 19, 23
-// test3((uint8,uint8)[][2]): 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19 -> 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
deleted file mode 100644
index 209a6ee696e9..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[] a;
-        uint8[2] b;
-    }
-
-    S[][] s1;
-    S[][1] s2;
-    S[1][] s3;
-
-    function test1(S[][] memory _a) public returns (S[][] memory){
-        s1 = _a;
-        return s1;
-    }
-
-    function test2(S[][1] memory _a) public returns (S[][1] memory) {
-        s2 = _a;
-        return s2;
-    }
-
-    function test3(S[1][] memory _a) public returns (S[1][] memory) {
-        s3 = _a;
-        return s3;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 309074
-// test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 118256
-// test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 190993
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
deleted file mode 100644
index c356e029f6b6..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8 x;
-        uint8 y;
-    }
-
-    S[][] src1;
-    S[][1] src2;
-    S[1][] src3;
-
-    S[][] dst1;
-    S[][1] dst2;
-    S[1][] dst3;
-
-    constructor() {
-        src1 = new S[][](1);
-        src1[0].push(S({x: 3, y: 7}));
-        src1[0].push(S({x: 11, y: 13}));
-
-        src2[0].push(S({x: 3, y: 7}));
-        src2[0].push(S({x: 11, y: 13}));
-        src2[0].push(S({x: 17, y: 19}));
-
-        src3.push([S({x: 3, y: 7})]);
-        src3.push([S({x: 11, y: 13})]);
-    }
-
-    function test1() public {
-        dst1 = src1;
-
-        require(dst1.length == 1);
-        require(dst1[0][0].x == src1[0][0].x);
-        require(dst1[0][0].y == src1[0][0].y);
-        require(dst1[0][1].x == src1[0][1].x);
-        require(dst1[0][1].y == src1[0][1].y);
-    }
-
-    function test2() public {
-        dst2 = src2;
-
-        require(dst2[0].length == 3);
-        require(dst2[0][0].x == src2[0][0].x);
-        require(dst2[0][0].y == src2[0][0].y);
-        require(dst2[0][1].x == src2[0][1].x);
-        require(dst2[0][1].y == src2[0][1].y);
-        require(dst2[0][2].x == src2[0][2].x);
-        require(dst2[0][2].y == src2[0][2].y);
-    }
-
-    function test3() public {
-        dst3 = src3;
-
-        require(dst3.length == 2);
-        require(dst3[0][0].x == src3[0][0].x);
-        require(dst3[0][0].y == src3[0][0].y);
-        require(dst3[1][0].x == src3[1][0].x);
-        require(dst3[1][0].y == src3[1][0].y);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1()
-// gas irOptimized: 123202
-// test2()
-// gas irOptimized: 123027
-// test3()
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
deleted file mode 100644
index 3a5e44a5df01..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[] a;
-        uint8[2] b;
-    }
-
-    uint8[] a1;
-    uint8[] a2;
-    uint8[] a3;
-
-    S[][] s1;
-    S[1][1] s2;
-
-    constructor() {
-        a1.push(23);
-        a1.push(29);
-        a2.push(31);
-
-        s1 = new S[][](2);
-        s1[0] = new S[](2);
-        s1[0][0] = S({a: a1, b: [7, 11]});
-        s1[0][1] = S({a: a2, b: [17, 19]});
-
-        s1[1] = new S[](1);
-        s1[1][0] = S({a: a3, b: [37, 41]});
-
-        s2[0][0] = S({a: a3, b: [43, 47]});
-    }
-
-    function test1() public returns (S[] memory) {
-        return s1[0];
-    }
-
-    function test2() public returns (S[1] memory) {
-        return s2[0];
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test1() -> 0x20, 2, 0x40, 0x0100, 0x60, 7, 11, 2, 23, 29, 0x60, 17, 19, 1, 31
-// test2() -> 0x20, 0x20, 0x60, 43, 47, 0
diff --git a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
deleted file mode 100644
index dfb7c27aca40..000000000000
--- a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    uint8[][] a;
-    uint8[][][] a2;
-
-    function test(uint8[][][] calldata _a) public {
-        a = _a[1];
-        require(a.length == 2);
-        require(a[0].length == 1);
-        require(a[0][0] == 7);
-        require(a[1].length == 2);
-        require(a[1][0] == 8);
-        require(a[1][1] == 9);
-    }
-
-    function test2(uint8[][] calldata _a) public {
-        a2 = new uint8[][][](2);
-        a2[0] = _a;
-        require(a2[0].length == 2);
-	require(a2[0][0].length == 1);
-	require(a2[0][0][0] == 7);
-	require(a2[0][1].length == 2);
-	require(a2[0][1][0] == 8);
-	require(a2[0][1][1] == 9);
-	require(a2[1].length == 0);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 138040
-// test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 164246
-// gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
deleted file mode 100644
index 9a2fbb4d9d58..000000000000
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint72[5][] a;
-
-    function f() public returns (uint72, uint72, uint72, uint72, uint72, uint72, uint72) {
-        for (uint i = 0; i < 4; i++)
-            a.push();
-        a[0][0] = 1;
-        a[0][3] = 2;
-        a[1][1] = 3;
-        a[1][4] = 4;
-        a[2][0] = 5;
-        a[3][2] = 6;
-        a[3][3] = 7;
-        uint72[5][] memory m = a;
-        return (m[0][0], m[0][3], m[1][1], m[1][4], m[2][0], m[3][2], m[3][3]);
-    }
-}
-// ----
-// f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205783
-// gas legacy: 211765
-// gas legacyOptimized: 211181
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
deleted file mode 100644
index 211477c553c2..000000000000
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    bytes[] a;
-
-    function f() public returns (bytes[] memory) {
-        a.push("abc");
-        a.push("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYZ");
-        bytes[] memory m = a;
-        return m;
-    }
-}
-// ----
-// f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202731
-// gas legacy: 204798
-// gas legacyOptimized: 203357
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
deleted file mode 100644
index 3606d7d60188..000000000000
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    uint72[5][] a;
-
-    function f() public returns (uint72, uint72, uint72, uint72, uint72, uint72, uint72) {
-        for (uint i = 0; i < 4; i++)
-            a.push();
-        a[0][0] = 1;
-        a[0][3] = 2;
-        a[1][1] = 3;
-        a[1][4] = 4;
-        a[2][0] = 5;
-        a[3][2] = 6;
-        a[3][3] = 7;
-        uint72[5][] storage a_ = a;
-        uint72[5][] memory m = a_;
-        return (m[0][0], m[0][3], m[1][1], m[1][4], m[2][0], m[3][2], m[3][3]);
-    }
-}
-// ----
-// f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205783
-// gas legacy: 211770
-// gas legacyOptimized: 211186
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
deleted file mode 100644
index cfbf5c874575..000000000000
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    struct T { uint8 x; uint8 y; uint[] z; }
-    T[3][] a;
-
-    function f() public returns (uint8, uint8, uint, uint8, uint8, uint) {
-        a.push();
-        a.push();
-        a[0][1].x = 11;
-        a[0][1].y = 12;
-        a[0][1].z.push(1);
-        a[0][1].z.push(2);
-        a[0][1].z.push(3);
-        a[1][2].x = 21;
-        a[1][2].y = 22;
-        a[1][2].z.push(4);
-        a[1][2].z.push(5);
-        a[1][2].z.push(6);
-        T[3][] memory m = a;
-        return (
-            m[0][1].x, m[0][1].y, m[0][1].z[0],
-            m[1][2].x, m[1][2].y, m[1][2].z[0]
-        );
-    }
-}
-// ----
-// f() -> 11, 0x0c, 1, 0x15, 22, 4
-// gas irOptimized: 291047
-// gas legacy: 293407
-// gas legacyOptimized: 290218
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
deleted file mode 100644
index f49b4923b81f..000000000000
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint8[33] a;
-
-    function f() public returns (uint8, uint8, uint8) {
-        a[0] = 2;
-        a[16] = 3;
-        a[32] = 4;
-        uint8[33] memory m = a;
-        return (m[0], m[16], m[32]);
-    }
-}
-// ----
-// f() -> 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
deleted file mode 100644
index 3ba5604a79f5..000000000000
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    uint8[] a;
-
-    function f() public returns (uint8, uint8, uint8) {
-        for (uint i = 0; i < 33; i++)
-            a.push(7);
-        a[0] = 2;
-        a[16] = 3;
-        a[32] = 4;
-        uint8[] memory m = a;
-        return (m[0], m[16], m[32]);
-    }
-}
-// ----
-// f() -> 2, 3, 4
-// gas irOptimized: 109108
-// gas legacy: 122235
-// gas legacyOptimized: 118411
diff --git a/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol b/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
deleted file mode 100644
index dec1a2d10e4a..000000000000
--- a/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(string calldata s) public returns (bytes calldata m) {
-        return bytes(s);
-    }
-}
-// ----
-// f(string): 0x20, 3, "abc" -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol b/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
deleted file mode 100644
index 9d2dbd8c28bb..000000000000
--- a/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (uint256) {
-        uint256[][] memory a = new uint256[][](0);
-        return 7;
-    }
-}
-// ----
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
deleted file mode 100644
index d507f080f36f..000000000000
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    struct S {
-        uint256[2] a;
-        bytes b;
-    }
-
-    function f() public returns (bytes1, uint256, uint256, bytes1) {
-        bytes memory x = new bytes(200);
-        x[199] = "A";
-        uint256[2][] memory y = new uint256[2][](300);
-        y[203][1] = 8;
-        S[] memory z = new S[](180);
-        z[170].a[1] = 4;
-        z[170].b = new bytes(102);
-        z[170].b[99] = "B";
-        return (x[199], y[203][1], z[170].a[1], z[170].b[99]);
-    }
-}
-// ----
-// f() -> "A", 8, 4, "B"
-// gas irOptimized: 125822
-// gas legacy: 121382
-// gas legacyOptimized: 115488
diff --git a/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol b/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
deleted file mode 100644
index 1d886a8c0e7d..000000000000
--- a/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function f() public returns (uint256) {
-        uint256 l = 2**256 / 32;
-        // This used to work without causing an error.
-        uint256[] memory x = new uint256[](l);
-        uint256[] memory y = new uint256[](1);
-        x[1] = 42;
-        // This used to overwrite the value written above.
-        y[0] = 23;
-        return x[1];
-    }
-    function g() public returns (uint256) {
-        uint256 l = 2**256 / 2 + 1;
-        // This used to work without causing an error.
-        uint16[] memory x = new uint16[](l);
-        uint16[] memory y = new uint16[](1);
-        x[2] = 42;
-        // This used to overwrite the value written above.
-        y[0] = 23;
-        return x[2];
-    }}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x41
-// g() -> FAILURE, hex"4e487b71", 0x41
diff --git a/test/libsolidity/semanticTests/array/create_memory_byte_array.sol b/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
deleted file mode 100644
index b4c29d0fd30c..000000000000
--- a/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (bytes1) {
-        bytes memory x = new bytes(35);
-        assert(x.length == 35);
-        x[34] = "A";
-        return (x[34]);
-    }
-}
-// ----
-// f() -> "A"
diff --git a/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol b/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
deleted file mode 100644
index 2396e3179b63..000000000000
--- a/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function f() public returns (uint256) {
-        uint256[][] memory x = new uint256[][](42);
-        assert(x[0].length == 0);
-        x[0] = new uint256[](1);
-        x[0][0] = 1;
-        assert(x[4].length == 0);
-        x[4] = new uint256[](1);
-        x[4][0] = 2;
-        assert(x[10].length == 0);
-        x[10] = new uint256[](1);
-        x[10][0] = 44;
-        uint256[][] memory y = new uint256[][](24);
-        assert(y[0].length == 0);
-        y[0] = new uint256[](1);
-        y[0][0] = 1;
-        assert(y[4].length == 0);
-        y[4] = new uint256[](1);
-        y[4][0] = 2;
-        assert(y[10].length == 0);
-        y[10] = new uint256[](1);
-        y[10][0] = 88;
-        if (
-            (x[0][0] == y[0][0]) &&
-            (x[4][0] == y[4][0]) &&
-            (x[10][0] == 44) &&
-            (y[10][0] == 88)
-        ) return 7;
-        return 0;
-    }
-}
-// ----
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
deleted file mode 100644
index fffea685a8cb..000000000000
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract c {
-    bytes data;
-
-    function test1() external returns (bool) {
-        data = new bytes(100);
-        for (uint256 i = 0; i < data.length; i++) data[i] = bytes1(uint8(i));
-        delete data[94];
-        delete data[96];
-        delete data[98];
-        return
-            data[94] == 0 &&
-            uint8(data[95]) == 95 &&
-            data[96] == 0 &&
-            uint8(data[97]) == 97;
-    }
-}
-// ----
-// test1() -> true
-// gas irOptimized: 204782
-// gas legacy: 242256
-// gas legacyOptimized: 241192
diff --git a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
deleted file mode 100644
index b735d182d555..000000000000
--- a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-    bytes data;
-
-    function f() public returns (uint ret) {
-        data.push("a");
-        data.push("b");
-        delete data;
-        assembly {
-            ret := sload(data.slot)
-        }
-    }
-
-    function g() public returns (uint ret) {
-        assembly {
-            sstore(data.slot, 67)
-        }
-        data.push("a");
-        data.push("b");
-        assert(data.length == 35);
-        delete data;
-        assert(data.length == 0);
-
-        uint size = 999;
-        assembly {
-            size := sload(data.slot)
-            mstore(0, data.slot)
-            ret := sload(keccak256(0, 32))
-        }
-        assert(size == 0);
-    }
-}
-// ----
-// f() -> 0
-// g() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
deleted file mode 100644
index 53a66af34337..000000000000
--- a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-
-    function len() public returns (uint ret) {
-        uint[] memory data = new uint[](2);
-        data[0] = 234;
-        data[1] = 123;
-        delete data;
-        assembly {
-            ret := mload(data)
-        }
-    }
-}
-// ----
-// len() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
deleted file mode 100644
index 2c1421eee952..000000000000
--- a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-// Test for a bug where we did not increment the counter properly while deleting a dynamic array.
-contract C {
-    struct S {
-        uint256 x;
-        uint256[] y;
-    }
-    S[] data;
-
-    function f() public returns (bool) {
-        S storage s1 = data.push();
-        s1.x = 2**200;
-        S storage s2 = data.push();
-        s2.x = 2**200;
-        delete data;
-        return true;
-    }
-}
-// ----
-// f() -> true # This code interprets x as an array length and thus will go out of gas. neither of the two should throw due to out-of-bounds access #
diff --git a/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
deleted file mode 100644
index c407eb73f8de..000000000000
--- a/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-    fallback() external { data = msg.data; }
-    function del() public returns (bool) { delete data; return true; }
-    bytes data;
-}
-// ----
-// (): 7 ->
-// storageEmpty -> 0
-// del(): 7 -> true
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
deleted file mode 100644
index 4136456684e2..000000000000
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    uint[] data;
-
-    function len() public returns (uint ret) {
-        data.push(234);
-        data.push(123);
-        delete data;
-        assembly {
-            ret := sload(data.slot)
-        }
-    }
-
-    function val() public returns (uint ret) {
-        assembly {
-            sstore(0, 2)
-            mstore(0, 0)
-            sstore(keccak256(0, 32), 234)
-            sstore(add(keccak256(0, 32), 1), 123)
-        }
-
-        assert(data[0] == 234);
-        assert(data[1] == 123);
-
-        delete data;
-
-        uint size = 999;
-
-        assembly {
-            size := sload(0)
-            mstore(0, 0)
-            ret := sload(keccak256(0, 32))
-        }
-    }
-}
-// ----
-// len() -> 0
-// val() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
deleted file mode 100644
index 9665201c98fd..000000000000
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint120[] data;
-
-    function f() public returns (uint120, uint120, uint120) {
-        data.push(123);
-        data.push(234);
-        data.push(345);
-        delete data;
-        assembly {
-            sstore(data.slot, 3)
-        }
-        return (data[0], data[1], data[2]);
-    }
-}
-// ----
-// f() -> 0, 0, 0
-// gas irOptimized: 90992
-// gas legacy: 111037
-// gas legacyOptimized: 109633
diff --git a/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol b/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
deleted file mode 100644
index 732e90adb622..000000000000
--- a/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Test {
-    function del() public returns (uint24[3][4] memory) {
-        uint24[3][4] memory x;
-        for (uint24 i = 0; i < x.length; i ++)
-            for (uint24 j = 0; j < x[i].length; j ++)
-                x[i][j] = i * 0x10 + j;
-        delete x[1];
-        delete x[3][2];
-        return x;
-    }
-}
-// ----
-// del() -> 0, 1, 2, 0, 0, 0, 0x20, 0x21, 0x22, 0x30, 0x31, 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
deleted file mode 100644
index eb950d1834c2..000000000000
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract c {
-    uint[20] spacer;
-    uint[] dynamic;
-    function fill() public {
-        for (uint i = 0; i < 21; ++i)
-            dynamic.push(i + 1);
-    }
-    function halfClear() public {
-        while (dynamic.length > 5)
-            dynamic.pop();
-    }
-    function fullClear() public { delete dynamic; }
-}
-// ----
-// storageEmpty -> 1
-// fill() ->
-// gas irOptimized: 519017
-// gas legacy: 518936
-// gas legacyOptimized: 515555
-// storageEmpty -> 0
-// halfClear() ->
-// gas irOptimized: 113961
-// gas legacy: 113257
-// gas legacyOptimized: 113120
-// storageEmpty -> 0
-// fullClear() ->
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
deleted file mode 100644
index 2f6769a24189..000000000000
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract c {
-    struct Data {
-        uint256 x;
-        uint256 y;
-    }
-    Data[] data;
-    uint256[] ids;
-
-    function setIDStatic(uint256 id) public {
-        ids[2] = id;
-    }
-
-    function setID(uint256 index, uint256 id) public {
-        ids[index] = id;
-    }
-
-    function setData(uint256 index, uint256 x, uint256 y) public {
-        data[index].x = x;
-        data[index].y = y;
-    }
-
-    function getID(uint256 index) public returns (uint256) {
-        return ids[index];
-    }
-
-    function getData(uint256 index) public returns (uint256 x, uint256 y) {
-        x = data[index].x;
-        y = data[index].y;
-    }
-
-    function getLengths() public returns (uint256 l1, uint256 l2) {
-        l1 = data.length;
-        l2 = ids.length;
-    }
-
-    function setLengths(uint256 l1, uint256 l2) public {
-        while (data.length < l1) data.push();
-        while (ids.length < l2) ids.push();
-    }
-}
-// ----
-// getLengths() -> 0, 0
-// setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 110797
-// gas legacy: 108273
-// gas legacyOptimized: 100269
-// getLengths() -> 48, 49
-// setIDStatic(uint256): 11 ->
-// getID(uint256): 2 -> 11
-// setID(uint256,uint256): 7, 8 ->
-// getID(uint256): 7 -> 8
-// setData(uint256,uint256,uint256): 7, 8, 9 ->
-// setData(uint256,uint256,uint256): 8, 10, 11 ->
-// getData(uint256): 7 -> 8, 9
-// getData(uint256): 8 -> 10, 11
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
deleted file mode 100644
index 7621d05bdcfd..000000000000
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract c {
-    struct s { uint[][] d; }
-    s[] data;
-    function fill() public returns (uint) {
-        while (data.length < 3)
-            data.push();
-        while (data[2].d.length < 4)
-            data[2].d.push();
-        while (data[2].d[3].length < 5)
-            data[2].d[3].push();
-        data[2].d[3][4] = 8;
-        return data[2].d[3][4];
-    }
-    function clear() public { delete data; }
-}
-// ----
-// storageEmpty -> 1
-// fill() -> 8
-// gas irOptimized: 122742
-// gas legacy: 121602
-// gas legacyOptimized: 120589
-// storageEmpty -> 0
-// clear() ->
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
deleted file mode 100644
index 5cf35ef3edfe..000000000000
--- a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract c {
-    uint256[] data;
-
-    function enlarge(uint256 amount) public returns (uint256) {
-        while (data.length < amount) data.push();
-        return data.length;
-    }
-
-    function set(uint256 index, uint256 value) public returns (bool) {
-        data[index] = value;
-        return true;
-    }
-
-    function get(uint256 index) public returns (uint256) {
-        return data[index];
-    }
-
-    function length() public returns (uint256) {
-        return data.length;
-    }
-}
-// ----
-// length() -> 0
-// get(uint256): 3 -> FAILURE, hex"4e487b71", 0x32
-// enlarge(uint256): 4 -> 4
-// length() -> 4
-// set(uint256,uint256): 3, 4 -> true
-// get(uint256): 3 -> 4
-// length() -> 4
-// set(uint256,uint256): 4, 8 -> FAILURE, hex"4e487b71", 0x32
-// length() -> 4
diff --git a/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol b/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
deleted file mode 100644
index f09757c6e02a..000000000000
--- a/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-    uint256[3] arr;
-    bool public test = false;
-
-    function getElement(uint256 i) public returns (uint256) {
-        return arr[i];
-    }
-
-    function testIt() public returns (bool) {
-        uint256 i = this.getElement(5);
-        test = true;
-        return true;
-    }
-}
-// ----
-// test() -> false
-// testIt() -> FAILURE, hex"4e487b71", 0x32
-// test() -> false
diff --git a/test/libsolidity/semanticTests/array/external_array_args.sol b/test/libsolidity/semanticTests/array/external_array_args.sol
deleted file mode 100644
index da6664f9e91e..000000000000
--- a/test/libsolidity/semanticTests/array/external_array_args.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-    function test(uint[8] calldata a, uint[] calldata b, uint[5] calldata c, uint a_index, uint b_index, uint c_index)
-            external returns (uint av, uint bv, uint cv) {
-        av = a[a_index];
-        bv = b[b_index];
-        cv = c[c_index];
-    }
-}
-// ----
-// test(uint256[8],uint256[],uint256[5],uint256,uint256,uint256): 1, 2, 3, 4, 5, 6, 7, 8, 0x220, 21, 22, 23, 24, 25, 0, 1, 2, 3, 11, 12, 13 -> 1, 12, 23
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
deleted file mode 100644
index b4d9a30ec068..000000000000
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract c {
-    uint spacer1;
-    uint spacer2;
-    uint[20] data;
-    function fill() public {
-        for (uint i = 0; i < data.length; ++i) data[i] = i+1;
-    }
-    function clear() public { delete data; }
-}
-// ----
-// storageEmpty -> 1
-// fill() ->
-// gas irOptimized: 464834
-// gas legacy: 468818
-// gas legacyOptimized: 466238
-// storageEmpty -> 0
-// clear() ->
-// gas irOptimized: 122148
-// gas legacy: 122440
-// gas legacyOptimized: 122259
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
deleted file mode 100644
index dd90985735b3..000000000000
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-    function f(uint16 input) public pure returns (uint16[5] memory arr) {
-        arr[0] = input;
-        arr[1] = ++input;
-        arr[2] = ++input;
-        arr[3] = ++input;
-        arr[4] = ++input;
-    }
-}
-
-
-contract B {
-    function f() public returns (uint16[5] memory res, uint16[5] memory res2) {
-        A a = new A();
-        res = a.f(2);
-        res2 = a.f(1000);
-    }
-}
-// ----
-// f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 114404
-// gas legacy: 230001
-// gas legacyOptimized: 130637
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
deleted file mode 100644
index ac11d779a563..000000000000
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract Creator {
-    uint256 public r;
-    address public ch;
-
-    constructor(address[3] memory s, uint256 x) {
-        r = x;
-        ch = s[2];
-    }
-}
-// ----
-// constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 126363
-// gas legacy: 174186
-// gas legacyOptimized: 128709
-// r() -> 4
-// ch() -> 3
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
deleted file mode 100644
index b65a3d254d54..000000000000
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-contract c {
-    struct Data {
-        uint256 x;
-        uint256 y;
-    }
-    Data[2**10] data;
-    uint256[2**10 + 3] ids;
-
-    function setIDStatic(uint256 id) public {
-        ids[2] = id;
-    }
-
-    function setID(uint256 index, uint256 id) public {
-        ids[index] = id;
-    }
-
-    function setData(uint256 index, uint256 x, uint256 y) public {
-        data[index].x = x;
-        data[index].y = y;
-    }
-
-    function getID(uint256 index) public returns (uint256) {
-        return ids[index];
-    }
-
-    function getData(uint256 index) public returns (uint256 x, uint256 y) {
-        x = data[index].x;
-        y = data[index].y;
-    }
-
-    function getLengths() public returns (uint256 l1, uint256 l2) {
-        l1 = data.length;
-        l2 = ids.length;
-    }
-}
-// ----
-// setIDStatic(uint256): 0xb ->
-// getID(uint256): 0x2 -> 0xb
-// setID(uint256,uint256): 0x7, 0x8 ->
-// getID(uint256): 0x7 -> 0x8
-// setData(uint256,uint256,uint256): 0x7, 0x8, 0x9 ->
-// setData(uint256,uint256,uint256): 0x8, 0xa, 0xb ->
-// getData(uint256): 0x7 -> 0x8, 0x9
-// getData(uint256): 0x8 -> 0xa, 0xb
-// getLengths() -> 0x400, 0x403
diff --git a/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol b/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
deleted file mode 100644
index d641cd83f1ac..000000000000
--- a/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    bytes1 a;
-
-    function f(bytes32 x) public returns (uint256, uint256, uint256) {
-        return (x.length, bytes16(uint128(2)).length, a.length + 7);
-    }
-}
-// ----
-// f(bytes32): "789" -> 32, 16, 8
diff --git a/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
deleted file mode 100644
index 1b3b640808b3..000000000000
--- a/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract c {
-    uint256[4] data;
-
-    function set(uint256 index, uint256 value) public returns (bool) {
-        data[index] = value;
-        return true;
-    }
-
-    function get(uint256 index) public returns (uint256) {
-        return data[index];
-    }
-
-    function length() public returns (uint256) {
-        return data.length;
-    }
-}
-// ----
-// length() -> 4
-// set(uint256,uint256): 3, 4 -> true
-// set(uint256,uint256): 4, 5 -> FAILURE, hex"4e487b71", 0x32
-// set(uint256,uint256): 400, 5 -> FAILURE, hex"4e487b71", 0x32
-// get(uint256): 3 -> 4
-// get(uint256): 4 -> FAILURE, hex"4e487b71", 0x32
-// get(uint256): 400 -> FAILURE, hex"4e487b71", 0x32
-// length() -> 4
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
deleted file mode 100644
index 773e904cc095..000000000000
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract D {
-    function f(function() external returns (function() external returns (uint))[] memory x)
-        public returns (function() external returns (uint)[3] memory r) {
-        r[0] = x[0]();
-        r[1] = x[1]();
-        r[2] = x[2]();
-    }
-}
-
-
-contract C {
-    function test() public returns (uint256, uint256, uint256) {
-        function() external returns (function() external returns (uint))[] memory x =
-            new function() external returns (function() external returns (uint))[](10);
-        for (uint256 i = 0; i < x.length; i++) x[i] = this.h;
-        x[0] = this.htwo;
-        function() external returns (uint)[3] memory y = (new D()).f(x);
-        return (y[0](), y[1](), y[2]());
-    }
-
-    function e() public returns (uint256) {
-        return 5;
-    }
-
-    function f() public returns (uint256) {
-        return 6;
-    }
-
-    function g() public returns (uint256) {
-        return 7;
-    }
-
-    uint256 counter;
-
-    function h() public returns (function() external returns (uint)) {
-        return counter++ == 0 ? this.f : this.g;
-    }
-
-    function htwo() public returns (function() external returns (uint)) {
-        return this.e;
-    }
-}
-// ----
-// test() -> 5, 6, 7
-// gas irOptimized: 255728
-// gas legacy: 440376
-// gas legacyOptimized: 278651
diff --git a/test/libsolidity/semanticTests/array/function_memory_array.sol b/test/libsolidity/semanticTests/array/function_memory_array.sol
deleted file mode 100644
index bdd23c67538e..000000000000
--- a/test/libsolidity/semanticTests/array/function_memory_array.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    function a(uint256 x) public returns (uint256) {
-        return x + 1;
-    }
-
-    function b(uint256 x) public returns (uint256) {
-        return x + 2;
-    }
-
-    function c(uint256 x) public returns (uint256) {
-        return x + 3;
-    }
-
-    function d(uint256 x) public returns (uint256) {
-        return x + 5;
-    }
-
-    function e(uint256 x) public returns (uint256) {
-        return x + 8;
-    }
-
-    function test(uint256 x, uint256 i) public returns (uint256) {
-        function(uint) internal returns (uint)[] memory arr =
-            new function(uint) internal returns (uint)[](10);
-        arr[0] = a;
-        arr[1] = b;
-        arr[2] = c;
-        arr[3] = d;
-        arr[4] = e;
-        return arr[i](x);
-    }
-}
-// ----
-// test(uint256,uint256): 10, 0 -> 11
-// test(uint256,uint256): 10, 1 -> 12
-// test(uint256,uint256): 10, 2 -> 13
-// test(uint256,uint256): 10, 3 -> 15
-// test(uint256,uint256): 10, 4 -> 18
-// test(uint256,uint256): 10, 5 -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
deleted file mode 100644
index 79d8f20200b2..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    function set(uint24[3][] memory _data, uint256 a, uint256 b)
-        public
-        returns (uint256 l, uint256 e)
-    {
-        l = _data.length;
-        e = _data[a][b];
-    }
-}
-// ----
-// set(uint24[3][],uint256,uint256): 0x60, 0x03, 0x02, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06, 0x0c
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
deleted file mode 100644
index 0e9168bce4cd..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract c {
-    bytes data;
-    function direct(bytes calldata arg, uint index) external returns (uint) {
-        return uint(uint8(arg[index]));
-    }
-    function storageCopyRead(bytes calldata arg, uint index) external returns (uint) {
-        data = arg;
-        return uint(uint8(data[index]));
-    }
-    function storageWrite() external returns (uint) {
-        data = new bytes(35);
-        data[31] = 0x77;
-        data[32] = 0x14;
-
-        data[31] = 0x01;
-        data[31] |= 0x08;
-        data[30] = 0x01;
-        data[32] = 0x03;
-        return uint(uint8(data[30])) * 0x100 | uint(uint8(data[31])) * 0x10 | uint(uint8(data[32]));
-    }
-}
-// ----
-// direct(bytes,uint256): 0x40, 33, 34, 0x000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F, left(0x2021) -> 0x21
-// storageCopyRead(bytes,uint256): 0x40, 33, 34, 0x000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F, left(0x2021) -> 0x21
-// storageWrite() -> 0x193
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
deleted file mode 100644
index fa65d25c0ff9..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract Main {
-    function f(bytes memory _s1, uint i1, uint i2, uint i3) public returns (bytes1 c1, bytes1 c2, bytes1 c3) {
-        c1 = _s1[i1];
-        c2 = intern(_s1, i2);
-        c3 = internIndirect(_s1)[i3];
-    }
-    function intern(bytes memory _s1, uint i) public returns (bytes1 c) {
-        return _s1[i];
-    }
-    function internIndirect(bytes memory _s1) public returns (bytes memory) {
-        return _s1;
-    }
-}
-// ----
-// f(bytes,uint256,uint256,uint256): 0x80, 3, 4, 5, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> "d", "e", "f"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
deleted file mode 100644
index 6dd6249936bd..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    function set(bytes memory _data, uint256 i)
-        public
-        returns (uint256 l, bytes1 c)
-    {
-        l = _data.length;
-        c = _data[i];
-    }
-}
-// ----
-// set(bytes,uint256): 0x40, 0x03, 0x08, "abcdefgh" -> 0x08, "d"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
deleted file mode 100644
index 9ab74eaf363a..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    bytes16[] public data;
-
-    function f(bytes32 x) public returns (bytes1) {
-        return x[2];
-    }
-
-    function g(bytes32 x) public returns (uint256) {
-        data = [x[0], x[1], x[2]];
-        data[0] = "12345";
-        return uint256(uint8(data[0][4]));
-    }
-}
-// ----
-// f(bytes32): "789" -> "9"
-// g(bytes32): "789" -> 0x35
-// data(uint256): 0x01 -> "8"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
deleted file mode 100644
index c618ae8e45d4..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function to_little_endian_64(uint64 value) public pure returns (bytes memory ret) {
-        ret = new bytes(8);
-        bytes8 bytesValue = bytes8(value);
-        // Byteswapping during copying to bytes.
-        ret[0] = bytesValue[7];
-        ret[1] = bytesValue[6];
-        ret[2] = bytesValue[5];
-        ret[3] = bytesValue[4];
-        ret[4] = bytesValue[3];
-        ret[5] = bytesValue[2];
-        ret[6] = bytesValue[1];
-        ret[7] = bytesValue[0];
-    }
-}
-// ----
-// to_little_endian_64(uint64): 0 -> 0x20, 8, 0x00
-// to_little_endian_64(uint64): 0x0102030405060708 -> 0x20, 8, 0x0807060504030201000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
deleted file mode 100644
index 0525f6f283ef..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (uint256) {
-        return ([1, 2, 3, 4][2]);
-    }
-}
-// ----
-// f() -> 3
diff --git a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
deleted file mode 100644
index bf6c0b0ee8d4..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    string public tester;
-
-    function f() public returns (string memory) {
-        return (["abc", "def", "g"][0]);
-    }
-
-    function test() public {
-        tester = f();
-    }
-}
-// ----
-// test() ->
-// tester() -> 0x20, 0x3, "abc"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
deleted file mode 100644
index be824b759fc6..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Test {
-    uint24[3][][4] data;
-
-    function set(uint24[3][][4] memory x)
-        internal
-        returns (uint24[3][][4] memory)
-    {
-        x[1][2][2] = 1;
-        x[1][3][2] = 7;
-        return x;
-    }
-
-    function f() public returns (uint24[3][] memory) {
-        while (data[1].length < 4) data[1].push();
-        return set(data)[1];
-    }
-}
-// ----
-// f() -> 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07
diff --git a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
deleted file mode 100644
index 7a8a18670ea5..000000000000
--- a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract Test {
-    function set(uint24[3][4] memory x) public {
-        x[2][2] = 1;
-        x[3][2] = 7;
-    }
-
-    function f() public returns (uint24[3][4] memory) {
-        uint24[3][4] memory data;
-        set(data);
-        return data;
-    }
-}
-// ----
-// f() -> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07
diff --git a/test/libsolidity/semanticTests/array/inline_array_return.sol b/test/libsolidity/semanticTests/array/inline_array_return.sol
deleted file mode 100644
index 25302dcbfdd2..000000000000
--- a/test/libsolidity/semanticTests/array/inline_array_return.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint8[] tester;
-
-    function f() public returns (uint8[5] memory) {
-        return ([1, 2, 3, 4, 5]);
-    }
-
-    function test() public returns (uint8, uint8, uint8, uint8, uint8) {
-        tester = f();
-        return (tester[0], tester[1], tester[2], tester[3], tester[4]);
-    }
-}
-// ----
-// f() -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/array/inline_array_singleton.sol b/test/libsolidity/semanticTests/array/inline_array_singleton.sol
deleted file mode 100644
index b14ade6e48c1..000000000000
--- a/test/libsolidity/semanticTests/array/inline_array_singleton.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// This caused a failure since the type was not converted to its mobile type.
-contract C {
-    function f() public returns (uint256) {
-        return [4][0];
-    }
-}
-// ----
-// f() -> 4
diff --git a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
deleted file mode 100644
index e145d281c906..000000000000
--- a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (uint256 x, uint256 y) {
-        x = 3;
-        y = 6;
-        uint256[2] memory z = [x, y];
-        return (z[0], z[1]);
-    }
-}
-// ----
-// f() -> 3, 6
diff --git a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
deleted file mode 100644
index 7dfe6e642594..000000000000
--- a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    string s = "doh";
-
-    function f() public returns (string memory, string memory) {
-        string memory t = "ray";
-        string[3] memory x = [s, t, "mi"];
-        return (x[1], x[2]);
-    }
-}
-// ----
-// f() -> 0x40, 0x80, 0x3, "ray", 0x2, "mi"
diff --git a/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol b/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
deleted file mode 100644
index 9cb16349a1ef..000000000000
--- a/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint256 i) public returns (string memory) {
-        string[4] memory x = ["This", "is", "an", "array"];
-        return (x[i]);
-    }
-}
-// ----
-// f(uint256): 0 -> 0x20, 0x4, "This"
-// f(uint256): 1 -> 0x20, 0x2, "is"
-// f(uint256): 2 -> 0x20, 0x2, "an"
-// f(uint256): 3 -> 0x20, 0x5, "array"
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
deleted file mode 100644
index ddf67aa90fbf..000000000000
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ /dev/null
@@ -1,95 +0,0 @@
-contract C {
-    bytes public x = "abc";
-    bytes public y;
-    function invalidateXShort() public {
-        assembly { sstore(x.slot, 64) }
-        delete y;
-    }
-    function invalidateXLong() public {
-        assembly { sstore(x.slot, 5) }
-        delete y;
-    }
-    function abiEncode() public view returns (bytes memory) { return x; }
-    function abiEncodePacked() public view returns (bytes memory) { return abi.encodePacked(x); }
-    function copyToMemory() public view returns (bytes memory m) { m = x; }
-    function indexAccess() public view returns (bytes1) { return x[0]; }
-    function assignTo() public { x = "def"; }
-    function assignToLong() public { x = "1234567890123456789012345678901234567"; }
-    function copyToStorage() public { y = x; }
-    function copyFromStorageShort() public { y = "abc"; x = y; }
-    function copyFromStorageLong() public { y = "1234567890123456789012345678901234567"; x = y; }
-    function arrayPop() public { x.pop(); }
-    function arrayPush() public { x.push("t"); }
-    function arrayPushEmpty() public { x.push(); }
-    function del() public { delete x; }
-}
-// ----
-// x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
-// abiEncode() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
-// abiEncodePacked() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
-// copyToMemory() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
-// indexAccess() -> 0x6100000000000000000000000000000000000000000000000000000000000000
-// arrayPushEmpty()
-// arrayPush()
-// x() -> 0x20, 5, 0x6162630074000000000000000000000000000000000000000000000000000000
-// arrayPop()
-// assignToLong()
-// x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
-// assignTo()
-// x() -> 0x20, 3, 0x6465660000000000000000000000000000000000000000000000000000000000
-// copyFromStorageShort()
-// x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
-// copyFromStorageLong()
-// gas irOptimized: 121106
-// gas legacy: 121904
-// gas legacyOptimized: 121398
-// x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
-// copyToStorage()
-// x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
-// y() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
-// del()
-// x() -> 0x20, 0x00
-// invalidateXLong()
-// x() -> FAILURE, hex"4e487b71", 0x22
-// abiEncode() -> FAILURE, hex"4e487b71", 0x22
-// abiEncodePacked() -> FAILURE, hex"4e487b71", 0x22
-// copyToMemory() -> FAILURE, hex"4e487b71", 0x22
-// indexAccess() -> FAILURE, hex"4e487b71", 0x22
-// arrayPushEmpty() -> FAILURE, hex"4e487b71", 0x22
-// arrayPush() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// arrayPop() -> FAILURE, hex"4e487b71", 0x22
-// assignToLong() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// assignTo() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// copyFromStorageShort() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// copyFromStorageLong() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// copyToStorage() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// y() -> 0x20, 0x00
-// del() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// invalidateXShort()
-// x() -> FAILURE, hex"4e487b71", 0x22
-// abiEncode() -> FAILURE, hex"4e487b71", 0x22
-// abiEncodePacked() -> FAILURE, hex"4e487b71", 0x22
-// copyToMemory() -> FAILURE, hex"4e487b71", 0x22
-// indexAccess() -> FAILURE, hex"4e487b71", 0x22
-// arrayPushEmpty() -> FAILURE, hex"4e487b71", 0x22
-// arrayPush() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// arrayPop() -> FAILURE, hex"4e487b71", 0x22
-// assignToLong() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// assignTo() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// copyFromStorageShort() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// copyFromStorageLong() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// copyToStorage() -> FAILURE, hex"4e487b71", 0x22
-// x() -> FAILURE, hex"4e487b71", 0x22
-// y() -> 0x20, 0x00
diff --git a/test/libsolidity/semanticTests/array/memory.sol b/test/libsolidity/semanticTests/array/memory.sol
deleted file mode 100644
index 88c18d4949b3..000000000000
--- a/test/libsolidity/semanticTests/array/memory.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma solidity >= 0.6.0;
-
-contract C {
-    function h(uint[4] memory n) public pure returns (uint) {
-        return n[0] + n[1] + n[2] + n[3];
-    }
-
-    function i(uint[4] memory n) public view returns (uint) {
-        return this.h(n) * 2;
-    }
-}
-// ----
-// h(uint256[4]): 1, 2, 3, 4 -> 10
-// i(uint256[4]): 1, 2, 3, 4 -> 20
diff --git a/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol b/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
deleted file mode 100644
index 0ce758d9d77c..000000000000
--- a/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// Computes binomial coefficients the chinese way
-contract C {
-    function f(uint256 n, uint256 k) public returns (uint256) {
-        uint256[][] memory rows = new uint256[][](n + 1);
-        for (uint256 i = 1; i <= n; i++) {
-            rows[i] = new uint256[](i);
-            rows[i][0] = rows[i][rows[i].length - 1] = 1;
-            for (uint256 j = 1; j < i - 1; j++)
-                rows[i][j] = rows[i - 1][j - 1] + rows[i - 1][j];
-        }
-        return rows[n][k - 1];
-    }
-}
-// ----
-// f(uint256,uint256): 3, 1 -> 1
-// f(uint256,uint256): 9, 5 -> 70
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop.sol b/test/libsolidity/semanticTests/array/pop/array_pop.sol
deleted file mode 100644
index bbb140a38e9b..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract c {
-    uint256[] data;
-
-    function test() public returns (uint256 x, uint256 l) {
-        data.push(7);
-        data.push(3);
-        x = data.length;
-        data.pop();
-        x = data.length;
-        data.pop();
-        l = data.length;
-    }
-}
-// ----
-// test() -> 1, 0
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
deleted file mode 100644
index a08d27ac0b38..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract c {
-    uint256 a;
-    uint256 b;
-    uint256 c;
-    uint16[] inner = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
-    uint16[][] data;
-    function test() public returns (uint x, uint y, uint z) {
-        for (uint i = 1; i <= 48; i++)
-            data.push(inner);
-        for (uint j = 1; j <= 10; j++)
-            data.pop();
-        x = data[data.length - 1][0];
-        for (uint k = 1; k <= 10; k++)
-            data.pop();
-        y = data[data.length - 1][1];
-        for (uint l = 1; l <= 10; l++)
-            data.pop();
-        z = data[data.length - 1][2];
-        for (uint m = 1; m <= 18; m++)
-            data.pop();
-        delete inner;
-    }
-}
-// ----
-// test() -> 1, 2, 3
-// gas irOptimized: 1827730
-// gas legacy: 1822466
-// gas legacyOptimized: 1813404
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
deleted file mode 100644
index 6130130da2de..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-    uint256[] data;
-
-    function test() public returns (bool) {
-        data.pop();
-        return true;
-    }
-}
-// ----
-// test() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol b/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
deleted file mode 100644
index 43d7c3a9836d..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// This tests that the compiler knows the correct size of the function on the stack.
-contract c {
-    uint256[] data;
-
-    function test() public returns (uint256 x) {
-        x = 2;
-        data.pop;
-        x = 3;
-    }
-}
-// ----
-// test() -> 3
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
deleted file mode 100644
index 17890cd199a2..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-    uint[] data;
-    function test() public {
-        data.push(7);
-        data.pop();
-    }
-}
-// ----
-// test() ->
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
deleted file mode 100644
index 1b69ab336bc7..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract c {
-    uint16[] data;
-    function test() public returns (uint16 x, uint16 y, uint16 z) {
-        for (uint i = 1; i <= 48; i++)
-            data.push(uint16(i));
-        for (uint j = 1; j <= 10; j++)
-            data.pop();
-        x = data[data.length - 1];
-        for (uint k = 1; k <= 10; k++)
-            data.pop();
-        y = data[data.length - 1];
-        for (uint l = 1; l <= 10; l++)
-            data.pop();
-        z = data[data.length - 1];
-        for (uint m = 1; m <= 18; m++)
-            data.pop();
-    }
-}
-// ----
-// test() -> 38, 28, 18
-// gas irOptimized: 148538
-// gas legacy: 151184
-// gas legacyOptimized: 142418
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
deleted file mode 100644
index d2e5995c0070..000000000000
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract c {
-    uint256 a;
-    uint256 b;
-    uint256 c;
-    uint24[] data;
-    function test() public returns (uint24 x, uint24 y) {
-        for (uint i = 1; i <= 30; i++)
-            data.push(uint24(i));
-        for (uint j = 1; j <= 10; j++)
-            data.pop();
-        x = data[data.length - 1];
-        for (uint k = 1; k <= 10; k++)
-            data.pop();
-        y = data[data.length - 1];
-        for (uint l = 1; l <= 10; l++)
-            data.pop();
-    }
-}
-// ----
-// test() -> 20, 10
-// gas irOptimized: 126068
-// gas legacy: 127216
-// gas legacyOptimized: 122224
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
deleted file mode 100644
index 8f0152180e35..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract c {
-    bytes data;
-
-    function test() public returns (uint256 x, uint256 y, uint256 l) {
-        data.push(0x07);
-        data.push(0x03);
-        x = data.length;
-        data.pop();
-        data.pop();
-        data.push(0x02);
-        y = data.length;
-        l = data.length;
-    }
-}
-// ----
-// test() -> 2, 1, 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
deleted file mode 100644
index c64d93c1208a..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract c {
-    bytes data;
-
-    function test() public returns (bytes memory) {
-        for (uint256 i = 0; i < 33; i++) data.push(0x03);
-        for (uint256 j = 0; j < 4; j++) data.pop();
-        return data;
-    }
-}
-// ----
-// test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109310
-// gas legacy: 101220
-// gas legacyOptimized: 123422
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
deleted file mode 100644
index d860275e404f..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract c {
-    uint256 a;
-    uint256 b;
-    uint256 c;
-    bytes data;
-
-    function test() public returns (bool) {
-        data.pop();
-        return true;
-    }
-}
-// ----
-// test() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
deleted file mode 100644
index f74221712534..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// This tests that the compiler knows the correct size of the function on the stack.
-contract c {
-    bytes data;
-
-    function test() public returns (uint256 x) {
-        x = 2;
-        data.pop;
-        x = 3;
-    }
-}
-// ----
-// test() -> 3
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
deleted file mode 100644
index a3ba9d4d2111..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract c {
-    uint256 a;
-    uint256 b;
-    uint256 c;
-    bytes data;
-    function test() public returns (bool) {
-        for (uint8 i = 0; i <= 40; i++)
-            data.push(bytes1(i+1));
-        for (int8 j = 40; j >= 0; j--) {
-            require(data[uint8(j)] == bytes1(uint8(j+1)));
-            require(data.length == uint8(j+1));
-            data.pop();
-        }
-        return true;
-    }
-}
-// ----
-// test() -> true
-// gas irOptimized: 140154
-// gas legacy: 178397
-// gas legacyOptimized: 163832
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
deleted file mode 100644
index a014e761ea24..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract c {
-    uint256 a;
-    uint256 b;
-    bytes data;
-    function test() public {
-        for (uint8 i = 0; i <= 40; i++)
-            data.push(0x03);
-        for (uint8 j = 0; j <= 40; j++) {
-            assembly {
-                mstore(0, "garbage")
-            }
-            data.pop();
-        }
-    }
-}
-// ----
-// test() ->
-// gas irOptimized: 113782
-// gas legacy: 131245
-// gas legacyOptimized: 126668
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
deleted file mode 100644
index 5b1a61839183..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract c {
-    bytes data;
-
-    function test() public returns (bytes memory) {
-        for (uint256 i = 0; i < 34; i++) data.push(0x03);
-        data.pop();
-        return data;
-    }
-}
-// ----
-// test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 107343
-// gas legacy: 121408
-// gas legacyOptimized: 120534
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
deleted file mode 100644
index a89f8a2acebf..000000000000
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract c {
-    bytes data;
-    function test() public {
-        data.push(0x07);
-        data.push(0x05);
-        data.push(0x03);
-        data.pop();
-        data.pop();
-        data.pop();
-    }
-}
-// ----
-// test() ->
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/parenthesized.sol b/test/libsolidity/semanticTests/array/pop/parenthesized.sol
deleted file mode 100644
index 478040fd2aa0..000000000000
--- a/test/libsolidity/semanticTests/array/pop/parenthesized.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  int[] data;
-  function f() public returns (uint) {
-    data.push(1);
-    (data.pop)();
-    return data.length;
-  }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
deleted file mode 100644
index 3e7ceb5a8b7d..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract c {
-    uint256[] data;
-
-    function test()
-        public
-        returns (uint256 x, uint256 y, uint256 z, uint256 l)
-    {
-        data.push(5);
-        x = data[0];
-        data.push(4);
-        y = data[1];
-        data.push(3);
-        l = data.length;
-        z = data[2];
-    }
-}
-// ----
-// test() -> 5, 4, 3, 3
-// gas irOptimized: 111363
-// gas legacy: 111807
-// gas legacyOptimized: 111122
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested.sol b/test/libsolidity/semanticTests/array/push/array_push_nested.sol
deleted file mode 100644
index a86679d3d135..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push_nested.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint8 b = 23;
-    uint120[][] s;
-    uint8 a = 17;
-    function f() public {
-        s.push();
-        assert(s.length == 1);
-        assert(s[0].length == 0);
-        s[0].push();
-        assert(s[0].length == 1);
-        assert(s[0][0] == 0);
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
deleted file mode 100644
index a010a9938ac7..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint8 b = 23;
-    uint120[][] s;
-    uint8 a = 17;
-    function f(uint120[] calldata c) public returns(uint120) {
-        s.push(c);
-        assert(s.length == 1);
-        assert(s[0].length == c.length);
-        assert(s[0].length > 0);
-        return s[0][0];
-    }
-}
-// ----
-// f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 112812
-// gas legacy: 113659
-// gas legacyOptimized: 113482
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
deleted file mode 100644
index 0d85613f1043..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint8 b = 23;
-    uint120[][] s;
-    uint8 a = 17;
-    function f() public returns(uint120) {
-        delete s;
-        uint120[] memory m = new uint120[](3);
-        m[0] = 1;
-        s.push(m);
-        assert(s.length == 1);
-        assert(s[0].length == m.length);
-        assert(s[0].length > 0);
-        return s[0][0];
-    }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
deleted file mode 100644
index e7a3bdbd1f18..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract c {
-    uint80[] x;
-
-    function test() public returns (uint80, uint80, uint80, uint80) {
-        x.push(1);
-        x.push(2);
-        x.push(3);
-        x.push(4);
-        x.push(5);
-        x.pop();
-        return (x[0], x[1], x[2], x[3]);
-    }
-}
-// ----
-// test() -> 1, 2, 3, 4
-// gas irOptimized: 93017
-// gas legacy: 92798
-// gas legacyOptimized: 92062
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
deleted file mode 100644
index 06c5db88b73c..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract c {
-    struct S {
-        uint16 a;
-        uint16 b;
-        uint16[3] c;
-        uint16[] d;
-    }
-    S[] data;
-
-    function test() public returns (uint16, uint16, uint16, uint16) {
-        S memory s;
-        s.a = 2;
-        s.b = 3;
-        s.c[2] = 4;
-        s.d = new uint16[](4);
-        s.d[2] = 5;
-        data.push(s);
-        return (data[0].a, data[0].b, data[0].c[2], data[0].d[2]);
-    }
-}
-// ----
-// test() -> 2, 3, 4, 5
-// gas irOptimized: 135103
-// gas legacy: 147443
-// gas legacyOptimized: 146434
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
deleted file mode 100644
index 4a33f816d773..000000000000
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-
-contract c {
-    struct S {
-        uint16 a;
-        uint16 b;
-        uint16[3] c;
-        uint16[] d;
-    }
-    S[] data;
-
-    function test(S calldata c) public returns (uint16, uint16, uint16, uint16) {
-        data.push(c);
-        return (data[0].a, data[0].b, data[0].c[2], data[0].d[2]);
-    }
-}
-// ----
-// test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 137061
-// gas legacy: 142423
-// gas legacyOptimized: 137991
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push.sol b/test/libsolidity/semanticTests/array/push/byte_array_push.sol
deleted file mode 100644
index 2e0288d24327..000000000000
--- a/test/libsolidity/semanticTests/array/push/byte_array_push.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract c {
-    bytes data;
-
-    function test() public returns (bool x) {
-        data.push(0x05);
-        if (data.length != 1) return true;
-        if (data[0] != 0x05) return true;
-        data.push(0x04);
-        if (data[1] != 0x04) return true;
-        data.push(0x03);
-        uint256 l = data.length;
-        if (data[2] != 0x03) return true;
-        if (l != 0x03) return true;
-    }
-}
-// ----
-// test() -> false
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
deleted file mode 100644
index 5f1fe0fac770..000000000000
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-// Tests transition between short and long encoding
-contract c {
-    bytes data;
-
-    function test() public returns (uint256) {
-        for (uint8 i = 1; i < 40; i++) {
-            data.push(bytes1(i));
-            if (data.length != i) return 0x1000 + i;
-            if (data[data.length - 1] != bytes1(i)) return i;
-        }
-        for (uint8 i = 1; i < 40; i++)
-            if (data[i - 1] != bytes1(i)) return 0x1000000 + i;
-        return 0;
-    }
-}
-// ----
-// test() -> 0
-// gas irOptimized: 167700
-// gas legacy: 206219
-// gas legacyOptimized: 197297
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
deleted file mode 100644
index 30ed47920d9c..000000000000
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    bytes[] a;
-
-    function f() public {
-        a.push("abc");
-        a.push("abcdefghabcdefghabcdefghabcdefgh");
-        a.push("abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh");
-        assert(a[0][0] == "a");
-        assert(a[1][31] == "h");
-        assert(a[2][32] == "a");
-    }
-}
-// ----
-// f() ->
-// gas irOptimized: 179112
-// gas legacy: 181014
-// gas legacyOptimized: 180422
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
deleted file mode 100644
index cf6f0687d910..000000000000
--- a/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	uint[] array;
-
-	function f() public returns (uint) {
-		uint y = array.push();
-		return y;
-	}
-
-	function lv(uint value) public {
-		array.push() = value;
-	}
-
-	function a(uint index) public view returns (uint) {
-		return array[index];
-	}
-
-	function l() public view returns (uint) {
-		return array.length;
-	}
-
-}
-// ----
-// l() -> 0
-// lv(uint256): 42 ->
-// l() -> 1
-// a(uint256): 0 -> 42
-// f() -> 0
-// l() -> 2
-// a(uint256): 1 -> 0
-// lv(uint256): 111 ->
-// l() -> 3
-// a(uint256): 2 -> 111
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
deleted file mode 100644
index 6901e32b8b54..000000000000
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-contract C {
-	uint[][] array2d;
-
-	function l() public returns (uint) {
-		return array2d.length;
-	}
-
-	function ll(uint index) public returns (uint) {
-		return array2d[index].length;
-	}
-
-	function a(uint i, uint j) public returns (uint) {
-		return array2d[i][j];
-	}
-
-	function f(uint index, uint value) public {
-		uint[] storage pointer = array2d.push();
-		for (uint i = 0; i <= index; ++i)
-			pointer.push();
-		pointer[index] = value;
-	}
-
-	function lv(uint value) public {
-		array2d.push().push() = value;
-	}
-}
-// ----
-// l() -> 0
-// f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112266
-// gas legacy: 107920
-// gas legacyOptimized: 101897
-// l() -> 1
-// ll(uint256): 0 -> 43
-// a(uint256,uint256): 0, 42 -> 64
-// f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 118686
-// gas legacy: 109972
-// gas legacyOptimized: 96331
-// l() -> 2
-// ll(uint256): 1 -> 85
-// a(uint256,uint256): 0, 42 -> 64
-// a(uint256,uint256): 1, 84 -> 128
-// lv(uint256): 512 ->
-// a(uint256,uint256): 2, 0 -> 512
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
deleted file mode 100644
index b19ebcc7367f..000000000000
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	bytes array;
-
-	function f() public {
-		array.push();
-	}
-
-	function g(uint x) public {
-		for (uint i = 0; i < x; ++i)
-			array.push() = bytes1(uint8(i));
-	}
-
-	function l() public returns (uint) {
-		return array.length;
-	}
-
-	function a(uint index) public view returns (bytes1) {
-		return array[index];
-	}
-}
-// ----
-// l() -> 0
-// g(uint256): 70 ->
-// gas irOptimized: 180849
-// gas legacy: 175185
-// gas legacyOptimized: 175005
-// l() -> 70
-// a(uint256): 69 -> left(69)
-// f() ->
-// l() -> 71
-// a(uint256): 70 -> 0
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol b/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
deleted file mode 100644
index 6f626d9c350a..000000000000
--- a/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-	}
-
-	S[] array;
-
-	function f(uint y) public {
-		S storage s = array.push();
-		g(s, y);
-	}
-
-	function g(S storage s, uint y) internal {
-		s.x = y;
-	}
-
-	function h(uint y) public {
-		g(array.push(), y);
-	}
-
-	function lv(uint y) public {
-		array.push().x = y;
-	}
-
-	function a(uint i) public returns (uint) {
-		return array[i].x;
-	}
-
-	function l() public returns (uint) {
-		return array.length;
-	}
-
-}
-// ----
-// l() -> 0
-// f(uint256): 42 ->
-// l() -> 1
-// a(uint256): 0 -> 42
-// h(uint256): 84 ->
-// l() -> 2
-// a(uint256): 1 -> 84
-// lv(uint256): 4096 ->
-// l() -> 3
-// a(uint256): 2 -> 4096
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
deleted file mode 100644
index 92b0c06bfb26..000000000000
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-// Invoke some features that use memory and test that they do not interfere with each other.
-contract Helper {
-    uint256 public flag;
-
-    constructor(uint256 x) {
-        flag = x;
-    }
-}
-
-
-contract Main {
-    mapping(uint256 => uint256) map;
-
-    function f(uint256 x) public returns (uint256) {
-        map[x] = x;
-        return
-            (new Helper(uint256(keccak256(abi.encodePacked(this.g(map[x]))))))
-                .flag();
-    }
-
-    function g(uint256 a) public returns (uint256) {
-        return map[a];
-    }
-}
-// ----
-// f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 111924
-// gas legacy: 125162
-// gas legacyOptimized: 113012
diff --git a/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
deleted file mode 100644
index 8288e1e86165..000000000000
--- a/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract c {
-    uint spacer1;
-    uint spacer2;
-    uint[3] data;
-    function fill() public {
-        for (uint i = 0; i < data.length; ++i) data[i] = i+1;
-    }
-    function clear() public { delete data; }
-}
-// ----
-// storageEmpty -> 1
-// fill() ->
-// storageEmpty -> 0
-// clear() ->
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol b/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
deleted file mode 100644
index c9c489a8fccd..000000000000
--- a/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint256[] calldata x, uint256[] calldata y, uint256 i) external returns (uint256) {
-        x = y;
-        return x[i];
-    }
-}
-// ----
-// f(uint256[],uint256[],uint256): 0x60, 0xA0, 1, 1, 0, 2, 1, 2 -> 2
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
deleted file mode 100644
index 079364d21ffc..000000000000
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    function f1(bytes calldata c1, uint256 s, uint256 e, bytes calldata c2) public returns (bool) {
-        return keccak256(c1[s:e]) == keccak256(c2);
-    }
-
-    function f2(bytes calldata c, uint256 s) public returns (uint256, bytes memory) {
-        return abi.decode(c[s:], (uint256, bytes));
-    }
-
-    function f3(bytes calldata c1, uint256 s, uint256 e, bytes calldata c2) public returns (bool) {
-        bytes memory a = abi.encode(c1[s:e]);
-        bytes memory b = abi.encode(c2);
-        if (a.length != b.length) { return false; }
-        for (uint256 i = 0; i < a.length; i++) {
-            if (a[i] != b[i]) { return false; }
-        }
-        return true;
-    }
-
-    function f4(bytes calldata c1, uint256 s, uint256 e, bytes calldata c2) public returns (bool) {
-        bytes memory a = abi.encodePacked(c1[s:e]);
-        bytes memory b = abi.encodePacked(c2);
-        if (a.length != b.length) { return false; }
-        for (uint256 i = 0; i < a.length; i++) {
-            if (a[i] != b[i]) { return false; }
-        }
-        return true;
-    }
-}
-// ----
-// f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
-// f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
-// f2(bytes,uint256): 0x40, 0, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// f3(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
-// f3(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
-// f4(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
-// f4(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
deleted file mode 100644
index 89096c99a208..000000000000
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint128 p1;
-        uint256[3] a;
-        uint32 p2;
-    }
-    function f(S[] calldata c) internal returns (S[] memory) {
-        return c;
-    }
-    function g(S[] calldata c, uint256 s, uint256 e) public returns (S[] memory) {
-        return f(c[s:e]);
-    }
-
-    function f1(uint256[3][] calldata c) internal returns (uint256[3][] memory) {
-        return c;
-    }
-    function g1(uint256[3][] calldata c, uint256 s, uint256 e) public returns (uint256[3][] memory) {
-        return f1(c[s:e]);
-    }
-}
-// ----
-// g((uint128,uint256[3],uint32)[],uint256,uint256): 0x60, 1, 3, 4, 55, 1, 2, 3, 66, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88, 88, 4, 5, 6, 99 -> 0x20, 2, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88
-// g1(uint256[3][],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> 0x20, 2, 4, 5, 6, 7, 8, 9
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
deleted file mode 100644
index e37bdf0c0594..000000000000
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    function f(int[] calldata b, uint256 start, uint256 end) public returns (int) {
-        int[] memory m = b[start:end];
-        uint len = end - start;
-        assert(len == m.length);
-        for (uint i = 0; i < len; i++) {
-            assert(b[start:end][i] == m[i]);
-        }
-        return [b[start:end]][0][0];
-    }
-
-    function g(int[] calldata b, uint256 start, uint256 end) public returns (int[] memory) {
-        return b[start:end];
-    }
-
-    function h1(int[] memory b) internal returns (int[] memory) {
-        return b;
-    }
-
-    function h(int[] calldata b, uint256 start, uint256 end) public returns (int[] memory) {
-        return h1(b[start:end]);
-    }
-}
-// ----
-// f(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
-// g(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 0x20, 2, 2, 3
-// h(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 0x20, 2, 2, 3
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
deleted file mode 100644
index b50d74e4c3f9..000000000000
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    int[] s;
-    function f(int[] calldata b, uint256 start, uint256 end) public returns (int) {
-        s = b[start:end];
-        uint len = end - start;
-        assert(len == s.length);
-        for (uint i = 0; i < len; i++) {
-            assert(b[start:end][i] == s[i]);
-        }
-        return s[0];
-    }
-}
-// ----
-// f(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
diff --git a/test/libsolidity/semanticTests/array/storage_array_ref.sol b/test/libsolidity/semanticTests/array/storage_array_ref.sol
deleted file mode 100644
index 37292ae874d1..000000000000
--- a/test/libsolidity/semanticTests/array/storage_array_ref.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-contract BinarySearch {
-    /// Finds the position of _value in the sorted list _data.
-    /// Note that "internal" is important here, because storage references only work for internal or private functions
-    function find(uint256[] storage _data, uint256 _value)
-        internal
-        returns (uint256 o_position)
-    {
-        return find(_data, 0, _data.length, _value);
-    }
-
-    function find(
-        uint256[] storage _data,
-        uint256 _begin,
-        uint256 _len,
-        uint256 _value
-    ) private returns (uint256 o_position) {
-        if (_len == 0 || (_len == 1 && _data[_begin] != _value))
-            return type(uint256).max; // failure
-        uint256 halfLen = _len / 2;
-        uint256 v = _data[_begin + halfLen];
-        if (_value < v) return find(_data, _begin, halfLen, _value);
-        else if (_value > v)
-            return find(_data, _begin + halfLen + 1, halfLen - 1, _value);
-        else return _begin + halfLen;
-    }
-}
-
-
-contract Store is BinarySearch {
-    uint256[] data;
-
-    function add(uint256 v) public {
-        data.push(0);
-        data[data.length - 1] = v;
-    }
-
-    function find(uint256 v) public returns (uint256) {
-        return find(data, v);
-    }
-}
-// ----
-// find(uint256): 7 -> -1
-// add(uint256): 7 ->
-// find(uint256): 7 -> 0
-// add(uint256): 11 ->
-// add(uint256): 17 ->
-// add(uint256): 27 ->
-// add(uint256): 31 ->
-// add(uint256): 32 ->
-// add(uint256): 66 ->
-// add(uint256): 177 ->
-// find(uint256): 7 -> 0
-// find(uint256): 27 -> 3
-// find(uint256): 32 -> 5
-// find(uint256): 176 -> -1
-// find(uint256): 0 -> -1
-// find(uint256): 400 -> -1
diff --git a/test/libsolidity/semanticTests/array/string_allocation_bug.sol b/test/libsolidity/semanticTests/array/string_allocation_bug.sol
deleted file mode 100644
index d6dadb78a964..000000000000
--- a/test/libsolidity/semanticTests/array/string_allocation_bug.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract Sample {
-    struct s {
-        uint16 x;
-        uint16 y;
-        string a;
-        string b;
-    }
-    s[2] public p;
-
-    constructor() {
-        s memory m;
-        m.x = 0xbbbb;
-        m.y = 0xcccc;
-        m.a = "hello";
-        m.b = "world";
-        p[0] = m;
-    }
-}
-// ----
-// p(uint256): 0x0 -> 0xbbbb, 0xcccc, 0x80, 0xc0, 0x05, "hello", 0x05, "world"
diff --git a/test/libsolidity/semanticTests/array/string_bytes_conversion.sol b/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
deleted file mode 100644
index 9578fc4f758a..000000000000
--- a/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Test {
-    string s;
-    bytes b;
-
-    function f(string memory _s, uint256 n) public returns (bytes1) {
-        b = bytes(_s);
-        s = string(b);
-        return bytes(s)[n];
-    }
-
-    function l() public returns (uint256) {
-        return bytes(s).length;
-    }
-}
-// ----
-// f(string,uint256): 0x40, 0x02, 0x06, "abcdef" -> "c"
-// l() -> 0x06
diff --git a/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol b/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
deleted file mode 100644
index dfabd26c095a..000000000000
--- a/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    bytes public s = "abc";
-    bytes public s1 = "abcd";
-    function f() public {
-        s = "abcd";
-        s1 = "abc";
-    }
-    function g() public {
-        (s, s1) = ("abc", "abcd");
-    }
-}
-// ----
-// s() -> 0x20, 3, "abc"
-// s1() -> 0x20, 4, "abcd"
-// f() ->
-// s() -> 0x20, 4, "abcd"
-// s1() -> 0x20, 3, "abc"
-// g() ->
-// s() -> 0x20, 3, "abc"
-// s1() -> 0x20, 4, "abcd"
diff --git a/test/libsolidity/semanticTests/array/strings_in_struct.sol b/test/libsolidity/semanticTests/array/strings_in_struct.sol
deleted file mode 100644
index bacf8dec7a00..000000000000
--- a/test/libsolidity/semanticTests/array/strings_in_struct.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract buggystruct {
-    Buggy public bug;
-
-    struct Buggy {
-        uint256 first;
-        uint256 second;
-        uint256 third;
-        string last;
-    }
-
-    constructor() {
-        bug = Buggy(10, 20, 30, "asdfghjkl");
-    }
-
-    function getFirst() public returns (uint256) {
-        return bug.first;
-    }
-
-    function getSecond() public returns (uint256) {
-        return bug.second;
-    }
-
-    function getThird() public returns (uint256) {
-        return bug.third;
-    }
-
-    function getLast() public returns (string memory) {
-        return bug.last;
-    }
-}
-// ----
-// getFirst() -> 0x0a
-// getSecond() -> 0x14
-// getThird() -> 0x1e
-// getLast() -> 0x20, 0x09, "asdfghjkl"
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
deleted file mode 100644
index d74db942c6a6..000000000000
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public returns (uint i) {
-        assembly {
-            for {} lt(i, 10) { i := add(i, 1) }
-            {
-                if eq(i, 6) { break }
-                i := add(i, 1)
-            }
-        }
-    }
-}
-// ----
-// f() -> 6
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
deleted file mode 100644
index f25a3c06a0bc..000000000000
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public returns (uint k) {
-        assembly {
-            for {let i := 0} lt(i, 10) { i := add(i, 1) }
-            {
-                if eq(mod(i, 2), 0) { continue }
-                k := add(k, 1)
-            }
-        }
-    }
-}
-// ----
-// f() -> 5
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
deleted file mode 100644
index 3a13e9f0e674..000000000000
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f(uint x) public returns (uint i) {
-        assembly {
-            for {} lt(i, 10) { i := add(i, 1) }
-            {
-                if eq(x, 0) { i := 2 break }
-                for {} lt(x, 3) { i := 17 x := 9 } {
-                    if eq(x, 1) { continue }
-                    if eq(x, 2) { break }
-                }
-                if eq(x, 4) { i := 90 }
-            }
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 2
-// f(uint256): 1 -> 18
-// f(uint256): 2 -> 10
-// f(uint256): 4 -> 91
diff --git a/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol b/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
deleted file mode 100644
index 2fc479d0e10a..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    bytes32 constant x = keccak256("abc");
-
-    function f() public returns (bytes32) {
-        return x;
-    }
-}
-// ----
-// f() -> 0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol b/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
deleted file mode 100644
index 008a0467d42f..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public returns(bytes32) {
-        return blockhash(1);
-    }
-    function g() public returns(bytes32) {
-        return blockhash(2);
-    }
-    function h() public returns(bytes32) {
-        return blockhash(3);
-    }
-}
-// ----
-// f() -> 0x3737373737373737373737373737373737373737373737373737373737373738
-// g() -> 0x3737373737373737373737373737373737373737373737373737373737373739
-// h() -> 0x373737373737373737373737373737373737373737373737373737373737373a
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol b/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
deleted file mode 100644
index 0b532da0ec8d..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function blockhash(uint256 blockNumber) public returns(bytes32) { bytes32 x; return x; }
-    function f() public returns(bytes32) { return blockhash(3); }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol b/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
deleted file mode 100644
index 2e771032bc7e..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint256 public x;
-
-    function f() public pure returns (bytes4) {
-        return this.f.selector;
-    }
-
-    function g() public returns (bytes4) {
-        function () pure external returns (bytes4) fun = this.f;
-        return fun.selector;
-    }
-
-    function h() public returns (bytes4) {
-        function () pure external returns (bytes4) fun = this.f;
-        return fun.selector;
-    }
-
-    function i() public pure returns (bytes4) {
-        return this.x.selector;
-    }
-}
-// ----
-// f() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
-// g() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
-// h() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
-// i() -> 0x0c55699c00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
deleted file mode 100644
index 91a26945cd59..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract c {
-    bytes data;
-
-    function foo() public returns (bytes32) {
-        data.push("x");
-        data.push("y");
-        data.push("z");
-        return keccak256(abi.encodePacked("b", keccak256(data), "a"));
-    }
-}
-// ----
-// foo() -> 0xb338eefce206f9f57b83aa738deecd5326dc4b72dd81ee6a7c621a6facb7acdc
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256.sol
deleted file mode 100644
index e01a56956e3e..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(int256 input) public returns (bytes32 sha256hash) {
-        return keccak256(abi.encodePacked(bytes32(uint256(input))));
-    }
-}
-// ----
-// f(int256): 4 -> 0x8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b
-// f(int256): 5 -> 0x036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0
-// f(int256): -1 -> 0xa9c584056064687e149968cbab758a3376d22aedc6a55823d1b3ecbee81b8fb9
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
deleted file mode 100644
index f75c569e7777..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bytes32) {
-        return keccak256("");
-    }
-}
-// ----
-// f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
deleted file mode 100644
index 972aee839e0e..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    function foo(uint256 a, uint256 b, uint256 c) public returns (bytes32 d) {
-        d = keccak256(abi.encodePacked(a, b, c));
-    }
-}
-// ----
-// foo(uint256,uint256,uint256): 0xa, 0xc, 0xd -> 0xbc740a98aae5923e8f04c9aa798c9ee82f69e319997699f2782c40828db9fd81
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
deleted file mode 100644
index 01397f55f85e..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    function foo(uint256 a, uint16 b) public returns (bytes32 d) {
-        d = keccak256(abi.encodePacked(a, b, uint8(145)));
-    }
-}
-// ----
-// foo(uint256,uint16): 0xa, 0xc -> 0x88acd45f75907e7c560318bc1a5249850a0999c4896717b1167d05d116e6dbad
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
deleted file mode 100644
index b157178fb857..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract c {
-    function foo() public returns (bytes32 d) {
-        d = keccak256("foo");
-    }
-
-    function bar(uint256 a, uint16 b) public returns (bytes32 d) {
-        d = keccak256(abi.encodePacked(a, b, uint8(145), "foo"));
-    }
-}
-// ----
-// foo() -> 0x41b1a0649752af1b28b3dc29a1556eee781e4a4c3a1f7f53f90fa834de098c4d
-// bar(uint256,uint16): 0xa, 0xc -> 0x6990f36476dc412b1c4baa48e2d9f4aa4bb313f61fda367c8fdbbb2232dc6146
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol
deleted file mode 100644
index cad49daec288..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(int256 _input) public returns (bytes32 hash) {
-        uint24 b = 65536;
-        uint c = 256;
-        bytes32 input = bytes32(uint256(_input));
-        return keccak256(abi.encodePacked(uint8(8), input, b, input, c));
-    }
-}
-// ----
-// f(int256): 4 -> 0xd270285b9966fefc715561efcd09d5b6a8deb15596f7c53cb4a1bb73aa55ac3a
-// f(int256): 5 -> 0xf2f92566c5653600c1e527a7073e5d881576d12bb51887c0b8f3e1f81865b03d
-// f(int256): -1 -> 0xbc78b45e0db67af5af72e4ab62757c67aefa7388cdf0c4e74f8b5fe9dd5d9d13
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol
deleted file mode 100644
index ea6d781898f0..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint120[3] x;
-    function f() public returns (bytes32 hash1, bytes32 hash2, bytes32 hash3) {
-        uint120[] memory y = new uint120[](3);
-        x[0] = y[0] = uint120(type(uint).max - 1);
-        x[1] = y[1] = uint120(type(uint).max - 2);
-        x[2] = y[2] = uint120(type(uint).max - 3);
-        hash1 = keccak256(abi.encodePacked(x));
-        hash2 = keccak256(abi.encodePacked(y));
-        hash3 = keccak256(abi.encodePacked(this.f));
-    }
-}
-// ----
-// f() -> 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0x0e9229fb1d2cd02cee4b6c9f25497777014a8766e3479666d1c619066d2887ec
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
deleted file mode 100644
index 1904e814021b..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract c {
-    bytes data;
-
-    function foo() public returns (bool) {
-        data.push("f");
-        data.push("o");
-        data.push("o");
-        return keccak256(data) == keccak256("foo");
-    }
-}
-// ----
-// foo() -> true
diff --git a/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol b/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
deleted file mode 100644
index f28658fe7dc1..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function foo(uint256 a) public returns (bytes4 value) {
-        return msg.sig;
-    }
-}
-// ----
-// foo(uint256): 0x0 -> 0x2fbebd3800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol b/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
deleted file mode 100644
index 7ff53efaa478..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    function boo() public returns (bytes4 value) {
-        return msg.sig;
-    }
-
-    function foo(uint256 a) public returns (bytes4 value) {
-        return boo();
-    }
-}
-// ----
-// foo(uint256): 0x0 -> 0x2fbebd3800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol
deleted file mode 100644
index e070a65f51bb..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(int256 input) public returns (bytes32 sha256hash) {
-        return ripemd160(abi.encodePacked(bytes32(uint256(input))));
-    }
-}
-// ----
-// f(int256): 4 -> 0x1b0f3c404d12075c68c938f9f60ebea4f74941a0000000000000000000000000
-// f(int256): 5 -> 0xee54aa84fc32d8fed5a5fe160442ae84626829d9000000000000000000000000
-// f(int256): -1 -> 0x1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
deleted file mode 100644
index 330fafc4d8df..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bytes20) {
-        return ripemd160("");
-    }
-}
-// ----
-// f() -> 0x9c1185a5c5e9fc54612808977ee8f548b2258d31000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol
deleted file mode 100644
index 733bd420d038..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(int256 _input) public returns (bytes32 hash) {
-        uint24 b = 65536;
-        uint c = 256;
-        bytes32 input = bytes32(uint256(_input));
-        return ripemd160(abi.encodePacked(uint8(8), input, b, input, c));
-    }
-}
-// ----
-// f(int256): 4 -> 0xf93175303eba2a7b372174fc9330237f5ad202fc000000000000000000000000
-// f(int256): 5 -> 0x04f4fc112e2bfbe0d38f896a46629e08e2fcfad5000000000000000000000000
-// f(int256): -1 -> 0xc0a2e4b1f3ff766a9a0089e7a410391730872495000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256.sol
deleted file mode 100644
index 4060a7fadac5..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/sha256.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(int256 input) public returns (bytes32 sha256hash) {
-        return sha256(abi.encodePacked(bytes32(uint256(input))));
-    }
-}
-// ----
-// f(int256): 4 -> 0xe38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f
-// f(int256): 5 -> 0x96de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c47
-// f(int256): -1 -> 0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
deleted file mode 100644
index bb9fc36161fa..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bytes32) {
-        return sha256("");
-    }
-}
-// ----
-// f() -> 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol
deleted file mode 100644
index 19959c44056c..000000000000
--- a/test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(int256 _input) public returns (bytes32 hash) {
-        uint24 b = 65536;
-        uint c = 256;
-        bytes32 input = bytes32(uint256(_input));
-        return sha256(abi.encodePacked(uint8(8), input, b, input, c));
-    }
-}
-// ----
-// f(int256): 4 -> 0x804e0d7003cfd70fc925dc103174d9f898ebb142ecc2a286da1abd22ac2ce3ac
-// f(int256): 5 -> 0xe94921945f9068726c529a290a954f412bcac53184bb41224208a31edbf63cf0
-// f(int256): -1 -> 0xf14def4d07cd185ddd8b10a81b2238326196a38867e6e6adbcc956dc913488c7
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
deleted file mode 100644
index dc77f0dff83a..000000000000
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    event ev(uint[], uint);
-    bytes public s;
-    function h() external returns (bytes memory) {
-        uint[] memory x = new uint[](2);
-        emit ev(x, 0x21);
-        bytes memory m = new bytes(63);
-        s = m;
-        s.push();
-        return s;
-    }
-    function g() external returns (bytes memory) {
-        bytes memory m = new bytes(63);
-        assembly {
-            mstore8(add(m, add(32, 63)), 0x42)
-        }
-        s = m;
-        s.push();
-        return s;
-    }
-    function f(bytes calldata c) external returns (bytes memory) {
-        s = c;
-        s.push();
-        return s;
-    }
-}
-// ====
-// compileViaYul: also
-// ----
-// constructor() ->
-// gas irOptimized: 443406
-// gas legacy: 711299
-// gas legacyOptimized: 482382
-// h() -> 0x20, 0x40, 0x00, 0
-// ~ emit ev(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
-// g() -> 0x20, 0x40, 0, 0x00
-// f(bytes): 0x20, 33, 0, -1 -> 0x20, 0x22, 0, 0xff00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/c99_scoping_activation.sol b/test/libsolidity/semanticTests/c99_scoping_activation.sol
deleted file mode 100644
index 6edf9db476fa..000000000000
--- a/test/libsolidity/semanticTests/c99_scoping_activation.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract test {
-    function f() pure public returns (uint) {
-        uint x = 7;
-        {
-            x = 3; // This should still assign to the outer variable
-            uint x;
-            x = 4; // This should assign to the new one
-        }
-        return x;
-    }
-    function g() pure public returns (uint x) {
-        x = 7;
-        {
-            x = 3;
-            uint x;
-            return x; // This returns the new variable, i.e. 0
-        }
-    }
-    function h() pure public returns (uint x, uint a, uint b) {
-        x = 7;
-        {
-            x = 3;
-            a = x; // This should read from the outer
-            uint x = 4;
-            b = x;
-        }
-    }
-    function i() pure public returns (uint x, uint a) {
-        x = 7;
-        {
-            x = 3;
-            uint x = x; // This should read from the outer and assign to the inner
-            a = x;
-        }
-    }
-}
-// ----
-// f() -> 3
-// g() -> 0
-// h() -> 3, 3, 4
-// i() -> 3, 3
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_access.sol
deleted file mode 100644
index 6dedc2a7fee3..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_array_access.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[] calldata x, uint256 i) external returns (uint256) {
-        return x[i];
-    }
-    function f(uint256[][] calldata x, uint256 i, uint256 j) external returns (uint256) {
-        return x[i][j];
-    }
-}
-// ----
-// f(uint256[],uint256): 0x40, 0, 0 -> FAILURE, hex"4e487b71", 0x32
-// f(uint256[],uint256): 0x40, 0, 1, 23 -> 23
-// f(uint256[],uint256): 0x40, 1, 1, 23 -> FAILURE, hex"4e487b71", 0x32
-// f(uint256[],uint256): 0x40, 0, 2, 23, 42 -> 23
-// f(uint256[],uint256): 0x40, 1, 2, 23, 42 -> 42
-// f(uint256[],uint256): 0x40, 2, 2, 23, 42 -> FAILURE, hex"4e487b71", 0x32
-// f(uint256[][],uint256,uint256): 0x60, 0, 0 -> FAILURE
-// f(uint256[][],uint256,uint256): 0x60, 0, 0, 1, 0x20, 1, 23 -> 23
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_dynamic_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_array_dynamic_bytes.sol
deleted file mode 100644
index 932f19610207..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_array_dynamic_bytes.sol
+++ /dev/null
@@ -1,75 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f1(bytes[1] calldata a)
-        external
-        returns (uint256, uint256, uint256, uint256)
-    {
-        return (a[0].length, uint8(a[0][0]), uint8(a[0][1]), uint8(a[0][2]));
-    }
-
-    function f2(bytes[1] calldata a, bytes[1] calldata b)
-        external
-        returns (uint256, uint256, uint256, uint256, uint256, uint256, uint256)
-    {
-        return (
-            a[0].length,
-            uint8(a[0][0]),
-            uint8(a[0][1]),
-            uint8(a[0][2]),
-            b[0].length,
-            uint8(b[0][0]),
-            uint8(b[0][1])
-        );
-    }
-
-    function g1(bytes[2] calldata a)
-        external
-        returns (
-            uint256,
-            uint256,
-            uint256,
-            uint256,
-            uint256,
-            uint256,
-            uint256,
-            uint256
-        )
-    {
-        return (
-            a[0].length,
-            uint8(a[0][0]),
-            uint8(a[0][1]),
-            uint8(a[0][2]),
-            a[1].length,
-            uint8(a[1][0]),
-            uint8(a[1][1]),
-            uint8(a[1][2])
-        );
-    }
-
-    function g2(bytes[] calldata a) external returns (uint256[8] memory) {
-        return [
-            a.length,
-            a[0].length,
-            uint8(a[0][0]),
-            uint8(a[0][1]),
-            a[1].length,
-            uint8(a[1][0]),
-            uint8(a[1][1]),
-            uint8(a[1][2])
-        ];
-    }
-}
-
-// via yul disabled because of stack issues.
-
-// ====
-// compileViaYul: false
-// ----
-// f1(bytes[1]): 0x20, 0x20, 0x3, hex"0102030000000000000000000000000000000000000000000000000000000000" -> 0x3, 0x1, 0x2, 0x3
-// f2(bytes[1],bytes[1]): 0x40, 0xa0, 0x20, 0x3, hex"0102030000000000000000000000000000000000000000000000000000000000", 0x20, 0x2, hex"0102000000000000000000000000000000000000000000000000000000000000" -> 0x3, 0x1, 0x2, 0x3, 0x2, 0x1, 0x2
-// g1(bytes[2]): 0x20, 0x40, 0x80, 0x3, hex"0102030000000000000000000000000000000000000000000000000000000000", 0x3, hex"0405060000000000000000000000000000000000000000000000000000000000" -> 0x3, 0x1, 0x2, 0x3, 0x3, 0x4, 0x5, 0x6
-// g1(bytes[2]): 0x20, 0x40, 0x40, 0x3, hex"0102030000000000000000000000000000000000000000000000000000000000" -> 0x3, 0x1, 0x2, 0x3, 0x3, 0x1, 0x2, 0x3
-// g2(bytes[]): 0x20, 0x2, 0x40, 0x80, 0x2, hex"0102000000000000000000000000000000000000000000000000000000000000", 0x3, hex"0405060000000000000000000000000000000000000000000000000000000000" -> 0x2, 0x2, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
deleted file mode 100644
index 634e35693ca2..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[] calldata x, uint256 s, uint256 e) external returns (uint256) {
-        return uint256[](x[s:e]).length;
-    }
-    function f(uint256[] calldata x, uint256 s, uint256 e, uint256 ss, uint256 ee) external returns (uint256) {
-        return uint256[](x[s:e][ss:ee]).length;
-    }
-    function f_s_only(uint256[] calldata x, uint256 s) external returns (uint256) {
-        return uint256[](x[s:]).length;
-    }
-    function f_e_only(uint256[] calldata x, uint256 e) external returns (uint256) {
-        return uint256[](x[:e]).length;
-    }
-    function g(uint256[] calldata x, uint256 s, uint256 e, uint256 idx) external returns (uint256) {
-        return uint256[](x[s:e])[idx];
-    }
-    function gg(uint256[] calldata x, uint256 s, uint256 e, uint256 idx) external returns (uint256) {
-        return x[s:e][idx];
-    }
-    function gg_s_only(uint256[] calldata x, uint256 s, uint256 idx) external returns (uint256) {
-        return x[s:][idx];
-    }
-    function gg_e_only(uint256[] calldata x, uint256 e, uint256 idx) external returns (uint256) {
-        return x[:e][idx];
-    }
-}
-// ----
-// f(uint256[],uint256,uint256): 0x60, 2, 4, 5, 1, 2, 3, 4, 5 -> 2
-// f(uint256[],uint256,uint256): 0x60, 2, 6, 5, 1, 2, 3, 4, 5 -> FAILURE
-// f(uint256[],uint256,uint256): 0x60, 3, 3, 5, 1, 2, 3, 4, 5 -> 0
-// f(uint256[],uint256,uint256): 0x60, 4, 3, 5, 1, 2, 3, 4, 5 -> FAILURE
-// f(uint256[],uint256,uint256): 0x60, 0, 3, 5, 1, 2, 3, 4, 5 -> 3
-// f(uint256[],uint256,uint256,uint256,uint256): 0xA0, 1, 3, 1, 2, 5, 1, 2, 3, 4, 5 -> 1
-// f(uint256[],uint256,uint256,uint256,uint256): 0xA0, 1, 3, 1, 4, 5, 1, 2, 3, 4, 5 -> FAILURE
-// f_s_only(uint256[],uint256): 0x40, 2, 5, 1, 2, 3, 4, 5 -> 3
-// f_s_only(uint256[],uint256): 0x40, 6, 5, 1, 2, 3, 4, 5 -> FAILURE
-// f_e_only(uint256[],uint256): 0x40, 3, 5, 1, 2, 3, 4, 5 -> 3
-// f_e_only(uint256[],uint256): 0x40, 6, 5, 1, 2, 3, 4, 5 -> FAILURE
-// g(uint256[],uint256,uint256,uint256): 0x80, 2, 4, 1, 5, 1, 2, 3, 4, 5 -> 4
-// g(uint256[],uint256,uint256,uint256): 0x80, 2, 4, 3, 5, 1, 2, 3, 4, 5 -> FAILURE, hex"4e487b71", 0x32
-// gg(uint256[],uint256,uint256,uint256): 0x80, 2, 4, 1, 5, 1, 2, 3, 4, 5 -> 4
-// gg(uint256[],uint256,uint256,uint256): 0x80, 2, 4, 3, 5, 1, 2, 3, 4, 5 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_length.sol b/test/libsolidity/semanticTests/calldata/calldata_array_length.sol
deleted file mode 100644
index 779d261a0351..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_array_length.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[] calldata x) external returns (uint256) {
-        return x.length;
-    }
-    function f(uint256[][] calldata x) external returns (uint256 l1, uint256 l2, uint256 l3) {
-        l1 = x.length;
-        if (l1 > 0) l2 = x[0].length;
-        if (l1 > 1) l3 = x[1].length;
-    }
-    function f(uint256[2] calldata x) external returns (uint256) {
-        return x.length;
-    }
-}
-// ----
-// f(uint256[]): 0x20, 0 -> 0
-// f(uint256[]): 0x20, 1, 23 -> 1
-// f(uint256[]): 0x20, 2, 23, 42 -> 2
-// f(uint256[]): 0x20, 3, 23, 42, 17 -> 3
-// f(uint256[2]): 23, 42 -> 2
-// f(uint256[][]): 0x20, 0 -> 0, 0, 0
-// f(uint256[][]): 0x20, 1, 0x20, 0 -> 1, 0, 0
-// f(uint256[][]): 0x20, 1, 0x00 -> 1, 0, 0
-// f(uint256[][]): 0x20, 1, 0x20, 1, 23 -> 1, 1, 0
-// f(uint256[][]): 0x20, 1, 0x20, 2, 23, 42 -> 1, 2, 0
-// f(uint256[][]): 0x20, 1, 0x40, 0, 2, 23, 42 -> 1, 2, 0
-// f(uint256[][]): 0x20, 1, -32 -> 1, 1, 0
-// f(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 2, 2
-// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 23, 42, 0 -> 2, 2, 0
-// f(uint256[][]): 0x20, 2, 0xA0, 0x40, 2, 23, 42, 0 -> 2, 0, 2
-// f(uint256[][]): 0x20, 2, 0x40, 0xA0, 2, 23, 42, 1, 17 -> 2, 2, 1
-// f(uint256[][]): 0x20, 2, 0x40, 0xA0, 2, 23, 42, 2, 17, 13 -> 2, 2, 2
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol b/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
deleted file mode 100644
index 42c360be0b7f..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function f(uint256[][2][] calldata x, uint256 i, uint256 j, uint256 k) external returns (uint256 a, uint256 b, uint256 c, uint256 d) {
-		a = x.length;
-		b = x[i].length;
-		c = x[i][j].length;
-		d = x[i][j][k];
-    }
-}
-// ----
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 0, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> 1, 2, 1, 42
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 1, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> 1, 2, 1, 23
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 1, 0, 1, 0x20, 0x40, 0x80, 1, 42, 2, 23, 17 -> 1, 2, 2, 23
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 1, 1, 1, 0x20, 0x40, 0x80, 1, 42, 2, 23, 17 -> 1, 2, 2, 17
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 1, 0, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> FAILURE, hex"4e487b71", 0x32
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 2, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> FAILURE, hex"4e487b71", 0x32
-// f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 2, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
deleted file mode 100644
index 1b6e7379b457..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder v2;
-
-library L {
-    function reverse(bytes calldata _b) internal pure returns (bytes1, bytes1) {
-        return (_b[1], _b[0]);
-    }
-}
-
-contract C {
-    using L for bytes;
-
-    function test(uint, bytes calldata _b, uint) external pure returns (bytes1, bytes1) {
-        return _b.reverse();
-    }
-}
-// ----
-// test(uint256,bytes,uint256): 7, 0x60, 4, 2, "ab" -> "b", "a"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
deleted file mode 100644
index 5803ef6e845d..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder v2;
-
-library L {
-    function reverse(uint[] calldata _a) internal pure returns (uint, uint) {
-        return (_a[1], _a[0]);
-    }
-}
-
-contract C {
-    using L for *;
-
-    function testArray(uint, uint[] calldata _a, uint) external pure returns (uint, uint) {
-        return _a.reverse();
-    }
-
-    function testSlice(uint, uint[] calldata _a, uint) external pure returns (uint, uint) {
-        return _a[:].reverse();
-    }
-}
-// ----
-// testArray(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
-// testSlice(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
deleted file mode 100644
index a5158dad66a4..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder v2;
-
-library L {
-    function reverse(uint[2] calldata _a) internal pure returns (uint, uint) {
-        return (_a[1], _a[0]);
-    }
-}
-
-contract C {
-    using L for uint[2];
-
-    function test(uint, uint[2] calldata _a, uint) external pure returns (uint, uint) {
-        return _a.reverse();
-    }
-}
-// ----
-// test(uint256,uint256[2],uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol
deleted file mode 100644
index ee4420470277..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder v2;
-
-struct S {
-    uint x;
-    uint y;
-}
-
-library L {
-    function reverse(S calldata _s) internal pure returns (uint, uint) {
-        return (_s.y, _s.x);
-    }
-}
-
-contract C {
-    using L for S;
-
-    function test(uint, S calldata _s, uint) external pure returns (uint, uint) {
-        return _s.reverse();
-    }
-}
-// ----
-// test(uint256,(uint256,uint256),uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol
deleted file mode 100644
index eb19897cc3a3..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(bytes[] calldata a, uint256 i) external returns (uint) {
-        return uint8(a[0][i]);
-    }
-}
-// ----
-// f(bytes[],uint256): 0x40, 0, 1, 0x20, 2, hex"6162" -> 0x61
-// f(bytes[],uint256): 0x40, 1, 1, 0x20, 2, hex"6162" -> 0x62
-// f(bytes[],uint256): 0x40, 2, 1, 0x20, 2, hex"6162" -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol
deleted file mode 100644
index a39758271f7c..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract CalldataTest {
-    function test(bytes calldata x) public returns (bytes calldata) {
-        return x;
-    }
-    function tester(bytes calldata x) public returns (bytes1) {
-        return this.test(x)[2];
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// tester(bytes): 0x20, 0x08, "abcdefgh" -> "c"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
deleted file mode 100644
index 79cf94be16d7..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bytes calldata b, uint i) internal pure returns (bytes1) {
-        return b[i];
-    }
-    function f(uint, bytes calldata b, uint) external pure returns (bytes1) {
-        return f(b, 2);
-    }
-}
-// ----
-// f(uint256,bytes,uint256): 7, 0x60, 7, 4, "abcd" -> "c"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
deleted file mode 100644
index 164ac8a8e6fd..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f(bytes calldata data) external returns (bytes32) {
-    return keccak256(bytes(data));
-  }
-}
-// ----
-// f(bytes): 0x20, 0x08, "abcdefgh" -> 0x48624fa43c68d5c552855a4e2919e74645f683f5384f72b5b051b71ea41d4f2d
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
deleted file mode 100644
index 5f30aff3038b..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f(bytes calldata data) external returns (bytes memory) {
-    return abi.encode(bytes(data));
-  }
-}
-// ----
-// f(bytes): 0x20, 0x08, "abcdefgh" -> 0x20, 0x60, 0x20, 8, 44048183304486788309563647967830685498285570828042699209880294173606615711744
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
deleted file mode 100644
index ee4bdf58c0f4..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function(bytes calldata) returns (bytes1) x;
-    constructor() { x = f; }
-    function f(bytes calldata b) internal pure returns (bytes1) {
-        return b[2];
-    }
-    function h(bytes calldata b) external returns (bytes1) {
-        return x(b);
-    }
-    function g() external returns (bytes1) {
-        bytes memory a = new bytes(34);
-        a[2] = bytes1(uint8(7));
-        return this.h(a);
-    }
-}
-// ----
-// g() -> 0x0700000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
deleted file mode 100644
index adc9963a2f64..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    function f(uint, bytes calldata _x, uint) internal returns (bytes1) {
-        return _x[2];
-    }
-}
-contract C {
-    function f(bytes calldata a)
-        external
-        returns (bytes1)
-    {
-        return L.f(3, a, 9);
-    }
-    function g() public returns (bytes1) {
-        bytes memory x = new bytes(4);
-        x[2] = 0x08;
-        return this.f(x);
-    }
-}
-// ----
-// g() -> 0x0800000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
deleted file mode 100644
index 26343b7e6bda..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function g(uint[][2] calldata s) internal pure returns (uint, uint[] calldata) {
-        return (s[0][1], s[1]);
-    }
-    function f(uint, uint[][2] calldata s, uint) external pure returns (uint, uint) {
-        (uint x, uint[] calldata y) = g(s);
-        return (x, y[0]);
-    }
-    function g() public returns (uint, uint) {
-        uint[][2] memory x;
-        x[0] = new uint[](2);
-        x[1] = new uint[](2);
-        x[0][1] = 7;
-        x[1][0] = 8;
-        return this.f(4, x, 5);
-    }
-}
-// ----
-// g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
deleted file mode 100644
index cd5a8cfeb692..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function g(uint[3][2] calldata s) internal pure returns (uint, uint[3] calldata) {
-        return (s[0][1], s[1]);
-    }
-    function f(uint, uint[3][2] calldata s, uint) external pure returns (uint, uint) {
-        (uint x, uint[3] calldata y) = g(s);
-        return (x, y[0]);
-    }
-    function g() public returns (uint, uint) {
-        uint[3][2] memory x;
-        x[0][1] = 7;
-        x[1][0] = 8;
-        return this.f(4, x, 5);
-    }
-}
-// ----
-// g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol b/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
deleted file mode 100644
index f5948d2d0e60..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f(bytes memory _a, bytes calldata _b, bytes memory _c)
-        public
-        returns (uint, bytes1, bytes1, bytes1)
-    {
-        return (_a.length + _b.length + _c.length, _a[1], _b[1], _c[1]);
-    }
-    function g() public returns (uint, bytes1, bytes1, bytes1) {
-        bytes memory x = new bytes(3);
-        bytes memory y = new bytes(4);
-        bytes memory z = new bytes(7);
-        x[1] = 0x08;
-        y[1] = 0x09;
-        z[1] = 0x0a;
-        return this.f(x, y, z);
-    }
-}
-// ----
-// g() -> 0x0e, 0x0800000000000000000000000000000000000000000000000000000000000000, 0x0900000000000000000000000000000000000000000000000000000000000000, 0x0a00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_string_array.sol b/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
deleted file mode 100644
index 79efb1712512..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(string[] calldata a)
-        external
-        returns (uint256, uint256, uint256, string memory)
-    {
-        string memory s1 = a[0];
-        bytes memory m1 = bytes(s1);
-        return (a.length, m1.length, uint8(m1[0]), s1);
-    }
-}
-// ----
-// f(string[]): 0x20, 0x1, 0x20, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000" -> 1, 2, 97, 0x80, 2, "ab"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_struct.sol
deleted file mode 100644
index 247c00a7ebf3..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_struct.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-
-struct S {
-    uint x;
-    uint y;
-}
-
-library L {
-    function reverse(S calldata _s) internal pure returns (uint, uint) {
-        return (_s.y, _s.x);
-    }
-}
-
-contract C {
-    function test(uint, S calldata _s, uint) external pure returns (uint, uint) {
-        return L.reverse(_s);
-    }
-}
-// ----
-// test(uint256,(uint256,uint256),uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol b/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
deleted file mode 100644
index 45b323b3d182..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint8 a;
-        bytes1 b;
-    }
-
-    function f(S calldata s) external pure returns (uint256 a, bytes32 b) {
-        uint8 tmp1 = s.a;
-        bytes1 tmp2 = s.b;
-        assembly {
-            a := tmp1
-            b := tmp2
-        }
-    }
-}
-// ----
-// f((uint8,bytes1)): 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" -> 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" # double check that the valid case goes through #
-// f((uint8,bytes1)): 0x1234, hex"5678000000000000000000000000000000000000000000000000000000000000" -> FAILURE
-// f((uint8,bytes1)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol b/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
deleted file mode 100644
index 8a6c2687ddfd..000000000000
--- a/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder               v2;
-
-struct S {
-    uint x;
-    uint y;
-}
-
-contract C {
-    function f(S calldata s) internal pure returns (uint, uint) {
-        return (s.x, s.y);
-    }
-    function f(uint, S calldata s, uint) external pure returns (uint, uint) {
-        return f(s);
-    }
-}
-// ----
-// f(uint256,(uint256,uint256),uint256): 7, 1, 2, 4 -> 1, 2
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
deleted file mode 100644
index aedf5ada4f57..000000000000
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract c {
-    function set() public returns (bool) { data = msg.data; return true; }
-    function checkIfDataIsEmpty() public returns (bool) { return data.length == 0; }
-    function sendMessage() public returns (bool, bytes memory) { bytes memory emptyData; return address(this).call(emptyData);}
-    fallback() external { data = msg.data; }
-    bytes data;
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155130
-// gas legacy: 155473
-// gas legacyOptimized: 155295
-// checkIfDataIsEmpty() -> false
-// sendMessage() -> true, 0x40, 0
-// checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol b/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol
deleted file mode 100644
index 18fa6ed65184..000000000000
--- a/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(bool _b) public returns (uint256) {
-        if (_b) return 1;
-        else return 0;
-    }
-
-    function g(bool _in) public returns (bool _out) {
-        _out = _in;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(bool): 0x0 -> 0x0
-// f(bool): 0x1 -> 0x1
-// f(bool): 0x2 -> 0x1
-// f(bool): 0x3 -> 0x1
-// f(bool): 0xff -> 0x1
-// g(bool): 0x0 -> 0x0
-// g(bool): 0x1 -> 0x1
-// g(bool): 0x2 -> 0x1
-// g(bool): 0x3 -> 0x1
-// g(bool): 0xff -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol b/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
deleted file mode 100644
index 003cdb0ec781..000000000000
--- a/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(bool _b) public returns (uint256) {
-        if (_b) return 1;
-        else return 0;
-    }
-
-    function g(bool _in) public returns (bool _out) {
-        _out = _in;
-    }
-}
-// ----
-// f(bool): 0x0 -> 0x0
-// f(bool): 0x1 -> 0x1
-// f(bool): 0x2 -> FAILURE
-// f(bool): 0x3 -> FAILURE
-// f(bool): 0xff -> FAILURE
-// g(bool): 0x0 -> 0x0
-// g(bool): 0x1 -> 0x1
-// g(bool): 0x2 -> FAILURE
-// g(bool): 0x3 -> FAILURE
-// g(bool): 0xff -> FAILURE
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
deleted file mode 100644
index 8718cb2e6a67..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f() public pure returns (address r) {
-        bytes21 x = 0x1122334455667788990011223344556677889900ff;
-        bytes20 y;
-        assembly {
-            y := x
-        }
-        address z = address(y);
-        assembly {
-            r := z
-        }
-        require(z == 0x1122334455667788990011223344556677889900);
-    }
-
-    function g() public pure returns (address payable r) {
-        bytes21 x = 0x1122334455667788990011223344556677889900ff;
-        bytes20 y;
-        assembly {
-            y := x
-        }
-        address payable z = payable(address(y));
-        assembly {
-            r := z
-        }
-        require(z == 0x1122334455667788990011223344556677889900);
-    }
-}
-// ----
-// f() -> 0x1122334455667788990011223344556677889900
-// g() -> 0x1122334455667788990011223344556677889900
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol
deleted file mode 100644
index a8622cb0b591..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-pragma abicoder v1;
-// Checks that address types are properly cleaned before they are compared.
-contract C {
-    function f(address a) public returns (uint256) {
-        if (a != 0x1234567890123456789012345678901234567890) return 1;
-        return 0;
-    }
-
-    function g(address payable a) public returns (uint256) {
-        if (a != 0x1234567890123456789012345678901234567890) return 1;
-        return 0;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(address): 0xffff1234567890123456789012345678901234567890 -> 0x0 # We input longer data on purpose.#
-// g(address): 0xffff1234567890123456789012345678901234567890 -> 0x0
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
deleted file mode 100644
index 73db35c32cb5..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-
-
-// Checks that address types are properly cleaned before they are compared.
-contract C {
-    function f(address a) public returns (uint256) {
-        if (a != 0x1234567890123456789012345678901234567890) return 1;
-        return 0;
-    }
-
-    function g(address payable a) public returns (uint256) {
-        if (a != 0x1234567890123456789012345678901234567890) return 1;
-        return 0;
-    }
-}
-// ----
-// f(address): 0xffff1234567890123456789012345678901234567890 -> FAILURE # We input longer data on purpose.#
-// g(address): 0xffff1234567890123456789012345678901234567890 -> FAILURE
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_OldCodeGen.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_OldCodeGen.sol
deleted file mode 100644
index 9ca68e6d0d9f..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_OldCodeGen.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public pure returns (bytes32 r) {
-        bytes4 x = 0xffffffff;
-        bytes2 y = bytes2(x);
-        assembly {
-            r := y
-        }
-        // At this point, r and y both store four bytes, but
-        // y is properly cleaned before the equality check
-        require(y == bytes2(0xffff));
-    }
-}
-// ====
-// compileViaYul: false
-// ----
-// f() -> 0xffffffff00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
deleted file mode 100644
index b26ba5640c9a..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure returns (bytes32 r) {
-        bytes4 x = 0xffffffff;
-        bytes2 y = bytes2(x);
-        assembly {
-            r := y
-        }
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 0xffff000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol
deleted file mode 100644
index 097da51e46f2..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-// Checks that bytesXX types are properly cleaned before they are compared.
-contract C {
-    function f(bytes2 a, uint16 x) public returns (uint256) {
-        if (a != "ab") return 1;
-        if (x != 0x0102) return 2;
-        if (bytes3(uint24(x)) != 0x000102) return 3;
-        return 0;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(bytes2,uint16): "abc", 0x40102 -> 0x0 # We input longer data on purpose. #
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
deleted file mode 100644
index 8a95f10c0911..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-
-// Checks that bytesXX types are properly cleaned before they are compared.
-contract C {
-    function f(bytes2 a, uint16 x) public returns (uint256) {
-        if (a != "ab") return 1;
-        if (x != 0x0102) return 2;
-        if (bytes3(uint24(x)) != 0x000102) return 3;
-        return 0;
-    }
-}
-// ----
-// f(bytes2,uint16): "abc", 0x40102 -> FAILURE # We input longer data on purpose. #
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol b/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
deleted file mode 100644
index e0e62971cf89..000000000000
--- a/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function test() public returns (uint256, uint256) {
-        uint32 a = 0xffffffff;
-        uint16 x = uint16(a);
-        uint16 y = x;
-        x /= 0x100;
-        y = y / 0x100;
-        return (x, y);
-    }
-}
-// ----
-// test() -> 0xff, 0xff
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
deleted file mode 100644
index 746f21ef5136..000000000000
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure returns (uint x) {
-        unchecked {
-            uint8 y = uint8(2)**uint8(8);
-            return 0**y;
-        }
-    }
-}
-// ----
-// f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
deleted file mode 100644
index 62f927b5bb6b..000000000000
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (uint8 x) {
-        unchecked {
-            return uint8(0)**uint8(uint8(2)**uint8(8));
-        }
-    }
-}
-// ----
-// f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
deleted file mode 100644
index de55afa9c657..000000000000
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure returns (uint8 x) {
-        unchecked {
-			uint16 x = 0x166;
-            return uint8(x)**uint8(uint8(2)**uint8(8));
-        }
-    }
-}
-// ----
-// f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
deleted file mode 100644
index 7b81d0a1c57e..000000000000
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure returns (uint16 x) {
-        // tests that ``e`` is not converted to uint8
-        // right before the exp
-        uint16 e = 0x100;
-        uint8 b = 0x2;
-        unchecked {
-            return b**e;
-        }
-    }
-}
-// ----
-// f() -> 0x00
diff --git a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol
deleted file mode 100644
index f0aa239baec0..000000000000
--- a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f() public pure returns (uint32 y) {
-        uint8 x = uint8(uint256(0x31313131313131313131313131313131));
-        assembly { y := x }
-    }
-
-    function g() public pure returns (bytes32 y) {
-        bytes1 x = bytes1(bytes16(0x31313131313131313131313131313131));
-        assembly { y := x }
-    }
-
-    function h() external returns (bytes32 y) {
-        bytes1 x;
-        assembly { x := sub(0,1) }
-        y = x;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 0x31
-// g() -> 0x3100000000000000000000000000000000000000000000000000000000000000
-// h() -> 0xff00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
deleted file mode 100644
index 742c02693df5..000000000000
--- a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    event ev0(bytes1 indexed);
-    constructor() {
-        emit ev0(bytes1(bytes16(0x31313131313131313131313131313131)));
-    }
-    function j() external {
-        bytes1 x;
-        assembly { x := 0x3131313131313131313131313131313131313131313131313131313131313131 }
-        emit ev0(x);
-    }
-}
-// ----
-// constructor() ->
-// ~ emit ev0(bytes1): #"1"
-// gas legacy: 168735
-// j() ->
-// ~ emit ev0(bytes1): #"1"
diff --git a/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol b/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
deleted file mode 100644
index 4426f0c0c5bf..000000000000
--- a/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (int, int) {
-        int x = int((-(-5.2 % 3)) * 5);
-        int t = 5;
-        return (x, (-(-t % 3)) * 5);
-    }
-}
-// ----
-// f() -> 11, 10
diff --git a/test/libsolidity/semanticTests/constantEvaluator/rounding.sol b/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
deleted file mode 100644
index 837e87dc8726..000000000000
--- a/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    int constant a = 7;
-    int constant b = 3;
-    int constant c = a / b;
-    int constant d = (-a) / b;
-    function f() public pure returns (uint, int, uint, int) {
-        uint[c] memory x;
-        uint[-d] memory y;
-        return (x.length, c, y.length, -d);
-    }
-}
-// ----
-// f() -> 2, 2, 2, 2
diff --git a/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol b/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
deleted file mode 100644
index ae405d8f366f..000000000000
--- a/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// Test for regression of https://github.com/ethereum/solidity/issues/8406
-
-contract C {
-  address constant e = 0x1212121212121212121212121000002134593163;
-
-  function f() public returns (bytes1 z) {
-    assembly { z := e }
-  }
-}
-// ----
-// f() -> 0x00
diff --git a/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol b/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
deleted file mode 100644
index 4f907646357c..000000000000
--- a/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-address constant e = 0x1212121212121212121212121000002134593163;
-
-contract C {
-  function f() public returns (address z) {
-    assembly { z := e }
-  }
-}
-// ----
-// f() -> 0x1212121212121212121212121000002134593163
diff --git a/test/libsolidity/semanticTests/constants/constant_string.sol b/test/libsolidity/semanticTests/constants/constant_string.sol
deleted file mode 100644
index 3b53102baaad..000000000000
--- a/test/libsolidity/semanticTests/constants/constant_string.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    bytes constant a = "\x03\x01\x02";
-    bytes constant b = hex"030102";
-    string constant c = "hello";
-
-    function f() public returns (bytes memory) {
-        return a;
-    }
-
-    function g() public returns (bytes memory) {
-        return b;
-    }
-
-    function h() public returns (bytes memory) {
-        return bytes(c);
-    }
-}
-// ----
-// f() -> 0x20, 3, "\x03\x01\x02"
-// g() -> 0x20, 3, "\x03\x01\x02"
-// h() -> 0x20, 5, "hello"
diff --git a/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol b/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
deleted file mode 100644
index 0ff332c4f51d..000000000000
--- a/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-bytes constant a = "\x03\x01\x02";
-bytes constant b = hex"030102";
-string constant c = "hello";
-uint256 constant x = 56;
-enum ActionChoices {GoLeft, GoRight, GoStraight, Sit}
-ActionChoices constant choices = ActionChoices.GoRight;
-bytes32 constant st = "abc\x00\xff__";
-
-contract C {
-    function f() public returns (bytes memory) {
-        return a;
-    }
-
-    function g() public returns (bytes memory) {
-        return b;
-    }
-
-    function h() public returns (bytes memory) {
-        return bytes(c);
-    }
-
-    function i() public returns (uint, ActionChoices, bytes32) {
-        return (x, choices, st);
-    }
-}
-// ----
-// f() -> 0x20, 3, "\x03\x01\x02"
-// g() -> 0x20, 3, "\x03\x01\x02"
-// h() -> 0x20, 5, "hello"
-// i() -> 0x38, 1, 0x61626300ff5f5f00000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/constants/constant_variables.sol b/test/libsolidity/semanticTests/constants/constant_variables.sol
deleted file mode 100644
index 2ecd6e76a6f6..000000000000
--- a/test/libsolidity/semanticTests/constants/constant_variables.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Foo {
-    uint256 constant x = 56;
-    enum ActionChoices {GoLeft, GoRight, GoStraight, Sit}
-    ActionChoices constant choices = ActionChoices.GoLeft;
-    bytes32 constant st = "abc\x00\xff__";
-}
-// ----
-// constructor() ->
diff --git a/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol b/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
deleted file mode 100644
index 764ffc245034..000000000000
--- a/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-==== Source: s1.sol ====
-
-
-bytes constant a = b;
-bytes constant b = hex"030102";
-
-function fre() pure returns (bytes memory) {
-    return a;
-}
-
-==== Source: s2.sol ====
-
-import "s1.sol";
-
-uint256 constant c = uint8(a[0]) + 2;
-
-contract C {
-    function f() public returns (bytes memory) {
-        return a;
-    }
-
-    function g() public returns (bytes memory) {
-        return b;
-    }
-
-    function h() public returns (uint) {
-        return c;
-    }
-
-    function i() public returns (bytes memory) {
-        return fre();
-    }
-}
-// ----
-// f() -> 0x20, 3, "\x03\x01\x02"
-// g() -> 0x20, 3, "\x03\x01\x02"
-// h() -> 5
-// i() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/consteval_array_length.sol b/test/libsolidity/semanticTests/constants/consteval_array_length.sol
deleted file mode 100644
index 91e929834df4..000000000000
--- a/test/libsolidity/semanticTests/constants/consteval_array_length.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint constant a = 12;
-    uint constant b = 10;
-
-    function f() public pure returns (uint, uint) {
-        uint[(a / b) * b] memory x;
-        return (x.length, (a / b) * b);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// constructor() ->
-// f() -> 0x0a, 0x0a
diff --git a/test/libsolidity/semanticTests/constants/function_unreferenced.sol b/test/libsolidity/semanticTests/constants/function_unreferenced.sol
deleted file mode 100644
index d7578fecea4d..000000000000
--- a/test/libsolidity/semanticTests/constants/function_unreferenced.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract B {
-    function g() public {}
-}
-contract C is B {
-    bytes4 constant s2 = B.g.selector;
-    function f() external pure returns (bytes4) { return s2; }
-}
-// ----
-// f() -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/constants/same_constants_different_files.sol b/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
deleted file mode 100644
index 3a819befb824..000000000000
--- a/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: s1.sol ====
-
-
-uint constant a = 89;
-
-function fre() pure returns (uint) {
-    return a;
-}
-
-==== Source: s2.sol ====
-
-import {a as b, fre} from "s1.sol";
-import "s1.sol" as M;
-
-uint256 constant a = 13;
-
-contract C {
-    function f() public returns (uint, uint, uint, uint) {
-        return (a, fre(), M.a, b);
-    }
-}
-// ----
-// f() -> 0x0d, 0x59, 0x59, 0x59
diff --git a/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol b/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
deleted file mode 100644
index ed0e919fcd57..000000000000
--- a/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Foo {
-    function getX() public returns (uint256 r) {
-        return x;
-    }
-
-    uint256 constant x = 56;
-}
-// ----
-// getX() -> 56
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
deleted file mode 100644
index 3d9c1ffecefe..000000000000
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract Base {
-    uint public m_x;
-    address[] m_s;
-    constructor(uint x, address[] memory s) {
-        m_x = x;
-        m_s = s;
-    }
-    function part(uint i) public returns (address) {
-        return m_s[i];
-    }
-}
-contract Main is Base {
-    constructor(address[] memory s, uint x) Base(x, f(s)) {}
-    function f(address[] memory s) public returns (address[] memory) {
-        return s;
-    }
-}
-contract Creator {
-    function f(uint x, address[] memory s) public returns (uint r, address ch) {
-        Main c = new Main(s, x);
-        r = c.m_x();
-        ch = c.part(x);
-    }
-}
-// ----
-// f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 424526
-// gas legacy: 581443
-// gas legacyOptimized: 444599
diff --git a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
deleted file mode 100644
index 55daf6d3d547..000000000000
--- a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract BaseBase {
-    uint256 m_a;
-
-    constructor(uint256 a) {
-        m_a = a;
-    }
-}
-
-
-contract Base is BaseBase(7) {
-    constructor() {
-        m_a *= m_a;
-    }
-}
-
-
-contract Derived is Base {
-    function getA() public returns (uint256 r) {
-        return m_a;
-    }
-}
-// ----
-// getA() -> 49
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
deleted file mode 100644
index 067a64e0e5f6..000000000000
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract Base {
-    uint public m_x;
-    bytes m_s;
-    constructor(uint x, bytes memory s) {
-        m_x = x;
-        m_s = s;
-    }
-    function part(uint i) public returns (bytes1) {
-        return m_s[i];
-    }
-}
-contract Main is Base {
-    constructor(bytes memory s, uint x) Base(x, f(s)) {}
-    function f(bytes memory s) public returns (bytes memory) {
-        return s;
-    }
-}
-contract Creator {
-    function f(uint x, bytes memory s) public returns (uint r, bytes1 ch) {
-        Main c = new Main(s, x);
-        r = c.m_x();
-        ch = c.part(x);
-    }
-}
-// ----
-// f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 275102
-// gas legacy: 418462
-// gas legacyOptimized: 291960
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
deleted file mode 100644
index 0665cb807a7d..000000000000
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract Test {
-    uint public m_x;
-    bytes public m_s;
-    constructor(uint x, bytes memory s) {
-        m_x = x;
-        m_s = s;
-    }
-}
-// ----
-// constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 269225
-// gas legacy: 311324
-// gas legacyOptimized: 258604
-// m_x() -> 7
-// m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/constructor/callvalue_check.sol b/test/libsolidity/semanticTests/constructor/callvalue_check.sol
deleted file mode 100644
index f45fbed925ad..000000000000
--- a/test/libsolidity/semanticTests/constructor/callvalue_check.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract A1 { constructor() {} }
-contract B1 is A1 {}
-
-contract A2 { constructor() payable {} }
-contract B2 is A2 {}
-
-contract B3 {}
-
-contract B4 { constructor() {} }
-
-contract C {
-	function createWithValue(bytes memory c, uint256 value) public payable returns (bool) {
-		uint256 y = 0;
-		assembly { y := create(value, add(c, 0x20), mload(c)) }
-		return y != 0;
-	}
-	function f(uint256 value) public payable returns (bool) {
-		return createWithValue(type(B1).creationCode, value);
-	}
-	function g(uint256 value) public payable returns (bool) {
-		return createWithValue(type(B2).creationCode, value);
-	}
-	function h(uint256 value) public payable returns (bool) {
-		return createWithValue(type(B3).creationCode, value);
-	}
-	function i(uint256 value) public payable returns (bool) {
-		return createWithValue(type(B4).creationCode, value);
-	}
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f(uint256), 2000 ether: 0 -> true
-// f(uint256), 2000 ether: 100 -> false
-// g(uint256), 2000 ether: 0 -> true
-// g(uint256), 2000 ether: 100 -> false
-// h(uint256), 2000 ether: 0 -> true
-// h(uint256), 2000 ether: 100 -> false
-// i(uint256), 2000 ether: 0 -> true
-// i(uint256), 2000 ether: 100 -> false
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
deleted file mode 100644
index 3037aaa31753..000000000000
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract Main {
-    bytes3 name;
-    bool flag;
-
-    constructor(bytes3 x, bool f) {
-        name = x;
-        flag = f;
-    }
-
-    function getName() public returns (bytes3 ret) {
-        return name;
-    }
-
-    function getFlag() public returns (bool ret) {
-        return flag;
-    }
-}
-// ----
-// constructor(): "abc", true
-// gas irOptimized: 104394
-// gas legacy: 143300
-// gas legacyOptimized: 102961
-// getFlag() -> true
-// getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
deleted file mode 100644
index bf3f0c0c9b74..000000000000
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract Helper {
-    bytes3 name;
-    bool flag;
-
-    constructor(bytes3 x, bool f) {
-        name = x;
-        flag = f;
-    }
-
-    function getName() public returns (bytes3 ret) {
-        return name;
-    }
-
-    function getFlag() public returns (bool ret) {
-        return flag;
-    }
-}
-
-
-contract Main {
-    Helper h;
-
-    constructor() {
-        h = new Helper("abc", true);
-    }
-
-    function getFlag() public returns (bool ret) {
-        return h.getFlag();
-    }
-
-    function getName() public returns (bytes3 ret) {
-        return h.getName();
-    }
-}
-// ----
-// getFlag() -> true
-// getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
deleted file mode 100644
index 159f2943d432..000000000000
--- a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// The IR of this test used to throw
-contract D {
-    constructor(function() external returns (uint)) {
-    }
-}
-// ----
-// constructor(): 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000 ->
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
deleted file mode 100644
index 4117b84b64f9..000000000000
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract D {
-    uint public x;
-    constructor(function() external pure returns (uint) g) {
-        x = g();
-    }
-}
-
-contract C {
-    function f() public returns (uint r) {
-        D d = new D(this.sixteen);
-        r = d.x();
-    }
-
-    function sixteen() public pure returns (uint) {
-        return 16;
-    }
-}
-// ----
-// f() -> 16
-// gas legacy: 102082
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
deleted file mode 100644
index 22acd1cc3fab..000000000000
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    uint256 public a;
-    uint256[3] public b;
-
-    constructor(uint256 _a, uint256[3] memory _b) {
-        a = _a;
-        b = _b;
-    }
-}
-// ----
-// constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 171015
-// gas legacy: 218378
-// gas legacyOptimized: 176211
-// a() -> 1
-// b(uint256): 0 -> 2
-// b(uint256): 1 -> 3
-// b(uint256): 2 -> 4
diff --git a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
deleted file mode 100644
index 43d1fdab848f..000000000000
--- a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-    constructor() {
-        address(this).call("123");
-    }
-}
-
-
-contract B {
-    uint256 public test = 1;
-
-    function testIt() public {
-        A a = new A();
-        ++test;
-    }
-}
-// ----
-// testIt() ->
-// test() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
deleted file mode 100644
index c04f039188c4..000000000000
--- a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract BaseBase {
-    uint256 m_a;
-
-    constructor(uint256 a) {
-        m_a = a;
-    }
-
-    function g() public returns (uint256 r) {
-        return 2;
-    }
-}
-
-
-contract Base is BaseBase(BaseBase.g()) {}
-
-
-contract Derived is Base {
-    function getA() public returns (uint256 r) {
-        return m_a;
-    }
-}
-// ----
-// getA() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
deleted file mode 100644
index b968a07a161d..000000000000
--- a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Test {
-    bytes3 name;
-    bool flag;
-
-    constructor() {
-        setName("abc");
-    }
-
-    function getName() public returns (bytes3 ret) {
-        return name;
-    }
-
-    function setName(bytes3 _name) private {
-        name = _name;
-    }
-}
-// ----
-// getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
deleted file mode 100644
index 0a1250a8ba62..000000000000
--- a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract Test {
-    bytes6 name;
-
-    constructor() {
-        function (bytes6 _name) internal setter = setName;
-        setter("abcdef");
-
-        applyShift(leftByteShift, 3);
-    }
-
-    function getName() public returns (bytes6 ret) {
-        return name;
-    }
-
-    function setName(bytes6 _name) private {
-        name = _name;
-    }
-
-    function leftByteShift(bytes6 _value, uint _shift) public returns (bytes6) {
-        return _value << _shift * 8;
-    }
-
-    function applyShift(function (bytes6 _value, uint _shift) internal returns (bytes6) _shiftOperator, uint _bytes) internal {
-        name = _shiftOperator(name, _bytes);
-    }
-}
-// ----
-// getName() -> "def\x00\x00\x00"
diff --git a/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol b/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
deleted file mode 100644
index 320349cda9ed..000000000000
--- a/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Base {
-    uint256 m_base = 5;
-
-    function getBMember() public returns (uint256 i) {
-        return m_base;
-    }
-}
-
-
-contract Derived is Base {
-    uint256 m_derived = 6;
-
-    function getDMember() public returns (uint256 i) {
-        return m_derived;
-    }
-}
-// ----
-// getBMember() -> 5
-// getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
deleted file mode 100644
index eec01005ebd2..000000000000
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract A1 {}
-contract B1 is A1 { constructor() payable {} }
-
-contract A2 { constructor() {} }
-contract B2 is A2 { constructor() payable {} }
-
-contract B3 { constructor() payable {} }
-
-contract C {
-	function f() public payable returns (bool) {
-		// Make sure none of these revert.
-		new B1{value: 10}();
-		new B2{value: 10}();
-		new B3{value: 10}();
-		return true;
-	}
-}
-// ----
-// f(), 2000 ether -> true
-// gas irOptimized: 119441
-// gas legacy: 122621
-// gas legacyOptimized: 122490
diff --git a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol b/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
deleted file mode 100644
index 2416f124ec37..000000000000
--- a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract A {
-    constructor(uint) {}
-}
-contract B {
-    constructor(uint) {}
-}
-contract C {
-    constructor(uint) {}
-}
-contract D {
-    constructor(uint) {}
-}
-contract X is D, C, B, A {
-    uint[] x;
-    function f(uint _x) internal returns (uint) {
-        x.push(_x);
-    }
-    function g() public view returns (uint[] memory) { return x; }
-    constructor() A(f(1)) C(f(2)) B(f(3)) D(f(4)) {}
-}
-// ----
-// g() -> 0x20, 4, 1, 3, 2, 4
diff --git a/test/libsolidity/semanticTests/constructor/payable_constructor.sol b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
deleted file mode 100644
index 09fe0a1cc32d..000000000000
--- a/test/libsolidity/semanticTests/constructor/payable_constructor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    constructor() payable {}
-}
-// ----
-// constructor(), 27 wei ->
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
deleted file mode 100644
index dee3af35415f..000000000000
--- a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    uint256 public result_in_constructor;
-    function(uint256) returns (uint256) internal x;
-
-    constructor() {
-        x = double;
-        result_in_constructor = use(2);
-    }
-
-    function double(uint256 _arg) public returns (uint256 _ret) {
-        _ret = _arg * 2;
-    }
-
-    function use(uint256 _arg) public returns (uint256) {
-        return x(_arg);
-    }
-}
-// ----
-// use(uint256): 3 -> 6
-// result_in_constructor() -> 4
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
deleted file mode 100644
index 07b12ad96cb7..000000000000
--- a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint16 public result_in_constructor;
-    function(uint16) returns (uint16) internal x;
-    uint16 public other = 0x1fff;
-
-    constructor() {
-        x = doubleInv;
-        result_in_constructor = use(2);
-    }
-
-    function doubleInv(uint16 _arg) public returns (uint16 _ret) {
-        _ret = ~(_arg * 2);
-    }
-
-    function use(uint16 _arg) public returns (uint16) {
-        return x(_arg);
-    }
-}
-// ----
-// use(uint16): 3 -> 0xfff9
-// result_in_constructor() -> 0xfffb
-// other() -> 0x1fff
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
deleted file mode 100644
index cc9d8ca6a134..000000000000
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function() returns (uint256) internal x;
-
-    constructor() {
-        x = unused;
-    }
-
-    function unused() internal returns (uint256) {
-        return 7;
-    }
-
-    function t() public returns (uint256) {
-        return x();
-    }
-}
-// ----
-// t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
deleted file mode 100644
index 5845e9b56e15..000000000000
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    function x() internal returns (uint256) {
-        return 7;
-    }
-}
-
-
-contract C {
-    function() returns (uint256) internal x;
-
-    constructor() {
-        x = L.x;
-    }
-
-    function t() public returns (uint256) {
-        return x();
-    }
-}
-// ----
-// t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
deleted file mode 100644
index 20cd8760b9b9..000000000000
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-    uint x;
-    constructor() {
-        x = 42;
-    }
-    function f() public returns(uint256) {
-        return x;
-    }
-}
-contract B is A {
-    uint public y = f();
-}
-// ====
-// compileViaYul: true
-// ----
-// constructor() ->
-// gas irOptimized: 119640
-// y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
deleted file mode 100644
index 820c56a4eea2..000000000000
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-    uint x = 42;
-    function f() public returns(uint256) {
-        return x;
-    }
-}
-contract B is A {
-    uint public y = f();
-}
-// ----
-// constructor() ->
-// gas irOptimized: 119640
-// gas legacy: 133594
-// gas legacyOptimized: 115341
-// y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_legacy.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_legacy.sol
deleted file mode 100644
index d9bed3f54316..000000000000
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_legacy.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    uint public x = 2;
-    constructor(uint) {}
-    function f() public returns(uint) { x = 4; }
-}
-contract B is A {
-    constructor() A(f()) {}
-}
-// ====
-// compileViaYul: false
-// ----
-// x() -> 4
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol
deleted file mode 100644
index 0d582f8d7db2..000000000000
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    uint public x = 2;
-    constructor(uint) {}
-    function f() public returns(uint) { x = 4; }
-}
-contract B is A {
-    constructor() A(f()) {}
-}
-// ====
-// compileViaYul: true
-// ----
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
deleted file mode 100644
index 1916f692fd1a..000000000000
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint public i;
-    uint public k;
-
-    constructor(uint newI, uint newK) {
-        i = newI;
-        k = newK;
-    }
-}
-// ----
-// constructor(): 2, 0 ->
-// gas irOptimized: 101390
-// gas legacy: 115678
-// i() -> 2
-// k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
deleted file mode 100644
index b2f66e4500d8..000000000000
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract A {
-    uint public i;
-    uint public k;
-
-    constructor(uint newI, uint newK) {
-        i = newI;
-        k = newK;
-    }
-}
-abstract contract B is A {
-    uint public j;
-    constructor(uint newJ) {
-        j = newJ;
-    }
-}
-contract C is A {
-    constructor(uint newI, uint newK) A(newI, newK) {}
-}
-contract D is B, C {
-    constructor(uint newI, uint newK) B(newI) C(newI, newK + 1) {}
-}
-// ----
-// constructor(): 2, 0 ->
-// gas irOptimized: 151966
-// gas legacy: 168623
-// gas legacyOptimized: 144577
-// i() -> 2
-// j() -> 2
-// k() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
deleted file mode 100644
index f5b20d9816a0..000000000000
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint public i;
-    uint public k;
-
-    constructor(uint newI, uint newK) {
-        i = newI;
-        k = newK;
-    }
-}
-contract D is C {
-    constructor(uint newI, uint newK) C(newI, newK + 1) {}
-}
-// ----
-// constructor(): 2, 0 ->
-// gas irOptimized: 121805
-// gas legacy: 137193
-// gas legacyOptimized: 118548
-// i() -> 2
-// k() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
deleted file mode 100644
index 8a9fc03a7f19..000000000000
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint public i;
-    uint public k;
-
-    constructor(uint newI, uint newK) {
-        i = newI;
-        k = newK;
-    }
-}
-contract D is C(2, 1) {}
-// ----
-// i() -> 2
-// k() -> 1
diff --git a/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
deleted file mode 100644
index 94dc0307b146..000000000000
--- a/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract C {
-    function () external returns(uint)[1] externalDefaultArray;
-    function () external view returns(uint)[1] externalViewArray;
-    function () external pure returns(uint)[1] externalPureArray;
-
-    function () internal returns(uint)[1] internalDefaultArray;
-    function () internal view returns(uint)[1] internalViewArray;
-    function () internal pure returns(uint)[1] internalPureArray;
-
-    function externalDefault() external returns(uint) { return 11; }
-    function externalView() external view returns(uint) { return 12; }
-    function externalPure() external pure returns(uint) { return 13; }
-
-    function internalDefault() internal returns(uint) { return 21; }
-    function internalView() internal view returns(uint) { return 22; }
-    function internalPure() internal pure returns(uint) { return 23; }
-
-    function testViewToDefault() public returns (uint, uint) {
-        externalDefaultArray = [this.externalView];
-        internalDefaultArray = [internalView];
-
-        return (externalDefaultArray[0](), internalDefaultArray[0]());
-    }
-
-    function testPureToDefault() public returns (uint, uint) {
-        externalDefaultArray = [this.externalPure];
-        internalDefaultArray = [internalPure];
-
-        return (externalDefaultArray[0](), internalDefaultArray[0]());
-    }
-
-    function testPureToView() public returns (uint, uint) {
-        externalViewArray = [this.externalPure];
-        internalViewArray = [internalPure];
-
-        return (externalViewArray[0](), internalViewArray[0]());
-    }
-}
-// ----
-// testViewToDefault() -> 12, 22
-// testPureToDefault() -> 13, 23
-// testPureToView() -> 13, 23
diff --git a/test/libsolidity/semanticTests/conversions/string_to_bytes.sol b/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
deleted file mode 100644
index 2f324588dc96..000000000000
--- a/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function f(string memory s) public pure returns (bytes memory t) {
-		t = bytes(s);
-	}
-}
-// ----
-// f(string): 32, 5, "Hello" -> 32, 5, "Hello"
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol
deleted file mode 100644
index 64b80422c352..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-function longdata(S memory) pure returns (bytes memory) {
-    return
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-}
-
-struct S {
-    uint x;
-}
-
-using { longdata } for S;
-
-contract C {
-    bytes data;
-    constructor() {
-        S memory x;
-        data = x.longdata();
-    }
-    function test() public view returns (bool) {
-        // Tests that the function longdata is not
-        // included in the runtime code.
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return x < data.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol
deleted file mode 100644
index 931109199649..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-library L {
-    function longdata() pure internal returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-contract C {
-    bytes data;
-    constructor() {
-        data = L.longdata();
-    }
-    function test() public view returns (bool) {
-        // Tests that the function L.longdata is not
-        // included in the runtime code.
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return x < data.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol
deleted file mode 100644
index 30f403af7f3d..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-library L {
-    function longdata() pure internal returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-
-contract C {
-    bytes data;
-    function () pure returns (bytes memory) f;
-    constructor() {
-        data = L.longdata();
-        f = L.longdata;
-    }
-    function test() public view returns (bool) {
-        return keccak256(data) == keccak256(f());
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol
deleted file mode 100644
index 018d410557b0..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-==== Source: mod.sol ====
-function longdata() pure returns (bytes memory) {
-    return
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-}
-==== Source: main.sol ====
-import "mod.sol" as M;
-
-contract C {
-    bytes data;
-    constructor() {
-        data = M.longdata();
-    }
-    function test() public view returns (bool) {
-        // Tests that the function longdata is not
-        // included in the runtime code.
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return x < data.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol
deleted file mode 100644
index f29355e07482..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-==== Source: mod.sol ====
-function longdata() pure returns (bytes memory) {
-    return
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-}
-==== Source: main.sol ====
-import "mod.sol" as M;
-
-contract C {
-    bytes data;
-    function () pure returns (bytes memory) f;
-    constructor() {
-        data = M.longdata();
-        f = M.longdata;
-    }
-    function test() public view returns (bool) {
-        return keccak256(data) == keccak256(f());
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol
deleted file mode 100644
index 0f9b023b08d9..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-abstract contract S {
-    function longdata() internal pure returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-
-contract C is S {
-    bytes data;
-    constructor() {
-        data = S.longdata();
-    }
-    function test() public view returns (bool) {
-        // Tests that the function longdata is not
-        // included in the runtime code.
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return x < data.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol
deleted file mode 100644
index a7c8d6cfeb82..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract S {
-    function longdata() internal pure returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-
-contract C is S {
-    bytes data;
-    function () pure returns (bytes memory) f;
-    constructor() {
-        data = S.longdata();
-        f = S.longdata;
-    }
-    function test() public view returns (bool) {
-        return keccak256(data) == keccak256(f());
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
deleted file mode 100644
index b6ae85b838d8..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract A {
-    function longdata() pure external returns (bytes memory) {
-        return
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-
-contract C {
-    constructor() {
-    }
-
-    function a() external returns (bytes memory) {
-        return type(A).creationCode;
-    }
-
-    function b() external returns (A) {
-        return new A();
-    }
-
-    function test() public view returns (bool) {
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return type(A).creationCode.length < x &&
-            x < 2 * type(A).creationCode.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol
deleted file mode 100644
index 9accc54a2b05..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-abstract contract S {
-    function longdata() internal pure returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-
-contract C is S {
-    bytes data;
-    constructor() {
-        data = super.longdata();
-    }
-    function test() public view returns (bool) {
-        // Tests that the function longdata is not
-        // included in the runtime code.
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return x < data.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol
deleted file mode 100644
index 9588007b360b..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract S {
-    function longdata() internal pure returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-    }
-}
-
-contract C is S {
-    bytes data;
-    function () pure returns (bytes memory) f;
-    constructor() {
-        data = super.longdata();
-        f = super.longdata;
-    }
-    function test() public view returns (bool) {
-        return keccak256(data) == keccak256(f());
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol
deleted file mode 100644
index 866fe9dfc452..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-abstract contract S {
-    function longdata() internal virtual pure returns (bytes memory);
-}
-
-abstract contract X is S {
-    function longdata() internal override pure returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-        }
-}
-
-contract C is X {
-    bytes data;
-    constructor() {
-        data = longdata();
-    }
-    function test() public view returns (bool) {
-        // Tests that the function longdata is not
-        // included in the runtime code.
-        uint x;
-        assembly {
-            x := codesize()
-        }
-        return x < data.length;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol
deleted file mode 100644
index bcc95b9f418d..000000000000
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-abstract contract S {
-    function longdata() internal virtual pure returns (bytes memory);
-}
-
-abstract contract X is S {
-    function longdata() internal override pure returns (bytes memory) {
-        return
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
-            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
-            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
-            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
-            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
-            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
-        }
-}
-
-contract C is X {
-    bytes data;
-    function () pure returns (bytes memory) f;
-    constructor() {
-        data = super.longdata();
-        f = super.longdata;
-    }
-    function test() public view returns (bool) {
-        return keccak256(data) == keccak256(f());
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/dirty_calldata_bytes.sol b/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
deleted file mode 100644
index 5876b1f7c65c..000000000000
--- a/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(bytes calldata b) public returns (bool correct) {
-        bytes1 a = b[3];
-        uint r;
-        assembly {
-            r := a
-        }
-        correct = r == (0x64 << 248);
-    }
-}
-// ----
-// f(bytes): 0x20, 0x04, "dead" -> true
diff --git a/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol b/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
deleted file mode 100644
index b59eb922e70b..000000000000
--- a/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(int16[] calldata a) external returns (bool correct) {
-        uint32 x = uint32(uint16(a[1]));
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = r == 0x7fff;
-    }
-}
-// ----
-// f(int16[]): 0x20, 0x02, 0x7fff, 0x7fff -> true
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
deleted file mode 100644
index 1beb451de8b0..000000000000
--- a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function a(bytes32 h, uint8 v, bytes32 r, bytes32 s) public returns (address addr) {
-        return ecrecover(h, v, r, s);
-    }
-}
-// ----
-// a(bytes32,uint8,bytes32,bytes32):
-// 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,
-// 28,
-// 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,
-// 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549
-// -> 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
deleted file mode 100644
index 995a1e456061..000000000000
--- a/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-contract test {
-    function a(bytes32 h, uint8 v, bytes32 r, bytes32 s) public returns (address addr) {
-        return ecrecover(h, v, r, s);
-    }
-}
-// ----
-// a(bytes32,uint8,bytes32,bytes32):
-// 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,
-// 28,
-// 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,
-// 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549
-// -> 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
deleted file mode 100644
index 55621bdcdae6..000000000000
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    // ecrecover should return zero for malformed input
-	// (v should be 27 or 28, not 1)
-	// Note that the precompile does not return zero but returns nothing.
-    function f() public returns (address) {
-        return ecrecover(bytes32(type(uint256).max), 1, bytes32(uint(2)), bytes32(uint(3)));
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
deleted file mode 100644
index 5e8c3cdbf74f..000000000000
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public returns (address) {
-        assembly {
-            mstore(mload(0x40), 0xca35b7d915458ef540ade6068dfe2f44e8fa733c)
-        }
-        return ecrecover(
-            0x77e5189111eb6557e8a637b27ef8fbb15bc61d61c2f00cc48878f3a296e5e0ca,
-            0, // invalid v value
-            0x6944c77849b18048f6abe0db8084b0d0d0689cdddb53d2671c36967b58691ad4,
-            0xef4f06ba4f78319baafd0424365777241af4dfd3da840471b4b4b087b7750d0d
-        );
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
deleted file mode 100644
index 511bd4e41c19..000000000000
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f() public returns (address) {
-        return recover(
-            0x77e5189111eb6557e8a637b27ef8fbb15bc61d61c2f00cc48878f3a296e5e0ca,
-            0, // invalid v value
-            0x6944c77849b18048f6abe0db8084b0d0d0689cdddb53d2671c36967b58691ad4,
-            0xef4f06ba4f78319baafd0424365777241af4dfd3da840471b4b4b087b7750d0d,
-            0x000000000000000000000000ca35b7d915458ef540ade6068dfe2f44e8fa733c,
-            0x000000000000000000000000ca35b7d915458ef540ade6068dfe2f44e8fa733c
-        );
-    }
-    function recover(bytes32 hash, uint8 v, bytes32 r, bytes32 s, uint blockExpired, bytes32 salt)
-        public returns (address)
-    {
-        require(hash == keccak256(abi.encodePacked(blockExpired, salt)));
-        return ecrecover(hash, v, r, s);
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/emit_three_identical_events.sol b/test/libsolidity/semanticTests/emit_three_identical_events.sol
deleted file mode 100644
index dec367e1b713..000000000000
--- a/test/libsolidity/semanticTests/emit_three_identical_events.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    event Terminated();
-
-    function terminate() external {
-        emit Terminated();
-        emit Terminated();
-        emit Terminated();
-    }
-}
-// ----
-// terminate() ->
-// ~ emit Terminated()
-// ~ emit Terminated()
-// ~ emit Terminated()
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/emit_two_identical_events.sol b/test/libsolidity/semanticTests/emit_two_identical_events.sol
deleted file mode 100644
index 85cdceafc033..000000000000
--- a/test/libsolidity/semanticTests/emit_two_identical_events.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    event Terminated();
-
-    function terminate() external {
-        emit Terminated();
-        emit Terminated();
-    }
-}
-// ----
-// terminate() ->
-// ~ emit Terminated()
-// ~ emit Terminated()
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/empty_contract.sol b/test/libsolidity/semanticTests/empty_contract.sol
deleted file mode 100644
index 7c1ae2846ea8..000000000000
--- a/test/libsolidity/semanticTests/empty_contract.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-}
-// ====
-// allowNonExistingFunctions: true
-// ----
-// i_am_not_there() -> FAILURE
diff --git a/test/libsolidity/semanticTests/empty_for_loop.sol b/test/libsolidity/semanticTests/empty_for_loop.sol
deleted file mode 100644
index 450134b63901..000000000000
--- a/test/libsolidity/semanticTests/empty_for_loop.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    function f() public returns(uint ret) {
-        ret = 1;
-        for (;;) {
-            ret += 1;
-            if (ret >= 10) break;
-        }
-    }
-}
-// ----
-// f() -> 10
diff --git a/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol b/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
deleted file mode 100644
index beabc514315b..000000000000
--- a/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    enum Truth {False, True}
-
-    function test() public returns (uint256) {
-        return uint256(Truth(uint8(0x1)));
-    }
-}
-// ----
-// test() -> 1
diff --git a/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
deleted file mode 100644
index b952524b2a22..000000000000
--- a/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract test {
-    enum ActionChoices {GoLeft, GoRight, GoStraight}
-
-    constructor() {}
-
-    function getChoiceExp(uint256 x) public returns (uint256 d) {
-        choice = ActionChoices(x);
-        d = uint256(choice);
-    }
-
-    function getChoiceFromSigned(int256 x) public returns (uint256 d) {
-        choice = ActionChoices(x);
-        d = uint256(choice);
-    }
-
-    function getChoiceFromMax() public returns (uint256 d) {
-        choice = ActionChoices(type(uint).max);
-        d = uint256(choice);
-    }
-
-    ActionChoices choice;
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// getChoiceExp(uint256): 2 -> 2
-// getChoiceExp(uint256): 3 -> FAILURE, hex"4e487b71", 0x21 # These should throw #
-// getChoiceFromSigned(int256): -1 -> FAILURE, hex"4e487b71", 0x21
-// getChoiceFromMax() -> FAILURE, hex"4e487b71", 0x21
-// getChoiceExp(uint256): 2 -> 2 # These should work #
-// getChoiceExp(uint256): 0 -> 0
diff --git a/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
deleted file mode 100644
index 60a1d64d3e34..000000000000
--- a/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract test {
-    enum ActionChoices {GoLeft, GoRight, GoStraight}
-
-    constructor() {}
-
-    function getChoiceExp(uint256 x) public returns (uint256 d) {
-        choice = ActionChoices(x);
-        d = uint256(choice);
-    }
-
-    function getChoiceFromSigned(int256 x) public returns (uint256 d) {
-        choice = ActionChoices(x);
-        d = uint256(choice);
-    }
-
-    function getChoiceFromMax() public returns (uint256 d) {
-        choice = ActionChoices(type(uint256).max);
-        d = uint256(choice);
-    }
-
-    ActionChoices choice;
-}
-// ====
-// EVMVersion: <byzantium
-// ----
-// getChoiceExp(uint256): 3 -> FAILURE # These should throw #
-// getChoiceFromSigned(int256): -1 -> FAILURE
-// getChoiceFromMax() -> FAILURE
-// getChoiceExp(uint256): 2 -> 2 # These should work #
-// getChoiceExp(uint256): 0 -> 0
diff --git a/test/libsolidity/semanticTests/enums/enum_referencing.sol b/test/libsolidity/semanticTests/enums/enum_referencing.sol
deleted file mode 100644
index c58f6e839059..000000000000
--- a/test/libsolidity/semanticTests/enums/enum_referencing.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-interface I {
-    enum Direction { A, B, Left, Right }
-}
-library L {
-    enum Direction { Left, Right }
-    function f() public pure returns (Direction) {
-        return Direction.Right;
-    }
-    function g() public pure returns (I.Direction) {
-        return I.Direction.Right;
-    }
-}
-contract C is I {
-    function f() public pure returns (Direction) {
-        return Direction.Right;
-    }
-    function g() public pure returns (I.Direction) {
-        return I.Direction.Right;
-    }
-    function h() public pure returns (L.Direction) {
-        return L.Direction.Right;
-    }
-    function x() public pure returns (L.Direction) {
-        return L.f();
-    }
-    function y() public pure returns (I.Direction) {
-        return L.g();
-    }
-}
-// ----
-// library: L
-// f() -> 3
-// g() -> 3
-// f() -> 3
-// g() -> 3
-// h() -> 1
-// x() -> 1
-// y() -> 3
diff --git a/test/libsolidity/semanticTests/enums/enum_with_256_members.sol b/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
deleted file mode 100644
index 8bfded3c253f..000000000000
--- a/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-pragma abicoder v2;
-enum E {
-    E000, E001, E002, E003, E004, E005, E006, E007, E008, E009,
-    E010, E011, E012, E013, E014, E015, E016, E017, E018, E019,
-    E020, E021, E022, E023, E024, E025, E026, E027, E028, E029,
-    E030, E031, E032, E033, E034, E035, E036, E037, E038, E039,
-    E040, E041, E042, E043, E044, E045, E046, E047, E048, E049,
-    E050, E051, E052, E053, E054, E055, E056, E057, E058, E059,
-    E060, E061, E062, E063, E064, E065, E066, E067, E068, E069,
-    E070, E071, E072, E073, E074, E075, E076, E077, E078, E079,
-    E080, E081, E082, E083, E084, E085, E086, E087, E088, E089,
-    E090, E091, E092, E093, E094, E095, E096, E097, E098, E099,
-    E100, E101, E102, E103, E104, E105, E106, E107, E108, E109,
-    E110, E111, E112, E113, E114, E115, E116, E117, E118, E119,
-    E120, E121, E122, E123, E124, E125, E126, E127, E128, E129,
-    E130, E131, E132, E133, E134, E135, E136, E137, E138, E139,
-    E140, E141, E142, E143, E144, E145, E146, E147, E148, E149,
-    E150, E151, E152, E153, E154, E155, E156, E157, E158, E159,
-    E160, E161, E162, E163, E164, E165, E166, E167, E168, E169,
-    E170, E171, E172, E173, E174, E175, E176, E177, E178, E179,
-    E180, E181, E182, E183, E184, E185, E186, E187, E188, E189,
-    E190, E191, E192, E193, E194, E195, E196, E197, E198, E199,
-    E200, E201, E202, E203, E204, E205, E206, E207, E208, E209,
-    E210, E211, E212, E213, E214, E215, E216, E217, E218, E219,
-    E220, E221, E222, E223, E224, E225, E226, E227, E228, E229,
-    E230, E231, E232, E233, E234, E235, E236, E237, E238, E239,
-    E240, E241, E242, E243, E244, E245, E246, E247, E248, E249,
-    E250, E251, E252, E253, E254, E255
-}
-
-contract C {
-    function getMinMax() public returns (E, E) {
-        return (E.E000, E.E255);
-    }
-
-    function intToEnum(uint8 _i) public returns (E) {
-        return E(_i);
-    }
-
-    function enumToInt(E _e) public returns (uint8) {
-        return uint8(_e);
-    }
-
-    function decodeEnum(bytes memory data) public returns (E) {
-        (E e) = abi.decode(data, (E));
-        return e;
-    }
-}
-// ----
-// getMinMax() -> 0, 255
-// intToEnum(uint8): 0 -> 0
-// intToEnum(uint8): 255 -> 255
-// enumToInt(uint8): 0 -> 0
-// enumToInt(uint8): 255 -> 255
-// enumToInt(uint8): 256 -> FAILURE
-// decodeEnum(bytes): 0x20, 32, 0 -> 0
-// decodeEnum(bytes): 0x20, 32, 255 -> 255
-// decodeEnum(bytes): 0x20, 32, 256 -> FAILURE
diff --git a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
deleted file mode 100644
index 243a7920c571..000000000000
--- a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    enum X { A, B }
-    event Log(X);
-
-    function test_log() public returns (uint) {
-        X garbled = X.A;
-        assembly {
-            garbled := 5
-        }
-        emit Log(garbled);
-        return 1;
-    }
-    function test_log_ok() public returns (uint) {
-        X x = X.A;
-        emit Log(x);
-        return 1;
-    }
-}
-// ----
-// test_log_ok() -> 1
-// ~ emit Log(uint8): 0x00
-// test_log() -> FAILURE, hex"4e487b71", 0x21
diff --git a/test/libsolidity/semanticTests/enums/minmax.sol b/test/libsolidity/semanticTests/enums/minmax.sol
deleted file mode 100644
index a447f64338e4..000000000000
--- a/test/libsolidity/semanticTests/enums/minmax.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-	enum MinMax { A, B, C, D }
-
-	function min() public returns(uint) { return uint(type(MinMax).min); }
-	function max() public returns(uint) { return uint(type(MinMax).max); }
-}
-// ----
-// min() -> 0
-// max() -> 3
diff --git a/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol b/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
deleted file mode 100644
index a3bce93accae..000000000000
--- a/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum Choice {A, B, C}
-
-    function answer() public returns (test.Choice _ret) {
-        _ret = test.Choice.B;
-    }
-}
-// ----
-// answer() -> 1
diff --git a/test/libsolidity/semanticTests/enums/using_enums.sol b/test/libsolidity/semanticTests/enums/using_enums.sol
deleted file mode 100644
index b4d0ce8e367f..000000000000
--- a/test/libsolidity/semanticTests/enums/using_enums.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract test {
-    enum ActionChoices {GoLeft, GoRight, GoStraight, Sit}
-
-    constructor() {
-        choices = ActionChoices.GoStraight;
-    }
-
-    function getChoice() public returns (uint256 d) {
-        d = uint256(choices);
-    }
-
-    ActionChoices choices;
-}
-// ----
-// getChoice() -> 2
diff --git a/test/libsolidity/semanticTests/enums/using_inherited_enum.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
deleted file mode 100644
index 9741568baaf3..000000000000
--- a/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract base {
-    enum Choice {A, B, C}
-}
-
-
-contract test is base {
-    function answer() public returns (Choice _ret) {
-        _ret = Choice.B;
-    }
-}
-// ----
-// answer() -> 1
diff --git a/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
deleted file mode 100644
index eb1d63a2fd6f..000000000000
--- a/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract base {
-    enum Choice {A, B, C}
-}
-
-
-contract test is base {
-    function answer() public returns (base.Choice _ret) {
-        _ret = base.Choice.B;
-    }
-}
-// ----
-// answer() -> 1
diff --git a/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol b/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
deleted file mode 100644
index fad9d8bbfc2f..000000000000
--- a/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-error E(uint a);
-library L {
-    error E(uint a, uint b);
-}
-interface I {
-    error E(uint a, uint b, uint c);
-}
-contract C {
-    function f() public pure {
-        revert E(1);
-    }
-    function g() public pure {
-        revert L.E(1, 2);
-    }
-    function h() public pure {
-        revert I.E(1, 2, 3);
-    }
-}
-// ----
-// f() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
-// g() -> FAILURE, hex"85208890", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000002"
-// h() -> FAILURE, hex"7924ea7c", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000003"
diff --git a/test/libsolidity/semanticTests/errors/error_selector.sol b/test/libsolidity/semanticTests/errors/error_selector.sol
deleted file mode 100644
index e7e40fd6ec12..000000000000
--- a/test/libsolidity/semanticTests/errors/error_selector.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-library L {
-    error E();
-}
-library S {
-    error E(uint);
-}
-library T {
-    error E();
-}
-
-error E();
-
-interface I {
-    error E();
-    function f() external pure;
-}
-
-contract D {
-    error F();
-}
-
-contract C is D {
-    function test1() public pure returns (bytes4, bytes4, bytes4, bytes4) {
-        assert(L.E.selector == T.E.selector);
-        assert(L.E.selector != S.E.selector);
-        assert(E.selector == L.E.selector);
-        assert(I.E.selector == L.E.selector);
-        return (L.E.selector, S.E.selector, E.selector, I.E.selector);
-    }
-
-    bytes4 s1 = L.E.selector;
-    bytes4 s2 = S.E.selector;
-    bytes4 s3 = T.E.selector;
-    bytes4 s4 = I.E.selector;
-    function test2() external returns (bytes4, bytes4, bytes4, bytes4) {
-        return (s1, s2, s3, s4);
-    }
-
-    function test3() external returns (bytes4) {
-        return (F.selector);
-    }
-}
-// ====
-// compileViaYul: also
-// ----
-// test1() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000
-// test2() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000
-// test3() -> 0x28811f5900000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol b/test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol
deleted file mode 100644
index bfda3b1263f0..000000000000
--- a/test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    error E(uint[], uint[1]);
-
-    // This case used to be affected by the buggy cleanup due to ABIEncoderV2HeadOverflowWithStaticArrayCleanup bug.
-    function f(uint[] memory a, uint[1] calldata b) public {
-        revert E(a, b);
-    }
-}
-// ----
-// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> FAILURE, hex"f42f106d", 0x40, 0xff, 1, 0xffff
diff --git a/test/libsolidity/semanticTests/errors/named_error_args.sol b/test/libsolidity/semanticTests/errors/named_error_args.sol
deleted file mode 100644
index 04697f52192b..000000000000
--- a/test/libsolidity/semanticTests/errors/named_error_args.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint a, uint b);
-contract C {
-    function f() public pure {
-        revert E({b: 7, a: 2});
-    }
-}
-// ----
-// f() -> FAILURE, hex"85208890", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000007"
diff --git a/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol b/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
deleted file mode 100644
index 2f2b7c676b9b..000000000000
--- a/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    error E1(StructType StructType);
-    error E2(EnumType StructType, StructType EnumType);
-
-    function f() public {
-        revert E1({StructType: StructType(42)});
-    }
-
-    function g() public {
-        revert E2({EnumType: StructType(42), StructType: EnumType.B});
-    }
-}
-// ----
-// f() -> FAILURE, hex"33a54193", hex"000000000000000000000000000000000000000000000000000000000000002a"
-// g() -> FAILURE, hex"374b9387", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"000000000000000000000000000000000000000000000000000000000000002a"
diff --git a/test/libsolidity/semanticTests/errors/panic_via_import.sol b/test/libsolidity/semanticTests/errors/panic_via_import.sol
deleted file mode 100644
index 94a6a7aaaf68..000000000000
--- a/test/libsolidity/semanticTests/errors/panic_via_import.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-error E(uint);
-==== Source: s2.sol ====
-import { E as Panic } from "s1.sol";
-contract C {
-    error E(uint);
-    function a() public pure {
-        revert Panic(1);
-    }
-    function b() public pure {
-        revert E(1);
-    }
-}
-// ----
-// a() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
-// b() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
diff --git a/test/libsolidity/semanticTests/errors/revert_conversion.sol b/test/libsolidity/semanticTests/errors/revert_conversion.sol
deleted file mode 100644
index bef34704fcf5..000000000000
--- a/test/libsolidity/semanticTests/errors/revert_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-error E(string a, uint[] b);
-contract C {
-    uint[] x;
-    function f() public {
-        x.push(7);
-        revert E("abc", x);
-    }
-}
-// ----
-// f() -> FAILURE, hex"59e4d4df", 0x40, 0x80, 3, "abc", 1, 7
diff --git a/test/libsolidity/semanticTests/errors/simple.sol b/test/libsolidity/semanticTests/errors/simple.sol
deleted file mode 100644
index 809b10c57d0a..000000000000
--- a/test/libsolidity/semanticTests/errors/simple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint a, uint b);
-contract C {
-    function f() public pure {
-        revert E(2, 7);
-    }
-}
-// ----
-// f() -> FAILURE, hex"85208890", 2, 7
diff --git a/test/libsolidity/semanticTests/errors/using_structs.sol b/test/libsolidity/semanticTests/errors/using_structs.sol
deleted file mode 100644
index e04e4b1c7a49..000000000000
--- a/test/libsolidity/semanticTests/errors/using_structs.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v2;
-struct S { uint a; string b; }
-error E(uint a, S s, uint b);
-contract C {
-    S s;
-    function f(bool c) public {
-        if (c) {
-            s.a = 9;
-            s.b = "abc";
-            revert E(2, s, 7);
-        } else {
-            revert E({b: 7, a: 2, s: S({b: "abc", a: 9})});
-        }
-    }
-}
-// ----
-// f(bool): true -> FAILURE, hex"e96e07f0", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000007", hex"0000000000000000000000000000000000000000000000000000000000000009", hex"0000000000000000000000000000000000000000000000000000000000000040", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"6162630000000000000000000000000000000000000000000000000000000000"
-// f(bool): false -> FAILURE, hex"e96e07f0", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000007", hex"0000000000000000000000000000000000000000000000000000000000000009", hex"0000000000000000000000000000000000000000000000000000000000000040", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"6162630000000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/via_contract_type.sol b/test/libsolidity/semanticTests/errors/via_contract_type.sol
deleted file mode 100644
index 09f60e6530d2..000000000000
--- a/test/libsolidity/semanticTests/errors/via_contract_type.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-  error E(uint);
-}
-contract X {
-  error E(string);
-}
-contract B is A {
-  function f() public pure { revert E(1); }
-  function g() public pure  { revert A.E(1); }
-  function h() public pure { revert X.E("abc"); }
-
-}
-// ----
-// f() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
-// g() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
-// h() -> FAILURE, hex"3e9992c9", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"6162630000000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/via_import.sol b/test/libsolidity/semanticTests/errors/via_import.sol
deleted file mode 100644
index eb54e5b4d71b..000000000000
--- a/test/libsolidity/semanticTests/errors/via_import.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: s1.sol ====
-error E(uint);
-==== Source: s2.sol ====
-import "s1.sol" as S;
-==== Source: s3.sol ====
-import "s1.sol" as S;
-import "s2.sol" as T;
-import "s1.sol";
-contract C {
-  function x() public pure {
-    revert E(1);
-  }
-  function y() public pure {
-    revert S.E(2);
-  }
-  function z() public pure {
-    revert T.S.E(3);
-  }
-}
-// ----
-// x() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
-// y() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000002"
-// z() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000003"
diff --git a/test/libsolidity/semanticTests/errors/weird_name.sol b/test/libsolidity/semanticTests/errors/weird_name.sol
deleted file mode 100644
index 2466d6e20346..000000000000
--- a/test/libsolidity/semanticTests/errors/weird_name.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error error(uint a);
-contract C {
-    function f() public pure {
-        revert error(2);
-    }
-}
-// ----
-// f() -> FAILURE, hex"b48fb6cf", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/events/event.sol b/test/libsolidity/semanticTests/events/event.sol
deleted file mode 100644
index 0f70dc655895..000000000000
--- a/test/libsolidity/semanticTests/events/event.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract ClientReceipt {
-    event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
-    function deposit(bytes32 _id, bool _manually) public payable {
-        if (_manually) {
-            bytes32 s = 0x19dacbf83c5de6658e14cbf7bcae5c15eca2eedecf1c66fbca928e4d351bea0f;
-            uint value = msg.value;
-            address sender = msg.sender;
-            assembly {
-                mstore(0, value)
-                log3(0, 0x20, s, sender, _id)
-            }
-        } else {
-            emit Deposit(msg.sender, _id, msg.value);
-        }
-    }
-}
-// ----
-// deposit(bytes32,bool), 18 wei: 0x1234, true ->
-// ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
-// deposit(bytes32,bool), 18 wei: 0x1234, false ->
-// ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol b/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
deleted file mode 100644
index dede5eacba96..000000000000
--- a/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    event x();
-}
-contract B is A {
-    function f() public returns (uint) {
-        emit A.x();
-        return 1;
-    }
-}
-// ----
-// f() -> 1
-// ~ emit x()
diff --git a/test/libsolidity/semanticTests/events/event_anonymous.sol b/test/libsolidity/semanticTests/events/event_anonymous.sol
deleted file mode 100644
index 1aaffa39b7af..000000000000
--- a/test/libsolidity/semanticTests/events/event_anonymous.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit() anonymous;
-    function deposit() public {
-        emit Deposit();
-    }
-}
-// ----
-// deposit() ->
-// ~ emit <anonymous>
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
deleted file mode 100644
index c4ac4e83bd58..000000000000
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit(uint256 indexed _from, bytes32 indexed _id, uint _value) anonymous;
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(0x2012159ca6b6372f102c535a4814d13a00bfc5568ddfd72151364061b00355d1, _id, msg.value); // 0x2012159c -> 'Deposit(uint256,bytes32,uint256)'
-    }
-}
-// ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit <anonymous>: #0x2012159ca6b6372f102c535a4814d13a00bfc5568ddfd72151364061b00355d1, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
deleted file mode 100644
index 3d2b3bb741b9..000000000000
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract ClientReceipt {
-    event Withdraw(uint _value, string owner);
-    event Deposit(uint256 indexed _from, bytes32 indexed _id, uint _value) anonymous;
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(0x5ddaa77ac5bda319ba947e31bee594711f39ed1b20d079d438dbad5ed729fb30, _id, msg.value); // 0x5ddaa77a -> 'Withdraw(uint256,string)'
-    }
-}
-// ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit Withdraw(uint256,string): #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
deleted file mode 100644
index a46d9799b318..000000000000
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit(address indexed _from, bytes32 indexed _id, uint indexed _value, uint indexed _value2, bytes32 data) anonymous;
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(msg.sender, _id, msg.value, 2, "abc");
-    }
-}
-// ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit <anonymous>: #0x1212121212121212121212121212120000000012, #0x1234, #0x12, #0x02, "abc"
diff --git a/test/libsolidity/semanticTests/events/event_constructor.sol b/test/libsolidity/semanticTests/events/event_constructor.sol
deleted file mode 100644
index bbb66cbac0a4..000000000000
--- a/test/libsolidity/semanticTests/events/event_constructor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
-    constructor() {
-        emit Deposit(msg.sender, bytes32("abc"), 7);
-    }
-}
-// ----
-// constructor()
-// ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #"abc", 0x07
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
deleted file mode 100644
index 4dd63819fd4b..000000000000
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    event E(uint[]);
-    function createEvent(uint x) public {
-        uint[] memory arr = new uint[](3);
-        arr[0] = x;
-        arr[1] = x + 1;
-        arr[2] = x + 2;
-        emit E(arr);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
deleted file mode 100644
index 8bde9a2a819c..000000000000
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder v2;
-contract C {
-    event E(uint[]);
-    function createEvent(uint x) public {
-        uint[] memory arr = new uint[](3);
-        arr[0] = x;
-        arr[1] = x + 1;
-        arr[2] = x + 2;
-        emit E(arr);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
deleted file mode 100644
index fec281c59a01..000000000000
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    event E(uint[]);
-    uint[] arr;
-    function createEvent(uint x) public {
-        while (arr.length < 3)
-            arr.push();
-        arr[0] = x;
-        arr[1] = x + 1;
-        arr[2] = x + 2;
-        emit E(arr);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113485
-// gas legacy: 116314
-// gas legacyOptimized: 114407
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
deleted file mode 100644
index 2b5a7114d99b..000000000000
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-pragma abicoder v2;
-contract C {
-    event E(uint[]);
-    uint[] arr;
-    function createEvent(uint x) public {
-        while (arr.length < 3)
-            arr.push();
-        arr[0] = x;
-        arr[1] = x + 1;
-        arr[2] = x + 2;
-        emit E(arr);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113485
-// gas legacy: 116314
-// gas legacyOptimized: 114407
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
deleted file mode 100644
index 00fda110fbd9..000000000000
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder v2;
-contract C {
-    event E(uint[][]);
-    function createEvent(uint x) public {
-        uint[][] memory arr = new uint[][](2);
-        arr[0] = new uint[](2);
-        arr[1] = new uint[](2);
-        arr[0][0] = x;
-        arr[0][1] = x + 1;
-        arr[1][0] = x + 2;
-        arr[1][1] = x + 3;
-        emit E(arr);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
deleted file mode 100644
index d6cfb68beff9..000000000000
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-contract C {
-    event E(uint[][]);
-    uint[][] arr;
-    function createEvent(uint x) public {
-        arr.push(new uint[](2));
-        arr.push(new uint[](2));
-        arr[0][0] = x;
-        arr[0][1] = x + 1;
-        arr[1][0] = x + 2;
-        arr[1][1] = x + 3;
-        emit E(arr);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185033
-// gas legacy: 187495
-// gas legacyOptimized: 184525
diff --git a/test/libsolidity/semanticTests/events/event_emit.sol b/test/libsolidity/semanticTests/events/event_emit.sol
deleted file mode 100644
index 07224d97b2e8..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(msg.sender, _id, msg.value);
-    }
-}
-// ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_emit_file_level.sol b/test/libsolidity/semanticTests/events/event_emit_file_level.sol
deleted file mode 100644
index b698bb80bdff..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit_file_level.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
-
-contract ClientReceipt {
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(msg.sender, _id, msg.value);
-    }
-}
-// ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol
deleted file mode 100644
index fcd7b6f4c5d9..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    event E();
-}
-
-contract D {
-    function test() public {
-        emit C.E();
-    }
-}
-
-// ----
-// test() ->
-// ~ emit E()
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol b/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol
deleted file mode 100644
index 05c03c20fe40..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    event E(uint256 value);
-}
-
-contract D {
-    event E(uint256 value);
-
-    function test() public {
-        emit C.E(1);
-        emit E(2);
-    }
-}
-
-// ----
-// test() ->
-// ~ emit E(uint256): 0x01
-// ~ emit E(uint256): 0x02
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
deleted file mode 100644
index f8b5141b97fc..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract D {
-    event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(msg.sender, _id, msg.value);
-    }
-}
-contract C {
-    D d;
-    constructor() {
-        d = new D();
-    }
-    function deposit(bytes32 _id) public payable {
-        d.deposit(_id);
-    }
-}
-// ----
-// constructor() ->
-// gas irOptimized: 165386
-// gas legacy: 244800
-// gas legacyOptimized: 171615
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol b/test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol
deleted file mode 100644
index 9e24287ab781..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-interface I {
-    event E();
-}
-
-library L {
-    function f() internal {
-        emit I.E();
-    }
-}
-
-contract C {
-    function g() public {
-        L.f();
-    }
-}
-
-// ----
-// g() ->
-// ~ emit E()
diff --git a/test/libsolidity/semanticTests/events/event_emit_via_interface.sol b/test/libsolidity/semanticTests/events/event_emit_via_interface.sol
deleted file mode 100644
index 7268e9ac503b..000000000000
--- a/test/libsolidity/semanticTests/events/event_emit_via_interface.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    event Event(address indexed _from, uint256 _value);
-}
-
-contract C {
-    function emitEvent(uint256 _value) public {
-        emit I.Event(msg.sender, _value);
-    }
-}
-
-// ----
-// emitEvent(uint256): 100 ->
-// ~ emit Event(address,uint256): #0x1212121212121212121212121212120000000012, 0x64
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function.sol b/test/libsolidity/semanticTests/events/event_indexed_function.sol
deleted file mode 100644
index ea7574159500..000000000000
--- a/test/libsolidity/semanticTests/events/event_indexed_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    event Test(function() external indexed);
-    function f() public {
-        emit Test(this.f);
-    }
-}
-// ----
-// f() ->
-// ~ emit Test(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79e26121ff00000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function2.sol b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
deleted file mode 100644
index d4c47e868a1f..000000000000
--- a/test/libsolidity/semanticTests/events/event_indexed_function2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    event TestA(function() external indexed);
-    event TestB(function(uint256) external indexed);
-    function f1() public {
-        emit TestA(this.f1);
-    }
-    function f2(uint256 a) public {
-        emit TestB(this.f2);
-    }
-}
-// ----
-// f1() ->
-// ~ emit TestA(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79ec27fc3050000000000000000
-// f2(uint256): 1 ->
-// ~ emit TestB(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79ebf3724af0000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
deleted file mode 100644
index ad753ef16fde..000000000000
--- a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    // Indexed parameters are always listed first in the output.
-    // The data is the ABI encoding of just the non-indexed parameters,
-    // so putting the indexed parameters "in between" would mess
-    // up the offsets for the reader.
-    event E(uint a, uint indexed r, uint b, bytes c);
-    function deposit() public {
-        emit E(1, 2, 3, "def");
-    }
-}
-// ----
-// deposit() ->
-// ~ emit E(uint256,uint256,uint256,bytes): #0x02, 0x01, 0x03, 0x60, 0x03, "def"
-// gas irOptimized: 23709
-// gas legacy: 24342
-// gas legacyOptimized: 23753
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
deleted file mode 100644
index 739619066a43..000000000000
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    string x;
-    uint[4] y;
-    event E(string indexed r, uint[4] indexed t);
-    function deposit() public {
-        for (uint i = 0; i < 90; i++)
-            bytes(x).push(0);
-        for (uint8 i = 0; i < 90; i++)
-            bytes(x)[i] = bytes1(i);
-        y[0] = 4;
-        y[1] = 5;
-        y[2] = 6;
-        y[3] = 7;
-        emit E(x, y);
-    }
-}
-// ----
-// deposit() ->
-// ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 328856
-// gas legacy: 365828
-// gas legacyOptimized: 362251
diff --git a/test/libsolidity/semanticTests/events/event_lots_of_data.sol b/test/libsolidity/semanticTests/events/event_lots_of_data.sol
deleted file mode 100644
index b7926a840945..000000000000
--- a/test/libsolidity/semanticTests/events/event_lots_of_data.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit(address _from, bytes32 _id, uint _value, bool _flag);
-    function deposit(bytes32 _id) public payable {
-        emit Deposit(msg.sender, _id, msg.value, true);
-    }
-}
-// ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit Deposit(address,bytes32,uint256,bool): 0x1212121212121212121212121212120000000012, 0x1234, 0x12, true
diff --git a/test/libsolidity/semanticTests/events/event_no_arguments.sol b/test/libsolidity/semanticTests/events/event_no_arguments.sol
deleted file mode 100644
index 235afeb6c1ed..000000000000
--- a/test/libsolidity/semanticTests/events/event_no_arguments.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit();
-    function deposit() public {
-        emit Deposit();
-    }
-}
-// ----
-// deposit() ->
-// ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol b/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
deleted file mode 100644
index 9e9c08063b42..000000000000
--- a/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ClientReceipt {
-    event Deposit(uint fixeda, bytes dynx, uint fixedb);
-    function deposit() public {
-        emit Deposit(10, msg.data, 15);
-    }
-}
-// ----
-// deposit() ->
-// ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x04, 0xd0e30db000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol b/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
deleted file mode 100644
index 1c993113c929..000000000000
--- a/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract ClientReceipt {
-    bytes x;
-    event Deposit(uint fixeda, bytes dynx, uint fixedb);
-    function deposit() public {
-        x.push("A");
-        x.push("B");
-        x.push("C");
-        emit Deposit(10, x, 15);
-    }
-}
-// ----
-// deposit() ->
-// ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x03, "ABC"
diff --git a/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol b/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
deleted file mode 100644
index 01fcc456543b..000000000000
--- a/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract ClientReceipt {
-    bytes x;
-    event Deposit(uint fixeda, bytes dynx, uint fixedb);
-    function deposit() public {
-        x = new bytes(31);
-        x[0] = "A";
-        x[1] = "B";
-        x[2] = "C";
-        x[30] = "Z";
-        emit Deposit(10, x, 15);
-    }
-}
-// ----
-// deposit() ->
-// ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x1f, "ABC\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Z"
diff --git a/test/libsolidity/semanticTests/events/event_selector.sol b/test/libsolidity/semanticTests/events/event_selector.sol
deleted file mode 100644
index b42ba490838b..000000000000
--- a/test/libsolidity/semanticTests/events/event_selector.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-library L {
-    event E();
-}
-
-library S {
-    event E(uint);
-}
-
-library T {
-    event E();
-}
-
-interface I {
-    event E();
-}
-
-contract B {
-    event E();
-}
-
-contract D {
-    event F();
-}
-
-contract C is D {
-    function test1() external pure returns (bytes32, bytes32, bytes32, bytes32) {
-        assert(L.E.selector == T.E.selector);
-        assert(I.E.selector == L.E.selector);
-        assert(T.E.selector == I.E.selector);
-        assert(B.E.selector == T.E.selector);
-
-        assert(L.E.selector != S.E.selector);
-        assert(T.E.selector != S.E.selector);
-        assert(I.E.selector != S.E.selector);
-        assert(B.E.selector != S.E.selector);
-
-        return (L.E.selector, S.E.selector, I.E.selector, B.E.selector);
-    }
-
-    bytes32 s1 = L.E.selector;
-    bytes32 s2 = S.E.selector;
-    bytes32 s3 = T.E.selector;
-    bytes32 s4 = I.E.selector;
-    bytes32 s5 = B.E.selector;
-    function test2() external returns (bytes32, bytes32, bytes32, bytes32, bytes32) {
-        return (s1, s2, s3, s4, s5);
-    }
-
-    function test3() external returns (bytes32) {
-        return (F.selector);
-    }
-}
-// ====
-// compileViaYul: also
-// ----
-// test1() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
-// test2() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
-// test3() -> 0x28811f5935c16a099486acb976b3a6b4942950a1425a74e9eb3e9b7f7135e12a
diff --git a/test/libsolidity/semanticTests/events/event_selector_file_level.sol b/test/libsolidity/semanticTests/events/event_selector_file_level.sol
deleted file mode 100644
index 8c5b6c95be68..000000000000
--- a/test/libsolidity/semanticTests/events/event_selector_file_level.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-event E();
-
-library L {
-    event E();
-}
-
-contract C {
-    function main() external pure returns (bytes32, bytes32) {
-        assert(E.selector == L.E.selector);
-
-        return (E.selector, L.E.selector);
-    }
-}
-// ----
-// main() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
diff --git a/test/libsolidity/semanticTests/events/event_shadowing_file_level.sol b/test/libsolidity/semanticTests/events/event_shadowing_file_level.sol
deleted file mode 100644
index 01c7d85aeb93..000000000000
--- a/test/libsolidity/semanticTests/events/event_shadowing_file_level.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-event E();
-
-library L1 {
-    event E(string);
-}
-
-library L2 {
-    event E();
-}
-
-library K {
-    function main() internal pure returns (bytes32, bytes32, bytes32) {
-        // Here E is the global event.
-        assert(E.selector != L1.E.selector);
-        assert(E.selector == L2.E.selector);
-
-        return (E.selector, L1.E.selector, L2.E.selector);
-    }
-}
-
-contract C {
-    event E(string);
-
-    function main() external pure returns (bytes32, bytes32, bytes32) {
-        // Here E is the local event.
-        assert(E.selector == L1.E.selector);
-        assert(E.selector != L2.E.selector);
-
-        return (E.selector, L1.E.selector, L2.E.selector);
-    }
-
-    function k_main() external pure returns (bytes32, bytes32, bytes32) {
-        return K.main();
-    }
-}
-// ----
-// main() -> 0x3e9992c940c54ea252d3a34557cc3d3014281525c43d694f89d5f3dfd820b07d, 0x3e9992c940c54ea252d3a34557cc3d3014281525c43d694f89d5f3dfd820b07d, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
-// k_main() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x3e9992c940c54ea252d3a34557cc3d3014281525c43d694f89d5f3dfd820b07d, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
diff --git a/test/libsolidity/semanticTests/events/event_signature_in_library.sol b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
deleted file mode 100644
index d8dc0f15808d..000000000000
--- a/test/libsolidity/semanticTests/events/event_signature_in_library.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-library L {
-    struct S {
-        uint8 a;
-        int16 b;
-    }
-    event E(S indexed, S);
-    function f() internal {
-        S memory s;
-        emit E(s, s);
-    }
-}
-contract C {
-    constructor() {
-        L.f();
-    }
-}
-// ----
-// constructor()
-// ~ emit E((uint8,int16),(uint8,int16)): #0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5, 0x00, 0x00
-// gas legacy: 150602
diff --git a/test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol b/test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol
deleted file mode 100644
index a72ad938c291..000000000000
--- a/test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    event E(uint[], uint[1]);
-
-    // This case used to be affected by the buggy cleanup due to ABIEncoderV2HeadOverflowWithStaticArrayCleanup bug.
-    function f(uint[] memory a, uint[1] calldata b) public {
-        emit E(a, b);
-    }
-}
-// ----
-// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff ->
-// ~ emit E(uint256[],uint256[1]): 0x40, 0xff, 0x01, 0xffff
diff --git a/test/libsolidity/semanticTests/events/event_string.sol b/test/libsolidity/semanticTests/events/event_string.sol
deleted file mode 100644
index b299888772cd..000000000000
--- a/test/libsolidity/semanticTests/events/event_string.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    event E(string r);
-    function deposit() public {
-        emit E("HELLO WORLD");
-    }
-}
-// ----
-// deposit() ->
-// ~ emit E(string): 0x20, 0x0b, "HELLO WORLD"
diff --git a/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol b/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
deleted file mode 100644
index a77c3150d0e8..000000000000
--- a/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v2;
-contract C {
-    struct S { uint a; }
-    event E(S);
-    function createEvent(uint x) public {
-        emit E(S(x));
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E((uint256)): 0x2a
diff --git a/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol b/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
deleted file mode 100644
index b64d8cff2181..000000000000
--- a/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder v2;
-contract C {
-    struct S { uint a; }
-    event E(S);
-    S s;
-    function createEvent(uint x) public {
-        s.a = x;
-        emit E(s);
-    }
-}
-// ----
-// createEvent(uint256): 42 ->
-// ~ emit E((uint256)): 0x2a
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name.sol b/test/libsolidity/semanticTests/events/events_with_same_name.sol
deleted file mode 100644
index 22a0895fb987..000000000000
--- a/test/libsolidity/semanticTests/events/events_with_same_name.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract ClientReceipt {
-    event Deposit();
-    event Deposit(address _addr);
-    event Deposit(address _addr, uint _amount);
-    event Deposit(address _addr, bool _flag);
-    function deposit() public returns (uint) {
-        emit Deposit();
-        return 1;
-    }
-    function deposit(address _addr) public returns (uint) {
-        emit Deposit(_addr);
-        return 2;
-    }
-    function deposit(address _addr, uint _amount) public returns (uint) {
-        emit Deposit(_addr, _amount);
-        return 3;
-    }
-    function deposit(address _addr, bool _flag) public returns (uint) {
-        emit Deposit(_addr, _flag);
-        return 4;
-    }
-}
-// ----
-// deposit() -> 1
-// ~ emit Deposit()
-// deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988 -> 2
-// ~ emit Deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988
-// deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 100 -> 3
-// ~ emit Deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 0x64
-// deposit(address,bool): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, false -> 4
-// ~ emit Deposit(address,bool): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, false
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol b/test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol
deleted file mode 100644
index 222e0b0cea1c..000000000000
--- a/test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-event Deposit();
-event Deposit(address _addr);
-event Deposit(address _addr, uint _amount);
-event Deposit(address _addr, bool _flag);
-
-contract ClientReceipt {
-    function deposit() public returns (uint) {
-        emit Deposit();
-        return 1;
-    }
-    function deposit(address _addr) public returns (uint) {
-        emit Deposit(_addr);
-        return 2;
-    }
-    function deposit(address _addr, uint _amount) public returns (uint) {
-        emit Deposit(_addr, _amount);
-        return 3;
-    }
-    function deposit(address _addr, bool _flag) public returns (uint) {
-        emit Deposit(_addr, _flag);
-        return 4;
-    }
-}
-// ----
-// deposit() -> 1
-// ~ emit Deposit()
-// deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988 -> 2
-// ~ emit Deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988
-// deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 100 -> 3
-// ~ emit Deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 0x64
-// deposit(address,bool): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, false -> 4
-// ~ emit Deposit(address,bool): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, false
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol b/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
deleted file mode 100644
index de87fe416f78..000000000000
--- a/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract A {
-    event Deposit();
-}
-
-contract B {
-    event Deposit(address _addr);
-}
-
-contract ClientReceipt is A, B {
-    event Deposit(address _addr, uint _amount);
-    function deposit() public returns (uint) {
-        emit Deposit();
-        return 1;
-    }
-    function deposit(address _addr) public returns (uint) {
-        emit Deposit(_addr);
-        return 1;
-    }
-    function deposit(address _addr, uint _amount) public returns (uint) {
-        emit Deposit(_addr, _amount);
-        return 1;
-    }
-}
-// ----
-// deposit() -> 1
-// ~ emit Deposit()
-// deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988 -> 1
-// ~ emit Deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988
-// deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 100 -> 1
-// ~ emit Deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 0x64
diff --git a/test/libsolidity/semanticTests/events/simple.sol b/test/libsolidity/semanticTests/events/simple.sol
deleted file mode 100644
index 018c91e70c78..000000000000
--- a/test/libsolidity/semanticTests/events/simple.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    event E();
-}
-
-contract Test is C {
-    event E(uint256, uint256);
-    function f() public {
-        emit C.E();
-        emit E(1,2);
-    }
-}
-// ====
-// compileViaYul: also
-// ----
-// f() ->
-// ~ emit E()
-// ~ emit E(uint256,uint256): 0x01, 0x02
diff --git a/test/libsolidity/semanticTests/exponentiation/literal_base.sol b/test/libsolidity/semanticTests/exponentiation/literal_base.sol
deleted file mode 100644
index 3dcba494abc0..000000000000
--- a/test/libsolidity/semanticTests/exponentiation/literal_base.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract test {
-    function f(uint x) public pure returns (uint, int) {
-        unchecked {
-            uint a = 2 ** x;
-            int b = -2 ** x;
-            return (a, b);
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 1, 1
-// f(uint256): 1 -> 2, -2
-// f(uint256): 2 -> 4, 4
-// f(uint256): 13 -> 0x2000, -8192
-// f(uint256): 113 -> 0x020000000000000000000000000000, -10384593717069655257060992658440192
-// f(uint256): 114 -> 0x040000000000000000000000000000, 20769187434139310514121985316880384
-// f(uint256): 1113 -> 0x00, 0
-// f(uint256): 1114 -> 0x00, 0
diff --git a/test/libsolidity/semanticTests/exponentiation/signed_base.sol b/test/libsolidity/semanticTests/exponentiation/signed_base.sol
deleted file mode 100644
index f58c081293e6..000000000000
--- a/test/libsolidity/semanticTests/exponentiation/signed_base.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    function f() public pure returns (int, int) {
-        int32 x = -3;
-        uint8 y1;
-        uint8 y2;
-        assembly {
-            y1 := 0x102
-            y2 := 0x103
-        }
-        return (x**y1, x**y2);
-    }
-}
-// ----
-// f() -> 9, -27
diff --git a/test/libsolidity/semanticTests/exponentiation/small_exp.sol b/test/libsolidity/semanticTests/exponentiation/small_exp.sol
deleted file mode 100644
index a26675fb7f31..000000000000
--- a/test/libsolidity/semanticTests/exponentiation/small_exp.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    function f() public pure returns (uint r) {
-        uint32 x;
-        uint8 y;
-        assembly {
-            x := 0xfffffffffe
-            y := 0x102
-        }
-        unchecked { r = x**y; }
-        return r;
-    }
-}
-// ----
-// f() -> 4
diff --git a/test/libsolidity/semanticTests/expressions/bit_operators.sol b/test/libsolidity/semanticTests/expressions/bit_operators.sol
deleted file mode 100644
index 35887059c99e..000000000000
--- a/test/libsolidity/semanticTests/expressions/bit_operators.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test {
-    uint8 x;
-    uint v;
-    function f() public returns (uint x, uint y, uint z) {
-        uint16 a;
-        uint32 b;
-        assembly {
-            a := 0x0f0f0f0f0f
-            b := 0xff0fff0fff
-        }
-        x = a & b;
-        y = a | b;
-        z = a ^ b;
-    }
-}
-// ----
-// f() -> 3855, 268374015, 268370160
diff --git a/test/libsolidity/semanticTests/expressions/bytes_comparison.sol b/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
deleted file mode 100644
index b1220c510ce7..000000000000
--- a/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public returns (bool) {
-        bytes2 a = "a";
-        bytes2 x = "aa";
-        bytes2 b = "b";
-        return a < x && x < b;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
deleted file mode 100644
index df07364b368d..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f(bool cond) public returns (uint) {
-        uint8 x = 0xcd;
-        uint16 y = 0xabab;
-        return cond ? x : y;
-    }
-}
-// ----
-// f(bool): true -> 0xcd
-// f(bool): false -> 0xabab
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
deleted file mode 100644
index 3915c7b8dc61..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public returns(uint d) {
-        return false ? 5 : 10;
-    }
-}
-// ----
-// f() -> 10
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
deleted file mode 100644
index bff9122b1ea1..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function x() public returns (uint) { return 1; }
-    function y() public returns (uint) { return 2; }
-
-    function f(bool cond) public returns (uint) {
-        function () returns (uint) z = cond ? x : y;
-        return z();
-    }
-}
-// ----
-// f(bool): true -> 1
-// f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
deleted file mode 100644
index 2a9d6de8086a..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    function f(uint x) public returns(uint d) {
-        return x > 100 ?
-                    x > 1000 ? 1000 : 100
-                    :
-                    x > 50 ? 50 : 10;
-    }
-}
-// ----
-// f(uint256): 1001 -> 1000
-// f(uint256): 500 -> 100
-// f(uint256): 80 -> 50
-// f(uint256): 40 -> 10
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
deleted file mode 100644
index 3434cca016e8..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract test {
-    bytes2[2] data1;
-    function f(bool cond) public returns (uint) {
-        bytes2[2] memory x;
-        x[0] = "aa";
-        bytes2[2] memory y;
-        y[0] = "bb";
-
-        data1 = cond ? x : y;
-
-        uint ret = 0;
-        if (data1[0] == "aa")
-        {
-            ret = 1;
-        }
-
-        if (data1[0] == "bb")
-        {
-            ret = 2;
-        }
-
-        return ret;
-    }
-}
-// ----
-// f(bool): true -> 1
-// f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
deleted file mode 100644
index 8633d2bfab48..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract test {
-    bytes2[2] data1;
-    function f(bool cond) public returns (uint) {
-        data1[0] = "cc";
-
-        bytes2[2] memory x;
-        bytes2[2] memory y;
-        y[0] = "bb";
-
-        x = cond ? y : data1;
-
-        uint ret = 0;
-        if (x[0] == "bb")
-        {
-            ret = 1;
-        }
-
-        if (x[0] == "cc")
-        {
-            ret = 2;
-        }
-
-        return ret;
-    }
-}
-// ----
-// f(bool): true -> 1
-// f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
deleted file mode 100644
index 06247f0dc535..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public returns(uint d) {
-        return true ? 5 : 10;
-    }
-}
-// ----
-// f() -> 5
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
deleted file mode 100644
index d27d06bacb79..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f(bool cond) public returns (uint, uint) {
-        return cond ? (1, 2) : (3, 4);
-    }
-}
-// ----
-// f(bool): true -> 1, 2
-// f(bool): false -> 3, 4
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
deleted file mode 100644
index bbaf051bde11..000000000000
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f(bool cond, uint v) public returns (uint a, uint b) {
-        cond ? a = v : b = v;
-    }
-}
-// ----
-// f(bool,uint256): true, 20 -> 20, 0
-// f(bool,uint256): false, 20 -> 0, 20
diff --git a/test/libsolidity/semanticTests/expressions/exp_operator_const.sol b/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
deleted file mode 100644
index e2a7ccc7355e..000000000000
--- a/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns(uint d) { return 2 ** 3; }
-}
-// ----
-// f() -> 8
diff --git a/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol b/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
deleted file mode 100644
index b2dd001b3528..000000000000
--- a/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns(int d) { return (-2) ** 3; }
-}
-// ----
-// f() -> -8
diff --git a/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol b/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
deleted file mode 100644
index f7e5c6ab8107..000000000000
--- a/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns(uint d) { return 0 ** 0; }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol b/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
deleted file mode 100644
index c6957ee9f62a..000000000000
--- a/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract test {
-    uint8 x;
-    uint v;
-    function f() public returns (uint r) {
-        uint a = 6;
-        r = a;
-        r += (a++) * 0x10;
-        r += (++a) * 0x100;
-        v = 3;
-        r += (v++) * 0x1000;
-        r += (++v) * 0x10000;
-    }
-}
-// ----
-// f() -> 0x053866
diff --git a/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol b/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
deleted file mode 100644
index 937d06c1877c..000000000000
--- a/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: A ====
-contract D {
-}
-==== Source: B ====
-import "A" as M;
-
-contract C {
-    function f() public pure returns (bool) {
-        bool flag;
-        ((flag = true) ? M : M).D;
-        return flag;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol b/test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol
deleted file mode 100644
index c8a2ced2cc12..000000000000
--- a/test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (bool){
-        bool flag;
-        ((flag = true) ? (1, 2, 3) : (3, 2, 1));
-        return flag;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol b/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
deleted file mode 100644
index 29bf661693ec..000000000000
--- a/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public returns (bool) {
-		return
-			0 <
-			~~84926290883049832306107864558384249403874903260938453235235091622489261765859;
-	}
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol b/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
deleted file mode 100644
index af408b3f5110..000000000000
--- a/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract TransferTest {
-	fallback() external payable {
-		// This used to cause an ICE
-		payable(this).transfer;
-	}
-
-	function f() pure public {}
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
deleted file mode 100644
index f9f53275bba9..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ /dev/null
@@ -1,118 +0,0 @@
-//sol FixedFeeRegistrar
-// Simple global registrar with fixed-fee reservations.
-// @authors:
-//   Gav Wood <g@ethdev.com>
-
-pragma solidity >=0.4.0 <0.9.0;
-
-abstract contract Registrar {
-	event Changed(string indexed name);
-
-	function owner(string memory _name) public virtual view returns (address o_owner);
-	function addr(string memory _name) public virtual view returns (address o_address);
-	function subRegistrar(string memory _name) virtual public view returns (address o_subRegistrar);
-	function content(string memory _name) public virtual view returns (bytes32 o_content);
-}
-
-contract FixedFeeRegistrar is Registrar {
-	struct Record {
-		address addr;
-		address subRegistrar;
-		bytes32 content;
-		address owner;
-	}
-
-	modifier onlyrecordowner(string memory _name) { if (m_record(_name).owner == msg.sender) _; }
-
-	function reserve(string memory _name) public payable {
-		Record storage rec = m_record(_name);
-		if (rec.owner == 0x0000000000000000000000000000000000000000 && msg.value >= c_fee) {
-			rec.owner = msg.sender;
-			emit Changed(_name);
-		}
-	}
-	function disown(string memory _name, address payable _refund) onlyrecordowner(_name) public {
-		delete m_recordData[uint(keccak256(bytes(_name))) / 8];
-		if (!_refund.send(c_fee))
-			revert();
-		emit Changed(_name);
-	}
-	function transfer(string memory _name, address _newOwner) onlyrecordowner(_name) public {
-		m_record(_name).owner = _newOwner;
-		emit Changed(_name);
-	}
-	function setAddr(string memory _name, address _a) onlyrecordowner(_name) public {
-		m_record(_name).addr = _a;
-		emit Changed(_name);
-	}
-	function setSubRegistrar(string memory _name, address _registrar) onlyrecordowner(_name) public {
-		m_record(_name).subRegistrar = _registrar;
-		emit Changed(_name);
-	}
-	function setContent(string memory _name, bytes32 _content) onlyrecordowner(_name) public {
-		m_record(_name).content = _content;
-		emit Changed(_name);
-	}
-
-	function record(string memory _name) public view returns (address o_addr, address o_subRegistrar, bytes32 o_content, address o_owner) {
-		Record storage rec = m_record(_name);
-		o_addr = rec.addr;
-		o_subRegistrar = rec.subRegistrar;
-		o_content = rec.content;
-		o_owner = rec.owner;
-	}
-	function addr(string memory _name) public override view returns (address) { return m_record(_name).addr; }
-	function subRegistrar(string memory _name) public override view returns (address) { return m_record(_name).subRegistrar; }
-	function content(string memory _name) public override view returns (bytes32) { return m_record(_name).content; }
-	function owner(string memory _name) public override view returns (address) { return m_record(_name).owner; }
-
-	Record[2**253] m_recordData;
-	function m_record(string memory _name) view internal returns (Record storage o_record) {
-		return m_recordData[uint(keccak256(bytes(_name))) / 8];
-	}
-	uint constant c_fee = 69 ether;
-}
-// ----
-// constructor()
-// gas irOptimized: 384610
-// gas legacy: 913421
-// gas legacyOptimized: 476928
-// reserve(string), 69 ether: 0x20, 3, "abc" ->
-// ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-// gas irOptimized: 45967
-// gas legacy: 46842
-// gas legacyOptimized: 46091
-// owner(string): 0x20, 3, "abc" -> 0x1212121212121212121212121212120000000012
-// reserve(string), 70 ether: 0x20, 3, "def" ->
-// ~ emit Changed(string): #0x34607c9bbfeb9c23509680f04363f298fdb0b5f9abe327304ecd1daca08cda9c
-// owner(string): 0x20, 3, "def" -> 0x1212121212121212121212121212120000000012
-// reserve(string), 68 ether: 0x20, 3, "ghi" ->
-// owner(string): 0x20, 3, "ghi" -> 0
-// account: 1 -> 0x1212121212121212121212121212120000001012
-// reserve(string), 69 ether: 0x20, 3, "abc" ->
-// owner(string): 0x20, 3, "abc" -> 0x1212121212121212121212121212120000000012
-// account: 0 -> 0x1212121212121212121212121212120000000012
-// setContent(string,bytes32): 0x40, 0, 3, "abc" ->
-// ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-// transfer(string,address): 0x40, 555, 3, "abc" ->
-// ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-// owner(string): 0x20, 3, "abc" -> 555
-// content(string): 0x20, 3, "abc" -> 0x00
-// setContent(string,bytes32): 0x40, 333, 3, "def" ->
-// ~ emit Changed(string): #0x34607c9bbfeb9c23509680f04363f298fdb0b5f9abe327304ecd1daca08cda9c
-// setAddr(string,address): 0x40, 124, 3, "def" ->
-// ~ emit Changed(string): #0x34607c9bbfeb9c23509680f04363f298fdb0b5f9abe327304ecd1daca08cda9c
-// setSubRegistrar(string,address): 0x40, 125, 3, "def" ->
-// ~ emit Changed(string): #0x34607c9bbfeb9c23509680f04363f298fdb0b5f9abe327304ecd1daca08cda9c
-// content(string): 0x20, 3, "def" -> 333
-// addr(string): 0x20, 3, "def" -> 124
-// subRegistrar(string): 0x20, 3, "def" -> 125
-// balance: 0x124 -> 0
-// disown(string,address): 0x40, 0x124, 3, "def" ->
-// ~ emit Changed(string): #0x34607c9bbfeb9c23509680f04363f298fdb0b5f9abe327304ecd1daca08cda9c
-// balance: 0x124 -> 0
-// ~ emit Changed(string): #0x34607c9bbfeb9c23509680f04363f298fdb0b5f9abe327304ecd1daca08cda9c
-// owner(string): 0x20, 3, "def" -> 0
-// content(string): 0x20, 3, "def" -> 0
-// addr(string): 0x20, 3, "def" -> 0
-// subRegistrar(string): 0x20, 3, "def" -> 0
diff --git a/test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol b/test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol
deleted file mode 100644
index 7df0c902d196..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol
+++ /dev/null
@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.0;
-
-/**
- * @dev Provides a set of functions to operate with Base64 strings.
- */
-library InlineAsmBase64 {
-    /**
-     * @dev Base64 Encoding/Decoding Table
-     */
-    string internal constant _TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    /**
-     * @dev Converts a `bytes` to its Bytes64 `string` representation.
-     */
-    function encode(bytes memory data) internal pure returns (string memory) {
-        /**
-         * Inspired by OpenZepplin Base64 implementation
-         * https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2884/commits/157c32b65a15cb0b58257543643cafa1cebf883a
-         */
-        if (data.length == 0) return "";
-
-        // Loads the table into memory
-        string memory table = _TABLE;
-
-        // Encoding takes 3 bytes chunks of binary data from `bytes` data parameter
-        // and split into 4 numbers of 6 bits.
-        // The final Base64 length should be `bytes` data length multiplied by 4/3 rounded up
-        // - `data.length + 2`  -> Round up
-        // - `/ 3`              -> Number of 3-bytes chunks
-        // - `4 *`              -> 4 characters for each chunk
-        uint256 encodedLen = 4 * ((data.length + 2) / 3);
-
-        // Add some extra buffer at the end required for the writing
-        string memory result = new string(encodedLen);
-
-        assembly {
-            // Store the actual result length in memory
-            mstore(result, encodedLen)
-
-            // Prepare the lookup table
-            let tablePtr := add(table, 1)
-
-            // Prepare input pointer
-            let dataPtr := data
-            let endPtr := add(dataPtr, mload(data))
-
-            // Prepare result pointer, jump over length
-            let resultPtr := add(result, 32)
-
-            // Run over the input, 3 bytes at a time
-            for {
-
-            } lt(dataPtr, endPtr) {
-
-            } {
-                // Advance 3 bytes
-                dataPtr := add(dataPtr, 3)
-                let input := mload(dataPtr)
-
-                // To write each character, shift the 3 bytes (24 bits) chunk 4
-                // times in blocks of 6 bits for each character (18, 12, 6, 0)
-                // and apply logical AND with 0x3F to extract the 6-bit group.
-                // Add the 6-bit group with the table ptr to index into the
-                // table and acquire the character to write.  Finally, write
-                // the character to the result pointer.
-
-                mstore8(resultPtr, mload(add(tablePtr, and(shr(18, input), 0x3F))))
-                resultPtr := add(resultPtr, 1) // Advance
-
-                mstore8(resultPtr, mload(add(tablePtr, and(shr(12, input), 0x3F))))
-                resultPtr := add(resultPtr, 1) // Advance
-
-                mstore8(resultPtr, mload(add(tablePtr, and(shr(6, input), 0x3F))))
-                resultPtr := add(resultPtr, 1) // Advance
-
-                mstore8(resultPtr, mload(add(tablePtr, and(input, 0x3F))))
-                resultPtr := add(resultPtr, 1) // Advance
-            }
-
-            // When data `bytes` is not exactly 3 bytes long
-            // it is padded with `=` characters at the end
-            switch mod(mload(data), 3)
-            case 1 {
-                mstore8(sub(resultPtr, 1), 0x3d)
-                mstore8(sub(resultPtr, 2), 0x3d)
-            }
-            case 2 {
-                mstore8(sub(resultPtr, 1), 0x3d)
-            }
-        }
-
-        return result;
-    }
-}
diff --git a/test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol b/test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol
deleted file mode 100644
index f54d2f925266..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.0;
-
-/**
- * @dev Provides a set of functions to operate with Base64 strings.
- */
-library NoAsmBase64 {
-    bytes private constant TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-        function encode(bytes memory data) internal pure returns (string memory) {
-        if (data.length == 0) return "";
-
-        bytes memory table     = TABLE;
-        bytes memory result    = new bytes(4 * ((data.length + 2) / 3));
-        uint256      resultPtr = 0;
-
-        for (uint256 dataPtr = 0; dataPtr < data.length; dataPtr += 3) {
-            uint24 chunk = (                            (uint24(uint8(data[dataPtr + 0])) << 16))
-                         + (dataPtr + 1 < data.length ? (uint24(uint8(data[dataPtr + 1])) <<  8) : 0)
-                         + (dataPtr + 2 < data.length ? (uint24(uint8(data[dataPtr + 2]))      ) : 0);
-
-            result[resultPtr++] = table[uint8(chunk >> 18) & 0x3f];
-            result[resultPtr++] = table[uint8(chunk >> 12) & 0x3f];
-            result[resultPtr++] = table[uint8(chunk >>  6) & 0x3f];
-            result[resultPtr++] = table[uint8(chunk      ) & 0x3f];
-        }
-
-        if (data.length % 3 == 1) {
-            result[--resultPtr] = 0x3d;
-            result[--resultPtr] = 0x3d;
-        }
-        else if (data.length % 3 == 2) {
-            result[--resultPtr] = 0x3d;
-        }
-
-        return (string(result));
-    }
-}
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/LICENSE.md b/test/libsolidity/semanticTests/externalContracts/_prbmath/LICENSE.md
deleted file mode 100644
index 77ac2a09f74b..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/LICENSE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# WTFPL
-
-by Paul Razvan Berg (@PaulRBerg)
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
deleted file mode 100644
index 9ec351b6c4a0..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
+++ /dev/null
@@ -1,361 +0,0 @@
-// SPDX-License-Identifier: WTFPL
-pragma solidity >=0.8.0;
-
-/// @dev Common mathematical functions used in both PRBMathSD59x18 and PRBMathUD60x18. Note that this shared library
-/// does not always assume the signed 59.18-decimal fixed-point or the unsigned 60.18-decimal fixed-point
-// representation. When it does not, it is annotated in the function's NatSpec documentation.
-library PRBMathCommon {
-    /// @dev How many trailing decimals can be represented.
-    uint256 internal constant SCALE = 1e18;
-
-    /// @dev Largest power of two divisor of SCALE.
-    uint256 internal constant SCALE_LPOTD = 262144;
-
-    /// @dev SCALE inverted mod 2^256.
-    uint256 internal constant SCALE_INVERSE = 78156646155174841979727994598816262306175212592076161876661508869554232690281;
-
-    /// @notice Calculates the binary exponent of x using the binary fraction method.
-    /// @dev Uses 128.128-bit fixed-point numbers, which is the most efficient way.
-    /// See https://ethereum.stackexchange.com/a/96594/24693.
-    /// @param x The exponent as an unsigned 128.128-bit fixed-point number.
-    /// @return result The result as an unsigned 60x18 decimal fixed-point number.
-    function exp2(uint256 x) internal pure returns (uint256 result) {
-        unchecked {
-            // Start from 0.5 in the 128.128-bit fixed-point format.
-            result = 0x80000000000000000000000000000000;
-
-            // Multiply the result by root(2, 2^-i) when the bit at position i is 1. None of the intermediary results overflows
-            // because the initial result is 2^127 and all magic factors are less than 2^129.
-            if (x & 0x80000000000000000000000000000000 > 0) result = (result * 0x16A09E667F3BCC908B2FB1366EA957D3E) >> 128;
-            if (x & 0x40000000000000000000000000000000 > 0) result = (result * 0x1306FE0A31B7152DE8D5A46305C85EDED) >> 128;
-            if (x & 0x20000000000000000000000000000000 > 0) result = (result * 0x1172B83C7D517ADCDF7C8C50EB14A7920) >> 128;
-            if (x & 0x10000000000000000000000000000000 > 0) result = (result * 0x10B5586CF9890F6298B92B71842A98364) >> 128;
-            if (x & 0x8000000000000000000000000000000 > 0) result = (result * 0x1059B0D31585743AE7C548EB68CA417FE) >> 128;
-            if (x & 0x4000000000000000000000000000000 > 0) result = (result * 0x102C9A3E778060EE6F7CACA4F7A29BDE9) >> 128;
-            if (x & 0x2000000000000000000000000000000 > 0) result = (result * 0x10163DA9FB33356D84A66AE336DCDFA40) >> 128;
-            if (x & 0x1000000000000000000000000000000 > 0) result = (result * 0x100B1AFA5ABCBED6129AB13EC11DC9544) >> 128;
-            if (x & 0x800000000000000000000000000000 > 0) result = (result * 0x10058C86DA1C09EA1FF19D294CF2F679C) >> 128;
-            if (x & 0x400000000000000000000000000000 > 0) result = (result * 0x1002C605E2E8CEC506D21BFC89A23A011) >> 128;
-            if (x & 0x200000000000000000000000000000 > 0) result = (result * 0x100162F3904051FA128BCA9C55C31E5E0) >> 128;
-            if (x & 0x100000000000000000000000000000 > 0) result = (result * 0x1000B175EFFDC76BA38E31671CA939726) >> 128;
-            if (x & 0x80000000000000000000000000000 > 0) result = (result * 0x100058BA01FB9F96D6CACD4B180917C3E) >> 128;
-            if (x & 0x40000000000000000000000000000 > 0) result = (result * 0x10002C5CC37DA9491D0985C348C68E7B4) >> 128;
-            if (x & 0x20000000000000000000000000000 > 0) result = (result * 0x1000162E525EE054754457D5995292027) >> 128;
-            if (x & 0x10000000000000000000000000000 > 0) result = (result * 0x10000B17255775C040618BF4A4ADE83FD) >> 128;
-            if (x & 0x8000000000000000000000000000 > 0) result = (result * 0x1000058B91B5BC9AE2EED81E9B7D4CFAC) >> 128;
-            if (x & 0x4000000000000000000000000000 > 0) result = (result * 0x100002C5C89D5EC6CA4D7C8ACC017B7CA) >> 128;
-            if (x & 0x2000000000000000000000000000 > 0) result = (result * 0x10000162E43F4F831060E02D839A9D16D) >> 128;
-            if (x & 0x1000000000000000000000000000 > 0) result = (result * 0x100000B1721BCFC99D9F890EA06911763) >> 128;
-            if (x & 0x800000000000000000000000000 > 0) result = (result * 0x10000058B90CF1E6D97F9CA14DBCC1629) >> 128;
-            if (x & 0x400000000000000000000000000 > 0) result = (result * 0x1000002C5C863B73F016468F6BAC5CA2C) >> 128;
-            if (x & 0x200000000000000000000000000 > 0) result = (result * 0x100000162E430E5A18F6119E3C02282A6) >> 128;
-            if (x & 0x100000000000000000000000000 > 0) result = (result * 0x1000000B1721835514B86E6D96EFD1BFF) >> 128;
-            if (x & 0x80000000000000000000000000 > 0) result = (result * 0x100000058B90C0B48C6BE5DF846C5B2F0) >> 128;
-            if (x & 0x40000000000000000000000000 > 0) result = (result * 0x10000002C5C8601CC6B9E94213C72737B) >> 128;
-            if (x & 0x20000000000000000000000000 > 0) result = (result * 0x1000000162E42FFF037DF38AA2B219F07) >> 128;
-            if (x & 0x10000000000000000000000000 > 0) result = (result * 0x10000000B17217FBA9C739AA5819F44FA) >> 128;
-            if (x & 0x8000000000000000000000000 > 0) result = (result * 0x1000000058B90BFCDEE5ACD3C1CEDC824) >> 128;
-            if (x & 0x4000000000000000000000000 > 0) result = (result * 0x100000002C5C85FE31F35A6A30DA1BE51) >> 128;
-            if (x & 0x2000000000000000000000000 > 0) result = (result * 0x10000000162E42FF0999CE3541B9FFFD0) >> 128;
-            if (x & 0x1000000000000000000000000 > 0) result = (result * 0x100000000B17217F80F4EF5AADDA45554) >> 128;
-            if (x & 0x800000000000000000000000 > 0) result = (result * 0x10000000058B90BFBF8479BD5A81B51AE) >> 128;
-            if (x & 0x400000000000000000000000 > 0) result = (result * 0x1000000002C5C85FDF84BD62AE30A74CD) >> 128;
-            if (x & 0x200000000000000000000000 > 0) result = (result * 0x100000000162E42FEFB2FED257559BDAA) >> 128;
-            if (x & 0x100000000000000000000000 > 0) result = (result * 0x1000000000B17217F7D5A7716BBA4A9AF) >> 128;
-            if (x & 0x80000000000000000000000 > 0) result = (result * 0x100000000058B90BFBE9DDBAC5E109CCF) >> 128;
-            if (x & 0x40000000000000000000000 > 0) result = (result * 0x10000000002C5C85FDF4B15DE6F17EB0E) >> 128;
-            if (x & 0x20000000000000000000000 > 0) result = (result * 0x1000000000162E42FEFA494F1478FDE05) >> 128;
-            if (x & 0x10000000000000000000000 > 0) result = (result * 0x10000000000B17217F7D20CF927C8E94D) >> 128;
-            if (x & 0x8000000000000000000000 > 0) result = (result * 0x1000000000058B90BFBE8F71CB4E4B33E) >> 128;
-            if (x & 0x4000000000000000000000 > 0) result = (result * 0x100000000002C5C85FDF477B662B26946) >> 128;
-            if (x & 0x2000000000000000000000 > 0) result = (result * 0x10000000000162E42FEFA3AE53369388D) >> 128;
-            if (x & 0x1000000000000000000000 > 0) result = (result * 0x100000000000B17217F7D1D351A389D41) >> 128;
-            if (x & 0x800000000000000000000 > 0) result = (result * 0x10000000000058B90BFBE8E8B2D3D4EDF) >> 128;
-            if (x & 0x400000000000000000000 > 0) result = (result * 0x1000000000002C5C85FDF4741BEA6E77F) >> 128;
-            if (x & 0x200000000000000000000 > 0) result = (result * 0x100000000000162E42FEFA39FE95583C3) >> 128;
-            if (x & 0x100000000000000000000 > 0) result = (result * 0x1000000000000B17217F7D1CFB72B45E3) >> 128;
-            if (x & 0x80000000000000000000 > 0) result = (result * 0x100000000000058B90BFBE8E7CC35C3F2) >> 128;
-            if (x & 0x40000000000000000000 > 0) result = (result * 0x10000000000002C5C85FDF473E242EA39) >> 128;
-            if (x & 0x20000000000000000000 > 0) result = (result * 0x1000000000000162E42FEFA39F02B772C) >> 128;
-            if (x & 0x10000000000000000000 > 0) result = (result * 0x10000000000000B17217F7D1CF7D83C1A) >> 128;
-            if (x & 0x8000000000000000000 > 0) result = (result * 0x1000000000000058B90BFBE8E7BDCBE2E) >> 128;
-            if (x & 0x4000000000000000000 > 0) result = (result * 0x100000000000002C5C85FDF473DEA871F) >> 128;
-            if (x & 0x2000000000000000000 > 0) result = (result * 0x10000000000000162E42FEFA39EF44D92) >> 128;
-            if (x & 0x1000000000000000000 > 0) result = (result * 0x100000000000000B17217F7D1CF79E949) >> 128;
-            if (x & 0x800000000000000000 > 0) result = (result * 0x10000000000000058B90BFBE8E7BCE545) >> 128;
-            if (x & 0x400000000000000000 > 0) result = (result * 0x1000000000000002C5C85FDF473DE6ECA) >> 128;
-            if (x & 0x200000000000000000 > 0) result = (result * 0x100000000000000162E42FEFA39EF366F) >> 128;
-            if (x & 0x100000000000000000 > 0) result = (result * 0x1000000000000000B17217F7D1CF79AFA) >> 128;
-            if (x & 0x80000000000000000 > 0) result = (result * 0x100000000000000058B90BFBE8E7BCD6E) >> 128;
-            if (x & 0x40000000000000000 > 0) result = (result * 0x10000000000000002C5C85FDF473DE6B3) >> 128;
-            if (x & 0x20000000000000000 > 0) result = (result * 0x1000000000000000162E42FEFA39EF359) >> 128;
-            if (x & 0x10000000000000000 > 0) result = (result * 0x10000000000000000B17217F7D1CF79AC) >> 128;
-
-            // We do two things at the same time below:
-            //
-            //     1. Multiply the result by 2^n + 1, where 2^n is the integer part and 1 is an extra bit to account
-            //        for the fact that we initially set the result to 0.5 We implement this by subtracting from 127
-            //        instead of 128.
-            //     2. Convert the result to the unsigned 60.18-decimal fixed-point format.
-            //
-            // This works because result * SCALE * 2^ip / 2^127 = result * SCALE / 2^(127 - ip), where ip is the integer
-            // part and SCALE / 2^128 is what converts the result to our unsigned fixed-point format.
-            result *= SCALE;
-            result >>= (127 - (x >> 128));
-        }
-    }
-
-    /// @notice Finds the zero-based index of the first one in the binary representation of x.
-    /// @dev See the note on msb in the "Find First Set" Wikipedia article https://en.wikipedia.org/wiki/Find_first_set
-    /// @param x The uint256 number for which to find the index of the most significant bit.
-    /// @return msb The index of the most significant bit as an uint256.
-    function mostSignificantBit(uint256 x) internal pure returns (uint256 msb) {
-        if (x >= 2**128) {
-            x >>= 128;
-            msb += 128;
-        }
-        if (x >= 2**64) {
-            x >>= 64;
-            msb += 64;
-        }
-        if (x >= 2**32) {
-            x >>= 32;
-            msb += 32;
-        }
-        if (x >= 2**16) {
-            x >>= 16;
-            msb += 16;
-        }
-        if (x >= 2**8) {
-            x >>= 8;
-            msb += 8;
-        }
-        if (x >= 2**4) {
-            x >>= 4;
-            msb += 4;
-        }
-        if (x >= 2**2) {
-            x >>= 2;
-            msb += 2;
-        }
-        if (x >= 2**1) {
-            // No need to shift x any more.
-            msb += 1;
-        }
-    }
-
-    /// @notice Calculates floor(x*y÷denominator) with full precision.
-    ///
-    /// @dev Credit to Remco Bloemen under MIT license https://xn--2-umb.com/21/muldiv.
-    ///
-    /// Requirements:
-    /// - The denominator cannot be zero.
-    /// - The result must fit within uint256.
-    ///
-    /// Caveats:
-    /// - This function does not work with fixed-point numbers.
-    ///
-    /// @param x The multiplicand as an uint256.
-    /// @param y The multiplier as an uint256.
-    /// @param denominator The divisor as an uint256.
-    /// @return result The result as an uint256.
-    function mulDiv(
-        uint256 x,
-        uint256 y,
-        uint256 denominator
-    ) internal pure returns (uint256 result) {
-        // 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2**256 and mod 2**256 - 1, then use
-        // use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
-        // variables such that product = prod1 * 2**256 + prod0.
-        uint256 prod0; // Least significant 256 bits of the product
-        uint256 prod1; // Most significant 256 bits of the product
-        assembly {
-            let mm := mulmod(x, y, not(0))
-            prod0 := mul(x, y)
-            prod1 := sub(sub(mm, prod0), lt(mm, prod0))
-        }
-
-        // Handle non-overflow cases, 256 by 256 division
-        if (prod1 == 0) {
-            require(denominator > 0);
-            assembly {
-                result := div(prod0, denominator)
-            }
-            return result;
-        }
-
-        // Make sure the result is less than 2**256. Also prevents denominator == 0.
-        require(denominator > prod1);
-
-        ///////////////////////////////////////////////
-        // 512 by 256 division.
-        ///////////////////////////////////////////////
-
-        // Make division exact by subtracting the remainder from [prod1 prod0].
-        uint256 remainder;
-        assembly {
-            // Compute remainder using mulmod.
-            remainder := mulmod(x, y, denominator)
-
-            // Subtract 256 bit number from 512 bit number
-            prod1 := sub(prod1, gt(remainder, prod0))
-            prod0 := sub(prod0, remainder)
-        }
-
-        // Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
-        // See https://cs.stackexchange.com/q/138556/92363.
-        unchecked {
-            // Does not overflow because the denominator cannot be zero at this stage in the function.
-            uint256 lpotdod = denominator & (~denominator + 1);
-            assembly {
-                // Divide denominator by lpotdod.
-                denominator := div(denominator, lpotdod)
-
-                // Divide [prod1 prod0] by lpotdod.
-                prod0 := div(prod0, lpotdod)
-
-                // Flip lpotdod such that it is 2**256 / lpotdod. If lpotdod is zero, then it becomes one.
-                lpotdod := add(div(sub(0, lpotdod), lpotdod), 1)
-            }
-
-            // Shift in bits from prod1 into prod0.
-            prod0 |= prod1 * lpotdod;
-
-            // Invert denominator mod 2**256. Now that denominator is an odd number, it has an inverse modulo 2**256 such
-            // that denominator * inv = 1 mod 2**256. Compute the inverse by starting with a seed that is correct for
-            // four bits. That is, denominator * inv = 1 mod 2**4
-            uint256 inverse = (3 * denominator) ^ 2;
-
-            // Now use Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
-            // in modular arithmetic, doubling the correct bits in each step.
-            inverse *= 2 - denominator * inverse; // inverse mod 2**8
-            inverse *= 2 - denominator * inverse; // inverse mod 2**16
-            inverse *= 2 - denominator * inverse; // inverse mod 2**32
-            inverse *= 2 - denominator * inverse; // inverse mod 2**64
-            inverse *= 2 - denominator * inverse; // inverse mod 2**128
-            inverse *= 2 - denominator * inverse; // inverse mod 2**256
-
-            // Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
-            // This will give us the correct result modulo 2**256. Since the precoditions guarantee that the outcome is
-            // less than 2**256, this is the final result. We don't need to compute the high bits of the result and prod1
-            // is no longer required.
-            result = prod0 * inverse;
-            return result;
-        }
-    }
-
-    /// @notice Calculates floor(x*y÷1e18) with full precision.
-    ///
-    /// @dev Variant of "mulDiv" with constant folding, i.e. in which the denominator is always 1e18. Before returning the
-    /// final result, we add 1 if (x * y) % SCALE >= HALF_SCALE. Without this, 6.6e-19 would be truncated to 0 instead of
-    /// being rounded to 1e-18.  See "Listing 6" and text above it at https://accu.org/index.php/journals/1717.
-    ///
-    /// Requirements:
-    /// - The result must fit within uint256.
-    ///
-    /// Caveats:
-    /// - The body is purposely left uncommented; see the NatSpec comments in "PRBMathCommon.mulDiv" to understand how this works.
-    /// - It is assumed that the result can never be type(uint256).max when x and y solve the following two queations:
-    ///     1. x * y = type(uint256).max * SCALE
-    ///     2. (x * y) % SCALE >= SCALE / 2
-    ///
-    /// @param x The multiplicand as an unsigned 60.18-decimal fixed-point number.
-    /// @param y The multiplier as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point number.
-    function mulDivFixedPoint(uint256 x, uint256 y) internal pure returns (uint256 result) {
-        uint256 prod0;
-        uint256 prod1;
-        assembly {
-            let mm := mulmod(x, y, not(0))
-            prod0 := mul(x, y)
-            prod1 := sub(sub(mm, prod0), lt(mm, prod0))
-        }
-
-        uint256 remainder;
-        uint256 roundUpUnit;
-        assembly {
-            remainder := mulmod(x, y, SCALE)
-            roundUpUnit := gt(remainder, 499999999999999999)
-        }
-
-        if (prod1 == 0) {
-            unchecked {
-                result = (prod0 / SCALE) + roundUpUnit;
-                return result;
-            }
-        }
-
-        require(SCALE > prod1);
-
-        assembly {
-            result := add(
-                mul(
-                    or(
-                        div(sub(prod0, remainder), SCALE_LPOTD),
-                        mul(sub(prod1, gt(remainder, prod0)), add(div(sub(0, SCALE_LPOTD), SCALE_LPOTD), 1))
-                    ),
-                    SCALE_INVERSE
-                ),
-                roundUpUnit
-            )
-        }
-    }
-
-    /// @notice Calculates the square root of x, rounding down.
-    /// @dev Uses the Babylonian method https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method.
-    ///
-    /// Caveats:
-    /// - This function does not work with fixed-point numbers.
-    ///
-    /// @param x The uint256 number for which to calculate the square root.
-    /// @return result The result as an uint256.
-    function sqrt(uint256 x) internal pure returns (uint256 result) {
-        if (x == 0) {
-            return 0;
-        }
-
-        // Calculate the square root of the perfect square of a power of two that is the closest to x.
-        uint256 xAux = uint256(x);
-        result = 1;
-        if (xAux >= 0x100000000000000000000000000000000) {
-            xAux >>= 128;
-            result <<= 64;
-        }
-        if (xAux >= 0x10000000000000000) {
-            xAux >>= 64;
-            result <<= 32;
-        }
-        if (xAux >= 0x100000000) {
-            xAux >>= 32;
-            result <<= 16;
-        }
-        if (xAux >= 0x10000) {
-            xAux >>= 16;
-            result <<= 8;
-        }
-        if (xAux >= 0x100) {
-            xAux >>= 8;
-            result <<= 4;
-        }
-        if (xAux >= 0x10) {
-            xAux >>= 4;
-            result <<= 2;
-        }
-        if (xAux >= 0x8) {
-            result <<= 1;
-        }
-
-        // The operations can never overflow because the result is max 2^127 when it enters this block.
-        unchecked {
-            result = (result + x / result) >> 1;
-            result = (result + x / result) >> 1;
-            result = (result + x / result) >> 1;
-            result = (result + x / result) >> 1;
-            result = (result + x / result) >> 1;
-            result = (result + x / result) >> 1;
-            result = (result + x / result) >> 1; // Seven iterations should be enough
-            uint256 roundedDownResult = x / result;
-            return result >= roundedDownResult ? roundedDownResult : result;
-        }
-    }
-}
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
deleted file mode 100644
index 9f3a10942d81..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
+++ /dev/null
@@ -1,578 +0,0 @@
-// SPDX-License-Identifier: WTFPL
-pragma solidity >=0.8.0;
-
-import "./PRBMathCommon.sol";
-
-/// @title PRBMathSD59x18
-/// @author Paul Razvan Berg
-/// @notice Smart contract library for advanced fixed-point math. It works with int256 numbers considered to have 18
-/// trailing decimals. We call this number representation signed 59.18-decimal fixed-point, since the numbers can have
-/// a sign and there can be up to 59 digits in the integer part and up to 18 decimals in the fractional part. The numbers
-/// are bound by the minimum and the maximum values permitted by the Solidity type int256.
-library PRBMathSD59x18 {
-    /// @dev log2(e) as a signed 59.18-decimal fixed-point number.
-    int256 internal constant LOG2_E = 1442695040888963407;
-
-    /// @dev Half the SCALE number.
-    int256 internal constant HALF_SCALE = 5e17;
-
-    /// @dev The maximum value a signed 59.18-decimal fixed-point number can have.
-    int256 internal constant MAX_SD59x18 = 57896044618658097711785492504343953926634992332820282019728792003956564819967;
-
-    /// @dev The maximum whole value a signed 59.18-decimal fixed-point number can have.
-    int256 internal constant MAX_WHOLE_SD59x18 = 57896044618658097711785492504343953926634992332820282019728000000000000000000;
-
-    /// @dev The minimum value a signed 59.18-decimal fixed-point number can have.
-    int256 internal constant MIN_SD59x18 = -57896044618658097711785492504343953926634992332820282019728792003956564819968;
-
-    /// @dev The minimum whole value a signed 59.18-decimal fixed-point number can have.
-    int256 internal constant MIN_WHOLE_SD59x18 = -57896044618658097711785492504343953926634992332820282019728000000000000000000;
-
-    /// @dev How many trailing decimals can be represented.
-    int256 internal constant SCALE = 1e18;
-
-    /// INTERNAL FUNCTIONS ///
-
-    /// @notice Calculate the absolute value of x.
-    ///
-    /// @dev Requirements:
-    /// - x must be greater than MIN_SD59x18.
-    ///
-    /// @param x The number to calculate the absolute value for.
-    /// @param result The absolute value of x.
-    function abs(int256 x) internal pure returns (int256 result) {
-        unchecked {
-            require(x > MIN_SD59x18);
-            result = x < 0 ? -x : x;
-        }
-    }
-
-    /// @notice Calculates arithmetic average of x and y, rounding down.
-    /// @param x The first operand as a signed 59.18-decimal fixed-point number.
-    /// @param y The second operand as a signed 59.18-decimal fixed-point number.
-    /// @return result The arithmetic average as a signed 59.18-decimal fixed-point number.
-    function avg(int256 x, int256 y) internal pure returns (int256 result) {
-        // The operations can never overflow.
-        unchecked {
-            // The last operand checks if both x and y are odd and if that is the case, we add 1 to the result. We need
-            // to do this because if both numbers are odd, the 0.5 remainder gets truncated twice.
-            result = (x >> 1) + (y >> 1) + (x & y & 1);
-        }
-    }
-
-    /// @notice Yields the least greatest signed 59.18 decimal fixed-point number greater than or equal to x.
-    ///
-    /// @dev Optimised for fractional value inputs, because for every whole value there are (1e18 - 1) fractional counterparts.
-    /// See https://en.wikipedia.org/wiki/Floor_and_ceiling_functions.
-    ///
-    /// Requirements:
-    /// - x must be less than or equal to MAX_WHOLE_SD59x18.
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number to ceil.
-    /// @param result The least integer greater than or equal to x, as a signed 58.18-decimal fixed-point number.
-    function ceil(int256 x) internal pure returns (int256 result) {
-        require(x <= MAX_WHOLE_SD59x18);
-        unchecked {
-            int256 remainder = x % SCALE;
-            if (remainder == 0) {
-                result = x;
-            } else {
-                // Solidity uses C fmod style, which returns a modulus with the same sign as x.
-                result = x - remainder;
-                if (x > 0) {
-                    result += SCALE;
-                }
-            }
-        }
-    }
-
-    /// @notice Divides two signed 59.18-decimal fixed-point numbers, returning a new signed 59.18-decimal fixed-point number.
-    ///
-    /// @dev Variant of "mulDiv" that works with signed numbers. Works by computing the signs and the absolute values separately.
-    ///
-    /// Requirements:
-    /// - All from "PRBMathCommon.mulDiv".
-    /// - None of the inputs can be type(int256).min.
-    /// - y cannot be zero.
-    /// - The result must fit within int256.
-    ///
-    /// Caveats:
-    /// - All from "PRBMathCommon.mulDiv".
-    ///
-    /// @param x The numerator as a signed 59.18-decimal fixed-point number.
-    /// @param y The denominator as a signed 59.18-decimal fixed-point number.
-    /// @param result The quotient as a signed 59.18-decimal fixed-point number.
-    function div(int256 x, int256 y) internal pure returns (int256 result) {
-        require(x > type(int256).min);
-        require(y > type(int256).min);
-
-        // Get hold of the absolute values of x and y.
-        uint256 ax;
-        uint256 ay;
-        unchecked {
-            ax = x < 0 ? uint256(-x) : uint256(x);
-            ay = y < 0 ? uint256(-y) : uint256(y);
-        }
-
-        // Compute the absolute value of (x*SCALE)÷y. The result must fit within int256.
-        uint256 resultUnsigned = PRBMathCommon.mulDiv(ax, uint256(SCALE), ay);
-        require(resultUnsigned <= uint256(type(int256).max));
-
-        // Get the signs of x and y.
-        uint256 sx;
-        uint256 sy;
-        assembly {
-            sx := sgt(x, sub(0, 1))
-            sy := sgt(y, sub(0, 1))
-        }
-
-        // XOR over sx and sy. This is basically checking whether the inputs have the same sign. If yes, the result
-        // should be positive. Otherwise, it should be negative.
-        result = sx ^ sy == 1 ? -int256(resultUnsigned) : int256(resultUnsigned);
-    }
-
-    /// @notice Returns Euler's number as a signed 59.18-decimal fixed-point number.
-    /// @dev See https://en.wikipedia.org/wiki/E_(mathematical_constant).
-    function e() internal pure returns (int256 result) {
-        result = 2718281828459045235;
-    }
-
-    /// @notice Calculates the natural exponent of x.
-    ///
-    /// @dev Based on the insight that e^x = 2^(x * log2(e)).
-    ///
-    /// Requirements:
-    /// - All from "log2".
-    /// - x must be less than 88722839111672999628.
-    ///
-    /// @param x The exponent as a signed 59.18-decimal fixed-point number.
-    /// @return result The result as a signed 59.18-decimal fixed-point number.
-    function exp(int256 x) internal pure returns (int256 result) {
-        // Without this check, the value passed to "exp2" would be less than -59794705707972522261.
-        if (x < -41446531673892822322) {
-            return 0;
-        }
-
-        // Without this check, the value passed to "exp2" would be greater than 128e18.
-        require(x < 88722839111672999628);
-
-        // Do the fixed-point multiplication inline to save gas.
-        unchecked {
-            int256 doubleScaleProduct = x * LOG2_E;
-            result = exp2((doubleScaleProduct + HALF_SCALE) / SCALE);
-        }
-    }
-
-    /// @notice Calculates the binary exponent of x using the binary fraction method.
-    ///
-    /// @dev See https://ethereum.stackexchange.com/q/79903/24693.
-    ///
-    /// Requirements:
-    /// - x must be 128e18 or less.
-    /// - The result must fit within MAX_SD59x18.
-    ///
-    /// Caveats:
-    /// - For any x less than -59794705707972522261, the result is zero.
-    ///
-    /// @param x The exponent as a signed 59.18-decimal fixed-point number.
-    /// @return result The result as a signed 59.18-decimal fixed-point number.
-    function exp2(int256 x) internal pure returns (int256 result) {
-        // This works because 2^(-x) = 1/2^x.
-        if (x < 0) {
-            // 2**59.794705707972522262 is the maximum number whose inverse does not turn into zero.
-            if (x < -59794705707972522261) {
-                return 0;
-            }
-
-            // Do the fixed-point inversion inline to save gas. The numerator is SCALE * SCALE.
-            unchecked { result = 1e36 / exp2(-x); }
-        } else {
-            // 2**128 doesn't fit within the 128.128-bit fixed-point representation.
-            require(x < 128e18);
-
-            unchecked {
-                // Convert x to the 128.128-bit fixed-point format.
-                uint256 x128x128 = (uint256(x) << 128) / uint256(SCALE);
-
-                // Safe to convert the result to int256 directly because the maximum input allowed is 128e18.
-                result = int256(PRBMathCommon.exp2(x128x128));
-            }
-        }
-    }
-
-    /// @notice Yields the greatest signed 59.18 decimal fixed-point number less than or equal to x.
-    ///
-    /// @dev Optimised for fractional value inputs, because for every whole value there are (1e18 - 1) fractional counterparts.
-    /// See https://en.wikipedia.org/wiki/Floor_and_ceiling_functions.
-    ///
-    /// Requirements:
-    /// - x must be greater than or equal to MIN_WHOLE_SD59x18.
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number to floor.
-    /// @param result The greatest integer less than or equal to x, as a signed 58.18-decimal fixed-point number.
-    function floor(int256 x) internal pure returns (int256 result) {
-        require(x >= MIN_WHOLE_SD59x18);
-        unchecked {
-            int256 remainder = x % SCALE;
-            if (remainder == 0) {
-                result = x;
-            } else {
-                // Solidity uses C fmod style, which returns a modulus with the same sign as x.
-                result = x - remainder;
-                if (x < 0) {
-                    result -= SCALE;
-                }
-            }
-        }
-    }
-
-    /// @notice Yields the excess beyond the floor of x for positive numbers and the part of the number to the right
-    /// of the radix point for negative numbers.
-    /// @dev Based on the odd function definition. https://en.wikipedia.org/wiki/Fractional_part
-    /// @param x The signed 59.18-decimal fixed-point number to get the fractional part of.
-    /// @param result The fractional part of x as a signed 59.18-decimal fixed-point number.
-    function frac(int256 x) internal pure returns (int256 result) {
-        unchecked { result = x % SCALE; }
-    }
-
-    /// @notice Calculates geometric mean of x and y, i.e. sqrt(x * y), rounding down.
-    ///
-    /// @dev Requirements:
-    /// - x * y must fit within MAX_SD59x18, lest it overflows.
-    /// - x * y cannot be negative.
-    ///
-    /// @param x The first operand as a signed 59.18-decimal fixed-point number.
-    /// @param y The second operand as a signed 59.18-decimal fixed-point number.
-    /// @return result The result as a signed 59.18-decimal fixed-point number.
-    function gm(int256 x, int256 y) internal pure returns (int256 result) {
-        if (x == 0) {
-            return 0;
-        }
-
-        unchecked {
-            // Checking for overflow this way is faster than letting Solidity do it.
-            int256 xy = x * y;
-            require(xy / x == y);
-
-            // The product cannot be negative.
-            require(xy >= 0);
-
-            // We don't need to multiply by the SCALE here because the x*y product had already picked up a factor of SCALE
-            // during multiplication. See the comments within the "sqrt" function.
-            result = int256(PRBMathCommon.sqrt(uint256(xy)));
-        }
-    }
-
-    /// @notice Calculates 1 / x, rounding towards zero.
-    ///
-    /// @dev Requirements:
-    /// - x cannot be zero.
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number for which to calculate the inverse.
-    /// @return result The inverse as a signed 59.18-decimal fixed-point number.
-    function inv(int256 x) internal pure returns (int256 result) {
-        unchecked {
-            // 1e36 is SCALE * SCALE.
-            result = 1e36 / x;
-        }
-    }
-
-    /// @notice Calculates the natural logarithm of x.
-    ///
-    /// @dev Based on the insight that ln(x) = log2(x) / log2(e).
-    ///
-    /// Requirements:
-    /// - All from "log2".
-    ///
-    /// Caveats:
-    /// - All from "log2".
-    /// - This doesn't return exactly 1 for 2718281828459045235, for that we would need more fine-grained precision.
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number for which to calculate the natural logarithm.
-    /// @return result The natural logarithm as a signed 59.18-decimal fixed-point number.
-    function ln(int256 x) internal pure returns (int256 result) {
-        // Do the fixed-point multiplication inline to save gas. This is overflow-safe because the maximum value that log2(x)
-        // can return is 195205294292027477728.
-        unchecked { result = (log2(x) * SCALE) / LOG2_E; }
-    }
-
-    /// @notice Calculates the common logarithm of x.
-    ///
-    /// @dev First checks if x is an exact power of ten and it stops if yes. If it's not, calculates the common
-    /// logarithm based on the insight that log10(x) = log2(x) / log2(10).
-    ///
-    /// Requirements:
-    /// - All from "log2".
-    ///
-    /// Caveats:
-    /// - All from "log2".
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number for which to calculate the common logarithm.
-    /// @return result The common logarithm as a signed 59.18-decimal fixed-point number.
-    function log10(int256 x) internal pure returns (int256 result) {
-        require(x > 0);
-
-        // Note that the "mul" in this block is the assembly mul operation, not the "mul" function defined in this contract.
-        // prettier-ignore
-        assembly {
-            switch x
-            case 1 { result := mul(SCALE, sub(0, 18)) }
-            case 10 { result := mul(SCALE, sub(1, 18)) }
-            case 100 { result := mul(SCALE, sub(2, 18)) }
-            case 1000 { result := mul(SCALE, sub(3, 18)) }
-            case 10000 { result := mul(SCALE, sub(4, 18)) }
-            case 100000 { result := mul(SCALE, sub(5, 18)) }
-            case 1000000 { result := mul(SCALE, sub(6, 18)) }
-            case 10000000 { result := mul(SCALE, sub(7, 18)) }
-            case 100000000 { result := mul(SCALE, sub(8, 18)) }
-            case 1000000000 { result := mul(SCALE, sub(9, 18)) }
-            case 10000000000 { result := mul(SCALE, sub(10, 18)) }
-            case 100000000000 { result := mul(SCALE, sub(11, 18)) }
-            case 1000000000000 { result := mul(SCALE, sub(12, 18)) }
-            case 10000000000000 { result := mul(SCALE, sub(13, 18)) }
-            case 100000000000000 { result := mul(SCALE, sub(14, 18)) }
-            case 1000000000000000 { result := mul(SCALE, sub(15, 18)) }
-            case 10000000000000000 { result := mul(SCALE, sub(16, 18)) }
-            case 100000000000000000 { result := mul(SCALE, sub(17, 18)) }
-            case 1000000000000000000 { result := 0 }
-            case 10000000000000000000 { result := SCALE }
-            case 100000000000000000000 { result := mul(SCALE, 2) }
-            case 1000000000000000000000 { result := mul(SCALE, 3) }
-            case 10000000000000000000000 { result := mul(SCALE, 4) }
-            case 100000000000000000000000 { result := mul(SCALE, 5) }
-            case 1000000000000000000000000 { result := mul(SCALE, 6) }
-            case 10000000000000000000000000 { result := mul(SCALE, 7) }
-            case 100000000000000000000000000 { result := mul(SCALE, 8) }
-            case 1000000000000000000000000000 { result := mul(SCALE, 9) }
-            case 10000000000000000000000000000 { result := mul(SCALE, 10) }
-            case 100000000000000000000000000000 { result := mul(SCALE, 11) }
-            case 1000000000000000000000000000000 { result := mul(SCALE, 12) }
-            case 10000000000000000000000000000000 { result := mul(SCALE, 13) }
-            case 100000000000000000000000000000000 { result := mul(SCALE, 14) }
-            case 1000000000000000000000000000000000 { result := mul(SCALE, 15) }
-            case 10000000000000000000000000000000000 { result := mul(SCALE, 16) }
-            case 100000000000000000000000000000000000 { result := mul(SCALE, 17) }
-            case 1000000000000000000000000000000000000 { result := mul(SCALE, 18) }
-            case 10000000000000000000000000000000000000 { result := mul(SCALE, 19) }
-            case 100000000000000000000000000000000000000 { result := mul(SCALE, 20) }
-            case 1000000000000000000000000000000000000000 { result := mul(SCALE, 21) }
-            case 10000000000000000000000000000000000000000 { result := mul(SCALE, 22) }
-            case 100000000000000000000000000000000000000000 { result := mul(SCALE, 23) }
-            case 1000000000000000000000000000000000000000000 { result := mul(SCALE, 24) }
-            case 10000000000000000000000000000000000000000000 { result := mul(SCALE, 25) }
-            case 100000000000000000000000000000000000000000000 { result := mul(SCALE, 26) }
-            case 1000000000000000000000000000000000000000000000 { result := mul(SCALE, 27) }
-            case 10000000000000000000000000000000000000000000000 { result := mul(SCALE, 28) }
-            case 100000000000000000000000000000000000000000000000 { result := mul(SCALE, 29) }
-            case 1000000000000000000000000000000000000000000000000 { result := mul(SCALE, 30) }
-            case 10000000000000000000000000000000000000000000000000 { result := mul(SCALE, 31) }
-            case 100000000000000000000000000000000000000000000000000 { result := mul(SCALE, 32) }
-            case 1000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 33) }
-            case 10000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 34) }
-            case 100000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 35) }
-            case 1000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 36) }
-            case 10000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 37) }
-            case 100000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 38) }
-            case 1000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 39) }
-            case 10000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 40) }
-            case 100000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 41) }
-            case 1000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 42) }
-            case 10000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 43) }
-            case 100000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 44) }
-            case 1000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 45) }
-            case 10000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 46) }
-            case 100000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 47) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 48) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 49) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 50) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 51) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 52) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 53) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 54) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 55) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 56) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 57) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 58) }
-            default {
-                result := MAX_SD59x18
-            }
-        }
-
-        if (result == MAX_SD59x18) {
-            // Do the fixed-point division inline to save gas. The denominator is log2(10).
-            unchecked { result = (log2(x) * SCALE) / 332192809488736234; }
-        }
-    }
-
-    /// @notice Calculates the binary logarithm of x.
-    ///
-    /// @dev Based on the iterative approximation algorithm.
-    /// https://en.wikipedia.org/wiki/Binary_logarithm#Iterative_approximation
-    ///
-    /// Requirements:
-    /// - x must be greater than zero.
-    ///
-    /// Caveats:
-    /// - The results are nor perfectly accurate to the last digit, due to the lossy precision of the iterative approximation.
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number for which to calculate the binary logarithm.
-    /// @return result The binary logarithm as a signed 59.18-decimal fixed-point number.
-    function log2(int256 x) internal pure returns (int256 result) {
-        require(x > 0);
-        unchecked {
-            // This works because log2(x) = -log2(1/x).
-            int256 sign;
-            if (x >= SCALE) {
-                sign = 1;
-            } else {
-                sign = -1;
-                // Do the fixed-point inversion inline to save gas. The numerator is SCALE * SCALE.
-                assembly {
-                    x := div(1000000000000000000000000000000000000, x)
-                }
-            }
-
-            // Calculate the integer part of the logarithm and add it to the result and finally calculate y = x * 2^(-n).
-            uint256 n = PRBMathCommon.mostSignificantBit(uint256(x / SCALE));
-
-            // The integer part of the logarithm as a signed 59.18-decimal fixed-point number. The operation can't overflow
-            // because n is maximum 255, SCALE is 1e18 and sign is either 1 or -1.
-            result = int256(n) * SCALE;
-
-            // This is y = x * 2^(-n).
-            int256 y = x >> n;
-
-            // If y = 1, the fractional part is zero.
-            if (y == SCALE) {
-                return result * sign;
-            }
-
-            // Calculate the fractional part via the iterative approximation.
-            // The "delta >>= 1" part is equivalent to "delta /= 2", but shifting bits is faster.
-            for (int256 delta = int256(HALF_SCALE); delta > 0; delta >>= 1) {
-                y = (y * y) / SCALE;
-
-                // Is y^2 > 2 and so in the range [2,4)?
-                if (y >= 2 * SCALE) {
-                    // Add the 2^(-m) factor to the logarithm.
-                    result += delta;
-
-                    // Corresponds to z/2 on Wikipedia.
-                    y >>= 1;
-                }
-            }
-            result *= sign;
-        }
-    }
-
-    /// @notice Multiplies two signed 59.18-decimal fixed-point numbers together, returning a new signed 59.18-decimal
-    /// fixed-point number.
-    ///
-    /// @dev Variant of "mulDiv" that works with signed numbers and employs constant folding, i.e. the denominator is
-    /// alawys 1e18.
-    ///
-    /// Requirements:
-    /// - All from "PRBMathCommon.mulDivFixedPoint".
-    /// - The result must fit within MAX_SD59x18.
-    ///
-    /// Caveats:
-    /// - The body is purposely left uncommented; see the NatSpec comments in "PRBMathCommon.mulDiv" to understand how this works.
-    ///
-    /// @param x The multiplicand as a signed 59.18-decimal fixed-point number.
-    /// @param y The multiplier as a signed 59.18-decimal fixed-point number.
-    /// @return result The result as a signed 59.18-decimal fixed-point number.
-    function mul(int256 x, int256 y) internal pure returns (int256 result) {
-        require(x > MIN_SD59x18);
-        require(y > MIN_SD59x18);
-
-        unchecked {
-            uint256 ax;
-            uint256 ay;
-            ax = x < 0 ? uint256(-x) : uint256(x);
-            ay = y < 0 ? uint256(-y) : uint256(y);
-
-            uint256 resultUnsigned = PRBMathCommon.mulDivFixedPoint(ax, ay);
-            require(resultUnsigned <= uint256(MAX_SD59x18));
-
-            uint256 sx;
-            uint256 sy;
-            assembly {
-                sx := sgt(x, sub(0, 1))
-                sy := sgt(y, sub(0, 1))
-            }
-            result = sx ^ sy == 1 ? -int256(resultUnsigned) : int256(resultUnsigned);
-        }
-    }
-
-    /// @notice Retrieves PI as a signed 59.18-decimal fixed-point number.
-    function pi() internal pure returns (int256 result) {
-        result = 3141592653589793238;
-    }
-
-    /// @notice Raises x (signed 59.18-decimal fixed-point number) to the power of y (basic unsigned integer) using the
-    /// famous algorithm "exponentiation by squaring".
-    ///
-    /// @dev See https://en.wikipedia.org/wiki/Exponentiation_by_squaring
-    ///
-    /// Requirements:
-    /// - All from "abs" and "PRBMathCommon.mulDivFixedPoint".
-    /// - The result must fit within MAX_SD59x18.
-    ///
-    /// Caveats:
-    /// - All from "PRBMathCommon.mulDivFixedPoint".
-    /// - Assumes 0^0 is 1.
-    ///
-    /// @param x The base as a signed 59.18-decimal fixed-point number.
-    /// @param y The exponent as an uint256.
-    /// @return result The result as a signed 59.18-decimal fixed-point number.
-    function pow(int256 x, uint256 y) internal pure returns (int256 result) {
-        uint256 absX = uint256(abs(x));
-
-        // Calculate the first iteration of the loop in advance.
-        uint256 absResult = y & 1 > 0 ? absX : uint256(SCALE);
-
-        // Equivalent to "for(y /= 2; y > 0; y /= 2)" but faster.
-        for (y >>= 1; y > 0; y >>= 1) {
-            absX = PRBMathCommon.mulDivFixedPoint(absX, absX);
-
-            // Equivalent to "y % 2 == 1" but faster.
-            if (y & 1 > 0) {
-                absResult = PRBMathCommon.mulDivFixedPoint(absResult, absX);
-            }
-        }
-
-        // The result must fit within the 59.18-decimal fixed-point representation.
-        require(absResult <= uint256(MAX_SD59x18));
-
-        // Is the base negative and the exponent an odd number?
-        bool isNegative = x < 0 && y & 1 == 1;
-        result = isNegative ? -int256(absResult) : int256(absResult);
-    }
-
-    /// @notice Returns 1 as a signed 59.18-decimal fixed-point number.
-    function scale() internal pure returns (int256 result) {
-        result = SCALE;
-    }
-
-    /// @notice Calculates the square root of x, rounding down.
-    /// @dev Uses the Babylonian method https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method.
-    ///
-    /// Requirements:
-    /// - x cannot be negative.
-    /// - x must be less than MAX_SD59x18 / SCALE.
-    ///
-    /// Caveats:
-    /// - The maximum fixed-point number permitted is 57896044618658097711785492504343953926634.992332820282019729.
-    ///
-    /// @param x The signed 59.18-decimal fixed-point number for which to calculate the square root.
-    /// @return result The result as a signed 59.18-decimal fixed-point .
-    function sqrt(int256 x) internal pure returns (int256 result) {
-        require(x >= 0);
-        require(x < 57896044618658097711785492504343953926634992332820282019729);
-        unchecked {
-            // Multiply x by the SCALE to account for the factor of SCALE that is picked up when multiplying two signed
-            // 59.18-decimal fixed-point numbers together (in this case, those two numbers are both the square root).
-            result = int256(PRBMathCommon.sqrt(uint256(x * SCALE)));
-        }
-    }
-}
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
deleted file mode 100644
index 0313481f62bd..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
+++ /dev/null
@@ -1,437 +0,0 @@
-// SPDX-License-Identifier: WTFPL
-pragma solidity >=0.8.0;
-
-import "./PRBMathCommon.sol";
-
-/// @title PRBMathUD60x18
-/// @author Paul Razvan Berg
-/// @notice Smart contract library for advanced fixed-point math. It works with uint256 numbers considered to have 18
-/// trailing decimals. We call this number representation unsigned 60.18-decimal fixed-point, since there can be up to 60
-/// digits in the integer part and up to 18 decimals in the fractional part. The numbers are bound by the minimum and the
-/// maximum values permitted by the Solidity type uint256.
-library PRBMathUD60x18 {
-    /// @dev Half the SCALE number.
-    uint256 internal constant HALF_SCALE = 5e17;
-
-    /// @dev log2(e) as an unsigned 60.18-decimal fixed-point number.
-    uint256 internal constant LOG2_E = 1442695040888963407;
-
-    /// @dev The maximum value an unsigned 60.18-decimal fixed-point number can have.
-    uint256 internal constant MAX_UD60x18 = 115792089237316195423570985008687907853269984665640564039457584007913129639935;
-
-    /// @dev The maximum whole value an unsigned 60.18-decimal fixed-point number can have.
-    uint256 internal constant MAX_WHOLE_UD60x18 = 115792089237316195423570985008687907853269984665640564039457000000000000000000;
-
-    /// @dev How many trailing decimals can be represented.
-    uint256 internal constant SCALE = 1e18;
-
-    /// @notice Calculates arithmetic average of x and y, rounding down.
-    /// @param x The first operand as an unsigned 60.18-decimal fixed-point number.
-    /// @param y The second operand as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The arithmetic average as an unsigned 60.18-decimal fixed-point number.
-    function avg(uint256 x, uint256 y) internal pure returns (uint256 result) {
-        // The operations can never overflow.
-        unchecked {
-            // The last operand checks if both x and y are odd and if that is the case, we add 1 to the result. We need
-            // to do this because if both numbers are odd, the 0.5 remainder gets truncated twice.
-            result = (x >> 1) + (y >> 1) + (x & y & 1);
-        }
-    }
-
-    /// @notice Yields the least unsigned 60.18 decimal fixed-point number greater than or equal to x.
-    ///
-    /// @dev Optimised for fractional value inputs, because for every whole value there are (1e18 - 1) fractional counterparts.
-    /// See https://en.wikipedia.org/wiki/Floor_and_ceiling_functions.
-    ///
-    /// Requirements:
-    /// - x must be less than or equal to MAX_WHOLE_UD60x18.
-    ///
-    /// @param x The unsigned 60.18-decimal fixed-point number to ceil.
-    /// @param result The least integer greater than or equal to x, as an unsigned 60.18-decimal fixed-point number.
-    function ceil(uint256 x) internal pure returns (uint256 result) {
-        require(x <= MAX_WHOLE_UD60x18);
-        assembly {
-            // Equivalent to "x % SCALE" but faster.
-            let remainder := mod(x, SCALE)
-
-            // Equivalent to "SCALE - remainder" but faster.
-            let delta := sub(SCALE, remainder)
-
-            // Equivalent to "x + delta * (remainder > 0 ? 1 : 0)" but faster.
-            result := add(x, mul(delta, gt(remainder, 0)))
-        }
-    }
-
-    /// @notice Divides two unsigned 60.18-decimal fixed-point numbers, returning a new unsigned 60.18-decimal fixed-point number.
-    ///
-    /// @dev Uses mulDiv to enable overflow-safe multiplication and division.
-    ///
-    /// Requirements:
-    /// - y cannot be zero.
-    ///
-    /// @param x The numerator as an unsigned 60.18-decimal fixed-point number.
-    /// @param y The denominator as an unsigned 60.18-decimal fixed-point number.
-    /// @param result The quotient as an unsigned 60.18-decimal fixed-point number.
-    function div(uint256 x, uint256 y) internal pure returns (uint256 result) {
-        result = PRBMathCommon.mulDiv(x, SCALE, y);
-    }
-
-    /// @notice Returns Euler's number as an unsigned 60.18-decimal fixed-point number.
-    /// @dev See https://en.wikipedia.org/wiki/E_(mathematical_constant).
-    function e() internal pure returns (uint256 result) {
-        result = 2718281828459045235;
-    }
-
-    /// @notice Calculates the natural exponent of x.
-    ///
-    /// @dev Based on the insight that e^x = 2^(x * log2(e)).
-    ///
-    /// Requirements:
-    /// - All from "log2".
-    /// - x must be less than 88722839111672999628.
-    ///
-    /// @param x The exponent as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point number.
-    function exp(uint256 x) internal pure returns (uint256 result) {
-        // Without this check, the value passed to "exp2" would be greater than 128e18.
-        require(x < 88722839111672999628);
-
-        // Do the fixed-point multiplication inline to save gas.
-        unchecked {
-            uint256 doubleScaleProduct = x * LOG2_E;
-            result = exp2((doubleScaleProduct + HALF_SCALE) / SCALE);
-        }
-    }
-
-    /// @notice Calculates the binary exponent of x using the binary fraction method.
-    ///
-    /// @dev See https://ethereum.stackexchange.com/q/79903/24693.
-    ///
-    /// Requirements:
-    /// - x must be 128e18 or less.
-    /// - The result must fit within MAX_UD60x18.
-    ///
-    /// @param x The exponent as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point number.
-    function exp2(uint256 x) internal pure returns (uint256 result) {
-        // 2**128 doesn't fit within the 128.128-bit format used internally in this function.
-        require(x < 128e18);
-
-        unchecked {
-            // Convert x to the 128.128-bit fixed-point format.
-            uint256 x128x128 = (x << 128) / SCALE;
-
-            // Pass x to the PRBMathCommon.exp2 function, which uses the 128.128-bit fixed-point number representation.
-            result = PRBMathCommon.exp2(x128x128);
-        }
-    }
-
-    /// @notice Yields the greatest unsigned 60.18 decimal fixed-point number less than or equal to x.
-    /// @dev Optimised for fractional value inputs, because for every whole value there are (1e18 - 1) fractional counterparts.
-    /// See https://en.wikipedia.org/wiki/Floor_and_ceiling_functions.
-    /// @param x The unsigned 60.18-decimal fixed-point number to floor.
-    /// @param result The greatest integer less than or equal to x, as an unsigned 60.18-decimal fixed-point number.
-    function floor(uint256 x) internal pure returns (uint256 result) {
-        assembly {
-            // Equivalent to "x % SCALE" but faster.
-            let remainder := mod(x, SCALE)
-
-            // Equivalent to "x - remainder * (remainder > 0 ? 1 : 0)" but faster.
-            result := sub(x, mul(remainder, gt(remainder, 0)))
-        }
-    }
-
-    /// @notice Yields the excess beyond the floor of x.
-    /// @dev Based on the odd function definition https://en.wikipedia.org/wiki/Fractional_part.
-    /// @param x The unsigned 60.18-decimal fixed-point number to get the fractional part of.
-    /// @param result The fractional part of x as an unsigned 60.18-decimal fixed-point number.
-    function frac(uint256 x) internal pure returns (uint256 result) {
-        assembly {
-            result := mod(x, SCALE)
-        }
-    }
-
-    /// @notice Calculates geometric mean of x and y, i.e. sqrt(x * y), rounding down.
-    ///
-    /// @dev Requirements:
-    /// - x * y must fit within MAX_UD60x18, lest it overflows.
-    ///
-    /// @param x The first operand as an unsigned 60.18-decimal fixed-point number.
-    /// @param y The second operand as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point number.
-    function gm(uint256 x, uint256 y) internal pure returns (uint256 result) {
-        if (x == 0) {
-            return 0;
-        }
-
-        unchecked {
-            // Checking for overflow this way is faster than letting Solidity do it.
-            uint256 xy = x * y;
-            require(xy / x == y);
-
-            // We don't need to multiply by the SCALE here because the x*y product had already picked up a factor of SCALE
-            // during multiplication. See the comments within the "sqrt" function.
-            result = PRBMathCommon.sqrt(xy);
-        }
-    }
-
-    /// @notice Calculates 1 / x, rounding towards zero.
-    ///
-    /// @dev Requirements:
-    /// - x cannot be zero.
-    ///
-    /// @param x The unsigned 60.18-decimal fixed-point number for which to calculate the inverse.
-    /// @return result The inverse as an unsigned 60.18-decimal fixed-point number.
-    function inv(uint256 x) internal pure returns (uint256 result) {
-        unchecked {
-            // 1e36 is SCALE * SCALE.
-            result = 1e36 / x;
-        }
-    }
-
-    /// @notice Calculates the natural logarithm of x.
-    ///
-    /// @dev Based on the insight that ln(x) = log2(x) / log2(e).
-    ///
-    /// Requirements:
-    /// - All from "log2".
-    ///
-    /// Caveats:
-    /// - All from "log2".
-    /// - This doesn't return exactly 1 for 2718281828459045235, for that we would need more fine-grained precision.
-    ///
-    /// @param x The unsigned 60.18-decimal fixed-point number for which to calculate the natural logarithm.
-    /// @return result The natural logarithm as an unsigned 60.18-decimal fixed-point number.
-    function ln(uint256 x) internal pure returns (uint256 result) {
-        // Do the fixed-point multiplication inline to save gas. This is overflow-safe because the maximum value that log2(x)
-        // can return is 196205294292027477728.
-        unchecked { result = (log2(x) * SCALE) / LOG2_E; }
-    }
-
-    /// @notice Calculates the common logarithm of x.
-    ///
-    /// @dev First checks if x is an exact power of ten and it stops if yes. If it's not, calculates the common
-    /// logarithm based on the insight that log10(x) = log2(x) / log2(10).
-    ///
-    /// Requirements:
-    /// - All from "log2".
-    ///
-    /// Caveats:
-    /// - All from "log2".
-    ///
-    /// @param x The unsigned 60.18-decimal fixed-point number for which to calculate the common logarithm.
-    /// @return result The common logarithm as an unsigned 60.18-decimal fixed-point number.
-    function log10(uint256 x) internal pure returns (uint256 result) {
-        require(x >= SCALE);
-
-        // Note that the "mul" in this block is the assembly mul operation, not the "mul" function defined in this contract.
-        // prettier-ignore
-        assembly {
-            switch x
-            case 1 { result := mul(SCALE, sub(0, 18)) }
-            case 10 { result := mul(SCALE, sub(1, 18)) }
-            case 100 { result := mul(SCALE, sub(2, 18)) }
-            case 1000 { result := mul(SCALE, sub(3, 18)) }
-            case 10000 { result := mul(SCALE, sub(4, 18)) }
-            case 100000 { result := mul(SCALE, sub(5, 18)) }
-            case 1000000 { result := mul(SCALE, sub(6, 18)) }
-            case 10000000 { result := mul(SCALE, sub(7, 18)) }
-            case 100000000 { result := mul(SCALE, sub(8, 18)) }
-            case 1000000000 { result := mul(SCALE, sub(9, 18)) }
-            case 10000000000 { result := mul(SCALE, sub(10, 18)) }
-            case 100000000000 { result := mul(SCALE, sub(11, 18)) }
-            case 1000000000000 { result := mul(SCALE, sub(12, 18)) }
-            case 10000000000000 { result := mul(SCALE, sub(13, 18)) }
-            case 100000000000000 { result := mul(SCALE, sub(14, 18)) }
-            case 1000000000000000 { result := mul(SCALE, sub(15, 18)) }
-            case 10000000000000000 { result := mul(SCALE, sub(16, 18)) }
-            case 100000000000000000 { result := mul(SCALE, sub(17, 18)) }
-            case 1000000000000000000 { result := 0 }
-            case 10000000000000000000 { result := SCALE }
-            case 100000000000000000000 { result := mul(SCALE, 2) }
-            case 1000000000000000000000 { result := mul(SCALE, 3) }
-            case 10000000000000000000000 { result := mul(SCALE, 4) }
-            case 100000000000000000000000 { result := mul(SCALE, 5) }
-            case 1000000000000000000000000 { result := mul(SCALE, 6) }
-            case 10000000000000000000000000 { result := mul(SCALE, 7) }
-            case 100000000000000000000000000 { result := mul(SCALE, 8) }
-            case 1000000000000000000000000000 { result := mul(SCALE, 9) }
-            case 10000000000000000000000000000 { result := mul(SCALE, 10) }
-            case 100000000000000000000000000000 { result := mul(SCALE, 11) }
-            case 1000000000000000000000000000000 { result := mul(SCALE, 12) }
-            case 10000000000000000000000000000000 { result := mul(SCALE, 13) }
-            case 100000000000000000000000000000000 { result := mul(SCALE, 14) }
-            case 1000000000000000000000000000000000 { result := mul(SCALE, 15) }
-            case 10000000000000000000000000000000000 { result := mul(SCALE, 16) }
-            case 100000000000000000000000000000000000 { result := mul(SCALE, 17) }
-            case 1000000000000000000000000000000000000 { result := mul(SCALE, 18) }
-            case 10000000000000000000000000000000000000 { result := mul(SCALE, 19) }
-            case 100000000000000000000000000000000000000 { result := mul(SCALE, 20) }
-            case 1000000000000000000000000000000000000000 { result := mul(SCALE, 21) }
-            case 10000000000000000000000000000000000000000 { result := mul(SCALE, 22) }
-            case 100000000000000000000000000000000000000000 { result := mul(SCALE, 23) }
-            case 1000000000000000000000000000000000000000000 { result := mul(SCALE, 24) }
-            case 10000000000000000000000000000000000000000000 { result := mul(SCALE, 25) }
-            case 100000000000000000000000000000000000000000000 { result := mul(SCALE, 26) }
-            case 1000000000000000000000000000000000000000000000 { result := mul(SCALE, 27) }
-            case 10000000000000000000000000000000000000000000000 { result := mul(SCALE, 28) }
-            case 100000000000000000000000000000000000000000000000 { result := mul(SCALE, 29) }
-            case 1000000000000000000000000000000000000000000000000 { result := mul(SCALE, 30) }
-            case 10000000000000000000000000000000000000000000000000 { result := mul(SCALE, 31) }
-            case 100000000000000000000000000000000000000000000000000 { result := mul(SCALE, 32) }
-            case 1000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 33) }
-            case 10000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 34) }
-            case 100000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 35) }
-            case 1000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 36) }
-            case 10000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 37) }
-            case 100000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 38) }
-            case 1000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 39) }
-            case 10000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 40) }
-            case 100000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 41) }
-            case 1000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 42) }
-            case 10000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 43) }
-            case 100000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 44) }
-            case 1000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 45) }
-            case 10000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 46) }
-            case 100000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 47) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 48) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 49) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 50) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 51) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 52) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 53) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 54) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 55) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 56) }
-            case 1000000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 57) }
-            case 10000000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 58) }
-            case 100000000000000000000000000000000000000000000000000000000000000000000000000000 { result := mul(SCALE, 59) }
-            default {
-                result := MAX_UD60x18
-            }
-        }
-
-        if (result == MAX_UD60x18) {
-            // Do the fixed-point division inline to save gas. The denominator is log2(10).
-            unchecked { result = (log2(x) * SCALE) / 332192809488736234; }
-        }
-    }
-
-    /// @notice Calculates the binary logarithm of x.
-    ///
-    /// @dev Based on the iterative approximation algorithm.
-    /// https://en.wikipedia.org/wiki/Binary_logarithm#Iterative_approximation
-    ///
-    /// Requirements:
-    /// - x must be greater than or equal to SCALE, otherwise the result would be negative.
-    ///
-    /// Caveats:
-    /// - The results are nor perfectly accurate to the last digit, due to the lossy precision of the iterative approximation.
-    ///
-    /// @param x The unsigned 60.18-decimal fixed-point number for which to calculate the binary logarithm.
-    /// @return result The binary logarithm as an unsigned 60.18-decimal fixed-point number.
-    function log2(uint256 x) internal pure returns (uint256 result) {
-        require(x >= SCALE);
-        unchecked {
-            // Calculate the integer part of the logarithm and add it to the result and finally calculate y = x * 2^(-n).
-            uint256 n = PRBMathCommon.mostSignificantBit(x / SCALE);
-
-            // The integer part of the logarithm as an unsigned 60.18-decimal fixed-point number. The operation can't overflow
-            // because n is maximum 255 and SCALE is 1e18.
-            result = n * SCALE;
-
-            // This is y = x * 2^(-n).
-            uint256 y = x >> n;
-
-            // If y = 1, the fractional part is zero.
-            if (y == SCALE) {
-                return result;
-            }
-
-            // Calculate the fractional part via the iterative approximation.
-            // The "delta >>= 1" part is equivalent to "delta /= 2", but shifting bits is faster.
-            for (uint256 delta = HALF_SCALE; delta > 0; delta >>= 1) {
-                y = (y * y) / SCALE;
-
-                // Is y^2 > 2 and so in the range [2,4)?
-                if (y >= 2 * SCALE) {
-                    // Add the 2^(-m) factor to the logarithm.
-                    result += delta;
-
-                    // Corresponds to z/2 on Wikipedia.
-                    y >>= 1;
-                }
-            }
-        }
-    }
-
-    /// @notice Multiplies two unsigned 60.18-decimal fixed-point numbers together, returning a new unsigned 60.18-decimal
-    /// fixed-point number.
-    /// @dev See the documentation for the "PRBMathCommon.mulDivFixedPoint" function.
-    /// @param x The multiplicand as an unsigned 60.18-decimal fixed-point number.
-    /// @param y The multiplier as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point number.
-    function mul(uint256 x, uint256 y) internal pure returns (uint256 result) {
-        result = PRBMathCommon.mulDivFixedPoint(x, y);
-    }
-
-    /// @notice Retrieves PI as an unsigned 60.18-decimal fixed-point number.
-    function pi() internal pure returns (uint256 result) {
-        result = 3141592653589793238;
-    }
-
-    /// @notice Raises x (unsigned 60.18-decimal fixed-point number) to the power of y (basic unsigned integer) using the
-    /// famous algorithm "exponentiation by squaring".
-    ///
-    /// @dev See https://en.wikipedia.org/wiki/Exponentiation_by_squaring
-    ///
-    /// Requirements:
-    /// - The result must fit within MAX_UD60x18.
-    ///
-    /// Caveats:
-    /// - All from "mul".
-    /// - Assumes 0^0 is 1.
-    ///
-    /// @param x The base as an unsigned 60.18-decimal fixed-point number.
-    /// @param y The exponent as an uint256.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point number.
-    function pow(uint256 x, uint256 y) internal pure returns (uint256 result) {
-        // Calculate the first iteration of the loop in advance.
-        result = y & 1 > 0 ? x : SCALE;
-
-        // Equivalent to "for(y /= 2; y > 0; y /= 2)" but faster.
-        for (y >>= 1; y > 0; y >>= 1) {
-            x = PRBMathCommon.mulDivFixedPoint(x, x);
-
-            // Equivalent to "y % 2 == 1" but faster.
-            if (y & 1 > 0) {
-                result = PRBMathCommon.mulDivFixedPoint(result, x);
-            }
-        }
-    }
-
-    /// @notice Returns 1 as an unsigned 60.18-decimal fixed-point number.
-    function scale() internal pure returns (uint256 result) {
-        result = SCALE;
-    }
-
-    /// @notice Calculates the square root of x, rounding down.
-    /// @dev Uses the Babylonian method https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method.
-    ///
-    /// Requirements:
-    /// - x must be less than MAX_UD60x18 / SCALE.
-    ///
-    /// Caveats:
-    /// - The maximum fixed-point number permitted is 115792089237316195423570985008687907853269.984665640564039458.
-    ///
-    /// @param x The unsigned 60.18-decimal fixed-point number for which to calculate the square root.
-    /// @return result The result as an unsigned 60.18-decimal fixed-point .
-    function sqrt(uint256 x) internal pure returns (uint256 result) {
-        require(x < 115792089237316195423570985008687907853269984665640564039458);
-        unchecked {
-            // Multiply x by the SCALE to account for the factor of SCALE that is picked up when multiplying two unsigned
-            // 60.18-decimal fixed-point numbers together (in this case, those two numbers are both the square root).
-            result = PRBMathCommon.sqrt(x * SCALE);
-        }
-    }
-}
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/README.md b/test/libsolidity/semanticTests/externalContracts/_prbmath/README.md
deleted file mode 100644
index 1c0fbaa22cf0..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Imported from https://github.com/hifi-finance/prb-math/commit/62021c1abc3413f20d0bdc8f941cf9f21d5a7d2d
diff --git a/test/libsolidity/semanticTests/externalContracts/_stringutils/LICENSE b/test/libsolidity/semanticTests/externalContracts/_stringutils/LICENSE
deleted file mode 100644
index 769c240957b0..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_stringutils/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Nick Johnson
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/test/libsolidity/semanticTests/externalContracts/_stringutils/README.md b/test/libsolidity/semanticTests/externalContracts/_stringutils/README.md
deleted file mode 100644
index 48f71f3192df..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_stringutils/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-String utilities, originally from
-
-https://github.com/Arachnid/solidity-stringutils
-
diff --git a/test/libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol b/test/libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
deleted file mode 100644
index 4dff7f9162cc..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * @title String & slice utility library for Solidity contracts.
- * @author Nick Johnson <arachnid@notdot.net>
- *
- * @dev Functionality in this library is largely implemented using an
- *      abstraction called a 'slice'. A slice represents a part of a string -
- *      anything from the entire string to a single character, or even no
- *      characters at all (a 0-length slice). Since a slice only has to specify
- *      an offset and a length, copying and manipulating slices is a lot less
- *      expensive than copying and manipulating the strings they reference.
- *
- *      To further reduce gas costs, most functions on slice that need to return
- *      a slice modify the original one instead of allocating a new one; for
- *      instance, `s.split(".")` will return the text up to the first '.',
- *      modifying s to only contain the remainder of the string after the '.'.
- *      In situations where you do not want to modify the original slice, you
- *      can make a copy first with `.copy()`, for example:
- *      `s.copy().split(".")`. Try and avoid using this idiom in loops; since
- *      Solidity has no memory management, it will result in allocating many
- *      short-lived slices that are later discarded.
- *
- *      Functions that return two slices come in two versions: a non-allocating
- *      version that takes the second slice as an argument, modifying it in
- *      place, and an allocating version that allocates and returns the second
- *      slice; see `nextRune` for example.
- *
- *      Functions that have to copy string data will return strings rather than
- *      slices; these can be cast back to slices for further processing if
- *      required.
- *
- *      For convenience, some functions are provided with non-modifying
- *      variants that create a new slice and return both; for instance,
- *      `s.splitNew('.')` leaves s unmodified, and returns two values
- *      corresponding to the left and right parts of the string.
- */
-
-pragma solidity >=0.0;
-
-library strings {
-    struct slice {
-        uint _len;
-        uint _ptr;
-    }
-
-    function memcpy(uint dest, uint src, uint len) private pure {
-        // Copy word-length chunks while possible
-        for(; len >= 32; len -= 32) {
-            assembly {
-                mstore(dest, mload(src))
-            }
-            dest += 32;
-            src += 32;
-        }
-
-        // The following masking would overflow in the case of len=0
-        // and the code path in that case is useless, albeit correct.
-        // This shortcut avoids it and saves gas.
-        if (len == 0)
-            return;
-
-        // Copy remaining bytes
-        uint mask;
-        unchecked { mask = 256 ** (32 - len) - 1; }
-        assembly {
-            let srcpart := and(mload(src), not(mask))
-            let destpart := and(mload(dest), mask)
-            mstore(dest, or(destpart, srcpart))
-        }
-    }
-
-    /*
-     * @dev Returns a slice containing the entire string.
-     * @param self The string to make a slice from.
-     * @return A newly allocated slice containing the entire string.
-     */
-    function toSlice(string memory self) internal pure returns (slice memory) {
-        uint ptr;
-        assembly {
-            ptr := add(self, 0x20)
-        }
-        return slice(bytes(self).length, ptr);
-    }
-
-    /*
-     * @dev Returns the length of a null-terminated bytes32 string.
-     * @param self The value to find the length of.
-     * @return The length of the string, from 0 to 32.
-     */
-    function len(bytes32 self) internal pure returns (uint) {
-        uint ret;
-        if (self == 0)
-            return 0;
-        if (uint256(self) & 0xffffffffffffffffffffffffffffffff == 0) {
-            ret += 16;
-            self = bytes32(uint(self) / 0x100000000000000000000000000000000);
-        }
-        if (uint256(self) & 0xffffffffffffffff == 0) {
-            ret += 8;
-            self = bytes32(uint(self) / 0x10000000000000000);
-        }
-        if (uint256(self) & 0xffffffff == 0) {
-            ret += 4;
-            self = bytes32(uint(self) / 0x100000000);
-        }
-        if (uint256(self) & 0xffff == 0) {
-            ret += 2;
-            self = bytes32(uint(self) / 0x10000);
-        }
-        if (uint256(self) & 0xff == 0) {
-            ret += 1;
-        }
-        return 32 - ret;
-    }
-
-    /*
-     * @dev Returns a slice containing the entire bytes32, interpreted as a
-     *      null-terminated utf-8 string.
-     * @param self The bytes32 value to convert to a slice.
-     * @return A new slice containing the value of the input argument up to the
-     *         first null.
-     */
-    function toSliceB32(bytes32 self) internal pure returns (slice memory ret) {
-        // Allocate space for `self` in memory, copy it there, and point ret at it
-        assembly {
-            let ptr := mload(0x40)
-            mstore(0x40, add(ptr, 0x20))
-            mstore(ptr, self)
-            mstore(add(ret, 0x20), ptr)
-        }
-        ret._len = len(self);
-    }
-
-    /*
-     * @dev Returns a new slice containing the same data as the current slice.
-     * @param self The slice to copy.
-     * @return A new slice containing the same data as `self`.
-     */
-    function copy(slice memory self) internal pure returns (slice memory) {
-        return slice(self._len, self._ptr);
-    }
-
-    /*
-     * @dev Copies a slice to a new string.
-     * @param self The slice to copy.
-     * @return A newly allocated string containing the slice's text.
-     */
-    function toString(slice memory self) internal pure returns (string memory) {
-        string memory ret = new string(self._len);
-        uint retptr;
-        assembly { retptr := add(ret, 32) }
-
-        memcpy(retptr, self._ptr, self._len);
-        return ret;
-    }
-
-    /*
-     * @dev Returns the length in runes of the slice. Note that this operation
-     *      takes time proportional to the length of the slice; avoid using it
-     *      in loops, and call `slice.empty()` if you only need to know whether
-     *      the slice is empty or not.
-     * @param self The slice to operate on.
-     * @return The length of the slice in runes.
-     */
-    function len(slice memory self) internal pure returns (uint l) {
-        // Starting at ptr-31 means the LSB will be the byte we care about
-        uint ptr = self._ptr - 31;
-        uint end = ptr + self._len;
-        for (l = 0; ptr < end; l++) {
-            uint8 b;
-            assembly { b := and(mload(ptr), 0xFF) }
-            if (b < 0x80) {
-                ptr += 1;
-            } else if(b < 0xE0) {
-                ptr += 2;
-            } else if(b < 0xF0) {
-                ptr += 3;
-            } else if(b < 0xF8) {
-                ptr += 4;
-            } else if(b < 0xFC) {
-                ptr += 5;
-            } else {
-                ptr += 6;
-            }
-        }
-    }
-
-    /*
-     * @dev Returns true if the slice is empty (has a length of 0).
-     * @param self The slice to operate on.
-     * @return True if the slice is empty, False otherwise.
-     */
-    function empty(slice memory self) internal pure returns (bool) {
-        return self._len == 0;
-    }
-
-    /*
-     * @dev Returns a positive number if `other` comes lexicographically after
-     *      `self`, a negative number if it comes before, or zero if the
-     *      contents of the two slices are equal. Comparison is done per-rune,
-     *      on unicode codepoints.
-     * @param self The first slice to compare.
-     * @param other The second slice to compare.
-     * @return The result of the comparison.
-     */
-    function compare(slice memory self, slice memory other) internal pure returns (int) {
-        uint shortest = self._len;
-        if (other._len < self._len)
-            shortest = other._len;
-
-        uint selfptr = self._ptr;
-        uint otherptr = other._ptr;
-        for (uint idx = 0; idx < shortest; idx += 32) {
-            uint a;
-            uint b;
-            assembly {
-                a := mload(selfptr)
-                b := mload(otherptr)
-            }
-            if (a != b) {
-                // Mask out irrelevant bytes and check again
-                uint256 mask = type(uint256).max; // 0xffff...
-                if(shortest < 32) {
-                  mask = ~(2 ** (8 * (32 - shortest + idx)) - 1);
-                }
-                uint256 diff;
-                // This depends on potential underflow.
-                unchecked { diff = (a & mask) - (b & mask); }
-                if (diff != 0)
-                    return int(diff);
-            }
-            selfptr += 32;
-            otherptr += 32;
-        }
-        return int(self._len) - int(other._len);
-    }
-
-    /*
-     * @dev Returns true if the two slices contain the same text.
-     * @param self The first slice to compare.
-     * @param self The second slice to compare.
-     * @return True if the slices are equal, false otherwise.
-     */
-    function equals(slice memory self, slice memory other) internal pure returns (bool) {
-        return compare(self, other) == 0;
-    }
-
-    /*
-     * @dev Extracts the first rune in the slice into `rune`, advancing the
-     *      slice to point to the next rune and returning `self`.
-     * @param self The slice to operate on.
-     * @param rune The slice that will contain the first rune.
-     * @return `rune`.
-     */
-    function nextRune(slice memory self, slice memory rune) internal pure returns (slice memory) {
-        rune._ptr = self._ptr;
-
-        if (self._len == 0) {
-            rune._len = 0;
-            return rune;
-        }
-
-        uint l;
-        uint b;
-        // Load the first byte of the rune into the LSBs of b
-        assembly { b := and(mload(sub(mload(add(self, 32)), 31)), 0xFF) }
-        if (b < 0x80) {
-            l = 1;
-        } else if(b < 0xE0) {
-            l = 2;
-        } else if(b < 0xF0) {
-            l = 3;
-        } else {
-            l = 4;
-        }
-
-        // Check for truncated codepoints
-        if (l > self._len) {
-            rune._len = self._len;
-            self._ptr += self._len;
-            self._len = 0;
-            return rune;
-        }
-
-        self._ptr += l;
-        self._len -= l;
-        rune._len = l;
-        return rune;
-    }
-
-    /*
-     * @dev Returns the first rune in the slice, advancing the slice to point
-     *      to the next rune.
-     * @param self The slice to operate on.
-     * @return A slice containing only the first rune from `self`.
-     */
-    function nextRune(slice memory self) internal pure returns (slice memory ret) {
-        nextRune(self, ret);
-    }
-
-    /*
-     * @dev Returns the number of the first codepoint in the slice.
-     * @param self The slice to operate on.
-     * @return The number of the first codepoint in the slice.
-     */
-    function ord(slice memory self) internal pure returns (uint ret) {
-        if (self._len == 0) {
-            return 0;
-        }
-
-        uint word;
-        uint length;
-        uint divisor = 2 ** 248;
-
-        // Load the rune into the MSBs of b
-        assembly { word:= mload(mload(add(self, 32))) }
-        uint b = word / divisor;
-        if (b < 0x80) {
-            ret = b;
-            length = 1;
-        } else if(b < 0xE0) {
-            ret = b & 0x1F;
-            length = 2;
-        } else if(b < 0xF0) {
-            ret = b & 0x0F;
-            length = 3;
-        } else {
-            ret = b & 0x07;
-            length = 4;
-        }
-
-        // Check for truncated codepoints
-        if (length > self._len) {
-            return 0;
-        }
-
-        for (uint i = 1; i < length; i++) {
-            divisor = divisor / 256;
-            b = (word / divisor) & 0xFF;
-            if (b & 0xC0 != 0x80) {
-                // Invalid UTF-8 sequence
-                return 0;
-            }
-            ret = (ret * 64) | (b & 0x3F);
-        }
-
-        return ret;
-    }
-
-    /*
-     * @dev Returns the keccak-256 hash of the slice.
-     * @param self The slice to hash.
-     * @return The hash of the slice.
-     */
-    function keccak(slice memory self) internal pure returns (bytes32 ret) {
-        assembly {
-            ret := keccak256(mload(add(self, 32)), mload(self))
-        }
-    }
-
-    /*
-     * @dev Returns true if `self` starts with `needle`.
-     * @param self The slice to operate on.
-     * @param needle The slice to search for.
-     * @return True if the slice starts with the provided text, false otherwise.
-     */
-    function startsWith(slice memory self, slice memory needle) internal pure returns (bool) {
-        if (self._len < needle._len) {
-            return false;
-        }
-
-        if (self._ptr == needle._ptr) {
-            return true;
-        }
-
-        bool equal;
-        assembly {
-            let length := mload(needle)
-            let selfptr := mload(add(self, 0x20))
-            let needleptr := mload(add(needle, 0x20))
-            equal := eq(keccak256(selfptr, length), keccak256(needleptr, length))
-        }
-        return equal;
-    }
-
-    /*
-     * @dev If `self` starts with `needle`, `needle` is removed from the
-     *      beginning of `self`. Otherwise, `self` is unmodified.
-     * @param self The slice to operate on.
-     * @param needle The slice to search for.
-     * @return `self`
-     */
-    function beyond(slice memory self, slice memory needle) internal pure returns (slice memory) {
-        if (self._len < needle._len) {
-            return self;
-        }
-
-        bool equal = true;
-        if (self._ptr != needle._ptr) {
-            assembly {
-                let length := mload(needle)
-                let selfptr := mload(add(self, 0x20))
-                let needleptr := mload(add(needle, 0x20))
-                equal := eq(keccak256(selfptr, length), keccak256(needleptr, length))
-            }
-        }
-
-        if (equal) {
-            self._len -= needle._len;
-            self._ptr += needle._len;
-        }
-
-        return self;
-    }
-
-    /*
-     * @dev Returns true if the slice ends with `needle`.
-     * @param self The slice to operate on.
-     * @param needle The slice to search for.
-     * @return True if the slice starts with the provided text, false otherwise.
-     */
-    function endsWith(slice memory self, slice memory needle) internal pure returns (bool) {
-        if (self._len < needle._len) {
-            return false;
-        }
-
-        uint selfptr = self._ptr + self._len - needle._len;
-
-        if (selfptr == needle._ptr) {
-            return true;
-        }
-
-        bool equal;
-        assembly {
-            let length := mload(needle)
-            let needleptr := mload(add(needle, 0x20))
-            equal := eq(keccak256(selfptr, length), keccak256(needleptr, length))
-        }
-
-        return equal;
-    }
-
-    /*
-     * @dev If `self` ends with `needle`, `needle` is removed from the
-     *      end of `self`. Otherwise, `self` is unmodified.
-     * @param self The slice to operate on.
-     * @param needle The slice to search for.
-     * @return `self`
-     */
-    function until(slice memory self, slice memory needle) internal pure returns (slice memory) {
-        if (self._len < needle._len) {
-            return self;
-        }
-
-        uint selfptr = self._ptr + self._len - needle._len;
-        bool equal = true;
-        if (selfptr != needle._ptr) {
-            assembly {
-                let length := mload(needle)
-                let needleptr := mload(add(needle, 0x20))
-                equal := eq(keccak256(selfptr, length), keccak256(needleptr, length))
-            }
-        }
-
-        if (equal) {
-            self._len -= needle._len;
-        }
-
-        return self;
-    }
-
-    // Returns the memory address of the first byte of the first occurrence of
-    // `needle` in `self`, or the first byte after `self` if not found.
-    function findPtr(uint selflen, uint selfptr, uint needlelen, uint needleptr) private pure returns (uint) {
-        uint ptr = selfptr;
-        uint idx;
-
-        if (needlelen <= selflen) {
-            if (needlelen <= 32) {
-                bytes32 mask = bytes32(~(2 ** (8 * (32 - needlelen)) - 1));
-
-                bytes32 needledata;
-                assembly { needledata := and(mload(needleptr), mask) }
-
-                uint end = selfptr + selflen - needlelen;
-                bytes32 ptrdata;
-                assembly { ptrdata := and(mload(ptr), mask) }
-
-                while (ptrdata != needledata) {
-                    if (ptr >= end)
-                        return selfptr + selflen;
-                    ptr++;
-                    assembly { ptrdata := and(mload(ptr), mask) }
-                }
-                return ptr;
-            } else {
-                // For long needles, use hashing
-                bytes32 hash;
-                assembly { hash := keccak256(needleptr, needlelen) }
-
-                for (idx = 0; idx <= selflen - needlelen; idx++) {
-                    bytes32 testHash;
-                    assembly { testHash := keccak256(ptr, needlelen) }
-                    if (hash == testHash)
-                        return ptr;
-                    ptr += 1;
-                }
-            }
-        }
-        return selfptr + selflen;
-    }
-
-    // Returns the memory address of the first byte after the last occurrence of
-    // `needle` in `self`, or the address of `self` if not found.
-    function rfindPtr(uint selflen, uint selfptr, uint needlelen, uint needleptr) private pure returns (uint) {
-        uint ptr;
-
-        if (needlelen <= selflen) {
-            if (needlelen <= 32) {
-                bytes32 mask = bytes32(~(2 ** (8 * (32 - needlelen)) - 1));
-
-                bytes32 needledata;
-                assembly { needledata := and(mload(needleptr), mask) }
-
-                ptr = selfptr + selflen - needlelen;
-                bytes32 ptrdata;
-                assembly { ptrdata := and(mload(ptr), mask) }
-
-                while (ptrdata != needledata) {
-                    if (ptr <= selfptr)
-                        return selfptr;
-                    ptr--;
-                    assembly { ptrdata := and(mload(ptr), mask) }
-                }
-                return ptr + needlelen;
-            } else {
-                // For long needles, use hashing
-                bytes32 hash;
-                assembly { hash := keccak256(needleptr, needlelen) }
-                ptr = selfptr + (selflen - needlelen);
-                while (ptr >= selfptr) {
-                    bytes32 testHash;
-                    assembly { testHash := keccak256(ptr, needlelen) }
-                    if (hash == testHash)
-                        return ptr + needlelen;
-                    ptr -= 1;
-                }
-            }
-        }
-        return selfptr;
-    }
-
-    /*
-     * @dev Modifies `self` to contain everything from the first occurrence of
-     *      `needle` to the end of the slice. `self` is set to the empty slice
-     *      if `needle` is not found.
-     * @param self The slice to search and modify.
-     * @param needle The text to search for.
-     * @return `self`.
-     */
-    function find(slice memory self, slice memory needle) internal pure returns (slice memory) {
-        uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr);
-        self._len -= ptr - self._ptr;
-        self._ptr = ptr;
-        return self;
-    }
-
-    /*
-     * @dev Modifies `self` to contain the part of the string from the start of
-     *      `self` to the end of the first occurrence of `needle`. If `needle`
-     *      is not found, `self` is set to the empty slice.
-     * @param self The slice to search and modify.
-     * @param needle The text to search for.
-     * @return `self`.
-     */
-    function rfind(slice memory self, slice memory needle) internal pure returns (slice memory) {
-        uint ptr = rfindPtr(self._len, self._ptr, needle._len, needle._ptr);
-        self._len = ptr - self._ptr;
-        return self;
-    }
-
-    /*
-     * @dev Splits the slice, setting `self` to everything after the first
-     *      occurrence of `needle`, and `token` to everything before it. If
-     *      `needle` does not occur in `self`, `self` is set to the empty slice,
-     *      and `token` is set to the entirety of `self`.
-     * @param self The slice to split.
-     * @param needle The text to search for in `self`.
-     * @param token An output parameter to which the first token is written.
-     * @return `token`.
-     */
-    function split(slice memory self, slice memory needle, slice memory token) internal pure returns (slice memory) {
-        uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr);
-        token._ptr = self._ptr;
-        token._len = ptr - self._ptr;
-        if (ptr == self._ptr + self._len) {
-            // Not found
-            self._len = 0;
-        } else {
-            self._len -= token._len + needle._len;
-            self._ptr = ptr + needle._len;
-        }
-        return token;
-    }
-
-    /*
-     * @dev Splits the slice, setting `self` to everything after the first
-     *      occurrence of `needle`, and returning everything before it. If
-     *      `needle` does not occur in `self`, `self` is set to the empty slice,
-     *      and the entirety of `self` is returned.
-     * @param self The slice to split.
-     * @param needle The text to search for in `self`.
-     * @return The part of `self` up to the first occurrence of `delim`.
-     */
-    function split(slice memory self, slice memory needle) internal pure returns (slice memory token) {
-        split(self, needle, token);
-    }
-
-    /*
-     * @dev Splits the slice, setting `self` to everything before the last
-     *      occurrence of `needle`, and `token` to everything after it. If
-     *      `needle` does not occur in `self`, `self` is set to the empty slice,
-     *      and `token` is set to the entirety of `self`.
-     * @param self The slice to split.
-     * @param needle The text to search for in `self`.
-     * @param token An output parameter to which the first token is written.
-     * @return `token`.
-     */
-    function rsplit(slice memory self, slice memory needle, slice memory token) internal pure returns (slice memory) {
-        uint ptr = rfindPtr(self._len, self._ptr, needle._len, needle._ptr);
-        token._ptr = ptr;
-        token._len = self._len - (ptr - self._ptr);
-        if (ptr == self._ptr) {
-            // Not found
-            self._len = 0;
-        } else {
-            self._len -= token._len + needle._len;
-        }
-        return token;
-    }
-
-    /*
-     * @dev Splits the slice, setting `self` to everything before the last
-     *      occurrence of `needle`, and returning everything after it. If
-     *      `needle` does not occur in `self`, `self` is set to the empty slice,
-     *      and the entirety of `self` is returned.
-     * @param self The slice to split.
-     * @param needle The text to search for in `self`.
-     * @return The part of `self` after the last occurrence of `delim`.
-     */
-    function rsplit(slice memory self, slice memory needle) internal pure returns (slice memory token) {
-        rsplit(self, needle, token);
-    }
-
-    /*
-     * @dev Counts the number of nonoverlapping occurrences of `needle` in `self`.
-     * @param self The slice to search.
-     * @param needle The text to search for in `self`.
-     * @return The number of occurrences of `needle` found in `self`.
-     */
-    function count(slice memory self, slice memory needle) internal pure returns (uint cnt) {
-        uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr) + needle._len;
-        while (ptr <= self._ptr + self._len) {
-            cnt++;
-            ptr = findPtr(self._len - (ptr - self._ptr), ptr, needle._len, needle._ptr) + needle._len;
-        }
-    }
-
-    /*
-     * @dev Returns True if `self` contains `needle`.
-     * @param self The slice to search.
-     * @param needle The text to search for in `self`.
-     * @return True if `needle` is found in `self`, false otherwise.
-     */
-    function contains(slice memory self, slice memory needle) internal pure returns (bool) {
-        return rfindPtr(self._len, self._ptr, needle._len, needle._ptr) != self._ptr;
-    }
-
-    /*
-     * @dev Returns a newly allocated string containing the concatenation of
-     *      `self` and `other`.
-     * @param self The first slice to concatenate.
-     * @param other The second slice to concatenate.
-     * @return The concatenation of the two strings.
-     */
-    function concat(slice memory self, slice memory other) internal pure returns (string memory) {
-        string memory ret = new string(self._len + other._len);
-        uint retptr;
-        assembly { retptr := add(ret, 32) }
-        memcpy(retptr, self._ptr, self._len);
-        memcpy(retptr + self._len, other._ptr, other._len);
-        return ret;
-    }
-
-    /*
-     * @dev Joins an array of slices, using `self` as a delimiter, returning a
-     *      newly allocated string.
-     * @param self The delimiter to use.
-     * @param parts A list of slices to join.
-     * @return A newly allocated string containing all the slices in `parts`,
-     *         joined with `self`.
-     */
-    function join(slice memory self, slice[] memory parts) internal pure returns (string memory) {
-        if (parts.length == 0)
-            return "";
-
-        uint length = self._len * (parts.length - 1);
-        for(uint i = 0; i < parts.length; i++)
-            length += parts[i]._len;
-
-        string memory ret = new string(length);
-        uint retptr;
-        assembly { retptr := add(ret, 32) }
-
-        for(uint i = 0; i < parts.length; i++) {
-            memcpy(retptr, parts[i]._ptr, parts[i]._len);
-            retptr += parts[i]._len;
-            if (i < parts.length - 1) {
-                memcpy(retptr, self._ptr, self._len);
-                retptr += self._len;
-            }
-        }
-
-        return ret;
-    }
-}
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
deleted file mode 100644
index 646601e6fb8b..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-==== ExternalSource: _base64/base64_inline_asm.sol ====
-==== ExternalSource: _base64/base64_no_inline_asm.sol ====
-==== Source: base64.sol ====
-
-import "_base64/base64_inline_asm.sol";
-import "_base64/base64_no_inline_asm.sol";
-
-contract test {
-    function encode_inline_asm(bytes memory data) external pure returns (string memory) {
-      return InlineAsmBase64.encode(data);
-    }
-
-    function encode_no_asm(bytes memory data) external pure returns (string memory) {
-      return NoAsmBase64.encode(data);
-    }
-
-    function encode_inline_asm_large() external {
-      for (uint i = 0; i < 1000; i++) {
-        InlineAsmBase64.encode("foo");
-      }
-    }
-
-    function encode_no_asm_large() external {
-      for (uint i = 0; i < 1000; i++) {
-        NoAsmBase64.encode("foo");
-      }
-    }
-}
-// Test cases derived from Base64 specification: RFC4648
-// https://datatracker.ietf.org/doc/html/rfc4648#section-10
-//
-// ====
-// EVMVersion: >=constantinople
-// ----
-// constructor()
-// gas irOptimized: 405832
-// gas legacy: 735054
-// gas legacyOptimized: 522722
-// encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
-// encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
-// encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
-// encode_inline_asm(bytes): 0x20, 3, "foo" -> 0x20, 4, "Zm9v"
-// encode_inline_asm(bytes): 0x20, 4, "foob" -> 0x20, 8, "Zm9vYg=="
-// encode_inline_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
-// encode_inline_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
-// encode_no_asm(bytes): 0x20, 0 -> 0x20, 0
-// encode_no_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
-// encode_no_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
-// encode_no_asm(bytes): 0x20, 3, "foo" -> 0x20, 4, "Zm9v"
-// encode_no_asm(bytes): 0x20, 4, "foob" -> 0x20, 8, "Zm9vYg=="
-// encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
-// encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
-// encode_inline_asm_large()
-// gas irOptimized: 1322025
-// gas legacy: 1554031
-// gas legacyOptimized: 1132031
-// encode_no_asm_large()
-// gas irOptimized: 3206081
-// gas legacy: 4587075
-// gas legacyOptimized: 2823075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
deleted file mode 100644
index 4f3342dea72f..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ /dev/null
@@ -1,210 +0,0 @@
-// ����┓��┓��┓������┓������┓��������┓��������������������┓���������┓����������┓���������������┓�
-// ┃���┛�┛┗┓┃┃��┃��┓┃��┃��┓┃����┗┓�┓┃�������������������┛┗┓����┃��┓┃���������┛┗┓�������������┛┗┓
-// ┃┗��┓┗┓�┛┃┗�┓┗┛�┛┃��┃┃�┃┃�����┃┃┃┃���┓���┓���┓���┓�┓┗┓�┛����┃┃�┗┛���┓��┓�┗┓�┛��┓���┓����┓┗┓�┛
-// ┃���┛�┃┃�┃�┓┃��┛�┛��┃┃�┃┃�����┃┃┃┃┃�┓┃┃�┓┃┃�┓┃┃��┫┣┫�┃┃�����┃┃��┓┃�┓┃┃�┓┓�┃┃�┃�┛┗�┓┃�┃��┛�┃┃�
-// ┃┗��┓�┃┗┓┃┃┃┃┃┃┗�┓�┓┃┗�┛┃�����┛┗┛┃┃┃�┫┃┗┛┃┃┗┛┃┣��┃┃┃�┃┗┓����┃┗�┛┃┃┗┛┃┃┃┃┃�┃┗┓┃┃�┃┗┛┗┓┃┗�┓�┃┗┓
-// ┗���┛�┗�┛┗┛┗┛┗���┛┗┛┗���┛����┗���┛┗��┛┃��┛┗��┛┗��┛┗┛�┗�┛����┗���┛┗��┛┗┛┗┛�┗�┛┗┛�┗���┛┗��┛�┗�┛
-// ��������������������������������������┃┃�����������������������������������������������������
-// ��������������������������������������┗┛�����������������������������������������������������
-
-// SPDX-License-Identifier: CC0-1.0
-
-// This interface is designed to be compatible with the Vyper version.
-/// @notice This is the Ethereum 2.0 deposit contract interface.
-/// For more information see the Phase 0 specification under https://github.com/ethereum/eth2.0-specs
-interface IDepositContract {
-    /// @notice A processed deposit event.
-    event DepositEvent(
-        bytes pubkey,
-        bytes withdrawal_credentials,
-        bytes amount,
-        bytes signature,
-        bytes index
-    );
-
-    /// @notice Submit a Phase 0 DepositData object.
-    /// @param pubkey A BLS12-381 public key.
-    /// @param withdrawal_credentials Commitment to a public key for withdrawals.
-    /// @param signature A BLS12-381 signature.
-    /// @param deposit_data_root The SHA-256 hash of the SSZ-encoded DepositData object.
-    /// Used as a protection against malformed input.
-    function deposit(
-        bytes calldata pubkey,
-        bytes calldata withdrawal_credentials,
-        bytes calldata signature,
-        bytes32 deposit_data_root
-    ) external payable;
-
-    /// @notice Query the current deposit root hash.
-    /// @return The deposit root hash.
-    function get_deposit_root() external view returns (bytes32);
-
-    /// @notice Query the current deposit count.
-    /// @return The deposit count encoded as a little endian 64-bit number.
-    function get_deposit_count() external view returns (bytes memory);
-}
-
-// Based on official specification in https://eips.ethereum.org/EIPS/eip-165
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceId The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceId` and
-    ///  `interfaceId` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceId) external pure returns (bool);
-}
-
-// This is a rewrite of the Vyper Eth2.0 deposit contract in Solidity.
-// It tries to stay as close as possible to the original source code.
-/// @notice This is the Ethereum 2.0 deposit contract interface.
-/// For more information see the Phase 0 specification under https://github.com/ethereum/eth2.0-specs
-contract DepositContract is IDepositContract, ERC165 {
-    uint constant DEPOSIT_CONTRACT_TREE_DEPTH = 32;
-    // NOTE: this also ensures `deposit_count` will fit into 64-bits
-    uint constant MAX_DEPOSIT_COUNT = 2**DEPOSIT_CONTRACT_TREE_DEPTH - 1;
-
-    bytes32[DEPOSIT_CONTRACT_TREE_DEPTH] branch;
-    uint256 deposit_count;
-
-    bytes32[DEPOSIT_CONTRACT_TREE_DEPTH] zero_hashes;
-
-    constructor() public {
-        // Compute hashes in empty sparse Merkle tree
-        for (uint height = 0; height < DEPOSIT_CONTRACT_TREE_DEPTH - 1; height++)
-            zero_hashes[height + 1] = sha256(abi.encodePacked(zero_hashes[height], zero_hashes[height]));
-    }
-
-    function get_deposit_root() override external view returns (bytes32) {
-        bytes32 node;
-        uint size = deposit_count;
-        for (uint height = 0; height < DEPOSIT_CONTRACT_TREE_DEPTH; height++) {
-            if ((size & 1) == 1)
-                node = sha256(abi.encodePacked(branch[height], node));
-            else
-                node = sha256(abi.encodePacked(node, zero_hashes[height]));
-            size /= 2;
-        }
-        return sha256(abi.encodePacked(
-            node,
-            to_little_endian_64(uint64(deposit_count)),
-            bytes24(0)
-        ));
-    }
-
-    function get_deposit_count() override external view returns (bytes memory) {
-        return to_little_endian_64(uint64(deposit_count));
-    }
-
-    function deposit(
-        bytes calldata pubkey,
-        bytes calldata withdrawal_credentials,
-        bytes calldata signature,
-        bytes32 deposit_data_root
-    ) override external payable {
-        // Extended ABI length checks since dynamic types are used.
-        require(pubkey.length == 48, "DepositContract: invalid pubkey length");
-        require(withdrawal_credentials.length == 32, "DepositContract: invalid withdrawal_credentials length");
-        require(signature.length == 96, "DepositContract: invalid signature length");
-
-        // Check deposit amount
-        require(msg.value >= 1 ether, "DepositContract: deposit value too low");
-        require(msg.value % 1 gwei == 0, "DepositContract: deposit value not multiple of gwei");
-        uint deposit_amount = msg.value / 1 gwei;
-        require(deposit_amount <= type(uint64).max, "DepositContract: deposit value too high");
-
-        // Emit `DepositEvent` log
-        bytes memory amount = to_little_endian_64(uint64(deposit_amount));
-        emit DepositEvent(
-            pubkey,
-            withdrawal_credentials,
-            amount,
-            signature,
-            to_little_endian_64(uint64(deposit_count))
-        );
-
-        // Compute deposit data root (`DepositData` hash tree root)
-        bytes32 pubkey_root = sha256(abi.encodePacked(pubkey, bytes16(0)));
-        bytes32 signature_root = sha256(abi.encodePacked(
-            sha256(abi.encodePacked(signature[:64])),
-            sha256(abi.encodePacked(signature[64:], bytes32(0)))
-        ));
-        bytes32 node = sha256(abi.encodePacked(
-            sha256(abi.encodePacked(pubkey_root, withdrawal_credentials)),
-            sha256(abi.encodePacked(amount, bytes24(0), signature_root))
-        ));
-
-        // Verify computed and expected deposit data roots match
-        require(node == deposit_data_root, "DepositContract: reconstructed DepositData does not match supplied deposit_data_root");
-
-        // Avoid overflowing the Merkle tree (and prevent edge case in computing `branch`)
-        require(deposit_count < MAX_DEPOSIT_COUNT, "DepositContract: merkle tree full");
-
-        // Add deposit data root to Merkle tree (update a single `branch` node)
-        deposit_count += 1;
-        uint size = deposit_count;
-        for (uint height = 0; height < DEPOSIT_CONTRACT_TREE_DEPTH; height++) {
-            if ((size & 1) == 1) {
-                branch[height] = node;
-                return;
-            }
-            node = sha256(abi.encodePacked(branch[height], node));
-            size /= 2;
-        }
-        // As the loop should always end prematurely with the `return` statement,
-        // this code should be unreachable. We assert `false` just to be safe.
-        assert(false);
-    }
-
-    function supportsInterface(bytes4 interfaceId) override external pure returns (bool) {
-        return interfaceId == type(ERC165).interfaceId || interfaceId == type(IDepositContract).interfaceId;
-    }
-
-    function to_little_endian_64(uint64 value) internal pure returns (bytes memory ret) {
-        ret = new bytes(8);
-        bytes8 bytesValue = bytes8(value);
-        // Byteswapping during copying to bytes.
-        ret[0] = bytesValue[7];
-        ret[1] = bytesValue[6];
-        ret[2] = bytesValue[5];
-        ret[3] = bytesValue[4];
-        ret[4] = bytesValue[3];
-        ret[5] = bytesValue[2];
-        ret[6] = bytesValue[1];
-        ret[7] = bytesValue[0];
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 1386886
-// gas legacy: 2369061
-// gas legacyOptimized: 1740144
-// supportsInterface(bytes4): 0x0 -> 0
-// supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
-// supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
-// supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
-// get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 115231
-// gas legacy: 148205
-// gas legacyOptimized: 122303
-// get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
-// deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
-// get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 115231
-// gas legacy: 148205
-// gas legacyOptimized: 122303
-// get_deposit_count() -> 0x20, 8, 0
-// deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
-// ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
-// get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 115216
-// gas legacy: 148214
-// gas legacyOptimized: 122315
-// get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
-// deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
-// ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
-// get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 115216
-// gas legacy: 148214
-// gas legacyOptimized: 122315
-// get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
deleted file mode 100644
index 3311a8dcf444..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ /dev/null
@@ -1,93 +0,0 @@
-==== ExternalSource: _prbmath/PRBMathCommon.sol ====
-==== ExternalSource: _prbmath/PRBMathSD59x18.sol ====
-==== Source: prbmath.sol ====
-import "_prbmath/PRBMathSD59x18.sol";
-
-contract test {
-    using PRBMathSD59x18 for int256;
-
-    function div(int256 x, int256 y) external pure returns (int256 ret) {
-        ret = x.div(y);
-    }
-    function exp(int256 x) external pure returns (int256 ret) {
-        ret = x.exp();
-    }
-    function exp2(int256 x) external pure returns (int256 ret) {
-        ret = x.exp2();
-    }
-    function gm(int256 x, int256 y) external pure returns (int256 ret) {
-        ret = x.gm(y);
-    }
-    function log10(int256 x) external pure returns (int256 ret) {
-        ret = x.log10();
-    }
-    function log2(int256 x) external pure returns (int256 ret) {
-        ret = x.log2();
-    }
-    function mul(int256 x, int256 y) external pure returns (int256 ret) {
-        ret = x.mul(y);
-    }
-    function pow(int256 x, uint256 y) external pure returns (int256 ret) {
-        ret = x.pow(y);
-    }
-    function sqrt(int256 x) external pure returns (int256 ret) {
-        ret = x.sqrt();
-    }
-    function benchmark(int256 x) external pure returns (int256 ret, int256 z1, int256 z2) {
-        int256 y = x.mul(3).ceil();
-        int256 z = y.div(x);
-        for (uint i = 0; i < 10; i++)
-            z = z.sqrt();
-        ret = z;
-
-        // Check precision
-        z1 = z.ceil();
-        z2 = z.sqrt().pow(2).ceil();
-        assert(z1 == z2);
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 1841740
-// gas legacy: 2414091
-// gas legacyOptimized: 1847616
-// div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
-// gas irOptimized: 22137
-// gas legacy: 22767
-// gas legacyOptimized: 22282
-// exp(int256): 3141592653589793238 -> 23140692632779268978
-// gas irOptimized: 24545
-// gas legacy: 25203
-// gas legacyOptimized: 24357
-// exp2(int256): 3141592653589793238 -> 8824977827076287620
-// gas irOptimized: 24257
-// gas legacy: 24864
-// gas legacyOptimized: 24110
-// gm(int256,int256): 3141592653589793238, 88714123 -> 16694419339601
-// gas irOptimized: 22970
-// gas legacy: 23228
-// gas legacyOptimized: 22683
-// log10(int256): 3141592653589793238 -> 4971498726941338506
-// gas irOptimized: 30609
-// gas legacy: 32934
-// gas legacyOptimized: 30323
-// log2(int256): 3141592653589793238 -> 1651496129472318782
-// gas irOptimized: 28819
-// gas legacy: 31067
-// gas legacyOptimized: 28426
-// mul(int256,int256): 3141592653589793238, 88714123 -> 278703637
-// gas irOptimized: 22225
-// gas legacy: 22807
-// gas legacyOptimized: 22295
-// pow(int256,uint256): 3141592653589793238, 5 -> 306019684785281453040
-// gas irOptimized: 22635
-// gas legacy: 23508
-// gas legacyOptimized: 22921
-// sqrt(int256): 3141592653589793238 -> 1772453850905516027
-// gas irOptimized: 22650
-// gas legacy: 22802
-// gas legacyOptimized: 22422
-// benchmark(int256): 3141592653589793238 -> 998882724338592125, 1000000000000000000, 1000000000000000000
-// gas irOptimized: 36630
-// gas legacy: 36673
-// gas legacyOptimized: 34729
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
deleted file mode 100644
index fb1d1a43524a..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ /dev/null
@@ -1,93 +0,0 @@
-==== ExternalSource: _prbmath/PRBMathCommon.sol ====
-==== ExternalSource: _prbmath/PRBMathUD60x18.sol ====
-==== Source: prbmath.sol ====
-import "_prbmath/PRBMathUD60x18.sol";
-
-contract test {
-    using PRBMathUD60x18 for uint256;
-
-    function div(uint256 x, uint256 y) external pure returns (uint256 ret) {
-        ret = x.div(y);
-    }
-    function exp(uint256 x) external pure returns (uint256 ret) {
-        ret = x.exp();
-    }
-    function exp2(uint256 x) external pure returns (uint256 ret) {
-        ret = x.exp2();
-    }
-    function gm(uint256 x, uint256 y) external pure returns (uint256 ret) {
-        ret = x.gm(y);
-    }
-    function log10(uint256 x) external pure returns (uint256 ret) {
-        ret = x.log10();
-    }
-    function log2(uint256 x) external pure returns (uint256 ret) {
-        ret = x.log2();
-    }
-    function mul(uint256 x, uint256 y) external pure returns (uint256 ret) {
-        ret = x.mul(y);
-    }
-    function pow(uint256 x, uint256 y) external pure returns (uint256 ret) {
-        ret = x.pow(y);
-    }
-    function sqrt(uint256 x) external pure returns (uint256 ret) {
-        ret = x.sqrt();
-    }
-    function benchmark(uint256 x) external pure returns (uint256 ret, uint256 z1, uint256 z2) {
-        uint256 y = x.mul(3).ceil();
-        uint256 z = y.div(x);
-        for (uint i = 0; i < 10; i++)
-            z = z.sqrt();
-        ret = z;
-
-        // Check precision
-        z1 = z.ceil();
-        z2 = z.sqrt().pow(2).ceil();
-        assert(z1 == z2);
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 1716327
-// gas legacy: 2193550
-// gas legacyOptimized: 1725061
-// div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
-// gas irOptimized: 22004
-// gas legacy: 22497
-// gas legacyOptimized: 22010
-// exp(uint256): 3141592653589793238 -> 23140692632779268978
-// gas irOptimized: 24444
-// gas legacy: 25104
-// gas legacyOptimized: 24258
-// exp2(uint256): 3141592653589793238 -> 8824977827076287620
-// gas irOptimized: 24198
-// gas legacy: 24814
-// gas legacyOptimized: 24062
-// gm(uint256,uint256): 3141592653589793238, 88714123 -> 16694419339601
-// gas irOptimized: 22950
-// gas legacy: 23269
-// gas legacyOptimized: 22724
-// log10(uint256): 3141592653589793238 -> 0x44fe4fc084a52b8a
-// gas irOptimized: 30269
-// gas legacy: 32898
-// gas legacyOptimized: 29925
-// log2(uint256): 3141592653589793238 -> 1651496129472318782
-// gas irOptimized: 28235
-// gas legacy: 30986
-// gas legacyOptimized: 28001
-// mul(uint256,uint256): 3141592653589793238, 88714123 -> 278703637
-// gas irOptimized: 22048
-// gas legacy: 22604
-// gas legacyOptimized: 22090
-// pow(uint256,uint256): 3141592653589793238, 5 -> 306019684785281453040
-// gas irOptimized: 22406
-// gas legacy: 23245
-// gas legacyOptimized: 22646
-// sqrt(uint256): 3141592653589793238 -> 1772453850905516027
-// gas irOptimized: 22672
-// gas legacy: 22820
-// gas legacyOptimized: 22440
-// benchmark(uint256): 3141592653589793238 -> 998882724338592125, 1000000000000000000, 1000000000000000000
-// gas irOptimized: 35603
-// gas legacy: 35385
-// gas legacyOptimized: 33449
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
deleted file mode 100644
index 3f555405ddbb..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-==== ExternalSource: _prbmath/PRBMathCommon.sol ====
-==== ExternalSource: _prbmath/PRBMathSD59x18.sol ====
-==== Source: ramanujan_pi.sol ====
-import "_prbmath/PRBMathSD59x18.sol";
-
-// The goal of this test file is to implement Ramanujan's pi approximation using various libraries.
-
-function factorial(uint n) pure returns (uint ret) {
-    ret = 1;
-    for (; n > 1; --n)
-        ret *= n;
-}
-
-contract test {
-    using PRBMathSD59x18 for int256;
-
-    function prb_scale(uint n) internal pure returns (int256 ret) {
-        // Scale to SD59x18
-        ret = int256(n * 10e17);
-    }
-
-    // This dumb implementation of Ramanujan series calculates 1/pi
-    function prb_pi() external pure returns (int256 ret) {
-        uint n = 6; // More than 6 iterations results in failure
-        for (uint k = 0; k < n; k++) {
-            int256 a = prb_scale(factorial(4 * k)).div(prb_scale(factorial(k)).pow(4));
-            int256 b = (prb_scale(25390).mul(prb_scale(k)) + prb_scale(1103)).div(prb_scale(396).pow(4 * k));
-            ret += a.mul(b);
-        }
-        ret = ret.mul(prb_scale(2).sqrt().mul(prb_scale(2)).div(prb_scale(99).pow(2)));
-        ret = prb_scale(1).div(ret);
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 407507
-// gas legacy: 615090
-// gas legacyOptimized: 451871
-// prb_pi() -> 3141592656369545286
-// gas irOptimized: 57478
-// gas legacy: 100947
-// gas legacyOptimized: 75735
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
deleted file mode 100644
index d3492a5c6b06..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ /dev/null
@@ -1,304 +0,0 @@
-library Pairing {
-	struct G1Point {
-		uint X;
-		uint Y;
-	}
-	// Encoding of field elements is: X[0] * z + X[1]
-	struct G2Point {
-		uint[2] X;
-		uint[2] Y;
-	}
-
-	/// @return the generator of G1
-	function P1() internal returns (G1Point memory) {
-		return G1Point(1, 2);
-	}
-
-	/// @return the generator of G2
-	function P2() internal returns (G2Point memory) {
-		return G2Point(
-			[11559732032986387107991004021392285783925812861821192530917403151452391805634,
-			 10857046999023057135944570762232829481370756359578518086990519993285655852781],
-			[4082367875863433681332203403145435568316851327593401208105741076214120093531,
-			 8495653923123431417604973247489272438418190587263600148770280649306958101930]
-		);
-	}
-
-	/// @return the negation of p, i.e. p.add(p.negate()) should be zero.
-	function negate(G1Point memory p) internal returns (G1Point memory) {
-		// The prime q in the base field F_q for G1
-		uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
-		if (p.X == 0 && p.Y == 0)
-			return G1Point(0, 0);
-		return G1Point(p.X, q - (p.Y % q));
-	}
-
-	/// @return r the sum of two points of G1
-	function add(G1Point memory p1, G1Point memory p2) internal returns (G1Point memory r) {
-		uint[4] memory input;
-		input[0] = p1.X;
-		input[1] = p1.Y;
-		input[2] = p2.X;
-		input[3] = p2.Y;
-		bool success;
-		assembly {
-			success := call(sub(gas(), 2000), 6, 0, input, 0xc0, r, 0x60)
-			// Use "invalid" to make gas estimation work
-			switch success case 0 { invalid() }
-		}
-		require(success);
-	}
-
-	/// @return r the product of a point on G1 and a scalar, i.e.
-	/// p == p.mul(1) and p.add(p) == p.mul(2) for all points p.
-	function mul(G1Point memory p, uint s) internal returns (G1Point memory r) {
-		uint[3] memory input;
-		input[0] = p.X;
-		input[1] = p.Y;
-		input[2] = s;
-		bool success;
-		assembly {
-			success := call(sub(gas(), 2000), 7, 0, input, 0x80, r, 0x60)
-			// Use "invalid" to make gas estimation work
-			switch success case 0 { invalid() }
-		}
-		require(success);
-	}
-
-	/// @return the result of computing the pairing check
-	/// e(p1[0], p2[0]) *  .... * e(p1[n], p2[n]) == 1
-	/// For example pairing([P1(), P1().negate()], [P2(), P2()]) should
-	/// return true.
-	function pairing(G1Point[] memory p1, G2Point[] memory p2) internal returns (bool) {
-		require(p1.length == p2.length);
-		uint elements = p1.length;
-		uint inputSize = p1.length * 6;
-		uint[] memory input = new uint[](inputSize);
-		for (uint i = 0; i < elements; i++)
-		{
-			input[i * 6 + 0] = p1[i].X;
-			input[i * 6 + 1] = p1[i].Y;
-			input[i * 6 + 2] = p2[i].X[0];
-			input[i * 6 + 3] = p2[i].X[1];
-			input[i * 6 + 4] = p2[i].Y[0];
-			input[i * 6 + 5] = p2[i].Y[1];
-		}
-		uint[1] memory out;
-		bool success;
-		assembly {
-			success := call(sub(gas(), 2000), 8, 0, add(input, 0x20), mul(inputSize, 0x20), out, 0x20)
-			// Use "invalid" to make gas estimation work
-			switch success case 0 { invalid() }
-		}
-		require(success);
-		return out[0] != 0;
-	}
-	function pairingProd2(G1Point memory a1, G2Point memory a2, G1Point memory b1, G2Point memory b2) internal returns (bool) {
-		G1Point[] memory p1 = new G1Point[](2);
-		G2Point[] memory p2 = new G2Point[](2);
-		p1[0] = a1;
-		p1[1] = b1;
-		p2[0] = a2;
-		p2[1] = b2;
-		return pairing(p1, p2);
-	}
-	function pairingProd3(
-		G1Point memory a1, G2Point memory a2,
-		G1Point memory b1, G2Point memory b2,
-		G1Point memory c1, G2Point memory c2
-	) internal returns (bool) {
-		G1Point[] memory p1 = new G1Point[](3);
-		G2Point[] memory p2 = new G2Point[](3);
-		p1[0] = a1;
-		p1[1] = b1;
-		p1[2] = c1;
-		p2[0] = a2;
-		p2[1] = b2;
-		p2[2] = c2;
-		return pairing(p1, p2);
-	}
-	function pairingProd4(
-		G1Point memory a1, G2Point memory a2,
-		G1Point memory b1, G2Point memory b2,
-		G1Point memory c1, G2Point memory c2,
-			G1Point memory d1, G2Point memory d2
-	) internal returns (bool) {
-		G1Point[] memory p1 = new G1Point[](4);
-		G2Point[] memory p2 = new G2Point[](4);
-		p1[0] = a1;
-		p1[1] = b1;
-		p1[2] = c1;
-		p1[3] = d1;
-		p2[0] = a2;
-		p2[1] = b2;
-		p2[2] = c2;
-		p2[3] = d2;
-		return pairing(p1, p2);
-	}
-}
-
-contract Test {
-	using Pairing for *;
-	struct VerifyingKey {
-		Pairing.G2Point A;
-		Pairing.G1Point B;
-		Pairing.G2Point C;
-		Pairing.G2Point gamma;
-		Pairing.G1Point gammaBeta1;
-		Pairing.G2Point gammaBeta2;
-		Pairing.G2Point Z;
-		Pairing.G1Point[] IC;
-	}
-	struct Proof {
-		Pairing.G1Point A;
-		Pairing.G1Point A_p;
-		Pairing.G2Point B;
-		Pairing.G1Point B_p;
-		Pairing.G1Point C;
-		Pairing.G1Point C_p;
-		Pairing.G1Point K;
-		Pairing.G1Point H;
-	}
-	function f() public returns (bool) {
-		Pairing.G1Point memory p1;
-		Pairing.G1Point memory p2;
-		p1.X = 1; p1.Y = 2;
-		p2.X = 1; p2.Y = 2;
-		Pairing.G1Point memory explicit_sum = Pairing.add(p1, p2);
-		Pairing.G1Point memory scalar_prod = Pairing.mul(p1, 2);
-		return (explicit_sum.X == scalar_prod.X &&
-			explicit_sum.Y == scalar_prod.Y);
-	}
-	function g() public returns (bool) {
-		Pairing.G1Point memory x = Pairing.add(Pairing.P1(), Pairing.negate(Pairing.P1()));
-		// should be zero
-		return (x.X == 0 && x.Y == 0);
-	}
-	function testMul() public returns (bool) {
-		Pairing.G1Point memory p;
-		// @TODO The points here are reported to be not well-formed
-		p.X = 14125296762497065001182820090155008161146766663259912659363835465243039841726;
-		p.Y = 16229134936871442251132173501211935676986397196799085184804749187146857848057;
-		p = Pairing.mul(p, 13986731495506593864492662381614386532349950841221768152838255933892789078521);
-		return
-			p.X == 18256332256630856740336504687838346961237861778318632856900758565550522381207 &&
-			p.Y == 6976682127058094634733239494758371323697222088503263230319702770853579280803;
-	}
-	function pair() public returns (bool) {
-		Pairing.G2Point memory fiveTimesP2 = Pairing.G2Point(
-			[4540444681147253467785307942530223364530218361853237193970751657229138047649, 20954117799226682825035885491234530437475518021362091509513177301640194298072],
-			[11631839690097995216017572651900167465857396346217730511548857041925508482915, 21508930868448350162258892668132814424284302804699005394342512102884055673846]
-		);
-		// The prime p in the base field F_p for G1
-		uint p = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
-		Pairing.G1Point[] memory g1points = new Pairing.G1Point[](2);
-		Pairing.G2Point[] memory g2points = new Pairing.G2Point[](2);
-		// check e(5 P1, P2)e(-P1, 5 P2) == 1
-		g1points[0] = Pairing.P1().mul(5);
-		g1points[1] = Pairing.P1().negate();
-		g2points[0] = Pairing.P2();
-		g2points[1] = fiveTimesP2;
-		if (!Pairing.pairing(g1points, g2points))
-			return false;
-		// check e(P1, P2)e(-P1, P2) == 1
-		g1points[0] = Pairing.P1();
-		g1points[1] = Pairing.P1();
-		g1points[1].Y = p - g1points[1].Y;
-		g2points[0] = Pairing.P2();
-		g2points[1] = Pairing.P2();
-		if (!Pairing.pairing(g1points, g2points))
-			return false;
-		return true;
-	}
-	function verifyingKey() internal returns (VerifyingKey memory vk) {
-		vk.A = Pairing.G2Point([0x209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf7, 0x04bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a41678], [0x2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d, 0x120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550]);
-		vk.B = Pairing.G1Point(0x2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc02, 0x03d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db84);
-		vk.C = Pairing.G2Point([0x2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb, 0x01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb3], [0x14a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713, 0x178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee24590]);
-		vk.gamma = Pairing.G2Point([0x25f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb1, 0x22acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d], [0x065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf68, 0x06d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb]);
-		vk.gammaBeta1 = Pairing.G1Point(0x15794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f21, 0x14db745c6780e9df549864cec19c2daf4531f6ec0c89cc1c7436cc4d8d300c6d);
-		vk.gammaBeta2 = Pairing.G2Point([0x1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e, 0x283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39], [0x140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e, 0x0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd4]);
-		vk.Z = Pairing.G2Point([0x217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac29, 0x0a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c], [0x26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a9855, 0x2fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d7]);
-		vk.IC = new Pairing.G1Point[](10);
-		vk.IC[0] = Pairing.G1Point(0x0aee46a7ea6e80a3675026dfa84019deee2a2dedb1bbe11d7fe124cb3efb4b5a, 0x044747b6e9176e13ede3a4dfd0d33ccca6321b9acd23bf3683a60adc0366ebaf);
-		vk.IC[1] = Pairing.G1Point(0x1e39e9f0f91fa7ff8047ffd90de08785777fe61c0e3434e728fce4cf35047ddc, 0x2e0b64d75ebfa86d7f8f8e08abbe2e7ae6e0a1c0b34d028f19fa56e9450527cb);
-		vk.IC[2] = Pairing.G1Point(0x1c36e713d4d54e3a9644dffca1fc524be4868f66572516025a61ca542539d43f, 0x042dcc4525b82dfb242b09cb21909d5c22643dcdbe98c4d082cc2877e96b24db);
-		vk.IC[3] = Pairing.G1Point(0x17d5d09b4146424bff7e6fb01487c477bbfcd0cdbbc92d5d6457aae0b6717cc5, 0x02b5636903efbf46db9235bbe74045d21c138897fda32e079040db1a16c1a7a1);
-		vk.IC[4] = Pairing.G1Point(0x0f103f14a584d4203c27c26155b2c955f8dfa816980b24ba824e1972d6486a5d, 0x0c4165133b9f5be17c804203af781bcf168da7386620479f9b885ecbcd27b17b);
-		vk.IC[5] = Pairing.G1Point(0x232063b584fb76c8d07995bee3a38fa7565405f3549c6a918ddaa90ab971e7f8, 0x2ac9b135a81d96425c92d02296322ad56ffb16299633233e4880f95aafa7fda7);
-		vk.IC[6] = Pairing.G1Point(0x09b54f111d3b2d1b2fe1ae9669b3db3d7bf93b70f00647e65c849275de6dc7fe, 0x18b2e77c63a3e400d6d1f1fbc6e1a1167bbca603d34d03edea231eb0ab7b14b4);
-		vk.IC[7] = Pairing.G1Point(0x0c54b42137b67cc268cbb53ac62b00ecead23984092b494a88befe58445a244a, 0x18e3723d37fae9262d58b548a0575f59d9c3266db7afb4d5739555837f6b8b3e);
-		vk.IC[8] = Pairing.G1Point(0x0a6de0e2240aa253f46ce0da883b61976e3588146e01c9d8976548c145fe6e4a, 0x04fbaa3a4aed4bb77f30ebb07a3ec1c7d77a7f2edd75636babfeff97b1ea686e);
-		vk.IC[9] = Pairing.G1Point(0x111e2e2a5f8828f80ddad08f9f74db56dac1cc16c1cb278036f79a84cf7a116f, 0x1d7d62e192b219b9808faa906c5ced871788f6339e8d91b83ac1343e20a16b30);
-	}
-	function verify(uint[] memory input, Proof memory proof) internal returns (uint) {
-		VerifyingKey memory vk = verifyingKey();
-		require(input.length + 1 == vk.IC.length);
-		// Compute the linear combination vk_x
-		Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0);
-		for (uint i = 0; i < input.length; i++)
-			vk_x = Pairing.add(vk_x, Pairing.mul(vk.IC[i + 1], input[i]));
-		vk_x = Pairing.add(vk_x, vk.IC[0]);
-		if (!Pairing.pairingProd2(proof.A, vk.A, Pairing.negate(proof.A_p), Pairing.P2())) return 1;
-		if (!Pairing.pairingProd2(vk.B, proof.B, Pairing.negate(proof.B_p), Pairing.P2())) return 2;
-		if (!Pairing.pairingProd2(proof.C, vk.C, Pairing.negate(proof.C_p), Pairing.P2())) return 3;
-		if (!Pairing.pairingProd3(
-			proof.K, vk.gamma,
-			Pairing.negate(Pairing.add(vk_x, Pairing.add(proof.A, proof.C))), vk.gammaBeta2,
-			Pairing.negate(vk.gammaBeta1), proof.B
-		)) return 4;
-		if (!Pairing.pairingProd3(
-			Pairing.add(vk_x, proof.A), proof.B,
-			Pairing.negate(proof.H), vk.Z,
-			Pairing.negate(proof.C), Pairing.P2()
-		)) return 5;
-		return 0;
-	}
-	event Verified(string);
-	function verifyTx() public returns (bool) {
-		uint[] memory input = new uint[](9);
-		Proof memory proof;
-		proof.A = Pairing.G1Point(12873740738727497448187997291915224677121726020054032516825496230827252793177, 21804419174137094775122804775419507726154084057848719988004616848382402162497);
-		proof.A_p = Pairing.G1Point(7742452358972543465462254569134860944739929848367563713587808717088650354556, 7324522103398787664095385319014038380128814213034709026832529060148225837366);
-		proof.B = Pairing.G2Point(
-			[8176651290984905087450403379100573157708110416512446269839297438960217797614, 15588556568726919713003060429893850972163943674590384915350025440408631945055],
-			[15347511022514187557142999444367533883366476794364262773195059233657571533367, 4265071979090628150845437155927259896060451682253086069461962693761322642015]);
-		proof.B_p = Pairing.G1Point(2979746655438963305714517285593753729335852012083057917022078236006592638393, 6470627481646078059765266161088786576504622012540639992486470834383274712950);
-		proof.C = Pairing.G1Point(6851077925310461602867742977619883934042581405263014789956638244065803308498, 10336382210592135525880811046708757754106524561907815205241508542912494488506);
-		proof.C_p = Pairing.G1Point(12491625890066296859584468664467427202390981822868257437245835716136010795448, 13818492518017455361318553880921248537817650587494176379915981090396574171686);
-		proof.H = Pairing.G1Point(12091046215835229523641173286701717671667447745509192321596954139357866668225, 14446807589950902476683545679847436767890904443411534435294953056557941441758);
-		proof.K = Pairing.G1Point(21341087976609916409401737322664290631992568431163400450267978471171152600502, 2942165230690572858696920423896381470344658299915828986338281196715687693170);
-		input[0] = 13986731495506593864492662381614386532349950841221768152838255933892789078521;
-		input[1] = 622860516154313070522697309645122400675542217310916019527100517240519630053;
-		input[2] = 11094488463398718754251685950409355128550342438297986977413505294941943071569;
-		input[3] = 6627643779954497813586310325594578844876646808666478625705401786271515864467;
-		input[4] = 2957286918163151606545409668133310005545945782087581890025685458369200827463;
-		input[5] = 1384290496819542862903939282897996566903332587607290986044945365745128311081;
-		input[6] = 5613571677741714971687805233468747950848449704454346829971683826953541367271;
-		input[7] = 9643208548031422463313148630985736896287522941726746581856185889848792022807;
-		input[8] = 18066496933330839731877828156604;
-		if (verify(input, proof) == 0) {
-			emit Verified("Successfully verified.");
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
-/// Disabled because the point seems to be not well-formed, we need to find another example.
-/// testMul() -> true
-//
-// ====
-// EVMVersion: >=constantinople
-// ----
-// library: Pairing
-// f() -> true
-// g() -> true
-// pair() -> true
-// gas irOptimized: 269697
-// gas legacy: 275206
-// gas legacyOptimized: 266925
-// verifyTx() -> true
-// ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 782210
-// gas legacy: 801868
-// gas legacyOptimized: 770942
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
deleted file mode 100644
index 18d6db37df1e..000000000000
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-==== ExternalSource: _stringutils/stringutils.sol ====
-==== Source: strings.sol ====
-pragma abicoder v2;
-import "_stringutils/stringutils.sol";
-
-contract test {
-    using strings for bytes32;
-    using strings for string;
-    using strings for strings.slice;
-
-    function toSlice(string memory a) external pure returns (strings.slice memory) {
-        return a.toSlice();
-    }
-
-    function roundtrip(string memory a) external pure returns (string memory) {
-        return a.toSlice().toString();
-    }
-
-    function utf8len(string memory a) external pure returns (uint) {
-        return a.toSlice().len();
-    }
-
-    function multiconcat(string memory a, uint count) public pure returns (string memory) {
-        strings.slice memory s = a.toSlice();
-        for (uint i = 0; i < count; i++) {
-            s = s.concat(s).toSlice();
-        }
-        return s.toString();
-    }
-
-    function benchmark(string memory text, bytes32 seed) external pure returns (uint) {
-        // Grow text.
-        text = multiconcat(text, 10);
-
-        strings.slice memory a = text.toSlice();
-        strings.slice memory b = seed.toSliceB32();
-
-        // Some heavy computation.
-        bool c = b.equals(a) || b.startsWith(a);
-
-        // Join as a list.
-        strings.slice memory delim = c ? string(",").toSlice() : string(";").toSlice();
-        strings.slice[] memory parts = new strings.slice[](2);
-        parts[0] = a;
-        parts[1] = b;
-        string memory d = delim.join(parts);
-        return d.toSlice().len();
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 630224
-// gas legacy: 1061957
-// gas legacyOptimized: 718937
-// toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
-// gas irOptimized: 22660
-// gas legacy: 23190
-// gas legacyOptimized: 22508
-// roundtrip(string): 0x20, 11, "hello world" -> 0x20, 11, "hello world"
-// gas irOptimized: 23408
-// gas legacy: 23820
-// gas legacyOptimized: 23123
-// utf8len(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 4 # Input: "😃😃😃😃" #
-// gas irOptimized: 24026
-// gas legacy: 25716
-// gas legacyOptimized: 24115
-// multiconcat(string,uint256): 0x40, 3, 11, "hello world" -> 0x20, 0x58, 0x68656c6c6f20776f726c6468656c6c6f20776f726c6468656c6c6f20776f726c, 0x6468656c6c6f20776f726c6468656c6c6f20776f726c6468656c6c6f20776f72, 49027192869463622675296414541903001712009715982962058146354235762728281047040 # concatenating 3 times #
-// gas irOptimized: 28440
-// gas legacy: 31621
-// gas legacyOptimized: 27914
-// benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1980944
-// gas legacy: 4233999
-// gas legacyOptimized: 2318684
diff --git a/test/libsolidity/semanticTests/externalSource/_external/external.sol b/test/libsolidity/semanticTests/externalSource/_external/external.sol
deleted file mode 100644
index 3289e6ec9fdc..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/external.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract External {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_external/external.sol=sol b/test/libsolidity/semanticTests/externalSource/_external/external.sol=sol
deleted file mode 100644
index 3289e6ec9fdc..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/external.sol=sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract External {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_external/import.sol b/test/libsolidity/semanticTests/externalSource/_external/import.sol
deleted file mode 100644
index 30915351eedb..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/import.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-import "external.sol";
-import "other_external.sol";
diff --git a/test/libsolidity/semanticTests/externalSource/_external/import_with_subdir.sol b/test/libsolidity/semanticTests/externalSource/_external/import_with_subdir.sol
deleted file mode 100644
index a8e23be56984..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/import_with_subdir.sol
+++ /dev/null
@@ -1 +0,0 @@
-import "subdir/import.sol";
diff --git a/test/libsolidity/semanticTests/externalSource/_external/other_external.sol b/test/libsolidity/semanticTests/externalSource/_external/other_external.sol
deleted file mode 100644
index 7a686b3dc861..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/other_external.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract OtherExternal {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_external/subdir/import.sol b/test/libsolidity/semanticTests/externalSource/_external/subdir/import.sol
deleted file mode 100644
index bf0ef42cee0e..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/subdir/import.sol
+++ /dev/null
@@ -1 +0,0 @@
-import "sub_external.sol";
diff --git a/test/libsolidity/semanticTests/externalSource/_external/subdir/sub_external.sol b/test/libsolidity/semanticTests/externalSource/_external/subdir/sub_external.sol
deleted file mode 100644
index 63a3bd180e84..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_external/subdir/sub_external.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract SubExternal {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/a.sol b/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/a.sol
deleted file mode 100644
index 4e829399a196..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/a.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract A {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/c.sol b/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/c.sol
deleted file mode 100644
index 41a6d5677919..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/c.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract C {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/d.sol b/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/d.sol
deleted file mode 100644
index 0c9cba07d347..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_non_normalized_paths/d.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract D {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/D/d.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/D/d.sol
deleted file mode 100644
index 0c9cba07d347..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/D/d.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract D {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/c.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/c.sol
deleted file mode 100644
index 41a6d5677919..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/c.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract C {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/B/b.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/B/b.sol
deleted file mode 100644
index 5611e6fa3cfb..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/B/b.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import {C} from "../../c.sol";
-contract B {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/G/g.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/G/g.sol
deleted file mode 100644
index 1d2096de2c28..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/G/g.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import {B} from "../B/b.sol";
-contract G {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/a.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/a.sol
deleted file mode 100644
index 4e829399a196..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/a.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract A {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/contract.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/contract.sol
deleted file mode 100644
index aab81b975c5b..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/dir/contract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-import {A} from "./a.sol";
-import {B} from "./B/b.sol";
-import {C} from "../c.sol";
-import {D} from "../D/d.sol";
-import {G} from "./E/../F/../G/./g.sol";
-import {H} from "../../../../_relative_imports/h.sol";
-contract Contract {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_relative_imports/h.sol b/test/libsolidity/semanticTests/externalSource/_relative_imports/h.sol
deleted file mode 100644
index 2d969980e4d2..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_relative_imports/h.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract H {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/b.sol b/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/b.sol
deleted file mode 100644
index 8b4d639527b7..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/b.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract B {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dir/a.sol b/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dir/a.sol
deleted file mode 100644
index 4e829399a196..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dir/a.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract A {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dir/contract.sol b/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dir/contract.sol
deleted file mode 100644
index f67d9702656a..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dir/contract.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-import {A} from "./a.sol";
-import {B} from "../b.sol";
diff --git a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dot_a.sol b/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dot_a.sol
deleted file mode 100644
index 3f1554224371..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dot_a.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract Dot_A {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dot_dot_b.sol b/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dot_dot_b.sol
deleted file mode 100644
index 037c81216561..000000000000
--- a/test/libsolidity/semanticTests/externalSource/_source_name_starting_with_dots/dot_dot_b.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract Dot_Dot_B {
-}
diff --git a/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol b/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
deleted file mode 100644
index 149109f6d0e0..000000000000
--- a/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== ExternalSource: a=_external/external.sol=sol ====
-import {External} from "a";
-contract C {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol b/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
deleted file mode 100644
index f16a7b0a165d..000000000000
--- a/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== ExternalSource: _external/external.sol ====
-==== ExternalSource: _external/other_external.sol ====
-import {External} from "_external/external.sol";
-import {OtherExternal} from "_external/other_external.sol";
-contract C {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/multisource.sol b/test/libsolidity/semanticTests/externalSource/multisource.sol
deleted file mode 100644
index 685f0b9daa54..000000000000
--- a/test/libsolidity/semanticTests/externalSource/multisource.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== ExternalSource: _external/external.sol ====
-==== Source: s1.sol ====
-import {External} from "_external/external.sol";
-contract S1 {
-}
-==== Source: s2.sol ====
-import {S1} from "s1.sol";
-contract C {
-}
-// ----
-// constructor()
-
diff --git a/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol b/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
deleted file mode 100644
index 7316cc7d57fd..000000000000
--- a/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== ExternalSource: _non_normalized_paths//a.sol ====
-==== ExternalSource: C/////c.sol=_non_normalized_paths/c.sol ====
-==== ExternalSource: C/../////D/d.sol=_non_normalized_paths///d.sol ====
-import {A} from "_non_normalized_paths//a.sol";
-import {C} from "C/////c.sol";
-import {D} from "C/../////D/d.sol";
-contract Contract {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/relative_imports.sol b/test/libsolidity/semanticTests/externalSource/relative_imports.sol
deleted file mode 100644
index 9a37896bb568..000000000000
--- a/test/libsolidity/semanticTests/externalSource/relative_imports.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== ExternalSource: _relative_imports/dir/contract.sol ====
-==== ExternalSource: _relative_imports/dir/a.sol ====
-==== ExternalSource: _relative_imports/dir/B/b.sol ====
-==== ExternalSource: _relative_imports/c.sol ====
-==== ExternalSource: _relative_imports/D/d.sol ====
-==== ExternalSource: _relative_imports/dir/G/g.sol ====
-==== ExternalSource: _relative_imports/h.sol ====
-import {A, B, C, D, G, H, Contract} from "_relative_imports/dir/contract.sol";
-contract CC {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source.sol b/test/libsolidity/semanticTests/externalSource/source.sol
deleted file mode 100644
index 12a50ff82abb..000000000000
--- a/test/libsolidity/semanticTests/externalSource/source.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== ExternalSource: _external/external.sol ====
-import {External} from "_external/external.sol";
-contract C {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_import.sol b/test/libsolidity/semanticTests/externalSource/source_import.sol
deleted file mode 100644
index f16a7b0a165d..000000000000
--- a/test/libsolidity/semanticTests/externalSource/source_import.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== ExternalSource: _external/external.sol ====
-==== ExternalSource: _external/other_external.sol ====
-import {External} from "_external/external.sol";
-import {OtherExternal} from "_external/other_external.sol";
-contract C {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol b/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
deleted file mode 100644
index 35f3b5ba1466..000000000000
--- a/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== ExternalSource: _external/import_with_subdir.sol ====
-==== ExternalSource: subdir/import.sol=_external/subdir/import.sol ====
-==== ExternalSource: sub_external.sol=_external/subdir/sub_external.sol ====
-import {SubExternal} from "sub_external.sol";
-contract C {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol b/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
deleted file mode 100644
index b671c94f9f9d..000000000000
--- a/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== ExternalSource: ./a.sol=_source_name_starting_with_dots/dot_a.sol ====
-==== ExternalSource: ../b.sol=_source_name_starting_with_dots/dot_dot_b.sol ====
-==== ExternalSource: _source_name_starting_with_dots/dir/a.sol ====
-==== ExternalSource: _source_name_starting_with_dots/b.sol ====
-==== ExternalSource: _source_name_starting_with_dots/dir/contract.sol ====
-import {A, B} from "_source_name_starting_with_dots/dir/contract.sol";
-contract Contract {
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_remapping.sol b/test/libsolidity/semanticTests/externalSource/source_remapping.sol
deleted file mode 100644
index 079a222fd1f5..000000000000
--- a/test/libsolidity/semanticTests/externalSource/source_remapping.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== ExternalSource: ExtSource.sol=_external/external.sol ====
-==== ExternalSource: /ExtSource.sol=_external/other_external.sol ====
-import "ExtSource.sol";
-import "/ExtSource.sol";
-contract C {
-    External _external;
-    OtherExternal _otherExternal;
-}
-// ----
-// constructor()
diff --git a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
deleted file mode 100644
index 7bf3aee3acfe..000000000000
--- a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract receiver {
-    uint256 public received;
-    function recv(uint256 x) public { received += x + 1; }
-    fallback() external { received = 0x80; }
-}
-contract sender {
-    constructor() { rec = new receiver();}
-    fallback() external { savedData = msg.data; }
-    function forward() public returns (bool) { address(rec).call(savedData); return true; }
-    function clear() public returns (bool) { delete savedData; return true; }
-    function val() public returns (uint) { return rec.received(); }
-    receiver rec;
-    bytes savedData;
-}
-// ====
-// allowNonExistingFunctions: true
-// ----
-// recv(uint256): 7 ->
-// val() -> 0
-// forward() -> true
-// val() -> 8
-// clear() -> true
-// val() -> 8
-// forward() -> true
-// val() -> 0x80
diff --git a/test/libsolidity/semanticTests/fallback/falback_return.sol b/test/libsolidity/semanticTests/fallback/falback_return.sol
deleted file mode 100644
index d59bb9d45247..000000000000
--- a/test/libsolidity/semanticTests/fallback/falback_return.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-    uint public x;
-    fallback () external {
-        if (x == 2) return;
-        x++;
-    }
-}
-// ----
-// ()
-// x() -> 1
-// ()
-// x() -> 2
-// ()
-// x() -> 2
-// ()
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/fallback/fallback_argument.sol b/test/libsolidity/semanticTests/fallback/fallback_argument.sol
deleted file mode 100644
index d351720761c1..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_argument.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-    uint public x;
-    fallback (bytes calldata _input) external returns (bytes memory) {
-        x = _input.length;
-        return "";
-    }
-    function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x01, 0x40, 0x00
-// x() -> 3
diff --git a/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol b/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol
deleted file mode 100644
index 1a995a8cd554..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-    bytes public x;
-    fallback (bytes calldata _input) external returns (bytes memory) {
-        x = _input;
-        return "";
-    }
-    function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x01, 0x40, 0x00
-// x() -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol b/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
deleted file mode 100644
index 9b5319ae0013..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint x;
-    uint y;
-    fallback () payable external { ++x; }
-    receive () payable external { ++y; }
-    function f() external returns (uint, uint) { return (x, y); }
-}
-// ----
-// f() -> 0, 0
-// () ->
-// f() -> 0, 1
-// (), 1 ether ->
-// f() -> 0, 2
-// (): 1 ->
-// f() -> 1, 2
-// (), 1 ether: 1 ->
-// f() -> 2, 2
diff --git a/test/libsolidity/semanticTests/fallback/fallback_override.sol b/test/libsolidity/semanticTests/fallback/fallback_override.sol
deleted file mode 100644
index 5e5adb37c515..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_override.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-    fallback (bytes calldata _input) virtual external returns (bytes memory) {
-        return _input;
-    }
-}
-contract B is A {
-    fallback (bytes calldata _input) override external returns (bytes memory) {
-        return "xyz";
-    }
-    function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x01, 0x40, 0x03, 0x78797a0000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/fallback/fallback_override2.sol b/test/libsolidity/semanticTests/fallback/fallback_override2.sol
deleted file mode 100644
index 67925fd5bdd6..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_override2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    fallback (bytes calldata _input) virtual external returns (bytes memory) {
-        return _input;
-    }
-}
-contract B is A {
-    fallback () override external {
-    }
-    function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 1, 0x40, 0x00
diff --git a/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol b/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol
deleted file mode 100644
index ce268e4f4391..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-    fallback (bytes calldata _input) virtual external returns (bytes memory) {
-        return _input;
-    }
-}
-contract B {
-    fallback (bytes calldata _input) virtual external returns (bytes memory) {
-        return "xyz";
-    }
-}
-contract C is B, A {
-    fallback () external override (B, A) {}
-    function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x01, 0x40, 0x00
diff --git a/test/libsolidity/semanticTests/fallback/fallback_return_data.sol b/test/libsolidity/semanticTests/fallback/fallback_return_data.sol
deleted file mode 100644
index d22c11e71c1f..000000000000
--- a/test/libsolidity/semanticTests/fallback/fallback_return_data.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A {
-    fallback (bytes calldata _input) external returns (bytes memory) {
-        return _input;
-    }
-    function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x01, 0x40, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/fallback/inherited.sol b/test/libsolidity/semanticTests/fallback/inherited.sol
deleted file mode 100644
index 55c63944508c..000000000000
--- a/test/libsolidity/semanticTests/fallback/inherited.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    uint data;
-    fallback() external { data = 1; }
-    function getData() public returns (uint r) { return data; }
-}
-contract B is A {}
-// ----
-// getData() -> 0
-// (): 42 ->
-// getData() -> 1
diff --git a/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol b/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
deleted file mode 100644
index dd97f4c03488..000000000000
--- a/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    uint public x;
-    // Signature is d88e0b00
-    function fow() public { x = 3; }
-    fallback () external { x = 2; }
-}
-// ----
-// (): hex"d88e0b"
-// x() -> 2
-// (): hex"d88e0b00"
-// x() -> 3
-// (): hex"d88e"
-// x() -> 2
-// (): hex"d88e0b00"
-// x() -> 3
-// (): hex"d8"
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/freeFunctions/easy.sol b/test/libsolidity/semanticTests/freeFunctions/easy.sol
deleted file mode 100644
index f73f101256c5..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/easy.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function add(uint a, uint b) pure returns (uint) {
-  return a + b;
-}
-
-contract C {
-  function f(uint x) public pure returns (uint) {
-    return add(x, 2);
-  }
-}
-// ----
-// f(uint256): 7 -> 9
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol b/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
deleted file mode 100644
index cf4140286d7c..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function f() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
-// f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
deleted file mode 100644
index 7a05ff5d0270..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-  uint public x = 2;
-}
-
-function test() returns (bool) {
-  return type(C).runtimeCode.length > 20;
-}
-
-contract D {
-  function f() public returns (bool) {
-    return test();
-  }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/freeFunctions/import.sol b/test/libsolidity/semanticTests/freeFunctions/import.sol
deleted file mode 100644
index edd44de4939a..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/import.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-==== Source: A ====
-struct S { uint x; }
-function set(S storage a, uint v) { a.x = v; }
-
-==== Source: B ====
-import "A";
-import "A" as A;
-contract C {
-  A.S data;
-  function f(uint v) public returns (uint one, uint two) {
-    A.set(data, v);
-    one = data.x;
-    set(data, v + 1);
-    two = data.x;
-  }
-}
-// ----
-// f(uint256): 7 -> 7, 8
diff --git a/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol b/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
deleted file mode 100644
index f7d2cf20e117..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-library L {
-  function pub() public pure returns (uint) {
-    return 7;
-  }
-  function inter() internal pure returns (uint) {
-    return 8;
-  }
-}
-
-function fu() pure returns (uint, uint) {
-  return (L.pub(), L.inter());
-}
-
-contract C {
-  function f() public pure returns (uint, uint) {
-    return fu();
-  }
-}
-// ----
-// library: L
-// f() -> 7, 8
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
deleted file mode 100644
index dd44a1b5950c..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-  uint public x = 2;
-}
-
-function test() returns (uint) {
-  return (new C()).x();
-}
-
-contract D {
-  function f() public returns (uint) {
-    return test();
-  }
-}
-// ----
-// f() -> 2
-// gas legacy: 100211
diff --git a/test/libsolidity/semanticTests/freeFunctions/overloads.sol b/test/libsolidity/semanticTests/freeFunctions/overloads.sol
deleted file mode 100644
index 6a2da653610e..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/overloads.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-function f(uint) returns (uint) {
-    return 2;
-}
-function f(string memory) returns (uint) {
-    return 3;
-}
-
-contract C {
-  function g() public returns (uint, uint) {
-      return (f(2), f("abc"));
-  }
-}
-// ----
-// g() -> 2, 3
diff --git a/test/libsolidity/semanticTests/freeFunctions/recursion.sol b/test/libsolidity/semanticTests/freeFunctions/recursion.sol
deleted file mode 100644
index 894a60f3f611..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/recursion.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-function exp(uint base, uint exponent) pure returns (uint power) {
-    if (exponent == 0)
-        return 1;
-    power = exp(base, exponent / 2);
-    power *= power;
-    if (exponent & 1 == 1)
-        power *= base;
-}
-
-contract C {
-  function g(uint base, uint exponent) public pure returns (uint) {
-      return exp(base, exponent);
-  }
-}
-// ----
-// g(uint256,uint256): 0, 0 -> 1
-// g(uint256,uint256): 0, 1 -> 0x00
-// g(uint256,uint256): 1, 0 -> 1
-// g(uint256,uint256): 2, 3 -> 8
-// g(uint256,uint256): 3, 10 -> 59049
-// g(uint256,uint256): 2, 255 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
diff --git a/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol b/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
deleted file mode 100644
index 3633fa957388..000000000000
--- a/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint[] data;
-    function f(uint x, uint[] calldata input) public returns (uint, uint) {
-        data.push(x);
-        (uint a, uint[] calldata b) = fun(input, data);
-        return (a, b[1]);
-
-    }
-}
-
-function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[] calldata) {
-	return (_y[0], _x);
-}
-// ----
-// f(uint256,uint256[]): 7, 0x40, 3, 8, 9, 10 -> 7, 9
diff --git a/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol b/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
deleted file mode 100644
index 4dbfe91f107f..000000000000
--- a/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract test {
-    function f(uint256[] calldata seq) external pure returns (uint256) {
-        uint i = 0;
-        uint sum = 0;
-        while (i < seq.length)
-        {
-            uint idx = i;
-            if (idx >= 10) break;
-            uint x = seq[idx];
-            if (x >= 1000) {
-                uint n = i + 1;
-                i = n;
-                continue;
-            }
-            else {
-                uint y = sum + x;
-                sum = y;
-            }
-            if (sum >= 500) return sum;
-            i++;
-        }
-        return sum;
-    }
-}
-// ----
-// f(uint256[]): 32, 3, 1000, 1, 2 -> 3
-// f(uint256[]): 32, 3, 100, 500, 300 -> 600
-// f(uint256[]): 32, 11, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 111 -> 55
diff --git a/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol b/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
deleted file mode 100644
index 17b6f74c8739..000000000000
--- a/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (bool) {
-        (bool success, ) = address(1).call("");
-        return success;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
deleted file mode 100644
index 023133a49f32..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    function g(function() internal returns (uint) _t) internal returns (uint) { return _t(); }
-}
-contract C {
-    using L for *;
-    function f() public returns (uint) {
-        return t.g();
-    }
-    function t() public pure returns (uint)  { return 7; }
-}
-// ----
-// library: L
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
deleted file mode 100644
index 5a599c8a5707..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-contract C {
-    using D for D.s;
-    D.s public x;
-    function f(uint a) public returns (uint) {
-        x.a = 6;
-        return (x.mul)({x: a});
-    }
-}
-// ----
-// library: D
-// f(uint256): 7 -> 0x2a
-// x() -> 0x2a
diff --git a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
deleted file mode 100644
index d2d23fb626d5..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library D { function length(string memory self) public returns (uint) { return bytes(self).length; } }
-contract C {
-    using D for string;
-    string x;
-    function f() public returns (uint) {
-        x = "abc";
-        return x.length();
-    }
-    function g() public returns (uint) {
-        string memory s = "abc";
-        return s.length();
-    }
-}
-// ----
-// library: D
-// f() -> 3
-// g() -> 3
diff --git a/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
deleted file mode 100644
index a00628eaf108..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract test {
-    function f0() public returns (uint) {
-        return 2;
-    }
-
-    function f1() internal returns (function() internal returns (uint)) {
-        return f0;
-    }
-
-    function f2() internal returns (function() internal returns (function () internal returns (uint))) {
-        return f1;
-    }
-
-    function f3() internal returns (function() internal returns (function () internal returns (function () internal returns (uint)))) {
-        return f2;
-    }
-
-    function f() public returns (uint) {
-        function() internal returns(function() internal returns(function() internal returns(function() internal returns(uint)))) x;
-        x = f3;
-        return x()()()();
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
deleted file mode 100644
index b43c453d2378..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    bool public flag = false;
-
-    function f0() public {
-        flag = true;
-    }
-
-    function f() public returns (bool) {
-        function() internal x = f0;
-        x();
-        return flag;
-    }
-}
-// ----
-// f() -> true
-// flag() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol b/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
deleted file mode 100644
index 0b880bfd1b8a..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function foo() internal returns (uint) {
-        return 42;
-    }
-
-    function get_ptr(function() internal returns (uint) ptr) internal returns(function() internal returns (uint)) {
-        return ptr;
-    }
-
-    function associated() public returns (uint) {
-        // This expression directly references function definition
-        return (foo)();
-    }
-
-    function unassociated() public returns (uint) {
-        // This expression is not associated with a specific function definition
-        return (get_ptr(foo))();
-    }
-}
-// ----
-// associated() -> 42
-// unassociated() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol b/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
deleted file mode 100644
index a93adf2456df..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function m(
-        function() external returns (uint) a,
-        function() external returns (uint) b
-    ) internal returns (function() external returns (uint)) {
-        return a;
-    }
-
-    function s(uint a, uint b) internal returns (uint) {
-        return a + b;
-    }
-
-    function foo() external returns (uint) {
-        return 6;
-    }
-
-    function test() public returns (uint) {
-        function(uint, uint) internal returns (uint) single_slot_function = s;
-
-        function(
-            function() external returns (uint),
-            function() external returns (uint)
-        ) internal returns (function() external returns (uint)) multi_slot_function = m;
-
-        return multi_slot_function(this.foo, this.foo)() + single_slot_function(5, 1);
-    }
-}
-// ----
-// test() -> 12
diff --git a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
deleted file mode 100644
index b9eb6ca42892..000000000000
--- a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(uint x) external payable returns (uint) { return 1; }
-    function f(uint x, uint y) external payable returns (uint) { return 2; }
-    function call() public payable returns (uint v, uint x, uint y, uint z) {
-        v = this.f{value: 10}(2);
-        x = this.f{gas: 10000}(2, 3);
-        y = this.f{gas: 10000, value: 10}(2, 3);
-        z = this.f{value: 10, gas: 10000}(2, 3);
-    }
-    function bal() external returns (uint) { return address(this).balance; }
-    receive() external payable {}
-}
-// ----
-// (), 1 ether
-// call() -> 1, 2, 2, 2
-// bal() -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol b/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
deleted file mode 100644
index 229618384d1e..000000000000
--- a/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-abstract contract D {
-    function g() public virtual;
-}
-
-
-contract C {
-    D d = D(address(0x1212));
-
-    function f() public returns (uint256) {
-        d.g();
-        return 7;
-    }
-
-    function g() public returns (uint256) {
-        d.g{gas: 200}();
-        return 7;
-    }
-
-    function h() public returns (uint256) {
-        address(d).call(""); // this does not throw (low-level)
-        return 7;
-    }
-}
-// ----
-// f() -> FAILURE
-// g() -> FAILURE
-// h() -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol b/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
deleted file mode 100644
index 9b008f12f2d9..000000000000
--- a/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract collatz {
-    function run(uint x) public returns(uint y) {
-        while ((y = x) > 1) {
-            if (x % 2 == 0) x = evenStep(x);
-            else x = oddStep(x);
-        }
-    }
-    function evenStep(uint x) public returns(uint y) {
-        return x / 2;
-    }
-    function oddStep(uint x) public returns(uint y) {
-        return 3 * x + 1;
-    }
-}
-// ----
-// run(uint256): 0 -> 0
-// run(uint256): 1 -> 1
-// run(uint256): 2 -> 1
-// run(uint256): 8 -> 1
-// run(uint256): 127 -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
deleted file mode 100644
index 701b1f51a3d4..000000000000
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function intern() public returns (uint256) {
-        function (uint) internal returns (uint) x;
-        x(2);
-        return 7;
-    }
-
-    function extern() public returns (uint256) {
-        function (uint) external returns (uint) x;
-        x(2);
-        return 7;
-    }
-}
-// ----
-// intern() -> FAILURE, hex"4e487b71", 0x51 # This should throw exceptions #
-// extern() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
deleted file mode 100644
index aa455afcf885..000000000000
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function() returns (uint256) internal x;
-    int256 mutex;
-
-    function t() public returns (uint256) {
-        if (mutex > 0) {
-            assembly {
-                mstore(0, 7)
-                return(0, 0x20)
-            }
-        }
-        mutex = 1;
-        // Avoid re-executing this function if we jump somewhere.
-        x();
-        return 2;
-    }
-}
-// ----
-// t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
deleted file mode 100644
index d83fab85222c..000000000000
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    int256 mutex;
-
-    function t() public returns (uint256) {
-        if (mutex > 0) {
-            assembly {
-                mstore(0, 7)
-                return(0, 0x20)
-            }
-        }
-        mutex = 1;
-        // Avoid re-executing this function if we jump somewhere.
-        function() internal returns (uint)[200] memory x;
-        x[0]();
-        return 2;
-    }
-}
-// ----
-// t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol b/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
deleted file mode 100644
index f5996d32ca9d..000000000000
--- a/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function g(int x, int y) public pure returns (int) { return x - y; }
-    function h(int y, int x) public pure returns (int) { return y - x; }
-
-    function f() public pure returns (int) {
-        return (false ? g : h)(2, 1);
-    }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
deleted file mode 100644
index b6a33fb7e835..000000000000
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint public i;
-    constructor() {
-        i = 2;
-    }
-}
-contract D {
-    function f() public returns (uint r) {
-        return new C().i();
-    }
-}
-// ----
-// f() -> 2
-// gas legacy: 100185
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
deleted file mode 100644
index 39592f4a4882..000000000000
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    uint public i;
-    constructor(uint newI) {
-        i = newI;
-    }
-}
-contract D {
-    C c;
-    constructor(uint v) {
-        c = new C(v);
-    }
-    function f() public returns (uint r) {
-        return c.i();
-    }
-}
-// ----
-// constructor(): 2 ->
-// gas irOptimized: 192703
-// gas legacy: 241234
-// gas legacyOptimized: 192961
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
deleted file mode 100644
index 3850a0be7fd6..000000000000
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    uint public i;
-    constructor(uint newI) {
-        i = newI;
-    }
-}
-contract D {
-    C c;
-    constructor(uint v) {
-        c = new C{salt: "abc"}(v);
-    }
-    function f() public returns (uint r) {
-        return c.i();
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// constructor(): 2 ->
-// gas irOptimized: 192866
-// gas legacy: 241606
-// gas legacyOptimized: 193193
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol b/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol
deleted file mode 100644
index 1e6d542cfcc9..000000000000
--- a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    uint256 value;
-
-    function set(uint256 _value) external {
-        value = _value;
-    }
-
-    function get() external view returns (uint256) {
-        return value;
-    }
-
-    function get_delegated() external returns (bool, bytes memory) {
-        return address(this).delegatecall(abi.encodeWithSignature("get()"));
-    }
-
-    function assert0() external view {
-        assert(value == 0);
-    }
-
-    function assert0_delegated() external returns (bool, bytes memory) {
-        return address(this).delegatecall(abi.encodeWithSignature("assert0()"));
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// get() -> 0x00
-// assert0_delegated() -> 0x01, 0x40, 0x0
-// get_delegated() -> 0x01, 0x40, 0x20, 0x0
-// set(uint256): 0x01 ->
-// get() -> 0x01
-// assert0_delegated() -> 0x00, 0x40, 0x24, 0x4e487b7100000000000000000000000000000000000000000000000000000000, 0x0100000000000000000000000000000000000000000000000000000000
-// get_delegated() -> 0x01, 0x40, 0x20, 0x1
-// set(uint256): 0x2a ->
-// get() -> 0x2a
-// assert0_delegated() -> 0x00, 0x40, 0x24, 0x4e487b7100000000000000000000000000000000000000000000000000000000, 0x0100000000000000000000000000000000000000000000000000000000
-// get_delegated() -> 0x01, 0x40, 0x20, 0x2a
diff --git a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol b/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol
deleted file mode 100644
index 498449d17d1b..000000000000
--- a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    uint256 value;
-
-    function set(uint256 _value) external {
-        value = _value;
-    }
-
-    function get() external view returns (uint256) {
-        return value;
-    }
-
-    function get_delegated() external returns (bool) {
-        (bool success,) = address(this).delegatecall(abi.encodeWithSignature("get()"));
-        return success;
-    }
-
-    function assert0() external view {
-        assert(value == 0);
-    }
-
-    function assert0_delegated() external returns (bool) {
-        (bool success,) = address(this).delegatecall(abi.encodeWithSignature("assert0()"));
-        return success;
-    }
-}
-// ====
-// EVMVersion: <byzantium
-// ----
-// get() -> 0x00
-// assert0_delegated() -> true
-// get_delegated() -> true
-// set(uint256): 0x01 ->
-// get() -> 0x01
-// assert0_delegated() -> false
-// get_delegated() -> true
-// set(uint256): 0x2a ->
-// get() -> 0x2a
-// assert0_delegated() -> false
-// get_delegated() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol b/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
deleted file mode 100644
index f15d2201da31..000000000000
--- a/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function a(uint a, uint b, uint c) public returns (uint r) { r = a * 100 + b * 10 + c * 1; }
-    function b() public returns (uint r) { r = a({c: 3, a: 1, b: 2}); }
-}
-// ----
-// b() -> 123
diff --git a/test/libsolidity/semanticTests/functionCall/external_call.sol b/test/libsolidity/semanticTests/functionCall/external_call.sol
deleted file mode 100644
index 9189d5cc7872..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_call.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma solidity >= 0.6.0;
-
-contract C {
-    function g(uint n) external pure returns (uint) {
-        return n + 1;
-    }
-
-    function f(uint n) public view returns (uint) {
-        return this.g(2 * n);
-    }
-}
-// ----
-// g(uint256): 4 -> 5
-// f(uint256): 2 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
deleted file mode 100644
index 6f7f020fe678..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-// This tests skipping the extcodesize check.
-
-contract T {
-    constructor() { this.f(); }
-    function f() external {}
-}
-contract U {
-    constructor() { this.f(); }
-    function f() external returns (uint) {}
-}
-
-contract C {
-    function f(uint c) external returns (uint) {
-        if (c == 0) new T();
-        else if (c == 1) new U();
-        return 1 + c;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(uint256): 0 -> FAILURE
-// f(uint256): 1 -> FAILURE
-// f(uint256): 2 -> 3
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol b/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
deleted file mode 100644
index 80ca6cc41e61..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma solidity >= 0.6.0;
-
-contract C {
-    function d(uint n) external pure returns (uint[] memory) {
-        uint[] memory data = new uint[](n);
-        for (uint i = 0; i < data.length; ++i)
-            data[i] = i;
-        return data;
-    }
-
-    function dt(uint n) public view returns (uint) {
-        uint[] memory data = this.d(n);
-        uint sum = 0;
-        for (uint i = 0; i < data.length; ++i)
-            sum += data[i];
-        return sum;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// dt(uint256): 4 -> 6
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
deleted file mode 100644
index a1c74cf89838..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-// This tests skipping the extcodesize check.
-
-interface I {
-    function a() external pure;
-    function b() external;
-    function c() external payable;
-    function x() external returns (uint);
-    function y() external returns (string memory);
-}
-contract C {
-    I i = I(address(0xcafecafe));
-    constructor() payable {}
-    function f(uint c) external returns (uint) {
-        if (c == 0) i.a();
-        else if (c == 1) i.b();
-        else if (c == 2) i.c();
-        else if (c == 3) i.c{value: 1}();
-        else if (c == 4) i.x();
-        else if (c == 5) i.y();
-        return 1 + c;
-    }
-}
-// ----
-// constructor(), 1 ether ->
-// gas irOptimized: 262355
-// gas legacy: 441442
-// gas legacyOptimized: 292862
-// f(uint256): 0 -> FAILURE
-// f(uint256): 1 -> FAILURE
-// f(uint256): 2 -> FAILURE
-// f(uint256): 3 -> FAILURE
-// f(uint256): 4 -> FAILURE
-// f(uint256): 5 -> FAILURE
-// f(uint256): 6 -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
deleted file mode 100644
index 96f097ce7f4a..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-// This tests skipping the extcodesize check.
-
-interface I {
-    function a() external pure;
-    function b() external;
-    function c() external payable;
-    function x() external returns (uint);
-    function y() external returns (string memory);
-}
-contract C {
-    I i = I(address(0xcafecafe));
-    constructor() payable {}
-    function f(uint c) external returns (uint) {
-        if (c == 0) i.a();
-        else if (c == 1) i.b();
-        else if (c == 2) i.c();
-        else if (c == 3) i.c{value: 1}();
-        else if (c == 4) i.x();
-        else if (c == 5) i.y();
-        return 1 + c;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// constructor(), 1 ether ->
-// gas irOptimized: 390464
-// gas legacy: 809985
-// gas legacyOptimized: 498331
-// f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
-// f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
-// f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
-// f(uint256): 3 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
-// f(uint256): 4 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
-// f(uint256): 5 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
-// f(uint256): 6 -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_value.sol b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
deleted file mode 100644
index 9639c1119a4d..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_call_value.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma solidity >= 0.6.0;
-
-contract C {
-    function g(uint n) external payable returns (uint, uint) {
-        return (msg.value * 1000, n);
-    }
-
-    function f(uint n) public payable returns (uint, uint) {
-        return this.g{value: 10}(n);
-    }
-}
-// ----
-// g(uint256), 1 ether: 4 -> 1000000000000000000000, 4
-// f(uint256), 11 ether: 2 -> 10000, 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_function.sol b/test/libsolidity/semanticTests/functionCall/external_function.sol
deleted file mode 100644
index 284bad09885d..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract c {
-    function f(uint256 a) public returns (uint256) {
-        return a;
-    }
-
-    function test(uint256 a, uint256 b)
-        external
-        returns (uint256 r_a, uint256 r_b)
-    {
-        r_a = f(a + 7);
-        r_b = b;
-    }
-}
-// ----
-// test(uint256,uint256): 2, 3 -> 9, 3
diff --git a/test/libsolidity/semanticTests/functionCall/external_public_override.sol b/test/libsolidity/semanticTests/functionCall/external_public_override.sol
deleted file mode 100644
index 8e34a5b22362..000000000000
--- a/test/libsolidity/semanticTests/functionCall/external_public_override.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-    function f() external virtual returns (uint256) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() public override returns (uint256) {
-        return 2;
-    }
-
-    function g() public returns (uint256) {
-        return f();
-    }
-}
-// ----
-// f() -> 2
-// g() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
deleted file mode 100644
index 091e5a77a62a..000000000000
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract D { constructor() payable {} }
-contract C {
-	uint public x;
-	constructor() payable {}
-	function f(uint amount) public returns (D) {
-		x++;
-		return (new D){value: amount}();
-	}
-	function stack(uint depth) public payable returns (address) {
-		if (depth > 0)
-			return this.stack(depth - 1);
-		else
-			return address(f(0));
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// constructor(), 20 wei
-// gas irOptimized: 166148
-// gas legacy: 285547
-// gas legacyOptimized: 168515
-// f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// x() -> 1
-// f(uint256): 20 -> FAILURE
-// x() -> 1
-// stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 252410
-// gas legacy: 477722
-// gas legacyOptimized: 299567
-// x() -> 1
-// stack(uint256): 10 -> 0x87948bd7ebbe13a00bfd930c93e4828ab18e3908
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol b/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
deleted file mode 100644
index 7013a63527e9..000000000000
--- a/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: a.sol ====
-function f(uint) pure returns (uint) { return 7; }
-function f(bytes memory x) pure returns (uint) { return x.length; }
-==== Source: b.sol ====
-import "a.sol" as M;
-contract C {
-    function f() public pure returns (uint, uint) {
-        return (M.f(2), M.f("abc"));
-
-    }
-}
-// ----
-// f() -> 7, 3
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
deleted file mode 100644
index 79a829aa77ba..000000000000
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract helper {
-    bool flag;
-
-    function getBalance() public payable returns (uint256 myBalance) {
-        return address(this).balance;
-    }
-
-    function setFlag() public {
-        flag = true;
-    }
-
-    function getFlag() public returns (bool fl) {
-        return flag;
-    }
-}
-
-
-contract test {
-    helper h;
-
-    constructor() payable {
-        h = new helper();
-    }
-
-    function sendAmount(uint256 amount) public payable returns (uint256 bal) {
-        return h.getBalance{value: amount}();
-    }
-
-    function outOfGas() public returns (bool ret) {
-        h.setFlag{gas: 2}(); // should fail due to OOG
-        return true;
-    }
-
-    function checkState() public returns (bool flagAfter, uint256 myBal) {
-        flagAfter = h.getFlag();
-        myBal = address(this).balance;
-    }
-}
-// ----
-// constructor(), 20 wei ->
-// gas irOptimized: 252642
-// gas legacy: 391588
-// gas legacyOptimized: 268089
-// sendAmount(uint256): 5 -> 5
-// outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
-// checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
deleted file mode 100644
index 71b6ebb2c7a3..000000000000
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-contract helper {
-    bool flag;
-
-    function getBalance() payable public returns(uint256 myBalance) {
-        return address(this).balance;
-    }
-
-    function setFlag() public {
-        flag = true;
-    }
-
-    function getFlag() public returns(bool fl) {
-        return flag;
-    }
-}
-contract test {
-    helper h;
-    constructor() payable {
-        h = new helper();
-    }
-
-    function sendAmount(uint amount) public payable returns(uint256 bal) {
-        return h.getBalance{value: amount}();
-    }
-
-    function outOfGas() public returns(bool ret) {
-        h.setFlag {
-            gas: 2
-        }(); // should fail due to OOG
-        return true;
-    }
-
-    function checkState() public returns(bool flagAfter, uint myBal) {
-        flagAfter = h.getFlag();
-        myBal = address(this).balance;
-    }
-}
-// ----
-// constructor(), 20 wei ->
-// gas irOptimized: 252642
-// gas legacy: 391588
-// gas legacyOptimized: 268089
-// sendAmount(uint256): 5 -> 5
-// outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
-// checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol b/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
deleted file mode 100644
index adf1200eedec..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract BaseBase {
-	uint public x;
-	uint public y;
-	function init(uint a, uint b) public virtual {
-		x = b;
-		y = a;
-	}
-	function init(uint a) public virtual {
-		x = a + 1;
-	}
-}
-
-contract Base is BaseBase {
-	function init(uint a, uint b) public override {
-		x = a;
-		y = b;
-	}
-	function init(uint a) public override {
-		x = a;
-	}
-}
-
-contract Child is Base {
-	function cInit(uint c) public {
-		Base.init(c);
-	}
-	function cInit(uint c, uint d) public {
-		Base.init(c, d);
-	}
-	function bInit(uint c) public {
-		BaseBase.init(c);
-	}
-	function bInit(uint c, uint d) public {
-		BaseBase.init(c, d);
-	}
-}
-// ----
-// x() -> 0
-// y() -> 0
-// cInit(uint256): 2 ->
-// x() -> 2
-// y() -> 0
-// cInit(uint256,uint256): 3, 3 ->
-// x() -> 3
-// y() -> 3
-// bInit(uint256): 4 ->
-// x() -> 5
-// bInit(uint256,uint256): 9, 10 ->
-// x() -> 10
-// y() -> 9
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol b/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
deleted file mode 100644
index 924431ec53f5..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract Base {
-	uint public x;
-	uint public y;
-	function init(uint a, uint b) public {
-		x = a;
-		y = b;
-	}
-	function init(uint a) public {
-		x = a;
-	}
-}
-
-contract Child is Base {
-	function cInit(uint c) public {
-		Base.init(c);
-	}
-	function cInit(uint c, uint d) public {
-		Base.init(c, d);
-	}
-}
-// ----
-// x() -> 0
-// y() -> 0
-// cInit(uint256): 2 ->
-// x() -> 2
-// y() -> 0
-// cInit(uint256,uint256): 3, 3 ->
-// x() -> 3
-// y() -> 3
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
deleted file mode 100644
index 8f0e93ddbeb5..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Base {
-	function f(uint n) public returns (uint) {
-		return 2 * n;
-	}
-}
-
-contract Child is Base {
-	function g(uint n) public returns (uint) {
-		return f(n);
-	}
-}
-// ----
-// g(uint256): 4 -> 8
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
deleted file mode 100644
index 8578a6707acc..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract BaseBase {
-	function f(uint n) public virtual returns (uint) {
-		return 2 * n;
-	}
-	function s(uint n) public returns (uint) {
-		return 4 * n;
-	}
-}
-
-contract Base is BaseBase {
-	function f(uint n) public virtual override returns (uint) {
-		return 3 * n;
-	}
-}
-
-contract Child is Base {
-	function g(uint n) public returns (uint) {
-		return f(n);
-	}
-
-	function h(uint n) public returns (uint) {
-		return s(n);
-	}
-}
-// ----
-// g(uint256): 4 -> 12
-// h(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
deleted file mode 100644
index f327b3f28e3a..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract BaseBase {
-	function f(uint n) public virtual returns (uint) {
-		return 2 * n;
-	}
-
-	function s(uint n) public returns (uint) {
-		return 4 * n;
-	}
-}
-
-contract Base is BaseBase {
-	function f(uint n) public virtual override returns (uint) {
-		return 3 * n;
-	}
-}
-
-contract Child is Base {
-	function g(uint n) public returns (uint) {
-		// calling base-bse function of a virtual overridden function.
-		return BaseBase.f(n);
-	}
-
-	function k(uint n) public returns (uint) {
-		// Calling base-base function of a non-virtual function.
-		return BaseBase.s(n);
-	}
-}
-// ----
-// g(uint256): 4 -> 8
-// k(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
deleted file mode 100644
index 0a0cf465f03d..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Base {
-	function f(uint n) public returns (uint) {
-		return 2 * n;
-	}
-}
-
-contract Child is Base {
-	function g(uint n) public returns (uint) {
-		return Base.f(n);
-	}
-}
-// ----
-// g(uint256): 4 -> 8
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
deleted file mode 100644
index 21ab22e0bc63..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-abstract contract I
-{
-    function a() internal view virtual returns(uint256);
-}
-abstract contract J is I
-{
-    function a() internal view virtual override returns(uint256);
-}
-abstract contract V is J
-{
-    function b() public view returns(uint256) { return a(); }
-}
-contract C is V
-{
-    function a() internal view override returns (uint256) { return 42; }
-}
-// ----
-// b() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
deleted file mode 100644
index 20774d692668..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-    function f() public virtual returns (uint) {
-        return 42;
-    }
-}
-
-abstract contract I {
-    function f() external virtual returns (uint);
-}
-
-contract B is A, I {
-    function f() override(A, I) public returns (uint) {
-        // I.f() is before A.f() in the C3 linearized order
-        // but it has no implementation.
-        return super.f();
-    }
-}
-// ----
-// f() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
deleted file mode 100644
index f5f0561334fe..000000000000
--- a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-    function f() public virtual returns (uint) {
-        return 42;
-    }
-}
-
-interface I {
-    function f() external returns (uint);
-}
-
-contract B is A, I {
-    function f() override(A, I) public returns (uint) {
-        // I.f() is before A.f() in the C3 linearized order
-        // but it has no implementation.
-        return super.f();
-    }
-}
-// ----
-// f() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
deleted file mode 100644
index 28c1822d77b7..000000000000
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract test {
-    mapping(uint8 => uint8)[2] a;
-    mapping(uint8 => uint8)[2] b;
-    function set_internal(mapping(uint8 => uint8)[2] storage m, uint8 key, uint8 value1, uint8 value2) internal returns (uint8, uint8) {
-        uint8 oldValue1 = m[0][key];
-        uint8 oldValue2 = m[1][key];
-        m[0][key] = value1;
-        m[1][key] = value2;
-        return (oldValue1, oldValue2);
-    }
-    function set(uint8 key, uint8 value_a1, uint8 value_a2, uint8 value_b1, uint8 value_b2) public returns (uint8 old_a1, uint8 old_a2, uint8 old_b1, uint8 old_b2) {
-        (old_a1, old_a2) = set_internal(a, key, value_a1, value_a2);
-        (old_b1, old_b2) = set_internal(b, key, value_b1, value_b2);
-    }
-    function get(uint8 key) public returns (uint8, uint8, uint8, uint8) {
-        return (a[0][key], a[1][key], b[0][key], b[1][key]);
-    }
-}
-// ----
-// set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111628
-// gas legacy: 113748
-// gas legacyOptimized: 111772
-// get(uint8): 1 -> 21, 22, 42, 43
-// set(uint8,uint8,uint8,uint8,uint8): 1, 10, 30, 11, 31 -> 21, 22, 42, 43
-// get(uint8): 1 -> 10, 30, 11, 31
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
deleted file mode 100644
index 728be2c09c7c..000000000000
--- a/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract test {
-    mapping(uint8 => uint8) a;
-    mapping(uint8 => uint8) b;
-    function set_internal(mapping(uint8 => uint8) storage m, uint8 key, uint8 value) internal returns (uint8) {
-        uint8 oldValue = m[key];
-        m[key] = value;
-        return oldValue;
-    }
-    function set(uint8 key, uint8 value_a, uint8 value_b) public returns (uint8 old_a, uint8 old_b) {
-        old_a = set_internal(a, key, value_a);
-        old_b = set_internal(b, key, value_b);
-    }
-    function get(uint8 key) public returns (uint8, uint8) {
-        return (a[key], b[key]);
-    }
-}
-// ----
-// set(uint8,uint8,uint8): 1, 21, 42 -> 0, 0
-// get(uint8): 1 -> 21, 42
-// set(uint8,uint8,uint8): 1, 10, 11 -> 21, 42
-// get(uint8): 1 -> 10, 11
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol b/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
deleted file mode 100644
index 7756a92b10c9..000000000000
--- a/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract test {
-    mapping(uint8 => uint8) a;
-    mapping(uint8 => uint8) b;
-    function f() internal returns (mapping(uint8 => uint8) storage r) {
-        r = a;
-        r[1] = 42;
-        r = b;
-        r[1] = 84;
-    }
-    function g() public returns (uint8, uint8, uint8, uint8, uint8, uint8) {
-        f()[2] = 21;
-        return (a[0], a[1], a[2], b[0], b[1], b[2]);
-    }
-    function h() public returns (uint8, uint8, uint8, uint8, uint8, uint8) {
-        mapping(uint8 => uint8) storage m = f();
-        m[2] = 17;
-        return (a[0], a[1], a[2], b[0], b[1], b[2]);
-    }
-}
-// ----
-// g() -> 0, 42, 0, 0, 84, 21
-// h() -> 0, 42, 0, 0, 84, 17
diff --git a/test/libsolidity/semanticTests/functionCall/member_accessors.sol b/test/libsolidity/semanticTests/functionCall/member_accessors.sol
deleted file mode 100644
index ae5eab6d11b3..000000000000
--- a/test/libsolidity/semanticTests/functionCall/member_accessors.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract test {
-    uint256 public data;
-    bytes6 public name;
-    bytes32 public a_hash;
-    address public an_address;
-    constructor() {
-        data = 8;
-        name = "Celina";
-        a_hash = keccak256("\x7b");
-        an_address = address(0x1337);
-        super_secret_data = 42;
-    }
-    uint256 super_secret_data;
-}
-// ====
-// allowNonExistingFunctions: true
-// ----
-// data() -> 8
-// name() -> "Celina"
-// a_hash() -> 0xa91eddf639b0b768929589c1a9fd21dcb0107199bdd82e55c5348018a1572f52
-// an_address() -> 0x1337
-// super_secret_data() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/multiple_functions.sol b/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
deleted file mode 100644
index 3c60a13f11cf..000000000000
--- a/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    function a() public returns(uint n) { return 0; }
-    function b() public returns(uint n) { return 1; }
-    function c() public returns(uint n) { return 2; }
-    function f() public returns(uint n) { return 3; }
-}
-// ====
-// allowNonExistingFunctions: true
-// ----
-// a() -> 0
-// b() -> 1
-// c() -> 2
-// f() -> 3
-// i_am_not_there() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol b/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
deleted file mode 100644
index cb2a8a0c0395..000000000000
--- a/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function run(bool x1, uint x2) public returns(uint y1, bool y2, uint y3) {
-        y1 = x2; y2 = x1;
-    }
-}
-// ----
-// run(bool,uint256): true, 0xcd -> 0xcd, true, 0
diff --git a/test/libsolidity/semanticTests/functionCall/named_args.sol b/test/libsolidity/semanticTests/functionCall/named_args.sol
deleted file mode 100644
index 706f6d94dc6a..000000000000
--- a/test/libsolidity/semanticTests/functionCall/named_args.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function a(uint a, uint b, uint c) public returns (uint r) { r = a * 100 + b * 10 + c * 1; }
-    function b() public returns (uint r) { r = a({a: 1, b: 2, c: 3}); }
-    function c() public returns (uint r) { r = a({b: 2, c: 3, a: 1}); }
-}
-// ----
-// b() -> 123
-// c() -> 123
diff --git a/test/libsolidity/semanticTests/functionCall/named_args_overload.sol b/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
deleted file mode 100644
index 65f34d8ff6d7..000000000000
--- a/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return 0;
-    }
-    function f(uint a) public returns (uint) {
-        return a;
-    }
-    function f(uint a, uint b) public returns (uint) {
-        return a+b;
-    }
-    function f(uint a, uint b, uint c) public returns (uint) {
-        return a+b+c;
-    }
-    function call(uint num) public returns (uint256) {
-        if (num == 0)
-            return f();
-        if (num == 1)
-            return f({a: 1});
-        if (num == 2)
-            return f({b: 1, a: 2});
-        if (num == 3)
-            return f({c: 1, a: 2, b: 3});
-        if (num == 4)
-            return f({b: 5, c: 1, a: 2});
-
-        return 500;
-    }
-}
-// ----
-// call(uint256): 0 -> 0
-// call(uint256): 1 -> 1
-// call(uint256): 2 -> 3
-// call(uint256): 3 -> 6
-// call(uint256): 4 -> 8
-// call(uint256): 5 -> 500
diff --git a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
deleted file mode 100644
index beda5f9b189c..000000000000
--- a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-interface Identity {
-    function selectorAndAppendValue(uint value) external pure returns (uint);
-}
-interface ReturnMoreData {
-    function f(uint value) external pure returns (uint, uint, uint);
-}
-contract C {
-    Identity constant i = Identity(address(0x0004));
-    function testHighLevel() external pure returns (bool) {
-        // Works because the extcodesize check is skipped
-        // and the precompiled contract returns actual data.
-        i.selectorAndAppendValue(5);
-        return true;
-    }
-    function testHighLevel2() external pure returns (uint, uint, uint) {
-        // Fails because the identity contract does not return enough data.
-        return ReturnMoreData(address(4)).f(2);
-    }
-    function testLowLevel() external view returns (uint value) {
-        (bool success, bytes memory ret) =
-            address(4).staticcall(
-                abi.encodeWithSelector(Identity.selectorAndAppendValue.selector, uint(5))
-            );
-        value = abi.decode(ret, (uint));
-    }
-
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// testHighLevel() -> true
-// testLowLevel() -> 0xc76596d400000000000000000000000000000000000000000000000000000000
-// testHighLevel2() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol b/test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol
deleted file mode 100644
index c7a1d12bf9d6..000000000000
--- a/test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-interface ShortReturn {
-    function f() external pure returns (bytes32);
-}
-contract LongReturn {
-    function f() external pure returns (uint[20] memory) {}
-}
-
-contract Test {
-    function test() public returns (uint) {
-        LongReturn longReturn = new LongReturn();
-        uint freeMemoryBefore;
-        assembly {
-            freeMemoryBefore := mload(0x40)
-        }
-
-        ShortReturn(address(longReturn)).f();
-
-        uint freeMemoryAfter;
-
-        assembly {
-            freeMemoryAfter := mload(0x40)
-        }
-
-        return freeMemoryAfter - freeMemoryBefore;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test() -> 0x20
-// gas legacy: 131966
diff --git a/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol b/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol
deleted file mode 100644
index 5f39b877eb69..000000000000
--- a/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-interface LongReturn {
-    function f() external pure returns (uint[20] memory);
-}
-contract ShortReturn {
-    function f() external pure returns (bytes32) {}
-}
-
-contract Test {
-    function test() public returns (uint) {
-        ShortReturn shortReturn = new ShortReturn();
-        uint freeMemoryBefore;
-        assembly {
-            freeMemoryBefore := mload(0x40)
-        }
-
-        LongReturn(address(shortReturn)).f();
-
-        uint freeMemoryAfter;
-
-        assembly {
-            freeMemoryAfter := mload(0x40)
-        }
-
-        return freeMemoryAfter - freeMemoryBefore;
-    }
-}
-// ====
-// EVMVersion: <=homestead
-// compileViaYul: true
-// ----
-// test() -> 0x0500
-// gas legacy: 131966
diff --git a/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol b/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol
deleted file mode 100644
index 2258322755a8..000000000000
--- a/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-interface LongReturn {
-    function f() external pure returns (uint[20] memory);
-}
-contract ShortReturn {
-    function f() external pure returns (bytes32) {}
-}
-
-contract Test {
-    function test() public returns (uint) {
-        ShortReturn shortReturn = new ShortReturn();
-        uint freeMemoryBefore;
-        assembly {
-            freeMemoryBefore := mload(0x40)
-        }
-
-        // This reverts. The external call succeeds but ABI decoding fails due to the returned
-        // `bytes32` being much shorter than the expected `uint[20]`.
-        LongReturn(address(shortReturn)).f();
-
-        uint freeMemoryAfter;
-
-        assembly {
-            freeMemoryAfter := mload(0x40)
-        }
-
-        return freeMemoryAfter - freeMemoryBefore;
-    }
-}
-// ====
-// EVMVersion: >homestead
-// compileViaYul: true
-// ----
-// test() -> FAILURE
-// gas legacy: 131966
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
deleted file mode 100644
index 18a19979295b..000000000000
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// Sending zero ether to a contract should still invoke the receive ether function
-// (it previously did not because the gas stipend was not provided by the EVM)
-contract Receiver {
-    receive() external payable {}
-}
-
-
-contract Main {
-    constructor() payable {}
-
-    function s() public returns (bool) {
-        Receiver r = new Receiver();
-        return payable(r).send(0);
-    }
-}
-// ----
-// constructor(), 20 wei ->
-// gas irOptimized: 100264
-// gas legacy: 113411
-// gas legacyOptimized: 100361
-// s() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/transaction_status.sol b/test/libsolidity/semanticTests/functionCall/transaction_status.sol
deleted file mode 100644
index caa538deec4b..000000000000
--- a/test/libsolidity/semanticTests/functionCall/transaction_status.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-	function f() public { }
-	function g() public { revert(); }
-	function h() public { assert(false); }
-}
-// ----
-// f() ->
-// g() -> FAILURE
-// h() -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/functionCall/value_test.sol b/test/libsolidity/semanticTests/functionCall/value_test.sol
deleted file mode 100644
index a6fea6a50b50..000000000000
--- a/test/libsolidity/semanticTests/functionCall/value_test.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f() public payable returns (uint) {
-		return msg.value;
-	}
-}
-// ----
-// f(), 1 ether -> 1000000000000000000
-// f(), 1 wei -> 1
diff --git a/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol b/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
deleted file mode 100644
index 0a9e6d3ffd14..000000000000
--- a/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-    function f() external {}
-    function g(uint256) external {}
-}
-contract B {
-    function f() external returns (uint256) {}
-    function g(uint256) external returns (uint256) {}
-}
-contract C {
-    function test1() external returns(bytes4, bytes4, bytes4, bytes4) {
-        return (A.f.selector, A.g.selector, B.f.selector, B.g.selector);
-    }
-    function test2() external returns(bytes4, bytes4, bytes4, bytes4) {
-        A a; B b;
-        return (a.f.selector, a.g.selector, b.f.selector, b.g.selector);
-    }
-}
-// ----
-// test1() -> left(0x26121ff0), left(0xe420264a), left(0x26121ff0), left(0xe420264a)
-// test2() -> left(0x26121ff0), left(0xe420264a), left(0x26121ff0), left(0xe420264a)
diff --git a/test/libsolidity/semanticTests/functionTypes/address_member.sol b/test/libsolidity/semanticTests/functionTypes/address_member.sol
deleted file mode 100644
index a5f56f3dc688..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/address_member.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public view returns (address a1, address a2) {
-        a1 = this.f.address;
-        this.f.address;
-        [this.f.address][0];
-        a2 = [this.f.address][0];
-    }
-}
-// ----
-// f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e, 0xc06afe3a8444fc0004668591e8306bfb9968e79e
diff --git a/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol b/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol
deleted file mode 100644
index a083ee1d9d34..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract Other {
-    function addTwo(uint256 x) public returns (uint256) {
-        return x + 2;
-    }
-}
-contract C {
-    function (function (uint) external returns (uint)) internal returns (uint) ev;
-    function (uint) external returns (uint) x;
-
-    function store(function(uint) external returns (uint) y) public {
-         x = y;
-    }
-
-    function eval(function(uint) external returns (uint) y) public returns (uint) {
-        return y(7);
-    }
-
-    function t() public returns (uint256) {
-        this.store((new Other()).addTwo);
-        // This call panics
-        return ev(x);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol b/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol
deleted file mode 100644
index feca44e0c10f..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract Other {
-    function addTwo(uint256 x) public returns (uint256) {
-        return x + 2;
-    }
-}
-contract C {
-    function (function (uint) external returns (uint)) internal returns (uint) ev;
-    function (uint) external returns (uint) x;
-
-    function store(function(uint) external returns (uint) y) public {
-         x = y;
-    }
-
-    function eval(function(uint) external returns (uint) y) public returns (uint) {
-        return y(7);
-    }
-
-    function t() public returns (uint256) {
-        this.store((new Other()).addTwo);
-        // This call panics
-        return ev(x);
-    }
-}
-// ====
-// compileViaYul: false
-// ----
-// t() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
deleted file mode 100644
index da9c528fd633..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-  function g() external {}
-  function comparison_operators_for_external_function_pointers_with_dirty_bits() external returns (bool) {
-        function() external g_ptr_dirty = this.g;
-        assembly {
-                g_ptr_dirty.address := or(g_ptr_dirty.address, shl(160, sub(0,1)))
-                g_ptr_dirty.selector := or(g_ptr_dirty.selector, shl(32, sub(0,1)))
-        }
-        function() external g_ptr = this.g;
-        return g_ptr == g_ptr_dirty;
-  }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// comparison_operators_for_external_function_pointers_with_dirty_bits() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
deleted file mode 100644
index 6c47752c60fa..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
+++ /dev/null
@@ -1,79 +0,0 @@
-contract C {
-    function f() external {}
-    function g() external {}
-    function h() pure external {}
-    function i() view external {}
-
-    function comparison_operators_for_external_functions() public returns (bool) {
-        assert(
-            this.f != this.g &&
-            this.f != this.h &&
-            this.f != this.i &&
-
-            this.g != this.h &&
-            this.g != this.i &&
-
-            this.h != this.i &&
-
-            this.f == this.f &&
-            this.g == this.g &&
-            this.h == this.h &&
-            this.i == this.i
-        );
-        return true;
-    }
-
-    function comparison_operators_for_local_external_function_pointers() public returns (bool) {
-        function () external f_local = this.f;
-        function () external g_local = this.g;
-        function () external pure h_local = this.h;
-        function () external view i_local = this.i;
-
-        assert(
-            f_local == this.f &&
-            g_local == this.g &&
-            h_local == this.h &&
-            i_local == this.i &&
-
-            f_local != this.g &&
-            f_local != this.h &&
-            f_local != this.i &&
-
-            g_local != this.f &&
-            g_local != this.h &&
-            g_local != this.i &&
-
-            h_local != this.f &&
-            h_local != this.g &&
-            h_local != this.i &&
-
-            i_local != this.f &&
-            i_local != this.g &&
-            i_local != this.h
-        );
-
-        assert(
-            f_local == f_local &&
-            f_local != g_local &&
-            f_local != h_local &&
-            f_local != i_local
-        );
-
-        assert(
-            g_local == g_local &&
-            g_local != h_local &&
-            g_local != i_local
-        );
-
-        assert(
-            h_local == h_local &&
-            i_local == i_local &&
-            h_local != i_local
-        );
-
-        return true;
-    }
-}
-// ----
-// comparison_operators_for_external_functions() -> true
-// comparison_operators_for_local_external_function_pointers() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol b/test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol
deleted file mode 100644
index c15007c59ea5..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function a() internal {}
-    function f() public {
-        function() ptr1 = a;
-        function() ptr2 = a;
-    }
-}
-// ----
-// f()
diff --git a/test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol b/test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
deleted file mode 100644
index 069d257f79bc..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function g(string calldata) external returns (bool) { return true; }
-
-    function main() external returns (bool) {
-        function (string memory) external returns (bool) ptr = this.g;
-        return ptr("testString");
-    }
-}
-// ----
-// main() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
deleted file mode 100644
index 67a4434dfe00..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function a() public returns (uint256) {
-        return 7;
-    }
-
-    function test() public returns (uint256) {
-        function() returns (uint256) y = a;
-        delete y;
-        y();
-    }
-}
-// ----
-// test() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
deleted file mode 100644
index a147b4e02587..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    function a() public returns (uint256) {
-        return 7;
-    }
-
-    function() returns (uint256) internal y;
-
-    function set() public returns (uint256) {
-        y = a;
-        return y();
-    }
-
-    function d() public returns (uint256) {
-        delete y;
-        return 1;
-    }
-
-    function ca() public returns (uint256) {
-        return y();
-    }
-}
-// ----
-// set() -> 7
-// ca() -> 7
-// d() -> 1
-// ca() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
deleted file mode 100644
index d5e105e5f536..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    function() external public x;
-    uint public y = 0;
-
-    function increment() public {
-        ++y;
-    }
-
-    function set() external {
-        x = this.increment;
-    }
-
-    function incrementIndirectly() public {
-        x();
-    }
-
-    function deleteFunction() public {
-        // used to lead to an ICE during IR
-        delete x;
-    }
-}
-// ----
-// x() -> 0
-// y() -> 0
-// increment() ->
-// y() -> 1
-// set() ->
-// x() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79ed09de08a0000000000000000
-// increment() ->
-// y() -> 2
-// incrementIndirectly() ->
-// y() -> 3
-// deleteFunction() ->
-// increment() ->
-// y() -> 4
-// incrementIndirectly() -> FAILURE
-// y() -> 4
diff --git a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
deleted file mode 100644
index 587daac97894..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-library Utils {
-    function reduce(
-        uint256[] memory array,
-        function(uint, uint) internal returns (uint) f,
-        uint256 init
-    ) internal returns (uint256) {
-        for (uint256 i = 0; i < array.length; i++) {
-            init = f(array[i], init);
-        }
-        return init;
-    }
-
-    function sum(uint256 a, uint256 b) internal returns (uint256) {
-        return a + b;
-    }
-}
-
-
-contract C {
-    function f(uint256[] memory x) public returns (uint256) {
-        return Utils.reduce(x, Utils.sum, 0);
-    }
-}
-// ----
-// f(uint256[]): 0x20, 0x3, 0x1, 0x7, 0x3 -> 11
diff --git a/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol b/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
deleted file mode 100644
index e65da6e1e76f..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() external payable returns (uint) { assert(msg.value > 0); return 1; }
-    function g() external payable returns (uint) { assert(msg.value > 0); return 2; }
-
-    function h() public payable returns (uint) {
-        return [this.f, this.g][0]{value: 1}();
-    }
-}
-// ----
-// h(), 1 ether -> 1
diff --git a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
deleted file mode 100644
index f9cd863baa7b..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract Flow {
-    bool public success;
-
-    mapping(address => function() internal) stages;
-
-    function stage0() internal {
-        stages[msg.sender] = stage1;
-    }
-
-    function stage1() internal {
-        stages[msg.sender] = stage2;
-    }
-
-    function stage2() internal {
-        success = true;
-    }
-
-    constructor() {
-        stages[msg.sender] = stage0;
-    }
-
-    function f() public returns (uint256) {
-        stages[msg.sender]();
-        return 7;
-    }
-}
-// ----
-// success() -> false
-// f() -> 7
-// f() -> 7
-// success() -> false
-// f() -> 7
-// success() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
deleted file mode 100644
index 3f14eb594af5..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f(uint256 x) public returns (uint256) {
-        return this.eval(this.g, x);
-    }
-
-    function f2(uint256 x) public returns (uint256) {
-        return eval(this.g, x);
-    }
-
-    function eval(function(uint) external returns (uint) x, uint a) public returns (uint) {
-        return x(a);
-    }
-
-    function g(uint256 x) public returns (uint256) {
-        return x + 1;
-    }
-}
-// ----
-// f(uint256): 7 -> 8
-// f2(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
deleted file mode 100644
index 0acbcc5858d9..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f(uint256 x) public returns (uint256) {
-        return eval(g, x);
-    }
-
-    function eval(function(uint) internal returns (uint) x, uint a) internal returns (uint) {
-        return x(a);
-    }
-
-    function g(uint256 x) public pure returns (uint256) {
-        return x + 1;
-    }
-}
-// ----
-// f(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
deleted file mode 100644
index 84f6fad1c098..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    uint256 public initial;
-
-    constructor() {
-        initial = double(2);
-    }
-
-    function double(uint256 _arg) public returns (uint256 _ret) {
-        _ret = _arg * 2;
-    }
-
-    function runtime(uint256 _arg) public returns (uint256) {
-        return double(_arg);
-    }
-}
-// ----
-// runtime(uint256): 3 -> 6
-// initial() -> 4
diff --git a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
deleted file mode 100644
index b5b24954c9f6..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function(uint256) returns (uint256) internal x;
-
-    constructor() {
-        x = double;
-    }
-
-    function test() public returns (bool) {
-        return x == double;
-    }
-
-    function double(uint256 _arg) public returns (uint256 _ret) {
-        _ret = _arg * 2;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_1.sol b/test/libsolidity/semanticTests/functionTypes/selector_1.sol
deleted file mode 100644
index 397655dae54c..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/selector_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract B {
-    function ext() external {}
-    function pub() public {}
-}
-
-contract C is B {
-    function test() public returns (bytes4, bytes4, bytes4, bytes4) {
-        return (B.ext.selector, B.pub.selector, this.ext.selector, pub.selector);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test() -> 0xcf9f23b500000000000000000000000000000000000000000000000000000000, 0x7defb41000000000000000000000000000000000000000000000000000000000, 0xcf9f23b500000000000000000000000000000000000000000000000000000000, 0x7defb41000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_2.sol b/test/libsolidity/semanticTests/functionTypes/selector_2.sol
deleted file mode 100644
index 248e446736bc..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/selector_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract B {
-    function ext() external {}
-    function pub() public {}
-}
-
-contract D {
-    function test() public returns (bytes4, bytes4) {
-        return (B.ext.selector, B.pub.selector);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// test() -> 0xcf9f23b500000000000000000000000000000000000000000000000000000000, 0x7defb41000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol b/test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol
deleted file mode 100644
index 896dbeb9927b..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    bool public z;
-    function f() public {
-        ((z = true) ? this.f : this.f).selector;
-    }
-}
-
-// ----
-// f()
-// z() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol b/test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol
deleted file mode 100644
index cdb7b98dfe70..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint x;
-	function f() public returns (uint256) {
-		h().f.selector;
-		return x;
-	}
-	function h() public returns (C) {
-		x = 42;
-		return this;
-	}
-}
-// ----
-// f() -> 42
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_ternary.sol b/test/libsolidity/semanticTests/functionTypes/selector_ternary.sol
deleted file mode 100644
index 567b7c14b945..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/selector_ternary.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f() public {}
-	function g() public {}
-	function h(bool c) public returns (bytes4) {
-		return (c ? this.f : this.g).selector;
-	}
-}
-// ----
-// h(bool): true -> 0x26121ff000000000000000000000000000000000000000000000000000000000
-// h(bool): false -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol b/test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol
deleted file mode 100644
index 83415f728ceb..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-    function f() public {}
-	function g() public {}
-}
-
-contract C {
-    A a = new A();
-
-    function getContract() public view returns (A) {
-        return a;
-    }
-
-    function test(bool b) public view returns (bytes4) {
-        return (b ? getContract().f : getContract().g).selector;
-    }
-}
-// ----
-// test(bool): true -> 0x26121ff000000000000000000000000000000000000000000000000000000000
-// test(bool): false -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
deleted file mode 100644
index f811988fec9a..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function g() external {}
-    function h() external payable {}
-    function test_function() external returns (bool){
-        assert (
-            this.g.address == this.g.address &&
-            this.g{gas: 42}.address == this.g.address &&
-            this.g{gas: 42}.selector == this.g.selector
-        );
-        assert (
-            this.h.address == this.h.address &&
-            this.h{gas: 42}.address == this.h.address &&
-            this.h{gas: 42}.selector == this.h.selector
-        );
-        assert (
-            this.h{gas: 42, value: 5}.address == this.h.address &&
-            this.h{gas: 42, value: 5}.selector == this.h.selector
-        );
-        return true;
-    }
-}
-// ----
-// test_function() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
deleted file mode 100644
index 132a6c95659a..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract Other {
-    function addTwo(uint256 x) public returns (uint256) {
-        return x + 2;
-    }
-}
-
-
-contract C {
-    function (function (uint) external returns (uint)) internal returns (uint) ev;
-    function (uint) external returns (uint) x;
-
-    function store(function(uint) external returns (uint) y) public {
-        x = y;
-    }
-
-    function eval(function(uint) external returns (uint) y) public returns (uint) {
-        return y(7);
-    }
-
-    function t() public returns (uint256) {
-        ev = eval;
-        this.store((new Other()).addTwo);
-        return ev(x);
-    }
-}
-// ----
-// t() -> 9
-// gas irOptimized: 99064
-// gas legacy: 149095
-// gas legacyOptimized: 106188
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
deleted file mode 100644
index 3de9cfa8763b..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-struct S {
-    uint16 a;
-    function() external returns (uint) x;
-    uint16 b;
-}
-contract Flow {
-    S[2] t;
-
-    function X() public pure returns (uint) {
-        return 1;
-    }
-
-    function Y() public pure returns (uint) {
-        return 2;
-    }
-
-    constructor() {
-        t[0].a = 0xff07;
-        t[0].b = 0xff07;
-        t[1].x = this.Y;
-        t[1].a = 0xff07;
-        t[1].b = 0xff07;
-        t[0].x = this.X;
-    }
-
-    function f() public returns (uint, uint) {
-        return (t[0].x(), t[1].x());
-    }
-}
-// ----
-// f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
deleted file mode 100644
index fae91862957a..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-struct S {
-    uint16 a;
-    function() returns (uint) x;
-    uint16 b;
-}
-contract Flow {
-    S[2] t;
-
-    function X() internal pure returns (uint) {
-        return 1;
-    }
-
-    function Y() internal pure returns (uint) {
-        return 2;
-    }
-
-    constructor() {
-        t[0].a = 0xff07;
-        t[0].b = 0xff07;
-        t[1].x = Y;
-        t[1].a = 0xff07;
-        t[1].b = 0xff07;
-        t[0].x = X;
-    }
-
-    function f() public returns (uint, uint) {
-        return (t[0].x(), t[1].x());
-    }
-}
-// ----
-// f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol b/test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol
deleted file mode 100644
index f7dc890489d0..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() internal pure returns(uint256) { return 1;}
-    function g() internal pure returns(uint256) { return 2; }
-    function test(bool b) public returns(uint256) {
-        return (b ? C.f : C.g)();
-    }
-}
-// ----
-// test(bool): true -> 1
-// test(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol b/test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol
deleted file mode 100644
index a29a678d502b..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    function f() internal pure returns(uint256){ return 1; }
-}
-
-contract C {
-    function g() internal pure returns(uint256) { return 2; }
-    function test(bool b) public returns(uint256) {
-        return (b ? L.f : C.g)();
-    }
-}
-// ----
-// test(bool): true -> 1
-// test(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol b/test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol
deleted file mode 100644
index 6d52017a5efb..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure returns(uint256) { return 1; }
-    function g() public pure returns(uint256) { return 2; }
-    function test(bool b) public returns(uint256) {
-        return (b ? C.f : C.g)();
-    }
-}
-// ----
-// test(bool): true -> 1
-// test(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol b/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
deleted file mode 100644
index b55de08758b8..000000000000
--- a/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    function() internal x;
-
-    function f() public returns (uint256 r) {
-        x();
-        return 2;
-    }
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/getters/array_mapping_struct.sol b/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
deleted file mode 100644
index d824897e8326..000000000000
--- a/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    struct Y {
-        uint a;
-        uint b;
-    }
-    mapping(uint256 => Y)[] public m;
-    mapping(uint256 => Y)[3] public n;
-    constructor() {
-        m.push();
-        m.push();
-        m[1][0].a = 1;
-        m[1][0].b = 2;
-        m[1][1].a = 3;
-        m[1][1].b = 4;
-        n[1][0].a = 7;
-        n[1][0].b = 8;
-        n[1][1].a = 9;
-        n[1][1].b = 10;
-    }
-}
-// ----
-// m(uint256,uint256): 0, 0 -> 0x00, 0x00
-// m(uint256,uint256): 1, 0 -> 1, 2
-// m(uint256,uint256): 1, 1 -> 3, 4
-// m(uint256,uint256): 1, 2 -> 0x00, 0x00
-// n(uint256,uint256): 0, 0 -> 0x00, 0x00
-// n(uint256,uint256): 1, 0 -> 7, 8
-// n(uint256,uint256): 1, 1 -> 9, 0x0a
-// n(uint256,uint256): 1, 2 -> 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/getters/arrays.sol b/test/libsolidity/semanticTests/getters/arrays.sol
deleted file mode 100644
index 0ce2cdfcb107..000000000000
--- a/test/libsolidity/semanticTests/getters/arrays.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint8[][2] public a;
-    constructor() {
-        a[1].push(3);
-        a[1].push(4);
-    }
-}
-// ----
-// a(uint256,uint256): 0, 0 -> FAILURE
-// a(uint256,uint256): 1, 0 -> 3
-// a(uint256,uint256): 1, 1 -> 4
-// a(uint256,uint256): 2, 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/getters/bytes.sol b/test/libsolidity/semanticTests/getters/bytes.sol
deleted file mode 100644
index c22403c7792a..000000000000
--- a/test/libsolidity/semanticTests/getters/bytes.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    bytes public b;
-    constructor() {
-        b = "abc";
-    }
-}
-// ----
-// b() -> 0x20, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/mapping.sol b/test/libsolidity/semanticTests/getters/mapping.sol
deleted file mode 100644
index 524cac36194a..000000000000
--- a/test/libsolidity/semanticTests/getters/mapping.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    mapping(uint => mapping(uint => uint)) public x;
-    constructor() {
-        x[1][2] = 3;
-    }
-}
-// ----
-// x(uint256,uint256): 1, 2 -> 3
-// x(uint256,uint256): 0, 0 -> 0
diff --git a/test/libsolidity/semanticTests/getters/mapping_array_struct.sol b/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
deleted file mode 100644
index 60683dfc0a0f..000000000000
--- a/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    struct Y {
-        uint a;
-        uint b;
-    }
-    mapping(uint256 => Y[]) public m;
-    mapping(uint256 => Y[3]) public n;
-    constructor() {
-        m[1].push().a = 1;
-        m[1][0].b = 2;
-        m[1].push().a = 3;
-        m[1][1].b = 4;
-        n[1][0].a = 7;
-        n[1][0].b = 8;
-        n[1][1].a = 9;
-        n[1][1].b = 10;
-    }
-}
-// ----
-// m(uint256,uint256): 0, 0 -> FAILURE
-// m(uint256,uint256): 1, 0 -> 1, 2
-// m(uint256,uint256): 1, 1 -> 3, 4
-// m(uint256,uint256): 1, 2 -> FAILURE
-// n(uint256,uint256): 0, 0 -> 0x00, 0x00
-// n(uint256,uint256): 1, 0 -> 7, 8
-// n(uint256,uint256): 1, 1 -> 9, 0x0a
-// n(uint256,uint256): 1, 2 -> 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/getters/mapping_of_string.sol b/test/libsolidity/semanticTests/getters/mapping_of_string.sol
deleted file mode 100644
index db8de806231b..000000000000
--- a/test/libsolidity/semanticTests/getters/mapping_of_string.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    mapping(string => uint8[3]) public x;
-    constructor() {
-        x["abc"][0] = 1;
-        x["abc"][2] = 3;
-        x["abc"][1] = 2;
-        x["def"][1] = 9;
-    }
-}
-// ----
-// x(string,uint256): 0x40, 0, 3, "abc" -> 1
-// x(string,uint256): 0x40, 1, 3, "abc" -> 2
-// x(string,uint256): 0x40, 2, 3, "abc" -> 3
-// x(string,uint256): 0x40, 0, 3, "def" -> 0x00
-// x(string,uint256): 0x40, 1, 3, "def" -> 9
-// x(string,uint256): 0x40, 2, 3, "def" -> 0x00
diff --git a/test/libsolidity/semanticTests/getters/mapping_to_struct.sol b/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
deleted file mode 100644
index d601fd90fc37..000000000000
--- a/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    struct S {
-        uint8 a;
-        uint16 b;
-        uint128 c;
-        uint d;
-    }
-    mapping(uint => mapping(uint => S)) public x;
-    constructor() {
-        x[1][2].a = 3;
-        x[1][2].b = 4;
-        x[1][2].c = 5;
-        x[1][2].d = 6;
-    }
-}
-// ----
-// x(uint256,uint256): 1, 2 -> 3, 4, 5, 6
-// x(uint256,uint256): 0, 0 -> 0x00, 0x00, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/getters/mapping_with_names.sol b/test/libsolidity/semanticTests/getters/mapping_with_names.sol
deleted file mode 100644
index 290a888094f4..000000000000
--- a/test/libsolidity/semanticTests/getters/mapping_with_names.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    mapping(uint a => mapping(uint b => uint c)) public x;
-    constructor() {
-        x[1][2] = 3;
-    }
-}
-// ----
-// x(uint256,uint256): 1, 2 -> 3
-// x(uint256,uint256): 0, 0 -> 0
diff --git a/test/libsolidity/semanticTests/getters/string_and_bytes.sol b/test/libsolidity/semanticTests/getters/string_and_bytes.sol
deleted file mode 100644
index f9cf7316f866..000000000000
--- a/test/libsolidity/semanticTests/getters/string_and_bytes.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    string public a;
-    string public b;
-    bytes public c;
-    string public d = "abcd";
-    constructor() {
-        a = "hello world";
-        b = hex"41424344";
-        c = hex"ff077fff";
-    }
-}
-// ----
-// a() -> 0x20, 11, "hello world"
-// b() -> 0x20, 4, "ABCD"
-// c() -> 0x20, 4, -439061522557375173052089223601630338202760422010735733633791622124826263552
-// d() -> 0x20, 4, "abcd"
diff --git a/test/libsolidity/semanticTests/getters/struct_with_bytes.sol b/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
deleted file mode 100644
index 477a1297fba0..000000000000
--- a/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    struct S {
-        uint a;
-        bytes b;
-        mapping(uint => uint) c;
-        uint[] d;
-    }
-    uint shifter;
-    S public s;
-    constructor() {
-        s.a = 7;
-        s.b = "abc";
-        s.c[0] = 9;
-        s.d.push(10);
-    }
-}
-// ----
-// s() -> 7, 0x40, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol b/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
deleted file mode 100644
index 281b29c871d6..000000000000
--- a/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    struct S {
-        uint a;
-        bytes b;
-        mapping(uint => uint) c;
-        uint[] d;
-    }
-    uint shifter;
-    S public s;
-    constructor() {
-        s.a = 7;
-        s.b = "abc";
-        s.c[0] = 9;
-    }
-}
-// ----
-// s() -> 0x07, 0x40, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/value_types.sol b/test/libsolidity/semanticTests/getters/value_types.sol
deleted file mode 100644
index a8a8759e3e33..000000000000
--- a/test/libsolidity/semanticTests/getters/value_types.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    uint8 public a;
-    uint16 public b;
-    uint128 public c;
-    uint public d;
-    bytes1 public e;
-    bytes20 public f;
-    bytes32 public g;
-    bool public h;
-    address public i;
-    constructor() {
-        a = 3;
-        b = 4;
-        c = 5;
-        d = 6;
-        e = bytes1(uint8(0x7f));
-        f = bytes20(uint160(0x6465616462656566313564656164000000000010));
-        g = bytes32(uint256(0x6465616462656566313564656164000000000000000000000000000000000010));
-        h = true;
-        i = address(type(uint160).max / 3);
-    }
-}
-// ----
-// a() -> 3
-// b() -> 4
-// c() -> 5
-// d() -> 6
-// e() -> 0x7f00000000000000000000000000000000000000000000000000000000000000
-// f() -> 0x6465616462656566313564656164000000000010000000000000000000000000
-// g() -> 0x6465616462656566313564656164000000000000000000000000000000000010
-// h() -> true
-// i() -> 0x5555555555555555555555555555555555555555
diff --git a/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol b/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
deleted file mode 100644
index 3f71a31e0fe0..000000000000
--- a/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	uint8 immutable a = 2;
-	function f() public view returns (uint) {
-		return a;
-	}
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol b/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
deleted file mode 100644
index e1440be56d5a..000000000000
--- a/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint immutable public a;
-	uint immutable public b;
-	uint immutable public c;
-	uint immutable public d;
-
-	constructor() {
-		a = 1;
-		b = a;
-		c = b;
-		d = c;
-	}
-}
-// ----
-// a() -> 1
-// b() -> 1
-// c() -> 1
-// d() -> 1
diff --git a/test/libsolidity/semanticTests/immutable/delete.sol b/test/libsolidity/semanticTests/immutable/delete.sol
deleted file mode 100644
index 76e219a77d44..000000000000
--- a/test/libsolidity/semanticTests/immutable/delete.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint8 immutable public a;
-    uint8 immutable public b = 0x42;
-    uint public c;
-
-    constructor() {
-        delete a;
-        delete b;
-        c = b * 2 + a;
-    }
-}
-// ----
-// a() -> 0
-// b() -> 0
-// c() -> 0
diff --git a/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol b/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
deleted file mode 100644
index 0aafbae3eeea..000000000000
--- a/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-	uint8 immutable a;
-	uint8 x;
-
-	constructor() {
-		a = 3;
-		x = readA();
-	}
-
-	function readX() public view returns (uint8) {
-		return x;
-	}
-
-	function readA() public view returns (uint8) {
-		return a;
-	}
-}
-// ----
-// readX() -> 3
-// readA() -> 3
diff --git a/test/libsolidity/semanticTests/immutable/getter.sol b/test/libsolidity/semanticTests/immutable/getter.sol
deleted file mode 100644
index bb4b191cf9f6..000000000000
--- a/test/libsolidity/semanticTests/immutable/getter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint immutable public x = 1;
-}
-// ----
-// x() -> 1
diff --git a/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol b/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol
deleted file mode 100644
index 2ef12c04aa95..000000000000
--- a/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    uint immutable public x = 1;
-    uint public y;
-    constructor() {
-        y = this.x();
-    }
-}
-contract C {
-    function f() public returns (bool) {
-        try new A() { return false; }
-        catch { return true; }
-    }
-}
-// ====
-// EVMVersion: >=tangerineWhistle
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/immutable/immutable_signed.sol b/test/libsolidity/semanticTests/immutable/immutable_signed.sol
deleted file mode 100644
index 6bb193f82673..000000000000
--- a/test/libsolidity/semanticTests/immutable/immutable_signed.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    int8 immutable a = -2;
-    bytes2 immutable b = "ab";
-    function() internal returns (uint) immutable f = g;
-    function viaasm() view external returns (bytes32 x, bytes32 y) {
-        int8 _a = a;
-        bytes2 _b = b;
-        assembly { x := _a y := _b }
-    }
-    function g() internal pure returns (uint) { return 2; }
-}
-// ----
-// viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/immutable/increment_decrement.sol b/test/libsolidity/semanticTests/immutable/increment_decrement.sol
deleted file mode 100644
index 14304513a3da..000000000000
--- a/test/libsolidity/semanticTests/immutable/increment_decrement.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    int immutable x = 1;
-    int immutable y = 3;
-
-    constructor() {
-        x--;
-        --x;
-        y++;
-        ++y;
-        --y;
-    }
-
-    function f() public view returns (int, int) {
-        return (x, y);
-    }
-}
-// ----
-// f() -> -1, 4
diff --git a/test/libsolidity/semanticTests/immutable/inheritance.sol b/test/libsolidity/semanticTests/immutable/inheritance.sol
deleted file mode 100644
index 889c273e46e4..000000000000
--- a/test/libsolidity/semanticTests/immutable/inheritance.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract A {
-	uint8 immutable a;
-	constructor() {
-		a = 4;
-	}
-}
-contract B is A {
-	uint8 immutable b;
-	constructor() {
-		b = 3;
-	}
-}
-contract C is A {
-	uint8 immutable c;
-	constructor() {
-		c = 2;
-	}
-}
-contract D is B, C {
-	uint8 immutable d;
-
-	constructor() {
-		d = 1;
-	}
-	function f() public view returns (uint256, uint256, uint, uint) {
-		return (a, b, c, d);
-	}
-}
-// ----
-// f() -> 4, 3, 2, 1
diff --git a/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol b/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
deleted file mode 100644
index f56db7f2770f..000000000000
--- a/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function() internal view returns(uint256) immutable z;
-	constructor() {
-		z = f;
-	}
-	function f() public view returns (uint256) {
-		return 7;
-	}
-	function callZ() public view returns (uint) {
-		return z();
-	}
-}
-// ----
-// f() -> 7
-// callZ() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
deleted file mode 100644
index 145c32add6e9..000000000000
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract A {
-	uint immutable a;
-	constructor() {
-		a = 7;
-	}
-	function f() public view returns (uint) { return a; }
-}
-contract B {
-	uint immutable a;
-	constructor() {
-		a = 5;
-	}
-	function f() public view returns (uint) { return a; }
-}
-contract C {
-	uint immutable a;
-	uint public x;
-	uint public y;
-	constructor() {
-		a = 3;
-		x = (new A()).f();
-		y = (new B()).f();
-	}
-	function f() public returns (uint256, uint, uint) {
-		return (a, (new A()).f(), (new B()).f());
-	}
-}
-// ----
-// f() -> 3, 7, 5
-// gas irOptimized: 124021
-// gas legacy: 148528
-// gas legacyOptimized: 123971
-// x() -> 7
-// y() -> 5
diff --git a/test/libsolidity/semanticTests/immutable/multiple_initializations.sol b/test/libsolidity/semanticTests/immutable/multiple_initializations.sol
deleted file mode 100644
index b72f05b11015..000000000000
--- a/test/libsolidity/semanticTests/immutable/multiple_initializations.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract A {
-    uint immutable x = x + 1;
-    uint immutable y = x += 2;
-
-    constructor(uint) m(x += 16) m(x += 32) {
-        x += 64;
-        x += 128;
-    }
-
-    modifier m(uint) {
-        _;
-    }
-
-    function get() public returns (uint) {
-        return x;
-    }
-}
-
-contract B is A(A.x += 8) {
-    constructor(uint) {}
-}
-
-contract C is B {
-    constructor() B(x += 4) {}
-}
-// ----
-// get() -> 0xff
diff --git a/test/libsolidity/semanticTests/immutable/read_in_ctor.sol b/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
deleted file mode 100644
index 329a37764434..000000000000
--- a/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-	uint8 immutable a;
-	uint8 x;
-
-	constructor() {
-		a = 3;
-		x = a;
-	}
-
-	function readX() public view returns (uint8) {
-		return x;
-	}
-}
-// ----
-// readX() -> 3
diff --git a/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol b/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
deleted file mode 100644
index 167bd48a170a..000000000000
--- a/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-	uint16 public immutable a;
-	uint16 public immutable b;
-	uint16 public immutable c;
-	uint16[3] public x;
-	constructor() {
-		c = 0xffff;
-		b = 0x0f0f;
-		a = 0x1234;
-		x = [a, b, c];
-	}
-}
-// ----
-// a() -> 4660
-// b() -> 0x0f0f
-// c() -> 0xffff
-// x(uint256): 0 -> 4660
-// x(uint256): 1 -> 0x0f0f
-// x(uint256): 2 -> 0xffff
diff --git a/test/libsolidity/semanticTests/immutable/stub.sol b/test/libsolidity/semanticTests/immutable/stub.sol
deleted file mode 100644
index 092edfab4fa8..000000000000
--- a/test/libsolidity/semanticTests/immutable/stub.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint256 immutable x;
-	uint256 immutable y;
-	constructor() {
-		x = 42;
-		y = 23;
-	}
-	function f() public view returns (uint256, uint256) {
-		return (x+x,y);
-	}
-}
-// ----
-// f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/immutable/uninitialized.sol b/test/libsolidity/semanticTests/immutable/uninitialized.sol
deleted file mode 100644
index f6d59ce768e7..000000000000
--- a/test/libsolidity/semanticTests/immutable/uninitialized.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable u;
-    bool immutable b;
-    address immutable a;
-
-    function get() public returns (uint, bool, address) {
-        return (u, b, a);
-    }
-}
-// ----
-// get() -> 0, false, 0x0
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
deleted file mode 100644
index 0a5ccf729f59..000000000000
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	uint256 immutable x;
-	uint256 immutable y;
-	mapping(uint => uint) public m;
-	constructor(uint _a) {
-		x = 42;
-		y = 23;
-		m[_a] = 7;
-		new uint[](4);
-
-	}
-	function f() public view returns (uint256, uint256) {
-		return (x+x,y);
-	}
-}
-// ----
-// constructor(): 3 ->
-// gas irOptimized: 123542
-// gas legacy: 197645
-// gas legacyOptimized: 137678
-// f() -> 84, 23
-// m(uint256): 3 -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/access_base_storage.sol b/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
deleted file mode 100644
index 034e7c1d34c5..000000000000
--- a/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract Base {
-    uint256 dataBase;
-
-    function getViaBase() public returns (uint256 i) {
-        return dataBase;
-    }
-}
-
-
-contract Derived is Base {
-    uint256 dataDerived;
-
-    function setData(uint256 base, uint256 derived) public returns (bool r) {
-        dataBase = base;
-        dataDerived = derived;
-        return true;
-    }
-
-    function getViaDerived() public returns (uint256 base, uint256 derived) {
-        base = dataBase;
-        derived = dataDerived;
-    }
-}
-// ----
-// setData(uint256,uint256): 1, 2 -> true
-// getViaBase() -> 1
-// getViaDerived() -> 1, 2
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
deleted file mode 100644
index c65d1abec558..000000000000
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    function balance() public returns (uint256) {
-        return 1;
-    }
-
-    function transfer(uint256 amount) public returns (uint256) {
-        return amount;
-    }
-}
-
-
-contract D {
-    function f() public returns (uint256) {
-        return (new C()).balance();
-    }
-
-    function g() public returns (uint256) {
-        return (new C()).transfer(5);
-    }
-}
-// ----
-// f() -> 1
-// gas irOptimized: 77051
-// gas legacy: 112280
-// g() -> 5
-// gas irOptimized: 77106
-// gas legacy: 112816
diff --git a/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol b/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
deleted file mode 100644
index 9cff3c728d5c..000000000000
--- a/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function() returns (uint256) internal x;
-
-    function set() public {
-        C.x = g;
-    }
-
-    function g() public pure returns (uint256) {
-        return 2;
-    }
-
-    function h() public returns (uint256) {
-        return C.x();
-    }
-}
-// ----
-// g() -> 2
-// h() -> FAILURE, hex"4e487b71", 0x51
-// set() ->
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol b/test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol
deleted file mode 100644
index 4de95b0f1c4f..000000000000
--- a/test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-abstract contract A {
-    function f(uint256[] calldata a) external virtual returns (uint256[] calldata);
-}
-
-contract B is A {
-    function f(uint256[] memory a) public override returns (uint256[] memory) {
-        return a;
-    }
-
-    function g(uint[] calldata x) public returns (uint256[] memory) {
-        return f(x);
-    }
-}
-// ====
-// compileViaYul: also
-// ----
-// f(uint256[]): 0x20, 2, 9, 8 -> 0x20, 2, 9, 8
-// g(uint256[]): 0x20, 2, 9, 8 -> 0x20, 2, 9, 8
diff --git a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
deleted file mode 100644
index 02e20c49d6af..000000000000
--- a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract B {
-    function f() public returns (uint256) {
-        return 10;
-    }
-}
-
-
-contract C is B {
-    function f(uint256 i) public returns (uint256) {
-        return 2 * i;
-    }
-
-    function g() public returns (uint256) {
-        return f(1);
-    }
-}
-// ----
-// g() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
deleted file mode 100644
index 5976fee6fefc..000000000000
--- a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract A {
-    function f(uint256 a) public returns (uint256) {
-        return 2 * a;
-    }
-}
-
-
-contract B {
-    function f() public returns (uint256) {
-        return 10;
-    }
-}
-
-
-contract C is A, B {
-    function g() public returns (uint256) {
-        return f();
-    }
-
-    function h() public returns (uint256) {
-        return f(1);
-    }
-}
-// ----
-// g() -> 10
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol b/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
deleted file mode 100644
index 78f1f186356c..000000000000
--- a/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract BaseBase {
-    function g() public virtual returns (uint256 r) {
-        return 1;
-    }
-}
-
-
-contract Base is BaseBase {
-    function g() public virtual override returns (uint256 r) {
-        return 2;
-    }
-}
-
-
-contract Derived is Base {
-    function f() public returns (uint256 r) {
-        return BaseBase.g();
-    }
-
-    function g() public override returns (uint256 r) {
-        return 3;
-    }
-}
-// ----
-// g() -> 3
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol b/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
deleted file mode 100644
index 70674a6c78bf..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    uint256 constant x = 7;
-}
-
-
-contract B is A {
-    function f() public returns (uint256) {
-        return A.x;
-    }
-}
-// ----
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function.sol b/test/libsolidity/semanticTests/inheritance/inherited_function.sol
deleted file mode 100644
index fb3f8ee8f032..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_function.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-    function f() internal virtual returns (uint256) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() internal override returns (uint256) {
-        return 2;
-    }
-
-    function g() public returns (uint256) {
-        return A.f();
-    }
-}
-// ----
-// g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
deleted file mode 100644
index 3114c80f1912..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-interface I {
-    function f(uint256[] calldata a) external returns (uint256);
-}
-
-
-contract A is I {
-    function f(uint256[] calldata a) external override returns (uint256) {
-        return 42;
-    }
-}
-
-
-contract B {
-    function f(uint256[] memory a) public returns (uint256) {
-        return a[1];
-    }
-
-    function g() public returns (uint256) {
-        I i = I(new A());
-        return i.f(new uint256[](2));
-    }
-}
-// ----
-// g() -> 42
-// gas irOptimized: 80813
-// gas legacy: 122471
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
deleted file mode 100644
index a6274ed773ef..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-    function f(uint256[] calldata a) external virtual returns (uint256) {
-        return a[0];
-    }
-}
-
-
-contract B is A {
-    function f(uint256[] memory a) public override returns (uint256) {
-        return a[1];
-    }
-
-    function g() public returns (uint256) {
-        uint256[] memory m = new uint256[](2);
-        m[0] = 42;
-        m[1] = 23;
-        return A(this).f(m);
-    }
-}
-// ----
-// g() -> 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
deleted file mode 100644
index 74bf42ec7e61..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-interface I {
-    function f(uint256[] calldata a) external returns (uint256);
-}
-
-
-contract A is I {
-    function f(uint256[] memory a) public override returns (uint256) {
-        return 42;
-    }
-}
-
-
-contract B {
-    function f(uint256[] memory a) public returns (uint256) {
-        return a[1];
-    }
-
-    function g() public returns (uint256) {
-        I i = I(new A());
-        return i.f(new uint256[](2));
-    }
-}
-// ----
-// g() -> 42
-// gas irOptimized: 100282
-// gas legacy: 180440
-// gas legacyOptimized: 112596
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
deleted file mode 100644
index 1b1092cba953..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-library A {
-    function f() internal returns (uint256) {
-        return 1;
-    }
-}
-
-
-contract B {
-    function f() internal returns (uint256) {
-        return 2;
-    }
-
-    function g() public returns (uint256) {
-        return A.f();
-    }
-}
-// ----
-// g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
deleted file mode 100644
index 39683079a4b5..000000000000
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-    function f() internal virtual returns (uint256) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() internal override returns (uint256) {
-        return 2;
-    }
-
-    function g() public returns (uint256) {
-        function() internal returns (uint256) ptr = A.f;
-        return ptr();
-    }
-}
-// ----
-// g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
deleted file mode 100644
index 33392e8d48c6..000000000000
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-==== Source: A ====
-contract C {
-	int private x;
-	constructor (int p) public { x = p; }
-	function getX() public returns (int) { return x; }
-}
-==== Source: B ====
-import "A" as M;
-
-contract D is M.C {
-	constructor (int p) M.C(p) public {}
-}
-
-contract A {
-	function g(int p) public returns (int) {
-		D d = new D(p);
-		return d.getX();
-	}
-}
-// ----
-// g(int256): -1 -> -1
-// gas legacy: 102086
-// g(int256): 10 -> 10
-// gas legacy: 101714
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
deleted file mode 100644
index d31dba485ac1..000000000000
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract test {
-    function f(uint256 k) public returns (uint256 d) {
-        return k;
-    }
-
-    function f(uint256 a, uint256 b) public returns (uint256 d) {
-        return a + b;
-    }
-
-    function g() public returns (uint256 d) {
-        return f(3);
-    }
-}
-// ----
-// g() -> 3
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
deleted file mode 100644
index c1f816c1f91d..000000000000
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract test {
-    function f(uint256 a, uint256 b) public returns (uint256 d) {
-        return a + b;
-    }
-
-    function f(uint256 k) public returns (uint256 d) {
-        return k;
-    }
-
-    function g() public returns (uint256 d) {
-        return f(3, 7);
-    }
-}
-// ----
-// g() -> 10
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
deleted file mode 100644
index c0ff8fd58062..000000000000
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test {
-    function f(uint256 a, uint256 b) public returns (uint256 d) {
-        return a + b;
-    }
-
-    function f(uint256 k) public returns (uint256 d) {
-        return k;
-    }
-
-    function g(bool flag) public returns (uint256 d) {
-        if (flag) return f(3);
-        else return f(3, 7);
-    }
-}
-// ----
-// g(bool): true -> 3
-// g(bool): false -> 10
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
deleted file mode 100644
index 7b8af54e9e7d..000000000000
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Base {
-    constructor(uint256 i) {
-        m_i = i;
-    }
-
-    uint256 public m_i;
-}
-
-
-contract Derived is Base {
-    constructor(uint256 i) Base(i) {}
-}
-
-
-contract Final is Derived(4) {}
-
-// ----
-// m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
deleted file mode 100644
index d028630e167f..000000000000
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract Base {
-    constructor(uint256 j) {
-        m_i = j;
-    }
-
-    uint256 public m_i;
-}
-
-
-contract Base1 is Base {
-    constructor(uint256 k) Base(k) {}
-}
-
-
-contract Derived is Base, Base1 {
-    constructor(uint256 i) Base1(i) {}
-}
-
-
-contract Final is Derived(4) {}
-
-// ----
-// m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
deleted file mode 100644
index 221368f0d08a..000000000000
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract Base {
-    constructor(uint256 i) {
-        m_i = i;
-    }
-
-    uint256 public m_i;
-}
-
-
-abstract contract Base1 is Base {
-    constructor(uint256 k) {}
-}
-
-
-contract Derived is Base, Base1 {
-    constructor(uint256 i) Base(i) Base1(7) {}
-}
-
-
-contract Final is Derived(4) {}
-
-// ----
-// m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol b/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
deleted file mode 100644
index 7e0aa51d201c..000000000000
--- a/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract A {
-    function f() public virtual returns (uint256 r) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() public virtual override returns (uint256 r) {
-        return super.f() | 2;
-    }
-}
-
-
-contract C is A {
-    function f() public virtual override returns (uint256 r) {
-        return super.f() | 4;
-    }
-}
-
-
-contract D is B, C {
-    uint256 data;
-
-    constructor() {
-        data = super.f() | 8;
-    }
-
-    function f() public override (B, C) returns (uint256 r) {
-        return data;
-    }
-}
-// ----
-// f() -> 15
diff --git a/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol b/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
deleted file mode 100644
index 6b06a784bcef..000000000000
--- a/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract A {
-    function f() public virtual returns (uint256 r) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() public virtual override returns (uint256 r) {
-        function() internal returns (uint) x = super.f;
-        return x() | 2;
-    }
-}
-
-
-contract C is A {
-    function f() public virtual override returns (uint256 r) {
-        function() internal returns (uint) x = super.f;
-        return x() | 4;
-    }
-}
-
-
-contract D is B, C {
-    uint256 data;
-
-    constructor() {
-        function() internal returns (uint) x = super.f;
-        data = x() | 8;
-    }
-
-    function f() public override (B, C) returns (uint256 r) {
-        return data;
-    }
-}
-// ----
-// f() -> 15
diff --git a/test/libsolidity/semanticTests/inheritance/super_overload.sol b/test/libsolidity/semanticTests/inheritance/super_overload.sol
deleted file mode 100644
index 7b0b1448f0db..000000000000
--- a/test/libsolidity/semanticTests/inheritance/super_overload.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract A {
-    function f(uint256 a) public returns (uint256) {
-        return 2 * a;
-    }
-}
-
-
-contract B {
-    function f(bool b) public returns (uint256) {
-        return 10;
-    }
-}
-
-
-contract C is A, B {
-    function g() public returns (uint256) {
-        return super.f(true);
-    }
-
-    function h() public returns (uint256) {
-        return super.f(1);
-    }
-}
-// ----
-// g() -> 10
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
deleted file mode 100644
index d8fd8766fec6..000000000000
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract Helper {
-    bytes3 name;
-    bool flag;
-
-    constructor(bytes3 x, bool f) payable {
-        name = x;
-        flag = f;
-    }
-
-    function getName() public returns (bytes3 ret) {
-        return name;
-    }
-
-    function getFlag() public returns (bool ret) {
-        return flag;
-    }
-}
-
-
-contract Main {
-    Helper h;
-
-    constructor() payable {
-        h = (new Helper){value: 10}("abc", true);
-    }
-
-    function getFlag() public returns (bool ret) {
-        return h.getFlag();
-    }
-
-    function getName() public returns (bytes3 ret) {
-        return h.getName();
-    }
-
-    function getBalances() public returns (uint256 me, uint256 them) {
-        me = address(this).balance;
-        them = address(h).balance;
-    }
-}
-// ----
-// constructor(), 22 wei ->
-// gas irOptimized: 261888
-// gas legacy: 392786
-// gas legacyOptimized: 261633
-// getFlag() -> true
-// getName() -> "abc"
-// getBalances() -> 12, 10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol b/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol
deleted file mode 100644
index aba6b44b9c33..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public view returns (uint ret) {
-        assembly {
-            let basefee := sload(0)
-            ret := basefee
-        }
-    }
-    function g() public pure returns (uint ret) {
-        assembly {
-            function basefee() -> r {
-                r := 1000
-            }
-            ret := basefee()
-        }
-    }
-}
-// ====
-// EVMVersion: <=berlin
-// ----
-// f() -> 0
-// g() -> 1000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
deleted file mode 100644
index 631e61fe043c..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint[2][] calldata x) public returns (uint[2][] memory r) {
-        assembly { x.offset := 0x44 x.length := 2 }
-        r = x;
-    }
-}
-// ----
-// f(uint256[2][]): 0x0, 1, 8, 7, 6, 5 -> 0x20, 2, 8, 7, 6, 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
deleted file mode 100644
index 32931be18024..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint[2][2] calldata x) public returns (uint[2][2] memory r) {
-        assembly { x := 0x24 }
-        r = x;
-    }
-}
-// ----
-// f(uint256[2][2]): 0x0, 8, 7, 6, 5 -> 8, 7, 6, 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
deleted file mode 100644
index 572e9def0ce2..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint[2][] calldata x) public returns (uint o, uint l, uint s) {
-        assembly { l := x.length o := x.offset }
-        uint[2] calldata t = x[1];
-        // statically-sized arrays only use one slot, so we read directly.
-        assembly { s := t }
-    }
-}
-// ----
-// f(uint256[2][]): 0x20, 2, 1, 2, 3, 4 -> 0x44, 2, 0x84
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
deleted file mode 100644
index f5d557e5528d..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bytes calldata x) public returns (bytes memory) {
-        assembly { x.offset := 1 x.length := 3 }
-        return x;
-    }
-}
-// ----
-// f(bytes): 0x20, 0, 0 -> 0x20, 3, 0x5754f80000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
deleted file mode 100644
index 876fffd42d21..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns (bytes calldata x) {
-        assembly { x.offset := 0 x.length := 4 }
-    }
-}
-// ----
-// f() -> 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
deleted file mode 100644
index d3574806a239..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function lenBytesRead(bytes calldata x) public returns (uint l) {
-        assembly { l := x.length }
-    }
-
-    function lenStringRead(string calldata x) public returns (uint l) {
-        assembly { l := x.length }
-    }
-}
-// ----
-// lenBytesRead(bytes): 0x20, 4, "abcd" -> 4
-// lenBytesRead(bytes): 0x20, 0, "abcd" -> 0x00
-// lenBytesRead(bytes): 0x20, 0x21, "abcd", "ef" -> 33
-// lenStringRead(string): 0x20, 4, "abcd" -> 4
-// lenStringRead(string): 0x20, 0, "abcd" -> 0x00
-// lenStringRead(string): 0x20, 0x21, "abcd", "ef" -> 33
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
deleted file mode 100644
index 0b10748c50cf..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(bytes calldata x) public returns (uint r) {
-        assembly { r := x.offset }
-    }
-
-    function f(uint, bytes calldata x, uint) public returns (uint r, uint v) {
-        assembly {
-            r := x.offset
-            v := x.length
-        }
-    }
-}
-// ----
-// f(bytes): 0x20, 0, 0 -> 0x44
-// f(bytes): 0x22, 0, 0, 0 -> 0x46
-// f(uint256,bytes,uint256): 7, 0x60, 8, 2, 0 -> 0x84, 2
-// f(uint256,bytes,uint256): 0, 0, 0 -> 0x24, 0x00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
deleted file mode 100644
index bcba7169b0f0..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f(uint, bytes calldata x, uint) public returns (uint r, uint v) {
-        assembly {
-            x.offset := 8
-            x.length := 20
-        }
-        assembly {
-            r := x.offset
-            v := x.length
-        }
-    }
-}
-// ----
-// f(uint256,bytes,uint256): 7, 0x60, 8, 2, 0 -> 8, 0x14
-// f(uint256,bytes,uint256): 0, 0, 0 -> 8, 0x14
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
deleted file mode 100644
index 96c01ae58704..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	struct S { uint256 x; }
-	struct S2 { uint256 x; uint256 y; }
-	function f(S calldata s, S2 calldata s2) public pure returns (uint256 r, uint256 r2) {
-		assembly {
-			s := s2
-			s2 := 4
-		}
-		r = s.x;
-		r2 = s2.x;
-	}
-}
-// ----
-// f((uint256),(uint256,uint256)): 0x42, 0x07, 0x77 -> 0x07, 0x42
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
deleted file mode 100644
index 4c699bc40dbd..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-contract C {
-  struct S { int8 x; int8 y; }
-  function f() internal pure returns(S calldata s) {
-    assembly {
-      s := 0x24
-    }
-  }
-  function g() public pure returns(int8, int8) {
-    S calldata s = f();
-    return (s.x, s.y);
-  }
-  function h() public pure returns(uint256) { f(); return 0x42; }
-  function i() public pure returns(uint256) { abi.decode(msg.data[4:], (S)); return 0x42; }
-}
-// ----
-// g(): 0xCAFFEE, 0x42, 0x21 -> 0x42, 0x21
-// g(): 0xCAFFEE, 0x4242, 0x2121 -> FAILURE
-// g(): 0xCAFFEE, 0x42 -> 0x42, 0
-// h() -> 0x42
-// i() -> FAILURE
diff --git a/test/libsolidity/semanticTests/inlineAssembly/chainid.sol b/test/libsolidity/semanticTests/inlineAssembly/chainid.sol
deleted file mode 100644
index f93d87c99e06..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/chainid.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint id) {
-        assembly {
-            id := chainid()
-        }
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol b/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
deleted file mode 100644
index 82badaca780b..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    uint constant a = 2;
-    bytes2 constant b = 0xabcd;
-    bytes3 constant c = "abc";
-    bool constant d = true;
-    address constant e = 0x1212121212121212121212121212121212121212;
-    function f() public pure returns (uint w, bytes2 x, bytes3 y, bool z, address t) {
-        assembly {
-            w := a
-            x := b
-            y := c
-            z := d
-            t := e
-        }
-    }
-}
-// ----
-// f() -> 2, left(0xabcd), left(0x616263), true, 0x1212121212121212121212121212121212121212
diff --git a/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol b/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
deleted file mode 100644
index d12a979c9983..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint constant a = 2;
-    uint constant aa = a;
-    uint constant aaa = aa;
-    bytes2 constant b = 0xabcd;
-    bytes2 constant bb = b;
-    bytes3 constant c = "abc";
-    bytes3 constant cc = c;
-    bytes3 constant ccc = cc;
-    bytes3 constant cccc = ccc;
-    bool constant d = true;
-    bool constant dd = d;
-    address constant e = 0x1212121212121212121212121212121212121212;
-    address constant ee = e;
-    function f() public pure returns (uint w, bytes2 x, bytes3 y, bool z, address t) {
-        assembly {
-            w := aaa
-            x := bb
-            y := cccc
-            z := dd
-            t := ee
-        }
-    }
-}
-// ----
-// f() -> 2, left(0xabcd), left(0x616263), true, 0x1212121212121212121212121212121212121212
diff --git a/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol b/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
deleted file mode 100644
index ef531f78af6d..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public view returns (uint ret) {
-        assembly {
-            ret := difficulty()
-        }
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
-// f() -> 200000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
deleted file mode 100644
index ae891df5dc4f..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function testFunction() external {}
-
-	function testYul() public returns (address adr) {
-		function() external fp = this.testFunction;
-
-		assembly {
-			adr := fp.address
-		}
-	}
-	function testSol() public returns (address) {
-		return this.testFunction.address;
-	}
-}
-// ----
-// testYul() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
-// testSol() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
deleted file mode 100644
index eb28a6d201a2..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function testFunction() external {}
-
-	function testYul(address newAddress) view public returns (address adr) {
-		function() external fp = this.testFunction;
-
-		assembly {
-			fp.address := newAddress
-		}
-
-		return fp.address;
-	}
-}
-// ----
-// testYul(address): 0x1234567890 -> 0x1234567890
-// testYul(address): 0xC0FFEE3EA7 -> 0xC0FFEE3EA7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
deleted file mode 100644
index 2fa372f816a1..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function testFunction() external {}
-
-	function testYul() public returns (uint32) {
-		function() external fp = this.testFunction;
-		uint selectorValue = 0;
-
-		assembly {
-			selectorValue := fp.selector
-		}
-
-		// Value is right-aligned, we shift it so it can be compared
-		return uint32(bytes4(bytes32(selectorValue << (256 - 32))));
-	}
-	function testSol() public returns (uint32) {
-		return uint32(this.testFunction.selector);
-	}
-}
-// ----
-// testYul() -> 0xe16b4a9b
-// testSol() -> 0xe16b4a9b
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
deleted file mode 100644
index a8e886147dc8..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function testFunction() external {}
-
-	function testYul(uint32 newSelector) view public returns (uint32) {
-		function() external fp = this.testFunction;
-
-		assembly {
-			fp.selector := newSelector
-		}
-
-		return uint32(fp.selector);
-	}
-}
-// ----
-// testYul(uint32): 0x12345678 -> 0x12345678
-// testYul(uint32): 0xABCDEF00 -> 0xABCDEF00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol b/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
deleted file mode 100644
index 19a4fbdb87b6..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (uint x) {
-        assembly {
-            function g() -> f { f := 2 }
-            x := g()
-        }
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
deleted file mode 100644
index e6ca33644f79..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure returns (uint r) {
-    assembly { function f() -> x { x := 1 } r := f() }
-  }
-  function g() public pure returns (uint r) {
-    assembly { function f() -> x { x := 2 } r := f() }
-  }
-}
-// ----
-// f() -> 1
-// g() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
deleted file mode 100644
index c925823d0d71..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            let d:= 0x10
-
-            function asmfun(a, b, c) -> x, y, z {
-                x := g(a)
-                function g(r) -> s {
-                    s := mul(r, r)
-                }
-                y := g(b)
-                z := 7
-            }
-            let a1, b1, c1 := asmfun(1, 2, 3)
-            mstore(0x00, a1)
-            mstore(0x20, b1)
-            mstore(0x40, c1)
-            mstore(0x60, d)
-            return (0, 0x80)
-        }
-    }
-}
-// ----
-// f() -> 0x1, 0x4, 0x7, 0x10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
deleted file mode 100644
index 848e9016c8e2..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f(uint256 a) public returns (uint256 b) {
-        assembly {
-            function fac(n) -> nf {
-                nf := 1
-                for {
-                    let i := n
-                } gt(i, 0) {
-                    i := sub(i, 1)
-                } {
-                    nf := mul(nf, i)
-                }
-            }
-            b := fac(a)
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 1
-// f(uint256): 1 -> 1
-// f(uint256): 2 -> 2
-// f(uint256): 3 -> 6
-// f(uint256): 4 -> 24
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
deleted file mode 100644
index 2d8179513677..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint256 st;
-
-    function f(uint256 a) public returns (uint256 b, uint256 c, uint256 d) {
-        st = 0;
-        assembly {
-            function sideeffect(r) -> x {
-                sstore(0, add(sload(0), r))
-                x := 1
-            }
-            for {
-                let i := a
-            } eq(i, sideeffect(2)) {
-                d := add(d, 3)
-            } {
-                b := i
-                i := 0
-            }
-        }
-        c = st;
-    }
-}
-// ----
-// f(uint256): 0 -> 0, 2, 0
-// f(uint256): 1 -> 1, 4, 3
-// f(uint256): 2 -> 0, 2, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
deleted file mode 100644
index de198dff2e45..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            function asmfun(a, b, c) -> x, y, z {
-                x := a
-                y := b
-                z := 7
-            }
-            let a1, b1, c1 := asmfun(1, 2, 3)
-            mstore(0x00, a1)
-            mstore(0x20, b1)
-            mstore(0x40, c1)
-            return (0, 0x60)
-        }
-    }
-}
-// ----
-// f() -> 1, 2, 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
deleted file mode 100644
index d21084aa7128..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            let d := 0x10
-
-            function asmfun(a, b, c) -> x, y, z {
-                x := a
-                y := b
-                z := 7
-            }
-            let a1, b1, c1 := asmfun(1, 2, 3)
-            mstore(0x00, a1)
-            mstore(0x20, b1)
-            mstore(0x40, c1)
-            mstore(0x60, d)
-            return (0, 0x80)
-        }
-    }
-}
-// ----
-// f() -> 0x1, 0x2, 0x7, 0x10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
deleted file mode 100644
index e2e07823c83e..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            let a1, b1, c1
-
-            function asmfun(a, b, c) -> x, y, z {
-                x := a
-                y := b
-                z := 7
-            }
-            a1, b1, c1 := asmfun(1, 2, 3)
-            mstore(0x00, a1)
-            mstore(0x20, b1)
-            mstore(0x40, c1)
-            return (0, 0x60)
-        }
-    }
-}
-// ----
-// f() -> 1, 2, 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
deleted file mode 100644
index ebe50f516bb0..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint256 a) public returns (uint256 b) {
-        assembly {
-            if gt(a, 1) {
-                b := 2
-            }
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 0
-// f(uint256): 1 -> 0
-// f(uint256): 2 -> 2
-// f(uint256): 3 -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
deleted file mode 100644
index e050d2b52220..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    modifier m {
-        uint256 a = 1;
-        assembly {
-            a := 2
-        }
-        if (a != 2) revert();
-        _;
-    }
-
-    function f() public m returns (bool) {
-        return true;
-    }
-
-    modifier n {
-        uint256 a = 1;
-        assembly {
-            a := 2
-        }
-        if (a != 2)
-            _;
-        revert();
-    }
-
-    function g() public n returns (bool) {
-        // This statement should never execute.
-        return true;
-    }
-}
-// ----
-// f() -> true
-// g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
deleted file mode 100644
index 1f6a50d65578..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function test() public returns (bytes memory) {
-        bytes memory x = new bytes(5);
-        for (uint256 i = 0; i < x.length; ++i) x[i] = bytes1(uint8(i + 1));
-        assembly {
-            mstore(add(x, 32), "12345678901234567890123456789012")
-        }
-        return x;
-    }
-}
-// ----
-// test() -> 0x20, 0x5, "12345"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
deleted file mode 100644
index ae4b94ed5989..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (uint256 r) {
-        for (uint256 x = 0; x < 10; ++x)
-            assembly {
-                r := add(r, x)
-            }
-    }
-}
-// ----
-// f() -> 45
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
deleted file mode 100644
index a509513199ff..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    function f(uint256 a) public returns (uint256 b) {
-        assembly {
-            function fac(n) -> nf {
-                switch n
-                    case 0 {
-                        nf := 1
-                    }
-                    case 1 {
-                        nf := 1
-                    }
-                    default {
-                        nf := mul(n, fac(sub(n, 1)))
-                    }
-            }
-            b := fac(a)
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 1
-// f(uint256): 1 -> 1
-// f(uint256): 2 -> 2
-// f(uint256): 3 -> 6
-// f(uint256): 4 -> 24
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
deleted file mode 100644
index 254bc7473d51..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    uint16 x;
-    uint16 public y;
-    uint256 public z;
-
-    function f() public returns (bool) {
-        uint256 off1;
-        uint256 off2;
-        assembly {
-            sstore(z.slot, 7)
-            off1 := z.offset
-            off2 := y.offset
-        }
-        assert(off1 == 0);
-        assert(off2 == 2);
-        return true;
-    }
-}
-// ----
-// f() -> true
-// z() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
deleted file mode 100644
index 80cd7e11ecfe..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint16 x;
-    uint16 public y;
-    uint256 public z;
-
-    function f() public returns (bool) {
-        uint256 off1;
-        uint256 off2;
-        assembly {
-            function f() -> o1 {
-                sstore(z.slot, 7)
-                o1 := y.offset
-            }
-            off2 := f()
-        }
-        assert(off2 == 2);
-        return true;
-    }
-}
-// ----
-// f() -> true
-// z() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
deleted file mode 100644
index c7728068e46a..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    uint256[] public a;
-
-    function f() public returns (uint256) {
-        uint256[] storage x = a;
-        uint256 off;
-        assembly {
-            sstore(x.slot, 7)
-            off := x.offset
-        }
-        assert(off == 0);
-        return a.length;
-    }
-}
-// ----
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
deleted file mode 100644
index 6c382ef9e60b..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    struct Data {
-        uint256 contents;
-    }
-    uint256 public separator;
-    Data public a;
-    uint256 public separator2;
-
-    function f() public returns (bool) {
-        Data storage x = a;
-        uint256 off;
-        assembly {
-            sstore(x.slot, 7)
-            off := x.offset
-        }
-        assert(off == 0);
-        return true;
-    }
-}
-// ----
-// f() -> true
-// a() -> 7
-// separator() -> 0
-// separator2() -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
deleted file mode 100644
index 615d69594b70..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f(uint256 a) public returns (uint256 b) {
-        assembly {
-            switch a
-                case 1 {
-                    b := 8
-                }
-                case 2 {
-                    b := 9
-                }
-                default {
-                    b := 2
-                }
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 2
-// f(uint256): 1 -> 8
-// f(uint256): 2 -> 9
-// f(uint256): 3 -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
deleted file mode 100644
index ed20bfe2de0f..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (uint256 r, bytes32 r2) {
-        assembly {
-            r := 7
-            r2 := "abcdef"
-        }
-    }
-}
-// ----
-// f() -> 7, "abcdef"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol b/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
deleted file mode 100644
index 17e14e8ac08e..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f() public pure returns (uint a, uint b) {
-		assembly {
-			let x
-			let y, z
-			a := x
-			b := z
-		}
-	}
-}
-// ----
-// f() -> 0, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
deleted file mode 100644
index 253af98902c3..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (bytes32 ret) {
-        assembly {
-            ret := keccak256(0, 0)
-        }
-    }
-}
-// ----
-// f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
deleted file mode 100644
index 2a245b35c58a..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public view returns (bool ret) {
-        assembly {
-            let x := calldataload(0)
-            mstore(0, x)
-            mstore(0x20, x)
-            let a := keccak256(0, 4)
-            let b := keccak256(0x20, 4)
-            ret := eq(a, b)
-        }
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
deleted file mode 100644
index 233e4f72735b..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public view returns (bool ret) {
-        assembly {
-            let x := calldataload(0)
-            mstore(0, x)
-            mstore(0x20, x)
-            let a := keccak256(0, 4)
-            let b := keccak256(0x20, 8)
-            ret := eq(a, b)
-        }
-    }
-}
-// ----
-// f() -> false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
deleted file mode 100644
index 4023a809bc8d..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-  uint[] data;
-
-  function val() public returns (bool) {
-    assembly {
-        sstore(0, 2)
-        mstore(0, 0)
-        sstore(keccak256(0, 32), 234)
-        // A bug in the caching mechanism previously caused keccak256(0, 23) to be the same as
-        // keccak256(0, 32), leading to `data[1] == 123` being true.
-        sstore(add(keccak256(0, 23), 1), 123)
-    }
-    assert(data[1] != 123);
-    assert(data[1] == 0);
-    return true;
-  }
-}
-// ----
-// val() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
deleted file mode 100644
index 35f8ae5ec6b6..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(string memory s) public returns (bool ret) {
-        assembly {
-            let a := keccak256(s, 32)
-            let b := keccak256(s, 8)
-            ret := eq(a, b)
-        }
-    }
-}
-// ----
-// f(string): "" -> false
-// f(string): 0x20, 5, "hello" -> false
-// f(string): 0x20, 0x2e, 29457663690442756349866640336617293820574110049925353194191585327958485180523, 45859201465615193776739262511799714667061496775486067316261261194408342061056 -> false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
deleted file mode 100644
index 88088bbda84c..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function g() public returns (uint ret) {
-        uint x = type(uint).max;
-        assembly {
-            mstore(0x20, x)
-            // both old and new optimizer should be able to evaluate this
-            ret := keccak256(0x20, 16)
-        }
-    }
-
-    function f() public returns (uint ret) {
-        uint x = type(uint).max;
-        assembly {
-            mstore(0x20, x)
-            // For Yul optimizer, load resolver and loop invariant code motion
-            // would take the Keccak-256 outside the loop. For the old-optimizer,
-            // this is not possible.
-            // Net savings approximately: 20 * cost of Keccak-256 = 572
-            for {let i := 0} lt(i, 20) { i := add(i, 1) } {
-                ret := keccak256(0x20, 16)
-            }
-        }
-    }
-}
-// ----
-// f() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
-// gas irOptimized: 22239
-// gas legacy: 23385
-// gas legacyOptimized: 23092
-// g() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
-// gas irOptimized: 21277
-// gas legacy: 21462
-// gas legacyOptimized: 21256
diff --git a/test/libsolidity/semanticTests/inlineAssembly/leave.sol b/test/libsolidity/semanticTests/inlineAssembly/leave.sol
deleted file mode 100644
index 40add273e000..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/leave.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure returns (uint w) {
-        assembly {
-            function f() -> t {
-                t := 2
-                leave
-                t := 9
-            }
-            w := f()
-        }
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
deleted file mode 100644
index 1a72925d6fd2..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	function f() external returns (uint256 x) {
-		assembly {
-			mstore(0, 0x42)
-		}
-		assembly {
-			x := mload(0)
-		}
-	}
-	function g() external returns (bool) {
-		uint initialFreeMemoryPointer;
-		assembly {
-			initialFreeMemoryPointer := mload(0x40)
-		}
-		assembly {
-			let ptr := mload(0x40)
-			mstore(0x40, add(ptr, 0x20))
-		}
-		uint finalFreeMemoryPointer;
-		assembly {
-			finalFreeMemoryPointer := mload(0x40)
-		}
-		assert(initialFreeMemoryPointer != finalFreeMemoryPointer);
-		return true;
-	}
-}
-// ----
-// f() -> 0x42
-// g() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol
deleted file mode 100644
index 023d178a9317..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract Test {
-	uint256 x;
-
-	function test() public returns (uint256) {
-		uint256 a = myGetX();
-		x = 5;
-		uint256 b = myGetX();
-		assembly {
-			log0(0, 64)
-		}
-		return a + b + myGetX();
-	}
-
-	function myGetX() internal view returns (uint256) {
-		assembly {
-			mstore(1, 0x123456789abcdef)
-		}
-		return x;
-	}
-}
-// ----
-// test() -> 10
-// ~ emit <anonymous>: 0x0123456789abcd, 0xef00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol b/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
deleted file mode 100644
index 8a71c8f4e68d..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public view returns (uint ret) {
-        assembly {
-            ret := prevrandao()
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol b/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol
deleted file mode 100644
index 1637de5b9e54..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public payable returns (uint ret) {
-        assembly {
-            ret := selfbalance()
-        }
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// f(), 254 wei -> 254
diff --git a/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol b/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
deleted file mode 100644
index d7e585e33e75..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function add(uint, uint) public pure returns (uint) { return 7; }
-    function g() public pure returns (uint x, uint y) {
-        x = add(1, 2);
-        assembly {
-            y := add(1, 2)
-        }
-    }
-}
-// ----
-// g() -> 7, 3
diff --git a/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol b/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
deleted file mode 100644
index abfc6d09be32..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    struct S {
-        uint a;
-        uint b;
-    }
-
-    mapping(uint => S) public mappingAccess;
-
-    function data() internal view returns (S storage _data) {
-        // We need to assign it from somewhere, otherwise we would
-        // get an "uninitialized access" error.
-        _data = mappingAccess[20];
-
-        bytes32 slot = keccak256(abi.encode(uint(1), uint(0)));
-        assembly {
-            _data.slot := slot
-        }
-    }
-
-    function set(uint x) public {
-        data().a = x;
-    }
-
-    function get() public view returns (uint) {
-        return data().a;
-    }
-}
-// ----
-// get() -> 0
-// mappingAccess(uint256): 1 -> 0, 0
-// set(uint256): 4
-// get() -> 4
-// mappingAccess(uint256): 1 -> 4, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
deleted file mode 100644
index e080985e36fe..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    mapping(uint => uint) private m0;
-    mapping(uint => uint) private m1;
-    mapping(uint => uint) private m2;
-
-    function f(uint i) public returns (uint slot, uint offset) {
-        mapping(uint => uint) storage m0Ptr = m0;
-        mapping(uint => uint) storage m1Ptr = m1;
-        mapping(uint => uint) storage m2Ptr = m2;
-
-        assembly {
-            switch i
-            case 1 {
-                slot := m1Ptr.slot
-                offset := m1Ptr.offset
-            }
-            case 2 {
-                slot := m2Ptr.slot
-                offset := m2Ptr.offset
-            }
-            default {
-                slot := m0Ptr.slot
-                offset := m0Ptr.offset
-            }
-        }
-    }
-}
-// ----
-// f(uint256): 0 -> 0, 0
-// f(uint256): 1 -> 1, 0
-// f(uint256): 2 -> 2, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol b/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
deleted file mode 100644
index 4183642bb082..000000000000
--- a/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (uint x, uint y) {
-        assembly {
-            x := true
-            y := false
-        }
-    }
-}
-// ----
-// f() -> 1, 0
diff --git a/test/libsolidity/semanticTests/integer/basic.sol b/test/libsolidity/semanticTests/integer/basic.sol
deleted file mode 100644
index cea56cd7cbc0..000000000000
--- a/test/libsolidity/semanticTests/integer/basic.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function basic() public pure returns(bool) {
-		uint uint_min = type(uint).min;
-		require(uint_min == 0);
-
-		uint uint_max = type(uint).max;
-		require(uint_max == 2**256 - 1);
-		require(uint_max == 115792089237316195423570985008687907853269984665640564039457584007913129639935);
-
-		int int_min = type(int).min;
-		require(int_min == -2**255);
-		require(int_min == -57896044618658097711785492504343953926634992332820282019728792003956564819968);
-
-		int int_max = type(int).max;
-		require(int_max == 2**255 -1);
-		require(int_max == 57896044618658097711785492504343953926634992332820282019728792003956564819967);
-
-		return true;
-	}
-}
-// ----
-// basic() -> true
diff --git a/test/libsolidity/semanticTests/integer/int.sol b/test/libsolidity/semanticTests/integer/int.sol
deleted file mode 100644
index d3681a0ee267..000000000000
--- a/test/libsolidity/semanticTests/integer/int.sol
+++ /dev/null
@@ -1,243 +0,0 @@
-contract test {
-
-	function intMinA() public pure returns (bool) {
-
-		int8 int8_min = type(int8).min;
-		require(int8_min == -2**7);
-
-		int16 int16_min = type(int16).min;
-		require(int16_min == -2**15);
-
-		int24 int24_min = type(int24).min;
-		require(int24_min == -2**23);
-
-		int32 int32_min = type(int32).min;
-		require(int32_min == -2**31);
-
-		int40 int40_min = type(int40).min;
-		require(int40_min == -2**39);
-
-		int48 int48_min = type(int48).min;
-		require(int48_min == -2**47);
-
-		int56 int56_min = type(int56).min;
-		require(int56_min == -2**55);
-
-		int64 int64_min = type(int64).min;
-		require(int64_min == -2**63);
-
-		return true;
-	}
-
-	function intMinB() public pure returns(bool) {
-
-		int72 int72_min = type(int72).min;
-		require(int72_min == -2**71);
-
-		int80 int80_min = type(int80).min;
-		require(int80_min == -2**79);
-
-		int88 int88_min = type(int88).min;
-		require(int88_min == -2**87);
-
-		int96 int96_min = type(int96).min;
-		require(int96_min == -2**95);
-
-		int104 int104_min = type(int104).min;
-		require(int104_min == -2**103);
-
-		int112 int112_min = type(int112).min;
-		require(int112_min == -2**111);
-
-		int120 int120_min = type(int120).min;
-		require(int120_min == -2**119);
-
-		int128 int128_min = type(int128).min;
-		require(int128_min == -2**127);
-
-		return true;
-	}
-
-	function intMinC() public pure returns (bool) {
-
-		int136 int136_min = type(int136).min;
-		require(int136_min == -2**135);
-
-		int144 int144_min = type(int144).min;
-		require(int144_min == -2**143);
-
-		int152 int152_min = type(int152).min;
-		require(int152_min == -2**151);
-
-		int160 int160_min = type(int160).min;
-		require(int160_min == -2**159);
-
-		int168 int168_min = type(int168).min;
-		require(int168_min == -2**167);
-
-		int176 int176_min = type(int176).min;
-		require(int176_min == -2**175);
-
-		int184 int184_min = type(int184).min;
-		require(int184_min == -2**183);
-
-		int192 int192_min = type(int192).min;
-		require(int192_min == -2**191);
-
-		return true;
-	}
-
-	function intMinD() public pure returns(bool) {
-
-		int200 int200_min = type(int200).min;
-		require(int200_min == -2**199);
-
-		int208 int208_min = type(int208).min;
-		require(int208_min == -2**207);
-
-		int216 int216_min = type(int216).min;
-		require(int216_min == -2**215);
-
-		int224 int224_min = type(int224).min;
-		require(int224_min == -2**223);
-
-		int232 int232_min = type(int232).min;
-		require(int232_min == -2**231);
-
-		int240 int240_min = type(int240).min;
-		require(int240_min == -2**239);
-
-		int248 int248_min = type(int248).min;
-		require(int248_min == -2**247);
-
-		int256 int256_min = type(int256).min;
-		require(int256_min == -2**255);
-
-		return true;
-	}
-
-	function intMaxA() public pure returns (bool) {
-
-		int8 int8_max = type(int8).max;
-		require(int8_max == 2**7-1);
-
-		int16 int16_max = type(int16).max;
-		require(int16_max == 2**15-1);
-
-		int24 int24_max = type(int24).max;
-		require(int24_max == 2**23-1);
-
-		int32 int32_max = type(int32).max;
-		require(int32_max == 2**31-1);
-
-		int40 int40_max = type(int40).max;
-		require(int40_max == 2**39-1);
-
-		int48 int48_max = type(int48).max;
-		require(int48_max == 2**47-1);
-
-		int56 int56_max = type(int56).max;
-		require(int56_max == 2**55-1);
-
-		int64 int64_max = type(int64).max;
-		require(int64_max == 2**63-1);
-
-		return true;
-	}
-
-	function intMaxB() public pure returns(bool) {
-
-		int72 int72_max = type(int72).max;
-		require(int72_max == 2**71-1);
-
-		int80 int80_max = type(int80).max;
-		require(int80_max == 2**79-1);
-
-		int88 int88_max = type(int88).max;
-		require(int88_max == 2**87-1);
-
-		int96 int96_max = type(int96).max;
-		require(int96_max == 2**95-1);
-
-		int104 int104_max = type(int104).max;
-		require(int104_max == 2**103-1);
-
-		int112 int112_max = type(int112).max;
-		require(int112_max == 2**111-1);
-
-		int120 int120_max = type(int120).max;
-		require(int120_max == 2**119-1);
-
-		int128 int128_max = type(int128).max;
-		require(int128_max == 2**127-1);
-
-		return true;
-	}
-
-	function intMaxC() public pure returns (bool) {
-
-		int136 int136_max = type(int136).max;
-		require(int136_max == 2**135-1);
-
-		int144 int144_max = type(int144).max;
-		require(int144_max == 2**143-1);
-
-		int152 int152_max = type(int152).max;
-		require(int152_max == 2**151-1);
-
-		int160 int160_max = type(int160).max;
-		require(int160_max == 2**159-1);
-
-		int168 int168_max = type(int168).max;
-		require(int168_max == 2**167-1);
-
-		int176 int176_max = type(int176).max;
-		require(int176_max == 2**175-1);
-
-		int184 int184_max = type(int184).max;
-		require(int184_max == 2**183-1);
-
-		int192 int192_max = type(int192).max;
-		require(int192_max == 2**191-1);
-
-		return true;
-	}
-
-	function intMaxD() public pure returns(bool) {
-
-		int200 int200_max = type(int200).max;
-		require(int200_max == 2**199-1);
-
-		int208 int208_max = type(int208).max;
-		require(int208_max == 2**207-1);
-
-		int216 int216_max = type(int216).max;
-		require(int216_max == 2**215-1);
-
-		int224 int224_max = type(int224).max;
-		require(int224_max == 2**223-1);
-
-		int232 int232_max = type(int232).max;
-		require(int232_max == 2**231-1);
-
-		int240 int240_max = type(int240).max;
-		require(int240_max == 2**239-1);
-
-		int248 int248_max = type(int248).max;
-		require(int248_max == 2**247-1);
-
-		int256 int256_max = type(int256).max;
-		require(int256_max == 2**255-1);
-
-		return true;
-	}
-}
-// ----
-// intMinA() -> true
-// intMinB() -> true
-// intMinC() -> true
-// intMinD() -> true
-// intMaxA() -> true
-// intMaxB() -> true
-// intMaxC() -> true
-// intMaxD() -> true
diff --git a/test/libsolidity/semanticTests/integer/many_local_variables.sol b/test/libsolidity/semanticTests/integer/many_local_variables.sol
deleted file mode 100644
index c43f92696898..000000000000
--- a/test/libsolidity/semanticTests/integer/many_local_variables.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function run(uint x1, uint x2, uint x3) public returns(uint y) {
-        uint8 a = 0x1; uint8 b = 0x10; uint16 c = 0x100;
-        y = a + b + c + x1 + x2 + x3;
-        y += b + x2;
-    }
-}
-// ----
-// run(uint256,uint256,uint256): 0x1000, 0x10000, 0x100000 -> 0x121121
diff --git a/test/libsolidity/semanticTests/integer/small_signed_types.sol b/test/libsolidity/semanticTests/integer/small_signed_types.sol
deleted file mode 100644
index 4c0311e50f92..000000000000
--- a/test/libsolidity/semanticTests/integer/small_signed_types.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function run() public returns(int256 y) {
-        return -int32(10) * -int64(20);
-    }
-}
-// ----
-// run() -> 200
diff --git a/test/libsolidity/semanticTests/integer/uint.sol b/test/libsolidity/semanticTests/integer/uint.sol
deleted file mode 100644
index ccd32fab4119..000000000000
--- a/test/libsolidity/semanticTests/integer/uint.sol
+++ /dev/null
@@ -1,242 +0,0 @@
-contract test {
-
-	function uintMinA() public pure returns(bool) {
-
-		uint8 uint8_min = type(uint8).min;
-		require(uint8_min == 0);
-
-		uint16 uint16_min = type(uint16).min;
-		require(uint16_min == 0);
-
-		uint24 uint24_min = type(uint24).min;
-		require(uint24_min == 0);
-
-		uint32 uint32_min = type(uint32).min;
-		require(uint32_min == 0);
-
-		uint40 uint40_min = type(uint40).min;
-		require(uint40_min == 0);
-
-		uint48 uint48_min = type(uint48).min;
-		require(uint48_min == 0);
-
-		uint56 uint56_min = type(uint56).min;
-		require(uint56_min == 0);
-
-		uint64 uint64_min = type(uint64).min;
-		require(uint64_min == 0);
-
-		return true;
-	}
-
-	function uintMinB() public pure returns(bool) {
-
-		uint72 uint72_min = type(uint72).min;
-		require(uint72_min == 0);
-
-		uint80 uint80_min = type(uint80).min;
-		require(uint80_min == 0);
-
-		uint88 uint88_min = type(uint88).min;
-		require(uint88_min == 0);
-
-		uint96 uint96_min = type(uint96).min;
-		require(uint96_min == 0);
-
-		uint104 uint104_min = type(uint104).min;
-		require(uint104_min == 0);
-
-		uint112 uint112_min = type(uint112).min;
-		require(uint112_min == 0);
-
-		uint120 uint120_min = type(uint120).min;
-		require(uint120_min == 0);
-
-		uint128 uint128_min = type(uint128).min;
-		require(uint128_min == 0);
-
-		return true;
-	}
-
-	function uintMinC() public pure returns(bool) {
-
-		uint136 uint136_min = type(uint136).min;
-		require(uint136_min == 0);
-
-		uint144 uint144_min = type(uint144).min;
-		require(uint144_min == 0);
-
-		uint152 uint152_min = type(uint152).min;
-		require(uint152_min == 0);
-
-		uint160 uint160_min = type(uint160).min;
-		require(uint160_min == 0);
-
-		uint168 uint168_min = type(uint168).min;
-		require(uint168_min == 0);
-
-		uint176 uint176_min = type(uint176).min;
-		require(uint176_min == 0);
-
-		uint184 uint184_min = type(uint184).min;
-		require(uint184_min == 0);
-
-		uint192 uint192_min = type(uint192).min;
-		require(uint192_min == 0);
-
-		return true;
-	}
-
-	function uintMinD() public pure returns(bool) {
-
-		uint200 uint200_min = type(uint200).min;
-		require(uint200_min == 0);
-
-		uint208 uint208_min = type(uint208).min;
-		require(uint208_min == 0);
-
-		uint216 uint216_min = type(uint216).min;
-		require(uint216_min == 0);
-
-		uint224 uint224_min = type(uint224).min;
-		require(uint224_min == 0);
-
-		uint232 uint232_min = type(uint232).min;
-		require(uint232_min == 0);
-
-		uint240 uint240_min = type(uint240).min;
-		require(uint240_min == 0);
-
-		uint248 uint248_min = type(uint248).min;
-		require(uint248_min == 0);
-
-		uint256 uint256_min = type(uint256).min;
-		require(uint256_min == 0);
-
-		return true;
-	}
-
-	function uintMaxA() public pure returns (bool) {
-
-		uint8 uint8_max = type(uint8).max;
-		require(uint8_max == 2**8-1);
-
-		uint16 uint16_max = type(uint16).max;
-		require(uint16_max == 2**16-1);
-
-		uint24 uint24_max = type(uint24).max;
-		require(uint24_max == 2**24-1);
-
-		uint32 uint32_max = type(uint32).max;
-		require(uint32_max == 2**32-1);
-
-		uint40 uint40_max = type(uint40).max;
-		require(uint40_max == 2**40-1);
-
-		uint48 uint48_max = type(uint48).max;
-		require(uint48_max == 2**48-1);
-
-		uint56 uint56_max = type(uint56).max;
-		require(uint56_max == 2**56-1);
-
-		uint64 uint64_max = type(uint64).max;
-		require(uint64_max == 2**64-1);
-
-		return true;
-	}
-
-	function uintMaxB() public pure returns (bool) {
-
-		uint72 uint72_max = type(uint72).max;
-		require(uint72_max == 2**72-1);
-
-		uint80 uint80_max = type(uint80).max;
-		require(uint80_max == 2**80-1);
-
-		uint88 uint88_max = type(uint88).max;
-		require(uint88_max == 2**88-1);
-
-		uint96 uint96_max = type(uint96).max;
-		require(uint96_max == 2**96-1);
-
-		uint104 uint104_max = type(uint104).max;
-		require(uint104_max == 2**104-1);
-
-		uint112 uint112_max = type(uint112).max;
-		require(uint112_max == 2**112-1);
-
-		uint120 uint120_max = type(uint120).max;
-		require(uint120_max == 2**120-1);
-
-		uint128 uint128_max = type(uint128).max;
-		require(uint128_max == 2**128-1);
-
-		return true;
-	}
-
-	function uintMaxC() public pure returns (bool) {
-
-		uint136 uint136_max = type(uint136).max;
-		require(uint136_max == 2**136-1);
-
-		uint144 uint144_max = type(uint144).max;
-		require(uint144_max == 2**144-1);
-
-		uint152 uint152_max = type(uint152).max;
-		require(uint152_max == 2**152-1);
-
-		uint160 uint160_max = type(uint160).max;
-		require(uint160_max == 2**160-1);
-
-		uint168 uint168_max = type(uint168).max;
-		require(uint168_max == 2**168-1);
-
-		uint176 uint176_max = type(uint176).max;
-		require(uint176_max == 2**176-1);
-
-		uint184 uint184_max = type(uint184).max;
-		require(uint184_max == 2**184-1);
-
-		uint192 uint192_max = type(uint192).max;
-		require(uint192_max == 2**192-1);
-
-		return true;
-	}
-
-	function uintMaxD() public pure returns(bool) {
-		uint200 uint200_max = type(uint200).max;
-		require(uint200_max == 2**200-1);
-
-		uint208 uint208_max = type(uint208).max;
-		require(uint208_max == 2**208-1);
-
-		uint216 uint216_max = type(uint216).max;
-		require(uint216_max == 2**216-1);
-
-		uint224 uint224_max = type(uint224).max;
-		require(uint224_max == 2**224-1);
-
-		uint232 uint232_max = type(uint232).max;
-		require(uint232_max == 2**232-1);
-
-		uint240 uint240_max = type(uint240).max;
-		require(uint240_max == 2**240-1);
-
-		uint248 uint248_max = type(uint248).max;
-		require(uint248_max == 2**248-1);
-
-		uint256 uint256_max = type(uint256).max;
-		require(uint256_max == 2**256-1);
-
-		return true;
-	}
-}
-// ----
-// uintMinA() -> true
-// uintMinB() -> true
-// uintMinC() -> true
-// uintMinD() -> true
-// uintMaxA() -> true
-// uintMaxB() -> true
-// uintMaxC() -> true
-// uintMaxD() -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/homer.sol b/test/libsolidity/semanticTests/interfaceID/homer.sol
deleted file mode 100644
index fbe6293ddb63..000000000000
--- a/test/libsolidity/semanticTests/interfaceID/homer.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-interface Simpson {
-    function is2D() external returns (bool);
-    function skinColor() external returns (string memory);
-}
-
-contract Homer is ERC165, Simpson {
-    function supportsInterface(bytes4 interfaceID) external view override returns (bool) {
-        return
-            interfaceID == this.supportsInterface.selector || // ERC165
-            interfaceID == this.is2D.selector ^ this.skinColor.selector; // Simpson
-    }
-
-    function is2D() external override returns (bool) {
-        return true;
-    }
-
-    function skinColor() external override returns (string memory) {
-        return "yellow";
-    }
-}
-// ----
-// supportsInterface(bytes4): left(0x01ffc9a0) -> false
-// supportsInterface(bytes4): left(0x01ffc9a7) -> true
-// supportsInterface(bytes4): left(0x73b6b492) -> true
-// supportsInterface(bytes4): left(0x70b6b492) -> false
diff --git a/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
deleted file mode 100644
index c66169cd3e2b..000000000000
--- a/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-interface Simpson {
-    function is2D() external returns (bool);
-    function skinColor() external returns (string memory);
-}
-
-contract Homer is ERC165, Simpson {
-    function supportsInterface(bytes4 interfaceID) external view override returns (bool) {
-        return
-            interfaceID == type(ERC165).interfaceId ||
-            interfaceID == type(Simpson).interfaceId;
-    }
-
-    function is2D() external override returns (bool) {
-        return true;
-    }
-
-    function skinColor() external override returns (string memory) {
-        return "yellow";
-    }
-}
-// ----
-// supportsInterface(bytes4): left(0x01ffc9a0) -> false
-// supportsInterface(bytes4): left(0x01ffc9a7) -> true
-// supportsInterface(bytes4): left(0x73b6b492) -> true
-// supportsInterface(bytes4): left(0x70b6b492) -> false
diff --git a/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol b/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
deleted file mode 100644
index 9bbf11bedbe2..000000000000
--- a/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface HelloWorld {
-    function hello() external pure;
-    function world(int) external pure;
-}
-
-interface HelloWorldWithEvent {
-    event Event();
-    function hello() external pure;
-    function world(int) external pure;
-}
-
-contract Test {
-    bytes4 public hello_world = type(HelloWorld).interfaceId;
-    bytes4 public hello_world_with_event = type(HelloWorldWithEvent).interfaceId;
-}
-// ----
-// hello_world() -> left(0xc6be8b58)
-// hello_world_with_event() -> left(0xc6be8b58)
diff --git a/test/libsolidity/semanticTests/interfaceID/interfaces.sol b/test/libsolidity/semanticTests/interfaceID/interfaces.sol
deleted file mode 100644
index f66d859ea347..000000000000
--- a/test/libsolidity/semanticTests/interfaceID/interfaces.sol
+++ /dev/null
@@ -1,61 +0,0 @@
-interface HelloWorld {
-    function hello() external pure;
-    function world(int) external pure;
-}
-
-interface HelloWorldDerived is HelloWorld {
-    function other() external pure;
-}
-
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-contract Test {
-    bytes4 public ghello_world_interfaceId = type(HelloWorld).interfaceId;
-    bytes4 public ERC165_interfaceId = type(ERC165).interfaceId;
-
-    function hello() public pure returns (bytes4 data){
-        HelloWorld i;
-        return i.hello.selector;
-    }
-
-    function world() public pure returns (bytes4 data){
-        HelloWorld i;
-        return i.world.selector;
-    }
-
-    function hello_world() public pure returns (bytes4 data){
-        // HelloWorld i;
-        // return i.hello.selector ^ i.world.selector; // = 0xc6be8b58
-        return 0xc6be8b58;
-    }
-
-    function hello_world_interfaceId() public pure returns (bytes4 data){
-        return type(HelloWorld).interfaceId;
-    }
-
-    function other() public pure returns (bytes4 data){
-        HelloWorldDerived i;
-        return i.other.selector;
-    }
-
-    function hello_world_derived_interfaceId() public pure returns (bytes4 data){
-        return type(HelloWorldDerived).interfaceId;
-    }
-}
-// ----
-// hello() -> left(0x19ff1d21)
-// world() -> left(0xdf419679)
-// ERC165_interfaceId() -> left(0x01ffc9a7)
-// hello_world() -> left(0xc6be8b58)
-// hello_world_interfaceId() -> left(0xc6be8b58)
-// ghello_world_interfaceId() -> left(0xc6be8b58)
-// other() -> left(0x85295877)
-// hello_world_derived_interfaceId() -> left(0x85295877)
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa.sol b/test/libsolidity/semanticTests/interfaceID/lisa.sol
deleted file mode 100644
index 722502d86fa0..000000000000
--- a/test/libsolidity/semanticTests/interfaceID/lisa.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-abstract contract ERC165MappingImplementation is ERC165 {
-    /// @dev You must not set element 0xffffffff to true
-    mapping(bytes4 => bool) internal supportedInterfaces;
-
-    constructor() {
-        supportedInterfaces[this.supportsInterface.selector] = true;
-    }
-
-    function supportsInterface(bytes4 interfaceID) external view override returns (bool) {
-        return supportedInterfaces[interfaceID];
-    }
-}
-
-interface Simpson {
-    function is2D() external returns (bool);
-    function skinColor() external returns (string memory);
-}
-
-contract Lisa is ERC165MappingImplementation, Simpson {
-    constructor() {
-        supportedInterfaces[this.is2D.selector ^ this.skinColor.selector] = true;
-    }
-
-    function is2D() external override returns (bool) {
-        return true;
-    }
-
-    function skinColor() external override returns (string memory) {
-        return "yellow";
-    }
-}
-// ----
-// supportsInterface(bytes4): left(0x01ffc9a0) -> false
-// supportsInterface(bytes4): left(0x01ffc9a7) -> true
-// supportsInterface(bytes4): left(0x73b6b492) -> true
-// supportsInterface(bytes4): left(0x70b6b492) -> false
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
deleted file mode 100644
index 457ac8856eb7..000000000000
--- a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-abstract contract ERC165MappingImplementation is ERC165 {
-    /// @dev You must not set element 0xffffffff to true
-    mapping(bytes4 => bool) internal supportedInterfaces;
-
-    constructor() {
-        supportedInterfaces[this.supportsInterface.selector] = true;
-    }
-
-    function supportsInterface(bytes4 interfaceID) external view override returns (bool) {
-        return supportedInterfaces[interfaceID];
-    }
-}
-
-interface Simpson {
-    function is2D() external returns (bool);
-    function skinColor() external returns (string memory);
-}
-
-contract Lisa is ERC165MappingImplementation, Simpson {
-    constructor() {
-        supportedInterfaces[type(Simpson).interfaceId] = true;
-    }
-
-    function is2D() external override returns (bool) {
-        return true;
-    }
-
-    function skinColor() external override returns (string memory) {
-        return "yellow";
-    }
-}
-// ----
-// supportsInterface(bytes4): left(0x01ffc9a0) -> false
-// supportsInterface(bytes4): left(0x01ffc9a7) -> true
-// supportsInterface(bytes4): left(0x73b6b492) -> true
-// supportsInterface(bytes4): left(0x70b6b492) -> false
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
deleted file mode 100644
index 62e1e4fba6dc..000000000000
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-interface Parent {
-    function parentFun() external returns (uint256);
-}
-
-interface SubA is Parent {
-    function subAFun() external returns (uint256);
-}
-
-interface SubB is Parent {
-    function subBFun() external returns (uint256);
-}
-
-contract Impl is SubA, SubB {
-    function parentFun() override external returns (uint256) { return 1; }
-    function subAFun() override external returns (uint256) { return 2; }
-    function subBFun() override external returns (uint256) { return 3; }
-}
-
-contract C {
-    function convertParent() public returns (uint256) {
-        Parent p = new Impl();
-        return p.parentFun();
-    }
-
-    function convertSubA() public returns (uint256, uint256) {
-        SubA sa = new Impl();
-        return (sa.parentFun(), sa.subAFun());
-    }
-
-    function convertSubB() public returns (uint256, uint256) {
-        SubB sb = new Impl();
-        return (sb.parentFun(), sb.subBFun());
-    }
-}
-// ----
-// convertParent() -> 1
-// gas irOptimized: 85524
-// convertSubA() -> 1, 2
-// gas irOptimized: 86155
-// gas legacy: 99047
-// convertSubB() -> 1, 3
-// gas irOptimized: 86098
-// gas legacy: 98981
diff --git a/test/libsolidity/semanticTests/isoltestFormatting.sol b/test/libsolidity/semanticTests/isoltestFormatting.sol
deleted file mode 100644
index 9380dc01588e..000000000000
--- a/test/libsolidity/semanticTests/isoltestFormatting.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public returns (uint[5] memory) {
-        uint[5] memory a = [4, 11, 0x111, uint(3355443), 2222222222222222222];
-        return a;
-    }
-    function g() public returns (uint[5] memory) {
-        uint[5] memory a = [16, 256, 257, uint(0x333333), 0x1ed6eb565788e38e];
-        return a;
-    }
-}
-// ----
-// f() -> 4, 11, 0x0111, 0x333333, 2222222222222222222
-// g() -> 0x10, 0x0100, 0x0101, 0x333333, 2222222222222222222
diff --git a/test/libsolidity/semanticTests/isoltestTesting/account.sol b/test/libsolidity/semanticTests/isoltestTesting/account.sol
deleted file mode 100644
index 7b6c55b1e79e..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/account.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract AccountBuiltinTest {
-    function who_am_i() public returns (address result) {
-        result = msg.sender;
-    }
-}
-// ----
-// constructor()
-// account: 0 -> 0x1212121212121212121212121212120000000012
-// who_am_i() -> 0x1212121212121212121212121212120000000012
-// balance: 0x1212121212121212121212121212120000000012 -> 1267650600228229401496703205376
-// account: 1 -> 0x1212121212121212121212121212120000001012
-// who_am_i() -> 0x1212121212121212121212121212120000001012
-// balance: 0x1212121212121212121212121212120000001012 -> 1267650600228229401496703205376
-// account: 2 -> 0x1212121212121212121212121212120000002012
-// who_am_i() -> 0x1212121212121212121212121212120000002012
-// balance: 0x1212121212121212121212121212120000002012 -> 1267650600228229401496703205376
-// account: 3 -> 0x1212121212121212121212121212120000003012
-// who_am_i() -> 0x1212121212121212121212121212120000003012
-// balance: 0x1212121212121212121212121212120000003012 -> 1267650600228229401496703205376
-// account: 4 -> 0x1212121212121212121212121212120000004012
-// who_am_i() -> 0x1212121212121212121212121212120000004012
-// balance: 0x1212121212121212121212121212120000004012 -> 1267650600228229401496703205376
-// account: 5 -> 0x1212121212121212121212121212120000005012
-// who_am_i() -> 0x1212121212121212121212121212120000005012
-// balance: 0x1212121212121212121212121212120000005012 -> 1267650600228229401496703205376
-// account: 6 -> 0x1212121212121212121212121212120000006012
-// who_am_i() -> 0x1212121212121212121212121212120000006012
-// balance: 0x1212121212121212121212121212120000006012 -> 1267650600228229401496703205376
-// account: 7 -> 0x1212121212121212121212121212120000007012
-// who_am_i() -> 0x1212121212121212121212121212120000007012
-// balance: 0x1212121212121212121212121212120000007012 -> 1267650600228229401496703205376
-// account: 8 -> 0x1212121212121212121212121212120000008012
-// who_am_i() -> 0x1212121212121212121212121212120000008012
-// balance: 0x1212121212121212121212121212120000008012 -> 1267650600228229401496703205376
-// account: 9 -> 0x1212121212121212121212121212120000009012
-// who_am_i() -> 0x1212121212121212121212121212120000009012
-// balance: 0x1212121212121212121212121212120000009012 -> 1267650600228229401496703205376
-// account: 10 -> 0x121212121212121212121212121212000000a012
-// who_am_i() -> 0x121212121212121212121212121212000000a012
-// balance: 0x121212121212121212121212121212000000a012 -> 0
-// account: 11 -> 0x121212121212121212121212121212000000b012
-// who_am_i() -> 0x121212121212121212121212121212000000b012
-// balance: 0x121212121212121212121212121212000000b012 -> 0
-// account: 12 -> 0x121212121212121212121212121212000000c012
-// who_am_i() -> 0x121212121212121212121212121212000000c012
-// balance: 0x121212121212121212121212121212000000c012 -> 0
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
deleted file mode 100644
index 306bc35670fe..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract Other {
-    constructor() payable {
-    }
-    function getAddress() public returns (address) {
-        return address(this);
-    }
-}
-contract ClientReceipt {
-    Other other;
-    constructor() payable {
-        other = new Other{value:500}();
-    }
-    function getAddress() public returns (address) {
-        return other.getAddress();
-    }
-}
-// ----
-// constructor(), 2000 wei ->
-// gas irOptimized: 169915
-// gas legacy: 230038
-// gas legacyOptimized: 173883
-// balance -> 1500
-// gas irOptimized: 191881
-// gas legacy: 235167
-// gas legacyOptimized: 180756
-// getAddress() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 500
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
deleted file mode 100644
index 3fd67d57ce3f..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract ClientReceipt {
-    constructor() payable {}
-}
-// ----
-// constructor(), 1000 wei ->
-// balance -> 1000
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
deleted file mode 100644
index 4b940fe869df..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract ClientReceipt {
-    constructor() payable {}
-}
-// ----
-// constructor(), 1 ether ->
-// balance -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
deleted file mode 100644
index 222fba4ecba6..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract ClientReceipt {
-}
-// ----
-// balance -> 0
-// balance: 0x0000000000000000000000000000000000000000 -> 0
diff --git a/test/libsolidity/semanticTests/isoltestTesting/builtins.sol b/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
deleted file mode 100644
index e8faa0cc4064..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract SmokeTest {
-}
-// ----
-// isoltest_builtin_test -> 0x1234
diff --git a/test/libsolidity/semanticTests/isoltestTesting/effects.sol b/test/libsolidity/semanticTests/isoltestTesting/effects.sol
deleted file mode 100644
index c9ab6c3eb2d5..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/effects.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract SmokeTest {
-}
-// ----
-// isoltest_side_effects_test -> 0
-// isoltest_side_effects_test: 0x1234 -> 0x1234
-// ~ 0000000000000000000000000000000000000000000000000000000000001234
-// isoltest_side_effects_test: 0x1234, 0x2345 # comment # -> 0x1234, 0x2345
-// ~ 0000000000000000000000000000000000000000000000000000000000001234
-// ~ 0000000000000000000000000000000000000000000000000000000000002345
-// isoltest_side_effects_test: 0x1234, 0x2345, 0x3456 -> 0x1234, 0x2345, 0x3456 # comment #
-// ~ 0000000000000000000000000000000000000000000000000000000000001234
-// ~ 0000000000000000000000000000000000000000000000000000000000002345
-// ~ 0000000000000000000000000000000000000000000000000000000000003456
diff --git a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
deleted file mode 100644
index a230cc9ab304..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(string memory s) external pure returns (string memory) {
-        return s;
-    }
-}
-// NOTE: The test is here to illustrate the problem with formatting control chars in strings in
-// test expectations but unfortunately it can only be triggered manually. It does not test anything
-// unless you introduce a difference in expectations to force isoltest to reformat them.
-// ----
-// f(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" # Input/Output: "😃😃😃😃" #
diff --git a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
deleted file mode 100644
index 11832a519165..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract StorageEmpty {
-}
-// ----
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
deleted file mode 100644
index 33b1a4d69cc1..000000000000
--- a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract StorageNotEmpty {
-    uint256 x;
-    function set(uint256 _a) public { x = _a; }
-}
-// ----
-// storageEmpty -> 1
-// set(uint256): 1 ->
-// storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol
deleted file mode 100644
index bc9e11de1eb1..000000000000
--- a/test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library D {
-    function f(bytes calldata _x) internal pure returns (bytes1) {
-        return _x[0];
-    }
-    function g(bytes memory _x) internal pure returns (bytes1) {
-        return _x[0];
-    }
-}
-
-contract C {
-    using D for bytes;
-    function f(bytes calldata _x) public pure returns (bytes1, bytes1) {
-        return (_x.f(), _x.g());
-    }
-}
-// ----
-// f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol
deleted file mode 100644
index 5c32d31e7e7b..000000000000
--- a/test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library D {
-    function f(bytes calldata _x) internal pure returns (bytes calldata) {
-        return _x;
-    }
-    function g(bytes calldata _x) internal pure returns (bytes memory) {
-        return _x;
-    }
-}
-
-contract C {
-    using D for bytes;
-    function f(bytes calldata _x) public pure returns (bytes1, bytes1) {
-        return (_x.f()[0], _x.g()[0]);
-    }
-}
-// ----
-// f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol b/test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol
deleted file mode 100644
index 1c1f0457f199..000000000000
--- a/test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library D {
-    function f(bytes calldata _x) public pure returns (bytes1) {
-        return _x[0];
-    }
-    function g(bytes memory _x) public pure returns (bytes1) {
-        return _x[0];
-    }
-}
-
-contract C {
-    using D for bytes;
-    function f(bytes calldata _x) public pure returns (bytes1, bytes1) {
-        return (_x.f(), _x.g());
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: D
-// f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol
deleted file mode 100644
index c194af882fcc..000000000000
--- a/test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library D {
-    function f(bytes calldata _x) public pure returns (bytes calldata) {
-        return _x;
-    }
-    function g(bytes calldata _x) public pure returns (bytes memory) {
-        return _x;
-    }
-}
-
-contract C {
-    using D for bytes;
-    function f(bytes calldata _x) public pure returns (bytes1, bytes1) {
-        return (_x.f()[0], _x.g()[0]);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: D
-// f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
deleted file mode 100644
index 1808d613951e..000000000000
--- a/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library L {
-    function run(
-        function(uint256) external returns (uint256) _operation,
-        uint256 _a
-    )
-        external
-        returns (uint256)
-    {
-        return _operation(_a);
-    }
-}
-
-contract C {
-    function double(uint256 _a) external returns (uint256) {
-        return _a * _a;
-    }
-
-    function g(uint256 _value) external returns (uint256) {
-        return L.run(this.double, _value);
-    }
-}
-// ----
-// library: L
-// g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
deleted file mode 100644
index e842fecaf3c2..000000000000
--- a/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function f(uint256[2] storage _a) external returns (uint256) {
-        return _a[0] * _a[1];
-    }
-}
-
-contract C {
-    uint256[2] x;
-
-    function g(uint256 _value) external returns (uint256) {
-        x[0] = x[1] = _value;
-        return L.f(x);
-    }
-}
-// ----
-// library: L
-// g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
deleted file mode 100644
index d009bed5cb7d..000000000000
--- a/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function f(mapping(uint256 => uint256) storage _a) external returns (uint256) {
-        return _a[0] * _a[1];
-    }
-}
-
-contract C {
-    mapping(uint256 => uint256) x;
-
-    function g(uint256 _value) external returns (uint256) {
-        x[0] = x[1] = _value;
-        return L.f(x);
-    }
-}
-// ----
-// library: L
-// g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
deleted file mode 100644
index 1fa930acc29b..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library L {
-    struct S {
-        uint256[] data;
-    }
-
-    function f(S memory _s) internal {
-        _s.data[3] += 2;
-    }
-}
-
-
-contract C {
-    using L for L.S;
-
-    function f() public returns (uint256) {
-        L.S memory x;
-        x.data = new uint256[](7);
-        x.data[3] = 8;
-        (x.f)();
-        return x.data[3];
-    }
-}
-// ----
-// f() -> 0x0a
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
deleted file mode 100644
index 5a76dabdfa42..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-	function f() internal returns (uint) {
-		return 3;
-	}
-}
-
-contract C {
-	function foo() public returns (uint) {
-		return (L.f)();
-	}
-}
-// ----
-// foo() -> 3
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
deleted file mode 100644
index 24299b6d14cd..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-// tests that internal library functions can be called from outside
-// and retain the same memory context (i.e. are pulled into the caller's code)
-// This has to work without linking, because everything will be inlined.
-library L {
-    function f(uint256[] memory _data) internal {
-        _data[3] = 2;
-    }
-}
-
-
-contract C {
-    function f() public returns (uint256) {
-        uint256[] memory x = new uint256[](7);
-        x[3] = 8;
-        L.f(x);
-        return x[3];
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol
deleted file mode 100644
index c5581b799194..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-library L {
-    function equals(address a, address b) internal pure returns (bool) {
-        return a == b;
-    }
-}
-
-contract C {
-    using L for address;
-
-    function foo(address a, address b) public returns (bool) {
-        return a.equals(b);
-    }
-}
-// ----
-// foo(address,address): 0x111122223333444455556666777788889999aAaa, 0x111122223333444455556666777788889999aAaa -> true
-// foo(address,address): 0x111122223333444455556666777788889999aAaa, 0x0000000000000000000000000000000000000000 -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol
deleted file mode 100644
index a4facc02a98b..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function transfer(address a) internal {}
-    function send(address a) internal {}
-}
-
-contract C {
-    using L for address;
-
-    function useTransfer(address a) public {
-        a.transfer();
-    }
-
-    function useSend(address a) public {
-        a.send();
-    }
-}
-// ----
-// useTransfer(address): 0x111122223333444455556666777788889999aAaa ->
-// useSend(address): 0x111122223333444455556666777788889999aAaa ->
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol
deleted file mode 100644
index 80e0153b66a1..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function pop(uint[2] memory a) internal {}
-    function push(uint[2] memory a) internal {}
-}
-
-contract C {
-    using L for uint[2];
-
-    function test() public {
-        uint[2] memory input;
-
-        input.push();
-        input.pop();
-    }
-}
-// ----
-// test() ->
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol
deleted file mode 100644
index bf49f4e7be54..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-library L {
-    function xor(bool a, bool b) internal pure returns (bool) {
-        return a != b;
-    }
-}
-
-contract C {
-    using L for bool;
-
-    function foo(bool a, bool b) public returns (bool) {
-        return a.xor(b);
-    }
-}
-// ----
-// foo(bool,bool): true, true -> false
-// foo(bool,bool): true, false -> true
-// foo(bool,bool): false, true -> true
-// foo(bool,bool): false, false -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
deleted file mode 100644
index a4a25f51ebde..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract E {}
-
-library L {
-    function foo(E e) internal pure returns (uint) {
-        return 42;
-    }
-}
-
-contract C {
-    using L for E;
-
-    function test() public returns (uint) {
-        E e = new E();
-        return e.foo();
-    }
-}
-// ----
-// test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol
deleted file mode 100644
index f759ea78df1a..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function at(uint[] memory a, uint i) internal pure returns (uint) {
-        return a[i];
-    }
-}
-
-contract C {
-    using L for uint[];
-
-    function secondItem() public returns (uint) {
-        uint[] memory input = new uint[](2);
-        input[0] = 0x11;
-        input[1] = 0x22;
-
-        return input.at(1);
-    }
-}
-// ----
-// secondItem() -> 0x22
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol
deleted file mode 100644
index 4dd3bad4e2e3..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    enum E { A, B }
-
-    function equals(E a, E b) internal pure returns (bool) {
-        return a == b;
-    }
-}
-
-contract C {
-    using L for L.E;
-
-    function equalsA(uint choice) public returns (bool) {
-        L.E x = L.E.A;
-        return x.equals(L.E(choice));
-    }
-}
-// ----
-// equalsA(uint256): 0 -> true
-// equalsA(uint256): 1 -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
deleted file mode 100644
index a2473e7e79d7..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    // NOTE: External function takes up two stack slots
-    function double(function(uint) external pure returns (uint) f, uint x) internal pure returns (uint) {
-        return f(x) * 2;
-    }
-}
-
-contract C {
-    using L for function(uint) external pure returns (uint);
-
-    function identity(uint x) external pure returns (uint) {
-        return x;
-    }
-
-    function test(uint value) public returns (uint) {
-        return this.identity.double(value);
-    }
-}
-// ----
-// test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol
deleted file mode 100644
index 28f621d59b0a..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function at(uint[2] memory a, uint i) internal pure returns (uint) {
-        return a[i];
-    }
-}
-
-contract C {
-    using L for uint[2];
-
-    function secondItem() public returns (uint) {
-        uint[2] memory input;
-        input[0] = 0x11;
-        input[1] = 0x22;
-
-        return input.at(1);
-    }
-}
-// ----
-// secondItem() -> 0x22
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol
deleted file mode 100644
index bf7d0ede844e..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-library L {
-    function add(bytes2 a, bytes2 b) internal pure returns (bytes2) {
-        return bytes2(uint16(a) + uint16(b));
-    }
-}
-
-contract C {
-    using L for bytes2;
-
-    function sum(bytes2 a, bytes2 b) public returns (bytes2) {
-        return a.add(b);
-    }
-}
-// ----
-// sum(bytes2,bytes2): left(0x1100), left(0x0022) -> left(0x1122)
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol
deleted file mode 100644
index 5234fb5e40c2..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-library L {
-    function add(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a + b;
-    }
-}
-
-contract C {
-    using L for uint256;
-
-    function foo(uint256 a, uint256 b) public returns (uint256) {
-        return a.add(b);
-    }
-}
-// ----
-// foo(uint256,uint256): 8, 42 -> 50
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
deleted file mode 100644
index 13228115a0e5..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-interface I {}
-contract E is I {}
-
-library L {
-    function foo(I i) internal pure returns (uint) {
-        return 42;
-    }
-}
-
-contract C {
-    using L for I;
-
-    function test() public returns (uint) {
-        E e = new E();
-        return I(e).foo();
-    }
-}
-// ----
-// test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
deleted file mode 100644
index 4397711c6f52..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function double(function(uint) internal pure returns (uint) f, uint x) internal pure returns (uint) {
-        return f(x) * 2;
-    }
-}
-
-contract C {
-    using L for function(uint) internal pure returns (uint);
-
-    function identity(uint x) internal pure returns (uint) {
-        return x;
-    }
-
-    function test(uint value) public returns (uint) {
-        return identity.double(value);
-    }
-}
-// ----
-// test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
deleted file mode 100644
index 4305b6d40e11..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function selector(function(uint) internal pure returns (uint) f, uint x) internal pure returns (uint) {
-        return f(x) * 2;
-    }
-}
-
-contract C {
-    using L for function(uint) internal pure returns (uint);
-
-    function identity(uint x) internal pure returns (uint) {
-        return x;
-    }
-
-    function test(uint value) public returns (uint) {
-        return identity.selector(value);
-    }
-}
-// ----
-// test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol
deleted file mode 100644
index da7ee6cccdf8..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library L {
-    function double(uint a) internal pure returns (uint) {
-        return a * 2;
-    }
-
-    function double(bytes memory a) internal pure returns (bytes memory) {
-        return bytes.concat(a, a);
-    }
-}
-
-contract C {
-    using L for *;
-
-    function double42() public returns (uint) {
-        return 42.double();
-    }
-
-    function doubleABC() public returns (bytes memory) {
-        return "abc".double();
-    }
-}
-// ----
-// double42() -> 84
-// doubleABC() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol
deleted file mode 100644
index d4cee5c97706..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    function at(mapping(uint => uint) storage a, uint i) internal view returns (uint) {
-        return a[i];
-    }
-}
-
-contract C {
-    using L for mapping(uint => uint);
-
-    mapping(uint => uint) map;
-
-    function mapValue(uint a) public returns (uint) {
-        map[42] = 0x24;
-        map[66] = 0x66;
-
-        return map.at(a);
-    }
-}
-// ----
-// mapValue(uint256): 42 -> 0x24
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol
deleted file mode 100644
index 3ed398f9ac1a..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-library L {
-    function at(string memory a, uint i) internal pure returns (uint8) {
-        return uint8(bytes(a)[i]);
-    }
-}
-
-contract C {
-    using L for string;
-
-    function secondChar() public returns (uint8) {
-        string memory input = "abc";
-        return input.at(1);
-    }
-}
-// ----
-// secondChar() -> 98
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol
deleted file mode 100644
index b7bc103f414c..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    function f(string memory a) internal pure returns (string memory) {
-        return a;
-    }
-    function g(string storage a) internal pure returns (string memory) {
-        return a;
-    }
-}
-
-contract C {
-    using L for string;
-    string s;
-
-    function test(string calldata x) public returns (string memory, string memory) {
-        s = x;
-        return (s.f(), s.g());
-    }
-}
-// ----
-// test(string): 0x20, 3, "def" -> 0x40, 0x80, 3, "def", 3, "def"
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
deleted file mode 100644
index e9f95c0ac1d2..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-// This has to work without linking, because everything will be inlined.
-library L {
-    struct S {
-        uint256[] data;
-    }
-
-    function f(S memory _s) internal {
-        _s.data[3] = 2;
-    }
-}
-
-
-contract C {
-    using L for L.S;
-
-    function f() public returns (uint256) {
-        L.S memory x;
-        x.data = new uint256[](7);
-        x.data[3] = 8;
-        x.f();
-        return x.data[3];
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
deleted file mode 100644
index 5ef12f69b41f..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-// tests that internal library functions that are called from outside and that
-// themselves call private functions are still able to (i.e. the private function
-// also has to be pulled into the caller's code)
-// This has to work without linking, because everything will be inlined.
-library L {
-    function g(uint256[] memory _data) private {
-        _data[3] = 2;
-    }
-
-    function f(uint256[] memory _data) internal {
-        g(_data);
-    }
-}
-
-
-contract C {
-    function f() public returns (uint256) {
-        uint256[] memory x = new uint256[](7);
-        x[3] = 8;
-        L.f(x);
-        return x[3];
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
deleted file mode 100644
index 0681fd0d0743..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-library L {
-    function f() internal returns (uint) {
-        return 66;
-    }
-}
-
-contract C {
-    function g() public returns (uint) {
-        function() internal returns(uint) ptr;
-        ptr = L.f;
-        return ptr();
-    }
-}
-// ----
-// g() -> 66
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
deleted file mode 100644
index d6e0e926208b..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-// This has to work without linking, because everything will be inlined.
-library L {
-    struct S {
-        uint256[] data;
-    }
-
-    function f(S memory _s) internal returns (uint256[] memory) {
-        _s.data[3] = 2;
-        return _s.data;
-    }
-}
-
-
-contract C {
-    using L for L.S;
-
-    function f() public returns (uint256) {
-        L.S memory x;
-        x.data = new uint256[](7);
-        x.data[3] = 8;
-        return x.f()[3];
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
deleted file mode 100644
index 79d53273ba7e..000000000000
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-library Lib {
-    function find(uint16[] storage _haystack, uint16 _needle) public view returns (uint)
-    {
-        for (uint i = 0; i < _haystack.length; ++i)
-            if (_haystack[i] == _needle)
-                return i;
-        return type(uint).max;
-    }
-}
-contract Test {
-    mapping(string => uint16[]) data;
-    function f() public returns (uint a, uint b)
-    {
-        while (data["abc"].length < 20)
-            data["abc"].push();
-        data["abc"][4] = 9;
-        data["abc"][17] = 3;
-        a = Lib.find(data["abc"], 9);
-        b = Lib.find(data["abc"], 3);
-    }
-}
-// ----
-// library: Lib
-// f() -> 4, 0x11
-// gas irOptimized: 111560
-// gas legacy: 132935
-// gas legacyOptimized: 118023
diff --git a/test/libsolidity/semanticTests/libraries/library_address.sol b/test/libsolidity/semanticTests/libraries/library_address.sol
deleted file mode 100644
index 6ca064445012..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_address.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-library L {
-    function f(uint256 v) external pure returns (uint) {
-        return v * v;
-    }
-    function g(uint256 v) external returns (uint) {
-        return v * v;
-    }
-}
-contract C {
-    function addr() public view returns (bool) {
-        return address(L) == address(0);
-    }
-    function g(uint256 v) public view returns (uint256) {
-        return L.f(v);
-    }
-    function h(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(L).delegatecall(abi.encodeWithSignature("f(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-    function i(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(L).call(abi.encodeWithSignature("f(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-    function j(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(L).delegatecall(abi.encodeWithSignature("g(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-    function k(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(L).call(abi.encodeWithSignature("g(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// library: L
-// addr() -> false
-// g(uint256): 1 -> 1
-// g(uint256): 2 -> 4
-// g(uint256): 4 -> 16
-// h(uint256): 1 -> 1
-// h(uint256): 2 -> 4
-// h(uint256): 4 -> 16
-// i(uint256): 1 -> 1
-// i(uint256): 2 -> 4
-// i(uint256): 4 -> 16
-// j(uint256): 1 -> 1
-// j(uint256): 2 -> 4
-// j(uint256): 4 -> 16
-// k(uint256): 1 -> FAILURE, hex"4e487b71", 0x01
-// k(uint256): 2 -> FAILURE, hex"4e487b71", 0x01
-// k(uint256): 4 -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/libraries/library_address_homestead.sol b/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
deleted file mode 100644
index ce7344f4adc4..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library L {
-    function f(uint256 a, uint256 b) external {
-        assert(a * a == b);
-    }
-}
-contract C {
-    function addr() public view returns (bool) {
-        return address(L) == address(0);
-    }
-    function g(uint256 a, uint256 b) public returns (bool) {
-        (bool success,) = address(L).delegatecall(abi.encodeWithSignature("f(uint256,uint256)", a, b));
-        return success;
-    }
-}
-// ----
-// library: L
-// g(uint256,uint256): 1, 1 -> true
-// g(uint256,uint256): 1, 2 -> false
-// g(uint256,uint256): 2, 3 -> false
-// g(uint256,uint256): 2, 4 -> true
-// g(uint256,uint256): 2, 5 -> false
-// g(uint256,uint256): 4, 15 -> false
-// g(uint256,uint256): 4, 16 -> true
-// g(uint256,uint256): 4, 17 -> false
diff --git a/test/libsolidity/semanticTests/libraries/library_address_via_module.sol b/test/libsolidity/semanticTests/libraries/library_address_via_module.sol
deleted file mode 100644
index 4c96469024bc..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_address_via_module.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-==== Source: a.sol ====
-
-import "a.sol" as M;
-
-library L {
-    function f(uint256 v) external pure returns (uint) {
-        return v * v;
-    }
-    function g(uint256 v) external returns (uint) {
-        return v * v;
-    }
-}
-contract C {
-    function addr() public view returns (bool) {
-        return address(M.L) == address(0);
-    }
-    function g(uint256 v) public view returns (uint256) {
-        return M.L.f(v);
-    }
-    function h(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(M.L).delegatecall(abi.encodeWithSignature("f(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-    function i(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(M.L).call(abi.encodeWithSignature("f(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-    function j(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(M.L).delegatecall(abi.encodeWithSignature("g(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-    function k(uint256 v) public returns (uint256) {
-        (bool success, bytes memory result) = address(M.L).call(abi.encodeWithSignature("g(uint256)", v));
-        assert(success);
-        return abi.decode(result, (uint256));
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// library: "a.sol":L
-// addr() -> false
-// g(uint256): 1 -> 1
-// g(uint256): 2 -> 4
-// g(uint256): 4 -> 16
-// h(uint256): 1 -> 1
-// h(uint256): 2 -> 4
-// h(uint256): 4 -> 16
-// i(uint256): 1 -> 1
-// i(uint256): 2 -> 4
-// i(uint256): 4 -> 16
-// j(uint256): 1 -> 1
-// j(uint256): 2 -> 4
-// j(uint256): 4 -> 16
-// k(uint256): 1 -> FAILURE, hex"4e487b71", 0x01
-// k(uint256): 2 -> FAILURE, hex"4e487b71", 0x01
-// k(uint256): 4 -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
deleted file mode 100644
index 44526da68a6a..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library Lib { function m() public returns (address) { return msg.sender; } }
-contract Test {
-    address public sender;
-    function f() public {
-        sender = Lib.m();
-    }
-}
-// ====
-// EVMVersion: >=homestead
-// ----
-// library: Lib
-// f() ->
-// sender() -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol
deleted file mode 100644
index b540e9a63feb..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-library L {
-    function f(uint256[] storage x) public pure returns (uint256) {
-        return 23;
-    }
-}
-contract C {
-    uint256[] y;
-    string x;
-    constructor() { y.push(42); }
-    function f() public view returns (uint256) {
-        return L.f(y);
-    }
-    function g() public returns (bool, uint256) {
-        uint256 ys;
-        assembly { ys := y.slot }
-        (bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.f.selector, ys));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-    function h() public returns (bool, uint256) {
-        uint256 ys;
-        assembly { ys := y.slot }
-        (bool success, bytes memory data) = address(L).call(abi.encodeWithSelector(L.f.selector, ys));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f() -> 23
-// g() -> true, 23
-// h() -> true, 23
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol
deleted file mode 100644
index 3c5274990f13..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-library L {
-    function f(uint256[] storage x) public view returns (uint256) {
-        return x.length;
-    }
-}
-contract C {
-    uint256[] y;
-    string x;
-    constructor() { y.push(42); }
-    function f() public view returns (uint256) {
-        return L.f(y);
-    }
-    function g() public returns (bool, uint256) {
-        uint256 ys;
-        assembly { ys := y.slot }
-        (bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.f.selector, ys));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-    function h() public returns (bool, uint256) {
-        uint256 ys;
-        assembly { ys := y.slot }
-        (bool success, bytes memory data) = address(L).call(abi.encodeWithSelector(L.f.selector, ys));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f() -> 1
-// g() -> true, 1
-// h() -> true, 0 # this is bad - this should fail! #
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol
deleted file mode 100644
index 2d4e6468e0e3..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-library L {
-    function f(uint256[] storage x) public view returns (uint256) {
-        return 84;
-    }
-}
-contract C {
-    uint256[] y;
-    constructor() { y.push(42); }
-    function f() public view returns (uint256) {
-        return L.f(y);
-    }
-    function g() public returns (bool, uint256) {
-        uint256 ys;
-        assembly { ys := y.slot }
-        (bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.f.selector, ys));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-    function h() public returns (bool, uint256) {
-        uint256 ys;
-        assembly { ys := y.slot }
-        (bool success, bytes memory data) = address(L).call(abi.encodeWithSelector(L.f.selector, ys));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f() -> 84
-// g() -> true, 84
-// h() -> true, 84
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol
deleted file mode 100644
index d8cdb9a4d463..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract D {
-    uint public x;
-    constructor() { x = 42; }
-}
-library L {
-    function f(D d) public view returns (uint256) {
-        return d.x();
-    }
-}
-contract C {
-    D d;
-    constructor() { d = new D(); }
-    function f() public view returns (uint256) {
-        return L.f(d);
-    }
-    function g() public returns (bool, uint256) {
-        (bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.f.selector, d));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-    function h() public returns (bool, uint256) {
-        (bool success, bytes memory data) = address(L).call(abi.encodeWithSelector(L.f.selector, d));
-        return (success, success ? abi.decode(data,(uint256)) : 0);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f() -> 42
-// g() -> true, 42
-// h() -> true, 42
diff --git a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
deleted file mode 100644
index a385fb29a311..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library Arst {
-    enum Foo {Things, Stuff}
-}
-
-
-contract Tsra {
-    function f() public returns (uint256) {
-        Arst.Foo;
-        return 1;
-    }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_function_selectors.sol b/test/libsolidity/semanticTests/libraries/library_function_selectors.sol
deleted file mode 100644
index baeb5ceddc2c..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_function_selectors.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-library L {
-    function f(uint256 x) external returns (uint) { return x; }
-    function g(uint256[] storage s) external returns (uint) { return s.length; }
-    function h(uint256[] memory m) public returns (uint) { return m.length; }
-}
-contract C {
-    uint256[] s;
-    constructor() { while (s.length < 42) s.push(0); }
-    function f() public returns (bool, bool, uint256) {
-		(bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.f.selector, 7));
-		return (L.f.selector == bytes4(keccak256("f(uint256)")), success, abi.decode(data, (uint256)));
-    }
-    function g() public returns (bool, bool, uint256) {
-		uint256 s_ptr;
-		assembly { s_ptr := s.slot }
-		(bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.g.selector, s_ptr));
-		return (L.g.selector == bytes4(keccak256("g(uint256[] storage)")), success, abi.decode(data, (uint256)));
-    }
-    function h() public returns (bool, bool, uint256) {
-		(bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.h.selector, new uint256[](23)));
-		return (L.h.selector == bytes4(keccak256("h(uint256[])")), success, abi.decode(data, (uint256)));
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f() -> true, true, 7
-// g() -> true, true, 42
-// h() -> true, true, 23
diff --git a/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol b/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol
deleted file mode 100644
index 186fad7dbc1a..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma abicoder               v2;
-library L {
-    struct S { uint256 a; }
-    function f(S storage s) external returns (uint) { return s.a; }
-    function g(S memory m) public returns (uint) { return m.a; }
-}
-contract C {
-    L.S s;
-    constructor() { s.a = 42; }
-
-    function f() public returns (bool, bool, uint256) {
-		uint256 s_ptr;
-		assembly { s_ptr := s.slot }
-		(bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.f.selector, s_ptr));
-		return (L.f.selector == bytes4(keccak256("f(L.S storage)")), success, abi.decode(data, (uint256)));
-    }
-    function g() public returns (bool, bool, uint256) {
-		(bool success, bytes memory data) = address(L).delegatecall(abi.encodeWithSelector(L.g.selector, L.S(23)));
-		return (L.g.selector == bytes4(keccak256("g(L.S)")), success, abi.decode(data, (uint256)));
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// library: L
-// f() -> true, true, 42
-// g() -> true, true, 23
diff --git a/test/libsolidity/semanticTests/libraries/library_references_preserve.sol b/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
deleted file mode 100644
index 41c16d2f3a8c..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-library L1 {
-    function add(uint256 a, uint256 b) external pure returns (uint256) {
-        return a + b + 1;
-    }
-}
-
-library L2 {
-    function add(uint256 a, uint256 b) external pure returns (uint256) {
-        return a + b + 2;
-    }
-}
-
-contract A {
-    uint256 sum;
-    constructor() {
-        sum = L1.add(1, 2);
-    }
-    function getSum() external view returns(uint256) {
-        return sum;
-    }
-}
-
-contract B {
-    uint256 sum;
-    constructor() {
-        sum = L2.add(1, 2);
-    }
-    function getSum() external view returns(uint256) {
-        return sum;
-    }
-}
-
-contract C {
-    A a = new A();
-    B b = new B();
-    function aSum() external view returns(uint256) {
-        return a.getSum();
-    }
-    function bSum() external view returns(uint256) {
-        return b.getSum();
-    }
-}
-// ----
-// library: L1
-// library: L2
-// aSum() -> 4
-// bSum() -> 5
diff --git a/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol b/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
deleted file mode 100644
index 00001a2f830f..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-library Lib {
-    struct Items {
-        mapping (uint => uint) a;
-    }
-
-    function get() public returns (Items storage x) {
-        assembly { x.slot := 123 }
-    }
-}
-
-contract C {
-    function f() public returns(uint256 slot) {
-        Lib.Items storage ptr = Lib.get();
-        assembly { slot := ptr.slot }
-    }
-}
-// ----
-// library: Lib
-// f() -> 123
diff --git a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
deleted file mode 100644
index e7692ed8380f..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-library Lib {
-    function x() public view returns (uint) {
-        return 1;
-    }
-}
-contract Test {
-    uint t;
-    function f() public returns (uint) {
-        t = 2;
-        return this.g();
-    }
-    function g() public view returns (uint) {
-        return Lib.x();
-    }
-}
-// ----
-// library: Lib
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_stray_values.sol b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
deleted file mode 100644
index 3acc8557024f..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_stray_values.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library Lib { function m(uint x, uint y) public returns (uint) { return x * y; } }
-contract Test {
-    function f(uint x) public returns (uint) {
-        Lib;
-        Lib.m;
-        return x + 9;
-    }
-}
-// ----
-// library: Lib
-// f(uint256): 33 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
deleted file mode 100644
index 96ee9bcffed7..000000000000
--- a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-library Arst {
-    struct Foo {
-        int256 Things;
-        int256 Stuff;
-    }
-}
-
-
-contract Tsra {
-    function f() public returns (uint256) {
-        Arst.Foo;
-        return 1;
-    }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
deleted file mode 100644
index cfbf7b0c7d15..000000000000
--- a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-library Lib {
-    function set(mapping(uint => uint) storage m, uint key, uint value) internal
-    {
-        m[key] = value;
-    }
-    function get(mapping(uint => uint) storage m, uint key) internal view returns (uint)
-    {
-        return m[key];
-    }
-}
-contract Test {
-    mapping(uint => uint) m;
-    function set(uint256 key, uint256 value) public returns (uint)
-    {
-        uint oldValue = Lib.get(m, key);
-        Lib.set(m, key, value);
-        return oldValue;
-    }
-    function get(uint256 key) public view returns (uint) {
-        return Lib.get(m, key);
-    }
-}
-// ----
-// library: Lib
-// set(uint256,uint256): 1, 42 -> 0
-// set(uint256,uint256): 2, 84 -> 0
-// set(uint256,uint256): 21, 7 -> 0
-// get(uint256): 0 -> 0
-// get(uint256): 1 -> 0x2a
-// get(uint256): 2 -> 0x54
-// get(uint256): 21 -> 7
-// set(uint256,uint256): 1, 21 -> 0x2a
-// set(uint256,uint256): 2, 42 -> 0x54
-// set(uint256,uint256): 21, 14 -> 7
-// get(uint256): 0 -> 0
-// get(uint256): 1 -> 0x15
-// get(uint256): 2 -> 0x2a
-// get(uint256): 21 -> 14
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
deleted file mode 100644
index da521f6bada5..000000000000
--- a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
+++ /dev/null
@@ -1,72 +0,0 @@
-library Lib {
-    function choose_mapping(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) internal pure returns(mapping(uint=>uint) storage)
-    {
-        return c ? a : b;
-    }
-}
-contract Test {
-    mapping(uint => uint) a;
-    mapping(uint => uint) b;
-    function set(bool choice, uint256 key, uint256 value) public returns (uint)
-    {
-        mapping(uint => uint) storage m = Lib.choose_mapping(a, b, choice);
-        uint oldValue = m[key];
-        m[key] = value;
-        return oldValue;
-    }
-    function get(bool choice, uint256 key) public view returns (uint) {
-        return Lib.choose_mapping(a, b, choice)[key];
-    }
-    function get_a(uint256 key) public view returns (uint) {
-        return a[key];
-    }
-    function get_b(uint256 key) public view returns (uint) {
-        return b[key];
-    }
-}
-// ----
-// library: Lib
-// set(bool,uint256,uint256): true, 1, 42 -> 0
-// set(bool,uint256,uint256): true, 2, 84 -> 0
-// set(bool,uint256,uint256): true, 21, 7 -> 0
-// set(bool,uint256,uint256): false, 1, 10 -> 0
-// set(bool,uint256,uint256): false, 2, 11 -> 0
-// set(bool,uint256,uint256): false, 21, 12 -> 0
-// get(bool,uint256): true, 0 -> 0
-// get(bool,uint256): true, 1 -> 0x2a
-// get(bool,uint256): true, 2 -> 0x54
-// get(bool,uint256): true, 21 -> 7
-// get_a(uint256): 0 -> 0
-// get_a(uint256): 1 -> 0x2a
-// get_a(uint256): 2 -> 0x54
-// get_a(uint256): 21 -> 7
-// get(bool,uint256): false, 0 -> 0
-// get(bool,uint256): false, 1 -> 10
-// get(bool,uint256): false, 2 -> 11
-// get(bool,uint256): false, 21 -> 12
-// get_b(uint256): 0 -> 0
-// get_b(uint256): 1 -> 10
-// get_b(uint256): 2 -> 11
-// get_b(uint256): 21 -> 12
-// set(bool,uint256,uint256): true, 1, 21 -> 0x2a
-// set(bool,uint256,uint256): true, 2, 42 -> 0x54
-// set(bool,uint256,uint256): true, 21, 14 -> 7
-// set(bool,uint256,uint256): false, 1, 30 -> 10
-// set(bool,uint256,uint256): false, 2, 31 -> 11
-// set(bool,uint256,uint256): false, 21, 32 -> 12
-// get_a(uint256): 0 -> 0
-// get_a(uint256): 1 -> 0x15
-// get_a(uint256): 2 -> 0x2a
-// get_a(uint256): 21 -> 14
-// get(bool,uint256): true, 0 -> 0
-// get(bool,uint256): true, 1 -> 0x15
-// get(bool,uint256): true, 2 -> 0x2a
-// get(bool,uint256): true, 21 -> 14
-// get_b(uint256): 0 -> 0
-// get_b(uint256): 1 -> 0x1e
-// get_b(uint256): 2 -> 0x1f
-// get_b(uint256): 21 -> 0x20
-// get(bool,uint256): false, 0 -> 0
-// get(bool,uint256): false, 1 -> 0x1e
-// get(bool,uint256): false, 2 -> 0x1f
-// get(bool,uint256): false, 21 -> 0x20
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
deleted file mode 100644
index e5963c1b3fe6..000000000000
--- a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-library Lib {
-    function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b) internal returns(mapping(uint=>uint) storage r)
-    {
-        r = a;
-        r[1] = 42;
-        r = b;
-        r[1] = 21;
-    }
-}
-contract Test {
-    mapping(uint => uint) a;
-    mapping(uint => uint) b;
-    function f() public returns (uint, uint, uint, uint, uint, uint)
-    {
-        Lib.f(a, b)[2] = 84;
-        return (a[0], a[1], a[2], b[0], b[1], b[2]);
-    }
-    function g() public returns (uint, uint, uint, uint, uint, uint)
-    {
-        mapping(uint => uint) storage m = Lib.f(a, b);
-        m[2] = 17;
-        return (a[0], a[1], a[2], b[0], b[1], b[2]);
-    }
-}
-// ----
-// library: Lib
-// f() -> 0, 0x2a, 0, 0, 0x15, 0x54
-// g() -> 0, 0x2a, 0, 0, 0x15, 0x11
diff --git a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
deleted file mode 100644
index 178f22b40f92..000000000000
--- a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L {
-    function f() public returns (uint) { return 7; }
-}
-contract C {
-    function f() public payable returns (uint) {
-        return L.f();
-    }
-}
-// ----
-// library: L
-// f(): 27 -> 7
diff --git a/test/libsolidity/semanticTests/libraries/stub.sol b/test/libsolidity/semanticTests/libraries/stub.sol
deleted file mode 100644
index 8bae3df27296..000000000000
--- a/test/libsolidity/semanticTests/libraries/stub.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    function f(uint256 v) external returns (uint256) { return v*v; }
-}
-contract C {
-    function g(uint256 v) external returns (uint256) {
-        return L.f(v);
-    }
-}
-// ----
-// library: L
-// g(uint256): 1 -> 1
-// g(uint256): 2 -> 4
-// g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/stub_internal.sol b/test/libsolidity/semanticTests/libraries/stub_internal.sol
deleted file mode 100644
index 075b8dbb22dc..000000000000
--- a/test/libsolidity/semanticTests/libraries/stub_internal.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library L {
-    function f(uint256 v) internal returns (uint256) { return v*v; }
-}
-contract C {
-    function g(uint256 v) external returns (uint256) {
-        return L.f(v);
-    }
-}
-// ----
-// g(uint256): 1 -> 1
-// g(uint256): 2 -> 4
-// g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
deleted file mode 100644
index d6c7f313e236..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-contract C {
-    using D for D.s;
-    D.s public x;
-    function f(uint a) public returns (uint) {
-        x.a = 6;
-        return x.mul({x: a});
-    }
-}
-// ----
-// library: D
-// f(uint256): 7 -> 0x2a
-// x() -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol b/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
deleted file mode 100644
index f44da5a8b800..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library D {
-	function double(uint self) public returns (uint) { return 2 * self; }
-}
-contract C {
-	using D for uint;
-	function f(uint a) public returns (uint) {
-		return a.double();
-	}
-}
-// ----
-// library: D
-// f(uint256): 9 -> 18
diff --git a/test/libsolidity/semanticTests/libraries/using_for_overload.sol b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
deleted file mode 100644
index 5dd67fba06be..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_for_overload.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library D {
-    struct s { uint a; }
-    function mul(s storage self, uint x) public returns (uint) { return self.a *= x; }
-    function mul(s storage self, bytes32 x) public returns (bytes32) { }
-}
-contract C {
-    using D for D.s;
-    D.s public x;
-    function f(uint a) public returns (uint) {
-        x.a = 6;
-        return x.mul(a);
-    }
-}
-// ----
-// library: D
-// f(uint256): 7 -> 0x2a
-// x() -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol b/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
deleted file mode 100644
index cd45726b676b..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-struct Struct { uint x; }
-
-library L {
-    function f(Struct storage _x) internal view returns (uint256) {
-      return _x.x;
-    }
-}
-
-contract C {
-  using L for Struct;
-
-  Struct s;
-
-  function h(Struct storage _s) internal view returns (uint) {
-    // _s is pointer
-    return _s.f();
-  }
-  function g() public returns (uint, uint) {
-    s.x = 7;
-    // s is reference
-    return (s.f(), h(s));
-  }
-}
-// ----
-// g() -> 7, 7
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
deleted file mode 100644
index b3e06c5bcfb8..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library Lib {
-    function set(mapping(uint => uint) storage m, uint key, uint value) public
-    {
-        m[key] = value;
-    }
-}
-contract Test {
-    mapping(uint => uint) m1;
-    mapping(uint => uint) m2;
-    function f() public returns (uint, uint, uint, uint, uint, uint)
-    {
-        Lib.set(m1, 0, 1);
-        Lib.set(m1, 2, 42);
-        Lib.set(m2, 0, 23);
-        Lib.set(m2, 2, 99);
-        return (m1[0], m1[1], m1[2], m2[0], m2[1], m2[2]);
-    }
-}
-// ----
-// library: Lib
-// f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119635
-// gas legacy: 124674
-// gas legacyOptimized: 119669
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
deleted file mode 100644
index e9d855969afd..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-library Lib {
-    function choose(mapping(uint => mapping(uint => uint)) storage m, uint key) external returns (mapping(uint => uint) storage) {
-        return m[key];
-    }
-}
-contract Test {
-    mapping(uint => mapping(uint => uint)) m;
-    function f() public returns (uint, uint, uint, uint, uint, uint)
-    {
-        Lib.choose(m, 0)[0] = 1;
-        Lib.choose(m, 0)[2] = 42;
-        Lib.choose(m, 1)[0] = 23;
-        Lib.choose(m, 1)[2] = 99;
-        return (m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2]);
-    }
-}
-// ----
-// library: Lib
-// f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 120194
-// gas legacy: 125109
-// gas legacyOptimized: 120128
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
deleted file mode 100644
index e709a5b5b93c..000000000000
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library Lib {
-    struct Data { uint a; uint[] b; }
-    function set(Data storage _s) public
-    {
-        _s.a = 7;
-        while (_s.b.length < 20)
-            _s.b.push();
-        _s.b[19] = 8;
-    }
-}
-contract Test {
-    mapping(string => Lib.Data) data;
-    function f() public returns (uint a, uint b)
-    {
-        Lib.set(data["abc"]);
-        a = data["abc"].a;
-        b = data["abc"].b[19];
-    }
-}
-// ----
-// library: Lib
-// f() -> 7, 8
-// gas irOptimized: 101818
-// gas legacy: 101429
diff --git a/test/libsolidity/semanticTests/literals/denominations.sol b/test/libsolidity/semanticTests/literals/denominations.sol
deleted file mode 100644
index f423775a613a..000000000000
--- a/test/libsolidity/semanticTests/literals/denominations.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	uint constant x = 1 ether + 1 gwei + 1 wei;
-
-	function f() public view returns(uint) { return x; }
-}
-// ----
-// f() -> 1000000001000000001
diff --git a/test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol b/test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol
deleted file mode 100644
index 43a09af050e7..000000000000
--- a/test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    uint[2 wei] a;
-    uint[2 gwei] b;
-    uint[2 ether] c;
-    uint[2 seconds] d;
-    uint[2 minutes] e;
-    uint[2 hours] f;
-    uint[2 days] g;
-    uint[2 weeks] h;
-
-    function lengths() public returns (uint, uint, uint, uint, uint, uint, uint, uint) {
-        return (
-            a.length,
-            b.length,
-            c.length,
-            d.length,
-            e.length,
-            f.length,
-            g.length,
-            h.length
-        );
-    }
-}
-// ----
-// lengths() -> 2, 2000000000, 2000000000000000000, 2, 120, 7200, 172800, 1209600
diff --git a/test/libsolidity/semanticTests/literals/escape.sol b/test/libsolidity/semanticTests/literals/escape.sol
deleted file mode 100644
index 96fa9b11e631..000000000000
--- a/test/libsolidity/semanticTests/literals/escape.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v2;
-
-contract C
-{
-	function f() public pure returns (uint, bytes1, bytes1) {
-		bytes memory encoded = abi.encodePacked("\\\\");
-		return (encoded.length, encoded[0], encoded[1]);
-	}
-}
-// ----
-// f() -> 2, 0x5c00000000000000000000000000000000000000000000000000000000000000, 0x5c00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/literals/ether.sol b/test/libsolidity/semanticTests/literals/ether.sol
deleted file mode 100644
index 16cb75315233..000000000000
--- a/test/libsolidity/semanticTests/literals/ether.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	uint constant x = 1 ether;
-
-	function f() public view returns(uint) { return x; }
-}
-// ----
-// f() -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/literals/fractional_denominations.sol b/test/libsolidity/semanticTests/literals/fractional_denominations.sol
deleted file mode 100644
index 6bc448f09018..000000000000
--- a/test/libsolidity/semanticTests/literals/fractional_denominations.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint public g = 1.5 gwei;
-    uint public e = 1.5 ether;
-    uint public m = 1.5 minutes;
-    uint public h = 1.5 hours;
-    uint public d = 1.5 days;
-    uint public w = 1.5 weeks;
-}
-// ----
-// g() -> 1500000000
-// e() -> 1500000000000000000
-// m() -> 90
-// h() -> 5400
-// d() -> 129600
-// w() -> 907200
diff --git a/test/libsolidity/semanticTests/literals/gwei.sol b/test/libsolidity/semanticTests/literals/gwei.sol
deleted file mode 100644
index bb8cc6ab0a71..000000000000
--- a/test/libsolidity/semanticTests/literals/gwei.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	uint constant x = 1 gwei;
-
-	function f() public view returns(uint) { return x; }
-}
-// ----
-// f() -> 1000000000
diff --git a/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol b/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
deleted file mode 100644
index 3edd6049c000..000000000000
--- a/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (bytes32 result) {
-        assembly {
-            result := hex"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
-        }
-    }
-}
-// ----
-// f() -> 0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
diff --git a/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol b/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
deleted file mode 100644
index db7f70f83bdc..000000000000
--- a/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns(bytes memory) {
-        return hex"12_34_5678_9A";
-    }
-}
-// ----
-// f() -> 32, 5, left(0x123456789A)
diff --git a/test/libsolidity/semanticTests/literals/scientific_notation.sol b/test/libsolidity/semanticTests/literals/scientific_notation.sol
deleted file mode 100644
index 5e0d80148aec..000000000000
--- a/test/libsolidity/semanticTests/literals/scientific_notation.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    function f() public returns(uint) {
-        return 2e10 wei;
-    }
-
-    function g() public returns(uint) {
-        return 200e-2 wei;
-    }
-
-    function h() public returns(uint) {
-        return 2.5e1;
-    }
-
-    function i() public returns(int) {
-        return -2e10;
-    }
-
-    function j() public returns(int) {
-        return -200e-2;
-    }
-
-    function k() public returns(int) {
-        return -2.5e1;
-    }
-}
-// ----
-// f() -> 20000000000
-// g() -> 2
-// h() -> 25
-// i() -> -20000000000
-// j() -> -2
-// k() -> -25
diff --git a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
deleted file mode 100644
index 82ec72d80b88..000000000000
--- a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract TestTernary
-{
-    function h() pure public returns (uint16 b)
-    {
-        b = (true ? 63 : 255) + (false ? 63 : 255);
-    }
-
-    function g() pure public returns (uint16 a)
-    {
-        bool t = true;
-        bool f = false;
-        a = (t ? 63 : 255) + (f ? 63 : 255);
-    }
-}
-// ----
-// g() -> FAILURE, hex"4e487b71", 0x11
-// h() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/literals/wei.sol b/test/libsolidity/semanticTests/literals/wei.sol
deleted file mode 100644
index 08bba771b0de..000000000000
--- a/test/libsolidity/semanticTests/literals/wei.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	uint constant x = 1 wei;
-
-	function f() public view returns(uint) { return x; }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol b/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
deleted file mode 100644
index d2ed3575ecec..000000000000
--- a/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure {
-        uint[] memory x;
-        uint y;
-        assembly {
-            y := x
-        }
-        // The value of an uninitialized dynamic array is not zero but rather
-        // an address of a location in memory that has the value of zero.
-        assert(y != 0);
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
deleted file mode 100644
index ed51a59921d2..000000000000
--- a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract Test {
-    mapping(uint=>uint) data;
-    function stat() public returns (uint[5] memory)
-    {
-        data[2] = 3; // make sure to use some memory
-    }
-    function dyn() public returns (uint[] memory) { stat(); }
-    function nested() public returns (uint[3][] memory) { stat(); }
-    function nestedStat() public returns (uint[3][7] memory) { stat(); }
-}
-// ----
-// stat() -> 0, 0, 0, 0, 0
-// dyn() -> 0x20, 0
-// nested() -> 0x20, 0
-// nestedStat() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/test/libsolidity/semanticTests/memoryManagement/return_variable.sol b/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
deleted file mode 100644
index a28672c93fa9..000000000000
--- a/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function memorySize() internal pure returns (uint s) {
-        assembly { s := mload(0x40) }
-    }
-    function f() public returns (uint, uint, uint) {
-        uint a = memorySize();
-        g();
-        uint b = memorySize();
-        h();
-        uint c = memorySize();
-        i();
-        uint d = memorySize();
-        return (b - a, c - b, d - c);
-    }
-    // In these functions, we do allocate memory in both cases.
-    // In `i()`, this could be avoided but we would have to check
-    // that all code paths return explicitly and provide a value.
-    function g() internal returns (uint[40] memory) {
-    }
-    function h() internal returns (uint[40] memory t) {
-    }
-    function i() internal returns (uint[40] memory) {
-        uint[40] memory x;
-        return x;
-    }
-}
-// ----
-// f() -> 0x0500, 0x0500, 0x0a00
diff --git a/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol b/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
deleted file mode 100644
index 9b27b3492ed2..000000000000
--- a/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function memorySize() internal pure returns (uint s) {
-        assembly { s := mload(0x40) }
-    }
-    function withValue() public pure returns (uint) {
-        uint[20] memory x;
-        uint memorySizeBefore = memorySize();
-        uint[20] memory t = x;
-        uint memorySizeAfter = memorySize();
-        return memorySizeAfter - memorySizeBefore;
-    }
-    function withoutValue() public pure returns (uint) {
-        uint[20] memory x;
-        uint memorySizeBefore = memorySize();
-        uint[20] memory t;
-        uint memorySizeAfter = memorySize();
-        return memorySizeAfter - memorySizeBefore;
-    }
-}
-// ----
-// withValue() -> 0x00
-// withoutValue() -> 0x0280
diff --git a/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol b/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
deleted file mode 100644
index 5b471e1a7e14..000000000000
--- a/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    struct S { uint x; uint y; uint z; }
-    function memorySize() internal pure returns (uint s) {
-        assembly { s := mload(0x40) }
-    }
-    function withValue() public pure returns (uint) {
-        S memory x = S(1, 2, 3);
-        uint memorySizeBefore = memorySize();
-        S memory t = x;
-        uint memorySizeAfter = memorySize();
-        return memorySizeAfter - memorySizeBefore;
-    }
-    function withoutValue() public pure returns (uint) {
-        uint memorySizeBefore = memorySize();
-        S memory t;
-        uint memorySizeAfter = memorySize();
-        return memorySizeAfter - memorySizeBefore;
-    }
-}
-// ----
-// withValue() -> 0x00
-// withoutValue() -> 0x60
diff --git a/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol b/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
deleted file mode 100644
index efdaedf50257..000000000000
--- a/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract contract A {
-    function f() virtual public pure;
-}
-
-interface I {
-    function f() external pure;
-}
-
-contract C {
-    function f() pure public {
-    }
-}
-
-contract Test is C {
-    function c() public pure returns (string memory) {
-        return type(C).name;
-    }
-    function a() public pure returns (string memory) {
-        return type(A).name;
-    }
-    function i() public pure returns (string memory) {
-        return type(I).name;
-    }
-}
-// ----
-// c() -> 0x20, 1, "C"
-// a() -> 0x20, 1, "A"
-// i() -> 0x20, 1, "I"
diff --git a/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol b/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
deleted file mode 100644
index 4d1538d7cfb7..000000000000
--- a/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract A {
-    uint public x = 7;
-    modifier m virtual { x = 2; _; }
-}
-contract C is A {
-    modifier m override { x = 1; _; }
-
-    function f() public A.m returns (uint) {
-        return 9;
-    }
-    function g() public m returns (uint) {
-        return 10;
-    }
-}
-// ----
-// x() -> 7
-// f() -> 9
-// x() -> 2
-// g() -> 0x0a
-// x() -> 1
-// f() -> 9
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol b/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
deleted file mode 100644
index 58c60014311f..000000000000
--- a/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-==== Source: a ====
-import "a" as M;
-contract C {
-    uint public x;
-    modifier m { x = 1; _; }
-
-    function f() public M.M.C.m returns (uint t, uint r) {
-        t = x;
-        x = 3;
-        r = 9;
-    }
-    function g() public m returns (uint t, uint r) {
-        t = x;
-        x = 4;
-        r = 10;
-    }
-}
-// ----
-// x() -> 0x00
-// f() -> 1, 9
-// x() -> 3
-// g() -> 1, 0x0a
-// x() -> 4
-// f() -> 1, 9
-// x() -> 3
diff --git a/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
deleted file mode 100644
index 67fc0e6be6c0..000000000000
--- a/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    uint256 public x;
-    modifier run() {
-        for (uint256 i = 0; i < 10; i++) {
-            _;
-            if (i == 1)
-                break;
-        }
-    }
-
-    function f() public run {
-        uint256 k = x;
-        uint256 t = k + 1;
-        x = t;
-    }
-}
-// ----
-// x() -> 0
-// f() ->
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
deleted file mode 100644
index 2879c55eaf0b..000000000000
--- a/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint256 public x;
-    modifier run() {
-        for (uint256 i = 0; i < 10; i++) {
-            if (i % 2 == 1) continue;
-            _;
-        }
-    }
-
-    function f() public run {
-        uint256 k = x;
-        uint256 t = k + 1;
-        x = t;
-    }
-}
-// ----
-// x() -> 0
-// f() ->
-// x() -> 5
diff --git a/test/libsolidity/semanticTests/modifiers/evaluation_order.sol b/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
deleted file mode 100644
index b92df61f96b3..000000000000
--- a/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A { constructor(uint) {} }
-contract B { constructor(uint) {} }
-contract C { constructor(uint) {} }
-
-contract D is A, B, C {
-    uint[] x;
-    constructor() m2(f(1)) B(f(2)) m1(f(3)) C(f(4)) m3(f(5)) A(f(6)) {
-        f(7);
-    }
-
-    function query() public view returns (uint[] memory) { return x; }
-
-    modifier m1(uint) { _; }
-    modifier m2(uint) { _; }
-    modifier m3(uint) { _; }
-
-    function f(uint y) internal returns (uint) { x.push(y); return 0; }
-}
-// ----
-// query() -> 0x20, 7, 4, 2, 6, 1, 3, 5, 7
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier.sol b/test/libsolidity/semanticTests/modifiers/function_modifier.sol
deleted file mode 100644
index e1978ba871f9..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function getOne() public payable nonFree returns (uint256 r) {
-        return 1;
-    }
-
-    modifier nonFree {
-        if (msg.value > 0) _;
-    }
-}
-// ----
-// getOne() -> 0
-// getOne(), 1 wei -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
deleted file mode 100644
index bae503250173..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-contract A {
-    uint256 data;
-
-    constructor() mod1 {
-        f1();
-    }
-
-    function f1() public mod2 {
-        data |= 0x1;
-    }
-
-    function f2() public {
-        data |= 0x20;
-    }
-
-    function f3() public virtual {}
-
-    modifier mod1 virtual {
-        f2();
-        _;
-    }
-    modifier mod2 {
-        f3();
-        if (false) _;
-    }
-
-    function getData() public returns (uint256 r) {
-        return data;
-    }
-}
-
-
-contract C is A {
-    modifier mod1 override {
-        f4();
-        _;
-    }
-
-    function f3() public override {
-        data |= 0x300;
-    }
-
-    function f4() public {
-        data |= 0x4000;
-    }
-}
-// ----
-// getData() -> 0x4300
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
deleted file mode 100644
index 16cbad1a4ab9..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-abstract contract A {
-    function f() public mod returns (bool r) {
-        return true;
-    }
-
-    modifier mod virtual;
-}
-
-
-contract C is A {
-    modifier mod override {
-        if (false) _;
-    }
-}
-// ----
-// f() -> false
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
deleted file mode 100644
index f32a238145db..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract A {
-    uint256 data;
-
-    constructor() mod1 {
-        data |= 2;
-    }
-
-    modifier mod1 virtual {
-        data |= 1;
-        _;
-    }
-
-    function getData() public returns (uint256 r) {
-        return data;
-    }
-}
-
-
-contract C is A {
-    modifier mod1 override {
-        data |= 4;
-        _;
-    }
-}
-// ----
-// getData() -> 6
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
deleted file mode 100644
index c50fb5ddec51..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-library L {
-    struct S {
-        uint256 v;
-    }
-    modifier mod(S storage s) {
-        s.v++;
-        _;
-    }
-
-    function libFun(S storage s) internal mod(s) {
-        s.v += 0x100;
-    }
-}
-
-
-contract Test {
-    using L for *;
-    L.S s;
-
-    function f() public returns (uint256) {
-        s.libFun();
-        L.libFun(s);
-        return s.v;
-    }
-}
-// ----
-// f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
deleted file mode 100644
index e87ac7a41330..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-// Tests that virtual lookup for modifiers in libraries does not consider
-// the current inheritance hierarchy.
-library L {
-    struct S {
-        uint256 v;
-    }
-    modifier mod(S storage s) {
-        s.v++;
-        _;
-    }
-
-    function libFun(S storage s) internal mod(s) {
-        s.v += 0x100;
-    }
-}
-
-
-contract Test {
-    using L for *;
-    L.S s;
-    modifier mod(L.S storage) {
-        revert();
-        _;
-    }
-
-    function f() public returns (uint256) {
-        s.libFun();
-        L.libFun(s);
-        return s.v;
-    }
-}
-// ----
-// f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
deleted file mode 100644
index c3b10475fcca..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    modifier mod1 {
-        uint8 a = 1;
-        uint8 b = 2;
-        _;
-    }
-    modifier mod2(bool a) {
-        if (a) return;
-        else _;
-    }
-
-    function f(bool a) public mod1 mod2(a) returns (uint256 r) {
-        return 3;
-    }
-}
-// ----
-// f(bool): true -> 0
-// f(bool): false -> 3
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_loop.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_loop.sol
deleted file mode 100644
index 2b2900223be7..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_loop.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    modifier repeat(uint256 count) {
-        uint256 i;
-        for (i = 0; i < count; ++i) _;
-    }
-
-    function f() public repeat(10) returns (uint256 r) {
-        r += 1;
-    }
-}
-// via yul disabled because the return variables are
-// fresh variables each time, while in the old code generator,
-// they share a stack slot when the function is
-// invoked multiple times via `_`.
-
-// ====
-// compileViaYul: false
-// ----
-// f() -> 10
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol
deleted file mode 100644
index 81caba767061..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    modifier repeat(uint256 count) {
-        uint256 i;
-        for (i = 0; i < count; ++i) _;
-    }
-
-    function f() public repeat(10) returns (uint256 r) {
-        r += 1;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation.sol
deleted file mode 100644
index f4e04480486f..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    modifier repeat(bool twice) {
-        if (twice) _;
-        _;
-    }
-
-    function f(bool twice) public repeat(twice) returns (uint256 r) {
-        r += 1;
-    }
-}
-// via yul disabled because the return variables are
-// fresh variables each time, while in the old code generator,
-// they share a stack slot when the function is
-// invoked multiple times via `_`.
-
-// ====
-// compileViaYul: false
-// ----
-// f(bool): false -> 1
-// f(bool): true -> 2
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol
deleted file mode 100644
index 929b006e3f83..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    modifier repeat(bool twice) {
-        if (twice) _;
-        _;
-    }
-
-    function f(bool twice) public repeat(twice) returns (uint256 r) {
-        r += 1;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f(bool): false -> 1
-// f(bool): true -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_with_return.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_with_return.sol
deleted file mode 100644
index 6058e35127b1..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_with_return.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// Note that return sets the return variable and jumps to the end of the current function or
-// modifier code block.
-contract C {
-    modifier repeat(bool twice) {
-        if (twice) _;
-        _;
-    }
-
-    function f(bool twice) public repeat(twice) returns (uint256 r) {
-        r += 1;
-        return r;
-    }
-}
-// via yul disabled because the return variables are
-// fresh variables each time, while in the old code generator,
-// they share a stack slot when the function is
-// invoked multiple times via `_`.
-
-// ====
-// compileViaYul: false
-// ----
-// f(bool): false -> 1
-// f(bool): true -> 2
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
deleted file mode 100644
index 5cda8b6d2063..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint256 public a;
-    modifier mod(uint256 x) {
-        a += x;
-        _;
-    }
-
-    function f(uint256 x) public mod(2) mod(5) mod(x) returns (uint256) {
-        return a;
-    }
-}
-// ----
-// f(uint256): 3 -> 10
-// a() -> 10
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
deleted file mode 100644
index 780b5a360c8d..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint256 public a;
-    modifier mod(uint256 x) {
-        uint256 b = x;
-        a += b;
-        _;
-        a -= b;
-        assert(b == x);
-    }
-
-    function f(uint256 x) public mod(2) mod(5) mod(x) returns (uint256) {
-        return a;
-    }
-}
-// ----
-// f(uint256): 3 -> 10
-// a() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
deleted file mode 100644
index 16d6b821637a..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-    function f() public mod returns (bool r) {
-        return true;
-    }
-
-    modifier mod virtual {
-        _;
-    }
-}
-
-
-contract C is A {
-    modifier mod override {
-        if (false) _;
-    }
-}
-// ----
-// f() -> false
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
deleted file mode 100644
index f14496fa14d1..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    modifier m1(uint value) {
-        _;
-    }
-    modifier m2(uint value) {
-        _;
-    }
-
-    function f() public m1(x = 2) m2(y = 3) returns (uint x, uint y) {
-    }
-}
-// ----
-// f() -> 2, 3
diff --git a/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol b/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
deleted file mode 100644
index ecc7851b4ba2..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// The IR of this contract used to throw
-contract B {
-    function f(uint8 a) mod1(a, true) mod2(r) pure public returns (bytes7 r) { }
-    modifier mod1(uint a, bool b) { if (b) _; }
-    modifier mod2(bytes7 a) { while (a == "1234567") _; }
-}
-// ----
-// f(uint8): 5 -> 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol b/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
deleted file mode 100644
index 530fadf63662..000000000000
--- a/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-// Test to see if the function return parameter, when forwarded to the modifier actually has value
-// zero.
-contract A {
-    uint public x = 0;
-
-    modifier alwaysZeros(uint256 a, uint256 b) {
-        x++;
-        _;
-        require(a == 0, "a is not zero");
-        require(b == 0, "b is not zero");
-    }
-
-    function f() public alwaysZeros(r1, r3) returns(uint r1, uint r2, uint r3) {
-        r1 = 16;
-        r2 = 32;
-        r3 = 64;
-    }
-
-    function shouldFail(uint i1) public alwaysZeros(i1, r + 20) returns (uint r) {
-        r = 0;
-    }
-
-    // The value of x would be 1 before calling this. It gets incremented four times in total during
-    // the modifier calls
-    function g() alwaysZeros(r, r) alwaysZeros(r, r) alwaysZeros(r + r, r - r) alwaysZeros(r * r, r & r) public returns (uint r) {
-        r = x;
-    }
-}
-// ----
-// f() -> 0x10, 0x20, 0x40
-// x() -> 1
-// shouldFail(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 13, "a is not zero"
-// shouldFail(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 13, "b is not zero"
-// x() -> 1
-// g() -> 5
-// x() -> 5
diff --git a/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol b/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
deleted file mode 100644
index a69a26f5ce28..000000000000
--- a/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint public called;
-    modifier mod1 {
-        called++;
-        _;
-    }
-    function f(uint x) public mod1 returns (uint256 r) {
-        return x == 0 ? 2 : f(x - 1)**2;
-    }
-}
-// ----
-// called() -> 0x00
-// f(uint256): 5 -> 0x0100000000
-// called() -> 6
diff --git a/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol b/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
deleted file mode 100644
index 136743d53089..000000000000
--- a/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// The IR of this contract used to throw
-contract A { modifier m1{_;} }
-contract B is A { constructor() A() m1{} }
-// ----
-// constructor() ->
diff --git a/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol b/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
deleted file mode 100644
index d4c72e1632d4..000000000000
--- a/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    modifier m(bool condition) {
-        if (condition) _;
-    }
-
-    function f(uint x) public m(x >= 10) returns (uint[5] memory r) {
-        r[2] = 3;
-    }
-}
-// ----
-// f(uint256): 9 -> 0x00, 0x00, 0x00, 0x00, 0x00
-// f(uint256): 10 -> 0x00, 0x00, 3, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol b/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
deleted file mode 100644
index 30cce5a79d79..000000000000
--- a/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// The IR of this contract used to throw
-contract A {
-  constructor() m1 { }
-  modifier m1 { _; }
-}
-contract B is A {
-  modifier m2 { _; }
-  constructor() A() m1 m2 {  }
-}
-// ----
-// constructor() ->
diff --git a/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
deleted file mode 100644
index 0d9bbfe32b2a..000000000000
--- a/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint256 public x;
-    modifier setsx {
-        _;
-        x = 9;
-    }
-
-    function f() public setsx returns (uint256) {
-        return 2;
-    }
-}
-// ----
-// x() -> 0
-// f() -> 2
-// x() -> 9
diff --git a/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
deleted file mode 100644
index 00e2bb32846c..000000000000
--- a/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint256 public x;
-    modifier run() {
-        for (uint256 i = 1; i < 10; i++) {
-            if (i == 5) return;
-            _;
-        }
-    }
-
-    function f() public run {
-        uint256 k = x;
-        uint256 t = k + 1;
-        x = t;
-    }
-}
-// ----
-// x() -> 0
-// f() ->
-// x() -> 4
diff --git a/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol b/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
deleted file mode 100644
index 616a2183c02d..000000000000
--- a/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    uint256 public x;
-    modifier m() {
-        for (uint256 i = 0; i < 10; i++) {
-            _;
-            ++x;
-            return;
-        }
-    }
-
-    function f() public m m m returns (uint) {
-        for (uint256 i = 0; i < 10; i++) {
-            ++x;
-            return 42;
-        }
-    }
-}
-// ----
-// x() -> 0
-// f() -> 42
-// x() -> 4
diff --git a/test/libsolidity/semanticTests/multiSource/circular_import.sol b/test/libsolidity/semanticTests/multiSource/circular_import.sol
deleted file mode 100644
index 4c4ba4b28ae3..000000000000
--- a/test/libsolidity/semanticTests/multiSource/circular_import.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: s1.sol ====
-import {f as g} from "s2.sol";
-function f() pure returns (uint) { return 1; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-contract C {
-  function foo() public pure returns (uint) {
-    return f() - g();
-  }
-}
-// ----
-// foo() -> 1
diff --git a/test/libsolidity/semanticTests/multiSource/circular_import_2.sol b/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
deleted file mode 100644
index 639629372e93..000000000000
--- a/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return 1000 + g() - h(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-contract C {
-  function foo() public pure returns (uint) {
-    return h() - f() - g();
-  }
-}
-// ----
-// foo() -> 992
diff --git a/test/libsolidity/semanticTests/multiSource/circular_reimport.sol b/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
deleted file mode 100644
index a866b0f547df..000000000000
--- a/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return 100 + h() - g(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-==== Source: s3.sol ====
-import "s1.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    return f() - g() - h();
-  }
-}
-// ----
-// foo() -> 0x60
diff --git a/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol b/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
deleted file mode 100644
index 3ff3a1a6029f..000000000000
--- a/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return 1000 + h() - g(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-==== Source: s3.sol ====
-import "s2.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    return 10000 + f() - g() - h();
-  }
-}
-// ----
-// foo() -> 0x2324
diff --git a/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol b/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
deleted file mode 100644
index a103ef071afd..000000000000
--- a/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: s1.sol ====
-function f(uint24) pure returns (uint) { return 24; }
-function g(bool) pure returns (bool) { return true; }
-==== Source: s2.sol ====
-import {f as g, g as g} from "s1.sol";
-contract C {
-  function foo() public pure returns (uint, bool) {
-    return (g(2), g(false));
-  }
-}
-// ----
-// foo() -> 24, true
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
deleted file mode 100644
index 321e16ae32b1..000000000000
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function g() public pure returns (uint) {
-    return f();
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C {
-  function h() public pure returns (uint) {
-    return g();
-  }
-}
-// ----
-// h() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
deleted file mode 100644
index f111273d8f58..000000000000
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function g() public pure virtual returns (uint) {
-    return f() + 1;
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C {
-  function g() public pure override returns (uint) {
-    return f();
-  }
-}
-// ----
-// g() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
deleted file mode 100644
index ae802d7c0a37..000000000000
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function g() public pure virtual returns (uint) {
-    return f();
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C {
-  function g() public pure override returns (uint) {
-    return super.g();
-  }
-}
-// ----
-// g() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
deleted file mode 100644
index 71723f0fa5b3..000000000000
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function g() public pure virtual returns (uint) {
-    return f();
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C {
-  function g() public pure virtual override returns (uint) {
-    return super.g() + 1;
-  }
-}
-==== Source: s3.sol ====
-import "s2.sol";
-contract E is D {
-  function g() public pure override returns (uint) {
-    return super.g() + 1;
-  }
-}
-// ----
-// g() -> 1339
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol b/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
deleted file mode 100644
index dec4c3f29e99..000000000000
--- a/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function g() public pure returns (uint) {
-    return f();
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C {
-  function h() public pure returns (uint) {
-    return g();
-  }
-}
-==== Source: s3.sol ====
-import "s2.sol";
-import {f as f} from "s2.sol";
-contract E is D {
-  function i() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
-// i() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/import.sol b/test/libsolidity/semanticTests/multiSource/import.sol
deleted file mode 100644
index 2a0f43d53978..000000000000
--- a/test/libsolidity/semanticTests/multiSource/import.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: A ====
-contract A {
-	function g(uint256 x) public view returns(uint256) { return x + 1; }
-}
-==== Source: B ====
-import "A";
-contract B is A {
-	function f(uint256 x) public view returns(uint256) { return x; }
-}
-// ----
-// f(uint256): 1337 -> 1337
-// g(uint256): 1337 -> 1338
diff --git a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
deleted file mode 100644
index 8d714dd45c16..000000000000
--- a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: A ====
-function sub(uint256 x, uint256 y) pure returns (uint) { return 1; }
-function sub(uint256 x) pure returns (uint) { return 2; }
-==== Source: B ====
-import {sub} from "A";
-contract C
-{
-    function f() public pure returns (uint, uint) {
-        return (sub(1, 2), sub(2));
-    }
-}
-// ----
-// f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
deleted file mode 100644
index c57693674535..000000000000
--- a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function g() public pure virtual returns (uint) {
-    return f();
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol" as M;
-function f() pure returns (uint) { return 6; }
-contract D is M.C {
-  function g() public pure override returns (uint) {
-    return super.g() + f() * 10000;
-  }
-}
-// ----
-// g() -> 61337
diff --git a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
deleted file mode 100644
index a5f43f8b1c7a..000000000000
--- a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-function f() pure returns (uint) { return 6; }
-contract D {
-  function h() public pure returns (uint) {
-    return g() + f() * 10000;
-  }
-}
-// ----
-// h() -> 61337
diff --git a/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol b/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
deleted file mode 100644
index 02b4821433f4..000000000000
--- a/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-==== Source: s3.sol ====
-import {g as h} from "s2.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    return h();
-  }
-}
-// ----
-// foo() -> 1337
diff --git a/test/libsolidity/semanticTests/operators/compound_assign.sol b/test/libsolidity/semanticTests/operators/compound_assign.sol
deleted file mode 100644
index ed91f3b6c586..000000000000
--- a/test/libsolidity/semanticTests/operators/compound_assign.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract test {
-	uint value1;
-	uint value2;
-	function f(uint x, uint y) public returns (uint w) {
-		uint value3 = y;
-		value1 += x;
-		value3 *= x;
-		value2 *= value3 + value1;
-		return value2 += 7;
-	}
-}
-// ----
-// f(uint256,uint256): 0, 6 -> 7
-// f(uint256,uint256): 1, 3 -> 0x23
-// f(uint256,uint256): 2, 25 -> 0x0746
-// f(uint256,uint256): 3, 69 -> 396613
-// f(uint256,uint256): 4, 84 -> 137228105
-// f(uint256,uint256): 5, 2 -> 0xcc7c5e28
-// f(uint256,uint256): 6, 51 -> 1121839760671
-// f(uint256,uint256): 7, 48 -> 408349672884251
diff --git a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol
deleted file mode 100644
index e4f0834a034c..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function shl(uint256 a, uint256 b) public returns (uint256 c) {
-        assembly {
-            c := shl(b, a)
-        }
-    }
-
-    function shr(uint256 a, uint256 b) public returns (uint256 c) {
-        assembly {
-            c := shr(b, a)
-        }
-    }
-
-    function sar(uint256 a, uint256 b) public returns (uint256 c) {
-        assembly {
-            c := sar(b, a)
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// shl(uint256,uint256): 0x01, 0x02 -> 0x04
-// shl(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x01 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// shl(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x100 -> 0x00
-// shr(uint256,uint256): 0x03, 0x01 -> 0x01
-// shr(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x01 -> 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// shr(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0xff -> 0x01
-// shr(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x100 -> 0x00
-// sar(uint256,uint256): 0x03, 0x01 -> 0x01
-// sar(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// sar(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0xff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// sar(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x100 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol
deleted file mode 100644
index 6e3bb173c3af..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol
+++ /dev/null
@@ -1,121 +0,0 @@
-contract C {
-    function shl_zero(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shl(0, a)
-        }
-    }
-
-    function shr_zero(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shr(0, a)
-        }
-    }
-
-    function sar_zero(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := sar(0, a)
-        }
-    }
-
-    function shl_large(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shl(0x110, a)
-        }
-    }
-
-    function shr_large(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shr(0x110, a)
-        }
-    }
-
-    function sar_large(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := sar(0x110, a)
-        }
-    }
-
-    function shl_combined(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shl(4, shl(12, a))
-        }
-    }
-
-    function shr_combined(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shr(4, shr(12, a))
-        }
-    }
-
-    function sar_combined(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := sar(4, sar(12, a))
-        }
-    }
-
-    function shl_combined_large(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shl(0xd0, shl(0x40, a))
-        }
-    }
-
-    function shl_combined_overflow(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shl(0x01, shl(not(0x00), a))
-        }
-    }
-
-    function shr_combined_large(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shr(0xd0, shr(0x40, a))
-        }
-    }
-
-    function shr_combined_overflow(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := shr(0x01, shr(not(0x00), a))
-        }
-    }
-
-    function sar_combined_large(uint256 a) public returns (uint256 c) {
-        assembly {
-            c := sar(0xd0, sar(0x40, a))
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// shl_zero(uint256): 0x00 -> 0x00
-// shl_zero(uint256): 0xffff -> 0xffff
-// shl_zero(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// shr_zero(uint256): 0x00 -> 0x00
-// shr_zero(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// sar_zero(uint256): 0x00 -> 0x00
-// sar_zero(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// shl_large(uint256): 0x00 -> 0x00
-// shl_large(uint256): 0xffff -> 0x00
-// shl_large(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// shr_large(uint256): 0x00 -> 0x00
-// shr_large(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// sar_large(uint256): 0x00 -> 0x00
-// sar_large(uint256): 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// sar_large(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// shl_combined(uint256): 0x00 -> 0x00
-// shl_combined(uint256): 0xffff -> 0xffff0000
-// shl_combined(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000
-// shr_combined(uint256): 0x00 -> 0x00
-// shr_combined(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// sar_combined(uint256): 0x00 -> 0x00
-// sar_combined(uint256): 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// sar_combined(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// shl_combined_large(uint256): 0x00 -> 0x00
-// shl_combined_large(uint256): 0xffff -> 0x00
-// shl_combined_large(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// shl_combined_overflow(uint256): 0x02 -> 0x00
-// shr_combined_large(uint256): 0x00 -> 0x00
-// shr_combined_large(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// shr_combined_overflow(uint256): 0x02 -> 0x00
-// sar_combined_large(uint256): 0x00 -> 0x00
-// sar_combined_large(uint256): 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
-// sar_combined_large(uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol
deleted file mode 100644
index 526909c6c529..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol
+++ /dev/null
@@ -1,82 +0,0 @@
-contract C {
-    function shl_1() public returns (bool) {
-        uint256 c;
-        assembly {
-            c := shl(2, 1)
-        }
-        assert(c == 4);
-        return true;
-    }
-
-    function shl_2() public returns (bool) {
-        uint256 c;
-        assembly {
-            c := shl(
-                1,
-                0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-            )
-        }
-        assert(
-            c ==
-                0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-        );
-        return true;
-    }
-
-    function shl_3() public returns (bool) {
-        uint256 c;
-        assembly {
-            c := shl(
-                256,
-                0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-            )
-        }
-        assert(c == 0);
-        return true;
-    }
-
-    function shr_1() public returns (bool) {
-        uint256 c;
-        assembly {
-            c := shr(1, 3)
-        }
-        assert(c == 1);
-        return true;
-    }
-
-    function shr_2() public returns (bool) {
-        uint256 c;
-        assembly {
-            c := shr(
-                1,
-                0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-            )
-        }
-        assert(
-            c ==
-                0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-        );
-        return true;
-    }
-
-    function shr_3() public returns (bool) {
-        uint256 c;
-        assembly {
-            c := shr(
-                256,
-                0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-            )
-        }
-        assert(c == 0);
-        return true;
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// shl_1() -> 0x01
-// shl_2() -> 0x01
-// shl_3() -> 0x01
-// shr_1() -> 0x01
-// shr_2() -> 0x01
-// shr_3() -> 0x01
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup.sol b/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup.sol
deleted file mode 100644
index e8f7d07476ba..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function l(uint8 y) public returns (bytes20) {
-		bytes20 x;
-		assembly { x := "12345678901234567890abcde" }
-		// When compiling via IR, `x` is truncated before applying
-		// the operation.
-		return x << y;
-	}
-	function r(uint8 y) public returns (bytes20) {
-		bytes20 x;
-		assembly { x := "12345678901234567890abcde" }
-		return x >> y;
-	}
-}
-// ====
-// compileViaYul: false
-// ----
-// l(uint8): 64 -> 0x3930313233343536373839300000000000000000000000000000000000000000
-// r(uint8): 64 -> 0x313233343536373839303132000000000000000000000000
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol b/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol
deleted file mode 100644
index 36b6e8b59375..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function l(uint8 y) public returns (bytes20) {
-		bytes20 x;
-		assembly { x := "12345678901234567890abcde" }
-		// When compiling via IR, `x` is truncated before applying
-		// the operation.
-		return x << y;
-	}
-	function r(uint8 y) public returns (bytes20) {
-		bytes20 x;
-		assembly { x := "12345678901234567890abcde" }
-		return x >> y;
-	}
-}
-// ====
-// compileViaYul: true
-// ----
-// l(uint8): 64 -> 0x3930313233343536373839300000000000000000000000000000000000000000
-// r(uint8): 64 -> 0x313233343536373839303132000000000000000000000000
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
deleted file mode 100644
index 0adc5ae55641..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public returns (uint16 x) {
-        unchecked {
-            x = 0xffff;
-            x += 32;
-            x <<= 8;
-            x >>= 16;
-        }
-    }
-}
-// ----
-// f() -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
deleted file mode 100644
index 452884f26340..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (uint8 x) {
-        assembly {
-            x := 0xffff
-        }
-        x >>= 8;
-    }
-}
-// ----
-// f() -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
deleted file mode 100644
index bc0c9f48445a..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint256 public a = 0x42 << 8;
-}
-// ----
-// a() -> 0x4200
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
deleted file mode 100644
index 3d245e9bf325..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (uint256 a) {
-        a = 0x42;
-        a <<= 8;
-    }
-}
-// ----
-// f() -> 0x4200
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
deleted file mode 100644
index 64403475093a..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint256 public a = 0x4200 >> 8;
-}
-// ----
-// a() -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
deleted file mode 100644
index ded331a79491..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (uint256 a) {
-        a = 0x4200;
-        a >>= 8;
-    }
-}
-// ----
-// f() -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
deleted file mode 100644
index 47afab5ec1f8..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) public returns (uint256) {
-        return a << b;
-    }
-}
-// ----
-// f(uint256,uint256): 0x4266, 0x0 -> 0x4266
-// f(uint256,uint256): 0x4266, 0x8 -> 0x426600
-// f(uint256,uint256): 0x4266, 0x10 -> 0x42660000
-// f(uint256,uint256): 0x4266, 0x11 -> 0x84cc0000
-// f(uint256,uint256): 0x4266, 0xf0 -> 0x4266000000000000000000000000000000000000000000000000000000000000
-// f(uint256,uint256): 0x4266, 0x100 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
deleted file mode 100644
index afa82c6f7920..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) public returns (uint256) {
-        a <<= b;
-        return a;
-    }
-}
-// ----
-// f(uint256,uint256): 0x4266, 0x0 -> 0x4266
-// f(uint256,uint256): 0x4266, 0x8 -> 0x426600
-// f(uint256,uint256): 0x4266, 0x10 -> 0x42660000
-// f(uint256,uint256): 0x4266, 0x11 -> 0x84cc0000
-// f(uint256,uint256): 0x4266, 0xf0 -> 0x4266000000000000000000000000000000000000000000000000000000000000
-// f(uint256,uint256): 0x4266, 0x100 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
deleted file mode 100644
index 44fd4a924a1b..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint256 a, uint8 b) public returns (uint256) {
-        a <<= b;
-        return a;
-    }
-}
-// ----
-// f(uint256,uint8): 0x4266, 0x0 -> 0x4266
-// f(uint256,uint8): 0x4266, 0x8 -> 0x426600
-// f(uint256,uint8): 0x4266, 0x10 -> 0x42660000
-// f(uint256,uint8): 0x4266, 0x11 -> 0x84cc0000
-// f(uint256,uint8): 0x4266, 0xf0 -> 0x4266000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
deleted file mode 100644
index 3d6d7c7e2b9c..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// This basically tests proper cleanup and conversion. It should not convert x to int8.
-contract C {
-    function f() public returns (int8) {
-        uint8 x = 254;
-        int8 y = 1;
-        return y << x;
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
deleted file mode 100644
index d66e2f4cbf74..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint32 a, uint32 b) public returns (uint256) {
-        return a << b;
-    }
-}
-// ----
-// f(uint32,uint32): 0x4266, 0x0 -> 0x4266
-// f(uint32,uint32): 0x4266, 0x8 -> 0x426600
-// f(uint32,uint32): 0x4266, 0x10 -> 0x42660000
-// f(uint32,uint32): 0x4266, 0x11 -> 0x84cc0000
-// f(uint32,uint32): 0x4266, 0x20 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
deleted file mode 100644
index d6d6d77bb163..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint8 a, uint8 b) public returns (uint256) {
-        return a << b;
-    }
-}
-// ----
-// f(uint8,uint8): 0x66, 0x0 -> 0x66
-// f(uint8,uint8): 0x66, 0x8 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
deleted file mode 100644
index 7671ce19de6e..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    int256 public a = -0x42 << 8;
-}
-// ----
-// a() -> -16896
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
deleted file mode 100644
index e9a76d2c94ba..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    int256 public a = -0x4200 >> 8;
-}
-// ----
-// a() -> -66
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol b/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
deleted file mode 100644
index 5b0491b36728..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function leftU(uint8 x, uint8 y) public returns (uint8) {
-        return x << y;
-    }
-
-    function leftS(int8 x, uint8 y) public returns (int8) {
-        return x << y;
-    }
-}
-// ----
-// leftU(uint8,uint8): 255, 8 -> 0
-// leftU(uint8,uint8): 255, 1 -> 254
-// leftU(uint8,uint8): 255, 0 -> 255
-// leftS(int8,uint8): 1, 7 -> -128 # Result is -128 and output is sign-extended, not zero-padded. #
-// leftS(int8,uint8): 1, 6 -> 64
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
deleted file mode 100644
index 4947b21d45a6..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) public returns (uint256) {
-        return a >> b;
-    }
-}
-// ----
-// f(uint256,uint256): 0x4266, 0x0 -> 0x4266
-// f(uint256,uint256): 0x4266, 0x8 -> 0x42
-// f(uint256,uint256): 0x4266, 0x10 -> 0
-// f(uint256,uint256): 0x4266, 0x11 -> 0
-// f(uint256,uint256): 57896044618658097711785492504343953926634992332820282019728792003956564819968, 5 -> 1809251394333065553493296640760748560207343510400633813116524750123642650624
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
deleted file mode 100644
index f9206b092f4b..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) public returns (uint256) {
-        a >>= b;
-        return a;
-    }
-}
-// ----
-// f(uint256,uint256): 0x4266, 0x0 -> 0x4266
-// f(uint256,uint256): 0x4266, 0x8 -> 0x42
-// f(uint256,uint256): 0x4266, 0x10 -> 0
-// f(uint256,uint256): 0x4266, 0x11 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol
deleted file mode 100644
index 094d75b68388..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(int8 a, uint8 b) public returns (int256) {
-        assembly {
-            a := 0xfffffff0
-        }
-        // Higher bits should be signextended before the shift
-        return a >> b;
-    }
-
-    function g(int8 a, uint8 b) public returns (int256) {
-        assembly {
-            a := 0xf0
-        }
-        // Higher bits should be signextended before the shift
-        return a >> b;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// f(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// f(int8,uint8): 0x00, 0xff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// f(int8,uint8): 0x00, 0x1003 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// f(int8,uint8): 0x00, 0x1004 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// g(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// g(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// g(int8,uint8): 0x00, 0xff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// g(int8,uint8): 0x00, 0x1003 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// g(int8,uint8): 0x00, 0x1004 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
deleted file mode 100644
index 2b1afb52be25..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(int8 a, uint8 b) public returns (int256) {
-        assembly {
-            a := 0xfffffff0
-        }
-        // Higher bits should be signextended before the shift
-        return a >> b;
-    }
-
-    function g(int8 a, uint8 b) public returns (int256) {
-        assembly {
-            a := 0xf0
-        }
-        // Higher bits should be signextended before the shift
-        return a >> b;
-    }
-}
-// ----
-// f(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// f(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// f(int8,uint8): 0x00, 0xff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// f(int8,uint8): 0x00, 0x1003 -> FAILURE
-// f(int8,uint8): 0x00, 0x1004 -> FAILURE
-// g(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-// g(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// g(int8,uint8): 0x00, 0xff -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// g(int8,uint8): 0x00, 0x1003 -> FAILURE
-// g(int8,uint8): 0x00, 0x1004 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol
deleted file mode 100644
index 8412e372bb33..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(uint8 a, uint8 b) public returns (uint256) {
-        assembly {
-            a := 0xffffffff
-        }
-        // Higher bits should be cleared before the shift
-        return a >> b;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(uint8,uint8): 0x00, 0x04 -> 0x0f
-// f(uint8,uint8): 0x00, 0x1004 -> 0x0f
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
deleted file mode 100644
index 8cf89f4b0039..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(uint8 a, uint8 b) public returns (uint256) {
-        assembly {
-            a := 0xffffffff
-        }
-        // Higher bits should be cleared before the shift
-        return a >> b;
-    }
-}
-// ----
-// f(uint8,uint8): 0x00, 0x04 -> 0x0f
-// f(uint8,uint8): 0x00, 0x1004 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
deleted file mode 100644
index e24118afe130..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-contract C {
-    function f1() public pure returns (bool) {
-        return (-4266 >> 0) == -4266;
-    }
-
-    function f2() public pure returns (bool) {
-        return (-4266 >> 1) == -2133;
-    }
-
-    function f3() public pure returns (bool) {
-        return (-4266 >> 4) == -267;
-    }
-
-    function f4() public pure returns (bool) {
-        return (-4266 >> 8) == -17;
-    }
-
-    function f5() public pure returns (bool) {
-        return (-4266 >> 16) == -1;
-    }
-
-    function f6() public pure returns (bool) {
-        return (-4266 >> 17) == -1;
-    }
-
-    function g1() public pure returns (bool) {
-        return (-4267 >> 0) == -4267;
-    }
-
-    function g2() public pure returns (bool) {
-        return (-4267 >> 1) == -2134;
-    }
-
-    function g3() public pure returns (bool) {
-        return (-4267 >> 4) == -267;
-    }
-
-    function g4() public pure returns (bool) {
-        return (-4267 >> 8) == -17;
-    }
-
-    function g5() public pure returns (bool) {
-        return (-4267 >> 16) == -1;
-    }
-
-    function g6() public pure returns (bool) {
-        return (-4267 >> 17) == -1;
-    }
-}
-// ----
-// f1() -> true
-// f2() -> true
-// f3() -> true
-// f4() -> true
-// f5() -> true
-// f6() -> true
-// g1() -> true
-// g2() -> true
-// g3() -> true
-// g4() -> true
-// g5() -> true
-// g6() -> true
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
deleted file mode 100644
index 5dcde06f2bc1..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f(int256 a, uint256 b) public returns (int256) {
-        return a >> b;
-    }
-}
-// ----
-// f(int256,uint256): -4266, 0 -> -4266
-// f(int256,uint256): -4266, 1 -> -2133
-// f(int256,uint256): -4266, 4 -> -267
-// f(int256,uint256): -4266, 8 -> -17
-// f(int256,uint256): -4266, 16 -> -1
-// f(int256,uint256): -4266, 17 -> -1
-// f(int256,uint256): -4267, 0 -> -4267
-// f(int256,uint256): -4267, 1 -> -2134
-// f(int256,uint256): -4267, 4 -> -267
-// f(int256,uint256): -4267, 8 -> -17
-// f(int256,uint256): -4267, 16 -> -1
-// f(int256,uint256): -4267, 17 -> -1
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
deleted file mode 100644
index 00ac9662e829..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f(int256 a, uint256 b) public returns (int256) {
-        a >>= b;
-        return a;
-    }
-}
-// ----
-// f(int256,uint256): -4266, 0 -> -4266
-// f(int256,uint256): -4266, 1 -> -2133
-// f(int256,uint256): -4266, 4 -> -267
-// f(int256,uint256): -4266, 8 -> -17
-// f(int256,uint256): -4266, 16 -> -1
-// f(int256,uint256): -4266, 17 -> -1
-// f(int256,uint256): -4267, 0 -> -4267
-// f(int256,uint256): -4267, 1 -> -2134
-// f(int256,uint256): -4267, 4 -> -267
-// f(int256,uint256): -4267, 8 -> -17
-// f(int256,uint256): -4267, 16 -> -1
-// f(int256,uint256): -4267, 17 -> -1
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
deleted file mode 100644
index 50612a6f306d..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f(int16 a, uint16 b) public returns (int256) {
-        return a >> b;
-    }
-}
-// ----
-// f(int16,uint16): -4266, 0 -> -4266
-// f(int16,uint16): -4266, 1 -> -2133
-// f(int16,uint16): -4266, 4 -> -267
-// f(int16,uint16): -4266, 8 -> -17
-// f(int16,uint16): -4266, 16 -> -1
-// f(int16,uint16): -4266, 17 -> -1
-// f(int16,uint16): -4267, 0 -> -4267
-// f(int16,uint16): -4267, 1 -> -2134
-// f(int16,uint16): -4267, 4 -> -267
-// f(int16,uint16): -4267, 8 -> -17
-// f(int16,uint16): -4267, 16 -> -1
-// f(int16,uint16): -4267, 17 -> -1
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
deleted file mode 100644
index 024eb3254624..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f(int32 a, uint32 b) public returns (int256) {
-        return a >> b;
-    }
-}
-// ----
-// f(int32,uint32): -4266, 0 -> -4266
-// f(int32,uint32): -4266, 1 -> -2133
-// f(int32,uint32): -4266, 4 -> -267
-// f(int32,uint32): -4266, 8 -> -17
-// f(int32,uint32): -4266, 16 -> -1
-// f(int32,uint32): -4266, 17 -> -1
-// f(int32,uint32): -4267, 0 -> -4267
-// f(int32,uint32): -4267, 1 -> -2134
-// f(int32,uint32): -4267, 4 -> -267
-// f(int32,uint32): -4267, 8 -> -17
-// f(int32,uint32): -4267, 16 -> -1
-// f(int32,uint32): -4267, 17 -> -1
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
deleted file mode 100644
index 9cff6c3b5249..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f(int8 a, uint8 b) public returns (int256) {
-        return a >> b;
-    }
-}
-// ----
-// f(int8,uint8): -66, 0 -> -66
-// f(int8,uint8): -66, 1 -> -33
-// f(int8,uint8): -66, 4 -> -5
-// f(int8,uint8): -66, 8 -> -1
-// f(int8,uint8): -66, 16 -> -1
-// f(int8,uint8): -66, 17 -> -1
-// f(int8,uint8): -67, 0 -> -67
-// f(int8,uint8): -67, 1 -> -34
-// f(int8,uint8): -67, 4 -> -5
-// f(int8,uint8): -67, 8 -> -1
-// f(int8,uint8): -67, 16 -> -1
-// f(int8,uint8): -67, 17 -> -1
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol
deleted file mode 100644
index 0b8d0e833f2d..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(int16 a, uint16 b) public returns (int16) {
-        return a >> b;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(int16,uint16): 0xff99, 0x00 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff99
-// f(int16,uint16): 0xff99, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcc
-// f(int16,uint16): 0xff99, 0x02 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6
-// f(int16,uint16): 0xff99, 0x04 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9
-// f(int16,uint16): 0xff99, 0x08 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
deleted file mode 100644
index f2c024483015..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(int16 a, uint16 b) public returns (int16) {
-        return a >> b;
-    }
-}
-// ----
-// f(int16,uint16): 0xff99, 0x00 -> FAILURE
-// f(int16,uint16): 0xff99, 0x01 -> FAILURE
-// f(int16,uint16): 0xff99, 0x02 -> FAILURE
-// f(int16,uint16): 0xff99, 0x04 -> FAILURE
-// f(int16,uint16): 0xff99, 0x08 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol
deleted file mode 100644
index a6b6378c6576..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(int32 a, uint32 b) public returns (int32) {
-        return a >> b;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(int32,uint32): 0xffffff99, 0x00 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff99
-// f(int32,uint32): 0xffffff99, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcc
-// f(int32,uint32): 0xffffff99, 0x02 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6
-// f(int32,uint32): 0xffffff99, 0x04 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9
-// f(int32,uint32): 0xffffff99, 0x08 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
deleted file mode 100644
index 9c3090a783a9..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(int32 a, uint32 b) public returns (int32) {
-        return a >> b;
-    }
-}
-// ----
-// f(int32,uint32): 0xffffff99, 0x00 -> FAILURE
-// f(int32,uint32): 0xffffff99, 0x01 -> FAILURE
-// f(int32,uint32): 0xffffff99, 0x02 -> FAILURE
-// f(int32,uint32): 0xffffff99, 0x04 -> FAILURE
-// f(int32,uint32): 0xffffff99, 0x08 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol
deleted file mode 100644
index 52529a85c929..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f(int8 a, uint8 b) public returns (int8) {
-        return a >> b;
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(int8,uint8): 0x99, 0x00 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff99
-// f(int8,uint8): 0x99, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcc
-// f(int8,uint8): 0x99, 0x02 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6
-// f(int8,uint8): 0x99, 0x04 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9
-// f(int8,uint8): 0x99, 0x08 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
deleted file mode 100644
index 8d3cec4e31e3..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    function f(int8 a, uint8 b) public returns (int8) {
-        return a >> b;
-    }
-}
-// ----
-// f(int8,uint8): 0x99, 0x00 -> FAILURE
-// f(int8,uint8): 0x99, 0x01 -> FAILURE
-// f(int8,uint8): 0x99, 0x02 -> FAILURE
-// f(int8,uint8): 0x99, 0x04 -> FAILURE
-// f(int8,uint8): 0x99, 0x08 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
deleted file mode 100644
index 2619ea334d51..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint32 a, uint32 b) public returns (uint256) {
-        return a >> b;
-    }
-}
-// ----
-// f(uint32,uint32): 0x4266, 0x0 -> 0x4266
-// f(uint32,uint32): 0x4266, 0x8 -> 0x42
-// f(uint32,uint32): 0x4266, 0x10 -> 0
-// f(uint32,uint32): 0x4266, 0x11 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
deleted file mode 100644
index 1792d8755193..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint8 a, uint8 b) public returns (uint256) {
-        return a >> b;
-    }
-}
-// ----
-// f(uint8,uint8): 0x66, 0x0 -> 0x66
-// f(uint8,uint8): 0x66, 0x8 -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol b/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
deleted file mode 100644
index 6f4f95e919f3..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(int256 a, uint256 b) public returns (int256) {
-        return a << b;
-    }
-
-    function g(int256 a, uint256 b) public returns (int256) {
-        return a >> b;
-    }
-}
-// ----
-// f(int256,uint256): 1, -1 -> 0
-// g(int256,uint256): 1, -1 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shifts.sol b/test/libsolidity/semanticTests/operators/shifts/shifts.sol
deleted file mode 100644
index e202f2889799..000000000000
--- a/test/libsolidity/semanticTests/operators/shifts/shifts.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint x) public returns (uint y) {
-        assembly { y := shl(2, x) }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// f(uint256): 7 -> 28
diff --git a/test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol
deleted file mode 100644
index 315356b6c34c..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol
+++ /dev/null
@@ -1,92 +0,0 @@
-type Int is int8;
-using {
-    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
-    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
-    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
-} for Int global;
-
-function bitor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) | Int.unwrap(y)); }
-function bitand(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) & Int.unwrap(y)); }
-function bitxor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) ^ Int.unwrap(y)); }
-function bitnot(Int x) pure returns (Int) { return Int.wrap(~Int.unwrap(x)); }
-
-function add(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) + Int.unwrap(y)); }
-function sub(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) - Int.unwrap(y)); }
-function unsub(Int x) pure returns (Int) { return Int.wrap(-Int.unwrap(x)); }
-function mul(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) * Int.unwrap(y)); }
-function div(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) / Int.unwrap(y)); }
-function mod(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) % Int.unwrap(y)); }
-
-function eq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) == Int.unwrap(y); }
-function noteq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) != Int.unwrap(y); }
-function lt(Int x, Int y) pure returns (bool) { return Int.unwrap(x) < Int.unwrap(y); }
-function gt(Int x, Int y) pure returns (bool) { return Int.unwrap(x) > Int.unwrap(y); }
-function leq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) <= Int.unwrap(y); }
-function geq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) >= Int.unwrap(y); }
-
-contract C {
-    Int constant ZERO = Int.wrap(0);
-    Int constant ONE = Int.wrap(1);
-    Int constant TWO = Int.wrap(2);
-    Int constant THREE = Int.wrap(3);
-    Int constant SIX = Int.wrap(6);
-
-    function testBitwise() public pure {
-        assert(Int.unwrap(ONE | TWO) == 3);
-        assert(Int.unwrap(ONE | ZERO) == 1);
-
-        assert(Int.unwrap(ONE & THREE) == 1);
-        assert(Int.unwrap(ONE & ONE) == 1);
-
-        assert(Int.unwrap(TWO ^ TWO) == 0);
-        assert(Int.unwrap(TWO ^ ONE) == 3);
-
-        assert(Int.unwrap(~ZERO) == -1);
-        assert(Int.unwrap(~ONE) == -2);
-        assert(Int.unwrap(~TWO) == -3);
-    }
-
-    function testArithmetic() public pure {
-        assert(Int.unwrap(ONE + TWO) == 3);
-        assert(Int.unwrap(ONE + ZERO) == 1);
-
-        assert(Int.unwrap(TWO - ONE) == 1);
-        assert(Int.unwrap(THREE - THREE) == 0);
-
-        assert(Int.unwrap(-TWO) == -2);
-        assert(Int.unwrap(-ZERO) == 0);
-
-        assert(Int.unwrap(ONE * ONE) == 1);
-        assert(Int.unwrap(THREE * TWO) == 6);
-
-        assert(Int.unwrap(SIX / TWO) == 3);
-        assert(Int.unwrap(THREE / TWO) == 1);
-
-        assert(Int.unwrap(SIX % TWO) == 0);
-        assert(Int.unwrap(THREE % TWO) == 1);
-    }
-
-    function testComparison() public pure {
-        assert((ONE == ONE) == true);
-        assert((ONE == TWO) == false);
-
-        assert((ONE != ONE) == false);
-        assert((ONE != TWO) == true);
-
-        assert((ONE < TWO) == true);
-        assert((TWO < ONE) == false);
-
-        assert((ONE <= TWO) == true);
-        assert((TWO <= ONE) == false);
-
-        assert((ONE > TWO) == false);
-        assert((TWO > ONE) == true);
-
-        assert((ONE >= TWO) == false);
-        assert((TWO >= ONE) == true);
-    }
-}
-// ----
-// testBitwise() ->
-// testArithmetic() ->
-// testComparison() ->
diff --git a/test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol
deleted file mode 100644
index 868a5396761a..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol
+++ /dev/null
@@ -1,670 +0,0 @@
-type Int8 is int8;
-type Int16 is int16;
-type Int24 is int24;
-type Int32 is int32;
-type Int40 is int40;
-type Int48 is int48;
-type Int56 is int56;
-type Int64 is int64;
-type Int72 is int72;
-type Int80 is int80;
-type Int88 is int88;
-type Int96 is int96;
-type Int104 is int104;
-type Int112 is int112;
-type Int120 is int120;
-type Int128 is int128;
-type Int136 is int136;
-type Int144 is int144;
-type Int152 is int152;
-type Int160 is int160;
-type Int168 is int168;
-type Int176 is int176;
-type Int184 is int184;
-type Int192 is int192;
-type Int200 is int200;
-type Int208 is int208;
-type Int216 is int216;
-type Int224 is int224;
-type Int232 is int232;
-type Int240 is int240;
-type Int248 is int248;
-type Int256 is int256;
-type Int is int;
-
-type Uint8 is uint8;
-type Uint16 is uint16;
-type Uint24 is uint24;
-type Uint32 is uint32;
-type Uint40 is uint40;
-type Uint48 is uint48;
-type Uint56 is uint56;
-type Uint64 is uint64;
-type Uint72 is uint72;
-type Uint80 is uint80;
-type Uint88 is uint88;
-type Uint96 is uint96;
-type Uint104 is uint104;
-type Uint112 is uint112;
-type Uint120 is uint120;
-type Uint128 is uint128;
-type Uint136 is uint136;
-type Uint144 is uint144;
-type Uint152 is uint152;
-type Uint160 is uint160;
-type Uint168 is uint168;
-type Uint176 is uint176;
-type Uint184 is uint184;
-type Uint192 is uint192;
-type Uint200 is uint200;
-type Uint208 is uint208;
-type Uint216 is uint216;
-type Uint224 is uint224;
-type Uint232 is uint232;
-type Uint240 is uint240;
-type Uint248 is uint248;
-type Uint256 is uint256;
-type Uint is uint;
-
-type Bytes1 is bytes1;
-type Bytes2 is bytes2;
-type Bytes3 is bytes3;
-type Bytes4 is bytes4;
-type Bytes5 is bytes5;
-type Bytes6 is bytes6;
-type Bytes7 is bytes7;
-type Bytes8 is bytes8;
-type Bytes9 is bytes9;
-type Bytes10 is bytes10;
-type Bytes11 is bytes11;
-type Bytes12 is bytes12;
-type Bytes13 is bytes13;
-type Bytes14 is bytes14;
-type Bytes15 is bytes15;
-type Bytes16 is bytes16;
-type Bytes17 is bytes17;
-type Bytes18 is bytes18;
-type Bytes19 is bytes19;
-type Bytes20 is bytes20;
-type Bytes21 is bytes21;
-type Bytes22 is bytes22;
-type Bytes23 is bytes23;
-type Bytes24 is bytes24;
-type Bytes25 is bytes25;
-type Bytes26 is bytes26;
-type Bytes27 is bytes27;
-type Bytes28 is bytes28;
-type Bytes29 is bytes29;
-type Bytes30 is bytes30;
-type Bytes31 is bytes31;
-type Bytes32 is bytes32;
-
-type Address is address;
-type AddressPayable is address payable;
-
-type Bool is bool;
-
-using {bitorInt8 as |, unsubInt8 as -} for Int8 global;
-using {bitorInt16 as |, unsubInt16 as -} for Int16 global;
-using {bitorInt24 as |, unsubInt24 as -} for Int24 global;
-using {bitorInt32 as |, unsubInt32 as -} for Int32 global;
-using {bitorInt40 as |, unsubInt40 as -} for Int40 global;
-using {bitorInt48 as |, unsubInt48 as -} for Int48 global;
-using {bitorInt56 as |, unsubInt56 as -} for Int56 global;
-using {bitorInt64 as |, unsubInt64 as -} for Int64 global;
-using {bitorInt72 as |, unsubInt72 as -} for Int72 global;
-using {bitorInt80 as |, unsubInt80 as -} for Int80 global;
-using {bitorInt88 as |, unsubInt88 as -} for Int88 global;
-using {bitorInt96 as |, unsubInt96 as -} for Int96 global;
-using {bitorInt104 as |, unsubInt104 as -} for Int104 global;
-using {bitorInt112 as |, unsubInt112 as -} for Int112 global;
-using {bitorInt120 as |, unsubInt120 as -} for Int120 global;
-using {bitorInt128 as |, unsubInt128 as -} for Int128 global;
-using {bitorInt136 as |, unsubInt136 as -} for Int136 global;
-using {bitorInt144 as |, unsubInt144 as -} for Int144 global;
-using {bitorInt152 as |, unsubInt152 as -} for Int152 global;
-using {bitorInt160 as |, unsubInt160 as -} for Int160 global;
-using {bitorInt168 as |, unsubInt168 as -} for Int168 global;
-using {bitorInt176 as |, unsubInt176 as -} for Int176 global;
-using {bitorInt184 as |, unsubInt184 as -} for Int184 global;
-using {bitorInt192 as |, unsubInt192 as -} for Int192 global;
-using {bitorInt200 as |, unsubInt200 as -} for Int200 global;
-using {bitorInt208 as |, unsubInt208 as -} for Int208 global;
-using {bitorInt216 as |, unsubInt216 as -} for Int216 global;
-using {bitorInt224 as |, unsubInt224 as -} for Int224 global;
-using {bitorInt232 as |, unsubInt232 as -} for Int232 global;
-using {bitorInt240 as |, unsubInt240 as -} for Int240 global;
-using {bitorInt248 as |, unsubInt248 as -} for Int248 global;
-using {bitorInt256 as |, unsubInt256 as -} for Int256 global;
-using {bitorInt as |, unsubInt as -} for Int global;
-
-using {bitorUint8 as |, bitnotUint8 as ~} for Uint8 global;
-using {bitorUint16 as |, bitnotUint16 as ~} for Uint16 global;
-using {bitorUint24 as |, bitnotUint24 as ~} for Uint24 global;
-using {bitorUint32 as |, bitnotUint32 as ~} for Uint32 global;
-using {bitorUint40 as |, bitnotUint40 as ~} for Uint40 global;
-using {bitorUint48 as |, bitnotUint48 as ~} for Uint48 global;
-using {bitorUint56 as |, bitnotUint56 as ~} for Uint56 global;
-using {bitorUint64 as |, bitnotUint64 as ~} for Uint64 global;
-using {bitorUint72 as |, bitnotUint72 as ~} for Uint72 global;
-using {bitorUint80 as |, bitnotUint80 as ~} for Uint80 global;
-using {bitorUint88 as |, bitnotUint88 as ~} for Uint88 global;
-using {bitorUint96 as |, bitnotUint96 as ~} for Uint96 global;
-using {bitorUint104 as |, bitnotUint104 as ~} for Uint104 global;
-using {bitorUint112 as |, bitnotUint112 as ~} for Uint112 global;
-using {bitorUint120 as |, bitnotUint120 as ~} for Uint120 global;
-using {bitorUint128 as |, bitnotUint128 as ~} for Uint128 global;
-using {bitorUint136 as |, bitnotUint136 as ~} for Uint136 global;
-using {bitorUint144 as |, bitnotUint144 as ~} for Uint144 global;
-using {bitorUint152 as |, bitnotUint152 as ~} for Uint152 global;
-using {bitorUint160 as |, bitnotUint160 as ~} for Uint160 global;
-using {bitorUint168 as |, bitnotUint168 as ~} for Uint168 global;
-using {bitorUint176 as |, bitnotUint176 as ~} for Uint176 global;
-using {bitorUint184 as |, bitnotUint184 as ~} for Uint184 global;
-using {bitorUint192 as |, bitnotUint192 as ~} for Uint192 global;
-using {bitorUint200 as |, bitnotUint200 as ~} for Uint200 global;
-using {bitorUint208 as |, bitnotUint208 as ~} for Uint208 global;
-using {bitorUint216 as |, bitnotUint216 as ~} for Uint216 global;
-using {bitorUint224 as |, bitnotUint224 as ~} for Uint224 global;
-using {bitorUint232 as |, bitnotUint232 as ~} for Uint232 global;
-using {bitorUint240 as |, bitnotUint240 as ~} for Uint240 global;
-using {bitorUint248 as |, bitnotUint248 as ~} for Uint248 global;
-using {bitorUint256 as |, bitnotUint256 as ~} for Uint256 global;
-using {bitorUint as |, bitnotUint as ~} for Uint global;
-
-using {bitorBytes1 as |, bitnotBytes1 as ~} for Bytes1 global;
-using {bitorBytes2 as |, bitnotBytes2 as ~} for Bytes2 global;
-using {bitorBytes3 as |, bitnotBytes3 as ~} for Bytes3 global;
-using {bitorBytes4 as |, bitnotBytes4 as ~} for Bytes4 global;
-using {bitorBytes5 as |, bitnotBytes5 as ~} for Bytes5 global;
-using {bitorBytes6 as |, bitnotBytes6 as ~} for Bytes6 global;
-using {bitorBytes7 as |, bitnotBytes7 as ~} for Bytes7 global;
-using {bitorBytes8 as |, bitnotBytes8 as ~} for Bytes8 global;
-using {bitorBytes9 as |, bitnotBytes9 as ~} for Bytes9 global;
-using {bitorBytes10 as |, bitnotBytes10 as ~} for Bytes10 global;
-using {bitorBytes11 as |, bitnotBytes11 as ~} for Bytes11 global;
-using {bitorBytes12 as |, bitnotBytes12 as ~} for Bytes12 global;
-using {bitorBytes13 as |, bitnotBytes13 as ~} for Bytes13 global;
-using {bitorBytes14 as |, bitnotBytes14 as ~} for Bytes14 global;
-using {bitorBytes15 as |, bitnotBytes15 as ~} for Bytes15 global;
-using {bitorBytes16 as |, bitnotBytes16 as ~} for Bytes16 global;
-using {bitorBytes17 as |, bitnotBytes17 as ~} for Bytes17 global;
-using {bitorBytes18 as |, bitnotBytes18 as ~} for Bytes18 global;
-using {bitorBytes19 as |, bitnotBytes19 as ~} for Bytes19 global;
-using {bitorBytes20 as |, bitnotBytes20 as ~} for Bytes20 global;
-using {bitorBytes21 as |, bitnotBytes21 as ~} for Bytes21 global;
-using {bitorBytes22 as |, bitnotBytes22 as ~} for Bytes22 global;
-using {bitorBytes23 as |, bitnotBytes23 as ~} for Bytes23 global;
-using {bitorBytes24 as |, bitnotBytes24 as ~} for Bytes24 global;
-using {bitorBytes25 as |, bitnotBytes25 as ~} for Bytes25 global;
-using {bitorBytes26 as |, bitnotBytes26 as ~} for Bytes26 global;
-using {bitorBytes27 as |, bitnotBytes27 as ~} for Bytes27 global;
-using {bitorBytes28 as |, bitnotBytes28 as ~} for Bytes28 global;
-using {bitorBytes29 as |, bitnotBytes29 as ~} for Bytes29 global;
-using {bitorBytes30 as |, bitnotBytes30 as ~} for Bytes30 global;
-using {bitorBytes31 as |, bitnotBytes31 as ~} for Bytes31 global;
-using {bitorBytes32 as |, bitnotBytes32 as ~} for Bytes32 global;
-
-function bitorInt8(Int8 x, Int8 y) pure returns (Int8) { return Int8.wrap(Int8.unwrap(x) | Int8.unwrap(y)); }
-function bitorInt16(Int16 x, Int16 y) pure returns (Int16) { return Int16.wrap(Int16.unwrap(x) | Int16.unwrap(y)); }
-function bitorInt24(Int24 x, Int24 y) pure returns (Int24) { return Int24.wrap(Int24.unwrap(x) | Int24.unwrap(y)); }
-function bitorInt32(Int32 x, Int32 y) pure returns (Int32) { return Int32.wrap(Int32.unwrap(x) | Int32.unwrap(y)); }
-function bitorInt40(Int40 x, Int40 y) pure returns (Int40) { return Int40.wrap(Int40.unwrap(x) | Int40.unwrap(y)); }
-function bitorInt48(Int48 x, Int48 y) pure returns (Int48) { return Int48.wrap(Int48.unwrap(x) | Int48.unwrap(y)); }
-function bitorInt56(Int56 x, Int56 y) pure returns (Int56) { return Int56.wrap(Int56.unwrap(x) | Int56.unwrap(y)); }
-function bitorInt64(Int64 x, Int64 y) pure returns (Int64) { return Int64.wrap(Int64.unwrap(x) | Int64.unwrap(y)); }
-function bitorInt72(Int72 x, Int72 y) pure returns (Int72) { return Int72.wrap(Int72.unwrap(x) | Int72.unwrap(y)); }
-function bitorInt80(Int80 x, Int80 y) pure returns (Int80) { return Int80.wrap(Int80.unwrap(x) | Int80.unwrap(y)); }
-function bitorInt88(Int88 x, Int88 y) pure returns (Int88) { return Int88.wrap(Int88.unwrap(x) | Int88.unwrap(y)); }
-function bitorInt96(Int96 x, Int96 y) pure returns (Int96) { return Int96.wrap(Int96.unwrap(x) | Int96.unwrap(y)); }
-function bitorInt104(Int104 x, Int104 y) pure returns (Int104) { return Int104.wrap(Int104.unwrap(x) | Int104.unwrap(y)); }
-function bitorInt112(Int112 x, Int112 y) pure returns (Int112) { return Int112.wrap(Int112.unwrap(x) | Int112.unwrap(y)); }
-function bitorInt120(Int120 x, Int120 y) pure returns (Int120) { return Int120.wrap(Int120.unwrap(x) | Int120.unwrap(y)); }
-function bitorInt128(Int128 x, Int128 y) pure returns (Int128) { return Int128.wrap(Int128.unwrap(x) | Int128.unwrap(y)); }
-function bitorInt136(Int136 x, Int136 y) pure returns (Int136) { return Int136.wrap(Int136.unwrap(x) | Int136.unwrap(y)); }
-function bitorInt144(Int144 x, Int144 y) pure returns (Int144) { return Int144.wrap(Int144.unwrap(x) | Int144.unwrap(y)); }
-function bitorInt152(Int152 x, Int152 y) pure returns (Int152) { return Int152.wrap(Int152.unwrap(x) | Int152.unwrap(y)); }
-function bitorInt160(Int160 x, Int160 y) pure returns (Int160) { return Int160.wrap(Int160.unwrap(x) | Int160.unwrap(y)); }
-function bitorInt168(Int168 x, Int168 y) pure returns (Int168) { return Int168.wrap(Int168.unwrap(x) | Int168.unwrap(y)); }
-function bitorInt176(Int176 x, Int176 y) pure returns (Int176) { return Int176.wrap(Int176.unwrap(x) | Int176.unwrap(y)); }
-function bitorInt184(Int184 x, Int184 y) pure returns (Int184) { return Int184.wrap(Int184.unwrap(x) | Int184.unwrap(y)); }
-function bitorInt192(Int192 x, Int192 y) pure returns (Int192) { return Int192.wrap(Int192.unwrap(x) | Int192.unwrap(y)); }
-function bitorInt200(Int200 x, Int200 y) pure returns (Int200) { return Int200.wrap(Int200.unwrap(x) | Int200.unwrap(y)); }
-function bitorInt208(Int208 x, Int208 y) pure returns (Int208) { return Int208.wrap(Int208.unwrap(x) | Int208.unwrap(y)); }
-function bitorInt216(Int216 x, Int216 y) pure returns (Int216) { return Int216.wrap(Int216.unwrap(x) | Int216.unwrap(y)); }
-function bitorInt224(Int224 x, Int224 y) pure returns (Int224) { return Int224.wrap(Int224.unwrap(x) | Int224.unwrap(y)); }
-function bitorInt232(Int232 x, Int232 y) pure returns (Int232) { return Int232.wrap(Int232.unwrap(x) | Int232.unwrap(y)); }
-function bitorInt240(Int240 x, Int240 y) pure returns (Int240) { return Int240.wrap(Int240.unwrap(x) | Int240.unwrap(y)); }
-function bitorInt248(Int248 x, Int248 y) pure returns (Int248) { return Int248.wrap(Int248.unwrap(x) | Int248.unwrap(y)); }
-function bitorInt256(Int256 x, Int256 y) pure returns (Int256) { return Int256.wrap(Int256.unwrap(x) | Int256.unwrap(y)); }
-function bitorInt(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) | Int.unwrap(y)); }
-
-function unsubInt8(Int8 x) pure returns (Int8) { return Int8.wrap(-Int8.unwrap(x)); }
-function unsubInt16(Int16 x) pure returns (Int16) { return Int16.wrap(-Int16.unwrap(x)); }
-function unsubInt24(Int24 x) pure returns (Int24) { return Int24.wrap(-Int24.unwrap(x)); }
-function unsubInt32(Int32 x) pure returns (Int32) { return Int32.wrap(-Int32.unwrap(x)); }
-function unsubInt40(Int40 x) pure returns (Int40) { return Int40.wrap(-Int40.unwrap(x)); }
-function unsubInt48(Int48 x) pure returns (Int48) { return Int48.wrap(-Int48.unwrap(x)); }
-function unsubInt56(Int56 x) pure returns (Int56) { return Int56.wrap(-Int56.unwrap(x)); }
-function unsubInt64(Int64 x) pure returns (Int64) { return Int64.wrap(-Int64.unwrap(x)); }
-function unsubInt72(Int72 x) pure returns (Int72) { return Int72.wrap(-Int72.unwrap(x)); }
-function unsubInt80(Int80 x) pure returns (Int80) { return Int80.wrap(-Int80.unwrap(x)); }
-function unsubInt88(Int88 x) pure returns (Int88) { return Int88.wrap(-Int88.unwrap(x)); }
-function unsubInt96(Int96 x) pure returns (Int96) { return Int96.wrap(-Int96.unwrap(x)); }
-function unsubInt104(Int104 x) pure returns (Int104) { return Int104.wrap(-Int104.unwrap(x)); }
-function unsubInt112(Int112 x) pure returns (Int112) { return Int112.wrap(-Int112.unwrap(x)); }
-function unsubInt120(Int120 x) pure returns (Int120) { return Int120.wrap(-Int120.unwrap(x)); }
-function unsubInt128(Int128 x) pure returns (Int128) { return Int128.wrap(-Int128.unwrap(x)); }
-function unsubInt136(Int136 x) pure returns (Int136) { return Int136.wrap(-Int136.unwrap(x)); }
-function unsubInt144(Int144 x) pure returns (Int144) { return Int144.wrap(-Int144.unwrap(x)); }
-function unsubInt152(Int152 x) pure returns (Int152) { return Int152.wrap(-Int152.unwrap(x)); }
-function unsubInt160(Int160 x) pure returns (Int160) { return Int160.wrap(-Int160.unwrap(x)); }
-function unsubInt168(Int168 x) pure returns (Int168) { return Int168.wrap(-Int168.unwrap(x)); }
-function unsubInt176(Int176 x) pure returns (Int176) { return Int176.wrap(-Int176.unwrap(x)); }
-function unsubInt184(Int184 x) pure returns (Int184) { return Int184.wrap(-Int184.unwrap(x)); }
-function unsubInt192(Int192 x) pure returns (Int192) { return Int192.wrap(-Int192.unwrap(x)); }
-function unsubInt200(Int200 x) pure returns (Int200) { return Int200.wrap(-Int200.unwrap(x)); }
-function unsubInt208(Int208 x) pure returns (Int208) { return Int208.wrap(-Int208.unwrap(x)); }
-function unsubInt216(Int216 x) pure returns (Int216) { return Int216.wrap(-Int216.unwrap(x)); }
-function unsubInt224(Int224 x) pure returns (Int224) { return Int224.wrap(-Int224.unwrap(x)); }
-function unsubInt232(Int232 x) pure returns (Int232) { return Int232.wrap(-Int232.unwrap(x)); }
-function unsubInt240(Int240 x) pure returns (Int240) { return Int240.wrap(-Int240.unwrap(x)); }
-function unsubInt248(Int248 x) pure returns (Int248) { return Int248.wrap(-Int248.unwrap(x)); }
-function unsubInt256(Int256 x) pure returns (Int256) { return Int256.wrap(-Int256.unwrap(x)); }
-function unsubInt(Int x) pure returns (Int) { return Int.wrap(-Int.unwrap(x)); }
-
-function bitorUint8(Uint8 x, Uint8 y) pure returns (Uint8) { return Uint8.wrap(Uint8.unwrap(x) | Uint8.unwrap(y)); }
-function bitorUint16(Uint16 x, Uint16 y) pure returns (Uint16) { return Uint16.wrap(Uint16.unwrap(x) | Uint16.unwrap(y)); }
-function bitorUint24(Uint24 x, Uint24 y) pure returns (Uint24) { return Uint24.wrap(Uint24.unwrap(x) | Uint24.unwrap(y)); }
-function bitorUint32(Uint32 x, Uint32 y) pure returns (Uint32) { return Uint32.wrap(Uint32.unwrap(x) | Uint32.unwrap(y)); }
-function bitorUint40(Uint40 x, Uint40 y) pure returns (Uint40) { return Uint40.wrap(Uint40.unwrap(x) | Uint40.unwrap(y)); }
-function bitorUint48(Uint48 x, Uint48 y) pure returns (Uint48) { return Uint48.wrap(Uint48.unwrap(x) | Uint48.unwrap(y)); }
-function bitorUint56(Uint56 x, Uint56 y) pure returns (Uint56) { return Uint56.wrap(Uint56.unwrap(x) | Uint56.unwrap(y)); }
-function bitorUint64(Uint64 x, Uint64 y) pure returns (Uint64) { return Uint64.wrap(Uint64.unwrap(x) | Uint64.unwrap(y)); }
-function bitorUint72(Uint72 x, Uint72 y) pure returns (Uint72) { return Uint72.wrap(Uint72.unwrap(x) | Uint72.unwrap(y)); }
-function bitorUint80(Uint80 x, Uint80 y) pure returns (Uint80) { return Uint80.wrap(Uint80.unwrap(x) | Uint80.unwrap(y)); }
-function bitorUint88(Uint88 x, Uint88 y) pure returns (Uint88) { return Uint88.wrap(Uint88.unwrap(x) | Uint88.unwrap(y)); }
-function bitorUint96(Uint96 x, Uint96 y) pure returns (Uint96) { return Uint96.wrap(Uint96.unwrap(x) | Uint96.unwrap(y)); }
-function bitorUint104(Uint104 x, Uint104 y) pure returns (Uint104) { return Uint104.wrap(Uint104.unwrap(x) | Uint104.unwrap(y)); }
-function bitorUint112(Uint112 x, Uint112 y) pure returns (Uint112) { return Uint112.wrap(Uint112.unwrap(x) | Uint112.unwrap(y)); }
-function bitorUint120(Uint120 x, Uint120 y) pure returns (Uint120) { return Uint120.wrap(Uint120.unwrap(x) | Uint120.unwrap(y)); }
-function bitorUint128(Uint128 x, Uint128 y) pure returns (Uint128) { return Uint128.wrap(Uint128.unwrap(x) | Uint128.unwrap(y)); }
-function bitorUint136(Uint136 x, Uint136 y) pure returns (Uint136) { return Uint136.wrap(Uint136.unwrap(x) | Uint136.unwrap(y)); }
-function bitorUint144(Uint144 x, Uint144 y) pure returns (Uint144) { return Uint144.wrap(Uint144.unwrap(x) | Uint144.unwrap(y)); }
-function bitorUint152(Uint152 x, Uint152 y) pure returns (Uint152) { return Uint152.wrap(Uint152.unwrap(x) | Uint152.unwrap(y)); }
-function bitorUint160(Uint160 x, Uint160 y) pure returns (Uint160) { return Uint160.wrap(Uint160.unwrap(x) | Uint160.unwrap(y)); }
-function bitorUint168(Uint168 x, Uint168 y) pure returns (Uint168) { return Uint168.wrap(Uint168.unwrap(x) | Uint168.unwrap(y)); }
-function bitorUint176(Uint176 x, Uint176 y) pure returns (Uint176) { return Uint176.wrap(Uint176.unwrap(x) | Uint176.unwrap(y)); }
-function bitorUint184(Uint184 x, Uint184 y) pure returns (Uint184) { return Uint184.wrap(Uint184.unwrap(x) | Uint184.unwrap(y)); }
-function bitorUint192(Uint192 x, Uint192 y) pure returns (Uint192) { return Uint192.wrap(Uint192.unwrap(x) | Uint192.unwrap(y)); }
-function bitorUint200(Uint200 x, Uint200 y) pure returns (Uint200) { return Uint200.wrap(Uint200.unwrap(x) | Uint200.unwrap(y)); }
-function bitorUint208(Uint208 x, Uint208 y) pure returns (Uint208) { return Uint208.wrap(Uint208.unwrap(x) | Uint208.unwrap(y)); }
-function bitorUint216(Uint216 x, Uint216 y) pure returns (Uint216) { return Uint216.wrap(Uint216.unwrap(x) | Uint216.unwrap(y)); }
-function bitorUint224(Uint224 x, Uint224 y) pure returns (Uint224) { return Uint224.wrap(Uint224.unwrap(x) | Uint224.unwrap(y)); }
-function bitorUint232(Uint232 x, Uint232 y) pure returns (Uint232) { return Uint232.wrap(Uint232.unwrap(x) | Uint232.unwrap(y)); }
-function bitorUint240(Uint240 x, Uint240 y) pure returns (Uint240) { return Uint240.wrap(Uint240.unwrap(x) | Uint240.unwrap(y)); }
-function bitorUint248(Uint248 x, Uint248 y) pure returns (Uint248) { return Uint248.wrap(Uint248.unwrap(x) | Uint248.unwrap(y)); }
-function bitorUint256(Uint256 x, Uint256 y) pure returns (Uint256) { return Uint256.wrap(Uint256.unwrap(x) | Uint256.unwrap(y)); }
-function bitorUint(Uint x, Uint y) pure returns (Uint) { return Uint.wrap(Uint.unwrap(x) | Uint.unwrap(y)); }
-
-function bitnotUint8(Uint8 x) pure returns (Uint8) { return Uint8.wrap(~Uint8.unwrap(x)); }
-function bitnotUint16(Uint16 x) pure returns (Uint16) { return Uint16.wrap(~Uint16.unwrap(x)); }
-function bitnotUint24(Uint24 x) pure returns (Uint24) { return Uint24.wrap(~Uint24.unwrap(x)); }
-function bitnotUint32(Uint32 x) pure returns (Uint32) { return Uint32.wrap(~Uint32.unwrap(x)); }
-function bitnotUint40(Uint40 x) pure returns (Uint40) { return Uint40.wrap(~Uint40.unwrap(x)); }
-function bitnotUint48(Uint48 x) pure returns (Uint48) { return Uint48.wrap(~Uint48.unwrap(x)); }
-function bitnotUint56(Uint56 x) pure returns (Uint56) { return Uint56.wrap(~Uint56.unwrap(x)); }
-function bitnotUint64(Uint64 x) pure returns (Uint64) { return Uint64.wrap(~Uint64.unwrap(x)); }
-function bitnotUint72(Uint72 x) pure returns (Uint72) { return Uint72.wrap(~Uint72.unwrap(x)); }
-function bitnotUint80(Uint80 x) pure returns (Uint80) { return Uint80.wrap(~Uint80.unwrap(x)); }
-function bitnotUint88(Uint88 x) pure returns (Uint88) { return Uint88.wrap(~Uint88.unwrap(x)); }
-function bitnotUint96(Uint96 x) pure returns (Uint96) { return Uint96.wrap(~Uint96.unwrap(x)); }
-function bitnotUint104(Uint104 x) pure returns (Uint104) { return Uint104.wrap(~Uint104.unwrap(x)); }
-function bitnotUint112(Uint112 x) pure returns (Uint112) { return Uint112.wrap(~Uint112.unwrap(x)); }
-function bitnotUint120(Uint120 x) pure returns (Uint120) { return Uint120.wrap(~Uint120.unwrap(x)); }
-function bitnotUint128(Uint128 x) pure returns (Uint128) { return Uint128.wrap(~Uint128.unwrap(x)); }
-function bitnotUint136(Uint136 x) pure returns (Uint136) { return Uint136.wrap(~Uint136.unwrap(x)); }
-function bitnotUint144(Uint144 x) pure returns (Uint144) { return Uint144.wrap(~Uint144.unwrap(x)); }
-function bitnotUint152(Uint152 x) pure returns (Uint152) { return Uint152.wrap(~Uint152.unwrap(x)); }
-function bitnotUint160(Uint160 x) pure returns (Uint160) { return Uint160.wrap(~Uint160.unwrap(x)); }
-function bitnotUint168(Uint168 x) pure returns (Uint168) { return Uint168.wrap(~Uint168.unwrap(x)); }
-function bitnotUint176(Uint176 x) pure returns (Uint176) { return Uint176.wrap(~Uint176.unwrap(x)); }
-function bitnotUint184(Uint184 x) pure returns (Uint184) { return Uint184.wrap(~Uint184.unwrap(x)); }
-function bitnotUint192(Uint192 x) pure returns (Uint192) { return Uint192.wrap(~Uint192.unwrap(x)); }
-function bitnotUint200(Uint200 x) pure returns (Uint200) { return Uint200.wrap(~Uint200.unwrap(x)); }
-function bitnotUint208(Uint208 x) pure returns (Uint208) { return Uint208.wrap(~Uint208.unwrap(x)); }
-function bitnotUint216(Uint216 x) pure returns (Uint216) { return Uint216.wrap(~Uint216.unwrap(x)); }
-function bitnotUint224(Uint224 x) pure returns (Uint224) { return Uint224.wrap(~Uint224.unwrap(x)); }
-function bitnotUint232(Uint232 x) pure returns (Uint232) { return Uint232.wrap(~Uint232.unwrap(x)); }
-function bitnotUint240(Uint240 x) pure returns (Uint240) { return Uint240.wrap(~Uint240.unwrap(x)); }
-function bitnotUint248(Uint248 x) pure returns (Uint248) { return Uint248.wrap(~Uint248.unwrap(x)); }
-function bitnotUint256(Uint256 x) pure returns (Uint256) { return Uint256.wrap(~Uint256.unwrap(x)); }
-function bitnotUint(Uint x) pure returns (Uint) { return Uint.wrap(~Uint.unwrap(x)); }
-
-function bitorBytes1(Bytes1 x, Bytes1 y) pure returns (Bytes1) { return Bytes1.wrap(Bytes1.unwrap(x) | Bytes1.unwrap(y)); }
-function bitorBytes2(Bytes2 x, Bytes2 y) pure returns (Bytes2) { return Bytes2.wrap(Bytes2.unwrap(x) | Bytes2.unwrap(y)); }
-function bitorBytes3(Bytes3 x, Bytes3 y) pure returns (Bytes3) { return Bytes3.wrap(Bytes3.unwrap(x) | Bytes3.unwrap(y)); }
-function bitorBytes4(Bytes4 x, Bytes4 y) pure returns (Bytes4) { return Bytes4.wrap(Bytes4.unwrap(x) | Bytes4.unwrap(y)); }
-function bitorBytes5(Bytes5 x, Bytes5 y) pure returns (Bytes5) { return Bytes5.wrap(Bytes5.unwrap(x) | Bytes5.unwrap(y)); }
-function bitorBytes6(Bytes6 x, Bytes6 y) pure returns (Bytes6) { return Bytes6.wrap(Bytes6.unwrap(x) | Bytes6.unwrap(y)); }
-function bitorBytes7(Bytes7 x, Bytes7 y) pure returns (Bytes7) { return Bytes7.wrap(Bytes7.unwrap(x) | Bytes7.unwrap(y)); }
-function bitorBytes8(Bytes8 x, Bytes8 y) pure returns (Bytes8) { return Bytes8.wrap(Bytes8.unwrap(x) | Bytes8.unwrap(y)); }
-function bitorBytes9(Bytes9 x, Bytes9 y) pure returns (Bytes9) { return Bytes9.wrap(Bytes9.unwrap(x) | Bytes9.unwrap(y)); }
-function bitorBytes10(Bytes10 x, Bytes10 y) pure returns (Bytes10) { return Bytes10.wrap(Bytes10.unwrap(x) | Bytes10.unwrap(y)); }
-function bitorBytes11(Bytes11 x, Bytes11 y) pure returns (Bytes11) { return Bytes11.wrap(Bytes11.unwrap(x) | Bytes11.unwrap(y)); }
-function bitorBytes12(Bytes12 x, Bytes12 y) pure returns (Bytes12) { return Bytes12.wrap(Bytes12.unwrap(x) | Bytes12.unwrap(y)); }
-function bitorBytes13(Bytes13 x, Bytes13 y) pure returns (Bytes13) { return Bytes13.wrap(Bytes13.unwrap(x) | Bytes13.unwrap(y)); }
-function bitorBytes14(Bytes14 x, Bytes14 y) pure returns (Bytes14) { return Bytes14.wrap(Bytes14.unwrap(x) | Bytes14.unwrap(y)); }
-function bitorBytes15(Bytes15 x, Bytes15 y) pure returns (Bytes15) { return Bytes15.wrap(Bytes15.unwrap(x) | Bytes15.unwrap(y)); }
-function bitorBytes16(Bytes16 x, Bytes16 y) pure returns (Bytes16) { return Bytes16.wrap(Bytes16.unwrap(x) | Bytes16.unwrap(y)); }
-function bitorBytes17(Bytes17 x, Bytes17 y) pure returns (Bytes17) { return Bytes17.wrap(Bytes17.unwrap(x) | Bytes17.unwrap(y)); }
-function bitorBytes18(Bytes18 x, Bytes18 y) pure returns (Bytes18) { return Bytes18.wrap(Bytes18.unwrap(x) | Bytes18.unwrap(y)); }
-function bitorBytes19(Bytes19 x, Bytes19 y) pure returns (Bytes19) { return Bytes19.wrap(Bytes19.unwrap(x) | Bytes19.unwrap(y)); }
-function bitorBytes20(Bytes20 x, Bytes20 y) pure returns (Bytes20) { return Bytes20.wrap(Bytes20.unwrap(x) | Bytes20.unwrap(y)); }
-function bitorBytes21(Bytes21 x, Bytes21 y) pure returns (Bytes21) { return Bytes21.wrap(Bytes21.unwrap(x) | Bytes21.unwrap(y)); }
-function bitorBytes22(Bytes22 x, Bytes22 y) pure returns (Bytes22) { return Bytes22.wrap(Bytes22.unwrap(x) | Bytes22.unwrap(y)); }
-function bitorBytes23(Bytes23 x, Bytes23 y) pure returns (Bytes23) { return Bytes23.wrap(Bytes23.unwrap(x) | Bytes23.unwrap(y)); }
-function bitorBytes24(Bytes24 x, Bytes24 y) pure returns (Bytes24) { return Bytes24.wrap(Bytes24.unwrap(x) | Bytes24.unwrap(y)); }
-function bitorBytes25(Bytes25 x, Bytes25 y) pure returns (Bytes25) { return Bytes25.wrap(Bytes25.unwrap(x) | Bytes25.unwrap(y)); }
-function bitorBytes26(Bytes26 x, Bytes26 y) pure returns (Bytes26) { return Bytes26.wrap(Bytes26.unwrap(x) | Bytes26.unwrap(y)); }
-function bitorBytes27(Bytes27 x, Bytes27 y) pure returns (Bytes27) { return Bytes27.wrap(Bytes27.unwrap(x) | Bytes27.unwrap(y)); }
-function bitorBytes28(Bytes28 x, Bytes28 y) pure returns (Bytes28) { return Bytes28.wrap(Bytes28.unwrap(x) | Bytes28.unwrap(y)); }
-function bitorBytes29(Bytes29 x, Bytes29 y) pure returns (Bytes29) { return Bytes29.wrap(Bytes29.unwrap(x) | Bytes29.unwrap(y)); }
-function bitorBytes30(Bytes30 x, Bytes30 y) pure returns (Bytes30) { return Bytes30.wrap(Bytes30.unwrap(x) | Bytes30.unwrap(y)); }
-function bitorBytes31(Bytes31 x, Bytes31 y) pure returns (Bytes31) { return Bytes31.wrap(Bytes31.unwrap(x) | Bytes31.unwrap(y)); }
-function bitorBytes32(Bytes32 x, Bytes32 y) pure returns (Bytes32) { return Bytes32.wrap(Bytes32.unwrap(x) | Bytes32.unwrap(y)); }
-
-function bitnotBytes1(Bytes1 x) pure returns (Bytes1) { return Bytes1.wrap(~Bytes1.unwrap(x)); }
-function bitnotBytes2(Bytes2 x) pure returns (Bytes2) { return Bytes2.wrap(~Bytes2.unwrap(x)); }
-function bitnotBytes3(Bytes3 x) pure returns (Bytes3) { return Bytes3.wrap(~Bytes3.unwrap(x)); }
-function bitnotBytes4(Bytes4 x) pure returns (Bytes4) { return Bytes4.wrap(~Bytes4.unwrap(x)); }
-function bitnotBytes5(Bytes5 x) pure returns (Bytes5) { return Bytes5.wrap(~Bytes5.unwrap(x)); }
-function bitnotBytes6(Bytes6 x) pure returns (Bytes6) { return Bytes6.wrap(~Bytes6.unwrap(x)); }
-function bitnotBytes7(Bytes7 x) pure returns (Bytes7) { return Bytes7.wrap(~Bytes7.unwrap(x)); }
-function bitnotBytes8(Bytes8 x) pure returns (Bytes8) { return Bytes8.wrap(~Bytes8.unwrap(x)); }
-function bitnotBytes9(Bytes9 x) pure returns (Bytes9) { return Bytes9.wrap(~Bytes9.unwrap(x)); }
-function bitnotBytes10(Bytes10 x) pure returns (Bytes10) { return Bytes10.wrap(~Bytes10.unwrap(x)); }
-function bitnotBytes11(Bytes11 x) pure returns (Bytes11) { return Bytes11.wrap(~Bytes11.unwrap(x)); }
-function bitnotBytes12(Bytes12 x) pure returns (Bytes12) { return Bytes12.wrap(~Bytes12.unwrap(x)); }
-function bitnotBytes13(Bytes13 x) pure returns (Bytes13) { return Bytes13.wrap(~Bytes13.unwrap(x)); }
-function bitnotBytes14(Bytes14 x) pure returns (Bytes14) { return Bytes14.wrap(~Bytes14.unwrap(x)); }
-function bitnotBytes15(Bytes15 x) pure returns (Bytes15) { return Bytes15.wrap(~Bytes15.unwrap(x)); }
-function bitnotBytes16(Bytes16 x) pure returns (Bytes16) { return Bytes16.wrap(~Bytes16.unwrap(x)); }
-function bitnotBytes17(Bytes17 x) pure returns (Bytes17) { return Bytes17.wrap(~Bytes17.unwrap(x)); }
-function bitnotBytes18(Bytes18 x) pure returns (Bytes18) { return Bytes18.wrap(~Bytes18.unwrap(x)); }
-function bitnotBytes19(Bytes19 x) pure returns (Bytes19) { return Bytes19.wrap(~Bytes19.unwrap(x)); }
-function bitnotBytes20(Bytes20 x) pure returns (Bytes20) { return Bytes20.wrap(~Bytes20.unwrap(x)); }
-function bitnotBytes21(Bytes21 x) pure returns (Bytes21) { return Bytes21.wrap(~Bytes21.unwrap(x)); }
-function bitnotBytes22(Bytes22 x) pure returns (Bytes22) { return Bytes22.wrap(~Bytes22.unwrap(x)); }
-function bitnotBytes23(Bytes23 x) pure returns (Bytes23) { return Bytes23.wrap(~Bytes23.unwrap(x)); }
-function bitnotBytes24(Bytes24 x) pure returns (Bytes24) { return Bytes24.wrap(~Bytes24.unwrap(x)); }
-function bitnotBytes25(Bytes25 x) pure returns (Bytes25) { return Bytes25.wrap(~Bytes25.unwrap(x)); }
-function bitnotBytes26(Bytes26 x) pure returns (Bytes26) { return Bytes26.wrap(~Bytes26.unwrap(x)); }
-function bitnotBytes27(Bytes27 x) pure returns (Bytes27) { return Bytes27.wrap(~Bytes27.unwrap(x)); }
-function bitnotBytes28(Bytes28 x) pure returns (Bytes28) { return Bytes28.wrap(~Bytes28.unwrap(x)); }
-function bitnotBytes29(Bytes29 x) pure returns (Bytes29) { return Bytes29.wrap(~Bytes29.unwrap(x)); }
-function bitnotBytes30(Bytes30 x) pure returns (Bytes30) { return Bytes30.wrap(~Bytes30.unwrap(x)); }
-function bitnotBytes31(Bytes31 x) pure returns (Bytes31) { return Bytes31.wrap(~Bytes31.unwrap(x)); }
-function bitnotBytes32(Bytes32 x) pure returns (Bytes32) { return Bytes32.wrap(~Bytes32.unwrap(x)); }
-
-using {bitorAddress as |, bitnotAddress as ~} for Address global;
-using {bitorAddressPayable as |, bitnotAddressPayable as ~} for AddressPayable global;
-using {bitorBool as |, bitnotBool as ~} for Bool global;
-
-function bitorAddress(Address x, Address y) pure returns (Address) {
-    return Address.wrap(address(bytes20(Address.unwrap(x)) | bytes20(Address.unwrap(y))));
-}
-function bitnotAddress(Address x) pure returns (Address) {
-    return Address.wrap(address(~bytes20(Address.unwrap(x))));
-}
-
-function bitorAddressPayable(AddressPayable x, AddressPayable y) pure returns (AddressPayable) {
-    return AddressPayable.wrap(payable(address(bytes20(address(AddressPayable.unwrap(x))) | bytes20(address(AddressPayable.unwrap(y))))));
-}
-function bitnotAddressPayable(AddressPayable x) pure returns (AddressPayable) {
-    return AddressPayable.wrap(payable(address(~bytes20(address(AddressPayable.unwrap(x))))));
-}
-
-function bitorBool(Bool x, Bool y) pure returns (Bool) {
-    return Bool.wrap(Bool.unwrap(x) || Bool.unwrap(y));
-}
-function bitnotBool(Bool x) pure returns (Bool) {
-    return Bool.wrap(!Bool.unwrap(x));
-}
-
-contract C {
-    function testIntBinary() public pure {
-        assert(Int8.unwrap(Int8.wrap(1) | Int8.wrap(2)) == 3);
-        assert(Int16.unwrap(Int16.wrap(1) | Int16.wrap(2)) == 3);
-        assert(Int24.unwrap(Int24.wrap(1) | Int24.wrap(2)) == 3);
-        assert(Int32.unwrap(Int32.wrap(1) | Int32.wrap(2)) == 3);
-        assert(Int40.unwrap(Int40.wrap(1) | Int40.wrap(2)) == 3);
-        assert(Int48.unwrap(Int48.wrap(1) | Int48.wrap(2)) == 3);
-        assert(Int56.unwrap(Int56.wrap(1) | Int56.wrap(2)) == 3);
-        assert(Int64.unwrap(Int64.wrap(1) | Int64.wrap(2)) == 3);
-        assert(Int72.unwrap(Int72.wrap(1) | Int72.wrap(2)) == 3);
-        assert(Int80.unwrap(Int80.wrap(1) | Int80.wrap(2)) == 3);
-        assert(Int88.unwrap(Int88.wrap(1) | Int88.wrap(2)) == 3);
-        assert(Int96.unwrap(Int96.wrap(1) | Int96.wrap(2)) == 3);
-        assert(Int104.unwrap(Int104.wrap(1) | Int104.wrap(2)) == 3);
-        assert(Int112.unwrap(Int112.wrap(1) | Int112.wrap(2)) == 3);
-        assert(Int120.unwrap(Int120.wrap(1) | Int120.wrap(2)) == 3);
-        assert(Int128.unwrap(Int128.wrap(1) | Int128.wrap(2)) == 3);
-        assert(Int136.unwrap(Int136.wrap(1) | Int136.wrap(2)) == 3);
-        assert(Int144.unwrap(Int144.wrap(1) | Int144.wrap(2)) == 3);
-        assert(Int152.unwrap(Int152.wrap(1) | Int152.wrap(2)) == 3);
-        assert(Int160.unwrap(Int160.wrap(1) | Int160.wrap(2)) == 3);
-        assert(Int168.unwrap(Int168.wrap(1) | Int168.wrap(2)) == 3);
-        assert(Int176.unwrap(Int176.wrap(1) | Int176.wrap(2)) == 3);
-        assert(Int184.unwrap(Int184.wrap(1) | Int184.wrap(2)) == 3);
-        assert(Int192.unwrap(Int192.wrap(1) | Int192.wrap(2)) == 3);
-        assert(Int200.unwrap(Int200.wrap(1) | Int200.wrap(2)) == 3);
-        assert(Int208.unwrap(Int208.wrap(1) | Int208.wrap(2)) == 3);
-        assert(Int216.unwrap(Int216.wrap(1) | Int216.wrap(2)) == 3);
-        assert(Int224.unwrap(Int224.wrap(1) | Int224.wrap(2)) == 3);
-        assert(Int232.unwrap(Int232.wrap(1) | Int232.wrap(2)) == 3);
-        assert(Int240.unwrap(Int240.wrap(1) | Int240.wrap(2)) == 3);
-        assert(Int248.unwrap(Int248.wrap(1) | Int248.wrap(2)) == 3);
-        assert(Int256.unwrap(Int256.wrap(1) | Int256.wrap(2)) == 3);
-        assert(Int.unwrap(Int.wrap(1) | Int.wrap(2)) == 3);
-    }
-
-    function testIntUnary() public pure {
-        assert(Int8.unwrap(-Int8.wrap(1)) == -1);
-        assert(Int16.unwrap(-Int16.wrap(1)) == -1);
-        assert(Int24.unwrap(-Int24.wrap(1)) == -1);
-        assert(Int32.unwrap(-Int32.wrap(1)) == -1);
-        assert(Int40.unwrap(-Int40.wrap(1)) == -1);
-        assert(Int48.unwrap(-Int48.wrap(1)) == -1);
-        assert(Int56.unwrap(-Int56.wrap(1)) == -1);
-        assert(Int64.unwrap(-Int64.wrap(1)) == -1);
-        assert(Int72.unwrap(-Int72.wrap(1)) == -1);
-        assert(Int80.unwrap(-Int80.wrap(1)) == -1);
-        assert(Int88.unwrap(-Int88.wrap(1)) == -1);
-        assert(Int96.unwrap(-Int96.wrap(1)) == -1);
-        assert(Int104.unwrap(-Int104.wrap(1)) == -1);
-        assert(Int112.unwrap(-Int112.wrap(1)) == -1);
-        assert(Int120.unwrap(-Int120.wrap(1)) == -1);
-        assert(Int128.unwrap(-Int128.wrap(1)) == -1);
-        assert(Int136.unwrap(-Int136.wrap(1)) == -1);
-        assert(Int144.unwrap(-Int144.wrap(1)) == -1);
-        assert(Int152.unwrap(-Int152.wrap(1)) == -1);
-        assert(Int160.unwrap(-Int160.wrap(1)) == -1);
-        assert(Int168.unwrap(-Int168.wrap(1)) == -1);
-        assert(Int176.unwrap(-Int176.wrap(1)) == -1);
-        assert(Int184.unwrap(-Int184.wrap(1)) == -1);
-        assert(Int192.unwrap(-Int192.wrap(1)) == -1);
-        assert(Int200.unwrap(-Int200.wrap(1)) == -1);
-        assert(Int208.unwrap(-Int208.wrap(1)) == -1);
-        assert(Int216.unwrap(-Int216.wrap(1)) == -1);
-        assert(Int224.unwrap(-Int224.wrap(1)) == -1);
-        assert(Int232.unwrap(-Int232.wrap(1)) == -1);
-        assert(Int240.unwrap(-Int240.wrap(1)) == -1);
-        assert(Int248.unwrap(-Int248.wrap(1)) == -1);
-        assert(Int256.unwrap(-Int256.wrap(1)) == -1);
-        assert(Int.unwrap(-Int.wrap(1)) == -1);
-    }
-
-    function testUintBinary() public pure {
-        assert(Uint8.unwrap(Uint8.wrap(1) | Uint8.wrap(2)) == 3);
-        assert(Uint16.unwrap(Uint16.wrap(1) | Uint16.wrap(2)) == 3);
-        assert(Uint24.unwrap(Uint24.wrap(1) | Uint24.wrap(2)) == 3);
-        assert(Uint32.unwrap(Uint32.wrap(1) | Uint32.wrap(2)) == 3);
-        assert(Uint40.unwrap(Uint40.wrap(1) | Uint40.wrap(2)) == 3);
-        assert(Uint48.unwrap(Uint48.wrap(1) | Uint48.wrap(2)) == 3);
-        assert(Uint56.unwrap(Uint56.wrap(1) | Uint56.wrap(2)) == 3);
-        assert(Uint64.unwrap(Uint64.wrap(1) | Uint64.wrap(2)) == 3);
-        assert(Uint72.unwrap(Uint72.wrap(1) | Uint72.wrap(2)) == 3);
-        assert(Uint80.unwrap(Uint80.wrap(1) | Uint80.wrap(2)) == 3);
-        assert(Uint88.unwrap(Uint88.wrap(1) | Uint88.wrap(2)) == 3);
-        assert(Uint96.unwrap(Uint96.wrap(1) | Uint96.wrap(2)) == 3);
-        assert(Uint104.unwrap(Uint104.wrap(1) | Uint104.wrap(2)) == 3);
-        assert(Uint112.unwrap(Uint112.wrap(1) | Uint112.wrap(2)) == 3);
-        assert(Uint120.unwrap(Uint120.wrap(1) | Uint120.wrap(2)) == 3);
-        assert(Uint128.unwrap(Uint128.wrap(1) | Uint128.wrap(2)) == 3);
-        assert(Uint136.unwrap(Uint136.wrap(1) | Uint136.wrap(2)) == 3);
-        assert(Uint144.unwrap(Uint144.wrap(1) | Uint144.wrap(2)) == 3);
-        assert(Uint152.unwrap(Uint152.wrap(1) | Uint152.wrap(2)) == 3);
-        assert(Uint160.unwrap(Uint160.wrap(1) | Uint160.wrap(2)) == 3);
-        assert(Uint168.unwrap(Uint168.wrap(1) | Uint168.wrap(2)) == 3);
-        assert(Uint176.unwrap(Uint176.wrap(1) | Uint176.wrap(2)) == 3);
-        assert(Uint184.unwrap(Uint184.wrap(1) | Uint184.wrap(2)) == 3);
-        assert(Uint192.unwrap(Uint192.wrap(1) | Uint192.wrap(2)) == 3);
-        assert(Uint200.unwrap(Uint200.wrap(1) | Uint200.wrap(2)) == 3);
-        assert(Uint208.unwrap(Uint208.wrap(1) | Uint208.wrap(2)) == 3);
-        assert(Uint216.unwrap(Uint216.wrap(1) | Uint216.wrap(2)) == 3);
-        assert(Uint224.unwrap(Uint224.wrap(1) | Uint224.wrap(2)) == 3);
-        assert(Uint232.unwrap(Uint232.wrap(1) | Uint232.wrap(2)) == 3);
-        assert(Uint240.unwrap(Uint240.wrap(1) | Uint240.wrap(2)) == 3);
-        assert(Uint248.unwrap(Uint248.wrap(1) | Uint248.wrap(2)) == 3);
-        assert(Uint256.unwrap(Uint256.wrap(1) | Uint256.wrap(2)) == 3);
-        assert(Uint.unwrap(Uint.wrap(1) | Uint.wrap(2)) == 3);
-    }
-
-    function testUintUnary() public pure {
-        assert(Uint8.unwrap(~Uint8.wrap(1)) == ~uint8(1));
-        assert(Uint16.unwrap(~Uint16.wrap(1)) == ~uint16(1));
-        assert(Uint24.unwrap(~Uint24.wrap(1)) == ~uint24(1));
-        assert(Uint32.unwrap(~Uint32.wrap(1)) == ~uint32(1));
-        assert(Uint40.unwrap(~Uint40.wrap(1)) == ~uint40(1));
-        assert(Uint48.unwrap(~Uint48.wrap(1)) == ~uint48(1));
-        assert(Uint56.unwrap(~Uint56.wrap(1)) == ~uint56(1));
-        assert(Uint64.unwrap(~Uint64.wrap(1)) == ~uint64(1));
-        assert(Uint72.unwrap(~Uint72.wrap(1)) == ~uint72(1));
-        assert(Uint80.unwrap(~Uint80.wrap(1)) == ~uint80(1));
-        assert(Uint88.unwrap(~Uint88.wrap(1)) == ~uint88(1));
-        assert(Uint96.unwrap(~Uint96.wrap(1)) == ~uint96(1));
-        assert(Uint104.unwrap(~Uint104.wrap(1)) == ~uint104(1));
-        assert(Uint112.unwrap(~Uint112.wrap(1)) == ~uint112(1));
-        assert(Uint120.unwrap(~Uint120.wrap(1)) == ~uint120(1));
-        assert(Uint128.unwrap(~Uint128.wrap(1)) == ~uint128(1));
-        assert(Uint136.unwrap(~Uint136.wrap(1)) == ~uint136(1));
-        assert(Uint144.unwrap(~Uint144.wrap(1)) == ~uint144(1));
-        assert(Uint152.unwrap(~Uint152.wrap(1)) == ~uint152(1));
-        assert(Uint160.unwrap(~Uint160.wrap(1)) == ~uint160(1));
-        assert(Uint168.unwrap(~Uint168.wrap(1)) == ~uint168(1));
-        assert(Uint176.unwrap(~Uint176.wrap(1)) == ~uint176(1));
-        assert(Uint184.unwrap(~Uint184.wrap(1)) == ~uint184(1));
-        assert(Uint192.unwrap(~Uint192.wrap(1)) == ~uint192(1));
-        assert(Uint200.unwrap(~Uint200.wrap(1)) == ~uint200(1));
-        assert(Uint208.unwrap(~Uint208.wrap(1)) == ~uint208(1));
-        assert(Uint216.unwrap(~Uint216.wrap(1)) == ~uint216(1));
-        assert(Uint224.unwrap(~Uint224.wrap(1)) == ~uint224(1));
-        assert(Uint232.unwrap(~Uint232.wrap(1)) == ~uint232(1));
-        assert(Uint240.unwrap(~Uint240.wrap(1)) == ~uint240(1));
-        assert(Uint248.unwrap(~Uint248.wrap(1)) == ~uint248(1));
-        assert(Uint256.unwrap(~Uint256.wrap(1)) == ~uint256(1));
-        assert(Uint.unwrap(~Uint.wrap(1)) == ~uint(1));
-    }
-
-    function testBytesBinary() public pure {
-        assert(Bytes1.unwrap(Bytes1.wrap(0x01) | Bytes1.wrap(0x02)) == bytes1(0x03));
-        assert(Bytes2.unwrap(Bytes2.wrap(bytes2(bytes1(0x01))) | Bytes2.wrap(bytes2(bytes1(0x02)))) == bytes2(bytes1(0x03)));
-        assert(Bytes3.unwrap(Bytes3.wrap(bytes3(bytes1(0x01))) | Bytes3.wrap(bytes3(bytes1(0x02)))) == bytes3(bytes1(0x03)));
-        assert(Bytes4.unwrap(Bytes4.wrap(bytes4(bytes1(0x01))) | Bytes4.wrap(bytes4(bytes1(0x02)))) == bytes4(bytes1(0x03)));
-        assert(Bytes5.unwrap(Bytes5.wrap(bytes5(bytes1(0x01))) | Bytes5.wrap(bytes5(bytes1(0x02)))) == bytes5(bytes1(0x03)));
-        assert(Bytes6.unwrap(Bytes6.wrap(bytes6(bytes1(0x01))) | Bytes6.wrap(bytes6(bytes1(0x02)))) == bytes6(bytes1(0x03)));
-        assert(Bytes7.unwrap(Bytes7.wrap(bytes7(bytes1(0x01))) | Bytes7.wrap(bytes7(bytes1(0x02)))) == bytes7(bytes1(0x03)));
-        assert(Bytes8.unwrap(Bytes8.wrap(bytes8(bytes1(0x01))) | Bytes8.wrap(bytes8(bytes1(0x02)))) == bytes8(bytes1(0x03)));
-        assert(Bytes9.unwrap(Bytes9.wrap(bytes9(bytes1(0x01))) | Bytes9.wrap(bytes9(bytes1(0x02)))) == bytes9(bytes1(0x03)));
-        assert(Bytes10.unwrap(Bytes10.wrap(bytes10(bytes1(0x01))) | Bytes10.wrap(bytes10(bytes1(0x02)))) == bytes10(bytes1(0x03)));
-        assert(Bytes11.unwrap(Bytes11.wrap(bytes11(bytes1(0x01))) | Bytes11.wrap(bytes11(bytes1(0x02)))) == bytes11(bytes1(0x03)));
-        assert(Bytes12.unwrap(Bytes12.wrap(bytes12(bytes1(0x01))) | Bytes12.wrap(bytes12(bytes1(0x02)))) == bytes12(bytes1(0x03)));
-        assert(Bytes13.unwrap(Bytes13.wrap(bytes13(bytes1(0x01))) | Bytes13.wrap(bytes13(bytes1(0x02)))) == bytes13(bytes1(0x03)));
-        assert(Bytes14.unwrap(Bytes14.wrap(bytes14(bytes1(0x01))) | Bytes14.wrap(bytes14(bytes1(0x02)))) == bytes14(bytes1(0x03)));
-        assert(Bytes15.unwrap(Bytes15.wrap(bytes15(bytes1(0x01))) | Bytes15.wrap(bytes15(bytes1(0x02)))) == bytes15(bytes1(0x03)));
-        assert(Bytes16.unwrap(Bytes16.wrap(bytes16(bytes1(0x01))) | Bytes16.wrap(bytes16(bytes1(0x02)))) == bytes16(bytes1(0x03)));
-        assert(Bytes17.unwrap(Bytes17.wrap(bytes17(bytes1(0x01))) | Bytes17.wrap(bytes17(bytes1(0x02)))) == bytes17(bytes1(0x03)));
-        assert(Bytes18.unwrap(Bytes18.wrap(bytes18(bytes1(0x01))) | Bytes18.wrap(bytes18(bytes1(0x02)))) == bytes18(bytes1(0x03)));
-        assert(Bytes19.unwrap(Bytes19.wrap(bytes19(bytes1(0x01))) | Bytes19.wrap(bytes19(bytes1(0x02)))) == bytes19(bytes1(0x03)));
-        assert(Bytes20.unwrap(Bytes20.wrap(bytes20(bytes1(0x01))) | Bytes20.wrap(bytes20(bytes1(0x02)))) == bytes20(bytes1(0x03)));
-        assert(Bytes21.unwrap(Bytes21.wrap(bytes21(bytes1(0x01))) | Bytes21.wrap(bytes21(bytes1(0x02)))) == bytes21(bytes1(0x03)));
-        assert(Bytes22.unwrap(Bytes22.wrap(bytes22(bytes1(0x01))) | Bytes22.wrap(bytes22(bytes1(0x02)))) == bytes22(bytes1(0x03)));
-        assert(Bytes23.unwrap(Bytes23.wrap(bytes23(bytes1(0x01))) | Bytes23.wrap(bytes23(bytes1(0x02)))) == bytes23(bytes1(0x03)));
-        assert(Bytes24.unwrap(Bytes24.wrap(bytes24(bytes1(0x01))) | Bytes24.wrap(bytes24(bytes1(0x02)))) == bytes24(bytes1(0x03)));
-        assert(Bytes25.unwrap(Bytes25.wrap(bytes25(bytes1(0x01))) | Bytes25.wrap(bytes25(bytes1(0x02)))) == bytes25(bytes1(0x03)));
-        assert(Bytes26.unwrap(Bytes26.wrap(bytes26(bytes1(0x01))) | Bytes26.wrap(bytes26(bytes1(0x02)))) == bytes26(bytes1(0x03)));
-        assert(Bytes27.unwrap(Bytes27.wrap(bytes27(bytes1(0x01))) | Bytes27.wrap(bytes27(bytes1(0x02)))) == bytes27(bytes1(0x03)));
-        assert(Bytes28.unwrap(Bytes28.wrap(bytes28(bytes1(0x01))) | Bytes28.wrap(bytes28(bytes1(0x02)))) == bytes28(bytes1(0x03)));
-        assert(Bytes29.unwrap(Bytes29.wrap(bytes29(bytes1(0x01))) | Bytes29.wrap(bytes29(bytes1(0x02)))) == bytes29(bytes1(0x03)));
-        assert(Bytes30.unwrap(Bytes30.wrap(bytes30(bytes1(0x01))) | Bytes30.wrap(bytes30(bytes1(0x02)))) == bytes30(bytes1(0x03)));
-        assert(Bytes31.unwrap(Bytes31.wrap(bytes31(bytes1(0x01))) | Bytes31.wrap(bytes31(bytes1(0x02)))) == bytes31(bytes1(0x03)));
-        assert(Bytes32.unwrap(Bytes32.wrap(bytes32(bytes1(0x01))) | Bytes32.wrap(bytes32(bytes1(0x02)))) == bytes32(bytes1(0x03)));
-    }
-
-    function testBytesUnary() public pure {
-        assert(Bytes1.unwrap(~Bytes1.wrap(bytes1(0x01))) == ~bytes1(0x01));
-        assert(Bytes2.unwrap(~Bytes2.wrap(bytes2(bytes1(0x01)))) == ~bytes2(bytes1(0x01)));
-        assert(Bytes3.unwrap(~Bytes3.wrap(bytes3(bytes1(0x01)))) == ~bytes3(bytes1(0x01)));
-        assert(Bytes4.unwrap(~Bytes4.wrap(bytes4(bytes1(0x01)))) == ~bytes4(bytes1(0x01)));
-        assert(Bytes5.unwrap(~Bytes5.wrap(bytes5(bytes1(0x01)))) == ~bytes5(bytes1(0x01)));
-        assert(Bytes6.unwrap(~Bytes6.wrap(bytes6(bytes1(0x01)))) == ~bytes6(bytes1(0x01)));
-        assert(Bytes7.unwrap(~Bytes7.wrap(bytes7(bytes1(0x01)))) == ~bytes7(bytes1(0x01)));
-        assert(Bytes8.unwrap(~Bytes8.wrap(bytes8(bytes1(0x01)))) == ~bytes8(bytes1(0x01)));
-        assert(Bytes9.unwrap(~Bytes9.wrap(bytes9(bytes1(0x01)))) == ~bytes9(bytes1(0x01)));
-        assert(Bytes10.unwrap(~Bytes10.wrap(bytes10(bytes1(0x01)))) == ~bytes10(bytes1(0x01)));
-        assert(Bytes11.unwrap(~Bytes11.wrap(bytes11(bytes1(0x01)))) == ~bytes11(bytes1(0x01)));
-        assert(Bytes12.unwrap(~Bytes12.wrap(bytes12(bytes1(0x01)))) == ~bytes12(bytes1(0x01)));
-        assert(Bytes13.unwrap(~Bytes13.wrap(bytes13(bytes1(0x01)))) == ~bytes13(bytes1(0x01)));
-        assert(Bytes14.unwrap(~Bytes14.wrap(bytes14(bytes1(0x01)))) == ~bytes14(bytes1(0x01)));
-        assert(Bytes15.unwrap(~Bytes15.wrap(bytes15(bytes1(0x01)))) == ~bytes15(bytes1(0x01)));
-        assert(Bytes16.unwrap(~Bytes16.wrap(bytes16(bytes1(0x01)))) == ~bytes16(bytes1(0x01)));
-        assert(Bytes17.unwrap(~Bytes17.wrap(bytes17(bytes1(0x01)))) == ~bytes17(bytes1(0x01)));
-        assert(Bytes18.unwrap(~Bytes18.wrap(bytes18(bytes1(0x01)))) == ~bytes18(bytes1(0x01)));
-        assert(Bytes19.unwrap(~Bytes19.wrap(bytes19(bytes1(0x01)))) == ~bytes19(bytes1(0x01)));
-        assert(Bytes20.unwrap(~Bytes20.wrap(bytes20(bytes1(0x01)))) == ~bytes20(bytes1(0x01)));
-        assert(Bytes21.unwrap(~Bytes21.wrap(bytes21(bytes1(0x01)))) == ~bytes21(bytes1(0x01)));
-        assert(Bytes22.unwrap(~Bytes22.wrap(bytes22(bytes1(0x01)))) == ~bytes22(bytes1(0x01)));
-        assert(Bytes23.unwrap(~Bytes23.wrap(bytes23(bytes1(0x01)))) == ~bytes23(bytes1(0x01)));
-        assert(Bytes24.unwrap(~Bytes24.wrap(bytes24(bytes1(0x01)))) == ~bytes24(bytes1(0x01)));
-        assert(Bytes25.unwrap(~Bytes25.wrap(bytes25(bytes1(0x01)))) == ~bytes25(bytes1(0x01)));
-        assert(Bytes26.unwrap(~Bytes26.wrap(bytes26(bytes1(0x01)))) == ~bytes26(bytes1(0x01)));
-        assert(Bytes27.unwrap(~Bytes27.wrap(bytes27(bytes1(0x01)))) == ~bytes27(bytes1(0x01)));
-        assert(Bytes28.unwrap(~Bytes28.wrap(bytes28(bytes1(0x01)))) == ~bytes28(bytes1(0x01)));
-        assert(Bytes29.unwrap(~Bytes29.wrap(bytes29(bytes1(0x01)))) == ~bytes29(bytes1(0x01)));
-        assert(Bytes30.unwrap(~Bytes30.wrap(bytes30(bytes1(0x01)))) == ~bytes30(bytes1(0x01)));
-        assert(Bytes31.unwrap(~Bytes31.wrap(bytes31(bytes1(0x01)))) == ~bytes31(bytes1(0x01)));
-        assert(Bytes32.unwrap(~Bytes32.wrap(bytes32(bytes1(0x01)))) == ~bytes32(bytes1(0x01)));
-    }
-
-    function testOtherBinary() public pure {
-        assert(Address.unwrap(Address.wrap(address(0x01)) | Address.wrap(address(0x02))) == address(0x03));
-        assert(AddressPayable.unwrap(AddressPayable.wrap(payable(address(0x01))) | AddressPayable.wrap(payable(address(0x02)))) == payable(address(0x03)));
-        assert(Bool.unwrap(~Bool.wrap(true)) == false);
-    }
-
-    function testOtherUnary() public pure {
-        assert(Address.unwrap(~Address.wrap(address(0))) == address(~bytes20(0)));
-        assert(AddressPayable.unwrap(~AddressPayable.wrap(payable(address(0)))) == payable(address(~bytes20(0))));
-        assert(Bool.unwrap(~Bool.wrap(true)) == false);
-    }
-}
-// ----
-// testIntBinary() ->
-// testIntUnary() ->
-// testUintBinary() ->
-// testUintUnary() ->
-// testBytesBinary() ->
-// testBytesUnary() ->
-// testOtherBinary() ->
-// testOtherUnary() ->
diff --git a/test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol b/test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol
deleted file mode 100644
index 6f0323869061..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is int16;
-
-using {add as +, add} for Int global;
-
-function add(Int _a, Int _b) pure returns (Int) {
-    return Int.wrap(Int.unwrap(_a) + Int.unwrap(_b));
-}
-
-contract C {
-    function f() pure public returns (Int) {
-        return Int.wrap(5) + Int.wrap(5);
-    }
-
-    function g() pure public returns (Int) {
-        return Int.wrap(7).add(Int.wrap(6));
-    }
-}
-// ----
-// f() -> 10
-// g() -> 13
diff --git a/test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol
deleted file mode 100644
index 599e894b2e4f..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-type U8 is uint8;
-
-function checkedAdd(U8 x, U8 y) pure returns (U8) {
-    return U8.wrap(U8.unwrap(x) + U8.unwrap(y));
-}
-
-using {checkedAdd as +} for U8 global;
-
-contract C {
-    function testCheckedOperator() public pure returns (U8) {
-        return U8.wrap(250) + U8.wrap(10);
-    }
-
-    function testCheckedOperatorInUncheckedBlock() public pure returns (U8) {
-        unchecked {
-            return U8.wrap(250) + U8.wrap(10);
-        }
-    }
-}
-// ----
-// testCheckedOperator() -> FAILURE, hex"4e487b71", 0x11
-// testCheckedOperatorInUncheckedBlock() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol b/test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol
deleted file mode 100644
index ef36294a6ac5..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-type A is address;
-
-using {add as +} for A global;
-
-function add(A a, A b) pure returns (A) {
-    return A.wrap(address(uint160(A.unwrap(a)) + uint160(A.unwrap(b))));
-}
-
-contract C {
-    function g() public pure returns (A) {
-        A a = A.wrap(0x3333333333333333333333333333333333333333);
-        A b = A.wrap(0x1111111111111111111111111111111111111111);
-        A c = A.wrap(0x5555555555555555555555555555555555555555);
-        return a + b + c;
-    }
-}
-// ----
-// g() -> 0x9999999999999999999999999999999999999999
diff --git a/test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol
deleted file mode 100644
index 6f17b16eb38d..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-type Fixed is int128;
-using {add as +, mul as *} for Fixed global;
-
-int constant MULTIPLIER = 10**18;
-
-function add(Fixed a, Fixed b) pure returns (Fixed) {
-    return Fixed.wrap(Fixed.unwrap(a) + Fixed.unwrap(b));
-}
-
-function mul(Fixed a, Fixed b) pure returns (Fixed) {
-    int intermediate = (int(Fixed.unwrap(a)) * int(Fixed.unwrap(b))) / MULTIPLIER;
-    if (int128(intermediate) != intermediate) { revert("Overflow"); }
-    return Fixed.wrap(int128(intermediate));
-}
-
-contract C {
-    function applyInterest(Fixed value, Fixed percentage) public pure returns (Fixed result) {
-        return value + value * percentage;
-    }
-}
-// ----
-// applyInterest(int128,int128): 500000000000000000000, 100000000000000000 -> 550000000000000000000
diff --git a/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol b/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol
deleted file mode 100644
index 0b2d740a6da5..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-type SmallInt is int;
-type BigInt is int;
-
-using {addSmall as +} for SmallInt global;
-using {addBig as +} for BigInt global;
-
-function addSmall(SmallInt a, SmallInt b) pure returns (SmallInt) {
-    return SmallInt.wrap(SmallInt.unwrap(a) + SmallInt.unwrap(b));
-}
-
-function addBig(BigInt a, BigInt b) pure returns (BigInt) {
-    return BigInt.wrap(10 * (BigInt.unwrap(a) + BigInt.unwrap(b)));
-}
-
-contract C {
-    function small() public pure returns (SmallInt) {
-        return SmallInt.wrap(1) + SmallInt.wrap(2);
-    }
-
-    function big() public pure returns (BigInt) {
-        return BigInt.wrap(3) + BigInt.wrap(4);
-    }
-}
-// ----
-// small() -> 3
-// big() -> 70
diff --git a/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol b/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol
deleted file mode 100644
index 3085d8e89304..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is int32;
-
-using {foo as +, foo as -} for Int global;
-
-function foo(Int a, Int b) pure returns(Int) {
-    return Int.wrap(Int.unwrap(a) + Int.unwrap(b));
-}
-
-contract C {
-    function f() pure public returns (Int) {
-        return Int.wrap(2) + Int.wrap(3);
-    }
-
-    function g() pure public returns (Int) {
-        return Int.wrap(6) - Int.wrap(1);
-    }
-}
-// ----
-// f() -> 5
-// g() -> 7
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol
deleted file mode 100644
index a26a750cde97..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-type Int is int16;
-
-using {keccak256 as +} for Int global;
-
-function keccak256(Int a, Int b) pure returns (Int) {
-    return Int.wrap(Int.unwrap(a) + Int.unwrap(b));
-}
-
-contract C {
-    function test() public returns (Int) {
-        return Int.wrap(3) + Int.wrap(4);
-    }
-}
-// ----
-// test() -> 7
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol
deleted file mode 100644
index 781f21d167d3..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol
+++ /dev/null
@@ -1,83 +0,0 @@
-type Bool is bool;
-using {add as +, mul as *, unsub as -} for Bool global;
-
-function add(Bool x, Bool y) pure returns (Bool) {
-    return Bool.wrap(Bool.unwrap(x) || Bool.unwrap(y));
-}
-
-function mul(Bool x, Bool y) pure returns (Bool) {
-    return Bool.wrap(Bool.unwrap(x) && Bool.unwrap(y));
-}
-
-function unsub(Bool x) pure returns (Bool) {
-    return Bool.wrap(!Bool.unwrap(x));
-}
-
-contract C {
-    event Wrapped(uint);
-    event Probe(Bool);
-
-    function toBool(uint x) public returns (Bool) {
-        emit Wrapped(x);
-        return Bool.wrap(x > 0);
-    }
-
-    function probe(Bool x) public returns (Bool) {
-        emit Probe(x);
-        return x;
-    }
-
-    function testSingleOperator() public {
-        toBool(0) +
-        (toBool(1) + toBool(2)) +
-        toBool(3);
-    }
-
-    function testTwoBinaryOperators() public {
-        toBool(0) * toBool(1) +
-        (toBool(2) * toBool(3)) +
-        toBool(4) * toBool(5);
-    }
-
-    function testBinaryAndUnaryOperators() public {
-        -toBool(0) * -toBool(1) +
-        (-toBool(2) * -toBool(3)) +
-        -toBool(4) * -toBool(5);
-    }
-
-    function testOperatorsNestedInCalls() public {
-        -probe(toBool(0) * -toBool(1)) +
-        (-probe(toBool(2) * -toBool(3))) +
-        -probe(toBool(4) * -toBool(5));
-    }
-}
-// ----
-// testSingleOperator() ->
-// ~ emit Wrapped(uint256): 0x00
-// ~ emit Wrapped(uint256): 0x01
-// ~ emit Wrapped(uint256): 0x02
-// ~ emit Wrapped(uint256): 0x03
-// testTwoBinaryOperators() ->
-// ~ emit Wrapped(uint256): 0x00
-// ~ emit Wrapped(uint256): 0x01
-// ~ emit Wrapped(uint256): 0x02
-// ~ emit Wrapped(uint256): 0x03
-// ~ emit Wrapped(uint256): 0x04
-// ~ emit Wrapped(uint256): 0x05
-// testBinaryAndUnaryOperators() ->
-// ~ emit Wrapped(uint256): 0x00
-// ~ emit Wrapped(uint256): 0x01
-// ~ emit Wrapped(uint256): 0x02
-// ~ emit Wrapped(uint256): 0x03
-// ~ emit Wrapped(uint256): 0x04
-// ~ emit Wrapped(uint256): 0x05
-// testOperatorsNestedInCalls() ->
-// ~ emit Wrapped(uint256): 0x00
-// ~ emit Wrapped(uint256): 0x01
-// ~ emit Probe(bool): 0x00
-// ~ emit Wrapped(uint256): 0x02
-// ~ emit Wrapped(uint256): 0x03
-// ~ emit Probe(bool): 0x00
-// ~ emit Wrapped(uint256): 0x04
-// ~ emit Wrapped(uint256): 0x05
-// ~ emit Probe(bool): 0x00
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
deleted file mode 100644
index ce6a0f48db09..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
+++ /dev/null
@@ -1,61 +0,0 @@
-type Int32 is int32;
-using {add as +, unsub as -} for Int32 global;
-
-function add(Int32 x, Int32 y) pure returns (Int32) {
-    return loadAdder().mul(x, y);
-}
-
-function unsub(Int32 x) pure returns (Int32) {
-    return loadAdder().inc(x);
-}
-
-interface IAdder {
-    function mul(Int32, Int32) external pure returns (Int32);
-    function inc(Int32) external pure returns (Int32);
-}
-
-contract Adder is IAdder {
-    function mul(Int32 x, Int32 y) external pure override returns (Int32) {
-        return Int32.wrap(Int32.unwrap(x) * Int32.unwrap(y));
-    }
-
-    function inc(Int32 x) external pure override returns (Int32) {
-        return Int32.wrap(Int32.unwrap(x) + 1);
-    }
-}
-
-function storeAdder(IAdder adder) pure {
-    assembly {
-        // This test would also work without assembly if we could hard-code an address here.
-        mstore(0, adder)
-    }
-}
-
-function loadAdder() pure returns (IAdder adder) {
-    assembly {
-        adder := mload(0)
-    }
-}
-
-contract C {
-    function testMul(Int32 x, Int32 y) public returns (Int32) {
-        storeAdder(new Adder());
-
-        return x + y;
-    }
-
-    function testInc(Int32 x) public returns (Int32) {
-        storeAdder(new Adder());
-
-        return -x;
-    }
-}
-// ----
-// testMul(int32,int32): 42, 10 -> 420
-// gas irOptimized: 102563
-// gas legacy: 183981
-// gas legacyOptimized: 123563
-// testInc(int32): 42 -> 43
-// gas irOptimized: 102386
-// gas legacy: 183239
-// gas legacyOptimized: 123251
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
deleted file mode 100644
index f3f8ebdc63db..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
+++ /dev/null
@@ -1,67 +0,0 @@
-type Int32 is int32;
-using {add as +, unsub as -} for Int32 global;
-
-function add(Int32 x, Int32 y) pure returns (Int32) {
-    return loadAdder().mul(x, y);
-}
-
-function unsub(Int32 x) pure returns (Int32) {
-    return loadAdder().inc(x);
-}
-
-interface IAdderPure {
-    function mul(Int32, Int32) external pure returns (Int32);
-    function inc(Int32) external pure returns (Int32);
-}
-
-interface IAdderView {
-    function mul(Int32, Int32) external view returns (Int32);
-    function inc(Int32) external view returns (Int32);
-}
-
-contract Adder is IAdderView {
-    function mul(Int32 x, Int32 y) external view override returns (Int32) {
-        return Int32.wrap(Int32.unwrap(x) * Int32.unwrap(y));
-    }
-
-    function inc(Int32 x) external view override returns (Int32) {
-        return Int32.wrap(Int32.unwrap(x) + 1);
-    }
-}
-
-function storeAdder(IAdderView adder) pure {
-    assembly {
-        // This test would also work without assembly if we could hard-code an address here.
-        mstore(0, adder)
-    }
-}
-
-function loadAdder() pure returns (IAdderPure adder) {
-    assembly {
-        // The adder we stored is view but we cheat by using a modified version with pure functions
-        adder := mload(0)
-    }
-}
-
-contract C {
-    function testMul(Int32 x, Int32 y) public returns (Int32) {
-        storeAdder(new Adder());
-
-        return x + y;
-    }
-
-    function testInc(Int32 x) public returns (Int32) {
-        storeAdder(new Adder());
-
-        return -x;
-    }
-}
-// ----
-// testMul(int32,int32): 42, 10 -> 420
-// gas irOptimized: 102563
-// gas legacy: 183981
-// gas legacyOptimized: 123563
-// testInc(int32): 42 -> 43
-// gas irOptimized: 102386
-// gas legacy: 183239
-// gas legacyOptimized: 123251
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol
deleted file mode 100644
index b51ad8dad5c5..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-type U8 is uint8;
-using {yoloAdd as +, yoloDiv as /} for U8 global;
-
-function yoloAdd(U8 x, U8 y) pure returns (U8 z) {
-    assembly {
-        z := add(x, y) // Wrong! No cleanup.
-    }
-}
-
-function yoloDiv(U8 x, U8 y) pure returns (U8 z) {
-    assembly {
-        z := div(x, y) // Wrong! No cleanup.
-    }
-}
-
-contract C {
-    function divAddNoOverflow(U8 a, U8 b, U8 c) external pure returns (U8) {
-        return a / (b + c);
-    }
-}
-// ----
-// divAddNoOverflow(uint8,uint8,uint8): 4, 0xff, 3 -> 0
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol
deleted file mode 100644
index fe37a0e12cc2..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-type U8 is uint8;
-using {f as ~, add as +} for U8 global;
-
-function f(U8 x) pure returns (U8 z) {
-    assembly {
-        // NOTE: Not using shr so that the test works pre-constantinople too
-        z := div(x, 256)
-    }
-}
-
-function add(U8 x, U8 y) pure returns (U8 z) {
-    assembly {
-        z := add(div(x, 256), div(x, 256))
-    }
-}
-
-contract C {
-    function testUnary() external pure returns (U8, U8) {
-        U8 a;
-        assembly {
-            a := 0x4200
-        }
-        // If the result is not 0, no cleanup was performed.
-        return (~a, f(a));
-    }
-
-    function testBinary() external pure returns (U8, U8) {
-        U8 a;
-        U8 b;
-        assembly {
-            a := 0x4200
-            b := 0x4200
-        }
-        // If the result is not 0, no cleanup was performed.
-        return (a + b, add(a, b));
-    }
-}
-// ----
-// testUnary() -> 0x42, 0x42
-// testBinary() -> 0x84, 0x84
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol
deleted file mode 100644
index 961e031695b6..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol
+++ /dev/null
@@ -1,71 +0,0 @@
-type Int is int64;
-using {
-    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
-    add as +, sub as -, unsub as -, mul as *, div as /, mod as %
-} for Int global;
-
-function bitor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) | Int.unwrap(y)); }
-function bitand(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) & Int.unwrap(y)); }
-function bitxor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) ^ Int.unwrap(y)); }
-function bitnot(Int x) pure returns (Int) { return Int.wrap(~Int.unwrap(x)); }
-
-function add(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) + Int.unwrap(y)); }
-function sub(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) - Int.unwrap(y)); }
-function unsub(Int x) pure returns (Int) { return Int.wrap(-Int.unwrap(x)); }
-function mul(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) * Int.unwrap(y)); }
-function div(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) / Int.unwrap(y)); }
-function mod(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) % Int.unwrap(y)); }
-
-contract C {
-    Int constant I0 = Int.wrap(0);
-    Int constant I1 = Int.wrap(1);
-    Int constant I2 = Int.wrap(2);
-    Int constant I3 = Int.wrap(3);
-    Int constant I4 = Int.wrap(4);
-    Int constant I5 = Int.wrap(5);
-    Int constant I6 = Int.wrap(6);
-    Int constant I7 = Int.wrap(7);
-    Int constant I8 = Int.wrap(8);
-    Int constant I10 = Int.wrap(10);
-    Int constant I13 = Int.wrap(13);
-    Int constant I15 = Int.wrap(15);
-    Int constant I20 = Int.wrap(20);
-    Int constant I128 = Int.wrap(128);
-
-    function testBitwise() public pure {
-        assert(Int.unwrap(I0 & I0 | I1) == (0 & 0 | 1));
-        assert(Int.unwrap(I0 & I0 | I1) == ((0 & 0) | 1));
-    }
-
-    function testBitwise_arithmetic() public pure {
-        assert(Int.unwrap(I2 + I2 & ~I1 | I6 * I6 - I4 & ~I3) == (2 + 2 & ~1 | 6 * 6 - 4 & ~3));
-        assert(Int.unwrap(I2 + I2 & ~I1 | I6 * I6 - I4 & ~I3) == (((2 + 2) & (~1)) | (((6 * 6) - 4) & (~3))));
-    }
-
-    function testArithmetic() public pure {
-        assert(Int.unwrap(I1 + I8 / I4 - I5 % I6 * I7) == (1 + 8 / 4 - 5 % 6 * 7));
-        assert(Int.unwrap(I1 + I8 / I4 - I5 % I6 * I7) == ((1 + (8 / 4)) - ((5 % 6) * 7)));
-    }
-
-    function testAll() public pure {
-        assert(
-            Int.unwrap(I128 + I1 - I10 + I4 & ~I1 ^ ~I1 * I2 | -I15 % -I10 * I20 / I2 + I13 & ~I3) ==
-            (128 + 1 - 10 + 4 & ~1 ^ ~1 * 2 | -15 % -10 * 20 / 2 + 13 & ~3)
-        );
-        assert(
-            Int.unwrap(I128 + I1 - I10 + I4 & ~I1 ^ ~I1 * I2 | -I15 % -I10 * I20 / I2 + I13 & ~I3) ==
-            (
-                (
-                    ((((128 + 1) - 10) + 4) & (~1)) ^
-                    ((~1) * 2)
-                ) |
-                ((((((-15) % (-10)) * 20) / 2) + 13) & (~3))
-            )
-        );
-    }
-}
-// ----
-// testBitwise() ->
-// testBitwise_arithmetic() ->
-// testArithmetic() ->
-// testAll() ->
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol
deleted file mode 100644
index 3798a0036238..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-type U8 is uint8;
-using {f as ~, g as +} for U8 global;
-
-function f(U8) pure returns (U8 z) {
-    assembly {
-        // Return a value with dirty bytes outside of uint8
-        z := 0xffff
-    }
-}
-
-function g(U8, U8) pure returns (U8 z) {
-    assembly {
-        // Return a value with dirty bytes outside of uint8
-        z := 0xffff
-    }
-}
-
-contract C {
-    function testUnary() external pure returns (uint, uint) {
-        U8 a; // Value does not matter
-
-        U8 opResult = ~a;
-        U8 fResult = f(a);
-
-        // Get the slot, including bytes outside of uint8
-        uint opResultFull;
-        uint fResultFull;
-        assembly {
-            opResultFull := opResult
-            fResultFull := fResult
-        }
-
-        // If the result is not 0xff, no cleanup was performed.
-        return (opResultFull, fResultFull);
-    }
-
-    function testBinary() external pure returns (uint, uint) {
-        U8 a; // Value does not matter
-        U8 b; // Value does not matter
-
-        U8 opResult = a + b;
-        U8 fResult = g(a, b);
-
-        // Get the slot, including bytes outside of uint8
-        uint opResultFull;
-        uint fResultFull;
-        assembly {
-            opResultFull := opResult
-            fResultFull := fResult
-        }
-
-        // If the result is not 0xff, no cleanup was performed.
-        return (opResultFull, fResultFull);
-    }
-}
-// ----
-// testUnary() -> 0xffff, 0xffff
-// testBinary() -> 0xffff, 0xffff
diff --git a/test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol b/test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol
deleted file mode 100644
index 3ce080c34dff..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-type Uint is uint;
-using {unaryCountdown as ~, binaryCountdown as ^, eq as ==} for Uint global;
-
-function unaryCountdown(Uint x) pure returns (Uint) {
-    if (x == Uint.wrap(0))
-        return Uint.wrap(0);
-
-    return ~Uint.wrap(Uint.unwrap(x) - 1);
-}
-
-function binaryCountdown(Uint x, Uint y) pure returns (Uint) {
-    if (x == Uint.wrap(0) && y == Uint.wrap(0))
-        return Uint.wrap(0);
-    if (x == Uint.wrap(0))
-        return y ^ x;
-
-    return Uint.wrap(Uint.unwrap(x) - 1) ^ y;
-}
-
-function eq(Uint x, Uint y) pure returns (bool) {
-    return Uint.unwrap(x) == Uint.unwrap(y);
-}
-
-contract C {
-    function testUnary(Uint x) public pure returns (Uint) {
-        return ~x;
-    }
-
-    function testBinary(Uint x, Uint y) public pure returns (Uint) {
-        return x ^ y;
-    }
-}
-// ----
-// testUnary(uint256): 0 -> 0
-// testUnary(uint256): 1 -> 0
-// testUnary(uint256): 99999999999 -> FAILURE
-// testBinary(uint256,uint256): 0, 0 -> 0
-// testBinary(uint256,uint256): 1, 0 -> 0
-// testBinary(uint256,uint256): 0, 1 -> 0
-// testBinary(uint256,uint256): 1, 1 -> 0
-// testBinary(uint256,uint256): 99999999999, 99999999999 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
deleted file mode 100644
index 9f3fd5d4e4d1..000000000000
--- a/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type U8 is uint8;
-
-function uncheckedAdd(U8 x, U8 y) pure returns (U8) {
-    unchecked {
-        return U8.wrap(U8.unwrap(x) + U8.unwrap(y));
-    }
-}
-
-using {uncheckedAdd as +} for U8 global;
-
-contract D {
-    function testUncheckedOperator() public pure returns (U8) {
-        return U8.wrap(250) + U8.wrap(10);
-    }
-
-    function testUncheckedOperatorInUncheckedBlock() public pure returns (U8) {
-        unchecked {
-            return U8.wrap(250) + U8.wrap(10);
-        }
-    }
-}
-// ----
-// testUncheckedOperator() -> 4
-// testUncheckedOperatorInUncheckedBlock() -> 4
diff --git a/test/libsolidity/semanticTests/optimizer/shift_bytes.sol b/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
deleted file mode 100644
index 6c7eef895cf6..000000000000
--- a/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-// This tests the optimizer rule
-// byte(A, shl(B, X))
-// ->
-// byte(A + B / 8, X)
-// given A <= 32 && B % 8 == 0 && B <= 256
-//
-// and the respective rule about shr
-contract C {
-  function f(uint a) public returns (uint, uint, uint) {
-    uint x = a << (256 - 8);
-    assembly {
-      x := byte(0, x)
-    }
-    uint y = a << 8;
-    assembly {
-      y := byte(30, y)
-    }
-    uint z = a << 16;
-    assembly {
-      z := byte(1, z)
-    }
-    return (x, y, z);
-  }
-  function g(uint a) public returns (uint, uint, uint) {
-    uint x = a >> (256 - 16);
-    assembly {
-      x := byte(31, x)
-    }
-    uint y = a >> 8;
-    assembly {
-      y := byte(4, y)
-    }
-    uint z = a >> 16;
-    assembly {
-      z := byte(7, z)
-    }
-    return (x, y, z);
-  }
-}
-// ----
-// f(uint256): 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -> 0x1f, 0x1f, 3
-// g(uint256): 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -> 1, 3, 5
diff --git a/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol b/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
deleted file mode 100644
index c36095914363..000000000000
--- a/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    modifier tryCircumvent {
-        if (false) _; // avoid the function, we should still not accept ether
-    }
-    function f() tryCircumvent public returns (uint) {
-        return msgvalue();
-    }
-    function msgvalue() internal returns (uint) {
-        return msg.value;
-    }
-}
-// ----
-// f(), 27 wei -> FAILURE
-// balance -> 0
diff --git a/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol b/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
deleted file mode 100644
index ce04cd73745b..000000000000
--- a/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A {
-    uint public x;
-    receive () external payable { ++x; }
-}
-// ----
-// x() -> 0
-// ()
-// x() -> 1
-// (), 1 wei
-// x() -> 2
-// x(), 1 wei -> FAILURE
-// (): hex"00" -> FAILURE
-// (), 1 ether: hex"00" -> FAILURE
diff --git a/test/libsolidity/semanticTests/receive/ether_and_data.sol b/test/libsolidity/semanticTests/receive/ether_and_data.sol
deleted file mode 100644
index 4c48df8d47ad..000000000000
--- a/test/libsolidity/semanticTests/receive/ether_and_data.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    receive () payable external { }
-}
-// ----
-// (), 1 ether
-// (), 1 ether: 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/receive/inherited.sol b/test/libsolidity/semanticTests/receive/inherited.sol
deleted file mode 100644
index 36273068ac9b..000000000000
--- a/test/libsolidity/semanticTests/receive/inherited.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    uint data;
-    receive() external payable { ++data; }
-    function getData() public returns (uint r) { return data; }
-}
-contract B is A {}
-// ----
-// getData() -> 0
-// () ->
-// getData() -> 1
-// (), 1 ether ->
-// getData() -> 2
diff --git a/test/libsolidity/semanticTests/revertStrings/array_slices.sol b/test/libsolidity/semanticTests/revertStrings/array_slices.sol
deleted file mode 100644
index dec3e916d763..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/array_slices.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(uint256 start, uint256 end, uint256[] calldata arr) external pure {
-		arr[start:end];
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256,uint256,uint256[]): 2, 1, 0x80, 3, 1, 2, 3 -> FAILURE, hex"08c379a0", 0x20, 22, "Slice starts after end"
-// f(uint256,uint256,uint256[]): 1, 5, 0x80, 3, 1, 2, 3 -> FAILURE, hex"08c379a0", 0x20, 28, "Slice is greater than length"
diff --git a/test/libsolidity/semanticTests/revertStrings/bubble.sol b/test/libsolidity/semanticTests/revertStrings/bubble.sol
deleted file mode 100644
index 5e9a0730df5f..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/bubble.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-	function g() public { revert("fail"); }
-}
-
-contract C {
-	A a = new A();
-	function f() public {
-		a.g();
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f() -> FAILURE, hex"08c379a0", 0x20, 4, "fail"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol
deleted file mode 100644
index 355c472230d2..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function f(uint256[][] calldata a) external returns (uint) {
-		return 42;
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256[][]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol
deleted file mode 100644
index 7c5ba33b735d..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][2][] calldata x) external returns (uint256) {
-        x[0];
-        return 23;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256[][2][]): 0x20, 0x01, 0x20, 0x00 -> FAILURE, hex"08c379a0", 0x20, 28, "Invalid calldata tail offset"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol
deleted file mode 100644
index 77341fa26a85..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][2][] calldata x) external returns (uint256) {
-        return 42;
-    }
-    function g(uint256[][2][] calldata x) external returns (uint256) {
-        return this.f(x);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// g(uint256[][2][]): 0x20, 0x01, 0x20, 0x00 -> FAILURE, hex"08c379a0", 0x20, 30, "Invalid calldata access offset"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol
deleted file mode 100644
index 4af015f33bc5..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function f(uint256[][] calldata x) external returns (uint256) {
-		return x[0].length;
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256[][]): 0x20, 1, 0x20, 0x0100000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 28, "Invalid calldata tail length"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol b/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol
deleted file mode 100644
index 34a6f0a025e9..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function f(uint a, uint[] calldata b, uint c) external pure returns (uint) {
-		return 7;
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x1000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray length"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol b/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol
deleted file mode 100644
index c0c1e3f4c0db..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][] calldata x) external { x[0]; }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256[][]): 0x20, 1, 0x20, 2, 0x42 -> FAILURE, hex"08c379a0", 0x20, 23, "Calldata tail too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol b/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol
deleted file mode 100644
index 4677d350f68c..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function d(bytes memory _data) public pure returns (uint8) {
-		return abi.decode(_data, (uint8));
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// d(bytes): 0x20, 0x01, 0x0000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 18, "Calldata too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol b/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol
deleted file mode 100644
index 110b1e50c724..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f() external {}
-	function g() external {
-		C c = C(address(0x0000000000000000000000000000000000000000000000000000000000000000));
-		c.f();
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// g() -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/revertStrings/empty_v1.sol b/test/libsolidity/semanticTests/revertStrings/empty_v1.sol
deleted file mode 100644
index b9658c794de9..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/empty_v1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function f() public {
-		revert("");
-	}
-	function g(string calldata msg) public {
-		revert(msg);
-	}
-}
-// ====
-// ABIEncoderV1Only: true
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// compileViaYul: false
-// ----
-// f() -> FAILURE, hex"08c379a0", 0x20, 0
-// g(string): 0x20, 0, "" -> FAILURE, hex"08c379a0", 0x20, 0
-// g(string): 0x20, 0 -> FAILURE, hex"08c379a0", 0x20, 0
diff --git a/test/libsolidity/semanticTests/revertStrings/empty_v2.sol b/test/libsolidity/semanticTests/revertStrings/empty_v2.sol
deleted file mode 100644
index 24a684904fa1..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/empty_v2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function f() public {
-		revert("");
-	}
-	function g(string calldata msg) public {
-		revert(msg);
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f() -> FAILURE, hex"08c379a0", 0x20, 0
-// g(string): "" -> FAILURE, hex"08c379a0", 0x20, 0
-// g(string): 0x20, 0, "" -> FAILURE, hex"08c379a0", 0x20, 0
-// g(string): 0x20, 0 -> FAILURE, hex"08c379a0", 0x20, 0
diff --git a/test/libsolidity/semanticTests/revertStrings/enum_v1.sol b/test/libsolidity/semanticTests/revertStrings/enum_v1.sol
deleted file mode 100644
index 305e43a573f7..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/enum_v1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder v1;
-contract C {
-	enum E {X, Y}
-	function f(E[] calldata arr) external {
-		arr[1];
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(uint8[]): 0x20, 2, 3, 3 -> FAILURE, hex"08c379a0", 0x20, 17, "Enum out of range"
diff --git a/test/libsolidity/semanticTests/revertStrings/enum_v2.sol b/test/libsolidity/semanticTests/revertStrings/enum_v2.sol
deleted file mode 100644
index e2f77e551638..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/enum_v2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v2;
-contract C {
-	enum E {X, Y}
-	function f(E[] calldata arr) external {
-		arr[1];
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint8[]): 0x20, 2, 3, 3 -> FAILURE
diff --git a/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol b/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol
deleted file mode 100644
index ffaea68787d9..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public {}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(), 1 ether -> FAILURE, hex"08c379a0", 0x20, 34, "Ether sent to non-payable functi", "on"
-// () -> FAILURE, hex"08c379a0", 0x20, 53, "Contract does not have fallback ", "nor receive functions"
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
deleted file mode 100644
index 13c3d8542bd4..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function t(uint) public pure {}
-}
-// ====
-// EVMVersion: >=byzantium
-// ABIEncoderV1Only: true
-// revertStrings: debug
-// compileViaYul: false
-// ----
-// t(uint256) -> FAILURE, hex"08c379a0", 0x20, 0x12, "Calldata too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
deleted file mode 100644
index 3412f58c6cca..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder v2;
-contract C {
-    function t(uint) public pure {}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// t(uint256) -> FAILURE, hex"08c379a0", 0x20, 34, "ABI decoding: tuple data too sho", "rt"
diff --git a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol b/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol
deleted file mode 100644
index 41cd0f4d26b1..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function d(bytes memory _data) public pure returns (uint8) {
-		return abi.decode(_data, (uint8));
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// d(bytes): 0x20, 0x20, 0x0000000000000000000000000000000000000000000000000000000000000000 -> 0
-// d(bytes): 0x100, 0x20, 0x0000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI calldata decoding: invalid h", "ead pointer"
-// d(bytes): 0x20, 0x100, 0x0000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI calldata decoding: invalid d", "ata pointer"
diff --git a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol b/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol
deleted file mode 100644
index af9d822dd6eb..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder v1;
-contract C {
-	function dyn(uint ptr, uint start, uint x) public returns (bytes memory a) {
-		assembly {
-			mstore(0, start)
-			mstore(start, add(start, 1))
-			return(ptr, x)
-		}
-	}
-	function f(uint ptr, uint start, uint x) public returns (bool) {
-		this.dyn(ptr, start, x);
-		return true;
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// f(uint256,uint256,uint256): 0, 0x200, 0x60 -> FAILURE, hex"08c379a0", 0x20, 39, "ABI memory decoding: invalid dat", "a start"
-// f(uint256,uint256,uint256): 0, 0x20, 0x60 -> FAILURE, hex"08c379a0", 0x20, 40, "ABI memory decoding: invalid dat", "a length"
diff --git a/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol b/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol
deleted file mode 100644
index 1a079a04ab02..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-library L {
-    function g() external {}
-}
-contract C {
-    function f() public returns (bytes memory) {
-        (bool success, bytes memory result) = address(L).call(abi.encodeWithSignature("g()"));
-		assert(!success);
-		return result;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// library: L
-// f() -> 32, 132, 3963877391197344453575983046348115674221700746820753546331534351508065746944, 862718293348820473429344482784628181556388621521298319395315527974912, 1518017211910606845658622928256476421055725129218887721595913401102969, 14649601406562900601407788686537400806574002225747213573947654179243427889152, 0
diff --git a/test/libsolidity/semanticTests/revertStrings/short_input_array.sol b/test/libsolidity/semanticTests/revertStrings/short_input_array.sol
deleted file mode 100644
index 4a96accf026d..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/short_input_array.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function f(uint[] memory a) public pure returns (uint) { return 7; }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// f(uint256[]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol b/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol
deleted file mode 100644
index 2f275b86d60f..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-	function e(bytes memory a) public pure returns (uint) { return 7; }
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// e(bytes): 0x20, 7 -> FAILURE, hex"08c379a0", 0x20, 39, "ABI decoding: invalid byte array", " length"
diff --git a/test/libsolidity/semanticTests/revertStrings/transfer.sol b/test/libsolidity/semanticTests/revertStrings/transfer.sol
deleted file mode 100644
index ef2e728594c7..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/transfer.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract A {
-	receive() external payable {
-		revert("no_receive");
-	}
-}
-
-contract C {
-	A a = new A();
-	receive() external payable {}
-	function f() public {
-		payable(a).transfer(1 wei);
-	}
-	function h() public {
-		payable(a).transfer(100 ether);
-	}
-	function g() public view returns (uint) {
-		return payable(this).balance;
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// (), 10 wei ->
-// g() -> 10
-// f() -> FAILURE, hex"08c379a0", 0x20, 10, "no_receive"
-// h() -> FAILURE
diff --git a/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol b/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol
deleted file mode 100644
index 62b245885146..000000000000
--- a/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	receive () external payable {}
-}
-// ====
-// EVMVersion: >=byzantium
-// revertStrings: debug
-// ----
-// (): hex"00" -> FAILURE, hex"08c379a0", 0x20, 41, "Unknown signature and no fallbac", "k defined"
diff --git a/test/libsolidity/semanticTests/reverts/assert_require.sol b/test/libsolidity/semanticTests/reverts/assert_require.sol
deleted file mode 100644
index bc4db3602c72..000000000000
--- a/test/libsolidity/semanticTests/reverts/assert_require.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public {
-        assert(false);
-    }
-
-    function g(bool val) public returns (bool) {
-        assert(val == true);
-        return true;
-    }
-
-    function h(bool val) public returns (bool) {
-        require(val);
-        return true;
-    }
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x01
-// g(bool): false -> FAILURE, hex"4e487b71", 0x01
-// g(bool): true -> true
-// h(bool): false -> FAILURE
-// h(bool): true -> true
diff --git a/test/libsolidity/semanticTests/reverts/error_struct.sol b/test/libsolidity/semanticTests/reverts/error_struct.sol
deleted file mode 100644
index d6171a416a8c..000000000000
--- a/test/libsolidity/semanticTests/reverts/error_struct.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-struct error { uint error; }
-contract C {
-	error test();
-	error _struct;
-	function f() public {
-		revert test();
-	}
-	function g(uint x) public returns (uint) {
-		_struct.error = x;
-		return _struct.error;
-	}
-}
-// ----
-// f() -> FAILURE, hex"f8a8fd6d"
-// g(uint256): 7 -> 7
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
deleted file mode 100644
index 28c4e01f9955..000000000000
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    enum X {A, B}
-
-    function tested(X x) public returns (uint256) {
-        return 1;
-    }
-
-    function test() public returns (uint256) {
-        X garbled;
-
-        assembly {
-            garbled := 5
-        }
-
-        return this.tested(garbled);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// test() -> FAILURE, hex"4e487b71", 0x21 # should throw #
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
deleted file mode 100644
index 7416d295fc7c..000000000000
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    enum X {A, B}
-
-    function test_return() public returns (X) {
-        X garbled;
-        assembly {
-            garbled := 5
-        }
-        return garbled;
-    }
-
-    function test_inline_assignment() public returns (X _ret) {
-        assembly {
-            _ret := 5
-        }
-    }
-
-    function test_assignment() public returns (X _ret) {
-        X tmp;
-        assembly {
-            tmp := 5
-        }
-        _ret = tmp;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// test_return() -> FAILURE, hex"4e487b71", 33 # both should throw #
-// test_inline_assignment() -> FAILURE, hex"4e487b71", 33
-// test_assignment() -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
deleted file mode 100644
index 527a4320235d..000000000000
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    enum X {A, B}
-
-    function test_eq() public returns (bool) {
-        X garbled;
-        assembly {
-            garbled := 5
-        }
-        return garbled == garbled;
-    }
-
-    function test_eq_ok() public returns (bool) {
-        X garbled = X.A;
-        return garbled == garbled;
-    }
-
-    function test_neq() public returns (bool) {
-        X garbled;
-        assembly {
-            garbled := 5
-        }
-        return garbled != garbled;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// test_eq_ok() -> 1
-// test_eq() -> FAILURE, hex"4e487b71", 33 # both should throw #
-// test_neq() -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
deleted file mode 100644
index 8049a977e746..000000000000
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    enum X {A, B}
-    X public x;
-
-    function test_store() public returns (uint256) {
-        X garbled = X.A;
-        assembly {
-            garbled := 5
-        }
-        x = garbled;
-        return 1;
-    }
-
-    function test_store_ok() public returns (uint256) {
-        x = X.A;
-        return 1;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// test_store_ok() -> 1
-// x() -> 0
-// test_store() -> FAILURE, hex"4e487b71", 33 # should throw #
diff --git a/test/libsolidity/semanticTests/reverts/invalid_instruction.sol b/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
deleted file mode 100644
index 69d9a0cd3605..000000000000
--- a/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            invalid()
-        }
-    }
-}
-// ----
-// f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/reverts/revert.sol b/test/libsolidity/semanticTests/reverts/revert.sol
deleted file mode 100644
index 2d733b4e7db2..000000000000
--- a/test/libsolidity/semanticTests/reverts/revert.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    uint256 public a = 42;
-
-    function f() public {
-        a = 1;
-        revert();
-    }
-
-    function g() public {
-        a = 1;
-        assembly {
-            revert(0, 0)
-        }
-    }
-}
-// ----
-// f() -> FAILURE
-// a() -> 42
-// g() -> FAILURE
-// a() -> 42
diff --git a/test/libsolidity/semanticTests/reverts/revert_return_area.sol b/test/libsolidity/semanticTests/reverts/revert_return_area.sol
deleted file mode 100644
index 8ab4ca22722c..000000000000
--- a/test/libsolidity/semanticTests/reverts/revert_return_area.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    fallback() external {
-        revert("abc");
-    }
-
-    function f() public returns (uint s, uint r) {
-        address x = address(this);
-        assembly {
-            mstore(0, 7)
-            s := call(sub(0, 1), x, 0, 0, 0, 0, 32)
-            r := mload(0)
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x00, 0x08c379a000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/reverts/simple_throw.sol b/test/libsolidity/semanticTests/reverts/simple_throw.sol
deleted file mode 100644
index 1c1bfee0b377..000000000000
--- a/test/libsolidity/semanticTests/reverts/simple_throw.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    function f(uint256 x) public returns (uint256) {
-        if (x > 10) return x + 10;
-        else revert();
-        return 2;
-    }
-}
-// ----
-// f(uint256): 11 -> 21
-// f(uint256): 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
deleted file mode 100644
index 1c5ce63ad456..000000000000
--- a/test/libsolidity/semanticTests/salted_create/prediction_example.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract D {
-    uint public x;
-    constructor(uint a) {
-        x = a;
-    }
-}
-
-contract C {
-    function createDSalted(bytes32 salt, uint arg) public {
-        address predictedAddress = address(uint160(uint(keccak256(abi.encodePacked(
-            bytes1(0xff),
-            address(this),
-            salt,
-            keccak256(abi.encodePacked(
-                type(D).creationCode,
-                arg
-            ))
-        )))));
-
-        D d = new D{salt: salt}(arg);
-        require(address(d) == predictedAddress, "Address mismatch.");
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// compileViaYul: also
-// ----
-// createDSalted(bytes32,uint256): 42, 64 ->
-// gas legacy: 102943
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
deleted file mode 100644
index 743ff5fd2a23..000000000000
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract B
-{
-}
-
-contract A {
-    function different_salt() public returns (bool) {
-        B x = new B{salt: "abc"}();
-        B y = new B{salt: "abcef"}();
-        return x != y;
-    }
-    function same_salt() public returns (bool) {
-        B x = new B{salt: "xyz"}();
-        try new B{salt: "xyz"}() {} catch {
-            return true;
-        }
-        return false;
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// different_salt() -> true
-// same_salt() -> true
-// gas irOptimized: 98438895
-// gas legacy: 98439109
-// gas legacyOptimized: 98438967
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
deleted file mode 100644
index c4db17474223..000000000000
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract B
-{
-    uint x;
-    function getBalance() public view returns (uint) {
-        return address(this).balance * 1000 + x;
-    }
-    constructor(uint _x) payable {
-        x = _x;
-    }
-}
-
-contract A {
-    function f() public payable returns (uint, uint, uint) {
-        B x = new B{salt: "abc", value: 3}(7);
-        B y = new B{value: 3, salt: "abc"}(8);
-        B z = new B{salt: "abc", value: 3}(9);
-        return (x.getBalance(), y.getBalance(), z.getBalance());
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 253005
-// gas legacy: 381063
-// gas legacyOptimized: 279694
diff --git a/test/libsolidity/semanticTests/shanghai/evmone_support.sol b/test/libsolidity/semanticTests/shanghai/evmone_support.sol
deleted file mode 100644
index 359dc516ffcd..000000000000
--- a/test/libsolidity/semanticTests/shanghai/evmone_support.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract ShortReturn {
-    constructor() {
-        assembly {
-            // return(0, 32)
-            // PUSH1 0x20 PUSH0 RETURN
-            mstore(0, hex"60205ff3")
-            return(0, 4)
-        }
-    }
-}
-
-interface DoesItReturnZero {
-    function foo() external pure returns (uint256);
-}
-
-contract Test {
-    ShortReturn immutable shortReturn = new ShortReturn();
-    function bytecode() external view returns(bytes memory) {
-        return address(shortReturn).code;
-    }
-    function isPush0Supported() external view returns (bool) {
-        assert(DoesItReturnZero(address(shortReturn)).foo() == 0);
-        return true;
-    }
-}
-// ====
-// compileViaYul: also
-// EVMVersion: >=shanghai
-// ----
-// bytecode() -> 0x20, 4, 0x60205ff300000000000000000000000000000000000000000000000000000000
-// isPush0Supported() -> true
diff --git a/test/libsolidity/semanticTests/shanghai/push0.sol b/test/libsolidity/semanticTests/shanghai/push0.sol
deleted file mode 100644
index e1acaaae6af1..000000000000
--- a/test/libsolidity/semanticTests/shanghai/push0.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function zero() external returns (uint) {
-        return 0;
-    }
-
-}
-// ====
-// compileViaYul: also
-// EVMVersion: >=shanghai
-// ----
-// zero() -> 0
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
deleted file mode 100644
index 3e8016f988f8..000000000000
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    uint256 public stateDecimal = 0x20;
-}
-
-contract D {
-    bool public stateBool = true;
-    uint256 public stateDecimal = 42;
-    bytes32 public stateBytes = "\x42\x00\xef";
-
-    function internalStateDecimal() public returns (uint256) {
-        return (new C()).stateDecimal();
-    }
-
-    function update(bool _bool, uint256 _decimal, bytes32 _bytes) public returns (bool, uint256, bytes32) {
-        stateBool = _bool;
-        stateDecimal = _decimal;
-        stateBytes = _bytes;
-        return (stateBool, stateDecimal, stateBytes);
-    }
-}
-// ----
-// stateBool() -> true
-// stateBool() -> right(true)
-// stateDecimal() -> 42
-// stateDecimal() -> right(42)
-// stateBytes() -> left(0x4200ef)
-// internalStateDecimal() -> 0x20
-// gas legacy: 100265
-// update(bool,uint256,bytes32): false, -23, left(0x2300ef) -> false, -23, left(0x2300ef)
diff --git a/test/libsolidity/semanticTests/smoke/arrays.sol b/test/libsolidity/semanticTests/smoke/arrays.sol
deleted file mode 100644
index 404c7157fe99..000000000000
--- a/test/libsolidity/semanticTests/smoke/arrays.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct T {
-        uint a;
-        uint b;
-        string s;
-    }
-    bool[2][] flags;
-    function r() public returns (bool[3] memory) {
-        return [true, false, true];
-    }
-    function s() public returns (uint[2] memory, uint) {
-        return ([uint(123), 456], 789);
-    }
-    function u() public returns (T[2] memory) {
-        return [T(23, 42, "any"), T(555, 666, "any")];
-    }
-    function v() public returns (bool[2][] memory) {
-        return flags;
-    }
-    function w1() public returns (string[1] memory) {
-        return ["any"];
-    }
-    function w2() public returns (string[2] memory) {
-        return ["any", "any"];
-    }
-    function w3() public returns (string[3] memory) {
-        return ["any", "any", "any"];
-    }
-    function x() public returns (string[2] memory, string[3] memory) {
-        return (["any", "any"], ["any", "any", "any"]);
-    }
-}
-// ----
-// r() -> true, false, true
-// s() -> 123, 456, 789
-// u() -> 0x20, 0x40, 0xE0, 23, 42, 0x60, 3, "any", 555, 666, 0x60, 3, "any"
-// v() -> 0x20, 0
-// w1() -> 0x20, 0x20, 3, "any"
-// w2() -> 0x20, 0x40, 0x80, 3, "any", 3, "any"
-// w3() -> 0x20, 0x60, 0xa0, 0xe0, 3, "any", 3, "any", 3, "any"
-// x() -> 0x40, 0x0100, 0x40, 0x80, 3, "any", 3, "any", 0x60, 0xa0, 0xe0, 3, "any", 3, "any", 3, "any"
diff --git a/test/libsolidity/semanticTests/smoke/basic.sol b/test/libsolidity/semanticTests/smoke/basic.sol
deleted file mode 100644
index 8f05c4262598..000000000000
--- a/test/libsolidity/semanticTests/smoke/basic.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function d() public {
-    }
-    function e() public payable returns (uint) {
-        return msg.value;
-    }
-    function f(uint a) public pure returns (uint, uint) {
-        return (a, a);
-    }
-    function g() public  pure returns (uint, uint) {
-        return (2, 3);
-    }
-    function h(uint x, uint y) public  pure returns (uint) {
-        unchecked { return x - y; }
-    }
-    function i(bool b) public  pure returns (bool) {
-        return !b;
-    }
-    function j(bytes32 b) public pure returns (bytes32, bytes32) {
-        return (b, b);
-    }
-    function k() public pure returns (uint) {
-        return msg.data.length;
-    }
-    function l(uint a) public pure returns (uint d) {
-        return a * 7;
-    }
-}
-// ----
-// d() ->
-// e(), 1 wei -> 1
-// e(), 1 ether -> 1000000000000000000
-// f(uint256): 3 -> 3, 3
-// g() -> 2, 3
-// h(uint256,uint256): 1, -2 -> 3
-// i(bool): true -> false
-// j(bytes32): 0x10001 -> 0x10001, 0x10001
-// k(): hex"4200efef" -> 8
-// l(uint256): 99 -> 693
diff --git a/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol b/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
deleted file mode 100644
index c20dd919e164..000000000000
--- a/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function e(bytes memory b) public pure returns (bytes memory) {
-        return b;
-    }
-    function f() public pure returns (string memory, string memory) {
-        return ("any", "any");
-    }
-    function g() public pure returns (string memory, uint, string memory) {
-        return ("any", 42, "any");
-    }
-    function h() public pure returns (string memory) {
-        return "any";
-    }
-}
-// ----
-// e(bytes): 32, 3, hex"AB33BB" -> 32, 3, left(0xAB33BB)
-// e(bytes): 32, 32, 0x20 -> 32, 32, 0x20
-// e(bytes): 32, 3, hex"AB33FF" -> 32, 3, hex"ab33ff0000000000000000000000000000000000000000000000000000000000"
-// f() -> 0x40, 0x80, 3, "any", 3, "any"
-// g() -> 0x60, 0x2a, 0xa0, 3, "any", 3, "any"
-// h() -> 0x20, 3, "any"
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
deleted file mode 100644
index 79b92867bc0d..000000000000
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint public state = 0;
-    constructor(uint _state) payable {
-        state = _state;
-    }
-    function balance() public payable returns (uint256) {
-        return address(this).balance;
-    }
-    function update(uint _state) public {
-        state = _state;
-    }
-}
-// ----
-// constructor(), 2 wei: 3 ->
-// gas irOptimized: 104412
-// gas legacy: 148308
-// gas legacyOptimized: 106727
-// state() -> 3
-// balance() -> 2
-// balance -> 2
-// update(uint256): 4
-// state() -> 4
diff --git a/test/libsolidity/semanticTests/smoke/failure.sol b/test/libsolidity/semanticTests/smoke/failure.sol
deleted file mode 100644
index 14cf1e627304..000000000000
--- a/test/libsolidity/semanticTests/smoke/failure.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function e() public pure {
-        revert("Transaction failed.");
-    }
-    function f(bool _value) public pure {
-        string memory message;
-        require(_value, message);
-    }
-    function g(bool _value) public pure {
-        require(_value, "Value is false.");
-    }
-    function h() public pure returns (uint) {
-        assert(false);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// allowNonExistingFunctions: true
-// ----
-// _() -> FAILURE
-// e() -> FAILURE, hex"08c379a0", 0x20, 0x13, "Transaction failed."
-// f(bool): false -> FAILURE, hex"08c379a0", 0x20, 0x00
-// g(bool): false -> FAILURE, hex"08c379a0", 0x20, 0x0f, "Value is false."
-// h() -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/smoke/fallback.sol b/test/libsolidity/semanticTests/smoke/fallback.sol
deleted file mode 100644
index b0e515db3210..000000000000
--- a/test/libsolidity/semanticTests/smoke/fallback.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-    uint public data;
-    uint public balance;
-    bytes public externalData;
-    fallback() external payable {
-        data += 1;
-        balance = msg.value;
-        externalData = msg.data;
-    }
-}
-// ----
-// data() -> 0
-// ()
-// data() -> 1
-// (): hex"42ef"
-// data() -> 2
-// externalData() -> 0x20, 2, left(0x42ef)
-// balance() -> 0
-// (), 1 wei
-// balance() -> 1
-// (), 2 wei: hex"fefe"
-// balance() -> 2
-// externalData() -> 0x20, 2, left(0xfefe)
diff --git a/test/libsolidity/semanticTests/smoke/multiline.sol b/test/libsolidity/semanticTests/smoke/multiline.sol
deleted file mode 100644
index 624b19473d36..000000000000
--- a/test/libsolidity/semanticTests/smoke/multiline.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint a, uint b, uint c, uint d, uint e) public returns (uint) {
-        return a + b + c + d + e;
-    }
-}
-// ====
-// allowNonExistingFunctions: true
-// ----
-// f(uint256,uint256,uint256,uint256,uint256): 1, 1, 1, 1, 1
-// -> 5
-// g()
-// # g() does not exist #
-// -> FAILURE
diff --git a/test/libsolidity/semanticTests/smoke/multiline_comments.sol b/test/libsolidity/semanticTests/smoke/multiline_comments.sol
deleted file mode 100644
index 17de40fc4dab..000000000000
--- a/test/libsolidity/semanticTests/smoke/multiline_comments.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(uint a, uint b, uint c, uint d, uint e) public returns (uint) {
-        return a + b + c + d + e;
-    }
-}
-// ----
-// f(uint256,uint256,uint256,uint256,uint256): 1, 1, 1, 1, 1
-// # A comment on the function parameters. #
-// -> 5
-// f(uint256,uint256,uint256,uint256,uint256):
-// 1,
-// 1,
-// 1,
-// 1,
-// 1
-// -> 5
-// # Should return sum of all parameters. #
diff --git a/test/libsolidity/semanticTests/smoke/structs.sol b/test/libsolidity/semanticTests/smoke/structs.sol
deleted file mode 100644
index d6df382c95b1..000000000000
--- a/test/libsolidity/semanticTests/smoke/structs.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint a;
-        uint b;
-    }
-    struct T {
-        uint a;
-        uint b;
-        string s;
-    }
-    function s() public returns (S memory) {
-        return S(23, 42);
-    }
-    function t() public returns (T memory) {
-        return T(23, 42, "any");
-    }
-}
-// ----
-// s() -> 23, 42
-// t() -> 0x20, 23, 42, 0x60, 3, "any"
diff --git a/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol b/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
deleted file mode 100644
index 80f734a31a1c..000000000000
--- a/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure returns (bytes memory r1, bytes memory r2) {
-        string memory x = "my_signature";
-        r1 = abi.encodeWithSignature("my_signature", 1);
-        r2 = abi.encodeWithSignature(x, 1);
-        assert(r1.length == r2.length);
-        for (uint i = 0; i < r1.length; i++)
-            assert(r1[i] == r2[i]);
-    }
-}
-// ----
-// f() -> 0x40, 0xa0, 0x24, -813742827273327954027712588510533233455028711326166692885570228492575965184, 26959946667150639794667015087019630673637144422540572481103610249216, 0x24, -813742827273327954027712588510533233455028711326166692885570228492575965184, 26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol b/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
deleted file mode 100644
index b255b1880b0e..000000000000
--- a/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        abi.encode;
-        abi.encodePacked;
-        abi.encodeWithSelector;
-        abi.encodeWithSignature;
-        abi.decode;
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol b/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
deleted file mode 100644
index 6dcb53e2d5bb..000000000000
--- a/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-// tests compile-time evaluation of keccak256 on literal strings
-contract C {
-    function short() public pure returns (bool) {
-        bytes32 a = keccak256("abcdefghijklmn");
-        bytes memory s = "abcdefghijklmn";
-        return a == keccak256(s);
-    }
-    bytes32 constant sc = keccak256("abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn");
-    function long() public pure returns (bool, bool) {
-        bytes32 a = keccak256("abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn");
-        bytes memory s = "abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn";
-        return (a == keccak256(s), sc == keccak256(s));
-    }
-}
-// ----
-// short() -> true
-// long() -> true, true
diff --git a/test/libsolidity/semanticTests/state/block_basefee.sol b/test/libsolidity/semanticTests/state/block_basefee.sol
deleted file mode 100644
index ebeaceec747c..000000000000
--- a/test/libsolidity/semanticTests/state/block_basefee.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.basefee;
-    }
-    function g() public view returns (uint ret) {
-        assembly {
-            ret := basefee()
-        }
-    }
-}
-// ====
-// EVMVersion: >=london
-// ----
-// f() -> 7
-// g() -> 7
-// f() -> 7
-// g() -> 7
diff --git a/test/libsolidity/semanticTests/state/block_chainid.sol b/test/libsolidity/semanticTests/state/block_chainid.sol
deleted file mode 100644
index 5d157323ecd1..000000000000
--- a/test/libsolidity/semanticTests/state/block_chainid.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return block.chainid;
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// f() -> 1
-// f() -> 1
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/state/block_coinbase.sol b/test/libsolidity/semanticTests/state/block_coinbase.sol
deleted file mode 100644
index e7aae2fc739a..000000000000
--- a/test/libsolidity/semanticTests/state/block_coinbase.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (address payable) {
-        return block.coinbase;
-    }
-}
-// ----
-// f() -> 0x7878787878787878787878787878787878787878
-// f() -> 0x7878787878787878787878787878787878787878
-// f() -> 0x7878787878787878787878787878787878787878
diff --git a/test/libsolidity/semanticTests/state/block_difficulty.sol b/test/libsolidity/semanticTests/state/block_difficulty.sol
deleted file mode 100644
index 921200ddf26a..000000000000
--- a/test/libsolidity/semanticTests/state/block_difficulty.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return block.difficulty;
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
-// f() -> 200000000
-// f() -> 200000000
-// f() -> 200000000
diff --git a/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol b/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
deleted file mode 100644
index 226a8bbb8b4b..000000000000
--- a/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return block.difficulty;
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
-// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
-// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/state/block_gaslimit.sol b/test/libsolidity/semanticTests/state/block_gaslimit.sol
deleted file mode 100644
index 0201068b630b..000000000000
--- a/test/libsolidity/semanticTests/state/block_gaslimit.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return block.gaslimit;
-    }
-}
-// ----
-// f() -> 20000000
-// f() -> 20000000
-// f() -> 20000000
diff --git a/test/libsolidity/semanticTests/state/block_number.sol b/test/libsolidity/semanticTests/state/block_number.sol
deleted file mode 100644
index 01ec30966a3d..000000000000
--- a/test/libsolidity/semanticTests/state/block_number.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    constructor() {}
-    function f() public returns (uint) {
-        return block.number;
-    }
-}
-// ----
-// constructor()
-// f() -> 2
-// f() -> 3
diff --git a/test/libsolidity/semanticTests/state/block_prevrandao.sol b/test/libsolidity/semanticTests/state/block_prevrandao.sol
deleted file mode 100644
index 590265da9fcd..000000000000
--- a/test/libsolidity/semanticTests/state/block_prevrandao.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.prevrandao;
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol b/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
deleted file mode 100644
index 6824cab5caff..000000000000
--- a/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.prevrandao;
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
-// f() -> 200000000
diff --git a/test/libsolidity/semanticTests/state/block_timestamp.sol b/test/libsolidity/semanticTests/state/block_timestamp.sol
deleted file mode 100644
index 485ae4be32cc..000000000000
--- a/test/libsolidity/semanticTests/state/block_timestamp.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    constructor() {}
-    function f() public returns (uint) {
-        return block.timestamp;
-    }
-}
-// ----
-// constructor() # This is the 1st block #
-// f() -> 0x1e # This is the 2nd block (each block is "15 seconds") #
-// f() -> 0x2d # This is the 3rd block #
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
deleted file mode 100644
index 01069aa0c6dc..000000000000
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    bytes32 public genesisHash;
-    bytes32 public currentHash;
-    constructor() {
-        require(block.number == 1);
-        genesisHash = blockhash(0);
-        currentHash = blockhash(1);
-    }
-    function f(uint blockNumber) public returns (bytes32) {
-        return blockhash(blockNumber);
-    }
-}
-// ----
-// constructor()
-// gas irOptimized: 108150
-// gas legacy: 152179
-// gas legacyOptimized: 106750
-// genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
-// currentHash() -> 0
-// f(uint256): 0 -> 0x3737373737373737373737373737373737373737373737373737373737373737
-// f(uint256): 1 -> 0x3737373737373737373737373737373737373737373737373737373737373738
-// f(uint256): 255 -> 0x00
-// f(uint256): 256 -> 0x00
-// f(uint256): 257 -> 0x00
diff --git a/test/libsolidity/semanticTests/state/gasleft.sol b/test/libsolidity/semanticTests/state/gasleft.sol
deleted file mode 100644
index 6ce623ce81ea..000000000000
--- a/test/libsolidity/semanticTests/state/gasleft.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (bool) {
-        return gasleft() > 0;
-    }
-}
-// ----
-// f() -> true
-// f() -> true
-// f() -> true
diff --git a/test/libsolidity/semanticTests/state/msg_data.sol b/test/libsolidity/semanticTests/state/msg_data.sol
deleted file mode 100644
index 5a240461a109..000000000000
--- a/test/libsolidity/semanticTests/state/msg_data.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (bytes calldata) {
-        return msg.data;
-    }
-    function g(uint,bool) public returns (bytes calldata) {
-        return msg.data;
-    }
-}
-// ----
-// f() -> 0x20, 4, 17219911917854084299749778639755835327755045716242581057573779540915269926912
-// g(uint256,bool): 1234, true -> 0x20, 0x44, 35691323728519381642872894128098848782337736632589179916067422734266033766400, 33268574187263889506619096617382224251268236217415066441681855047532544, 26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/state/msg_sender.sol b/test/libsolidity/semanticTests/state/msg_sender.sol
deleted file mode 100644
index 951d1f529201..000000000000
--- a/test/libsolidity/semanticTests/state/msg_sender.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (address) {
-        return msg.sender;
-    }
-}
-// ----
-// f() -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/state/msg_sig.sol b/test/libsolidity/semanticTests/state/msg_sig.sol
deleted file mode 100644
index f2f26e24567f..000000000000
--- a/test/libsolidity/semanticTests/state/msg_sig.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (bytes4) {
-        return msg.sig;
-    }
-    function g() public returns (bytes4) {
-        return msg.sig;
-    }
-}
-// ----
-// f() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
-// g() -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/state/msg_value.sol b/test/libsolidity/semanticTests/state/msg_value.sol
deleted file mode 100644
index 143183b865a3..000000000000
--- a/test/libsolidity/semanticTests/state/msg_value.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public payable returns (uint) {
-        return msg.value;
-    }
-}
-// ----
-// f() -> 0
-// f(), 12 ether -> 12000000000000000000
diff --git a/test/libsolidity/semanticTests/state/tx_gasprice.sol b/test/libsolidity/semanticTests/state/tx_gasprice.sol
deleted file mode 100644
index 0d6dc6ae9c42..000000000000
--- a/test/libsolidity/semanticTests/state/tx_gasprice.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return tx.gasprice;
-    }
-}
-// ----
-// f() -> 3000000000
-// f() -> 3000000000
-// f() -> 3000000000
diff --git a/test/libsolidity/semanticTests/state/tx_origin.sol b/test/libsolidity/semanticTests/state/tx_origin.sol
deleted file mode 100644
index aa726c355262..000000000000
--- a/test/libsolidity/semanticTests/state/tx_origin.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (address) {
-        return tx.origin;
-    }
-}
-// ----
-// f() -> 0x9292929292929292929292929292929292929292
-// f() -> 0x9292929292929292929292929292929292929292
-// f() -> 0x9292929292929292929292929292929292929292
diff --git a/test/libsolidity/semanticTests/state/uncalled_blockhash.sol b/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
deleted file mode 100644
index 4e2526c72846..000000000000
--- a/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bytes32) {
-        return (blockhash)(block.number - 1);
-    }
-}
-// ----
-// f() -> 0x3737373737373737373737373737373737373737373737373737373737373738
diff --git a/test/libsolidity/semanticTests/state_var_initialization.sol b/test/libsolidity/semanticTests/state_var_initialization.sol
deleted file mode 100644
index a8b0f108a868..000000000000
--- a/test/libsolidity/semanticTests/state_var_initialization.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint public i = 1;
-    uint public k = 2;
-
-    constructor() {
-        i = i + i;
-        k = k - i;
-    }
-}
-// ----
-// i() -> 2
-// k() -> 0
diff --git a/test/libsolidity/semanticTests/state_variables_init_order.sol b/test/libsolidity/semanticTests/state_variables_init_order.sol
deleted file mode 100644
index 6f8a59c14d37..000000000000
--- a/test/libsolidity/semanticTests/state_variables_init_order.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    uint public x = 0;
-    uint y = f();
-    function f() public returns (uint256) {
-        ++x;
-        return 42;
-    }
-}
-contract B is A {
-}
-// ----
-// x() -> 1
diff --git a/test/libsolidity/semanticTests/state_variables_init_order_2.sol b/test/libsolidity/semanticTests/state_variables_init_order_2.sol
deleted file mode 100644
index 9003898e6129..000000000000
--- a/test/libsolidity/semanticTests/state_variables_init_order_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-    uint public x = 0;
-    uint y = f();
-    function f() public returns (uint256) {
-        ++x;
-        return 42;
-    }
-}
-contract B is A {
-    uint public z;
-    constructor() {
-        z = x;
-    }
-}
-// ----
-// z() -> 1
diff --git a/test/libsolidity/semanticTests/state_variables_init_order_3.sol b/test/libsolidity/semanticTests/state_variables_init_order_3.sol
deleted file mode 100644
index 0a0aad59b8f1..000000000000
--- a/test/libsolidity/semanticTests/state_variables_init_order_3.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract A {
-    uint public a = 42;
-    uint public b;
-    uint public c;
-    constructor(uint x) {
-        b = a;
-        a = x;
-    }
-    function f(uint x) public returns (uint256) { c = x * 3;  return 23; }
-}
-contract B is A {
-    uint public d = f(a);
-    uint public e = b;
-    uint public b_a;
-    uint public b_b;
-    uint public b_c;
-    constructor() A(17) { b_a = a; b_b = b; b_c = c; }
-}
-// ====
-// compileViaYul: true
-// ----
-// a() -> 17
-// b() -> 42
-// c() -> 51
-// b_a() -> 17
-// b_b() -> 42
-// b_c() -> 51
-// d() -> 23
-// e() -> 42
diff --git a/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol b/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
deleted file mode 100644
index 76f2bc4ae6e4..000000000000
--- a/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    function f() public pure returns(uint r) {
-        uint i = 0;
-        do
-        {
-            if (i > 0) return 0;
-            i++;
-            continue;
-        } while (false);
-        return 42;
-    }
-}
-// ----
-// f() -> 42
diff --git a/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol b/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
deleted file mode 100644
index f309bcf167fa..000000000000
--- a/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract test {
-    mapping(uint => uint[8]) public data;
-    mapping(uint => uint[]) public dynamicData;
-    constructor() {
-        data[2][2] = 8;
-        for (uint i = 0; i < 3; i++)
-            dynamicData[2].push();
-        dynamicData[2][2] = 8;
-    }
-}
-// ----
-// data(uint256,uint256): 2, 2 -> 8
-// data(uint256,uint256): 2, 8 -> FAILURE # NB: the original code contained a bug here #
-// dynamicData(uint256,uint256): 2, 2 -> 8
-// dynamicData(uint256,uint256): 2, 8 -> FAILURE
diff --git a/test/libsolidity/semanticTests/storage/array_accessor.sol b/test/libsolidity/semanticTests/storage/array_accessor.sol
deleted file mode 100644
index 599931a372c7..000000000000
--- a/test/libsolidity/semanticTests/storage/array_accessor.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract test {
-    uint[8] public data;
-    uint[] public dynamicData;
-    uint24[] public smallTypeData;
-    struct st { uint a; uint[] finalArray; }
-    mapping(uint256 => mapping(uint256 => st[5])) public multiple_map;
-
-    constructor() {
-        data[0] = 8;
-
-        dynamicData.push();
-        dynamicData.push();
-        dynamicData.push(8);
-
-        smallTypeData = new uint24[](128);
-        smallTypeData[1] = 22;
-        smallTypeData[127] = 2;
-
-        multiple_map[2][1][2].a = 3;
-        for (uint i = 0; i < 4; i++)
-            multiple_map[2][1][2].finalArray.push();
-        multiple_map[2][1][2].finalArray[3] = 5;
-    }
-}
-// ----
-// data(uint256): 0 -> 8
-// data(uint256): 8 -> FAILURE
-// dynamicData(uint256): 2 -> 8
-// dynamicData(uint256): 8 -> FAILURE
-// smallTypeData(uint256): 1 -> 22
-// smallTypeData(uint256): 127 -> 2
-// smallTypeData(uint256): 128 -> FAILURE
-// multiple_map(uint256,uint256,uint256): 2, 1, 2 -> 3
diff --git a/test/libsolidity/semanticTests/storage/chop_sign_bits.sol b/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
deleted file mode 100644
index 51cba0261264..000000000000
--- a/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract Test {
-    int16[] public x = [-1, -2];
-    int16[2] public y = [-5, -6];
-    int16 z;
-    function f() public returns (int16[] memory) {
-        int8[] memory t = new int8[](2);
-        t[0] = -3;
-        t[1] = -4;
-        x = t;
-        return x;
-    }
-    function g() public returns (int16[2] memory) {
-        int8[2] memory t = [-3, -4];
-        y = t;
-        return y;
-    }
-    function h(int8 t) public returns (int16) {
-        z = t;
-        return z;
-    }
-}
-// ----
-// x(uint256): 0 -> -1
-// x(uint256): 1 -> -2
-// y(uint256): 0 -> -5
-// y(uint256): 1 -> -6
-// f() -> 0x20, 2, -3, -4
-// g() -> -3, -4
-// h(int8): -10 -> -10
diff --git a/test/libsolidity/semanticTests/storage/complex_accessors.sol b/test/libsolidity/semanticTests/storage/complex_accessors.sol
deleted file mode 100644
index 59ad86a1a948..000000000000
--- a/test/libsolidity/semanticTests/storage/complex_accessors.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test {
-    mapping(uint256 => bytes4) public to_string_map;
-    mapping(uint256 => bool) public to_bool_map;
-    mapping(uint256 => uint256) public to_uint_map;
-    mapping(uint256 => mapping(uint256 => uint256)) public to_multiple_map;
-    constructor() {
-        to_string_map[42] = "24";
-        to_bool_map[42] = false;
-        to_uint_map[42] = 12;
-        to_multiple_map[42][23] = 31;
-    }
-}
-// ----
-// to_string_map(uint256): 42 -> "24"
-// to_bool_map(uint256): 42 -> false
-// to_uint_map(uint256): 42 -> 12
-// to_multiple_map(uint256,uint256): 42, 23 -> 31
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
deleted file mode 100644
index 5f32421657cd..000000000000
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract Test {
-    bytes x;
-    function set(bytes memory _a) public { x = _a; }
-}
-// ----
-// set(bytes): 0x20, 3, "abc"
-// storageEmpty -> 0
-// set(bytes): 0x20, 0
-// storageEmpty -> 1
-// set(bytes): 0x20, 31, "1234567890123456789012345678901"
-// storageEmpty -> 0
-// set(bytes): 0x20, 36, "12345678901234567890123456789012", "XXXX"
-// storageEmpty -> 0
-// set(bytes): 0x20, 3, "abc"
-// storageEmpty -> 0
-// set(bytes): 0x20, 0
-// storageEmpty -> 1
-// set(bytes): 0x20, 3, "abc"
-// storageEmpty -> 0
-// set(bytes): 0x20, 36, "12345678901234567890123456789012", "XXXX"
-// storageEmpty -> 0
-// set(bytes): 0x20, 0
-// storageEmpty -> 1
-// set(bytes): 0x20, 66, "12345678901234567890123456789012", "12345678901234567890123456789012", "12"
-// gas irOptimized: 111886
-// gas legacy: 112734
-// gas legacyOptimized: 112115
-// storageEmpty -> 0
-// set(bytes): 0x20, 3, "abc"
-// storageEmpty -> 0
-// set(bytes): 0x20, 0
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/storage/mapping_state.sol b/test/libsolidity/semanticTests/storage/mapping_state.sol
deleted file mode 100644
index 9059e72d0c5a..000000000000
--- a/test/libsolidity/semanticTests/storage/mapping_state.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract Ballot {
-	mapping(address => bool) canVote;
-	mapping(address => uint) voteCount;
-	mapping(address => bool) voted;
-	function getVoteCount(address addr) public returns (uint retVoteCount) {
-		return voteCount[addr];
-	}
-	function grantVoteRight(address addr) public {
-		canVote[addr] = true;
-	}
-	function vote(address voter, address vote) public returns (bool success) {
-		if (!canVote[voter] || voted[voter]) return false;
-		voted[voter] = true;
-		voteCount[vote] = voteCount[vote] + 1;
-		return true;
-	}
-}
-// ----
-// getVoteCount(address): 0 -> 0
-// getVoteCount(address): 1 -> 0
-// getVoteCount(address): 2 -> 0
-// vote(address,address): 0, 2 -> false
-// getVoteCount(address): 0 -> 0
-// getVoteCount(address): 1 -> 0
-// getVoteCount(address): 2 -> 0
-// grantVoteRight(address): 0 ->
-// grantVoteRight(address): 1 ->
-// vote(address,address): 0, 2 -> true
-// getVoteCount(address): 0 -> 0
-// getVoteCount(address): 1 -> 0
-// getVoteCount(address): 2 -> 1
-// vote(address,address): 0, 1 -> false
-// getVoteCount(address): 0 -> 0
-// getVoteCount(address): 1 -> 0
-// getVoteCount(address): 2 -> 1
-// vote(address,address): 2, 1 -> false
-// getVoteCount(address): 0 -> 0
-// getVoteCount(address): 1 -> 0
-// getVoteCount(address): 2 -> 1
-// grantVoteRight(address): 2 ->
-// vote(address,address): 2, 1 -> true
-// getVoteCount(address): 0 -> 0
-// getVoteCount(address): 1 -> 1
-// getVoteCount(address): 2 -> 1
diff --git a/test/libsolidity/semanticTests/storage/mapping_string_key.sol b/test/libsolidity/semanticTests/storage/mapping_string_key.sol
deleted file mode 100644
index be7516926d89..000000000000
--- a/test/libsolidity/semanticTests/storage/mapping_string_key.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    mapping (string => uint) m_nameToRecord;
-    function set(string calldata key, uint value) external {
-        m_nameToRecord[key] = value;
-    }
-    function get(string calldata key) external view returns (uint) {
-        return m_nameToRecord[key];
-    }
-    function setFixed(uint value) external {
-        m_nameToRecord["fixed"] = value;
-    }
-    function getFixed() external view returns (uint) {
-        return m_nameToRecord["fixed"];
-    }
-}
-// ----
-// set(string,uint256): 0x40, 8, 3, "abc" ->
-// get(string): 0x20, 3, "abc" -> 8
-// get(string): 0x20, 3, "abe" -> 0
-// getFixed() -> 0
-// setFixed(uint256): 9 ->
-// getFixed() -> 9
diff --git a/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol b/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
deleted file mode 100644
index f4407bb6ca30..000000000000
--- a/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-	mapping (uint => uint)[][] a;
-
-	function n1(uint key, uint value) public {
-		a.push();
-		mapping (uint => uint)[] storage b = a[a.length - 1];
-		b.push();
-		b[b.length - 1][key] = value;
-	}
-
-	function n2() public {
-		a.push();
-		mapping (uint => uint)[] storage b = a[a.length - 1];
-		b.push();
-	}
-
-	function map(uint key) public view returns (uint) {
-		mapping (uint => uint)[] storage b = a[a.length - 1];
-		return b[b.length - 1][key];
-	}
-
-	function p() public {
-		a.pop();
-	}
-
-	function d() public returns (uint) {
-		delete a;
-		return a.length;
-	}
-}
-// ----
-// n1(uint256,uint256): 42, 64 ->
-// map(uint256): 42 -> 64
-// p() ->
-// n2() ->
-// map(uint256): 42 -> 64
-// d() -> 0
-// n2() ->
-// map(uint256): 42 -> 64
diff --git a/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol b/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
deleted file mode 100644
index 97390057637b..000000000000
--- a/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-	mapping (uint => uint)[] a;
-
-	function n1(uint key, uint value) public {
-		a.push();
-		a[a.length - 1][key] = value;
-	}
-
-	function n2() public {
-		a.push();
-	}
-
-	function map(uint key) public view returns (uint) {
-		return a[a.length - 1][key];
-	}
-
-	function p() public {
-		a.pop();
-	}
-
-	function d() public returns (uint) {
-		delete a;
-		return a.length;
-	}
-}
-// ----
-// n1(uint256,uint256): 42, 64 ->
-// map(uint256): 42 -> 64
-// p() ->
-// n2() ->
-// map(uint256): 42 -> 64
-// d() -> 0
-// n2() ->
-// map(uint256): 42 -> 64
diff --git a/test/libsolidity/semanticTests/storage/packed_functions.sol b/test/libsolidity/semanticTests/storage/packed_functions.sol
deleted file mode 100644
index 564a3fabf355..000000000000
--- a/test/libsolidity/semanticTests/storage/packed_functions.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract C {
-    // these should take the same slot
-    function() internal returns (uint) a;
-    function() external returns (uint) b;
-    function() external returns (uint) c;
-    function() internal returns (uint) d;
-    uint8 public x;
-
-    function set() public {
-        x = 2;
-        d = g;
-        c = this.h;
-        b = this.h;
-        a = g;
-    }
-
-    function t1() public returns (uint256) {
-        return a();
-    }
-
-    function t2() public returns (uint256) {
-        return b();
-    }
-
-    function t3() public returns (uint256) {
-        return a();
-    }
-
-    function t4() public returns (uint256) {
-        return b();
-    }
-
-    function g() public returns (uint256) {
-        return 7;
-    }
-
-    function h() public returns (uint256) {
-        return 8;
-    }
-}
-// ----
-// set() ->
-// t1() -> 7
-// t2() -> 8
-// t3() -> 7
-// t4() -> 8
-// x() -> 2
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol b/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
deleted file mode 100644
index af2ecc70c9d5..000000000000
--- a/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint16 x = 0x1234;
-    uint16 a = 0xffff;
-    uint16 b;
-
-    function f() public returns (uint256, uint256, uint256, uint256) {
-        unchecked { a++; }
-        uint256 c = b;
-        delete b;
-        unchecked { a -= 2; }
-        return (x, c, b, a);
-    }
-}
-// ----
-// f() -> 0x1234, 0x0, 0x0, 0xfffe
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_signed.sol b/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
deleted file mode 100644
index 92cb82c90c6f..000000000000
--- a/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    int8 a;
-    uint8 b;
-    int8 c;
-    uint8 d;
-
-    function test()
-        public
-        returns (uint256 x1, uint256 x2, uint256 x3, uint256 x4)
-    {
-        a = -2;
-        unchecked {
-            b = (0 - uint8(a)) * 2;
-            c = a * int8(120) * int8(121);
-        }
-        x1 = uint256(int256(a));
-        x2 = b;
-        x3 = uint256(int256(c));
-        x4 = d;
-    }
-}
-// ----
-// test() -> -2, 4, -112, 0
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
deleted file mode 100644
index 2c29abc79bb0..000000000000
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract C {
-    struct s1 {
-        bytes1 a;
-        bytes1 b;
-        bytes10 c;
-        bytes9 d;
-        bytes10 e;
-    }
-    struct s2 {
-        bytes1 a;
-        s1 inner;
-        bytes1 b;
-        bytes1 c;
-    }
-    bytes1 x;
-    s2 data;
-    bytes1 y;
-
-    function test() public returns (bool) {
-        x = 0x01;
-        data.a = 0x02;
-        data.inner.a = 0x03;
-        data.inner.b = 0x04;
-        data.inner.c = "1234567890";
-        data.inner.d = "123456789";
-        data.inner.e = "abcdefghij";
-        data.b = 0x05;
-        data.c = bytes1(0x06);
-        y = 0x07;
-        return
-            x == 0x01 &&
-            data.a == 0x02 &&
-            data.inner.a == 0x03 &&
-            data.inner.b == 0x04 &&
-            data.inner.c == "1234567890" &&
-            data.inner.d == "123456789" &&
-            data.inner.e == "abcdefghij" &&
-            data.b == 0x05 &&
-            data.c == bytes1(0x06) &&
-            y == 0x07;
-    }
-}
-// ----
-// test() -> true
-// gas irOptimized: 132493
-// gas legacy: 136009
-// gas legacyOptimized: 133478
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
deleted file mode 100644
index cda71d33da9f..000000000000
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    enum small {A, B, C, D}
-    enum larger {A, B, C, D, E}
-    struct str {
-        small a;
-        small b;
-        larger c;
-        larger d;
-    }
-    str data;
-
-    function test() public returns (uint256) {
-        data.a = small.B;
-        if (data.a != small.B) return 2;
-        data.b = small.C;
-        if (data.b != small.C) return 3;
-        data.c = larger.D;
-        if (data.c != larger.D) return 4;
-        if (data.a != small.B) return 5;
-        data.a = small.C;
-        if (data.a != small.C) return 6;
-        if (data.b != small.C) return 7;
-        data.b = small.D;
-        if (data.b != small.D) return 8;
-        if (data.c != larger.D) return 9;
-        data.c = larger.B;
-        if (data.c != larger.B) return 10;
-        return 1;
-    }
-}
-// ----
-// test() -> 1
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
deleted file mode 100644
index ea3c03d64426..000000000000
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    struct str {
-        uint8 a;
-        uint16 b;
-        uint248 c;
-    }
-    str data;
-
-    function test() public returns (uint256) {
-        data.a = 2;
-        if (data.a != 2) return 2;
-        data.b = 0xabcd;
-        if (data.b != 0xabcd) return 3;
-        data.c = 0x1234567890;
-        if (data.c != 0x1234567890) return 4;
-        if (data.a != 2) return 5;
-        data.a = 8;
-        if (data.a != 8) return 6;
-        if (data.b != 0xabcd) return 7;
-        data.b = 0xdcab;
-        if (data.b != 0xdcab) return 8;
-        if (data.c != 0x1234567890) return 9;
-        data.c = 0x9876543210;
-        if (data.c != 0x9876543210) return 10;
-        return 1;
-    }
-}
-// ----
-// test() -> 1
diff --git a/test/libsolidity/semanticTests/storage/simple_accessor.sol b/test/libsolidity/semanticTests/storage/simple_accessor.sol
deleted file mode 100644
index 7aaeb4dbb98c..000000000000
--- a/test/libsolidity/semanticTests/storage/simple_accessor.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    uint256 public data;
-    constructor() {
-        data = 8;
-    }
-}
-// ----
-// data() -> 8
diff --git a/test/libsolidity/semanticTests/storage/state_smoke_test.sol b/test/libsolidity/semanticTests/storage/state_smoke_test.sol
deleted file mode 100644
index 1b464531b523..000000000000
--- a/test/libsolidity/semanticTests/storage/state_smoke_test.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract test {
-    uint256 value1;
-    uint256 value2;
-    function get(uint8 which) public returns (uint256 value) {
-        if (which == 0) return value1;
-        else return value2;
-    }
-    function set(uint8 which, uint256 value) public {
-        if (which == 0) value1 = value;
-        else value2 = value;
-    }
-}
-// ----
-// get(uint8): 0x00 -> 0
-// get(uint8): 0x01 -> 0
-// set(uint8,uint256): 0x00, 0x1234 ->
-// set(uint8,uint256): 0x01, 0x8765 ->
-// get(uint8): 0x00 -> 0x1234
-// get(uint8): 0x01 -> 0x8765
-// set(uint8,uint256): 0x00, 0x03 ->
-// get(uint8): 0x00 -> 0x03
diff --git a/test/libsolidity/semanticTests/storage/struct_accessor.sol b/test/libsolidity/semanticTests/storage/struct_accessor.sol
deleted file mode 100644
index 8d8fc178cf8f..000000000000
--- a/test/libsolidity/semanticTests/storage/struct_accessor.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    struct Data { uint a; uint8 b; mapping(uint => uint) c; bool d; }
-    mapping(uint => Data) public data;
-    constructor() {
-        data[7].a = 1;
-        data[7].b = 2;
-        data[7].c[0] = 3;
-        data[7].d = true;
-    }
-}
-// ----
-// data(uint256): 7 -> 1, 2, true
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
deleted file mode 100644
index 304ccecb4e66..000000000000
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(string memory a, string memory b) public returns (string memory) {
-        return string.concat(a, b);
-    }
-}
-// ----
-// f(string,string): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
-// f(string,string): 0x40, 0xa0, 64, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x45, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
-// f(string,string): 0x40, 0x80, 3, "abc", 3, "def" -> 0x20, 6, "abcdef"
-// f(string,string): 0x40, 0xa0, 34, "abcdabcdabcdabcdabcdabcdabcdabcd", "ab", 30, "cdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x40, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364
-// f(string,string): 0x40, 0xa0, 34, "abcdabcdabcdabcdabcdabcdabcdabcd", "ab", 34, "cdabcdabcdabcdabcdabcdabcdabcdab", "cd" -> 0x20, 0x44, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364, 44048183293808120317390542201052832727062033572611867748297851798484192067584
-// f(string,string): 0x40, 0x80, 3, "abc", 30, "dabcdabcdabcdabcdabcdabcdabcda" -> 0x20, 0x21, 0x6162636461626364616263646162636461626364616263646162636461626364, 43874346312576839672212443538448152585028080127215369968075725190498334277632
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
deleted file mode 100644
index 0891e30c9a43..000000000000
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C{
-    string s = "bcdef";
-
-    function f(string memory a) public returns (string memory) {
-        return string.concat(a, "bcdef");
-    }
-    function g(string calldata a) public returns (string memory) {
-        return string.concat(a, "abcdefghabcdefghabcdefghabcdefghab");
-    }
-    function h(string calldata a) public returns (string memory) {
-        return string.concat(a, s);
-    }
-    function j(string calldata a) public returns (string memory) {
-        string storage ref = s;
-        return string.concat(a, ref, s);
-    }
-    function k(string calldata a, bytes memory b) public returns (string memory) {
-        return string.concat(a, string(b));
-    }
-    function slice(string calldata a) public returns (string memory) {
-        require(bytes(a).length > 2, "");
-        return string.concat(a[:2], a[2:]);
-    }
-    function strParam(bytes calldata a) public returns (string memory) {
-        return string.concat(string(a), "bcdef");
-    }
-}
-// ----
-// f(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
-// g(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x42, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636465666768616263646566676861626364656667686162636465666768, 44047497324925121336511606693520958599579173549109180625971642598225011015680
-// h(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
-// j(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x2a, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928944786876717917111204727192787026596791669343131645116682757734400
-// k(string,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
-// slice(string): 0x20, 4, "abcd" -> 0x20, 4, "abcd"
-// strParam(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
deleted file mode 100644
index 0297bd26f125..000000000000
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        return string.concat();
-    }
-}
-// ----
-// f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
deleted file mode 100644
index b90235b3f83f..000000000000
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        string memory b = "";
-        return string.concat(
-            string.concat(b),
-            string.concat(b, b),
-            string.concat("", b),
-            string.concat(b, "")
-        );
-    }
-
-    function g() public returns (string memory) {
-        return string.concat("", "abc", hex"", "abc", unicode"");
-    }
-
-    function h() public returns (string memory) {
-        string memory b = "";
-        return string.concat(b, "abc", b, "abc", b);
-    }
-}
-// ----
-// f() -> 0x20, 0
-// g() -> 0x20, 6, "abcabc"
-// h() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
deleted file mode 100644
index ce594b6a5ae4..000000000000
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(string memory a, string memory b, string memory c) public returns (string memory) {
-        return string.concat(string.concat(a, b), c);
-    }
-}
-// ----
-// f(string,string,string): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/semanticTests/strings/constant_string_literal.sol b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
deleted file mode 100644
index 817a9081f967..000000000000
--- a/test/libsolidity/semanticTests/strings/constant_string_literal.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract Test {
-    bytes32 constant public b = "abcdefghijklmnopq";
-    string constant public x = "abefghijklmnopqabcdefghijklmnopqabcdefghijklmnopqabca";
-
-    constructor() {
-        string memory xx = x;
-        bytes32 bb = b;
-    }
-    function getB() public returns (bytes32) { return b; }
-    function getX() public returns (string memory) { return x; }
-    function getX2() public returns (string memory r) { r = x; }
-    function unused() public returns (uint) {
-        "unusedunusedunusedunusedunusedunusedunusedunusedunusedunusedunusedunused";
-        return 2;
-    }
-}
-// ----
-// b() -> 0x6162636465666768696a6b6c6d6e6f7071000000000000000000000000000000
-// x() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
-// getB() -> 0x6162636465666768696a6b6c6d6e6f7071000000000000000000000000000000
-// getX() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
-// getX2() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
-// unused() -> 2
diff --git a/test/libsolidity/semanticTests/strings/empty_storage_string.sol b/test/libsolidity/semanticTests/strings/empty_storage_string.sol
deleted file mode 100644
index 70d85f24b4b0..000000000000
--- a/test/libsolidity/semanticTests/strings/empty_storage_string.sol
+++ /dev/null
@@ -1,100 +0,0 @@
-contract C {
-
-    string uninitializedString;
-    string emptyString = "";
-    string nonEmptyString = "This is a non empty string";
-    string nonEmptyString2 = "Another string";
-    bytes uninitializedBytes;
-    bytes emptyBytes = "";
-    error EmptyError(string);
-    event EmptyEvent(string);
-
-    function f() public returns (string memory) {
-        return uninitializedString;
-    }
-
-    function g() public returns (string memory, string memory) {
-        return (uninitializedString, emptyString);
-    }
-
-    function h() public returns (string memory, string memory) {
-        return (uninitializedString, nonEmptyString);
-    }
-
-    function i() public returns (string memory, string memory) {
-        return (nonEmptyString, emptyString);
-    }
-
-    function j(string calldata _s) public returns (string memory) {
-        return _s;
-    }
-
-    function k() public returns (string memory) {
-        nonEmptyString2 = "";
-        return nonEmptyString2;
-    }
-
-    function l(string calldata _s) public returns (bytes memory) {
-        return abi.encode(_s);
-    }
-
-    function m() public returns (string memory) {
-        bytes memory b = abi.encode(emptyString);
-        return string(b);
-    }
-
-    function n() public {
-        revert EmptyError(uninitializedString);
-    }
-
-    function o() public {
-        emit EmptyEvent(emptyString);
-    }
-
-    function p() public {
-        emit EmptyEvent("");
-    }
-
-    function q() public returns (bytes memory) {
-        return uninitializedBytes;
-    }
-
-    function r() public returns (bytes memory) {
-        emptyBytes = abi.encode("");
-        return emptyBytes;
-    }
-
-    function s() public returns (bytes memory) {
-        emptyBytes = abi.encode(uninitializedString);
-        return emptyBytes;
-    }
-
-    function set(string calldata _s) public {
-        nonEmptyString = _s;
-    }
-
-    function get() public returns (string memory) {
-        return nonEmptyString;
-    }
-}
-// ====
-// compileViaYul: also
-// ----
-// f() -> 0x20, 0
-// g() -> 0x40, 0x60, 0, 0
-// h() -> 0x40, 0x60, 0, 0x1a, 38178759162904981154304545770567765692299154484752076569098748838215919075328
-// i() -> 0x40, 0x80, 0x1a, 38178759162904981154304545770567765692299154484752076569098748838215919075328, 0
-// j(string): 0x20, 0, "" -> 0x20, 0
-// k() -> 0x20, 0
-// l(string): 0x20, 0, "" -> 0x20, 0x40, 0x20, 0
-// m() -> 0x20, 0x40, 0x20, 0
-// n() -> FAILURE, hex"d3f13430", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000000"
-// o() ->
-// ~ emit EmptyEvent(string): 0x20, 0x00
-// p() ->
-// ~ emit EmptyEvent(string): 0x20, 0x00
-// q() -> 0x20, 0
-// r() -> 0x20, 0x40, 0x20, 0
-// s() -> 0x20, 0x40, 0x20, 0
-// set(string): 0x20, 0, "" ->
-// get() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/empty_string.sol b/test/libsolidity/semanticTests/strings/empty_string.sol
deleted file mode 100644
index f023c7236913..000000000000
--- a/test/libsolidity/semanticTests/strings/empty_string.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns (string memory) {
-        return "";
-    }
-}
-// ----
-// f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/empty_string_input.sol b/test/libsolidity/semanticTests/strings/empty_string_input.sol
deleted file mode 100644
index bd9fbc85fdd9..000000000000
--- a/test/libsolidity/semanticTests/strings/empty_string_input.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f() public pure returns (string memory) {
-        return "";
-    }
-    function g(string calldata msg) public pure returns (string memory) {
-        return msg;
-    }
-    function h(string calldata msg, uint256 v) public pure returns (string memory, uint256) {
-        return (msg, v);
-    }
-    // Adjusting order of input/output intentionally.
-    function i(string calldata msg1, uint256 v, string calldata msg2) public pure returns (string memory, string memory, uint256) {
-        return (msg1, msg2, v);
-    }
-    function j(string calldata msg1, uint256 v) public pure returns (string memory, string memory, uint256) {
-        return (msg1, "", v);
-    }
-}
-// ----
-// f() -> 0x20, 0
-// g(string): 0x20, 0, "" -> 0x20, 0
-// g(string): 0x20, 0 -> 0x20, 0
-// h(string,uint256): 0x40, 0x888, 0, "" -> 0x40, 0x0888, 0
-// h(string,uint256): 0x40, 0x888, 0 -> 0x40, 0x0888, 0
-// i(string,uint256,string): 0x60, 0x888, 0x60, 0, "" -> 0x60, 0x80, 0x0888, 0, 0
-// i(string,uint256,string): 0x60, 0x888, 0x60, 0 -> 0x60, 0x80, 0x0888, 0, 0
-// j(string,uint256): 0x40, 0x888, 0, "" -> 0x60, 0x80, 0x0888, 0, 0
-// j(string,uint256): 0x40, 0x888, 0 -> 0x60, 0x80, 0x0888, 0, 0
diff --git a/test/libsolidity/semanticTests/strings/return_string.sol b/test/libsolidity/semanticTests/strings/return_string.sol
deleted file mode 100644
index 704a7859cdd5..000000000000
--- a/test/libsolidity/semanticTests/strings/return_string.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Main {
-    string public s;
-    function set(string calldata _s) external {
-        s = _s;
-    }
-    function get1() public returns (string memory r) {
-        return s;
-    }
-    function get2() public returns (string memory r) {
-        r = s;
-    }
-}
-// ----
-// set(string): 0x20, 5, "Julia" ->
-// get1() -> 0x20, 5, "Julia"
-// get2() -> 0x20, 5, "Julia"
-// s() -> 0x20, 5, "Julia"
diff --git a/test/libsolidity/semanticTests/strings/string_escapes.sol b/test/libsolidity/semanticTests/strings/string_escapes.sol
deleted file mode 100644
index ea178d645e47..000000000000
--- a/test/libsolidity/semanticTests/strings/string_escapes.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "\t\n\r\'\"\\";
-        return escapeCharacters;
-    }
-}
-// ----
-// f() -> 0x090a0d27225c0000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/strings/unicode_escapes.sol b/test/libsolidity/semanticTests/strings/unicode_escapes.sol
deleted file mode 100644
index 401d8b61e4ec..000000000000
--- a/test/libsolidity/semanticTests/strings/unicode_escapes.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function oneByteUTF8() public pure returns (string memory) {
-        return "aaa\u0024aaa"; // usdollar
-    }
-
-    function twoBytesUTF8() public pure returns (string memory) {
-        return "aaa\u00A2aaa"; // cent
-    }
-
-    function threeBytesUTF8() public pure returns (string memory) {
-        return "aaa\u20ACaaa"; // euro
-    }
-
-    function combined() public pure returns (string memory) {
-        return "\u0024\u00A2\u20AC";
-    }
-}
-// ----
-// oneByteUTF8() -> 0x20, 7, "aaa$aaa"
-// twoBytesUTF8() -> 0x20, 8, "aaa\xc2\xa2aaa"
-// threeBytesUTF8() -> 0x20, 9, "aaa\xe2\x82\xacaaa"
-// combined() -> 0x20, 6, "$\xc2\xa2\xe2\x82\xac"
diff --git a/test/libsolidity/semanticTests/strings/unicode_string.sol b/test/libsolidity/semanticTests/strings/unicode_string.sol
deleted file mode 100644
index e06556fb5466..000000000000
--- a/test/libsolidity/semanticTests/strings/unicode_string.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure returns (string memory) {
-        return unicode"😃, 😭, and 😈";
-    }
-    function g() public pure returns (string memory) {
-        return unicode"😃, 😭,\
- and 😈";
-    }
-}
-// ----
-// f() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"
-// g() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"
diff --git a/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol b/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
deleted file mode 100644
index f5f53cc40d06..000000000000
--- a/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    struct RecursiveStruct {
-        RecursiveStruct[] vals;
-    }
-
-    function func() public pure {
-        RecursiveStruct[1] memory val = [ RecursiveStruct(new RecursiveStruct[](42)) ];
-        assert(val[0].vals.length == 42);
-    }
-}
-// ----
-// func() ->
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
deleted file mode 100644
index 425144403381..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint128 p1;
-        uint256[][2] a;
-        uint32 p2;
-    }
-
-    struct S1 {
-        uint128 u;
-        S s;
-    }
-
-    struct S2 {
-        S[2] array;
-    }
-
-    function f1(S1 calldata c) internal returns(S1 calldata) {
-        return c;
-    }
-
-    function f(S1 calldata c, uint32 p) external returns(uint32, uint128, uint256, uint256, uint32) {
-        S1 memory m = f1(c);
-        assert(m.s.a[0][0] == c.s.a[0][0]);
-        assert(m.s.a[1][1] == c.s.a[1][1]);
-        return (p, m.s.p1, m.s.a[0][0], m.s.a[1][1], m.s.p2);
-    }
-
-    function g(S2 calldata c) external returns(uint128, uint256, uint256, uint32) {
-        S2 memory m = c;
-        assert(m.array[0].a[0][0] == c.array[0].a[0][0]);
-        assert(m.array[0].a[1][1] == c.array[0].a[1][1]);
-        return (m.array[1].p1, m.array[1].a[0][0], m.array[1].a[1][1], m.array[1].p2);
-    }
-
-    function h(S1 calldata c, uint32 p) external returns(uint32, uint128, uint256, uint256, uint32) {
-        S memory m = c.s;
-        assert(m.a[0][0] == c.s.a[0][0]);
-        assert(m.a[1][1] == c.s.a[1][1]);
-        return (p, m.p1, m.a[0][0], m.a[1][1], m.p2);
-    }
-}
-// ----
-// f((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
-// g(((uint128,uint256[][2],uint32)[2])): 0x20, 0x20, 0x40, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 22, 1, 2, 33
-// h((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
deleted file mode 100644
index 418f9e93a8f6..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-
-    function f(S calldata s) external pure returns (uint256 a, uint256 b) {
-        a = s.a;
-        b = s.b;
-    }
-}
-// ----
-// f((uint256,uint256)): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
deleted file mode 100644
index 5bdd1b42fb94..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-
-    function f(uint256 a, S calldata s, uint256 b)
-        external
-        pure
-        returns (uint256, uint256, uint256, uint256)
-    {
-        return (a, s.a, s.b, b);
-    }
-}
-// ----
-// f(uint256,(uint256,uint256),uint256): 1, 2, 3, 4 -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
deleted file mode 100644
index 34d2bf476649..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder v2;
-
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256[2] b;
-        uint256 c;
-    }
-
-    function f(S calldata s)
-        external
-        pure
-        returns (uint256 a, uint256 b0, uint256 b1, uint256 c)
-    {
-        a = s.a;
-        b0 = s.b[0];
-        b1 = s.b[1];
-        c = s.c;
-    }
-}
-// ----
-// f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
deleted file mode 100644
index 14f770a35070..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint32 a;
-        uint256[] b;
-        uint64 c;
-    }
-
-    function f(S calldata s)
-        external
-        pure
-        returns (uint32 a, uint256 b0, uint256 b1, uint64 c)
-    {
-        a = s.a;
-        b0 = s.b[0];
-        b1 = s.b[1];
-        c = s.c;
-    }
-}
-// ----
-// f((uint32,uint256[],uint64)): 0x20, 42, 0x60, 23, 2, 1, 2 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
deleted file mode 100644
index 35d51d7b4e40..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma abicoder v2;
-
-struct S {
-    uint128 p1;
-    uint256[][2] a;
-    uint32 p2;
-}
-struct S1 {
-    uint128 u;
-    S s;
-}
-
-library L {
-    function f(S1 memory m, uint32 p) external returns(uint32, uint128, uint256, uint256, uint32) {
-        return (p, m.s.p1, m.s.a[0][0], m.s.a[1][1], m.s.p2);
-    }
-}
-
-contract C {
-
-    function f(S1 calldata c, uint32 p) external returns(uint32, uint128, uint256, uint256, uint32) {
-        return L.f(c, p);
-    }
-}
-// ----
-// library: L
-// f((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
deleted file mode 100644
index c43e6fb18fb9..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint128 p1;
-        uint256[][2] a;
-        uint32 p2;
-    }
-
-    function g(uint32 p1, S memory s) internal returns(uint32, uint128, uint256, uint256, uint32) {
-        s.p1++;
-        s.a[0][1]++;
-        return (p1, s.p1, s.a[0][0], s.a[1][1], s.p2);
-    }
-
-    function f(uint32 p1, S calldata c) external returns(uint32, uint128, uint256, uint256, uint32) {
-        return g(p1, c);
-    }
-}
-// ----
-// f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
deleted file mode 100644
index cc5288058995..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint64 a;
-        uint64 b;
-    }
-    struct S1 {
-        uint256 a;
-        S s;
-        uint256 c;
-    }
-
-    function f(S1 calldata s1)
-        external
-        pure
-        returns (uint256 a, uint64 b0, uint64 b1, uint256 c)
-    {
-        a = s1.a;
-        b0 = s1.s.a;
-        b1 = s1.s.b;
-        c = s1.c;
-    }
-}
-// ----
-// f((uint256,(uint64,uint64),uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
deleted file mode 100644
index 7c84a096f6ea..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint64 a;
-        bytes b;
-    }
-    struct S1 {
-        uint256 a;
-        S s;
-        uint256 c;
-    }
-
-    function f(S1 calldata s1)
-        external
-        pure
-        returns (uint256 a, uint64 b0, bytes1 b1, uint256 c)
-    {
-        a = s1.a;
-        b0 = s1.s.a;
-        b1 = s1.s.b[0];
-        c = s1.c;
-    }
-}
-// ----
-// f((uint256,(uint64,bytes),uint256)): 0x20, 42, 0x60, 23, 1, 0x40, 2, "ab" -> 42, 1, "a", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
deleted file mode 100644
index 3aeb0dcbca27..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256 b;
-        bytes2 c;
-    }
-
-    function f(S calldata s) external pure returns (uint256, uint256, bytes1) {
-        S memory m = s;
-        return (m.a, m.b, m.c[1]);
-    }
-}
-// ----
-// f((uint256,uint256,bytes2)): 42, 23, "ab" -> 42, 23, "b"
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
deleted file mode 100644
index 516179804021..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint128 p1;
-        uint256[][2] a;
-        uint32 p2;
-    }
-
-    function f(uint32 p1, S calldata c) external returns(uint32, uint128, uint256, uint256, uint32) {
-        S memory m;
-        uint32 p2;
-        (p2, m) = (p1, c);
-        m.p1++;
-        m.a[0][1]++;
-        return (p2, m.p1, m.a[0][0], m.a[1][1], m.p2);
-    }
-}
-// ----
-// f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
deleted file mode 100644
index 6b56a73c2ca8..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint256 a;
-        uint64 b;
-        bytes2 c;
-    }
-
-    uint[153] r;
-    S s;
-
-    function f(uint32 a, S calldata c, uint256 b) external returns (uint256, uint256, bytes1) {
-        s = c;
-        return (s.a, s.b, s.c[1]);
-    }
-}
-// ----
-// f(uint32,(uint256,uint64,bytes2),uint256): 1, 42, 23, "ab", 1 -> 42, 23, "b"
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
deleted file mode 100644
index b7b3058b4259..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint256 a;
-        uint256[2] b;
-        uint256 c;
-    }
-
-    function f(S calldata c)
-        external
-        pure
-        returns (uint256, uint256, uint256, uint256)
-    {
-        S memory m = c;
-        return (m.a, m.b[0], m.b[1], m.c);
-    }
-}
-// ----
-// f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
deleted file mode 100644
index 3fa7a33fda6e..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint256 a;
-        bytes b;
-        uint256 c;
-    }
-
-    function f(S calldata c)
-        external
-        pure
-        returns (uint256, bytes1, bytes1, uint256)
-    {
-        S memory m = c;
-        return (m.a, m.b[0], m.b[1], m.c);
-    }
-}
-// ----
-// f((uint256,bytes,uint256)): 0x20, 42, 0x60, 23, 2, "ab" -> 42, "a", "b", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
deleted file mode 100644
index b3c7f4695e66..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint128 p1;
-        uint256[][2] a;
-        uint32 p2;
-    }
-    function f(uint32 p1, S calldata c) external returns(uint32, uint128, uint256, uint256, uint32) {
-        S memory s = c;
-        assert(s.a[0][0] == c.a[0][0]);
-        assert(s.a[1][1] == c.a[1][1]);
-        s.p1++;
-        assert(s.p1 != c.p1);
-        s.a[0][1]++;
-        assert(s.a[0][1] != c.a[0][1]);
-        return (p1, s.p1, s.a[0][0], s.a[1][1], s.p2);
-    }
-}
-// ----
-// f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
deleted file mode 100644
index add42a8f3b18..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint128 p1;
-        uint256[][2] a;
-        uint32 p2;
-    }
-    S s;
-    function f(uint32 p1, S calldata c) external returns(uint32, uint128, uint256, uint256, uint32) {
-        s = c;
-        assert(s.a[0][0] == c.a[0][0]);
-        assert(s.a[1][1] == c.a[1][1]);
-        return (p1, s.p1, s.a[0][0], s.a[1][1], s.p2);
-    }
-}
-// ----
-// f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 202843
-// gas legacy: 207384
-// gas legacyOptimized: 203584
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
deleted file mode 100644
index b73077131295..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S1 {
-        uint256 a;
-        uint256 b;
-    }
-    struct S2 {
-        uint256 a;
-    }
-
-    function f(S1 calldata s1, S2 calldata s2, S1 calldata s3)
-        external
-        pure
-        returns (uint256 a, uint256 b, uint256 c, uint256 d, uint256 e)
-    {
-        a = s1.a;
-        b = s1.b;
-        c = s2.a;
-        d = s3.a;
-        e = s3.b;
-    }
-}
-// ----
-// f((uint256,uint256),(uint256),(uint256,uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol b/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
deleted file mode 100644
index 633c4c7b321f..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S2 { uint256 b; }
-	struct S { uint256 a; S2[] children; }
-	function f(S calldata s) external pure returns (uint256, uint256, uint256, uint256) {
-		return (s.children.length, s.a, s.children[0].b, s.children[1].b);
-	}
-}
-// ----
-// f((uint256,(uint256)[])): 32, 17, 64, 2, 23, 42 -> 2, 17, 23, 42
diff --git a/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol b/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
deleted file mode 100644
index 0dfa2cea3f53..000000000000
--- a/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S { uint256[] a; }
-	function f(S calldata s) external pure returns (uint256 a, uint256 b, uint256 c) {
-	    return (s.a.length, s.a[0], s.a[1]);
-	}
-}
-// ----
-// f((uint256[])): 32, 32, 2, 42, 23 -> 2, 42, 23
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
deleted file mode 100644
index 699836179be2..000000000000
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract CopyTest {
-    struct Tree {
-        Tree[] children;
-    }
-
-    Tree storageTree;
-    Tree[] children;
-
-    constructor() {
-        for (uint i = 0; i < 2; i++)
-            storageTree.children.push();
-        for (uint i = 0; i < 23; i++)
-            storageTree.children[0].children.push();
-        for (uint i = 0; i < 42; i++)
-            storageTree.children[1].children.push();
-    }
-
-    function run() public returns (uint256, uint256, uint256) {
-        Tree memory memoryTree;
-        memoryTree = storageTree;
-        return (memoryTree.children.length, memoryTree.children[0].children.length, memoryTree.children[1].children.length);
-    }
-}
-// ----
-// run() -> 2, 23, 42
-// gas irOptimized: 193677
-// gas legacy: 185731
-// gas legacyOptimized: 184458
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
deleted file mode 100644
index d14bff96961f..000000000000
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract CopyTest {
-    struct Tree {
-        uint256 data;
-        Tree[] children;
-    }
-    Tree storageTree;
-    Tree childStorageTree;
-
-    constructor() {
-        storageTree.data = 0x42;
-        for (uint i = 0; i < 2; i++)
-            storageTree.children.push(childStorageTree);
-        storageTree.children[0].data = 0x4200;
-        storageTree.children[1].data = 0x4201;
-        for (uint i = 0; i < 3; i++)
-            storageTree.children[0].children.push(childStorageTree);
-        for (uint i = 0; i < 3; i++)
-            storageTree.children[0].children[i].data = 0x420000 + i;
-        for (uint i = 0; i < 4; i++)
-            storageTree.children[1].children.push(childStorageTree);
-        for (uint i = 0; i < 4; i++)
-            storageTree.children[1].children[i].data = 0x420100 + i;
-    }
-
-    function countData(Tree memory tree) internal returns (uint256 c) {
-        c = 1;
-        for (uint i = 0; i < tree.children.length; i++) {
-            c += countData(tree.children[i]);
-        }
-    }
-
-    function copyFromTree(Tree memory tree, uint256[] memory data, uint256 offset) internal returns (uint256) {
-        data[offset++] = tree.data;
-        for (uint i = 0; i < tree.children.length; i++) {
-            offset = copyFromTree(tree.children[i], data, offset);
-        }
-        return offset;
-    }
-
-    function run() public returns (uint256[] memory) {
-        Tree memory memoryTree;
-        memoryTree = storageTree;
-        uint256 length = countData(memoryTree);
-        uint256[] memory result = new uint256[](length);
-        copyFromTree(memoryTree, result, 0);
-        return result;
-    }
-}
-// ----
-// run() -> 0x20, 10, 0x42, 0x4200, 0x420000, 0x420001, 0x420002, 0x4201, 0x420100, 0x420101, 0x420102, 0x420103
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
deleted file mode 100644
index 1d1783a16291..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        bytes b;
-        uint16[] a;
-        uint16 u;
-    }
-
-    constructor() {
-        uint16[] memory a = new uint16[](2);
-        a[0] = 13;
-        a[1] = 14;
-
-        m[7] = S({b: "foo", a: a, u: 7});
-    }
-
-    mapping (uint => S) m;
-    S s;
-
-    function to_state() public returns (S memory) {
-	s = m[7];
-        return s;
-    }
-
-    function to_storage() public returns (S memory) {
-        S storage sLocal = s;
-	sLocal = m[7];
-        return sLocal;
-    }
-
-    function to_memory() public returns (S memory) {
-	return m[7];
-    }
-
-}
-// ----
-// to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121481
-// gas legacy: 123069
-// gas legacyOptimized: 121756
-// to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
deleted file mode 100644
index b3d730453486..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_from_storage.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder v2;
-// Example from https://github.com/ethereum/solidity/issues/12558
-struct S {
-    uint x;
-}
-
-contract C {
-    S sStorage;
-    constructor() {
-        sStorage.x = 13;
-    }
-
-    function f() external returns (S[] memory) {
-        S[] memory sMemory = new S[](1);
-
-        sMemory[0] = sStorage;
-
-        return sMemory;
-    }
-}
-// ----
-// f() -> 0x20, 1, 13
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
deleted file mode 100644
index 937eeeaf437e..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ /dev/null
@@ -1,95 +0,0 @@
-pragma abicoder v2;
-
-struct S { uint value; }
-
-contract Test {
-    S[][] a;
-    S[] b;
-
-    constructor() {
-        a.push();
-        a[0].push(S(1));
-        a[0].push(S(2));
-        a[0].push(S(3));
-
-        b.push(S(4));
-        b.push(S(5));
-        b.push(S(6));
-        b.push(S(7));
-    }
-
-    function test1() external returns (bool) {
-        a.push();
-        a[1] = b;
-
-        assert(a.length == 2);
-        assert(a[0].length == 3);
-        assert(a[1].length == 4);
-        assert(a[1][0].value == 4);
-        assert(a[1][1].value == 5);
-        assert(a[1][2].value == 6);
-        assert(a[1][3].value == 7);
-
-        return true;
-    }
-
-    function test2() external returns (bool) {
-        S[][] memory temp = new S[][](2);
-
-        temp = a;
-
-        assert(temp.length == 2);
-        assert(temp[0].length == 3);
-        assert(temp[1].length == 4);
-        assert(temp[1][0].value == 4);
-        assert(temp[1][1].value == 5);
-        assert(temp[1][2].value == 6);
-        assert(temp[1][3].value == 7);
-
-        return true;
-    }
-
-    function test3() external returns (bool) {
-        S[][] memory temp = new S[][](2);
-
-        temp[0] = a[0];
-        temp[1] = a[1];
-
-        assert(temp.length == 2);
-        assert(temp[0].length == 3);
-        assert(temp[1].length == 4);
-        assert(temp[1][0].value == 4);
-        assert(temp[1][1].value == 5);
-        assert(temp[1][2].value == 6);
-        assert(temp[1][3].value == 7);
-
-        return true;
-    }
-
-    function test4() external returns (bool) {
-        S[][] memory temp = new S[][](2);
-
-        temp[0] = a[0];
-        temp[1] = b;
-
-        assert(temp.length == 2);
-        assert(temp[0].length == 3);
-        assert(temp[1].length == 4);
-        assert(temp[1][0].value == 4);
-        assert(temp[1][1].value == 5);
-        assert(temp[1][2].value == 6);
-        assert(temp[1][3].value == 7);
-
-        return true;
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// test1() -> true
-// gas irOptimized: 152882
-// gas legacy: 153012
-// gas legacyOptimized: 152637
-// test2() -> true
-// test3() -> true
-// test4() -> true
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
deleted file mode 100644
index 6c22c71da8c8..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[1] x;
-        uint8[] y;
-    }
-
-    function test(S calldata s) public returns (S memory) {
-        return s;
-    }
-}
-// ----
-// test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11 -> 0x20, 3, 0x40, 2, 7, 11
-// test((uint8[1],uint8[])): 0x20, 3, 0x40, 3, 17, 19, 23 -> 0x20, 3, 0x40, 3, 17, 19, 23
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
deleted file mode 100644
index dcf2a3a27720..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[1] x;
-        uint8[] y;
-    }
-
-    S s;
-
-    function test(S calldata src) public {
-        s = src;
-
-        require(s.x[0] == 3);
-        require(s.y.length == 2);
-        require(s.y[0] == 7);
-        require(s.y[1] == 11);
-    }
-}
-// ----
-// test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
deleted file mode 100644
index 3d132641f4f9..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[1] x;
-        uint8[] y;
-    }
-
-    function test(S memory s) public returns (S memory r) {
-        return r;
-    }
-}
-// ----
-// test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11 -> 0x20, 0, 0x40, 0
-// test((uint8[1],uint8[])): 0x20, 3, 0x40, 3, 17, 19, 23 -> 0x20, 0, 0x40, 0
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
deleted file mode 100644
index 880b7433dd2d..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    struct S {
-        uint8[1] x;
-        uint8[] y;
-    }
-
-    S src;
-    S dst;
-
-    constructor() {
-        src.x = [3];
-        src.y.push(7);
-        src.y.push(11);
-    }
-
-    function test() public {
-        dst = src;
-
-        require(dst.x[0] == 3);
-        require(dst.y.length == 2);
-        require(dst.y[0] == 7);
-        require(dst.y[1] == 11);
-    }
-}
-// ----
-// test()
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
deleted file mode 100644
index a1b0999ff5b1..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        bytes b;
-        uint16[] a;
-        uint16 u;
-    }
-
-    constructor() {
-        uint16[] memory a = new uint16[](2);
-        a[0] = 13;
-        a[1] = 14;
-
-        m[7] = S({b: "foo", a: a, u: 7});
-    }
-
-    mapping (uint => S) m;
-    S s;
-
-    function to_state() public returns (S memory) {
-	s.b = m[7].b;
-	s.a = m[7].a;
-	s.u = m[7].u;
-        return s;
-    }
-
-    function to_storage() public returns (S memory) {
-        S storage sLocal = s;
-	sLocal.b = m[7].b;
-	sLocal.a = m[7].a;
-	sLocal.u = m[7].u;
-        return sLocal;
-    }
-
-    function to_memory() public returns (S memory) {
-        S memory sLocal;
-        sLocal.b = m[7].b;
-        sLocal.a = m[7].a;
-        sLocal.u = m[7].u;
-	return sLocal;
-    }
-
-}
-// ----
-// to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121598
-// gas legacy: 123208
-// gas legacyOptimized: 121763
-// to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
deleted file mode 100644
index b88466113408..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        bytes b;
-        uint16[] a;
-        uint16 u;
-    }
-
-    S s;
-    constructor() {
-        uint16[] memory a = new uint16[](2);
-        a[0] = 13;
-        a[1] = 14;
-
-        s.b = "foo";
-        s.a = a;
-        s.u = 21;
-    }
-
-    mapping (uint => S) m;
-
-    function from_memory() public returns (S memory) {
-        S memory sMemory = s;
-        m[0].b = sMemory.b;
-        m[0].a = sMemory.a;
-        m[0].u = sMemory.u;
-        return m[0];
-    }
-
-    function from_state() public returns (S memory) {
-        m[1].b = s.b;
-        m[1].a = s.a;
-        m[1].u = s.u;
-        return m[1];
-    }
-
-    function from_storage() public returns (S memory) {
-        S storage sLocal = s;
-        m[1].b = sLocal.b;
-        m[1].a = sLocal.a;
-        m[1].u = sLocal.u;
-        return m[1];
-    }
-
-    function from_calldata(S calldata sCalldata) public returns (S memory) {
-        m[2].b = sCalldata.b;
-        m[2].a = sCalldata.a;
-        m[2].u = sCalldata.u;
-        return m[2];
-    }
-}
-// ----
-// from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 123039
-// gas legacy: 130227
-// gas legacyOptimized: 128758
-// from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121709
-// gas legacy: 123282
-// gas legacyOptimized: 121868
-// from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115130
-// gas legacy: 122516
-// gas legacyOptimized: 120804
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
deleted file mode 100644
index e6b569922c5f..000000000000
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        bytes b;
-        uint16[] a;
-        uint16 u;
-    }
-
-    S s;
-    constructor() {
-        uint16[] memory a = new uint16[](2);
-        a[0] = 13;
-        a[1] = 14;
-
-        s.b = "foo";
-        s.a = a;
-        s.u = 21;
-    }
-
-    mapping (uint => S) m;
-
-    function from_state() public returns (S memory) {
-        m[0] = s;
-        return m[0];
-    }
-
-    function from_storage() public returns (S memory) {
-        S storage sLocal = s;
-        m[1] = sLocal;
-        return m[1];
-    }
-
-    function from_memory() public returns (S memory) {
-        S memory sMemory = s;
-        m[2] = sMemory;
-        return m[2];
-    }
-
-
-    function from_calldata(S calldata sCalldata) public returns (S memory) {
-        m[3] = sCalldata;
-        return m[3];
-    }
-}
-// ----
-// from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121686
-// gas legacy: 123144
-// gas legacyOptimized: 121808
-// from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121731
-// gas legacy: 123193
-// gas legacyOptimized: 121860
-// from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122947
-// gas legacy: 130088
-// gas legacyOptimized: 128754
-// from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115045
-// gas legacy: 118301
-// gas legacyOptimized: 115432
diff --git a/test/libsolidity/semanticTests/structs/delete_struct.sol b/test/libsolidity/semanticTests/structs/delete_struct.sol
deleted file mode 100644
index 39a1cf429cb1..000000000000
--- a/test/libsolidity/semanticTests/structs/delete_struct.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-contract test {
-    struct topStruct {
-        nestedStruct nstr;
-        uint topValue;
-        mapping (uint => uint) topMapping;
-    }
-    uint toDelete;
-    topStruct str;
-    struct nestedStruct {
-        uint nestedValue;
-        mapping (uint => bool) nestedMapping;
-    }
-    constructor() {
-        toDelete = 5;
-        str.topValue = 1;
-        str.topMapping[0] = 1;
-        str.topMapping[1] = 2;
-
-        str.nstr.nestedValue = 2;
-        str.nstr.nestedMapping[0] = true;
-        str.nstr.nestedMapping[1] = false;
-        delete str;
-        delete toDelete;
-    }
-    function getToDelete() public returns (uint res){
-        res = toDelete;
-    }
-    function getTopValue() public returns(uint topValue){
-        topValue = str.topValue;
-    }
-    function getNestedValue() public returns(uint nestedValue){
-        nestedValue = str.nstr.nestedValue;
-    }
-    function getTopMapping(uint index) public returns(uint ret) {
-        ret = str.topMapping[index];
-    }
-    function getNestedMapping(uint index) public returns(bool ret) {
-        return str.nstr.nestedMapping[index];
-    }
-}
-// ----
-// getToDelete() -> 0
-// getTopValue() -> 0
-// getNestedValue() -> 0 #mapping values should be the same#
-// getTopMapping(uint256): 0 -> 1
-// getTopMapping(uint256): 1 -> 2
-// getNestedMapping(uint256): 0 -> true
-// getNestedMapping(uint256): 1 -> false
diff --git a/test/libsolidity/semanticTests/structs/event.sol b/test/libsolidity/semanticTests/structs/event.sol
deleted file mode 100644
index 5a96c7cfa52a..000000000000
--- a/test/libsolidity/semanticTests/structs/event.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v2;
-
-struct Item {uint x;}
-library L {
-    event Ev(Item);
-    function o() public { emit L.Ev(Item(1)); }
-}
-contract C {
-    function f() public {
-        L.o();
-    }
-}
-// ----
-// library: L
-// f() ->
-// ~ emit Ev((uint256)): 0x01
diff --git a/test/libsolidity/semanticTests/structs/function_type_copy.sol b/test/libsolidity/semanticTests/structs/function_type_copy.sol
deleted file mode 100644
index 6230d47f9b03..000000000000
--- a/test/libsolidity/semanticTests/structs/function_type_copy.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder v2;
-struct S {
-    function () external[] functions;
-}
-
-contract C {
-    function f(function () external[] calldata functions) external returns (S memory) {
-        S memory s;
-        s.functions = functions;
-        return s;
-    }
-}
-
-contract Test {
-    C immutable c = new C();
-
-    function test() external returns (bool) {
-        function() external[] memory functions = new function() external[](3);
-
-        functions[0] = this.random1;
-        functions[1] = this.random2;
-        functions[2] = this.random3;
-
-        S memory ret = c.f(functions);
-
-        assert(ret.functions.length == 3);
-        assert(ret.functions[0] == this.random1);
-        assert(ret.functions[1] == this.random2);
-        assert(ret.functions[2] == this.random3);
-
-        return true;
-    }
-    function random1() external {
-    }
-    function random2() external {
-    }
-    function random3() external {
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/structs/global.sol b/test/libsolidity/semanticTests/structs/global.sol
deleted file mode 100644
index 052122538eb9..000000000000
--- a/test/libsolidity/semanticTests/structs/global.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-struct S { uint256 a; uint256 b; }
-contract C {
-    function f(S calldata s) external pure returns (uint256, uint256) {
-        return (s.a, s.b);
-    }
-}
-// ----
-// f((uint256,uint256)): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol b/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
deleted file mode 100644
index 9434e40454f8..000000000000
--- a/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct s {
-        uint256 a;
-        uint256 b;
-    }
-
-    function f() public returns (uint256) {
-        s[7][]; // This is only the type, should not have any effect
-        return 3;
-    }
-}
-// ----
-// f() -> 3
diff --git a/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
deleted file mode 100644
index f844c08fac01..000000000000
--- a/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint256 a;
-        bool x;
-    }
-
-    function s() public returns(S memory)
-    {
-        return S({x: true, a: 8});
-    }
-}
-// ----
-// s() -> 8, true
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol b/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
deleted file mode 100644
index 96b9569920ea..000000000000
--- a/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract Test {
-    struct S {
-        uint8 x;
-        uint16 y;
-        uint256 z;
-    }
-
-    function test() public returns (uint256 x, uint256 y, uint256 z) {
-        S memory data = combine(1, 2, 3);
-        x = extract(data, 0);
-        y = extract(data, 1);
-        z = extract(data, 2);
-    }
-
-    function extract(S memory s, uint256 which) internal returns (uint256 x) {
-        if (which == 0) return s.x;
-        else if (which == 1) return s.y;
-        else return s.z;
-    }
-
-    function combine(uint8 x, uint16 y, uint256 z)
-        internal
-        returns (S memory s)
-    {
-        s.x = x;
-        s.y = y;
-        s.z = z;
-    }
-}
-// ----
-// test() -> 1, 2, 3
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
deleted file mode 100644
index e541fa975733..000000000000
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract Test {
-    struct S {
-        uint8 x;
-        uint16 y;
-        uint256 z;
-    }
-    struct X {
-        uint8 x;
-        S s;
-    }
-
-    function test()
-        public
-        returns (uint256 a, uint256 x, uint256 y, uint256 z)
-    {
-        X memory d = combine(1, 2, 3, 4);
-        a = extract(d, 0);
-        x = extract(d, 1);
-        y = extract(d, 2);
-        z = extract(d, 3);
-    }
-
-    function extract(X memory s, uint256 which) internal returns (uint256 x) {
-        if (which == 0) return s.x;
-        else if (which == 1) return s.s.x;
-        else if (which == 2) return s.s.y;
-        else return s.s.z;
-    }
-
-    function combine(uint8 a, uint8 x, uint16 y, uint256 z)
-        internal
-        returns (X memory s)
-    {
-        s.x = a;
-        s.s.x = x;
-        s.s.y = y;
-        s.s.z = z;
-    }
-}
-// ----
-// test() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
deleted file mode 100644
index e5b139d5c3c7..000000000000
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ /dev/null
@@ -1,72 +0,0 @@
-contract Test {
-    struct S {
-        uint8 x;
-        uint16 y;
-        uint256 z;
-    }
-    struct X {
-        uint8 x;
-        S s;
-        uint8[2] a;
-    }
-    X m_x;
-
-    function load()
-        public
-        returns (
-            uint256 a,
-            uint256 x,
-            uint256 y,
-            uint256 z,
-            uint256 a1,
-            uint256 a2
-        )
-    {
-        m_x.x = 1;
-        m_x.s.x = 2;
-        m_x.s.y = 3;
-        m_x.s.z = 4;
-        m_x.a[0] = 5;
-        m_x.a[1] = 6;
-        X memory d = m_x;
-        a = d.x;
-        x = d.s.x;
-        y = d.s.y;
-        z = d.s.z;
-        a1 = d.a[0];
-        a2 = d.a[1];
-    }
-
-    function store()
-        public
-        returns (
-            uint256 a,
-            uint256 x,
-            uint256 y,
-            uint256 z,
-            uint256 a1,
-            uint256 a2
-        )
-    {
-        X memory d;
-        d.x = 1;
-        d.s.x = 2;
-        d.s.y = 3;
-        d.s.z = 4;
-        d.a[0] = 5;
-        d.a[1] = 6;
-        m_x = d;
-        a = m_x.x;
-        x = m_x.s.x;
-        y = m_x.s.y;
-        z = m_x.s.z;
-        a1 = m_x.a[0];
-        a2 = m_x.a[1];
-    }
-}
-// ----
-// load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 110317
-// gas legacy: 112964
-// gas legacyOptimized: 110876
-// store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol b/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
deleted file mode 100644
index fe319d19df26..000000000000
--- a/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract Test {
-    struct S {
-        uint8 x;
-        uint16 y;
-        uint256 z;
-        uint8[2] a;
-    }
-    S[5] data;
-
-    function testInit()
-        public
-        returns (uint8 x, uint16 y, uint256 z, uint8 a, bool flag)
-    {
-        S[2] memory d;
-        x = d[0].x;
-        y = d[0].y;
-        z = d[0].z;
-        a = d[0].a[1];
-        flag = true;
-    }
-
-    function testCopyRead()
-        public
-        returns (uint8 x, uint16 y, uint256 z, uint8 a)
-    {
-        data[2].x = 1;
-        data[2].y = 2;
-        data[2].z = 3;
-        data[2].a[1] = 4;
-        S memory s = data[2];
-        x = s.x;
-        y = s.y;
-        z = s.z;
-        a = s.a[1];
-    }
-
-    function testAssign()
-        public
-        returns (uint8 x, uint16 y, uint256 z, uint8 a)
-    {
-        S memory s;
-        s.x = 1;
-        s.y = 2;
-        s.z = 3;
-        s.a[1] = 4;
-        x = s.x;
-        y = s.y;
-        z = s.z;
-        a = s.a[1];
-    }
-}
-// ----
-// testInit() -> 0, 0, 0, 0, true
-// testCopyRead() -> 1, 2, 3, 4
-// testAssign() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
deleted file mode 100644
index d88797d57f93..000000000000
--- a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder v2;
-
-struct St0 {
-    bytes el0;
-}
-contract C {
-    function f() external returns (St0 memory) {
-        St0 memory x;
-        x.el0 = msg.data;
-        return x;
-    }
-
-    function g() external returns (St0 memory) {
-        bytes memory temp = msg.data;
-        St0 memory x;
-        x.el0 = temp;
-        return x;
-    }
-
-    function hashes() external returns (bytes4, bytes4) {
-        return (this.f.selector, this.g.selector);
-    }
-
-    function large(uint256, uint256, uint256, uint256) external returns (St0 memory) {
-        St0 memory x;
-        x.el0 = msg.data;
-        return x;
-    }
-
-    function another_large(uint256, uint256, uint256, uint256) external returns (St0 memory) {
-        bytes memory temp = msg.data;
-        St0 memory x;
-        x.el0 = temp;
-        return x;
-    }
-
-}
-// ----
-// f() -> 0x20, 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
-// g() -> 0x20, 0x20, 4, 0xe2179b8e00000000000000000000000000000000000000000000000000000000
-// hashes() -> 0x26121ff000000000000000000000000000000000000000000000000000000000, 0xe2179b8e00000000000000000000000000000000000000000000000000000000
-// large(uint256,uint256,uint256,uint256): 1, 2, 3, 4 -> 0x20, 0x20, 0x84, 0xe02492f800000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000, 0x200000000000000000000000000000000000000000000000000000000, 0x300000000000000000000000000000000000000000000000000000000, 0x400000000000000000000000000000000000000000000000000000000
-// another_large(uint256,uint256,uint256,uint256): 1, 2, 3, 4 -> 0x20, 0x20, 0x84, 0x2a46f85a00000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000, 0x200000000000000000000000000000000000000000000000000000000, 0x300000000000000000000000000000000000000000000000000000000, 0x400000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
deleted file mode 100644
index 648c962cf9b8..000000000000
--- a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-  struct I {
-    uint b;
-    uint c;
-    function(uint) external returns (uint) x;
-  }
-  struct S {
-    I a;
-  }
-
-  function o(uint a) external returns(uint) { return a+1; }
-
-  function f() external returns (uint) {
-    S memory s = S(I(1,2, this.o));
-    return s.a.x(1);
-  }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol b/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
deleted file mode 100644
index 0037d9573e8a..000000000000
--- a/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-  struct I {
-    uint b;
-    uint c;
-  }
-  struct S {
-    I a;
-  }
-
-  function f() external returns (uint) {
-    S memory s = S(I(1,2));
-    return s.a.b;
-  }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
deleted file mode 100644
index 741b55f3f07d..000000000000
--- a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    struct str { uint8 a; uint16 b; uint8 c; }
-    uint8 x;
-    uint16 y;
-    str data;
-    function test() public returns (uint) {
-        x = 1;
-        y = 2;
-        data.a = 2;
-        data.b = 0xabcd;
-        data.c = 0xfa;
-        if (x != 1 || y != 2 || data.a != 2 || data.b != 0xabcd || data.c != 0xfa)
-            return 2;
-        delete y;
-        delete data.b;
-        if (x != 1 || y != 0 || data.a != 2 || data.b != 0 || data.c != 0xfa)
-            return 3;
-        delete x;
-        delete data;
-        return 1;
-    }
-}
-// ----
-// test() -> 1
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/recursive_struct_2.sol b/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
deleted file mode 100644
index 65cfcf20948c..000000000000
--- a/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    struct S {
-        uint16 v;
-        S[] x;
-    }
-    uint8[77] padding;
-    S s;
-    constructor() {
-         s.v = 21;
-         s.x.push(); s.x.push(); s.x.push();
-         s.x[0].v = 101; s.x[1].v = 102; s.x[2].v = 103;
-    }
-    function f() public returns (uint256 a, uint256 b, uint256 c, uint256 d) {
-       S storage sptr1 = s.x[0];
-       S storage sptr2 = s.x[1];
-       S storage sptr3 = s.x[2];
-       uint256 slot1; uint256 slot2; uint256 slot3;
-       assembly { slot1 := sptr1.slot slot2 := sptr2.slot slot3 := sptr3.slot }
-       delete s;
-       assembly { a := sload(s.slot) b := sload(slot1) c := sload(slot2) d := sload(slot3) }
-    }
-}
-// ----
-// f() -> 0, 0, 0, 0
diff --git a/test/libsolidity/semanticTests/structs/recursive_structs.sol b/test/libsolidity/semanticTests/structs/recursive_structs.sol
deleted file mode 100644
index f8944f11f355..000000000000
--- a/test/libsolidity/semanticTests/structs/recursive_structs.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    struct S {
-        S[] x;
-    }
-    S sstorage;
-
-    function f() public returns (uint256) {
-        S memory s;
-        s.x = new S[](10);
-        delete s;
-        // TODO Uncomment after implemented.
-        // sstorage.x.push();
-        delete sstorage;
-        return 1;
-    }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol b/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
deleted file mode 100644
index e45626d3168c..000000000000
--- a/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  struct S {
-    uint a;
-  }
-
-  function f() external returns (uint) {
-    S memory s = S(1);
-    return s.a;
-  }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol b/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
deleted file mode 100644
index 47b9a9ece202..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract test {
-    struct testStruct {
-        uint256 m_value;
-    }
-    testStruct data1;
-    testStruct data2;
-    testStruct data3;
-
-    constructor() {
-        data1.m_value = 2;
-    }
-
-    function assign()
-        public
-        returns (
-            uint256 ret_local,
-            uint256 ret_global,
-            uint256 ret_global3,
-            uint256 ret_global1
-        )
-    {
-        testStruct storage x = data1; //x is a reference data1.m_value == 2 as well as x.m_value = 2
-        data2 = data1; // should copy data. data2.m_value == 2
-
-        ret_local = x.m_value; // = 2
-        ret_global = data2.m_value; // = 2
-
-        x.m_value = 3;
-        data3 = x; //should copy the data. data3.m_value == 3
-        ret_global3 = data3.m_value; // = 3
-        ret_global1 = data1.m_value; // = 3. Changed due to the assignment to x.m_value
-    }
-}
-// ----
-// assign() -> 2, 2, 3, 3
diff --git a/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol b/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
deleted file mode 100644
index 7ce22e45aa6d..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    struct X {
-        uint256 x1;
-        uint256 x2;
-    }
-    struct S {
-        uint256 s1;
-        uint256[3] s2;
-        X s3;
-    }
-    S s;
-
-    constructor() {
-        uint256[3] memory s2;
-        s2[1] = 9;
-        s = S(1, s2, X(4, 5));
-    }
-
-    function get()
-        public
-        returns (uint256 s1, uint256[3] memory s2, uint256 x1, uint256 x2)
-    {
-        s1 = s.s1;
-        s2 = s.s2;
-        x1 = s.s3.x1;
-        x2 = s.s3.x2;
-    }
-}
-// ----
-// get() -> 0x01, 0x00, 0x09, 0x00, 0x04, 0x05
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
deleted file mode 100644
index 856edc27be48..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract c {
-    struct Struct { uint a; bytes data; uint b; }
-    Struct data1;
-    Struct data2;
-    function set(uint _a, bytes calldata _data, uint _b) external returns (bool) {
-        data1.a = _a;
-        data1.b = _b;
-        data1.data = _data;
-        return true;
-    }
-    function copy() public returns (bool) {
-        data1 = data2;
-        return true;
-    }
-    function del() public returns (bool) {
-        delete data1;
-        return true;
-    }
-    function test(uint256 i) public returns (bytes1) {
-        return data1.data[i];
-    }
-}
-// ----
-// storageEmpty -> 1
-// set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133592
-// gas legacy: 134628
-// gas legacyOptimized: 133871
-// test(uint256): 32 -> "3"
-// storageEmpty -> 0
-// copy() -> true
-// storageEmpty -> 1
-// set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133592
-// gas legacy: 134628
-// gas legacyOptimized: 133871
-// storageEmpty -> 0
-// del() -> true
-// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
deleted file mode 100644
index a321f0686897..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-contract c {
-    struct Nested {
-        uint256 x;
-        uint256 y;
-    }
-    struct Struct {
-        uint256 a;
-        Nested nested;
-        uint256 c;
-    }
-    mapping(uint256 => Struct) data;
-
-    function set(uint256 k) public returns (bool) {
-        data[k].a = 1;
-        data[k].nested.x = 3;
-        data[k].nested.y = 4;
-        data[k].c = 2;
-        return true;
-    }
-
-    function copy(uint256 from, uint256 to) public returns (bool) {
-        data[to] = data[from];
-        return true;
-    }
-
-    function retrieve(uint256 k)
-        public
-        returns (uint256 a, uint256 x, uint256 y, uint256 c)
-    {
-        a = data[k].a;
-        x = data[k].nested.x;
-        y = data[k].nested.y;
-        c = data[k].c;
-    }
-}
-// ----
-// set(uint256): 7 -> true
-// gas irOptimized: 109893
-// gas legacy: 110597
-// gas legacyOptimized: 110003
-// retrieve(uint256): 7 -> 1, 3, 4, 2
-// copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118582
-// gas legacy: 119147
-// gas legacyOptimized: 118619
-// retrieve(uint256): 7 -> 1, 3, 4, 2
-// retrieve(uint256): 8 -> 1, 3, 4, 2
-// copy(uint256,uint256): 0, 7 -> true
-// retrieve(uint256): 7 -> 0, 0, 0, 0
-// retrieve(uint256): 8 -> 1, 3, 4, 2
-// copy(uint256,uint256): 7, 8 -> true
-// retrieve(uint256): 8 -> 0, 0, 0, 0
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
deleted file mode 100644
index 71b40acc80f6..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract c {
-    struct Struct {
-        uint256 a;
-        uint256 b;
-    }
-    uint[75] r;
-    Struct data1;
-    Struct data2;
-
-    function test() public returns (bool) {
-        data1.a = 1;
-        data1.b = 2;
-        Struct memory x = data1;
-        data2 = x;
-        return data2.a == data1.a && data2.b == data1.b;
-    }
-}
-// ----
-// test() -> true
-// gas irOptimized: 109706
-// gas legacy: 110615
-// gas legacyOptimized: 109705
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_member.sol b/test/libsolidity/semanticTests/structs/struct_delete_member.sol
deleted file mode 100644
index 7f991f401bc5..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_member.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract test {
-    struct testStruct {
-        uint256 m_value;
-    }
-    testStruct data1;
-
-    constructor() {
-        data1.m_value = 2;
-    }
-
-    function deleteMember() public returns (uint256 ret_value) {
-        testStruct storage x = data1; //should not copy the data. data1.m_value == 2 but x.m_value = 0
-        x.m_value = 4;
-        delete x.m_value;
-        ret_value = data1.m_value;
-    }
-}
-// ----
-// deleteMember() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
deleted file mode 100644
index 31558cfbe288..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    struct S {
-        uint256 x;
-        uint128 y;
-        uint32 z;
-    }
-    uint8 b = 23;
-    S s;
-    uint8 a = 17;
-    function f() public {
-        s.x = 42; s.y = 42; s.y = 42;
-        delete s;
-        assert(s.x == 0);
-        assert(s.y == 0);
-        assert(s.z == 0);
-        assert(b == 23);
-        assert(a == 17);
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
deleted file mode 100644
index 57bf38e52c6b..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-    struct S {
-        uint32 a;
-        S[] x;
-    }
-    S s;
-    function f() public returns (uint256 r1, uint256 r2, uint256 r3) {
-        assembly {
-            // 2 ** 150 - 1
-            sstore(s.slot, 1427247692705959881058285969449495136382746623)
-        }
-        s.a = 1;
-        s.x.push(); s.x.push();
-        S storage ptr1 = s.x[0];
-        S storage ptr2 = s.x[1];
-        assembly {
-            // 2 ** 150 - 1
-            sstore(ptr1.slot, 1427247692705959881058285969449495136382746623)
-            sstore(ptr2.slot, 1427247692705959881058285969449495136382746623)
-        }
-        s.x[0].a = 2; s.x[1].a = 3;
-        delete s;
-        assert(s.a == 0);
-        assert(s.x.length == 0);
-        assembly {
-            r1 := sload(s.slot)
-            r2 := sload(ptr1.slot)
-            r3 := sload(ptr2.slot)
-        }
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 0, 0, 0
-// gas irOptimized: 117101
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol
deleted file mode 100644
index 046e4ec6d6b6..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    struct S {
-        uint64 y;
-        uint64 z;
-    }
-    S s;
-    function f() public returns (uint256 ret) {
-        assembly {
-            // 2 ** 150 - 1
-            sstore(s.slot, 1427247692705959881058285969449495136382746623)
-        }
-        s.y = 1; s.z = 2;
-        delete s;
-        assert(s.y == 0);
-        assert(s.z == 0);
-        assembly {
-            ret := sload(s.slot)
-        }
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
deleted file mode 100644
index d76618bbc9fc..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint128 a;
-        uint256[] x;
-        uint240 b;
-    }
-    uint8 b = 23;
-    S s;
-    uint8 a = 17;
-    function f() public {
-        delete s;
-        s.x.push(42); s.x.push(42); s.x.push(42);
-        delete s;
-        assert(s.x.length == 0);
-        uint256[] storage x = s.x;
-        assembly { sstore(x.slot, 3) }
-        assert(s.x[0] == 0);
-        assert(s.x[1] == 0);
-        assert(s.x[2] == 0);
-        assert(b == 23);
-        assert(a == 17);
-    }
-
-    function g() public {
-        delete s;
-        s.x.push(42); s.x.push(42); s.x.push(42);
-        s.a = 1; s.b = 2;
-        delete s.x;
-        assert(s.x.length == 0);
-        uint256[] storage x = s.x;
-        assembly { sstore(x.slot, 3) }
-        assert(s.x[0] == 0);
-        assert(s.x[1] == 0);
-        assert(s.x[2] == 0);
-        assert(b == 23);
-        assert(a == 17);
-        assert(s.a == 1);
-        assert(s.b == 2);
-    }
-}
-// ----
-// f() ->
-// gas irOptimized: 113210
-// gas legacy: 113591
-// gas legacyOptimized: 113103
-// g() ->
-// gas irOptimized: 118580
-// gas legacy: 118764
-// gas legacyOptimized: 118172
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
deleted file mode 100644
index 2345fea3cfe2..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    struct S {
-        uint32 a;
-        uint32[3] b;
-        uint32[] x;
-    }
-    S s;
-    function f() public returns (uint256 ret) {
-        assembly {
-            // 2 ** 150 - 1
-            sstore(s.slot, 1427247692705959881058285969449495136382746623)
-        }
-        s.a = 1;
-        s.b[0] = 2; s.b[1] = 3;
-        s.x.push(4); s.x.push(5);
-        delete s;
-        assert(s.a == 0);
-        assert(s.b[0] == 0);
-        assert(s.b[1] == 0);
-        assert(s.x.length == 0);
-        assembly {
-            ret := sload(s.slot)
-        }
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> 0
-// gas irOptimized: 111570
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
deleted file mode 100644
index ae21f6f865b8..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test {
-    struct testStruct {
-        uint256 m_value;
-    }
-    mapping(uint256 => testStruct) campaigns;
-
-    constructor() {
-        campaigns[0].m_value = 2;
-    }
-
-    function deleteIt() public returns (uint256) {
-        delete campaigns[0];
-        return campaigns[0].m_value;
-    }
-}
-// ----
-// deleteIt() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
deleted file mode 100644
index 290c812ccdca..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint32 a;
-        uint128 b;
-        uint256 c;
-    }
-
-    struct X {
-        uint256 a;
-        S s;
-    }
-
-    uint[79] r;
-    X x;
-
-    function f() external returns (uint32, uint128, uint256) {
-        X memory m = X(12, S(42, 23, 34));
-        x = m;
-        return (x.s.a, x.s.b, x.s.c);
-    }
-}
-// ----
-// f() -> 42, 23, 34
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
deleted file mode 100644
index 9af3774692a9..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint32 a;
-        uint128 b;
-        uint256 c;
-        function() internal returns (uint32) f;
-    }
-
-    struct X {
-        uint256 a;
-        S s;
-    }
-
-    uint[79] r;
-    X x;
-
-    function f() external returns (uint32, uint128, uint256, uint32, uint32) {
-        X memory m = X(12, S(42, 23, 34, g));
-        x = m;
-        return (x.s.a, x.s.b, x.s.c, x.s.f(), m.s.f());
-    }
-
-    function g() internal returns (uint32) {
-        return x.s.a;
-    }
-}
-// ----
-// f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110382
-// gas legacy: 111993
-// gas legacyOptimized: 110546
diff --git a/test/libsolidity/semanticTests/structs/struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
deleted file mode 100644
index f16f61e3213e..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S {
-        uint256 a;
-        bool x;
-    }
-    S public s;
-
-    constructor() {
-        s = S({x: true, a: 1});
-    }
-}
-// ----
-// s() -> 1, true
diff --git a/test/libsolidity/semanticTests/structs/struct_reference.sol b/test/libsolidity/semanticTests/structs/struct_reference.sol
deleted file mode 100644
index 79eeccbe711d..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_reference.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract test {
-    struct s2 {
-        uint32 z;
-        mapping(uint8 => s2) recursive;
-    }
-    s2 data;
-    function check() public returns (bool ok) {
-        return data.z == 2 &&
-            data.recursive[0].z == 3 &&
-            data.recursive[0].recursive[1].z == 0 &&
-            data.recursive[0].recursive[0].z == 1;
-    }
-    function set() public {
-        data.z = 2;
-        mapping(uint8 => s2) storage map = data.recursive;
-        s2 storage inner = map[0];
-        inner.z = 3;
-        inner.recursive[0].z = inner.recursive[1].z + 1;
-    }
-}
-// ----
-// check() -> false
-// set() ->
-// check() -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_referencing.sol b/test/libsolidity/semanticTests/structs/struct_referencing.sol
deleted file mode 100644
index 93fad63befcf..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_referencing.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-pragma abicoder v2;
-interface I {
-    struct S { uint a; }
-}
-
-library L {
-    struct S { uint b; uint a; }
-    function f() public pure returns (S memory) {
-        S memory s;
-        s.a = 3;
-        return s;
-    }
-    function g() public pure returns (I.S memory) {
-        I.S memory s;
-        s.a = 4;
-        return s;
-    }
-    // argument-dependent lookup tests
-    function a(I.S memory) public pure returns (uint) { return 1; }
-    function a(S memory) public pure returns (uint) { return 2; }
-}
-
-contract C is I {
-    function f() public pure returns (S memory) {
-        S memory s;
-        s.a = 1;
-        return s;
-    }
-    function g() public pure returns (I.S memory) {
-        I.S memory s;
-        s.a = 2;
-        return s;
-    }
-    function h() public pure returns (L.S memory) {
-        L.S memory s;
-        s.a = 5;
-        return s;
-    }
-    function x() public pure returns (L.S memory) {
-        return L.f();
-    }
-    function y() public pure returns (I.S memory) {
-        return L.g();
-    }
-    function a1() public pure returns (uint) { S memory s; return L.a(s); }
-    function a2() public pure returns (uint) { L.S memory s; return L.a(s); }
-}
-// ----
-// library: L
-// f() -> 1
-// g() -> 2
-// f() -> 1
-// g() -> 2
-// h() -> 0, 5
-// x() -> 0, 3
-// y() -> 4
-// a1() -> 1
-// a2() -> 2
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol b/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
deleted file mode 100644
index d427761894cb..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    struct S {
-        uint256 x;
-        uint128 y;
-        uint32 z;
-        uint128[3] a1;
-        uint128[] a2;
-    }
-    uint8 b = 23;
-    S[] s;
-    uint8 a = 17;
-    function f() public {
-        s.push();
-        assert(s[0].x == 0);
-        assert(s[0].y == 0);
-        assert(s[0].z == 0);
-        assert(s[0].a1[0] == 0);
-        assert(s[0].a1[1] == 0);
-        assert(s[0].a1[2] == 0);
-        assert(s[0].a2.length == 0);
-        assert(b == 23);
-        assert(a == 17);
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
deleted file mode 100644
index b77c696b4ce2..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S {
-        uint a;
-    }
-    S s;
-    mapping (uint => S) m;
-
-    function f() external returns (bool) {
-        s.a = 12;
-        m[1] = s;
-        return m[1].a == 12;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
deleted file mode 100644
index 26862fd008fc..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint32 a;
-        uint128 b;
-        uint256 c;
-    }
-    struct X {
-        uint32 a;
-        S s;
-    }
-
-    uint[79] arr;
-    X x = X(12, S(42, 23, 34));
-
-    function f() external returns (uint32, uint128, uint256) {
-        X memory m = x;
-        return (m.s.a, m.s.b, m.s.c);
-    }
-}
-// ----
-// f() -> 42, 23, 34
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
deleted file mode 100644
index 5ec25fb3632c..000000000000
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint32 a;
-        uint128 b;
-        uint256 c;
-        function() internal returns (uint32) f;
-    }
-
-    struct X {
-        uint256 a;
-        S s;
-    }
-
-    uint[79] arr;
-    X x = X(12, S(42, 23, 34, g));
-
-    function f() external returns (uint32, uint128, uint256, uint32, uint32) {
-        X memory m = x;
-        return (m.s.a, m.s.b, m.s.c, m.s.f(), x.s.f());
-    }
-
-    function g() internal returns (uint32) {
-        return x.s.a;
-    }
-}
-// ----
-// f() -> 42, 23, 34, 42, 42
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
deleted file mode 100644
index b5e9d10bb844..000000000000
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract test {
-    struct s1 {
-        uint8 x;
-        bool y;
-    }
-    struct s2 {
-        uint32 z;
-        s1 s1data;
-        mapping(uint8 => s2) recursive;
-    }
-    s2 data;
-    function check() public returns (bool ok) {
-        return data.z == 1 && data.s1data.x == 2 &&
-            data.s1data.y == true &&
-            data.recursive[3].recursive[4].z == 5 &&
-            data.recursive[4].recursive[3].z == 6 &&
-            data.recursive[0].s1data.y == false &&
-            data.recursive[4].z == 9;
-    }
-    function set() public {
-        data.z = 1;
-        data.s1data.x = 2;
-        data.s1data.y = true;
-        data.recursive[3].recursive[4].z = 5;
-        data.recursive[4].recursive[3].z = 6;
-        data.recursive[0].s1data.y = false;
-        data.recursive[4].z = 9;
-    }
-}
-// ----
-// check() -> false
-// set() ->
-// gas irOptimized: 134417
-// gas legacy: 135246
-// gas legacyOptimized: 134062
-// check() -> true
diff --git a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
deleted file mode 100644
index 7b51b59fcf0a..000000000000
--- a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-contract C {
-    using D for D.s;
-    D.s public x;
-    function f(uint a) public returns (uint) {
-        x.a = 3;
-        return x.mul(a);
-    }
-}
-// ----
-// library: D
-// f(uint256): 7 -> 0x15
-// x() -> 0x15
diff --git a/test/libsolidity/semanticTests/tryCatch/assert.sol b/test/libsolidity/semanticTests/tryCatch/assert.sol
deleted file mode 100644
index 8b6a7b99692e..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/assert.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function g(bool x) public pure {
-        assert(x);
-    }
-    function f(bool x) public returns (uint) {
-        // Set the gas to make this work on pre-byzantium VMs
-        try this.g{gas: 8000}(x) {
-            return 1;
-        } catch {
-            return 2;
-        }
-    }
-}
-// ----
-// f(bool): true -> 1
-// f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/create.sol b/test/libsolidity/semanticTests/tryCatch/create.sol
deleted file mode 100644
index 43d0f22f6506..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/create.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract Reverts {
-    constructor(uint) { revert("test message."); }
-}
-contract Succeeds {
-    constructor(uint) { }
-}
-
-contract C {
-    function f() public returns (Reverts x, uint, string memory txt) {
-        uint i = 3;
-        try new Reverts(i) returns (Reverts r) {
-            x = r;
-            txt = "success";
-        } catch Error(string memory s) {
-            txt = s;
-        }
-    }
-    function g() public returns (Succeeds x, uint, string memory txt) {
-        uint i = 8;
-        try new Succeeds(i) returns (Succeeds r) {
-            x = r;
-            txt = "success";
-        } catch Error(string memory s) {
-            txt = s;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0, 0, 96, 13, "test message."
-// g() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a, 0, 96, 7, "success"
diff --git a/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol b/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol
deleted file mode 100644
index 2bfc23191f77..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol
+++ /dev/null
@@ -1,168 +0,0 @@
-contract C {
-    function g(bytes memory revertMsg) public pure returns (uint, uint) {
-        assembly { revert(add(revertMsg, 0x20), mload(revertMsg)) }
-    }
-    function f1() public returns (uint x) {
-        // Invalid signature
-        try this.g(abi.encodeWithSelector(0x12345678, uint(0), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch (bytes memory) {
-            return 2;
-        }
-    }
-    function f1a() public returns (uint x) {
-        // Invalid signature
-        try this.g(abi.encodeWithSelector(0x12345678, uint(0), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch {
-            return 2;
-        }
-    }
-    function f1b() public returns (uint x) {
-        // Invalid signature
-        try this.g(abi.encodeWithSelector(0x12345678, uint(0), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        }
-    }
-    function f1c() public returns (uint x) {
-        // Invalid signature
-        try this.g(abi.encodeWithSelector(0x12345678, uint(0), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch {
-            return 2;
-        }
-    }
-    function f2() public returns (uint x) {
-        // Valid signature but illegal offset
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x100), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch (bytes memory) {
-            return 2;
-        }
-    }
-    function f2a() public returns (uint x) {
-        // Valid signature but illegal offset
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x100), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch {
-            return 2;
-        }
-    }
-    function f2b() public returns (uint x) {
-        // Valid signature but illegal offset
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x100), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        }
-    }
-    function f2c() public returns (uint x) {
-        // Valid signature but illegal offset
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x100), uint(0), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch {
-            return 1;
-        }
-    }
-    function f3() public returns (uint x) {
-        // Valid up to length
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x30), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch (bytes memory) {
-            return 2;
-        }
-    }
-    function f3a() public returns (uint x) {
-        // Valid up to length
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x30), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch (bytes memory) {
-            return 2;
-        }
-    }
-    function f3b() public returns (uint x) {
-        // Valid up to length
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x30), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        }
-    }
-    function f3c() public returns (uint x) {
-        // Valid up to length
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x30), uint(0))) returns (uint a, uint b) {
-            return 0;
-        } catch {
-            return 1;
-        }
-    }
-    function f4() public returns (uint x) {
-        // Fully valid
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x7), bytes7("abcdefg"))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch (bytes memory) {
-            return 2;
-        }
-    }
-    function f4a() public returns (uint x) {
-        // Fully valid
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x7), bytes7("abcdefg"))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        } catch {
-            return 2;
-        }
-    }
-    function f4b() public returns (uint x) {
-        // Fully valid
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x7), bytes7("abcdefg"))) returns (uint a, uint b) {
-            return 0;
-        } catch Error(string memory) {
-            return 1;
-        }
-    }
-    function f4c() public returns (uint x) {
-        // Fully valid
-        try this.g(abi.encodeWithSignature("Error(string)", uint(0x20), uint(0x7), bytes7("abcdefg"))) returns (uint a, uint b) {
-            return 0;
-        } catch {
-            return 1;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f1() -> 2
-// f1a() -> 2
-// f1b() -> FAILURE, hex"12345678", 0x0, 0, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-// f1c() -> 2
-// f2() -> 2
-// f2a() -> 2
-// f2b() -> FAILURE, hex"08c379a0", 0x100, 0, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-// f2c() -> 1
-// f3() -> 2
-// f3a() -> 2
-// f3b() -> FAILURE, hex"08c379a0", 0x20, 48, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-// f3c() -> 1
-// f4() -> 1
-// f4a() -> 1
-// f4b() -> 1
-// f4c() -> 1
diff --git a/test/libsolidity/semanticTests/tryCatch/lowLevel.sol b/test/libsolidity/semanticTests/tryCatch/lowLevel.sol
deleted file mode 100644
index ac275522d9e5..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/lowLevel.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function g(bool b) public pure returns (uint, uint) {
-        require(b, "message");
-        return (1, 2);
-    }
-    function f(bool b) public returns (uint x, uint y, bytes memory txt) {
-        try this.g(b) returns (uint a, uint b) {
-            (x, y) = (a, b);
-        } catch (bytes memory s) {
-            txt = s;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> 1, 2, 96, 0
-// f(bool): false -> 0, 0, 96, 100, 0x8c379a000000000000000000000000000000000000000000000000000000000, 0x2000000000000000000000000000000000000000000000000000000000, 0x76d657373616765000000000000000000000000000000000000000000, 0
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_error.sol b/test/libsolidity/semanticTests/tryCatch/malformed_error.sol
deleted file mode 100644
index 95c29276e697..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/malformed_error.sol
+++ /dev/null
@@ -1,88 +0,0 @@
-contract C {
-    function f(uint size) public pure {
-        assembly {
-            mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-            mstore(4, 0x20)
-            mstore(0x24, 7)
-            mstore(0x44, "abcdefg")
-            revert(0, size)
-        }
-    }
-    function a() public returns (uint) {
-        try this.f(3) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function b() public returns (uint) {
-        try this.f(6) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function b2() public returns (uint) {
-        try this.f(0x43) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function b3() public returns (string memory) {
-        try this.f(0x4a) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function c() public returns (string memory) {
-        try this.f(0x4b) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory er) {
-            assert(true);
-            return er;
-        } catch {
-            assert(false);
-        }
-    }
-    function d() public returns (string memory) {
-        try this.f(0x100) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory er) {
-            assert(true);
-            return er;
-        } catch {
-            assert(false);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// a() -> 0x00
-// b() -> 0x00
-// b2() -> 0x00
-// b3() -> 0x20, 0x00
-// c() -> 0x20, 7, "abcdefg"
-// d() -> 0x20, 7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol
deleted file mode 100644
index 816dab7c47a1..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-contract C {
-    function f(uint size) public pure {
-        assembly {
-            mstore(0, 0x4e487b7100000000000000000000000000000000000000000000000000000000)
-            mstore(4, 0x43)
-            revert(0, size)
-        }
-    }
-    function a() public returns (uint) {
-        try this.f(3) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function b() public returns (uint) {
-        try this.f(6) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function c() public returns (uint) {
-        try this.f(0x24) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        } catch {
-            assert(false);
-        }
-    }
-    function d() public returns (uint) {
-        try this.f(0x100) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        } catch {
-            assert(false);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// a() -> 0x00
-// b() -> 0x00
-// c() -> 0x43
-// d() -> 0x43
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol
deleted file mode 100644
index bf47c01a8131..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-contract C {
-    function f(uint size) public pure {
-        assembly {
-            mstore(0, 0x4e487b7100000000000000000000000000000000000000000000000000000000)
-            mstore(4, 0x43)
-            revert(0, size)
-        }
-    }
-    function a() public returns (uint) {
-        try this.f(3) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        }
-        // Error will be re-thrown, since there is no low-level catch clause
-        assert(false);
-    }
-    function b() public returns (uint) {
-        try this.f(6) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        }
-        // Error will be re-thrown, since there is no low-level catch clause
-        assert(false);
-    }
-    function c() public returns (uint) {
-        try this.f(0x24) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        }
-        assert(false);
-    }
-    function d() public returns (uint) {
-        try this.f(0x100) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        }
-        assert(false);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// a() -> FAILURE, hex"4e487b"
-// b() -> FAILURE, hex"4e487b710000"
-// c() -> 0x43
-// d() -> 0x43
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol
deleted file mode 100644
index cad5aaa46436..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-contract C {
-    function f(uint size) public pure {
-        assembly {
-            mstore(0, 0x4e487b7100000000000000000000000000000000000000000000000000000000)
-            mstore(4, 0x43)
-            revert(0, size)
-        }
-    }
-    function a() public returns (uint) {
-        try this.f(3) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        }
-        // Error will be re-thrown, since there is no low-level catch clause
-        assert(false);
-    }
-    function b() public returns (uint) {
-        try this.f(6) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        }
-        // Error will be re-thrown, since there is no low-level catch clause
-        assert(false);
-    }
-    function c() public returns (uint) {
-        try this.f(0x24) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        } catch Error(string memory) {
-            assert(false);
-        }
-    }
-    function d() public returns (uint) {
-        try this.f(0x100) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        } catch Error(string memory) {
-            assert(false);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// a() -> FAILURE, hex"4e487b"
-// b() -> FAILURE, hex"4e487b710000"
-// c() -> 0x43
-// d() -> 0x43
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol
deleted file mode 100644
index ad096b9b8b6e..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol
+++ /dev/null
@@ -1,61 +0,0 @@
-contract C {
-    function f(uint size) public pure {
-        assembly {
-            mstore(0, 0x4e487b7100000000000000000000000000000000000000000000000000000000)
-            mstore(4, 0x43)
-            revert(0, size)
-        }
-    }
-    function a() public returns (uint) {
-        try this.f(3) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function b() public returns (uint) {
-        try this.f(6) {
-            assert(false);
-        } catch Panic(uint) {
-            assert(false);
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(true);
-        }
-    }
-    function c() public returns (uint) {
-        try this.f(0x24) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(false);
-        }
-    }
-    function d() public returns (uint) {
-        try this.f(0x100) {
-            assert(false);
-        } catch Panic(uint c) {
-            assert(true);
-            return c;
-        } catch Error(string memory) {
-            assert(false);
-        } catch {
-            assert(false);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// a() -> 0x00
-// b() -> 0x00
-// c() -> 0x43
diff --git a/test/libsolidity/semanticTests/tryCatch/nested.sol b/test/libsolidity/semanticTests/tryCatch/nested.sol
deleted file mode 100644
index 7c56a81b78d1..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/nested.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function g(bool b) public pure returns (uint, uint) {
-        require(b, "failure");
-        return (1, 2);
-    }
-    function f(bool cond1, bool cond2) public returns (uint x, uint y, bytes memory txt) {
-        try this.g(cond1) returns (uint a, uint b) {
-            try this.g(cond2) returns (uint a2, uint b2) {
-                (x, y) = (a, b);
-                txt = "success";
-            } catch Error(string memory s) {
-                x = 12;
-                txt = bytes(s);
-            } catch (bytes memory s) {
-                x = 13;
-                txt = s;
-            }
-        } catch Error(string memory s) {
-            x = 99;
-            txt = bytes(s);
-        } catch (bytes memory s) {
-            x = 98;
-            txt = s;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool,bool): true, true -> 1, 2, 96, 7, "success"
-// f(bool,bool): true, false -> 12, 0, 96, 7, "failure"
-// f(bool,bool): false, true -> 99, 0, 96, 7, "failure"
-// f(bool,bool): false, false -> 99, 0, 96, 7, "failure"
diff --git a/test/libsolidity/semanticTests/tryCatch/panic.sol b/test/libsolidity/semanticTests/tryCatch/panic.sol
deleted file mode 100644
index eb7dd8c8b208..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/panic.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function uf(bool b, uint x, uint y) public pure returns (uint) {
-        require(b, "failure");
-        return x - y;
-    }
-    function onlyPanic(bool b, uint x, uint y) public returns (uint r, uint code) {
-        try this.uf(b, x, y) returns (uint b) {
-            r = b;
-        } catch Panic(uint c) {
-            code = c;
-        }
-    }
-    function panicAndError(bool b, uint x, uint y) public returns (uint r, uint code, string memory msg_) {
-        try this.uf(b, x, y) returns (uint b) {
-            r = b;
-        } catch Panic(uint c) {
-            code = c;
-        } catch Error(string memory _errmsg) {
-            msg_ = _errmsg;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// onlyPanic(bool,uint256,uint256): true, 7, 6 -> 1, 0x00
-// onlyPanic(bool,uint256,uint256): true, 6, 7 -> 0x00, 0x11
-// onlyPanic(bool,uint256,uint256): false, 7, 6 -> FAILURE, hex"08c379a0", 0x20, 7, "failure"
-// onlyPanic(bool,uint256,uint256): false, 6, 7 -> FAILURE, hex"08c379a0", 0x20, 7, "failure"
-// panicAndError(bool,uint256,uint256): true, 7, 6 -> 1, 0x00, 0x60, 0x00
-// panicAndError(bool,uint256,uint256): true, 6, 7 -> 0x00, 0x11, 0x60, 0x00
-// panicAndError(bool,uint256,uint256): false, 7, 6 -> 0x00, 0x00, 0x60, 7, "failure"
-// panicAndError(bool,uint256,uint256): false, 6, 7 -> 0x00, 0x00, 0x60, 7, "failure"
diff --git a/test/libsolidity/semanticTests/tryCatch/return_function.sol b/test/libsolidity/semanticTests/tryCatch/return_function.sol
deleted file mode 100644
index 6aac30fe4617..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/return_function.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function g() public returns (uint a, function() external h, uint b) {
-        a = 1;
-        h = this.fun;
-        b = 9;
-    }
-    function f() public returns (uint, function() external, uint) {
-        // Note that the function type uses two stack slots.
-        try this.g() returns (uint a, function() external h, uint b) {
-            return (a, h, b);
-        } catch {
-        }
-    }
-    function fun() public pure {}
-}
-// ----
-// f() -> 0x1, 0xc06afe3a8444fc0004668591e8306bfb9968e79e946644cd0000000000000000, 9
diff --git a/test/libsolidity/semanticTests/tryCatch/simple.sol b/test/libsolidity/semanticTests/tryCatch/simple.sol
deleted file mode 100644
index 48bccfa5afe7..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/simple.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function g(bool b) public pure returns (uint x, uint y) {
-        require(b);
-        return (1, 2);
-    }
-    function f(bool flag) public view returns (uint x, uint y) {
-        try this.g(flag) returns (uint a, uint b) {
-            (x, y) = (a, b);
-        } catch {
-            (x, y) = (9, 10);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> 1, 2
-// f(bool): false -> 9, 10
diff --git a/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol b/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol
deleted file mode 100644
index 6368edf7009f..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function g(bool b) public pure returns (uint x) {
-        require(b);
-        return 13;
-    }
-    function f(bool flag) public view returns (uint x) {
-        try this.g(flag) returns (uint a) {
-            x = a;
-        } catch {
-            x = 9;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> 13
-// f(bool): false -> 9
diff --git a/test/libsolidity/semanticTests/tryCatch/structured.sol b/test/libsolidity/semanticTests/tryCatch/structured.sol
deleted file mode 100644
index e5aa238b30da..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/structured.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function g(bool b) public pure returns (uint, uint) {
-        require(b, "message");
-        return (1, 2);
-    }
-    function f(bool b) public returns (uint x, uint y, string memory txt) {
-        try this.g(b) returns (uint a, uint b) {
-            (x, y) = (a, b);
-            txt = "success";
-        } catch Error(string memory s) {
-            txt = s;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> 1, 2, 0x60, 7, "success"
-// f(bool): false -> 0, 0, 0x60, 7, "message"
diff --git a/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol b/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol
deleted file mode 100644
index 8a8cb3d1b62f..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function g(bool b) public pure returns (uint, uint) {
-        require(b, "message longer than 32 bytes 32 bytes 32 bytes 32 bytes 32 bytes 32 bytes 32 bytes");
-        return (1, 2);
-    }
-    function f(bool cond) public returns (uint x, uint y, bytes memory txt) {
-        try this.g(cond) returns (uint a, uint b) {
-            (x, y) = (a, b);
-            txt = "success";
-        } catch Error(string memory s) {
-            x = 99;
-            txt = bytes(s);
-        } catch (bytes memory s) {
-            x = 98;
-            txt = s;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> 1, 2, 96, 7, "success"
-// f(bool): false -> 99, 0, 96, 82, "message longer than 32 bytes 32 ", "bytes 32 bytes 32 bytes 32 bytes", " 32 bytes 32 bytes"
diff --git a/test/libsolidity/semanticTests/tryCatch/super_trivial.sol b/test/libsolidity/semanticTests/tryCatch/super_trivial.sol
deleted file mode 100644
index 98fbcddb21b5..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/super_trivial.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function g(bool x) external pure {
-        require(x);
-    }
-    function f(bool x) public returns (uint) {
-        try this.g(x) {
-            return 1;
-        } catch {
-            return 2;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> 1
-// f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/trivial.sol b/test/libsolidity/semanticTests/tryCatch/trivial.sol
deleted file mode 100644
index d43477e994ab..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/trivial.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function g(bool x) public pure {
-        require(x);
-    }
-    function f(bool x) public returns (uint) {
-        // Set the gas to make this work on pre-byzantium VMs
-        try this.g{gas: 8000}(x) {
-            return 1;
-        } catch {
-            return 2;
-        }
-    }
-}
-// ----
-// f(bool): true -> 1
-// f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol b/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol
deleted file mode 100644
index e7bad76b0847..000000000000
--- a/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-library L {
-    struct S { uint x; }
-    function integer(uint t, bool b) public view returns (uint) {
-        if (b) {
-            return t;
-        } else {
-            revert("failure");
-        }
-    }
-    function stru(S storage t, bool b) public view returns (uint) {
-        if (b) {
-            return t.x;
-        } else {
-            revert("failure");
-        }
-    }
-}
-contract C {
-    using L for L.S;
-    L.S t;
-    function f(bool b) public returns (uint, string memory) {
-        uint x = 8;
-        try L.integer(x, b) returns (uint _x) {
-            return (_x, "");
-        } catch Error(string memory message) {
-            return (18, message);
-        }
-    }
-    function g(bool b) public returns (uint, string memory) {
-        t.x = 9;
-        try t.stru(b) returns (uint x) {
-            return (x, "");
-        } catch Error(string memory message) {
-            return (19, message);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// library: L
-// f(bool): true -> 8, 0x40, 0
-// f(bool): false -> 18, 0x40, 7, "failure"
-// g(bool): true -> 9, 0x40, 0
-// g(bool): false -> 19, 0x40, 7, "failure"
diff --git a/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
deleted file mode 100644
index 6a41ddbe9f63..000000000000
--- a/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-abstract contract A {
-	constructor (mapping (uint => uint) [] storage m) {
-		m.push();
-		m[0][1] = 2;
-	}
-}
-
-contract C is A {
-	mapping(uint => mapping (uint => uint) []) public m;
-
-	constructor() A(m[1]) {
-	}
-}
-// ----
-// m(uint256,uint256,uint256): 0, 0, 0 -> FAILURE
-// m(uint256,uint256,uint256): 1, 0, 1 -> 2
-// m(uint256,uint256,uint256): 1, 0, 5 -> 0
diff --git a/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol b/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
deleted file mode 100644
index 8350628e4764..000000000000
--- a/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint256 x) public pure returns (uint256, uint256) {
-        uint256 b = x;
-        x = 42;
-        return (x, b);
-    }
-}
-// ----
-// f(uint256): 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
deleted file mode 100644
index fdfafa9e2a34..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToBytes(bytes2 input) public returns (bytes4 ret) {
-        return bytes4(input);
-    }
-}
-// ----
-// bytesToBytes(bytes2): "ab" -> "ab"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
deleted file mode 100644
index 5c9a6cdc5ac3..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToBytes(bytes4 input) public returns (bytes4 ret) {
-        return bytes4(input);
-    }
-}
-// ----
-// bytesToBytes(bytes4): "abcd" -> "abcd"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
deleted file mode 100644
index 2052c9da9278..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToBytes(bytes4 input) public returns (bytes2 ret) {
-        return bytes2(input);
-    }
-}
-// ----
-// bytesToBytes(bytes4): "abcd" -> "ab"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
deleted file mode 100644
index b0ab07f549f2..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToUint(bytes4 s) public returns (uint64 h) {
-        return uint64(uint32(s));
-    }
-}
-// ----
-// bytesToUint(bytes4): "abcd" -> 0x61626364
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
deleted file mode 100644
index ff1dfebfd657..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToUint(bytes1 s) public returns (uint8 h) {
-        return uint8(s);
-    }
-}
-// ----
-// bytesToUint(bytes1): "a" -> 0x61
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
deleted file mode 100644
index 390bf4b01d51..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToUint(bytes32 s) public returns (uint256 h) {
-        return uint(s);
-    }
-}
-// ----
-// bytesToUint(bytes32): "abc2" -> left(0x61626332)
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
deleted file mode 100644
index eb450993e492..000000000000
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function bytesToUint(bytes4 s) public returns (uint16 h) {
-        return uint16(uint32(s));
-    }
-}
-// ----
-// bytesToUint(bytes4): "abcd" -> 0x6364
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
deleted file mode 100644
index 9949b477b290..000000000000
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function UintToBytes(uint16 h) public returns (bytes8 s) {
-        return bytes8(uint64(h));
-    }
-}
-// ----
-// UintToBytes(uint16): 0x6162 -> "\x00\x00\x00\x00\x00\x00ab"
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
deleted file mode 100644
index 60b9a4cf0105..000000000000
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function UintToBytes(uint8 h) public returns (bytes1 s) {
-        return bytes1(h);
-    }
-}
-// ----
-// UintToBytes(uint8): 0x61 -> "a"
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
deleted file mode 100644
index 5662d909e6f0..000000000000
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function uintToBytes(uint256 h) public returns (bytes32 s) {
-        return bytes32(h);
-    }
-}
-// ----
-// uintToBytes(uint256): left(0x616263) -> left(0x616263)
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
deleted file mode 100644
index 963cbc3427fa..000000000000
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function uintToBytes(uint32 h) public returns (bytes2 s) {
-        return bytes2(uint16(h));
-    }
-}
-// ----
-// uintToBytes(uint32): 0x61626364 -> "cd"
diff --git a/test/libsolidity/semanticTests/types/external_function_to_address.sol b/test/libsolidity/semanticTests/types/external_function_to_address.sol
deleted file mode 100644
index fb938d37aaca..000000000000
--- a/test/libsolidity/semanticTests/types/external_function_to_address.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (bool) {
-        return this.f.address == address(this);
-    }
-    function g(function() external cb) public returns (address) {
-        return cb.address;
-    }
-}
-// ----
-// f() -> true
-// g(function): hex"00000000000000000000000000000000000004226121ff00000000000000000" -> 0x42
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
deleted file mode 100644
index b17ba6d9160b..000000000000
--- a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8[3] x;
-        uint8[][] y;
-        uint16 z;
-    }
-
-    mapping (uint8 => S) src;
-    mapping (uint8 => S) dst;
-
-    constructor() {
-        uint8[] memory d = new uint8[](2);
-        d[0] = 3;
-        d[1] = 4;
-
-        uint8[][] memory y = new uint8[][](2);
-        y[0] = d;
-        y[1] = d;
-
-        src[0] = S({x: [7, 8, 9], y: y, z: 13});
-    }
-
-    function f() public returns (S memory) {
-        dst[0] = src[0];
-        return dst[0];
-    }
-}
-// ----
-// f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
-// gas irOptimized: 197082
-// gas legacy: 199891
-// gas legacyOptimized: 196817
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
deleted file mode 100644
index 43f2a80fc79a..000000000000
--- a/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S {
-        uint8 x;
-    }
-
-    constructor() {
-        s = S({x: 7});
-        m2[0].push();
-    }
-
-    S s;
-
-    mapping (uint8 => S[2]) m1;
-    mapping (uint8 => S[]) m2;
-
-    function from_storage_to_static_array() public returns (S[2] memory) {
-        m1[0][1] = s;
-        return m1[0];
-    }
-
-    function from_storage_to_dynamic_array() public returns (S[] memory) {
-        m2[0][0] = s;
-        return m2[0];
-    }
-
-    function from_memory_to_static_array() public returns (S[2] memory) {
-        S memory sLocal = s;
-        m1[0][1] = sLocal;
-        return m1[0];
-    }
-
-    function from_memory_to_dynamic_array() public returns (S[] memory) {
-        S memory sLocal = s;
-        m2[0][0] = sLocal;
-        return m2[0];
-    }
-
-    function from_calldata_to_static_array(S calldata sCalldata) public returns (S[2] memory) {
-        m1[0][1] = sCalldata;
-        return m1[0];
-    }
-
-    function from_calldata_to_dynamic_array(S calldata sCalldata) public returns (S[] memory) {
-        m2[0][0] = sCalldata;
-        return m2[0];
-    }
-}
-// ----
-// from_storage_to_static_array() -> 0, 7
-// from_storage_to_dynamic_array() -> 0x20, 1, 7
-// from_memory_to_static_array() -> 0, 7
-// from_memory_to_dynamic_array() -> 0x20, 1, 7
-// from_calldata_to_static_array((uint8)): 8 -> 0, 8
-// from_calldata_to_dynamic_array((uint8)): 8 -> 0x20, 1, 8
diff --git a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
deleted file mode 100644
index a8a8fca44cec..000000000000
--- a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-type A is uint;
-type B is uint;
-
-library L {
-  function f(mapping(A=>B) storage _m, B _v) public { _m[A.wrap(uint(2))] = _v; }
-  function f(mapping(uint=>uint) storage _m, uint _v) public { _m[uint(3)] = _v; }
-}
-
-contract C {
-	mapping(uint=>uint) uintMap;
-	mapping(A=>B) abMap;
-
-	function testAB() public returns (bool) {
-		L.f(abMap, B.wrap(3));
-		return B.unwrap(abMap[A.wrap(uint(2))]) == 3;
-	}
-	function testUint() public returns (bool) {
-		L.f(uintMap, 4);
-		return uintMap[3] == 4;
-	}
-}
-// ----
-// library: L
-// testAB() -> true
-// testUint() -> true
diff --git a/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
deleted file mode 100644
index e9ff60d5c238..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-abstract contract A {
-    constructor (mapping (uint => uint) storage m) {
-        m[5] = 20;
-    }
-}
-
-contract C is A {
-    mapping (uint => uint) public m;
-
-    constructor() A(m) {
-    }
-}
-// ----
-// m(uint256): 1 -> 0
-// m(uint256): 5 -> 20
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key.sol b/test/libsolidity/semanticTests/types/mapping_contract_key.sol
deleted file mode 100644
index 401776ffa811..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_contract_key.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-interface A {}
-contract test {
-    mapping(A => uint8) table;
-    function get(A k) public returns (uint8 v) {
-        return table[k];
-    }
-    function set(A k, uint8 v) public {
-        table[k] = v;
-    }
-}
-// ----
-// get(address): 0 -> 0
-// get(address): 0x01 -> 0
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x01, 0xa1 ->
-// get(address): 0 -> 0
-// get(address): 0x01 -> 0xa1
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x00, 0xef ->
-// get(address): 0 -> 0xef
-// get(address): 0x01 -> 0xa1
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x01, 0x05 ->
-// get(address): 0 -> 0xef
-// get(address): 0x01 -> 0x05
-// get(address): 0xa7 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol b/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
deleted file mode 100644
index ee916a63d750..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-interface A {}
-contract test {
-    mapping(A => uint8) public table;
-    function set(A k, uint8 v) public {
-        table[k] = v;
-    }
-    function get(A k) public returns (uint8) {
-        return this.table(k);
-    }
-}
-// ----
-// table(address): 0 -> 0
-// table(address): 0x01 -> 0
-// table(address): 0xa7 -> 0
-// get(address): 0 -> 0
-// get(address): 0x01 -> 0
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x01, 0xa1 ->
-// table(address): 0 -> 0
-// table(address): 0x01 -> 0xa1
-// table(address): 0xa7 -> 0
-// get(address): 0 -> 0
-// get(address): 0x01 -> 0xa1
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x00, 0xef ->
-// table(address): 0 -> 0xef
-// table(address): 0x01 -> 0xa1
-// table(address): 0xa7 -> 0
-// get(address): 0 -> 0xef
-// get(address): 0x01 -> 0xa1
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x01, 0x05 ->
-// table(address): 0 -> 0xef
-// table(address): 0x01 -> 0x05
-// table(address): 0xa7 -> 0
-// get(address): 0 -> 0xef
-// get(address): 0x01 -> 0x05
-// get(address): 0xa7 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol b/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
deleted file mode 100644
index bedb605c177e..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-interface A {}
-library L {
-    function get(mapping(A => uint8) storage table, A k) external returns (uint8) {
-        return table[k];
-    }
-    function set(mapping(A => uint8) storage table, A k, uint8 v) external {
-        table[k] = v;
-    }
-}
-contract test {
-    mapping(A => uint8) table;
-    function get(A k) public returns (uint8 v) {
-        return L.get(table, k);
-    }
-    function set(A k, uint8 v) public {
-        L.set(table, k, v);
-    }
-}
-// ----
-// library: L
-// get(address): 0 -> 0
-// get(address): 0x01 -> 0
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x01, 0xa1 ->
-// get(address): 0 -> 0
-// get(address): 0x01 -> 0xa1
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x00, 0xef ->
-// get(address): 0 -> 0xef
-// get(address): 0x01 -> 0xa1
-// get(address): 0xa7 -> 0
-// set(address,uint8): 0x01, 0x05 ->
-// get(address): 0 -> 0xef
-// get(address): 0x01 -> 0x05
-// get(address): 0xa7 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol
deleted file mode 100644
index b34ef779868c..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder v1;
-contract test {
-    enum E { A, B, C }
-    mapping(E => uint8) public table;
-    function set(E k, uint8 v) public {
-        table[k] = v;
-    }
-    function get(E k) public returns (uint8) {
-        return this.table(k);
-    }
-}
-// ====
-// ABIEncoderV1Only: true
-// EVMVersion: >=byzantium
-// compileViaYul: false
-// ----
-// table(uint8): 0 -> 0
-// table(uint8): 0x01 -> 0
-// table(uint8): 0xa7 -> 0
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x01, 0xa1 ->
-// table(uint8): 0 -> 0
-// table(uint8): 0x01 -> 0xa1
-// table(uint8): 0xa7 -> 0
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x00, 0xef ->
-// table(uint8): 0 -> 0xef
-// table(uint8): 0x01 -> 0xa1
-// table(uint8): 0xa7 -> 0
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x01, 0x05 ->
-// table(uint8): 0 -> 0xef
-// table(uint8): 0x01 -> 0x05
-// table(uint8): 0xa7 -> 0
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
deleted file mode 100644
index cd252a3a5e41..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-pragma abicoder               v2;
-contract test {
-    enum E { A, B, C }
-    mapping(E => uint8) public table;
-    function set(E k, uint8 v) public {
-        table[k] = v;
-    }
-    function get(E k) public returns (uint8) {
-        return this.table(k);
-    }
-}
-// ----
-// table(uint8): 0 -> 0
-// table(uint8): 0x01 -> 0
-// table(uint8): 0xa7 -> FAILURE
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0xa1 ->
-// table(uint8): 0 -> 0
-// table(uint8): 0x01 -> 0xa1
-// table(uint8): 0xa7 -> FAILURE
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x00, 0xef ->
-// table(uint8): 0 -> 0xef
-// table(uint8): 0x01 -> 0xa1
-// table(uint8): 0xa7 -> FAILURE
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0x05 ->
-// table(uint8): 0 -> 0xef
-// table(uint8): 0x01 -> 0x05
-// table(uint8): 0xa7 -> FAILURE
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol
deleted file mode 100644
index 798ef812aafc..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-pragma abicoder v1;
-enum E { A, B, C }
-library L {
-    function get(mapping(E => uint8) storage table, E k) external returns (uint8) {
-        return table[k];
-    }
-    function set(mapping(E => uint8) storage table, E k, uint8 v) external {
-        table[k] = v;
-    }
-}
-contract test {
-    mapping(E => uint8) table;
-    function get(E k) public returns (uint8 v) {
-        return L.get(table, k);
-    }
-    function set(E k, uint8 v) public {
-        L.set(table, k, v);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// library: L
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x01, 0xa1 ->
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x00, 0xef ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x01, 0x05 ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol
deleted file mode 100644
index 87676aa0d614..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-pragma abicoder v2;
-
-enum E { A, B, C }
-library L {
-    function get(mapping(E => uint8) storage table, E k) external returns (uint8) {
-        return table[k];
-    }
-    function set(mapping(E => uint8) storage table, E k, uint8 v) external {
-        table[k] = v;
-    }
-}
-contract test {
-    mapping(E => uint8) table;
-    function get(E k) public returns (uint8 v) {
-        return L.get(table, k);
-    }
-    function set(E k, uint8 v) public {
-        L.set(table, k, v);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// library: L
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0xa1 ->
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x00, 0xef ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0x05 ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_v1.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_v1.sol
deleted file mode 100644
index 934ce7d111c2..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_v1.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma abicoder v1;
-enum E { A, B, C }
-contract test {
-    mapping(E => uint8) table;
-    function get(E k) public returns (uint8 v) {
-        return table[k];
-    }
-    function set(E k, uint8 v) public {
-        table[k] = v;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ABIEncoderV1Only: true
-// compileViaYul: false
-// ----
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0x02 -> 0
-// get(uint8): 0x03 -> FAILURE, hex"4e487b71", 33
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x01, 0xa1 ->
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x00, 0xef ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
-// set(uint8,uint8): 0x01, 0x05 ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol
deleted file mode 100644
index a35fdd2273cf..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma abicoder v2;
-enum E { A, B, C }
-contract test {
-    mapping(E => uint8) table;
-    function get(E k) public returns (uint8 v) {
-        return table[k];
-    }
-    function set(E k, uint8 v) public {
-        table[k] = v;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0x02 -> 0
-// get(uint8): 0x03 -> FAILURE
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0xa1 ->
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x00, 0xef ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0x05 ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/types/mapping_simple.sol b/test/libsolidity/semanticTests/types/mapping_simple.sol
deleted file mode 100644
index 4da4c5b102e9..000000000000
--- a/test/libsolidity/semanticTests/types/mapping_simple.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract test {
-    mapping(uint8 => uint8) table;
-    function get(uint8 k) public returns (uint8 v) {
-        return table[k];
-    }
-    function set(uint8 k, uint8 v) public {
-        table[k] = v;
-    }
-}
-// ----
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0
-// get(uint8): 0xa7 -> 0
-// set(uint8,uint8): 0x01, 0xa1 ->
-// get(uint8): 0 -> 0
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> 0
-// set(uint8,uint8): 0x00, 0xef ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0xa1
-// get(uint8): 0xa7 -> 0
-// set(uint8,uint8): 0x01, 0x05 ->
-// get(uint8): 0 -> 0xef
-// get(uint8): 0x01 -> 0x05
-// get(uint8): 0xa7 -> 0
diff --git a/test/libsolidity/semanticTests/types/nested_tuples.sol b/test/libsolidity/semanticTests/types/nested_tuples.sol
deleted file mode 100644
index 32203a9cbed7..000000000000
--- a/test/libsolidity/semanticTests/types/nested_tuples.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract test {
-    function f0() public returns(int, bool) {
-        int a;
-        bool b;
-        ((a, b)) = (2, true);
-        return (a, b);
-    }
-    function f1() public returns(int) {
-        int a;
-        (((a, ), )) = ((1, 2) ,3);
-        return a;
-    }
-    function f2() public returns(int) {
-        int a;
-        (((, a),)) = ((1, 2), 3);
-        return a;
-    }
-    function f3() public returns(int) {
-        int a = 3;
-        ((, ), ) = ((7, 8), 9);
-        return a;
-    }
-    function f4() public returns(int) {
-        int a;
-        (a, ) = (4, (8, 16, 32));
-        return a;
-    }
-}
-// ----
-// f0() -> 2, true
-// f1() -> 1
-// f2() -> 2
-// f3() -> 3
-// f4() -> 4
diff --git a/test/libsolidity/semanticTests/types/packing_signed_types.sol b/test/libsolidity/semanticTests/types/packing_signed_types.sol
deleted file mode 100644
index 2d2e0e16e608..000000000000
--- a/test/libsolidity/semanticTests/types/packing_signed_types.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function run() public returns(int8 y) {
-        uint8 x = 0xfa;
-        return int8(x);
-    }
-}
-// ----
-// run() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa
diff --git a/test/libsolidity/semanticTests/types/packing_unpacking_types.sol b/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
deleted file mode 100644
index 8b500cca1351..000000000000
--- a/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function run(bool a, uint32 b, uint64 c) public returns(uint256 y) {
-        if (a) y = 1;
-        y = y * 0x100000000 | ~b;
-        y = y * 0x10000000000000000 | ~c;
-    }
-}
-// ----
-// run(bool,uint32,uint64): true, 0x0f0f0f0f, 0xf0f0f0f0f0f0f0f0
-// -> 0x0000000000000000000000000000000000000001f0f0f0f00f0f0f0f0f0f0f0f
diff --git a/test/libsolidity/semanticTests/types/strings.sol b/test/libsolidity/semanticTests/types/strings.sol
deleted file mode 100644
index f76116bba319..000000000000
--- a/test/libsolidity/semanticTests/types/strings.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    function fixedBytesHex() public returns(bytes32 ret) {
-        return hex"aabb00ff";
-    }
-    function fixedBytes() public returns(bytes32 ret) {
-        return "abc\x00\xff__";
-    }
-    function pipeThrough(bytes2 small, bool one) public returns(bytes16 large, bool oneRet) {
-        oneRet = one;
-        large = small;
-    }
-}
-// ----
-// fixedBytesHex() -> "\xaa\xbb\x00\xff"
-// fixedBytes() -> "abc\x00\xff__"
-// pipeThrough(bytes2,bool): "\x00\x02", true -> "\x00\x02", true
diff --git a/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
deleted file mode 100644
index 2040df1dd1fb..000000000000
--- a/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-struct S {
-	mapping (uint => uint) m;
-}
-
-abstract contract A {
-	constructor (S storage s) {
-		s.m[5] = 16;
-	}
-}
-
-contract C is A {
-	mapping(uint => S) m;
-
-	constructor() A(m[1]) {
-	}
-
-	function getM(uint a, uint b) external returns (uint) {
-		return m[a].m[b];
-	}
-}
-// ----
-// getM(uint256,uint256): 0, 0 -> 0
-// getM(uint256,uint256): 1, 5 -> 0x10
-// getM(uint256,uint256): 1, 0 -> 0
diff --git a/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol b/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
deleted file mode 100644
index 6574dcb59771..000000000000
--- a/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-
-	function f() public pure returns (uint, uint, uint) {
-		bytes memory a; bytes memory b; bytes memory c;
-		(a, (b, c)) = ("0", ("1", "2"));
-		return (uint8(a[0]), uint8(b[0]), uint8(c[0]));
-	}
-
-}
-// ----
-// f() -> 0x30, 0x31, 0x32
diff --git a/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol b/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
deleted file mode 100644
index d3d2b01bbcb4..000000000000
--- a/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Test {
-    function test() public returns (uint ret) { return uint(uint160(address(uint160(uint128(type(uint200).max))))); }
-}
-// ----
-// test() -> 0xffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/underscore/as_function.sol b/test/libsolidity/semanticTests/underscore/as_function.sol
deleted file mode 100644
index be60a01bc351..000000000000
--- a/test/libsolidity/semanticTests/underscore/as_function.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function _() public pure returns (uint) {
-        return 88;
-    }
-
-    function g() public pure returns (uint){
-        return _();
-    }
-
-    function h() public pure returns (uint) {
-        _;
-        return 33;
-    }
-}
-// ----
-// _() -> 88
-// g() -> 88
-// h() -> 33
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
deleted file mode 100644
index e4e6453c5e15..000000000000
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-
-  function() internal storedFn;
-
-  bool flag;
-
-  constructor() {
-    if (!flag) {
-      flag = true;
-      function() internal invalid;
-      storedFn = invalid;
-      invalid();
-    }
-  }
-  function f() public pure {}
-}
-contract Test {
-  function f() public {
-    new C();
-  }
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
deleted file mode 100644
index fbaca1a67a33..000000000000
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-
-  function() internal storedFn;
-
-  bool flag;
-
-  constructor() {
-    if (!flag) {
-      flag = true;
-      function() internal invalid;
-      storedFn = invalid;
-      storedFn();
-    }
-  }
-  function f() public pure {}
-}
-contract Test {
-  function f() public {
-    new C();
-  }
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
deleted file mode 100644
index 1c1e596abd64..000000000000
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-pragma solidity >=0.4.0 <0.9.0;
-
-contract InvalidTest {
-
-  function() internal storedFn;
-  uint public x;
-
-  constructor() {
-    uint _y1;
-    uint _y2;
-    uint _y3;
-    uint _y4;
-    uint _y5;
-    uint _y6;
-    uint _y7;
-    uint _y8;
-    uint _y9;
-    uint _y10;
-    uint _y11;
-    uint _y12;
-    uint _y13;
-    uint _y14;
-
-
-    function() internal invalid;
-    storedFn = invalid;
-  }
-
-  function run() public {
-    // this did not always cause revert in the past
-    storedFn();
-  }
-
-  function z() public {
-      x++;
-  }
-}
-// ----
-// run() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
deleted file mode 100644
index 08a96792c2ad..000000000000
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract InvalidTest {
-
-  function() internal storedFn;
-
-  bool flag;
-
-  constructor() {
-    function() internal invalid;
-    storedFn = invalid;
-  }
-  function f() public returns (uint) {
-    if (flag) return 2;
-    flag = true;
-    storedFn();
-  }
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x51
-// f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_legacy.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_legacy.sol
deleted file mode 100644
index 1e5f96465ef1..000000000000
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_legacy.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Test {
-	function() internal x;
-	function f() public returns (bool) {
-		function() internal t = x;
-		// The legacy codegen  would use a specific function
-		// entry tag that always panics.
-		// Via Yul, the internal dispatch will panic instead.
-		uint z;
-		assembly { z := t }
-		assert(z != 0);
-		return true;
-	}
-}
-// ====
-// compileViaYul: false
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol
deleted file mode 100644
index bf8eab8ced87..000000000000
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Test {
-	function() internal x;
-	function f() public returns (bool) {
-		function() internal t = x;
-		// The legacy codegen  would use a specific function
-		// entry tag that always panics.
-		// Via Yul, the internal dispatch will panic instead.
-		uint z;
-		assembly { z := t }
-		assert(z == 0);
-		return true;
-	}
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol b/test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol
deleted file mode 100644
index 87d4ef429a43..000000000000
--- a/test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint public x;
-	function f() public {
-		x = 1; // This write used to be removed by the Yul optimizer due to the StorageWriteRemovalBeforeConditionalTermination bug.
-		g();
-		x = 2;
-	}
-	function g() internal {
-		if (msg.data.length > 4) return;
-		assembly { return(0, 0) }
-	}
-}
-// ----
-// f() ->
-// x() -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol b/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol
deleted file mode 100644
index c2f89ba86c58..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-// A test to see if `abi.encodeWithSelector(..., (CustomType))` works as intended.
-contract C {
-    type MyInt is int;
-    function f(MyInt x) external returns(MyInt a, MyInt b, MyInt c, MyInt d) {
-        a = MyInt.wrap(-1);
-        b = MyInt.wrap(0);
-        c = MyInt.wrap(1);
-        d = x;
-    }
-    function g() external returns(bool) {
-        (bool success1, bytes memory ret1) =  address(this).call(abi.encodeWithSelector(this.f.selector, MyInt.wrap(5)));
-        assert(success1);
-
-        (MyInt a1, MyInt b1, MyInt c1, MyInt d1) = abi.decode(ret1, (MyInt, MyInt, MyInt, MyInt));
-        assert(MyInt.unwrap(a1) == -1);
-        assert(MyInt.unwrap(b1) == 0);
-        assert(MyInt.unwrap(c1) == 1);
-        assert(MyInt.unwrap(d1) == 5);
-
-        (bool success2, bytes memory ret2) = address(this).call(abi.encodeWithSelector(this.f.selector, int(-5)));
-        assert(success2);
-
-        (int a2, int b2, int c2, int d2) = abi.decode(ret2, (int, int, int, int));
-        assert(a2 == -1);
-        assert(b2 == 0);
-        assert(c2 == 1);
-        assert(d2 == -5);
-
-        return true;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// g() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v1.sol b/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v1.sol
deleted file mode 100644
index f41a9205def2..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v1.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-pragma abicoder v1;
-
-type MyBytes2 is bytes2;
-
-contract C {
-    function f(MyBytes2 val) external returns (bytes2 ret) {
-        assembly {
-            ret := val
-        }
-    }
-
-    function g(bytes2 val) external returns (bytes2 ret) {
-        assembly {
-            ret := val
-        }
-    }
-
-    function h(uint256 val) external returns (MyBytes2) {
-        MyBytes2 ret;
-        assembly {
-            ret := val
-        }
-        return ret;
-    }
-
-}
-// ====
-// compileViaYul: false
-// ----
-// f(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// g(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// f(bytes2): "abcdef" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// g(bytes2): "abcdef" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// h(uint256): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// h(uint256): "abcdef" -> 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol b/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
deleted file mode 100644
index 67e6107a6d44..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma abicoder v2;
-
-type MyBytes2 is bytes2;
-
-contract C {
-    function f(MyBytes2 val) external returns (bytes2 ret) {
-        assembly {
-            ret := val
-        }
-    }
-
-    function g(bytes2 val) external returns (bytes2 ret) {
-        assembly {
-            ret := val
-        }
-    }
-
-    function h(uint256 val) external returns (MyBytes2) {
-        MyBytes2 ret;
-        assembly {
-            ret := val
-        }
-        return ret;
-    }
-
-}
-// ----
-// f(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// g(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// f(bytes2): "abcdef" -> FAILURE
-// g(bytes2): "abcdef" -> FAILURE
-// h(uint256): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// h(uint256): "abcdef" -> 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
deleted file mode 100644
index 9ed64be08bcf..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ /dev/null
@@ -1,63 +0,0 @@
-pragma abicoder v2;
-type MyAddress is address;
-
-contract C {
-    MyAddress[] public addresses;
-    function f(MyAddress[] calldata _addresses) external {
-        for (uint i = 0; i < _addresses.length; i++) {
-            MyAddress.unwrap(_addresses[i]).call("");
-        }
-        addresses = _addresses;
-    }
-    function g(MyAddress[] memory _addresses) external {
-        for (uint i = 0; i < _addresses.length; i++) {
-            MyAddress.unwrap(_addresses[i]).call("");
-        }
-        addresses = _addresses;
-    }
-    function test_f() external returns (bool) {
-        clean();
-        MyAddress[] memory test = new MyAddress[](3);
-        test[0] = MyAddress.wrap(address(21));
-        test[1] = MyAddress.wrap(address(22));
-        test[2] = MyAddress.wrap(address(23));
-        this.f(test);
-        test_equality(test);
-        return true;
-    }
-    function test_g() external returns (bool) {
-        clean();
-        MyAddress[] memory test = new MyAddress[](5);
-        test[0] = MyAddress.wrap(address(24));
-        test[1] = MyAddress.wrap(address(25));
-        test[2] = MyAddress.wrap(address(26));
-        test[3] = MyAddress.wrap(address(27));
-        test[4] = MyAddress.wrap(address(28));
-        this.g(test);
-        test_equality(test);
-        return true;
-    }
-    function clean() internal {
-        delete addresses;
-    }
-    function test_equality(MyAddress[] memory _addresses) internal view {
-        require (_addresses.length == addresses.length);
-        for (uint i = 0; i < _addresses.length; i++) {
-            require(MyAddress.unwrap(_addresses[i]) == MyAddress.unwrap(addresses[i]));
-        }
-    }
-}
-// ----
-// test_f() -> true
-// gas irOptimized: 122078
-// gas legacy: 125322
-// gas legacyOptimized: 122709
-// test_g() -> true
-// gas irOptimized: 106215
-// gas legacy: 111120
-// gas legacyOptimized: 106964
-// addresses(uint256): 0 -> 0x18
-// addresses(uint256): 1 -> 0x19
-// addresses(uint256): 3 -> 0x1b
-// addresses(uint256): 4 -> 0x1c
-// addresses(uint256): 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
deleted file mode 100644
index c3d58811ae4e..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-pragma abicoder v2;
-
-type Small is uint16;
-type Left is bytes2;
-struct S { uint8 a; Small b; Left c; uint8 d; }
-
-contract C {
-    S public s;
-    Small[] public small;
-    Left[] public l;
-    function f(S calldata _s) external {
-        s = _s;
-    }
-    function g(Small[] calldata _small) external returns (Small[] memory) {
-        small = _small;
-        return small;
-    }
-    function h(Left[] calldata _left) external returns (Left[] memory) {
-        l = _left;
-        return l;
-    }
-}
-// ----
-// s() -> 0, 0, 0x00, 0
-// f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
-// gas irOptimized: 44405
-// gas legacy: 47200
-// gas legacyOptimized: 44923
-// s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15
-// g(uint16[]): 0x20, 3, 1, 2, 3 -> 0x20, 3, 1, 2, 3
-// gas irOptimized: 69097
-// gas legacy: 75466
-// gas legacyOptimized: 74255
-// small(uint256): 0 -> 1
-// small(uint256): 1 -> 2
-// h(bytes2[]): 0x20, 3, "ab", "cd", "ef" -> 0x20, 3, "ab", "cd", "ef"
-// gas irOptimized: 69174
-// gas legacy: 75156
-// gas legacyOptimized: 74342
-// l(uint256): 0 -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// l(uint256): 1 -> 0x6364000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
deleted file mode 100644
index cc165e879e5b..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-pragma abicoder v2;
-type MyUInt8 is uint8;
-
-// Note that this wraps from a uint256
-function wrap(uint x) pure returns (MyUInt8 y) { assembly { y := x } }
-function unwrap(MyUInt8 x) pure returns (uint8 y) { assembly { y := x } }
-
-contract C {
-    uint8 a;
-    MyUInt8 b;
-    uint8 c;
-    function ret() external returns(MyUInt8) {
-        return wrap(0x1ff);
-    }
-    function f(MyUInt8 x) external returns(MyUInt8) {
-        return x;
-    }
-    function mem() external returns (MyUInt8[] memory) {
-        MyUInt8[] memory x = new MyUInt8[](2);
-        x[0] = wrap(0x1ff);
-        x[1] = wrap(0xff);
-        require(unwrap(x[0]) == unwrap(x[1]));
-        assembly {
-            mstore(add(x, 0x20), 0x1ff)
-        }
-        require(unwrap(x[0]) == unwrap(x[1]));
-        return x;
-    }
-    function stor() external returns (uint8, MyUInt8, uint8) {
-        a = 1;
-        c = 2;
-        b = wrap(0x1ff);
-        return (a, b, c);
-    }
-}
-// ----
-// ret() -> 0xff
-// f(uint8): 0x1ff -> FAILURE
-// f(uint8): 0xff -> 0xff
-// mem() -> 0x20, 2, 0xff, 0xff
-// stor() -> 1, 0xff, 2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol b/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol
deleted file mode 100644
index 727c66063333..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma abicoder v1;
-type MyUInt8 is uint8;
-
-// Note that this wraps from a uint256
-function wrap(uint x) pure returns (MyUInt8 y) { assembly { y := x } }
-function unwrap(MyUInt8 x) pure returns (uint8 y) { assembly { y := x } }
-
-contract C {
-    uint8 a;
-    MyUInt8 b;
-    uint8 c;
-    function ret() external returns(MyUInt8) {
-        return wrap(0x1ff);
-    }
-    function f(MyUInt8 x) external returns(MyUInt8) {
-        return x;
-    }
-    function mem() external returns (MyUInt8[] memory) {
-        MyUInt8[] memory x = new MyUInt8[](2);
-        x[0] = wrap(0x1ff);
-        x[1] = wrap(0xff);
-        require(unwrap(x[0]) == unwrap(x[1]));
-        assembly {
-            mstore(add(x, 0x20), 0x1ff)
-        }
-        require(unwrap(x[0]) == unwrap(x[1]));
-        return x;
-    }
-    function stor() external returns (uint8, MyUInt8, uint8) {
-        a = 1;
-        c = 2;
-        b = wrap(0x1ff);
-        return (a, b, c);
-    }
-}
-// ====
-// compileViaYul: false
-// ----
-// ret() -> 0xff
-// f(uint8): 0x1ff -> 0xff
-// f(uint8): 0xff -> 0xff
-// mem() -> 0x20, 2, 0x01ff, 0xff
-// stor() -> 1, 0xff, 2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/constant.sol b/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
deleted file mode 100644
index a1e587522fbe..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type T is int224;
-pragma solidity >= 0.0.0;
-contract C {
-  T constant public s = T.wrap(int224(165521356710917456517261742455526507355687727119203895813322792776));
-  T constant public t = s;
-  int224 constant public u = T.unwrap(t);
-}
-// ----
-// s() -> 165521356710917456517261742455526507355687727119203895813322792776
-// t() -> 165521356710917456517261742455526507355687727119203895813322792776
-// u() -> 165521356710917456517261742455526507355687727119203895813322792776
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
deleted file mode 100644
index 24b316f9cf4a..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-pragma abicoder v2;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-    function f(uint a) external returns(MyUInt8) {
-        return MyUInt8.wrap(uint8(a));
-    }
-    function g(uint a) external returns(MyInt8) {
-        return MyInt8.wrap(int8(int(a)));
-    }
-    function h(MyUInt8 a) external returns (MyInt8) {
-        return MyInt8.wrap(int8(MyUInt8.unwrap(a)));
-    }
-    function i(MyUInt8 a) external returns(MyUInt16) {
-        return MyUInt16.wrap(MyUInt8.unwrap(a));
-    }
-    function j(MyUInt8 a) external returns (uint) {
-        return MyUInt8.unwrap(a);
-    }
-    function k(MyUInt8 a) external returns (MyUInt16) {
-        return MyUInt16.wrap(MyUInt8.unwrap(a));
-    }
-    function m(MyUInt16 a) external returns (MyUInt8) {
-        return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
-    }
-}
-// ----
-// f(uint256): 1 -> 1
-// f(uint256): 2 -> 2
-// f(uint256): 257 -> 1
-// g(uint256): 1 -> 1
-// g(uint256): 2 -> 2
-// g(uint256): 255 -> -1
-// g(uint256): 257 -> 1
-// h(uint8): 1 -> 1
-// h(uint8): 2 -> 2
-// h(uint8): 255 -> -1
-// h(uint8): 257 -> FAILURE
-// i(uint8): 250 -> 250
-// j(uint8): 1 -> 1
-// j(uint8): 2 -> 2
-// j(uint8): 255 -> 0xff
-// j(uint8): 257 -> FAILURE
-// k(uint8): 1 -> 1
-// k(uint8): 2 -> 2
-// k(uint8): 255 -> 0xff
-// k(uint8): 257 -> FAILURE
-// m(uint16): 1 -> 1
-// m(uint16): 2 -> 2
-// m(uint16): 255 -> 0xff
-// m(uint16): 257 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol b/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol
deleted file mode 100644
index e8fbfb246036..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-pragma abicoder v1;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-    function f(uint a) external returns(MyUInt8) {
-        return MyUInt8.wrap(uint8(a));
-    }
-    function g(uint a) external returns(MyInt8) {
-        return MyInt8.wrap(int8(int(a)));
-    }
-    function h(MyUInt8 a) external returns (MyInt8) {
-        return MyInt8.wrap(int8(MyUInt8.unwrap(a)));
-    }
-    function i(MyUInt8 a) external returns(MyUInt16) {
-        return MyUInt16.wrap(MyUInt8.unwrap(a));
-    }
-    function j(MyUInt8 a) external returns (uint) {
-        return MyUInt8.unwrap(a);
-    }
-    function k(MyUInt8 a) external returns (MyUInt16) {
-        return MyUInt16.wrap(MyUInt8.unwrap(a));
-    }
-    function m(MyUInt16 a) external returns (MyUInt8) {
-        return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
-    }
-}
-// ====
-// compileViaYul: false
-// ----
-// f(uint256): 1 -> 1
-// f(uint256): 2 -> 2
-// f(uint256): 257 -> 1
-// g(uint256): 1 -> 1
-// g(uint256): 2 -> 2
-// g(uint256): 255 -> -1
-// g(uint256): 257 -> 1
-// h(uint8): 1 -> 1
-// h(uint8): 2 -> 2
-// h(uint8): 255 -> -1
-// h(uint8): 257 -> 1
-// i(uint8): 250 -> 250
-// j(uint8): 1 -> 1
-// j(uint8): 2 -> 2
-// j(uint8): 255 -> 0xff
-// j(uint8): 257 -> 1
-// k(uint8): 1 -> 1
-// k(uint8): 2 -> 2
-// k(uint8): 255 -> 0xff
-// k(uint8): 257 -> 1
-// m(uint16): 1 -> 1
-// m(uint16): 2 -> 2
-// m(uint16): 255 -> 0xff
-// m(uint16): 257 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol b/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
deleted file mode 100644
index 4936ba808527..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-type MyUInt16 is uint16;
-type MyBytes2 is bytes2;
-contract C {
-    MyUInt16 public a = MyUInt16.wrap(13);
-    MyBytes2 public b = MyBytes2.wrap(bytes2(uint16(1025)));
-    bytes2 public x;
-    function write_a() external {
-        uint max = 0xf00e0bbc0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0e0c0ba098076054032001;
-        assembly {
-            sstore(a.slot, max)
-        }
-    }
-    function write_b() external {
-        uint max = 0xf00e0bbc0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0e0c0ba098076054032001;
-        assembly {
-            sstore(b.slot, max)
-        }
-    }
-    function get_b(uint index) public returns (bytes1) {
-        return MyBytes2.unwrap(b)[index];
-    }
-}
-// ----
-// a() -> 13
-// b() -> 0x0401000000000000000000000000000000000000000000000000000000000000
-// get_b(uint256): 0 -> 0x0400000000000000000000000000000000000000000000000000000000000000
-// get_b(uint256): 1 -> 0x0100000000000000000000000000000000000000000000000000000000000000
-// get_b(uint256): 2 -> FAILURE, hex"4e487b71", 0x32
-// write_a() ->
-// a() -> 0x2001
-// write_b() ->
-// b() -> 0x5403000000000000000000000000000000000000000000000000000000000000
-// get_b(uint256): 0 -> 0x5400000000000000000000000000000000000000000000000000000000000000
-// get_b(uint256): 1 -> 0x0300000000000000000000000000000000000000000000000000000000000000
-// get_b(uint256): 2 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol b/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
deleted file mode 100644
index a5a51461b1ee..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type MyInt8 is int8;
-contract C {
-    MyInt8 public x = MyInt8.wrap(-5);
-
-    /// The most significant bit is flipped to 0
-    function create_dirty_slot() external {
-        uint mask  = 2**255 -1;
-        assembly {
-            let value := sload(x.slot)
-            sstore(x.slot, and(mask, value))
-        }
-    }
-
-    function read_unclean_value() external returns (bytes32 ret) {
-        MyInt8 value = x;
-        assembly {
-            ret := value
-        }
-    }
-}
-// ----
-// x() -> -5
-// create_dirty_slot() ->
-// read_unclean_value() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
deleted file mode 100644
index 27ab530cd76d..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ /dev/null
@@ -1,145 +0,0 @@
-pragma abicoder v2;
-// A rewrite of the test/libsolidity/semanticTests/various/erc20.sol, but using user defined value
-// types.
-
-// User defined type name. Indicating a type with 18 decimals.
-type UFixed18 is uint256;
-
-library FixedMath
-{
-    function add(UFixed18 a, UFixed18 b) internal pure returns (UFixed18 c) {
-        return UFixed18.wrap(UFixed18.unwrap(a) + UFixed18.unwrap(b));
-    }
-    function sub(UFixed18 a, UFixed18 b) internal pure returns (UFixed18 c) {
-        return UFixed18.wrap(UFixed18.unwrap(a) - UFixed18.unwrap(b));
-    }
-}
-
-contract ERC20 {
-    using FixedMath for UFixed18;
-
-    event Transfer(address indexed from, address indexed to, UFixed18 value);
-    event Approval(address indexed owner, address indexed spender, UFixed18 value);
-
-    mapping (address => UFixed18) private _balances;
-    mapping (address => mapping (address => UFixed18)) private _allowances;
-    UFixed18 private _totalSupply;
-
-    constructor() {
-        _mint(msg.sender, UFixed18.wrap(20));
-    }
-
-    function totalSupply() public view returns (UFixed18) {
-        return _totalSupply;
-    }
-
-    function balanceOf(address owner) public view returns (UFixed18) {
-        return _balances[owner];
-    }
-
-    function allowance(address owner, address spender) public view returns (UFixed18) {
-        return _allowances[owner][spender];
-    }
-
-    function transfer(address to, UFixed18 value) public returns (bool) {
-        _transfer(msg.sender, to, value);
-        return true;
-    }
-
-    function approve(address spender, UFixed18 value) public returns (bool) {
-        _approve(msg.sender, spender, value);
-        return true;
-    }
-
-    function transferFrom(address from, address to, UFixed18 value) public returns (bool) {
-        _transfer(from, to, value);
-        // The subtraction here will revert on overflow.
-        _approve(from, msg.sender, _allowances[from][msg.sender].sub(value));
-        return true;
-    }
-
-    function increaseAllowance(address spender, UFixed18 addedValue) public returns (bool) {
-        // The addition here will revert on overflow.
-        _approve(msg.sender, spender, _allowances[msg.sender][spender].add(addedValue));
-        return true;
-    }
-
-    function decreaseAllowance(address spender, UFixed18 subtractedValue) public returns (bool) {
-        // The subtraction here will revert on overflow.
-        _approve(msg.sender, spender, _allowances[msg.sender][spender].sub(subtractedValue));
-        return true;
-    }
-
-    function _transfer(address from, address to, UFixed18 value) internal {
-        require(to != address(0), "ERC20: transfer to the zero address");
-
-        // The subtraction and addition here will revert on overflow.
-        _balances[from] = _balances[from].sub(value);
-        _balances[to] = _balances[to].add(value);
-        emit Transfer(from, to, value);
-    }
-
-    function _mint(address account, UFixed18 value) internal {
-        require(account != address(0), "ERC20: mint to the zero address");
-
-        // The additions here will revert on overflow.
-        _totalSupply = _totalSupply.add(value);
-        _balances[account] = _balances[account].add(value);
-        emit Transfer(address(0), account, value);
-    }
-
-    function _burn(address account, UFixed18 value) internal {
-        require(account != address(0), "ERC20: burn from the zero address");
-
-        // The subtractions here will revert on overflow.
-        _totalSupply = _totalSupply.sub(value);
-        _balances[account] = _balances[account].sub(value);
-        emit Transfer(account, address(0), value);
-    }
-
-    function _approve(address owner, address spender, UFixed18 value) internal {
-        require(owner != address(0), "ERC20: approve from the zero address");
-        require(spender != address(0), "ERC20: approve to the zero address");
-
-        _allowances[owner][spender] = value;
-        emit Approval(owner, spender, value);
-    }
-
-    function _burnFrom(address account, UFixed18 value) internal {
-        _burn(account, value);
-        _approve(account, msg.sender, _allowances[account][msg.sender].sub(value));
-    }
-}
-// ----
-// constructor()
-// ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 352698
-// gas legacy: 834932
-// gas legacyOptimized: 412648
-// totalSupply() -> 20
-// gas irOptimized: 23415
-// gas legacy: 23653
-// gas legacyOptimized: 23368
-// transfer(address,uint256): 2, 5 -> true
-// ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x05
-// gas irOptimized: 48471
-// gas legacy: 49572
-// gas legacyOptimized: 48575
-// decreaseAllowance(address,uint256): 2, 0 -> true
-// ~ emit Approval(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x00
-// gas irOptimized: 26275
-// gas legacy: 27204
-// gas legacyOptimized: 26317
-// decreaseAllowance(address,uint256): 2, 1 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24042
-// gas legacy: 24506
-// gas legacyOptimized: 24077
-// transfer(address,uint256): 2, 14 -> true
-// ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x0e
-// gas irOptimized: 28571
-// gas legacy: 29672
-// gas legacyOptimized: 28675
-// transfer(address,uint256): 2, 2 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24071
-// gas legacy: 24492
-// gas legacyOptimized: 24074
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol b/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
deleted file mode 100644
index 4afd48087fdd..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-// Represent a 18 decimal, 256 bit wide fixed point type using a user defined value type.
-type UFixed256x18 is uint256;
-
-/// A minimal library to do fixed point operations on UFixed256x18.
-library FixedMath {
-    uint constant multiplier = 10**18;
-    /// Adds two UFixed256x18 numbers. Reverts on overflow, relying on checked arithmetic on
-    /// uint256.
-    function add(UFixed256x18 a, UFixed256x18 b) internal returns (UFixed256x18) {
-        return UFixed256x18.wrap(UFixed256x18.unwrap(a) + UFixed256x18.unwrap(b));
-    }
-    /// Multiplies UFixed256x18 and uint256. Reverts on overflow, relying on checked arithmetic on
-    /// uint256.
-    function mul(UFixed256x18 a, uint256 b) internal returns (UFixed256x18) {
-        return UFixed256x18.wrap(UFixed256x18.unwrap(a) * b);
-    }
-    /// Take the floor of a UFixed256x18 number.
-    /// @return the largest integer that does not exceed `a`.
-    function floor(UFixed256x18 a) internal returns (uint256) {
-        return UFixed256x18.unwrap(a) / multiplier;
-    }
-    /// Turns a uint256 into a UFixed256x18 of the same value.
-    /// Reverts if the integer is too large.
-    function toUFixed256x18(uint256 a) internal pure returns (UFixed256x18) {
-        return UFixed256x18.wrap(a * multiplier);
-    }
-}
-
-contract TestFixedMath {
-    function add(UFixed256x18 a, UFixed256x18 b) external returns (UFixed256x18) {
-        return FixedMath.add(a, b);
-    }
-    function mul(UFixed256x18 a, uint256 b) external returns (UFixed256x18) {
-        return FixedMath.mul(a, b);
-    }
-    function floor(UFixed256x18 a) external returns (uint256) {
-        return FixedMath.floor(a);
-    }
-    function toUFixed256x18(uint256 a) external returns (UFixed256x18) {
-        return FixedMath.toUFixed256x18(a);
-    }
-}
-// ----
-// add(uint256,uint256): 0, 0 -> 0
-// add(uint256,uint256): 25, 45 -> 0x46
-// add(uint256,uint256): 115792089237316195423570985008687907853269984665640564039457584007913129639935, 10 -> FAILURE, hex"4e487b71", 0x11
-// mul(uint256,uint256): 340282366920938463463374607431768211456, 45671926166590716193865151022383844364247891968 -> FAILURE, hex"4e487b71", 0x11
-// mul(uint256,uint256): 340282366920938463463374607431768211456, 20 -> 6805647338418769269267492148635364229120
-// floor(uint256): 11579208923731619542357098500868790785326998665640564039457584007913129639930 -> 11579208923731619542357098500868790785326998665640564039457
-// floor(uint256): 115792089237316195423570985008687907853269984665640564039457584007913129639935 -> 115792089237316195423570985008687907853269984665640564039457
-// toUFixed256x18(uint256): 0 -> 0
-// toUFixed256x18(uint256): 5 -> 5000000000000000000
-// toUFixed256x18(uint256): 115792089237316195423570985008687907853269984665640564039457 -> 115792089237316195423570985008687907853269984665640564039457000000000000000000
-// toUFixed256x18(uint256): 115792089237316195423570985008687907853269984665640564039458 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol b/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
deleted file mode 100644
index ec017a98281b..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-type MyInt is int16;
-type MyBytes is bytes2;
-contract C {
-    MyInt immutable a = MyInt.wrap(-2);
-    MyBytes immutable b = MyBytes.wrap("ab");
-    function() internal returns (uint) immutable f = g;
-    function direct() view external returns (MyInt, MyBytes) {
-        return (a, b);
-    }
-    function viaasm() view external returns (bytes32 x, bytes32 y) {
-        MyInt _a = a;
-        MyBytes _b = b;
-        assembly { x := _a y := _b }
-    }
-    function g() internal pure returns (uint) { return 2; }
-}
-// ----
-// direct() -> -2, 0x6162000000000000000000000000000000000000000000000000000000000000
-// viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol b/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
deleted file mode 100644
index 1b64dbceea9e..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type MyInt is int;
-contract C {
-    function f() public returns (MyInt a, int b) {
-        (MyInt).wrap;
-        a = (MyInt).wrap(5);
-        (MyInt).unwrap;
-        b = (MyInt).unwrap((MyInt).wrap(10));
-    }
-}
-// ----
-// f() -> 5, 10
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol b/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
deleted file mode 100644
index f209c7a42ed1..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-type MyInt is int;
-contract C {
-    mapping(MyInt => int) public m;
-    function set(MyInt key, int value) external {
-        m[key] = value;
-    }
-    function set_unwrapped(int key, int value) external {
-        m[MyInt.wrap(key)] = value;
-    }
-}
-// ----
-// set(int256,int256): 1, 1 ->
-// m(int256): 1 -> 1
-// set_unwrapped(int256,int256): 1, 2 ->
-// m(int256): 1 -> 2
-// m(int256): 2 -> 0
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
deleted file mode 100644
index db745dce31ec..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-pragma abicoder v2;
-
-type Small is uint16;
-type Left is bytes2;
-struct S { uint8 a; Small b; Left c; uint8 d; }
-
-contract C {
-    S public s;
-    Small[] public small;
-    Left[] public l;
-    function f(S memory _s) public {
-        s = _s;
-    }
-    function g(Small[] memory _small) public returns (Small[] memory) {
-        small = _small;
-        return small;
-    }
-    function h(Left[] memory _left) public returns (Left[] memory) {
-        l = _left;
-        return l;
-    }
-}
-// ----
-// s() -> 0, 0, 0x00, 0
-// f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
-// gas irOptimized: 44473
-// gas legacy: 46213
-// gas legacyOptimized: 44671
-// s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15
-// g(uint16[]): 0x20, 3, 1, 2, 3 -> 0x20, 3, 1, 2, 3
-// gas irOptimized: 69555
-// gas legacy: 76557
-// gas legacyOptimized: 74834
-// small(uint256): 0 -> 1
-// small(uint256): 1 -> 2
-// h(bytes2[]): 0x20, 3, "ab", "cd", "ef" -> 0x20, 3, "ab", "cd", "ef"
-// gas irOptimized: 69617
-// gas legacy: 76238
-// gas legacyOptimized: 74921
-// l(uint256): 0 -> 0x6162000000000000000000000000000000000000000000000000000000000000
-// l(uint256): 1 -> 0x6364000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol b/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
deleted file mode 100644
index d30c73605d61..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: A ====
-type MyInt is int;
-type MyAddress is address;
-==== Source: B ====
-import {MyInt, MyAddress as OurAddress} from "A";
-contract A {
-    function f(int x) external view returns(MyInt) { return MyInt.wrap(x); }
-    function f(address x) external view returns(OurAddress) { return OurAddress.wrap(x); }
-}
-// ----
-// f(int256): 5 -> 5
-// f(address): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol b/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
deleted file mode 100644
index 5f107ce15f94..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: s1.sol ====
-type MyInt is int;
-==== Source: s2.sol ====
-import "s1.sol" as M;
-contract C {
-  function f(int x) public pure returns (M.MyInt) { return M.MyInt.wrap(x); }
-  function g(M.MyInt x) public pure returns (int) { return M.MyInt.unwrap(x); }
-}
-// ----
-// f(int256): 5 -> 5
-// g(int256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol b/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
deleted file mode 100644
index 3c9787fdc358..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-// Implementation of OpenZepplin's
-// https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol
-// using user defined value types.
-
-contract Ownable {
-    type Owner is address;
-    Owner public owner = Owner.wrap(msg.sender);
-    error OnlyOwner();
-    modifier onlyOwner() {
-        if (Owner.unwrap(owner) != msg.sender)
-            revert OnlyOwner();
-
-        _;
-    }
-    event OwnershipTransferred(Owner indexed previousOwner, Owner indexed newOwner);
-    function setOwner(Owner newOwner) onlyOwner external {
-        emit OwnershipTransferred({previousOwner: owner, newOwner: newOwner});
-        owner = newOwner;
-    }
-    function renounceOwnership() onlyOwner external {
-        owner = Owner.wrap(address(0));
-    }
-}
-// ----
-// owner() -> 0x1212121212121212121212121212120000000012
-// setOwner(address): 0x1212121212121212121212121212120000000012 ->
-// ~ emit OwnershipTransferred(address,address): #0x1212121212121212121212121212120000000012, #0x1212121212121212121212121212120000000012
-// renounceOwnership() ->
-// owner() -> 0
-// setOwner(address): 0x1212121212121212121212121212120000000012 -> FAILURE, hex"5fc483c5"
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol b/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
deleted file mode 100644
index bbabc1dd6199..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-pragma abicoder v2;
-
-type MyAddress is address;
-contract C {
-    function id(MyAddress a) external returns (MyAddress b) {
-        b = a;
-    }
-
-    function unwrap_assembly(MyAddress a) external returns (address b) {
-        assembly { b := a }
-    }
-
-    function wrap_assembly(address a) external returns (MyAddress b) {
-        assembly { b := a }
-    }
-
-    function unwrap(MyAddress a) external returns (address b) {
-        b = MyAddress.unwrap(a);
-    }
-    function wrap(address a) external returns (MyAddress b) {
-        b = MyAddress.wrap(a);
-    }
-
-}
-// ----
-// id(address): 5 -> 5
-// id(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// id(address): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
-// unwrap(address): 5 -> 5
-// unwrap(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// unwrap(address): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
-// wrap(address): 5 -> 5
-// wrap(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// wrap(address): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
-// unwrap_assembly(address): 5 -> 5
-// unwrap_assembly(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// unwrap_assembly(address): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
-// wrap_assembly(address): 5 -> 5
-// wrap_assembly(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
-// wrap_assembly(address): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> FAILURE
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/simple.sol b/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
deleted file mode 100644
index e2c23c4f666a..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-type MyInt is int;
-contract C {
-    function f() external pure returns (MyInt a) {
-    }
-    function g() external pure returns (MyInt b, MyInt c) {
-        b = MyInt.wrap(int(1));
-        c = MyInt.wrap(1);
-    }
-}
-// ----
-// f() -> 0
-// g() -> 1, 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
deleted file mode 100644
index 284b41225ac9..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
+++ /dev/null
@@ -1,72 +0,0 @@
-type MyInt8 is int8;
-type MyAddress is address;
-type MyInt96 is int96;
-
-contract C {
-    MyInt8 a;
-    MyInt8 b;
-    MyInt8 c;
-    MyAddress d;
-
-    MyAddress e;
-
-    MyAddress f;
-    MyInt96 g;
-
-    function storage_a() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := a.slot
-            offset := a.offset
-        }
-    }
-
-    function storage_b() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := b.slot
-            offset := b.offset
-        }
-    }
-
-    function storage_c() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := d.slot
-            offset := c.offset
-        }
-    }
-    function storage_d() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := d.slot
-            offset := d.offset
-        }
-    }
-
-    function storage_e() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := e.slot
-            offset := e.offset
-        }
-    }
-
-    function storage_f() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := f.slot
-            offset := f.offset
-        }
-    }
-
-    function storage_g() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := g.slot
-            offset := g.offset
-        }
-    }
-
-}
-// ----
-// storage_a() -> 0, 0
-// storage_b() -> 0, 1
-// storage_c() -> 0, 2
-// storage_d() -> 0, 3
-// storage_e() -> 1, 0
-// storage_f() -> 2, 0
-// storage_g() -> 2, 0x14
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
deleted file mode 100644
index 8c51b2921b1a..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
+++ /dev/null
@@ -1,178 +0,0 @@
-type MyInt64 is int64;
-struct HalfSlot {
-    MyInt64 a;
-    MyInt64 b;
-}
-
-struct RegularHalfSlot {
-    int64 a;
-    int64 b;
-}
-
-type MyAddress is address;
-type MyInt96 is int96;
-struct FullSlot {
-    MyInt96 a;
-    MyAddress b;
-}
-struct RegularFullSlot {
-    int96 a;
-    address b;
-}
-
-contract C {
-    HalfSlot public a;
-    RegularHalfSlot public ra;
-
-    HalfSlot public b;
-    RegularHalfSlot public rb;
-
-    HalfSlot public c;
-    RegularHalfSlot public rc;
-
-    FullSlot public d;
-    RegularFullSlot public rd;
-
-    function storage_a() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := a.slot
-            offset := a.offset
-        }
-    }
-
-    function storage_ra() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := ra.slot
-            offset := ra.offset
-        }
-    }
-
-    function storage_b() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := b.slot
-            offset := b.offset
-        }
-    }
-
-    function storage_rb() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := rb.slot
-            offset := rb.offset
-        }
-    }
-
-   function storage_c() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := c.slot
-            offset := c.offset
-        }
-    }
-
-   function storage_rc() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := rc.slot
-            offset := rc.offset
-        }
-    }
-
-   function storage_d() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := d.slot
-            offset := d.offset
-        }
-    }
-
-   function storage_rd() pure external returns(uint slot, uint offset) {
-        assembly {
-            slot := rd.slot
-            offset := rd.offset
-        }
-    }
-
-
-   function set_a(MyInt64 _a, MyInt64 _b) external {
-       a.a = _a;
-       a.b = _b;
-   }
-
-   function set_ra(int64 _a, int64 _b) external {
-       ra.a = _a;
-       ra.b = _b;
-   }
-
-   function set_b(MyInt64 _a, MyInt64 _b) external {
-       b.a = _a;
-       b.b = _b;
-   }
-
-   function set_rb(int64 _a, int64 _b) external {
-       rb.a = _a;
-       rb.b = _b;
-   }
-
-   function set_c(MyInt64 _a, MyInt64 _b) external {
-       c.a = _a;
-       c.b = _b;
-   }
-
-   function set_rc(int64 _a, int64 _b) external {
-       rc.a = _a;
-       rc.b = _b;
-   }
-
-   function set_d(MyInt96 _a, MyAddress _b) external {
-       d.a = _a;
-       d.b = _b;
-   }
-
-   function set_rd(int96 _a, address _b) external {
-       rd.a = _a;
-       rd.b = _b;
-   }
-
-   function read_slot(uint slot) view external returns (uint value) {
-       assembly {
-           value := sload(slot)
-       }
-   }
-
-   function read_contents_asm() external returns (bytes32 rxa, bytes32 rya, bytes32 rxb, bytes32 ryb) {
-       b.a = MyInt64.wrap(-2);
-       b.b = MyInt64.wrap(-3);
-       HalfSlot memory x = b;
-       MyInt64 y = b.a;
-       MyInt64 z = b.b;
-       assembly {
-           rxa := mload(x)
-           rya := y
-           rxb := mload(add(x, 0x20))
-           ryb := z
-       }
-   }
-}
-// ----
-// storage_a() -> 0, 0
-// set_a(int64,int64): 100, 200 ->
-// read_slot(uint256): 0 -> 0xc80000000000000064
-// storage_ra() -> 1, 0
-// set_ra(int64,int64): 100, 200 ->
-// read_slot(uint256): 1 -> 0xc80000000000000064
-// storage_b() -> 2, 0
-// set_b(int64,int64): 0, 200 ->
-// read_slot(uint256): 2 -> 3689348814741910323200
-// storage_rb() -> 3, 0
-// set_rb(int64,int64): 0, 200 ->
-// read_slot(uint256): 3 -> 3689348814741910323200
-// storage_c() -> 4, 0
-// set_c(int64,int64): 100, 0 ->
-// read_slot(uint256): 4 -> 0x64
-// storage_rc() -> 5, 0
-// set_rc(int64,int64): 100, 0 ->
-// read_slot(uint256): 5 -> 0x64
-// storage_d() -> 6, 0
-// set_d(int96,address): 39614081257132168796771975167, 1461501637330902918203684832716283019655932542975 ->
-// read_slot(uint256): 6 -> -39614081257132168796771975169
-// storage_rd() -> 7, 0
-// set_rd(int96,address): 39614081257132168796771975167, 1461501637330902918203684832716283019655932542975 ->
-// read_slot(uint256): 7 -> -39614081257132168796771975169
-// read_contents_asm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd, 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
deleted file mode 100644
index 813931e02fa5..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-type MyInt is int16;
-contract C {
-    bytes2 first = "ab";
-    MyInt public a = MyInt.wrap(-2);
-    bytes2 third = "ef";
-    function direct() external returns (MyInt) {
-        return a;
-    }
-    function indirect() external returns (int16) {
-        return MyInt.unwrap(a);
-    }
-    function toMemDirect() external returns (MyInt[1] memory) {
-        return [a];
-    }
-    function toMemIndirect() external returns (int16[1] memory) {
-        return [MyInt.unwrap(a)];
-    }
-    function div() external returns (int16) {
-        return MyInt.unwrap(a) / 2;
-    }
-    function viaasm() external returns (bytes32 x) {
-        MyInt st = a;
-        assembly { x := st }
-    }
-}
-// ----
-// a() -> -2
-// direct() -> -2
-// indirect() -> -2
-// toMemDirect() -> -2
-// toMemIndirect() -> -2
-// div() -> -1
-// viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
deleted file mode 100644
index 117e0dd84922..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type MyAddress is address;
-contract C {
-    function f() pure public {
-        MyAddress.wrap;
-        MyAddress.unwrap;
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
deleted file mode 100644
index 1da734fae1e6..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    type T is uint;
-}
-contract D {
-    function f(C.T x) public pure returns(uint) {
-        return C.T.unwrap(x);
-    }
-    function g(uint x) public pure returns(C.T) {
-        return C.T.wrap(x);
-    }
-    function h(uint x) public pure returns(uint) {
-        return f(g(x));
-    }
-    function i(C.T x) public pure returns(C.T) {
-        return g(f(x));
-    }
-}
-// ----
-// f(uint256): 0x42 -> 0x42
-// g(uint256): 0x42 -> 0x42
-// h(uint256): 0x42 -> 0x42
-// i(uint256): 0x42 -> 0x42
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
deleted file mode 100644
index 2c5a15bb93ac..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-// a test to compare the cost between using user defined value types and elementary type. See the
-// test zero_cost_abstraction_userdefined.sol for a comparison.
-
-pragma abicoder v2;
-
-contract C {
-    int x;
-    function setX(int _x) external {
-        x = _x;
-    }
-    function getX() view external returns (int) {
-        return x;
-    }
-    function add(int a, int b) view external returns (int) {
-        return a + b;
-    }
-}
-// ----
-// getX() -> 0
-// gas irOptimized: 23379
-// gas legacy: 23479
-// gas legacyOptimized: 23311
-// setX(int256): 5 ->
-// gas irOptimized: 43510
-// gas legacy: 43724
-// gas legacyOptimized: 43516
-// getX() -> 5
-// gas irOptimized: 23379
-// gas legacy: 23479
-// gas legacyOptimized: 23311
-// add(int256,int256): 200, 99 -> 299
-// gas irOptimized: 21764
-// gas legacy: 22394
-// gas legacyOptimized: 21813
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
deleted file mode 100644
index 2f275c543b11..000000000000
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-// a test to compare the cost between using user defined value types and elementary type. See the
-// test zero_cost_abstraction_elementary.sol for comparison.
-
-pragma abicoder v2;
-
-type MyInt is int;
-contract C {
-    int x;
-    function setX(MyInt _x) external {
-        x = MyInt.unwrap(_x);
-    }
-    function getX() view external returns (MyInt) {
-        return MyInt.wrap(x);
-    }
-    function add(MyInt a, MyInt b) pure external returns(MyInt) {
-        return MyInt.wrap(MyInt.unwrap(a) + MyInt.unwrap(b));
-    }
-}
-// ----
-// getX() -> 0
-// gas irOptimized: 23379
-// gas legacy: 23608
-// gas legacyOptimized: 23311
-// setX(int256): 5 ->
-// gas irOptimized: 43510
-// gas legacy: 43724
-// gas legacyOptimized: 43516
-// getX() -> 5
-// gas irOptimized: 23379
-// gas legacy: 23608
-// gas legacyOptimized: 23311
-// add(int256,int256): 200, 99 -> 299
-// gas irOptimized: 21764
-// gas legacy: 22523
-// gas legacyOptimized: 21813
diff --git a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
deleted file mode 100644
index a9b99dd34683..000000000000
--- a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-
-contract C {
-    function f(uint[] calldata arr) external returns (uint) {
-        return arr.sum();
-    }
-}
-
-function sum(uint[] memory arr) returns (uint result) {
-    for(uint i = 0; i < arr.length; i++) {
-        result += arr[i];
-    }
-}
-
-using {sum} for uint[];
-
-// ----
-// f(uint256[]): 0x20, 3, 1, 2, 8 -> 11
diff --git a/test/libsolidity/semanticTests/using/free_function_braces.sol b/test/libsolidity/semanticTests/using/free_function_braces.sol
deleted file mode 100644
index 897914b9bcf4..000000000000
--- a/test/libsolidity/semanticTests/using/free_function_braces.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-function zero(uint) pure returns (uint) {
-    return 0;
-}
-
-contract C {
-    function f(uint z) pure external returns(uint) {
-        return z.id();
-    }
-
-    function g(uint z) pure external returns (uint) {
-        return z.zero();
-    }
-
-    using {id, zero} for uint;
-}
-// ----
-// f(uint256): 10 -> 10
-// g(uint256): 10 -> 0
-// f(uint256): 256 -> 0x0100
-// g(uint256): 256 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_function_multi.sol b/test/libsolidity/semanticTests/using/free_function_multi.sol
deleted file mode 100644
index 31ac50bc3a94..000000000000
--- a/test/libsolidity/semanticTests/using/free_function_multi.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function f(uint z) pure external returns(uint) {
-        return z.id();
-    }
-
-    using {id, zero, zero, id} for uint;
-
-    function g(uint z) pure external returns (uint) {
-        return z.zero();
-    }
-}
-
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-function zero(uint) pure returns (uint) {
-    return 0;
-}
-// ----
-// f(uint256): 10 -> 10
-// g(uint256): 10 -> 0
-// f(uint256): 256 -> 0x0100
-// g(uint256): 256 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_functions_individual.sol b/test/libsolidity/semanticTests/using/free_functions_individual.sol
deleted file mode 100644
index 5a14cd7cb230..000000000000
--- a/test/libsolidity/semanticTests/using/free_functions_individual.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-using {zero} for uint;
-
-contract C {
-    using {id} for uint;
-
-    function f(uint z) pure external returns(uint) {
-        return z.id();
-    }
-
-    function g(uint z) pure external returns (uint) {
-        return z.zero();
-    }
-}
-
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-function zero(uint) pure returns (uint) {
-    return 0;
-}
-// ----
-// f(uint256): 10 -> 10
-// g(uint256): 10 -> 0
-// f(uint256): 256 -> 0x0100
-// g(uint256): 256 -> 0
diff --git a/test/libsolidity/semanticTests/using/imported_functions.sol b/test/libsolidity/semanticTests/using/imported_functions.sol
deleted file mode 100644
index 60a801ba3411..000000000000
--- a/test/libsolidity/semanticTests/using/imported_functions.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-function inc(uint x) pure returns (uint) {
-    return x + 1;
-}
-
-==== Source: B ====
-contract C {
-	function f(uint x) public returns (uint) {
-        return x.f() + x.inc();
-    }
-}
-using {A.inc, f} for uint;
-import {inc as f} from "A";
-import "A" as A;
-// ----
-// f(uint256): 5 -> 12
-// f(uint256): 10 -> 0x16
diff --git a/test/libsolidity/semanticTests/using/library_functions_inside_contract.sol b/test/libsolidity/semanticTests/using/library_functions_inside_contract.sol
deleted file mode 100644
index 170bc7853680..000000000000
--- a/test/libsolidity/semanticTests/using/library_functions_inside_contract.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-library L {
-    function externalFunction(uint a) external pure returns (uint) { return a * 1; }
-    function publicFunction(uint b) public pure returns (uint) { return b * 2; }
-    function internalFunction(uint c) internal pure returns (uint) { return c * 3; }
-}
-
-contract C {
-    using {L.externalFunction} for uint;
-    using {L.publicFunction} for uint;
-    using {L.internalFunction} for uint;
-
-    function f() public pure returns (uint) {
-        uint x = 1;
-        return x.externalFunction();
-    }
-
-    function g() public pure returns (uint) {
-        uint x = 1;
-        return x.publicFunction();
-    }
-
-    function h() public pure returns (uint) {
-        uint x = 1;
-        return x.internalFunction();
-    }
-}
-// ----
-// library: L
-// f() -> 1
-// g() -> 2
-// h() -> 3
diff --git a/test/libsolidity/semanticTests/using/library_on_interface.sol b/test/libsolidity/semanticTests/using/library_on_interface.sol
deleted file mode 100644
index 48553c218d7a..000000000000
--- a/test/libsolidity/semanticTests/using/library_on_interface.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-using L for I;
-interface I { function f() external pure returns (uint); }
-library L {
-    function execute(I i) internal pure returns (uint) {
-        return i.f();
-    }
-}
-contract C is I {
-    function x() public view returns (uint) {
-        I i = this;
-        return i.execute();
-    }
-    function f() public pure returns (uint) { return 7; }
-}
-// ----
-// x() -> 7
diff --git a/test/libsolidity/semanticTests/using/library_through_module.sol b/test/libsolidity/semanticTests/using/library_through_module.sol
deleted file mode 100644
index cb33613cb123..000000000000
--- a/test/libsolidity/semanticTests/using/library_through_module.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-==== Source: A ====
-library L {
-    function id(uint x) internal pure returns (uint) {
-        return x;
-    }
-    function one_ext(uint) pure external returns(uint) {
-        return 1;
-    }
-    function empty() pure internal {
-    }
-
-}
-
-==== Source: B ====
-contract C {
-    using M.L for uint;
-    function f(uint x) public pure returns (uint) {
-        return x.id();
-    }
-    function g(uint x) public pure returns (uint) {
-        return x.one_ext();
-    }
-}
-
-import "A" as M;
-
-// ----
-// library: "A":L
-// f(uint256): 5 -> 5
-// f(uint256): 10 -> 10
-// g(uint256): 5 -> 1
-// g(uint256): 10 -> 1
diff --git a/test/libsolidity/semanticTests/using/module_renamed.sol b/test/libsolidity/semanticTests/using/module_renamed.sol
deleted file mode 100644
index 427e220ffad5..000000000000
--- a/test/libsolidity/semanticTests/using/module_renamed.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-==== Source: A ====
-function f(uint x) pure returns (uint) {
-    return x + 2;
-}
-function g(uint x) pure returns (uint) {
-    return x + 8;
-}
-
-==== Source: B ====
-import {f as g, g as f} from "A";
-
-==== Source: C ====
-contract C {
-	function test(uint x, uint y) public pure returns (uint, uint) {
-        return (x.f(), y.g());
-    }
-}
-
-using {M.g, M.f} for uint;
-
-import "B" as M;
-
-// ----
-// test(uint256,uint256): 1, 1 -> 9, 3
diff --git a/test/libsolidity/semanticTests/using/private_library_function.sol b/test/libsolidity/semanticTests/using/private_library_function.sol
deleted file mode 100644
index e14404921900..000000000000
--- a/test/libsolidity/semanticTests/using/private_library_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    using {L.privateFunction} for uint;
-    function privateFunction(uint x) private pure returns (uint) { return x + 1; }
-    function f() public pure returns (uint) {
-        uint x = 1;
-        return x.privateFunction();
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/using/recursive_import.sol b/test/libsolidity/semanticTests/using/recursive_import.sol
deleted file mode 100644
index 6c8962598bc6..000000000000
--- a/test/libsolidity/semanticTests/using/recursive_import.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: A ====
-import {T as U} from "A";
-import "A" as X;
-
-type T is uint;
-function f(T x) pure returns (T) { return T.wrap(T.unwrap(x) + 1); }
-function g(T x) pure returns (uint) { return T.unwrap(x) + 10; }
-
-using { f } for X.X.U global;
-using { g } for T global;
-
-function cr() pure returns (T) {}
-
-==== Source: B ====
-import { cr } from "A";
-
-contract C {
-    function f() public returns (uint) {
-        return cr().f().g();
-    }
-}
-// ----
-// f() -> 11
diff --git a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
deleted file mode 100644
index f19c0c0fbd09..000000000000
--- a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-==== Source: A ====
-enum E {A, B}
-struct S { uint x; }
-type T is uint;
-using L for E global;
-using L for S global;
-using L for T global;
-library L {
-    function f(E e) internal pure returns (uint) {
-        return uint(e);
-    }
-    function f(S memory s) internal pure returns (uint) {
-        return s.x;
-    }
-    function f(T t) internal pure returns (uint) {
-        return T.unwrap(t);
-    }
-}
-
-==== Source: B ====
-contract C {
-    function f() public pure returns (uint a, uint b, uint c) {
-        E e = E.B;
-        a = e.f();
-        S memory s;
-        s.x = 7;
-        b = s.f();
-        T t = T.wrap(9);
-        c = t.f();
-    }
-}
-
-import {E, S, T} from "A";
-
-// ----
-// f() -> 1, 7, 9
diff --git a/test/libsolidity/semanticTests/using/using_global_for_global.sol b/test/libsolidity/semanticTests/using/using_global_for_global.sol
deleted file mode 100644
index 67a31c3415cc..000000000000
--- a/test/libsolidity/semanticTests/using/using_global_for_global.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-type global is uint;
-using { f } for global global;
-function f(global x) pure returns (global) { return global.wrap(global.unwrap(x) + 1); }
-==== Source: B ====
-import { global } from "A";
-
-function g(global x) pure returns (global) { return global.wrap(global.unwrap(x) + 10); }
-
-contract C {
-    using { g } for global;
-    function f(global r) public pure returns (global) {
-        return r.f().g();
-    }
-}
-// ----
-// f(uint256): 100 -> 111
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
deleted file mode 100644
index 3e767a185d90..000000000000
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-==== Source: A ====
-type T is uint;
-using L for T global;
-library L {
-    function inc(T x) internal pure returns (T) {
-        return T.wrap(T.unwrap(x) + 1);
-    }
-    function dec(T x) external pure returns (T) {
-        return T.wrap(T.unwrap(x) - 1);
-    }
-}
-using {unwrap} for T global;
-function unwrap(T x) pure returns (uint) {
-    return T.unwrap(x);
-}
-
-==== Source: B ====
-contract C {
-    function f() public pure returns (T r1) {
-        r1 = r1.inc().inc();
-    }
-}
-
-import {T} from "A";
-
-==== Source: C ====
-import {C} from "B";
-
-contract D {
-    function test() public returns (uint) {
-        C c = new C();
-        // This tests that attached functions are available
-        // even if the type is not available by name.
-        // This is a regular function call, a
-        // public and an internal library call
-        // and a free function call.
-        return c.f().inc().inc().dec().unwrap();
-    }
-}
-// ----
-// library: "A":L
-// test() -> 3
-// gas legacy: 120881
diff --git a/test/libsolidity/semanticTests/using/using_global_library.sol b/test/libsolidity/semanticTests/using/using_global_library.sol
deleted file mode 100644
index f18024f37864..000000000000
--- a/test/libsolidity/semanticTests/using/using_global_library.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-==== Source: A ====
-type T is uint;
-using L for T global;
-library L {
-    function inc(T x) internal pure returns (T) {
-        return T.wrap(T.unwrap(x) + 1);
-    }
-    function dec(T x) external pure returns (T) {
-        return T.wrap(T.unwrap(x) - 1);
-    }
-}
-
-==== Source: B ====
-contract C {
-    function f() public pure returns (T r1, T r2) {
-        r1 = r1.inc().inc();
-        r2 = r1.dec();
-    }
-}
-
-import {T} from "A";
-
-// ----
-// library: "A":L
-// f() -> 2, 1
diff --git a/test/libsolidity/semanticTests/variables/delete_local.sol b/test/libsolidity/semanticTests/variables/delete_local.sol
deleted file mode 100644
index 1d00bace1f61..000000000000
--- a/test/libsolidity/semanticTests/variables/delete_local.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function delLocal() public returns (uint res){
-        uint v = 5;
-        delete v;
-        res = v;
-    }
-}
-// ----
-// delLocal() -> 0
diff --git a/test/libsolidity/semanticTests/variables/delete_locals.sol b/test/libsolidity/semanticTests/variables/delete_locals.sol
deleted file mode 100644
index e442b8e853fa..000000000000
--- a/test/libsolidity/semanticTests/variables/delete_locals.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function delLocal() public returns (uint res1, uint res2){
-        uint v = 5;
-        uint w = 6;
-        uint x = 7;
-        delete v;
-        res1 = w;
-        res2 = x;
-    }
-}
-// ----
-// delLocal() -> 6, 7
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
deleted file mode 100644
index b9938582385a..000000000000
--- a/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract test {
-    mapping(uint8 => uint8) m1;
-    mapping(uint8 => uint8) m2;
-    function f() public returns (uint8, uint8, uint8, uint8) {
-        mapping(uint8 => uint8) storage m = m1;
-        m[1] = 42;
-
-        m = m2;
-        m[2] = 21;
-
-        return (m1[1], m1[2], m2[1], m2[2]);
-    }
-}
-// ----
-// f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
deleted file mode 100644
index df3ee2f547ba..000000000000
--- a/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    mapping(uint8 => uint8) m1;
-    mapping(uint8 => uint8) m2;
-    function f() public returns (uint8, uint8, uint8, uint8) {
-        mapping(uint8 => uint8) storage m = m1;
-        m[1] = 42;
-
-        (m = m2)[2] = 21;
-
-        return (m1[1], m1[2], m2[1], m2[2]);
-    }
-}
-// ----
-// f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
deleted file mode 100644
index 39dd04abbf27..000000000000
--- a/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    mapping(uint8 => uint8) m1;
-    mapping(uint8 => uint8) m2;
-    function f() public returns (uint8, uint8, uint8, uint8) {
-        mapping(uint8 => uint8) storage m = m1;
-        m[1] = 42;
-
-        uint8 v;
-        (m, v) = (m2, 21);
-        m[2] = v;
-
-        return (m1[1], m1[2], m2[1], m2[2]);
-    }
-}
-// ----
-// f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding.sol b/test/libsolidity/semanticTests/variables/public_state_overridding.sol
deleted file mode 100644
index 78e0fb447833..000000000000
--- a/test/libsolidity/semanticTests/variables/public_state_overridding.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A
-{
-	function test() external virtual returns (uint256)
-	{
-		return 5;
-	}
-}
-contract X is A
-{
-	uint256 public override test;
-
-	function set() public { test = 2; }
-}
-// ----
-// test() -> 0
-// set() ->
-// test() -> 2
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
deleted file mode 100644
index 15226b5e0997..000000000000
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder               v2;
-
-struct S { uint256 v; string s; }
-
-contract A
-{
-	function test() external virtual returns (uint256 v, string memory s)
-	{
-	    v = 42;
-	    s = "test";
-	}
-}
-contract X is A
-{
-	S public override test;
-
-	function set() public { test.v = 2; test.s = "statevar"; }
-}
-// ----
-// test() -> 0, 64, 0
-// set() ->
-// test() -> 2, 0x40, 8, "statevar"
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
deleted file mode 100644
index 62aa616e891c..000000000000
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder               v2;
-
-struct S { uint256 v; string s; }
-
-contract A
-{
-	function test(uint256 x) external virtual returns (uint256 v, string memory s)
-	{
-	    v = x;
-	    s = "test";
-	}
-}
-contract X is A
-{
-	mapping(uint256 => S) public override test;
-
-	function set() public { test[42].v = 2; test[42].s = "statevar"; }
-}
-// ----
-// test(uint256): 0 -> 0, 64, 0
-// test(uint256): 42 -> 0, 64, 0
-// set() ->
-// test(uint256): 0 -> 0, 64, 0
-// test(uint256): 42 -> 2, 0x40, 8, "statevar"
diff --git a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
deleted file mode 100644
index 7a4d36205910..000000000000
--- a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    event Ev(bool);
-    bool public perm;
-    function set() public returns(uint) {
-        bool tmp;
-        assembly {
-            tmp := 5
-        }
-        perm = tmp;
-        return 1;
-    }
-    function ret() public returns(bool) {
-        bool tmp;
-        assembly {
-            tmp := 5
-        }
-        return tmp;
-    }
-    function ev() public returns(uint) {
-        bool tmp;
-        assembly {
-            tmp := 5
-        }
-        emit Ev(tmp);
-        return 1;
-    }
-}
-// ----
-// set() -> 1
-// perm() -> true
-// ret() -> true
-// ev() -> 1
-// ~ emit Ev(bool): true
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
deleted file mode 100644
index 80daf116cdbd..000000000000
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    bytes public initCode;
-
-    constructor() {
-        // This should catch problems, but lets also test the case the optimiser is buggy.
-        assert(address(this).code.length == 0);
-        initCode = address(this).code;
-    }
-
-    // To avoid dependency on exact length.
-    function f() public view returns (bool) { return address(this).code.length > 400; }
-    function g() public view returns (uint) { return address(0).code.length; }
-    function h() public view returns (uint) { return address(1).code.length; }
-}
-// ----
-// constructor() ->
-// gas irOptimized: 173273
-// gas legacy: 241796
-// gas legacyOptimized: 153670
-// initCode() -> 0x20, 0
-// f() -> true
-// g() -> 0
-// h() -> 0
diff --git a/test/libsolidity/semanticTests/various/address_code_complex.sol b/test/libsolidity/semanticTests/various/address_code_complex.sol
deleted file mode 100644
index f2d21c9069b3..000000000000
--- a/test/libsolidity/semanticTests/various/address_code_complex.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    constructor() {
-        assembly {
-            // This is only 7 bytes here.
-            mstore(0, 0x48aa5566000000)
-            return(0, 32)
-        }
-    }
-}
-
-contract C {
-    function f() public returns (bytes memory) { return address(new A()).code; }
-    function g() public returns (uint) { return address(new A()).code.length; }
-}
-// ----
-// f() -> 0x20, 0x20, 0x48aa5566000000
-// g() -> 0x20
diff --git a/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol b/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
deleted file mode 100644
index 110240ce938d..000000000000
--- a/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint256 constant x = 0x123 + 0x456;
-
-    function f() public returns (uint256) {
-        return x + 1;
-    }
-}
-// ----
-// f() -> 0x57a
diff --git a/test/libsolidity/semanticTests/various/balance.sol b/test/libsolidity/semanticTests/various/balance.sol
deleted file mode 100644
index 8638f409c062..000000000000
--- a/test/libsolidity/semanticTests/various/balance.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    constructor() payable {}
-
-    function getBalance() public returns (uint256 balance) {
-        return address(this).balance;
-    }
-}
-// ----
-// constructor(), 23 wei ->
-// getBalance() -> 23
diff --git a/test/libsolidity/semanticTests/various/byte_optimization_bug.sol b/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
deleted file mode 100644
index b850ea327e5e..000000000000
--- a/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(uint256 x) public returns (uint256 a) {
-        assembly {
-            a := byte(x, 31)
-        }
-    }
-
-    function g(uint256 x) public returns (uint256 a) {
-        assembly {
-            a := byte(31, x)
-        }
-    }
-}
-// ----
-// f(uint256): 2 -> 0
-// g(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
deleted file mode 100644
index 92d31d621433..000000000000
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract D {
-    bytes32 public x;
-
-    constructor() {
-        bytes32 codeHash;
-        assembly {
-            let size := codesize()
-            codecopy(mload(0x40), 0, size)
-            codeHash := keccak256(mload(0x40), size)
-        }
-        x = codeHash;
-    }
-}
-
-
-contract C {
-    function testRuntime() public returns (bool) {
-        D d = new D();
-        bytes32 runtimeHash = keccak256(type(D).runtimeCode);
-        bytes32 otherHash;
-        uint256 size;
-        assembly {
-            size := extcodesize(d)
-            extcodecopy(d, mload(0x40), 0, size)
-            otherHash := keccak256(mload(0x40), size)
-        }
-        require(size == type(D).runtimeCode.length);
-        require(runtimeHash == otherHash);
-        return true;
-    }
-
-    function testCreation() public returns (bool) {
-        D d = new D();
-        bytes32 creationHash = keccak256(type(D).creationCode);
-        require(creationHash == d.x());
-        return true;
-    }
-}
-// ----
-// testRuntime() -> true
-// gas legacy: 100177
-// testCreation() -> true
-// gas legacy: 100600
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
deleted file mode 100644
index 075682129cda..000000000000
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract D {
-    uint256 x;
-
-    constructor() {
-        x = 7;
-    }
-
-    function f() public view returns (uint256) {
-        return x;
-    }
-}
-
-
-contract C {
-    function test() public returns (uint256) {
-        bytes memory c = type(D).creationCode;
-        D d;
-        assembly {
-            d := create(0, add(c, 0x20), mload(c))
-        }
-        return d.f();
-    }
-}
-// ----
-// test() -> 7
-// gas legacy: 100849
diff --git a/test/libsolidity/semanticTests/various/code_access_padding.sol b/test/libsolidity/semanticTests/various/code_access_padding.sol
deleted file mode 100644
index 831d4bde4ab4..000000000000
--- a/test/libsolidity/semanticTests/various/code_access_padding.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract D {
-    function f() public pure returns (uint256) {
-        return 7;
-    }
-}
-
-
-contract C {
-    function diff() public pure returns (uint256 remainder) {
-        bytes memory a = type(D).creationCode;
-        bytes memory b = type(D).runtimeCode;
-        assembly {
-            remainder := mod(sub(b, a), 0x20)
-        }
-    }
-}
-// ----
-// diff() -> 0 # This checks that the allocation function pads to multiples of 32 bytes #
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
deleted file mode 100644
index 9a9e7a80bf90..000000000000
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract D {
-    uint256 x;
-
-    constructor() {
-        x = 7;
-    }
-
-    function f() public view returns (uint256) {
-        return x;
-    }
-}
-
-contract C {
-    function test() public returns (uint256) {
-        D d = new D();
-        bytes32 hash;
-        assembly { hash := extcodehash(d) }
-        assert(hash == keccak256(type(D).runtimeCode));
-        return 42;
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// test() -> 42
-// gas legacy: 100235
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
deleted file mode 100644
index 97a7637976eb..000000000000
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-contract C {
-    uint len1;
-    uint len2;
-    constructor() {
-        uint mem_ptr_before;
-        uint mem_ptr_after;
-
-        assembly {
-            mem_ptr_before := mload(64)
-        }
-
-        len1 = address(0).code.length;
-
-        assembly {
-            mem_ptr_after := mload(64)
-        }
-
-        // To check that no memory was allocated and written.
-        assert(mem_ptr_before == mem_ptr_after);
-
-        len2 = address(this).code.length;
-
-        // To check that no memory was allocated and written.
-        assembly {
-            mem_ptr_after := mload(64)
-        }
-
-        assert(mem_ptr_before == mem_ptr_after);
-
-    }
-
-    function f() public view returns (bool r1, bool r2) {
-        uint mem_ptr_before;
-        uint mem_ptr_after;
-
-        assembly {
-            mem_ptr_before := mload(64)
-        }
-
-        r1 = address(this).code.length > 50;
-
-        assembly {
-            mem_ptr_after := mload(64)
-        }
-
-        // To check that no memory was allocated and written.
-        assert(mem_ptr_before == mem_ptr_after);
-
-        address a = address(0);
-        r2 = a.code.length == 0;
-
-        // To check that no memory was allocated and written.
-        assembly {
-            mem_ptr_after := mload(64)
-        }
-
-    }
-}
-// ----
-// constructor()
-// gas legacy: 124168
-// f(): true, true -> true, true
diff --git a/test/libsolidity/semanticTests/various/code_length_contract_member.sol b/test/libsolidity/semanticTests/various/code_length_contract_member.sol
deleted file mode 100644
index ff883139a46e..000000000000
--- a/test/libsolidity/semanticTests/various/code_length_contract_member.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// Test to see if type.code.length does extcodesize(type) only when type is an address.
-struct S {
-    bytes32 code;
-    bytes32 another;
-}
-
-contract C {
-    S s;
-
-    function f() public returns (uint, uint, bool) {
-        return (s.code.length, s.another.length, address(this).code.length > 50);
-    }
-}
-// ----
-// f() -> 0x20, 0x20, true
diff --git a/test/libsolidity/semanticTests/various/codebalance_assembly.sol b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
deleted file mode 100644
index fad0d3e5b465..000000000000
--- a/test/libsolidity/semanticTests/various/codebalance_assembly.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    constructor() payable {}
-
-    function f() public returns (uint256 ret) {
-        assembly {
-            ret := balance(0)
-        }
-    }
-    function g() public returns (uint256 ret) {
-        assembly {
-            ret := balance(1)
-        }
-    }
-    function h() public returns (uint256 ret) {
-        assembly {
-            ret := balance(address())
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// constructor(), 23 wei ->
-// gas legacy: 100517
-// f() -> 0
-// g() -> 1
-// h() -> 23
diff --git a/test/libsolidity/semanticTests/various/codehash.sol b/test/libsolidity/semanticTests/various/codehash.sol
deleted file mode 100644
index fa7dab9dab9f..000000000000
--- a/test/libsolidity/semanticTests/various/codehash.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f() public returns (bytes32) {
-        // non-existent in tests
-        return address(0).codehash;
-    }
-    function g() public returns (bytes32) {
-        // precompile
-        return address(0x1).codehash;
-    }
-    function h() public returns (bool) {
-        return address(this).codehash != 0;
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// f() -> 0x0
-// g() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
-// h() -> true
diff --git a/test/libsolidity/semanticTests/various/codehash_assembly.sol b/test/libsolidity/semanticTests/various/codehash_assembly.sol
deleted file mode 100644
index fe2210fa107a..000000000000
--- a/test/libsolidity/semanticTests/various/codehash_assembly.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f() public returns (bytes32 ret) {
-        assembly {
-            ret := extcodehash(0)
-        }
-    }
-    function g() public returns (bytes32 ret) {
-        assembly {
-            ret := extcodehash(1)
-        }
-    }
-    function h() public returns (bool ret) {
-        assembly {
-            ret := iszero(iszero(extcodehash(address())))
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// f() -> 0
-// g() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
-// h() -> true
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
deleted file mode 100644
index 0ebf772fbad7..000000000000
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-    function f() public {
-        new B();
-    }
-}
-
-
-contract B {
-    function f() public {}
-}
-
-
-contract C {
-    function f() public {
-        new B();
-    }
-}
-// ----
-// constructor() ->
-// gas irOptimized: 100415
diff --git a/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol b/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
deleted file mode 100644
index bc16bacbb6f4..000000000000
--- a/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public returns (uint256 r) {
-        uint256;
-        uint256;
-        uint256;
-        uint256;
-        int256 x = -7;
-        return uint256(x);
-    }
-}
-// ----
-// f() -> -7
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
deleted file mode 100644
index c3d038136f6e..000000000000
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	bytes public s;
-	constructor(uint256 x) {
-		// Due to a bug in EVMHost, msg.data used to contain initcode and constructor arguments.
-		s = msg.data;
-		assert(msg.data.length == 0);
-	}
-}
-// ----
-// constructor(): 42 ->
-// gas irOptimized: 145578
-// gas legacy: 173845
-// gas legacyOptimized: 137877
-// s() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/create_random.sol b/test/libsolidity/semanticTests/various/create_random.sol
deleted file mode 100644
index 676ec32a89ae..000000000000
--- a/test/libsolidity/semanticTests/various/create_random.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    function addr() external returns (address) {
-        return address(this);
-    }
-
-    function testRunner() external returns (address a1, address a2) {
-        assembly {
-            // This is `return(0, 1)`. We are using a simplified/fixed initcode to avoid
-            // instability due to metadata changes.
-            let initcode := hex"60016000f3"
-            mstore(0, initcode)
-
-            a1 := create(0, 0, 5)
-            a2 := create2(0, 0, 5, address())
-        }
-    }
-
-    function testCalc() external returns (address a1, address a2) {
-        a1 = calculateCreate(address(this), 1);
-        a2 = calculateCreate2(address(this), keccak256(hex"60016000f3"), bytes32(uint256(uint160(address(this)))));
-    }
-
-    function calculateCreate(address from, uint256 nonce) private pure returns (address) {
-        assert(nonce <= 127);
-        bytes memory data =
-            bytes.concat(hex"d694", bytes20(uint160(from)), nonce == 0 ? bytes1(hex"80") : bytes1(uint8(nonce)));
-        return address(uint160(uint256(keccak256(data)))); // Take the lower 160-bits
-    }
-
-    function calculateCreate2(address creator, bytes32 codehash, bytes32 salt) private pure returns (address) {
-        return address(uint160(uint256(keccak256(abi.encodePacked(bytes1(0xff), creator, salt, codehash)))));
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// addr() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
-// testRunner() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a, 0x2c1c30623ddd93e0b765a6caaca0c859eeb0644d
-// testCalc() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a, 0x2c1c30623ddd93e0b765a6caaca0c859eeb0644d
diff --git a/test/libsolidity/semanticTests/various/cross_contract_types.sol b/test/libsolidity/semanticTests/various/cross_contract_types.sol
deleted file mode 100644
index 9c7728a02c25..000000000000
--- a/test/libsolidity/semanticTests/various/cross_contract_types.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract Lib {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-}
-
-
-contract Test {
-    function f() public returns (uint256 r) {
-        Lib.S memory x = Lib.S({a: 2, b: 3});
-        r = x.b;
-    }
-}
-// ----
-// f() -> 3
diff --git a/test/libsolidity/semanticTests/various/decayed_tuple.sol b/test/libsolidity/semanticTests/various/decayed_tuple.sol
deleted file mode 100644
index 799da3481791..000000000000
--- a/test/libsolidity/semanticTests/various/decayed_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (uint256) {
-        uint256 x = 1;
-        (x) = 2;
-        return x;
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
deleted file mode 100644
index b8236e2cd5ff..000000000000
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract C {
-    uint256 x = 7;
-    bytes data;
-    uint256[] y;
-    uint256[] arrayData;
-
-    function returnsArray() public returns (uint256[] memory) {
-        arrayData = new uint256[](9);
-        arrayData[2] = 5;
-        arrayData[7] = 4;
-        return arrayData;
-    }
-
-    function f(bytes memory s) public returns (uint256) {
-        uint256 loc;
-        uint256[] memory memArray;
-        (loc, x, y, data, arrayData[3]) = (8, 4, returnsArray(), s, 2);
-        if (loc != 8) return 1;
-        if (x != 4) return 2;
-        if (y.length != 9) return 3;
-        if (y[2] != 5) return 4;
-        if (y[7] != 4) return 5;
-        if (data.length != s.length) return 6;
-        if (data[3] != s[3]) return 7;
-        if (arrayData[3] != 2) return 8;
-        (memArray, loc) = (arrayData, 3);
-        if (loc != 3) return 9;
-        if (memArray.length != arrayData.length) return 10;
-        bytes memory memBytes;
-        (x, memBytes, y[2], , ) = (456, s, 789, 101112, 131415);
-        if (x != 456 || memBytes.length != s.length || y[2] != 789) return 11;
-    }
-}
-// ----
-// f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 241837
-// gas legacy: 243284
-// gas legacyOptimized: 242420
diff --git a/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol b/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
deleted file mode 100644
index 71eb0077c91f..000000000000
--- a/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f(uint256 k) public returns (uint256) {
-        return k;
-    }
-}
-// ----
-// f(uint256): 9 -> 9
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
deleted file mode 100644
index b752a5210152..000000000000
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ /dev/null
@@ -1,128 +0,0 @@
-pragma solidity >=0.4.0 <0.9.0;
-
-contract ERC20 {
-    event Transfer(address indexed from, address indexed to, uint256 value);
-    event Approval(address indexed owner, address indexed spender, uint256 value);
-
-    mapping (address => uint256) private _balances;
-    mapping (address => mapping (address => uint256)) private _allowances;
-    uint256 private _totalSupply;
-
-    constructor() {
-        _mint(msg.sender, 20);
-    }
-
-    function totalSupply() public view returns (uint256) {
-        return _totalSupply;
-    }
-
-    function balanceOf(address owner) public view returns (uint256) {
-        return _balances[owner];
-    }
-
-    function allowance(address owner, address spender) public view returns (uint256) {
-        return _allowances[owner][spender];
-    }
-
-    function transfer(address to, uint256 value) public returns (bool) {
-        _transfer(msg.sender, to, value);
-        return true;
-    }
-
-    function approve(address spender, uint256 value) public returns (bool) {
-        _approve(msg.sender, spender, value);
-        return true;
-    }
-
-    function transferFrom(address from, address to, uint256 value) public returns (bool) {
-        _transfer(from, to, value);
-        // The subtraction here will revert on overflow.
-        _approve(from, msg.sender, _allowances[from][msg.sender] - value);
-        return true;
-    }
-
-    function increaseAllowance(address spender, uint256 addedValue) public returns (bool) {
-        // The addition here will revert on overflow.
-        _approve(msg.sender, spender, _allowances[msg.sender][spender] + addedValue);
-        return true;
-    }
-
-    function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) {
-        // The subtraction here will revert on overflow.
-        _approve(msg.sender, spender, _allowances[msg.sender][spender] - subtractedValue);
-        return true;
-    }
-
-    function _transfer(address from, address to, uint256 value) internal {
-        require(to != address(0), "ERC20: transfer to the zero address");
-
-        // The subtraction and addition here will revert on overflow.
-        _balances[from] = _balances[from] - value;
-        _balances[to] = _balances[to] + value;
-        emit Transfer(from, to, value);
-    }
-
-    function _mint(address account, uint256 value) internal {
-        require(account != address(0), "ERC20: mint to the zero address");
-
-        // The additions here will revert on overflow.
-        _totalSupply = _totalSupply + value;
-        _balances[account] = _balances[account] + value;
-        emit Transfer(address(0), account, value);
-    }
-
-    function _burn(address account, uint256 value) internal {
-        require(account != address(0), "ERC20: burn from the zero address");
-
-        // The subtractions here will revert on overflow.
-        _totalSupply = _totalSupply - value;
-        _balances[account] = _balances[account] - value;
-        emit Transfer(account, address(0), value);
-    }
-
-    function _approve(address owner, address spender, uint256 value) internal {
-        require(owner != address(0), "ERC20: approve from the zero address");
-        require(spender != address(0), "ERC20: approve to the zero address");
-
-        _allowances[owner][spender] = value;
-        emit Approval(owner, spender, value);
-    }
-
-    function _burnFrom(address account, uint256 value) internal {
-        _burn(account, value);
-        _approve(account, msg.sender, _allowances[account][msg.sender] - value);
-    }
-}
-// ----
-// constructor()
-// ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 353276
-// gas legacy: 807683
-// gas legacyOptimized: 408718
-// totalSupply() -> 20
-// gas irOptimized: 23415
-// gas legacy: 23524
-// gas legacyOptimized: 23368
-// transfer(address,uint256): 2, 5 -> true
-// ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x05
-// gas irOptimized: 48471
-// gas legacy: 49317
-// gas legacyOptimized: 48491
-// decreaseAllowance(address,uint256): 2, 0 -> true
-// ~ emit Approval(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x00
-// gas irOptimized: 26275
-// gas legacy: 27012
-// gas legacyOptimized: 26275
-// decreaseAllowance(address,uint256): 2, 1 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24042
-// gas legacy: 24467
-// gas legacyOptimized: 24056
-// transfer(address,uint256): 2, 14 -> true
-// ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x0e
-// gas irOptimized: 28571
-// gas legacy: 29417
-// gas legacyOptimized: 28591
-// transfer(address,uint256): 2, 2 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24071
-// gas legacy: 24453
-// gas legacyOptimized: 24053
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
deleted file mode 100644
index e8742c2346b0..000000000000
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C1 {
-    C1 public bla;
-
-    constructor(C1 x) {
-        bla = x;
-    }
-}
-
-
-contract C {
-    function test() public returns (C1 x, C1 y) {
-        C1 c = new C1(C1(address(9)));
-        x = c.bla();
-        y = this.t1(C1(address(7)));
-    }
-
-    function t1(C1 a) public returns (C1) {
-        return a;
-    }
-
-    function t2() public returns (C1) {
-        return C1(address(9));
-    }
-}
-// ----
-// test() -> 9, 7
-// gas legacy: 127514
-// t2() -> 9
diff --git a/test/libsolidity/semanticTests/various/flipping_sign_tests.sol b/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
deleted file mode 100644
index 174fb993f7bd..000000000000
--- a/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public returns (bool) {
-        int256 x = -2**255;
-        unchecked { assert(-x == x); }
-        return true;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/various/gasleft_decrease.sol b/test/libsolidity/semanticTests/various/gasleft_decrease.sol
deleted file mode 100644
index ab7302743f64..000000000000
--- a/test/libsolidity/semanticTests/various/gasleft_decrease.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint256 v;
-
-    function f() public returns (bool) {
-        uint256 startGas = gasleft();
-        v++;
-        assert(startGas > gasleft());
-        return true;
-    }
-
-    function g() public returns (bool) {
-        uint256 startGas = gasleft();
-        assert(startGas > gasleft());
-        return true;
-    }
-}
-// ----
-// f() -> true
-// g() -> true
diff --git a/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol b/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
deleted file mode 100644
index 280bc496095b..000000000000
--- a/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function gasleft() public returns (uint256) {
-        return 0;
-    }
-
-    function f() public returns (uint256) {
-        return gasleft();
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/various/inline_member_init.sol b/test/libsolidity/semanticTests/various/inline_member_init.sol
deleted file mode 100644
index 5c48b5d72e2c..000000000000
--- a/test/libsolidity/semanticTests/various/inline_member_init.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract test {
-    constructor() {
-        m_b = 6;
-        m_c = 8;
-    }
-
-    uint256 m_a = 5;
-    uint256 m_b;
-    uint256 m_c = 7;
-
-    function get() public returns (uint256 a, uint256 b, uint256 c) {
-        a = m_a;
-        b = m_b;
-        c = m_c;
-    }
-}
-// ----
-// get() -> 5, 6, 8
diff --git a/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol b/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
deleted file mode 100644
index b440b35a83b0..000000000000
--- a/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract Base {
-    constructor() {}
-
-    uint256 m_base = 5;
-
-    function getBMember() public returns (uint256 i) {
-        return m_base;
-    }
-}
-
-
-contract Derived is Base {
-    constructor() {}
-
-    uint256 m_derived = 6;
-
-    function getDMember() public returns (uint256 i) {
-        return m_derived;
-    }
-}
-// ----
-// getBMember() -> 5
-// getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol b/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
deleted file mode 100644
index e85a38dd6b2a..000000000000
--- a/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    function f() public returns (int8) {
-        int8[5] memory foo3 = [int8(1), -1, 0, 0, 0];
-        return foo3[0];
-    }
-}
-// ----
-// f() -> 1
diff --git a/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol b/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
deleted file mode 100644
index d797ab9cd4b8..000000000000
--- a/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// A long time ago, some opcodes were renamed, which involved the opcodes
-// "iszero" and "not".
-contract C {
-    function f() public returns (bool) {
-        bytes32 x = bytes32(uint256(1));
-        assembly {
-            x := not(x)
-        }
-        if (x != ~bytes32(uint256(1))) return false;
-        assembly {
-            x := iszero(x)
-        }
-        if (x != bytes32(0)) return false;
-        return true;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/various/literal_empty_string.sol b/test/libsolidity/semanticTests/various/literal_empty_string.sol
deleted file mode 100644
index 44154fa55b99..000000000000
--- a/test/libsolidity/semanticTests/various/literal_empty_string.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    bytes32 public x;
-    uint256 public a;
-
-    function f(bytes32 _x, uint256 _a) public {
-        x = _x;
-        a = _a;
-    }
-
-    function g() public {
-        this.f("", 2);
-    }
-}
-// ----
-// x() -> 0
-// a() -> 0
-// g() ->
-// x() -> 0
-// a() -> 2
diff --git a/test/libsolidity/semanticTests/various/many_subassemblies.sol b/test/libsolidity/semanticTests/various/many_subassemblies.sol
deleted file mode 100644
index 26c3a1bbff7b..000000000000
--- a/test/libsolidity/semanticTests/various/many_subassemblies.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C0 {}
-contract C1 {}
-contract C2 {}
-contract C3 {}
-contract C4 {}
-contract C5 {}
-contract C6 {}
-contract C7 {}
-contract C8 {}
-contract C9 {}
-contract C10 {}
-
-contract D {
-    function run() public {
-        // This is primarily meant to test assembly import via --import-asm-json.
-        // The exported JSON will fail the reimport unless the subassembly indices are parsed
-        // correctly - as hex numbers.
-        new C0();
-        new C1();
-        new C2();
-        new C3();
-        new C4();
-        new C5();
-        new C6();
-        new C7();
-        new C8();
-        new C9();
-        new C10();
-    }
-}
-// ----
-// run() ->
-// gas irOptimized: 381615
-// gas legacy: 392719
-// gas legacyOptimized: 392719
diff --git a/test/libsolidity/semanticTests/various/memory_overwrite.sol b/test/libsolidity/semanticTests/various/memory_overwrite.sol
deleted file mode 100644
index 3ab16a3e88f4..000000000000
--- a/test/libsolidity/semanticTests/various/memory_overwrite.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (bytes memory x) {
-        x = "12345";
-        x[3] = 0x61;
-        x[0] = 0x62;
-    }
-}
-// ----
-// f() -> 0x20, 5, "b23a5"
diff --git a/test/libsolidity/semanticTests/various/multi_modifiers.sol b/test/libsolidity/semanticTests/various/multi_modifiers.sol
deleted file mode 100644
index 07f6c038d3db..000000000000
--- a/test/libsolidity/semanticTests/various/multi_modifiers.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// This triggered a bug in some version because the variable in the modifier was not
-// unregistered correctly.
-contract C {
-    uint256 public x;
-    modifier m1 {
-        address a1 = msg.sender;
-        x++;
-        _;
-    }
-
-    function f1() public m1() {
-        x += 7;
-    }
-
-    function f2() public m1() {
-        x += 3;
-    }
-}
-// ----
-// f1() ->
-// x() -> 0x08
-// f2() ->
-// x() -> 0x0c
diff --git a/test/libsolidity/semanticTests/various/multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
deleted file mode 100644
index de4ecdbe46bd..000000000000
--- a/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract C {
-    function g() public returns (uint256 a, uint256 b, uint256 c) {
-        a = 1;
-        b = 2;
-        c = 3;
-    }
-
-    function h() public returns (uint256 a, uint256 b, uint256 c, uint256 d) {
-        a = 1;
-        b = 2;
-        c = 3;
-        d = 4;
-    }
-
-    function f1() public returns (bool) {
-        (uint256 x, uint256 y, uint256 z) = g();
-        if (x != 1 || y != 2 || z != 3) return false;
-        (, uint256 a, ) = g();
-        if (a != 2) return false;
-        (uint256 b, , ) = g();
-        if (b != 1) return false;
-        (, , uint256 c) = g();
-        if (c != 3) return false;
-        return true;
-    }
-
-    function f2() public returns (bool) {
-        (uint256 a1, , uint256 a3, ) = h();
-        if (a1 != 1 || a3 != 3) return false;
-        (uint256 b1, uint256 b2, , ) = h();
-        if (b1 != 1 || b2 != 2) return false;
-        (, uint256 c2, uint256 c3, ) = h();
-        if (c2 != 2 || c3 != 3) return false;
-        (, , uint256 d3, uint256 d4) = h();
-        if (d3 != 3 || d4 != 4) return false;
-        (uint256 e1, , uint256 e3, uint256 e4) = h();
-        if (e1 != 1 || e3 != 3 || e4 != 4) return false;
-        return true;
-    }
-
-    function f() public returns (bool) {
-        return f1() && f2();
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/various/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
deleted file mode 100644
index 3c9130e9fdf0..000000000000
--- a/test/libsolidity/semanticTests/various/negative_stack_height.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-contract C {
-    mapping(uint256 => Invoice) public invoices;
-    struct Invoice {
-        uint256 AID;
-        bool Aboola;
-        bool Aboolc;
-        bool exists;
-    }
-
-    function nredit(uint256 startindex)
-        public
-        pure
-        returns (
-            uint256[500] memory CIDs,
-            uint256[500] memory dates,
-            uint256[500] memory RIDs,
-            bool[500] memory Cboolas,
-            uint256[500] memory amounts
-        )
-    {}
-
-    function return500InvoicesByDates(
-        uint256 begindate,
-        uint256 enddate,
-        uint256 startindex
-    )
-        public
-        view
-        returns (
-            uint256[500] memory AIDs,
-            bool[500] memory Aboolas,
-            uint256[500] memory dates,
-            bytes32[3][500] memory Abytesas,
-            bytes32[3][500] memory bytesbs,
-            bytes32[2][500] memory bytescs,
-            uint256[500] memory amounts,
-            bool[500] memory Aboolbs,
-            bool[500] memory Aboolcs
-        )
-    {}
-
-    function return500PaymentsByDates(
-        uint256 begindate,
-        uint256 enddate,
-        uint256 startindex
-    )
-        public
-        view
-        returns (
-            uint256[500] memory BIDs,
-            uint256[500] memory dates,
-            uint256[500] memory RIDs,
-            bool[500] memory Bboolas,
-            bytes32[3][500] memory bytesbs,
-            bytes32[2][500] memory bytescs,
-            uint256[500] memory amounts,
-            bool[500] memory Bboolbs
-        )
-    {}
-}
-
-// via yul disabled because of stack issues.
-
-// ====
-// compileViaYul: false
-// ----
-// constructor() ->
-// gas legacy: 575272
-// gas legacyOptimized: 345026
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
deleted file mode 100644
index b11241322cec..000000000000
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S1 {
-        uint256 a;
-        uint256 b;
-    }
-    struct S2 {
-        uint256 a;
-        uint256 b;
-        S1 s;
-        uint256 c;
-    }
-
-    function f(S2 calldata s)
-        external
-        pure
-        returns (uint256 a, uint256 b, uint256 sa, uint256 sb, uint256 c)
-    {
-        return (s.a, s.b, s.s.a, s.s.b, s.c);
-    }
-}
-// ----
-// f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
deleted file mode 100644
index 25cd645e45bd..000000000000
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-
-contract C {
-    struct S1 {
-        uint256 a;
-        uint256 b;
-    }
-    struct S2 {
-        uint256 a;
-        uint256 b;
-        S1 s;
-        uint256 c;
-    }
-
-    function f(S2 calldata s)
-        external
-        pure
-        returns (uint256 a, uint256 b, uint256 sa, uint256 sb, uint256 c)
-    {
-        S2 memory m = s;
-        return (m.a, m.b, m.s.a, m.s.b, m.c);
-    }
-}
-// ----
-// f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol b/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
deleted file mode 100644
index 4c0d7114588e..000000000000
--- a/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    int8 public x = 2;
-    int8 public y = 127;
-    int16 public q = 250;
-}
-// ----
-// x() -> 2
-// y() -> 127
-// q() -> 250
diff --git a/test/libsolidity/semanticTests/various/selfdestruct.sol b/test/libsolidity/semanticTests/various/selfdestruct.sol
deleted file mode 100644
index 6aa42cb14413..000000000000
--- a/test/libsolidity/semanticTests/various/selfdestruct.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract C {
-  event Terminated();
-
-  constructor() payable {
-  }
-
-  function terminate() external {
-    emit Terminated();
-    selfdestruct(payable(msg.sender));
-    // Execution stops here, so the second one is not executed.
-    selfdestruct(payable(msg.sender));
-    emit Terminated();
-  }
-}
-
-contract D {
-  C public c;
-
-  constructor() payable {
-      c = new C{value: 1 ether}();
-  }
-
-  function f() external {
-      c.terminate();
-  }
-
-  function exists() external returns (bool) {
-      return address(c).code.length != 0;
-  }
-}
-// ----
-// constructor(), 1 ether ->
-// gas irOptimized: 186958
-// gas legacy: 255973
-// gas legacyOptimized: 178919
-// c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000
-// balance -> 0
-// exists() -> true
-// f() ->
-// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 0
-// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance -> 1000000000000000000
-// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// exists() -> false
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
deleted file mode 100644
index 6628454db9db..000000000000
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function f() public view returns (uint256) {
-        return msg.sender.balance;
-    }
-}
-
-
-contract D {
-    C c = new C();
-
-    constructor() payable {}
-
-    function f() public view returns (uint256) {
-        return c.f();
-    }
-}
-// ----
-// constructor(), 27 wei ->
-// gas irOptimized: 167865
-// gas legacy: 218459
-// gas legacyOptimized: 167292
-// f() -> 27
diff --git a/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol b/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
deleted file mode 100644
index 69c4c4121dee..000000000000
--- a/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract Base {
-    uint256 data;
-
-    function setData(uint256 i) public {
-        data = i;
-    }
-
-    function getViaBase() public returns (uint256 i) {
-        return data;
-    }
-}
-
-
-contract A is Base {
-    function setViaA(uint256 i) public {
-        setData(i);
-    }
-}
-
-
-contract B is Base {
-    function getViaB() public returns (uint256 i) {
-        return getViaBase();
-    }
-}
-
-
-contract Derived is Base, B, A {}
-// ----
-// getViaB() -> 0
-// setViaA(uint256): 23 ->
-// getViaB() -> 23
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
deleted file mode 100644
index 186b162c2515..000000000000
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// The EVM cannot provide access to dynamically-sized return values, so we have to skip them.
-contract C {
-    function f() public returns (uint256, uint256[] memory, uint256) {
-        return (7, new uint256[](2), 8);
-    }
-
-    function g() public returns (uint256, uint256) {
-        // Previous implementation "moved" b to the second place and did not skip.
-        (uint256 a, , uint256 b) = this.f();
-        return (a, b);
-    }
-}
-// ----
-// g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
deleted file mode 100644
index 75fdb1e8d8c5..000000000000
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        bool[] b;
-    }
-
-    function f() public returns (uint256, bool[][2] memory, S[2] memory, uint256) {
-        return (
-            5,
-            [new bool[](1), new bool[](2)],
-            [S(new bool[](2)), S(new bool[](5))],
-            6
-        );
-    }
-
-    function g() public returns (uint256, uint256) {
-        (uint256 a, , , uint256 b) = this.f();
-        return (a, b);
-    }
-}
-// ----
-// g() -> 5, 6
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
deleted file mode 100644
index ce8946c55c4e..000000000000
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-// For accessors, the dynamic types are already removed in the external signature itself.
-contract C {
-    struct S {
-        uint256 x;
-        string a; // this is present in the accessor
-        uint256[] b; // this is not present
-        uint256 y;
-    }
-    S public s;
-
-    function g() public returns (uint256, uint256) {
-        s.x = 2;
-        s.a = "abc";
-        s.b = [7, 8, 9];
-        s.y = 6;
-        (uint256 x, , uint256 y) = this.s();
-        return (x, y);
-    }
-}
-// ----
-// g() -> 2, 6
-// gas irOptimized: 178475
-// gas legacy: 180839
-// gas legacyOptimized: 179374
diff --git a/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol b/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
deleted file mode 100644
index f7add5fba191..000000000000
--- a/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    uint256 x = 1;
-    uint256 y = 2;
-
-    function a() public returns (uint256 x) {
-        x = A.y;
-    }
-}
-// ----
-// a() -> 2
diff --git a/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol b/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
deleted file mode 100644
index 1167da57e08d..000000000000
--- a/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Scope {
-    uint256 stateVar = 42;
-
-    function getStateVar() public view returns (uint256 stateVar) {
-        stateVar = Scope.stateVar;
-    }
-}
-// ----
-// getStateVar() -> 42
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
deleted file mode 100644
index 1306529d4183..000000000000
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract C {
-    uint256 x;
-
-    function f() public returns (uint256) {
-        x = 3;
-        return 1;
-    }
-}
-
-
-interface CView {
-    function f() external view returns (uint256);
-}
-
-
-interface CPure {
-    function f() external pure returns (uint256);
-}
-
-
-contract D {
-    function f() public returns (uint256) {
-        return (new C()).f();
-    }
-
-    function fview() public returns (uint256) {
-        return (CView(address(new C()))).f();
-    }
-
-    function fpure() public returns (uint256) {
-        return (CPure(address(new C()))).f();
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f() -> 0x1 # This should work, next should throw #
-// gas legacy: 102095
-// fview() -> FAILURE
-// gas irOptimized: 98438588
-// gas legacy: 98438774
-// gas legacyOptimized: 98438580
-// fpure() -> FAILURE
-// gas irOptimized: 98438589
-// gas legacy: 98438774
-// gas legacyOptimized: 98438580
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol
deleted file mode 100644
index a193e875204d..000000000000
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    uint256 x;
-
-    function f() public returns (uint256) {
-        x = 3;
-        return 1;
-    }
-}
-
-
-interface CView {
-    function f() external view returns (uint256);
-}
-
-
-interface CPure {
-    function f() external pure returns (uint256);
-}
-
-
-contract D {
-    function f() public returns (uint256) {
-        return (new C()).f();
-    }
-
-    function fview() public returns (uint256) {
-        return (CView(address(new C()))).f();
-    }
-
-    function fpure() public returns (uint256) {
-        return (CPure(address(new C()))).f();
-    }
-}
-// ====
-// EVMVersion: <byzantium
-// ----
-// f() -> 0x1
-// fview() -> 1
-// fpure() -> 1
diff --git a/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol b/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
deleted file mode 100644
index df3f97ebfe2c..000000000000
--- a/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    mapping(string => uint256) data;
-
-    function f() public returns (uint256) {
-        data["abc"] = 2;
-        return data["abc"];
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/various/store_bytes.sol b/test/libsolidity/semanticTests/various/store_bytes.sol
deleted file mode 100644
index 4b92a251a072..000000000000
--- a/test/libsolidity/semanticTests/various/store_bytes.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// this test just checks that the copy loop does not mess up the stack
-contract C {
-    function save() public returns (uint256 r) {
-        r = 23;
-        savedData = msg.data;
-        r = 24;
-    }
-
-    bytes savedData;
-}
-// ----
-// save() -> 24 # empty copy loop #
-// save(): "abcdefg" -> 24
diff --git a/test/libsolidity/semanticTests/various/string_tuples.sol b/test/libsolidity/semanticTests/various/string_tuples.sol
deleted file mode 100644
index 57028ae39a05..000000000000
--- a/test/libsolidity/semanticTests/various/string_tuples.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public returns (string memory, uint256) {
-        return ("abc", 8);
-    }
-
-    function g() public returns (string memory, string memory) {
-        return (h(), "def");
-    }
-
-    function h() public returns (string memory) {
-        return ("abc");
-    }
-}
-// ----
-// f() -> 0x40, 0x8, 0x3, "abc"
-// g() -> 0x40, 0x80, 0x3, "abc", 0x3, "def"
diff --git a/test/libsolidity/semanticTests/various/super.sol b/test/libsolidity/semanticTests/various/super.sol
deleted file mode 100644
index cd1b4a71afd8..000000000000
--- a/test/libsolidity/semanticTests/various/super.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract A {
-    function f() public virtual returns (uint256 r) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() public virtual override returns (uint256 r) {
-        return super.f() | 2;
-    }
-}
-
-
-contract C is A {
-    function f() public virtual override returns (uint256 r) {
-        return super.f() | 4;
-    }
-}
-
-
-contract D is B, C {
-    function f() public override(B, C) returns (uint256 r) {
-        return super.f() | 8;
-    }
-}
-// ----
-// f() -> 15
diff --git a/test/libsolidity/semanticTests/various/super_alone.sol b/test/libsolidity/semanticTests/various/super_alone.sol
deleted file mode 100644
index 223e31762c86..000000000000
--- a/test/libsolidity/semanticTests/various/super_alone.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-    function f() public {
-        super;
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/various/super_parentheses.sol b/test/libsolidity/semanticTests/various/super_parentheses.sol
deleted file mode 100644
index fd7944764dec..000000000000
--- a/test/libsolidity/semanticTests/various/super_parentheses.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract A {
-    function f() public virtual returns (uint256 r) {
-        return 1;
-    }
-}
-
-
-contract B is A {
-    function f() public virtual override returns (uint256 r) {
-        return ((super).f)() | 2;
-    }
-}
-
-
-contract C is A {
-    function f() public virtual override returns (uint256 r) {
-        return ((super).f)() | 4;
-    }
-}
-
-
-contract D is B, C {
-    function f() public override(B, C) returns (uint256 r) {
-        return ((super).f)() | 8;
-    }
-}
-// ----
-// f() -> 15
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
deleted file mode 100644
index bd5a59519c8d..000000000000
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-// This tests a swap in storage which does not work as one
-// might expect because we do not have temporary storage.
-// (x, y) = (y, x) is the same as
-// y = x;
-// x = y;
-contract c {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-    S public x;
-    S public y;
-
-    function set() public {
-        x.a = 1;
-        x.b = 2;
-        y.a = 3;
-        y.b = 4;
-    }
-
-    function swap() public {
-        (x, y) = (y, x);
-    }
-}
-// ----
-// x() -> 0, 0
-// y() -> 0, 0
-// set() ->
-// gas irOptimized: 109684
-// gas legacy: 109728
-// gas legacyOptimized: 109680
-// x() -> 1, 2
-// y() -> 3, 4
-// swap() ->
-// x() -> 1, 2
-// y() -> 1, 2
diff --git a/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol b/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
deleted file mode 100644
index b9503e44c667..000000000000
--- a/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f(bool cond) public pure returns (uint256) {
-        uint32 x = 0x1234_ab;
-        uint256 y = 0x1234_abcd_1234;
-        return cond ? x : y;
-    }
-}
-// ----
-// f(bool): true -> 0x1234ab
-// f(bool): false -> 0x1234abcd1234
diff --git a/test/libsolidity/semanticTests/various/tuples.sol b/test/libsolidity/semanticTests/various/tuples.sol
deleted file mode 100644
index 4580075954d3..000000000000
--- a/test/libsolidity/semanticTests/various/tuples.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    uint256[] data;
-    uint256[] m_c;
-
-    function g() internal returns (uint256 a, uint256 b, uint256[] storage c) {
-        return (1, 2, data);
-    }
-
-    function h() external returns (uint256 a, uint256 b) {
-        return (5, 6);
-    }
-
-    function f() public returns (uint256) {
-        data.push(3);
-        uint256 a;
-        uint256 b;
-        (a, b) = this.h();
-        if (a != 5 || b != 6) return 1;
-        uint256[] storage c = m_c;
-        (a, b, c) = g();
-        if (a != 1 || b != 2 || c[0] != 3) return 2;
-        (a, b) = (b, a);
-        if (a != 2 || b != 1) return 3;
-        (a, , b, , ) = (8, 9, 10, 11, 12);
-        if (a != 8 || b != 10) return 4;
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
deleted file mode 100644
index c9f12fdaefd4..000000000000
--- a/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    struct S {
-        uint256 x;
-    }
-    S s;
-
-    function g() internal returns (uint256, S storage, uint256) {
-        s.x = 7;
-        return (1, s, 2);
-    }
-
-    function f() public returns (bool) {
-        (uint256 x1, S storage y1, uint256 z1) = g();
-        if (x1 != 1 || y1.x != 7 || z1 != 2) return false;
-        (, S storage y2, ) = g();
-        if (y2.x != 7) return false;
-        (uint256 x2, , ) = g();
-        if (x2 != 1) return false;
-        (, , uint256 z2) = g();
-        if (z2 != 2) return false;
-        return true;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
deleted file mode 100644
index 9f262fbdeb51..000000000000
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract helper {
-    function getBalance() public payable returns (uint256 myBalance) {
-        return address(this).balance;
-    }
-}
-
-
-contract test {
-    helper h;
-
-    constructor() payable {
-        h = new helper();
-    }
-
-    function sendAmount(uint256 amount) public payable returns (uint256 bal) {
-        uint256 someStackElement = 20;
-        return h.getBalance{value: amount + 3, gas: 1000}();
-    }
-}
-// ----
-// constructor(), 20 wei ->
-// gas irOptimized: 172407
-// gas legacy: 252296
-// gas legacyOptimized: 180352
-// sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
deleted file mode 100644
index 1e591050c3b3..000000000000
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract helper {
-    function getBalance() public payable returns (uint256 myBalance) {
-        return address(this).balance;
-    }
-}
-
-
-contract test {
-    helper h;
-
-    constructor() payable {
-        h = new helper();
-    }
-
-    function sendAmount(uint256 amount) public returns (uint256 bal) {
-        return h.getBalance{value: amount + 3, gas: 1000}();
-    }
-}
-// ----
-// constructor(), 20 wei ->
-// gas irOptimized: 173271
-// gas legacy: 253820
-// gas legacyOptimized: 180784
-// sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/write_storage_external.sol b/test/libsolidity/semanticTests/various/write_storage_external.sol
deleted file mode 100644
index a8959b24ea81..000000000000
--- a/test/libsolidity/semanticTests/various/write_storage_external.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    uint256 public x;
-
-    function f(uint256 y) public payable {
-        x = y;
-    }
-
-    function g(uint256 y) external {
-        x = y;
-    }
-
-    function h() public {
-        this.g(12);
-    }
-}
-
-
-contract D {
-    C c = new C();
-
-    function f() public payable returns (uint256) {
-        c.g(3);
-        return c.x();
-    }
-
-    function g() public returns (uint256) {
-        c.g(8);
-        return c.x();
-    }
-
-    function h() public returns (uint256) {
-        c.h();
-        return c.x();
-    }
-}
-// ----
-// f() -> 3
-// g() -> 8
-// h() -> 12
diff --git a/test/libsolidity/semanticTests/viaYul/assert.sol b/test/libsolidity/semanticTests/viaYul/assert.sol
deleted file mode 100644
index bd1cabc48be3..000000000000
--- a/test/libsolidity/semanticTests/viaYul/assert.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f(bool a) public pure returns (bool x) {
-        bool b = a;
-        x = b;
-        assert(b);
-    }
-    function fail() public pure returns (bool x) {
-        x = true;
-        assert(false);
-    }
-    function succeed() public pure returns (bool x) {
-        x = true;
-        assert(true);
-    }
-}
-// ----
-// f(bool): true -> true
-// f(bool): false -> FAILURE, hex"4e487b71", 0x01
-// fail() -> FAILURE, hex"4e487b71", 0x01
-// succeed() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
deleted file mode 100644
index a403b5d64a65..000000000000
--- a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(bool a) public pure returns (bool x) {
-        bool b = a;
-        x = b;
-        assert(b);
-    }
-    function f2(bool a) public pure returns (bool x) {
-        bool b = a;
-        x = b;
-        require(b);
-    }
-}
-// ----
-// f(bool): true -> true
-// f(bool): false -> FAILURE, hex"4e487b71", 0x01
-// f2(bool): true -> true
-// f2(bool): false -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol b/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
deleted file mode 100644
index 5da58b31641d..000000000000
--- a/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure returns (uint, uint, uint) {
-        return (1, 2, 3);
-    }
-    function g() public pure returns (uint a, uint b, uint c) {
-        (c, b, a) = f();
-    }
-    function h() public pure returns (uint a) {
-        (,,a) = f();
-    }
-}
-// ----
-// g() -> 3, 2, 1
-// h() -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol b/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol
deleted file mode 100644
index 19b7cb846430..000000000000
--- a/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-contract C {
-	function add() public pure returns (uint8, uint8) {
-		uint8 x; uint8 y = 0;
-		assembly { x := 0x0101 }
-		return (x + y, y + x);
-	}
-	function sub() public pure returns (uint8, uint8) {
-		uint8 x; uint8 y = 1;
-		assembly { x := 0x0101 }
-		return (x - y, y - x);
-	}
-	function mul() public pure returns (uint8, uint8) {
-		uint8 x; uint8 y = 1;
-		assembly { x := 0x0101 }
-		return (x * y, y * x);
-	}
-	function div() public pure returns (uint8, uint8) {
-		uint8 x; uint8 y = 1;
-		assembly { x := 0x0101 }
-		return (x / y, y / x);
-	}
-	function mod() public pure returns (uint8, uint8) {
-		uint8 x; uint8 y = 2;
-		assembly { x := 0x0101 }
-		return (x % y, y % x);
-	}
-	function inc_pre() public pure returns (uint8) {
-		uint8 x;
-		assembly { x := 0x0100 }
-		return ++x;
-	}
-	function inc_post() public pure returns (uint8) {
-		uint8 x;
-		assembly { x := 0x0100 }
-		return x++;
-	}
-	function dec_pre() public pure returns (uint8) {
-		uint8 x;
-		assembly { x := not(0xFF) }
-		return --x;
-	}
-	function dec_post() public pure returns (uint8) {
-		uint8 x;
-		assembly { x := not(0xFF) }
-		return x--;
-	}
-	function neg() public pure returns (int8) {
-		int8 x;
-		assembly { x := 0x80 }
-		return -x;
-	}
-}
-// ====
-// compileViaYul: true
-// ----
-// add() -> 1, 1
-// sub() -> 0, 0
-// mul() -> 1, 1
-// div() -> 1, 1
-// mod() -> 1, 0
-// inc_pre() -> 1
-// inc_post() -> 0
-// dec_pre() -> FAILURE, hex"4e487b71", 0x11
-// dec_post() -> FAILURE, hex"4e487b71", 0x11
-// neg() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol b/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
deleted file mode 100644
index 035c2690614a..000000000000
--- a/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-	function eq() public pure returns (bool) {
-		uint8 x = 1; uint8 y;
-		assembly { y := 0x0101 }
-		return (x == y);
-	}
-	function neq() public pure returns (bool) {
-		uint8 x = 1; uint8 y;
-		assembly { y := 0x0101 }
-		return (x != y);
-	}
-	function geq() public pure returns (bool) {
-		uint8 x = 1; uint8 y;
-		assembly { y := 0x0101 }
-		return (x >= y);
-	}
-	function leq() public pure returns (bool) {
-		uint8 x = 2; uint8 y;
-		assembly { y := 0x0101 }
-		return (x <= y);
-	}
-	function gt() public pure returns (bool) {
-		uint8 x = 2; uint8 y;
-		assembly { y := 0x0101 }
-		return (x > y);
-	}
-	function lt() public pure returns (bool) {
-		uint8 x = 1; uint8 y;
-		assembly { y := 0x0101 }
-		return (x < y);
-	}
-}
-// ----
-// eq() -> true
-// neq() -> false
-// geq() -> true
-// leq() -> false
-// gt() -> true
-// lt() -> false
diff --git a/test/libsolidity/semanticTests/viaYul/comparison.sol b/test/libsolidity/semanticTests/viaYul/comparison.sol
deleted file mode 100644
index 1ac2aec17558..000000000000
--- a/test/libsolidity/semanticTests/viaYul/comparison.sol
+++ /dev/null
@@ -1,72 +0,0 @@
-contract C {
-    function f(address a) public pure returns (bool) {
-        return a == address(0);
-    }
-    function g() public pure returns (bool) {
-        return bytes3("abc") == bytes4("abc");
-    }
-    function lt(uint a, uint b) public pure returns (bool) {
-        return a < b;
-    }
-    function slt(int a, int b) public pure returns (bool) {
-        return a < b;
-    }
-    function lte(uint a, uint b) public pure returns (bool) {
-        return a <= b;
-    }
-    function slte(int a, int b) public pure returns (bool) {
-        return a <= b;
-    }
-    function gt(uint a, uint b) public pure returns (bool) {
-        return a > b;
-    }
-    function sgt(int a, int b) public pure returns (bool) {
-        return a > b;
-    }
-    function gte(uint a, uint b) public pure returns (bool) {
-        return a >= b;
-    }
-    function sgte(int a, int b) public pure returns (bool) {
-        return a >= b;
-    }
-    function eq(uint a, uint b) public pure returns (bool) {
-        return a == b;
-    }
-    function neq(uint a, uint b) public pure returns (bool) {
-        return a != b;
-    }
-}
-// ----
-// f(address): 0x1234 -> false
-// f(address): 0x00 -> true
-// g() -> true
-// lt(uint256,uint256): 4, 5 -> true
-// lt(uint256,uint256): 5, 5 -> false
-// lt(uint256,uint256): 6, 5 -> false
-// gt(uint256,uint256): 4, 5 -> false
-// gt(uint256,uint256): 5, 5 -> false
-// gt(uint256,uint256): 6, 5 -> true
-// lte(uint256,uint256): 4, 5 -> true
-// lte(uint256,uint256): 5, 5 -> true
-// lte(uint256,uint256): 6, 5 -> false
-// gte(uint256,uint256): 4, 5 -> false
-// gte(uint256,uint256): 5, 5 -> true
-// gte(uint256,uint256): 6, 5 -> true
-// eq(uint256,uint256): 4, 5 -> false
-// eq(uint256,uint256): 5, 5 -> true
-// eq(uint256,uint256): 6, 5 -> false
-// neq(uint256,uint256): 4, 5 -> true
-// neq(uint256,uint256): 5, 5 -> false
-// neq(uint256,uint256): 6, 5 -> true
-// slt(int256,int256): -1, 0 -> true
-// slt(int256,int256): 0, 0 -> false
-// slt(int256,int256): 1, 0 -> false
-// sgt(int256,int256): -1, 0 -> false
-// sgt(int256,int256): 0, 0 -> false
-// sgt(int256,int256): 1, 0 -> true
-// slte(int256,int256): -1, 0 -> true
-// slte(int256,int256): 0, 0 -> true
-// slte(int256,int256): 1, 0 -> false
-// sgte(int256,int256): -1, 0 -> false
-// sgte(int256,int256): 0, 0 -> true
-// sgte(int256,int256): 1, 0 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
deleted file mode 100644
index a004299b3b75..000000000000
--- a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	// If these two functions are identical, the optimiser
-	// on the old codegen path can deduplicate them, and breaking the test.
-	function internal1() internal pure returns (bool) {
-		return true;
-	}
-	function internal2() internal pure returns (bool) {
-		return false;
-	}
-
-	function equal() public pure returns (bool same, bool diff, bool inv) {
-		function() internal pure returns (bool) invalid;
-		delete invalid;
-		same = internal1 == internal1;
-		diff = internal1 == internal2;
-		inv  = internal1 == invalid;
-	}
-
-	function unequal() public pure returns (bool same, bool diff, bool inv) {
-		function() internal pure returns (bool) invalid;
-		delete invalid;
-		same = internal1 != internal1;
-		diff = internal1 != internal2;
-		inv  = internal1 != invalid;
-	}
-}
-// ----
-// equal() -> true, false, false
-// unequal() -> false, true, true
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
deleted file mode 100644
index 828398f57b40..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function f() public pure returns (uint) {
-		uint x = 3 < 0 ? 2 > 1 ? 2 : 1 : 7 > 2 ? 7 : 6;
-		return x;
-	}
-}
-// ----
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
deleted file mode 100644
index c2bbb08d5294..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-	function f() public pure returns (uint) {
-		uint x = true ? 1 : 0;
-		uint y = false ? 0 : 1;
-		return x + y;
-	}
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
deleted file mode 100644
index 51030f9a3a25..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-	function f(bool cond) public pure returns (uint, uint) {
-		(uint a, uint b) = cond ? (1, 2) : (3, 4);
-		return (a, b);
-	}
-}
-// ----
-// f(bool): true -> 1, 2
-// f(bool): false -> 3, 4
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
deleted file mode 100644
index 80d4dde60dc6..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function f() public pure returns (uint, uint, uint, uint) {
-		uint y1 = 1;
-		uint y2 = 1;
-		uint x = 3 < 0 ? y1 = 3 : 6;
-		uint z = 3 < 10 ? y2 = 5 : 6;
-		return (x, y1, y2, z);
-	}
-}
-// ----
-// f() -> 6, 1, 5, 5
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
deleted file mode 100644
index 4de296630d46..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-	function f() public pure returns (uint, uint, uint, uint) {
-		uint x = 3;
-		uint y = 1;
-		uint z = (x > y) ? x : y;
-		uint w = x < y ? x : y;
-		return (x, y, z, w);
-	}
-}
-// ----
-// f() -> 3, 1, 3, 1
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
deleted file mode 100644
index cc5a156e20dc..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint16 x) {
-        uint8 y = uint8(0x78);
-        x = y;
-    }
-}
-// ----
-// f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
deleted file mode 100644
index 0ab4b34a741d..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bytes32 b) public pure returns (bytes32 x) {
-        x = b;
-    }
-    function g() public pure returns (bytes32 x) {
-        x = f(bytes4(uint32(0x12345678)));
-    }
-}
-// ----
-// g() -> 0x1234567800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
deleted file mode 100644
index 425c6eaedd68..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint a) public pure returns (uint8 x) {
-        uint8 b = uint8(a);
-        x = b;
-    }
-}
-// ----
-// f(uint256): 0x12345678 -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
deleted file mode 100644
index 46d4492e98dd..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// Triggered ICE before
-contract C {
-	function f(string calldata data) external pure returns(string memory) {
-		bytes calldata test = bytes(data[:3]);
-		return string(test);
-	}
-}
-// ----
-// f(string): 0x20, 3, "123" -> 0x20, 3, "123"
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
deleted file mode 100644
index 843376baa553..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f(uint x) public pure returns (uint) {
-		return 2 * x;
-	}
-	function g() public view returns (function (uint) external returns (uint)) {
-		return this.f;
-	}
-	function h(uint x) public returns (uint) {
-		return this.g()(x) + 1;
-	}
-	function t() external view returns (
-			function(uint) external returns (uint) a,
-			function(uint) external view returns (uint) b) {
-		a = this.f;
-		b = this.f;
-	}
-}
-// ----
-// f(uint256): 2 -> 4
-// h(uint256): 2 -> 5
-// t() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79eb3de648b0000000000000000, 0xc06afe3a8444fc0004668591e8306bfb9968e79eb3de648b0000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
deleted file mode 100644
index e22466010c83..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// Tests IRGeneratorForStatements::visit(Assignment const& _assignment)
-contract C {
-    function f() public pure returns (uint16 x) {
-        uint8 y;
-        assembly {
-            y := 0x12345678
-        }
-        x = y;
-    }
-}
-// ----
-// f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
deleted file mode 100644
index e62d45b3576f..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// IRGeneratorForStatements::visit(FunctionCall const& _functionCall)
-contract C {
-    function f(uint b) public pure returns (uint x) {
-        x = b;
-    }
-    function g() public pure returns (uint x) {
-        uint8 a;
-        assembly {
-            a := 0x12345678
-        }
-        x = f(a);
-    }
-}
-// ----
-// g() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
deleted file mode 100644
index 3793b4e0cf21..000000000000
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// IRGeneratorForStatements::visit(VariableDeclarationStatement const& _varDeclStatement)
-contract C {
-    function f() public pure returns (uint y) {
-        uint8 a;
-        assembly { a := 0x12345678 }
-        uint z = a;
-        y = z;
-    }
-}
-// ----
-// f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
deleted file mode 100644
index 5a85ba07591a..000000000000
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	struct Struct {
-		function () external el;
-	}
-	Struct[] array;
-	int externalCalled = 0;
-
-	function ext() external {
-		externalCalled++;
-	}
-
-	function f() public {
-		array.push(Struct(this.ext));
-		array.push(array[0]);
-
-		array[0].el();
-		array[1].el();
-
-		assert(externalCalled == 2);
-	}
-}
-// ----
-// f() ->
-// gas irOptimized: 112969
-// gas legacy: 112890
-// gas legacyOptimized: 112580
diff --git a/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol b/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
deleted file mode 100644
index 3e1559bcfa2f..000000000000
--- a/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public pure returns (uint, uint, uint) {
-        return (1, 2, 3);
-    }
-    function g() public pure returns (uint x, uint y, uint z) {
-        (uint c, uint b, uint a) = f();
-        (x, y, z) = (a, b, c);
-    }
-    function h() public pure returns (uint) {
-        (,,uint a) = f();
-        return a;
-    }
-}
-// ----
-// g() -> 3, 2, 1
-// h() -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/delete.sol b/test/libsolidity/semanticTests/viaYul/delete.sol
deleted file mode 100644
index 6a0f3d598618..000000000000
--- a/test/libsolidity/semanticTests/viaYul/delete.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function internal_func() internal pure returns (int8)
-	{
-		return 1;
-	}
-	function call_internal_func() public pure returns (bool ret)
-	{
-		function() internal pure returns(int8) func = internal_func;
-
-		return func() == internal_func();
-	}
-	function call_deleted_internal_func() public pure returns (bool ret)
-	{
-		function() internal pure returns(int8) func = internal_func;
-
-		delete func;
-
-		return func() == internal_func();
-	}
-}
-// ----
-// call_deleted_internal_func() -> FAILURE, hex"4e487b71", 0x51
-// call_internal_func() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
deleted file mode 100644
index 412998b55993..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint x) {
-        x = a + b;
-    }
-    function g(uint8 a, uint8 b) public pure returns (uint8 x) {
-        x = a + b;
-    }
-}
-// ----
-// f(uint256,uint256): 5, 6 -> 11
-// f(uint256,uint256): -2, 1 -> -1
-// f(uint256,uint256): -2, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): 2, -2 -> FAILURE, hex"4e487b71", 0x11
-// g(uint8,uint8): 128, 64 -> 192
-// g(uint8,uint8): 128, 127 -> 255
-// g(uint8,uint8): 128, 128 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
deleted file mode 100644
index 5c721ac2f2bf..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    function f(int a, int b) public pure returns (int x) {
-        x = a + b;
-    }
-    function g(int8 a, int8 b) public pure returns (int8 x) {
-        x = a + b;
-    }
-}
-// ----
-// f(int256,int256): 5, 6 -> 11
-// f(int256,int256): -2, 1 -> -1
-// f(int256,int256): -2, 2 -> 0
-// f(int256,int256): 2, -2 -> 0
-// f(int256,int256): -5, -6 -> -11
-// f(int256,int256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0, 0x0F -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// f(int256,int256): 0x0F, 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// f(int256,int256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 1 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 1, 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000001, -1 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): -1, 0x8000000000000000000000000000000000000000000000000000000000000001 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000000, -1 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): -1, 0x8000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): 5, 6 -> 11
-// g(int8,int8): -2, 1 -> -1
-// g(int8,int8): -2, 2 -> 0
-// g(int8,int8): 2, -2 -> 0
-// g(int8,int8): -5, -6 -> -11
-// g(int8,int8): 126, 1 -> 127
-// g(int8,int8): 1, 126 -> 127
-// g(int8,int8): 127, 1 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): 1, 127 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -127, -1 -> -128
-// g(int8,int8): -1, -127 -> -128
-// g(int8,int8): -127, -2 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -2, -127 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -128, 0 -> -128
-// g(int8,int8): 0, -128 -> -128
diff --git a/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
deleted file mode 100644
index d4cefe12f651..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint x) {
-        x = a / b;
-    }
-    function g(int8 a, int8 b) public pure returns (int8 x) {
-        x = a / b;
-    }
-    function h(uint256 a, uint256 b) public pure returns (uint256 x) {
-        x = a / b;
-    }
-}
-// ----
-// f(uint256,uint256): 10, 3 -> 3
-// f(uint256,uint256): 1, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(uint256,uint256): 0, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(uint256,uint256): 0, 1 -> 0
-// g(int8,int8): -10, 3 -> -3
-// g(int8,int8): -10, -3 -> 3
-// g(int8,int8): -10, 0 -> FAILURE, hex"4e487b71", 0x12
-// g(int8,int8): -128, 1 -> -128
-// g(int8,int8): -128, -2 -> 64
-// g(int8,int8): -128, 2 -> -64
-// g(int8,int8): -128, -1 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -127, -1 -> 127
-// h(uint256,uint256): 0x8000000000000000000000000000000000000000000000000000000000000000, -1 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol b/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
deleted file mode 100644
index 0d0432987459..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint x) {
-        x = a % b;
-    }
-    function g(uint8 a, uint8 b) public pure returns (uint8 x) {
-        x = a % b;
-    }
-}
-// ----
-// f(uint256,uint256): 10, 3 -> 1
-// f(uint256,uint256): 10, 2 -> 0
-// f(uint256,uint256): 11, 2 -> 1
-// f(uint256,uint256): 2, 2 -> 0
-// f(uint256,uint256): 1, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(uint256,uint256): 0, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(uint256,uint256): 0, 1 -> 0
-// g(uint8,uint8): 10, 3 -> 1
-// g(uint8,uint8): 10, 2 -> 0
-// g(uint8,uint8): 11, 2 -> 1
-// g(uint8,uint8): 2, 2 -> 0
-// g(uint8,uint8): 1, 0 -> FAILURE, hex"4e487b71", 0x12
-// g(uint8,uint8): 0, 0 -> FAILURE, hex"4e487b71", 0x12
-// g(uint8,uint8): 0, 1 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
deleted file mode 100644
index e97bc4cc30a2..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-    function f(int a, int b) public pure returns (int x) {
-        x = a % b;
-    }
-    function g(int8 a, int8 b) public pure returns (int8 x) {
-        x = a % b;
-    }
-}
-// ----
-// f(int256,int256): 10, 3 -> 1
-// f(int256,int256): 10, 2 -> 0
-// f(int256,int256): 11, 2 -> 1
-// f(int256,int256): -10, 3 -> -1
-// f(int256,int256): 10, -3 -> 1
-// f(int256,int256): -10, -3 -> -1
-// f(int256,int256): 2, 2 -> 0
-// f(int256,int256): 1, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(int256,int256): -1, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(int256,int256): 0, 0 -> FAILURE, hex"4e487b71", 0x12
-// f(int256,int256): 0, 1 -> 0
-// f(int256,int256): 0, -1 -> 0
-// g(int8,int8): 10, 3 -> 1
-// g(int8,int8): 10, 2 -> 0
-// g(int8,int8): 11, 2 -> 1
-// g(int8,int8): -10, 3 -> -1
-// g(int8,int8): 10, -3 -> 1
-// g(int8,int8): -10, -3 -> -1
-// g(int8,int8): 2, 2 -> 0
-// g(int8,int8): 1, 0 -> FAILURE, hex"4e487b71", 0x12
-// g(int8,int8): -1, 0 -> FAILURE, hex"4e487b71", 0x12
-// g(int8,int8): 0, 0 -> FAILURE, hex"4e487b71", 0x12
-// g(int8,int8): 0, 1 -> 0
-// g(int8,int8): 0, -1 -> 0
-// g(int8,int8): -128, -128 -> 0
-// g(int8,int8): -128, 127 -> -1
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
deleted file mode 100644
index 935d03752dc5..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint x) {
-        x = a * b;
-    }
-    function g(uint8 a, uint8 b) public pure returns (uint8 x) {
-        x = a * b;
-    }
-}
-// ----
-// f(uint256,uint256): 5, 6 -> 30
-// f(uint256,uint256): -1, 1 -> -1
-// f(uint256,uint256): -1, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): 0x8000000000000000000000000000000000000000000000000000000000000000, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> -2
-// f(uint256,uint256): 2, 0x8000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): 2, 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> -2
-// f(uint256,uint256): 0x0100000000000000000000000000000000, 0x0100000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): 0x0100000000000000000000000000000000, 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
-// f(uint256,uint256): 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 0x0100000000000000000000000000000000 -> 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
-// f(uint256,uint256): 0x0100000000000000000000000000000001, 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> -1
-// f(uint256,uint256): 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 0x0100000000000000000000000000000001 -> -1
-// f(uint256,uint256): 0x0100000000000000000000000000000002, 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 0x0100000000000000000000000000000002 -> FAILURE, hex"4e487b71", 0x11
-// f(uint256,uint256): -1, 0 -> 0
-// f(uint256,uint256): 0, -1 -> 0
-// g(uint8,uint8): 5, 6 -> 30
-// g(uint8,uint8): 0x80, 2 -> FAILURE, hex"4e487b71", 0x11
-// g(uint8,uint8): 0x7F, 2 -> 254
-// g(uint8,uint8): 2, 0x7F -> 254
-// g(uint8,uint8): 0x10, 0x10 -> FAILURE, hex"4e487b71", 0x11
-// g(uint8,uint8): 0x0F, 0x11 -> 0xFF
-// g(uint8,uint8): 0x0F, 0x12 -> FAILURE, hex"4e487b71", 0x11
-// g(uint8,uint8): 0x12, 0x0F -> FAILURE, hex"4e487b71", 0x11
-// g(uint8,uint8): 0xFF, 0 -> 0
-// g(uint8,uint8): 0, 0xFF -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
deleted file mode 100644
index 213b1a6d3b24..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
+++ /dev/null
@@ -1,82 +0,0 @@
-contract C {
-    function f(int a, int b) public pure returns (int x) {
-        x = a * b;
-    }
-    function g(int8 a, int8 b) public pure returns (int8 x) {
-        x = a * b;
-    }
-    function h(int160 a, int160 b) public pure returns (int160 x) {
-        x = a * b;
-    }
-}
-// ----
-// f(int256,int256): 5, 6 -> 30
-// f(int256,int256): -1, 1 -> -1
-// f(int256,int256): -1, 2 -> -2 # positive, positive #
-// f(int256,int256): 0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// f(int256,int256): 0x4000000000000000000000000000000000000000000000000000000000000000, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 2, 0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): -1, 0x8000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000000, -1 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
-// f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
-// f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
-// f(int256,int256): 0x4000000000000000000000000000000000000000000000000000000000000000, -2 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): 0x4000000000000000000000000000000000000000000000000000000000000001, -2 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 2, 0xC000000000000000000000000000000000000000000000000000000000000000 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): 2, 0xBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE, hex"4e487b71", 0x11 # negative, positive #
-// f(int256,int256): 2, 0xBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE, hex"4e487b71", 0x11 # negative, positive #
-// f(int256,int256): 2, 0xBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE, hex"4e487b71", 0x11 # negative, positive #
-// f(int256,int256): -2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): -2, 0x4000000000000000000000000000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 0xC000000000000000000000000000000000000000000000000000000000000000, 2 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): 0xBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> FAILURE, hex"4e487b71", 0x11 # negative, negative #
-// f(int256,int256): 0xBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> FAILURE, hex"4e487b71", 0x11 # negative, negative #
-// f(int256,int256): 0xBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> FAILURE, hex"4e487b71", 0x11 # negative, negative #
-// f(int256,int256): 0xC000000000000000000000000000000000000000000000000000000000000001, -2 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// f(int256,int256): 0xC000000000000000000000000000000000000000000000000000000000000000, -2 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): -2, 0xC000000000000000000000000000000000000000000000000000000000000001 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// f(int256,int256): -2, 0xC000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # small type #
-// f(int256,int256): -2, 0xC000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # small type #
-// f(int256,int256): -2, 0xC000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # small type #
-// g(int8,int8): 5, 6 -> 30
-// g(int8,int8): -1, 1 -> -1
-// g(int8,int8): -1, 2 -> -2 # positive, positive #
-// g(int8,int8): 63, 2 -> 126
-// g(int8,int8): 64, 2 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): 2, 63 -> 126
-// g(int8,int8): 2, 64 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
-// g(int8,int8): 2, 64 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
-// g(int8,int8): 2, 64 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
-// g(int8,int8): 64, -2 -> -128
-// g(int8,int8): 65, -2 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): 2, -64 -> -128
-// g(int8,int8): 2, -65 -> FAILURE, hex"4e487b71", 0x11 # negative, positive #
-// g(int8,int8): 2, -65 -> FAILURE, hex"4e487b71", 0x11 # negative, positive #
-// g(int8,int8): 2, -65 -> FAILURE, hex"4e487b71", 0x11 # negative, positive #
-// g(int8,int8): -2, 64 -> -128
-// g(int8,int8): -2, 65 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -64, 2 -> -128
-// g(int8,int8): -65, 2 -> FAILURE, hex"4e487b71", 0x11 # negative, negative #
-// g(int8,int8): -65, 2 -> FAILURE, hex"4e487b71", 0x11 # negative, negative #
-// g(int8,int8): -65, 2 -> FAILURE, hex"4e487b71", 0x11 # negative, negative #
-// g(int8,int8): -63, -2 -> 126
-// g(int8,int8): -64, -2 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -2, -63 -> 126
-// g(int8,int8): -2, -64 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): -1, 1 -> -1
-// h(int160,int160): 1, -1 -> -1
-// h(int160,int160): -1, 2 -> -2
-// h(int160,int160): 2, -1 -> -2
-// h(int160,int160): -1, 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): -1, 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000, -1 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): 0x0000000000000000000000004000000000000000000000000000000000000000, -2 -> 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000
-// h(int160,int160): -2, 0x0000000000000000000000004000000000000000000000000000000000000000 -> 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000
-// h(int160,int160): -2, 0x0000000000000000000000004000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): 0x0000000000000000000000004000000000000000000000000000000000000001, -2 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): 0x0000000000000000000000004000000000000000000000000000000000000001, 2 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): 2, 0x0000000000000000000000004000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11
-// h(int160,int160): 0x0000000000000000000000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> 0x0000000000000000000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
-// h(int160,int160): 2, 0x0000000000000000000000004000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
deleted file mode 100644
index ee059137a028..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint x) {
-        x = a - b;
-    }
-    function g(uint8 a, uint8 b) public pure returns (uint8 x) {
-        x = a - b;
-    }
-}
-// ----
-// f(uint256,uint256): 6, 5 -> 1
-// f(uint256,uint256): 6, 6 -> 0
-// f(uint256,uint256): 5, 6 -> FAILURE, hex"4e487b71", 0x11
-// g(uint8,uint8): 6, 5 -> 1
-// g(uint8,uint8): 6, 6 -> 0
-// g(uint8,uint8): 5, 6 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
deleted file mode 100644
index a247af68bff8..000000000000
--- a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    function f(int a, int b) public pure returns (int x) {
-        x = a - b;
-    }
-    function g(int8 a, int8 b) public pure returns (int8 x) {
-        x = a - b;
-    }
-}
-// ----
-// f(int256,int256): 5, 6 -> -1
-// f(int256,int256): -2, 1 -> -3
-// f(int256,int256): -2, 2 -> -4
-// f(int256,int256): 2, -2 -> 4
-// f(int256,int256): 2, 2 -> 0
-// f(int256,int256): -5, -6 -> 1
-// f(int256,int256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0, -15 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// f(int256,int256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0, -16 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, -1 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 15, 0x8000000000000000000000000000000000000000000000000000000000000010 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-// f(int256,int256): 16, 0x8000000000000000000000000000000000000000000000000000000000000010 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 1, 0x8000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): -1, 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): -2, 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000001, 1 -> 0x8000000000000000000000000000000000000000000000000000000000000000
-// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000001, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000000, 1 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): 5, 6 -> -1
-// g(int8,int8): -2, 1 -> -3
-// g(int8,int8): -2, 2 -> -4
-// g(int8,int8): 2, -2 -> 4
-// g(int8,int8): 2, 2 -> 0
-// g(int8,int8): -5, -6 -> 1
-// g(int8,int8): 126, -1 -> 127
-// g(int8,int8): 1, -126 -> 127
-// g(int8,int8): 127, -1 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): 1, -127 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -127, 1 -> -128
-// g(int8,int8): -1, 127 -> -128
-// g(int8,int8): -127, 2 -> FAILURE, hex"4e487b71", 0x11
-// g(int8,int8): -2, 127 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_calldata_struct.sol b/test/libsolidity/semanticTests/viaYul/dirty_calldata_struct.sol
deleted file mode 100644
index 66a92469ac26..000000000000
--- a/test/libsolidity/semanticTests/viaYul/dirty_calldata_struct.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S {
-        uint16[] m;
-    }
-    function f(S calldata s) public pure returns (bool correct) {
-        int8 x = int8(int16(s.m[0]));
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = r == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f((uint16[])): 0x20, 0x20, 0x01, 0x0180 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol
deleted file mode 100644
index 36a253b02452..000000000000
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() public pure returns (bool correct) {
-        uint8[] memory m = new uint8[](1);
-        assembly {
-            mstore(add(m, 32), 258)
-        }
-        uint8 x = m[0];
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = (m[0] == 0x02) && (r == 0x02);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol
deleted file mode 100644
index fc2fe4251658..000000000000
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() public pure returns (bool correct) {
-        uint256[1] memory m;
-        assembly {
-            mstore(m, 0xdeadbeef15dead)
-        }
-        int32 x = int32(uint32(m[0]));
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = (m[0] == 0xdeadbeef15dead) && (r == (((2 ** 224 - 1) << 32) | 0xef15dead));
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol
deleted file mode 100644
index 4742bae2dfdf..000000000000
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() public pure returns (bool correct) {
-        uint8[1] memory m;
-        assembly {
-            mstore(m, 257)
-        }
-        uint8 x = m[0];
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = (m[0] == 0x01) && (r == 0x01);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol
deleted file mode 100644
index 411cbe069e6a..000000000000
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    struct S {
-        uint8[] m;
-    }
-    function f() public pure returns (bool correct) {
-        S memory s;
-        s.m = new uint8[](1);
-        assembly {
-            mstore(add(s, 64), 257)
-        }
-        uint8 x = s.m[0];
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = r == 0x01;
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol
deleted file mode 100644
index a23a566c5bbe..000000000000
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() public pure returns (bool correct) {
-        uint256[1] memory m;
-        assembly {
-            mstore(m, 0xdeadbeef15dead)
-        }
-        uint32 x = uint32(m[0]);
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = (r == 0xef15dead) && (m[0] == 0xdeadbeef15dead);
-    }
-}
-// ====
-// compileViaYul: true
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol b/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
deleted file mode 100644
index ae6cff0e9b7d..000000000000
--- a/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        assembly{ mstore(0x40, sub(0, 1)) }
-    }
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/viaYul/exp.sol b/test/libsolidity/semanticTests/viaYul/exp.sol
deleted file mode 100644
index 324256b456df..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(uint x, uint y) public returns (uint) {
-        return x**y;
-    }
-}
-// ----
-// f(uint256,uint256): 0, 0 -> 1
-// f(uint256,uint256): 0, 1 -> 0x00
-// f(uint256,uint256): 0, 2 -> 0x00
-// f(uint256,uint256): 1, 0 -> 1
-// f(uint256,uint256): 1, 1 -> 1
-// f(uint256,uint256): 1, 2 -> 1
-// f(uint256,uint256): 2, 0 -> 1
-// f(uint256,uint256): 2, 1 -> 2
-// f(uint256,uint256): 2, 2 -> 4
-// f(uint256,uint256): 7, 63 -> 174251498233690814305510551794710260107945042018748343
-// f(uint256,uint256): 128, 2 -> 0x4000
diff --git a/test/libsolidity/semanticTests/viaYul/exp_literals.sol b/test/libsolidity/semanticTests/viaYul/exp_literals.sol
deleted file mode 100644
index 382d75184ff5..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp_literals.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-contract C {
-    function exp_2(uint y) public returns (uint) {
-        return 2**y;
-    }
-    function exp_minus_2(uint y) public returns (int) {
-        return (-2)**y;
-    }
-
-    function exp_uint_max(uint y) public returns (uint) {
-        return (2**256 - 1)**y;
-    }
-    function exp_int_max(uint y) public returns (int) {
-        return ((-2)**255)**y;
-    }
-
-    function exp_5(uint y) public returns (uint) {
-        return 5**y;
-    }
-    function exp_minus_5(uint y) public returns (int) {
-        return (-5)**y;
-    }
-
-    function exp_256(uint y) public returns (uint) {
-        return 256**y;
-    }
-    function exp_minus_256(uint y) public returns (int) {
-        return (-256)**y;
-    }
-
-}
-// ====
-// compileViaYul: true
-// ----
-// exp_2(uint256): 255 -> 57896044618658097711785492504343953926634992332820282019728792003956564819968
-// exp_2(uint256): 256 -> FAILURE, hex"4e487b71", 0x11
-// exp_minus_2(uint256): 255 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// exp_minus_2(uint256): 256 -> FAILURE, hex"4e487b71", 0x11
-// exp_uint_max(uint256): 1 -> 115792089237316195423570985008687907853269984665640564039457584007913129639935
-// exp_uint_max(uint256): 2 -> FAILURE, hex"4e487b71", 0x11
-// exp_int_max(uint256): 1 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// exp_int_max(uint256): 2 -> FAILURE, hex"4e487b71", 0x11
-// exp_5(uint256): 110 -> 77037197775489434122239117703397092741524065928615527809597551822662353515625
-// exp_5(uint256): 111 -> FAILURE, hex"4e487b71", 0x11
-// exp_minus_5(uint256): 109 -> -15407439555097886824447823540679418548304813185723105561919510364532470703125
-// exp_minus_5(uint256): 110 -> FAILURE, hex"4e487b71", 0x11
-// exp_256(uint256): 31 -> 452312848583266388373324160190187140051835877600158453279131187530910662656
-// exp_256(uint256): 32 -> FAILURE, hex"4e487b71", 0x11
-// exp_minus_256(uint256): 31 -> -452312848583266388373324160190187140051835877600158453279131187530910662656
-// exp_minus_256(uint256): 32 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol b/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
deleted file mode 100644
index 12ab33924293..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    function exp_2(uint y) public returns (uint) {
-        return 2**y;
-    }
-    function exp_minus_2(uint y) public returns (int) {
-        return (-2)**y;
-    }
-
-    function exp_uint_max(uint y) public returns (uint) {
-        return (2**256 - 1)**y;
-    }
-    function exp_int_max(uint y) public returns (int) {
-        return ((-2)**255)**y;
-    }
-
-    function exp_5(uint y) public returns (uint) {
-        return 5**y;
-    }
-    function exp_minus_5(uint y) public returns (int) {
-        return (-5)**y;
-    }
-
-    function exp_256(uint y) public returns (uint) {
-        return 256**y;
-    }
-    function exp_minus_256(uint y) public returns (int) {
-        return (-256)**y;
-    }
-
-}
-// ----
-// exp_2(uint256): 255 -> 57896044618658097711785492504343953926634992332820282019728792003956564819968
-// exp_minus_2(uint256): 255 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// exp_uint_max(uint256): 1 -> 115792089237316195423570985008687907853269984665640564039457584007913129639935
-// exp_int_max(uint256): 1 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// exp_5(uint256): 110 -> 77037197775489434122239117703397092741524065928615527809597551822662353515625
-// exp_minus_5(uint256): 109 -> -15407439555097886824447823540679418548304813185723105561919510364532470703125
-// exp_256(uint256): 31 -> 452312848583266388373324160190187140051835877600158453279131187530910662656
-// exp_minus_256(uint256): 31 -> -452312848583266388373324160190187140051835877600158453279131187530910662656
diff --git a/test/libsolidity/semanticTests/viaYul/exp_neg.sol b/test/libsolidity/semanticTests/viaYul/exp_neg.sol
deleted file mode 100644
index a6ba617d7945..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp_neg.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    function f(int x, uint y) public returns (int) {
-        return x**y;
-    }
-}
-// ----
-// f(int256,uint256): 0, 0 -> 1
-// f(int256,uint256): 0, 1 -> 0x00
-// f(int256,uint256): 0, 2 -> 0x00
-// f(int256,uint256): 1, 0 -> 1
-// f(int256,uint256): 1, 1 -> 1
-// f(int256,uint256): 1, 2 -> 1
-// f(int256,uint256): 2, 0 -> 1
-// f(int256,uint256): 2, 1 -> 2
-// f(int256,uint256): 2, 2 -> 4
-// f(int256,uint256): 7, 63 -> 174251498233690814305510551794710260107945042018748343
-// f(int256,uint256): 128, 2 -> 0x4000
-// f(int256,uint256): -1, 0 -> 1
-// f(int256,uint256): -1, 1 -> -1
-// f(int256,uint256): -1, 2 -> 1
-// f(int256,uint256): -2, 0 -> 1
-// f(int256,uint256): -2, 1 -> -2
-// f(int256,uint256): -2, 2 -> 4
-// f(int256,uint256): -7, 63 -> -174251498233690814305510551794710260107945042018748343
-// f(int256,uint256): -128, 2 -> 0x4000
-// f(int256,uint256): -1, 115792089237316195423570985008687907853269984665640564039457584007913129639935 -> -1
-// f(int256,uint256): -2, 255 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// f(int256,uint256): -8, 85 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// f(int256,uint256): -131072, 15 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// f(int256,uint256): -32, 51 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// f(int256,uint256): -57896044618658097711785492504343953926634992332820282019728792003956564819968, 1 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
diff --git a/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol b/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
deleted file mode 100644
index a966e3ccdbf3..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-    function f(int8 x, uint y) public returns (int) {
-        return x**y;
-    }
-    function g(int256 x, uint y) public returns (int) {
-        return x**y;
-    }
-}
-// ----
-// f(int8,uint256): 2, 6 -> 64
-// f(int8,uint256): 2, 7 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): 2, 8 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -2, 6 -> 64
-// f(int8,uint256): -2, 7 -> -128
-// f(int8,uint256): -2, 8 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): 6, 3 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): 7, 2 -> 0x31
-// f(int8,uint256): 7, 3 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -7, 2 -> 0x31
-// f(int8,uint256): -7, 3 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -7, 4 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): 127, 31 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): 127, 131 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -128, 0 -> 1
-// f(int8,uint256): -128, 1 -> -128
-// f(int8,uint256): -128, 31 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -128, 131 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -11, 2 -> 121
-// f(int8,uint256): -12, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): 12, 2 -> FAILURE, hex"4e487b71", 0x11
-// f(int8,uint256): -5, 3 -> -125
-// f(int8,uint256): -6, 3 -> FAILURE, hex"4e487b71", 0x11
-// g(int256,uint256): -7, 90 -> 11450477594321044359340126713545146077054004823284978858214566372120240027249
-// g(int256,uint256): -7, 91 -> FAILURE, hex"4e487b71", 0x11
-// g(int256,uint256): -63, 42 -> 3735107253208426854890677539053540390278853997836851167913009474475553834369
-// g(int256,uint256): -63, 43 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/exp_overflow.sol b/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
deleted file mode 100644
index 7a100c2be003..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function f(uint8 x, uint8 y) public returns (uint) {
-        return x**y;
-    }
-    function g(uint x, uint y) public returns (uint) {
-        return x**y;
-    }
-}
-// ----
-// f(uint8,uint8): 2, 7 -> 0x80
-// f(uint8,uint8): 2, 8 -> FAILURE, hex"4e487b71", 0x11
-// f(uint8,uint8): 15, 2 -> 225
-// f(uint8,uint8): 6, 3 -> 0xd8
-// f(uint8,uint8): 7, 2 -> 0x31
-// f(uint8,uint8): 7, 3 -> FAILURE, hex"4e487b71", 0x11
-// f(uint8,uint8): 7, 4 -> FAILURE, hex"4e487b71", 0x11
-// f(uint8,uint8): 255, 31 -> FAILURE, hex"4e487b71", 0x11
-// f(uint8,uint8): 255, 131 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 0x200000000000000000000000000000000, 1 -> 0x0200000000000000000000000000000000
-// g(uint256,uint256): 0x100000000000000000000000000000010, 2 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 0x200000000000000000000000000000000, 2 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 0x200000000000000000000000000000000, 3 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 255, 31 -> 400631961586894742455537928461950192806830589109049416147172451019287109375
-// g(uint256,uint256): 255, 32 -> -13630939032658036097408813250890608687528184442832962921928608997994916749311
-// g(uint256,uint256): 255, 33 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 255, 131 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 258, 31 -> 575719427506838823084316385994930914701079543089399988096291424922125729792
-// g(uint256,uint256): 258, 37 -> FAILURE, hex"4e487b71", 0x11
-// g(uint256,uint256): 258, 131 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/exp_various.sol b/test/libsolidity/semanticTests/viaYul/exp_various.sol
deleted file mode 100644
index 3e9cf9d40bb6..000000000000
--- a/test/libsolidity/semanticTests/viaYul/exp_various.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-contract C {
-    function f(uint8 x, uint8 y) public returns (uint) {
-        return x**y;
-    }
-    function g(uint x, uint y) public returns (uint) {
-        return x**y;
-    }
-}
-// ----
-// f(uint8,uint8): 0, 0 -> 1
-// f(uint8,uint8): 0, 1 -> 0x00
-// f(uint8,uint8): 0, 2 -> 0x00
-// f(uint8,uint8): 0, 3 -> 0x00
-// f(uint8,uint8): 1, 0 -> 1
-// f(uint8,uint8): 1, 1 -> 1
-// f(uint8,uint8): 1, 2 -> 1
-// f(uint8,uint8): 1, 3 -> 1
-// f(uint8,uint8): 2, 0 -> 1
-// f(uint8,uint8): 2, 1 -> 2
-// f(uint8,uint8): 2, 2 -> 4
-// f(uint8,uint8): 2, 3 -> 8
-// f(uint8,uint8): 3, 0 -> 1
-// f(uint8,uint8): 3, 1 -> 3
-// f(uint8,uint8): 3, 2 -> 9
-// f(uint8,uint8): 3, 3 -> 0x1b
-// f(uint8,uint8): 10, 0 -> 1
-// f(uint8,uint8): 10, 1 -> 0x0a
-// f(uint8,uint8): 10, 2 -> 100
-// g(uint256,uint256): 0, 0 -> 1
-// g(uint256,uint256): 0, 1 -> 0x00
-// g(uint256,uint256): 0, 2 -> 0x00
-// g(uint256,uint256): 0, 3 -> 0x00
-// g(uint256,uint256): 1, 0 -> 1
-// g(uint256,uint256): 1, 1 -> 1
-// g(uint256,uint256): 1, 2 -> 1
-// g(uint256,uint256): 1, 3 -> 1
-// g(uint256,uint256): 2, 0 -> 1
-// g(uint256,uint256): 2, 1 -> 2
-// g(uint256,uint256): 2, 2 -> 4
-// g(uint256,uint256): 2, 3 -> 8
-// g(uint256,uint256): 3, 0 -> 1
-// g(uint256,uint256): 3, 1 -> 3
-// g(uint256,uint256): 3, 2 -> 9
-// g(uint256,uint256): 3, 3 -> 0x1b
-// g(uint256,uint256): 10, 10 -> 10000000000
-// g(uint256,uint256): 10, 77 -> -15792089237316195423570985008687907853269984665640564039457584007913129639936
-// g(uint256,uint256): 256, 2 -> 0x010000
-// g(uint256,uint256): 256, 31 -> 0x0100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/function_address.sol b/test/libsolidity/semanticTests/viaYul/function_address.sol
deleted file mode 100644
index 0c1c58dd821d..000000000000
--- a/test/libsolidity/semanticTests/viaYul/function_address.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() external returns (address) {
-        return this.f.address;
-    }
-    function g() external returns (bool) {
-      return this.f.address == address(this);
-    }
-    function h(function() external a) public returns (address) {
-      return a.address;
-    }
-}
-// ----
-// f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
-// g() -> true
-// h(function): left(0x1122334400112233445566778899AABBCCDDEEFF42424242) -> 0x1122334400112233445566778899AABBCCDDEEFF
diff --git a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
deleted file mode 100644
index 6f5f90824f60..000000000000
--- a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-    }
-    function g(uint x, uint y) public returns (uint) {
-    }
-    function h() public payable returns (uint) {
-    }
-    function i(bytes32 b) public returns (bytes32) {
-    }
-    function j(bool b) public returns (bool) {
-    }
-    function k(bytes32 b) public returns (bytes32) {
-    }
-    function s() public returns (uint256[] memory) {
-    }
-    function t(uint) public pure {
-    }
-}
-// ----
-// f() -> 0
-// g(uint256,uint256): 1, -2 -> 0
-// h(), 1 ether -> 0
-// i(bytes32), 1 ether: 2 -> FAILURE
-// i(bytes32): 2 -> 0
-// j(bool): true -> false
-// k(bytes32): 0x31 -> 0x00
-// s(): hex"4200ef" -> 0x20, 0
-// t(uint256) -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/function_pointers.sol b/test/libsolidity/semanticTests/viaYul/function_pointers.sol
deleted file mode 100644
index b34f01981788..000000000000
--- a/test/libsolidity/semanticTests/viaYul/function_pointers.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() public {
-		function() internal returns (uint) _f;
-		_f();
-	}
-	function g() public {
-		function() external returns (uint) _g;
-		_g();
-	}
-	function h1() internal returns (function() internal returns (uint) _h) {}
-	function h2() public {
-		h1()();
-	}
-	function k1() internal returns (function() external returns (uint) _k) {}
-	function k2() public {
-		k1()();
-	}
-}
-// ----
-// f() -> FAILURE, hex"4e487b71", 0x51
-// g() -> FAILURE
-// h2() -> FAILURE, hex"4e487b71", 0x51
-// k2() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/function_selector.sol b/test/libsolidity/semanticTests/viaYul/function_selector.sol
deleted file mode 100644
index 4737a36d9a94..000000000000
--- a/test/libsolidity/semanticTests/viaYul/function_selector.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() external returns (bytes4) {
-        return this.f.selector;
-    }
-    function h(function() external a) public returns (bytes4) {
-        return a.selector;
-    }
-}
-// ----
-// f() -> left(0x26121ff0)
-// h(function): left(0x1122334400112233445566778899AABBCCDDEEFF42424242) -> left(0x42424242)
diff --git a/test/libsolidity/semanticTests/viaYul/if.sol b/test/libsolidity/semanticTests/viaYul/if.sol
deleted file mode 100644
index 0fe752d51020..000000000000
--- a/test/libsolidity/semanticTests/viaYul/if.sol
+++ /dev/null
@@ -1,80 +0,0 @@
-contract C {
-    function f(bool condition) public returns (uint x) {
-        x = 23;
-        if (condition)
-            x = 42;
-    }
-    function g(bool condition) public returns (uint x) {
-        x = 0;
-        if (condition)
-            x = 42;
-        else
-            x = 23;
-    }
-    function h(bool condition) public returns (uint x) {
-        if (condition)
-            return 42;
-        x = 23;
-    }
-    function i(bool condition) public returns (uint x) {
-        if (condition)
-            x = 10;
-        else
-            return 23;
-        x = 42;
-    }
-    function j(uint a, uint b) public returns (uint x, uint y) {
-        x = 42;
-        if (a + b < 10)
-            x = a;
-        else
-            x = b;
-        y = 100;
-    }
-    function k(uint a, uint b) public returns (uint x, uint y) {
-        x = 42;
-        do {
-            if (a + b < 10)
-            {
-                if (a == b)
-                {
-                    x = 99; y = 99;
-                    break;
-                }
-                else
-                {
-                    x = a;
-                }
-            }
-            else
-            {
-                x = b;
-                if (a != b)
-                    y = 17;
-                else
-                    y = 13;
-                break;
-            }
-            y = 100;
-        } while(false);
-    }
-}
-// ----
-// f(bool): 0 -> 23
-// f(bool): 1 -> 42
-// g(bool): 0 -> 23
-// g(bool): 1 -> 42
-// h(bool): 0 -> 23
-// h(bool): 1 -> 42
-// i(bool): 0 -> 23
-// i(bool): 1 -> 42
-// j(uint256,uint256): 1, 3 -> 1, 100
-// j(uint256,uint256): 3, 1 -> 3, 100
-// j(uint256,uint256): 10, 23 -> 23, 100
-// j(uint256,uint256): 23, 10 -> 10, 100
-// k(uint256,uint256): 1, 3 -> 1, 100
-// k(uint256,uint256): 3, 1 -> 3, 100
-// k(uint256,uint256): 3, 3 -> 99, 99
-// k(uint256,uint256): 10, 23 -> 23, 17
-// k(uint256,uint256): 23, 10 -> 10, 17
-// k(uint256,uint256): 23, 23 -> 23, 13
diff --git a/test/libsolidity/semanticTests/viaYul/keccak.sol b/test/libsolidity/semanticTests/viaYul/keccak.sol
deleted file mode 100644
index 017d67c50ff3..000000000000
--- a/test/libsolidity/semanticTests/viaYul/keccak.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function keccak1() public pure returns (bytes32) {
-		return keccak256("123");
-    }
-    function keccak2() public pure returns (bytes32) {
-		bytes memory a = "123";
-		return keccak256(a);
-    }
-}
-// ----
-// keccak1() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
-// keccak2() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
diff --git a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
deleted file mode 100644
index 529513eafff5..000000000000
--- a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(address a) public pure returns (address x) {
-        address b = a;
-        x = b;
-    }
-}
-// ----
-// f(address): 0x1234 -> 0x1234
diff --git a/test/libsolidity/semanticTests/viaYul/local_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
deleted file mode 100644
index f77d25c663d4..000000000000
--- a/test/libsolidity/semanticTests/viaYul/local_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint a) public pure returns (uint x) {
-        uint b = a;
-        x = b;
-    }
-}
-// ----
-// f(uint256): 6 -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
deleted file mode 100644
index d32e281dad56..000000000000
--- a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool a) public pure returns (bool x) {
-        bool b = a;
-        x = b;
-    }
-}
-// ----
-// f(bool): true -> true
diff --git a/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
deleted file mode 100644
index ff7f0785574e..000000000000
--- a/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    uint public x = 17;
-    function f(uint a1, uint a2) public returns (uint r1, uint r2) {
-        (uint b1, uint b2) = (a1, a2);
-        (r1, x, r2) = (b1, b2, b2);
-    }
-    function g() public returns (uint a, uint b, uint c) {
-        uint256[3] memory m;
-        (m[0], m[1], m[2]) = (1, x, 3);
-        return (m[2], m[1], m[0]);
-    }
-    function h() public returns (uint a, uint b, uint c) {
-        uint256[3] memory m;
-        (m[0], m[1], , m[2], m[0]) = (1, x, 3, 4, 42);
-        return (m[2], m[1], m[0]);
-    }
-    function i() public returns (uint a, uint b, uint c, uint d) {
-        (a) = 42;
-        (((((b))))) = 23;
-        c = (((17)));
-        (((d))) = (13);
-    }
-}
-// ----
-// x() -> 17
-// f(uint256,uint256): 23, 42 -> 23, 42
-// x() -> 42
-// g() -> 3, 42, 1
-// h() -> 4, 42, 1
-// i() -> 42, 23, 17, 13
diff --git a/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol b/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
deleted file mode 100644
index f1b2b1740bc3..000000000000
--- a/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint) {
-        uint x;
-        return x;
-    }
-}
-// ----
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/loops/break.sol b/test/libsolidity/semanticTests/viaYul/loops/break.sol
deleted file mode 100644
index 77ecface7958..000000000000
--- a/test/libsolidity/semanticTests/viaYul/loops/break.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function f() public returns (uint x) {
-        x = 1;
-        for (uint a = 0; a < 10; a = a + 1) {
-            x = x + x;
-            break;
-        }
-    }
-    function g() public returns (uint x) {
-        x = 1;
-        uint a = 0;
-        while (a < 10) {
-            x = x + x;
-            break;
-            a = a + 1;
-        }
-    }
-    function h() public returns (uint x) {
-        x = 1;
-        do {
-            x = x + 1;
-            break;
-        } while (x < 3);
-    }
-}
-// ----
-// f() -> 2
-// g() -> 2
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/loops/continue.sol b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
deleted file mode 100644
index b9c3f167d3a7..000000000000
--- a/test/libsolidity/semanticTests/viaYul/loops/continue.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-    function f() public returns (uint x) {
-        x = 1;
-        uint a = 0;
-        for (; a < 10; a = a + 1) {
-            continue;
-            x = x + x;
-        }
-        x = x + a;
-    }
-    function g() public returns (uint x) {
-        x = 1;
-        uint a = 0;
-        while (a < 10) {
-            a = a + 1;
-            continue;
-            x = x + x;
-        }
-        x = x + a;
-    }
-    function h() public returns (uint x) {
-        x = 1;
-        uint a = 0;
-        do {
-            a = a + 1;
-            continue;
-            x = x + x;
-        } while (a < 4);
-        x = x + a;
-    }
-}
-// ----
-// f() -> 11
-// g() -> 11
-// h() -> 5
diff --git a/test/libsolidity/semanticTests/viaYul/loops/return.sol b/test/libsolidity/semanticTests/viaYul/loops/return.sol
deleted file mode 100644
index ee7062e70073..000000000000
--- a/test/libsolidity/semanticTests/viaYul/loops/return.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    function f() public returns (uint x) {
-        x = 1;
-        uint a;
-        for (; a < 10; a = a + 1) {
-            return x;
-            x = x + x;
-        }
-        x = x + a;
-    }
-    function g() public returns (uint x) {
-        x = 1;
-        uint a;
-        while (a < 10) {
-            return x;
-            x = x + x;
-            a = a + 1;
-        }
-        x = x + a;
-    }
-    function h() public returns (uint x) {
-        x = 1;
-        do {
-            x = x + 1;
-            return x;
-        } while (x < 3);
-    }
-}
-// ----
-// f() -> 1
-// g() -> 1
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/loops/simple.sol b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
deleted file mode 100644
index a4d076325c39..000000000000
--- a/test/libsolidity/semanticTests/viaYul/loops/simple.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    function f() public returns (uint x) {
-        x = 1;
-        for (uint a = 0; a < 10; a = a + 1) {
-            x = x + x;
-        }
-    }
-    function g() public returns (uint x) {
-        x = 1;
-        uint a = 0;
-        while (a < 10) {
-            x = x + x;
-            a = a + 1;
-        }
-    }
-    function h() public returns (uint x) {
-        x = 1;
-        do {
-            x = x + 1;
-        } while (false);
-    }
-    function i() public returns (uint x) {
-        x = 1;
-        do {
-            x = x + 1;
-        } while (x < 3);
-    }
-    function j() public {
-        for (;;) {break;}
-    }
-}
-// ----
-// f() -> 1024
-// g() -> 1024
-// h() -> 2
-// i() -> 3
-// j() ->
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol b/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
deleted file mode 100644
index 306474274792..000000000000
--- a/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder               v2;
-contract test {
-    enum E { A, B, C }
-    mapping(E => uint8) public table;
-    function set(E k, uint8 v) public {
-        table[k] = v;
-    }
-}
-// ----
-// table(uint8): 0 -> 0
-// table(uint8): 0x01 -> 0
-// table(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0xa1 ->
-// table(uint8): 0 -> 0
-// table(uint8): 0x01 -> 0xa1
-// table(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x00, 0xef ->
-// table(uint8): 0 -> 0xef
-// table(uint8): 0x01 -> 0xa1
-// table(uint8): 0xa7 -> FAILURE
-// set(uint8,uint8): 0x01, 0x05 ->
-// table(uint8): 0 -> 0xef
-// table(uint8): 0x01 -> 0x05
-// table(uint8): 0xa7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_getters.sol b/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
deleted file mode 100644
index a709bc168eee..000000000000
--- a/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract test {
-    mapping(uint256 => uint256) public m1;
-    mapping(uint256 => mapping(uint256 => uint256)) public m2;
-    function set(uint256 k, uint256 v) public {
-        m1[k] = v;
-    }
-    function set(uint256 k1, uint256 k2, uint256 v) public {
-        m2[k1][k2] = v;
-    }
-}
-// ----
-// m1(uint256): 0 -> 0
-// m1(uint256): 0x01 -> 0
-// m1(uint256): 0xa7 -> 0
-// set(uint256,uint256): 0x01, 0xa1 ->
-// m1(uint256): 0 -> 0
-// m1(uint256): 0x01 -> 0xa1
-// m1(uint256): 0xa7 -> 0
-// set(uint256,uint256): 0x00, 0xef ->
-// m1(uint256): 0 -> 0xef
-// m1(uint256): 0x01 -> 0xa1
-// m1(uint256): 0xa7 -> 0
-// set(uint256,uint256): 0x01, 0x05 ->
-// m1(uint256): 0 -> 0xef
-// m1(uint256): 0x01 -> 0x05
-// m1(uint256): 0xa7 -> 0
-// m2(uint256,uint256): 0, 0 -> 0
-// m2(uint256,uint256): 0, 0x01 -> 0
-// m2(uint256,uint256): 0xa7, 0 -> 0
-// m2(uint256,uint256): 0xa7, 0x01 -> 0
-// set(uint256,uint256,uint256): 0xa7, 0x01, 0x23
-// m2(uint256,uint256): 0, 0x01 -> 0
-// m2(uint256,uint256): 0xa7, 0 -> 0
-// m2(uint256,uint256): 0xa7, 0x01 -> 0x23
-// set(uint256,uint256,uint256): 0, 0x01, 0xef
-// m2(uint256,uint256): 0, 0x01 -> 0xef
-// m2(uint256,uint256): 0xa7, 0 -> 0
-// m2(uint256,uint256): 0xa7, 0x01 -> 0x23
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
deleted file mode 100644
index 8dcd767754e0..000000000000
--- a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	mapping (string => uint) map;
-	function set(string memory s) public {
-		map[s];
-	}
-}
-// ----
-// set(string): 0x20, 32, "01234567890123456789012345678901" ->
diff --git a/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol b/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
deleted file mode 100644
index 9f87c7b97d0f..000000000000
--- a/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    struct S {
-        uint256 a;
-        uint256 b;
-    }
-
-    function f() public pure returns (uint256 a, uint256 b){
-        assembly {
-            // Make free memory dirty to check that the struct allocation cleans it up again.
-            let freeMem := mload(0x40)
-            mstore(freeMem, 42)
-            mstore(add(freeMem, 32), 42)
-        }
-        S memory s;
-        return (s.a, s.b);
-    }
-}
-// ----
-// f() -> 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/msg_sender.sol b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
deleted file mode 100644
index 058f142f8694..000000000000
--- a/test/libsolidity/semanticTests/viaYul/msg_sender.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function test() public view returns (bool) {
-        address x;
-        assembly { x := caller() }
-        return x == msg.sender;
-    }
-}
-// ----
-// test() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/negation_bug.sol b/test/libsolidity/semanticTests/viaYul/negation_bug.sol
deleted file mode 100644
index d4d1b82ff1e9..000000000000
--- a/test/libsolidity/semanticTests/viaYul/negation_bug.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure {
-		-(int8(0));
-		unchecked {
-			// Used to incorrectly use the checked unary negation function and revert.
-			(-(type(int8).min));
-		}
-	}
-}
-// ----
-// f() ->
diff --git a/test/libsolidity/semanticTests/viaYul/require.sol b/test/libsolidity/semanticTests/viaYul/require.sol
deleted file mode 100644
index 39677b4f5d3f..000000000000
--- a/test/libsolidity/semanticTests/viaYul/require.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract C {
-	function f(bool a) public pure returns (bool x) {
-		bool b = a;
-		x = b;
-		require(b);
-	}
-	function fail() public pure returns (bool x) {
-		x = true;
-		require(false);
-	}
-	function succeed() public pure returns (bool x) {
-		x = true;
-		require(true);
-	}
-	function f2(bool a) public pure returns (bool x) {
-		x = a;
-		string memory message;
-		message = "fancy message!";
-		require(a, message);
-	}
-	function f3(bool a) public pure returns (bool x) {
-		x = a;
-		require(a, "msg");
-	}
-	function f4(bool a) public pure returns (bool x) {
-		x = a;
-		string memory message;
-		require(a, message);
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// f(bool): true -> true
-// f(bool): false -> FAILURE
-// fail() -> FAILURE
-// succeed() -> true
-// f2(bool): true -> true
-// f2(bool): false -> FAILURE, hex"08c379a0", 0x20, 14, "fancy message!"
-// f3(bool): true -> true
-// f3(bool): false -> FAILURE, hex"08c379a0", 0x20, 3, "msg"
-// f4(bool): true -> true
-// f4(bool): false -> FAILURE, hex"08c379a0", 0x20, 0
diff --git a/test/libsolidity/semanticTests/viaYul/return.sol b/test/libsolidity/semanticTests/viaYul/return.sol
deleted file mode 100644
index f58632b964e8..000000000000
--- a/test/libsolidity/semanticTests/viaYul/return.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint x) {
-        return 7;
-        x = 3;
-    }
-}
-// ----
-// f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
deleted file mode 100644
index 78e9e3bea0c0..000000000000
--- a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (uint) {
-        uint8 b;
-        assembly { b := 0xffff }
-        return b;
-    }
-}
-// ----
-// f() -> 255
diff --git a/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol b/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
deleted file mode 100644
index 936058124b48..000000000000
--- a/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint[] arr1;
-	uint[][] arr2;
-	function f() internal returns (uint[] storage ptr1, uint[][] storage ptr2) {
-		ptr1 = arr1;
-		ptr2 = arr2;
-	}
-	function g() public returns (uint, uint) {
-		return (arr1.length, arr2.length);
-	}
-
-}
-// ----
-// g() -> 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/short_circuit.sol b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
deleted file mode 100644
index b160bbd77e94..000000000000
--- a/test/libsolidity/semanticTests/viaYul/short_circuit.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function or(uint x) public returns (bool t, uint y) {
-        t = (x == 0 || ((x = 8) > 0));
-        y = x;
-    }
-    function and(uint x) public returns (bool t, uint y) {
-        t = (x == 0 && ((x = 8) > 0));
-        y = x;
-    }
-}
-// ----
-// or(uint256): 0 -> true, 0
-// and(uint256): 0 -> true, 8
-// or(uint256): 1 -> true, 8
-// and(uint256): 1 -> false, 1
diff --git a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
deleted file mode 100644
index ed0ba28784dd..000000000000
--- a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint x, uint y) {
-        x = a;
-        y = b;
-    }
-}
-// ----
-// f(uint256,uint256): 5, 6 -> 5, 6
diff --git a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
deleted file mode 100644
index 8e8cd78e87f2..000000000000
--- a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public pure returns (uint32 x) {
-        uint32 a;
-        uint32 b;
-        uint32 c;
-        assembly {
-            a := 1
-            b := 2
-            c := 3
-        }
-        x = a + b + c;
-    }
-}
-// ----
-// f() -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/smoke_test.sol b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
deleted file mode 100644
index 53a11869fefd..000000000000
--- a/test/libsolidity/semanticTests/viaYul/smoke_test.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-}
-// ====
-// allowNonExistingFunctions: true
-// ----
-// f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
deleted file mode 100644
index d1ec20db09b5..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    bytes b;
-    function f() public returns (bool correct) {
-        assembly {
-            sstore(b.slot, or("deadbeef", 0x08))
-        }
-        bytes1 s = b[3];
-        uint r;
-        assembly {
-            r := s
-        }
-        correct = r == (0x64 << 248);
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
deleted file mode 100644
index 3f822cbbb9ed..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    bytes b;
-    function f() public returns (bool correct) {
-        assembly {
-            sstore(b.slot, 0x41)
-            mstore(0, b.slot)
-            sstore(keccak256(0, 0x20), "deadbeefdeadbeefdeadbeefdeadbeef")
-        }
-        bytes1 s = b[31];
-        uint r;
-        assembly {
-            r := s
-        }
-        correct = r == (0x66 << 248);
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
deleted file mode 100644
index e5d2c702ecd9..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    uint8[] s;
-    function f() public returns (bool correct) {
-        s.push();
-        assembly {
-            mstore(0, s.slot)
-            sstore(keccak256(0, 0x20), 257)
-        }
-        uint8 x = s[0];
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = (s[0] == 0x01) && (r == 0x01);
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
deleted file mode 100644
index 7c035f05362a..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    uint8[1] s;
-    function f() public returns (bool correct) {
-        assembly {
-            sstore(s.slot, 257)
-        }
-        uint8 x = s[0];
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = (s[0] == 0x01) && (r == 0x01);
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
deleted file mode 100644
index adcd09c7e0dc..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    struct S {
-        uint8[] m;
-    }
-    S s;
-    function f() public returns (bool correct) {
-        s.m.push();
-        assembly {
-            mstore(0, s.slot)
-            sstore(keccak256(0, 0x20), 257)
-        }
-        uint8 x = s.m[0];
-        uint r;
-        assembly {
-            r := x
-        }
-        correct = r == 0x01;
-    }
-}
-// ----
-// f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
deleted file mode 100644
index 42b7fe802696..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    mapping(uint => uint) simple;
-    mapping(uint16 => uint) cleanup;
-    mapping(string => uint) str;
-    mapping(uint => mapping(uint => uint)) twodim;
-    function test_simple(uint _off) public returns (uint _a, uint _b, uint _c) {
-        simple[_off + 2] = 3;
-        simple[_off + 3] = 4;
-        simple[type(uint256).max] = 5;
-        _c = simple[type(uint256).max];
-        _b = simple[3 + _off];
-        _a = simple[2 + _off];
-    }
-    function test_cleanup() public returns (bool) {
-        uint16 x;
-        assembly { x := 0xffff0001 }
-        cleanup[x] = 3;
-        return cleanup[1] == 3;
-    }
-    function test_str() public returns (bool) {
-        str["abc"] = 3;
-        string memory s = "abc";
-        return str[s] == 3;
-    }
-    function test_twodim() public returns (uint a, uint b) {
-        twodim[2][3] = 3;
-        a = twodim[3][2];
-        b = twodim[2][3];
-    }
-}
-// ----
-// test_simple(uint256): 0 -> 3, 4, 5
-// test_simple(uint256): 1 -> 3, 4, 5
-// test_simple(uint256): 2 -> 3, 4, 5
-// test_cleanup() -> true
-// test_str() -> true
-// test_twodim() -> 0, 3
diff --git a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
deleted file mode 100644
index 5253a6a1ab16..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint16 x;
-    bytes1 y;
-    uint16 z;
-    function f(uint8 a) public returns (uint _x) {
-        x = a;
-        y = bytes1(uint8(x) + 1);
-        z = uint8(y) + 1;
-        x = z + 1;
-        _x = x;
-    }
-}
-// ----
-// f(uint8): 6 -> 9
diff --git a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
deleted file mode 100644
index 03d7ed92051c..000000000000
--- a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    uint x;
-    uint y;
-    function setX(uint a) public returns (uint _x) {
-        x = a;
-        _x = x;
-    }
-    function setY(uint a) public returns (uint _y) {
-        y = a;
-        _y = y;
-    }
-}
-// ----
-// setX(uint256): 6 -> 6
-// setY(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/string_format.sol b/test/libsolidity/semanticTests/viaYul/string_format.sol
deleted file mode 100644
index 5869ea2e76fb..000000000000
--- a/test/libsolidity/semanticTests/viaYul/string_format.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f1() external pure returns (string memory) { return "abcabc"; }
-	function f2() external pure returns (string memory) { return "abcabc`~12345677890- _=+!@#$%^&*()[{]}|;:',<.>?"; }
-	function g() external pure returns (bytes32) { return "abcabc"; }
-	function h() external pure returns (bytes4) { return 0xcafecafe; }
-}
-// ----
-// f1() -> 0x20, 6, left(0x616263616263)
-// f2() -> 32, 47, 44048183223289766195424279195050628400112610419087780792899004030957505095210, 18165586057823232067963737336409268114628061002662705707816940456850361417728
-// g() -> left(0x616263616263)
-// h() -> left(0xcafecafe)
diff --git a/test/libsolidity/semanticTests/viaYul/string_literals.sol b/test/libsolidity/semanticTests/viaYul/string_literals.sol
deleted file mode 100644
index 985d26354253..000000000000
--- a/test/libsolidity/semanticTests/viaYul/string_literals.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    function short_dyn() public pure returns (string memory x) {
-        x = "abc";
-    }
-    function long_dyn() public pure returns (string memory x) {
-        x = "12345678901234567890123456789012345678901234567890123456789012345678901234567890";
-    }
-    function short_bytes_dyn() public pure returns (bytes memory x) {
-        x = "abc";
-    }
-    function long_bytes_dyn() public pure returns (bytes memory x) {
-        x = "12345678901234567890123456789012345678901234567890123456789012345678901234567890";
-    }
-    function bytesNN() public pure returns (bytes3 x) {
-        x = "abc";
-    }
-    function bytesNN_padded() public pure returns (bytes4 x) {
-        x = "abc";
-    }
-}
-// ----
-// short_dyn() -> 0x20, 3, "abc"
-// long_dyn() -> 0x20, 80, "12345678901234567890123456789012", "34567890123456789012345678901234", "5678901234567890"
-// short_bytes_dyn() -> 0x20, 3, "abc"
-// long_bytes_dyn() -> 0x20, 80, "12345678901234567890123456789012", "34567890123456789012345678901234", "5678901234567890"
-// bytesNN() -> 0x6162630000000000000000000000000000000000000000000000000000000000
-// bytesNN_padded() -> 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/struct_member_access.sol b/test/libsolidity/semanticTests/viaYul/struct_member_access.sol
deleted file mode 100644
index a2d9a02fd6be..000000000000
--- a/test/libsolidity/semanticTests/viaYul/struct_member_access.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S {
-        uint a;
-        uint[] b;
-        uint c;
-    }
-
-    S s;
-    constructor() {
-        s.a = 42;
-        s.b.push(1);
-        s.b.push(2);
-        s.b.push(3);
-        s.c = 21;
-    }
-
-    function f(S memory m) public pure returns (uint, uint[] memory, uint) {
-        return (m.a, m.b, m.c);
-    }
-    function g(S calldata c) external pure returns (uint, uint, uint, uint, uint, uint) {
-        return (c.a, c.b.length, c.c, c.b[0], c.b[1], c.b[2]);
-    }
-    function g2(S calldata c1, S calldata c2) external pure returns (uint, uint, uint, uint, uint, uint) {
-        return (c1.a, c1.c, c2.a, c2.b.length, c2.c, c2.b[0]);
-    }
-    function h() external view returns (uint, uint, uint, uint, uint, uint) {
-        return (s.a, s.b.length, s.c, s.b[0], s.b[1], s.b[2]);
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// f((uint256,uint256[],uint256)): 0x20, 42, 0x60, 21, 3, 1, 2, 3 -> 42, 0x60, 21, 3, 1, 2, 3
-// g((uint256,uint256[],uint256)): 0x20, 42, 0x60, 21, 3, 1, 2, 3 -> 42, 3, 21, 1, 2, 3
-// g2((uint256,uint256[],uint256),(uint256,uint256[],uint256)): 0x40, 0x0120, 42, 0x60, 21, 2, 1, 2, 3, 7, 0x80, 9, 0, 1, 17 -> 42, 21, 7, 1, 9, 17
-// h() -> 42, 3, 21, 1, 2, 3
diff --git a/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol b/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
deleted file mode 100644
index e1a1689b7fc0..000000000000
--- a/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint256 x;
-    uint256 y;
-    function set(uint256 v) public returns (uint256) { x = v; return v; }
-    function f() public returns (uint256, uint256) {
-       (y, y, y) = (set(1), set(2), set(3));
-       assert(y == 1 && x == 3);
-       return (x, y);
-    }
-}
-// ----
-// f() -> 3, 1
diff --git a/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol b/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
deleted file mode 100644
index d8e640713a05..000000000000
--- a/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
+++ /dev/null
@@ -1,76 +0,0 @@
-contract C {
-	function conv(bytes25 a) public pure returns (bytes32) {
-		// truncating and widening
-		return ~bytes32(bytes16(~a));
-	}
-
-	function upcast(bytes25 a) public pure returns (bytes32) {
-		// implicit widening is allowed
-		return ~a;
-	}
-
-	function downcast(bytes25 a) public pure returns (bytes12) {
-		// truncating cast must be explicit
-		return bytes12(~a);
-	}
-
-	function r_b32() public pure returns (bytes32) {
-		return ~bytes32(hex"ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00");
-	}
-	function r_b25() public pure returns (bytes25) {
-		return ~bytes25(hex"ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff");
-	}
-	function r_b16() public pure returns (bytes16) {
-		return ~bytes16(hex"ff00ff00ff00ff00ff00ff00ff00ff00");
-	}
-	function r_b8() public pure returns (bytes8) {
-		return ~bytes8(hex"ff00ff00ff00ff00");
-	}
-	function r_b4() public pure returns (bytes4) {
-		return ~bytes4(hex"ff00ff00");
-	}
-	function r_b1() public pure returns (bytes1) {
-		return ~bytes1(hex"55");
-	}
-
-	function a_b32() public pure returns (bytes32) {
-		bytes32 r = ~bytes32(hex"ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00");
-		return r;
-	}
-	function a_b25() public pure returns (bytes25) {
-		bytes25 r = ~bytes25(hex"ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff");
-		return r;
-	}
-	function a_b16() public pure returns (bytes16) {
-		bytes16 r =  ~bytes16(hex"ff00ff00ff00ff00ff00ff00ff00ff00");
-		return r;
-	}
-	function a_b8() public pure returns (bytes8) {
-		bytes8 r =  ~bytes8(hex"ff00ff00ff00ff00");
-		return r;
-	}
-	function a_b4() public pure returns (bytes4) {
-		bytes4 r =  ~bytes4(hex"ff00ff00");
-		return r;
-	}
-	function a_b1() public pure returns (bytes1) {
-		bytes1 r =  ~bytes1(hex"55");
-		return r;
-	}
-}
-// ----
-// conv(bytes25): left(0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff) -> 0xff00ff00ff00ff00ff00ff00ff00ff00ffffffffffffffffffffffffffffffff
-// upcast(bytes25): left(0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff) -> 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff0000000000000000
-// downcast(bytes25): left(0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff) -> 0xff00ff00ff00ff00ff00ff0000000000000000000000000000000000000000
-// r_b32() -> 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff
-// r_b25() -> 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff0000000000000000
-// r_b16() -> 0xff00ff00ff00ff00ff00ff00ff00ff00000000000000000000000000000000
-// r_b8() -> 0xff00ff00ff00ff000000000000000000000000000000000000000000000000
-// r_b4() -> 0xff00ff00000000000000000000000000000000000000000000000000000000
-// r_b1() -> 0xaa00000000000000000000000000000000000000000000000000000000000000
-// a_b32() -> 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff
-// a_b25() -> 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff0000000000000000
-// a_b16() -> 0xff00ff00ff00ff00ff00ff00ff00ff00000000000000000000000000000000
-// a_b8() -> 0xff00ff00ff00ff000000000000000000000000000000000000000000000000
-// a_b4() -> 0xff00ff00000000000000000000000000000000000000000000000000000000
-// a_b1() -> 0xaa00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/unary_operations.sol b/test/libsolidity/semanticTests/viaYul/unary_operations.sol
deleted file mode 100644
index 17d8dad03472..000000000000
--- a/test/libsolidity/semanticTests/viaYul/unary_operations.sol
+++ /dev/null
@@ -1,136 +0,0 @@
-contract C {
-	function preincr_u8(uint8 a) public pure returns (uint8) {
-		return ++a + a;
-	}
-	function postincr_u8(uint8 a) public pure returns (uint8) {
-		return a++ + a;
-	}
-	function predecr_u8(uint8 a) public pure returns (uint8) {
-		return --a + a;
-	}
-	function postdecr_u8(uint8 a) public pure returns (uint8) {
-		return a-- + a;
-	}
-	function preincr_s8(int8 a) public pure returns (int8 ret1, int8 ret2) {
-		ret1 = ++a;
-		ret2 = a;
-	}
-	function postincr_s8(int8 a) public pure returns (int8 ret1, int8 ret2) {
-		ret1 = a++;
-		ret2 = a;
-	}
-	function predecr_s8(int8 a) public pure returns (int8 ret1, int8 ret2) {
-		ret1 = --a;
-		ret2 = a;
-	}
-	function postdecr_s8(int8 a) public pure returns (int8 ret1, int8 ret2) {
-		ret1 = a--;
-		ret2 = a;
-	}
-	function preincr(uint a) public pure returns (uint) {
-		return ++a + a;
-	}
-	function postincr(uint a) public pure returns (uint) {
-		return a++ + a;
-	}
-	function predecr(uint a) public pure returns (uint) {
-		return --a + a;
-	}
-	function postdecr(uint a) public pure returns (uint) {
-		return a-- + a;
-	}
-	function not(bool a) public pure returns (bool)
-	{
-		return !a;
-	}
-	function bitnot(int256 a) public pure returns (int256)
-	{
-		return ~a;
-	}
-	function bitnot_u8(uint8 a) public pure returns (uint256 ret)
-	{
-		a = ~a;
-		assembly {
-			// Tests that the lower bit parts are cleaned up
-			ret := a
-		}
-	}
-	function bitnot_s8() public pure returns (int256 ret)
-	{
-		int8 a;
-		assembly {
-			a := 0x9C
-		}
-
-		a = ~a;
-
-		assembly {
-			// Tests that the lower bit parts are cleaned up
-			ret := a
-		}
-	}
-	function negate(int256 a) public pure returns (int256)
-	{
-		return -a;
-	}
-	function negate_s8(int8 a) public pure returns (int8)
-	{
-		return -a;
-	}
-	function negate_s16(int16 a) public pure returns (int16)
-	{
-		return -a;
-	}
-}
-// ====
-// compileViaYul: true
-// ----
-// preincr_s8(int8): 128 -> FAILURE
-// postincr_s8(int8): 128 -> FAILURE
-// preincr_s8(int8): 127 -> FAILURE, hex"4e487b71", 0x11
-// postincr_s8(int8): 127 -> FAILURE, hex"4e487b71", 0x11
-// preincr_s8(int8): 126 -> 127, 127
-// postincr_s8(int8): 126 -> 126, 127
-// predecr_s8(int8): -128 -> FAILURE, hex"4e487b71", 0x11
-// postdecr_s8(int8): -128 -> FAILURE, hex"4e487b71", 0x11
-// predecr_s8(int8): -127 -> -128, -128
-// postdecr_s8(int8): -127 -> -127, -128
-// preincr_s8(int8): -5 -> -4, -4
-// postincr_s8(int8): -5 -> -5, -4
-// predecr_s8(int8): -5 -> -6, -6
-// postdecr_s8(int8): -5 -> -5, -6
-// preincr_u8(uint8): 255 -> FAILURE, hex"4e487b71", 0x11
-// postincr_u8(uint8): 255 -> FAILURE, hex"4e487b71", 0x11
-// preincr_u8(uint8): 254 -> FAILURE, hex"4e487b71", 0x11
-// postincr_u8(uint8): 254 -> FAILURE, hex"4e487b71", 0x11
-// predecr_u8(uint8): 0 -> FAILURE, hex"4e487b71", 0x11
-// postdecr_u8(uint8): 0 -> FAILURE, hex"4e487b71", 0x11
-// predecr_u8(uint8): 1 -> 0
-// postdecr_u8(uint8): 1 -> 1
-// preincr_u8(uint8): 2 -> 6
-// postincr_u8(uint8): 2 -> 5
-// predecr_u8(uint8): 2 -> 2
-// postdecr_u8(uint8): 2 -> 3
-// preincr(uint256): 2 -> 6
-// postincr(uint256): 2 -> 5
-// predecr(uint256): 2 -> 2
-// postdecr(uint256): 2 -> 3
-// not(bool): true -> false
-// not(bool): false -> true
-// bitnot(int256): 5 -> -6
-// bitnot(int256): 10 -> -11
-// bitnot(int256): 0 -> -1
-// bitnot(int256): -100 -> 99
-// bitnot_u8(uint8): 100 -> 155
-// bitnot_s8() -> 99
-// negate(int256): -57896044618658097711785492504343953926634992332820282019728792003956564819968 -> FAILURE, hex"4e487b71", 0x11
-// negate(int256): -57896044618658097711785492504343953926634992332820282019728792003956564819967 -> 57896044618658097711785492504343953926634992332820282019728792003956564819967
-// negate(int256): 0 -> 0
-// negate(int256): 1 -> -1
-// negate(int256): -1 -> 1
-// negate_s8(int8): -128 -> FAILURE, hex"4e487b71", 0x11
-// negate_s8(int8): -138 -> FAILURE
-// negate_s8(int8): -127 -> 127
-// negate_s8(int8): 127 -> -127
-// negate_s16(int16): -32768 -> FAILURE, hex"4e487b71", 0x11
-// negate_s16(int16): -32767 -> 32767
diff --git a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
deleted file mode 100644
index b440d8e136c6..000000000000
--- a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public pure returns (uint32 x) {
-        uint32 a;
-        uint32 b;
-        uint32 c;
-        assembly {
-            function myAwesomeFunction(param) -> returnMe {
-                let localVar := 10
-                returnMe := add(localVar, param)
-            }
-            let abc := sub(10, a)
-            let xyz := 20
-            a := abc
-            b := myAwesomeFunction(30)
-            c := xyz
-        }
-        x = a + b + c;
-    }
-}
-// ----
-// f() -> 70
diff --git a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
deleted file mode 100644
index 798f90ffd431..000000000000
--- a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract X {
-    function f() public returns (uint x) {
-        x = g();
-    }
-    function g() public virtual returns (uint x) {
-        x = 2;
-    }
-}
-contract C is X {
-    function f1() public returns (uint x) {
-        // direct call
-        x = g();
-    }
-    function f2() public returns (uint x) {
-        // call via base
-        x = f();
-    }
-    function f3() public returns (uint x) {
-        // explicit call via base
-        //x = super.g();
-    }
-    function g() public override returns (uint x) {
-        x = 3;
-    }
-}
-// ----
-// f() -> 3
-// f1() -> 3
-// f2() -> 3
-// g() -> 3
diff --git a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
deleted file mode 100644
index 28705ee40ee8..000000000000
--- a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Base {
-    function f() public returns (uint256 i) {
-        return g();
-    }
-
-    function g() internal virtual returns (uint256 i) {
-        return 1;
-    }
-}
-
-
-contract Derived is Base {
-    function g() internal override returns (uint256 i) {
-        return 2;
-    }
-}
-// ----
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
deleted file mode 100644
index d83343048399..000000000000
--- a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract Base {
-    function f() internal returns (uint256 i) {
-        function() internal returns (uint256) ptr = g;
-        return ptr();
-    }
-
-    function g() internal virtual returns (uint256 i) {
-        return 1;
-    }
-}
-
-
-contract Derived is Base {
-    function g() internal override returns (uint256 i) {
-        return 2;
-    }
-
-    function h() public returns (uint256 i) {
-        return f();
-    }
-}
-// ----
-// h() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
deleted file mode 100644
index ea543a786fdc..000000000000
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Base {
-    function f() public returns (uint256 i) {
-        return g();
-    }
-
-    function g() public virtual returns (uint256 i) {
-        return 1;
-    }
-}
-
-
-contract Derived is Base {
-    function g() public override returns (uint256 i) {
-        return 2;
-    }
-}
-// ----
-// g() -> 2
-// f() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
deleted file mode 100644
index 55a50a5c91cb..000000000000
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract BaseBase {
-    uint256 m_a;
-
-    constructor(uint256 a) {
-        m_a = a;
-    }
-
-    function overridden() public virtual returns (uint256 r) {
-        return 1;
-    }
-
-    function g() public returns (uint256 r) {
-        return overridden();
-    }
-}
-
-
-contract Base is BaseBase(BaseBase.g()) {}
-
-
-contract Derived is Base {
-    function getA() public returns (uint256 r) {
-        return m_a;
-    }
-
-    function overridden() public override returns (uint256 r) {
-        return 2;
-    }
-}
-// ----
-// getA() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol
deleted file mode 100644
index cee1bcdde55d..000000000000
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-    function f() internal virtual {
-        mutableWithViewOverride();
-        mutableWithPureOverride();
-        viewWithPureOverride();
-    }
-
-    function mutableWithViewOverride() internal virtual {}
-    function mutableWithPureOverride() internal virtual {}
-    function viewWithPureOverride() internal view virtual {}
-}
-
-contract C is A {
-    function run() public {
-        f();
-    }
-
-    function mutableWithViewOverride() internal view override {}
-    function mutableWithPureOverride() internal pure override {}
-    function viewWithPureOverride() internal pure override {}
-}
-// ----
-// run() ->
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol
deleted file mode 100644
index c3d9e60a0519..000000000000
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-    function f() internal virtual {
-        mutableWithViewOverride();
-        mutableWithPureOverride();
-        viewWithPureOverride();
-    }
-
-    function mutableWithViewOverride() public virtual {}
-    function mutableWithPureOverride() public virtual {}
-    function viewWithPureOverride() public view virtual {}
-}
-
-contract C is A {
-    function run() public {
-        f();
-    }
-
-    function mutableWithViewOverride() public view override {}
-    function mutableWithPureOverride() public pure override {}
-    function viewWithPureOverride() public pure override {}
-}
-// ----
-// run() ->
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_1_tuple.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_1_tuple.sol
deleted file mode 100644
index d43f11b68199..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_1_tuple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f(bytes calldata data) external pure returns (uint256[] memory) {
-		return abi.decode(data, (uint256[]));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
deleted file mode 100644
index da30d302fedf..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	function abiDecodeArray(bytes memory b1, bytes memory b2) public pure {
-		(uint[] memory a, uint[] memory b) = abi.decode(b1, (uint[], uint[]));
-		assert(a.length == b.length); // should fail
-
-		(uint[] memory c, uint[] memory d) = abi.decode(b1, (uint[], uint[]));
-		assert(a.length == c.length);
-		assert(a.length == d.length); // should fail
-		assert(b.length == d.length);
-		assert(b.length == c.length); // should fail
-
-		(uint[] memory e, uint[] memory f, uint[] memory g) = abi.decode(b1, (uint[], uint[], uint[]));
-		assert(e.length == a.length); // should fail
-		assert(f.length == b.length); // should fail
-		assert(e.length == g.length); // should fail
-
-		(uint[][] memory h, uint[][][] memory i, uint j) = abi.decode(b1, (uint[][], uint[][][], uint));
-		require(j < h.length);
-		require(j < i.length);
-		require(j < i[j].length);
-		assert(h[j].length == i[j][j].length); // should fail
-
-		(uint[] memory k, uint[] memory l) = abi.decode(b2, (uint[], uint[]));
-		assert(k.length == a.length); // should fail
-		assert(k.length == l.length); // should fail
-		assert(l.length == b.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (182-210): CHC: Assertion violation happens here.
-// Warning 6328: (335-363): CHC: Assertion violation happens here.
-// Warning 6328: (414-442): CHC: Assertion violation happens here.
-// Warning 6328: (560-588): CHC: Assertion violation happens here.
-// Warning 6328: (607-635): CHC: Assertion violation happens here.
-// Warning 6328: (654-682): CHC: Assertion violation happens here.
-// Warning 6328: (879-916): CHC: Assertion violation happens here.
-// Warning 6328: (1009-1037): CHC: Assertion violation happens here.
-// Warning 6328: (1056-1084): CHC: Assertion violation happens here.
-// Warning 6328: (1103-1131): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
deleted file mode 100644
index 76c2ec2e9fe1..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	function abiDecodeSimple(bytes memory b1, bytes memory b2) public pure {
-		(uint x, uint y) = abi.decode(b1, (uint, uint));
-		(uint z, uint w) = abi.decode(b1, (uint, uint));
-		assert(x == z);
-		assert(x == y); // should fail
-		assert(y == w);
-		assert(z == w); // should fail
-
-		(uint a, uint b, bool c) = abi.decode(b1, (uint, uint, bool));
-		assert(a == x); // should fail
-		assert(b == y); // should fail
-		assert(c); // should fail
-
-		(uint k, uint l) = abi.decode(b2, (uint, uint));
-		assert(k == x); // should fail
-		assert(l == y); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (209-223): CHC: Assertion violation happens here.
-// Warning 6328: (260-274): CHC: Assertion violation happens here.
-// Warning 6328: (359-373): CHC: Assertion violation happens here.
-// Warning 6328: (392-406): CHC: Assertion violation happens here.
-// Warning 6328: (425-434): CHC: Assertion violation happens here.
-// Warning 6328: (505-519): CHC: Assertion violation happens here.
-// Warning 6328: (538-552): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol
deleted file mode 100644
index 9b1440f89a8b..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	function abiEncodeSlice(bytes calldata data) external pure {
-		bytes memory b1 = abi.encode(data);
-		bytes memory b2 = abi.encode(data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		// Disabled because of Spacer nondeterminism
-		//bytes memory b3 = abi.encode(data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		//assert(b1.length == b3.length); // fails for now
-
-		// Disabled because of Spacer nondeterminism
-		//bytes memory b4 = abi.encode(data[5:10]);
-		//assert(b1.length == b4.length); // should fail
-
-		// Disabled because of Spacer nondeterminism in Z3 4.8.9
-		//uint x = 5;
-		//uint y = 10;
-		//bytes memory b5 = abi.encode(data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		//assert(b1.length == b5.length); // fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (279-309): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol
deleted file mode 100644
index 4c8e32697839..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	function abiEncodeSlice(uint[] calldata data) external pure {
-		bytes memory b1 = abi.encode(data);
-		bytes memory b2 = abi.encode(data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		bytes memory b3 = abi.encode(data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		// Disabled because of Spacer nondeterminism.
-		//assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encode(data[5:10]);
-		// Disabled because of Spacer nondeterminism.
-		//assert(b1.length == b4.length); // should fail
-
-		uint x = 5;
-		uint y = 10;
-		bytes memory b5 = abi.encode(data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		// Disabled because of Spacer nondeterminism.
-		//assert(b1.length == b5.length); // fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (332-347): Unused local variable.
-// Warning 2072: (618-633): Unused local variable.
-// Warning 2072: (791-806): Unused local variable.
-// Warning 6328: (280-310): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
deleted file mode 100644
index db29d51113b2..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function callMeMaybe(uint a, uint b) external {}
-
-	function abiEncodeSimple(uint x, uint y, uint z) public view {
-		require(x == y);
-		function (uint, uint) external f = this.callMeMaybe;
-		bytes memory b1 = abi.encodeCall(f, (x, z));
-		bytes memory b2 = abi.encodeCall(f, (y, z));
-		assert(b1.length == b2.length); // should hold
-		assert(b1[0] == b2[0]); // should hold
-
-		bytes memory b3 = abi.encodeCall(this.callMeMaybe, (3, z));
-		assert(b1.length == b3.length); // should hold, but we don't encode the length computation precisely
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (354-359): CHC: Out of bounds access happens here.
-// Warning 6368: (363-368): CHC: Out of bounds access happens here.
-// Warning 6328: (451-481): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
deleted file mode 100644
index 2ce3d625adda..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function callMeMaybe(uint a, uint b) external {}
-
-	function abiEncodeSimple(uint x, uint y, uint z) public view {
-		require(x == y);
-		bytes memory b1 = abi.encodeCall(this.callMeMaybe, (x, z));
-		bytes memory b2 = abi.encodeCall(this.callMeMaybe, (y, z));
-		assert(b1.length == b2.length); // should hold
-		assert(b1[0] == b2[0]); // should hold
-
-		bytes memory b3 = abi.encodeCall(this.callMeMaybe, (3, z));
-		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (329-334): CHC: Out of bounds access happens here.
-// Warning 6368: (338-343): CHC: Out of bounds access happens here.
-// Warning 6328: (426-456): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
deleted file mode 100644
index 691493b565a3..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function callMeMaybe(uint a, uint b) external {}
-
-	function abiEncodeSimple(uint x, uint y, uint z) public pure {
-		require(x == y);
-		bytes memory b1 = abi.encodeCall(C.callMeMaybe, (x, z));
-		bytes memory b2 = abi.encodeCall(C.callMeMaybe, (y, z));
-		assert(b1.length == b2.length); // should hold
-		assert(b1[0] == b2[0]); // should hold
-
-		bytes memory b3 = abi.encodeCall(C.callMeMaybe, (3, z));
-		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (323-328): CHC: Out of bounds access happens here.
-// Warning 6368: (332-337): CHC: Out of bounds access happens here.
-// Warning 6328: (417-447): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
deleted file mode 100644
index 358f4955c6b3..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-abstract contract D {
-	function no(uint a, uint b) external virtual;
-}
-
-contract C {
-	function callMeMaybe(uint a, uint b) external {}
-
-	function abiEncodeSimple(uint x, uint y, uint z) public pure {
-		require(x == y);
-		bytes memory b1 = abi.encodeCall(D.no, (x, z));
-		bytes memory b2 = abi.encodeCall(D.no, (y, z));
-		assert(b1.length == b2.length); // should hold
-		assert(b1[0] == b2[0]); // should hold
-
-		bytes memory b3 = abi.encodeCall(D.no, (3, z));
-		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (377-382): CHC: Out of bounds access happens here.
-// Warning 6368: (386-391): CHC: Out of bounds access happens here.
-// Warning 6328: (462-492): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
deleted file mode 100644
index 21173a707dec..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-abstract contract D {
-	function no(uint a, uint b) external virtual;
-}
-
-contract C {
-	function callMeMaybe(uint a, uint b) external {}
-
-	function abiEncodeSimple(D d, uint x, uint y, uint z) public pure {
-		require(x == y);
-		bytes memory b1 = abi.encodeCall(d.no, (x, z));
-		bytes memory b2 = abi.encodeCall(d.no, (y, z));
-		assert(b1.length == b2.length); // should hold
-		assert(b1[0] == b2[0]); // should hold
-
-		bytes memory b3 = abi.encodeCall(d.no, (3, z));
-		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (382-387): CHC: Out of bounds access happens here.
-// Warning 6368: (391-396): CHC: Out of bounds access happens here.
-// Warning 6328: (467-497): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
deleted file mode 100644
index 2bce234d4d29..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f() public view {
-		abi.encode(this.f);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol
deleted file mode 100644
index 6260ebde9c7a..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function abiEncodeHash(uint a, uint b) public pure {
-		require(a == b);
-		bytes memory b1 = abi.encode(a, a, a, a);
-		bytes memory b2 = abi.encode(b, a, b, a);
-		assert(keccak256(b1) == keccak256(b2));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
deleted file mode 100644
index 2d4c8119903e..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() pure public {
-		bytes memory res = abi.encode();
-		assert(res.length == 0); // should hold
-		assert(res.length > 0); // should fail
-		res = abi.encodePacked();
-		assert(res.length == 0); // should hold
-		assert(res.length > 0); // should fail
-		res = abi.encodeWithSelector(0);
-		assert(res.length == 4); // should hold, but SMTChecker cannot know this yet
-		res = abi.encodeWithSignature("");
-		assert(res.length == 4); // should hold, but SMTChecker cannot know this yet
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (120-142): CHC: Assertion violation happens here.
-// Warning 6328: (231-253): CHC: Assertion violation happens here.
-// Warning 6328: (307-330): CHC: Assertion violation happens here.
-// Warning 6328: (423-446): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol
deleted file mode 100644
index 91bcfe5ea032..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-	function abiencodePackedSlice(bytes calldata data) external pure {
-		bytes memory b1 = abi.encodePacked(data);
-		bytes memory b2 = abi.encodePacked(data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		// Disabled because of Spacer nondeterminism
-		//assert(b1.length == b2.length); // fails for now
-
-		// Disabled because of Spacer nondeterminism
-		//bytes memory b3 = abi.encodePacked(data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		//assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encodePacked(data[5:10]);
-		// Disabled because of Spacer nondeterminism
-		//assert(b1.length == b4.length); // should fail
-
-		uint x = 5;
-		uint y = 10;
-		bytes memory b5 = abi.encodePacked(data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		assert(b1.length == b5.length); // fails for now
-
-		bytes memory b6 = abi.encode(data[5:10]);
-		// Disabled because of Spacer nondeterminism
-		//assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (127-142): Unused local variable.
-// Warning 2072: (691-706): Unused local variable.
-// Warning 2072: (1099-1114): Unused local variable.
-// Warning 6328: (1047-1077): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol
deleted file mode 100644
index fc34ff1c7288..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-	function abiencodePackedSlice(uint[] calldata data) external pure {
-		bytes memory b1 = abi.encodePacked(data);
-		bytes memory b2 = abi.encodePacked(data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		// Disabled because of Spacer nondeterminism
-		//bytes memory b3 = abi.encodePacked(data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		//assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encodePacked(data[5:10]);
-		// Disabled because of Spacer nondeterminism
-		//assert(b1.length == b4.length); // should fail
-
-		// Disabled because of Spacer nondeterminism
-		//uint x = 5;
-		//uint y = 10;
-		//bytes memory b5 = abi.encodePacked(data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		//assert(b1.length == b5.length); // fails for now
-
-		// Disabled because of Spacer nondeterminism
-		//bytes memory b6 = abi.encode(data[5:10]);
-		//assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (643-658): Unused local variable.
-// Warning 6328: (298-328): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
deleted file mode 100644
index dc886246b817..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function abiencodePackedHash(uint a, uint b) public pure {
-		require(a == b);
-		bytes memory b1 = abi.encodePacked(a, a, a, a);
-		bytes memory b2 = abi.encodePacked(b, a, b, a);
-		assert(keccak256(b1) == keccak256(b2));
-
-		bytes memory b3 = abi.encode(a, a, a, a);
-		assert(keccak256(b1) == keccak256(b3)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (281-319): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
deleted file mode 100644
index 50d474a873f7..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	function abiencodePackedSimple(bool t, uint x, uint y, uint z, uint[] memory a, uint[] memory b) public pure {
-		require(x == y);
-		bytes memory b1 = abi.encodePacked(x, z, a);
-		bytes memory b2 = abi.encodePacked(y, z, a);
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encodePacked(y, z, b);
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodePacked(t, z, a);
-		assert(b1.length == b4.length); // should fail
-
-		bytes memory b5 = abi.encodePacked(y, y, y, y, a, a, a);
-		assert(b1.length != b5.length); // should fail
-		assert(b1.length == b5.length); // should fail
-
-		// Commented out because of nondeterminism in Spacer in Z3 4.8.9
-		//bytes memory b6 = abi.encode(x, z, a);
-		//assert(b1.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (322-352): CHC: Assertion violation happens here.
-// Warning 6328: (419-449): CHC: Assertion violation happens here.
-// Warning 6328: (528-558): CHC: Assertion violation happens here.
-// Warning 6328: (577-607): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
deleted file mode 100644
index 08c48cbd99de..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	function abiencodePackedStringLiteral() public pure {
-		bytes memory b1 = abi.encodePacked("");
-		bytes memory b2 = abi.encodePacked("");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encodePacked(bytes(""));
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodePacked(bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
-
-		bytes memory b5 = abi.encodePacked(string(""));
-		assert(b1.length == b5.length); // should fail
-
-		bytes memory b6 = abi.encode("");
-		assert(b1.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (226-256): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = [0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (310-340): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (483-513): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (568-598): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (654-684): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a]\nb6 = [0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117]\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
deleted file mode 100644
index f80027626102..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	function abiencodePackedStringLiteral() public pure {
-		bytes memory b1 = abi.encodePacked("");
-		bytes memory b2 = abi.encodePacked("");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encodePacked(bytes(""));
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodePacked(bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
-
-		bytes memory b5 = abi.encodePacked(string(""));
-		assert(b1.length == b5.length); // should fail
-
-		bytes memory b6 = abi.encode("");
-		assert(b1.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTShowUnproved: no
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (226-256): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = [0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (310-340): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (483-513): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (568-598): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
-// Warning 6328: (654-684): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a]\nb6 = [0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117]\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
deleted file mode 100644
index bf3bd61bece7..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	function abiEncodeSimple(bool t, uint x, uint y, uint z, uint[] memory a, uint[] memory b) public pure {
-		require(x == y);
-		bytes memory b1 = abi.encode(x, z, a);
-		bytes memory b2 = abi.encode(y, z, a);
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encode(y, z, b);
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encode(t, z, a);
-		assert(b1.length == b4.length); // should fail
-
-		bytes memory b5 = abi.encode(y, y, y, y, a, a, a);
-		assert(b1.length != b5.length); // should fail
-		// Disabled because of nondeterminism in Spacer Z3 4.8.9
-		//assert(b1.length == b5.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (298-328): CHC: Assertion violation happens here.
-// Warning 6328: (389-419): CHC: Assertion violation happens here.
-// Warning 6328: (492-522): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
deleted file mode 100644
index b55952ee74f6..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	function abiEncodeStringLiteral() public pure {
-		bytes memory b1 = abi.encode("");
-		bytes memory b2 = abi.encode("");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encode(bytes(""));
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encode(bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
-
-		bytes memory b5 = abi.encode(string(""));
-		assert(b1.length == b5.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (208-238): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = []\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
-// Warning 6328: (286-316): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb3 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
-// Warning 6328: (453-483): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
-// Warning 6328: (532-562): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
deleted file mode 100644
index 67c8b92e6203..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	function abiEncodeSlice(bytes4 sel, bytes calldata data) external pure {
-		bytes memory b1 = abi.encodeWithSelector(sel, data);
-		bytes memory b2 = abi.encodeWithSelector(sel, data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		bytes memory b3 = abi.encodeWithSelector(sel, data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encodeWithSelector(sel, data[5:10]);
-		assert(b1.length == b4.length); // should fail
-
-		uint x = 5;
-		uint y = 10;
-		bytes memory b5 = abi.encodeWithSelector(sel, data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		assert(b1.length == b5.length); // fails for now
-
-		bytes memory b6 = abi.encodeWithSelector(0xcafecafe, data[5:10]);
-		assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (325-355): CHC: Assertion violation happens here.
-// Warning 6328: (578-608): CHC: Assertion violation happens here.
-// Warning 6328: (1079-1109): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (1079-1109): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
deleted file mode 100644
index 69a3482b199d..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	function abiEncodeSlice(bytes4 sel, uint[] calldata data) external pure {
-		bytes memory b1 = abi.encodeWithSelector(sel, data);
-		bytes memory b2 = abi.encodeWithSelector(sel, data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		bytes memory b3 = abi.encodeWithSelector(sel, data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encodeWithSelector(sel, data[5:10]);
-		assert(b1.length == b4.length); // should fail
-
-		uint x = 5;
-		uint y = 10;
-		bytes memory b5 = abi.encodeWithSelector(sel, data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		assert(b1.length == b5.length); // fails for now
-
-		bytes memory b6 = abi.encodeWithSelector(0xcafecafe, data[5:10]);
-		assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (326-356): CHC: Assertion violation happens here.
-// Warning 6328: (579-609): CHC: Assertion violation happens here.
-// Warning 6328: (1080-1110): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (1080-1110): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
deleted file mode 100644
index ae6ea018f19c..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function abiEncodeHash(bytes4 sel, uint a, uint b) public pure {
-		require(a == b);
-		bytes memory b1 = abi.encodeWithSelector(sel, a, a, a, a);
-		bytes memory b2 = abi.encodeWithSelector(sel, b, a, b, a);
-		// Disabled because of OSX nondeterminism
-		//assert(keccak256(b1) == keccak256(b2));
-
-		bytes memory b3 = abi.encodeWithSelector(0xcafecafe, a, a, a, a);
-		assert(keccak256(b1) == keccak256(b3)); // should fail
-		assert(keccak256(b1) != keccak256(b3)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (161-176): Unused local variable.
-// Warning 6328: (379-417): CHC: Assertion violation happens here.
-// Warning 6328: (436-474): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
deleted file mode 100644
index 07090e1ef1a0..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	function abiEncodeSimple(bytes4 sel, bool t, uint x, uint y, uint z, uint[] memory a, uint[] memory b) public pure {
-		require(x == y);
-		// Disabled because of Spacer nondeterminism
-		bytes memory b1 = abi.encodeWithSelector(sel, x, z, a);
-		//bytes memory b2 = abi.encodeWithSelector(sel, y, z, a);
-		//assert(b1.length == b2.length);
-
-		// Disabled because of Spacer nondeterminism
-		//bytes memory b3 = abi.encodeWithSelector(sel, y, z, b);
-		//assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodeWithSelector(sel, t, z, a);
-		assert(b1.length == b4.length); // should fail
-
-		bytes memory b5 = abi.encodeWithSelector(sel, y, y, y, y, a, a, a);
-		assert(b1.length != b5.length); // should fail
-		assert(b1.length == b5.length); // should fail
-
-		bytes memory b6 = abi.encodeWithSelector(0xcafecafe, x, z, a);
-		assert(b1.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 5667: (100-115): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (571-601): CHC: Assertion violation happens here.
-// Warning 6328: (691-721): CHC: Assertion violation happens here.
-// Warning 6328: (740-770): CHC: Assertion violation happens here.
-// Warning 6328: (855-885): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
deleted file mode 100644
index 6d1ab3066c84..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	function abiEncodeStringLiteral(bytes4 sel) public pure {
-		bytes memory b1 = abi.encodeWithSelector(sel, "");
-		bytes memory b2 = abi.encodeWithSelector(sel, "");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encodeWithSelector(sel, bytes(""));
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodeWithSelector(sel, bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
-
-		bytes memory b5 = abi.encodeWithSelector(sel, string(""));
-		assert(b1.length == b5.length); // should fail
-
-		bytes memory b6 = abi.encodeWithSelector(0xcafecafe, bytes24(""));
-		assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (252-282): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb1 = [0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
-// Warning 6328: (347-377): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb3 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
-// Warning 6328: (531-561): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb1 = [0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90]\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
-// Warning 6328: (627-657): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb5 = [0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
-// Warning 6328: (746-776): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb2 = []\nb5 = [0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol
deleted file mode 100644
index 6737700b5ba8..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function abiEncodeStringLiteral(bytes4 sel) public pure {
-		bytes memory b1 = abi.encodeWithSelector("");
-		require(sel == "");
-		bytes memory b2 = abi.encodeWithSelector(sel);
-		assert(b1.length == b2.length); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
deleted file mode 100644
index 4b4f7a3ace98..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(string memory sig, uint x, uint[] memory a) public pure {
-		bytes memory b1 = abi.encodeWithSignature(sig, x, a);
-		bytes memory b2 = abi.encodeWithSelector(bytes4(keccak256(bytes(sig))), x, a);
-		// should hold but we do not evaluate keccak256 in an interpreted way
-		//assert(b1.length == b2.length);
-		assert(b1.length != b2.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (330-360): CHC: Assertion violation might happen here.
-// Warning 7812: (330-360): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
deleted file mode 100644
index fad7437448f3..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	function abiEncodeSlice(string memory sig, bytes calldata data) external pure {
-		bytes memory b1 = abi.encodeWithSignature(sig, data);
-		bytes memory b2 = abi.encodeWithSignature(sig, data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		bytes memory b3 = abi.encodeWithSignature(sig, data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encodeWithSignature(sig, data[5:10]);
-		assert(b1.length == b4.length); // should fail
-
-		uint x = 5;
-		uint y = 10;
-		bytes memory b5 = abi.encodeWithSignature(sig, data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		assert(b1.length == b5.length); // fails for now
-
-		bytes memory b6 = abi.encodeWithSelector("f()", data[5:10]);
-		assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (334-364): CHC: Assertion violation happens here.
-// Warning 6328: (588-618): CHC: Assertion violation happens here.
-// Warning 6328: (1086-1116): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (1086-1116): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
deleted file mode 100644
index 41e71ee5bf0e..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	function abiEncodeSlice(string memory sig, uint[] calldata data) external pure {
-		bytes memory b1 = abi.encodeWithSignature(sig, data);
-		bytes memory b2 = abi.encodeWithSignature(sig, data[0:]);
-		// should hold but the engine cannot infer that data is fully equals data[0:] because each index is assigned separately
-		assert(b1.length == b2.length); // fails for now
-
-		bytes memory b3 = abi.encodeWithSignature(sig, data[:data.length]);
-		// should hold but the engine cannot infer that data is fully equals data[:data.length] because each index is assigned separately
-		assert(b1.length == b3.length); // fails for now
-
-		bytes memory b4 = abi.encodeWithSignature(sig, data[5:10]);
-		assert(b1.length == b4.length); // should fail
-
-		uint x = 5;
-		uint y = 10;
-		bytes memory b5 = abi.encodeWithSignature(sig, data[x:y]);
-		// should hold but the engine cannot infer that data[5:10] is fully equals data[x:y] because each index is assigned separately
-		assert(b1.length == b5.length); // fails for now
-
-		bytes memory b6 = abi.encodeWithSelector("f()", data[5:10]);
-		assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (335-365): CHC: Assertion violation happens here.
-// Warning 6328: (589-619): CHC: Assertion violation happens here.
-// Warning 6328: (1087-1117): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (1087-1117): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
deleted file mode 100644
index fbcaa1607cef..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function abiEncodeHash(string memory sig, uint a, uint b) public pure {
-		require(a == b);
-		bytes memory b1 = abi.encodeWithSignature(sig, a, a, a, a);
-		bytes memory b2 = abi.encodeWithSignature(sig, b, a, b, a);
-		assert(keccak256(b1) == keccak256(b2));
-
-		bytes memory b3 = abi.encodeWithSelector("f()", a, a, a, a);
-		assert(keccak256(b1) == keccak256(b3)); // should fail
-		assert(keccak256(b1) != keccak256(b3)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (337-375): CHC: Assertion violation happens here.
-// Warning 6328: (394-432): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
deleted file mode 100644
index bd0f8a331a44..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	function abiEncodeSimple(string memory sig, bool t, uint x, uint y, uint z, uint[] memory a, uint[] memory b) public pure {
-		require(x == y);
-		bytes memory b1 = abi.encodeWithSignature(sig, x, z, a);
-		bytes memory b2 = abi.encodeWithSignature(sig, y, z, a);
-		assert(b1.length == b2.length);
-
-		// Disabled because of nondeterminism in Spacer Z3 4.8.9
-		//bytes memory b3 = abi.encodeWithSignature(sig, y, z, b);
-		//assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodeWithSignature(sig, t, z, a);
-		assert(b1.length == b4.length); // should fail
-
-		bytes memory b5 = abi.encodeWithSignature(sig, y, y, y, y, a, a, a);
-		assert(b1.length != b5.length); // should fail
-		assert(b1.length == b5.length); // should fail
-
-		bytes memory b6 = abi.encodeWithSignature("f()", x, z, a);
-		assert(b1.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 5667: (107-122): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (543-573): CHC: Assertion violation happens here.
-// Warning 6328: (664-694): CHC: Assertion violation happens here.
-// Warning 6328: (713-743): CHC: Assertion violation happens here.
-// Warning 6328: (824-854): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
deleted file mode 100644
index de218cfaa6d6..000000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	function abiEncodeStringLiteral(string memory sig) public pure {
-		bytes memory b1 = abi.encodeWithSignature(sig, "");
-		bytes memory b2 = abi.encodeWithSignature(sig, "");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encodeWithSignature(sig, bytes(""));
-		assert(b1.length == b3.length); // should fail
-
-		bytes memory b4 = abi.encodeWithSignature(sig, bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
-
-		bytes memory b5 = abi.encodeWithSignature(sig, string(""));
-		assert(b1.length == b5.length); // should fail
-
-		bytes memory b6 = abi.encodeWithSelector("f()", bytes24(""));
-		assert(b4.length == b6.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (261-291): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
-// Warning 6328: (357-387): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
-// Warning 6328: (542-572): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa]\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
-// Warning 6328: (639-669): CHC: Assertion violation happens here.\nCounterexample:\n\nb4 = [0x22, 0x22, 0x22, 0x22, 0x22, 0x0d, 0x22, 0x22, 0x22, 0x22, 0x09, 0x22, 0x0b, 0x22, 0x22, 0x0e, 0x22, 0x10, 0x22, 0x12, 0x22, 0x14, 0x22, 0x16, 0x22, 0x18, 0x22, 0x1a, 0x22, 0x1c, 0x22, 0x1e, 0x22, 0x20, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
-// Warning 6328: (753-783): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117]\nb4 = []\nb5 = [0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol
deleted file mode 100644
index 43aa6c31f42e..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.pop();
-		a.push();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol
deleted file mode 100644
index 011d7b321590..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.pop();
-		a.length;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol
deleted file mode 100644
index b7432100642b..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.pop();
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
-// Warning 2529: (60-67): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol
deleted file mode 100644
index 206ada96e697..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.length;
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (61-68): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol
deleted file mode 100644
index 8811944c81c8..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint[] a;
-	function g() internal {
-		a.push();
-	}
-	function f() public {
-		a.pop();
-		g();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (89-96): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol
deleted file mode 100644
index f47a89375820..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint[] a;
-	function g() internal view {
-		a.length;
-	}
-	function f() public {
-		a.pop();
-		g();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (94-101): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol
deleted file mode 100644
index 5ba845e7497b..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.push();
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
deleted file mode 100644
index f3546acf1bce..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.pop();
-		a.push();
-		a.push();
-		a.push();
-		a.pop();
-		a.pop();
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol b/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
deleted file mode 100644
index cbded7cad7df..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	bytes data;
-	function g() public {
-		require(data.length == 0);
-		data.push("b");
-		assert(data[0] == "b"); // should hold
-		assert(data[0] == "c"); // should fail
-		delete data;
-		data.push(hex"01");
-		assert(uint8(data[0]) == 1); // should hold
-		assert(uint8(data[0]) == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (139-161): CHC: Assertion violation happens here.
-// Warning 6328: (263-290): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol
deleted file mode 100644
index 3d68cef67e66..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function f(uint[][] memory arr) public pure {
-		require(arr.length > 0);
-		uint[][] memory arr2 = arr;
-		assert(arr2[0].length == arr[0].length);
-		assert(arr.length == arr2.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
deleted file mode 100644
index a20d20e0e503..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	uint[][] arr;
-	uint[][] arr2;
-	constructor() {
-		arr.push();
-		arr.push();
-		arr2.push();
-		arr2.push();
-	}
-	function f() public view {
-		assert(arr2[0].length == arr[0].length);
-		assert(arr2.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol
deleted file mode 100644
index cc5845733bee..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	uint[][] arr;
-	function f(uint[][] memory arr2) public {
-		require(arr2.length > 0);
-		arr = arr2;
-		assert(arr2[0].length == arr[0].length);
-		assert(arr2.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
deleted file mode 100644
index 8c952aa75b68..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	uint[][] arr;
-	constructor() {
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-	}
-	function f() public view {
-		uint[][] memory arr2 = arr;
-		assert(arr2[0].length == arr[0].length);
-		assert(arr2.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
deleted file mode 100644
index 233c95560f72..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	mapping (uint => uint[]) map;
-	function f() public view {
-		assert(map[0].length == map[1].length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol
deleted file mode 100644
index 245d4b8d4ece..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	mapping (uint => uint[]) map;
-	function f(uint x, uint y) public view {
-		require(x == y);
-		assert(map[x].length == map[y].length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol
deleted file mode 100644
index d6efabebfd32..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	mapping (uint => uint[][]) map;
-	function f(uint x, uint y) public {
-		require(x == y);
-		map[x].push();
-		assert(map[x][0].length == map[y][0].length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
deleted file mode 100644
index f12f2bd92d5e..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	struct S {
-		uint[] arr;
-	}
-	S s1;
-	S s2;
-	function f() public view {
-		assert(s1.arr.length == s2.arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
deleted file mode 100644
index ab3bf9a7c573..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	struct S {
-		uint[][] arr;
-	}
-	S s1;
-	S s2;
-	constructor() {
-		s1.arr.push();
-		s2.arr.push();
-		s1.arr[0].push();
-		s1.arr[0].push();
-		s1.arr[0].push();
-		s2.arr[0].push();
-		s2.arr[0].push();
-		s2.arr[0].push();
-	}
-	function f() public view {
-		assert(s1.arr[0].length == s2.arr[0].length);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol
deleted file mode 100644
index 9a6a00b8fd2a..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	function f(uint[][] memory arr) public pure {
-		uint[][] memory arr2 = arr;
-		assert(arr2.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol
deleted file mode 100644
index 72aca44e0b29..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(uint[] memory arr) public pure {
-		uint[] memory arr2 = arr;
-		assert(arr2.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol
deleted file mode 100644
index f198c962645d..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[] arr;
-	uint[] arr2;
-	function f() public {
-		arr2 = arr;
-		assert(arr2.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_basic.sol b/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
deleted file mode 100644
index 981311a8b7d3..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint[] arr;
-	function f() public view {
-		uint x = arr.length;
-		uint y = x;
-		assert(arr.length == y);
-		assert(arr.length != y);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (120-143): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol
deleted file mode 100644
index 07b0bbb467eb..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] arr;
-	function f(uint[] memory marr) public {
-		arr = marr;
-		assert(marr.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol
deleted file mode 100644
index a750ba59ad42..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] arr;
-	function f() public view {
-		uint[] memory marr = arr;
-		assert(marr.length == arr.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol b/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
deleted file mode 100644
index 4b30e2a6a808..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[] arr;
-	function f() public view {
-		assert(arr.length == g().length);
-	}
-	function g() internal pure returns (uint[] memory) {
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
deleted file mode 100644
index aa1a06132fb4..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint[] arr;
-	constructor() {
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-	}
-	function f() public view {
-		uint[] memory arr2 = arr;
-		arr2[2] = 3;
-		assert(arr.length == arr2.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
deleted file mode 100644
index 783ad207ec54..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	uint[][] arr;
-	constructor() {
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr[2].push();
-		arr[2].push();
-		arr[2].push();
-		arr[2].push();
-	}
-	function f() public {
-		uint x = arr[2].length;
-		uint y = arr[3].length;
-		uint z = arr.length;
-		arr[2][3] = 444;
-		assert(arr[2].length == x);
-		assert(arr[3].length == y);
-		assert(arr.length == z);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
deleted file mode 100644
index 40effc4cb9ef..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	uint[][] arr;
-	constructor() {
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr[2].push();
-		arr[2].push();
-		arr[2].push();
-		arr[2].push();
-	}
-	function f() public {
-		uint x = arr[2].length;
-		uint y = arr[3].length;
-		uint z = arr.length;
-		arr[2][3] = 444;
-		assert(arr[2].length != x);
-		assert(arr[3].length != y);
-		assert(arr.length != z);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (291-317): CHC: Assertion violation happens here.
-// Warning 6328: (321-347): CHC: Assertion violation happens here.
-// Warning 6328: (351-374): CHC: Assertion violation happens here.
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
deleted file mode 100644
index 8ba2cd75de80..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	uint[][] arr;
-
-	constructor() {
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-	}
-
-	function f() public {
-		uint x = arr[2].length;
-		uint y = arr[3].length;
-		uint z = arr.length;
-		uint t = arr[5].length;
-		arr[5] = arr[8];
-		assert(arr[2].length == x);
-		assert(arr[3].length == y);
-		assert(arr.length == z);
-		assert(arr[5].length == t);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
deleted file mode 100644
index d346692db7df..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-	uint[][] arr;
-	constructor() {
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-		arr.push();
-	}
-	function f() public {
-		uint x = arr[2].length;
-		uint y = arr[3].length;
-		uint z = arr.length;
-		uint t = arr[5].length;
-		arr[5] = arr[8];
-		assert(arr[2].length != x);
-		assert(arr[3].length != y);
-		assert(arr.length != z);
-		assert(arr[5].length != t);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (319-345): CHC: Assertion violation happens here.
-// Warning 6328: (349-375): CHC: Assertion violation happens here.
-// Warning 6328: (379-402): CHC: Assertion violation happens here.
-// Warning 6328: (406-432): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol
deleted file mode 100644
index 5ba845e7497b..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.push();
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
deleted file mode 100644
index 833983469195..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol
deleted file mode 100644
index e915d4df4fa9..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[][] a;
-	function f() public {
-		a.push();
-		a[0].push();
-		a[0].pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
deleted file mode 100644
index ea9f6a251bcd..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint[][] a;
-	function f() public {
-		a.push();
-		a.push();
-		a[0].push();
-		a[1].pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (90-100): CHC: Empty array "pop" happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol
deleted file mode 100644
index 06be68f9bc64..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	constructor() {
-		a.push();
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
deleted file mode 100644
index 7e1eb8b694e8..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	constructor() {
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 2529: (43-50): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol
deleted file mode 100644
index 5bd322cd598e..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint[] a;
-	function f(uint l) public {
-		for (uint i = 0; i < l; ++i) {
-			a.push();
-			a.pop();
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
deleted file mode 100644
index 0bb7b4f16e19..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint[] a;
-	function f(uint l) public {
-		for (uint i = 0; i < l; ++i) {
-			a.push();
-			a.pop();
-		}
-		a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (117-124): CHC: Empty array "pop" happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol
deleted file mode 100644
index 665fb13c8f41..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[][] a;
-	function f(uint[] memory x, uint y) public {
-		a.push(x);
-		a[0].push(y);
-		assert(a[0][a[0].length - 1] == y);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
deleted file mode 100644
index c60e983c2e14..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	uint[][] a;
-	function f(uint[] memory x, uint y) public {
-		a.push(x);
-		a[0].push(y);
-		a[0].pop();
-		assert(a[0][a[0].length - 1] == y);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 3944: (129-144): CHC: Underflow (resulting value less than 0) happens here.
-// Warning 6328: (117-151): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol
deleted file mode 100644
index 002d9246fc99..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f(uint x) public {
-		a.push(x);
-		assert(a[a.length - 1] == x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
deleted file mode 100644
index 42dd2e4947cf..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint[] b;
-
-	function f() public {
-		require(b.length == 0);
-		b.push() = 1;
-		assert(b[0] == 1);
-	}
-
-	function g() public {
-		b.push() = 1;
-		assert(b[b.length - 1] == 1);
-		// Fails
-		assert(b[b.length - 1] == 100);
-	}
-
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (199-229): CHC: Assertion violation happens here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
deleted file mode 100644
index 71997ecdd357..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	uint[][] c;
-
-	function f() public {
-		require(c.length == 0);
-		c.push().push() = 2;
-		assert(c.length == 1);
-		assert(c[0].length == 1);
-		assert(c[0][0] == 2);
-	}
-
-	function g() public {
-		c.push().push() = 2;
-		assert(c.length > 0);
-		assert(c[c.length - 1].length == 1);
-		assert(c[c.length - 1][c[c.length - 1].length - 1] == 2);
-		// Fails
-		assert(c[c.length - 1][c[c.length - 1].length - 1] == 200);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (362-420): CHC: Assertion violation happens here.
-// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol
deleted file mode 100644
index 180e70cbe7e3..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	int[][] array2d;
-	function s() public returns (int[] memory) {
-		array2d.push() = array2d.push();
-		assert(array2d[array2d.length - 1].length == array2d[array2d.length - 2].length);
-		return array2d[1];
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol
deleted file mode 100644
index 380dd892d3fb..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	uint[][][] c;
-
-	function f() public {
-		require(c.length == 0);
-		c.push().push().push() = 2;
-		assert(c.length == 1);
-		assert(c[0].length == 1);
-		assert(c[0][0].length == 1);
-		assert(c[0][0][0] == 2);
-	}
-
-	function g() public {
-		c.push().push().push() = 2;
-		uint length1 = c.length;
-		uint length2 = c[length1 - 1].length;
-		uint length3 = c[length1 - 1][length2 - 1].length;
-		assert(length1 > 0);
-		assert(length2 == 1);
-		assert(length3 == 1);
-		assert(c[length1 - 1][length2 - 1][length3 - 1] == 2);
-		// Fails
-		assert(c[length1 - 1][length2 - 1][length3 - 1] == 200);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (537-592): CHC: Assertion violation happens here.
-// Info 1391: CHC: 32 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
deleted file mode 100644
index d52b657d52f0..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint[] b;
-	function f() public {
-		b.push() = b.push();
-		uint length = b.length;
-		assert(length >= 2);
-		assert(b[length - 1] == 0);
-		assert(b[length - 1] == b[length - 2]);
-		// Fails
-		assert(b[length - 1] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (204-230): CHC: Assertion violation happens here.
-// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
deleted file mode 100644
index efc775ed7962..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint[][] b;
-	function f() public {
-		require(b.length == 0);
-		b.push().push() = b.push().push();
-		assert(b.length == 2);
-		assert(b[0].length == 1);
-		assert(b[0].length == 1);
-		assert(b[0][0] == 0);
-		assert(b[1][0] == 0);
-		assert(b[0][0] == b[1][0]);
-		// Fails
-		assert(b[0][0] != b[1][0]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (284-310): CHC: Assertion violation happens here.
-// Info 1391: CHC: 20 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol
deleted file mode 100644
index ccfc54401522..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint[][] b;
-	function f() public {
-		b.push().push() = b.push().push();
-		uint length = b.length;
-		assert(length >= 2);
-		uint length1 = b[length - 1].length;
-		uint length2 = b[length - 2].length;
-		assert(length1 == 1);
-		assert(length2 == 1);
-		assert(b[length - 1][length1 - 1] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
deleted file mode 100644
index b29bdde3f4fb..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	bytes b;
-	function f() public {
-		b.push() = b.push();
-		uint length = b.length;
-		assert(length >= 2);
-		assert(b[length - 1] == 0);
-		assert(b[length - 1] == b[length - 2]);
-		// Fails
-		assert(b[length - 1] == bytes1(uint8(1)));
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (203-244): CHC: Assertion violation happens here.
-// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
deleted file mode 100644
index ce8fa06572ce..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	bytes b;
-
-	function f() public {
-		require(b.length == 0);
-		b.push() = bytes1(uint8(1));
-		assert(b[0] == bytes1(uint8(1)));
-	}
-
-	function g() public {
-		bytes1 one = bytes1(uint8(1));
-		b.push() = one;
-		assert(b[b.length - 1] == one);
-		// Fails
-		assert(b[b.length - 1] == bytes1(uint8(100)));
-	}
-
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (265-310): CHC: Assertion violation happens here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
deleted file mode 100644
index 4dc7a7c3d10e..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-	bytes[] c;
-
-	function f() public {
-		bytes1 val = bytes1(uint8(2));
-		require(c.length == 0);
-		c.push().push() = val;
-		assert(c.length == 1);
-		assert(c[0].length == 1);
-		assert(c[0][0] == val);
-	}
-
-	function g() public {
-		bytes1 val = bytes1(uint8(2));
-		c.push().push() = val;
-		assert(c.length > 0);
-		assert(c[c.length - 1].length == 1);
-		assert(c[c.length - 1][c[c.length - 1].length - 1] == val);
-		// Fails
-		assert(c[c.length - 1][c[c.length - 1].length - 1] == bytes1(uint8(100)));
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (435-508): CHC: Assertion violation happens here.
-// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
deleted file mode 100644
index 4d20c8ae9b68..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-
-	int[] u;
-
-	function t() public {
-		require(u.length == 0);
-		u.push() -= 1;
-		assert(u[0] < 0); // should hold
-		assert(u[0] >= 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (128-145): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol
deleted file mode 100644
index a92b69f7b1aa..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	struct S {
-		int[] b;
-	}
-	S s;
-	struct T {
-		S s;
-	}
-	T t;
-	function f() public {
-		s.b.push() = t.s.b.push();
-		assert(s.b[s.b.length -1] == t.s.b[t.s.b.length - 1]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol b/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol
deleted file mode 100644
index ae897ce13396..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	bytes x;
-
-	function getX() internal view returns (bytes storage) {
-		return x;
-	}
-
-	function s() public {
-		require(x.length == 0);
-		getX().push("a");
-		assert(x.length == 1); // should hold but knowledge is erased due to pushing a reference
-		assert(x.length == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (168-189): CHC: Assertion violation happens here.
-// Warning 6328: (259-280): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
deleted file mode 100644
index 0d92364200d2..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint256[] x;
-	constructor() { x.push(42); }
-	function f() public {
-		x.push(23);
-		assert(x[0] == 42 || x[0] == 23);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
deleted file mode 100644
index 66cd21111ab6..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint256[] x;
-	constructor() { x.push(42); }
-	function f() public {
-		x.push(23);
-		assert(x[0] == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
deleted file mode 100644
index 798f8fce7bfd..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint256[] x;
-	function f(uint256 l) public {
-		require(x.length == 0);
-		x.push(42);
-		x.push(84);
-		for(uint256 i = 0; i < l; ++i)
-			x.push(23);
-		assert(x[0] == 42 || x[0] == 23);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
deleted file mode 100644
index cbd65e041701..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	uint256[] x;
-	function f(uint256 l) public {
-		require(x.length == 0);
-		x.push(42);
-		x.push(84);
-		for(uint256 i = 0; i < l; ++i)
-			x.push(23);
-		assert(x[0] == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol
deleted file mode 100644
index 5d3f01fe3032..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	int[][] array2d;
-	function l() public {
-		array2d.push().push();
-		assert(array2d.length > 0);
-		assert(array2d[array2d.length - 1].length > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
deleted file mode 100644
index 2d54d3ae1de4..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	int[][] array2d;
-	function l() public {
-		array2d.push().push();
-		assert(array2d.length > 2);
-		assert(array2d[array2d.length - 1].length > 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (81-107): CHC: Assertion violation happens here.
-// Warning 6328: (111-157): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol
deleted file mode 100644
index f78f917e48ce..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	int[][][] array2d;
-	function l() public {
-		array2d.push().push().push();
-		assert(array2d.length > 0);
-		uint last = array2d[array2d.length - 1].length;
-		assert(last > 0);
-		assert(array2d[array2d.length - 1][last - 1].length > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
deleted file mode 100644
index 5ff371cd70e7..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	int[][][] array2d;
-	function l() public {
-		array2d.push().push().push();
-		assert(array2d.length > 2);
-		uint last = array2d[array2d.length - 1].length;
-		assert(last > 3);
-		assert(array2d[array2d.length - 1][last - 1].length > 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (90-116): CHC: Assertion violation happens here.
-// Warning 6328: (170-186): CHC: Assertion violation happens here.
-// Warning 6328: (190-246): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
deleted file mode 100644
index e43d83c61fa1..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint[][] a;
-	function f() public {
-		a.push();
-		uint[] storage b = a[0];
-		b.push(8);
-		assert(b[b.length - 1] == 8);
-		// Safe but fails due to aliasing.
-		assert(a[0][a[0].length - 1] == 8);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (179-183): CHC: Out of bounds access happens here.
-// Warning 6368: (184-188): CHC: Out of bounds access happens here.
-// Warning 3944: (184-199): CHC: Underflow (resulting value less than 0) happens here.
-// Warning 6328: (172-206): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
deleted file mode 100644
index 502274fb2a1e..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	uint[][] a;
-	function f() public {
-		a.push();
-		a[0].push();
-		a[0][0] = 16;
-		uint[] storage b = a[0];
-		b[0] = 32;
-		// Access is safe but fails due to aliasing.
-		assert(a[0][0] == 16);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (188-192): CHC: Out of bounds access happens here.
-// Warning 6368: (188-195): CHC: Out of bounds access happens here.
-// Warning 6328: (181-202): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
deleted file mode 100644
index ebabc9706f42..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-	uint[][] a;
-	uint[][][] c;
-	uint[] d;
-	constructor() {
-		c.push().push().push();
-		d.push(); d.push();
-	}
-	function f() public {
-		a.push();
-		uint[] storage b = a[0];
-		// Access is safe but oob reported due to aliasing.
-		c[0][0][0] = 12;
-		// Access is safe but oob reported due to aliasing.
-		d[1] = 7;
-		b.push(8);
-		assert(a[0].length == 0);
-		// Safe but knowledge about `c` is erased because `b` could be pointing to `c[x][y]`.
-		// Access is safe but oob reported due to aliasing.
-		assert(c[0][0][0] == 12);
-		// Safe but knowledge about `d` is erased because `b` could be pointing to `d`.
-		// Removed assertion because current Spacer seg faults in cex generation.
-		//assert(d[1] == 7);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (238-242): CHC: Out of bounds access happens here.
-// Warning 6368: (238-245): CHC: Out of bounds access happens here.
-// Warning 6368: (238-248): CHC: Out of bounds access happens here.
-// Warning 6368: (311-315): CHC: Out of bounds access happens here.
-// Warning 6368: (343-347): CHC: Out of bounds access happens here.
-// Warning 6328: (336-360): CHC: Assertion violation happens here.
-// Warning 6368: (513-517): CHC: Out of bounds access happens here.
-// Warning 6368: (513-520): CHC: Out of bounds access happens here.
-// Warning 6368: (513-523): CHC: Out of bounds access happens here.
-// Warning 6328: (506-530): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol
deleted file mode 100644
index bb69ec9eeceb..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	struct S {
-		int[] b;
-	}
-	S s;
-	struct T {
-		S s;
-	}
-	T t;
-	function f() public {
-		s.b.push();
-		t.s.b.push();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
deleted file mode 100644
index ad7a675b0b0d..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	struct S {
-		int[] b;
-	}
-	S s;
-	struct T {
-		S[] s;
-	}
-	T t;
-	function f() public {
-		s.b.push();
-		t.s.push();
-		t.s[0].b.push();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol
deleted file mode 100644
index 73fb53865482..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[][] a;
-	function f() public {
-		a.push();
-		a[a.length - 1].push();
-		assert(a[a.length - 1][0] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol
deleted file mode 100644
index dde8a83705b3..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint[][] a;
-	function f() public {
-		a.push();
-		a[a.length - 1].push();
-		assert(a[a.length - 1][0] == 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (89-122): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol
deleted file mode 100644
index 3c33fbda6756..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.push();
-		assert(a[a.length - 1] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
deleted file mode 100644
index ed846fae090e..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint[] a;
-	function f() public {
-		a.push();
-		assert(a[a.length - 1] == 100);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (61-91): CHC: Assertion violation happens here.\nCounterexample:\na = [0]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
deleted file mode 100644
index cbe2d6593d5c..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	int[][] array2d;
-	function l() public {
-		s().push();
-		// False positive.
-		// Knowledge is erased because `s()` is a storage pointer.
-		assert(array2d[2].length > 0);
-	}
-	function s() internal returns (int[] storage) {
-		array2d.push();
-		array2d.push();
-		array2d.push();
-		return array2d[2];
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (159-169): CHC: Out of bounds access happens here.
-// Warning 6328: (152-181): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol
deleted file mode 100644
index 74906c3d95d6..000000000000
--- a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	int[][] array2d;
-	function l() public {
-		s();
-		array2d[2].push();
-		assert(array2d[2].length > 0);
-	}
-	function s() internal returns (int[] storage) {
-		array2d.push();
-		array2d.push();
-		array2d.push();
-		return array2d[2];
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero.sol
deleted file mode 100644
index bf7fc6de9237..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	constructor() payable {
-		assert(address(this).balance == 0); // should fail
-		assert(address(this).balance > 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (40-74): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }
-// Warning 6328: (93-126): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
deleted file mode 100644
index e5c913c6a818..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	constructor() payable {
-		require(msg.value > 100);
-	}
-	function f() public view {
-		assert(address(this).balance > 100); // should hold
-		assert(address(this).balance > 200); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (153-188): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
deleted file mode 100644
index 796144733244..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	uint prevBalance;
-	constructor() payable {
-		prevBalance = address(this).balance;
-	}
-	function f() public payable {
-		assert(address(this).balance == prevBalance + msg.value); // should fail because there might be funds from selfdestruct/block.coinbase
-		assert(address(this).balance < prevBalance + msg.value); // should fail
-		assert(address(this).balance >= prevBalance + msg.value); // should hold
-		prevBalance = address(this).balance;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (132-188): CHC: Assertion violation happens here.
-// Warning 6328: (269-324): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
deleted file mode 100644
index f1c423bc8718..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	uint x;
-	bool once;
-	constructor() payable {
-		x = address(this).balance;
-	}
-	function f() public payable {
-		require(!once);
-		once = true;
-		require(msg.value > 0);
-		assert(address(this).balance > x); // should hold
-		assert(address(this).balance > x + 10); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (235-273): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_3.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_3.sol
deleted file mode 100644
index 169e1a066d52..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	constructor() payable {
-		assert(address(this).balance == msg.value); // should fail because there might be funds from before deployment
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (40-82): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
deleted file mode 100644
index dfa571c33822..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint c;
-	function f() public payable {
-		require(msg.value > 10);
-		++c;
-	}
-	function inv() public view {
-		assert(address(this).balance >= c * 11); // should hold
-		assert(address(this).balance >= c * 12); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 4984: (82-85): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (154-160): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (212-218): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (180-219): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (82-85): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 2661: (154-160): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 2661: (212-218): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
deleted file mode 100644
index 26009b3b8f8e..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint sum = msg.value;
-	function f() public payable {
-		sum += msg.value;
-	}
-	function inv() public view {
-		assert(address(this).balance == sum); // should fail
-		assert(address(this).balance >= sum); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (122-158): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
deleted file mode 100644
index 7379b1999931..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-	bool once;
-	function f() public payable {
-		require(!once);
-		once = true;
-		require(msg.value == 10);
-		assert(address(this).balance >= 10); // should hold
-		assert(address(this).balance >= 20); // should fail
-		g();
-	}
-	function g() internal view {
-		assert(address(this).balance >= 10); // should hold
-		assert(address(this).balance >= 20); // should fail
-		h();
-	}
-	function h() internal view {
-		assert(address(this).balance >= 10); // should hold
-		assert(address(this).balance >= 20); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (173-208): CHC: Assertion violation happens here.
-// Warning 6328: (321-356): CHC: Assertion violation happens here.
-// Warning 6328: (469-504): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
deleted file mode 100644
index 7f22d1d0efb3..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface I {
-	function ext() external;
-}
-
-contract C {
-	function f(I _i) public {
-		uint x = address(this).balance;
-		_i.ext();
-		assert(address(this).balance == x); // should fail
-		assert(address(this).balance >= x); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (131-165): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
deleted file mode 100644
index 0a3066888f50..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f(address _a) public {
-		uint x = address(this).balance;
-		_a.call("");
-		assert(address(this).balance == x); // should fail
-		assert(address(this).balance >= x); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreInv: yes
-// ----
-// Warning 9302: (82-93): Return value of low-level calls not used.
-// Warning 6328: (97-131): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
deleted file mode 100644
index b74f34c3bec5..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-interface I {
-	function ext() external;
-}
-
-contract C {
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-	function f(I _i) public mutex {
-		uint x = address(this).balance;
-		_i.ext();
-		assert(address(this).balance == x); // should hold
-		assert(address(this).balance < x); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (277-310): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
deleted file mode 100644
index 387e45bb9f46..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	constructor() payable {
-		require(msg.value > 100);
-	}
-	uint c;
-	function f(address payable _a, uint _v) public {
-		require(_v < 10);
-		require(c < 2);
-		++c;
-		_a.transfer(_v);
-	}
-	function inv() public view {
-		assert(address(this).balance > 80); // should hold
-		assert(address(this).balance > 90); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (280-314): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 1236: (175-190): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
deleted file mode 100644
index 5df0b99956f2..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	constructor() payable {
-		require(msg.value > 100);
-	}
-	function f(address payable _a, uint _v) public {
-		require(_v < 10);
-		_a.transfer(_v);
-	}
-	function inv() public view {
-		assert(address(this).balance > 0); // should fail
-		assert(address(this).balance > 80); // should fail
-		assert(address(this).balance > 90); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (193-226): CHC: Assertion violation might happen here.
-// Warning 6328: (245-279): CHC: Assertion violation happens here.
-// Warning 6328: (298-332): CHC: Assertion violation happens here.
-// Warning 1236: (141-156): BMC: Insufficient funds happens here.
-// Warning 4661: (193-226): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero.sol
deleted file mode 100644
index 1e585cb7d1e4..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	constructor() {
-		assert(address(this).balance == 0); // should fail because there might be funds from before deployment
-		assert(address(this).balance > 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (32-66): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (137-170): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_2.sol
deleted file mode 100644
index 1ba5eb87f63e..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public view {
-		assert(address(this).balance == 0); // should fail because there might be funds from before deployment
-		assert(address(this).balance > 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (43-77): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (148-181): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol
deleted file mode 100644
index 39c7000c3e39..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x = address(this).balance;
-	constructor() {
-		assert(x == 0); // should fail because there might be funds from before deployment
-		assert(x > 0); // should fail
-	}
-	function f() public view {
-		assert(x == 0); // should fail because there might be funds from before deployment
-		assert(x > 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (65-79): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (150-163): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (213-227): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 1\nC.f()
-// Warning 6328: (298-311): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol
deleted file mode 100644
index 81bf41892624..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	uint x = g();
-	function g() internal view returns (uint) {
-		return address(this).balance;
-	}
-	constructor() {
-		assert(x == 0); // should fail because there might be funds from before deployment
-		assert(x > 0); // should fail
-	}
-	function f() public view {
-		assert(x == 0); // should fail because there might be funds from before deployment
-		assert(x > 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (212-225): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (275-289): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 1\nC.f()
-// Warning 6328: (360-373): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol b/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
deleted file mode 100644
index 76455060d8d5..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	uint t;
-	constructor() {
-		t = address(this).balance;
-	}
-	function f(address payable a, uint x) public {
-		require(address(this).balance >= x);
-		a.transfer(x);
-	}
-	function inv() public view {
-		// If only looking at `f`, it looks like this.balance always decreases.
-		// However, the edge case of a contract `selfdestruct` sending its remaining balance
-		// to this contract should make the claim false (since there's no fallback/receive here).
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(address(this).balance == t);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
deleted file mode 100644
index e7e7d924206b..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-function l(address payable a) {}
-
-contract C {
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		l(a);
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should hold
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
deleted file mode 100644
index e2e187038ca1..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-function l(address payable a) {
-	a.transfer(1);
-}
-
-contract C {
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		require(a != address(this));
-		l(a);
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail
-		assert(b1 == b2 + 1); // should hold
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (258-274): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 1236: (33-46): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
deleted file mode 100644
index 4314db11b091..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-	function l(address payable a) internal {}
-}
-
-contract C {
-	using L for address payable;
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		a.l();
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should hold
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
deleted file mode 100644
index f16a57acf68f..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-library L {
-	function l(address payable a) internal {
-		require(a != address(this));
-		a.transfer(1);
-	}
-}
-
-contract C {
-	using L for address payable;
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		a.l();
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail
-		assert(b1 == b2 + 1); // should hold
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (315-331): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 1236: (87-100): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol
deleted file mode 100644
index 98e0e664fa58..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-library L {
-	function l(address payable a) public {}
-}
-
-contract C {
-	using L for address payable;
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		a.l();
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail because the called library can transfer with `this`s balance
-		assert(x == 0); // should fail because of `delegatecall`
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4588: (219-224): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (263-279): CHC: Assertion violation happens here.
-// Warning 6328: (359-373): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
deleted file mode 100644
index 4b500581d323..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-library L {
-	function l(address payable a) public {
-		a.transfer(1);
-	}
-}
-
-contract C {
-	using L for address payable;
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		a.l();
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail
-		assert(x == 0); // should fail because of `delegatecall`
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4588: (238-243): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (282-298): CHC: Assertion violation happens here.
-// Warning 6328: (317-331): CHC: Assertion violation happens here.
-// Warning 1236: (54-67): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol
deleted file mode 100644
index 26975e35900b..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-library L {
-	function l(address payable a) public returns (uint) {
-		return msg.value;
-	}
-}
-
-contract C {
-	using L for address payable;
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		uint v = a.l();
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail because the called library can transfer with `this`s balance
-		assert(x == 0); // should fail because of `delegatecall`
-		assert(v == msg.value); // should hold but we don't support `delegatecall` properly yet.
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 5667: (24-41): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 4588: (265-270): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (309-325): CHC: Assertion violation happens here.
-// Warning 6328: (405-419): CHC: Assertion violation happens here.
-// Warning 6328: (464-486): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol
deleted file mode 100644
index 57fdbf9ad2a8..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-library L {
-	function l(address payable a) public returns (address) {
-		return msg.sender;
-	}
-}
-
-contract C {
-	using L for address payable;
-	uint x;
-	function f(address payable a) public payable {
-		require(msg.value > 1);
-		uint b1 = address(this).balance;
-		address v = a.l();
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail because the called library can transfer with `this`s balance
-		assert(x == 0); // should fail because of `delegatecall`
-		assert(v == msg.sender); // should hold but we don't support `delegatecall` properly yet.
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 5667: (24-41): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2018: (13-93): Function state mutability can be restricted to view
-// Warning 4588: (272-277): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (316-332): CHC: Assertion violation happens here.
-// Warning 6328: (412-426): CHC: Assertion violation happens here.
-// Warning 6328: (471-494): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
deleted file mode 100644
index a51f73ddd73d..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	address t;
-	constructor() {
-		t = address(this);
-	}
-	function inv() public view {
-		assert(address(this) == t);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
deleted file mode 100644
index 2c9e58e7b39d..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	address t;
-	constructor() {
-		t = address(this);
-	}
-	function f(D d) public {
-		address a = address(this);
-		d.d();
-		assert(address(this) == t);
-		assert(a == t);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
deleted file mode 100644
index 1b1adc9d7546..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	address t;
-	constructor() {
-		t = address(this);
-	}
-	function f() public view {
-		g(address(this));
-	}
-	function g(address a) internal view {
-		assert(a == t);
-		assert(a == address(this));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
deleted file mode 100644
index c099ffb2e5c9..000000000000
--- a/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f(address payable a) public {
-		require(address(this).balance > 1000);
-		a.transfer(666);
-		assert(address(this).balance > 100);
-		// Fails.
-		assert(address(this).balance > 500);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (166-201): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol
deleted file mode 100644
index 819839f7e445..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-	function g(uint x) public pure {
-		require(x >= 0);
-	}
-	function h(uint x) public pure {
-		require(x == 2);
-		require(x != 2);
-	}
-	function i(uint x) public pure {
-		if (false) {
-			if (x != 2) {
-			}
-		}
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (49-62): BMC: Assertion violation happens here.
-// Warning 6838: (111-117): BMC: Condition is always true.
-// Warning 6838: (186-192): BMC: Condition is always false.
-// Warning 2512: (254-260): BMC: Condition unreachable.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol
deleted file mode 100644
index 65f079649edb..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint x = initX();
-
-	function initX() internal pure returns (uint) {
-		return 42;
-	}
-}
-
-contract D is C {
-	uint y;
-
-	constructor() {
-		assert(x == 42);
-		y = x;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
deleted file mode 100644
index 422f57c09e05..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-
-	uint x;
-
-	modifier check() {
-		require(x == 0);
-		_;
-		assert(x == 1); // should fail;
-		assert(x == 0); // should hold;
-	}
-
-	modifier inc() {
-		if (x == 0) {
-			return;
-		}
-		x = x + 1;
-		_;
-	}
-
-	function test() check inc public {
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (70-84): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
deleted file mode 100644
index 2b845fbc3810..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract C {
-
-    uint x;
-
-    function reset_if_overflow() internal postinc {
-        if (x < 10)
-            return;
-        x = 0;
-    }
-
-    modifier postinc() {
-        if (x == 0) {
-            return;
-        }
-        _;
-        x = x + 1;
-    }
-
-    function test() public {
-        if (x == 0) {
-            reset_if_overflow();
-            assert(x == 1); // should fail;
-            assert(x == 0); // should hold;
-            return;
-        }
-        if (x < 10) {
-            uint oldx = x;
-            reset_if_overflow();
-            assert(oldx + 1 == x); // should hold;
-            assert(oldx == x);     // should fail;
-            return;
-        }
-        reset_if_overflow();
-        assert(x == 1); // should hold;
-        assert(x == 0); // should fail;
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (351-365): BMC: Assertion violation happens here.
-// Warning 4661: (602-619): BMC: Assertion violation happens here.
-// Warning 4661: (748-762): BMC: Assertion violation happens here.
-// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
deleted file mode 100644
index c262e2481be5..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract A {
-	int x;
-	constructor (int a) { x = a;}
-}
-
-contract B is A {
-	int y;
-	constructor(int a) A(-a) {
-		if (a > 0) {
-			y = 2;
-			return;
-		}
-		else {
-			y = 3;
-		}
-		y = 4; // overwrites the else branch
-	}
-}
-
-contract C is B {
-	constructor(int a) B(a) {
-		assert(y != 3); // should hold
-		assert(y == 4); // should fail
-		if (a > 0) {
-			assert(x < 0 && y == 2); // should hold
-			assert(x < 0 && y == 4); // should fail
-		}
-		else {
-			assert(x >= 0 && y == 4); // should hold
-			assert(x >= 0 && y == 2); // should fail
-			assert(x > 0); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (297-311): BMC: Assertion violation happens here.
-// Warning 4661: (389-412): BMC: Assertion violation happens here.
-// Warning 4661: (489-513): BMC: Assertion violation happens here.
-// Warning 4661: (533-546): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
deleted file mode 100644
index 63e49db4cefa..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract A {
-	uint x = 1;
-}
-
-contract B is A {
-	constructor(int a) {
-		if (a > 0) {
-			x = 2;
-			return;
-		}
-		x = 3;
-	}
-}
-
-abstract contract C is B {
-}
-
-contract D is C {
-	constructor(int a) B(a) {
-		assert(a > 0 || x == 3); // should hold
-		assert(a <= 0 || x == 2); // should hold
-		assert(x == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (286-300): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
deleted file mode 100644
index 4a7794ac9b26..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
+++ /dev/null
@@ -1,71 +0,0 @@
-contract A {
-	int x;
-}
-
-contract B is A {
-	int y;
-	constructor (int a) {
-		if (a >= 0) {
-			y = 1;
-			return;
-		}
-		x = 1;
-		y = 2;
-	}
-}
-
-contract C is A {
-	int z;
-	constructor (int a) {
-		if (a >= 0) {
-			z = 1;
-			return;
-		}
-		x = -1;
-		z = 2;
-	}
-}
-
-contract D1 is B, C {
-	constructor() B(1) C(1) {
-		assert(x == 0); // should hold
-		assert(x == 1); // should fail
-		assert(x == -1); // should fail
-	}
-}
-
-contract D2 is B, C {
-	constructor() B(1) C(-1) {
-		assert(x == 0); // should fail
-		assert(x == 1); // should fail
-		assert(x == -1); // should hold (constructor of C is executed AFTER constructor of B)
-	}
-}
-
-contract D3 is B, C {
-	constructor() B(-1) C(1) {
-		assert(x == 0); // should fail
-		assert(x == 1); // should hold
-		assert(x == -1); // should fail
-	}
-}
-
-contract D4 is B, C {
-	constructor() B(-1) C(-1) {
-		assert(x == 0); // should fail
-		assert(x == 1); // should fail
-		assert(x == -1); // should hold (constructor of C is executed AFTER constructor of B)
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (337-351): BMC: Assertion violation happens here.
-// Warning 4661: (370-385): BMC: Assertion violation happens here.
-// Warning 4661: (460-474): BMC: Assertion violation happens here.
-// Warning 4661: (493-507): BMC: Assertion violation happens here.
-// Warning 4661: (670-684): BMC: Assertion violation happens here.
-// Warning 4661: (736-751): BMC: Assertion violation happens here.
-// Warning 4661: (827-841): BMC: Assertion violation happens here.
-// Warning 4661: (860-874): BMC: Assertion violation happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
deleted file mode 100644
index 3d06983fece4..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract B {
-	int x;
-	constructor(int b) {
-		if (b > 0) {
-			x = 1;
-			return;
-		}
-		else {
-			x = 2;
-			return;
-		}
-		x = 3; // dead code
-	}
-}
-
-contract C is B {
-	constructor(int a) B(a) {
-		assert(a > 0 || x == 2); // should hold
-		assert(a <= 0 || x == 1); // should hold
-		assert(x == 3); // should fail
-		assert(x == 2); // should fail
-		assert(x == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 5740: (119-124): Unreachable code.
-// Warning 4661: (277-291): BMC: Assertion violation happens here.
-// Warning 4661: (310-324): BMC: Assertion violation happens here.
-// Warning 4661: (343-357): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
deleted file mode 100644
index f496f3989886..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-
-	function test(uint256 a, uint256 b) public pure {
-		assert(nested_if(a,b) != 42); // should hold
-		assert(nested_if(a,b) == 1);  // should fail
-	}
-
-	function nested_if(uint256 a, uint256 b) internal pure returns (uint256) {
-		if (a < 5) {
-			if (b > 1) {
-				return 0;
-			}
-		}
-		if (a == 2 && b == 2) {
-			return 42; // unreachable
-		}
-		else {
-			return 1;
-		}
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (114-141): BMC: Assertion violation happens here.
-// Warning 6838: (299-315): BMC: Condition is always false.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
deleted file mode 100644
index 60abfb09cd2f..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-
-	function test() public pure {
-		assert(branches(0) == 0);
-		assert(branches(1) == 42);
-	}
-
-	function branches(uint256 a) internal pure returns (uint256) {
-		if (a == 0) {
-			return 0;
-		}
-		else {
-			return 42;
-		}
-		return 1; // dead code
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 5740: (232-240): Unreachable code.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol
deleted file mode 100644
index 3c9ff6097af7..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function test(uint256 a, uint256 b) public pure returns (uint256) {
-		if (a == 0) {
-			return 0;
-		}
-		return b / a; // This division is safe because of the early return in if-block.
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol
deleted file mode 100644
index 4860bd88584f..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-
-	function test(uint256 a) public pure {
-		assert(simple_if(a) == 1); // should fail for a == 0
-	}
-
-	function simple_if(uint256 a) internal pure returns (uint256) {
-		if (a == 0) {
-			return 0;
-		}
-		return 1;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (56-81): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
deleted file mode 100644
index a5f9f3a5c2af..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-
-	uint[] a;
-
-	constructor () {
-		a.push();
-		a.push();
-	}
-
-	function check() public {
-		require(a.length >= 2);
-		require(a[1] == 0);
-		conditional_store();
-		assert(a[1] == 1); // should fail;
-		assert(a[1] == 0); // should hold;
-	}
-
-	function conditional_store() internal {
-		if (a[1] == 0) {
-			return;
-		}
-		a[1] = 1;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (172-189): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
deleted file mode 100644
index db4abe9c74a4..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-
-	uint x;
-
-	function check() public {
-		require(x == 0);
-		conditional_increment();
-		assert(x == 1); // should fail;
-		assert(x == 0); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (x == 0) {
-			return;
-		}
-		x = 1;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (99-113): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
deleted file mode 100644
index 9f987ceaead3..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-	S s;
-
-	function check() public {
-		require(s.x == 0);
-		conditional_increment();
-		assert(s.x == 1); // should fail;
-		assert(s.x == 0); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (s.x == 0) {
-			return;
-		}
-		s.x = 1;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (123-139): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
deleted file mode 100644
index d001ed3d5b76..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-	S s;
-
-	function check() public {
-		require(s.x == 0);
-		conditional_increment();
-		assert(s.x == 1); // should fail;
-		assert(s.x == 0); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (s.x == 0) {
-			return;
-		}
-		s = S(1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (123-139): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
deleted file mode 100644
index 589931f68d67..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-
-	uint x;
-	uint y;
-
-	function check() public {
-		require(x == 0);
-		require(y == 0);
-		conditional_increment();
-		assert(x == 0); // should fail;
-		assert(x == 1); // should fail;
-		assert(x == 2); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (x == 0) {
-			(x,y) = (2,2);
-			return;
-		}
-		(x,y) = (1,1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (127-141): BMC: Assertion violation happens here.
-// Warning 4661: (161-175): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol
deleted file mode 100644
index 7c25f5b82ae4..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-
-    uint a;
-    uint b;
-    uint c;
-
-	function test() public view {
-		if (a == 0) {
-			if (b == 0) {
-				if (c == 0) {
-					return;
-				}
-			}
-		}
-		assert(a != 0 || b != 0 || c != 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol
deleted file mode 100644
index b0f383a14033..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(address _a) public {
-		uint b1 = address(this).balance;
-		_a.call("");
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should fail
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 9302: (83-94): Return value of low-level calls not used.
-// Warning 4661: (133-149): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol
deleted file mode 100644
index 3e58eea1107f..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint x;
-	function f(address _a) public {
-		x = 2;
-		_a.call("");
-		assert(x == 2); // should fail
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 9302: (66-77): Return value of low-level calls not used.
-// Warning 4661: (81-95): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/compound_bitwise_or_uint_3.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/compound_bitwise_or_uint_3.sol
deleted file mode 100644
index 02d538d7d64c..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/compound_bitwise_or_uint_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
-// ====
-// SMTEngine: bmc
-// SMTShowUnproved: no
-// ----
-// Warning 2788: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol
deleted file mode 100644
index 737443e64b91..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f(address payable a) public {
-		a.transfer(200);
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 1236: (55-70): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
deleted file mode 100644
index a3e974489ded..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x = initX();
-	uint y = initY();
-
-    function initX() internal pure returns (uint) {
-		return 42;
-	}
-
-	function initY() internal view returns (uint) {
-		assert(x == 42);
-		return x;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (172-187): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol
deleted file mode 100644
index 92dad6bd41a0..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function a(uint x, uint y) public pure returns (uint) {
-		return x + y;
-	}
-	function s(uint x, uint y) public pure returns (uint) {
-		return x - y;
-	}
-	function m(uint x, uint y) public pure returns (uint) {
-		return x * y;
-	}
-	function d(uint x, uint y) public pure returns (uint) {
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 2661: (79-84): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4144: (155-160): BMC: Underflow (resulting value less than 0) happens here.
-// Warning 2661: (231-236): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 3046: (307-312): BMC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol
deleted file mode 100644
index 6d027c58e7b6..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	uint z = 1;
-	uint w = z - 3;
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4144: (36-41): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
deleted file mode 100644
index bb89407a4cfc..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    uint x = msg.value;
-    constructor() {
-        assert(x == 0); // should hold
-    }
-}
-
-contract B {
-    constructor() payable {
-        assert(msg.value == 0); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (154-176): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
deleted file mode 100644
index a11373322507..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-contract C {
-	constructor() payable {
-		assert(tx.origin >= address(0));
-		assert(tx.origin <= address(2**160 - 1));
-		assert(tx.gasprice >= 0);
-		assert(tx.gasprice <= 2**256 - 1);
-		assert(msg.sender >= address(0));
-		assert(msg.sender <= address(2**160 - 1));
-		assert(msg.value >= 0);
-		assert(msg.value <= 2**256 - 1);
-
-		assert(block.coinbase >= address(0));
-		assert(block.coinbase <= address(2**160 - 1));
-		assert(block.timestamp >= 0);
-		assert(block.timestamp <= 2**256 - 1);
-		assert(block.chainid >= 0);
-		assert(block.chainid <= 2**256 - 1);
-		assert(block.difficulty >= 0);
-		assert(block.difficulty <= 2**256 - 1);
-		assert(block.prevrandao > 2**64);
-		assert(block.prevrandao <= 2**256 - 1);
-		assert(block.gaslimit >= 0);
-		assert(block.gaslimit <= 2**256 - 1);
-		assert(block.number >= 0);
-		assert(block.number <= 2**256 - 1);
-	}
-}
-
-contract D {
-	constructor() payable {
-		unchecked {
-			assert(tx.origin >= address(0));
-			assert(tx.origin <= address(2**160 - 1));
-			assert(tx.gasprice >= 0);
-			assert(tx.gasprice <= 2**256 - 1);
-			assert(msg.sender >= address(0));
-			assert(msg.sender <= address(2**160 - 1));
-			assert(msg.value >= 0);
-			assert(msg.value <= 2**256 - 1);
-
-			assert(block.coinbase >= address(0));
-			assert(block.coinbase <= address(2**160 - 1));
-			assert(block.timestamp >= 0);
-			assert(block.timestamp <= 2**256 - 1);
-			assert(block.chainid >= 0);
-			assert(block.chainid <= 2**256 - 1);
-			assert(block.difficulty >= 0);
-			assert(block.difficulty <= 2**256 - 1);
-			assert(block.prevrandao > 2**64);
-			assert(block.prevrandao <= 2**256 - 1);
-			assert(block.gaslimit >= 0);
-			assert(block.gaslimit <= 2**256 - 1);
-			assert(block.number >= 0);
-			assert(block.number <= 2**256 - 1);
-		}
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 8417: (565-581): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (598-614): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (1447-1463): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (1481-1497): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Info 6002: BMC: 44 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
deleted file mode 100644
index cfbdebfdd84d..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(address _a) public view {
-		uint b1 = address(this).balance;
-		_a.staticcall("");
-		uint b2 = address(this).balance;
-		assert(b1 == b2); // should hold
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 9302: (88-105): Return value of low-level calls not used.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
deleted file mode 100644
index ad50613c2747..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint x;
-	function f(address _a) public {
-		x = 2;
-		_a.staticcall("");
-		assert(x == 2); // should hold
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 9302: (66-83): Return value of low-level calls not used.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol
deleted file mode 100644
index 93064ff621ca..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        uint b = block.timestamp;
-        uint a = b + 0; // Overflow not possible!
-        return a;
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
deleted file mode 100644
index 279d22b4c7ca..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-
-	function g() public pure {}
-
-	function f() public view {
-		uint x = 0;
-		bool success = false;
-		try this.g() {
-			success = true;
-			x = 1;
-		} catch Error (string memory /*reason*/) {
-			x = 2;
-		} catch (bytes memory /*reason*/) {
-			x = 3;
-		}
-		assert(x > 0 && x < 4); // should hold
-		assert(x == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (306-320): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
deleted file mode 100644
index 75458fada26b..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-		int y;
-	}
-
-	function g() public pure returns (bool b, S memory s) {
-		b = true;
-		s.x = 42;
-		s.y = -1;
-	}
-
-	function f() public view {
-		bool success = false;
-		try this.g() returns (bool b, S memory s) {
-			success = true;
-			assert(b && s.x == 42 && s.y == -1); // should hold
-		} catch {
-		}
-		assert(success); // fails, not guaranteed that there will be no error
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (336-351): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol
deleted file mode 100644
index 085be46182e4..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	uint8 x;
-
-	function inc_pre() public {
-		++x;
-	}
-
-	function dec_pre() public {
-		--x;
-	}
-
-	/* Commented out because Spacer segfaults in Z3 4.8.9
-    function inc_post() public {
-		x++;
-	}
-
-	function dec_post() public {
-		x--;
-	}
-    */
-
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 2661: (55-58): BMC: Overflow (resulting value larger than 255) happens here.
-// Warning 4144: (95-98): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol
deleted file mode 100644
index 3fb817489a3c..000000000000
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(uint x) internal pure {
-		unchecked {
-			uint y = x - 1;
-			assert(y < x); // should fail, underflow can happen, we are inside unchecked block
-		}
-	}
-	function g(uint x) public pure {
-		unchecked { f(x); }
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (85-98): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol b/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol
deleted file mode 100644
index ac268409d8ac..000000000000
--- a/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @title MerkleProof
- * @dev Merkle proof verification based on
- * https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol
- */
-library MerkleProof {
-    /**
-     * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves
-     * and each pair of pre-images are sorted.
-     * @param proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree
-     * @param root Merkle root
-     * @param leaf Leaf of Merkle tree
-     */
-    function verify(bytes32[] memory proof, bytes32 root, bytes32 leaf) internal pure returns (bool) {
-        bytes32 computedHash = leaf;
-
-        for (uint256 i = 0; i < proof.length; i++) {
-            bytes32 proofElement = proof[i];
-
-            if (computedHash < proofElement) {
-                // Hash(current computed hash + current element of the proof)
-                computedHash = keccak256(abi.encodePacked(computedHash, proofElement));
-            } else {
-                // Hash(current element of the proof + current computed hash)
-                computedHash = keccak256(abi.encodePacked(proofElement, computedHash));
-            }
-        }
-
-        // Check if the computed hash (root) is equal to the provided root
-        return computedHash == root;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol b/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol
deleted file mode 100644
index 2415ac5eb4f1..000000000000
--- a/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-
-contract A {
-
-    address constant public MY_ADDRESS = 0xE0f5206BBD039e7b0592d8918820024e2a7437b9;
-    address public myFriendsAddress = 0xc0ffee254729296a45a3885639AC7E10F9d54979;
-
-    uint public used;
-    uint public test = 5;
-
-    uint constant X = 32**22 + 8;
-    string constant TEXT1 = "abc";
-    string text2 = "xyz";
-
-    function setUsed() public {
-        if (msg.sender == MY_ADDRESS) {
-            used = test;
-        }
-    }
-}
-
-
-contract B is A {
-
-    address public mySistersAddress = 0x999999cf1046e68e36E1aA2E0E07105eDDD1f08E;
-
-    fallback () external {
-        used = 0;
-    }
-
-    function setUsed(uint a) public {
-        if (msg.sender == MY_ADDRESS) {
-            used = a;
-        }
-    }
-}
-
-contract MyConc{
-
-    uint constant A = 1;
-    bytes32 should_be_constant = sha256('abc');
-    uint should_be_constant_2 = A + 1;
-    address not_constant = msg.sender;
-    uint not_constant_2 = getNumber();
-    uint not_constant_3 = 10 + block.number;
-
-    function getNumber() public returns(uint){
-        return block.number;
-    }
-
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2519: (740-759): This declaration shadows an existing declaration.
-// Warning 2018: (976-1053): Function state mutability can be restricted to view
-// Warning 4984: (952-969): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/complex/slither/data_dependency.sol b/test/libsolidity/smtCheckerTests/complex/slither/data_dependency.sol
deleted file mode 100644
index 87edde95caec..000000000000
--- a/test/libsolidity/smtCheckerTests/complex/slither/data_dependency.sol
+++ /dev/null
@@ -1,121 +0,0 @@
-contract Simple{
-
-    address destination;
-    address source;
-
-    function set(address source_taint) public{
-        destination = source_taint;
-    }
-
-    function set2() public{
-        destination = source;
-    }
-}
-
-contract Reference{
-
-    struct St{
-        uint val;
-    }
-
-    St destination;
-    St source;
-    St destination_indirect_1;
-    St destination_indirect_2;
-
-    function set(uint source_taint) public{
-        destination.val = source_taint;
-    }
-
-    function set2() public{
-        destination.val = source.val;
-    }
-
-    function set3(uint source_taint) public{
-        St storage ref = destination_indirect_1;
-        if(true){
-            ref = destination_indirect_2;
-        }
-        ref.val = source_taint;
-    }
-}
-
-contract SolidityVar{
-
-    address addr_1;
-    address addr_2;
-
-    constructor(){
-        addr_1 = msg.sender;
-    }
-
-}
-
-contract Intermediate{
-
-    uint destination;
-    uint source_intermediate;
-    uint source;
-
-    function f() public{
-        destination = source_intermediate;
-    }
-    function f2() public{
-        source_intermediate = source;
-    }
-
-}
-
-
-contract Base{
-
-    uint destination;
-    uint source_intermediate;
-    uint source;
-
-    function f() public{
-        destination = source_intermediate;
-    }
-}
-contract Derived is Base{
-
-    function f2() public{
-        source_intermediate = source;
-    }
-
-
-}
-
-
-contract PropagateThroughArguments {
-    uint var_tainted;
-    uint var_not_tainted;
-    uint var_dependant;
-
-    function f(uint user_input) public {
-        f2(user_input, 4);
-        var_dependant = var_tainted;
-    }
-
-    function f2(uint x, uint y) internal {
-        var_tainted = x;
-        var_not_tainted = y;
-    }
-}
-
-contract PropagateThroughReturnValue {
-  uint var_dependant;
-  uint var_state;
-
-  function foo() public {
-    var_dependant = bar();
-  }
-
-  function bar() internal returns (uint) {
-    return (var_state);
-  }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2018: (1847-1915): Function state mutability can be restricted to view
diff --git a/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol b/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
deleted file mode 100644
index 936ad1703784..000000000000
--- a/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
+++ /dev/null
@@ -1,88 +0,0 @@
-contract ContractWithFunctionCalled {
-    function funcCalled() external  {
-        uint256 i = 0;
-    }
-}
-
-contract ContractWithFunctionCalledSuper is ContractWithFunctionCalled {
-    function callWithSuper() public {
-        uint256 i = 0;
-    }
-}
-
-contract ContractWithFunctionNotCalled {
-
-    function funcNotCalled3() public {
-
-    }
-
-    function funcNotCalled2() public {
-
-    }
-
-    function funcNotCalled() public {
-
-    }
-
-    function my_func() internal returns(bool){
-        return true;
-    }
-
-}
-
-contract ContractWithFunctionNotCalled2 is ContractWithFunctionCalledSuper {
-    function funcNotCalled() public {
-        uint256 i = 0;
-        address three = address(new ContractWithFunctionNotCalled());
-        three.call(abi.encode(bytes4(keccak256("helloTwo()"))));
-        super.callWithSuper();
-        ContractWithFunctionCalled c = new ContractWithFunctionCalled();
-        c.funcCalled();
-    }
-}
-
-contract InternalCall {
-
-    function() returns(uint) ptr;
-
-    function set_test1() external{
-        ptr = test1;
-    }
-
-    function set_test2() external{
-        ptr = test2;
-    }
-
-    function test1() public returns(uint){
-        return 1;
-    }
-
-    function test2() public returns(uint){
-        return 2;
-    }
-
-    function test3() public returns(uint){
-        return 3;
-    }
-
-    function exec() external returns(uint){
-        return ptr();
-    }
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (727-782): Return value of low-level calls not used.
-// Warning 2072: (84-93): Unused local variable.
-// Warning 2072: (227-236): Unused local variable.
-// Warning 2072: (634-643): Unused local variable.
-// Warning 2018: (42-104): Function state mutability can be restricted to pure
-// Warning 2018: (185-247): Function state mutability can be restricted to pure
-// Warning 2018: (437-506): Function state mutability can be restricted to pure
-// Warning 2018: (1111-1173): Function state mutability can be restricted to pure
-// Warning 2018: (1179-1241): Function state mutability can be restricted to pure
-// Warning 2018: (1247-1309): Function state mutability can be restricted to pure
-// Warning 8729: (681-716): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 8729: (854-886): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 5729: (1370-1375): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/complex/warn_on_typecast.sol b/test/libsolidity/smtCheckerTests/complex/warn_on_typecast.sol
deleted file mode 100644
index 28b2a30d9937..000000000000
--- a/test/libsolidity/smtCheckerTests/complex/warn_on_typecast.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint) {
-        return uint8(1);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol b/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol
deleted file mode 100644
index 3f9e379a522e..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure { uint a = 2; assert(a == 2); }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol
deleted file mode 100644
index 229a93ddc2aa..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        if (x > 10) {
-            assert(x > 9);
-        }
-        else
-        {
-            assert(x < 11);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol
deleted file mode 100644
index 299da87e8744..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        if (x > 10) {
-            assert(x > 9);
-        }
-        else if (x > 2)
-        {
-            assert(x <= 10 && x > 2);
-        }
-        else
-        {
-           assert(0 <= x && x <= 2);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
deleted file mode 100644
index b70b2024a07e..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint x;
-    modifier m(uint z) {
-		uint y = 3;
-        if (z == 10)
-            x = 2 + y;
-        _;
-        if (z == 10)
-            x = 4 + y;
-    }
-    function f() m(10) internal {
-        x = 3;
-    }
-    function g() public {
-        x = 0;
-        f();
-        assert(x == 7);
-        // Fails
-        assert(x == 6);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (327-341): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
deleted file mode 100644
index 974c32506b51..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    uint x;
-    modifier m(uint z) {
-		uint y = 3;
-        if (z == 10)
-            x = 2 + y;
-        _;
-        if (z == 10)
-            x = 4 + y;
-    }
-    function f() m(10) m(12) internal {
-        x = 3;
-    }
-    function g() public {
-        x = 0;
-        f();
-        assert(x == 3);
-        // Fails
-        assert(x == 6);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (333-347): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
deleted file mode 100644
index 6889f36d6de8..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint x;
-    modifier m(uint z) {
-		uint y = 3;
-        if (z == 10)
-            x = 2 + y;
-        _;
-        if (z == 10)
-            x = 4 + y;
-    }
-    function f() m(8) internal {
-        x = 3;
-    }
-    function g() public {
-        x = 0;
-        f();
-        assert(x == 3);
-        // Fails
-        assert(x == 6);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (326-340): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
deleted file mode 100644
index 135f18b29016..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    uint x;
-    modifier m(uint z) {
-		uint y = 3;
-        if (z >= 10)
-            x = 2 + y;
-        _;
-        if (z >= 10)
-            x = 4 + y;
-    }
-    function f() m(10) m(12) internal {
-        x = 3;
-    }
-    function g() public {
-        x = 0;
-        f();
-        assert(x == 7);
-        // Fails
-        assert(x == 6);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (333-347): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol
deleted file mode 100644
index a76f41104460..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// Branch does not touch variable a
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol
deleted file mode 100644
index 36618ec5c286..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// Positive branch touches variable a, but assertion should still hold.
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-            a = 3;
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol
deleted file mode 100644
index deda2c85146a..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// Negative branch touches variable a, but assertion should still hold.
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-        } else {
-            a = 3;
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol
deleted file mode 100644
index 95589bfebaf9..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// Variable is not merged, if it is only read.
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-            assert(a == 3);
-        } else {
-            assert(a == 3);
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol
deleted file mode 100644
index 82665aec92a4..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// Variable is reset in both branches
-contract C {
-    function f(uint x) public pure {
-        uint a = 2;
-        if (x > 10) {
-            a = 3;
-        } else {
-            a = 3;
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol
deleted file mode 100644
index c388054ca700..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// Variable is reset in both branches
-contract C {
-    function f(uint x) public pure {
-        uint a = 2;
-        if (x > 10) {
-            a = 3;
-        } else {
-            a = 4;
-        }
-        assert(a >= 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
deleted file mode 100644
index 42315c89f5cc..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-
-	uint x;
-
-	modifier check() {
-		require(x == 0);
-		_;
-		assert(x == 1); // should fail;
-		assert(x == 0); // should hold;
-	}
-
-	modifier inc() {
-		if (x == 0) {
-			return;
-		}
-		x = x + 1;
-		_;
-	}
-
-	function test() check inc public {
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (70-84): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
deleted file mode 100644
index d297959c86b7..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract C {
-
-	uint x;
-
-	function reset_if_overflow() internal postinc {
-		if (x < 10)
-			return;
-		x = 0;
-	}
-
-	modifier postinc() {
-		if (x == 0) {
-			return;
-		}
-		_;
-		x = x + 1;
-	}
-
-	function test() public {
-		if (x == 0) {
-			reset_if_overflow();
-			assert(x == 1); // should fail;
-			assert(x == 0); // should hold;
-			return;
-		}
-		if (x < 10) {
-			uint oldx = x;
-			reset_if_overflow();
-			// Disabled because of nondeterminism in Spacer Z3 4.8.9
-			//assert(oldx + 1 == x); // should hold;
-			assert(oldx == x);     // should fail;
-			return;
-		}
-		reset_if_overflow();
-		assert(x == 1); // should hold;
-		assert(x == 0); // should fail;
-	}
-
-	function set(uint _x) public {
-		x = _x;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (255-269): CHC: Assertion violation happens here.
-// Warning 6328: (502-519): CHC: Assertion violation happens here.
-// Warning 6328: (615-629): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
deleted file mode 100644
index d33f9571b0c8..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract A {
-	int x;
-	constructor (int a) { x = a;}
-}
-
-contract B is A {
-	int y;
-	constructor(int a) A(-a) {
-		if (a > 0) {
-			y = 2;
-			return;
-		}
-		else {
-			y = 3;
-		}
-		y = 4; // overwrites the else branch
-	}
-}
-
-contract C is B {
-	constructor(int a) B(a) {
-		assert(y != 3); // should hold
-		assert(y == 4); // should fail
-		if (a > 0) {
-			assert(x < 0 && y == 2); // should hold
-			assert(x < 0 && y == 4); // should fail
-		}
-		else {
-			assert(x >= 0 && y == 4); // should hold
-			assert(x >= 0 && y == 2); // should fail
-			assert(x > 0); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (297-311): CHC: Assertion violation happens here.
-// Warning 6328: (389-412): CHC: Assertion violation happens here.
-// Warning 6328: (489-513): CHC: Assertion violation happens here.
-// Warning 6328: (533-546): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
deleted file mode 100644
index 22148e0b3237..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract A {
-	uint x = 1;
-}
-
-contract B is A {
-	constructor(int a) {
-		if (a > 0) {
-			x = 2;
-			return;
-		}
-		x = 3;
-	}
-}
-
-abstract contract C is B {
-}
-
-contract D is C {
-	constructor(int a) B(a) {
-		assert(a > 0 || x == 3); // should hold
-		assert(a <= 0 || x == 2); // should hold
-		assert(x == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (286-300): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
deleted file mode 100644
index 6890370334a4..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
+++ /dev/null
@@ -1,71 +0,0 @@
-contract A {
-	int x;
-}
-
-contract B is A {
-	int y;
-	constructor (int a) {
-		if (a >= 0) {
-			y = 1;
-			return;
-		}
-		x = 1;
-		y = 2;
-	}
-}
-
-contract C is A {
-	int z;
-	constructor (int a) {
-		if (a >= 0) {
-			z = 1;
-			return;
-		}
-		x = -1;
-		z = 2;
-	}
-}
-
-contract D1 is B, C {
-	constructor() B(1) C(1) {
-		assert(x == 0); // should hold
-		assert(x == 1); // should fail
-		assert(x == -1); // should fail
-	}
-}
-
-contract D2 is B, C {
-	constructor() B(1) C(-1) {
-		assert(x == 0); // should fail
-		assert(x == 1); // should fail
-		assert(x == -1); // should hold (constructor of C is executed AFTER constructor of B)
-	}
-}
-
-contract D3 is B, C {
-	constructor() B(-1) C(1) {
-		assert(x == 0); // should fail
-		assert(x == 1); // should hold
-		assert(x == -1); // should fail
-	}
-}
-
-contract D4 is B, C {
-	constructor() B(-1) C(-1) {
-		assert(x == 0); // should fail
-		assert(x == 1); // should fail
-		assert(x == -1); // should hold (constructor of C is executed AFTER constructor of B)
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (337-351): CHC: Assertion violation happens here.
-// Warning 6328: (370-385): CHC: Assertion violation happens here.
-// Warning 6328: (460-474): CHC: Assertion violation happens here.
-// Warning 6328: (493-507): CHC: Assertion violation happens here.
-// Warning 6328: (670-684): CHC: Assertion violation happens here.
-// Warning 6328: (736-751): CHC: Assertion violation happens here.
-// Warning 6328: (827-841): CHC: Assertion violation happens here.
-// Warning 6328: (860-874): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
deleted file mode 100644
index def9bea42f66..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract B {
-	int x;
-	constructor(int b) {
-		if (b > 0) {
-			x = 1;
-			return;
-		}
-		else {
-			x = 2;
-			return;
-		}
-		x = 3; // dead code
-	}
-}
-
-contract C is B {
-	constructor(int a) B(a) {
-		assert(a > 0 || x == 2); // should hold
-		assert(a <= 0 || x == 1); // should hold
-		assert(x == 3); // should fail
-		assert(x == 2); // should fail
-		assert(x == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5740: (119-124): Unreachable code.
-// Warning 6328: (277-291): CHC: Assertion violation happens here.
-// Warning 6328: (310-324): CHC: Assertion violation happens here.
-// Warning 6328: (343-357): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
deleted file mode 100644
index ecccf8885ad7..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-
-	function test(uint256 a, uint256 b) public pure {
-		assert(nested_if(a,b) != 42); // should hold
-		assert(nested_if(a,b) == 1);  // should fail
-	}
-
-	function nested_if(uint256 a, uint256 b) internal pure returns (uint256) {
-		if (a < 5) {
-			if (b > 1) {
-				return 0;
-			}
-		}
-		if (a == 2 && b == 2) {
-			return 42; // unreachable
-		}
-		else {
-			return 1;
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (114-141): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (299-315): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
deleted file mode 100644
index f5294a6b6733..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-
-	function test() public pure {
-		assert(branches(0) == 0);
-		assert(branches(1) == 42);
-	}
-
-	function branches(uint256 a) internal pure returns (uint256) {
-		if (a == 0) {
-			return 0;
-		}
-		else {
-			return 42;
-		}
-		return 1; // dead code
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5740: (232-240): Unreachable code.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol
deleted file mode 100644
index 627ffa27f940..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function test(uint256 a, uint256 b) public pure returns (uint256) {
-		if (a == 0) {
-			return 0;
-		}
-		return b / a; // This division is safe because of the early return in if-block.
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol
deleted file mode 100644
index ea44595972d8..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-
-	function test(uint256 a) public pure {
-		assert(simple_if(a) == 1); // should fail for a == 0
-	}
-
-	function simple_if(uint256 a) internal pure returns (uint256) {
-		if (a == 0) {
-			return 0;
-		}
-		return 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (56-81): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.test(0)\n    C.simple_if(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
deleted file mode 100644
index 2b41f3abe26c..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-
-	uint[] a;
-
-	constructor () {
-		a.push();
-		a.push();
-	}
-
-	function check() public {
-		require(a.length >= 2);
-		require(a[1] == 0);
-		conditional_store();
-		assert(a[1] == 1); // should fail;
-		assert(a[1] == 0); // should hold;
-	}
-
-	function conditional_store() internal {
-		if (a[1] == 0) {
-			return;
-		}
-		a[1] = 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (172-189): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
deleted file mode 100644
index 4df0b8ce3133..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-
-	uint x;
-
-	function check() public {
-		require(x == 0);
-		conditional_increment();
-		assert(x == 1); // should fail;
-		assert(x == 0); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (x == 0) {
-			return;
-		}
-		x = 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
deleted file mode 100644
index 02d1689373e0..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-	S s;
-
-	function check() public {
-		require(s.x == 0);
-		conditional_increment();
-		assert(s.x == 1); // should fail;
-		assert(s.x == 0); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (s.x == 0) {
-			return;
-		}
-		s.x = 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (123-139): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
deleted file mode 100644
index 87fbcc18a49f..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-	S s;
-
-	function check() public {
-		require(s.x == 0);
-		conditional_increment();
-		assert(s.x == 1); // should fail;
-		assert(s.x == 0); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (s.x == 0) {
-			return;
-		}
-		s = S(1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (123-139): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
deleted file mode 100644
index f3fce1f0d437..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-
-	uint x;
-	uint y;
-
-	function check() public {
-		require(x == 0);
-		require(y == 0);
-		conditional_increment();
-		assert(x == 0); // should fail;
-		assert(x == 1); // should fail;
-		assert(x == 2); // should hold;
-	}
-
-	function conditional_increment() internal {
-		if (x == 0) {
-			(x,y) = (2,2);
-			return;
-		}
-		(x,y) = (1,1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.
-// Warning 6328: (161-175): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
deleted file mode 100644
index c6d6450f399f..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-
-    uint a;
-    uint b;
-    uint c;
-
-	function test() public view {
-		if (a == 0) {
-			if (b == 0) {
-				if (c == 0) {
-					return;
-				}
-			}
-		}
-		assert(a != 0 || b != 0 || c != 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol
deleted file mode 100644
index fd76ceab4f78..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		if (true) {
-			address a = g();
-			assert(a == address(0));
-		}
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol
deleted file mode 100644
index 8d8cdae53cb4..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f() public pure {
-		if (true) {
-			address a = g();
-			assert(a == address(0));
-		}
-		else
-		{
-			address b = g();
-			assert(b == address(0));
-		}
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol
deleted file mode 100644
index 462ff871c234..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f() public pure {
-		if (true) {
-			address a = g();
-			assert(a == address(0));
-		}
-		if (true) {
-			address a = g();
-			assert(a == address(0));
-		}
-
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol
deleted file mode 100644
index dbe7fc079cb9..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C
-{
-	function f() public pure {
-		if (true) {
-			address a = g();
-			assert(a == address(0));
-		}
-		if (true) {
-			address a = h();
-			assert(a == address(0));
-		}
-
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-	function h() public pure returns (address) {
-		address a;
-		return a;
-	}
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol
deleted file mode 100644
index b99811b8e76b..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() public pure {
-		if (true) {
-		} else {
-			address a = g();
-			assert(a == address(0));
-		}
-	}
-	function g() public pure returns (address) {
-		address x;
-		x = address(0);
-		return x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol
deleted file mode 100644
index 52f110108c74..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	modifier m(address a) {
-		if (true) {
-			a = g();
-			_;
-			assert(a == address(0));
-		}
-	}
-
-	function f(address a) m(a) public pure {
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol
deleted file mode 100644
index ce53546295c8..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	modifier m {
-		if (true)
-			_;
-	}
-
-	function f(address a) m public pure {
-		if (true) {
-			a = g();
-			assert(a == address(0));
-		}
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/require.sol b/test/libsolidity/smtCheckerTests/control_flow/require.sol
deleted file mode 100644
index 31b243a3afab..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/require.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-	function f() pure public {
-		require(false);
-		// This is not reachable.
-		assert(false);
-	}
-
-	function g() pure public {
-		require(false, "require message");
-		// This is not reachable.
-		assert(false);
-	}
-
-	function h(bool b) pure public {
-		if (b)
-			require(false);
-		assert(!b);
-	}
-
-	// Check that arguments are evaluated.
-	bool x = false;
-	function m() view internal returns (string memory) {
-		assert(x != true);
-	}
-	function i() public {
-		x = true;
-		require(false, m());
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (396-409): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (415-432): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_1.sol b/test/libsolidity/smtCheckerTests/control_flow/return_1.sol
deleted file mode 100644
index 2d532f7755e8..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/return_1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function add(uint x, uint y) internal pure returns (uint) {
-		if (y == 0)
-			return x;
-		if (y == 1)
-			return ++x;
-		if (y == 2)
-			return x + 2;
-		return x + y;
-	}
-
-	function f() public pure {
-		assert(add(100, 0) == 100);
-		assert(add(100, 1) == 101);
-		assert(add(100, 2) == 102);
-		assert(add(100, 100) == 200);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
deleted file mode 100644
index 375e726091d6..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	function add(uint x, uint y) internal pure returns (uint) {
-		if (y == 0)
-			return x;
-		if (y == 1)
-			return ++x;
-		if (y == 2)
-			return x + 2;
-		return x + y;
-	}
-
-	function f() public pure {
-		assert(add(100, 0) != 100);
-		assert(add(100, 1) != 101);
-		assert(add(100, 2) != 102);
-		assert(add(100, 100) != 200);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (211-237): CHC: Assertion violation happens here.
-// Warning 6328: (241-267): CHC: Assertion violation happens here.
-// Warning 6328: (271-297): CHC: Assertion violation happens here.
-// Warning 6328: (301-329): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_2.sol b/test/libsolidity/smtCheckerTests/control_flow/return_2.sol
deleted file mode 100644
index 92f030e82562..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/return_2.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	uint c;
-	function add(uint x, uint y) internal returns (uint) {
-		c = 0xff;
-		if (y == 0)
-			return x;
-		c = 0xffff;
-		if (y == 1)
-			return ++x;
-		c = 0xffffff;
-		if (y == 2)
-			return x + 2;
-		c = 0xffffffff;
-		return x + y;
-	}
-
-	function f() public {
-		assert(add(100, 0) == 100);
-		assert(c == 0xff);
-		assert(add(100, 1) == 101);
-		assert(c == 0xffff);
-		assert(add(100, 2) == 102);
-		assert(c == 0xffffff);
-		assert(add(100, 100) == 200);
-		assert(c == 0xffffffff);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
deleted file mode 100644
index 0596647de19e..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-	uint c;
-	function add(uint x, uint y) internal returns (uint) {
-		c = 0xff;
-		if (y == 0)
-			return x;
-		c = 0xffff;
-		if (y == 1)
-			return ++x;
-		c = 0xffffff;
-		if (y == 2)
-			return x + 2;
-		c = 0xffffffff;
-		return x + y;
-	}
-
-	function f() public {
-		assert(add(100, 0) != 100);
-		assert(c != 0xff);
-		assert(add(100, 1) != 101);
-		assert(c != 0xffff);
-		assert(add(100, 2) != 102);
-		assert(c != 0xffffff);
-		assert(add(100, 100) != 200);
-		assert(c != 0xffffffff);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (270-296): CHC: Assertion violation happens here.
-// Warning 6328: (300-317): CHC: Assertion violation happens here.
-// Warning 6328: (321-347): CHC: Assertion violation happens here.
-// Warning 6328: (351-370): CHC: Assertion violation happens here.
-// Warning 6328: (374-400): CHC: Assertion violation happens here.
-// Warning 6328: (404-425): CHC: Assertion violation happens here.
-// Warning 6328: (429-457): CHC: Assertion violation happens here.
-// Warning 6328: (461-484): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/revert.sol b/test/libsolidity/smtCheckerTests/control_flow/revert.sol
deleted file mode 100644
index a19e745aa72f..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/revert.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-	function f() pure public {
-		revert();
-		// This is not reachable.
-		assert(false);
-	}
-
-	function g() pure public {
-		revert("revert message");
-		// This is not reachable.
-		assert(false);
-	}
-
-	function h(bool b) pure public {
-		if (b)
-			revert();
-		assert(!b);
-	}
-
-	// Check that arguments are evaluated.
-	bool x = false;
-	function m() view internal returns (string memory) {
-		assert(x != true);
-	}
-	function i() public {
-		x = true;
-		revert(m());
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5740: (83-96): Unreachable code.
-// Warning 5740: (188-201): Unreachable code.
-// Warning 6321: (375-388): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (394-411): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol b/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
deleted file mode 100644
index 848f1edbf4a2..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f(bool b, uint a) pure public {
-		require(a <= 256);
-		if (b)
-			revert();
-		uint c = a + 1;
-		if (b)
-			c--;
-		else
-			c++;
-		assert(c == a);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (150-164): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (122-123): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol
deleted file mode 100644
index 118e66ce7692..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() == 0) && (f() == 0);
-		assert(x == 1);
-		assert(!b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
deleted file mode 100644
index a38ffdf8a957..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() == 0) && (f() == 0);
-		assert(x == 1);
-		assert(b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (194-203): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = false\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
deleted file mode 100644
index 0f4736f3ab3c..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		bool b;
-			x = 100;
-			b = f() > 0;
-			assert(x == 102);
-			// Should fail.
-			assert(!b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (169-185): CHC: Assertion violation happens here.
-// Warning 6328: (209-219): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol
deleted file mode 100644
index 0b79769d5c0b..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() > 0) && (f() > 0);
-		assert(x == 2);
-		assert(b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
deleted file mode 100644
index a5337675eb55..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() > 0) && (f() > 0);
-		assert(x == 2);
-		assert(!b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol
deleted file mode 100644
index 9ded6413186e..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	bool b;
-	function f() public {
-		if ((b = false) && (b == true)) {}
-		if ((b == false) && (b = true)) {}
-		if ((b = false) && (b = true)) {}
-		if ((b == false) && (b == true)) {}
-		if ((b = true) && b) {}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (51-77): BMC: Condition is always false.
-// Warning 6838: (88-114): BMC: Condition is always true.
-// Warning 6838: (125-150): BMC: Condition is always false.
-// Warning 6838: (161-188): BMC: Condition is always false.
-// Warning 6838: (199-214): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol
deleted file mode 100644
index 548ac477549c..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	bool b;
-	function g(bool _b) internal returns (bool) {
-		b = _b;
-		return b;
-	}
-	function f() public {
-		if (g(false) && (b == true)) {}
-		if ((b == false) && g(true)) {}
-		if (g(false) && g(true)) {}
-		if (g(false) && (b == true)) {}
-		if (g(true) && b) {}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (123-146): BMC: Condition is always false.
-// Warning 6838: (157-180): BMC: Condition is always true.
-// Warning 6838: (191-210): BMC: Condition is always false.
-// Warning 6838: (221-244): BMC: Condition is always false.
-// Warning 6838: (255-267): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol
deleted file mode 100644
index 437a7890dd7e..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() > 0) || (f() > 0);
-		assert(x == 1);
-		assert(b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
deleted file mode 100644
index c60dcc11319c..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() > 0) || (f() > 0);
-		assert(x == 1);
-		assert(!b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
deleted file mode 100644
index 8d23f1e4e056..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g(bool a) public returns (bool) {
-		bool b;
-		if (a) {
-			x = 0;
-			b = (f() > 0) || (f() > 0);
-			assert(x == 1);
-			assert(b);
-		} else {
-			x = 100;
-			b = (f() == 0) || (f() > 0);
-			assert(x == 102);
-			// Should fail.
-			assert(!b);
-		}
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (327-337): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol
deleted file mode 100644
index 237a90004546..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() > 1) || (f() > 1);
-		assert(x == 2);
-		assert(b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
deleted file mode 100644
index e528cf49dfec..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-	function g() public returns (bool) {
-		x = 0;
-		bool b = (f() > 1) || (f() > 1);
-		assert(x == 2);
-		assert(!b);
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol
deleted file mode 100644
index 50c6aeabbafd..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	bool b;
-	function f() public {
-		if ((b = true) || (b == false)) {}
-		if ((b == true) || (b = false)) {}
-		if ((b = true) || (b = false)) {}
-		if ((b == true) || (b == false)) {}
-		if ((b = false) || b) {}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (51-77): BMC: Condition is always true.
-// Warning 6838: (88-114): BMC: Condition is always true.
-// Warning 6838: (125-150): BMC: Condition is always true.
-// Warning 6838: (161-188): BMC: Condition is always true.
-// Warning 6838: (199-215): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol
deleted file mode 100644
index b541b284dd61..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	bool b;
-	function g(bool _b) internal returns (bool) {
-		b = _b;
-		return b;
-	}
-	function f() public {
-		if (g(true) || (b == false)) {}
-		if ((b == true) || g(false)) {}
-		if (g(true) || g(false)) {}
-		if (g(true) || (b == false)) {}
-		if (g(false) || b) {}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (123-146): BMC: Condition is always true.
-// Warning 6838: (157-180): BMC: Condition is always true.
-// Warning 6838: (191-210): BMC: Condition is always true.
-// Warning 6838: (221-244): BMC: Condition is always true.
-// Warning 6838: (255-268): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol
deleted file mode 100644
index 9bea0383ad1d..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public pure {
-        uint x;
-        if (++x < 3) {}
-
-        assert(x == 1); // should hold
-        assert(x != 1); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 6838: (72-79): BMC: Condition is always true.
-// Warning 4661: (132-146): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol
deleted file mode 100644
index 1780a7e20b16..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint x;
-
-    function inc() internal returns (uint) {
-        // BMC inlines function calls and also looks at functions in isolation,
-        // therefore it says once that this is safe, when called by `f`,
-        // but also that it is unsafe just looking at this function (false positive).
-        ++x;
-        return x;
-    }
-
-    function f() public {
-        require(x < 1000);
-        uint y = x;
-        if (inc() < 3) {}
-
-        assert(x == y + 1); // should hold
-        assert(x != y + 1); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (499-517): BMC: Assertion violation happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol
deleted file mode 100644
index 2e415a7b08cb..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    uint x;
-
-    function inc() internal returns (uint) {
-        // BMC inlines function calls and also looks at functions in isolation,
-        // therefore it says once that this is safe, when called by `f`,
-        // but also that it is unsafe just looking at this function (false positive).
-        ++x;
-        return x;
-    }
-
-    function inc2() internal returns (uint) {
-        return inc();
-    }
-
-    function f() public {
-        require(x < 1000);
-        uint y = x;
-        if (inc2() < 3) {}
-
-        assert(x == y + 1); // should hold
-        assert(x != y + 1); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (575-593): BMC: Assertion violation happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol
deleted file mode 100644
index 6e624184e11e..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public pure {
-        uint x = 2;
-        if (--x < 3) {}
-
-        assert(x == 1); // should hold
-        assert(x != 1); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 6838: (76-83): BMC: Condition is always true.
-// Warning 4661: (136-150): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol
deleted file mode 100644
index 9801b99b5667..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public pure {
-        uint x;
-        uint y = (++x < 3) ? ++x : --x;
-
-        assert(y == x); // should hold;
-        assert(x == 2); // should hold
-        assert(x != 2); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 6838: (77-86): BMC: Condition is always true.
-// Warning 4661: (188-202): BMC: Assertion violation happens here.
-// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol
deleted file mode 100644
index 54d72960b942..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    uint x;
-
-    function inc() internal returns (uint) {
-        // BMC inlines function calls and also looks at functions in isolation,
-        // therefore it says once that this is safe, when called by `f`,
-        // but also that it is unsafe just looking at this function (false positive).
-        ++x;
-        return x;
-    }
-
-    function f() public {
-        require(x < 1000);
-        uint z = x;
-        uint y = (inc() < 3) ? inc() : inc();
-
-        assert(y == x);
-        assert(x == z + 2); // should hold
-        assert(x != z + 2); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (543-561): BMC: Assertion violation happens here.
-// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol
deleted file mode 100644
index 18e36c8fd22f..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    uint x;
-
-    function inc() internal returns (uint) {
-        // BMC inlines function calls and also looks at functions in isolation,
-        // therefore it says once that this is safe, when called by `f`,
-        // but also that it is unsafe just looking at this function (false positive).
-        ++x;
-        return x;
-    }
-
-    function inc2() internal returns (uint) {
-        return inc();
-    }
-
-    function f() public {
-        require(x < 1000);
-        uint z = x;
-        uint y = (inc2() < 3) ? inc2() : inc2();
-
-        assert(y == x); // should hold
-        assert(x == z + 2); // should hold
-        assert(x != z + 2); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (636-654): BMC: Assertion violation happens here.
-// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol
deleted file mode 100644
index e24cdf297d63..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public pure {
-        uint x = 2;
-        uint y = (--x < 3) ? --x : 0;
-
-        assert(y == x); // should hold
-        assert(x == 0); // should hold
-        assert(x != 0); // should fail
-    }
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 6838: (81-90): BMC: Condition is always true.
-// Warning 4661: (189-203): BMC: Assertion violation happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol b/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol
deleted file mode 100644
index 72f52d6d4100..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function g() public returns (uint) {
-		try this.g() returns (uint x) { x; }
-		catch Error(string memory s) { s; }
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// SMTEngine: all
-// ----
-// Warning 6321: (43-47): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/try_catch_2.sol b/test/libsolidity/smtCheckerTests/control_flow/try_catch_2.sol
deleted file mode 100644
index 274c8c48fb1d..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/try_catch_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f() public {
-		try this.f() {}
-		catch (bytes memory x) {
-			x;
-		}
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_1.sol b/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_1.sol
deleted file mode 100644
index 61f795c25ef6..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Context {}
-
-contract ERC20 is Context {
-    function approve() public virtual { _approve(); }
-    function _approve() internal virtual {}
-}
-
-contract __unstable__ERC20Owned is ERC20 {
-    function _approve() internal override {
-        if (true) {
-            super._approve();
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol b/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol
deleted file mode 100644
index 219980be6a90..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract A {
-    function f() internal virtual {
-        v();
-    }
-    function v() internal virtual {
-    }
-}
-
-contract B is A {
-    function f() internal virtual override {
-        super.f();
-    }
-}
-
-contract C is B {
-    function v() internal override {
-        if (0==1)
-            f();
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (271-275): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
deleted file mode 100644
index ce0ce630b147..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-            a++;
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
deleted file mode 100644
index 4ceff5f3fcad..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-            ++a;
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol
deleted file mode 100644
index 93d926769114..000000000000
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        uint a = 3;
-        if (x > 10) {
-            a = 5;
-        }
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (129-143): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 5\n\nTransaction trace:\nC.constructor()\nC.f(11)
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
deleted file mode 100644
index a49aeac09080..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f(bytes memory data) public pure {
-		bytes32 k = keccak256(data);
-		bytes32 s = sha256(data);
-		bytes32 r = ripemd160(data);
-		assert(k == s);
-		assert(s == r);
-		assert(r == k);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (150-164): CHC: Assertion violation happens here.
-// Warning 6328: (168-182): CHC: Assertion violation happens here.
-// Warning 6328: (186-200): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
deleted file mode 100644
index 8485b89a6bd8..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-	function k(bytes memory b0, bytes memory b1) public pure {
-		bytes32 k0 = keccak256(b0);
-		bytes32 k1 = keccak256(b1);
-		assert(k0 == k1);
-	}
-	function s(bytes memory b0, bytes memory b1) public pure {
-		bytes32 s0 = sha256(b0);
-		bytes32 s1 = sha256(b1);
-		// Disabled because of Spacer nondeterminism.
-		//assert(s0 == s1);
-	}
-	function r(bytes memory b0, bytes memory b1) public pure {
-		bytes32 r0 = ripemd160(b0);
-		bytes32 r1 = ripemd160(b1);
-		// Disabled because of Spacer nondeterminism.
-		//assert(r0 == r1);
-	}
-	function e(bytes32 h0, uint8 v0, bytes32 r0, bytes32 s0, bytes32 h1, uint8 v1, bytes32 r1, bytes32 s1) public pure {
-		address a0 = ecrecover(h0, v0, r0, s0);
-		address a1 = ecrecover(h1, v1, r1, s1);
-		// Disabled because of Spacer nondeterminism.
-		//assert(a0 == a1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (218-228): Unused local variable.
-// Warning 2072: (245-255): Unused local variable.
-// Warning 2072: (405-415): Unused local variable.
-// Warning 2072: (435-445): Unused local variable.
-// Warning 2072: (656-666): Unused local variable.
-// Warning 2072: (698-708): Unused local variable.
-// Warning 6328: (135-151): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
deleted file mode 100644
index a8c6199d0f24..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(bytes memory data) public pure {
-		bytes32 k = keccak256(data);
-		fi(data, k);
-	}
-	function fi(bytes memory data, bytes32 k) internal pure {
-		bytes32 h = sha256(data);
-		assert(h == k);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (196-210): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol
deleted file mode 100644
index 99d6f7c78152..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bytes memory data) public pure {
-		bytes32 k = keccak256(data);
-		fi(data, k);
-	}
-	function fi(bytes memory data, bytes32 k) internal pure {
-		bytes32 h = keccak256(data);
-		assert(h == k);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
deleted file mode 100644
index a39cfc88f0f3..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-	bytes data;
-	bytes32 h;
-	uint8 v;
-	bytes32 r;
-	bytes32 s;
-
-	bytes32 kec;
-	bytes32 sha;
-	bytes32 rip;
-	address erc;
-
-	constructor(bytes memory _data, bytes32 _h, uint8 _v, bytes32 _r, bytes32 _s) {
-		data = _data;
-		h = _h;
-		v = _v;
-		r = _r;
-		s = _s;
-
-		kec = keccak256(data);
-		sha = sha256(data);
-		rip = ripemd160(data);
-		erc = ecrecover(h, v, r, s);
-	}
-
-	function f() public view {
-		bytes32 _kec = keccak256(data);
-		bytes32 _sha = sha256(data);
-		bytes32 _rip = ripemd160(data);
-		address _erc = ecrecover(h, v, r, s);
-		assert(_kec == kec);
-		assert(_sha == sha);
-		assert(_rip == rip);
-		assert(_erc == erc);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
deleted file mode 100644
index c088b121b147..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-contract C {
-	bytes data;
-	bytes32 h;
-	uint8 v;
-	bytes32 r;
-	bytes32 s;
-
-	bytes32 kec;
-	bytes32 sha;
-	bytes32 rip;
-	address erc;
-
-	constructor(bytes memory _data, bytes32 _h, uint8 _v, bytes32 _r, bytes32 _s) {
-		data = _data;
-		h = _h;
-		v = _v;
-		r = _r;
-		s = _s;
-
-		kec = keccak256(data);
-		sha = sha256(data);
-		rip = ripemd160(data);
-		erc = ecrecover(h, v, r, s);
-	}
-
-	function set(bytes memory _data, bytes32 _h, uint8 _v, bytes32 _r, bytes32 _s) public {
-		data = _data;
-		h = _h;
-		v = _v;
-		r = _r;
-		s = _s;
-	}
-
-	function f() public view {
-		bytes32 _kec = keccak256(data);
-		bytes32 _sha = sha256(data);
-		bytes32 _rip = ripemd160(data);
-		address _erc = ecrecover(h, v, r, s);
-		assert(_kec == kec);
-		assert(_sha == sha);
-		assert(_rip == rip);
-		assert(_erc == erc);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (693-712): CHC: Assertion violation happens here.\nCounterexample:\nh = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\n_kec = 0x52f6\n_sha = 0x2e15\n_rip = 0x2297\n_erc = 0x0985\n\nTransaction trace:\nC.constructor(_data, 0x23c6, 198, 0x1599, 0x1980)\nState: h = 0x23c6, v = 198, r = 0x1599, s = 0x1980, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\nC.set(_data, 0x0, 0, 0x0, 0x0)\nState: h = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\nC.f()
-// Warning 6328: (716-735): CHC: Assertion violation happens here.\nCounterexample:\nh = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\n_kec = 0x0985\n_sha = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdd68\n_rip = 0x20ad\n_erc = 0x2e15\n\nTransaction trace:\nC.constructor([0x19, 0x19, 0x19, 0x19, 0x19, 0x38, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x2b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x36, 0x19, 0x19, 0x39, 0x19, 0x3b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19], 0x1169, 88, 0x0a12, 0x1599)\nState: data = [0x19, 0x19, 0x19, 0x19, 0x19, 0x38, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x2b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x36, 0x19, 0x19, 0x39, 0x19, 0x3b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19], h = 0x1169, v = 88, r = 0x0a12, s = 0x1599, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\nC.set(_data, 0x0, 0, 0x0, 0x0)\nState: h = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\nC.f()
-// Warning 6328: (739-758): CHC: Assertion violation happens here.
-// Warning 6328: (762-781): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol
deleted file mode 100644
index a6abfdec92c1..000000000000
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	function k(bytes memory b0) public pure {
-		bytes memory b1 = b0;
-		bytes32 k0 = keccak256(b0);
-		bytes32 k1 = keccak256(b1);
-		assert(k0 == k1);
-	}
-	function s(bytes memory b0) public pure {
-		bytes memory b1 = b0;
-		bytes32 s0 = sha256(b0);
-		bytes32 s1 = sha256(b1);
-		assert(s0 == s1);
-	}
-	function r(bytes memory b0) public pure {
-		bytes memory b1 = b0;
-		bytes32 r0 = ripemd160(b0);
-		bytes32 r1 = ripemd160(b1);
-		assert(r0 == r1);
-	}
-	function e(bytes32 h0, uint8 v0, bytes32 r0, bytes32 s0) public pure {
-		(bytes32 h1, uint8 v1, bytes32 r1, bytes32 s1) = (h0, v0, r0, s0);
-		address a0 = ecrecover(h0, v0, r0, s0);
-		address a1 = ecrecover(h1, v1, r1, s1);
-		assert(a0 == a1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol
deleted file mode 100644
index 81ddc515e1b4..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract D {
-	uint x;
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	function g() public {
-		D d = new D();
-		uint y = d.f();
-		assert(y == 0); // should fail in BMC
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTExtCalls: trusted
-// ----
-// Warning 8729: (124-131): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 4661: (153-167): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol
deleted file mode 100644
index f69a8d6c72eb..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {
-	uint x;
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	function g() public {
-		D d = new D();
-		uint y = d.f();
-		assert(y == 0); // should fail in ext calls untrusted mode
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 8729: (124-131): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 4661: (153-167): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
deleted file mode 100644
index 00d0f5d6a1d4..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {
-	uint x;
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	function g() public {
-		D d = new D();
-		uint y = d.f();
-		assert(y == 0); // should hold in ext calls trusted mode
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
deleted file mode 100644
index 01c68790c843..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract D {
-	uint x;
-}
-
-contract C {
-	function f() public {
-		D d1 = new D();
-		D d2 = new D();
-
-		assert(d1 != d2); // should hold in ext calls trusted mode
-		assert(address(this) != address(d1)); // should hold in ext calls trusted mode
-		assert(address(this) != address(d2)); // should hold in ext calls trusted mode
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
deleted file mode 100644
index eb0a0c0498ae..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract D {
-	uint x;
-	function inc() public { ++x; }
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	function f() public {
-		D d = new D();
-		assert(d.f() == 0); // should hold
-		d.inc();
-		assert(d.f() == 1); // should hold
-		d = new D();
-		assert(d.f() == 0); // should hold
-		assert(d.f() == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// SMTIgnoreOS: macos
-// ----
-// Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (215-233): CHC: Assertion violation might happen here.
-// Warning 6328: (304-322): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (215-233): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
deleted file mode 100644
index f31f9a3e1469..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {
-	uint x;
-}
-
-contract C {
-	uint y;
-	function g() public {
-		D d = new D();
-		assert(y == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Warning 2072: (72-75): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
deleted file mode 100644
index b2712306c9d3..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract D {
-	uint x;
-	function inc() public { ++x; }
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	D d;
-	constructor() {
-		d = new D();
-		assert(d.f() == 0); // should hold
-	}
-	function g() public view {
-		assert(d.f() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// SMTIgnoreOS: macos
-// ----
-// Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (233-251): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
deleted file mode 100644
index 0f904454312e..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract D {
-	uint x;
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	D d;
-	constructor() {
-		d = new D();
-		assert(d.f() == 0); // should hold
-	}
-	function g() public view {
-		assert(d.f() == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol
deleted file mode 100644
index 260909b87a25..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract D {
-	uint x;
-	function s(uint _x) public { x = _x; }
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	D d;
-	constructor() {
-		d = new D();
-	}
-	function g() public view {
-		assert(d.f() == 0); // should fail
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (204-222): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol
deleted file mode 100644
index 5bd27c3b822d..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract D {
-	bool b;
-	function s() public { b = true; }
-	function f() public view returns (bool) { return b; }
-}
-
-contract C {
-	D d;
-	constructor() {
-		d = new D();
-	}
-	function g() public view {
-		assert(d.f()); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (199-212): CHC: Assertion violation happens here.\nCounterexample:\nd = (- 1)\n\nTransaction trace:\nC.constructor()\nState: d = (- 1)\nC.g()\n    D.f() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol
deleted file mode 100644
index a28d4621054f..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {
-	uint x;
-	function f() public view returns (uint) { return x; }
-}
-
-contract C {
-	function g() public {
-		D d = new D();
-		uint y = d.f();
-		assert(y == 0); // should fail in ext calls untrusted mode
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8729: (124-131): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 6328: (153-167): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\ny = 1\n\nTransaction trace:\nC.constructor()\nC.g()\n    d.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol
deleted file mode 100644
index c934e152b27c..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract D {
-	uint x;
-}
-
-contract C {
-	function f() public {
-		D d1 = new D();
-		D d2 = new D();
-
-		assert(d1 != d2); // should fail in ext calls untrusted mode
-		assert(address(this) != address(d1)); // should fail in ext calls untrusted mode
-		assert(address(this) != address(d2)); // should fail in ext calls untrusted mode
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8729: (70-77): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 8729: (88-95): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 6328: (100-116): CHC: Assertion violation happens here.\nCounterexample:\n\nd1 = 0\nd2 = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (163-199): CHC: Assertion violation happens here.\nCounterexample:\n\nd1 = 21238\nd2 = 21238\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (246-282): CHC: Assertion violation happens here.\nCounterexample:\n\nd1 = 21238\nd2 = 21238\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol
deleted file mode 100644
index be18b33f633a..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {
-	uint x;
-}
-
-contract C {
-	uint y;
-	function g() public {
-		D d = new D();
-		assert(y == 0); // should fail in ext calls untrusted mode
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (72-75): Unused local variable.
-// Warning 8729: (78-85): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 6328: (89-103): CHC: Assertion violation happens here.\nCounterexample:\ny = 1\nd = 0\n\nTransaction trace:\nC.constructor()\nState: y = 0\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol b/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
deleted file mode 100644
index 37f5ca80a3e9..000000000000
--- a/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-	constructor() payable {}
-}
-
-contract B {
-	function f() public payable {
-		require(address(this).balance == 100);
-		A a = new A{value: 50}();
-		assert(address(this).balance == 50); // should hold
-		assert(address(this).balance == 60); // should fail
-		assert(address(a).balance >= 50); // should hold
-		assert(address(a).balance == 50); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (211-246): CHC: Assertion violation happens here.
-// Warning 6328: (316-348): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
deleted file mode 100644
index 985ee26d16ee..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract D {
-	constructor(uint _x) { x = _x; }
-	uint public x;
-}
-
-contract E {
-	constructor() { x = 2; }
-	uint public x;
-}
-
-contract C {
-	constructor() {
-		address d = address(new D(42));
-		assert(D(d).x() == 42); // should hold
-		assert(D(d).x() == 43); // should fail
-		uint y = E(d).x();
-		assert(y == 2); // should fail, it would still call D.x() == 42
-		assert(y == 42); // should hold, but fails due to false positive
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (231-253): CHC: Assertion violation happens here.
-// Warning 6328: (293-307): CHC: Assertion violation happens here.
-// Warning 6328: (359-374): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
deleted file mode 100644
index b078a32eff5b..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract D {
-	constructor(uint _x) { x = _x; }
-	function setD(uint _x) public { x = _x; }
-	uint public x;
-}
-
-contract C {
-	constructor() {
-		address d = address(new D(42));
-		assert(D(d).x() == 42); // should hold
-		assert(D(d).x() == 21); // should fail
-		d.call(abi.encodeCall(D.setD, (21)));
-		assert(D(d).x() == 21); // should hold, but false positive cus low level calls are not handled precisely
-		assert(D(d).x() == 42); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// ----
-// Warning 9302: (257-293): Return value of low-level calls not used.
-// Warning 6328: (216-238): CHC: Assertion violation happens here.
-// Warning 6328: (297-319): CHC: Assertion violation happens here.
-// Warning 6328: (404-426): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
deleted file mode 100644
index 904a5967499d..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract D {
-	constructor(uint _x) { x = _x; }
-	uint public x;
-}
-
-contract E {
-	constructor() { x = 2; }
-	uint public x;
-}
-
-contract C {
-	function f() public {
-		address d = address(new D(42));
-		assert(D(d).x() == 42); // should hold
-		assert(D(d).x() == 43); // should fail
-		uint y = E(d).x();
-		assert(y == 2); // should fail, it would still call D.x() == 42
-		assert(y == 42); // should hold, but fails due to false positive
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (237-259): CHC: Assertion violation happens here.
-// Warning 6328: (299-313): CHC: Assertion violation happens here.
-// Warning 6328: (365-380): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
deleted file mode 100644
index 41d771b5ed93..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract D {
-	constructor(uint _x) { x = _x; }
-	function setD(uint _x) public { x = _x; }
-	uint public x;
-}
-
-contract C {
-	function f() public {
-		address d = address(new D(42));
-		assert(D(d).x() == 42); // should hold
-		assert(D(d).x() == 21); // should fail
-		d.call(abi.encodeCall(D.setD, (21)));
-		assert(D(d).x() == 21); // should hold, but false positive cus low level calls are not handled precisely
-		assert(D(d).x() == 42); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// ----
-// Warning 9302: (263-299): Return value of low-level calls not used.
-// Warning 6328: (222-244): CHC: Assertion violation happens here.
-// Warning 6328: (303-325): CHC: Assertion violation happens here.
-// Warning 6328: (410-432): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
deleted file mode 100644
index b224dae2fdbe..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract D {
-	constructor(uint _x) { x = _x; }
-	function setD(uint _x) public { x = _x; }
-	uint public x;
-}
-
-contract C {
-	uint x;
-
-	function f() public {
-		x = 666;
-		address d = address(new D(42));
-		assert(D(d).x() == 42); // should hold
-		assert(D(d).x() == 21); // should fail
-		d.call(abi.encodeCall(D.setD, (21)));
-		assert(D(d).x() == 21); // should hold, but false positive cus low level calls are not handled precisely
-		assert(D(d).x() == 42); // should fail
-		assert(x == 666); // should hold, C's storage should not have been havoced
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// ----
-// Warning 9302: (284-320): Return value of low-level calls not used.
-// Warning 6328: (243-265): CHC: Assertion violation happens here.
-// Warning 6328: (324-346): CHC: Assertion violation happens here.
-// Warning 6328: (431-453): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
deleted file mode 100644
index 9c29f329ea69..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint x;
-	constructor(address _a) {
-		_a.call("aaaa");
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (51-66): Return value of low-level calls not used.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
deleted file mode 100644
index b7e735b4d151..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint x;
-	function f(uint _x) public {
-		x = _x;
-	}
-	constructor(address _a) {
-		_a.call("aaaa");
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (94-109): Return value of low-level calls not used.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
deleted file mode 100644
index f238fd636f48..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	uint x;
-
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-
-	function set(uint _x) mutex public {
-		x = _x;
-	}
-
-	function f(address _a) mutex public {
-		uint y = x;
-		_a.call("aaaaa");
-		assert(y == x); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (218-234): Return value of low-level calls not used.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
deleted file mode 100644
index e8c17d3eb05f..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	uint x;
-
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-
-	function set(uint _x) mutex public {
-		x = _x;
-	}
-
-	function f(address _a) public {
-		uint y = x;
-		_a.call("aaaaa");
-		assert(y == x); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 9302: (212-228): Return value of low-level calls not used.
-// Warning 6328: (232-246): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, lock = false\n_a = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, lock = false\nC.set(1)\nState: x = 1, lock = false\nC.f(0x0)\n    _a.call("aaaaa") -- untrusted external call, synthesized as:\n        C.set(0) -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol
deleted file mode 100644
index f33f8ada3c08..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x;
-	function s(uint _x) public {
-		x = _x;
-	}
-	function f(address a) public {
-		(bool s, bytes memory data) = a.call("");
-		assert(x == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2519: (100-106): This declaration shadows an existing declaration.
-// Warning 2072: (100-106): Unused local variable.
-// Warning 2072: (108-125): Unused local variable.
-// Warning 6328: (143-157): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
deleted file mode 100644
index 89ed906fbd79..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x;
-	function s(uint _x) public view {
-		x == _x;
-	}
-	function f(address a) public {
-		(bool s, bytes memory data) = a.call("");
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 2519: (106-112): This declaration shadows an existing declaration.
-// Warning 2072: (106-112): Unused local variable.
-// Warning 2072: (114-131): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol
deleted file mode 100644
index 127d9f242aed..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint x;
-	function f(address a) public {
-		(bool s, bytes memory data) = a.call("");
-		assert(s); // should fail
-		assert(!s); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (65-82): Unused local variable.
-// Warning 6328: (100-109): CHC: Assertion violation happens here.
-// Warning 6328: (128-138): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol
deleted file mode 100644
index a9ae1d473206..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint x;
-	function f(address a) public {
-		(bool s, bytes memory data) = a.call("");
-		assert(data.length > 10); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (57-63): Unused local variable.
-// Warning 6328: (100-124): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
deleted file mode 100644
index 0f6548d926f9..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint x;
-	function f(address a) public {
-		(bool s, bytes memory data) = a.call("");
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// ----
-// Warning 2072: (57-63): Unused local variable.
-// Warning 2072: (65-82): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
deleted file mode 100644
index 813185adf497..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function g(address payable i) public {
-		require(address(this).balance == 100);
-		i.call{value: 10}("");
-		assert(address(this).balance == 90); // should hold
-		assert(address(this).balance == 100); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 9302: (96-117): Return value of low-level calls not used.
-// Warning 6328: (121-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-211): CHC: Assertion violation happens here.
-// Warning 4661: (121-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
deleted file mode 100644
index 968095bb2b19..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function g(address payable i) public {
-		require(address(this).balance == 100);
-		i.call{value: 0}("");
-		assert(address(this).balance == 100); // should hold
-		assert(address(this).balance == 20); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (96-116): Return value of low-level calls not used.
-// Warning 6328: (120-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-210): CHC: Assertion violation happens here.
-// Warning 4661: (120-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
deleted file mode 100644
index 6cbe241362e4..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function g(address payable i) public {
-		require(address(this).balance > 100);
-		i.call{value: 20}("");
-		assert(address(this).balance > 0); // should hold
-		// Disabled due to Spacer nondeterminism
-		//assert(address(this).balance == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (95-116): Return value of low-level calls not used.
-// Warning 6328: (120-153): CHC: Assertion violation might happen here.
-// Warning 4661: (120-153): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external.sol b/test/libsolidity/smtCheckerTests/external_calls/external.sol
deleted file mode 100644
index 5ddb61a2226d..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	D d;
-	function f() public {
-		if (x < 10)
-			++x;
-	}
-	function g() public {
-		d.d();
-		assert(x < 10);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (167-181): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol
deleted file mode 100644
index e02533bc1e7b..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract State {
-	function f(uint _x) public pure returns (uint) {
-		assert(_x < 100);
-		return _x;
-	}
-}
-contract C {
-	State s;
-	uint z = s.f(2);
-
-	function f() public view {
-		assert(z == 2); // should fail since we don't trust s.f's code
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
deleted file mode 100644
index 6f2b717b5e87..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract State {
-	function f(uint _x) public pure returns (uint) {
-		assert(_x < 100); // should fail
-		return _x;
-	}
-}
-contract C {
-	State s;
-	uint z = s.f(2);
-
-	function f() public view {
-		assert(z == 2); // should hold in trusted mode
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: all
-// SMTExtCalls: trusted
-// SMTIgnoreInv: yes
-// ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
deleted file mode 100644
index 48bcf93a381f..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint z = this.g(2);
-
-	function g(uint _x) public pure returns (uint) {
-		assert(_x > 0);
-		return _x;
-	}
-
-	function f() public view {
-		assert(z == 2); // should fail since we don't trust s.f's code
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
deleted file mode 100644
index c2b8f83938c5..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint z = this.g(2);
-
-	function g(uint _x) public pure returns (uint) {
-		assert(_x > 0); // should fail
-		return _x;
-	}
-
-	function f() public view {
-		assert(z == 2); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
deleted file mode 100644
index a468186b39c6..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract State {
-	function f(uint _x) public pure returns (uint) {
-		assert(_x < 100);
-		return _x;
-	}
-}
-contract C {
-	State s;
-	uint z;
-
-	constructor() {
-		z = s.f(2);
-	}
-
-	function f() public view {
-		assert(z == 2); // should fail since we don't trust s.f's code
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 0\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
deleted file mode 100644
index 590664055d6b..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract State {
-	function f(uint _x) public pure returns (uint) {
-		assert(_x < 100); // should fail
-		return _x;
-	}
-}
-contract C {
-	State s;
-	uint z;
-
-	constructor() {
-		z = s.f(2);
-	}
-
-	function f() public view {
-		assert(z == 2); // should hold in trusted mode
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
deleted file mode 100644
index 75fb4a7c84c3..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface D {
-	function ext(C c) external returns (uint);
-}
-
-contract C {
-	uint x;
-	function s(uint _x) public { x = _x; }
-	constructor(D d) {
-		uint a = d.ext(this);
-		assert(x == 0); // should hold because there's no reentrancy from the constructor
-		assert(a == 2); // should fail
-	}
-}
-// ====
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (253-267): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
deleted file mode 100644
index c6b46b2f87bf..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract A {
-	uint x;
-	function setX(uint _x) public {
-		x = _x;
-	}
-	function getX() public view returns (uint) {
-		return x;
-	}
-}
-
-contract B {
-	A a;
-	constructor() {
-		a = new A();
-		assert(a.getX() == 0); // should hold
-	}
-	function g() public view {
-		assert(a.getX() == 0); // should fail because A.setX() can be called without B
-	}
-	function getX() public view returns (uint) {
-		return a.getX();
-	}
-}
-
-contract C {
-	B b;
-	constructor() {
-		b = new B();
-		assert(b.getX() == 0); // should hold
-	}
-	function f() public view {
-		assert(b.getX() == 0); // should fail because A.setX() can be called without A
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (256-277): CHC: Assertion violation happens here.
-// Warning 6328: (533-554): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
deleted file mode 100644
index c1d567cfec7d..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-contract A {
-    uint x;
-    address immutable owner;
-    constructor() {
-        owner = msg.sender;
-    }
-    function setX(uint _x) public {
-        require(msg.sender == owner);
-        x = _x;
-    }
-    function getX() public view returns (uint) {
-        return x;
-    }
-}
-
-contract B {
-    A a;
-    constructor() {
-        a = new A();
-        assert(a.getX() == 0); // should hold
-    }
-    function g() public view {
-        assert(a.getX() == 0); // should hold, but fails because
-        // the nondet_interface constraint added for `A a` in between
-        // txs of `B` does not have the constraint that `msg.sender != address(this)`
-        // so `A.setX` is allowed with `msg.sender = address(this)` inside
-        // the current rules defining nondet_interface.
-        // If we want to support that, we likely need a new type of nondet_interface
-        // `nondet_interface_with_tx` that contains tx data as well as restricts
-        // every further `nondet_interface_with_tx` to not have that `msg.sender`.
-    }
-    function getX() public view returns (uint) {
-        return a.getX();
-    }
-}
-
-contract C {
-    B b;
-    constructor() {
-        b = new B();
-        assert(b.getX() == 0); // should hold
-    }
-    function f() public view {
-        assert(b.getX() == 0); // should hold
-    }
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (434-455): CHC: Assertion violation happens here.
-// Warning 6328: (1270-1291): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
deleted file mode 100644
index ff17649dd968..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract A {
-	uint x;
-	address immutable owner;
-	constructor() {
-		owner = msg.sender;
-	}
-	function setX(uint _x) public {
-		require(msg.sender == owner);
-		x = _x;
-	}
-	function getX() public view returns (uint) {
-		return x;
-	}
-}
-
-contract B {
-	A a;
-	constructor() {
-		a = new A();
-		assert(a.getX() == 0); // should hold
-	}
-	function g() public {
-		a.setX(42);
-	}
-	function getX() public view returns (uint) {
-		return a.getX();
-	}
-}
-
-contract C {
-	B b;
-	constructor() {
-		b = new B();
-		assert(b.getX() == 0); // should hold
-	}
-	function f() public view {
-		assert(b.getX() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (561-582): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
deleted file mode 100644
index 766f6e133446..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-contract A {
-	uint x;
-	address immutable owner;
-	constructor() {
-		owner = msg.sender;
-	}
-	function setX(uint _x) public {
-		require(msg.sender == owner);
-		x = _x;
-	}
-	function getX() public view returns (uint) {
-		return x;
-	}
-}
-
-contract B {
-	A a;
-	address immutable owner;
-	constructor() {
-		owner = msg.sender;
-		a = new A();
-		assert(a.getX() == 0); // should hold
-	}
-	function g() public {
-		require(msg.sender == owner);
-		a.setX(42);
-	}
-	function getX() public view returns (uint) {
-		return a.getX();
-	}
-}
-
-contract C {
-	B b;
-	constructor() {
-		b = new B();
-		assert(b.getX() == 0); // should hold
-	}
-	function f() public view {
-		assert(b.getX() == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (641-662): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
deleted file mode 100644
index 9313858ce2b1..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-contract A {
-	uint x;
-	address immutable owner;
-	constructor() {
-		owner = msg.sender;
-	}
-	function setX(uint _x) public {
-		require(msg.sender == owner);
-		x = _x;
-	}
-	function getX() public view returns (uint) {
-		return x;
-	}
-}
-
-contract B {
-	A a;
-	address immutable owner;
-	constructor() {
-		owner = msg.sender;
-		a = new A();
-	}
-	function g() public {
-		require(msg.sender == owner);
-		a.setX(42);
-	}
-	function getX() public view returns (uint) {
-		return a.getX();
-	}
-}
-
-contract C {
-	B b;
-	constructor() {
-		b = new B();
-		assert(b.getX() == 0); // should hold
-	}
-	function f() public view {
-		assert(b.getX() == 0); // should fail
-	}
-	function h() public {
-		b.g();
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (601-622): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
deleted file mode 100644
index 6b4493231231..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x;
-	function i() public { ++x; }
-	function f() public {
-		x = 0;
-		this.i();
-		assert(x == 1); // should hold in trusted mode
-		assert(x != 1); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// SMTTargets: assert
-// ----
-// Warning 6328: (147-161): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
deleted file mode 100644
index 55e8848800a3..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint x;
-	function i() public { ++x; }
-	function f() public {
-		x = 0;
-		((this)).i();
-		assert(x == 1); // should hold in trusted mode
-		assert(x != 1); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (151-165): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
deleted file mode 100644
index 5435e5dcd493..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x;
-	function i() public { ++x; }
-	function f() public {
-		x = 0;
-		C c = this;
-		c.i();
-		assert(x == 1); // should hold in trusted mode
-		assert(x != 1); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (158-172): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
deleted file mode 100644
index 6075548dbd08..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	struct S {
-		address d;
-	}
-	S[] ss;
-	constructor() {
-		ss.push(S(address(new D())));
-		assert(D(ss[0].d).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(ss[0].d).x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (210-237): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
deleted file mode 100644
index c8834ab85ebf..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	struct S {
-		address d;
-	}
-	S[] ss;
-	constructor() {
-		ss.push(S(address(new D())));
-		assert(D(ss[0].d).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(ss[0].d).x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (253-280): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
deleted file mode 100644
index 4a7da79323d0..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	address[] ds;
-	constructor() {
-		ds.push(address(new D()));
-		assert(D(ds[0]).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(ds[0]).x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (226-251): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
deleted file mode 100644
index 846087997dde..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	address[] ds;
-	constructor() {
-		ds.push(address(new D()));
-		assert(D(ds[0]).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(ds[0]).x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (183-208): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
deleted file mode 100644
index 3f1c7acbec77..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	struct S {
-		address d;
-	}
-	S s;
-	constructor() {
-		s.d = address(new D());
-		assert(D(s.d).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(s.d).x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (240-263): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
deleted file mode 100644
index 146141fbab51..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	struct S {
-		address d;
-	}
-	S s;
-	constructor() {
-		s.d = address(new D());
-		assert(D(s.d).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(s.d).x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (197-220): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
deleted file mode 100644
index b2711cb51cc4..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	struct S {
-		address d;
-	}
-	struct T {
-		S s;
-	}
-	T t;
-	constructor() {
-		t.s.d = address(new D());
-		assert(D(t.s.d).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(t.s.d).x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (223-248): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
deleted file mode 100644
index e8387b74c370..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	struct S {
-		address d;
-	}
-	struct T {
-		S s;
-	}
-	T t;
-	constructor() {
-		t.s.d = address(new D());
-		assert(D(t.s.d).x() == 0); // should hold
-	}
-	function f() public view {
-		assert(D(t.s.d).x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (266-291): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
deleted file mode 100644
index aefad8a75a7d..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	struct S {
-		D d;
-	}
-	S[] ss;
-	constructor() {
-		ss.push(S(new D()));
-		assert(ss[0].d.x() == 0); // should hold
-	}
-	function f() public view {
-		assert(ss[0].d.x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (192-216): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
deleted file mode 100644
index 3f03cd713bb7..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	struct S {
-		D d;
-	}
-	S[] ss;
-	constructor() {
-		ss.push(S(new D()));
-		assert(ss[0].d.x() == 0); // should hold
-	}
-	function f() public view {
-		assert(ss[0].d.x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (235-259): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
deleted file mode 100644
index 017e760e7096..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	D[] ds;
-	constructor() {
-		ds.push(new D());
-		assert(ds[0].x() == 0); // should hold
-	}
-	function f() public view {
-		assert(ds[0].x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (208-230): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
deleted file mode 100644
index 0ac805b2f626..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	D[] ds;
-	constructor() {
-		ds.push(new D());
-		assert(ds[0].x() == 0); // should hold
-	}
-	function f() public view {
-		assert(ds[0].x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// SMTTargets: assert
-// ----
-// Warning 6328: (165-187): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
deleted file mode 100644
index f7c705c10d99..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	struct S {
-		D d;
-	}
-	S s;
-	constructor() {
-		s.d = new D();
-		assert(s.d.x() == 0); // should hold
-	}
-	function f() public view {
-		assert(s.d.x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (222-242): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
deleted file mode 100644
index 50bab6173b91..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	struct S {
-		D d;
-	}
-	S s;
-	constructor() {
-		s.d = new D();
-		assert(s.d.x() == 0); // should hold
-	}
-	function f() public view {
-		assert(s.d.x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// SMTTargets: assert
-// ----
-// Warning 6328: (179-199): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
deleted file mode 100644
index 7a5791c6dda2..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract D {
-	uint public x;
-}
-
-contract C {
-	struct S {
-		D d;
-	}
-	struct T {
-		S s;
-	}
-	T t;
-	constructor() {
-		t.s.d = new D();
-		assert(t.s.d.x() == 0); // should hold
-	}
-	function f() public view {
-		assert(t.s.d.x() == 0); // should hold, but fails because we havoc the state
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// SMTTargets: assert
-// ----
-// Warning 6328: (205-227): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
deleted file mode 100644
index 3bc9abafa86e..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract D {
-	uint public x;
-	function setD(uint _x) public { x = _x; }
-}
-
-contract C {
-	struct S {
-		D d;
-	}
-	struct T {
-		S s;
-	}
-	T t;
-	constructor() {
-		t.s.d = new D();
-		assert(t.s.d.x() == 0); // should hold
-	}
-	function f() public view {
-		assert(t.s.d.x() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (248-270): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
deleted file mode 100644
index fbf4140b258c..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function g() public {
-		require(address(this).balance == 100);
-		this.h{value: 10}();
-		assert(address(this).balance == 100); // should hold
-		assert(address(this).balance == 90); // should fail
-	}
-
-	function h() external payable {}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (157-192): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
deleted file mode 100644
index 0cdf7ec8b5fc..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function g(uint i) public {
-		require(address(this).balance == 100);
-		// if called address is same as this, don't do anything with the value stuff
-		// or fix the receiving end
-		this.h{value: i}();
-		uint x = address(this).balance;
-		assert(x == 100); // should hold
-		assert(address(this).balance == 100); // should hold
-		assert(address(this).balance == 90); // should fail
-	}
-
-	function h() external payable {}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (340-375): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol
deleted file mode 100644
index 86cbbe9b5a7d..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-	function f() public view {
-		(bool success, ) = address(10).staticcall{gas: 3}("");
-		require(success);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_1.sol
deleted file mode 100644
index a5ac8ded97e4..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface I {
-	function f() external payable;
-}
-
-contract C {
-	function g(I i) public {
-		require(address(this).balance == 100);
-		i.f{value: 10}();
-		assert(address(this).balance == 90); // should hold
-		// Disabled due to Spacer nondeterminism
-		//assert(address(this).balance == 100); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (151-186): CHC: Assertion violation might happen here.
-// Warning 4661: (151-186): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
deleted file mode 100644
index 2b94abc0e02b..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-interface I {
-	function f() external payable;
-}
-
-contract C {
-	function g(I i) public {
-		require(address(this).balance == 100);
-		i.f{value: 0}();
-		assert(address(this).balance == 100); // should hold
-		assert(address(this).balance == 90); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (150-186): CHC: Assertion violation might happen here.
-// Warning 6328: (205-240): CHC: Assertion violation happens here.
-// Warning 4661: (150-186): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
deleted file mode 100644
index 2a535329aca4..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-interface I {
-	function f() external payable;
-}
-
-contract C {
-	function g(I i) public {
-		require(address(this).balance > 100);
-		i.f{value: 20}();
-		assert(address(this).balance > 0); // should hold
-		assert(address(this).balance == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (150-183): CHC: Assertion violation might happen here.
-// Warning 6328: (202-236): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    i.f{value: 20}() -- untrusted external call
-// Warning 4661: (150-183): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
deleted file mode 100644
index 6b8d41adeaec..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract Crypto {
-	function hash(bytes32) external pure virtual returns (bytes32);
-}
-
-contract C {
-	address owner;
-	bytes32 sig_1;
-	bytes32 sig_2;
-	Crypto d;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function f1(bytes32 _msg) public {
-		address prevOwner = owner;
-		sig_1 = d.hash(_msg);
-		sig_2 = d.hash(_msg);
-		assert(prevOwner == owner);
-	}
-
-	function inv() public view {
-		assert(sig_1 == sig_2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (390-412): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
deleted file mode 100644
index 514e6a5cedb5..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract Crypto {
-	function hash(bytes32) external pure returns (bytes32) {
-		return bytes32(0);
-	}
-}
-
-contract C {
-	address owner;
-	bytes32 sig_1;
-	bytes32 sig_2;
-	Crypto d;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function f1(bytes32 _msg) public {
-		address prevOwner = owner;
-		sig_1 = d.hash(_msg);
-		sig_2 = d.hash(_msg);
-		assert(prevOwner == owner);
-	}
-
-	function inv() public view {
-		assert(sig_1 == sig_2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (398-420): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
deleted file mode 100644
index aa5cb40374a2..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract Crypto {
-	function hash(bytes32) external pure returns (bytes32) {
-		return bytes32(0);
-	}
-}
-
-contract C {
-	address owner;
-	bytes32 sig_1;
-	bytes32 sig_2;
-	Crypto d;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function f1(bytes32 _msg) public {
-		address prevOwner = owner;
-		sig_1 = d.hash(_msg);
-		sig_2 = d.hash(_msg);
-		assert(prevOwner == owner);
-	}
-
-	function inv() public view {
-		assert(sig_1 == sig_2);
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: all
-// SMTExtCalls: trusted
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
deleted file mode 100644
index 90b91e9b268f..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract State {
-	uint x;
-	function f() public returns (uint) {
-		if (x == 0) x = 1;
-		else if (x == 1) x = 2;
-		else if (x == 2) x = 0;
-		return x;
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		y = s.f();
-		z = s.f();
-		assert(prevOwner == owner);
-	}
-
-	function inv() public view {
-		// This is safe but external calls do not yet support the state
-		// of the called contract.
-		assert(owner == address(0) || y != z);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (495-532): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
deleted file mode 100644
index 29d18489594e..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract State {
-	uint x;
-	C c;
-	function f() public view returns (uint) {
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function f() public view {
-		address prevOwner = owner;
-		uint z = s.f();
-		assert(z == y);
-		// Disabled because of Spacer nondeterminism.
-		//assert(prevOwner == owner);
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (219-236): Unused local variable.
-// Warning 6328: (266-280): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
deleted file mode 100644
index 2fc1f0302763..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract State {
-	uint x;
-	C c;
-	function f() public returns (uint) {
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-	bool insidef;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function zz() public {
-		require(insidef);
-		z = 3;
-	}
-
-	function f() public {
-		require(!insidef);
-		address prevOwner = owner;
-		insidef = true;
-		s.f();
-		assert(z == y);
-		assert(prevOwner == owner);
-		insidef = false;
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 2018: (33-88): Function state mutability can be restricted to view
-// Warning 6328: (367-381): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
deleted file mode 100644
index 720b202332e3..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract State {
-	C c;
-	constructor(C _c) {
-		c = _c;
-	}
-	function f() public view returns (uint) {
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-	bool insidef;
-
-	constructor() {
-		owner = msg.sender;
-		s = new State(this);
-	}
-
-	function zz() public {
-		require(insidef);
-		z = 3;
-	}
-
-	function f() public {
-		require(!insidef);
-		address prevOwner = owner;
-		insidef = true;
-		s.f();
-		assert(z == y);
-		assert(prevOwner == owner);
-		insidef = false;
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
deleted file mode 100644
index 80e27e7e2a77..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-contract State {
-	uint x;
-	C c;
-	function f() public view returns (uint) {
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-	bool insidef;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function zz() public {
-		require(insidef);
-		z = 3;
-	}
-
-	function f() public {
-		require(!insidef);
-		address prevOwner = owner;
-		insidef = true;
-		// s.f() cannot call zz() because it is `view`
-		// and zz modifies the state.
-		s.f();
-		assert(z == y);
-		assert(prevOwner == owner);
-		insidef = false;
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
deleted file mode 100644
index bd779b56a516..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-contract Other {
-	C c;
-	function h() public {
-		c.setOwner(address(0));
-	}
-}
-
-contract State {
-	uint x;
-	Other o;
-	C c;
-	function f() public returns (uint) {
-		o.h();
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		uint z = s.f();
-		assert(z == y);
-		assert(prevOwner == owner);
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (419-433): CHC: Assertion violation happens here.
-// Warning 6328: (437-463): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol
deleted file mode 100644
index 8000b3267d9e..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract Other {
-	C c;
-	constructor(C _c) {
-		c = _c;
-	}
-	function h() public {
-		c.setOwner(address(0));
-	}
-}
-
-contract State {
-	uint x;
-	Other o;
-	C c;
-	constructor(C _c) {
-		c = _c;
-		o = new Other(_c);
-	}
-	function f() public returns (uint) {
-		o.h();
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-		s = new State(this);
-	}
-
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		uint z = s.f();
-		assert(z == y); // should hold
-		assert(prevOwner == owner); // should not hold because of reentrancy
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (531-545): CHC: Assertion violation might happen here.
-// Warning 6328: (564-590): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
deleted file mode 100644
index 34df5c0e0fb9..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract State {
-	C c;
-	constructor(C _c) {
-		c = _c;
-	}
-	function f() public view returns (uint) {
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-		s = new State(this);
-	}
-
-	function f() public view {
-		address prevOwner = owner;
-		uint z = s.f();
-		assert(z == y);
-		assert(prevOwner == owner);
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (314-328): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
deleted file mode 100644
index b3b43980ab6c..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract State {
-	uint x;
-	C c;
-	function f() public returns (uint) {
-		c.setOwner(address(0));
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		uint z = s.f();
-		assert(z == y);
-		assert(prevOwner == owner);
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (348-362): CHC: Assertion violation happens here.
-// Warning 6328: (366-392): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol
deleted file mode 100644
index 4d179ddf8254..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract State {
-	C c;
-	constructor(C _c) {
-		c = _c;
-	}
-	function f() public returns (uint) {
-		c.setOwner(address(0));
-		return c.g();
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-		s = new State(this);
-	}
-
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		uint z = s.f();
-		assert(z == y); // should hold
-		assert(prevOwner == owner); // should not hold because of reentrancy
-	}
-
-	function g() public view returns (uint) {
-		return y;
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (396-410): CHC: Assertion violation might happen here.
-// Warning 6328: (429-455): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol
deleted file mode 100644
index 1c557f7a6ddd..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract State {
-	uint x;
-	function f() public returns (uint) {
-		if (x == 0) x = 1;
-		else if (x == 1) x = 2;
-		else if (x == 2) x = 0;
-		return x;
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-
-	constructor() {
-		s = new State();
-		owner = msg.sender;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		y = s.f();
-		z = s.f();
-		assert(prevOwner == owner);
-		assert(y != z);
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (355-381): CHC: Assertion violation might happen here.
-// Warning 6328: (385-399): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol
deleted file mode 100644
index 68990bebcce3..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract State {
-	uint x;
-	function f() public returns (uint) {
-		if (x == 0) x = 1;
-		else if (x == 1) x = 2;
-		else if (x == 2) x = 0;
-		return x;
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-	}
-
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		y = s.f();
-		z = s.f();
-		assert(prevOwner == owner);
-	}
-
-	function inv() public view {
-		// This is safe but external calls do not yet support the state
-		// of the called contract.
-		assert(owner == address(0) || y != z);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (402-428): CHC: Assertion violation happens here.
-// Warning 6328: (561-598): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol
deleted file mode 100644
index 7d217e145a8b..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract State {
-	uint x;
-	function f() public returns (uint) {
-		if (x == 0) x = 1;
-		else if (x == 1) x = 2;
-		else if (x == 2) x = 0;
-		return x;
-	}
-}
-
-contract C {
-	address owner;
-	uint y;
-	uint z;
-	State s;
-
-	constructor() {
-		owner = msg.sender;
-		s = new State();
-	}
-
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-
-	function f() public {
-		address prevOwner = owner;
-		y = s.f();
-		z = s.f();
-		assert(prevOwner == owner);
-		assert(y != z);
-	}
-}
-// ====
-// SMTContract: C
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// ----
-// Warning 6328: (421-447): CHC: Assertion violation might happen here.
-// Warning 6328: (451-465): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
deleted file mode 100644
index 22a4551c8588..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	D d;
-
-	function inc() public {
-		++x;
-	}
-
-	function f() public {
-		d.d();
-		assert(x < 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (113-116): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (156-170): CHC: Assertion violation happens here.
-// Warning 2661: (113-116): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol
deleted file mode 100644
index 0a874a7824aa..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	uint y;
-	D d;
-
-	function inc2() public {
-		if (y == 1)
-			x = 1;
-	}
-	function inc1() public {
-		if (x == 0)
-			y = 1;
-	}
-
-	function f() public {
-		uint oldX = x;
-		// Removed because Spacer 4.8.9 seg faults.
-		//d.d();
-		assert(oldX == x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2018: (203-322): Function state mutability can be restricted to view
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
deleted file mode 100644
index 4df99bfe15e1..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-interface D { function e() external; }
-
-contract C {
-	bool locked = true;
-
-	function call(address target) public {
-		locked = false;
-		D(target).e();
-		locked = true;
-	}
-
-	function broken() public view {
-		assert(locked);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (206-220): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.broken() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
deleted file mode 100644
index 1783be78141e..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-interface D { function e() external; }
-
-contract C {
-	bool locked = true;
-
-	function call(address target) public {
-		assert(locked);
-		locked = false;
-		D(target).e();
-		locked = true;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.call(0x0) -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
deleted file mode 100644
index cfe12434c3ea..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-abstract contract D {
-	function d() virtual public {}
-}
-
-contract A {
-	int x = 0;
-
-	function f() virtual public view {
-		assert(x == 0); // should hold
-		assert(x == 1); // should fail
-	}
-}
-contract C is A {
-	constructor() {
-		x = 1;
-	}
-
-	function call(D d) public {
-		d.d();
-	}
-
-	function f() public view override {
-		assert(x == 1); // should hold
-		//Disabled because of Spacer nondeterminism.
-		//assert(x == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreInv: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (154-168): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
deleted file mode 100644
index 2cac5443b284..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-abstract contract D {
-	function d() virtual public;
-}
-
-contract C {
-	bytes data;
-
-	bytes32 kec;
-
-	constructor(bytes memory _data) {
-		data = _data;
-
-		kec = keccak256(data);
-	}
-
-	function check(bytes memory _data) public view {
-		bytes32 _kec = keccak256(data);
-		assert(_kec == kec); // should hold
-		assert(kec == keccak256(_data)); // should fail
-	}
-
-	function ext(D d) public {
-		d.d();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreInv: yes
-// ----
-// Warning 6328: (302-333): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
deleted file mode 100644
index 593aba289ca3..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	D d;
-	function f() public {
-		if (x < 10)
-			++x;
-	}
-	function g() public {
-		d.d();
-		assert(x < 11);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
deleted file mode 100644
index 7b73311a0b5f..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	uint y;
-	D d;
-
-	function inc() public {
-		if (y == 1)
-			x = 1;
-		if (x == 0)
-			y = 1;
-	}
-
-	function f() public {
-		uint oldX = x;
-		d.d();
-		assert(oldX == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (223-240): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol
deleted file mode 100644
index 37af9be9cd2b..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-interface I {
-    function i() external;
-}
-
-library L {
-    function f(I _i) internal {
-        _i.i();
-    }
-}
-
-contract C {
-    uint x;
-    bool inG;
-    function s() public {
-        require(inG);
-        x = 2;
-    }
-    function g(I _i) public {
-        inG = true;
-        L.f(_i);
-        assert(x == 0);
-        inG = false;
-    }
-}
-// ----
-// Warning 6328: (296-310): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.f(0) -- internal call\n        _i.i() -- untrusted external call, synthesized as:\n            C.s() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
deleted file mode 100644
index 3dca6dd3dafc..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-interface I {
-    function i() external;
-}
-
-library L {
-    function f(I _i) internal {
-        _i.i();
-    }
-	function g(I _i) internal {
-		f(_i);
-	}
-}
-
-contract C {
-    uint x;
-    bool inG;
-    function s() public {
-        require(inG);
-        x = 2;
-    }
-    function g(I _i) public {
-        inG = true;
-        L.g(_i);
-        assert(x == 0);
-        inG = false;
-    }
-}
-// ----
-// Warning 6328: (337-351): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
deleted file mode 100644
index c9d35e645726..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-interface I {
-    function i() external;
-}
-
-library M {
-    function f(I _i) internal {
-        _i.i();
-    }
-}
-
-library L {
-	function g(I _i) internal {
-		M.f(_i);
-	}
-}
-
-contract C {
-    uint x;
-    bool inG;
-    function s() public {
-        require(inG);
-        x = 2;
-    }
-    function g(I _i) public {
-        inG = true;
-        L.g(_i);
-        assert(x == 0);
-        inG = false;
-    }
-}
-// ----
-// Warning 6328: (354-368): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
deleted file mode 100644
index ffe23ae8dde7..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	D d;
-
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-
-	function set(uint _x) mutex public {
-		x = _x;
-	}
-
-	function f() mutex public {
-		uint y = x;
-		d.d();
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol b/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
deleted file mode 100644
index 76568adf6504..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-	uint x;
-	D d;
-
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-
-	function set(uint _x) mutex public {
-		x = _x;
-	}
-
-	function f() public {
-		uint y = x;
-		d.d();
-		// Disabled because of Spacer nondeterminism.
-		//assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (251-257): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
deleted file mode 100644
index 54b0d36fb2d1..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	uint x;
-
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-
-	function set(uint _x) mutex public {
-		x = _x;
-	}
-
-	function f(address _a) mutex public {
-		uint y = x;
-		_a.staticcall("aaaaa");
-		assert(y == x); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (218-240): Return value of low-level calls not used.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
deleted file mode 100644
index 19b5e54618e8..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	uint x;
-
-	bool lock;
-	modifier mutex {
-		require(!lock);
-		lock = true;
-		_;
-		lock = false;
-	}
-
-	function set(uint _x) mutex public {
-		x = _x;
-	}
-
-	function f(address _a) public {
-		uint y = x;
-		_a.staticcall("aaaaa");
-		assert(y == x); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 9302: (212-234): Return value of low-level calls not used.
-// Warning 2018: (164-271): Function state mutability can be restricted to view
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
deleted file mode 100644
index 70a817315d03..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x;
-	function s(uint _x) public view {
-		x == _x;
-	}
-	function f(address a) public {
-		(bool s, bytes memory data) = a.staticcall("");
-		assert(x == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2519: (106-112): This declaration shadows an existing declaration.
-// Warning 2072: (106-112): Unused local variable.
-// Warning 2072: (114-131): Unused local variable.
-// Warning 2018: (72-188): Function state mutability can be restricted to view
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
deleted file mode 100644
index f9f65bb7bdf5..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-interface Token {
-	function balanceOf(address _a) external view returns (uint);
-	function transfer(address _to, uint _amt) external;
-}
-
-contract TokenCorrect is Token {
-	mapping (address => uint) balance;
-	constructor(address _a, uint _b) {
-		balance[_a] = _b;
-	}
-	function balanceOf(address _a) public view override returns (uint) {
-		return balance[_a];
-	}
-	function transfer(address _to, uint _amt) public override {
-		require(balance[msg.sender] >= _amt);
-		balance[msg.sender] -= _amt;
-		balance[_to] += _amt;
-	}
-}
-
-contract Test {
-	function property_transfer(address _token, address _to, uint _amt) public {
-		require(_to != address(this));
-
-		TokenCorrect t = TokenCorrect(_token);
-
-		uint xPre = t.balanceOf(address(this));
-		require(xPre >= _amt);
-		uint yPre = t.balanceOf(_to);
-
-		t.transfer(_to, _amt);
-		uint xPost = t.balanceOf(address(this));
-		uint yPost = t.balanceOf(_to);
-
-		assert(xPost == xPre - _amt);
-		assert(yPost == yPre + _amt);
-	}
-
-	function test_concrete() public {
-		TokenCorrect t = new TokenCorrect(address(this), 1000);
-
-		uint b = t.balanceOf(address(this));
-		assert(b == 1000);
-
-		address other = address(0x333);
-		require(address(this) != other);
-
-		uint c = t.balanceOf(other);
-		assert(c == 0);
-
-		t.transfer(other, 100);
-
-		uint d = t.balanceOf(address(this));
-		assert(d == 900);
-
-		uint e = t.balanceOf(other);
-		assert(e == 100);
-	}
-}
-// ====
-// SMTContract: Test
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
deleted file mode 100644
index 2aee3c8d3283..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-interface Token {
-	function balanceOf(address _a) external view returns (uint);
-	function transfer(address _to, uint _amt) external;
-}
-
-contract TokenWrong is Token {
-	mapping (address => uint) balance;
-	constructor(address _a, uint _b) {
-		balance[_a] = _b;
-	}
-	function balanceOf(address _a) public view override returns (uint) {
-		return balance[_a];
-	}
-	function transfer(address _to, uint _amt) public override {
-		require(balance[msg.sender] >= _amt);
-		// Commented out to make this token implementation wrong.
-		//balance[msg.sender] -= _amt;
-		balance[_to] += _amt;
-	}
-}
-
-contract Test {
-	function property_transfer(address _token, address _to, uint _amt) public {
-		require(_to != address(this));
-
-		TokenWrong t = TokenWrong(_token);
-
-		uint xPre = t.balanceOf(address(this));
-		require(xPre >= _amt);
-		uint yPre = t.balanceOf(_to);
-
-		t.transfer(_to, _amt);
-		uint xPost = t.balanceOf(address(this));
-		uint yPost = t.balanceOf(_to);
-
-		assert(xPost == xPre - _amt); // should fail
-		assert(yPost == yPre + _amt);
-	}
-
-	function test_concrete() public {
-		TokenWrong t = new TokenWrong(address(this), 1000);
-
-		uint b = t.balanceOf(address(this));
-		assert(b == 1000);
-
-		address other = address(0x333);
-		require(address(this) != other);
-
-		uint c = t.balanceOf(other);
-		assert(c == 0);
-
-		t.transfer(other, 100);
-
-		uint d = t.balanceOf(address(this));
-		assert(d == 900); // should fail
-
-		uint e = t.balanceOf(other);
-		assert(e == 100);
-	}
-}
-// ====
-// SMTContract: Test
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (950-978): CHC: Assertion violation happens here.
-// Warning 6328: (1370-1386): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol b/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
deleted file mode 100644
index 0b5c8fa07d73..000000000000
--- a/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-
-	uint v;
-	bool guard = true;
-
-	function dec() public returns (uint) {
-		if (guard) return 0;
-		--v;
-		return v;
-	}
-
-	function f() public returns (uint) {
-		guard = false;
-		uint ret = this.dec();
-		guard = true;
-		return ret;
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTIgnoreCex: no
-// SMTTargets: underflow
-// ----
-// Warning 3944: (109-112): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nv = 0, guard = false\n = 0\n\nTransaction trace:\nC.constructor()\nState: v = 0, guard = true\nC.f()\n    C.dec() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source.sol b/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source.sol
deleted file mode 100644
index c9abf3f34630..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: s1.sol ====
-function f() {
-	ecrecover("1234", 1, "0", abi.decode("", (bytes2)));
-}
-==== Source: s2.sol ====
-contract C {}
-// ----
-// Warning 6133: (s1.sol:16-67): Statement has no effect.
-// Warning 2018: (s1.sol:0-70): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol b/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol
deleted file mode 100644
index f403b5c6eaf1..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: s1.sol ====
-function f() {
-	ecrecover("", 1, "", "");
-}
-==== Source: s2.sol ====
-contract C {}
-// ----
-// Warning 6133: (s1.sol:16-40): Statement has no effect.
-// Warning 2018: (s1.sol:0-43): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol b/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol
deleted file mode 100644
index ff8d72b30a21..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: l.sol ====
-library L {
-	int constant one = 1;
-	function f() internal {
-		one;
-	}
-}
-==== Source: s1.sol ====
-library L {}
-// ----
-// Warning 6133: (l.sol:62-65): Statement has no effect.
-// Warning 2018: (l.sol:36-69): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol b/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol
deleted file mode 100644
index 73dc2a861913..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-uint constant x = 42;
-
-contract C {
-	function f() public pure {
-		uint z = x;
-		assert(z == 41);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (80-95): CHC: Assertion violation happens here.\nCounterexample:\n\nz = 42\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol b/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
deleted file mode 100644
index 55120bcb4aaa..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-bytes constant a = "\x03\x01\x02";
-bytes constant b = hex"030102";
-string constant c = "hello";
-uint256 constant x = 56;
-enum ActionChoices {GoLeft, GoRight, GoStraight, Sit}
-ActionChoices constant choices = ActionChoices.GoRight;
-bytes32 constant st = "abc\x00\xff__";
-
-contract C {
-	function f() internal pure returns (bytes memory) {
-		return a;
-	}
-
-	function g() internal pure returns (bytes memory) {
-		return b;
-	}
-
-	function h() internal pure returns (bytes memory) {
-		return bytes(c);
-	}
-
-	function i() internal pure returns (uint, ActionChoices, bytes32) {
-		return (x, choices, st);
-	}
-
-	function p() public pure {
-		assert(f().length == 3); // should hold
-		assert(g().length == 3); // should hold
-		assert(h().length == 5); // should hold
-		(uint w, ActionChoices z, bytes32 t) = i();
-		assert(x == 56); // should hold
-		assert(w == 56); // should hold
-		assert(z == ActionChoices.GoRight); // should hold
-		assert(t == "abc\x00\xff__"); // should hold
-		assert(w == 59); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (968-983): CHC: Assertion violation happens here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol b/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
deleted file mode 100644
index c7be224866b2..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-==== Source: s1.sol ====
-
-
-bytes constant a = b;
-bytes constant b = hex"030102";
-
-function fre() pure returns (bytes memory) {
-	return a;
-}
-
-==== Source: s2.sol ====
-
-import "s1.sol";
-
-uint256 constant c = uint8(a[0]) + 2;
-
-contract C {
-	function f() internal pure returns (bytes memory) {
-		return a;
-	}
-
-	function g() internal pure returns (bytes memory) {
-		return b;
-	}
-
-	function h() internal pure returns (uint) {
-		return c;
-	}
-
-	function i() internal pure returns (bytes memory) {
-		return fre();
-	}
-
-	function p() public pure {
-		bytes memory r1 = f();
-		assert(r1[0] == 0x03); // should hold
-		assert(r1[1] == 0x01); // should hold
-		assert(r1[2] == 0x02); // should hold
-		assert(r1[2] == 0x04); // should fail
-
-		bytes memory r2 = g();
-		assert(r2[0] == 0x03); // should hold
-		assert(r2[1] == 0x01); // should hold
-		assert(r2[2] == 0x02); // should hold
-		assert(r2[2] == 0x04); // should fail
-
-		bytes memory r3 = i();
-		assert(r3[0] == 0x03); // should hold
-		assert(r3[1] == 0x01); // should hold
-		assert(r3[2] == 0x02); // should hold
-		assert(r3[2] == 0x04); // should fail
-
-		uint z = h();
-		assert(z == 5); // should hold
-		assert(z == 7); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (s2.sol:518-539): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:704-725): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:890-911): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:980-994): CHC: Assertion violation happens here.
-// Info 1391: CHC: 24 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/easy.sol b/test/libsolidity/smtCheckerTests/file_level/easy.sol
deleted file mode 100644
index 2cbef3f5cc82..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/easy.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-function add(uint a, uint b) pure returns (uint) {
-	return a + b;
-}
-
-contract C {
-	function f(uint x) internal pure returns (uint) {
-		return add(x, 2);
-	}
-	function g() public pure {
-		assert(f(7) == 9); // should hold
-		assert(f(8) == 9); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (222-239): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f(7) -- internal call\n        add(7, 2) -- internal call\n    C.f(8) -- internal call\n        add(8, 2) -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/enum.sol b/test/libsolidity/smtCheckerTests/file_level/enum.sol
deleted file mode 100644
index 0cefa021a7cd..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/enum.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-enum E {
-	READ,
-	WRITE
-}
-
-function allocate(bool b) pure returns (E) {
-	if (b) return E.READ;
-	return E.WRITE;
-}
-
-contract C {
-	function f() public pure {
-		E e1 = allocate(true);
-		assert(e1 == E.READ); // should hold
-		E e2 = allocate(false);
-		assert(e2 == E.READ); // should fail
-		assert(allocate(false) == E.WRITE); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (247-267): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol b/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
deleted file mode 100644
index 95468f129d98..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: a.sol ====
-function f(uint) pure returns (uint) { return 7; }
-function f(bytes memory x) pure returns (uint) { return x.length; }
-==== Source: b.sol ====
-import "a.sol" as M;
-contract C {
-	function f() internal pure returns (uint, uint) {
-		return (M.f(2), M.f("abc"));
-	}
-	function p() public pure {
-		(uint a, uint b) = f();
-		assert(a == 7); // should hold
-		assert(a == 9); // should fail
-		assert(b == 3); // should hold
-		assert(b == 5); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (b.sol:208-222): CHC: Assertion violation happens here.
-// Warning 6328: (b.sol:274-288): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol b/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol
deleted file mode 100644
index ccf6700eff73..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-uint constant A = 42;
-contract C {
-	function f(uint x) public pure returns (uint) {
-		return x + A;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (93-98): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639894\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639894)
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_constant_2.sol b/test/libsolidity/smtCheckerTests/file_level/free_constant_2.sol
deleted file mode 100644
index 3419624c7ea6..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_constant_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-uint256 constant x = 56;
-enum ActionChoices {GoLeft, GoRight, GoStraight, Sit}
-ActionChoices constant choices = ActionChoices.GoRight;
-bytes32 constant st = "abc\x00\xff__";
-contract C {
-	function i() public returns (uint, ActionChoices, bytes32) {
-		return (x, choices, st);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2018: (188-278): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol
deleted file mode 100644
index 5dd951521578..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	uint[] data;
-	function f(uint x, uint[] calldata input) public view returns (uint, uint) {
-		(uint a, uint[] calldata b) = fun(input, data);
-		return (a, b.length + x);
-	}
-}
-function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[] calldata) {
-	return (_y[0], _x);
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (168-180): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6368: (289-294): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_2.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_2.sol
deleted file mode 100644
index 5d22f1506038..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function g() external {
-		f();
-	}
-}
-function f() {}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_3.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_3.sol
deleted file mode 100644
index 25e16ad400b2..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_3.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function f() view {}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol
deleted file mode 100644
index 3fab520df03f..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-function f()pure {
-	ufixed a = uint64(1) + ufixed(2);
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (20-28): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol
deleted file mode 100644
index fbfe61fd89aa..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract K {}
-function f() pure {
-	(abi.encode, "");
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (35-51): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol
deleted file mode 100644
index 4bb7e3960ce1..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-uint constant A = 42;
-contract C {
-	uint[] data;
-	function f(uint x, uint[] calldata input) public view returns (uint, uint) {
-		(uint a, uint[] calldata b) = fun(input, data);
-		return (a, b.length + x + A);
-	}
-}
-function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[] calldata) {
-	return (_y[0], _x);
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (190-202): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (190-206): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6368: (315-320): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol b/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
deleted file mode 100644
index 3119fd1c84c7..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-function f() pure returns (uint) { return 1337; }
-
-contract C {
-	function g() public pure {
-		assert(f() == 42); // should hold
-		assert(f() == 1337); // should fail
-	}
-	function f() internal pure returns (uint) { return 42; }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2519: (170-226): This declaration shadows an existing declaration.
-// Warning 6328: (130-149): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol b/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol
deleted file mode 100644
index 939d32e225c6..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint public x = 2;
-}
-
-function test() pure returns (bool) {
-	return type(C).runtimeCode.length > 20;
-}
-
-contract D {
-	function f() public pure {
-		assert(test()); // should hold but SMTChecker doesn't know that
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7507: (82-101): Assertion checker does not yet support this expression.
-// Warning 6328: (161-175): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/import.sol b/test/libsolidity/smtCheckerTests/file_level/import.sol
deleted file mode 100644
index 445953637f7e..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/import.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-==== Source: A ====
-struct S { uint x; }
-function set(S storage a, uint v) { a.x = v; }
-
-==== Source: B ====
-import "A";
-import "A" as A;
-contract C {
-	A.S data;
-	function f(uint v) internal returns (uint one, uint two) {
-		A.set(data, v);
-		one = data.x;
-		set(data, v + 1);
-		two = data.x;
-	}
-	function g() public {
-		(uint x, uint y) = f(7);
-		assert(x == 7); // should hold but the SMTChecker doesn't know that
-		assert(y == 8); // should hold but the SMTChecker doesn't know that
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (B:238-252): CHC: Assertion violation happens here.
-// Warning 6328: (B:308-322): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol b/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol
deleted file mode 100644
index 881c1388e988..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-library L {
-	function pub() public pure returns (uint) {
-		return 7;
-	}
-	function inter() internal pure returns (uint) {
-		return 8;
-	}
-}
-
-function fu() pure returns (uint, uint) {
-	return (L.pub(), L.inter());
-}
-
-contract C {
-	function f() public pure {
-		(uint x, uint y) = fu();
-		assert(x == 7); // should hold but SMTChecker doesn't implement delegatecall
-		assert(y == 9); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4588: (190-197): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (284-298): CHC: Assertion violation happens here.
-// Warning 6328: (363-377): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol b/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
deleted file mode 100644
index 45109a6fef30..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-==== Source: s1.sol ====
-uint constant a = 89;
-==== Source: s2.sol ====
-uint constant a = 88;
-
-==== Source: s3.sol ====
-import "s1.sol" as M;
-import "s2.sol" as N;
-
-contract C {
-	function f() internal pure returns (uint, uint) {
-		return (M.a, N.a);
-	}
-	function p() public pure {
-		(uint x, uint y) = f();
-		assert(x == 89); // should hold
-		assert(x == 88); // should fail
-		assert(y == 88); // should hold
-		assert(y == 89); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 6328: (s3.sol:223-238): CHC: Assertion violation happens here.
-// Warning 6328: (s3.sol:291-306): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol b/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
deleted file mode 100644
index 27527ab8e139..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-==== Source: s1.sol ====
-uint constant a = 89;
-
-function fre() pure returns (uint) {
-	return a;
-}
-
-==== Source: s2.sol ====
-function foo() pure returns (uint) {
-	return 42;
-}
-
-==== Source: s3.sol ====
-import {fre as foo} from "s1.sol";
-import "s1.sol" as M;
-import "s2.sol" as N;
-
-uint256 constant a = 13;
-
-contract C {
-	function f() internal pure returns (uint, uint, uint, uint) {
-		return (a, foo(), N.foo(), M.a);
-	}
-	function p() public pure {
-		(uint x, uint y, uint z, uint t) = f();
-
-		assert(x == 13); // should hold
-		assert(x == 89); // should fail
-
-		assert(y == 89); // should hold
-		assert(y == 42); // should fail
-
-		assert(z == 42); // should hold
-		assert(z == 89); // should fail
-
-		assert(t == 89); // should hold
-		assert(t == 13); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (s3.sol:327-342): CHC: Assertion violation happens here.
-// Warning 6328: (s3.sol:396-411): CHC: Assertion violation happens here.
-// Warning 6328: (s3.sol:465-480): CHC: Assertion violation happens here.
-// Warning 6328: (s3.sol:534-549): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/new_operator.sol b/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
deleted file mode 100644
index 925f53bc9c01..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint public x = 2;
-}
-
-function test() returns (uint) {
-	return (new C()).x();
-}
-
-contract D {
-	function f() public {
-		assert(test() == 2); // should hold but the SMTChecker doesn't support `new`
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8729: (78-85): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 6328: (133-152): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call\n        (new C()).x() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/file_level/overloads.sol b/test/libsolidity/smtCheckerTests/file_level/overloads.sol
deleted file mode 100644
index b645705595a6..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/overloads.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-function f(uint) pure returns (uint) {
-	return 2;
-}
-function f(string memory) pure returns (uint) {
-	return 3;
-}
-
-contract C {
-	function g() public pure {
-		(uint x, uint y) = (f(2), f("abc"));
-		assert(x == 2); // should hold
-		assert(y == 4); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (229-243): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/recursion.sol b/test/libsolidity/smtCheckerTests/file_level/recursion.sol
deleted file mode 100644
index 34a26d3268a7..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/recursion.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-function exp(uint base, uint exponent) pure returns (uint power) {
-	if (exponent == 0)
-		return 1;
-	power = exp(base, exponent / 2);
-	power *= power;
-	if (exponent & 1 == 1)
-		power *= base;
-}
-
-contract C {
-	function g(uint base, uint exponent) internal pure returns (uint) {
-		return exp(base, exponent);
-	}
-	function f() public pure {
-		// All of these should hold but the SMTChecker can't prove them.
-		// Disabled because of Spacer nondet
-		/*
-		assert(g(0, 0) == 1);
-		assert(g(0, 1) == 0);
-		assert(g(1, 0) == 1);
-		assert(g(2, 3) == 8);
-		assert(g(3, 10) == 59049);
-		*/
-	}
-}
-// ====
-// SMTEngine: all
diff --git a/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol b/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol
deleted file mode 100644
index 7a8bcc0aabcd..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-==== Source: s1.sol ====
-
-
-uint constant a = 89;
-
-function fre() pure returns (uint) {
-	return a;
-}
-
-==== Source: s2.sol ====
-
-import {a as b, fre} from "s1.sol";
-import "s1.sol" as M;
-
-uint256 constant a = 13;
-
-contract C {
-	function f() internal pure returns (uint, uint, uint, uint) {
-		return (a, fre(), M.a, b);
-	}
-	function p() public pure {
-		(uint x, uint y, uint z, uint t) = f();
-		assert(x == 13); // should hold
-		assert(y == 89); // should hold
-		assert(z == 89); // should hold
-		assert(t == 89); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/struct.sol b/test/libsolidity/smtCheckerTests/file_level/struct.sol
deleted file mode 100644
index f469933dbaf8..000000000000
--- a/test/libsolidity/smtCheckerTests/file_level/struct.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-struct S {
-	uint x;
-	uint[] a;
-}
-
-function allocate(uint _x, uint _f) pure returns (S memory) {
-	S memory s;
-	s.x = _x;
-	s.a = new uint[](1);
-	s.a[0] = _f;
-	return s;
-}
-
-contract C {
-	function f() public pure {
-		S memory s = allocate(2, 1);
-		assert(s.x == 2); // should hold
-		assert(s.a[0] == 1); // should hold
-		assert(s.x == 3); // should fail
-		assert(s.a[0] == 4); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (317-333): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
-// Warning 6328: (352-371): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/function_selector_via_contract_name.sol b/test/libsolidity/smtCheckerTests/function_selector/function_selector_via_contract_name.sol
deleted file mode 100644
index 7c7398003e67..000000000000
--- a/test/libsolidity/smtCheckerTests/function_selector/function_selector_via_contract_name.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-    function f() external {}
-    function g(uint256) external {}
-}
-contract B {
-    function f() external returns (uint256) {}
-    function g(uint256) external returns (uint256) {}
-}
-contract C {
-    function test1() external pure returns(bytes4, bytes4, bytes4, bytes4) {
-        return (A.f.selector, A.g.selector, B.f.selector, B.g.selector);
-    }
-    function test2() external pure returns(bytes4, bytes4, bytes4, bytes4) {
-        A a; B b;
-        return (a.f.selector, a.g.selector, b.f.selector, b.g.selector);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol b/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
deleted file mode 100644
index 45910c66629d..000000000000
--- a/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    uint256 public x;
-
-    function f() public pure returns (bytes4) {
-        return this.f.selector;
-    }
-
-    function g() public view returns (bytes4) {
-        function () pure external returns (bytes4) fun = this.f;
-        return fun.selector;
-    }
-
-    function i() public pure returns (bytes4) {
-        return this.x.selector;
-    }
-
-    function check() public view {
-        assert(f() == 0x26121ff0);
-        assert(g() == 0x26121ff0);
-        assert(i() == 0x0c55699c);
-        assert(i() == 0x26121ff0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7650: (251-263): Assertion checker does not yet support this expression.
-// Warning 6328: (437-462): CHC: Assertion violation happens here.
-// Warning 6328: (507-532): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/homer.sol b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
deleted file mode 100644
index a3bb0c64ba1a..000000000000
--- a/test/libsolidity/smtCheckerTests/function_selector/homer.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-interface Simpson {
-    function is2D() external returns (bool);
-    function skinColor() external returns (string memory);
-}
-
-interface PeaceMaker {
-    function achieveWorldPeace() external;
-}
-
-contract Homer is ERC165, Simpson {
-    function supportsInterface(bytes4 interfaceID) public pure override returns (bool) {
-        return
-            interfaceID == this.supportsInterface.selector || // ERC165
-            interfaceID == this.is2D.selector ^ this.skinColor.selector; // Simpson
-    }
-
-    function is2D() external pure override returns (bool) {
-        return true;
-    }
-
-    function skinColor() external pure override returns (string memory) {
-        return "yellow";
-    }
-
-    function check() public pure {
-        assert(supportsInterface(type(Simpson).interfaceId));
-        assert(supportsInterface(type(ERC165).interfaceId));
-        assert(supportsInterface(type(PeaceMaker).interfaceId));
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (1340-1395): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/selector.sol b/test/libsolidity/smtCheckerTests/function_selector/selector.sol
deleted file mode 100644
index 486f48c45a28..000000000000
--- a/test/libsolidity/smtCheckerTests/function_selector/selector.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assert(msg.sig == this.f.selector);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/selector_2.sol b/test/libsolidity/smtCheckerTests/function_selector/selector_2.sol
deleted file mode 100644
index c3a4b88663aa..000000000000
--- a/test/libsolidity/smtCheckerTests/function_selector/selector_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function g() external pure {
-    }
-
-    function f() public pure {
-        assert(msg.sig == this.g.selector);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (92-126): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }
diff --git a/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol b/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol
deleted file mode 100644
index c4dd67e17915..000000000000
--- a/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-
-contract C {
-    int public x;
-    int public y;
-
-    function f() public pure {
-        assert(this.x.selector != this.y.selector);
-        assert(this.x.selector == this.y.selector);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (142-184): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/abi_encode_functions.sol b/test/libsolidity/smtCheckerTests/functions/abi_encode_functions.sol
deleted file mode 100644
index 903b330d8539..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/abi_encode_functions.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f() public pure returns (bytes memory, bytes memory) {
-        return (abi.encode(""), abi.encodePacked( "7?8r"));
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_base_basic.sol b/test/libsolidity/smtCheckerTests/functions/constructor_base_basic.sol
deleted file mode 100644
index 3f858a6c3ba5..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_base_basic.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-	uint x;
-	constructor() {
-		x = 2;
-	}
-}
-
-contract B is A {
-	constructor() A() {
-		x = 3;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
deleted file mode 100644
index d95dbdce93a8..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-contract A is C {
-	constructor() C(2) {
-		assert(a == 2);
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (120-134): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
deleted file mode 100644
index 62d9c83ec5e0..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C { uint a; constructor(uint x) { a = x; } }
-contract A is C { constructor() C(2) { assert(a == 2); } }
-contract B is C { constructor() C(3) { assert(a == 3); } }
-contract J is C { constructor() C(3) { assert(a == 4); } }
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (211-225): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
deleted file mode 100644
index 9e79ebfbb673..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B is C {
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-contract A is B {
-	constructor(uint x) B(x) C(x + 2) {
-		assert(a == x);
-		assert(a == x + 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (171-176): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (200-218): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
deleted file mode 100644
index 3cefaa78af42..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B is C {
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-contract A is B {
-	constructor(uint x) C(x + 2) B(x + 1) {
-		assert(a == x + 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (166-171): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (175-180): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
deleted file mode 100644
index 44ccc2b74e7b..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B1 is C {
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-contract B2 is C {
-	constructor(uint x) C(x + 2) {
-		a = x;
-	}
-}
-
-contract A is B2, B1 {
-	constructor(uint x) B2(x) B1(x) {
-		assert(a == x);
-		assert(a == x + 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (168-173): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (270-288): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
deleted file mode 100644
index d826bc38792e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B1 is C {
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-contract B2 is C {
-	constructor(uint x) C(x + 2) {
-		a = x;
-	}
-}
-
-contract A is B2, B1 {
-	constructor(uint x) B1(x) B2(x) {
-		assert(a == x);
-		assert(a == x + 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (168-173): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (270-288): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
deleted file mode 100644
index 593a2ae7d145..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B1 is C {
-	uint b1;
-	constructor(uint x) {
-		b1 = x + a;
-	}
-}
-
-contract B2 is C {
-	uint b2;
-	constructor(uint x) C(x + 2) {
-		b2 = x + a;
-	}
-}
-
-contract A is B2, B1 {
-	constructor(uint x) B2(x) B1(x) {
-		assert(b1 == b2);
-		assert(b1 != b2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (193-198): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (209-214): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (302-318): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
deleted file mode 100644
index bf1c0ee604de..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract B is C {
-}
-
-contract B2 is C {
-}
-
-contract A is B, B2 {
-	constructor(uint x) {
-		assert(a == 2);
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (132-138): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (162-176): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol
deleted file mode 100644
index 57a0f40d7bd0..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract B is C {
-}
-
-contract B2 is C {
-	constructor() {
-		assert(a == 2);
-	}
-}
-
-contract A is B, B2 {
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
deleted file mode 100644
index 113e80dab24c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract F {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract E is F {}
-contract D is E {}
-contract C is D {}
-contract B is C {}
-
-contract A is B {
-	constructor(uint x) {
-		assert(a == 2);
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (162-168): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (192-206): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
deleted file mode 100644
index 8c6ca28e3715..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract B is C {
-}
-
-contract A is B {
-	constructor(uint x) B() {
-		assert(a == 2);
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (106-112): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (140-154): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol
deleted file mode 100644
index f2f6297b2e7e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract B is C {
-}
-
-contract A is B {
-	constructor(uint x) {
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (106-112): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (118-132): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
deleted file mode 100644
index 75d5efb42ce3..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract F {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract E is F {}
-contract D is E {
-	constructor() {
-		a = 3;
-	}
-}
-contract C is D {}
-contract B is C {
-	constructor() {
-		a = 4;
-	}
-}
-
-contract A is B {
-	constructor(uint x) {
-		assert(a == 4);
-		assert(a == 5);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (222-228): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (252-266): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol
deleted file mode 100644
index 4eac4fe97904..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract F {
-	uint a;
-	constructor() {
-		a = 2;
-	}
-}
-
-contract E is F {}
-contract D is E {
-	constructor() {
-		a = 3;
-	}
-}
-contract C is D {}
-contract B is C {
-	constructor() {
-		assert(a == 3);
-		a = 4;
-	}
-}
-
-contract A is B {
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
deleted file mode 100644
index ea1f31aad531..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract F {
-	uint a;
-	constructor() {
-		uint f = 2;
-		a = f;
-	}
-}
-
-contract E is F {}
-contract D is E {
-	constructor() {
-		uint d = 3;
-		a = d;
-	}
-}
-contract C is D {}
-contract B is C {
-	constructor() {
-		uint b = 4;
-		a = b;
-	}
-}
-
-contract A is B {
-	constructor(uint x) {
-		uint a1 = 4;
-		uint a2 = 5;
-		assert(a == a1);
-		assert(a == a2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (264-270): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (325-340): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
deleted file mode 100644
index 2d49cd1e3871..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract F {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract E is F {}
-abstract contract D is E {
-	constructor() {
-		a = 3;
-	}
-}
-abstract contract C is D {}
-contract B is C {
-	constructor(uint x) F(x + 1) {
-	}
-}
-
-contract A is B {
-	constructor(uint x) B(x) {
-		assert(a == 3);
-		assert(a == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (215-220): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (296-310): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
deleted file mode 100644
index 383392c632c6..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract F {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract E is F {}
-abstract contract D is E {
-	constructor() {
-		a = 3;
-	}
-}
-abstract contract C is D {}
-contract B is C {
-	constructor() F(1) {
-		assert(a == 3);
-		assert(a == 2);
-	}
-}
-
-contract A is B {
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (234-248): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol
deleted file mode 100644
index 951d006ec460..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint a;
-	modifier n { _; a = 7; }
-	constructor(uint x) n {
-		a = x;
-	}
-}
-
-contract A is C {
-	modifier m { a = 5; _; }
-	constructor() C(2) {
-		assert(a == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (156-170): CHC: Assertion violation happens here.\nCounterexample:\na = 7\n\nTransaction trace:\nA.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol
deleted file mode 100644
index 051b89252e53..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-contract A is C {
-	constructor() C(2) {
-		assert(a == 0);
-		assert(C.a == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (102-116): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
-// Warning 6328: (120-136): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol b/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
deleted file mode 100644
index ef0a5467823e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x;
-
-	constructor() {
-		assert(x == 0);
-		x = 10;
-	}
-
-	function f(uint y) public view {
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (108-122): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
deleted file mode 100644
index 1726c89fe895..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	uint x = 5;
-
-	constructor() {
-		assert(x == 5);
-		x = 10;
-	}
-
-	function f(uint y) public view {
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (112-126): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
deleted file mode 100644
index 1fc6e011f0d3..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract B {
-	uint x = 5;
-}
-
-contract C is B {
-	constructor() {
-		assert(x == 5);
-		x = 10;
-	}
-
-	function f(uint y) public view {
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (132-146): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
deleted file mode 100644
index 008338ba81a7..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	uint x = 5;
-
-	constructor(uint a, uint b) {
-		assert(x == 5);
-		x = a + b;
-	}
-
-	function f(uint y) view public {
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (82-87): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (129-143): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_this.sol b/test/libsolidity/smtCheckerTests/functions/constructor_this.sol
deleted file mode 100644
index 28a343b0d5c3..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/constructor_this.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure {}
-    constructor() {
-        C c = this;
-        c.f(); // this does not warn now, but should warn in the future
-        this.f();
-        (this).f();
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5805: (165-169): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
-// Warning 5805: (184-188): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol b/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
deleted file mode 100644
index 32b51d53f9c1..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public {
-        uint a = 3;
-        this.f();
-        assert(a == 3);
-        f();
-        assert(a == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5740: (122-136): Unreachable code.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol b/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol
deleted file mode 100644
index 6ca122aeff5c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint x = f(2);
-
-	function f(uint y) internal pure returns (uint) {
-		assert(y > 1000);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (83-99): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol b/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol
deleted file mode 100644
index 4bb98c7a3937..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract State {
-	C c;
-	function f() public returns (uint) {
-		while(true)
-			c.setOwner();
-	}
-}
-contract C {
-	address owner;
-	function setOwner() public {
-		owner = address(0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (53-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_2.sol b/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_2.sol
deleted file mode 100644
index 937f9b2a657b..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract Other {
-	C c;
-	function h(bool b) public {
-		if (b)
-			c.setOwner(address(0));
-	}
-}
-contract C {
-	address owner;
-	function setOwner(address _owner) public {
-		owner = _owner;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol b/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol
deleted file mode 100644
index 47ace2a9d398..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	uint y;
-
-	function f() public {
-		if (y != 1)
-			g();
-		assert(y == 1);
-	}
-
-	function g() internal {
-		y = 1;
-		h();
-	}
-
-	function h() internal {
-		f();
-		assert(y == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
deleted file mode 100644
index bd74fe1b5215..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint x;
-	function f() internal {
-		require(x < 10000);
-		x = x + 1;
-	}
-	function g(bool b) public {
-		x = 0;
-		if (b)
-			f();
-		// Should fail for `b == true`.
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (176-190): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol
deleted file mode 100644
index 3f45d8b58c8c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint x;
-	function f() internal {
-		require(x < 10000);
-		x = x + 1;
-	}
-	function g(bool b) public {
-		x = 0;
-		if (b)
-			f();
-		else
-			f();
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
deleted file mode 100644
index 0795c832e775..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C
-{
-	uint x;
-	function f() internal {
-		require(x < 10000);
-		x = x + 1;
-	}
-	function g(bool b) public {
-		x = 0;
-		if (b)
-			f();
-		// Should fail for `b == true`.
-		assert(x == 0);
-	}
-	function h(bool b) public {
-		x = 0;
-		if (!b)
-			f();
-		// Should fail for `b == false`.
-		assert(x == 0);
-	}
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (176-190): CHC: Assertion violation happens here.
-// Warning 6328: (288-302): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
deleted file mode 100644
index 0a646d0e5923..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-library L
-{
-	function add(uint x, uint y) internal pure returns (uint) {
-		require(x < 1000);
-		require(y < 1000);
-		return x + y;
-	}
-}
-
-contract C
-{
-	using L for uint;
-	function f(uint x) public pure {
-		uint y = x.add(999);
-		assert(y < 10000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
deleted file mode 100644
index e739aa57c376..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-library L
-{
-	function add(uint x, uint y) internal pure returns (uint) {
-		require(x < 1000);
-		require(y < 1000);
-		return x + y;
-	}
-}
-
-contract C
-{
-	using L for uint;
-	function f(uint x) public pure {
-		uint y = x.add(999);
-		assert(y < 1000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (228-244): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
deleted file mode 100644
index 56090df24cfb..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-abstract contract D
-{
-	function g(uint x) public virtual;
-}
-
-contract C
-{
-	uint x;
-	function f(uint y, D d) public {
-		require(x == y);
-		assert(x == y);
-		d.g(y);
-		// Storage knowledge is cleared after an external call.
-		assert(x == y);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// SMTIgnoreOS: macos
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
deleted file mode 100644
index d3373b62d63a..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract contract D
-{
-	function g(uint x) public virtual;
-}
-
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint y, D d) public {
-		require(map[0] == map[1]);
-		assert(map[0] == map[1]);
-		d.g(y);
-		assert(map[0] == map[1]);
-		assert(map[0] == 0); // should fail
-	}
-
-	function set(uint x) public {
-		map[0] = x;
-		map[1] = x;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
deleted file mode 100644
index 6f80e1e0af02..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-abstract contract D
-{
-	function g(uint x) public virtual;
-}
-
-contract C
-{
-	mapping (uint => uint) storageMap;
-	function f(uint y, D d) public {
-		mapping (uint => uint) storage map = storageMap;
-		require(map[0] == map[1]);
-		assert(map[0] == map[1]);
-		d.g(y);
-		// Storage knowledge is cleared after an external call.
-		assert(map[0] == map[1]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol
deleted file mode 100644
index f5fd59c2f13a..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(uint _x) public pure returns (uint) {
-		return _x;
-	}
-}
-
-contract D
-{
-	C c;
-	function g(uint _y) public view {
-		uint z = c.f(_y);
-		assert(z == _y);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (158-173): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
deleted file mode 100644
index bddefceb9155..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint x;
-	function f() public {
-		x = 0;
-		((inc))();
-		assert(x == 1); // should hold
-	}
-
-	function inc() internal returns (uint) {
-		require(x < 100);
-		return ++x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol
deleted file mode 100644
index 8e491d8dbf3b..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-library L {
-	struct S {
-		uint256[] data;
-	}
-	function f(S memory _s) internal pure returns (uint256) {
-		require(_s.data.length > 0);
-		return 42;
-	}
-}
-
-contract C {
-	using L for L.S;
-	function f() public pure returns (uint256 y) {
-		L.S memory x;
-		y = (x.f)();
-		assert(y == 42); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol
deleted file mode 100644
index 20f0ddcfebe0..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    int[]data;
-
-    function f() public {
-        (data.pop)();
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (63-75): CHC: Empty array "pop" happens here.\nCounterexample:\ndata = []\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
deleted file mode 100644
index 40a023bb47e3..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function h(uint x) public pure returns (uint) {
-		return x;
-	}
-	function g() public pure {
-		uint x;
-		x = h(42);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
deleted file mode 100644
index 414a8a52bca7..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function h(uint x) public pure returns (uint) {
-		return x;
-	}
-	function g() public pure {
-		uint x;
-		x = h(0);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (129-142): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
deleted file mode 100644
index 54d0abaf7543..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function h(uint x) public pure returns (uint) {
-		return k(x);
-	}
-
-	function k(uint x) public pure returns (uint) {
-		return x;
-	}
-	function g() public pure {
-		uint x;
-		x = h(2);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
deleted file mode 100644
index 955f6906ce4e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function h(uint x) public pure returns (uint) {
-		return k(x);
-	}
-
-	function k(uint x) public pure returns (uint) {
-		return x;
-	}
-	function g() public pure {
-		uint x;
-		x = h(0);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (197-210): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call\n        C.k(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
deleted file mode 100644
index e140fdedce29..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function h(uint x) public pure returns (uint) {
-		return x;
-	}
-	function g() public pure {
-		uint x;
-		x = (h)(42);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
deleted file mode 100644
index b511dc63bc02..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function h(uint x) public pure returns (uint) {
-		return x;
-	}
-	function g() public pure {
-		uint x;
-		x = (h)(0);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (131-144): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol
deleted file mode 100644
index a6c1539f56ef..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L
-{
-	function add(uint x, uint y) internal pure returns (uint) {
-		require(x < 1000);
-		require(y < 1000);
-		return x + y;
-	}
-}
-
-contract C
-{
-	function f(uint x) public pure {
-		uint y = L.add(x, 999);
-		assert(y < 10000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
deleted file mode 100644
index 843679a52b8c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-library L
-{
-	function add(uint x, uint y) internal pure returns (uint) {
-		require(x < 1000);
-		require(y < 1000);
-		return x + y;
-	}
-}
-
-contract C
-{
-	function f(uint x) public pure {
-		uint y = L.add(x, 999);
-		assert(y < 1000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (212-228): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
deleted file mode 100644
index 405c3f71507e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-	function value(function()internal a, uint256 b) internal {}
-}
-contract C {
-	using L for function()internal;
-
-	function f() public {
-		function()internal x;
-		x.value(42);
- 	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol b/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
deleted file mode 100644
index 0e3699e6be72..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint a;
-	function g() public {
-		if (a > 0)
-		{
-			a = a - 1;
-			g();
-		}
-		else
-			assert(a == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol b/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
deleted file mode 100644
index 903afbbcd1a3..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint a;
-	function f() public {
-		if (a > 0)
-		{
-			a = a - 1;
-			g();
-		}
-		else
-			assert(a == 0);
-	}
-	function g() public {
-		if (a > 0)
-		{
-			a = a - 1;
-			f();
-		}
-		else
-			assert(a == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
deleted file mode 100644
index 2b6289b95fa9..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	uint a;
-	function f(uint x) public {
-		uint y;
-		a = (y = x);
-	}
-	function g() public {
-		f(1);
-		assert(a > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
deleted file mode 100644
index 3e045cee7036..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint a;
-	function f(uint x) public {
-		uint y;
-		a = (y = x);
-	}
-	function g() public {
-		f(0);
-		assert(a > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (112-125): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
deleted file mode 100644
index 001067a28ad3..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint a;
-	function f(uint x) public {
-		uint y;
-		a = (y = x);
-	}
-	function g() public {
-		f(1);
-		f(42);
-		assert(a > 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
deleted file mode 100644
index 35906db3b991..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint a;
-	function f(uint x) public {
-		uint y;
-		a = (y = x);
-	}
-	function g() public {
-		f(1);
-		f(0);
-		assert(a > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (120-133): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(1) -- internal call\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for_only_call.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for_only_call.sol
deleted file mode 100644
index c8f80ea4b79a..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for_only_call.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { for (;x;) {} }
-	function g() public pure { f(true); }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol
deleted file mode 100644
index da5240aad230..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { require(x); if (x) {} }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (63-64): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol
deleted file mode 100644
index 84fd5c62bce6..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { x = true; require(x); }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (65-66): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require_only_call.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require_only_call.sol
deleted file mode 100644
index e2e6bd85806e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require_only_call.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { require(x); }
-	function g() public pure { f(true); }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while_only_call.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while_only_call.sol
deleted file mode 100644
index 149f0f1c939d..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while_only_call.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { while (x) {} }
-	function g() public pure { f(true); }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/address.sol b/test/libsolidity/smtCheckerTests/functions/getters/address.sol
deleted file mode 100644
index cf8c9158308e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/address.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	address public x;
-	address payable public y;
-
-	function f() public view {
-		address a = this.x();
-		address b = this.y();
-		assert(a == x); // should hold
-		assert(a == address(this)); // should fail
-		assert(b == y); // should hold
-		assert(y == address(this)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (171-197): CHC: Assertion violation happens here.
-// Warning 6328: (249-275): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
deleted file mode 100644
index 658e0b859c53..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint[] public a;
-	constructor() {
-		a.push();
-		a.push();
-		a.push();
-		a.push();
-	}
-	function f() public view {
-		uint y = this.a(2);
-		assert(y == a[2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (187-201): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
deleted file mode 100644
index 2d92413d5e24..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	uint[][] public a;
-	constructor() {
-		a.push();
-		a.push();
-		a.push();
-		a[2].push();
-		a[2].push();
-		a[2].push();
-		a[2].push();
-	}
-	function f() public view {
-		uint y = this.a(2,3);
-		assert(y == a[2][3]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (242-256): CHC: Assertion violation happens here.\nCounterexample:\na = [[], [], [0, 0, 0, 0]]\ny = 0\n\nTransaction trace:\nC.constructor()\nState: a = [[], [], [0, 0, 0, 0]]\nC.f()
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
deleted file mode 100644
index 209b00f5f319..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v1;
-struct Item {
-	uint x;
-	uint y;
-}
-
-contract D {
-	Item[][][] public items;
-
-	function test() public view returns (uint) {
-		(uint a, uint b) = this.items(1, 2, 3);
-		return a + b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
deleted file mode 100644
index b62611b5190d..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder v1;
-struct Item {
-	uint x;
-	uint y;
-}
-
-contract D {
-	Item[] public items;
-
-	function test() public {
-		delete items;
-		items.push(Item(42, 43));
-		(uint a, uint b) = this.items(0);
-		assert(a == 42); // should hold
-		assert(b == 43); // should hold
-		assert(b == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (267-281): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43}]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
deleted file mode 100644
index abe50e8a5445..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma abicoder v1;
-struct Item {
-	uint x;
-	uint y;
-	uint[] arr;
-}
-
-contract D {
-	Item[] public items;
-
-	function test() public {
-		delete items;
-		uint[] memory tmp = new uint[](1);
-		items.push(Item(42, 43, tmp));
-		(uint a, uint b) = this.items(0);
-		assert(a == 42); // should hold
-		assert(b == 43); // should hold
-		assert(b == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (322-336): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol b/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
deleted file mode 100644
index 63522d6106f2..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	bytes public str2 = 'c';
-
-	function f() public view {
-		bytes memory a2 = this.str2();
-		assert(keccak256(a2) == keccak256(str2)); // should hold
-		assert(keccak256(a2) == keccak256('a')); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (162-201): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/contract.sol b/test/libsolidity/smtCheckerTests/functions/getters/contract.sol
deleted file mode 100644
index 7da893bd3644..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/contract.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract D {}
-
-contract C {
-	D public d;
-
-	function f() public view {
-		D e = this.d();
-		assert(e == d); // should hold
-		assert(address(e) == address(this)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (123-158): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol b/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
deleted file mode 100644
index 844773ba5398..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	struct S {
-		uint u;
-	}
-
-	S public s;
-
-	function f() public view {
-		uint u = this.s();
-		uint v = this.s();
-		assert(u == s.u); // should hold
-		assert(u == v); // should hold
-		assert(u == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (193-207): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/enum.sol b/test/libsolidity/smtCheckerTests/functions/getters/enum.sol
deleted file mode 100644
index fabe444506ba..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/enum.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-
-contract C {
-	enum ActionChoices { GoLeft, GoRight, GoStraight, SitStill }
-	ActionChoices public choice;
-
-	function f() public view {
-		ActionChoices e = this.choice();
-		assert(e == choice); // should hold
-		assert(e == ActionChoices.SitStill); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (210-245): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
deleted file mode 100644
index 31397eedf385..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract D {
-	uint public d;
-	function g() public {
-		++d;
-	}
-}
-
-contract C {
-	function f() public {
-		D a = new D();
-		assert(a.d() == 0); // should hold
-		a.g();
-		assert(a.d() == 1); // should hold
-		assert(a.d() == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (203-221): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
deleted file mode 100644
index ad8ddcd022c5..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract E {
-	uint public e;
-	function setE(uint _e) public {
-		e = _e;
-	}
-}
-
-contract D {
-	E e;
-	constructor(E _e) {
-		e = _e;
-	}
-	function setE(uint x) public {
-		e.setE(x);
-	}
-}
-
-contract C {
-	function f() public {
-		E e = new E();
-		D d = new D(e);
-		assert(e.e() == 0); // should hold
-		d.setE(42);
-		assert(e.e() == 42); // should hold
-		assert(e.e() == 2); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTTargets: assert
-// ----
-// Warning 6328: (344-362): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
deleted file mode 100644
index f23af4f3261d..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	uint public x;
-
-	function f() public {
-		x = 2;
-		x = 3;
-		uint y = this.x();
-		assert(y == 3); // should hold
-		assert(y == 2); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// SMTTargets: assert
-// ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
deleted file mode 100644
index 0673b14ab0a5..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint public x;
-
-	function f() public {
-		x = 2;
-		x = 3;
-		C c = this;
-		uint y = c.x();
-		assert(y == 3); // should hold
-		assert(y == 2); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTExtCalls: trusted
-// SMTIgnoreCex: yes
-// SMTTargets: assert
-// ----
-// Warning 6328: (138-152): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol b/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
deleted file mode 100644
index 6edf2a88c48a..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	bytes1 public x;
-	bytes3 public y;
-
-	function f() public view {
-		bytes1 a = this.x();
-		bytes3 b = this.y();
-		assert(a == x); // should hold
-		assert(a == 'a'); // should fail
-		assert(b == y); // should hold
-		assert(y == "abc"); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (159-175): CHC: Assertion violation happens here.
-// Warning 6328: (227-245): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/function.sol b/test/libsolidity/smtCheckerTests/functions/getters/function.sol
deleted file mode 100644
index a5339f7a8926..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/function.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function () external returns (uint) public g;
-
-	function f() public {
-		g = this.X;
-		function () external returns (uint) e = this.g();
-		assert(e() == g()); // should hold, but fails because of the lack of support for tracking function pointers
-		assert(e() == 1); // should fail
-	}
-
-	function X() public pure returns (uint) {
-		return 42;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8364: (140-146): Assertion checker does not yet implement type function () view external returns (function () external returns (uint256))
-// Warning 6328: (152-170): CHC: Assertion violation happens here.
-// Warning 6328: (262-278): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_1.sol
deleted file mode 100644
index 44aac8a3be64..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	struct S {
-		string a;
-		uint256 y;
-	}
-	S public s;
-	function g() public view returns (uint256) {
-		this.s();
-	}
-}
-// ====
-// SMTEngine: all
-// EVMVersion: <=spuriousDragon
-// ----
-// Warning 6321: (101-108): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_2.sol
deleted file mode 100644
index 81a2fc6b4596..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f() public returns(bool[]memory) {
-		this.f();
-	}
-}
-// ====
-// SMTEngine: all
-// EVMVersion: <=spuriousDragon
-// ----
-// Warning 6321: (42-54): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_3.sol
deleted file mode 100644
index ca790a614754..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	struct S {
-		string a;
-	}
-	S public s;
-	function g() public view returns (uint256) {
-		this.s();
-	}
-}
-// ====
-// SMTEngine: all
-// EVMVersion: <=spuriousDragon
-// ----
-// Warning 6321: (88-95): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_4.sol
deleted file mode 100644
index 3e5ba016e8cb..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/inaccessible_dynamic_type_4.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	string public s;
-	function g() public view returns (uint256) {
-		this.s();
-	}
-}
-// ====
-// SMTEngine: all
-// EVMVersion: <=spuriousDragon
-// ----
-// Warning 6321: (66-73): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
deleted file mode 100644
index 4dbd6a489a46..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	mapping (uint => uint) public map;
-
-	function f() public view {
-		uint y = this.map(2);
-		assert(y == map[2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (142-156): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
deleted file mode 100644
index 418515a20889..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	mapping (uint => mapping (uint => uint)) public map;
-
-	function f() public view {
-		uint y = this.map(2, 3);
-		assert(y == map[2][3]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
deleted file mode 100644
index b78f44d5c755..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	mapping (bytes16 => uint) public m;
-
-	function f() public view {
-		uint y = this.m("foo");
-		assert(y == m["foo"]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (147-161): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
deleted file mode 100644
index 6e221e6547a0..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	mapping (uint => uint[]) public m;
-
-	constructor() {
-		m[0].push();
-		m[0].push();
-		m[0][1] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1);
-		assert(y == m[0][1]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (210-224): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
deleted file mode 100644
index ce840d7d90a4..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	mapping (uint => uint[])[] public m;
-
-	constructor() {
-		m.push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1][2] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2);
-		assert(y == m[0][1][2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (256-270): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
deleted file mode 100644
index 934eb854292c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	mapping (uint => uint[][]) public m;
-
-	constructor() {
-		m[0].push();
-		m[0].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1][2] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2);
-		assert(y == m[0][1][2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (274-288): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
deleted file mode 100644
index 8471d6f26e4b..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	mapping (uint => uint[][][]) public m;
-
-	constructor() {
-		m[0].push();
-		m[0].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2][3] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2,3);
-		assert(y == m[0][1][2][3]); // should hold
-		// Disabled because of Spacer seg fault
-		//assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 18 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
deleted file mode 100644
index 3e0f0b63fa0f..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	mapping (uint => mapping (uint => uint[])) public m;
-
-	constructor() {
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1][2] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2);
-		assert(y == m[0][1][2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (260-274): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
deleted file mode 100644
index 17c280e0401b..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	mapping (uint => mapping (uint => uint[][])) public m;
-
-	constructor() {
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2][3] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2,3);
-		assert(y == m[0][1][2][3]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (354-368): CHC: Assertion violation happens here.
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
deleted file mode 100644
index 08af1f555801..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	mapping (uint => mapping (uint => mapping (uint => uint[]))) public m;
-
-	constructor() {
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2].push();
-		m[0][1][2][3] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2,3);
-		assert(y == m[0][1][2][3]); // should hold
-		// Disabled because Spacer seg faults
-		//assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
deleted file mode 100644
index d22fe68d4ab0..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	mapping (uint => uint)[] public m;
-
-	constructor() {
-		m.push();
-		m[0][1] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1);
-		assert(y == m[0][1]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (192-206): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
deleted file mode 100644
index d57591c739f5..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	mapping (uint => uint)[][] public m;
-
-	constructor() {
-		m.push();
-		m[0].push();
-		m[0].push();
-		m[0][1][2] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2);
-		assert(y == m[0][1][2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (232-246): CHC: Assertion violation happens here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
deleted file mode 100644
index 8bb9f9fb723d..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	mapping (uint => mapping (uint => uint))[] public m;
-
-	constructor() {
-		m.push();
-		m[0][1][2] = 42;
-	}
-
-	function f() public view {
-		uint y = this.m(0,1,2);
-		assert(y == m[0][1][2]); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (218-232): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
deleted file mode 100644
index a7b057beecce..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-
-contract C {
-
-	uint[2] public x = [42,1];
-
-	function f() public view {
-		assert(this.x(0) == x[0]); // should hold
-		assert(this.x(1) == x[1]); // should hold
-		assert(this.x(0) == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (162-184): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/string.sol b/test/libsolidity/smtCheckerTests/functions/getters/string.sol
deleted file mode 100644
index 9649372f72d1..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/string.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	string public str1 = 'b';
-
-	function f() public view {
-		string memory a1 = this.str1();
-		assert(keccak256(bytes(a1)) == keccak256(bytes(str1))); // should hold
-		assert(keccak256(bytes(a1)) == keccak256('a')); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (178-224): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
deleted file mode 100644
index 06c021706bd5..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	struct T {
-		uint t;
-	}
-	struct S {
-		uint x;
-		T t;
-		bool b;
-		uint[] a;
-	}
-
-	S public s;
-
-	function f() public view {
-		uint y;
-		bool c;
-		T memory t;
-		(y,t,c) = this.s();
-		assert(y == s.x); // this should hold
-		assert(c == s.b); // this should hold
-		assert(t.t == s.t.t); // this should hold
-		assert(c == true); // this should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (338-355): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0, t: {t: 0}, b: false, a: []}\ny = 0\nc = false\nt = {t: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0, t: {t: 0}, b: false, a: []}\nC.f()
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
deleted file mode 100644
index b43df21fcb9c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-//pragma abicoder v2;
-
-contract C {
-	struct S {
-		uint[2] a;
-		uint u;
-	}
-
-	S public s;
-
-	function f() public view {
-		uint u = this.s();
-		assert(u == s.u); // should hold
-		assert(u == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (175-189): CHC: Assertion violation happens here.\nCounterexample:\ns = {a: [0, 0], u: 0}\nu = 0\n\nTransaction trace:\nC.constructor()\nState: s = {a: [0, 0], u: 0}\nC.f()
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
deleted file mode 100644
index ea68e0485d97..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	struct S {
-		string s;
-		bytes b;
-	}
-
-	S public m;
-
-	constructor() {
-		m.s = "foo";
-		m.b = "bar";
-	}
-
-	function f() public view {
-		(string memory s, bytes memory b) = this.m();
-		assert(keccak256(bytes(s)) == keccak256(bytes(m.s))); // should hold
-		assert(b[0] == m.b[0]); // should hold
-		assert(b[0] == "t"); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (307-326): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
deleted file mode 100644
index 345959354fb4..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract D {
-}
-
-contract C {
-	struct S {
-		D d;
-		function () external returns (uint) f;
-	}
-
-	S public s;
-
-	function test() public view {
-		(D d, function () external returns (uint) f) = this.s();
-		assert(d == s.d); // should hold
-		assert(address(d) == address(this)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (146-183): Unused local variable.
-// Warning 8364: (187-193): Assertion checker does not yet implement type function () view external returns (contract D,function () external returns (uint256))
-// Warning 6328: (234-269): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
deleted file mode 100644
index a322f4fb41ac..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		bool b;
-	}
-
-	S public s;
-
-	constructor() {
-		s.x = 1;
-		s.b = false;
-	}
-
-	function f() public {
-		uint x;
-		bool b;
-		(x,b) = this.s();
-		assert(x == s.x); // this should hold
-		assert(b == s.b); // this should hold
-		assert(b == true); // this should fail
-		s.x = 42;
-		(uint y, bool c) = this.s();
-		assert(c == b); // this should hold
-		assert(y == x); // this should fail
-
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (255-272): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 1, b: false}\nx = 1\nb = false\ny = 0\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
-// Warning 6328: (377-391): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 42, b: false}\nx = 1\nb = false\ny = 42\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
deleted file mode 100644
index d05753dd7c54..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint public x;
-
-	function f() public view {
-		uint y = this.x();
-		assert(y == x); // should hold
-		assert(y == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (114-128): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol
deleted file mode 100644
index 2907a7e227c2..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function c() public pure returns (uint) { return 42; }
-}
-
-contract B is C {
-	function b() public pure returns (uint) { return c(); }
-}
-
-contract A is B {
-	uint public x;
-
-	function a() public {
-		x = b();
-		assert(x < 40);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (221-235): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.a()\n    B.b() -- internal call\n        C.c() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init.sol
deleted file mode 100644
index 77c5e4b16845..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-	bool b = (f() == 0) && (f() == 0);
-	function f() internal returns (uint) {}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
deleted file mode 100644
index 4a8ed0d7184d..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract c {
-	uint x;
-	function f() internal returns (uint) {
-		x = x + 1;
-	}
-	bool b = (f() > 0) || (f() > 0);
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (54-58): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
deleted file mode 100644
index f42bdb7dc3f5..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C{
-    uint x;
-	constructor(uint y) {
-		assert(x == 0);
-		x = 1;
-	}
-    function f() public {
-		assert(x == 1);
-		++x;
-		g();
-		assert(x == 1);
-    }
-
-	function g() internal {
-		assert(x == 2);
-		--x;
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
deleted file mode 100644
index 1aaa973f3ab2..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C{
-    uint x;
-	constructor(uint y) {
-		assert(x == 1);
-		x = 1;
-	}
-    function f() public {
-		assert(x == 2);
-		++x;
-		g();
-		assert(x == 2);
-    }
-
-	function g() internal {
-		assert(x == 3);
-		--x;
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (49-63): CHC: Assertion violation happens here.
-// Warning 6328: (105-119): CHC: Assertion violation happens here.
-// Warning 6328: (137-151): CHC: Assertion violation happens here.
-// Warning 6328: (187-201): CHC: Assertion violation happens here.
-// Warning 6328: (212-226): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol
deleted file mode 100644
index 3ad9aa488085..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-	uint x;
-	function f() internal {
-		assert(x == 1);
-		--x;
-	}
-}
-
-contract C is A {
-	constructor() {
-		assert(x == 0);
-		++x;
-		f();
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
deleted file mode 100644
index 9f2fca60cefb..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-	uint x;
-	function f() internal {
-		assert(x == 2);
-		--x;
-	}
-}
-
-contract C is A {
-	constructor() {
-		assert(x == 1);
-		++x;
-		f();
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (49-63): CHC: Assertion violation happens here.
-// Warning 6328: (115-129): CHC: Assertion violation happens here.
-// Warning 6328: (147-161): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
deleted file mode 100644
index e7e6ec61ce21..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C{
-    uint x;
-	constructor(uint y) {
-		assert(x == 0);
-		x = 1;
-	}
-    function f() public {
-		assert(x == 1);
-		++x;
-		++x;
-		g();
-		g();
-		assert(x == 1);
-    }
-
-	function g() internal {
-		--x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
deleted file mode 100644
index 34d793d0677e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C{
-    uint x;
-	constructor(uint y) {
-		assert(x == 1);
-		x = 1;
-	}
-    function f() public {
-		assert(x == 2);
-		++x;
-		++x;
-		g();
-		g();
-		assert(x == 3);
-    }
-
-	function g() internal {
-		--x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (49-63): CHC: Assertion violation happens here.
-// Warning 6328: (105-119): CHC: Assertion violation happens here.
-// Warning 6328: (151-165): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol b/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
deleted file mode 100644
index 7fe00f5724cc..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function g(uint y) public {
-		uint z = L.f(y);
-		assert(z == y);
-	}
-}
-
-library L {
-	function f(uint x) internal returns (uint) {
-		return x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2018: (98-157): Function state mutability can be restricted to pure
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_constant.sol b/test/libsolidity/smtCheckerTests/functions/library_constant.sol
deleted file mode 100644
index 53349f0b6c30..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/library_constant.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library l1 {
-
-	uint private constant TON = 1000;
-	function f1() public pure {
-		assert(TON == 1000);
-		assert(TON == 2000);
-	}
-	function f2(uint x, uint y) internal pure returns (uint) {
-		return x + y;
-	}
-}
-
-contract C {
-	function f(uint x) public pure {
-		uint z = l1.f2(x, 1);
-		assert(z == x + 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (103-122): CHC: Assertion violation happens here.
-// Warning 4984: (196-201): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol b/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol
deleted file mode 100644
index bfa260301d95..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library l1 {
-
-	uint private constant TON = 1000;
-	function f1() public pure {
-		assert(TON == 1000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol b/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol
deleted file mode 100644
index fd763b8c5555..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-library L {
-    function f1(uint x) public pure {
-        assert(x > 0); // should fail
-    }
-    function f(uint x) internal pure { f1(x); }
-}
-
-contract C {
-    function g(uint x) external pure {
-        // This should trigger the assertion failure
-        // since it calls `f` internally, which calls
-        // `f1` internally.
-        return L.f(x);
-    }
-
-    function h(uint x) external pure {
-        // This should not trigger the assertion failure
-        // since it delegatecalls and that's not supported.
-        return L.f1(x);
-    }
-}
-// ====
-// SMTContract: C
-// ----
-// Warning 4588: (533-540): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (58-71): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    L.f(0) -- internal call\n        L.f1(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol b/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol
deleted file mode 100644
index c0c62c246859..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-library L {
-    function f1(uint x) public pure {
-        assert(x > 0); // should fail
-    }
-    function f() internal pure {
-        f1(0); // should cause the assertion in `f1` to fail
-    }
-    function g() internal pure {
-        f1(1); // should not cause the assertion in `f1` to fail
-    }
-}
-
-contract C {
-    function f() external pure {
-        return L.f(); // should cause the assertion to fail
-    }
-    function g() external pure {
-        return L.g(); // should not cause the assertion to fail
-    }
-}
-// ====
-// SMTContract: C
-// ----
-// Warning 6328: (58-71): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()\n    L.f() -- internal call\n        L.f1(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_1.sol b/test/libsolidity/smtCheckerTests/functions/payable_1.sol
deleted file mode 100644
index c17691fa59ac..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/payable_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function g() external {
-		f();
-	}
-
-	function h() external payable {
-		f();
-	}
-
-	function f() internal {
-		require(msg.value == 0);
-	}
-}
-// ====
-// SMTEngine: all
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_2.sol b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
deleted file mode 100644
index 2a381fd4f907..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/payable_2.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	function g() external {
-		f();
-		h();
-		i();
-	}
-
-	function g2() external payable {
-		i();
-	}
-
-	function f() internal {
-		require(msg.value == 0);
-	}
-
-	function h() internal {
-		assert(msg.value == 0); // should hold
-	}
-
-	function i() internal {
-		assert(msg.value == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (261-283): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/recursive_multi_return.sol b/test/libsolidity/smtCheckerTests/functions/recursive_multi_return.sol
deleted file mode 100644
index 1f353e4d087b..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/recursive_multi_return.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function g() public pure returns (uint, uint) {
-		uint a;
-		uint b;
-		(a, b) = g();
-	}
-}
-//
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol b/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol
deleted file mode 100644
index 98b239761b77..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract c { function f() public pure {22237625-86535-0+1;
-    555565-3*51;
-}
-}contract C {
-	function g() public pure returns (
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-int, uint, bytes14) {
-		uint
-a;
-		uint b;
-		(,,,,,,,a,b,,,,) = g();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (39-57): Statement has no effect.
-// Warning 6133: (63-74): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
deleted file mode 100644
index e0b191573307..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract A {
-	int x = 0;
-
-	function f() virtual internal {
-		x = 2;
-	}
-
-	function proxy() public {
-		f();
-	}
-}
-
-contract C is A {
-	function f() internal virtual override {
-		super.f();
-		assert(x == 2);
-		assert(x == 3); // should fail
-	}
-}
-
-contract D is C {
-
-	function f() internal override {
-		super.f();
-		assert(x == 2);
-		assert(x == 3); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (205-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call\n        A.f() -- internal call
-// Warning 6328: (328-342): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.proxy()\n    D.f() -- internal call\n        C.f() -- internal call\n            A.f() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call.sol
deleted file mode 100644
index c079ba49ed3f..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	uint x;
-	function f(uint y) public {
-		x = y;
-	}
-	function g(uint y) public {
-		require(y < 1000);
-		this.f(y);
-		assert(x < 1000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
deleted file mode 100644
index 7d7064c97f3e..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint a;
-    function f(uint x) public {
-        this.g(x);
-        assert(a == x);
-        assert(a != 42);
-    }
-
-    function g(uint x) public {
-        a = x;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (108-123): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol
deleted file mode 100644
index 06ba5dd45524..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint x;
-	function f(uint y) public returns (uint) {
-		x = y;
-		return x;
-	}
-	function g(uint y) public {
-		require(y < 1000);
-		uint z = this.f(y);
-		assert(z < 1000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
deleted file mode 100644
index 4907a7402b57..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    address lastCaller;
-
-    constructor() {
-        lastCaller = msg.sender;
-    }
-
-    modifier log {
-        lastCaller = msg.sender;
-        _;
-    }
-
-    function test() log public {
-        assert(lastCaller == msg.sender);
-        this.g();
-        assert(lastCaller == address(this));
-        assert(lastCaller == msg.sender);
-        assert(lastCaller == address(0));
-    }
-
-    function g() log public {
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (314-346): CHC: Assertion violation happens here.
-// Warning 6328: (356-388): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol
deleted file mode 100644
index 6b07cf2d3c4a..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-
-	function test() view public {
-		require(address(this) != tx.origin);
-		assert(!this.g());
-	}
-
-	function g() view public returns (bool) {
-		return msg.sender == tx.origin;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_state.sol b/test/libsolidity/smtCheckerTests/functions/this_state.sol
deleted file mode 100644
index dec101060d8c..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/this_state.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-    uint public x;
-    function g() public {
-		x = 0;
-        this.h();
-		assert(x == 2);
-    }
-    function h() public {
-        x = 2;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
deleted file mode 100644
index d39aaad5f9a1..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-    int x = 0;
-
-    function f() virtual internal view {
-        assert(x == 0);
-    }
-
-    function proxy() public view {
-        f();
-    }
-}
-
-contract C is A {
-
-    function f() internal view override {
-        assert(x == 1);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (227-241): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
deleted file mode 100644
index b4deddc7ce1d..000000000000
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract A {
-    uint public x;
-    function v() internal virtual {
-        x = 2;
-    }
-    constructor() {
-        v();
-    }
-	function i() public view virtual {
-		assert(x == 2); // should hold
-		assert(x == 10); // should fail
-	}
-}
-
-contract C is A {
-    function v() internal override {
-        x = 10;
-    }
-	function i() public view override {
-		assert(x == 10); // should hold
-		assert(x == 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (199-214): CHC: Assertion violation happens here.
-// Warning 6328: (387-401): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
deleted file mode 100644
index 7675bc42ea8c..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-==== Source: ExtCall.sol ====
-interface Unknown {
-    function callme() external;
-}
-
-contract ExtCall {
-    uint x;
-
-    bool lock;
-    modifier mutex {
-        require(!lock);
-        lock = true;
-        _;
-        lock = false;
-    }
-
-    function setX(uint y) mutex public {
-        x = y;
-    }
-
-    function xMut(Unknown u) public {
-        uint x_prev = x;
-        u.callme();
-        assert(x_prev == x);
-    }
-}
-==== Source: ExtCall.t.sol ====
-import "ExtCall.sol";
-
-contract ExtCallTest {
-    ExtCall call;
-
-    function setUp() public {
-        call = new ExtCall();
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (ExtCall.sol:362-381): CHC: Assertion violation happens here.
-// Warning 8729: (ExtCall.t.sol:110-123): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
diff --git a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
deleted file mode 100644
index a98ba962a7bf..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-==== Source: a.sol ====
-contract A {
-	uint x;
-}
-==== Source: b.sol ====
-import "a.sol";
-contract B is A {
-	function g() public view { assert(x > x); }
-}
-==== Source: c.sol ====
-import "b.sol";
-contract C is B {
-	function h(uint x) public pure { assert(x < x); }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: smtlib2
-// ----
-// Warning 6328: (b.sol:62-75): CHC: Assertion violation might happen here.
-// Warning 3996: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-// Warning 7812: (b.sol:62-75): BMC: Assertion violation might happen here.
-// Warning 8084: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
-// Warning 6328: (c.sol:68-81): CHC: Assertion violation might happen here.
-// Warning 3996: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-// Warning 7812: (c.sol:68-81): BMC: Assertion violation might happen here.
-// Warning 8084: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
deleted file mode 100644
index cd9a647619d7..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-import "s1.sol" as M;
-contract D is M.C {
-	function f(uint _y) public {
-		g(_y);
-		assert(x == _y); // should hold
-		assert(x > 100); // should fail
-	}
-}
-==== Source: s1.sol ====
-contract C {
-	uint x;
-	function g(uint _x) public {
-		x = _x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (A:117-132): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
deleted file mode 100644
index 1298f1f09762..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: A ====
-import "s1.sol" as M;
-function f(uint _x) pure {
-	assert(_x > 0);
-}
-contract D {
-	function g(uint _y) public pure {
-		M.f(200); // should hold
-		M.f(_y); // should fail
-		f(10); // should hold
-		f(_y); // should fail
-	}
-}
-==== Source: s1.sol ====
-function f(uint _x) pure {
-	assert(_x > 100);
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (A:50-64): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call\n    A:f(10) -- internal call\n    A:f(0) -- internal call
-// Warning 6328: (s1.sol:28-44): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_base.sol b/test/libsolidity/smtCheckerTests/imports/import_base.sol
deleted file mode 100644
index 3e8aeefe4845..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/import_base.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-==== Source: base ====
-contract Base {
-	uint x;
-	address a;
-	function f() internal returns (uint) {
-		a = address(this);
-		++x;
-		return 2;
-	}
-}
-==== Source: der ====
-import "base";
-contract Der is Base {
-	function g(uint y) public {
-		require(x < 10); // added to restrict the search space and avoid non-determinsm in Spacer
-		x += f();
-		assert(y > x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (der:173-186): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol b/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol
deleted file mode 100644
index 6e9621b30e27..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: Address.sol ====
-pragma solidity ^0.8.0;
-function s() pure {}
-==== Source: ERC20.sol ====
-pragma solidity ^0.8.0;
-
-import "./Address.sol";
-
-function sub(uint256 a, uint256 b) pure returns (uint256) {
-    return a - b;
-}
-
-contract ERC20 {
-    mapping (address => uint256) private _balances;
-
-    function transferFrom(uint256 amount) public view {
-        sub(_balances[msg.sender], amount);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 3944: (ERC20.sol:121-126): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\namount = 1\n\nTransaction trace:\nERC20.constructor()\nERC20.transferFrom(1){ msg.sender: 0x52f6 }\n    ERC20.sol:sub(0, 1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_library.sol b/test/libsolidity/smtCheckerTests/imports/import_library.sol
deleted file mode 100644
index 7c3a32e10a2f..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/import_library.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: c ====
-import "lib";
-contract C {
-	function g(uint x) public pure {
-		uint y = L.f();
-		assert(x > y);
-	}
-}
-==== Source: lib ====
-library L {
-	uint constant one = 1;
-	function f() internal pure returns (uint) {
-		return one;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (c:81-94): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 1\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    L.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
deleted file mode 100644
index a1c3160ea23a..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-==== Source: Address.sol ====
-pragma solidity ^0.8.0;
-library Address { function s() internal pure {} }
-==== Source: ERC20.sol ====
-pragma solidity ^0.8.0;
-
-import "./Address.sol";
-
-library SafeMath {
-    function sub(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a - b;
-    }
-}
-
-contract ERC20 {
-    using SafeMath for uint256;
-    using Address for address;
-
-    mapping (address => uint256) private _balances;
-
-    function transferFrom(uint256 amount) public view {
-        _balances[msg.sender].sub(amount);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 3944: (ERC20.sol:157-162): CHC: Underflow (resulting value less than 0) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol b/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol
deleted file mode 100644
index cd9e2e27ea53..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-==== Source: A.sol ====
-contract A {
-	uint x;
-	function f(uint _x) public {
-		x = _x;
-	}
-}
-==== Source: B.sol ====
-import "A.sol";
-contract B is A {
-	function g(uint _x) public view {
-		assert(_x > x);
-	}
-}
-==== Source: C.sol ====
-import "B.sol";
-contract C is B {
-	function h(uint _x) public view {
-		assert(_x < x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (B.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
-// Warning 6328: (C.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
diff --git a/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol b/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol
deleted file mode 100644
index cd9e2e27ea53..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-==== Source: A.sol ====
-contract A {
-	uint x;
-	function f(uint _x) public {
-		x = _x;
-	}
-}
-==== Source: B.sol ====
-import "A.sol";
-contract B is A {
-	function g(uint _x) public view {
-		assert(_x > x);
-	}
-}
-==== Source: C.sol ====
-import "B.sol";
-contract C is B {
-	function h(uint _x) public view {
-		assert(_x < x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (B.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
-// Warning 6328: (C.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
diff --git a/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol b/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol
deleted file mode 100644
index afe8b1bb3261..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-==== Source: A.sol ====
-contract A {
-	uint x;
-	function f(uint _x) public {
-		x = _x;
-	}
-}
-==== Source: B.sol ====
-import "A.sol";
-contract B is A {
-	function g(uint _x) public view {
-		assert(_x > x);
-	}
-}
-==== Source: C.sol ====
-import "A.sol";
-contract C is A {
-	function h(uint _x) public view {
-		assert(_x < x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (B.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
-// Warning 6328: (C.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
diff --git a/test/libsolidity/smtCheckerTests/imports/private_vars.sol b/test/libsolidity/smtCheckerTests/imports/private_vars.sol
deleted file mode 100644
index 5604e7d595a9..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/private_vars.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: ERC20.sol ====
-contract ERC20 {
-    uint256 private a;
-    function f() internal virtual {
-        a = 2;
-    }
-}
-==== Source: Token.sol ====
-import "ERC20.sol";
-contract Token is ERC20 {
-    constructor() {
-      f();
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/imports/simple.sol b/test/libsolidity/smtCheckerTests/imports/simple.sol
deleted file mode 100644
index 21ac31c071fa..000000000000
--- a/test/libsolidity/smtCheckerTests/imports/simple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: A.sol ====
-contract A { function f() public {} }
-==== Source: B.sol ====
-import "A.sol";
-contract C is A {}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
deleted file mode 100644
index 6ecfed7914a6..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract B {
-	uint x;
-	function f() public view {
-		assert(x == 0);
-	}
-}
-
-contract C is B {
-	uint y;
-	function g() public {
-		x = 1;
-		f();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
deleted file mode 100644
index 85e2677f782a..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract A {
-	uint x;
-	function f() internal view {
-		assert(x == 0);
-	}
-}
-
-contract B is A {
-	uint a;
-	uint b;
-}
-
-contract C is B {
-	uint y;
-	uint z;
-	uint w;
-	function g() public {
-		x = 1;
-		f();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (54-68): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, z = 0, w = 0, a = 0, b = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, z = 0, w = 0, a = 0, b = 0, x = 0\nC.g()\n    A.f() -- internal call
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
deleted file mode 100644
index f1481197f11f..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract A {
-	uint x;
-	function f() internal virtual {
-		v();
-		assert(x == 0); // should fail
-		assert(x == 2); // should hold
-	}
-	function v() internal virtual {
-		x = 0;
-	}
-}
-
-contract B is A {
-	function f() internal virtual override {
-		super.f();
-	}
-}
-
-contract C is B {
-	function g() public {
-		x = 1;
-		f();
-	}
-	function v() internal override {
-		x = 2;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
deleted file mode 100644
index 04b7ea7480e9..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract A {
-	uint x;
-	function f() internal virtual {
-		v();
-		assert(x == 0); // should fail
-		assert(x == 2); // should hold
-	}
-	function v() internal virtual {
-		x = 0;
-	}
-}
-contract A1 is A {
-	function f() internal virtual override {
-		super.f();
-	}
-}
-contract B is A {
-	function f() internal virtual override {
-		super.f();
-	}
-}
-
-contract C is B, A1 {
-	function g() public {
-		x = 1;
-		f();
-	}
-	function f() internal override(B, A1) {
-		super.f();
-	}
-	function v() internal override {
-		x = 2;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call\n        A1.f() -- internal call\n            B.f() -- internal call\n                A.f() -- internal call\n                    C.v() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
deleted file mode 100644
index e386c4b445b3..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract A {
-	uint x;
-	function f() internal virtual {
-		v();
-		assert(x == 0); // should hold
-		assert(x == 2); // should fail
-	}
-	function v() internal virtual {
-		x = 0;
-	}
-}
-
-contract B is A {
-	function f() internal virtual override {
-		super.f();
-	}
-}
-
-contract C is B {
-	function g() public {
-		x = 1;
-		f();
-	}
-	function v() internal override {
-		x = 2;
-		super.v();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (97-111): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call\n                A.v() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
deleted file mode 100644
index 2bac9303b275..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract A {
-	uint x;
-	function f() internal virtual {
-		v();
-		assert(x == 2); // should hold
-	}
-	function v() internal virtual {
-		x = 0;
-	}
-	function g() public virtual {
-		v();
-		assert(x == 2); // should fail
-	}
-}
-
-contract B is A {
-	function f() internal virtual override {
-		super.f();
-	}
-}
-
-contract C is B {
-	function g() public override {
-		x = 1;
-		f();
-	}
-	function v() internal override {
-		x = 2;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (183-197): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()\n    A.v() -- internal call
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
deleted file mode 100644
index 45cf7fe186ad..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract A {
-	uint x;
-	function f() internal {
-		v();
-		assert(x == 0); // should fail
-		assert(x == 2); // should hold
-	}
-	function v() internal virtual {
-		x = 0;
-	}
-}
-
-contract C is A {
-	function g() public {
-		x = 1;
-		f();
-	}
-	function v() internal override {
-		x = 2;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (56-70): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    A.f() -- internal call\n        C.v() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
deleted file mode 100644
index 068531b4482e..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-abstract contract A {
-	uint x;
-	function f() public view {
-		assert(x == 2);
-	}
-}
-
-contract C is  A {
-	function g() public {
-		x = 2;
-		f();
-		x = 0;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (61-75): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
deleted file mode 100644
index 9972c7e3ff26..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract A {
-	uint x;
-	function f() public virtual {
-		v();
-		assert(x == 0); // should fail when C is the most derived contract
-		assert(x == 2); // should fail when A is the most derived contract
-	}
-	function v() internal virtual {
-		x = 0;
-	}
-}
-
-contract B is A {
-	function f() public virtual override {
-		super.f();
-	}
-}
-
-contract C is B {
-	function g() public {
-		x = 1;
-		f();
-	}
-	function v() internal override {
-		x = 2;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (62-76): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nB.f()\n    A.f() -- internal call\n        C.v() -- internal call
-// Warning 6328: (131-145): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()\n    A.v() -- internal call
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
deleted file mode 100644
index edc345c428dd..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-
-	function g() internal returns (uint) {
-		x = 42;
-		return x;
-	}
-}
-
-contract Z is B {
-	constructor(uint z) B(z + f()) {
-	}
-}
-
-contract C is Z(5) {
-	constructor() {
-		assert(x == 6);
-		assert(x > 9); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (292-299): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (367-380): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
deleted file mode 100644
index f97b0b7eced3..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A(9) {
-	constructor(uint b) {
-		x += b;
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-
-	function g() internal returns (uint) {
-		x = 42;
-		return x;
-	}
-}
-
-contract Z is B {
-	constructor(uint z) B(z + f()) {
-	}
-}
-
-contract C is Z(5) {
-	constructor() {
-		assert(x == 15);
-		assert(x > 90); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (110-116): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (300-307): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (376-390): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
deleted file mode 100644
index 16b6db133cc6..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b + f()) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-}
-
-abstract contract Z is A {
-	uint k;
-	constructor(uint z) {
-		k = z;
-	}
-}
-
-contract C is Z, B {
-	constructor() B(x) Z(x) {
-		assert(x == 1);
-		assert(k == 0);
-		assert(x == k); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (351-365): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
deleted file mode 100644
index 55ee0e77b2fa..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-}
-
-abstract contract Z is A {
-	uint k;
-	constructor(uint z) {
-		k = z;
-	}
-}
-
-contract C is Z, B {
-	constructor() B(f()) Z(f()) {
-		assert(x == 1);
-		assert(k == 2);
-		assert(x == k); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (349-363): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
deleted file mode 100644
index ebaffc714892..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b + f()) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-}
-
-abstract contract Z is A {
-	uint k;
-	constructor(uint z) {
-		k = z;
-	}
-}
-
-contract C is Z, B {
-	constructor(uint c) B(c) Z(x) {
-		assert(x == c + 1);
-		assert(k == 0);
-		assert(x == k); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (361-375): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
deleted file mode 100644
index 35cb038ae4ab..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b + f()) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-}
-
-abstract contract Z is A {
-	uint k;
-	constructor(uint z) {
-		k = z;
-	}
-}
-
-contract C is Z, B {
-	constructor(uint c) Z(x) B(c) {
-		assert(x == c + 1);
-		assert(k == 0);
-		assert(x == k); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (361-375): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
deleted file mode 100644
index a8d87ce26b8d..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b + f()) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-
-	function g() internal returns (uint) {
-		x = 42;
-		return x;
-	}
-}
-
-abstract contract Z is A {
-	uint k;
-	constructor(uint z) {
-		k = z;
-	}
-}
-
-contract C is Z, B {
-	constructor() Z(g()) B(f()) {
-		assert(x == 44);
-		assert(k == 42);
-		assert(x == k); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (423-437): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
deleted file mode 100644
index 76ba20735efd..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-
-	function g() internal returns (uint) {
-		x = 42;
-		return x;
-	}
-}
-
-abstract contract Z is A {
-	uint k;
-	constructor(uint z) {
-		k = z;
-	}
-}
-
-contract C is Z, B {
-	constructor() Z(g()) B(f()) {
-		assert(x == 1);
-		assert(k == 42);
-		assert(x == k); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (416-430): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
deleted file mode 100644
index d861ac2edb88..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint a) { x = a; }
-}
-
-contract B is A {
-	constructor(uint b) A(b) {
-	}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-
-	function g() internal returns (uint) {
-		x = 42;
-		return x;
-	}
-}
-
-contract Z is B {
-	constructor() B(f()) {
-	}
-}
-
-contract C is Z {
-	constructor() {
-		assert(x == 1);
-		assert(x > 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (354-367): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
deleted file mode 100644
index 5815f9ed610c..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-	uint public x;
-	constructor(uint) {}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-}
-
-contract C is A {
-	constructor() A(f()) {
-		assert(x == 1);
-		assert(x == 0); // should fail
-		assert(x > 2000); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (185-199): CHC: Assertion violation happens here.
-// Warning 6328: (218-234): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
deleted file mode 100644
index bfb7abb98cea..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract A {
-	uint public x = 42;
-	constructor(uint) {}
-
-	function f() internal returns (uint) {
-		x = x + 1;
-		return x;
-	}
-}
-
-contract C is A {
-	constructor() A(f()) {
-		assert(x == 42);
-		assert(x == 0); // should fail
-		assert(x == 1); // should fail
-		assert(x > 2000); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (191-205): CHC: Assertion violation happens here.
-// Warning 6328: (224-238): CHC: Assertion violation happens here.
-// Warning 6328: (257-273): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
deleted file mode 100644
index 2d49cd1e3871..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract F {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract E is F {}
-abstract contract D is E {
-	constructor() {
-		a = 3;
-	}
-}
-abstract contract C is D {}
-contract B is C {
-	constructor(uint x) F(x + 1) {
-	}
-}
-
-contract A is B {
-	constructor(uint x) B(x) {
-		assert(a == 3);
-		assert(a == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (215-220): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (296-310): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
deleted file mode 100644
index db94b516f204..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint x = 2;
-	constructor () {
-		assert(x == 2);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
deleted file mode 100644
index 03b634ba941d..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract A {
-	int x;
-	constructor (int a) { x = a;}
-}
-
-contract B is A {
-	int y;
-	constructor(int a) A(-a) {
-		if (a > 0) {
-			y = 2;
-		}
-		else {
-			y = 4;
-		}
-	}
-}
-
-contract C is B {
-	constructor(int a) B(a) {
-		assert(y != 3); // should hold
-		assert(y == 4); // should fail
-		if (a > 0) {
-			assert(x < 0 && y == 2); // should hold
-			assert(x < 0 && y == 4); // should fail
-		}
-		else {
-			assert(x >= 0 && y == 4); // should hold
-			assert(x >= 0 && y == 2); // should fail
-			assert(x > 0); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (247-261): CHC: Assertion violation happens here.
-// Warning 6328: (339-362): CHC: Assertion violation happens here.
-// Warning 6328: (439-463): CHC: Assertion violation happens here.
-// Warning 6328: (483-496): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
deleted file mode 100644
index 0ebbed1dbd27..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint x = 2;
-}
-
-contract D is C {
-	constructor() {
-		assert(x == 2);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (84-98): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
deleted file mode 100644
index f9382fb64e65..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-	uint x = 1;
-}
-
-contract B is A {
-	constructor() { x = 2; }
-}
-
-contract C is B {
-	constructor() { x = 3; }
-}
-
-contract D is C {
-	constructor() {
-		assert(x == 3);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (178-192): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
deleted file mode 100644
index e3be37f2b174..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract A {
-	uint x = 1;
-}
-
-contract B is A {
-	constructor() { x = 2; }
-}
-
-contract C is B {
-}
-
-contract D is C {
-	constructor() {
-		assert(x == 2);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (152-166): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
deleted file mode 100644
index 09833f14de50..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B is C {
-	uint b;
-	constructor(uint x) {
-		b = a + x;
-	}
-}
-
-contract A is B {
-	constructor(uint x) B(x) C(x + 2) {
-		assert(a == x + 2);
-		assert(b == x + x + 2);
-		assert(a == x + 5);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (125-130): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (184-189): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (243-261): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
deleted file mode 100644
index 035a901b0ec1..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	uint a;
-	constructor(uint x) {
-		a = x;
-	}
-}
-
-abstract contract B is C {
-	uint b;
-	constructor(uint x) {
-		b = x + 10;
-	}
-}
-
-contract A is B {
-	constructor(uint x) B(x) C(x + 2) {
-		assert(a == x + 2);
-		assert(b == x + 10);
-		assert(b == x + 5);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (125-131): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (185-190): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (241-259): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
deleted file mode 100644
index e98ddcb63c2e..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract A {
-	int x;
-	constructor (int a) { x = a; }
-}
-
-contract Z {
-	int z;
-	constructor(int _z) {
-		z = _z;
-	}
-}
-
-contract B is A, Z {
-	constructor(int b) A(b) Z(x) {
-		assert(x == b);
-		assert(z == 0);
-	}
-}
-
-contract F is Z, A {
-	constructor(int b) Z(x) A(b) {
-		assert(x == b);
-		assert(z == 0);
-	}
-}
-
-contract C is B {
-	constructor(int c) B(-c) {
-		if (x > 0) {
-			assert(c < 0); // should hold
-			assert(c >= 0); // should fail
-		}
-		else {
-			assert(c < 0); // should fail
-			assert(c >= 0); // should hold
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (403-417): CHC: Assertion violation happens here.
-// Warning 6328: (450-463): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
deleted file mode 100644
index ed61c1c2b1ca..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-	uint x = 2;
-}
-
-contract B is A {
-}
-
-contract C is A {
-}
-
-contract D is B, C {
-	constructor() {
-		assert(x == 2);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (129-143): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
deleted file mode 100644
index 8590b0bcfa86..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract A {
-	uint x = 1;
-}
-
-contract B is A {
-	constructor() {
-		assert(x == 1);
-		x = 2;
-	}
-}
-
-contract C is A {
-	constructor() {
-		assert(x == 1);
-		x = 3;
-	}
-}
-
-contract D is B, C {
-	constructor() {
-		assert(x == 3);
-		assert(x == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (134-148): CHC: Assertion violation happens here.
-// Warning 6328: (223-237): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol
deleted file mode 100644
index 031f5a1c0edd..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	uint x = f(2);
-	constructor () {
-		assert(x == 2);
-	}
-
-	function f(uint y) internal view returns (uint) {
-		assert(y > 0);
-		assert(x == 0);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
deleted file mode 100644
index 1c0defa916cb..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-	uint x;
-	constructor() {
-		x = 42;
-	}
-	function f() public view returns(uint256) {
-		return x;
-	}
-}
-contract B is A {
-	uint y = f();
-}
-contract C is B {
-	function g() public view {
-		assert(y == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
deleted file mode 100644
index 546f934b70fb..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract A {
-	function f() public virtual returns (uint256 r) {
-		return 1;
-	}
-}
-
-
-contract B is A {
-	function f() public virtual override returns (uint256 r) {
-		return super.f() + 2;
-	}
-}
-
-
-contract C is A {
-	function f() public virtual override returns (uint256 r) {
-		return super.f() + 4;
-	}
-}
-
-
-contract D is B, C {
-	function f() public override(B, C) returns (uint256 r) {
-		r = super.f() + 8;
-		assert(r == 15); // should hold
-		assert(r == 13); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (437-452): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 15\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
deleted file mode 100644
index 1825098a8063..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract A {
-	function f() public virtual returns (uint256 r) {
-		return 1;
-	}
-}
-
-
-contract B is A {
-	function f() public virtual override returns (uint256 r) {
-		return super.f() + 2;
-	}
-}
-
-
-contract C is A {
-	function f() public virtual override returns (uint256 r) {
-		return 2 * (super.f() + 4);
-	}
-}
-
-
-contract D is B, C {
-	function f() public override(B, C) returns (uint256 r) {
-		r = super.f() + 8;
-		assert(r == 22); // should hold
-		assert(r == 20); // should fail
-		assert(r == 18); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (443-458): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Warning 6328: (477-492): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
deleted file mode 100644
index f6674021ebf0..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract A {
-	int public x;
-	function f() public virtual {
-		x = 1;
-	}
-}
-
-contract B is A {
-	function f() public virtual override {
-		super.f();
-		x += 100;
-	}
-}
-
-contract C is B {
-	function f() public virtual override {
-		super.f();
-		x += 10;
-	}
-}
-
-contract D is B {
-}
-
-contract E is C,D {
-	function f() public override(C,B) {
-		super.f();
-		assert(x == 111); // should hold
-		assert(x == 13); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (379-394): CHC: Assertion violation happens here.\nCounterexample:\nx = 111\n\nTransaction trace:\nE.constructor()\nState: x = 0\nE.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/fallback.sol b/test/libsolidity/smtCheckerTests/inheritance/fallback.sol
deleted file mode 100644
index e1ae216c41d2..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/fallback.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// 2 warnings, fallback and A.g
-contract A {
-	uint x;
-
-	fallback () external virtual {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 2 warnings, fallback and A.g
-contract B is A {
-	uint y;
-
-	fallback () external override {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (89-103): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.fallback()
-// Warning 6328: (138-152): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol b/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol
deleted file mode 100644
index 203484265ede..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-// 2 warnings, fallback and A.g
-contract A {
-	uint x;
-
-	fallback () external {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 3 warnings, receive, A.fallback and A.g
-contract B is A {
-	uint y;
-
-	receive () external payable {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.
-// Warning 6328: (130-144): CHC: Assertion violation happens here.
-// Warning 6328: (256-270): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol b/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol
deleted file mode 100644
index bcdcc389a1db..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-// 2 warnings, A.f and A.g
-contract A {
-	uint x;
-
-	function f() public virtual view {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 2 warnings, B.f and A.g
-contract B is A {
-	function f() public view override {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (243-257): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol b/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol
deleted file mode 100644
index ca1a874b8e77..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// 2 warnings, A.f and A.g
-contract A {
-	uint x;
-
-	function f() public virtual view {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 2 warnings, B.f and A.g
-contract B is A {
-	uint y;
-
-	function f() public view override {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (253-267): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol b/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol
deleted file mode 100644
index d262b2abcbf6..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-// 2 warnings, A.f and A.g
-contract A {
-	uint x;
-
-	function f() public virtual view {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 3 warnings, B.f, B.h, A.g
-contract B is A {
-	uint y;
-
-	function f() public view virtual override {
-		assert(x == 1);
-	}
-	function h() public view {
-		assert(x == 1);
-	}
-}
-
-// 4 warnings, C.f, C.i, B.h, A.g
-contract C is B {
-	uint z;
-
-	function f() public view override {
-		assert(x == 1);
-	}
-	function i() public view {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (263-277): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.f()
-// Warning 6328: (312-326): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.h()
-// Warning 6328: (435-449): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, y = 0, x = 0\n\nTransaction trace:\nC.constructor()\nState: z = 0, y = 0, x = 0\nC.f()
-// Warning 6328: (484-498): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, y = 0, x = 0\n\nTransaction trace:\nC.constructor()\nState: z = 0, y = 0, x = 0\nC.i()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
deleted file mode 100644
index f43195d62141..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-	uint x;
-	constructor (uint y) { assert(x == 0); x = y; }
-}
-
-contract B is A {
-	constructor () A(2) { assert(x == 2); }
-}
-
-contract C is B {
-	function f() public view {
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
deleted file mode 100644
index 799bba43b89c..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A {
-	uint x;
-	function h() public view {
-		assert(x == 0);
-	}
-}
-
-contract B is A {
-	function g() public view {
-		assert(x == 0);
-	}
-}
-
-contract C is B {
-	function f() public view {
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol b/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
deleted file mode 100644
index b339e5a14aa3..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract BaseBase {
-	uint x;
-	function init(uint a, uint b) public virtual {
-		x = a;
-	}
-}
-contract Base is BaseBase {
-	function init(uint a, uint b) public override {
-	}
-}
-contract Child is Base {
-	function bInit(uint c, uint d) public {
-		BaseBase.init(c, d);
-		assert(x == c);
-		assert(x == d); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 5667: (52-58): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (282-296): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/receive.sol b/test/libsolidity/smtCheckerTests/inheritance/receive.sol
deleted file mode 100644
index f55b9efd620b..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/receive.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-// 2 warnings, receive and A.g
-contract A {
-	uint x;
-
-	receive () external virtual payable {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 2 warnings, receive and A.g
-contract B is A {
-	uint y;
-
-	receive () external payable override {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.
-// Warning 6328: (144-158): CHC: Assertion violation happens here.
-// Warning 6328: (267-281): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol b/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
deleted file mode 100644
index 3d4c5e06aabc..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// 2 warnings, receive and A.g
-contract A {
-	uint x;
-
-	receive () external payable {
-		assert(x == 1);
-	}
-	function g() public view {
-		assert(x == 1);
-	}
-}
-
-// 3 warnings, fallback, A.receive and A.g
-contract B is A {
-	uint y;
-
-	fallback () external {
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.receive(){ msg.value: 1 }
-// Warning 6328: (136-150): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol b/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol
deleted file mode 100644
index 0b92796708f3..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Base {
-	uint x;
-	uint z;
-	uint private t;
-}
-
-contract C is Base {
-	function f(uint y) public {
-		require(x < 10);
-		require(y < 100);
-		z = x + y;
-		assert(z < 150);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol b/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol
deleted file mode 100644
index fd1fbccac64c..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract Base1 {
-	uint x;
-}
-
-contract Base2 is Base1 {
-	uint z;
-}
-
-contract C is Base2 {
-	function f(uint y) public {
-		require(x < 10);
-		require(y < 100);
-		z = x + y;
-		assert(z < 150);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol b/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol
deleted file mode 100644
index 03a1e79772bd..000000000000
--- a/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Base {
-	uint x;
-	uint private t;
-}
-
-contract C is Base {
-
-	uint private z;
-	function f(uint y) public {
-		require(x < 10);
-		require(y < 100);
-		z = x + y;
-		assert(z < 150);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol
deleted file mode 100644
index ad531cc240d3..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() internal pure returns (bool) {
-		bool b;
-		assembly { b := 1 } // This assignment is overapproximated at the moment, we don't know value of b after the assembly block
-		return b;
-	}
-	function g() public pure {
-		assert(f()); // False positive currently
-		assert(!f()); // should fail, now because of overapproximation in the analysis
-		require(f()); // BMC constant value not detected at the moment
-		require(!f()); // BMC constant value not ddetected at the moment
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (70-89): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (239-250): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (282-294): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
deleted file mode 100644
index ad18cb325e6d..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure returns (bool) {
-		bool b;
-		int x = 42;
-		assembly { b := 1 }
-		assert(x == 42); // should hold
-		assert(b); // should hold, but fails due to overapproximation
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (82-101): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (138-147): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
deleted file mode 100644
index 73cdcd4d8dec..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public pure returns (bool) {
-        bool b;
-        bool c = true;
-        assembly { b := c }
-        assert(c); // should hold, c is not assigned in the assembly
-        assert(b); // should hold, but fails currently because of overapproximation
-        return b;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (106-125): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (203-212): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
deleted file mode 100644
index 59db8c8c4d23..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure returns (bool) {
-		bool b;
-		int x = 42;
-		assembly { b := 1 }
-		b = true;
-		assert(x == 42); // should hold
-		assert(b); // should hold
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (82-101): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
deleted file mode 100644
index b81ae7663a24..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-	}
-
-	S s;
-
-	function f() public {
-		s.x = 42;
-		S memory sm = s;
-		assert(sm.x == 42); // should hold
-		uint256 i = 7;
-		assembly {
-			mstore(sm, i)
-		}
-		sm.x = 10;
-		assert(sm.x == 10); // should hold
-		assert(s.x == 42); // should hold, storage not changed by the assembly
-		assert(i == 7); // should hold, not changed by the assembly
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (156-187): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol
deleted file mode 100644
index 21a32c0f4c78..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-	}
-
-	S s;
-
-	function f() public {
-		s.x = 42;
-		S storage sm = s;
-		assert(sm.x == 42); // should hold
-		uint256 i = 7;
-		assembly {
-			sstore(sm.slot, i)
-		}
-		sm.x = 10;
-		assert(sm.x == 10); // should hold
-		assert(i == 7); // should hold, not changed by the assembly
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (157-193): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
deleted file mode 100644
index b8df9f3e9e42..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	uint256 public z;
-
-	function f() public {
-		z = 42;
-		uint i = 32;
-		assembly {
-			function f() {
-				sstore(z.slot, 7)
-			}
-			f()
-		}
-		assert(z == 42); // should fail
-		assert(z == 7); // should hold, but the analysis cannot know this yet
-		assert(i == 32); // should hold, not changed by the assembly
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 7737: (83-149): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (152-167): CHC: Assertion violation happens here.
-// Warning 6328: (186-200): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
deleted file mode 100644
index 390ce10ad279..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint256[] public a;
-
-	function f() public {
-		require(a.length == 0);
-		uint256[] storage x = a;
-		assert(x.length == 0); // should hold
-		uint256 i = 7;
-		assembly {
-			sstore(x.slot, 7)
-		}
-		assert(x.length == 0); // should fail
-		assert(x.length == 7); // should hold, but the analysis cannot know this yet
-		assert(i == 7); // should hold, not changed by the assembly
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 7737: (170-205): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (208-229): CHC: Assertion violation happens here.
-// Warning 6328: (248-269): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
deleted file mode 100644
index 7eb441392fa9..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-	}
-
-	S s;
-
-	function f() public {
-		s.x = 42;
-		S memory sm = s;
-		assert(sm.x == 42); // should hold
-		uint256 i = 7;
-		assembly {
-			mstore(sm, i)
-		}
-		assert(sm.x == 42); // should fail
-		assert(sm.x == 7); // should hold, but the analysis cannot know this yet
-		assert(s.x == 42); // should hold, storage not changed by the assembly
-		assert(i == 7); // should hold, not changed by the assembly
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 7737: (156-187): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (190-208): CHC: Assertion violation happens here.
-// Warning 6328: (227-244): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol b/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol
deleted file mode 100644
index ed0905392e97..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f() public pure {
-		assembly {
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (43-57): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol b/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol
deleted file mode 100644
index f7ac997f026c..000000000000
--- a/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	function f(uint x) public pure returns (uint) {
-		assembly {
-			x := 2
-		}
-		return x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7737: (64-88): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
diff --git a/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol b/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol
deleted file mode 100644
index 56e0eb35010a..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-contract C {
-	bool a;
-	bool b;
-	bool c;
-	bool d;
-	bool e;
-	bool f;
-	function press_A() public {
-		if(e) { a = true; } else { reset(); }
-	}
-	function press_B() public {
-		if(c) { b = true; } else { reset(); }
-	}
-	function press_C() public {
-		if(a) { c = true; } else { reset(); }
-	}
-	function press_D() public {
-		d = true;
-	}
-	function press_E() public {
-		if(d) { e = true; } else { reset(); }
-	}
-	function press_F() public {
-		if(b) { f = true; } else { reset(); }
-	}
-	function is_not_solved() view public {
-		// f = true can be reached by calling the functions
-		// press_D()
-		// press_E()
-		// press_A()
-		// press_C()
-		// press_B()
-		// press_F()
-		assert(!f);
-	}
-	function reset() internal {
-		a = false;
-		b = false;
-		c = false;
-		d = false;
-		e = false;
-		f = false;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (657-667): CHC: Assertion violation might happen here.
-// Warning 4661: (657-667): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol b/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol
deleted file mode 100644
index f43b61f8dbcf..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract Simple {
-	function f(uint x) public pure {
-		uint y;
-		require(x > 0);
-		while (y < x)
-			++y;
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol b/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol
deleted file mode 100644
index dcc731bf8e20..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Simple {
-	function f(uint x) public pure {
-		uint y;
-		for (y = 0; y < x; ++y) {}
-		assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol b/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol
deleted file mode 100644
index d14c2a2a3e38..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract Simple {
-	function f() public pure {
-		uint x = 10;
-		uint y;
-		while (y < x)
-		{
-			++y;
-			x = 0;
-			while (x < 10)
-				++x;
-			assert(x == 10);
-		}
-		// Removed because of Spacer nondeterminism.
-		//assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol b/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol
deleted file mode 100644
index 55f5b617de7a..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Simple {
-	function f() public pure {
-		uint x;
-		uint y;
-		for (x = 10; y < x; ++y)
-		{
-			for (x = 0; x < 10; ++x) {}
-			assert(x == 10);
-		}
-		// Disabled because of Spacer nondeterminism.
-		//assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
deleted file mode 100644
index fd0610eafb55..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-	uint x;
-
-	function f() public {
-		if (x == 0)
-			x = 1;
-	}
-
-	function g() public {
-		if (x == 1)
-			x = 2;
-	}
-
-	function h() public {
-		if (x == 2)
-			x = 0;
-	}
-
-	// This function shows that (x < 9) is not inductive and
-	// a stronger invariant is needed to be found.
-	// (x < 3) is the one found in the end.
-	function j() public {
-		if (x == 7)
-			x = 100;
-	}
-
-	function i() public view {
-		assert(x < 9);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/state_machine_1_fail.sol b/test/libsolidity/smtCheckerTests/invariants/state_machine_1_fail.sol
deleted file mode 100644
index b8727aab472a..000000000000
--- a/test/libsolidity/smtCheckerTests/invariants/state_machine_1_fail.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	uint x;
-
-	function f() public {
-		if (x == 0)
-			x = 1;
-	}
-
-	function g() public {
-		if (x == 1)
-			x = 2;
-	}
-
-	function h() public {
-		if (x == 2)
-			x = 0;
-	}
-
-	function j() public {
-		if (x < 2)
-			x = 100;
-	}
-
-	// Fails due to j.
-	function i() public view {
-		// Disabled because Spacer 4.8.9 seg faults.
-		//assert(x < 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_1.sol
deleted file mode 100644
index f49fb588eb38..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		do {
-			x = x + 1;
-		} while (x < 1000);
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
deleted file mode 100644
index 6ebaa26738fc..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		do {
-			x = x + 1;
-		} while (x < 10);
-		assert(x < 14);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (110-124): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol
deleted file mode 100644
index bff046b06332..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		do {
-			++x;
-		} while (x < 2);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol
deleted file mode 100644
index 92cbc1bea18f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-			{
-				++x;
-				++x;
-			}
-		} while (x < 3);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol
deleted file mode 100644
index d4a37786c236..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		do {
-			if (x >= 2)
-				++x;
-			++x;
-		} while (x < 3);
-		assert(x == 4);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol
deleted file mode 100644
index cce896b70c7f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-		} while (true);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol
deleted file mode 100644
index 6f25a4f5c124..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint x;
-
-    function condition() private returns(bool) {
-		++x;
-		return x < 3;
-	}
-
-	function f() public {
-		require(x == 0);
-		do {
-		} while (condition());
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (77-80): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol
deleted file mode 100644
index 8f7c82ad9f71..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint x;
-	uint y;
-
-	function condition() private returns(bool) {
-		x = (x + 1) % 2;
-		return (x == 1);
-	}
-
-	function f() public {
-		require(x == 0);
-		require(y == 0);
-		do {
-			++y;
-		} while (condition());
-		assert(y == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (85-90): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol
deleted file mode 100644
index 81d94e1b9c33..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint256[] y;
-
-	function f() public view {
-		uint256 x = 0;
-		do {
-			++x;
-		} while (x < y.length);
-		require(x != 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Warning 6838: (124-130): BMC: Condition is always true.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol
deleted file mode 100644
index 54ede91c2df6..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		do {
-			++x;
-		} while (x < 2);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (102-116): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol
deleted file mode 100644
index 8c742b749d0c..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-			break;
-		} while (x < 3);
-		assert(x == 0);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Warning 5740: (87-92): Unreachable code.
-// Warning 4661: (97-111): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol
deleted file mode 100644
index 0742c5cdc211..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-			continue;
-		} while (x < 2);
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Warning 4661: (100-114): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol
deleted file mode 100644
index e7bb9d145ce2..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-			break;
-		} while (x < 3);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 5740: (87-92): Unreachable code.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol
deleted file mode 100644
index 9dec60544d1e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		do {
-			if (x > 0)
-				break;
-			++x;
-		} while (x < 3);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol
deleted file mode 100644
index 0f1c7d033024..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		do {
-			if (x >= 0) {
-				++x;
-				break;
-			}
-			++x;
-		} while (x < 3);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol
deleted file mode 100644
index c2c046809ff4..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		do {
-			if (x > 0) {
-				++x;
-				break;
-			}
-			++x;
-		} while (x < 3);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol
deleted file mode 100644
index 4379d4f61362..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		do {
-			++x;
-			if (x > 1) {
-				++x;
-				break;
-			}
-		} while (x < 3);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
deleted file mode 100644
index d0a917fa915c..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-			if (x > 0) {
- 				x = 2;
-				break;
-			}
-			if (x > 1) {
-				x = 3;
-				break;
-			}
-		} while (x < 3);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
deleted file mode 100644
index 52c3270ba7ea..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			++x;
-			if (x > 1) {
-				x = 3;
-				break;
- 			}
-			if (x > 0) {
-				x = 2;
-				break;
- 			}
-		} while (x < 3);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol
deleted file mode 100644
index c25f982126df..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			break;
-		} while (++x < 2);
-        // loop condition is not executed after break
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 5740: (79-86): Unreachable code.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol
deleted file mode 100644
index 53ce958fab1a..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			if (x > 1) {
-				break;
- 			}
-			if (x >= 0) {
-				x = 10;
-				continue;
- 			}
-		} while (x < 3);
-		assert(x == 10);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol
deleted file mode 100644
index 12d6fff6f5a8..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			if (x > 1) {
-				x = 3;
-				break;
- 			}
-			if (x >= 0) {
-				x = 2;
-				continue;
- 			}
-		} while (x < 4);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol
deleted file mode 100644
index aa69cb90cc4a..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		do {
-			++x;
-			if (x == 3) {
-				continue;
-			}
-			++x;
-		} while (x < 3);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol
deleted file mode 100644
index 83826575de5e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		uint y = 0;
-		do {
-			++x;
-			if (x == 2) {
-				++x;
-				y = 1;
-				continue;
-			}
-			if (x == 3) {
-				y = 2;
-				continue;
-			}
-		} while (x < 3);
-		assert(y == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol
deleted file mode 100644
index 1afe9034e0d7..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		uint y = 0;
-		do {
-			++x;
-			if (x > 0) {
-				y = 1;
-				continue;
-			}
-			if (x > 0) {
-				y = 2;
-				continue;
-			}
-		} while (x < 3);
-		assert(y == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol
deleted file mode 100644
index 69ad6529c62f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		uint i;
-		do {
-			++i;
-			if (i == 2) {
-				x = 2;
-				continue;
-			}
-			if (i == 1) {
-				x = 1;
-				continue;
-			}
-		} while (i < 3);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol
deleted file mode 100644
index 62d1b793df5c..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	function f(uint z) public pure {
-		uint x = 0;
-		require(z == 0);
-		do {
-			uint y = 0;
-			do {
-				++z;
-				++y;
-			} while (y < 2);
-			++x;
-		} while (x < 2);
-		assert(z == 4);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol
deleted file mode 100644
index 267e18ec64d8..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	function f(uint z) public pure {
-		uint x = 0;
-		require(z == 0);
-		do {
-			uint y = 0;
-			do {
-				if (y > 0)
-					break;
-				++z;
-				++y;
-			} while (y < 2);
-			++x;
-		} while (x < 2);
-		assert(z == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol
deleted file mode 100644
index 42ef9bccc5a0..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	function f(uint z) public pure {
-		uint x = 0;
-		require(z == 0);
-		do {
-			uint y = 0;
-			do {
-				++y;
-				if (y > 0)
-					continue;
-				++z;
-			} while (y < 2);
-			++x;
-		} while (x < 2);
-		assert(z == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
deleted file mode 100644
index 4d1112ac0605..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		do {
-			if (x >= 3)
-				y = 1;
-			++x;
-		} while (x < 3 || y == 1);
-		// BMC loop iteration setting is not enough to leave the loop
-		assert(x == 0); // should hold - no assumptions on value if didn't complete loop
-		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
deleted file mode 100644
index 9db49261c01e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		do {
-			if (x >= 3)
-				y = 1;
-			++x;
-		} while (x < 3 || y == 1);
-		// BMC loop iteration setting is just enough to leave the loop
-		assert(x == 3);
-		assert(y == 1); // should fail, when x == 3 loop is completed
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 4661: (223-237): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
deleted file mode 100644
index e5e03d3d6289..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		do {
-			if (x >= 3)
-				y = 1;
-			++x;
-		} while (x < 3 || y == 1);
-		// BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3);
-		assert(y == 1); // should fail
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 4661: (228-242): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
deleted file mode 100644
index 04d197045db9..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		do {
-			++x;
-			if (x >= 3)
-				y = 1;
-		} while (x < 3 || y == 1);
-		// BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3); // should hold
-		assert(y == 1); // should hold
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol
deleted file mode 100644
index 449d41c67cb9..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		require(x == 0);
-		uint y;
-		do {
-			++y;
-			if (y == 2)
-			    x = 3;
-		} while (y < 3);
-		// nothing is reported because loop condition is true after unrolling the loop one time
-		assert(x == 4);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
deleted file mode 100644
index 7d779c473472..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			break;
-			x = 1;
-		} while (x == 0);
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (71-76): Unreachable code.
-// Warning 5740: (89-95): Unreachable code.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
deleted file mode 100644
index c7710320a04c..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f() public pure {
-		uint a = 0;
-		while (true) {
-			do {
-				break;
-				a = 2;
-			} while (true);
-			a = 1;
-			break;
-		}
-		assert(a == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (95-100): Unreachable code.
-// Warning 5740: (114-118): Unreachable code.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol
deleted file mode 100644
index 3544e04d4a52..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f() public pure {
-		uint a = 0;
-		while (true) {
-			do {
-				break;
-				a = 2;
-			} while (true);
-			a = 1;
-			break;
-		}
-		assert(a == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (95-100): Unreachable code.
-// Warning 5740: (114-118): Unreachable code.
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = 1\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol
deleted file mode 100644
index cea834c69c8b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			break;
-			x = 1;
-		} while (x == 0);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (71-76): Unreachable code.
-// Warning 5740: (89-95): Unreachable code.
-// Warning 6328: (100-114): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol b/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
deleted file mode 100644
index 5564b6a5914f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		do {
-			continue;
-			x = 1;
-		} while (x == 0);
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (74-79): Unreachable code.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_break.sol b/test/libsolidity/smtCheckerTests/loops/for_1_break.sol
deleted file mode 100644
index 31b92ef0a339..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_1_break.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 10);
-		for (; x < 10; ) {
-			if (b)
-				++x;
-			else {
-				x = 20;
-				break;
-			}
-		}
-		assert(x >= 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
deleted file mode 100644
index 271d220f0423..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		for (; x < 10; ) {
-			if (b)
-				++x;
-			else {
-				break;
-			}
-		}
-		// Fails because the loop might break.
-		assert(x >= 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (168-183): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol b/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol
deleted file mode 100644
index 66193a31f7e6..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 10);
-		for (; x < 10; ++x) {
-			if (b) {
-				x = 20;
-				continue;
-			}
-		}
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
deleted file mode 100644
index d35e727cc3fa..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 10);
-		for (; x < 10; ) {
-			++x;
-		}
-		assert(x > 15);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5667: (33-39): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (109-123): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
deleted file mode 100644
index 0b4ac7e68824..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		for(uint i = 0; i < 5; ++i) {
-			x = x + 1;
-		}
-		// Disabled because of non-determinism in Spacer in Z3 4.8.9, check with next solver release.
-		//assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (106-111): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
deleted file mode 100644
index a25f0fcc1baf..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		for (x = 0; x < 10; ++x)
-			break;
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (69-72): Unreachable code.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol
deleted file mode 100644
index 155aa45bfd5f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        require(x == 2);
-        for (;;) {}
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol
deleted file mode 100644
index 212feb824563..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        for (; x == 2; ) {
-            assert(x == 2);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol
deleted file mode 100644
index ae6392bdfc62..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        for (uint y = 2; x < 10; ) {
-            assert(y == 2);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol
deleted file mode 100644
index 0c7941b0d6d1..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        for (uint y = 2; x < 10; y = 3) {
-            assert(y == 2);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (104-118): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 3\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol
deleted file mode 100644
index 6c496e7af96e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        uint y;
-        for (y = 2; x < 10; ) {
-            y = 3;
-        }
-        assert(y == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (135-149): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\ny = 2\n\nTransaction trace:\nC.constructor()\nC.f(10)
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol
deleted file mode 100644
index 976d2540a77f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        uint y;
-        for (y = 2; x < 10; ) {
-            y = 3;
-        }
-        // False positive due to resetting y.
-        assert(y < 4);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
deleted file mode 100644
index 953a6d507cfc..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract LoopFor2 {
-	function testUnboundedForLoop(uint n, uint[] memory b, uint[] memory c) public pure {
-		require(n < b.length);
-		require(n < c.length);
-		require(n > 0 && n < 100);
-		b[0] = 900;
-		uint[] memory a = b;
-		for (uint i = 0; i < n; i += 1) {
-			// Accesses are safe but oob is reported due to potential aliasing after c's assignment.
-			// Disabled because of Spacer nondeterminism.
-			//b[i] = i + 1;
-			//c[i] = b[i];
-		}
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == c[0]);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(a[0] == 900);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == 900);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (202-217): Unused local variable.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
deleted file mode 100644
index 53a6142a6e4e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract LoopFor2 {
-	uint[] a;
-	function p() public {
-		a.push();
-	}
-	function testUnboundedForLoop(uint n, uint[] memory b, uint[] memory c) public {
-		require(n < a.length);
-		require(n < b.length);
-		require(n < c.length);
-		require(n > 0 && n < 100);
-		b[0] = 900;
-		a = b;
-		for (uint i = 0; i < n; i += 1) {
-			// Accesses are safe but oob is reported due to potential aliasing after c's assignment.
-			b[i] = i + 1;
-			// Disabled because of Spacer's nondeterminism.
-			//c[i] = b[i];
-		}
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == c[0]);
-		//assert(a[0] == 900);
-		//assert(b[0] == 900);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol
deleted file mode 100644
index d52cc2c99046..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// Most of the code has been commented out because of nondeterminism in Spacer in Z3 4.8.9
-contract LoopFor2 {
-	uint[] b;
-	//uint[] c;
-	function p() public {
-		b.push();
-	}
-	function testUnboundedForLoop(uint n) public {
-		require(b.length > 0);
-		b[0] = 900;
-		//uint[] memory a = b;
-		require(n > 0 && n < 100);
-		for (uint i = 0; i < n; i += 1) {
-			//b[i] = i + 1;
-			//c[i] = b[i];
-		}
-		// This is safe but too hard to solve currently.
-		//assert(b[0] == c[0]);
-		//assert(a[0] == 900);
-		//assert(b[0] == 900);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol
deleted file mode 100644
index c8e536933850..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract LoopFor2 {
-	uint[] b;
-	uint[] c;
-
-	// Disabled because of Spancer nondeterminism in the overflow queries
-	// which can't be disabled separately.
-	/*
-	function testUnboundedForLoop(uint n) public {
-		b[0] = 900;
-		uint[] storage a = b;
-		require(n > 0 && n < 100);
-		for (uint i = 0; i < n; i += 1) {
-			b[i] = i + 1;
-			c[i] = b[i];
-		}
-		// This is safe but too hard to prove currently.
-		assert(b[0] == c[0]);
-		assert(a[0] == 900);
-		assert(b[0] == 900);
-	}
-	*/
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol
deleted file mode 100644
index a352b6e38fab..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i)
-			++x;
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol
deleted file mode 100644
index 5c91d2ce5c93..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint256[] y;
-
-	function f() public view {
-		uint256 x = 0;
-		for (uint i = 0; i < y.length; i++) {
-			x = 1;
-		}
-		// tests that constant condition warning is not reported
-		require(x != 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol
deleted file mode 100644
index d460ea770c49..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i)
-			x = i;
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol
deleted file mode 100644
index 63b43466895e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i)
-			if (i > 1)
-				x = 10;
-		assert(x == 10);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-//  Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol
deleted file mode 100644
index e3fea509a579..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 0; ++i)
-			++x;
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol
deleted file mode 100644
index 38437fce2496..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (; x < 0; ++x) {}
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol
deleted file mode 100644
index cdbc41485164..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		for (uint i = 1; i < 3;) {
-			x = i;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol
deleted file mode 100644
index 834529b32a5c..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	uint x;
-
-	function condition() private returns(bool) {
-		++x;
-		return x < 3;
-	}
-
-	function f() public {
-		require(x == 0);
-		for (; condition();) {
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (71-74): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol
deleted file mode 100644
index 421c965e1c57..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C
-{
-	uint x;
-	uint y;
-
-	function condition() private returns(bool) {
-		++x;
-		return x < 3;
-	}
-
-	function expression() private {
-		++y;
-	}
-
-	function f() public {
-		require(x == 0);
-		require(y == 0);
-		for (; condition(); expression()) {
-		}
-		assert(x == 3);
-		assert(y == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (80-83): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 2661: (140-143): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol
deleted file mode 100644
index a460106802a7..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint x;
-	uint y;
-
-	function condition() private returns(bool) {
-		x = (x + 1) % 2;
-		return (x == 1);
-	}
-
-	function f() public {
-		require(x == 0);
-		require(y == 0);
-		for (; condition();) {
-			++y;
-		}
-		assert(y == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (85-90): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol
deleted file mode 100644
index 67290785b060..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i)
-			++x;
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (92-106): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol
deleted file mode 100644
index cd1ae918f591..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i) {
-			++x;
-			break;
-		}
-		assert(x == 0);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 5740: (77-80): Unreachable code.
-// Warning 4661: (108-122): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol
deleted file mode 100644
index 8e1cb97bc8a1..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i) {
-			++x;
-			continue;
-		}
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (111-125): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol
deleted file mode 100644
index 26958bf1d254..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			break;
-			++x;
-		}
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 5740: (77-80): Unreachable code.
-// Warning 5740: (97-100): Unreachable code.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
deleted file mode 100644
index cada2d85195e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			++x;
- 			break;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 5740: (77-80): Unreachable code.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol
deleted file mode 100644
index eb947d555feb..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			if (i > 0)
-				break;
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol
deleted file mode 100644
index 3d4855abfab1..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			++x;
-			if (i > 0)
-				break;
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol
deleted file mode 100644
index f21255502a75..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			if (i > 1) {
-				x = 1;
-				break;
-			}
-			if (i > 1) {
-				x = 2;
-				break;
-			}
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol
deleted file mode 100644
index 401491e9049b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			if (i > 1) {
-				x = 1;
-				break;
-			}
-			if (i >= 1) {
-				x = 2;
-				break;
-			}
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol
deleted file mode 100644
index 4bb4ffdf0408..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (;;) {
-			++x;
-			break;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
deleted file mode 100644
index a88a031e75e1..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (;;) {
- 			break;
-			++x;
-		}
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 5740: (78-81): Unreachable code.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
deleted file mode 100644
index 4ce3d9268e89..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (;x < 2;) {
-			++x;
- 			break;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol
deleted file mode 100644
index b999f9cf6176..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			if (i > 1) {
-				break;
- 			}
-			if (i >= 0) {
-				x = 10;
-				continue;
- 			}
-		}
-		assert(x == 10);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol
deleted file mode 100644
index 0da0f5d9940f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i) {
-			if (i > 0) {
-				x = 1;
-				break;
- 			}
-			if (i >= 0) {
-				x = 2;
-				continue;
-			}
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol
deleted file mode 100644
index 9f762bb43674..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 3; ++i) {
-			if (i > 0) {
-				x = 1;
-				break;
- 			} else {
-				x = 2;
-				continue;
-			}
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol
deleted file mode 100644
index 44983ecddc11..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		for (uint i = 0; i < 3; ++i) {
-			if (i > 1)
-				continue;
-			++x;
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol
deleted file mode 100644
index 2c7fc1236755..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i) {
-			if (i == 1) {
-				x = 1;
-				continue;
-			}
-			if (i == 0) {
-				x = 2;
-				continue;
-			}
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
deleted file mode 100644
index b74709e484fd..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		for (uint i = 0; i < 3; ++i) {
-			if (x > 1) {
-				x = 10;
-				continue;
-			}
- 			if (x > 0) {
-				x = 11;
-				continue;
-			}
-			++x;
-		}
-		assert(x == 10);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol
deleted file mode 100644
index 246aa74c9710..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (; x < 2; ++x) {
-			if (x > 1) {
-				x = 10;
-				continue;
-			}
-			if (x > 0) {
-				x = 11;
-				continue;
-			}
-		}
-		// x > 0 branch triggers x = 11 and continue triggers ++x loop expression
-		assert(x == 12);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol
deleted file mode 100644
index 270d8d4df8a1..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (; x < 2; ++x) {
-			continue;
-		}
-		// loop expression is executed after continue
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol
deleted file mode 100644
index 20071a64aaba..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		for (;;) {
-			x = 1;
-		}
-		assert(x == 1000);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol
deleted file mode 100644
index d63e2ca5c697..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x;
-		for (uint i = 0; i < 2; ++i) {
-			for (uint j = 0; j < 2; ++j)
-				++x;
-		}
-		assert(x == 4);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol
deleted file mode 100644
index c302decafec8..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		for (uint i = 0; i < 2; ++i) {
-			for (uint j = 0; j < 2; ++j) {
-				x = x + 1;
-				break;
-			}
-			break;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 5740: (92-95): Unreachable code.
-// Warning 5740: (126-129): Unreachable code.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol
deleted file mode 100644
index 8c07d096a772..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		for (uint i = 0; i < 2; ++i) {
-			for (uint j = 0; j < 2; ++j) {
-			    if (i > 0)
-					continue;
-				++x;
-			}
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
deleted file mode 100644
index d3a6c825fc82..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		for (; x < 3 || y == 1; ++x) {
-			if (x >= 3)
-				y = 1;
-		}
-        // BMC loop iteration setting is not enough to leave the loop
-		assert(x == 0); // should hold - no assumptions on value if didn't complete the loop
-		assert(y == 0); // should hold - no assumptions on value if didn't complete the loop
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
deleted file mode 100644
index 720f621dfd8b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		for (; x < 3 || y == 1; ++x) {
-			if (x >= 3)
-				y = 1;
-		}
-		// BMC loop iteration setting is just enough to leave the loop
-		assert(x == 3);
-		assert(y == 1); // should fail
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (216-230): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
deleted file mode 100644
index 00cd3a5ce8da..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		for (; x < 3 || y == 1; ++x) {
-			if (x >= 3)
-				y = 1;
-		}
-		// BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3);
-		assert(y == 1); // should fail
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 4661: (221-235): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol
deleted file mode 100644
index 8bfecdfa59ce..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		for (uint i = 0; i < 2; ++i) {
-			++x;
-		}
-		// nothing is reported because loop condition is still true after BMCLoopIterations
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
deleted file mode 100644
index 36af4f9b4155..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        require(x == 2);
-        for (; x == 2;) {}
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
deleted file mode 100644
index 0847066a0536..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        require(x == 2);
-        uint y;
-        for (; x == 2;) {
-            y = 7;
-        }
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
deleted file mode 100644
index e5219bad58f0..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        require(x == 2);
-        uint y;
-        // The loop condition is always true,
-        // but since x is touched in the body
-        // we can't infer that.
-        for (; x == 2;) {
-            x = 2;
-        }
-        // False positive due to resetting x.
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 2072: (83-89): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1.sol b/test/libsolidity/smtCheckerTests/loops/while_1.sol
deleted file mode 100644
index ffb407fee1ae..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 100);
-		while (x < 10) {
-			if (b)
-				x = x + 1;
-			else
-				x = 0;
-		}
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_break.sol b/test/libsolidity/smtCheckerTests/loops/while_1_break.sol
deleted file mode 100644
index 136509f63ece..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1_break.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b)
-				++x;
-			else {
-				x = 20;
-				break;
-			}
-		}
-		assert(x >= 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
deleted file mode 100644
index 84ec71f4c834..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b)
-				++x;
-			else {
-				break;
-			}
-		}
-		// Fails because the loop might break.
-		assert(x >= 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (185-200): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol b/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol
deleted file mode 100644
index b2e63a3bc2ad..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b) {
-				x = 20;
-				continue;
-			}
-			++x;
-		}
-		assert(x >= 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol
deleted file mode 100644
index 39ee24ac52cc..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 100);
-		while (x < 10) {
-			if (b) {
-				x = 15;
-				continue;
-				x = 200;
-			}
-			x = 20;
-
-		}
-		// Fails due to the if.
-		assert(x >= 17);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (136-143): Unreachable code.
-// Warning 6328: (194-209): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(10, false)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
deleted file mode 100644
index 941bd541560b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		while (x < 10) {
-			x = x + 1;
-		}
-		assert(x < 14);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (106-120): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol b/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol
deleted file mode 100644
index bbd7bfe4ede0..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	function f(uint x, bool b) public pure {
-		require(x < 100);
-		while (x < 10) {
-			if (b)
-				x = x + 1;
-			else
-				x = 0;
-		}
-		// CHC proves it safe because
-		// 1- if it doesn't go in the loop in the first place, x >= 10
-		// 2- if it goes in the loop and b == true, x increases until >= 10
-		// 3- if it goes in the loop and b == false, it's an infinite loop, therefore
-		//    the assertion and the error are unreachable.
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2.sol b/test/libsolidity/smtCheckerTests/loops/while_2.sol
deleted file mode 100644
index b4d0edacd46d..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		x = 2;
-		while (x > 1) {
-			if (x > 10)
-				x = 2;
-			else
-				--x;
-		}
-		assert(x < 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_break.sol b/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
deleted file mode 100644
index 5e2bbd44834e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 0;
-		while (x == 0) {
-			++x;
-			break;
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 5740: (95-98): Unreachable code.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
deleted file mode 100644
index 95e5b4c344a2..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		while (x == 0) {
-			++x;
-			break;
-			++x;
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTSolvers: z3
-// ----
-// Warning 5740: (87-90): Unreachable code.
-// Warning 6328: (98-112): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol
deleted file mode 100644
index 95324dd6568b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		x = 2;
-		while (x > 1) {
-			if (x > 10)
-				x = 2;
-			else
-				x = 10;
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol
deleted file mode 100644
index 11a4e7587b08..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		require(x == 0);
-		uint y;
-		while (y < 3) {
-			++y;
-			if (y == 2)
-			    x = 3;
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol
deleted file mode 100644
index 075e342eae58..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			++x;
-			{
-				++x;
-				++x;
-			}
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol
deleted file mode 100644
index 2596af24f79a..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			if (x >= 2)
-				++x;
-			++x;
-		}
-		assert(x == 4);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol
deleted file mode 100644
index 8bfbe32d1a15..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		x = 0;
-		while (x < 1) {
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol
deleted file mode 100644
index f3166cee8633..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (true) {
-			++x;
-		}
-		assert(x == 1000);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol
deleted file mode 100644
index ffdeeba1a461..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint x;
-	uint y;
-
-	function condition() private returns(bool) {
-		x = (x + 1) % 2;
-		return (x == 1);
-	}
-
-	function f() public {
-		require(x == 0);
-		require(y == 0);
-		while (condition()) {
-			++y;
-		}
-		assert(y == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (85-90): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol
deleted file mode 100644
index 3f6a5b4bfa34..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    uint x;
-
-    function condition() private returns(bool) {
-		++x;
-		return x < 3;
-	}
-
-	function f() public {
-		require(x == 0);
-		while (condition()) {
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 5
-// ----
-// Warning 2661: (77-80): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
deleted file mode 100644
index b7ad4e2ecb0b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	uint256[] y;
-
-	function f() public view {
- 		uint256 x = 0;
-		while (x < y.length) {
-			x = 1;
-		}
-		// tests that constant condition warning is not reported
-		require(x != 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol
deleted file mode 100644
index a43c7489e78f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x == 0);
-		while (x < 2) {
-			++x;
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (98-112): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol
deleted file mode 100644
index c16f755b663a..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 2) {
-			++x;
-			break;
-		}
-		assert(x == 0);
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Warning 4661: (93-107): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol
deleted file mode 100644
index acaf4f9a3ec5..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 2) {
-			++x;
-			continue;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (96-110): BMC: Assertion violation happens here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol
deleted file mode 100644
index c8b45bac04fd..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			++x;
-			break;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol
deleted file mode 100644
index c4a8c2f39bc3..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			if (x > 0)
-				break;
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol
deleted file mode 100644
index c089b906bc86..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			if (x > 0) {
-				++x;
-				break;
-			}
-			++x;
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
deleted file mode 100644
index d1939871bf39..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			++x;
-			if (x > 0) {
- 				++x;
-				break;
-			}
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol
deleted file mode 100644
index f7ba610a69d2..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			++x;
-			if (x > 1) {
-				++x;
-				break;
-			}
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
deleted file mode 100644
index 0546e48c0ddb..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			++x;
-			if (x > 0) {
- 				x = 2;
-				break;
-			}
-			if (x > 1) {
-				x = 3;
-				break;
-			}
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
deleted file mode 100644
index 8e4d3b6261d0..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			++x;
-			if (x > 1) {
-				x = 3;
-				break;
- 			}
-			if (x > 0) {
-				x = 2;
-				break;
- 			}
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol
deleted file mode 100644
index be6b04bb2728..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		while (x < 3) {
-			if (x >= 0) {
-				++x;
-				break;
-			}
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol
deleted file mode 100644
index caaa4f570ac5..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		while (x < 3) {
-			++x;
-			break;
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 5740: (94-97): Unreachable code.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
deleted file mode 100644
index bb9554523453..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			if (x > 1) {
-				break;
- 			}
-			if (x >= 0) {
-				x = 10;
-				continue;
- 			}
-		}
-		assert(x == 10);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
deleted file mode 100644
index b65404e22f76..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		while (x < 3) {
-			if (x > 1) {
-				x = 3;
-				break;
- 			}
-			if (x >= 0) {
-				x = 2;
-				continue;
- 			}
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol
deleted file mode 100644
index e17fa303734b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		uint i;
-		while (i < 3) {
-			++i;
-			if (i > 1)
-				continue;
-			++x;
-		}
-		assert(x == 1);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol
deleted file mode 100644
index 3670f8dacb4e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		require(x == 0);
-		uint i;
-		while (i < 3) {
-			 ++i;
-			if (i == 2) {
-				x = 2;
-				continue;
-			}
-			if (i == 1) {
-				x = 1;
-				continue;
-			}
-		}
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol
deleted file mode 100644
index 887ce60f7dff..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f(uint z) public pure {
-		uint x = 0;
-		require(z == 0);
-		while (x < 2) {
-			uint y = 0;
-			while (y < 2) {
-				++z;
-				++y;
-			}
-			++x;
-		}
-		assert(z == 4);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol
deleted file mode 100644
index 170c5a3c3c9f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f(uint z) public pure {
-		uint x = 0;
-		require(z == 0);
-		while (x < 2) {
-			uint y = 0;
-			while (y < 2) {
-				if (y > 0)
-					break;
-				++z;
-				++y;
-			}
-			++x;
-		}
-		assert(z == 2);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol
deleted file mode 100644
index 66ad2081b45f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x;
-		uint i;
-		while (i < 3) {
-			++i;
-			uint j;
-			while (j < 3) {
-				++j;
-				if (i > 1)
-					continue;
-				++x;
-			}
-		}
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
deleted file mode 100644
index 7de8b8146a30..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		while (x < 3 || y == 1) {
-			if (x >= 3)
-				y = 1;
-			++x;
-		}
-		// BMC loop iteration setting is not enough to leave the loop
-		assert(x == 0); // should hold - no assumptions on value if didn't complete the loop
-		assert(y == 0); // should hold - no assumptions on value if didn't complete the loop
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 2
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
deleted file mode 100644
index a50acf4d2b4e..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		while (x < 3 || y == 1) {
-			if (x >= 3)
-				y = 1;
-			++x;
-		}
- 		// BMC loop iteration setting is just enough to leave the loop
-		assert(x == 3);
-		assert(y == 1); // should fail
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 3
-// ----
-// Warning 4661: (220-234): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
deleted file mode 100644
index 6ead58142c35..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		int y = 0;
-		while (x < 3 || y == 1) {
-			if (x >= 3)
-				y = 1;
-			++x;
-		}
-		// BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3);
-		assert(y == 1); // should fail
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 4
-// ----
-// Warning 4661: (224-238): BMC: Assertion violation happens here.
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol
deleted file mode 100644
index 3134e35c47b2..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = 0;
-		while (x < 5) {
-			x = x + 1;
-		}
-		// nothing is reported because loop condition is true after unrolling the loop one time
-		assert(x == 5);
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: bmc
-// SMTSolvers: z3
-// BMCLoopIterations: 1
-// ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
deleted file mode 100644
index 4a6245b0fdec..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		x = 0;
-		while (x < 10)
-			break;
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
deleted file mode 100644
index be350ef5e22d..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract LoopFor2 {
-	function testUnboundedForLoop(uint n, uint[] memory b, uint[] memory c) public pure {
-		require(n < b.length);
-		require(n < c.length);
-		require(n > 0 && n < 100);
-		b[0] = 900;
-		uint[] memory a = b;
-		uint i;
-		// Disabled because of Spacer's nondeterminism.
-		/*
-		while (i < n) {
-			// Accesses are safe but oob is reported due to potential aliasing after c's assignment.
-			b[i] = i + 1;
-			c[i] = b[i];
-			++i;
-		}
-		*/
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == c[0]);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(a[0] == 900);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == 900);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTSolvers: z3
-// ----
-// Warning 2072: (202-217): Unused local variable.
-// Warning 2072: (225-231): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
deleted file mode 100644
index 1e5e2fbe9b93..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract LoopFor2 {
-	uint[] a;
-	function p() public {
-		a.push();
-	}
-	function testUnboundedForLoop(uint n, uint[] memory b, uint[] memory c) public {
-		require(n < a.length);
-		require(n < b.length);
-		require(n < c.length);
-		b[0] = 900;
-		a = b;
-		require(n > 0 && n < 100);
-		uint i;
-		// Disabled because of Spacer nondeterminism.
-		/*
-		while (i < n) {
-			// Accesses are safe but oob is reported due to potential aliasing after c's assignment.
-			b[i] = i + 1;
-			c[i] = b[i];
-			++i;
-		}
-		*/
-		// Fails due to aliasing, since both b and c are
-		// memory references of same type.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == c[0]);
-		assert(a[0] == 900);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == 900);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 2072: (280-286): Unused local variable.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
deleted file mode 100644
index ed7ebdfba570..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract LoopFor2 {
-	uint[] b;
-	uint[] c;
-	function p() public {
-		b.push();
-		c.push();
-	}
-	function testUnboundedForLoop(uint n) public {
-		require(n < b.length);
-		require(n < c.length);
-		require(n > 0 && n < 100);
-		b[0] = 900;
-		uint[] storage a = b;
-		uint i;
-		while (i < n) {
-			b[i] = i + 1;
-			//c[i] = b[i]; // Removed because of Spacer's nondeterminism
-			++i;
-		}
-		//assert(b[0] == c[0]); // Removed because of Spacer's nondeterminism
-		assert(a[0] == 900);
-		assert(b[0] == 900);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (288-292): CHC: Out of bounds access might happen here.
-// Warning 6368: (459-463): CHC: Out of bounds access happens here.
-// Warning 6328: (452-471): CHC: Assertion violation happens here.
-// Warning 6328: (475-494): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
deleted file mode 100644
index 461e4f4e68d4..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// Check that variables are cleared
-contract C {
-    function f(uint x) public pure {
-        x = 2;
-        while (x > 1) {
-            x = 1;
-        }
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (162-176): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol
deleted file mode 100644
index e71e73ee945f..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// Check that condition is assumed.
-contract C {
-    function f(uint x) public pure {
-        while (x == 2) {
-            assert(x == 2);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol
deleted file mode 100644
index 684adaadb6c6..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// Check that condition is not assumed after the body anymore
-contract C {
-    function f(uint x) public pure {
-        while (x == 2) {
-        }
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTSolvers: z3
-// ----
-// Warning 6328: (155-169): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol
deleted file mode 100644
index f5ee2dfaff37..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// Check that negation of condition is not assumed after the body anymore
-contract C {
-    function f(uint x) public pure {
-        while (x == 2) {
-        }
-        assert(x != 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
deleted file mode 100644
index 5a085fdb023b..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// Check that side-effects of condition are taken into account
-contract C {
-    function f(uint x, uint y) public pure {
-        x = 7;
-        while ((x = y) > 0) {
-			--y;
-        }
-        assert(x == 7);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 6328: (192-206): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol
deleted file mode 100644
index 8f80745b8b53..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C
-{
-	function f(uint x, uint y, bool b, bool c) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b) {
-				++x;
-				if (x == 10)
-					x = 15;
-			}
-			else {
-				require(y < 10);
-				while (y < 10) {
-					if (c)
-						++y;
-					else {
-						y = 20;
-						break;
-					}
-				}
-				assert(y >= 10);
-				x = 15;
-				break;
-			}
-		}
-		assert(x >= 15);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
deleted file mode 100644
index 60ce3be9ba15..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C
-{
-	function f(uint x, uint y, bool b, bool c) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b) {
-				++x;
-				if (x == 10)
-					x = 15;
-			}
-			else {
-				require(y < 10);
-				while (y < 10) {
-					if (c)
-						++y;
-					else {
-						y = 20;
-						break;
-					}
-				}
-				assert(y >= 15);
-				x = 15;
-				break;
-			}
-		}
-		assert(x >= 20);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (296-311): CHC: Assertion violation happens here.
-// Warning 6328: (347-362): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol
deleted file mode 100644
index eee4d91df644..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C
-{
-	function f(uint x, uint y, bool b, bool c) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b) {
-				x = 20;
-				continue;
-			}
-			else {
-				require(y < 10);
-				while (y < 10) {
-					if (c) {
-						y = 20;
-						continue;
-					}
-					y = 15;
-					break;
-				}
-				assert(y >= 15);
-				x = y;
-			}
-		}
-		assert(x >= 15);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
deleted file mode 100644
index 180d85adcade..000000000000
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C
-{
-	function f(uint x, uint y, bool b, bool c) public pure {
-		require(x < 10);
-		while (x < 10) {
-			if (b) {
-				x = 15;
-				continue;
-			}
-			else {
-				require(y < 10);
-				while (y < 10) {
-					if (c) {
-						y = 20;
-						continue;
-					}
-					y = 15;
-					break;
-				}
-				assert(y >= 20);
-				x = y;
-			}
-		}
-		assert(x >= 20);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (290-305): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 15\nb = false\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(0, 0, false, false)
-// Warning 6328: (329-344): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(0, 0, true, false)
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_1.sol b/test/libsolidity/smtCheckerTests/math/addmod_1.sol
deleted file mode 100644
index 3ec75c8c7c5d..000000000000
--- a/test/libsolidity/smtCheckerTests/math/addmod_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() public pure {
-		assert(addmod(2**256 - 1, 10, 9) == 7);
-		uint y = 0;
-		uint x = addmod(2**256 - 1, 10, y);
-		assert(x == 1);
-	}
-	function g(uint x, uint y, uint k) public pure returns (uint) {
-		return addmod(x, y, k);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.
-// Warning 6328: (137-151): CHC: Assertion violation happens here.
-// Warning 4281: (230-245): CHC: Division by zero happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol b/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol
deleted file mode 100644
index b957a9b41219..000000000000
--- a/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function test() public pure {
-		uint x;
-		if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) x = 1;
-		if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) x = 2;
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (60-110): BMC: Condition is always false.
-// Warning 6838: (125-175): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol b/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
deleted file mode 100644
index 90a4f8b9d046..000000000000
--- a/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	function f(uint256 d) public pure {
-		uint x = addmod(1, 2, d);
-		assert(x < d);
-	}
-
-	function g(uint256 d) public pure {
-		uint x = mulmod(1, 2, d);
-		assert(x < d);
-	}
-
-	function h() public pure returns (uint256) {
-		uint x = mulmod(0, 1, 2);
-		uint y = mulmod(1, 0, 2);
-		assert(x == y);
-		uint z = addmod(0, 1, 2);
-		uint t = addmod(1, 0, 2);
-		assert(z == t);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (220-227): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 4281: (61-76): CHC: Division by zero happens here.
-// Warning 6328: (80-93): CHC: Assertion violation happens here.
-// Warning 4281: (147-162): CHC: Division by zero happens here.
-// Warning 6328: (166-179): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/addmulmod.sol b/test/libsolidity/smtCheckerTests/math/addmulmod.sol
deleted file mode 100644
index 478121284a77..000000000000
--- a/test/libsolidity/smtCheckerTests/math/addmulmod.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function test_addmod(uint x, uint y) public pure {
-		require(x % 13 == 0);
-		require(y % 13 == 0);
-
-		uint z = addmod(x, y, 13);
-		assert(z == 0);
-	}
-	function test_mulmod(uint x, uint y) public pure {
-		require(x % 13 == 0);
-		require(y % 13 == 0);
-
-		uint z = mulmod(x, y, 13);
-		assert(z == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/mulmod_1.sol b/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
deleted file mode 100644
index de15f362a3b6..000000000000
--- a/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() public pure {
-		assert(mulmod(2**256 - 1, 2, 14) == 2);
-		uint y = 0;
-		uint x = mulmod(2**256 - 1, 10, y);
-		assert(x == 1);
-	}
-	function g(uint x, uint y, uint k) public pure returns (uint) {
-		return mulmod(x, y, k);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.
-// Warning 6328: (137-151): CHC: Assertion violation happens here.
-// Warning 4281: (230-245): CHC: Division by zero happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_abstract.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_abstract.sol
deleted file mode 100644
index 9d541b629988..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_abstract.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract A {
-	function f() public mod {}
-	modifier mod virtual;
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_assignment_outside_branch.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_assignment_outside_branch.sol
deleted file mode 100644
index f23a6215db0e..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_assignment_outside_branch.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-    uint x;
-    address owner;
-
-	modifier onlyOwner {
-        if (msg.sender == owner) _;
-    }
-
-    function f() public onlyOwner {
-    }
-
-    function g(uint y) public {
-        y = 1;
-        if (y > x) f();
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
deleted file mode 100644
index 5f08811b5c6c..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		require(x > 0);
-		_;
-		// Fails because of overflow behavior.
-		assert(x > 1);
-	}
-
-	function f() m public {
-		assert(x > 0);
-		unchecked { x = x + 1; }
-	}
-
-	function g(uint _x) public {
-		x = _x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (103-116): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
deleted file mode 100644
index f348bf24d031..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		if (x == 0)
-			_;
-	}
-
-	function f() m public view {
-		assert(x == 0);
-		assert(x > 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (111-124): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inline_function_inside_branch.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inline_function_inside_branch.sol
deleted file mode 100644
index dd329c65ab38..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inline_function_inside_branch.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	address owner;
-	modifier m {
-		if (true)
-			owner = g();
-		_;
-	}
-	function f() m public {
-	}
-	function g() public pure returns (address) {
-		address a;
-		a = address(0);
-		return a;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch.sol
deleted file mode 100644
index f910b544f283..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    address owner;
-    modifier onlyOwner {
-        if (msg.sender == owner) _;
-    }
-    function g() public onlyOwner {
-    }
-    function f(uint x) public {
-        if (x > 0) g();
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
deleted file mode 100644
index caa67b0da968..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint x;
-	address owner;
-
-	modifier onlyOwner {
-		if (msg.sender == owner) _;
-	}
-
-	function f() public onlyOwner {
-		x = 0;
-	}
-	function g(uint y) public {
-		x = 1;
-		if (y > 0)
-			f();
-		// Fails for {y = >0, msg.sender == owner, x = 0}.
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (254-267): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.f()\nState: x = 0, owner = 0x0\nC.g(1)\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
deleted file mode 100644
index 187305a6eb3e..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-	uint x;
-	address owner;
-
-	modifier onlyOwner {
-		if (msg.sender == owner) {
-			require(x > 0);
-			_;
-		}
-	}
-
-	function f() public onlyOwner {
-		// Condition is always true due to `require(x > 0)` in the modifier.
-		if (x > 0)
-			x -= 1;
-	}
-	function g(uint y) public {
-		x = 2;
-		if (y > 0)
-			f();
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (233-238): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
deleted file mode 100644
index db597db2a33f..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract C {
-	uint x;
-	address owner;
-
-	modifier onlyOwner {
-		if (msg.sender == owner) {
-			require(x > 0);
-			_;
-		}
-	}
-
-	function f() public onlyOwner {
-		x -= 1;
-		h();
-	}
-	function h() public onlyOwner {
-		require(x < 10000);
-		x += 2;
-	}
-	function g(uint y) public {
-		require(y > 0 && y < 10000);
-		require(msg.sender == owner);
-		x = y;
-		if (y > 1) {
-			f();
-			// This now fails as a false positive because
-			// CHC does not propagate msg.sender throughout predicates.
-			assert(x == y + 1);
-		}
-		// Fails for {y = 0, x = 0}.
-		assert(x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (540-554): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
deleted file mode 100644
index 292c44ae1c11..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		require(x > 0);
-		require(x < 10000);
-		_;
-	}
-
-	modifier n {
-		x = x + 1;
-		_;
-		assert(x > 2);
-		assert(x > 8);
-	}
-
-	function f() m n public {
-		x = x + 1;
-	}
-
-	function g(uint _x) public {
-		x = _x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (137-150): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
deleted file mode 100644
index fb503bb7b299..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	modifier m(uint a, uint b) {
-		require(g(a, b));
-		_;
-	}
-
-	modifier notZero(uint x) {
-		require(x > 0);
-		_;
-	}
-
-	function g(uint a, uint b) notZero(a) internal pure returns (bool) {
-		return a > b;
-	}
-
-	function f(uint x) m(x, 0) public pure {
-		assert(x > 0);
-		assert(x > 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (278-291): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
deleted file mode 100644
index 1e55dab19bed..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	modifier m(uint a, uint b) {
-		require(g(a, b));
-		_;
-	}
-
-	function g(uint a, uint b) m(a, b) internal pure returns (bool) {
-		return a > b;
-	}
-
-	function f(uint x) m(x, 0) public pure {
-		assert(x > 0);
-		assert(x > 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5740: (137-157): Unreachable code.
-// Warning 5740: (199-237): Unreachable code.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
deleted file mode 100644
index 31578a311438..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	modifier m(uint a, uint b) {
-		require(a > b);
-		_;
-	}
-
-	function f(uint x) m(x, 0) public pure {
-		assert(x > 0);
-		assert(x > 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (131-144): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
deleted file mode 100644
index b3c5b8ed0fdb..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		require(x > 0);
-		_;
-	}
-
-	function f() m public {
-		assert(x > 0);
-		x = x + 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
deleted file mode 100644
index 9165ed13311a..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-abstract contract A {
-	uint s;
-
-	function f() public mod(s) {}
-	modifier mod(uint x) virtual;
-}
-
-contract B is A {
-	modifier mod(uint x) override {
-		require(x == 42);
-		_;
-		assert(x == 42); // should hold
-		assert(x == 0); // should fail
-	}
-
-	function set(uint x) public {
-		s = x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (209-223): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol
deleted file mode 100644
index fd9dc9008523..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-abstract contract A {
-	bool s;
-
-	function f() public view mod {
-		assert(s); // holds for C, but fails for B
-	}
-	modifier mod() virtual;
-}
-
-contract B is A {
-	modifier mod() virtual override {
-		s = false;
-		_;
-	}
-}
-
-contract C is B {
-	modifier mod() override {
-		s = true;
-		_;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (66-75): CHC: Assertion violation happens here.\nCounterexample:\ns = false\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
deleted file mode 100644
index f85e1b3baec0..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-abstract contract A {
-	bool s;
-
-	function f() public view mod {
-		assert(s); // holds for B
-		assert(!s); // fails for B
-	}
-	modifier mod() virtual;
-}
-
-contract B is A {
-	modifier mod() virtual override {
-		bool x = true;
-		s = x;
-		_;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (94-104): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
deleted file mode 100644
index 652dd811f3d4..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-abstract contract A {
-	int x = 0;
-
-	function f() public view mod() {
-		assert(x != 0); // does not hold for A, but A is abstract so it should not be reported
-		assert(x != 1); // fails for B
-		assert(x != 2); // fails for C
-		assert(x != 3); // fails for D
-	}
-
-	modifier mod() virtual {
-		_;
-	}
-}
-
-contract B is A {
-	modifier mod() virtual override {
-		x = 1;
-		_;
-	}
-}
-
-contract C is A {
-	modifier mod() virtual override {
-		x = 2;
-		_;
-	}
-}
-
-contract D is B,C {
-	modifier mod() virtual override (B,C){
-		x = 3;
-		_;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (160-174): CHC: Assertion violation happens here.
-// Warning 6328: (193-207): CHC: Assertion violation happens here.
-// Warning 6328: (226-240): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
deleted file mode 100644
index 1612cb8e77e3..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	modifier m(uint x) {
-		x == 2;
-		_;
-	}
-
-	function f(uint x) m(x) public pure {
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol
deleted file mode 100644
index 761dd8a3bc82..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	uint s;
-	modifier m(uint a) {
-		// Condition is always true for m(2).
-		require(a > 0);
-		_;
-	}
-
-	function f(uint x) m(x) m(2) m(s) public view {
-		assert(x > 0);
-		assert(s > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol
deleted file mode 100644
index baa295d8515a..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	modifier m(uint x) {
-		require(x == 2);
-		_;
-		return;
-	}
-
-	modifier n(uint x) {
-		require(x == 3);
-		_;
-	}
-
-	function f(uint x) m(x) n(x) public pure {
-		assert(x == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol
deleted file mode 100644
index 1d86c0fead95..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	modifier m {
-		uint x = 2;
-		_;
-	}
-
-	function f(uint x) m public pure {
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nx = 2\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol
deleted file mode 100644
index 7875bb80f9bd..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		require(x > 0);
-		_;
-	}
-
-	function f() m public view {
-		assert(x > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol
deleted file mode 100644
index 26197459b041..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		// Condition is always true for the second invocation.
-		require(x > 0);
-		require(x < 10000);
-		_;
-		assert(x > 1);
-	}
-
-	function f() m m public {
-		x = x + 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
deleted file mode 100644
index d6bc51ffd5c3..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		require(x == 0);
-		_;
-		x = x + 1;
-		assert(x <= 2);
-	}
-
-	function f() m m public {
-		x = x + 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (76-90): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
deleted file mode 100644
index 00b6fab519ce..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C
-{
-	uint x;
-
-	modifier m {
-		require(x > 0);
-		require(x < 10000);
-		_;
-		assert(x > 1);
-		_;
-		assert(x > 2);
-		assert(x > 10);
-	}
-
-	function f() m public {
-		x = x + 1;
-	}
-
-	function g(uint _x) public {
-		x = _x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (123-137): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_1.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_1.sol
deleted file mode 100644
index 40bc6d93ebbd..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    modifier m virtual {
-      _;
-    }
-}
-contract C is A {
-    function f() public A.m returns (uint) {
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
deleted file mode 100644
index b270fb2bb5e1..000000000000
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract A {
-	int x = 0;
-
-	modifier m virtual {
-		assert(x == 0); // should hold
-		assert(x == 42); // should fail
-		_;
-	}
-}
-contract C is A {
-
-	modifier m override {
-		assert(x == 1); // This assert is not reachable, should NOT be reported
-		_;
-	}
-
-	function f() public A.m returns (uint) {
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (83-98): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol
deleted file mode 100644
index d013670594ed..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.13;
-
-contract C {
-    function f(uint x) external pure {
-        uint t = msb(x);
-        assert(t == 0); // should fail
-    }
-}
-
-/// @custom:smtchecker abstract-function-nondet
-function msb(uint256 x) pure returns (uint256 result) {}
-
-// ====
-// SMTEngine: chc
-// ----
-// Warning 6328: (144-158): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol
deleted file mode 100644
index 57f0707a7149..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	/// @custom:smtchecker abstract-function-nondet
-	function f(uint x) internal pure returns (uint) {
-		return x;
-	}
-	function g(uint y) public pure {
-		uint z = f(y);
-		// Generally holds, but here it doesn't because function
-		// `f` has been abstracted by nondeterministic values.
-		assert(z == y);
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (297-311): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol
deleted file mode 100644
index b9bca0357a91..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-	function e(uint _e) public pure {
-		// Without abstracting function `pow` the solver
-		// fails to prove that `++i` does not overflow.
-		for (uint i = 0; i < _e; ++i)
-			pow(_e, _e);
-	}
-
-	function pow(uint base, uint exponent) internal pure returns (uint) {
-		// Disabled because of Spacer nondet
-		/*
-		if (base == 0) {
-			return 0;
-		}
-		if (exponent == 0) {
-			return 1;
-		}
-		if (exponent == 1) {
-			return base;
-		}
-		uint y = 1;
-		while(exponent > 1) {
-			if(exponent % 2 == 0) {
-				base = base * base;
-				exponent = exponent / 2;
-			} else {
-				y = base * y;
-				base = base * base;
-				exponent = (exponent - 1) / 2;
-			}
-		}
-		return base * y;
-		*/
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol
deleted file mode 100644
index e0647000a2cf..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-	function e(uint _e) public pure {
-		// Without abstracting function `pow` the solver
-		// fails to prove that `++i` does not overflow.
-		for (uint i = 0; i < _e; ++i)
-			pow(_e, _e);
-	}
-
-	/// @custom:smtchecker abstract-function-nondet
-	function pow(uint base, uint exponent) internal pure returns (uint) {
-		if (base == 0) {
-			return 0;
-		}
-		if (exponent == 0) {
-			return 1;
-		}
-		if (exponent == 1) {
-			return base;
-		}
-		uint y = 1;
-		while(exponent > 1) {
-			if(exponent % 2 == 0) {
-				base = base * base;
-				exponent = exponent / 2;
-			} else {
-				y = base * y;
-				base = base * base;
-				exponent = (exponent - 1) / 2;
-			}
-		}
-		return base * y;
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_empty.sol b/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_empty.sol
deleted file mode 100644
index 981c4b9ff780..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_empty.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	/// @custom:smtchecker
-	function f(uint x) internal pure returns (uint) {
-		return x;
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 3130: (38-102): Unknown option for "custom:smtchecker": ""
diff --git a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_error_1.sol b/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_error_1.sol
deleted file mode 100644
index ba704f52b096..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_error_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	/// @custom:smtchecker abstract-function
-	function f(uint x) internal pure returns (uint) {
-		return x;
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 3130: (56-120): Unknown option for "custom:smtchecker": "abstract-function"
diff --git a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol b/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol
deleted file mode 100644
index a19923c9cb08..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    /// @custom:smtchecker b
-    /// @custom:smtchecker
-    /// @custom:smtchecker a b c
-    function f() internal {}
-}
-
-contract D is C {}
-// ----
-// Warning 3130: (106-130): Unknown option for "custom:smtchecker": "b"
diff --git a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol
deleted file mode 100644
index 62cd8e56b992..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-	uint x;
-	uint y;
-
-	function g(uint _x) public {
-		f1(_x);
-		// If the body of function `f` is ignored while keeping the state,
-		// the assertion is true and not reporting it would be a false negative.
-		// However, since `f` can change the state, the state variables are also
-		// assigned nondeterministic values after a call to `f`.
-		// Therefore the assertion below should fail.
-		assert(x == 0);
-
-		f2(_x);
-		assert(y == 0); // should fail
-	}
-
-	/// @custom:smtchecker abstract-function-nondet
-	function f1(uint _x) internal {
-		x = _x;
-	}
-
-	function f2(uint _y) internal {
-		y = _y;
-	}
-
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 6328: (400-414): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
-// Warning 6328: (429-443): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 1\n_x = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(1)\n    C.f1(1) -- internal call\n    C.f2(1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
deleted file mode 100644
index 552c8d4f60e6..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	uint x;
-	uint y;
-
-	function g(uint _x) public {
-		uint z = f1(_x);
-		assert(x == 0); // should hold because f1 is pure
-		assert(z == _x); // should hold but f1 was abstracted as nondet, so it fails
-
-		uint t = f2(_x);
-		assert(y == 0); // should hold because f1 is pure and f2 is view
-		assert(t == _x); // should hold
-	}
-
-	/// @custom:smtchecker abstract-function-nondet
-	function f1(uint _x) internal pure returns (uint) {
-		return _x;
-	}
-
-	function f2(uint _y) internal view returns (uint) {
-		return _y;
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTIgnoreCex: yes
-// ----
-// Warning 2018: (33-335): Function state mutability can be restricted to view
-// Warning 2018: (457-524): Function state mutability can be restricted to pure
-// Warning 6328: (135-150): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol b/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
deleted file mode 100644
index 6202478a6986..000000000000
--- a/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	uint x;
-	uint y;
-
-	function g(uint _x) public {
-		f1(_x);
-		assert(x > 0); // should fail
-
-		f2(_x);
-		assert(y > 0); // should fail
-	}
-
-	/// @custom:smtchecker abstract-function-nondet
-	function f1(uint _x) internal {
-		x = _x;
-	}
-
-	function f2(uint _y) internal {
-		y = _y;
-	}
-
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 6328: (74-87): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
-// Warning 6328: (117-130): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call\n    C.f2(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol
deleted file mode 100644
index a0fd84c9353f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    string public name = (C).name = type(C).name;
-
-    function f() external view {
-        assert(keccak256(bytes(name)) == keccak256(bytes("C"))); // should fail because SMTChecker doesn't support type(C).name
-    }
-}
-// ----
-// Warning 7507: (49-61): Assertion checker does not yet support this expression.
-// Warning 6328: (105-160): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
deleted file mode 100644
index c89314e0fdc8..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint x = ((((C)))).x = ((C)).x = 2;
-
-    function f() external view {
-        assert(x == 2); // should hold
-    }
-
-    function g() external view {
-        assert(x != 2); // should fail
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (174-188): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
deleted file mode 100644
index e53436a0f66c..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint x = ((((C)))).x = ((C)).x = 2;
-
-    function f() external view {
-        assert(x == 2); // should fail for D
-    }
-
-    function g() external view {
-        assert(x != 2); // should fail for C
-    }
-}
-
-contract D is C {
-    uint y = ((C)).x = 3;
-
-    function h() external view {
-        assert(y == 3); // should hold
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\ny = 3, x = 3\n\nTransaction trace:\nD.constructor()\nState: y = 3, x = 3\nC.f()
-// Warning 6328: (180-194): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
deleted file mode 100644
index 40eb48672ebe..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract A {
-	int x;
-	int y;
-	function a() public {
-		require(A.x < 100);
-		A.y = A.x++;
-		assert(A.y == A.x - 1);
-		// Fails
-		// assert(A.y == 0); // Disabled because of nondeterminism in Spacer
-		A.y = ++A.x;
-		assert(A.y == A.x);
-		delete A.x;
-		assert(A.x == 0);
-		A.y = A.x--;
-		assert(A.y == A.x + 1);
-		assert(A.y == 0);
-		A.y = --A.x;
-		assert(A.y == A.x);
-		A.x += 10;
-		// Fails
-		assert(A.y == 0);
-		assert(A.y + 10 == A.x);
-		A.x -= 10;
-		assert(A.y == A.x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreInv: yes
-// ----
-// Warning 6328: (392-408): CHC: Assertion violation happens here.
-// Info 1391: CHC: 17 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
deleted file mode 100644
index 3a93659f4361..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-	uint[] a;
-	function f() public {
-		A.a.push(2);
-		assert(A.a[A.a.length - 1] == 2);
-		A.a.pop();
-		// Fails
-		assert(A.a.length > 0);
-		assert(A.a.length == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (124-146): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
deleted file mode 100644
index 15bb168a72a0..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    int[] a;
-    function f() public {
-		A.a.push();
-        A.a[0] = 2;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
deleted file mode 100644
index 0fe3e68bea1d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract A {
-	int[] a;
-	constructor() {
-		p();
-	}
-	function p() public {
-		a.push(1);
-	}
-	function f() public {
-		require(a.length == 1 && a[0] == 1);
-		int[] storage u = a;
-		assert(u[0] == 1); // should hold
-		int[] memory b = new int[](2);
-		a = b;
-		// Access is safe but oob is reported due to aliasing.
-		assert(u[0] == 1); // should fail
-		A.a = b;
-		// Access is safe but oob is reported due to aliasing.
-		assert(u[0] == 1); // should fail
-	}
-
-	function push_v(int x) public {
-		a.push(x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (318-322): CHC: Out of bounds access happens here.
-// Warning 6328: (311-328): CHC: Assertion violation happens here.
-// Warning 6368: (422-426): CHC: Out of bounds access happens here.
-// Warning 6328: (415-432): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
deleted file mode 100644
index baa1c75a474a..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-==== Source: AASource ====
-import "AASource" as AA;
-contract A {
-	int x;
-	int y;
-	function a() public {
-		require(A.x < 100);
-		AA.A.y = A.x++;
-		assert(A.y == AA.A.x - 1);
-		// Fails
-		assert(AA.A.y == 0);
-		A.y = ++AA.A.x;
-		assert(A.y == A.x);
-		delete AA.A.x;
-		assert(A.x == 0);
-		A.y = A.x--;
-		assert(AA.A.y == AA.A.x + 1);
-		A.y = --A.x;
-		assert(A.y == A.x);
-		AA.A.x += 10;
-		// Fails
-		assert(A.y == 0);
-		assert(A.y + 10 == A.x);
-		A.x -= 10;
-		assert(AA.A.y == A.x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (AASource:159-178): CHC: Assertion violation happens here.
-// Warning 6328: (AASource:370-386): CHC: Assertion violation happens here.
-// Info 1391: CHC: 16 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol
deleted file mode 100644
index 175702d6837b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure {
-		assert(bytes1("") & ("") == bytes1(0)); // should hold
-		assert(bytes1(0xAA) & bytes1(0x55) == bytes1(0)); // should hold
-		assert(bytes1(0xFF) & bytes1(0xAA) == bytes1(0xAA)); // should hold
-		assert(bytes1(0xFF) & bytes1(0xAA) == bytes1(0)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (237-285): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
deleted file mode 100644
index b280038accfc..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function f() public pure {
-		int8 x = 1;
-		int8 y = 0;
-		assert(x & y != 0); // should fail
-		x = -1; y = 3;
-		assert(x & y == 3); // should hold
-		y = -1;
-		int8 z = x & y;
-		assert(z == -1); // should hold
-		y = 127;
-		assert(x & y == 127); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (71-89): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
deleted file mode 100644
index ec649ce7b097..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure {
-		assert(1 & 0 != 0);
-		assert(-1 & 3 == 3);
-		assert(-1 & -1 == -1);
-		assert(-1 & 127 == 127);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (43-61): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
deleted file mode 100644
index fcf2bdfca8de..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		uint8 x = 1;
-		uint16 y = 0;
-		assert(x & y != 0);
-		x = 0xff;
-		y = 0xffff;
-		assert(x & y == 0xff);
-		assert(x & y == 0xffff);
-		assert(x & y == 0x0000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (74-92): CHC: Assertion violation happens here.
-// Warning 6328: (147-170): CHC: Assertion violation happens here.
-// Warning 6328: (174-197): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol
deleted file mode 100644
index 0a0822dd9b19..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure {
-		uint8 x = 0xff;
-		uint8 y = ~x;
-		assert(x & y == 0);
-		assert(x | y == 0xff);
-		assert(x ^ y == 0xff);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
deleted file mode 100644
index c028baf9f580..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure {
-		// ffff0000 in bytes4
-		bytes4 x = ~bytes4(hex"ffff");
-		assert(x == 0xffff0000); // should fail
-		assert(x == 0x0000ffff); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (100-123): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
deleted file mode 100644
index cf6d09000613..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		int16 x = 1;
-		assert(~x == 0);
-		x = 0xff;
-		assert(~x == 0);
-		x = 0x0f;
-		assert(~x == 0xf0);
-		x = -1;
-		assert(~x != 0);
-		x = -2;
-		assert(~x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (58-73): CHC: Assertion violation happens here.
-// Warning 6328: (89-104): CHC: Assertion violation happens here.
-// Warning 6328: (120-138): CHC: Assertion violation happens here.
-// Warning 6328: (152-167): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
deleted file mode 100644
index 19b33bd6e696..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure {
-		uint8 x = 0xff;
-		assert(~x == 0x00);
-		uint16 y = 0xff00;
-		assert(~y == 0xff);
-		assert(~y == 0xffff);
-		assert(~y == 0x0000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (126-146): CHC: Assertion violation happens here.
-// Warning 6328: (150-170): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
deleted file mode 100644
index f1e89940907b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    // tests that bitwise operators are parsed from z3 answer
-    function test(uint x, uint y) public pure {
-        x | y;
-        x & y;
-        x ^ y;
-        assert(true);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
deleted file mode 100644
index 9ae3b79e6e19..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure returns (bytes1) {
-		bytes1 b = (bytes1(0x0F) | (bytes1(0xF0)));
-		assert(b == bytes1(0xFF)); // should hold
-		assert(b == bytes1(0x00)); // should fail
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (150-175): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
deleted file mode 100644
index 9f1ff33277ef..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		int16 x = 1;
-		int16 y = 0;
-		assert(x | y == 1);
-		x = 0; y = 0;
-		assert(x | y != 0);
-		y = 240;
-		x = 15;
-		int16 z = x | y;
-		assert(z == 255);
-		x = -1; y = 200;
-		assert(x | y == x);
-		assert(x | z != -1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (111-129): CHC: Assertion violation happens here.
-// Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
deleted file mode 100644
index e66c5e8c5e9f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() public pure {
-		uint8 x = 1;
-		uint16 y = 0;
-		assert(x | y != 0);
-		x = 0xff;
-		y = 0xff00;
-		assert(x | y == 0xff);
-		assert(x | y == 0xffff);
-		assert(x | y == 0x0000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (122-143): CHC: Assertion violation happens here.
-// Warning 6328: (174-197): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol
deleted file mode 100644
index 1783a4e35594..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure {
-		uint x = type(uint256).max - 1;
-		assert(x == 2**256 - 2);
-		assert(~1 == -2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
deleted file mode 100644
index 5dc27441790f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure {
-		assert(~1 | (~0xff & 0) == -2);
-		int x = ~1 | (~0xff ^ 0);
-		/// Result is negative, assertion fails.
-		assert(x > 0);
-		int y = ~x | (0xff & 1);
-		assert(y > 0);
-		assert(y & (0xffffffffffffffffff & 1) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (148-161): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
deleted file mode 100644
index 927097552d85..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract Simp {
-	function f3() public pure returns (bytes1) {
-		bytes memory y = "def";
-		assert(y[0] ^ "e" != bytes1(0)); // should hold
-		assert(y[1] ^ "e" != bytes1(0)); // should fail
-		return y[0];
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (140-171): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
deleted file mode 100644
index 67b2246eac72..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function f() public pure {
-		int8 x = 1;
-		int16 y = 0;
-		assert(x ^ y == 1);
-		int16 z = -1;
-		assert(x ^ z == -2);
-		assert(y ^ z == -1);
-		assert(y ^ z > 0);
-		x = 7; y = 3;
-		assert(x ^ y < 5);
-		assert(x ^ y > 5);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (156-173): CHC: Assertion violation happens here.
-// Warning 6328: (214-231): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
deleted file mode 100644
index 6dcbcc8bef8a..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() public pure {
-		uint8 x = 1;
-		uint16 y = 0;
-		assert(x ^ y != 0);
-		x = 0xff;
-		y = 0xff00;
-		assert(x ^ y == 0xff);
-		assert(x ^ y == 0xffff);
-		assert(x ^ y == 0x0000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (122-143): CHC: Assertion violation happens here.
-// Warning 6328: (174-197): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bytes_new.sol b/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
deleted file mode 100644
index 2c9d5e39c663..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes memory x = new bytes(0);
-		assert(x.length == 0);
-	}
-	function g() public pure {
-		bytes memory x = new bytes(3);
-		assert(x.length == 3);
-		assert(x[0] == 0);
-		assert(x[1] == 0);
-		assert(x[2] == 0);
-	}
-	function h() public pure {
-		bytes memory x = new bytes(3);
-		assert(x.length == 3);
-		x[0] = 0x12;
-		x[1] = 0x34;
-		assert(x[0] == 0x12);
-		assert(x[1] == 0x34);
-		// This should be an out-of-bounds assertion.
-		x[5] = 0xff;
-		assert(x[5] == 0xff);
-	}
-	function h(uint size) public pure {
-		bytes memory x = new bytes(size);
-		assert(x.length == size);
-		require(size >= 2);
-		x[0] = 0x12;
-		x[1] = 0x34;
-		assert(x[0] == 0x12);
-		assert(x[1] == 0x34);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (468-472): CHC: Out of bounds access happens here.
-// Warning 6368: (490-494): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add.sol b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
deleted file mode 100644
index 7a18b1c7ee4e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_add.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		uint y = 100;
-		y += y + x;
-		assert(y < 300);
-		assert(y < 110);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (118-133): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
deleted file mode 100644
index 5d8b4aaa18cf..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	uint[] array;
-	constructor() {
-		q(); q();
-	}
-	function q() public {
-		array.push();
-	}
-	function f(uint x, uint p) public {
-		require(p < array.length);
-		require(x < 100);
-		array[p] = 100;
-		array[p] += array[p] + x;
-		assert(array[p] < 300);
-		assert(array[p] < 110);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (262-284): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol
deleted file mode 100644
index 07a41244c1c5..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint a = 1;
-		uint b = 3;
-		uint c = 7;
-		a += b += c;
-		assert(b ==  10 && a == 11);
-		a += (b += c);
-		assert(b ==  17 && a == 28);
-		a += a += a;
-		assert(a == 112);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
deleted file mode 100644
index e0025230722e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x, uint p) public {
-		require(x < 100);
-		map[p] = 100;
-		map[p] += map[p] + x;
-		assert(map[p] < 300);
-		assert(map[p] < 110);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (165-185): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
deleted file mode 100644
index 5922c59df5a1..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(uint x) public pure {
-		require(x == 2);
-		uint y = 10;
-		y /= y / x;
-		assert(y == x);
-		assert(y == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (115-129): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
deleted file mode 100644
index 9290d364ef01..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	uint[] array;
-	constructor() {
-		q(); q();
-	}
-	function q() public {
-		array.push();
-	}
-	function f(uint x, uint p) public {
-		require(p < array.length);
-		require(x == 2);
-		array[p] = 10;
-		array[p] /= array[p] / x;
-		assert(array[p] == x);
-		assert(array[p] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (259-280): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
deleted file mode 100644
index 6611531157a2..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	mapping (uint => uint) map;
-	function f(uint x, uint p) public {
-		require(x == 2);
-		map[p] = 10;
-		map[p] /= map[p] / x;
-		assert(map[p] == x);
-		assert(map[p] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (162-181): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol
deleted file mode 100644
index 01f89d97a909..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(int a, uint b) public view {
-		a >>= tx.gasprice;
-		require(a == 16 && b == 2);
-		a >>= b;
-		assert(a == 4); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
deleted file mode 100644
index d596ddb895fe..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public pure returns (bytes1) {
-        bytes1 a = 0xff;
-        bytes1 b = 0xf0;
-        a &= b;
-        assert(a == b);
-
-        a &= ~b;
-        assert(a != 0); // fails
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
deleted file mode 100644
index 0797321f6df5..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		int8 x = 1;
-		int8 y = 0;
-		x &= y;
-		assert(x != 0); // fails
-		x = -1; y = 3;
-		y &= x;
-		assert(y == 3);
-		y = -1;
-		y &= x;
-		assert(y == -1);
-		y = 127;
-		x &= y;
-		assert(x == 127);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
deleted file mode 100644
index 3fe528cef58b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-    function f() public pure {
-        uint v = 1;
-        v &= 1;
-        assert(v == 1);
-
-        v = 7;
-        v &= 3;
-        assert(v != 3); // fails, as 7 & 3 = 3
-
-        uint c = 0;
-        c &= v;
-        assert(c == 0);
-
-        uint8 x = 0xff;
-        uint16 y = 0xffff;
-        y &= x;
-        assert(y == 0xff);
-        assert(y == 0xffff); // fails
-
-        y = 0xffff;
-        x = 0xff;
-        y &= y | x;
-        assert(y == 0xffff);
-        assert(y == 0xff); // fails
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (144-158): CHC: Assertion violation happens here.
-// Warning 6328: (347-366): CHC: Assertion violation happens here.
-// Warning 6328: (473-490): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
deleted file mode 100644
index f8206376d8f0..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public pure returns (bytes1) {
-        bytes1 a = 0xff;
-        bytes1 b = 0xf0;
-        b |= a;
-        assert(a == b);
-
-        a |= ~b;
-        assert(a == 0); // fails
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
deleted file mode 100644
index 3309b5d8f505..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function f() public pure {
-		int8 x = 1;
-		int8 y = 0;
-		x |= y;
-		assert(x == 0); // fails
-		x = -1; y = 3;
-		x |= y;
-		assert(x == -1);
-		x = 4;
-		y |= x;
-		assert(y == 7);
-		y = 127;
-		x |= y;
-		assert(x == 127);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
deleted file mode 100644
index d3fbc3222571..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    int[1][20] c;
-    function f(bool b) public {
-	    require(c[10][0] == 0);
-        if (b)
-            c[10][0] |= 1;
-        assert(c[10][0] == 0 || c[10][0] == 1);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (76-81): CHC: Out of bounds access might happen here.
-// Warning 6368: (76-84): CHC: Out of bounds access might happen here.
-// Warning 6368: (119-124): CHC: Out of bounds access might happen here.
-// Warning 6368: (119-127): CHC: Out of bounds access might happen here.
-// Warning 6368: (149-154): CHC: Out of bounds access might happen here.
-// Warning 6368: (149-157): CHC: Out of bounds access might happen here.
-// Warning 6368: (166-171): CHC: Out of bounds access might happen here.
-// Warning 6368: (166-174): CHC: Out of bounds access might happen here.
-// Warning 6328: (142-180): CHC: Assertion violation might happen here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
deleted file mode 100644
index d022f87e6c13..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f() public pure {
-        uint v = 7;
-        v |= 3;
-        assert(v != 7); // fails, as 7 | 3 = 7
-
-        uint c = 0;
-        c |= v;
-        assert(c == 7);
-
-        uint16 x = 0xff;
-        uint16 y = 0xffff;
-        y |= x;
-        assert(y == 0xff); // fails
-        assert(y == 0xffff);
-
-        y = 0xf1ff;
-        x = 0xff00;
-        x |= y & x;
-        assert(y == 0xffff); // fails
-        assert(x == 0xff00);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.
-// Warning 6328: (265-282): CHC: Assertion violation happens here.
-// Warning 6328: (391-410): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
deleted file mode 100644
index f0916cf7e869..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    uint[1] c;
-    function f(bool b) public {
-        require(c[0] == 0);
-        if (b)
-            c[0] |= 1;
-        assert(c[0] <= 1);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (76-80): CHC: Out of bounds access might happen here.
-// Warning 6368: (115-119): CHC: Out of bounds access might happen here.
-// Warning 6368: (141-145): CHC: Out of bounds access might happen here.
-// Warning 6328: (134-151): CHC: Assertion violation might happen here.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
deleted file mode 100644
index edd36047cf82..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    struct S {
-        uint[] x;
-    }
-    S s;
-	constructor() {
-		s.x.push();
-		s.x.push();
-		s.x.push();
-		s.x.push();
-	}
-    function f(bool b) public {
-        if (b)
-            s.x[2] |= 1;
-		// Removed because of Spacer nondeterminism.
-        //assert(s.x[2] != 1);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (196-202): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol
deleted file mode 100644
index 2650b08975bd..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-    S s;
-    function f(bool b) public {
-        s.x |= b ? 1 : 2;
-        assert(s.x > 0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (125-140): CHC: Assertion violation might happen here.
-// Warning 7812: (125-140): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
deleted file mode 100644
index 57d47eb1cd7d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes memory y = "def";
-		y[0] &= "d";
-		assert(y[0] == "d");
-
-		y[0] |= "e";
-		assert(y[0] == "d"); // fails
-
-		y[0] ^= "f";
-		// Disabled because of nondeterminism in Spacer in Z3 4.8.9
-		//assert(y[0] == (bytes1("d") | bytes1("e")) ^ bytes1("f"));
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (123-142): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
deleted file mode 100644
index 70f9095f8439..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes3 y = "def";
-        y &= "def";
-        assert(y == "def");
-
-        y |= "dee";
-        assert(y == "def"); // fails
-
-        y ^= "fed";
-        assert(y == (bytes3("def") | bytes3("dee")) ^ bytes3("fed"));
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (147-165): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
deleted file mode 100644
index 81b92965859d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes32 y = "abcdefghabcdefghabcdefghabcdefgh";
-        bytes32 z = y;
-        y &= "bcdefghabcdefghabcdefghabcdefgha";
-        z &= "bcdefghabcdefghabcdefghabcdefgha";
-        assert(y == "abcdefghabcdefghabcdefghabcdefgh"); // fails
-
-        y |= "cdefghabcdefghabcdefghabcdefghab";
-        z |= "cdefghabcdefghabcdefghabcdefghab";
-        assert(y == "abcdefghabcdefghabcdefghabcd"); // fails
-
-        y ^= "abcdefghabcdefghabcdefghabcdefgh";
-        assert(y == z ^ "abcdefghabcdefghabcdefghabcdefgh");
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (229-276): CHC: Assertion violation happens here.
-// Warning 6328: (394-437): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
deleted file mode 100644
index 58902c22deec..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public pure returns (bytes1) {
-        bytes1 a = 0xff;
-        bytes1 b = 0xf0;
-        a ^= ~b;
-        assert(a == b);
-
-        a ^= ~b;
-        assert(a != 0xff); // fails
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (178-195): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
deleted file mode 100644
index 58cb7c5be38a..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		int8 x = 1;
-		int8 y = 0;
-		x ^= y;
-		assert(x != 1); // fails
-		x = -1; y = 1;
-		x ^= y;
-		assert(x == -2);
-		x = 4;
-		y ^= x;
-		assert(y == 5);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
deleted file mode 100644
index 6d2daabb556d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f() public pure {
-        uint v = 7;
-        v ^= 3;
-        assert(v != 4); // fails, as 7 ^ 3 = 4
-
-        uint c = 0;
-        c ^= v;
-        assert(c == 4);
-
-        uint16 x = 0xff;
-        uint16 y = 0xffff;
-        y ^= x;
-        assert(y == 0xff); // fails
-        assert(y == 0xff00);
-
-        y = 0xf1;
-        x = 0xff00;
-        y ^= x | y;
-        assert(y == 0xffff); // fails
-        assert(x == 0xff00);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.
-// Warning 6328: (265-282): CHC: Assertion violation happens here.
-// Warning 6328: (389-408): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
deleted file mode 100644
index c04affe2d9e8..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 10);
-		uint y = 10;
-		y *= y + x;
-		assert(y <= 190);
-		assert(y < 50);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
deleted file mode 100644
index 18b2792d1c25..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint[] array;
-	function q() public { array.push(); }
-	function f(uint x, uint p) public {
-		require(p < array.length);
-		require(x < 10);
-		array[p] = 10;
-		array[p] *= array[p] + x;
-		assert(array[p] <= 190);
-		assert(array[p] < 50);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (226-247): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
deleted file mode 100644
index df7c9d0399c1..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x, uint p) public {
-		require(x < 10);
-		map[p] = 10;
-		map[p] *= map[p] + x;
-		assert(map[p] <= 190);
-		assert(map[p] < 50);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (164-183): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol
deleted file mode 100644
index b2b1af4a8749..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		uint v = 1000000;
-		if (b)
-			v <<= 2;
-		assert(v > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol
deleted file mode 100644
index 99469dc40e32..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		uint v = 1;
-		if (b)
-			v >>= 2;
-		assert(v > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (84-97): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
deleted file mode 100644
index bcfb3f785ca5..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		uint y = 200;
-		y -= y - x;
-		assert(y >= 0);
-		assert(y < 90);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
deleted file mode 100644
index 9d44f4156777..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint[] array;
-	function q() public { array.push(); }
-	function f(uint x, uint p) public {
-		require(p < array.length);
-		require(x < 100);
-		array[p] = 200;
-		array[p] -= array[p] - x;
-		assert(array[p] >= 0);
-		assert(array[p] < 90);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (226-247): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
deleted file mode 100644
index b10763319d35..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x, uint p) public {
-		require(x < 100);
-		map[p] = 200;
-		map[p] -= map[p] - x;
-		assert(map[p] >= 0);
-		assert(map[p] < 90);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (164-183): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol
deleted file mode 100644
index d0ce284e4f66..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		uint a = b ? 2 : 3;
-		assert(a > 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (71-84): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\na = 2\n\nTransaction trace:\nC.constructor()\nC.f(true)
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
deleted file mode 100644
index 38dee0b2274e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(uint b) public pure {
-		require(b < 3);
-		uint c = (b > 0) ? b++ : ++b;
-		assert(c == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
deleted file mode 100644
index 34763bd23907..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(uint a, uint b) public pure {
-		require(a < 10);
-		require(b <= a);
-
-		uint c = (b > 4) ? a++ : b++;
-		assert(c > a);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (128-141): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
deleted file mode 100644
index 1e9b40211717..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-abstract contract D {
-    function d() public virtual ;
-}
-
-contract C {
-    bool a;
-    uint x;
-    D d;
-    function g() public returns (uint) {
-        x = 2;
-        return x;
-    }
-    function f(bool b) public {
-        x = 1;
-        uint y = b ? g() : 3;
-        assert(x == 2 || x == 1);
-    }
-    function h() public {
-        x = 3;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (240-246): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
deleted file mode 100644
index 24be3cd8ea85..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract contract D {
-    function d() public virtual ;
-}
-
-contract C {
-    bool a;
-    uint x;
-    D d;
-    function g() public returns (uint) {
-        x = 2;
-        d.d();
-        return x;
-    }
-    function f() public {
-        x = 1;
-        uint y = g();
-        assert(x == 2 || x == 1);
-    }
-    function h() public {
-        x = 3;
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (249-255): Unused local variable.
-// Warning 6328: (271-295): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
deleted file mode 100644
index 87ca405b9978..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract contract D {
-    function d() public virtual ;
-}
-
-contract C {
-    bool a;
-    uint x;
-    D d;
-    function g() public returns (uint) {
-        x = 2;
-        d.d();
-        return x;
-    }
-    function f(bool b) public {
-        x = 1;
-        uint y = b ? g() : 3;
-        assert(x == 2 || x == 1);
-    }
-    function h() internal {
-        x = 3;
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 2072: (255-261): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol
deleted file mode 100644
index 714a87c1b65d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(uint b) public pure returns (uint d) {
-		require(b < 10);
-		uint c = b < 5 ? 5 : 1;
-		d = c > 5 ? 3 : 2;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (115-120): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol
deleted file mode 100644
index a13f5f9f5eee..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		require(b);
-		uint c = b ? 5 : 1;
-		assert(c < 5);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (85-98): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\nc = 5\n\nTransaction trace:\nC.constructor()\nC.f(true)
-// Warning 6838: (72-73): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol
deleted file mode 100644
index dde02e24f2dd..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint a) internal pure returns (bool b) {
-        b = a > 5;
-    }
-    function g(uint a) public pure {
-        uint c = f(a) ? 3 : 4;
-        assert(c > 5);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (170-183): CHC: Assertion violation happens here.\nCounterexample:\n\na = 6\nc = 3\n\nTransaction trace:\nC.constructor()\nC.g(6)\n    C.f(6) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
deleted file mode 100644
index ebd04d04380c..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f(uint a) internal pure returns (uint b) {
-        require(a < 1000);
-        return a * a;
-    }
-    function g(uint a) internal pure returns (uint b) {
-        require(a < 1000);
-        return a + 100;
-    }
-    function h(uint a) public pure {
-        uint c = a < 5 ? g(a) : f(a);
-        assert(c >= 25);
-        assert(c < 20); // should fail
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (345-359): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
deleted file mode 100644
index 3aa38daca2be..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(bool b1, bool b2) public pure {
-        require(b1 || b2);
-        uint c = b1 ? 3 : (b2 ? 2 : 1);
-        assert(c > 1);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (114-116): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol
deleted file mode 100644
index 71eaa8d6c851..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bool b1, bool b2) public pure {
-        uint c = b1 ? 3 : (b2 ? 2 : 1);
-        assert(c > 1);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (108-121): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = false\nb2 = false\nc = 1\n\nTransaction trace:\nC.constructor()\nC.f(false, false)
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
deleted file mode 100644
index 32d5435d3883..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    uint a;
-    bool b;
-
-	constructor(bool _b) {
-		b = _b;
-	}
-
-    function f() public returns(uint c) {
-        c = b ? a + 10 : ++a;
-        assert(c >= a);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (143-146): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (143-146): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol b/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
deleted file mode 100644
index 54d37f8ba1ac..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	uint constant x = 2;
-	uint constant y = x ** 10;
-
-	function f() public view {
-		assert(y == 2 ** 10);
-		assert(y == 1024);
-		assert(y == 14); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2018: (65-173): Function state mutability can be restricted to pure
-// Warning 6328: (139-154): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol b/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
deleted file mode 100644
index a7dc70472efe..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint constant DEPOSIT_CONTRACT_TREE_DEPTH = 32;
-	uint constant MAX_DEPOSIT_COUNT = 2**DEPOSIT_CONTRACT_TREE_DEPTH - 1;
-	function f() public pure {
-		assert(DEPOSIT_CONTRACT_TREE_DEPTH == 32);
-		assert(MAX_DEPOSIT_COUNT == 4294967295);
-		assert(MAX_DEPOSIT_COUNT == 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (251-281): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol b/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol
deleted file mode 100644
index a38fd31d47c9..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	uint constant x = 7;
-	uint constant y = 3;
-	uint constant z = x / y;
-
-	function f() public pure {
-		assert(z == 2);
-		assert(z == x / 3);
-		assert(z == 7 / y);
-		assert(z * 3 != 7);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array.sol b/test/libsolidity/smtCheckerTests/operators/delete_array.sol
deleted file mode 100644
index 0fae64446077..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_array.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	uint[] a;
-	function f(bool b) public {
-		a.push();
-		a.push();
-		a.push();
-		a[2] = 3;
-		require(b);
-		if (b)
-			delete a;
-		else
-			delete a[2];
-		assert(a.length == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (121-122): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
deleted file mode 100644
index d13e1e36bdd2..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint[][] a;
-	constructor() {
-		a.push(); a.push(); a.push();
-		a[2].push();
-		a[2].push();
-		a[2].push();
-		a[2].push();
-	}
-	function f() public {
-		require(a[2][3] == 4);
-		delete a;
-		assert(a[2][3] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
deleted file mode 100644
index a56bfed559c9..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	uint[] a;
-	constructor() {
-		a.push();
-		a.push();
-		a.push();
-		a.push();
-	}
-	function f(bool b) public {
-		a[2] = 3;
-		require(!b);
-		if (b)
-			delete a;
-		else
-			delete a[2];
-		assert(a[2] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (154-155): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
deleted file mode 100644
index 71d260907e3d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C
-{
-	uint[][] a;
-	constructor() {
-		init();
-	}
-	function init() internal {
-		a.push();
-		a.push();
-		a[0].push();
-		a[1].push();
-	}
-	function f(bool b) public {
-		// Removed due to Spacer's nondeterminism.
-		//a[1][1] = 512;
-		if (b)
-			delete a;
-		else
-			delete a[1];
-		init();
-		assert(a[1][0] == 0);
-		assert(a[0][0] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (315-335): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (315-335): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol
deleted file mode 100644
index d65a2fdc2596..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	int[][] array2d;
-	function s() public {
-		delete array2d.push();
-		assert(array2d[array2d.length - 1].length == 0);
-		// Fails
-		assert(array2d[array2d.length - 1].length != 0);
-		delete array2d.push().push();
-		uint length = array2d.length;
-		uint length2 = array2d[length - 1].length;
-		assert(array2d[length - 1][length2 - 1] == 0);
-		// Fails
-		assert(array2d[length - 1][length2 - 1] != 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (143-190): CHC: Assertion violation happens here.
-// Warning 6328: (363-408): CHC: Assertion violation happens here.
-// Info 1391: CHC: 16 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function.sol b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
deleted file mode 100644
index 510254e8ea94..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_function.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C
-{
-	uint[] a;
-	constructor() { init(); }
-	function init() internal {
-		a.push();
-		a.push();
-		a.push();
-	}
-	function g() internal {
-		delete a;
-	}
-	function h() internal {
-		delete a[2];
-	}
-	function f(bool b) public {
-		a[2] = 3;
-		require(b);
-		if (b)
-			g();
-		else
-			h();
-		init();
-		assert(a[2] == 0);
-		assert(a[1] == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (262-263): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
deleted file mode 100644
index b6bc1f6a0472..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-struct S {
-    function() e;
-}
-
-contract C {
-    S s;
-    function() f;
-
-    constructor() {
-        delete s.e;
-        assert(s.e == f); // should fail for now because function pointer comparisons are not supported
-    }
-}
-// ----
-// Warning 7229: (128-136): Assertion checker does not yet implement the type function () for comparisons
-// Warning 6328: (121-137): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
deleted file mode 100644
index ee7497aca03d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    mapping (uint => function()) m;
-    function() f;
-
-    constructor() {
-        m[2] = f;
-        delete m[2];
-        assert(m[2] == f); // should fail for now because function pointer comparisons are not supported
-    }
-}
-// ----
-// Warning 7229: (142-151): Assertion checker does not yet implement the type function () for comparisons
-// Warning 6328: (135-152): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
deleted file mode 100644
index 33a31d6c4840..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function()[] arr;
-    function() f;
-
-    constructor() {
-        arr.push();
-        arr.push();
-        arr[1] = f;
-        delete arr[1];
-        assert(arr[1] == f); // should fail for now because function pointer comparisons are not supported
-    }
-}
-// ----
-// Warning 8364: (82-90): Assertion checker does not yet implement type function (function ()[] storage pointer) returns (function ())
-// Warning 8364: (102-110): Assertion checker does not yet implement type function (function ()[] storage pointer) returns (function ())
-// Warning 7229: (172-183): Assertion checker does not yet implement the type function () for comparisons
-// Warning 6368: (149-155): CHC: Out of bounds access happens here.
-// Warning 6368: (172-178): CHC: Out of bounds access happens here.
-// Warning 6328: (165-184): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol b/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
deleted file mode 100644
index 53a1a253e00e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-contract C {
-	uint[] a;
-	uint[][] b;
-	function p() public { a.push(); }
-	function q() public { b.push().push(); }
-	function f(uint x, uint v) public {
-		require(x < a.length);
-		a[x] = v;
-		delete a;
-		assert(a.length == 0);
-	}
- 	function g(uint x, uint y, uint v) public {
-		require(x < b.length);
-		require(y < b[x].length);
-		b[x][y] = v;
-		delete b;
-		assert(b.length == 0);
-	}
- 	function h(uint x, uint y, uint v) public {
-		require(x < b.length);
-		require(y < b[x].length);
-		b[x][y] = v;
-		delete b[x];
-		assert(b[x].length == 0);
-	}
- 	function i(uint x, uint y, uint v) public {
-		require(x < b.length);
-		require(y < b[x].length);
-		b[x][y] = v;
-		require(y < b.length);
-		delete b[y];
-		assert(b[y].length == 0);
-	}
- 	function j(uint x, uint y, uint z, uint v) public {
-		require(x < b.length);
-		require(y < b[x].length);
-		b[x][y] = v;
-		require(z < b.length);
-		delete b[z];
-		// Not necessarily the case.
-		require(y < b.length);
-		require(x < b[x].length);
-		// Disabled because of Spacer nondeterminism.
-		//assert(b[y][x] == 0);
-	}
-	function setA(uint x, uint y) public {
-		require(x < a.length);
-		a[x] = y;
-	}
-	function setB(uint x, uint y, uint z) public {
-		require(x < b.length);
-		require(y < b[x].length);
-		b[x][y] = z;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Info 1391: CHC: 27 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_struct.sol b/test/libsolidity/smtCheckerTests/operators/delete_struct.sol
deleted file mode 100644
index 76338a0a7c73..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_struct.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	struct S
-	{
-		uint x;
-	}
-	function f(bool b) public pure {
-		S memory s;
-		s.x = 2;
-		if (b)
-			delete s;
-		else
-			delete s.x;
-		assert(s.x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol b/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol
deleted file mode 100644
index 1925197829de..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A{
-	function f() public pure {
-		delete ([""][0]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/div_zero.sol b/test/libsolidity/smtCheckerTests/operators/div_zero.sol
deleted file mode 100644
index d1841abd3b3b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/div_zero.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	uint z = 0;
-	uint x = 2 / z;
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (36-41): CHC: Division by zero happens here.\nCounterexample:\nz = 0, x = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/operators/division_1.sol b/test/libsolidity/smtCheckerTests/operators/division_1.sol
deleted file mode 100644
index d37420b0f28a..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (79-84): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/division_2.sol b/test/libsolidity/smtCheckerTests/operators/division_2.sol
deleted file mode 100644
index 8704c665474e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(uint x, uint y) public pure returns (uint) {
-		require(y != 0);
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_3.sol b/test/libsolidity/smtCheckerTests/operators/division_3.sol
deleted file mode 100644
index af4ed582e5d0..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(int x, int y) public pure returns (int) {
-		require(y != 0);
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (95-100): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_4.sol b/test/libsolidity/smtCheckerTests/operators/division_4.sol
deleted file mode 100644
index 54403b1ec1e0..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_4.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(int x, int y) public pure returns (int) {
-		require(y != 0);
-		require(y != -1);
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_5.sol b/test/libsolidity/smtCheckerTests/operators/division_5.sol
deleted file mode 100644
index 5b5c368c08e3..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function mul(uint8 a, uint8 b) internal pure returns (uint8) {
-		uint8 c;
-		if (a != 0) {
-			c = a * b;
-			require(c / a == b);
-		}
-		return c;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (129-139): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_6.sol b/test/libsolidity/smtCheckerTests/operators/division_6.sol
deleted file mode 100644
index 69d4ee580a00..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_6.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function mul(uint8 a, uint8 b) public pure returns (uint8) {
-		if (a == 0) {
-			return 0;
-		}
-		uint8 c = a * b;
-		require(c / a == b);
-		return c;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (120-125): CHC: Overflow (resulting value larger than 255) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (137-147): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_7.sol b/test/libsolidity/smtCheckerTests/operators/division_7.sol
deleted file mode 100644
index 34bd4b50110d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_7.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function div(uint256 a, uint256 b) internal pure returns (uint256) {
-		require(b > 0);
-		uint256 c = a / b;
-		return c;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol
deleted file mode 100644
index 5d3725f3d293..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(uint x, uint y) public pure {
-		x = 7;
-		y = 2;
-		assert(x / y == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
deleted file mode 100644
index 29af565a223e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(int x, int y) public pure {
-		x = 7;
-		y = 2;
-		assert(x / y == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
deleted file mode 100644
index 573f6d246812..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(int x, int y) public pure {
-		x = -7;
-		y = 2;
-		assert(x / y == -3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
deleted file mode 100644
index 6610bc524461..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(int x, int y) public pure {
-		x = 7;
-		y = -2;
-		assert(x / y == -3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
deleted file mode 100644
index 97faba60fb3b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f(int x, int y) public pure {
-		x = -7;
-		y = -2;
-		assert(x / y == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/exp.sol b/test/libsolidity/smtCheckerTests/operators/exp.sol
deleted file mode 100644
index 278300f42825..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/exp.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {
-	function f(uint x) public pure {
-		assert(x**2 == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5188: (56-60): Assertion checker does not yet implement this operator.
-// Warning 6328: (49-66): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nD.constructor()\nD.f(0)
diff --git a/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol b/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol
deleted file mode 100644
index 96d8c523def8..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-	function f() internal pure {
-		ufixed a = uint64(1) + ufixed(2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (48-56): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/operators/fixed_point_compound_add.sol b/test/libsolidity/smtCheckerTests/operators/fixed_point_compound_add.sol
deleted file mode 100644
index ac714c2f5c6f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/fixed_point_compound_add.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  fixed[] b;
-  function f() internal { b[0] += 1; }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol b/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
deleted file mode 100644
index d925ca4491c6..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-library L {
-	function l(uint x, uint y) internal pure returns (uint) {
-		return x + y;
-	}
-}
-
-contract C {
-	function f(uint u, uint s, bool b) internal pure returns (uint z) {
-		if (b)
-			z = u;
-		else
-			z = s;
-	}
-
-	using L for uint;
-
-	function call() public pure {
-		uint a = 2;
-		uint b = a.l({y: 3});
-		assert(b == 5);
-		b = L.l({x: 3, y: 3});
-		assert(b == 6);
-		b = f({b: true, u: 1, s: 2});
-		assert(b == 1);
-		b = f({b: false, u: 1, s: 2});
-		// Fails, should be 2.
-		assert(b == 6);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (475-489): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
deleted file mode 100644
index 71dac3e08a86..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes memory x = hex"00112233";
-        assert(x[0] == 0x00);
-        assert(x[1] == 0x11);
-        assert(x.length == 3);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (152-173): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
deleted file mode 100644
index c516675d6e5f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    bytes20 x;
-    function f(bytes16 b) public view {
-        b[uint8(x[2])];
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (76-90): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol
deleted file mode 100644
index 535335de0d46..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        string memory x = "\x12\x34";
-        bytes memory y = bytes(x);
-        assert(y[0] == 0x12);
-        assert(y[1] == 0x34);
-        assert(y.length == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
deleted file mode 100644
index d18f605f7c5e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-	uint[] a;
-	constructor() {
-		a.push();
-		a.push();
-		a.push();
-		a.push();
-	}
-	// Accesses are safe but oob is reported due to aliasing.
-	function h() internal returns (uint[] storage) {
-		if (a[2] == 0)
-			a[2] = 3;
-		return a;
-	}
-	function g() public {
-		// Disabled because of Spacer nondeterminism.
-		//h()[2] = 4;
-		assert(h()[2] == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (335-354): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (335-354): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/integer_new.sol b/test/libsolidity/smtCheckerTests/operators/integer_new.sol
deleted file mode 100644
index d85fb4073c54..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/integer_new.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-	function f() public pure {
-		uint[] memory x = new uint[](0);
-		assert(x.length == 0);
-	}
-	function g() public pure {
-		uint[] memory x = new uint[](3);
-		assert(x.length == 3);
-		assert(x[0] == 0);
-		assert(x[1] == 0);
-		assert(x[2] == 0);
-	}
-	function h() public pure {
-		uint[] memory x = new uint[](3);
-		assert(x.length == 3);
-		x[0] = 0x12;
-		x[1] = 0x34;
-		assert(x[0] == 0x12);
-		assert(x[1] == 0x34);
-		// This should be an out-of-bounds assertion.
-		x[5] = 0xff;
-		assert(x[5] == 0xff);
-	}
-	function h(uint size) public pure {
-		uint[] memory x = new uint[](size);
-		assert(x.length == size);
-		require(size >= 2);
-		x[0] = 0x12;
-		x[1] = 0x34;
-		assert(x[0] == 0x12);
-		assert(x[1] == 0x34);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (474-478): CHC: Out of bounds access happens here.
-// Warning 6368: (496-500): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod.sol b/test/libsolidity/smtCheckerTests/operators/mod.sol
deleted file mode 100644
index a600ef03f1d3..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/mod.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(int x, int y) public pure {
-		require(y == -10);
-		require(x == 100);
-		int z1 = x % y;
-		int z2 = x % -y;
-		assert(z1 == z2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_even.sol b/test/libsolidity/smtCheckerTests/operators/mod_even.sol
deleted file mode 100644
index b6195bac9baa..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/mod_even.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 10000);
-		uint y = x * 2;
-		assert((y % 2) == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_n.sol b/test/libsolidity/smtCheckerTests/operators/mod_n.sol
deleted file mode 100644
index a9b0b464a69e..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/mod_n.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f(uint x, uint y) public pure {
-		require(y > 0);
-		uint z = x % y;
-		assert(z < y);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol b/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol
deleted file mode 100644
index a45fd3ef251d..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f(uint16 x, uint16 y) public pure {
-		require(y > 0);
-		uint z = x % y;
-		assert(z < 100_000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
deleted file mode 100644
index 2e640f53fd77..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f(int x, int y) public pure {
-		require(y != 0);
-		require(x == 42);
-		int z1 = x % y;
-		int z2 = -x % y;
-		assert(z1 == -z2);
-		assert((x >= 0 && z1 >=0) || (x <= 0 && z1 <= 0));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (131-148): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/named_arguments_in_any_order.sol b/test/libsolidity/smtCheckerTests/operators/named_arguments_in_any_order.sol
deleted file mode 100644
index 79b7a4860cab..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/named_arguments_in_any_order.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(uint u, string memory s, bool b) internal {}
-
-	function call() public {
-		f({s: "abc", u: 1,     b: true});
-		f({s: "abc", b: true,  u: 1});
-		f({u: 1,     s: "abc", b: true});
-		f({b: true,  s: "abc", u: 1});
-		f({u: 1,     b: true,  s: "abc"});
-		f({b: true,  u: 1,     s: "abc"});
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/named_arguments_overload_in_any_order.sol b/test/libsolidity/smtCheckerTests/operators/named_arguments_overload_in_any_order.sol
deleted file mode 100644
index 7dd63d0107c1..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/named_arguments_overload_in_any_order.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f(uint u, string memory s, bool b) internal {}
-	function f(uint u, uint s, uint b) internal {}
-
-	function call() public {
-		f({s: "abc", u: 1,     b: true});
-		f({s: "abc", b: true,  u: 1});
-		f({u: 1,     s: "abc", b: true});
-		f({b: true,  s: "abc", u: 1});
-		f({u: 1,     b: true,  s: "abc"});
-		f({b: true,  u: 1,     s: "abc"});
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol b/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol
deleted file mode 100644
index f5313726a28f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) internal pure returns (uint256) {
-        a <<= b;
-        return a;
-    }
-    function t() public pure {
-        assert(f(0x4266, 0x0) == 0x4266);
-        assert(f(0x4266, 0x8) == 0x426600);
-        assert(f(0x4266, 0xf0) == 0x4266000000000000000000000000000000000000000000000000000000000000);
-        assert(f(0x4266, 0x4266) == 0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol b/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol
deleted file mode 100644
index d566bf24eddc..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) internal pure returns (uint256) {
-        a >>= b;
-        return a;
-    }
-    function t() public pure {
-        assert(f(0x4266, 0) == 0x4266);
-        assert(f(0x4266, 0x8) == 0x42);
-        assert(f(0x4266, 0x11) == 0);
-        assert(f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 5) == 1809251394333065553493296640760748560207343510400633813116524750123642650624);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol
deleted file mode 100644
index 8670b79c060c..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function left() public pure {
-		uint x = 0x4266;
-		assert(x << 0x0 == 0x4266);
-		// Fails because the above is true.
-		assert(x << 0x0 == 0x4268);
-	}
-
-	function right() public pure {
-		uint x = 0x4266;
-		assert(x >> 0x0 == 0x4266);
-		// Fails because the above is true.
-		assert(x >> 0x0 == 0x4268);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (133-159): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 16998\n\nTransaction trace:\nC.constructor()\nC.left()
-// Warning 6328: (286-312): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 16998\n\nTransaction trace:\nC.constructor()\nC.right()
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
deleted file mode 100644
index 14ae9f72f0a4..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure returns (uint16 x) {
-		unchecked {
-			x = 0xffff;
-			x += 32;
-			x = x << 8;
-			x = x >> 16;
-		}
-		assert(x == 0);
-		// Fails because x = 0.
-		assert(x == 10);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (182-197): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
deleted file mode 100644
index ac8a961f8479..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a << b;
-    }
-	function t() public pure {
-		assert(f(0x4266, 0x0) == 0x4266);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x0) == 0x4268);
-
-		assert(f(0x4266, 0x8) == 0x426600);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x8) == 0x120939);
-
-		assert(f(0x4266, 0xf0) == 0x4266000000000000000000000000000000000000000000000000000000000000);
-		// Fails because the above is true.
-		assert(f(0x4266, 0xf0) == 0x4266000000000000000000000000000000000000000000000000000000000001);
-
-		assert(f(0x4266, 0x4266) == 0);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x4266) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (217-249): CHC: Assertion violation happens here.
-// Warning 6328: (330-364): CHC: Assertion violation happens here.
-// Warning 6328: (504-597): CHC: Assertion violation happens here.
-// Warning 6328: (674-704): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
deleted file mode 100644
index 0867aa4cb47f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f() public pure returns (int8) {
-		uint8 x = 254;
-		int8 y = 1;
-		assert(y << x == 0);
-		// Fails because z = 0.
-		assert(y << x == 10);
-		return y << x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (138-158): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
deleted file mode 100644
index 7e0128dca99b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f(uint32 a, uint32 b) internal pure returns (uint256) {
-        return a << b;
-    }
-	function t() public pure {
-		assert(f(0x4266, 0) == 0x4266);
-		// Fails because the above is true.
-		assert(f(0x4266, 0) == 0x4267);
-
-		assert(f(0x4266, 0x10) == 0x42660000);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x10) == 0x426600000);
-
-		assert(f(0x4266, 0x11) == 0x84cc0000);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x11) == 0x84cc000);
-
-		assert(f(0x4266, 0x20) == 0);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x20) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (213-243): CHC: Assertion violation happens here.
-// Warning 6328: (327-365): CHC: Assertion violation happens here.
-// Warning 6328: (449-485): CHC: Assertion violation happens here.
-// Warning 6328: (560-588): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
deleted file mode 100644
index bbbea4ef71a8..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f(uint8 a, uint8 b) internal pure returns (uint256) {
-        return a << b;
-    }
-	function t() public pure {
-		assert(f(0x66, 0x0) == 0x66);
-		// Fails because the above is true.
-		assert(f(0x66, 0x0) == 0x660);
-
-		assert(f(0x66, 0x8) == 0);
-		// Fails because the above is true.
-		assert(f(0x66, 0x8) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (209-238): CHC: Assertion violation happens here.
-// Warning 6328: (310-335): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
deleted file mode 100644
index efe69945cc35..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    function leftU(uint8 x, uint8 y) internal pure returns (uint8) {
-        return x << y;
-    }
-
-    function leftS(int8 x, uint8 y) internal pure returns (int8) {
-        return x << y;
-    }
-
-	function t() public pure {
-		assert(leftU(255, 8) == 0);
-		// Fails because the above is true.
-		assert(leftU(255, 8) == 1);
-
-		assert(leftU(255, 1) == 254);
-		// Fails because the above is true.
-		assert(leftU(255, 1) == 255);
-
-		assert(leftU(255, 0) == 255);
-		// Fails because the above is true.
-		assert(leftU(255, 0) == 0);
-
-		assert(leftS(1, 7) == -128);
-		// Fails because the above is true.
-		assert(leftS(1, 7) == 127);
-
-		assert(leftS(1, 6) == 64);
-		// Fails because the above is true.
-		assert(leftS(1, 6) == -64);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (307-333): CHC: Assertion violation happens here.
-// Warning 6328: (408-436): CHC: Assertion violation happens here.
-// Warning 6328: (511-537): CHC: Assertion violation happens here.
-// Warning 6328: (611-637): CHC: Assertion violation happens here.
-// Warning 6328: (709-735): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
deleted file mode 100644
index 6d893efcc1cc..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(0x4266, 0) == 0x4266);
-		// Fails because the above is true.
-		assert(f(0x4266, 0) == 0x426);
-
-		assert(f(0x4266, 0x8) == 0x42);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x8) == 0x420);
-
-		assert(f(0x4266, 0x11) == 0);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x11) == 1);
-
-		assert(f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 5) == 1809251394333065553493296640760748560207343510400633813116524750123642650624);
-		// Fails because the above is true.
-		assert(f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 5) == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (215-244): CHC: Assertion violation happens here.
-// Warning 6328: (321-352): CHC: Assertion violation happens here.
-// Warning 6328: (427-455): CHC: Assertion violation happens here.
-// Warning 6328: (673-769): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
deleted file mode 100644
index 61de9aa43fb5..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract C {
-	function f(int16 x, uint16 y, int16 z) internal pure returns (bool) {
-		return x >> y == z;
-	}
-
-	function t() public pure {
-		assert(f(-4266, 0, -4266));
-		// Fails because the above is true.
-		assert(f(-4266, 0, -426));
-
-		assert(f(-4266, 1, -2133));
-		// Fails because the above is true.
-		assert(f(-4266, 1, -2134));
-
-		assert(f(-4266, 4, -267));
-		// Fails because the above is true.
-		assert(f(-4266, 4, -2670));
-
-		assert(f(-4266, 8, -17));
-		// Fails because the above is true.
-		assert(f(-4266, 8, -1));
-
-		assert(f(-4266, 16, -1));
-		// Fails because the above is true.
-		assert(f(-4266, 16, -0));
-
-		assert(f(-4266, 17, -1));
-		// Fails because the above is true.
-		assert(f(-4266, 17, -0));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (208-233): CHC: Assertion violation happens here.
-// Warning 6328: (306-332): CHC: Assertion violation happens here.
-// Warning 6328: (404-430): CHC: Assertion violation happens here.
-// Warning 6328: (501-524): CHC: Assertion violation happens here.
-// Warning 6328: (595-619): CHC: Assertion violation happens here.
-// Warning 6328: (690-714): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
deleted file mode 100644
index 773a77bc0dd5..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract C {
-    function f(int256 a, uint256 b) internal pure returns (int256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(-4266, 0) == -4266);
-		// Fails because the above is true.
-		assert(f(-4266, 0) == -426);
-
-		assert(f(-4266, 1) == -2133);
-		// Fails because the above is true.
-		assert(f(-4266, 1) == -21330);
-
-		assert(f(-4266, 4) == -267);
-		// Fails because the above is true.
-		assert(f(-4266, 4) == -255);
-
-		assert(f(-4266, 8) == -17);
-		// Fails because the above is true.
-		assert(f(-4266, 8) == -1);
-
-		assert(f(-4266, 16) == -1);
-		// Fails because the above is true.
-		assert(f(-4266, 16) == 0);
-
-		assert(f(-4266, 17) == -1);
-		// Fails because the above is true.
-		assert(f(-4266, 17) == 0);
-	}
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (211-238): CHC: Assertion violation happens here.
-// Warning 6328: (313-342): CHC: Assertion violation happens here.
-// Warning 6328: (416-443): CHC: Assertion violation happens here.
-// Warning 6328: (516-541): CHC: Assertion violation happens here.
-// Warning 6328: (614-639): CHC: Assertion violation happens here.
-// Warning 6328: (712-737): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
deleted file mode 100644
index 043a640aafcd..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    function f(int16 a, uint16 b) internal pure returns (int256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(-4266, 0) == -4266);
-		// Fails because the above is true.
-		assert(f(-4266, 0) == -426);
-
-		assert(f(-4266, 1) == -2133);
-		// Fails because the above is true.
-		assert(f(-4266, 1) == -21330);
-
-		assert(f(-4266, 4) == -267);
-		// Fails because the above is true.
-		assert(f(-4266, 4) == -255);
-
-		assert(f(-4266, 8) == -17);
-		// Fails because the above is true.
-		assert(f(-4266, 8) == -1);
-
-		assert(f(-4266, 16) == -1);
-		// Fails because the above is true.
-		assert(f(-4266, 16) == 0);
-
-		assert(f(-4266, 17) == -1);
-		// Fails because the above is true.
-		assert(f(-4266, 17) == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (209-236): CHC: Assertion violation happens here.
-// Warning 6328: (311-340): CHC: Assertion violation happens here.
-// Warning 6328: (414-441): CHC: Assertion violation happens here.
-// Warning 6328: (514-539): CHC: Assertion violation happens here.
-// Warning 6328: (612-637): CHC: Assertion violation happens here.
-// Warning 6328: (710-735): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
deleted file mode 100644
index 94b212a631a5..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    function f(int32 a, uint32 b) internal pure returns (int256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(-4266, 0) == -4266);
-		// Fails because the above is true.
-		assert(f(-4266, 0) == -426);
-
-		assert(f(-4266, 1) == -2133);
-		// Fails because the above is true.
-		assert(f(-4266, 1) == -21330);
-
-		assert(f(-4266, 4) == -267);
-		// Fails because the above is true.
-		assert(f(-4266, 4) == -255);
-
-		assert(f(-4266, 8) == -17);
-		// Fails because the above is true.
-		assert(f(-4266, 8) == -1);
-
-		assert(f(-4266, 16) == -1);
-		// Fails because the above is true.
-		assert(f(-4266, 16) == 0);
-
-		assert(f(-4266, 17) == -1);
-		// Fails because the above is true.
-		assert(f(-4266, 17) == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (209-236): CHC: Assertion violation happens here.
-// Warning 6328: (311-340): CHC: Assertion violation happens here.
-// Warning 6328: (414-441): CHC: Assertion violation happens here.
-// Warning 6328: (514-539): CHC: Assertion violation happens here.
-// Warning 6328: (612-637): CHC: Assertion violation happens here.
-// Warning 6328: (710-735): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
deleted file mode 100644
index 400f26cf340f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    function f(int8 a, uint8 b) internal pure returns (int256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(-66, 0) == -66);
-		// Fails because the above is true.
-		assert(f(-66, 0) == -6);
-
-		assert(f(-66, 1) == -33);
-		// Fails because the above is true.
-		assert(f(-66, 1) == -3);
-
-		assert(f(-66, 4) == -5);
-		// Fails because the above is true.
-		assert(f(-66, 4) == -2);
-
-		assert(f(-66, 8) == -1);
-		// Fails because the above is true.
-		assert(f(-66, 8) == -2);
-
-		assert(f(-66, 16) == -1);
-		// Fails because the above is true.
-		assert(f(-66, 16) == 0);
-
-		assert(f(-66, 17) == -1);
-		// Fails because the above is true.
-		assert(f(-66, 17) == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (203-226): CHC: Assertion violation happens here.
-// Warning 6328: (297-320): CHC: Assertion violation happens here.
-// Warning 6328: (390-413): CHC: Assertion violation happens here.
-// Warning 6328: (483-506): CHC: Assertion violation happens here.
-// Warning 6328: (577-600): CHC: Assertion violation happens here.
-// Warning 6328: (671-694): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
deleted file mode 100644
index 9e68e22ef852..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f(uint32 a, uint32 b) internal pure returns (uint256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(0x4266, 0) == 0x4266);
-		// Fails because the above is true.
-		assert(f(0x4266, 0) == 0x426);
-
-		assert(f(0x4266, 8) == 0x42);
-		// Fails because the above is true.
-		assert(f(0x4266, 8) == 0x420);
-
-		assert(f(0x4266, 0x10) == 0);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x10) == 255);
-
-		assert(f(0x4266, 0x11) == 0);
-		// Fails because the above is true.
-		assert(f(0x4266, 0x11) == 255);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (213-242): CHC: Assertion violation happens here.
-// Warning 6328: (317-346): CHC: Assertion violation happens here.
-// Warning 6328: (421-451): CHC: Assertion violation happens here.
-// Warning 6328: (526-556): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
deleted file mode 100644
index 864a760e9188..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f(uint8 a, uint8 b) internal pure returns (uint256) {
-        return a >> b;
-    }
-	function t() public pure {
-		assert(f(0x66, 0) == 0x66);
-		// Fails because the above is true.
-		assert(f(0x66, 0) == 0x6);
-
-		assert(f(0x66, 8) == 0);
-		// Fails because the above is true.
-		assert(f(0x66, 8) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (207-232): CHC: Assertion violation happens here.
-// Warning 6328: (302-325): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
deleted file mode 100644
index d02e1440237b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    function f(int256 a, uint256 b) internal pure returns (int256) {
-        return a << b;
-    }
-
-    function g(int256 a, uint256 b) internal pure returns (int256) {
-        return a >> b;
-    }
-
-	function t() public pure {
-		assert(f(1, 2**256 - 1) == 0);
-		// Fails because the above is true.
-		assert(f(1, 2**256 - 1) == 1);
-
-		assert(g(1, 2**256 - 1) == 0);
-		// Fails because the above is true.
-		assert(g(1, 2**256 - 1) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (312-341): CHC: Assertion violation happens here.
-// Warning 6328: (417-446): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
deleted file mode 100644
index 8f34b530b944..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure {
-		fixed x;
-		assert(x >>> 6 == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice.sol b/test/libsolidity/smtCheckerTests/operators/slice.sol
deleted file mode 100644
index 29f89295f0d7..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slice.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(bytes calldata b) external pure {
-		require(b.length > 10);
-		require(b[10] == 0xff);
-		assert(bytes(b[10:20]).length == 10);
-		// Disabled because of Spacer nondeterminism
-		//assert(bytes(b[10:20])[0] == 0xff);
-		// Disabled because of Spacer nondeterminism
-		//assert(bytes(b[10:20])[5] == 0xff);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol b/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol
deleted file mode 100644
index 8c8c95361f59..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(bytes calldata b) external pure {
-		require(b.length > 10);
-		((b[:])[5]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
deleted file mode 100644
index b017b7ff0bfc..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f(bytes calldata b) external pure {
-		require(b.length == 30);
-		require(b[10] == 0xff);
-		require(b[b.length - 1] == 0xaa);
-		assert(bytes(b[10:]).length == 20); // should hold
-		// Disabled because of Spacer's nondeterminism.
-		//assert(bytes(b[10:])[0] == 0xff); // should hold
-		//assert(bytes(b[10:])[5] == 0xff); // Removed because of Spacer's nondeterminism
-		//assert(bytes(b[10:])[19] == 0xaa); // Removed because of Spacer nondeterminism
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
deleted file mode 100644
index ef422245d3f8..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f(bytes calldata b) external pure {
-		require(b.length > 20);
-		require(b[0] == 0xff);
-		assert(bytes(b[:20]).length == 20);
-		assert(bytes(b[:20])[0] == 0xff);
-		assert(bytes(b[:20])[5] == 0xff);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (150-182): CHC: Assertion violation might happen here.
-// Warning 6328: (186-218): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (150-182): BMC: Assertion violation happens here.
-// Warning 4661: (186-218): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/slices_1.sol b/test/libsolidity/smtCheckerTests/operators/slices_1.sol
deleted file mode 100644
index 393c9489869c..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slices_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(bytes calldata x) external pure {
-		x[:18726387213];
-		x[18726387213:];
-		x[18726387213:111111111111111111];
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/slices_2.sol b/test/libsolidity/smtCheckerTests/operators/slices_2.sol
deleted file mode 100644
index 95e9dc6b4767..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slices_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract e {
-	function f(uint[] calldata) internal {}
-	function h(uint[] calldata c) external { f(c[:]); }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/slices_3.sol b/test/libsolidity/smtCheckerTests/operators/slices_3.sol
deleted file mode 100644
index 530b870cef44..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/slices_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-int[] s;
-function f(int[] calldata b, uint256 start, uint256 end) public returns (int) {
-    s = b[start:end];
-    uint len = end - start;
-    assert(len == s.length);
-    for (uint i = 0; i < len; i++) {
-        // Removed because of Spacer nondeterminism.
-        //assert(b[start:end][i] == s[i]);
-    }
-    return s[0];
-}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol
deleted file mode 100644
index ce475d91bed1..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f(uint x) public pure returns (uint) {
-		return x > 0 ? x - 1 : 0; // Underflow cannot happen
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol
deleted file mode 100644
index 3f2e42efd7db..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-
-	function decrement(uint x) private pure returns (uint) {
-		return x - 1; // No underflow, the method can be called only with positive value
-	}
-
-	function f(uint x) public pure returns (uint) {
-		return x > 0 ? decrement(x) : 0;
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol
deleted file mode 100644
index dac62d380da6..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract D {
-	function d() external virtual returns (uint);
-}
-
-contract C {
-
-	D d;
-	uint v;
-	bool guard = true;
-
-	function inc() public {
-		++v;
-	}
-
-	function dec() public {
-		if (guard) return;
-		--v;
-	}
-
-	function f() public returns (uint) {
-		guard = false;
-		uint ret = v > 0 ? d.d() : 0;
-		guard = true;
-		return ret;
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTTargets: underflow
-// ----
-// Warning 3944: (206-209): CHC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol
deleted file mode 100644
index 96d00ff60bb6..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C { function decrement(uint x) private pure returns (uint) { return x - 1; } function decrement2(uint x) private pure returns (uint) { return x - 1; } function f(uint x) public pure returns (uint) { return x > 0 ? decrement(x) : decrement2(x); } }
-// ----
-// Warning 3944: (151-156): CHC: Underflow (resulting value less than 0) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol
deleted file mode 100644
index 7da04b464835..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-abstract contract D {
-	function d() external virtual returns (uint);
-}
-
-contract C {
-
-	D d;
-	uint v;
-	bool guard = true;
-
-	function inc() public {
-		++v;
-	}
-
-	function dec() public {
-		if (guard) return;
-		--v;
-		guard = true;
-	}
-
-	function f() public returns (uint) {
-		guard = false;
-		uint ret = v > 0 ? d.d() : 0;
-		guard = true;
-		return ret;
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTTargets: underflow
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol
deleted file mode 100644
index d2722fc04945..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-
-	function unreachable() private pure returns (uint) {
-		assert(false);
-		return 0;
-	}
-
-	function f(uint x) public pure returns (uint) {
-		return x <= 1 ? 0 : x < 2 ? unreachable() : 0;
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol
deleted file mode 100644
index 71e294fb49bc..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-
-	function decrement(uint x) private pure returns (uint) {
-		return x - 1;
-	}
-
-	function decrement2(uint x) private pure returns (uint) {
-		return x - 1;
-	}
-
-	function increment(uint x) private pure returns (uint) {
-		return x + 1;
-	}
-
-	function increment2(uint x) private pure returns (uint) {
-		return x + 1;
-	}
-
-	function f(uint x) public pure returns (uint) {
-		return x < 10 ? (x > 0 ? decrement(x) : increment(x)) : (x > 100 ? increment2(x) : decrement2(x));
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 4984: (317-322): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol
deleted file mode 100644
index 0638e4838e10..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-
-	function increment(uint x) private pure returns (uint) {
-		return x + 1;
-	}
-
-	function increment2(uint x) private pure returns (uint) {
-		return x + 1;
-	}
-
-	function f(uint x) public pure returns (uint) {
-		return x < 10 ? (x > 0 ? 0 : increment(x)) : (x > 100 ? increment2(x) : 0);
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 4984: (160-165): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol
deleted file mode 100644
index 295590228d58..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-
-	uint s = 1;
-
-	function decrement() private returns (uint) {
-		return --s;
-	}
-
-	function increment() private returns (uint) {
-		return ++s;
-	}
-
-	function f(uint x) public returns (uint) {
-		require(s > 0 && s < 10);
-		uint olds = s;
-		uint ret = x < 1 ? increment() : decrement();
-		assert(s != olds);
-		return ret;
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol b/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol
deleted file mode 100644
index c5732293af58..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(bool x) public pure {
-		(uint a, uint b) = x ? (10000000001, 2) : (3, 4);
-		assert(a != 0);
-		assert(b != 0);
-		assert(a % 2 == 1);
-		assert(b % 2 == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add.sol b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
deleted file mode 100644
index 571cd666c10b..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 2;
-		uint a = ++x;
-		assert(x == 3);
-		assert(a == 3);
-		uint b = x++;
-		assert(x == 4);
-		// Should fail.
-		assert(b < 3);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 4\na = 3\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
deleted file mode 100644
index a45a5b980421..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C
-{
-	uint[] array;
-	function p() public {
-		array.push();
-	}
-	function f(uint x) public {
-		require(x < array.length);
-		array[x] = 2;
-		uint a = ++array[x];
-		assert(array[x] == 3);
-		assert(a == 3);
-		uint b = array[x]++;
-		assert(array[x] == 4);
-		// Should fail.
-		assert(b < 3);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (278-291): CHC: Assertion violation happens here.
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
deleted file mode 100644
index 4617fa91c789..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint[] x;
-	function f() public {
-		require(x.length == 0);
-		++x.push();
-		assert(x.length == 1);
-		assert(x[0] == 1); // should hold
-		assert(x[0] == 42); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (150-168): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
deleted file mode 100644
index a6cacac08a26..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	struct S {
-		int[][] d;
-	}
-	S[] data;
-	constructor() {
-		data.push();
-		data.push();
-		data[1].d.push();
-		data[1].d.push();
-		data[1].d.push();
-		data[1].d.push();
-	}
-	function f() public {
-		++data[1].d[3].push();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
deleted file mode 100644
index 5b208787ec76..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x) public {
-		map[x] = 2;
-		uint a = ++map[x];
-		assert(map[x] == 3);
-		assert(a == 3);
-		uint b = map[x]++;
-		assert(map[x] == 4);
-		// Should fail.
-		assert(b < 3);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (211-224): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol
deleted file mode 100644
index 3ab970900a67..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	uint8 x;
-
-	function inc_pre() public {
-		++x;
-	}
-
-	function dec_pre() public {
-		--x;
-	}
-
-    /* Commented out because Spacer segfaults in Z3 4.8.9
-	function inc_post() public {
-		x++;
-	}
-
-    function dec_post() public {
-		x--;
-	}
-    */
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (55-58): CHC: Overflow (resulting value larger than 255) might happen here.
-// Warning 3944: (95-98): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.dec_pre()
-// Warning 2661: (55-58): BMC: Overflow (resulting value larger than 255) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
deleted file mode 100644
index f1d57fa9674a..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint8 x = 254;
-
-	function inc_pre() public {
-		++x;
-	}
-
-	function check() view public {
-		uint y = x;
-		assert(y < 256);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (61-64): CHC: Overflow (resulting value larger than 255) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
deleted file mode 100644
index 12687d9e1820..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	struct S {
-		uint8 x;
-	}
-
-	S s;
-
-	constructor() {
-		s.x = 254;
-	}
-
-	function inc_pre() public {
-		++s.x;
-	}
-
-	function check() view public {
-		uint y = s.x;
-		assert(y < 256);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (112-117): CHC: Overflow (resulting value larger than 255) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol
deleted file mode 100644
index 72b292306efa..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		uint x;
-		if (b) ++(x);
-		if (b) --(x);
-		if (b) delete(b);
-		assert(x == 0);
-		assert(!b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol
deleted file mode 100644
index e61109c36fcf..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		uint x;
-		if (b) ++((((((x))))));
-		if (b) --((((((x))))));
-		if (b) delete((((((b))))));
-		assert(x == 0);
-		assert(!b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
deleted file mode 100644
index bef3d128035f..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bool b) public pure {
-		uint x;
-		if (b) ++(x);
-		else x += 1;
-		assert(x == 1);
-		assert(!b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (108-118): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
deleted file mode 100644
index 86ec98062fcb..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint x = 5;
-		uint a = --x;
-		assert(x == 4);
-		assert(a == 4);
-		uint b = x--;
-		assert(x == 3);
-		// Should fail.
-		assert(b > 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\na = 4\nb = 4\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
deleted file mode 100644
index f0cfe36cf58c..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	uint[] array;
-	function p() public { array.push(); }
-	function f(uint x) public {
-		require(x < array.length);
-		array[x] = 5;
-		uint a = --array[x];
-		assert(array[x] == 4);
-		assert(a == 4);
-		uint b = array[x]--;
-		assert(array[x] == 3);
-		// Should fail.
-		assert(b > 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (275-288): CHC: Assertion violation happens here.
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
deleted file mode 100644
index 20f2c838091c..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x) public {
-		map[x] = 5;
-		uint a = --map[x];
-		assert(map[x] == 4);
-		assert(a == 4);
-		uint b = map[x]--;
-		assert(map[x] == 3);
-		// Should fail.
-		assert(b > 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (211-224): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
deleted file mode 100644
index 1e94e41d4a62..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-type U is uint;
-using {div as /} for U global;
-
-function div(U x, U y) pure returns (U) {
-    return U.wrap(U.unwrap(x) / U.unwrap(y)); // detects division by zero
-}
-
-contract C {
-    function f(U x, U y) public pure returns (U) {
-        return x / y; // reports division by zero in the implementation
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
deleted file mode 100644
index 8f8e6c53c411..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-type U is uint;
-using {div as /} for U global;
-
-function div(U x, U y) pure returns (U) {
-    if (U.unwrap(y) == 0)
-        return U.wrap(0);
-
-    return U.wrap(U.unwrap(x) / U.unwrap(y));
-}
-
-contract C {
-    function f(U x, U y) public pure returns (U) {
-        return x / y; // no div by zero possible here
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
deleted file mode 100644
index c39360b656d2..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
+++ /dev/null
@@ -1,64 +0,0 @@
-type I16 is int16;
-using {
-    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
-    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
-    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
-} for I16 global;
-
-function bitor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) | I16.unwrap(y)); }
-function bitand(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) & I16.unwrap(y)); }
-function bitxor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) ^ I16.unwrap(y)); }
-function bitnot(I16 x) pure returns (I16) { return I16.wrap(~I16.unwrap(x)); }
-
-function add(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) + I16.unwrap(y)); }
-function sub(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) - I16.unwrap(y)); }
-function unsub(I16 x) pure returns (I16) { return I16.wrap(-I16.unwrap(x)); }
-function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) * I16.unwrap(y)); }
-function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
-function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
-
-function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
-function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
-function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
-function gt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) > I16.unwrap(y); }
-function leq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) <= I16.unwrap(y); }
-function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unwrap(y); }
-
-contract C {
-    I16 constant MINUS_TWO = I16.wrap(-2);
-    I16 constant ZERO = I16.wrap(0);
-    I16 constant ONE = I16.wrap(1);
-    I16 constant TWO = I16.wrap(2);
-    I16 constant THREE = I16.wrap(3);
-    I16 constant FOUR = I16.wrap(4);
-
-    function testBitwise() public pure {
-        assert(ONE | TWO == THREE);
-        assert(ONE & THREE == ONE);
-        assert(TWO ^ TWO == ZERO);
-        assert(~ONE == MINUS_TWO);
-    }
-
-    function testArithmetic() public pure {
-        assert(TWO + TWO == FOUR);
-        assert(TWO - TWO == ZERO);
-        assert(-TWO == MINUS_TWO);
-        assert(TWO * TWO == FOUR);
-        assert(TWO / TWO == ONE);
-        assert(TWO % TWO == ZERO);
-    }
-
-    function testComparison() public pure {
-        assert(TWO == TWO);
-        assert(!(TWO != TWO));
-        assert(!(TWO < TWO));
-        assert(!(TWO > TWO));
-        assert(TWO <= TWO);
-        assert(TWO >= TWO);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 21 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
deleted file mode 100644
index 25674513c0de..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
+++ /dev/null
@@ -1,79 +0,0 @@
-type I16 is int16;
-using {
-    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
-    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
-    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
-} for I16 global;
-
-function bitor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) | I16.unwrap(y)); }
-function bitand(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) & I16.unwrap(y)); }
-function bitxor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) ^ I16.unwrap(y)); }
-function bitnot(I16 x) pure returns (I16) { return I16.wrap(~I16.unwrap(x)); }
-
-function add(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) + I16.unwrap(y)); }
-function sub(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) - I16.unwrap(y)); }
-function unsub(I16 x) pure returns (I16) { return I16.wrap(-I16.unwrap(x)); }
-function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) * I16.unwrap(y)); }
-function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
-function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
-
-function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
-function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
-function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
-function gt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) > I16.unwrap(y); }
-function leq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) <= I16.unwrap(y); }
-function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unwrap(y); }
-
-contract C {
-    I16 constant MINUS_TWO = I16.wrap(-2);
-    I16 constant ZERO = I16.wrap(0);
-    I16 constant ONE = I16.wrap(1);
-    I16 constant TWO = I16.wrap(2);
-    I16 constant THREE = I16.wrap(3);
-    I16 constant FOUR = I16.wrap(4);
-
-    function testBitwise() public pure {
-        assert(ONE | TWO == FOUR); // should fail
-        assert(ONE & THREE == FOUR); // should fail
-        assert(TWO ^ TWO == FOUR); // should fail
-        assert(~ONE == FOUR); // should fail
-    }
-
-    function testArithmetic() public pure {
-        assert(TWO + THREE == FOUR); // should fail
-        assert(TWO - TWO == FOUR); // should fail
-        assert(-TWO == FOUR); // should fail
-        assert(TWO * THREE == FOUR); // should fail
-        assert(TWO / TWO == FOUR); // should fail
-        assert(TWO % TWO == FOUR); // should fail
-    }
-
-    function testComparison() public pure {
-        assert(!(TWO == TWO)); // should fail
-        assert(TWO != TWO); // should fail
-        assert(TWO < TWO); // should fail
-        assert(TWO > TWO); // should fail
-        assert(!(TWO <= TWO)); // should fail
-        assert(!(TWO >= TWO)); // should fail
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (2012-2037): CHC: Assertion violation happens here.
-// Warning 6328: (2062-2089): CHC: Assertion violation happens here.
-// Warning 6328: (2114-2139): CHC: Assertion violation happens here.
-// Warning 6328: (2164-2184): CHC: Assertion violation happens here.
-// Warning 6328: (2260-2287): CHC: Assertion violation happens here.
-// Warning 6328: (2312-2337): CHC: Assertion violation happens here.
-// Warning 6328: (2362-2382): CHC: Assertion violation happens here.
-// Warning 6328: (2407-2434): CHC: Assertion violation happens here.
-// Warning 6328: (2459-2484): CHC: Assertion violation happens here.
-// Warning 6328: (2509-2534): CHC: Assertion violation happens here.
-// Warning 6328: (2610-2631): CHC: Assertion violation happens here.
-// Warning 6328: (2656-2674): CHC: Assertion violation happens here.
-// Warning 6328: (2699-2716): CHC: Assertion violation happens here.
-// Warning 6328: (2741-2758): CHC: Assertion violation happens here.
-// Warning 6328: (2783-2804): CHC: Assertion violation happens here.
-// Warning 6328: (2829-2850): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
deleted file mode 100644
index a6cad9580f72..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-type I16 is int16;
-using {
-    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
-    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
-    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
-} for I16 global;
-
-function bitor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) | I16.unwrap(y)); }
-function bitand(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) & I16.unwrap(y)); }
-function bitxor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) ^ I16.unwrap(y)); }
-function bitnot(I16 x) pure returns (I16) { return I16.wrap(~I16.unwrap(x)); }
-
-function add(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) + I16.unwrap(y)); }
-function sub(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) - I16.unwrap(y)); }
-function unsub(I16 x) pure returns (I16) { return I16.wrap(-I16.unwrap(x)); }
-function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) * I16.unwrap(y)); }
-function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
-function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
-
-
-function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
-function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
-function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
-function gt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) > I16.unwrap(y); }
-function leq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) <= I16.unwrap(y); }
-function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unwrap(y); }
-
-contract C {
-    function testBitwise(I16 x, I16 y) public pure {
-        assert(x | y == bitor(x, y)); // should hold
-        assert(x & y == bitand(x, y)); // should hold
-        assert(x ^ y == bitxor(x, y)); // should hold
-        assert(~x == bitnot(x)); // should hold
-    }
-
-    function testArithmetic(I16 x, I16 y) public pure {
-        assert(x + y == add(x, y));
-        assert(x - y == sub(x, y));
-        assert(-x == unsub(x));
-        assert(x * y == mul(x, y));
-        assert(x / y == div(x, y));
-        assert(x % y == mod(x, y));
-    }
-
-    function testComparison(I16 x, I16 y) public pure {
-        assert((x == y) == eq(x, y)); // should hold
-        assert((x != y) == noteq(x, y)); // should hold
-        assert((x < y) == lt(x, y)); // should hold
-        assert((x > y) == gt(x, y)); // should hold
-        assert((x <= y) == leq(x, y)); // should hold
-        assert((x >= y) == geq(x, y)); // should hold
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 3944: (679-708): CHC: Underflow (resulting value less than -32768) might happen here.
-// Warning 4984: (679-708): CHC: Overflow (resulting value larger than 32767) might happen here.
-// Warning 3944: (777-806): CHC: Underflow (resulting value less than -32768) happens here.
-// Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) might happen here.
-// Warning 3944: (953-982): CHC: Underflow (resulting value less than -32768) might happen here.
-// Warning 4984: (953-982): CHC: Overflow (resulting value larger than 32767) might happen here.
-// Warning 4984: (1051-1080): CHC: Overflow (resulting value larger than 32767) might happen here.
-// Warning 4281: (1051-1080): CHC: Division by zero might happen here.
-// Warning 4281: (1149-1178): CHC: Division by zero happens here.
-// Warning 6328: (2105-2131): CHC: Assertion violation might happen here.
-// Warning 6328: (2141-2163): CHC: Assertion violation might happen here.
-// Warning 6328: (2209-2235): CHC: Assertion violation might happen here.
-// Warning 6328: (2245-2271): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 3046: (1051-1080): BMC: Division by zero happens here.
-// Warning 7812: (2245-2271): BMC: Assertion violation might happen here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
deleted file mode 100644
index 8211325276fd..000000000000
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type U8 is uint8;
-using {add as +} for U8 global;
-
-function add(U8 x, U8 y) pure returns (U8) {
-    return U8.wrap(U8.unwrap(x) + U8.unwrap(y)); // overflow detected
-}
-
-contract C {
-    U8 x = U8.wrap(255);
-
-    function inc() public {
-        x = x + U8.wrap(1);
-    }
-
-    function check() view public {
-        U8 y = x;
-        assert(U8.unwrap(y) < 256);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (115-142): CHC: Overflow (resulting value larger than 255) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/options/engine_none.sol b/test/libsolidity/smtCheckerTests/options/engine_none.sol
deleted file mode 100644
index f14eb43f3da5..000000000000
--- a/test/libsolidity/smtCheckerTests/options/engine_none.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        assert(x > 0);
-    }
-}
-// ====
-// SMTEngine: none
diff --git a/test/libsolidity/smtCheckerTests/options/pragma.sol b/test/libsolidity/smtCheckerTests/options/pragma.sol
deleted file mode 100644
index b3e35ee02238..000000000000
--- a/test/libsolidity/smtCheckerTests/options/pragma.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma experimental SMTChecker;
-contract C {
-    function f(uint x) public pure {
-        assert(x > 0);
-    }
-}
-// ----
-// Warning 5523: (0-31): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
-// Warning 6328: (90-103): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
deleted file mode 100644
index bc37a3130178..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-	uint[] a;
-	uint l;
-	function p() public {
-		require(a.length < type(uint).max - 1);
-		a.push();
-		++l;
-	}
-	function q() public {
-		require(a.length > 0);
-		a.pop();
-		--l;
-	}
-	function r() public view returns (uint) {
-		require(l > 0);
-		return a[l]; // oob access
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 3944: (181-184): CHC: Underflow (resulting value less than 0) might happen here.
-// Warning 6368: (259-263): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4144: (181-184): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
deleted file mode 100644
index 77f4548fd292..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint[] a;
-	uint l;
-	function p() public {
-		require(a.length < type(uint).max - 1);
-		require(l < type(uint).max - 1);
-		a.push();
-		++l;
-	}
-	function q() public {
-		require(a.length > 0);
-		require(l > 0);
-		a.pop();
-		--l;
-	}
-	function r() public view returns (uint) {
-		require(l > 0);
-		return a[l - 1]; // safe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol
deleted file mode 100644
index a52707c58a1c..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint[][] a;
-	function p() public { a.push(); }
-	function q(uint i) public {
-		require(i < a.length);
-		a[i].push();
-	}
-	function r(uint i, uint j) public view returns (uint) {
-		require(i < a.length);
-		require(j < a[i].length);
-		return a[i][j]; // safe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
deleted file mode 100644
index 63fa1cf7c7fd..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint[][] a;
-	function p() public { a.push(); }
-	function q(uint i) public {
-		require(i < a.length);
-		a[i].push();
-	}
-	function r(uint i, uint j) public view returns (uint) {
-		require(i < a.length);
-		return a[i][j]; // unsafe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (224-231): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol
deleted file mode 100644
index 8fad49b80638..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	uint[][] a;
-	function p() public { a.push(); }
-	function q(uint i) public {
-		require(i < a.length);
-		a[i].push();
-	}
-	function r() public view {
-		for (uint i = 0; i < a.length; ++i)
-			for (uint j = 0; j < a[i].length; ++j)
-				a[i][j]; // safe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
deleted file mode 100644
index 2a9f39d1a2fa..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	uint[][] a;
-	function p() public { a.push(); }
-	function q(uint i) public {
-		require(i < a.length);
-		a[i].push();
-	}
-	function r() public view {
-		for (uint i = 0; i < a.length + 10; ++i)
-			for (uint j = 0; j < a[i].length + 20; ++j)
-				a[i][j]; // oob access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (184-197): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (199-202): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (228-232): CHC: Out of bounds access happens here.
-// Warning 4984: (228-244): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (246-249): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (255-259): CHC: Out of bounds access happens here.
-// Warning 6368: (255-262): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (184-197): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 2661: (228-244): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol
deleted file mode 100644
index bd70673c365f..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	uint[] a;
-	function r(uint i) public view returns (uint) {
-		return a[i]; // oob access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (82-86): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r(0)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol
deleted file mode 100644
index ab895696fbb4..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	uint[] a;
-	function p() public { a.push(); }
-	function r(uint i) public view returns (uint) {
-		require(i < a.length);
-		return a[i]; // safe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol
deleted file mode 100644
index 464188441dea..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function r(bytes4 x) public pure returns (bytes1) {
-		return x[0]; // safe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
deleted file mode 100644
index d51685f397d0..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function r(bytes4 x, uint y) public pure returns (bytes1) {
-		return x[y]; // oob access
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6368: (83-87): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = 0x0\ny = 4\n = 0x0\n\nTransaction trace:\nC.constructor()\nC.r(0x0, 4)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol
deleted file mode 100644
index 5d0dd95f827b..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function r(bytes32 x, uint y) public pure {
-		require(y <= 31);
-		x[0]; // safe access
-		x[y]; // safe access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
deleted file mode 100644
index fd94acfee5e4..000000000000
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function r(bytes32 x, uint y) public pure {
-		x[0]; // safe access
-		// Disabled because of Spacer nondeterminism.
-		//x[y]; // oob access
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (36-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
deleted file mode 100644
index c5e7ecf38920..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract DepositContract {
-    uint constant MAX_DEPOSIT_COUNT = 2**32 - 1;
-
-    uint256 deposit_count;
-    uint256 deposit_count_2;
-
-    function deposit() external {
-        require(deposit_count < MAX_DEPOSIT_COUNT);
-        deposit_count += 1;
-        deposit_count_2 += 10; // should fail
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (256-277): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (256-277): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
deleted file mode 100644
index c43aba43c51b..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(uint8 x) public pure returns (uint8) {
-		x = 100;
-		uint8 y = x * 3;
-		assert(y == 44);
-		x = 128;
-		y = x * 4;
-		assert(y == 0);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (87-92): CHC: Overflow (resulting value larger than 255) happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
deleted file mode 100644
index 3dd28c7ad668..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bytes calldata x, uint y) external pure {
-		require(x.length > 10);
-		x[8][0];
-		x[8][5*y];
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (111-114): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6368: (106-115): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
deleted file mode 100644
index 16e7d0a2095b..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(int8 x) public pure returns (int8) {
-		x = 100;
-		int8 y;
-		unchecked { y = x * 2; }
-		assert(y == -56);
-		y = x * 100;
-		assert(y == 16);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (136-143): CHC: Overflow (resulting value larger than 127) happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
deleted file mode 100644
index 100c4bfc07d9..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f(uint8 x) public pure returns (uint8) {
-		uint8 y;
-		unchecked { y = x + 255; }
-		require(y >= x);
-		x = 255;
-		unchecked { y = x + 1; }
-		assert(y == 0);
-		y = x + 255;
-		assert(y == 254);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (185-192): CHC: Overflow (resulting value larger than 255) happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol
deleted file mode 100644
index b26189f5082a..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f(int8 x) public pure {
-		x = 127;
-		int8 y;
-		unchecked { y = x + 1; }
-		assert(y == -128);
-		unchecked { y = x + 127; }
-		assert(y == -2);
-		x = -127;
-		unchecked { y = x + -127; }
-		assert(y == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/safe_sub_1.sol b/test/libsolidity/smtCheckerTests/overflow/safe_sub_1.sol
deleted file mode 100644
index 221da89ff3dc..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/safe_sub_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function sub(uint256 a, uint256 b) internal pure returns (uint256) {
-		require(b <= a);
-		uint256 c = a - b;
-		return c;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
deleted file mode 100644
index 1e55eb9770be..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
-// Warning 4281: (77-82): CHC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
deleted file mode 100644
index 65bf721dcb05..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		require(x >= y);
-		return x - y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
deleted file mode 100644
index 7704e2d7e001..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		require(x + y >= x);
-		return x + y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 3944: (78-83): CHC: Underflow (resulting value less than -2**255) happens here.
-// Warning 4984: (78-83): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol
deleted file mode 100644
index 7106bbbb8811..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		return x % y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (77-82): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
deleted file mode 100644
index c91b15da716b..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		return x * y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -2**255) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
deleted file mode 100644
index 000acfaeaefa..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		return x - y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -2**255) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
deleted file mode 100644
index 998944a55e3f..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C  {
-	function f(int x, int y) public pure returns (int) {
-		return x + y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -2**255) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
deleted file mode 100644
index e8cf49a83258..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint a, uint b) public pure returns (uint) { return a + b; }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 1\nb = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
diff --git a/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol b/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol
deleted file mode 100644
index aadeff533175..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(uint8 x) public pure returns (uint) {
-		x = 0;
-		uint8 y;
-		unchecked { y = x - 1; }
-		assert(y == 255);
-		unchecked { y = x - 255; }
-		assert(y == 1);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol b/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol
deleted file mode 100644
index c62198109e4b..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(int8 x) public pure returns (int8) {
-		x = -2;
-		int8 y;
-		unchecked { y = x - 127; }
-		assert(y == 127);
-		x = -128;
-		unchecked { y = x - 127; }
-		assert(y == 1);
-		x = 127;
-		unchecked { y = x - (-127); }
-		assert(y == -2);
-		return y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol
deleted file mode 100644
index 76ab3402ee8e..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x / y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (80-85): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol
deleted file mode 100644
index afc0c2682752..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		require(x >= y);
-		return x - y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol
deleted file mode 100644
index 904cb52c497f..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x + y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol
deleted file mode 100644
index 7c42d43a2595..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x % y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (80-85): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
deleted file mode 100644
index e809e041cc68..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x * y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol
deleted file mode 100644
index 1c6df4b2cac5..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x - y;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 3944: (80-85): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\nx = 0\ny = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 1)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol
deleted file mode 100644
index 904cb52c497f..000000000000
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C  {
-	function f(uint x, uint y) public pure returns (uint) {
-		return x + y;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol b/test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol
deleted file mode 100644
index a592331035f0..000000000000
--- a/test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-
-    function f() public pure {
-        uint x = 1;
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (73-87): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/simple/smoke_test.sol b/test/libsolidity/smtCheckerTests/simple/smoke_test.sol
deleted file mode 100644
index 975451bc2430..000000000000
--- a/test/libsolidity/smtCheckerTests/simple/smoke_test.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/simple/static_array.sol b/test/libsolidity/smtCheckerTests/simple/static_array.sol
deleted file mode 100644
index c32e2a890524..000000000000
--- a/test/libsolidity/smtCheckerTests/simple/static_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C
-{
-	// Used to crash because Literal had no type
-	int[3] d;
-	// Used to crash because Literal had no type
-	int[3*1] x;
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2.sol
deleted file mode 100644
index b9613a58cd99..000000000000
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	struct S { uint x; uint[] b; }
-	function f() public pure returns (S memory, bytes memory, uint[][2] memory) {
-		return abi.decode("abc", (S, bytes, uint[][2]));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
deleted file mode 100644
index 25bd93f5b34a..000000000000
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-	function f(bytes memory data) public pure {
-		(uint x1, bool b1) = abi.decode(data, (uint, bool));
-		(uint x2, bool b2) = abi.decode(data, (uint, bool));
-		assert(x1 == x2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (91-98): Unused local variable.
-// Warning 2072: (146-153): Unused local variable.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
deleted file mode 100644
index 576728365289..000000000000
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f(bytes memory data) public pure {
-		(uint a1, bytes32 b1, C c1) = abi.decode(data, (uint, bytes32, C));
-		(uint a2, bytes32 b2, C c2) = abi.decode(data, (uint, bytes32, C));
-		assert(a1 == a2);
-		assert(a1 != a2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (70-80): Unused local variable.
-// Warning 2072: (82-86): Unused local variable.
-// Warning 2072: (140-150): Unused local variable.
-// Warning 2072: (152-156): Unused local variable.
-// Warning 6328: (220-236): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/abi_encode_slice.sol b/test/libsolidity/smtCheckerTests/special/abi_encode_slice.sol
deleted file mode 100644
index 5295afa690e4..000000000000
--- a/test/libsolidity/smtCheckerTests/special/abi_encode_slice.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f(bytes calldata data) external pure returns (bytes memory) {
-		return abi.encode(bytes(data[:32]));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
deleted file mode 100644
index 6d367b5c6dd5..000000000000
--- a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract C {
-	address coin;
-	uint dif;
-	uint prevrandao;
-	uint gas;
-	uint number;
-	uint timestamp;
-	function f() public {
-		coin = block.coinbase;
-		dif = block.difficulty;
-		prevrandao = block.prevrandao;
-		gas = block.gaslimit;
-		number = block.number;
-		timestamp = block.timestamp;
-
-		g();
-	}
-	function g() internal view {
-		assert(uint160(coin) >= 0); // should hold
-		assert(dif >= 0); // should hold
-		assert(prevrandao > 2**64); // should hold
-		assert(gas >= 0); // should hold
-		assert(number >= 0); // should hold
-		assert(timestamp >= 0); // should hold
-
-		assert(coin == block.coinbase); // should fail with BMC
-		assert(dif == block.difficulty); // should fail with BMC
-		assert(prevrandao == block.prevrandao); // should fail with BMC
-		assert(gas == block.gaslimit); // should fail with BMC
-		assert(number == block.number); // should fail with BMC
-		assert(timestamp == block.timestamp); // should fail with BMC
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 8417: (155-171): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (641-657): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 4661: (409-435): BMC: Assertion violation happens here.
-// Warning 4661: (569-599): BMC: Assertion violation happens here.
-// Warning 4661: (627-658): BMC: Assertion violation happens here.
-// Warning 4661: (686-724): BMC: Assertion violation happens here.
-// Warning 4661: (752-781): BMC: Assertion violation happens here.
-// Warning 4661: (809-839): BMC: Assertion violation happens here.
-// Warning 4661: (867-903): BMC: Assertion violation happens here.
-// Info 6002: BMC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
deleted file mode 100644
index 71e21aa4be03..000000000000
--- a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract C {
-	address coin;
-	uint dif;
-	uint prevrandao;
-	uint gas;
-	uint number;
-	uint timestamp;
-	function f() public {
-		coin = block.coinbase;
-		dif = block.difficulty;
-		prevrandao = block.prevrandao;
-		gas = block.gaslimit;
-		number = block.number;
-		timestamp = block.timestamp;
-
-		g();
-	}
-	function g() internal view {
-		assert(uint160(coin) >= 0); // should hold
-		assert(dif >= 0); // should hold
-		assert(prevrandao > 2**64); // should hold
-		assert(gas >= 0); // should hold
-		assert(number >= 0); // should hold
-		assert(timestamp >= 0); // should hold
-
-		assert(coin == block.coinbase); // should hold with CHC
-		assert(dif == block.difficulty); // should hold with CHC
-		assert(prevrandao == block.prevrandao); // should hold with CHC
-		assert(gas == block.gaslimit); // should hold with CHC
-		assert(number == block.number); // should hold with CHC
-		assert(timestamp == block.timestamp); // should hold with CHC
-
-		assert(coin == address(this)); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTIgnoreOS: macos
-// ----
-// Warning 8417: (155-171): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (641-657): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 6328: (932-961): CHC: Assertion violation happens here.
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/blockhash.sol b/test/libsolidity/smtCheckerTests/special/blockhash.sol
deleted file mode 100644
index 65432370118e..000000000000
--- a/test/libsolidity/smtCheckerTests/special/blockhash.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(uint x) public payable {
-		assert(blockhash(x) > 0);
-		assert(blockhash(2) > 0);
-		uint y = x;
-		assert(blockhash(x) == blockhash(y));
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (52-76): CHC: Assertion violation happens here.
-// Warning 6328: (80-104): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/chainid.sol b/test/libsolidity/smtCheckerTests/special/chainid.sol
deleted file mode 100644
index 3cb4003dfcff..000000000000
--- a/test/libsolidity/smtCheckerTests/special/chainid.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.chainid + 0; // Overflow not possible!
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/ether_units.sol b/test/libsolidity/smtCheckerTests/special/ether_units.sol
deleted file mode 100644
index 9c0e8ea71ff0..000000000000
--- a/test/libsolidity/smtCheckerTests/special/ether_units.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {
-	function f() public pure {
-		assert(1000000000000000000 wei == 1 ether);
-		assert(100000000000000000 wei == 1 ether);
-		assert(1000000000 wei == 1 gwei);
-		assert(100000000 wei == 1 gwei);
-		assert(1000000000 gwei == 1 ether);
-		assert(100000000 gwei == 1 ether);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (89-130): CHC: Assertion violation happens here.
-// Warning 6328: (170-201): CHC: Assertion violation happens here.
-// Warning 6328: (243-276): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/event.sol b/test/libsolidity/smtCheckerTests/special/event.sol
deleted file mode 100644
index a5ddafc58dac..000000000000
--- a/test/libsolidity/smtCheckerTests/special/event.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	event Nudge();
-	event SomeArgs(uint, uint);
-	event Caller(address, uint);
-	function f() payable external {
-		emit Nudge();
-		emit SomeArgs(134, 567);
-		emit Caller(msg.sender, msg.value);
-	}
-	function g_data() pure internal returns (uint) {
-		assert(true);
-	}
-	function g() external {
-		emit SomeArgs(g_data(), g_data());
-	}
-	bool x = true;
-	function h_data() view internal returns (uint) {
-		assert(x);
-	}
-	function h() external {
-		x = false;
-		emit SomeArgs(h_data(), h_data());
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (247-251): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (397-401): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (407-416): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/gasleft.sol b/test/libsolidity/smtCheckerTests/special/gasleft.sol
deleted file mode 100644
index 29b8e0dc0755..000000000000
--- a/test/libsolidity/smtCheckerTests/special/gasleft.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f() public view {
-		assert(gasleft() > 0);
-		uint g = gasleft();
-		assert(g < gasleft());
-		assert(g >= gasleft());
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (43-64): CHC: Assertion violation happens here.
-// Warning 6328: (90-111): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/many.sol b/test/libsolidity/smtCheckerTests/special/many.sol
deleted file mode 100644
index 247eec98e223..000000000000
--- a/test/libsolidity/smtCheckerTests/special/many.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C
-{
-	function f() public payable {
-		assert(msg.sender == block.coinbase);
-		assert(block.difficulty == block.gaslimit);
-		assert(block.prevrandao == block.gaslimit);
-		assert(block.number == block.timestamp);
-		assert(tx.gasprice == msg.value);
-		assert(tx.origin == msg.sender);
-		uint x = block.number;
-		unchecked { x += 2; }
-		assert(x > block.number);
-		assert(block.timestamp > 10);
-		assert(gasleft() > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 8417: (93-109): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 6328: (46-82): CHC: Assertion violation happens here.
-// Warning 6328: (86-128): CHC: Assertion violation happens here.
-// Warning 6328: (132-174): CHC: Assertion violation happens here.
-// Warning 6328: (178-217): CHC: Assertion violation happens here.
-// Warning 6328: (221-253): CHC: Assertion violation happens here.
-// Warning 6328: (257-288): CHC: Assertion violation happens here.
-// Warning 6328: (341-365): CHC: Assertion violation happens here.
-// Warning 6328: (369-397): CHC: Assertion violation happens here.
-// Warning 6328: (401-424): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/many_internal.sol b/test/libsolidity/smtCheckerTests/special/many_internal.sol
deleted file mode 100644
index cf9c61ae6648..000000000000
--- a/test/libsolidity/smtCheckerTests/special/many_internal.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C
-{
-	function f() public payable {
-		g();
-	}
-	function g() internal {
-		assert(msg.sender == block.coinbase);
-		assert(block.difficulty == block.gaslimit);
-		assert(block.prevrandao == block.gaslimit);
-		assert(block.number == block.timestamp);
-		assert(tx.gasprice == msg.value);
-		assert(tx.origin == msg.sender);
-		uint x = block.number;
-		unchecked { x += 2; }
-		assert(x > block.number);
-		assert(block.timestamp > 10);
-		assert(gasleft() > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 8417: (128-144): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 6328: (81-117): CHC: Assertion violation happens here.
-// Warning 6328: (121-163): CHC: Assertion violation happens here.
-// Warning 6328: (167-209): CHC: Assertion violation happens here.
-// Warning 6328: (213-252): CHC: Assertion violation happens here.
-// Warning 6328: (256-288): CHC: Assertion violation happens here.
-// Warning 6328: (292-323): CHC: Assertion violation happens here.
-// Warning 6328: (376-400): CHC: Assertion violation happens here.
-// Warning 6328: (404-432): CHC: Assertion violation happens here.
-// Warning 6328: (436-459): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_data.sol b/test/libsolidity/smtCheckerTests/special/msg_data.sol
deleted file mode 100644
index 37552a2b91e5..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_data.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C
-{
-	function f() public payable {
-		assert(msg.data.length > 0);
-		// Fails since calldata size should be 4
-		assert(msg.data.length > 4);
-		// f's sig is 0x26121ff0
-		assert(msg.data[0] == 0x26);
-		assert(msg.data[1] == 0x12);
-		assert(msg.data[2] == 0x1f);
-		assert(msg.data[3] == 0xf0);
-	}
-	function g() public payable {
-		// g's sig is 0xe2179b8e
-		assert(msg.data[0] == 0xe2);
-		assert(msg.data[1] == 0x17);
-		assert(msg.data[2] == 0x9b);
-		// Fails
-		assert(msg.data[3] == 0x8f);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (120-147): CHC: Assertion violation happens here.
-// Warning 6328: (467-494): CHC: Assertion violation happens here.
-// Info 1391: CHC: 16 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol b/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol
deleted file mode 100644
index 6368eb2ddd12..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public payable {
-		assert((msg).value == 10);
-		assert((true ? msg : msg).value == 12);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// SMTIgnoreCex: yes
-// ----
-// TypeError 9717: (90-93): Invalid mobile type in true expression.
-// TypeError 3703: (96-99): Invalid mobile type in false expression.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol
deleted file mode 100644
index af6d79021e6f..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f() public view {
-		address a = msg.sender;
-		address b = msg.sender;
-		assert(a == b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol
deleted file mode 100644
index 71cb0e123528..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	function f() public view {
-		require(msg.sender != address(0));
-		address a = msg.sender;
-		address b = msg.sender;
-		assert(a == b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol
deleted file mode 100644
index 4ca48fb4c75f..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	address owner;
-
-	constructor() {
-		owner = msg.sender;
-		assert(owner >= address(0)); // should hold
-	}
-}
-
-contract D {
-	address owner;
-
-	constructor() {
-		unchecked {
-			owner = msg.sender;
-			assert(owner >= address(0)); // should hold
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
deleted file mode 100644
index e285f97d91b8..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(address c) public view {
-		address a = msg.sender;
-		address b = msg.sender;
-		assert(a == b);
-		assert(c == msg.sender);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (122-145): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol
deleted file mode 100644
index f78200cd3b11..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-
-	function f() public view {
-		assert(msg.sender >= address(0)); // should hold
-		assert(msg.sender <= address(2**160-1)); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sig.sol b/test/libsolidity/smtCheckerTests/special/msg_sig.sol
deleted file mode 100644
index 45fa054364b8..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_sig.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C
-{
-	function f() public pure {
-		assert(msg.sig == 0x00000000);
-		assert(msg.sig == 0x26121ff0);
-		fi();
-		gi();
-	}
-	function fi() internal pure {
-		assert(msg.sig == 0x26121ff0);
-	}
-	function g() public pure {
-		assert(msg.sig == 0xe2179b8e);
-		gi();
-	}
-	function gi() internal pure {
-		// Fails since f can also call gi in which case msg.sig == 0x26121ff0
-		assert(msg.sig == 0xe2179b8e);
-	}
-	function h() public pure {
-		// Fails since gi can also call h in which case msg.sig can be f() or g()
-		assert(msg.sig == 0xe2179b8e);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (43-72): CHC: Assertion violation happens here.
-// Warning 6328: (370-399): CHC: Assertion violation happens here.
-// Warning 6328: (510-539): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_1.sol b/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
deleted file mode 100644
index 3f8b50ba0fd5..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public payable {
-		assert ((5 + msg.value + msg.value) - (4 + msg.value) > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (55-68): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (55-80): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_2.sol b/test/libsolidity/smtCheckerTests/special/msg_value_2.sol
deleted file mode 100644
index acf1b9e5dc6e..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public payable {
-		assert(msg.value > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (46-67): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 0 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
deleted file mode 100644
index 4035dffaa809..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	bool lock = true;
-	function f() public {
-		lock = false;
-		g();
-		lock = true;
-	}
-	function g() public payable {
-		require(lock == false);
-		assert(msg.value == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_4.sol b/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
deleted file mode 100644
index cab8c0aa58a4..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    uint x = msg.value;
-    constructor() {
-        assert(x == 0); // should hold
-    }
-}
-
-contract B {
-    constructor() payable {
-        assert(msg.value == 0); // should fail
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (154-176): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
deleted file mode 100644
index 07a2bb35bf65..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract A {
-	uint public x = msg.value;
-	constructor() payable {
-		assert(x == 0); // should fail, A can be constructed with any msg.value
-	}
-}
-
-contract C is A {
-	uint public v = msg.value;
-	constructor() A() {
-		assert(v == 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (68-82): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
deleted file mode 100644
index 942607bd8a6f..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-	uint public x = msg.value;
-	constructor() {
-		assert(x == 0); // should fail, if A is constructed as part of C, it can have any msg.value
-	}
-}
-
-contract C is A {
-	uint public v = msg.value; // 1
-	constructor() A() payable {
-		assert(v == 0); // should fail, C can be constructed with any msg.value
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (60-74): CHC: Assertion violation happens here.
-// Warning 6328: (240-254): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
deleted file mode 100644
index fc8d6e08f300..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract A {
-	uint public x = msg.value;
-	constructor() {
-		assert(x == 0); // can fail when A is constructed as part of C
-	}
-}
-
-contract B {
-	constructor() payable {
-		assert(msg.value >= 0); // should hold
-	}
-}
-contract C is A, B {
-	constructor() A() B() payable {
-		assert(msg.value >= 0); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (60-74): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
deleted file mode 100644
index f96f588019a9..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	bytes data;
-	address sender;
-	bytes4 sig;
-	uint value;
-	function f() public payable {
-		data = msg.data;
-		sender = msg.sender;
-		sig = msg.sig;
-		value = msg.value;
-
-		g();
-	}
-	function g() internal view {
-		assert(data.length >= 0); // should hold
-		assert(uint160(sender) >= 0); // should hold
-		assert(uint32(sig) >= 0); // should hold
-		assert(value >= 0); // should hold
-
-		assert(data.length == msg.data.length); // should fail with BMC
-		assert(sender == msg.sender); // should fail with BMC
-		assert(sig == msg.sig); // should fail with BMC
-		assert(value == msg.value); // should fail with BMC
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (394-432): BMC: Assertion violation happens here.
-// Warning 4661: (460-488): BMC: Assertion violation happens here.
-// Warning 4661: (516-538): BMC: Assertion violation happens here.
-// Warning 4661: (566-592): BMC: Assertion violation happens here.
-// Info 6002: BMC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
deleted file mode 100644
index 2a39b5de4527..000000000000
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-	bytes data;
-	address sender;
-	bytes4 sig;
-	uint value;
-	function f() public payable {
-		data = msg.data;
-		sender = msg.sender;
-		sig = msg.sig;
-		value = msg.value;
-		require(value == 42);
-
-		g();
-	}
-	function g() internal view {
-		assert(data.length >= 0); // should hold
-		assert(uint160(sender) >= 0); // should hold
-		assert(uint32(sig) >= 0); // should hold
-		assert(value >= 0); // should hold
-
-		assert(data.length == msg.data.length); // should hold with CHC
-		assert(sender == msg.sender); // should hold with CHC
-		assert(sig == msg.sig); // should hold with CHC
-		assert(value == msg.value); // should hold with CHC
-
-		assert(msg.value == 10); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// ----
-// Warning 6328: (645-668): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/prevrandao.sol b/test/libsolidity/smtCheckerTests/special/prevrandao.sol
deleted file mode 100644
index 4bc818ba1606..000000000000
--- a/test/libsolidity/smtCheckerTests/special/prevrandao.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(uint prevrandao) public view {
-		assert(block.prevrandao == prevrandao); // should fail
-		assert(block.difficulty == prevrandao); // should fail
-		assert(block.difficulty == block.prevrandao); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 8417: (122-138): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (179-195): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 6328: (58-96): CHC: Assertion violation happens here.
-// Warning 6328: (115-153): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/range_check.sol b/test/libsolidity/smtCheckerTests/special/range_check.sol
deleted file mode 100644
index 8880a68a7a0f..000000000000
--- a/test/libsolidity/smtCheckerTests/special/range_check.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-contract C {
-	constructor() payable {
-		assert(tx.origin >= address(0));
-		assert(tx.origin <= address(2**160 - 1));
-		assert(tx.gasprice >= 0);
-		assert(tx.gasprice <= 2**256 - 1);
-		assert(msg.sender >= address(0));
-		assert(msg.sender <= address(2**160 - 1));
-		assert(msg.value >= 0);
-		assert(msg.value <= 2**256 - 1);
-
-		assert(block.coinbase >= address(0));
-		assert(block.coinbase <= address(2**160 - 1));
-		assert(block.timestamp >= 0);
-		assert(block.timestamp <= 2**256 - 1);
-		assert(block.chainid >= 0);
-		assert(block.chainid <= 2**256 - 1);
-		assert(block.difficulty >= 0);
-		assert(block.difficulty <= 2**256 - 1);
-		assert(block.prevrandao > 2**64);
-		assert(block.prevrandao <= 2**256 - 1);
-		assert(block.gaslimit >= 0);
-		assert(block.gaslimit <= 2**256 - 1);
-		assert(block.number >= 0);
-		assert(block.number <= 2**256 - 1);
-	}
-}
-
-contract D {
-	constructor() payable {
-		unchecked {
-			assert(tx.origin >= address(0));
-			assert(tx.origin <= address(2**160 - 1));
-			assert(tx.gasprice >= 0);
-			assert(tx.gasprice <= 2**256 - 1);
-			assert(msg.sender >= address(0));
-			assert(msg.sender <= address(2**160 - 1));
-			assert(msg.value >= 0);
-			assert(msg.value <= 2**256 - 1);
-
-			assert(block.coinbase >= address(0));
-			assert(block.coinbase <= address(2**160 - 1));
-			assert(block.timestamp >= 0);
-			assert(block.timestamp <= 2**256 - 1);
-			assert(block.chainid >= 0);
-			assert(block.chainid <= 2**256 - 1);
-			assert(block.difficulty >= 0);
-			assert(block.difficulty <= 2**256 - 1);
-			assert(block.prevrandao > 2**64);
-			assert(block.prevrandao <= 2**256 - 1);
-			assert(block.gaslimit >= 0);
-			assert(block.gaslimit <= 2**256 - 1);
-			assert(block.number >= 0);
-			assert(block.number <= 2**256 - 1);
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8417: (565-581): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (598-614): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (1447-1463): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (1481-1497): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Info 1391: CHC: 44 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/shadowing_1.sol b/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
deleted file mode 100644
index 27fb60bad355..000000000000
--- a/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	struct S {
-		uint value;
-		address origin;
-		uint number;
-	}
-	function f() public payable {
-		S memory msg = S(42, address(0), 666);
-		S memory tx = S(42, address(0), 666);
-		S memory block = S(42, address(0), 666);
-		assert(msg.value == 42); // should hold
-		assert(msg.value == 41); // should fail
-		assert(tx.origin == address(0)); // should hold
-		assert(block.number == 666); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2319: (108-120): This declaration shadows a builtin symbol.
-// Warning 2319: (149-160): This declaration shadows a builtin symbol.
-// Warning 2319: (189-203): This declaration shadows a builtin symbol.
-// Warning 6328: (274-297): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/this.sol b/test/libsolidity/smtCheckerTests/special/this.sol
deleted file mode 100644
index efd0f52c1af0..000000000000
--- a/test/libsolidity/smtCheckerTests/special/this.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f(address a) public view {
-		assert(a == address(this));
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (52-78): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/this_state.sol b/test/libsolidity/smtCheckerTests/special/this_state.sol
deleted file mode 100644
index 703488db7f40..000000000000
--- a/test/libsolidity/smtCheckerTests/special/this_state.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	address thisAddr;
-	function f(address a) public {
-		require(a == address(this));
-		thisAddr = a;
-		assert(thisAddr == address(this));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/time_units.sol b/test/libsolidity/smtCheckerTests/special/time_units.sol
deleted file mode 100644
index 922fb402078d..000000000000
--- a/test/libsolidity/smtCheckerTests/special/time_units.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract D {
-	function f() public pure {
-		assert(1 == 1 seconds);
-		assert(2 == 1 seconds);
-		assert(2 minutes == 120 seconds);
-		assert(3 minutes == 120 seconds);
-		assert(2 hours == 120 minutes);
-		assert(3 hours == 120 minutes);
-		assert(2 days == 48 hours);
-		assert(4 days == 48 hours);
-		assert(2 weeks == 14 days);
-		assert(25 weeks == 14 days);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (69-91): CHC: Assertion violation happens here.
-// Warning 6328: (131-163): CHC: Assertion violation happens here.
-// Warning 6328: (201-231): CHC: Assertion violation happens here.
-// Warning 6328: (265-291): CHC: Assertion violation happens here.
-// Warning 6328: (325-352): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/timestamp.sol b/test/libsolidity/smtCheckerTests/special/timestamp.sol
deleted file mode 100644
index 31bd09694c2b..000000000000
--- a/test/libsolidity/smtCheckerTests/special/timestamp.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        uint b = block.timestamp;
-        uint a = b + 0; // Overflow not possible!
-        return a;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/timestamp_2.sol b/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
deleted file mode 100644
index c9520840b8bd..000000000000
--- a/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	uint x;
-
-	constructor() {
-		x = block.timestamp + 0; // No overflow should be reported
-		x = block.timestamp + 1; // Overflow should be reported here
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (107-126): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol b/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
deleted file mode 100644
index a30f25b7f7b9..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	uint gleft;
-
-	function f() public payable {
-		gleft = gasleft();
-
-		fi();
-
-		assert(gleft == gasleft());
-		assert(gleft >= gasleft());
-	}
-
-	function fi() internal view {
-		assert(gleft == gasleft());
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (91-117): CHC: Assertion violation happens here.
-// Warning 6328: (186-212): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol b/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
deleted file mode 100644
index c66ce565393a..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
+++ /dev/null
@@ -1,70 +0,0 @@
-contract C {
-	bytes32 bhash;
-	address coin;
-	uint dif;
-	uint prevrandao;
-	uint glimit;
-	uint number;
-	uint tstamp;
-	bytes mdata;
-	address sender;
-	bytes4 sig;
-	uint value;
-	uint gprice;
-	address origin;
-
-	function f() public payable {
-		bhash = blockhash(12);
-		coin = block.coinbase;
-		dif = block.difficulty;
-		prevrandao = block.prevrandao;
-		glimit = block.gaslimit;
-		number = block.number;
-		tstamp = block.timestamp;
-		mdata = msg.data;
-		sender = msg.sender;
-		sig = msg.sig;
-		value = msg.value;
-		gprice = tx.gasprice;
-		origin = tx.origin;
-
-		fi();
-
-		assert(bhash == blockhash(12));
-		assert(coin == block.coinbase);
-		assert(dif == block.difficulty);
-		assert(prevrandao == block.prevrandao);
-		assert(glimit == block.gaslimit);
-		assert(number == block.number);
-		assert(tstamp == block.timestamp);
-		assert(mdata.length == msg.data.length);
-		assert(sender == msg.sender);
-		assert(sig == msg.sig);
-		assert(value == msg.value);
-		assert(gprice == tx.gasprice);
-		assert(origin == tx.origin);
-	}
-
-	function fi() internal view {
-		assert(bhash == blockhash(12));
-		assert(coin == block.coinbase);
-		assert(dif == block.difficulty);
-		assert(prevrandao == block.prevrandao);
-		assert(glimit == block.gaslimit);
-		assert(number == block.number);
-		assert(tstamp == block.timestamp);
-		assert(mdata.length == msg.data.length);
-		assert(sender == msg.sender);
-		assert(sig == msg.sig);
-		assert(value == msg.value);
-		assert(gprice == tx.gasprice);
-		assert(origin == tx.origin);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8417: (293-309): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (645-661): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (1127-1143): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Info 1391: CHC: 26 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol b/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
deleted file mode 100644
index 2b16f2d1aab7..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
+++ /dev/null
@@ -1,96 +0,0 @@
-contract C {
-	bytes32 bhash;
-	address coin;
-	uint dif;
-	uint prevrandao;
-	uint glimit;
-	uint number;
-	uint tstamp;
-	bytes mdata;
-	address sender;
-	bytes4 sig;
-	uint value;
-	uint gprice;
-	address origin;
-
-	function f() public payable {
-		bhash = blockhash(12);
-		coin = block.coinbase;
-		dif = block.difficulty;
-		prevrandao = block.prevrandao;
-		glimit = block.gaslimit;
-		number = block.number;
-		tstamp = block.timestamp;
-		mdata = msg.data;
-		sender = msg.sender;
-		sig = msg.sig;
-		value = msg.value;
-		gprice = tx.gasprice;
-		origin = tx.origin;
-
-		fi();
-
-		assert(bhash == blockhash(122));
-		assert(coin != block.coinbase);
-		assert(dif != block.difficulty);
-		assert(prevrandao != block.prevrandao);
-		assert(glimit != block.gaslimit);
-		assert(number != block.number);
-		assert(tstamp != block.timestamp);
-		assert(mdata.length != msg.data.length);
-		assert(sender != msg.sender);
-		assert(sig != msg.sig);
-		assert(value != msg.value);
-		assert(gprice != tx.gasprice);
-		assert(origin != tx.origin);
-	}
-
-	function fi() internal view {
-		assert(bhash == blockhash(122));
-		assert(coin != block.coinbase);
-		assert(dif != block.difficulty);
-		assert(prevrandao != block.prevrandao);
-		assert(glimit != block.gaslimit);
-		assert(number != block.number);
-		assert(tstamp != block.timestamp);
-		assert(mdata.length != msg.data.length);
-		assert(sender != msg.sender);
-		assert(sig != msg.sig);
-		assert(value != msg.value);
-		assert(gprice != tx.gasprice);
-		assert(origin != tx.origin);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 8417: (293-309): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (646-662): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 8417: (1129-1145): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
-// Warning 6328: (563-594): CHC: Assertion violation happens here.
-// Warning 6328: (598-628): CHC: Assertion violation happens here.
-// Warning 6328: (632-663): CHC: Assertion violation happens here.
-// Warning 6328: (667-705): CHC: Assertion violation happens here.
-// Warning 6328: (709-741): CHC: Assertion violation happens here.
-// Warning 6328: (745-775): CHC: Assertion violation happens here.
-// Warning 6328: (779-812): CHC: Assertion violation happens here.
-// Warning 6328: (816-855): CHC: Assertion violation happens here.
-// Warning 6328: (859-887): CHC: Assertion violation happens here.
-// Warning 6328: (891-913): CHC: Assertion violation happens here.
-// Warning 6328: (917-943): CHC: Assertion violation happens here.
-// Warning 6328: (947-976): CHC: Assertion violation happens here.
-// Warning 6328: (980-1007): CHC: Assertion violation happens here.
-// Warning 6328: (1046-1077): CHC: Assertion violation happens here.
-// Warning 6328: (1081-1111): CHC: Assertion violation happens here.
-// Warning 6328: (1115-1146): CHC: Assertion violation happens here.
-// Warning 6328: (1150-1188): CHC: Assertion violation happens here.
-// Warning 6328: (1192-1224): CHC: Assertion violation happens here.
-// Warning 6328: (1228-1258): CHC: Assertion violation happens here.
-// Warning 6328: (1262-1295): CHC: Assertion violation happens here.
-// Warning 6328: (1299-1338): CHC: Assertion violation happens here.
-// Warning 6328: (1342-1370): CHC: Assertion violation happens here.
-// Warning 6328: (1374-1396): CHC: Assertion violation happens here.
-// Warning 6328: (1400-1426): CHC: Assertion violation happens here.
-// Warning 6328: (1430-1459): CHC: Assertion violation happens here.
-// Warning 6328: (1463-1490): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
deleted file mode 100644
index 03db677c0826..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-	uint gas;
-	address origin;
-	function f() public {
-		gas = tx.gasprice;
-		origin = tx.origin;
-
-		g();
-	}
-	function g() internal view {
-		assert(gas >= 0); // should hold
-		assert(uint160(origin) >= 0); // should hold
-
-		assert(gas == tx.gasprice); // should fail with BMC
-		assert(origin == tx.origin); // should fail with BMC
-	}
-}
-// ====
-// SMTEngine: bmc
-// ----
-// Warning 4661: (233-259): BMC: Assertion violation happens here.
-// Warning 4661: (287-314): BMC: Assertion violation happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
deleted file mode 100644
index 6aa6640305a6..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	uint gas;
-	address origin;
-	function f() public {
-		gas = tx.gasprice;
-		origin = tx.origin;
-
-		g();
-	}
-	function g() internal view {
-		assert(gas >= 0); // should hold
-		assert(uint160(origin) >= 0); // should hold
-
-		assert(gas == tx.gasprice); // should hold with CHC
-		assert(origin == tx.origin); // should hold with CHC
-
-		assert(tx.origin == address(this)); // should fail
-	}
-}
-// ====
-// SMTEngine: chc
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (343-377): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
deleted file mode 100644
index 7af8c96c894d..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-interface I {
-	function f() external;
-}
-
-contract C {
-	function g(I _i) public payable {
-		uint x = address(this).balance;
-		_i.f();
-		assert(x == address(this).balance); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 5892\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 11 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 32278 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
deleted file mode 100644
index 81de958b3402..000000000000
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-interface I {
-	function f() external payable;
-}
-
-contract C {
-	function g(I _i) public payable {
-		uint x = address(this).balance;
-		_i.f{ value: 100 }();
-		assert(x == address(this).balance); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 101\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 83 }\n    _i.f{ value: 100 }() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
deleted file mode 100644
index b1500256c4a0..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	int x;
-
-	function g() public  {
-		x = 42;
-	}
-
-	function f() public {
-		x = 0;
-		bool success = false;
-		try this.g() {
-			success = true;
-		} catch (bytes memory s) {
-			assert(x == 0); // should hold
-		}
-		assert(success); // fails for now, since external call is over-approximated (both success and fail are considered possible) for now even for known code
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (163-177): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (221-236): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
deleted file mode 100644
index 724d7b74ec30..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	int x;
-
-	function g() public  {
-		x = 42;
-	}
-
-	function f() public {
-		x = 0;
-		try this.g() {
-			assert(x == 42); // should hold
-		} catch (bytes memory s) {
-			assert(x == 0); // should hold
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (155-169): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
deleted file mode 100644
index 7698eed0f006..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-	int x;
-
-	function g(int y) public pure returns (int) {
-		return y;
-	}
-
-	function postinc() internal returns (int) {
-		x += 1;
-		return x;
-	}
-
-	function f() public {
-		x = 0;
-		try this.g(postinc()) {
-			assert(x == 1); // should hold
-		} catch (bytes memory s) {
-			assert(x == 0); // should fail - state is reverted to the state after postinc(), but before the call to this.g()
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 5667: (259-273): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (280-294): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\ns = []\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.postinc() -- internal call
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
deleted file mode 100644
index 9090e71f2c8d..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-
-	int x;
-	D d;
-
-	function set(int n) public {
-		x = n;
-	}
-
-	function f() public {
-		x = 0;
-		try d.d() {
-			//assert(x == 0); // should fail, x can be anything here
-		} catch {
-			assert(x == 0); // should hold, all changes to x has been reverted
-			assert(x == 1); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (320-334): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
deleted file mode 100644
index 163a879d881d..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-abstract contract D {
-	function d() external virtual;
-}
-
-contract C {
-
-	int x;
-	D d;
-
-	function set(int n) public {
-		require(n < 100);
-		x = n;
-	}
-
-	function f() public {
-		x = 0;
-		try d.d() {
-			assert(x < 100); // should hold
-		} catch {
-			assert(x == 0); // should hold, all changes to x has been reverted
-			assert(x == 1); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (315-329): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol
deleted file mode 100644
index b90a9fca9a48..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        try this.f() {
-        } catch Error(string memory) {
-			g();
-		}
-	}
-	function g() public pure returns (address) {
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol
deleted file mode 100644
index 0c438943bd51..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-        } catch Error(string memory) {
-			g();
-		}
-	}
-	function g() public pure {
-		int test = 1;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (167-175): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol b/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
deleted file mode 100644
index 4a65bd9a3003..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-  function g(bool b) public {}
-  function f(bool b) public returns (bytes memory txt) {
-    if (0==1)
-      try this.g(b) {}
-      catch (bytes memory s) {
-        txt = s;
-      }
-  }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (109-113): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol b/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
deleted file mode 100644
index 63976d59f9cc..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public returns (uint) {
-		while(1==1)
-			try this.f() returns (uint b) {
-				b = 2;
-			} catch {
-			}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (43-47): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
deleted file mode 100644
index 4605aee86310..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	int x;
-
-	function g() public  {
-		x = 42;
-	}
-
-	function f() public {
-		x = 1;
-		bool success = false;
-		try this.g() {
-			success = true;
-			assert(x == 42); // should hold
-		} catch Error (string memory /*reason*/) {
-			assert(x == 1); // should hold
-		} catch (bytes memory /*reason*/) {
-			assert(x == 1); // should hold
-		}
-		assert((success && x == 42) || (!success && x == 1)); // should hold
-		assert(success); // can fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (415-430): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
deleted file mode 100644
index b7b5de6417f6..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-
-	function g() public pure {}
-
-	function f() public view {
-		uint x = 0;
-		bool success = false;
-		try this.g() {
-			success = true;
-			x = 1;
-		} catch Error (string memory /*reason*/) {
-			x = 2;
-		} catch (bytes memory /*reason*/) {
-			x = 3;
-		}
-		assert(x > 0 && x < 4); // should hold
-		assert(x == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (306-320): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
deleted file mode 100644
index a53f0c13fe84..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract contract D {
-	function d() external virtual returns (uint x, bool b);
-}
-
-contract C {
-
-	int x;
-	D d;
-
-	function f() public {
-		x = 0;
-		try d.d() returns (uint x, bool c) {
-			assert(x == 0); // should fail, x is the local variable shadowing the state variable
-			assert(!c); // should fail, c can be anything
-		} catch {
-			assert(x == 0); // should hold, x is the state variable
-			assert(x == 1); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2519: (164-170): This declaration shadows an existing declaration.
-// Warning 6328: (185-199): CHC: Assertion violation happens here.
-// Warning 6328: (273-283): CHC: Assertion violation happens here.
-// Warning 6328: (393-407): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
deleted file mode 100644
index ccbd444232ce..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-		int y;
-	}
-
-	function g() public pure returns (bool b, S memory s) {
-		b = true;
-		s.x = 42;
-		s.y = -1;
-	}
-
-	function f() public view {
-		bool success = false;
-		try this.g() returns (bool b, S memory s) {
-			success = true;
-			assert(b && s.x == 42 && s.y == -1);
-		} catch {
-		}
-		assert(success); // fails, not guaranteed that there will be no error
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (321-336): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
deleted file mode 100644
index 2407d893fbfe..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	int public x;
-
-	function f() public view {
-		int y = 42;
-		bool success = false;
-		try this.x() returns (int v) {
-			y = v;
-			try this.x() returns (int w) {
-				success = true;
-				y = w;
-			}
-			catch {}
-		} catch {}
-		assert(!success || y == x); // should hold
-		assert(y == 42); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (280-295): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
deleted file mode 100644
index e1935cf97e30..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	function g() public pure returns (uint, uint) {
-	}
-	function f() public view {
-		uint choice = 42;
-		try this.g() returns (uint, uint) {
-			choice = 10;
-			try this.g() returns (uint, uint) {
-				choice = 1;
-			} catch {
-				choice = 2;
-			}
-		} catch {
-			choice = 3;
-		}
-		assert(choice >= 1 && choice <= 3); // should hold
-		assert(choice == 42); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (342-362): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
deleted file mode 100644
index 7ce761a80219..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	function g() public pure returns (uint) {
-	}
-	function f() public view {
-		uint choice = 42;
-		try this.g() returns (uint) {
-			choice = 1;
-		} catch{
-			choice = 10;
-			try this.g() returns (uint) {
-				choice = 2;
-			} catch {
-				choice = 3;
-			}
-		}
-		assert(choice >= 1 && choice <= 3); // should hold
-		assert(choice == 42); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (323-343): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_new.sol b/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
deleted file mode 100644
index 5c98c279d2a0..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract Reverts {
-    constructor(uint) { revert("test message."); }
-}
-contract Succeeds {
-    constructor(uint) { }
-}
-
-contract C {
-    function f() public returns (Reverts x, string memory txt) {
-        uint i = 3;
-        try new Reverts(i) returns (Reverts r) {
-            x = r;
-            txt = "success";
-        } catch Error(string memory s) {
-            txt = s;
-        }
-    }
-    function g() public returns (Succeeds x, string memory txt) {
-        uint i = 8;
-        try new Succeeds(i) returns (Succeeds r) {
-            x = r;
-            txt = "success";
-        } catch Error(string memory s) {
-            txt = s;
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8729: (231-245): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
-// Warning 8729: (492-507): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
deleted file mode 100644
index 23c2a7b6c27a..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	int public x;
-
-	function f() public view {
-		try this.x() returns (int v) {
-			assert(x == v); // should hold
-		} catch {
-			assert(false); // this fails, because we over-approximate every external call in the way that it can both succeed and fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (139-152): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
deleted file mode 100644
index ae38765c4c48..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	mapping (uint => uint[]) public m;
-
-	constructor() {
-		m[0].push();
-		m[0].push();
-		m[0][1] = 42;
-	}
-
-	function f() public view {
-		try this.m(0,1) returns (uint y) {
-			assert(y == m[0][1]); // should hold
-		}
-		catch {
-			assert(m[0][1] == 42); // should hold
-			assert(m[0][1] == 1); // should fail
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (280-300): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol b/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol
deleted file mode 100644
index 93f1a347ddb4..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-
-	function g() public pure returns (bytes memory) {
-		return hex"ffff";
-	}
-
-	function f() public view {
-		try this.g() returns (bytes memory b) {
-			assert(b[0] == bytes1(uint8(255)) && b[1] == bytes1(uint8(255))); // should hold
-			// Disabled because of Spacer seg fault
-			//assert(b[0] == bytes1(uint8(0)) || b[1] == bytes1(uint8(0))); // should fail
-		} catch {
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol
deleted file mode 100644
index e84b0f6a4368..000000000000
--- a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-
-	function g() public pure returns (bytes2) {
-		return hex"ffff";
-	}
-
-	function f() public view {
-		try this.g() returns (bytes2 b) {
-			assert(uint8(b[0]) == 255 && uint8(b[1]) == 255); // should hold
-			assert(uint8(b[0]) == 0 || uint8(b[1]) == 0); // should fail
-		} catch {
-		}
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (218-262): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
deleted file mode 100644
index 5189b45e9f42..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-  address x; // We know that this is "zero initialised".
-  function f() public view {
-    address a = address(0);
-    assert(x == address(0));
-    assert(x == a);
-  }
-
-  function g() public pure {
-    address a = address(0);
-    address b = address(1);
-    address c = address(0);
-    address d = a;
-    address e = address(0x12345678);
-    assert(c == d);
-    assert(a == c);
-    assert(e == address(305419896));
-    // This is untrue.
-    assert(a == b);
-  }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (454-468): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
deleted file mode 100644
index bc3d92b418be..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function f() external pure {
-		bytes memory b = hex"00010203040506070809000102030405060708090001020304050607080900010203040506070809";
-		bytes8 c = bytes8(b);
-		assert(c == 0x0001020304050607); // should hold
-		bytes16 d = bytes16(b);
-		assert(d == 0x00010203040506070809000102030405);
-		bytes24 e = bytes24(b);
-		assert(e == 0x000102030405060708090001020304050607080900010203); // should hold
-		bytes32 g = bytes32(b);
-		assert(g == 0x0001020304050607080900010203040506070809000102030405060708090001); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol
deleted file mode 100644
index 40cd27776ea9..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	function f() external pure {
-		bytes memory b = hex"00010203040506070809000102030405060708090001020304050607080900010203040506070809";
-		bytes8 c = bytes8(b);
-		//assert(c == 0x0001020304050607); // should hold
-		assert(c == 0x0001020304050608); // should fail
-		bytes16 d = bytes16(b);
-		//assert(d == 0x00010203040506070809000102030405);
-		assert(d == 0x00010203040506070809000102030406); // should fail
-		bytes24 e = bytes24(b);
-		//assert(e == 0x000102030405060708090001020304050607080900010203); // should hold
-		assert(e == 0x000102030405060708090001020304050607080900010204); // should fail
-		bytes32 g = bytes32(b);
-		//assert(g == 0x0001020304050607080900010203040506070809000102030405060708090001); // should hold
-		assert(g == 0x0001020304050607080900010203040506070809000102030405060708090002); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (227-258): CHC: Assertion violation happens here.
-// Warning 6328: (356-403): CHC: Assertion violation happens here.
-// Warning 6328: (532-595): CHC: Assertion violation happens here.
-// Warning 6328: (740-819): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol
deleted file mode 100644
index c106dfc1f2d5..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f(address a) public pure {
-		require(a != address(0));
-		assert(a != address(0));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol
deleted file mode 100644
index 2e0d63326463..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f() public pure {
-		bytes2 a = 0x1234;
-		uint32 b = uint16(a); // b will be 0x00001234
-		assert(b == 0x1234);
-		uint32 c = uint32(bytes4(a)); // c will be 0x12340000
-		assert(c == 0x12340000);
-		uint8 d = uint8(uint16(a)); // d will be 0x34
-		assert(d == 0x34);
-		uint8 e = uint8(bytes1(a)); // e will be 0x12
-		assert(e == 0x12);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol
deleted file mode 100644
index 05383eb3c178..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f(uint8 x) public pure {
-		uint16 y = uint16(x);
-		// True because of x's type
-		assert(y < 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol
deleted file mode 100644
index a608372d279f..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint16 a = 0x1234;
-		uint32 b = uint32(a); // b will be 0x00001234 now
-		// This is correct (left padding).
-		assert(a == b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol
deleted file mode 100644
index 15b4257d543a..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint16 a = 0x1234;
-		uint32 b = uint32(a); // b will be 0x00001234 now
-		assert(a != b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (116-130): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4660\nb = 4660\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
deleted file mode 100644
index fca18d824a44..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f() public pure {
-		bytes2 a = 0x1234;
-		bytes4 b = bytes4(a); // b will be 0x12340000
-		// False positive since right padding is not supported yet.
-		assert(b == 0x12340000);
-		// This should fail (right padding).
-		assert(a == b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (240-254): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol
deleted file mode 100644
index 05c8756d4829..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f(uint16 x) public pure {
-		uint8 y = uint8(x);
-		// True because of y's type
-		assert(y < 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol
deleted file mode 100644
index 66782a49da89..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint32 a = 0x12345678;
-		uint16 b = uint16(a); // b will be 0x5678 now
-		assert(b == 0x5678);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol
deleted file mode 100644
index c524f21bfcd3..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f() public pure {
-		bytes2 a = 0x1234;
-		bytes1 b = bytes1(a); // b will be 0x12
-		assert(b == 0x12);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/downcast.sol b/test/libsolidity/smtCheckerTests/typecast/downcast.sol
deleted file mode 100644
index bba3585f26cf..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/downcast.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-contract C {
-	function f1() public pure {
-		// signed <- signed
-		int8 z = int8(-1);
-		assert(z == -1);
-		z = int8(int(0) - 1);
-		assert(z == -1);
-		z = int8(int(0) - 1);
-		assert(z == -1);
-		z = int8(int(0) - 2);
-		assert(z == -2);
-		z = int8(int(0) - 1);
-		assert(z == -1);
-
-		// unsigned <= unsigned
-		uint8 x = uint8(type(uint256).max);
-		assert(x == 255);
-		x = uint8(type(uint256).max);
-		assert(x == 255);
-
-		// signed <- unsigned
-		int8 y = int8(uint8(type(uint16).max));
-		assert(y == -1);
-		y = int8(uint8(uint16(100)));
-		assert(y == 100);
-		y = int8(uint8(uint16(200)));
-		assert(y == -56);
-
-		// unsigned <- signed
-		uint8 v = uint8(type(uint16).max);
-		assert(v == 255);
-		v = uint8(int8(int16(300)));
-		assert(v == 44);
-		v = uint8(int8(int16(200)));
-		assert(v == 200);
-
-		// fixed bytes
-		bytes2 b = bytes2(bytes4(0xcafeffff));
-		assert(b == 0xcafe);
-		b = bytes2(bytes4(bytes8(0xaaaabbbbccccdddd)));
-		assert(b == 0xaaaa);
-		b = bytes2(bytes8(0xaaaabbbbccccdddd));
-		assert(b == 0xaaaa);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 20 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol b/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol
deleted file mode 100644
index c051db017618..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	function f(uint x) public pure {
-		require(x == 0);
-		D _a = D(x);
-		assert(_a == D.Left);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol b/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol
deleted file mode 100644
index e65cf683ff39..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	function f(D _a) public pure {
-		uint x = uint(_a);
-		assert(x < 10);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol
deleted file mode 100644
index 1a70c078340c..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(function(uint) external returns (uint) g, function(uint) external returns (uint) h) public {
-		assert(g(2) == h(2));
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (123-143): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\nh = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)\n    g(2) -- untrusted external call\n    h(2) -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
deleted file mode 100644
index 2d3448ee7b0d..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	function(uint) returns (uint) a;
-	function(uint) returns (uint) b;
-    function f(function(uint) returns (uint) g, function(uint) returns (uint) h) internal {
-		assert(g(2) == h(2));
-		assert(g == h);
-    }
-	function g() public {
-		f(a, b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2519: (96-127): This declaration shadows an existing declaration.
-// Warning 6031: (182-186): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (190-194): Internal error: Expression undefined for SMT solver.
-// Warning 7229: (206-212): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
-// Warning 5729: (182-186): BMC does not yet implement this type of function call.
-// Warning 5729: (190-194): BMC does not yet implement this type of function call.
-// Warning 6328: (175-195): CHC: Assertion violation happens here.
-// Warning 6328: (199-213): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol b/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
deleted file mode 100644
index b98c518a6427..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	mapping (bytes1 => uint) map;
-	function f() public {
-		map[""] = 2;
-		uint x = map[""];
-		g("");
-		bytes1 b = "";
-		assert(x == map[b]);
-		assert(x == map["x"]);
-	}
-	function g(bytes1 b) internal pure {}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (153-174): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/number_literal.sol b/test/libsolidity/smtCheckerTests/typecast/number_literal.sol
deleted file mode 100644
index af7da87d2c8b..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/number_literal.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-  function f() public pure {
-    uint x = 1234;
-    uint y = 0;
-    assert(x != y);
-    assert(x == uint(1234));
-    assert(y == uint(0));
-  }
-  function g() public pure {
-    uint a = uint(0);
-    uint b = type(uint256).max;
-    uint c = 115792089237316195423570985008687907853269984665640564039457584007913129639935;
-    int d = -1;
-    uint e = uint(d);
-    assert(a != b);
-    assert(b == c);
-    assert(b == e);
-  }
-  function h() public pure {
-    uint32 a = uint32(0);
-    uint32 b = type(uint32).max;
-    uint32 c = 4294967295;
-    int32 d = -1;
-    uint32 e = uint32(d);
-    assert(a != b);
-    assert(b == c);
-    assert(b == e);
-  }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/same_size.sol b/test/libsolidity/smtCheckerTests/typecast/same_size.sol
deleted file mode 100644
index b55e26064af5..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/same_size.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-abstract contract D {}
-
-enum E {A, B}
-
-contract C {
-	function f1() public pure {
-		// signed <- unsigned
-		int8 x = int8(uint8(200));
-		assert(x == -56);
-		int256 y = int256(uint256(2**255 + 10));
-		assert(y == -(2**255) + 10);
-		int256 z = int256(uint(2**255 + 10));
-		assert(z == -(2**255) + 10);
-		int256 t = int256(uint256(bytes32(uint256(200))));
-		assert(t == 200);
-		int256 v = int256(uint256(bytes32(uint256(2**255 + 10))));
-		assert(v == -(2**255) + 10);
-		int160 a = int160(uint160(address(type(uint160).max)));
-		assert(a == -1);
-		int160 b = int160(uint160(address(uint160(uint(2**159 + 10)))));
-		assert(b == -(2**159) + 10);
-		D d;
-		int160 e = int160(uint160(address(d)));
-		assert(e == 0);
-	}
-
-	function f2() public pure {
-		// unsigned <- signed
-		uint8 x = uint8(int8(100));
-		assert(x == 100);
-		uint16 y = uint16(int16(200));
-		assert(y == 200);
-		uint8 z = uint8(int8(-100));
-		assert(z == 156);
-		uint16 t = uint16(int16(-200));
-		assert(t == type(uint16).max - 200 + 1);
-		uint256 v = uint256(int256(-200));
-		assert(v == 2**256 - 200);
-		uint256 w = uint256(type(uint256).max - 1);
-		assert(w == 2**256 - 2);
-		bytes4 b = bytes4(uint32(type(uint256).max - 1));
-		assert(uint32(b) == uint32(2**32 - 2));
-		address a = address(type(uint160).max);
-		assert(uint160(a) == uint160(2**160 - 1));
-		address c = address(0);
-		assert(uint160(c) == 0);
-		D d;
-		address e = address(d);
-		assert(uint160(e) == 0);
-		E f = E(1);
-		assert(uint(f) == 1);
-	}
-
-	function f3() public pure {
-		// unsigned <- unsigned
-		uint8 x = uint8(bytes1(uint8(100)));
-		assert(x == 100);
-		address a = address(0);
-		assert(a == address(uint160(0)));
-		D d;
-		assert(a == address(d));
-	}
-
-	function f4() public pure {
-		// signed <- signed
-		int8 x = -10;
-		int8 y = int8(x);
-		assert(y == -10);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 27 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/slice_to_bytes.sol b/test/libsolidity/smtCheckerTests/typecast/slice_to_bytes.sol
deleted file mode 100644
index 0c31e37662e8..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/slice_to_bytes.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(bytes calldata x) external pure {
-		bytes(x[:18726387213]);
-		bytes(x[18726387213:]);
-		bytes(x[18726387213:111111111111111111]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/typecast/slice_to_fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/typecast/slice_to_fixed_bytes_1.sol
deleted file mode 100644
index e1e7ef69221a..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/slice_to_fixed_bytes_1.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-	function fromSlice(bytes calldata c) external pure returns (bytes32) {
-		return bytes32(c[0:33]);
-	}
-}
-// ----
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol
deleted file mode 100644
index d4e7615ee9e6..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes memory b = bytes(hex"ffff");
-		assert(b.length == 2); // should hold
-		assert(b[0] == bytes1(uint8(255))); // should hold
-		assert(b[1] == bytes1(uint8(100))); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (173-207): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_1.sol
deleted file mode 100644
index a467f8cb84e3..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract MockContract {
-	bytes4 public constant SENTINEL_ANY_MOCKS = hex"01";
-	mapping(bytes4 => bytes4) methodIdMocks;
-
-	constructor() {
-		methodIdMocks[SENTINEL_ANY_MOCKS] = 0;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol
deleted file mode 100644
index 013f81554228..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract MockContract {
-	bytes4 public constant SENTINEL_ANY_MOCKS = hex"01";
-
-	constructor() {
-		assert(SENTINEL_ANY_MOCKS >= 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_explicit.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_explicit.sol
deleted file mode 100644
index d306dd149ea9..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_explicit.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract SMT {
-	bytes32 constant internal NULL_BYTES32 = bytes32('');
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol
deleted file mode 100644
index 7ce44435708d..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract B {
-    function f() pure public {
-		g("0123456");
-	}
-    function g(bytes7 a) pure public {
-		assert(a == "0123456");
-		assert(a == "1234567");
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (104-126): CHC: Assertion violation happens here.
-// Warning 6328: (130-152): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
deleted file mode 100644
index fb98c5061fc9..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract B {
-    function f() mod2("0123456") pure public { }
-    modifier mod2(bytes7 a) {
-		assert(a == "0123456");
-		assert(a == "1234567");
-		_;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (120-142): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
deleted file mode 100644
index ecdc253e33b2..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function g() public pure returns (bytes32 val) { return "abc"; }
-    function f1() public pure returns (bytes32 val) { return g(); }
-
-	function a() public pure {
-		assert(f1() == "abc");
-		assert(f1() == "cde");
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (206-227): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
deleted file mode 100644
index 4ba6ba2ed5de..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function h() public pure returns (bytes32 val, bytes3 val2) { return ("abc", "def"); }
-    function g() public pure returns (bytes32 val) { return "abc"; }
-    function f1() public pure returns (bytes32 val) { return g(); }
-    function f2() public pure returns (bytes32 val, bytes3 val2) { return h(); }
-
-	function a() public pure {
-		(bytes32 v1, bytes3 v2) = f2();
-		assert(v1 == "abc");
-		assert(v2 == "cde");
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (410-429): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol
deleted file mode 100644
index be1af11c9bff..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure {
-		assert(bytes4(hex"0000ffff") == bytes4(hex"ffff")); // should fail
-		assert(bytes4(hex"ffff0000") == bytes4(hex"ffff")); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (43-93): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
deleted file mode 100644
index 01027e2b8db4..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	string x;
-
-	function s() public {
-		x = "abc";
-		bytes(x).push("a");
-		assert(bytes(x).length == 4); // should hold
-		assert(bytes(x).length == 3); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (132-160): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
deleted file mode 100644
index 827c6e11a606..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	string x;
-
-	function s() public {
-		x = "abc";
-		((bytes(((x))))).push("a");
-		assert(bytes(x).length == 4); // should hold
-		assert(bytes(x).length == 3); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (140-168): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/upcast.sol b/test/libsolidity/smtCheckerTests/typecast/upcast.sol
deleted file mode 100644
index db9e90dfd7c6..000000000000
--- a/test/libsolidity/smtCheckerTests/typecast/upcast.sol
+++ /dev/null
@@ -1,70 +0,0 @@
-abstract contract D {}
-
-contract C {
-	function f1() public pure {
-		// unsigned <- signed
-		uint16 x = type(uint16).max;
-		assert(x == 65535);
-		int8 i = int8(-1);
-		assert(i == -1);
-		x = uint16(uint8(int8(-1)));
-		assert(x == 255);
-		x = uint16(int16(i));
-		assert(x == 65535);
-		uint z = uint(uint8(i));
-		assert(z == 255);
-	}
-
-	function f2() public pure {
-		// signed <- unsigned
-		int16 y = int16(uint16(uint8(uint(65535))));
-		assert(y == 255);
-		int z = int(uint(uint8(type(uint).max)));
-		assert(z == 255);
-		z = int(uint(uint8(255)));
-		assert(z == 255);
-	}
-
-	function f3() public pure {
-		// signed <- signed
-		int16 y = int16(uint16(uint8(int8(int(uint(65535))))));
-		assert(y == 255);
-		int z = int(int8(-1));
-		assert(z == -1);
-		z = int(int8(int(255)));
-		assert(z == -1);
-		z = int(int16(5000));
-		assert(z == 5000);
-	}
-
-	function f4() public pure {
-		// unsigned <- unsigned
-		uint x = uint(uint8(type(uint).max));
-		assert(x == 255);
-		x = uint(uint16(type(uint).max));
-		assert(x == 65535);
-		x = uint(uint16(5000));
-		assert(x == 5000);
-		uint16 y = uint16(type(uint).max);
-		assert(y == 65535);
-		y = uint16(uint8(type(uint16).max));
-		assert(y == 255);
-		address a = address(uint160(uint8(0)));
-		assert(a == address(0));
-		D d = D(address(uint160(uint8(0))));
-		assert(a == address(d));
-		bytes2 b1 = 0xcafe;
-		bytes4 b2 = bytes4(b1);
-		assert(b2 == 0xcafe0000);
-		bytes16 b3 = bytes16(b1);
-		assert(b3 == 0xcafe0000000000000000000000000000);
-		bytes4 b4 = bytes4(uint32(0xcafe));
-		assert(b4 == 0x0000cafe);
-		bytes4 b5 = bytes4(uint32(0xcafe0000));
-		assert(b5 == 0xcafe0000);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
deleted file mode 100644
index 2341b7c85be2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(bytes memory d) public pure {
-		(bool a, uint x) = abi.decode(d, (bool, uint));
-		assert(a == (x == 2)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (107-128): CHC: Assertion violation happens here.\nCounterexample:\n\na = false\nx = 2\n\nTransaction trace:\nC.constructor()\nC.f(d)
diff --git a/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol b/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol
deleted file mode 100644
index e1730feddec6..000000000000
--- a/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f(bytes memory d) public pure {
-		assert(abi.decode(d, (bool))); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (57-86): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(d)
diff --git a/test/libsolidity/smtCheckerTests/types/address_balance.sol b/test/libsolidity/smtCheckerTests/types/address_balance.sol
deleted file mode 100644
index a24fa32b18d2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_balance.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function f(address a, address b) public view {
-		uint x = b.balance + 1000 ether;
-		assert(a.balance > b.balance);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (63-69): Unused local variable.
-// Warning 4984: (72-94): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (98-127): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_call.sol b/test/libsolidity/smtCheckerTests/types/address_call.sol
deleted file mode 100644
index 063909f873f0..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_call.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C
-{
-	uint x;
-	mapping (uint => uint) map;
-	function f(address a, bytes memory data) public {
-		x = 0;
-		map[0] = 0;
-		mapping (uint => uint) storage localMap = map;
-		(bool success, bytes memory ret) = a.call(data);
-		assert(success);
-		assert(x == 0);
-		// Disabled because of Spacer nondeterminism.
-		//assert(map[0] == 0);
-		// Disabled because of Spacer nondeterminism.
-		//assert(localMap[0] == 0);
-	}
-}
-// ====
-// EVMVersion: >spuriousDragon
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreInv: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 2072: (127-166): Unused local variable.
-// Warning 2072: (191-207): Unused local variable.
-// Warning 6328: (227-242): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol b/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol
deleted file mode 100644
index b4d707cf343a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint x;
-	mapping (uint => uint) map;
-	function f(address a, bytes memory data) public {
-		x = 0;
-		map[0] = 0;
-		mapping (uint => uint) storage localMap = map;
-		(bool success, bytes memory ret) = a.delegatecall(data);
-		assert(success);
-		assert(x == 0);
-		assert(map[0] == 0);
-		assert(localMap[0] == 0);
-	}
-}
-// ====
-// EVMVersion: >spuriousDragon
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (191-207): Unused local variable.
-// Warning 4588: (211-231): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (235-250): CHC: Assertion violation happens here.
-// Warning 6328: (254-268): CHC: Assertion violation happens here.
-// Warning 6328: (272-291): CHC: Assertion violation happens here.
-// Warning 6328: (295-319): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
deleted file mode 100644
index 3479a38bb380..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C
-{
-	uint x;
-	mapping (uint => uint) map;
-	function f(address a, bytes memory data) public {
-		x = 0;
-		map[0] = 0;
-		mapping (uint => uint) storage localMap = map;
-		(bool success, bytes memory ret) = a.staticcall(data);
-		assert(success);
-		assert(x == 0);
-		assert(map[0] == 0);
-		// Disabled because of Spacer's seg fault
-		//assert(localMap[0] == 0);
-	}
-}
-// ====
-// EVMVersion: >spuriousDragon
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (127-166): Unused local variable.
-// Warning 2072: (191-207): Unused local variable.
-// Warning 6328: (233-248): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer.sol b/test/libsolidity/smtCheckerTests/types/address_transfer.sol
deleted file mode 100644
index 89e8ae10274e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_transfer.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(address payable a) public {
-		uint x = 100;
-		require(x == a.balance);
-		a.transfer(600);
-		// This fails since a == this is possible.
-		assert(a.balance == 700);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (162-186): CHC: Assertion violation happens here.
-// Warning 1236: (98-113): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
deleted file mode 100644
index 0a2c08d0caab..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(uint x, address payable a, address payable b) public {
-		require(a != b);
-		require(x == 100);
-		require(x == a.balance);
-		require(a.balance == b.balance);
-		a.transfer(600);
-		b.transfer(100);
-		// Fails since a == this is possible.
-		assert(a.balance > b.balance);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (262-291): CHC: Assertion violation happens here.
-// Warning 1236: (184-199): BMC: Insufficient funds happens here.
-// Warning 1236: (203-218): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
deleted file mode 100644
index 02d20c4f5bc4..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(address payable a) public {
-		require(1000 == address(this).balance);
-		require(100 == a.balance);
-		a.transfer(600);
-		// a == this is not possible because address(this).balance == 1000
-		// and a.balance == 100,
-		// so this should hold in CHC, ignoring the transfer revert.
-		assert(a.balance == 700);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
deleted file mode 100644
index 59568cb5be91..000000000000
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f(address payable a, address payable b) public {
-		require(a.balance == 0);
-		a.transfer(600);
-		b.transfer(1000);
-		// Fails since a == this is possible.
-		assert(a.balance == 600);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (180-204): CHC: Assertion violation happens here.
-// Warning 1236: (101-116): BMC: Insufficient funds happens here.
-// Warning 1236: (120-136): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
deleted file mode 100644
index 07f0c9c1f5b3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-pragma abicoder               v2;
-
-contract C
-{
-	function f(
-		uint[] memory a,
-		uint[] memory b,
-		uint[][] memory cc,
-		uint8[][] memory dd,
-		uint[][][] memory eee
-	) public pure {
-		require(a.length > 0);
-		require(b.length > 0);
-		require(cc.length > 0);
-		require(cc[0].length > 0);
-		require(dd.length > 0);
-		require(dd[0].length > 0);
-		require(eee.length > 0);
-		require(eee[0].length > 0);
-		require(eee[0][0].length > 0);
-		a[0] = 2;
-		// The accesses below are safe but oob is reported because of aliasing.
-		cc[0][0] = 50;
-		dd[0][0] = 10;
-		eee[0][0][0] = 50;
-		b[0] = 1;
-		// Fails because
-		// b == a is possible
-		// b == cc[0] is possible
-		// b == ee[0][0] is possible
-		assert(a[0] == 2 || cc[0][0] == 50 || eee[0][0][0] == 50);
-		// Should not fail since knowledge is erased only for uint[].
-		assert(dd[0][0] == 10);
-		assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (523-528): CHC: Out of bounds access happens here.
-// Warning 6368: (523-531): CHC: Out of bounds access happens here.
-// Warning 6368: (557-563): CHC: Out of bounds access happens here.
-// Warning 6368: (557-566): CHC: Out of bounds access happens here.
-// Warning 6368: (557-569): CHC: Out of bounds access happens here.
-// Warning 6368: (578-582): CHC: Out of bounds access happens here.
-// Warning 6368: (699-703): CHC: Out of bounds access happens here.
-// Warning 6368: (712-717): CHC: Out of bounds access happens here.
-// Warning 6368: (712-720): CHC: Out of bounds access happens here.
-// Warning 6368: (730-736): CHC: Out of bounds access happens here.
-// Warning 6368: (730-739): CHC: Out of bounds access happens here.
-// Warning 6368: (730-742): CHC: Out of bounds access happens here.
-// Warning 6328: (692-749): CHC: Assertion violation happens here.
-// Warning 6368: (850-854): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
deleted file mode 100644
index e90d4fbf8c3a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder               v2;
-
-contract C
-{
-	uint[] array;
-	function p() public {
-		array.push();
-	}
-	function f(uint[] memory a, uint[] memory b) public {
-		require(a.length > 0);
-		require(b.length > 0);
-		require(array.length > 0);
-		array[0] = 42;
-		a[0] = 2;
-		// Access is safe but oob is reported due of aliasing.
-		b[0] = 1;
-		// Erasing knowledge about memory references should not
-		// erase knowledge about state variables.
-		// Removed because current Spacer seg faults.
-		//assert(array[0] == 42);
-		// Accesses are safe but oob is reported due of aliasing.
-		assert(a[0] == 2);
-		assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (327-331): CHC: Out of bounds access happens here.
-// Warning 6368: (584-588): CHC: Out of bounds access happens here.
-// Warning 6328: (577-594): CHC: Assertion violation happens here.
-// Warning 6368: (605-609): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
deleted file mode 100644
index c23074566373..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-pragma abicoder               v2;
-
-contract C
-{
-	uint[] array;
-	constructor() {
-		array.push();
-	}
-	function f(uint[] memory a, uint[] memory b) public {
-		require(a.length > 0);
-		array[0] = 42;
-		uint[] storage c = array;
-		a[0] = 2;
-		require(b.length > 0);
-		b[0] = 1;
-		// Erasing knowledge about memory references should not
-		// erase knowledge about state variables.
-		assert(array[0] == 42);
-		// Erasing knowledge about memory references should not
-		// erase knowledge about storage references.
-		assert(c[0] == 42);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(a[0] == 2);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol
deleted file mode 100644
index 199ccbc160c3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract C
-{
-	uint[] array;
-	uint[][] array2d;
-	uint[][][][] array4d;
-	uint8[] tinyArray;
-	uint8[][][] tinyArray3d;
-	function f(
-		uint[] storage a,
-		uint[] storage b,
-		uint[][] storage cc,
-		uint8[][] storage dd,
-		uint[][][] storage eee
-	) internal {
-		a[0] = 2;
-		array[0] = 42;
-		array2d[0][0] = 42;
-		tinyArray[0] = 42;
-		cc[0][0] = 42;
-		dd[0][0] = 42;
-		eee[0][0][0] = 42;
-		b[0] = 1;
-		// Fails because b == a is possible.
-		assert(a[0] == 2);
-		// Fails because b == array is possible.
-		assert(array[0] == 42);
-		// Fails because b == array2d[0] is possible.
-		assert(array2d[0][0] == 42);
-		// Should not fail since knowledge is erased only for uint[].
-		assert(tinyArray[0] == 42);
-		// Fails because b == cc[0] is possible.
-		assert(cc[0][0] == 42);
-		// Should not fail since knowledge is erased only for uint[].
-		assert(dd[0][0] == 42);
-		// Fails because b == ee[0][0] is possible.
-		assert(eee[0][0][0] == 42);
-		assert(b[0] == 1);
-	}
-
-	function g(uint a, uint b, uint c, uint d, uint e) public {
-		require(a < array2d.length);
-		require(b < array2d.length);
-		require(c < array4d.length);
-		require(c < array4d[c].length);
-		require(d < tinyArray3d.length);
-		require(e < array4d.length);
-		// Disabled because of Spacer seg fault.
-		//f(array2d[a], array2d[b], array4d[c][c], tinyArray3d[d], array4d[e]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2018: (957-1329): Function state mutability can be restricted to view
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
deleted file mode 100644
index b9e726d97edb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract C
-{
-	uint[][] array2d;
-	function p() public {
-		array2d.push().push();
-	}
-	function g(uint x, uint y, uint[] memory c) public {
-		require(x < array2d.length);
-		require(y < array2d.length);
-		f(array2d[x], array2d[y], c);
-	}
-
-	function f(uint[] storage a, uint[] storage b, uint[] memory c) internal {
-		require(a.length > 0);
-		require(b.length > 0);
-		require(c.length > 0);
-		c[0] = 42;
-		a[0] = 2;
-		// Access is safe but oob is reported because of aliasing.
-		b[0] = 1;
-		// Erasing knowledge about storage references should not
-		// erase knowledge about memory references.
-		assert(c[0] == 42);
-		// Fails because b == a is possible.
-		assert(a[0] == 2);
-		// Access is safe but oob is reported because of aliasing.
-		assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (474-478): CHC: Out of bounds access happens here.
-// Warning 6368: (659-663): CHC: Out of bounds access happens here.
-// Warning 6328: (652-669): CHC: Assertion violation happens here.
-// Warning 6368: (741-745): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
deleted file mode 100644
index 3d8dbc056561..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract C
-{
-	uint[][] array2d;
-	function p() public { array2d.push().push(); }
-	function g(uint x, uint y, uint[] memory c) public {
-		require(x < array2d.length);
-		require(y < array2d.length);
-		f(array2d[x], array2d[y], c);
-	}
-	function f(uint[] storage a, uint[] storage b, uint[] memory c) internal {
-		require(a.length > 0);
-		require(b.length > 0);
-		require(c.length > 0);
-		uint[] memory d = c;
-		c[0] = 42;
-		a[0] = 2;
-		// Access is safe but oob is reported due of aliasing.
-		b[0] = 1;
-		// Erasing knowledge about storage references should not
-		// erase knowledge about memory references.
-		// Disabled because of Spacer's seg fault.
-		//assert(c[0] == 42);
-		// Erasing knowledge about storage references should not
-		// erase knowledge about memory references.
-		// Disabled because of Spacer's seg fault.
-		//assert(d[0] == 42);
-		// Fails because b == a is possible.
-		// Accesses are safe but oob is reported due of aliasing.
-		assert(a[0] == 2);
-		assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2072: (384-399): Unused local variable.
-// Warning 6368: (489-493): CHC: Out of bounds access happens here.
-// Warning 6368: (955-959): CHC: Out of bounds access happens here.
-// Warning 6328: (948-965): CHC: Assertion violation happens here.
-// Warning 6368: (976-980): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_4.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_4.sol
deleted file mode 100644
index f64c080ef245..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_4.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C
-{
-	uint[] array;
-	uint[][] array2d;
-	function p() public {
-		array.push();
-		array2d.push().push();
-	}
-	function f(uint[] storage a, uint[] storage b) internal {
-		require(a.length > 0);
-		require(b.length > 0);
-		a[0] = 2;
-		// Accesses are safe but oob is reported because of aliasing.
-		b[0] = 42;
-		array[0] = 1;
-		// Fails because array == a is possible.
-		assert(a[0] == 2);
-		// Fails because array == b is possible.
-		assert(b[0] == 42);
-		assert(array[0] == 1);
-	}
-	function g(uint x, uint y) public {
-		require(x < array2d.length);
-		require(y < array2d.length);
-		// Disabled because of Spacer nondeterminism.
-		//f(array2d[x], array2d[y]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2018: (486-665): Function state mutability can be restricted to view
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol
deleted file mode 100644
index ca692a0e8734..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-contract C
-{
-	uint[] b;
-	uint[] d;
-	uint[][] array2d;
-	function p() public {
-		array2d.push().push();
-	}
-	function g(uint x, uint[] memory c) public {
-		require(x < array2d.length);
-		// Disabled because of Spacer nondeterminism.
-		//f(array2d[0], c);
-	}
-	function f(uint[] storage a, uint[] memory c) internal {
-		// Accesses are safe but oob is reported because of aliasing.
-		d[0] = 42;
-		c[0] = 42;
-		a[0] = 2;
-		b[0] = 1;
-		// Erasing knowledge about storage variables should not
-		// erase knowledge about memory references.
-		assert(c[0] == 42);
-		// Fails because d == a is possible.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(d[0] == 42);
-		// Fails because b == a and d == a are possible.
-		assert(a[0] == 2);
-		// b == a is possible, but does not fail because b
-		// was the last assignment.
-		assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 5667: (125-140): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2018: (106-254): Function state mutability can be restricted to view
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
deleted file mode 100644
index 43b6cc0d4174..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(bool b, uint[] memory c) public pure {
-		require(c.length >= 1 && c.length <= 2);
-		c[0] = 0;
-		if (b)
-			c[0] = 1;
-		assert(c[0] > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (143-159): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_2d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_2d.sol
deleted file mode 100644
index 66d90ef35814..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branch_2d.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint[][] c;
-	constructor() {
-		c.push().push();
-	}
-	function f(bool b) public {
-		// Disabled because of Spacer nondeterminism.
-		/*
-		c[0][0] = 0;
-		if (b)
-			c[0][0] = 1;
-		assert(c[0][0] > 0);
-		*/
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
deleted file mode 100644
index 8ba3f013707d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint[][][] c;
-	constructor() {
-		c.push();
-		c[0].push();
-		c[0][0].push();
-	}
-	function f(bool b) public {
-		c[0][0][0] = 0;
-		if (b)
-			c[0][0][0] = 1;
-		assert(c[0][0][0] > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-162): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-184): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Warning 6328: (170-192): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol
deleted file mode 100644
index 61abb418d6e0..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(bool b, uint[] memory c) public pure {
-		require(c.length > 0);
-		c[0] = 0;
-		if (b)
-			c[0] = 1;
-		else
-			c[0] = 2;
-		assert(c[0] > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol
deleted file mode 100644
index f4743dcc5657..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	uint[][] c;
-	function p() public {
-		c.push().push();
-	}
-	function f(bool b) public {
-		require(c.length > 0);
-		require(c[0].length > 0);
-		c[0][0] = 0;
-		if (b)
-			c[0][0] = 1;
-		else
-			c[0][0] = 2;
-		assert(c[0][0] > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
deleted file mode 100644
index ecd419eea6ac..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C
-{
-	uint[][][] c;
-	constructor() {
-		c.push();
-		c[0].push();
-		c[0][0].push();
-	}
-	function f(bool b) public {
-		c[0][0][0] = 0;
-		if (b)
-			c[0][0][0] = 1;
-		assert(c[0][0][0] < 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-162): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-184): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
deleted file mode 100644
index acd5744726d5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C
-{
-	uint[][][] c;
-	constructor() {
-		c.push();
-		c[0].push();
-		c[0][0].push();
-	}
-	function f(bool b) public {
-		c[0][0][0] = 0;
-		if (b)
-			c[0][0][0] = 1;
-		assert(c[0][0][0] < 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTShowUnproved: yes
-// ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-162): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-184): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol
deleted file mode 100644
index 2aba2bbeb092..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint[] array;
-	constructor() {
-		array.push();
-		array.push();
-		array.push();
-		array.push();
-	}
-	function f(uint x, uint y) public {
-		require(x < array.length);
-		array[x] = 200;
-		require(x == y);
-		assert(array[y] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
deleted file mode 100644
index bc512b557487..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	uint[] array;
-	function p() public { array.push(); }
-	function f(uint x, uint y) public {
-		require(x < array.length);
-		array[x] = 200;
-		require(x == y);
-		assert(array[y] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (172-194): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
deleted file mode 100644
index 5e421cf49931..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	uint[][] array;
-	function f(uint x, uint y, uint z, uint t) public view {
-		require(array[x][y] == 200);
-		require(x == z && y == t);
-		assert(array[z][t] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (98-106): CHC: Out of bounds access happens here.
-// Warning 6368: (98-109): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
deleted file mode 100644
index fa55bd7f77f2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	uint[][] array;
-	function a() public {
-		array.push().push();
-	}
-	function f(uint x, uint y, uint z, uint t) public {
-		require(x < array.length);
-		require(y < array[x].length);
-		array[x][y] = 200;
-		require(x == z && y == t);
-		assert(array[z][t] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (245-270): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol
deleted file mode 100644
index ae90faa4ebee..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	uint[][][] array;
-	function f(uint x, uint y, uint z, uint t, uint w, uint v) public view {
-		require(x < array.length);
-		require(y < array[x].length);
-		require(z < array[x][y].length);
-		require(array[x][y][z] == 200);
-		require(x == t && y == w && z == v);
-		assert(array[t][w][v] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
deleted file mode 100644
index 76732c141365..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	uint[][][] array;
-	function p() public {
-		array.push().push().push();
-	}
-	function f(uint x, uint y, uint z, uint t, uint w, uint v) public {
-		require(x < array.length);
-		require(y < array[x].length);
-		require(z < array[x][y].length);
-		array[x][y][z] = 200;
-		require(x == t && y == w && z == v);
-		assert(array[t][w][v] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (318-346): CHC: Assertion violation happens here.
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol
deleted file mode 100644
index 7387e8125d1c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	function f(uint[] memory array, uint x, uint y) public pure {
-		require(x < array.length);
-		array[x] = 200;
-		require(x == y);
-		assert(array[y] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
deleted file mode 100644
index 004bab44d83d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f(uint[] memory array, uint x, uint y) public pure {
-		require(x < array.length);
-		array[x] = 200;
-		require(x == y);
-		assert(array[y] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (144-166): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_1.sol b/test/libsolidity/smtCheckerTests/types/array_literal_1.sol
deleted file mode 100644
index 79a1d08ab3e3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint[3] memory array = [uint(1), 2, 3];
-		assert(array[0] == 1);
-		assert(array[1] == 2);
-		assert(array[2] == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
deleted file mode 100644
index d48644c2fd27..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint[3] memory a = [uint(1), 2, 3];
-		uint[3] memory b = [uint(1), 2, 4];
-		assert(a[0] == b[0]);
-		assert(a[1] == b[1]);
-		assert(a[2] == b[2]); // fails
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (167-187): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
deleted file mode 100644
index cdaff2bf44a4..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function f() public pure {
-		(uint[3] memory a, uint[3] memory b) = ([uint(1), 2, 3], [uint(1), 2, 4]);
-		assert(a[0] == b[0]);
-		assert(a[1] == b[1]);
-		assert(a[2] == b[2]); // fails
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (168-188): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_4.sol b/test/libsolidity/smtCheckerTests/types/array_literal_4.sol
deleted file mode 100644
index 1c95ea98ea84..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_4.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function f(bool c) public pure {
-		uint[3] memory a = c ? [uint(1), 2, 3] : [uint(1), 2, 4];
-		uint[3] memory b = [uint(1), 2, c ? 3 : 4];
-		assert(a[0] == b[0]);
-		assert(a[1] == b[1]);
-		assert(a[2] == b[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
deleted file mode 100644
index 0a6fe02bc551..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	uint[] s;
-	function f() public {
-		uint[3] memory a = [uint(1), 2, 3];
-		s = a;
-		assert(s.length == a.length);
-		assert(s[0] == a[0]);
-		assert(s[1] == a[1]);
-		assert(s[2] != a[2]); // fails
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (176-196): CHC: Assertion violation happens here.\nCounterexample:\ns = [1, 2, 3]\na = [1, 2, 3]\n\nTransaction trace:\nC.constructor()\nState: s = []\nC.f()
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
deleted file mode 100644
index b017aa93e547..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint[3] memory a = [uint(1), 2, 3];
-		uint[4] memory b = [uint(1), 2, 4, 3];
-		uint[4] memory c = b;
-		assert(a.length == c.length); // fails
-		assert(a[0] == c[0]);
-		assert(a[1] == c[1]);
-		assert(a[2] == c[2]); // fails
-		assert(a[2] == c[3]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (146-174): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (235-255): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_7.sol b/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
deleted file mode 100644
index 21e345023d7f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C
-{
-	uint[] s;
-	function f() public {
-		uint[3] memory a = [uint(1), 2, 3];
-		uint[4] memory b = [uint(1), 2, 4, 3];
-		uint[4] memory c = b;
-		assert(c.length == b.length);
-		s = a;
-		assert(s.length == a.length);
-
-		assert(s.length == c.length); // fails
-		assert(s[0] == c[0]);
-		assert(s[1] == c[1]);
-		assert(s[2] == c[2]); // fails
-		assert(s[2] == c[3]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (226-254): CHC: Assertion violation happens here.
-// Warning 6328: (315-335): CHC: Assertion violation happens here.
-// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
deleted file mode 100644
index 3f9c89734fcb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract C
-{
-	mapping (uint => uint) singleMap;
-	mapping (uint => uint)[] severalMaps;
-	mapping (uint => uint8)[] severalMaps8;
-	mapping (uint => uint)[][] severalMaps3d;
-	function p() public {
-		severalMaps.push();
-		severalMaps8.push();
-		severalMaps3d.push().push();
-	}
-	function f(mapping (uint => uint) storage map) internal {
-		require(severalMaps.length > 0);
-		require(severalMaps8.length > 0);
-		require(severalMaps3d.length > 0);
-		require(severalMaps3d[0].length > 0);
-		severalMaps[0][0] = 42;
-		severalMaps8[0][0] = 42;
-		severalMaps3d[0][0][0] = 42;
-		map[0] = 2;
-		// Should fail since map == severalMaps[0] is possible.
-		// Access is safe but oob is reported because of aliasing.
-		assert(severalMaps[0][0] == 42);
-		// Should not fail since knowledge is erased only for mapping (uint => uint).
-		assert(severalMaps8[0][0] == 42);
-		// Should fail since map == severalMaps3d[0][0] is possible.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(severalMaps3d[0][0][0] == 42);
-	}
-	function g(uint x) public {
-		require(x < severalMaps.length);
-		f(severalMaps[x]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (706-720): CHC: Out of bounds access happens here.
-// Warning 6328: (699-730): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
deleted file mode 100644
index 5ac20c96f869..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-contract C
-{
-	mapping (uint => uint) singleMap;
-	mapping (uint => uint)[] severalMaps;
-	mapping (uint => uint8)[] severalMaps8;
-	mapping (uint => uint)[][] severalMaps3d;
-	constructor() {
-		severalMaps.push();
-		severalMaps8.push();
-		severalMaps3d.push().push();
-	}
-	function f(mapping (uint => uint) storage map) internal {
-		map[0] = 42;
-		// Index accesses are safe but the assignment above makes
-		// them fail because of aliasing.
-		severalMaps[0][0] = 42;
-		severalMaps8[0][0] = 42;
-		severalMaps3d[0][0][0] = 42;
-		singleMap[0] = 2;
-		// Should not fail since singleMap == severalMaps[0] is not possible.
-		assert(severalMaps[0][0] == 42);
-		// Should not fail since knowledge is erased only for mapping (uint => uint).
-		assert(severalMaps8[0][0] == 42);
-		// Should not fail since singleMap == severalMaps3d[0][0] is not possible.
-		assert(severalMaps3d[0][0][0] == 42);
-		// Should fail since singleMap == map is possible.
-		assert(map[0] == 42);
-	}
-	function g(uint x) public {
-		require(x < severalMaps.length);
-		f(severalMaps[x]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (439-453): CHC: Out of bounds access happens here.
-// Warning 6368: (465-480): CHC: Out of bounds access might happen here.
-// Warning 6368: (492-508): CHC: Out of bounds access happens here.
-// Warning 6368: (492-511): CHC: Out of bounds access happens here.
-// Warning 6368: (622-636): CHC: Out of bounds access happens here.
-// Warning 6368: (737-752): CHC: Out of bounds access might happen here.
-// Warning 6368: (850-866): CHC: Out of bounds access happens here.
-// Warning 6368: (850-869): CHC: Out of bounds access happens here.
-// Warning 6328: (936-956): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_1.sol b/test/libsolidity/smtCheckerTests/types/array_static_1.sol
deleted file mode 100644
index 3d33caa490c7..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	uint[10] array;
-	function f(uint x, uint y) public {
-		require(x < array.length);
-		array[x] = 200;
-		require(x == y);
-		assert(array[y] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
deleted file mode 100644
index 0ab524c758aa..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	uint[10] array;
-	function f(uint x, uint y) public {
-		require(x < array.length);
-		array[x] = 200;
-		require(x == y);
-		assert(array[y] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (135-157): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_2.sol
deleted file mode 100644
index c90d4a299a6d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	uint[10][20] array;
-	function f(uint x, uint y, uint z, uint t) public view {
-		require(x < array.length);
-		require(y < array[x].length);
-		require(array[x][y] == 200);
-		require(x == z && y == t);
-		assert(array[z][t] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
deleted file mode 100644
index e0146c85f86a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	uint[10][20] array;
-	function f(uint x, uint y, uint z, uint t) public view {
-		require(x < array.length);
-		require(y < array[x].length);
-		require(array[x][y] < 200);
-		require(x == z && y == t);
-		assert(array[z][t] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (214-239): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_3.sol b/test/libsolidity/smtCheckerTests/types/array_static_3.sol
deleted file mode 100644
index a1ca13a80196..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_3.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	uint[10][20][30] array;
-	function f(uint x, uint y, uint z, uint t, uint w, uint v) public view {
-		require(x < array.length);
-		require(y < array[x].length);
-		require(z < array[x][y].length);
-		require(array[x][y][z] == 200);
-		require(x == t && y == w && z == v);
-		assert(array[t][w][v] > 100);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
deleted file mode 100644
index b299de21c6de..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint[10][20][30] array;
-	function f(uint x, uint y, uint z, uint t, uint w, uint v) public {
-		require(x < array.length);
-		require(y < array[x].length);
-		require(z < array[x][y].length);
-		array[x][y][z] = 200;
-		require(x == t && y == w && z == v);
-		assert(array[t][w][v] > 300);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (268-296): CHC: Assertion violation happens here.
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
deleted file mode 100644
index 8e6d23ab6c00..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C
-{
-	function f(uint[2] memory a, uint[2] memory b, uint[2] memory c) public pure {
-		require(c[0] == 42);
-		require(a[0] == 2);
-		b[0] = 1;
-		// Should fail since b == c is possible.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(c[0] == 42);
-		// Should fail since b == a is possible.
-		// Access is safe but oob is reported due of aliasing.
-		assert(a[0] == 2);
-		assert(b[0] == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (385-402): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol
deleted file mode 100644
index 73863078834c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C
-{
-	uint[2] b1;
-	uint[2] b2;
-	function f(uint[2] storage a, uint[2] memory c) internal {
-		// Accesses are safe but oob is reported because of aliasing.
-		c[0] = 42;
-		a[0] = 2;
-		b1[0] = 1;
-		// Erasing knowledge about storage variables should not
-		// erase knowledge about memory references.
-		assert(c[0] == 42);
-		// Fails because b1 == a is possible.
-		// Disabled because Spacer seg faults.
-		//assert(a[0] == 2);
-		assert(b1[0] == 1);
-	}
-	function g(bool x, uint[2] memory c) public {
-		if (x) f(b1, c);
-		else f(b2, c);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
deleted file mode 100644
index 7ee1acf47b35..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C
-{
-	mapping (uint => uint) singleMap;
-	mapping (uint => uint)[2] severalMaps;
-	mapping (uint => uint8)[2] severalMaps8;
-	mapping (uint => uint)[2][2] severalMaps3d;
-	function f(mapping (uint => uint) storage map) internal {
-		// Accesses are safe but oob is reported because of aliasing.
-		severalMaps[0][0] = 42;
-		severalMaps8[0][0] = 42;
-		severalMaps3d[0][0][0] = 42;
-		map[0] = 2;
-		// Should fail since map == severalMaps[0] is possible.
-		assert(severalMaps[0][0] == 42);
-		// Should not fail since knowledge is erased only for mapping (uint => uint).
-		assert(severalMaps8[0][0] == 42);
-		// Should fail since map == severalMaps3d[0][0] is possible.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(severalMaps3d[0][0][0] == 42);
-	}
-	function g(uint x) public {
-		require(x < severalMaps.length);
-		f(severalMaps[x]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (456-487): CHC: Assertion violation happens here.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
deleted file mode 100644
index 1f167b8586ab..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C
-{
-	mapping (uint => uint) singleMap;
-	mapping (uint => uint)[2] severalMaps;
-	mapping (uint => uint8)[2] severalMaps8;
-	mapping (uint => uint)[2][2] severalMaps3d;
-	function f(mapping (uint => uint) storage map) internal {
-		// Accesses are safe but reported as unsafe due to aliasing.
-		map[0] = 42;
-		severalMaps[0][0] = 42;
-		severalMaps8[0][0] = 42;
-		severalMaps3d[0][0][0] = 42;
-		singleMap[0] = 2;
-		// Should not fail since singleMap == severalMaps[0] is not possible.
-		assert(severalMaps[0][0] == 42);
-		// Should not fail since knowledge is erased only for mapping (uint => uint).
-		assert(severalMaps8[0][0] == 42);
-		// Should not fail since singleMap == severalMaps3d[0][0] is not possible.
-		// Removed because of Spacer nondeterminism.
-		//assert(severalMaps3d[0][0][0] == 42);
-		// Should fail since singleMap == map is possible.
-		assert(map[0] == 42);
-	}
-	function g(uint x) public {
-		require(x < 2);
-		f(severalMaps3d[x][0]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6368: (340-355): CHC: Out of bounds access might happen here.
-// Warning 6368: (612-627): CHC: Out of bounds access might happen here.
-// Warning 6328: (860-880): CHC: Assertion violation happens here.
-// Warning 6368: (936-952): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol
deleted file mode 100644
index cc82aa924a9f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-	struct S { uint[][] a; }
-	function f(bool b) public pure {
-		S[] memory c = new S[](1);
-		// Disabled because of Spacer nondetemrinism.
-		/*
-		c[0].a = new uint[][](1);
-		c[0].a[0] = new uint[](1);
-		c[0].a[0][0] = 0;
-		if (b)
-			c[0].a[0][0] = 1;
-		else
-			c[0].a[0][0] = 2;
-		assert(c[0].a[0][0] > 0);
-		*/
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (51-57): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (75-87): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol
deleted file mode 100644
index 2e75ad33ded8..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(bool x) public pure {
-        uint a;
-        if(x)
-            a = 1;
-        assert(!x || a > 0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol
deleted file mode 100644
index ac6dd87eb04a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(bool x, uint a) public pure {
-        require(!x || a > 0);
-        uint b = a;
-        assert(!x || b > 0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol
deleted file mode 100644
index 7039ae1bf324..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function f(bool x, bool y) public pure {
-        uint a;
-        if (x) {
-            if (y) {
-                a = 0;
-            } else {
-                a = 1;
-            }
-        } else {
-            if (y) {
-                a = 1;
-            } else {
-                a = 0;
-            }
-        }
-        bool xor_x_y = (x && !y) || (!x && y);
-        assert(!xor_x_y || a > 0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
deleted file mode 100644
index a9ea6c7f9602..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bool x) public pure {
-        assert(x);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (58-67): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
deleted file mode 100644
index 7e23d77d65c9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bool x, bool y) public pure {
-        assert(x == y);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = true\ny = false\n\nTransaction trace:\nC.constructor()\nC.f(true, false)
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol
deleted file mode 100644
index fdc08d441bb2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bool x, bool y) public pure {
-        bool z = x || y;
-        assert(!(x && y) || z);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol
deleted file mode 100644
index cafb34c2279e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(bool x) public pure {
-        if(x) {
-            assert(x);
-        } else {
-            assert(!x);
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol
deleted file mode 100644
index c19a5fa16b02..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(bool x) public pure {
-        bool y = x;
-        assert(x == y);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol
deleted file mode 100644
index eab6282f0231..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(bool x) public pure {
-        require(x);
-        bool y;
-        y = false;
-        assert(x || y);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_1.sol b/test/libsolidity/smtCheckerTests/types/bytes_1.sol
deleted file mode 100644
index 9dadcca14bd5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bytes_1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f(bytes memory b) public pure returns (bytes memory) {
-		bytes memory c = b;
-		return b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (80-94): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_2.sol b/test/libsolidity/smtCheckerTests/types/bytes_2.sol
deleted file mode 100644
index 5b27d56bfcc1..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bytes_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(bytes memory b1, bytes memory b2) public pure {
-		require(b2.length > 2);
-		b1 = b2;
-		// Knowledge about b2 is lost because of potential aliasing, so we re-add the length constraint.
-		require(b2.length > 2);
-		assert(b1[1] == b2[1]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (237-259): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol b/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
deleted file mode 100644
index 66fa8ae3e6d3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function f(bytes memory b1, bytes memory b2) public pure {
-		b1 = b2;
-		require(b1.length > 2 && b2.length > 2);
-		assert(b1[1] == b2[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (129-151): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_length.sol b/test/libsolidity/smtCheckerTests/types/bytes_length.sol
deleted file mode 100644
index ea69bc3a442f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/bytes_length.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes memory x = hex"0123";
-		assert(x.length == 2);
-	}
-	function g() public pure {
-		bytes memory x = bytes(hex"0123");
-		assert(x.length == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/contract.sol b/test/libsolidity/smtCheckerTests/types/contract.sol
deleted file mode 100644
index 0ddc3e6503c0..000000000000
--- a/test/libsolidity/smtCheckerTests/types/contract.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f(C c, C d) public pure {
-		assert(c == d);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (51-65): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_2.sol b/test/libsolidity/smtCheckerTests/types/contract_2.sol
deleted file mode 100644
index 2357852d5663..000000000000
--- a/test/libsolidity/smtCheckerTests/types/contract_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract D
-{
-	uint x;
-}
-
-contract C
-{
-	function f(D c, D d) public pure {
-		assert(c == d);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (76-90): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_3.sol b/test/libsolidity/smtCheckerTests/types/contract_3.sol
deleted file mode 100644
index 657999c0b7fc..000000000000
--- a/test/libsolidity/smtCheckerTests/types/contract_3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function f(C c, C d, C e) public pure {
-		require(c == d);
-		require(d == e);
-		assert(c == e);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol b/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol
deleted file mode 100644
index a0148e876dc9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f(C c, address a) public pure {
-		assert(address(c) == a);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (57-80): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol b/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol
deleted file mode 100644
index 0b395c1877c5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	function f(C c, C d) public pure {
-		assert(address(c) == address(c));
-		address a = address(c);
-		require(c == d);
-		assert(a == address(d));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/data_location_in_function_type.sol b/test/libsolidity/smtCheckerTests/types/data_location_in_function_type.sol
deleted file mode 100644
index 97d9f11bd98c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/data_location_in_function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L {
-    struct Nested { uint y; }
-    function c(function(Nested memory) external returns (uint)[] storage) external pure {}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol b/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
deleted file mode 100644
index 0d297354b14a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	D d;
-	function f(D _a) public {
-		require(_a == D.Left);
-		d = D.Right;
-		assert(d != _a);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol b/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol
deleted file mode 100644
index 23a9d20d1bad..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	D d;
-	function f(D _a) public {
-		require(_a == D.Left);
-		d = D.Left;
-		assert(d != _a);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (111-126): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\n_a = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/enum_in_library.sol b/test/libsolidity/smtCheckerTests/types/enum_in_library.sol
deleted file mode 100644
index 57e6d7b435e2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_in_library.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L
-{
-	enum D { Left, Right }
-}
-
-contract C
-{
-	enum E { Left, Right }
-	function f(E _d) public pure {
-		_d = E.Left;
-		assert(_d == E.Left);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol b/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol
deleted file mode 100644
index ef3f420917a6..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L
-{
-	enum D { Left, Right }
-}
-
-contract C
-{
-	enum E { Left, Right }
-	function f(E _d) public pure {
-		_d = E.Right;
-		assert(_d == E.Left);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (126-146): CHC: Assertion violation happens here.\nCounterexample:\n\n_d = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol b/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol
deleted file mode 100644
index d46c120df2b5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-contract C
-{
-	enum D { Left, Right }
-	struct S { uint x; D d; }
-	function f(S memory s) public pure {
-		s.d = D.Left;
-		assert(s.d == D.Left);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_range.sol b/test/libsolidity/smtCheckerTests/types/enum_range.sol
deleted file mode 100644
index 403743e08d2e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_range.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	function f(D a) public pure {
-		assert(a == D.Left || a == D.Right);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol b/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol
deleted file mode 100644
index 9a1ab6d32569..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	D d;
-	function f(D _d) public {
-		d = _d;
-		assert(d != _d);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (82-97): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\n_d = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol b/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol
deleted file mode 100644
index 1f1811ea61b9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	enum D { Left, Right }
-	D d;
-	function f(D _a, D _b) public view {
-		require(_a == _b);
-		require(_a == d);
-		assert(d == _b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/event_with_rational_size_array.sol b/test/libsolidity/smtCheckerTests/types/event_with_rational_size_array.sol
deleted file mode 100644
index 219eeafeb9c3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/event_with_rational_size_array.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract a { event b(uint[(1 / 1)]); }
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol
deleted file mode 100644
index 3fc25a3c33c4..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	bytes32 x;
-	function f(bytes8 y) public view {
-		assert(x != y);
-		assert(x != g());
-	}
-	function g() public view returns (bytes32) {
-		return x;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (63-77): CHC: Assertion violation happens here.
-// Warning 6328: (81-97): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
deleted file mode 100644
index c9ce9f14ff8e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	bytes32 x;
-	function f(bytes8 y) public view {
-		assert(x == g());
-		assert(x != y);
-	}
-	function g() public view returns (bytes32) {
-		return x;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (83-97): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
deleted file mode 100644
index 30d61718a521..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-	bytes10[6] data2;
-	function test() public view returns (bytes10 r2) {
-		r2 = data2[4][5];
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
deleted file mode 100644
index 33ce3ca25864..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bytes calldata x, uint y) external pure {
-		require(x.length > 10);
-		x[8][0];
-		// Disabled because of Spacer nondeterminism.
-		//x[8][5%y];
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 5667: (43-49): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
deleted file mode 100644
index bb4ef03428e7..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-	bytes16[][] a;
-	constructor() {
-		a.push();
-		a.push();
-		a.push();
-		a.push();
-		a.push();
-		a.push();
-		a[2].push();
-		a[2].push();
-		a[2].push();
-		a[3].push();
-		a[3].push();
-		a[3].push();
-		a[3].push();
-		a[3].push();
-	}
-	function g() internal view returns (bytes16[] storage) {
-		return a[2];
-	}
-	function h() internal view returns (bytes16) {
-		return a[2][2];
-	}
-	function f() external view {
-		// Reports oob because of aliasing.
-		g()[3][4];
-		h()[5];
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (456-462): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
deleted file mode 100644
index b67017112d44..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes32 x = 0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff;
-		bytes1 z = 0x00;
-		bytes1 o = 0xff;
-		assert(x[0] == z);
-		assert(x[31] == o);
-		assert(x[0] == x[22]);
-		assert(x[0] == x[23]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (231-252): CHC: Assertion violation happens here.
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
deleted file mode 100644
index 122979feda16..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes4 x = 0x01020304;
-		bytes1 b = 0x02;
-		assert(x[0] == b); // fails
-		assert(x[1] == b);
-		assert(x[2] == b); // fails
-		assert(x[3] == b); // fails
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (87-104): CHC: Assertion violation happens here.
-// Warning 6328: (138-155): CHC: Assertion violation happens here.
-// Warning 6328: (168-185): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol
deleted file mode 100644
index e506b9450bff..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure {
-		bytes4 x = 0x01020304;
-		bytes1 b = x[3];
-		assert(b == b[0]);
-		assert(b == b[0][0]);
-		assert(b == b[0][0][0][0][0][0][0][0][0][0][0]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 18 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol
deleted file mode 100644
index b97ffbe242be..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(uint i) public pure {
-		bytes4 x = 0x01020304;
-		require(i > 3);
-		assert(x[i] == 0x00);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6368: (99-103): CHC: Out of bounds access happens here.\nCounterexample:\n\ni = 4\nx = 0x01020304\n\nTransaction trace:\nC.constructor()\nC.f(4)
-// Warning 6328: (92-112): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 4\nx = 0x01020304\n\nTransaction trace:\nC.constructor()\nC.f(4)
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol
deleted file mode 100644
index b4168dc98e24..000000000000
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-
-	function f(bytes1 b) public pure {
-		bytes1 c = hex"7f";
-		require(b > c);
-		assert(uint8(b) > 127); // should hold
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol b/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol
deleted file mode 100644
index 053ac9c6a379..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract K {
-	function f() public pure {
-		(abi.encode, 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (43-58): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol b/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol
deleted file mode 100644
index df15f1e5d982..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract K {
-	function f() public pure {
-		(abi.encode, "");
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (43-59): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_array_as_reference_type.sol b/test/libsolidity/smtCheckerTests/types/function_type_array_as_reference_type.sol
deleted file mode 100644
index fc913702be36..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_array_as_reference_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    struct Nested { uint y; }
-    // ensure that we consider array of function pointers as reference type
-    function b(function(Nested memory) external returns (uint)[] storage) internal pure {}
-    function c(function(Nested memory) external returns (uint)[] memory) public pure {}
-    function d(function(Nested memory) external returns (uint)[] calldata) external pure {}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol b/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol
deleted file mode 100644
index 1cc490d25fd8..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function(uint) external returns (uint)[] public x;
-    function(uint) internal returns (uint)[10] y;
-    function f() view public {
-        function(uint) returns (uint)[10] memory a;
-        function(uint) returns (uint)[10] storage b = y;
-        function(uint) external returns (uint)[] memory c;
-        c = new function(uint) external returns (uint)[](200);
-        assert(c.length == 200);
-        a; b;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_as_argument.sol b/test/libsolidity/smtCheckerTests/types/function_type_as_argument.sol
deleted file mode 100644
index 6fe95f4b51b6..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_as_argument.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(function(uint) external g) public {
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_call.sol b/test/libsolidity/smtCheckerTests/types/function_type_call.sol
deleted file mode 100644
index 2d0bd0757cd5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_call.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function(uint) m_g;
-    function f(function(uint) internal g) internal {
-		g(2);
-    }
-	function h() public {
-		f(m_g);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5729: (89-93): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol b/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol
deleted file mode 100644
index b48e53826399..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(address a, function(uint) external g) internal pure {
-		address b = g.address;
-		assert(a == b);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7650: (96-105): Assertion checker does not yet support this expression.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_members.sol b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
deleted file mode 100644
index 16a57b852c00..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_members.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(function(uint) external payable g) internal {
-		g.selector;
-		g{gas: 2, value: 3}(4);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7650: (76-86): Assertion checker does not yet support this expression.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_nested.sol b/test/libsolidity/smtCheckerTests/types/function_type_nested.sol
deleted file mode 100644
index 00eaf74f7120..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_nested.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-	function(uint) m_g;
-    function f1(function(uint) internal g1) internal {
-		g1(2);
-    }
-    function f2(function(function(uint) internal) internal g2) internal {
-		g2(m_g);
-    }
-	function h() public {
-		f2(f1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (120-165): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (180-182): Assertion checker does not yet implement type function (function (uint256))
-// Warning 6031: (223-225): Internal error: Expression undefined for SMT solver.
-// Warning 8364: (223-225): Assertion checker does not yet implement type function (function (uint256))
-// Warning 5729: (91-96): BMC does not yet implement this type of function call.
-// Warning 5729: (180-187): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol b/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol
deleted file mode 100644
index 66564e6180bb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-	function(uint) m_g;
-	function r() internal view returns (function(uint)) {
-		return m_g;
-	}
-    function f1(function(uint) internal g1) internal {
-		g1(2);
-    }
-    function f2(function(function(uint) internal) internal g2) internal {
-		g2(r());
-    }
-	function h() public {
-		f2(f1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (192-237): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (252-254): Assertion checker does not yet implement type function (function (uint256))
-// Warning 1695: (255-256): Assertion checker does not yet support this global variable.
-// Warning 6031: (295-297): Internal error: Expression undefined for SMT solver.
-// Warning 8364: (295-297): Assertion checker does not yet implement type function (function (uint256))
-// Warning 5729: (163-168): BMC does not yet implement this type of function call.
-// Warning 5729: (252-259): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_1.sol
deleted file mode 100644
index c8d6c4ca710e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x) public {
-		map[2] = x;
-		assert(x == map[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
deleted file mode 100644
index 7e9669eaf246..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x) public {
-		map[2] = x;
-		map[2] = 3;
-		assert(x != map[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (101-120): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_2.sol
deleted file mode 100644
index 81a36e550ede..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	mapping (uint => bool) map;
-	function f(bool x) public view {
-		assert(x != map[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (78-97): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol
deleted file mode 100644
index 9bab80f2ce81..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	mapping (uint => mapping (uint => uint)) map;
-	function f(uint x) public {
-		x = 42;
-		map[13][14] = 42;
-		assert(x == map[13][14]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol
deleted file mode 100644
index 57178c41798c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	mapping (uint => mapping (uint => uint)) map;
-	function f(uint x) public {
-		x = 41;
-		map[13][14] = 42;
-		assert(x == map[13][14]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (121-145): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 41\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_3.sol b/test/libsolidity/smtCheckerTests/types/mapping_3.sol
deleted file mode 100644
index 654f0622b2ff..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f() public {
-		map[1] = 111;
-		uint x = map[2];
-		map[1] = 112;
-		assert(map[2] == x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol
deleted file mode 100644
index 824e47213d2a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	mapping (uint => mapping (uint => mapping (uint => uint))) map;
-	function f(uint x) public {
-		x = 42;
-		map[13][14][15] = 42;
-		assert(x == map[13][14][15]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol
deleted file mode 100644
index 9bcbc133b704..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	mapping (uint => mapping (uint => mapping (uint => uint))) map;
-	function f(uint x) public {
-		x = 41;
-		map[13][14][15] = 42;
-		assert(x == map[13][14][15]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (143-171): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 41\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_4.sol b/test/libsolidity/smtCheckerTests/types/mapping_4.sol
deleted file mode 100644
index cdaf3fece282..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_4.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	mapping (bool => bool) map;
-	function f(bool x) public view {
-		require(x);
-		assert(x != map[x]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_5.sol b/test/libsolidity/smtCheckerTests/types/mapping_5.sol
deleted file mode 100644
index 632191a675c4..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_5.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	mapping (address => uint) map;
-	function f(address a, uint x) public view {
-		assert(x != map[a]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (92-111): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0x0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
deleted file mode 100644
index be126d16e025..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	mapping (uint => uint) a;
-	mapping (uint => uint) b;
-
-	function f(uint x) public {
-		a[1] = x;
-		b[1] = x;
-		a[1] = 2;
-		mapping (uint => uint) storage c = a;
-		assert(c[1] == 2);
-		// False negative! Needs aliasing.
-		assert(a[1] == b[1]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (233-253): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
deleted file mode 100644
index 54b69b38cea1..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C
-{
-	mapping (uint => uint) a;
-	mapping (uint => mapping (uint => uint)) maps;
-	mapping (uint => mapping (uint => uint8)) maps8;
-	function f(mapping (uint => uint) storage map1, mapping (uint => uint) storage map2) internal {
-		map1[0] = 2;
-		a[0] = 42;
-		maps[0][0] = 42;
-		maps8[0][0] = 42;
-		map2[0] = 1;
-		// Fails because map2 == map1 is possible.
-		assert(map1[0] == 2);
-		// Fails because map2 == a is possible.
-		assert(a[0] == 42);
-		// Fails because map2 == maps[0] is possible.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(maps[0][0] == 42);
-		// Should not fail since knowledge is erased only for mapping (uint => uint).
-		assert(maps8[0][0] == 42);
-		assert(map2[0] == 1);
-	}
-
-	function g(bool b, uint x, uint y) public {
-		if (b)
-			f(a, maps[y]);
-		else
-			f(maps[x], maps[y]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (364-384): CHC: Assertion violation happens here.
-// Warning 6328: (430-448): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_and_array_of_functions.sol b/test/libsolidity/smtCheckerTests/types/mapping_and_array_of_functions.sol
deleted file mode 100644
index 490bd552f817..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_and_array_of_functions.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping (address => function() internal returns (uint)) a;
-    mapping (address => function() external) b;
-    mapping (address => function() external[]) c;
-    function() external[] d;
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_as_local_var_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_as_local_var_1.sol
deleted file mode 100644
index c9d1e75d7625..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_as_local_var_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract c {
-	mapping(uint => uint) x;
-	mapping(uint => uint) y;
-	function f(bool cond) public {
-		mapping(uint => uint) storage a = cond ? x : y;
-		x[2] = 1;
-		y[2] = 2;
-		a[2] = 3;
-		// False positive since aliasing is not yet supported.
-		if (cond)
-			assert(a[2] == x[2] && a[2] != y[2]);
-		else
-			assert(a[2] == y[2] && a[2] != x[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (255-291): CHC: Assertion violation happens here.
-// Warning 6328: (303-339): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol
deleted file mode 100644
index 670b083544e6..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract c {
-	mapping(uint => uint) x;
-	function f(mapping(uint => uint) storage map, uint index, uint value) internal {
-		map[index] = value;
-	}
-	function g(uint a, uint b) public {
-		f(x, a, b);
-		// False positive since aliasing is not yet supported.
-		assert(x[a] == b);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (256-273): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol
deleted file mode 100644
index 746b67788848..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x, uint y) public view {
-		require(x == y);
-		assert(map[x] == map[y]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
deleted file mode 100644
index a246974e5e72..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	mapping (uint => uint) map;
-	function f(uint x, uint y) public view {
-		assert(x == y);
-		assert(map[x] == map[y]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (86-100): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol b/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol
deleted file mode 100644
index 88c07f1832a9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	struct S {
-		uint x;
-	}
-	mapping (uint => S) smap;
-	function f(uint y, uint v) public {
-		if (0==1)
-			smap[y] = S(v);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (108-112): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol
deleted file mode 100644
index 17f67b8a1eec..000000000000
--- a/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	mapping (string => uint) map;
-	function f(string memory s, uint x) public {
-		map[s] = x;
-		assert(x == map[s]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol b/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol
deleted file mode 100644
index 56864e315da2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract test {
-    struct s { uint a; uint b;}
-    function f() pure public returns (bytes1) {
-		s;
-		s(1,2);
-		s[7];
-		uint;
-		uint[7];
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (86-92): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6133: (98-99): Statement has no effect.
-// Warning 6133: (103-109): Statement has no effect.
-// Warning 6133: (113-117): Statement has no effect.
-// Warning 6133: (121-125): Statement has no effect.
-// Warning 6133: (129-136): Statement has no effect.
-// Warning 8364: (113-117): Assertion checker does not yet implement type type(struct test.s memory[7] memory)
-// Warning 8364: (129-136): Assertion checker does not yet implement type type(uint256[7] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/rational_large_1.sol b/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
deleted file mode 100644
index 0a011b44e7f9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract c {
-	function f() public pure returns (uint) {
-		uint x = 8e130%9;
-		assert(x == 8);
-		assert(x != 8);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (48-52): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (96-110): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_1.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_1.sol
deleted file mode 100644
index 21805a1d457b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	uint[][] a;
-	function f(uint[1] memory x) public {
-		a.push(x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol
deleted file mode 100644
index 1040f7cae63c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	uint[][] a;
-	function f(uint[1][] memory x) public {
-		require(x.length > 2);
-		a.push(x[2]);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol
deleted file mode 100644
index 37ef3158e1e8..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {
-	bytes16[] inner;
-	bytes32[][] data;
-	function t() public {
-		data.push(inner);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol
deleted file mode 100644
index f0049b3f3dce..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {
-	int16[] inner;
-	int[][] data;
-	function t() public {
-		data.push(inner);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
deleted file mode 100644
index f8f27898fbde..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(address[2] memory a) public pure {
-		assert(a.length == 2); // should hold
-		assert(a.length < 2); // should fail
-		assert(a.length > 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (102-122): CHC: Assertion violation happens here.
-// Warning 6328: (141-161): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
deleted file mode 100644
index bf643100d61d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() public pure returns (address[2] memory a) {
-		assert(a.length == 2); // should hold
-		assert(a.length < 2); // should fail
-		assert(a.length > 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (113-133): CHC: Assertion violation happens here.
-// Warning 6328: (152-172): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
deleted file mode 100644
index c2d26b45f35c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f() public pure {
-		address[2] memory a;
-		assert(a.length == 2); // should hold
-		assert(a.length < 2); // should fail
-		assert(a.length > 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (106-126): CHC: Assertion violation happens here.
-// Warning 6328: (145-165): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
deleted file mode 100644
index 287007762ea0..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	uint[2] a;
-	uint x = f();
-	constructor() {
-		assert(a.length == 2); // should hold
-		assert(x == 2); // should hold
-		assert(a.length < 2); // should fail
-		assert(a.length > 2); // should fail
-	}
-	function f() internal view returns (uint) {
-		assert(a.length == 2); // should hold
-		assert(a.length < 2); // should fail
-		assert(a.length > 2); // should fail
-		return a.length;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (132-152): CHC: Assertion violation happens here.
-// Warning 6328: (171-191): CHC: Assertion violation happens here.
-// Warning 6328: (298-318): CHC: Assertion violation happens here.
-// Warning 6328: (337-357): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
deleted file mode 100644
index 1319ca10df86..000000000000
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	uint[2] a;
-	function f() public view {
-		assert(a.length == 2); // should hold
-		assert(a.length < 2); // should fail
-		assert(a.length > 2); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (95-115): CHC: Assertion violation happens here.
-// Warning 6328: (134-154): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_1.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_1.sol
deleted file mode 100644
index e1523a38014d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_1.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C
-{
-    address a;
-    bool b;
-    uint c;
-    function f(uint x) public {
-        if (x == 0)
-        {
-            a = 0x0000000000000000000000000000000000000100;
-            b = true;
-        }
-        else
-        {
-            a = 0x0000000000000000000000000000000000000200;
-            b = false;
-        }
-        assert(a > 0x0000000000000000000000000000000000000000 && b);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (330-389): CHC: Assertion violation happens here.\nCounterexample:\na = 0x0200, b = false, c = 0\nx = 1\n\nTransaction trace:\nC.constructor()\nState: a = 0x0, b = false, c = 0\nC.f(1)
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol
deleted file mode 100644
index 6bda2d66b709..000000000000
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-    address a;
-    bool b;
-    uint c;
-    function f() public view {
-        assert(c > 0);
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (91-104): CHC: Assertion violation happens here.\nCounterexample:\na = 0x0, b = false, c = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0x0, b = false, c = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol
deleted file mode 100644
index 4fa609633b50..000000000000
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C
-{
-    function f(uint x) public {
-        if (x == 0)
-        {
-            a = 0x0000000000000000000000000000000000000100;
-            b = true;
-        }
-        else
-        {
-            a = 0x0000000000000000000000000000000000000200;
-            b = false;
-        }
-        assert(b == (a < 0x0000000000000000000000000000000000000200));
-    }
-
-    function g() public view {
-        require(a < 0x0000000000000000000000000000000000000100);
-        assert(c >= 0);
-    }
-    address a;
-    bool b;
-    uint c;
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol
deleted file mode 100644
index 2f3c977b48cb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-    function f() public view {
-        assert(c > 0);
-    }
-    uint c;
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (52-65): CHC: Assertion violation happens here.\nCounterexample:\nc = 0\n\nTransaction trace:\nC.constructor()\nState: c = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/string_1.sol b/test/libsolidity/smtCheckerTests/types/string_1.sol
deleted file mode 100644
index 8209f992805d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C
-{
-	function f(string memory s1, string memory s2) public pure {
-		assert(bytes(s1).length == bytes(s2).length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (77-121): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(s1, s2)
diff --git a/test/libsolidity/smtCheckerTests/types/string_2.sol b/test/libsolidity/smtCheckerTests/types/string_2.sol
deleted file mode 100644
index 633a0bcf0f48..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C
-{
-	function f() public pure {
-		string memory s = "Hello World";
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (43-58): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/string_length.sol b/test/libsolidity/smtCheckerTests/types/string_length.sol
deleted file mode 100644
index c6a1e8047d60..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_length.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function f() public pure {
-		string memory x = "Hello World";
-		assert(bytes(x).length == 11);
-	}
-	function g() public pure {
-		string memory x = unicode"Hello World";
-		assert(bytes(x).length == 11);
-	}
-	function h() public pure {
-		bytes memory x = unicode"Hello World";
-		string memory y = string(x);
-		assert(bytes(y).length == 11);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
deleted file mode 100644
index 0289de4bfd5f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bytes32 _x) public pure {
-		require(_x == "test");
-		bytes32 y = "test";
-		bytes16 z = "testz";
-		assert(_x == y);
-		assert(_x == z);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (142-157): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
deleted file mode 100644
index 65dc7cb20bb3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f(bytes32 _x) public pure {
-		require(_x == "test");
-		(bytes32 y, bytes16 z) = ("test", "testz");
-		assert(_x == y);
-		assert(_x == z);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (143-158): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
deleted file mode 100644
index 1c25ccb6a450..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(bytes32 _x) public pure {
-		require(_x == "test");
-		bytes32 y;
-		bytes16 z;
-		(y, z) = ("test", "testz");
-		assert(_x == y);
-		assert(_x == z);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (153-168): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
deleted file mode 100644
index 647c3ae248d1..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	function g() internal pure returns (bytes32, bytes16) {
-		return ("test", "testz");
-	}
-
-	function f(bytes32 _x) public pure {
-		require(_x == "test");
-		bytes32 y;
-		bytes16 z;
-		(y, z) = g();
-		assert(_x == y);
-		assert(_x == z);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (228-243): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
deleted file mode 100644
index 70ad2f57c524..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function g() internal pure returns (bytes32, bytes16) {
-		return ("test", "testz");
-	}
-
-	function f(bytes32 _x) public pure {
-		require(_x == "test");
-		(bytes32 y, bytes16 z) = g();
-		assert(_x == y);
-		assert(_x == z);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (218-233): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
deleted file mode 100644
index daec90a4d806..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f(bytes32 _x) public pure {
-		require(_x == "test");
-		bytes32 y = _x;
-		bytes32 z = _x;
-		assert(z == "test");
-		assert(y == "testx");
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (137-157): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol
deleted file mode 100644
index 81f513bd5d3e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(bytes32 _x) public pure {
-		require(_x != "test");
-		bytes32 y = _x;
-		bytes32 z = _x;
-		assert(z == "test");
-		assert(y != "testx");
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (114-133): CHC: Assertion violation happens here.
-// Warning 6328: (137-157): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol
deleted file mode 100644
index bc5ddf49ed7a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	function f() public pure {
-		S[] memory s1 = new S[](3);
-		assert(s1.length == 3);
-		s1[0].x = 2;
-		assert(s1[0].x == 2);
-		s1[1].t.y = 3;
-		assert(s1[1].t.y == 3);
-		s1[2].a = new uint[](3);
-		s1[2].a[2] = 4;
-		assert(s1[2].a[2] == 4);
-		s1[0].ts = new T[](6);
-		s1[0].ts[3].y = 5;
-		assert(s1[0].ts[3].y == 5);
-		s1[1].ts = new T[](6);
-		s1[1].ts[4].a = new uint[](6);
-		s1[1].ts[4].a[5] = 6;
-		assert(s1[1].ts[4].a[5] == 6);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 29 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
deleted file mode 100644
index 504d3ea54f9c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	function f(S memory s2) public pure {
-		S[] memory s1 = new S[](3);
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1.length == 3);
-		s1[0].x = 2;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1[0].x == s2.x);
-		s1[1].t.y = 3;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1[1].t.y == s2.t.y);
-		s1[2].a = new uint[](3);
-		s1[2].a[2] = 4;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1[2].a[2] == s2.a[2]);
-		s1[0].ts = new T[](4);
-		s1[0].ts[3].y = 5;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1[0].ts[3].y == s2.ts[3].y);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (151-162): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
deleted file mode 100644
index b2f7b9825c7d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	S[] s1;
-	function f() public {
-		s1.push();
-		s1.push();
-		s1.push();
-		s1[0].x = 2;
-		assert(s1[0].x == 2);
-		s1[1].t.y = 3;
-		assert(s1[1].t.y == 3);
-		s1[2].a.push();
-		s1[2].a.push();
-		s1[2].a.push();
-		s1[2].a[2] = 4;
-		assert(s1[2].a[2] == 4);
-		s1[0].ts.push();
-		s1[0].ts.push();
-		s1[0].ts.push();
-		s1[0].ts.push();
-		s1[0].ts.push();
-		s1[0].ts[3].y = 5;
-		assert(s1[0].ts[3].y == 5);
-		s1[1].ts.push();
-		s1[1].ts.push();
-		s1[1].ts.push();
-		s1[1].ts.push();
-		s1[1].ts.push();
-		s1[1].ts[4].a.push();
-		s1[1].ts[4].a.push();
-		s1[1].ts[4].a.push();
-		s1[1].ts[4].a.push();
-		s1[1].ts[4].a.push();
-		s1[1].ts[4].a.push();
-		s1[1].ts[4].a[5] = 6;
-		assert(s1[1].ts[4].a[5] == 6);
-		s1.pop();
-		s1.pop();
-		s1.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 51 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
deleted file mode 100644
index 007c451d58b9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	function f(S memory s1, S memory s2, bool b) public pure {
-		S memory s3 = b ? s1 : s2;
-		assert(s3.x == s1.x);
-		assert(s3.x == s2.x);
-		// This is safe.
-		assert(s3.x == s1.x || s3.x == s2.x);
-		// This fails as false positive because of lack of support to aliasing.
-		s3.x = 42;
-		assert(s3.x == s1.x || s3.x == s2.x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (176-196): CHC: Assertion violation happens here.
-// Warning 6328: (200-220): CHC: Assertion violation happens here.
-// Warning 6328: (370-406): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
deleted file mode 100644
index edb1e1b40b73..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    struct S {
-		uint sum;
-		uint[] a;
-    }
-
-	function f(S memory m, uint v) internal pure {
-		m.sum = v;
-		m.a = new uint[](2);
-	}
-
-	constructor(uint amt) {
-		S memory s;
-		f(s, amt);
-		assert(s.a.length == 2); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (201-224): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\ns = {sum: 0, a: []}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
deleted file mode 100644
index 28da837006fc..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    struct S {
-		uint sum;
-		uint[] a;
-    }
-
-	struct T {
-		S s;
-		uint x;
-	}
-
-	function f(S memory m, uint v) internal pure {
-		m.sum = v;
-		m.a = new uint[](2);
-	}
-
-	constructor(uint amt) {
-		T memory t;
-		f(t.s, amt);
-		assert(t.s.a.length == 2); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (236-261): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
deleted file mode 100644
index 36890f03eb25..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    struct S {
-		uint sum;
-		uint[] a;
-    }
-
-	struct T {
-		S s;
-		uint x;
-	}
-
-	function f(T memory m, uint v) internal pure {
-		m.s.sum = v;
-		m.s.a = new uint[](2);
-	}
-
-	constructor(uint amt) {
-		T memory t;
-		f(t, amt);
-		assert(t.s.a.length == 2); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (238-263): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
deleted file mode 100644
index df99f8a84b6d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    struct S {
-        mapping(address => uint) innerM;
-		uint sum;
-    }
-
-	function f(S storage m, address i, uint v) internal {
-		m.innerM[i] = v;
-		m.sum += v;
-	}
-
-	S s;
-
-	constructor(uint amt) {
-		f(s, msg.sender, amt);
-	}
-	function g() public view {
-		assert(s.sum == 0); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (270-288): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
deleted file mode 100644
index 69826238217c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    struct S {
-        mapping(address => uint) innerM;
-		uint sum;
-    }
-
-	function f(mapping(address => uint) storage innerM, address i, uint v) internal {
-		innerM[i] = v;
-	}
-
-	S s;
-
-	constructor(uint amt) {
-		f(s.innerM, msg.sender, amt);
-	}
-	function g() public view {
-		assert(s.innerM[msg.sender] == 0); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 11}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 11}\nC.g(){ msg.sender: 0x0985 }
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
deleted file mode 100644
index 416bd6109d93..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    struct S {
-        mapping(address => uint) innerM;
-		uint sum;
-    }
-
-	struct T {
-		uint x;
-		S s;
-	}
-
-	function f(T storage m, address i, uint v) internal {
-		m.s.innerM[i] = v;
-		m.s.sum += v;
-	}
-
-	T t;
-
-	constructor(uint amt) {
-		f(t, msg.sender, amt);
-	}
-	function g() public view {
-		assert(t.s.sum == 0); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (307-327): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
deleted file mode 100644
index 480753e28ea1..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    struct S {
-        mapping(address => uint) innerM;
-		uint sum;
-    }
-
-	struct T {
-		uint x;
-		S s;
-	}
-
-	function f(S storage m, address i, uint v) internal {
-		m.innerM[i] = v;
-		m.sum += v;
-	}
-
-	T t;
-
-	constructor(uint amt) {
-		f(t.s, msg.sender, amt);
-	}
-	function g() public view {
-		assert(t.s.sum == 0); // should hold but no aliasing support means it fails for now
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (305-325): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
deleted file mode 100644
index 3a8699bda721..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	S s1;
-	S s2;
-	function f(bool b) public {
-		S storage s3 = b ? s1 : s2;
-		// Disabled because Spacer 4.8.9 seg fauts.
-		//assert(s3.x == s1.x);
-		//assert(s3.x == s2.x);
-		// This is safe.
-		assert(s3.x == s1.x || s3.x == s2.x);
-		// This fails as false positive because of lack of support to aliasing.
-		s3.x = 42;
-		assert(s3.x == s1.x || s3.x == s2.x);
-	}
-	function g(bool b, uint _x) public {
-		if (b)
-			s1.x = _x;
-		else
-			s2.x = _x;
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (369-405): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol
deleted file mode 100644
index 3bcd573e37ed..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	function f() public pure {
-		S memory s1;
-		s1.x = 2;
-		assert(s1.x == 2);
-		s1.t.y = 3;
-		assert(s1.t.y == 3);
-		s1.a = new uint[](3);
-		s1.a[2] = 4;
-		assert(s1.a[2] == 4);
-		s1.ts = new T[](6);
-		s1.ts[3].y = 5;
-		assert(s1.ts[3].y == 5);
-		s1.ts[4].a = new uint[](6);
-		s1.ts[4].a[5] = 6;
-		assert(s1.ts[4].a[5] == 6);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 14 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
deleted file mode 100644
index d4acec19bb43..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	function f() public pure {
-		S memory s1;
-		s1.x = 2;
-		assert(s1.x != 2);
-		s1.t.y = 3;
-		assert(s1.t.y != 3);
-		s1.a = new uint[](3);
-		s1.a[2] = 4;
-		assert(s1.a[2] != 4);
-		s1.ts = new T[](6);
-		s1.ts[3].y = 5;
-		assert(s1.ts[3].y != 5);
-		s1.ts[4].a = new uint[](6);
-		s1.ts[4].a[5] = 6;
-		assert(s1.ts[4].a[5] != 6);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (196-213): CHC: Assertion violation happens here.
-// Warning 6328: (231-250): CHC: Assertion violation happens here.
-// Warning 6328: (293-313): CHC: Assertion violation happens here.
-// Warning 6328: (357-380): CHC: Assertion violation happens here.
-// Warning 6328: (435-461): CHC: Assertion violation happens here.
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol
deleted file mode 100644
index 50c3f1d7f8f2..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	function f(S memory s2) public pure {
-		S memory s1;
-		s1.x = 2;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1.x == s2.x);
-		s1.t.y = 3;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1.t.y == s2.t.y);
-		s1.a = new uint[](3);
-		s1.a[2] = 4;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1.a[2] == s2.a[2]);
-		s1.ts = new T[](6);
-		s1.ts[3].y = 5;
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(s1.ts[3].y == s2.ts[3].y);
-		s1.ts[4].a = new uint[](6);
-		s1.ts[4].a[5] = 6;
-		require(s2.ts.length > 4);
-		require(s2.ts[4].a.length > 6);
-		assert(s1.ts[4].a[5] == s2.ts[4].a[5]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (804-842): CHC: Assertion violation happens here.
-// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol
deleted file mode 100644
index 86db5aee22c7..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	S s1;
-	function f() public {
-		s1.x = 2;
-		assert(s1.x == 2);
-		s1.t.y = 3;
-		assert(s1.t.y == 3);
-		s1.a.push();
-		s1.a.push();
-		s1.a.push();
-		s1.a[2] = 4;
-		assert(s1.a[2] == 4);
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts[3].y = 5;
-		assert(s1.ts[3].y == 5);
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a[5] = 6;
-		assert(s1.ts[4].a[5] == 6);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 19 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
deleted file mode 100644
index cafc62759f3a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract C {
-	struct T {
-		uint y;
-		uint[] a;
-	}
-	struct S {
-		uint x;
-		T t;
-		uint[] a;
-		T[] ts;
-	}
-	S s1;
-	function f() public {
-		s1.x = 2;
-		assert(s1.x != 2);
-		s1.t.y = 3;
-		assert(s1.t.y != 3);
-		s1.a.push();
-		s1.a.push();
-		s1.a.push();
-		s1.a[2] = 4;
-		assert(s1.a[2] != 4);
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts.push();
-		s1.ts[3].y = 5;
-		assert(s1.ts[3].y != 5);
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a.push();
-		s1.ts[4].a[5] = 6;
-		assert(s1.ts[4].a[5] != 6);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (148-165): CHC: Assertion violation happens here.
-// Warning 6328: (183-202): CHC: Assertion violation happens here.
-// Warning 6328: (266-286): CHC: Assertion violation happens here.
-// Warning 6328: (404-427): CHC: Assertion violation happens here.
-// Warning 6328: (578-604): CHC: Assertion violation happens here.
-// Info 1391: CHC: 14 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
deleted file mode 100644
index 30d6da4a468e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma experimental SMTChecker;
-contract C {
-  struct S {
-    int a;
-    bytes5 b;
-  }
-  function f() public pure {
-    assert(S({a:2, b:""}).b == bytes5(0)); // should hold
-    assert(S({a:2, b:""}).a == 0); // should fail
-  }
-}
-// ----
-// Warning 5523: (0-31): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
-// Warning 6328: (178-207): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
deleted file mode 100644
index d52a71697790..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-
-	struct T {
-		S s;
-		uint y;
-	}
-
-	function test() pure public {
-		S memory inner = S({x: 43});
-		T memory outer = T({y: 512, s: inner});
-		assert(outer.y == 512);
-		assert(outer.s.x == 43);
-		assert(outer.s.x == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (232-255): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol
deleted file mode 100644
index 8383ef6d69ea..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-		uint y;
-		uint z;
-	}
-
-	function test() pure public {
-		S memory s = S({z: 1, y: 2, x: 3});
-		assert(s.x == 3);
-		assert(s.y == 2);
-		assert(s.z == 1);
-		assert(s.x == 0 || s.y == 0 || s.z == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (191-231): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol
deleted file mode 100644
index 71e29bd9eead..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Test {
-	struct RecursiveStruct {
-		RecursiveStruct[] vals;
-	}
-	function func() public pure {
-		RecursiveStruct[1] memory val = [ RecursiveStruct(new RecursiveStruct[](42)) ];
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2072: (104-133): Unused local variable.
-// Warning 8364: (138-180): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol
deleted file mode 100644
index 1b6dc3236ad9..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Test {
-	struct RecursiveStruct {
-		uint x;
-		RecursiveStruct[] vals;
-	}
-	function func() public pure {
-		RecursiveStruct memory val = RecursiveStruct(1, new RecursiveStruct[](42));
-		assert(val.x == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (114-140): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (143-188): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
-// Warning 7650: (199-204): Assertion checker does not yet support this expression.
-// Warning 8364: (199-202): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
-// Warning 6328: (192-210): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTest.constructor()\nTest.func()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
deleted file mode 100644
index 3653fa850a65..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	function f(S memory s1, S memory s2) public pure {
-		delete s1;
-		assert(s1.x == s2.x);
-		assert(s1.a.length == s2.a.length);
-		assert(s1.a.length == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (152-172): CHC: Assertion violation happens here.
-// Warning 6328: (176-210): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
deleted file mode 100644
index 12e38a41010b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	S s1;
-	function g(S memory s2) public {
-		s1.x = s2.x;
-		s1.a = s2.a;
-	}
-	function f(S memory s2) public {
-		delete s1;
-		assert(s1.x == s2.x);
-		assert(s1.a.length == s2.a.length);
-		assert(s1.a.length == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (208-228): CHC: Assertion violation happens here.
-// Warning 6328: (232-266): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol
deleted file mode 100644
index 494d2dcf2b6f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-struct S {
-    function() external returns (uint) x;
-}
-contract C {
-
-    function X() public pure returns (uint) {
-        return 1;
-    }
-
-    uint y;
-    uint z;
-
-    function setZ(uint _z) public {
-        z = _z;
-    }
-
-
-    function f() public returns (uint) {
-        S memory s;
-        s.x = this.X;
-        require(y == 0);
-        require(z == 0);
-        uint ret = s.x();
-        assert(y == 0); // should hold
-        assert(z == 0); // can report violation due to overapproximation after externall call s.x()
-        return ret;
-    }
-}
-
-
-// ----
-// Warning 6328: (431-445): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol
deleted file mode 100644
index 0ebb38c3d4eb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		mapping (uint => uint) m;
-	}
-	S s1;
-	S s2;
-	function f() public view {
-		// Disabled because Spacer 4.8.9 seg faults.
-		//assert(s1.m[0] == s2.m[0]);
-	}
-	function g(uint a, uint b) public {
-		s1.m[a] = b;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
deleted file mode 100644
index 0b04379fe522..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-
-	struct T {
-		S s;
-		uint y;
-	}
-
-	function test() pure public {
-		S memory inner = S(43);
-		T memory outer = T(inner, 512);
-		assert(outer.y == 512);
-		assert(outer.s.x == 43);
-		assert(outer.s.x == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (219-242): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol
deleted file mode 100644
index 03bc66617b0f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	struct B { uint b1; }
-	struct A { uint a1; B a2; }
-	function f() public pure {
-		A memory a = A({ a1: 1, a2: B({b1: 2}) });
-		assert(a.a1 == 1 && a.a2.b1 == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol
deleted file mode 100644
index 848b99045760..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-
-	struct T {
-		S s;
-		uint y;
-	}
-
-	function test() pure public {
-		assert(T(S(42), 1).s.x == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol
deleted file mode 100644
index 171eba091077..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f() public view {
-		assert(s1.x == s2.x);
-		assert(s1.a.length == s2.a.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (98-102): Assertion checker does not yet support this expression.
-// Warning 8364: (98-100): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (106-110): Assertion checker does not yet support this expression.
-// Warning 8364: (106-108): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (122-126): Assertion checker does not yet support this expression.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-141): Assertion checker does not yet support this expression.
-// Warning 8364: (137-139): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (91-111): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (115-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol
deleted file mode 100644
index f0d436c236f1..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol
+++ /dev/null
@@ -1,73 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f() public view {
-		assert(s1.x == s2.x);
-		assert(s1.a.length == s2.a.length);
-		assert(s1.a[0].x == s2.a[0].x);
-	}
-	function g() public {
-		s1.x = 42;
-		s2.x = 42;
-		s1.a.push();
-		s2.a.push();
-		s1.a[0].x = 43;
-		s2.a[0].x = 43;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (98-102): Assertion checker does not yet support this expression.
-// Warning 8364: (98-100): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (106-110): Assertion checker does not yet support this expression.
-// Warning 8364: (106-108): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (122-126): Assertion checker does not yet support this expression.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-141): Assertion checker does not yet support this expression.
-// Warning 8364: (137-139): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (160-169): Assertion checker does not yet support this expression.
-// Warning 7650: (160-164): Assertion checker does not yet support this expression.
-// Warning 8364: (160-162): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (160-167): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (173-182): Assertion checker does not yet support this expression.
-// Warning 7650: (173-177): Assertion checker does not yet support this expression.
-// Warning 8364: (173-175): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (173-180): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (213-217): Assertion checker does not yet support this expression.
-// Warning 8364: (213-215): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (213-217): Assertion checker does not support recursive structs.
-// Warning 7650: (226-230): Assertion checker does not yet support this expression.
-// Warning 8364: (226-228): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (226-230): Assertion checker does not support recursive structs.
-// Warning 7650: (239-243): Assertion checker does not yet support this expression.
-// Warning 8364: (239-241): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (239-250): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (239-243): Assertion checker does not support recursive structs.
-// Warning 7650: (254-258): Assertion checker does not yet support this expression.
-// Warning 8364: (254-256): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (254-265): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (254-258): Assertion checker does not support recursive structs.
-// Warning 7650: (269-278): Assertion checker does not yet support this expression.
-// Warning 7650: (269-273): Assertion checker does not yet support this expression.
-// Warning 8364: (269-271): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (269-276): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (269-278): Assertion checker does not support recursive structs.
-// Warning 7650: (287-296): Assertion checker does not yet support this expression.
-// Warning 7650: (287-291): Assertion checker does not yet support this expression.
-// Warning 8364: (287-289): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (287-294): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (287-296): Assertion checker does not support recursive structs.
-// Warning 6328: (91-111): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (115-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (160-167): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (173-180): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (153-183): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (269-276): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (287-294): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol
deleted file mode 100644
index 64396abcb9f0..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol
+++ /dev/null
@@ -1,143 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f() public view {
-		assert(s1.x == s2.x);
-		assert(s1.a.length == s2.a.length);
-		require(s1.a.length > 0);
-		require(s2.a.length > 0);
-		assert(s1.a[0].x == s2.a[0].x);
-		require(s1.a[0].a.length > 0);
-		require(s2.a[0].a.length > 0);
-		assert(s1.a[0].a.length == s2.a[0].a.length);
-		// Disabled because of Spacer killed.
-		//require(s1.a[0].a[0].a.length > 0);
-		//require(s2.a[0].a[0].a.length > 0);
-		//assert(s1.a[0].a[0].x == s2.a[0].a[0].x);
-	}
-	function g() public {
-		s1.x = 42;
-		s2.x = 42;
-		s1.a.push();
-		s2.a.push();
-		s1.a[0].x = 43;
-		s2.a[0].x = 43;
-		s1.a[0].a.push();
-		s2.a[0].a.push();
-		s1.a[0].a[0].x = 44;
-		s2.a[0].a[0].x = 44;
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (98-102): Assertion checker does not yet support this expression.
-// Warning 8364: (98-100): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (106-110): Assertion checker does not yet support this expression.
-// Warning 8364: (106-108): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (122-126): Assertion checker does not yet support this expression.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-141): Assertion checker does not yet support this expression.
-// Warning 8364: (137-139): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (161-165): Assertion checker does not yet support this expression.
-// Warning 8364: (161-163): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (189-193): Assertion checker does not yet support this expression.
-// Warning 8364: (189-191): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (216-225): Assertion checker does not yet support this expression.
-// Warning 7650: (216-220): Assertion checker does not yet support this expression.
-// Warning 8364: (216-218): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (216-223): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (229-238): Assertion checker does not yet support this expression.
-// Warning 7650: (229-233): Assertion checker does not yet support this expression.
-// Warning 8364: (229-231): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (229-236): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (251-260): Assertion checker does not yet support this expression.
-// Warning 7650: (251-255): Assertion checker does not yet support this expression.
-// Warning 8364: (251-253): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (251-258): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (284-293): Assertion checker does not yet support this expression.
-// Warning 7650: (284-288): Assertion checker does not yet support this expression.
-// Warning 8364: (284-286): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (284-291): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (316-325): Assertion checker does not yet support this expression.
-// Warning 7650: (316-320): Assertion checker does not yet support this expression.
-// Warning 8364: (316-318): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (316-323): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (336-345): Assertion checker does not yet support this expression.
-// Warning 7650: (336-340): Assertion checker does not yet support this expression.
-// Warning 8364: (336-338): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (336-343): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (549-553): Assertion checker does not yet support this expression.
-// Warning 8364: (549-551): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (549-553): Assertion checker does not support recursive structs.
-// Warning 7650: (562-566): Assertion checker does not yet support this expression.
-// Warning 8364: (562-564): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (562-566): Assertion checker does not support recursive structs.
-// Warning 7650: (575-579): Assertion checker does not yet support this expression.
-// Warning 8364: (575-577): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (575-586): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (575-579): Assertion checker does not support recursive structs.
-// Warning 7650: (590-594): Assertion checker does not yet support this expression.
-// Warning 8364: (590-592): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (590-601): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (590-594): Assertion checker does not support recursive structs.
-// Warning 7650: (605-614): Assertion checker does not yet support this expression.
-// Warning 7650: (605-609): Assertion checker does not yet support this expression.
-// Warning 8364: (605-607): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (605-612): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (605-614): Assertion checker does not support recursive structs.
-// Warning 7650: (623-632): Assertion checker does not yet support this expression.
-// Warning 7650: (623-627): Assertion checker does not yet support this expression.
-// Warning 8364: (623-625): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (623-630): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (623-632): Assertion checker does not support recursive structs.
-// Warning 7650: (641-650): Assertion checker does not yet support this expression.
-// Warning 7650: (641-645): Assertion checker does not yet support this expression.
-// Warning 8364: (641-643): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (641-648): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (641-657): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (641-650): Assertion checker does not support recursive structs.
-// Warning 7650: (661-670): Assertion checker does not yet support this expression.
-// Warning 7650: (661-665): Assertion checker does not yet support this expression.
-// Warning 8364: (661-663): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (661-668): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (661-677): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (661-670): Assertion checker does not support recursive structs.
-// Warning 7650: (681-695): Assertion checker does not yet support this expression.
-// Warning 7650: (681-690): Assertion checker does not yet support this expression.
-// Warning 7650: (681-685): Assertion checker does not yet support this expression.
-// Warning 8364: (681-683): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (681-688): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (681-693): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (681-695): Assertion checker does not support recursive structs.
-// Warning 7650: (704-718): Assertion checker does not yet support this expression.
-// Warning 7650: (704-713): Assertion checker does not yet support this expression.
-// Warning 7650: (704-708): Assertion checker does not yet support this expression.
-// Warning 8364: (704-706): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (704-711): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (704-716): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (704-718): Assertion checker does not support recursive structs.
-// Warning 6328: (91-111): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (115-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (216-223): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (229-236): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (209-239): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (251-258): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (284-291): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (316-323): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (336-343): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (309-353): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (605-612): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (623-630): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (641-648): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (661-668): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (681-688): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (681-693): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (704-711): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (704-716): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol
deleted file mode 100644
index ef60d1ba2f0d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f(bool b1, bool b2) public {
-		S storage s3 = b1 ? s1 : s2;
-		S storage s4 = b2 ? s1 : s2;
-		assert(s3.x == s1.x || s3.x == s2.x);
-		assert(s4.x == s1.x || s4.x == s2.x);
-		s3.x = 44;
-		// Fails as false positive because of lack of support to aliasing.
-		assert(s1.x == 44 || s2.x == 44);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (102-114): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (133-145): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (127-129): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (117-129): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 8364: (153-155): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (158-160): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (148-160): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (171-175): Assertion checker does not yet support this expression.
-// Warning 8364: (171-173): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (179-183): Assertion checker does not yet support this expression.
-// Warning 8364: (179-181): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (187-191): Assertion checker does not yet support this expression.
-// Warning 8364: (187-189): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (195-199): Assertion checker does not yet support this expression.
-// Warning 8364: (195-197): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (211-215): Assertion checker does not yet support this expression.
-// Warning 8364: (211-213): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (219-223): Assertion checker does not yet support this expression.
-// Warning 8364: (219-221): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (227-231): Assertion checker does not yet support this expression.
-// Warning 8364: (227-229): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (235-239): Assertion checker does not yet support this expression.
-// Warning 8364: (235-237): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (244-248): Assertion checker does not yet support this expression.
-// Warning 8364: (244-246): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 4375: (244-248): Assertion checker does not support recursive structs.
-// Warning 7650: (333-337): Assertion checker does not yet support this expression.
-// Warning 8364: (333-335): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (347-351): Assertion checker does not yet support this expression.
-// Warning 8364: (347-349): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (164-200): CHC: Assertion violation happens here.
-// Warning 6328: (204-240): CHC: Assertion violation happens here.
-// Warning 6328: (326-358): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
deleted file mode 100644
index ca7aee8f21fb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		S[] a;
-	}
-	S[] sa;
-	S[][] sa2;
-	function f() public {
-		sa.push();
-		sa2.push();
-		sa2[0].push();
-		sa2[0][0].a.push();
-		assert(sa2[0][0].a.length == sa[0].a.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8364: (93-102): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (120-133): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-148): Assertion checker does not yet support this expression.
-// Warning 8364: (137-146): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (137-155): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (137-148): Assertion checker does not support recursive structs.
-// Warning 7650: (166-177): Assertion checker does not yet support this expression.
-// Warning 8364: (166-175): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (188-195): Assertion checker does not yet support this expression.
-// Warning 8364: (188-193): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (159-203): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol
deleted file mode 100644
index d6ae281aa1aa..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f() public {
-		s1.x = 10;
-		++s1.x;
-		s1.x++;
-		s2.x = 20;
-		--s2.x;
-		s2.x--;
-		assert(s1.x == s2.x + 6);
-		assert(s1.a.length == s2.a.length);
-		delete s1;
-		assert(s1.x == 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (86-90): Assertion checker does not yet support this expression.
-// Warning 8364: (86-88): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (86-90): Assertion checker does not support recursive structs.
-// Warning 7650: (101-105): Assertion checker does not yet support this expression.
-// Warning 8364: (101-103): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (101-105): Assertion checker does not support recursive structs.
-// Warning 7650: (109-113): Assertion checker does not yet support this expression.
-// Warning 8364: (109-111): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (109-113): Assertion checker does not support recursive structs.
-// Warning 7650: (119-123): Assertion checker does not yet support this expression.
-// Warning 8364: (119-121): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (119-123): Assertion checker does not support recursive structs.
-// Warning 7650: (134-138): Assertion checker does not yet support this expression.
-// Warning 8364: (134-136): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (134-138): Assertion checker does not support recursive structs.
-// Warning 7650: (142-146): Assertion checker does not yet support this expression.
-// Warning 8364: (142-144): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (142-146): Assertion checker does not support recursive structs.
-// Warning 7650: (159-163): Assertion checker does not yet support this expression.
-// Warning 8364: (159-161): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (167-171): Assertion checker does not yet support this expression.
-// Warning 8364: (167-169): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (187-191): Assertion checker does not yet support this expression.
-// Warning 8364: (187-189): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (202-206): Assertion checker does not yet support this expression.
-// Warning 8364: (202-204): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (225-227): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (238-242): Assertion checker does not yet support this expression.
-// Warning 8364: (238-240): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4984: (99-105): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4984: (109-115): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 3944: (132-138): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 3944: (142-148): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4984: (167-175): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (152-176): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (180-214): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (231-248): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol
deleted file mode 100644
index 8305c25f7b0c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		T[] a;
-	}
-	struct T {
-		uint y;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f() public view {
-		assert(s1.x == s2.x);
-		assert(s1.a.length == s2.a.length);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (82-86): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (89-93): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (132-136): Assertion checker does not yet support this expression.
-// Warning 8364: (132-134): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (140-144): Assertion checker does not yet support this expression.
-// Warning 8364: (140-142): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (156-160): Assertion checker does not yet support this expression.
-// Warning 8364: (156-158): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (171-175): Assertion checker does not yet support this expression.
-// Warning 8364: (171-173): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (125-145): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (149-183): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol
deleted file mode 100644
index 9753466ac8a8..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol
+++ /dev/null
@@ -1,63 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		T[] a;
-	}
-	struct T {
-		uint y;
-		S[] a;
-	}
-	S s1;
-	S s2;
-	function f() public {
-		s1.a.push();
-		s2.a.push();
-		s1.a[0].a.push();
-		s2.a[0].a.push();
-		assert(s1.a[0].a[0].x == s2.a[0].a[0].x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 8115: (82-86): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (89-93): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (120-124): Assertion checker does not yet support this expression.
-// Warning 8364: (120-122): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (120-131): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 4375: (120-124): Assertion checker does not support recursive structs.
-// Warning 7650: (135-139): Assertion checker does not yet support this expression.
-// Warning 8364: (135-137): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (135-146): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 4375: (135-139): Assertion checker does not support recursive structs.
-// Warning 7650: (150-159): Assertion checker does not yet support this expression.
-// Warning 7650: (150-154): Assertion checker does not yet support this expression.
-// Warning 8364: (150-152): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (150-157): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (150-166): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (150-159): Assertion checker does not support recursive structs.
-// Warning 7650: (170-179): Assertion checker does not yet support this expression.
-// Warning 7650: (170-174): Assertion checker does not yet support this expression.
-// Warning 8364: (170-172): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (170-177): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (170-186): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (170-179): Assertion checker does not support recursive structs.
-// Warning 7650: (197-211): Assertion checker does not yet support this expression.
-// Warning 7650: (197-206): Assertion checker does not yet support this expression.
-// Warning 7650: (197-201): Assertion checker does not yet support this expression.
-// Warning 8364: (197-199): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (197-204): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (197-209): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (215-229): Assertion checker does not yet support this expression.
-// Warning 7650: (215-224): Assertion checker does not yet support this expression.
-// Warning 7650: (215-219): Assertion checker does not yet support this expression.
-// Warning 8364: (215-217): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (215-222): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (215-227): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6368: (150-157): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (170-177): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (197-204): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (197-209): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (215-222): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (215-227): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (190-230): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
deleted file mode 100644
index 200289f2d5dd..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	function s() internal pure returns (S memory s1) {
-		s1.x = 42;
-		s1.a = new uint[](5);
-		s1.a[2] = 43;
-	}
-	function f() public pure {
-		S memory s2 = s();
-		assert(s2.x == 42);
-		assert(s2.a[2] == 43);
-		assert(s2.a[3] == 43);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (256-277): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
deleted file mode 100644
index 7569a41165b3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-
-	S s = S(42);
-
-	function test() view public {
-		assert(s.x == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
deleted file mode 100644
index a0dcde7c7218..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	S s;
-	function p() public { s.a.push(); }
-	function f(uint _x) public {
-		require(s.a.length >= 2);
-		s.x = _x;
-		s.a[0] = _x;
-		assert(s.a[1] == s.a[0]);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (180-204): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
deleted file mode 100644
index 73e8e4e54b40..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	S s;
-	function f(uint _x) public {
-		s.a.pop();
-		s.a.length;
-		s.a.push();
-		s.x = _x;
-		s.a.pop();
-		s.a.push();
-		s.a.push();
-		s.a[0] = _x;
-		assert(s.a[1] == s.a[0]);
-		s.a.pop();
-		s.a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2529: (88-97): CHC: Empty array "pop" happens here.
-// Warning 6328: (197-221): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
deleted file mode 100644
index 1478e4524197..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	S s;
-	function f(uint _x) public {
-		s.x = _x;
-		s.a.pop();
-		s.a.push();
-		s.a.push();
-		s.a[0] = _x;
-		assert(s.a[1] == s.a[0]);
-		s.a.pop();
-		s.a.pop();
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 2529: (100-109): CHC: Empty array "pop" happens here.
-// Warning 6328: (156-180): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol
deleted file mode 100644
index 342efc4b1030..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-
-	struct S {
-		uint x;
-	}
-
-	function test() pure public {
-		assert(S(42).x == 42);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
deleted file mode 100644
index 99314c39ac7b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	function f(S memory s1, S memory s2) public pure {
-		delete s1;
-		s1.x++;
-		++s1.x;
-		assert(s1.x == 2);
-		assert(s1.x == s2.x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (193-213): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
deleted file mode 100644
index f58925201988..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-	struct S {
-		uint x;
-		uint[] a;
-	}
-	function f(S memory s1, S memory s2) public pure {
-		delete s1;
-		s1.x = 100;
-		s1.x--;
-		--s1.x;
-		assert(s1.x == 98);
-		assert(s1.x == s2.x);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (208-228): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_1.sol b/test/libsolidity/smtCheckerTests/types/struct_1.sol
deleted file mode 100644
index 84ad5004d3ea..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	struct S {
-		uint x;
-	}
-
-	mapping (uint => S) smap;
-
-	function f(uint y, uint v) public {
-		smap[y] = S(v);
-		S memory smem = S(v);
-		assert(smap[y].x == smem.x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol
deleted file mode 100644
index 979a72db2544..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	struct S { uint[] a; }
-	function f(bool b) public pure {
-		S memory c;
-		c.a = new uint[](2);
-		c.a[0] = 0;
-		if (b)
-			c.a[0] = 1;
-		else
-			c.a[0] = 2;
-		assert(c.a[0] > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
deleted file mode 100644
index 0d45aee14216..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	struct S { uint[][] a; }
-	function f(bool b) public pure {
-		S memory c;
-		c.a = new uint[][](1);
-		c.a[0] = new uint[](1);
-		c.a[0][0] = 0;
-		if (b)
-			c.a[0][0] = 1;
-		else
-			c.a[0][0] = 2;
-		assert(c.a[0][0] > 0);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (216-225): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
deleted file mode 100644
index 2d46a846d3fd..000000000000
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C
-{
-	struct S { uint[][][] a; }
-	function f(bool b) public pure {
-		S memory c;
-		c.a = new uint[][][](2);
-		assert(c.a.length == 2);
-		assert(c.a[0].length == 0);
-		c.a[0] = new uint[][](2);
-		assert(c.a[0].length == 2);
-		assert(c.a[0][0].length == 0);
-		c.a[0][0] = new uint[](2);
-		// Disabled because of Spacer's seg fault.
-		/*
-		if (b)
-			c.a[0][0][0] = 1;
-		else
-			c.a[0][0][0] = 2;
-		assert(c.a[0][0][0] > 0);
-		*/
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 5667: (53-59): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
deleted file mode 100644
index bc1b0141019b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function i() public pure returns (uint d) {
-		if (0==0)
-			(d) = 13;
-		assert(d == 13);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (64-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
deleted file mode 100644
index 0f3c4534597d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function i() public pure returns (uint d) {
-		if (0==0)
-			((d)) = 13;
-		assert(d == 13);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (64-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
deleted file mode 100644
index 103eccc9738f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function i() public pure returns (uint d) {
-		if (0==0)
-			(((((d))))) = 13;
-		assert(d == 13);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (64-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol
deleted file mode 100644
index 45a26a31ae2b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	int[] a;
-	function f() public { (a).pop();}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (46-55): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol
deleted file mode 100644
index a1946258e28c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	int[] a;
-	function f() public { (((((a))))).pop();}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 2529: (46-63): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol
deleted file mode 100644
index 9c8f8a4ee26b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function g() public pure {
-		uint x;
-		uint y;
-		(x, y) = (2, 4);
-		assert(x == 2);
-		assert(y == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol
deleted file mode 100644
index 69ef8ee7c866..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	uint[] a;
-	function p() public { a.push(); }
-	function g(uint x, uint y) public {
-		require(x < a.length);
-		require(y < a.length);
-		require(x != y);
-		(a[x], a[y]) = (2, 4);
-		assert(a[x] == 2);
-		assert(a[y] == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
deleted file mode 100644
index 79be48b3ae81..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C
-{
-	uint[] a;
-	function f(uint x) public {
-		a.push(x);
-	}
-	function g(uint x, uint y) public {
-		require(x < a.length);
-		require(y < a.length);
-		require(x != y);
-		(, a[y]) = (2, 4);
-		assert(a[x] == 2);
-		assert(a[y] == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (198-215): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
deleted file mode 100644
index 214c20d24db5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-	function f() public pure {
-		uint a = 1;
-		uint b = 3;
-		a += ((((b))));
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (89-103): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
deleted file mode 100644
index e9dd360c4992..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C
-{
-	function g() public pure {
-		uint x;
-		uint y;
-		(x, ) = (2, 4);
-		assert(x == 2);
-		assert(y == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol
deleted file mode 100644
index 574eb9e8780d..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-	function f(uint x) public pure returns (uint, uint) {
-		return (x, x);
-	}
-
-	function g() public pure {
-		(uint a, uint b) = f(0);
-		(uint c, uint d) = f(0);
-		assert(a == c && b == d);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol
deleted file mode 100644
index e3bb85849f86..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	function g() public pure {
-		(uint x, uint y) = (2, 4);
-		assert(x == 2);
-		assert(y == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol
deleted file mode 100644
index 206b201d3ff6..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function g() public pure {
-		(uint x, ) = (2, 4);
-		assert(x == 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol
deleted file mode 100644
index a28269eb29e0..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() internal pure returns (uint, bool, uint) {
-		uint x = 3;
-		bool b = true;
-		uint y = 999;
-		return (x, b, y);
-	}
-	function g() public pure {
-		(uint x, bool b, uint y) = f();
-		assert(x == 3);
-		assert(b);
-		assert(y == 999);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol
deleted file mode 100644
index 459fd6e21914..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C
-{
-	function f(uint x) internal pure returns (uint, bool, uint) {
-		bool b = true;
-		uint y = 999;
-		return (x * 2, b, y);
-	}
-	function g() public pure {
-		(uint x, bool b, uint y) = f(7);
-		assert(x == 14);
-		assert(b);
-		assert(y == 999);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol
deleted file mode 100644
index 1772aa995936..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C
-{
-	function f() internal pure returns (uint, bool, uint) {
-		uint x = 3;
-		bool b = true;
-		uint y = 999;
-		return (x, b, y);
-	}
-	function g() public pure {
-		(, bool b,) = f();
-		assert(!b);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (191-201): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
deleted file mode 100644
index f6541bc750d5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f() public pure returns(int) {
-		int a;
-		(,, a) = ((((((1, 3, (((((2)))))))))));
-		assert(a == 2);
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (47-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (125-139): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
deleted file mode 100644
index 7806cb60b250..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f() public pure returns(int) {
-		int a;
-		((,, a)) = ((((((1, 3, (((((2)))))))))));
-		assert(a == 2);
-		assert(a == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (47-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (127-141): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol
deleted file mode 100644
index b358a2032770..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f2() public pure returns(int) {
-		int a;
-		((, a)) = (1, 2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol
deleted file mode 100644
index cf34d34a8dad..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f2() public pure returns(int) {
-		int a;
-		(((, a),)) = ((1, 2), 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol
deleted file mode 100644
index 051c582de0eb..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f2() public pure returns(int) {
-		int a;
-		(((((((, a),)))))) = ((1, 2), 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol
deleted file mode 100644
index 7f7185b11652..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f2() public pure returns(int) {
-		int a;
-		((((((, a)))),)) = ((1, 2), 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol
deleted file mode 100644
index d757bebde040..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f2() public pure returns(int) {
-		int a;
-		((((((((((((, a))))))),))))) = ((1, 2), 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_6.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_6.sol
deleted file mode 100644
index 9426fa4a0b43..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_6.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f() public pure {
-		(((,))) = ((2),3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
deleted file mode 100644
index 7defe2cdf23a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function g() internal pure returns (uint, uint) {
-		return (2, 3);
-	}
-	function f() public {
-		(address(1).call(""));
-		(uint x, uint y) = ((g()));
-		assert(x == 2);
-		assert(y == 3);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function.sol b/test/libsolidity/smtCheckerTests/types/tuple_function.sol
deleted file mode 100644
index 97156f5cfb6f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_function.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() internal pure returns (uint, uint) {
-		return (2, 3);
-	}
-	function g() public pure {
-		uint x;
-		uint y;
-		(x,y) = f();
-		assert(x == 1);
-		assert(y == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (149-163): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (167-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
deleted file mode 100644
index 62b73e904a93..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f() internal pure returns (uint, uint) {
-		return (2, 3);
-	}
-	function g() public pure {
-		uint x;
-		uint y;
-		(x,) = f();
-		assert(x == 2);
-		assert(y == 4);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
deleted file mode 100644
index 0e0c7bded915..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	function f() internal pure returns (uint, bool, uint) {
-		return (2, false, 3);
-	}
-	function g() public pure {
-		uint x;
-		uint y;
-		bool b;
-		(,b,) = f();
-		assert(x == 2);
-		assert(y == 4);
-		assert(!b);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (172-186): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (190-204): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol b/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol
deleted file mode 100644
index 3336975637d5..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-	struct S { uint x; }
-
-	function g() internal pure returns (uint, S memory) {
-		return (2, S(3));
-	}
-	function f(uint a) public pure {
-		uint x;
-		S memory y;
-		if (a > 100) {
-			(x, y) = g();
-			assert(y.x == 3);
-		 }
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol
deleted file mode 100644
index 5501f7527015..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public pure {
-		(("", 2));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (43-52): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol
deleted file mode 100644
index a856d53d175b..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public pure {
-		(("", ""));
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (43-53): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol b/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol
deleted file mode 100644
index c02e0f786c3e..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public pure {
-		(2);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (43-46): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_tuple.sol b/test/libsolidity/smtCheckerTests/types/tuple_tuple.sol
deleted file mode 100644
index 73b30278bee1..000000000000
--- a/test/libsolidity/smtCheckerTests/types/tuple_tuple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f3() public pure {
-		((, ), ) = ((7, 8), 9);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol
deleted file mode 100644
index 081be39a4e32..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-
-function f() public pure { int[][]; }
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (41-48): Statement has no effect.
-// Warning 8364: (41-46): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (41-48): Assertion checker does not yet implement type type(int256[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol
deleted file mode 100644
index 1be4a781bdb4..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-
-function f() public pure { int[][][]; }
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (41-50): Statement has no effect.
-// Warning 8364: (41-46): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (41-48): Assertion checker does not yet implement type type(int256[] memory[] memory)
-// Warning 8364: (41-50): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol
deleted file mode 100644
index 0d525f50a857..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-
-function f() public pure { (int[][]); }
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (41-50): Statement has no effect.
-// Warning 8364: (42-47): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (42-49): Assertion checker does not yet implement type type(int256[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol
deleted file mode 100644
index 37540b98255a..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-
-function f() public pure { (int[][][]); }
-
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6133: (41-52): Statement has no effect.
-// Warning 8364: (42-47): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (42-49): Assertion checker does not yet implement type type(int256[] memory[] memory)
-// Warning 8364: (42-51): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol b/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol
deleted file mode 100644
index cd0d56506e7c..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-interface I1 {
-}
-
-interface I2 {
-	function f() external;
-}
-
-interface I3 {
-	function f() external;
-	function g(uint, address) external;
-}
-
-contract C {
-	function f() public pure {
-		assert(type(I1).interfaceId == 0);
-		assert(type(I2).interfaceId != 0);
-		assert(type(I2).interfaceId == 0x26121ff0);
-		assert(type(I2).interfaceId != 0);
-		assert(type(I3).interfaceId == 0x822b51c6);
-	}
-	function g() public pure {
-		assert(type(I1).interfaceId == type(I2).interfaceId);
-	}
-	function h() public pure {
-		assert(type(I2).interfaceId == type(I3).interfaceId);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (416-468): CHC: Assertion violation happens here.
-// Warning 6328: (503-555): CHC: Assertion violation happens here.
-// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol b/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol
deleted file mode 100644
index bd42eb72dbc3..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A {
-}
-
-contract C {
-	function f() public pure {
-		assert(bytes(type(C).name).length != 0);
-		assert(type(A).creationCode.length != 0);
-		assert(type(A).runtimeCode.length != 0);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 7507: (72-84): Assertion checker does not yet support this expression.
-// Warning 7507: (109-129): Assertion checker does not yet support this expression.
-// Warning 7507: (153-172): Assertion checker does not yet support this expression.
-// Warning 6328: (59-98): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (102-142): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (146-185): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/type_minmax.sol b/test/libsolidity/smtCheckerTests/types/type_minmax.sol
deleted file mode 100644
index da9bb1b6d15f..000000000000
--- a/test/libsolidity/smtCheckerTests/types/type_minmax.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-	function f(uint a) public pure {
-		assert(a <= type(uint).max);
-		assert(a >= type(uint).min);
-		require(a <= type(uint64).max);
-		assert(a <= type(uint64).max);
-		assert(a <= type(uint32).max);
-	}
-
-	function int_min() public pure {
-		int8 int8_min = type(int8).min;
-		assert(int8_min == -2**7);
-
-		int16 int16_min = type(int16).min;
-		assert(int16_min == -2**15);
-
-		int24 int24_min = type(int24).min;
-		assert(int24_min == -2**23);
-
-		int32 int32_min = type(int32).min;
-		assert(int32_min == -2**31);
-
-		int64 int64_min = type(int64).min;
-		assert(int64_min == -2**63);
-
-		int256 int256_min = type(int256).min;
-		assert(int256_min == -2**255);
-	}
-
-	function int_max() public pure {
-		int8 int8_max = type(int8).max;
-		assert(int8_max == 2**7-1);
-
-		int16 int16_max = type(int16).max;
-		assert(int16_max == 2**15-1);
-
-		int24 int24_max = type(int24).max;
-		assert(int24_max == 2**23-1);
-
-		int32 int32_max = type(int32).max;
-		assert(int32_max == 2**31-1);
-
-		int256 int256_max = type(int256).max;
-		assert(int256_max == 2**255-1);
-	}
-
-	function uint_min() public pure {
-		uint8 uint8_min = type(uint8).min;
-		assert(uint8_min == 0);
-
-		uint16 uint16_min = type(uint16).min;
-		assert(uint16_min == 0);
-
-		uint24 uint24_min = type(uint24).min;
-		assert(uint24_min == 0);
-
-		uint32 uint32_min = type(uint32).min;
-		assert(uint32_min == 0);
-
-		uint256 uint256_min = type(uint256).min;
-		assert(uint256_min == 0);
-	}
-
-	function uint_max() public pure {
-		uint8 uint8_max = type(uint8).max;
-		assert(uint8_max == 2**8-1);
-
-		uint16 uint16_max = type(uint16).max;
-		assert(uint16_max == 2**16-1);
-
-		uint24 uint24_max = type(uint24).max;
-		assert(uint24_max == 2**24-1);
-
-		uint32 uint32_max = type(uint32).max;
-		assert(uint32_max == 2**32-1);
-
-		uint256 uint256_max = type(uint256).max;
-		assert(uint256_max == 2**256-1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (178-207): CHC: Assertion violation happens here.
-// Info 1391: CHC: 24 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/unused_mapping.sol b/test/libsolidity/smtCheckerTests/types/unused_mapping.sol
deleted file mode 100644
index 889cf78a5623..000000000000
--- a/test/libsolidity/smtCheckerTests/types/unused_mapping.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	uint x;
-	uint y;
-	mapping (address => bool) public never_used;
-
-	function inc() public {
-		require(x < 10);
-		require(y < 10);
-
-		if(x == 0) x = 0; // noop state var read
-		x++;
-		y++;
-		// Commented out because of nondeterminism in Spacer in Z3 4.8.9
-		//assert(y == x);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol
deleted file mode 100644
index e9321b4607b0..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-  function f() public pure returns (uint y) {
-    unchecked{{
-        uint max = type(uint).max;
-        uint x = max + 1; // overflow not reported
-        y = x;
-    }}
-	assert(y == 0);
-  }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol b/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol
deleted file mode 100644
index b7d19c0bdfcf..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    uint public x = msg.value - 10; // can underflow
-    constructor() payable {}
-}
-
-contract D {
-	function h() internal returns (uint) {
-		return msg.value - 10; // can underflow
-	}
-    function f() public {
-        unchecked {
-            h(); // unchecked here does not mean h does not underflow
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 3944: (33-47): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }
-// Warning 3944: (160-174): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    D.h() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
deleted file mode 100644
index 9d8df15eb086..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function add(uint16 a, uint16 b) public pure returns (uint16) {
-        return a + b; // can overflow
-    }
-
-    function f(uint16 a, uint16 b, uint16 c) public pure returns (uint16) {
-        unchecked { return add(a, b) + c; } // add can still overflow, `+ c` can't
-    }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 65535) happens here.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol
deleted file mode 100644
index d60c50e97492..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    modifier add(uint16 a, uint16 b) {
-        unchecked { a + b; } // overflow not reported
-        _;
-    }
-
-    function f(uint16 a, uint16 b, uint16 c) public pure add(a, b) returns (uint16) {
-        return b + c; // can overflow
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (225-230): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65535\nb = 1\nc = 65535\n = 0\na = 65535\nb = 1\n\nTransaction trace:\nC.constructor()\nC.f(65535, 1, 65535)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
deleted file mode 100644
index 96b415010596..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    function f() public pure returns (bool) {
-        int256 x = -2**255;
-        unchecked { assert(-x == x); }
-        assert(-x == x); // CHC apparently does not create an underflow target for unary minus
-        return true;
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (110-125): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol b/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol
deleted file mode 100644
index 5af2a6d7adb0..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-	function o() public pure {
-		uint x = type(uint).max;
-		unchecked { ++x; }
-		assert(x == type(uint).min);
-	}
-
-	function u() public pure {
-		uint x = type(uint).min;
-		unchecked { --x; }
-		assert(x == type(uint).max);
-	}
-
-	function o_int() public pure {
-		int x = type(int).max;
-		unchecked { ++x; }
-		assert(x == type(int).min);
-	}
-
-	function u_int() public pure {
-		int x = type(int).min;
-		unchecked { --x; }
-		assert(x == type(int).max);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
deleted file mode 100644
index 9d04f9ed6a37..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f(int a, int b) public pure returns (int) {
-        return a % b; // can div by 0
-    }
-    function g(bool _check) public pure returns (int) {
-        int x = type(int).min;
-        if (_check) {
-            return x / -1; // can overflow
-        } else {
-            unchecked { return x / -1; } // overflow not reported
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (85-90): CHC: Division by zero happens here.
-// Warning 4984: (242-248): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol
deleted file mode 100644
index 12081e639fa0..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function add(uint16 a, uint16 b) public pure returns (uint16) {
-        unchecked {
-            return a + b; // overflow not reported
-        }
-    }
-
-    function f(uint16 a) public pure returns (uint16) {
-        return add(a, 0x100) + 0x100; // should overflow on `+ 0x100`
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4984: (240-261): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65024\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(65024)\n    C.add(65024, 256) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol
deleted file mode 100644
index cabf58251555..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function div(uint256 a, uint256 b) public pure returns (uint256) {
-        // Does not disable div by zero check
-        unchecked {
-            return a / b;
-        }
-    }
-
-    function mod(uint256 a, uint256 b) public pure returns (uint256) {
-        // Does not disable div by zero check
-        unchecked {
-            return a % b;
-        }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 4281: (169-174): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.div(0, 0)
-// Warning 4281: (349-354): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.mod(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol
deleted file mode 100644
index 5db44309d1d1..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-
-	modifier m() {
-		unchecked{}
-		_;
-	}
-
-	function t() m internal pure {}
-
-	function f() public pure {
-		unchecked { t(); }
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol
deleted file mode 100644
index ebb6912cfda4..000000000000
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f(uint x) internal pure {
-		unchecked {
-			uint y = x - 1;
-			assert(y < x); // should fail, underflow can happen, we are inside unchecked block
-		}
-	}
-	function g(uint x) public pure {
-		unchecked { f(x); }
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (85-98): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol b/test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol
deleted file mode 100644
index 4c7ded319892..000000000000
--- a/test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f(uint x, uint y) public pure {
-        assembly {}
-        assert(x < y);
-    }
-
-    function g(uint x, uint y) public pure {
-        assembly {}
-        assert(x < y);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTShowUnsupported: no
-// ----
-// Warning 5724: SMTChecker: 2 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
-// Warning 6328: (86-99): CHC: Assertion violation happens here.
-// Warning 6328: (181-194): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/constant.sol b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
deleted file mode 100644
index baba50d07d99..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/constant.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type T is int224;
-pragma solidity >= 0.0.0;
-contract C {
-	T constant public s = T.wrap(int224(165521356710917456517261742455526507355687727119203895813322792776));
-	T constant public t = s;
-	int224 constant public u = T.unwrap(t);
-
-	function f() public pure {
-		assert(T.unwrap(s) == 165521356710917456517261742455526507355687727119203895813322792776);
-		assert(T.unwrap(t) == 165521356710917456517261742455526507355687727119203895813322792776);
-		assert(u == 165521356710917456517261742455526507355687727119203895813322792776);
-		assert(T.unwrap(s) == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: no
-// ----
-// Warning 6328: (531-555): CHC: Assertion violation happens here.\nCounterexample:\nu = 165521356710917456517261742455526507355687727119203895813322792776\n\nTransaction trace:\nC.constructor()\nState: u = 165521356710917456517261742455526507355687727119203895813322792776\nC.f()
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
deleted file mode 100644
index 8aa3d9aed3d8..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-pragma abicoder v2;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-	function f(uint a) internal pure returns(MyUInt8) {
-		return MyUInt8.wrap(uint8(a));
-	}
-	function g(uint a) internal pure returns(MyInt8) {
-		return MyInt8.wrap(int8(int(a)));
-	}
-
-	function p() public pure {
-		assert(MyUInt8.unwrap(f(1)) == 1);
-		assert(MyUInt8.unwrap(f(2)) == 2);
-		assert(MyUInt8.unwrap(f(257)) == 1);
-		assert(MyUInt8.unwrap(f(257)) == 257); // should fail
-	}
-
-	function q() public pure {
-		assert(MyInt8.unwrap(g(1)) == 1);
-		assert(MyInt8.unwrap(g(2)) == 2);
-		assert(MyInt8.unwrap(g(255)) == -1);
-		assert(MyInt8.unwrap(g(257)) == 1);
-		assert(MyInt8.unwrap(g(257)) == -1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (428-465): CHC: Assertion violation happens here.
-// Warning 6328: (665-700): CHC: Assertion violation happens here.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
deleted file mode 100644
index cfc68b599316..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-pragma abicoder v2;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-	function h(MyUInt8 a) internal pure returns (MyInt8) {
-		return MyInt8.wrap(int8(MyUInt8.unwrap(a)));
-	}
-	function i(MyUInt8 a) internal pure returns(MyUInt16) {
-		return MyUInt16.wrap(MyUInt8.unwrap(a));
-	}
-
-	function r() public pure {
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(1))) == 1);
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(2))) == 2);
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == -1);
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == 1); // should fail
-	}
-
-	function s() public pure {
-		assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 250);
-		assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (497-545): CHC: Assertion violation happens here.
-// Warning 6328: (652-702): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
deleted file mode 100644
index ac70c80669a2..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma abicoder v2;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-	function j(MyUInt8 a) internal pure returns (uint) {
-		return MyUInt8.unwrap(a);
-	}
-	function k(MyUInt8 a) internal pure returns (MyUInt16) {
-		return MyUInt16.wrap(MyUInt8.unwrap(a));
-	}
-
-	function t() public pure {
-		assert(j(MyUInt8.wrap(1)) == 1);
-		assert(j(MyUInt8.wrap(2)) == 2);
-		assert(j(MyUInt8.wrap(255)) == 0xff);
-		assert(j(MyUInt8.wrap(255)) == 1); // should fail
-	}
-
-	function v() public pure {
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(1))) == 1);
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(2))) == 2);
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 0xff);
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (434-467): CHC: Assertion violation happens here.
-// Warning 6328: (679-729): CHC: Assertion violation happens here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
deleted file mode 100644
index 891148c681d0..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-pragma abicoder v2;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-	function m(MyUInt16 a) internal pure returns (MyUInt8) {
-		return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
-	}
-
-	function w() public pure {
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(1))) == 1);
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(2))) == 2);
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 0xff);
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (407-457): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
deleted file mode 100644
index 763a1196287c..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
+++ /dev/null
@@ -1,76 +0,0 @@
-// Represent a 18 decimal, 256 bit wide fixed point type using a user defined value type.
-type UFixed256x18 is uint256;
-
-/// A minimal library to do fixed point operations on UFixed256x18.
-library FixedMath {
-	uint constant multiplier = 10**18;
-	/// Adds two UFixed256x18 numbers. Reverts on overflow, relying on checked arithmetic on
-	/// uint256.
-	function add(UFixed256x18 a, UFixed256x18 b) internal pure returns (UFixed256x18) {
-		return UFixed256x18.wrap(UFixed256x18.unwrap(a) + UFixed256x18.unwrap(b));
-	}
-	/// Multiplies UFixed256x18 and uint256. Reverts on overflow, relying on checked arithmetic on
-	/// uint256.
-	function mul(UFixed256x18 a, uint256 b) internal pure returns (UFixed256x18) {
-		return UFixed256x18.wrap(UFixed256x18.unwrap(a) * b);
-	}
-	/// Take the floor of a UFixed256x18 number.
-	/// @return the largest integer that does not exceed `a`.
-	function floor(UFixed256x18 a) internal pure returns (uint256) {
-		return UFixed256x18.unwrap(a) / multiplier;
-	}
-	/// Turns a uint256 into a UFixed256x18 of the same value.
-	/// Reverts if the integer is too large.
-	function toUFixed256x18(uint256 a) internal pure returns (UFixed256x18) {
-		return UFixed256x18.wrap(a * multiplier);
-	}
-}
-
-contract TestFixedMath {
-	function add(UFixed256x18 a, UFixed256x18 b) internal pure returns (UFixed256x18) {
-		return FixedMath.add(a, b);
-	}
-	function mul(UFixed256x18 a, uint256 b) internal pure returns (UFixed256x18) {
-		return FixedMath.mul(a, b);
-	}
-	function floor(UFixed256x18 a) internal pure returns (uint256) {
-		return FixedMath.floor(a);
-	}
-	function toUFixed256x18(uint256 a) internal pure returns (UFixed256x18) {
-		return FixedMath.toUFixed256x18(a);
-	}
-
-	function f() public pure {
-		assert(UFixed256x18.unwrap(add(UFixed256x18.wrap(0), UFixed256x18.wrap(0))) == 0);
-		assert(UFixed256x18.unwrap(add(UFixed256x18.wrap(25), UFixed256x18.wrap(45))) == 0x46);
-		assert(UFixed256x18.unwrap(add(UFixed256x18.wrap(25), UFixed256x18.wrap(45))) == 46); // should fail
-	}
-
-	function g() public pure {
-		assert(UFixed256x18.unwrap(mul(UFixed256x18.wrap(340282366920938463463374607431768211456), 20)) == 6805647338418769269267492148635364229120);
-		assert(UFixed256x18.unwrap(mul(UFixed256x18.wrap(340282366920938463463374607431768211456), 20)) == 0); // should fail
-	}
-
-	function h() public pure {
-		assert(floor(UFixed256x18.wrap(11579208923731619542357098500868790785326998665640564039457584007913129639930)) == 11579208923731619542357098500868790785326998665640564039457);
-		assert(floor(UFixed256x18.wrap(115792089237316195423570985008687907853269984665640564039457584007913129639935)) == 115792089237316195423570985008687907853269984665640564039457);
-		assert(floor(UFixed256x18.wrap(11579208923731619542357098500868790785326998665640564039457584007913129639930)) == 0); // should fail
-	}
-
-	function i() public pure {
-		assert(UFixed256x18.unwrap(toUFixed256x18(0)) == 0);
-		assert(UFixed256x18.unwrap(toUFixed256x18(5)) == 5000000000000000000);
-		assert(UFixed256x18.unwrap(toUFixed256x18(115792089237316195423570985008687907853269984665640564039457)) == 115792089237316195423570985008687907853269984665640564039457000000000000000000);
-		assert(UFixed256x18.unwrap(toUFixed256x18(5)) == 5); // should fail
-	}
-
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (1886-1970): CHC: Assertion violation happens here.
-// Warning 6328: (2165-2266): CHC: Assertion violation happens here.
-// Warning 6328: (2675-2791): CHC: Assertion violation happens here.
-// Warning 6328: (3161-3212): CHC: Assertion violation happens here.
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
deleted file mode 100644
index ad4063182ade..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type MyInt is int;
-contract C {
-	function f() public pure returns (MyInt a) {
-		a = MyInt.wrap(5);
-		assert(MyInt.unwrap(a) == 5);
-		assert(MyInt.unwrap(a) == 6); // should fail
-	}
-
-	function g() public pure {
-		MyInt x = f();
-		assert(MyInt.unwrap(x) == 5);
-		assert(MyInt.unwrap(x) == 6); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (133-161): CHC: Assertion violation happens here.
-// Warning 6328: (261-289): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
deleted file mode 100644
index 713eb8ddbcec..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-type MyInt is int;
-contract C {
-	function f() public pure returns (MyInt a, int b) {
-		(MyInt).wrap;
-		a = (MyInt).wrap(5);
-		(MyInt).unwrap;
-		b = (MyInt).unwrap((MyInt).wrap(10));
-	}
-
-	function g() public pure {
-		(MyInt x, int y) = f();
-		assert(MyInt.unwrap(x) == 5);
-		assert(MyInt.unwrap(x) == 6); // should fail
-		assert(y == 10);
-		assert(y == 11); // should fail
-	}
-
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6133: (87-99): Statement has no effect.
-// Warning 6133: (126-140): Statement has no effect.
-// Warning 6328: (274-302): CHC: Assertion violation happens here.
-// Warning 6328: (340-355): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
deleted file mode 100644
index 100448cb06ed..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-type MyInt is int;
-contract C {
-    mapping(MyInt => int) m;
-	function f(MyInt a) public view {
-		assert(m[a] == 0); // should hold
-		assert(m[a] != 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreInv: yes
-// ----
-// Warning 6328: (134-151): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol b/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
deleted file mode 100644
index 8ff82e5149e1..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-type T1 is uint;
-type T2 is uint;
-
-contract C {
-	modifier m(T1 x, T2 y) {
-		require(T1.unwrap(x) == T2.unwrap(y));
-		_;
-	}
-
-	function f(uint x, uint y) m(T1.wrap(x), T2.wrap(y)) public pure {
-		assert(x == y);
-		assert(x != y); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (212-226): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/multisource.sol b/test/libsolidity/smtCheckerTests/userTypes/multisource.sol
deleted file mode 100644
index 3e7ff133d167..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/multisource.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: A ====
-type MyInt is int;
-type MyAddress is address;
-==== Source: B ====
-import {MyInt, MyAddress as OurAddress} from "A";
-contract A {
-	function f(int x) internal pure returns(MyInt) { return MyInt.wrap(x); }
-	function f(address x) internal pure returns(OurAddress) { return OurAddress.wrap(x); }
-
-	function g() public pure {
-		assert(MyInt.unwrap(f(int(5))) == 5);
-		assert(MyInt.unwrap(f(int(5))) == 0); // should fail
-		assert(OurAddress.unwrap(f(address(5))) == address(5));
-		assert(OurAddress.unwrap(f(address(5))) == address(0)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (B:296-332): CHC: Assertion violation happens here.
-// Warning 6328: (B:409-463): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
deleted file mode 100644
index f4300d252a07..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: s1.sol ====
-type MyInt is int;
-==== Source: s2.sol ====
-import "s1.sol" as M;
-contract C {
-	function f(int x) public pure returns (M.MyInt) { return M.MyInt.wrap(x); }
-	function g(M.MyInt x) public pure returns (int) { return M.MyInt.unwrap(x); }
-
-	function h() public pure {
-		assert(M.MyInt.unwrap(f(5)) == 5);
-		assert(M.MyInt.unwrap(f(5)) == 6); // should fail
-		assert(g(M.MyInt.wrap(1)) == 1);
-		assert(g(M.MyInt.wrap(1)) == 0); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (s2.sol:259-292): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:346-377): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/simple.sol b/test/libsolidity/smtCheckerTests/userTypes/simple.sol
deleted file mode 100644
index 1b0f6e1fe459..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/simple.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type MyInt is int;
-contract C {
-	function f() internal pure returns (MyInt a) {
-	}
-	function g() internal pure returns (MyInt b, MyInt c) {
-		b = MyInt.wrap(int(1));
-		c = MyInt.wrap(1);
-	}
-
-	function h() public pure {
-		assert(MyInt.unwrap(f()) == 0);
-		assert(MyInt.unwrap(f()) == 1); // should fail
-		(MyInt x, MyInt y) = g();
-		assert(MyInt.unwrap(x) == 1);
-		assert(MyInt.unwrap(x) == 0); // should fail
-		assert(MyInt.unwrap(y) == 1);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (255-285): CHC: Assertion violation happens here.
-// Warning 6328: (364-392): CHC: Assertion violation happens here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
deleted file mode 100644
index 3958436041c0..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-type T is uint;
-
-contract C {
-	function f(bytes memory data) public pure {
-		T x = abi.decode(data, (T));
-		uint y = abi.decode(data, (uint));
-		assert(T.unwrap(x) == y); // should hold
-		assert(T.unwrap(x) != y); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (188-212): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
deleted file mode 100644
index e41c76539aeb..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-type T is uint;
-
-contract C {
-	function f(bytes memory data) public pure {
-		T x = abi.decode(data, (T));
-		T y = abi.decode(data, (T));
-		assert(T.unwrap(x) == T.unwrap(y)); // should hold
-		assert(T.unwrap(x) != T.unwrap(y)); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (192-226): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
deleted file mode 100644
index 5336f752ef19..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    type T is address;
-    T[] arr;
-
-    function p() public {
-        arr.push(T.wrap(address(42)));
-    }
-
-    function inv(uint i) external view {
-        require(i < arr.length);
-        assert(T.unwrap(arr[i]) == address(42)); // should hold
-    }
-}
-// ====
-// SMTIgnoreOS: macos
-// ----
-// Warning 6328: (204-243): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (204-243): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
deleted file mode 100644
index 84202b69c561..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    type T is address;
-    T[] arr;
-
-    function p() public {
-        arr.push(T.wrap(address(42)));
-    }
-
-    function inv2() external view {
-        if (arr.length > 0) {
-            assert(T.unwrap(arr[0]) == address(0)); // should fail
-        }
-    }
-}
-// ----
-// Warning 6328: (200-238): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
deleted file mode 100644
index 64a89d1f01ff..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-type T is bool;
-library L{
-    T constant c = T.wrap(true);
-    uint constant z = 42;
-}
-T constant g = T.wrap(true);
-
-contract C {
-    T constant b = T.wrap(true);
-    uint constant X = 42;
-
-    function f() external pure {
-        T x = T.wrap(true);
-        assert(T.unwrap(x)); // should hold
-
-        assert(L.z == 42); // should hold
-        assert(T.unwrap(L.c)); // should hold
-
-        assert(T.unwrap(g)); // should hold
-
-        assert(C.X == 42); // should hold
-        assert(T.unwrap(b)); // should hold
-        assert(T.unwrap(C.b)); // should hold
-    }
-}
-// ----
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol
deleted file mode 100644
index 5b7ebe2570fd..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-type T is bool;
-library L{
-    T constant c = T.wrap(false);
-    uint constant z = 43;
-}
-T constant g = T.wrap(false);
-
-contract C {
-    T constant b = T.wrap(false);
-    uint constant X = 43;
-
-    function f() external pure {
-        T x = T.wrap(false);
-        assert(T.unwrap(x)); // should fail
-
-        assert(L.z == 42); // should fail
-        assert(T.unwrap(L.c)); // should fail
-
-        assert(T.unwrap(g)); // should fail
-
-        assert(C.X == 42); // should fail
-        assert(T.unwrap(b)); // should fail
-        assert(T.unwrap(C.b)); // should fail
-    }
-}
-// ----
-// Warning 6328: (264-283): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
-// Warning 6328: (309-326): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
-// Warning 6328: (351-372): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
-// Warning 6328: (398-417): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
-// Warning 6328: (443-460): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
-// Warning 6328: (485-504): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
-// Warning 6328: (529-550): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
deleted file mode 100644
index 6761ca6f3ed9..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    type T is bool;
-    mapping (T => uint) s;
-
-    constructor() {
-        s[C.T.wrap(true)] = 42;
-        s[C.T.wrap(false)] = 2;
-    }
-
-    function f(bool b) external view {
-        assert(s[C.T.wrap(b)] > 0); // should hold
-    }
-
-    function g(T b) external view {
-        require(C.T.unwrap(b));
-        assert(s[b] == 2); // should fail
-    }
-}
-// ----
-// Warning 6328: (325-342): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
deleted file mode 100644
index 11e0212ce51b..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    type T is address;
-    mapping (T => uint) s;
-
-    constructor() {
-        s[T.wrap(address(0))] = 42;
-    }
-
-    function f(address a) external view {
-        require(a != address(0));
-        assert(s[C.T.wrap(a)] == 0); // should hold
-    }
-
-    function g(T a) external view {
-        require(C.T.unwrap(a) == address(0));
-        assert(s[a] != 42); // should fail
-    }
-}
-// ----
-// Warning 6328: (352-370): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
deleted file mode 100644
index 8d2b990dff44..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    type T is address;
-
-    struct S {
-        T a;
-        uint x;
-    }
-
-    mapping (T => S) m;
-
-    constructor() {
-        m[T.wrap(address(0))] = S(T.wrap(address(0)), 0);
-    }
-
-    function set(address _a) external {
-        m[T.wrap(_a)] = S(T.wrap(_a), 0);
-    }
-
-    function inv(T t) external view {
-        assert( // should hold
-            T.unwrap(m[t].a) == T.unwrap(t) ||
-            T.unwrap(m[t].a) == address(0)
-        );
-    }
-}
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol b/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
deleted file mode 100644
index 1747c3529c01..000000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-	type T is uint;
-}
-contract D {
-	function f(C.T x) internal pure returns(uint) {
-		return C.T.unwrap(x);
-	}
-	function g(uint x) internal pure returns(C.T) {
-		return C.T.wrap(x);
-	}
-	function h(uint x) internal pure returns(uint) {
-		return f(g(x));
-	}
-	function i(C.T x) internal pure returns(C.T) {
-		return g(f(x));
-	}
-
-	function m() public pure {
-		assert(f(C.T.wrap(0x42)) == 0x42);
-		assert(f(C.T.wrap(0x42)) == 0x43); // should fail
-		assert(C.T.unwrap(g(0x42)) == 0x42);
-		assert(C.T.unwrap(g(0x42)) == 0x43); // should fail
-		assert(h(0x42) == 0x42);
-		assert(h(0x42) == 0x43); // should fail
-		assert(C.T.unwrap(i(C.T.wrap(0x42))) == 0x42);
-		assert(C.T.unwrap(i(C.T.wrap(0x42))) == 0x43); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (403-436): CHC: Assertion violation happens here.
-// Warning 6328: (494-529): CHC: Assertion violation happens here.
-// Warning 6328: (575-598): CHC: Assertion violation happens here.
-// Warning 6328: (666-711): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol
deleted file mode 100644
index 9511566b0133..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        if (x >= 0) { revert(); }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (62-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol
deleted file mode 100644
index f3e14f241f73..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        if (x >= 10) { if (x < 10) { revert(); } }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (77-83): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_3.sol b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_3.sol
deleted file mode 100644
index 6dfcaff77557..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// a plain literal constant is fine
-contract C {
-    function f(uint) public pure {
-        if (true) { revert(); }
-    }
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/verification_target/no_target_for_abstract_constract.sol b/test/libsolidity/smtCheckerTests/verification_target/no_target_for_abstract_constract.sol
deleted file mode 100644
index edaab9cba109..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/no_target_for_abstract_constract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-	function f() public pure {
-		assert(false); // A cannot be deployed so this should not be reported
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/verification_target/no_target_for_constructor_of_abstract_constract.sol b/test/libsolidity/smtCheckerTests/verification_target/no_target_for_constructor_of_abstract_constract.sol
deleted file mode 100644
index 90f99269810e..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/no_target_for_constructor_of_abstract_constract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-	constructor() {
-		assert(false); // A cannot be deployed, so this should not be reported
-	}
-}
-// ====
-// SMTEngine: all
-// ----
diff --git a/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol b/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol
deleted file mode 100644
index 1d9476869be8..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint a) public pure { assert(a == 2); }
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (50-64): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol b/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol
deleted file mode 100644
index 980cab8eb4e5..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint a) public pure { require(a < 10); assert(a < 20); }
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol b/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol
deleted file mode 100644
index b63801cfa8e7..000000000000
--- a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	function f(uint a) public pure {
-		require(a < 10, "Input number is too large.");
-		assert(a < 20);
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol
deleted file mode 100644
index c59b1b3f7ffe..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-error E(uint);
-
-function f() {
-    abi.encodeCall(E, (1));
-}
-// ----
-// TypeError 3509: (50-51): Expected regular external function type, or external view on public function. Cannot use errors for abi.encodeCall.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol
deleted file mode 100644
index 39930125bcc9..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-    event E(uint);
-}
-
-function f() {
-    abi.encodeCall(L.E, (1));
-}
-// ----
-// TypeError 3509: (68-71): Expected regular external function type, or external view on public function. Cannot use events for abi.encodeCall.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol
deleted file mode 100644
index 5567810f427e..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-function g(uint) {}
-
-function f() {
-    abi.encodeCall(g, (1));
-}
-// ----
-// TypeError 3509: (55-56): Expected regular external function type, or external view on public function. Provided internal function.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol
deleted file mode 100644
index ed2e02a11b74..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-    function g() external {}
-}
-
-function f() {
-    abi.encodeCall(L.g, (1));
-}
-// ----
-// TypeError 3509: (78-81): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol
deleted file mode 100644
index 955cea06abcd..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function f0() public {}
-    function f2(uint, uint) public {}
-
-    function h() public view {
-        uint a;
-        uint b;
-
-        abi.encodeCall(this.f0, () = g0());
-        abi.encodeCall(this.f0, () = ());
-        abi.encodeCall(this.f2, (a, b) = g2());
-        abi.encodeCall(this.f2, (a, b) = (2, 3));
-    }
-}
-// ----
-// TypeError 5547: (284-286): Empty tuple on the left hand side.
-// TypeError 9062: (284-293): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 5547: (328-330): Empty tuple on the left hand side.
-// TypeError 9062: (328-335): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (370-383): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (418-433): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol
deleted file mode 100644
index 3b8b549ba7c9..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function f0() public {}
-    function f2(uint, uint) public {}
-
-    function h() public view {
-        abi.encodeCall(this.f0, true ? g0() : g0());
-        abi.encodeCall(this.f2, true ? g2() : g2());
-        abi.encodeCall(this.f2, true ? (1, 2) : (3, 4));
-    }
-}
-// ----
-// TypeError 9062: (251-269): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (304-322): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (357-379): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
deleted file mode 100644
index c96b82909921..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    event Ev();
-    error Er();
-
-    function f0() public {}
-
-    function h() public view {
-        abi.encodeCall(this.f0, Ev());
-        abi.encodeCall(this.f0, Er());
-        abi.encodeCall(this.f0, revert());
-    }
-}
-// ----
-// TypeError 9062: (138-142): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (177-181): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (216-224): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
deleted file mode 100644
index f6035dd0af33..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    event Ev();
-    error Er();
-
-    function g0() internal pure {}
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function f0() public {}
-    function f2(uint, uint) public {}
-
-    function h() public view {
-        abi.encodeCall(this.f2, (1, 1) + (2, 2));
-        abi.encodeCall(this.f0, Ev() / Er());
-        abi.encodeCall(this.f0, !());
-    }
-}
-// ----
-// TypeError 2271: (284-299): Built-in binary operator + cannot be applied to types tuple(int_const 1,int_const 1) and tuple(int_const 2,int_const 2).
-// TypeError 9062: (284-299): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 2271: (334-345): Built-in binary operator / cannot be applied to types tuple() and tuple().
-// TypeError 9062: (334-345): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 4907: (380-383): Built-in unary operator ! cannot be applied to type tuple().
-// TypeError 9062: (380-383): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol
deleted file mode 100644
index ddb4934c4f6f..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function f0() public {}
-    function f2(uint, uint) public {}
-
-    function h() public view {
-        abi.encodeCall(this.f0, g0());
-        abi.encodeCall(this.f2, g2());
-
-        abi.encodeCall(this.f0, (g0()));
-        abi.encodeCall(this.f2, (g2()));
-    }
-}
-// ----
-// TypeError 9062: (251-255): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 9062: (290-294): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 6473: (331-335): Tuple component cannot be empty.
-// TypeError 7788: (306-337): Expected 0 instead of 1 components for the tuple parameter.
-// TypeError 7788: (347-378): Expected 2 instead of 1 components for the tuple parameter.
-// TypeError 5407: (372-376): Cannot implicitly convert component at position 0 from "tuple(uint256,uint256)" to "uint256".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol
deleted file mode 100644
index 06bb65075131..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-
-    function f1(uint) public {}
-
-    function h() public view {
-        uint a;
-
-        abi.encodeCall(this.f1, (a) = g1());
-        abi.encodeCall(this.f1, (a) = (1));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol
deleted file mode 100644
index 518d8d32f0ca..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-
-    function f1(uint) public {}
-
-    function h() public view {
-        abi.encodeCall(this.f1, true ? (1) : (2));
-        abi.encodeCall(this.f1, true ? g1() : g1());
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol
deleted file mode 100644
index 6308ce8f18df..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function f1(uint) public {}
-    function f2(uint, uint) public {}
-
-    function h() public view {
-        abi.encodeCall(this.f1, g1());
-        abi.encodeCall(this.f1, (g1()));
-        abi.encodeCall(this.f2, (g1(), g1()));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol
deleted file mode 100644
index 71047858029a..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-interface testInterface {
-    function C(function (string memory) external) external;
-    function D(string calldata) external;
-    function E(string memory) external;
-    function F(address) external;
-}
-
-contract testContract {
-    function g(string calldata) external {}
-    function h(string memory) external {}
-    function i(string calldata str) external {
-        this.h(str);
-        this.g(str);
-    }
-    function j(string memory str) external {
-        this.h(str);
-        this.g(str);
-    }
-    function k(string memory str) external pure {
-        abi.encodeCall(testInterface.D, (str));
-    }
-    string s;
-
-    function main() external view {
-        abi.encodeCall(testInterface.C, (this.g));
-        abi.encodeCall(testInterface.C, (this.h));
-        abi.encodeCall(testInterface.D, (s));
-        abi.encodeCall(testInterface.E, (s));
-        abi.encodeCall(testInterface.F, (payable(address(0))));
-        abi.encodeCall(this.i, (s));
-        abi.encodeCall(this.j, (s));
-    }
-}
-// ----
-// Warning 6133: (860-914): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
deleted file mode 100644
index b5d53142c7ea..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface testInterface {
-    function A(address payable) external;
-}
-
-contract testContract {
-    function main() external view {
-        abi.encodeCall(testInterface.A, (address(0)));
-    }
-}
-// ----
-// TypeError 5407: (171-183): Cannot implicitly convert component at position 0 from "address" to "address payable".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
deleted file mode 100644
index 242eb61c7998..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-interface testInterface {
-    function B(function (string calldata) external) external;
-}
-
-contract testContract {
-    function g(string calldata) external {}
-    function h(string memory) external {}
-
-    function main() external view {
-        abi.encodeCall(testInterface.B, (this.g));
-        abi.encodeCall(testInterface.B, (this.h));
-    }
-}
-// ----
-// TypeError 5407: (278-286): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
-// TypeError 5407: (329-337): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol
deleted file mode 100644
index da81a3bc6682..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma abicoder               v2;
-pragma abicoder v1;
-// ----
-// SyntaxError 3845: (34-53): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol
deleted file mode 100644
index f06b2458c36d..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma abicoder v1;
-pragma abicoder v2;
-// ----
-// SyntaxError 3845: (20-39): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse_experimental.sol b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse_experimental.sol
deleted file mode 100644
index 855378e9ef60..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse_experimental.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma abicoder v1;
-pragma experimental ABIEncoderV2;
-// ----
-// SyntaxError 8273: (20-53): ABI coder v1 has already been selected through "pragma abicoder v1".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
deleted file mode 100644
index 9c82812e9663..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct T { mapping(uint => uint) a; }
-    struct S { T[][2] b; }
-    function f(S memory) public {}
-}
-// ----
-// TypeError 4103: (132-140): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol
deleted file mode 100644
index ad46b4abe103..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S { function() internal a; }
-    function f(S[2] memory) public {}
-}
-// ----
-// TypeError 4103: (89-100): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol
deleted file mode 100644
index ca0610e697af..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    struct S { function() internal[2] a; }
-    function f(S memory) public {}
-}
-// ----
-// TypeError 4103: (92-100): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol
deleted file mode 100644
index 6dff9d8b2bb3..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { function() internal a; }
-    function f(S memory) public {}
-}
-// ----
-// TypeError 4103: (103-111): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
deleted file mode 100644
index 144962c2a0c0..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { mapping(uint => uint) a; }
-    function f(S memory) public {}
-}
-// ----
-// TypeError 4103: (105-113): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol b/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol
deleted file mode 100644
index cbfa03b3f0e5..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma abicoder something;
-// ----
-// SyntaxError 2745: (0-26): Expected either "pragma abicoder v1" or "pragma abicoder v2".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/overloaded_external_functions_taking_different_structs.sol b/test/libsolidity/syntaxTests/abiEncoder/overloaded_external_functions_taking_different_structs.sol
deleted file mode 100644
index 9bc0471bc4bc..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/overloaded_external_functions_taking_different_structs.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S1 { function() external a; }
-    struct S2 { bytes24 a; }
-    function f(S1 memory) public pure {}
-    function f(S2 memory) public pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/overloaded_external_functions_taking_identical_structs.sol b/test/libsolidity/syntaxTests/abiEncoder/overloaded_external_functions_taking_identical_structs.sol
deleted file mode 100644
index f750fae391fb..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/overloaded_external_functions_taking_identical_structs.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S1 { int i; }
-    struct S2 { int i; }
-    function f(S1 memory) public pure {}
-    function f(S2 memory) public pure {}
-}
-// ----
-// TypeError 9914: (143-179): Function overload clash during conversion to external types for arguments.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol b/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol
deleted file mode 100644
index 0303bcb14900..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma experimental ABIEncoderV2;
-pragma abicoder v2;
-// ----
-// SyntaxError 3845: (34-53): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/select_v1.sol b/test/libsolidity/syntaxTests/abiEncoder/select_v1.sol
deleted file mode 100644
index 1beb5f0ec7a6..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/select_v1.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-pragma abicoder v1;
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/select_v1_quoted_string.sol b/test/libsolidity/syntaxTests/abiEncoder/select_v1_quoted_string.sol
deleted file mode 100644
index a6c26efdc7e9..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/select_v1_quoted_string.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-pragma abicoder "v1";
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/select_v2_quoted_string.sol b/test/libsolidity/syntaxTests/abiEncoder/select_v2_quoted_string.sol
deleted file mode 100644
index 9a71ec4c16fa..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/select_v2_quoted_string.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-pragma abicoder "v2";
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol b/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol
deleted file mode 100644
index 424c2c7f2b89..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma abicoder v1;
-pragma abicoder v1;
-// ----
-// SyntaxError 3845: (20-39): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/selected_twice_v2.sol b/test/libsolidity/syntaxTests/abiEncoder/selected_twice_v2.sol
deleted file mode 100644
index 0b296da3a86a..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/selected_twice_v2.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma abicoder v2;
-pragma experimental ABIEncoderV2;
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol
deleted file mode 100644
index f324d2c33e30..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder v1;
-struct Item {
-    uint x;
-    uint y;
-}
-
-contract D {
-    Item[][][] public items;
-
-    function test() public view returns (uint) {
-        // The autogenerated getters to not use ABI encoder.
-        (uint a, uint b) = this.items(1, 2, 3);
-        return a + b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol
deleted file mode 100644
index feaf895e17ee..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v1;
-struct Item {
-    uint x;
-    uint y;
-}
-
-contract D {
-    Item[][][] public items;
-
-    function test() public view returns (uint) {
-        // The autogenerated getters to not use ABI encoder.
-        Item memory item = this.items(1, 2, 3);
-        return item.x + item.y;
-    }
-}
-// ----
-// TypeError 7364: (222-260): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 9574: (222-260): Type uint256 is not implicitly convertible to expected type struct Item memory.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol
deleted file mode 100644
index b21b7cfaff5e..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-
-    function set(Item storage _item) external view {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    L.Item item;
-
-    function foo() public view {
-        L.set(item);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
deleted file mode 100644
index 3ee6f75a17b9..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    constructor(Item memory _item) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public {
-        new C(C.Item(5));
-    }
-}
-// ----
-// TypeError 2443: (B:91-100): The type of this parameter, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
deleted file mode 100644
index c02faba189bc..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function set(uint _x, string memory _y, Item memory _item, bool _z) external view {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public view {
-        C(address(0x00)).set({_item: C.Item(50), _z: false, _y: "abc", _x: 30});
-    }
-}
-// ----
-// TypeError 2443: (B:119-129): The type of this parameter, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
deleted file mode 100644
index 674ce4e32a8c..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function get(Item memory _item) external {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public {
-        C c = new C();
-        function(C.Item memory) external ptr = c.get;
-        ptr(C.Item(5));
-    }
-}
-// ----
-// TypeError 2443: (B:166-175): The type of this parameter, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
deleted file mode 100644
index 5379bdb50356..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    function f() external view returns (string[] memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract D {
-    function g() public view {
-        C(address(0x00)).f();
-    }
-}
-// ----
-// TypeError 2428: (B:85-105): The type of return parameter 1, string[] memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
deleted file mode 100644
index d2b0e1ffe256..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public view {
-        C(address(0x00)).get();
-    }
-}
-// ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
deleted file mode 100644
index 0aa9973aa702..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint[] y;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public view {
-        C(address(0x00)).get();
-    }
-}
-// ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
deleted file mode 100644
index e868418683e8..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-    event E(Item _value);
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public {
-        emit L.E(L.Item(42));
-    }
-}
-// ----
-// TypeError 2443: (B:94-104): The type of this parameter, struct L.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol
deleted file mode 100644
index bb3651d4f8b2..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-
-    function f(uint) external view returns (Item memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract D {
-    using L for uint;
-
-    function test() public {
-        uint(1).f();
-    }
-}
-// ----
-// TypeError 2428: (B:106-117): The type of return parameter 1, struct L.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol
deleted file mode 100644
index 41bc072a5949..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-
-    function get(Item storage _item) external view {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    L.Item item;
-
-    function foo() public view {
-        L.get(item);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
deleted file mode 100644
index c6ba7522596b..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract Test {
-    function foo() public view {
-        L.get();
-    }
-}
-// ----
-// TypeError 2428: (B:90-97): The type of return parameter 1, struct L.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol
deleted file mode 100644
index 78d7b0512414..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract A {
-    function get() public view returns (Data memory) {}
-}
-
-contract B {
-    modifier validate() {
-        A(address(0x00)).get();
-        _;
-    }
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract C is B {
-    function foo()
-        public
-        validate()
-    {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol
deleted file mode 100644
index 1ac5d713b104..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract A {
-    function get() public view returns (Data memory) {}
-}
-
-contract B {
-    constructor() validate {
-        A(address(0x00)).get();
-    }
-
-    modifier validate() {
-        A(address(0x00)).get();
-        _;
-    }
-}
-
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract C is B {}
-==== Source: C ====
-pragma abicoder v1;
-import "B";
-
-contract D is C {
-    constructor() validate B() validate C() validate {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol
deleted file mode 100644
index 073a125be984..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract A {
-    function get() public view returns (Data memory) {}
-}
-
-contract B {
-    constructor() {
-        A(address(0x00)).get();
-    }
-
-    function foo() public view {
-        A(address(0x00)).get();
-    }
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract C is B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol
deleted file mode 100644
index 963ed33c70e6..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Item {
-    uint x;
-}
-
-contract C {
-    event Ev(Item);
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract D is C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
deleted file mode 100644
index c37bad41c274..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function get(Item memory) external view {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract D is C {}
-// ----
-// TypeError 6594: (B:33-51): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
deleted file mode 100644
index f25754246930..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract D is C {}
-// ----
-// TypeError 6594: (B:33-51): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol
deleted file mode 100644
index 8aa2f8552c2b..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Item {
-    uint x;
-}
-
-library L {
-    event Ev(Item);
-}
-
-contract C {
-    function foo() public {
-        emit L.Ev(Item(1));
-    }
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract D is C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol
deleted file mode 100644
index dd102cf51378..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract A {
-    function get() public view returns (Data memory) {}
-}
-
-contract B {
-    modifier validate() virtual {
-        A(address(0x00)).get();
-        _;
-    }
-}
-
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract C is B {
-    function foo() public pure validate {}
-
-    modifier validate() override {
-        _;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol
deleted file mode 100644
index e5df9cc82237..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-==== Source: C ====
-pragma abicoder v1;
-import "X";
-import "V1A";
-import "V2A";
-import "V1B";
-
-contract C is V1A, V2A, V1B {
-    function foo()
-        public
-        modV1A
-        modV2A // There should be no error for modV2A (it uses ABIEncoderV2)
-        modV1B
-    {
-    }
-}
-==== Source: V1A ====
-pragma abicoder v1;
-import "X";
-
-contract V1A {
-    modifier modV1A() {
-        _;
-    }
-}
-==== Source: V1B ====
-pragma abicoder v1;
-import "X";
-
-contract V1B {
-    modifier modV1B() {
-        _;
-    }
-}
-==== Source: V2A ====
-pragma abicoder               v2;
-import "X";
-
-contract V2A {
-    modifier modV2A() {
-        X(address(0x00)).get();
-        _;
-    }
-}
-==== Source: X ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract X {
-    function get() public view returns (Data memory) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol
deleted file mode 100644
index bafff148d34a..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function get() public view returns (uint[][] memory) {}
-
-    function test() public view returns (bool) {
-        uint[][] memory x = this.get();
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (150-154): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (166-183): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol
deleted file mode 100644
index 096ceea715ed..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function get() public view returns (uint[][] memory) {}
-
-    function test() public view returns (bool) {
-        uint[][] memory x = this.get();
-    }
-}
-// ====
-// EVMVersion: <byzantium
-// ----
-// TypeError 9574: (166-196): Type inaccessible dynamic type is not implicitly convertible to expected type uint256[][] memory.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_constructor_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_constructor_accepting_struct.sol
deleted file mode 100644
index bf3720c6ce6f..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_constructor_accepting_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    constructor(Item memory _item) {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public {
-        new C(C.Item(5));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_pointer_accepting_struct.sol
deleted file mode 100644
index f55e778feccc..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_pointer_accepting_struct.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function get(Item memory _item) external {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public {
-        C c = new C();
-        function(C.Item memory) external ptr = c.get;
-        ptr(C.Item(5));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_dynamic_string_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_dynamic_string_array.sol
deleted file mode 100644
index d8f729b5f537..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_dynamic_string_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    function f() external view returns (string[] memory) {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract D {
-    function g() public view {
-        C(address(0x00)).f();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_struct.sol
deleted file mode 100644
index 1f3a0befb980..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint x;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public view {
-        C(address(0x00)).get();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
deleted file mode 100644
index 5b526af39318..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-contract C {
-    struct Item {
-        uint[] y;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public view {
-        C(address(0x00)).get();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_event_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_event_accepting_struct.sol
deleted file mode 100644
index b18b1c650c52..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_event_accepting_struct.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-    event E(Item _value);
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public {
-        emit L.E(L.Item(42));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol
deleted file mode 100644
index 2d2e75684d6c..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-
-    function get(Item memory _item) external {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public {
-        // NOTE: This test checks a case that is currently not possible (pointer to an external
-        // library function) but it might become possible in the future.
-        function(L.Item memory) external ptr = L.get;
-        ptr(L.Item(5));
-    }
-}
-// ----
-// TypeError 9574: (B:269-313): Type function (struct L.Item memory) is not implicitly convertible to expected type function (struct L.Item memory) external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_returning_struct.sol
deleted file mode 100644
index 1f1222a5ad6d..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_returning_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-library L {
-    struct Item {
-        uint x;
-    }
-
-    function get() external view returns(Item memory) {}
-}
-==== Source: B ====
-pragma abicoder               v2;
-
-import "A";
-
-contract Test {
-    function foo() public view {
-        L.get();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
deleted file mode 100644
index 45fed616c08e..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract A {
-    function get() public view returns (Data memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract B {
-    modifier validate() {
-        A(address(0x00)).get();
-        _;
-    }
-}
-==== Source: C ====
-pragma abicoder v1;
-import "B";
-
-contract C is B {
-    function foo()
-        public
-        validate()
-    {}
-}
-// ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
deleted file mode 100644
index 5bc10f53eddb..000000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-==== Source: A ====
-pragma abicoder               v2;
-
-struct Data {
-    bool flag;
-}
-
-contract A {
-    function get() public view returns (Data memory) {}
-}
-==== Source: B ====
-pragma abicoder v1;
-import "A";
-
-contract B {
-    modifier validate() {
-        A(address(0x00)).get();
-        _;
-    }
-}
-==== Source: C ====
-pragma abicoder               v2;
-
-import "B";
-
-contract C is B {
-    function foo()
-        public
-        validate()
-    {}
-}
-// ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol b/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol
deleted file mode 100644
index 4851172a2169..000000000000
--- a/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-interface A {
-    function utterance() external returns (bytes32);
-}
-contract B is A {
-}
-// ----
-// TypeError 3656: (69-88): Contract "B" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol b/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol
deleted file mode 100644
index 560f473732bf..000000000000
--- a/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract contract AbstractContract {
-    constructor() { }
-    function utterance() public returns (bytes32) { return "miaow"; }
-}
-
-contract Test {
-    function create() public {
-       AbstractContract ac = new AbstractContract();
-    }
-}
-// ----
-// TypeError 4614: (208-228): Cannot instantiate an abstract contract.
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_only.sol b/test/libsolidity/syntaxTests/abstract/abstract_only.sol
deleted file mode 100644
index 2df81582aa6e..000000000000
--- a/test/libsolidity/syntaxTests/abstract/abstract_only.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract
-// ----
-// ParserError 3515: (9-9): Expected keyword "contract", "interface" or "library".
-// ParserError 2314: (9-9): Expected identifier but got end of source
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol b/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol
deleted file mode 100644
index b432b3ab18eb..000000000000
--- a/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract A { }
-// ----
-// ParserError 3515: (9-10): Expected keyword "contract", "interface" or "library".
diff --git a/test/libsolidity/syntaxTests/abstract/contract.sol b/test/libsolidity/syntaxTests/abstract/contract.sol
deleted file mode 100644
index 4e694df40608..000000000000
--- a/test/libsolidity/syntaxTests/abstract/contract.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-abstract contract A { constructor() {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/abstract/interface.sol b/test/libsolidity/syntaxTests/abstract/interface.sol
deleted file mode 100644
index 74c22227a84f..000000000000
--- a/test/libsolidity/syntaxTests/abstract/interface.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface B { }
-abstract interface A { }
-// ----
-// TypeError 9348: (16-40): Interfaces do not need the "abstract" keyword, they are abstract implicitly.
diff --git a/test/libsolidity/syntaxTests/abstract/library.sol b/test/libsolidity/syntaxTests/abstract/library.sol
deleted file mode 100644
index 67fd4ec03943..000000000000
--- a/test/libsolidity/syntaxTests/abstract/library.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract library A { }
-// ----
-// TypeError 9571: (0-22): Libraries cannot be abstract.
diff --git a/test/libsolidity/syntaxTests/abstract/unimplemented_functions.sol b/test/libsolidity/syntaxTests/abstract/unimplemented_functions.sol
deleted file mode 100644
index d2ce28f71c12..000000000000
--- a/test/libsolidity/syntaxTests/abstract/unimplemented_functions.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    function a() public virtual;
-}
-// ----
-// TypeError 3656: (0-47): Contract "A" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol b/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol
deleted file mode 100644
index d71c7feee62f..000000000000
--- a/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract A {
-    function a() public virtual;
-}
-contract B is A {
-}
-// ----
-// TypeError 3656: (57-76): Contract "B" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/array/array_pop.sol b/test/libsolidity/syntaxTests/array/array_pop.sol
deleted file mode 100644
index 3804f911f4ca..000000000000
--- a/test/libsolidity/syntaxTests/array/array_pop.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint[] data;
-    function test() public {
-      data.pop();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/array_pop_arg.sol b/test/libsolidity/syntaxTests/array/array_pop_arg.sol
deleted file mode 100644
index 5d383d867417..000000000000
--- a/test/libsolidity/syntaxTests/array/array_pop_arg.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint[] data;
-    function test() public {
-      data.pop(5);
-    }
-}
-// ----
-// TypeError 6160: (65-76): Wrong argument count for function call: 1 arguments given but expected 0.
diff --git a/test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol b/test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol
deleted file mode 100644
index dd7fcda97bdd..000000000000
--- a/test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    bytes1[] x;
-    bytes1[] z;
-    function f() public {
-        (x.push(), x.push()) = (0, 0);
-        (((x.push())), (x.push())) = (0, 0);
-        ((x.push(), x.push()), x.push()) = ((0, 0), 0);
-        (x.push(), x[0]) = (0, 0);
-        bytes1[] storage y = x;
-        (x.push(), y.push()) = (0, 0);
-        (x.push(), z.push()) = (0, 0);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol b/test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol
deleted file mode 100644
index 1e954d1fb8f7..000000000000
--- a/test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	bytes x;
-	function f() public {
-		(x[0], x[1]) = (0, 0);
-		(x[0], x[1]) = (x[1], x[0]);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/bytes_pop.sol b/test/libsolidity/syntaxTests/array/bytes_pop.sol
deleted file mode 100644
index cd5aa0eb6f63..000000000000
--- a/test/libsolidity/syntaxTests/array/bytes_pop.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    bytes data;
-    function test() public {
-      data.pop();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol b/test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol
deleted file mode 100644
index 320e93963877..000000000000
--- a/test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    bytes x;
-    bytes z;
-    function f() public {
-        (x.push(), x.push()) = (0, 0);
-        (((x.push())), (x.push())) = (0, 0);
-        ((x.push(), x.push()), x.push()) = ((0, 0), 0);
-        (x.push(), x[0]) = (0, 0);
-        bytes storage y = x;
-        (x.push(), y.push()) = (0, 0);
-        // The following is a false positive.
-        (x.push(), z.push()) = (0, 0);
-    }
-}
-// ----
-// Warning 7239: (73-102): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
-// Warning 7239: (112-147): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
-// Warning 7239: (157-203): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
-// Warning 7239: (213-238): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
-// Warning 7239: (277-306): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
-// Warning 7239: (362-391): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
diff --git a/test/libsolidity/syntaxTests/array/bytes_to_fixed_bytes.sol b/test/libsolidity/syntaxTests/array/bytes_to_fixed_bytes.sol
deleted file mode 100644
index af8cd9d516f6..000000000000
--- a/test/libsolidity/syntaxTests/array/bytes_to_fixed_bytes.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    bytes s;
-    function f(bytes calldata c, string memory m) public view returns (bytes3, bytes8, bytes16, bytes32) {
-        return (bytes3(c[0:3]), bytes8(s), bytes16(c), bytes32(bytes(m)));
-    }
-}
-// ----
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/array/calldata.sol b/test/libsolidity/syntaxTests/array/calldata.sol
deleted file mode 100644
index 77af5400d74d..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    function f(uint[3] calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/calldata_assign.sol b/test/libsolidity/syntaxTests/array/calldata_assign.sol
deleted file mode 100644
index 05a8f682d9b6..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata_assign.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    function f(uint256[] calldata s) external { s[0] = 4; }
-}
-// ----
-// TypeError 6182: (98-102): Calldata arrays are read-only.
diff --git a/test/libsolidity/syntaxTests/array/calldata_dynamic.sol b/test/libsolidity/syntaxTests/array/calldata_dynamic.sol
deleted file mode 100644
index 0b8d3fda51ed..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata_dynamic.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    function f(uint[] calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/calldata_multi.sol b/test/libsolidity/syntaxTests/array/calldata_multi.sol
deleted file mode 100644
index 9fa2b60adcf3..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata_multi.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    function f(uint[3][4] calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic.sol b/test/libsolidity/syntaxTests/array/calldata_multi_dynamic.sol
deleted file mode 100644
index 8112fd4cdb1f..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    function f(uint[][] calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol b/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
deleted file mode 100644
index 754270ecf449..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v1;
-contract Test {
-    function f(uint[][] calldata) external { }
-    function g(uint[][1] calldata) external { }
-}
-// ----
-// TypeError 4957: (51-68): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
-// TypeError 4957: (98-116): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/array/calldata_resize.sol b/test/libsolidity/syntaxTests/array/calldata_resize.sol
deleted file mode 100644
index 36de4e724139..000000000000
--- a/test/libsolidity/syntaxTests/array/calldata_resize.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f (uint256[] calldata x) external pure {
-        x.length = 42;
-    }
-}
-// ----
-// TypeError 7567: (75-83): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol
deleted file mode 100644
index d956c4663523..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function g() public pure returns (bytes memory) {
-        return bytes.concat;
-    }
-}
-// ----
-// TypeError 6359: (82-94): Return argument type function () pure returns (bytes memory) is not implicitly convertible to expected type (type of first return variable) bytes memory.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
deleted file mode 100644
index 8950217334d3..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        bytes memory a;
-        bytes memory b = type(bytes).concat(a);
-    }
-}
-// ----
-// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes storage pointer) provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol
deleted file mode 100644
index 325c776e2a02..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        bytes memory a;
-        bytes memory b = a.concat();
-    }
-}
-// ----
-// TypeError 9582: (88-96): Member "concat" not found or not visible after argument-dependent lookup in bytes memory.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_valid_type_literal.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_valid_type_literal.sol
deleted file mode 100644
index f39e9039638d..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_valid_type_literal.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes.concat(
-            hex"00",
-            hex"aabbcc",
-            unicode"abc",
-            "123",
-            "abc"
-            "123456789012345678901234567890123456789012345678901234567890" // Longer than 32 bytes
-        );
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
deleted file mode 100644
index 7bb257136ae8..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    bytes s;
-    function f(bytes calldata c, string calldata c1) public {
-        bytes memory a;
-        bytes16 b;
-        uint8[] memory num;
-        bytes1[] memory m;
-        bytes memory d = bytes.concat(a, b, c, num, s, "abc", m, c1, bytes(c1));
-    }
-}
-// ----
-// TypeError 8015: (233-236): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] memory provided.
-// TypeError 8015: (248-249): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] memory provided.
-// TypeError 8015: (251-253): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string calldata provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol
deleted file mode 100644
index 86ee748ed349..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        bytes.concat([], [], []);
-    }
-}
-// ----
-// TypeError 6378: (60-62): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_string_literal.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_string_literal.sol
deleted file mode 100644
index afba249f8d4a..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_string_literal.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes.concat(hex"", unicode"", "");
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
deleted file mode 100644
index 42eb1a31d440..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-
-    enum E {A, B, C}
-
-    mapping(uint => E) m;
-
-    function f() public {
-        bool b;
-        uint u;
-        uint8 u8;
-        address a;
-        address payable ap;
-        function () external fext;
-        function () internal fint;
-        uint[] memory uDynamic;
-        uint[2] memory uStatic;
-        C c;
-        S memory s;
-        E e;
-
-        bytes.concat(b, u, u8, a, ap, fext, fint, uDynamic, uStatic, c, s, e, m);
-    }
-}
-// ----
-// TypeError 8015: (425-426): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
-// TypeError 8015: (428-429): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256 provided.
-// TypeError 8015: (431-433): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
-// TypeError 8015: (435-436): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
-// TypeError 8015: (438-440): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address payable provided.
-// TypeError 8015: (442-446): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () external provided.
-// TypeError 8015: (448-452): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (454-462): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] memory provided.
-// TypeError 8015: (464-471): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] memory provided.
-// TypeError 8015: (473-474): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (476-477): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S memory provided.
-// TypeError 8015: (479-480): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
-// TypeError 8015: (482-483): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but mapping(uint256 => enum C.E) provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
deleted file mode 100644
index 8d5374e84462..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-
-    enum E {A, B, C}
-
-    function f() public {
-        bytes.concat(
-            false,
-            1,
-            1e10,
-            1e-10,
-            0.1,
-            0x1234567,
-            0x11112222333344445555666677778888999900,     // One byte less than an address
-            0x1111222233334444555566667777888899990000,   // Address
-            0x111122223333444455556666777788889999000011, // One byte more than an address
-            0x00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff,  // exactly 32 bytes
-            -0x0000000000000000000000000000000000000000000000000000000000000001, // exactly 32 bytes
-            bytes(bytes32(0x00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff))[:],
-            f,
-            (),
-            (0, 0),
-            [0],
-            [0][:],
-            [0][0],
-            new C(),
-            S(0),
-            E.A
-        );
-    }
-}
-// ----
-// TypeError 9640: (697-779): Explicit type conversion not allowed from "bytes32" to "bytes memory".
-// TypeError 1227: (697-782): Index range access is only supported for dynamic calldata arrays.
-// TypeError 1227: (864-870): Index range access is only supported for dynamic calldata arrays.
-// TypeError 8015: (133-138): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
-// TypeError 8015: (152-153): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 1 provided.
-// TypeError 8015: (167-171): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 10000000000 provided.
-// TypeError 8015: (185-190): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10000000000 provided.
-// TypeError 8015: (204-207): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10 provided.
-// TypeError 8015: (221-230): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 19088743 provided.
-// TypeError 8015: (244-284): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3806...(37 digits omitted)...1680 provided.
-// TypeError 8015: (335-377): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
-// TypeError 8015: (404-448): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 2494...(42 digits omitted)...0497 provided.
-// TypeError 8015: (495-561): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3027...(66 digits omitted)...5855 provided.
-// TypeError 8015: (596-663): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const -1 provided.
-// TypeError 8015: (697-782): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes memory slice provided.
-// TypeError 8015: (796-797): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (811-813): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple() provided.
-// TypeError 8015: (827-833): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple(int_const 0,int_const 0) provided.
-// TypeError 8015: (847-850): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] memory provided.
-// TypeError 8015: (864-870): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] memory slice provided.
-// TypeError 8015: (884-890): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
-// TypeError 8015: (904-911): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (925-929): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S memory provided.
-// TypeError 8015: (943-946): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol
deleted file mode 100644
index e62d13adde05..000000000000
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes.concat(
-            0,
-            -0,
-            0.0,
-            -0.0,
-            0e10,
-            -0e10,
-            0e-10,
-            -0e-10,
-            (0),
-            0x00,
-            -0x00,
-            0x0000000000000000000000000000000000000000000000000000000000000000, // exactly 32 bytes
-            -0x0000000000000000000000000000000000000000000000000000000000000000 // exactly 32 bytes
-        );
-    }
-}
-// ----
-// TypeError 8015: (78-79): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (93-95): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (109-112): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (126-130): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (144-148): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (162-167): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (181-186): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (200-206): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (220-223): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (237-241): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (255-260): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (274-340): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (374-441): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
diff --git a/test/libsolidity/syntaxTests/array/contract_array.sol b/test/libsolidity/syntaxTests/array/contract_array.sol
deleted file mode 100644
index 819353fef466..000000000000
--- a/test/libsolidity/syntaxTests/array/contract_array.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    C[] y = new C[](3);
-    C[3] x;
-    function f() public {
-        C[3] memory z;
-        y.push(this);
-        x[0] = this;
-        z[0] = this;
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/array/contract_index_access.sol b/test/libsolidity/syntaxTests/array/contract_index_access.sol
deleted file mode 100644
index 50fbfd41bc1a..000000000000
--- a/test/libsolidity/syntaxTests/array/contract_index_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() view public {
-        C[0];
-    }
-}
-// ----
-// Warning 6133: (52-56): Statement has no effect.
-// Warning 2018: (17-63): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/array/copy_from_function_type.sol b/test/libsolidity/syntaxTests/array/copy_from_function_type.sol
deleted file mode 100644
index b795094683db..000000000000
--- a/test/libsolidity/syntaxTests/array/copy_from_function_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// Example from https://github.com/ethereum/solidity/issues/12558
-pragma abicoder v2;
-contract C {
-  function() external[1][] s0;
-  constructor(function() external[1][] memory i0)
-  {
-    i0[0] = s0[1];
-  }
-}
diff --git a/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol b/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
deleted file mode 100644
index 44011bea459e..000000000000
--- a/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function() external [] s0;
-    function() external view [] s1;
-    function copyStorageArrayOfFunctionType() public {
-        s1 = s0;
-    }
-}
-// ----
-// TypeError 7407: (148-150): Type function () external[] storage ref is not implicitly convertible to expected type function () view external[] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol b/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol
deleted file mode 100644
index c8e9252576cc..000000000000
--- a/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function test() public {
-      uint[] memory data;
-      data.pop();
-    }
-}
-// ----
-// TypeError 4994: (74-82): Member "pop" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/function_mapping.sol b/test/libsolidity/syntaxTests/array/function_mapping.sol
deleted file mode 100644
index 3f64c081c392..000000000000
--- a/test/libsolidity/syntaxTests/array/function_mapping.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder               v2;
-
-contract Test {
-    function f(mapping(uint => uint)[] memory x) public pure {}
-}
-// ----
-// TypeError 4103: (66-98): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/array/function_mapping_library.sol b/test/libsolidity/syntaxTests/array/function_mapping_library.sol
deleted file mode 100644
index 2099e0dd1865..000000000000
--- a/test/libsolidity/syntaxTests/array/function_mapping_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-library L {
-    function f(mapping(uint => uint)[2] memory a) external pure returns (mapping(uint => uint)[2] memory) {}
-}
-// ----
-// TypeError 4061: (61-94): Type mapping(uint256 => uint256)[2] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol b/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol
deleted file mode 100644
index ca38231be05f..000000000000
--- a/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    bytes s;
-    function f(bytes calldata c, string memory m) public view returns (bytes3 r1, bytes16 r2, bytes32 r3) {
-        require(c.length >= 3, "");
-        r2 = s;
-        r1 = c[0:3];
-        r3 = bytes32(m);
-        r3 = m;
-    }
-}
-// ----
-// TypeError 7407: (183-184): Type bytes storage ref is not implicitly convertible to expected type bytes16.
-// TypeError 7407: (199-205): Type bytes calldata slice is not implicitly convertible to expected type bytes3.
-// TypeError 9640: (220-230): Explicit type conversion not allowed from "string memory" to "bytes32".
-// TypeError 7407: (245-246): Type string memory is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/array/invalid/library_array.sol b/test/libsolidity/syntaxTests/array/invalid/library_array.sol
deleted file mode 100644
index 020ea92d156c..000000000000
--- a/test/libsolidity/syntaxTests/array/invalid/library_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L {}
-contract C {
-	function f() public {
-		L[] memory x;
-	}
-}
-// ----
-// TypeError 1130: (51-52): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol b/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol
deleted file mode 100644
index 885a114b02bc..000000000000
--- a/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library C {
-    function f() view public {
-        C[0];
-    }
-}
-// ----
-// TypeError 2876: (51-55): Index access for library types and arrays of libraries are not possible.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol b/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol
deleted file mode 100644
index b08fd0df53fd..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    function f(bytes8[] calldata c) external returns (uint256, bytes10, bytes10, bytes10) {
-        bytes10[] memory m = c;
-        return (m.length, m[0], m[1], m[2]);
-    }
-}
-// ----
-// TypeError 9574: (134-156): Type bytes8[] calldata is not implicitly convertible to expected type bytes10[] memory.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol
deleted file mode 100644
index af4a593cc89e..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder v2;
-
-contract C {
-    bytes8[] s;
-    function f() external returns (uint256, bytes10, bytes10, bytes10) {
-        s.push("abcd");
-        s.push("bcde");
-        s.push("cdef");
-        bytes10[] memory m = s;
-        return (m.length, m[0], m[1], m[2]);
-    }
-}
-// ----
-// TypeError 9574: (203-225): Type bytes8[] storage ref is not implicitly convertible to expected type bytes10[] memory.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol
deleted file mode 100644
index d45a77182b72..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    bytes1[32] data1;
-    bytes2[10] data2;
-    function f() external {
-        data1 = data2;
-    }
-}
-// ----
-// TypeError 7407: (101-106): Type bytes2[10] storage ref is not implicitly convertible to expected type bytes1[32] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol
deleted file mode 100644
index dabeb18e0f47..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint64[32] data1;
-    uint256[10] data2;
-    function f() external {
-        data1 = data2;
-    }
-}
-// ----
-// TypeError 7407: (102-107): Type uint256[10] storage ref is not implicitly convertible to expected type uint64[32] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol
deleted file mode 100644
index d91cdd95e43a..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    int256[32] data1;
-    uint256[10] data2;
-    function f() external {
-        data1 = data2;
-    }
-    function g() external {
-        data2 = data1;
-    }
-}
-// ----
-// TypeError 7407: (102-107): Type uint256[10] storage ref is not implicitly convertible to expected type int256[32] storage ref.
-// TypeError 7407: (159-164): Type int256[32] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol
deleted file mode 100644
index 1b3733a0b453..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint256[10] data1;
-    uint256[] data2;
-    function f() external {
-        data1 = data2;
-    }
-}
-// ----
-// TypeError 7407: (101-106): Type uint256[] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol
deleted file mode 100644
index 95185d317af7..000000000000
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint256[10] data1;
-    uint256[18] data2;
-    function f() external {
-        data1 = data2;
-    }
-}
-// ----
-// TypeError 7407: (103-108): Type uint256[18] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol b/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol
deleted file mode 100644
index 06caa0f22947..000000000000
--- a/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// Used to cause ICE
-contract C {
-	function f() public {
-		abi.decode("", (bytes1[999999999]));
-	}
-}
-// ----
-// TypeError 6118: (75-92): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol b/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol
deleted file mode 100644
index cc979668ccab..000000000000
--- a/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint constant LEN) public {
-        uint[LEN] a;
-    }
-}
-// ----
-// DeclarationError 1788: (28-45): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 5462: (69-72): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (64-75): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol b/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
deleted file mode 100644
index 8ab64198490a..000000000000
--- a/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    bytes32[8**90] ids;
-}
-// ----
-// TypeError 1847: (25-30): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
deleted file mode 100644
index 8a7eeb4d56fb..000000000000
--- a/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    bytes32[8**90][500] ids;
-}
-// ----
-// TypeError 1847: (25-30): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/length/can_be_constant_in_function.sol b/test/libsolidity/syntaxTests/array/length/can_be_constant_in_function.sol
deleted file mode 100644
index 92536dd50520..000000000000
--- a/test/libsolidity/syntaxTests/array/length/can_be_constant_in_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint constant LEN = 10;
-    function f() public pure {
-        uint[LEN] memory a;
-        a;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/length/can_be_constant_in_struct.sol b/test/libsolidity/syntaxTests/array/length/can_be_constant_in_struct.sol
deleted file mode 100644
index 89e174f2d3fb..000000000000
--- a/test/libsolidity/syntaxTests/array/length/can_be_constant_in_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint constant LEN = 10;
-    struct Test {
-        uint[LEN] ids;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/length/can_be_recursive_constant.sol b/test/libsolidity/syntaxTests/array/length/can_be_recursive_constant.sol
deleted file mode 100644
index 6810a9d6a481..000000000000
--- a/test/libsolidity/syntaxTests/array/length/can_be_recursive_constant.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint constant L = 5;
-    uint constant LEN = L + 4 * L;
-    uint[LEN] ids;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol
deleted file mode 100644
index 0c8f08e86275..000000000000
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    uint[] storageArray;
-    function f() public {
-        storageArray.length = 3;
-    }
-}
-// ----
-// TypeError 7567: (72-91): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol
deleted file mode 100644
index c4a9e81bd53e..000000000000
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    mapping(uint => uint[]) map;
-    function f() public {
-        map[0].length = 4;
-    }
-}
-// ----
-// TypeError 7567: (80-93): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol
deleted file mode 100644
index 179d7cf287ab..000000000000
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct S {
-        uint[] a;
-    }
-    S s;
-    function f() public {
-        s.a.length = 4;
-    }
-}
-// ----
-// TypeError 7567: (95-105): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol
deleted file mode 100644
index 61521192f7e6..000000000000
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public {}
-    uint[f] ids;
-}
-// ----
-// TypeError 5462: (49-50): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol
deleted file mode 100644
index c0decec5763c..000000000000
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint x) public {}
-    uint constant LEN = f();
-    uint[LEN] ids;
-}
-// ----
-// TypeError 5462: (84-87): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol b/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol
deleted file mode 100644
index 0710124a100e..000000000000
--- a/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint constant L2 = LEN - 10;
-    uint constant L1 = L2 / 10;
-    uint constant LEN = 10 + L1 * 5;
-    function f() public {
-        uint[LEN] a;
-    }
-}
-// ----
-// TypeError 5210: (17-44): Cyclic constant definition (or maximum recursion depth exhausted).
diff --git a/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol b/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol
deleted file mode 100644
index 2145d7025511..000000000000
--- a/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    fixed constant L = 10.5;
-    uint[L] ids;
-}
-// ----
-// TypeError 5462: (51-52): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/constant_var.sol b/test/libsolidity/syntaxTests/array/length/constant_var.sol
deleted file mode 100644
index f3f5545a9bd4..000000000000
--- a/test/libsolidity/syntaxTests/array/length/constant_var.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint constant LEN = 10;
-    uint[LEN] ids;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol b/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol
deleted file mode 100644
index dd089e4d0180..000000000000
--- a/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint constant LEN = LEN;
-    function f() public {
-        uint[LEN] a;
-    }
-}
-// ----
-// TypeError 5210: (17-40): Cyclic constant definition (or maximum recursion depth exhausted).
diff --git a/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol b/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol
deleted file mode 100644
index 6a913d1e3a3f..000000000000
--- a/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-  function a() public pure returns(int[0][500] memory) {}
-  function b() public pure returns(uint[0][500] memory) {}
-  function c() public pure returns(bytes1[0][500] memory) {}
-  function d() public pure returns(bytes32[0][500] memory) {}
-  function e() public pure returns(bytes[0][500] memory) {}
-  function e() public pure returns(string[0][500] memory) {}
-}
-// ----
-// TypeError 1406: (52-53): Array with zero length specified.
-// TypeError 1406: (111-112): Array with zero length specified.
-// TypeError 1406: (172-173): Array with zero length specified.
-// TypeError 1406: (234-235): Array with zero length specified.
-// TypeError 1406: (294-295): Array with zero length specified.
-// TypeError 1406: (355-356): Array with zero length specified.
diff --git a/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol b/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol
deleted file mode 100644
index d268d75dd799..000000000000
--- a/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-  int[0] a;
-  uint[0] b;
-  bytes1[0] c;
-  bytes32[0] d;
-  bytes[0] e;
-  string[0] f;
-}
-// ----
-// TypeError 1406: (19-20): Array with zero length specified.
-// TypeError 1406: (32-33): Array with zero length specified.
-// TypeError 1406: (47-48): Array with zero length specified.
-// TypeError 1406: (63-64): Array with zero length specified.
-// TypeError 1406: (77-78): Array with zero length specified.
-// TypeError 1406: (92-93): Array with zero length specified.
diff --git a/test/libsolidity/syntaxTests/array/length/inline_array.sol b/test/libsolidity/syntaxTests/array/length/inline_array.sol
deleted file mode 100644
index 71e738804766..000000000000
--- a/test/libsolidity/syntaxTests/array/length/inline_array.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[[2]] a15;
-}
-// ----
-// TypeError 5462: (22-25): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol
deleted file mode 100644
index 14fc21ac173f..000000000000
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[-true] ids;
-}
-// ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol
deleted file mode 100644
index 5cb91b94229e..000000000000
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[true/1] ids;
-}
-// ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol
deleted file mode 100644
index dbedaaa3b766..000000000000
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[1/true] ids;
-}
-// ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol
deleted file mode 100644
index dc588eb4b8f8..000000000000
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[1.111111E1111111111111] ids;
-}
-// ----
-// TypeError 5462: (22-44): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol
deleted file mode 100644
index 4e8b76d711b3..000000000000
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[3/0] ids;
-}
-// ----
-// TypeError 6020: (22-25): Operator / not compatible with types int_const 3 and int_const 0
diff --git a/test/libsolidity/syntaxTests/array/length/literal_conversion.sol b/test/libsolidity/syntaxTests/array/length/literal_conversion.sol
deleted file mode 100644
index cf769f337974..000000000000
--- a/test/libsolidity/syntaxTests/array/length/literal_conversion.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    uint[uint(1)] valid_size_invalid_expr1;
-    uint[uint(2**256-1)] valid_size_invalid_expr2;
-    uint[uint(2**256)] invalid_size_invalid_expr3;
-
-    uint[int(1)] valid_size_invalid_expr4;
-    uint[int(2**256-1)] valid_size_invalid_expr5;
-    uint[int(2**256)] invalid_size_invalid_expr6;
-}
-// ----
-// TypeError 5462: (22-29): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (66-80): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (117-129): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (169-175): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (212-225): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (262-273): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol b/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol
deleted file mode 100644
index c9ab030a4d81..000000000000
--- a/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-  function f() public pure
-  {
-    bytes32[1263941234127518272][500] memory x;
-    uint[2**30][] memory y;
-    uint[2**30][2**30][] memory z;
-    uint[2**16][2**16][] memory w;
-  }
-}
-// ----
-// TypeError 1534: (48-90): Type too large for memory.
-// TypeError 1534: (96-118): Type too large for memory.
-// TypeError 1534: (124-153): Type too large for memory.
-// TypeError 1534: (159-188): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol b/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol
deleted file mode 100644
index 0a9e82443754..000000000000
--- a/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    bool constant LEN = true;
-    uint[LEN] ids;
-}
-// ----
-// TypeError 5462: (52-55): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol b/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol
deleted file mode 100644
index b32e6232aee4..000000000000
--- a/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[true] ids;
-}
-// ----
-// TypeError 5462: (22-26): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/parameter_too_large.sol b/test/libsolidity/syntaxTests/array/length/parameter_too_large.sol
deleted file mode 100644
index 5426af5d2eb1..000000000000
--- a/test/libsolidity/syntaxTests/array/length/parameter_too_large.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  function f(bytes32[1263941234127518272] memory) public pure {}
-}
-// ----
-// TypeError 1534: (26-61): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol
deleted file mode 100644
index 00a302252e54..000000000000
--- a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f(bytes32[1263941234127518272][500] memory) public pure {}
-  function f(uint[2**30][] memory) public pure {}
-  function f(uint[2**30][2**30][] memory) public pure {}
-  function f(uint[2**16][2**16][] memory) public pure {}
-}
-// ----
-// TypeError 1534: (26-66): Type too large for memory.
-// TypeError 1534: (96-116): Type too large for memory.
-// TypeError 1534: (146-173): Type too large for memory.
-// TypeError 1534: (203-230): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol b/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol
deleted file mode 100644
index 7fd7b531b40f..000000000000
--- a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-  function f(bytes32[1263941234127518272][500] memory) public pure {}
-  function f(uint[2**30][2**30][][] memory) public pure {}
-}
-// ----
-// TypeError 1534: (61-101): Type too large for memory.
-// TypeError 1534: (131-160): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/parentheses.sol b/test/libsolidity/syntaxTests/array/length/parentheses.sol
deleted file mode 100644
index e5db44599453..000000000000
--- a/test/libsolidity/syntaxTests/array/length/parentheses.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    uint constant L1 = (2);
-    uint constant L2 = ((2));
-    uint constant L3 = ((((2))));
-    uint constant L4 = (2 + 1);
-    uint constant L5 = ((2 + 1));
-    uint constant L6 = (((2) + ((1))));
-    uint constant L7 = (2 + 1) / 1;
-    uint constant L8 = (2 + ((1))) / (1);
-    uint[L1] a1;
-    uint[L2] a2;
-    uint[L3] a3;
-    uint[L4] a4;
-    uint[L5] a5;
-    uint[L6] a6;
-    uint[L7] a7;
-    uint[L8] a8;
-    uint[(2)] a9;
-    uint[(2 + 1)] a10;
-    uint[(2 + 1) + 1] a11;
-    uint[((2) + 1) + 1] a12;
-    uint[(2 + 1) + ((1))] a13;
-    uint[(((2) + 1)) + (((1)))] a14;
-    uint[((((3) + 1)) + (((1))))%2] a15;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/length/pure_functions.sol b/test/libsolidity/syntaxTests/array/length/pure_functions.sol
deleted file mode 100644
index dc9b4a872779..000000000000
--- a/test/libsolidity/syntaxTests/array/length/pure_functions.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint constant LEN = keccak256(ripemd160(33));
-    uint[LEN] ids;
-}
-// ----
-// TypeError 5462: (72-75): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/too_large.sol b/test/libsolidity/syntaxTests/array/length/too_large.sol
deleted file mode 100644
index 7d59fd86cb65..000000000000
--- a/test/libsolidity/syntaxTests/array/length/too_large.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint[8**90] ids;
-    uint[2**256-1] okay;
-    uint[2**256] tooLarge;
-}
-// ----
-// TypeError 1847: (22-27): Array length too large, maximum is 2**256 - 1.
-// TypeError 1847: (68-74): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/length/tuples.sol b/test/libsolidity/syntaxTests/array/length/tuples.sol
deleted file mode 100644
index 9d90798506e1..000000000000
--- a/test/libsolidity/syntaxTests/array/length/tuples.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[(1,2)] a15;
-}
-// ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
deleted file mode 100644
index f3e249f83930..000000000000
--- a/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[8**90][500] ids;
-}
-// ----
-// TypeError 1847: (22-27): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/library_array.sol b/test/libsolidity/syntaxTests/array/library_array.sol
deleted file mode 100644
index fec5762f8aab..000000000000
--- a/test/libsolidity/syntaxTests/array/library_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L {}
-contract C {
-  function f() public pure {
-    new L[](2);
-  }
-}
-// ----
-// TypeError 1130: (63-64): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_memory.sol b/test/libsolidity/syntaxTests/array/nested_calldata_memory.sol
deleted file mode 100644
index fb2ab2d94609..000000000000
--- a/test/libsolidity/syntaxTests/array/nested_calldata_memory.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract Test {
-    struct shouldBug {
-        bytes[2] deadly;
-    }
-    function killer(bytes[2] calldata weapon) pure external {
-      shouldBug(weapon);
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_memory2.sol b/test/libsolidity/syntaxTests/array/nested_calldata_memory2.sol
deleted file mode 100644
index ad09877c4ec1..000000000000
--- a/test/libsolidity/syntaxTests/array/nested_calldata_memory2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract Test {
-    struct shouldBug {
-        uint256[][2] deadly;
-    }
-    function killer(uint256[][2] calldata weapon) pure external {
-      shouldBug(weapon);
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_memory3.sol b/test/libsolidity/syntaxTests/array/nested_calldata_memory3.sol
deleted file mode 100644
index d7f0133fcb23..000000000000
--- a/test/libsolidity/syntaxTests/array/nested_calldata_memory3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract Test {
-    struct shouldBug {
-        uint256[][] deadly;
-    }
-    function killer(uint256[][] calldata weapon) pure external {
-      shouldBug(weapon);
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol b/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol
deleted file mode 100644
index e9878fc223e0..000000000000
--- a/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-  uint[][2] tmp_i;
-  function i(uint[][2] calldata s) external { tmp_i = s; }
-}
-
-// ----
-// UnimplementedFeatureError: Copying nested calldata dynamic arrays to storage is not implemented in the old code generator.
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol b/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol
deleted file mode 100644
index 2d1c1f5866b1..000000000000
--- a/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-  uint[][] tmp_i;
-  function i(uint[][] calldata s) external { tmp_i = s; }
-}
-
-// ----
-// UnimplementedFeatureError: Copying nested calldata dynamic arrays to storage is not implemented in the old code generator.
diff --git a/test/libsolidity/syntaxTests/array/new_no_parentheses.sol b/test/libsolidity/syntaxTests/array/new_no_parentheses.sol
deleted file mode 100644
index 99287f8fc5ef..000000000000
--- a/test/libsolidity/syntaxTests/array/new_no_parentheses.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint size) public {
-        new uint[1];
-    }
-}
-// ----
-// TypeError 3904: (60-67): Length has to be placed in parentheses after the array type for new expression.
diff --git a/test/libsolidity/syntaxTests/array/no_array_pop.sol b/test/libsolidity/syntaxTests/array/no_array_pop.sol
deleted file mode 100644
index a53a195993b6..000000000000
--- a/test/libsolidity/syntaxTests/array/no_array_pop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint data;
-    function test() public {
-      data.pop();
-    }
-}
-// ----
-// TypeError 9582: (63-71): Member "pop" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol b/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol
deleted file mode 100644
index 03f038eed219..000000000000
--- a/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint[] calldata x) external {
-        x.pop();
-    }
-}
-// ----
-// TypeError 4994: (66-71): Member "pop" is not available in uint256[] calldata outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/pop/memory_pop.sol b/test/libsolidity/syntaxTests/array/pop/memory_pop.sol
deleted file mode 100644
index 96235dcb0773..000000000000
--- a/test/libsolidity/syntaxTests/array/pop/memory_pop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        uint[] memory x;
-        x.pop();
-    }
-}
-// ----
-// TypeError 4994: (72-77): Member "pop" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/pop/storage_with_mapping_pop.sol b/test/libsolidity/syntaxTests/array/pop/storage_with_mapping_pop.sol
deleted file mode 100644
index d798aee13554..000000000000
--- a/test/libsolidity/syntaxTests/array/pop/storage_with_mapping_pop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    mapping(uint=>uint)[] array;
-    mapping(uint=>uint) map;
-    function f() public {
-        array.pop();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/push/calldata_push.sol b/test/libsolidity/syntaxTests/array/push/calldata_push.sol
deleted file mode 100644
index 30f34455583d..000000000000
--- a/test/libsolidity/syntaxTests/array/push/calldata_push.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint[] calldata x) external {
-        x.push();
-    }
-}
-// ----
-// TypeError 4994: (66-72): Member "push" is not available in uint256[] calldata outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/push/memory_push.sol b/test/libsolidity/syntaxTests/array/push/memory_push.sol
deleted file mode 100644
index 446d7576f073..000000000000
--- a/test/libsolidity/syntaxTests/array/push/memory_push.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        uint[] memory x;
-        x.push();
-    }
-}
-// ----
-// TypeError 4994: (72-78): Member "push" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol b/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol
deleted file mode 100644
index 6032b0c2a4f2..000000000000
--- a/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    mapping(uint=>uint)[] array;
-    mapping(uint=>uint) map;
-    function f() public {
-        array.push();
-        array.push(map);
-    }
-}
-// ----
-// TypeError 8871: (131-141): Storage arrays with nested mappings do not support .push(<arg>).
diff --git a/test/libsolidity/syntaxTests/array/slice/assign_to_storage.sol b/test/libsolidity/syntaxTests/array/slice/assign_to_storage.sol
deleted file mode 100644
index df259b2940c1..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/assign_to_storage.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-  bytes public b;
-  function f() public {
-    b = msg.data[:];
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/bytes_calldata.sol b/test/libsolidity/syntaxTests/array/slice/bytes_calldata.sol
deleted file mode 100644
index dd560aff38bb..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/bytes_calldata.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(bytes calldata x) external pure {
-        x[1:2];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol b/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol
deleted file mode 100644
index c75f27c63fc2..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes memory x) public pure {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (66-72): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol b/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol
deleted file mode 100644
index a42193d618de..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    bytes x;
-    function f() public view {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (65-71): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic.sol b/test/libsolidity/syntaxTests/array/slice/calldata_dynamic.sol
deleted file mode 100644
index 26af30dbaa4f..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint256[] calldata x) external pure {
-        x[1:2];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_access.sol b/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_access.sol
deleted file mode 100644
index 65088f4c2ae5..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint256[] calldata x) external pure {
-        x[1:2][0];
-        x[1:][0];
-        x[1:][1:2][0];
-        x[1:2][1:][0];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_convert_to_memory.sol b/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_convert_to_memory.sol
deleted file mode 100644
index feefb5106666..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_convert_to_memory.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(bytes calldata x) external pure returns (bytes memory) {
-        return x[1:2];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_encode.sol b/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_encode.sol
deleted file mode 100644
index de90b0f75729..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_encode.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint256[] calldata x) external pure {
-        abi.encode(x[1:2]);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_forward.sol b/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_forward.sol
deleted file mode 100644
index 75c42cd4e53c..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/calldata_dynamic_forward.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(bytes calldata x) external {
-        return this.f(x[1:2]);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_static.sol b/test/libsolidity/syntaxTests/array/slice/calldata_static.sol
deleted file mode 100644
index c78e2a12e16c..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/calldata_static.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint256[42] calldata x) external pure {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (76-82): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/member_access.sol b/test/libsolidity/syntaxTests/array/slice/member_access.sol
deleted file mode 100644
index 1abcf4b45b96..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/member_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// Used to cause ICE
-contract C {
-    function f(uint[] calldata x) external pure {
-        x[1:2].a;
-    }
-}
-// ----
-// TypeError 9582: (92-100): Member "a" not found or not visible after argument-dependent lookup in uint256[] calldata slice.
diff --git a/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol b/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol
deleted file mode 100644
index 0a881ef62363..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint256[] memory x) public pure {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (70-76): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/memory_static.sol b/test/libsolidity/syntaxTests/array/slice/memory_static.sol
deleted file mode 100644
index 89f49ed963af..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/memory_static.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint256[42] memory x) public pure {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (72-78): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_literal.sol b/test/libsolidity/syntaxTests/array/slice/slice_literal.sol
deleted file mode 100644
index 50fc27bbb9be..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/slice_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        1[1:];
-    }
-}
-// ----
-// TypeError 4781: (52-57): Index range access is only possible for arrays and array slices.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol b/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol
deleted file mode 100644
index 6b93721fc401..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes memory y;
-        y[1:2];
-    }
-}
-// ----
-// TypeError 1227: (76-82): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol b/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol
deleted file mode 100644
index cfb1da8b52a4..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        string memory y;
-        y[1:2];
-    }
-}
-// ----
-// TypeError 1227: (77-83): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_string.sol b/test/libsolidity/syntaxTests/array/slice/slice_string.sol
deleted file mode 100644
index 40b4c13cc088..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/slice_string.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        ""[1:];
-    }
-}
-// ----
-// TypeError 4781: (52-58): Index range access is only possible for arrays and array slices.
diff --git a/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol b/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol
deleted file mode 100644
index 270209550197..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint256[] x;
-    function f() public view {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (69-75): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/storage_static.sol b/test/libsolidity/syntaxTests/array/slice/storage_static.sol
deleted file mode 100644
index 415276c18f5d..000000000000
--- a/test/libsolidity/syntaxTests/array/slice/storage_static.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint256[42] x;
-    function f() public view {
-        x[1:2];
-    }
-}
-// ----
-// TypeError 1227: (71-77): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol b/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol
deleted file mode 100644
index 178a22e153c3..000000000000
--- a/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint[3] data;
-    function test() public {
-      data.pop();
-    }
-}
-// ----
-// TypeError 9582: (66-74): Member "pop" not found or not visible after argument-dependent lookup in uint256[3] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/string_pop.sol b/test/libsolidity/syntaxTests/array/string_pop.sol
deleted file mode 100644
index d4a5f725a03f..000000000000
--- a/test/libsolidity/syntaxTests/array/string_pop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    string data;
-    function test() public {
-      data.pop();
-    }
-}
-// ----
-// TypeError 9582: (65-73): Member "pop" not found or not visible after argument-dependent lookup in string storage ref.
diff --git a/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol b/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
deleted file mode 100644
index 76b49050b5c9..000000000000
--- a/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public {
-		uint[] storage x;
-		uint[10] storage y;
-		x;
-		y;
-	}
-}
-// ----
-// TypeError 3464: (80-81): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (85-86): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex.sol
deleted file mode 100644
index dd89836075af..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract D {}
-contract C is D {}
-contract E is D
-{
-	function foo() public { new C(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol
deleted file mode 100644
index 548b9186deeb..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A { function foo() public { new D(); } }
-contract C { function foo() public { new A(); } }
-contract D is C {}
-// ----
-// TypeError 7813: (37-42): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (87-92): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol
deleted file mode 100644
index 13d998d0b3c8..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function f()
-{
-	new D();
-}
-
-contract D
-{
-	receive() external payable { f; }
-}
-// ----
-// TypeError 7813: (16-21): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_function_parameters.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_function_parameters.sol
deleted file mode 100644
index ea93a44b8b38..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_function_parameters.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function foo(D _d) public { _d.foo(this); } }
-contract D { function foo(C _c) public { _c.foo(this); } }
-// ----
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_internal_function.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_internal_function.sol
deleted file mode 100644
index 0b06b2b7ae12..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_internal_function.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-	// Internal uncalled function should not cause an cyclic dep. error
-	function foo() internal { new D(); }
-	function callFoo() virtual public { foo(); }
-}
-
-contract D is C
-{
-	function callFoo() override public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_internal_functions.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_internal_functions.sol
deleted file mode 100644
index 8c60a87a66d9..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_internal_functions.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C { function foo() internal { new D(); } }
-contract D { function foo() internal { new C(); } }
-// ----
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_libraries.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_libraries.sol
deleted file mode 100644
index ee551a6051e1..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_libraries.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-library L1 { function foo() internal { L2.foo(); } }
-library L2 { function foo() internal { L1.foo(); } }
-// ----
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol
deleted file mode 100644
index 9fc69772751e..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function foo() public pure { D; }
-}
-contract D {
-	function foo() public pure { C; }
-}
-// ----
-// Warning 6133: (43-44): Statement has no effect.
-// Warning 6133: (93-94): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol
deleted file mode 100644
index c99a7b104603..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	constructor() { new C(); }
-}
-// ----
-// TypeError 7813: (30-35): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol
deleted file mode 100644
index a204c444870e..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A { B x = new B(); }
-contract B { C x = new C(); }
-contract C { D x = new D(); }
-contract D { E x = new E(); }
-contract E { F x = new F(); }
-contract F { E x = new E(); }
-// ----
-// TypeError 7813: (19-24): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (49-54): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (79-84): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (109-114): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (139-144): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (169-174): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol
deleted file mode 100644
index ce6b101f5ff0..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function foo() public pure { type(D); }
-}
-contract D {
-	function foo() public pure { type(C); }
-}
-// ----
-// Warning 6133: (43-50): Statement has no effect.
-// Warning 6133: (99-106): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/cyclic_dep_exhaustion.sol b/test/libsolidity/syntaxTests/bytecodeReferences/cyclic_dep_exhaustion.sol
deleted file mode 100644
index 44a1a538dce7..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/cyclic_dep_exhaustion.sol
+++ /dev/null
@@ -1,773 +0,0 @@
-contract D {
-    function f() public {
-        new C();
-    }
-}
-contract C {
-    constructor() { new C2(); }
-}
-contract C2 {
-    constructor() { new C3(); }
-}
-contract C3 {
-    constructor() { new C4(); }
-}
-contract C4 {
-    constructor() { new C5(); }
-}
-contract C5 {
-    constructor() { new C6(); }
-}
-contract C6 {
-    constructor() { new C7(); }
-}
-contract C7 {
-    constructor() { new C8(); }
-}
-contract C8 {
-    constructor() { new C9(); }
-}
-contract C9 {
-    constructor() { new C10(); }
-}
-contract C10 {
-    constructor() { new C11(); }
-}
-contract C11 {
-    constructor() { new C12(); }
-}
-contract C12 {
-    constructor() { new C13(); }
-}
-contract C13 {
-    constructor() { new C14(); }
-}
-contract C14 {
-    constructor() { new C15(); }
-}
-contract C15 {
-    constructor() { new C16(); }
-}
-contract C16 {
-    constructor() { new C17(); }
-}
-contract C17 {
-    constructor() { new C18(); }
-}
-contract C18 {
-    constructor() { new C19(); }
-}
-contract C19 {
-    constructor() { new C20(); }
-}
-contract C20 {
-    constructor() { new C21(); }
-}
-contract C21 {
-    constructor() { new C22(); }
-}
-contract C22 {
-    constructor() { new C23(); }
-}
-contract C23 {
-    constructor() { new C24(); }
-}
-contract C24 {
-    constructor() { new C25(); }
-}
-contract C25 {
-    constructor() { new C26(); }
-}
-contract C26 {
-    constructor() { new C27(); }
-}
-contract C27 {
-    constructor() { new C28(); }
-}
-contract C28 {
-    constructor() { new C29(); }
-}
-contract C29 {
-    constructor() { new C30(); }
-}
-contract C30 {
-    constructor() { new C31(); }
-}
-contract C31 {
-    constructor() { new C32(); }
-}
-contract C32 {
-    constructor() { new C33(); }
-}
-contract C33 {
-    constructor() { new C34(); }
-}
-contract C34 {
-    constructor() { new C35(); }
-}
-contract C35 {
-    constructor() { new C36(); }
-}
-contract C36 {
-    constructor() { new C37(); }
-}
-contract C37 {
-    constructor() { new C38(); }
-}
-contract C38 {
-    constructor() { new C39(); }
-}
-contract C39 {
-    constructor() { new C40(); }
-}
-contract C40 {
-    constructor() { new C41(); }
-}
-contract C41 {
-    constructor() { new C42(); }
-}
-contract C42 {
-    constructor() { new C43(); }
-}
-contract C43 {
-    constructor() { new C44(); }
-}
-contract C44 {
-    constructor() { new C45(); }
-}
-contract C45 {
-    constructor() { new C46(); }
-}
-contract C46 {
-    constructor() { new C47(); }
-}
-contract C47 {
-    constructor() { new C48(); }
-}
-contract C48 {
-    constructor() { new C49(); }
-}
-contract C49 {
-    constructor() { new C50(); }
-}
-contract C50 {
-    constructor() { new C51(); }
-}
-contract C51 {
-    constructor() { new C52(); }
-}
-contract C52 {
-    constructor() { new C53(); }
-}
-contract C53 {
-    constructor() { new C54(); }
-}
-contract C54 {
-    constructor() { new C55(); }
-}
-contract C55 {
-    constructor() { new C56(); }
-}
-contract C56 {
-    constructor() { new C57(); }
-}
-contract C57 {
-    constructor() { new C58(); }
-}
-contract C58 {
-    constructor() { new C59(); }
-}
-contract C59 {
-    constructor() { new C60(); }
-}
-contract C60 {
-    constructor() { new C61(); }
-}
-contract C61 {
-    constructor() { new C62(); }
-}
-contract C62 {
-    constructor() { new C63(); }
-}
-contract C63 {
-    constructor() { new C64(); }
-}
-contract C64 {
-    constructor() { new C65(); }
-}
-contract C65 {
-    constructor() { new C66(); }
-}
-contract C66 {
-    constructor() { new C67(); }
-}
-contract C67 {
-    constructor() { new C68(); }
-}
-contract C68 {
-    constructor() { new C69(); }
-}
-contract C69 {
-    constructor() { new C70(); }
-}
-contract C70 {
-    constructor() { new C71(); }
-}
-contract C71 {
-    constructor() { new C72(); }
-}
-contract C72 {
-    constructor() { new C73(); }
-}
-contract C73 {
-    constructor() { new C74(); }
-}
-contract C74 {
-    constructor() { new C75(); }
-}
-contract C75 {
-    constructor() { new C76(); }
-}
-contract C76 {
-    constructor() { new C77(); }
-}
-contract C77 {
-    constructor() { new C78(); }
-}
-contract C78 {
-    constructor() { new C79(); }
-}
-contract C79 {
-    constructor() { new C80(); }
-}
-contract C80 {
-    constructor() { new C81(); }
-}
-contract C81 {
-    constructor() { new C82(); }
-}
-contract C82 {
-    constructor() { new C83(); }
-}
-contract C83 {
-    constructor() { new C84(); }
-}
-contract C84 {
-    constructor() { new C85(); }
-}
-contract C85 {
-    constructor() { new C86(); }
-}
-contract C86 {
-    constructor() { new C87(); }
-}
-contract C87 {
-    constructor() { new C88(); }
-}
-contract C88 {
-    constructor() { new C89(); }
-}
-contract C89 {
-    constructor() { new C90(); }
-}
-contract C90 {
-    constructor() { new C91(); }
-}
-contract C91 {
-    constructor() { new C92(); }
-}
-contract C92 {
-    constructor() { new C93(); }
-}
-contract C93 {
-    constructor() { new C94(); }
-}
-contract C94 {
-    constructor() { new C95(); }
-}
-contract C95 {
-    constructor() { new C96(); }
-}
-contract C96 {
-    constructor() { new C97(); }
-}
-contract C97 {
-    constructor() { new C98(); }
-}
-contract C98 {
-    constructor() { new C99(); }
-}
-contract C99 {
-    constructor() { new C100(); }
-}
-contract C100 {
-    constructor() { new C101(); }
-}
-contract C101 {
-    constructor() { new C102(); }
-}
-contract C102 {
-    constructor() { new C103(); }
-}
-contract C103 {
-    constructor() { new C104(); }
-}
-contract C104 {
-    constructor() { new C105(); }
-}
-contract C105 {
-    constructor() { new C106(); }
-}
-contract C106 {
-    constructor() { new C107(); }
-}
-contract C107 {
-    constructor() { new C108(); }
-}
-contract C108 {
-    constructor() { new C109(); }
-}
-contract C109 {
-    constructor() { new C110(); }
-}
-contract C110 {
-    constructor() { new C111(); }
-}
-contract C111 {
-    constructor() { new C112(); }
-}
-contract C112 {
-    constructor() { new C113(); }
-}
-contract C113 {
-    constructor() { new C114(); }
-}
-contract C114 {
-    constructor() { new C115(); }
-}
-contract C115 {
-    constructor() { new C116(); }
-}
-contract C116 {
-    constructor() { new C117(); }
-}
-contract C117 {
-    constructor() { new C118(); }
-}
-contract C118 {
-    constructor() { new C119(); }
-}
-contract C119 {
-    constructor() { new C120(); }
-}
-contract C120 {
-    constructor() { new C121(); }
-}
-contract C121 {
-    constructor() { new C122(); }
-}
-contract C122 {
-    constructor() { new C123(); }
-}
-contract C123 {
-    constructor() { new C124(); }
-}
-contract C124 {
-    constructor() { new C125(); }
-}
-contract C125 {
-    constructor() { new C126(); }
-}
-contract C126 {
-    constructor() { new C127(); }
-}
-contract C127 {
-    constructor() { new C128(); }
-}
-contract C128 {
-    constructor() { new C129(); }
-}
-contract C129 {
-    constructor() { new C130(); }
-}
-contract C130 {
-    constructor() { new C131(); }
-}
-contract C131 {
-    constructor() { new C132(); }
-}
-contract C132 {
-    constructor() { new C133(); }
-}
-contract C133 {
-    constructor() { new C134(); }
-}
-contract C134 {
-    constructor() { new C135(); }
-}
-contract C135 {
-    constructor() { new C136(); }
-}
-contract C136 {
-    constructor() { new C137(); }
-}
-contract C137 {
-    constructor() { new C138(); }
-}
-contract C138 {
-    constructor() { new C139(); }
-}
-contract C139 {
-    constructor() { new C140(); }
-}
-contract C140 {
-    constructor() { new C141(); }
-}
-contract C141 {
-    constructor() { new C142(); }
-}
-contract C142 {
-    constructor() { new C143(); }
-}
-contract C143 {
-    constructor() { new C144(); }
-}
-contract C144 {
-    constructor() { new C145(); }
-}
-contract C145 {
-    constructor() { new C146(); }
-}
-contract C146 {
-    constructor() { new C147(); }
-}
-contract C147 {
-    constructor() { new C148(); }
-}
-contract C148 {
-    constructor() { new C149(); }
-}
-contract C149 {
-    constructor() { new C150(); }
-}
-contract C150 {
-    constructor() { new C151(); }
-}
-contract C151 {
-    constructor() { new C152(); }
-}
-contract C152 {
-    constructor() { new C153(); }
-}
-contract C153 {
-    constructor() { new C154(); }
-}
-contract C154 {
-    constructor() { new C155(); }
-}
-contract C155 {
-    constructor() { new C156(); }
-}
-contract C156 {
-    constructor() { new C157(); }
-}
-contract C157 {
-    constructor() { new C158(); }
-}
-contract C158 {
-    constructor() { new C159(); }
-}
-contract C159 {
-    constructor() { new C160(); }
-}
-contract C160 {
-    constructor() { new C161(); }
-}
-contract C161 {
-    constructor() { new C162(); }
-}
-contract C162 {
-    constructor() { new C163(); }
-}
-contract C163 {
-    constructor() { new C164(); }
-}
-contract C164 {
-    constructor() { new C165(); }
-}
-contract C165 {
-    constructor() { new C166(); }
-}
-contract C166 {
-    constructor() { new C167(); }
-}
-contract C167 {
-    constructor() { new C168(); }
-}
-contract C168 {
-    constructor() { new C169(); }
-}
-contract C169 {
-    constructor() { new C170(); }
-}
-contract C170 {
-    constructor() { new C171(); }
-}
-contract C171 {
-    constructor() { new C172(); }
-}
-contract C172 {
-    constructor() { new C173(); }
-}
-contract C173 {
-    constructor() { new C174(); }
-}
-contract C174 {
-    constructor() { new C175(); }
-}
-contract C175 {
-    constructor() { new C176(); }
-}
-contract C176 {
-    constructor() { new C177(); }
-}
-contract C177 {
-    constructor() { new C178(); }
-}
-contract C178 {
-    constructor() { new C179(); }
-}
-contract C179 {
-    constructor() { new C180(); }
-}
-contract C180 {
-    constructor() { new C181(); }
-}
-contract C181 {
-    constructor() { new C182(); }
-}
-contract C182 {
-    constructor() { new C183(); }
-}
-contract C183 {
-    constructor() { new C184(); }
-}
-contract C184 {
-    constructor() { new C185(); }
-}
-contract C185 {
-    constructor() { new C186(); }
-}
-contract C186 {
-    constructor() { new C187(); }
-}
-contract C187 {
-    constructor() { new C188(); }
-}
-contract C188 {
-    constructor() { new C189(); }
-}
-contract C189 {
-    constructor() { new C190(); }
-}
-contract C190 {
-    constructor() { new C191(); }
-}
-contract C191 {
-    constructor() { new C192(); }
-}
-contract C192 {
-    constructor() { new C193(); }
-}
-contract C193 {
-    constructor() { new C194(); }
-}
-contract C194 {
-    constructor() { new C195(); }
-}
-contract C195 {
-    constructor() { new C196(); }
-}
-contract C196 {
-    constructor() { new C197(); }
-}
-contract C197 {
-    constructor() { new C198(); }
-}
-contract C198 {
-    constructor() { new C199(); }
-}
-contract C199 {
-    constructor() { new C200(); }
-}
-contract C200 {
-    constructor() { new C201(); }
-}
-contract C201 {
-    constructor() { new C202(); }
-}
-contract C202 {
-    constructor() { new C203(); }
-}
-contract C203 {
-    constructor() { new C204(); }
-}
-contract C204 {
-    constructor() { new C205(); }
-}
-contract C205 {
-    constructor() { new C206(); }
-}
-contract C206 {
-    constructor() { new C207(); }
-}
-contract C207 {
-    constructor() { new C208(); }
-}
-contract C208 {
-    constructor() { new C209(); }
-}
-contract C209 {
-    constructor() { new C210(); }
-}
-contract C210 {
-    constructor() { new C211(); }
-}
-contract C211 {
-    constructor() { new C212(); }
-}
-contract C212 {
-    constructor() { new C213(); }
-}
-contract C213 {
-    constructor() { new C214(); }
-}
-contract C214 {
-    constructor() { new C215(); }
-}
-contract C215 {
-    constructor() { new C216(); }
-}
-contract C216 {
-    constructor() { new C217(); }
-}
-contract C217 {
-    constructor() { new C218(); }
-}
-contract C218 {
-    constructor() { new C219(); }
-}
-contract C219 {
-    constructor() { new C220(); }
-}
-contract C220 {
-    constructor() { new C221(); }
-}
-contract C221 {
-    constructor() { new C222(); }
-}
-contract C222 {
-    constructor() { new C223(); }
-}
-contract C223 {
-    constructor() { new C224(); }
-}
-contract C224 {
-    constructor() { new C225(); }
-}
-contract C225 {
-    constructor() { new C226(); }
-}
-contract C226 {
-    constructor() { new C227(); }
-}
-contract C227 {
-    constructor() { new C228(); }
-}
-contract C228 {
-    constructor() { new C229(); }
-}
-contract C229 {
-    constructor() { new C230(); }
-}
-contract C230 {
-    constructor() { new C231(); }
-}
-contract C231 {
-    constructor() { new C232(); }
-}
-contract C232 {
-    constructor() { new C233(); }
-}
-contract C233 {
-    constructor() { new C234(); }
-}
-contract C234 {
-    constructor() { new C235(); }
-}
-contract C235 {
-    constructor() { new C236(); }
-}
-contract C236 {
-    constructor() { new C237(); }
-}
-contract C237 {
-    constructor() { new C238(); }
-}
-contract C238 {
-    constructor() { new C239(); }
-}
-contract C239 {
-    constructor() { new C240(); }
-}
-contract C240 {
-    constructor() { new C241(); }
-}
-contract C241 {
-    constructor() { new C242(); }
-}
-contract C242 {
-    constructor() { new C243(); }
-}
-contract C243 {
-    constructor() { new C244(); }
-}
-contract C244 {
-    constructor() { new C245(); }
-}
-contract C245 {
-    constructor() { new C246(); }
-}
-contract C246 {
-    constructor() { new C247(); }
-}
-contract C247 {
-    constructor() { new C248(); }
-}
-contract C248 {
-    constructor() { new C249(); }
-}
-contract C249 {
-    constructor() { new C250(); }
-}
-contract C250 {
-    constructor() { new C251(); }
-}
-contract C251 {
-    constructor() { new C252(); }
-}
-contract C252 {
-    constructor() { new C253(); }
-}
-contract C253 {
-    constructor() { new C254(); }
-}
-contract C254 {
-    constructor() { new C255(); }
-}
-contract C255 {
-    constructor() { new C(); }
-}
-
-// ----
-// TypeError 7864: (13057-13105): Contract dependencies exhausting cyclic dependency validator
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol
deleted file mode 100644
index a0b7e4e7a85c..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L1 {
-    function foo() internal { new A(); }
-}
-library L2 {
-    function foo() internal { L1.foo(); }
-}
-contract A {
-    function f() public pure { L2.foo(); }
-}
-// ----
-// TypeError 7813: (43-48): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol
deleted file mode 100644
index 53ecc0755db5..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-library L {
-    function f() internal {
-        new C();
-    }
-}
-
-contract D {
-    function f() public {
-        L.f();
-    }
-}
-contract C {
-    constructor() { new D(); }
-}
-
-// ----
-// TypeError 7813: (48-53): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (161-166): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol
deleted file mode 100644
index b7392ff3ee74..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L1 {
-    function foo() internal { new A(); }
-}
-library L2 {
-    function foo() internal { L1.foo(); }
-}
-contract A {
-    function f() public pure { type(L2).creationCode; }
-}
-// ----
-// Warning 6133: (157-178): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_public_called.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_public_called.sol
deleted file mode 100644
index 93f314b4fb9a..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_public_called.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L1 {
-    function foo() internal { new A(); }
-}
-library L2 {
-    function foo() public { L1.foo(); }
-}
-contract A {
-    function f() public { L2.foo(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol
deleted file mode 100644
index 955ea24d9ec1..000000000000
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L1 {
-    function foo() public { L2.foo(); }
-
-}
-library L2 {
-    function foo() internal { type(L1).creationCode; }
-}
-// ----
-// TypeError 7813: (99-120): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol
deleted file mode 100644
index 2a731411a1bb..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF
-        /*underflow ‬*/
-    }
-}
-// ----
-// ParserError 8936: (71-83): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol
deleted file mode 100644
index a8576fb06a85..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF PDF
-        /*underflow ‬‬*/
-    }
-}
-// ----
-// ParserError 8936: (75-87): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol
deleted file mode 100644
index b019702261d8..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO
-        /*overflow ‮*/
-    }
-}
-// ----
-// ParserError 8936: (71-86): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol
deleted file mode 100644
index 45f14cd01249..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO RLO
-        /*overflow ‮‮*/
-    }
-}
-// ----
-// ParserError 8936: (75-93): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_5.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_5.sol
deleted file mode 100644
index 46d201772015..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO PDF
-        /*ok ‮‬*/
-
-        // RLO RLO PDF PDF
-        /*ok ‮‮‬‬*/
-
-        // RLO RLO RLO PDF PDF PDF
-        /*ok ‮‮‮‬‬‬*/
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol
deleted file mode 100644
index 5ad89117c1da..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF RLO
-        /*overflow ‬‮*/
-    }
-}
-// ----
-// ParserError 8936: (75-86): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_7.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_7.sol
deleted file mode 100644
index 80f40a97f0ed..000000000000
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_7.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        /* LRO‭ LRE‪ RLE ‫  PDF‬ RLO‮ PDF ‬ PDF‬
-    }
-}
-// ----
-// ParserError 8936: (52-115): Expected multi-line comment-terminator.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol
deleted file mode 100644
index 16eaaeddb8f0..000000000000
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF
-        // underflow ‬
-    }
-}
-// ----
-// ParserError 8936: (71-84): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol
deleted file mode 100644
index 91f544fb6426..000000000000
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF PDF
-        // underflow ‬‬
-    }
-}
-// ----
-// ParserError 8936: (75-88): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol
deleted file mode 100644
index bc9b0cff5398..000000000000
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO
-        // overflow ‮
-    }
-}
-// ----
-// ParserError 8936: (71-86): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol
deleted file mode 100644
index 907f213bd685..000000000000
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO RLO
-        // overflow ‮‮
-    }
-}
-// ----
-// ParserError 8936: (75-93): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_5.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_5.sol
deleted file mode 100644
index 0c13f7fec713..000000000000
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO PDF
-        // ok ‮‬
-
-        // RLO RLO PDF PDF
-        // ok ‮‮‬‬
-
-        // RLO RLO RLO PDF PDF PDF
-        // ok ‮‮‮‬‬‬
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol
deleted file mode 100644
index 2040d6fb22ac..000000000000
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF RLO
-        // underflow ‬‮
-    }
-}
-// ----
-// ParserError 8936: (75-88): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol b/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol
deleted file mode 100644
index f8abd48bfe57..000000000000
--- a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool b) public pure
-    {
-        if ‬(b) { return; }
-    }
-}
-// ----
-// ParserError 2314: (65-66): Expected '(' but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol b/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol
deleted file mode 100644
index 464b62729051..000000000000
--- a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool b) public pure
-    {
-        uint a = 10; ‬
-    }
-}
-// ----
-// ParserError 8936: (75-76): Invalid token.
diff --git a/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol b/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol
deleted file mode 100644
index ec3f1052d297..000000000000
--- a/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract TimelockUpgrade {
-    function confirmUpgrade() external {
-        uint256 m;
-        uint256 d;
-        (/*year*/,/*month‮*/,d/*yad*/,m/*‬‬hour*/,/*minute*/,/*second*/) = BokkyDateTime.timestampToDateTime(block.timestamp);
-    }
-}
-
-// ----
-// ParserError 8936: (124-135): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol b/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol
deleted file mode 100644
index 55bd279019b7..000000000000
--- a/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint8 constant a = 255;
-    uint16 constant b = a + 2;
-    function f() public pure {
-        uint[b] memory x;
-    }
-}
-// ----
-// TypeError 2643: (65-70): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
deleted file mode 100644
index 086d89151262..000000000000
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-int[L] constant L = 6;
-// ----
-// TypeError 5462: (4-5): Invalid array length, expected integer literal or constant expression.
-// TypeError 9259: (0-21): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
deleted file mode 100644
index dfb81378b43f..000000000000
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    int[L] constant L = 6;
-}
-// ----
-// TypeError 5462: (21-22): Invalid array length, expected integer literal or constant expression.
-// TypeError 9259: (17-38): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/unary_fine.sol b/test/libsolidity/syntaxTests/constantEvaluator/unary_fine.sol
deleted file mode 100644
index f36c45c0dd32..000000000000
--- a/test/libsolidity/syntaxTests/constantEvaluator/unary_fine.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    int8 constant a = -7;
-    function f() public pure {
-        uint[-a] memory x;
-        x[0] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol b/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol
deleted file mode 100644
index 6ca25911ad2d..000000000000
--- a/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint8 constant a = 0;
-    function f() public pure {
-        uint[a - 1] memory x;
-    }
-}
-// ----
-// TypeError 2643: (83-88): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol b/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol
deleted file mode 100644
index 5887ab19d0bb..000000000000
--- a/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    int8 constant a = -128;
-    function f() public pure {
-        uint[-a] memory x;
-    }
-}
-// ----
-// TypeError 3667: (85-87): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/constants/abi_encoding_constant.sol b/test/libsolidity/syntaxTests/constants/abi_encoding_constant.sol
deleted file mode 100644
index dd6968a07a67..000000000000
--- a/test/libsolidity/syntaxTests/constants/abi_encoding_constant.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    bytes32 constant a = keccak256(abi.encode(1, 2));
-    bytes32 constant b = keccak256(abi.encodePacked(uint(1), a));
-    bytes32 constant c = keccak256(abi.encodeWithSelector(0x12345678, b, 2));
-    bytes32 constant d = keccak256(abi.encodeWithSignature("f()", 1, 2));
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol b/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol
deleted file mode 100644
index 741cd56ee60d..000000000000
--- a/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint constant a = addmod(3, 4, 0.1);
-    uint constant b = mulmod(3, 4, 0.1);
-}
-// ----
-// TypeError 9553: (48-51): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
-// TypeError 9553: (89-92): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/constants/addmod_zero.sol b/test/libsolidity/syntaxTests/constants/addmod_zero.sol
deleted file mode 100644
index 2c5a0de49d80..000000000000
--- a/test/libsolidity/syntaxTests/constants/addmod_zero.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract c {
-    uint constant a1 = 0;
-    uint constant a2 = 1;
-    uint constant b1 = addmod(3, 4, 0);
-    uint constant b2 = addmod(3, 4, a1);
-    uint constant b3 = addmod(3, 4, a2 - 1);
-}
-// ----
-// TypeError 4195: (88-103): Arithmetic modulo zero.
-// TypeError 4195: (128-144): Arithmetic modulo zero.
-// TypeError 4195: (169-189): Arithmetic modulo zero.
diff --git a/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol b/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol
deleted file mode 100644
index 5f5624084d9d..000000000000
--- a/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function () pure returns (uint) x;
-    uint constant y = x();
-}
-// ----
-// TypeError 8349: (74-77): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol b/test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol
deleted file mode 100644
index e0af337c735a..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-type Type is uint;
-using {f as +} for Type global;
-function f(Type, Type) pure returns (Type) {}
-
-Type constant t = Type.wrap(1);
-Type constant u = v + t;
-Type constant v = u + t;
-// ----
-// TypeError 8349: (148-153): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (173-178): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/constants/constant_natspec.sol b/test/libsolidity/syntaxTests/constants/constant_natspec.sol
deleted file mode 100644
index 31e5dbdaa57c..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_natspec.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @dev Documentation
-uint constant x = 8;
-// ----
diff --git a/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol b/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol
deleted file mode 100644
index feb952860f4b..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-/// Documentation
-uint constant x = 8;
-// ----
-// DocstringParsingError 6546: (0-18): Documentation tag @notice not valid for file-level variables.
diff --git a/test/libsolidity/syntaxTests/constants/constant_override.sol b/test/libsolidity/syntaxTests/constants/constant_override.sol
deleted file mode 100644
index 3aa974012e50..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_override.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint constant override x = 2;
-// ----
-// ParserError 2314: (14-22): Expected identifier but got 'override'
diff --git a/test/libsolidity/syntaxTests/constants/constant_unassigned.sol b/test/libsolidity/syntaxTests/constants/constant_unassigned.sol
deleted file mode 100644
index 8ee727ed7ffd..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_unassigned.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint constant x;
-// ----
-// TypeError 4266: (0-15): Uninitialized "constant" variable.
diff --git a/test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol b/test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol
deleted file mode 100644
index 19e8bfee2108..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-uint256 constant MAX = 1;
-
-library L1 {
-    uint256 internal constant INT = 100;
-}
-
-contract C1 {
-    uint256 internal constant CONST1 = L1.INT;
-
-    uint256[L1.INT] internal arr1; // error, backward reference
-    uint256[L2.INT] internal arr2; // error, forward reference
-}
-
-contract C2 is C1 {
-    uint256 internal constant CONST2 = CONST1;
-
-    uint256[CONST1] internal arr3; // error, inherited constants
-    uint256[CONST2] internal arr4; // error, same contract constant
-}
-
-library L2 {
-    uint256 internal constant INT = 100;
-}
-
-// ----
-// TypeError 5462: (158-164): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (222-228): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (356-362): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (421-427): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/constants/constant_virtual.sol b/test/libsolidity/syntaxTests/constants/constant_virtual.sol
deleted file mode 100644
index e6f885cdfc07..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_virtual.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint constant virtual x;
-// ----
-// ParserError 2314: (14-21): Expected identifier but got 'virtual'
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol
deleted file mode 100644
index a2a1ce20ee15..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-uint256 constant MAX = 1;
-
-library L1 {
-    uint256 internal constant INT = 100;
-}
-
-contract C1 {
-    uint256 internal constant CONST = 20 + L2.INT; // forward reference
-    uint256 internal constant LIMIT = MAX * L1.INT;  // same file & external library constant
-    uint256 internal constant NESTED = LIMIT + CONST; // nested & same contract constant
-
-    uint256[L1.INT] internal arr1; // error, backward reference
-    uint256[L2.INT] internal arr2; // error, forward reference
-}
-
-contract C2 is C1 {
-    uint256 internal constant INHERITED = NESTED + CONST * LIMIT; // inherited constants
-}
-
-contract C3 is C2 {
-    uint256 internal constant NESTED_INHERITED = INHERITED + NESTED + CONST * LIMIT; // nest-inherited constants
-
-    uint256[CONST] internal arr3;            // error, nest-inherited constants
-    uint256[NESTED_INHERITED] internal arr4; // error, same contract constant
-}
-
-library L2 {
-    uint256 internal constant INT = 100;
-}
-
-// ----
-// TypeError 5462: (366-372): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (430-436): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (742-747): Invalid array length, expected integer literal or constant expression.
-// TypeError 5462: (822-838): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol
deleted file mode 100644
index 964ffb5f2bea..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-uint256 constant MAX = 1;
-
-library L1 {
-    uint256 internal constant INT = 100;
-}
-
-contract C1 {
-    uint256 internal constant CONST = 20 + L2.INT; // forward reference
-    uint256 internal constant LIMIT = MAX * L1.INT;  // same file & external library constant
-    uint256 internal constant NESTED = LIMIT + CONST; // nested & same contract constant
-}
-
-contract C2 is C1 {
-    uint256 internal constant INHERITED = NESTED + CONST * LIMIT; // inherited constants
-}
-
-contract C3 is C2 {
-    uint256 internal constant NESTED_INHERITED = INHERITED + NESTED + CONST * LIMIT; // nest-inherited constants
-}
-
-library L2 {
-    uint256 internal constant INT = 100;
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol
deleted file mode 100644
index 9bb1723e7e99..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: A.sol ====
-import "B.sol" as B;
-
-uint constant X = 1;
-uint constant Y = B.Y;
-
-==== Source: B.sol ====
-import "A.sol" as A;
-
-uint constant X = A.X;
-uint constant Y = 2;
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol b/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol
deleted file mode 100644
index 5b7fbf81c990..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint public constant x = 7;
-// ----
-// ParserError 2314: (5-11): Expected identifier but got 'public'
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol b/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol
deleted file mode 100644
index 6ac50ca924fc..000000000000
--- a/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint constant public y = 7;
-// ----
-// ParserError 2314: (14-20): Expected identifier but got 'public'
diff --git a/test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol b/test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol
deleted file mode 100644
index 4518a510a674..000000000000
--- a/test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A.sol ====
-import "B.sol";
-
-library L {
-    uint constant X = 1;
-    uint constant Y = K.Y;
-}
-
-==== Source: B.sol ====
-import "A.sol";
-
-library K {
-    uint constant X = L.X;
-    uint constant Y = 2;
-}
-
-// ====
diff --git a/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol b/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol
deleted file mode 100644
index 1843204bdcd1..000000000000
--- a/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: a ====
-import "b";
-uint constant c = d;
-==== Source: b ====
-import "a";
-uint constant b = c;
-uint constant d = b;
-contract C {
-    uint constant a = b;
-}
-// ----
-// TypeError 6161: (b:12-31): The value of the constant b has a cyclic dependency via c.
-// TypeError 6161: (b:33-52): The value of the constant d has a cyclic dependency via b.
-// TypeError 6161: (b:71-90): The value of the constant a has a cyclic dependency via b.
-// TypeError 6161: (a:12-31): The value of the constant c has a cyclic dependency via d.
diff --git a/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol b/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol
deleted file mode 100644
index 07dd156b8b31..000000000000
--- a/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: a ====
-import "b";
-uint constant c = d;
-==== Source: b ====
-import "a" as M;
-uint constant b = M.c;
-uint constant d = b;
-contract C {
-    uint constant a = b;
-}
-// ----
-// TypeError 6161: (b:17-38): The value of the constant b has a cyclic dependency via c.
-// TypeError 6161: (b:40-59): The value of the constant d has a cyclic dependency via b.
-// TypeError 6161: (b:78-97): The value of the constant a has a cyclic dependency via b.
-// TypeError 6161: (a:12-31): The value of the constant c has a cyclic dependency via d.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol
deleted file mode 100644
index ebd81d4a2335..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint constant a = a;
-}
-// ----
-// TypeError 6161: (17-36): The value of the constant a has a cyclic dependency via a.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol
deleted file mode 100644
index 676f534cc66e..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint constant a = b * c;
-    uint constant b = 7;
-    uint constant c = b + uint(keccak256(abi.encodePacked(d)));
-    uint constant d = 2 + a;
-}
-// ----
-// TypeError 6161: (17-40): The value of the constant a has a cyclic dependency via c.
-// TypeError 6161: (71-129): The value of the constant c has a cyclic dependency via d.
-// TypeError 6161: (135-158): The value of the constant d has a cyclic dependency via a.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol
deleted file mode 100644
index e280f4a97fdd..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint constant x = a;
-    uint constant a = b * c;
-    uint constant b = c;
-    uint constant c = b;
-}
-// ----
-// TypeError 6161: (17-36): The value of the constant x has a cyclic dependency via a.
-// TypeError 6161: (42-65): The value of the constant a has a cyclic dependency via b.
-// TypeError 6161: (71-90): The value of the constant b has a cyclic dependency via c.
-// TypeError 6161: (96-115): The value of the constant c has a cyclic dependency via b.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_4.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_4.sol
deleted file mode 100644
index cc34fad28974..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint constant a = b * c;
-    uint constant b = 7;
-    uint constant c = 4 + uint(keccak256(abi.encode(d)));
-    uint constant d = 2 + b;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol
deleted file mode 100644
index b8a5b49ae932..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  uint constant a = uint(keccak256(abi.encode(d)));
-  uint c = uint(keccak256(abi.encode(d)));
-  uint constant d = a;
-}
-// ----
-// TypeError 6161: (15-63): The value of the constant a has a cyclic dependency via d.
-// TypeError 6161: (110-129): The value of the constant d has a cyclic dependency via a.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol
deleted file mode 100644
index 92f5dfce6b00..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: A.sol ====
-import "B.sol";
-
-uint256 constant A = B.VAL + 1;
-
-==== Source: B.sol ====
-import "A.sol";
-
-library B {
-    uint256 constant VAL = A + 1;
-}
-
-// ----
-// TypeError 6161: (B.sol:33-61): The value of the constant VAL has a cyclic dependency via A.
-// TypeError 6161: (A.sol:17-47): The value of the constant A has a cyclic dependency via VAL.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol
deleted file mode 100644
index d874abba7d09..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: A.sol ====
-import "B.sol";
-
-uint256 constant A = B + 1;
-
-==== Source: B.sol ====
-import "A.sol";
-
-uint256 constant B = A + 1;
-
-// ----
-// TypeError 6161: (B.sol:17-43): The value of the constant B has a cyclic dependency via A.
-// TypeError 6161: (A.sol:17-43): The value of the constant A has a cyclic dependency via B.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol
deleted file mode 100644
index d72ea0a666b2..000000000000
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library A {
-    uint256 constant VAL = B.VAL + 1;
-}
-
-library B {
-    uint256 constant VAL = A.VAL + 1;
-}
-
-// ----
-// TypeError 6161: (16-48): The value of the constant VAL has a cyclic dependency via VAL.
-// TypeError 6161: (69-101): The value of the constant VAL has a cyclic dependency via VAL.
diff --git a/test/libsolidity/syntaxTests/constants/division_by_zero.sol b/test/libsolidity/syntaxTests/constants/division_by_zero.sol
deleted file mode 100644
index f734ba40cae3..000000000000
--- a/test/libsolidity/syntaxTests/constants/division_by_zero.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    uint constant a1 = 0;
-    uint constant a2 = 1;
-    uint constant b1 = 7 / a1;
-    uint constant b2 = 7 / (a2 - 1);
-}
-// ----
-// TypeError 1211: (88-94): Division by zero.
-// TypeError 1211: (119-131): Division by zero.
diff --git a/test/libsolidity/syntaxTests/constants/file_level_memory.sol b/test/libsolidity/syntaxTests/constants/file_level_memory.sol
deleted file mode 100644
index ebaf6a410477..000000000000
--- a/test/libsolidity/syntaxTests/constants/file_level_memory.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint[] memory constant x = 2;
-// ----
-// ParserError 2314: (7-13): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol b/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol
deleted file mode 100644
index 95b48d60f3b2..000000000000
--- a/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint[] constant memory x = 2;
-// ----
-// ParserError 2314: (16-22): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol b/test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol
deleted file mode 100644
index 1ca07c6607fc..000000000000
--- a/test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-uint constant constant x;
-// ----
-// ParserError 3109: (14-22): Mutability already set to "constant"
-
diff --git a/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol b/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol
deleted file mode 100644
index 01b8ef7c8469..000000000000
--- a/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-uint immutable x = 7;
-// ----
-// DeclarationError 8342: (0-20): Only constant variables are allowed at file level.
-// DeclarationError 8297: (0-20): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/constants/mapping_constant.sol b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
deleted file mode 100644
index e6b5b124a9de..000000000000
--- a/test/libsolidity/syntaxTests/constants/mapping_constant.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-mapping(uint => uint) constant b = b;
-// ----
-// TypeError 9259: (0-36): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constants/mod_div_rational.sol b/test/libsolidity/syntaxTests/constants/mod_div_rational.sol
deleted file mode 100644
index d983fa1ee916..000000000000
--- a/test/libsolidity/syntaxTests/constants/mod_div_rational.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    fixed a1 = 0.1 % -0.4271087646484375;
-    fixed a2 = 0.1 % 0.4271087646484375;
-    fixed a3 = 0 / 0.123;
-    fixed a4 = 0 / -0.123;
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/constants/mod_zero.sol b/test/libsolidity/syntaxTests/constants/mod_zero.sol
deleted file mode 100644
index 0fe34b62a30f..000000000000
--- a/test/libsolidity/syntaxTests/constants/mod_zero.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    uint constant a1 = 0;
-    uint constant a2 = 1;
-    uint constant b1 = 3 % a1;
-    uint constant b2 = 3 % (a2 - 1);
-}
-// ----
-// TypeError 1211: (88-94): Modulo zero.
-// TypeError 1211: (119-131): Modulo zero.
diff --git a/test/libsolidity/syntaxTests/constants/mulmod_zero.sol b/test/libsolidity/syntaxTests/constants/mulmod_zero.sol
deleted file mode 100644
index 5b4e69a04c52..000000000000
--- a/test/libsolidity/syntaxTests/constants/mulmod_zero.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract c {
-    uint constant a1 = 0;
-    uint constant a2 = 1;
-    uint constant b1 = mulmod(3, 4, 0);
-    uint constant b2 = mulmod(3, 4, a1);
-    uint constant b3 = mulmod(3, 4, a2 - 1);
-}
-// ----
-// TypeError 4195: (88-103): Arithmetic modulo zero.
-// TypeError 4195: (128-144): Arithmetic modulo zero.
-// TypeError 4195: (169-189): Arithmetic modulo zero.
diff --git a/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol b/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol
deleted file mode 100644
index 847c4d52fbde..000000000000
--- a/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-uint constant c = 7;
-==== Source: b ====
-import {c as d} from "a";
-uint constant d = 7;
-// ----
-// DeclarationError 2333: (b:26-45): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/constants/non_constant.sol b/test/libsolidity/syntaxTests/constants/non_constant.sol
deleted file mode 100644
index 2851d1e10dd8..000000000000
--- a/test/libsolidity/syntaxTests/constants/non_constant.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-uint x = 7;
-// ----
-// DeclarationError 8342: (0-10): Only constant variables are allowed at file level.
diff --git a/test/libsolidity/syntaxTests/constants/pure_non_rational.sol b/test/libsolidity/syntaxTests/constants/pure_non_rational.sol
deleted file mode 100644
index 642ac39f733d..000000000000
--- a/test/libsolidity/syntaxTests/constants/pure_non_rational.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// Tests that the ConstantEvaluator does not crash for pure non-rational functions.
-// Currently it does not evaluate such functions, but this may change in the future
-// causing a division by zero error for a.
-contract C {
-	uint constant a = 1 / (uint(keccak256([0])[0]) - uint(keccak256([0])[0]));
-	uint constant b = 1 / uint(keccak256([0]));
-	uint constant c = uint(keccak256([0]));
-	uint[c] mem;
-}
-// ----
-// TypeError 5462: (392-393): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol b/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol
deleted file mode 100644
index 5ce740377393..000000000000
--- a/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: a ====
-import "b";
-uint constant c = 7;
-==== Source: b ====
-import "a";
-uint constant c = 7;
-// ----
-// DeclarationError 2333: (b:12-31): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol b/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol
deleted file mode 100644
index bbb71b5ac8d2..000000000000
--- a/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-uint constant c = 7;
-uint constant c = 8;
-// ----
-// DeclarationError 2333: (21-40): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/constants/struct_constant.sol b/test/libsolidity/syntaxTests/constants/struct_constant.sol
deleted file mode 100644
index 9195dac0c85b..000000000000
--- a/test/libsolidity/syntaxTests/constants/struct_constant.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-struct S { uint x; }
-S constant s;
-// ----
-// TypeError 9259: (21-33): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol b/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
deleted file mode 100644
index 144b3141a190..000000000000
--- a/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// This used to cause an internal error because of the visitation order.
-contract Test {
-    function createChild() public {
-       Child asset = new Child();
-    }
-}
-
-contract Parent {
-    constructor(address _address) {}
-}
-
-contract Child is Parent {
-}
-// ----
-// TypeError 3415: (226-254): No arguments passed to the base constructor. Specify the arguments or mark "Child" as abstract.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
deleted file mode 100644
index 5a005c160175..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    constructor(uint, bool) {}
-}
-
-contract D is C() {}
-contract E is C() { constructor() {} }
-contract F is C() { constructor() C {} }
-contract G is C() { constructor() C() {} }
-
-contract H is C {}
-contract I is C { constructor() {} }
-contract J is C { constructor() C {} }
-contract K is C { constructor() C() {} }
-// ----
-// TypeError 3415: (47-67): No arguments passed to the base constructor. Specify the arguments or mark "D" as abstract.
-// TypeError 3415: (68-106): No arguments passed to the base constructor. Specify the arguments or mark "E" as abstract.
-// DeclarationError 1563: (141-142): Modifier-style base constructor call without arguments.
-// TypeError 3415: (107-147): No arguments passed to the base constructor. Specify the arguments or mark "F" as abstract.
-// TypeError 3415: (192-210): No arguments passed to the base constructor. Specify the arguments or mark "H" as abstract.
-// TypeError 3415: (211-247): No arguments passed to the base constructor. Specify the arguments or mark "I" as abstract.
-// DeclarationError 1563: (280-281): Modifier-style base constructor call without arguments.
-// TypeError 3415: (248-286): No arguments passed to the base constructor. Specify the arguments or mark "J" as abstract.
-// TypeError 7927: (61-64): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (82-85): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (121-124): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (141-142): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
-// TypeError 7927: (162-165): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (182-185): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
-// TypeError 2973: (280-281): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
-// TypeError 2973: (319-322): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol
deleted file mode 100644
index 42ba9886f318..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-abstract contract C {
-    constructor(uint, bool) {}
-}
-
-abstract contract D is C() {}
-abstract contract E is C() { constructor() {} }
-abstract contract F is C() { constructor() C {} }
-abstract contract G is C() { constructor() C() {} }
-// ----
-// DeclarationError 1563: (177-178): Modifier-style base constructor call without arguments.
-// TypeError 7927: (79-82): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (109-112): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (157-160): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (177-178): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
-// TypeError 7927: (207-210): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (227-230): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol
deleted file mode 100644
index ad934d7e7bf9..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract contract C {
-    constructor(uint, bool) {}
-}
-
-abstract contract D is C {}
-abstract contract E is C { constructor() {} }
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol
deleted file mode 100644
index 7cf33c0ecdb9..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract C {
-    constructor(uint, bool) {}
-}
-
-abstract contract D is C { constructor() C {} }
-// ----
-// DeclarationError 1563: (97-98): Modifier-style base constructor call without arguments.
-// TypeError 2973: (97-98): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol
deleted file mode 100644
index 43c68a7eee30..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract C {
-    constructor(uint, bool) {}
-}
-
-abstract contract D is C { constructor() C() {} }
-// ----
-// TypeError 2973: (97-100): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
deleted file mode 100644
index 08193b6dae6a..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    constructor(uint, bool) {}
-}
-
-contract D is C(1, true, "a") { constructor() C(1, true, "a") {} }
-contract E is C(1) { constructor() C(1) {} }
-// ----
-// DeclarationError 3364: (93-108): Base constructor arguments given twice.
-// DeclarationError 3364: (149-153): Base constructor arguments given twice.
-// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2
-// TypeError 2973: (93-108): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
-// TypeError 7927: (128-132): Wrong argument count for constructor call: 1 arguments given but expected 2
-// TypeError 2973: (149-153): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
deleted file mode 100644
index f20462484b71..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    constructor(uint, bool) {}
-}
-
-contract D is C(1, true, "a") {}
-contract E is C(1) {}
-// ----
-// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2
-// TypeError 7927: (94-98): Wrong argument count for constructor call: 1 arguments given but expected 2
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
deleted file mode 100644
index b7b619d84398..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract contract C {
-    constructor(uint, bool) {}
-}
-
-abstract contract D is C(1, true, "a") {}
-abstract contract E is C(1) {}
-// ----
-// TypeError 7927: (79-94): Wrong argument count for constructor call: 3 arguments given but expected 2
-// TypeError 7927: (121-125): Wrong argument count for constructor call: 1 arguments given but expected 2
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol
deleted file mode 100644
index 5bf9d1239486..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    constructor(uint, bool) {}
-}
-
-contract D is C() { constructor() C(1, true, "a") {} }
-contract E is C() { constructor() C(1) {} }
-// ----
-// TypeError 7927: (61-64): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (81-96): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
-// TypeError 7927: (116-119): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (136-140): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
deleted file mode 100644
index ff8a0f93b7a8..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    constructor(uint, bool) {}
-}
-
-contract D is C(1, true, "a") { constructor() {} }
-contract E is C(1) { constructor() {} }
-// ----
-// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2
-// TypeError 7927: (112-116): Wrong argument count for constructor call: 1 arguments given but expected 2
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol
deleted file mode 100644
index 8fe486e16ce8..000000000000
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    constructor(uint, bool) {}
-}
-
-contract D is C { constructor() C(1, true, "a") {} }
-contract E is C { constructor() C(1) {} }
-// ----
-// TypeError 2973: (79-94): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
-// TypeError 2973: (132-136): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol b/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol
deleted file mode 100644
index 616fbe5a8504..000000000000
--- a/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    constructor(uint[] calldata) public {}
-}
-// ----
-// TypeError 6651: (29-44): Data location must be "storage" or "memory" for constructor parameter, but "calldata" was given.
diff --git a/test/libsolidity/syntaxTests/constructor/constructer_internal_function_abstract.sol b/test/libsolidity/syntaxTests/constructor/constructer_internal_function_abstract.sol
deleted file mode 100644
index 78ca464cf0e0..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructer_internal_function_abstract.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract contract A {
-    constructor(function() internal) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/constructible_abstract_base.sol b/test/libsolidity/syntaxTests/constructor/constructible_abstract_base.sol
deleted file mode 100644
index 32a9525dc9f1..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructible_abstract_base.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract C {
-	constructor() {}
-}
-contract D is C {
-	constructor() { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol b/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
deleted file mode 100644
index c2735f467824..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract C {
-	constructor() internal {}
-}
-contract D is C {
-	constructor() { }
-}
-// ----
-// Warning 2462: (23-48): Visibility for constructor is ignored. If you want the contract to be non-deployable, making it "abstract" is sufficient.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor.sol b/test/libsolidity/syntaxTests/constructor/constructor.sol
deleted file mode 100644
index 83fccc7b336d..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract A { constructor() {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol b/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
deleted file mode 100644
index e22462daada8..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
+++ /dev/null
@@ -1,59 +0,0 @@
-contract D {
-    constructor(function() external pure returns (uint) ) {
-    }
-}
-
-library L {
-    function f() public pure returns (uint) {
-        return 5;
-    }
-}
-
-contract C {
-    function f() public returns (uint r) {
-        // An assert used to fail if the function types are not exactly equal (pure, view) v/s
-        // default
-        // ok
-        new D(this.testPure);
-        // not okay
-        new D(this.testView);
-        // not okay
-        new D(this.testDefault);
-        // not okay
-        new D(this.testDifferentSignature);
-        // not okay
-        new D(gasleft);
-        // not okay
-        new D(L.f);
-        // not okay
-        new D(testInternalFunction);
-        // not okay
-        new D(this.testInternalFunction);
-    }
-
-    function testPure() public pure returns (uint) {
-    }
-
-    function testView() public view returns (uint) {
-        block.timestamp;
-    }
-
-    function testDefault() public returns (uint) {
-        selfdestruct(payable(address(this)));
-    }
-
-    function testDifferentSignature(uint a) public pure returns (uint) {
-    }
-
-    function testInternalFunction() internal pure returns (uint) {
-        return 10;
-    }
-}
-// ----
-// TypeError 9553: (415-428): Invalid type for argument in function call. Invalid implicit conversion from function () view external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (465-481): Invalid type for argument in function call. Invalid implicit conversion from function () external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (518-545): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (582-589): Invalid type for argument in function call. Invalid implicit conversion from function () view returns (uint256) to function () pure external returns (uint256) requested. Special functions cannot be converted to function types.
-// TypeError 9553: (626-629): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions cannot be converted to function types.
-// TypeError 9553: (666-686): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions cannot be converted to function types.
-// TypeError 9582: (723-748): Member "testInternalFunction" not found or not visible after argument-dependent lookup in contract C.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol b/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol
deleted file mode 100644
index bc57055e84ac..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    constructor(function() internal) {}
-}
-// ----
-// TypeError 4103: (29-49): Internal type is not allowed for public or external functions. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
deleted file mode 100644
index b9e0ed801d35..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    constructor(mapping(uint => uint) memory a) {}
-}
-// ----
-// TypeError 4103: (29-59): Types containing (nested) mappings can only be parameters or return variables of internal or library functions. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol
deleted file mode 100644
index 4162878958c3..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract A {
-    constructor(mapping(uint => uint) memory a) {}
-}
-// ----
-// TypeError 4061: (38-68): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_old.sol b/test/libsolidity/syntaxTests/constructor/constructor_old.sol
deleted file mode 100644
index f89a9641241c..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_old.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { function A() public {} }
-// ----
-// SyntaxError 5796: (13-35): Functions are not allowed to have the same name as the contract. If you intend this to be a constructor, use "constructor(...) { ... }" to define it.
-// Warning 2519: (13-35): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_override.sol b/test/libsolidity/syntaxTests/constructor/constructor_override.sol
deleted file mode 100644
index c0e363f35091..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_override.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    constructor() override {}
-}
-// ----
-// TypeError 1209: (17-42): Constructors cannot override.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_payable.sol b/test/libsolidity/syntaxTests/constructor/constructor_payable.sol
deleted file mode 100644
index ad6cf154f84f..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_payable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    constructor() payable { }
-}
-
-contract D {
-    function createC() public returns (C) {
-       C c = (new C){value: 1}();
-       return c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol b/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
deleted file mode 100644
index 487009d07865..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test1 {
-  constructor() view {}
-}
-contract test2 {
-  constructor() pure {}
-}
-// ----
-// TypeError 1558: (19-40): Constructor must be payable or non-payable, but is "view".
-// TypeError 1558: (62-83): Constructor must be payable or non-payable, but is "pure".
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_storage.sol b/test/libsolidity/syntaxTests/constructor/constructor_storage.sol
deleted file mode 100644
index 9388da132564..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_storage.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    constructor(uint[] storage a) {}
-}
-// ----
-// TypeError 3644: (29-45): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_storage_abstract.sol b/test/libsolidity/syntaxTests/constructor/constructor_storage_abstract.sol
deleted file mode 100644
index 15f4b427c1ee..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_storage_abstract.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract contract A {
-    constructor(uint[] storage a) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol b/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol
deleted file mode 100644
index 61955b6eff53..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    constructor() virtual {}
-}
-// ----
-// TypeError 7001: (17-41): Constructors cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
deleted file mode 100644
index 5992dfa4c9ce..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// The constructor of a base class should not be visible in the derived class
-contract A { constructor(string memory) { } }
-contract B is A {
-  function f() pure public {
-    A x = A(address(0)); // convert from address
-    string memory y = "ab";
-    A(y); // call as a function is invalid
-    x;
-  }
-}
-// ----
-// TypeError 3415: (124-303): No arguments passed to the base constructor. Specify the arguments or mark "B" as abstract.
-// TypeError 9640: (252-256): Explicit type conversion not allowed from "string memory" to "contract A".
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol b/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
deleted file mode 100644
index 869cc18add14..000000000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	constructor();
-}
-// ----
-// TypeError 5700: (14-28): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/external_constructor.sol b/test/libsolidity/syntaxTests/constructor/external_constructor.sol
deleted file mode 100644
index 54ce01b286b8..000000000000
--- a/test/libsolidity/syntaxTests/constructor/external_constructor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	constructor() external {}
-}
-// ----
-// TypeError 9239: (17-42): Constructor cannot have visibility.
diff --git a/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol b/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
deleted file mode 100644
index ae0815ec6390..000000000000
--- a/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function constructor();
-}
-// ----
-// ParserError 3323: (26-37): This function is named "constructor" but is not the constructor of the contract. If you intend this to be a constructor, use "constructor(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol
deleted file mode 100644
index 461857ff135b..000000000000
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract C {
-	constructor() {}
-}
-contract D {
-	function f() public { C c = new C(); c; }
-}
-// ----
-// TypeError 4614: (84-89): Cannot instantiate an abstract contract.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol
deleted file mode 100644
index f947ed6753db..000000000000
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// Previously, the type information for A was not yet available at the point of
-// "new A".
-contract B {
-	A a;
-	constructor() {
-		a = new A(address(this));
-	}
-}
-abstract contract A {
-	constructor(address) {}
-}
-// ----
-// TypeError 4614: (134-139): Cannot instantiate an abstract contract.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
deleted file mode 100644
index fa2b494c06d0..000000000000
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	constructor() internal {}
-}
-contract D {
-	function f() public { C c = new C(); c; }
-}
-// ----
-// DeclarationError 1845: (14-39): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
deleted file mode 100644
index a20e9e2e33af..000000000000
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// Previously, the type information for A was not yet available at the point of
-// "new A".
-contract B {
-	A a;
-	constructor() {
-		a = new A(address(this));
-	}
-}
-contract A {
-	constructor(address) internal {}
-}
-// ----
-// DeclarationError 1845: (175-207): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/interface_constructor.sol b/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
deleted file mode 100644
index bbdab25a6f82..000000000000
--- a/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-interface I {
-	constructor();
-}
-// ----
-// TypeError 6482: (15-29): Constructor cannot be defined in interfaces.
-// TypeError 5700: (15-29): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol b/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol
deleted file mode 100644
index 66f6636056d5..000000000000
--- a/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	constructor() internal {}
-}
-// ----
-// DeclarationError 1845: (14-39): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/library_constructor.sol b/test/libsolidity/syntaxTests/constructor/library_constructor.sol
deleted file mode 100644
index bd1fa9550e5b..000000000000
--- a/test/libsolidity/syntaxTests/constructor/library_constructor.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library Lib {
-	constructor();
-}
-// ----
-// TypeError 7634: (15-29): Constructor cannot be defined in libraries.
-// TypeError 5700: (15-29): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol b/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol
deleted file mode 100644
index 8392cdf6385a..000000000000
--- a/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint256 value;
-    constructor() {
-        value = msg.value;
-    }
-}
-// ----
-// TypeError 5887: (68-77): "msg.value" and "callvalue()" can only be used in payable constructors. Make the constructor "payable" to avoid this error.
diff --git a/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol b/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
deleted file mode 100644
index 8e0c323b8c33..000000000000
--- a/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder v1;
-contract C {
-	constructor(uint[][][] memory t) {}
-}
-// ----
-// TypeError 4957: (46-65): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract.
diff --git a/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol b/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol
deleted file mode 100644
index 2ca22790c128..000000000000
--- a/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder v1;
-abstract contract C {
-	constructor(uint[][][] memory t) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol b/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol
deleted file mode 100644
index cb1923c1f416..000000000000
--- a/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract A1 { constructor() {} }
-contract B1 is A1 {}
-
-contract A2 { constructor() payable {} }
-contract B2 is A2 {}
-
-contract B3 {}
-
-contract B4 { constructor() {} }
-
-contract C {
-	function f() public payable {
-		new B1{value: 10}();
-		new B2{value: 10}();
-		new B3{value: 10}();
-		new B4{value: 10}();
-	}
-}
-// ----
-// TypeError 7006: (214-231): Cannot set option "value", since the constructor of contract B1 is not payable.
-// TypeError 7006: (237-254): Cannot set option "value", since the constructor of contract B2 is not payable.
-// TypeError 7006: (260-277): Cannot set option "value", since the constructor of contract B3 is not payable.
-// TypeError 7006: (283-300): Cannot set option "value", since the constructor of contract B4 is not payable.
diff --git a/test/libsolidity/syntaxTests/constructor/not_a_contract.sol b/test/libsolidity/syntaxTests/constructor/not_a_contract.sol
deleted file mode 100644
index a9a121fe04d0..000000000000
--- a/test/libsolidity/syntaxTests/constructor/not_a_contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// This used to cause an internal error because of the visitation order.
-contract Test {
-    struct S { uint a; }
-    function f() public {
-       new S();
-    }
-}
-// ----
-// TypeError 5540: (147-152): Identifier is not a contract.
diff --git a/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol b/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
deleted file mode 100644
index d33d92860acd..000000000000
--- a/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A { function f() public {} }
-contract B is A {
-  function A() public pure returns (uint8) {}
-  function g() public {
-    A.f();
-  }
-}
-// ----
-// Warning 2519: (58-101): This declaration shadows an existing declaration.
-// TypeError 9582: (130-133): Member "f" not found or not visible after argument-dependent lookup in function () pure returns (uint8).
diff --git a/test/libsolidity/syntaxTests/constructor/payable_new.sol b/test/libsolidity/syntaxTests/constructor/payable_new.sol
deleted file mode 100644
index 350956a4c303..000000000000
--- a/test/libsolidity/syntaxTests/constructor/payable_new.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A1 {}
-contract B1 is A1 { constructor() payable {} }
-
-contract A2 { constructor() {} }
-contract B2 is A2 { constructor() payable {} }
-
-contract B3 { constructor() payable {} }
-
-contract C {
-	function f() public payable {
-		new B1{value: 10}();
-		new B2{value: 10}();
-		new B3{value: 10}();
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol b/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol
deleted file mode 100644
index 0134fd24321e..000000000000
--- a/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract C {
-	constructor() public {}
-}
-// ----
-// DeclarationError 8295: (23-46): Abstract contracts cannot have public constructors. Remove the "public" keyword to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol b/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol
deleted file mode 100644
index 8f6ca5e5497e..000000000000
--- a/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	constructor() public {}
-}
-// ----
-// Warning 2462: (14-37): Visibility for constructor is ignored. If you want the contract to be non-deployable, making it "abstract" is sufficient.
diff --git a/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol b/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
deleted file mode 100644
index c3eea9ea8369..000000000000
--- a/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	constructor() returns (uint a) { }
-}
-// ----
-// TypeError 9712: (39-47): Non-empty "returns" directive for constructor.
diff --git a/test/libsolidity/syntaxTests/constructor/two_constructors.sol b/test/libsolidity/syntaxTests/constructor/two_constructors.sol
deleted file mode 100644
index 6cd7abf734e1..000000000000
--- a/test/libsolidity/syntaxTests/constructor/two_constructors.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	constructor(uint) { }
-	constructor() {}
-}
-// ----
-// DeclarationError 7997: (40-56): More than one constructor defined.
diff --git a/test/libsolidity/syntaxTests/constructor_this.sol b/test/libsolidity/syntaxTests/constructor_this.sol
deleted file mode 100644
index 3740cf867f90..000000000000
--- a/test/libsolidity/syntaxTests/constructor_this.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure {}
-    constructor() {
-        C c = this;
-        c.f(); // this does not warn now, but should warn in the future
-        this.f();
-        (this).f();
-    }
-}
-// ----
-// Warning 5805: (165-169): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
-// Warning 5805: (184-188): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol
deleted file mode 100644
index 2baadc8d0f99..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() internal returns (uint256[] calldata) {}
-}
-// ----
-// TypeError 3464: (48-66): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol
deleted file mode 100644
index 0adfc86fecc6..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() internal returns (uint256[1] calldata) {}
-}
-// ----
-// TypeError 3464: (48-67): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol
deleted file mode 100644
index fd682b090ac9..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    struct S { uint256 x; }
-    function f() internal returns (S calldata) {}
-}
-// ----
-// TypeError 3464: (76-86): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol b/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol
deleted file mode 100644
index a0f17f7aec08..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C0 {
-  function f() external {}
-  function f(int) external {}
-  function f2() external {}
-}
-function f() {}
-contract C {
-  function f() external {}
-}
-contract C2 is C0 {}
-// ----
-// Warning 2519: (16-40): This declaration shadows an existing declaration.
-// Warning 2519: (43-70): This declaration shadows an existing declaration.
-// Warning 2519: (132-156): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/controlFlow/leave_inside_function.sol b/test/libsolidity/syntaxTests/controlFlow/leave_inside_function.sol
deleted file mode 100644
index 245106e133f7..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/leave_inside_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            function f() {
-                // Make sure this doesn't trigger the unimplemented assertion in the control flow builder.
-                leave
-            }
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol b/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol
deleted file mode 100644
index 81727b80b31c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            // Make sure this doesn't trigger the unimplemented assertion in the control flow builder.
-            leave
-        }
-    }
-}
-// ----
-// SyntaxError 8149: (178-183): Keyword "leave" can only be used inside a function.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol
deleted file mode 100644
index 9b155fd2d797..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint[] calldata _c) public pure {
-        uint[] calldata c;
-        if (_c[2] > 10)
-            c = _c;
-        c[2];
-    }
-}
-// ----
-// TypeError 3464: (141-142): This variable is of calldata pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_fine.sol
deleted file mode 100644
index 8bd0aeac2698..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_fine.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint[] calldata _c) public pure {
-        uint[] calldata c;
-        if (_c[2] > 10)
-            c = _c;
-        else
-            c = _c;
-        c[2];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/smoke_declaration.sol b/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/smoke_declaration.sol
deleted file mode 100644
index ae43f6f73afc..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/smoke_declaration.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function g() internal pure returns (bytes calldata) {
-        return msg.data;
-    }
-    function h(uint[] calldata _c) internal pure {
-        uint[] calldata c;
-        c = _c;
-        c[2];
-    }
-    function i(uint[] calldata _c) internal pure {
-        uint[] calldata c;
-        (c) = _c;
-        c[2];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol
deleted file mode 100644
index 61c3822827c7..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {
-        S storage c;
-        assembly {
-            for {} eq(0,0) { c.slot := s.slot } {}
-        }
-        c;
-    }
-    function g() internal pure {
-        S storage c;
-        assembly {
-            for {} eq(0,1) { c.slot := s.slot } {}
-        }
-        c;
-    }
-    function h() internal pure {
-        S storage c;
-        assembly {
-            for {} eq(0,0) {} { c.slot := s.slot }
-        }
-        c;
-    }
-    function i() internal pure {
-        S storage c;
-        assembly {
-            for {} eq(0,1) {} { c.slot := s.slot }
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (189-190): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (340-341): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (491-492): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (642-643): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_fine.sol
deleted file mode 100644
index 4d797e6bdea0..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_fine.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {
-        S storage c;
-        assembly {
-            for { c.slot := s.slot } iszero(0) {} {}
-        }
-        c;
-    }
-    function g() internal pure {
-        S storage c;
-        assembly {
-            for { c.slot := s.slot } iszero(1) {} {}
-        }
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol
deleted file mode 100644
index 120199c14cf5..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal pure {
-        S storage c;
-        assembly {
-            if flag { c.slot := s.slot }
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (188-189): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/returning_function_declaration.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/returning_function_declaration.sol
deleted file mode 100644
index 6c4ee97d6fab..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/returning_function_declaration.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {
-        S storage c;
-        // this should warn about unreachable code, but currently function flow is ignored
-        assembly {
-            function f() { return(0, 0) }
-            f()
-            c.slot := s.slot
-        }
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol
deleted file mode 100644
index 5b57385232b1..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {
-        S storage c;
-        // this could be allowed, but currently control flow for functions is not analysed
-        assembly {
-            function f() { revert(0, 0) }
-            f()
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (287-288): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/stub_declaration.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/stub_declaration.sol
deleted file mode 100644
index f637652c1d60..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/stub_declaration.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {
-        S storage c;
-        assembly {
-            c.slot := s.slot
-        }
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol
deleted file mode 100644
index da2f2fe61193..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(uint256 a) internal pure {
-        S storage c;
-        assembly {
-            switch a
-            case 0 { c.slot := s.slot }
-        }
-        c;
-    }
-    function g(bool flag) internal pure {
-        S storage c;
-        assembly {
-            switch flag
-            case 0 { c.slot := s.slot }
-            case 1 { c.slot := s.slot }
-        }
-        c;
-    }
-    function h(uint256 a) internal pure {
-        S storage c;
-        assembly {
-            switch a
-            case 0 { c.slot := s.slot }
-            default { return(0,0) }
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (208-209): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (421-422): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_fine.sol
deleted file mode 100644
index a92664f4d088..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_fine.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal pure {
-        S storage c;
-        assembly {
-            switch flag
-            case 0 { c.slot := s.slot }
-            default { c.slot := s.slot }
-        }
-        c;
-    }
-    function g(uint256 a) internal pure {
-        S storage c;
-        assembly {
-            switch a
-            case 0 { revert(0, 0) }
-            default { c.slot := s.slot }
-        }
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol
deleted file mode 100644
index e939dbed220c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        do {
-            break;
-            c = s;
-        } while(false);
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        do {
-            if (s.f) {
-                continue;
-                c = s;
-            }
-            else {
-            }
-        } while(false);
-        c;
-    }
-    function h() internal view {
-        S storage c;
-        do {
-            if (s.f) {
-                break;
-            }
-            else {
-                c = s;
-            }
-        } while(false);
-        c;
-    }
-    function i() internal view {
-        S storage c;
-        do {
-            if (s.f) {
-                continue;
-            }
-            else {
-                c = s;
-            }
-        } while(false);
-        c;
-    }
-    function j() internal view {
-        S storage c;
-        do {
-            continue;
-            c = s;
-        } while(false);
-        c;
-    }
-}
-// ----
-// TypeError 3464: (184-185): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (145-150): Unreachable code.
-// Warning 5740: (168-173): Unreachable code.
-// TypeError 3464: (411-412): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (325-330): Unreachable code.
-// TypeError 3464: (635-636): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (862-863): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (1011-1012): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (972-977): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol
deleted file mode 100644
index e46cfbf953bc..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        do {} while((c = s).f);
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        do { c = s; } while(false);
-        c;
-    }
-    function h() internal view {
-        S storage c;
-        c = s;
-        do {} while(false);
-        c;
-    }
-    function i() internal view {
-        S storage c;
-        do {} while(false);
-        c = s;
-        c;
-    }
-    function j() internal view {
-        S storage c;
-        do {
-            c = s;
-            break;
-        } while(false);
-        c;
-    }
-    function k() internal view {
-        S storage c;
-        do {
-            c = s;
-            continue;
-        } while(false);
-        c;
-    }
-}
-// ----
-// Warning 5740: (606-611): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol
deleted file mode 100644
index 50585d384311..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        for(;; c = s) {
-        }
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        for(;;) {
-            c = s;
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (143-144): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (261-262): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_fine.sol
deleted file mode 100644
index b3e9f46d1468..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_fine.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        for(c = s;;) {
-        }
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        for(; (c = s).f;) {
-        }
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol
deleted file mode 100644
index 2787f3efbe53..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal {
-        S storage c;
-        if (flag) c = s;
-        c;
-    }
-    function g(bool flag) internal {
-        S storage c;
-        if (flag) c = s;
-        else
-        {
-            if (!flag) c = s;
-            else s.f = true;
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (138-139): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (330-331): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_fine.sol
deleted file mode 100644
index 5d3a6d5bd52a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_fine.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view {
-        S storage c;
-        if (flag) c = s;
-        else c = s;
-        c;
-    }
-    function g(bool flag) internal view {
-        S storage c;
-        if (flag) c = s;
-        else { c = s; }
-        c;
-    }
-    function h(bool flag) internal view {
-        S storage c;
-        if (flag) c = s;
-        else
-        {
-            if (!flag) c = s;
-            else c = s;
-        }
-        c;
-    }
-    function i() internal view {
-        S storage c;
-        if ((c = s).f) {
-        }
-        c;
-    }
-    function j() internal view {
-        S storage c;
-        if ((c = s).f && !(c = s).f) {
-        }
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol
deleted file mode 100644
index 260ae6b9499f..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    modifier alwaysRevert() {
-        _;
-        revert();
-    }
-    modifier ifFlag(bool flag) {
-        if (flag)
-            _;
-    }
-    struct S { uint a; }
-    S s;
-    function f(bool flag) alwaysRevert() internal view {
-        if (flag) s;
-    }
-    function g(bool flag) alwaysRevert() ifFlag(flag) internal view {
-        s;
-    }
-
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/revert_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/revert_declaration_fine.sol
deleted file mode 100644
index 5cb580528409..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/revert_declaration_fine.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function g(bool flag) internal view {
-        S storage c;
-        if (flag) c = s;
-        else revert();
-        s;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol
deleted file mode 100644
index 28665925a8ea..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        false && (c = s).f;
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        true || (c = s).f;
-        c;
-    }
-    function h() internal view {
-        S storage c;
-        // expect error, although this is always fine
-        true && (false || (c = s).f);
-        c;
-    }
-}
-// ----
-// TypeError 3464: (137-138): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (235-236): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (398-399): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_fine.sol
deleted file mode 100644
index e8ad5e4853f4..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_fine.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        (c = s).f && false;
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        (c = s).f || true;
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/smoke_declaration.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/smoke_declaration.sol
deleted file mode 100644
index f820456e18ee..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/smoke_declaration.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {}
-    function g() internal view { s; }
-    function h() internal view {
-        S storage c;
-        c = s;
-        c;
-    }
-    function i() internal view {
-        S storage c;
-        (c) = s;
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol
deleted file mode 100644
index b5f79de12c5c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint256[] s;
-    function f() public {
-        bool d;
-        uint256[] storage x;
-        uint256[] storage y = d ? (x = s) : x;
-        y;
-    }
-}
-// ----
-// TypeError 3464: (145-146): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol
deleted file mode 100644
index 10e9a67957d1..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint256[] s;
-    function f() public view {
-        uint256[] storage x;
-        uint256[] storage y = (x = s)[0] > 0 ? x : x;
-        y;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol
deleted file mode 100644
index f9ee41a0a103..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view {
-        S storage c;
-        flag ? (c = s).f : false;
-        c;
-    }
-    function g(bool flag) internal view {
-        S storage c;
-        flag ? false : (c = s).f;
-        c;
-    }
-}
-// ----
-// TypeError 3464: (152-153): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (266-267): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_fine.sol
deleted file mode 100644
index 1dd8d2f5745e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_fine.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view {
-        S storage c;
-        flag ? c = s : c = s;
-        c;
-    }
-    function g(bool flag) internal view {
-        S storage c;
-        flag ? c = s : (c = s);
-        c;
-    }
-    function h(bool flag) internal view {
-        S storage c;
-        flag ? (c = s).f : (c = s).f;
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol
deleted file mode 100644
index 6e6ec37222cc..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function ext() external {}
-    function f() internal
-    {
-        S storage r;
-        try this.ext() { }
-        catch (bytes memory) { r = s; }
-        r;
-    }
-    function g() internal
-    {
-        S storage r;
-        try this.ext() { r = s; }
-        catch (bytes memory) { }
-        r;
-    }
-    function h() internal
-    {
-        S storage r;
-        try this.ext() {}
-        catch Error (string memory) { r = s; }
-        catch (bytes memory) { r = s; }
-        r;
-    }
-    function i() internal
-    {
-        S storage r;
-        try this.ext() { r = s; }
-        catch (bytes memory) { r; }
-        r = s;
-        r;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 3464: (206-207): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (343-344): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (526-527): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (653-654): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_fine.sol
deleted file mode 100644
index 285a7810e697..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_fine.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function ext() external { }
-    function f() internal
-    {
-        S storage r;
-        try this.ext() { r = s; }
-        catch (bytes memory) { r = s; }
-        r;
-    }
-    function g() internal
-    {
-        S storage r;
-        try this.ext() { r = s; }
-        catch Error (string memory) { r = s; }
-        catch (bytes memory) { r = s; }
-        r;
-    }
-    function h() internal
-    {
-        S storage r;
-        try this.ext() { }
-        catch (bytes memory) { }
-        r = s;
-        r;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/tuple_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/tuple_declaration_fine.sol
deleted file mode 100644
index e2e27419638a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/tuple_declaration_fine.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage, uint) {
-      return (s,2);
-    }
-    function g() internal view {
-        uint a;
-        S storage c;
-        (c, a) = f();
-        c;
-    }
-    function h() internal view {
-        (s, s);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol
deleted file mode 100644
index b120554cc628..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        while(false) {
-            c = s;
-        }
-        c;
-    }
-}
-// ----
-// TypeError 3464: (161-162): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_fine.sol
deleted file mode 100644
index 20e72e5dbcb9..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_fine.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view {
-        S storage c;
-        while((c = s).f) {
-        }
-        c;
-    }
-    function g() internal view {
-        S storage c;
-        c = s;
-        while(false) {
-        }
-        c;
-    }
-    function h() internal view {
-        S storage c;
-        while(false) {
-        }
-        c = s;
-        c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol
deleted file mode 100644
index 050c422bf428..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() internal pure returns (mapping(uint=>uint) storage r) { }
-}
-// ----
-// TypeError 3464: (53-82): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_fine.sol b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_fine.sol
deleted file mode 100644
index 4146192f3097..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_fine.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    mapping(uint=>uint) m;
-    function f() internal view returns (mapping(uint=>uint) storage r) { r = m; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol
deleted file mode 100644
index f8bb7d12ea3e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() internal pure returns (mapping(uint=>uint) storage) {}
-}
-// ----
-// TypeError 3464: (53-80): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_fine.sol b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_fine.sol
deleted file mode 100644
index 9c5e3149da5b..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_fine.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    mapping(uint=>uint) m;
-    function f() internal view returns (mapping(uint=>uint) storage) { return m; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol
deleted file mode 100644
index 08b4ef12efc0..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-    function f() public view mod {
-        require(block.timestamp > 10);
-    }
-    modifier mod() virtual { }
-}
-// ----
-// SyntaxError 2883: (129-132): Modifier body does not contain '_'.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
deleted file mode 100644
index 63d9153692c2..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-	function f() mod internal returns (uint[] storage) {
-		revert();
-	}
-	function g() mod internal returns (uint[] storage) {
-	}
-	modifier mod() virtual {
-		_;
-	}
-}
-// ----
-// TypeError 3464: (118-132): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
deleted file mode 100644
index 3c5eb80ee439..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-	function f() mod internal returns (uint[] storage) {
-	}
-	modifier mod() virtual {
-		revert();
-		_;
-	}
-}
-contract B is A {
-	modifier mod() override { _; }
-	function g() public {
-		f()[0] = 42;
-	}
-}
-// ----
-// Warning 5740: (65-69): Unreachable code.
-// TypeError 3464: (49-63): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/non_implemented_modifer.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/non_implemented_modifer.sol
deleted file mode 100644
index 61aede05eb5a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/non_implemented_modifer.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract contract A {
-    function f() public view mod {
-        require(block.timestamp > 10);
-    }
-    modifier mod() virtual;
-}
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol
deleted file mode 100644
index 5195d037994c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage c) {
-        assembly {
-            for {} eq(0,0) { c.slot := s.slot } {}
-        }
-    }
-    function g() internal pure returns (S storage c) {
-        assembly {
-            for {} eq(0,1) { c.slot := s.slot } {}
-        }
-    }
-    function h() internal pure returns (S storage c) {
-        assembly {
-            for {} eq(0,0) {} { c.slot := s.slot }
-        }
-    }
-    function i() internal pure returns (S storage c) {
-        assembly {
-            for {} eq(0,1) {} { c.slot := s.slot }
-        }
-    }
-}
-// ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (228-239): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (369-380): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (510-521): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_fine.sol
deleted file mode 100644
index 3160c9e287d7..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_fine.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage c) {
-        assembly {
-            for { c.slot := s.slot } iszero(0) {} {}
-        }
-    }
-    function g() internal pure returns (S storage c) {
-        assembly {
-            for { c.slot := s.slot } iszero(1) {} {}
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol
deleted file mode 100644
index 7e3ceeb2014a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal pure returns (S storage c) {
-        assembly {
-            if flag { c.slot := s.slot }
-        }
-    }
-}
-// ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/returning_function.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/returning_function.sol
deleted file mode 100644
index fbff48f46d12..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/returning_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage c) {
-        // this should warn about unreachable code, but currently function flow is ignored
-        assembly {
-            function f() { return(0, 0) }
-            f()
-            c.slot := s.slot
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol
deleted file mode 100644
index 11d8edfb8b50..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage c) {
-        // this could be allowed, but currently control flow for functions is not analysed
-        assembly {
-            function f() { revert(0, 0) }
-            f()
-        }
-    }
-}
-// ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/stub.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/stub.sol
deleted file mode 100644
index df747d623a06..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/stub.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage c) {
-        assembly {
-            c.slot := s.slot
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol
deleted file mode 100644
index 414078fb1522..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(uint256 a) internal pure returns (S storage c) {
-        assembly {
-            switch a
-            case 0 { c.slot := s.slot }
-        }
-    }
-    function g(bool flag) internal pure returns (S storage c) {
-        assembly {
-            switch flag
-            case 0 { c.slot := s.slot }
-            case 1 { c.slot := s.slot }
-        }
-    }
-    function h(uint256 a) internal pure returns (S storage c) {
-        assembly {
-            switch a
-            case 0 { c.slot := s.slot }
-            default { return(0,0) }
-        }
-    }
-}
-// ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (256-267): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_fine.sol
deleted file mode 100644
index 42f58eac3a90..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_fine.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal pure returns (S storage c) {
-        assembly {
-            switch flag
-            case 0 { c.slot := s.slot }
-            default { c.slot := s.slot }
-        }
-    }
-    function g(uint256 a) internal pure returns (S storage c) {
-        assembly {
-            switch a
-            case 0 { revert(0, 0) }
-            default { c.slot := s.slot }
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_only_default_warn.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_only_default_warn.sol
deleted file mode 100644
index 611f68624945..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_only_default_warn.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(uint256 a) internal pure returns (S storage c) {
-        assembly {
-            switch a
-                default { c.slot := s.slot }
-        }
-    }
-}
-// ----
-// Warning 9592: (142-195): "switch" statement with only a default case.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol
deleted file mode 100644
index 0cb7fa70dad8..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage) {
-        assembly {
-        }
-    }
-}
-// ----
-// TypeError 3464: (87-96): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol
deleted file mode 100644
index 5a4173ab6d28..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S memory c) {
-        c = s;
-    }
-    function g() internal view returns (S memory) {
-        return s;
-    }
-    function h() internal pure returns (S memory) {
-    }
-    function i(bool flag) internal view returns (S memory c) {
-        if (flag) c = s;
-    }
-    function j(bool flag) internal view returns (S memory) {
-        if (flag) return s;
-    }
-}
-// ----
-// Warning 6321: (399-407): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol
deleted file mode 100644
index 97df2c5900d4..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        do {
-            break;
-            c = s;
-        } while(false);
-    }
-    function g() internal view returns (S storage c) {
-        do {
-            if (s.f) {
-                continue;
-                c = s;
-            }
-            else {
-            }
-        } while(false);
-    }
-    function h() internal view returns (S storage c) {
-        do {
-            if (s.f) {
-                break;
-            }
-            else {
-                c = s;
-            }
-        } while(false);
-    }
-    function i() internal view returns (S storage c) {
-        do {
-            if (s.f) {
-                continue;
-            }
-            else {
-                c = s;
-            }
-        } while(false);
-    }
-    function j() internal view returns (S storage c) {
-        do {
-            continue;
-            c = s;
-        } while(false);
-    }
-}
-// ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (146-151): Unreachable code.
-// Warning 5740: (169-174): Unreachable code.
-// TypeError 3464: (223-234): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (316-321): Unreachable code.
-// TypeError 3464: (440-451): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (654-665): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (871-882): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (933-938): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol
deleted file mode 100644
index 412974b6d8ae..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        do {} while((c = s).f);
-    }
-    function g() internal view returns (S storage c) {
-        do { c = s; } while(false);
-    }
-    function h() internal view returns (S storage c) {
-        c = s;
-        do {} while(false);
-    }
-    function i() internal view returns (S storage c) {
-        do {} while(false);
-        c = s;
-    }
-    function j() internal view returns (S storage c) {
-        do {
-            c = s;
-            break;
-        } while(false);
-    }
-    function k() internal view returns (S storage c) {
-        do {
-            c = s;
-            continue;
-        } while(false);
-    }
-}
-// ----
-// Warning 5740: (567-572): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol
deleted file mode 100644
index a5c741a9115e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        for(;; c = s) {
-        }
-    }
-    function g() internal view returns (S storage c) {
-        for(;;) {
-            c = s;
-        }
-    }
-}
-// ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (182-193): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_fine.sol
deleted file mode 100644
index aa82cb9a802e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_fine.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        for(c = s;;) {
-        }
-    }
-    function g() internal view returns (S storage c) {
-        for(; (c = s).f;) {
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol
deleted file mode 100644
index a2649a2e3546..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view returns (S storage c) {
-        if (flag) c = s;
-    }
-    function g(bool flag) internal returns (S storage c) {
-        if (flag) c = s;
-        else
-        {
-            if (!flag) c = s;
-            else s.f = true;
-        }
-    }
-}
-// ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (186-197): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_fine.sol
deleted file mode 100644
index b809e95d24ef..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_fine.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view returns (S storage c) {
-        if (flag) c = s;
-        else c = s;
-    }
-    function g(bool flag) internal view returns (S storage c) {
-        if (flag) c = s;
-        else { c = s; }
-    }
-    function h(bool flag) internal view returns (S storage c) {
-        if (flag) c = s;
-        else
-        {
-            if (!flag) c = s;
-            else c = s;
-        }
-    }
-    function i() internal view returns (S storage c) {
-        if ((c = s).f) {
-        }
-    }
-    function j() internal view returns (S storage c) {
-        if ((c = s).f && !(c = s).f) {
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
deleted file mode 100644
index 5dee487d1fe5..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    modifier callAndRevert() {
-        _;
-        revert();
-    }
-    modifier ifFlag(bool flag) {
-        if (flag)
-            _;
-    }
-    struct S { uint a; }
-    S s;
-    function f(bool flag) ifFlag(flag) internal view returns(S storage) {
-        return s;
-    }
-
-    function g(bool flag) ifFlag(flag) callAndRevert() internal view returns(S storage) {
-        return s;
-    }
-}
-// ----
-// TypeError 3464: (246-255): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (361-370): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol
deleted file mode 100644
index 7b7b3ba0c2d9..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    modifier callAndRevert() {
-        _;
-        revert();
-    }
-    modifier ifFlag(bool flag) {
-        if (flag)
-            _;
-    }
-    struct S { uint a; }
-    S s;
-    function f(bool flag) callAndRevert() internal view returns(S storage) {
-        if (flag) return s;
-    }
-    function g(bool flag) callAndRevert() ifFlag(flag) internal view returns(S storage) {
-        return s;
-    }
-
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/revert_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/revert_fine.sol
deleted file mode 100644
index 022f2d1c5baf..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/revert_fine.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure returns (S storage) {
-        revert();
-    }
-    function g(bool flag) internal view returns (S storage c) {
-        if (flag) c = s;
-        else revert();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol
deleted file mode 100644
index abad1da77723..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        false && (c = s).f;
-    }
-    function g() internal view returns (S storage c) {
-        true || (c = s).f;
-    }
-    function h() internal view returns (S storage c) {
-        // expect error, although this is always fine
-        true && (false || (c = s).f);
-    }
-}
-// ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (176-187): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (264-275): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_fine.sol
deleted file mode 100644
index 699849c0e4c1..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_fine.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        (c = s).f && false;
-    }
-    function g() internal view returns (S storage c) {
-        (c = s).f || true;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/smoke.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/smoke.sol
deleted file mode 100644
index beeadbe4617d..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/smoke.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal pure {}
-    function g() internal view returns (S storage) { return s; }
-    function h() internal view returns (S storage c) { return s; }
-    function i() internal view returns (S storage c) { c = s; }
-    function j() internal view returns (S storage c) { (c) = s; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol
deleted file mode 100644
index afa7881b970e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view returns (S storage c) {
-        flag ? (c = s).f : false;
-    }
-    function g(bool flag) internal view returns (S storage c) {
-        flag ? false : (c = s).f;
-    }
-}
-// ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (200-211): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_fine.sol
deleted file mode 100644
index ee3869bd55a7..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_fine.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f(bool flag) internal view returns (S storage c) {
-        flag ? c = s : c = s;
-    }
-    function g(bool flag) internal view returns (S storage c) {
-        flag ? c = s : (c = s);
-    }
-    function h(bool flag) internal view returns (S storage c) {
-        flag ? (c = s).f : (c = s).f;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol
deleted file mode 100644
index 6c06d70fd7b3..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function ext() external {}
-    function f() internal returns (S storage r)
-    {
-        try this.ext() { }
-        catch (bytes memory) { r = s; }
-    }
-    function g() internal returns (S storage r)
-    {
-        try this.ext() { r = s; }
-        catch (bytes memory) { }
-    }
-    function h() internal returns (S storage r)
-    {
-        try this.ext() {}
-        catch Error (string memory) { r = s; }
-        catch (bytes memory) { r = s; }
-    }
-    function i() internal returns (S storage r)
-    {
-        try this.ext() { r = s; }
-        catch (bytes memory) { return r; }
-        r = s;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 3464: (113-124): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (240-251): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (367-378): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (631-632): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_fine.sol
deleted file mode 100644
index 7582533b392f..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_fine.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function ext() external { }
-    function f() internal returns (S storage r)
-    {
-        try this.ext() { r = s; }
-        catch (bytes memory) { r = s; }
-    }
-    function g() internal returns (S storage r)
-    {
-        try this.ext() { r = s; }
-        catch Error (string memory) { r = s; }
-        catch (bytes memory) { r = s; }
-    }
-    function h() internal returns (S storage r)
-    {
-        try this.ext() { }
-        catch (bytes memory) { }
-        r = s;
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/tuple_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/tuple_fine.sol
deleted file mode 100644
index 7567f694771c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/tuple_fine.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage, uint) {
-        return (s,2);
-    }
-    function g() internal view returns (S storage c) {
-        uint a;
-        (c, a) = f();
-    }
-    function h() internal view returns (S storage, S storage) {
-        return (s,s);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/unimplemented_internal.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/unimplemented_internal.sol
deleted file mode 100644
index 3c8986a6b13d..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/unimplemented_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract C {
-    function f() internal virtual returns(uint[] storage);
-    function g() internal virtual returns(uint[] storage s);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/unimplemented_library.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/unimplemented_library.sol
deleted file mode 100644
index eaf4cf810a2c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/unimplemented_library.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// This used to work pre-0.6.0.
-library L {
-    function f() public returns(uint[] storage);
-    function g() public returns(uint[] storage s);
-}
-abstract library T {
-    function f() public returns(uint[] storage);
-    function g() public returns(uint[] storage s);
-}
-// ----
-// TypeError 9571: (146-268): Libraries cannot be abstract.
-// TypeError 9231: (48-92): Library functions must be implemented if declared.
-// TypeError 9231: (97-143): Library functions must be implemented if declared.
-// TypeError 9231: (171-215): Library functions must be implemented if declared.
-// TypeError 9231: (220-266): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol
deleted file mode 100644
index f558436fcf62..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        while(false) {
-            c = s;
-        }
-    }
-}
-// ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_fine.sol
deleted file mode 100644
index 715434226267..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_fine.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    struct S { bool f; }
-    S s;
-    function f() internal view returns (S storage c) {
-        while((c = s).f) {
-        }
-    }
-    function g() internal view returns (S storage c) {
-        c = s;
-        while(false) {
-        }
-    }
-    function h() internal view returns (S storage c) {
-        while(false) {
-        }
-        c = s;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol
deleted file mode 100644
index 688f994c18fe..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() internal view returns(uint[] storage a)
-    {
-        uint b = a[0];
-        revert();
-        b;
-    }
-}
-// ----
-// Warning 5740: (125-126): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol
deleted file mode 100644
index 4b3f17219eee..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	uint[] r;
-    function f() internal view returns (uint[] storage s) {
-        assembly { pop(s.slot) }
-        s = r;
-    }
-}
-// ----
-// TypeError 3464: (107-113): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol
deleted file mode 100644
index fce705723b91..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-	function testFunc() external {
-		for (;;) {}
-		bytes storage b;
-		b[0] = 0x42;
-	}
-}
-// ----
-// TypeError 3464: (83-84): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol
deleted file mode 100644
index 91643dba1bbc..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Test {
-
-  struct Sample { bool flag; }
-  Sample public s;
-
-   function testFunc() external {
-        if(true){}
-        Sample storage t;
-        t.flag=true;
-    }
-}
-// ----
-// TypeError 3464: (155-156): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol
deleted file mode 100644
index 88b4fb410790..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract Test {
-
-  struct Sample { bool flag; }
-  Sample public s;
-
-  modifier checkAddr(address _a){
-      require(_a!=address(0));
-      _;
-  }
-  function testFunc(address _a) external checkAddr(_a) {
-        Sample storage t;
-        t.flag=true;
-    }
-}
-// ----
-// TypeError 3464: (237-238): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol
deleted file mode 100644
index 9e8567f2ea41..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-	function testFunc() external {
-		require(true);
-		bytes storage b;
-		b[0] = 0x42;
-	}
-}
-// ----
-// TypeError 3464: (86-87): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol
deleted file mode 100644
index 58beac6073e2..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-	function testFunc() external {
-		while (true) {}
-		bytes storage b;
-		b[0] = 0x42;
-	}
-}
-// ----
-// TypeError 3464: (87-88): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/functionType.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/functionType.sol
deleted file mode 100644
index 5d3d47aec47b..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/functionType.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    // Make sure function parameters and return values are not considered
-    // for uninitialized return detection in the control flow analysis.
-    function f(function(uint[] storage) internal returns (uint[] storage)) internal pure
-    returns (function(uint[] storage) internal returns (uint[] storage))
-    {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol
deleted file mode 100644
index cb0838e4c395..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    modifier m1(uint[] storage a) { _; }
-    modifier m2(uint[] storage a) { _; }
-    uint[] s;
-    function f() m1(b) m2(b = s) internal view returns (uint[] storage b) {}
-}
-// ----
-// TypeError 3464: (129-130): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fine.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fine.sol
deleted file mode 100644
index d259d9c4ae03..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fine.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    modifier m1(uint[] storage a) { _; }
-    modifier m2(uint[] storage a) { _; }
-    uint[] s;
-    function f() m1(b = s) m2(b) internal view returns (uint[] storage b) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol
deleted file mode 100644
index b109b4c91f42..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint[] s;
-    modifier mod(uint[] storage b) {
-        _;
-        b[0] = 0;
-    }
-    function f() mod(a) internal returns (uint[] storage a)
-    {
-		a = s;
-    }
-}
-// ----
-// TypeError 3464: (120-121): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol
deleted file mode 100644
index 41ce9384f25e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint[] s;
-    modifier mod(uint[] storage b) {
-        b[0] = 0;
-        _;
-    }
-    function f() mod(a) internal returns (uint[] storage a)
-    {
-		a = s;
-    }
-}
-// ----
-// TypeError 3464: (120-121): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call.sol
deleted file mode 100644
index b376c42532e0..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-        function iWillRevert() pure public { revert(); }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_free_function.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_free_function.sol
deleted file mode 100644
index 42ecea572c17..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_free_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function iWillRevert() pure { revert(); }
-
-contract C {
-	function test(bool _param) pure external returns(uint256) {
-		if (_param)
-			return 1;
-
-		iWillRevert();
-	}
-}
-
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol
deleted file mode 100644
index 8ec29301808a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L
-{
-	function iWillRevert() public pure { revert(); }
-}
-
-contract C
-{
-	function test(bool _param) pure external returns(uint256)
-	{
-		if (_param) return 1;
-
-		L.iWillRevert();
-	}
-}
-
-// ----
-// Warning 6321: (128-135): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_nested.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_nested.sol
deleted file mode 100644
index 105d4cda1bff..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_nested.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-        function iWillRevertLevel1() pure public { revert(); }
-        function iWillRevert() pure public { iWillRevertLevel1(); }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_nested1.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_nested1.sol
deleted file mode 100644
index 0f5653f719f5..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_nested1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-        function iWillRevertLevel2() pure public { revert(); }
-        function iWillRevertLevel1() pure public { iWillRevertLevel2(); }
-        function iWillRevert() pure public { iWillRevertLevel1(); }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_recursive.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_recursive.sol
deleted file mode 100644
index 2562cb4307a1..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_recursive.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C
-{
-	function iWillRevertLevel2(bool _recurse) pure public
-	{
-		if (_recurse)
-			iWillRevertLevel1();
-		else
-			revert();
-	}
-
-	function iWillRevertLevel1() pure public { iWillRevertLevel2(true); }
-	function iWillRevert() pure public { iWillRevertLevel1(); }
-
-	function test(bool _param) pure external returns(uint256)
-	{
-		if (_param) return 1;
-
-		iWillRevert();
-	}
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_static.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_static.sol
deleted file mode 100644
index 699b958ac042..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_static.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-abstract contract B
-{
-        function iWillRevert() pure public virtual { revert(); }
-}
-
-abstract contract X
-{
-        function iWillRevert() pure public virtual { revert(); }
-}
-
-contract C is B, X
-{
-        function iWillRevert() pure public override(B, X) {  }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                B.iWillRevert();
-        }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_super.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_super.sol
deleted file mode 100644
index 9a0dd1fb69f6..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_super.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-abstract contract B
-{
-        function iWillRevert() pure public virtual { revert(); }
-}
-
-contract C is B
-{
-        function iWillRevert() pure public override {  }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                super.iWillRevert();
-        }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol
deleted file mode 100644
index 01e3ec953f02..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-abstract contract B
-{
-        function iWillRevert() pure public virtual { revert(); }
-
-        function test2(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
-contract C is B
-{
-        function iWillRevert() pure public override {  }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
-// ----
-// Warning 6321: (146-153): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (381-388): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual1.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual1.sol
deleted file mode 100644
index 0aedfcbea7ce..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-abstract contract B
-{
-        function iWillRevert() pure public virtual { }
-}
-
-contract C is B
-{
-        function iWillRevert() pure public override { revert(); }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol
deleted file mode 100644
index b63bc9a99584..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-abstract contract B
-{
-        function iWillRevert() pure public virtual { }
-
-        function test(bool _param) pure external returns(uint256)
-        {
-                if (_param) return 1;
-
-                iWillRevert();
-        }
-}
-
-contract C is B
-{
-        function iWillRevert() pure public override { revert(); }
-}
-
-// ----
-// Warning 6321: (135-142): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol
deleted file mode 100644
index a25332d3036e..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-  function f() public virtual returns (uint) { g(); }
-  function g() internal virtual { revert(); }
-}
-contract B is A {
-  function f() public override returns (uint) { A.f(); }
-  function g() internal override {}
-}
-// ----
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned when the function is called when "B" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (173-177): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol
deleted file mode 100644
index f0e1ac622f43..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-  function f() public virtual returns (uint) { g(); }
-  function g() internal virtual { revert(); }
-}
-contract B is A {
-  function f() public virtual override returns (uint) { A.f(); }
-  function g() internal virtual override { A.g(); }
-}
-contract C is B {
-  function f() public virtual override returns (uint) { A.f(); }
-  function g() internal virtual override { }
-}
-// ----
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (181-185): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (318-322): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol
deleted file mode 100644
index f6062b9a16bd..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint[] s;
-    function f() internal returns (uint[] storage a)
-    {
-        a[0] = 0;
-        a = s;
-    }
-}
-// ----
-// TypeError 3464: (94-95): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol
deleted file mode 100644
index b11a0e96163a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct S { uint a; }
-    S s;
-    function f() internal returns (S storage r)
-    {
-        r.a = 0;
-        r = s;
-    }
-}
-// ----
-// TypeError 3464: (109-110): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol
deleted file mode 100644
index 7dbb2403467b..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint[] s;
-    function f() internal returns (uint[] storage a)
-    {
-        revert();
-        a[0] = 0;
-        a = s;
-    }
-}
-// ----
-// Warning 5740: (112-135): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol
deleted file mode 100644
index 1fc581964406..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            revert(0, 0)
-            revert(0, 0)
-        }
-    }
-    function g() public pure {
-        assembly {
-            revert(0, 0)
-        }
-        revert();
-    }
-}
-// ----
-// Warning 5740: (100-112): Unreachable code.
-// Warning 5740: (222-230): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol
deleted file mode 100644
index 14c75893c8e2..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            for { let a := 0} lt(a,1) { a := add(a, 1) } {
-                break
-                let b := 42
-            }
-        }
-    }
-}
-// ----
-// Warning 5740: (103-117): Unreachable code.
-// Warning 5740: (160-171): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol
deleted file mode 100644
index daf5f4818f5f..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            for { let a := 0} lt(a,1) { a := add(a, 1) } {
-                continue
-                let b := 42
-            }
-        }
-    }
-}
-// ----
-// Warning 5740: (163-174): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol
deleted file mode 100644
index 364191bb099b..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(uint256 y) public pure returns (uint256 x) {
-        assembly {
-            return(0, 0)
-            x := y
-        }
-    }
-    function g(uint256 y) public pure returns (uint256 x) {
-        assembly {
-            return(0, 0)
-        }
-        x = y;
-    }
-}
-// ----
-// Warning 5740: (129-135): Unreachable code.
-// Warning 5740: (274-279): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol
deleted file mode 100644
index c7013ae35037..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f(uint256 y) public pure returns (uint256 x) {
-        assembly {
-            revert(0, 0)
-            x := y
-        }
-    }
-    function g(uint256 y) public pure returns (uint256 x) {
-        assembly {
-            revert(0, 0)
-        }
-        x = y;
-    }
-}
-// ----
-// Warning 5740: (129-135): Unreachable code.
-// Warning 5740: (274-279): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/comment_fine.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/comment_fine.sol
deleted file mode 100644
index cbafdc80828b..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/comment_fine.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        return;
-        // unreachable comment
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/constant_condition.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/constant_condition.sol
deleted file mode 100644
index bb646ac05f74..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/constant_condition.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        if (false) {
-            return; // unreachable, but not yet detected
-        }
-        return;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol
deleted file mode 100644
index bffcd43c6901..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure {
-        do {
-            uint a = 42; a;
-            continue;
-            return; // this is unreachable
-        } while(false);
-        return; // this is still reachable
-    }
-}
-// ----
-// Warning 5740: (119-126): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol
deleted file mode 100644
index c2a7d6685c4a..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint) {
-        return 0;
-        return 0;
-    }
-}
-// ----
-// Warning 5740: (85-93): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol
deleted file mode 100644
index 19bbb97cc460..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        revert();
-        revert();
-    }
-}
-// ----
-// Warning 5740: (70-78): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol
deleted file mode 100644
index 6f6a1714c53b..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure {
-        for (uint a = 0; a < 1; a++) {
-            break;
-            uint b = 42; b;
-        }
-        return;
-    }
-}
-// ----
-// Warning 5740: (76-79): Unreachable code.
-// Warning 5740: (114-128): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol
deleted file mode 100644
index 2fe91843691d..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(bool c) public pure {
-        if (c) {
-            return;
-        } else {
-            return;
-        }
-        return; // unreachable
-    }
-}
-// ----
-// Warning 5740: (142-149): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/library_function_import_bug.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/library_function_import_bug.sol
deleted file mode 100644
index fc3f1e8cfd30..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/library_function_import_bug.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-==== Source: a ====
-import "b";
-contract Test is Bar {}
-==== Source: b ====
-library Foo {
-    function nop() internal {}
-}
-
-contract Bar {
-    function example() public returns (uint256) {
-        foo();
-        return 0;
-    }
-
-    function foo() public {
-        Foo.nop();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/library_function_nonimport_bug.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/library_function_nonimport_bug.sol
deleted file mode 100644
index ad46c4cd5622..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/library_function_nonimport_bug.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract Bar {
-    function example() public {
-        foo();
-        return;
-    }
-
-    function foo() internal {
-        Foo.nop();
-    }
-}
-
-contract Y is Bar {}
-
-library Foo {
-    function nop() internal {}
-}
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol
deleted file mode 100644
index ad72077770f9..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        revert();
-        uint a = 0; a;
-    }
-}
-// ----
-// Warning 5740: (70-83): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert_empty.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert_empty.sol
deleted file mode 100644
index bc0822c0c964..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert_empty.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        revert();
-        for(int i = 0; i < 3; i++) { f(); }
-    }
-}
-// ----
-// Warning 5740: (70-105): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol
deleted file mode 100644
index b950e2ab9d73..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure {
-        uint a = 0;
-        while (a < 100) {
-            a++;
-            break;
-            a--;
-        }
-    }
-}
-// ----
-// Warning 5740: (138-141): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol
deleted file mode 100644
index 7090bfbf234c..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        while(true) {
-            continue;
-            return;
-        }
-        return; // this is unreachable as well, but currently undetected (needs to consider constant condition "true")
-    }
-}
-// ----
-// Warning 5740: (100-107): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol b/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol
deleted file mode 100644
index d0a0b6ea6591..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-type X is uint24;
-type Y is uint16;
-
-using {addX as +} for X global;
-using {addY as +} for Y global;
-
-function addX(X, X) pure returns (X) {}
-function addY(Y, Y) pure returns (Y) { revert(); }
-
-contract C {
-    function f() public pure {
-        X.wrap(1) + X.wrap(Y.unwrap(Y.wrap(2) + Y.wrap(3)));
-        X.wrap(4) + X.wrap(5); // Unreachable
-    }
-}
-// ----
-// Warning 5740: (307-328): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol b/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol
deleted file mode 100644
index 12b0f03b93a5..000000000000
--- a/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-type X is uint24;
-type Y is uint16;
-
-using {unsubX as -} for X global;
-using {unsubY as -} for Y global;
-
-function unsubX(X) pure returns (X) {}
-function unsubY(Y) pure returns (Y) { revert(); }
-
-contract C {
-    function f() public pure {
-        -X.wrap(Y.unwrap(-Y.wrap(1)));
-        -X.wrap(Y.unwrap(Y.wrap(2))); // Unreachable
-    }
-}
-// ----
-// Warning 5740: (287-315): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_bytes_array.sol b/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_bytes_array.sol
deleted file mode 100644
index 6b3ff04a3fe0..000000000000
--- a/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_bytes_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	bytes a;
-	bytes b;
-	function f() public view {
-		bytes storage c = a;
-		bytes memory d = b;
-		d = bytes(c);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_string.sol b/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_string.sol
deleted file mode 100644
index e12bac4c4c3b..000000000000
--- a/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_string.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	string a;
-	string b;
-	function f() public view {
-		string storage c = a;
-		string memory d = b;
-		d = string(c);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/conversion_to_bytes.sol b/test/libsolidity/syntaxTests/conversion/conversion_to_bytes.sol
deleted file mode 100644
index cdb89caac73e..000000000000
--- a/test/libsolidity/syntaxTests/conversion/conversion_to_bytes.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-  function f() public pure returns (bytes memory) {
-    return bytes("abc");
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol b/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol
deleted file mode 100644
index a36882c7ec16..000000000000
--- a/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        super().x;
-    }
-}
-// ----
-// TypeError 1744: (52-59): Cannot convert to the super type.
diff --git a/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol b/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol
deleted file mode 100644
index 0cbfe6fcb332..000000000000
--- a/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        super(this).f();
-    }
-}
-// ----
-// TypeError 1744: (52-63): Cannot convert to the super type.
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol
deleted file mode 100644
index 103cb8f9d354..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function g(address payable _p) internal pure returns (uint) {
-		return 1;
-	}
-	function f(address _a) public pure {
-		uint x = g(payable(_a));
-		uint y = g(_a);
-	}
-}
-// ----
-// TypeError 9553: (169-171): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol
deleted file mode 100644
index 309dccabd3fe..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface MyInterface {
-    error MyCustomError(uint256, bool);
-}
-
-contract Test {
-    function test() public returns(bytes4) {
-        return bytes4(MyInterface.MyCustomError);
-    }
-}
-// ----
-// TypeError 9640: (143-176): Explicit type conversion not allowed from "error MyCustomError(uint256,bool)" to "bytes4".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol
deleted file mode 100644
index dd036791f502..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-    event MyCustomEvent(uint256);
-
-    function test() public returns(bytes4) {
-        return bytes4(MyCustomEvent);
-    }
-}
-// ----
-// TypeError 9640: (111-132): Explicit type conversion not allowed from "event MyCustomEvent(uint256)" to "bytes4".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol
deleted file mode 100644
index b13067e03364..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-interface MyInterface {
-    enum MyEnum { E1, E2 }
-    error CustomError1(
-        uint256,
-        bool,
-        bool[],
-        address payable,
-        MyInterface,
-        MyEnum,
-        function (string memory) external returns (uint)
-    );
-}
-
-contract Test {
-    function testFunction(string memory) external returns (uint) {}
-
-    function test() public {
-        MyInterface instance = MyInterface(msg.sender);
-        bool[] calldata arr;
-        address payable addr;
-        bytes4(MyInterface.CustomEror1);
-        bytes4(MyInterface.CustomError1());
-        bytes4(MyInterface.CustomError1(1, true, arr, addr, instance, MyInterface.MyEnum.E1, this.testFunction));
-        address(MyInterface.CustomError1);
-    }
-}
-// ----
-// TypeError 9582: (495-518): Member "CustomEror1" not found or not visible after argument-dependent lookup in type(contract MyInterface).
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol
deleted file mode 100644
index 62edf7de83cb..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-interface MyInterface {
-    enum MyEnum { E1, E2 }
-}
-
-contract Test {
-    function testFunction(string memory) external returns (uint) {}
-
-    event CustomEvent1(
-        uint256,
-        bool,
-        bool[],
-        address payable,
-        MyInterface,
-        MyInterface.MyEnum,
-        function (string memory) external returns (uint)
-    );
-
-
-    function test() public {
-        MyInterface instance = MyInterface(msg.sender);
-        bool[] calldata arr;
-        address payable addr;
-        bytes4(CustomEvent1);
-        bytes4(CustomEvent1());
-        bytes4(CustomEvent1(1, true, arr, addr, instance, MyInterface.MyEnum.E1, this.testFunction));
-        address(CustomEvent1);
-    }
-}
-// ----
-// TypeError 9640: (502-522): Explicit type conversion not allowed from "event CustomEvent1(uint256,bool,bool[],address payable,contract MyInterface,enum MyInterface.MyEnum,function (string) external returns (uint256))" to "bytes4".
-// TypeError 6160: (539-553): Wrong argument count for function call: 0 arguments given but expected 7.
-// TypeError 9640: (532-554): Explicit type conversion not allowed from "tuple()" to "bytes4".
-// TypeError 9640: (564-656): Explicit type conversion not allowed from "tuple()" to "bytes4".
-// TypeError 9640: (666-687): Explicit type conversion not allowed from "event CustomEvent1(uint256,bool,bool[],address payable,contract MyInterface,enum MyInterface.MyEnum,function (string) external returns (uint256))" to "address".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
deleted file mode 100644
index 819b8d916fae..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	int[10] x;
-	function f() public view {
-		int[](x);
-		int(x);
-	}
-}
-// ----
-// TypeError 9640: (55-63): Explicit type conversion not allowed from "int256[10] storage ref" to "int256[] storage pointer".
-// TypeError 9640: (67-73): Explicit type conversion not allowed from "int256[10] storage ref" to "int256".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol
deleted file mode 100644
index 68a639750dd4..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() public view {
-		address payable p = payable(msg.sender);
-		address payable q = payable(address(msg.sender));
-	}
-}
-// ----
-// Warning 2072: (43-60): Unused local variable.
-// Warning 2072: (86-103): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol
deleted file mode 100644
index ae98b7fabe5e..000000000000
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f() public pure {
-		address payable p = payable(this);
-		address payable q = payable(address(this));
-	}
-}
-// ----
-// TypeError 9640: (63-76): Explicit type conversion not allowed from "contract C" to "address payable".
diff --git a/test/libsolidity/syntaxTests/conversion/function_cast_value_set.sol b/test/libsolidity/syntaxTests/conversion/function_cast_value_set.sol
deleted file mode 100644
index 93b90a8f9451..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_cast_value_set.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function f() public payable {
-		function() external payable x = this.f{value: 7};
-	}
-}
-// ----
-// TypeError 9574: (46-94): Type function () payable external is not implicitly convertible to expected type function () payable external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol b/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol
deleted file mode 100644
index 179eafdc9fdc..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-contract C {
-    function externalDefault() external returns(uint) { return 11; }
-    function externalView() external view returns(uint) { return 12; }
-    function externalPure() external pure returns(uint) { return 13; }
-
-    function internalDefault() internal returns(uint) { return 21; }
-    function internalView() internal view returns(uint) { return 22; }
-    function internalPure() internal pure returns(uint) { return 23; }
-
-    function testViewToDefault() public returns (uint, uint) {
-        function () external returns(uint)[1] memory externalDefaultArray;
-        function () internal returns(uint)[1] memory internalDefaultArray;
-
-        // This would work if we were assigning to storage rather than memory
-        externalDefaultArray = [this.externalView];
-        internalDefaultArray = [internalView];
-
-        return (externalDefaultArray[0](), internalDefaultArray[0]());
-    }
-
-    function testPureToDefault() public returns (uint, uint) {
-        function () external returns(uint)[1] memory externalDefaultArray;
-        function () internal returns(uint)[1] memory internalDefaultArray;
-
-        // This would work if we were assigning to storage rather than memory
-        externalDefaultArray = [this.externalPure];
-        internalDefaultArray = [internalPure];
-
-        return (externalDefaultArray[0](), internalDefaultArray[0]());
-    }
-
-    function testPureToView() public returns (uint, uint) {
-        function () external returns(uint)[1] memory externalViewArray;
-        function () internal returns(uint)[1] memory internalViewArray;
-
-        // This would work if we were assigning to storage rather than memory
-        externalViewArray = [this.externalPure];
-        internalViewArray = [internalPure];
-
-        return (externalViewArray[0](), internalViewArray[0]());
-    }
-}
-// ----
-// TypeError 7407: (760-779): Type function () view external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
-// TypeError 7407: (812-826): Type function () view returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
-// TypeError 7407: (1230-1249): Type function () pure external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
-// TypeError 7407: (1282-1296): Type function () pure returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
-// TypeError 7407: (1688-1707): Type function () pure external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
-// TypeError 7407: (1737-1751): Type function () pure returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_payable.sol b/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_payable.sol
deleted file mode 100644
index 74c754903f7b..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_payable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() external {
-    }
-    function f() view external returns (bytes4) {
-        function () payable external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (105-144): Type function () external is not implicitly convertible to expected type function () payable external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_pure.sol b/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_pure.sol
deleted file mode 100644
index 61344ac67759..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_pure.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() external {
-    }
-    function f() view external returns (bytes4) {
-        function () pure external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (105-141): Type function () external is not implicitly convertible to expected type function () pure external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_view.sol b/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_view.sol
deleted file mode 100644
index c48f4cb76dc8..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_nonpayable_view.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() external {
-    }
-    function f() view external returns (bytes4) {
-        function () view external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (105-141): Type function () external is not implicitly convertible to expected type function () view external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_payable_nonpayable.sol b/test/libsolidity/syntaxTests/conversion/function_type_payable_nonpayable.sol
deleted file mode 100644
index d21b03ea9ad0..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_payable_nonpayable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function h() payable external {
-    }
-    function f() view external returns (bytes4) {
-        function () external g = this.h;
-        return g.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_payable_pure.sol b/test/libsolidity/syntaxTests/conversion/function_type_payable_pure.sol
deleted file mode 100644
index b1f092b78586..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_payable_pure.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() payable external {
-    }
-    function f() view external returns (bytes4) {
-        function () pure external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (113-149): Type function () payable external is not implicitly convertible to expected type function () pure external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_payable_view.sol b/test/libsolidity/syntaxTests/conversion/function_type_payable_view.sol
deleted file mode 100644
index aed9f8184e81..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_payable_view.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() payable external {
-    }
-    function f() view external returns (bytes4) {
-        function () view external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (113-149): Type function () payable external is not implicitly convertible to expected type function () view external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_pure_nonpayable.sol b/test/libsolidity/syntaxTests/conversion/function_type_pure_nonpayable.sol
deleted file mode 100644
index 40d63d14b4b5..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_pure_nonpayable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function h() pure external {
-    }
-    function f() view external returns (bytes4) {
-        function () external g = this.h;
-        return g.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_pure_payable.sol b/test/libsolidity/syntaxTests/conversion/function_type_pure_payable.sol
deleted file mode 100644
index c490ac89c0f2..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_pure_payable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() pure external {
-    }
-    function f() view external returns (bytes4) {
-        function () payable external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (110-149): Type function () pure external is not implicitly convertible to expected type function () payable external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_pure_view.sol b/test/libsolidity/syntaxTests/conversion/function_type_pure_view.sol
deleted file mode 100644
index 3aadcd8d7a62..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_pure_view.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function h() pure external {
-    }
-    function f() view external returns (bytes4) {
-        function () view external g = this.h;
-        return g.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_same.sol b/test/libsolidity/syntaxTests/conversion/function_type_same.sol
deleted file mode 100644
index c5ebe1ca25c9..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_same.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	int dummy;
-    function h_nonpayable() external { dummy = 1; }
-    function h_payable() payable external {}
-    function h_view() view external { dummy; }
-    function h_pure() pure external {}
-    function f() view external {
-        function () external g_nonpayable = this.h_nonpayable; g_nonpayable;
-        function () payable external g_payable = this.h_payable; g_payable;
-        function () view external g_view = this.h_view; g_view;
-        function () pure external g_pure = this.h_pure; g_pure;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_view_nonpayable.sol b/test/libsolidity/syntaxTests/conversion/function_type_view_nonpayable.sol
deleted file mode 100644
index 65630e6d7c06..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_view_nonpayable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	int dummy;
-    function h() view external {
-		dummy;
-    }
-    function f() view external returns (bytes4) {
-        function () external g = this.h;
-        return g.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_view_payable.sol b/test/libsolidity/syntaxTests/conversion/function_type_view_payable.sol
deleted file mode 100644
index ce603d7f10e5..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_view_payable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() view external {
-    }
-    function f() view external returns (bytes4) {
-        function () payable external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (110-149): Type function () view external is not implicitly convertible to expected type function () payable external.
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_view_pure.sol b/test/libsolidity/syntaxTests/conversion/function_type_view_pure.sol
deleted file mode 100644
index deaba824daaa..000000000000
--- a/test/libsolidity/syntaxTests/conversion/function_type_view_pure.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function h() view external {
-    }
-    function f() view external returns (bytes4) {
-        function () pure external g = this.h;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9574: (110-146): Type function () view external is not implicitly convertible to expected type function () pure external.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol
deleted file mode 100644
index 51dce0986e31..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-interface MyInterface {
-    error MyCustomError(uint256, bool);
-}
-
-contract MyContract {
-    function f(bytes4 arg) public {}
-    function test() public {
-        f(MyInterface.MyCustomError);
-    }
-}
-// ----
-//  TypeError 9553: (165-190): Invalid type for argument in function call. Invalid implicit conversion from error MyCustomError(uint256,bool) to bytes4 requested.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol
deleted file mode 100644
index c3deea881cd7..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface MyInterface {
-    error MyCustomError(uint256, bool);
-}
-
-contract Test {
-    function test() public returns(bytes4) {
-        return (MyInterface.MyCustomError);
-    }
-}
-// ----
-// TypeError 6359: (143-170): Return argument type error MyCustomError(uint256,bool) is not implicitly convertible to expected type (type of first return variable) bytes4.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol
deleted file mode 100644
index 96b643a62751..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract MyContract {
-    event MyCustomEvent(uint256);
-    function f(bytes4 arg) public {}
-    function test() public {
-        f(MyCustomEvent);
-    }
-}
-// ----
-// TypeError 9553: (132-145): Invalid type for argument in function call. Invalid implicit conversion from event MyCustomEvent(uint256) to bytes4 requested.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol
deleted file mode 100644
index 70523821d355..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-    event MyCustomEvent(uint256);
-
-    function test() public returns(bytes4) {
-        return (MyCustomEvent);
-    }
-}
-// ----
-// TypeError 6359: (111-126): Return argument type event MyCustomEvent(uint256) is not implicitly convertible to expected type (type of first return variable) bytes4.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
deleted file mode 100644
index cd74b985cb4f..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f() public pure returns(string[5] calldata) {
-        return ["h", "e", "l", "l", "o"];
-    }
-}
-// ----
-// TypeError 6359: (122-147): Return argument type string[5] memory is not implicitly convertible to expected type (type of first return variable) string[5] calldata.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_storage_array_ref.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_storage_array_ref.sol
deleted file mode 100644
index bd83a9e3771f..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_storage_array_ref.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	int[10] x;
-	int[] y;
-	function f() public {
-		y = x;
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol
deleted file mode 100644
index 166ebffb0b53..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f1() public pure returns(string calldata) {
-        return "hello";
-    }
-
-    function f2() public pure returns(string calldata) {
-        return unicode"hello";
-    }
-
-    function f3() public pure returns(bytes calldata) {
-        return hex"68656c6c6f";
-    }
-}
-// ----
-// TypeError 6359: (85-92): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) string calldata.
-// TypeError 6359: (173-187): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) string calldata.
-// TypeError 6359: (267-282): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) bytes calldata.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol
deleted file mode 100644
index bf58cba42935..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function g(string calldata _s) public {}
-    function h(bytes calldata _b) public {}
-
-    function f() public {
-        g("hello");
-        g(unicode"hello");
-        h(hex"68656c6c6f");
-    }
-}
-// ----
-// TypeError 9553: (139-146): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to string calldata requested.
-// TypeError 9553: (159-173): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to string calldata requested.
-// TypeError 9553: (186-201): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to bytes calldata requested.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
deleted file mode 100644
index 708713b6b0ff..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract D {}
-
-contract C {
-    C c;
-    D d;
-
-    function foo() public {
-        // Current instance of the current contract vs super
-        super != this;
-        this != super;
-
-        // Different instance of the current contract vs super
-        super != c;
-        c != super;
-
-        // Instance of an unrelated contract vs super
-        super != d;
-        d != super;
-    }
-}
-// ----
-// TypeError 2271: (144-157): Built-in binary operator != cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (167-180): Built-in binary operator != cannot be applied to types contract C and type(contract super C).
-// TypeError 2271: (254-264): Built-in binary operator != cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (274-284): Built-in binary operator != cannot be applied to types contract C and type(contract super C).
-// TypeError 2271: (349-359): Built-in binary operator != cannot be applied to types type(contract super C) and contract D.
-// TypeError 2271: (369-379): Built-in binary operator != cannot be applied to types contract D and type(contract super C).
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
deleted file mode 100644
index 234657a224e1..000000000000
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-contract C {
-    function foo() public {
-        super << this;
-        super >> this;
-        super ^ this;
-        super | this;
-        super & this;
-
-        super * this;
-        super / this;
-        super % this;
-        super - this;
-        super + this;
-        super ** this;
-
-        super == this;
-        super != this;
-        super >= this;
-        super <= this;
-        super < this;
-        super > this;
-
-        super || this;
-        super && this;
-
-        super -= this;
-        super += this;
-
-        true ? super : this;
-    }
-}
-// ----
-// TypeError 2271: (49-62): Built-in binary operator << cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (72-85): Built-in binary operator >> cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (95-107): Built-in binary operator ^ cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (117-129): Built-in binary operator | cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (139-151): Built-in binary operator & cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (162-174): Built-in binary operator * cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (184-196): Built-in binary operator / cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (206-218): Built-in binary operator % cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (228-240): Built-in binary operator - cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (250-262): Built-in binary operator + cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (272-285): Built-in binary operator ** cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (296-309): Built-in binary operator == cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (319-332): Built-in binary operator != cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (342-355): Built-in binary operator >= cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (365-378): Built-in binary operator <= cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (388-400): Built-in binary operator < cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (410-422): Built-in binary operator > cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (433-446): Built-in binary operator || cannot be applied to types type(contract super C) and contract C.
-// TypeError 2271: (456-469): Built-in binary operator && cannot be applied to types type(contract super C) and contract C.
-// TypeError 4247: (480-485): Expression has to be an lvalue.
-// TypeError 7366: (480-493): Operator -= not compatible with types type(contract super C) and contract C.
-// TypeError 4247: (503-508): Expression has to be an lvalue.
-// TypeError 7366: (503-516): Operator += not compatible with types type(contract super C) and contract C.
-// TypeError 9717: (534-539): Invalid mobile type in true expression.
diff --git a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol
deleted file mode 100644
index 749a9b0d9daf..000000000000
--- a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract S
-{
-	int o;
-	function foo() public returns (int) { return o = 3; }
-}
-
-contract B is S
-{
-	function fii() public
-	{
-		o = S(super).foo();
-	}
-}
-// ----
-// TypeError 9640: (129-137): Explicit type conversion not allowed from "type(contract super B)" to "contract S".
diff --git a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer1.sol b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer1.sol
deleted file mode 100644
index 3aa59612f0c7..000000000000
--- a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	uint[] a;
-	uint[] b;
-	function f() public view {
-		uint[] storage c = a;
-		uint[] storage d = b;
-		d = uint[](c);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer2.sol b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer2.sol
deleted file mode 100644
index 060c97078d3d..000000000000
--- a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	uint[] a;
-	uint[] b;
-	function f() public view {
-		uint[] storage c = a;
-		uint[] memory d = b;
-		d = uint[](c);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/cycle_checker_function_type.sol b/test/libsolidity/syntaxTests/cycle_checker_function_type.sol
deleted file mode 100644
index 7e3e86be492a..000000000000
--- a/test/libsolidity/syntaxTests/cycle_checker_function_type.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// Used to cause ICE.
-contract C {
-        function ( ) internal returns ( bytes [ ] storage , mapping ( bytes => mapping ( bytes => mapping ( uint => mapping ( bytes => mapping ( string => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( string => mapping ( string => mapping ( uint => mapping ( bytes => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( bytes => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( uint => mapping ( string => mapping ( uint => string ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) [ ] storage ) constant c = c ;
-}
-// ----
-// TypeError 6161: (43-643): The value of the constant c has a cyclic dependency via c.
diff --git a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type.sol b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type.sol
deleted file mode 100644
index 804bf7cefa5f..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    struct Nested { uint y; }
-    function c(function(Nested memory) external returns (uint)[] storage) external pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
deleted file mode 100644
index 4e5091e8c1cf..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L {
-    struct Nested { uint y; }
-    function b(function(Nested calldata) external returns (uint)[] storage) external pure {}
-    function d(function(Nested storage) external returns (uint)[] storage) external pure {}
-}
-
-// ----
-// TypeError 6651: (159-173): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol
deleted file mode 100644
index 1a90a2bb699f..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function i() external pure returns(uint[]) {}
-}
-// ----
-// TypeError 6651: (52-58): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_calldata.sol
deleted file mode 100644
index b75fc05c7283..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_calldata.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f(bytes calldata) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol
deleted file mode 100644
index 9b9602feeb91..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(bytes memory) external;
-}
-// ----
-// TypeError 3656: (0-56): Contract "test" should be marked as abstract.
-// TypeError 5424: (20-54): Functions without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol
deleted file mode 100644
index 3fbf7563ad0f..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f(bytes storage) external;
-}
-// ----
-// TypeError 6651: (31-44): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol
deleted file mode 100644
index c4fffd12e629..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f(bytes4 memory) public;
-}
-// ----
-// TypeError 6651: (31-44): Data location can only be specified for array, struct or mapping types, but "memory" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/function_parameters_with_data_location_fine.sol b/test/libsolidity/syntaxTests/dataLocations/function_parameters_with_data_location_fine.sol
deleted file mode 100644
index 68c3c76e0490..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/function_parameters_with_data_location_fine.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint[] memory, uint[] storage) private pure {}
-    function g(uint[] memory, uint[] storage) internal pure {}
-    function h(uint[] memory) public pure {}
-    function i(uint[] calldata) external pure {}
-    // No data location for events.
-    event e(uint[]);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol b/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol
deleted file mode 100644
index 6972c7a270e7..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() private pure returns(uint[] memory, uint[] storage b) { b = b; }
-    function g() internal pure returns(uint[] memory, uint[] storage b) { b = b; }
-    function h() public pure returns(uint[] memory) {}
-    function i() external pure returns(uint[] memory) {}
-}
-// ----
-// Warning 6321: (51-64): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (134-147): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/dataLocations/function_type_array_as_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/function_type_array_as_reference_type.sol
deleted file mode 100644
index b3856f58529c..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/function_type_array_as_reference_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct Nested { uint y; }
-    // ensure that we consider array of function pointers as reference type
-    function b(function(Nested memory) external returns (uint)[] storage) internal pure {}
-    function c(function(Nested memory) external returns (uint)[] memory) public pure {}
-    function d(function(Nested memory) external returns (uint)[] calldata) external pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol
deleted file mode 100644
index c3c70c737788..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(bytes calldata) internal;
-}
-// ----
-// TypeError 3656: (0-58): Contract "test" should be marked as abstract.
-// TypeError 5424: (20-56): Functions without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_memory.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_memory.sol
deleted file mode 100644
index dde99d56c08d..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_memory.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f(bytes memory) internal {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_storage.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_storage.sol
deleted file mode 100644
index 706d22bcee1e..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_storage.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f(bytes storage) internal {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol
deleted file mode 100644
index 64df444d6494..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function g(uint[]) internal pure {}
-}
-// ----
-// TypeError 6651: (28-34): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol
deleted file mode 100644
index d8d6ab2a5dd7..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function g() internal pure returns(uint[]) {}
-}
-// ----
-// TypeError 6651: (52-58): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol
deleted file mode 100644
index 557347d2c949..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library L {
-    struct S { uint x; }
-    function g(uint[2]) external pure {}
-    function h(uint[]) external pure {}
-    function i(S) external pure {}
-    function j(mapping(uint => uint)) external pure {}
-}
-// ----
-// TypeError 6651: (52-59): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
-// TypeError 6651: (93-99): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
-// TypeError 6651: (133-134): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
-// TypeError 6651: (168-189): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol
deleted file mode 100644
index 3bb0a5a06c70..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library L {
-    struct S { uint x; }
-    function g() external pure returns (uint[2]) {}
-    function h() external pure returns (uint[]) {}
-    function i() external pure returns (S) {}
-    function j() external pure returns (mapping(uint => uint)) {}
-}
-// ----
-// TypeError 6651: (77-84): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (129-135): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (180-181): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (226-247): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol
deleted file mode 100644
index dfacbe936b4b..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-library L {
-    struct S { uint x; }
-    function f(uint[] memory, uint[] storage, S storage) private pure
-        returns (mapping(uint => uint) storage a, S memory b, uint[] storage c) { return (a, b, c); }
-    function g(uint[] memory, uint[] storage) internal pure
-        returns (mapping(uint => uint) storage a, S memory b, uint[] storage c) { return (a, b, c); }
-    function h(uint[] memory, uint[] storage) public pure returns (S storage x) { return x; }
-    function i(uint[] calldata, uint[] storage) external pure returns (S storage x) {return x; }
-}
-// ----
-// TypeError 3464: (197-198): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (203-204): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (359-360): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (365-366): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (460-461): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (557-558): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol
deleted file mode 100644
index 97c246203dd1..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    struct S { uint x; }
-    function g() internal pure returns (uint[2]) {}
-    function h() internal pure returns (uint[]) {}
-    function i() internal pure returns (S) {}
-    function j() internal pure returns (mapping(uint => uint)) {}
-    function gp(uint[2]) internal pure {}
-    function hp(uint[]) internal pure {}
-    function ip(S) internal pure {}
-    function jp(mapping(uint => uint)) internal pure {}
-}
-// ----
-// TypeError 6651: (77-84): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (129-135): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (180-181): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (226-247): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (268-275): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (310-316): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (351-352): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (387-408): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol
deleted file mode 100644
index 277eafd5bde8..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library L {
-    struct S { uint x; }
-    function g() private pure returns (uint[2]) {}
-    function h() private pure returns (uint[]) {}
-    function i() private pure returns (S) {}
-    function j() private pure returns (mapping(uint => uint)) {}
-    function gp(uint[2]) private pure {}
-    function hp(uint[]) private pure {}
-    function ip(S) private pure {}
-    function jp(mapping(uint => uint)) private pure {}
-}
-// ----
-// TypeError 6651: (76-83): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (127-133): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (177-178): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (222-243): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (264-271): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (305-311): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (345-346): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (380-401): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol
deleted file mode 100644
index 9f01d2cab402..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    struct S { uint x; }
-    function g() private pure returns (uint[2]) {}
-    function h() private pure returns (uint[]) {}
-    function i() private pure returns (S) {}
-    function j() private pure returns (mapping(uint => uint)) {}
-    function gp(uint[2]) private pure {}
-    function hp(uint[]) private pure {}
-    function ip(S) private pure {}
-    function jp(mapping(uint => uint)) private pure {}}
-// ----
-// TypeError 6651: (76-83): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (127-133): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (177-178): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (222-243): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (264-271): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (305-311): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (345-346): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (380-401): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_calldata.sol
deleted file mode 100644
index 6df4d10c9f01..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_calldata.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library test {
-    function f(bytes calldata) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol
deleted file mode 100644
index 2a374eb77755..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library test {
-    function f(bytes memory) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_storage.sol b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_storage.sol
deleted file mode 100644
index f79cb988f434..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_storage.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library test {
-    function f(bytes storage) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol
deleted file mode 100644
index b9291a52de6d..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library test {
-    function f(bytes calldata) internal pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_memory.sol b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_memory.sol
deleted file mode 100644
index 031355357671..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_memory.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library test {
-    function f(bytes memory) internal pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_storage.sol b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_storage.sol
deleted file mode 100644
index d58ecd4b43ed..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_storage.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library test {
-    function f(bytes storage) internal pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
deleted file mode 100644
index e431350ed52e..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	int[] x;
-	function f() public {
-		int[] storage a = x;
-		int[] memory b;
-		a = b;
-		a = int[](b);
-	}
-}
-// ----
-// TypeError 7407: (93-94): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
-// TypeError 7407: (102-110): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol
deleted file mode 100644
index 5af253dfcabc..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint[]) private pure {}
-}
-// ----
-// TypeError 6651: (28-34): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol
deleted file mode 100644
index 5026360ebe0b..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() private pure returns(uint[]) {}
-}
-// ----
-// TypeError 6651: (51-57): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol
deleted file mode 100644
index f8705d51a4c8..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(bytes calldata) public;
-}
-// ----
-// TypeError 3656: (0-56): Contract "test" should be marked as abstract.
-// TypeError 5424: (20-54): Functions without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_memory.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_memory.sol
deleted file mode 100644
index 7cea3cb49a9c..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_memory.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f(bytes memory) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol
deleted file mode 100644
index 1fb8e09f25af..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f(bytes storage) public;
-}
-// ----
-// TypeError 6651: (31-44): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol
deleted file mode 100644
index e39a85fe16fc..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function h(uint[]) public pure {}
-}
-// ----
-// TypeError 6651: (28-34): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol
deleted file mode 100644
index c34c786cfb3c..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function h() public pure returns(uint[]) {}
-}
-// ----
-// TypeError 6651: (50-56): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol b/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol
deleted file mode 100644
index 040fe5266396..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  struct S {uint x;}
-  constructor(S) {}
-}
-// ----
-// TypeError 6651: (48-49): Data location must be "storage" or "memory" for constructor parameter, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol
deleted file mode 100644
index 8c7a2ecb96a6..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    function f() public {
-      uint storage a1;
-      bytes16 storage b1;
-      uint memory a2;
-      bytes16 memory b2;
-    }
-}
-// ----
-// TypeError 6651: (48-63): Data location can only be specified for array, struct or mapping types, but "storage" was given.
-// TypeError 6651: (71-89): Data location can only be specified for array, struct or mapping types, but "storage" was given.
-// TypeError 6651: (97-111): Data location can only be specified for array, struct or mapping types, but "memory" was given.
-// TypeError 6651: (119-136): Data location can only be specified for array, struct or mapping types, but "memory" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol
deleted file mode 100644
index 0fbad1555a1b..000000000000
--- a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    uint[] a;
-    uint[]  b;
-    function f() public {
-      uint[] storage s1 = a;
-      uint[] memory s2 = new uint[](42);
-      uint[] storage s3 = b;
-      s1.push(42);
-      s2[3] = 12;
-      s3.push(42);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol b/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
deleted file mode 100644
index 994c0568a141..000000000000
--- a/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	uint constant x = 0x01 wei;
-}
-// ----
-// TypeError 5145: (32-40): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 day" instead.
diff --git a/test/libsolidity/syntaxTests/denominations/denominations.sol b/test/libsolidity/syntaxTests/denominations/denominations.sol
deleted file mode 100644
index 3c1c305cfef2..000000000000
--- a/test/libsolidity/syntaxTests/denominations/denominations.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	uint constant a = 1 wei + 4 ether;
-	uint constant b = 1 seconds + 2 minutes + 3 hours + 4 days + 5 weeks;
-	uint constant c = 2 ether / 1 seconds + 3 gwei * 3 hours;
-	uint constant d = 2 gwei / 1 seconds + 3 minutes * 3 hours;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol b/test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol
deleted file mode 100644
index 46c7a0d87df7..000000000000
--- a/test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint[42 wei] a;
-    uint[42 gwei] b;
-    uint[42 ether] c;
-    uint[42 seconds] d;
-    uint[42 minutes] e;
-    uint[42 hours] f;
-    uint[42 days] g;
-    uint[42 weeks] h;
-}
-// ----
-// Warning 7325: (58-72): Type uint256[42000000000000000000] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/denominations/deprecated_year.sol b/test/libsolidity/syntaxTests/denominations/deprecated_year.sol
deleted file mode 100644
index 61c519a7baed..000000000000
--- a/test/libsolidity/syntaxTests/denominations/deprecated_year.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	uint constant a = 3 years;
-}
-// ----
-// TypeError 4820: (32-39): Using "years" as a unit denomination is deprecated.
diff --git a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
deleted file mode 100644
index 0974cde13e4a..000000000000
--- a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        uint x = 1 finney;
-    }
-}
-// ----
-// ParserError 2314: (58-64): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol b/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol
deleted file mode 100644
index 4098de0e2f4c..000000000000
--- a/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-	uint constant a = 4 ether / 3 hours;
-	ufixed constant b = ufixed(4 ether / 3 hours);
-}
-// ----
-// TypeError 2326: (32-49): Type rational_const 10000000000000000 / 27 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x62 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol b/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol
deleted file mode 100644
index 43fde5ed79fb..000000000000
--- a/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	uint constant gwei = 1;
-}
-// ----
-// ParserError 2314: (28-32): Expected identifier but got 'gwei'
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
deleted file mode 100644
index 8eec22dee3f0..000000000000
--- a/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	address a = 0x11111122222333334444455555666667777788888 wei;
-}
-// ----
-// TypeError 5145: (26-73): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 day" instead.
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol
deleted file mode 100644
index f67fde89d7a8..000000000000
--- a/test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	uint constant y = 1wei;
-}
-// ----
-// ParserError 8936: (32-33): Identifier-start is not allowed at end of a number.
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol
deleted file mode 100644
index 58d7d205e626..000000000000
--- a/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	bool constant x = true ether;
-}
-// ----
-// ParserError 2314: (37-42): Expected ';' but got 'ether'
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol
deleted file mode 100644
index 9d27c5d3de64..000000000000
--- a/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	string s = "abc" ether;
-}
-// ----
-// ParserError 2314: (31-36): Expected ';' but got 'ether'
diff --git a/test/libsolidity/syntaxTests/denominations/szabo_finney_identifiers.sol b/test/libsolidity/syntaxTests/denominations/szabo_finney_identifiers.sol
deleted file mode 100644
index 9d6abe9590e6..000000000000
--- a/test/libsolidity/syntaxTests/denominations/szabo_finney_identifiers.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f(uint finney) public pure returns (uint szabo) {
-    // These used to be denominations.
-    szabo = finney;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
deleted file mode 100644
index d0e3eb3ff734..000000000000
--- a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        uint x = 1 szabo;
-    }
-}
-// ----
-// ParserError 2314: (58-63): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol b/test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol
deleted file mode 100644
index 8583e1d42782..000000000000
--- a/test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-	uint constant y = 8 gwei ether;
-}
-// ----
-// ParserError 2314: (39-44): Expected ';' but got 'ether'
diff --git a/test/libsolidity/syntaxTests/deprecated_functions.sol b/test/libsolidity/syntaxTests/deprecated_functions.sol
deleted file mode 100644
index 239d22ab5742..000000000000
--- a/test/libsolidity/syntaxTests/deprecated_functions.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-	function f() pure public {
-		bytes32 x = sha3("");
-		x;
-	}
-	function g() public {
-		suicide(payable(0x0000000000000000000000000000000000000001));
-	}
-}
-// ----
-// TypeError 3557: (58-62): "sha3" has been deprecated in favour of "keccak256".
-// TypeError 8050: (101-108): "suicide" has been deprecated in favour of "selfdestruct".
diff --git a/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol b/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol
deleted file mode 100644
index 97650d4cad59..000000000000
--- a/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	uint256 variable;
-	uint128 variable;
-}
-// ----
-// DeclarationError 2333: (36-52): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/double_variable_declaration.sol b/test/libsolidity/syntaxTests/double_variable_declaration.sol
deleted file mode 100644
index 9deff2f5218a..000000000000
--- a/test/libsolidity/syntaxTests/double_variable_declaration.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-	function f() pure public {
-		uint256 x;
-		x = 1;
-		if (true) { uint256 x; x = 2; }
-	}
-}
-// ----
-// Warning 2519: (80-89): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol b/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol
deleted file mode 100644
index 3dbf9b0bcdbc..000000000000
--- a/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint x;
-    fallback() external { x = 2; }
-    fallback() external { x = 3; }
-}
-// ----
-// DeclarationError 7301: (64-94): Only one fallback function is allowed.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol
deleted file mode 100644
index e7541fe233d4..000000000000
--- a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// Exception for the rule about illegal names.
-contract C {
-	function this() public {
-	}
-	function super() public {
-	}
-	function _() public {
-	}
-}
-// ----
-// Warning 2319: (61-88): This declaration shadows a builtin symbol.
-// Warning 2319: (90-118): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol
deleted file mode 100644
index e6c7134850f6..000000000000
--- a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function _() internal returns(uint) {
-        return 1;
-    }
-
-    function super() internal {
-    }
-
-    function this() internal {
-    }
-}
-// ----
-// DeclarationError 3726: (17-78): The name "_" is reserved.
-// DeclarationError 3726: (84-117): The name "super" is reserved.
-// DeclarationError 3726: (123-155): The name "this" is reserved.
-// Warning 2319: (84-117): This declaration shadows a builtin symbol.
-// Warning 2319: (123-155): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol b/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol
deleted file mode 100644
index 2160dc05518d..000000000000
--- a/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    receive() external payable { }
-    receive() external payable { }
-    receive() external payable { }
-}
-// ----
-// DeclarationError 4046: (52-82): Only one receive function is allowed.
-// DeclarationError 4046: (87-117): Only one receive function is allowed.
diff --git a/test/libsolidity/syntaxTests/duplicate_contract.sol b/test/libsolidity/syntaxTests/duplicate_contract.sol
deleted file mode 100644
index 39e5273071b4..000000000000
--- a/test/libsolidity/syntaxTests/duplicate_contract.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract X {}
-contract X {}
-// ----
-// DeclarationError 2333: (14-27): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/emit/emit_empty.sol b/test/libsolidity/syntaxTests/emit/emit_empty.sol
deleted file mode 100644
index 065de916ac11..000000000000
--- a/test/libsolidity/syntaxTests/emit/emit_empty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public {
-    emit;
-  }
-}
-// ----
-// ParserError 5620: (45-46): Expected event name or path.
diff --git a/test/libsolidity/syntaxTests/emit/emit_non_event.sol b/test/libsolidity/syntaxTests/emit/emit_non_event.sol
deleted file mode 100644
index 64021bb29a84..000000000000
--- a/test/libsolidity/syntaxTests/emit/emit_non_event.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function() Test;
-
-  function f() public {
-    emit Test();
-  }
-}
-// ----
-// TypeError 9292: (66-70): Expression has to be an event invocation.
diff --git a/test/libsolidity/syntaxTests/empty_struct.sol b/test/libsolidity/syntaxTests/empty_struct.sol
deleted file mode 100644
index 3473612caa03..000000000000
--- a/test/libsolidity/syntaxTests/empty_struct.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	struct A {}
-}
-// ----
-// SyntaxError 5306: (17-28): Defining empty structs is disallowed.
diff --git a/test/libsolidity/syntaxTests/enums/enum_member_shadowing.sol b/test/libsolidity/syntaxTests/enums/enum_member_shadowing.sol
deleted file mode 100644
index dbbb8dc91378..000000000000
--- a/test/libsolidity/syntaxTests/enums/enum_member_shadowing.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-
-    enum E {E, S, C, a, f}
-
-    uint a;
-
-    function f() public pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/enums/enum_with_too_many_members.sol b/test/libsolidity/syntaxTests/enums/enum_with_too_many_members.sol
deleted file mode 100644
index c4eced557670..000000000000
--- a/test/libsolidity/syntaxTests/enums/enum_with_too_many_members.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-enum E {
-    E000, E001, E002, E003, E004, E005, E006, E007, E008, E009,
-    E010, E011, E012, E013, E014, E015, E016, E017, E018, E019,
-    E020, E021, E022, E023, E024, E025, E026, E027, E028, E029,
-    E030, E031, E032, E033, E034, E035, E036, E037, E038, E039,
-    E040, E041, E042, E043, E044, E045, E046, E047, E048, E049,
-    E050, E051, E052, E053, E054, E055, E056, E057, E058, E059,
-    E060, E061, E062, E063, E064, E065, E066, E067, E068, E069,
-    E070, E071, E072, E073, E074, E075, E076, E077, E078, E079,
-    E080, E081, E082, E083, E084, E085, E086, E087, E088, E089,
-    E090, E091, E092, E093, E094, E095, E096, E097, E098, E099,
-    E100, E101, E102, E103, E104, E105, E106, E107, E108, E109,
-    E110, E111, E112, E113, E114, E115, E116, E117, E118, E119,
-    E120, E121, E122, E123, E124, E125, E126, E127, E128, E129,
-    E130, E131, E132, E133, E134, E135, E136, E137, E138, E139,
-    E140, E141, E142, E143, E144, E145, E146, E147, E148, E149,
-    E150, E151, E152, E153, E154, E155, E156, E157, E158, E159,
-    E160, E161, E162, E163, E164, E165, E166, E167, E168, E169,
-    E170, E171, E172, E173, E174, E175, E176, E177, E178, E179,
-    E180, E181, E182, E183, E184, E185, E186, E187, E188, E189,
-    E190, E191, E192, E193, E194, E195, E196, E197, E198, E199,
-    E200, E201, E202, E203, E204, E205, E206, E207, E208, E209,
-    E210, E211, E212, E213, E214, E215, E216, E217, E218, E219,
-    E220, E221, E222, E223, E224, E225, E226, E227, E228, E229,
-    E230, E231, E232, E233, E234, E235, E236, E237, E238, E239,
-    E240, E241, E242, E243, E244, E245, E246, E247, E248, E249,
-    E250, E251, E252, E253, E254, E255, E256
-}
-// ----
-// DeclarationError 1611: (0-1655): Enum with more than 256 members is not allowed.
diff --git a/test/libsolidity/syntaxTests/enums/global_enum.sol b/test/libsolidity/syntaxTests/enums/global_enum.sol
deleted file mode 100644
index a14eaf6f20ee..000000000000
--- a/test/libsolidity/syntaxTests/enums/global_enum.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-enum E { A }
-contract C {
-    function f() public pure {
-        E e = E.A;
-        e;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol b/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol
deleted file mode 100644
index e2226993f9f2..000000000000
--- a/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-enum E { A }
-contract E {}
-// ----
-// DeclarationError 2333: (13-26): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol b/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol
deleted file mode 100644
index 507f92fff40a..000000000000
--- a/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-enum E { A }
-enum E { A }
-// ----
-// DeclarationError 2333: (13-25): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol b/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol
deleted file mode 100644
index 1b9bce95e417..000000000000
--- a/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-enum E { A }
-contract C {
-    enum E { A }
-    function f() public pure {
-        E e = E.A;
-        e;
-    }
-}
-// ----
-// Warning 2519: (30-42): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/enums/illegal_names.sol b/test/libsolidity/syntaxTests/enums/illegal_names.sol
deleted file mode 100644
index 399d91ed1252..000000000000
--- a/test/libsolidity/syntaxTests/enums/illegal_names.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-enum this {
-    a
-}
-enum super {
-    b
-}
-enum _ {
-    c
-}
-
-enum E {
-    this,
-    super,
-    _
-}
-
-contract C {
-    this a;
-    super b;
-    _ c;
-    E e;
-}
-// ----
-// DeclarationError 3726: (0-19): The name "this" is reserved.
-// DeclarationError 3726: (20-40): The name "super" is reserved.
-// DeclarationError 3726: (41-57): The name "_" is reserved.
-// DeclarationError 3726: (72-76): The name "this" is reserved.
-// DeclarationError 3726: (82-87): The name "super" is reserved.
-// DeclarationError 3726: (93-94): The name "_" is reserved.
-// Warning 2319: (0-19): This declaration shadows a builtin symbol.
-// Warning 2319: (20-40): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/enums/literal_conversion.sol b/test/libsolidity/syntaxTests/enums/literal_conversion.sol
deleted file mode 100644
index 4c1487b7e48b..000000000000
--- a/test/libsolidity/syntaxTests/enums/literal_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    enum Test { One, Two }
-    function f() public pure {
-        Test a = Test(0);
-        Test b = Test(1);
-        Test c = Test(type(uint).max);
-        a; b; c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol b/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol
deleted file mode 100644
index c6d220f617b3..000000000000
--- a/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    enum Test { One, Two }
-    function f() public {
-        Test(-1);
-        Test(2);
-        Test(13);
-        Test(5/3);
-        Test(0.5);
-    }
-}
-// ----
-// TypeError 9640: (74-82): Explicit type conversion not allowed from "int_const -1" to "enum C.Test".
-// TypeError 9640: (92-99): Explicit type conversion not allowed from "int_const 2" to "enum C.Test".
-// TypeError 9640: (109-117): Explicit type conversion not allowed from "int_const 13" to "enum C.Test".
-// TypeError 9640: (127-136): Explicit type conversion not allowed from "rational_const 5 / 3" to "enum C.Test".
-// TypeError 9640: (146-155): Explicit type conversion not allowed from "rational_const 1 / 2" to "enum C.Test".
diff --git a/test/libsolidity/syntaxTests/errors/abi_decode_error.sol b/test/libsolidity/syntaxTests/errors/abi_decode_error.sol
deleted file mode 100644
index 72b661b6f8f6..000000000000
--- a/test/libsolidity/syntaxTests/errors/abi_decode_error.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error E(uint);
-contract C {
-    function f() public pure returns (bytes memory) {
-        return abi.decode(msg.data, (E));
-    }
-}
-// ----
-// TypeError 1039: (119-120): Argument has to be a type name.
-// TypeError 5132: (90-122): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/errors/abi_encode_error.sol b/test/libsolidity/syntaxTests/errors/abi_encode_error.sol
deleted file mode 100644
index 55b4d73df8e4..000000000000
--- a/test/libsolidity/syntaxTests/errors/abi_encode_error.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint);
-contract C {
-    function f() public pure returns (bytes memory) {
-        return abi.encode(E);
-    }
-}
-// ----
-// TypeError 2056: (108-109): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol b/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol
deleted file mode 100644
index fbc8b97f1726..000000000000
--- a/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint);
-contract C {
-    function f() public pure returns (bytes memory) {
-        return abi.encode(E(2));
-    }
-}
-// ----
-// TypeError 2056: (108-112): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/errors/all_ones_signature.sol b/test/libsolidity/syntaxTests/errors/all_ones_signature.sol
deleted file mode 100644
index 4cadf624d09a..000000000000
--- a/test/libsolidity/syntaxTests/errors/all_ones_signature.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error test266151307();
-contract C {
-    error test266151307();
-}
-// ----
-// Warning 2519: (40-62): This declaration shadows an existing declaration.
-// SyntaxError 2855: (0-22): The selector 0xffffffff is reserved. Please rename the error to avoid the collision.
-// SyntaxError 2855: (40-62): The selector 0xffffffff is reserved. Please rename the error to avoid the collision.
diff --git a/test/libsolidity/syntaxTests/errors/anonymous.sol b/test/libsolidity/syntaxTests/errors/anonymous.sol
deleted file mode 100644
index 5cbf95f2d3c7..000000000000
--- a/test/libsolidity/syntaxTests/errors/anonymous.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error E() anonymous;
-// ----
-// ParserError 2314: (10-19): Expected ';' but got 'anonymous'
diff --git a/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol b/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol
deleted file mode 100644
index 45ac6bfa10dd..000000000000
--- a/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error E();
-function f(bool x) pure {
-    assert(x, E());
-}
-// ----
-// TypeError 6160: (41-55): Wrong argument count for function call: 2 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/errors/assert_with_error.sol b/test/libsolidity/syntaxTests/errors/assert_with_error.sol
deleted file mode 100644
index 90f79b40eeb7..000000000000
--- a/test/libsolidity/syntaxTests/errors/assert_with_error.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error E();
-function f() pure {
-    assert(E());
-}
-// ----
-// TypeError 9553: (42-45): Invalid type for argument in function call. Invalid implicit conversion from tuple() to bool requested.
diff --git a/test/libsolidity/syntaxTests/errors/basic.sol b/test/libsolidity/syntaxTests/errors/basic.sol
deleted file mode 100644
index 75ac3cf5e799..000000000000
--- a/test/libsolidity/syntaxTests/errors/basic.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    error MyError();
-    error MyError2(uint x);
-    error MyError3(uint x, bytes);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol b/test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol
deleted file mode 100644
index 4b8bbd4599f0..000000000000
--- a/test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error MyCustomError(uint, bool);
-contract C {
-    function f() public {
-        bytes memory a;
-        bytes memory b = type(MyCustomError).concat(a);
-    }
-}
-// ----
-// TypeError 4259: (126-139): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but error MyCustomError(uint256,bool) provided.
diff --git a/test/libsolidity/syntaxTests/errors/clash_function_error.sol b/test/libsolidity/syntaxTests/errors/clash_function_error.sol
deleted file mode 100644
index 0e3a97f7f0fb..000000000000
--- a/test/libsolidity/syntaxTests/errors/clash_function_error.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function Err() pure {}
-error Err();
-// ----
-// DeclarationError 2333: (23-35): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol b/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol
deleted file mode 100644
index 3b71fb4d67ee..000000000000
--- a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { function Err() public pure {} }
-contract B is A { error Err(); }
-// ----
-// DeclarationError 9097: (63-75): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol b/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol
deleted file mode 100644
index bfe4e823fccd..000000000000
--- a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { function Err() public pure {} }
-contract B { error Err(); }
-contract C is A, B {}
-// ----
-// DeclarationError 9097: (58-70): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/duplicate.sol b/test/libsolidity/syntaxTests/errors/duplicate.sol
deleted file mode 100644
index 143098637050..000000000000
--- a/test/libsolidity/syntaxTests/errors/duplicate.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: A ====
-
-error E();
-
-==== Source: B ====
-
-error E();
-
-==== Source: C ====
-
-import "A" as A;
-import "B" as B;
-
-contract Test {
-    function f() public pure {
-        revert A.E();
-    }
-    function g() public pure {
-        revert B.E();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol b/test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol
deleted file mode 100644
index 110af7e34c29..000000000000
--- a/test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-    error a(bool payable);
-    error b(string payable);
-    error c(int payable);
-    error d(int256 payable);
-    error e(uint payable);
-    error f(uint256 payable);
-    error g(bytes1 payable);
-    error h(bytes payable);
-    error i(bytes32 payable);
-    error j(fixed payable);
-    error k(fixed80x80 payable);
-    error l(ufixed payable);
-    error m(ufixed80x80 payable);
-}
-contract C2 {
-    error a(bool view);
-    error b(string view);
-    error c(int view);
-    error d(int256 view);
-    error e(uint view);
-    error f(uint256 view);
-    error g(bytes1 view);
-    error h(bytes view);
-    error i(bytes32 view);
-    error j(fixed view);
-    error k(fixed80x80 view);
-    error l(ufixed view);
-    error m(ufixed80x80 view);
-}
-contract C3 {
-    error a(bool pure);
-    error b(string pure);
-    error c(int pure);
-    error d(int256 pure);
-    error e(uint pure);
-    error f(uint256 pure);
-    error g(bytes1 pure);
-    error h(bytes pure);
-    error i(bytes32 pure);
-    error j(fixed pure);
-    error k(fixed80x80 pure);
-    error l(ufixed pure);
-    error m(ufixed80x80 pure);
-}
-// ----
-// ParserError 9106: (30-37): State mutability can only be specified for address types.
-// ParserError 9106: (59-66): State mutability can only be specified for address types.
-// ParserError 9106: (85-92): State mutability can only be specified for address types.
-// ParserError 9106: (114-121): State mutability can only be specified for address types.
-// ParserError 9106: (141-148): State mutability can only be specified for address types.
-// ParserError 9106: (171-178): State mutability can only be specified for address types.
-// ParserError 9106: (200-207): State mutability can only be specified for address types.
-// ParserError 9106: (228-235): State mutability can only be specified for address types.
-// ParserError 9106: (258-265): State mutability can only be specified for address types.
-// ParserError 9106: (286-293): State mutability can only be specified for address types.
-// ParserError 9106: (319-326): State mutability can only be specified for address types.
-// ParserError 9106: (348-355): State mutability can only be specified for address types.
-// ParserError 9106: (382-389): State mutability can only be specified for address types.
-// ParserError 9106: (425-429): State mutability can only be specified for address types.
-// ParserError 9106: (451-455): State mutability can only be specified for address types.
-// ParserError 9106: (474-478): State mutability can only be specified for address types.
-// ParserError 9106: (500-504): State mutability can only be specified for address types.
-// ParserError 9106: (524-528): State mutability can only be specified for address types.
-// ParserError 9106: (551-555): State mutability can only be specified for address types.
-// ParserError 9106: (577-581): State mutability can only be specified for address types.
-// ParserError 9106: (602-606): State mutability can only be specified for address types.
-// ParserError 9106: (629-633): State mutability can only be specified for address types.
-// ParserError 9106: (654-658): State mutability can only be specified for address types.
-// ParserError 9106: (684-688): State mutability can only be specified for address types.
-// ParserError 9106: (710-714): State mutability can only be specified for address types.
-// ParserError 9106: (741-745): State mutability can only be specified for address types.
-// ParserError 9106: (781-785): State mutability can only be specified for address types.
-// ParserError 9106: (807-811): State mutability can only be specified for address types.
-// ParserError 9106: (830-834): State mutability can only be specified for address types.
-// ParserError 9106: (856-860): State mutability can only be specified for address types.
-// ParserError 9106: (880-884): State mutability can only be specified for address types.
-// ParserError 9106: (907-911): State mutability can only be specified for address types.
-// ParserError 9106: (933-937): State mutability can only be specified for address types.
-// ParserError 9106: (958-962): State mutability can only be specified for address types.
-// ParserError 9106: (985-989): State mutability can only be specified for address types.
-// ParserError 9106: (1010-1014): State mutability can only be specified for address types.
-// ParserError 9106: (1040-1044): State mutability can only be specified for address types.
-// ParserError 9106: (1066-1070): State mutability can only be specified for address types.
-// ParserError 9106: (1097-1101): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/errors/error_abi_decode.sol b/test/libsolidity/syntaxTests/errors/error_abi_decode.sol
deleted file mode 100644
index 8f9f831dc837..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_abi_decode.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error MyCustomError(uint, bool);
-contract Test {
-    function f() public {
-        abi.decode(MyCustomError, (bool));
-    }
-}
-// ----
-// TypeError 1956: (94-107): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_address_payable.sol b/test/libsolidity/syntaxTests/errors/error_address_payable.sol
deleted file mode 100644
index 3e983e3741e4..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_address_payable.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-error E(address payable x);
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/error_as_function_param.sol b/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
deleted file mode 100644
index 79f28a0085da..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-error E(uint);
-function f(E x) pure returns (uint) {}
-// ----
-// TypeError 5172: (26-27): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol b/test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol
deleted file mode 100644
index c26d7230e957..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() pure public {
-        bytes.concat(MyCustomError, MyCustomError);
-    }
-}
-// ----
-// TypeError 8015: (99-112): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but error MyCustomError(uint256,bool) provided.
-// TypeError 8015: (114-127): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but error MyCustomError(uint256,bool) provided.
diff --git a/test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol b/test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol
deleted file mode 100644
index b49b4be5137a..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-error MyCustomError(uint, bool);
-contract C {
-    enum testEnum { choice1, choice2, choice3 }
-
-    function f1(uint8, uint8) external {}
-    function f2(uint32) external {}
-    function f3(uint) external {}
-    function g1(bytes memory) external {}
-    function g2(bytes32) external {}
-    function h(string memory) external {}
-    function i(bool) external {}
-    function j(address) external {}
-    function k(address payable) external {}
-    function l(testEnum) external {}
-
-    function f() pure public {
-        abi.encodeCall(this.f1, (MyCustomError, MyCustomError));
-        abi.encodeCall(this.f2, (MyCustomError));
-        abi.encodeCall(this.f3, (MyCustomError));
-        abi.encodeCall(this.g1, (MyCustomError));
-        abi.encodeCall(this.g2, (MyCustomError));
-        abi.encodeCall(this.h, (MyCustomError));
-        abi.encodeCall(this.i, (MyCustomError));
-        abi.encodeCall(this.j, (MyCustomError));
-        abi.encodeCall(this.k, (MyCustomError));
-        abi.encodeCall(this.l, (MyCustomError));
-    }
-}
-// ----
-// TypeError 5407: (543-556): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "uint8".
-// TypeError 5407: (558-571): Cannot implicitly convert component at position 1 from "error MyCustomError(uint256,bool)" to "uint8".
-// TypeError 5407: (607-622): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "uint32".
-// TypeError 5407: (657-672): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "uint256".
-// TypeError 5407: (707-722): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "bytes memory".
-// TypeError 5407: (757-772): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "bytes32".
-// TypeError 5407: (806-821): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "string memory".
-// TypeError 5407: (855-870): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "bool".
-// TypeError 5407: (904-919): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "address".
-// TypeError 5407: (953-968): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "address payable".
-// TypeError 5407: (1002-1017): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "enum C.testEnum".
diff --git a/test/libsolidity/syntaxTests/errors/error_in_interface.sol b/test/libsolidity/syntaxTests/errors/error_in_interface.sol
deleted file mode 100644
index 3f0f89b61afe..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_in_interface.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface C {
-    error E(uint);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/error_in_library.sol b/test/libsolidity/syntaxTests/errors/error_in_library.sol
deleted file mode 100644
index 1be9718b01e9..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_in_library.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library L {
-    error E(uint);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
deleted file mode 100644
index 3a54c1c15c73..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() pure public {
-        MyCustomError << MyCustomError;
-        MyCustomError >> MyCustomError;
-        MyCustomError ^ MyCustomError;
-        MyCustomError | MyCustomError;
-        MyCustomError & MyCustomError;
-
-        MyCustomError * MyCustomError;
-        MyCustomError / MyCustomError;
-        MyCustomError % MyCustomError;
-        MyCustomError + MyCustomError;
-        MyCustomError - MyCustomError;
-
-        MyCustomError == MyCustomError;
-        MyCustomError != MyCustomError;
-        MyCustomError >= MyCustomError;
-        MyCustomError <= MyCustomError;
-        MyCustomError < MyCustomError;
-        MyCustomError > MyCustomError;
-
-        MyCustomError || MyCustomError;
-        MyCustomError && MyCustomError;
-    }
-}
-
-// ----
-// TypeError 2271: (86-116): Built-in binary operator << cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (126-156): Built-in binary operator >> cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (166-195): Built-in binary operator ^ cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (205-234): Built-in binary operator | cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (244-273): Built-in binary operator & cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (284-313): Built-in binary operator * cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (323-352): Built-in binary operator / cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (362-391): Built-in binary operator % cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (401-430): Built-in binary operator + cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (440-469): Built-in binary operator - cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (480-510): Built-in binary operator == cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (520-550): Built-in binary operator != cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (560-590): Built-in binary operator >= cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (600-630): Built-in binary operator <= cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (640-669): Built-in binary operator < cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (679-708): Built-in binary operator > cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (719-749): Built-in binary operator || cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (759-789): Built-in binary operator && cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
deleted file mode 100644
index 61463e587ba2..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() pure public {
-        uint a;
-        MyCustomError += 1;
-        MyCustomError -= 1;
-        a += MyCustomError;
-        a -= MyCustomError;
-    }
-}
-
-// ----
-// TypeError 4247: (102-115): Expression has to be an lvalue.
-// TypeError 7366: (102-120): Operator += not compatible with types error MyCustomError(uint256,bool) and int_const 1.
-// TypeError 4247: (130-143): Expression has to be an lvalue.
-// TypeError 7366: (130-148): Operator -= not compatible with types error MyCustomError(uint256,bool) and int_const 1.
-// TypeError 7366: (158-176): Operator += not compatible with types uint256 and error MyCustomError(uint256,bool).
-// TypeError 7366: (186-204): Operator -= not compatible with types uint256 and error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
deleted file mode 100644
index 147d2a3e686e..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() pure public {
-        MyCustomError++;
-    }
-}
-
-// ----
-// TypeError 4247: (86-99): Expression has to be an lvalue.
-// TypeError 9767: (86-101): Built-in unary operator ++ cannot be applied to type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol b/test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol
deleted file mode 100644
index 0f1ce2c77e86..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract B {
-    function f() mod1(MyCustomError) public { }
-    modifier mod1(uint a) { if (a > 0) _; }
-}
-
-// ----
-// TypeError 4649: (69-82): Invalid type for argument in modifier invocation. Invalid implicit conversion from error MyCustomError(uint256,bool) to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/errors/error_location_memory.sol b/test/libsolidity/syntaxTests/errors/error_location_memory.sol
deleted file mode 100644
index c40d8dfc2bf9..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_location_memory.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error E(uint[] memory);
-// ----
-// ParserError 2314: (15-21): Expected ',' but got 'memory'
diff --git a/test/libsolidity/syntaxTests/errors/error_location_specifier.sol b/test/libsolidity/syntaxTests/errors/error_location_specifier.sol
deleted file mode 100644
index 5f5bdc2bbca2..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_location_specifier.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error E(uint[] calldata);
-// ----
-// ParserError 2314: (15-23): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol b/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol
deleted file mode 100644
index c8f9ca65bca5..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    error E(int bytes, bytes x);
-}
-// ----
-// ParserError 2314: (29-34): Expected ',' but got 'bytes'
diff --git a/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_param_name.sol b/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_param_name.sol
deleted file mode 100644
index 4650ed6d4cf6..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_param_name.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    error E1(StructType StructType);
-    error E2(EnumType EnumType);
-    error E3(EnumType StructType, StructType EnumType);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/error_reserved_name.sol b/test/libsolidity/syntaxTests/errors/error_reserved_name.sol
deleted file mode 100644
index fc89efc182f8..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_reserved_name.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error Error(uint);
-// ----
-// SyntaxError 1855: (0-18): The built-in errors "Error" and "Panic" cannot be re-defined.
diff --git a/test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol b/test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol
deleted file mode 100644
index 05d9df179b13..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() public returns (uint8, uint8, int) {
-        return ((MyCustomError, 8, MyCustomError));
-    }
-}
-
-// ----
-// TypeError 5992: (116-151): Return argument type tuple(error MyCustomError(uint256,bool),int_const 8,error MyCustomError(uint256,bool)) is not implicitly convertible to expected type tuple(uint8,uint8,int256).
diff --git a/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol b/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
deleted file mode 100644
index 1af3bbcd2c0b..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-library L {
-    error E(bytes4, bool, bytes);
-}
-
-error E(bytes4, bool, bytes);
-
-interface I {
-    error E(bytes4, bool, bytes);
-}
-
-contract B {
-    error E(bytes4, bool, bytes);
-}
-
-contract C is B {
-    bytes4 public librarySelector = L.E.selector;
-    bytes4 internal freeSelector = E.selector;
-    bytes4 internal contractSelector = B.E.selector;
-    bytes4 private interfaceSelector = I.E.selector;
-
-    function f(bool condition) public view {
-        assert(librarySelector == L.E.selector);
-        assert(E.selector == B.E.selector);
-
-        if (condition)
-            revert E(E.selector, true, "123");
-        else
-            revert L.E((B.E.selector), true, "123");
-    }
-}
-// ----
-// Warning 2519: (16-45): This declaration shadows an existing declaration.
-// Warning 2519: (98-127): This declaration shadows an existing declaration.
-// Warning 2519: (148-177): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/errors/error_ternary_operator.sol b/test/libsolidity/syntaxTests/errors/error_ternary_operator.sol
deleted file mode 100644
index c4600a858caf..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_ternary_operator.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() pure public {
-        true ? MyCustomError : MyCustomError;
-    }
-}
-
-// ----
-// TypeError 9717: (93-106): Invalid mobile type in true expression.
-// TypeError 3703: (109-122): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol b/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
deleted file mode 100644
index 6b2350cd0259..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-error E();
-
-contract C {
-    function() internal pure x = E;
-}
-// ----
-// TypeError 7407: (58-59): Type error E() is not implicitly convertible to expected type function () pure. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol b/test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol
deleted file mode 100644
index bca9acc0b2b2..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract C {
-    function f() public {
-        bytes4 a = MyCustomError;
-    }
-}
-
-// ----
-// TypeError 9574: (81-105): Type error MyCustomError(uint256,bool) is not implicitly convertible to expected type bytes4.
diff --git a/test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol b/test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol
deleted file mode 100644
index 69fc60735b70..000000000000
--- a/test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-error MyCustomError(uint, bool);
-
-contract Base {
-    constructor(uint8) {}
-}
-
-contract Derived is Base(MyCustomError) {}
-
-// ----
-// TypeError 9827: (104-117): Invalid type for argument in constructor call. Invalid implicit conversion from error MyCustomError(uint256,bool) to uint8 requested.
diff --git a/test/libsolidity/syntaxTests/errors/file_level.sol b/test/libsolidity/syntaxTests/errors/file_level.sol
deleted file mode 100644
index 07afb90ccc7c..000000000000
--- a/test/libsolidity/syntaxTests/errors/file_level.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error MyError();
-error MyError2(uint x);
-contract C {
-    error MyError3(uint x, bytes);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/hash_collision.sol b/test/libsolidity/syntaxTests/errors/hash_collision.sol
deleted file mode 100644
index d5ff09af9f5f..000000000000
--- a/test/libsolidity/syntaxTests/errors/hash_collision.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    error gsf();
-    error tgeo();
-}
-// ----
-// TypeError 4883: (43-47): Error signature hash collision for tgeo()
diff --git a/test/libsolidity/syntaxTests/errors/hash_collision_external.sol b/test/libsolidity/syntaxTests/errors/hash_collision_external.sol
deleted file mode 100644
index 8102a85a19fa..000000000000
--- a/test/libsolidity/syntaxTests/errors/hash_collision_external.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    error gsf();
-}
-contract test {
-    error tgeo();
-    function f(bool a) public {
-        if (a)
-            revert L.gsf();
-        else
-            revert tgeo();
-    }
-}
-// ----
-// TypeError 4883: (57-61): Error signature hash collision for tgeo()
diff --git a/test/libsolidity/syntaxTests/errors/indexed_error.sol b/test/libsolidity/syntaxTests/errors/indexed_error.sol
deleted file mode 100644
index 2efa3d70d338..000000000000
--- a/test/libsolidity/syntaxTests/errors/indexed_error.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error E(uint indexed);
-// ----
-// ParserError 2314: (13-20): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/errors/internal_type.sol b/test/libsolidity/syntaxTests/errors/internal_type.sol
deleted file mode 100644
index b88a27435d6f..000000000000
--- a/test/libsolidity/syntaxTests/errors/internal_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error E1(function() internal);
-error E2(S);
-
-struct S {
-    S[] ss;
-}
-// ----
-// TypeError 3417: (9-29): Internal or recursive type is not allowed as error parameter type.
-// TypeError 3417: (40-41): Internal or recursive type is not allowed as error parameter type.
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol
deleted file mode 100644
index 99b629cd3718..000000000000
--- a/test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    error e1(uint indexed x);
-}
-// ----
-// ParserError 2314: (31-38): Expected ',' but got 'indexed'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
deleted file mode 100644
index a116188d2375..000000000000
--- a/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: A ====
-contract test {
-    error e1(string storage a);
-}
-==== Source: B ====
-contract test {
-    error e1(string memory a);
-}
-==== Source: C ====
-contract test {
-    error e1(string calldata a);
-}
-// ----
-// ParserError 2314: (A:36-43): Expected ',' but got 'storage'
-// ParserError 2314: (B:36-42): Expected ',' but got 'memory'
-// ParserError 2314: (C:36-44): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol
deleted file mode 100644
index fc5b4609b9e6..000000000000
--- a/test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    error e1(uint constant x);
-    error e2(uint immutable x);
-}
-// ----
-// DeclarationError 1788: (26-41): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 8297: (57-73): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol
deleted file mode 100644
index c35e759df5f6..000000000000
--- a/test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-contract C {
-    error e1(uint external x);
-}
-==== Source: B ====
-contract C {
-    error e1(uint internal x);
-}
-==== Source: C ====
-contract C {
-    error e1(uint public x);
-}
-==== Source: D ====
-contract C {
-    error e1(uint private x);
-}
-// ----
-// ParserError 2314: (A:31-39): Expected ',' but got 'external'
-// ParserError 2314: (B:31-39): Expected ',' but got 'internal'
-// ParserError 2314: (C:31-37): Expected ',' but got 'public'
-// ParserError 2314: (D:31-38): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/errors/no_mappings.sol b/test/libsolidity/syntaxTests/errors/no_mappings.sol
deleted file mode 100644
index 1de0e2374b2a..000000000000
--- a/test/libsolidity/syntaxTests/errors/no_mappings.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error MyError(mapping(uint => uint));
-contract C {
-    error MyError2(mapping(uint => uint));
-}
-// ----
-// TypeError 3448: (14-35): Type containing a (nested) mapping is not allowed as error parameter type.
diff --git a/test/libsolidity/syntaxTests/errors/no_overloading.sol b/test/libsolidity/syntaxTests/errors/no_overloading.sol
deleted file mode 100644
index 53ba017438f9..000000000000
--- a/test/libsolidity/syntaxTests/errors/no_overloading.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-error Err(uint);
-error Err(bytes32);
-// ----
-// DeclarationError 2333: (17-36): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol b/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol
deleted file mode 100644
index fac0da4bc036..000000000000
--- a/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    error Err(uint);
-}
-contract B is A {
-    error Err(bytes32);
-}
-// ----
-// DeclarationError 9097: (58-77): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol b/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol
deleted file mode 100644
index 8727a2852913..000000000000
--- a/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder v1;
-struct S {uint a;}
-contract C {
-    error MyError(S);
-}
-// ----
-// TypeError 3061: (70-71): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol b/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol
deleted file mode 100644
index c6f3dd1afde7..000000000000
--- a/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error Panic(bytes2);
-// ----
-// SyntaxError 1855: (0-20): The built-in errors "Error" and "Panic" cannot be re-defined.
diff --git a/test/libsolidity/syntaxTests/errors/require_custom.sol b/test/libsolidity/syntaxTests/errors/require_custom.sol
deleted file mode 100644
index f139a4fe5a7c..000000000000
--- a/test/libsolidity/syntaxTests/errors/require_custom.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint a, uint b);
-contract C {
-    function f(bool c) public pure {
-        require(c, E(2, 7));
-    }
-}
-// ----
-// TypeError 9322: (83-90): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/errors/revert_parentheses.sol b/test/libsolidity/syntaxTests/errors/revert_parentheses.sol
deleted file mode 100644
index 27c7044e5d84..000000000000
--- a/test/libsolidity/syntaxTests/errors/revert_parentheses.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint a, uint b);
-contract C {
-    function f() public pure {
-        revert(E(2, 7));
-    }
-}
-// ----
-// TypeError 9322: (77-83): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/errors/selector.sol b/test/libsolidity/syntaxTests/errors/selector.sol
deleted file mode 100644
index 6d882651750e..000000000000
--- a/test/libsolidity/syntaxTests/errors/selector.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error E();
-
-contract C {
-    bytes4 t = E.selector;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/selector_on_instance.sol b/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
deleted file mode 100644
index 3eac5984f311..000000000000
--- a/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-error E();
-
-contract C {
-    bytes4 t = E().selector;
-}
-// ----
-// TypeError 9582: (40-52): Member "selector" not found or not visible after argument-dependent lookup in tuple().
diff --git a/test/libsolidity/syntaxTests/errors/struct_named_error.sol b/test/libsolidity/syntaxTests/errors/struct_named_error.sol
deleted file mode 100644
index 0ee82ead66ae..000000000000
--- a/test/libsolidity/syntaxTests/errors/struct_named_error.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// Test that the parser workaround is not breaking.
-struct error {uint a;}
-contract C {
-    error x;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/unreachable.sol b/test/libsolidity/syntaxTests/errors/unreachable.sol
deleted file mode 100644
index c3ee54d177d6..000000000000
--- a/test/libsolidity/syntaxTests/errors/unreachable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    error E();
-    uint x = 2;
-    function f() public {
-        revert E();
-        x = 4;
-    }
-}
-// ----
-// Warning 5740: (98-103): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/errors/using.sol b/test/libsolidity/syntaxTests/errors/using.sol
deleted file mode 100644
index ad5a43f8648a..000000000000
--- a/test/libsolidity/syntaxTests/errors/using.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-error E(uint);
-library L {
-    function f(uint) internal {}
-}
-contract C {
-    using L for *;
-    function f() public pure {
-        E.f();
-    }
-}
-// ----
-// TypeError 9582: (133-136): Member "f" not found or not visible after argument-dependent lookup in error E(uint256).
diff --git a/test/libsolidity/syntaxTests/errors/using_2.sol b/test/libsolidity/syntaxTests/errors/using_2.sol
deleted file mode 100644
index 6942513a1922..000000000000
--- a/test/libsolidity/syntaxTests/errors/using_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-error E(uint);
-library L {
-    function f(uint) internal {}
-}
-contract C {
-    using L for E;
-    function f() public pure {
-        E.f();
-    }
-}
-// ----
-// TypeError 5172: (91-92): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/using_structs.sol b/test/libsolidity/syntaxTests/errors/using_structs.sol
deleted file mode 100644
index 282fce35d3cc..000000000000
--- a/test/libsolidity/syntaxTests/errors/using_structs.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-struct S {uint a;}
-contract C {
-    error MyError(S);
-    error MyError2(S t);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/errors/weird3.sol b/test/libsolidity/syntaxTests/errors/weird3.sol
deleted file mode 100644
index a059339c6ced..000000000000
--- a/test/libsolidity/syntaxTests/errors/weird3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-error E();
-
-contract C {
-    E x;
-}
-// ----
-// TypeError 5172: (29-30): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/weird4.sol b/test/libsolidity/syntaxTests/errors/weird4.sol
deleted file mode 100644
index c4fff3747daf..000000000000
--- a/test/libsolidity/syntaxTests/errors/weird4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error E();
-
-contract C {
-    function f() public pure {
-        E x;
-    }
-}
-// ----
-// TypeError 5172: (64-65): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/zero_signature.sol b/test/libsolidity/syntaxTests/errors/zero_signature.sol
deleted file mode 100644
index 06a212d76c0e..000000000000
--- a/test/libsolidity/syntaxTests/errors/zero_signature.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error buyAndFree22457070633(uint256);
-contract C {
-    error buyAndFree22457070633(uint256);
-}
-// ----
-// Warning 2519: (55-92): This declaration shadows an existing declaration.
-// SyntaxError 2855: (0-37): The selector 0x00000000 is reserved. Please rename the error to avoid the collision.
-// SyntaxError 2855: (55-92): The selector 0x00000000 is reserved. Please rename the error to avoid the collision.
diff --git a/test/libsolidity/syntaxTests/events/anonymous_event_four_indexed.sol b/test/libsolidity/syntaxTests/events/anonymous_event_four_indexed.sol
deleted file mode 100644
index b3283f46992f..000000000000
--- a/test/libsolidity/syntaxTests/events/anonymous_event_four_indexed.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    event e(uint indexed a, bytes3 indexed b, bool indexed c, uint indexed d) anonymous;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol b/test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol
deleted file mode 100644
index fd3e317b82c5..000000000000
--- a/test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e(uint a) anonymous anonymous;
-}
-// ----
-// ParserError 2314: (43-52): Expected ';' but got 'anonymous'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/events/anonymous_event_too_many_indexed.sol b/test/libsolidity/syntaxTests/events/anonymous_event_too_many_indexed.sol
deleted file mode 100644
index d1e254d6ad22..000000000000
--- a/test/libsolidity/syntaxTests/events/anonymous_event_too_many_indexed.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e(uint indexed a, bytes3 indexed b, bool indexed c, uint indexed d, uint indexed e) anonymous;
-}
-// ----
-// TypeError 8598: (17-117): More than 4 indexed arguments for anonymous event.
diff --git a/test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol b/test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol
deleted file mode 100644
index 40323830e56b..000000000000
--- a/test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() public {
-        bytes memory a;
-        bytes memory b = type(MyCustomEvent).concat(a);
-    }
-}
-// ----
-//  TypeError 4259: (124-137): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but event MyCustomEvent(uint256) provided.
diff --git a/test/libsolidity/syntaxTests/events/double_event_declaration.sol b/test/libsolidity/syntaxTests/events/double_event_declaration.sol
deleted file mode 100644
index fd48e247e7d5..000000000000
--- a/test/libsolidity/syntaxTests/events/double_event_declaration.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    event A(uint i);
-    event A(uint i);
-}
-// ----
-// DeclarationError 5883: (20-36): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol b/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol
deleted file mode 100644
index 0b35181059cc..000000000000
--- a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    event A(uint i);
-    event A(uint i) anonymous;
-}
-// ----
-// DeclarationError 5883: (20-36): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol b/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol
deleted file mode 100644
index fb45ebe1078a..000000000000
--- a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    event A(uint i);
-    event A(uint indexed i);
-}
-// ----
-// DeclarationError 5883: (20-36): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol b/test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol
deleted file mode 100644
index a3e08411b1cf..000000000000
--- a/test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-    event a(bool payable);
-    event b(string payable);
-    event c(int payable);
-    event d(int256 payable);
-    event e(uint payable);
-    event f(uint256 payable);
-    event g(bytes1 payable);
-    event h(bytes payable);
-    event i(bytes32 payable);
-    event j(fixed payable);
-    event k(fixed80x80 payable);
-    event l(ufixed payable);
-    event m(ufixed80x80 payable);
-}
-contract C2 {
-    event a(bool view);
-    event b(string view);
-    event c(int view);
-    event d(int256 view);
-    event e(uint view);
-    event f(uint256 view);
-    event g(bytes1 view);
-    event h(bytes view);
-    event i(bytes32 view);
-    event j(fixed view);
-    event k(fixed80x80 view);
-    event l(ufixed view);
-    event m(ufixed80x80 view);
-}
-contract C3 {
-    event a(bool pure);
-    event b(string pure);
-    event c(int pure);
-    event d(int256 pure);
-    event e(uint pure);
-    event f(uint256 pure);
-    event g(bytes1 pure);
-    event h(bytes pure);
-    event i(bytes32 pure);
-    event j(fixed pure);
-    event k(fixed80x80 pure);
-    event l(ufixed pure);
-    event m(ufixed80x80 pure);
-}
-// ----
-// ParserError 9106: (30-37): State mutability can only be specified for address types.
-// ParserError 9106: (59-66): State mutability can only be specified for address types.
-// ParserError 9106: (85-92): State mutability can only be specified for address types.
-// ParserError 9106: (114-121): State mutability can only be specified for address types.
-// ParserError 9106: (141-148): State mutability can only be specified for address types.
-// ParserError 9106: (171-178): State mutability can only be specified for address types.
-// ParserError 9106: (200-207): State mutability can only be specified for address types.
-// ParserError 9106: (228-235): State mutability can only be specified for address types.
-// ParserError 9106: (258-265): State mutability can only be specified for address types.
-// ParserError 9106: (286-293): State mutability can only be specified for address types.
-// ParserError 9106: (319-326): State mutability can only be specified for address types.
-// ParserError 9106: (348-355): State mutability can only be specified for address types.
-// ParserError 9106: (382-389): State mutability can only be specified for address types.
-// ParserError 9106: (425-429): State mutability can only be specified for address types.
-// ParserError 9106: (451-455): State mutability can only be specified for address types.
-// ParserError 9106: (474-478): State mutability can only be specified for address types.
-// ParserError 9106: (500-504): State mutability can only be specified for address types.
-// ParserError 9106: (524-528): State mutability can only be specified for address types.
-// ParserError 9106: (551-555): State mutability can only be specified for address types.
-// ParserError 9106: (577-581): State mutability can only be specified for address types.
-// ParserError 9106: (602-606): State mutability can only be specified for address types.
-// ParserError 9106: (629-633): State mutability can only be specified for address types.
-// ParserError 9106: (654-658): State mutability can only be specified for address types.
-// ParserError 9106: (684-688): State mutability can only be specified for address types.
-// ParserError 9106: (710-714): State mutability can only be specified for address types.
-// ParserError 9106: (741-745): State mutability can only be specified for address types.
-// ParserError 9106: (781-785): State mutability can only be specified for address types.
-// ParserError 9106: (807-811): State mutability can only be specified for address types.
-// ParserError 9106: (830-834): State mutability can only be specified for address types.
-// ParserError 9106: (856-860): State mutability can only be specified for address types.
-// ParserError 9106: (880-884): State mutability can only be specified for address types.
-// ParserError 9106: (907-911): State mutability can only be specified for address types.
-// ParserError 9106: (933-937): State mutability can only be specified for address types.
-// ParserError 9106: (958-962): State mutability can only be specified for address types.
-// ParserError 9106: (985-989): State mutability can only be specified for address types.
-// ParserError 9106: (1010-1014): State mutability can only be specified for address types.
-// ParserError 9106: (1040-1044): State mutability can only be specified for address types.
-// ParserError 9106: (1066-1070): State mutability can only be specified for address types.
-// ParserError 9106: (1097-1101): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/events/event.sol b/test/libsolidity/syntaxTests/events/event.sol
deleted file mode 100644
index c5f9e4d05f9f..000000000000
--- a/test/libsolidity/syntaxTests/events/event.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e(uint indexed a, bytes3 indexed s, bool indexed b);
-    function f() public { emit e(2, "abc", true); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_abi_decode.sol b/test/libsolidity/syntaxTests/events/event_abi_decode.sol
deleted file mode 100644
index 6895d77909ad..000000000000
--- a/test/libsolidity/syntaxTests/events/event_abi_decode.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Test {
-    event E(uint);
-    function f() public {
-        abi.decode(E, (bool));
-    }
-}
-// ----
-// TypeError 1956: (80-81): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type event E(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_array_indexed_v2.sol b/test/libsolidity/syntaxTests/events/event_array_indexed_v2.sol
deleted file mode 100644
index 558e2f4337e9..000000000000
--- a/test/libsolidity/syntaxTests/events/event_array_indexed_v2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract c {
-    event E(uint[] indexed);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_array_v2.sol b/test/libsolidity/syntaxTests/events/event_array_v2.sol
deleted file mode 100644
index 6f0a1936d107..000000000000
--- a/test/libsolidity/syntaxTests/events/event_array_v2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract c {
-    event E(uint[]);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol b/test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol
deleted file mode 100644
index 7ec5188cc8bf..000000000000
--- a/test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() pure public {
-        bytes.concat(MyCustomEvent, MyCustomEvent);
-    }
-}
-// ----
-// TypeError 8015: (96-109): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but event MyCustomEvent(uint256) provided.
-// TypeError 8015: (111-124): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but event MyCustomEvent(uint256) provided.
diff --git a/test/libsolidity/syntaxTests/events/event_call.sol b/test/libsolidity/syntaxTests/events/event_call.sol
deleted file mode 100644
index 8cf50597f657..000000000000
--- a/test/libsolidity/syntaxTests/events/event_call.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e(uint a, bytes3 indexed s, bool indexed b);
-    function f() public { emit e(2, "abc", true); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_emit_complex.sol b/test/libsolidity/syntaxTests/events/event_emit_complex.sol
deleted file mode 100644
index 37828fbeece6..000000000000
--- a/test/libsolidity/syntaxTests/events/event_emit_complex.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    event e(uint a, string b);
-    function f() public {
-        emit e(2, "abc");
-        emit e({b: "abc", a: 8});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_emit_foreign_class.sol b/test/libsolidity/syntaxTests/events/event_emit_foreign_class.sol
deleted file mode 100644
index a6c28d2fffef..000000000000
--- a/test/libsolidity/syntaxTests/events/event_emit_foreign_class.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A { event e(uint a, string b); }
-contract C is A {
-    function f() public {
-        emit A.e(2, "abc");
-        emit A.e({b: "abc", a: 8});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol b/test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol
deleted file mode 100644
index 6d1cc65de761..000000000000
--- a/test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: M.sol ====
-event E();
-==== Source: A.sol ====
-import "M.sol" as M;
-
-function f() {
-    emit M.E();
-}
diff --git a/test/libsolidity/syntaxTests/events/event_emit_simple.sol b/test/libsolidity/syntaxTests/events/event_emit_simple.sol
deleted file mode 100644
index 597cf04fb1fc..000000000000
--- a/test/libsolidity/syntaxTests/events/event_emit_simple.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    event e();
-    function f() public {
-        emit e();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol b/test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol
deleted file mode 100644
index 46fda33bc467..000000000000
--- a/test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-event E();
-
-contract C {
-    function f() public {
-        emit E();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol b/test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol
deleted file mode 100644
index 9137fd26f4c6..000000000000
--- a/test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-
-    enum testEnum { choice1, choice2, choice3 }
-
-    function f1(uint8, uint8) external {}
-    function f2(uint32) external {}
-    function f3(uint) external {}
-    function g1(bytes memory) external {}
-    function g2(bytes32) external {}
-    function h(string memory) external {}
-    function i(bool) external {}
-    function j(address) external {}
-    function k(address payable) external {}
-    function l(testEnum) external {}
-
-    function f() pure public {
-        abi.encodeCall(this.f1, (MyCustomEvent, MyCustomEvent));
-        abi.encodeCall(this.f2, (MyCustomEvent));
-        abi.encodeCall(this.f3, (MyCustomEvent));
-        abi.encodeCall(this.g1, (MyCustomEvent));
-        abi.encodeCall(this.g2, (MyCustomEvent));
-        abi.encodeCall(this.h, (MyCustomEvent));
-        abi.encodeCall(this.i, (MyCustomEvent));
-        abi.encodeCall(this.j, (MyCustomEvent));
-        abi.encodeCall(this.k, (MyCustomEvent));
-        abi.encodeCall(this.l, (MyCustomEvent));
-    }
-}
-// ----
-// TypeError 5407: (542-555): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "uint8".
-// TypeError 5407: (557-570): Cannot implicitly convert component at position 1 from "event MyCustomEvent(uint256)" to "uint8".
-// TypeError 5407: (606-621): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "uint32".
-// TypeError 5407: (656-671): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "uint256".
-// TypeError 5407: (706-721): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "bytes memory".
-// TypeError 5407: (756-771): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "bytes32".
-// TypeError 5407: (805-820): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "string memory".
-// TypeError 5407: (854-869): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "bool".
-// TypeError 5407: (903-918): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "address".
-// TypeError 5407: (952-967): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "address payable".
-// TypeError 5407: (1001-1016): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "enum C.testEnum".
diff --git a/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol b/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol
deleted file mode 100644
index 858e93d2d9e2..000000000000
--- a/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function dup() public returns (uint) {
-        return 1;
-    }
-}
-contract B {
-    event dup();
-}
-contract C is A, B {
-}
-// ----
-// DeclarationError 9097: (99-111): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/event_function_type_indexed.sol b/test/libsolidity/syntaxTests/events/event_function_type_indexed.sol
deleted file mode 100644
index 37c22556efb6..000000000000
--- a/test/libsolidity/syntaxTests/events/event_function_type_indexed.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	event Test(function() external indexed);
-	function f() public {
-		emit Test(this.f);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
deleted file mode 100644
index bf04c6a3b33f..000000000000
--- a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() pure public {
-        MyCustomEvent << MyCustomEvent;
-        MyCustomEvent >> MyCustomEvent;
-        MyCustomEvent ^ MyCustomEvent;
-        MyCustomEvent | MyCustomEvent;
-        MyCustomEvent & MyCustomEvent;
-
-        MyCustomEvent * MyCustomEvent;
-        MyCustomEvent / MyCustomEvent;
-        MyCustomEvent % MyCustomEvent;
-        MyCustomEvent + MyCustomEvent;
-        MyCustomEvent - MyCustomEvent;
-
-        MyCustomEvent == MyCustomEvent;
-        MyCustomEvent != MyCustomEvent;
-        MyCustomEvent >= MyCustomEvent;
-        MyCustomEvent <= MyCustomEvent;
-        MyCustomEvent < MyCustomEvent;
-        MyCustomEvent > MyCustomEvent;
-
-        MyCustomEvent || MyCustomEvent;
-        MyCustomEvent && MyCustomEvent;
-    }
-}
-
-// ----
-// TypeError 2271: (83-113): Built-in binary operator << cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (123-153): Built-in binary operator >> cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (163-192): Built-in binary operator ^ cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (202-231): Built-in binary operator | cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (241-270): Built-in binary operator & cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (281-310): Built-in binary operator * cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (320-349): Built-in binary operator / cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (359-388): Built-in binary operator % cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (398-427): Built-in binary operator + cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (437-466): Built-in binary operator - cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (477-507): Built-in binary operator == cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (517-547): Built-in binary operator != cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (557-587): Built-in binary operator >= cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (597-627): Built-in binary operator <= cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (637-666): Built-in binary operator < cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (676-705): Built-in binary operator > cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (716-746): Built-in binary operator || cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (756-786): Built-in binary operator && cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol b/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
deleted file mode 100644
index 64d62955108b..000000000000
--- a/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() pure public {
-        uint a;
-        MyCustomEvent += 1;
-        MyCustomEvent -= 1;
-        a += MyCustomEvent;
-        a -= MyCustomEvent;
-    }
-}
-
-// ----
-// TypeError 4247: (99-112): Expression has to be an lvalue.
-// TypeError 7366: (99-117): Operator += not compatible with types event MyCustomEvent(uint256) and int_const 1.
-// TypeError 4247: (127-140): Expression has to be an lvalue.
-// TypeError 7366: (127-145): Operator -= not compatible with types event MyCustomEvent(uint256) and int_const 1.
-// TypeError 7366: (155-173): Operator += not compatible with types uint256 and event MyCustomEvent(uint256).
-// TypeError 7366: (183-201): Operator -= not compatible with types uint256 and event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
deleted file mode 100644
index 751be213240a..000000000000
--- a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() pure public {
-        MyCustomEvent++;
-    }
-}
-
-// ----
-// TypeError 4247: (83-96): Expression has to be an lvalue.
-// TypeError 9767: (83-98): Built-in unary operator ++ cannot be applied to type event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_inheritance.sol b/test/libsolidity/syntaxTests/events/event_inheritance.sol
deleted file mode 100644
index b13d57551819..000000000000
--- a/test/libsolidity/syntaxTests/events/event_inheritance.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract base {
-    event e(uint a, bytes3 indexed s, bool indexed b);
-}
-contract c is base {
-    function f() public { emit e(2, "abc", true); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol b/test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol
deleted file mode 100644
index b534c3b1e6a2..000000000000
--- a/test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract B {
-    event MyCustomEvent(uint);
-    function f() mod1(MyCustomEvent) public { }
-    modifier mod1(uint a) { if (a > 0) _; }
-}
-
-// ----
-// TypeError 4649: (66-79): Invalid type for argument in modifier invocation. Invalid implicit conversion from event MyCustomEvent(uint256) to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/events/event_library_function.sol b/test/libsolidity/syntaxTests/events/event_library_function.sol
deleted file mode 100644
index 7a1b793f35b9..000000000000
--- a/test/libsolidity/syntaxTests/events/event_library_function.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-library L {
-	function f() public {
-		int x = 1;
-	}
-}
-
-contract C {
-	event Test(function() external indexed);
-
-	function g() public {
-		Test(L.f);
-	}
-}
-
-contract D {
-	event Test(function() external);
-
-	function f() public {
-		Test(L.f);
-	}
-}
-
-contract E {
-	event Test(function() external indexed);
-
-	using L for D;
-
-	function k() public {
-		Test(D.f);
-	}
-}
-// ----
-// TypeError 9553: (140-143): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions cannot be converted to function types.
-// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions cannot be converted to function types.
-// TypeError 9553: (345-348): Invalid type for argument in function call. Invalid implicit conversion from function D.f() to function () external requested. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/events/event_multiple_indexed_of_one_parameter.sol b/test/libsolidity/syntaxTests/events/event_multiple_indexed_of_one_parameter.sol
deleted file mode 100644
index dd6edd825eb5..000000000000
--- a/test/libsolidity/syntaxTests/events/event_multiple_indexed_of_one_parameter.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    event e(uint indexed a, bytes3 indexed indexed s, bool indexed indexed indexed b);
-    event e2(uint indexed indexed a, bytes3 indexed s);
-}
-// ----
-// ParserError 5399: (56-63): Indexed already specified.
-// ParserError 5399: (80-87): Indexed already specified.
-// ParserError 5399: (88-95): Indexed already specified.
-// ParserError 5399: (126-133): Indexed already specified.
diff --git a/test/libsolidity/syntaxTests/events/event_named_arguments_in_any_order.sol b/test/libsolidity/syntaxTests/events/event_named_arguments_in_any_order.sol
deleted file mode 100644
index 372659e898d3..000000000000
--- a/test/libsolidity/syntaxTests/events/event_named_arguments_in_any_order.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    event e(uint u, string s, bool b);
-
-    function call() public {
-        emit e({s: "abc", u: 1,     b: true});
-        emit e({s: "abc", b: true,  u: 1});
-        emit e({u: 1,     s: "abc", b: true});
-        emit e({b: true,  s: "abc", u: 1});
-        emit e({u: 1,     b: true,  s: "abc"});
-        emit e({b: true,  u: 1,     s: "abc"});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array.sol b/test/libsolidity/syntaxTests/events/event_nested_array.sol
deleted file mode 100644
index 2491dae6e824..000000000000
--- a/test/libsolidity/syntaxTests/events/event_nested_array.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder v1;
-contract c {
-    event E(uint[][]);
-}
-// ----
-// TypeError 3061: (45-53): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_2.sol b/test/libsolidity/syntaxTests/events/event_nested_array_2.sol
deleted file mode 100644
index 5825650e161d..000000000000
--- a/test/libsolidity/syntaxTests/events/event_nested_array_2.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    event E(uint[2][]);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
deleted file mode 100644
index ee868a7152ad..000000000000
--- a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder v1;
-contract c {
-	struct S { uint x; uint[][] arr; }
-    event E(S);
-}
-// ----
-// TypeError 3061: (81-82): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_indexed_v2.sol b/test/libsolidity/syntaxTests/events/event_nested_array_indexed_v2.sol
deleted file mode 100644
index 0643fdec29df..000000000000
--- a/test/libsolidity/syntaxTests/events/event_nested_array_indexed_v2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract c {
-    event E(uint[][] indexed);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_v2.sol b/test/libsolidity/syntaxTests/events/event_nested_array_v2.sol
deleted file mode 100644
index a314a164f8bc..000000000000
--- a/test/libsolidity/syntaxTests/events/event_nested_array_v2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma abicoder               v2;
-contract c {
-    event E(uint[][]);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol
deleted file mode 100644
index 28ee39e152ab..000000000000
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    event e(uint u, string s);
-    event e(string s, uint u);
-
-    function call() public {
-        emit e({u: 2, s: "abc"});
-    }
-}
-// ----
-// TypeError 4487: (118-119): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol
deleted file mode 100644
index 2c7884a9dfc0..000000000000
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    event e(uint u, string s);
-    event e(bytes s, int u);
-
-    function call() public {
-        emit e({u: 2, s: "abc"});
-    }
-}
-// ----
-// TypeError 4487: (116-117): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_in_any_order.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_in_any_order.sol
deleted file mode 100644
index e1d4eb34399e..000000000000
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_in_any_order.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    event e(uint u, string s, bool b);
-    event e(uint u, uint s, uint b);
-
-    function call() public {
-        emit e({s: "abc", u: 1,     b: true});
-        emit e({s: "abc", b: true,  u: 1});
-        emit e({u: 1,     s: "abc", b: true});
-        emit e({b: true,  s: "abc", u: 1});
-        emit e({u: 1,     b: true,  s: "abc"});
-        emit e({b: true,  u: 1,     s: "abc"});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol
deleted file mode 100644
index abee5dff1210..000000000000
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    event e(uint u, string s);
-    event e(string s, uint u);
-
-    function call() public {
-        emit e({s: 2, u: "abc"});
-    }
-}
-// ----
-// TypeError 9322: (118-119): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol b/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol
deleted file mode 100644
index 3adc1bb7a8ea..000000000000
--- a/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e(uint indexed a, mapping(uint => uint) indexed b, bool indexed c, uint indexed d, uint indexed e) anonymous;
-}
-// ----
-// TypeError 3448: (41-72): Type containing a (nested) mapping is not allowed as event parameter type.
diff --git a/test/libsolidity/syntaxTests/events/event_param_type_shadowed_by_param_name.sol b/test/libsolidity/syntaxTests/events/event_param_type_shadowed_by_param_name.sol
deleted file mode 100644
index b59e67ecee6b..000000000000
--- a/test/libsolidity/syntaxTests/events/event_param_type_shadowed_by_param_name.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    event E1(StructType StructType);
-    event E2(EnumType EnumType);
-    event E3(EnumType StructType, StructType EnumType);
-    event E4(StructType indexed StructType) anonymous;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol b/test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol
deleted file mode 100644
index 87be3691f006..000000000000
--- a/test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() public returns (uint8, uint8, int) {
-        return ((MyCustomEvent, 8, MyCustomEvent));
-    }
-}
-
-// ----
-// TypeError 5992: (113-148): Return argument type tuple(event MyCustomEvent(uint256),int_const 8,event MyCustomEvent(uint256)) is not implicitly convertible to expected type tuple(uint8,uint8,int256).
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol b/test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol
deleted file mode 100644
index 1131e00b6e57..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-event E();
-
-contract C {
-    function f() external pure returns (bytes32) {
-        return E.selector;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol b/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
deleted file mode 100644
index ccc2b199cff9..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {
-    event E();
-}
-
-contract C {
-    function f() external pure returns (bytes32) {
-        return D.E.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol b/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
deleted file mode 100644
index 2b4cd4e92992..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface I {
-    event E();
-}
-
-contract C {
-    function f() external pure returns (bytes32) {
-        return I.E.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_library.sol b/test/libsolidity/syntaxTests/events/event_selector_access_library.sol
deleted file mode 100644
index 2bf248459838..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_access_library.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    event E();
-}
-
-contract C {
-    function f() external pure returns (bytes32) {
-        return L.E.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
deleted file mode 100644
index e94869732cff..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library Y {
-    event E() anonymous;
-}
-
-contract D {
-    function test1() external pure returns (bytes32) {
-        return Y.E.selector;
-    }
-}
-// ----
-// TypeError 9582: (123-135): Member "selector" not found or not visible after argument-dependent lookup in event E().
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
deleted file mode 100644
index 613d4ebcf796..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library Y {
-    event E() anonymous;
-}
-
-contract C {
-    bytes32 s5 = Y.E.selector;
-
-    function test2() view external returns (bytes32) {
-        return s5;
-    }
-}
-// ----
-// TypeError 9582: (70-82): Member "selector" not found or not visible after argument-dependent lookup in event E().
diff --git a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
deleted file mode 100644
index fec21b55f53b..000000000000
--- a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-library L {
-    event E(bytes32, bool, bytes indexed);
-}
-
-interface I {
-    event E(bytes32, bool, bytes indexed);
-}
-
-contract A {
-    event E(bytes32, bool, bytes indexed);
-}
-
-contract B {
-    event E(bytes32, bool, bytes indexed);
-}
-
-contract C is B {
-    bytes32 public librarySelector = L.E.selector;
-    bytes32 public interfaceSelector = I.E.selector;
-    bytes32 public foreignContractSelector = A.E.selector;
-    bytes32 inheritedSelector = E.selector;
-
-    function f() public {
-        assert(librarySelector == L.E.selector);
-        assert(interfaceSelector == I.E.selector);
-        assert(foreignContractSelector == A.E.selector);
-        assert(E.selector == B.E.selector);
-
-        emit E(E.selector, true, "123");
-        emit I.E((B.E.selector), true, "123");
-        emit A.E((B.E.selector), true, "123");
-        emit L.E((B.E.selector), true, "123");
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_struct.sol b/test/libsolidity/syntaxTests/events/event_struct.sol
deleted file mode 100644
index ac6355fe0744..000000000000
--- a/test/libsolidity/syntaxTests/events/event_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder v1;
-contract c {
-    struct S { uint a ; }
-    event E(S);
-}
-// ----
-// TypeError 3061: (71-72): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
deleted file mode 100644
index 7e3393400c79..000000000000
--- a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder v1;
-contract c {
-    struct S { uint a ; }
-    event E(S indexed);
-}
-// ----
-// TypeError 3061: (71-80): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_struct_indexed_v2.sol b/test/libsolidity/syntaxTests/events/event_struct_indexed_v2.sol
deleted file mode 100644
index b67b37b856e7..000000000000
--- a/test/libsolidity/syntaxTests/events/event_struct_indexed_v2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-contract c {
-    struct S { uint a ; }
-    event E(S indexed);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_struct_v2.sol b/test/libsolidity/syntaxTests/events/event_struct_v2.sol
deleted file mode 100644
index 53e538d1a266..000000000000
--- a/test/libsolidity/syntaxTests/events/event_struct_v2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-contract c {
-    struct S { uint a ; }
-    event E(S);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/event_ternary_operator.sol b/test/libsolidity/syntaxTests/events/event_ternary_operator.sol
deleted file mode 100644
index 0ba773241f4c..000000000000
--- a/test/libsolidity/syntaxTests/events/event_ternary_operator.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() pure public {
-        true ? MyCustomEvent : MyCustomEvent;
-    }
-}
-
-// ----
-// TypeError 9717: (90-103): Invalid mobile type in true expression.
-// TypeError 3703: (106-119): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol b/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
deleted file mode 100644
index 76d0edc763e5..000000000000
--- a/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-
-contract C {
-    event E(uint);
-    function() internal pure x = E;
-}
-// ----
-// TypeError 7407: (66-67): Type event E(uint256) is not implicitly convertible to expected type function () pure. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/events/event_too_many_indexed.sol b/test/libsolidity/syntaxTests/events/event_too_many_indexed.sol
deleted file mode 100644
index ccc8d71c1d33..000000000000
--- a/test/libsolidity/syntaxTests/events/event_too_many_indexed.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e(uint indexed a, bytes3 indexed b, bool indexed c, uint indexed d);
-}
-// ----
-// TypeError 7249: (17-91): More than 3 indexed arguments for event.
diff --git a/test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol b/test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol
deleted file mode 100644
index 60cdebddc97d..000000000000
--- a/test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    function f() public {
-        bytes4 a = MyCustomEvent;
-    }
-}
-
-// ----
-// TypeError 9574: (78-102): Type event MyCustomEvent(uint256) is not implicitly convertible to expected type bytes4.
diff --git a/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol b/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol
deleted file mode 100644
index 6b79c77d2b7d..000000000000
--- a/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    event e();
-    function f() public {
-        e();
-    }
-}
-// ----
-// TypeError 3132: (62-65): Event invocations have to be prefixed by "emit".
diff --git a/test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol b/test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol
deleted file mode 100644
index adaaf4cccbab..000000000000
--- a/test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Base {
-    event MyCustomEvent(uint);
-    constructor(uint8) {}
-}
-
-contract Derived is Base(Base.MyCustomEvent) {}
-
-// ----
-// TypeError 9827: (101-119): Invalid type for argument in constructor call. Invalid implicit conversion from event MyCustomEvent(uint256) to uint8 requested.
diff --git a/test/libsolidity/syntaxTests/events/events_with_same_name.sol b/test/libsolidity/syntaxTests/events/events_with_same_name.sol
deleted file mode 100644
index a75e9e552a5e..000000000000
--- a/test/libsolidity/syntaxTests/events/events_with_same_name.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract TestIt {
-    event A();
-    event A(uint i);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/events_with_same_name_different_types.sol b/test/libsolidity/syntaxTests/events/events_with_same_name_different_types.sol
deleted file mode 100644
index 7c87dd0f1883..000000000000
--- a/test/libsolidity/syntaxTests/events/events_with_same_name_different_types.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    event A(uint);
-    event A(bytes);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/events_with_same_name_unnamed_arguments.sol b/test/libsolidity/syntaxTests/events/events_with_same_name_unnamed_arguments.sol
deleted file mode 100644
index ab23bf5c22df..000000000000
--- a/test/libsolidity/syntaxTests/events/events_with_same_name_unnamed_arguments.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    event A(uint);
-    event A(uint, uint);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/file_level_event.sol b/test/libsolidity/syntaxTests/events/file_level_event.sol
deleted file mode 100644
index 33d4378fdca7..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-event E1();
-event E2(uint);
-event E3(uint, string indexed, bytes, bool);
-event E4(int, int, int) anonymous;
-
-function f() {
-    emit E1();
-    emit E2(1);
-    emit E3(1, "abc", "abc", true);
-    emit E4(1, 2, 3);
-}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol b/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol
deleted file mode 100644
index 30d3594eaf4f..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-event E();
-event E();
-// ----
-// DeclarationError 5883: (0-10): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol b/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol
deleted file mode 100644
index 0cd9c8c2aab9..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: A.sol ====
-event E();
-==== Source: B.sol ====
-import "A.sol";
-
-event E();
-// ----
-// DeclarationError 5883: (B.sol:17-27): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_import.sol b/test/libsolidity/syntaxTests/events/file_level_event_import.sol
deleted file mode 100644
index c2591a18f276..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_import.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: A.sol ====
-event EA();
-==== Source: B.sol ====
-event EB();
-==== Source: C.sol ====
-import "A.sol";
-import {EB} from "B.sol";
-
-function f() {
-    emit EA();
-    emit EB();
-}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_overloading.sol b/test/libsolidity/syntaxTests/events/file_level_event_overloading.sol
deleted file mode 100644
index 1f4ac33823f7..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_overloading.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-event E();
-event E(uint);
-event E(uint, string indexed, bytes, bool);
-event E(int, int, int) anonymous;
-
-function f() {
-    emit E();
-    emit E(1);
-    emit E(1, "abc", "abc", true);
-    emit E(1, 2, 3);
-}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol b/test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol
deleted file mode 100644
index f6268b286447..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-event E();
-
-contract C {
-    event E(uint);
-
-    function f() public {
-        emit E();
-        emit E(1);
-    }
-}
-// ----
-// Warning 2519: (29-43): This declaration shadows an existing declaration.
-// TypeError 6160: (84-87): Wrong argument count for function call: 0 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol
deleted file mode 100644
index 1408e543469d..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-event E();
-
-contract C {
-    event E();
-}
-
-library L {
-    event E();
-}
-
-interface I {
-    event E();
-}
-// ----
-// Warning 2519: (29-39): This declaration shadows an existing declaration.
-// Warning 2519: (59-69): This declaration shadows an existing declaration.
-// Warning 2519: (91-101): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol
deleted file mode 100644
index 1b95ac7d1e85..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-event E();
-
-contract C {
-    event E() anonymous;
-}
-
-library L {
-    event E() anonymous;
-}
-
-interface I {
-    event E() anonymous;
-}
-// ----
-// Warning 2519: (29-49): This declaration shadows an existing declaration.
-// Warning 2519: (69-89): This declaration shadows an existing declaration.
-// Warning 2519: (111-131): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol
deleted file mode 100644
index 1ebe600e5db7..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-event E();
-contract E {}
-// ----
-// DeclarationError 2333: (11-24): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol
deleted file mode 100644
index c6ba8e9c7a92..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-event E();
-error E();
-// ----
-// DeclarationError 2333: (11-21): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_using.sol b/test/libsolidity/syntaxTests/events/file_level_event_using.sol
deleted file mode 100644
index 99827d0b87b6..000000000000
--- a/test/libsolidity/syntaxTests/events/file_level_event_using.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-event E();
-
-type T is uint;
-using {E} for T;
-// ----
-// TypeError 8187: (35-36): Expected function name.
diff --git a/test/libsolidity/syntaxTests/events/function_event_in_contract_clash.sol b/test/libsolidity/syntaxTests/events/function_event_in_contract_clash.sol
deleted file mode 100644
index eba87f3b519a..000000000000
--- a/test/libsolidity/syntaxTests/events/function_event_in_contract_clash.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    event dup();
-    function dup() public returns (uint) {
-        return 1;
-    }
-}
-// ----
-// DeclarationError 2333: (34-96): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/function_event_inheritance_clash.sol b/test/libsolidity/syntaxTests/events/function_event_inheritance_clash.sol
deleted file mode 100644
index 6b08009b1a10..000000000000
--- a/test/libsolidity/syntaxTests/events/function_event_inheritance_clash.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract B {
-    event dup();
-}
-contract A {
-    function dup() public returns (uint) {
-        return 1;
-    }
-}
-contract C is B, A {
-}
-// ----
-// DeclarationError 9097: (49-111): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/illegal_names_exception.sol b/test/libsolidity/syntaxTests/events/illegal_names_exception.sol
deleted file mode 100644
index c45db8d7d123..000000000000
--- a/test/libsolidity/syntaxTests/events/illegal_names_exception.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// Exception for the illegal name list. External interface events
-contract C {
-	event this();
-	event super();
-	event _();
-}
-// ----
-// Warning 2319: (80-93): This declaration shadows a builtin symbol.
-// Warning 2319: (95-109): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol b/test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol
deleted file mode 100644
index 48b23dc38fb6..000000000000
--- a/test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// Exception for the illegal name list. External interface events
-event this();
-event super();
-event _();
diff --git a/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol b/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol
deleted file mode 100644
index 0e92a88b9b59..000000000000
--- a/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    event X();
-}
-contract B is A {
-    event X() anonymous;
-}
-// ----
-// DeclarationError 5883: (52-72): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol b/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol
deleted file mode 100644
index f68a96ea9601..000000000000
--- a/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    event X(uint);
-}
-contract B is A {
-    event X(uint indexed);
-}
-// ----
-// DeclarationError 5883: (56-78): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_adds_parameter.sol b/test/libsolidity/syntaxTests/events/inheritance_adds_parameter.sol
deleted file mode 100644
index 6da42974cc4f..000000000000
--- a/test/libsolidity/syntaxTests/events/inheritance_adds_parameter.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-    event X();
-}
-contract B is A {
-    event X(uint);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol b/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol
deleted file mode 100644
index 9c19ebb33e5c..000000000000
--- a/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    event X(uint);
-}
-contract B is A {
-    event X(uint);
-}
-// ----
-// DeclarationError 5883: (56-70): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol b/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol
deleted file mode 100644
index 3724fc10c6c4..000000000000
--- a/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    event X(uint, uint indexed);
-}
-contract B {
-    event X(uint, uint);
-}
-contract C is A, B {
-}
-// ----
-// DeclarationError 5883: (65-85): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol b/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol
deleted file mode 100644
index 6379618b1840..000000000000
--- a/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    event X(uint, uint indexed);
-}
-contract B is A {
-    event X(uint, uint);
-}
-// ----
-// DeclarationError 5883: (70-90): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/internal_type.sol b/test/libsolidity/syntaxTests/events/internal_type.sol
deleted file mode 100644
index 1e584a8ebb6e..000000000000
--- a/test/libsolidity/syntaxTests/events/internal_type.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-struct S {
-    S[] ss;
-}
-
-contract C {
-    event E1(function() internal);
-    event E2(S);
-}
-// ----
-// TypeError 3417: (52-72): Internal or recursive type is not allowed as event parameter type.
-// TypeError 3417: (87-88): Internal or recursive type is not allowed as event parameter type.
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
deleted file mode 100644
index 04ee9b7bc4b6..000000000000
--- a/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: A ====
-contract test {
-    event e1(string storage a);
-}
-==== Source: B ====
-contract test {
-    event e1(string memory a);
-}
-==== Source: C ====
-contract test {
-    event e1(string calldata a);
-}
-// ----
-// ParserError 2314: (A:36-43): Expected ',' but got 'storage'
-// ParserError 2314: (B:36-42): Expected ',' but got 'memory'
-// ParserError 2314: (C:36-44): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol
deleted file mode 100644
index f7314e6f593a..000000000000
--- a/test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    event e1(uint constant a);
-    event e2(uint immutable a);
-}
-// ----
-// DeclarationError 1788: (29-44): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 8297: (60-76): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol
deleted file mode 100644
index bcb6d4306daa..000000000000
--- a/test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-contract test {
-    event e1(uint external a);
-}
-==== Source: B ====
-contract test {
-    event e1(uint internal a);
-}
-==== Source: C ====
-contract test {
-    event e1(uint public a);
-}
-==== Source: D ====
-contract test {
-    event e1(uint private a);
-}
-// ----
-// ParserError 2314: (A:34-42): Expected ',' but got 'external'
-// ParserError 2314: (B:34-42): Expected ',' but got 'internal'
-// ParserError 2314: (C:34-40): Expected ',' but got 'public'
-// ParserError 2314: (D:34-41): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol b/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol
deleted file mode 100644
index 3fa5bc5a29e2..000000000000
--- a/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    event SetFirstElem(uint indexed elem);
-    event SetSecondElem(uint indexed elem);
-    function setVal() external  {
-        emit SetFirstElem(0);
-    }
-    function setValX() external  {
-        // There was a missing error for this case.
-        // Whenever there was a proper invocation of events,
-        // the compiler assumed that all the subsequent invocations
-        // were proper.
-        SetFirstElem(1);
-    }
-}
-// ----
-// TypeError 3132: (421-436): Event invocations have to be prefixed by "emit".
diff --git a/test/libsolidity/syntaxTests/events/multiple_events_argument_clash.sol b/test/libsolidity/syntaxTests/events/multiple_events_argument_clash.sol
deleted file mode 100644
index 45dd100cf48c..000000000000
--- a/test/libsolidity/syntaxTests/events/multiple_events_argument_clash.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    event e1(uint a, uint e1, uint e2);
-    event e2(uint a, uint e1, uint e2);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/multiple_inheritance.sol b/test/libsolidity/syntaxTests/events/multiple_inheritance.sol
deleted file mode 100644
index 7ef11bbe7a4a..000000000000
--- a/test/libsolidity/syntaxTests/events/multiple_inheritance.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { event X(uint); }
-contract B is A {}
-contract C is A {}
-contract D is B, C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/events/overloading_in_contract.sol b/test/libsolidity/syntaxTests/events/overloading_in_contract.sol
deleted file mode 100644
index a84e1064cabb..000000000000
--- a/test/libsolidity/syntaxTests/events/overloading_in_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    event X();
-    event X(uint);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
deleted file mode 100644
index f8799de42b65..000000000000
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma experimental solidity;
-
-import std.stub;
-// ====
-// EVMVersion: >=constantinople
-// compileViaYul: true
-// ----
-// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
deleted file mode 100644
index f5bcf8efcdf5..000000000000
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma experimental solidity;
-
-import std.stub as stub;
-// ====
-// EVMVersion: >=constantinople
-// compileViaYul: true
-// ----
-// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
deleted file mode 100644
index 4b325ea4edf1..000000000000
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma experimental solidity;
-
-import { identity } from std.stub;
-// ====
-// EVMVersion: >=constantinople
-// compileViaYul: true
-// ----
-// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
deleted file mode 100644
index 865e59b554f4..000000000000
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma experimental solidity;
-
-import * as stub from std.stub;
-// ====
-// EVMVersion: >=constantinople
-// compileViaYul: true
-// ----
-// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol
deleted file mode 100644
index 0106846f98e2..000000000000
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import std.stub;
-// ----
-// ParserError 9478: (7-10): Expected string literal (path), "*" or alias list.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol
deleted file mode 100644
index 3a6c1848bab9..000000000000
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import { identity } from std.stub;
-// ----
-// ParserError 6845: (25-28): Expected import path.
diff --git a/test/libsolidity/syntaxTests/fallback/arguments.sol b/test/libsolidity/syntaxTests/fallback/arguments.sol
deleted file mode 100644
index c796161d2a4f..000000000000
--- a/test/libsolidity/syntaxTests/fallback/arguments.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback(uint256) external {}
-}
-// ----
-// TypeError 5570: (44-44): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/default_visibility.sol b/test/libsolidity/syntaxTests/fallback/default_visibility.sol
deleted file mode 100644
index ee3fa6f6f38c..000000000000
--- a/test/libsolidity/syntaxTests/fallback/default_visibility.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    // Check that visibility is also enforced for the fallback function.
-    fallback() {}
-}
-// ----
-// SyntaxError 4937: (90-103): No visibility specified. Did you intend to add "external"?
-// TypeError 1159: (90-103): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol b/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol
deleted file mode 100644
index cb31d46d79e1..000000000000
--- a/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function fallback() external pure {}
-}
-// ----
-// Warning 3445: (26-34): This function is named "fallback" but is not the fallback function of the contract. If you intend this to be a fallback function, use "fallback(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol
deleted file mode 100644
index 625c17f98430..000000000000
--- a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    fallback(bytes calldata _input) external returns (bytes memory _output) {}
-    fallback() external {}
-}
-// ----
-// DeclarationError 7301: (96-118): Only one fallback function is allowed.
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol
deleted file mode 100644
index 818006a11563..000000000000
--- a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    fallback(bytes calldata _input) external returns (bytes memory _output) {}
-}
-contract D is C {
-    fallback() external {}
-}
-// ----
-// TypeError 9456: (116-138): Overriding function is missing "override" specifier.
-// TypeError 4334: (17-91): Trying to override non-virtual function. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_override.sol b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_override.sol
deleted file mode 100644
index 32638c08200f..000000000000
--- a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_override.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    fallback(bytes calldata _input) external virtual returns (bytes memory _output) {}
-}
-contract D is C {
-    fallback() external override {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol b/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol
deleted file mode 100644
index 5ddefdf3d424..000000000000
--- a/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract D {
-    fallback(bytes memory) external returns (bytes memory) {}
-}
-contract E {
-    fallback(bytes memory) external returns (bytes calldata) {}
-}
-contract F {
-    fallback(bytes calldata) external returns (bytes calldata) {}
-}
-// ----
-// TypeError 5570: (57-71): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
-// TypeError 5570: (134-150): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
-// TypeError 5570: (215-231): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/inheritance_multi_base.sol b/test/libsolidity/syntaxTests/fallback/inheritance_multi_base.sol
deleted file mode 100644
index 330ff156ce8a..000000000000
--- a/test/libsolidity/syntaxTests/fallback/inheritance_multi_base.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract A {
-    fallback (bytes calldata _input) external returns (bytes memory) {
-        return _input;
-    }
-}
-contract B {
-    fallback (bytes calldata _input) external returns (bytes memory) {
-        return "xyz";
-    }
-}
-contract C is B, A {
-     function f() public returns (bool, bytes memory) {
-        (bool success, bytes memory retval) = address(this).call("abc");
-        return (success, retval);
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 6480: (229-420): Derived contract must override function "". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol b/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol
deleted file mode 100644
index 868671d2a8b3..000000000000
--- a/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    fallback() external returns (bytes memory _output) {}
-}
-contract D {
-    fallback(bytes calldata _input) external {}
-}
-// ----
-// TypeError 5570: (45-67): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
-// TypeError 5570: (131-131): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/old_syntax.sol b/test/libsolidity/syntaxTests/fallback/old_syntax.sol
deleted file mode 100644
index 31bbf00431ea..000000000000
--- a/test/libsolidity/syntaxTests/fallback/old_syntax.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function() external {}
-}
-// ----
-// ParserError 2915: (37-38): Expected a state variable declaration. If you intended this as a fallback function or a function to handle plain ether transactions, use the "fallback" keyword or the "receive" keyword instead.
diff --git a/test/libsolidity/syntaxTests/fallback/payable_fallback_with_inherited_receive.sol b/test/libsolidity/syntaxTests/fallback/payable_fallback_with_inherited_receive.sol
deleted file mode 100644
index b1bbb494ea18..000000000000
--- a/test/libsolidity/syntaxTests/fallback/payable_fallback_with_inherited_receive.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-    receive() external payable { }
-}
-contract C is A {
-    fallback() external payable { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_empty.sol b/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_empty.sol
deleted file mode 100644
index 6b95a7e65fe5..000000000000
--- a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_empty.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    fallback() external payable { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_nonempty.sol b/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_nonempty.sol
deleted file mode 100644
index f4bc549674aa..000000000000
--- a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_nonempty.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    fallback() external payable { }
-    function f() public pure { }
-}
-// ----
-// Warning 3628: (0-83): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
diff --git a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_nonempty_by_inheritance.sol b/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_nonempty_by_inheritance.sol
deleted file mode 100644
index a2e39e536bff..000000000000
--- a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_nonempty_by_inheritance.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    function f() external pure {}
-}
-contract C is A {
-    fallback() external payable { }
-}
-// ----
-// Warning 3628: (49-104): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
diff --git a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_only_internal.sol b/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_only_internal.sol
deleted file mode 100644
index 49547319204c..000000000000
--- a/test/libsolidity/syntaxTests/fallback/payable_fallback_without_receive_only_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback() external payable { }
-    function f() internal pure { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/fallback/pure_modifier.sol b/test/libsolidity/syntaxTests/fallback/pure_modifier.sol
deleted file mode 100644
index fbfb892a4d3d..000000000000
--- a/test/libsolidity/syntaxTests/fallback/pure_modifier.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    fallback() external pure { x = 2; }
-}
-// ----
-// TypeError 4575: (29-64): Fallback function must be payable or non-payable, but is "pure".
diff --git a/test/libsolidity/syntaxTests/fallback/return_value_number.sol b/test/libsolidity/syntaxTests/fallback/return_value_number.sol
deleted file mode 100644
index e5d358c73887..000000000000
--- a/test/libsolidity/syntaxTests/fallback/return_value_number.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback() external returns (bytes memory, bytes memory) {}
-}
-// ----
-// TypeError 5570: (45-73): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/return_value_type.sol b/test/libsolidity/syntaxTests/fallback/return_value_type.sol
deleted file mode 100644
index 01363ebe4589..000000000000
--- a/test/libsolidity/syntaxTests/fallback/return_value_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback() external returns (uint256) {}
-}
-// ----
-// TypeError 5570: (45-54): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol b/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol
deleted file mode 100644
index 88f181f3fd20..000000000000
--- a/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback() external returns (bytes memory) {}
-}
-// ----
-// TypeError 5570: (45-59): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/returns.sol b/test/libsolidity/syntaxTests/fallback/returns.sol
deleted file mode 100644
index a4d45c522278..000000000000
--- a/test/libsolidity/syntaxTests/fallback/returns.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    fallback(bytes calldata _input) external returns (bytes memory _output) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/fallback/view_modifier.sol b/test/libsolidity/syntaxTests/fallback/view_modifier.sol
deleted file mode 100644
index f2e2febf546f..000000000000
--- a/test/libsolidity/syntaxTests/fallback/view_modifier.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    fallback() external view { x = 2; }
-}
-// ----
-// TypeError 4575: (29-64): Fallback function must be payable or non-payable, but is "view".
diff --git a/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol b/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol
deleted file mode 100644
index a76cbf28fe92..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// Checks that error is triggered no matter which order
-function l() {
-    s();
-}
-function s() {
-	new C();
-}
-contract D {
-	function f() public {
-		l();
-	}
-}
-contract C {
-	constructor() { new D(); }
-}
-// ----
-// TypeError 7813: (98-103): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (187-192): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol b/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol
deleted file mode 100644
index 62879fe028a6..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-// Checks that error is triggered no matter which order
-contract D {
-    function f() public {
-        l();
-    }
-}
-contract C {
-    constructor() { new D(); }
-}
-function l() {
-    s();
-}
-function s() {
-    new C();
-}
-// ----
-// TypeError 7813: (207-212): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (149-154): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol b/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol
deleted file mode 100644
index 749a98d48c11..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {}
-}
-function fun() {
-    C.f();
-}
-// ----
-// TypeError 3419: (68-73): Cannot call function via contract type name.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol b/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
deleted file mode 100644
index 7878983571ed..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-constructor() {}
-// ----
-// ParserError 7858: (0-11): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_different_integer_types.sol b/test/libsolidity/syntaxTests/freeFunctions/free_different_integer_types.sol
deleted file mode 100644
index eb584f58d2fe..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_different_integer_types.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f(uint24) {}
-function f(uint16) {}
-function f(int24) {}
-function f(bool) {}
-// ----
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol b/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
deleted file mode 100644
index 897ed5964752..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-fallback(){}
-// ----
-// ParserError 7858: (0-8): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol
deleted file mode 100644
index cfe5c3ffc6a9..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function fun() someModifier {
-}
-// ----
-// DeclarationError 7920: (15-27): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol
deleted file mode 100644
index bde560ccb5cb..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function g() pure returns (uint) { return 1; }
-function g() pure returns (string memory) { return "1"; }
-contract C {
-  function foo() public pure returns (uint) {
-    string memory s = g();
-    return 100/g();
-  }
-}
-// ----
-// DeclarationError 1686: (0-46): Function with same name and parameter types defined twice.
-// TypeError 9574: (168-189): Type uint256 is not implicitly convertible to expected type string memory.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_qualified_modifier.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_qualified_modifier.sol
deleted file mode 100644
index 7d45986b668e..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_qualified_modifier.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  modifier someModifier() { _; }
-}
-
-function fun() C.someModifier {
-
-}
-// ----
-// SyntaxError 5811: (49-83): Free functions cannot have modifiers.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol
deleted file mode 100644
index bd1b2bd875d7..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-function f() {}
-contract C {
-  function f() public {}
-  function g() public {
-    f();
-  }
-}
-// ----
-// Warning 2519: (31-53): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol
deleted file mode 100644
index 36a0e0e0c0fb..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function fun1() public { }
-function fun2() internal { }
-// ----
-// SyntaxError 4126: (0-26): Free functions cannot have visibility.
-// SyntaxError 4126: (27-55): Free functions cannot have visibility.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol
deleted file mode 100644
index 2fec9db1d07b..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-function f();
-// ----
-// TypeError 4668: (0-13): Free functions must be implemented.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_functions.sol b/test/libsolidity/syntaxTests/freeFunctions/free_functions.sol
deleted file mode 100644
index 4862e8e63bba..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_functions.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function fun(uint256, uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[] calldata) {
-	return (_y[0], _x);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_identical.sol b/test/libsolidity/syntaxTests/freeFunctions/free_identical.sol
deleted file mode 100644
index 58d5a5b5bf98..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_identical.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function f() pure returns (uint) { return 1337; }
-function f() pure returns (uint) { return 42; }
-// ----
-// DeclarationError 1686: (0-49): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_identical_multiple.sol b/test/libsolidity/syntaxTests/freeFunctions/free_identical_multiple.sol
deleted file mode 100644
index 2eb8b6b4b40f..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_identical_multiple.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure returns (uint) { return 1337; }
-function f() pure returns (uint) { return 42; }
-function f() pure returns (uint) { return 1; }
-// ----
-// DeclarationError 1686: (0-49): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol b/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
deleted file mode 100644
index 9279ff1ebc13..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function f() {
-    uint x = 2;
-    x;
-}
-function g(uint[] storage x) pure { x[0] = 1; }
-// ----
-// Warning 2018: (0-39): Function state mutability can be restricted to pure
-// TypeError 8961: (76-80): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_namesake_contract_function.sol b/test/libsolidity/syntaxTests/freeFunctions/free_namesake_contract_function.sol
deleted file mode 100644
index 4212154cc4fe..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_namesake_contract_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function f() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
-// Warning 2519: (65-126): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol b/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol
deleted file mode 100644
index 440b9449f35f..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-function f(uint) returns (bytes memory) {}
-function f(uint[] memory x) returns (bytes memory) { return f(x[0]); }
-function g(uint8) {}
-function g(uint16) {}
-function t() {
-    g(2);
-}
-// ----
-// TypeError 4487: (176-177): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_override.sol b/test/libsolidity/syntaxTests/freeFunctions/free_override.sol
deleted file mode 100644
index da54a2fa62cf..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_override.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function fun() override {
-}
-// ----
-// SyntaxError 1750: (0-27): Free functions cannot override.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol b/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol
deleted file mode 100644
index 563c118f0d33..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function fun() payable {
-}
-// ----
-// TypeError 9559: (0-26): Free functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol b/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
deleted file mode 100644
index 83dfee446347..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-receive() {}
-// ----
-// ParserError 7858: (0-7): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_redefinition.sol b/test/libsolidity/syntaxTests/freeFunctions/free_redefinition.sol
deleted file mode 100644
index 91c53aff12de..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_redefinition.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-function f() pure returns (uint) { return 1337; }
-function f() view returns (uint) { return 42; }
-contract C {
-  function g() public pure virtual returns (uint) {
-    return f();
-  }
-}
-// ----
-// DeclarationError 1686: (0-49): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_storage.sol b/test/libsolidity/syntaxTests/freeFunctions/free_storage.sol
deleted file mode 100644
index 7d356a9a7dcd..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_storage.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-struct S { uint x; }
-function fun(S storage) {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol b/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol
deleted file mode 100644
index a4261be1fb1b..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function fun() virtual {
-}
-// ----
-// SyntaxError 4493: (0-26): Free functions cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol b/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol
deleted file mode 100644
index 3b16749ae92d..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {}
-function C() {}
-// ----
-// DeclarationError 2333: (14-29): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol b/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol
deleted file mode 100644
index b029c0d90dde..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    struct S { uint x; }
-}
-function f() returns (uint) { S storage t; }
-// ----
-// DeclarationError 7920: (70-71): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol b/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol
deleted file mode 100644
index 7e2dafe8a2c0..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-function fun() {
-    fun{gas: 1}();
-    fun{value: 1}();
-}
-// ----
-// TypeError 2193: (21-32): Function call options can only be set on external function calls or contract creations.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol b/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol
deleted file mode 100644
index aed22b225b61..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-function this() {}
-function super() {}
-function _() {}
-
-contract C {
-	function test() public {
-		this();
-		super();
-		_();
-	}
-}
-// ----
-// DeclarationError 3726: (0-18): The name "this" is reserved.
-// DeclarationError 3726: (19-38): The name "super" is reserved.
-// DeclarationError 3726: (39-54): The name "_" is reserved.
-// Warning 2319: (0-18): This declaration shadows a builtin symbol.
-// Warning 2319: (19-38): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol b/test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol
deleted file mode 100644
index 889d7df2123d..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function unicode() returns {}
-
-// ----
-// ParserError 2314: (9-16): Expected identifier but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol b/test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol
deleted file mode 100644
index 8f0c0ea3fce6..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-function fallback() {}
-// ----
-// Warning 3445: (9-17): This function is named "fallback" but is not the fallback function of the contract. If you intend this to be a fallback function, use "fallback(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol b/test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol
deleted file mode 100644
index 25c860241665..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-function receive() {}
-// ----
-// Warning 3445: (9-16): This function is named "receive" but is not the receive function of the contract. If you intend this to be a receive function, use "receive(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol b/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol
deleted file mode 100644
index 2d9a3011b655..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function f() returns (uint) { C.S storage t; t.x; }
-
-contract C {
-    struct S { uint x; }
-}
-// ----
-// Warning 6321: (22-26): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// TypeError 3464: (45-46): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/struct_after_function.sol b/test/libsolidity/syntaxTests/freeFunctions/struct_after_function.sol
deleted file mode 100644
index c41693e97fca..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/struct_after_function.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-function f(S storage g) view returns (uint) { S storage t = g; return t.x; }
-struct S { uint x; }
-// ----
diff --git a/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol b/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol
deleted file mode 100644
index ff6061c65f8e..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {}
-function f() {
-    super;
-}
-// ----
-// DeclarationError 7576: (33-38): Undeclared identifier. "super" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol b/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol
deleted file mode 100644
index cdea708d45d2..000000000000
--- a/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {}
-function f() {
-    this;
-}
-// ----
-// DeclarationError 7576: (33-37): Undeclared identifier. "this" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol b/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol
deleted file mode 100644
index 5d900e04e31d..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.encodeWithSelector();
-        abi.encodeWithSignature();
-        abi.encodeWithSelector(uint(2), 2);
-        abi.encodeWithSignature(uint(2), 2);
-    }
-}
-// ----
-// TypeError 9308: (52-76): Need at least 1 arguments for function call, but provided only 0.
-// TypeError 9308: (86-111): Need at least 1 arguments for function call, but provided only 0.
-// TypeError 9553: (144-151): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes4 requested.
-// TypeError 9553: (189-196): Invalid type for argument in function call. Invalid implicit conversion from uint256 to string memory requested.
diff --git a/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base.sol b/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base.sol
deleted file mode 100644
index afd4d27acca3..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract contract I
-{
-    function a() internal view virtual returns(uint256);
-}
-abstract contract V is I
-{
-    function b() public view returns(uint256) { return a(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol b/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol
deleted file mode 100644
index 4b7d45624268..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-abstract contract I {
-    function a() internal view virtual returns(uint256);
-}
-
-abstract contract C is I {
-    function f() public view returns(uint256) {
-        return I.a();
-    }
-}
-
-abstract contract D is I {
-    function f() public view returns(uint256) {
-        return super.a();
-    }
-}
-// ----
-// TypeError 7501: (172-177): Cannot call unimplemented base function.
-// TypeError 9582: (278-285): Member "a" not found or not visible after argument-dependent lookup in type(contract super D).
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
deleted file mode 100644
index 729dba77860b..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	struct S {
-		function() a;
-	}
-	function f(S calldata) public {}
-}
-// ----
-// TypeError 4103: (56-66): Internal type is not allowed for public or external functions.
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
deleted file mode 100644
index f618934e3ddf..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	struct S {
-		function() a;
-	}
-	function f(S[2] calldata) public {}
-}
-// ----
-// TypeError 4103: (56-69): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
deleted file mode 100644
index 796b0fc586b5..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	struct S {
-		function() a;
-	}
-	constructor (S[2] storage) public {}
-}
-// ----
-// TypeError 3644: (58-70): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol
deleted file mode 100644
index 3b162a7f220a..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract D {}
-contract C {
-    function foo(int a) payable external {
-        this.foo{gas:2, gas: 5};
-        this.foo{value:2, value: 5};
-        this.foo{gas:2, value: 5, gas:2, value:3};
-        new D{salt:"abc", salt:"efg"}();
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// TypeError 9886: (78-101): Duplicate option "gas".
-// TypeError 9886: (111-138): Duplicate option "value".
-// TypeError 9886: (148-189): Duplicate option "gas".
-// TypeError 9886: (148-189): Duplicate option "value".
-// TypeError 9886: (199-228): Duplicate option "salt".
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_delegatecall.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_delegatecall.sol
deleted file mode 100644
index d719fdcd9bb7..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_delegatecall.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function foo() pure internal {
-        address(10).delegatecall{value: 7, gas: 3}("");
-    }
-}
-// ----
-// TypeError 6189: (56-98): Cannot set option "value" for delegatecall.
-// Warning 9302: (56-102): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol
deleted file mode 100644
index af5706de3915..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract D {}
-contract C {
-    function foo(int a) pure internal {
-        foo{gas: 5};
-    }
-}
-// ----
-// TypeError 2193: (75-86): Function call options can only be set on external function calls or contract creations.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol
deleted file mode 100644
index e128f03f1f21..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function foo() pure internal {
-        address(10).staticcall{value: 7, gas: 3}("");
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 2842: (56-96): Cannot set option "value" for staticcall.
-// Warning 9302: (56-100): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
deleted file mode 100644
index 4356efcf95d5..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract D {}
-contract C {
-    function foo(int a) payable external {
-        this.foo{value:2, gas: 5}{gas:2};
-        (this.foo{value:2, gas: 5}){gas:2};
-        this.foo{value:2, gas: 5}{value:6};
-        this.foo{gas:2, value: 5}{value:2, gas:5};
-        new D{salt:"abc"}{salt:"a"}();
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// TypeError 1645: (78-110): Function call options have already been set, you have to combine them into a single {...}-option.
-// TypeError 1645: (120-154): Function call options have already been set, you have to combine them into a single {...}-option.
-// TypeError 1645: (164-198): Function call options have already been set, you have to combine them into a single {...}-option.
-// TypeError 1645: (208-249): Function call options have already been set, you have to combine them into a single {...}-option.
-// TypeError 1645: (259-286): Function call options have already been set, you have to combine them into a single {...}-option.
diff --git a/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
deleted file mode 100644
index f2d7cd1b2b40..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-enum E { A, B, C }
-
-contract C {
-    uint a = E.B(1000);
-}
-// ----
-// TypeError 5704: (46-55): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
deleted file mode 100644
index e1ddbc7db764..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-    function f ( ) public {
-        ( ( 1 ( 3 ) ) , 2 );
-    }
-}
-// ----
-// TypeError 5704: (53-60): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol
deleted file mode 100644
index 1219bcc896fa..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract D {}
-contract C {
-    function foo(int a) pure internal {
-		  a{val:5};
-    }
-}
-// ----
-// TypeError 2622: (71-79): Expected callable expression before call options.
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol
deleted file mode 100644
index a4786f9d4216..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract D {}
-contract C {
-    function foo(int a) pure external {
-      this.foo{random:5+5};
-    }
-}
-// ----
-// TypeError 9318: (73-93): Unknown call option "random". Valid options are "salt", "value" and "gas".
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions3.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions3.sol
deleted file mode 100644
index a7b236fa5cf7..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {}
-contract C {
-  function foo(int a) external {
-    this.foo{slt:5, value:3, salt: 8};
-  }
-}
-// ----
-// TypeError 9318: (64-97): Unknown call option "slt". Valid options are "salt", "value" and "gas".
-// TypeError 7006: (64-97): Cannot set option "value" on a non-payable function type.
-// TypeError 2721: (64-97): Function call option "salt" can only be used with "new".
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol
deleted file mode 100644
index 0893c0ea6b8c..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function g(int x, int y) public pure returns (int) { return x - y; }
-    function h(int y, int x) public pure returns (int) { return y - x; }
-
-    function f() public pure {
-        (true ? g : h)({x : 1, y : 2});
-        [g, h][1]({x : 1, y : 2});
-    }
-}
-// ----
-// TypeError 4974: (199-229): Named argument "x" does not match function declaration.
-// TypeError 4974: (199-229): Named argument "y" does not match function declaration.
-// TypeError 4974: (239-264): Named argument "x" does not match function declaration.
-// TypeError 4974: (239-264): Named argument "y" does not match function declaration.
diff --git a/test/libsolidity/syntaxTests/functionCalls/lowlevel_call_options.sol b/test/libsolidity/syntaxTests/functionCalls/lowlevel_call_options.sol
deleted file mode 100644
index da5c17a20ac0..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/lowlevel_call_options.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function foo() internal {
-        (bool success, ) = address(10).call{value: 7, gas: 3}("");
-        success;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
deleted file mode 100644
index c93f0bb88b62..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint a = msg(1000);
-}
-// ----
-// TypeError 5704: (26-35): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
deleted file mode 100644
index e5258b62bea8..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    mapping (uint => uint) m;
-    uint a = m(1000);
-}
-// ----
-// TypeError 5704: (56-63): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
deleted file mode 100644
index 0f41072ec63b..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint a = m(1000);
-
-    modifier m(uint) { _; }
-}
-// ----
-// TypeError 5704: (26-33): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
deleted file mode 100644
index 1415810ae2c3..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: A.sol ====
-==== Source: B.sol ====
-import "A.sol" as A;
-
-contract C {
-    uint a = A(1000);
-}
-// ----
-// TypeError 5704: (B.sol:48-55): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol b/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol
deleted file mode 100644
index 281e748823e3..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function get() public view returns(uint256) {
-        return msg.value;
-    }
-}
-// ----
-// TypeError 5887: (78-87): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol
deleted file mode 100644
index 17ee8dc4508f..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function a(uint a, uint b) public returns (uint r) {
-        r = a + b;
-    }
-    function b() public returns (uint r) {
-        r = a({a: 1, a: 2});
-    }
-}
-// ----
-// Warning 2519: (31-37): This declaration shadows an existing declaration.
-// Warning 2519: (39-45): This declaration shadows an existing declaration.
-// TypeError 6995: (159-160): Duplicate named argument "a".
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol
deleted file mode 100644
index 0c4da5c7317d..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function a(uint a, uint b) public returns (uint r) {
-        r = a + b;
-    }
-    function b() public returns (uint r) {
-        r = a({});
-    }
-}
-// ----
-// Warning 2519: (31-37): This declaration shadows an existing declaration.
-// Warning 2519: (39-45): This declaration shadows an existing declaration.
-// TypeError 6160: (153-158): Wrong argument count for function call: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_for_functions_that_take_arbitrary_parameters.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_for_functions_that_take_arbitrary_parameters.sol
deleted file mode 100644
index 0f1c2af49475..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_for_functions_that_take_arbitrary_parameters.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.encodeWithSelector({selector:"abc"});
-    }
-}
-// ----
-// TypeError 2627: (52-92): Named arguments cannot be used for functions that take arbitrary parameters.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_in_any_order.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_in_any_order.sol
deleted file mode 100644
index 695bd5ac50f1..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_in_any_order.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint u, string memory s, bool b) internal {}
-
-    function call() public {
-        f({s: "abc", u: 1,     b: true});
-        f({s: "abc", b: true,  u: 1});
-        f({u: 1,     s: "abc", b: true});
-        f({b: true,  s: "abc", u: 1});
-        f({u: 1,     b: true,  s: "abc"});
-        f({b: true,  u: 1,     s: "abc"});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_invalid_name.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_invalid_name.sol
deleted file mode 100644
index 0c19ff416c09..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_invalid_name.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    function f(uint a, bool b, bytes memory c, uint d, bool e) public returns (uint r) {
-        if (b && !e)
-            r = a + d;
-        else
-            r = c.length;
-    }
-    function g() public returns (uint r) {
-        r = f({c: "abc", x: 1, e: 2, a: 11, b: 12});
-    }
-}
-// ----
-// TypeError 4974: (249-288): Named argument "x" does not match function declaration.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload.sol
deleted file mode 100644
index 589d22ff39ca..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint x) internal { }
-    function f(uint x, uint y) internal { }
-    function f(uint x, uint y, uint z) internal { }
-    function call() internal {
-        f({x: 1});
-        f({x: 1, y: 2});
-        f({y: 2, x: 1});
-        f({x: 1, y: 2, z: 3});
-        f({z: 3, x: 1, y: 2});
-        f({y: 2, z: 3, x: 1});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol
deleted file mode 100644
index c858e7720540..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint x) internal { }
-    function f(uint x, uint y) internal { }
-    function f(uint x, uint y, uint z) internal { }
-    function call() internal {
-        f(1, 2);
-        f(1);
-
-        f({x: 1, y: 2});
-        f({y: 2});
-    }
-}
-// ----
-// TypeError 9322: (241-242): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol
deleted file mode 100644
index aa49def1f289..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f(uint x) internal { }
-    function f(uint x, uint y) internal { }
-    function f(uint x, uint y, uint z) internal { }
-    function call() internal {
-
-        f({x:1, y: 2});
-        f({x:1, z: 3});
-    }
-}
-// ----
-// TypeError 9322: (209-210): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol
deleted file mode 100644
index fd9069eaec76..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint x) internal { }
-    function f(uint x, uint y) internal { }
-    function f(uint x, uint y, uint z) internal { }
-    function call() internal {
-        f({x:1, y: 2, z: 3});
-        f({y:2, v: 10, z: 3});
-    }
-}
-// ----
-// TypeError 9322: (214-215): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol
deleted file mode 100644
index 85acad30615b..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(uint x, string memory y, bool z) internal {}
-    function f(string memory y, uint x, bool z) internal {}
-    function f(bool z, string memory y, uint x) internal {}
-
-    function call() internal {
-        f({x: 1, y: "abc", z: true});
-    }
-}
-// ----
-// TypeError 4487: (233-234): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol
deleted file mode 100644
index 4e44c54e1f51..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint x, string memory y) internal {}
-    function f(bytes memory y, int x) internal {}
-
-    function call() internal {
-        f({x: 1, y: "abc"});
-    }
-}
-// ----
-// TypeError 4487: (155-156): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol
deleted file mode 100644
index fc2b413abbb1..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint x, string memory y, bool z) internal {}
-    function f(uint x, uint y, uint z) internal {}
-
-    function call() internal {
-        f({y: 1, x: "abc", z: true});
-    }
-}
-// ----
-// TypeError 9322: (164-165): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol
deleted file mode 100644
index 951de8678e4d..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint x, string memory y, bool z) internal {}
-    function f(uint x, uint y, uint z) internal {}
-
-    function call() internal {
-        f({a: 1, b: "abc", c: true});
-    }
-}
-// ----
-// TypeError 9322: (164-165): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_in_any_order.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_in_any_order.sol
deleted file mode 100644
index e6ba976d0298..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_in_any_order.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(uint u, string memory s, bool b) internal {}
-    function f(uint u, uint s, uint b) internal {}
-
-    function call() public {
-        f({s: "abc", u: 1,     b: true});
-        f({s: "abc", b: true,  u: 1});
-        f({u: 1,     s: "abc", b: true});
-        f({b: true,  s: "abc", u: 1});
-        f({u: 1,     b: true,  s: "abc"});
-        f({b: true,  u: 1,     s: "abc"});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol
deleted file mode 100644
index 5acc2b44437c..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function a(uint a, uint b) public returns (uint r) {
-        r = a + b;
-    }
-    function b() public returns (uint r) {
-        r = a({a: 1});
-    }
-}
-// ----
-// Warning 2519: (31-37): This declaration shadows an existing declaration.
-// Warning 2519: (39-45): This declaration shadows an existing declaration.
-// TypeError 6160: (153-162): Wrong argument count for function call: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_library.sol b/test/libsolidity/syntaxTests/functionCalls/new_library.sol
deleted file mode 100644
index da410f73b361..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/new_library.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L {}
-contract C {
-  function f() public pure {
-    new L();
-  }
-}
-// ----
-// TypeError 1130: (63-64): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions.sol b/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions.sol
deleted file mode 100644
index 173bfc5452d8..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract D { constructor() payable {} }
-contract C {
-    function foo() pure internal {
-		new D{salt:"abc", value:3};
-		new D{salt:"abc"};
-		new D{value:5+5};
-		new D{salt:"aabbcc"};
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions_unsupported.sol b/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions_unsupported.sol
deleted file mode 100644
index 89ec2b110b1f..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions_unsupported.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract D { constructor() payable {} }
-contract C {
-    function foo() pure internal {
-		new D{salt:"abc", value:3};
-		new D{salt:"abc"};
-		new D{value:5+5};
-		new D{salt:"aabbcc"};
-    }
-}
-// ====
-// EVMVersion: <constantinople
-// ----
-// TypeError 5189: (90-116): Unsupported call option "salt" (requires Constantinople-compatible VMs).
-// TypeError 5189: (120-137): Unsupported call option "salt" (requires Constantinople-compatible VMs).
-// TypeError 5189: (161-181): Unsupported call option "salt" (requires Constantinople-compatible VMs).
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol b/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
deleted file mode 100644
index 0455d4d7730d..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract D {}
-contract C {
-    function foo() pure internal {
-		new D{salt:"abc", value:3, gas: 4};
-		new D{slt:5, value:3};
-		new D{val:5};
-		new D{salt:"xyz", salt:"aaf"};
-		new D{value:3, value:4};
-		new D{random:5+5};
-		new D{what:2130+5};
-		new D{gas: 2};
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// TypeError 7006: (64-98): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 9903: (64-98): Function call option "gas" cannot be used with "new".
-// TypeError 9318: (102-123): Unknown call option "slt". Valid options are "salt", "value" and "gas".
-// TypeError 7006: (102-123): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 9318: (127-139): Unknown call option "val". Valid options are "salt", "value" and "gas".
-// TypeError 9886: (143-172): Duplicate option "salt".
-// TypeError 7006: (176-199): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 7006: (176-199): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 9318: (203-220): Unknown call option "random". Valid options are "salt", "value" and "gas".
-// TypeError 9318: (224-242): Unknown call option "what". Valid options are "salt", "value" and "gas".
-// TypeError 9903: (246-259): Function call option "gas" cannot be used with "new".
diff --git a/test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol b/test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol
deleted file mode 100644
index dc5797c912b4..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public {
-        (bool success, ) = address(10).staticcall{gas: 3}("");
-        success;
-    }
-}
-// ====
-// EVMVersion: <byzantium
-// ----
-// TypeError 5052: (66-100): "staticcall" is not supported by the VM version.
diff --git a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
deleted file mode 100644
index 8de5683bc808..000000000000
--- a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this() {
-        } catch Error(string memory) {
-        }
-    }
-}
-// ----
-// TypeError 5704: (72-78): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol b/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol
deleted file mode 100644
index fd60adce469c..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-library L {
-    function foo(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a + b;
-    }
-}
-contract C {
-    using L for uint256;
-
-    function bar() public {
-        uint256 x;
-        function (uint256, uint256) internal pure returns (uint256) ptr = x.foo;
-    }
-}
-// ----
-// TypeError 9574: (209-280): Type function (uint256,uint256) pure returns (uint256) is not implicitly convertible to expected type function (uint256,uint256) pure returns (uint256). Attached functions cannot be converted into unattached functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol b/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol
deleted file mode 100644
index 277880b9775c..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-contract C {
-    using D for D.s;
-    D.s x;
-    function f(uint a) public returns (uint) {
-        function (D.s storage, uint) returns (uint) g = x.mul;
-        g(x, a);
-        g(a);
-    }
-}
-// ----
-// TypeError 9574: (218-271): Type function (struct D.s storage pointer,uint256) returns (uint256) is not implicitly convertible to expected type function (struct D.s storage pointer,uint256) returns (uint256). Attached functions cannot be converted into unattached functions.
-// TypeError 6160: (298-302): Wrong argument count for function call: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol b/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol
deleted file mode 100644
index 32cc005dfecb..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public {
-     function (uint) view returns (bytes32) _blockhash = blockhash;
-  }
-}
-// ----
-// TypeError 9574: (42-103): Type function (uint256) view returns (bytes32) is not implicitly convertible to expected type function (uint256) view returns (bytes32). Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol b/test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol
deleted file mode 100644
index 6b926e2ddecb..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function (uint) external returns (uint) x;
-    function f() public {
-        x{gas: 2}(1);
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol
deleted file mode 100644
index 28d06d1b3e43..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L {
-    function value(function()internal a, uint256 b) internal {}
-}
-contract C {
-    using L for function()internal;
-    function f() public {
-        function()internal x;
-        x.value(42);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol
deleted file mode 100644
index 13a5e8ee7123..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  // Tests that we don't get a wrong error about constructors
-  function f() public view returns (C) { return this; }
-  function g() public { this.f.value(); }
-}
-// ----
-// TypeError 8820: (155-167): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
deleted file mode 100644
index ea88bac312a5..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function (uint) external returns (uint) x;
-    function f() public {
-        x{value: 2}(1);
-    }
-}
-// ----
-// TypeError 7006: (94-105): Cannot set option "value" on a non-payable function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol
deleted file mode 100644
index 847a601252d9..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function (uint) external payable returns (uint) x;
-    function f() public {
-        x{value: 2}(1);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
deleted file mode 100644
index 6e32f5f229c3..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function (uint) external returns (uint) x;
-    function g() public {
-        x{value: 2}(1);
-    }
-}
-// ----
-// TypeError 7006: (94-105): Cannot set option "value" on a non-payable function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol
deleted file mode 100644
index 026f0343becb..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (bool ret) {
-        return f == f;
-    }
-    function g() public returns (bool ret) {
-        return f != f;
-    }
-}
-// ----
-// Warning 2018: (17-86): Function state mutability can be restricted to pure
-// Warning 2018: (91-160): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
deleted file mode 100644
index b88c257aef79..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bool ret) {
-        return this.f > this.f;
-    }
-}
-// ----
-// TypeError 2271: (73-88): Built-in binary operator > cannot be applied to types function () external returns (bool) and function () external returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
deleted file mode 100644
index 000aea879d22..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bool ret) {
-        return f > f;
-    }
-}
-// ----
-// TypeError 2271: (73-78): Built-in binary operator > cannot be applied to types function () returns (bool) and function () returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
deleted file mode 100644
index ea1c55d3e3c2..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bool ret) {
-        return this.f < this.f;
-    }
-}
-// ----
-// TypeError 2271: (73-88): Built-in binary operator < cannot be applied to types function () external returns (bool) and function () external returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
deleted file mode 100644
index dc973ff602d2..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (bool ret) {
-        return f < f;
-    }
-}
-// ----
-// TypeError 2271: (73-78): Built-in binary operator < cannot be applied to types function () returns (bool) and function () returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
deleted file mode 100644
index 12cbe2939bc3..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function external_test_function() external {}
-    function comparison_operator_for_external_function_with_extra_slots() external returns (bool) {
-        return (
-            (this.external_test_function{gas: 4} == this.external_test_function) &&
-            (this.external_test_function{gas: 4} == this.external_test_function{gas: 4})
-        );
-    }
-}
-// ----
-// TypeError 2271: (193-259): Built-in binary operator == cannot be applied to types function () external and function () external.
-// TypeError 2271: (277-351): Built-in binary operator == cannot be applied to types function () external and function () external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
deleted file mode 100644
index 7c0bf096063f..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function external_test_function() external {}
-    function internal_test_function() internal {}
-
-    function comparison_operator_between_internal_and_external_function_pointers() external returns (bool) {
-        function () external external_function_pointer_local = this.external_test_function;
-        function () internal internal_function_pointer_local = internal_test_function;
-
-        assert(
-            this.external_test_function == external_function_pointer_local &&
-            internal_function_pointer_local == internal_test_function
-        );
-        assert(
-            internal_function_pointer_local != external_function_pointer_local &&
-            internal_test_function != this.external_test_function
-        );
-
-        return true;
-    }
-}
-// ----
-// TypeError 2271: (606-672): Built-in binary operator != cannot be applied to types function () and function () external.
-// TypeError 2271: (688-741): Built-in binary operator != cannot be applied to types function () and function () external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
deleted file mode 100644
index 599e9286e44f..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-    function external_test_function1(uint num) external {}
-    function external_test_function2(bool val) external {}
-
-    function comparison_operator_between_internal_and_external_function_pointers() external returns (bool) {
-        function () external external_function_pointer_local1 = this.external_test_function1;
-        function () external external_function_pointer_local2 = this.external_test_function2;
-
-        assert(
-            this.external_test_function1 == external_function_pointer_local1 &&
-            this.external_test_function2 == external_function_pointer_local2
-        );
-        assert(
-            external_function_pointer_local2 != external_function_pointer_local1 &&
-            this.external_test_function2 != this.external_test_function1
-        );
-
-        return true;
-    }
-}
-// ----
-// TypeError 9574: (249-333): Type function (uint256) external is not implicitly convertible to expected type function () external.
-// TypeError 9574: (343-427): Type function (bool) external is not implicitly convertible to expected type function () external.
-// TypeError 2271: (458-522): Built-in binary operator == cannot be applied to types function (uint256) external and function () external.
-// TypeError 2271: (538-602): Built-in binary operator == cannot be applied to types function (bool) external and function () external.
-// TypeError 2271: (726-786): Built-in binary operator != cannot be applied to types function (bool) external and function (uint256) external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol b/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol
deleted file mode 100644
index 369ff7d0116c..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public view returns (address) {
-        return address(this.f);
-    }
-}
-// ----
-// TypeError 5030: (77-92): Explicit type conversion not allowed from "function () view external returns (address)" to "address". To obtain the address of the contract of the function, you can use the .address member of the function.
diff --git a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
deleted file mode 100644
index c31c49aea99b..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract D {
-	function f() external {}
-	function g() external {}
-}
-contract C {
-	function f(bool c) public pure {
-		(c ? D.f : D.g);
-	}
-}
-// ----
-// TypeError 9717: (121-124): Invalid mobile type in true expression.
-// TypeError 3703: (127-130): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol
deleted file mode 100644
index 210211b287f0..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() internal {}
-    function g() internal {}
-}
-
-contract D is C {
-    function h(bool b) public pure {
-        (b ? C.f : C.g);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol b/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol
deleted file mode 100644
index 55abe8267567..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        delete this.f;
-    }
-}
-// ----
-// TypeError 4247: (54-60): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/functionTypes/delete_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/delete_function_type.sol
deleted file mode 100644
index 2481c455ccb4..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/delete_function_type.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function(uint) external returns (uint) x;
-    function(uint) internal returns (uint) y;
-    function f() public {
-        delete x;
-        function(uint) internal returns (uint) a = y;
-        delete a;
-        delete y;
-        function() internal c = f;
-        delete c;
-        function(uint) internal returns (uint) g;
-        delete g;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol b/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol
deleted file mode 100644
index 546a0acd5fe2..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        delete f;
-    }
-}
-// ----
-// TypeError 4247: (54-55): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
deleted file mode 100644
index 1141d532df74..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function (uint) external payable returns (uint) x;
-    function f() public {
-        x.gas(2)(1);
-    }
-}
-// ----
-// TypeError 1621: (102-107): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
deleted file mode 100644
index a5e6df3431f7..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    constructor() payable {}
-}
-contract D {
-    function createC() public returns (C) {
-        C c = (new C).value(2)();
-        return c;
-    }
-}
-// ----
-// TypeError 1621: (115-128): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol
deleted file mode 100644
index 4cc674570e63..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    constructor() {}
-}
-contract D {
-    function createC() public returns (C) {
-        C c = (new C).value(2)();
-        return c;
-    }
-}
-// ----
-// TypeError 8827: (107-120): Constructor for contract C must be payable for member "value" to be available.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
deleted file mode 100644
index 44c4fd905dd7..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function (uint) external payable returns (uint) x;
-    function f() public {
-        x.value(2)(1);
-    }
-}
-// ----
-// TypeError 1621: (102-109): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_to_function_type_calldata_parameter.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_to_function_type_calldata_parameter.sol
deleted file mode 100644
index c2b2f19cfab5..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_to_function_type_calldata_parameter.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is a test that checks that the type of the `bytes` parameter is
-// correctly changed from its own type `bytes calldata` to `bytes memory`
-// when converting to a function type.
-contract C {
-    function f(function(bytes memory) pure external /*g*/) pure public { }
-    function callback(bytes calldata) pure external {}
-    function g() view public {
-        f(this.callback);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_public_variable.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_public_variable.sol
deleted file mode 100644
index 0a6d1e534d82..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_public_variable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function (uint) external public x;
-
-    function g(uint) public {
-        x = this.g;
-    }
-    function f() public view returns (function(uint) external) {
-        return this.x();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol
deleted file mode 100644
index 5a4d446139d0..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function() external returns (function () internal) x;
-}
-// ----
-// TypeError 2582: (46-67): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol
deleted file mode 100644
index 33248a62c02f..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function(function () internal) external x;
-}
-// ----
-// TypeError 2582: (26-47): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address.sol
deleted file mode 100644
index 44b1f6a6df7a..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public view returns (address) {
-        return this.f.address;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol
deleted file mode 100644
index 2fa634fced38..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public view returns (address payable) {
-        return this.f.address;
-    }
-}
-// ----
-// TypeError 6359: (85-99): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol
deleted file mode 100644
index 083388e6ab88..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return uint(this.f);
-    }
-}
-// ----
-// TypeError 9640: (69-81): Explicit type conversion not allowed from "function () external returns (uint256)" to "uint256".
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
deleted file mode 100644
index b5bacb69b8bf..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f(function (string calldata) external) external {}
-    function g(string calldata) external {}
-
-    function main() external {
-        function (string calldata) external ptr = this.g;
-        abi.encodeCall(this.f, (this.g));
-        this.f(this.g);
-    }
-}
-// ----
-// TypeError 9574: (161-209): Type function (string memory) external is not implicitly convertible to expected type function (string calldata) external.
-// TypeError 5407: (242-250): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
-// TypeError 9553: (268-274): Invalid type for argument in function call. Invalid implicit conversion from function (string memory) external to function (string calldata) external requested.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
deleted file mode 100644
index 8aab9fd18dfe..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function g(string calldata) external {}
-
-    function main() view external {
-        function (string memory) external ptr = this.g;
-        ptr;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
deleted file mode 100644
index 8593bdbf4fed..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f (address) external returns (bool) {
-        this.f{gas: 42}.address;
-    }
-}
-// ----
-// Warning 6321: (56-60): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2018: (17-102): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
deleted file mode 100644
index c9c87a2cccb9..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    function f(uint256 _a) external returns (uint256) {}
-}
-
-contract C {
-    function run(function(uint256) external returns (uint256) _operation) internal returns (uint256) {}
-    function test() public {
-        run(L.f);
-        function(uint256) external returns (uint256) _operation = L.f;
-    }
-}
-// ----
-// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) external returns (uint256) requested. Special functions cannot be converted to function types.
-// TypeError 9574: (244-305): Type function (uint256) returns (uint256) is not implicitly convertible to expected type function (uint256) external returns (uint256). Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol b/test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol
deleted file mode 100644
index 62ad8aa93d6c..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure returns (uint x) {
-        x = (true ? addmod : addmod)(3, 4, 5);
-    }
-}
-// ----
-// TypeError 9717: (81-87): Invalid mobile type in true expression.
-// TypeError 3703: (90-96): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_parameter_allowed_conversions.sol b/test/libsolidity/syntaxTests/functionTypes/function_parameter_allowed_conversions.sol
deleted file mode 100644
index 9c11ea25c777..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_parameter_allowed_conversions.sol
+++ /dev/null
@@ -1,83 +0,0 @@
-contract D {
-    constructor(function() external returns (uint)) {
-    }
-}
-
-contract E {
-    function test(function() external returns(uint) f) public returns (uint) {
-        return f();
-    }
-}
-
-library L {
-    function test(function() external returns(uint) f) public returns (uint) {
-        return f();
-    }
-}
-
-contract C {
-    uint x;
-    // tests for usage as constructor parameter
-    function f() public {
-        // An assert used to fail in ABIFunction.cpp that the function types are not exactly equal
-        // that is pure or view v/s default even though they could be converted.
-        new D(this.testPure);
-        new D(this.testView);
-        new D(this.testDefault);
-    }
-
-    // tests for usage as contract function parameter
-    function g() public {
-        E e = E(address(0));
-
-        e.test(this.testPure);
-        e.test(this.testView);
-        e.test(this.testDefault);
-    }
-
-    // tests for usage as library function parameter
-    function h() public {
-        L.test(this.testPure);
-        L.test(this.testView);
-        L.test(this.testDefault);
-    }
-
-    // tests for usage as return parameter
-    function i() public view returns (function() external returns(uint)) {
-        uint value = block.number % 3;
-
-        if (value == 0) {
-            return this.testPure;
-        }
-        else if (value == 1) {
-            return this.testView;
-        }
-        else {
-            return this.testDefault;
-        }
-    }
-
-    modifier mod(function() external returns(uint) fun) {
-        if (fun() == 0) {
-            _;
-        }
-    }
-
-    // tests for usage as modifier parameter
-    function j(function() external pure returns(uint) fun) mod(fun) public {
-    }
-
-    function testPure() public pure returns (uint) {
-        return 0;
-    }
-
-    function testView() public view returns (uint) {
-        return x;
-    }
-
-    function testDefault() public returns (uint) {
-        x = 5;
-        return x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type.sol b/test/libsolidity/syntaxTests/functionTypes/function_type.sol
deleted file mode 100644
index 0f73d6dd23a6..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        function(uint) returns (uint) x;
-        x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_arrays.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_arrays.sol
deleted file mode 100644
index e0beeaba64d8..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_arrays.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function(uint) external returns (uint)[] public x;
-    function(uint) internal returns (uint)[10] y;
-    function f() view public {
-        function(uint) returns (uint)[10] memory a;
-        function(uint) returns (uint)[10] storage b = y;
-        function(uint) external returns (uint)[] memory c;
-        c = new function(uint) external returns (uint)[](200);
-        a; b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol
deleted file mode 100644
index 270ff69f91f1..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    // Fool parser into parsing a constructor as a function type.
-    constructor() x;
-}
-// ----
-// SyntaxError 2668: (83-99): Functions without implementation cannot have modifiers.
-// DeclarationError 7920: (97-98): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
deleted file mode 100644
index e438a871df49..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    // Fool parser into parsing a constructor as a function type.
-    function f() {
-      constructor() x;
-    }
-}
-// ----
-// ParserError 6933: (104-115): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_internal_public_variable.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_internal_public_variable.sol
deleted file mode 100644
index d7ac99902fca..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_internal_public_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function(bytes memory) internal public a;
-}
-// ----
-// TypeError 6744: (17-57): Internal or recursive type is not allowed for public state variables.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol
deleted file mode 100644
index ca337904ac72..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        function(uint a) returns (uint) x;
-        x({a:2});
-    }
-}
-// ----
-// Warning 6162: (61-67): Naming function type parameters is deprecated.
-// TypeError 4974: (95-103): Named argument "a" does not match function declaration.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_parameter.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_parameter.sol
deleted file mode 100644
index bec64eb04352..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_parameter.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint x;
-    function f(function(uint) external returns (uint) g) public returns (function(uint) external returns (uint)) {
-        x = 2;
-        return g;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol
deleted file mode 100644
index c96cbfff97bc..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function(uint) returns (bool ret) f;
-}
-// ----
-// SyntaxError 7304: (41-49): Return parameters in function types may not be named.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_returned.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_returned.sol
deleted file mode 100644
index a30cfa59261f..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_returned.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns (function(uint) pure external returns (uint) g) {
-        return g;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_struct.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_struct.sol
deleted file mode 100644
index e63a6e60ffd5..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L
-{
-	struct Nested
-	{
-		uint y;
-	}
-	function f(function(Nested memory) external) external pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol
deleted file mode 100644
index c12a42d63b13..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L
-{
-	struct Nested
-	{
-		Non y;
-	}
-	function f(function(Nested memory) external) external pure {}
-}
-// ----
-// DeclarationError 7920: (32-35): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
deleted file mode 100644
index cd0800c3d928..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function fa(bytes memory) public { }
-    function(bytes memory) external internal a = fa;
-}
-// ----
-// TypeError 7407: (106-108): Type function (bytes memory) is not implicitly convertible to expected type function (bytes memory) external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol b/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol
deleted file mode 100644
index 8c2ca4c89f11..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    // This is an error, you should explicitly use
-    // `external public` to fix it - `internal public` does not exist.
-    function(bytes memory) public a;
-}
-// ----
-// TypeError 6012: (139-170): Invalid visibility, can only be "external" or "internal".
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_types_variable_visibility.sol b/test/libsolidity/syntaxTests/functionTypes/function_types_variable_visibility.sol
deleted file mode 100644
index 91c2420a8b6e..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/function_types_variable_visibility.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function(bytes memory) a1;
-    function(bytes memory) internal b1;
-    function(bytes memory) internal internal b2;
-    function(bytes memory) external c1;
-    function(bytes memory) external internal c2;
-    function(bytes memory) external public c3;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol
deleted file mode 100644
index 4e5ae7613677..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    function f(uint a) internal pure {}
-    function g(uint a) internal pure {}
-}
-contract C {
-    using L for *;
-    function f() pure public {
-        uint t = 8;
-        [t.f, t.g][0]();
-    }
-}
-// ----
-// TypeError 9563: (186-189): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol
deleted file mode 100644
index be98f2be5b7f..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    function f(uint a) internal pure {}
-}
-contract C {
-    using L for *;
-    function f() pure public {
-        uint t;
-        function() pure x;
-        [t.f, x][0]({a: 8});
-    }
-}
-// ----
-// TypeError 9563: (169-172): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol
deleted file mode 100644
index 195287d55776..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract D {
-    function f(uint a) external payable {}
-    function g(uint a) external {}
-}
-
-contract C {
-    function f() public {
-        D d;
-        [d.f{value: 1}, d.g][0](8);
-    }
-}
-// ----
-// TypeError 9563: (155-168): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_array_memory_as_external_parameter_in_library_external.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_array_memory_as_external_parameter_in_library_external.sol
deleted file mode 100644
index 00fdf76e32f2..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_array_memory_as_external_parameter_in_library_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library L {
-    // Used to cause internal error
-    function f(function(uint) internal returns (uint)[] memory x) public { }
-}
-// ----
-// TypeError 4103: (63-112): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_array_storage_as_external_parameter_in_library_external.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_array_storage_as_external_parameter_in_library_external.sol
deleted file mode 100644
index 5942fc1163b6..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_array_storage_as_external_parameter_in_library_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library L {
-    // Used to cause internal error
-    function g(function(uint) internal returns (uint)[] storage x) public { }
-}
-// ----
-// TypeError 4103: (63-113): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter.sol
deleted file mode 100644
index 2db4ed3a79e8..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// It should not be possible to give internal functions
-// as parameters to external functions.
-contract C {
-    function f(function(uint) internal returns (uint) x) public {
-    }
-}
-// ----
-// TypeError 4103: (124-164): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter_in_library_external.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter_in_library_external.sol
deleted file mode 100644
index b8bd1141f5b6..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter_in_library_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library L {
-    function f(function(uint) internal returns (uint) x) public {
-    }
-}
-// ----
-// TypeError 4103: (27-67): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter_in_library_internal.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter_in_library_internal.sol
deleted file mode 100644
index 1b616b781f90..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_as_external_parameter_in_library_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(function(uint) internal returns (uint) /*x*/) pure internal {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_returned_from_public_function.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_returned_from_public_function.sol
deleted file mode 100644
index 1968e4cfacd7..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_returned_from_public_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// It should not be possible to return internal functions from external functions.
-contract C {
-    function f() public returns (function(uint) internal returns (uint) x) {
-    }
-}
-// ----
-// TypeError 4103: (129-169): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol
deleted file mode 100644
index a384c8a66abe..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-    struct S
-    {
-        function(uint) internal returns (uint)[] x;
-    }
-    function f(S storage s) public { }
-}
-// ----
-// TypeError 4103: (104-115): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol
deleted file mode 100644
index 18b9a7ea91f0..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (address) {
-        return address(f);
-    }
-}
-// ----
-// TypeError 9640: (72-82): Explicit type conversion not allowed from "function () returns (address)" to "address".
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol b/test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
deleted file mode 100644
index 5e9014adaec5..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function g(bytes calldata b) pure internal {}
-
-    function main() pure external {
-        function (bytes calldata) internal ptr = g;
-        ptr;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/payable_internal_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/payable_internal_function_type.sol
deleted file mode 100644
index e559ad081e40..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/payable_internal_function_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function (uint) internal payable returns (uint) x;
-}
-// ----
-// TypeError 7415: (17-66): Only external function types can be payable.
diff --git a/test/libsolidity/syntaxTests/functionTypes/payable_internal_function_type_is_not_fatal.sol b/test/libsolidity/syntaxTests/functionTypes/payable_internal_function_type_is_not_fatal.sol
deleted file mode 100644
index 481ad3a171e2..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/payable_internal_function_type_is_not_fatal.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function (uint) internal payable returns (uint) x;
-
-    function g() public {
-        x = g;
-    }
-}
-// ----
-// TypeError 7415: (17-66): Only external function types can be payable.
diff --git a/test/libsolidity/syntaxTests/functionTypes/private_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/private_function_type.sol
deleted file mode 100644
index 06bce9d64f35..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/private_function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        function(uint) private returns (uint) x;
-    }
-}
-// ----
-// TypeError 6012: (47-86): Invalid visibility, can only be "external" or "internal".
diff --git a/test/libsolidity/syntaxTests/functionTypes/public_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/public_function_type.sol
deleted file mode 100644
index f8df83da8325..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/public_function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        function(uint) public returns (uint) x;
-    }
-}
-// ----
-// TypeError 6012: (47-85): Invalid visibility, can only be "external" or "internal".
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol
deleted file mode 100644
index 847caad06f34..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() external pure { }
-    function g() external pure { }
-    function test(bool b) public returns(bytes4) {
-        (b ? C.f : C.g).selector;
-    }
-}
-// ----
-// TypeError 9717: (147-150): Invalid mobile type in true expression.
-// TypeError 3703: (153-156): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol
deleted file mode 100644
index 5f5edfa9fcc6..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure { }
-    function g() public pure { }
-}
-
-contract A {
-    function test(bool b) public returns(bytes4) {
-        (b ? C.f : C.g).selector;
-    }
-}
-// ----
-// TypeError 9717: (159-162): Invalid mobile type in true expression.
-// TypeError 3703: (165-168): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol
deleted file mode 100644
index e015f4315021..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() external pure { }
-}
-
-contract D {
-    function g() external pure { }
-}
-
-contract A {
-    function test(bool b) public returns(bytes4) {
-        (b ? C.f : D.g).selector;
-    }
-}
-// ----
-// TypeError 9717: (179-182): Invalid mobile type in true expression.
-// TypeError 3703: (185-188): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol
deleted file mode 100644
index 4109a14ced16..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-interface I1 {
-    function f() external pure;
-}
-
-interface I2 {
-    function g() external pure;
-}
-
-contract C {
-    function test(bool b) public returns(bytes4) {
-        (b ? I1.f : I2.g).selector;
-    }
-}
-// ----
-// TypeError 9717: (177-181): Invalid mobile type in true expression.
-// TypeError 3703: (184-188): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selectors.sol b/test/libsolidity/syntaxTests/functionTypes/selectors.sol
deleted file mode 100644
index 21a88fe8eb61..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/selectors.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract B {
-    function ext() external {}
-    function pub() public {}
-}
-
-contract C is B {
-    function test() public pure {
-        B.ext.selector;
-        B.pub.selector;
-        this.ext.selector;
-        pub.selector;
-    }
-}
-
-contract D {
-    function test() public pure {
-        B.ext.selector;
-        B.pub.selector;
-    }
-}
-// ----
-// Warning 6133: (136-150): Statement has no effect.
-// Warning 6133: (160-174): Statement has no effect.
-// Warning 6133: (184-201): Statement has no effect.
-// Warning 6133: (289-303): Statement has no effect.
-// Warning 6133: (313-327): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol b/test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol
deleted file mode 100644
index 810f5eb21075..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library L {
-    function f() external {}
-}
-
-contract C {
-    function test() public {
-        (true ? L.f : L.f).selector;
-    }
-}
-
-// ----
-// TypeError 9582: (94-121): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol b/test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol
deleted file mode 100644
index 2e12e4d2a8f2..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    function f(uint a) internal pure {}
-    function g(uint a) internal pure {}
-}
-contract C {
-    using L for *;
-    function f(bool x) pure public {
-        uint t = 8;
-        (x ? t.f : t.g)();
-    }
-}
-// ----
-// TypeError 9717: (196-199): Invalid mobile type in true expression.
-// TypeError 3703: (202-205): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/valid_function_type_variables.sol b/test/libsolidity/syntaxTests/functionTypes/valid_function_type_variables.sol
deleted file mode 100644
index 65198706c943..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/valid_function_type_variables.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract test {
-    function fa(uint) public {}
-    function fb(uint) internal {}
-    function fc(uint) internal {}
-    function fd(uint) external {}
-    function fe(uint) external {}
-    function ff(uint) internal {}
-    function fg(uint) internal pure {}
-    function fh(uint) pure internal {}
-
-    function(uint) a = fa;
-    function(uint) internal b = fb; // (explicit internal applies to the function type)
-    function(uint) internal internal c = fc;
-    function(uint) external d = this.fd;
-    function(uint) external internal e = this.fe;
-    function(uint) internal f = ff;
-    function(uint) internal pure g = fg;
-    function(uint) pure internal h = fh;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol b/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol
deleted file mode 100644
index 6964146f10ba..000000000000
--- a/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function(uint a) f;
-}
-// ----
-// Warning 6162: (26-32): Naming function type parameters is deprecated.
diff --git a/test/libsolidity/syntaxTests/getter/complex_struct.sol b/test/libsolidity/syntaxTests/getter/complex_struct.sol
deleted file mode 100644
index 4581fa9ea9da..000000000000
--- a/test/libsolidity/syntaxTests/getter/complex_struct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct Y {
-        uint a;
-        uint b;
-    }
-    mapping(uint256 => Y) public m;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/getter/nested_structs.sol b/test/libsolidity/syntaxTests/getter/nested_structs.sol
deleted file mode 100644
index 36886bacffeb..000000000000
--- a/test/libsolidity/syntaxTests/getter/nested_structs.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v1;
-contract C {
-    struct Y {
-        uint b;
-    }
-    struct X {
-        Y a;
-    }
-    mapping(uint256 => X) public m;
-}
-// ----
-// TypeError 2763: (108-138): The following types are only supported for getters in ABI coder v2: struct C.Y memory. Either remove "public" or use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/getter/recursive_struct.sol b/test/libsolidity/syntaxTests/getter/recursive_struct.sol
deleted file mode 100644
index 4723a162c670..000000000000
--- a/test/libsolidity/syntaxTests/getter/recursive_struct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct Y {
-        Y[] x;
-    }
-    mapping(uint256 => Y) public m;
-}
-// ----
-// TypeError 6744: (53-83): Internal or recursive type is not allowed for public state variables.
diff --git a/test/libsolidity/syntaxTests/getter/simple_struct.sol b/test/libsolidity/syntaxTests/getter/simple_struct.sol
deleted file mode 100644
index 6216240df62d..000000000000
--- a/test/libsolidity/syntaxTests/getter/simple_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    struct Y {
-        uint b;
-    }
-    mapping(uint256 => Y) public m;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol
deleted file mode 100644
index 33a864429c72..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public {
-        (bool success,) = address(this).call();
-        require(success);
-        (success,) = address(this).call(bytes4(0x12345678));
-        require(success);
-        (success,) = address(this).call(uint(1));
-        require(success);
-        (success,) = address(this).call(uint(1), uint(2));
-        require(success);
-    }
-}
-// ----
-// TypeError 6138: (65-85): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError 8051: (153-171): Invalid type for argument in function call. Invalid implicit conversion from bytes4 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError 8051: (240-247): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError 8922: (297-333): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol
deleted file mode 100644
index 8b94264057d3..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public {
-        (bool success,) = address(this).callcode();
-        require(success);
-        (success,) = address(this).callcode(uint(1));
-        require(success);
-        (success,) = address(this).callcode(uint(1), uint(2));
-        require(success);
-    }
-}
-// ----
-// TypeError 6138: (65-89): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError 8051: (161-168): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError 8922: (218-258): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol
deleted file mode 100644
index 1e2b067a627f..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public {
-        (bool success,) = address(this).delegatecall();
-        require(success);
-        (success,) = address(this).delegatecall(uint(1));
-        require(success);
-        (success,) = address(this).delegatecall(uint(1), uint(2));
-        require(success);
-    }
-}
-// ----
-// TypeError 6138: (65-93): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError 8051: (169-176): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError 8922: (226-270): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol
deleted file mode 100644
index 8867cf78b952..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        require(keccak256() != 0);
-        require(keccak256(uint(1)) != 0);
-        require(keccak256(uint(1), uint(2)) != 0);
-    }
-}
-// ----
-// TypeError 4323: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (100-107): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 4323: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol b/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol
deleted file mode 100644
index 4418c619890b..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function f() public {
-		log0;
-		log1;
-		log2;
-		log3;
-		log4;
-	}
-}
-// ----
-// DeclarationError 7576: (38-42): Undeclared identifier.
-// DeclarationError 7576: (46-50): Undeclared identifier.
-// DeclarationError 7576: (54-58): Undeclared identifier.
-// DeclarationError 7576: (62-66): Undeclared identifier.
-// DeclarationError 7576: (70-74): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol b/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
deleted file mode 100644
index d6d9b8e9f7d0..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function f() public {
-		now;
-	}
-}
-// ----
-// TypeError 7359: (38-41): "now" has been deprecated. Use "block.timestamp" instead.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/now_override.sol b/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
deleted file mode 100644
index 08d648f7814a..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f() public view {
-		uint now = block.timestamp;
-		now;
-	}
-}
-// ----
-// Warning 2319: (43-51): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol
deleted file mode 100644
index 62df6c4ef163..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        require(ripemd160() != 0);
-        require(ripemd160(uint(1)) != 0);
-        require(ripemd160(uint(1), uint(2)) != 0);
-    }
-}
-// ----
-// TypeError 4323: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (100-107): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 4323: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol
deleted file mode 100644
index 47dff279a252..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        require(sha256() != 0);
-        require(sha256(uint(1)) != 0);
-        require(sha256(uint(1), uint(2)) != 0);
-    }
-}
-// ----
-// TypeError 4323: (55-63): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (94-101): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 4323: (126-150): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol b/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol
deleted file mode 100644
index 23d64f1338f5..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bytes memory data) public pure {
-		sha3;
-	}
-}
-// ----
-// TypeError 3557: (60-64): "sha3" has been deprecated in favour of "keccak256".
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha3_override.sol b/test/libsolidity/syntaxTests/globalFunctions/sha3_override.sol
deleted file mode 100644
index 65f5636aaa53..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/sha3_override.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function sha3() public pure returns (bool) {
-		return true;
-	}
-	function f() public pure returns (bool) {
-		return sha3();
-	}
-}
-// ----
-// Warning 2319: (14-76): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol b/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol
deleted file mode 100644
index 2313a6e18c9f..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-	function f() public pure returns (bool) {
-		bool sha3 = true;
-		return sha3;
-	}
-}
-// ----
-// Warning 2319: (58-67): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol b/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol
deleted file mode 100644
index 379c7dd7aaf4..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bytes memory data) public pure {
-		suicide;
-	}
-}
-// ----
-// TypeError 8050: (60-67): "suicide" has been deprecated in favour of "selfdestruct".
diff --git a/test/libsolidity/syntaxTests/globalFunctions/suicide_override.sol b/test/libsolidity/syntaxTests/globalFunctions/suicide_override.sol
deleted file mode 100644
index 55416de5070e..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/suicide_override.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function suicide() public pure returns (bool) {
-		return true;
-	}
-	function f() public pure returns (bool) {
-		return suicide();
-	}
-}
-// ----
-// Warning 2319: (14-79): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol b/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol
deleted file mode 100644
index c51810009c92..000000000000
--- a/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-	function f() public pure returns (bool) {
-		bool suicide = true;
-		return suicide;
-	}
-}
-// ----
-// Warning 2319: (58-70): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol b/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol
deleted file mode 100644
index 7257ef0f7baa..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        function() external returns (function() internal) getCallback;
-        getCallback();
-    }
-}
-// ----
-// TypeError 2582: (76-96): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol b/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol
deleted file mode 100644
index 9bb40242ead1..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(
-        function() external returns (function() internal) getCallback
-    ) public {
-        getCallback();
-    }
-}
-// ----
-// TypeError 2582: (66-86): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
deleted file mode 100644
index 2983b0e71e28..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct S {
-        mapping(uint => uint) c;
-    }
-    S public constant e = 0x1212121212121212121212121212121212121212;
-}
-// ----
-// TypeError 9259: (71-135): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol
deleted file mode 100644
index 608481c7658c..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-    function f() public
-    {
-        int x = ~(0,);
-    }
-}
-// ----
-// TypeError 8381: (60-64): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
deleted file mode 100644
index 9398ef4735ba..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-    function f() public
-    {
-        int x = --(,);
-    }
-}
-// ----
-// TypeError 9767: (59-64): Built-in unary operator -- cannot be applied to type tuple(,).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
deleted file mode 100644
index 649eae56fa8e..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C
-{
-    function f() public
-    {
-        int x = delete (,0);
-    }
-}
-// ----
-// TypeError 4247: (68-69): Expression has to be an lvalue.
-// TypeError 9767: (59-70): Built-in unary operator delete cannot be applied to type tuple(,int_const 0).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
deleted file mode 100644
index 2f20a62164f0..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-    function f() public
-    {
-        (int x) = ++(,);
-    }
-}
-// ----
-// TypeError 9767: (61-66): Built-in unary operator ++ cannot be applied to type tuple(,).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol
deleted file mode 100644
index a0621ebf04b1..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-    function f() public
-    {
-        int x = +(0, 0);
-    }
-}
-// ----
-// ParserError 9636: (59-60): Use of unary + is disallowed.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
deleted file mode 100644
index a0ed75c9a416..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C
-{
-    function f() public
-    {
-        int y = -(0, 0);
-        (int z) = ~(0, 0);
-        (int t) = !(0, 0);
-    }
-}
-// ----
-// TypeError 4907: (59-66): Built-in unary operator - cannot be applied to type tuple(int_const 0,int_const 0).
-// TypeError 7364: (51-66): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (86-93): Built-in unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0).
-// TypeError 7364: (76-93): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (113-120): Built-in unary operator ! cannot be applied to type tuple(int_const 0,int_const 0).
-// TypeError 7364: (103-120): Different number of components on the left hand side (1) than on the right hand side (2).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol b/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
deleted file mode 100644
index aa5aeec48094..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-        function ( uint ) external returns ( a [ ] calldata ) public a = ( 1 / 2 ) ;
-}
-// ----
-// TypeError 5172: (58-59): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol b/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol
deleted file mode 100644
index 84be465fa6fd..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-        struct X { bytes31 [ 3 ] x1 ;
-                uint x2 ;
-        }
-        struct S { uint256 [ ] [ 0.425781 ether ] s1 ;
-                uint [ 2 ** 0xFF ] [ 2 ** 0x42 ] s2 ;
-                X s3 ;
-                uint [ 9 hours ** 16 ] d ;
-                string s ;
-        }
-        function f ( ) public { function ( function ( bytes9 , uint ) external pure returns ( uint ) , uint ) external pure returns ( uint ) [ 3 ] memory s2 ;
-                S memory s ;
-        }
-}
-// ----
-// TypeError 1534: (474-484): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol b/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol
deleted file mode 100644
index 5d724cd023a9..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    struct R { uint[10][10] y; }
-    struct S { uint a; uint b; R d; uint[20][20][2999999999999999999999999990] c; }
-    function f() public pure {
-        C.S memory y;
-        C.S[10] memory z;
-        y.a < 2;
-        z; y;
-    }
-}
-// ----
-// TypeError 1534: (169-181): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol b/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol
deleted file mode 100644
index 411518710665..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// Used to cause ICE because of a too strict assert
-pragma abicoder               v2;
-contract C {
-    struct S { uint a; T[222222222222222222222222222] sub; }
-    struct T { uint[] x; }
-    function f() public returns (uint, S memory) {
-    }
-}
-// ----
-// TypeError 1534: (226-234): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol b/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol
deleted file mode 100644
index d9a4cdd497e1..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
- contract C {
-        function h ( bool flag ) public returns ( bool c ) {
-                mapping ( string => uint24 ) [ 1 ] memory val ;
-        }
-}
-// ----
-// TypeError 4061: (91-136): Type mapping(string => uint24)[1] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol b/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol
deleted file mode 100644
index 761e60a1a873..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract b {
-    struct c {
-        uint [2 ** 253] a;
-    }
-
-    c d;
-
-    function e() public view {
-        c storage x = d;
-        x.a[0];
-        function()[3**44] storage fs;
-    }
-}
-// ----
-// Warning 7325: (66-67): Type struct b.c covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (66-67): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (111-112): Type struct b.c covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (111-112): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (152-169): Type function ()[984770902183611232881] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 2072: (152-180): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol b/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
deleted file mode 100644
index 9f53b9ed6171..000000000000
--- a/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract Test {
-        struct RecursiveStruct {
-                address payable d ;
-                mapping ( uint => address payable ) c ;
-                mapping ( uint => address payable [ ] ) d ;
-        }
-        function func ( ) private pure {
-                RecursiveStruct [ 1 ] memory val ;
-                val ;
-        }
-}
-// ----
-// DeclarationError 2333: (157-198): Identifier already declared.
-// TypeError 4061: (268-300): Type struct Test.RecursiveStruct[1] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/immutable/as_function_param.sol b/test/libsolidity/syntaxTests/immutable/as_function_param.sol
deleted file mode 100644
index dd9ca0bc80b9..000000000000
--- a/test/libsolidity/syntaxTests/immutable/as_function_param.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint immutable) public pure {}
-}
-// ----
-// DeclarationError 8297: (28-42): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/assembly.sol b/test/libsolidity/syntaxTests/immutable/assembly.sol
deleted file mode 100644
index a81611120197..000000000000
--- a/test/libsolidity/syntaxTests/immutable/assembly.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable x;
-    function f() public view {
-        uint t;
-        assembly {
-            t := x
-        }
-    }
-}
-// ----
-// TypeError 3773: (118-119): Assembly access to immutable variables is not supported.
diff --git a/test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol b/test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol
deleted file mode 100644
index e6e668bc0ae5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Parent {
-    constructor() {
-        return;
-    }
-}
-
-contract Child is Parent {
-    uint public immutable baked = 123;
-}
-
diff --git a/test/libsolidity/syntaxTests/immutable/complex.sol b/test/libsolidity/syntaxTests/immutable/complex.sol
deleted file mode 100644
index b624430ea741..000000000000
--- a/test/libsolidity/syntaxTests/immutable/complex.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-  int immutable a;
-  constructor() { a = 5; }
-  function f() public { a += 7; }
-}
-
-// ----
-// TypeError 1581: (83-84): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol b/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
deleted file mode 100644
index d2c473fbb945..000000000000
--- a/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        if (false)
-            return;
-
-        x = 1;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol b/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
deleted file mode 100644
index 312a76083a88..000000000000
--- a/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        if (false)
-            x = 1;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/creationCode.sol b/test/libsolidity/syntaxTests/immutable/creationCode.sol
deleted file mode 100644
index 0a2282695cda..000000000000
--- a/test/libsolidity/syntaxTests/immutable/creationCode.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    address public immutable user = address(0x0);
-}
-
-contract Test {
-    function test() public pure returns(bytes memory) {
-        return type(A).creationCode;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol b/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol
deleted file mode 100644
index e95bf57403fb..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        initX();
-    }
-
-    function initX() internal {
-        x = 3;
-    }
-}
-// ----
-// TypeError 1581: (119-120): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
deleted file mode 100644
index b23d161c174b..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = f();
-    }
-
-    function f() public view returns (uint) { return 3 + x; }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
deleted file mode 100644
index 5df8d162f6c2..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = 3 + x;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_tuple.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_tuple.sol
deleted file mode 100644
index 86d995553dd3..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_tuple.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint immutable x;
-    uint immutable y;
-    constructor() {
-        (x, y) = f();
-    }
-
-    function f() internal pure returns(uint _x, uint _y) {
-        _x = 3;
-        _y = 4;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
deleted file mode 100644
index 09c3aefa704c..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() readX(x = 3) { }
-
-    modifier readX(uint _x) {
-        _; f(_x);
-    }
-
-    function f(uint a) internal pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol
deleted file mode 100644
index 5970ab247adf..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() initX {
-    }
-
-    modifier initX() {
-        _; x = 23;
-    }
-}
-// ----
-// TypeError 1581: (102-103): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
deleted file mode 100644
index 113cda75fc20..000000000000
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() readX {
-        x = 3;
-    }
-
-    modifier readX() {
-        _; f(x);
-    }
-
-    function f(uint a) internal pure {}
-}
diff --git a/test/libsolidity/syntaxTests/immutable/decrement.sol b/test/libsolidity/syntaxTests/immutable/decrement.sol
deleted file mode 100644
index 4931b5f9f9e6..000000000000
--- a/test/libsolidity/syntaxTests/immutable/decrement.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x--;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/double_specifier.sol b/test/libsolidity/syntaxTests/immutable/double_specifier.sol
deleted file mode 100644
index a292ee115015..000000000000
--- a/test/libsolidity/syntaxTests/immutable/double_specifier.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint immutable immutable x;
-    uint immutable constant x;
-}
-// ----
-// ParserError 3109: (32-41): Mutability already set to "immutable"
-// ParserError 3109: (64-72): Mutability already set to "immutable"
diff --git a/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol b/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol
deleted file mode 100644
index bf73cc1de7c1..000000000000
--- a/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function() external immutable f;
-}
-// ----
-// TypeError 3366: (17-48): Immutable variables of external function type are not yet supported.
diff --git a/test/libsolidity/syntaxTests/immutable/function_initialization.sol b/test/libsolidity/syntaxTests/immutable/function_initialization.sol
deleted file mode 100644
index daa6c6cd1e0e..000000000000
--- a/test/libsolidity/syntaxTests/immutable/function_initialization.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint immutable x = f();
-
-    function f() public pure returns (uint) { return 3; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
deleted file mode 100644
index e276ba7835e0..000000000000
--- a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint immutable x = f();
-
-    function f() public view returns (uint) { return 3 + x; }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
deleted file mode 100644
index cc175d0831d5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract contract B {
-    uint immutable x;
-
-    constructor(function() internal returns(uint) fp) {
-        x = fp();
-    }
-}
-
-contract C is B(C.f) {
-    function f() internal returns(uint) { return x = 2; }
-}
-// ----
-// TypeError 1581: (200-201): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
deleted file mode 100644
index 2658d35d2324..000000000000
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract contract B {
-    uint immutable x;
-
-    constructor(function() internal returns(uint) fp) {
-        x = fp();
-    }
-}
-
-contract C is B(C.f) {
-    function f() internal view returns(uint) { return x + 2; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/illegal_names.sol b/test/libsolidity/syntaxTests/immutable/illegal_names.sol
deleted file mode 100644
index a80083ed8ba5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/illegal_names.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable super;
-    uint immutable _;
-    uint immutable this;
-}
-// ----
-// DeclarationError 3726: (17-37): The name "super" is reserved.
-// DeclarationError 3726: (43-59): The name "_" is reserved.
-// DeclarationError 3726: (65-84): The name "this" is reserved.
-// Warning 2319: (17-37): This declaration shadows a builtin symbol.
-// Warning 2319: (65-84): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/immutable/immutable_basic.sol b/test/libsolidity/syntaxTests/immutable/immutable_basic.sol
deleted file mode 100644
index 7b0462840a17..000000000000
--- a/test/libsolidity/syntaxTests/immutable/immutable_basic.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    uint immutable x = 0;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/increment.sol b/test/libsolidity/syntaxTests/immutable/increment.sol
deleted file mode 100644
index 62506d88ff73..000000000000
--- a/test/libsolidity/syntaxTests/immutable/increment.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x++;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
deleted file mode 100644
index 985e5d0b395e..000000000000
--- a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint immutable x = 0;
-    uint y = f();
-
-    function f() internal pure returns(uint) { return x; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor.sol
deleted file mode 100644
index 3c15e7fa5217..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract B {
-    uint immutable x;
-
-    constructor() {
-        x = 3;
-    }
-}
-
-contract C is B {
-    uint immutable y;
-    constructor() {
-        y = 3;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
deleted file mode 100644
index 025f5616129c..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract B {
-    uint immutable x;
-
-    constructor(uint _x) {
-        x = _x;
-    }
-}
-
-contract C is B {
-    uint immutable y;
-    constructor() B(y = 3) { }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
deleted file mode 100644
index f1787ab428a2..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract B {
-    uint immutable x;
-
-    constructor(uint _x) {
-        x = _x;
-    }
-}
-
-contract C is B(C.y = 3) {
-    uint immutable y;
-}
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
deleted file mode 100644
index 0ac37261feef..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract B {
-    uint immutable x;
-
-    constructor(uint _x) {
-        x = _x;
-    }
-}
-
-contract C is B(C.y) {
-    uint immutable y;
-    constructor() {
-        y = 3;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
deleted file mode 100644
index addd3249c8e0..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract B {
-    uint immutable x;
-
-    constructor() {
-        x = xInit();
-    }
-
-    function xInit() internal view virtual returns(uint) {
-        return 3;
-    }
-}
-
-contract C is B {
-    function xInit() internal view override returns(uint) {
-        return x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions_direct_call.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions_direct_call.sol
deleted file mode 100644
index b8ca24a2febd..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions_direct_call.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract B {
-    uint immutable x = 3;
-
-    function readX() internal virtual returns(uint) {
-        return x;
-    }
-}
-
-contract C is B {
-    constructor() {
-        B.readX;
-    }
-
-    function readX() internal pure override returns(uint) {
-        return 3;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions_super.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions_super.sol
deleted file mode 100644
index ffb6992627c7..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions_super.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract B {
-    uint immutable x = 3;
-
-    function readX() internal view virtual returns(uint) {
-        return x;
-    }
-}
-
-contract C is B {
-    constructor() {
-        super.readX();
-    }
-
-    function readX() internal pure override returns(uint) {
-        return 1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
deleted file mode 100644
index 31f510dccca5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract B {
-    uint immutable x;
-
-    constructor() readX {
-        x = 3;
-    }
-
-    modifier readX() virtual {
-        _; f(3);
-    }
-
-    function f(uint a) internal pure {}
-}
-
-contract C is B {
-    modifier readX() override {
-        _; f(x);
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol b/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
deleted file mode 100644
index d7586c433d39..000000000000
--- a/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract B {
-    uint immutable x = 4;
-}
-
-contract C is B {
-    constructor() {
-        x = 3;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
deleted file mode 100644
index f638ae7bf952..000000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract D {
-    uint immutable t;
-    modifier m(uint) { _; }
-    constructor() m(t = 2) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
deleted file mode 100644
index 63c6057d3e69..000000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C { constructor(uint) {} }
-contract D is C {
-  uint immutable t;
-  constructor() C(t=2) {}
-}
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol
deleted file mode 100644
index b42943959179..000000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract D {
-    uint immutable t;
-    modifier m(uint) { _; }
-    function f() public m(t = 2) {}
-}
-// ----
-// TypeError 1581: (89-90): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol b/test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol
deleted file mode 100644
index 01163f2fe215..000000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract B {
-    uint immutable x;
-}
-
-contract C is B {
-    function f() public {
-        B.x = 42;
-    }
-}
-// ----
-// TypeError 1581: (90-93): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol b/test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol
deleted file mode 100644
index 941b5e5167b2..000000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract B {
-    uint immutable x;
-
-    function g() public {}
-}
-
-contract C is B {
-    function f() public {
-        super.x = 42;
-    }
-}
-// ----
-// TypeError 9582: (118-125): Member "x" not found or not visible after argument-dependent lookup in type(contract super C).
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
deleted file mode 100644
index f80c238e6391..000000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C { constructor(uint) {} }
-contract D is C(D.t = 2) {
-    uint immutable t;
-}
diff --git a/test/libsolidity/syntaxTests/immutable/initialized_after_ctor.sol b/test/libsolidity/syntaxTests/immutable/initialized_after_ctor.sol
deleted file mode 100644
index a9fe45f1b11e..000000000000
--- a/test/libsolidity/syntaxTests/immutable/initialized_after_ctor.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    constructor() {
-        return;
-    }
-
-    uint immutable x = 3;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/long_name.sol b/test/libsolidity/syntaxTests/immutable/long_name.sol
deleted file mode 100644
index 914cc2ead4f0..000000000000
--- a/test/libsolidity/syntaxTests/immutable/long_name.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    uint immutable long___name___that___definitely___exceeds___the___thirty___two___byte___limit = 0;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/loop_initialized.sol b/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
deleted file mode 100644
index 1cbe9add1a6c..000000000000
--- a/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        while (true)
-            x = 1;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
deleted file mode 100644
index a87ec76805a3..000000000000
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract A {
-    function f() internal virtual returns(uint) { return 3; }
-}
-
-contract B {
-    uint immutable x;
-
-    constructor() {
-        x = xInit();
-    }
-
-    function xInit() internal virtual returns(uint) {
-        return f();
-    }
-
-    function f() internal view virtual returns(uint) { return 3; }
-}
-
-contract C is A, B {
-    function xInit() internal override returns(uint) {
-        return B.xInit();
-    }
-
-    function f() internal view override(A, B) returns(uint) {
-        return x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
deleted file mode 100644
index 8b8c5dd2818d..000000000000
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract A {
-    function f() internal virtual returns(uint) { return 3; }
-}
-
-contract B {
-    uint immutable x;
-
-    constructor() {
-        x = xInit();
-    }
-
-    function xInit() internal virtual returns(uint) {
-        return f();
-    }
-
-    function f() internal view virtual returns(uint) { return 3; }
-}
-
-contract C is A, B {
-    function xInit() internal override returns(uint) {
-        return super.xInit();
-    }
-
-    function f() internal view override(A, B) returns(uint) {
-        return x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol b/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
deleted file mode 100644
index 8fe5ddcfc0ea..000000000000
--- a/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = 1;
-        x = 4;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/no_assignments.sol b/test/libsolidity/syntaxTests/immutable/no_assignments.sol
deleted file mode 100644
index 7357d174a8d5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/no_assignments.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = 0;
-        while (true)
-        {}
-    }
-    function f() external view returns(uint) { return x; }
-}
-// ====
-// optimize-yul: true
-// ----
-// CodeGenerationError 1284: Some immutables were read from but never assigned, possibly because of optimization.
diff --git a/test/libsolidity/syntaxTests/immutable/non-value_type.sol b/test/libsolidity/syntaxTests/immutable/non-value_type.sol
deleted file mode 100644
index db3355bc3117..000000000000
--- a/test/libsolidity/syntaxTests/immutable/non-value_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[] immutable x;
-}
-// ----
-// TypeError 6377: (17-35): Immutable variables cannot have a non-value type.
diff --git a/test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol b/test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol
deleted file mode 100644
index ad01e3b5e652..000000000000
--- a/test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Contract {
-    struct S {
-        int k;
-    }
-
-    S immutable s;
-}
-// ----
-// TypeError 6377: (61-74): Immutable variables cannot have a non-value type.
diff --git a/test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol b/test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol
deleted file mode 100644
index b734db30fc87..000000000000
--- a/test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Contract {
-    struct S {
-        mapping(uint => address) map;
-    }
-
-    S immutable s;
-}
-// ----
-// TypeError 6377: (84-97): Immutable variables cannot have a non-value type.
diff --git a/test/libsolidity/syntaxTests/immutable/private_state_var.sol b/test/libsolidity/syntaxTests/immutable/private_state_var.sol
deleted file mode 100644
index cce1ca0f5fb3..000000000000
--- a/test/libsolidity/syntaxTests/immutable/private_state_var.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract B {
-    uint immutable private x = f();
-
-    constructor() {
-    }
-
-    function f() internal view virtual returns(uint) { return 1; }
-    function readX() internal view returns(uint) { return x; }
-}
-
-contract C is B {
-    uint immutable y;
-    constructor() {
-        y = 3;
-    }
-    function f() internal view override returns(uint) { return readX(); }
-
-}
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
deleted file mode 100644
index b4f56a269d07..000000000000
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract contract A {
-	uint public t;
-	constructor() { t = f(); }
-
-	function f() virtual pure internal returns (uint);
-}
-contract B is A {
-	uint immutable x = 2;
-	function f() override pure internal returns (uint) { return x; }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
deleted file mode 100644
index 7234e0ef0a30..000000000000
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  uint immutable t = 2;
-  uint x = f();
-  function f() internal pure returns (uint) { return t; }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/reading_after_initialization.sol b/test/libsolidity/syntaxTests/immutable/reading_after_initialization.sol
deleted file mode 100644
index f9a4d2c85933..000000000000
--- a/test/libsolidity/syntaxTests/immutable/reading_after_initialization.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint immutable x = 0;
-    uint y = 0;
-
-    function f() internal {
-        y = x + 1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
deleted file mode 100644
index 618ad36f4333..000000000000
--- a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	uint immutable x;
-
-	constructor()
-	{
-		readX();
-		x = 3;
-		readX();
-	}
-
-	function readX() public view returns(uint) {
-		return x;
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_modifier.sol b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_modifier.sol
deleted file mode 100644
index 98a7ea228d6a..000000000000
--- a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_modifier.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint immutable x = 0;
-    uint y = 0;
-
-    function f() readX internal {
-    }
-
-    modifier readX() {
-        _;
-        y = x + 1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
deleted file mode 100644
index 755de6481a29..000000000000
--- a/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    uint immutable x = 0;
-    uint y = x;
-}
diff --git a/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol b/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
deleted file mode 100644
index 3a0b3f436799..000000000000
--- a/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        return;
-
-        x = 1;
-    }
-}
-// ----
-// Warning 5740: (80-85): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/immutable/runtimeCode.sol b/test/libsolidity/syntaxTests/immutable/runtimeCode.sol
deleted file mode 100644
index 16965317c3e0..000000000000
--- a/test/libsolidity/syntaxTests/immutable/runtimeCode.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    address public immutable user = address(0x0);
-}
-
-contract Test {
-    function test() public pure returns(bytes memory) {
-        return type(A).runtimeCode;
-    }
-}
-// ----
-// TypeError 9274: (153-172): "runtimeCode" is not available for contracts containing immutable variables.
diff --git a/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol b/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol
deleted file mode 100644
index f7cf83775f25..000000000000
--- a/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Base {
-    address public immutable user = address(0x0);
-}
-
-contract Derived is Base {}
-
-contract Test {
-    function test() public pure returns(bytes memory) {
-        return type(Derived).runtimeCode;
-    }
-}
-// ----
-// TypeError 9274: (185-210): "runtimeCode" is not available for contracts containing immutable variables.
diff --git a/test/libsolidity/syntaxTests/immutable/selector.sol b/test/libsolidity/syntaxTests/immutable/selector.sol
deleted file mode 100644
index 01bf91e23aba..000000000000
--- a/test/libsolidity/syntaxTests/immutable/selector.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = 3;
-        this.readX.selector;
-    }
-
-    function readX() external view returns(uint) { return x; }
-}
-// ----
-// Warning 6133: (78-97): Statement has no effect.
-// Warning 5805: (78-82): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/syntaxTests/immutable/selector_function_name.sol b/test/libsolidity/syntaxTests/immutable/selector_function_name.sol
deleted file mode 100644
index 19e45d06e9da..000000000000
--- a/test/libsolidity/syntaxTests/immutable/selector_function_name.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = 3;
-        C.selector.selector;
-        C.selector;
-    }
-
-    function selector() external view returns(uint) { return x; }
-}
-// ----
-// Warning 6133: (78-97): Statement has no effect.
-// Warning 6133: (107-117): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/immutable/selector_function_pointer.sol b/test/libsolidity/syntaxTests/immutable/selector_function_pointer.sol
deleted file mode 100644
index 5e62322791c5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/selector_function_pointer.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        x = 3;
-        readX().selector;
-    }
-
-    function f() external view returns(uint)  {
-        return x;
-    }
-
-    function readX() public view returns(function() external view returns(uint) _f) {
-        _f = this.f;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol b/test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol
deleted file mode 100644
index 64b24b069dbe..000000000000
--- a/test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint immutable public x = 42;
-
-    function g() external view returns (uint) {}
-
-    function f() public view returns (uint) {
-        return this.x();
-    }
-
-    function h() public view returns (function () external view returns (uint)) {
-        return this.x;
-    }
-}
diff --git a/test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol b/test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol
deleted file mode 100644
index 4baa743cb201..000000000000
--- a/test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable public x = 42;
-
-    function g() external view returns (uint) {}
-
-    function f() public view {
-        this.x = this.g;
-    }
-}
-// ----
-// TypeError 4247: (137-143): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
deleted file mode 100644
index fe969a20d04c..000000000000
--- a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract A
-{
-    uint256 public immutable variable;
-
-    constructor()
-    {
-        B b;
-        try b.foo(variable = 1)
-        {
-            variable = 2;
-        }
-        catch Panic(uint)
-        {
-            variable = 3;
-        }
-        catch Error(string memory)
-        {
-            variable = 4;
-        }
-        catch
-        {
-            variable = 5;
-        }
-    }
-}
-
-contract B
-{
-    function foo(uint256) external pure
-    {
-        revert();
-    }
-}
-// ====
-// EVMVersion: >=byzantium
diff --git a/test/libsolidity/syntaxTests/immutable/unary.sol b/test/libsolidity/syntaxTests/immutable/unary.sol
deleted file mode 100644
index f3c75c09b632..000000000000
--- a/test/libsolidity/syntaxTests/immutable/unary.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-  int immutable a;
-  constructor() { a = 5; }
-  function f() public { --a; }
-}
-
-// ----
-// TypeError 1581: (85-86): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/uninitialized.sol b/test/libsolidity/syntaxTests/immutable/uninitialized.sol
deleted file mode 100644
index bf7c68a847d9..000000000000
--- a/test/libsolidity/syntaxTests/immutable/uninitialized.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C {
-    uint immutable x;
-}
diff --git a/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol b/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol
deleted file mode 100644
index 70bd1448a9c5..000000000000
--- a/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract B {
-    uint immutable private x;
-
-    constructor() {
-    }
-
-    function f() internal view virtual returns(uint) { return 1; }
-    function readX() internal view returns(uint) { return x; }
-}
-
-contract C is B {
-    uint immutable y;
-    constructor() {
-        y = 3;
-    }
-    function f() internal view override returns(uint) { return readX(); }
-
-}
diff --git a/test/libsolidity/syntaxTests/immutable/unrelated_reading.sol b/test/libsolidity/syntaxTests/immutable/unrelated_reading.sol
deleted file mode 100644
index 8eac18c7a173..000000000000
--- a/test/libsolidity/syntaxTests/immutable/unrelated_reading.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint immutable x = 1;
-
-    function readX() internal pure returns(uint) {
-        return x + 3;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol b/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
deleted file mode 100644
index 2917f276b794..000000000000
--- a/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint immutable z = 2;
-    uint immutable x = z = y = 3;
-    uint immutable y = 5;
-}
diff --git a/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol b/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
deleted file mode 100644
index 6451c8e207de..000000000000
--- a/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract C {
-    int immutable x = x = 5;
-}
diff --git a/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol b/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol
deleted file mode 100644
index 4b2b91a15f41..000000000000
--- a/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint immutable x = 0;
-
-    function f() internal {
-        x = 1;
-    }
-}
-// ----
-// TypeError 1581: (76-77): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol b/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol
deleted file mode 100644
index d450a37d2076..000000000000
--- a/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint immutable x = 0;
-
-    function f() readX internal { }
-
-    modifier readX() {
-        _; x = 1;
-    }
-}
-// ----
-// TypeError 1581: (111-112): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/imports/alias_import_not_forwarded.sol b/test/libsolidity/syntaxTests/imports/alias_import_not_forwarded.sol
deleted file mode 100644
index 1a7bb40fe165..000000000000
--- a/test/libsolidity/syntaxTests/imports/alias_import_not_forwarded.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: dummy ====
-contract Dummy { string public constant FOO = "FOO"; }
-==== Source: hasAlias ====
-import {Dummy as AliasedDummy} from "dummy";
-==== Source: Main ====
-import {AliasedDummy} from "hasAlias";
-contract TestAlias is AliasedDummy {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol b/test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol
deleted file mode 100644
index 8dc8da06819a..000000000000
--- a/test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: //// ====
-// This test used to throw due to a bug in boost::filesystem.
-// See https://github.com/boostorg/filesystem/issues/176
-import ".";
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/circular_import.sol b/test/libsolidity/syntaxTests/imports/circular_import.sol
deleted file mode 100644
index 8b9da4e3032b..000000000000
--- a/test/libsolidity/syntaxTests/imports/circular_import.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-import "b"; contract C { D d; }
-==== Source: b ====
-import "a"; contract D { C c; }
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/complex_import.sol b/test/libsolidity/syntaxTests/imports/complex_import.sol
deleted file mode 100644
index 38d9e3afae87..000000000000
--- a/test/libsolidity/syntaxTests/imports/complex_import.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract A {} contract B {} contract C { struct S { uint a; } }
-==== Source: b ====
-import "a" as x; import {B as b, C as c, C} from "a";
-contract D is b { function f(c.S memory var1, x.C.S memory var2, C.S memory var3) internal {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/declaration_not_found.sol b/test/libsolidity/syntaxTests/imports/declaration_not_found.sol
deleted file mode 100644
index b02868e542e0..000000000000
--- a/test/libsolidity/syntaxTests/imports/declaration_not_found.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-contract A { }
-==== Source: b ====
-import {C} from "a";
-contract B { }
-// ----
-// DeclarationError 2904: (b:0-20): Declaration "C" not found in "a" (referenced as "a").
diff --git a/test/libsolidity/syntaxTests/imports/filename_with_period.sol b/test/libsolidity/syntaxTests/imports/filename_with_period.sol
deleted file mode 100644
index 6b27ca0325f4..000000000000
--- a/test/libsolidity/syntaxTests/imports/filename_with_period.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a/.b.sol ====
-contract B {}
-==== Source: a/a.sol ====
-import ".b.sol"; contract A is B {}
-// ----
-// ParserError 6275: (a/a.sol:0-16): Source ".b.sol" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/imports/import_access_struct.sol b/test/libsolidity/syntaxTests/imports/import_access_struct.sol
deleted file mode 100644
index 03dac4926a8a..000000000000
--- a/test/libsolidity/syntaxTests/imports/import_access_struct.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: a ====
-struct S { uint x; }
-==== Source: b ====
-import "a" as A;
-struct T { uint x; }
-contract C {
-    function f() public pure {
-        T;
-        A.S;
-    }
-}
-// ----
-// Warning 6133: (b:90-91): Statement has no effect.
-// Warning 6133: (b:101-104): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol b/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol
deleted file mode 100644
index f1aaf75dfc2b..000000000000
--- a/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract C { D d; }
-==== Source: b ====
-import "a"; contract D is C {}
-// ----
-// DeclarationError 7920: (a:13-14): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/imports/import_is_transitive.sol b/test/libsolidity/syntaxTests/imports/import_is_transitive.sol
deleted file mode 100644
index 01ab397bc5e0..000000000000
--- a/test/libsolidity/syntaxTests/imports/import_is_transitive.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: a ====
-contract C { }
-==== Source: b ====
-import "a";
-==== Source: c ====
-import "b";
-contract D is C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/importing_free_functions.sol b/test/libsolidity/syntaxTests/imports/importing_free_functions.sol
deleted file mode 100644
index 02bc3673e829..000000000000
--- a/test/libsolidity/syntaxTests/imports/importing_free_functions.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: a ====
-function f(uint x) pure returns (uint) { return x * 3; }
-==== Source: b ====
-import "a" as A;
-function g(uint x) pure returns (uint) { return A.f(x) * 3; }
-==== Source: c ====
-import "b" as B;
-contract C {
-    function f() public pure {
-        B.g(2);
-        B.A.f(3);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_match.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_match.sol
deleted file mode 100644
index c4eca74fbc85..000000000000
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_match.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-==== Source: A.sol ====
-pragma abicoder               v2;
-
-contract A
-{
-    struct S { uint a; }
-    S public s;
-    function f(S memory _s) public returns (S memory,S memory) { }
-}
-==== Source: B.sol ====
-pragma abicoder               v2;
-
-import "./A.sol";
-contract B is A { }
-==== Source: C.sol ====
-pragma abicoder               v2;
-
-import "./B.sol";
-contract C is B { }
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
deleted file mode 100644
index 891f57e8d334..000000000000
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-==== Source: A.sol ====
-pragma abicoder               v2;
-
-contract A
-{
-    struct S { uint a; }
-    S public s;
-    function f(S memory _s) public returns (S memory,S memory) { }
-}
-==== Source: B.sol ====
-pragma abicoder               v2;
-
-import "./A.sol";
-contract B is A { }
-==== Source: C.sol ====
-pragma abicoder v1;
-import "./B.sol";
-contract C is B { }
-// ----
-// TypeError 6594: (C.sol:38-57): Contract "C" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
deleted file mode 100644
index c92221f3accd..000000000000
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: A.sol ====
-pragma abicoder               v2;
-
-contract A
-{
-    struct S { uint a; }
-    S public s;
-    function f(S memory _s) public returns (S memory,S memory) { }
-}
-==== Source: B.sol ====
-pragma abicoder v1;
-import "./A.sol";
-contract B is A { }
-==== Source: C.sol ====
-pragma abicoder v1;
-import "./B.sol";
-contract C is B { }
-// ----
-// TypeError 6594: (B.sol:38-57): Contract "B" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/imports/library_name_clash.sol b/test/libsolidity/syntaxTests/imports/library_name_clash.sol
deleted file mode 100644
index 00a9c155023e..000000000000
--- a/test/libsolidity/syntaxTests/imports/library_name_clash.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: a ====
-library A {}
-==== Source: b ====
-library A {}
-==== Source: c ====
-import {A} from "./a"; import {A} from "./b";
-// ----
-// DeclarationError 2333: (c:31-32): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/library_name_clash_with_contract.sol b/test/libsolidity/syntaxTests/imports/library_name_clash_with_contract.sol
deleted file mode 100644
index e542d04a7cd7..000000000000
--- a/test/libsolidity/syntaxTests/imports/library_name_clash_with_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-library A {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol b/test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol
deleted file mode 100644
index d97bbee3d372..000000000000
--- a/test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: A ====
-function f() pure returns (uint) {
-    return 42;
-}
-==== Source: B ====
-function f() pure returns (uint) {
-    return 24;
-}
-==== Source: C ====
-import "A" as A;
-import "B" as B;
-
-contract C {
-    function f(bool b) public pure returns (uint) {
-        return (b ? A : B).f();
-    }
-}
-// ----
-// TypeError 1080: (C:116-125): True expression's type module "A" does not match false expression's type module "B".
diff --git a/test/libsolidity/syntaxTests/imports/multiple_non_existent_file_names.sol b/test/libsolidity/syntaxTests/imports/multiple_non_existent_file_names.sol
deleted file mode 100644
index 4172955ab052..000000000000
--- a/test/libsolidity/syntaxTests/imports/multiple_non_existent_file_names.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-import "~~~some-long-unlikely-file-name-12";
-import "~~~some-long-unlikely-file-name-456";
-import "~~~some-long-unlikely-file-name-7890";
-// This test is here to verify that the license/pragma preamble added by the test suite does not
-// affect source locations in error messages. Positions in messages below should start at 0 and
-// there should be no gaps between the ranges.
-// ----
-// ParserError 6275: (0-44): Source "~~~some-long-unlikely-file-name-12" not found: File not supplied initially.
-// ParserError 6275: (45-90): Source "~~~some-long-unlikely-file-name-456" not found: File not supplied initially.
-// ParserError 6275: (91-137): Source "~~~some-long-unlikely-file-name-7890" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol
deleted file mode 100644
index 60a46eb1953e..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import "a"; contract A {}
-// ----
-// DeclarationError 2333: (b:12-25): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol
deleted file mode 100644
index 1043ae0742da..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import "a" as A; contract A {}
-// ----
-// DeclarationError 2333: (b:17-30): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol
deleted file mode 100644
index 23c27b327e9e..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import {A as b} from "a"; contract b {}
-// ----
-// DeclarationError 2333: (b:26-39): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol
deleted file mode 100644
index 70dba3c645fa..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import {A} from "a"; contract A {}
-// ----
-// DeclarationError 2333: (b:21-34): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_5.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_5.sol
deleted file mode 100644
index e98d30231ebc..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_5.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import {A} from "a"; contract B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol
deleted file mode 100644
index 40e858377f12..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import "a";
-struct A { uint256 a; }
-// ----
-// DeclarationError 2333: (b:12-35): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol
deleted file mode 100644
index 081261f9a57a..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import "a" as A;
-struct A { uint256 a; }
-// ----
-// DeclarationError 2333: (b:17-40): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol
deleted file mode 100644
index 242cf4f71ab9..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import {A as b} from "a";
-struct b { uint256 a; }
-// ----
-// DeclarationError 2333: (b:26-49): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol
deleted file mode 100644
index f85d9e93de1f..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import {A} from "a";
-struct A { uint256 a; }
-// ----
-// DeclarationError 2333: (b:21-44): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_5.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_5.sol
deleted file mode 100644
index 28523a7edb6b..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_5.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: b ====
-import {A} from "a";
-struct B { uint256 a; }
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol
deleted file mode 100644
index d0d994a99ae5..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-enum E { A }
-==== Source: b ====
-import "a";
-enum E { A }
-// ----
-// DeclarationError 2333: (b:12-24): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol
deleted file mode 100644
index 4133b322a1e3..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-enum E { A }
-==== Source: b ====
-import "a";
-contract E { }
-// ----
-// DeclarationError 2333: (b:12-26): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol
deleted file mode 100644
index 3da456b8274e..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-enum E { A }
-==== Source: b ====
-import "a";
-struct E { uint256 a; }
-// ----
-// DeclarationError 2333: (b:12-35): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol
deleted file mode 100644
index 1257bd609c43..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import "a";
-struct A { uint256 a; }
-// ----
-// DeclarationError 2333: (b:12-35): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol
deleted file mode 100644
index 316c80ee7ea5..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import "a" as A;
-struct A { uint256 a; }
-// ----
-// DeclarationError 2333: (b:17-40): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol
deleted file mode 100644
index dc3acc0961d2..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import {A as b} from "a";
-struct b { uint256 a; }
-// ----
-// DeclarationError 2333: (b:26-49): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol
deleted file mode 100644
index 632aa1ed4d1a..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import {A} from "a";
-struct A { uint256 a; }
-// ----
-// DeclarationError 2333: (b:21-44): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_5.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_5.sol
deleted file mode 100644
index 6cac15bb4baa..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_5.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import {A} from "a";
-struct B { uint256 a; }
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol
deleted file mode 100644
index 5b9089fa5d41..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import "a";
-contract A {}
-// ----
-// DeclarationError 2333: (b:12-25): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol
deleted file mode 100644
index d92579d47306..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import "a" as A;
-contract A {}
-// ----
-// DeclarationError 2333: (b:17-30): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol
deleted file mode 100644
index c34cd3b9e94c..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import {A as b} from "a";
-contract b {}
-// ----
-// DeclarationError 2333: (b:26-39): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol
deleted file mode 100644
index 145eb219645f..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import {A} from "a";
-contract A {}
-// ----
-// DeclarationError 2333: (b:21-34): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_5.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_5.sol
deleted file mode 100644
index d79d46339369..000000000000
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_5.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: a ====
-struct A { uint256 a; }
-==== Source: b ====
-import {A} from "a";
-contract B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/regular_import.sol b/test/libsolidity/syntaxTests/imports/regular_import.sol
deleted file mode 100644
index f32f8bbefbc4..000000000000
--- a/test/libsolidity/syntaxTests/imports/regular_import.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-contract C {}
-==== Source: b ====
-import "a"; contract D is C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/relative_import.sol b/test/libsolidity/syntaxTests/imports/relative_import.sol
deleted file mode 100644
index 657eff0c4bf6..000000000000
--- a/test/libsolidity/syntaxTests/imports/relative_import.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: a ====
-import "./dir/b"; contract A is B {}
-==== Source: dir/b ====
-contract B {}
-==== Source: dir/c ====
-import "../a"; contract C is A {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/relative_import_multiplex.sol b/test/libsolidity/syntaxTests/imports/relative_import_multiplex.sol
deleted file mode 100644
index 7326cbb08e56..000000000000
--- a/test/libsolidity/syntaxTests/imports/relative_import_multiplex.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: dir/a/b/c ====
-import "../../.././a"; contract B is A {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol
deleted file mode 100644
index 8608e2c9a469..000000000000
--- a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-==== Source: B.sol ====
-contract C {}
-==== Source: b ====
-import {C as msg} from "B.sol";
-// ----
-// Warning 2319: (b:13-16): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol
deleted file mode 100644
index 178f1144c3d8..000000000000
--- a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: B.sol ====
-contract X {}
-==== Source: b ====
-import * as msg from "B.sol";
-contract C {
-}
-// ----
-// Warning 2319: (b:0-29): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol
deleted file mode 100644
index 30d94338f0c4..000000000000
--- a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: B.sol ====
-contract msg {} contract block{}
-==== Source: b ====
-import {msg, block} from "B.sol";
-contract C {
-}
-// ----
-// Warning 2319: (B.sol:0-15): This declaration shadows a builtin symbol.
-// Warning 2319: (B.sol:16-32): This declaration shadows a builtin symbol.
-// Warning 2319: (b:8-11): This declaration shadows a builtin symbol.
-// Warning 2319: (b:13-18): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol b/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol
deleted file mode 100644
index 00a9c155023e..000000000000
--- a/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: a ====
-library A {}
-==== Source: b ====
-library A {}
-==== Source: c ====
-import {A} from "./a"; import {A} from "./b";
-// ----
-// DeclarationError 2333: (c:31-32): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/simple_alias.sol b/test/libsolidity/syntaxTests/imports/simple_alias.sol
deleted file mode 100644
index 32bb3a47dbab..000000000000
--- a/test/libsolidity/syntaxTests/imports/simple_alias.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-contract A {}
-==== Source: dir/a/b/c ====
-import "../../.././a" as x; contract B is x.A { fallback() external { x.A r = x.A(address(20)); r; } }
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/smoke_test.sol b/test/libsolidity/syntaxTests/imports/smoke_test.sol
deleted file mode 100644
index a694de15f528..000000000000
--- a/test/libsolidity/syntaxTests/imports/smoke_test.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-==== Source: a ====
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/imports/transitive.sol b/test/libsolidity/syntaxTests/imports/transitive.sol
deleted file mode 100644
index 8299c20626d7..000000000000
--- a/test/libsolidity/syntaxTests/imports/transitive.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: a ====
-struct S { uint[2] mS; }
-==== Source: b ====
-import "a" as A;
-struct T { A.S[2] mT; }
-==== Source: c ====
-pragma abicoder               v2;
-import "b" as B;
-contract C {
-    function f(B.T memory y, B.A.S memory z) public pure returns (uint, uint) {
-        z = B.A.S([uint(2), 3]);
-        y = B.T([z, z]);
-        return (y.mT[0].mS[0], z.mS[0]);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol b/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol
deleted file mode 100644
index b0d4dbb107c1..000000000000
--- a/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public {
-    bytes[32] memory a;
-    a[8**90][8**90][8**90*0.1];
-  }
-}
-// ----
-// TypeError 7407: (67-72): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (74-79): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (81-90): Type rational_const 9485...(73 digits omitted)...5712 / 5 is not implicitly convertible to expected type uint256.
-// TypeError 6318: (65-91): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol b/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol
deleted file mode 100644
index 0f18ec4d28b9..000000000000
--- a/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public {
-    bytes[32] memory a;
-    a[8**90][8**90][1 - 8**90];
-  }
-}
-// ----
-// TypeError 7407: (67-72): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (74-79): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (81-90): Type int_const -189...(75 digits omitted)...1423 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
-// TypeError 6318: (65-91): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/array_negative_index.sol b/test/libsolidity/syntaxTests/indexing/array_negative_index.sol
deleted file mode 100644
index 810ad3b73780..000000000000
--- a/test/libsolidity/syntaxTests/indexing/array_negative_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public {
-    bytes[32] memory a;
-    a[-1];
-  }
-}
-// ----
-// TypeError 7407: (67-69): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
diff --git a/test/libsolidity/syntaxTests/indexing/array_noninteger_index.sol b/test/libsolidity/syntaxTests/indexing/array_noninteger_index.sol
deleted file mode 100644
index c1a62ffb4337..000000000000
--- a/test/libsolidity/syntaxTests/indexing/array_noninteger_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public {
-    bytes[32] memory a;
-    a[888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888];
-  }
-}
-// ----
-// TypeError 7407: (67-178): Type int_const 8888...(103 digits omitted)...8888 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
diff --git a/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol b/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol
deleted file mode 100644
index 17190ee381f1..000000000000
--- a/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public {
-    bytes[32] memory a;
-    a[64];
-  }
-}
-// ----
-// TypeError 3383: (65-70): Out of bounds array access.
diff --git a/test/libsolidity/syntaxTests/indexing/array_without_index.sol b/test/libsolidity/syntaxTests/indexing/array_without_index.sol
deleted file mode 100644
index 485746ecd26a..000000000000
--- a/test/libsolidity/syntaxTests/indexing/array_without_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public {
-    bytes memory a;
-    a[];
-  }
-}
-// ----
-// TypeError 9689: (61-64): Index expression cannot be omitted.
diff --git a/test/libsolidity/syntaxTests/indexing/error_type_without_index.sol b/test/libsolidity/syntaxTests/indexing/error_type_without_index.sol
deleted file mode 100644
index 66658a4c9649..000000000000
--- a/test/libsolidity/syntaxTests/indexing/error_type_without_index.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface MyInterface {
-    error MyCustomError(uint256, bool);
-}
-
-contract MyContract {
-    function test() public {
-        MyInterface.MyCustomError[];
-    }
-}
-// ----
-// TypeError 2614: (126-151): Indexed expression has to be a type, mapping or array (is error MyCustomError(uint256,bool))
diff --git a/test/libsolidity/syntaxTests/indexing/event_type_without_index.sol b/test/libsolidity/syntaxTests/indexing/event_type_without_index.sol
deleted file mode 100644
index 83d1ecc029ea..000000000000
--- a/test/libsolidity/syntaxTests/indexing/event_type_without_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract MyContract {
-    event MyCustomEvent(uint256);
-    function test() public {
-        MyCustomEvent[];
-    }
-}
-// ----
-// TypeError 2614: (93-106): Indexed expression has to be a type, mapping or array (is event MyCustomEvent(uint256))
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol
deleted file mode 100644
index 4d6e8545e880..000000000000
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public {
-    bytes32 b;
-    b[-1];
-  }
-}
-// ----
-// TypeError 7407: (58-60): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
-// TypeError 6318: (56-61): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_noninteger_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_noninteger_index.sol
deleted file mode 100644
index c73064245593..000000000000
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_noninteger_index.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public {
-    bytes32 b;
-    b[888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888];
-  }
-}
-// ----
-// TypeError 7407: (58-169): Type int_const 8888...(103 digits omitted)...8888 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 6318: (56-170): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol
deleted file mode 100644
index fb06db9fb91c..000000000000
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public {
-    bytes32 b;
-    b[64];
-  }
-}
-// ----
-// TypeError 1859: (56-61): Out of bounds array access.
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol
deleted file mode 100644
index 948333cbee49..000000000000
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public {
-    bytes32 b;
-    b[];
-  }
-}
-// ----
-// TypeError 8830: (56-59): Index expression cannot be omitted.
diff --git a/test/libsolidity/syntaxTests/indexing/function_type.sol b/test/libsolidity/syntaxTests/indexing/function_type.sol
deleted file mode 100644
index 10edb7d96018..000000000000
--- a/test/libsolidity/syntaxTests/indexing/function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public {
-    f[0];
-  }
-}
-// ----
-// TypeError 2614: (41-42): Indexed expression has to be a type, mapping or array (is function ())
diff --git a/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol b/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol
deleted file mode 100644
index 9bcb9e1e6011..000000000000
--- a/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public {
-    f[];
-  }
-}
-// ----
-// TypeError 2614: (41-42): Indexed expression has to be a type, mapping or array (is function ())
diff --git a/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol b/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol
deleted file mode 100644
index acce33091923..000000000000
--- a/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// Used to trigger assert
-contract s{}
-function f() {s[:][];}
-// ----
-// TypeError 1760: (53-57): Types cannot be sliced.
diff --git a/test/libsolidity/syntaxTests/indexing/struct_array_noninteger_index.sol b/test/libsolidity/syntaxTests/indexing/struct_array_noninteger_index.sol
deleted file mode 100644
index 93222ec939f4..000000000000
--- a/test/libsolidity/syntaxTests/indexing/struct_array_noninteger_index.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    struct s { uint a; uint b;}
-    function f() pure public returns (bytes1) {
-        s[75555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555];
-        s[7];
-    }
-}
-
-// ----
-// TypeError 7407: (106-246): Type int_const 7555...(132 digits omitted)...5555 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
diff --git a/test/libsolidity/syntaxTests/inheritance/allow_empty_duplicated_super_constructor_call.sol b/test/libsolidity/syntaxTests/inheritance/allow_empty_duplicated_super_constructor_call.sol
deleted file mode 100644
index 6f5005b96ac5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/allow_empty_duplicated_super_constructor_call.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract A { constructor() { } }
-contract B is A { constructor() A() {  } }
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol b/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol
deleted file mode 100644
index 422ee9080469..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Base {
-  constructor(uint) {}
-}
-contract Derived is Base(2) { }
-contract Derived2 is Base(), Derived() { }
-// ----
-// TypeError 7927: (94-100): Wrong argument count for constructor call: 0 arguments given but expected 1. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol b/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol
deleted file mode 100644
index 3824b74b9eb3..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Base {
-    constructor(uint) { }
-}
-contract Base1 is Base(3) {}
-contract Derived is Base, Base1 {
-    constructor(uint i) Base(i) {}
-}
-// ----
-// DeclarationError 3364: (131-138): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/base_arguments_no_parentheses.sol b/test/libsolidity/syntaxTests/inheritance/base_arguments_no_parentheses.sol
deleted file mode 100644
index 669f18cc68d0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/base_arguments_no_parentheses.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Base {
-  constructor(uint) {}
-}
-contract Derived is Base(2) { }
-contract Derived2 is Base, Derived {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol b/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
deleted file mode 100644
index 8d12b6e0747f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function fun() {}
-
-contract C is fun {}
-// ----
-// TypeError 8758: (33-36): Contract expected.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol
deleted file mode 100644
index 6105a50a283e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-abstract contract A {
-    function f(uint256[1] memory a) external virtual returns (uint256);
-}
-contract B is A {
-    function f(uint256[1] calldata a) external pure virtual override returns (uint256) {
-        return a[0];
-    }
-}
-contract C is A, B {
-    function f(uint256[1] memory a) external pure override(B, A) returns (uint256) {
-        return a[0];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol
deleted file mode 100644
index a4856d9f0335..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract contract A {
-    modifier m(uint256[1] memory a) virtual;
-    function test(uint256[1] memory a) m(a) external {
-    }
-}
-
-contract B is A {
-    modifier m(uint256[1] calldata a) override {
-        _;
-    }
-}
-// ----
-// TypeError 1078: (153-214): Override changes modifier signature.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol
deleted file mode 100644
index e3fb069af239..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract contract A {
-    function f(uint256[1] calldata a) public virtual returns (uint256);
-}
-
-contract B is A {
-    function f(uint256[1] memory a) public override returns (uint256) {
-        return a[0];
-    }
-}
-// ----
-// TypeError 7723: (119-213): Data locations of parameters have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol
deleted file mode 100644
index 55b5b5fe6bc5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-abstract contract A {
-    function f(uint256[1] memory a) internal virtual returns (uint256);
-    function test() external returns (uint) {
-        uint[1] memory t;
-        t[0] = 7;
-        return f(t);
-    }
-}
-
-contract B is A {
-    function f(uint256[1] calldata a) internal override returns (uint256) {
-        return a[0];
-    }
-}
-// ----
-// TypeError 7723: (236-334): Data locations of parameters have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol
deleted file mode 100644
index 52123f68d475..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-abstract contract A {
-    function f(uint256[1] memory a) public virtual returns (uint256);
-    function test() external returns (uint) {
-        uint[1] memory t;
-        t[0] = 7;
-        return f(t);
-    }
-}
-
-contract B is A {
-    function f(uint256[1] calldata a) public override returns (uint256) {
-        return a[0];
-    }
-}
-// ----
-// TypeError 7723: (234-330): Data locations of parameters have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol
deleted file mode 100644
index 1c7f4e926c5f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract A {
-	function foo() external virtual view returns(uint[] calldata);
-}
-contract X is A {
-	function foo() public view override returns(uint[] memory) {  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol
deleted file mode 100644
index e06cd43ae573..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-	function foo() public virtual view returns(uint[] calldata);
-}
-contract X is A {
-	function foo() public view override returns(uint[] memory) {  }
-}
-// ----
-// TypeError 1443: (105-168): Data locations of return variables have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol b/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol
deleted file mode 100644
index 2f2801e5fb47..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { constructor() { } }
-contract B is A { constructor() A {  } }
-// ----
-// DeclarationError 1563: (65-66): Modifier-style base constructor call without arguments.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol
deleted file mode 100644
index 0cab1a1eb607..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { constructor(uint) { } }
-contract B is A(2) { constructor() {  } }
-contract C is B { constructor() A(3) {  } }
-// ----
-// DeclarationError 3364: (111-115): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol
deleted file mode 100644
index ca1e839b5b68..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { constructor(uint) { } }
-contract B is A(2) { constructor() A(3) {  } }
-// ----
-// DeclarationError 3364: (72-76): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol
deleted file mode 100644
index f7a655b9f2a7..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C { constructor(uint) {} }
-contract A is C(2) {}
-contract B is C(2) {}
-contract D is A, B { constructor() C(3) {} }
-// ----
-// DeclarationError 3364: (115-119): Base constructor arguments given twice.
-// DeclarationError 3364: (115-119): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol
deleted file mode 100644
index 09a1593f71ed..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C { constructor(uint) {} }
-contract A is C(2) {}
-contract B is C(2) {}
-contract D is A, B {}
-// ----
-// DeclarationError 3364: (80-101): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol
deleted file mode 100644
index 0b29661d0568..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C { constructor(uint) {} }
-contract A is C { constructor() C(2) {} }
-contract B is C { constructor() C(2) {} }
-contract D is A, B { }
-// ----
-// DeclarationError 3364: (120-142): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol
deleted file mode 100644
index 161c23c3ff21..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	receive() external payable {}
-}
-contract D is C {
-	fallback() override external {}
-}
-// ----
-// TypeError 7792: (76-84): Function has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_with_override.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_with_override.sol
deleted file mode 100644
index 4579a732d10e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_with_override.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	fallback() virtual external {}
-}
-contract D is C {
-	fallback() override external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_with_override_intermediate.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_with_override_intermediate.sol
deleted file mode 100644
index ea5f01344dd8..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_with_override_intermediate.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	fallback() virtual external {}
-}
-contract D is C {
-}
-contract E is D {
-	fallback() override external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol
deleted file mode 100644
index 5bf71099a4e0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	fallback() virtual external {}
-}
-contract D is C {
-	fallback() external {}
-}
-// ----
-// TypeError 9456: (66-88): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol
deleted file mode 100644
index 8c03b57e0571..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	fallback() virtual external {}
-}
-contract D is C {
-}
-contract E is D {
-	fallback() external {}
-}
-// ----
-// TypeError 9456: (86-108): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol
deleted file mode 100644
index c7a52537130a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	fallback() external {}
-}
-contract D is C {
-	receive() override external payable {}
-}
-// ----
-// TypeError 7792: (68-76): Function has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol
deleted file mode 100644
index 1798316a70b4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    receive(bytes2) {}
-}
-contract D is C {
-    receive() {}
-}
-// ----
-// SyntaxError 4937: (17-35): No visibility specified. Did you intend to add "external"?
-// SyntaxError 4937: (60-72): No visibility specified. Did you intend to add "external"?
-// DeclarationError 7793: (17-35): Receive ether function must be payable, but is "nonpayable".
-// DeclarationError 4095: (17-35): Receive ether function must be defined as "external".
-// DeclarationError 6857: (24-32): Receive ether function cannot take parameters.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol
deleted file mode 100644
index ca01cc572291..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    receive() external payable virtual returns(uint) {}
-}
-contract D is C {
-    receive() external payable override {}
-}
-// ----
-// DeclarationError 6899: (59-65): Receive ether function cannot return values.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol
deleted file mode 100644
index 99760771c9d5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    receive(bytes2) external payable;
-}
-
-interface J is I {
-    receive() external payable override;
-}
-
-contract C is J {
-    receive() external payable override {}
-}
-// ----
-// DeclarationError 6857: (25-33): Receive ether function cannot take parameters.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_with_override.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_with_override.sol
deleted file mode 100644
index d867c25232b1..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_with_override.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	receive() virtual external payable {}
-}
-contract D is C {
-	receive() override external payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_with_override_intermediate.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_with_override_intermediate.sol
deleted file mode 100644
index 2606df4879a7..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_with_override_intermediate.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	receive() virtual external payable {}
-}
-contract D is C {
-}
-contract E is D {
-	receive() override external payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol
deleted file mode 100644
index c6809ae4211d..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	receive() virtual external payable {}
-}
-contract D is C {
-	receive() external payable {}
-}
-// ----
-// TypeError 9456: (73-102): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol
deleted file mode 100644
index c4f0e27c8d45..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-	receive() virtual external payable {}
-}
-contract D is C {
-}
-contract E is D {
-	receive() external payable {}
-}
-// ----
-// TypeError 9456: (93-122): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol b/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol
deleted file mode 100644
index f7f084d1335c..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {}
-interface I is C {}
-
-// ----
-// TypeError 6536: (29-30): Interfaces can only inherit from other interfaces.
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/diamond/diamond_no_relist.sol b/test/libsolidity/syntaxTests/inheritance/interface/diamond/diamond_no_relist.sol
deleted file mode 100644
index 6793bdb68fbd..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/diamond/diamond_no_relist.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface Parent {
-    function test() external pure returns (uint256);
-}
-
-interface SubA is Parent {}
-interface SubB is Parent {}
-
-contract C is SubA, SubB {
-    function test() external override pure returns (uint256) { return 42; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/diamond/diamond_with_relist.sol b/test/libsolidity/syntaxTests/inheritance/interface/diamond/diamond_with_relist.sol
deleted file mode 100644
index 400bc4c07b6b..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/diamond/diamond_with_relist.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-interface Parent {
-    function test() external pure returns (uint256);
-}
-
-interface SubA is Parent {
-    function test() external pure override returns (uint256);
-}
-
-interface SubB is Parent {
-    function test() external pure override returns (uint256);
-}
-
-contract C is SubA, SubB {
-    function test() external pure override(SubA, SubB) returns (uint256) { return 42; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/implementation/complete.sol b/test/libsolidity/syntaxTests/inheritance/interface/implementation/complete.sol
deleted file mode 100644
index 291d1b58d383..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/implementation/complete.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface ParentA {
-    function testA() external pure returns (uint256);
-}
-
-interface ParentB {
-    function testB() external pure returns (uint256);
-}
-
-interface Sub is ParentA, ParentB {
-    function testSub() external pure returns (uint256);
-}
-
-contract SubImpl is Sub {
-    function testA() external pure override returns (uint256) { return 12; }
-    function testB() external pure override(ParentB) returns (uint256) { return 42; }
-    function testSub() external pure override returns (uint256) { return 99; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/implementation/partial.sol b/test/libsolidity/syntaxTests/inheritance/interface/implementation/partial.sol
deleted file mode 100644
index ee5d1608d689..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/implementation/partial.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-interface ParentA {
-    function testA() external returns (uint256);
-}
-
-interface ParentB {
-    function testB() external returns (uint256);
-}
-
-interface Sub is ParentA, ParentB {
-    function testSub() external returns (uint256);
-}
-
-contract SubImpl is Sub {
-    function testA() external override returns (uint256) { return 12; }
-    function testSub() external override returns (uint256) { return 99; }
-}
-
-// ----
-// TypeError 3656: (234-407): Contract "SubImpl" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_a.sol b/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_a.sol
deleted file mode 100644
index 9fffe92074a5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_a.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface ParentA {}
-interface ParentB {}
-interface Sub is ParentA, ParentB {}
-
-contract ListsA is Sub, ParentA {}
-
-// ----
-// TypeError 5005: (80-114): Linearization of inheritance graph impossible
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_b.sol b/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_b.sol
deleted file mode 100644
index 329dfdf5a4f9..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_b.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface ParentA {}
-interface ParentB {}
-interface Sub is ParentA, ParentB {}
-
-contract ListsB is Sub, ParentB {}
-
-// ----
-// TypeError 5005: (80-114): Linearization of inheritance graph impossible
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_both.sol b/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_both.sol
deleted file mode 100644
index 0223af603ef8..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/linearization/invalid/lists_both.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface ParentA {}
-interface ParentB {}
-interface Sub is ParentA, ParentB {}
-
-contract ListsBoth is Sub, ParentA, ParentB {}
-
-// ----
-// TypeError 5005: (80-126): Linearization of inheritance graph impossible
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/linearization/valid.sol b/test/libsolidity/syntaxTests/inheritance/interface/linearization/valid.sol
deleted file mode 100644
index 19a39b355303..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/linearization/valid.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface ParentA {}
-interface ParentB {}
-interface Sub is ParentA, ParentB {}
-
-contract ListsA is ParentA, Sub {}
-contract ListsB is ParentB, Sub {}
-contract ListsBoth is ParentA, ParentB, Sub {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/multiple_parents.sol b/test/libsolidity/syntaxTests/inheritance/interface/multiple_parents.sol
deleted file mode 100644
index 2ba34ad12c31..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/multiple_parents.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-interface SuperA {
-    function test() external returns (uint256);
-    function testA() external returns (int128);
-}
-
-interface SuperB {
-    function test() external returns (uint256);
-    function testB() external returns (int256);
-}
-
-interface Sub is SuperA, SuperB {
-}
-
-// ----
-// TypeError 6480: (236-271): Derived contract must override function "test". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol b/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol
deleted file mode 100644
index 9c2f39bd93ab..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-interface SuperA {
-    function test1() external returns (uint256);
-    function test2() external returns (uint256);
-    function test3() external returns (uint256);
-    function test4() external returns (uint256);
-    function test5() external returns (uint256);
-}
-
-interface SuperB {
-    function test1() external returns (uint256);
-    function test2() external returns (uint256);
-    function test3() external returns (uint256);
-    function test4() external returns (uint256);
-    function test5() external returns (uint256);
-}
-
-interface Sub is SuperA, SuperB {
-    function test1() external returns (uint256);
-    function test2() external override returns (uint256);
-    function test3() external override(SuperA) returns (uint256);
-    function test4() external override(SuperB) returns (uint256);
-    function test5() external override(SuperA, SuperB) returns (uint256);
-}
-
-// ----
-// TypeError 4327: (572-616): Function needs to specify overridden contracts "SuperA" and "SuperB".
-// TypeError 4327: (647-655): Function needs to specify overridden contracts "SuperA" and "SuperB".
-// TypeError 4327: (705-721): Function needs to specify overridden contract "SuperB".
-// TypeError 4327: (771-787): Function needs to specify overridden contract "SuperA".
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/overrides_single.sol b/test/libsolidity/syntaxTests/inheritance/interface/overrides_single.sol
deleted file mode 100644
index bed7026ddc93..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/overrides_single.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface Super {
-    function test1() external returns (uint256);
-    function test2() external returns (uint256);
-    function test3() external returns (uint256);
-}
-
-interface Sub is Super {
-    function test1() external returns (uint256);
-    function test2() external override returns (uint256);
-    function test3() external override(Super) returns (uint256);
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/single_parent.sol b/test/libsolidity/syntaxTests/inheritance/interface/single_parent.sol
deleted file mode 100644
index 303b6fc8e024..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface/single_parent.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-interface Super {
-    function test() external returns (uint256);
-}
-
-interface Sub is Super {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol b/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol
deleted file mode 100644
index 703c47859e2f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface I {
-	function foo() virtual external;
-}
-// ----
-// Warning 5815: (15-47): Interface functions are implicitly "virtual"
diff --git a/test/libsolidity/syntaxTests/inheritance/modifiers_in_constructor_context.sol b/test/libsolidity/syntaxTests/inheritance/modifiers_in_constructor_context.sol
deleted file mode 100644
index cc9e0e42b31f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/modifiers_in_constructor_context.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// This generated an invalid warning on m1 in some compiler versions.
-contract A {
-  constructor() m1 { }
-  modifier m1 { _; }
-}
-contract B is A {
-  modifier m2 { _; }
-  constructor() A() m1 m2 {  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/add_view.sol b/test/libsolidity/syntaxTests/inheritance/override/add_view.sol
deleted file mode 100644
index 508678514f04..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/add_view.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract B { function f() virtual public {} }
-contract C is B { function f() override public view {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol
deleted file mode 100644
index 3179a9789b20..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-interface I {
-    function f() external;
-    function g() external;
-}
-interface J {
-	function f() external;
-}
-abstract contract A is I, J {
-    function f() external override (I, J) {}
-    function g() external override virtual;
-}
-abstract contract B is I {
-    function f() external override virtual;
-    function g() external override {}
-}
-contract C is A, B {
-}
-// ----
-// TypeError 6480: (342-364): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
-// TypeError 6480: (342-364): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol
deleted file mode 100644
index 04db16623fa9..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-interface I {
-    function f() external;
-    function g() external;
-}
-interface J {
-	function f() external;
-}
-abstract contract A is I, J {
-    function f() external override (I, J) {}
-}
-abstract contract B is I {
-    function g() external override {}
-}
-contract C is A, B {
-}
-// ----
-// TypeError 6480: (254-276): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_functions_overridden_in_intermediate_base.sol b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_functions_overridden_in_intermediate_base.sol
deleted file mode 100644
index cd358c4200ab..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_functions_overridden_in_intermediate_base.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-	function f() external virtual {}
-}
-contract B {
-	function f() external virtual {}
-}
-contract C is A, B {
-	function f() external override (A, B) {}
-}
-contract X is C {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_functions_overridden_in_intermediate_base_unimplemented.sol b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_functions_overridden_in_intermediate_base_unimplemented.sol
deleted file mode 100644
index 905f45832913..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_functions_overridden_in_intermediate_base_unimplemented.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-	function f() external virtual {}
-}
-contract B {
-	function f() external virtual {}
-}
-contract C is A, B {
-	function f() external override (A, B);
-}
-contract X is C {
-}
-// ----
-// TypeError 4593: (120-158): Overriding an implemented function with an unimplemented function is not allowed.
-// TypeError 4593: (120-158): Overriding an implemented function with an unimplemented function is not allowed.
-// TypeError 5424: (120-158): Functions without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory.sol b/test/libsolidity/syntaxTests/inheritance/override/calldata_memory.sol
deleted file mode 100644
index 788bdf10fb85..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-    uint dummy;
-    function f(uint[] calldata) external virtual pure {}
-    function g(uint[] calldata) external virtual view { dummy; }
-    function h(uint[] calldata) external virtual { dummy = 42; }
-    function i(uint[] calldata) external virtual payable {}
-}
-contract B is A {
-    function f(uint[] memory) public override pure {}
-    function g(uint[] memory) public override view { dummy; }
-    function h(uint[] memory) public override { dummy = 42; }
-    function i(uint[] memory) public override payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_conflict.sol b/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_conflict.sol
deleted file mode 100644
index 8bd2a2b5850b..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_conflict.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract A {
-    uint dummy;
-    function f(uint[] calldata) external virtual pure {}
-    function g(uint[] calldata) external virtual view { dummy; }
-    function h(uint[] calldata) external virtual { dummy = 42; }
-    function i(uint[] calldata) external virtual payable {}
-}
-contract B is A {
-    function f(uint[] calldata) external override pure {}
-    function g(uint[] calldata) external override view { dummy; }
-    function h(uint[] calldata) external override { dummy = 42; }
-    function i(uint[] calldata) external override payable {}
-    function f(uint[] memory) public override pure {}
-    function g(uint[] memory) public override view { dummy; }
-    function h(uint[] memory) public override { dummy = 42; }
-    function i(uint[] memory) public override payable {}
-}
-// ----
-// DeclarationError 1686: (300-353): Function with same name and parameter types defined twice.
-// DeclarationError 1686: (358-419): Function with same name and parameter types defined twice.
-// DeclarationError 1686: (424-485): Function with same name and parameter types defined twice.
-// DeclarationError 1686: (490-546): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface.sol b/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface.sol
deleted file mode 100644
index 7be022c02269..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-interface I {
-    function f(uint[] calldata) external pure;
-    function g(uint[] calldata) external view;
-    function h(uint[] calldata) external;
-    function i(uint[] calldata) external payable;
-}
-contract C is I {
-    uint dummy;
-    function f(uint[] memory) public pure {}
-    function g(uint[] memory) public view { dummy; }
-    function h(uint[] memory) public { dummy = 42; }
-    function i(uint[] memory) public payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_instantiate.sol b/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_instantiate.sol
deleted file mode 100644
index 2c1045802886..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_instantiate.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    function f(uint[] calldata) external pure;
-}
-contract A is I {
-    function f(uint[] memory) public pure {}
-}
-contract C {
-    function f() public {
-        I i = I(new A());
-        i.f(new uint[](1));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_struct.sol b/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_struct.sol
deleted file mode 100644
index 1ba73bb97de5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_struct.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder               v2;
-interface I {
-    struct S { int a; }
-    function f(S calldata) external pure;
-    function g(S calldata) external view;
-    function h(S calldata) external;
-    function i(S calldata) external payable;
-}
-contract C is I {
-    uint dummy;
-    function f(S memory) public override pure {}
-    function g(S memory) public view { dummy; }
-    function h(S memory) public override { dummy = 42; }
-    function i(S memory) public payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_struct.sol b/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_struct.sol
deleted file mode 100644
index 65afb8cc6134..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/calldata_memory_struct.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma abicoder               v2;
-contract A {
-    uint dummy;
-    struct S { int a; }
-    function f(S calldata) external virtual pure {}
-    function g(S calldata) external virtual view { dummy; }
-    function h(S calldata) external virtual { dummy = 42; }
-    function i(S calldata) external virtual payable {}
-}
-contract B is A {
-    function f(S memory) public override pure {}
-    function g(S memory) public override view { dummy; }
-    function h(S memory) public override { dummy = 42; }
-    function i(S memory) public override payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/change_return_types_in_interface.sol b/test/libsolidity/syntaxTests/inheritance/override/change_return_types_in_interface.sol
deleted file mode 100644
index 2ac2734c53c9..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/change_return_types_in_interface.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface I {
-  function f() external pure returns (uint);
-}
-contract B is I {
-  // The compiler used to have a bug where changing
-  // the return type was fine in this situation.
-  function f() public pure returns (uint, uint) {}
-}
-// ----
-// TypeError 4822: (182-230): Overriding function return types differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol
deleted file mode 100644
index cc065bbeed57..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-interface I {
-    function f() external;
-    function g() external;
-}
-abstract contract A is I {
-    function f() external {}
-    function g() external virtual;
-}
-abstract contract B is I {
-    function g() external {}
-    function f() external virtual;
-}
-contract C is A, B {
-}
-// ----
-// TypeError 6480: (256-278): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
-// TypeError 6480: (256-278): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_mention.sol b/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_mention.sol
deleted file mode 100644
index 7a4244941875..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_mention.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    function f() external;
-    function g() external;
-}
-abstract contract A is I {
-    function f() external {}
-}
-abstract contract B is I {
-    function g() external {}
-}
-contract C is A, B {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol b/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol
deleted file mode 100644
index a7da5e4d1c02..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-interface IBase {
-    function foo() external view;
-}
-
-contract Base is IBase {
-    function foo() public virtual view {}
-}
-
-interface IExt is IBase {}
-
-contract Ext is IExt, Base {}
-
-contract T { function foo() public virtual view {} }
-
-contract Impl is Ext, T {
-    function foo() public view override(IBase, Base, T) {}
-}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol b/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol
deleted file mode 100644
index 881402620147..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-abstract contract IBase {
-    function foo() external view virtual;
-}
-
-contract Base is IBase {
-    function foo() public virtual override view {}
-}
-
-abstract contract IExt is IBase {}
-
-contract Ext is IExt, Base {}
-
-contract T { function foo() public virtual view {} }
-
-contract Impl is Ext, T {
-    function foo() public view override(IBase, Base, T) {}
-}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol b/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol
deleted file mode 100644
index 9907090c60aa..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract X {
-	int public override override testvar;
-	function test() internal override override returns (uint256);
-}
-// ----
-// ParserError 9125: (34-42): Override already specified.
-// ParserError 1827: (87-95): Override already specified.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol
deleted file mode 100644
index ef48ab5fe42d..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-}
-contract A is I
-{
-	uint public f;
-}
-abstract contract B is I
-{
-	function f() external virtual returns (uint);
-}
-abstract contract C is A, B {}
-// ----
-// TypeError 6480: (128-158): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable.sol
deleted file mode 100644
index 7d0a0740c99e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-	function f() external returns (uint);
-}
-abstract contract A is I
-{
-	uint public f;
-}
-abstract contract B is I
-{
-}
-// This is fine because `f` is not implemented in `I` and `A.f` is the only mention below `I`.
-abstract contract C is A, B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol
deleted file mode 100644
index 4ea1ab4c08e5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-interface I {
-	function f() external returns (uint);
-}
-contract A is I
-{
-	uint public f;
-}
-abstract contract B is I
-{
-	function f() external virtual returns (uint);
-}
-abstract contract C is A, B {}
-// ----
-// TypeError 6480: (167-197): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol
deleted file mode 100644
index 90efce554edd..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-interface I {
-	function f() external returns (uint);
-}
-contract A is I
-{
-	uint public f;
-}
-abstract contract B is I
-{
-	function f() external virtual returns (uint) { return 2; }
-}
-abstract contract C is A, B {}
-// ----
-// TypeError 6480: (180-210): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol
deleted file mode 100644
index 61c159b082d4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract I {
-	function f() external view virtual returns (uint) { return 1; }
-}
-contract A is I
-{
-}
-contract B is I
-{
-}
-contract C is A, B
-{
-	uint public override f;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol
deleted file mode 100644
index 392b6640bcd0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract I {
-	function f() external view virtual returns (uint) { return 1; }
-}
-contract A is I
-{
-	uint public override f;
-}
-contract B is I
-{
-	function f() external pure virtual override returns (uint) { return 2; }
-}
-contract C is A, B {}
-// ----
-// TypeError 6480: (219-240): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol
deleted file mode 100644
index 5e7052a6234c..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract I {
-	function f() external view virtual returns (uint) { return 1; }
-}
-contract A is I
-{
-	uint public override f;
-}
-contract B is I
-{
-}
-contract C is A, B {}
-// ----
-// TypeError 6480: (145-166): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/external_turns_public_no_params.sol b/test/libsolidity/syntaxTests/inheritance/override/external_turns_public_no_params.sol
deleted file mode 100644
index 72981e5cafa0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/external_turns_public_no_params.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    function f() external virtual pure {}
-}
-contract B is A {
-    function f() public override pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol b/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol
deleted file mode 100644
index bae30a862369..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function() external virtual fp;
-	function() external override fp2;
-	function() external override virtual fp3;
-}
-// ----
-// ParserError 2314: (34-41): Expected identifier but got 'virtual'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/function_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/function_state_variable.sol
deleted file mode 100644
index ccb56709992d..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/function_state_variable.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-interface ERC20 { function x() external returns (uint); }
-contract C is ERC20 { uint public x; }
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/implement_interface_by_public_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/implement_interface_by_public_variable.sol
deleted file mode 100644
index d98e253c5a6a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/implement_interface_by_public_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface X { function test() external returns (uint256); }
-contract Y is X {
-    uint256 public test = 42;
-}
-contract T {
-    constructor() { new Y(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/implement_internal_function_by_public_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/implement_internal_function_by_public_variable.sol
deleted file mode 100644
index 9bdfdeb7b9d0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/implement_internal_function_by_public_variable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract contract X { function test() internal virtual returns (uint256); }
-contract Y is X {
-    uint256 public override test = 42;
-}
-contract T {
-    constructor() { new Y(); }
-}
-// ----
-// TypeError 5225: (98-131): Public state variables can only override functions with external visibility.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/implement_private_function_by_public_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/implement_private_function_by_public_variable.sol
deleted file mode 100644
index f78403d15bc3..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/implement_private_function_by_public_variable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract contract X { function test() private virtual returns (uint256); }
-contract Y is X {
-    uint256 public override test = 42;
-}
-contract T {
-    constructor() { new Y(); }
-}
-// ----
-// TypeError 5225: (97-130): Public state variables can only override functions with external visibility.
-// TypeError 3942: (22-72): "virtual" and "private" cannot be used together.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/implement_public_function_by_public_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/implement_public_function_by_public_variable.sol
deleted file mode 100644
index c4e1b4ece250..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/implement_public_function_by_public_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract X { function test() external virtual returns (uint256); }
-contract Y is X {
-    uint256 public override test = 42;
-}
-contract T {
-    constructor() { new Y(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
deleted file mode 100644
index e3f4917704a6..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface IBase {
-    function foo() external view;
-}
-
-contract Base is IBase {
-    function foo() public virtual view {}
-}
-
-interface IExt is IBase {}
-
-contract Ext is IExt, Base {}
-
-contract Impl is Ext {
-    function foo() public view {}
-}
-// ----
-// TypeError 9456: (211-240): Overriding function is missing "override" specifier.
-// TypeError 4327: (211-240): Function needs to specify overridden contracts "Base" and "IBase".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol
deleted file mode 100644
index e20bcd888139..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-interface IBase {
-    function foo() external view;
-}
-
-contract Base is IBase {
-    function foo() public virtual view {}
-}
-
-interface IExt is IBase {}
-
-contract Ext is IExt, Base {}
-
-contract Impl is Ext {
-    function foo() public view override (IBase, Base) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol
deleted file mode 100644
index 97290af9c538..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract I {
-	function f() external virtual;
-}
-contract C is I {
-	function f() external {}
-}
-// ----
-// TypeError 9456: (75-99): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol
deleted file mode 100644
index 6c46e0a8bfe2..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-interface I {
-	function f() external;
-	function g() external;
-	function h() external;
-}
-interface J {
-	function f() external;
-	function g() external;
-	function h() external;
-}
-contract C is I, J {
-	function f() external {}
-	function g() external override {}
-	function h() external override(I) {}
-}
-// ----
-// TypeError 4327: (198-222): Function needs to specify overridden contracts "I" and "J".
-// TypeError 4327: (246-254): Function needs to specify overridden contracts "I" and "J".
-// TypeError 4327: (281-292): Function needs to specify overridden contract "J".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/regular_optional.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/regular_optional.sol
deleted file mode 100644
index b2f1d7c130d2..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/regular_optional.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface I {
-	function f() external;
-	function g() external;
-	function h() external;
-}
-contract C is I {
-	function f() external {}
-	function g() external override {}
-	function h() external override(I) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/internal_external.sol b/test/libsolidity/syntaxTests/inheritance/override/internal_external.sol
deleted file mode 100644
index ba4eb83bdfc0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/internal_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A {
-    function f(uint[] calldata) external pure {}
-    function f(uint[] memory) internal pure {}
-}
-// ----
-// DeclarationError 1686: (17-61): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol b/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol
deleted file mode 100644
index 8a84fb5483f8..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-    function f(uint[] calldata) external pure {}
-}
-contract B {
-    function f(uint[] memory) internal pure {}
-}
-contract C is A, B {}
-// ----
-// TypeError 6480: (126-147): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous.sol b/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous.sol
deleted file mode 100644
index 00aeed0cda6f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    modifier f() virtual { _; }
-}
-contract B {
-    modifier f() virtual { _; }
-}
-contract C is A, B {
-    modifier f() override(A,B) { _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol b/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol
deleted file mode 100644
index 7332f0817c18..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    modifier f() virtual { _; }
-}
-contract B {
-    modifier f() virtual { _; }
-}
-contract C is A, B {
-}
-// ----
-// TypeError 6480: (94-116): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol b/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol
deleted file mode 100644
index 428f38e62bf0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    modifier f(uint a) virtual { _; }
-}
-contract B {
-    modifier f() virtual { _; }
-}
-contract C is A, B {
-}
-// ----
-// TypeError 6480: (100-122): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature_override.sol b/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature_override.sol
deleted file mode 100644
index 7791ea725048..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature_override.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    modifier f(uint a) virtual { _; }
-}
-contract B {
-    modifier f() virtual { _; }
-}
-contract C is A, B {
-    modifier f() virtual override(A, B) { _; }
-}
-// ----
-// TypeError 1078: (125-167): Override changes modifier signature.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol
deleted file mode 100644
index 4da82307f67e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract contract A {
-    function f() external {}
-    function g() external virtual;
-}
-abstract contract B {
-    function g() external {}
-    function f() external virtual;
-}
-contract C is A, B {
-}
-// ----
-// TypeError 6480: (176-198): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
-// TypeError 6480: (176-198): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/no_matching_resolution.sol b/test/libsolidity/syntaxTests/inheritance/override/no_matching_resolution.sol
deleted file mode 100644
index 4e40416dd8b0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/no_matching_resolution.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function f() virtual internal {}
-}
-contract B is A {
-    function f() virtual override internal {}
-    function h() pure internal { f; }
-}
-contract C is B {
-    function f() override internal {}
-    function i() pure internal { f; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation.sol
deleted file mode 100644
index f22f73158427..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-interface I {
-	function f() external;
-	function g() external;
-}
-interface J {
-	function f() external;
-}
-abstract contract IJ is I, J {
-	function f() external virtual override (I, J);
-}
-abstract contract A is IJ
-{
-	function f() external override {}
-}
-abstract contract B is IJ
-{
-	function g() external override {}
-}
-contract C is A, B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol b/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol
deleted file mode 100644
index deda228fa0b5..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract I {
-	modifier f() virtual { _; }
-}
-contract J {
-	modifier f() virtual { _; }
-}
-contract IJ is I, J {
-	modifier f() virtual override (I, J) { _; }
-}
-contract A is IJ
-{
-	modifier f() override { _; }
-}
-contract B is IJ
-{
-}
-contract C is A, B {}
-// ----
-// TypeError 6480: (229-250): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_unimplemented.sol b/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_unimplemented.sol
deleted file mode 100644
index fabb3420d320..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_unimplemented.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-interface I {
-	function f() external;
-	function g() external;
-}
-interface J {
-	function f() external;
-}
-abstract contract IJ is I, J {
-	function f() external virtual override (I, J);
-}
-abstract contract A is IJ
-{
-	function f() external virtual override;
-}
-abstract contract B is IJ
-{
-	function g() external override {}
-}
-abstract contract C is A, B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override.sol b/test/libsolidity/syntaxTests/inheritance/override/override.sol
deleted file mode 100644
index dcd270571b38..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract contract A {
-	function test() internal virtual returns (uint256);
-	function test2() internal virtual returns (uint256);
-}
-contract X is A {
-	function test() internal override returns (uint256) {}
-	function test2() internal override(A) returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_ambiguous.sol b/test/libsolidity/syntaxTests/inheritance/override/override_ambiguous.sol
deleted file mode 100644
index 033649cd45c0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_ambiguous.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract B {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract X is A, B {
-	function test() internal override returns (uint256) {}
-}
-// ----
-// TypeError 6480: (205-292): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_base_base.sol b/test/libsolidity/syntaxTests/inheritance/override/override_base_base.sol
deleted file mode 100644
index a3f5ed2c722c..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_base_base.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-}
-
-abstract contract B is A {
-	function foo() internal override virtual returns (uint256);
-}
-
-abstract contract C is B {
-	function foo() internal override virtual returns (uint256);
-}
-
-abstract contract D is C {
-	function foo() internal override virtual returns (uint256);
-}
-
-contract X is D {
-	function foo() internal override returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol b/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol
deleted file mode 100644
index 59e489c226a1..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-	int public testvar;
-	function test() internal returns (uint256);
-}
-contract X is A {
-	int public override testvar;
-	function test() internal override() returns (uint256);
-}
-// ----
-// ParserError 2314: (164-165): Expected identifier but got ')'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol
deleted file mode 100644
index 72e0eaa1bfcb..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A {
-    function f() public virtual {}
-}
-abstract contract B {
-    function f() public virtual;
-}
-contract C is A, B {
-    function f() public virtual override(A, B) {
-        B.f(); // Should not skip over to A.f() just because B.f() has no implementation.
-    }
-}
-// ----
-// TypeError 7501: (185-190): Cannot call unimplemented base function.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_super.sol b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_super.sol
deleted file mode 100644
index 61d121f03e33..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_super.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function f() public virtual {}
-}
-abstract contract B {
-    function f() public virtual;
-}
-contract C is A, B {
-    function f() public override(A, B) {
-        super.f(); // super should skip the unimplemented B.f() and call A.f() instead.
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_no_call.sol b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_no_call.sol
deleted file mode 100644
index 3a9d94ea1c99..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_no_call.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function f() public virtual {}
-}
-abstract contract B {
-    function f() public virtual;
-}
-contract C is A, B {
-    function f() public override(A, B) {
-        // This is fine. The unimplemented B.f() is not used.
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_virtual_call_into_base_contract.sol b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_virtual_call_into_base_contract.sol
deleted file mode 100644
index 5321bbdb08c3..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_virtual_call_into_base_contract.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A {
-    function f() public virtual {}
-}
-abstract contract B {
-    function f() public virtual;
-}
-abstract contract C is A, B {
-    function g() public {
-        f(); // Would call B.f() if we did not require an override in C.
-    }
-}
-// ----
-// TypeError 6480: (107-243): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_with_unimplemented_then_implemented.sol b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_with_unimplemented_then_implemented.sol
deleted file mode 100644
index b1721e1647c6..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_with_unimplemented_then_implemented.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function f() public virtual {}
-}
-abstract contract B is A {
-    function f() public virtual override;
-}
-contract C is B {
-    function f() public virtual override {}
-}
-// ----
-// TypeError 4593: (81-118): Overriding an implemented function with an unimplemented function is not allowed.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_interface.sol b/test/libsolidity/syntaxTests/inheritance/override/override_interface.sol
deleted file mode 100644
index 9f26355118eb..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_interface.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface A {
-	function test() external returns (uint256);
-	function test2() external returns (uint256);
-	function test3() external returns (uint256);
-}
-contract X is A {
-	function test() external override returns (uint256) {}
-	function test2() external override(A) returns (uint256) {}
-	function test3() external returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_interface_multiple.sol b/test/libsolidity/syntaxTests/inheritance/override/override_interface_multiple.sol
deleted file mode 100644
index 9b82be89f756..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_interface_multiple.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-interface A {
-	function test() external returns (uint256);
-	function test2() external returns (uint256);
-}
-
-interface B {
-	function test() external returns (uint256);
-	function test2() external returns (uint256);
-}
-contract X is A, B {
-	function test() external override(A, B) returns (uint256) {}
-	function test2() external override(B, A) returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_less_strict_mutability.sol b/test/libsolidity/syntaxTests/inheritance/override/override_less_strict_mutability.sol
deleted file mode 100644
index 4bf72532c3fd..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_less_strict_mutability.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract A {
-	function foo() external pure virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() external pure override virtual returns (uint256) {}
-}
-contract C is A {
-	function foo() external view override virtual returns (uint256) {}
-}
-contract D is B, C {
-	function foo() external override(B, C) virtual returns (uint256) {}
-}
-contract E is C, B {
-	function foo() external pure override(B, C) virtual returns (uint256) {}
-}
-contract F is C, B {
-	function foo() external payable override(B, C) virtual returns (uint256) {}
-}
-// ----
-// TypeError 6959: (181-247): Overriding function changes state mutability from "pure" to "view".
-// TypeError 6959: (272-339): Overriding function changes state mutability from "pure" to "nonpayable".
-// TypeError 6959: (272-339): Overriding function changes state mutability from "view" to "nonpayable".
-// TypeError 6959: (461-536): Overriding function changes state mutability from "view" to "payable".
-// TypeError 6959: (461-536): Overriding function changes state mutability from "pure" to "payable".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_library.sol b/test/libsolidity/syntaxTests/inheritance/override/override_library.sol
deleted file mode 100644
index 1a8828fb2755..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library L {}
-contract C {
-	function f() public override (L) {}
-}
-// ----
-// TypeError 1130: (57-58): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_missing_virtual.sol b/test/libsolidity/syntaxTests/inheritance/override/override_missing_virtual.sol
deleted file mode 100644
index 78c3281acc16..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_missing_virtual.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract contract A {
-	function test() external virtual returns (uint256);
-	function test2() external returns (uint256) {}
-}
-abstract contract X is A {
-	function test() external returns (uint256) {}
-	function test2() external override(A) returns (uint256) {}
-}
-// ----
-// TypeError 9456: (153-198): Overriding function is missing "override" specifier.
-// TypeError 4334: (76-122): Trying to override non-virtual function. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol b/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol
deleted file mode 100644
index 9badb5428634..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract A {
-}
-abstract contract X is A {
-	modifier f() override { _; }
-}
-// ----
-// TypeError 7792: (65-73): Modifier has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
deleted file mode 100644
index 309d905d1557..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-interface IBase {
-    function foo() external view;
-}
-
-contract Base1 is IBase { function foo() public virtual view {} }
-contract Base2 is IBase { function foo() public virtual view {} }
-
-interface IExt1a is IBase {}
-interface IExt1b is IBase {}
-interface IExt2a is IBase {}
-interface IExt2b is IBase {}
-
-contract Ext1 is IExt1a, IExt1b, Base1 {}
-contract Ext2 is IExt2a, IExt2b, Base2 {}
-
-contract Impl is Ext1, Ext2 {
-    function foo() public view {}
-}
-// ----
-// TypeError 9456: (424-453): Overriding function is missing "override" specifier.
-// TypeError 9456: (424-453): Overriding function is missing "override" specifier.
-// TypeError 4327: (424-453): Function needs to specify overridden contracts "Base1", "Base2" and "IBase".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol
deleted file mode 100644
index 3c12d3ba60ad..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface IBase {
-    function foo() external view;
-}
-
-contract Base1 is IBase { function foo() public virtual view {} }
-contract Base2 is IBase { function foo() public virtual view {} }
-
-interface IExt1a is IBase {}
-interface IExt1b is IBase {}
-interface IExt2a is IBase {}
-interface IExt2b is IBase {}
-
-contract Ext1 is IExt1a, IExt1b, Base1 {}
-contract Ext2 is IExt2a, IExt2b, Base2 {}
-
-contract Impl is Ext1, Ext2 {
-    function foo() public view override (IBase, Base1, Base2) {}
-}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol
deleted file mode 100644
index 1671c9d0dd7a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-interface IBase {
-    function foo() external view;
-}
-
-contract Base1 is IBase { function foo() public virtual view {} }
-contract Base2 is IBase { function foo() public virtual view {} }
-
-interface IExt1a is IBase {}
-abstract contract IExt1b is IBase {}
-abstract contract IExt2a is IBase {}
-interface IExt2b is IBase {}
-
-contract Ext1 is IExt1a, IExt1b, Base1 {}
-contract Ext2 is IExt2a, IExt2b, Base2 {}
-
-contract Impl is Ext1, Ext2 {
-    function foo() public view override (IBase, Base1, Base2) {}
-}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple.sol
deleted file mode 100644
index 2762436ebc38..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-	function test(uint8 _a) internal virtual returns (uint256) {}
-}
-abstract contract B {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract C {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract D {
-	function foo() internal virtual returns (uint256);
-}
-contract X is A, B, C, D {
-	function test() internal override returns (uint256) {}
-	function foo() internal override(A, B, C, D) returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple2.sol
deleted file mode 100644
index 6cec3c2e7d55..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-abstract contract A {
-	int public testvar;
-	function foo() internal virtual returns (uint256);
-	function test(uint8 _a) internal virtual returns (uint256);
-}
-abstract contract B {
-	function foo() internal virtual returns (uint256);
-}
-
-abstract contract C is A {
-}
-abstract contract D is A, B, C {
-	function foo() internal override(A, B) virtual returns (uint256);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol
deleted file mode 100644
index eb3148a06359..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-	function test(uint8 _a) internal virtual returns (uint256);
-}
-abstract contract B {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract C {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract D {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract X is A, B, C, D {
-	function test() internal override(B, D, D) virtual returns (uint256);
-	function foo() internal override(A, C, B, B, B, D ,D) virtual returns (uint256);
-}
-// ----
-// TypeError 4520: (548-549): Duplicate contract "D" found in override list of "test".
-// TypeError 4520: (621-622): Duplicate contract "B" found in override list of "foo".
-// TypeError 4520: (624-625): Duplicate contract "B" found in override list of "foo".
-// TypeError 4520: (630-631): Duplicate contract "D" found in override list of "foo".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol
deleted file mode 100644
index d95c2c9f41de..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() internal returns (uint256);
-}
-contract X {
-	int public override(A,) testvar;
-}
-// ----
-// ParserError 2314: (95-96): Expected identifier but got ')'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol
deleted file mode 100644
index f2d370df6710..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() internal returns (uint256);
-}
-contract X {
-	function test() internal override(,) returns (uint256);
-}
-// ----
-// ParserError 2314: (107-108): Expected identifier but got ','
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol
deleted file mode 100644
index ee510868aa8f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() internal returns (uint256);
-}
-contract X {
-	function foo() internal override(X, address) returns (uint256);
-}
-// ----
-// ParserError 2314: (109-116): Expected identifier but got 'address'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol
deleted file mode 100644
index b63ead808aec..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() internal returns (uint256);
-}
-contract X {
-	int public override() testvar;
-}
-// ----
-// ParserError 2314: (93-94): Expected identifier but got ')'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
deleted file mode 100644
index eb28808e5665..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-	function test(uint8 _a) virtual internal returns (uint256);
-}
-abstract contract B {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract C {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract D {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract X is A, B, C, D {
-	function test() internal override(B, D, C) virtual returns (uint256);
-	function foo() internal override(A, C) virtual returns (uint256);
-}
-// ----
-// TypeError 2353: (533-550): Invalid contract specified in override list: "C".
-// TypeError 4327: (603-617): Function needs to specify overridden contracts "B" and "D".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol
deleted file mode 100644
index 4ad64b81e137..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A
-{
-	function foo() virtual internal {}
-}
-contract B
-{
-	function foo() internal {}
-}
-contract C is A, B
-{
-	function foo() internal override(A, B) {}
-}
-// ----
-// TypeError 4334: (65-91): Trying to override non-virtual function. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol
deleted file mode 100644
index f2aa79c197e0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A
-{
-	function foo() virtual internal {}
-}
-contract B
-{
-	function foo() internal {}
-}
-contract C is A, B
-{
-}
-// ----
-// TypeError 6480: (94-116): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol
deleted file mode 100644
index 98d0c04433fb..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A {
-	int public testvar;
-	function foo() internal override(N, Z) returns (uint256);
-}
-// ----
-// DeclarationError 7920: (68-69): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol b/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol
deleted file mode 100644
index f330f20c2c87..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract contract A {
-	int public testvar;
-}
-abstract contract X is A {
-	int public override testvar;
-}
-// ----
-// DeclarationError 9097: (73-100): Identifier already declared.
-// TypeError 1452: (23-41): Cannot override public state variable.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_return_mismatch.sol b/test/libsolidity/syntaxTests/inheritance/override/override_return_mismatch.sol
deleted file mode 100644
index a4a068297d2c..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_return_mismatch.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract B {
-	function foo() internal virtual returns (uint8);
-	function test() internal virtual returns (uint256);
-}
-abstract contract X is A, B {
-	function test() internal override virtual returns (uint256);
-}
-// ----
-// TypeError 6480: (203-296): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_shared_base.sol b/test/libsolidity/syntaxTests/inheritance/override/override_shared_base.sol
deleted file mode 100644
index 75bb4426f624..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_shared_base.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract I {
-	function set() public virtual {}
-}
-contract A is I {
-	uint a;
-	function set() public virtual override { a = 1; super.set(); a = 2; }
-}
-contract B is I {
-	uint b;
-	function set() public virtual override { b = 1; super.set(); b = 2; }
-
-}
-contract X is A, B {
-	function set() public override(A, B) { super.set(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_shared_base_partial.sol b/test/libsolidity/syntaxTests/inheritance/override/override_shared_base_partial.sol
deleted file mode 100644
index f167ca8988b1..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_shared_base_partial.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract I {
-  function f() external virtual {}
-}
-contract A is I {
-  function f() external virtual override {}
-}
-contract B is I {}
-contract C is A, B {
-  function f() external override(A, I) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_shared_base_simple.sol b/test/libsolidity/syntaxTests/inheritance/override/override_shared_base_simple.sol
deleted file mode 100644
index 476ddcff4108..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_shared_base_simple.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract I {
-  function f() external {}
-}
-contract A is I {}
-contract B is I {}
-contract C is A, B {}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability.sol
deleted file mode 100644
index 3c09e5722f34..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-	function foo() internal view virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() internal pure override virtual returns (uint256) {}
-}
-contract C is A {
-	function foo() internal view override virtual returns (uint256) {}
-}
-contract D is B, C {
-	function foo() internal pure override(B, C) virtual returns (uint256) {}
-}
-contract E is C, B {
-	function foo() internal pure override(B, C) virtual returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability1.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability1.sol
deleted file mode 100644
index 959774a7b9ff..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() public payable virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() public override virtual returns (uint256) {}
-}
-// ----
-// TypeError 6959: (94-153): Overriding function changes state mutability from "payable" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability2.sol
deleted file mode 100644
index 7e62c2023c43..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-	function foo() internal virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() internal view override virtual returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability3.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability3.sol
deleted file mode 100644
index e1117f2b2b91..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-	function foo() internal view virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() internal pure override virtual returns (uint256) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability4.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability4.sol
deleted file mode 100644
index da539d6df0f2..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability4.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() public payable virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() public view override virtual returns (uint256) {}
-}
-// ----
-// TypeError 6959: (94-158): Overriding function changes state mutability from "payable" to "view".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability5.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability5.sol
deleted file mode 100644
index 2c11faed9a01..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability5.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() public payable virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() public pure override virtual returns (uint256) {}
-}
-// ----
-// TypeError 6959: (94-158): Overriding function changes state mutability from "payable" to "pure".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability6.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability6.sol
deleted file mode 100644
index 8947c357afc7..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability6.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() public virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() public payable override virtual returns (uint256) {}
-}
-// ----
-// TypeError 6959: (86-153): Overriding function changes state mutability from "nonpayable" to "payable".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability7.sol b/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability7.sol
deleted file mode 100644
index c0965660891a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_stricter_mutability7.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	function foo() public view virtual returns (uint256) {}
-}
-contract B is A {
-	function foo() public payable override virtual returns (uint256) {}
-}
-// ----
-// TypeError 6959: (91-158): Overriding function changes state mutability from "view" to "payable".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol b/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol
deleted file mode 100644
index 2eacdf754a8a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-abstract contract A {
-	function foo() internal virtual returns (uint256);
-	function test(uint8 _a) internal virtual returns (uint256);
-}
-abstract contract B {
-	function foo() internal virtual returns (uint256);
-	function test() internal virtual returns (uint256);
-}
-abstract contract C {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract D {
-	function foo() internal virtual returns (uint256);
-}
-abstract contract X is A, B, C, D {
-	struct MyStruct { int abc; }
-	enum ENUM { F,G,H }
-
-	function test() internal override virtual returns (uint256);
-	function foo() internal override(MyStruct, ENUM, A, B, C, D) virtual returns (uint256);
-}
-// ----
-// TypeError 9301: (602-610): Expected contract but got struct X.MyStruct.
-// TypeError 9301: (612-616): Expected contract but got enum X.ENUM.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol
deleted file mode 100644
index 519e7b5d60c0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-  function f() public virtual {}
-}
-contract B {
-  function g() public {}
-}
-contract C is A,B {
-  function f() public override (g) {}
-}
-
-// ----
-// TypeError 9301: (140-141): Expected contract but got function ().
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_implemented_with_unimplemented.sol b/test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_implemented_with_unimplemented.sol
deleted file mode 100644
index f67be0ecea09..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_implemented_with_unimplemented.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-abstract contract A {
-    function f() external virtual;
-}
-abstract contract B {
-    function f() external virtual {}
-}
-abstract contract C is A, B {
-    function f() external virtual override(A, B);
-}
-abstract contract D is B, A {
-    function f() external virtual override(A, B);
-}
-// ----
-// TypeError 4593: (154-199): Overriding an implemented function with an unimplemented function is not allowed.
-// TypeError 4593: (236-281): Overriding an implemented function with an unimplemented function is not allowed.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_unimplemented_with_unimplemented.sol b/test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_unimplemented_with_unimplemented.sol
deleted file mode 100644
index 8c9a9f79fece..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_unimplemented_with_unimplemented.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface A {
-    function f() external;
-}
-interface B {
-    function f() external;
-}
-abstract contract C is A, B {
-    function f() external virtual override(A, B);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol
deleted file mode 100644
index 74bc4a850cbd..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C1 {
-  function f() external pure returns(int) { return 42; }
-}
-
-contract C is C1 {
-   int override f;
-}
-// ----
-// TypeError 8022: (96-110): Override can only be used with public state variables.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_constant_var_overrides_pure.sol b/test/libsolidity/syntaxTests/inheritance/override/public_constant_var_overrides_pure.sol
deleted file mode 100644
index 92f83a01f92e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_constant_var_overrides_pure.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract C {
-    function foo() external pure virtual returns (uint);
-}
-contract X is C {
-	uint public constant override foo = 7;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol b/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol
deleted file mode 100644
index 53f7170f46ae..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract C {
-    function foo() external pure virtual returns (uint);
-}
-contract X is C {
-	uint public immutable override foo = 7;
-}
-// ----
-// TypeError 6959: (100-138): Overriding public state variable changes state mutability from "pure" to "view".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol
deleted file mode 100644
index eeb2574d5384..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-interface A {
-    function foo() external returns (uint);
-    function goo() external returns (uint);
-}
-interface B {
-    function foo() external returns (uint);
-    function goo() external returns (uint);
-}
-contract X is A, B {
-	uint public override(A, B) foo;
-    function goo() external virtual override(A, B) returns (uint) {}
-}
-abstract contract T is A {
-    function foo() external virtual returns (uint);
-    function goo() external virtual returns (uint);
-}
-contract Y is X, T {
-}
-// ----
-// TypeError 6480: (466-488): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
-// TypeError 6480: (466-488): Derived contract must override function "goo". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol
deleted file mode 100644
index a8e299339c9e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface A {
-    function foo() external returns (uint);
-}
-interface B {
-    function foo() external returns (uint);
-}
-contract X is A, B {
-	uint public override(A) foo;
-}
-// ----
-// TypeError 4327: (154-165): Public state variable needs to specify overridden contract "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol
deleted file mode 100644
index 15b6e7b5d7fb..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-	function foo() internal virtual view returns(uint) { return 5; }
-}
-contract X is A {
-	uint public foo;
-}
-// ----
-// TypeError 9456: (100-115): Overriding public state variable is missing "override" specifier.
-// TypeError 5225: (100-115): Public state variables can only override functions with external visibility.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_override_mapping_to_dynamic_struct.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_override_mapping_to_dynamic_struct.sol
deleted file mode 100644
index 2769f8a928a3..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_override_mapping_to_dynamic_struct.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-
-abstract contract C {
-	struct S {
-	uint256 x;
-	string y;
-	}
-	function f(address x) external virtual returns (uint256, string memory);
-}
-contract D is C {
-	mapping(address => S) public override f;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_override_struct_with_memory_element.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_override_struct_with_memory_element.sol
deleted file mode 100644
index bb202543eb3c..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_override_struct_with_memory_element.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-abstract contract C {
-	struct S {
-		uint256 x;
-		string y;
-	}
-
-	function f() external virtual returns (uint256, string memory);
-}
-contract D is C {
-	S public override f;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol
deleted file mode 100644
index 6e78bd7224e3..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-    uint public foo;
-}
-contract X is A {
-	uint public override foo;
-}
-// ----
-// DeclarationError 9097: (55-79): Identifier already declared.
-// TypeError 1452: (17-32): Cannot override public state variable.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol
deleted file mode 100644
index 835351b3df12..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract C {
-    function foo() external pure virtual returns (uint);
-}
-contract X is C {
-	uint public override foo;
-}
-// ----
-// TypeError 6959: (100-124): Overriding public state variable changes state mutability from "pure" to "view".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_overriding_multiple.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_overriding_multiple.sol
deleted file mode 100644
index b5414aff5661..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_overriding_multiple.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface A {
-    function foo() external returns (uint);
-}
-interface B {
-    function foo() external returns (uint);
-}
-contract X is A, B {
-	uint public override(A, B) foo;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_overriding_multiple_derived.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_overriding_multiple_derived.sol
deleted file mode 100644
index 385a6ee71392..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_overriding_multiple_derived.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-interface A {
-    function foo() external returns (uint);
-}
-interface B {
-    function foo() external returns (uint);
-}
-contract X is A, B {
-	uint public override(A, B) foo;
-}
-contract Y is X {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol
deleted file mode 100644
index 3fdb7a0e3968..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface A {
-    function foo() external returns (uint);
-}
-contract B {
-    uint public foo;
-}
-contract X is A, B {
-}
-// ----
-// TypeError 6480: (96-118): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_same_name_but_different_args.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_same_name_but_different_args.sol
deleted file mode 100644
index 3a19a760842f..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_same_name_but_different_args.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-	function foo(uint) internal virtual pure returns(uint) { return 5; }
-}
-contract X is A {
-	uint public foo;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol
deleted file mode 100644
index 0e2e7cb46cda..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-interface A {
-    function foo() external returns (uint);
-}
-interface B {}
-contract X is A {
-	uint public override(A, B) foo;
-}
-// ----
-// TypeError 2353: (106-120): Invalid contract specified in override list: "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol
deleted file mode 100644
index 0222db63b34a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract B {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract X is A, B {
-	uint public override foo;
-}
-// ----
-// TypeError 4327: (196-204): Public state variable needs to specify overridden contracts "A" and "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol
deleted file mode 100644
index 7cba6cf0a965..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A {
-	uint public foo;
-}
-contract B {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract X is A, B {
-	uint public override foo;
-}
-// ----
-// DeclarationError 9097: (136-160): Identifier already declared.
-// TypeError 1452: (14-29): Cannot override public state variable.
-// TypeError 4327: (148-156): Public state variable needs to specify overridden contracts "A" and "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol
deleted file mode 100644
index 42c0a97f1d7b..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-	function foo() external virtual view returns(uint) { return 4; }
-	function foo(uint ) external virtual view returns(uint) { return 4; }
-	function foo(uint , uint ) external view virtual returns(A) {  }
-}
-contract X is A {
-	uint public override foo;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol
deleted file mode 100644
index 35e3e78ac0de..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-	function foo() external virtual view returns(A) {  }
-	function foo(uint ) external virtual view returns(uint) { return 4; }
-	function foo(uint , uint ) external view virtual returns(A) {  }
-}
-contract X is A {
-	uint public override foo;
-}
-// ----
-// TypeError 4822: (225-249): Overriding public state variable return types differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple4.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple4.sol
deleted file mode 100644
index 2370416c9546..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract ERC20 {
-  function balanceOf(address) external virtual view returns (uint) {}
-  function balanceOf(uint) external virtual view returns (uint) {}
-  function balanceOf() external virtual view returns (uint) {}
-}
-contract C is ERC20 {
-  mapping(address => uint) public override balanceOf;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol
deleted file mode 100644
index 16d5f1d52450..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract ERC20 {
-  function balanceOf(address, uint) external virtual view returns (uint) {}
-  function balanceOf(uint) external virtual view returns (uint) {}
-  function balanceOf() external virtual view returns (uint) {}
-}
-contract C is ERC20 {
-  mapping(address => uint) public override balanceOf;
-}
-// ----
-// TypeError 7792: (281-289): Public state variable has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol
deleted file mode 100644
index 67e95e129980..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract B is A {
-	function foo() external virtual override view returns(uint) { return 5; }
-}
-contract C is A {
-	function foo() external virtual override view returns(uint) { return 5; }
-}
-contract X is B, C {
-	uint public override foo;
-}
-// ----
-// TypeError 4327: (305-313): Public state variable needs to specify overridden contracts "B" and "C".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol
deleted file mode 100644
index 9830bfce7aa4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract B is A {
-	uint public override foo;
-}
-contract C is A {
-	function foo() external virtual override view returns(uint) { return 5; }
-}
-contract X is B, C {
-	uint public override foo;
-}
-// ----
-// DeclarationError 9097: (245-269): Identifier already declared.
-// TypeError 1452: (100-124): Cannot override public state variable.
-// TypeError 4327: (257-265): Public state variable needs to specify overridden contracts "B" and "C".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol
deleted file mode 100644
index 0ce74dc6bb67..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract B is A {
-	uint public override foo;
-}
-contract C is A {
-	function foo() external virtual override view returns(uint) { return 5; }
-}
-contract X is B, C {
-	uint public override(A, C) foo;
-}
-// ----
-// DeclarationError 9097: (245-275): Identifier already declared.
-// TypeError 1452: (100-124): Cannot override public state variable.
-// TypeError 4327: (257-271): Public state variable needs to specify overridden contract "B".
-// TypeError 2353: (257-271): Invalid contract specified in override list: "A".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol
deleted file mode 100644
index b0579b3075d8..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract B {
-	function foo() external virtual view returns(uint) { return 5; }
-}
-contract X is A, B {
-	uint public override(A, B) foo;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol
deleted file mode 100644
index d87c4bc46d24..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract X {
-	uint public override foo;
-}
-// ----
-// TypeError 7792: (26-34): Public state variable has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol b/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol
deleted file mode 100644
index 5d67854b1496..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract B { function f() virtual public view {} }
-contract C is B { function f() public {} }
-// ----
-// TypeError 9456: (69-91): Overriding function is missing "override" specifier.
-// TypeError 6959: (69-91): Overriding function changes state mutability from "view" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/restrict_mutability_for_override_only.sol b/test/libsolidity/syntaxTests/inheritance/override/restrict_mutability_for_override_only.sol
deleted file mode 100644
index bbcb89203ee4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/restrict_mutability_for_override_only.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-    // no "state mutability can be restricted"-warning here
-    function foo() external virtual returns (uint) { return 1; }
-}
-contract B is A {
-    // no "state mutability can be restricted"-warning here
-    function foo() external virtual override returns (uint) { return 2; }
-}
-contract C is B {
-    // warning is here
-    function foo() external override returns (uint) { return 3; }
-}
-// ----
-// Warning 2018: (339-400): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol b/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol
deleted file mode 100644
index ee89571a68f4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-	uint public x;
-}
-contract C is A {
-	function x() public returns (uint) {}
-}
-// ----
-// DeclarationError 9097: (50-87): Identifier already declared.
-// TypeError 9456: (50-87): Overriding function is missing "override" specifier.
-// TypeError 1452: (14-27): Cannot override public state variable.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol b/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol
deleted file mode 100644
index c8d4f05885e2..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A { function f() public pure virtual {} }
-contract B is A { function f() public pure virtual override {} }
-contract C is A, B { }
-contract D is A, B { function f() public pure override(A, B) {} }
-// ----
-// TypeError 6480: (116-138): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/triangle_no_impl.sol b/test/libsolidity/syntaxTests/inheritance/override/triangle_no_impl.sol
deleted file mode 100644
index 786a78df2ca6..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/triangle_no_impl.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract A { function f() public pure virtual; }
-contract B is A { function f() public pure virtual override {} }
-contract C is A, B { }
-contract D is A, B { function f() public pure override(A, B) {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/virtual_private.sol b/test/libsolidity/syntaxTests/inheritance/override/virtual_private.sol
deleted file mode 100644
index 4fa8167c1fc4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/override/virtual_private.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-	function test() private virtual returns (uint256);
-}
-abstract contract X is A {
-	function test() private override returns (uint256) {}
-}
-// ----
-// TypeError 3942: (23-73): "virtual" and "private" cannot be used together.
diff --git a/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol b/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol
deleted file mode 100644
index a871d3ce04c0..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract X {}
-contract D {
-    constructor() X(5) {}
-}
-// ----
-// TypeError 4659: (45-49): Referenced declaration is neither modifier nor base class.
diff --git a/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol b/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol
deleted file mode 100644
index 141ecee08b3a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-	uint i;
-}
-contract B is A {
-	uint i;
-}
-// ----
-// DeclarationError 9097: (43-49): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/inheritance/shadowing_private_base_state_vars.sol b/test/libsolidity/syntaxTests/inheritance/shadowing_private_base_state_vars.sol
deleted file mode 100644
index 851ef000199c..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/shadowing_private_base_state_vars.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-	uint private i;
-}
-contract B is A {
-	uint i;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/super_on_external.sol b/test/libsolidity/syntaxTests/inheritance/super_on_external.sol
deleted file mode 100644
index 1fd7483c2811..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/super_on_external.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    function f() external virtual pure {}
-}
-contract B is A {
-    function f() public override pure {
-        super.f();
-    }
-}
-// ----
-// TypeError 9582: (123-130): Member "f" not found or not visible after argument-dependent lookup in type(contract super B).
diff --git a/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol b/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
deleted file mode 100644
index 4042e0089ac2..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Base {
-  constructor(uint, uint) {}
-}
-contract Derived is Base(2) { }
-contract Derived2 is Base {
-  constructor() Base(2) { }
-}
-// ----
-// TypeError 7927: (67-74): Wrong argument count for constructor call: 1 arguments given but expected 2
-// TypeError 2973: (123-130): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol b/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol
deleted file mode 100644
index 92c2a81c7119..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract C {
-	function f() external;
-}
-// ----
-// TypeError 5424: (23-45): Functions without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol b/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol
deleted file mode 100644
index 63da78464912..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function foo() virtual public virtual {}
-	modifier modi() virtual virtual {_;}
-}
-// ----
-// ParserError 6879: (44-51): Virtual already specified.
-// ParserError 2662: (80-87): Virtual already specified.
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol b/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol
deleted file mode 100644
index 7c2e1bbce9c4..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f() internal pure virtual returns (uint) { return 0; }
-}
-// ----
-// TypeError 7801: (16-79): Library functions cannot be "virtual".
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol b/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol
deleted file mode 100644
index 85824c86b776..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library test {
-    modifier m virtual;
-    function f() m public {
-    }
-}
-// ----
-// TypeError 3275: (19-38): Modifiers in a library cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/simple.sol b/test/libsolidity/syntaxTests/inheritance/virtual/simple.sol
deleted file mode 100644
index 892118a13d2a..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/virtual/simple.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C
-{
-	function foo() public virtual {}
-	function foo2() virtual public {}
-	modifier modi() virtual {_;}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol b/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol
deleted file mode 100644
index 6f85c2c0ad7e..000000000000
--- a/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Base {
-  constructor(uint8) {}
-}
-contract Derived is Base(300) { }
-contract Derived2 is Base {
-  constructor() Base(2) { }
-}
-// ----
-// TypeError 9827: (67-70): Invalid type for argument in constructor call. Invalid implicit conversion from int_const 300 to uint8 requested. Literal is too large to fit in uint8.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol
deleted file mode 100644
index 7e0672f65d83..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure {
-    assembly "evmasm" ("memory-safe", "memory-safe") {}
-}
-// ----
-// SyntaxError 7026: (24-75): Inline assembly marked memory-safe multiple times.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol
deleted file mode 100644
index 44206c9ece8f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function f() pure {
-    assembly "evmasm" ("a", "b", "c", "c") {}
-}
-// ----
-// Warning 4430: (24-65): Unknown inline assembly flag: "a"
-// Warning 4430: (24-65): Unknown inline assembly flag: "b"
-// Warning 4430: (24-65): Unknown inline assembly flag: "c"
-// Warning 4430: (24-65): Unknown inline assembly flag: "c"
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
deleted file mode 100644
index 1cf1e7fb9447..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure {
-    assembly " evmasm" {}
-}
-// ----
-// ParserError 4531: (33-42): Only "evmasm" supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol
deleted file mode 100644
index 69c503559895..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure {
-    assembly ("memory-safe", "memory-safe") {}
-}
-// ----
-// SyntaxError 7026: (24-66): Inline assembly marked memory-safe multiple times.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
deleted file mode 100644
index cae17320b9aa..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure {
-    assembly () {}
-}
-// ----
-// ParserError 2314: (34-35): Expected 'StringLiteral' but got ')'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
deleted file mode 100644
index 222e59b930da..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure {
-    assembly "evmasm" () {}
-}
-// ----
-// ParserError 2314: (43-44): Expected 'StringLiteral' but got ')'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
deleted file mode 100644
index cd82f8aaa40e..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() pure {
-	assembly ("a" "b") {}
-}
-// ----
-// ParserError 2314: (35-38): Expected ')' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
deleted file mode 100644
index 3364d793e827..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function f() pure {
-    assembly ("a", "b", "c", "c") {}
-}
-// ----
-// Warning 4430: (24-56): Unknown inline assembly flag: "a"
-// Warning 4430: (24-56): Unknown inline assembly flag: "b"
-// Warning 4430: (24-56): Unknown inline assembly flag: "c"
-// Warning 4430: (24-56): Unknown inline assembly flag: "c"
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol
deleted file mode 100644
index dd2eac18a908..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := C
-    }
-  }
-}
-// ----
-// TypeError 4977: (72-73): Expected a library.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol
deleted file mode 100644
index da597ef4c8b4..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := f
-    }
-  }
-}
-// ----
-// DeclarationError 2025: (72-73): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol
deleted file mode 100644
index aedf53ea81a3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {}
-    constructor() {
-        assembly {
-            let x := f
-        }
-    }
-}
-// ----
-// DeclarationError 2025: (105-106): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
deleted file mode 100644
index 014a4dd455cd..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function ff() {}
-
-contract C {
-  function f() public pure {
-    assembly {
-      let x := ff
-    }
-  }
-}
-// ----
-// DeclarationError 2025: (90-92): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_library.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_library.sol
deleted file mode 100644
index 522ca801d975..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_library.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L {
-}
-
-contract C {
-  function f() public pure {
-    assembly {
-      let x := L
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
deleted file mode 100644
index cb675ab29128..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        uint mload;
-        assembly {
-            let x := mload
-        }
-    }
-}
-// ----
-// ParserError 7104: (104-109): Builtin function "mload" must be called.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol
deleted file mode 100644
index c5a5750b54a3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := super
-    }
-  }
-}
-// ----
-// DeclarationError 8198: (72-77): Identifier "super" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol
deleted file mode 100644
index 46e56ffcbd3c..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        uint x; uint y;
-        assembly { x, y := 7 }
-    }
-}
-// ----
-// DeclarationError 8678: (87-96): Variable count for assignment to "x, y" does not match number of values (2 vs. 1)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
deleted file mode 100644
index 38e88eeeb6a4..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        function() external g;
-        assembly {
-            g.address := 0x42
-            g.selector := 0x23
-        }
-    }
-}
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
deleted file mode 100644
index 51028e50c52b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        uint mload;
-        assembly {
-            mload := 1
-        }
-    }
-}
-// ----
-// ParserError 6272: (101-103): Cannot assign to builtin function "mload".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol
deleted file mode 100644
index c037764de3c4..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-  function f() public {
-    assembly {
-      super := 1
-      this := 1
-      msg := 1
-      block := 1
-      f := 1
-      C := 1
-    }
-  }
-}
-// ----
-// DeclarationError 4634: (58-63): Variable not found or variable not lvalue.
-// DeclarationError 4634: (75-79): Variable not found or variable not lvalue.
-// DeclarationError 4634: (91-94): Variable not found or variable not lvalue.
-// DeclarationError 4634: (106-111): Variable not found or variable not lvalue.
-// TypeError 1990: (123-124): Only local variables can be assigned to in inline assembly.
-// TypeError 1990: (136-137): Only local variables can be assigned to in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol b/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol
deleted file mode 100644
index 00ecaf01a426..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public view returns (uint ret) {
-        assembly {
-            let basefee := sload(0)
-            ret := basefee
-        }
-    }
-}
-// ====
-// EVMVersion: =london
-// ----
-// ParserError 5568: (98-105): Cannot use builtin function name "basefee" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol b/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol
deleted file mode 100644
index a87473239ede..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    bytes32 constant x = x;
-    function f() public pure returns (uint t) {
-        assembly {
-            // Reference to a circular member
-            t := x
-        }
-    }
-}
-// ----
-// TypeError 3558: (171-172): Constant variable is circular.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol b/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol
deleted file mode 100644
index 75f1ba6671fa..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: a ====
-import "b";
-uint constant c = d;
-==== Source: b ====
-import "a" as M;
-uint constant b = M.c;
-uint constant d = b;
-contract C {
-    uint constant a = b;
-    function f() public returns (uint t) {
-        assembly {
-            t := a
-        }
-    }
-}
-// ----
-// TypeError 3558: (b:178-179): Constant variable is circular.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol b/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol
deleted file mode 100644
index 8d79f6e6960a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: a ====
-bytes32 constant x = x;
-==== Source: b ====
-import "a";
-contract C {
-    function f() public pure returns (uint t) {
-        assembly {
-            // Reference to a circular member
-            t := x
-        }
-    }
-}
-// ----
-// TypeError 3558: (b:155-156): Constant variable is circular.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/const_forward_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/const_forward_reference.sol
deleted file mode 100644
index 6cadfb69ee47..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/const_forward_reference.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      pop(add(add(1, 2), c))
-    }
-  }
-  int constant c = 1;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol b/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol
deleted file mode 100644
index 709922dd35bc..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  bool nc = false;
-  bool constant c = nc;
-  function f() public {
-    assembly {
-        let t := c
-    }
-  }
-}
-// ----
-// TypeError 8349: (52-54): Initial value for constant variable has to be compile-time constant.
-// TypeError 7615: (112-113): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol b/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol
deleted file mode 100644
index 76a05592ebcb..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  bool constant c = this;
-  function f() public {
-    assembly {
-        let t := c
-    }
-  }
-}
-// ----
-// TypeError 7407: (33-37): Type contract C is not implicitly convertible to expected type bool.
-// TypeError 8349: (33-37): Initial value for constant variable has to be compile-time constant.
-// TypeError 7615: (95-96): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_access.sol
deleted file mode 100644
index 9389c87afb13..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_access.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint constant x = 2**20;
-    bool constant b = true;
-    bytes4 constant s = "ab";
-    function f() public pure {
-        assembly {
-            let c1 := x
-            let c2 := b
-            let c3 := s
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol
deleted file mode 100644
index cc439cf04baf..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint constant x;
-    function f() public pure {
-        assembly {
-            let c1 := x
-        }
-    }
-}
-// ----
-// TypeError 4266: (17-32): Uninitialized "constant" variable.
-// TypeError 3224: (106-107): Constant has no value.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol
deleted file mode 100644
index 0787a6795c2d..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    string constant x = "abc";
-    function f() public pure {
-        assembly {
-            let a := x
-        }
-    }
-}
-// ----
-// TypeError 7615: (115-116): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol
deleted file mode 100644
index 23974658cba2..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    bytes32 constant x = keccak256("abc");
-    bytes32 constant y = x;
-    function f() public pure returns (uint t) {
-        assembly {
-            t := y
-        }
-    }
-}
-// ----
-// TypeError 7615: (168-169): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_computation.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_computation.sol
deleted file mode 100644
index fc0605704015..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_computation.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint constant x = 2**20;
-    function f() public pure {
-        assembly {
-            let a := x
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_ref.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_ref.sol
deleted file mode 100644
index dbde5cfa3e09..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_ref.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint constant a = 2;
-    uint constant b = a;
-    function f() public pure {
-        assembly {
-            let x := b
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_post_istanbul.sol b/test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_post_istanbul.sol
deleted file mode 100644
index 96a384c54d20..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_post_istanbul.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-	function f() public {
-		uint create2; create2;
-		assembly { pop(create2(0, 0, 0, 0)) }
-	}
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_pre_istanbul.sol b/test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_pre_istanbul.sol
deleted file mode 100644
index 50093c42aa0d..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_pre_istanbul.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract c {
-	function f() public {
-		uint create2; create2;
-		assembly { pop(create2(0, 0, 0, 0)) }
-	}
-}
-// ====
-// EVMVersion: =byzantium
-// ----
-// TypeError 6166: (78-85): The "create2" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// TypeError 3950: (78-97): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol
deleted file mode 100644
index 13ea92c52639..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public view returns (uint256) {
-        return block.difficulty;
-    }
-
-    function g() public view returns (uint256 ret) {
-        assembly {
-            ret := difficulty()
-        }
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol
deleted file mode 100644
index a177e8f63099..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public view returns (uint256 ret) {
-        assembly {
-            let difficulty := sload(0)
-            ret := difficulty
-        }
-    }
-
-    function g() public pure returns (uint256 ret) {
-        assembly {
-            function difficulty() -> r {
-                r := 1000
-            }
-            ret := difficulty()
-        }
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
-// ParserError 5568: (101-111): Cannot use builtin function name "difficulty" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol
deleted file mode 100644
index 8fb75340e1b7..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint256) {
-        return block.difficulty;
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// Warning 8417: (77-93): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol
deleted file mode 100644
index 65fe4c15c158..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            pop(difficulty())
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// DeclarationError 4619: (74-84): Function "difficulty" not found.
-// TypeError 3950: (74-86): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol
deleted file mode 100644
index 5121a110ba09..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function f() public view returns (uint256 ret) {
-        assembly {
-            let difficulty := sload(0)
-            ret := difficulty
-        }
-    }
-
-    function g() public pure returns (uint256 ret) {
-        assembly {
-            function difficulty() -> r {
-                r := 1000
-            }
-            ret := difficulty()
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// DeclarationError 5017: (101-111): The identifier "difficulty" is reserved and can not be used.
-// DeclarationError 5017: (255-323): The identifier "difficulty" is reserved and can not be used.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
deleted file mode 100644
index b08172ebe469..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() pure external {
-        assembly {
-            let s := returndatasize()
-            returndatacopy(0, 0, s)
-        }
-    }
-    function g() view external returns (uint ret) {
-        assembly {
-            ret := staticcall(0, gas(), 0, 0, 0, 0)
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
deleted file mode 100644
index 74316c526301..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() pure external {
-        assembly {
-            let s := returndatasize()
-            returndatacopy(0, 0, s)
-        }
-    }
-    function g() view external returns (uint ret) {
-        assembly {
-            ret := staticcall(0, gas(), 0, 0, 0, 0)
-        }
-    }
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// TypeError 4778: (86-100): The "returndatasize" instruction is only available for Byzantium-compatible VMs (you are currently compiling for "homestead").
-// DeclarationError 3812: (77-102): Variable count mismatch for declaration of "s": 1 variables and 0 values.
-// TypeError 7756: (115-129): The "returndatacopy" instruction is only available for Byzantium-compatible VMs (you are currently compiling for "homestead").
-// TypeError 1503: (245-255): The "staticcall" instruction is only available for Byzantium-compatible VMs (you are currently compiling for "homestead").
-// DeclarationError 8678: (238-277): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol
deleted file mode 100644
index 2aff4351ae8b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function f() view external returns (uint ret) {
-        assembly {
-            ret := shl(gas(), 5)
-            ret := shr(ret, 2)
-            ret := sar(ret, 2)
-        }
-    }
-    function g() external returns (address ret) {
-        assembly {
-            ret := create2(0, 0, 0, 0)
-        }
-    }
-    function h() view external returns (bytes32 ret) {
-        assembly {
-            ret := extcodehash(address())
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol
deleted file mode 100644
index 80b14d4d0b96..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    function f() view external returns (uint ret) {
-        assembly {
-            ret := shl(gas(), 5)
-            ret := shr(ret, 2)
-            ret := sar(ret, 2)
-        }
-    }
-    function g() external returns (address ret) {
-        assembly {
-            ret := create2(0, 0, 0, 0)
-        }
-    }
-    function h() view external returns (bytes32 ret) {
-        assembly {
-            ret := extcodehash(address())
-        }
-    }
-}
-// ====
-// EVMVersion: =byzantium
-// ----
-// TypeError 6612: (103-106): The "shl" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// DeclarationError 8678: (96-116): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
-// TypeError 7458: (136-139): The "shr" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// DeclarationError 8678: (129-147): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
-// TypeError 2054: (167-170): The "sar" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// DeclarationError 8678: (160-178): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
-// TypeError 6166: (283-290): The "create2" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// DeclarationError 8678: (276-302): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
-// TypeError 7110: (412-423): The "extcodehash" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// DeclarationError 8678: (405-434): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_istanbul.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_istanbul.sol
deleted file mode 100644
index f28f3ca0d4d9..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_istanbul.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() view external returns (uint id) {
-        assembly {
-            id := chainid()
-        }
-    }
-    function g() view external returns (uint sb) {
-        assembly {
-            sb := selfbalance()
-        }
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_istanbul_on_petersburg.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_istanbul_on_petersburg.sol
deleted file mode 100644
index 95af42317d1b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_istanbul_on_petersburg.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f() pure external returns (uint id) {
-        assembly {
-            id := chainid()
-        }
-    }
-    function g() view external returns (uint sb) {
-        assembly {
-            sb := selfbalance()
-        }
-    }
-}
-// ====
-// EVMVersion: =petersburg
-// ----
-// TypeError 1561: (101-108): The "chainid" instruction is only available for Istanbul-compatible VMs (you are currently compiling for "petersburg").
-//  DeclarationError 8678: (95-110): Variable count for assignment to "id" does not match number of values (1 vs. 0)
-// TypeError 7721: (215-226): The "selfbalance" instruction is only available for Istanbul-compatible VMs (you are currently compiling for "petersburg").
-// DeclarationError 8678: (209-228): Variable count for assignment to "sb" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_post_constantinople.sol b/test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_post_constantinople.sol
deleted file mode 100644
index 8b34ab906d4a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_post_constantinople.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-	function f() public view {
-		uint extcodehash;
-		extcodehash;
-		assembly { pop(extcodehash(0)) }
-	}
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_pre_constantinople.sol b/test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_pre_constantinople.sol
deleted file mode 100644
index 62432b4dca76..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_pre_constantinople.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract c {
-	function f() public view {
-		uint extcodehash;
-		extcodehash;
-		assembly { pop(extcodehash(0)) }
-	}
-}
-// ====
-// EVMVersion: =byzantium
-// ----
-// TypeError 7110: (93-104): The "extcodehash" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// TypeError 3950: (93-107): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol b/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol
deleted file mode 100644
index fb073bd382ff..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public returns (uint x) {
-        assembly {
-            function g() -> x {
-                x := 42
-            }
-            x := g()
-        }
-    }
-}
-// ----
-// DeclarationError 6578: (123-124): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol
deleted file mode 100644
index f3b35f8a3b19..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f(a) {}
-
-      f()
-      f(1)
-      f(1, 2)
-    }
-  }
-}
-// ----
-// TypeError 7000: (87-88): Function "f" expects 1 arguments but got 0.
-// TypeError 7000: (108-109): Function "f" expects 1 arguments but got 2.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol
deleted file mode 100644
index cc74edfcea68..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      k()
-    }
-  }
-}
-// ----
-// DeclarationError 4619: (63-64): Function "k" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol
deleted file mode 100644
index f6f3573f6cfe..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := 1
-
-      x()
-    }
-  }
-}
-// ----
-// TypeError 4202: (81-82): Attempt to call variable instead of function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_definition.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_definition.sol
deleted file mode 100644
index 4ad606f54178..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_definition.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() pure public {
-    assembly {
-      function f (a, b  , c ) ->    y,x,z {
-      }
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol
deleted file mode 100644
index d3c56f3e2ea1..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() pure public {
-    assembly {
-      function f (a, b  , c ) -     >    y,x,z {
-      }
-    }
-  }
-}
-// ----
-// ParserError 2314: (87-88): Expected '{' but got '-'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol
deleted file mode 100644
index 86d0a960576b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function k() {}
-
-      k
-    }
-  }
-}
-// ----
-// ParserError 6913: (92-93): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/hex_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/hex_assignment.sol
deleted file mode 100644
index d8fdb0f9f7d8..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/hex_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := hex"0011"
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/hex_expression.sol b/test/libsolidity/syntaxTests/inlineAssembly/hex_expression.sol
deleted file mode 100644
index 36a9a519d391..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/hex_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      pop(hex"2233")
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/hex_switch_case.sol b/test/libsolidity/syntaxTests/inlineAssembly/hex_switch_case.sol
deleted file mode 100644
index 038e8c4ff99e..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/hex_switch_case.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      switch codesize()
-      case hex"00" {}
-      case hex"1122" {}
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol b/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol
deleted file mode 100644
index f4e20f8b959a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      setimmutable("abc", 0)
-      loadimmutable("abc")
-    }
-  }
-}
-// ----
-// DeclarationError 4619: (63-75): Function "setimmutable" not found.
-// DeclarationError 4619: (92-105): Function "loadimmutable" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/in_modifier.sol b/test/libsolidity/syntaxTests/inlineAssembly/in_modifier.sol
deleted file mode 100644
index 87a7b28d04d4..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/in_modifier.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    modifier m {
-        uint a = 1;
-        assembly {
-            a := 2
-        }
-        _;
-    }
-    function f() public m {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol
deleted file mode 100644
index b4603f54c4ae..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let mod := 2
-    }
-  }
-}
-// ----
-// ParserError 5568: (67-70): Cannot use builtin function name "mod" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol
deleted file mode 100644
index 9ce487295b3b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            function f() {}
-            f := 1
-        }
-    }
-}
-// ----
-// TypeError 2657: (103-104): Assignment requires variable.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
deleted file mode 100644
index 87884efeecde..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() view public {
-        assembly {
-            address
-            pop
-        }
-    }
-}
-// ----
-// ParserError 6913: (95-98): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol
deleted file mode 100644
index 5262b68ecc5e..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint[] calldata bytesAsCalldata) external {
-        assembly {
-            let x := bytesAsCalldata
-        }
-    }
-}
-// ----
-// TypeError 1397: (112-127): Call data elements cannot be accessed directly. Use ".offset" and ".length" to access the calldata offset and length of this array and then use "calldatacopy".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array_offset.sol
deleted file mode 100644
index b6a2844f7144..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array_offset.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint[] calldata bytesAsCalldata) external pure {
-        assembly {
-            let x := bytesAsCalldata.offset
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol
deleted file mode 100644
index 4af7fa91e371..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(bytes calldata bytesAsCalldata) external {
-        assembly {
-            let x := bytesAsCalldata.slot
-        }
-    }
-}
-// ----
-// TypeError 1536: (111-131): Calldata variables only support ".offset" and ".length".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol
deleted file mode 100644
index 07562ad272e0..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(bytes calldata bytesAsCalldata) external {
-        assembly {
-            let x := bytesAsCalldata
-        }
-    }
-}
-// ----
-// TypeError 1397: (111-126): Call data elements cannot be accessed directly. Use ".offset" and ".length" to access the calldata offset and length of this array and then use "calldatacopy".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol
deleted file mode 100644
index 295bc927d379..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  function f() {
-    assembly {
-      c := add(add(1, 2), c)
-    }
-  }
-  int constant c = 0 + 1;
-}
-// ----
-// SyntaxError 4937: (15-83): No visibility specified. Did you intend to add "public"?
-// TypeError 2249: (71-72): Constant variables with non-literal values cannot be forward referenced from inline assembly.
-// TypeError 6252: (51-52): Constant variables cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_access.sol
deleted file mode 100644
index bde3dca769c1..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    uint constant x = 1;
-    function f() public pure {
-        assembly {
-            let y := x
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol
deleted file mode 100644
index 9df1f4d3c992..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    uint constant x = 1;
-    function f() public {
-        assembly {
-            x := 2
-        }
-    }
-}
-// ----
-// TypeError 6252: (98-99): Constant variables cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol
deleted file mode 100644
index eda71f955440..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-	uint constant x = 2;
-	function f() public pure {
-		assembly {
-			let y := x.length
-		}
-	}
-}
-// ----
-// TypeError 3622: (91-99): The suffix ".length" is not supported by this variable or type.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
deleted file mode 100644
index eab2d2b4ef2f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    uint constant x = 2;
-    function f() pure public {
-        assembly {
-            let r := x.offset
-        }
-    }
-}
-// ----
-// TypeError 6617: (112-120): The suffixes .offset and .slot can only be used on non-constant storage variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol
deleted file mode 100644
index e6644e9da685..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f(a., x.b) -> t.b, b.. {}
-    }
-  }
-}
-// ----
-// DeclarationError 3927: (74-76): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (78-81): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (86-89): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (91-94): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol
deleted file mode 100644
index 2e8118b78784..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f.() {}
-      function g.f() {}
-    }
-  }
-}
-// ----
-// DeclarationError 3927: (63-79): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (86-103): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol
deleted file mode 100644
index 58efb2de6402..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f() -> x, y, z {}
-      let a., aa.b := f()
-    }
-  }
-}
-// ----
-// DeclarationError 3927: (100-102): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (104-108): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol
deleted file mode 100644
index 0537afb74466..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let a. := 2
-      let a.. := 2
-      let a.b := 2
-      let a..b := 2
-    }
-  }
-}
-// ----
-// DeclarationError 3927: (67-69): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (85-88): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (104-107): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (123-127): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol
deleted file mode 100644
index 63e89a242589..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            dup0()
-            dup1()
-            dup2()
-            dup3()
-            dup4()
-            dup5()
-            dup6()
-            dup7()
-            dup8()
-            dup9()
-            dup10()
-            dup11()
-            dup12()
-            dup13()
-            dup14()
-            dup15()
-            dup16()
-            dup32()
-        }
-    }
-}
-// ----
-// DeclarationError 4619: (75-79): Function "dup0" not found.
-// DeclarationError 4619: (94-98): Function "dup1" not found.
-// DeclarationError 4619: (113-117): Function "dup2" not found.
-// DeclarationError 4619: (132-136): Function "dup3" not found.
-// DeclarationError 4619: (151-155): Function "dup4" not found.
-// DeclarationError 4619: (170-174): Function "dup5" not found.
-// DeclarationError 4619: (189-193): Function "dup6" not found.
-// DeclarationError 4619: (208-212): Function "dup7" not found.
-// DeclarationError 4619: (227-231): Function "dup8" not found.
-// DeclarationError 4619: (246-250): Function "dup9" not found.
-// DeclarationError 4619: (265-270): Function "dup10" not found.
-// DeclarationError 4619: (285-290): Function "dup11" not found.
-// DeclarationError 4619: (305-310): Function "dup12" not found.
-// DeclarationError 4619: (325-330): Function "dup13" not found.
-// DeclarationError 4619: (345-350): Function "dup14" not found.
-// DeclarationError 4619: (365-370): Function "dup15" not found.
-// DeclarationError 4619: (385-390): Function "dup16" not found.
-// DeclarationError 4619: (405-410): Function "dup32" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol
deleted file mode 100644
index a2e938698cb6..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f(a, b) {}
-      f()
-      f(,1)
-    }
-  }
-}
-// ----
-// ParserError 1856: (101-102): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol
deleted file mode 100644
index be95849c3680..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f(a, b) {}
-      f()
-      f(1,)
-    }
-  }
-}
-// ----
-// ParserError 1856: (103-104): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol
deleted file mode 100644
index 00bdac65e061..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f(a, b, c) {}
-      f(1,,1)
-    }
-  }
-}
-// ----
-// ParserError 1856: (96-97): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol
deleted file mode 100644
index a6dba71efcb3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function (a, b) {}
-    }
-  }
-}
-// ----
-// ParserError 2314: (72-73): Expected identifier but got '('
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol
deleted file mode 100644
index f6abe29765ff..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-	function testFunction() external {}
-
-	function testYul() public {
-		function() external fp = this.testFunction;
-
-		uint myOffset;
-
-		assembly {
-			myOffset := fp.offset
-		}
-	}
-}
-// ----
-// TypeError 9272: (173-182): Variables of type function pointer only support ".selector" and ".address".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol
deleted file mode 100644
index 0122dc4dbaf3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let a, .a, aa.b := f()
-    }
-  }
-}
-// ----
-// ParserError 2314: (70-71): Expected identifier but got '.'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol
deleted file mode 100644
index 6c41b22964ab..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-contract C {
-    function f() public {
-        // reserved function names
-        assembly {
-            function this() {
-            }
-            function super() {
-            }
-            function _() {
-            }
-        }
-
-        // reserved names as function argument
-        assembly {
-            function a(this) {
-            }
-            function b(super) {
-            }
-            function c(_) {
-            }
-        }
-
-        // reserved names as function return parameter
-        assembly {
-            function d() -> this {
-            }
-            function g() -> super {
-            }
-            function c() -> _ {
-            }
-        }
-
-        // reserved names as variable declaration
-        assembly {
-            let this := 1
-            let super := 1
-            let _ := 1
-        }
-    }
-}
-// ----
-// DeclarationError 4113: (105-136): The identifier name "this" is reserved.
-// DeclarationError 4113: (149-181): The identifier name "super" is reserved.
-// DeclarationError 4113: (194-222): The identifier name "_" is reserved.
-// DeclarationError 4113: (323-327): The identifier name "this" is reserved.
-// DeclarationError 4113: (368-373): The identifier name "super" is reserved.
-// DeclarationError 4113: (414-415): The identifier name "_" is reserved.
-// DeclarationError 4113: (546-550): The identifier name "this" is reserved.
-// DeclarationError 4113: (595-600): The identifier name "super" is reserved.
-// DeclarationError 4113: (645-646): The identifier name "_" is reserved.
-// DeclarationError 4113: (759-763): The identifier name "this" is reserved.
-// DeclarationError 3859: (759-763): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (785-790): The identifier name "super" is reserved.
-// DeclarationError 3859: (785-790): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (812-813): The identifier name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol
deleted file mode 100644
index c252657caff1..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-	function testFunction() internal {}
-
-	function testYul() public returns (address adr) {
-		function() internal fp = testFunction;
-		uint selectorValue = 0;
-
-		assembly {
-			adr := fp.address
-		}
-	}
-	function testSol() public returns (address) {
-		return testFunction.address;
-	}
-}
-// ----
-// TypeError 8533: (193-203): Only Variables of type external function pointer support ".selector" and ".address".
-// TypeError 9582: (267-287): Member "address" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol
deleted file mode 100644
index 4913bf5d6ba9..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-	function testFunction() internal {}
-
-	function testYul() public returns (uint32) {
-		function() internal fp = testFunction;
-		uint selectorValue = 0;
-
-		assembly {
-			selectorValue := fp.selector
-		}
-
-		return uint32(bytes4(bytes32(selectorValue)));
-	}
-	function testSol() public returns (uint32) {
-		return uint32(testFunction.selector);
-	}
-}
-// ----
-// TypeError 8533: (198-209): Only Variables of type external function pointer support ".selector" and ".address".
-// TypeError 9582: (329-350): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol
deleted file mode 100644
index 1ba49bc39364..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := 0100
-    }
-  }
-}
-// ----
-// ParserError 1465: (72-73): Illegal token: Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol
deleted file mode 100644
index 9d79776d88ec..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            jump(2)
-        }
-    }
-}
-// ----
-// DeclarationError 4619: (75-79): Function "jump" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol
deleted file mode 100644
index 364d981bd2eb..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            jumpdest()
-        }
-    }
-}
-// ----
-// DeclarationError 4619: (75-83): Function "jumpdest" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol
deleted file mode 100644
index 4271842e0dbc..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            jumpi(2, 1)
-        }
-    }
-}
-// ----
-// DeclarationError 4619: (75-80): Function "jumpi" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol
deleted file mode 100644
index cfe0d1c3dd0b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            label:
-        }
-    }
-}
-// ----
-// ParserError 6913: (80-81): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol
deleted file mode 100644
index dec7911c6da3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            mload(0)
-        }
-    }
-}
-// ----
-// TypeError 3083: (75-83): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol
deleted file mode 100644
index 91348e801db2..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            1
-        }
-    }
-}
-// ----
-// ParserError 6913: (85-86): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol
deleted file mode 100644
index b7b07fb168a1..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public {
-        uint a;
-        assembly {
-            function g() -> x { x := a }
-        }
-    }
-}
-// ----
-// DeclarationError 6578: (114-115): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol
deleted file mode 100644
index 24cc283b1238..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    uint[] r;
-    function f() public {
-        uint[] storage a = r;
-        assembly {
-            function g() -> x { x := a.offset }
-        }
-    }
-}
-// ----
-// DeclarationError 6578: (142-150): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol
deleted file mode 100644
index e3d822539d93..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      x := 1
-    }
-  }
-}
-// ----
-// DeclarationError 4634: (63-64): Variable not found or variable not lvalue.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol
deleted file mode 100644
index 901df4ad5f18..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x := mload(0)
-      := 1
-    }
-  }
-}
-// ----
-// ParserError 1856: (87-89): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol
deleted file mode 100644
index cb5e5c560680..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function g() -> a,b, c {}
-      let a, sub, mov := g()
-    }
-  }
-}
-// ----
-// ParserError 5568: (102-105): Cannot use builtin function name "sub" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol
deleted file mode 100644
index 6a2f9142275b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  function f() public pure returns (uint x) {
-    assembly {
-      function f1() {
-        function f2() { }
-        x := 2
-      }
-    }
-  }
-}
-// ----
-// DeclarationError 6578: (130-131): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol
deleted file mode 100644
index 816bb1c0d5f4..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f() pure public {
-		assembly {
-			pop(pc())
-		}
-	}
-}
-// ----
-// SyntaxError 2450: (61-63): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol
deleted file mode 100644
index 0e73c1184f2e..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol
+++ /dev/null
@@ -1,73 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            push0()
-            push1()
-            push2()
-            push3()
-            push4()
-            push5()
-            push6()
-            push7()
-            push8()
-            push9()
-            push10()
-            push11()
-            push12()
-            push13()
-            push14()
-            push15()
-            push16()
-            push17()
-            push18()
-            push19()
-            push20()
-            push21()
-            push22()
-            push23()
-            push24()
-            push25()
-            push26()
-            push27()
-            push28()
-            push29()
-            push30()
-            push31()
-            push32()
-        }
-    }
-}
-// ----
-// DeclarationError 4619: (75-80): Function "push0" not found.
-// DeclarationError 4619: (95-100): Function "push1" not found.
-// DeclarationError 4619: (115-120): Function "push2" not found.
-// DeclarationError 4619: (135-140): Function "push3" not found.
-// DeclarationError 4619: (155-160): Function "push4" not found.
-// DeclarationError 4619: (175-180): Function "push5" not found.
-// DeclarationError 4619: (195-200): Function "push6" not found.
-// DeclarationError 4619: (215-220): Function "push7" not found.
-// DeclarationError 4619: (235-240): Function "push8" not found.
-// DeclarationError 4619: (255-260): Function "push9" not found.
-// DeclarationError 4619: (275-281): Function "push10" not found.
-// DeclarationError 4619: (296-302): Function "push11" not found.
-// DeclarationError 4619: (317-323): Function "push12" not found.
-// DeclarationError 4619: (338-344): Function "push13" not found.
-// DeclarationError 4619: (359-365): Function "push14" not found.
-// DeclarationError 4619: (380-386): Function "push15" not found.
-// DeclarationError 4619: (401-407): Function "push16" not found.
-// DeclarationError 4619: (422-428): Function "push17" not found.
-// DeclarationError 4619: (443-449): Function "push18" not found.
-// DeclarationError 4619: (464-470): Function "push19" not found.
-// DeclarationError 4619: (485-491): Function "push20" not found.
-// DeclarationError 4619: (506-512): Function "push21" not found.
-// DeclarationError 4619: (527-533): Function "push22" not found.
-// DeclarationError 4619: (548-554): Function "push23" not found.
-// DeclarationError 4619: (569-575): Function "push24" not found.
-// DeclarationError 4619: (590-596): Function "push25" not found.
-// DeclarationError 4619: (611-617): Function "push26" not found.
-// DeclarationError 4619: (632-638): Function "push27" not found.
-// DeclarationError 4619: (653-659): Function "push28" not found.
-// DeclarationError 4619: (674-680): Function "push29" not found.
-// DeclarationError 4619: (695-701): Function "push30" not found.
-// DeclarationError 4619: (716-722): Function "push31" not found.
-// DeclarationError 4619: (737-743): Function "push32" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
deleted file mode 100644
index b01f1ee21fbe..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    uint x = 1;
-    function f() public {
-        assembly {
-            x := 2
-        }
-    }
-}
-// ----
-// TypeError 1408: (89-90): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
deleted file mode 100644
index 64cfc862362a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    uint x = 1;
-    modifier m {
-        assembly {
-            x := 2
-        }
-        _;
-    }
-    function f() public m {
-    }
-}
-// ----
-// TypeError 1408: (80-81): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol
deleted file mode 100644
index ba0ef195ca98..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    uint x = 1;
-    function f() public {
-        assembly {
-            let t := x.length
-            x.length := 2
-        }
-    }
-}
-// ----
-// TypeError 4656: (98-106): State variables only support ".slot" and ".offset".
-// TypeError 4656: (119-127): State variables only support ".slot" and ".offset".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_variable_access_out_of_functions.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_variable_access_out_of_functions.sol
deleted file mode 100644
index 1b2f085e5907..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_variable_access_out_of_functions.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    uint a;
-    function f() pure public {
-        assembly {
-            function g() -> x { x := a.slot }
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol
deleted file mode 100644
index de37f412042f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            swap0()
-            swap1()
-            swap2()
-            swap3()
-            swap4()
-            swap5()
-            swap6()
-            swap7()
-            swap8()
-            swap9()
-            swap10()
-            swap11()
-            swap12()
-            swap13()
-            swap14()
-            swap15()
-            swap16()
-            swap32()
-        }
-    }
-}
-// ----
-// DeclarationError 4619: (75-80): Function "swap0" not found.
-// DeclarationError 4619: (95-100): Function "swap1" not found.
-// DeclarationError 4619: (115-120): Function "swap2" not found.
-// DeclarationError 4619: (135-140): Function "swap3" not found.
-// DeclarationError 4619: (155-160): Function "swap4" not found.
-// DeclarationError 4619: (175-180): Function "swap5" not found.
-// DeclarationError 4619: (195-200): Function "swap6" not found.
-// DeclarationError 4619: (215-220): Function "swap7" not found.
-// DeclarationError 4619: (235-240): Function "swap8" not found.
-// DeclarationError 4619: (255-260): Function "swap9" not found.
-// DeclarationError 4619: (275-281): Function "swap10" not found.
-// DeclarationError 4619: (296-302): Function "swap11" not found.
-// DeclarationError 4619: (317-323): Function "swap12" not found.
-// DeclarationError 4619: (338-344): Function "swap13" not found.
-// DeclarationError 4619: (359-365): Function "swap14" not found.
-// DeclarationError 4619: (380-386): Function "swap15" not found.
-// DeclarationError 4619: (401-407): Function "swap16" not found.
-// DeclarationError 4619: (422-428): Function "swap32" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
deleted file mode 100644
index 80dd3a58755c..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        assembly {
-            pop
-        }
-    }
-}
-// ----
-// ParserError 6913: (85-86): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol
deleted file mode 100644
index 6942afe6bb0f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        assembly {
-            1
-        }
-    }
-}
-// ----
-// ParserError 6913: (83-84): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
deleted file mode 100644
index b1f8ba435ec9..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    uint8 x;
-    function f() public {
-        assembly { pop(x) }
-    }
-}
-// ----
-// TypeError 1408: (75-76): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol
deleted file mode 100644
index dd69058f305b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let x.offset := 1
-            let x.slot := 1
-        }
-    }
-}
-// ----
-// DeclarationError 3927: (79-87): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (109-115): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol
deleted file mode 100644
index 9eba8e7b3698..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let x : = mload(0)
-    }
-  }
-}
-// ----
-// ParserError 2314: (71-72): Expected identifier but got '='
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol
deleted file mode 100644
index ca9f34fcae46..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function g() -> a,b, c {}
-      let x, y ,z : = g()
-    }
-  }
-}
-// ----
-// ParserError 2314: (109-110): Expected identifier but got '='
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
deleted file mode 100644
index d23eceeed7f2..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	function f() public pure {
-		/// @test test
-		assembly {}
-		/// @solidity test
-		assembly {}
-		/// @param
-		assembly {}
-	}
-}
-// ----
-// Warning 6269: (60-71): Unexpected NatSpec tag "test" with value "test" in inline assembly.
-// Warning 8787: (95-106): Unexpected value for @solidity tag in inline assembly: test
-// Warning 7828: (122-133): Inline assembly has invalid NatSpec documentation.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/leave.sol b/test/libsolidity/syntaxTests/inlineAssembly/leave.sol
deleted file mode 100644
index 27edba47eccd..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/leave.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function f() {
-        leave
-      }
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol b/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol
deleted file mode 100644
index 1b7c75105645..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      leave
-    }
-  }
-}
-// ----
-// SyntaxError 8149: (63-68): Keyword "leave" can only be used inside a function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol b/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol
deleted file mode 100644
index 8679a97a254b..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      pop(linkersymbol("contract/library.sol:L"))
-    }
-  }
-}
-// ----
-// DeclarationError 4619: (67-79): Function "linkersymbol" not found.
-// TypeError 3950: (67-105): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol b/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol
deleted file mode 100644
index 7434ddfd5845..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      function linkersymbol(a) {}
-
-      linkersymbol("contract/library.sol:L")
-    }
-  }
-}
-// ----
-// DeclarationError 5017: (63-90): The identifier "linkersymbol" is reserved and can not be used.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol b/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol
deleted file mode 100644
index 9d0fd3e1c786..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-function f() pure {
-    /// @solidity memory-safe-assembly
-    assembly "evmasm" ("memory-safe") {
-    }
-}
-// ----
-// Warning 8544: (63-104): Inline assembly marked as memory safe using both a NatSpec tag and an assembly flag. If you are not concerned with backwards compatibility, only use the assembly flag, otherwise only use the NatSpec tag.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol b/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol
deleted file mode 100644
index c034f803da6e..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-function f() pure {
-    assembly "evmasm" ("memory-safe") {}
-}
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol
deleted file mode 100644
index b93b20318651..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-	function f() public pure {
-		// @solidity memory-safe-assembly
-		assembly {}
-	}
-}
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
deleted file mode 100644
index 945d62b0695f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-function f() pure {
-    /// @unrelated bogus-value
-
-    /// @before bogus-value
-    ///
-    /// @solidity a   memory-safe-assembly b    c
-    ///           d
-    /// @after bogus-value
-    assembly {}
-    /// @solidity memory-safe-assembly a a a
-    ///           memory-safe-assembly
-    assembly {}
-}
-// ----
-// Warning 6269: (189-200): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
-// Warning 6269: (189-200): Unexpected NatSpec tag "before" with value "bogus-value" in inline assembly.
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: a
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: b
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: c
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: d
-// Warning 8787: (289-300): Unexpected value for @solidity tag in inline assembly: a
-// Warning 4377: (289-300): Value for @solidity tag in inline assembly specified multiple times: a
-// Warning 4377: (289-300): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
deleted file mode 100644
index 74be1232ddee..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-function f() pure {
-    /// @unrelated bogus-value
-
-    /// @before
-    ///
-    /// @solidity a   memory-safe-assembly b    c
-    ///           d
-    /// @after bogus-value
-    assembly {}
-    /// @solidity memory-safe-assembly a a a
-    ///           memory-safe-assembly
-    assembly {}
-}
-// ----
-// Warning 6269: (177-188): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
-// Warning 6269: (177-188): Unexpected NatSpec tag "before" with value "@solidity a   memory-safe-assembly b    c           d" in inline assembly.
-// Warning 8787: (277-288): Unexpected value for @solidity tag in inline assembly: a
-// Warning 4377: (277-288): Value for @solidity tag in inline assembly specified multiple times: a
-// Warning 4377: (277-288): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/no_unused_variable_warning.sol b/test/libsolidity/syntaxTests/inlineAssembly/no_unused_variable_warning.sol
deleted file mode 100644
index 4630b833db08..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/no_unused_variable_warning.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        uint a;
-        assembly {
-            a := 1
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol
deleted file mode 100644
index 64411c6dfc71..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() pure public {}
-    function f(address) pure public {}
-    function g() pure public {
-        assembly {
-            let x := f
-        }
-    }
-}
-// ----
-// DeclarationError 4718: (155-156): Multiple matching identifiers. Resolving overloaded identifiers is not supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/period_in_identifer.sol b/test/libsolidity/syntaxTests/inlineAssembly/period_in_identifer.sol
deleted file mode 100644
index 6788c891fae0..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/period_in_identifer.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() pure public {
-        // Periods are part of identifiers in assembly,
-        // but not in Solidity. This tests that this scanner
-        // setting is properly reset early enough.
-        assembly { }
-        C.f();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol
deleted file mode 100644
index d85e77a45ef0..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f() public view returns (uint256 ret) {
-        assembly {
-            let prevrandao := sload(0)
-            ret := prevrandao
-        }
-    }
-
-    function g() public pure returns (uint256 ret) {
-        assembly {
-            function prevrandao() -> r {
-                r := 1000
-            }
-            ret := prevrandao()
-        }
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol
deleted file mode 100644
index 66dbc110ae57..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public view returns (uint256) {
-        return block.prevrandao;
-    }
-
-    function g() public view returns (uint256 ret) {
-        assembly {
-            ret := prevrandao()
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol
deleted file mode 100644
index 6c284a005956..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public view returns (uint256 ret) {
-        assembly {
-            let prevrandao := sload(0)
-            ret := prevrandao
-        }
-    }
-
-    function g() public pure returns (uint256 ret) {
-        assembly {
-            function prevrandao() -> r {
-                r := 1000
-            }
-            ret := prevrandao()
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// ParserError 5568: (101-111): Cannot use builtin function name "prevrandao" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol
deleted file mode 100644
index 2086892b1ce3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint256) {
-        return block.prevrandao;
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
-// Warning 9432: (77-93): "prevrandao" is not supported by the VM version and will be treated as "difficulty".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol
deleted file mode 100644
index 34e7763988bb..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            pop(prevrandao())
-        }
-    }
-}
-// ====
-// EVMVersion: <paris
-// ----
-// DeclarationError 4619: (74-84): Function "prevrandao" not found.
-// TypeError 3950: (74-86): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol
deleted file mode 100644
index b1471ac55b2f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-// Ok
-contract push0 {}
-
-contract A {
-    // Ok, warning about shadowing
-    function push0() external {}
-}
-
-contract C {
-    function f() external {
-        assembly {
-            // Not okay
-            push0()
-        }
-    }
-}
-// ----
-// Warning 2519: (77-105): This declaration shadows an existing declaration.
-// DeclarationError 4619: (205-210): Function "push0" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol
deleted file mode 100644
index 6660887d02ef..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let linkersymbol := 1
-      let datacopy := 1
-      let swap16 := 1
-    }
-  }
-}
-// ----
-// DeclarationError 5017: (67-79): The identifier "linkersymbol" is reserved and can not be used.
-// DeclarationError 5017: (95-103): The identifier "datacopy" is reserved and can not be used.
-// DeclarationError 5017: (119-125): The identifier "swap16" is reserved and can not be used.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_byzantium.sol
deleted file mode 100644
index b6cdf4540d77..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_byzantium.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let shl := 1
-    }
-    assembly {
-      pop(shl(1, 2))
-    }
-  }
-}
-// ====
-// EVMVersion: =byzantium
-// ----
-// DeclarationError 5017: (67-70): The identifier "shl" is reserved and can not be used.
-// TypeError 6612: (107-110): The "shl" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
-// TypeError 3950: (107-116): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol
deleted file mode 100644
index cea698fd1f37..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      let shl := 1
-    }
-    assembly {
-      pop(shl(1, 2))
-    }
-  }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// ParserError 5568: (67-70): Cannot use builtin function name "shl" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
deleted file mode 100644
index f959537b6064..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public pure {
-        uint returndatasize;
-        returndatasize;
-        assembly {
-            let x := returndatasize()
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
deleted file mode 100644
index 44a12aa06eba..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        uint returndatasize;
-        returndatasize;
-        assembly {
-            returndatasize := 2
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// ParserError 6272: (143-145): Cannot assign to builtin function "returndatasize".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
deleted file mode 100644
index 07bae8ac89ec..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C { function f() public pure { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
-// ====
-// EVMVersion: =homestead
-// ----
-// TypeError 4778: (92-106): The "returndatasize" instruction is only available for Byzantium-compatible VMs (you are currently compiling for "homestead").
-// TypeError 3950: (92-108): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol
deleted file mode 100644
index bd5ad50c37b1..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        uint returndatasize;
-        returndatasize;
-        assembly {
-            let x := returndatasize
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// ParserError 7104: (137-151): Builtin function "returndatasize" must be called.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol
deleted file mode 100644
index ce2ad9d33eeb..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint a) public pure {
-        assembly {
-            let a := 1
-        }
-    }
-}
-// ----
-// DeclarationError 3859: (85-86): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol
deleted file mode 100644
index 06a033727906..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint constant a;
-    function f() public pure {
-        assembly {
-            let a := 1
-        }
-    }
-}
-// ----
-// DeclarationError 3859: (100-101): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol
deleted file mode 100644
index e32e9ea9dc73..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let C := 1
-        }
-    }
-}
-// ----
-// DeclarationError 3859: (79-80): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol
deleted file mode 100644
index cd93d9896b2a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let f := 1
-        }
-    }
-}
-// ----
-// DeclarationError 3859: (79-80): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/global_function_by_opcode.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/global_function_by_opcode.sol
deleted file mode 100644
index 1af10c07c235..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/global_function_by_opcode.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-function mload() pure {}
-contract C {
-    function g() public pure {
-        assembly {
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_function_by_opcode.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_function_by_opcode.sol
deleted file mode 100644
index 93527da39678..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_function_by_opcode.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function add(uint, uint) public pure returns (uint) { return 7; }
-    function g() public pure returns (uint x, uint y) {
-        x = add(1, 2);
-        assembly {
-            y := add(1, 2)
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol
deleted file mode 100644
index 9f666add7235..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        uint a;
-        assembly {
-            let a := 1
-        }
-    }
-}
-// ----
-// DeclarationError 3859: (95-96): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol
deleted file mode 100644
index c5cc1a5781fb..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-==== Source: a ====
-contract A
-{
-	uint constant a = 42;
-}
-==== Source: b ====
-import {A as b} from "a";
-contract B {
-    function f() public pure {
-        assembly {
-            let b := 3
-            let b.a := 4
-        }
-    }
-}
-// ----
-// DeclarationError 3859: (b:105-106): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 3927: (b:128-131): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/no_name_clash_in_import.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/no_name_clash_in_import.sol
deleted file mode 100644
index f349c61a4a9f..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/no_name_clash_in_import.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: a ====
-contract A
-{
-	uint constant a = 42;
-}
-==== Source: b ====
-import {A as b} from "a";
-contract B {
-    function f() public pure {
-        assembly {
-            let A := 1
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol
deleted file mode 100644
index ea410943e7c8..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract D {
-    uint constant a;
-}
-contract C {
-    function f() public pure {
-        assembly {
-            let D.a := 1
-            let D.b := 1 // shadowing the prefix only is also an error
-        }
-    }
-}
-// ----
-// DeclarationError 3927: (115-118): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (140-143): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/state_variable_by_opcode.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/state_variable_by_opcode.sol
deleted file mode 100644
index 2138f648fac6..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/state_variable_by_opcode.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint mload;
-    function g() public pure {
-        assembly {
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
deleted file mode 100644
index 6c27750c8e45..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        uint mload;
-    }
-    function g() public pure {
-        uint mload;
-        assembly {
-        }
-    }
-}
-// ----
-// Warning 2072: (52-62): Unused local variable.
-// Warning 2072: (109-119): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/solidity_keywords.sol b/test/libsolidity/syntaxTests/inlineAssembly/solidity_keywords.sol
deleted file mode 100644
index 5467d045a814..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/solidity_keywords.sol
+++ /dev/null
@@ -1,113 +0,0 @@
-contract C {
-  function f() view public {
-    assembly {
-  // These are keywords of Solidity -- a copy from liblangutil/Token.h.
-  let abstract := 1
-  let anonymous := 1
-  let as := 1
-  let assembly := 1
-  // break is Yul keyword
-  let catch := 1
-  let constant := 1
-  let constructor := 1
-  // continue is Yul keyword
-  let contract := 1
-  let do := 1
-  let else := 1
-  let enum := 1
-  let emit := 1
-  let event := 1
-  let external := 1
-  let fallback := 1
-  // for is a Yul keyword
-  // function is a Yul keyword
-  // hex is a Yul keyword
-  // if is a Yul keyword
-  let indexed := 1
-  let interface := 1
-  let internal := 1
-  let immutable := 1
-  let import := 1
-  let is := 1
-  let library := 1
-  let mapping := 1
-  let memory := 1
-  let modifier := 1
-  let new := 1
-  let override := 1
-  let payable := 1
-  let public := 1
-  let pragma := 1
-  let private := 1
-  let pure := 1
-  let receive := 1
-  // return is a builtin in EVMDialect
-  return(0, 0)
-  let returns := 1
-  let storage := 1
-  let calldata := 1
-  let struct := 1
-  let throw := 1
-  let try := 1
-  // type shadows the Solidity function
-  let unicode := 1
-  let using := 1
-  let view := 1
-  let virtual := 1
-  let while := 1
-  let wei := 1
-  let gwei := 1
-  let ether := 1
-  let seconds := 1
-  let minutes := 1
-  let hours := 1
-  let days := 1
-  let weeks := 1
-  let years := 1
-  let int := 1
-  let uint := 1
-  let bytes := 1
-  // byte is a builtin in EVMDialect
-  pop(byte(1, 1))
-  let string := 1
-  // address is a builtin in EVMDialect
-  pop(address())
-  let bool := 1
-  let fixed := 1
-  let ufixed := 1
-  let after := 1
-  let alias := 1
-  let apply := 1
-  let auto := 1
-  // case is a Yul keyword
-  let copyof := 1
-  // default is a Yul keyword
-  let define := 1
-  let final := 1
-  let implements := 1
-  let in := 1
-  let inline := 1
-  // let is a Yul keyword
-  let macro := 1
-  let match := 1
-  let mutable := 1
-  let null := 1
-  let of := 1
-  let partial := 1
-  let promise := 1
-  let reference := 1
-  let relocatable := 1
-  let sealed := 1
-  let sizeof := 1
-  let static := 1
-  let supports := 1
-  // switch is a Yul keyword
-  let typedef := 1
-  let typeof := 1
-  let unchecked := 1
-  let var := 1
-    }
-  }
-}
-// ----
-// Warning 5740: (955-2168): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol
deleted file mode 100644
index 47f898019eff..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint[] storage y = x;
-        assembly {
-            pop(y)
-        }
-    }
-}
-// ----
-// TypeError 9068: (118-119): You have to use the ".slot" or ".offset" suffix to access storage reference variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol
deleted file mode 100644
index 4f8e36068e0a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint[] storage y = x;
-        assembly {
-            y.slot := 1
-            y.offset := 2
-        }
-    }
-}
-// ----
-// TypeError 9739: (138-146): Only .slot can be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
deleted file mode 100644
index f4ed7c378730..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        assembly {
-            x.slot := 1
-            x.offset := 2
-        }
-    }
-}
-// ----
-// TypeError 4713: (84-90): State variables cannot be assigned to - you have to use "sstore()".
-// TypeError 4713: (108-116): State variables cannot be assigned to - you have to use "sstore()".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol
deleted file mode 100644
index ab13d1dd6b1a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let x := .offset
-        }
-    }
-}
-// ----
-// ParserError 1856: (84-85): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol
deleted file mode 100644
index 43d5ab8e2286..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let x := .slot
-        }
-    }
-}
-// ----
-// ParserError 1856: (84-85): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_fine.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_fine.sol
deleted file mode 100644
index 362a5c6472bb..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_fine.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint[] storage y = x;
-        assembly {
-            pop(y.slot)
-            pop(y.offset)
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
deleted file mode 100644
index d2ca4d7cbfb0..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint[] storage y = x;
-        assembly {
-            pop(y_slot)
-            pop(y_offset)
-        }
-    }
-}
-// ----
-// DeclarationError 9467: (118-124): Identifier not found. Use ".slot" and ".offset" to access storage variables.
-// DeclarationError 9467: (142-150): Identifier not found. Use ".slot" and ".offset" to access storage variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old_shadow.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old_shadow.sol
deleted file mode 100644
index 9914eb09ffd5..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old_shadow.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint y_slot = 2;
-        uint y_offset = 3;
-        uint[] storage y = x;
-        assembly {
-            pop(y_slot)
-            pop(y_offset)
-        }
-        y[0] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol
deleted file mode 100644
index 66bf81e6f5fc..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            let x := f.slot
-        }
-    }
-}
-// ----
-// TypeError 7944: (84-90): The suffixes ".offset", ".slot" and ".length" can only be used with variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol
deleted file mode 100644
index a319c597c737..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint[] memory y = x;
-        assembly {
-            pop(y.slot)
-            pop(y.offset)
-        }
-    }
-}
-// ----
-// TypeError 3622: (117-123): The suffix ".slot" is not supported by this variable or type.
-// TypeError 3622: (141-149): The suffix ".offset" is not supported by this variable or type.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol
deleted file mode 100644
index 4f8e36068e0a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint[] x;
-    fallback() external {
-        uint[] storage y = x;
-        assembly {
-            y.slot := 1
-            y.offset := 2
-        }
-    }
-}
-// ----
-// TypeError 9739: (138-146): Only .slot can be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/string_literal_switch_case.sol b/test/libsolidity/syntaxTests/inlineAssembly/string_literal_switch_case.sol
deleted file mode 100644
index 0a63987e143e..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/string_literal_switch_case.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      switch codesize()
-      case "1" {}
-      case "2" {}
-    }
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol
deleted file mode 100644
index 5b71b61f906a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() pure external {
-        function() external two_stack_slots;
-        assembly {
-            let x :=  two_stack_slots
-        }
-    }
-}
-// ----
-// TypeError 9857: (132-147): Only types that use one stack slot are supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol b/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol
deleted file mode 100644
index 5b71b61f906a..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() pure external {
-        function() external two_stack_slots;
-        assembly {
-            let x :=  two_stack_slots
-        }
-    }
-}
-// ----
-// TypeError 9857: (132-147): Only types that use one stack slot are supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/use_msize_with_optimizer.sol b/test/libsolidity/syntaxTests/inlineAssembly/use_msize_with_optimizer.sol
deleted file mode 100644
index a1c0818b5ef3..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/use_msize_with_optimizer.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            let x := msize()
-        }
-    }
-}
-// ====
-// optimize-yul: true
-// ----
-// SyntaxError 6553: (52-101): The msize instruction cannot be used when the Yul optimizer is activated because it can change its semantics. Either disable the Yul optimizer or do not use the instruction.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/use_msize_without_optimizer.sol b/test/libsolidity/syntaxTests/inlineAssembly/use_msize_without_optimizer.sol
deleted file mode 100644
index 8cdf96641ada..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/use_msize_without_optimizer.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            let x := msize()
-        }
-    }
-}
-// ====
-// optimize-yul: false
-// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol
deleted file mode 100644
index bdafa407a961..000000000000
--- a/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() pure public {
-        assembly {
-            let x := verbatim_1o(hex"6001")
-        }
-    }
-}
-// ====
-// optimize-yul: true
-// ----
-// DeclarationError 4619: (84-95): Function "verbatim_1o" not found.
-// DeclarationError 3812: (75-106): Variable count mismatch for declaration of "x": 1 variables and 0 values.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol
deleted file mode 100644
index 311f8430b68d..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        uint8[4][4] memory dyn = [[1, 2, 3, 4], [2, 3, 4, 5], [3, 4, 5, 6], [4, 5, 6, 7]];
-    }
-}
-// ----
-// Warning 2072: (47-69): Unused local variable.
-// Warning 2018: (17-135): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion.sol
deleted file mode 100644
index bb938d872698..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-    contract C {
-        function f() public returns (uint) {
-            uint8 x = 7;
-            uint16 y = 8;
-            uint32 z = 9;
-            uint32[3] memory ending = [x, y, z];
-            return (ending[1]);
-        }
-    }
-// ----
-// Warning 2018: (25-229): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion_strings.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion_strings.sol
deleted file mode 100644
index e177364b3480..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion_strings.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        string memory x = "Hello";
-        string memory y = "World";
-        string[2] memory z = [x, y];
-        return (z[0]);
-    }
-}
-// ----
-// Warning 2018: (17-198): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_int_conversion.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_int_conversion.sol
deleted file mode 100644
index 06e38a60b3fd..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_int_conversion.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        uint8[4] memory z = [1,2,3,5];
-        return (z[0]);
-    }
-}
-// ----
-// Warning 2018: (17-121): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_string_conversion.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_string_conversion.sol
deleted file mode 100644
index ce4f53aae69d..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_string_conversion.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        string[2] memory z = ["Hello", "World"];
-        return (z[0]);
-    }
-}
-// ----
-// Warning 2018: (17-140): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type.sol
deleted file mode 100644
index 9f7c4d725902..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (uint) {
-        return ([4,5,6][1]);
-    }
-}
-// ----
-// Warning 2018: (17-88): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type_strings.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type_strings.sol
deleted file mode 100644
index 17a79ecdbd82..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type_strings.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        return (["foo", "man", "choo"][1]);
-    }
-}
-// ----
-// Warning 2018: (17-112): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
deleted file mode 100644
index 56a4d0e201bd..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        fixed[3] memory a = [fixed(3.5), fixed(-4.25), fixed(967.125)];
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2072: (50-67): Unused local variable.
-// Warning 2018: (20-119): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol
deleted file mode 100644
index e0b1c6f6c9e3..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  mapping(int => int) a;
-  function f() public {
-    [a];
-  }
-}
-// ----
-// TypeError 1545: (66-69): Type mapping(int256 => int256) is only valid in storage.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
deleted file mode 100644
index 78aa35de7c03..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        ufixed128x3[4] memory a = [ufixed128x3(3.5), 4.125, 2.5, 4.0];
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2072: (50-73): Unused local variable.
-// Warning 2018: (20-118): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol
deleted file mode 100644
index 1ba1fdb1d382..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        uint[3] memory x = [45, 'foo', true];
-    }
-}
-// ----
-// TypeError 6378: (66-83): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol
deleted file mode 100644
index 748134a9e48c..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        [1, 2, 3]++;
-        [1, 2, 3] = [4, 5, 6];
-    }
-}
-// ----
-// TypeError 3025: (47-56): Inline array type cannot be declared as LValue.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol
deleted file mode 100644
index 21f112c5cf41..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        [(1, 2, 3), (4, 5, 6)];
-    }
-}
-// ----
-// TypeError 9656: (47-69): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
deleted file mode 100644
index b848b7b12bdf..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        [msg];
-    }
-}
-// ----
-// TypeError 9563: (48-51): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
deleted file mode 100644
index 7f659209c5be..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        [type(C)];
-    }
-}
-// ----
-// TypeError 9563: (48-55): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol
deleted file mode 100644
index 78c5493e5f8b..000000000000
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        [uint];
-    }
-}
-// ----
-// TypeError 9563: (53-57): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_fine.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_fine.sol
deleted file mode 100644
index 4a4f392c6a8f..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_fine.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    uint[2**64 - 1] x;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol
deleted file mode 100644
index 08f8a46b3291..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    mapping(uint => uint[2**100]) x;
-}
-// ----
-// Warning 7325: (17-46): Type uint256[1267650600228229401496703205376] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol
deleted file mode 100644
index 3fc91da4d1d8..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[2**64] x;
-}
-// ----
-// Warning 7325: (17-28): Type uint256[18446744073709551616] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_combined.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_combined.sol
deleted file mode 100644
index eee56ce0f7e0..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_combined.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    uint[200][200][2**30][][2**30] x;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol
deleted file mode 100644
index e2488adc0b62..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    struct S { uint[2**30] x; uint[2**50] y; }
-    S[2**20] x;
-}
-// ----
-// Warning 7325: (64-72): Type struct C.S[1048576] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol
deleted file mode 100644
index cbc912a35008..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-contract C {
-    struct P { uint256[2**63] x; }
-
-    struct S0 {
-        P[101] x;
-        P y;
-    }
-    S0 s0;
-
-    struct S1 {
-        P x;
-        P[102] y;
-    }
-    S1 s1;
-
-    struct S2 {
-        mapping(uint => P[103]) x;
-        mapping(uint => P[103]) y;
-        mapping(uint => P[104]) z;
-        mapping(uint => S2) t;
-    }
-    S2 s2;
-
-    struct Q0
-    {
-        uint[1][][10**20 + 1] x;
-        uint[10**20 + 2][][1] y;
-        uint[][10**20 + 3] z;
-        uint[10**20 + 4][] t;
-    }
-    Q0 q0;
-
-    struct Q1
-    {
-        uint[1][][10**20 + 5] x;
-    }
-    Q1 q1;
-
-    struct Q2
-    {
-        uint[10**20 + 6][][1] y;
-    }
-    Q2 q2;
-
-    struct Q3
-    {
-        uint[][10**20 + 7] x;
-    }
-    Q3 q3;
-
-    struct Q4
-    {
-        uint[10**20 + 8][] y;
-    }
-    Q4 q4;
-}
-// ----
-// Warning 7325: (106-108): Type struct C.S0 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (106-108): Type struct C.P[101] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (171-173): Type struct C.S1 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (171-173): Type struct C.P[102] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (341-343): Type struct C.P[103] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (341-343): Type struct C.P[104] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type struct C.Q0 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[1][][100000000000000000001] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[][100000000000000000003] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[100000000000000000004] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[100000000000000000002] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (576-578): Type struct C.Q1 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (576-578): Type uint256[1][][100000000000000000005] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (647-649): Type uint256[100000000000000000006] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (715-717): Type struct C.Q3 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (715-717): Type uint256[][100000000000000000007] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (783-785): Type uint256[100000000000000000008] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol b/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol
deleted file mode 100644
index 4bf6c86be0eb..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0;
-contract C {
-    uint[2**255][2] a;
-}
-// ----
-// TypeError 7676: (60-97): Contract requires too much storage.
-// TypeError 1534: (77-94): Type too large for storage.
diff --git a/test/libsolidity/syntaxTests/largeTypes/oversized_contract.sol b/test/libsolidity/syntaxTests/largeTypes/oversized_contract.sol
deleted file mode 100644
index f6c82a8235fc..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/oversized_contract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0;
-contract C {
-    uint[2**255] a;
-    uint[2**255] b;
-}
-// ----
-// TypeError 7676: (60-114): Contract requires too much storage.
diff --git a/test/libsolidity/syntaxTests/largeTypes/oversized_contract_inheritance.sol b/test/libsolidity/syntaxTests/largeTypes/oversized_contract_inheritance.sol
deleted file mode 100644
index a181e3a58134..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/oversized_contract_inheritance.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0;
-contract C {
-    uint[2**255] a;
-}
-contract D is C {
-    uint[2**255] b;
-}
-// ----
-// TypeError 7676: (95-134): Contract requires too much storage.
diff --git a/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol b/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol
deleted file mode 100644
index d1c8187568d6..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >= 0.0;
-contract C {
-    struct S {
-        uint[2**255] a;
-        uint[2**255] b;
-    }
-    S s;
-}
-// ----
-// TypeError 7676: (60-152): Contract requires too much storage.
-// TypeError 1534: (146-149): Type too large for storage.
diff --git a/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol b/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol
deleted file mode 100644
index 836a49b034e7..000000000000
--- a/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    struct S { uint256[2**255] x; }
-    function f(S storage) internal {}
-}
-// ----
-// Warning 7325: (64-65): Type struct C.S covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (64-65): Type uint256[57896044618658097711785492504343953926634992332820282019728792003956564819968] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/license/license_AND.sol b/test/libsolidity/syntaxTests/license/license_AND.sol
deleted file mode 100644
index eb996a948d04..000000000000
--- a/test/libsolidity/syntaxTests/license/license_AND.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0 AND GPL-2.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_OR.sol b/test/libsolidity/syntaxTests/license/license_OR.sol
deleted file mode 100644
index 9f36bb416ca1..000000000000
--- a/test/libsolidity/syntaxTests/license/license_OR.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0 OR GPL-2.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_bidi_marks.sol b/test/libsolidity/syntaxTests/license/license_bidi_marks.sol
deleted file mode 100644
index b9ef0e6c62c9..000000000000
--- a/test/libsolidity/syntaxTests/license/license_bidi_marks.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-// ‮0.3-LPG :reifitnedI-esneciL-XDPS‬
-// NOTE: The text above is reversed using Unicode directional marks. In raw form it would look like this:
-// <LRO>0.3-LPG :reifitnedI-esneciL-XDPS<PDF>
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_bottom.sol b/test/libsolidity/syntaxTests/license/license_bottom.sol
deleted file mode 100644
index 8e7cc293d30c..000000000000
--- a/test/libsolidity/syntaxTests/license/license_bottom.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-contract C {}
-// SPDX-License-Identifier: GPL-3.0
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_cr_endings.sol b/test/libsolidity/syntaxTests/license/license_cr_endings.sol
deleted file mode 100644
index a844d80a910e..000000000000
--- a/test/libsolidity/syntaxTests/license/license_cr_endings.sol
+++ /dev/null
@@ -1 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
// SPDX-License-Identifier: GPL-3.0
contract C {}
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/license/license_crlf_endings.sol b/test/libsolidity/syntaxTests/license/license_crlf_endings.sol
deleted file mode 100644
index 8e83125ee027..000000000000
--- a/test/libsolidity/syntaxTests/license/license_crlf_endings.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-// SPDX-License-Identifier: GPL-3.0
-contract C {}
diff --git a/test/libsolidity/syntaxTests/license/license_double.sol b/test/libsolidity/syntaxTests/license/license_double.sol
deleted file mode 100644
index 0885ad150192..000000000000
--- a/test/libsolidity/syntaxTests/license/license_double.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-contract C {}
-// SPDX-License-Identifier: MIT
-// ----
-// ParserError 3716: Multiple SPDX license identifiers found in source file. Use "AND" or "OR" to combine multiple licenses. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_double2.sol b/test/libsolidity/syntaxTests/license/license_double2.sol
deleted file mode 100644
index 4c390a3d4436..000000000000
--- a/test/libsolidity/syntaxTests/license/license_double2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-// SPDX-License-Identifier: MIT
-contract C {}
-// ----
-// ParserError 3716: Multiple SPDX license identifiers found in source file. Use "AND" or "OR" to combine multiple licenses. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_double3.sol b/test/libsolidity/syntaxTests/license/license_double3.sol
deleted file mode 100644
index 10ade5d9d64e..000000000000
--- a/test/libsolidity/syntaxTests/license/license_double3.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-// SPDX-License-Identifier: GPL-3.0
-contract C {}
-// ----
-// ParserError 3716: Multiple SPDX license identifiers found in source file. Use "AND" or "OR" to combine multiple licenses. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_double4.sol b/test/libsolidity/syntaxTests/license/license_double4.sol
deleted file mode 100644
index 395a458ee823..000000000000
--- a/test/libsolidity/syntaxTests/license/license_double4.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0 OR GPL-2.0
-SPDX-License-Identifier: GPL-3.0 OR GPL-2.0 */
-contract C {}
-// ----
-// ParserError 3716: Multiple SPDX license identifiers found in source file. Use "AND" or "OR" to combine multiple licenses. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_double5.sol b/test/libsolidity/syntaxTests/license/license_double5.sol
deleted file mode 100644
index efc22186b1d0..000000000000
--- a/test/libsolidity/syntaxTests/license/license_double5.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0 OR GPL-2.0 */ /* SPDX-License-Identifier: GPL-3.0 OR GPL-2.0 */
-contract C {}
-// ----
-// ParserError 3716: Multiple SPDX license identifiers found in source file. Use "AND" or "OR" to combine multiple licenses. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_hidden_unicode.sol b/test/libsolidity/syntaxTests/license/license_hidden_unicode.sol
deleted file mode 100644
index f93ef18c4f70..000000000000
--- a/test/libsolidity/syntaxTests/license/license_hidden_unicode.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0 ⡉⡊⡋⡌�⡎��⡑⡒
-contract C {}
-// ----
-// ParserError 1114: Invalid SPDX license identifier.
diff --git a/test/libsolidity/syntaxTests/license/license_in_contract.sol b/test/libsolidity/syntaxTests/license/license_in_contract.sol
deleted file mode 100644
index 8318fbd80719..000000000000
--- a/test/libsolidity/syntaxTests/license/license_in_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-// SPDX-License-Identifier: GPL-3.0
-}
-// ----
-// Warning 1878: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_in_import.sol b/test/libsolidity/syntaxTests/license/license_in_import.sol
deleted file mode 100644
index e31d49aa789d..000000000000
--- a/test/libsolidity/syntaxTests/license/license_in_import.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-import "// SPDX-License-Identifier: GPL-3.0";
-contract C {}
-// ----
-// Warning 1878: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
-// ParserError 6275: (0-45): Source "// SPDX-License-Identifier: GPL-3.0" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/license/license_in_string.sol b/test/libsolidity/syntaxTests/license/license_in_string.sol
deleted file mode 100644
index 5db1c6f66b19..000000000000
--- a/test/libsolidity/syntaxTests/license/license_in_string.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    bytes license = "// SPDX-License-Identifier: GPL-3.0";
-}
-// ----
-// Warning 1878: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
diff --git a/test/libsolidity/syntaxTests/license/license_missing.sol b/test/libsolidity/syntaxTests/license/license_missing.sol
deleted file mode 100644
index e919dc6e5bd5..000000000000
--- a/test/libsolidity/syntaxTests/license/license_missing.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_missing_colon.sol b/test/libsolidity/syntaxTests/license/license_missing_colon.sol
deleted file mode 100644
index 8f9e775c57d1..000000000000
--- a/test/libsolidity/syntaxTests/license/license_missing_colon.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-// SPDX-License-Identifier GPL-3.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_multiline.sol b/test/libsolidity/syntaxTests/license/license_multiline.sol
deleted file mode 100644
index b9790dce98d6..000000000000
--- a/test/libsolidity/syntaxTests/license/license_multiline.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-/* SPDX-License-Identifier: GPL-3.0 */
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_natspec.sol b/test/libsolidity/syntaxTests/license/license_natspec.sol
deleted file mode 100644
index d26b3c4e7325..000000000000
--- a/test/libsolidity/syntaxTests/license/license_natspec.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-/// SPDX-License-Identifier: GPL-3.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_natspec_multiline.sol b/test/libsolidity/syntaxTests/license/license_natspec_multiline.sol
deleted file mode 100644
index cd7ad6cd3b2d..000000000000
--- a/test/libsolidity/syntaxTests/license/license_natspec_multiline.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-/** SPDX-License-Identifier: GPL-3.0 */
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_no_whitespace.sol b/test/libsolidity/syntaxTests/license/license_no_whitespace.sol
deleted file mode 100644
index eedca61d1025..000000000000
--- a/test/libsolidity/syntaxTests/license/license_no_whitespace.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-//SPDX-License-Identifier:GPL-3.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_no_whitespace_multiline.sol b/test/libsolidity/syntaxTests/license/license_no_whitespace_multiline.sol
deleted file mode 100644
index 5807ae22dca3..000000000000
--- a/test/libsolidity/syntaxTests/license/license_no_whitespace_multiline.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-/*SPDX-License-Identifier:GPL-3.0*/
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_nonempty_line.sol b/test/libsolidity/syntaxTests/license/license_nonempty_line.sol
deleted file mode 100644
index ac8f7c67551c..000000000000
--- a/test/libsolidity/syntaxTests/license/license_nonempty_line.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// This test is actually useless, as the test suite adds the automatic preamble.
-pragma solidity >= 0.0; // SPDX-License-Identifier: GPL-3.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_unicode.sol b/test/libsolidity/syntaxTests/license/license_unicode.sol
deleted file mode 100644
index bcf2cdb77b9a..000000000000
--- a/test/libsolidity/syntaxTests/license/license_unicode.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: ⡉⡊⡋⡌�⡎��⡑⡒
-contract C {}
-// ----
-// ParserError 1114: Invalid SPDX license identifier.
diff --git a/test/libsolidity/syntaxTests/license/license_whitespace_after_colon.sol b/test/libsolidity/syntaxTests/license/license_whitespace_after_colon.sol
deleted file mode 100644
index 67b960a5f125..000000000000
--- a/test/libsolidity/syntaxTests/license/license_whitespace_after_colon.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-License-Identifier:    GPL-3.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_whitespace_before_spdx.sol b/test/libsolidity/syntaxTests/license/license_whitespace_before_spdx.sol
deleted file mode 100644
index 67108c0cdd35..000000000000
--- a/test/libsolidity/syntaxTests/license/license_whitespace_before_spdx.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-//     SPDX-License-Identifier: GPL-3.0
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/license/license_whitespace_trailing.sol b/test/libsolidity/syntaxTests/license/license_whitespace_trailing.sol
deleted file mode 100644
index 466d3d80c74e..000000000000
--- a/test/libsolidity/syntaxTests/license/license_whitespace_trailing.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0   
-// NOTE: Trailing space at the end of the line above is intentional.
-contract C {}
-// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
deleted file mode 100644
index 5685084d551d..000000000000
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint constant a = 1 / 0;
-}
-// ----
-// TypeError 2271: (35-40): Built-in binary operator / cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
deleted file mode 100644
index 195336e27941..000000000000
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint constant a = 1 / ((1+3)-4);
-}
-// ----
-// TypeError 2271: (35-48): Built-in binary operator / cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/exponent.sol b/test/libsolidity/syntaxTests/literalOperations/exponent.sol
deleted file mode 100644
index 72dc5ecd4ef5..000000000000
--- a/test/libsolidity/syntaxTests/literalOperations/exponent.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function g() public pure {
-        int a;
-        a ** 1E1233;
-        a ** (1/2);
-    }
-}
-// ----
-// TypeError 2271: (67-78): Built-in binary operator ** cannot be applied to types int256 and int_const 1000...(1226 digits omitted)...0000. Exponent too large.
-// TypeError 2271: (88-98): Built-in binary operator ** cannot be applied to types int256 and rational_const 1 / 2. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/literalOperations/exponent_fine.sol b/test/libsolidity/syntaxTests/literalOperations/exponent_fine.sol
deleted file mode 100644
index f7d9fcd51fcc..000000000000
--- a/test/libsolidity/syntaxTests/literalOperations/exponent_fine.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        uint a;
-        a = a ** 1E5;
-        a = 0 ** 1E1233;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
deleted file mode 100644
index b4ca4d27b135..000000000000
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint constant b3 = 1 % 0;
-}
-// ----
-// TypeError 2271: (36-41): Built-in binary operator % cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
deleted file mode 100644
index 73cbd71fea99..000000000000
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint constant b3 = 1 % (-4+((2)*2));
-}
-// ----
-// TypeError 2271: (36-52): Built-in binary operator % cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literal_comparisons.sol b/test/libsolidity/syntaxTests/literal_comparisons.sol
deleted file mode 100644
index dd2afcaa1cac..000000000000
--- a/test/libsolidity/syntaxTests/literal_comparisons.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f(int8 x) public pure {
-        if (x == 1) {}
-        if (1 == x) {}
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol
deleted file mode 100644
index 4dc19ae1bded..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        hex"12__34";
-    }
-}
-// ----
-// ParserError 8936: (52-60): Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol b/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol
deleted file mode 100644
index 0ed89d729b52..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let x := hex"12__34";
-        }
-    }
-}
-// ----
-// ParserError 1465: (84-92): Illegal token: Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol b/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol
deleted file mode 100644
index 9e623854bc48..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            let x := hex"abxy";
-        }
-    }
-}
-// ----
-// ParserError 1465: (84-90): Illegal token: Expected even number of hex-nibbles.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol
deleted file mode 100644
index d6d3d43eea35..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        hex"_1234";
-    }
-}
-// ----
-// ParserError 8936: (52-57): Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol
deleted file mode 100644
index 6e64ae2db57d..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        hex"1_234";
-    }
-}
-// ----
-// ParserError 8936: (52-56): Expected even number of hex-nibbles.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol
deleted file mode 100644
index a015846e2226..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        hex"1234_";
-    }
-}
-// ----
-// ParserError 8936: (52-61): Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_underscores_valid.sol b/test/libsolidity/syntaxTests/literals/hex_string_underscores_valid.sol
deleted file mode 100644
index 71ba395b4a9f..000000000000
--- a/test/libsolidity/syntaxTests/literals/hex_string_underscores_valid.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    bytes constant c = hex"12_3456_789012";
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/literals/invalid_hex_number.sol b/test/libsolidity/syntaxTests/literals/invalid_hex_number.sol
deleted file mode 100644
index 1cc7e0eccb02..000000000000
--- a/test/libsolidity/syntaxTests/literals/invalid_hex_number.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint x = 0x1000abcdefgh;
-}
-// ----
-// ParserError 8936: (26-38): Identifier-start is not allowed at end of a number.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol b/test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol
deleted file mode 100644
index a4ec101c30c0..000000000000
--- a/test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint y = 01gwei;
-}
-// ----
-// ParserError 8936: (26-27): Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol b/test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol
deleted file mode 100644
index 8565377a096d..000000000000
--- a/test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint y = 098;
-}
-// ----
-// ParserError 8936: (26-27): Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_octal_number.sol b/test/libsolidity/syntaxTests/literals/invalid_octal_number.sol
deleted file mode 100644
index 668913be61d4..000000000000
--- a/test/libsolidity/syntaxTests/literals/invalid_octal_number.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint x = 0100;
-}
-// ----
-// ParserError 8936: (26-27): Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol b/test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol
deleted file mode 100644
index 6a928c3addb4..000000000000
--- a/test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract TestTernary
-{
-    function g() pure public
-    {
-        bool t = true;
-        bool f = false;
-        uint8 v255 = 255;
-        uint8 v63 = 63;
-        uint8 a;
-
-        // Currently none of these should produce errors or warnings.
-        // The result of the operator is always a limited-precision integer, even if all arguments are literals.
-
-        a = (t ? 63 : 255) + (f ? 63 : 255);
-        a = (t ? 0x3f : 0xff) + (f ? 0x3f : 0xff);
-        a = (t ? uint8(63) : 255) + (f ? 63 : uint8(255));
-        a = (t ? v63 : 255) + (f ? 63 : v255);
-
-        a = (true ? 63 : 255) + (false ? 63 : 255);
-        a = (true ? 0x3f : 0xff) + (false ? 0x3f : 0xff);
-        a = (true ? uint8(63) : 255) + (false ? 63 : uint8(255));
-        a = (true ? v63 : 255) + (false ? 63 : v255);
-
-        a = (t ? 63 : 255) - (f ? 63 : 255);
-        a = (t ? 63 : 255) * (f ? 63 : 255);
-        a = (t ? 63 : 255) / (f ? 63 : 255);
-
-        a = (t ? (true ? 63 : 255) : (false ? 63 : 255)) + (f ? (t ? 63 : 255) : (f ? 63 : 255));
-        a = uint8(t ? 63 : 255) + uint8(f ? 63 : 255);
-
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol
deleted file mode 100644
index 5feb89256e3c..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF
-        bytes memory s = unicode"underflow ‬";
-    }
-}
-// ----
-// ParserError 8936: (88-106): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol
deleted file mode 100644
index 409bc4795330..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF PDF
-        bytes memory m = unicode"underflow ‬‬";
-    }
-}
-// ----
-// ParserError 8936: (92-110): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol
deleted file mode 100644
index 6641ca3fcab8..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO
-        bytes memory m = unicode"overflow ‮";
-    }
-}
-// ----
-// ParserError 8936: (88-108): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol
deleted file mode 100644
index a6d6e664c2cc..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO RLO
-        bytes memory m = unicode"overflow ‮‮";
-    }
-}
-// ----
-// ParserError 8936: (92-115): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_5.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_5.sol
deleted file mode 100644
index 5aa21c5bbc4c..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_5.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // RLO PDF
-        bytes memory m = unicode" ok ‮‬";
-
-        // RLO RLO PDF PDF
-        m = unicode" ok ‮‮‬‬";
-
-        // RLO RLO RLO PDF PDF PDF
-        m = unicode" ok ‮‮‮‬‬‬";
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol
deleted file mode 100644
index 70e7b8043487..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // PDF RLO
-        bytes memory m = unicode" underflow ‬‮";
-    }
-}
-// ----
-// ParserError 8936: (92-111): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_7.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_7.sol
deleted file mode 100644
index f10d823a6bb4..000000000000
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_7.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure
-    {
-        // LRO PDF RLO PDF
-        bytes memory m = unicode"‭ ok ‬‮‬";
-
-        // lre rle pdf pdf
-        m = unicode"lre‪ rle‫ pdf‬ pdf‬";
-        // lre lro pdf pdf
-        m = unicode"lre‪ lro‭ pdf‬ pdf‬";
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol b/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol
deleted file mode 100644
index 480f949485f7..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint256[] calldata x) external pure {
-        x[0] = 42;
-    }
-}
-// ----
-// TypeError 6182: (74-78): Calldata arrays are read-only.
diff --git a/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol b/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol
deleted file mode 100644
index dc6e9290a29a..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { uint256 x; }
-    function f(S calldata s) external pure {
-        s.x = 42;
-    }
-}
-// ----
-// TypeError 4156: (128-131): Calldata structs are read-only.
diff --git a/test/libsolidity/syntaxTests/lvalues/external_reference_argument.sol b/test/libsolidity/syntaxTests/lvalues/external_reference_argument.sol
deleted file mode 100644
index 67378653ba3f..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/external_reference_argument.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint256[] calldata x, uint256[] calldata y) external pure {
-        x = y;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/lvalues/functions.sol b/test/libsolidity/syntaxTests/lvalues/functions.sol
deleted file mode 100644
index 4a7e919acab9..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/functions.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() internal {
-    }
-    function g() internal {
-        g = f;
-    }
-    function h() external {
-    }
-    function i() external {
-        this.i = this.h;
-    }
-}
-// ----
-// TypeError 4247: (83-84): Expression has to be an lvalue.
-// TypeError 4247: (166-172): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/lvalues/library_mapping.sol b/test/libsolidity/syntaxTests/lvalues/library_mapping.sol
deleted file mode 100644
index 2c774f55c208..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/library_mapping.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L {
-    function f(mapping(uint=>uint) storage x, mapping(uint=>uint) storage y) external {
-        x = y;
-    }
-}
-// ----
-// TypeError 9214: (108-109): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol b/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol
deleted file mode 100644
index ab514ebc5115..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function foo(uint x) public
-    {
-        // Used to cause an ICE
-        uint p = new uint[] = x;
-    }
-}
-// ----
-// TypeError 4247: (100-110): Expression has to be an lvalue.
-// TypeError 7407: (113-114): Type uint256 is not implicitly convertible to expected type function (uint256) pure returns (uint256[] memory).
-// TypeError 9574: (91-114): Type function (uint256) pure returns (uint256[] memory) is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/lvalues/valid_lvalues.sol b/test/libsolidity/syntaxTests/lvalues/valid_lvalues.sol
deleted file mode 100644
index f90accd0e56a..000000000000
--- a/test/libsolidity/syntaxTests/lvalues/valid_lvalues.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract C {
-    struct S { uint256 x; }
-	function i() internal pure {}
-	function e() external pure {}
-	uint[] s1;
-    function f(uint x, bytes32 y) external {
-        x = 42;
-        y = bytes32(0);
-        (x, y) = (23, bytes32(0));
-        S memory ms1;
-        S memory ms2;
-        ms1 = ms2;
-        ms1.x = x;
-        uint256[] memory a = new uint256[](2);
-        uint256[] memory b = new uint256[](3);
-        a = b;
-        a[0] = x;
-        s1[0] = x;
-        s1 = a;
-    }
-    function g(function() internal pure x) internal view {
-        x = i;
-        function(uint, bytes32) external y;
-        y = this.f;
-    }
-    function g(function() external pure x) external view {
-        x = this.e;
-        function(function() internal pure) internal view y;
-        y = g;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol b/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol
deleted file mode 100644
index 71b63faa55ff..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library L{ constructor() { L.x; } }
-// ----
-// TypeError 7634: (11-33): Constructor cannot be defined in libraries.
-// TypeError 9582: (27-30): Member "x" not found or not visible after argument-dependent lookup in type(library L).
diff --git a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol b/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol
deleted file mode 100644
index 809309d1d3be..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        address(this).send(10);
-    }
-}
-
-// ----
-// TypeError 9862: (47-65): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol b/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol
deleted file mode 100644
index 54b7a12eb883..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        address(this).transfer(10);
-    }
-}
-
-// ----
-// TypeError 9862: (47-69): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol b/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol
deleted file mode 100644
index 041c7878f1de..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f(uint, uint) public {}
-  function f(uint) public {}
-  function g() public { f(1, 2, 3); }
-}
-// ----
-// TypeError 9322: (101-102): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol b/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol
deleted file mode 100644
index 2feb329a2a97..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-  function f(uint, uint) public {}
-  function f(uint) public {}
-}
-contract C {
-  function g() public { L.f(1, 2, 3); }
-}
-// ----
-// TypeError 9582: (115-118): Member "f" not found or not visible after argument-dependent lookup in type(library L).
diff --git a/test/libsolidity/syntaxTests/memberLookup/internal_function_type.sol b/test/libsolidity/syntaxTests/memberLookup/internal_function_type.sol
deleted file mode 100644
index 19bcf420e1c8..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/internal_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function () internal returns (uint) x;
-    constructor() {
-        C.x = g;
-    }
-    function g() public pure returns (uint) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol b/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol
deleted file mode 100644
index 1bffefb21db2..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function a(uint256) public returns (uint) { return 1; }
-    function a(uint8) public returns (uint) { return 1; }
-
-    function f() public returns (C) { return this; }
-
-    function g() internal returns (function(uint8) internal returns(uint))
-    {
-        return f().a;
-    }
-}
-// ----
-// TypeError 6675: (282-287): Member "a" not unique after argument-dependent lookup in contract C.
diff --git a/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol b/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol
deleted file mode 100644
index 0fe2e3281b03..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function value(uint256) public returns (uint) { return 1; }
-    function value(uint8) public returns (uint) { return 1; }
-
-    function f() public returns (C) { return this; }
-
-    function g() internal returns (function(uint8) internal returns(uint))
-    {
-        return f().value;
-    }
-}
-// ----
-// TypeError 6675: (290-299): Member "value" not unique after argument-dependent lookup in contract C - did you forget the "payable" modifier?
diff --git a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
deleted file mode 100644
index f92e4dbd5719..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-	struct S1 { uint8 a; mapping(uint => uint)[] b1; uint8 c; }
-	struct S2 { uint8 a; S1[] b2; uint8 c; }
-	S2 s2;
-    function f() public {
-        S2 memory x = s2;
-        x.b2.length;
-        x.b2[1].b1[2][3];
-    }
-}
-// ----
-// TypeError 4061: (161-172): Type struct Test.S2 memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
deleted file mode 100644
index 0e8512a62e6d..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-	struct S { uint8 a; mapping(uint => uint) b; uint8 c; }
-	S s;
-	function f() public {
-		S memory x;
-	}
-}
-// ----
-// TypeError 4061: (104-114): Type struct Test.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol b/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol
deleted file mode 100644
index 661544ad7f58..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        (msg.sender).send(10);
-    }
-}
-// ----
-// TypeError 9862: (47-64): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol b/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol
deleted file mode 100644
index f44e0489f110..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        (msg.sender).transfer(10);
-    }
-}
-// ----
-// TypeError 9862: (47-68): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_payable.sol b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_payable.sol
deleted file mode 100644
index fb70e9a0fb68..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_payable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    modifier costs(uint _amount) { require(msg.value >= _amount); _; }
-    function f() costs(1 ether) public payable {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol
deleted file mode 100644
index bdd188981768..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    modifier costs(uint _amount) { require(msg.value >= _amount); _; }
-    function f() costs(1 ether) public pure {}
-}
-// ----
-// TypeError 2527: (101-115): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol
deleted file mode 100644
index 29e47138cd99..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    modifier costs(uint _amount) { require(msg.value >= _amount); _; }
-    function f() costs(1 ether) public view {}
-}
-// ----
-// TypeError 4006: (101-115): This modifier uses "msg.value" or "callvalue()" and thus the function has to be payable or internal.
diff --git a/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol b/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol
deleted file mode 100644
index f10fc44d02cb..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Test {
-	function f() public pure {
-        uint[] memory x;
-        x.push(1);
-	}
-}
-// ----
-// TypeError 4994: (77-83): Member "push" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol b/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol
deleted file mode 100644
index b96568395339..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        (tx.origin).send(10);
-    }
-}
-// ----
-// TypeError 9862: (47-63): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol b/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol
deleted file mode 100644
index 34f60ebae933..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        (tx.origin).transfer(10);
-    }
-}
-// ----
-// TypeError 9862: (47-67): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol b/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol
deleted file mode 100644
index 5fb2e5645a84..000000000000
--- a/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: s1.sol ====
-import "s1.sol" as A;
-
-library L {
-    function f() internal pure {}
-}
-
-contract C
-{
-    function test() public pure {
-        A.L;
-    }
-}
-// ----
-// Warning 6133: (s1.sol:127-130): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol
deleted file mode 100644
index b4f11310ce3e..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool c) public {
-        (c ? uint[2] : uint[2])[3];
-    }
-}
-// ----
-// TypeError 9717: (58-65): Invalid mobile type in true expression.
-// TypeError 3703: (68-75): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccess.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccess.sol
deleted file mode 100644
index e90443e14ef5..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccess.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    function creationOther() public pure returns (bytes memory) {
-        return type(Other).creationCode;
-    }
-    function runtimeOther() public pure returns (bytes memory) {
-        return type(Other).runtimeCode;
-    }
-}
-contract Other {
-    function f(uint) public pure returns (uint) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol
deleted file mode 100644
index 2f5c356c08d0..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    function creationOther() public pure returns (bytes memory) {
-        return type(Other).creationCode;
-    }
-}
-abstract contract Other {
-    function f(uint) public returns (uint);
-}
-// ----
-// TypeError 9582: (97-121): Member "creationCode" not found or not visible after argument-dependent lookup in type(contract Other).
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol
deleted file mode 100644
index 538a26e78941..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    function runtime() public pure returns (bytes memory) {
-        return type(Other).runtimeCode;
-    }
-}
-abstract contract Other {
-    function f(uint) public returns (uint);
-}
-// ----
-// TypeError 9582: (91-114): Member "runtimeCode" not found or not visible after argument-dependent lookup in type(contract Other).
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol
deleted file mode 100644
index c202046cc4d0..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract Base {
-    function f() public pure returns (uint) {}
-}
-contract Test1 is Base {
-    function creation() public pure returns (bytes memory) {
-        return type(Test1).creationCode;
-    }
-}
-contract Test2 is Base {
-    function runtime() public pure returns (bytes memory) {
-        return type(Test2).runtimeCode;
-    }
-}
-contract Test3 is Base {
-    function creationBase() public pure returns (bytes memory) {
-        return type(Base).creationCode;
-    }
-}
-contract Test4 is Base {
-    function runtimeBase() public pure returns (bytes memory) {
-        return type(Base).runtimeCode;
-    }
-}
-// ----
-// TypeError 7813: (166-190): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (300-323): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol
deleted file mode 100644
index 57e3263e3249..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract A {
-    function f() public pure {
-        type(B).runtimeCode;
-    }
-}
-contract B {
-    function f() public pure {
-        type(A).runtimeCode;
-    }
-}
-// ----
-// TypeError 7813: (52-71): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (133-152): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessIsConstant.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessIsConstant.sol
deleted file mode 100644
index cda5d5c349f7..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessIsConstant.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    bytes constant c = type(B).creationCode;
-    bytes constant r = type(B).runtimeCode;
-
-}
-contract B { function f() public pure {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessLibrary.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessLibrary.sol
deleted file mode 100644
index f746dc35d1de..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessLibrary.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    function creationOther() public pure returns (bytes memory) {
-        return type(Library).creationCode;
-    }
-    function runtime() public pure returns (bytes memory) {
-        return type(Library).runtimeCode;
-    }
-}
-contract Library {
-    function f(uint) public pure returns (uint) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol
deleted file mode 100644
index 7d057e132b17..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Other {
-    function f(uint) public pure returns (uint) {}
-}
-contract SuperTest is Other {
-	function creationSuper() public pure returns (bytes memory) {
-		return type(super).creationCode;
-	}
-	function runtimeOther() public pure returns (bytes memory) {
-		return type(super).runtimeCode;
-	}
-}
-// ----
-// TypeError 4259: (177-182): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super SuperTest) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol b/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol
deleted file mode 100644
index c9cade179f55..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    function f() public pure {
-        type(C).creationCode = new bytes(6);
-        type(C).runtimeCode = new bytes(6);
-    }
-}
-contract C {}
-// ----
-// TypeError 4247: (55-75): Expression has to be an lvalue.
-// TypeError 4247: (100-119): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol
deleted file mode 100644
index 7f4f17552ef1..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure { }
-    function g(bool c) public {
-        (c ? C : C).f();
-    }
-}
-// ----
-// TypeError 9717: (91-92): Invalid mobile type in true expression.
-// TypeError 3703: (95-96): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/contract_min.sol b/test/libsolidity/syntaxTests/metaTypes/contract_min.sol
deleted file mode 100644
index d6c0789c149d..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/contract_min.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Min {
-	function contractMin() public {
-		type(Min).min;
-	}
-}
-// ----
-// TypeError 9582: (50-63): Member "min" not found or not visible after argument-dependent lookup in type(contract Min).
diff --git a/test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol b/test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol
deleted file mode 100644
index 3afd4d296f0c..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool c) pure public returns (int) {
-        return (c ? int : int)(0);
-    }
-}
-// ----
-// TypeError 9717: (84-87): Invalid mobile type in true expression.
-// TypeError 3703: (90-93): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/int_name.sol b/test/libsolidity/syntaxTests/metaTypes/int_name.sol
deleted file mode 100644
index d8f3acd03197..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/int_name.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	function intName() public {
-		type(int).name;
-	}
-}
-// ----
-// TypeError 9582: (47-61): Member "name" not found or not visible after argument-dependent lookup in type(int256).
diff --git a/test/libsolidity/syntaxTests/metaTypes/integer.sol b/test/libsolidity/syntaxTests/metaTypes/integer.sol
deleted file mode 100644
index 992efdb25da6..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/integer.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract Test {
-    function basic() public pure {
-        uint uintMax = type(uint).max;
-        uintMax;
-        int intMax = type(int).max;
-        intMax;
-        uint uintMin = type(uint).min;
-        uintMin;
-        int intMin = type(int).min;
-        intMin;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
deleted file mode 100644
index 7e703b72e51f..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract Test {
-    function assignment() public {
-        uint8 uint8Min = type(int).min;
-        uint uintMin = type(int).min;
-
-        if (type(int).min == 2**256 - 1) {
-            uintMin;
-        }
-
-    }
-}
-// ----
-// TypeError 9574: (59-89): Type int256 is not implicitly convertible to expected type uint8.
-// TypeError 9574: (99-127): Type int256 is not implicitly convertible to expected type uint256.
-// TypeError 2271: (142-169): Built-in binary operator == cannot be applied to types int256 and int_const 1157...(70 digits omitted)...9935.
diff --git a/test/libsolidity/syntaxTests/metaTypes/integer_pure.sol b/test/libsolidity/syntaxTests/metaTypes/integer_pure.sol
deleted file mode 100644
index ad78c2715870..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/integer_pure.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-
-    function viewAssignment() public view {
-        int min = type(int).min;
-        min;
-    }
-
-    function assignment() public {
-        int max = type(int).max;
-        max;
-    }
-
-}
-// ----
-// Warning 2018: (21-112): Function state mutability can be restricted to pure
-// Warning 2018: (118-200): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol b/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol
deleted file mode 100644
index 0740b31cfd1c..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-interface ERC165 {
-    /// @notice Query if a contract implements an interface
-    /// @param interfaceID The interface identifier, as specified in ERC-165
-    /// @dev Interface identification is specified in ERC-165. This function
-    ///  uses less than 30,000 gas.
-    /// @return `true` if the contract implements `interfaceID` and
-    ///  `interfaceID` is not 0xffffffff, `false` otherwise
-    function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-abstract contract Test is ERC165 {
-    function hello() public pure returns (bytes4 data){
-        return type(super).interfaceID;
-    }
-}
-// ----
-// TypeError 4259: (592-597): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super Test) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol
deleted file mode 100644
index e1e147a15c06..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library L {
-    function f() public pure { }
-}
-
-contract C {
-    function g(bool c) public {
-        (c ? L : L).f();
-    }
-}
-// ----
-// TypeError 9717: (106-107): Invalid mobile type in true expression.
-// TypeError 3703: (110-111): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol b/test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol
deleted file mode 100644
index ce4a1262300d..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function max(bool isUint) pure public returns (uint8) {
-        return (isUint ? type(uint8) : type(int8)).max;
-    }
-}
-// ----
-// TypeError 9717: (98-109): Invalid mobile type in true expression.
-// TypeError 3703: (112-122): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/name.sol b/test/libsolidity/syntaxTests/metaTypes/name.sol
deleted file mode 100644
index c8b8f78c7ec3..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/name.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Test {
-    function f() public pure returns (string memory) {
-        return type(Test).name;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/name_constant.sol b/test/libsolidity/syntaxTests/metaTypes/name_constant.sol
deleted file mode 100644
index a90160389273..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/name_constant.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-  string public constant name = type(C).name;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/name_other_contract.sol b/test/libsolidity/syntaxTests/metaTypes/name_other_contract.sol
deleted file mode 100644
index 35e7f272096d..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/name_other_contract.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract Test {
-    function f() public pure returns (string memory) {
-        return type(C).name;
-    }
-    function g() public pure returns (string memory) {
-        return type(A).name;
-    }
-    function h() public pure returns (string memory) {
-        return type(I).name;
-    }
-}
-
-abstract contract A {
-	function f() virtual public pure;
-}
-
-interface I {
-	function f() external pure;
-}
-
-contract C {
-    function f() pure public {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol b/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol
deleted file mode 100644
index 3e2d577d54cf..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function creation() public pure returns (bytes memory) {
-        type();
-    }
-}
-// ----
-// TypeError 8885: (85-91): This function takes one argument, but 0 were provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol b/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol
deleted file mode 100644
index 40eaee040cbe..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract Test {
-    function f() public pure returns (uint) {
-        return type(C).runtimeCode.length +
-            type(D).runtimeCode.length +
-            type(C).creationCode.length +
-            type(D).creationCode.length;
-    }
-}
-contract C {
-    constructor() { assembly {} }
-}
-contract D is C {
-    constructor() {}
-}
-// ----
-// Warning 6417: (77-96): The constructor of the contract (or its base) uses inline assembly. Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode.
-// Warning 6417: (118-137): The constructor of the contract (or its base) uses inline assembly. Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode.
diff --git a/test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol b/test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol
deleted file mode 100644
index b2b9b2adcb6b..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract A {
-    function f() public {}
-}
-
-contract B {
-    function g() public {}
-}
-
-contract C {
-    function ab(bool getA) pure public returns (bytes memory) {
-        return (getA ? type(A) : type(B)).runtimeCode;
-    }
-}
-// ----
-// TypeError 9717: (186-193): Invalid mobile type in true expression.
-// TypeError 3703: (196-203): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol
deleted file mode 100644
index 5d531d23fc0b..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-struct S {
-    uint x;
-    uint y;
-    uint z;
-}
-
-contract C {
-    function f(bool c) public pure {
-        S memory s = (c ? S : S)(0, 1, 2);
-    }
-}
-// ----
-// TypeError 9717: (126-127): Invalid mobile type in true expression.
-// TypeError 3703: (130-131): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/super_name.sol b/test/libsolidity/syntaxTests/metaTypes/super_name.sol
deleted file mode 100644
index 5795b81908c7..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/super_name.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-pragma abicoder v2;
-
-function compareStrings(string memory s1, string memory s2) returns (bool) {
-    return keccak256(abi.encodePacked(s1)) == keccak256(abi.encodePacked(s2));
-}
-
-contract A {
-    string[] r;
-    function f() public virtual returns (bool) {
-        r.push("");
-
-        return false;
-    }
-}
-
-
-contract B is A {
-    function f() public virtual override returns (bool) {
-        super.f();
-        r.push(type(super).name);
-
-        return false;
-    }
-}
-
-
-contract C is A {
-    function f() public virtual override returns (bool) {
-        super.f();
-        r.push(type(super).name);
-
-        return false;
-    }
-}
-
-
-contract D is B, C {
-    function f() public override(B, C) returns (bool) {
-        super.f();
-        r.push(type(super).name);
-        // Order of calls: D.f, C.f, B.f, A.f
-        // r contains "", "A", "B", "C"
-        assert(r.length == 4);
-        assert(compareStrings(r[0], ""));
-        assert(compareStrings(r[1], "A"));
-        assert(compareStrings(r[2], "B"));
-        assert(compareStrings(r[3], "C"));
-
-        return true;
-    }
-}
-// ----
-// TypeError 4259: (426-431): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super B) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol b/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol
deleted file mode 100644
index 38d4e9a58c47..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function creation() public pure returns (bytes memory) {
-        type(1, 2);
-    }
-}
-// ----
-// TypeError 8885: (85-95): This function takes one argument, but 2 were provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol
deleted file mode 100644
index b8f44134e7fd..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract type { }
-// ----
-// ParserError 2314: (9-13): Expected identifier but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol
deleted file mode 100644
index a22b45efb45f..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Test {
-    function type() public pure {
-    }
-}
-// ----
-// ParserError 2314: (29-33): Expected identifier but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol
deleted file mode 100644
index b1ba7e542956..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Test {
-    function f(uint type) public pure {
-    }
-}
-// ----
-// ParserError 2314: (36-40): Expected ',' but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol
deleted file mode 100644
index 213eef18c79c..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Test {
-    uint type;
-}
-// ----
-// ParserError 2314: (25-29): Expected identifier but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol
deleted file mode 100644
index 256b4b582217..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function f() public pure {
-        uint type;
-    }
-}
-// ----
-// ParserError 2314: (60-64): Expected ';' but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol b/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol
deleted file mode 100644
index 53b2d819e57d..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Test {
-    function f() public pure returns (bytes memory) {
-        type(Test);
-    }
-}
-// ----
-// Warning 6321: (54-66): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6133: (78-88): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol b/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol
deleted file mode 100644
index 427caf4d01ce..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    function f() public pure {
-        type(type(type(Test)));
-    }
-}
-// ----
-// TypeError 4259: (65-75): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract Test) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol b/test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol
deleted file mode 100644
index 9e926738d2e8..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool b) public pure returns (uint) {
-        return type(b ? uint : uint).max;
-    }
-}
-// ----
-// TypeError 9717: (89-93): Invalid mobile type in true expression.
-// TypeError 3703: (96-100): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol b/test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol
deleted file mode 100644
index c5a5e82c3c08..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function max() public pure returns (uint8) {
-        return (type(uint8)).max;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol b/test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol
deleted file mode 100644
index b015641738c6..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool c) pure public {
-        type(c ? uint : uint);
-    }
-}
-// ----
-// TypeError 9717: (67-71): Invalid mobile type in true expression.
-// TypeError 3703: (74-78): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_max.sol b/test/libsolidity/syntaxTests/metaTypes/type_max.sol
deleted file mode 100644
index 4d3b5886e391..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_max.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function max() public pure returns (uint8) {
-        return type(uint8).max;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol b/test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol
deleted file mode 100644
index 873b2e679b95..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function max(bool isUint) public returns (uint8) {
-        return (isUint ? type(uint8) : type(int8)).max;
-    }
-}
-// ----
-// TypeError 9717: (93-104): Invalid mobile type in true expression.
-// TypeError 3703: (107-117): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol b/test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol
deleted file mode 100644
index 6b054b4dacfb..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-}
-
-contract C {
-    function f() public pure returns (bytes memory) {
-        return type(A).runtimeCode;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol b/test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol
deleted file mode 100644
index 8fcf65480e12..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-}
-
-contract B {
-}
-
-contract C {
-    function f(bool getA) public returns (bytes memory) {
-        return (getA ? type(A) : type(B)).runtimeCode;
-    }
-}
-// ----
-// TypeError 9717: (126-133): Invalid mobile type in true expression.
-// TypeError 3703: (136-143): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol b/test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol
deleted file mode 100644
index aa7686ed8168..000000000000
--- a/test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-    struct S { uint x; }
-    function f() public pure {
-        // Unsupported for now, but might be supported in the future
-        type(S);
-    }
-}
-// ----
-// TypeError 4259: (154-155): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(struct Test.S storage pointer) provided.
diff --git a/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol b/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
deleted file mode 100644
index 32ae4045b87a..000000000000
--- a/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-pragma abicoder               v2;
-
-contract Ownable {
-    address private _owner;
-
-    modifier onlyOwner() {
-        require(msg.sender == _owner, "Ownable: caller is not the owner");
-        _;
-    }
-
-    function renounceOwnership() public onlyOwner { }
-}
-
-library VoteTiming {
-    function init(uint phaseLength) internal pure {
-        require(true, "");
-    }
-}
-
-contract Voting is Ownable {
-    constructor() {
-        VoteTiming.init(1);
-    }
-}
-// ----
-// Warning 5667: (299-315): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/syntaxTests/missing_state_variable.sol b/test/libsolidity/syntaxTests/missing_state_variable.sol
deleted file mode 100644
index 5ba3429f3f31..000000000000
--- a/test/libsolidity/syntaxTests/missing_state_variable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Scope {
-    function getStateVar() view public returns (uint stateVar) {
-        stateVar = Scope.stateVar; // should fail.
-    }
-}
-// ----
-// TypeError 9582: (101-115): Member "stateVar" not found or not visible after argument-dependent lookup in type(contract Scope).
diff --git a/test/libsolidity/syntaxTests/modifiers/access_in_library.sol b/test/libsolidity/syntaxTests/modifiers/access_in_library.sol
deleted file mode 100644
index 052c60bdedbb..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/access_in_library.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-    modifier m() { _; }
-}
-contract C {
-    function f() L.m public {
-    }
-}
-// ----
-// TypeError 9428: (68-71): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol b/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol
deleted file mode 100644
index d0a376fa5094..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C { constructor(uint a) {} }
-contract B is C {
-    constructor() C(2) C(2) {}
-}
-// ----
-// DeclarationError 3364: (74-78): Base constructor arguments given twice.
-// DeclarationError 1697: (79-83): Base constructor already provided.
diff --git a/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol b/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol
deleted file mode 100644
index 8a1071a6c14c..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    constructor() C() {}
-}
-// ----
-// TypeError 4659: (31-34): Referenced declaration is neither modifier nor base class.
diff --git a/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol b/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol
deleted file mode 100644
index 007a1bc133ed..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// This caused a segfault in an earlier version
-contract C {
-    constructor() {}
-}
-contract D is C {
-    constructor() C(5) {}
-}
-// ----
-// TypeError 2973: (120-124): Wrong argument count for modifier invocation: 1 arguments given but expected 0.
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol
deleted file mode 100644
index 430b8afe1ffc..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    modifier m() { _; }
-}
-contract D {
-    function f() C.m public {
-    }
-}
-// ----
-// TypeError 9428: (69-72): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_base.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_base.sol
deleted file mode 100644
index 391feb859cb4..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_base.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    modifier m() { _; }
-}
-contract D is C {
-    function f() C.m public {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol
deleted file mode 100644
index b70ba3092be7..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    modifier m() { _; }
-}
-contract D is C {
-    function f() super.m public {
-    }
-}
-// ----
-// DeclarationError 7920: (74-81): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol
deleted file mode 100644
index 7ca8b9ca21c0..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {}
-contract C is A {
-    modifier m() { _; }
-}
-contract D is A {
-    function f() C.m public {
-    }
-}
-contract T is D, C {}
-// ----
-// TypeError 9428: (93-96): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_contract.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_contract.sol
deleted file mode 100644
index 9b0a805adf26..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_contract.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    modifier m { _; }
-    modifier mv virtual { _; }
-}
-
-abstract contract A {
-    modifier m { _; }
-    modifier mv virtual { _; }
-    modifier muv virtual;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol
deleted file mode 100644
index 2018ae4eabbd..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    modifier mu;
-    modifier muv virtual;
-}
-// ----
-// TypeError 3656: (0-57): Contract "C" should be marked as abstract.
-// TypeError 8063: (17-29): Modifiers without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol
deleted file mode 100644
index 2f8281bdeb83..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-interface I {
-    modifier m { _; }
-    modifier mu;
-    modifier mv virtual { _; }
-    modifier muv virtual;
-}
-// ----
-// TypeError 6408: (18-35): Modifiers cannot be defined or declared in interfaces.
-// TypeError 6408: (40-52): Modifiers cannot be defined or declared in interfaces.
-// TypeError 8063: (40-52): Modifiers without implementation must be marked virtual.
-// TypeError 6408: (57-83): Modifiers cannot be defined or declared in interfaces.
-// TypeError 6408: (88-109): Modifiers cannot be defined or declared in interfaces.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol
deleted file mode 100644
index 6acbf3a0f603..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    modifier mv virtual { _; }
-}
-// ----
-// TypeError 3275: (16-42): Modifiers in a library cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol
deleted file mode 100644
index 5fbc35682258..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L {
-    modifier mu;
-    modifier muv virtual;
-}
-// ----
-// TypeError 8063: (16-28): Modifiers without implementation must be marked virtual.
-// TypeError 3275: (33-54): Modifiers in a library cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_library_virtual.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_library_virtual.sol
deleted file mode 100644
index 173a94536b0c..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_library_virtual.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library L {
-    modifier m { _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol b/test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol
deleted file mode 100644
index 568743b36398..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-    modifier a(bool payable) {}
-    modifier b(string payable) {}
-    modifier c(int payable) {}
-    modifier d(int256 payable) {}
-    modifier e(uint payable) {}
-    modifier f(uint256 payable) {}
-    modifier g(bytes1 payable) {}
-    modifier h(bytes payable) {}
-    modifier i(bytes32 payable) {}
-    modifier j(fixed payable) {}
-    modifier k(fixed80x80 payable) {}
-    modifier l(ufixed payable) {}
-    modifier m(ufixed80x80 payable) {}
-}
-contract C2 {
-    modifier a(bool view) {}
-    modifier b(string view) {}
-    modifier c(int view) {}
-    modifier d(int256 view) {}
-    modifier e(uint view) {}
-    modifier f(uint256 view) {}
-    modifier g(bytes1 view) {}
-    modifier h(bytes view) {}
-    modifier i(bytes32 view) {}
-    modifier j(fixed view) {}
-    modifier k(fixed80x80 view) {}
-    modifier l(ufixed view) {}
-    modifier m(ufixed80x80 view) {}
-}
-contract C3 {
-    modifier a(bool pure) {}
-    modifier b(string pure) {}
-    modifier c(int pure) {}
-    modifier d(int256 pure) {}
-    modifier e(uint pure) {}
-    modifier f(uint256 pure) {}
-    modifier g(bytes1 pure) {}
-    modifier h(bytes pure) {}
-    modifier i(bytes32 pure) {}
-    modifier j(fixed pure) {}
-    modifier k(fixed80x80 pure) {}
-    modifier l(ufixed pure) {}
-    modifier m(ufixed80x80 pure) {}
-}
-// ----
-// ParserError 9106: (33-40): State mutability can only be specified for address types.
-// ParserError 9106: (67-74): State mutability can only be specified for address types.
-// ParserError 9106: (98-105): State mutability can only be specified for address types.
-// ParserError 9106: (132-139): State mutability can only be specified for address types.
-// ParserError 9106: (164-171): State mutability can only be specified for address types.
-// ParserError 9106: (199-206): State mutability can only be specified for address types.
-// ParserError 9106: (233-240): State mutability can only be specified for address types.
-// ParserError 9106: (266-273): State mutability can only be specified for address types.
-// ParserError 9106: (301-308): State mutability can only be specified for address types.
-// ParserError 9106: (334-341): State mutability can only be specified for address types.
-// ParserError 9106: (372-379): State mutability can only be specified for address types.
-// ParserError 9106: (406-413): State mutability can only be specified for address types.
-// ParserError 9106: (445-452): State mutability can only be specified for address types.
-// ParserError 9106: (493-497): State mutability can only be specified for address types.
-// ParserError 9106: (524-528): State mutability can only be specified for address types.
-// ParserError 9106: (552-556): State mutability can only be specified for address types.
-// ParserError 9106: (583-587): State mutability can only be specified for address types.
-// ParserError 9106: (612-616): State mutability can only be specified for address types.
-// ParserError 9106: (644-648): State mutability can only be specified for address types.
-// ParserError 9106: (675-679): State mutability can only be specified for address types.
-// ParserError 9106: (705-709): State mutability can only be specified for address types.
-// ParserError 9106: (737-741): State mutability can only be specified for address types.
-// ParserError 9106: (767-771): State mutability can only be specified for address types.
-// ParserError 9106: (802-806): State mutability can only be specified for address types.
-// ParserError 9106: (833-837): State mutability can only be specified for address types.
-// ParserError 9106: (869-873): State mutability can only be specified for address types.
-// ParserError 9106: (914-918): State mutability can only be specified for address types.
-// ParserError 9106: (945-949): State mutability can only be specified for address types.
-// ParserError 9106: (973-977): State mutability can only be specified for address types.
-// ParserError 9106: (1004-1008): State mutability can only be specified for address types.
-// ParserError 9106: (1033-1037): State mutability can only be specified for address types.
-// ParserError 9106: (1065-1069): State mutability can only be specified for address types.
-// ParserError 9106: (1096-1100): State mutability can only be specified for address types.
-// ParserError 9106: (1126-1130): State mutability can only be specified for address types.
-// ParserError 9106: (1158-1162): State mutability can only be specified for address types.
-// ParserError 9106: (1188-1192): State mutability can only be specified for address types.
-// ParserError 9106: (1223-1227): State mutability can only be specified for address types.
-// ParserError 9106: (1254-1258): State mutability can only be specified for address types.
-// ParserError 9106: (1290-1294): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/modifiers/empty_modifier_body.sol b/test/libsolidity/syntaxTests/modifiers/empty_modifier_body.sol
deleted file mode 100644
index 0c0e821f5612..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/empty_modifier_body.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-abstract contract A { modifier mod(uint a) virtual;}
-contract B is A { modifier mod(uint a) override { _; } }
-
-abstract contract C {
-	modifier m virtual;
-	function f() m public {
-
-	}
-}
-contract D is C {
-	modifier m override {
-		_;
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol b/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol
deleted file mode 100644
index e9e03f30423b..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {modifier m virtual;}
-
-abstract contract B {modifier m virtual;}
-contract C is B { }
-
-abstract contract D {modifier m;}
-// ----
-// TypeError 3656: (0-32): Contract "A" should be marked as abstract.
-// TypeError 3656: (76-95): Contract "C" should be marked as abstract.
-// TypeError 8063: (118-129): Modifiers without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/function_modifier_double_invocation.sol b/test/libsolidity/syntaxTests/modifiers/function_modifier_double_invocation.sol
deleted file mode 100644
index c6e0d4ebf05d..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/function_modifier_double_invocation.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract B {
-    function f(uint x) mod(x) mod(2) public pure { }
-    modifier mod(uint a) { if (a > 0) _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation.sol b/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation.sol
deleted file mode 100644
index 02d791fcbf2b..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract B {
-    function f() mod1(2, true) mod2("0123456") pure public { }
-    modifier mod1(uint a, bool b) { if (b) _; }
-    modifier mod2(bytes7 a) { while (a == "1234567") _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol b/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol
deleted file mode 100644
index 2616ab9f841d..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract B {
-    function f() mod(x) pure public { uint x = 7; }
-    modifier mod(uint a) { if (a > 0) _; }
-}
-// ----
-// DeclarationError 7576: (34-35): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_parameters.sol b/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_parameters.sol
deleted file mode 100644
index cf6a72f0198f..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_parameters.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract B {
-    function f(uint8 a) mod1(a, true) mod2(r) pure public returns (bytes7 r) { }
-    modifier mod1(uint a, bool b) { if (b) _; }
-    modifier mod2(bytes7 a) { while (a == "1234567") _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol b/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol
deleted file mode 100644
index 4be6bc898453..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { function mod(uint a) public { } }
-contract B is A { modifier mod(uint a) { _; } }
-// ----
-// DeclarationError 9097: (65-92): Identifier already declared.
-// TypeError 5631: (65-92): Override changes function or public state variable to modifier.
diff --git a/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol b/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol
deleted file mode 100644
index 81a2fe29bf3e..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A { modifier mod(uint a) { _; } }
-contract B is A { modifier mod(uint8 a) { _; } }
-// ----
-// TypeError 1078: (61-89): Override changes modifier signature.
-// TypeError 9456: (61-89): Overriding modifier is missing "override" specifier.
-// TypeError 4334: (13-40): Trying to override non-virtual modifier. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/modifiers/illegal_name.sol b/test/libsolidity/syntaxTests/modifiers/illegal_name.sol
deleted file mode 100644
index e29122b74a42..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/illegal_name.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	modifier this { _; }
-	modifier super { _; }
-	modifier _ { _; }
-}
-// ----
-// DeclarationError 3726: (14-34): The name "this" is reserved.
-// DeclarationError 3726: (36-57): The name "super" is reserved.
-// DeclarationError 3726: (59-76): The name "_" is reserved.
-// Warning 2319: (14-34): This declaration shadows a builtin symbol.
-// Warning 2319: (36-57): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol b/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol
deleted file mode 100644
index 37cc50beb844..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract B {
-    function f() mod1(true) public { }
-    modifier mod1(uint a) { if (a > 0) _; }
-}
-// ----
-// TypeError 4649: (35-39): Invalid type for argument in modifier invocation. Invalid implicit conversion from bool to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol
deleted file mode 100644
index a19d7beb2db2..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract B {
-    modifier mod1(uint indexed a) { _; }
-}
-// ----
-// ParserError 2314: (36-43): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol
deleted file mode 100644
index f23861ebf49d..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-    modifier mod1(uint constant a) { _; }
-    modifier mod2(uint immutable a) { _; }
-}
-// ----
-// DeclarationError 1788: (31-46): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 8297: (73-89): The "immutable" keyword can only be used for state variables.
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol
deleted file mode 100644
index 0ef9e5c056b4..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-contract A {
-    modifier mod(uint internal a) { _; }
-}
-==== Source: B ====
-contract A {
-    modifier mod(uint external a) { _; }
-}
-==== Source: C ====
-contract A {
-    modifier mod(uint public a) { _; }
-}
-==== Source: D ====
-contract A {
-    modifier mod(uint private a) { _; }
-}
-// ----
-// ParserError 2314: (A:35-43): Expected ',' but got 'internal'
-// ParserError 2314: (B:35-43): Expected ',' but got 'external'
-// ParserError 2314: (C:35-41): Expected ',' but got 'public'
-// ParserError 2314: (D:35-42): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/modifiers/legal_modifier_override.sol b/test/libsolidity/syntaxTests/modifiers/legal_modifier_override.sol
deleted file mode 100644
index 62356abb133c..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/legal_modifier_override.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract A { modifier mod(uint a) virtual { _; } }
-contract B is A { modifier mod(uint a) override { _; } }
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/library_via_using.sol b/test/libsolidity/syntaxTests/modifiers/library_via_using.sol
deleted file mode 100644
index bac0b33da729..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/library_via_using.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    modifier m() { _; }
-}
-contract C {
-    using L for *;
-    function f() L.m public {
-    }
-}
-// ----
-// TypeError 9428: (87-90): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol b/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol
deleted file mode 100644
index dd3ef4499fdf..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    modifier m() virtual { _; }
-}
-abstract contract B is A {
-    modifier m() virtual override;
-}
-contract C is B {
-    function f() m public {}
-}
-// ----
-// TypeError 4593: (78-108): Overriding an implemented modifier with an unimplemented modifier is not allowed.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol b/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol
deleted file mode 100644
index a22344cab72d..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { modifier mod(uint a) { _; } }
-contract B is A { function mod(uint a) public { } }
-// ----
-// DeclarationError 9097: (61-92): Identifier already declared.
-// TypeError 1469: (61-92): Override changes modifier to function.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol b/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol
deleted file mode 100644
index 1f170601f351..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { modifier mod(uint a) { _; } }
-contract B is A { uint public mod; }
-// ----
-// DeclarationError 9097: (61-76): Identifier already declared.
-// TypeError 1456: (61-76): Override changes modifier to public state variable.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol b/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol
deleted file mode 100644
index fc658e62550e..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A {
-    function f(uint a) mod(2) public returns (uint r) { }
-    modifier mod(uint a) { _; return 7; }
-}
-// ----
-// TypeError 7552: (101-109): Return arguments not allowed.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol b/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol
deleted file mode 100644
index c1689c44d300..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    modifier m() {}
-}
-// ----
-// SyntaxError 2883: (33-35): Modifier body does not contain '_'.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifiers_on_abstract_functions_no_parser_error.sol b/test/libsolidity/syntaxTests/modifiers/modifiers_on_abstract_functions_no_parser_error.sol
deleted file mode 100644
index 16061fbafd4c..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/modifiers_on_abstract_functions_no_parser_error.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// Previous versions of Solidity turned this
-// into a parser error (they wrongly recognized
-// these functions as state variables of
-// function type).
-abstract contract C
-{
-    modifier only_owner() { _; }
-    function foo() only_owner public virtual;
-    function bar() public only_owner virtual;
-}
-// ----
-// SyntaxError 2668: (212-253): Functions without implementation cannot have modifiers.
-// SyntaxError 2668: (258-299): Functions without implementation cannot have modifiers.
diff --git a/test/libsolidity/syntaxTests/modifiers/multiple_inheritance_unimplemented_override.sol b/test/libsolidity/syntaxTests/modifiers/multiple_inheritance_unimplemented_override.sol
deleted file mode 100644
index 81e1c3565b80..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/multiple_inheritance_unimplemented_override.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    modifier m() virtual { _; }
-}
-abstract contract B {
-    modifier m() virtual;
-}
-contract C is A, B {
-    modifier m() override(A, B) { _; }
-    function f() m public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol b/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
deleted file mode 100644
index e264a593ff2c..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-    modifier mod1(string storage storage a) { _; }
-    modifier mod2(string storage memory a) { _; }
-    modifier mod3(string storage calldata a) { _; }
-    modifier mod4(string memory storage a) { _; }
-    modifier mod5(string memory memory a) { _; }
-    modifier mod6(string memory calldata a) { _; }
-    modifier mod7(string calldata storage a) { _; }
-    modifier mod8(string calldata memory a) { _; }
-    modifier mod9(string calldata calldata a) { _; }
-}
-// ----
-// ParserError 3548: (46-53): Location already specified.
-// ParserError 3548: (97-103): Location already specified.
-// ParserError 3548: (147-155): Location already specified.
-// ParserError 3548: (198-205): Location already specified.
-// ParserError 3548: (248-254): Location already specified.
-// ParserError 3548: (297-305): Location already specified.
-// ParserError 3548: (350-357): Location already specified.
-// ParserError 3548: (402-408): Location already specified.
-// ParserError 3548: (453-461): Location already specified.
diff --git a/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol b/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol
deleted file mode 100644
index 1dcd26ad79bc..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { modifier mod(uint a) { _; } }
-contract B is A { modifier mod(uint a) override { _; } }
-// ----
-// TypeError 4334: (13-40): Trying to override non-virtual modifier. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/modifiers/unimplemented_function_and_modifier.sol b/test/libsolidity/syntaxTests/modifiers/unimplemented_function_and_modifier.sol
deleted file mode 100644
index bf823748c85b..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/unimplemented_function_and_modifier.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract A {
-  function foo() public virtual;
-  function foo(uint x) virtual public returns(uint);
-  modifier mod() virtual;
-}
-
-contract B is A {
-  function foo(uint x) override public returns(uint) {return x;}
-  modifier mod() override { _; }
-}
-
-contract C is A {
-  function foo() public override {}
-  modifier mod() override { _; }
-}
-
-contract D is A {
-  function foo() public override {}
-  function foo(uint x) override public returns(uint) {return x;}
-}
-
-/* No errors */
-contract E is A {
-  function foo() public override {}
-  function foo(uint x) override public returns(uint) {return x;}
-  modifier mod() override { _;}
-}
-// ----
-// TypeError 3656: (137-254): Contract "B" should be marked as abstract.
-// TypeError 3656: (256-344): Contract "C" should be marked as abstract.
-// TypeError 3656: (346-466): Contract "D" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/modifiers/unimplemented_override_unimplemented.sol b/test/libsolidity/syntaxTests/modifiers/unimplemented_override_unimplemented.sol
deleted file mode 100644
index ae041ebfc61b..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/unimplemented_override_unimplemented.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract contract A {
-    modifier m() virtual;
-}
-abstract contract B is A {
-    modifier m() virtual override;
-}
-abstract contract C is B {
-    modifier m() virtual override;
-    function f() m public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol b/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol
deleted file mode 100644
index 897a23874186..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    modifier mod() { _; }
-
-    function f() public {
-        mod  ;
-    }
-}
-// ----
-// TypeError 3112: (77-80): Modifier can only be referenced in function headers.
diff --git a/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol b/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol
deleted file mode 100644
index febdd96159fb..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-interface I {
-  function f() external m pure returns (uint);
-  modifier m() { _; }
-}
-// ----
-// SyntaxError 5842: (16-60): Functions in interfaces cannot have modifiers.
-// TypeError 6408: (63-82): Modifiers cannot be defined or declared in interfaces.
diff --git a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_from_base.sol b/test/libsolidity/syntaxTests/modifiers/use_unimplemented_from_base.sol
deleted file mode 100644
index 6d6423e7e133..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_from_base.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-    modifier m() virtual;
-    function f() m public {}
-}
-contract B is A {
-    modifier m() virtual override { _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_on_overridden_func.sol b/test/libsolidity/syntaxTests/modifiers/use_unimplemented_on_overridden_func.sol
deleted file mode 100644
index 5f6de4ce8302..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_on_overridden_func.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract A {
-    modifier m() virtual;
-    function f() m public virtual {}
-}
-abstract contract B is A {
-    function f() public override {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol b/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol
deleted file mode 100644
index a6fcd7eafae3..000000000000
--- a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    modifier m() virtual { _; }
-}
-abstract contract B {
-    modifier m() virtual;
-}
-contract C is A, B {
-    modifier m() override(A, B) { _; }
-    function f() B.m public {}
-}
-// ----
-// TypeError 1835: (174-177): Cannot call unimplemented modifier. The modifier has no implementation in the referenced contract. Refer to it by its unqualified name if you want to call the implementation from the most derived contract.
diff --git a/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol b/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol
deleted file mode 100644
index ff1697e1e609..000000000000
--- a/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol
+++ /dev/null
@@ -1,524 +0,0 @@
-contract C {
-  function f() public {
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-    b = 5;
-  }
-}
-// ----
-// DeclarationError 7576: (41-42): Undeclared identifier.
-// DeclarationError 7576: (52-53): Undeclared identifier.
-// DeclarationError 7576: (63-64): Undeclared identifier.
-// DeclarationError 7576: (74-75): Undeclared identifier.
-// DeclarationError 7576: (85-86): Undeclared identifier.
-// DeclarationError 7576: (96-97): Undeclared identifier.
-// DeclarationError 7576: (107-108): Undeclared identifier.
-// DeclarationError 7576: (118-119): Undeclared identifier.
-// DeclarationError 7576: (129-130): Undeclared identifier.
-// DeclarationError 7576: (140-141): Undeclared identifier.
-// DeclarationError 7576: (151-152): Undeclared identifier.
-// DeclarationError 7576: (162-163): Undeclared identifier.
-// DeclarationError 7576: (173-174): Undeclared identifier.
-// DeclarationError 7576: (184-185): Undeclared identifier.
-// DeclarationError 7576: (195-196): Undeclared identifier.
-// DeclarationError 7576: (206-207): Undeclared identifier.
-// DeclarationError 7576: (217-218): Undeclared identifier.
-// DeclarationError 7576: (228-229): Undeclared identifier.
-// DeclarationError 7576: (239-240): Undeclared identifier.
-// DeclarationError 7576: (250-251): Undeclared identifier.
-// DeclarationError 7576: (261-262): Undeclared identifier.
-// DeclarationError 7576: (272-273): Undeclared identifier.
-// DeclarationError 7576: (283-284): Undeclared identifier.
-// DeclarationError 7576: (294-295): Undeclared identifier.
-// DeclarationError 7576: (305-306): Undeclared identifier.
-// DeclarationError 7576: (316-317): Undeclared identifier.
-// DeclarationError 7576: (327-328): Undeclared identifier.
-// DeclarationError 7576: (338-339): Undeclared identifier.
-// DeclarationError 7576: (349-350): Undeclared identifier.
-// DeclarationError 7576: (360-361): Undeclared identifier.
-// DeclarationError 7576: (371-372): Undeclared identifier.
-// DeclarationError 7576: (382-383): Undeclared identifier.
-// DeclarationError 7576: (393-394): Undeclared identifier.
-// DeclarationError 7576: (404-405): Undeclared identifier.
-// DeclarationError 7576: (415-416): Undeclared identifier.
-// DeclarationError 7576: (426-427): Undeclared identifier.
-// DeclarationError 7576: (437-438): Undeclared identifier.
-// DeclarationError 7576: (448-449): Undeclared identifier.
-// DeclarationError 7576: (459-460): Undeclared identifier.
-// DeclarationError 7576: (470-471): Undeclared identifier.
-// DeclarationError 7576: (481-482): Undeclared identifier.
-// DeclarationError 7576: (492-493): Undeclared identifier.
-// DeclarationError 7576: (503-504): Undeclared identifier.
-// DeclarationError 7576: (514-515): Undeclared identifier.
-// DeclarationError 7576: (525-526): Undeclared identifier.
-// DeclarationError 7576: (536-537): Undeclared identifier.
-// DeclarationError 7576: (547-548): Undeclared identifier.
-// DeclarationError 7576: (558-559): Undeclared identifier.
-// DeclarationError 7576: (569-570): Undeclared identifier.
-// DeclarationError 7576: (580-581): Undeclared identifier.
-// DeclarationError 7576: (591-592): Undeclared identifier.
-// DeclarationError 7576: (602-603): Undeclared identifier.
-// DeclarationError 7576: (613-614): Undeclared identifier.
-// DeclarationError 7576: (624-625): Undeclared identifier.
-// DeclarationError 7576: (635-636): Undeclared identifier.
-// DeclarationError 7576: (646-647): Undeclared identifier.
-// DeclarationError 7576: (657-658): Undeclared identifier.
-// DeclarationError 7576: (668-669): Undeclared identifier.
-// DeclarationError 7576: (679-680): Undeclared identifier.
-// DeclarationError 7576: (690-691): Undeclared identifier.
-// DeclarationError 7576: (701-702): Undeclared identifier.
-// DeclarationError 7576: (712-713): Undeclared identifier.
-// DeclarationError 7576: (723-724): Undeclared identifier.
-// DeclarationError 7576: (734-735): Undeclared identifier.
-// DeclarationError 7576: (745-746): Undeclared identifier.
-// DeclarationError 7576: (756-757): Undeclared identifier.
-// DeclarationError 7576: (767-768): Undeclared identifier.
-// DeclarationError 7576: (778-779): Undeclared identifier.
-// DeclarationError 7576: (789-790): Undeclared identifier.
-// DeclarationError 7576: (800-801): Undeclared identifier.
-// DeclarationError 7576: (811-812): Undeclared identifier.
-// DeclarationError 7576: (822-823): Undeclared identifier.
-// DeclarationError 7576: (833-834): Undeclared identifier.
-// DeclarationError 7576: (844-845): Undeclared identifier.
-// DeclarationError 7576: (855-856): Undeclared identifier.
-// DeclarationError 7576: (866-867): Undeclared identifier.
-// DeclarationError 7576: (877-878): Undeclared identifier.
-// DeclarationError 7576: (888-889): Undeclared identifier.
-// DeclarationError 7576: (899-900): Undeclared identifier.
-// DeclarationError 7576: (910-911): Undeclared identifier.
-// DeclarationError 7576: (921-922): Undeclared identifier.
-// DeclarationError 7576: (932-933): Undeclared identifier.
-// DeclarationError 7576: (943-944): Undeclared identifier.
-// DeclarationError 7576: (954-955): Undeclared identifier.
-// DeclarationError 7576: (965-966): Undeclared identifier.
-// DeclarationError 7576: (976-977): Undeclared identifier.
-// DeclarationError 7576: (987-988): Undeclared identifier.
-// DeclarationError 7576: (998-999): Undeclared identifier.
-// DeclarationError 7576: (1009-1010): Undeclared identifier.
-// DeclarationError 7576: (1020-1021): Undeclared identifier.
-// DeclarationError 7576: (1031-1032): Undeclared identifier.
-// DeclarationError 7576: (1042-1043): Undeclared identifier.
-// DeclarationError 7576: (1053-1054): Undeclared identifier.
-// DeclarationError 7576: (1064-1065): Undeclared identifier.
-// DeclarationError 7576: (1075-1076): Undeclared identifier.
-// DeclarationError 7576: (1086-1087): Undeclared identifier.
-// DeclarationError 7576: (1097-1098): Undeclared identifier.
-// DeclarationError 7576: (1108-1109): Undeclared identifier.
-// DeclarationError 7576: (1119-1120): Undeclared identifier.
-// DeclarationError 7576: (1130-1131): Undeclared identifier.
-// DeclarationError 7576: (1141-1142): Undeclared identifier.
-// DeclarationError 7576: (1152-1153): Undeclared identifier.
-// DeclarationError 7576: (1163-1164): Undeclared identifier.
-// DeclarationError 7576: (1174-1175): Undeclared identifier.
-// DeclarationError 7576: (1185-1186): Undeclared identifier.
-// DeclarationError 7576: (1196-1197): Undeclared identifier.
-// DeclarationError 7576: (1207-1208): Undeclared identifier.
-// DeclarationError 7576: (1218-1219): Undeclared identifier.
-// DeclarationError 7576: (1229-1230): Undeclared identifier.
-// DeclarationError 7576: (1240-1241): Undeclared identifier.
-// DeclarationError 7576: (1251-1252): Undeclared identifier.
-// DeclarationError 7576: (1262-1263): Undeclared identifier.
-// DeclarationError 7576: (1273-1274): Undeclared identifier.
-// DeclarationError 7576: (1284-1285): Undeclared identifier.
-// DeclarationError 7576: (1295-1296): Undeclared identifier.
-// DeclarationError 7576: (1306-1307): Undeclared identifier.
-// DeclarationError 7576: (1317-1318): Undeclared identifier.
-// DeclarationError 7576: (1328-1329): Undeclared identifier.
-// DeclarationError 7576: (1339-1340): Undeclared identifier.
-// DeclarationError 7576: (1350-1351): Undeclared identifier.
-// DeclarationError 7576: (1361-1362): Undeclared identifier.
-// DeclarationError 7576: (1372-1373): Undeclared identifier.
-// DeclarationError 7576: (1383-1384): Undeclared identifier.
-// DeclarationError 7576: (1394-1395): Undeclared identifier.
-// DeclarationError 7576: (1405-1406): Undeclared identifier.
-// DeclarationError 7576: (1416-1417): Undeclared identifier.
-// DeclarationError 7576: (1427-1428): Undeclared identifier.
-// DeclarationError 7576: (1438-1439): Undeclared identifier.
-// DeclarationError 7576: (1449-1450): Undeclared identifier.
-// DeclarationError 7576: (1460-1461): Undeclared identifier.
-// DeclarationError 7576: (1471-1472): Undeclared identifier.
-// DeclarationError 7576: (1482-1483): Undeclared identifier.
-// DeclarationError 7576: (1493-1494): Undeclared identifier.
-// DeclarationError 7576: (1504-1505): Undeclared identifier.
-// DeclarationError 7576: (1515-1516): Undeclared identifier.
-// DeclarationError 7576: (1526-1527): Undeclared identifier.
-// DeclarationError 7576: (1537-1538): Undeclared identifier.
-// DeclarationError 7576: (1548-1549): Undeclared identifier.
-// DeclarationError 7576: (1559-1560): Undeclared identifier.
-// DeclarationError 7576: (1570-1571): Undeclared identifier.
-// DeclarationError 7576: (1581-1582): Undeclared identifier.
-// DeclarationError 7576: (1592-1593): Undeclared identifier.
-// DeclarationError 7576: (1603-1604): Undeclared identifier.
-// DeclarationError 7576: (1614-1615): Undeclared identifier.
-// DeclarationError 7576: (1625-1626): Undeclared identifier.
-// DeclarationError 7576: (1636-1637): Undeclared identifier.
-// DeclarationError 7576: (1647-1648): Undeclared identifier.
-// DeclarationError 7576: (1658-1659): Undeclared identifier.
-// DeclarationError 7576: (1669-1670): Undeclared identifier.
-// DeclarationError 7576: (1680-1681): Undeclared identifier.
-// DeclarationError 7576: (1691-1692): Undeclared identifier.
-// DeclarationError 7576: (1702-1703): Undeclared identifier.
-// DeclarationError 7576: (1713-1714): Undeclared identifier.
-// DeclarationError 7576: (1724-1725): Undeclared identifier.
-// DeclarationError 7576: (1735-1736): Undeclared identifier.
-// DeclarationError 7576: (1746-1747): Undeclared identifier.
-// DeclarationError 7576: (1757-1758): Undeclared identifier.
-// DeclarationError 7576: (1768-1769): Undeclared identifier.
-// DeclarationError 7576: (1779-1780): Undeclared identifier.
-// DeclarationError 7576: (1790-1791): Undeclared identifier.
-// DeclarationError 7576: (1801-1802): Undeclared identifier.
-// DeclarationError 7576: (1812-1813): Undeclared identifier.
-// DeclarationError 7576: (1823-1824): Undeclared identifier.
-// DeclarationError 7576: (1834-1835): Undeclared identifier.
-// DeclarationError 7576: (1845-1846): Undeclared identifier.
-// DeclarationError 7576: (1856-1857): Undeclared identifier.
-// DeclarationError 7576: (1867-1868): Undeclared identifier.
-// DeclarationError 7576: (1878-1879): Undeclared identifier.
-// DeclarationError 7576: (1889-1890): Undeclared identifier.
-// DeclarationError 7576: (1900-1901): Undeclared identifier.
-// DeclarationError 7576: (1911-1912): Undeclared identifier.
-// DeclarationError 7576: (1922-1923): Undeclared identifier.
-// DeclarationError 7576: (1933-1934): Undeclared identifier.
-// DeclarationError 7576: (1944-1945): Undeclared identifier.
-// DeclarationError 7576: (1955-1956): Undeclared identifier.
-// DeclarationError 7576: (1966-1967): Undeclared identifier.
-// DeclarationError 7576: (1977-1978): Undeclared identifier.
-// DeclarationError 7576: (1988-1989): Undeclared identifier.
-// DeclarationError 7576: (1999-2000): Undeclared identifier.
-// DeclarationError 7576: (2010-2011): Undeclared identifier.
-// DeclarationError 7576: (2021-2022): Undeclared identifier.
-// DeclarationError 7576: (2032-2033): Undeclared identifier.
-// DeclarationError 7576: (2043-2044): Undeclared identifier.
-// DeclarationError 7576: (2054-2055): Undeclared identifier.
-// DeclarationError 7576: (2065-2066): Undeclared identifier.
-// DeclarationError 7576: (2076-2077): Undeclared identifier.
-// DeclarationError 7576: (2087-2088): Undeclared identifier.
-// DeclarationError 7576: (2098-2099): Undeclared identifier.
-// DeclarationError 7576: (2109-2110): Undeclared identifier.
-// DeclarationError 7576: (2120-2121): Undeclared identifier.
-// DeclarationError 7576: (2131-2132): Undeclared identifier.
-// DeclarationError 7576: (2142-2143): Undeclared identifier.
-// DeclarationError 7576: (2153-2154): Undeclared identifier.
-// DeclarationError 7576: (2164-2165): Undeclared identifier.
-// DeclarationError 7576: (2175-2176): Undeclared identifier.
-// DeclarationError 7576: (2186-2187): Undeclared identifier.
-// DeclarationError 7576: (2197-2198): Undeclared identifier.
-// DeclarationError 7576: (2208-2209): Undeclared identifier.
-// DeclarationError 7576: (2219-2220): Undeclared identifier.
-// DeclarationError 7576: (2230-2231): Undeclared identifier.
-// DeclarationError 7576: (2241-2242): Undeclared identifier.
-// DeclarationError 7576: (2252-2253): Undeclared identifier.
-// DeclarationError 7576: (2263-2264): Undeclared identifier.
-// DeclarationError 7576: (2274-2275): Undeclared identifier.
-// DeclarationError 7576: (2285-2286): Undeclared identifier.
-// DeclarationError 7576: (2296-2297): Undeclared identifier.
-// DeclarationError 7576: (2307-2308): Undeclared identifier.
-// DeclarationError 7576: (2318-2319): Undeclared identifier.
-// DeclarationError 7576: (2329-2330): Undeclared identifier.
-// DeclarationError 7576: (2340-2341): Undeclared identifier.
-// DeclarationError 7576: (2351-2352): Undeclared identifier.
-// DeclarationError 7576: (2362-2363): Undeclared identifier.
-// DeclarationError 7576: (2373-2374): Undeclared identifier.
-// DeclarationError 7576: (2384-2385): Undeclared identifier.
-// DeclarationError 7576: (2395-2396): Undeclared identifier.
-// DeclarationError 7576: (2406-2407): Undeclared identifier.
-// DeclarationError 7576: (2417-2418): Undeclared identifier.
-// DeclarationError 7576: (2428-2429): Undeclared identifier.
-// DeclarationError 7576: (2439-2440): Undeclared identifier.
-// DeclarationError 7576: (2450-2451): Undeclared identifier.
-// DeclarationError 7576: (2461-2462): Undeclared identifier.
-// DeclarationError 7576: (2472-2473): Undeclared identifier.
-// DeclarationError 7576: (2483-2484): Undeclared identifier.
-// DeclarationError 7576: (2494-2495): Undeclared identifier.
-// DeclarationError 7576: (2505-2506): Undeclared identifier.
-// DeclarationError 7576: (2516-2517): Undeclared identifier.
-// DeclarationError 7576: (2527-2528): Undeclared identifier.
-// DeclarationError 7576: (2538-2539): Undeclared identifier.
-// DeclarationError 7576: (2549-2550): Undeclared identifier.
-// DeclarationError 7576: (2560-2561): Undeclared identifier.
-// DeclarationError 7576: (2571-2572): Undeclared identifier.
-// DeclarationError 7576: (2582-2583): Undeclared identifier.
-// DeclarationError 7576: (2593-2594): Undeclared identifier.
-// DeclarationError 7576: (2604-2605): Undeclared identifier.
-// DeclarationError 7576: (2615-2616): Undeclared identifier.
-// DeclarationError 7576: (2626-2627): Undeclared identifier.
-// DeclarationError 7576: (2637-2638): Undeclared identifier.
-// DeclarationError 7576: (2648-2649): Undeclared identifier.
-// DeclarationError 7576: (2659-2660): Undeclared identifier.
-// DeclarationError 7576: (2670-2671): Undeclared identifier.
-// DeclarationError 7576: (2681-2682): Undeclared identifier.
-// DeclarationError 7576: (2692-2693): Undeclared identifier.
-// DeclarationError 7576: (2703-2704): Undeclared identifier.
-// DeclarationError 7576: (2714-2715): Undeclared identifier.
-// DeclarationError 7576: (2725-2726): Undeclared identifier.
-// DeclarationError 7576: (2736-2737): Undeclared identifier.
-// DeclarationError 7576: (2747-2748): Undeclared identifier.
-// DeclarationError 7576: (2758-2759): Undeclared identifier.
-// DeclarationError 7576: (2769-2770): Undeclared identifier.
-// DeclarationError 7576: (2780-2781): Undeclared identifier.
-// DeclarationError 7576: (2791-2792): Undeclared identifier.
-// DeclarationError 7576: (2802-2803): Undeclared identifier.
-// DeclarationError 7576: (2813-2814): Undeclared identifier.
-// DeclarationError 7576: (2824-2825): Undeclared identifier.
-// DeclarationError 7576: (2835-2836): Undeclared identifier.
-// DeclarationError 7576: (2846-2847): Undeclared identifier.
-// Warning 4013: There are more than 256 errors. Aborting.
diff --git a/test/libsolidity/syntaxTests/more_than_256_importerrors.sol b/test/libsolidity/syntaxTests/more_than_256_importerrors.sol
deleted file mode 100644
index d4a4121194e2..000000000000
--- a/test/libsolidity/syntaxTests/more_than_256_importerrors.sol
+++ /dev/null
@@ -1,521 +0,0 @@
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-import "a.sol";
-
-contract C {
-  function f() public {
-  }
-}
-// ----
-// ParserError 6275: (0-15): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (16-31): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (32-47): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (48-63): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (64-79): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (80-95): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (96-111): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (112-127): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (128-143): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (144-159): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (160-175): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (176-191): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (192-207): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (208-223): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (224-239): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (240-255): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (256-271): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (272-287): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (288-303): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (304-319): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (320-335): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (336-351): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (352-367): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (368-383): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (384-399): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (400-415): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (416-431): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (432-447): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (448-463): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (464-479): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (480-495): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (496-511): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (512-527): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (528-543): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (544-559): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (560-575): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (576-591): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (592-607): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (608-623): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (624-639): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (640-655): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (656-671): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (672-687): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (688-703): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (704-719): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (720-735): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (736-751): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (752-767): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (768-783): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (784-799): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (800-815): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (816-831): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (832-847): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (848-863): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (864-879): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (880-895): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (896-911): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (912-927): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (928-943): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (944-959): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (960-975): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (976-991): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (992-1007): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1008-1023): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1024-1039): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1040-1055): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1056-1071): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1072-1087): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1088-1103): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1104-1119): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1120-1135): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1136-1151): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1152-1167): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1168-1183): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1184-1199): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1200-1215): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1216-1231): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1232-1247): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1248-1263): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1264-1279): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1280-1295): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1296-1311): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1312-1327): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1328-1343): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1344-1359): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1360-1375): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1376-1391): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1392-1407): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1408-1423): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1424-1439): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1440-1455): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1456-1471): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1472-1487): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1488-1503): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1504-1519): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1520-1535): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1536-1551): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1552-1567): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1568-1583): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1584-1599): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1600-1615): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1616-1631): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1632-1647): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1648-1663): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1664-1679): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1680-1695): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1696-1711): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1712-1727): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1728-1743): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1744-1759): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1760-1775): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1776-1791): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1792-1807): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1808-1823): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1824-1839): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1840-1855): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1856-1871): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1872-1887): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1888-1903): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1904-1919): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1920-1935): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1936-1951): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1952-1967): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1968-1983): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1984-1999): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2000-2015): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2016-2031): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2032-2047): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2048-2063): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2064-2079): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2080-2095): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2096-2111): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2112-2127): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2128-2143): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2144-2159): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2160-2175): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2176-2191): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2192-2207): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2208-2223): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2224-2239): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2240-2255): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2256-2271): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2272-2287): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2288-2303): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2304-2319): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2320-2335): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2336-2351): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2352-2367): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2368-2383): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2384-2399): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2400-2415): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2416-2431): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2432-2447): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2448-2463): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2464-2479): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2480-2495): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2496-2511): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2512-2527): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2528-2543): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2544-2559): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2560-2575): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2576-2591): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2592-2607): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2608-2623): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2624-2639): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2640-2655): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2656-2671): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2672-2687): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2688-2703): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2704-2719): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2720-2735): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2736-2751): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2752-2767): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2768-2783): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2784-2799): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2800-2815): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2816-2831): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2832-2847): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2848-2863): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2864-2879): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2880-2895): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2896-2911): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2912-2927): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2928-2943): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2944-2959): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2960-2975): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2976-2991): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2992-3007): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3008-3023): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3024-3039): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3040-3055): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3056-3071): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3072-3087): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3088-3103): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3104-3119): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3120-3135): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3136-3151): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3152-3167): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3168-3183): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3184-3199): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3200-3215): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3216-3231): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3232-3247): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3248-3263): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3264-3279): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3280-3295): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3296-3311): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3312-3327): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3328-3343): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3344-3359): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3360-3375): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3376-3391): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3392-3407): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3408-3423): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3424-3439): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3440-3455): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3456-3471): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3472-3487): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3488-3503): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3504-3519): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3520-3535): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3536-3551): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3552-3567): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3568-3583): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3584-3599): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3600-3615): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3616-3631): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3632-3647): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3648-3663): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3664-3679): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3680-3695): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3696-3711): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3712-3727): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3728-3743): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3744-3759): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3760-3775): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3776-3791): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3792-3807): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3808-3823): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3824-3839): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3840-3855): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3856-3871): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3872-3887): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3888-3903): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3904-3919): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3920-3935): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3936-3951): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3952-3967): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3968-3983): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3984-3999): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4000-4015): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4016-4031): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4032-4047): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4048-4063): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4064-4079): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4080-4095): Source "a.sol" not found: File not supplied initially.
-// Warning 4013: There are more than 256 errors. Aborting.
diff --git a/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol b/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol
deleted file mode 100644
index b3b5691210e1..000000000000
--- a/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol
+++ /dev/null
@@ -1,524 +0,0 @@
-contract C {
-  function f() public {
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-    continue;
-  }
-}
-// ----
-// SyntaxError 4123: (41-49): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (55-63): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (69-77): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (83-91): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (97-105): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (111-119): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (125-133): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (139-147): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (153-161): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (167-175): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (181-189): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (195-203): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (209-217): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (223-231): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (237-245): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (251-259): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (265-273): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (279-287): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (293-301): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (307-315): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (321-329): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (335-343): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (349-357): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (363-371): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (377-385): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (391-399): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (405-413): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (419-427): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (433-441): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (447-455): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (461-469): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (475-483): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (489-497): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (503-511): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (517-525): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (531-539): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (545-553): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (559-567): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (573-581): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (587-595): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (601-609): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (615-623): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (629-637): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (643-651): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (657-665): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (671-679): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (685-693): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (699-707): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (713-721): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (727-735): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (741-749): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (755-763): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (769-777): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (783-791): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (797-805): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (811-819): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (825-833): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (839-847): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (853-861): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (867-875): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (881-889): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (895-903): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (909-917): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (923-931): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (937-945): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (951-959): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (965-973): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (979-987): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (993-1001): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1007-1015): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1021-1029): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1035-1043): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1049-1057): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1063-1071): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1077-1085): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1091-1099): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1105-1113): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1119-1127): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1133-1141): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1147-1155): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1161-1169): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1175-1183): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1189-1197): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1203-1211): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1217-1225): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1231-1239): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1245-1253): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1259-1267): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1273-1281): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1287-1295): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1301-1309): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1315-1323): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1329-1337): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1343-1351): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1357-1365): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1371-1379): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1385-1393): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1399-1407): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1413-1421): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1427-1435): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1441-1449): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1455-1463): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1469-1477): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1483-1491): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1497-1505): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1511-1519): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1525-1533): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1539-1547): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1553-1561): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1567-1575): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1581-1589): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1595-1603): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1609-1617): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1623-1631): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1637-1645): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1651-1659): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1665-1673): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1679-1687): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1693-1701): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1707-1715): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1721-1729): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1735-1743): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1749-1757): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1763-1771): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1777-1785): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1791-1799): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1805-1813): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1819-1827): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1833-1841): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1847-1855): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1861-1869): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1875-1883): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1889-1897): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1903-1911): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1917-1925): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1931-1939): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1945-1953): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1959-1967): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1973-1981): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1987-1995): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2001-2009): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2015-2023): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2029-2037): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2043-2051): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2057-2065): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2071-2079): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2085-2093): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2099-2107): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2113-2121): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2127-2135): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2141-2149): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2155-2163): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2169-2177): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2183-2191): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2197-2205): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2211-2219): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2225-2233): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2239-2247): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2253-2261): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2267-2275): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2281-2289): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2295-2303): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2309-2317): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2323-2331): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2337-2345): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2351-2359): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2365-2373): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2379-2387): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2393-2401): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2407-2415): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2421-2429): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2435-2443): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2449-2457): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2463-2471): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2477-2485): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2491-2499): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2505-2513): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2519-2527): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2533-2541): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2547-2555): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2561-2569): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2575-2583): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2589-2597): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2603-2611): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2617-2625): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2631-2639): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2645-2653): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2659-2667): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2673-2681): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2687-2695): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2701-2709): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2715-2723): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2729-2737): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2743-2751): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2757-2765): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2771-2779): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2785-2793): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2799-2807): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2813-2821): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2827-2835): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2841-2849): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2855-2863): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2869-2877): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2883-2891): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2897-2905): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2911-2919): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2925-2933): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2939-2947): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2953-2961): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2967-2975): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2981-2989): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2995-3003): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3009-3017): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3023-3031): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3037-3045): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3051-3059): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3065-3073): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3079-3087): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3093-3101): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3107-3115): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3121-3129): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3135-3143): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3149-3157): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3163-3171): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3177-3185): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3191-3199): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3205-3213): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3219-3227): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3233-3241): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3247-3255): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3261-3269): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3275-3283): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3289-3297): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3303-3311): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3317-3325): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3331-3339): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3345-3353): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3359-3367): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3373-3381): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3387-3395): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3401-3409): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3415-3423): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3429-3437): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3443-3451): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3457-3465): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3471-3479): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3485-3493): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3499-3507): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3513-3521): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3527-3535): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3541-3549): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3555-3563): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3569-3577): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3583-3591): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3597-3605): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3611-3619): "continue" has to be in a "for" or "while" loop.
-// Warning 4013: There are more than 256 errors. Aborting.
diff --git a/test/libsolidity/syntaxTests/multiSource/alias_shadows_another_alias.sol b/test/libsolidity/syntaxTests/multiSource/alias_shadows_another_alias.sol
deleted file mode 100644
index 55a7c29a699e..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/alias_shadows_another_alias.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-function g() pure returns (uint) { return 42; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-==== Source: s3.sol ====
-// imports f()->1337 as g()
-import "s2.sol";
-// imports f()->1337 as f() and
-// g()->42 as g
-import {f as f, g as g} from "s1.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    // calls f()->1337 / f()->1337
-    return f() / g();
-  }
-}
-// ----
-// DeclarationError 1686: (s1.sol:0-49): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/alias_shadows_function.sol b/test/libsolidity/syntaxTests/multiSource/alias_shadows_function.sol
deleted file mode 100644
index d59e9d3d7eac..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/alias_shadows_function.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-function g() pure returns (uint) { return 42; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-==== Source: s3.sol ====
-// imports f()->1337 as g()
-import "s2.sol";
-// imports f()->1337 as f() and
-// g()->42 as g
-import "s1.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    // calls f()->1337 / f()->1337
-    return f() / g();
-  }
-}
-// ----
-// DeclarationError 1686: (s1.sol:0-49): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/circular_import.sol b/test/libsolidity/syntaxTests/multiSource/circular_import.sol
deleted file mode 100644
index 52574456f329..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/circular_import.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: s1.sol ====
-import {f as g} from "s2.sol";
-function f() pure returns (uint) { return 1; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/circular_import_2.sol b/test/libsolidity/syntaxTests/multiSource/circular_import_2.sol
deleted file mode 100644
index 019baae4a96c..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/circular_import_2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return h() - g(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/circular_import_3.sol b/test/libsolidity/syntaxTests/multiSource/circular_import_3.sol
deleted file mode 100644
index 2a8e7a47a60f..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/circular_import_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return h() - g(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-==== Source: s3.sol ====
-import "s1.sol";
-import "s2.sol";
-// ----
-// DeclarationError 1686: (s1.sol:39-93): Function with same name and parameter types defined twice.
-// DeclarationError 1686: (s2.sol:31-77): Function with same name and parameter types defined twice.
-// DeclarationError 1686: (s2.sol:78-124): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/circular_import_4.sol b/test/libsolidity/syntaxTests/multiSource/circular_import_4.sol
deleted file mode 100644
index 08205dc86f98..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/circular_import_4.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return h() - g(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-==== Source: s3.sol ====
-import "s1.sol";
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/circular_import_5.sol b/test/libsolidity/syntaxTests/multiSource/circular_import_5.sol
deleted file mode 100644
index 17c669682ce5..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/circular_import_5.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-import {f as g, g as h} from "s2.sol";
-function f() pure returns (uint) { return h() - g(); }
-==== Source: s2.sol ====
-import {f as h} from "s1.sol";
-function f() pure returns (uint) { return 2; }
-function g() pure returns (uint) { return 4; }
-==== Source: s3.sol ====
-import "s2.sol";
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/duplicate_import_statement.sol b/test/libsolidity/syntaxTests/multiSource/duplicate_import_statement.sol
deleted file mode 100644
index aaf4267d6217..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/duplicate_import_statement.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import {f as f} from "s1.sol";
-import {f as f} from "s1.sol";
-contract C {
-  function g() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/error_in_first.sol b/test/libsolidity/syntaxTests/multiSource/error_in_first.sol
deleted file mode 100644
index 2c21da4022fc..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/error_in_first.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: A ====
-contract A {
-	function g() public { x; }
-}
-==== Source: B ====
-contract B {
-	function f() public { }
-}
-// ----
-// DeclarationError 7576: (A:36-37): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/multiSource/free_different_interger_types.sol b/test/libsolidity/syntaxTests/multiSource/free_different_interger_types.sol
deleted file mode 100644
index b4eff0b48607..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/free_different_interger_types.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: s1.sol ====
-function f(uint) pure returns (uint) { return 24; }
-function g() pure returns (bool) { return true; }
-==== Source: s2.sol ====
-import {f as g, g as g} from "s1.sol";
-contract C {
-  function foo() public pure returns (uint, bool) {
-    return (g(2), g());
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/free_function_alias_different_parameter_types.sol b/test/libsolidity/syntaxTests/multiSource/free_function_alias_different_parameter_types.sol
deleted file mode 100644
index 2ff23c6bd454..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/free_function_alias_different_parameter_types.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint16) { return 1337; }
-function g() pure returns (uint8) { return 42; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-==== Source: s3.sol ====
-// imports f(uint16)->1337 as g(uint16)
-import "s2.sol";
-// imports f(uint16)->1337 as f(uint16) and
-// g(uint8)->42 as g(uint8)
-import {f as f, g as g} from "s1.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    // calls f()->1337 / f()->1337
-    return f() / g();
-  }
-}
-// ----
-// DeclarationError 1686: (s1.sol:0-51): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol b/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol
deleted file mode 100644
index 63268475acc2..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: s1.sol ====
-function normal() pure returns (uint) { return 1337; }
-function reverting() pure returns (uint) { revert(); }
-==== Source: s2.sol ====
-import "s1.sol";
-contract C
-{
-	function foo() public pure returns (uint) { normal(); }
-	function bar() public pure returns (uint) { reverting(); }
-}
-// ----
-// Warning 6321: (s2.sol:67-71): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/free_function_redefinition_base_derived.sol b/test/libsolidity/syntaxTests/multiSource/free_function_redefinition_base_derived.sol
deleted file mode 100644
index 0bb58b5d0517..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/free_function_redefinition_base_derived.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {}
-==== Source: s2.sol ====
-import "s1.sol";
-function f() pure returns (uint) { return 42; }
-contract D is C {}
-// ----
-// DeclarationError 1686: (s2.sol:17-64): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/free_function_redefinition_transitive.sol b/test/libsolidity/syntaxTests/multiSource/free_function_redefinition_transitive.sol
deleted file mode 100644
index 944ae21631de..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/free_function_redefinition_transitive.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C {}
-==== Source: s3.sol ====
-import "s2.sol";
-function f() pure returns (uint) { return 42; }
-contract E is D {}
-// ----
-// DeclarationError 1686: (s3.sol:17-64): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/free_function_resolution_override_virtual.sol b/test/libsolidity/syntaxTests/multiSource/free_function_resolution_override_virtual.sol
deleted file mode 100644
index a3d3ccd9e805..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/free_function_resolution_override_virtual.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-contract C {
-  function f() public pure virtual returns (uint) {
-    return f();
-  }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-function f() pure returns (uint) { return 42; }
-contract D is C {
-  function f() public pure override returns (uint) {
-    return f();
-  }
-}
-// ----
-// Warning 2519: (s1.sol:65-134): This declaration shadows an existing declaration.
-// Warning 2519: (s2.sol:85-155): This declaration shadows an existing declaration.
-// DeclarationError 1686: (s2.sol:17-64): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/multiSource/import.sol b/test/libsolidity/syntaxTests/multiSource/import.sol
deleted file mode 100644
index b351e7ccda26..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/import.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: A ====
-contract A {
-	function g(uint256 x) public view returns(uint256) { return x; }
-}
-==== Source: B ====
-import "A";
-contract B is A {
-	function f(uint256 x) public view returns(uint256) { return x; }
-}
-// ----
-// Warning 2018: (A:14-78): Function state mutability can be restricted to pure
-// Warning 2018: (B:31-95): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/multiSource/import_alias.sol b/test/libsolidity/syntaxTests/multiSource/import_alias.sol
deleted file mode 100644
index c697fa4fdab4..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/import_alias.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: s1.sol ====
-int constant a = 2;
-==== Source: s2.sol ====
-import {a as e} from "s1.sol";
-import "s2.sol" as M;
-contract C {
-  function f() public pure returns (int) { return M.e; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol b/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol
deleted file mode 100644
index 311ca3e43b50..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-int constant a = 2;
-==== Source: s2.sol ====
-import {a as e} from "s1.sol";
-import "s2.sol" as M;
-contract C {
-  function f() public pure returns (int) { return M.a; }
-}
-// ----
-// TypeError 9582: (s2.sol:116-119): Member "a" not found or not visible after argument-dependent lookup in module "s2.sol".
diff --git a/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol b/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol
deleted file mode 100644
index c7b5601e3de4..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-contract C {
-  function f() public pure returns (uint) {
-    return 1337;
-  }
-}
-==== Source: s2.sol ====
-import {C.f as g} from "s1.sol";
-// ----
-// ParserError 2314: (s2.sol:9-10): Expected '}' but got '.'
diff --git a/test/libsolidity/syntaxTests/multiSource/import_not_found.sol b/test/libsolidity/syntaxTests/multiSource/import_not_found.sol
deleted file mode 100644
index f3042eceaa4a..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/import_not_found.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: a ====
-import "b";
-contract C {}
-// ----
-// ParserError 6275: (a:0-11): Source "b" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/multiSource/imported_free_function.sol b/test/libsolidity/syntaxTests/multiSource/imported_free_function.sol
deleted file mode 100644
index 5714ea7d721d..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/imported_free_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import "s1.sol";
-contract C {
-  function g() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol b/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol
deleted file mode 100644
index e8908625b410..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: s1.sol ====
-library L
-{
-	function normal() public pure returns (uint) { return 1337; }
-	function reverting() public pure returns (uint) { revert(); }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract C
-{
-	function foo() public pure returns (uint) { L.normal(); }
-	function bar() public pure returns (uint) { L.reverting(); }
-}
-// ----
-// Warning 6321: (s2.sol:67-71): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (s2.sol:126-130): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/multiple_imports_same_function.sol b/test/libsolidity/syntaxTests/multiSource/multiple_imports_same_function.sol
deleted file mode 100644
index 6691ed7437f7..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/multiple_imports_same_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import {f as f, f as f, f as f} from "s1.sol";
-contract C {
-  function g() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/no_import.sol b/test/libsolidity/syntaxTests/multiSource/no_import.sol
deleted file mode 100644
index 25b10ce11ac4..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/no_import.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: A ====
-contract A {
-	function g(uint256 x) public view returns(uint256) { return x; }
-}
-==== Source: B ====
-contract B is A {
-	function f(uint256 x) public view returns(uint256) { return x; }
-}
-// ----
-// DeclarationError 7920: (B:14-15): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/multiSource/one_source.sol b/test/libsolidity/syntaxTests/multiSource/one_source.sol
deleted file mode 100644
index 9c1d92eb5192..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/one_source.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-==== Source: SourceName ====
-contract A {
-	uint256 x;
-	function f() public pure { x = 42; }
-}
-// ----
-// TypeError 8961: (SourceName:53-54): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/multiSource/reimport_imported_function.sol b/test/libsolidity/syntaxTests/multiSource/reimport_imported_function.sol
deleted file mode 100644
index 41fbe76d00c9..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/reimport_imported_function.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import {f as g} from "s1.sol";
-==== Source: s3.sol ====
-import {g as h} from "s2.sol";
-contract C {
-  function foo() public pure returns (uint) {
-    return h();
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol b/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol
deleted file mode 100644
index 94271585d8c8..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: s1.sol ====
-contract C
-{
-	function normal() public pure returns (uint) { return 1337; }
-	function reverting() public pure returns (uint) { revert(); }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C
-{
-	function foo() public pure returns (uint) { normal(); }
-	function bar() public pure returns (uint) { reverting(); }
-}
-// ----
-// Warning 6321: (s2.sol:72-76): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol b/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol
deleted file mode 100644
index d7e569542ba4..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-==== Source: s1.sol ====
-contract C
-{
-	function normal(bool x) public pure returns (uint)
-	{
-		if (x)
-			return xxx();
-		else
-			return yyy();
-	}
-	function yyy() public pure returns (uint) { revert(); }
-	function bar() public pure returns (uint) { normal(true); }
-
-	function xxx() public virtual pure returns (uint) { return 1; }
-}
-==== Source: s2.sol ====
-import "s1.sol";
-contract D is C
-{
-	function foo() public pure returns (uint) { normal(false); }
-	function xxx() public override pure returns(uint) { revert(); }
-}
-// ----
-// Warning 6321: (s1.sol:215-219): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/two_imports_same_function.sol b/test/libsolidity/syntaxTests/multiSource/two_imports_same_function.sol
deleted file mode 100644
index 087443383532..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/two_imports_same_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: s1.sol ====
-function f() pure returns (uint) { return 1337; }
-==== Source: s2.sol ====
-import {f as f, f as f} from "s1.sol";
-contract C {
-  function g() public pure returns (uint) {
-    return f();
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiSource/warning_in_both.sol b/test/libsolidity/syntaxTests/multiSource/warning_in_both.sol
deleted file mode 100644
index 04ea5ca3ff84..000000000000
--- a/test/libsolidity/syntaxTests/multiSource/warning_in_both.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: A ====
-contract A {
-	function g(uint256 x) public view returns(uint256) { return x; }
-}
-==== Source: B ====
-contract B {
-	function f(uint256 x) public view returns(uint256) { return x; }
-}
-// ----
-// Warning 2018: (A:14-78): Function state mutability can be restricted to pure
-// Warning 2018: (B:14-78): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
deleted file mode 100644
index 791e50784c58..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-contract C {
-    function f() public {
-        uint a = (1,2);
-        uint b = (1,2,3);
-        uint c = (1,2,3,4);
-    }
-    function g() public {
-        (uint a1, uint b1, uint c1, uint d1) = 1;
-        (uint a2, uint b2, uint c2) = 1;
-        (uint a3, uint b3) = 1;
-    }
-    function h() public {
-        (uint a1, uint b1, uint c1, uint d1) = (1,2,3);
-        (uint a2, uint b2, uint c2) = (1,2,3,4);
-    }
-}
-// ----
-// TypeError 7364: (47-61): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 7364: (71-87): Different number of components on the left hand side (1) than on the right hand side (3).
-// TypeError 7364: (97-115): Different number of components on the left hand side (1) than on the right hand side (4).
-// TypeError 7364: (157-197): Different number of components on the left hand side (4) than on the right hand side (1).
-// TypeError 7364: (207-238): Different number of components on the left hand side (3) than on the right hand side (1).
-// TypeError 7364: (248-270): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (312-358): Different number of components on the left hand side (4) than on the right hand side (3).
-// TypeError 7364: (368-407): Different number of components on the left hand side (3) than on the right hand side (4).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
deleted file mode 100644
index 1cd676ef8f98..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function f() public {
-        uint a = two();
-        uint b = three();
-        uint c = four();
-    }
-    function g() public {
-        (uint a1, uint b1, uint c1, uint d1) = one();
-        (uint a2, uint b2, uint c2) = one();
-        (uint a3, uint b3) = one();
-    }
-    function h() public {
-        (uint a1, uint b1, uint c1, uint d1) = three();
-        (uint a2, uint b2, uint c2) = four();
-    }
-    function one() public pure returns (uint) {}
-    function two() public pure returns (uint, uint) {}
-    function three() public pure returns (uint, uint, uint) {}
-    function four() public pure returns (uint, uint, uint, uint) {}
-}
-// ----
-// TypeError 7364: (47-61): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 7364: (71-87): Different number of components on the left hand side (1) than on the right hand side (3).
-// TypeError 7364: (97-112): Different number of components on the left hand side (1) than on the right hand side (4).
-// TypeError 7364: (154-198): Different number of components on the left hand side (4) than on the right hand side (1).
-// TypeError 7364: (208-243): Different number of components on the left hand side (3) than on the right hand side (1).
-// TypeError 7364: (253-279): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (321-367): Different number of components on the left hand side (4) than on the right hand side (3).
-// TypeError 7364: (377-413): Different number of components on the left hand side (3) than on the right hand side (4).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
deleted file mode 100644
index 6942a99ea735..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-contract C {
-    function fn() public pure {
-        (uint a,) = (1,2,3);
-        (,uint b) = (1,2,3);
-        (,uint c,) = (1,2,3,4,5);
-        (uint d, uint e,) = (1,2,3,4);
-        (,uint f, uint g) = (1,2,3,4);
-        (,uint h, uint i,) = (1,2,3);
-        (uint j,) = 1;
-        (,uint k) = 1;
-        (,uint l,) = 1;
-        a;b;c;d;e;f;g;h;i;j;k;l;
-    }
-}
-// ----
-// TypeError 7364: (53-72): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (82-101): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (111-135): Different number of components on the left hand side (3) than on the right hand side (5).
-// TypeError 7364: (145-174): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (184-213): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (223-251): Different number of components on the left hand side (4) than on the right hand side (3).
-// TypeError 7364: (261-274): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (284-297): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (307-321): Different number of components on the left hand side (3) than on the right hand side (1).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
deleted file mode 100644
index 26055d41fee8..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-abstract contract C {
-    function fn() public pure {
-        (uint a,) = three();
-        (,uint b) = three();
-        (,uint c,) = five();
-        (uint d, uint e,) = four();
-        (,uint f, uint g) = four();
-        (,uint h, uint i,) = three();
-        (uint j,) = one();
-        (,uint k) = one();
-        (,uint l,) = one();
-        (,uint m, uint n,) = five();
-        a;b;c;d;e;f;g;h;i;j;k;l;m;n;
-    }
-    function one() public pure returns (uint) {}
-    function two() public pure returns (uint, uint) {}
-    function three() public pure returns (uint, uint, uint) {}
-    function four() public pure returns (uint, uint, uint, uint) {}
-    function five() public pure returns (uint, uint, uint, uint, uint) {}
-}
-// ----
-// TypeError 7364: (62-81): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (91-110): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (120-139): Different number of components on the left hand side (3) than on the right hand side (5).
-// TypeError 7364: (149-175): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (185-211): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (221-249): Different number of components on the left hand side (4) than on the right hand side (3).
-// TypeError 7364: (259-276): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (286-303): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (313-331): Different number of components on the left hand side (3) than on the right hand side (1).
-// TypeError 7364: (341-368): Different number of components on the left hand side (4) than on the right hand side (5).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol
deleted file mode 100644
index b08ca8fc0ae1..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() internal returns (uint) {
-    (uint a) = f();
-    a;
-  }
-}
-// ----
-// Warning 5740: (78-79): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
deleted file mode 100644
index b1ec065ac018..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract D {
-  struct S { uint a; uint b; }
-}
-contract C {
-  function f() internal pure {
-    (,,,D.S[10*2] storage x,) = g();
-    x;
-  }
-  function g() internal pure returns (uint, uint, uint, D.S[20] storage x, uint) { x = x; }
-}
-// ----
-// Warning 6321: (176-180): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (182-186): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (188-192): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (213-217): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
deleted file mode 100644
index 05ae8b440bb0..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        (uint a, uint b) = f();
-        (uint c) = f();
-        uint d = f();
-    }
-}
-// ----
-// TypeError 7364: (52-74): Different number of components on the left hand side (2) than on the right hand side (0).
-// TypeError 7364: (84-98): Different number of components on the left hand side (1) than on the right hand side (0).
-// TypeError 7364: (108-120): Different number of components on the left hand side (1) than on the right hand side (0).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationInvalidType.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationInvalidType.sol
deleted file mode 100644
index a12649cfc676..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationInvalidType.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() internal returns (string memory, uint, uint, uint) {
-    (uint a, string memory b,,) = f();
-    a; b;
-  }
-}
-// ----
-// TypeError 9574: (85-118): Type string memory is not implicitly convertible to expected type uint256.
-// TypeError 9574: (85-118): Type uint256 is not implicitly convertible to expected type string memory.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol
deleted file mode 100644
index 9b07ac8fb0e3..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() internal {
-    {
-      (uint a, uint b, uint c) = (1, 2, 3);
-    }
-    a;
-  }
-}
-// ----
-// DeclarationError 7576: (99-100): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol
deleted file mode 100644
index 8a37f42f522a..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() internal {
-    {
-      (uint a, uint b, uint c) = (a, b, c);
-    }
-  }
-}
-// ----
-// DeclarationError 7576: (79-80): Undeclared identifier. "a" is not (or not yet) visible at this point.
-// DeclarationError 7576: (82-83): Undeclared identifier. "b" is not (or not yet) visible at this point.
-// DeclarationError 7576: (85-86): Undeclared identifier. "c" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
deleted file mode 100644
index 742ae5a0dc4e..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-  function f() internal pure returns (uint, uint, uint, uint) {
-    (uint a, uint b,,) = f();
-    a; b;
-  }
-  function g() internal pure {
-    (bytes memory a, string storage b) = h();
-    a; b;
-  }
-  function h() internal pure returns (bytes memory, string storage s) { s = s; }
-}
-// ----
-// Warning 5740: (111-115): Unreachable code.
-// Warning 6321: (250-262): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol
deleted file mode 100644
index eb313eadd5bb..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  struct S { function() returns (S storage)[] x; }
-  S s;
-  function f() internal pure returns (uint, uint, uint, S storage, uint, uint) {
-    (,,,s.x[2](),,) = f();
-  }
-}
-// ----
-// TypeError 4247: (160-168): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
deleted file mode 100644
index b3b365fed6d0..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        (uint a,) = (1,);
-        a;
-    }
-}
-// ----
-// TypeError 8381: (59-63): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/sameNumberOfComponents.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/sameNumberOfComponents.sol
deleted file mode 100644
index 59eb34af6329..000000000000
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/sameNumberOfComponents.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        (uint a1, uint b1, uint c1, uint d1) = (1,2,3,4);
-        (uint a2, uint b2, uint c2) = (1,2,3);
-        (uint a3, uint b3) = (1,2);
-        a1; b1; c1; d1; a2; b2; c2; a3; b3;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/multiline_comments.sol b/test/libsolidity/syntaxTests/multiline_comments.sol
deleted file mode 100644
index 480fde6c3984..000000000000
--- a/test/libsolidity/syntaxTests/multiline_comments.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * This is a multi-line comment
- * it should create no problems
- *
-*/
-
-contract test {
-    /*
-    * this is another multi-line comment
-    *
-    */
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol
deleted file mode 100644
index cfbf9365ef4c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    uint256 variable;
-    function f(uint256) public returns (uint out) { f(variable); test; out; }
-}
-// ----
-// Warning 5740: (103-112): Unreachable code.
-// Warning 6133: (103-107): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol
deleted file mode 100644
index 10f733fd2912..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    uint256 variable;
-    function f(uint256 arg) public {
-        f(notfound);
-    }
-}
-// ----
-// DeclarationError 7576: (85-93): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol
deleted file mode 100644
index a3590ba01be7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    uint256 variable;
-    function f(uint256 arg) public {
-        f(notfound);
-        f(notfound);
-    }
-}
-// ----
-// DeclarationError 7576: (85-93): Undeclared identifier.
-// DeclarationError 7576: (106-114): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/004_reference_to_later_declaration.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/004_reference_to_later_declaration.sol
deleted file mode 100644
index a554d3abb3c8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/004_reference_to_later_declaration.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function g() public { f(); }
-    function f() public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol
deleted file mode 100644
index 2dcd2ab693ca..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f() public { uint32(2) == uint64(2); }
-}
-// ----
-// Warning 6133: (42-64): Statement has no effect.
-// Warning 2018: (20-67): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
deleted file mode 100644
index f191d44789e7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public { int32(2) == uint64(2); }
-}
-// ----
-// TypeError 2271: (42-63): Built-in binary operator == cannot be applied to types int32 and uint64.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol
deleted file mode 100644
index 354b6ed0e517..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f() public { string memory x = "123456789012345678901234567890123"; }
-}
-// ----
-// Warning 2072: (42-57): Unused local variable.
-// Warning 2018: (20-98): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol
deleted file mode 100644
index 8a8945ebb4d1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function fun() public {
-        uint256 x = address(0).balance;
-    }
-}
-// ----
-// Warning 2072: (52-61): Unused local variable.
-// Warning 2018: (20-89): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol
deleted file mode 100644
index dcd2be341d08..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function fun() public {
-        address(0).balance = 7;
-    }
-}
-// ----
-// TypeError 4247: (52-70): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol
deleted file mode 100644
index a1fed99674e6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    struct str {
-        mapping(uint=>uint) map;
-    }
-    str data;
-    function fun() public {
-        str storage a = data;
-        data = a;
-    }
-}
-// ----
-// TypeError 9214: (152-156): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol
deleted file mode 100644
index d4c9a1882033..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract First {
-    function fun() public returns (bool) {
-        return Second(address(1)).fun(1, true, 3) > 0;
-    }
-}
-contract Second {
-    function fun(uint, bool, uint) public returns (uint) {
-        if (First(address(2)).fun() == true) return 1;
-    }
-}
-// ----
-// Warning 6321: (192-196): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/019_comparison_bitop_precedence.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/019_comparison_bitop_precedence.sol
deleted file mode 100644
index c77536620ab3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/019_comparison_bitop_precedence.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract First {
-    function fun() public returns (bool ret) {
-        return 1 & 2 == 8 & 9 && 1 ^ 2 < 4 | 6;
-    }
-}
-// ----
-// Warning 2018: (21-117): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
deleted file mode 100644
index d31f5fa3b31e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    mapping(uint => uint) x;
-    function f() public returns (bool ret) {
-        mapping(uint => uint) storage y = x;
-        return x == y;
-    }
-}
-// ----
-// TypeError 2271: (147-153): Built-in binary operator == cannot be applied to types mapping(uint256 => uint256) and mapping(uint256 => uint256).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/029_create_abstract_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/029_create_abstract_contract.sol
deleted file mode 100644
index 029db714adfa..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/029_create_abstract_contract.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract base { function foo() public virtual; }
-contract derived {
-    base b;
-    function foo() public { b = new base(); }
-}
-// ----
-// TypeError 3656: (0-48): Contract "base" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/030_redeclare_implemented_abstract_function_as_abstract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/030_redeclare_implemented_abstract_function_as_abstract.sol
deleted file mode 100644
index c9c1e5bf8855..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/030_redeclare_implemented_abstract_function_as_abstract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract base { function foo() public virtual; }
-contract derived is base { function foo() public virtual override {} }
-contract wrong is derived { function foo() public virtual override; }
-// ----
-// TypeError 4593: (157-196): Overriding an implemented function with an unimplemented function is not allowed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/044_returning_multi_dimensional_arrays_new_abi.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/044_returning_multi_dimensional_arrays_new_abi.sol
deleted file mode 100644
index c266406d24e4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/044_returning_multi_dimensional_arrays_new_abi.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f() public pure returns (string[][] memory) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
deleted file mode 100644
index c9075a4cd3bf..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f() public pure returns (string[][] memory) {}
-}
-// ----
-// TypeError 4957: (71-88): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
deleted file mode 100644
index ee8c7f18d3c4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f() public pure returns (uint[][2] memory) {}
-}
-// ----
-// TypeError 4957: (71-87): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/047_returning_arrays_in_structs_new_abi.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/047_returning_arrays_in_structs_new_abi.sol
deleted file mode 100644
index 5b761aad2478..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/047_returning_arrays_in_structs_new_abi.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { string[] s; }
-    function f() public pure returns (S memory) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
deleted file mode 100644
index 77c77831e01d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder v1;
-contract C {
-    struct S { string[] s; }
-    function f() public pure returns (S memory x) {}
-}
-// ----
-// TypeError 4957: (100-110): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/049_function_external_call_allowed_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/049_function_external_call_allowed_conversion.sol
deleted file mode 100644
index bda0b94675c5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/049_function_external_call_allowed_conversion.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {}
-contract Test {
-    function externalCall() public {
-        C arg;
-        this.g(arg);
-    }
-    function g (C c) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol
deleted file mode 100644
index e4e02269b13b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {}
-contract Test {
-    function externalCall() public {
-        address arg;
-        this.g(arg);
-    }
-    function g (C c) external {}
-}
-// ----
-// TypeError 9553: (103-106): Invalid type for argument in function call. Invalid implicit conversion from address to contract C requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/051_function_internal_allowed_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/051_function_internal_allowed_conversion.sol
deleted file mode 100644
index 5a9616ac1c57..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/051_function_internal_allowed_conversion.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint a;
-}
-contract Test {
-    C a;
-    function g (C c) public {}
-    function internalCall() public {
-        g(a);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol
deleted file mode 100644
index cc23fdf6e1a1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint a;
-}
-contract Test {
-    address a;
-    function g (C c) public {}
-    function internalCall() public {
-        g(a);
-    }
-}
-// ----
-// TypeError 9553: (136-137): Invalid type for argument in function call. Invalid implicit conversion from address to contract C requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/053_hash_collision_in_interface.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/053_hash_collision_in_interface.sol
deleted file mode 100644
index 1319a36bea2a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/053_hash_collision_in_interface.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function gsf() public { }
-    function tgeo() public { }
-}
-// ----
-// TypeError 1860: (0-78): Function signature hash collision for tgeo()
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/054_inheritance_basic.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/054_inheritance_basic.sol
deleted file mode 100644
index 69bf2a49a84d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/054_inheritance_basic.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract base { uint baseMember; struct BaseType { uint element; } }
-contract derived is base {
-    BaseType data;
-    function f() public { baseMember = 7; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/055_inheritance_diamond_basic.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/055_inheritance_diamond_basic.sol
deleted file mode 100644
index 8fda799014af..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/055_inheritance_diamond_basic.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract root { function rootFunction() public {} }
-contract inter1 is root { function f() public virtual {} }
-contract inter2 is root { function f() public virtual {} }
-contract derived is root, inter2, inter1 {
-	function g() public { f(); rootFunction(); }
-	function f() override(inter1, inter2) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol
deleted file mode 100644
index 287aa93dc714..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A is B { }
-contract B is A { }
-// ----
-// TypeError 2449: (14-15): Definition of base has to precede definition of derived contract
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/057_legal_override_direct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/057_legal_override_direct.sol
deleted file mode 100644
index bf6459cba0f7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/057_legal_override_direct.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract B { function f() public {} }
-contract C is B { function f(uint i) public {} }
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/058_legal_override_indirect.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/058_legal_override_indirect.sol
deleted file mode 100644
index 461bbbf21da1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/058_legal_override_indirect.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { function f(uint a) public {} }
-contract B { function f() public {} }
-contract C is A, B { }
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol
deleted file mode 100644
index c7bcad6e3f23..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract B { function f() virtual internal {} }
-contract C is B { function f() public {} }
-// ----
-// TypeError 9456: (66-88): Overriding function is missing "override" specifier.
-// TypeError 9098: (66-88): Overriding function visibility differs.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol
deleted file mode 100644
index f817fe28650e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A { function f() public virtual { uint8 x = C(address(0)).g(); } }
-contract B { function f() public virtual {} function g() public returns (uint8) {} }
-contract C is A, B { function f() public override (A, B) { A.f(); } }
-// ----
-// Warning 2072: (43-50): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
deleted file mode 100644
index 83119653bb10..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { constructor(uint a) { } }
-contract B is A { }
-// ----
-// TypeError 3415: (39-58): No arguments passed to the base constructor. Specify the arguments or mark "B" as abstract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
deleted file mode 100644
index bdca8fdd3798..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract A { constructor(uint a) { } }
-contract B is A { constructor(bytes4 a, bytes28 b) { } }
-// ----
-// TypeError 3415: (39-95): No arguments passed to the base constructor. Specify the arguments or mark "B" as abstract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol
deleted file mode 100644
index d055b56adc2f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A { }
-contract B is A {
-    function f() public { A a = B(address(1)); }
-}
-// ----
-// Warning 2072: (59-62): Unused local variable.
-// Warning 2018: (37-81): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol
deleted file mode 100644
index 3ef4ca3c13b4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract A { }
-contract B is A {
-    function f() public { B b = A(address(1)); }
-}
-// ----
-// TypeError 9574: (59-78): Type contract A is not implicitly convertible to expected type contract B.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol
deleted file mode 100644
index d94f5bcc6d64..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function b() public {}
-}
-
-contract B is A {
-    function f() public {
-        super.f();
-    }
-}
-// ----
-// TypeError 9582: (95-102): Member "f" not found or not visible after argument-dependent lookup in type(contract super B).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol
deleted file mode 100644
index 67726f6d7a97..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function fun() public {
-        uint64(2);
-    }
-    uint256 foo;
-    function foo() public {}
-}
-// ----
-// DeclarationError 2333: (90-114): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/069_base_class_state_variable_accessor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/069_base_class_state_variable_accessor.sol
deleted file mode 100644
index 676c4b5408f9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/069_base_class_state_variable_accessor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// test for issue #1126 https://github.com/ethereum/cpp-ethereum/issues/1126
-contract Parent {
-    uint256 public m_aMember;
-}
-contract Child is Parent {
-    function foo() public returns (uint256) { return Parent.m_aMember; }
-}
-// ----
-// Warning 2018: (158-226): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
deleted file mode 100644
index 79e7f17fc2aa..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Data { uint[15] m_array; }
-    Data public data;
-}
-// ----
-// TypeError 5359: (58-74): The struct has all its members omitted, therefore the getter cannot return any values.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/071_base_class_state_variable_internal_member.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/071_base_class_state_variable_internal_member.sol
deleted file mode 100644
index ea17c2e8b28b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/071_base_class_state_variable_internal_member.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Parent {
-    uint256 internal m_aMember;
-}
-contract Child is Parent {
-    function foo() public returns (uint256) { return Parent.m_aMember; }
-}
-// ----
-// Warning 2018: (83-151): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol
deleted file mode 100644
index 40d86ebf8d06..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Parent1 {
-    uint256 internal m_aMember1;
-}
-contract Parent2 is Parent1 {
-    uint256 internal m_aMember2;
-}
-contract Child is Parent2 {
-    function foo() public returns (uint256) { return Parent2.m_aMember1; }
-}
-// ----
-// TypeError 9582: (200-218): Member "m_aMember1" not found or not visible after argument-dependent lookup in type(contract Parent2).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol
deleted file mode 100644
index f56084bda778..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Parent1 {
-    uint256 internal m_aMember1;
-}
-contract Parent2 is Parent1 {
-    uint256 internal m_aMember2;
-}
-contract Child is Parent2 {
-    function foo() public returns (uint256) { return Child.m_aMember2; }
-    uint256 public m_aMember3;
-}
-// ----
-// TypeError 9582: (200-216): Member "m_aMember2" not found or not visible after argument-dependent lookup in type(contract Child).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/074_fallback_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/074_fallback_function.sol
deleted file mode 100644
index 3fd1900585dc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/074_fallback_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint x;
-    fallback() external { x = 2; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/075_fallback_function_with_arguments.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/075_fallback_function_with_arguments.sol
deleted file mode 100644
index 6ed769c88d1a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/075_fallback_function_with_arguments.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    fallback(uint a) external { x = 2; }
-}
-// ----
-// TypeError 5570: (55-55): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol
deleted file mode 100644
index 0f41231750fc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library C {
-    fallback() external {}
-}
-// ----
-// TypeError 5982: (16-38): Libraries cannot have fallback functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol
deleted file mode 100644
index f9ed076923ff..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library C {
-    receive() external payable {}
-}
-// ----
-// DeclarationError 4549: (16-45): Libraries cannot have receive ether functions.
-// TypeError 7708: (16-45): Library functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol
deleted file mode 100644
index 268a7e69b09f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback() external returns (uint) { }
-}
-// ----
-// TypeError 5570: (45-51): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/079_fallback_function_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/079_fallback_function_inheritance.sol
deleted file mode 100644
index 487fc4b68ae6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/079_fallback_function_inheritance.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    uint x;
-    fallback() virtual external { x = 1; }
-}
-contract C is A {
-    fallback() override external { x = 2; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/096_access_to_default_function_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/096_access_to_default_function_visibility.sol
deleted file mode 100644
index 2f6ef6b7aa6b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/096_access_to_default_function_visibility.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    function f() public {}
-}
-contract d {
-    function g() public { c(address(0)).f(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol
deleted file mode 100644
index 028947d63d02..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    function f() internal {}
-}
-contract d {
-    function g() public { c(address(0)).f(); }
-}
-// ----
-// TypeError 9582: (83-98): Member "f" not found or not visible after argument-dependent lookup in contract c.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol
deleted file mode 100644
index efdedc4f1317..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    uint a;
-}
-contract d {
-    function g() public { c(address(0)).a(); }
-}
-// ----
-// TypeError 9582: (66-81): Member "a" not found or not visible after argument-dependent lookup in contract c.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/099_access_to_internal_state_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/099_access_to_internal_state_variable.sol
deleted file mode 100644
index 7aa77c13de3f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/099_access_to_internal_state_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    uint public a;
-}
-contract d {
-    function g() public { c(address(0)).a(); }
-}
-// ----
-// Warning 2018: (51-93): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/104_empty_name_input_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/104_empty_name_input_parameter.sol
deleted file mode 100644
index af392402fe27..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/104_empty_name_input_parameter.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f(uint) public { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
deleted file mode 100644
index e2ef8518d2ca..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(uint[] memory constant a) public { }
-}
-// ----
-// DeclarationError 1788: (31-55): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 9259: (31-55): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/106_empty_name_return_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/106_empty_name_return_parameter.sol
deleted file mode 100644
index b524cd97e0ec..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/106_empty_name_return_parameter.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f() public returns (bool) { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/107_empty_name_input_parameter_with_named_one.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/107_empty_name_input_parameter_with_named_one.sol
deleted file mode 100644
index 7ec5b3b71a59..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/107_empty_name_input_parameter_with_named_one.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f(uint, uint k) public returns (uint ret_k) {
-        return k;
-    }
-}
-// ----
-// Warning 2018: (20-98): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol
deleted file mode 100644
index 241d15f10808..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public returns (uint ret_k, uint) {
-        return 5;
-    }
-}
-// ----
-// TypeError 8863: (77-85): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/110_no_overflow_with_large_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/110_no_overflow_with_large_literal.sol
deleted file mode 100644
index bdec196fe134..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/110_no_overflow_with_large_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    constructor() {
-        a = 115792089237316195423570985008687907853269984665640564039458;
-    }
-    uint256 a;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/111_overflow_caused_by_ether_units.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/111_overflow_caused_by_ether_units.sol
deleted file mode 100644
index 6cdda2514bd6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/111_overflow_caused_by_ether_units.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    constructor() {
-        a = 115792089237316195423570985008687907853269984665640564039458 ether;
-    }
-    uint256 a;
-}
-// ----
-// TypeError 7407: (45-111): Type int_const 1157...(70 digits omitted)...0000 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
deleted file mode 100644
index ea571b72af28..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns (uint d) { return 2 ** 10000000000; }
-}
-// ----
-// TypeError 2271: (66-82): Built-in binary operator ** cannot be applied to types int_const 2 and int_const 10000000000.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/113_exp_warn_literal_base_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/113_exp_warn_literal_base_1.sol
deleted file mode 100644
index e80497460256..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/113_exp_warn_literal_base_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        uint8 x = 100;
-        return 10**x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/114_exp_warn_literal_base_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/114_exp_warn_literal_base_2.sol
deleted file mode 100644
index 4afa941a7ef5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/114_exp_warn_literal_base_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        uint8 x = 100;
-        return uint8(10)**x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/115_exp_warn_literal_base_3.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/115_exp_warn_literal_base_3.sol
deleted file mode 100644
index b25ae4549fdd..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/115_exp_warn_literal_base_3.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        return 2**80;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/116_shift_warn_literal_base_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/116_shift_warn_literal_base_1.sol
deleted file mode 100644
index 9de53237deeb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/116_shift_warn_literal_base_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        uint8 x = 100;
-        return 10 << x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/117_shift_warn_literal_base_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/117_shift_warn_literal_base_2.sol
deleted file mode 100644
index c783c9c092d7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/117_shift_warn_literal_base_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        uint8 x = 100;
-        return uint8(10) << x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/118_shift_warn_literal_base_3.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/118_shift_warn_literal_base_3.sol
deleted file mode 100644
index c43f04fcb45e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/118_shift_warn_literal_base_3.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        return 2 << 80;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/119_shift_warn_literal_base_4.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/119_shift_warn_literal_base_4.sol
deleted file mode 100644
index 3248e4fba640..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/119_shift_warn_literal_base_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-         uint8 x = 100;
-         return 10 >> x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/124_enum_member_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/124_enum_member_access.sol
deleted file mode 100644
index 2bf8de45a9d6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/124_enum_member_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor()
-    {
-        choices = ActionChoices.GoStraight;
-    }
-    ActionChoices choices;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/125_enum_member_access_accross_contracts.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/125_enum_member_access_accross_contracts.sol
deleted file mode 100644
index da6ea988903d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/125_enum_member_access_accross_contracts.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Interface {
-    enum MyEnum { One, Two }
-}
-contract Impl {
-    function test() public returns (Interface.MyEnum) {
-        return Interface.MyEnum.One;
-    }
-}
-// ----
-// Warning 2018: (72-166): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/126_enum_invalid_member_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/126_enum_invalid_member_access.sol
deleted file mode 100644
index b19360a78554..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/126_enum_invalid_member_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor() {
-        choices = ActionChoices.RunAroundWavingYourHands;
-    }
-    ActionChoices choices;
-}
-// ----
-// TypeError 9582: (114-152): Member "RunAroundWavingYourHands" not found or not visible after argument-dependent lookup in type(enum test.ActionChoices).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol
deleted file mode 100644
index 9dc9fb449547..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor() {
-        choices = Sit;
-    }
-    ActionChoices choices;
-}
-// ----
-// DeclarationError 7576: (114-117): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/128_enum_explicit_conversion_is_okay.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/128_enum_explicit_conversion_is_okay.sol
deleted file mode 100644
index a74421805bf9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/128_enum_explicit_conversion_is_okay.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor() {
-        a = uint256(ActionChoices.GoStraight);
-        b = uint64(ActionChoices.Sit);
-    }
-    uint256 a;
-    uint64 b;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/129_int_to_enum_explicit_conversion_is_okay.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/129_int_to_enum_explicit_conversion_is_okay.sol
deleted file mode 100644
index a76beb93d27e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/129_int_to_enum_explicit_conversion_is_okay.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor() {
-        a = 2;
-        b = ActionChoices(a);
-    }
-    uint256 a;
-    ActionChoices b;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol
deleted file mode 100644
index 79e45f82cd3b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor() {
-        a = ActionChoices.GoStraight;
-    }
-    uint256 a;
-}
-// ----
-// TypeError 7407: (108-132): Type enum test.ActionChoices is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol
deleted file mode 100644
index f57df6707865..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
-    constructor() {
-        b = ActionChoices.Sit;
-    }
-    uint64 b;
-}
-// ----
-// TypeError 7407: (108-125): Type enum test.ActionChoices is not implicitly convertible to expected type uint64.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol
deleted file mode 100644
index 73588a5bcb41..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    enum Paper { Up, Down, Left, Right }
-    enum Ground { North, South, West, East }
-    constructor() {
-        Ground(Paper.Up);
-    }
-}
-// ----
-// TypeError 9640: (130-146): Explicit type conversion not allowed from "enum test.Paper" to "enum test.Ground".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol
deleted file mode 100644
index bcd1ad52bd06..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-    contract test {
-        enum ActionChoices { GoLeft, GoRight, GoLeft, Sit }
-    }
-// ----
-// DeclarationError 2333: (66-72): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/134_enum_name_resolution_under_current_contract_name.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/134_enum_name_resolution_under_current_contract_name.sol
deleted file mode 100644
index 8b0bfae43a8b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/134_enum_name_resolution_under_current_contract_name.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    enum Foo {
-        First,
-        Second
-    }
-
-    function a() public {
-        A.Foo;
-    }
-}
-// ----
-// Warning 2018: (69-111): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol
deleted file mode 100644
index 160ceaec721f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract base {
-    function f() private {}
-}
-contract derived is base {
-    function g() public { f(); }
-}
-// ----
-// DeclarationError 7576: (99-100): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol
deleted file mode 100644
index 64fd5fdf1eac..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract base {
-    function f() private {}
-}
-contract derived is base {
-    function g() public { base.f(); }
-}
-// ----
-// TypeError 9582: (99-105): Member "f" not found or not visible after argument-dependent lookup in type(contract base).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol
deleted file mode 100644
index d8090e1e05b1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    function f() external {}
-    function g() public { f(); }
-}
-// ----
-// DeclarationError 7576: (68-69): Undeclared identifier. "f" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol
deleted file mode 100644
index 5c0508f1fbaa..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    function func() public {}
-    function g() public { fun(); }
-}
-// ----
-// DeclarationError 7576: (69-72): Undeclared identifier. Did you mean "func"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol
deleted file mode 100644
index c3619934e954..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function g() public { fun(); }
-}
-// ----
-// DeclarationError 7576: (39-42): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol
deleted file mode 100644
index aa7bc7b5dc70..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract c {
-    function g() public {
-        uint var1 = 1;
-        uint var2 = 1;
-        uint var3 = 1;
-        uint var4 = 1;
-        uint var5 = varx;
-    }
-}
-// ----
-// DeclarationError 7576: (151-155): Undeclared identifier. Did you mean "var1", "var2", "var3", "var4" or "var5"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol
deleted file mode 100644
index db870e19c602..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    uint log9 = 2;
-    function g() public {
-        uint log8 = 3;
-        uint var1 = lgox;
-    }
-}
-// ----
-// DeclarationError 7576: (101-105): Undeclared identifier. Did you mean "log8" or "log9"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol
deleted file mode 100644
index a7533abbec6b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract a { function func() public {} }
-contract c is a {
-    function g() public {
-        uint var1 = fun();
-    }
-}
-// ----
-// DeclarationError 7576: (105-108): Undeclared identifier. Did you mean "func"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol
deleted file mode 100644
index 4a97864cda34..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    function g() public {
-        uint va = 1;
-        uint vb = vaxyz;
-     }
-}
-// ----
-// DeclarationError 7576: (78-83): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol
deleted file mode 100644
index f2e4406655f6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    function g() public {
-        uint va = 1;
-        uint vb = x;
-     }
-}
-// ----
-// DeclarationError 7576: (78-79): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol
deleted file mode 100644
index 3892fd8ad895..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract base {
-    function f() external {}
-}
-contract derived is base {
-    function g() public { base.f(); }
-}
-// ----
-// TypeError 3419: (100-108): Cannot call function via contract type name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/146_external_argument_assign.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/146_external_argument_assign.sol
deleted file mode 100644
index 8d01ab63a90a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/146_external_argument_assign.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    function f(uint a) external pure { a = 1; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/147_external_argument_increment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/147_external_argument_increment.sol
deleted file mode 100644
index c80dbcd2a2cb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/147_external_argument_increment.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    function f(uint a) external pure { a++; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/148_external_argument_delete.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/148_external_argument_delete.sol
deleted file mode 100644
index 98a80765c890..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/148_external_argument_delete.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function f(uint a) external { delete a; }
-}
-// ----
-// Warning 2018: (17-58): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/149_test_for_bug_override_function_with_bytearray_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/149_test_for_bug_override_function_with_bytearray_type.sol
deleted file mode 100644
index 1864913f72ce..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/149_test_for_bug_override_function_with_bytearray_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Vehicle {
-    function f(bytes calldata) external virtual returns (uint256 r) {r = 1;}
-}
-contract Bike is Vehicle {
-    function f(bytes calldata) override external returns (uint256 r) {r = 42;}
-}
-// ----
-// Warning 2018: (129-203): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol
deleted file mode 100644
index 779c4a0029f1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    function f(uint a) public { uint8[a] x; }
-}
-// ----
-// TypeError 5462: (51-52): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (45-55): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol
deleted file mode 100644
index 627f188fdb2e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    function f(uint a) public { uint8[-1] x; }
-}
-// ----
-// TypeError 3658: (51-53): Array with negative length specified.
-// TypeError 6651: (45-56): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol
deleted file mode 100644
index 1a5036d050a1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    bytes a;
-    uint[] b;
-    function f() public { b = a; }
-}
-// ----
-// TypeError 7407: (70-71): Type bytes storage ref is not implicitly convertible to expected type uint256[] storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol
deleted file mode 100644
index 7e4cc6f40436..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    uint32[] a;
-    uint8[] b;
-    function f() public { b = a; }
-}
-// ----
-// TypeError 7407: (74-75): Type uint32[] storage ref is not implicitly convertible to expected type uint8[] storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/154_array_copy_with_different_types_conversion_possible.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/154_array_copy_with_different_types_conversion_possible.sol
deleted file mode 100644
index d983c3454914..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/154_array_copy_with_different_types_conversion_possible.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    uint32[] a;
-    uint8[] b;
-    function f() public { a = b; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/155_array_copy_with_different_types_static_dynamic.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/155_array_copy_with_different_types_static_dynamic.sol
deleted file mode 100644
index 1858e046969e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/155_array_copy_with_different_types_static_dynamic.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    uint32[] a;
-    uint8[80] b;
-    function f() public { a = b; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol
deleted file mode 100644
index ee26931cfed3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    uint[] a;
-    uint[80] b;
-    function f() public { b = a; }
-}
-// ----
-// TypeError 7407: (73-74): Type uint256[] storage ref is not implicitly convertible to expected type uint256[80] storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol
deleted file mode 100644
index 09c7654d1cd5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    a[] public foo;
-}
-// ----
-// DeclarationError 7920: (17-18): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol
deleted file mode 100644
index 0d0baf4002c6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    uint8 a = 1000;
-}
-// ----
-// TypeError 7407: (27-31): Type int_const 1000 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol
deleted file mode 100644
index d907273f4b8d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    uint a = "abc";
-}
-// ----
-// TypeError 7407: (26-31): Type literal_string "abc" is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol
deleted file mode 100644
index 4ab89a3a212a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    bytes arr;
-    function f() public { bytes1 a = arr[0];}
-}
-// ----
-// Warning 2072: (54-62): Unused local variable.
-// Warning 2018: (32-73): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol
deleted file mode 100644
index cd71f3287bbd..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Foo {
-    function changeIt() public { x = 9; }
-    uint constant x = 56;
-}
-// ----
-// TypeError 6520: (48-49): Cannot assign to a constant variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol
deleted file mode 100644
index 247b08bcf6c2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    address constant x = msg.sender;
-}
-// ----
-// TypeError 8349: (38-48): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol
deleted file mode 100644
index 4926c394aa3c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract Test {
-    string constant x = "abefghijklmnopqabcdefghijklmnopqabcdefghijklmnopqabca";
-    function f() public {
-        // Even if this is made possible in the future, we should not allow assignment
-        // to elements of constant arrays.
-        x[0] = "f";
-    }
-}
-// ----
-// TypeError 9961: (261-265): Index access for string is not possible.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/168_assignment_to_const_var_involving_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/168_assignment_to_const_var_involving_conversion.sol
deleted file mode 100644
index 4c6f31a221df..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/168_assignment_to_const_var_involving_conversion.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    C constant x = C(address(0x123));
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/169_assignment_to_const_var_involving_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/169_assignment_to_const_var_involving_expression.sol
deleted file mode 100644
index ad842bdeb5e9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/169_assignment_to_const_var_involving_expression.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    uint constant x = 0x123 + 0x456;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/170_assignment_to_const_var_involving_keccak.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/170_assignment_to_const_var_involving_keccak.sol
deleted file mode 100644
index b39e7be498b1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/170_assignment_to_const_var_involving_keccak.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    bytes32 constant x = keccak256("abc");
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
deleted file mode 100644
index 590cec5a30c8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[3] constant x = [uint(1), 2, 3];
-}
-// ----
-// TypeError 9259: (17-53): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/172_assignment_to_const_string_bytes.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/172_assignment_to_const_string_bytes.sol
deleted file mode 100644
index 7190de5d8be1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/172_assignment_to_const_string_bytes.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    bytes constant a = "\x00\x01\x02";
-    bytes constant b = hex"000102";
-    string constant c = "hello";
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
deleted file mode 100644
index 6b5e7a13c281..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    struct S { uint x; uint[] y; }
-    S constant x = S(5, new uint[](4));
-}
-// ----
-// TypeError 9259: (52-86): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/174_address_is_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/174_address_is_constant.sol
deleted file mode 100644
index e3b4714901b5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/174_address_is_constant.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    address constant x = 0x1212121212121212121212121212121212121212;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol
deleted file mode 100644
index 6fba36420290..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Foo {
-    uint constant y;
-}
-// ----
-// TypeError 4266: (19-34): Uninitialized "constant" variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol
deleted file mode 100644
index 1d10d3e78938..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public returns (uint) { return 1; }
-    function f(uint a) public returns (uint) { return a; }
-    function g() public returns (uint) { return f(3, 5); }
-}
-// ----
-// TypeError 9322: (176-177): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol
deleted file mode 100644
index 52cdf1737289..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f(uint8 a) public returns (uint) { return a; }
-    function f(uint a) public returns (uint) { return 2 * a; }
-    // literal 1 can be both converted to uint and uint8, so the call is ambiguous.
-    function g() public returns (uint) { return f(1); }
-}
-// ----
-// TypeError 4487: (271-272): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/178_assignment_of_nonoverloaded_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/178_assignment_of_nonoverloaded_function.sol
deleted file mode 100644
index ec9415dbbd84..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/178_assignment_of_nonoverloaded_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(uint a) public returns (uint) { return 2 * a; }
-    function g() public returns (uint) { function (uint) returns (uint) x = f; return x(7); }
-}
-// ----
-// Warning 2018: (20-78): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol
deleted file mode 100644
index ab57704b5cea..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public returns (uint) { return 1; }
-    function f(uint a) public returns (uint) { return 2 * a; }
-    function g() public returns (uint) { function (uint) returns (uint) x = f; return x(7); }
-}
-// ----
-// TypeError 2144: (208-209): No matching declaration found after variable lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol
deleted file mode 100644
index c4d650a2b8e6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract base {
-    enum a { X }
-    function f(a) public { }
-}
-contract test is base {
-    function f(uint8 a) public { }
-}
-// ----
-// TypeError 9914: (37-61): Function overload clash during conversion to external types for arguments.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/181_override_changes_return_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/181_override_changes_return_types.sol
deleted file mode 100644
index 9a051bd51ef6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/181_override_changes_return_types.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract base {
-    function f(uint a) public virtual returns (uint) { }
-}
-contract test is base {
-    function f(uint a) public override returns (uint8) { }
-}
-// ----
-// TypeError 4822: (103-157): Overriding function return types differ.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/182_equal_overload.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/182_equal_overload.sol
deleted file mode 100644
index 8f15ea1be7f7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/182_equal_overload.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function test(uint a) public returns (uint b) { }
-    function test(uint a) external {}
-}
-// ----
-// DeclarationError 1686: (17-66): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol
deleted file mode 100644
index e71f53b7f651..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    string s;
-    function f() public { bytes1 a = s[2]; }
-}
-// ----
-// TypeError 9961: (64-68): Index access for string is not possible.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol
deleted file mode 100644
index 041b3fd6c09a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    string s;
-    function f() public { uint a = s.length; }
-}
-// ----
-// TypeError 9582: (62-70): Member "length" not found or not visible after argument-dependent lookup in string storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol
deleted file mode 100644
index a4d84f2da352..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    int8 public i = -129;
-}
-// ----
-// TypeError 7407: (36-40): Type int_const -129 is not implicitly convertible to expected type int8. Literal is too large to fit in int8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/191_negative_integers_to_signed_min.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/191_negative_integers_to_signed_min.sol
deleted file mode 100644
index 82d96f6b5cca..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/191_negative_integers_to_signed_min.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    int8 public i = -128;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol
deleted file mode 100644
index 0bc4699b3cb5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    int8 public j = 128;
-}
-// ----
-// TypeError 7407: (36-39): Type int_const 128 is not implicitly convertible to expected type int8. Literal is too large to fit in int8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/193_positive_integers_to_signed_out_of_bound_max.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/193_positive_integers_to_signed_out_of_bound_max.sol
deleted file mode 100644
index 9a34f737deac..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/193_positive_integers_to_signed_out_of_bound_max.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    int8 public j = 127;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol
deleted file mode 100644
index 0dac77a7397c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    uint8 public x = -1;
-}
-// ----
-// TypeError 7407: (37-39): Type int_const -1 is not implicitly convertible to expected type uint8. Cannot implicitly convert signed literal to unsigned type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol
deleted file mode 100644
index dbc43d7dd4b0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    uint8 public x = 700;
-}
-// ----
-// TypeError 7407: (37-40): Type int_const 700 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
deleted file mode 100644
index e3e0dd2a3b24..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract test { fallback() external { uint x = 1; uint y = 2; x || y; } }
-// ----
-// TypeError 2271: (62-68): Built-in binary operator || cannot be applied to types uint256 and uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
deleted file mode 100644
index d8141a2aaa32..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract test { fallback() external { uint x = 1; uint y = 2; x && y; } }
-// ----
-// TypeError 2271: (62-68): Built-in binary operator && cannot be applied to types uint256 and uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
deleted file mode 100644
index 83c39fbdad55..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract test { fallback() external { uint x = 1; !x; } }
-// ----
-// TypeError 4907: (50-52): Built-in unary operator ! cannot be applied to type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
deleted file mode 100644
index 5f5e8209080d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract test { fallback() external { uint x = 3; int y = -4; x ** y; } }
-// ----
-// TypeError 2271: (62-68): Built-in binary operator ** cannot be applied to types uint256 and int256. Exponentiation power is not allowed to be a signed integer type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/200_integer_signed_exp_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/200_integer_signed_exp_unsigned.sol
deleted file mode 100644
index 896c05820e18..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/200_integer_signed_exp_unsigned.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    fallback() external { uint x = 3; int y = -4; y ** x; }
-    function f() public pure { int16 x = 3; uint8 y = 4; x ** y; }
-    function g() public pure { int16 x = 3; uint16 y = 4; x ** y; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
deleted file mode 100644
index f7f3df910745..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public { int x = 3; int y = 4; x ** y; }
-    function h() public { uint8 x = 3; int16 y = 4; x ** y; }
-    function i() public { int16 x = 4; x ** -3; }
-}
-// ----
-// TypeError 2271: (64-70): Built-in binary operator ** cannot be applied to types int256 and int256. Exponentiation power is not allowed to be a signed integer type.
-// TypeError 2271: (126-132): Built-in binary operator ** cannot be applied to types uint8 and int16. Exponentiation power is not allowed to be a signed integer type.
-// Warning 3149: (126-132): The result type of the exponentiation operation is equal to the type of the first operand (uint8) ignoring the (larger) type of the second operand (int16) which might be unexpected. Silence this warning by either converting the first or the second operand to the type of the other.
-// TypeError 2271: (175-182): Built-in binary operator ** cannot be applied to types int16 and int_const -3. Exponentiation power is not allowed to be a negative integer literal.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
deleted file mode 100644
index 064afd46bb57..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-contract test { bytes a; bytes b; fallback() external { a == b; } }
-// ----
-// TypeError 2271: (56-62): Built-in binary operator == cannot be applied to types bytes storage ref and bytes storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
deleted file mode 100644
index 1cf46ac837ed..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-  struct s {uint a;}
-  s x;
-  s y;
-  fallback() external {
-    x == y;
-  }
-}
-// ----
-// TypeError 2271: (79-85): Built-in binary operator == cannot be applied to types struct test.s storage ref and struct test.s storage ref. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol
deleted file mode 100644
index af9b8ba686d5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    function f(uint[] memory a) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol
deleted file mode 100644
index f0e0f8b39268..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint[] storage a) external {}
-}
-// ----
-// TypeError 6651: (28-44): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/206_storage_location_local_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/206_storage_location_local_variables.sol
deleted file mode 100644
index 868d7bc84223..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/206_storage_location_local_variables.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint[] m_x;
-    function f() public view {
-        uint[] storage x = m_x;
-        uint[] memory y;
-        x;y;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
deleted file mode 100644
index 1db651f37db5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        mapping(uint=>uint)[] memory x;
-    }
-}
-// ----
-// TypeError 4061: (47-77): Type mapping(uint256 => uint256)[] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol
deleted file mode 100644
index 3d89796c4c72..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint[] data;
-    function f(uint[] memory x) public {
-        uint[] storage dataRef = data;
-        dataRef = x;
-    }
-}
-// ----
-// TypeError 7407: (128-129): Type uint256[] memory is not implicitly convertible to expected type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol
deleted file mode 100644
index aa6d55916676..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint[] data;
-    uint8[] otherData;
-    function f() public {
-        uint8[] storage x = otherData;
-        uint[] storage y = data;
-        y = x;
-        // note that data = otherData works
-    }
-}
-// ----
-// TypeError 7407: (163-164): Type uint8[] storage pointer is not implicitly convertible to expected type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol
deleted file mode 100644
index bfa56208cb23..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        mapping(uint => uint) storage x;
-        x;
-    }
-}
-// ----
-// TypeError 4182: (47-78): Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
deleted file mode 100644
index 16ac9ac1caad..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        mapping(uint => uint)[] storage x;
-        x;
-    }
-}
-// ----
-// TypeError 3464: (95-96): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
deleted file mode 100644
index 7d452197eecc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint[] data;
-    function f() public {
-        uint[] storage x = data;
-        delete x;
-    }
-}
-// ----
-// TypeError 9767: (97-105): Built-in unary operator delete cannot be applied to type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/214_assignment_mem_storage_variable_directly.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/214_assignment_mem_storage_variable_directly.sol
deleted file mode 100644
index 7cc7cbec78f4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/214_assignment_mem_storage_variable_directly.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint[] data;
-    function f(uint[] memory x) public {
-        data = x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol
deleted file mode 100644
index 140ae88884e6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint[] storage x) private {
-    }
-    function g(uint[] memory x) public {
-        f(x);
-    }
-}
-// ----
-// TypeError 9553: (113-114): Invalid type for argument in function call. Invalid implicit conversion from uint256[] memory to uint256[] storage pointer requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/216_function_argument_storage_to_mem.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/216_function_argument_storage_to_mem.sol
deleted file mode 100644
index 0f4388d0b6d3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/216_function_argument_storage_to_mem.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint[] storage x) private {
-        g(x);
-    }
-    function g(uint[] memory x) public {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol
deleted file mode 100644
index e9a1b9b48dbf..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint8[] memory x) private {
-        // Such an assignment is possible in storage, but not in memory
-        // (because it would incur an otherwise unnecessary copy).
-        // This requirement might be lifted, though.
-        uint[] memory y = x;
-    }
-}
-// ----
-// TypeError 9574: (256-275): Type uint8[] memory is not implicitly convertible to expected type uint256[] memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol
deleted file mode 100644
index c4ab822d3666..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        uint[] memory x;
-        x.length = 2;
-    }
-}
-// ----
-// TypeError 7567: (72-80): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol
deleted file mode 100644
index 16c8b3cb5b09..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; bool x; }
-    function f() public {
-        S memory s = S(1, true);
-    }
-}
-// ----
-// Warning 2072: (80-90): Unused local variable.
-// Warning 2018: (50-110): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol
deleted file mode 100644
index 9f6a1158614f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct X { uint x1; uint x2; }
-    struct S { uint s1; uint[3] s2; X s3; }
-    function f() public {
-        uint[3] memory s2;
-        S memory s = S(1, s2, X(4, 5));
-    }
-}
-// ----
-// Warning 2072: (153-163): Unused local variable.
-// Warning 2018: (96-190): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol
deleted file mode 100644
index a854664e3b7e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; bool x; }
-    function f() public {
-        S memory s = S({a: 1, x: true});
-    }
-}
-// ----
-// Warning 2072: (80-90): Unused local variable.
-// Warning 2018: (50-118): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/223_literal_strings.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/223_literal_strings.sol
deleted file mode 100644
index ec2fe3d692bb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/223_literal_strings.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Foo {
-    function f() public {
-        string memory long = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-        string memory short = "123";
-        long; short;
-    }
-}
-// ----
-// Warning 2018: (19-238): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol
deleted file mode 100644
index ed6a9b374a02..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    string s;
-    bytes b;
-    function h(string calldata _s) pure external { bytes(_s).length; }
-    function i(string memory _s) pure internal { bytes(_s).length; }
-    function j() view internal { bytes(s).length; }
-    function k(bytes calldata _b) pure external { string(_b); }
-    function l(bytes memory _b) pure internal { string(_b); }
-    function m() view internal { string(b); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol
deleted file mode 100644
index ed555b3c4280..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library Lib {}
-contract Test is Lib {}
-// ----
-// TypeError 2571: (32-35): Libraries cannot be inherited from.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol
deleted file mode 100644
index 964c22ad854f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract Test {}
-library Lib is Test {}
-// ----
-// TypeError 9469: (17-39): Library is not allowed to inherit.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol
deleted file mode 100644
index b59e0d68b75f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-library Lib { uint x; }
-// ----
-// TypeError 9957: (14-20): Library cannot have non-constant state variables
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/228_valid_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/228_valid_library.sol
deleted file mode 100644
index 52570c36c77b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/228_valid_library.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-library Lib { uint constant x = 9; }
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/229_call_to_library_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/229_call_to_library_function.sol
deleted file mode 100644
index 8b389282aad7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/229_call_to_library_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-// This used to work in pre-0.6.0.
-library Lib {
-    function min(uint, uint) public returns (uint);
-}
-contract Test {
-    function f() public {
-        uint t = Lib.min(12, 7);
-    }
-}
-// ----
-// TypeError 9231: (53-100): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol
deleted file mode 100644
index 738031b0c2c5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Test {
-    function f() public { Test x = new Test(); }
-}
-// ----
-// TypeError 7813: (51-59): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol
deleted file mode 100644
index d2ce419ba2ea..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    uint[2] dataArray;
-    function set5th() public returns (bool) {
-        dataArray[5] = 2;
-        return true;
-    }
-}
-// ----
-// TypeError 3383: (90-102): Out of bounds array access.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
deleted file mode 100644
index 077d09cbdf28..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() public { string storage x = "abc"; }
-}
-// ----
-// TypeError 9574: (39-63): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
deleted file mode 100644
index a092c643d437..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    struct s {
-        uint a;
-    }
-    function f() public {
-        s storage x;
-        x.a = 2;
-    }
-}
-// ----
-// TypeError 3464: (105-106): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol
deleted file mode 100644
index 545b8cf27e6c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public { abi.encode(2**500); }
-}
-// ----
-// TypeError 8009: (55-61): Invalid rational number (too large or division by zero).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol
deleted file mode 100644
index 1686a9f07b17..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A { function f() public { new B(); } }
-contract B { function f() public { new C(); } }
-contract C { function f() public { new A(); } }
-// ----
-// TypeError 7813: (35-40): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (83-88): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (131-136): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol
deleted file mode 100644
index 9851f1a74d07..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A is B { }
-contract B { function f() public { new C(); } }
-contract C { function f() public { new A(); } }
-// ----
-// TypeError 2449: (14-15): Definition of base has to precede definition of derived contract
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/244_tuples.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/244_tuples.sol
deleted file mode 100644
index d18c115d6bbc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/244_tuples.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        uint a = (1);
-        (uint b,) = (uint8(1),2);
-        (uint c, uint d) = (uint32(1), 2 + a);
-        (uint e, ,) = (uint64(1), 2, b);
-        a;b;c;d;e;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol
deleted file mode 100644
index 02bc66fa6946..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        (1,,2);
-    }
-}
-// ----
-// TypeError 8381: (47-53): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol
deleted file mode 100644
index 0ab3c1984c31..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    struct R { uint[10][10] y; }
-    struct S { uint a; uint b; uint[20][20][20] c; R d; }
-    S data;
-    function f() public {
-        C.S storage x = data;
-        C.S memory y;
-        C.S[10] memory z;
-        C.S[10];
-        y.a = 2;
-        x.c[1][2][3] = 9;
-        x.d.y[2][2] = 3;
-        z;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/251_using_for_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/251_using_for_library.sol
deleted file mode 100644
index b3a250140b29..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/251_using_for_library.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library D { }
-contract C {
-    using D for uint;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
deleted file mode 100644
index 42de5ba411dc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract D { }
-contract C {
-    using D for uint;
-}
-// ----
-// TypeError 4357: (38-39): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/253_using_for_function_exists.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/253_using_for_function_exists.sol
deleted file mode 100644
index cd86a70ddc02..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/253_using_for_function_exists.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library D { function double(uint self) public returns (uint) { return 2*self; } }
-contract C {
-    using D for uint;
-    function f(uint a) public {
-        a.double;
-    }
-}
-// ----
-// Warning 2018: (12-79): Function state mutability can be restricted to pure
-// Warning 2018: (121-172): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/254_using_for_function_on_int.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/254_using_for_function_on_int.sol
deleted file mode 100644
index 838118017fcb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/254_using_for_function_on_int.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library D { function double(uint self) public returns (uint) { return 2*self; } }
-contract C {
-    using D for uint;
-    function f(uint a) public returns (uint) {
-        return a.double();
-    }
-}
-// ----
-// Warning 2018: (12-79): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/255_using_for_function_on_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/255_using_for_function_on_struct.sol
deleted file mode 100644
index 8b491d2b2cd8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/255_using_for_function_on_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-contract C {
-    using D for D.s;
-    D.s x;
-    function f(uint a) public returns (uint) {
-        return x.mul(a);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/256_using_for_overload.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/256_using_for_overload.sol
deleted file mode 100644
index f033b85b6438..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/256_using_for_overload.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library D {
-    struct s { uint a; }
-    function mul(s storage self, uint x) public returns (uint) { return self.a *= x; }
-    function mul(s storage, bytes32) public returns (bytes32) { }
-}
-contract C {
-    using D for D.s;
-    D.s x;
-    function f(uint a) public returns (uint) {
-        return x.mul(a);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/257_using_for_by_name.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/257_using_for_by_name.sol
deleted file mode 100644
index a10568ef1ac4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/257_using_for_by_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-contract C {
-    using D for D.s;
-    D.s x;
-    function f(uint a) public returns (uint) {
-        return x.mul({x: a});
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol
deleted file mode 100644
index 87b7f3452845..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library D { function double(bytes32 self) public returns (uint) { return 2; } }
-contract C {
-    using D for uint;
-    function f(uint a) public returns (uint) {
-        return a.double();
-    }
-}
-// ----
-// TypeError 9582: (177-185): Member "double" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
deleted file mode 100644
index 819ef969b3a5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library D { function double(uint self) public returns (uint) { return 2; } }
-contract C {
-    using D for uint;
-    function f(uint16 a) public returns (uint) {
-        // This is an error because the function is only attached to uint.
-        // Had it been attached to *, it would have worked.
-        return a.double();
-    }
-}
-// ----
-// TypeError 9582: (311-319): Member "double" not found or not visible after argument-dependent lookup in uint16.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/260_library_memory_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/260_library_memory_struct.sol
deleted file mode 100644
index cfd3fcda6838..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/260_library_memory_struct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-library c {
-    struct S { uint x; }
-    function f() public returns (S memory) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
deleted file mode 100644
index f0076a15c8c8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library D { function double(bytes32 self) public returns (uint) { return 2; } }
-contract C {
-    using D for *;
-    function f(uint a) public returns (uint) {
-        // Attached to a, but self type does not match.
-        return a.double();
-    }
-}
-// ----
-// TypeError 9582: (230-238): Member "double" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/263_create_memory_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/263_create_memory_arrays.sol
deleted file mode 100644
index d808ce24937a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/263_create_memory_arrays.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    struct R { uint[10][10] y; }
-    struct S { uint a; uint b; uint[20][20][20] c; R d; }
-}
-contract C {
-    function f(uint size) public {
-        L.S[][] memory x = new L.S[][](10);
-        uint[] memory y = new uint[](20);
-        bytes memory z = new bytes(size);
-        x;y;z;
-    }
-}
-// ----
-// Warning 2018: (122-301): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol
deleted file mode 100644
index d561bd29ee1e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint size) public {
-        mapping(uint => uint) storage x = new mapping(uint => uint)[](4);
-    }
-}
-// ----
-// TypeError 1164: (94-117): Array containing a (nested) mapping cannot be constructed in memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol
deleted file mode 100644
index b7ab47d6e111..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint size) public {
-        uint x = new uint(7);
-    }
-}
-// ----
-// TypeError 8807: (65-73): Contract or array type expected.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/268_function_overload_array_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/268_function_overload_array_type.sol
deleted file mode 100644
index 6a713457ea9e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/268_function_overload_array_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract contract M {
-    function f(uint[] memory) public virtual;
-    function f(int[] memory) public virtual;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol
deleted file mode 100644
index f5e15e220a27..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    struct S {
-        uint a;
-        string b;
-    }
-    function f() public {
-        S[2] memory x = [S({a: 1, b: "fish"}), S({a: 2, b: "fish"})];
-    }
-}
-// ----
-// Warning 2072: (102-115): Unused local variable.
-// Warning 2018: (72-169): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol
deleted file mode 100644
index 76385a1d0547..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        if (true)
-            break;
-    }
-}
-// ----
-// SyntaxError 6102: (69-74): "break" has to be in a "for" or "while" loop.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol
deleted file mode 100644
index 8da1f34c51e7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public {
-        if (true)
-            continue;
-    }
-}
-// ----
-// SyntaxError 4123: (69-77): "continue" has to be in a "for" or "while" loop.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol
deleted file mode 100644
index 289e882a623d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public {
-        while (true)
-        {
-        }
-        continue;
-    }
-}
-// ----
-// SyntaxError 4123: (88-96): "continue" has to be in a "for" or "while" loop.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol
deleted file mode 100644
index da2ae63ae4c6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        true ? true : 2;
-    }
-}
-// ----
-// TypeError 1080: (47-62): True expression's type bool does not match false expression's type uint8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol
deleted file mode 100644
index 2acc4e1f4e67..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public {
-        uint x;
-        uint y;
-        (true ? x : y) = 1;
-    }
-}
-// ----
-// TypeError 2212: (80-92): Conditional expression as left value is not supported yet.
-// TypeError 4247: (80-92): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol
deleted file mode 100644
index 1141ff084133..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct s1 {
-        uint x;
-    }
-    struct s2 {
-        uint x;
-    }
-    function f() public {
-        s1 memory x;
-        s2 memory y;
-        true ? x : y;
-    }
-}
-// ----
-// TypeError 1080: (165-177): True expression's type struct C.s1 memory does not match false expression's type struct C.s2 memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol
deleted file mode 100644
index 7d55d61efa95..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function x(bool) public {}
-    function y() public {}
-
-    function f() public {
-        true ? x : y;
-    }
-}
-// ----
-// TypeError 1080: (106-118): True expression's type function (bool) does not match false expression's type function ().
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol
deleted file mode 100644
index c0cb69db6901..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    enum small { A, B, C, D }
-    enum big { A, B, C, D }
-
-    function f() public {
-        small x;
-        big y;
-
-        true ? x : y;
-    }
-}
-// ----
-// TypeError 1080: (139-151): True expression's type enum C.small does not match false expression's type enum C.big.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol
deleted file mode 100644
index 8bf1268c04ca..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    mapping(uint8 => uint8) table1;
-    mapping(uint32 => uint8) table2;
-
-    function f() public {
-        true ? table1 : table2;
-    }
-}
-// ----
-// TypeError 1080: (121-143): True expression's type mapping(uint8 => uint8) does not match false expression's type mapping(uint32 => uint8).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol
deleted file mode 100644
index 19920b50c1bb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol
+++ /dev/null
@@ -1,89 +0,0 @@
-contract C {
-    struct s1 {
-        uint x;
-    }
-    s1 struct_x;
-    s1 struct_y;
-
-    function fun_x() public {}
-    function fun_y() public {}
-
-    enum small { A, B, C, D }
-
-    mapping(uint8 => uint8) table1;
-    mapping(uint8 => uint8) table2;
-
-    function f() public {
-        // integers
-        uint x;
-        uint y;
-        uint g = true ? x : y;
-        g += 1; // Avoid unused var warning
-
-        // integer constants
-        uint h = true ? 1 : 3;
-        h += 1; // Avoid unused var warning
-
-        // string literal
-        string memory i = true ? "hello" : "world";
-        i = "used"; //Avoid unused var warning
-    }
-    function f2() public {
-        // bool
-        bool j = true ? true : false;
-        j = j && true; // Avoid unused var warning
-
-        // real is not there yet.
-
-        // array
-        bytes1[2] memory a;
-        bytes1[2] memory b;
-        bytes1[2] memory k = true ? a : b;
-        k[0] = bytes1(0); //Avoid unused var warning
-
-        bytes memory e;
-        bytes memory f;
-        bytes memory l = true ? e : f;
-        l[0] = bytes1(0); // Avoid unused var warning
-
-        // fixed bytes
-        bytes2 c;
-        bytes2 d;
-        bytes2 m = true ? c : d;
-        m &= m;
-
-    }
-    function f3() public {
-        // contract doesn't fit in here
-
-        // struct
-        struct_x = true ? struct_x : struct_y;
-
-        // function
-        function () r = true ? fun_x : fun_y;
-        r(); // Avoid unused var warning
-        // enum
-        small enum_x;
-        small enum_y;
-        enum_x = true ? enum_x : enum_y;
-
-        // tuple
-        (uint n, uint o) = true ? (1, 2) : (3, 4);
-        (n, o) = (o, n); // Avoid unused var warning
-        // mapping
-        mapping(uint8 => uint8) storage p = true ? table1 : table2;
-        p[0] = 0; // Avoid unused var warning
-        // typetype
-        uint32 q = true ? uint32(1) : uint32(2);
-        q += 1; // Avoid unused var warning
-        // modifier doesn't fit in here
-
-        // magic doesn't fit in here
-
-        // module doesn't fit in here
-    }
-}
-// ----
-// Warning 2519: (1013-1027): This declaration shadows an existing declaration.
-// Warning 2018: (257-642): Function state mutability can be restricted to pure
-// Warning 2018: (647-1237): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/289_uint7_and_uintM_as_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/289_uint7_and_uintM_as_identifier.sol
deleted file mode 100644
index ce35d7ffebdc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/289_uint7_and_uintM_as_identifier.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-string uintM = "Hello 4 you";
-    function f() public {
-        uint8 uint7 = 3;
-        uint7 = 5;
-        string memory intM;
-        uint bytesM = 21;
-        intM; bytesM;
-    }
-}
-// ----
-// Warning 2018: (50-197): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol
deleted file mode 100644
index 8954a77fe500..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        uintM something = 3;
-    }
-}
-// ----
-// DeclarationError 7920: (50-55): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol
deleted file mode 100644
index 2c441c696e4e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        intM should = 4;
-    }
-}
-// ----
-// DeclarationError 7920: (50-54): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol
deleted file mode 100644
index 4deb9db9e337..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        bytesM fail = "now";
-    }
-}
-// ----
-// DeclarationError 7920: (50-56): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
deleted file mode 100644
index 30f240c1e1ad..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    modifier mod() { _; }
-
-    function f() public {
-        mod g;
-    }
-}
-// ----
-// TypeError 5172: (77-80): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
deleted file mode 100644
index 92d777550968..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    modifier mod() { _; }
-
-    function f() public {
-        mod g;
-        g = f;
-    }
-}
-// ----
-// TypeError 5172: (77-80): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
deleted file mode 100644
index 66ff7cf35981..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function foo() public {
-    }
-
-    function f() public {
-        foo g;
-    }
-}
-// ----
-// TypeError 5172: (85-88): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol
deleted file mode 100644
index 4bb9542a287d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        uint99999999999999999999999999 something = 3;
-    }
-}
-// ----
-// DeclarationError 7920: (50-80): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol
deleted file mode 100644
index 33ab20b93625..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        bytes32 bytes10abc = "abc";
-    }
-}
-// ----
-// Warning 2072: (50-68): Unused local variable.
-// Warning 2018: (20-83): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/296_int10abc_is_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/296_int10abc_is_identifier.sol
deleted file mode 100644
index 5550d43b515c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/296_int10abc_is_identifier.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        uint uint10abc = 3;
-        int int10abc = 4;
-        uint10abc; int10abc;
-    }
-}
-// ----
-// Warning 2018: (20-130): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol
deleted file mode 100644
index 5819fb61b308..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L { function l() public {} }
-contract test {
-    function f() public {
-        L.l.value;
-    }
-}
-// ----
-// TypeError 8477: (87-96): Member "value" is not allowed in delegated calls due to "msg.value" persisting.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol
deleted file mode 100644
index 73b2bf8ab8ec..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    fixed0x7 a = .3;
-}
-// ----
-// DeclarationError 7920: (20-28): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/299_invalid_fixed_types_long_invalid_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/299_invalid_fixed_types_long_invalid_identifier.sol
deleted file mode 100644
index f4502dd69c4f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/299_invalid_fixed_types_long_invalid_identifier.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    fixed99999999999999999999999999999999999999x7 b = 9.5;
-}
-// ----
-// DeclarationError 7920: (20-65): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol
deleted file mode 100644
index 57b4aad20790..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    fixed7x8 c = 3.12345678;
-}
-// ----
-// DeclarationError 7920: (20-28): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol
deleted file mode 100644
index cea40fc4c89a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L { function l() public {} }
-contract test {
-    function f() public {
-        L x;
-        x.l();
-    }
-}
-// ----
-// TypeError 1130: (87-88): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/302_invalid_fixed_type_long.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/302_invalid_fixed_type_long.sol
deleted file mode 100644
index a337fda9e5a3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/302_invalid_fixed_type_long.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        fixed8x888888888888888888888888888888888888888888888888888 b;
-    }
-}
-// ----
-// DeclarationError 7920: (50-108): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol
deleted file mode 100644
index ba1eb806910d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    function f() public {
-        uint64 a = 3;
-        int64 b = 4;
-        fixed c = b;
-        ufixed d = a;
-        c; d;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2018: (20-147): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol
deleted file mode 100644
index 81ad7dbe8ac5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public {
-        fixed c = 3;
-        ufixed d = 4;
-        c; d;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2018: (20-104): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol
deleted file mode 100644
index b7642e16a199..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public {
-        fixed a = 4.5;
-        ufixed d = 2.5;
-        a; d;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2018: (20-108): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol
deleted file mode 100644
index f4d8479454ef..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        fixed a = 4.5;
-        int b = a;
-        a; b;
-    }
-}
-// ----
-// TypeError 9574: (73-82): Type fixed128x18 is not implicitly convertible to expected type int256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol
deleted file mode 100644
index b8b2f12b5117..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() pure public {
-        ufixed16x2 a = 3.25;
-        fixed16x2 b = -3.25;
-        a; b;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
deleted file mode 100644
index 29d29b46bd70..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() pure public {
-        ufixed16x2 a = +3.25;
-        fixed16x2 b = -3.25;
-        a; b;
-    }
-}
-// ----
-// ParserError 9636: (70-71): Use of unary + is disallowed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol
deleted file mode 100644
index 082514ebcf9c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function f() pure public {
-        ufixed16x2 a = 0.5;
-        ufixed256x52 b = 0.0000000000000006661338147750939242541790008544921875;
-        fixed16x2 c = -0.5;
-        fixed256x52 d = -0.0000000000000006661338147750939242541790008544921875;
-        a; b; c; d;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/313_fixed_type_size_capabilities.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/313_fixed_type_size_capabilities.sol
deleted file mode 100644
index 148e7e672354..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/313_fixed_type_size_capabilities.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    function f() public {
-        ufixed256x1 a = 123456781234567979695948382928485849359686494864095409282048094275023098123.5;
-        ufixed256x77 b = 0.920890746623327805482905058466021565416131529487595827354393978494366605267637;
-        ufixed224x78 c = 0.000000000001519884736399797998492268541131529487595827354393978494366605267646;
-        fixed256x1 d = -123456781234567979695948382928485849359686494864095409282048094275023098123.5;
-        fixed256x76 e = -0.93322335481643744342575580035176794825198893968114429702091846411734101080123;
-        fixed256x79 g = -0.0001178860664374434257558003517679482519889396811442970209184641173410108012309;
-        a; b; c; d; e; g;
-    }
-}
-// ----
-// TypeError 5107: (153-250): Type rational_const 9208...(70 digits omitted)...7637 / 1000...(71 digits omitted)...0000 is not implicitly convertible to expected type ufixed256x77, but it can be explicitly converted.
-// TypeError 5107: (470-566): Type rational_const -933...(70 digits omitted)...0123 / 1000...(70 digits omitted)...0000 is not implicitly convertible to expected type fixed256x76, but it can be explicitly converted.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol
deleted file mode 100644
index 1d1e62cf3614..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        fixed16x2 a = 0; a;
-        ufixed32x1 b = 0; b;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2018: (20-104): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol
deleted file mode 100644
index 3a492356381f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        ufixed a = 11/4;
-        ufixed248x8 b = a; b;
-    }
-}
-// ----
-// TypeError 9574: (75-92): Type ufixed128x18 is not implicitly convertible to expected type ufixed248x8. Too many fractional digits.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol
deleted file mode 100644
index 169363c13e97..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        ufixed256x1 a = 1/3; a;
-    }
-}
-// ----
-// TypeError 4486: (50-69): Type rational_const 1 / 3 is not implicitly convertible to expected type ufixed256x1. Try converting to type ufixed256x77 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol
deleted file mode 100644
index 4899b3d786f7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public {
-        ufixed256x80 a = ufixed256x80(1/3); a;
-        ufixed248x80 b = ufixed248x80(1/3); b;
-        ufixed8x1 c = ufixed8x1(1/3); c;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2018: (20-182): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol
deleted file mode 100644
index 88aad0b8bcd3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        uint[3.5] a; a;
-    }
-}
-// ----
-// TypeError 3208: (55-58): Array with fractional length specified.
-// TypeError 6651: (50-61): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol
deleted file mode 100644
index 321c43008c97..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        uint[fixed(3.5)] a; a;
-    }
-}
-// ----
-// TypeError 5462: (55-65): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (50-68): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol
deleted file mode 100644
index 779b6a66e457..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        uint[ufixed(3.5)] a; a;
-    }
-}
-// ----
-// TypeError 5462: (55-66): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (50-69): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol
deleted file mode 100644
index 294ab1877f8b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        bytes32 c = 3.2; c;
-    }
-}
-// ----
-// TypeError 4486: (50-65): Type rational_const 16 / 5 is not implicitly convertible to expected type bytes32. Try converting to type ufixed8x1 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol
deleted file mode 100644
index fa401dd42d96..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        fixed a = 3.25;
-        bytes32 c = a; c;
-    }
-}
-// ----
-// TypeError 9574: (74-87): Type fixed128x18 is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol
deleted file mode 100644
index 20ebcb1fef37..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    mapping(ufixed8x1 => string) fixedString;
-    function f() public {
-        fixedString[0.5] = "Half";
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol
deleted file mode 100644
index 24a090127cb2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    struct myStruct {
-        ufixed a;
-        int b;
-    }
-    myStruct a = myStruct(3.125, 3);
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol
deleted file mode 100644
index 635d20392140..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        uint[] memory a;
-        a[.5];
-    }
-}
-// ----
-// TypeError 2326: (77-79): Type rational_const 1 / 2 is not implicitly convertible to expected type uint256. Try converting to type ufixed8x1 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
deleted file mode 100644
index 4dbcb3f206c0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    function f() public {
-        ufixed64x8 a = 3.5 * 3;
-        ufixed64x8 b = 4 - 2.5;
-        ufixed64x8 c = 11 / 4;
-        ufixed240x5 d = 599 + 0.21875;
-        ufixed256x80 e = ufixed256x80(35.245 % 12.9);
-        ufixed256x80 f = ufixed256x80(1.2 % 2);
-        fixed g = 2 ** -2;
-        a; b; c; d; e; f; g;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2519: (238-252): This declaration shadows an existing declaration.
-// Warning 2018: (20-339): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
deleted file mode 100644
index d604ac7b4dd4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        fixed g = 2 ** -2.2;
-    }
-}
-// ----
-// TypeError 2271: (60-69): Built-in binary operator ** cannot be applied to types int_const 2 and rational_const -11 / 5.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
deleted file mode 100644
index 800397524461..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        ufixed b = 3 ** 2.5;
-    }
-}
-// ----
-// TypeError 2271: (61-69): Built-in binary operator ** cannot be applied to types int_const 3 and rational_const 5 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
deleted file mode 100644
index e2843d34fd49..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        2 ** (1/2);
-    }
-}
-// ----
-// TypeError 2271: (50-60): Built-in binary operator ** cannot be applied to types int_const 2 and rational_const 1 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
deleted file mode 100644
index 5b84f1a50066..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        42 ** (-1/4);
-    }
-}
-// ----
-// TypeError 2271: (50-62): Built-in binary operator ** cannot be applied to types int_const 42 and rational_const -1 / 4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
deleted file mode 100644
index 3c7082f17dcb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        ufixed a = 3 ** ufixed(1.5);
-    }
-}
-// ----
-// TypeError 2271: (61-77): Built-in binary operator ** cannot be applied to types int_const 3 and ufixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
deleted file mode 100644
index c462d501511e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        ufixed c = 42 ** fixed(-1/4);
-    }
-}
-// ----
-// TypeError 2271: (61-78): Built-in binary operator ** cannot be applied to types int_const 42 and fixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
deleted file mode 100644
index 46cda0a1cb74..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        ~fixed(3.5);
-    }
-}
-// ----
-// TypeError 4907: (50-61): Built-in unary operator ~ cannot be applied to type fixed128x18.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
deleted file mode 100644
index 93cbd9ce6d2c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        fixed(1.5) | 3;
-    }
-}
-// ----
-// TypeError 2271: (50-64): Built-in binary operator | cannot be applied to types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
deleted file mode 100644
index d8792c6bc047..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        fixed(1.75) ^ 3;
-    }
-}
-// ----
-// TypeError 2271: (50-65): Built-in binary operator ^ cannot be applied to types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
deleted file mode 100644
index 0cd2d7f23e61..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        fixed(1.75) & 3;
-    }
-}
-// ----
-// TypeError 2271: (50-65): Built-in binary operator & cannot be applied to types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/342_missing_bool_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/342_missing_bool_conversion.sol
deleted file mode 100644
index 6308f849fb4b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/342_missing_bool_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function b(uint a) public {
-        bool(a == 1);
-    }
-}
-// ----
-// Warning 2018: (20-75): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
deleted file mode 100644
index ad7b34fd76ec..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        ufixed a = uint64(1) + ufixed(2);
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2072: (50-58): Unused local variable.
-// Warning 2018: (20-89): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol
deleted file mode 100644
index 8a4213299a4c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        uint a = 1/3;
-    }
-}
-// ----
-// TypeError 4486: (50-62): Type rational_const 1 / 3 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x77 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/345_unused_return_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/345_unused_return_value.sol
deleted file mode 100644
index 109e8dfb29c2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/345_unused_return_value.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function g() public returns (uint) {}
-    function f() public {
-        g();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol
deleted file mode 100644
index 80787c10c467..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        payable(address(0x12)).send(1);
-    }
-}
-// ----
-// Warning 5878: (50-80): Failure condition of 'send' ignored. Consider using 'transfer' instead.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol
deleted file mode 100644
index 9eee174cc6d3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        address(0x12).call("abc");
-    }
-}
-// ----
-// Warning 9302: (50-75): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
deleted file mode 100644
index e837a6e66d88..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        address(0x12).call{value: 2}("abc");
-    }
-}
-// ----
-// Warning 9302: (50-85): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/350_unused_return_value_delegatecall.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/350_unused_return_value_delegatecall.sol
deleted file mode 100644
index def88fbdca05..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/350_unused_return_value_delegatecall.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        address(0x12).delegatecall("abc");
-    }
-}
-// ----
-// Warning 9302: (50-83): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol
deleted file mode 100644
index dbf81c237346..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public {
-        address(0x12).callcode;
-    }
-}
-// ----
-// TypeError 2256: (55-77): "callcode" has been deprecated in favour of "delegatecall".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/353_callcode_not_deprecated_as_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/353_callcode_not_deprecated_as_function.sol
deleted file mode 100644
index cbfb33577455..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/353_callcode_not_deprecated_as_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function callcode() pure public {
-        test.callcode();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol
deleted file mode 100644
index 119bae11173f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library test {
-    function f() payable public {}
-}
-// ----
-// TypeError 7708: (19-49): Library functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/355_payable_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/355_payable_external.sol
deleted file mode 100644
index a6c7f3f3b39d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/355_payable_external.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f() payable external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol
deleted file mode 100644
index a21a18d9c2bf..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() payable internal {}
-}
-// ----
-// TypeError 5587: (20-52): "internal" and "private" functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol
deleted file mode 100644
index 3436ce76fda4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() payable private {}
-}
-// ----
-// TypeError 5587: (20-51): "internal" and "private" functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol
deleted file mode 100644
index 60b0a90edcb3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract B { function f() payable virtual public {} }
-contract C is B { function f() public {} }
-// ----
-// TypeError 9456: (72-94): Overriding function is missing "override" specifier.
-// TypeError 6959: (72-94): Overriding function changes state mutability from "payable" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol
deleted file mode 100644
index c2a5857b76d4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract B { function f() virtual public {} }
-contract C is B { function f() payable public {} }
-// ----
-// TypeError 9456: (64-94): Overriding function is missing "override" specifier.
-// TypeError 6959: (64-94): Overriding function changes state mutability from "nonpayable" to "payable".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/360_function_variable_mixin.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/360_function_variable_mixin.sol
deleted file mode 100644
index 2107aafd88d3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/360_function_variable_mixin.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// bug #1798 (cpp-ethereum), related to #1286 (solidity)
-contract attribute {
-    bool ok = false;
-}
-contract func {
-    function ok() public returns (bool) { return true; }
-}
-contract attr_func is attribute, func {
-    function checkOk() public returns (bool) { return ok(); }
-}
-// ----
-// DeclarationError 9097: (121-173): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol
deleted file mode 100644
index cefd2514ef39..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract receiver { function pay() payable public {} }
-contract test {
-    function f() public { (new receiver()).pay{value: 10}(); }
-    receiver r = new receiver();
-    function h() public { r.pay{value: 10}(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
deleted file mode 100644
index 20f0c65668c2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract receiver { function nopay() public {} }
-contract test {
-    function f() public { (new receiver()).nopay{value: 10}(); }
-    function g() public { (new receiver()).nopay.value(10)(); }
-}
-// ----
-// TypeError 7006: (91-124): Cannot set option "value" on a non-payable function type.
-// TypeError 8820: (156-184): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
deleted file mode 100644
index fe0224b4dee4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    constructor() { }
-}
-contract D {
-    function f() public returns (uint) {
-        (new C){value: 2}();
-        return 2;
-    }
-}
-// ----
-// TypeError 7006: (99-116): Cannot set option "value", since the constructor of contract C is not payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol
deleted file mode 100644
index 2eaff9c0c687..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct S { uint x; }
-    constructor(uint k) { S[k]; }
-}
-// ----
-// TypeError 3940: (69-70): Integer constant expected.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol
deleted file mode 100644
index 1a2c2969bb62..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library B {
-    function b() public {}
-}
-
-contract A {
-    using B for bytes;
-
-    function a() public {
-        bytes memory x;
-        x.b();
-    }
-}
-// ----
-// TypeError 9582: (137-140): Member "b" not found or not visible after argument-dependent lookup in bytes memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
deleted file mode 100644
index 6cbf05825164..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint public a = 0x42 << -8;
-}
-// ----
-// TypeError 2271: (33-43): Built-in binary operator << cannot be applied to types int_const 66 and int_const -8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
deleted file mode 100644
index b7eca3d2f8c7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint public a = 0x42 >> -8;
-}
-// ----
-// TypeError 2271: (33-43): Built-in binary operator >> cannot be applied to types int_const 66 and int_const -8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
deleted file mode 100644
index 4272c357b17f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint public a = 0x42 << 0x100000000;
-}
-// ----
-// TypeError 2271: (33-52): Built-in binary operator << cannot be applied to types int_const 66 and int_const 4294967296.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
deleted file mode 100644
index 2c3cec95eb25..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint public a = 0x42 >> 0x100000000;
-}
-// ----
-// TypeError 2271: (33-52): Built-in binary operator >> cannot be applied to types int_const 66 and int_const 4294967296.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
deleted file mode 100644
index 913572d45e1d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint public a = 0x42 >> (1 / 2);
-}
-// ----
-// TypeError 2271: (33-48): Built-in binary operator >> cannot be applied to types int_const 66 and rational_const 1 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/396_invalid_mobile_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/396_invalid_mobile_type.sol
deleted file mode 100644
index df0aec30df42..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/396_invalid_mobile_type.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-    contract C {
-        function f() public {
-            // Invalid number
-            78901234567890123456789012345678901234567890123456789345678901234567890012345678012345678901234567;
-            [1, 78901234567890123456789012345678901234567890123456789345678901234567890012345678012345678901234567];
-        }
-    }
-// ----
-// TypeError 3757: (89-187): Invalid rational number.
-// TypeError 3390: (205-303): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol
deleted file mode 100644
index 008b9fc1bb9a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        msg.value;
-    }
-}
-// ----
-// TypeError 5887: (52-61): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/398_does_not_warn_msg_value_in_payable_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/398_does_not_warn_msg_value_in_payable_function.sol
deleted file mode 100644
index 78e4a9cd9d92..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/398_does_not_warn_msg_value_in_payable_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() payable public {
-        msg.value;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol
deleted file mode 100644
index edd8d2594cf1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view internal {
-        msg.value;
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/400_does_not_warn_msg_value_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/400_does_not_warn_msg_value_in_library.sol
deleted file mode 100644
index 43d1db91eaa2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/400_does_not_warn_msg_value_in_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library C {
-    function f() view public {
-        msg.value;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/401_does_not_warn_msg_value_in_modifier_following_non_payable_public_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/401_does_not_warn_msg_value_in_modifier_following_non_payable_public_function.sol
deleted file mode 100644
index d97cd8553f40..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/401_does_not_warn_msg_value_in_modifier_following_non_payable_public_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function f() pure public { }
-    modifier m() { msg.value; _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol
deleted file mode 100644
index 84b9d5454b64..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    uint constant a = 1;
-    function f() public { a = 2; }
-}
-// ----
-// TypeError 6520: (64-65): Cannot assign to a constant variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/403_return_structs.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/403_return_structs.sol
deleted file mode 100644
index d025dfb8b992..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/403_return_structs.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { uint a; T[] sub; }
-    struct T { uint[] x; }
-    function f() public returns (uint, S memory) {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/404_read_returned_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/404_read_returned_struct.sol
deleted file mode 100644
index 39958b66c010..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/404_read_returned_struct.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-contract A {
-    struct T {
-        int x;
-        int y;
-    }
-    function g() public returns (T memory) {
-        return this.g();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/405_address_checksum_type_deduction.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/405_address_checksum_type_deduction.sol
deleted file mode 100644
index 25acbfd42a3e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/405_address_checksum_type_deduction.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public {
-        payable(0xfA0bFc97E48458494Ccd857e1A85DC91F7F0046E).transfer(2);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/406_invalid_address_checksum.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/406_invalid_address_checksum.sol
deleted file mode 100644
index 2abd832f137e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/406_invalid_address_checksum.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        address x = 0xFA0bFc97E48458494Ccd857e1A85DC91F7F0046E;
-        x;
-    }
-}
-// ----
-// SyntaxError 9429: (64-106): This looks like an address but has an invalid checksum. Correct checksummed address: "0xfA0bFc97E48458494Ccd857e1A85DC91F7F0046E". If this is not used as an address, please prepend '00'. For more information please see https://docs.soliditylang.org/en/develop/types.html#address-literals
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/407_invalid_address_no_checksum.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/407_invalid_address_no_checksum.sol
deleted file mode 100644
index 2299c4e85eb5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/407_invalid_address_no_checksum.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        address x = 0xfa0bfc97e48458494ccd857e1a85dc91f7f0046e;
-        x;
-    }
-}
-// ----
-// SyntaxError 9429: (64-106): This looks like an address but has an invalid checksum. Correct checksummed address: "0xfA0bFc97E48458494Ccd857e1A85DC91F7F0046E". If this is not used as an address, please prepend '00'. For more information please see https://docs.soliditylang.org/en/develop/types.html#address-literals
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/408_invalid_address_length_short.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/408_invalid_address_length_short.sol
deleted file mode 100644
index d0ee67e857e5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/408_invalid_address_length_short.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        address x = 0xA0bFc97E48458494Ccd857e1A85DC91F7F0046E;
-        x;
-    }
-}
-// ----
-// SyntaxError 9429: (64-105): This looks like an address but is not exactly 40 hex digits. It is 39 hex digits. If this is not used as an address, please prepend '00'. For more information please see https://docs.soliditylang.org/en/develop/types.html#address-literals
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/409_invalid_address_length_long.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/409_invalid_address_length_long.sol
deleted file mode 100644
index bc5fc8b999c3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/409_invalid_address_length_long.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        address x = 0xFA0bFc97E48458494Ccd857e1A85DC91F7F0046E0;
-        x;
-    }
-}
-// ----
-// SyntaxError 9429: (64-107): This looks like an address but is not exactly 40 hex digits. It is 41 hex digits. If this is not used as an address, please prepend '00'. For more information please see https://docs.soliditylang.org/en/develop/types.html#address-literals
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/410_string_literal_not_convertible_to_address_as_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/410_string_literal_not_convertible_to_address_as_assignment.sol
deleted file mode 100644
index 2a62d956b45c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/410_string_literal_not_convertible_to_address_as_assignment.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// A previous implementation claimed the string would be an address
-contract AddrString {
-    address public test = "0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c";
-}
-// ----
-// TypeError 7407: (116-160): Type literal_string "0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c" is not implicitly convertible to expected type address.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/411_string_literal_not_convertible_to_address_as_return_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/411_string_literal_not_convertible_to_address_as_return_value.sol
deleted file mode 100644
index 338dea1db9a3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/411_string_literal_not_convertible_to_address_as_return_value.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// A previous implementation claimed the string would be an address
-contract AddrString {
-    function f() public returns (address) {
-        return "0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c";
-   }
-}
-// ----
-// TypeError 6359: (149-193): Return argument type literal_string "0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c" is not implicitly convertible to expected type (type of first return variable) address.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol
deleted file mode 100644
index 44cc9a3b0d4b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// This tests a crash that occurred because we did not stop for fatal errors.
-contract C {
-    struct S {
-        ftring a;
-    }
-    S public s;
-    function s() public s {
-    }
-}
-// ----
-// DeclarationError 2333: (150-179): Identifier already declared.
-// DeclarationError 7920: (114-120): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/413_address_methods.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/413_address_methods.sol
deleted file mode 100644
index ad57224cdecb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/413_address_methods.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public {
-        address payable addr;
-        uint balance = addr.balance;
-        (bool callSuc,) = addr.call("");
-        (bool delegatecallSuc,) = addr.delegatecall("");
-        bool sendRet = addr.send(1);
-        addr.transfer(1);
-        balance; callSuc; delegatecallSuc; sendRet;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/414_interface.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/414_interface.sol
deleted file mode 100644
index 4ff8685febc9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/414_interface.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-interface I {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/415_interface_functions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/415_interface_functions.sol
deleted file mode 100644
index 32ecfc4fa303..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/415_interface_functions.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface I {
-    fallback() external;
-    function f() external;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/416_interface_function_bodies.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/416_interface_function_bodies.sol
deleted file mode 100644
index 71748031a545..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/416_interface_function_bodies.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-interface I {
-    function f() external pure {
-    }
-}
-// ----
-// TypeError 4726: (18-52): Functions in interfaces cannot have an implementation.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/417_interface_events.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/417_interface_events.sol
deleted file mode 100644
index 288bc7168b5c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/417_interface_events.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface I {
-    event E();
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/418_interface_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/418_interface_inheritance.sol
deleted file mode 100644
index 4cb06a12b19c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/418_interface_inheritance.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface A {
-}
-interface I is A {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/419_interface_structs.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/419_interface_structs.sol
deleted file mode 100644
index 385ed18e0aef..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/419_interface_structs.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-interface I {
-    struct A {
-        int dummy;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol
deleted file mode 100644
index adb8ee69fb47..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface I {
-    uint a;
-}
-// ----
-// TypeError 8274: (18-24): Variables cannot be declared in interfaces.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/421_interface_function_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/421_interface_function_parameters.sol
deleted file mode 100644
index 9722e936cb59..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/421_interface_function_parameters.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface I {
-    function f(uint a) external returns (bool);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/422_interface_enums.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/422_interface_enums.sol
deleted file mode 100644
index 1533e7ff7761..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/422_interface_enums.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface I {
-    enum A { B, C }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/423_using_interface.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/423_using_interface.sol
deleted file mode 100644
index 4f7cf189934c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/423_using_interface.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface I {
-    function f() external;
-}
-contract C is I {
-    function f() public override {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/424_using_interface_complex.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/424_using_interface_complex.sol
deleted file mode 100644
index cbe12447c688..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/424_using_interface_complex.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface I {
-    event A();
-    function f() external;
-    function g() external;
-    fallback() external;
-}
-abstract contract C is I {
-    function f() public override {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/425_interface_implement_public_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/425_interface_implement_public_contract.sol
deleted file mode 100644
index 4f7cf189934c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/425_interface_implement_public_contract.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface I {
-    function f() external;
-}
-contract C is I {
-    function f() public override {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol
deleted file mode 100644
index 1f36e4d7d8d2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        throw;
-    }
-}
-// ----
-// SyntaxError 4538: (52-57): "throw" is deprecated in favour of "revert()", "require()" and "assert()".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol
deleted file mode 100644
index 9cd58e3da7c8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint x) pure public {
-        if (x > 7)
-            revert;
-    }
-}
-// ----
-// TypeError 2144: (81-87): No matching declaration found after variable lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/429_revert_with_reason.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/429_revert_with_reason.sol
deleted file mode 100644
index 48c3693bf563..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/429_revert_with_reason.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f(uint x) pure public {
-        if (x > 7)
-            revert("abc");
-        else
-            revert();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
deleted file mode 100644
index 6662d7b29964..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() pure public { selfdestruct; }
-}
-// ----
-// Warning 5159: (44-56): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// Warning 6133: (44-56): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol
deleted file mode 100644
index 5e007aa22520..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public { assert; }
-}
-// ----
-// Warning 6133: (44-50): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol
deleted file mode 100644
index a67f5180fc29..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    // This is different because it does have overloads.
-    function f() pure public { require; }
-}
-// ----
-// TypeError 2144: (101-108): No matching declaration found after variable lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol
deleted file mode 100644
index 5e4084885ba0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        for (uint x = 0; x < 10; true)
-            x++;
-    }
-}
-// ----
-// Warning 6133: (77-81): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/434_pure_statement_check_for_regular_for_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/434_pure_statement_check_for_regular_for_loop.sol
deleted file mode 100644
index ba62ad4fd0b2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/434_pure_statement_check_for_regular_for_loop.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        for (uint x = 0; true; x++)
-        {}
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/438_unused_unnamed_function_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/438_unused_unnamed_function_parameter.sol
deleted file mode 100644
index 21bb08ab1adc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/438_unused_unnamed_function_parameter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint) pure public {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/441_unused_unnamed_return_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/441_unused_unnamed_return_parameter.sol
deleted file mode 100644
index b8d8abfc4971..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/441_unused_unnamed_return_parameter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public returns (uint) {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/442_named_return_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/442_named_return_parameter.sol
deleted file mode 100644
index 671f553e056f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/442_named_return_parameter.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() pure public returns (uint a) {
-        a = 1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/443_named_return_parameter_with_explicit_return.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/443_named_return_parameter_with_explicit_return.sol
deleted file mode 100644
index 643014336b88..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/443_named_return_parameter_with_explicit_return.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() pure public returns (uint a) {
-        return 1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/444_unnamed_return_parameter_with_explicit_return.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/444_unnamed_return_parameter_with_explicit_return.sol
deleted file mode 100644
index 55dda5e11e52..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/444_unnamed_return_parameter_with_explicit_return.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() pure public returns (uint) {
-        return 1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/445_no_unused_warning_interface_arguments.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/445_no_unused_warning_interface_arguments.sol
deleted file mode 100644
index 824ef4b464d9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/445_no_unused_warning_interface_arguments.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface I {
-    function f(uint a) pure external returns (uint b);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/446_no_unused_warning_abstract_arguments.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/446_no_unused_warning_abstract_arguments.sol
deleted file mode 100644
index 636c9a360470..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/446_no_unused_warning_abstract_arguments.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract contract C {
-    function f(uint a) pure public virtual returns (uint b);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/447_no_unused_warnings.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/447_no_unused_warnings.sol
deleted file mode 100644
index 4fd1b355c67b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/447_no_unused_warnings.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint a) pure public returns (uint b) {
-        uint c = 1;
-        b = a + c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/459_function_overload_is_not_shadowing.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/459_function_overload_is_not_shadowing.sol
deleted file mode 100644
index 1a8c46669e99..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/459_function_overload_is_not_shadowing.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public {}
-    function f(uint) pure public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/460_function_override_is_not_shadowing.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/460_function_override_is_not_shadowing.sol
deleted file mode 100644
index 138030784db2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/460_function_override_is_not_shadowing.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract D { function f() pure public {} }
-contract C is D {
-    function f(uint) pure public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/461_event_parameter_cannot_shadow_state_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/461_event_parameter_cannot_shadow_state_variable.sol
deleted file mode 100644
index 9135ed53d12d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/461_event_parameter_cannot_shadow_state_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    address a;
-    event E(address a);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
deleted file mode 100644
index 1f9e7a1a05e2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; bool x; }
-    S public s;
-    constructor() {
-        3({a: 1, x: true});
-    }
-}
-// ----
-// TypeError 5704: (90-108): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/466_does_not_error_transfer_payable_fallback.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/466_does_not_error_transfer_payable_fallback.sol
deleted file mode 100644
index 642ae8360569..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/466_does_not_error_transfer_payable_fallback.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// This used to be a test for a.transfer to generate a warning
-// because A does not have a payable fallback function.
-
-contract A {
-    receive() payable external {}
-}
-
-contract B {
-    A a;
-
-    fallback() external {
-        payable(a).transfer(100);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/467_does_not_error_transfer_regular_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/467_does_not_error_transfer_regular_function.sol
deleted file mode 100644
index 443ee9e36227..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/467_does_not_error_transfer_regular_function.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function transfer() pure public {}
-}
-
-contract B {
-    A a;
-
-    fallback() external {
-        a.transfer();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/470_specified_storage_no_warn.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/470_specified_storage_no_warn.sol
deleted file mode 100644
index f45abc5da918..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/470_specified_storage_no_warn.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; string b; }
-    S x;
-    function f() view public {
-        S storage y = x;
-        y;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
deleted file mode 100644
index 54caa2b38ea6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { uint a; }
-    S m_x;
-    uint[] m_y;
-    function f() view public {
-        S x = m_x;
-        uint[] y = m_y;
-        x; y;
-    }
-}
-// ----
-// TypeError 6651: (104-107): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
-// TypeError 6651: (123-131): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol
deleted file mode 100644
index 937874b61fd6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint storage a) public { }
-}
-// ----
-// TypeError 6651: (28-42): Data location can only be specified for array, struct or mapping types, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol
deleted file mode 100644
index 48ed1e63be65..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint storage a) public {
-        a = f;
-    }
-}
-// ----
-// TypeError 6651: (28-42): Data location can only be specified for array, struct or mapping types, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol
deleted file mode 100644
index aeb91eedb5fd..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (bytes4) {
-        uint32 tmp = 1;
-        return tmp;
-    }
-}
-// ----
-// TypeError 6359: (95-98): Return argument type uint32 is not implicitly convertible to expected type (type of first return variable) bytes4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol
deleted file mode 100644
index b319bd56cf7d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint[85678901234] calldata a) pure external {
-    }
-}
-// ----
-// TypeError 1534: (28-56): Type too large for calldata.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol
deleted file mode 100644
index 0447f5e01018..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint[85678901234] memory a) pure internal {
-    }
-}
-// ----
-// TypeError 1534: (28-54): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol
deleted file mode 100644
index bf65519d1ee9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint[85678901234] memory a) pure public {
-    }
-}
-// ----
-// TypeError 1534: (28-54): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/479_explicit_literal_to_memory_string_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/479_explicit_literal_to_memory_string_assignment.sol
deleted file mode 100644
index 716ab0720381..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/479_explicit_literal_to_memory_string_assignment.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        string memory x = "abc";
-        x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol
deleted file mode 100644
index 25485451bce0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        string storage x = "abc";
-    }
-}
-// ----
-// TypeError 9574: (52-76): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
deleted file mode 100644
index 25485451bce0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        string storage x = "abc";
-    }
-}
-// ----
-// TypeError 9574: (52-76): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol
deleted file mode 100644
index 70eaebb285a7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        string("abc");
-    }
-}
-// ----
-// Warning 6133: (52-65): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/483_modifiers_access_storage_pointer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/483_modifiers_access_storage_pointer.sol
deleted file mode 100644
index 271535fb21b8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/483_modifiers_access_storage_pointer.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct S { uint a; }
-    modifier m(S storage x) {
-        x;
-        _;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol
deleted file mode 100644
index 46f6479fbc9c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public view returns (bytes4) {
-        return f.selector;
-    }
-}
-// ----
-// TypeError 9582: (76-86): Member "selector" not found or not visible after argument-dependent lookup in function () view returns (bytes4).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol
deleted file mode 100644
index fae30bbec69f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function g() pure internal {
-    }
-    function f() public view returns (bytes4) {
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9582: (115-125): Member "selector" not found or not visible after argument-dependent lookup in function () pure.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol
deleted file mode 100644
index 66cb6d6fd2eb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public view returns (bytes4) {
-        function () g;
-        return g.selector;
-    }
-}
-// ----
-// TypeError 9582: (99-109): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/487_function_types_selector_4.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/487_function_types_selector_4.sol
deleted file mode 100644
index 8ac385603229..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/487_function_types_selector_4.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() pure external returns (bytes4) {
-        return this.f.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/488_function_types_selector_5.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/488_function_types_selector_5.sol
deleted file mode 100644
index 5f601db224a2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/488_function_types_selector_5.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function h() pure external {
-    }
-    function f() pure external returns (bytes4) {
-        return this.h.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/489_function_types_selector_6.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/489_function_types_selector_6.sol
deleted file mode 100644
index 9ee7d9bb9b25..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/489_function_types_selector_6.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function h() pure external {
-    }
-    function f() view external returns (bytes4) {
-        function () pure external g = this.h;
-        return g.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/490_function_types_selector_7.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/490_function_types_selector_7.sol
deleted file mode 100644
index 9ee7d9bb9b25..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/490_function_types_selector_7.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function h() pure external {
-    }
-    function f() view external returns (bytes4) {
-        function () pure external g = this.h;
-        return g.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol
deleted file mode 100644
index 114046584e3a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    constructor() {
-        this.f();
-    }
-    function f() pure public {
-    }
-}
-// ----
-// Warning 5805: (41-45): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
deleted file mode 100644
index d46920d1dbdf..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// This checks for a bug that caused a crash because of continued analysis.
-contract C {
-    mapping (uint => uint) m;
-    function f() public {
-        m(1) = 2;
-    }
-}
-// ----
-// TypeError 5704: (153-157): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol
deleted file mode 100644
index 75a6ff5a9c7f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        keccak256.gas();
-    }
-}
-// ----
-// TypeError 9582: (47-60): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol
deleted file mode 100644
index a418ef207a09..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        sha256.gas();
-    }
-}
-// ----
-// TypeError 9582: (47-57): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol
deleted file mode 100644
index 17b0fc490ad4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        ripemd160.gas();
-    }
-}
-// ----
-// TypeError 9582: (47-60): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes20).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol
deleted file mode 100644
index 007cb316a574..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        ecrecover.gas();
-    }
-}
-// ----
-// TypeError 9582: (47-60): Member "gas" not found or not visible after argument-dependent lookup in function (bytes32,uint8,bytes32,bytes32) pure returns (address).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/497_gasleft.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/497_gasleft.sol
deleted file mode 100644
index 3d5acac99be3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/497_gasleft.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    function f() public view returns (uint256 val) { return gasleft(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol
deleted file mode 100644
index afd3f2d91a5f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() public view returns (uint256 val) { return msg.gas; }
-}
-// ----
-// TypeError 1400: (73-80): "msg.gas" has been deprecated in favor of "gasleft()"
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/500_gasleft_shadowing_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/500_gasleft_shadowing_1.sol
deleted file mode 100644
index d3ea58c32f92..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/500_gasleft_shadowing_1.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function gasleft() public pure returns (bytes32 val) { return "abc"; }
-    function f() public pure returns (bytes32 val) { return gasleft(); }
-}
-// ----
-// Warning 2319: (17-87): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol
deleted file mode 100644
index ea6149313230..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint gasleft;
-    function f() public { gasleft = 42; }
-}
-// ----
-// Warning 2319: (17-29): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol
deleted file mode 100644
index 7763535ef0fa..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        keccak256.value();
-    }
-}
-// ----
-// TypeError 8820: (47-62): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol
deleted file mode 100644
index aaccfad42175..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        sha256.value();
-    }
-}
-// ----
-// TypeError 8820: (47-59): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol
deleted file mode 100644
index 57c5c0456ea0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        ripemd160.value();
-    }
-}
-// ----
-// TypeError 8820: (47-62): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol
deleted file mode 100644
index 88713331e3fd..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        ecrecover.value();
-    }
-}
-// ----
-// TypeError 8820: (47-62): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol
deleted file mode 100644
index f77845b477e3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// This used to work pre-0.6.0.
-library L {
-    // This can be used as an "interface", hence it is allowed.
-    function f() public;
-}
-// ----
-// TypeError 9231: (112-132): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol
deleted file mode 100644
index 46025690a76e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f() internal;
-}
-// ----
-// TypeError 9231: (16-38): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol
deleted file mode 100644
index ad7683d65d10..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f() private;
-}
-// ----
-// TypeError 9231: (16-37): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
deleted file mode 100644
index 940a3b071a83..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// This tests a crash that was resolved by making the first error fatal.
-library L {
-    struct S { uint d; }
-    using S for S;
-    function f(S memory _s) internal {
-        _s.d = 1;
-    }
-}
-// ----
-// TypeError 4357: (120-121): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol
deleted file mode 100644
index 54ca8f6945d7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface I {}
-contract C {
-    function f() public {
-        new I();
-    }
-}
-// ----
-// TypeError 2971: (62-67): Cannot instantiate an interface.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
deleted file mode 100644
index 88396f8c6e01..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface I {}
-contract C is I(2) {}
-// ----
-// TypeError 7927: (29-33): Wrong argument count for constructor call: 1 arguments given but expected 0
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/526_fallback_marked_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/526_fallback_marked_external.sol
deleted file mode 100644
index 7959698268db..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/526_fallback_marked_external.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    fallback () external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol
deleted file mode 100644
index 1589d58c93b4..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback () internal { }
-}
-// ----
-// TypeError 1159: (17-41): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol
deleted file mode 100644
index 3d3020bfad34..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback () private { }
-}
-// ----
-// TypeError 1159: (17-40): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol
deleted file mode 100644
index ce8f3e018a27..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    fallback () public { }
-}
-// ----
-// TypeError 1159: (17-39): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol
deleted file mode 100644
index 0c92397cf8f9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        uint x;
-        (x, ) = (1E111);
-    }
-}
-// ----
-// TypeError 7407: (76-83): Type int_const 1000...(104 digits omitted)...0000 is not implicitly convertible to expected type tuple(uint256,).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol
deleted file mode 100644
index 0739c9e839cc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        uint x;
-        (x, ) = (1, 1E111);
-    }
-}
-// ----
-// TypeError 3390: (80-85): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol
deleted file mode 100644
index 53979ab5f85e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        uint x;
-        (x, ) = (1E111, 1);
-    }
-}
-// ----
-// TypeError 3390: (77-82): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol
deleted file mode 100644
index 2010aac6809e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        (2**270, 1);
-    }
-}
-// ----
-// TypeError 3390: (53-59): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol
deleted file mode 100644
index ab239f2a4f1f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        ((2**270) / 2**100, 1);
-    }
-}
-// ----
-// Warning 6133: (52-74): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/535_address_overload_resolution.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/535_address_overload_resolution.sol
deleted file mode 100644
index a36aeed86364..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/535_address_overload_resolution.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function balance() public returns (uint) {
-        this.balance; // to avoid pureness warning
-        return 1;
-    }
-    function transfer(uint amount) public {
-        payable(this).transfer(amount); // to avoid pureness warning
-    }
-    receive() payable external {
-    }
-}
-contract D {
-    function f() public {
-        uint x = (new C()).balance();
-        x;
-        (new C()).transfer(5);
-    }
-}
-// ----
-// Warning 2018: (17-134): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol
deleted file mode 100644
index 14fc21ac173f..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[-true] ids;
-}
-// ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol
deleted file mode 100644
index 5cb91b94229e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[true/1] ids;
-}
-// ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol
deleted file mode 100644
index dbedaaa3b766..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[1/true] ids;
-}
-// ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol
deleted file mode 100644
index dc588eb4b8f8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[1.111111E1111111111111] ids;
-}
-// ----
-// TypeError 5462: (22-44): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol
deleted file mode 100644
index 4e8b76d711b3..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint[3/0] ids;
-}
-// ----
-// TypeError 6020: (22-25): Operator / not compatible with types int_const 3 and int_const 0
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol
deleted file mode 100644
index 38c3c80ca2f6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        this.balance;
-    }
-}
-// ----
-// TypeError 3125: (52-64): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(this).balance" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol
deleted file mode 100644
index 7eb41976e514..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        this.transfer;
-    }
-}
-// ----
-// TypeError 3125: (52-65): Member "transfer" not found or not visible after argument-dependent lookup in contract C. Use "address(this).transfer" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol
deleted file mode 100644
index a889c26c3e12..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        this.send;
-    }
-}
-// ----
-// TypeError 3125: (52-61): Member "send" not found or not visible after argument-dependent lookup in contract C. Use "address(this).send" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol
deleted file mode 100644
index 94a1aa3b111d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        this.call;
-    }
-}
-// ----
-// TypeError 3125: (52-61): Member "call" not found or not visible after argument-dependent lookup in contract C. Use "address(this).call" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol
deleted file mode 100644
index e2e59e5661d8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        this.callcode;
-    }
-}
-// ----
-// TypeError 3125: (52-65): Member "callcode" not found or not visible after argument-dependent lookup in contract C. Use "address(this).callcode" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol
deleted file mode 100644
index f12d3cf97d55..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() view public {
-        this.delegatecall;
-    }
-}
-// ----
-// TypeError 3125: (52-69): Member "delegatecall" not found or not visible after argument-dependent lookup in contract C. Use "address(this).delegatecall" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol
deleted file mode 100644
index 91e7404b03b6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() view public {
-        C c;
-        c.balance;
-    }
-}
-// ----
-// TypeError 3125: (65-74): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(c).balance" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol
deleted file mode 100644
index 192a898926b7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() view public {
-        C c;
-        c.transfer;
-    }
-}
-// ----
-// TypeError 3125: (65-75): Member "transfer" not found or not visible after argument-dependent lookup in contract C. Use "address(c).transfer" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol
deleted file mode 100644
index ba614226af70..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() view public {
-        C c;
-        c.send;
-    }
-}
-// ----
-// TypeError 3125: (65-71): Member "send" not found or not visible after argument-dependent lookup in contract C. Use "address(c).send" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol
deleted file mode 100644
index 7d2eb2af8c5d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        C c;
-        c.call;
-    }
-}
-// ----
-// TypeError 3125: (65-71): Member "call" not found or not visible after argument-dependent lookup in contract C. Use "address(c).call" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol
deleted file mode 100644
index 971af8632cd2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        C c;
-        c.callcode;
-    }
-}
-// ----
-// TypeError 3125: (65-75): Member "callcode" not found or not visible after argument-dependent lookup in contract C. Use "address(c).callcode" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol
deleted file mode 100644
index ff933142f0fb..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        C c;
-        c.delegatecall;
-    }
-}
-// ----
-// TypeError 3125: (65-79): Member "delegatecall" not found or not visible after argument-dependent lookup in contract C. Use "address(c).delegatecall" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/559_no_warning_for_using_members_that_look_like_address_members.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/559_no_warning_for_using_members_that_look_like_address_members.sol
deleted file mode 100644
index d4a47ec3c312..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/559_no_warning_for_using_members_that_look_like_address_members.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract C {
-    function transfer(uint) public virtual;
-    function f() public {
-        this.transfer(10);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/568_blockhash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/568_blockhash.sol
deleted file mode 100644
index 164c223dae8d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/568_blockhash.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    function f() public view returns (bytes32) { return blockhash(3); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol
deleted file mode 100644
index 69c53894d9f5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public view returns (bytes32) {
-        return block.blockhash(3);
-    }
-}
-// ----
-// TypeError 8113: (77-92): "block.blockhash()" has been deprecated in favor of "blockhash()"
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol
deleted file mode 100644
index a9509ce407e9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function a(function(Nested)) external pure {}
-}
-// ----
-// DeclarationError 7920: (37-43): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol
deleted file mode 100644
index 90bd436651e8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function a(function(Nested) external) external pure {}
-}
-// ----
-// DeclarationError 7920: (37-43): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol
deleted file mode 100644
index 8b08c29e7a40..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function a(function(function(function(Nested)))) external pure {}
-}
-// ----
-// DeclarationError 7920: (55-61): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/573_similar_name_longer_than_80_not_suggested.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/573_similar_name_longer_than_80_not_suggested.sol
deleted file mode 100644
index d83ee1d8182e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/573_similar_name_longer_than_80_not_suggested.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        int YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY = YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY;
-    }
-}
-// ----
-// DeclarationError 7576: (146-236): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/574_similar_name_shorter_than_80_suggested.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/574_similar_name_shorter_than_80_suggested.sol
deleted file mode 100644
index cb44e4dba489..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/574_similar_name_shorter_than_80_suggested.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public {
-        int YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY = YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY;
-    }
-}
-// ----
-// DeclarationError 7576: (137-216): Undeclared identifier. Did you mean "YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol
deleted file mode 100644
index f7a5f3242a3c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract A{
-    function f() public pure{
-
-    }
-}
-contract B{
-    A public a;
-}
-contract C{
-    B public b;
-}
-contract D{
-    C c;
-    function f() public view{
-        c.b.a.f();
-    }
-}
-// ----
-// TypeError 6005: (170-175): Member "a" not found or not visible after argument-dependent lookup in function () view external returns (contract B). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol
deleted file mode 100644
index e96d0189b20d..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A{
-    function f() public pure{
-
-    }
-}
-contract B{
-    A public a;
-}
-contract C{
-    B b;
-    function f() public view{
-        b.a.f();
-    }
-}
-
-// ----
-// TypeError 6005: (140-145): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol
deleted file mode 100644
index 11814b81f952..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A{
-
-}
-contract B{
-    A public a;
-}
-contract C{
-    B b;
-    function f() public view{
-        b.a.f();
-    }
-}
-
-// ----
-// TypeError 6005: (104-109): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol
deleted file mode 100644
index fceadad8dc48..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A{
-    function f() public pure{
-
-    }
-}
-contract B{
-    A private a;
-}
-contract C{
-    B b;
-    function f() public view{
-        b.a.f();
-    }
-}
-
-// ----
-// TypeError 9582: (141-144): Member "a" not found or not visible after argument-dependent lookup in contract B.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol
deleted file mode 100644
index 3286934371f9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A{
-    function f() private pure{
-
-    }
-}
-contract B{
-    A public a;
-}
-contract C{
-    B b;
-    function f() public view{
-        b.a.f();
-    }
-}
-
-// ----
-// TypeError 6005: (141-146): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol
deleted file mode 100644
index 832cf3ae8ce9..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract c {
-    function f () public
-    {
-        a = ac;
-        a = cd;
-        a = b;
-    }
-    uint256 a;
-    uint256 ab;
-}
-// ----
-// DeclarationError 7576: (56-58): Undeclared identifier. Did you mean "ab"?
-// DeclarationError 7576: (72-74): Undeclared identifier.
-// DeclarationError 7576: (88-89): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol
deleted file mode 100644
index 6070ff353835..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract c {
-    function f () public
-    {
-        a = abd;
-        a = ade;
-    }
-    uint256 a;
-    uint256 abc;
-}
-// ----
-// DeclarationError 7576: (56-59): Undeclared identifier. Did you mean "abc" or "abi"?
-// DeclarationError 7576: (73-76): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol
deleted file mode 100644
index 4da28a5e93e1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract c {
-    function f () public
-    {
-        a = land;
-        a = lost;
-        a = lang;
-    }
-    uint256 long;
-    uint256 abc;
-}
-// ----
-// DeclarationError 7576: (52-53): Undeclared identifier.
-// DeclarationError 7576: (56-60): Undeclared identifier. Did you mean "long"?
-// DeclarationError 7576: (70-71): Undeclared identifier.
-// DeclarationError 7576: (74-78): Undeclared identifier. Did you mean "long"?
-// DeclarationError 7576: (88-89): Undeclared identifier.
-// DeclarationError 7576: (92-96): Undeclared identifier. Did you mean "long"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol
deleted file mode 100644
index a2864ed8ef36..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public { abi.encodePacked(0/1); }
-}
-// ----
-// TypeError 7279: (61-64): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol
deleted file mode 100644
index 0d5fadcc808c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public { abi.decode("", (0)); }
-}
-// ----
-// TypeError 1039: (60-61): Argument has to be a type name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
deleted file mode 100644
index abbf76182f9b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder v1;
-contract C {
-	struct s { uint a; uint b; }
-    function f() pure public {
-        abi.decode("", (s));
-    }
-}
-// ----
-// TypeError 9611: (118-119): Decoding type struct C.s memory not supported.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol
deleted file mode 100644
index fbeae8141ac8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error MyCustomError(uint, bool);
-contract Test {
-    function f() public {
-        uint[] memory a;
-        a[MyCustomError];
-    }
-}
-// ----
-// TypeError 7407: (110-123): Type error MyCustomError(uint256,bool) is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol
deleted file mode 100644
index 9b49f788bad2..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Test {
-    event MyCustomEvent(uint);
-    function f() public {
-        uint[] memory a;
-        a[MyCustomEvent];
-    }
-}
-// ----
-// TypeError 7407: (108-121): Type event MyCustomEvent(uint256) is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol
deleted file mode 100644
index dd4c8cb83637..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    uint constant a = 7;
-    uint constant b = 3;
-    function f() public {
-        uint[a / b] memory x; x[0];
-        uint[7 / 3] memory y; y[0];
-    }
-}
-// ----
-// TypeError 3208: (141-146): Array with fractional length specified.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol
deleted file mode 100644
index a5b57253a35b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L { function l() public {} }
-contract test {
-    function f() public {
-        L.l{value: 1}();
-    }
-}
-// ----
-// TypeError 2193: (87-100): Function call options can only be set on external function calls or contract creations.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
deleted file mode 100644
index 6cd7f99c6dd1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (uint a, uint b) {
-        a += (1, 1);
-    }
-}
-// ----
-// TypeError 7366: (72-83): Operator += not compatible with types uint256 and tuple(int_const 1,int_const 1).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol
deleted file mode 100644
index 7171a9abae7c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (uint a, uint b) {
-        (a, b) += (1, 1);
-    }
-}
-// ----
-// TypeError 4289: (72-88): Compound assignment is not allowed for tuple types.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol
deleted file mode 100644
index 8d2d38d226ba..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        uint x;
-        (x, ) = ([100e100]);
-    }
-}
-// ----
-// TypeError 9563: (78-85): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
deleted file mode 100644
index d845e735ce93..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-S constant x;
-struct S { int y; }
-// ----
-// TypeError 9259: (0-12): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
deleted file mode 100644
index 803cdad53507..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    mapping(uint => uint) constant x;
-}
-// ----
-// TypeError 9259: (17-49): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
deleted file mode 100644
index 2fed9d63114e..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct S {
-        mapping(uint => uint) x;
-    }
-    S public constant c;
-}
-// ----
-// TypeError 9259: (71-90): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol
deleted file mode 100644
index ceb172bad0b6..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-uint constant c = 7;
-function c() returns (uint) {}
-// ----
-// DeclarationError 2333: (21-51): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/hash_collision_in_abstract_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/hash_collision_in_abstract_contract.sol
deleted file mode 100644
index c90c6c8ae77c..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/hash_collision_in_abstract_contract.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// This contract used to throw
-abstract contract D {
-    function gsf() public {}
-    function tgeo() public {}
-}
-contract C {
-    D d;
-    function g() public returns (uint) {
-        d.d;
-    }
-}
-// ----
-// TypeError 1860: (31-113): Function signature hash collision for tgeo()
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol
deleted file mode 100644
index 16bcbf4479fc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint size) public {
-        uint[] memory x = new uint[]();
-    }
-}
-// ----
-// TypeError 6160: (74-86): Wrong argument count for function call: 0 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol
deleted file mode 100644
index 3ff9d9ed1155..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; uint b; }
-
-    function f() public {
-        S memory s = S({a: 1});
-    }
-}
-// ----
-// TypeError 9755: (94-103): Wrong argument count for struct constructor: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol
deleted file mode 100644
index cbcb02f6fbbc..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; uint b; mapping(uint=>uint) c; }
-
-    function f() public {
-        S({a: 1});
-    }
-}
-// ----
-// TypeError 9515: (104-113): Struct containing a (nested) mapping cannot be constructed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol
deleted file mode 100644
index aac750153049..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public {
-        uint(1, 1);
-        uint({arg:1});
-    }
-}
-// ----
-// TypeError 2558: (50-60): Exactly one argument expected for explicit type conversion.
-// TypeError 5153: (70-83): Type conversion cannot allow named arguments.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol
deleted file mode 100644
index e7abd890dfd1..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function o(bytes1) public pure {}
-    function f() public {
-        o(true ? 99**99 : 99);
-        o(true ? 99 : 99**99);
-
-        o(true ? 99**99 : 99**99);
-    }
-}
-// ----
-// TypeError 9717: (94-100): Invalid mobile type in true expression.
-// TypeError 9553: (87-105): Invalid type for argument in function call. Invalid implicit conversion from uint8 to bytes1 requested.
-// TypeError 3703: (130-136): Invalid mobile type in false expression.
-// TypeError 9553: (118-136): Invalid type for argument in function call. Invalid implicit conversion from uint8 to bytes1 requested.
-// TypeError 9717: (157-163): Invalid mobile type in true expression.
-// TypeError 3703: (166-172): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol
deleted file mode 100644
index 58d9f8ce6d00..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    constructor(bytes32 _arg) {
-    }
-}
-
-contract A {
-    function f() public {
-        new  C((1234));
-    }
-}
-// ----
-// TypeError 9553: (108-114): Invalid type for argument in function call. Invalid implicit conversion from int_const 1234 to bytes32 requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol
deleted file mode 100644
index 5f5b9a13051a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test {
- struct s { uint a; uint b;}
-    function f() pure public returns (bytes1) {
-		s;
-		s(1,2);
-		s[7];
-		uint;
-		uint[7];
-    }
-}
-// ----
-// Warning 6321: (83-89): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6133: (95-96): Statement has no effect.
-// Warning 6133: (100-106): Statement has no effect.
-// Warning 6133: (110-114): Statement has no effect.
-// Warning 6133: (118-122): Statement has no effect.
-// Warning 6133: (126-133): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol
deleted file mode 100644
index a09ab31b91db..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    event keccak256();
-}
-// ----
-// Warning 2319: (17-35): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/functions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/functions.sol
deleted file mode 100644
index be1a70364a6b..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/functions.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function keccak256() pure public {}
-}
-// ----
-// Warning 2319: (17-52): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol
deleted file mode 100644
index 76fb2ff83195..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract msg {
-}
-// ----
-// Warning 2319: (0-16): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/ignores_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/ignores_constructor.sol
deleted file mode 100644
index 81884a73bd5a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/ignores_constructor.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    constructor() {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/ignores_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/ignores_struct.sol
deleted file mode 100644
index c675e63eb8f0..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/ignores_struct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    struct a {
-        uint msg;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol
deleted file mode 100644
index cb1f793b2c46..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            function this() {
-            }
-            function super() {
-            }
-            function _() {
-            }
-        }
-    }
-}
-// ----
-// DeclarationError 4113: (75-106): The identifier name "this" is reserved.
-// DeclarationError 4113: (119-151): The identifier name "super" is reserved.
-// DeclarationError 4113: (164-192): The identifier name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol
deleted file mode 100644
index 4fc9b245bbad..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            let super := 1
-            let this := 1
-            let _ := 1
-        }
-    }
-}
-// ----
-// DeclarationError 4113: (74-79): The identifier name "super" is reserved.
-// DeclarationError 3859: (74-79): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (101-105): The identifier name "this" is reserved.
-// DeclarationError 3859: (101-105): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (127-128): The identifier name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol
deleted file mode 100644
index 6b5c7c99bbe7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f(uint super) public {
-    }
-    function g(uint this) public {
-    }
-    function h(uint _) public {
-    }
-    function i() public returns (uint super) {
-        return 1;
-    }
-    function j() public returns (uint this) {
-        return 1;
-    }
-    function k() public returns (uint _) {
-        return 1;
-    }
-}
-// ----
-// DeclarationError 3726: (28-38): The name "super" is reserved.
-// DeclarationError 3726: (70-79): The name "this" is reserved.
-// DeclarationError 3726: (111-117): The name "_" is reserved.
-// DeclarationError 3726: (167-177): The name "super" is reserved.
-// DeclarationError 3726: (238-247): The name "this" is reserved.
-// DeclarationError 3726: (308-314): The name "_" is reserved.
-// Warning 2319: (28-38): This declaration shadows a builtin symbol.
-// Warning 2319: (70-79): This declaration shadows a builtin symbol.
-// Warning 2319: (167-177): This declaration shadows a builtin symbol.
-// Warning 2319: (238-247): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_library_using_for.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_library_using_for.sol
deleted file mode 100644
index ac928fa9f493..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_library_using_for.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-library super {
-    function f() public {
-    }
-}
-
-library this {
-    function f() public {
-    }
-}
-library _ {
-    function f() public {
-    }
-}
-
-contract C {
-    // These are not errors
-    using super for uint;
-    using this for uint16;
-    using _ for int;
-}
-// ----
-// DeclarationError 3726: (0-49): The name "super" is reserved.
-// DeclarationError 3726: (51-99): The name "this" is reserved.
-// DeclarationError 3726: (100-145): The name "_" is reserved.
-// Warning 2319: (0-49): This declaration shadows a builtin symbol.
-// Warning 2319: (51-99): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol
deleted file mode 100644
index bf995ba2f490..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-library L {
-    function f() public {
-    }
-}
-
-// error
-struct super {
-    uint a;
-}
-
-// error
-struct this {
-    uint a;
-}
-
-// error
-struct _ {
-    uint a;
-}
-
-contract C {
-    // These are not errors
-    using L for super;
-    using L for _;
-    using L for this;
-}
-// ----
-// DeclarationError 3726: (56-84): The name "super" is reserved.
-// DeclarationError 3726: (95-122): The name "this" is reserved.
-// DeclarationError 3726: (133-157): The name "_" is reserved.
-// Warning 2319: (56-84): This declaration shadows a builtin symbol.
-// Warning 2319: (95-122): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol
deleted file mode 100644
index 40a76dd793bf..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint require) pure public {
-        require = 2;
-    }
-}
-// ----
-// Warning 2319: (28-40): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol
deleted file mode 100644
index e7367038528a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public returns (uint require) {
-        require = 2;
-    }
-}
-// ----
-// Warning 2319: (51-63): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol
deleted file mode 100644
index cde3d01bf4ae..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    uint msg;
-}
-// ----
-// Warning 2319: (17-25): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol
deleted file mode 100644
index 47970c046111..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() pure public {
-        uint super = 3;
-        uint this = 4;
-    }
-}
-// ----
-// DeclarationError 3726: (52-62): The name "super" is reserved.
-// DeclarationError 3726: (76-85): The name "this" is reserved.
-// Warning 2319: (52-62): This declaration shadows a builtin symbol.
-// Warning 2319: (76-85): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol
deleted file mode 100644
index d13cfe9886f7..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        uint msg;
-        msg;
-    }
-}
-// ----
-// Warning 2319: (52-60): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shift_warn_literal_large_shift_amount.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shift_warn_literal_large_shift_amount.sol
deleted file mode 100644
index 7ba9bf3db407..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shift_warn_literal_large_shift_amount.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public returns(uint) {
-        uint x = 100;
-        return 10 << x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/function_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/function_call.sol
deleted file mode 100644
index 3872b1c3b993..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/function_call.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns (bool) { return g(12, true) == 3; }
-    function g(uint256, bool) public returns (uint256) { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol
deleted file mode 100644
index b340c2d396a5..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library X { }
-
-contract Y {
-	X abc;
-	function foo(X param) private view
-	{
-		X ofg;
-		ofg = abc;
-	}
-}
-// ----
-// TypeError 1130: (29-30): Invalid use of a library name.
-// TypeError 1130: (50-51): Invalid use of a library name.
-// TypeError 1130: (77-78): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return.sol
deleted file mode 100644
index a008470ecb66..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns (bool r) { return 1 >= 2; }
-}
-// ----
-// Warning 2018: (20-75): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol
deleted file mode 100644
index a6160b322f44..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns (uint256 r, uint8) { return ((12, "")); }
-}
-// ----
-// TypeError 5992: (76-86): Return argument type tuple(int_const 12,literal_string "") is not implicitly convertible to expected type tuple(uint256,uint8).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol
deleted file mode 100644
index 8ad9de4705cf..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns (bool r1, bool r2) { return 1 >= 2; }
-}
-// ----
-// TypeError 8863: (69-82): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol
deleted file mode 100644
index f3d27491e441..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() public returns (uint256 r) { return 1 >= 2; }
-}
-// ----
-// TypeError 6359: (69-75): Return argument type bool is not implicitly convertible to expected type (type of first return variable) uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/function_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/function_parameter.sol
deleted file mode 100644
index 4227cbb90a7a..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/function_parameter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint a) pure public {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol
deleted file mode 100644
index b36061080807..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        uint a;
-    }
-}
-// ----
-// Warning 2072: (52-58): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol
deleted file mode 100644
index 943de5dd0e00..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        uint a = 1;
-    }
-}
-// ----
-// Warning 2072: (52-58): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/return_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/return_parameter.sol
deleted file mode 100644
index b4c9be35c8e8..000000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/return_parameter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure public returns (uint a) {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/negation.sol b/test/libsolidity/syntaxTests/negation.sol
deleted file mode 100644
index c5805f4f785c..000000000000
--- a/test/libsolidity/syntaxTests/negation.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public pure {
-        int x;
-        uint y = uint(-x);
-        -y;
-    }
-}
-// ----
-// TypeError 4907: (97-99): Built-in unary operator - cannot be applied to type uint256. Unary negation is only allowed for signed integers.
diff --git a/test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol b/test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol
deleted file mode 100644
index ea0c8f9d8a69..000000000000
--- a/test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type Int is int256;
-
-function f() pure {
-    Int a = Int.wrap(0);
-    a + a;
-    a >>> a;
-}
-
-// ----
-// TypeError 2271: (70-75): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 2271: (81-88): Built-in binary operator >>> cannot be applied to types Int and Int.
diff --git a/test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol b/test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol
deleted file mode 100644
index 29273852e63a..000000000000
--- a/test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type Int is int256;
-
-function f() pure {
-    Int a = Int.wrap(0);
-    -a;
-    a++;
-}
-
-// ----
-// TypeError 4907: (70-72): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
-// TypeError 9767: (78-81): Built-in unary operator ++ cannot be applied to type Int.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol
deleted file mode 100644
index a00eb2ce5246..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type Int is int;
-using {add as +} for Int global;
-using {unsub as -} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-function f() pure {
-    Int.wrap(0) + Int.wrap(0);
-    -Int.wrap(0);
-}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol
deleted file mode 100644
index 6c1baa4b1a06..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-type Int is int16;
-
-using {add as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-
-function f() {
-    Int a;
-    a.add(a);
-}
-// ----
-// TypeError 9582: (130-135): Member "add" not found or not visible after argument-dependent lookup in Int.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol
deleted file mode 100644
index 62c53cb8e19a..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-type Int is int16;
-
-using {add as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-
-function f() {
-    Int a;
-    a.+(a);
-}
-// ----
-// ParserError 2314: (132-133): Expected identifier but got '+'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol
deleted file mode 100644
index 827853938ff0..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: definition.sol ====
-import "type-and-binding.sol";
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-==== Source: type-and-binding.sol ====
-import "definition.sol";
-
-type Int is int;
-
-using {add as +} for Int global;
-using {unsub as -} for Int global;
-
-==== Source: use.sol ====
-import "type-and-binding.sol";
-
-contract C {
-    function f() pure public {
-        Int.wrap(0) + Int.wrap(0);
-        -Int.wrap(0);
-    }
-}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol
deleted file mode 100644
index d7a9ed057790..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-==== Source: binding.sol ====
-import "definition.sol";
-import "type.sol";
-
-using {add as +} for Int global;
-using {unsub as -} for Int global;
-
-==== Source: definition.sol ====
-import "type.sol";
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-==== Source: type.sol ====
-type Int is int;
-
-==== Source: use.sol ====
-import "type.sol";
-
-contract C {
-    function f() pure public {
-        Int.wrap(0) + Int.wrap(0);
-        -Int.wrap(0);
-    }
-}
-// ----
-// TypeError 4117: (binding.sol:45-77): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (binding.sol:78-112): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 2271: (use.sol:72-97): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 4907: (use.sol:107-119): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol
deleted file mode 100644
index 7c56bd6d68d0..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: s1.sol ====
-type Int is int;
-using {add as +} for Int global;
-using {unsub as -} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-==== Source: s2.sol ====
-import "s1.sol";
-
-contract C {
-    function f() pure public {
-        Int.wrap(0) + Int.wrap(0);
-        -Int.wrap(0);
-    }
-}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol
deleted file mode 100644
index ab2a83797b2c..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: s1.sol ====
-type Int is int;
-using {add as +} for Int;
-using {unsub as -} for Int;
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-==== Source: s2.sol ====
-import "s1.sol";
-
-contract C {
-    function f() pure public {
-        Int.wrap(0) + Int.wrap(0);
-        -Int.wrap(0);
-    }
-}
-// ----
-// TypeError 3320: (s1.sol:24-27): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (s1.sol:50-55): Operators can only be defined in a global 'using for' directive.
-// TypeError 2271: (s2.sol:70-95): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 4907: (s2.sol:105-117): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol
deleted file mode 100644
index 86e4c2f43fdb..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-==== Source: s0.sol ====
-type Int is int;
-
-==== Source: s1.sol ====
-import "s0.sol";
-using {add1 as +} for Int global;
-using {unsub1 as -} for Int global;
-
-function add1(Int, Int) pure returns (Int) {}
-function unsub1(Int) pure returns (Int) {}
-
-==== Source: s2.sol ====
-import "s0.sol";
-using {add2 as +} for Int global;
-using {unsub2 as -} for Int global;
-
-function add2(Int, Int) pure returns (Int) {}
-function unsub2(Int) pure returns (Int) {}
-
-==== Source: s3.sol ====
-import "s1.sol";
-import "s2.sol";
-contract C {
-    function f() public {
-        Int.wrap(0) + Int.wrap(0);
-        -Int.wrap(0);
-    }
-}
-// ----
-// TypeError 4117: (s1.sol:17-50): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (s1.sol:51-86): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (s2.sol:17-50): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (s2.sol:51-86): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 2271: (s3.sol:81-106): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 4907: (s3.sol:116-128): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol
deleted file mode 100644
index 7bd3fa146b18..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-==== Source: s0.sol ====
-type Int is int;
-
-==== Source: s1.sol ====
-import "s0.sol";
-using {add1 as +} for Int;
-using {unsub1 as -} for Int;
-
-function add1(Int, Int) pure returns (Int) {}
-function unsub1(Int) pure returns (Int) {}
-
-==== Source: s2.sol ====
-import "s0.sol";
-using {add2 as +} for Int;
-using {unsub2 as -} for Int;
-
-function add2(Int, Int) pure returns (Int) {}
-function unsub2(Int) pure returns (Int) {}
-
-==== Source: s3.sol ====
-import "s1.sol";
-import "s2.sol";
-contract C {
-    function f() public {
-        Int.wrap(0) + Int.wrap(0);
-        -Int.wrap(0);
-    }
-}
-// ----
-// TypeError 3320: (s1.sol:24-28): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (s1.sol:51-57): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (s2.sol:24-28): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (s2.sol:51-57): Operators can only be defined in a global 'using for' directive.
-// TypeError 2271: (s3.sol:81-106): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 4907: (s3.sol:116-128): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol
deleted file mode 100644
index f05655b65217..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type B4 is bytes4;
-using {bitor as |, bitnot as ~} for B4 global;
-
-function bitor(B4, B4) pure returns (B4) {}
-function bitnot(B4) pure returns (B4) {}
-
-B4 constant X = B4.wrap(0x12345678) | B4.wrap(0xaabbccdd);
-
-contract C {
-    B4 constant Y = B4.wrap(0x12345678) | B4.wrap(0xaabbccdd);
-}
-
-library L {
-    B4 constant Z = ~B4.wrap(0x12345678);
-}
-
-interface I {
-    B4 constant W = ~B4.wrap(0x12345678);
-}
-// ----
-// TypeError 8349: (169-210): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (246-287): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (324-344): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (383-403): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol
deleted file mode 100644
index 5af79ad475e5..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-type Int is int;
-using {add as +} for Int;
-using {unsub as -} for Int;
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-function f() pure {
-    Int.wrap(0) + Int.wrap(0);
-    -Int.wrap(0);
-}
-// ----
-// TypeError 3320: (24-27): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (50-55): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol
deleted file mode 100644
index 08e9e68d9ca7..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type Int is int16;
-
-using {add as +} for Int global;
-
-function add(Int, Int) returns (Int) {
-    B b = new B();
-    return b.f();
-}
-
-contract B {
-    Int s;
-    function f() external returns (Int) {
-        s = Int.wrap(3);
-        return s;
-    }
-}
-
-contract C {
-    function test() public returns (Int) {
-        return Int.wrap(0) + Int.wrap(0);
-    }
-}
-// ----
-// TypeError 7775: (27-30): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol
deleted file mode 100644
index 02c5d655f26b..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is int16;
-using {add as +, unsub as -} for Int global;
-
-IAdder constant ADDER = IAdder(address(0));
-
-function add(Int x, Int y) pure returns (Int) {
-    return ADDER.mul(x, y);
-}
-
-function unsub(Int x) pure returns (Int) {
-    return ADDER.inc(x);
-}
-
-interface IAdder {
-    function mul(Int, Int) external returns (Int);
-    function inc(Int) external returns (Int);
-}
-// ----
-// TypeError 8961: (169-184): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (243-255): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol
deleted file mode 100644
index 37a8add56cb8..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-type Int is int16;
-using {add as +, unsub as -} for Int global;
-
-IAdder constant ADDER = IAdder(address(0));
-
-function add(Int x, Int y) pure returns (Int) {
-    return ADDER.mul(x, y);
-}
-
-function unsub(Int x) pure returns (Int) {
-    return ADDER.inc(x);
-}
-
-interface IAdder {
-    function mul(Int, Int) external pure returns (Int);
-    function inc(Int) external pure returns (Int);
-}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol
deleted file mode 100644
index f45f7a30f0f3..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is int16;
-using {add as +, unsub as -} for Int global;
-
-IAdder constant ADDER = IAdder(address(0));
-
-function add(Int x, Int y) pure returns (Int) {
-    return ADDER.mul(x, y);
-}
-
-function unsub(Int x) pure returns (Int) {
-    return ADDER.inc(x);
-}
-
-interface IAdder {
-    function mul(Int, Int) external view returns (Int);
-    function inc(Int) external view returns (Int);
-}
-// ----
-// TypeError 2527: (169-184): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (243-255): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol
deleted file mode 100644
index afe4e46e8016..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-using {add as +, unsub as -} for U global;
-
-type U is uint;
-
-function add(U, U) pure returns (U) {}
-function unsub(U) pure returns (U) {}
-
-contract C {
-    function fromBool() public {
-        U u;
-
-        u + true;
-        true + u;
-        -true;
-    }
-
-    function fromUint() public {
-        U u;
-        uint32 u32;
-
-        u + u32;
-        u32 + u;
-        -u32;
-    }
-}
-// ----
-// TypeError 5653: (207-215): The type of the second operand of this user-defined binary operator + does not match the type of the first operand, which is U.
-// TypeError 2271: (225-233): Built-in binary operator + cannot be applied to types bool and U.
-// TypeError 4907: (243-248): Built-in unary operator - cannot be applied to type bool.
-// TypeError 5653: (332-339): The type of the second operand of this user-defined binary operator + does not match the type of the first operand, which is U.
-// TypeError 2271: (349-356): Built-in binary operator + cannot be applied to types uint32 and U.
-// TypeError 4907: (366-370): Built-in unary operator - cannot be applied to type uint32. Unary negation is only allowed for signed integers.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol
deleted file mode 100644
index 8bdcd510aa4a..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-using {f as +} for uint global;
-using {f as +} for uint[2] global;
-using {f as +} for mapping(uint => uint) global;
-using {f as +} for function (uint) pure returns (uint) global;
-using {f as +} for string global;
-
-function f(uint, uint) pure returns (uint) {}
-// ----
-// TypeError 8841: (0-31): Can only use "global" with user-defined types.
-// TypeError 5332: (7-8): Operators can only be implemented for user-defined value types.
-// TypeError 8841: (32-66): Can only use "global" with user-defined types.
-// TypeError 5332: (39-40): Operators can only be implemented for user-defined value types.
-// TypeError 8841: (67-115): Can only use "global" with user-defined types.
-// TypeError 5332: (74-75): Operators can only be implemented for user-defined value types.
-// TypeError 8841: (116-178): Can only use "global" with user-defined types.
-// TypeError 5332: (123-124): Operators can only be implemented for user-defined value types.
-// TypeError 8841: (179-212): Can only use "global" with user-defined types.
-// TypeError 5332: (186-187): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol
deleted file mode 100644
index 55418f579ebd..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-using {fc as +} for C global;
-using {fa as +} for A global;
-
-function fc(C, C) pure returns (C) {}
-function fa(A, A) pure returns (A) {}
-
-contract C {}
-abstract contract A {}
-// ----
-// TypeError 8841: (0-29): Can only use "global" with user-defined types.
-// TypeError 5332: (7-9): Operators can only be implemented for user-defined value types.
-// TypeError 8841: (30-59): Can only use "global" with user-defined types.
-// TypeError 5332: (37-39): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol
deleted file mode 100644
index dce1009948de..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-using {add as +} for E global;
-
-enum E {
-    E1,
-    E2
-}
-
-function add(E, E) pure returns (E) {}
-// ----
-// TypeError 5332: (7-10): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol
deleted file mode 100644
index 0dcab966d582..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-using {add as +} for E global;
-
-error E();
-
-function add(E, E) pure returns (E) {
-    return E.E1;
-}
-
-// ----
-// TypeError 5172: (21-22): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol
deleted file mode 100644
index 5dd5fbce9284..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-using {add as +} for C.Event global;
-
-contract C {
-    event Event();
-}
-
-function add(C.Event, C.Event) pure returns (C.Event) {}
-
-// ----
-// TypeError 5172: (21-28): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol
deleted file mode 100644
index 9db33819c2f1..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-using {f as +} for I global;
-
-function f(I, I) pure returns (I) {}
-
-interface I {}
-// ----
-// TypeError 8841: (0-28): Can only use "global" with user-defined types.
-// TypeError 5332: (7-8): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol
deleted file mode 100644
index 210cb30096cd..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-using {f as +} for L global;
-
-function f() pure {}
-library L {}
-// ----
-// TypeError 1130: (19-20): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol
deleted file mode 100644
index 0244f731c93b..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-using {add as +} for S global;
-
-struct S {
-    uint x;
-}
-
-function add(S memory, S memory) pure returns (S memory) {}
-// ----
-// TypeError 5332: (7-10): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol
deleted file mode 100644
index 1e3c9e7756e8..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-type Int is int;
-
-function add(Int, Int) pure returns (Int) {}
-
-contract C {
-    using {add as +} for *;
-}
-
-contract D {
-    using {add as +} for * global;
-}
-// ----
-// SyntaxError 3349: (81-104): The type has to be specified explicitly when attaching specific functions.
-// SyntaxError 3349: (125-155): The type has to be specified explicitly when attaching specific functions.
-// SyntaxError 2854: (125-155): Can only globally attach functions to specific types.
-// SyntaxError 3367: (125-155): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol
deleted file mode 100644
index 25325f75624e..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-using {add as +} for * global;
-
-function add(int, int) returns (int) {}
-// ----
-// SyntaxError 8118: (0-30): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-30): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol
deleted file mode 100644
index a04e81c31d98..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type Int is uint;
-using {f} for Int;
-
-Int constant v;
-using {v.f as +} for Int global;
-
-function f(Int) pure returns (Int) {}
-// ----
-// DeclarationError 9589: (61-64): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol
deleted file mode 100644
index 00889bc0932f..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-type Int is int16;
-
-using {abi.encode as +} for Int global;
-
-function f(Int, Int) pure returns (Int) {}
-
-// ----
-// DeclarationError 9589: (27-37): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol
deleted file mode 100644
index ee088624cd56..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-type Int is int16;
-
-using {keccak256 as +} for Int global;
-// ----
-// TypeError 8187: (27-36): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol
deleted file mode 100644
index daf4cab6ba24..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-type Int is int16;
-
-using {revert as +} for Int global;
-// ----
-// DeclarationError 9589: (27-33): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol
deleted file mode 100644
index 309ea9558422..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type Int is int;
-
-contract C {
-    using {add as +} for Int;
-
-    function add(Int, Int) public pure returns (Int) {}
-}
-// ----
-// TypeError 4167: (42-45): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol
deleted file mode 100644
index 969dd8094c06..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type Int is int;
-
-using {C.add as +} for Int global;
-
-contract C {
-    function add(Int, Int) public pure returns (Int) {
-        return 0;
-    }
-}
-// ----
-// TypeError 4167: (25-30): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol
deleted file mode 100644
index 1bec8b44dfdb..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-type Int is int16;
-
-using {IntError as +} for Int global;
-
-error IntError(Int a, Int b);
-// ----
-// TypeError 8187: (27-35): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol
deleted file mode 100644
index 3a7b6423a583..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type Int is int16;
-
-using {C.IntEvent as +} for Int global;
-
-contract C {
-    event IntEvent(Int a, Int b);
-}
-// ----
-// TypeError 8187: (27-37): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol
deleted file mode 100644
index 834fe2d7d1c9..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-type Int is int8;
-
-contract C {
-    function(Int, Int) external pure returns (Int) ptr;
-    using {ptr as +} for Int;
-}
-// ----
-// TypeError 8187: (99-102): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol
deleted file mode 100644
index 52f4e362da8d..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type Int is int16;
-
-using {keccak256 as +} for Int global;
-
-function keccak256(Int, Int) pure returns (Int) {
-    return Int.wrap(0);
-}
-// ----
-// Warning 2319: (60-135): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol
deleted file mode 100644
index a6460da133bc..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-type Int is int16;
-
-using {L as +} for Int global;
-
-library L {}
-// ----
-// TypeError 8187: (27-28): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol
deleted file mode 100644
index 889fc0eb27c6..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol
+++ /dev/null
@@ -1,113 +0,0 @@
-==== Source: external.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) external pure returns (Int) {}
-    function unaryOperator(Int) external pure returns (Int) {}
-
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-contract C {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-library X {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-==== Source: internal.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) internal pure returns (Int) {}
-    function unaryOperator(Int) internal pure returns (Int) {}
-
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-contract C {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-library X {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-==== Source: private.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) private pure returns (Int) {}
-    function unaryOperator(Int) private pure returns (Int) {}
-
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-==== Source: public.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) public pure returns (Int) {}
-    function unaryOperator(Int) public pure returns (Int) {}
-
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-contract C {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-library X {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-// ----
-// TypeError 3320: (external.sol:177-193): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (external.sol:177-193): Only pure free functions can be used to define operators.
-// TypeError 3320: (external.sol:220-235): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (external.sol:220-235): Only pure free functions can be used to define operators.
-// TypeError 3320: (external.sol:278-294): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (external.sol:278-294): Only pure free functions can be used to define operators.
-// TypeError 3320: (external.sol:321-336): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (external.sol:321-336): Only pure free functions can be used to define operators.
-// TypeError 3320: (external.sol:378-394): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (external.sol:378-394): Only pure free functions can be used to define operators.
-// TypeError 3320: (external.sol:421-436): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (external.sol:421-436): Only pure free functions can be used to define operators.
-// TypeError 3320: (internal.sol:177-193): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (internal.sol:177-193): Only pure free functions can be used to define operators.
-// TypeError 3320: (internal.sol:220-235): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (internal.sol:220-235): Only pure free functions can be used to define operators.
-// TypeError 3320: (internal.sol:278-294): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (internal.sol:278-294): Only pure free functions can be used to define operators.
-// TypeError 3320: (internal.sol:321-336): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (internal.sol:321-336): Only pure free functions can be used to define operators.
-// TypeError 3320: (internal.sol:378-394): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (internal.sol:378-394): Only pure free functions can be used to define operators.
-// TypeError 3320: (internal.sol:421-436): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (internal.sol:421-436): Only pure free functions can be used to define operators.
-// TypeError 3320: (private.sol:175-191): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (private.sol:175-191): Only pure free functions can be used to define operators.
-// TypeError 3320: (private.sol:218-233): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (private.sol:218-233): Only pure free functions can be used to define operators.
-// TypeError 3320: (public.sol:173-189): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (public.sol:173-189): Only pure free functions can be used to define operators.
-// TypeError 3320: (public.sol:216-231): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (public.sol:216-231): Only pure free functions can be used to define operators.
-// TypeError 3320: (public.sol:274-290): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (public.sol:274-290): Only pure free functions can be used to define operators.
-// TypeError 3320: (public.sol:317-332): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (public.sol:317-332): Only pure free functions can be used to define operators.
-// TypeError 3320: (public.sol:374-390): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (public.sol:374-390): Only pure free functions can be used to define operators.
-// TypeError 3320: (public.sol:417-432): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (public.sol:417-432): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol
deleted file mode 100644
index 1e3c13aec2f2..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-==== Source: external.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) external pure returns (Int) {}
-    function unaryOperator(Int) external pure returns (Int) {}
-}
-
-using {L.binaryOperator as +} for Int global;
-using {L.unaryOperator as -} for Int global;
-
-==== Source: internal.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) internal pure returns (Int) {}
-    function unaryOperator(Int) internal pure returns (Int) {}
-}
-
-using {L.binaryOperator as +} for Int global;
-using {L.unaryOperator as -} for Int global;
-
-==== Source: public.sol ====
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) public pure returns (Int) {}
-    function unaryOperator(Int) public pure returns (Int) {}
-}
-
-using {L.binaryOperator as +} for Int global;
-using {L.unaryOperator as -} for Int global;
-// ----
-// TypeError 7775: (external.sol:175-191): Only pure free functions can be used to define operators.
-// TypeError 7775: (external.sol:221-236): Only pure free functions can be used to define operators.
-// TypeError 7775: (internal.sol:175-191): Only pure free functions can be used to define operators.
-// TypeError 7775: (internal.sol:221-236): Only pure free functions can be used to define operators.
-// TypeError 7775: (public.sol:171-187): Only pure free functions can be used to define operators.
-// TypeError 7775: (public.sol:217-232): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol
deleted file mode 100644
index 077330baf645..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-type Int is int128;
-
-library L {
-    function binaryOperator(Int, Int) private pure returns (Int) {}
-    function unaryOperator(Int) private pure returns (Int) {}
-}
-
-using {L.binaryOperator as +} for Int global;
-using {L.unaryOperator as -} for Int global;
-
-contract C {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-
-library X {
-    using {L.binaryOperator as *} for Int;
-    using {L.unaryOperator as ~} for Int;
-}
-// ----
-// TypeError 6772: (173-189): Function "L.binaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 7775: (173-189): Only pure free functions can be used to define operators.
-// TypeError 6772: (219-234): Function "L.unaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 7775: (219-234): Only pure free functions can be used to define operators.
-// TypeError 6772: (282-298): Function "L.binaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 3320: (282-298): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (282-298): Only pure free functions can be used to define operators.
-// TypeError 6772: (325-340): Function "L.unaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 3320: (325-340): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (325-340): Only pure free functions can be used to define operators.
-// TypeError 6772: (382-398): Function "L.binaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 3320: (382-398): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (382-398): Only pure free functions can be used to define operators.
-// TypeError 6772: (425-440): Function "L.unaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 3320: (425-440): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (425-440): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol
deleted file mode 100644
index e009fa03d949..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-using {add as +, sub as -, mul as *} for A global;
-
-function add(A, A) view returns (A) {}
-function sub(A, A) returns (A) {}
-function mul(A, A) payable returns (A) {}
-
-type A is address payable;
-// ----
-// TypeError 7775: (7-10): Only pure free functions can be used to define operators.
-// TypeError 7775: (17-20): Only pure free functions can be used to define operators.
-// TypeError 7775: (27-30): Only pure free functions can be used to define operators.
-// TypeError 9559: (125-166): Free functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol
deleted file mode 100644
index 15581a1c19c4..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// This should point out all 3 errors, rather than give up after the first one.
-using {add as +} for address;
-
-function add(address, address) view returns (address) {}
-// ----
-// TypeError 3320: (87-90): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (87-90): Only pure free functions can be used to define operators.
-// TypeError 5332: (87-90): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol
deleted file mode 100644
index ccddd3fa7c13..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-using {add as +} for A global;
-using {add as +} for AP global;
-
-function add(A, A) pure returns (A) {}
-function add(AP, AP) pure returns (AP) {}
-
-type A is address;
-type AP is address payable;
-// ----
-// DeclarationError 9589: (7-10): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol
deleted file mode 100644
index d41db77db65c..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-using {L.add as +} for A global;
-using {L.add as +} for AP global;
-
-library L {
-    function add(A, A) private pure returns (A) {}
-    function add(AP, AP) internal pure returns (AP) {}
-}
-
-type A is address;
-type AP is address payable;
-// ----
-// DeclarationError 9589: (7-12): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol
deleted file mode 100644
index 80793f68dc18..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type B32 is bytes32;
-
-library L {
-    function publicOperator(B32, B32) public pure returns (B32) {}
-}
-
-using {publicOperator as +} for B32 global;
-// ----
-// DeclarationError 9589: (111-125): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol
deleted file mode 100644
index 565aa6dc9afc..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-type B32 is bytes32;
-
-library L {
-    using {externalOperator as +} for B32;
-    using {publicOperator as -} for B32;
-    using {internalOperator as *} for B32;
-    using {privateOperator as /} for B32;
-
-    function externalOperator(B32, B32) external pure returns (B32) {}
-    function publicOperator(B32, B32) public pure returns (B32) {}
-    function internalOperator(B32, B32) internal pure returns (B32) {}
-    function privateOperator(B32, B32) private pure returns (B32) {}
-}
-// ----
-// TypeError 3320: (45-61): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (45-61): Only pure free functions can be used to define operators.
-// TypeError 3320: (88-102): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (88-102): Only pure free functions can be used to define operators.
-// TypeError 3320: (129-145): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (129-145): Only pure free functions can be used to define operators.
-// TypeError 3320: (172-187): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (172-187): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol
deleted file mode 100644
index 94769ee17f79..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-==== Source: Int.sol ====
-type Int is int;
-
-using {add as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-
-==== Source: test.sol ====
-import "Int.sol";
-
-using {anotherAdd as +} for Int;
-
-function anotherAdd(Int, Int) pure returns (Int) {}
-
-function test() pure returns (Int) {
-    return Int.wrap(0) + Int.wrap(0);
-}
-// ----
-// TypeError 3320: (test.sol:26-36): Operators can only be defined in a global 'using for' directive.
-// TypeError 4705: (test.sol:26-36): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol
deleted file mode 100644
index 0b30e06ba8ea..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-type Int is int;
-
-using {add as +} for Int global;
-using {add2 as +} for Int;
-using {unsub as -} for Int global;
-using {unsub2 as -} for Int;
-
-function add(Int, Int) pure returns (Int) {}
-function add2(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-function unsub2(Int) pure returns (Int) {}
-
-function testBinary() pure returns (Int) {
-    return Int.wrap(1) + Int.wrap(2);
-}
-
-function testUnary() pure returns (Int) {
-    return -Int.wrap(2);
-}
-// ----
-// TypeError 4705: (25-28): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
-// TypeError 3320: (58-62): Operators can only be defined in a global 'using for' directive.
-// TypeError 4705: (58-62): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
-// TypeError 4705: (85-90): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
-// TypeError 3320: (120-126): Operators can only be defined in a global 'using for' directive.
-// TypeError 4705: (120-126): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol
deleted file mode 100644
index 2d6e47a8fbc1..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-==== Source: Int.sol ====
-type Int is int;
-
-using {add as +} for Int;
-
-function add(Int, Int) pure returns (Int) {}
-
-==== Source: test.sol ====
-import "Int.sol";
-
-using {anotherAdd as +} for Int global;
-
-function anotherAdd(Int, Int) pure returns (Int) {}
-
-function test() pure returns (Int) {
-    return Int.wrap(0) + Int.wrap(0);
-}
-// ----
-// TypeError 3320: (Int.sol:25-28): Operators can only be defined in a global 'using for' directive.
-// TypeError 4117: (test.sol:19-58): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol
deleted file mode 100644
index 4972deef1f3c..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-type Int is uint128;
-
-using {add as +, sub as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-function sub(Int, Int) pure returns (Int) {}
-
-function test() {
-    Int.wrap(0) + Int.wrap(1);
-}
-// ----
-// TypeError 4705: (29-32): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
-// TypeError 4705: (39-42): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol
deleted file mode 100644
index ec4274c7b84a..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-type Int is uint128;
-
-// Still an error, even if the operator is not actually used
-using {add1 as +, add2 as +} for Int global;
-using {unsub1 as -, unsub2 as -} for Int global;
-
-function add1(Int, Int) pure returns (Int) {}
-function add2(Int, Int) pure returns (Int) {}
-function unsub1(Int) pure returns (Int) {}
-function unsub2(Int) pure returns (Int) {}
-// ----
-// TypeError 4705: (90-94): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
-// TypeError 4705: (101-105): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
-// TypeError 4705: (135-141): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
-// TypeError 4705: (148-154): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol
deleted file mode 100644
index bb517ca7bf67..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-type Int is int;
-
-using {add as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-function another_add(Int, Int) pure returns (Int) {}
-
-contract B {
-    using {another_add as +} for Int;
-
-    function f() public {
-        Int.wrap(0) + Int.wrap(0);
-    }
-}
-
-contract C is B {
-    function g() public {
-        Int.wrap(0) + Int.wrap(0);
-    }
-}
-// ----
-// TypeError 3320: (175-186): Operators can only be defined in a global 'using for' directive.
-// TypeError 4705: (175-186): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol
deleted file mode 100644
index 4cd956ba3058..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-type Int is int;
-
-function add(Int, Int) pure returns (Int) {}
-function unsub(Int) pure returns (Int) {}
-
-using {add as +, unsub as -} for Int global;
-
-contract C {
-    using {add as +, unsub as -} for Int;
-}
-
-library X {
-    using {add as +, unsub as -} for Int;
-}
-// ----
-// TypeError 3320: (176-179): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (186-191): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (233-236): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (243-248): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol
deleted file mode 100644
index 9fd4c73312fb..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-type Int is int;
-
-library L {
-    using {add as +, unsub as -} for Int;
-    using {L.add as +, L.unsub as -} for Int;
-
-    function add(Int, Int) internal pure returns (Int) {}
-    function unsub(Int) internal pure returns (Int) {}
-}
-
-using {L.add as +, L.unsub as -} for Int global;
-
-contract C {
-    using {L.add as +, L.unsub as -} for Int;
-}
-
-library X {
-    using {L.add as +, L.unsub as -} for Int;
-}
-// ----
-// TypeError 3320: (41-44): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (41-44): Only pure free functions can be used to define operators.
-// TypeError 3320: (51-56): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (51-56): Only pure free functions can be used to define operators.
-// TypeError 3320: (83-88): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (83-88): Only pure free functions can be used to define operators.
-// TypeError 3320: (95-102): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (95-102): Only pure free functions can be used to define operators.
-// TypeError 7775: (242-247): Only pure free functions can be used to define operators.
-// TypeError 7775: (254-261): Only pure free functions can be used to define operators.
-// TypeError 3320: (309-314): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (309-314): Only pure free functions can be used to define operators.
-// TypeError 3320: (321-328): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (321-328): Only pure free functions can be used to define operators.
-// TypeError 3320: (370-375): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (370-375): Only pure free functions can be used to define operators.
-// TypeError 3320: (382-389): Operators can only be defined in a global 'using for' directive.
-// TypeError 7775: (382-389): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol
deleted file mode 100644
index 9bb4d62362f3..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type Int is int32;
-
-using {add as +, add as +} for Int global;
-
-function add(Int, Int) pure returns(Int) {}
-
-function f(int32 a, int32 b) pure {
-    Int.wrap(a) + Int.wrap(b);
-}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol
deleted file mode 100644
index d2a648e78db9..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-type Int is int32;
-
-using {add as +} for Int global;
-using {add as +} for Int global;
-
-function add(Int, Int) pure returns(Int) {}
-
-function f(int32 a, int32 b) pure {
-    Int.wrap(a) + Int.wrap(b);
-}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol
deleted file mode 100644
index e7b0a76428ed..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-type Int is uint128;
-
-using {add as +, add128 as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-function add128(Int, int128) pure returns (Int) {}
-
-function test() {
-    Int.wrap(0) + Int.wrap(1);
-}
-// ----
-// TypeError 4705: (29-32): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
-// TypeError 1884: (129-142): Wrong parameters in operator definition. The function "add128" needs to have two parameters of type Int and the same data location to be used for the operator +.
-// TypeError 4705: (39-45): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol
deleted file mode 100644
index 5911fc6535fc..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-using {as -} for uint global;
-// ----
-// ParserError 2314: (7-9): Expected identifier but got 'as'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol
deleted file mode 100644
index 1a1be262a007..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-using f as - for uint global;
-// ----
-// ParserError 2314: (8-10): Expected 'for' but got 'as'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol
deleted file mode 100644
index ed4fb13a48d3..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-using {
-    f as new,
-    f as delete,
-    f as **,
-    f as <<,
-    f as >>,
-    f as &&,
-    f as ||,
-    f as !,
-    f as =,
-    f as |=,
-    f as ^=,
-    f as &=,
-    f as <<=,
-    f as >>=,
-    f as +=,
-    f as -=,
-    f as *=,
-    f as /=,
-    f as %=,
-    f as ++,
-    f as --
-} for int256 global;
-// ----
-// ParserError 4403: (17-20): Not a user-definable operator: new. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (31-37): Not a user-definable operator: delete. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (48-50): Not a user-definable operator: **. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (61-63): Not a user-definable operator: <<. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (74-76): Not a user-definable operator: >>. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (87-89): Not a user-definable operator: &&. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (100-102): Not a user-definable operator: ||. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (113-114): Not a user-definable operator: !. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (125-126): Not a user-definable operator: =. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (137-139): Not a user-definable operator: |=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (150-152): Not a user-definable operator: ^=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (163-165): Not a user-definable operator: &=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (176-179): Not a user-definable operator: <<=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (190-193): Not a user-definable operator: >>=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (204-206): Not a user-definable operator: +=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (217-219): Not a user-definable operator: -=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (230-232): Not a user-definable operator: *=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (243-245): Not a user-definable operator: /=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (256-258): Not a user-definable operator: %=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (269-271): Not a user-definable operator: ++. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (282-284): Not a user-definable operator: --. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol
deleted file mode 100644
index 7fa8c5eeb141..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-using {
-    f as x,
-    f as operator,
-    f as as,
-    f as 123,
-    f as ()
-} for int256 global;
-// ----
-// ParserError 4403: (17-18): Not a user-definable operator: x. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (29-37): Not a user-definable operator: operator. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (48-50): Not a user-definable operator: as. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (61-64): Not a user-definable operator: 123. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (75-76): Not a user-definable operator: (. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 2314: (76-77): Expected '}' but got ')'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol
deleted file mode 100644
index 8435de6d9399..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-using {f as ''} for uint;
-using {f as ""} for int;
-using {f as hex""} for address;
-// ----
-// ParserError 4403: (12-14): Not a user-definable operator: . Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (38-40): Not a user-definable operator: . Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 4403: (63-68): Not a user-definable operator: . Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol
deleted file mode 100644
index a6970a9b82aa..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-using {f as} for uint global;
-// ----
-// ParserError 4403: (11-12): Not a user-definable operator: }. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
-// ParserError 2314: (13-16): Expected '}' but got 'for'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol
deleted file mode 100644
index 5266931894a4..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-using {f as as} for uint global;
-// ----
-// ParserError 4403: (12-14): Not a user-definable operator: as. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol
deleted file mode 100644
index 676f2c475ba4..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-type Int is int256;
-
-using {
-    add as +,
-    div as /,
-    unsub as -,
-    bitnot as ~,
-    gt as >,
-    lt as <
-} for Int global;
-
-function add(Int x, Int y) pure returns (int256) {}
-function div(Int x, Int y) pure {}
-function unsub(Int) pure returns (Int, Int) {}
-function bitnot(Int) pure returns (int256) {}
-function gt(Int, Int) pure returns (Int) {}
-function lt(Int, Int) pure returns (bool, Int) {}
-
-function f() pure {
-    Int.wrap(0) + Int.wrap(1);
-    Int.wrap(0) / Int.wrap(0);
-    -Int.wrap(0);
-    ~Int.wrap(0);
-    Int.wrap(0) < Int.wrap(0);
-    Int.wrap(0) > Int.wrap(0);
-}
-// ----
-// TypeError 7743: (174-182): Wrong return parameters in operator definition. The function "add" needs to return exactly one value of type Int to be used for the operator +.
-// TypeError 7743: (218-218): Wrong return parameters in operator definition. The function "div" needs to return exactly one value of type Int to be used for the operator /.
-// TypeError 7743: (254-264): Wrong return parameters in operator definition. The function "unsub" needs to return exactly one value of type Int to be used for the operator -.
-// TypeError 7743: (302-310): Wrong return parameters in operator definition. The function "bitnot" needs to return exactly one value of type Int to be used for the operator ~.
-// TypeError 7743: (349-354): Wrong return parameters in operator definition. The function "gt" needs to return exactly one value of type bool to be used for the operator >.
-// TypeError 7743: (393-404): Wrong return parameters in operator definition. The function "lt" needs to return exactly one value of type bool to be used for the operator <.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol
deleted file mode 100644
index 1d034c8ec3af..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-type Int is int256;
-
-using {
-    add as +,
-    sub as -,
-    div as /
-} for Int global;
-
-function add(Int) pure returns (Int) {}
-function sub(Int, Int, Int) pure returns (Int) {}
-function div(int256, int256) pure returns (Int) {}
-
-function f() pure {
-    Int.wrap(0) + Int.wrap(1);
-    Int.wrap(0) - Int.wrap(0);
-    Int.wrap(0) / Int.wrap(0);
-}
-
-// ----
-// TypeError 1884: (101-106): Wrong parameters in operator definition. The function "add" needs to have two parameters of type Int and the same data location to be used for the operator +.
-// TypeError 1884: (141-156): Wrong parameters in operator definition. The function "sub" needs to have one or two parameters of type Int and the same data location to be used for the operator -.
-// TypeError 1884: (191-207): Wrong parameters in operator definition. The function "div" needs to have one or two parameters of type Int and the same data location to be used for the operator /.
-// TypeError 7743: (221-226): Wrong return parameters in operator definition. The function "div" needs to return a value of the same type and data location as its parameters to be used for the operator /.
-// TypeError 2271: (255-280): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 2271: (286-311): Built-in binary operator - cannot be applied to types Int and Int. No matching user-defined operator found.
-// TypeError 2271: (317-342): Built-in binary operator / cannot be applied to types Int and Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol
deleted file mode 100644
index ffd35cc1daed..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type Int is int;
-
-using {
-    f as +
-} for Int global;
-
-function f() returns (Int) {
-    return Int.wrap(0);
-}
-// ----
-// TypeError 4731: (30-31): The function "f" does not have any parameters, and therefore cannot be attached to the type "Int".
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol
deleted file mode 100644
index 323b564494cd..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-type Int is int;
-
-using {
-    f as ~
-} for Int global;
-
-function f() returns (Int) {
-    return Int.wrap(0);
-}
-// ----
-// TypeError 4731: (30-31): The function "f" does not have any parameters, and therefore cannot be attached to the type "Int".
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol
deleted file mode 100644
index c254ad04a1d3..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is int128;
-
-using {
-    add as +,
-    sub as -,
-    mul as *,
-    div as /
-} for Int global;
-
-function add(Int, int128) pure returns (Int) {}
-function sub(int128, Int) pure returns (int128) {}
-function mul(int128, int256) pure returns (Int) {}
-function div(Int, Int) pure returns (int256) {}
-// ----
-// TypeError 1884: (115-128): Wrong parameters in operator definition. The function "add" needs to have two parameters of type Int and the same data location to be used for the operator +.
-// TypeError 1884: (163-176): Wrong parameters in operator definition. The function "sub" needs to have one or two parameters of type Int and the same data location to be used for the operator -.
-// TypeError 7743: (190-198): Wrong return parameters in operator definition. The function "sub" needs to return exactly one value of type Int to be used for the operator -.
-// TypeError 1884: (214-230): Wrong parameters in operator definition. The function "mul" needs to have two parameters of type Int and the same data location to be used for the operator *.
-// TypeError 7743: (244-249): Wrong return parameters in operator definition. The function "mul" needs to return a value of the same type and data location as its parameters to be used for the operator *.
-// TypeError 7743: (289-297): Wrong return parameters in operator definition. The function "div" needs to return exactly one value of type Int to be used for the operator /.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol
deleted file mode 100644
index 81d4546239e1..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-type Int is int128;
-
-using {bitnot as ~} for Int global;
-
-function bitnot(Int, Int) pure returns (Int) {}
-
-contract C {
-    function test() public pure {
-        ~Int.wrap(1);
-    }
-}
-// ----
-// TypeError 1884: (73-83): Wrong parameters in operator definition. The function "bitnot" needs to have exactly one parameter of type Int to be used for the operator ~.
-// TypeError 4907: (162-174): Built-in unary operator ~ cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol
deleted file mode 100644
index 612c377e9de7..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-type AP is address payable;
-
-function sub(AP, AP) pure returns (AP) {}
-function unsub(AP) pure returns (AP) {}
-
-function attachedPure(AP, uint, address) pure {}
-function attachedView(AP) view {}
-function attached(AP, function(AP)) {}
-
-using {sub as -, attachedPure, attachedView, unsub as -, attached} for AP global;
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol
deleted file mode 100644
index 9b7f80054f15..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    type FixedBytes is bytes10;
-}
-
-function add(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
-function unsub(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
-
-library LX {
-    using {add as +, unsub as -} for L.FixedBytes;
-}
-
-contract CX {
-    using {add as +, unsub as -} for L.FixedBytes;
-}
-// ----
-// TypeError 3320: (218-221): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (228-233): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (286-289): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (296-301): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol
deleted file mode 100644
index c99fd0e684c1..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-type Int is int16;
-
-function add(Int, Int) pure returns (Int) {}
-
-contract C {
-    using {add as +} for Int global;
-
-    function test() pure public {
-        Int.wrap(0) + Int.wrap(0);
-    }
-}
-// ----
-// SyntaxError 3367: (83-115): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol
deleted file mode 100644
index d4f9d9ac1039..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: s1.sol ====
-type Int is int;
-
-==== Source: s2.sol ====
-import "s1.sol";
-
-function bitnot(Int) pure returns (Int) {}
-
-contract C {
-    using {bitnot as ~} for Int global;
-}
-// ----
-// SyntaxError 3367: (s2.sol:79-114): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol
deleted file mode 100644
index 17351599f9df..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-type Int is int128;
-
-function add(Int, Int) pure returns (Int) {}
-function another_add(Int, Int) pure returns (Int) {}
-
-contract B {
-    using {add as +} for Int;
-
-    function f() pure public returns (Int) {
-        return Int.wrap(0) + Int.wrap(0);
-    }
-}
-
-contract C is B {
-    using {another_add as +} for Int;
-
-    function g() pure public returns (Int) {
-        return Int.wrap(0) + Int.wrap(0);
-    }
-}
-
-contract D is B {
-    function h() pure public returns (Int) {
-        return Int.wrap(0) + Int.wrap(0);
-    }
-}
-// ----
-// TypeError 3320: (144-147): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (289-300): Operators can only be defined in a global 'using for' directive.
-// TypeError 2271: (491-516): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol
deleted file mode 100644
index 46dbee9708d6..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-type Int is int;
-
-function add(Int, Int) pure returns (Int) {}
-
-interface I {
-    using {add as +} for Int;
-}
-// ----
-// SyntaxError 9088: (82-107): The "using for" directive is not allowed inside interfaces.
-// TypeError 3320: (89-92): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol
deleted file mode 100644
index 6efae72fe8d0..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-library L {
-    type FixedBytes is bytes1;
-}
-
-contract C {
-    type FixedBytes is bytes2;
-}
-
-interface I {
-    type FixedBytes is bytes3;
-}
-
-function addL(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
-function addC(C.FixedBytes, C.FixedBytes) pure returns (C.FixedBytes) {}
-function addI(I.FixedBytes, I.FixedBytes) pure returns (I.FixedBytes) {}
-
-function unsubL(L.FixedBytes) pure returns (L.FixedBytes) {}
-function unsubC(C.FixedBytes) pure returns (C.FixedBytes) {}
-function unsubI(I.FixedBytes) pure returns (I.FixedBytes) {}
-
-using {addL as +, unsubL as -} for L.FixedBytes global;
-using {addC as +, unsubC as -} for C.FixedBytes global;
-using {addI as +, unsubI as -} for I.FixedBytes global;
-// ----
-// TypeError 4117: (545-600): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (601-656): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (657-712): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol
deleted file mode 100644
index fa0e467ebae6..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-library L {
-    type FixedBytes is bytes1;
-}
-
-contract C {
-    type FixedBytes is bytes2;
-}
-
-interface I {
-    type FixedBytes is bytes3;
-}
-
-function addL(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
-function addC(C.FixedBytes, C.FixedBytes) pure returns (C.FixedBytes) {}
-function addI(I.FixedBytes, I.FixedBytes) pure returns (I.FixedBytes) {}
-
-function unsubL(L.FixedBytes) pure returns (L.FixedBytes) {}
-function unsubC(C.FixedBytes) pure returns (C.FixedBytes) {}
-function unsubI(I.FixedBytes) pure returns (I.FixedBytes) {}
-
-using {addL as +, unsubL as -} for L.FixedBytes;
-using {addC as +, unsubC as -} for C.FixedBytes;
-using {addI as +, unsubI as -} for I.FixedBytes;
-// ----
-// TypeError 3320: (552-556): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (563-569): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (601-605): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (612-618): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (650-654): Operators can only be defined in a global 'using for' directive.
-// TypeError 3320: (661-667): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol
deleted file mode 100644
index b04934d96cb9..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-==== Source: s1.sol ====
-type Int is int;
-
-using {add as +} for Int global;
-using {add as +} for Int;
-
-function add(Int a, Int b) pure returns (Int) {}
-function test_add() pure returns (Int) {}
-
-==== Source: s2.sol ====
-import "s1.sol";
-
-contract C2 {
-    function test1() pure public returns (Int) {
-        return test_add();
-    }
-
-    function test2() pure public returns (Int) {
-        return Int.wrap(3) + Int.wrap(4);
-    }
-}
-// ----
-// TypeError 3320: (s1.sol:58-61): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol
deleted file mode 100644
index 7eda376e369c..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: s1.sol ====
-type Int is int;
-
-==== Source: s2.sol ====
-import "s1.sol";
-
-function bitnot(Int) pure returns (Int) {}
-
-using {bitnot as ~} for Int global;
-// ----
-// TypeError 4117: (s2.sol:62-97): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol
deleted file mode 100644
index 68f61988673f..000000000000
--- a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is int16;
-
-using {unsub as -} for Int global;
-using {sub as -} for Int;
-
-function sub(Int a, Int b) pure returns (Int) {}
-
-function unsub(Int a) pure returns (Int) {}
-
-contract C {
-    function test_sub() public pure returns (Int) {
-        return Int.wrap(7) - Int.wrap(2);
-    }
-
-    function test_unsub() public pure returns (Int) {
-        return -Int.wrap(4);
-    }
-}
-// ----
-// TypeError 3320: (62-65): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol b/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol
deleted file mode 100644
index 6426da1e50e5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    address constant payable b = address(0);
-}
-// ----
-// ParserError 2314: (34-41): Expected identifier but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/address_function_arguments_and_returns.sol b/test/libsolidity/syntaxTests/parsing/address_function_arguments_and_returns.sol
deleted file mode 100644
index 6dae9d33b15c..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_function_arguments_and_returns.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(address) public pure returns (address) {}
-    function g(address payable) public pure returns (address payable) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_in_struct.sol b/test/libsolidity/syntaxTests/parsing/address_in_struct.sol
deleted file mode 100644
index 3766f401fbfd..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_in_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    struct S {
-        address payable a;
-        address b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol b/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
deleted file mode 100644
index 2aa4dd344d99..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-contract C {
-    address view m_a;
-    address pure m_b;
-    address view[] m_c;
-    mapping(uint => address view) m_d;
-    function f() public pure {
-        address view a;
-        address pure b;
-        a; b;
-    }
-    function g(address view) public pure {}
-    function h(address pure) public pure {}
-    function i() public pure returns (address view) {}
-    function j() public pure returns (address pure) {}
-    modifier m1(address view) {_;}
-    modifier m2(address pure) {_;}
-    event e1(address view);
-    event e2(address pure);
-    error err1(address view);
-    error err2(address pure);
-    function f2() public pure returns (address) {
-        try this.f2() returns (address view res) {} catch {}
-    }
-    function f3() public pure returns (address) {
-        try this.f3() returns (address pure res) {} catch {}
-    }
-}
-address view constant f_a;
-address pure constant f_b;
-// ----
-// TypeError 2311: (17-29): Address types can only be payable or non-payable.
-// TypeError 2311: (39-51): Address types can only be payable or non-payable.
-// TypeError 2311: (61-73): Address types can only be payable or non-payable.
-// TypeError 2311: (101-113): Address types can only be payable or non-payable.
-// TypeError 2311: (159-171): Address types can only be payable or non-payable.
-// TypeError 2311: (183-195): Address types can only be payable or non-payable.
-// TypeError 2311: (234-246): Address types can only be payable or non-payable.
-// TypeError 2311: (278-290): Address types can only be payable or non-payable.
-// TypeError 2311: (345-357): Address types can only be payable or non-payable.
-// TypeError 2311: (400-412): Address types can only be payable or non-payable.
-// TypeError 2311: (433-445): Address types can only be payable or non-payable.
-// TypeError 2311: (468-480): Address types can only be payable or non-payable.
-// TypeError 2311: (500-512): Address types can only be payable or non-payable.
-// TypeError 2311: (528-540): Address types can only be payable or non-payable.
-// TypeError 2311: (558-570): Address types can only be payable or non-payable.
-// TypeError 2311: (588-600): Address types can only be payable or non-payable.
-// TypeError 2311: (684-696): Address types can only be payable or non-payable.
-// TypeError 2311: (801-813): Address types can only be payable or non-payable.
-// TypeError 2311: (839-851): Address types can only be payable or non-payable.
-// TypeError 2311: (866-878): Address types can only be payable or non-payable.
diff --git a/test/libsolidity/syntaxTests/parsing/address_nonpayable.sol b/test/libsolidity/syntaxTests/parsing/address_nonpayable.sol
deleted file mode 100644
index 4d98c4744ca6..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_nonpayable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    address a;
-    function f(address b) public pure returns (address c) {
-        address d = b;
-        return d;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable.sol b/test/libsolidity/syntaxTests/parsing/address_payable.sol
deleted file mode 100644
index 2b6f0c73bbc6..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    address payable a;
-    function f(address payable b) public pure returns (address payable c) {
-        address payable d = b;
-        return d;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_constant.sol b/test/libsolidity/syntaxTests/parsing/address_payable_constant.sol
deleted file mode 100644
index b309fadfa6f9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_constant.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    address payable constant a = payable(0);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol b/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol
deleted file mode 100644
index 7e7841565501..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = address payable(this);
-    }
-}
-// ----
-// ParserError 2314: (80-87): Expected ';' but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_function_type.sol b/test/libsolidity/syntaxTests/parsing/address_payable_function_type.sol
deleted file mode 100644
index 2a0a046593c1..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function (address payable) view internal returns (address payable) f;
-    function g(function (address payable) payable external returns (address payable)) public payable returns (function (address payable) payable external returns (address payable)) {
-        function (address payable) payable external returns (address payable) h; h;
-    }
-}
-// ----
-// Warning 6321: (197-267): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_library.sol b/test/libsolidity/syntaxTests/parsing/address_payable_library.sol
deleted file mode 100644
index 4b798db0fcb7..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_library.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library L {
-}
-contract C {
-    using L for address payable;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_local.sol b/test/libsolidity/syntaxTests/parsing/address_payable_local.sol
deleted file mode 100644
index ac6f0d4b202d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_local.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    mapping(uint => address payable) m;
-    mapping(uint => address payable[]) n;
-    function f() public view {
-        address payable a;
-        address payable[] memory b;
-        mapping(uint => address payable) storage c = m;
-        mapping(uint => address payable[]) storage d = n;
-        a; b; c; d;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_state_variable.sol b/test/libsolidity/syntaxTests/parsing/address_payable_state_variable.sol
deleted file mode 100644
index 223fc4eecce7..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_state_variable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    address payable a;
-    address payable public b;
-    address payable[] c;
-    address payable[] public d;
-    mapping(uint => address payable) e;
-    mapping(uint => address payable[]) f;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_struct.sol b/test/libsolidity/syntaxTests/parsing/address_payable_struct.sol
deleted file mode 100644
index e2fa66e86c18..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S {
-        address payable a;
-        address payable[] b;
-        mapping(uint => address payable) c;
-        mapping(uint => address payable[]) d;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol b/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol
deleted file mode 100644
index b09f1ed13fb0..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable;
-    }
-}
-// ----
-// ParserError 2314: (67-68): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol b/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol
deleted file mode 100644
index 8f27f2922fa2..000000000000
--- a/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    address public payable a;
-}
-// ----
-// ParserError 2314: (32-39): Expected identifier but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_and_ternary.sol b/test/libsolidity/syntaxTests/parsing/array_range_and_ternary.sol
deleted file mode 100644
index 36733898ebc5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/array_range_and_ternary.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bool cond, bytes calldata x) external pure {
-        bytes1 a = x[cond ? 1 : 2]; a;
-        abi.decode(x[cond ? 1 : 2 : ], (uint256));
-        abi.decode(x[cond ? 1 : 2 : cond ? 3 : 4], (uint256));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol b/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol
deleted file mode 100644
index 785d8e73281a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure {
-        uint[] memory x;
-        uint[1:](x);
-        uint[1:2](x);
-        uint[][1:](x);
-    }
-}
-// ----
-// TypeError 1760: (77-85): Types cannot be sliced.
-// TypeError 9640: (77-88): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
-// TypeError 1760: (98-107): Types cannot be sliced.
-// TypeError 9640: (98-110): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
-// TypeError 1760: (120-130): Types cannot be sliced.
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_nested.sol b/test/libsolidity/syntaxTests/parsing/array_range_nested.sol
deleted file mode 100644
index 5f027cc8cfc6..000000000000
--- a/test/libsolidity/syntaxTests/parsing/array_range_nested.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][] calldata x) external pure {
-        x[0][1:2];
-        uint256 a = x[0][1:2][1:2][1:][3:][0];
-        uint256 b = x[1][1:][3:4][1:][2:3][0];
-        a; b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol b/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol
deleted file mode 100644
index 700f3e1ff845..000000000000
--- a/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    function f(uint256[][] calldata x) external pure {
-        x[1:2];
-        x[:];
-        x[1:];
-        x[:2];
-    }
-}
-// ----
-// TypeError 2148: (110-116): Index range access is not supported for arrays with dynamically encoded base types.
-// TypeError 2148: (126-130): Index range access is not supported for arrays with dynamically encoded base types.
-// TypeError 2148: (140-145): Index range access is not supported for arrays with dynamically encoded base types.
-// TypeError 2148: (155-160): Index range access is not supported for arrays with dynamically encoded base types.
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_no_start.sol b/test/libsolidity/syntaxTests/parsing/array_range_no_start.sol
deleted file mode 100644
index a0aba3e102a8..000000000000
--- a/test/libsolidity/syntaxTests/parsing/array_range_no_start.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint256[] calldata x) external pure {
-        x[:][:10];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/array_type_range.sol b/test/libsolidity/syntaxTests/parsing/array_type_range.sol
deleted file mode 100644
index 0e4a155b2c57..000000000000
--- a/test/libsolidity/syntaxTests/parsing/array_type_range.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure {
-        uint[][1:] memory x;
-        uint[][1:2] memory x;
-        uint[1:] memory x;
-        uint[1:2] memory x;
-    }
-}
-
-// ----
-// ParserError 5464: (52-62): Expected array length expression.
-// ParserError 5464: (81-92): Expected array length expression.
-// ParserError 5464: (111-119): Expected array length expression.
-// ParserError 5464: (138-147): Expected array length expression.
diff --git a/test/libsolidity/syntaxTests/parsing/arrays_in_events.sol b/test/libsolidity/syntaxTests/parsing/arrays_in_events.sol
deleted file mode 100644
index 65ad9da50cfc..000000000000
--- a/test/libsolidity/syntaxTests/parsing/arrays_in_events.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    event e(uint[10] a, bytes7[8] indexed b, c[3] x);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
deleted file mode 100644
index 44fcd2d3a881..000000000000
--- a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function f() public { c[10] storage a = 7; uint8[10 * 2] storage x; }
-}
-// ----
-// TypeError 9574: (39-58): Type int_const 7 is not implicitly convertible to expected type contract c[10] storage pointer.
diff --git a/test/libsolidity/syntaxTests/parsing/arrays_in_storage.sol b/test/libsolidity/syntaxTests/parsing/arrays_in_storage.sol
deleted file mode 100644
index f4bd749897f8..000000000000
--- a/test/libsolidity/syntaxTests/parsing/arrays_in_storage.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract c {
-    uint[10] a;
-    uint[] a2;
-    struct x { uint[2**20] b; y[1] c; }
-    struct y { uint d; mapping(uint=>x)[] e; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/assembly_evmasm_type.sol b/test/libsolidity/syntaxTests/parsing/assembly_evmasm_type.sol
deleted file mode 100644
index ba37d9e9b601..000000000000
--- a/test/libsolidity/syntaxTests/parsing/assembly_evmasm_type.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly "evmasm" {}
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol b/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol
deleted file mode 100644
index eb40db05e943..000000000000
--- a/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly "failasm" {}
-  }
-}
-// ----
-// ParserError 4531: (55-64): Only "evmasm" supported.
diff --git a/test/libsolidity/syntaxTests/parsing/calling_function.sol b/test/libsolidity/syntaxTests/parsing/calling_function.sol
deleted file mode 100644
index 15b47bfaaaee..000000000000
--- a/test/libsolidity/syntaxTests/parsing/calling_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public {
-        function() returns(function() returns(function() returns(function() returns(uint)))) x;
-        uint y;
-        y = x()()()();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/comment_end_with_double_star.sol b/test/libsolidity/syntaxTests/parsing/comment_end_with_double_star.sol
deleted file mode 100644
index 508cd996a757..000000000000
--- a/test/libsolidity/syntaxTests/parsing/comment_end_with_double_star.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C1 {
-/**
- **/
-}
-contract C2 {}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol b/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol
deleted file mode 100644
index d7c1299ffbc5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    function f() public {
-        uint x = 3 < 0 ? 2 > 1 ? 2 : 1 : 7 > 2 ? 7 : 6;
-    }
-}
-// ----
-// Warning 2072: (47-53): Unused local variable.
-// Warning 2018: (17-100): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol b/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol
deleted file mode 100644
index e63a4fba0a2f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    function f() public {
-        uint x = true ? 1 : 0;
-        uint y = false ? 0 : 1;
-    }
-}
-// ----
-// Warning 2072: (47-53): Unused local variable.
-// Warning 2072: (78-84): Unused local variable.
-// Warning 2018: (17-107): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_assignment.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_assignment.sol
deleted file mode 100644
index 7489aaf92f39..000000000000
--- a/test/libsolidity/syntaxTests/parsing/conditional_with_assignment.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    function f() public pure {
-        uint y = 1;
-        uint x = 3 < 0 ? y = 3 : 6;
-        true ? x = 3 : 4;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
deleted file mode 100644
index 1aa092298eec..000000000000
--- a/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    function f() public {
-        uint x = 3 > 0 ? 3 : 0;
-        uint y = (3 > 0) ? 3 : 0;
-    }
-}
-// ----
-// Warning 2072: (47-53): Unused local variable.
-// Warning 2072: (79-85): Unused local variable.
-// Warning 2018: (17-110): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol
deleted file mode 100644
index d475d8efc30a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function f() public {
-        uint x = 3;
-        uint y = 1;
-        uint z = (x > y) ? x : y;
-        uint w = x > y ? x : y;
-    }
-}
-// ----
-// Warning 2072: (87-93): Unused local variable.
-// Warning 2072: (121-127): Unused local variable.
-// Warning 2018: (17-150): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol b/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
deleted file mode 100644
index a8dbd391d2be..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Foo {
-	uint constant = 4;
-}
-// ----
-// ParserError 2314: (30-31): Expected identifier but got '='
diff --git a/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol b/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol
deleted file mode 100644
index ea3b7abd8196..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	uint s;
-	function f() public constant returns (uint) {
-		return s;
-	}
-}
-// ----
-// ParserError 2314: (43-51): Expected '{' but got 'constant'
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_allowed_this.sol b/test/libsolidity/syntaxTests/parsing/constructor_allowed_this.sol
deleted file mode 100644
index 55d960de4cc8..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_allowed_this.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract A {
-    function a() public pure {
-    }
-}
-contract B {
-    constructor(C) {
-    }
-    function b(C) public returns (A) {
-        return new A();
-    }
-}
-contract C {
-    B m_b;
-    C m_c;
-    constructor(C other_c) {
-        m_c = other_c;
-        m_b = new B(this);
-        m_b.b(this).a();
-        g(this).f();
-        other_c.f();
-        m_c.f();
-    }
-    function f() public pure {
-    }
-    function g(C) public view returns (C) {
-        return m_c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol b/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol
deleted file mode 100644
index 8b84de0553fa..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  constructor() internal internal {}
-}
-// ----
-// ParserError 9439: (38-46): Visibility already specified as "internal".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol b/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol
deleted file mode 100644
index 15d60c392c5a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  constructor() internal public {}
-}
-// ----
-// ParserError 9439: (38-44): Visibility already specified as "internal".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol b/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol
deleted file mode 100644
index 495e3759c849..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  constructor() payable payable {}
-}
-// ----
-// ParserError 9680: (37-44): State mutability already specified as "payable".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol b/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol
deleted file mode 100644
index 7d58520e5a31..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  constructor() public internal {}
-}
-// ----
-// ParserError 9439: (36-44): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol b/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol
deleted file mode 100644
index c0674f2e5409..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  constructor() public public {}
-}
-// ----
-// ParserError 9439: (36-42): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_super.sol b/test/libsolidity/syntaxTests/parsing/constructor_super.sol
deleted file mode 100644
index 5cb7dc11e7c7..000000000000
--- a/test/libsolidity/syntaxTests/parsing/constructor_super.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-  function x() pure internal {}
-}
-
-contract B is A {
-  constructor() {
-    // used to trigger warning about using ``this`` in constructor
-    super.x();
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
deleted file mode 100644
index e34522540e8d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-    fixed40x40 storeMe;
-    function f(ufixed x, fixed32x32 y) public {
-        ufixed8x8 a;
-        fixed b;
-    }
-}
-// ----
-// UnimplementedFeatureError: Fixed point types not implemented.
-// Warning 5667: (52-60): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (62-74): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (93-104): Unused local variable.
-// Warning 2072: (114-121): Unused local variable.
-// Warning 2018: (41-128): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol b/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol
deleted file mode 100644
index a9675f3f1984..000000000000
--- a/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    fixed40x40 pi = 3.14;
-}
-// ----
-// TypeError 2326: (33-37): Type rational_const 157 / 50 is not implicitly convertible to expected type fixed40x40. Try converting to type ufixed16x2 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol
deleted file mode 100644
index aefb4748c15d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-    function a(bool payable) public pure {}
-    function b(string payable) public pure {}
-    function c(int payable) public pure {}
-    function d(int256 payable) public pure {}
-    function e(uint payable) public pure {}
-    function f(uint256 payable) public pure {}
-    function g(bytes1 payable) public pure {}
-    function h(bytes payable) public pure {}
-    function i(bytes32 payable) public pure {}
-    function j(fixed payable) public pure {}
-    function k(fixed80x80 payable) public pure {}
-    function l(ufixed payable) public pure {}
-    function m(ufixed80x80 payable) public pure {}
-}
-contract C1 {
-    function a(bool view) public pure {}
-    function b(string view) public pure {}
-    function c(int view) public pure {}
-    function d(int256 view) public pure {}
-    function e(uint view) public pure {}
-    function f(uint256 view) public pure {}
-    function g(bytes1 view) public pure {}
-    function h(bytes view) public pure {}
-    function i(bytes32 view) public pure {}
-    function j(fixed view) public pure {}
-    function k(fixed80x80 view) public pure {}
-    function l(ufixed view) public pure {}
-    function m(ufixed80x80 view) public pure {}
-}
-contract C2 {
-    function a(bool pure) public pure {}
-    function b(string pure) public pure {}
-    function c(int pure) public pure {}
-    function d(int256 pure) public pure {}
-    function e(uint pure) public pure {}
-    function f(uint256 pure) public pure {}
-    function g(bytes1 pure) public pure {}
-    function h(bytes pure) public pure {}
-    function i(bytes32 pure) public pure {}
-    function j(fixed pure) public pure {}
-    function k(fixed80x80 pure) public pure {}
-    function l(ufixed pure) public pure {}
-    function m(ufixed80x80 pure) public pure {}
-}
-// ----
-// ParserError 9106: (33-40): State mutability can only be specified for address types.
-// ParserError 9106: (79-86): State mutability can only be specified for address types.
-// ParserError 9106: (122-129): State mutability can only be specified for address types.
-// ParserError 9106: (168-175): State mutability can only be specified for address types.
-// ParserError 9106: (212-219): State mutability can only be specified for address types.
-// ParserError 9106: (259-266): State mutability can only be specified for address types.
-// ParserError 9106: (305-312): State mutability can only be specified for address types.
-// ParserError 9106: (350-357): State mutability can only be specified for address types.
-// ParserError 9106: (397-404): State mutability can only be specified for address types.
-// ParserError 9106: (442-449): State mutability can only be specified for address types.
-// ParserError 9106: (492-499): State mutability can only be specified for address types.
-// ParserError 9106: (538-545): State mutability can only be specified for address types.
-// ParserError 9106: (589-596): State mutability can only be specified for address types.
-// ParserError 9106: (649-653): State mutability can only be specified for address types.
-// ParserError 9106: (692-696): State mutability can only be specified for address types.
-// ParserError 9106: (732-736): State mutability can only be specified for address types.
-// ParserError 9106: (775-779): State mutability can only be specified for address types.
-// ParserError 9106: (816-820): State mutability can only be specified for address types.
-// ParserError 9106: (860-864): State mutability can only be specified for address types.
-// ParserError 9106: (903-907): State mutability can only be specified for address types.
-// ParserError 9106: (945-949): State mutability can only be specified for address types.
-// ParserError 9106: (989-993): State mutability can only be specified for address types.
-// ParserError 9106: (1031-1035): State mutability can only be specified for address types.
-// ParserError 9106: (1078-1082): State mutability can only be specified for address types.
-// ParserError 9106: (1121-1125): State mutability can only be specified for address types.
-// ParserError 9106: (1169-1173): State mutability can only be specified for address types.
-// ParserError 9106: (1226-1230): State mutability can only be specified for address types.
-// ParserError 9106: (1269-1273): State mutability can only be specified for address types.
-// ParserError 9106: (1309-1313): State mutability can only be specified for address types.
-// ParserError 9106: (1352-1356): State mutability can only be specified for address types.
-// ParserError 9106: (1393-1397): State mutability can only be specified for address types.
-// ParserError 9106: (1437-1441): State mutability can only be specified for address types.
-// ParserError 9106: (1480-1484): State mutability can only be specified for address types.
-// ParserError 9106: (1522-1526): State mutability can only be specified for address types.
-// ParserError 9106: (1566-1570): State mutability can only be specified for address types.
-// ParserError 9106: (1608-1612): State mutability can only be specified for address types.
-// ParserError 9106: (1655-1659): State mutability can only be specified for address types.
-// ParserError 9106: (1698-1702): State mutability can only be specified for address types.
-// ParserError 9106: (1746-1750): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol
deleted file mode 100644
index 25b9acc9fc27..000000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol
+++ /dev/null
@@ -1,81 +0,0 @@
-bool payable a;
-string payable b;
-int payable c;
-int256 payable d;
-uint payable e;
-uint256 payable f;
-bytes1 payable g;
-bytes payable h;
-bytes32 payable i;
-fixed payable j;
-fixed80x80 payable k;
-ufixed payable l;
-ufixed80x80 payable m;
-
-bool view a2;
-string view b2;
-int view c2;
-int256 view d2;
-uint view e2;
-uint256 view f2;
-bytes1 view g2;
-bytes view h2;
-bytes32 view i2;
-fixed view j2;
-fixed80x80 view k2;
-ufixed view l2;
-ufixed80x80 view m2;
-
-bool pure a3;
-string pure b3;
-int pure c3;
-int256 pure d3;
-uint pure e3;
-uint256 pure f3;
-bytes1 pure g3;
-bytes pure h3;
-bytes32 pure i3;
-fixed pure j3;
-fixed80x80 pure k3;
-ufixed pure l3;
-ufixed80x80 pure m3;
-// ----
-// ParserError 9106: (5-12): State mutability can only be specified for address types.
-// ParserError 9106: (23-30): State mutability can only be specified for address types.
-// ParserError 9106: (38-45): State mutability can only be specified for address types.
-// ParserError 9106: (56-63): State mutability can only be specified for address types.
-// ParserError 9106: (72-79): State mutability can only be specified for address types.
-// ParserError 9106: (91-98): State mutability can only be specified for address types.
-// ParserError 9106: (109-116): State mutability can only be specified for address types.
-// ParserError 9106: (126-133): State mutability can only be specified for address types.
-// ParserError 9106: (145-152): State mutability can only be specified for address types.
-// ParserError 9106: (162-169): State mutability can only be specified for address types.
-// ParserError 9106: (184-191): State mutability can only be specified for address types.
-// ParserError 9106: (202-209): State mutability can only be specified for address types.
-// ParserError 9106: (225-232): State mutability can only be specified for address types.
-// ParserError 9106: (242-246): State mutability can only be specified for address types.
-// ParserError 9106: (258-262): State mutability can only be specified for address types.
-// ParserError 9106: (271-275): State mutability can only be specified for address types.
-// ParserError 9106: (287-291): State mutability can only be specified for address types.
-// ParserError 9106: (301-305): State mutability can only be specified for address types.
-// ParserError 9106: (318-322): State mutability can only be specified for address types.
-// ParserError 9106: (334-338): State mutability can only be specified for address types.
-// ParserError 9106: (349-353): State mutability can only be specified for address types.
-// ParserError 9106: (366-370): State mutability can only be specified for address types.
-// ParserError 9106: (381-385): State mutability can only be specified for address types.
-// ParserError 9106: (401-405): State mutability can only be specified for address types.
-// ParserError 9106: (417-421): State mutability can only be specified for address types.
-// ParserError 9106: (438-442): State mutability can only be specified for address types.
-// ParserError 9106: (453-457): State mutability can only be specified for address types.
-// ParserError 9106: (469-473): State mutability can only be specified for address types.
-// ParserError 9106: (482-486): State mutability can only be specified for address types.
-// ParserError 9106: (498-502): State mutability can only be specified for address types.
-// ParserError 9106: (512-516): State mutability can only be specified for address types.
-// ParserError 9106: (529-533): State mutability can only be specified for address types.
-// ParserError 9106: (545-549): State mutability can only be specified for address types.
-// ParserError 9106: (560-564): State mutability can only be specified for address types.
-// ParserError 9106: (577-581): State mutability can only be specified for address types.
-// ParserError 9106: (592-596): State mutability can only be specified for address types.
-// ParserError 9106: (612-616): State mutability can only be specified for address types.
-// ParserError 9106: (628-632): State mutability can only be specified for address types.
-// ParserError 9106: (649-653): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol
deleted file mode 100644
index d0b25a539ba9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol
+++ /dev/null
@@ -1,91 +0,0 @@
-contract C {
-    function f() public pure {
-        bool payable a;
-        string payable b;
-        int payable c;
-        int256 payable d;
-        uint payable e;
-        uint256 payable f;
-        bytes1 payable g;
-        bytes payable h;
-        bytes32 payable i;
-        fixed payable j;
-        fixed80x80 payable k;
-        ufixed payable l;
-        ufixed80x80 payable m;
-    }
-}
-contract C2 {
-    function f() public pure {
-        bool view a;
-        string view b;
-        int view c;
-        int256 view d;
-        uint view e;
-        uint256 view f;
-        bytes1 view g;
-        bytes view h;
-        bytes32 view i;
-        fixed view j;
-        fixed80x80 view k;
-        ufixed view l;
-        ufixed80x80 view m;
-    }
-}
-contract C3 {
-    function f() public pure {
-        bool pure a;
-        string pure b;
-        int pure c;
-        int256 pure d;
-        uint pure e;
-        uint256 pure f;
-        bytes1 pure g;
-        bytes pure h;
-        bytes32 pure i;
-        fixed pure j;
-        fixed80x80 pure k;
-        ufixed pure l;
-        ufixed80x80 pure m;
-    }
-}
-// ----
-// ParserError 9106: (57-64): State mutability can only be specified for address types.
-// ParserError 9106: (83-90): State mutability can only be specified for address types.
-// ParserError 9106: (106-113): State mutability can only be specified for address types.
-// ParserError 9106: (132-139): State mutability can only be specified for address types.
-// ParserError 9106: (156-163): State mutability can only be specified for address types.
-// ParserError 9106: (183-190): State mutability can only be specified for address types.
-// ParserError 9106: (209-216): State mutability can only be specified for address types.
-// ParserError 9106: (234-241): State mutability can only be specified for address types.
-// ParserError 9106: (261-268): State mutability can only be specified for address types.
-// ParserError 9106: (286-293): State mutability can only be specified for address types.
-// ParserError 9106: (316-323): State mutability can only be specified for address types.
-// ParserError 9106: (342-349): State mutability can only be specified for address types.
-// ParserError 9106: (373-380): State mutability can only be specified for address types.
-// ParserError 9106: (450-454): State mutability can only be specified for address types.
-// ParserError 9106: (473-477): State mutability can only be specified for address types.
-// ParserError 9106: (493-497): State mutability can only be specified for address types.
-// ParserError 9106: (516-520): State mutability can only be specified for address types.
-// ParserError 9106: (537-541): State mutability can only be specified for address types.
-// ParserError 9106: (561-565): State mutability can only be specified for address types.
-// ParserError 9106: (584-588): State mutability can only be specified for address types.
-// ParserError 9106: (606-610): State mutability can only be specified for address types.
-// ParserError 9106: (630-634): State mutability can only be specified for address types.
-// ParserError 9106: (652-656): State mutability can only be specified for address types.
-// ParserError 9106: (679-683): State mutability can only be specified for address types.
-// ParserError 9106: (702-706): State mutability can only be specified for address types.
-// ParserError 9106: (730-734): State mutability can only be specified for address types.
-// ParserError 9106: (804-808): State mutability can only be specified for address types.
-// ParserError 9106: (827-831): State mutability can only be specified for address types.
-// ParserError 9106: (847-851): State mutability can only be specified for address types.
-// ParserError 9106: (870-874): State mutability can only be specified for address types.
-// ParserError 9106: (891-895): State mutability can only be specified for address types.
-// ParserError 9106: (915-919): State mutability can only be specified for address types.
-// ParserError 9106: (938-942): State mutability can only be specified for address types.
-// ParserError 9106: (960-964): State mutability can only be specified for address types.
-// ParserError 9106: (984-988): State mutability can only be specified for address types.
-// ParserError 9106: (1006-1010): State mutability can only be specified for address types.
-// ParserError 9106: (1033-1037): State mutability can only be specified for address types.
-// ParserError 9106: (1056-1060): State mutability can only be specified for address types.
-// ParserError 9106: (1084-1088): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol
deleted file mode 100644
index 9e428fa9ddcf..000000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-    function a() public pure returns (bool payable) {}
-    function b() public pure returns (string payable) {}
-    function c() public pure returns (int payable) {}
-    function d() public pure returns (int256 payable) {}
-    function e() public pure returns (uint payable) {}
-    function f() public pure returns (uint256 payable) {}
-    function g() public pure returns (bytes1 payable) {}
-    function h() public pure returns (bytes payable) {}
-    function i() public pure returns (bytes32 payable) {}
-    function j() public pure returns (fixed payable) {}
-    function k() public pure returns (fixed80x80 payable) {}
-    function l() public pure returns (ufixed payable) {}
-    function m() public pure returns (ufixed80x80 payable) {}
-}
-contract C1 {
-    function a() public pure returns (bool view) {}
-    function b() public pure returns (string view) {}
-    function c() public pure returns (int view) {}
-    function d() public pure returns (int256 view) {}
-    function e() public pure returns (uint view) {}
-    function f() public pure returns (uint256 view) {}
-    function g() public pure returns (bytes1 view) {}
-    function h() public pure returns (bytes view) {}
-    function i() public pure returns (bytes32 view) {}
-    function j() public pure returns (fixed view) {}
-    function k() public pure returns (fixed80x80 view) {}
-    function l() public pure returns (ufixed view) {}
-    function m() public pure returns (ufixed80x80 view) {}
-}
-contract C2 {
-    function a() public pure returns (bool pure) {}
-    function b() public pure returns (string pure) {}
-    function c() public pure returns (int pure) {}
-    function d() public pure returns (int256 pure) {}
-    function e() public pure returns (uint pure) {}
-    function f() public pure returns (uint256 pure) {}
-    function g() public pure returns (bytes1 pure) {}
-    function h() public pure returns (bytes pure) {}
-    function i() public pure returns (bytes32 pure) {}
-    function j() public pure returns (fixed pure) {}
-    function k() public pure returns (fixed80x80 pure) {}
-    function l() public pure returns (ufixed pure) {}
-    function m() public pure returns (ufixed80x80 pure) {}
-}
-// ----
-// ParserError 9106: (56-63): State mutability can only be specified for address types.
-// ParserError 9106: (113-120): State mutability can only be specified for address types.
-// ParserError 9106: (167-174): State mutability can only be specified for address types.
-// ParserError 9106: (224-231): State mutability can only be specified for address types.
-// ParserError 9106: (279-286): State mutability can only be specified for address types.
-// ParserError 9106: (337-344): State mutability can only be specified for address types.
-// ParserError 9106: (394-401): State mutability can only be specified for address types.
-// ParserError 9106: (450-457): State mutability can only be specified for address types.
-// ParserError 9106: (508-515): State mutability can only be specified for address types.
-// ParserError 9106: (564-571): State mutability can only be specified for address types.
-// ParserError 9106: (625-632): State mutability can only be specified for address types.
-// ParserError 9106: (682-689): State mutability can only be specified for address types.
-// ParserError 9106: (744-751): State mutability can only be specified for address types.
-// ParserError 9106: (815-819): State mutability can only be specified for address types.
-// ParserError 9106: (869-873): State mutability can only be specified for address types.
-// ParserError 9106: (920-924): State mutability can only be specified for address types.
-// ParserError 9106: (974-978): State mutability can only be specified for address types.
-// ParserError 9106: (1026-1030): State mutability can only be specified for address types.
-// ParserError 9106: (1081-1085): State mutability can only be specified for address types.
-// ParserError 9106: (1135-1139): State mutability can only be specified for address types.
-// ParserError 9106: (1188-1192): State mutability can only be specified for address types.
-// ParserError 9106: (1243-1247): State mutability can only be specified for address types.
-// ParserError 9106: (1296-1300): State mutability can only be specified for address types.
-// ParserError 9106: (1354-1358): State mutability can only be specified for address types.
-// ParserError 9106: (1408-1412): State mutability can only be specified for address types.
-// ParserError 9106: (1467-1471): State mutability can only be specified for address types.
-// ParserError 9106: (1535-1539): State mutability can only be specified for address types.
-// ParserError 9106: (1589-1593): State mutability can only be specified for address types.
-// ParserError 9106: (1640-1644): State mutability can only be specified for address types.
-// ParserError 9106: (1694-1698): State mutability can only be specified for address types.
-// ParserError 9106: (1746-1750): State mutability can only be specified for address types.
-// ParserError 9106: (1801-1805): State mutability can only be specified for address types.
-// ParserError 9106: (1855-1859): State mutability can only be specified for address types.
-// ParserError 9106: (1908-1912): State mutability can only be specified for address types.
-// ParserError 9106: (1963-1967): State mutability can only be specified for address types.
-// ParserError 9106: (2016-2020): State mutability can only be specified for address types.
-// ParserError 9106: (2074-2078): State mutability can only be specified for address types.
-// ParserError 9106: (2128-2132): State mutability can only be specified for address types.
-// ParserError 9106: (2187-2191): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol
deleted file mode 100644
index 960929f91993..000000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-contract C {
-    bool payable a;
-    string payable b;
-    int payable c;
-    int256 payable d;
-    uint payable e;
-    uint256 payable f;
-    bytes1 payable g;
-    bytes payable h;
-    bytes32 payable i;
-    fixed payable j;
-    fixed80x80 payable k;
-    ufixed payable l;
-    ufixed80x80 payable m;
-}
-contract C2 {
-    bool view a;
-    string view b;
-    int view c;
-    int256 view d;
-    uint view e;
-    uint256 view f;
-    bytes1 view g;
-    bytes view h;
-    bytes32 view i;
-    fixed view j;
-    fixed80x80 view k;
-    ufixed view l;
-    ufixed80x80 view m;
-}
-contract C3 {
-    bool pure a;
-    string pure b;
-    int pure c;
-    int256 pure d;
-    uint pure e;
-    uint256 pure f;
-    bytes1 pure g;
-    bytes pure h;
-    bytes32 pure i;
-    fixed pure j;
-    fixed80x80 pure k;
-    ufixed pure l;
-    ufixed80x80 pure m;
-}
-// ----
-// ParserError 9106: (22-29): State mutability can only be specified for address types.
-// ParserError 9106: (44-51): State mutability can only be specified for address types.
-// ParserError 9106: (63-70): State mutability can only be specified for address types.
-// ParserError 9106: (85-92): State mutability can only be specified for address types.
-// ParserError 9106: (105-112): State mutability can only be specified for address types.
-// ParserError 9106: (128-135): State mutability can only be specified for address types.
-// ParserError 9106: (150-157): State mutability can only be specified for address types.
-// ParserError 9106: (171-178): State mutability can only be specified for address types.
-// ParserError 9106: (194-201): State mutability can only be specified for address types.
-// ParserError 9106: (215-222): State mutability can only be specified for address types.
-// ParserError 9106: (241-248): State mutability can only be specified for address types.
-// ParserError 9106: (263-270): State mutability can only be specified for address types.
-// ParserError 9106: (290-297): State mutability can only be specified for address types.
-// ParserError 9106: (326-330): State mutability can only be specified for address types.
-// ParserError 9106: (345-349): State mutability can only be specified for address types.
-// ParserError 9106: (361-365): State mutability can only be specified for address types.
-// ParserError 9106: (380-384): State mutability can only be specified for address types.
-// ParserError 9106: (397-401): State mutability can only be specified for address types.
-// ParserError 9106: (417-421): State mutability can only be specified for address types.
-// ParserError 9106: (436-440): State mutability can only be specified for address types.
-// ParserError 9106: (454-458): State mutability can only be specified for address types.
-// ParserError 9106: (474-478): State mutability can only be specified for address types.
-// ParserError 9106: (492-496): State mutability can only be specified for address types.
-// ParserError 9106: (515-519): State mutability can only be specified for address types.
-// ParserError 9106: (534-538): State mutability can only be specified for address types.
-// ParserError 9106: (558-562): State mutability can only be specified for address types.
-// ParserError 9106: (591-595): State mutability can only be specified for address types.
-// ParserError 9106: (610-614): State mutability can only be specified for address types.
-// ParserError 9106: (626-630): State mutability can only be specified for address types.
-// ParserError 9106: (645-649): State mutability can only be specified for address types.
-// ParserError 9106: (662-666): State mutability can only be specified for address types.
-// ParserError 9106: (682-686): State mutability can only be specified for address types.
-// ParserError 9106: (701-705): State mutability can only be specified for address types.
-// ParserError 9106: (719-723): State mutability can only be specified for address types.
-// ParserError 9106: (739-743): State mutability can only be specified for address types.
-// ParserError 9106: (757-761): State mutability can only be specified for address types.
-// ParserError 9106: (780-784): State mutability can only be specified for address types.
-// ParserError 9106: (799-803): State mutability can only be specified for address types.
-// ParserError 9106: (823-827): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/else_if_statement.sol b/test/libsolidity/syntaxTests/parsing/else_if_statement.sol
deleted file mode 100644
index 5b423564e583..000000000000
--- a/test/libsolidity/syntaxTests/parsing/else_if_statement.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function fun(uint256 a) public returns (uint8 b) {
-        if (a < 0) b = 0x67; else if (a == 0) b = 0x12; else b = 0x78;
-    }
-}
-// ----
-// Warning 2018: (20-147): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/emit_without_event.sol b/test/libsolidity/syntaxTests/parsing/emit_without_event.sol
deleted file mode 100644
index 3e1f733faae9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/emit_without_event.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	event A();
-	function f() {
-		emit A;
-	}
-}
-// ----
-// ParserError 2314: (49-50): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/empty_comment.sol b/test/libsolidity/syntaxTests/parsing/empty_comment.sol
deleted file mode 100644
index 044adf6f6b19..000000000000
--- a/test/libsolidity/syntaxTests/parsing/empty_comment.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-contract test
-{}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/empty_enum.sol b/test/libsolidity/syntaxTests/parsing/empty_enum.sol
deleted file mode 100644
index 1dc04d914cd3..000000000000
--- a/test/libsolidity/syntaxTests/parsing/empty_enum.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	enum foo { }
-}
-// ----
-// ParserError 3147: (25-26): Enum with no members is not allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/empty_function.sol b/test/libsolidity/syntaxTests/parsing/empty_function.sol
deleted file mode 100644
index 3f42e4e3e450..000000000000
--- a/test/libsolidity/syntaxTests/parsing/empty_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	uint256 stateVar;
-	function functionName(bytes20 arg1, address addr) public view returns (int id) { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/enum_from_interface.sol b/test/libsolidity/syntaxTests/parsing/enum_from_interface.sol
deleted file mode 100644
index f2623c7e8f76..000000000000
--- a/test/libsolidity/syntaxTests/parsing/enum_from_interface.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface I {
-    enum Direction { Left, Right }
-}
-
-contract D {
-    function f() public pure returns (I.Direction) {
-      return I.Direction.Left;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/enum_from_interface_in_library.sol b/test/libsolidity/syntaxTests/parsing/enum_from_interface_in_library.sol
deleted file mode 100644
index b4c4a84184cd..000000000000
--- a/test/libsolidity/syntaxTests/parsing/enum_from_interface_in_library.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    enum Direction { Left, Right }
-}
-
-library L {
-    function f() public pure returns (I.Direction) {
-      return I.Direction.Left;
-    }
-    function g() internal pure returns (I.Direction) {
-      return I.Direction.Left;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/enum_from_library.sol b/test/libsolidity/syntaxTests/parsing/enum_from_library.sol
deleted file mode 100644
index 896f4e98c8b4..000000000000
--- a/test/libsolidity/syntaxTests/parsing/enum_from_library.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    enum Direction { Left, Right }
-}
-
-contract D {
-    function f() public pure returns (L.Direction) {
-      return L.Direction.Left;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/enum_inheritance_contract.sol b/test/libsolidity/syntaxTests/parsing/enum_inheritance_contract.sol
deleted file mode 100644
index 9671be8cd8c8..000000000000
--- a/test/libsolidity/syntaxTests/parsing/enum_inheritance_contract.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    enum Direction { Left, Right }
-}
-
-contract D is C {
-    function f() public pure returns (Direction) {
-      return Direction.Left;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/enum_inheritance_interface.sol b/test/libsolidity/syntaxTests/parsing/enum_inheritance_interface.sol
deleted file mode 100644
index 49917a539b0b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/enum_inheritance_interface.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface I {
-    enum Direction { Left, Right }
-}
-
-contract D is I {
-    function f() public pure returns (Direction) {
-      return Direction.Left;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/enum_valid_declaration.sol b/test/libsolidity/syntaxTests/parsing/enum_valid_declaration.sol
deleted file mode 100644
index 59272a841e24..000000000000
--- a/test/libsolidity/syntaxTests/parsing/enum_valid_declaration.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    enum validEnum { Value1, Value2, Value3, Value4 }
-    constructor() {
-        a = validEnum.Value3;
-    }
-    validEnum a;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/event.sol b/test/libsolidity/syntaxTests/parsing/event.sol
deleted file mode 100644
index ffcc3587c417..000000000000
--- a/test/libsolidity/syntaxTests/parsing/event.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    event e();
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/event_arguments.sol b/test/libsolidity/syntaxTests/parsing/event_arguments.sol
deleted file mode 100644
index daaa9aeb353d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/event_arguments.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    event e(uint a, bytes32 s);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/event_arguments_indexed.sol b/test/libsolidity/syntaxTests/parsing/event_arguments_indexed.sol
deleted file mode 100644
index 925f0eb7a82a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/event_arguments_indexed.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    event e(uint a, bytes32 indexed s, bool indexed b);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol b/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol
deleted file mode 100644
index 2e294fde9246..000000000000
--- a/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	event e;
-}
-// ----
-// ParserError 2314: (21-22): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/exp_expression.sol b/test/libsolidity/syntaxTests/parsing/exp_expression.sol
deleted file mode 100644
index 17e3deadb5a6..000000000000
--- a/test/libsolidity/syntaxTests/parsing/exp_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function fun(uint256 a) public {
-        uint256 x = 3 ** a;
-    }
-}
-// ----
-// Warning 2072: (61-70): Unused local variable.
-// Warning 2018: (20-86): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/external_function.sol b/test/libsolidity/syntaxTests/parsing/external_function.sol
deleted file mode 100644
index 0315b2000444..000000000000
--- a/test/libsolidity/syntaxTests/parsing/external_function.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    function x() external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/external_variable.sol b/test/libsolidity/syntaxTests/parsing/external_variable.sol
deleted file mode 100644
index 8935d4c5a001..000000000000
--- a/test/libsolidity/syntaxTests/parsing/external_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	uint external x;
-}
-// ----
-// ParserError 2314: (19-27): Expected identifier but got 'external'
diff --git a/test/libsolidity/syntaxTests/parsing/fallback_function.sol b/test/libsolidity/syntaxTests/parsing/fallback_function.sol
deleted file mode 100644
index edfbab671a82..000000000000
--- a/test/libsolidity/syntaxTests/parsing/fallback_function.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    fallback() external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol b/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol
deleted file mode 100644
index e85f9a54cd1f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-	fixed40x40 pi = 3.14.15;
-}
-// ----
-// ParserError 2314: (34-37): Expected ';' but got 'Number'
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol b/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol
deleted file mode 100644
index 53cfe1a4f36b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    function fun(uint256 a) public {
-        uint256 i =0;
-        for (i = 0; i < 10; i++) {
-            uint256 x = i; break; continue;
-        }
-    }
-}
-// ----
-// Warning 5740: (103-106): Unreachable code.
-// Warning 5740: (144-152): Unreachable code.
-// Warning 5667: (33-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (122-131): Unused local variable.
-// Warning 2018: (20-169): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol b/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol
deleted file mode 100644
index 6c0e4b0e39ed..000000000000
--- a/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-        function fun(uint256 a) public {
-            uint256 i =0;
-            for (;;) {
-                uint256 x = i; break; continue;
-            }
-        }
-    }
-// ----
-// Warning 5740: (144-152): Unreachable code.
-// Warning 5667: (37-46): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (122-131): Unused local variable.
-// Warning 2018: (24-177): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol b/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol
deleted file mode 100644
index 83869238257a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function fun(uint256 a) public {
-        uint256 i = 0;
-        for (i = 0; i < 10; i++)
-            continue;
-    }
-}
-// ----
-// Warning 5667: (33-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2018: (20-136): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol b/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol
deleted file mode 100644
index 220c120cd8a5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract test {
-    function fun(uint256 a) public {
-        for (uint256 i = 0; i < 10; i++) {
-            uint256 x = i; break; continue;
-        }
-    }
-}
-// ----
-// Warning 5740: (89-92): Unreachable code.
-// Warning 5740: (130-138): Unreachable code.
-// Warning 5667: (33-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (108-117): Unused local variable.
-// Warning 2018: (20-155): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/from_is_not_keyword.sol b/test/libsolidity/syntaxTests/parsing/from_is_not_keyword.sol
deleted file mode 100644
index 1dde31813318..000000000000
--- a/test/libsolidity/syntaxTests/parsing/from_is_not_keyword.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// "from" is not a keyword although it is used as a keyword in import directives.
-contract from {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/function_no_body.sol b/test/libsolidity/syntaxTests/parsing/function_no_body.sol
deleted file mode 100644
index 5851d2f61ff7..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_no_body.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract contract test {
-	function functionName(bytes32 input) public virtual returns (bytes32 out);
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/function_normal_comments.sol b/test/libsolidity/syntaxTests/parsing/function_normal_comments.sol
deleted file mode 100644
index 231be9c2b1cf..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_normal_comments.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    uint256 stateVar;
-    // We won't see this comment
-    function functionName(bytes32 input) public returns (bytes32 out) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_as_parameter.sol b/test/libsolidity/syntaxTests/parsing/function_type_as_parameter.sol
deleted file mode 100644
index 174bfeeacc79..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_as_parameter.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(function(uint) external returns (uint) g) internal returns (uint a) {
-        return g(1);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable.sol b/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable.sol
deleted file mode 100644
index 07906f56d50b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function (uint, uint) internal returns (uint) f1;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_assignment.sol b/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_assignment.sol
deleted file mode 100644
index 42d8717ab7aa..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_assignment.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f(uint x, uint y) public returns (uint a) {}
-    function (uint, uint) internal returns (uint) f1 = f;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol b/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol
deleted file mode 100644
index 35e9997c92f2..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	function (uint, uint) modifier1() returns (uint) f1;
-}
-// ----
-// ParserError 2314: (48-49): Expected ';' but got '('
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_in_expression.sol b/test/libsolidity/syntaxTests/parsing/function_type_in_expression.sol
deleted file mode 100644
index 725a777abd0b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_in_expression.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f(uint x, uint y) public returns (uint a) {}
-    function g() public {
-        function (uint, uint) internal returns (uint) f1 = f;
-    }
-}
-// ----
-// Warning 2072: (108-156): Unused local variable.
-// Warning 2018: (78-167): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol b/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol
deleted file mode 100644
index 5bd6c8dcfab0..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    struct S {
-        function (uint x, uint y) internal returns (uint) f;
-        function (uint, uint) external returns (uint) g;
-        uint d;
-    }
-}
-// ----
-// Warning 6162: (49-55): Naming function type parameters is deprecated.
-// Warning 6162: (57-63): Naming function type parameters is deprecated.
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol b/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol
deleted file mode 100644
index 8d67db095deb..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public pure {
-    function() pure pure g;
-  }
-}
-// ----
-// ParserError 9680: (62-66): State mutability already specified as "pure".
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol b/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol
deleted file mode 100644
index c9b035864018..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public pure {
-    function() public public g;
-  }
-}
-// ----
-// ParserError 9439: (64-70): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_state_variable.sol b/test/libsolidity/syntaxTests/parsing/function_type_state_variable.sol
deleted file mode 100644
index ed85ce8e28a9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/function_type_state_variable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	function() x;
-	function() y = x;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/if_statement.sol b/test/libsolidity/syntaxTests/parsing/if_statement.sol
deleted file mode 100644
index 580a0f557d59..000000000000
--- a/test/libsolidity/syntaxTests/parsing/if_statement.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function fun(uint256 a) public returns (uint) {
-        if (a >= 8) { return 2; } else { uint b = 7; }
-    }
-}
-// ----
-// Warning 6321: (60-64): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (109-115): Unused local variable.
-// Warning 2018: (20-128): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/import_complex.sol b/test/libsolidity/syntaxTests/parsing/import_complex.sol
deleted file mode 100644
index 12d9e73bcbed..000000000000
--- a/test/libsolidity/syntaxTests/parsing/import_complex.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import {hello, world} from "hello";
-// ----
-// ParserError 6275: (0-35): Source "hello" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol b/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol
deleted file mode 100644
index 6709260b0666..000000000000
--- a/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import {hello, world} from function;
-// ----
-// ParserError 6845: (27-35): Expected import path.
diff --git a/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol b/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol
deleted file mode 100644
index 34d5433db84c..000000000000
--- a/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import {hello, world};
-// ----
-// ParserError 8208: (21-22): Expected "from".
diff --git a/test/libsolidity/syntaxTests/parsing/import_empty.sol b/test/libsolidity/syntaxTests/parsing/import_empty.sol
deleted file mode 100644
index 74931d4dd00b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/import_empty.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import "";
-// ----
-// ParserError 6326: (9-10): Import path cannot be empty.
diff --git a/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol b/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol
deleted file mode 100644
index 24150e76d061..000000000000
--- a/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import function;
-// ----
-// ParserError 9478: (7-15): Expected string literal (path), "*" or alias list.
diff --git a/test/libsolidity/syntaxTests/parsing/import_simple.sol b/test/libsolidity/syntaxTests/parsing/import_simple.sol
deleted file mode 100644
index e4ee0ce1b0dc..000000000000
--- a/test/libsolidity/syntaxTests/parsing/import_simple.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-import "hello";
-// ----
-// ParserError 6275: (0-15): Source "hello" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/parsing/inline_array_declaration.sol b/test/libsolidity/syntaxTests/parsing/inline_array_declaration.sol
deleted file mode 100644
index 4730f9502e31..000000000000
--- a/test/libsolidity/syntaxTests/parsing/inline_array_declaration.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    uint[] a;
-    function f() public returns (uint, uint) {
-        a = [1,2,3];
-        return (a[3], [2,3,4][0]);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol b/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol
deleted file mode 100644
index 05496b9b2621..000000000000
--- a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-	uint[] a;
-	function f() returns (uint) {
-		a = [,2,3];
-		return (a[0]);
-	}
-}
-// ----
-// ParserError 4799: (62-63): Expected expression (inline array elements cannot be omitted).
diff --git a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol b/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol
deleted file mode 100644
index 1837fe650f7b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-	uint[] a;
-	function f() returns (uint, uint) {
-		return ([3, ,4][0]);
-	}
-}
-// ----
-// ParserError 4799: (75-76): Expected expression (inline array elements cannot be omitted).
diff --git a/test/libsolidity/syntaxTests/parsing/interface_basic.sol b/test/libsolidity/syntaxTests/parsing/interface_basic.sol
deleted file mode 100644
index 0742c24f6ffa..000000000000
--- a/test/libsolidity/syntaxTests/parsing/interface_basic.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface Interface {
-	function f() external;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol b/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol
deleted file mode 100644
index fa079ae4b042..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	function f() {
-		fixed a = 1.0x2;
-	}
-}
-// ----
-// ParserError 8936: (44-47): Identifier-start is not allowed at end of a number.
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol b/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol
deleted file mode 100644
index 0dd79bae7938..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: A ====
-contract test {
-    function f1(uint indexed a) public returns (uint) { }
-}
-==== Source: B ====
-contract test {
-    function f1(uint a) public returns (uint indexed) { }
-}
-// ----
-// ParserError 2314: (A:37-44): Expected ',' but got 'indexed'
-// ParserError 2314: (B:61-68): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol b/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol
deleted file mode 100644
index 602414192584..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f1(uint immutable a) public returns (uint immutable) { }
-    function f2(uint constant a) public returns (uint constant) { }
-}
-// ----
-// DeclarationError 8297: (32-48): The "immutable" keyword can only be used for state variables.
-// DeclarationError 8297: (66-80): The "immutable" keyword can only be used for state variables.
-// DeclarationError 1788: (102-117): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 1788: (135-148): The "constant" keyword can only be used for state variables or variables at file level.
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol b/test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol
deleted file mode 100644
index b5b3439f42eb..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: A ====
-contract test {
-    string memory a;
-}
-==== Source: B ====
-contract test {
-    string calldata a;
-}
-// ----
-// ParserError 2314: (A:27-33): Expected identifier but got 'memory'
-// ParserError 2314: (B:27-35): Expected identifier but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol b/test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol
deleted file mode 100644
index 9508e795ac2f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: A ====
-uint indexed a;
-==== Source: B ====
-contract test {
-    function f(uint a) public {
-        uint indexed a;
-    }
-}
-==== Source: C ====
-contract test {
-    uint indexed a;
-}
-// ----
-// ParserError 2314: (A:5-12): Expected identifier but got 'indexed'
-// ParserError 2314: (B:61-68): Expected ';' but got 'indexed'
-// ParserError 2314: (C:25-32): Expected identifier but got 'indexed'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol b/test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol
deleted file mode 100644
index 874a18512360..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: A ====
-contract test {
-    function f(uint a) public {
-        uint constant a;
-    }
-}
-==== Source: B ====
-contract test {
-    function f(uint a) public {
-        uint immutable a;
-    }
-}
-// ----
-// ParserError 2314: (A:61-69): Expected ';' but got 'constant'
-// ParserError 2314: (B:61-70): Expected ';' but got 'immutable'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol b/test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol
deleted file mode 100644
index 0180ebf73ebc..000000000000
--- a/test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C
-{
-    string unicode = "abc";
-}
-// ----
-// ParserError 2314: (24-31): Expected identifier but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal.sol
deleted file mode 100644
index d4d3299f82c6..000000000000
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-  function f() public pure {
-    uint d1 = 654_321;
-    uint d2 =  54_321;
-    uint d3 =   4_321;
-    uint d4 = 5_43_21;
-    uint d5 = 1_2e10;
-    uint d6 = 12e1_0;
-
-    d1; d2; d3; d4; d5; d6;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
deleted file mode 100644
index 6cbeb217c771..000000000000
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-  function f() public pure {
-    uint D1 = 1234_;
-    uint D2 = 12__34;
-    uint D3 = 12_e34;
-    uint D4 = 12e_34;
-  }
-}
-// ----
-// SyntaxError 2090: (56-61): Invalid use of underscores in number literal. No trailing underscores allowed.
-// SyntaxError 2990: (77-83): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
-// SyntaxError 6415: (99-105): Invalid use of underscores in number literal. No underscore at the end of the mantissa allowed.
-// SyntaxError 6165: (121-127): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol
deleted file mode 100644
index 00ed4f6540cf..000000000000
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    fixed f1 = 3.14_15;
-    fixed f2 = 3_1.4_15;
-
-    f1; f2;
-  }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
deleted file mode 100644
index 49bf042cdabe..000000000000
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-  function f() public pure {
-    fixed F1 = 3.1415_;
-    fixed F2 = 3__1.4__15;
-    fixed F3 = 1_.2;
-    fixed F4 = 1._2;
-    fixed F5 = 1.2e_12;
-    fixed F6 = 1._;
-  }
-}
-// ----
-// SyntaxError 2090: (57-64): Invalid use of underscores in number literal. No trailing underscores allowed.
-// SyntaxError 2990: (81-91): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
-// SyntaxError 1023: (108-112): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
-// SyntaxError 3891: (129-133): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
-// SyntaxError 6165: (150-157): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
-// SyntaxError 2090: (174-177): Invalid use of underscores in number literal. No trailing underscores allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex.sol
deleted file mode 100644
index 999a4634d794..000000000000
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-  function f() public pure {
-    uint x1 = 0x8765_4321;
-    uint x2 = 0x765_4321;
-    uint x3 = 0x65_4321;
-    uint x4 = 0x5_4321;
-    uint x5 = 0x123_1234_1234_1234;
-    uint x6 = 0x123456_1234_1234;
-
-    x1; x2; x3; x4; x5; x6;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
deleted file mode 100644
index 5a2e2f5c1f7e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public pure {
-    uint X1 = 0x1234__1234__1234__123;
-  }
-}
-// ----
-// SyntaxError 2990: (56-79): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/library_simple.sol b/test/libsolidity/syntaxTests/parsing/library_simple.sol
deleted file mode 100644
index c892e3ed1d2b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/library_simple.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library Lib {
-    function f() public { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/literal_constants_with_ether_subdenominations.sol b/test/libsolidity/syntaxTests/parsing/literal_constants_with_ether_subdenominations.sol
deleted file mode 100644
index 6b3ccc7c05be..000000000000
--- a/test/libsolidity/syntaxTests/parsing/literal_constants_with_ether_subdenominations.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public
-    {
-         a = 1 wei;
-         b = 2 ether;
-         c = 3 gwei;
-    }
-    uint256 a;
-    uint256 b;
-    uint256 c;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/literal_constants_with_ether_subdenominations_in_expressions.sol b/test/libsolidity/syntaxTests/parsing/literal_constants_with_ether_subdenominations_in_expressions.sol
deleted file mode 100644
index 1e7574f00dac..000000000000
--- a/test/libsolidity/syntaxTests/parsing/literal_constants_with_ether_subdenominations_in_expressions.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    constructor()
-    {
-         a = 1 wei * 100 wei + 7 gwei - 3;
-    }
-    uint256 a;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/local_const_variable.sol b/test/libsolidity/syntaxTests/parsing/local_const_variable.sol
deleted file mode 100644
index 6a4427361d17..000000000000
--- a/test/libsolidity/syntaxTests/parsing/local_const_variable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Foo {
-	function localConst() returns (uint ret)
-	{
-		uint constant local = 4;
-		return local;
-	}
-}
-// ----
-// ParserError 2314: (67-75): Expected ';' but got 'constant'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol
deleted file mode 100644
index c7b1558e6140..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: A ====
-uint[] storage a;
-==== Source: B ====
-uint[] memory b;
-==== Source: C ====
-uint[] calldata c;
-// ----
-// ParserError 2314: (A:7-14): Expected identifier but got 'storage'
-// ParserError 2314: (B:7-13): Expected identifier but got 'memory'
-// ParserError 2314: (C:7-15): Expected identifier but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol
deleted file mode 100644
index 06627bd6490d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract Foo {
-    function f1() returns (string calldata calldata) {}
-    function f2() returns (string calldata memory) {}
-    function f3() returns (string calldata storage) {}
-    function f4() returns (string memory calldata) {}
-    function f5() returns (string memory memory) {}
-    function f6() returns (string memory storage) {}
-    function f7() returns (string storage calldata) {}
-    function f8() returns (string storage memory) {}
-    function f9() returns (string storage storage) {}
-}
-// ----
-// ParserError 3548: (58-66): Location already specified.
-// ParserError 3548: (114-120): Location already specified.
-// ParserError 3548: (168-175): Location already specified.
-// ParserError 3548: (221-229): Location already specified.
-// ParserError 3548: (275-281): Location already specified.
-// ParserError 3548: (327-334): Location already specified.
-// ParserError 3548: (381-389): Location already specified.
-// ParserError 3548: (436-442): Location already specified.
-// ParserError 3548: (489-496): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals.sol
deleted file mode 100644
index 38de7b1c6206..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract Foo {
-    uint[] m_x;
-    function f() public view {
-        uint[] storage x = m_x;
-        uint[] memory y;
-        x; y;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
deleted file mode 100644
index f61cd9498ef5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract Foo {
-    uint[] m_x;
-    function f() public view {
-        uint[] storage memory x = m_x;
-        uint[] memory storage calldata y;
-        uint[] storage calldata x2;
-        uint[] storage storage x3;
-        uint[] calldata memory x4;
-        uint[] calldata calldata x5;
-        uint[] calldata storage x6;
-        uint[] storage memory x4;
-        uint[] storage calldata x5;
-        uint[] storage storage x6;
-        x; y;
-    }
-}
-// ----
-// ParserError 3548: (85-91): Location already specified.
-// ParserError 3548: (123-130): Location already specified.
-// ParserError 3548: (131-139): Location already specified.
-// ParserError 3548: (166-174): Location already specified.
-// ParserError 3548: (202-209): Location already specified.
-// ParserError 3548: (238-244): Location already specified.
-// ParserError 3548: (273-281): Location already specified.
-// ParserError 3548: (310-317): Location already specified.
-// ParserError 3548: (345-351): Location already specified.
-// ParserError 3548: (379-387): Location already specified.
-// ParserError 3548: (415-422): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
deleted file mode 100644
index c5761a944e14..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Foo {
-    function f(uint[] storage constant x, uint[] memory y) internal { }
-}
-// ----
-// DeclarationError 1788: (30-55): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 9259: (30-55): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
deleted file mode 100644
index 8d1985cd6f65..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract Foo {
-    function f(uint[] storage memory constant x, uint[] memory calldata y) internal { }
-    function f2(uint[] storage storage x) internal { }
-    function f3(uint[] storage calldata x) internal { }
-    function f4(uint[] memory storage x) internal { }
-    function f5(uint[] memory memory x) internal { }
-    function f6(uint[] calldata storage x) internal { }
-    function f7(uint[] calldata memory x) internal { }
-    function f8(uint[] calldata calldata x) internal { }
-}
-// ----
-// ParserError 3548: (45-51): Location already specified.
-// ParserError 3548: (78-86): Location already specified.
-// ParserError 3548: (134-141): Location already specified.
-// ParserError 3548: (189-197): Location already specified.
-// ParserError 3548: (244-251): Location already specified.
-// ParserError 3548: (298-304): Location already specified.
-// ParserError 3548: (353-360): Location already specified.
-// ParserError 3548: (409-415): Location already specified.
-// ParserError 3548: (464-472): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
deleted file mode 100644
index 53d7c2771de1..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Foo {
-	uint[] memory x;
-}
-// ----
-// ParserError 2314: (23-29): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
deleted file mode 100644
index d53f247571f2..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-==== Source: A ====
-contract Foo {
-	uint[] memory storage calldata x;
-}
-==== Source: B ====
-contract Foo {
-	uint[] storage storage x;
-}
-// ----
-// ParserError 2314: (A:23-29): Expected identifier but got 'memory'
-// ParserError 2314: (B:23-30): Expected identifier but got 'storage'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol
deleted file mode 100644
index 19af8c2c7400..000000000000
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Foo {
-	function f() { var memory x; }
-}
-// ----
-// ParserError 6933: (31-34): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol b/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol
deleted file mode 100644
index fd00ac497960..000000000000
--- a/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	enum foo { WARNING,}
-}
-// ----
-// ParserError 1612: (33-34): Expected identifier after ','
diff --git a/test/libsolidity/syntaxTests/parsing/mapping.sol b/test/libsolidity/syntaxTests/parsing/mapping.sol
deleted file mode 100644
index dfb6283cc02a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address => bytes32) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_and_array_of_functions.sol b/test/libsolidity/syntaxTests/parsing/mapping_and_array_of_functions.sol
deleted file mode 100644
index 730261fb82a5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_and_array_of_functions.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    mapping (address => function() internal returns (uint)) a;
-    mapping (address => function() external) b;
-    mapping (address => function() external[]) c;
-    function() external[] d;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol b/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol
deleted file mode 100644
index e83761a0985d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    mapping(address payable => uint) m;
-}
-// ----
-// ParserError 2314: (33-40): Expected '=>' but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_in_struct.sol b/test/libsolidity/syntaxTests/parsing/mapping_in_struct.sol
deleted file mode 100644
index 7233355dcd2f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_in_struct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    struct test_struct {
-        address addr;
-        uint256 count;
-        mapping(bytes32 => test_struct) self_reference;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol
deleted file mode 100644
index b27befba1f77..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	mapping(uint[] => uint) data;
-}
-// ----
-// ParserError 2314: (26-27): Expected '=>' but got '['
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol
deleted file mode 100644
index 68aa61a416b3..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-	struct S {
-		uint x;
-	}
-	mapping(S => uint) data;
-}
-// ----
-// TypeError 7804: (47-48): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol
deleted file mode 100644
index 991f2b622eed..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-	struct S {
-		string s;
-	}
-	mapping(S => uint) data;
-}
-// ----
-// TypeError 7804: (49-50): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol
deleted file mode 100644
index 551d41b38b42..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	mapping(string[] => uint) data;
-}
-// ----
-// ParserError 2314: (28-29): Expected '=>' but got '['
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_to_mapping_in_struct.sol b/test/libsolidity/syntaxTests/parsing/mapping_to_mapping_in_struct.sol
deleted file mode 100644
index c906eeb0963e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_to_mapping_in_struct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    struct test_struct {
-        address addr;
-        mapping (uint64 => mapping (bytes32 => uint)) complex_mapping;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol
deleted file mode 100644
index 2cdcb419e8d9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address user => bytes32 ipfs) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol
deleted file mode 100644
index 63be7caeeeff..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address => bytes32 ipfs) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol
deleted file mode 100644
index c2458c3903cc..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address user => bytes32) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol
deleted file mode 100644
index e2e510acd46f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address spender => bytes32[] notes)) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol
deleted file mode 100644
index ed3b11075abb..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(address uint => bytes32 ipfs) names;
-}
-// ----
-// ParserError 2314: (36-40): Expected '=>' but got 'uint'
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol
deleted file mode 100644
index 548129d04d40..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address owner => bytes32[] note) notes;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol
deleted file mode 100644
index 881b285045cb..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address => mapping(address => address) hello) world;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol
deleted file mode 100644
index 551bad6766ca..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    address owner;
-    mapping(address owner => bytes32 ipfs) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol
deleted file mode 100644
index c8db83256515..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(address owner => address owner) owner;
-}
-// ----
-// DeclarationError 1809: (20-59): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol
deleted file mode 100644
index 172acceccd31..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address owner => address owner)) owner;
-}
-// ----
-// DeclarationError 1809: (45-84): Conflicting parameter name "owner" in mapping.
-// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
-// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol
deleted file mode 100644
index 4e4a8589248d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address owner => address hello)) world;
-}
-// ----
-// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol
deleted file mode 100644
index f2ea8315d6e5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address hello => address owner)) world;
-}
-// ----
-// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol
deleted file mode 100644
index 56b3de07c209..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(address hello => mapping(address owner => address owner)) world;
-}
-// ----
-// DeclarationError 1809: (45-84): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol
deleted file mode 100644
index aaf0d4ed9a74..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function _main(mapping(uint name1 => uint name2) storage map) internal {
-        map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol
deleted file mode 100644
index de3e146803fa..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function _main(mapping(uint name1 => uint) storage map) internal {
-        map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol
deleted file mode 100644
index d0edd59d9a83..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function _main(mapping(uint => uint name2) storage map) internal {
-        map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol
deleted file mode 100644
index 896a5fdce9f4..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function _main(mapping(uint name1 => mapping(uint name2 => uint name3) name4) storage map) internal {
-        map[1][2] = 3;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol
deleted file mode 100644
index 40f4a44be99d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function _main(mapping(uint name1 => uint[] name2) storage map) internal {
-        map[1].push(2);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol
deleted file mode 100644
index 660f69907c42..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function _main(mapping(uint nameSame => mapping(uint name2 => mapping(uint nameSame => uint name3) name4) name5) storage map) internal {
-        map[1][2][3] = 4;
-    }
-}
-// ----
-// DeclarationError 1809: (35-132): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol
deleted file mode 100644
index 5234e246b8d7..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function _main(mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) storage map) internal {
-        map[1][2][3] = 4;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol
deleted file mode 100644
index c59ab1f1e9b9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function(mapping(uint name1 => uint name2) storage) internal stateVariableName;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol
deleted file mode 100644
index ce5d6e2097ec..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function(mapping(uint name1 => uint) storage) internal stateVariableName;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol
deleted file mode 100644
index 8e4411338604..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function(mapping(uint => uint name2) storage) internal stateVariableName;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol
deleted file mode 100644
index 22922611aa0c..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function(mapping(uint name1 => mapping(uint name2 => uint name3) name4) storage) internal stateVariableName;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol
deleted file mode 100644
index 38b9c6b12305..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function(mapping(uint name1 => uint[] name2) storage) internal stateVariableName;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol
deleted file mode 100644
index daf9adc58590..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function(mapping(uint nameSame => mapping(uint name2 => mapping(uint nameSame => uint name3) name4) name5) storage) internal stateVariableName;
-}
-// ----
-// DeclarationError 1809: (29-126): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol
deleted file mode 100644
index 78e3a513b187..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function(mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) storage) internal stateVariableName;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol
deleted file mode 100644
index dad80d594dfd..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping(uint name1 => uint name2) map;
-
-    function main() external {
-        mapping(uint name3 => uint name4) storage _map = map;
-        _map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol
deleted file mode 100644
index ee61e084dd59..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping(uint name1 => uint) map;
-
-    function main() external {
-        mapping(uint => uint name4) storage _map = map;
-        _map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol
deleted file mode 100644
index 963ff82bf46b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping(uint => uint name2) map;
-
-    function main() external {
-        mapping(uint name3 => uint) storage _map = map;
-        _map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol
deleted file mode 100644
index e4ebf16a370e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping(uint name1 => mapping(uint name2 => uint name3) name4) map;
-
-    function main() external {
-        mapping(uint name5 => uint name6) storage _map = map[1];
-        _map[1] = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol
deleted file mode 100644
index 755827410565..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping(uint name1 => uint[] name4) map;
-
-    function main() external {
-        mapping(uint name5 => uint[] name6) storage _map = map;
-        _map[1].push(2);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol
deleted file mode 100644
index d1bda36fcb5c..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    mapping(uint name1 => mapping(uint name2 => uint name3) name4) map;
-
-    function main() external {
-        mapping(uint nameSame => mapping(uint name2 => uint nameSame) name4) storage _map = map;
-        _map[1][2] = 3;
-    }
-}
-// ----
-// DeclarationError 1809: (128-196): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol
deleted file mode 100644
index ccb44f860d13..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name3) name6) name4) map;
-
-    function main() external {
-        mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name3) name6) name4) storage _map = map;
-        _map[1][2][3] = 4;
-    }
-}
-// ----
-// DeclarationError 1809: (20-117): Conflicting parameter name "nameSame" in mapping.
-// DeclarationError 1809: (163-260): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol
deleted file mode 100644
index 08bb80c9e117..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) map;
-
-    function main() external {
-        mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) storage _map = map;
-        _map[1][2][3] = 4;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol
deleted file mode 100644
index b5b2bc55d82a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address spender => bytes32 note)) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol
deleted file mode 100644
index e65e3be2bf35..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address => mapping(address spender => bytes32 note)) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol
deleted file mode 100644
index c0a7472a243b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address => bytes32 note)) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol
deleted file mode 100644
index 011ab97fa65a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address spender => bytes32)) names;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol
deleted file mode 100644
index 30e37bfae879..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(address owner => mapping(address spender => bytes32 note));
-}
-// ----
-// ParserError 2314: (86-87): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol
deleted file mode 100644
index a31c8d4ca6f6..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name2) name3) name4) name5;
-}
-// ----
-// DeclarationError 1809: (20-117): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol
deleted file mode 100644
index 848f2b5e3943..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name3) name6) name4) public name5;
-}
-// ----
-// DeclarationError 1809: (20-117): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol
deleted file mode 100644
index a3d839a51aea..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) public name7;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol
deleted file mode 100644
index ce3d88813caf..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint phone => uint calls) friends;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol
deleted file mode 100644
index 69c733009f9f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint phone => uint) friends;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol
deleted file mode 100644
index ec078ab26e03..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint => uint calls) friends;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol
deleted file mode 100644
index d3ee618ac705..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint phone => mapping(uint call => uint time) callTimes) friends;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol
deleted file mode 100644
index ccc6d1a5539e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint phone => uint[] calls) friends;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol
deleted file mode 100644
index 8b65f281deed..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name2) name3) name4) name5;
-    }
-}
-// ----
-// DeclarationError 1809: (44-141): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol
deleted file mode 100644
index 08ce99da29bc..000000000000
--- a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    struct Person {
-        mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) name7;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol
deleted file mode 100644
index b193b3c42877..000000000000
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    bytes
-    [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ // 100*[
-    [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
-    [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [
-....
-// ----
-// ParserError 7319: (287-288): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol
deleted file mode 100644
index d57f24055d95..000000000000
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() {
-        {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ // 100*{
-        {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
-        {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
-        {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
-        {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
-        {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {
-....
-// ----
-// ParserError 7319: (693-694): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol
deleted file mode 100644
index d5dfa4af5150..000000000000
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() {
-        uint x = f
-        (((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((( // 100*(
-        ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
-        (((((((((((((((((((((((((((((((((((((( (
-....
-// ----
-// ParserError 7319: (325-326): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol
deleted file mode 100644
index dc9b3103422c..000000000000
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f() public pure {
-        uint ok = 0;
-        uint nok = 0;
-
-        (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-(
-        ( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (
-        (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-(
-        ( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (
-        (-( (-( (-( (-( (-( (-( (-( (-( (
-        ok++
-        )))))))))))))))))
-        ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
-        ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
-
-        ( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (
-        (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-(
-        ( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (
-        (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-( (-(
-        ( (-( (-( (-( (-( (-( (-( (-( (-( (
-        nok++
-        ))))))))))))))))))
-        ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
-        ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
-    }
-}
-// ----
-// ParserError 7319: (1305-1308): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol
deleted file mode 100644
index a54df516f30f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	function a(uint a, uint b, uint c) returns (uint r) { r = a * 100 + b * 10 + c * 1; }
-	function b() returns (uint r) { r = a({a: , b: , c: }); }
-}
-// ----
-// ParserError 6933: (146-147): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
deleted file mode 100644
index 799144cfb4c3..000000000000
--- a/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	function a(uint a, uint b, uint c) returns (uint r) { r = a * 100 + b * 10 + c * 1; }
-	function b() returns (uint r) { r = a({: 1, : 2, : 3}); }
-}
-// ----
-// ParserError 2314: (143-144): Expected identifier but got ':'
diff --git a/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol b/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
deleted file mode 100644
index cd4025405e3b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    uint256 ;
-}
-// ----
-// ParserError 2314: (28-29): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/modifier.sol b/test/libsolidity/syntaxTests/parsing/modifier.sol
deleted file mode 100644
index 8cb9529133a7..000000000000
--- a/test/libsolidity/syntaxTests/parsing/modifier.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    modifier mod { if (msg.sender == 0x0000000000000000000000000000000000000000) _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/modifier_arguments.sol b/test/libsolidity/syntaxTests/parsing/modifier_arguments.sol
deleted file mode 100644
index 7b3058d6b4c2..000000000000
--- a/test/libsolidity/syntaxTests/parsing/modifier_arguments.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    modifier mod(address a) { if (msg.sender == a) _; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/modifier_invocation.sol b/test/libsolidity/syntaxTests/parsing/modifier_invocation.sol
deleted file mode 100644
index dfd7cfdf3163..000000000000
--- a/test/libsolidity/syntaxTests/parsing/modifier_invocation.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    modifier mod1(uint a) { if (msg.sender == address(uint160(a))) _; }
-    modifier mod2 { if (msg.sender == address(2)) _; }
-    function f() public mod1(7) mod2 { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol b/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol
deleted file mode 100644
index 6b3a1de56251..000000000000
--- a/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-	modifier mod { if (msg.sender == 0) _ }
-}
-// ----
-// ParserError 2314: (52-53): Expected ';' but got '}'
diff --git a/test/libsolidity/syntaxTests/parsing/multi_arrays.sol b/test/libsolidity/syntaxTests/parsing/multi_arrays.sol
deleted file mode 100644
index 5c2595281c51..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multi_arrays.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    mapping(uint => mapping(uint => int8)[8][][9])[] x;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/multi_variable_declarations.sol b/test/libsolidity/syntaxTests/parsing/multi_variable_declarations.sol
deleted file mode 100644
index 56c2e28012dd..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multi_variable_declarations.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-	function f() pure public {
-		(uint a, uint b, uint c) = g();
-		(uint d) = 2;
-		(, uint e) = (3,4);
-		(uint h,) = (4,5);
-		(uint x,,) = g();
-		(, uint y,) = g();
-        a; b; c; d; e; h; x; y;
-	}
-	function g() pure public returns (uint, uint, uint) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol
deleted file mode 100644
index a1d4872bee96..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    event Test(uint a, uint b,);
-    function(uint a) {}
-}
-// ----
-// ParserError 7591: (45-46): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol
deleted file mode 100644
index ae73c79542b1..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	function(uint a, uint b,) {}
-}
-// ----
-// ParserError 7591: (40-41): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_functions_natspec_documentation.sol b/test/libsolidity/syntaxTests/parsing/multiple_functions_natspec_documentation.sol
deleted file mode 100644
index ba090c533ea3..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_functions_natspec_documentation.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract test {
-    uint256 stateVar;
-    /// This is test function 1
-    function functionName1(bytes32 input) public returns (bytes32 out) {}
-    /// This is test function 2
-    function functionName2(bytes32 input) public returns (bytes32 out) {}
-    // nothing to see here
-    function functionName3(bytes32 input) public returns (bytes32 out) {}
-    /// This is test function 4
-    function functionName4(bytes32 input) public returns (bytes32 out) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol
deleted file mode 100644
index 7f6dcbd9380e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    modifier modTest(uint a, uint b,) { _; }
-    function(uint a) {}
-}
-// ----
-// ParserError 7591: (51-52): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol b/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol
deleted file mode 100644
index 8dbe4ac67eea..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    modifier f() override override {}
-}
-// ----
-// ParserError 9102: (39-47): Override already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol
deleted file mode 100644
index 50579054c82a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    uint constant constant a;
-    uint immutable immutable b;
-    uint constant immutable c;
-    uint immutable constant d;
-}
-// ----
-// ParserError 3109: (31-39): Mutability already set to "constant"
-// ParserError 3109: (62-71): Mutability already set to "immutable"
-// ParserError 3109: (93-102): Mutability already set to "constant"
-// ParserError 3109: (125-133): Mutability already set to "immutable"
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol
deleted file mode 100644
index 001993f21cb4..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function() returns (uint a, uint b,) {}
-}
-// ----
-// ParserError 7591: (54-55): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol
deleted file mode 100644
index e9c4401054bb..000000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol
+++ /dev/null
@@ -1,103 +0,0 @@
-==== Source: A ====
-contract c1 {
-    function f() payable payable {}
-}
-contract c2 {
-    function f() view view {}
-}
-contract c3 {
-    function f() pure pure {}
-}
-contract c4 {
-    function f() pure view {}
-}
-contract c5 {
-    function f() payable view {}
-}
-contract c6 {
-    function f() pure payable {}
-}
-contract c7 {
-    function f() view payable {}
-}
-contract c8 {
-    function f() payable pure {}
-}
-contract c9 {
-    function f() view pure {}
-}
-==== Source: B ====
-contract c {
-    address payable payable v;
-}
-==== Source: C ====
-contract c {
-    function fn(address payable payable) public { }
-}
-==== Source: D ====
-contract c {
-    function fn() public returns (address payable payable) { }
-}
-==== Source: E ====
-contract c {
-    function fn() public {
-        address payable payable v;
-    }
-}
-==== Source: F ====
-contract c {
-    function fn(address payable payable v) public { }
-}
-==== Source: G ====
-contract c {
-    function fn() public returns (address payable payable res) { }
-}
-==== Source: H ====
-address payable payable v;
-==== Source: I ====
-contract c {
-    modifier m(address payable payable x)  { _; }
-}
-==== Source: J ====
-contract c {
-    event e(address payable payable x);
-}
-==== Source: K ====
-contract c {
-    error e1(address payable payable x);
-}
-==== Source: L ====
-contract c {
-    function f() public returns (address payable) {
-        try this.f() returns (address payable payable) { } catch { }
-    }
-}
-==== Source: M ====
-contract c {
-    function f() public returns (address payable) {
-        try this.f() returns (address payable) { } catch Error(address payable payable) { }
-    }
-}
-// ----
-// ParserError 9680: (A:39-46): State mutability already specified as "payable".
-// ParserError 9680: (A:88-92): State mutability already specified as "view".
-// ParserError 9680: (A:134-138): State mutability already specified as "pure".
-// ParserError 9680: (A:180-184): State mutability already specified as "pure".
-// ParserError 9680: (A:229-233): State mutability already specified as "payable".
-// ParserError 9680: (A:275-282): State mutability already specified as "pure".
-// ParserError 9680: (A:324-331): State mutability already specified as "view".
-// ParserError 9680: (A:376-380): State mutability already specified as "payable".
-// ParserError 9680: (A:422-426): State mutability already specified as "view".
-// ParserError 2314: (B:33-40): Expected identifier but got 'payable'
-// ParserError 2314: (C:45-52): Expected ',' but got 'payable'
-// ParserError 2314: (D:63-70): Expected ',' but got 'payable'
-// ParserError 2314: (E:64-71): Expected identifier but got 'payable'
-// ParserError 2314: (F:45-52): Expected ',' but got 'payable'
-// ParserError 2314: (G:63-70): Expected ',' but got 'payable'
-// ParserError 2314: (H:16-23): Expected identifier but got 'payable'
-// ParserError 2314: (I:44-51): Expected ',' but got 'payable'
-// ParserError 2314: (J:41-48): Expected ',' but got 'payable'
-// ParserError 2314: (K:42-49): Expected ',' but got 'payable'
-// ParserError 2314: (L:111-118): Expected ',' but got 'payable'
-// ParserError 2314: (M:144-151): Expected ',' but got 'payable'
-
diff --git a/test/libsolidity/syntaxTests/parsing/new_address_payable.sol b/test/libsolidity/syntaxTests/parsing/new_address_payable.sol
deleted file mode 100644
index 715201fd554f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/new_address_payable.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns(address payable[] memory m) {
-        m = new address payable[](10);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol b/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol
deleted file mode 100644
index fb3855c885cd..000000000000
--- a/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function f() {
-		new var;
-	}
-}
-// ----
-// ParserError 3546: (35-38): Expected type name
diff --git a/test/libsolidity/syntaxTests/parsing/no_function_params.sol b/test/libsolidity/syntaxTests/parsing/no_function_params.sol
deleted file mode 100644
index 1f7c85a3d33f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/no_function_params.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	uint256 stateVar;
-	function functionName() public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/overloaded_functions.sol b/test/libsolidity/syntaxTests/parsing/overloaded_functions.sol
deleted file mode 100644
index a3359f8bb239..000000000000
--- a/test/libsolidity/syntaxTests/parsing/overloaded_functions.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	function fun(uint a) public returns(uint r) { return a; }
-	function fun(uint a, uint b) public returns(uint r) { return a + b; }
-}
-// ----
-// Warning 2018: (17-74): Function state mutability can be restricted to pure
-// Warning 2018: (76-145): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol b/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol
deleted file mode 100644
index 0e9dd7c3c070..000000000000
--- a/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function f() public pure {
-		address payable q = payable;
-	}
-}
-// ----
-// ParserError 2314: (70-71): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol b/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol
deleted file mode 100644
index 5b16ad02ce74..000000000000
--- a/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract c {
-    function fun() public returns (uint r) {
-        uint _ = 8;
-        return _ + 1;
-    }
-}
-// ----
-// DeclarationError 3726: (66-72): The name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol b/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol
deleted file mode 100644
index f9c714080fdf..000000000000
--- a/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma ``;
-// ----
-// ParserError 6281: (7-8): Token incompatible with Solidity parser as part of pragma directive.
-// ParserError 6281: (8-9): Token incompatible with Solidity parser as part of pragma directive.
diff --git a/test/libsolidity/syntaxTests/parsing/scientific_notation.sol b/test/libsolidity/syntaxTests/parsing/scientific_notation.sol
deleted file mode 100644
index 16502b3db30f..000000000000
--- a/test/libsolidity/syntaxTests/parsing/scientific_notation.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-	uint256 a = 2e10;
-	uint256 b = 2E10;
-	uint256 c = 200e-2;
-	uint256 d = 2E10 wei;
-	uint256 e = 2.5e10;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol
deleted file mode 100644
index 8169b78c3e43..000000000000
--- a/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	event Test(uint a,);
-	function(uint a) {}
-}
-// ----
-// ParserError 7591: (34-35): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/single_function_param.sol b/test/libsolidity/syntaxTests/parsing/single_function_param.sol
deleted file mode 100644
index 8dbac272836c..000000000000
--- a/test/libsolidity/syntaxTests/parsing/single_function_param.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	uint256 stateVar;
-	function functionName(bytes32 input) public returns (bytes32 out) {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol
deleted file mode 100644
index 20bfc5cb9495..000000000000
--- a/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	function(uint a,) {}
-}
-// ----
-// ParserError 7591: (32-33): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol
deleted file mode 100644
index f88cf1ae8317..000000000000
--- a/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	modifier modTest(uint a,) { _; }
-	function(uint a) {}
-}
-// ----
-// ParserError 7591: (40-41): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol
deleted file mode 100644
index d199981a41de..000000000000
--- a/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	function() returns (uint a,) {}
-}
-// ----
-// ParserError 7591: (43-44): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/smoke_test.sol b/test/libsolidity/syntaxTests/parsing/smoke_test.sol
deleted file mode 100644
index d328b1675167..000000000000
--- a/test/libsolidity/syntaxTests/parsing/smoke_test.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    uint256 stateVariable1;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/struct_definition.sol b/test/libsolidity/syntaxTests/parsing/struct_definition.sol
deleted file mode 100644
index f4424e9e8b98..000000000000
--- a/test/libsolidity/syntaxTests/parsing/struct_definition.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    uint256 stateVar;
-    struct MyStructName {
-        address addr;
-        uint256 count;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol
deleted file mode 100644
index f791509c9037..000000000000
--- a/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	function a(uint a, uint b, uint c) returns (uint r) { r = a * 100 + b * 10 + c * 1; }
-	function b() returns (uint r) { r = a({a: 1, b: 2, c: 3, }); }
-}
-// ----
-// ParserError 2074: (159-160): Unexpected trailing comma.
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol b/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol
deleted file mode 100644
index fd7b833597c5..000000000000
--- a/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	uint256 a = 2.2e10;
-	uint256 b = .5E10;
-	uint256 c = 4.e-2;
-}
-// ----
-// TypeError 9582: (70-73): Member "e" not found or not visible after argument-dependent lookup in int_const 4.
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol b/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol
deleted file mode 100644
index 7e4d6cb37dfe..000000000000
--- a/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	uint256 a = 2.2e10;
-	uint256 b = .5E10;
-	uint256 c = 2 + 2.;
-}
-// ----
-// ParserError 2314: (76-77): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_dot3.sol b/test/libsolidity/syntaxTests/parsing/trailing_dot3.sol
deleted file mode 100644
index de2ea55eae8d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/trailing_dot3.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-	uint a = 2.
-// ----
-// ParserError 2314: (29-29): Expected identifier but got end of source
diff --git a/test/libsolidity/syntaxTests/parsing/tuples.sol b/test/libsolidity/syntaxTests/parsing/tuples.sol
deleted file mode 100644
index 875556e9fdbb..000000000000
--- a/test/libsolidity/syntaxTests/parsing/tuples.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure {
-		uint a = (1);
-		(uint b,) = (1,2);
-		(uint c, uint d) = (1, 2 + a);
-		(uint e,) = (1, b);
-		(a) = 3;
-		a;b;c;d;e;
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol b/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol
deleted file mode 100644
index 4d2919211d8b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        (uint a, uint b, uint c);
-    }
-}
-// ----
-// ParserError 2314: (76-77): Expected '=' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol b/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol
deleted file mode 100644
index 45c529a7770e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	function f() {
-		uint a = (2 2);
-	}
-}
-// ----
-// ParserError 2314: (43-44): Expected ',' but got 'Number'
diff --git a/test/libsolidity/syntaxTests/parsing/two_exact_functions.sol b/test/libsolidity/syntaxTests/parsing/two_exact_functions.sol
deleted file mode 100644
index 82171ce0b66d..000000000000
--- a/test/libsolidity/syntaxTests/parsing/two_exact_functions.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// with support of overloaded functions, during parsing,
-// we can't determine whether they match exactly, however
-// it will throw DeclarationError in following stage.
-contract test {
-    function fun(uint a) public returns(uint r) { return a; }
-    function fun(uint a) public returns(uint r) { return a; }
-}
-// ----
-// DeclarationError 1686: (189-246): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
deleted file mode 100644
index 527c9450b121..000000000000
--- a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f(uint x) pure public {
-        uint y = +x;
-        y;
-    }
-}
-// ----
-// ParserError 9636: (70-71): Use of unary + is disallowed.
diff --git a/test/libsolidity/syntaxTests/parsing/user_defined_value_type.sol b/test/libsolidity/syntaxTests/parsing/user_defined_value_type.sol
deleted file mode 100644
index e4bd137a3074..000000000000
--- a/test/libsolidity/syntaxTests/parsing/user_defined_value_type.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-type MyInt is uint;
-
-contract C {
-    type MyAddress is address;
-}
diff --git a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol b/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol
deleted file mode 100644
index dc1208bfd88b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type(MyInt) is uint256;
-// ----
-// ParserError 2314: (4-5): Expected identifier but got '('
diff --git a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol b/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol
deleted file mode 100644
index 6e31db22665a..000000000000
--- a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-function f() {
-    type(uint).max;
-    type MyInt is int;
-}
-// ----
-// ParserError 2314: (44-49): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/parsing/var_array.sol b/test/libsolidity/syntaxTests/parsing/var_array.sol
deleted file mode 100644
index 160b073a489b..000000000000
--- a/test/libsolidity/syntaxTests/parsing/var_array.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Foo {
-	function f() { var[] a; }
-}
-// ----
-// ParserError 6933: (31-34): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/parsing/var_storage_var.sol b/test/libsolidity/syntaxTests/parsing/var_storage_var.sol
deleted file mode 100644
index 5cbbd4599473..000000000000
--- a/test/libsolidity/syntaxTests/parsing/var_storage_var.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    var a;
-}
-// ----
-// ParserError 9182: (17-20): Function, variable, struct or modifier declaration expected.
diff --git a/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol b/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol
deleted file mode 100644
index bd5165b89f7e..000000000000
--- a/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	function fun() {
-		mapping(var=>bytes32) d;
-	}
-}
-// ----
-// ParserError 1005: (44-47): Expected elementary type name or identifier for mapping key type
diff --git a/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol b/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol
deleted file mode 100644
index 3ecadd381ea9..000000000000
--- a/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract c {
-    uint private a;
-    uint internal b;
-    uint public c;
-    uint d;
-    function f() public {}
-    function f_priv() private {}
-    function f_internal() internal {}
-}
-// ----
-// Warning 2519: (58-71): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/parsing/while_loop.sol b/test/libsolidity/syntaxTests/parsing/while_loop.sol
deleted file mode 100644
index 2f1477f83c74..000000000000
--- a/test/libsolidity/syntaxTests/parsing/while_loop.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function fun() public pure {
-        uint256 x;
-        while (true) { x = 1; break; continue; } x = 9;
-    }
-}
-// ----
-// Warning 5740: (105-113): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol
deleted file mode 100644
index ea05513de189..000000000000
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity ^99.99.0;
-// ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol
deleted file mode 100644
index 6e97cd06c2ad..000000000000
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma solidity ^99.99.0;
-this is surely invalid
-// ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol
deleted file mode 100644
index 06d7c4dda806..000000000000
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma solidity ^99.99.0;
-contract C {
-    uint ;
-}
-// ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol
deleted file mode 100644
index 0d052123e876..000000000000
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma solidity ^99.99.0;
-contract C {
-    function f() {}
-}
-// ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/pragma/blank_space_version.sol b/test/libsolidity/syntaxTests/pragma/blank_space_version.sol
deleted file mode 100644
index d4c6eadcf416..000000000000
--- a/test/libsolidity/syntaxTests/pragma/blank_space_version.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity ;
-// ----
-// ParserError 1684: (0-17): Invalid version pragma. Empty version pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_1.sol b/test/libsolidity/syntaxTests/pragma/broken_version_1.sol
deleted file mode 100644
index 7b23fdfb523d..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_1.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity ^0^1;
-// ----
-// ParserError 5333: (0-21): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_2.sol b/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
deleted file mode 100644
index 67c37fe64700..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity pragma;
-// ----
-// ParserError 1684: (0-23): Invalid version pragma. Expected the start of a version number but instead found character 'p'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_3.sol b/test/libsolidity/syntaxTests/pragma/broken_version_3.sol
deleted file mode 100644
index fd8a0f1a7daf..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_3.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma solidity #8.0.0;
-// ----
-// ParserError 6281: (16-17): Token incompatible with Solidity parser as part of pragma directive.
-// ParserError 5333: (0-23): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_4.sol b/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
deleted file mode 100644
index ab9faa173e6e..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity (8.0.0);
-// ----
-// ParserError 1684: (0-24): Invalid version pragma. Expected the start of a version number but instead found character '('. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_5.sol b/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
deleted file mode 100644
index d858fdfa5230..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity 88_;
-// ----
-// ParserError 1684: (0-20): Invalid version pragma. Expected the start of a version number but instead found character '_'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_6.sol b/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
deleted file mode 100644
index ee47523a312f..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity v1.2.3;
-// ----
-// ParserError 1684: (0-23): Invalid version pragma. Expected the start of a version number but instead found character 'v'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_7.sol b/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
deleted file mode 100644
index 88fad9c99984..000000000000
--- a/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity >0.5.0<;
-// ----
-// ParserError 1684: (0-24): Invalid version pragma. Expected version number but reached end of pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/empty_version.sol b/test/libsolidity/syntaxTests/pragma/empty_version.sol
deleted file mode 100644
index b304283863b1..000000000000
--- a/test/libsolidity/syntaxTests/pragma/empty_version.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity;
-// ----
-// ParserError 1684: (0-16): Invalid version pragma. Empty version pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol b/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol
deleted file mode 100644
index 963ef5884b21..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental "";
-// ----
-// SyntaxError 3250: (0-23): Empty experimental feature name is invalid.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol b/test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol
deleted file mode 100644
index 49fe597ec350..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma experimental experimental __test;
-// ----
-// SyntaxError 6022: (0-40): Stray arguments.
-
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_multiple_same_line.sol b/test/libsolidity/syntaxTests/pragma/experimental_multiple_same_line.sol
deleted file mode 100644
index f88c0e0d8476..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_multiple_same_line.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental unsupportedName unsupportedName;
-// ----
-// SyntaxError 6022: (0-52): Stray arguments.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol b/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol
deleted file mode 100644
index 042b5464ce96..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma experimental __test;
-pragma experimental __test;
-// ----
-// Warning 2264: (0-27): Experimental features are turned on. Do not use experimental features on live deployments.
-// SyntaxError 1231: (28-55): Duplicate experimental feature name.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol b/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol
deleted file mode 100644
index d45e7e6afe4b..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental;
-// ----
-// SyntaxError 9679: (0-20): Experimental feature name is missing.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_pragma_unknown_string_literal.sol b/test/libsolidity/syntaxTests/pragma/experimental_pragma_unknown_string_literal.sol
deleted file mode 100644
index 76be60ce8a67..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_pragma_unknown_string_literal.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental unsupportedName;
-// ----
-// SyntaxError 8491: (0-36): Unsupported experimental feature name.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
deleted file mode 100644
index 285c76ed3030..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma experimental solidity;
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
deleted file mode 100644
index fe4125e84303..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-==== Source: A.sol ====
-contract A {}
-==== Source: B.sol ====
-pragma experimental solidity;
-import "A.sol";
-contract B {
-    A a;
-}
-==== Source: C.sol ====
-pragma experimental solidity;
-import "A.sol";
-contract C {
-    A a;
-}
-==== Source: D.sol ====
-pragma experimental solidity;
-import "A.sol";
-contract D {
-    A a;
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// ParserError 2141: (B.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
-// ParserError 2141: (C.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
-// ParserError 2141: (D.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
deleted file mode 100644
index d6741b0d3a99..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {}
-
-pragma experimental solidity;
-// ====
-// EVMVersion: >=constantinople
-// ----
-// ParserError 8185: (45-45): Experimental pragma "solidity" can only be set at the beginning of the source unit.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
deleted file mode 100644
index 940bd3fbb369..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-function f() pure returns (uint)
-{
-    return 1;
-}
-
-pragma experimental solidity;
-
-struct A
-{
-    uint256 x;
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// ParserError 8185: (83-89): Experimental pragma "solidity" can only be set at the beginning of the source unit.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol
deleted file mode 100644
index 3e070535b03d..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma experimental solidity;
-
-contract C {}
-
-// ====
-// EVMVersion: <constantinople
-// ----
-// ParserError 7637: (31-39): Experimental solidity requires Constantinople EVM version at the minimum.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol b/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol
deleted file mode 100644
index 31f46fbb8f4c..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental __test;
-// ----
-// Warning 2264: (0-27): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol b/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol
deleted file mode 100644
index f8e8267a0d78..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental 123;
-// ----
-// SyntaxError 8491: (0-24): Unsupported experimental feature name.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_unknown_quoted_string_literal.sol b/test/libsolidity/syntaxTests/pragma/experimental_unknown_quoted_string_literal.sol
deleted file mode 100644
index a08a0489b208..000000000000
--- a/test/libsolidity/syntaxTests/pragma/experimental_unknown_quoted_string_literal.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental "unsupportedName";
-// ----
-// SyntaxError 8491: (0-38): Unsupported experimental feature name.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol b/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol
deleted file mode 100644
index 950492dd6a7a..000000000000
--- a/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma 0;
-// ----
-// SyntaxError 5226: (0-9): Invalid pragma "0"
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol
deleted file mode 100644
index 235549c4c9ef..000000000000
--- a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity 0.4.1 - 0.6.2 0.8.17;
-// ----
-// ParserError 1684: (0-37): Invalid version pragma. You can only combine version ranges using the || operator.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol
deleted file mode 100644
index 00c6aff60a4e..000000000000
--- a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity 0.8.17 0.4.1 - 0.6.2;
-// ----
-// ParserError 1684: (0-37): Invalid version pragma. Expected the start of a version number but instead found character '-'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol
deleted file mode 100644
index a5cb07a1880f..000000000000
--- a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity 0.4.0 - 0.4.1 0.4.1 - 0.6.2;
-// ----
-// ParserError 1684: (0-44): Invalid version pragma. You can only combine version ranges using the || operator.
diff --git a/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol b/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol
deleted file mode 100644
index 8c263965e61a..000000000000
--- a/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma thisdoesntexist;
-// ----
-// SyntaxError 4936: (0-23): Unknown pragma "thisdoesntexist"
diff --git a/test/libsolidity/syntaxTests/pragma/unterminated_pragma.sol b/test/libsolidity/syntaxTests/pragma/unterminated_pragma.sol
deleted file mode 100644
index 8c7337bb57df..000000000000
--- a/test/libsolidity/syntaxTests/pragma/unterminated_pragma.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity 0.4.3
-// ----
-// ParserError 2314: (22-22): Expected ';' but got end of source
diff --git a/test/libsolidity/syntaxTests/pragma/unterminated_version.sol b/test/libsolidity/syntaxTests/pragma/unterminated_version.sol
deleted file mode 100644
index 2515a9679f34..000000000000
--- a/test/libsolidity/syntaxTests/pragma/unterminated_version.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma solidity 0.4.3
-pragma abicoder v2;
-// ----
-// ParserError 1684: (0-41): Invalid version pragma. Expected the start of a version number but instead found character 'p'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol b/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol
deleted file mode 100644
index f318ec6f9f37..000000000000
--- a/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-pragma solidity 0.8.17 || 0.4.1 - 0.9.0;
-// ----
diff --git a/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol b/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol
deleted file mode 100644
index 6bf3a243e896..000000000000
--- a/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-pragma solidity 0.4.0 - 0.9.0 || 0.4.1 - 0.6.2;
-// ----
diff --git a/test/libsolidity/syntaxTests/pragma/version_check.sol b/test/libsolidity/syntaxTests/pragma/version_check.sol
deleted file mode 100644
index fa245cbb8dd1..000000000000
--- a/test/libsolidity/syntaxTests/pragma/version_check.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity < 142857;
-pragma solidity >= 0.0;
-pragma solidity >= 0.0.0;
-
-contract C {
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/pragma/version_number_too_large.sol b/test/libsolidity/syntaxTests/pragma/version_number_too_large.sol
deleted file mode 100644
index bde5a9aaef7b..000000000000
--- a/test/libsolidity/syntaxTests/pragma/version_number_too_large.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity 4294967296;
-// ----
-// ParserError 1684: (0-27): Invalid version pragma. Integer too large to be used in a version number.
diff --git a/test/libsolidity/syntaxTests/pragma/version_range.sol b/test/libsolidity/syntaxTests/pragma/version_range.sol
deleted file mode 100644
index 4d6cdf6b9cb6..000000000000
--- a/test/libsolidity/syntaxTests/pragma/version_range.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-pragma solidity >=0.4.0 <0.9.0;
-// ----
diff --git a/test/libsolidity/syntaxTests/receiveEther/arguments.sol b/test/libsolidity/syntaxTests/receiveEther/arguments.sol
deleted file mode 100644
index e05ed43a46cd..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/arguments.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    receive(uint256) external payable {}
-}
-// ----
-// DeclarationError 6857: (24-33): Receive ether function cannot take parameters.
diff --git a/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol b/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol
deleted file mode 100644
index 1db63cbdce71..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    // Check that visibility is also enforced for the receive ether function.
-    receive() {}
-}
-// ----
-// SyntaxError 4937: (95-107): No visibility specified. Did you intend to add "external"?
-// DeclarationError 7793: (95-107): Receive ether function must be payable, but is "nonpayable".
-// DeclarationError 4095: (95-107): Receive ether function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol b/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol
deleted file mode 100644
index 20e0dbdf2682..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    receive() external payable { msg.data; }
-}
-// ----
-// TypeError 7139: (46-54): "msg.data" cannot be used inside of "receive" function.
diff --git a/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol b/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol
deleted file mode 100644
index b3c000234908..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function() external payable {}
-}
-// ----
-// ParserError 2915: (45-46): Expected a state variable declaration. If you intended this as a fallback function or a function to handle plain ether transactions, use the "fallback" keyword or the "receive" keyword instead.
diff --git a/test/libsolidity/syntaxTests/receiveEther/pure_modifier.sol b/test/libsolidity/syntaxTests/receiveEther/pure_modifier.sol
deleted file mode 100644
index 0258e2f68a4b..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/pure_modifier.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    receive() external pure { x = 2; }
-}
-// ----
-// DeclarationError 7793: (29-63): Receive ether function must be payable, but is "pure".
diff --git a/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol b/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol
deleted file mode 100644
index 03372b73b558..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function receive() external pure {}
-}
-// ----
-// Warning 3445: (26-33): This function is named "receive" but is not the receive function of the contract. If you intend this to be a receive function, use "receive(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/receiveEther/return_value.sol b/test/libsolidity/syntaxTests/receiveEther/return_value.sol
deleted file mode 100644
index 8d4c58872497..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/return_value.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    receive() external returns (uint256) {}
-}
-// ----
-// DeclarationError 7793: (17-56): Receive ether function must be payable, but is "nonpayable".
-// DeclarationError 6899: (44-53): Receive ether function cannot return values.
diff --git a/test/libsolidity/syntaxTests/receiveEther/view_modifier.sol b/test/libsolidity/syntaxTests/receiveEther/view_modifier.sol
deleted file mode 100644
index 02624e1f5ff4..000000000000
--- a/test/libsolidity/syntaxTests/receiveEther/view_modifier.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    receive() external view { x = 2; }
-}
-// ----
-// DeclarationError 7793: (29-63): Receive ether function must be payable, but is "view".
diff --git a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol
deleted file mode 100644
index 34ceafa74829..000000000000
--- a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-    function f() public pure returns (uint)
-    {
-        return;
-    }
-    function g() public pure returns (uint)
-    {
-        return (1, 2);
-    }
-}
-// ----
-// TypeError 6777: (71-78): Return arguments required.
-// TypeError 5132: (143-156): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol
deleted file mode 100644
index d7d44778d928..000000000000
--- a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C
-{
-    function f() public pure returns (uint a)
-    {
-        return;
-    }
-    function g() public pure returns (uint a)
-    {
-        return (1, 2);
-    }
-}
-// ----
-// TypeError 6777: (73-80): Return arguments required.
-// TypeError 5132: (147-160): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol
deleted file mode 100644
index 6cc56dc0000f..000000000000
--- a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-    function g() public pure returns (uint)
-    {
-        return "string";
-    }
-}
-// ----
-// TypeError 6359: (78-86): Return argument type literal_string "string" is not implicitly convertible to expected type (type of first return variable) uint256.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol b/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol
deleted file mode 100644
index 918ff29bfaaf..000000000000
--- a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-    function f() public pure returns (uint, uint)
-    {
-        return 1;
-    }
-    function g() public pure returns (uint, uint)
-    {
-        return (1, 2, 3);
-    }
-    function h() public pure returns (uint, uint)
-    {
-        return;
-    }
-}
-// ----
-// TypeError 8863: (77-85): Different number of arguments in return statement than in returns declaration.
-// TypeError 5132: (157-173): Different number of arguments in return statement than in returns declaration.
-// TypeError 6777: (245-252): Return arguments required.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol b/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol
deleted file mode 100644
index 9fce879ae0c4..000000000000
--- a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-    function f() public pure returns (uint a, uint b)
-    {
-        return 1;
-    }
-    function g() public pure returns (uint a, uint b)
-    {
-        return (1, 2, 3);
-    }
-    function h() public pure returns (uint a, uint b)
-    {
-        return;
-    }
-}
-// ----
-// TypeError 8863: (81-89): Different number of arguments in return statement than in returns declaration.
-// TypeError 5132: (165-181): Different number of arguments in return statement than in returns declaration.
-// TypeError 6777: (257-264): Return arguments required.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/valid_returns.sol b/test/libsolidity/syntaxTests/returnExpressions/valid_returns.sol
deleted file mode 100644
index a04456161a0f..000000000000
--- a/test/libsolidity/syntaxTests/returnExpressions/valid_returns.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-    function f() public pure {
-        return;
-    }
-    function g() public pure returns (uint) {
-        return 1;
-    }
-    function h() public pure returns (uint a) {
-        return 1;
-    }
-    function i() public pure returns (uint, uint) {
-        return (1, 2);
-    }
-    function j() public pure returns (uint a, uint b) {
-        return (1, 2);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol b/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol
deleted file mode 100644
index b2d53bd8bc71..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-revert X();
-// ----
-// ParserError 2314: (8-9): Expected ';' but got '('
diff --git a/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol b/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
deleted file mode 100644
index 208a7326be14..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error E();
-function f() pure {
-    E();
-}
-// ----
-// TypeError 7757: (35-38): Errors can only be used with revert statements: "revert MyError();".
diff --git a/test/libsolidity/syntaxTests/revertStatement/in_global_function.sol b/test/libsolidity/syntaxTests/revertStatement/in_global_function.sol
deleted file mode 100644
index c7c526148c12..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/in_global_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-error E();
-function f() pure {
-    revert E();
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/revertStatement/non_called.sol b/test/libsolidity/syntaxTests/revertStatement/non_called.sol
deleted file mode 100644
index 63ecfbc6e01e..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/non_called.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-error E();
-function f() public pure {
-    revert E;
-}
-// ----
-// ParserError 2314: (50-51): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/revertStatement/non_error.sol b/test/libsolidity/syntaxTests/revertStatement/non_error.sol
deleted file mode 100644
index 329b68f938ea..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/non_error.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function f() public pure {
-    revert 1;
-}
-// ----
-// ParserError 2314: (38-39): Expected ';' but got 'Number'
diff --git a/test/libsolidity/syntaxTests/revertStatement/regular.sol b/test/libsolidity/syntaxTests/revertStatement/regular.sol
deleted file mode 100644
index 5a5d2d90dd5e..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/regular.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-error E();
-contract C {
-    function f() public pure {
-        revert E();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/revertStatement/revert_event.sol b/test/libsolidity/syntaxTests/revertStatement/revert_event.sol
deleted file mode 100644
index 6b2832c876ff..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/revert_event.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    event E();
-    function f() public pure {
-        revert E();
-    }
-}
-// ----
-// TypeError 1885: (74-75): Expression has to be an error.
diff --git a/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol b/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol
deleted file mode 100644
index f3b1e080551d..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error revert();
-contract C {
-    function f() public pure {
-        revert revert();
-    }
-}
-// ----
-// Warning 2319: (0-15): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/revertStatement/scoped.sol b/test/libsolidity/syntaxTests/revertStatement/scoped.sol
deleted file mode 100644
index 87db0360eea9..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/scoped.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-    error E();
-}
-contract C {
-    function f() public pure {
-        revert A.E();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/revertStatement/using_function.sol b/test/libsolidity/syntaxTests/revertStatement/using_function.sol
deleted file mode 100644
index e10384cd75b4..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/using_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-error f(uint, uint);
-contract C {
-    function f(uint) public {
-        revert f(10);
-    }
-}
-// ----
-// Warning 2519: (38-91): This declaration shadows an existing declaration.
-// TypeError 1885: (79-80): Expression has to be an error.
diff --git a/test/libsolidity/syntaxTests/revertStatement/using_struct.sol b/test/libsolidity/syntaxTests/revertStatement/using_struct.sol
deleted file mode 100644
index f04b0d598af6..000000000000
--- a/test/libsolidity/syntaxTests/revertStatement/using_struct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-struct S { uint x; }
-contract C {
-    function f() public {
-        revert S(10);
-    }
-}
-// ----
-// TypeError 1885: (75-76): Expression has to be an error.
diff --git a/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol b/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol
deleted file mode 100644
index 12454b740127..000000000000
--- a/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        uint[] memory x = x[0];
-    }
-}
-// ----
-// DeclarationError 7576: (70-71): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol b/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol
deleted file mode 100644
index 152ee038e96f..000000000000
--- a/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    struct S { uint y; }
-    function f() public pure {
-        S memory x = x.y;
-    }
-}
-// ----
-// DeclarationError 7576: (90-91): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol b/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
deleted file mode 100644
index b8904d59411a..000000000000
--- a/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function fun() public { }
-    function fun() public { }
-}
-// ----
-// DeclarationError 1686: (20-45): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol
deleted file mode 100644
index b29b5ae04415..000000000000
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() pure public {
-        { uint x; }
-        { uint x; }
-    }
-}
-// ----
-// Warning 2072: (57-63): Unused local variable.
-// Warning 2072: (77-83): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol
deleted file mode 100644
index e6beef51aec7..000000000000
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() pure public {
-        { uint x; }
-        uint x;
-    }
-}
-// ----
-// Warning 2519: (57-63): This declaration shadows an existing declaration.
-// Warning 2072: (57-63): Unused local variable.
-// Warning 2072: (75-81): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol
deleted file mode 100644
index f457b183fec6..000000000000
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() pure public {
-        uint x;
-        { uint x; }
-        uint x;
-    }
-}
-// ----
-// DeclarationError 2333: (91-97): Identifier already declared.
-// Warning 2519: (73-79): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol
deleted file mode 100644
index 1113c4de8001..000000000000
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() pure public {
-        uint x;
-        uint x;
-    }
-}
-// ----
-// DeclarationError 2333: (71-77): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol b/test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol
deleted file mode 100644
index 647e5b416e73..000000000000
--- a/test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function f() public pure {
-        uint x;
-        externalFunction(x);
-    }
-}
-// ----
-// DeclarationError 7576: (120-136): Undeclared identifier. "externalFunction" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol b/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol
deleted file mode 100644
index 4b558ec68d9c..000000000000
--- a/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint) public pure {}
-    uint public f = 0;
-}
-// ----
-// DeclarationError 2333: (53-70): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/library_inherited.sol b/test/libsolidity/syntaxTests/scoping/library_inherited.sol
deleted file mode 100644
index 60c16d7c48ac..000000000000
--- a/test/libsolidity/syntaxTests/scoping/library_inherited.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library Lib {
-    function foo(uint256 value) internal returns (uint256) {
-        return value + 42;
-    }
-}
-
-contract A {
-    using Lib for uint256;
-}
-
-contract B is A {
-    function bar(uint256 value) public returns (uint256) {
-        return value.foo(); // Usage of Lib
-    }
-}
-// ----
-// TypeError 9582: (246-255): Member "foo" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/scoping/library_inherited2.sol b/test/libsolidity/syntaxTests/scoping/library_inherited2.sol
deleted file mode 100644
index be9255379c0e..000000000000
--- a/test/libsolidity/syntaxTests/scoping/library_inherited2.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library Lib {
-    function foo(uint256 value) internal pure returns (uint256) {
-        return value + 42;
-    }
-}
-
-contract A {
-    using Lib for uint256;
-}
-
-contract B is A {
-    using Lib for uint256;
-    function bar(uint256 value) public pure returns (uint256) {
-        return value.foo(); // Usage of Lib
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol b/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol
deleted file mode 100644
index d2a191eeb0d7..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function e() external { }
-    function f() public pure { uint e; e = 0; }
-}
-// ----
-// Warning 8760: (77-83): This declaration has the same name as another declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol b/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol
deleted file mode 100644
index 88a59cc16825..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function e() external { }
-    function f() public pure { uint e; e = 0; }
-    function e(int) external { }
-}
-// ----
-// Warning 8760: (77-83): This declaration has the same name as another declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol
deleted file mode 100644
index 1ae8ed754558..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-interface I {
-    function f(uint I) external;         // OK
-}
-
-library L {
-    function f(uint L) public pure {}    // warning
-}
-
-abstract contract A {
-    function f(uint A) public pure {}    // warning
-    function g(uint A) public virtual;   // OK
-}
-
-contract C {
-    function f(uint C) public pure {}    // warning
-}
-// ----
-// Warning 2519: (91-97): This declaration shadows an existing declaration.
-// Warning 2519: (168-174): This declaration shadows an existing declaration.
-// Warning 2519: (283-289): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol
deleted file mode 100644
index a17a743534bd..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(uint f) pure public {}
-}
-// ----
-// Warning 2519: (28-34): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
deleted file mode 100644
index 5c63f652985f..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    function f(StructType memory StructType) external {}
-    function g(EnumType EnumType) external {}
-    function h(EnumType StructType, StructType memory EnumType) external {}
-
-    function z(EnumType e) external returns (uint EnumType) {}
-}
-// ----
-// Warning 2519: (104-132): This declaration shadows an existing declaration.
-// Warning 2519: (161-178): This declaration shadows an existing declaration.
-// Warning 2519: (207-226): This declaration shadows an existing declaration.
-// Warning 2519: (228-254): This declaration shadows an existing declaration.
-// Warning 2519: (314-327): This declaration shadows an existing declaration.
-// TypeError 5172: (104-114): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol
deleted file mode 100644
index fcba51e57055..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-library C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    function f1(function (StructType memory StructType) external f) external {}
-    function f2(function (EnumType EnumType) external f) external {}
-    function f3(function (EnumType StructType, StructType memory EnumType) external f) external {}
-}
-// ----
-// Warning 6162: (114-142): Naming function type parameters is deprecated.
-// Warning 6162: (194-211): Naming function type parameters is deprecated.
-// Warning 6162: (263-282): Naming function type parameters is deprecated.
-// Warning 6162: (284-310): Naming function type parameters is deprecated.
-// Warning 2519: (114-142): This declaration shadows an existing declaration.
-// Warning 2519: (194-211): This declaration shadows an existing declaration.
-// Warning 2519: (263-282): This declaration shadows an existing declaration.
-// Warning 2519: (284-310): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
deleted file mode 100644
index 8afde695231c..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    function f() external returns (StructType memory StructType) {}
-    function g() external returns (EnumType EnumType) {}
-    function h() external returns (EnumType StructType, StructType memory EnumType) {}
-
-    function z(uint EnumType) external returns (EnumType e) {}
-}
-// ----
-// Warning 2519: (124-152): This declaration shadows an existing declaration.
-// Warning 2519: (192-209): This declaration shadows an existing declaration.
-// Warning 2519: (249-268): This declaration shadows an existing declaration.
-// Warning 2519: (270-296): This declaration shadows an existing declaration.
-// Warning 2519: (317-330): This declaration shadows an existing declaration.
-// TypeError 5172: (124-134): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol
deleted file mode 100644
index a82f054e54c9..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    function (StructType memory StructType) external ext1;
-    function (EnumType EnumType) external ext2;
-    function (EnumType StructType, StructType memory EnumType) external ext3;
-}
-// ----
-// Warning 6162: (103-131): Naming function type parameters is deprecated.
-// Warning 6162: (162-179): Naming function type parameters is deprecated.
-// Warning 6162: (210-229): Naming function type parameters is deprecated.
-// Warning 6162: (231-257): Naming function type parameters is deprecated.
-// Warning 2519: (103-131): This declaration shadows an existing declaration.
-// Warning 2519: (162-179): This declaration shadows an existing declaration.
-// Warning 2519: (210-229): This declaration shadows an existing declaration.
-// Warning 2519: (231-257): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol
deleted file mode 100644
index 5c260ceae40d..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    enum EnumType {A, B, C}
-
-    struct StructType {
-        uint x;
-    }
-
-    function () external returns (StructType memory StructType) ext1;
-    function () external returns (EnumType EnumType) ext2;
-    function () external returns (EnumType StructType, StructType memory EnumType) ext3;
-}
-// ----
-// SyntaxError 7304: (123-151): Return parameters in function types may not be named.
-// SyntaxError 7304: (193-210): Return parameters in function types may not be named.
-// SyntaxError 7304: (252-271): Return parameters in function types may not be named.
-// SyntaxError 7304: (273-299): Return parameters in function types may not be named.
-// Warning 2519: (123-151): This declaration shadows an existing declaration.
-// Warning 2519: (193-210): This declaration shadows an existing declaration.
-// Warning 2519: (252-271): This declaration shadows an existing declaration.
-// Warning 2519: (273-299): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol
deleted file mode 100644
index b7818410987b..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-function e() {}
-contract test {
-    function f() pure public { uint e; e = 0; }
-}
-// ----
-// Warning 2519: (63-69): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol
deleted file mode 100644
index 43f7c86b3bd5..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-function e() {}
-contract test {
-    function f() pure public { uint e; uint g; uint h; e = g = h = 0; }
-    function g() pure public {}
-}
-function h() {}
-// ----
-// Warning 2519: (63-69): This declaration shadows an existing declaration.
-// Warning 2519: (71-77): This declaration shadows an existing declaration.
-// Warning 2519: (79-85): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol
deleted file mode 100644
index 1e70c9181789..000000000000
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    uint256 variable;
-    function f() pure public { uint32 variable; variable = 2; }
-}
-// ----
-// Warning 2519: (69-84): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol b/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol
deleted file mode 100644
index f0500ede0b2c..000000000000
--- a/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract test {
-    function f() pure public {
-        uint x;
-        uint x;
-        uint x;
-        uint x;
-        uint x;
-        uint x;
-    }
-}
-// ----
-// DeclarationError 2333: (71-77): Identifier already declared.
-// DeclarationError 2333: (87-93): Identifier already declared.
-// DeclarationError 2333: (103-109): Identifier already declared.
-// DeclarationError 2333: (119-125): Identifier already declared.
-// DeclarationError 2333: (135-141): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping.sol b/test/libsolidity/syntaxTests/scoping/scoping.sol
deleted file mode 100644
index bfd1c0b09908..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public {
-        {
-            uint256 x;
-        }
-        x = 2;
-    }
-}
-// ----
-// DeclarationError 7576: (93-94): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_activation.sol b/test/libsolidity/syntaxTests/scoping/scoping_activation.sol
deleted file mode 100644
index cdc3c7655716..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_activation.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() pure public {
-        x = 3;
-        uint x;
-    }
-}
-// ----
-// DeclarationError 7576: (55-56): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol b/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol
deleted file mode 100644
index cdc3c7655716..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() pure public {
-        x = 3;
-        uint x;
-    }
-}
-// ----
-// DeclarationError 7576: (55-56): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_for.sol b/test/libsolidity/syntaxTests/scoping/scoping_for.sol
deleted file mode 100644
index fe929efc7bab..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_for.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() pure public {
-        for (uint x = 0; x < 10; x ++){
-            x = 2;
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_for2.sol b/test/libsolidity/syntaxTests/scoping/scoping_for2.sol
deleted file mode 100644
index e6f37996c92a..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_for2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public {
-        for (uint x = 0; x < 10; x ++)
-            x = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_for3.sol b/test/libsolidity/syntaxTests/scoping/scoping_for3.sol
deleted file mode 100644
index 29bf0ae84981..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_for3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() pure public {
-        for (uint x = 0; x < 10; x ++){
-            x = 2;
-        }
-        x = 4;
-    }
-}
-// ----
-// DeclarationError 7576: (124-125): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol b/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol
deleted file mode 100644
index 102d7bf0150c..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() pure public {
-        for (;; y++){
-            uint y = 3;
-        }
-    }
-}
-// ----
-// DeclarationError 7576: (63-64): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_old.sol b/test/libsolidity/syntaxTests/scoping/scoping_old.sol
deleted file mode 100644
index 6ac3162a6102..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_old.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() pure public {
-        x = 4;
-        uint256 x = 2;
-    }
-}
-// ----
-// DeclarationError 7576: (55-56): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol b/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol
deleted file mode 100644
index be77c646552a..000000000000
--- a/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() pure public {
-        uint a = a;
-    }
-}
-// ----
-// DeclarationError 7576: (64-65): Undeclared identifier. "a" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol
deleted file mode 100644
index 52ca438c92a1..000000000000
--- a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint public f = 0;
-    function f(uint) public pure {}
-}
-// ----
-// DeclarationError 2333: (40-71): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
deleted file mode 100644
index f44ca63fd1fb..000000000000
--- a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// This used to crash with some compiler versions.
-contract SomeContract {
-
-  uint public balance = 0;
-
-  function balance(uint number) public {}
-
-  function doSomething() public {
-    balance(3);
-  }
-}
-// ----
-// DeclarationError 2333: (106-145): Identifier already declared.
-// TypeError 5704: (185-195): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/shifts/shift_signed_rvalue.sol b/test/libsolidity/syntaxTests/shifts/shift_signed_rvalue.sol
deleted file mode 100644
index 1ca57bdccfc3..000000000000
--- a/test/libsolidity/syntaxTests/shifts/shift_signed_rvalue.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(int256 a, int256 b) public returns (int256) {
-        return a >> b;
-    }
-    function g(int256 a, int256 b) public returns (int256) {
-        return a >> (256 - b);
-    }
-}
-// ----
-// TypeError 2271: (89-95): Built-in binary operator >> cannot be applied to types int256 and int256.
-// TypeError 2271: (179-193): Built-in binary operator >> cannot be applied to types int256 and int256.
diff --git a/test/libsolidity/syntaxTests/signed_rational_modulus.sol b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
deleted file mode 100644
index a3acf182fcaf..000000000000
--- a/test/libsolidity/syntaxTests/signed_rational_modulus.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public pure {
-        fixed a = 0.42578125 % -0.4271087646484375;
-        fixed b = .5 % a;
-        fixed c = a % b;
-        a; b; c;
-    }
-}
-// ----
-// TypeError 2271: (117-123): Built-in binary operator % cannot be applied to types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
deleted file mode 100644
index 21c48cc43323..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v2;
-
-contract test {
-    function f() public pure returns (string memory ret) {
-        // 27000 bytes long data
-        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// Warning 5574: (21-27154): Contract code size is 27187 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_abiencoder_v1.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_abiencoder_v1.sol
deleted file mode 100644
index a0c7267d0d20..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_abiencoder_v1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v1;
-
-contract test {
-    function f() public pure returns (string memory ret) {
-        // 27000 bytes long data
-        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// Warning 5574: (21-27154): Contract code size is 27205 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
deleted file mode 100644
index 67dee4cad6ea..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public pure returns (string memory ret) {
-        // 27000 bytes long data
-        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-// ====
-// EVMVersion: =byzantium
-// ----
-// Warning 5574: (0-27133): Contract code size is 27221 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_homestead.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_homestead.sol
deleted file mode 100644
index 946f5e8b4118..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_homestead.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public pure returns (string memory ret) {
-        // 27000 bytes long data
-        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-// ====
-// EVMVersion: =homestead
-// ----
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
deleted file mode 100644
index 0a97c87dfa9c..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract A {
-    function f() public pure returns (string memory ret) {
-        // 27000 bytes long data
-        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-
-contract B is A {
-    function g() public pure returns (bool) {
-        return true;
-    }
-}
-
-contract C is A {
-    function g() public pure returns (bool) {
-        return false;
-    }
-}
-
-contract test {
-    constructor() {
-        new B();
-        new C();
-    }
-}
-// ====
-// EVMVersion: =paris
-// ----
-// Warning 5574: (0-27130): Contract code size is 27193 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27132-27224): Contract code size is 27219 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27226-27319): Contract code size is 27219 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
deleted file mode 100644
index 3fc466db3927..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
+++ /dev/null
@@ -1,32 +0,0 @@
-contract A {
-    function f() public pure returns (string memory ret) {
-        // 27000 bytes long data
-        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-
-contract B is A {
-    function g() public pure returns (bool) {
-        return true;
-    }
-}
-
-contract C is A {
-    function g() public pure returns (bool) {
-        return false;
-    }
-}
-
-contract test {
-    constructor() {
-        new B();
-        new C();
-    }
-}
-// ====
-// EVMVersion: =shanghai
-// ----
-// Warning 5574: (0-27130): Contract code size is 27187 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27132-27224): Contract code size is 27213 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27226-27319): Contract code size is 27212 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 3860: (27321-27398): Contract initcode size is 54628 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol
deleted file mode 100644
index cbfa944666fc..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract A {
-    function f() public pure returns (string memory ret) {
-        // 20000 bytes long data
-        ret = "................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-
-contract B is A {
-    function g() public pure returns (bool) {
-        return true;
-    }
-}
-
-contract C is A {
-    function g() public pure returns (bool) {
-        return false;
-    }
-}
-
-contract test {
-    constructor() {
-        new A();
-        new B();
-        new C();
-    }
-}
-// ====
-// EVMVersion: =paris
-// ----
diff --git a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
deleted file mode 100644
index f82434d5d663..000000000000
--- a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract A {
-    function f() public pure returns (string memory ret) {
-        // 20000 bytes long data
-        ret = "................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
-    }
-}
-
-contract B is A {
-    function g() public pure returns (bool) {
-        return true;
-    }
-}
-
-contract C is A {
-    function g() public pure returns (bool) {
-        return false;
-    }
-}
-
-contract test {
-    constructor() {
-        new A();
-        new B();
-        new C();
-    }
-}
-// ====
-// EVMVersion: =shanghai
-// ----
-// Warning 3860: (20321-20415): Contract initcode size is 60896 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/smoke_test.sol b/test/libsolidity/syntaxTests/smoke_test.sol
deleted file mode 100644
index 986cf95861ff..000000000000
--- a/test/libsolidity/syntaxTests/smoke_test.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	uint256 stateVariable1;
-	function fun(uint256 arg1) public { uint256 y; y = arg1; }
-}
-// ----
-// Warning 2018: (42-100): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
deleted file mode 100644
index c10dc10f25e0..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f() public pure {
-        abi.encodePacked([new uint[](5), new uint[](7)]);
-    }
-}
-// ----
-// TypeError 9578: (89-119): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol
deleted file mode 100644
index 150ac68e387e..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f() public pure {
-        abi.encodePacked([new uint[](5), new uint[](7)]);
-    }
-}
-// ----
-// TypeError 9578: (104-134): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol
deleted file mode 100644
index f03c27a1bd17..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint x; }
-    S s;
-    struct T { uint y; }
-    T t;
-    function f() public view {
-        bytes32 a = sha256(abi.encodePacked(s, t));
-        a;
-    }
-}
-// ----
-// TypeError 9578: (191-192): Type not supported in packed mode.
-// TypeError 9578: (194-195): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol
deleted file mode 100644
index 8dc796928e28..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g1() internal pure returns (uint) { return (1); }
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function h() public pure {
-        abi.encodePacked(g0());
-        abi.encodePacked(g2());
-        abi.encodePacked((g1(), g1()));
-    }
-}
-// ----
-// TypeError 2056: (240-244): This type cannot be encoded.
-// TypeError 2056: (272-276): This type cannot be encoded.
-// TypeError 2056: (304-316): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol
deleted file mode 100644
index 4ac1c1d408da..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-
-    function h() public pure {
-        abi.encodePacked(g1());
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol
deleted file mode 100644
index b8d0bcfcbe6a..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g1() internal pure returns (uint) { return (1); }
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function f0() public {}
-    function f1(uint) public {}
-    function f2(uint, uint) public {}
-
-    function h() public pure {
-        abi.encodeWithSelector(this.f0.selector, g0());
-        abi.encodeWithSelector(this.f0.selector, g2());
-        abi.encodeWithSelector(this.f0.selector, (g1(), g1()));
-    }
-}
-// ----
-// TypeError 2056: (363-367): This type cannot be encoded.
-// TypeError 2056: (419-423): This type cannot be encoded.
-// TypeError 2056: (475-487): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol
deleted file mode 100644
index 1ef98b0783d2..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-
-    function f0() public {}
-
-    function h() public pure {
-        abi.encodeWithSelector(this.f0.selector, g1());
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol
deleted file mode 100644
index c618ec1b2c52..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g1() internal pure returns (uint) { return (1); }
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function h() public pure {
-        abi.encodeWithSignature("f0()", g0());
-        abi.encodeWithSignature("f()", g2());
-        abi.encodeWithSignature("f()", (g1(), g1()));
-    }
-}
-// ----
-// TypeError 2056: (255-259): This type cannot be encoded.
-// TypeError 2056: (301-305): This type cannot be encoded.
-// TypeError 2056: (347-359): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol
deleted file mode 100644
index 504871832ddf..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-
-    function h() public pure {
-        abi.encodeWithSignature("f()", g1());
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
deleted file mode 100644
index 8c679258c5fe..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function test() public pure {
-        abi.encode([new uint[](5), new uint[](7)]);
-    }
-}
-// ----
-// TypeError 2056: (86-116): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array_v2.sol
deleted file mode 100644
index e12c37e7bd40..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array_v2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f() public pure {
-        abi.encode([new uint[](5), new uint[](7)]);
-    }
-}
-// ----
-// Warning 6133: (87-129): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
deleted file mode 100644
index a7d0e3dbe099..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma abicoder v1;
-contract C {
-    struct S { uint x; }
-    S s;
-    struct T { uint y; }
-    T t;
-    function f() public view {
-        abi.encode(s, t);
-    }
-    function g() public view {
-        abi.encodePacked(s, t);
-    }
-}
-// ----
-// TypeError 2056: (151-152): This type cannot be encoded.
-// TypeError 2056: (154-155): This type cannot be encoded.
-// TypeError 9578: (220-221): Type not supported in packed mode.
-// TypeError 9578: (223-224): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol
deleted file mode 100644
index e7117f2b1ab4..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint x; }
-    S s;
-    struct T { uint y; }
-    T t;
-    function e() public view {
-        S memory st;
-        abi.encodePacked(st);
-    }
-    function f() public view {
-        abi.encode(s, t);
-    }
-    function g() public view {
-        abi.encodePacked(s, t);
-    }
-}
-// ----
-// TypeError 9578: (193-195): Type not supported in packed mode.
-// TypeError 9578: (323-324): Type not supported in packed mode.
-// TypeError 9578: (326-327): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol
deleted file mode 100644
index 747ccdabfdb6..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function g0() internal pure {}
-    function g1() internal pure returns (uint) { return (1); }
-    function g2() internal pure returns (uint, uint) { return (2, 3); }
-
-    function h() public pure {
-        abi.encode(g0());
-        abi.encode(g2());
-        abi.encode((g1(), g1()));
-    }
-}
-// ----
-// TypeError 2056: (234-238): This type cannot be encoded.
-// TypeError 2056: (260-264): This type cannot be encoded.
-// TypeError 2056: (286-298): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol
deleted file mode 100644
index 6c3cdf84ae83..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function g1() internal pure returns (uint) { return (1); }
-
-    function h() public pure {
-        abi.encode(g1());
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol
deleted file mode 100644
index 47dedc3754d4..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public pure {
-        abi.encode;
-        abi.encodePacked;
-        abi.encodeWithSelector;
-        abi.encodeWithSignature;
-        abi.decode;
-    }
-}
-// ----
-// Warning 6133: (52-62): Statement has no effect.
-// Warning 6133: (72-88): Statement has no effect.
-// Warning 6133: (98-120): Statement has no effect.
-// Warning 6133: (130-153): Statement has no effect.
-// Warning 6133: (163-173): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol
deleted file mode 100644
index 1f12fcf31f34..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", ((uint)[2]));
-        abi.decode("", ((uint)[]));
-        abi.decode("", ((uint)[][3]));
-        abi.decode("", ((uint)[4][]));
-        abi.decode("", ((uint)[5][6]));
-        abi.decode("", (((uint))[5][6]));
-    }
-}
-// ----
-// Warning 6133: (52-79): Statement has no effect.
-// Warning 6133: (89-115): Statement has no effect.
-// Warning 6133: (125-154): Statement has no effect.
-// Warning 6133: (164-193): Statement has no effect.
-// Warning 6133: (203-233): Statement has no effect.
-// Warning 6133: (243-275): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol
deleted file mode 100644
index 7c0e35a21ace..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// This restriction might be lifted in the future
-contract C {
-  function f() public pure {
-    abi.decode("abc", (bytes calldata));
-  }
-}
-// ----
-// ParserError 2314: (121-129): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol
deleted file mode 100644
index 73d46b5aa31b..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        abi.decode("abc", ());
-    }
-}
-// ----
-// Warning 6133: (52-73): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol
deleted file mode 100644
index a44a65739291..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    enum Color { red, green, blue }
-    function f() pure public {
-        abi.decode("", (Color));
-    }
-}
-// ----
-// Warning 6133: (88-111): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol
deleted file mode 100644
index e18088989931..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-  function f() public pure {
-    abi.decode();
-    abi.decode(msg.data);
-    abi.decode(msg.data, uint, uint);
-  }
-}
-// ----
-// TypeError 5782: (46-58): This function takes two arguments, but 0 were provided.
-// TypeError 5782: (64-84): This function takes two arguments, but 1 were provided.
-// TypeError 5782: (90-122): This function takes two arguments, but 3 were provided.
-// TypeError 6444: (111-115): The second argument to "abi.decode" has to be a tuple of types.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol
deleted file mode 100644
index 4c0795d94095..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public pure {
-    abi.decode(uint, uint);
-  }
-}
-// ----
-// TypeError 1956: (57-61): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type type(uint256).
-// TypeError 6444: (63-67): The second argument to "abi.decode" has to be a tuple of types.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol
deleted file mode 100644
index f958f74f3107..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        bool x;
-        abi.decode("", (uint[type(x = true ? uint8 : uint8).max]));
-    }
-}
-// ----
-// TypeError 9717: (105-110): Invalid mobile type in true expression.
-// TypeError 3703: (113-118): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol
deleted file mode 100644
index 3b5dc9059486..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", ((uint, int)[5][6]));
-    }
-}
-// ----
-// TypeError 2614: (68-79): Indexed expression has to be a type, mapping or array (is tuple(type(uint256),type(int256)))
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol
deleted file mode 100644
index 6f481e0d3805..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", ([uint][2]));
-    }
-}
-// ----
-// TypeError 9563: (69-73): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol
deleted file mode 100644
index 97b15f4bbbe9..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        bool x;
-        abi.decode("", ((x = true ? uint : uint)[0]));
-    }
-}
-// ----
-// TypeError 9717: (96-100): Invalid mobile type in true expression.
-// TypeError 3703: (103-107): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol
deleted file mode 100644
index 6e64de7235a8..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", (true ? uint : uint));
-    }
-}
-// ----
-// TypeError 9717: (75-79): Invalid mobile type in true expression.
-// TypeError 3703: (82-86): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol
deleted file mode 100644
index 891164812968..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", ((true ? uint : uint)));
-    }
-}
-// ----
-// TypeError 9717: (76-80): Invalid mobile type in true expression.
-// TypeError 3703: (83-87): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol
deleted file mode 100644
index 62592e429631..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() pure public {
-        int x;
-        abi.decode("", ((x = 1) > 0 ? int : int));
-    }
-}
-// ----
-// TypeError 9717: (97-100): Invalid mobile type in true expression.
-// TypeError 3703: (103-106): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol
deleted file mode 100644
index 317244a0940b..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", ((uint, int)));
-    }
-}
-// ----
-// TypeError 1039: (68-79): Argument has to be a type name.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol
deleted file mode 100644
index 84640abd2a20..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() pure public {
-        abi.decode("", (type(uint)));
-    }
-}
-// ----
-// TypeError 1039: (68-78): Argument has to be a type name.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol
deleted file mode 100644
index 5078fcdebf3c..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    struct S { int a; }
-    enum State { idle, running, blocked }
-}
-
-contract D {
-    struct X { uint b; }
-    enum Color { red, green, blue }
-}
-
-contract C {
-    function f() pure public {
-        abi.decode("", (L.S));
-        abi.decode("", (L.State));
-        abi.decode("", (D.X));
-        abi.decode("", (D.Color));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol
deleted file mode 100644
index 4e8cb93f60d0..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public pure {
-    abi.decode("abc", (bytes memory, uint[][2] memory));
-  }
-}
-// ----
-// ParserError 2314: (71-77): Expected ',' but got 'memory'
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory_v2.sol
deleted file mode 100644
index 3a776e036b89..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory_v2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v2;
-contract C {
-  struct S { uint x; uint[] b; }
-  function f() public pure returns (S memory, bytes memory, uint[][2] memory) {
-    return abi.decode("abc", (S, bytes, uint[][2]));
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
deleted file mode 100644
index 1981b04bf352..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder v1;
-contract C {
-    function f() public pure {
-        abi.decode("1234", (uint[][3]));
-    }
-}
-// ----
-// TypeError 9611: (92-101): Decoding type uint256[][3] memory not supported.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol
deleted file mode 100644
index 54f1d5a6e555..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f() public pure {
-        abi.decode("1234", (uint[][3]));
-    }
-}
-// ----
-// Warning 6133: (87-118): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol
deleted file mode 100644
index 973ad3dbb121..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure {
-    abi.decode("abc", uint);
-    abi.decode("abc", this);
-    abi.decode("abc", f());
-  }
-}
-// ----
-// TypeError 6444: (64-68): The second argument to "abi.decode" has to be a tuple of types.
-// TypeError 6444: (93-97): The second argument to "abi.decode" has to be a tuple of types.
-// TypeError 6444: (122-125): The second argument to "abi.decode" has to be a tuple of types.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_simple.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_simple.sol
deleted file mode 100644
index f44d0701357f..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_simple.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  function f() public pure returns (uint, bytes32, C) {
-    return abi.decode("abc", (uint, bytes32, C));
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_single_return.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_single_return.sol
deleted file mode 100644
index 7b7f4c0af89e..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_single_return.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns (bool) {
-        return abi.decode("abc", (uint)) == 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_singletontuple.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_singletontuple.sol
deleted file mode 100644
index 57eccacf2560..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_singletontuple.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  function f() public pure returns (uint) {
-    return abi.decode("abc", (uint));
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol
deleted file mode 100644
index e2f93848316e..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// This restriction might be lifted in the future
-contract C {
-  function f() {
-    abi.decode("abc", (bytes storage));
-  }
-}
-// ----
-// ParserError 2314: (109-116): Expected ',' but got 'storage'
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
deleted file mode 100644
index dd981b54c9b5..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder v1;
-struct S {
-    uint x;
-}
-
-contract C {
-    function f() public pure {
-        abi.decode("1234", (S));
-    }
-}
-// ----
-// TypeError 9611: (118-119): Decoding type struct S memory not supported.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol
deleted file mode 100644
index 824f723ed2ca..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-
-struct S {
-    uint x;
-}
-
-contract C {
-    function f() public pure {
-        abi.decode("1234", (S));
-    }
-}
-// ----
-// Warning 6133: (113-136): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol
deleted file mode 100644
index 8da0f0a0906e..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-struct S { int a; }
-
-contract C {
-    function f() pure public {
-        abi.decode("", (((uint))));
-        abi.decode("", ((((uint)))));
-        abi.decode("", (((S))));
-    }
-}
-// ----
-// Warning 6133: (73-99): Statement has no effect.
-// Warning 6133: (109-137): Statement has no effect.
-// Warning 6133: (147-170): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/contract_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/contract_array.sol
deleted file mode 100644
index c07b436c7428..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/contract_array.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-	function f(bytes calldata x) public pure returns (C[] memory c) {
-		c = abi.decode(x, (C[]));
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
deleted file mode 100644
index 6cf39cfaeb75..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
+++ /dev/null
@@ -1,48 +0,0 @@
-interface I {
-	function fExternal(uint256 p, string memory t) external;
-}
-
-contract Other {
-	function fExternal(uint) external pure {}
-	function fPublic(uint) public pure {}
-	function fInternal(uint) internal pure {}
-}
-
-library L {
-	function fExternal(uint256 p, string memory t) external {}
-	function fInternal(uint256 p, string memory t) internal {}
-}
-
-contract Base {
-	function baseFunctionExternal(uint) external pure {}
-}
-
-contract C is Base {
-	function f(int a) public {}
-	function f2(int a, string memory b) public {}
-	function f4() public {}
-
-	function successFunctionArgsIntLiteralTuple() public view returns(bytes memory) {
-		return abi.encodeCall(this.f, (1));
-	}
-	function successFunctionArgsIntLiteral() public view returns(bytes memory) {
-		return abi.encodeCall(this.f, 1);
-	}
-	function successFunctionArgsLiteralTuple() public view returns(bytes memory) {
-		return abi.encodeCall(this.f2, (1, "test"));
-	}
-	function successFunctionArgsEmptyTuple() public view returns(bytes memory) {
-		return abi.encodeCall(this.f4, ());
-	}
-	function viaDeclaration() public pure returns (bytes memory) {
-		return bytes.concat(
-			abi.encodeCall(Other.fExternal, (1)),
-			abi.encodeCall(Other.fPublic, (1)),
-			abi.encodeCall(I.fExternal, (1, "123"))
-		);
-	}
-	function viaBaseDeclaration() public pure returns (bytes memory) {
-		return abi.encodeCall(Base.baseFunctionExternal, (1));
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
deleted file mode 100644
index 48372263f664..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C {
-	function f(int a) public {}
-	function f3(int a, int b) public {}
-
-	function failFunctionArgsWrongType() public returns(bytes memory) {
-		return abi.encodeCall(this.f, ("test"));
-	}
-	function failFunctionArgsTooMany() public returns(bytes memory) {
-		return abi.encodeCall(this.f, (1, 2));
-	}
-	function failFunctionArgsTooFew0() public returns(bytes memory) {
-		return abi.encodeCall(this.f, ());
-	}
-	function failFunctionArgsTooFew1() public returns(bytes memory) {
-		return abi.encodeCall(this.f);
-	}
-	function failFunctionArgsArrayLiteral() public returns(bytes memory) {
-		return abi.encodeCall(this.f3, [1, 2]);
-	}
-}
-// ----
-// TypeError 5407: (181-189): Cannot implicitly convert component at position 0 from "literal_string "test"" to "int256".
-// TypeError 7788: (271-301): Expected 1 instead of 2 components for the tuple parameter.
-// TypeError 7788: (382-408): Expected 1 instead of 0 components for the tuple parameter.
-// TypeError 6219: (489-511): Expected two arguments: a function pointer followed by a tuple.
-// TypeError 7515: (597-628): Expected a tuple with 2 components instead of a single non-tuple parameter.
-// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2] memory" to "int256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol
deleted file mode 100644
index e83512222500..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint) external {}
-
-    function main() external view {
-        function () h;
-        abi.encodeCall(this.f, (h));
-    }
-}
-// ----
-// TypeError 5407: (137-140): Cannot implicitly convert component at position 0 from "function ()" to "uint256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
deleted file mode 100644
index 9ac254c99b12..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
+++ /dev/null
@@ -1,78 +0,0 @@
-interface I {
-	function fExternal(uint256 p, string memory t) external;
-}
-
-contract Other {
-	function fExternal(uint) external pure {}
-	function fPublic(uint) public pure {}
-	function fInternal(uint) internal pure {}
-}
-
-library L {
-	function fExternal(uint256 p, string memory t) external {}
-	function fInternal(uint256 p, string memory t) internal {}
-}
-
-contract Base {
-	function baseFunctionInternal(uint) internal pure {}
-	function baseFunctionPublic(uint) public pure {}
-}
-
-function fileLevel(uint) pure {}
-
-contract C is Base {
-	using L for uint256;
-
-	function fPublic(int a) public {}
-	function fInternal(uint256 p, string memory t) internal {}
-
-	function failFunctionPtrMissing() public returns(bytes memory) {
-		return abi.encodeCall(1, this.fPublic);
-	}
-	function failFunctionPtrWrongType() public returns(bytes memory) {
-		return abi.encodeCall(abi.encodeCall, (1, 2, 3, "test"));
-	}
-	function failFunctionInternal() public returns(bytes memory) {
-		return abi.encodeCall(fInternal, (1, "123"));
-	}
-	function failFunctionInternalFromVariable() public returns(bytes memory) {
-		function(uint256, string memory) internal localFunctionPointer = fInternal;
-		return abi.encodeCall(localFunctionPointer, (1, "123"));
-	}
-	function failLibraryPointerCall() public {
-		abi.encodeCall(L.fInternal, (1, "123"));
-		abi.encodeCall(L.fExternal, (1, "123"));
-	}
-	function failAttachedLibraryPointerCall() public returns (bytes memory) {
-		uint256 x = 1;
-		return abi.encodeCall(x.fExternal, (1, "123"));
-	}
-	function viaBaseDeclaration() public pure returns (bytes memory) {
-		return abi.encodeCall(C.fPublic, (2));
-	}
-	function viaBaseDeclaration2() public pure returns (bytes memory) {
-		return bytes.concat(
-			abi.encodeCall(Base.baseFunctionPublic, (1)),
-			abi.encodeCall(Base.baseFunctionInternal, (1))
-		);
-	}
-	function fileLevelFunction() public pure returns (bytes memory) {
-		return abi.encodeCall(fileLevel, (2));
-	}
-	function createFunction() public pure returns (bytes memory) {
-		return abi.encodeCall(new Other, (2));
-	}
-}
-// ----
-// TypeError 5511: (742-743): Expected first argument to be a function pointer, not "int_const 1".
-// TypeError 3509: (855-869): Expected regular external function type, or external view on public function. Cannot use special function.
-// TypeError 3509: (982-991): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (1187-1207): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (1286-1297): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (1329-1340): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
-// TypeError 3509: (1474-1485): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
-// TypeError 3509: (1595-1604): Expected regular external function type, or external view on public function. Provided internal function. Did you forget to prefix "this."?
-// TypeError 3509: (1725-1748): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
-// TypeError 3509: (1774-1799): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
-// TypeError 3509: (1905-1914): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (2013-2022): Expected regular external function type, or external view on public function. Provided creation function.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
deleted file mode 100644
index c27f61d6872a..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function f(int a, int b) public {}
-	function failFunctionArgsIntLiteralNestedTuple() public returns(bytes memory) {
-		return abi.encodeCall(this.f, ((1,2)));
-	}
-}
-// ----
-// TypeError 7788: (139-170): Expected 2 instead of 1 components for the tuple parameter.
-// TypeError 5407: (163-168): Cannot implicitly convert component at position 0 from "tuple(int_const 1,int_const 2)" to "int256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
deleted file mode 100644
index 7f69995d5e8d..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f(int a) public {}
-	function failFunctionArgsIntLiteralTuple() public returns(bytes memory) {
-		return abi.encodeCall(this.f, (1,));
-	}
-}
-// ----
-// TypeError 8381: (149-153): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol
deleted file mode 100644
index a120331d3df9..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint x; }
-    function f() public pure {
-        S[] memory s;
-        abi.encodePacked(s);
-    }
-}
-// ----
-// TypeError 9578: (116-117): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol
deleted file mode 100644
index 342e76bf526a..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    string[] s;
-    function f() public pure {
-        string[] memory m;
-        abi.encodePacked(m);
-    }
-    function g() public pure {
-        abi.encodePacked(s);
-    }
-}
-// ----
-// TypeError 9578: (112-113): Type not supported in packed mode.
-// TypeError 9578: (178-179): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encode_array_of_struct.sol b/test/libsolidity/syntaxTests/specialFunctions/encode_array_of_struct.sol
deleted file mode 100644
index 0e7b99a54b49..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encode_array_of_struct.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { uint x; }
-    function f() public pure {
-        S[] memory s;
-        abi.encode(s);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol b/test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol
deleted file mode 100644
index 11b675fb7acc..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-struct S {
-    function () f;
-}
-
-contract C {
-    enum testEnum { choice1, choice2, choice3 }
-
-    function f1(uint8) external {}
-    function f2(uint32) external {}
-    function f3(uint) external {}
-    function g1(bytes memory) external {}
-    function g2(bytes32) external {}
-    function h(string memory) external {}
-    function i(bool) external {}
-    function j(address) external {}
-    function k(address payable) external {}
-    function l(testEnum) external {}
-
-    function main() external view {
-        S memory s;
-        abi.encodeCall(this.f1, (s));
-        abi.encodeCall(this.f2, (s));
-        abi.encodeCall(this.f3, (s));
-        abi.encodeCall(this.g1, (s));
-        abi.encodeCall(this.g2, (s));
-        abi.encodeCall(this.h, (s));
-        abi.encodeCall(this.i, (s));
-        abi.encodeCall(this.j, (s));
-        abi.encodeCall(this.k, (s));
-        abi.encodeCall(this.l, (s));
-    }
-}
-// ----
-// TypeError 5407: (560-563): Cannot implicitly convert component at position 0 from "struct S memory" to "uint8".
-// TypeError 5407: (598-601): Cannot implicitly convert component at position 0 from "struct S memory" to "uint32".
-// TypeError 5407: (636-639): Cannot implicitly convert component at position 0 from "struct S memory" to "uint256".
-// TypeError 5407: (674-677): Cannot implicitly convert component at position 0 from "struct S memory" to "bytes memory".
-// TypeError 5407: (712-715): Cannot implicitly convert component at position 0 from "struct S memory" to "bytes32".
-// TypeError 5407: (749-752): Cannot implicitly convert component at position 0 from "struct S memory" to "string memory".
-// TypeError 5407: (786-789): Cannot implicitly convert component at position 0 from "struct S memory" to "bool".
-// TypeError 5407: (823-826): Cannot implicitly convert component at position 0 from "struct S memory" to "address".
-// TypeError 5407: (860-863): Cannot implicitly convert component at position 0 from "struct S memory" to "address payable".
-// TypeError 5407: (897-900): Cannot implicitly convert component at position 0 from "struct S memory" to "enum C.testEnum".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol b/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol
deleted file mode 100644
index 071859e53fb7..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public payable {
-		abi.encode(this.f{value: 2});
-		abi.encode(this.f{gas: 2});
-		abi.encode(this.f{value: 2, gas: 1});
-    }
-}
-// ----
-// TypeError 2056: (60-76): This type cannot be encoded.
-// TypeError 2056: (92-106): This type cannot be encoded.
-// TypeError 2056: (122-146): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol b/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol
deleted file mode 100644
index c30bd99dc38b..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() pure public {
-        g(keccak256(uint(2)));
-        g(sha256(uint(2)));
-        g(ripemd160(uint(2)));
-    }
-    function g(bytes32) pure internal {}
-}
-// ----
-// TypeError 7556: (64-71): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (92-99): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (123-130): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
deleted file mode 100644
index 6ecb4e4ff869..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes32 h = keccak256(abi.encodePacked(keccak256, f, this.f{gas: 2}, blockhash));
-        h;
-    }
-}
-// ----
-// TypeError 2056: (91-100): This type cannot be encoded.
-// TypeError 2056: (102-103): This type cannot be encoded.
-// TypeError 2056: (105-119): This type cannot be encoded.
-// TypeError 2056: (121-130): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol
deleted file mode 100644
index e83498b6c98d..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        (bool a,) = address(this).call(abi.encode(address(this).delegatecall, super));
-        (a,) = address(this).delegatecall(abi.encode(block, tx, mulmod));
-        a;
-    }
-}
-// ----
-// TypeError 2056: (94-120): This type cannot be encoded.
-// TypeError 2056: (122-127): This type cannot be encoded.
-// TypeError 2056: (184-189): This type cannot be encoded.
-// TypeError 2056: (191-193): This type cannot be encoded.
-// TypeError 2056: (195-201): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol
deleted file mode 100644
index 02777da1e791..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { uint x; }
-    S s;
-    struct T { uint y; }
-    T t;
-    function f() public view {
-        bytes32 a = sha256(abi.encodePacked(s, t));
-        a;
-    }
-}
-// ----
-// TypeError 9578: (156-157): Type not supported in packed mode.
-// TypeError 9578: (159-160): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol
deleted file mode 100644
index c427565d30e5..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    struct S { uint x; }
-    S s;
-    struct T { uint y; }
-    T t;
-    enum A { X, Y }
-    function f() public pure {
-        bytes memory a = abi.encodePacked(S, A, A.X, T, uint, uint[]);
-        a;
-    }
-}
-// ----
-// TypeError 2056: (174-175): This type cannot be encoded.
-// TypeError 2056: (177-178): This type cannot be encoded.
-// TypeError 2056: (185-186): This type cannot be encoded.
-// TypeError 2056: (188-192): This type cannot be encoded.
-// TypeError 2056: (194-200): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_without_encoding_problems.sol b/test/libsolidity/syntaxTests/specialFunctions/types_without_encoding_problems.sol
deleted file mode 100644
index d890e35f3006..000000000000
--- a/test/libsolidity/syntaxTests/specialFunctions/types_without_encoding_problems.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    uint[3] sarr;
-    function f() view public {
-        uint[3] memory arr;
-        bytes32 h = keccak256(abi.encodePacked(this.f, arr, sarr));
-        h;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
deleted file mode 100644
index f38a3267eef9..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function g() public pure returns (string memory) {
-        return string.concat;
-    }
-}
-// ----
-// TypeError 6359: (83-96): Return argument type function () pure returns (string memory) is not implicitly convertible to expected type (type of first return variable) string memory.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
deleted file mode 100644
index dcf3057da7f3..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function j() external {
-        string memory a = "hello";
-        string memory b = " world";
-
-        string memory d = string.concat(bytes(a), bytes(b));
-        string memory e = string.concat(a, 0);
-    }
-}
-// ----
-// TypeError 9977: (153-161): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
-// TypeError 9977: (163-171): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
-// TypeError 9977: (217-218): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
deleted file mode 100644
index 49b8a465a90d..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    string s;
-    function f(string calldata c, string calldata c1) public {
-        string memory a;
-        bytes16 b;
-        uint8[] memory num;
-        bytes1[] memory m;
-        string memory d = string.concat(a, b, c, num, s, "abc", m, c1, bytes(c1));
-    }
-}
-// ----
-// TypeError 9977: (232-233): Invalid type for argument in the string.concat function call. string type is required, but t_bytes16 provided.
-// TypeError 9977: (238-241): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$dyn_memory_ptr provided.
-// TypeError 9977: (253-254): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_bytes1_$dyn_memory_ptr provided.
-// TypeError 9977: (260-269): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_calldata_ptr provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
deleted file mode 100644
index 8c204ffca939..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        string.concat([], [], []);
-    }
-}
-// ----
-// TypeError 6378: (61-63): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
deleted file mode 100644
index 3c4639363c35..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-
-    enum E {A, B, C}
-
-    mapping(uint => E) m;
-
-    function f() public {
-        bool b;
-        uint u;
-        uint8 u8;
-        address a;
-        address payable ap;
-        function () external fext;
-        function () internal fint;
-        uint[] memory uDynamic;
-        uint[2] memory uStatic;
-        C c;
-        S memory s;
-        E e;
-
-        string.concat(b, u, u8, a, ap, fext, fint, uDynamic, uStatic, c, s, e, m);
-    }
-}
-// ----
-// TypeError 9977: (426-427): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
-// TypeError 9977: (429-430): Invalid type for argument in the string.concat function call. string type is required, but t_uint256 provided.
-// TypeError 9977: (432-434): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
-// TypeError 9977: (436-437): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
-// TypeError 9977: (439-441): Invalid type for argument in the string.concat function call. string type is required, but t_address_payable provided.
-// TypeError 9977: (443-447): Invalid type for argument in the string.concat function call. string type is required, but t_function_external_nonpayable$__$returns$__$ provided.
-// TypeError 9977: (449-453): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
-// TypeError 9977: (455-463): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$dyn_memory_ptr provided.
-// TypeError 9977: (465-472): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$2_memory_ptr provided.
-// TypeError 9977: (474-475): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$86 provided.
-// TypeError 9977: (477-478): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
-// TypeError 9977: (480-481): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
-// TypeError 9977: (483-484): Invalid type for argument in the string.concat function call. string type is required, but t_mapping$_t_uint256_$_t_enum$_E_$8_$ provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
deleted file mode 100644
index f8e62b49e40b..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-contract C {
-    struct S {
-        uint x;
-    }
-
-    enum E {A, B, C}
-
-    function f() public {
-        string.concat(
-            false,
-            1,
-            1e10,
-            1e-10,
-            0.1,
-            0x1234567,
-            0x11112222333344445555666677778888999900,     // One byte less than an address
-            0x1111222233334444555566667777888899990000,   // Address
-            0x111122223333444455556666777788889999000011, // One byte more than an address
-            0x00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff,  // exactly 32 bytes
-            -0x0000000000000000000000000000000000000000000000000000000000000001, // exactly 32 bytes
-            bytes(bytes32(0x00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff))[:],
-            f,
-            (),
-            (0, 0),
-            [0],
-            [0][:],
-            [0][0],
-            new C(),
-            S(0),
-            E.A
-        );
-    }
-}
-// ----
-// TypeError 9640: (698-780): Explicit type conversion not allowed from "bytes32" to "bytes memory".
-// TypeError 1227: (698-783): Index range access is only supported for dynamic calldata arrays.
-// TypeError 1227: (865-871): Index range access is only supported for dynamic calldata arrays.
-// TypeError 9977: (134-139): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
-// TypeError 9977: (153-154): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_1 provided.
-// TypeError 9977: (168-172): Invalid type for argument in the string.concat function call. string type is required, but t_rational_10000000000_by_1 provided.
-// TypeError 9977: (186-191): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10000000000 provided.
-// TypeError 9977: (205-208): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10 provided.
-// TypeError 9977: (222-231): Invalid type for argument in the string.concat function call. string type is required, but t_rational_19088743_by_1 provided.
-// TypeError 9977: (245-285): Invalid type for argument in the string.concat function call. string type is required, but t_rational_380605192295934637532253317235440047844071680_by_1 provided.
-// TypeError 9977: (336-378): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
-// TypeError 9977: (405-449): Invalid type for argument in the string.concat function call. string type is required, but t_rational_24943341882306372405313753398341798975509081620497_by_1 provided.
-// TypeError 9977: (496-562): Invalid type for argument in the string.concat function call. string type is required, but t_rational_30272441630670900764332283662402067049651745785153368133042924362431065855_by_1 provided.
-// TypeError 9977: (597-664): Invalid type for argument in the string.concat function call. string type is required, but t_rational_minus_1_by_1 provided.
-// TypeError 9977: (698-783): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr_slice provided.
-// TypeError 9977: (797-798): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
-// TypeError 9977: (812-814): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$__$ provided.
-// TypeError 9977: (828-834): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$_t_rational_0_by_1_$_t_rational_0_by_1_$ provided.
-// TypeError 9977: (848-851): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr provided.
-// TypeError 9977: (865-871): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr_slice provided.
-// TypeError 9977: (885-891): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
-// TypeError 9977: (905-912): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$61 provided.
-// TypeError 9977: (926-930): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
-// TypeError 9977: (944-947): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
deleted file mode 100644
index c1b2b4513db0..000000000000
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-contract C {
-    function f() public pure {
-        string.concat(
-            0,
-            -0,
-            0.0,
-            -0.0,
-            0e10,
-            -0e10,
-            0e-10,
-            -0e-10,
-            (0),
-            0x00,
-            -0x00,
-            0x0000000000000000000000000000000000000000000000000000000000000000, // exactly 32 bytes
-            -0x0000000000000000000000000000000000000000000000000000000000000000 // exactly 32 bytes
-        );
-    }
-}
-// ----
-// TypeError 9977: (79-80): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (94-96): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (110-113): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (127-131): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (145-149): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (163-168): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (182-187): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (201-207): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (221-224): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (238-242): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (256-261): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (275-341): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (375-442): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
diff --git a/test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol b/test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol
deleted file mode 100644
index 981f5fdd5e01..000000000000
--- a/test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (string memory) {
-        return "
;
-    }
-}
-// ----
-// ParserError 8936: (86-88): Invalid character in string. If you are trying to use Unicode characters, use a unicode"..." string literal.
diff --git a/test/libsolidity/syntaxTests/string/hex_as_identifier.sol b/test/libsolidity/syntaxTests/string/hex_as_identifier.sol
deleted file mode 100644
index 063b52b89a6a..000000000000
--- a/test/libsolidity/syntaxTests/string/hex_as_identifier.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-function g() pure {
-    assembly { let hex := 1 }
-}
-// ----
-// ParserError 2314: (39-42): Expected identifier but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol b/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol
deleted file mode 100644
index 1972990ef59c..000000000000
--- a/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "\t\b\f";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 8936: (100-105): Invalid escape sequence.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol
deleted file mode 100644
index 3ad1c4b56617..000000000000
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    string s = string("\xa0\x00");
-}
-// ----
-// TypeError 9640: (28-46): Explicit type conversion not allowed from "literal_string hex"a000"" to "string memory". Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol
deleted file mode 100644
index a089137dc130..000000000000
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    string s = hex"a000";
-}
-// ----
-// TypeError 7407: (28-37): Type literal_string hex"a000" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol
deleted file mode 100644
index 98d83e1d40d3..000000000000
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    string s = "\xa0\x00";
-}
-// ----
-// TypeError 7407: (28-38): Type literal_string hex"a000" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_in_bytes.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_in_bytes.sol
deleted file mode 100644
index c5af0d094f10..000000000000
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_in_bytes.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    bytes b1 = "\xa0\x00";
-    bytes32 b2 = "\xa0\x00";
-    bytes b3 = hex"a000";
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol
deleted file mode 100644
index f8df14ca5760..000000000000
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    string s = unicode"À";
-}
-// ----
-// SyntaxError 8452: (28-38): Contains invalid UTF-8 sequence at position 0.
-// TypeError 7407: (28-38): Type literal_string hex"c0" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/large_utf8_codepoint.sol b/test/libsolidity/syntaxTests/string/large_utf8_codepoint.sol
deleted file mode 100644
index ea13293a2843..000000000000
--- a/test/libsolidity/syntaxTests/string/large_utf8_codepoint.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    string s = "\xf0\x9f\xa6\x84";
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_ascii.sol b/test/libsolidity/syntaxTests/string/string_ascii.sol
deleted file mode 100644
index 47014df535e0..000000000000
--- a/test/libsolidity/syntaxTests/string/string_ascii.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public pure returns (string memory) {
-        return "hello world";
-    }
-    function g() public pure returns (string memory) {
-        return unicode"hello world";
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_escapes.sol b/test/libsolidity/syntaxTests/string/string_escapes.sol
deleted file mode 100644
index 95739062b849..000000000000
--- a/test/libsolidity/syntaxTests/string/string_escapes.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "\n\r\'\"\\";
-        return escapeCharacters;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol b/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol
deleted file mode 100644
index 54cccbcc5c80..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = hex"aa" hex"b";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 5428: (108-112): Expected even number of hex-nibbles.
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_newline_with_hex_prefix.sol b/test/libsolidity/syntaxTests/string/string_multipart_newline_with_hex_prefix.sol
deleted file mode 100644
index 1d4de1759b2b..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_newline_with_hex_prefix.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = hex"0000"
-        hex"deaf"
-        hex"feed";
-        return escapeCharacters;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol b/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol
deleted file mode 100644
index cf46d536e97a..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = hex"0000"
-        "deaf"
-        "feed";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 2314: (118-124): Expected ';' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol b/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol
deleted file mode 100644
index ff54daa1e243..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = hex"aa" hex"bb" "cc";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 2314: (116-120): Expected ';' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol b/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol
deleted file mode 100644
index 6d0c29e0e2a8..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "foo" "bar" hex"aa";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 2314: (112-119): Expected ';' but got 'HexStringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_single_line.sol b/test/libsolidity/syntaxTests/string/string_multipart_single_line.sol
deleted file mode 100644
index c07bde30c45b..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_single_line.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "first" "second" "third";
-        return escapeCharacters;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_unicode.sol b/test/libsolidity/syntaxTests/string/string_multipart_unicode.sol
deleted file mode 100644
index 669413992952..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_unicode.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = unicode"foo" unicode"😃, 😭, and 😈" unicode"!";
-        return escapeCharacters;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol b/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol
deleted file mode 100644
index 6264799bd2e4..000000000000
--- a/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "foo" hex"aa" unicode"😃, 😭, and 😈" "!" hex"00";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 2314: (106-113): Expected ';' but got 'HexStringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_new_line.sol b/test/libsolidity/syntaxTests/string/string_new_line.sol
deleted file mode 100644
index b7d28c52607a..000000000000
--- a/test/libsolidity/syntaxTests/string/string_new_line.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "This a test
-        ";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 8936: (100-112): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol b/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol
deleted file mode 100644
index 715630feae79..000000000000
--- a/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "text \";
-        return escapeCharacters;
-    }
-}
-// ----
-// ParserError 8936: (100-109): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/string_unicode.sol b/test/libsolidity/syntaxTests/string/string_unicode.sol
deleted file mode 100644
index 0f70121bec75..000000000000
--- a/test/libsolidity/syntaxTests/string/string_unicode.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f() public pure returns (string memory) {
-        return unicode"😃, 😭, and 😈";
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol b/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
deleted file mode 100644
index 581d9dd7d792..000000000000
--- a/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (string memory) {
-        return "😃, 😭, and 😈";
-    }
-}
-// ----
-// ParserError 8936: (86-88): Invalid character in string. If you are trying to use Unicode characters, use a unicode"..." string literal.
diff --git a/test/libsolidity/syntaxTests/string/string_unterminated.sol b/test/libsolidity/syntaxTests/string/string_unterminated.sol
deleted file mode 100644
index 9142fdea43c1..000000000000
--- a/test/libsolidity/syntaxTests/string/string_unterminated.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (bytes32) {
-        bytes32 escapeCharacters = "This a test
-    }
-}
-// ----
-// ParserError 8936: (100-112): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol b/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol
deleted file mode 100644
index 85a822b92b21..000000000000
--- a/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract test {
-    function f() pure public { "abc\
-// ----
-// ParserError 8936: (47-53): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/unicode_escape_literals.sol b/test/libsolidity/syntaxTests/string/unicode_escape_literals.sol
deleted file mode 100644
index c3e419265db2..000000000000
--- a/test/libsolidity/syntaxTests/string/unicode_escape_literals.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract test {
-    function oneByteUTF8() public pure returns (bytes32) {
-        bytes32 usdollar = "aaa\u0024aaa";
-        return usdollar;
-    }
-
-    function twoBytesUTF8() public pure returns (bytes32) {
-        bytes32 cent = "aaa\u00A2aaa";
-        return cent;
-    }
-
-    function threeBytesUTF8() public pure returns (bytes32) {
-        bytes32 eur = "aaa\u20ACaaa";
-        return  eur;
-    }
-
-    function combined() public pure returns (bytes32) {
-        bytes32 res = "\u0024\u00A2\u20AC";
-        return res;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol b/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol
deleted file mode 100644
index 975c5ac39741..000000000000
--- a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-    function f() public pure returns (string memory) {
-        return "\xc1";
-    }
-}
-// ----
-// TypeError 6359: (86-92): Return argument type literal_string hex"c1" is not implicitly convertible to expected type (type of first return variable) string memory. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol b/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol
deleted file mode 100644
index 6afcd94afcff..000000000000
--- a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract test {
-    // this function returns an invalid unicode character
-    function invalidLiteral() public pure returns (bytes32) {
-        bytes32 invalid = "\u00xx";
-        return invalid;
-    }
-
-}
-// ----
-// ParserError 8936: (162-165): Invalid escape sequence.
diff --git a/test/libsolidity/syntaxTests/structs/address_member_access.sol b/test/libsolidity/syntaxTests/structs/address_member_access.sol
deleted file mode 100644
index 5d8c219dd320..000000000000
--- a/test/libsolidity/syntaxTests/structs/address_member_access.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    struct S { uint a; }
-    function f() public pure returns(address) {
-        S memory s = S(42);
-        return s.address;
-    }
-}
-// ----
-// TypeError 9582: (129-138): Member "address" not found or not visible after argument-dependent lookup in struct C.S memory.
diff --git a/test/libsolidity/syntaxTests/structs/address_member_declaration.sol b/test/libsolidity/syntaxTests/structs/address_member_declaration.sol
deleted file mode 100644
index 575c0fe73df0..000000000000
--- a/test/libsolidity/syntaxTests/structs/address_member_declaration.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    struct S { uint address; }
-}
-// ----
-// ParserError 2314: (33-40): Expected identifier but got 'address'
diff --git a/test/libsolidity/syntaxTests/structs/array_calldata.sol b/test/libsolidity/syntaxTests/structs/array_calldata.sol
deleted file mode 100644
index 30ca2ebed250..000000000000
--- a/test/libsolidity/syntaxTests/structs/array_calldata.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    struct S { int a; }
-    function f(S[] calldata) external { }
-    function f(S[][] calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/calldata.sol b/test/libsolidity/syntaxTests/structs/calldata.sol
deleted file mode 100644
index 420cc6b7fd98..000000000000
--- a/test/libsolidity/syntaxTests/structs/calldata.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    struct S { int a; }
-    function f(S calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol b/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol
deleted file mode 100644
index 33b10f5f5af3..000000000000
--- a/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    struct S { int[3] a; }
-    function f(S calldata s, int[3] calldata a) external {
-        s.a = a;
-    }
-}
-// ----
-// TypeError 4156: (144-147): Calldata structs are read-only.
diff --git a/test/libsolidity/syntaxTests/structs/calldata_assign.sol b/test/libsolidity/syntaxTests/structs/calldata_assign.sol
deleted file mode 100644
index 798e6dd608ec..000000000000
--- a/test/libsolidity/syntaxTests/structs/calldata_assign.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    struct S { int a; }
-    function f(S calldata s) external { s.a = 4; }
-}
-// ----
-// TypeError 4156: (114-117): Calldata structs are read-only.
diff --git a/test/libsolidity/syntaxTests/structs/calldata_dynamic.sol b/test/libsolidity/syntaxTests/structs/calldata_dynamic.sol
deleted file mode 100644
index 8e3f1954de8d..000000000000
--- a/test/libsolidity/syntaxTests/structs/calldata_dynamic.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-	struct S { int[] a; }
-	function f(S calldata) external { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/calldata_struct_function_type.sol b/test/libsolidity/syntaxTests/structs/calldata_struct_function_type.sol
deleted file mode 100644
index b2e5f6e2c111..000000000000
--- a/test/libsolidity/syntaxTests/structs/calldata_struct_function_type.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { function (uint) external returns (uint) fn; }
-    function f(S calldata s) external returns (uint256 a) {
-        return s.fn(42);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol b/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
deleted file mode 100644
index 9ff30c6ec063..000000000000
--- a/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract test {
-    struct S {
-        T t;
-    }
-    struct T {
-        mapping (uint => uint) k;
-    }
-    function f(S calldata b) external {
-    }
-}
-// ----
-// TypeError 4103: (155-167): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol b/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol
deleted file mode 100644
index 7f178ed9844b..000000000000
--- a/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract S {}
-struct S { uint256 a; }
-// ----
-// DeclarationError 2333: (14-37): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/structs/global_struct.sol b/test/libsolidity/syntaxTests/structs/global_struct.sol
deleted file mode 100644
index 010fdfcd7c17..000000000000
--- a/test/libsolidity/syntaxTests/structs/global_struct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-struct S { uint a; }
-contract C {
-    function f() public pure {
-        S memory s = S(42);
-        s;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol b/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol
deleted file mode 100644
index bf13b2db763b..000000000000
--- a/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-struct S { uint256 a; }
-contract S {}
-// ----
-// DeclarationError 2333: (24-37): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol b/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol
deleted file mode 100644
index 53615fb42747..000000000000
--- a/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-struct S { uint a; }
-contract C {
-    struct S { address x; }
-    function f() public view {
-        S memory s = S(address(this));
-        s;
-    }
-}
-// ----
-// Warning 2519: (38-61): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol b/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol
deleted file mode 100644
index 1590f7ad1a4a..000000000000
--- a/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-struct S { uint256 a; }
-struct S { uint256 a; }
-// ----
-// DeclarationError 2333: (24-47): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/structs/illegal_names.sol b/test/libsolidity/syntaxTests/structs/illegal_names.sol
deleted file mode 100644
index 48e7d93a908a..000000000000
--- a/test/libsolidity/syntaxTests/structs/illegal_names.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-struct this { uint a; }
-struct super { uint b; }
-struct _ { uint c; }
-
-contract C {
-	this a;
-	super b;
-	_ c;
-}
-// ----
-// DeclarationError 3726: (0-23): The name "this" is reserved.
-// DeclarationError 3726: (24-48): The name "super" is reserved.
-// DeclarationError 3726: (49-69): The name "_" is reserved.
-// Warning 2319: (0-23): This declaration shadows a builtin symbol.
-// Warning 2319: (24-48): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol b/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol
deleted file mode 100644
index 8871e3f82732..000000000000
--- a/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  struct S {t t;}
-  function f(function(S memory) external) public {}
-}
-// ----
-// DeclarationError 7920: (25-26): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_eq_name_2.sol b/test/libsolidity/syntaxTests/structs/member_type_eq_name_2.sol
deleted file mode 100644
index 12abeb28e6b1..000000000000
--- a/test/libsolidity/syntaxTests/structs/member_type_eq_name_2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    enum E {a, b, c}
-    struct S {E X; uint E;}
-    struct T {E T; uint E;}
-    struct U {E E;}
-}
diff --git a/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol b/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol
deleted file mode 100644
index cd09c1d74a10..000000000000
--- a/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    enum E {a, b, c}
-    struct S {function (E X) external f; uint E;}
-    struct T {function (E T) external f; uint E;}
-    struct U {function (E E) external f;}
-}
-// ----
-// Warning 6162: (58-61): Naming function type parameters is deprecated.
-// Warning 6162: (108-111): Naming function type parameters is deprecated.
-// Warning 6162: (158-161): Naming function type parameters is deprecated.
-// Warning 2519: (108-111): This declaration shadows an existing declaration.
-// Warning 2519: (158-161): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_func.sol b/test/libsolidity/syntaxTests/structs/member_type_func.sol
deleted file mode 100644
index dca3086fe416..000000000000
--- a/test/libsolidity/syntaxTests/structs/member_type_func.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public {}
-  struct S {f x;}
-  function g(function(S memory) external) public {}
-}
-// ----
-// TypeError 5172: (50-51): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol b/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol
deleted file mode 100644
index 56d26a27adc4..000000000000
--- a/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract Test {
-    struct S { int a; }
-    function f(S calldata s) external { s = S(2); }
-    function g(S calldata s) external { S memory m; s = m; }
-}
-// ----
-// TypeError 7407: (118-122): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
-// TypeError 7407: (182-183): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/multi_struct_composition.sol b/test/libsolidity/syntaxTests/structs/recursion/multi_struct_composition.sol
deleted file mode 100644
index 40f1eca8d80e..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/multi_struct_composition.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-  struct T { U u; V v; }
-
-  struct U { W w; }
-
-  struct V { W w; }
-
-  struct W { uint x; }
-
-  function f(T memory) public pure { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/parallel_structs.sol b/test/libsolidity/syntaxTests/structs/recursion/parallel_structs.sol
deleted file mode 100644
index 3bd34360a082..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/parallel_structs.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-pragma abicoder               v2;
-
-contract TestContract
-{
-    struct SubStruct {
-        uint256 id;
-    }
-    struct TestStruct {
-        SubStruct subStruct1;
-        SubStruct subStruct2;
-    }
-    function addTestStruct(TestStruct memory) public pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol
deleted file mode 100644
index 2f29d3d44c29..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma abicoder               v2;
-
-contract Test {
-    struct MyStructName {
-        address addr;
-        MyStructName[] x;
-    }
-
-    function f(MyStructName memory s) public {}
-}
-// ----
-// TypeError 4103: (147-168): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_library_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_library_function_parameter.sol
deleted file mode 100644
index 37685dc8d0c1..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_library_function_parameter.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library Test {
-    struct MyStructName {
-        address addr;
-        MyStructName[] x;
-    }
-
-    function f(MyStructName storage s) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol
deleted file mode 100644
index 6739a89858bc..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma abicoder               v2;
-
-library Test {
-    struct MyStructName {
-        address addr;
-        MyStructName[] x;
-    }
-
-    function f(MyStructName memory _x) public {
-    }
-}
-// ----
-// TypeError 4103: (146-168): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol
deleted file mode 100644
index 3e429d5b33c2..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    function f(Data.S memory a) public {}
-}
-contract Data {
-    struct S { S[] x; }
-}
-// ----
-// TypeError 4103: (63-78): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_function_pointer.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_function_pointer.sol
deleted file mode 100644
index 5856e9efa942..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_function_pointer.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S {
-        uint a;
-        function() external returns (S memory) sub;
-    }
-    function f() public pure returns (S memory) {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
deleted file mode 100644
index c8708e3e0d53..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library a {
-    struct b {
-        mapping (uint => b) c ;
-    }
-    // Segfaults in https://github.com/ethereum/solidity/issues/9443
-    function d(b memory) public {}
-}
-// ----
-// TypeError 4103: (149-157): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_storage.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_storage.sol
deleted file mode 100644
index a83540e35e46..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_storage.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library a {
-    struct b {
-        mapping (uint => b) c ;
-    }
-    function d(b storage) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol
deleted file mode 100644
index 22f026ee8872..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library Test {
-    struct MyStructName {
-        address addr;
-        MyStructName[] x;
-        function() internal y;
-    }
-
-    function f(MyStructName storage s) public {}
-}
-// ----
-// TypeError 4103: (142-164): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol
deleted file mode 100644
index 043dcd658997..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint a; S[] sub; }
-    function f() public pure returns (uint, S memory) {
-    }
-}
-// ----
-// TypeError 4103: (126-134): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol
deleted file mode 100644
index 05a53a71b11f..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint a; S[2][] sub; }
-    function f() public pure returns (uint, S memory) {
-    }
-}
-// ----
-// TypeError 4103: (129-137): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol
deleted file mode 100644
index 118dc1973288..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma abicoder               v2;
-
-contract C {
-    struct S { uint a; S[][][] sub; }
-    struct T { S s; }
-    function f() public pure returns (uint x, T memory t) {
-    }
-}
-// ----
-// TypeError 4103: (154-164): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/static_array_of_recursive_structs.sol b/test/libsolidity/syntaxTests/structs/recursion/static_array_of_recursive_structs.sol
deleted file mode 100644
index f9d67d8b8020..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/static_array_of_recursive_structs.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    struct RecursiveStruct {
-        RecursiveStruct[] vals;
-    }
-
-    function func() private pure {
-        RecursiveStruct[1] memory val;
-        val;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive.sol
deleted file mode 100644
index b3fd38c5406e..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Test {
-    struct MyStructName {
-        address addr;
-        MyStructName x;
-    }
-}
-// ----
-// TypeError 2046: (20-93): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive_dynamic_array.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive_dynamic_array.sol
deleted file mode 100644
index d847f17c2a1f..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive_dynamic_array.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Test {
-    struct MyStructName {
-        address addr;
-        MyStructName[] x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive_fixed_array.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive_fixed_array.sol
deleted file mode 100644
index ef222ace4f4e..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive_fixed_array.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Test {
-    struct MyStructName {
-        address addr;
-        MyStructName[1] x;
-    }
-}
-// ----
-// TypeError 2046: (20-96): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive.sol
deleted file mode 100644
index 5dab5e64e037..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2 x;
-    }
-    struct MyStructName2 {
-        MyStructName1 x;
-    }
-}
-// ----
-// TypeError 2046: (20-118): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_complex.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_complex.sol
deleted file mode 100644
index f7fbcdc30cfd..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_complex.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName4[1] x;
-    }
-    struct MyStructName2 {
-        MyStructName1 x;
-    }
-    struct MyStructName3 {
-        MyStructName2[1] x;
-    }
-    struct MyStructName4 {
-        MyStructName3 x;
-    }
-}
-// ----
-// TypeError 2046: (20-121): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array1.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array1.sol
deleted file mode 100644
index 10d7de2ce375..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array1.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2[] x;
-    }
-    struct MyStructName2 {
-        MyStructName1 x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array2.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array2.sol
deleted file mode 100644
index f20510ca670f..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2 x;
-    }
-    struct MyStructName2 {
-        MyStructName1[] x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array3.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array3.sol
deleted file mode 100644
index 69747e71f93d..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_array3.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2[] x;
-    }
-    struct MyStructName2 {
-        MyStructName1[] x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_multi_array.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_multi_array.sol
deleted file mode 100644
index b350782863c7..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_dynamic_multi_array.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract Test {
-    struct S1 {
-        S2[1][] x;
-    }
-    struct S2 {
-        S1 x;
-    }
-    struct T1 {
-        T2[][1] x;
-    }
-    struct T2 {
-        T1 x;
-    }
-    struct R1 {
-        R2[][] x;
-    }
-    struct R2 {
-        R1 x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array1.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array1.sol
deleted file mode 100644
index 452facc15d13..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2[1] x;
-    }
-    struct MyStructName2 {
-        MyStructName1 x;
-    }
-}
-// ----
-// TypeError 2046: (20-121): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array2.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array2.sol
deleted file mode 100644
index 54fcdafb7bfd..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array2.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2 x;
-    }
-    struct MyStructName2 {
-        MyStructName1[1] x;
-    }
-}
-// ----
-// TypeError 2046: (20-118): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array3.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array3.sol
deleted file mode 100644
index ec9116a43413..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_array3.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2[1] x;
-    }
-    struct MyStructName2 {
-        MyStructName1[1] x;
-    }
-}
-// ----
-// TypeError 2046: (20-121): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_multi_array.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_multi_array.sol
deleted file mode 100644
index 143171b4ef94..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive_fixed_multi_array.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        MyStructName2[1][1] x;
-    }
-    struct MyStructName2 {
-        MyStructName1 x;
-    }
-}
-// ----
-// TypeError 2046: (20-124): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive.sol
deleted file mode 100644
index 56ccbf05eaab..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Test {
-    struct S1 { uint a; }
-    struct S2 { S1 x; S1 y; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive_array.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive_array.sol
deleted file mode 100644
index 963904a063a1..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive_array.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Test {
-    struct S1 { uint a; }
-    struct S2 { S1[1] x; S1[1] y; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_recursion_via_mapping.sol b/test/libsolidity/syntaxTests/structs/recursion/struct_definition_recursion_via_mapping.sol
deleted file mode 100644
index 8ae151e9f1ef..000000000000
--- a/test/libsolidity/syntaxTests/structs/recursion/struct_definition_recursion_via_mapping.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract Test {
-    struct MyStructName1 {
-        address addr;
-        uint256 count;
-        mapping(uint => MyStructName1) x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/super/super_in_function.sol b/test/libsolidity/syntaxTests/super/super_in_function.sol
deleted file mode 100644
index 5156ddd35aea..000000000000
--- a/test/libsolidity/syntaxTests/super/super_in_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-}
-function f() pure {
-    super;
-}
-// ----
-// DeclarationError 7576: (39-44): Undeclared identifier. "super" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/super/super_in_library.sol b/test/libsolidity/syntaxTests/super/super_in_library.sol
deleted file mode 100644
index 299df290c9b5..000000000000
--- a/test/libsolidity/syntaxTests/super/super_in_library.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L {
-  function f() public {
-    (super);
-  }
-}
-// ----
-// DeclarationError 7576: (41-46): Undeclared identifier. "super" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/tight_packing_literals.sol b/test/libsolidity/syntaxTests/tight_packing_literals.sol
deleted file mode 100644
index 45211452fd8a..000000000000
--- a/test/libsolidity/syntaxTests/tight_packing_literals.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function k() pure public returns (bytes memory) {
-        return abi.encodePacked(1);
-    }
-}
-
-// ----
-// TypeError 7279: (99-100): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/tight_packing_literals_fine.sol b/test/libsolidity/syntaxTests/tight_packing_literals_fine.sol
deleted file mode 100644
index 45fc1f723a00..000000000000
--- a/test/libsolidity/syntaxTests/tight_packing_literals_fine.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function k() pure public returns (bytes memory) {
-        return abi.encodePacked(uint8(1));
-    }
-    function l() pure public returns (bytes memory) {
-        return abi.encode(1);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol b/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol
deleted file mode 100644
index 49ee9ad5e89f..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    struct gas { uint a; }
-    function f() public returns (uint, uint) {
-        try this.f() {
-            gas memory x;
-        } catch Error(string memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (73-77): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (79-83): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (122-134): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/catch_error.sol b/test/libsolidity/syntaxTests/tryCatch/catch_error.sol
deleted file mode 100644
index ccdfac28b98f..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/catch_error.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch Error(string memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol b/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol
deleted file mode 100644
index 590c6cbba077..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch Error(string memory x) {
-            x;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol b/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol
deleted file mode 100644
index 68e7cc32ff29..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch (bytes memory x) {
-            x;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/creation.sol b/test/libsolidity/syntaxTests/tryCatch/creation.sol
deleted file mode 100644
index d92c179dc918..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/creation.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract D {
-}
-contract C {
-    function f() public {
-        try new D() {
-        } catch (bytes memory x) {
-            x;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol b/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol
deleted file mode 100644
index eb8e45e8ad28..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Foo {
-    function test() public {
-        try this.f() {}
-        catch Error(string reason) {}
-    }
-
-    function f() public {
-    }
-}
-// ----
-// TypeError 6651: (88-101): Data location must be "memory" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/double_panic.sol b/test/libsolidity/syntaxTests/tryCatch/double_panic.sol
deleted file mode 100644
index 27ce26330ab7..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/double_panic.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-        } catch Panic(bytes memory) {
-        } catch Panic(uint) {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 1271: (72-109): Expected `catch Panic(uint ...) { ... }`.
-// TypeError 6732: (110-139): This try statement already has a "Panic" catch clause.
diff --git a/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol b/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol
deleted file mode 100644
index 926e944df6c6..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-        } catch Panic(uint) {
-        } catch Panic(uint) {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 6732: (102-131): This try statement already has a "Panic" catch clause.
diff --git a/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol b/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol
deleted file mode 100644
index edb3c5301fa5..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    function a() public pure {
-        try this.a() {} catch (string payable memory) {}
-    }
-    function c() public pure {
-        try this.c() {} catch (bytes payable memory) {}
-    }
-}
-contract C2 {
-    function a() public pure {
-        try this.a() {} catch (string view memory) {}
-    }
-    function c() public pure {
-        try this.c() {} catch (bytes view memory) {}
-    }
-}
-contract C3 {
-    function a() public pure {
-        try this.a() {} catch (string pure memory) {}
-    }
-    function c() public pure {
-        try this.c() {} catch (bytes pure memory) {}
-    }
-}
-// ----
-// ParserError 9106: (82-89): State mutability can only be specified for address types.
-// ParserError 9106: (175-182): State mutability can only be specified for address types.
-// ParserError 9106: (285-289): State mutability can only be specified for address types.
-// ParserError 9106: (375-379): State mutability can only be specified for address types.
-// ParserError 9106: (482-486): State mutability can only be specified for address types.
-// ParserError 9106: (572-576): State mutability can only be specified for address types.
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol b/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol
deleted file mode 100644
index bc16f19c7a2e..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol
+++ /dev/null
@@ -1,163 +0,0 @@
-contract C {
-    function a() public pure returns (bool) {
-        try this.a() returns (bool payable res) {} catch {}
-    }
-    function b() public pure returns (string) {
-        try this.b() returns (string payable res) {} catch {}
-    }
-    function c() public pure returns (int) {
-        try this.c() returns (int payable res) {} catch {}
-    }
-    function d() public pure returns (int256) {
-        try this.d() returns (int256 payable res) {} catch {}
-    }
-    function e() public pure returns (uint) {
-        try this.e() returns (uint payable res) {} catch {}
-    }
-    function f() public pure returns (uint256) {
-        try this.f() returns (uint256 payable res) {} catch {}
-    }
-    function g() public pure returns (bytes1) {
-        try this.g() returns (bytes1 payable res) {} catch {}
-    }
-    function h() public pure returns (bytes) {
-        try this.h() returns (bytes payable res) {} catch {}
-    }
-    function i() public pure returns (bytes32) {
-        try this.i() returns (bytes32 payable res) {} catch {}
-    }
-    function j() public pure returns (fixed) {
-        try this.j() returns (fixed payable res) {} catch {}
-    }
-    function k() public pure returns (fixed80x80) {
-        try this.k() returns (fixed80x80 payable res) {} catch {}
-    }
-    function l() public pure returns (ufixed) {
-        try this.l() returns (ufixed payable res) {} catch {}
-    }
-    function m() public pure returns (ufixed80x80) {
-        try this.m() returns (ufixed80x80 payable res) {} catch {}
-    }
-}
-contract C1 {
-    function a() public pure returns (bool) {
-        try this.a() returns (bool view res) {} catch {}
-    }
-    function b() public pure returns (string) {
-        try this.b() returns (string view res) {} catch {}
-    }
-    function c() public pure returns (int) {
-        try this.c() returns (int view res) {} catch {}
-    }
-    function d() public pure returns (int256) {
-        try this.d() returns (int256 view res) {} catch {}
-    }
-    function e() public pure returns (uint) {
-        try this.e() returns (uint view res) {} catch {}
-    }
-    function f() public pure returns (uint256) {
-        try this.f() returns (uint256 view res) {} catch {}
-    }
-    function g() public pure returns (bytes1) {
-        try this.g() returns (bytes1 view res) {} catch {}
-    }
-    function h() public pure returns (bytes) {
-        try this.h() returns (bytes view res) {} catch {}
-    }
-    function i() public pure returns (bytes32) {
-        try this.i() returns (bytes32 view res) {} catch {}
-    }
-    function j() public pure returns (fixed) {
-        try this.j() returns (fixed view res) {} catch {}
-    }
-    function k() public pure returns (fixed80x80) {
-        try this.k() returns (fixed80x80 view res) {} catch {}
-    }
-    function l() public pure returns (ufixed) {
-        try this.l() returns (ufixed view res) {} catch {}
-    }
-    function m() public pure returns (ufixed80x80) {
-        try this.m() returns (ufixed80x80 view res) {} catch {}
-    }
-}
-contract C2 {
-    function a() public pure returns (bool) {
-        try this.a() returns (bool pure res) {} catch {}
-    }
-    function b() public pure returns (string) {
-        try this.b() returns (string pure res) {} catch {}
-    }
-    function c() public pure returns (int) {
-        try this.c() returns (int pure res) {} catch {}
-    }
-    function d() public pure returns (int256) {
-        try this.d() returns (int256 pure res) {} catch {}
-    }
-    function e() public pure returns (uint) {
-        try this.e() returns (uint pure res) {} catch {}
-    }
-    function f() public pure returns (uint256) {
-        try this.f() returns (uint256 pure res) {} catch {}
-    }
-    function g() public pure returns (bytes1) {
-        try this.g() returns (bytes1 pure res) {} catch {}
-    }
-    function h() public pure returns (bytes) {
-        try this.h() returns (bytes pure res) {} catch {}
-    }
-    function i() public pure returns (bytes32) {
-        try this.i() returns (bytes32 pure res) {} catch {}
-    }
-    function j() public pure returns (fixed) {
-        try this.j() returns (fixed pure res) {} catch {}
-    }
-    function k() public pure returns (fixed80x80) {
-        try this.k() returns (fixed80x80 pure res) {} catch {}
-    }
-    function l() public pure returns (ufixed) {
-        try this.l() returns (ufixed pure res) {} catch {}
-    }
-    function m() public pure returns (ufixed80x80) {
-        try this.m() returns (ufixed80x80 pure res) {} catch {}
-    }
-}
-// ----
-// ParserError 9106: (94-101): State mutability can only be specified for address types.
-// ParserError 9106: (210-217): State mutability can only be specified for address types.
-// ParserError 9106: (320-327): State mutability can only be specified for address types.
-// ParserError 9106: (436-443): State mutability can only be specified for address types.
-// ParserError 9106: (548-555): State mutability can only be specified for address types.
-// ParserError 9106: (666-673): State mutability can only be specified for address types.
-// ParserError 9106: (782-789): State mutability can only be specified for address types.
-// ParserError 9106: (896-903): State mutability can only be specified for address types.
-// ParserError 9106: (1014-1021): State mutability can only be specified for address types.
-// ParserError 9106: (1128-1135): State mutability can only be specified for address types.
-// ParserError 9106: (1252-1259): State mutability can only be specified for address types.
-// ParserError 9106: (1368-1375): State mutability can only be specified for address types.
-// ParserError 9106: (1494-1501): State mutability can only be specified for address types.
-// ParserError 9106: (1622-1626): State mutability can only be specified for address types.
-// ParserError 9106: (1735-1739): State mutability can only be specified for address types.
-// ParserError 9106: (1842-1846): State mutability can only be specified for address types.
-// ParserError 9106: (1955-1959): State mutability can only be specified for address types.
-// ParserError 9106: (2064-2068): State mutability can only be specified for address types.
-// ParserError 9106: (2179-2183): State mutability can only be specified for address types.
-// ParserError 9106: (2292-2296): State mutability can only be specified for address types.
-// ParserError 9106: (2403-2407): State mutability can only be specified for address types.
-// ParserError 9106: (2518-2522): State mutability can only be specified for address types.
-// ParserError 9106: (2629-2633): State mutability can only be specified for address types.
-// ParserError 9106: (2750-2754): State mutability can only be specified for address types.
-// ParserError 9106: (2863-2867): State mutability can only be specified for address types.
-// ParserError 9106: (2986-2990): State mutability can only be specified for address types.
-// ParserError 9106: (3111-3115): State mutability can only be specified for address types.
-// ParserError 9106: (3224-3228): State mutability can only be specified for address types.
-// ParserError 9106: (3331-3335): State mutability can only be specified for address types.
-// ParserError 9106: (3444-3448): State mutability can only be specified for address types.
-// ParserError 9106: (3553-3557): State mutability can only be specified for address types.
-// ParserError 9106: (3668-3672): State mutability can only be specified for address types.
-// ParserError 9106: (3781-3785): State mutability can only be specified for address types.
-// ParserError 9106: (3892-3896): State mutability can only be specified for address types.
-// ParserError 9106: (4007-4011): State mutability can only be specified for address types.
-// ParserError 9106: (4118-4122): State mutability can only be specified for address types.
-// ParserError 9106: (4239-4243): State mutability can only be specified for address types.
-// ParserError 9106: (4352-4356): State mutability can only be specified for address types.
-// ParserError 9106: (4475-4479): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol b/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol
deleted file mode 100644
index d1ae8c52df11..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch () {
-
-        }
-    }
-}
-// ----
-// ParserError 3546: (101-102): Expected type name
diff --git a/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol b/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol
deleted file mode 100644
index aea3d6bcdd15..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() returns () {
-
-        } catch {
-
-        }
-    }
-}
-// ----
-// ParserError 3546: (69-70): Expected type name
diff --git a/test/libsolidity/syntaxTests/tryCatch/error_and_panic.sol b/test/libsolidity/syntaxTests/tryCatch/error_and_panic.sol
deleted file mode 100644
index 70e75e7d4810..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/error_and_panic.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-        } catch Error(string memory) {
-        } catch Panic(uint) {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol b/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol
deleted file mode 100644
index d7c1de93a037..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch Error(uint) {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 2943: (94-123): Expected `catch Error(string memory ...) { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol
deleted file mode 100644
index d9302ef1f069..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {} catch (string calldata a) { }
-    }
-}
-// ----
-// TypeError 6651: (70-87): Data location must be "memory" for parameter in function, but "calldata" was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol
deleted file mode 100644
index 066b1ebfe99d..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {} catch (string storage a) { }
-    }
-}
-// ----
-// TypeError 6651: (70-86): Data location must be "memory" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol
deleted file mode 100644
index d777065e6b12..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-        } catch Error2() {
-        } catch abc() {
-        }
-    }
-}
-// ----
-// TypeError 3542: (93-119): Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`.
-// TypeError 3542: (120-143): Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol
deleted file mode 100644
index b68ab1cb149f..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public returns (uint8, uint) {
-        // Implicitly convertible, but not exactly the same type.
-        try this.f() returns (uint, int x) {
-
-        } catch {
-
-        }
-    }
-}
-// ----
-// TypeError 6509: (157-161): Invalid type, expected uint8 but got uint256.
-// TypeError 6509: (163-168): Invalid type, expected uint256 but got int256.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol
deleted file mode 100644
index c9980026f541..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string storage a) {} catch { }
-    }
-}
-// ----
-// TypeError 6651: (93-109): Data location must be "memory" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol
deleted file mode 100644
index 43e04583ac13..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-==== Source: A ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint indexed a) {
-        } catch { }
-    }
-}
-==== Source: E ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch Error(string memory indexed x) {
-        }
-    }
-}
-==== Source: I ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch (bytes memory indexed x) {
-        }
-    }
-}
-// ----
-// ParserError 2314: (A:89-96): Expected ',' but got 'indexed'
-// ParserError 2314: (E:128-135): Expected ',' but got 'indexed'
-// ParserError 2314: (I:122-129): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol
deleted file mode 100644
index bbc267f8995d..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() returns (uint constant a, uint immutable b) {
-        } catch Error(string memory immutable x) {
-            x;
-        }
-
-        try this.f() returns (uint a, uint b) {
-        } catch (bytes memory immutable x) {
-            x;
-        }
-
-        try this.f() returns (uint a, uint b) {
-        } catch Error(string memory constant x) {
-            x;
-        }
-
-        try this.f() returns (uint a, uint b) {
-        } catch (bytes memory constant x) {
-            x;
-        }
-    }
-}
-// ----
-// DeclarationError 1788: (90-105): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 8297: (107-123): The "immutable" keyword can only be used for state variables.
-// DeclarationError 8297: (149-174): The "immutable" keyword can only be used for state variables.
-// DeclarationError 8297: (269-293): The "immutable" keyword can only be used for state variables.
-// DeclarationError 1788: (393-417): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 1788: (512-535): The "constant" keyword can only be used for state variables or variables at file level.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol
deleted file mode 100644
index 1828f25d3c64..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol
+++ /dev/null
@@ -1,105 +0,0 @@
-==== Source: A ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint public a) {
-        } catch { }
-    }
-}
-==== Source: B ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint private a) {
-        } catch { }
-    }
-}
-==== Source: C ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint external a) {
-        } catch { }
-    }
-}
-==== Source: D ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint internal a) {
-        } catch { }
-    }
-}
-==== Source: E ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch Error(string memory public x) {
-        }
-    }
-}
-==== Source: F ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch Error(string memory private x) {
-        }
-    }
-}
-==== Source: G ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch Error(string memory external x) {
-        }
-    }
-}
-==== Source: H ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch Error(string memory internal x) {
-        }
-    }
-}
-==== Source: I ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch (bytes memory public x) {
-        }
-    }
-}
-==== Source: J ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch (bytes memory private x) {
-        }
-    }
-}
-==== Source: K ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch (bytes memory external x) {
-        }
-    }
-}
-==== Source: L ====
-contract C {
-    function f() public returns (uint) {
-        try this.f() returns (uint) {
-        } catch (bytes memory internal x) {
-        }
-    }
-}
-// ----
-// ParserError 2314: (A:89-95): Expected ',' but got 'public'
-// ParserError 2314: (B:89-96): Expected ',' but got 'private'
-// ParserError 2314: (C:89-97): Expected ',' but got 'external'
-// ParserError 2314: (D:89-97): Expected ',' but got 'internal'
-// ParserError 2314: (E:128-134): Expected ',' but got 'public'
-// ParserError 2314: (F:128-135): Expected ',' but got 'private'
-// ParserError 2314: (G:128-136): Expected ',' but got 'external'
-// ParserError 2314: (H:128-136): Expected ',' but got 'internal'
-// ParserError 2314: (I:122-128): Expected ',' but got 'public'
-// ParserError 2314: (J:122-129): Expected ',' but got 'private'
-// ParserError 2314: (K:122-130): Expected ',' but got 'external'
-// ParserError 2314: (L:122-130): Expected ',' but got 'internal'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/tryCatch/library_call.sol b/test/libsolidity/syntaxTests/tryCatch/library_call.sol
deleted file mode 100644
index b2ceaa6a5b2b..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/library_call.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-library L {
-    struct S { uint x; }
-    function integer(uint t, bool b) public pure returns (uint) {
-        if (b) {
-            return t;
-        } else {
-            revert("failure");
-        }
-    }
-    function stru(S storage t, bool b) public view returns (uint) {
-        if (b) {
-            return t.x;
-        } else {
-            revert("failure");
-        }
-    }
-}
-contract C {
-    using L for L.S;
-    L.S t;
-    function f(bool b) public pure returns (uint, string memory) {
-        uint x = 8;
-        try L.integer(x, b) returns (uint _x) {
-            return (_x, "");
-        } catch Error(string memory message) {
-            return (18, message);
-        }
-    }
-    function g(bool b) public returns (uint, string memory) {
-        t.x = 9;
-        try t.stru(b) returns (uint x) {
-            return (x, "");
-        } catch Error(string memory message) {
-            return (19, message);
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol
deleted file mode 100644
index 1588301bb8aa..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch (bytes memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (homestead). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol
deleted file mode 100644
index 19728ca22d84..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch (bytes memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: =spuriousDragon
-// ----
-// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (spuriousDragon). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol
deleted file mode 100644
index 33d17d846787..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch (bytes memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: =tangerineWhistle
-// ----
-// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (tangerineWhistle). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol
deleted file mode 100644
index 10c6d3851263..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch (uint) {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 6231: (94-118): Expected `catch (bytes memory ...) { ... }` or `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol b/test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol
deleted file mode 100644
index 88df3f5bad60..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol
+++ /dev/null
@@ -1,132 +0,0 @@
-==== Source: A1 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string memory memory a) { } catch { }
-    }
-}
-==== Source: A2 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string memory storage a) { } catch { }
-    }
-}
-==== Source: A3 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string memory calldata a) { } catch { }
-    }
-}
-
-==== Source: B1 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string calldata memory a) { } catch { }
-    }
-}
-==== Source: B2 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string calldata storage a) { } catch { }
-    }
-}
-==== Source: B3 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string calldata calldata a) { } catch { }
-    }
-}
-
-==== Source: C1 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string storage memory a) { } catch { }
-    }
-}
-==== Source: C2 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string storage storage a) { } catch { }
-    }
-}
-==== Source: C3 ====
-contract C {
-    function f() public returns (string memory) {
-        try this.f() returns (string storage calldata a) { } catch { }
-    }
-}
-
-==== Source: D1 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string memory memory x) { }
-    }
-}
-==== Source: D2 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string memory calldata x) { }
-    }
-}
-==== Source: D3 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string memory storage x) { }
-    }
-}
-
-==== Source: E1 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string calldata memory x) { }
-    }
-}
-==== Source: E2 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string calldata calldata x) { }
-    }
-}
-==== Source: E3 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string calldata storage x) { }
-    }
-}
-
-==== Source: G1 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string storage memory x) { }
-    }
-}
-==== Source: G2 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string storage calldata x) { }
-    }
-}
-==== Source: G3 ====
-contract C {
-    function f() public {
-        try this.f() {}  catch (string storage storage x) { }
-    }
-}
-// ----
-// ParserError 3548: (A1:107-113): Location already specified.
-// ParserError 3548: (A2:107-114): Location already specified.
-// ParserError 3548: (A3:107-115): Location already specified.
-// ParserError 3548: (B1:109-115): Location already specified.
-// ParserError 3548: (B2:109-116): Location already specified.
-// ParserError 3548: (B3:109-117): Location already specified.
-// ParserError 3548: (C1:108-114): Location already specified.
-// ParserError 3548: (C2:108-115): Location already specified.
-// ParserError 3548: (C3:108-116): Location already specified.
-// ParserError 3548: (D1:85-91): Location already specified.
-// ParserError 3548: (D2:85-93): Location already specified.
-// ParserError 3548: (D3:85-92): Location already specified.
-// ParserError 3548: (E1:87-93): Location already specified.
-// ParserError 3548: (E2:87-95): Location already specified.
-// ParserError 3548: (E3:87-94): Location already specified.
-// ParserError 3548: (G1:86-92): Location already specified.
-// ParserError 3548: (G2:86-94): Location already specified.
-// ParserError 3548: (G3:86-93): Location already specified.
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_catch.sol b/test/libsolidity/syntaxTests/tryCatch/no_catch.sol
deleted file mode 100644
index 1563b227d334..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/no_catch.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-        }
-    }
-}
-// ----
-// ParserError 2314: (97-98): Expected 'catch' but got '}'
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol b/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol
deleted file mode 100644
index 724ed81e838b..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try f() {
-        } catch {
-        }
-    }
-}
-// ----
-// TypeError 2536: (72-75): Try can only be used with external function calls and contract creation calls.
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_returns.sol b/test/libsolidity/syntaxTests/tryCatch/no_returns.sol
deleted file mode 100644
index a328530533c8..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/no_returns.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch {
-
-        }
-    }
-}
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_special.sol b/test/libsolidity/syntaxTests/tryCatch/no_special.sol
deleted file mode 100644
index d760e6ee35f5..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/no_special.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this {
-        } catch {
-        }
-        try gasleft() {
-        } catch {
-        }
-        try type(address) {
-        } catch {
-        }
-    }
-}
-// ----
-// TypeError 5347: (72-76): Try can only be used with external function calls and contract creation calls.
-// TypeError 2536: (119-128): Try can only be used with external function calls and contract creation calls.
-// TypeError 4259: (176-183): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(address) provided.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns.sol b/test/libsolidity/syntaxTests/tryCatch/returns.sol
deleted file mode 100644
index 335270b0b5b7..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/returns.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() returns (uint a, uint b) {
-            a = 1;
-            b = 2;
-        } catch {
-
-        }
-    }
-}
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol b/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol
deleted file mode 100644
index d575e455e20d..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint[] memory, uint) {
-        try this.f() returns (uint[] memory x, uint y) {
-            return (x, y);
-        } catch {
-
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (46-59): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (61-65): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol b/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol
deleted file mode 100644
index 4647e762e5fb..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint[] memory, uint) {
-        try this.f() returns (uint[] memory, uint) {
-
-        } catch {
-
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (46-59): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (61-65): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns_mismatch.sol b/test/libsolidity/syntaxTests/tryCatch/returns_mismatch.sol
deleted file mode 100644
index fcfb93d35504..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/returns_mismatch.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() returns (uint a) {
-            a = 1;
-        } catch {
-
-        }
-    }
-}
-// ----
-// TypeError 2800: (81-128): Function returns 2 values, but returns clause has 1 variables.
diff --git a/test/libsolidity/syntaxTests/tryCatch/scoping.sol b/test/libsolidity/syntaxTests/tryCatch/scoping.sol
deleted file mode 100644
index e6fbaade1929..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/scoping.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract Test {
-  // This checks a scoping error,
-  // the variable "a" was not visible
-  // at the assignment.
-  function test(address _ext) external {
-    try Test(_ext).test(_ext) {} catch {}
-    uint a = 1;
-    a = 3;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/simple_catch.sol b/test/libsolidity/syntaxTests/tryCatch/simple_catch.sol
deleted file mode 100644
index 5171de9d314b..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/simple_catch.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch {
-
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol b/test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol
deleted file mode 100644
index b77e6b4e07cc..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch Error(string memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (homestead). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol b/test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol
deleted file mode 100644
index 64863d58d21e..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch Error(string memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: =spuriousDragon
-// ----
-// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (spuriousDragon). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol b/test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol
deleted file mode 100644
index c57d1d66d613..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-
-        } catch Error(string memory) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: =tangerineWhistle
-// ----
-// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (tangerineWhistle). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol b/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol
deleted file mode 100644
index 7ca4376fe1ce..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch Error(string memory x) {
-            x;
-
-        } catch (bytes memory x) {
-            x;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/two_error_catch_clauses.sol b/test/libsolidity/syntaxTests/tryCatch/two_error_catch_clauses.sol
deleted file mode 100644
index 2d5504406117..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/two_error_catch_clauses.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch Error(string memory x) {
-            x;
-        } catch Error(string memory y) {
-            y;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 1036: (150-205): This try statement already has an "Error" catch clause.
diff --git a/test/libsolidity/syntaxTests/tryCatch/two_low_level_catch_clauses.sol b/test/libsolidity/syntaxTests/tryCatch/two_low_level_catch_clauses.sol
deleted file mode 100644
index b9c0a0bfc89f..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/two_low_level_catch_clauses.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public returns (uint, uint) {
-        try this.f() {
-
-        } catch {
-        } catch (bytes memory y) {
-            y;
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 5320: (112-161): This try statement already has a low-level catch clause.
diff --git a/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol b/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol
deleted file mode 100644
index 379a2c7c54b0..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-        } catch Panic() {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 1271: (72-97): Expected `catch Panic(uint ...) { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/wrong_panic_2.sol b/test/libsolidity/syntaxTests/tryCatch/wrong_panic_2.sol
deleted file mode 100644
index 6ccf784abfd3..000000000000
--- a/test/libsolidity/syntaxTests/tryCatch/wrong_panic_2.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        try this.f() {
-        } catch Panic(bytes memory) {
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 1271: (72-109): Expected `catch Panic(uint ...) { ... }`.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
deleted file mode 100644
index b4bbb73675d8..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// This used to crash in certain compiler versions.
-contract CrashContract {
-       struct S { uint a; }
-       S x;
-       function f() public {
-               (x, x) = 1(x, x);
-       }
-}
-// ----
-// TypeError 5704: (170-177): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol
deleted file mode 100644
index 940ef6d04e76..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-function f() pure {
-    ((, ())) = (1, 3);
-}
-
-function g() pure {
-    ((, ((, ())))) = (1, 3);
-}
-
-function t() pure returns (int, int) {
-    return (4, 5);
-}
-
-function h() pure {
-    ((, ())) = t();
-}
-
-function ff() pure {
-    ((((, ())) , )) = ((1, 2), 3);
-}
-
-function fg() pure {
-    (((, ())) , ) = ((1, 2), 3);
-}
-
-// ----
-// TypeError 5547: (28-30): Empty tuple on the left hand side.
-// TypeError 7407: (35-41): Type tuple(int_const 1,int_const 3) is not implicitly convertible to expected type tuple(,tuple()).
-// TypeError 5547: (78-80): Empty tuple on the left hand side.
-// TypeError 7407: (87-93): Type tuple(int_const 1,int_const 3) is not implicitly convertible to expected type tuple(,tuple(,tuple())).
-// TypeError 5547: (187-189): Empty tuple on the left hand side.
-// TypeError 7407: (194-197): Type tuple(int256,int256) is not implicitly convertible to expected type tuple(,tuple()).
-// TypeError 5547: (233-235): Empty tuple on the left hand side.
-// TypeError 7407: (245-256): Type tuple(tuple(int_const 1,int_const 2),int_const 3) is not implicitly convertible to expected type tuple(tuple(,tuple()),).
-// TypeError 5547: (291-293): Empty tuple on the left hand side.
-// TypeError 7407: (302-313): Type tuple(tuple(int_const 1,int_const 2),int_const 3) is not implicitly convertible to expected type tuple(tuple(,tuple()),).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol b/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol
deleted file mode 100644
index fac7ec57a2bc..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function f0() public { (()) = 2; }
-
-    function f1() public pure { (()) = (); }
-
-    //#8711
-    function f2() internal pure returns (uint, uint) { return () = f2(); }
-
-    //#8277
-    function f3()public{return()=();}
-
-    //#8277
-    function f4 ( bytes32 hash , uint8 v , bytes32 r , bytes32 s , uint blockExpired , bytes32 salt ) public returns ( address ) {
-        require ( ( ( ) ) |= keccak256 ( abi . encodePacked ( blockExpired , salt ) ) ) ;
-        return ecrecover ( hash , v , r , s ) ;
-    }
-}
-// ----
-// TypeError 5547: (41-43): Empty tuple on the left hand side.
-// TypeError 7407: (47-48): Type int_const 2 is not implicitly convertible to expected type tuple().
-// TypeError 5547: (86-88): Empty tuple on the left hand side.
-// TypeError 5547: (173-175): Empty tuple on the left hand side.
-// TypeError 7407: (178-182): Type tuple(uint256,uint256) is not implicitly convertible to expected type tuple().
-// TypeError 5132: (166-182): Different number of arguments in return statement than in returns declaration.
-// TypeError 5547: (229-231): Empty tuple on the left hand side.
-// TypeError 5547: (401-404): Empty tuple on the left hand side.
-// TypeError 4289: (399-466): Compound assignment is not allowed for tuple types.
-// TypeError 7407: (410-466): Type bytes32 is not implicitly convertible to expected type tuple().
-// TypeError 9322: (389-396): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol
deleted file mode 100644
index 14b9818574f4..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure returns (uint, uint, bytes32) {
-		uint a;
-		bytes32 b;
-		(a,) = f();
-		(,b) = f();
-	}
-}
-// ----
-// TypeError 7407: (103-106): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(uint256,).
-// TypeError 7407: (117-120): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(,bytes32).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol b/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol
deleted file mode 100644
index 14b9818574f4..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-	function f() public pure returns (uint, uint, bytes32) {
-		uint a;
-		bytes32 b;
-		(a,) = f();
-		(,b) = f();
-	}
-}
-// ----
-// TypeError 7407: (103-106): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(uint256,).
-// TypeError 7407: (117-120): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(,bytes32).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol b/test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol
deleted file mode 100644
index 287e09239929..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-    function f() pure public {
-        bytes1 b;
-        bytes1 a;
-        (((, , b))) = (1, 2, a);
-    }
-}
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol b/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol
deleted file mode 100644
index e941a0eb18ed..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	function g() public pure returns (
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint,
-		uint
-	) { }
-	function f() public pure returns (uint, uint, bytes32) {
-		uint a;
-		uint b;
-		(,,,,a,,,,b,,,,) = g();
-	}
-}
-// ----
-// Warning 6321: (194-198): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (200-204): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (206-213): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/nowarn_swap_memory.sol b/test/libsolidity/syntaxTests/tupleAssignments/nowarn_swap_memory.sol
deleted file mode 100644
index d4b1958b740e..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/nowarn_swap_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	struct S { uint a; uint b; }
-	function f() pure public {
-		S memory x;
-		S memory y;
-		(x, y) = (y, x);
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/nowarn_swap_storage_pointers.sol b/test/libsolidity/syntaxTests/tupleAssignments/nowarn_swap_storage_pointers.sol
deleted file mode 100644
index 014df7e1bec8..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/nowarn_swap_storage_pointers.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-		contract C {
-			struct S { uint a; uint b; }
-			S x; S y;
-			function f() public {
-				S storage x_local = x;
-				S storage y_local = y;
-				S storage z_local = x;
-				(x, y_local, x_local, z_local) = (y, x_local, y_local, y);
-			}
-		}
-// ----
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol b/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol
deleted file mode 100644
index 1c3a62c13fa7..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public {
-    (((((((((((,2),)),)),),))=4)));
-  }
-}
-// ----
-// TypeError 4247: (53-54): Expression has to be an lvalue.
-// TypeError 7407: (67-68): Type int_const 4 is not implicitly convertible to expected type tuple(tuple(tuple(tuple(tuple(,int_const 2),),),),).
-// TypeError 6473: (44-68): Tuple component cannot be empty.
-// TypeError 6473: (43-69): Tuple component cannot be empty.
-// TypeError 6473: (42-70): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_short.sol b/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_short.sol
deleted file mode 100644
index 931d8203dfb6..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_short.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public pure {
-    int a;
-    (((a,),)) = ((1,2),3);
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol
deleted file mode 100644
index 898c79101536..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-	function f() internal pure {}
-	function g() internal pure returns (uint256) {}
-	function h() internal pure returns (uint256, uint256) {}
-	function test() public pure {
-		f() = ();
-		g() = (uint256(1));
-		h() = (uint256(1), uint256(2));
-		h() = ();
-	}
-}
-// ----
-// TypeError 4247: (184-187): Expression has to be an lvalue.
-// TypeError 4247: (196-199): Expression has to be an lvalue.
-// TypeError 4247: (218-221): Expression has to be an lvalue.
-// TypeError 4247: (252-255): Expression has to be an lvalue.
-// TypeError 7407: (258-260): Type tuple() is not implicitly convertible to expected type tuple(uint256,uint256).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol b/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
deleted file mode 100644
index e35d361d21ec..000000000000
--- a/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-	struct S { uint a; uint b; }
-	S x; S y;
-	function f() public {
-		(x, y) = (y, x);
-	}
-	function g() public {
-		uint z;
-		((x, y), z) = ((y, x), 0);
-	}
-}
-// ----
-// Warning 7238: (79-94): This assignment performs two copies to storage. Since storage copies do not first copy to a temporary location, one of them might be overwritten before the second is executed and thus may have unexpected effects. It is safer to perform the copies separately or assign to storage pointers first.
-// Warning 7238: (134-159): This assignment performs two copies to storage. Since storage copies do not first copy to a temporary location, one of them might be overwritten before the second is executed and thus may have unexpected effects. It is safer to perform the copies separately or assign to storage pointers first.
diff --git a/test/libsolidity/syntaxTests/types/address/address_abi_decode.sol b/test/libsolidity/syntaxTests/types/address/address_abi_decode.sol
deleted file mode 100644
index aefab11db993..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_abi_decode.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(bytes memory b) public pure returns (address payable) {
-        (address payable c) = abi.decode(b, (address));
-        return c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol b/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
deleted file mode 100644
index 7535e6da510f..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    address a;
-    function f() public pure returns(bool) {
-        a = address(0) + address(0);
-        a = address(0) - address(0);
-        a = address(0) * address(0);
-        a = address(0) / address(0);
-        return address(0) == address(0);
-    }
-}
-// ----
-// TypeError 2271: (85-108): Built-in binary operator + cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (122-145): Built-in binary operator - cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (159-182): Built-in binary operator * cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (196-219): Built-in binary operator / cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
diff --git a/test/libsolidity/syntaxTests/types/address/address_constant.sol b/test/libsolidity/syntaxTests/types/address/address_constant.sol
deleted file mode 100644
index 146eee4f0ed4..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_constant.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    address constant a = address(0);
-    address payable constant b = payable(0);
-    function f() public pure returns (address, address) {
-        return (a,b);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol b/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol
deleted file mode 100644
index 76df63cddb4d..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    address constant a = address(0);
-    address payable constant b = payable(0);
-    function f() public {
-        a = address(0);
-        b = payable(0);
-    }
-}
-// ----
-// TypeError 6520: (129-130): Cannot assign to a constant variable.
-// TypeError 6520: (153-154): Cannot assign to a constant variable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol b/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol
deleted file mode 100644
index 6d4a01d96669..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    struct S {
-        address payable a;
-    }
-    S s;
-    function f() public {
-        s.a = address(this);
-    }
-}
-// ----
-// TypeError 7407: (110-123): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_in_struct_fine.sol b/test/libsolidity/syntaxTests/types/address/address_in_struct_fine.sol
deleted file mode 100644
index 33fa71960c6c..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_in_struct_fine.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-    struct S {
-        address a;
-    }
-    S s;
-    function f() public {
-        s.a = address(this);
-    }
-}
-contract B {
-    struct S {
-        address payable a;
-    }
-    S s;
-    function f() public {
-        s.a = payable(this);
-    }
-    receive() external payable {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_literal_to_payable.sol b/test/libsolidity/syntaxTests/types/address/address_literal_to_payable.sol
deleted file mode 100644
index 509eb0398eac..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_literal_to_payable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = payable(address(0x00000000219ab540356cBB839Cbe05303d7705Fa));
-        address payable b = payable(0x00000000219ab540356cBB839Cbe05303d7705Fa);
-        a = b;
-        b = a;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_literal_to_payable_err.sol b/test/libsolidity/syntaxTests/types/address/address_literal_to_payable_err.sol
deleted file mode 100644
index 7a9edf32dfdb..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_literal_to_payable_err.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = address(0x00000000219ab540356cBB839Cbe05303d7705Fa);
-        address payable b = 0x00000000219ab540356cBB839Cbe05303d7705Fa;
-    }
-}
-// ----
-// TypeError 9574: (52-123): Type address is not implicitly convertible to expected type address payable.
-// TypeError 9574: (133-195): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_members.sol b/test/libsolidity/syntaxTests/types/address/address_members.sol
deleted file mode 100644
index 144361b9409a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_members.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public view returns (address) { return address(this); }
-    function g() public view returns (uint) { return f().balance; }
-    function h() public view returns (bytes memory) { return f().code; }
-    function i() public view returns (uint) { return f().code.length; }
-    function j() public view returns (uint) { return h().length; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol b/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol
deleted file mode 100644
index d3488257586a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public returns (C) { return this; }
-    function g() public returns (uint) { return f().balance; }
-}
-// ----
-// TypeError 3125: (114-125): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(...).balance" to access this address member.
diff --git a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
deleted file mode 100644
index 9122d2a89429..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(address a) public {
-        selfdestruct(a);
-    }
-}
-// ----
-// Warning 5159: (56-68): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// TypeError 9553: (69-70): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_external_overload.sol b/test/libsolidity/syntaxTests/types/address/address_payable_external_overload.sol
deleted file mode 100644
index d478f75a279d..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_external_overload.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(address) external pure {}
-    function f(address payable) external pure {}
-
-}
-// ----
-// TypeError 9914: (58-102): Function overload clash during conversion to external types for arguments.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_nonpayable.sol b/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_nonpayable.sol
deleted file mode 100644
index 656005440fdd..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_nonpayable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(address payable) internal pure {}
-    function f(address) internal pure returns (uint) {}
-    function g() internal pure {
-        address a = address(0);
-        uint b = f(a); // TODO: should this be valid?
-        b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol b/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol
deleted file mode 100644
index c07dd81f6373..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(address payable) internal pure {}
-    function f(address) internal pure {}
-    function g() internal pure {
-        address payable a = payable(0);
-        f(a);
-    }
-}
-// ----
-// TypeError 4487: (184-185): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol b/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol
deleted file mode 100644
index cf58555da972..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable[] memory a = new address payable[](4);
-        address[] memory b = new address[](4);
-        a = b;
-        b = a;
-    }
-}
-// ----
-// TypeError 7407: (166-167): Type address[] memory is not implicitly convertible to expected type address payable[] memory.
-// TypeError 7407: (181-182): Type address payable[] memory is not implicitly convertible to expected type address[] memory.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_public_overload.sol b/test/libsolidity/syntaxTests/types/address/address_payable_public_overload.sol
deleted file mode 100644
index cae9b324fbae..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_public_overload.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(address) public pure {}
-    function f(address payable) public pure {}
-
-}
-// ----
-// TypeError 9914: (56-98): Function overload clash during conversion to external types for arguments.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
deleted file mode 100644
index bd1aff795277..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(address payable a) public {
-        selfdestruct(a);
-    }
-}
-// ----
-// Warning 5159: (64-76): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol b/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol
deleted file mode 100644
index 49d92cafe556..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    address payable[] a;
-    address[] b;
-    function f() public view {
-        address payable[] storage c = a;
-        address[] storage d = b;
-        d = c; // TODO: this could be allowed in the future
-    }
-}
-// ----
-// TypeError 7407: (172-173): Type address payable[] storage pointer is not implicitly convertible to expected type address[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol b/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol
deleted file mode 100644
index 7793040a9851..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    address payable[] a;
-    address[] b;
-    function f() public view {
-        address payable[] storage c = a;
-        address[] storage d = b;
-        c = d;
-    }
-}
-// ----
-// TypeError 7407: (172-173): Type address[] storage pointer is not implicitly convertible to expected type address payable[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_contract.sol b/test/libsolidity/syntaxTests/types/address/address_to_contract.sol
deleted file mode 100644
index 629a3df041e0..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_to_contract.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  function f() public pure returns (C c) {
-    c = C(address(2));
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol b/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol
deleted file mode 100644
index 2aa032e0ecd9..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public view {
-    C c = address(2);
-  }
-}
-// ----
-// TypeError 9574: (46-62): Type address is not implicitly convertible to expected type contract C.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_contract_payable_fallback.sol b/test/libsolidity/syntaxTests/types/address/address_to_contract_payable_fallback.sol
deleted file mode 100644
index 6c6a7d70680c..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_to_contract_payable_fallback.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure returns (C c) {
-    c = C(payable(address(2)));
-  }
-  fallback() external payable {
-  }
-}
-// ----
-// Warning 3628: (0-129): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_contract_receive.sol b/test/libsolidity/syntaxTests/types/address/address_to_contract_receive.sol
deleted file mode 100644
index 75bd2537601a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_to_contract_receive.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public pure returns (C c) {
-    c = C(payable(address(2)));
-  }
-  receive() external payable {
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol
deleted file mode 100644
index e82371efd12a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(address a) public pure {
-        address b;
-        address payable c = a;
-        c = b;
-    }
-}
-// ----
-// TypeError 9574: (80-101): Type address is not implicitly convertible to expected type address payable.
-// TypeError 7407: (115-116): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol b/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol
deleted file mode 100644
index 48645fb36934..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(address a) public pure returns (address payable) {
-        return address(address(a));
-    }
-}
-// ----
-// TypeError 6359: (94-113): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol b/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol
deleted file mode 100644
index 727be340444f..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public view returns (address payable a, address b) {
-        (address c, address payable d) = (address(this), payable(0));
-        (a,b) = (c,d);
-    }
-}
-// ----
-// TypeError 7407: (169-174): Type tuple(address,address payable) is not implicitly convertible to expected type tuple(address payable,address).
diff --git a/test/libsolidity/syntaxTests/types/address/address_tuple_fine.sol b/test/libsolidity/syntaxTests/types/address/address_tuple_fine.sol
deleted file mode 100644
index 7c1eef0233ba..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_tuple_fine.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public view returns (address payable a, address b) {
-        (address c, address payable d) = (address(this), payable(0));
-        (a,b) = (d,c);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_uint_bytes20_this.sol b/test/libsolidity/syntaxTests/types/address/address_uint_bytes20_this.sol
deleted file mode 100644
index c1204f266d99..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_uint_bytes20_this.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f() public view {
-        address a1 = address(uint160(0));
-        address a2 = address(bytes20(0));
-        address a3 = address(this);
-
-        // Trivial conversions
-        address payable a4 = payable(address(uint160(0)));
-        address payable a5 = payable(address(bytes20(0)));
-        address payable a6 = payable(address(this));
-
-        a1; a2; a3; a4; a5; a6;
-    }
-
-    // to make payable(this) work
-    receive() payable external {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/address_uint_bytes20_this_to_payable_err.sol b/test/libsolidity/syntaxTests/types/address/address_uint_bytes20_this_to_payable_err.sol
deleted file mode 100644
index 37f087e5bfa2..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_uint_bytes20_this_to_payable_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = address(uint160(0));
-        address payable b = address(bytes20(0));
-        address payable c = address(this);
-    }
-}
-// ----
-// TypeError 9574: (52-91): Type address is not implicitly convertible to expected type address payable.
-// TypeError 9574: (101-140): Type address is not implicitly convertible to expected type address payable.
-// TypeError 9574: (150-183): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol b/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol
deleted file mode 100644
index d72f7483f13d..000000000000
--- a/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = address(0);
-    }
-}
-// ----
-// TypeError 9574: (52-82): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol
deleted file mode 100644
index c185cab80568..000000000000
--- a/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bytes32 x) public pure returns (address payable) {
-        return address(x);
-    }
-}
-// ----
-// TypeError 9640: (94-104): Explicit type conversion not allowed from "bytes32" to "address".
-// TypeError 6359: (94-104): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol
deleted file mode 100644
index f7f1f42cb4d1..000000000000
--- a/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(bytes10 x) public pure returns (address payable) {
-        return address(x);
-    }
-}
-// ----
-// TypeError 9640: (94-104): Explicit type conversion not allowed from "bytes10" to "address".
-// TypeError 6359: (94-104): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/bytes_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/bytes_to_payable_address.sol
deleted file mode 100644
index 5e658c1423f2..000000000000
--- a/test/libsolidity/syntaxTests/types/address/bytes_to_payable_address.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(bytes20 x) public pure returns (address payable) {
-        return payable(address(x));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/codehash.sol b/test/libsolidity/syntaxTests/types/address/codehash.sol
deleted file mode 100644
index cf7eaabec976..000000000000
--- a/test/libsolidity/syntaxTests/types/address/codehash.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public view returns (bytes32) {
-        return address(this).codehash;
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/codehash_before_constantinople.sol b/test/libsolidity/syntaxTests/types/address/codehash_before_constantinople.sol
deleted file mode 100644
index 2e65e0ba38b7..000000000000
--- a/test/libsolidity/syntaxTests/types/address/codehash_before_constantinople.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (bytes32) {
-        return address(this).codehash;
-    }
-}
-// ====
-// EVMVersion: <constantinople
-// ----
-// TypeError 7598: (77-99): "codehash" is not supported by the VM version.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_no_fallback_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/contract_no_fallback_to_payable_address.sol
deleted file mode 100644
index 1b7744a5c1d3..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_no_fallback_to_payable_address.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public view {
-    address payable a = address(this);
-    a;
-  }
-}
-// ----
-// TypeError 9574: (46-79): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_non_payable_fallback_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/contract_non_payable_fallback_to_payable_address.sol
deleted file mode 100644
index adc9f37cb41d..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_non_payable_fallback_to_payable_address.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public view {
-    address payable a = address(this);
-    a;
-  }
-  fallback() external {
-  }
-}
-// ----
-// TypeError 9574: (46-79): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address.sol
deleted file mode 100644
index 2d4ae3a7228c..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public view {
-    address payable a = payable(this);
-    a;
-  }
-  fallback() external payable {
-  }
-}
-// ----
-// Warning 3628: (0-129): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol b/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol
deleted file mode 100644
index e22db0c3a9ca..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public view {
-    address payable a = this;
-    a;
-  }
-  fallback() external payable {
-  }
-}
-// ----
-// Warning 3628: (0-120): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
-// TypeError 9574: (46-70): Type contract C is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address.sol
deleted file mode 100644
index cf25a618aaed..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-  function f() public view {
-    address payable a = payable(this);
-    a;
-  }
-  receive() external payable {
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol b/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol
deleted file mode 100644
index 23caa8847e84..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public view {
-    address payable a = this;
-    a;
-  }
-  receive() external payable {
-  }
-}
-// ----
-// TypeError 9574: (46-70): Type contract C is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_to_address.sol b/test/libsolidity/syntaxTests/types/address/contract_to_address.sol
deleted file mode 100644
index ec2f8184d6db..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_to_address.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-  function f() public view {
-    address a = address(this);
-    a;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol b/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol
deleted file mode 100644
index b689f7a2aec2..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public view {
-    address a = this;
-    a;
-  }
-}
-// ----
-// TypeError 9574: (46-62): Type contract C is not implicitly convertible to expected type address.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol b/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol
deleted file mode 100644
index 62b34a294601..000000000000
--- a/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-interface I {}
-
-library L {}
-
-contract C {
-    function f() public pure {
-        address(C);
-        address(I);
-        address(L); // This one is allowed
-
-        address(type(C));
-        address(type(I));
-        address(type(L));
-    }
-}
-// ----
-// TypeError 9640: (82-92): Explicit type conversion not allowed from "type(contract C)" to "address".
-// TypeError 9640: (102-112): Explicit type conversion not allowed from "type(contract I)" to "address".
-// TypeError 9640: (166-182): Explicit type conversion not allowed from "type(contract C)" to "address".
-// TypeError 9640: (192-208): Explicit type conversion not allowed from "type(contract I)" to "address".
-// TypeError 9640: (218-234): Explicit type conversion not allowed from "type(library L)" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/conversion.sol b/test/libsolidity/syntaxTests/types/address/conversion.sol
deleted file mode 100644
index f341f3f15152..000000000000
--- a/test/libsolidity/syntaxTests/types/address/conversion.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure returns (address) {
-        return address(2**160 -1);
-    }
-    function g() public pure returns (address) {
-        return address(type(uint160).max);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/conversion_error.sol b/test/libsolidity/syntaxTests/types/address/conversion_error.sol
deleted file mode 100644
index 99155ae474e0..000000000000
--- a/test/libsolidity/syntaxTests/types/address/conversion_error.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public pure returns (address) {
-        return address(-1);
-    }
-    function g() public pure returns (address) {
-        return -1;
-    }
-	function h() public pure returns (address) {
-		return address(2**160);
-	}
-}
-// ----
-// TypeError 9640: (77-88): Explicit type conversion not allowed from "int_const -1" to "address".
-// TypeError 6359: (160-162): Return argument type int_const -1 is not implicitly convertible to expected type (type of first return variable) address.
-// TypeError 9640: (225-240): Explicit type conversion not allowed from "int_const 1461...(41 digits omitted)...2976" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/literal_to_address.sol b/test/libsolidity/syntaxTests/types/address/literal_to_address.sol
deleted file mode 100644
index 5d3b89d5e22a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/literal_to_address.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        address a = address(0);
-        a = address(1);
-        address b = 0x0123456789012345678901234567890123456789;
-        b = 0x9876543210987654321098765432109876543210;
-        b = 0x9876_5432_1098_7654_3210_9876_5432_1098_7654_3210;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/literal_to_address_call.sol b/test/libsolidity/syntaxTests/types/address/literal_to_address_call.sol
deleted file mode 100644
index 1891d8aaf89b..000000000000
--- a/test/libsolidity/syntaxTests/types/address/literal_to_address_call.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public returns (bool success) {
-        (success, ) = (address(0)).call{value: 30}("");
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/literal_to_address_oversized.sol b/test/libsolidity/syntaxTests/types/address/literal_to_address_oversized.sol
deleted file mode 100644
index df362b2a4e01..000000000000
--- a/test/libsolidity/syntaxTests/types/address/literal_to_address_oversized.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        address(0x11223345567aaaaaaaaaaaaaaaaaaaaaaaaaaaaa0112233445566778899001122);
-    }
-}
-// ----
-// TypeError 9640: (52-128): Explicit type conversion not allowed from "int_const 1239...(70 digits omitted)...8130" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/literal_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/literal_to_payable_address.sol
deleted file mode 100644
index 2a9691873f1a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/literal_to_payable_address.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure {
-        // We allow an exception for 0
-        address payable a = payable(0);
-        a = payable(address(1));
-        address payable b = payable(0x0123456789012345678901234567890123456789);
-        b = payable(0x9876543210987654321098765432109876543210);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol b/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol
deleted file mode 100644
index d72f7483f13d..000000000000
--- a/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = address(0);
-    }
-}
-// ----
-// TypeError 9574: (52-82): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol b/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol
deleted file mode 100644
index b0e54a4c8b73..000000000000
--- a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  function f() public pure returns (C c) {
-    address a = address(2);
-    c = C(a);
-  }
-  fallback() external payable {
-  }
-}
-// ----
-// Warning 3628: (0-139): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
-// TypeError 7398: (92-96): Explicit type conversion not allowed from non-payable "address" to "contract C", which has a payable fallback function.
diff --git a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol b/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol
deleted file mode 100644
index 0f11d6bea40f..000000000000
--- a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure returns (C c) {
-    address a = address(2);
-    c = C(a);
-  }
-  receive() external payable {
-  }
-}
-// ----
-// TypeError 7398: (92-96): Explicit type conversion not allowed from non-payable "address" to "contract C", which has a payable fallback function.
diff --git a/test/libsolidity/syntaxTests/types/address/payable_address_to_address.sol b/test/libsolidity/syntaxTests/types/address/payable_address_to_address.sol
deleted file mode 100644
index 8e9c2f078c20..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_address_to_address.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(address payable a) public pure {
-        address payable b;
-        address c = a;
-        c = b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversion.sol b/test/libsolidity/syntaxTests/types/address/payable_conversion.sol
deleted file mode 100644
index ce7c9078a692..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_conversion.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function f() public {
-        address payable a = payable(address(new D()));
-        address payable b = payable(new E());
-        address payable c = payable(new F());
-
-        a;
-        b;
-        c;
-    }
-}
-
-// A contract that cannot receive Ether
-contract D {}
-
-// A contract that can receive Ether
-contract E {
-    receive() external payable {
-    }
-}
-
-// A contract that can receive Ether using the fallback
-contract F {
-    fallback() external payable {
-
-    }
-}
-
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol b/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol
deleted file mode 100644
index 28bb52e2367e..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public {
-        address payable a = address(new D());
-
-        // This conversion makes no sense anyway.
-        address payable b = address(D);
-    }
-}
-
-contract D {
-    receive() external payable {
-    }
-}
-// ----
-// TypeError 9574: (47-83): Type address is not implicitly convertible to expected type address payable.
-// TypeError 9640: (164-174): Explicit type conversion not allowed from "type(contract D)" to "address".
-// TypeError 9574: (144-174): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversion_strict.sol b/test/libsolidity/syntaxTests/types/address/payable_conversion_strict.sol
deleted file mode 100644
index 31bdb72be52a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_conversion_strict.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = payable(address(uint160(0)));
-        address payable b = payable(address(bytes20(0)));
-        address payable c = payable(address(2));
-        // hex literal that is only 15 bytes long
-        address payable d = payable(address(0x002190356cBB839Cbe05303d7705Fa));
-
-        uint160 a1 = uint160(address(payable(0)));
-        bytes20 b1 = bytes20(address(payable(0)));
-
-        a; b; c; d; a1; b1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol b/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol
deleted file mode 100644
index b653dc7c5077..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    function f() public pure {
-        address payable a = payable(uint160(0));
-        address payable b = payable(bytes20(0));
-        address payable c = payable(2);
-        // hex literal that is only 15 bytes long
-        address payable d = payable(0x002190356cBB839Cbe05303d7705Fa);
-
-        // The opposite should also be disallowed
-        uint160 a1 = uint160(payable(0));
-        bytes20 b1 = bytes20(payable(0));
-    }
-}
-// ----
-// TypeError 9640: (72-91): Explicit type conversion not allowed from "uint160" to "address payable".
-// TypeError 9640: (121-140): Explicit type conversion not allowed from "bytes20" to "address payable".
-// TypeError 9640: (170-180): Explicit type conversion not allowed from "int_const 2" to "address payable".
-// TypeError 9640: (260-301): Explicit type conversion not allowed from "int_const 6807...(25 digits omitted)...4970" to "address payable".
-// TypeError 9640: (375-394): Explicit type conversion not allowed from "address payable" to "uint160".
-// TypeError 9640: (417-436): Explicit type conversion not allowed from "address payable" to "bytes20".
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversions_literals.sol b/test/libsolidity/syntaxTests/types/address/payable_conversions_literals.sol
deleted file mode 100644
index 81971f918b9a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_conversions_literals.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() public pure {
-        // 0 is okay, because it's an exception
-        address payable a = payable(0);
-
-        // address literals have type address
-        address payable b = payable(0x00000000219ab540356cBB839Cbe05303d7705Fa);
-
-        address payable c = payable(address(2));
-
-        a; b; c;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/payable_to_contract_receive.sol b/test/libsolidity/syntaxTests/types/address/payable_to_contract_receive.sol
deleted file mode 100644
index 75bd2537601a..000000000000
--- a/test/libsolidity/syntaxTests/types/address/payable_to_contract_receive.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-  function f() public pure returns (C c) {
-    c = C(payable(address(2)));
-  }
-  receive() external payable {
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/address/super_to_address.sol b/test/libsolidity/syntaxTests/types/address/super_to_address.sol
deleted file mode 100644
index e3308081c4cf..000000000000
--- a/test/libsolidity/syntaxTests/types/address/super_to_address.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        address(super);
-    }
-}
-// ----
-// TypeError 9640: (52-66): Explicit type conversion not allowed from "type(contract super C)" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol b/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol
deleted file mode 100644
index 7f4666a5464b..000000000000
--- a/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-struct S {
-    uint x;
-}
-
-enum E {A, B, C}
-
-contract C {
-    function f() public pure {
-        address(uint);
-        address(bytes16);
-        address(bool);
-        address(address);
-        address(fixed);
-
-        address(S);
-        address(E);
-
-        address(uint[]);
-        address(uint[][]);
-        address(uint[5]);
-        address(string);
-        address(bytes);
-        address(S[]);
-        address(E[]);
-        address((uint, uint));
-
-        address(type(uint));
-    }
-}
-// ----
-// TypeError 9640: (96-109): Explicit type conversion not allowed from "type(uint256)" to "address".
-// TypeError 9640: (119-135): Explicit type conversion not allowed from "type(bytes16)" to "address".
-// TypeError 9640: (145-158): Explicit type conversion not allowed from "type(bool)" to "address".
-// TypeError 9640: (168-184): Explicit type conversion not allowed from "type(address)" to "address".
-// TypeError 9640: (194-208): Explicit type conversion not allowed from "type(fixed128x18)" to "address".
-// TypeError 9640: (219-229): Explicit type conversion not allowed from "type(struct S storage pointer)" to "address".
-// TypeError 9640: (239-249): Explicit type conversion not allowed from "type(enum E)" to "address".
-// TypeError 9640: (260-275): Explicit type conversion not allowed from "type(uint256[] memory)" to "address".
-// TypeError 9640: (285-302): Explicit type conversion not allowed from "type(uint256[] memory[] memory)" to "address".
-// TypeError 9640: (312-328): Explicit type conversion not allowed from "type(uint256[5] memory)" to "address".
-// TypeError 9640: (338-353): Explicit type conversion not allowed from "type(string storage pointer)" to "address".
-// TypeError 9640: (363-377): Explicit type conversion not allowed from "type(bytes storage pointer)" to "address".
-// TypeError 9640: (387-399): Explicit type conversion not allowed from "type(struct S memory[] memory)" to "address".
-// TypeError 9640: (409-421): Explicit type conversion not allowed from "type(enum E[] memory)" to "address".
-// TypeError 9640: (431-452): Explicit type conversion not allowed from "tuple(type(uint256),type(uint256))" to "address".
-// TypeError 9640: (463-482): Explicit type conversion not allowed from "type(uint256)" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/uint_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/uint_to_payable_address.sol
deleted file mode 100644
index bbd6cc78b63c..000000000000
--- a/test/libsolidity/syntaxTests/types/address/uint_to_payable_address.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(uint x) public pure returns (address payable) {
-        return payable(address(uint160(x)));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/array_index_too_large.sol b/test/libsolidity/syntaxTests/types/array_index_too_large.sol
deleted file mode 100644
index e9a57df3fb06..000000000000
--- a/test/libsolidity/syntaxTests/types/array_index_too_large.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public returns (string memory) {
-        // this used to cause an internal error
-        return (["zeppelin"][123456789012345678901234567890123456789012345678901234567890123456789012345678]);
-    }
-}
-// ----
-// TypeError 7407: (140-218): Type int_const 1234...(70 digits omitted)...5678 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
diff --git a/test/libsolidity/syntaxTests/types/bool_ops.sol b/test/libsolidity/syntaxTests/types/bool_ops.sol
deleted file mode 100644
index 08501ff5b39b..000000000000
--- a/test/libsolidity/syntaxTests/types/bool_ops.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-contract C {
-    function f(bool a, bool b) public pure {
-        bool c;
-        // OK
-        c = !a;
-        c = !b;
-        c = a == b;
-        c = a != b;
-        c = a || b;
-        c = a && b;
-
-        // Not OK
-        c = a > b;
-        c = a < b;
-        c = a >= b;
-        c = a <= b;
-        c = a & b;
-        c = a | b;
-        c = a ^ b;
-        c = ~a;
-        c = ~b;
-        c = a + b;
-        c = a - b;
-        c = -a;
-        c = -b;
-        c = a * b;
-        c = a / b;
-        c = a ** b;
-        c = a % b;
-        c = a << b;
-        c = a >> b;
-    }
-}
-// ----
-// TypeError 2271: (231-236): Built-in binary operator > cannot be applied to types bool and bool.
-// TypeError 2271: (250-255): Built-in binary operator < cannot be applied to types bool and bool.
-// TypeError 2271: (269-275): Built-in binary operator >= cannot be applied to types bool and bool.
-// TypeError 2271: (289-295): Built-in binary operator <= cannot be applied to types bool and bool.
-// TypeError 2271: (309-314): Built-in binary operator & cannot be applied to types bool and bool.
-// TypeError 2271: (328-333): Built-in binary operator | cannot be applied to types bool and bool.
-// TypeError 2271: (347-352): Built-in binary operator ^ cannot be applied to types bool and bool.
-// TypeError 4907: (366-368): Built-in unary operator ~ cannot be applied to type bool.
-// TypeError 4907: (382-384): Built-in unary operator ~ cannot be applied to type bool.
-// TypeError 2271: (398-403): Built-in binary operator + cannot be applied to types bool and bool.
-// TypeError 2271: (417-422): Built-in binary operator - cannot be applied to types bool and bool.
-// TypeError 4907: (436-438): Built-in unary operator - cannot be applied to type bool.
-// TypeError 4907: (452-454): Built-in unary operator - cannot be applied to type bool.
-// TypeError 2271: (468-473): Built-in binary operator * cannot be applied to types bool and bool.
-// TypeError 2271: (487-492): Built-in binary operator / cannot be applied to types bool and bool.
-// TypeError 2271: (506-512): Built-in binary operator ** cannot be applied to types bool and bool.
-// TypeError 2271: (526-531): Built-in binary operator % cannot be applied to types bool and bool.
-// TypeError 2271: (545-551): Built-in binary operator << cannot be applied to types bool and bool.
-// TypeError 2271: (565-571): Built-in binary operator >> cannot be applied to types bool and bool.
diff --git a/test/libsolidity/syntaxTests/types/byte.sol b/test/libsolidity/syntaxTests/types/byte.sol
deleted file mode 100644
index 3945eda04e62..000000000000
--- a/test/libsolidity/syntaxTests/types/byte.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    byte public a;
-}
-// ----
-// ParserError 9182: (17-21): Function, variable, struct or modifier declaration expected.
diff --git a/test/libsolidity/syntaxTests/types/bytes0.sol b/test/libsolidity/syntaxTests/types/bytes0.sol
deleted file mode 100644
index 13a6c54de937..000000000000
--- a/test/libsolidity/syntaxTests/types/bytes0.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  bytes0 b0 = 1;
-}
-// ----
-// DeclarationError 7920: (15-21): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol b/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol
deleted file mode 100644
index 2d0a7d326c4e..000000000000
--- a/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns(uint256) {
-        return uint256(bytes1(''));
-    }
-}
-// ----
-// TypeError 9640: (76-95): Explicit type conversion not allowed from "bytes1" to "uint256".
diff --git a/test/libsolidity/syntaxTests/types/bytes256.sol b/test/libsolidity/syntaxTests/types/bytes256.sol
deleted file mode 100644
index 4f477c4c7bfd..000000000000
--- a/test/libsolidity/syntaxTests/types/bytes256.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  bytes256 b256 = 1;
-}
-// ----
-// DeclarationError 7920: (15-23): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol b/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol
deleted file mode 100644
index 1370e0093a1d..000000000000
--- a/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns(uint32) {
-        return uint32(bytes32(''));
-    }
-}
-// ----
-// TypeError 9640: (75-94): Explicit type conversion not allowed from "bytes32" to "uint32".
diff --git a/test/libsolidity/syntaxTests/types/bytes33.sol b/test/libsolidity/syntaxTests/types/bytes33.sol
deleted file mode 100644
index 2ec7f530ac93..000000000000
--- a/test/libsolidity/syntaxTests/types/bytes33.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  bytes33 b33 = 1;
-}
-// ----
-// DeclarationError 7920: (15-22): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_bitnot.sol b/test/libsolidity/syntaxTests/types/bytesNN_bitnot.sol
deleted file mode 100644
index f6cfbbfd2943..000000000000
--- a/test/libsolidity/syntaxTests/types/bytesNN_bitnot.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-  bytes32 b32 = ~bytes32(hex"ff");
-  bytes32 b25 = ~bytes25(hex"ff");
-  bytes25 b8 = ~bytes8(hex"ff");
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol b/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol
deleted file mode 100644
index d8de853a7cb4..000000000000
--- a/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        bytes32 x;
-        x[0] = 0x42;
-    }
-}
-// ----
-// TypeError 4360: (71-75): Single bytes in fixed bytes arrays cannot be modified.
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol b/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol
deleted file mode 100644
index 61492eaa98ce..000000000000
--- a/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-        function f() public pure {
-                C(bytes20(uint160(0x1234)));
-        }
-}
-// ----
-// TypeError 9640: (64-91): Explicit type conversion not allowed from "bytes20" to "contract C".
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_to_uint_same_size.sol b/test/libsolidity/syntaxTests/types/bytesNN_to_uint_same_size.sol
deleted file mode 100644
index 6711c8c69f66..000000000000
--- a/test/libsolidity/syntaxTests/types/bytesNN_to_uint_same_size.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public pure returns (uint256) {
-        return uint256(bytes32(uint256(0)));
-    }
-    function g() public pure returns (uint128) {
-        return uint128(bytes16(uint128(0)));
-    }
-    function h() public pure returns (uint64) {
-        return uint64(bytes8(uint64(0)));
-    }
-    function i() public pure returns (uint32) {
-        return uint32(bytes4(uint32(0)));
-    }
-    function j() public pure returns (uint16) {
-        return uint16(bytes2(uint16(0)));
-    }
-    function k() public pure returns (uint8) {
-        return uint8(bytes1(uint8(0)));
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_upcasting.sol b/test/libsolidity/syntaxTests/types/bytesNN_upcasting.sol
deleted file mode 100644
index 90f58de14cb1..000000000000
--- a/test/libsolidity/syntaxTests/types/bytesNN_upcasting.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-contract C {
-  bytes1 b1 = bytes1(0x01);
-  bytes2 b2 = b1;
-  bytes3 b3 = b2;
-  bytes4 b4 = b3;
-  bytes5 b5 = b4;
-  bytes6 b6 = b5;
-  bytes7 b7 = b6;
-  bytes8 b8 = b7;
-  bytes9 b9 = b8;
-  bytes10 b10 = b9;
-  bytes11 b11 = b10;
-  bytes12 b12 = b11;
-  bytes13 b13 = b12;
-  bytes14 b14 = b13;
-  bytes15 b15 = b14;
-  bytes16 b16 = b15;
-  bytes17 b17 = b16;
-  bytes18 b18 = b17;
-  bytes19 b19 = b18;
-  bytes20 b20 = b19;
-  bytes21 b21 = b20;
-  bytes22 b22 = b21;
-  bytes23 b23 = b22;
-  bytes24 b24 = b23;
-  bytes25 b25 = b24;
-  bytes26 b26 = b25;
-  bytes27 b27 = b26;
-  bytes28 b28 = b27;
-  bytes29 b29 = b28;
-  bytes30 b30 = b29;
-  bytes31 b31 = b30;
-  bytes32 b32 = b31;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol b/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol
deleted file mode 100644
index 9412a78824e4..000000000000
--- a/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns (bytes2) {
-        return bytes2(hex"123456");
-    }
-}
-// ----
-// TypeError 9640: (76-95): Explicit type conversion not allowed from "literal_string hex"123456"" to "bytes2". Literal is larger than the type.
diff --git a/test/libsolidity/syntaxTests/types/call_unimplemented_internal_function.sol b/test/libsolidity/syntaxTests/types/call_unimplemented_internal_function.sol
deleted file mode 100644
index 469382789d39..000000000000
--- a/test/libsolidity/syntaxTests/types/call_unimplemented_internal_function.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract contract A {
-    function f() public virtual;
-    function g() public {
-        f();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol b/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
deleted file mode 100644
index c3e58284d437..000000000000
--- a/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-	// Used to cause internal compiler error.
-	function() returns (x) constant x = x;
-
-}
-// ----
-// TypeError 5172: (77-78): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
deleted file mode 100644
index 72c09455cdf9..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-    function f() external {}
-    function g() external pure {}
-}
-
-contract B is A {
-    function h() external {
-        function() external f = A.f;
-        function() external pure g = A.g;
-    }
-}
-// ----
-// TypeError 9574: (133-160): Type function A.f() is not implicitly convertible to expected type function () external. Special functions cannot be converted to function types.
-// TypeError 9574: (170-202): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
deleted file mode 100644
index 6dcce143d251..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract A {
-    function f() external {}
-    function g() external pure {}
-}
-
-contract B {
-    function h() external {
-        function() external f = A.f;
-        function() external pure g = A.g;
-    }
-}
-// ----
-// TypeError 9574: (128-155): Type function A.f() is not implicitly convertible to expected type function () external. Special functions cannot be converted to function types.
-// TypeError 9574: (165-197): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract.sol
deleted file mode 100644
index 95c4d6febb9b..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract B {
-    function f() external {}
-    function g() public {}
-}
-contract C is B {
-    function h() public returns (bytes4 fs, bytes4 gs) {
-        fs = B.f.selector;
-        gs = B.g.selector;
-        B.g();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol
deleted file mode 100644
index 893b79101680..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract B {
-    function f() external {}
-    function g() internal {}
-}
-contract C is B {
-    function i() public {
-        B.f();
-        B.g.selector;
-    }
-}
-// ----
-// TypeError 3419: (125-130): Cannot call function via contract type name.
-// TypeError 9582: (140-152): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol
deleted file mode 100644
index 7680eac5c1a3..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    function f() external {}
-    function g() external pure {}
-    function h() public pure {}
-}
-
-contract B {
-    function i() external {
-        A.f();
-        A.g();
-        A.h(); // might be allowed in the future
-    }
-}
-// ----
-// TypeError 3419: (160-165): Cannot call function via contract type name.
-// TypeError 3419: (175-180): Cannot call function via contract type name.
-// TypeError 3419: (190-195): Cannot call function via contract type name.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol
deleted file mode 100644
index f351bc547c63..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract contract B {
-    function f() public virtual;
-}
-contract C is B {
-    function f() public override {
-        B.f();
-    }
-}
-// ----
-// TypeError 7501: (118-123): Cannot call unimplemented base function.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_selector_via_contract_name.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_selector_via_contract_name.sol
deleted file mode 100644
index a1a2fa819799..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_selector_via_contract_name.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    function f() external {}
-}
-
-contract B {
-    function g() external pure returns(bytes4) {
-        return A.f.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_selector_via_interface_name.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_selector_via_interface_name.sol
deleted file mode 100644
index 36c980790dca..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_selector_via_interface_name.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface I {
-    function f() external;
-}
-
-contract B {
-    function g() external pure returns(bytes4) {
-        return I.f.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol
deleted file mode 100644
index ef785b036fb6..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function f() internal {}
-}
-
-contract B {
-    function g() external {
-        A.f;
-    }
-}
-// ----
-// TypeError 9582: (94-97): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol
deleted file mode 100644
index 672af71fdae5..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract A {
-    function f() external {}
-    function f(uint256) external {}
-}
-
-contract B {
-    function g() external {
-        A.f;
-    }
-}
-// ----
-// TypeError 6675: (130-133): Member "f" not unique after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol
deleted file mode 100644
index 229d20d2e829..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function f() private {}
-}
-
-contract B {
-    function g() external {
-        A.f;
-    }
-}
-// ----
-// TypeError 9582: (93-96): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_public.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_public.sol
deleted file mode 100644
index 21937d19fc38..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_public.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    function f() public {}
-}
-
-contract B {
-    function g() external pure returns(bytes4) {
-        return A.f.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol
deleted file mode 100644
index fab24ba808c2..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    modifier mod() { _; }
-}
-contract B {
-    function f() public {
-        A.mod;
-    }
-}
-// ----
-// TypeError 9582: (88-93): Member "mod" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol
deleted file mode 100644
index 42e8445c6b99..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    modifier mod() { _; }
-}
-contract B is A {
-    function f() public {
-        A.mod;
-    }
-}
-// ----
-// TypeError 9582: (93-98): Member "mod" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/struct_enum.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/struct_enum.sol
deleted file mode 100644
index d4116d61b5bf..000000000000
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/struct_enum.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-    struct S { uint256 a; }
-    enum E { V }
-}
-contract B {
-    A.S x;
-    A.E e;
-}
-contract C is A {
-    A.S x;
-    S y;
-    A.E e;
-    E f;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contract_to_base.sol b/test/libsolidity/syntaxTests/types/contract_to_base.sol
deleted file mode 100644
index b0a24e620131..000000000000
--- a/test/libsolidity/syntaxTests/types/contract_to_base.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {}
-contract B is A {}
-contract C {
-  function f() public {
-    A a = new B();
-    a;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contract_to_base_base.sol b/test/libsolidity/syntaxTests/types/contract_to_base_base.sol
deleted file mode 100644
index e99e5cdc9bbf..000000000000
--- a/test/libsolidity/syntaxTests/types/contract_to_base_base.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {}
-contract B is A {}
-contract C is B {}
-contract D {
-  function f() public {
-    A a = new C();
-    a;
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/contract_to_derived.sol b/test/libsolidity/syntaxTests/types/contract_to_derived.sol
deleted file mode 100644
index e45f86c42503..000000000000
--- a/test/libsolidity/syntaxTests/types/contract_to_derived.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract B {}
-contract A is B {}
-contract C {
-  function f() public pure {
-    A a = A(new B());
-  }
-}
-// ----
-// TypeError 9640: (85-95): Explicit type conversion not allowed from "contract B" to "contract A".
diff --git a/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol b/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol
deleted file mode 100644
index cbc48df52b8d..000000000000
--- a/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {}
-contract B {}
-contract C {
-  function f() public pure {
-    B b = B(new A());
-  }
-}
-// ----
-// TypeError 9640: (80-90): Explicit type conversion not allowed from "contract A" to "contract B".
diff --git a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol
deleted file mode 100644
index 40d3ce529f71..000000000000
--- a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol
+++ /dev/null
@@ -1,262 +0,0 @@
-contract A {}
-contract Main {
-    A constant B = C;
-    A constant C = D;
-    A constant D = E;
-    A constant E = F;
-    A constant F = G;
-    A constant G = H;
-    A constant H = I;
-    A constant I = J;
-    A constant J = K;
-    A constant K = L;
-    A constant L = M;
-    A constant M = N;
-    A constant N = O;
-    A constant O = P;
-    A constant P = Q;
-    A constant Q = R;
-    A constant R = S;
-    A constant S = T;
-    A constant T = U;
-    A constant U = V;
-    A constant V = W;
-    A constant W = X;
-    A constant X = Y;
-    A constant Y = Z;
-    A constant Z = BA;
-    A constant BA = BB;
-    A constant BB = BC;
-    A constant BC = BD;
-    A constant BD = BE;
-    A constant BE = BF;
-    A constant BF = BG;
-    A constant BG = BH;
-    A constant BH = BI;
-    A constant BI = BJ;
-    A constant BJ = BK;
-    A constant BK = BL;
-    A constant BL = BM;
-    A constant BM = BN;
-    A constant BN = BO;
-    A constant BO = BP;
-    A constant BP = BQ;
-    A constant BQ = BR;
-    A constant BR = BS;
-    A constant BS = BT;
-    A constant BT = BU;
-    A constant BU = BV;
-    A constant BV = BW;
-    A constant BW = BX;
-    A constant BX = BY;
-    A constant BY = BZ;
-    A constant BZ = CA;
-    A constant CA = CB;
-    A constant CB = CC;
-    A constant CC = CD;
-    A constant CD = CE;
-    A constant CE = CF;
-    A constant CF = CG;
-    A constant CG = CH;
-    A constant CH = CI;
-    A constant CI = CJ;
-    A constant CJ = CK;
-    A constant CK = CL;
-    A constant CL = CM;
-    A constant CM = CN;
-    A constant CN = CO;
-    A constant CO = CP;
-    A constant CP = CQ;
-    A constant CQ = CR;
-    A constant CR = CS;
-    A constant CS = CT;
-    A constant CT = CU;
-    A constant CU = CV;
-    A constant CV = CW;
-    A constant CW = CX;
-    A constant CX = CY;
-    A constant CY = CZ;
-    A constant CZ = DA;
-    A constant DA = DB;
-    A constant DB = DC;
-    A constant DC = DD;
-    A constant DD = DE;
-    A constant DE = DF;
-    A constant DF = DG;
-    A constant DG = DH;
-    A constant DH = DI;
-    A constant DI = DJ;
-    A constant DJ = DK;
-    A constant DK = DL;
-    A constant DL = DM;
-    A constant DM = DN;
-    A constant DN = DO;
-    A constant DO = DP;
-    A constant DP = DQ;
-    A constant DQ = DR;
-    A constant DR = DS;
-    A constant DS = DT;
-    A constant DT = DU;
-    A constant DU = DV;
-    A constant DV = DW;
-    A constant DW = DX;
-    A constant DX = DY;
-    A constant DY = DZ;
-    A constant DZ = EA;
-    A constant EA = EB;
-    A constant EB = EC;
-    A constant EC = ED;
-    A constant ED = EE;
-    A constant EE = EF;
-    A constant EF = EG;
-    A constant EG = EH;
-    A constant EH = EI;
-    A constant EI = EJ;
-    A constant EJ = EK;
-    A constant EK = EL;
-    A constant EL = EM;
-    A constant EM = EN;
-    A constant EN = EO;
-    A constant EO = EP;
-    A constant EP = EQ;
-    A constant EQ = ER;
-    A constant ER = ES;
-    A constant ES = ET;
-    A constant ET = EU;
-    A constant EU = EV;
-    A constant EV = EW;
-    A constant EW = EX;
-    A constant EX = EY;
-    A constant EY = EZ;
-    A constant EZ = FA;
-    A constant FA = FB;
-    A constant FB = FC;
-    A constant FC = FD;
-    A constant FD = FE;
-    A constant FE = FF;
-    A constant FF = FG;
-    A constant FG = FH;
-    A constant FH = FI;
-    A constant FI = FJ;
-    A constant FJ = FK;
-    A constant FK = FL;
-    A constant FL = FM;
-    A constant FM = FN;
-    A constant FN = FO;
-    A constant FO = FP;
-    A constant FP = FQ;
-    A constant FQ = FR;
-    A constant FR = FS;
-    A constant FS = FT;
-    A constant FT = FU;
-    A constant FU = FV;
-    A constant FV = FW;
-    A constant FW = FX;
-    A constant FX = FY;
-    A constant FY = FZ;
-    A constant FZ = GA;
-    A constant GA = GB;
-    A constant GB = GC;
-    A constant GC = GD;
-    A constant GD = GE;
-    A constant GE = GF;
-    A constant GF = GG;
-    A constant GG = GH;
-    A constant GH = GI;
-    A constant GI = GJ;
-    A constant GJ = GK;
-    A constant GK = GL;
-    A constant GL = GM;
-    A constant GM = GN;
-    A constant GN = GO;
-    A constant GO = GP;
-    A constant GP = GQ;
-    A constant GQ = GR;
-    A constant GR = GS;
-    A constant GS = GT;
-    A constant GT = GU;
-    A constant GU = GV;
-    A constant GV = GW;
-    A constant GW = GX;
-    A constant GX = GY;
-    A constant GY = GZ;
-    A constant GZ = HA;
-    A constant HA = HB;
-    A constant HB = HC;
-    A constant HC = HD;
-    A constant HD = HE;
-    A constant HE = HF;
-    A constant HF = HG;
-    A constant HG = HH;
-    A constant HH = HI;
-    A constant HI = HJ;
-    A constant HJ = HK;
-    A constant HK = HL;
-    A constant HL = HM;
-    A constant HM = HN;
-    A constant HN = HO;
-    A constant HO = HP;
-    A constant HP = HQ;
-    A constant HQ = HR;
-    A constant HR = HS;
-    A constant HS = HT;
-    A constant HT = HU;
-    A constant HU = HV;
-    A constant HV = HW;
-    A constant HW = HX;
-    A constant HX = HY;
-    A constant HY = HZ;
-    A constant HZ = IA;
-    A constant IA = IB;
-    A constant IB = IC;
-    A constant IC = ID;
-    A constant ID = IE;
-    A constant IE = IF;
-    A constant IF = IG;
-    A constant IG = IH;
-    A constant IH = II;
-    A constant II = IJ;
-    A constant IJ = IK;
-    A constant IK = IL;
-    A constant IL = IM;
-    A constant IM = IN;
-    A constant IN = IO;
-    A constant IO = IP;
-    A constant IP = IQ;
-    A constant IQ = IR;
-    A constant IR = IS;
-    A constant IS = IT;
-    A constant IT = IU;
-    A constant IU = IV;
-    A constant IV = IW;
-    A constant IW = IX;
-    A constant IX = IY;
-    A constant IY = IZ;
-    A constant IZ = JA;
-    A constant JA = JB;
-    A constant JB = JC;
-    A constant JC = JD;
-    A constant JD = JE;
-    A constant JE = JF;
-    A constant JF = JG;
-    A constant JG = JH;
-    A constant JH = JI;
-    A constant JI = JJ;
-    A constant JJ = JK;
-    A constant JK = JL;
-    A constant JL = JM;
-    A constant JM = JN;
-    A constant JN = JO;
-    A constant JO = JP;
-    A constant JP = JQ;
-    A constant JQ = JR;
-    A constant JR = JS;
-    A constant JS = JT;
-    A constant JT = JU;
-    A constant JU = JV;
-    A constant JV = JW;
-    A constant JW = JX;
-    A constant JX = A(address(0x00));
-}
-// ----
-// DeclarationError 7380: (6105-6123): Variable definition exhausting cyclic dependency validator.
diff --git a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_good.sol b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_good.sol
deleted file mode 100644
index 4d27621d3f2d..000000000000
--- a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_good.sol
+++ /dev/null
@@ -1,136 +0,0 @@
-contract A {}
-contract Main {
-    A constant B = C;
-    A constant C = D;
-    A constant D = E;
-    A constant E = F;
-    A constant F = G;
-    A constant G = H;
-    A constant H = I;
-    A constant I = J;
-    A constant J = K;
-    A constant K = L;
-    A constant L = M;
-    A constant M = N;
-    A constant N = O;
-    A constant O = P;
-    A constant P = Q;
-    A constant Q = R;
-    A constant R = S;
-    A constant S = T;
-    A constant T = U;
-    A constant U = V;
-    A constant V = W;
-    A constant W = X;
-    A constant X = Y;
-    A constant Y = Z;
-    A constant Z = BA;
-    A constant BA = BB;
-    A constant BB = BC;
-    A constant BC = BD;
-    A constant BD = BE;
-    A constant BE = BF;
-    A constant BF = BG;
-    A constant BG = BH;
-    A constant BH = BI;
-    A constant BI = BJ;
-    A constant BJ = BK;
-    A constant BK = BL;
-    A constant BL = BM;
-    A constant BM = BN;
-    A constant BN = BO;
-    A constant BO = BP;
-    A constant BP = BQ;
-    A constant BQ = BR;
-    A constant BR = BS;
-    A constant BS = BT;
-    A constant BT = BU;
-    A constant BU = BV;
-    A constant BV = BW;
-    A constant BW = BX;
-    A constant BX = BY;
-    A constant BY = BZ;
-    A constant BZ = CA;
-    A constant CA = CB;
-    A constant CB = CC;
-    A constant CC = CD;
-    A constant CD = CE;
-    A constant CE = CF;
-    A constant CF = CG;
-    A constant CG = CH;
-    A constant CH = CI;
-    A constant CI = CJ;
-    A constant CJ = CK;
-    A constant CK = CL;
-    A constant CL = CM;
-    A constant CM = CN;
-    A constant CN = CO;
-    A constant CO = CP;
-    A constant CP = CQ;
-    A constant CQ = CR;
-    A constant CR = CS;
-    A constant CS = CT;
-    A constant CT = CU;
-    A constant CU = CV;
-    A constant CV = CW;
-    A constant CW = CX;
-    A constant CX = CY;
-    A constant CY = CZ;
-    A constant CZ = DA;
-    A constant DA = DB;
-    A constant DB = DC;
-    A constant DC = DD;
-    A constant DD = DE;
-    A constant DE = DF;
-    A constant DF = DG;
-    A constant DG = DH;
-    A constant DH = DI;
-    A constant DI = DJ;
-    A constant DJ = DK;
-    A constant DK = DL;
-    A constant DL = DM;
-    A constant DM = DN;
-    A constant DN = DO;
-    A constant DO = DP;
-    A constant DP = DQ;
-    A constant DQ = DR;
-    A constant DR = DS;
-    A constant DS = DT;
-    A constant DT = DU;
-    A constant DU = DV;
-    A constant DV = DW;
-    A constant DW = DX;
-    A constant DX = DY;
-    A constant DY = DZ;
-    A constant DZ = EA;
-    A constant EA = EB;
-    A constant EB = EC;
-    A constant EC = ED;
-    A constant ED = EE;
-    A constant EE = EF;
-    A constant EF = EG;
-    A constant EG = EH;
-    A constant EH = EI;
-    A constant EI = EJ;
-    A constant EJ = EK;
-    A constant EK = EL;
-    A constant EL = EM;
-    A constant EM = EN;
-    A constant EN = EO;
-    A constant EO = EP;
-    A constant EP = EQ;
-    A constant EQ = ER;
-    A constant ER = ES;
-    A constant ES = ET;
-    A constant ET = EU;
-    A constant EU = EV;
-    A constant EV = EW;
-    A constant EW = EX;
-    A constant EX = EY;
-    A constant EY = EZ;
-    A constant EZ = FA;
-    A constant FA = FB;
-    A constant FB = FC;
-    A constant FC = A(address(0x00));
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol
deleted file mode 100644
index 2dab25f1ff6a..000000000000
--- a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol
+++ /dev/null
@@ -1,260 +0,0 @@
-contract Main {
-    struct B { C m; }
-    struct C { D m; }
-    struct D { E m; }
-    struct E { F m; }
-    struct F { G m; }
-    struct G { H m; }
-    struct H { I m; }
-    struct I { J m; }
-    struct J { K m; }
-    struct K { L m; }
-    struct L { M m; }
-    struct M { N m; }
-    struct N { O m; }
-    struct O { P m; }
-    struct P { Q m; }
-    struct Q { R m; }
-    struct R { S m; }
-    struct S { T m; }
-    struct T { U m; }
-    struct U { V m; }
-    struct V { W m; }
-    struct W { X m; }
-    struct X { Y m; }
-    struct Y { Z m; }
-    struct Z { BA m; }
-    struct BA { BB m; }
-    struct BB { BC m; }
-    struct BC { BD m; }
-    struct BD { BE m; }
-    struct BE { BF m; }
-    struct BF { BG m; }
-    struct BG { BH m; }
-    struct BH { BI m; }
-    struct BI { BJ m; }
-    struct BJ { BK m; }
-    struct BK { BL m; }
-    struct BL { BM m; }
-    struct BM { BN m; }
-    struct BN { BO m; }
-    struct BO { BP m; }
-    struct BP { BQ m; }
-    struct BQ { BR m; }
-    struct BR { BS m; }
-    struct BS { BT m; }
-    struct BT { BU m; }
-    struct BU { BV m; }
-    struct BV { BW m; }
-    struct BW { BX m; }
-    struct BX { BY m; }
-    struct BY { BZ m; }
-    struct BZ { CA m; }
-    struct CA { CB m; }
-    struct CB { CC m; }
-    struct CC { CD m; }
-    struct CD { CE m; }
-    struct CE { CF m; }
-    struct CF { CG m; }
-    struct CG { CH m; }
-    struct CH { CI m; }
-    struct CI { CJ m; }
-    struct CJ { CK m; }
-    struct CK { CL m; }
-    struct CL { CM m; }
-    struct CM { CN m; }
-    struct CN { CO m; }
-    struct CO { CP m; }
-    struct CP { CQ m; }
-    struct CQ { CR m; }
-    struct CR { CS m; }
-    struct CS { CT m; }
-    struct CT { CU m; }
-    struct CU { CV m; }
-    struct CV { CW m; }
-    struct CW { CX m; }
-    struct CX { CY m; }
-    struct CY { CZ m; }
-    struct CZ { DA m; }
-    struct DA { DB m; }
-    struct DB { DC m; }
-    struct DC { DD m; }
-    struct DD { DE m; }
-    struct DE { DF m; }
-    struct DF { DG m; }
-    struct DG { DH m; }
-    struct DH { DI m; }
-    struct DI { DJ m; }
-    struct DJ { DK m; }
-    struct DK { DL m; }
-    struct DL { DM m; }
-    struct DM { DN m; }
-    struct DN { DO m; }
-    struct DO { DP m; }
-    struct DP { DQ m; }
-    struct DQ { DR m; }
-    struct DR { DS m; }
-    struct DS { DT m; }
-    struct DT { DU m; }
-    struct DU { DV m; }
-    struct DV { DW m; }
-    struct DW { DX m; }
-    struct DX { DY m; }
-    struct DY { DZ m; }
-    struct DZ { EA m; }
-    struct EA { EB m; }
-    struct EB { EC m; }
-    struct EC { ED m; }
-    struct ED { EE m; }
-    struct EE { EF m; }
-    struct EF { EG m; }
-    struct EG { EH m; }
-    struct EH { EI m; }
-    struct EI { EJ m; }
-    struct EJ { EK m; }
-    struct EK { EL m; }
-    struct EL { EM m; }
-    struct EM { EN m; }
-    struct EN { EO m; }
-    struct EO { EP m; }
-    struct EP { EQ m; }
-    struct EQ { ER m; }
-    struct ER { ES m; }
-    struct ES { ET m; }
-    struct ET { EU m; }
-    struct EU { EV m; }
-    struct EV { EW m; }
-    struct EW { EX m; }
-    struct EX { EY m; }
-    struct EY { EZ m; }
-    struct EZ { FA m; }
-    struct FA { FB m; }
-    struct FB { FC m; }
-    struct FC { FD m; }
-    struct FD { FE m; }
-    struct FE { FF m; }
-    struct FF { FG m; }
-    struct FG { FH m; }
-    struct FH { FI m; }
-    struct FI { FJ m; }
-    struct FJ { FK m; }
-    struct FK { FL m; }
-    struct FL { FM m; }
-    struct FM { FN m; }
-    struct FN { FO m; }
-    struct FO { FP m; }
-    struct FP { FQ m; }
-    struct FQ { FR m; }
-    struct FR { FS m; }
-    struct FS { FT m; }
-    struct FT { FU m; }
-    struct FU { FV m; }
-    struct FV { FW m; }
-    struct FW { FX m; }
-    struct FX { FY m; }
-    struct FY { FZ m; }
-    struct FZ { GA m; }
-    struct GA { GB m; }
-    struct GB { GC m; }
-    struct GC { GD m; }
-    struct GD { GE m; }
-    struct GE { GF m; }
-    struct GF { GG m; }
-    struct GG { GH m; }
-    struct GH { GI m; }
-    struct GI { GJ m; }
-    struct GJ { GK m; }
-    struct GK { GL m; }
-    struct GL { GM m; }
-    struct GM { GN m; }
-    struct GN { GO m; }
-    struct GO { GP m; }
-    struct GP { GQ m; }
-    struct GQ { GR m; }
-    struct GR { GS m; }
-    struct GS { GT m; }
-    struct GT { GU m; }
-    struct GU { GV m; }
-    struct GV { GW m; }
-    struct GW { GX m; }
-    struct GX { GY m; }
-    struct GY { GZ m; }
-    struct GZ { HA m; }
-    struct HA { HB m; }
-    struct HB { HC m; }
-    struct HC { HD m; }
-    struct HD { HE m; }
-    struct HE { HF m; }
-    struct HF { HG m; }
-    struct HG { HH m; }
-    struct HH { HI m; }
-    struct HI { HJ m; }
-    struct HJ { HK m; }
-    struct HK { HL m; }
-    struct HL { HM m; }
-    struct HM { HN m; }
-    struct HN { HO m; }
-    struct HO { HP m; }
-    struct HP { HQ m; }
-    struct HQ { HR m; }
-    struct HR { HS m; }
-    struct HS { HT m; }
-    struct HT { HU m; }
-    struct HU { HV m; }
-    struct HV { HW m; }
-    struct HW { HX m; }
-    struct HX { HY m; }
-    struct HY { HZ m; }
-    struct HZ { IA m; }
-    struct IA { IB m; }
-    struct IB { IC m; }
-    struct IC { ID m; }
-    struct ID { IE m; }
-    struct IE { IF m; }
-    struct IF { IG m; }
-    struct IG { IH m; }
-    struct IH { II m; }
-    struct II { IJ m; }
-    struct IJ { IK m; }
-    struct IK { IL m; }
-    struct IL { IM m; }
-    struct IM { IN m; }
-    struct IN { IO m; }
-    struct IO { IP m; }
-    struct IP { IQ m; }
-    struct IQ { IR m; }
-    struct IR { IS m; }
-    struct IS { IT m; }
-    struct IT { IU m; }
-    struct IU { IV m; }
-    struct IV { IW m; }
-    struct IW { IX m; }
-    struct IX { IY m; }
-    struct IY { IZ m; }
-    struct IZ { JA m; }
-    struct JA { JB m; }
-    struct JB { JC m; }
-    struct JC { JD m; }
-    struct JD { JE m; }
-    struct JE { JF m; }
-    struct JF { JG m; }
-    struct JG { JH m; }
-    struct JH { JI m; }
-    struct JI { JJ m; }
-    struct JJ { JK m; }
-    struct JK { JL m; }
-    struct JL { JM m; }
-    struct JM { JN m; }
-    struct JN { JO m; }
-    struct JO { JP m; }
-    struct JP { JQ m; }
-    struct JQ { JR m; }
-    struct JR { JS m; }
-    struct JS { JT m; }
-    struct JT { JU m; }
-    struct JU { JV m; }
-    struct JV { JW m; }
-    struct JW { int i; }
-}
-// ----
-// DeclarationError 5651: (6091-6111): Struct definition exhausts cyclic dependency validator.
diff --git a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_good.sol b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_good.sol
deleted file mode 100644
index 184a1246ea78..000000000000
--- a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_good.sol
+++ /dev/null
@@ -1,135 +0,0 @@
-contract Main {
-    struct B { C m; }
-    struct C { D m; }
-    struct D { E m; }
-    struct E { F m; }
-    struct F { G m; }
-    struct G { H m; }
-    struct H { I m; }
-    struct I { J m; }
-    struct J { K m; }
-    struct K { L m; }
-    struct L { M m; }
-    struct M { N m; }
-    struct N { O m; }
-    struct O { P m; }
-    struct P { Q m; }
-    struct Q { R m; }
-    struct R { S m; }
-    struct S { T m; }
-    struct T { U m; }
-    struct U { V m; }
-    struct V { W m; }
-    struct W { X m; }
-    struct X { Y m; }
-    struct Y { Z m; }
-    struct Z { BA m; }
-    struct BA { BB m; }
-    struct BB { BC m; }
-    struct BC { BD m; }
-    struct BD { BE m; }
-    struct BE { BF m; }
-    struct BF { BG m; }
-    struct BG { BH m; }
-    struct BH { BI m; }
-    struct BI { BJ m; }
-    struct BJ { BK m; }
-    struct BK { BL m; }
-    struct BL { BM m; }
-    struct BM { BN m; }
-    struct BN { BO m; }
-    struct BO { BP m; }
-    struct BP { BQ m; }
-    struct BQ { BR m; }
-    struct BR { BS m; }
-    struct BS { BT m; }
-    struct BT { BU m; }
-    struct BU { BV m; }
-    struct BV { BW m; }
-    struct BW { BX m; }
-    struct BX { BY m; }
-    struct BY { BZ m; }
-    struct BZ { CA m; }
-    struct CA { CB m; }
-    struct CB { CC m; }
-    struct CC { CD m; }
-    struct CD { CE m; }
-    struct CE { CF m; }
-    struct CF { CG m; }
-    struct CG { CH m; }
-    struct CH { CI m; }
-    struct CI { CJ m; }
-    struct CJ { CK m; }
-    struct CK { CL m; }
-    struct CL { CM m; }
-    struct CM { CN m; }
-    struct CN { CO m; }
-    struct CO { CP m; }
-    struct CP { CQ m; }
-    struct CQ { CR m; }
-    struct CR { CS m; }
-    struct CS { CT m; }
-    struct CT { CU m; }
-    struct CU { CV m; }
-    struct CV { CW m; }
-    struct CW { CX m; }
-    struct CX { CY m; }
-    struct CY { CZ m; }
-    struct CZ { DA m; }
-    struct DA { DB m; }
-    struct DB { DC m; }
-    struct DC { DD m; }
-    struct DD { DE m; }
-    struct DE { DF m; }
-    struct DF { DG m; }
-    struct DG { DH m; }
-    struct DH { DI m; }
-    struct DI { DJ m; }
-    struct DJ { DK m; }
-    struct DK { DL m; }
-    struct DL { DM m; }
-    struct DM { DN m; }
-    struct DN { DO m; }
-    struct DO { DP m; }
-    struct DP { DQ m; }
-    struct DQ { DR m; }
-    struct DR { DS m; }
-    struct DS { DT m; }
-    struct DT { DU m; }
-    struct DU { DV m; }
-    struct DV { DW m; }
-    struct DW { DX m; }
-    struct DX { DY m; }
-    struct DY { DZ m; }
-    struct DZ { EA m; }
-    struct EA { EB m; }
-    struct EB { EC m; }
-    struct EC { ED m; }
-    struct ED { EE m; }
-    struct EE { EF m; }
-    struct EF { EG m; }
-    struct EG { EH m; }
-    struct EH { EI m; }
-    struct EI { EJ m; }
-    struct EJ { EK m; }
-    struct EK { EL m; }
-    struct EL { EM m; }
-    struct EM { EN m; }
-    struct EN { EO m; }
-    struct EO { EP m; }
-    struct EP { EQ m; }
-    struct EQ { ER m; }
-    struct ER { ES m; }
-    struct ES { ET m; }
-    struct ET { EU m; }
-    struct EU { EV m; }
-    struct EV { EW m; }
-    struct EW { EX m; }
-    struct EX { EY m; }
-    struct EY { EZ m; }
-    struct EZ { FA m; }
-    struct FA { FB m; }
-    struct FB { FC m; }
-    struct FC { int i; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol b/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol
deleted file mode 100644
index 920c8991be5d..000000000000
--- a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = bytes1(1);
-     bytes2 b2 = bytes2(1);
-     bytes2 b3 = bytes2(256);
-     bytes3 b4 = bytes3(1);
-     bytes3 b5 = bytes3(65536);
-     bytes4 b6 = bytes4(1);
-     bytes4 b7 = bytes4(16777216);
-     bytes16 b8 = bytes16(1);
-     bytes32 b9 = bytes32(1);
-   }
-}
-// ----
-// TypeError 9640: (60-69): Explicit type conversion not allowed from "int_const 1" to "bytes1".
-// TypeError 9640: (88-97): Explicit type conversion not allowed from "int_const 1" to "bytes2".
-// TypeError 9640: (116-127): Explicit type conversion not allowed from "int_const 256" to "bytes2".
-// TypeError 9640: (146-155): Explicit type conversion not allowed from "int_const 1" to "bytes3".
-// TypeError 9640: (174-187): Explicit type conversion not allowed from "int_const 65536" to "bytes3".
-// TypeError 9640: (206-215): Explicit type conversion not allowed from "int_const 1" to "bytes4".
-// TypeError 9640: (234-250): Explicit type conversion not allowed from "int_const 16777216" to "bytes4".
-// TypeError 9640: (270-280): Explicit type conversion not allowed from "int_const 1" to "bytes16".
-// TypeError 9640: (300-310): Explicit type conversion not allowed from "int_const 1" to "bytes32".
diff --git a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol b/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol
deleted file mode 100644
index 9f7002a8d39b..000000000000
--- a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = 1;
-     bytes2 b2 = 1;
-     bytes2 b3 = 256;
-     bytes3 b4 = 1;
-     bytes3 b5 = 65536;
-     bytes4 b6 = 1;
-     bytes4 b7 = 16777216;
-     bytes16 b8 = 1;
-     bytes32 b9 = 1;
-   }
-}
-// ----
-// TypeError 9574: (48-61): Type int_const 1 is not implicitly convertible to expected type bytes1.
-// TypeError 9574: (68-81): Type int_const 1 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (88-103): Type int_const 256 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (110-123): Type int_const 1 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (130-147): Type int_const 65536 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (154-167): Type int_const 1 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (174-194): Type int_const 16777216 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (201-215): Type int_const 1 is not implicitly convertible to expected type bytes16.
-// TypeError 9574: (222-236): Type int_const 1 is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_event.sol b/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
deleted file mode 100644
index a83e6ec1ee59..000000000000
--- a/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    event SomeEvent();
-    function a() public {
-        (emit SomeEvent(), 7);
-    }
-}
-// ----
-// ParserError 6933: (71-75): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_function.sol b/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
deleted file mode 100644
index f60fe87a1c6b..000000000000
--- a/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() private pure {}
-    function a() public pure {
-        bool x = true;
-        bool y = true;
-        (x) ? (f(), y = false) : (f(), y = false);
-    }
-}
-// ----
-// TypeError 6473: (138-141): Tuple component cannot be empty.
-// TypeError 6473: (157-160): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
deleted file mode 100644
index 9d2ed7b24039..000000000000
--- a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    function f() private pure {}
-    function a() public {
-        uint x;
-        uint y;
-        (x, y) = (f(), f());
-    }
-}
-// ----
-// TypeError 6473: (122-125): Tuple component cannot be empty.
-// TypeError 6473: (127-130): Tuple component cannot be empty.
-// TypeError 7407: (121-131): Type tuple(tuple(),tuple()) is not implicitly convertible to expected type tuple(uint256,uint256).
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol
deleted file mode 100644
index 538460c68b2a..000000000000
--- a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() private pure {}
-    function a() public {
-        uint x;
-        uint y;
-        (x, y) = [f(), f()];
-    }
-}
-// ----
-// TypeError 5604: (122-125): Array component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/encoding_fractional.sol b/test/libsolidity/syntaxTests/types/encoding_fractional.sol
deleted file mode 100644
index 2202e7a82e56..000000000000
--- a/test/libsolidity/syntaxTests/types/encoding_fractional.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-   function f1() public pure returns (bytes memory) {
-       return abi.encode(0.1, 1);
-   }
-}
-// ----
-// TypeError 6090: (92-95): Fractional numbers cannot yet be encoded.
diff --git a/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol b/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol
deleted file mode 100644
index 6c818fa7682c..000000000000
--- a/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma abicoder               v2;
-contract C {
-   function f1() public pure returns (bytes memory) {
-       return abi.encode(0.1, 1);
-   }
-}
-// ----
-// TypeError 6090: (126-129): Fractional numbers cannot yet be encoded.
diff --git a/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol b/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol
deleted file mode 100644
index f3e2863f06d2..000000000000
--- a/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-   function f1() public pure returns (bytes memory) {
-       return abi.encodePacked(0.1, 1);
-   }
-}
-// ----
-// TypeError 6090: (98-101): Fractional numbers cannot yet be encoded.
-// TypeError 7279: (103-104): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol b/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol
deleted file mode 100644
index c227caa40e9d..000000000000
--- a/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-   function f1() public pure returns (bytes memory) {
-       return abi.encodePacked(0.1, 1);
-   }
-}
-// ----
-// TypeError 6090: (132-135): Fractional numbers cannot yet be encoded.
-// TypeError 7279: (137-138): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/types/event_with_rational_size_array.sol b/test/libsolidity/syntaxTests/types/event_with_rational_size_array.sol
deleted file mode 100644
index 75350a485430..000000000000
--- a/test/libsolidity/syntaxTests/types/event_with_rational_size_array.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-contract a { event b(uint[(1 / 1)]); }
-// ----
diff --git a/test/libsolidity/syntaxTests/types/function_call_fail.sol b/test/libsolidity/syntaxTests/types/function_call_fail.sol
deleted file mode 100644
index 67631bc2bf7e..000000000000
--- a/test/libsolidity/syntaxTests/types/function_call_fail.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint y) public pure {
-        (4(y)) = 2;
-    }
-}
-// ----
-// TypeError 5704: (59-63): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/types/function_call_fail2.sol b/test/libsolidity/syntaxTests/types/function_call_fail2.sol
deleted file mode 100644
index 97b7519191ce..000000000000
--- a/test/libsolidity/syntaxTests/types/function_call_fail2.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f(uint y) public pure returns (uint) {
-        (f(y)) = 2;
-    }
-}
-// ----
-// TypeError 4247: (74-78): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol b/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol
deleted file mode 100644
index b514e1ce1e7e..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface Banana {
-    function transfer(address,uint256) external returns(bool);
-}
-
-contract Apple {
-    function f() public pure {
-        Banana.transfer;
-    }
-}
-// ----
-// Warning 6133: (141-156): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_parameter_return_types_fail.sol b/test/libsolidity/syntaxTests/types/function_types/function_parameter_return_types_fail.sol
deleted file mode 100644
index 9fb1a432d074..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/function_parameter_return_types_fail.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-abstract contract Test
-{
-    function uint256_to_uint256(uint256 x) internal pure returns (uint256) { return x; }
-    function uint256_to_string(uint256 x) internal pure returns (string memory) { return x == 0 ? "a" : "b"; }
-    function uint256_to_string_storage(uint256) internal pure returns (string storage) {}
-    function string_to_uint256(string memory x) internal pure returns (uint256) { return bytes(x).length; }
-    function string_to_string(string memory x) internal pure returns (string memory) { return x; }
-
-    function uint256_uint256_to_uint256(uint256 x, uint256 y) internal pure returns (uint256) { return x + y; }
-    function uint256_uint256_to_string(uint256 x, uint256 y) internal pure returns (string memory) { return x == y ? "a" : "b"; }
-    function string_uint256_to_string(string memory x, uint256 y) internal pure returns (string memory) { return y == 0 ? "a" : x; }
-    function string_string_to_string(string memory x, string memory y) internal pure returns (string memory) { return bytes(x).length == 0 ? y : x; }
-    function uint256_string_to_string(uint256 x, string memory y) internal pure returns (string memory) { return x == 0 ? "a" : y; }
-
-    function tests() internal pure
-    {
-      function (uint256) internal pure returns (uint256) var_uint256_to_uint256 = uint256_to_string;
-      function (uint256) internal pure returns (string memory) var_uint256_to_string = uint256_to_string_storage;
-      function (string memory) internal pure returns (uint256) var_string_to_uint256 = uint256_to_string;
-      function (string memory) internal pure returns (string memory) var_string_to_string = var_uint256_to_string;
-
-      function (uint256, uint256) internal pure returns (uint256) var_uint256_uint256_to_uint256 = uint256_to_uint256;
-      function (string memory, uint256) internal pure returns (string memory) var_string_uint256_to_string = string_to_string;
-      function (string memory, string memory) internal pure returns (string memory) var_string_string_to_string = string_to_string;
-
-      var_uint256_to_uint256(1);
-      var_uint256_to_string(2);
-      var_string_to_uint256("a");
-      var_string_to_string("b");
-      var_uint256_uint256_to_uint256(3, 4);
-      var_string_uint256_to_string("c", 7);
-      var_string_string_to_string("d", "e");
-    }
-}
-// ----
-// TypeError 9574: (1229-1322): Type function (uint256) pure returns (string memory) is not implicitly convertible to expected type function (uint256) pure returns (uint256).
-// TypeError 9574: (1330-1436): Type function (uint256) pure returns (string storage pointer) is not implicitly convertible to expected type function (uint256) pure returns (string memory).
-// TypeError 9574: (1444-1542): Type function (uint256) pure returns (string memory) is not implicitly convertible to expected type function (string memory) pure returns (uint256).
-// TypeError 9574: (1550-1657): Type function (uint256) pure returns (string memory) is not implicitly convertible to expected type function (string memory) pure returns (string memory).
-// TypeError 9574: (1666-1777): Type function (uint256) pure returns (uint256) is not implicitly convertible to expected type function (uint256,uint256) pure returns (uint256).
-// TypeError 9574: (1785-1904): Type function (string memory) pure returns (string memory) is not implicitly convertible to expected type function (string memory,uint256) pure returns (string memory).
-// TypeError 9574: (1912-2036): Type function (string memory) pure returns (string memory) is not implicitly convertible to expected type function (string memory,string memory) pure returns (string memory).
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_parameter_return_types_success.sol b/test/libsolidity/syntaxTests/types/function_types/function_parameter_return_types_success.sol
deleted file mode 100644
index f750632efc13..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/function_parameter_return_types_success.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract Test
-{
-  function uint256_to_uint256(uint256 x) internal pure returns (uint256) { return x; }
-  function uint256_to_string(uint256 x) internal pure returns (string memory) { return x == 0 ? "a" : "b"; }
-  function string_to_uint256(string memory x) internal pure returns (uint256) { return bytes(x).length; }
-  function string_to_string(string memory x) internal pure returns (string memory) { return x; }
-
-  function uint256_uint256_to_uint256(uint256 x, uint256 y) internal pure returns (uint256) { return x + y; }
-  function uint256_uint256_to_string(uint256 x, uint256 y) internal pure returns (string memory) { return x == y ? "a" : "b"; }
-  function string_uint256_to_string(string memory x, uint256 y) internal pure returns (string memory) { return y == 0 ? "a" : x; }
-  function string_string_to_string(string memory x, string memory y) internal pure returns (string memory) { return bytes(x).length == 0 ? y : x; }
-  function uint256_string_to_string(uint256 x, string memory y) internal pure returns (string memory) { return x == 0 ? "a" : y; }
-
-  function tests() internal pure
-  {
-    function (uint256) internal pure returns (uint256) var_uint256_to_uint256 = uint256_to_uint256;
-    function (uint256) internal pure returns (string memory) var_uint256_to_string = uint256_to_string;
-    function (string memory) internal pure returns (uint256) var_string_to_uint256 = string_to_uint256;
-    function (string memory) internal pure returns (string memory) var_string_to_string = string_to_string;
-
-    function (uint256, uint256) internal pure returns (uint256) var_uint256_uint256_to_uint256 = uint256_uint256_to_uint256;
-    function (uint256, uint256) internal pure returns (string memory) var_uint256_uint256_to_string = uint256_uint256_to_string;
-    function (string memory, uint256) internal pure returns (string memory) var_string_uint256_to_string = string_uint256_to_string;
-    function (string memory, string memory) internal pure returns (string memory) var_string_string_to_string = string_string_to_string;
-    function (uint256, string memory) internal pure returns (string memory) var_uint256_string_to_string = uint256_string_to_string;
-
-    // Avoid unused variable warnings:
-    var_uint256_to_uint256(1);
-    var_uint256_to_string(2);
-    var_string_to_uint256("a");
-    var_string_to_string("b");
-    var_uint256_uint256_to_uint256(3, 4);
-    var_uint256_uint256_to_string(5, 6);
-    var_string_uint256_to_string("c", 7);
-    var_string_string_to_string("d", "e");
-    var_uint256_string_to_string(8, "f");
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol b/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol
deleted file mode 100644
index b393ed1197cf..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-contract Test
-{
-  function internalPureFunc(uint256 x) internal pure returns (uint256) { return x; }
-  function internalViewFunc(uint256 x) internal view returns (uint256) { return x; }
-  function internalMutableFunc(uint256 x) internal returns (uint256) { return x; }
-
-  function externalPureFunc(uint256 x) external pure returns (uint256) { return x; }
-  function externalViewFunc(uint256 x) external view returns (uint256) { return x; }
-  function externalPayableFunc(uint256 x) external payable returns (uint256) { return x; }
-  function externalMutableFunc(uint256 x) external returns (uint256) { return x; }
-
-  function funcTakesInternalPure(function(uint256) internal pure returns(uint256) a) internal returns (uint256) { return a(4); }
-  function funcTakesInternalView(function(uint256) internal view returns(uint256) a) internal returns (uint256) { return a(4); }
-  function funcTakesInternalMutable(function(uint256) internal returns(uint256) a) internal returns (uint256) { return a(4); }
-
-  function funcTakesExternalPure(function(uint256) external pure returns(uint256) a) internal returns (uint256) { return a(4); }
-  function funcTakesExternalView(function(uint256) external view returns(uint256) a) internal returns (uint256) { return a(4); }
-  function funcTakesExternalPayable(function(uint256) external payable returns(uint256) a) internal returns (uint256) { return a(4); }
-  function funcTakesExternalMutable(function(uint256) external returns(uint256) a) internal returns (uint256) { return a(4); }
-
-  function tests() internal
-  {
-    funcTakesInternalPure(internalViewFunc); // view -> pure should fail
-    funcTakesInternalPure(internalMutableFunc); // mutable -> pure should fail
-
-    funcTakesInternalView(internalMutableFunc); // mutable -> view should fail
-
-    funcTakesExternalPure(this.externalViewFunc); // view -> pure should fail
-    funcTakesExternalPure(this.externalPayableFunc); // payable -> pure should fail
-    funcTakesExternalPure(this.externalMutableFunc); // mutable -> pure should fail
-
-    funcTakesExternalView(this.externalPayableFunc); // payable -> view should fail
-    funcTakesExternalView(this.externalMutableFunc); // mutable -> view should fail
-
-    funcTakesExternalPayable(this.externalPureFunc); // pure -> payable should fail
-    funcTakesExternalPayable(this.externalViewFunc); // view -> payable should fail
-    funcTakesExternalPayable(this.externalMutableFunc); // mutable -> payable should fail
-  }
-}
-// ----
-// TypeError 9553: (1580-1596): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view returns (uint256) to function (uint256) pure returns (uint256) requested.
-// TypeError 9553: (1653-1672): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) pure returns (uint256) requested.
-// TypeError 9553: (1733-1752): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) view returns (uint256) requested.
-// TypeError 9553: (1813-1834): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view external returns (uint256) to function (uint256) pure external returns (uint256) requested.
-// TypeError 9553: (1891-1915): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) payable external returns (uint256) to function (uint256) pure external returns (uint256) requested.
-// TypeError 9553: (1975-1999): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) pure external returns (uint256) requested.
-// TypeError 9553: (2060-2084): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) payable external returns (uint256) to function (uint256) view external returns (uint256) requested.
-// TypeError 9553: (2144-2168): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) view external returns (uint256) requested.
-// TypeError 9553: (2232-2253): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function (uint256) payable external returns (uint256) requested.
-// TypeError 9553: (2316-2337): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view external returns (uint256) to function (uint256) payable external returns (uint256) requested.
-// TypeError 9553: (2400-2424): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) payable external returns (uint256) requested.
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_success.sol b/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_success.sol
deleted file mode 100644
index 4ee515fc4f51..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_success.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract Test
-{
-  uint y;
-  function internalPureFunc(uint256 x) internal pure returns (uint256) { return x; }
-  function internalViewFunc(uint256 x) internal view returns (uint256) { return x + y; }
-  function internalMutableFunc(uint256 x) internal returns (uint256) { y = x; return x; }
-
-  function externalPureFunc(uint256 x) external pure returns (uint256) { return x; }
-  function externalViewFunc(uint256 x) external view returns (uint256) { return x + y; }
-  function externalPayableFunc(uint256 x) external payable returns (uint256) { return x + y; }
-  function externalMutableFunc(uint256 x) external returns (uint256) { y = x; return x; }
-
-  function funcTakesInternalPure(function(uint256) internal pure returns(uint256) a) internal pure returns (uint256) { return a(4); }
-  function funcTakesInternalView(function(uint256) internal view returns(uint256) a) internal view returns (uint256) { return a(4); }
-  function funcTakesInternalMutable(function(uint256) internal returns(uint256) a) internal returns (uint256) { return a(4); }
-
-  function funcTakesExternalPure(function(uint256) external pure returns(uint256) a) internal pure returns (uint256) { return a(4); }
-  function funcTakesExternalView(function(uint256) external view returns(uint256) a) internal view returns (uint256) { return a(4); }
-  function funcTakesExternalPayable(function(uint256) external payable returns(uint256) a) internal returns (uint256) { return a(4); }
-  function funcTakesExternalMutable(function(uint256) external returns(uint256) a) internal returns (uint256) { return a(4); }
-
-  function tests() internal
-  {
-    funcTakesInternalPure(internalPureFunc);
-
-    funcTakesInternalView(internalPureFunc);
-    funcTakesInternalView(internalViewFunc);
-
-    funcTakesInternalMutable(internalPureFunc);
-    funcTakesInternalMutable(internalViewFunc);
-    funcTakesInternalMutable(internalMutableFunc);
-
-    funcTakesExternalPure(this.externalPureFunc);
-
-    funcTakesExternalView(this.externalPureFunc);
-    funcTakesExternalView(this.externalViewFunc);
-
-    funcTakesExternalPayable(this.externalPayableFunc);
-
-    funcTakesExternalMutable(this.externalPureFunc);
-    funcTakesExternalMutable(this.externalViewFunc);
-    funcTakesExternalMutable(this.externalPayableFunc);
-    funcTakesExternalMutable(this.externalMutableFunc);
-  }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/function_selector_pure.sol b/test/libsolidity/syntaxTests/types/function_types/selector/function_selector_pure.sol
deleted file mode 100644
index d27e163fd1c3..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/selector/function_selector_pure.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-interface A {
-    function f() external;
-}
-contract B {
-    function g() public {}
-}
-
-contract C is B {
-    function h() external {}
-    bytes4 constant s1 = A.f.selector;
-    bytes4 constant s2 = B.g.selector;
-    bytes4 constant s3 = this.h.selector;
-    bytes4 constant s4 = super.g.selector;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol b/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol
deleted file mode 100644
index aeb2f6cd817b..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public pure returns (bytes4) {
-        function() external g;
-        // Make sure g.selector is not considered pure:
-        // If it was considered pure, this would emit a warning "Statement has no effect".
-        g.selector;
-    }
-}
-// ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol
deleted file mode 100644
index bccc6fb76632..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract A {
-    function() external public f;
-}
-
-contract C {
-    bytes4 constant s4 = A.f.selector;
-}
-// ----
-// TypeError 9582: (88-91): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol
deleted file mode 100644
index 90ff1488fd96..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    function() external public f;
-}
-contract B {
-    function() external public g;
-}
-
-contract C is B {
-    function() external public h;
-    bytes4 constant s1 = h.selector;
-    bytes4 constant s2 = B.g.selector;
-    bytes4 constant s3 = this.h.selector;
-}
-// ----
-// TypeError 8349: (176-186): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (213-225): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (252-267): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol
deleted file mode 100644
index 0aab02207524..000000000000
--- a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract B {
-    function() external public g;
-}
-
-contract C is B {
-    bytes4 constant s4 = super.g.selector;
-}
-// ----
-// TypeError 9582: (93-100): Member "g" not found or not visible after argument-dependent lookup in type(contract super C).
diff --git a/test/libsolidity/syntaxTests/types/global_struct_recursive.sol b/test/libsolidity/syntaxTests/types/global_struct_recursive.sol
deleted file mode 100644
index a3f6976d8aaa..000000000000
--- a/test/libsolidity/syntaxTests/types/global_struct_recursive.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-struct s1 { s2 x; }
-struct s2 { s1 y; }
-
-contract C {
-    // whatever
-}
-// ----
-// TypeError 2046: (0-19): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
deleted file mode 100644
index 5b24153c8f74..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    bytes32 b = ~hex"00ff11";
-}
-// ----
-// TypeError 4907: (29-41): Built-in unary operator ~ cannot be applied to type literal_string hex"00ff11".
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol
deleted file mode 100644
index 7e10fff50bba..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = bytes1(0x1);
-     bytes1 b2 = bytes1(0x100);
-     bytes2 b3 = bytes2(0xFF);
-     bytes2 b4 = bytes2(0x100);
-     bytes2 b5 = bytes2(0x10000);
-     bytes3 b6 = bytes3(0xFFFF);
-     bytes3 b7 = bytes3(0x10000);
-     bytes3 b8 = bytes3(0x1000000);
-     bytes4 b9 = bytes4(0xFFFFFF);
-     bytes4 b10 = bytes4(0x1000000);
-     bytes4 b11 = bytes4(0x100000000);
-     bytes16 b12 = bytes16(0x1);
-     bytes32 b13 = bytes32(0x1);
-   }
-}
-// ----
-// TypeError 9640: (60-71): Explicit type conversion not allowed from "int_const 1" to "bytes1".
-// TypeError 9640: (90-103): Explicit type conversion not allowed from "int_const 256" to "bytes1".
-// TypeError 9640: (122-134): Explicit type conversion not allowed from "int_const 255" to "bytes2".
-// TypeError 9640: (153-166): Explicit type conversion not allowed from "int_const 256" to "bytes2".
-// TypeError 9640: (185-200): Explicit type conversion not allowed from "int_const 65536" to "bytes2".
-// TypeError 9640: (219-233): Explicit type conversion not allowed from "int_const 65535" to "bytes3".
-// TypeError 9640: (252-267): Explicit type conversion not allowed from "int_const 65536" to "bytes3".
-// TypeError 9640: (286-303): Explicit type conversion not allowed from "int_const 16777216" to "bytes3".
-// TypeError 9640: (322-338): Explicit type conversion not allowed from "int_const 16777215" to "bytes4".
-// TypeError 9640: (358-375): Explicit type conversion not allowed from "int_const 16777216" to "bytes4".
-// TypeError 9640: (395-414): Explicit type conversion not allowed from "int_const 4294967296" to "bytes4".
-// TypeError 9640: (435-447): Explicit type conversion not allowed from "int_const 1" to "bytes16".
-// TypeError 9640: (468-480): Explicit type conversion not allowed from "int_const 1" to "bytes32".
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol
deleted file mode 100644
index 6df3337f693d..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = 0x1;
-     bytes1 b2 = 0x100;
-     bytes2 b3 = 0xFF;
-     bytes2 b4 = 0x100;
-     bytes2 b5 = 0x10000;
-     bytes3 b6 = 0xFFFF;
-     bytes3 b7 = 0x10000;
-     bytes3 b8 = 0x1000000;
-     bytes4 b9 = 0xFFFFFF;
-     bytes4 b10 = 0x1000000;
-     bytes4 b11 = 0x100000000;
-     bytes16 b12 = 0x1;
-     bytes32 b13 = 0x1;
-   }
-}
-// ----
-// TypeError 9574: (48-63): Type int_const 1 is not implicitly convertible to expected type bytes1.
-// TypeError 9574: (70-87): Type int_const 256 is not implicitly convertible to expected type bytes1.
-// TypeError 9574: (94-110): Type int_const 255 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (117-134): Type int_const 256 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (141-160): Type int_const 65536 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (167-185): Type int_const 65535 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (192-211): Type int_const 65536 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (218-239): Type int_const 16777216 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (246-266): Type int_const 16777215 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (273-295): Type int_const 16777216 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (302-326): Type int_const 4294967296 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (333-350): Type int_const 1 is not implicitly convertible to expected type bytes16.
-// TypeError 9574: (357-374): Type int_const 1 is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_same_size_explicit.sol b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_same_size_explicit.sol
deleted file mode 100644
index 1a40ae322eff..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_same_size_explicit.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = bytes1(0x01);
-     bytes1 b2 = bytes1(0xFF);
-     bytes2 b3 = bytes2(0x0100);
-     bytes2 b4 = bytes2(0xFFFF);
-     bytes3 b5 = bytes3(0x010000);
-     bytes3 b6 = bytes3(0xFFFFFF);
-     bytes4 b7 = bytes4(0x01000000);
-     bytes4 b8 = bytes4(0xFFFFFFFF);
-     b1; b2; b3; b4; b5; b6; b7; b8;
-   }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_same_size_implicit.sol b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_same_size_implicit.sol
deleted file mode 100644
index edcf5b77aaba..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_same_size_implicit.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = 0x01;
-     bytes1 b2 = 0xFF;
-     bytes2 b3 = 0x0100;
-     bytes2 b4 = 0xFFFF;
-     bytes3 b5 = 0x010000;
-     bytes3 b6 = 0xFFFFFF;
-     bytes4 b7 = 0x01000000;
-     bytes4 b8 = 0xFFFFFFFF;
-     b1; b2; b3; b4; b5; b6; b7; b8;
-   }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol
deleted file mode 100644
index 18b628cb6297..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = bytes1(hex"");
-     bytes1 b2 = bytes1(hex"1234");
-     bytes2 b3 = bytes2(hex"12");
-     bytes2 b4 = bytes2(hex"1234");
-     bytes2 b5 = bytes2(hex"123456");
-     bytes3 b6 = bytes3(hex"1234");
-     bytes3 b7 = bytes3(hex"123456");
-     bytes3 b8 = bytes3(hex"12345678");
-     bytes4 b9 = bytes4(hex"123456");
-     bytes4 b10 = bytes4(hex"12345678");
-     bytes4 b11 = bytes4(hex"1234567890");
-   }
-}
-// ----
-// TypeError 9640: (92-109): Explicit type conversion not allowed from "literal_string hex"1234"" to "bytes1". Literal is larger than the type.
-// TypeError 9640: (198-217): Explicit type conversion not allowed from "literal_string hex"123456"" to "bytes2". Literal is larger than the type.
-// TypeError 9640: (310-331): Explicit type conversion not allowed from "literal_string hex"12345678"" to "bytes3". Literal is larger than the type.
-// TypeError 9640: (430-453): Explicit type conversion not allowed from "literal_string hex"1234567890"" to "bytes4". Literal is larger than the type.
diff --git a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_same_size_explicit.sol b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_same_size_explicit.sol
deleted file mode 100644
index 943fb3292d5d..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_same_size_explicit.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = bytes1(hex"01");
-     bytes1 b2 = bytes1(hex"FF");
-     bytes2 b3 = bytes2(hex"0100");
-     bytes2 b4 = bytes2(hex"FFFF");
-     bytes3 b5 = bytes3(hex"010000");
-     bytes3 b6 = bytes3(hex"FFFFFF");
-     bytes4 b7 = bytes4(hex"01000000");
-     bytes4 b8 = bytes4(hex"FFFFFFFF");
-     b1; b2; b3; b4; b5; b6; b7; b8;
-   }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_same_size_implicit.sol b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_same_size_implicit.sol
deleted file mode 100644
index 100d5e7ceeb3..000000000000
--- a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_same_size_implicit.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-   function f() public pure {
-     bytes1 b1 = hex"01";
-     bytes1 b2 = hex"FF";
-     bytes2 b3 = hex"0100";
-     bytes2 b4 = hex"FFFF";
-     bytes3 b5 = hex"010000";
-     bytes3 b6 = hex"FFFFFF";
-     bytes4 b7 = hex"01000000";
-     bytes4 b8 = hex"FFFFFFFF";
-     b1; b2; b3; b4; b5; b6; b7; b8;
-   }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/index_access_for_bytes.sol b/test/libsolidity/syntaxTests/types/index_access_for_bytes.sol
deleted file mode 100644
index 12fecb78cc76..000000000000
--- a/test/libsolidity/syntaxTests/types/index_access_for_bytes.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    bytes20 x;
-    function f(bytes16 b) public view {
-        b[uint8(x[2])];
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/integer_implicit_err.sol b/test/libsolidity/syntaxTests/types/integer_implicit_err.sol
deleted file mode 100644
index 5b99005c4685..000000000000
--- a/test/libsolidity/syntaxTests/types/integer_implicit_err.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-    function f() public pure {
-        uint16 a = 1;
-        int32 b = a;
-
-        uint256 c = 10;
-        int8 d = c;
-    }
-}
-// ----
-// TypeError 9574: (74-85): Type uint16 is not implicitly convertible to expected type int32.
-// TypeError 9574: (120-130): Type uint256 is not implicitly convertible to expected type int8.
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector.sol b/test/libsolidity/syntaxTests/types/library_function_selector.sol
deleted file mode 100644
index 581aa783ee84..000000000000
--- a/test/libsolidity/syntaxTests/types/library_function_selector.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    function f(uint256) external {}
-    function g(uint256[] storage) external {}
-    function h(uint256[] memory) public {}
-}
-contract C {
-    function f() public pure returns (bytes4 a, bytes4 b, bytes4 c, bytes4 d) {
-        a = L.f.selector;
-        b = L.g.selector;
-        c = L.h.selector;
-        d = L.h.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol b/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol
deleted file mode 100644
index 96ed0585472d..000000000000
--- a/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    function f(uint256) internal {}
-}
-contract C {
-    function f() public pure returns (bytes4) {
-        return L.f.selector;
-    }
-}
-// ----
-// TypeError 9582: (126-138): Member "selector" not found or not visible after argument-dependent lookup in function (uint256).
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol b/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol
deleted file mode 100644
index 36d43f0fa4c5..000000000000
--- a/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L {
-    function f(uint256) private {}
-    function g(uint256) public returns (uint256) {
-        return f.selector;
-    }
-}
-// ----
-// TypeError 9582: (113-123): Member "selector" not found or not visible after argument-dependent lookup in function (uint256).
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol b/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol
deleted file mode 100644
index 000cfec1593c..000000000000
--- a/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    function f(uint256) private {}
-}
-contract C {
-    function f() public pure returns (bytes4) {
-        return L.f.selector;
-    }
-}
-// ----
-// TypeError 9582: (125-128): Member "f" not found or not visible after argument-dependent lookup in type(library L).
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_view_pure.sol b/test/libsolidity/syntaxTests/types/library_function_selector_view_pure.sol
deleted file mode 100644
index 02ace71f0868..000000000000
--- a/test/libsolidity/syntaxTests/types/library_function_selector_view_pure.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    function f(uint256) external pure {}
-    function g(uint256) external view {}
-}
-contract C {
-    function f() public pure returns (bytes4, bytes4) {
-        return (L.f.selector, L.g.selector);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/library_internal_call.sol b/test/libsolidity/syntaxTests/types/library_internal_call.sol
deleted file mode 100644
index 44f69029c9cb..000000000000
--- a/test/libsolidity/syntaxTests/types/library_internal_call.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function a() public pure {}
-    function b() public pure { a(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/library_to_address.sol b/test/libsolidity/syntaxTests/types/library_to_address.sol
deleted file mode 100644
index 50ef844dab32..000000000000
--- a/test/libsolidity/syntaxTests/types/library_to_address.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library L {
-}
-contract C {
-    function f() public pure returns (address) {
-        return address(L);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/library_to_address_payable.sol b/test/libsolidity/syntaxTests/types/library_to_address_payable.sol
deleted file mode 100644
index 50950b27e14b..000000000000
--- a/test/libsolidity/syntaxTests/types/library_to_address_payable.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {
-}
-contract C {
-    function f() public pure returns (address payable) {
-        return address(L);
-    }
-}
-// ----
-// TypeError 6359: (99-109): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/magic_block.sol b/test/libsolidity/syntaxTests/types/magic_block.sol
deleted file mode 100644
index e3bf2ab5332f..000000000000
--- a/test/libsolidity/syntaxTests/types/magic_block.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() public view returns (address payable) {
-        return block.coinbase;
-    }
-    function g() public view returns (uint) {
-        return block.difficulty;
-    }
-    function h() public view returns (uint) {
-        return block.gaslimit;
-    }
-    function i() public view returns (uint) {
-        return block.timestamp;
-    }
-    function j() public view returns (uint) {
-        return block.chainid;
-    }
-}
-// ====
-// EVMVersion: <istanbul
-// ----
-// TypeError 3081: (420-433): "chainid" is not supported by the VM version.
diff --git a/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol b/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol
deleted file mode 100644
index b723d0aeeb2b..000000000000
--- a/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.basefee;
-    }
-}
-// ====
-// EVMVersion: <=berlin
-// ----
-// TypeError 5921: (74-87): "basefee" is not supported by the VM version.
diff --git a/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol b/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol
deleted file mode 100644
index 62ac0e1f7405..000000000000
--- a/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    function f() public view returns (address payable) {
-        return block.coinbase;
-    }
-    function g() public view returns (uint) {
-        return block.gaslimit;
-    }
-    function h() public view returns (uint) {
-        return block.timestamp;
-    }
-    function i() public view returns (uint) {
-        return block.chainid;
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
diff --git a/test/libsolidity/syntaxTests/types/magic_block_london.sol b/test/libsolidity/syntaxTests/types/magic_block_london.sol
deleted file mode 100644
index 0d65672ca984..000000000000
--- a/test/libsolidity/syntaxTests/types/magic_block_london.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.basefee;
-    }
-    function g() public view returns (uint ret) {
-        assembly {
-            ret := basefee()
-        }
-    }
-}
-// ====
-// EVMVersion: >=london
-// ----
diff --git a/test/libsolidity/syntaxTests/types/magic_block_paris.sol b/test/libsolidity/syntaxTests/types/magic_block_paris.sol
deleted file mode 100644
index 7875d9b0e56a..000000000000
--- a/test/libsolidity/syntaxTests/types/magic_block_paris.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return block.prevrandao;
-    }
-    function g() public view returns (uint ret) {
-        assembly {
-            ret := prevrandao()
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/abstract_contructor_param.sol b/test/libsolidity/syntaxTests/types/mapping/abstract_contructor_param.sol
deleted file mode 100644
index 4a16ed914761..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/abstract_contructor_param.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract contract A {
-    constructor (mapping (uint => uint) [] storage) { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol b/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol
deleted file mode 100644
index 5f2d4330d59b..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    mapping(uint => uint) m;
-    function f() public {
-        m[] = 3;
-    }
-}
-// ----
-// TypeError 1267: (76-79): Index expression cannot be omitted.
diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/argument_external.sol
deleted file mode 100644
index 4b391e72bdd9..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/argument_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(mapping(uint => uint) storage) external pure {
-    }
-}
-// ----
-// TypeError 6651: (28-57): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_internal.sol b/test/libsolidity/syntaxTests/types/mapping/argument_internal.sol
deleted file mode 100644
index 3c021515cc78..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/argument_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(mapping(uint => uint) storage) internal pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_private.sol b/test/libsolidity/syntaxTests/types/mapping/argument_private.sol
deleted file mode 100644
index 63733d711222..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/argument_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(mapping(uint => uint) storage) private pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/argument_public.sol
deleted file mode 100644
index ce7635e3112f..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/argument_public.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(mapping(uint => uint) storage) public pure {
-    }
-}
-// ----
-// TypeError 6651: (28-57): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol
deleted file mode 100644
index 91900619e4a3..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(mapping(uint => uint)[] storage) external pure {
-    }
-}
-// ----
-// TypeError 6651: (28-59): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_internal.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_internal.sol
deleted file mode 100644
index 352d09823f1b..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/array_argument_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(mapping(uint => uint)[] storage) internal pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_private.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_private.sol
deleted file mode 100644
index 332dbe6c0641..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/array_argument_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(mapping(uint => uint)[] storage) private pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol
deleted file mode 100644
index 4316457b0c53..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(mapping(uint => uint)[] storage) public pure {
-    }
-}
-// ----
-// TypeError 6651: (28-59): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_local.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_local.sol
deleted file mode 100644
index a329c91eea23..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_local.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test {
-    mapping(uint=>uint) map;
-    function fun() public view {
-        mapping(uint=>uint) storage a = map;
-        mapping(uint=>uint) storage b = map;
-        b = a;
-        (b) = a;
-        (b, b) = (a, a);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol
deleted file mode 100644
index 1d75c53b9992..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract D {
-    mapping (uint => uint) a;
-    mapping (uint => uint) b;
-    function foo() public view {
-        mapping (uint => uint) storage c = b;
-        b = c;
-    }
-}
-// ----
-// TypeError 9214: (160-161): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol
deleted file mode 100644
index fda9abf3dfa7..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-contract C {
-    mapping (uint => address payable [ ]) public a = a ;
-}
-
-contract D {
-    mapping (uint => uint) a;
-    mapping (uint => uint) b = a;
-}
-
-contract F {
-    mapping (uint => uint) a;
-    mapping (uint => uint) b;
-
-    function foo() public {
-        a = b;
-    }
-}
-
-contract G {
-    uint x = 1;
-    mapping (uint => uint) b = x;
-}
-
-contract H {
-    struct S {mapping (uint => uint) a;}
-
-	S x;
-	S y = x;
-	S z = z;
-}
-// ----
-// TypeError 6280: (17-67): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (120-148): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (263-264): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (312-340): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (407-414): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (417-424): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol
deleted file mode 100644
index bcf0c7e7be8e..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract test {
-    mapping(uint=>uint) map;
-    function fun() public {
-        mapping(uint=>uint) storage a = map;
-        map = a;
-        (map) = a;
-        (map, map) = (a, a);
-    }
-}
-// ----
-// TypeError 9214: (126-129): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (144-147): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (163-166): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (168-171): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol
deleted file mode 100644
index c1051f25a7fe..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract test {
-    struct str {
-        mapping(uint=>uint) map;
-    }
-    str data;
-    function fun() public {
-        mapping(uint=>uint) storage a = data.map;
-        data.map = a;
-        (data.map) = a;
-        (data.map, data.map) = (a, a);
-    }
-}
-// ----
-// TypeError 9214: (172-180): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (195-203): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (219-227): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (229-237): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_type_mismatch.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_type_mismatch.sol
deleted file mode 100644
index ec68c8e52077..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_type_mismatch.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract D {
-    mapping (uint => uint) a;
-    function foo() public view {
-        mapping (uint => int) storage c = a;
-    }
-}
-// ----
-// TypeError 9574: (84-119): Type mapping(uint256 => uint256) is not implicitly convertible to expected type mapping(uint256 => int256).
diff --git a/test/libsolidity/syntaxTests/types/mapping/constructor_parameter.sol b/test/libsolidity/syntaxTests/types/mapping/constructor_parameter.sol
deleted file mode 100644
index 4257adad3c19..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/constructor_parameter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract A {
-    constructor (mapping (uint => uint) [] storage) { }
-}
-// ----
-// TypeError 3644: (30-63): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/types/mapping/contract_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/contract_mapping.sol
deleted file mode 100644
index a8cfdab65b25..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/contract_mapping.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-interface I {}
-contract J {}
-contract C {
-    mapping(I => bool) i;
-    mapping(J => bool) j;
-    function f(I x, J y) public view returns (bool, bool) {
-        return (i[x], j[y]);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol b/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol
deleted file mode 100644
index 10e127f4ec5b..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {}
-contract J {}
-contract C {
-    mapping(I => bool) i;
-    mapping(J => bool) j;
-    function f(I x, J y, address z) public view returns (bool, bool, bool) {
-        return (i[y], j[x], i[z]);
-    }
-}
-// ----
-// TypeError 7407: (189-190): Type contract J is not implicitly convertible to expected type contract I.
-// TypeError 7407: (195-196): Type contract I is not implicitly convertible to expected type contract J.
-// TypeError 7407: (201-202): Type address is not implicitly convertible to expected type contract I.
diff --git a/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol
deleted file mode 100644
index 5e33008ba623..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-struct S { mapping(uint => uint)[2] a; }
-contract C {
-    function f(S storage s) public {}
-}
-// ----
-// TypeError 6651: (69-80): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/enum_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/enum_mapping.sol
deleted file mode 100644
index 75151e644287..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/enum_mapping.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-enum E { A, B, C }
-contract C {
-    mapping(E => bool) e;
-    function f(E v) public view returns (bool, bool) {
-        return (e[v], e[E.A]);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol b/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol
deleted file mode 100644
index 9b0815bf0dd1..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-enum E { A, B, C }
-contract C {
-    mapping(E => bool) e;
-    function f(uint256 a, uint8 b) public view returns (bool, bool) {
-        return (e[a], e[b]);
-    }
-}
-// ----
-// TypeError 7407: (146-147): Type uint256 is not implicitly convertible to expected type enum E.
-// TypeError 7407: (152-153): Type uint8 is not implicitly convertible to expected type enum E.
diff --git a/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol b/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol
deleted file mode 100644
index d836e7bf29fc..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-error E (mapping (uint => uint));
-// ----
-// TypeError 3448: (9-31): Type containing a (nested) mapping is not allowed as error parameter type.
diff --git a/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol b/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol
deleted file mode 100644
index c21d1b8e3166..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    event E (mapping (uint => uint) [2]);
-}
-// ----
-// TypeError 3448: (26-52): Type containing a (nested) mapping is not allowed as event parameter type.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol
deleted file mode 100644
index 9be0688d5684..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-    function f(mapping(uint => uint)[2] memory b) internal {
-    }
-}
-// ----
-// TypeError 4061: (31-64): Type mapping(uint256 => uint256)[2] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol
deleted file mode 100644
index 368aaaf0c48d..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(function(mapping(uint=>uint) storage) external) public pure {
-    }
-}
-// ----
-// TypeError 6651: (37-64): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_internal.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_internal.sol
deleted file mode 100644
index 32e5db7917f5..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(function(mapping(uint=>uint) storage) internal) internal pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol
deleted file mode 100644
index 7e00f15e73b4..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f(function() external returns (mapping(uint=>uint) storage)) public pure {
-    }
-}
-// ----
-// TypeError 6651: (57-84): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_return_internal.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_return_internal.sol
deleted file mode 100644
index 62392faa6747..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_return_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f(function() internal returns (mapping(uint=>uint) storage)) internal pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol
deleted file mode 100644
index c041271e186b..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-  function f(mapping(uint=>uint) memory) public {}
-}
-// ----
-// TypeError 4061: (25-51): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/library_argument_external.sol
deleted file mode 100644
index ebd05d86713b..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_argument_external.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint) storage) external pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_argument_internal.sol b/test/libsolidity/syntaxTests/types/mapping/library_argument_internal.sol
deleted file mode 100644
index 3ff072d1ccbc..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_argument_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint) storage) internal pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_argument_private.sol b/test/libsolidity/syntaxTests/types/mapping/library_argument_private.sol
deleted file mode 100644
index 56c3dbf9ec87..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_argument_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint) storage) private pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/library_argument_public.sol
deleted file mode 100644
index 36e833b707bd..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_argument_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint) storage) public pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_argument_storage.sol b/test/libsolidity/syntaxTests/types/mapping/library_argument_storage.sol
deleted file mode 100644
index 747f934d9731..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_argument_storage.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library Set {
-    struct Data { mapping(uint => bool) flags; }
-
-    function insert(Data storage self, uint value)
-        public
-        returns (bool)
-    {
-        if (self.flags[value])
-            return false; // already there
-        self.flags[value] = true;
-        return true;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/library_array_argument_external.sol
deleted file mode 100644
index ca875546e9b1..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_external.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint)[] storage) external pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_internal.sol b/test/libsolidity/syntaxTests/types/mapping/library_array_argument_internal.sol
deleted file mode 100644
index 416887d3f826..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint)[] storage) internal pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_private.sol b/test/libsolidity/syntaxTests/types/mapping/library_array_argument_private.sol
deleted file mode 100644
index 0118c370d80c..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint)[] storage) private pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/library_array_argument_public.sol
deleted file mode 100644
index 03ca40145aa1..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_array_argument_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    function f(mapping(uint => uint)[] storage) public pure {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol
deleted file mode 100644
index 1456565db8d8..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library L {}
-contract C
-{
-  mapping(bool => L) j;
-  mapping(L => bool) i;
-}
-// ----
-// TypeError 1130: (44-45): Invalid use of a library name.
-// TypeError 1130: (60-61): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
deleted file mode 100644
index 4b1d77baa3a0..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder               v2;
-library L {
-    struct S { mapping(uint => uint) m; }
-    function f(S memory a) external pure returns (S memory) {}
-}
-// ----
-// TypeError 4061: (103-113): Type struct L.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_nested_storage.sol b/test/libsolidity/syntaxTests/types/mapping/library_nested_storage.sol
deleted file mode 100644
index 11b09ce25ee8..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_nested_storage.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library Test {
-    struct Nested { mapping(uint => uint)[2][] a; uint y; }
-    struct X { Nested n; }
-    function f(X storage x) external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/library_return_external.sol
deleted file mode 100644
index 6c145801c1e2..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_return_external.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L
-{
-    function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) external pure returns(mapping(uint => uint) storage) {
-        return c ? a : b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_return_internal.sol b/test/libsolidity/syntaxTests/types/mapping/library_return_internal.sol
deleted file mode 100644
index afbe2826902a..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_return_internal.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L
-{
-    function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) internal pure returns(mapping(uint => uint) storage) {
-        return c ? a : b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_return_private.sol b/test/libsolidity/syntaxTests/types/mapping/library_return_private.sol
deleted file mode 100644
index d068629487ab..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_return_private.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L
-{
-    function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) private pure returns(mapping(uint => uint) storage) {
-        return c ? a : b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/library_return_public.sol
deleted file mode 100644
index a98458cd7765..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_return_public.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library L
-{
-    function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) public pure returns(mapping(uint => uint) storage) {
-        return c ? a : b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_storage_parameter_with_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_storage_parameter_with_mapping.sol
deleted file mode 100644
index 915aa24f44e3..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_storage_parameter_with_mapping.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-struct S { mapping(uint => uint)[2] a; }
-library L {
-    function f(S storage s) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_storage_parameter_with_nested_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_storage_parameter_with_nested_mapping.sol
deleted file mode 100644
index 6da58fccbd8d..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/library_storage_parameter_with_nested_mapping.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-library Test {
-    struct Nested { mapping(uint => uint)[2][] a; }
-    struct X { Nested n; }
-    function f(X storage x) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
deleted file mode 100644
index f959394d1fe4..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function f1(mapping(uint => uint)[] calldata) pure external {}
-}
-// ----
-// TypeError 4103: (29-61): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol
deleted file mode 100644
index 976dacee908d..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() external pure returns (mapping(uint=>uint)[] storage m) {
-    }
-}
-// ----
-// TypeError 6651: (53-84): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_internal.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_internal.sol
deleted file mode 100644
index 8837c745b29f..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_internal.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    mapping(uint=>uint)[] m;
-    function f() internal view returns (mapping(uint=>uint)[] storage) {
-        return m;
-    }
-    function g() private view returns (mapping(uint=>uint)[] storage) {
-        return m;
-    }
-    function h() internal view returns (mapping(uint=>uint)[] storage r) {
-        r = m;
-    }
-    function i() private view returns (mapping(uint=>uint)[] storage r) {
-        (r,r) = (m,m);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol
deleted file mode 100644
index c6e94c542479..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns (mapping(uint=>uint)[] storage m) {
-    }
-}
-// ----
-// TypeError 6651: (51-82): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol
deleted file mode 100644
index 86f971d38f37..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    mapping(uint => uint) y;
-    function f() view public {
-        mapping(uint => uint) calldata x = y;
-        x;
-    }
-}
-// ----
-// TypeError 4061: (81-113): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol
deleted file mode 100644
index 6874deb88946..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    mapping(uint => uint) y;
-    function f() view public {
-        mapping(uint => uint) x = y;
-        x;
-    }
-}
-// ----
-// TypeError 6651: (81-104): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
deleted file mode 100644
index 1281e4b5145b..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function f1(mapping(uint => uint) calldata) pure external returns (mapping(uint => uint) memory) {}
-}
-// ----
-// TypeError 4103: (29-59): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol
deleted file mode 100644
index 95ca53279be2..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract c {
-    function f4(mapping(uint => uint) storage) pure internal {}
-    function f5(mapping(uint => uint) memory) pure internal {}
-}
-// ----
-// TypeError 4061: (93-121): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
deleted file mode 100644
index 667c0b1013ac..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    function f3(mapping(uint => uint) memory) view public {}
-}
-// ----
-// TypeError 4103: (29-57): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol
deleted file mode 100644
index f31c79315757..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    mapping(uint => uint) y;
-    function f() view public {
-        mapping(uint => uint) memory x = y;
-        x;
-    }
-}
-// ----
-// TypeError 4061: (81-111): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_dynamic_key.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_dynamic_key.sol
deleted file mode 100644
index 049b3583d8b4..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_dynamic_key.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-	mapping(string => uint) data;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_dynamic_key_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_dynamic_key_public.sol
deleted file mode 100644
index a70d19aebb2a..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_dynamic_key_public.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-	mapping(string => uint) public data;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
deleted file mode 100644
index 8b780ea8d45d..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma abicoder               v2;
-
-contract test {
-    struct S {
-        mapping (uint => uint) s;
-    }
-    function f(S calldata b) external {
-    }
-}
-// ----
-// TypeError 4103: (121-133): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol
deleted file mode 100644
index e09e52ae3890..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() external pure returns (mapping(uint=>uint) storage m) {
-    }
-}
-// ----
-// TypeError 6651: (53-82): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_internal.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_internal.sol
deleted file mode 100644
index 4912836efc22..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_internal.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    mapping(uint=>uint) m;
-    function f() internal view returns (mapping(uint=>uint) storage) {
-        return m;
-    }
-    function g() private view returns (mapping(uint=>uint) storage) {
-        return m;
-    }
-    function h() internal view returns (mapping(uint=>uint) storage r) {
-        r = m;
-    }
-    function i() private view returns (mapping(uint=>uint) storage r) {
-        (r,r) = (m,m);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol
deleted file mode 100644
index df3f1c993a36..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns (mapping(uint=>uint) storage m) {
-    }
-}
-// ----
-// TypeError 6651: (51-80): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
deleted file mode 100644
index 6594401c6e5e..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns (mapping(uint=>uint) memory m) {
-    }
-}
-// ----
-// TypeError 4103: (51-79): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
deleted file mode 100644
index 399f7c6ae4a6..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { mapping(uint => uint) a; }
-    function f(S memory) public {}
-}
-// ----
-// TypeError 4103: (104-112): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
deleted file mode 100644
index 49cf31487362..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma abicoder               v2;
-contract C {
-    struct S { mapping(uint => uint) a; }
-    struct T { S s; }
-    struct U { T t; }
-    function f(U memory) public {}
-}
-// ----
-// TypeError 4103: (148-156): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol b/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
deleted file mode 100644
index 4da809bd5e61..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract Test {
-	struct S {
-		T[] t;
-	}
-
-	struct T {
-		U[] u;
-	}
-
-	struct U {
-		S[] s;
-		mapping (uint => S) map;
-	}
-
-	function f() public {
-		S memory s;
-	}
-}
-// ----
-// TypeError 4061: (143-153): Type struct Test.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol b/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
deleted file mode 100644
index 6d6dd65e4aed..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract Test {
-    struct S {
-        uint8 a;
-        mapping(uint256 => uint256) b;
-        uint8 c;
-    }
-    S s;
-
-    function f() public returns (uint256) {
-        S memory x;
-    }
-}
-
-// ----
-// TypeError 4061: (172-182): Type struct Test.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol b/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol
deleted file mode 100644
index 51b3c0388423..000000000000
--- a/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-type T is uint;
-library L {
-  function f(mapping(T=>T) memory) public {}
-}
-// ----
-// TypeError 4061: (41-61): Type mapping(T => T) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol b/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol
deleted file mode 100644
index 18e086a2e1d0..000000000000
--- a/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-	function f() public pure {
-		uint a;
-		(a,) = (uint(1),);
-	}
-}
-// ----
-// TypeError 8381: (60-70): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/rational_negative_numerator_negative_exp.sol b/test/libsolidity/syntaxTests/types/rational_negative_numerator_negative_exp.sol
deleted file mode 100644
index 430e618e7d22..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_negative_numerator_negative_exp.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() public pure returns (int) {
-        return (-1 / 2) ** -1;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol
deleted file mode 100644
index f41eb8b7a032..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract c {
-    uint[2**253] data;
-}
-// ----
-// Warning 7325: (17-29): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
deleted file mode 100644
index 801773db29c9..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract c {
-    function f() public pure {
-        int a;
-        a = 1 << 4095; // shift is fine, but result too large
-        a = 1 << 4096; // too large
-        a = (1E1233) << 2; // too large
-    }
-}
-// ----
-// TypeError 7407: (71-80): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (133-142): Built-in binary operator << cannot be applied to types int_const 1 and int_const 4096.
-// TypeError 2271: (169-182): Built-in binary operator << cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
-// TypeError 7407: (169-182): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
deleted file mode 100644
index ae42d5e5e41d..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    function f() public pure {
-        int a;
-        a = 1/(2<<4094)/(2<<4094);
-    }
-}
-// ----
-// TypeError 2271: (71-92): Built-in binary operator / cannot be applied to types rational_const 1 / 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
-// TypeError 2326: (71-92): Type rational_const 1 / 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Try converting to type ufixed8x80 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
deleted file mode 100644
index fb029202f76d..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-contract c {
-    function f() public pure {
-        int a;
-        a = (((((4 ** 4) ** 2) ** 4) ** 4) ** 4) ** 4;
-        a = -(((4 ** 4 ** 2 ** 4 ** 4) ** 4) ** 4) ** 4;
-        a = 4 ** (-(2 ** 4 ** 4 ** 4 ** 4 ** 4));
-        a = 2 ** 1E1233;
-        a = -2 ** 1E1233;
-        a = 2 ** -1E1233;
-        a = -2 ** -1E1233;
-        a = 1E1233 ** 2;
-        a = -1E1233 ** 2;
-        a = 1E1233 ** -2;
-        a = -1E1233 ** -2;
-        a = 1E1233 ** 1E1233;
-        a = 1E1233 ** -1E1233;
-        a = -1E1233 ** 1E1233;
-        a = -1E1233 ** -1E1233;
-    }
-}
-// ----
-// TypeError 2271: (71-112): Built-in binary operator ** cannot be applied to types int_const 1797...(301 digits omitted)...7216 and int_const 4.
-// TypeError 7407: (71-112): Type int_const 1797...(301 digits omitted)...7216 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (135-151): Built-in binary operator ** cannot be applied to types int_const 4 and int_const 1157...(70 digits omitted)...9936.
-// TypeError 7407: (126-169): Type int_const 1340...(147 digits omitted)...4096 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (201-217): Built-in binary operator ** cannot be applied to types int_const 4 and int_const 1340...(147 digits omitted)...4096.
-// TypeError 2271: (183-219): Built-in binary operator ** cannot be applied to types int_const 4 and int_const -115...(71 digits omitted)...9936.
-// TypeError 2271: (233-244): Built-in binary operator ** cannot be applied to types int_const 2 and int_const 1000...(1226 digits omitted)...0000.
-// TypeError 2271: (258-270): Built-in binary operator ** cannot be applied to types int_const -2 and int_const 1000...(1226 digits omitted)...0000.
-// TypeError 2271: (284-296): Built-in binary operator ** cannot be applied to types int_const 2 and int_const -100...(1227 digits omitted)...0000.
-// TypeError 2271: (310-323): Built-in binary operator ** cannot be applied to types int_const -2 and int_const -100...(1227 digits omitted)...0000.
-// TypeError 2271: (337-348): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
-// TypeError 7407: (337-348): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (362-374): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const 2.
-// TypeError 7407: (362-374): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (388-400): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const -2.
-// TypeError 7407: (388-400): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (414-427): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const -2.
-// TypeError 7407: (414-427): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (441-457): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
-// TypeError 7407: (441-457): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (471-488): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
-// TypeError 7407: (471-488): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (502-519): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
-// TypeError 7407: (502-519): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (533-551): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
-// TypeError 7407: (533-551): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fine.sol b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fine.sol
deleted file mode 100644
index 67cd6da854d6..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fine.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract c {
-    function f() public pure {
-        int a;
-        a = 0 ** 1E1233;
-        a = 1 ** 1E1233;
-        a = -1 ** 1E1233;
-        a = 0E123456789;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/rational_number_huge.sol b/test/libsolidity/syntaxTests/types/rational_number_huge.sol
deleted file mode 100644
index 378de20129c6..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_huge.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f(uint y) public pure {
-        // fits FixedBytes with exactly 32-bytes
-        y = 0xffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000; // FixedBytes (32)
-
-        // fits exactly into FixedBytes (32), ensures underscored literals won't hurt
-        y = 0xffffffff00000000ffffffff00000000ffffffff00000000ffffffff_00000000;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/rational_number_huge_fail.sol b/test/libsolidity/syntaxTests/types/rational_number_huge_fail.sol
deleted file mode 100644
index cec814ef3677..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_huge_fail.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f(uint y) public pure {
-        // one byte too long for storing in Fixedbytes (would require 33 bytes)
-        y = 0xffffffff00000000ffffffff00000000ffffffff00000000ffffffff000000001;
-    }
-}
-// ----
-// TypeError 7407: (142-209): Type int_const 1852...(71 digits omitted)...7281 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol b/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol
deleted file mode 100644
index 7ef2ff829f68..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    function bignum() public {
-        uint256 a;
-        a = 1e1233 / 1e1233; // 1e1233 is still fine
-        a = 1e1234; // 1e1234 is too big
-    }
-}
-// ----
-// TypeError 2826: (128-134): Invalid literal value.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_2.sol b/test/libsolidity/syntaxTests/types/rational_number_literal_limit_2.sol
deleted file mode 100644
index ece44f322cd4..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    function bignum() public {
-        uint a;
-        a = 134562324532464234452335168163516E1200 / 134562324532464234452335168163516E1200; // still fine
-        a = 1345623245324642344523351681635168E1200; // too large
-    }
-}
-// ----
-// TypeError 2826: (179-218): Invalid literal value.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_3.sol b/test/libsolidity/syntaxTests/types/rational_number_literal_limit_3.sol
deleted file mode 100644
index 29514d528316..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    function bignum() public {
-        uint a;
-        a = 134562324532464.234452335168163517E1200 / 134562324532464.234452335168163517E1200; // still fine
-        a = 134562324532464.2344523351681635177E1200; // too large
-    }
-}
-// ----
-// TypeError 2826: (181-221): Invalid literal value.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol b/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol
deleted file mode 100644
index 5bceec60955d..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract C {
-    function literalToUFixed() public pure {
-        ufixed8x2 a = 0.10;
-        ufixed8x2 b = 0.00;
-        ufixed8x2 c = 2.55;
-        a; b; c;
-    }
-    function literalToFixed() public pure {
-        fixed8x1 a =   0.1;
-        fixed8x1 b =  12.7;
-        fixed8x1 c = -12.8;
-        a; b; c;
-    }
-}
-// ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
deleted file mode 100644
index c23569c95fca..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    function f() public pure {
-        int a;
-        a = (1<<4095)*(1<<4095);
-    }
-}
-// ----
-// TypeError 2271: (71-90): Built-in binary operator * cannot be applied to types int_const 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
-// TypeError 7407: (71-90): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol b/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol
deleted file mode 100644
index 94429034751a..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract c {
-    function f() public pure {
-        uint a = -1;
-        uint b = uint(-1);
-    }
-}
-// ----
-// TypeError 9574: (52-63): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
-// TypeError 9640: (82-90): Explicit type conversion not allowed from "int_const -1" to "uint256".
diff --git a/test/libsolidity/syntaxTests/types/rational_number_too_large.sol b/test/libsolidity/syntaxTests/types/rational_number_too_large.sol
deleted file mode 100644
index b3c065f1e68b..000000000000
--- a/test/libsolidity/syntaxTests/types/rational_number_too_large.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        uint8 a = 256;
-        uint8 b = uint8(256);
-        int8 c = int8(-129);
-    }
-}
-// ----
-// TypeError 9574: (52-65): Type int_const 256 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
-// TypeError 9640: (85-95): Explicit type conversion not allowed from "int_const 256" to "uint8".
-// TypeError 9640: (114-124): Explicit type conversion not allowed from "int_const -129" to "int8".
diff --git a/test/libsolidity/syntaxTests/types/strict_explicit.sol b/test/libsolidity/syntaxTests/types/strict_explicit.sol
deleted file mode 100644
index 8bfebb13d50f..000000000000
--- a/test/libsolidity/syntaxTests/types/strict_explicit.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract B{}
-contract C
-{
-    function f() public pure {
-
-        uint16 a = uint16(uint8(int8(-1)));
-        a;
-
-        int8 b = -1;
-        b;
-        uint16 c = uint16(uint8(b));
-        c;
-
-        int8 d = int8(int16(uint16(type(uint16).max)));
-        d;
-
-        uint16 e = type(uint16).max;
-        e;
-        int8 g = int8(uint8(e));
-        g;
-
-        address h = address(uint160(uint(type(uint).max)));
-        h;
-
-        uint i = uint(uint160(address(0)));
-        i;
-
-        uint j = type(uint).max;
-        j;
-        address k = address(uint160(j));
-        k;
-
-        int80 l = int80(uint80(bytes10("h")));
-        l;
-        bytes10 m = bytes10(uint80(int80(-1)));
-        m;
-
-        B n = B(address(uint160(uint(int(100)))));
-        n;
-
-        uint8 o = 1;
-        int16 p = int16(o);
-    }
-}
-// ----
-// TypeError 9640: (801-809): Explicit type conversion not allowed from "uint8" to "int16".
diff --git a/test/libsolidity/syntaxTests/types/strict_explicit_err.sol b/test/libsolidity/syntaxTests/types/strict_explicit_err.sol
deleted file mode 100644
index 2f0c9a080e02..000000000000
--- a/test/libsolidity/syntaxTests/types/strict_explicit_err.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-contract B{}
-
-enum E { Zero }
-
-contract C
-{
-    function f() public pure {
-
-        uint16 a = uint16(int8(-1));
-
-        int8 b = -1;
-        uint16 c = uint16(b);
-
-        int8 d = int8(uint16(type(uint16).max));
-
-        uint16 e = type(uint16).max;
-        int8 g = int8(e);
-
-        address h = address(uint(type(uint).max));
-
-        uint i = uint(address(0));
-
-        uint j = type(uint).max;
-        address k = address(j);
-
-        int80 l = int80(bytes10("h"));
-        bytes10 m = bytes10(int80(-1));
-
-        B n = B(int(100));
-        int o = int(new B());
-
-        B p = B(0x00);
-
-        int q = int(E(0));
-        int r = int(E.Zero);
-    }
-}
-// ----
-// TypeError 9640: (95-111): Explicit type conversion not allowed from "int8" to "uint16".
-// TypeError 9640: (154-163): Explicit type conversion not allowed from "int8" to "uint16".
-// TypeError 9640: (183-213): Explicit type conversion not allowed from "uint16" to "int8".
-// TypeError 9640: (270-277): Explicit type conversion not allowed from "uint16" to "int8".
-// TypeError 9640: (300-329): Explicit type conversion not allowed from "uint256" to "address".
-// TypeError 9640: (349-365): Explicit type conversion not allowed from "address" to "uint256".
-// TypeError 9640: (421-431): Explicit type conversion not allowed from "uint256" to "address".
-// TypeError 9640: (452-471): Explicit type conversion not allowed from "bytes10" to "int80".
-// TypeError 9640: (493-511): Explicit type conversion not allowed from "int80" to "bytes10".
-// TypeError 9640: (528-539): Explicit type conversion not allowed from "int256" to "contract B".
-// TypeError 9640: (557-569): Explicit type conversion not allowed from "contract B" to "int256".
-// TypeError 9640: (586-593): Explicit type conversion not allowed from "int_const 0" to "contract B".
-// TypeError 9640: (612-621): Explicit type conversion not allowed from "enum E" to "int256".
-// TypeError 9640: (639-650): Explicit type conversion not allowed from "enum E" to "int256".
diff --git a/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol b/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol
deleted file mode 100644
index be4e1dde0298..000000000000
--- a/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// Used to segfault.
-contract C {
-	struct S {
-		mapping(S => uint) a;
-	}
-	function g (S calldata) external view {}
- }
-// ----
-// TypeError 7804: (56-57): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
diff --git a/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol b/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol
deleted file mode 100644
index fa0ceac110f5..000000000000
--- a/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-  fixed8x80 a = -1e-100;
-}
-// ----
-// TypeError 4426: (29-36): Type rational_const -1 / 1000...(93 digits omitted)...0000 is not implicitly convertible to expected type fixed8x80, but it can be explicitly converted.
diff --git a/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol b/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol
deleted file mode 100644
index b9709b9aed21..000000000000
--- a/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns(bytes1) {
-        return bytes1(uint256(0));
-    }
-}
-// ----
-// TypeError 9640: (75-93): Explicit type conversion not allowed from "uint256" to "bytes1".
diff --git a/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol b/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol
deleted file mode 100644
index 6b6550b9fc10..000000000000
--- a/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure returns(bytes32) {
-        return bytes32(uint32(0));
-    }
-}
-// ----
-// TypeError 9640: (76-94): Explicit type conversion not allowed from "uint32" to "bytes32".
diff --git a/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol b/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol
deleted file mode 100644
index 00301cde0aa2..000000000000
--- a/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() internal pure {}
-    function g() internal pure returns (uint) { return 1; }
-    function h() internal pure returns (uint, uint) { return (1, 2); }
-
-    function test() internal pure {
-        () = f();
-        () = g();
-        (,) = h();
-    }
-}
-
-// ----
-// ParserError 6933: (224-225): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol b/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol
deleted file mode 100644
index 314d2bb73ce5..000000000000
--- a/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract n
-{
-	fallback() external
-	{
-		// Used to cause a segfault
-		(uint x, ) = (1);
-		(uint z) = ();
-
-		assembly {
-			mstore(x, z)
-		}
-	}
-}
-// ----
-// TypeError 7364: (69-85): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (89-102): Different number of components on the left hand side (1) than on the right hand side (0).
diff --git a/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol b/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol
deleted file mode 100644
index 7f55029c2157..000000000000
--- a/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        var a;
-        a.NeverReachedByParser();
-    }
-}
-// ----
-// ParserError 6933: (52-55): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol b/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol
deleted file mode 100644
index dad288d79f15..000000000000
--- a/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        var (b, c);
-        b.WeMustNotReachHere();
-        c.FailsToLookupToo();
-    }
-}
-// ----
-// ParserError 6933: (52-55): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol b/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol
deleted file mode 100644
index caf1787616aa..000000000000
--- a/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    function f() public pure {
-        var (d, e,);
-    }
-}
-// ----
-// ParserError 6933: (52-55): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_type_invalid_rational.sol b/test/libsolidity/syntaxTests/types/var_type_invalid_rational.sol
deleted file mode 100644
index c56e50b62eb9..000000000000
--- a/test/libsolidity/syntaxTests/types/var_type_invalid_rational.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() internal pure {
-        uint i = 31415999999999999999999999999999999999999999999999999999999999999999933**3;
-        uint unreachable = 123;
-    }
-}
-// ----
-// TypeError 9574: (54-137): Type int_const 3100...(204 digits omitted)...9237 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
diff --git a/test/libsolidity/syntaxTests/types/weird_sized_types.sol b/test/libsolidity/syntaxTests/types/weird_sized_types.sol
deleted file mode 100644
index 563778d7ea0e..000000000000
--- a/test/libsolidity/syntaxTests/types/weird_sized_types.sol
+++ /dev/null
@@ -1,42 +0,0 @@
-contract C {
-    uint bytes01 = 0;
-    uint bytes000000001 = 0;
-    uint bytes000099000 = 0;
-    uint bytes0a = 0;
-
-    uint int0 = 0;
-    uint int01 = 0;
-    uint int000000001 = 0;
-    uint int000099000 = 0;
-    uint int0a = 0;
-
-    uint uint0 = 0;
-    uint uint01 = 0;
-    uint uint000000001 = 0;
-    uint uint000099000 = 0;
-    uint uint0a = 0;
-
-    uint fixed0x0 = 0;
-    uint fixed01x1 = 0;
-    uint fixed1x01 = 0;
-    uint fixed000000001x1 = 0;
-    uint fixed1x000000001 = 0;
-    uint fixed000099000x1 = 0;
-    uint fixed1x000099000 = 0;
-    uint fixed0ax1 = 0;
-    uint fixed1x0a = 0;
-
-    uint ufixed0x0 = 0;
-    uint ufixed01x1 = 0;
-    uint ufixed1x01 = 0;
-    uint ufixed000000001x1 = 0;
-    uint ufixed1x000000001 = 0;
-    uint ufixed000099000x1 = 0;
-    uint ufixed1x000099000 = 0;
-    uint ufixed0ax1 = 0;
-    uint ufixed1x0a = 0;
-
-    // overflow check
-    uint uint300 = 0;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/zero_literal_to_bytesNN_explicit.sol b/test/libsolidity/syntaxTests/types/zero_literal_to_bytesNN_explicit.sol
deleted file mode 100644
index 0cf03f1ea59b..000000000000
--- a/test/libsolidity/syntaxTests/types/zero_literal_to_bytesNN_explicit.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    function f() public pure {
-      bytes1 b1 = bytes1(0);
-      bytes2 b2 = bytes2(0);
-      bytes3 b3 = bytes3(0);
-      bytes4 b4 = bytes4(0);
-      bytes8 b8 = bytes8(0);
-      bytes16 b16 = bytes16(0);
-      bytes32 b32 = bytes32(0);
-      b1; b2; b3; b4; b8; b16; b32;
-    }
-    function g() public pure {
-      bytes1 b1 = bytes1(0x000);
-      bytes2 b2 = bytes2(0x00000);
-      bytes3 b3 = bytes3(0x0000000);
-      bytes4 b4 = bytes4(0x000000000);
-      bytes8 b8 = bytes8(0x00000000000000000);
-      b1; b2; b3; b4; b8;
-    }
-    function h() public pure {
-      bytes1 b1 = bytes1(0x0);
-      bytes2 b2 = bytes2(0x0);
-      bytes3 b3 = bytes3(0x0);
-      bytes4 b4 = bytes4(0x0);
-      bytes8 b8 = bytes8(0x0);
-      bytes16 b16 = bytes16(0x0);
-      bytes32 b32 = bytes32(0x0);
-      b1; b2; b3; b4; b8; b16; b32;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/types/zero_literal_to_bytesNN_implicit.sol b/test/libsolidity/syntaxTests/types/zero_literal_to_bytesNN_implicit.sol
deleted file mode 100644
index 9ff972fb9488..000000000000
--- a/test/libsolidity/syntaxTests/types/zero_literal_to_bytesNN_implicit.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    function f() public pure {
-      bytes1 b1 = 0;
-      bytes2 b2 = 0;
-      bytes3 b3 = 0;
-      bytes4 b4 = 0;
-      bytes8 b8 = 0;
-      bytes16 b16 = 0;
-      bytes32 b32 = 0;
-      b1; b2; b3; b4; b8; b16; b32;
-    }
-    function g() public pure {
-      bytes1 b1 = 0x000;
-      bytes2 b2 = 0x00000;
-      bytes3 b3 = 0x0000000;
-      bytes4 b4 = 0x000000000;
-      bytes8 b8 = 0x00000000000000000;
-      b1; b2; b3; b4; b8;
-    }
-    function h() public pure {
-      bytes1 b1 = 0x0;
-      bytes2 b2 = 0x0;
-      bytes3 b3 = 0x0;
-      bytes4 b4 = 0x0;
-      bytes8 b8 = 0x0;
-      bytes16 b16 = 0x0;
-      bytes32 b32 = 0x0;
-      b1; b2; b3; b4; b8; b16; b32;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol
deleted file mode 100644
index a5b4ecbdcc1c..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        for (unchecked { uint x = 2 }; x < 2; x ++) {
-
-        }
-    }
-}
-// ----
-// ParserError 6933: (57-66): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol
deleted file mode 100644
index ef45a8e2b831..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-function f() pure returns (uint) unchecked {}
-// ----
-// ParserError 5296: (33-42): "unchecked" blocks can only be used inside regular blocks.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol
deleted file mode 100644
index 2d424236929a..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    modifier m() { unchecked { _; } }
-}
-// ----
-// SyntaxError 2573: (44-45): The placeholder statement "_" cannot be used inside an "unchecked" block.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_nested.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_nested.sol
deleted file mode 100644
index 6c64ce52205e..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_nested.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        unchecked {
-            unchecked {
-                uint x = 2 + 3;
-            }
-        }
-    }
-}
-// ----
-// SyntaxError 1941: (76-133): "unchecked" blocks cannot be nested.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol
deleted file mode 100644
index 2b77920dce9b..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        for (uint x = 2; x < 2; unchecked { x ++; }) {
-
-        }
-    }
-}
-// ----
-// ParserError 6933: (76-85): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol
deleted file mode 100644
index b49112f5eac1..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint x = unchecked { f() + 2 }
-    function f() public pure returns (uint) {
-        return 4;
-    }
-}
-// ----
-// ParserError 6933: (26-35): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol
deleted file mode 100644
index 4b7c6f2abc9c..000000000000
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public pure {
-        while (true) unchecked {
-
-        }
-    }
-}
-// ----
-// ParserError 5296: (65-74): "unchecked" blocks can only be used inside regular blocks.
diff --git a/test/libsolidity/syntaxTests/underscore/as_function.sol b/test/libsolidity/syntaxTests/underscore/as_function.sol
deleted file mode 100644
index e8bfdae4dc5d..000000000000
--- a/test/libsolidity/syntaxTests/underscore/as_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function _() public pure {
-    }
-
-    function g() public pure {
-        _();
-    }
-
-    function h() public pure {
-        _;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/underscore/in_function.sol b/test/libsolidity/syntaxTests/underscore/in_function.sol
deleted file mode 100644
index 5b41e889ace9..000000000000
--- a/test/libsolidity/syntaxTests/underscore/in_function.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    function f() public pure returns (uint) {
-        uint _;
-        return _;
-    }
-
-    function g() public pure returns (uint) {
-        uint _ = 1;
-        return _;
-    }
-
-    function h() public pure {
-        _;
-    }
-}
-// ----
-// DeclarationError 3726: (67-73): The name "_" is reserved.
-// DeclarationError 3726: (154-160): The name "_" is reserved.
-// DeclarationError 7576: (230-231): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/underscore/in_modifier.sol b/test/libsolidity/syntaxTests/underscore/in_modifier.sol
deleted file mode 100644
index 5e330d010f32..000000000000
--- a/test/libsolidity/syntaxTests/underscore/in_modifier.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C {
-    modifier m() {
-        _;
-    }
-
-    modifier n() {
-        string memory _ = "";
-        _;
-        revert(_);
-    }
-
-    function f() m() public {
-    }
-
-    function g() n() public {
-    }
-}
-// ----
-// DeclarationError 3726: (77-92): The name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/unexpected.sol b/test/libsolidity/syntaxTests/unexpected.sol
deleted file mode 100644
index c6fae414c387..000000000000
--- a/test/libsolidity/syntaxTests/unexpected.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-unexpected
-// ----
-// ParserError 7858: (0-10): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/unimplemented_super_function.sol b/test/libsolidity/syntaxTests/unimplemented_super_function.sol
deleted file mode 100644
index 22b98df0214f..000000000000
--- a/test/libsolidity/syntaxTests/unimplemented_super_function.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract contract a {
-    function f() virtual public;
-}
-contract b is a {
-    function f() public override { super.f(); }
-}
-// ----
-// TypeError 9582: (110-117): Member "f" not found or not visible after argument-dependent lookup in type(contract super b).
diff --git a/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol b/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol
deleted file mode 100644
index 6a683b4612d8..000000000000
--- a/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract contract a {
-    function f() virtual public;
-}
-contract b is a {
-    function f() public virtual override { super.f(); }
-}
-contract c is a,b {
-    // No error here.
-    function f() public override(a, b) { super.f(); }
-}
-// ----
-// TypeError 9582: (118-125): Member "f" not found or not visible after argument-dependent lookup in type(contract super b).
diff --git a/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot.sol b/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot.sol
deleted file mode 100644
index 1dbd11c145b8..000000000000
--- a/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    function f() pure public { 1.
-// ----
-// ParserError 2314: (47-47): Expected identifier but got end of source
diff --git a/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol b/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol
deleted file mode 100644
index 12c20b150680..000000000000
--- a/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() pure public { 1.x; }
-}
-// ----
-// TypeError 9582: (47-50): Member "x" not found or not visible after argument-dependent lookup in int_const 1.
diff --git a/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot.sol b/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot.sol
deleted file mode 100644
index 22404b7e8a6b..000000000000
--- a/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract c {
-    function f() pure public { 0.
-// ----
-// ParserError 2314: (47-47): Expected identifier but got end of source
diff --git a/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol b/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol
deleted file mode 100644
index de53fcc5d20b..000000000000
--- a/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-    function f() pure public { 0.x; }
-}
-// ----
-// TypeError 9582: (47-50): Member "x" not found or not visible after argument-dependent lookup in int_const 0.
diff --git a/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol b/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol
deleted file mode 100644
index 0376c3e13e31..000000000000
--- a/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract test {
-    function f() public returns (uint b) {
-        try this.f() returns (uint a) {
-
-        } catch Error(string memory message) {
-
-        } catch (bytes memory error) {
-
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Warning 5667: (49-55): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (89-95): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (122-143): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (165-183): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/syntaxTests/upper_case_hex_literals.sol b/test/libsolidity/syntaxTests/upper_case_hex_literals.sol
deleted file mode 100644
index 0842c2ec17ec..000000000000
--- a/test/libsolidity/syntaxTests/upper_case_hex_literals.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract test {
-
-    function f() public pure returns (uint256) {
-        uint256 a = 0x1234aAbcC;
-        uint256 b = 0x1234ABCDEF;
-        return a + b;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol b/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol
deleted file mode 100644
index e1d453007ae8..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-type MyAddress is address;
-type MyAddressPayable is address payable;
-type MyInt is int;
-type MyUInt is uint;
-type MyInt128 is int128;
-type MyUInt128 is uint128;
-type MyFixed is fixed;
-type MyUfixed is ufixed;
-type MyFixedBytes32 is bytes32;
-type MyFixedBytes1 is bytes1;
-type MyBool is bool;
-/// test to see if having NatSpec causes issues
-type redundantNatSpec is bytes2;
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol b/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol
deleted file mode 100644
index febe0819348e..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    type MyInt is int;
-    MyInt constant mi = MyInt.wrap(5);
-    // This is currently unsupported.
-    uint[MyInt.unwrap(mi)] arr;
-}
-// ----
-// TypeError 5462: (122-138): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol
deleted file mode 100644
index 33c81aee5450..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-type MyAddress is address;
-function f() {
-    MyAddress a = MyAddress(5, 2);
-}
-// ----
-// TypeError 2558: (60-75): Exactly one argument expected for explicit type conversion.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversion_self.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversion_self.sol
deleted file mode 100644
index c2fdc84e488e..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversion_self.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-type MyInt is int;
-function f(MyInt a) pure returns (MyInt b) {
-    b = MyInt(a);
-}
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol
deleted file mode 100644
index 24a7a071e272..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-type MyUInt is uint;
-type MyAddress is address;
-type AnotherUInt is uint;
-
-function f() pure {
-    MyUInt(-1);
-    MyAddress(-1);
-    MyUInt(5);
-    MyAddress(address(5));
-
-    AnotherUInt(MyUInt.wrap(5));
-    MyUInt(AnotherUInt.wrap(10));
-    AnotherUInt.unwrap(MyUInt.wrap(5));
-    MyUInt.unwrap(AnotherUInt.wrap(10));
-}
-// ----
-// TypeError 9640: (99-109): Explicit type conversion not allowed from "int_const -1" to "MyUInt".
-// TypeError 9640: (115-128): Explicit type conversion not allowed from "int_const -1" to "MyAddress".
-// TypeError 9640: (134-143): Explicit type conversion not allowed from "int_const 5" to "MyUInt".
-// TypeError 9640: (149-170): Explicit type conversion not allowed from "address" to "MyAddress".
-// TypeError 9640: (177-204): Explicit type conversion not allowed from "MyUInt" to "AnotherUInt".
-// TypeError 9640: (210-238): Explicit type conversion not allowed from "AnotherUInt" to "MyUInt".
-// TypeError 9553: (263-277): Invalid type for argument in function call. Invalid implicit conversion from MyUInt to AnotherUInt requested.
-// TypeError 9553: (298-318): Invalid type for argument in function call. Invalid implicit conversion from AnotherUInt to MyUInt requested.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol
deleted file mode 100644
index 6d10e8b20ebc..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-type MyUint is uint;
-type MyAddress is address;
-
-function f() pure {
-    MyUint.wrap(5);
-    MyAddress.wrap(address(5));
-}
-// ----
-// Warning 6133: (73-87): Statement has no effect.
-// Warning 6133: (93-119): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol
deleted file mode 100644
index 0fb85119613a..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-type MyAddress is address;
-type MyUInt8 is uint8;
-
-function f() pure {
-    MyAddress.wrap(address(5));
-    MyUInt8.wrap(5);
-    MyUInt8.wrap(50);
-}
-// ----
-// Warning 6133: (75-101): Statement has no effect.
-// Warning 6133: (107-122): Statement has no effect.
-// Warning 6133: (128-144): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol
deleted file mode 100644
index 884fb2b5d6f3..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    Left[] pu1;
-}
-type Left is bytes2;
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol
deleted file mode 100644
index a459698a70d6..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol
+++ /dev/null
@@ -1,2 +0,0 @@
-MyInt constant x = MyInt.wrap(20);
-type MyInt is int;
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol
deleted file mode 100644
index 9ea93cb0902c..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-function f(MyIntB x) pure {}
-type MyIntB is MyIntB;
-// ----
-// TypeError 8657: (44-50): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol
deleted file mode 100644
index b99cff215fc3..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-struct S { U u; }
-contract C { S s; }
-type U is address;
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion.sol b/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion.sol
deleted file mode 100644
index 8837db7d132a..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-type MyInt is uint;
-type MyAddress is address;
-function f() pure {
-    MyInt a;
-    MyInt b = a;
-    MyAddress c;
-    MyAddress d = c;
-    b;
-    d;
-}
-
-function g(MyInt a) pure returns (MyInt) {
-    return a;
-}
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol
deleted file mode 100644
index 3b61798457ad..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-type MyInt is int;
-function f(int a) pure returns (int) {
-    MyInt b = a;
-
-    int c = b;
-
-    address d = b;
-
-    MyInt e = d;
-
-    uint x = 0;
-    MyInt y = MyInt(x);
-
-    return e;
-}
-// ----
-// TypeError 9574: (62-73): Type int256 is not implicitly convertible to expected type MyInt.
-// TypeError 9574: (80-89): Type MyInt is not implicitly convertible to expected type int256.
-// TypeError 9574: (96-109): Type MyInt is not implicitly convertible to expected type address.
-// TypeError 9574: (116-127): Type address is not implicitly convertible to expected type MyInt.
-// TypeError 9640: (160-168): Explicit type conversion not allowed from "uint256" to "MyInt".
-// TypeError 6359: (182-183): Return argument type MyInt is not implicitly convertible to expected type (type of first return variable) int256.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol b/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol
deleted file mode 100644
index d2d5585c16b4..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-type MyInt is int;
-contract C {
-    mapping(MyInt => int) m;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol
deleted file mode 100644
index b6a7b5bccf7d..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: A ====
-type MyInt is int;
-type MyAddress is address;
-==== Source: B ====
-import {MyAddress as OurAddress} from "A";
-contract A {
-    function f(int x) external view returns(MyInt) { return MyInt.wrap(x); }
-}
-// ----
-// DeclarationError 7920: (B:100-105): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol
deleted file mode 100644
index a0e7f9ec0eba..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-==== Source: A ====
-type MyInt is int;
-type MyAddress is address;
-==== Source: B ====
-import {MyAddress as OurAddress} from "A";
-contract A {
-    function f(address x) external view returns(MyAddress) { return MyAddress.wrap(x); }
-}
-// ----
-// DeclarationError 7920: (B:104-113): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource3.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource3.sol
deleted file mode 100644
index ed2cbde28d2f..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource3.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: s1.sol ====
-type MyInt is int;
-==== Source: s2.sol ====
-import "s1.sol" as M;
-contract C {
-  function f(int x) public pure returns (M.MyInt) { return M.MyInt.wrap(x); }
-  function g(M.MyInt x) public pure returns (int) { return M.MyInt.unwrap(x); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol
deleted file mode 100644
index 92a1e54f1a78..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-==== Source: s1.sol ====
-type MyInt is int;
-==== Source: s2.sol ====
-import "s1.sol" as M;
-contract C {
-  function f(int x) public pure returns (MyInt) { return MyInt.wrap(x); }
-}
-// ----
-// DeclarationError 7920: (s2.sol:76-81): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol b/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol
deleted file mode 100644
index 8c5306bc4e26..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-type MyAddress is address;
-contract C {
-    type MyAddress is address;
-}
-// ----
-// Warning 2519: (44-70): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol
deleted file mode 100644
index 6573111eaa13..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-type MyInt is int;
-type MyInt is address;
-contract C {
-    type MyAddress is address;
-    type MyAddress is address;
-}
-// ----
-// DeclarationError 2333: (19-41): Identifier already declared.
-// DeclarationError 2333: (90-116): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol
deleted file mode 100644
index 2bb6c5809fad..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type MyBytes is bytes;
-// ----
-// TypeError 8129: (0-22): The underlying type of the user defined value type "MyBytes" is not a value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol
deleted file mode 100644
index 5a86e92f996a..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {}
-type MyContract is C;
-// ----
-// TypeError 8657: (33-34): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol
deleted file mode 100644
index f143bc509312..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-enum E {A, B, C}
-
-type MyType is E;
-// ----
-// TypeError 8657: (33-34): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol
deleted file mode 100644
index 78d9c70431e2..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type MyFunction is function(uint) returns (uint);
-// ----
-// TypeError 8657: (19-49): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol
deleted file mode 100644
index 9f894c521b80..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type MyInt is mapping(uint => uint);
-// ----
-// TypeError 8657: (14-35): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol
deleted file mode 100644
index b44b23bdbec8..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type MyString is string;
-// ----
-// TypeError 8129: (0-24): The underlying type of the user defined value type "MyString" is not a value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol
deleted file mode 100644
index 3a713a887691..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-struct S {uint x;}
-
-contract C {
-    type MyType is S;
-}
-// ----
-// TypeError 8657: (52-53): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/overload_clash_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/overload_clash_err.sol
deleted file mode 100644
index a84930433d8b..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/overload_clash_err.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-type MyAddress is address;
-interface I {}
-contract C {
-    function f(MyAddress a) external {
-    }
-    function f(address a) external {
-    }
-}
-contract D {
-    function g(MyAddress a) external {
-    }
-}
-contract E is D {
-    function g(I a) external {
-    }
-}
-// ----
-// TypeError 9914: (104-142): Function overload clash during conversion to external types for arguments.
-// TypeError 9914: (162-202): Function overload clash during conversion to external types for arguments.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol
deleted file mode 100644
index 4130edde5d9a..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-type MyInt1 is MyInt2;
-type MyInt2 is MyInt1;
-// ----
-// TypeError 8657: (15-21): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/recursive_function_paramter_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/recursive_function_paramter_err.sol
deleted file mode 100644
index 52e99311e4ad..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/recursive_function_paramter_err.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type MyFunction is function(MyFunction) external returns(MyFunction);
-// ----
-// TypeError 8657: (19-69): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/reference.sol b/test/libsolidity/syntaxTests/userDefinedValueType/reference.sol
deleted file mode 100644
index 81a1ae8af036..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/reference.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    type MyInt is int;
-}
-
-contract C {
-    L.MyInt a;
-    type MyInt is int8;
-}
-
-contract D is C {
-    C.MyInt b;
-    L.MyInt c;
-}
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol
deleted file mode 100644
index d9fc18d7f800..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-type MyInt is int;
-type MyInt is int;
-type MyAddress is address;
-type MyAddress is uint;
-// ----
-// DeclarationError 2333: (19-37): Identifier already declared.
-// DeclarationError 2333: (65-88): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol
deleted file mode 100644
index 20c657c7341a..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-type MyInt is MyInt;
-// ----
-// TypeError 8657: (14-19): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol
deleted file mode 100644
index 30955f3102b0..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-type MyInt is int;
-function test() pure {
-    function (MyInt) returns (int) f = MyInt.unwrap;
-    function (int) returns (MyInt) g = MyInt.wrap;
-}
-// ----
-// TypeError 9574: (46-93): Type function (MyInt) pure returns (int256) is not implicitly convertible to expected type function (MyInt) returns (int256). Special functions cannot be converted to function types.
-// TypeError 9574: (99-144): Type function (int256) pure returns (MyInt) is not implicitly convertible to expected type function (int256) returns (MyInt). Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol
deleted file mode 100644
index d4ee407fd6f8..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-type MyInt is int;
-function f() {
-    MyInt.wrap(5, 6, 7);
-    MyInt.wrap({test: 5});
-    MyInt.wrap();
-    MyInt.unwrap(5);
-    MyInt.unwrap({test: 5});
-    MyInt.unwrap(MyInt.wrap(1), MyInt.wrap(2));
-}
-// ----
-// TypeError 6160: (38-57): Wrong argument count for function call: 3 arguments given but expected 1.
-// TypeError 4974: (63-84): Named argument "test" does not match function declaration.
-// TypeError 6160: (90-102): Wrong argument count for function call: 0 arguments given but expected 1.
-// TypeError 9553: (121-122): Invalid type for argument in function call. Invalid implicit conversion from int_const 5 to MyInt requested.
-// TypeError 4974: (129-152): Named argument "test" does not match function declaration.
-// TypeError 6160: (158-200): Wrong argument count for function call: 2 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
deleted file mode 100644
index 1d9c6eb13667..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C { type T is uint; }
-library L { type T is uint; }
-interface I { type T is uint; }
-contract D
-{
-    C.T x = C.T.wrap(uint(1));
-    L.T y = L.T.wrap(uint(1));
-    I.T z = I.T.wrap(uint(1));
-}
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol
deleted file mode 100644
index 334cb9fb0285..000000000000
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C { type T is uint; }
-library L { type T is uint; }
-contract D
-{
-    C.T x = L.T.wrap(uint(1));
-}
-// ----
-// TypeError 7407: (86-103): Type L.T is not implicitly convertible to expected type C.T.
diff --git a/test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol b/test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol
deleted file mode 100644
index a03ffbe8c8dd..000000000000
--- a/test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-struct S {
-    uint x;
-}
-
-library L {
-    function f(S calldata) internal pure {}
-}
-
-contract C {
-    using L for S;
-
-    function run(S calldata _s) external pure {
-        _s.f();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol b/test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol
deleted file mode 100644
index ea03a3bd6859..000000000000
--- a/test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-library D { function f(bytes calldata) internal pure {} }
-contract C {
-	using D for bytes;
-	function f(bytes memory _x) public pure {
-		_x.f();
-	}
-}
-// ----
-// TypeError 9582: (136-140): Member "f" not found or not visible after argument-dependent lookup in bytes memory.
diff --git a/test/libsolidity/syntaxTests/using/double_asterisk.sol b/test/libsolidity/syntaxTests/using/double_asterisk.sol
deleted file mode 100644
index 44cee5479778..000000000000
--- a/test/libsolidity/syntaxTests/using/double_asterisk.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-function zero(address) pure returns (address) {
-    return address(0);
-}
-
-contract C {
-    using * for *;
-    function f(uint x) pure external returns (uint) {
-        return x.id();
-    }
-    function g(address a) pure external returns (address) {
-        return a.zero();
-    }
-}
-// ----
-// ParserError 2314: (156-157): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol b/test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol
deleted file mode 100644
index 2f4007605b59..000000000000
--- a/test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    using {this.contractFunction} for uint;
-
-    function contractFunction(uint) external view {}
-}
-// ----
-// DeclarationError 9589: (24-45): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol b/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
deleted file mode 100644
index 219954238a1c..000000000000
--- a/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-==== Source: A ====
-function id(uint x) pure returns (uint) {
-    return x;
-}
-// we check that the effect of this directive is
-// limited to this file.
-using {id} for uint;
-
-function t() pure {
-    uint y = 2;
-    y = y.id();
-}
-
-==== Source: B ====
-import "A";
-
-function f() pure {
-    uint y = 2;
-    y = y.id();
-}
-// ----
-// TypeError 9582: (B:57-61): Member "id" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol
deleted file mode 100644
index 9df5e9c2c1bc..000000000000
--- a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-function id(uint16 x) pure returns(uint16) {
-    return x;
-}
-contract C {
-    using {id} for uint8;
-}
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
deleted file mode 100644
index 32a49bbb7778..000000000000
--- a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-struct S {
-    uint8 x;
-}
-
-function id(uint16 x) pure returns(uint16) {
-    return x;
-}
-contract C {
-    using {id} for uint256;
-    using {id} for S;
-}
-// ----
-// TypeError 3100: (112-114): The function "id" cannot be attached to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
-// TypeError 3100: (140-142): The function "id" cannot be attached to the type "struct S" because the type cannot be implicitly converted to the first argument of the function ("uint16").
diff --git a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
deleted file mode 100644
index 7404b0d9beb8..000000000000
--- a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-function id(int8 x) pure returns(int8) {
-    return x;
-}
-function id(uint256 x) pure returns(uint256) {
-    return x;
-}
-
-contract C {
-    using {id} for uint256;
-}
-// ----
-// DeclarationError 9589: (145-147): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads.sol b/test/libsolidity/syntaxTests/using/free_overloads.sol
deleted file mode 100644
index e05580d5fb1e..000000000000
--- a/test/libsolidity/syntaxTests/using/free_overloads.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-function f(uint8 x) pure returns (uint) {
-    return x;
-}
-function f(int8 storage x) pure returns (int) {
-    return x[0];
-}
-using {f} for uint8;
-using {f} for int;
-// ----
-// DeclarationError 9589: (132-133): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads_array.sol b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
deleted file mode 100644
index cab3eccf2467..000000000000
--- a/test/libsolidity/syntaxTests/using/free_overloads_array.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-function f(uint x, uint[] y) pure returns (uint) {
-    return x;
-}
-function f(uint x, uint y) pure returns (int) {
-    return x;
-}
-using {f} for uint;
-// ----
-// DeclarationError 9589: (138-139): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_reference_type.sol b/test/libsolidity/syntaxTests/using/free_reference_type.sol
deleted file mode 100644
index 833b78266e97..000000000000
--- a/test/libsolidity/syntaxTests/using/free_reference_type.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function f(uint[] memory x) pure returns (uint) {
-    return x[0];
-}
-function g(uint[] storage x) view returns (uint) {
-    return x[0];
-}
-function h(uint[] calldata x) pure returns (uint) {
-    return x[0];
-}
-using {f, g, h} for uint[];
-// ----
diff --git a/test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol b/test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol
deleted file mode 100644
index a162912cad20..000000000000
--- a/test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function baseFunction(uint) public pure {}
-}
-
-contract D is C {
-    using {super.baseFunction} for uint;
-}
-// ----
-// DeclarationError 9589: (92-110): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol b/test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol
deleted file mode 100644
index 85d591fd47b4..000000000000
--- a/test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-function f(uint x) pure { }
-
-using f for uint;
-
-contract C {
-    function g(uint x) public pure {
-        x.f();
-    }
-}
-// ----
-// TypeError 4357: (35-36): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol b/test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol
deleted file mode 100644
index 003137381785..000000000000
--- a/test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-function f(uint x) pure { }
-
-contract C {
-    using f for uint;
-    function g(uint x) public pure {
-        x.f();
-    }
-}
-// ----
-// TypeError 4357: (52-53): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/global_and_local.sol b/test/libsolidity/syntaxTests/using/global_and_local.sol
deleted file mode 100644
index 7af04c0a602b..000000000000
--- a/test/libsolidity/syntaxTests/using/global_and_local.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-using {f} for S global;
-struct S { uint x; }
-function gen() pure returns (S memory) {}
-function f(S memory _x) pure returns (uint) { return _x.x; }
-==== Source: B ====
-contract C {
-    using {fun} for S;
-    // Adds the same function again with the same name,
-    // so it's fine.
-    using {A.f} for S;
-
-    function test() pure public
-    {
-        uint p = g().f();
-        p = g().fun();
-    }
-}
-import {gen as g, f as fun, S} from "A";
-import "A" as A;
-// ----
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
deleted file mode 100644
index a4ee65a39857..000000000000
--- a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-using {f} for * global;
-function f(uint) pure{}
-// ----
-// SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-23): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol b/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
deleted file mode 100644
index 051874abc9bc..000000000000
--- a/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-using {f} for uint global;
-function f(uint) pure{}
-// ----
-// TypeError 8841: (0-26): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol b/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
deleted file mode 100644
index 232ffafade9d..000000000000
--- a/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-using {f} for L.S global;
-function f(L.S memory) pure{}
-library L {
-    struct S { uint x; }
-}
-// ----
-// TypeError 4117: (0-25): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol b/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
deleted file mode 100644
index 458a644e9a85..000000000000
--- a/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: A ====
-struct S { uint x; }
-==== Source: B ====
-
-using {f} for S global;
-using {f} for A.S global;
-
-function f(S memory) pure{}
-
-import {S} from "A";
-import "A" as A;
-// ----
-// TypeError 4117: (B:1-24): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (B:25-50): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_inside_contract.sol b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
deleted file mode 100644
index 54c01f99c681..000000000000
--- a/test/libsolidity/syntaxTests/using/global_inside_contract.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    using {f} for uint global;
-}
-function f(uint) pure{}
-// ----
-// SyntaxError 3367: (17-43): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_library_for_builtin.sol b/test/libsolidity/syntaxTests/using/global_library_for_builtin.sol
deleted file mode 100644
index 7ff956941b4b..000000000000
--- a/test/libsolidity/syntaxTests/using/global_library_for_builtin.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-using L for uint global;
-using L for uint[] global;
-using L for function() returns (uint) global;
-library L {
-}
-// ----
-// TypeError 8841: (0-24): Can only use "global" with user-defined types.
-// TypeError 8841: (25-51): Can only use "global" with user-defined types.
-// TypeError 8841: (52-97): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol b/test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol
deleted file mode 100644
index f3f65890f685..000000000000
--- a/test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-using L for L.S global;
-library L {
-    struct S { uint x; }
-}
-// ----
-// TypeError 4117: (0-23): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_library_for_interface.sol b/test/libsolidity/syntaxTests/using/global_library_for_interface.sol
deleted file mode 100644
index 06a644634a43..000000000000
--- a/test/libsolidity/syntaxTests/using/global_library_for_interface.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-interface I {}
-using L for I global;
-library L {
-}
-// ----
-// TypeError 8841: (15-36): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_library_foreign.sol b/test/libsolidity/syntaxTests/using/global_library_foreign.sol
deleted file mode 100644
index 9eacc2c4b9ae..000000000000
--- a/test/libsolidity/syntaxTests/using/global_library_foreign.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-==== Source: A ====
-struct S { uint x; }
-==== Source: B ====
-library L {}
-using L for S global;
-import {S} from "A";
-// ----
-// TypeError 4117: (B:13-34): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol b/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
deleted file mode 100644
index 50860de4a93b..000000000000
--- a/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-using L for * global;
-library L {}
-// ----
-// SyntaxError 8118: (0-21): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-21): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_local_clash.sol b/test/libsolidity/syntaxTests/using/global_local_clash.sol
deleted file mode 100644
index 5d5d8ae2527b..000000000000
--- a/test/libsolidity/syntaxTests/using/global_local_clash.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-==== Source: A ====
-using {f} for S global;
-struct S { uint x; }
-function gen() pure returns (S memory) {}
-function f(S memory _x) pure returns (uint) { return _x.x; }
-function f1(S memory _x) pure returns (uint) { return _x.x + 1; }
-==== Source: B ====
-contract C {
-    // Here, f points to f1, so we end up with two different functions
-    // attached as S.f
-    using {f} for S;
-
-    function test() pure public
-    {
-        uint p = g().f();
-    }
-}
-import {gen as g, f1 as f, S} from "A";
-import "A" as A;
-// ----
-// TypeError 6675: (B:184-189): Member "f" not unique after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol b/test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol
deleted file mode 100644
index 48ce7f111900..000000000000
--- a/test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-using {f} for S global global;
-struct S { uint x; }
-function f(S memory _x) pure returns (uint) { return _x.x; }
-// ----
-// ParserError 2314: (23-29): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/using/global_nonglobal.sol b/test/libsolidity/syntaxTests/using/global_nonglobal.sol
deleted file mode 100644
index 972a34a8d1b2..000000000000
--- a/test/libsolidity/syntaxTests/using/global_nonglobal.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-==== Source: A ====
-using {f} for S global;
-using {g} for S;
-struct S { uint x; }
-function gen() pure returns (S memory) {}
-function f(S memory _x) pure { _x.g(); }
-function g(S memory _x) pure { }
-==== Source: B ====
-import "A";
-function test() pure
-{
-    gen().f();
-    gen().g();
-}
-
-// ----
-// TypeError 9582: (B:54-61): Member "g" not found or not visible after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/global_with_asterisk.sol b/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
deleted file mode 100644
index a4ee65a39857..000000000000
--- a/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-using {f} for * global;
-function f(uint) pure{}
-// ----
-// SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-23): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_working.sol b/test/libsolidity/syntaxTests/using/global_working.sol
deleted file mode 100644
index 9447202451fb..000000000000
--- a/test/libsolidity/syntaxTests/using/global_working.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-==== Source: A ====
-using {f} for S global;
-// this should not conflict
-using {f} for S;
-struct S { uint x; }
-function gen() pure returns (S memory) {}
-function f(S memory _x) pure returns (uint) { return _x.x; }
-==== Source: B ====
-function test() pure
-{
-    uint p = g().f();
-    p++;
-}
-import {gen as g} from "A";
-// ----
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol b/test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol
deleted file mode 100644
index 9a9ee26f6111..000000000000
--- a/test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-interface I {
-    function g() external pure;
-}
-
-using {I.g} for uint;
-// ----
-// TypeError 4167: (56-59): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol b/test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol
deleted file mode 100644
index f01788ff5170..000000000000
--- a/test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-interface I {
-    function g() external pure;
-}
-
-contract C {
-    using {I.g} for uint;
-}
-// ----
-// TypeError 4167: (73-76): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/interface_using_for.sol b/test/libsolidity/syntaxTests/using/interface_using_for.sol
deleted file mode 100644
index 41597101703d..000000000000
--- a/test/libsolidity/syntaxTests/using/interface_using_for.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-library L {
-    function f() public {}
-}
-
-interface I {
-    using L for int;
-    function g() external;
-}
-// ----
-// SyntaxError 9088: (60-76): The "using for" directive is not allowed inside interfaces.
diff --git a/test/libsolidity/syntaxTests/using/library_at_file_level.sol b/test/libsolidity/syntaxTests/using/library_at_file_level.sol
deleted file mode 100644
index 9cb1965a0864..000000000000
--- a/test/libsolidity/syntaxTests/using/library_at_file_level.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-}
-
-using L for uint;
-
-contract C {
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol b/test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol
deleted file mode 100644
index e2e4b57038fd..000000000000
--- a/test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library D { function double(uint self) internal pure returns (uint) { return 2*self; } }
-contract C {
-	using D for uint;
-	function f(uint a) public pure {
-		a.double();
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol b/test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol
deleted file mode 100644
index 877ff8ea6a38..000000000000
--- a/test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-library D { function double(uint self) public pure returns (uint) { return 2*self; } }
-contract C {
-	using D for uint;
-	function f(uint a) public pure {
-		a.double;
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol b/test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol
deleted file mode 100644
index bcaac24676f4..000000000000
--- a/test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L {
-	function g(function() internal returns (uint) _t) internal returns (uint) { return _t(); }
-}
-contract C {
-	using L for *;
-	function f() public returns (uint) {
-		return t.g();
-	}
-	function t() public pure returns (uint)  { return 7; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol b/test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol
deleted file mode 100644
index 2876f591a09c..000000000000
--- a/test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-}
-
-using {L.externalFunction} for uint;
-using {L.publicFunction} for uint;
-using {L.internalFunction} for uint;
-
-contract C {
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol b/test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol
deleted file mode 100644
index 21d30f557294..000000000000
--- a/test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-using {L.externalFunction, L.publicFunction, L.internalFunction} for uint;
-
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
-// TypeError 6700: (299-319): Libraries cannot call their own functions externally.
-// TypeError 6700: (329-347): Libraries cannot call their own functions externally.
diff --git a/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol b/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol
deleted file mode 100644
index bb191faa6449..000000000000
--- a/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-}
-
-using {L.externalFunction, L.publicFunction, L.internalFunction} for uint;
-
-contract C {
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol b/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol
deleted file mode 100644
index 300a3480d38c..000000000000
--- a/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-}
-
-contract C {
-    using {L.externalFunction, L.publicFunction, L.internalFunction} for uint;
-
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol b/test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol
deleted file mode 100644
index 46d4c571d6d4..000000000000
--- a/test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-}
-
-contract C {
-    using {L.externalFunction} for uint;
-    using {L.publicFunction} for uint;
-    using {L.internalFunction} for uint;
-
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_import_as.sol b/test/libsolidity/syntaxTests/using/library_import_as.sol
deleted file mode 100644
index 7c3fc2891da9..000000000000
--- a/test/libsolidity/syntaxTests/using/library_import_as.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: A ====
-library L {
-    function id(uint x) pure internal returns (uint) {
-        return x;
-    }
-}
-
-==== Source: B ====
-import {L as M} from "A";
-
-contract C {
-    using M for uint;
-	function f(uint x) public pure returns (uint) {
-        return x.id();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/using/library_inside_contract.sol b/test/libsolidity/syntaxTests/using/library_inside_contract.sol
deleted file mode 100644
index cd7f8fd19386..000000000000
--- a/test/libsolidity/syntaxTests/using/library_inside_contract.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-}
-
-contract C {
-    using L for uint;
-
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
deleted file mode 100644
index 0a51043db2ad..000000000000
--- a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    function id_ext(uint x) external returns(uint) {
-        return x;
-    }
-}
-
-contract C {
-    using L.id_ext for uint;
-    function f(uint x) external {
-        x.id_ext();
-    }
-}
-// ----
-// TypeError 4357: (115-123): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/library_non_free_function.sol b/test/libsolidity/syntaxTests/using/library_non_free_function.sol
deleted file mode 100644
index 2fdb471aba70..000000000000
--- a/test/libsolidity/syntaxTests/using/library_non_free_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L {
-    function id(uint x) internal pure returns(uint) {
-        return x;
-    }
-}
-
-contract C {
-    using {L.id} for uint;
-    function f(uint x) external pure {
-        x.id();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/module_1.sol b/test/libsolidity/syntaxTests/using/module_1.sol
deleted file mode 100644
index a2d3b9f992ac..000000000000
--- a/test/libsolidity/syntaxTests/using/module_1.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-==== Source: A ====
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-==== Source: B ====
-import "A" as M;
-contract C {
-    using M for uint;
-}
-// ----
-// TypeError 4357: (B:40-41): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/module_2.sol b/test/libsolidity/syntaxTests/using/module_2.sol
deleted file mode 100644
index 92420822250a..000000000000
--- a/test/libsolidity/syntaxTests/using/module_2.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: A ====
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-==== Source: B ====
-import {id as Id} from "A";
-
-contract C {
-    using { Id } for uint;
-	function f(uint x) public pure returns (uint) {
-        return x.Id();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/using/module_3.sol b/test/libsolidity/syntaxTests/using/module_3.sol
deleted file mode 100644
index f017363e67cd..000000000000
--- a/test/libsolidity/syntaxTests/using/module_3.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-==== Source: A ====
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-==== Source: B ====
-import "A" as M;
-
-contract C {
-    using {M.id} for uint;
-    function f(uint x) public pure returns (uint) {
-        return x.id();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
deleted file mode 100644
index 2526d216f252..000000000000
--- a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: A ====
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-==== Source: B ====
-import "A" as M;
-
-contract C {
-    using { id } for uint;
-}
-// ----
-// DeclarationError 9589: (B:43-45): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol b/test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol
deleted file mode 100644
index 1f036d83b2dc..000000000000
--- a/test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-library L {
-    using {L.privateFunction} for uint;
-    function privateFunction(uint) private pure {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol b/test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol
deleted file mode 100644
index 2be2010c6e34..000000000000
--- a/test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-library L {
-    function privateFunction(uint) private pure {}
-}
-
-using {L.privateFunction} for uint;
-
-contract C {
-    using {L.privateFunction} for uint;
-}
-// ----
-// TypeError 6772: (73-90): Function "L.privateFunction" is private and therefore cannot be attached to a type outside of the library where it is defined.
-// TypeError 6772: (127-144): Function "L.privateFunction" is private and therefore cannot be attached to a type outside of the library where it is defined.
diff --git a/test/libsolidity/syntaxTests/using/public_state_variable_getter.sol b/test/libsolidity/syntaxTests/using/public_state_variable_getter.sol
deleted file mode 100644
index 9223a92a5daa..000000000000
--- a/test/libsolidity/syntaxTests/using/public_state_variable_getter.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    uint public data;
-}
-
-contract C {
-    A a = new A();
-
-    using {a.data} for uint;
-}
-// ----
-// DeclarationError 9589: (82-88): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/undeclared_library.sol b/test/libsolidity/syntaxTests/using/undeclared_library.sol
deleted file mode 100644
index c2174cc6c124..000000000000
--- a/test/libsolidity/syntaxTests/using/undeclared_library.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-using L for uint;
-// ----
-// DeclarationError 9589: (6-7): Identifier is not a library name.
diff --git a/test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol b/test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol
deleted file mode 100644
index 7403dcf28247..000000000000
--- a/test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-library L {
-    function externalFunction(uint) external pure {}
-    function publicFunction(uint) public pure {}
-    function internalFunction(uint) internal pure {}
-    function privateFunction(uint) private pure {}
-
-    using {externalFunction, publicFunction, internalFunction, privateFunction} for uint;
-
-    function f() public pure {
-        uint x;
-        x.externalFunction();
-        x.publicFunction();
-        x.internalFunction();
-        x.privateFunction();
-    }
-}
-// ----
-// TypeError 6700: (365-385): Libraries cannot call their own functions externally.
-// TypeError 6700: (395-413): Libraries cannot call their own functions externally.
diff --git a/test/libsolidity/syntaxTests/using/using_contract_err.sol b/test/libsolidity/syntaxTests/using/using_contract_err.sol
deleted file mode 100644
index e216e4cfc420..000000000000
--- a/test/libsolidity/syntaxTests/using/using_contract_err.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint) external {
-    }
-}
-interface I {
-    function f(uint) external;
-}
-
-contract Test {
-    using C for uint;
-}
-// ----
-// TypeError 4357: (127-128): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/using_empty_list_err.sol b/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
deleted file mode 100644
index b8b9cb9a7646..000000000000
--- a/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    using {} for uint;
-}
-// ----
-// ParserError 2314: (24-25): Expected identifier but got '}'
diff --git a/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol b/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
deleted file mode 100644
index b1dc8b706837..000000000000
--- a/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-using {} for uint;
-// ----
-// ParserError 2314: (7-8): Expected identifier but got '}'
diff --git a/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol b/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
deleted file mode 100644
index 2b5d6a0dd63a..000000000000
--- a/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-using {id} for *;
-// ----
-// SyntaxError 8118: (59-76): The type has to be specified explicitly at file level (cannot use '*').
diff --git a/test/libsolidity/syntaxTests/using/using_for_enum.sol b/test/libsolidity/syntaxTests/using/using_for_enum.sol
deleted file mode 100644
index e7c6b5c820f1..000000000000
--- a/test/libsolidity/syntaxTests/using/using_for_enum.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-enum E {A, B, C}
-
-function f(E) {}
-
-using {f} for E;
diff --git a/test/libsolidity/syntaxTests/using/using_free_functions.sol b/test/libsolidity/syntaxTests/using/using_free_functions.sol
deleted file mode 100644
index 5180cfd2012c..000000000000
--- a/test/libsolidity/syntaxTests/using/using_free_functions.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-function id(uint x) pure returns (uint) {
-    return x;
-}
-
-function zero(uint) pure returns (uint) {
-    return 0;
-}
-using {id} for uint;
-contract C {
-    using {zero} for uint;
-
-    function g(uint z) pure external {
-        z.zero();
-        z.id();
-    }
-}
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
deleted file mode 100644
index 54fdd825d70b..000000000000
--- a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-function one() pure returns(uint) {
-    return 1;
-}
-
-using {one} for uint;
-// ----
-// TypeError 4731: (60-63): The function "one" does not have any parameters, and therefore cannot be attached to the type "uint256".
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
deleted file mode 100644
index 4e15a9d8801a..000000000000
--- a/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-struct S { uint8 x; }
-function f() {}
-using {f} for S;
-// ----
-// TypeError 4731: (45-46): The function "f" does not have any parameters, and therefore cannot be attached to the type "struct S".
diff --git a/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol b/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
deleted file mode 100644
index 62f8e4736f9c..000000000000
--- a/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-function f(uint) {}
-
-contract C {
-    using {f} for *;
-}
-// ----
-// SyntaxError 3349: (38-54): The type has to be specified explicitly when attaching specific functions.
diff --git a/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol b/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
deleted file mode 100644
index 07b607004c2d..000000000000
--- a/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-using * for uint;
-// ----
-// ParserError 2314: (6-7): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol b/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
deleted file mode 100644
index 67eee5862e0e..000000000000
--- a/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    using * for uint;
-}
-// ----
-// ParserError 2314: (23-24): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol b/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
deleted file mode 100644
index dfc0b916e9df..000000000000
--- a/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-library L { }
-using L for *;
-// ----
-// SyntaxError 8118: (14-28): The type has to be specified explicitly at file level (cannot use '*').
diff --git a/test/libsolidity/syntaxTests/using/using_library_file_level.sol b/test/libsolidity/syntaxTests/using/using_library_file_level.sol
deleted file mode 100644
index c4de282c48a8..000000000000
--- a/test/libsolidity/syntaxTests/using/using_library_file_level.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-library L { }
-using L for uint;
-// ----
diff --git a/test/libsolidity/syntaxTests/using/using_library_for_library.sol b/test/libsolidity/syntaxTests/using/using_library_for_library.sol
deleted file mode 100644
index 8166e9c7674d..000000000000
--- a/test/libsolidity/syntaxTests/using/using_library_for_library.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-library L {}
-library M {}
-contract C {
-    using L for M;
-    using M for L;
-    using L for L;
-}
-// ----
-// TypeError 1130: (55-56): Invalid use of a library name.
-// TypeError 1130: (74-75): Invalid use of a library name.
-// TypeError 1130: (93-94): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
deleted file mode 100644
index fabfcd92c54e..000000000000
--- a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    using {f, g} for uint;
-
-    function f(uint) internal { }
-    function g(uint) public { }
-}
-// ----
-// TypeError 4167: (24-25): Only file-level functions and library functions can be attached to a type in a "using" statement
-// TypeError 4167: (27-28): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/using_non_function.sol b/test/libsolidity/syntaxTests/using/using_non_function.sol
deleted file mode 100644
index 32d97345b670..000000000000
--- a/test/libsolidity/syntaxTests/using/using_non_function.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function() internal pure x;
-    using {x} for uint;
-}
-// ----
-// TypeError 8187: (56-57): Expected function name.
diff --git a/test/libsolidity/syntaxTests/using/using_struct_for_struct.sol b/test/libsolidity/syntaxTests/using/using_struct_for_struct.sol
deleted file mode 100644
index 59c8e2aa7def..000000000000
--- a/test/libsolidity/syntaxTests/using/using_struct_for_struct.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    struct S { uint t; }
-    function r() public {
-        S memory x;
-        x.d;
-    }
-    using S for S;
-}
-// ----
-// TypeError 4357: (113-114): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol b/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol
deleted file mode 100644
index 3692b12f7208..000000000000
--- a/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma solidity >0.4.24;
-
-contract C
-{
-	function f(uint x) public pure {
-		do
-			uint y;
-		while (x > 0);
-	}
-}
-// ----
-// SyntaxError 9079: (81-87): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/else.sol b/test/libsolidity/syntaxTests/variableDeclaration/else.sol
deleted file mode 100644
index ca9d94462060..000000000000
--- a/test/libsolidity/syntaxTests/variableDeclaration/else.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-pragma solidity >0.4.24;
-
-contract C
-{
-	function f(uint x) public pure {
-		if (x > 0)
-			{uint y;}
-		else
-			uint z;
-	}
-}
-// ----
-// SyntaxError 9079: (109-115): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/for.sol b/test/libsolidity/syntaxTests/variableDeclaration/for.sol
deleted file mode 100644
index 75fe0eb55423..000000000000
--- a/test/libsolidity/syntaxTests/variableDeclaration/for.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity >0.4.24;
-
-contract C
-{
-	function f(uint x) public pure {
-		for (uint i = 0; i < x; ++i)
-			uint y;
-	}
-}
-// ----
-// SyntaxError 9079: (107-113): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/if.sol b/test/libsolidity/syntaxTests/variableDeclaration/if.sol
deleted file mode 100644
index 6f65ae1a91f3..000000000000
--- a/test/libsolidity/syntaxTests/variableDeclaration/if.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity >0.4.24;
-
-contract C
-{
-	function f(uint x) public pure {
-		if (x > 0)
-			uint y;
-	}
-}
-// ----
-// SyntaxError 9079: (89-95): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol b/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol
deleted file mode 100644
index 24d1d98d6e67..000000000000
--- a/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-uint constant this = 1;
-uint constant super = 2;
-uint constant _ = 3;
-contract C {
-	address this;
-	int super;
-	mapping (address => address) _;
-}
-
-contract D {
-	address[] this;
-	struct _ { uint super; }
-}
-// ----
-// DeclarationError 3726: (0-22): The name "this" is reserved.
-// DeclarationError 3726: (24-47): The name "super" is reserved.
-// DeclarationError 3726: (49-68): The name "_" is reserved.
-// DeclarationError 3726: (84-96): The name "this" is reserved.
-// DeclarationError 3726: (99-108): The name "super" is reserved.
-// DeclarationError 3726: (111-141): The name "_" is reserved.
-// DeclarationError 3726: (160-174): The name "this" is reserved.
-// DeclarationError 3726: (177-201): The name "_" is reserved.
-// DeclarationError 3726: (188-198): The name "super" is reserved.
-// Warning 2519: (84-96): This declaration shadows an existing declaration.
-// Warning 2519: (99-108): This declaration shadows an existing declaration.
-// Warning 2519: (111-141): This declaration shadows an existing declaration.
-// Warning 2519: (160-174): This declaration shadows an existing declaration.
-// Warning 2519: (177-201): This declaration shadows an existing declaration.
-// Warning 2319: (0-22): This declaration shadows a builtin symbol.
-// Warning 2319: (24-47): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/while.sol b/test/libsolidity/syntaxTests/variableDeclaration/while.sol
deleted file mode 100644
index e4664b3db0df..000000000000
--- a/test/libsolidity/syntaxTests/variableDeclaration/while.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity >0.4.24;
-
-contract C
-{
-	function f(uint x) public pure {
-		while (x > 0)
-			uint y;
-	}
-}
-// ----
-// SyntaxError 9079: (92-98): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_constant.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_constant.sol
deleted file mode 100644
index e9d5803157d6..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_constant.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract A {
-    uint constant x = 2;
-}
-
-contract B is A {
-    function f() public pure returns (uint) {
-        return A.x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
deleted file mode 100644
index 0f434c7437b5..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract A {
-    function x() public {}
-}
-
-contract B is A {
-    function f() public view {
-        A.x();
-    }
-}
-// ----
-// TypeError 8961: (100-105): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
deleted file mode 100644
index 13d0ed913652..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract A {
-    struct S { uint x; }
-    S s;
-}
-
-contract B is A {
-    function f() public view {
-        A.s = A.S(2);
-    }
-    function g() public view {
-        A.s.x = 2;
-    }
-    function h() public pure returns (uint) {
-        return A.s.x;
-    }
-}
-// ----
-// TypeError 8961: (107-110): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (166-171): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 2527: (244-247): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (244-249): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
deleted file mode 100644
index 1203d2c670d1..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract A {
-    uint x;
-}
-
-contract B is A {
-    function f() public pure returns (uint) {
-        return A.x;
-    }
-    function g() public view {
-        A.x = 5;
-    }
-}
-// ----
-// TypeError 2527: (107-110): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (157-160): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/address.sol b/test/libsolidity/syntaxTests/viewPureChecker/address.sol
deleted file mode 100644
index 088a6a2f4288..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/address.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-    function f() public view returns (uint) {
-        return address(this).balance;
-    }
-    function g() public view returns (uint) {
-        return address(0).balance;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/address_constantinople.sol b/test/libsolidity/syntaxTests/viewPureChecker/address_constantinople.sol
deleted file mode 100644
index 4387ca60a75b..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/address_constantinople.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public view returns (bytes32) {
-        return address(this).codehash;
-    }
-    function g() public view returns (bytes32) {
-        return address(0).codehash;
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push.sol b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push.sol
deleted file mode 100644
index 4bba3a585518..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract A {
-    uint[] x;
-    function g() public returns (uint) {
-        return x.push();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
deleted file mode 100644
index 27ba16eaf2ae..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract A {
-    uint[] x;
-    function f() public view returns (uint) {
-        return x.push();
-    }
-}
-// ----
-// TypeError 8961: (88-96): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol
deleted file mode 100644
index 365e07bc7d40..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract A {
-    uint[] x;
-}
-
-contract B is A {
-    function g() public pure returns (uint) {
-        return A.x.length;
-    }
-    function h() public pure returns (uint) {
-        return A.x[2];
-    }
-}
-// ----
-// TypeError 2527: (109-112): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (109-119): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (188-191): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (188-194): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/assembly.sol b/test/libsolidity/syntaxTests/viewPureChecker/assembly.sol
deleted file mode 100644
index cc8ac5e8341b..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/assembly.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-contract C {
-    struct S { uint x; }
-    S s;
-    function e() pure public {
-        assembly { mstore(keccak256(0, 20), mul(s.slot, 2)) }
-    }
-    function f() pure public {
-        uint x;
-        assembly { x := 7 }
-    }
-    function g() view public {
-        assembly { for {} 1 { pop(sload(0)) } { } pop(gas()) }
-    }
-    function h() view public {
-        assembly { function g() { pop(blockhash(20)) } }
-    }
-    function i() public {
-        assembly { pop(call(0, 1, 2, 3, 4, 5, 6)) }
-    }
-    function j() public {
-        assembly { pop(call(gas(), 1, 2, 3, 4, 5, 6)) }
-    }
-    function k() public view {
-        assembly { pop(balance(0)) }
-    }
-    function l() public view {
-        assembly { pop(extcodesize(0)) }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol
deleted file mode 100644
index 2f681ed57009..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly { pop(chainid()) }
-    }
-    function g() public pure returns (uint) {
-        return block.chainid;
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// TypeError 2527: (67-76): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (147-160): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/assembly_constantinople.sol b/test/libsolidity/syntaxTests/viewPureChecker/assembly_constantinople.sol
deleted file mode 100644
index ed0b20d53793..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/assembly_constantinople.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public view {
-        assembly { pop(extcodehash(0)) }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/assembly_istanbul.sol b/test/libsolidity/syntaxTests/viewPureChecker/assembly_istanbul.sol
deleted file mode 100644
index 1f4fb430983f..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/assembly_istanbul.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public view {
-        assembly { pop(chainid()) }
-    }
-    function g() public view returns (uint) {
-        return block.chainid;
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol
deleted file mode 100644
index 0d7c19086710..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly { pop(basefee()) }
-    }
-    function g() public pure returns (uint) {
-        return block.basefee;
-    }
-}
-// ====
-// EVMVersion: >=london
-// ----
-// TypeError 2527: (67-76): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (147-160): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
deleted file mode 100644
index 3ee940679873..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-    function f() public {
-        payable(this).transfer(1);
-        require(payable(this).send(2));
-        selfdestruct(payable(this));
-        (bool success,) = address(this).delegatecall("");
-        require(success);
-		(success,) = address(this).call("");
-        require(success);
-    }
-    function g() pure public {
-        bytes32 x = keccak256("abc");
-        bytes32 y = sha256("abc");
-        address z = ecrecover(bytes32(uint256(1)), uint8(2), bytes32(uint256(3)), bytes32(uint256(4)));
-        require(true);
-        assert(true);
-        x; y; z;
-    }
-    receive() payable external {}
-}
-// ----
-// Warning 5159: (122-134): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_restrict_warning.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_restrict_warning.sol
deleted file mode 100644
index 858bcac446b2..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_restrict_warning.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-contract C {
-    function f() view public {
-        bytes32 x = keccak256("abc");
-        bytes32 y = sha256("abc");
-        address z = ecrecover(bytes32(uint256(1)), uint8(2), bytes32(uint256(3)), bytes32(uint256(4)));
-        require(true);
-        assert(true);
-        x; y; z;
-    }
-    function g() public {
-        bytes32 x = keccak256("abc");
-        bytes32 y = sha256("abc");
-        address z = ecrecover(bytes32(uint256(1)), uint8(2), bytes32(uint256(3)), bytes32(uint256(4)));
-        require(true);
-        assert(true);
-        x; y; z;
-    }
-}
-// ----
-// Warning 2018: (17-288): Function state mutability can be restricted to pure
-// Warning 2018: (293-559): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
deleted file mode 100644
index f458aaad5dfa..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f() view public {
-        payable(this).transfer(1);
-    }
-    function g() view public {
-        require(payable(this).send(2));
-    }
-    function h() view public {
-        selfdestruct(payable(this));
-    }
-    function i() view public {
-        (bool success,) = address(this).delegatecall("");
-        require(success);
-    }
-    function j() view public {
-        (bool success,) = address(this).call("");
-        require(success);
-    }
-    receive() payable external {
-    }
-}
-// ----
-// Warning 5159: (201-213): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// TypeError 8961: (52-77): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (132-153): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (201-228): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (293-323): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (414-436): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
deleted file mode 100644
index 38762a34a6d4..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    uint x;
-    function f() pure public { g(); }
-    function g() view public { x; }
-    function h() view public { i(); }
-    function i() public { x = 2; }
-}
-// ----
-// TypeError 2527: (56-59): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (130-133): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol
deleted file mode 100644
index 858f5d7da588..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function g() pure public { g(); }
-    function f() view public returns (uint) { f(); g(); }
-    function h() public { h(); g(); f(); }
-    function i() payable public { i(); h(); g(); f(); }
-}
-// ----
-// Warning 5740: (102-105): Unreachable code.
-// Warning 5740: (140-143): Unreachable code.
-// Warning 5740: (145-148): Unreachable code.
-// Warning 5740: (191-194): Unreachable code.
-// Warning 5740: (196-199): Unreachable code.
-// Warning 5740: (201-204): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_fallback.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_fallback.sol
deleted file mode 100644
index 053b2b19e810..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_fallback.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C
-{
-    fallback() external {
-        uint x;
-        assembly {
-            x := callvalue()
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function.sol
deleted file mode 100644
index 1339e465a483..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C
-{
-    function f(uint x) public {
-        assembly {
-            x := callvalue()
-        }
-    }
-}
-// ----
-// Warning 2018: (17-108): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function_internal.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function_internal.sol
deleted file mode 100644
index 6a2b0dfd2155..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function_internal.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-    function f() internal returns (uint x) {
-        assembly {
-            x := callvalue()
-        }
-    }
-	function g() public returns (uint) {
-		return f();
-	}
-}
-// ----
-// Warning 2018: (17-121): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function_modifier.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function_modifier.sol
deleted file mode 100644
index 695ccb652c8f..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_nonpayable_assembly_function_modifier.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	modifier m {
-		uint x;
-		assembly {
-			x := callvalue()
-		}
-		_;
-	}
-    function f() m public {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_fallback.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_fallback.sol
deleted file mode 100644
index 79277a44316a..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_fallback.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C
-{
-    receive () external payable {
-    }
-    fallback () external payable {
-        uint x;
-        assembly {
-            x := callvalue()
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_function.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_function.sol
deleted file mode 100644
index 9de5ee70bf10..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_function.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C
-{
-    function f(uint x) public payable {
-        assembly {
-            x := callvalue()
-        }
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_function_modifier.sol b/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_function_modifier.sol
deleted file mode 100644
index 5847a7ab1ae9..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/callvalue_payable_assembly_function_modifier.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C
-{
-	modifier m {
-		uint x;
-		assembly {
-			x := callvalue()
-		}
-		_;
-	}
-    function f() m public payable {
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/constant.sol b/test/libsolidity/syntaxTests/viewPureChecker/constant.sol
deleted file mode 100644
index d5a9ca873160..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/constant.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint constant x = 2;
-    function k() pure public returns (uint) {
-        return x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/constant_restrict_warning.sol b/test/libsolidity/syntaxTests/viewPureChecker/constant_restrict_warning.sol
deleted file mode 100644
index 89993cd931d4..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/constant_restrict_warning.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-    uint constant x = 2;
-    function f() view public returns (uint) {
-        return x;
-    }
-    function g() public returns (uint) {
-        return x;
-    }
-}
-// ----
-// Warning 2018: (42-107): Function state mutability can be restricted to pure
-// Warning 2018: (112-172): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/creation_no_restrict_warning.sol b/test/libsolidity/syntaxTests/viewPureChecker/creation_no_restrict_warning.sol
deleted file mode 100644
index eb2ea7a0649a..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/creation_no_restrict_warning.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract D {}
-contract C {
-    function f() public { new D(); }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
deleted file mode 100644
index c934c90933db..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract D {}
-contract C {
-    function f() public view { new D(); }
-}
-// ----
-// TypeError 8961: (58-65): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/function_types.sol b/test/libsolidity/syntaxTests/viewPureChecker/function_types.sol
deleted file mode 100644
index 897f23662848..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/function_types.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-contract C {
-    function f() pure public {
-        function () external nonpayFun;
-        function () external view viewFun;
-        function () external pure pureFun;
-
-        nonpayFun;
-        viewFun;
-        pureFun;
-        pureFun();
-    }
-    function g() view public {
-        function () external view viewFun;
-
-        viewFun();
-    }
-    function h() public {
-        function () external nonpayFun;
-
-        nonpayFun();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
deleted file mode 100644
index f0ad5efccea7..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract C {
-    function f() pure public {
-        function () external nonpayFun;
-        nonpayFun();
-    }
-    function g() pure public {
-        function () external view viewFun;
-        viewFun();
-    }
-    function h() view public {
-        function () external nonpayFun;
-        nonpayFun();
-    }
-}
-// ----
-// TypeError 8961: (92-103): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (193-202): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (289-300): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol
deleted file mode 100644
index 41120bf08111..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-contract C {
-    function f() external payable {}
-	function g(address a) external pure {
-		a.call{value: 42};
-		a.call{gas: 42};
-		a.staticcall{gas: 42};
-		a.delegatecall{gas: 42};
-	}
-	function h() external view {
-		this.f{value: 42};
-		this.f{gas: 42};
-	}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
deleted file mode 100644
index 65030cb30729..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(address a) external view returns (bool success) {
-		(success,) = a.call{gas: 42}("");
-	}
-	function h() external payable {}
-	function i() external view {
-		this.h{gas: 42}();
-	}
-}
-// ----
-// TypeError 8961: (90-109): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (180-197): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/immutable.sol b/test/libsolidity/syntaxTests/viewPureChecker/immutable.sol
deleted file mode 100644
index a1081959ea8c..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/immutable.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract B {
-    uint immutable x = 1;
-    function f() public pure returns (uint) {
-        return x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
deleted file mode 100644
index b3753706cfb0..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
+++ /dev/null
@@ -1,93 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            stop()
-            pop(add(0, 1))
-            pop(sub(0, 1))
-            pop(mul(0, 1))
-            pop(div(0, 1))
-            pop(sdiv(0, 1))
-            pop(mod(0, 1))
-            pop(smod(0, 1))
-            pop(exp(0, 1))
-            pop(not(0))
-            pop(lt(0, 1))
-            pop(gt(0, 1))
-            pop(slt(0, 1))
-            pop(sgt(0, 1))
-            pop(eq(0, 1))
-            pop(iszero(0))
-            pop(and(0, 1))
-            pop(or(0, 1))
-            pop(xor(0, 1))
-            pop(byte(0, 1))
-            pop(shl(0, 1))
-            pop(shr(0, 1))
-            pop(sar(0, 1))
-            pop(addmod(0, 1, 2))
-            pop(mulmod(0, 1, 2))
-            pop(signextend(0, 1))
-            pop(keccak256(0, 1))
-            pop(0)
-            pop(mload(0))
-            mstore(0, 1)
-            mstore8(0, 1)
-            pop(sload(0))
-            sstore(0, 1)
-            pop(gas())
-            pop(address())
-            pop(balance(0))
-            pop(selfbalance())
-            pop(caller())
-            pop(callvalue())
-            pop(calldataload(0))
-            pop(calldatasize())
-            calldatacopy(0, 1, 2)
-            pop(codesize())
-            codecopy(0, 1, 2)
-            pop(extcodesize(0))
-            extcodecopy(0, 1, 2, 3)
-            pop(returndatasize())
-            returndatacopy(0, 1, 2)
-            pop(extcodehash(0))
-            pop(create(0, 1, 2))
-            pop(create2(0, 1, 2, 3))
-            pop(call(0, 1, 2, 3, 4, 5, 6))
-            pop(callcode(0, 1, 2, 3, 4, 5, 6))
-            pop(delegatecall(0, 1, 2, 3, 4, 5))
-            pop(staticcall(0, 1, 2, 3, 4, 5))
-            return(0, 1)
-            revert(0, 1)
-            selfdestruct(0)
-            invalid()
-            log0(0, 1)
-            log1(0, 1, 2)
-            log2(0, 1, 2, 3)
-            log3(0, 1, 2, 3, 4)
-            log4(0, 1, 2, 3, 4, 5)
-            pop(chainid())
-            pop(basefee())
-            pop(origin())
-            pop(gasprice())
-            pop(blockhash(0))
-            pop(coinbase())
-            pop(timestamp())
-            pop(number())
-            pop(prevrandao())
-            pop(gaslimit())
-
-            // NOTE: msize() is allowed only with optimizer disabled
-            //pop(msize())
-            //pop(pc())
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// Warning 1699: (1754-1766): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// Warning 5740: (89-1716): Unreachable code.
-// Warning 5740: (1729-1741): Unreachable code.
-// Warning 5740: (1754-1769): Unreachable code.
-// Warning 5740: (1782-1791): Unreachable code.
-// Warning 5740: (1804-2215): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol
deleted file mode 100644
index be9f7281f206..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            pop(difficulty())
-        }
-    }
-}
-// ====
-// EVMVersion: <=london
-// ----
-// Warning 2018: (17-103): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
deleted file mode 100644
index 16c75d6f7291..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
+++ /dev/null
@@ -1,89 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            stop()
-            pop(add(0, 1))
-            pop(sub(0, 1))
-            pop(mul(0, 1))
-            pop(div(0, 1))
-            pop(sdiv(0, 1))
-            pop(mod(0, 1))
-            pop(smod(0, 1))
-            pop(exp(0, 1))
-            pop(not(0))
-            pop(lt(0, 1))
-            pop(gt(0, 1))
-            pop(slt(0, 1))
-            pop(sgt(0, 1))
-            pop(eq(0, 1))
-            pop(iszero(0))
-            pop(and(0, 1))
-            pop(or(0, 1))
-            pop(xor(0, 1))
-            pop(byte(0, 1))
-            pop(shl(0, 1))
-            pop(shr(0, 1))
-            pop(sar(0, 1))
-            pop(addmod(0, 1, 2))
-            pop(mulmod(0, 1, 2))
-            pop(signextend(0, 1))
-            pop(keccak256(0, 1))
-            pop(0)
-            pop(mload(0))
-            mstore(0, 1)
-            mstore8(0, 1)
-            //pop(sload(0))
-            //sstore(0, 1)
-            //pop(gas())
-            //pop(address())
-            //pop(balance(0))
-            //pop(selfbalance())
-            //pop(caller())
-            //pop(callvalue())
-            pop(calldataload(0))
-            pop(calldatasize())
-            calldatacopy(0, 1, 2)
-            pop(codesize())
-            codecopy(0, 1, 2)
-            //pop(extcodesize(0))
-            //extcodecopy(0, 1, 2, 3)
-            pop(returndatasize())
-            returndatacopy(0, 1, 2)
-            //pop(extcodehash(0))
-            //pop(create(0, 1, 2))
-            //pop(create2(0, 1, 2, 3))
-            //pop(call(0, 1, 2, 3, 4, 5, 6))
-            //pop(callcode(0, 1, 2, 3, 4, 5, 6))
-            //pop(delegatecall(0, 1, 2, 3, 4, 5))
-            //pop(staticcall(0, 1, 2, 3, 4, 5))
-            return(0, 1)
-            revert(0, 1)
-            //selfdestruct(0)
-            invalid()
-            //log0(0, 1)
-            //log1(0, 1, 2)
-            //log2(0, 1, 2, 3)
-            //log3(0, 1, 2, 3, 4)
-            //log4(0, 1, 2, 3, 4, 5)
-            //pop(chainid())
-            //pop(basefee())
-            //pop(origin())
-            //pop(gasprice())
-            //pop(blockhash(0))
-            //pop(coinbase())
-            //pop(timestamp())
-            //pop(number())
-            //pop(gaslimit())
-
-            // NOTE: msize() is allowed only with optimizer disabled
-            //pop(msize())
-            //pop(pc())
-        }
-    }
-}
-// ====
-// EVMVersion: >=london
-// ----
-// Warning 5740: (94-1755): Unreachable code.
-// Warning 5740: (1768-1780): Unreachable code.
-// Warning 5740: (1823-1832): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
deleted file mode 100644
index 0bb92c1fd2fa..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
+++ /dev/null
@@ -1,91 +0,0 @@
-contract C {
-    function f() public view {
-        assembly {
-            stop()
-            pop(add(0, 1))
-            pop(sub(0, 1))
-            pop(mul(0, 1))
-            pop(div(0, 1))
-            pop(sdiv(0, 1))
-            pop(mod(0, 1))
-            pop(smod(0, 1))
-            pop(exp(0, 1))
-            pop(not(0))
-            pop(lt(0, 1))
-            pop(gt(0, 1))
-            pop(slt(0, 1))
-            pop(sgt(0, 1))
-            pop(eq(0, 1))
-            pop(iszero(0))
-            pop(and(0, 1))
-            pop(or(0, 1))
-            pop(xor(0, 1))
-            pop(byte(0, 1))
-            pop(shl(0, 1))
-            pop(shr(0, 1))
-            pop(sar(0, 1))
-            pop(addmod(0, 1, 2))
-            pop(mulmod(0, 1, 2))
-            pop(signextend(0, 1))
-            pop(keccak256(0, 1))
-            pop(0)
-            pop(mload(0))
-            mstore(0, 1)
-            mstore8(0, 1)
-            pop(sload(0))
-            //sstore(0, 1)
-            pop(gas())
-            pop(address())
-            pop(balance(0))
-            pop(selfbalance())
-            pop(caller())
-            pop(callvalue())
-            pop(calldataload(0))
-            pop(calldatasize())
-            calldatacopy(0, 1, 2)
-            pop(codesize())
-            codecopy(0, 1, 2)
-            pop(extcodesize(0))
-            extcodecopy(0, 1, 2, 3)
-            pop(returndatasize())
-            returndatacopy(0, 1, 2)
-            pop(extcodehash(0))
-            //pop(create(0, 1, 2))
-            //pop(create2(0, 1, 2, 3))
-            //pop(call(0, 1, 2, 3, 4, 5, 6))
-            //pop(callcode(0, 1, 2, 3, 4, 5, 6))
-            //pop(delegatecall(0, 1, 2, 3, 4, 5))
-            pop(staticcall(0, 1, 2, 3, 4, 5))
-            return(0, 1)
-            revert(0, 1)
-            //selfdestruct(0)
-            invalid()
-            //log0(0, 1)
-            //log1(0, 1, 2)
-            //log2(0, 1, 2, 3)
-            //log3(0, 1, 2, 3, 4)
-            //log4(0, 1, 2, 3, 4, 5)
-            pop(chainid())
-            pop(basefee())
-            pop(origin())
-            pop(gasprice())
-            pop(blockhash(0))
-            pop(coinbase())
-            pop(timestamp())
-            pop(number())
-            pop(prevrandao())
-            pop(gaslimit())
-
-            // NOTE: msize() is allowed only with optimizer disabled
-            //pop(msize())
-            //pop(pc())
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// Warning 5740: (94-1733): Unreachable code.
-// Warning 5740: (1746-1758): Unreachable code.
-// Warning 5740: (1801-1810): Unreachable code.
-// Warning 5740: (1978-2244): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol
deleted file mode 100644
index ffc757a19f96..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() public view {
-        assembly {
-            pop(difficulty())
-        }
-    }
-}
-// ====
-// EVMVersion: <=london
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol
deleted file mode 100644
index 992a51ad2a28..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-contract C {
-    function f() public {
-        assembly {
-            datasize(0)
-            dataoffset(0)
-            datacopy(0, 1, 2)
-            setimmutable(0, "x", 1)
-            loadimmutable("x")
-            linkersymbol("x")
-            memoryguard(0)
-            verbatim_1i_1o(hex"600202", 0)
-
-            pop(msize())
-            pop(pc())
-        }
-    }
-}
-// ----
-// SyntaxError 6553: (47-362): The msize instruction cannot be used when the Yul optimizer is activated because it can change its semantics. Either disable the Yul optimizer or do not use the instruction.
-// DeclarationError 4619: (70-78): Function "datasize" not found.
-// DeclarationError 4619: (94-104): Function "dataoffset" not found.
-// DeclarationError 4619: (120-128): Function "datacopy" not found.
-// DeclarationError 4619: (150-162): Function "setimmutable" not found.
-// DeclarationError 4619: (186-199): Function "loadimmutable" not found.
-// DeclarationError 4619: (217-229): Function "linkersymbol" not found.
-// DeclarationError 4619: (247-258): Function "memoryguard" not found.
-// DeclarationError 4619: (274-288): Function "verbatim_1i_1o" not found.
-// SyntaxError 2450: (347-349): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
deleted file mode 100644
index be84b801f2ab..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(sload(0))
-            sstore(0, 1)
-            pop(gas())
-            pop(address())
-            pop(balance(0))
-            pop(caller())
-            pop(callvalue())
-            pop(extcodesize(0))
-            extcodecopy(0, 1, 2, 3)
-            pop(create(0, 1, 2))
-            pop(call(0, 1, 2, 3, 4, 5, 6))
-            pop(callcode(0, 1, 2, 3, 4, 5, 6))
-            pop(delegatecall(0, 1, 2, 3, 4, 5))
-            selfdestruct(0)
-            log0(0, 1)
-            log1(0, 1, 2)
-            log2(0, 1, 2, 3)
-            log3(0, 1, 2, 3, 4)
-            log4(0, 1, 2, 3, 4, 5)
-            pop(origin())
-            pop(gasprice())
-            pop(blockhash(0))
-            pop(coinbase())
-            pop(timestamp())
-            pop(number())
-            pop(gaslimit())
-
-            // These two are disallowed too but the error suppresses other errors.
-            //pop(msize())
-            //pop(pc())
-        }
-    }
-}
-// ----
-// Warning 1699: (498-510): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// Warning 5740: (526-853): Unreachable code.
-// TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (130-135): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (153-162): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (180-190): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (208-216): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (234-245): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (263-277): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (291-314): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (331-346): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (364-389): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (407-436): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (454-484): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (498-513): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (526-536): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (549-562): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (575-591): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (604-623): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (636-658): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (675-683): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (701-711): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (729-741): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (759-769): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (787-798): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (816-824): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (842-852): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol
deleted file mode 100644
index f0320d8b0835..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(staticcall(0, 1, 2, 3, 4, 5))
-        }
-    }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// TypeError 2527: (79-107): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol
deleted file mode 100644
index 30210efc32fa..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(extcodehash(0))
-            pop(create2(0, 1, 2, 3))
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// TypeError 2527: (79-93): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (111-130): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol
deleted file mode 100644
index b4e02248346c..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(selfbalance())
-            pop(chainid())
-        }
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// TypeError 2527: (79-92): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (110-119): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol
deleted file mode 100644
index ba47d44472ed..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(basefee())
-        }
-    }
-}
-// ====
-// EVMVersion: >=london
-// ----
-// TypeError 2527: (79-88): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol
deleted file mode 100644
index e374522a1f69..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(prevrandao())
-        }
-    }
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// TypeError 2527: (79-91): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol
deleted file mode 100644
index e348fd98bec5..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly {
-            pop(difficulty())
-        }
-    }
-}
-// ====
-// EVMVersion: <=london
-// ----
-// TypeError 2527: (79-91): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
deleted file mode 100644
index cd69bed793c8..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-contract C {
-    function f() public view {
-        assembly {
-            sstore(0, 1)
-            pop(create(0, 1, 2))
-            pop(create2(0, 1, 2, 3))
-            pop(call(0, 1, 2, 3, 4, 5, 6))
-            pop(callcode(0, 1, 2, 3, 4, 5, 6))
-            pop(delegatecall(0, 1, 2, 3, 4, 5))
-            selfdestruct(0)
-            log0(0, 1)
-            log1(0, 1, 2)
-            log2(0, 1, 2, 3)
-            log3(0, 1, 2, 3, 4)
-            log4(0, 1, 2, 3, 4, 5)
-
-            // These two are disallowed too but the error suppresses other errors.
-            //pop(msize())
-            //pop(pc())
-        }
-    }
-}
-// ====
-// EVMVersion: >=london
-// ----
-// Warning 1699: (308-320): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// Warning 5740: (336-468): Unreachable code.
-// TypeError 8961: (75-87): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (104-119): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (137-156): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (174-199): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (217-246): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (264-294): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (308-323): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (336-346): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (359-372): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (385-401): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (414-433): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (446-468): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/interface.sol b/test/libsolidity/syntaxTests/viewPureChecker/interface.sol
deleted file mode 100644
index 5f34cafbe0e2..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/interface.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-interface D {
-    function f() view external;
-}
-contract C is D {
-    function f() override view external {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables.sol b/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables.sol
deleted file mode 100644
index 6f613938c773..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-contract C {
-    struct S { uint a; }
-    S s;
-    function f() view public {
-        S storage x = s;
-        x;
-    }
-    function g() view public {
-        S storage x = s;
-        x = s;
-    }
-    function i() public {
-        s.a = 2;
-    }
-    function h() public {
-        S storage x = s;
-        x.a = 2;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
deleted file mode 100644
index 3b9054c41abc..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { uint a; }
-    S s;
-    function f() pure public {
-        S storage x = s;
-        x;
-    }
-    function g() view public {
-        S storage x = s;
-        x.a = 1;
-    }
-}
-// ----
-// TypeError 2527: (100-101): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (184-187): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/mappings.sol b/test/libsolidity/syntaxTests/viewPureChecker/mappings.sol
deleted file mode 100644
index 89cfff234fab..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/mappings.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    mapping(uint => uint) a;
-    function f() view public {
-        a;
-    }
-    function g() view public {
-        a[2];
-    }
-    function h() public {
-        a[2] = 3;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/modifiers.sol b/test/libsolidity/syntaxTests/viewPureChecker/modifiers.sol
deleted file mode 100644
index f8b440f8d837..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/modifiers.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-contract D {
-    uint x;
-    modifier purem(uint) { _; }
-    modifier viewm(uint) { uint a = x; _; a; }
-    modifier nonpayablem(uint) { x = 2; _; }
-}
-contract C is D {
-    function f() purem(0) pure public {}
-    function g() viewm(0) view public {}
-    function h() nonpayablem(0) public {}
-    function i() purem(x) view public {}
-    function j() viewm(x) view public {}
-    function k() nonpayablem(x) public {}
-    function l() purem(x = 2) public {}
-    function m() viewm(x = 2) public {}
-    function n() nonpayablem(x = 2) public {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
deleted file mode 100644
index ad24e1827724..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract D {
-    uint x;
-    modifier viewm(uint) { uint a = x; _; a; }
-    modifier nonpayablem(uint) { x = 2; _; }
-}
-contract C is D {
-    function f() viewm(0) pure public {}
-    function g() nonpayablem(0) view public {}
-}
-// ----
-// TypeError 2527: (154-162): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (195-209): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol b/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol
deleted file mode 100644
index 9803a04b8fd2..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    modifier m(uint _amount, uint _avail) { require(_avail >= _amount); _; }
-    function f() m(1 ether, msg.value) public pure {}
-}
-// ----
-// TypeError 2527: (118-127): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol
deleted file mode 100644
index ad1ee3d4e0bf..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    modifier m(uint _amount, uint _avail) { require(_avail >= _amount); _; }
-    function f() m(1 ether, msg.value) public view {}
-}
-// ----
-// TypeError 5887: (118-127): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol
deleted file mode 100644
index 6ddd708abff7..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-contract D {
-    uint x;
-    function f() public virtual view { x; }
-    function g() public virtual pure {}
-}
-contract C1 is D {
-    function f() public override {}
-    function g() public virtual override view {}
-}
-contract C2 is D {
-    function g() public override {}
-}
-// ----
-// TypeError 6959: (134-165): Overriding function changes state mutability from "view" to "nonpayable".
-// TypeError 6959: (170-214): Overriding function changes state mutability from "pure" to "view".
-// TypeError 6959: (240-271): Overriding function changes state mutability from "pure" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/overriding_no_restrict_warning.sol b/test/libsolidity/syntaxTests/viewPureChecker/overriding_no_restrict_warning.sol
deleted file mode 100644
index 6c41f4051af3..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/overriding_no_restrict_warning.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract D {
-    uint x;
-    function f() virtual public { x = 2; }
-}
-contract C is D {
-    function f() public override {}
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol
deleted file mode 100644
index 849ac0a6291f..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint x;
-    function f() public pure returns (uint) {
-        return x;
-    }
-}
-// ----
-// TypeError 2527: (86-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol
deleted file mode 100644
index 6acb874d16c7..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    struct S { uint x; }
-    S s;
-    function f() pure internal returns (S storage) {
-        return s;
-    }
-    function g() pure public {
-        f().x;
-    }
-}
-// ----
-// TypeError 2527: (115-116): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (163-168): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_no_restrict_warning.sol b/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_no_restrict_warning.sol
deleted file mode 100644
index 382358968367..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_no_restrict_warning.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-contract C {
-    struct S { uint x; }
-    S s;
-    function f() view internal returns (S storage) {
-        return s;
-    }
-    function g() public {
-        f().x = 2;
-    }
-    function h() view public {
-        f();
-        f().x;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/selector.sol b/test/libsolidity/syntaxTests/viewPureChecker/selector.sol
deleted file mode 100644
index b360c7370c1e..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/selector.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    uint public x;
-    function f() payable public {
-    }
-    function g() pure public returns (bytes4) {
-        return this.f.selector ^ this.x.selector;
-    }
-    function h() view public returns (bytes4) {
-        x;
-        return this.f.selector ^ this.x.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol b/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol
deleted file mode 100644
index c071ebadf78c..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f(C c) pure public returns (C) {
-        return c;
-    }
-    function g() pure public returns (bytes4) {
-        // By passing `this`, we read from the state, even if f itself is pure.
-        return f(this).f.selector;
-    }
-}
-// ----
-// TypeError 2527: (228-232): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/selector_complex2.sol b/test/libsolidity/syntaxTests/viewPureChecker/selector_complex2.sol
deleted file mode 100644
index a26c37c29243..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/selector_complex2.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-        function f() payable public returns (C) {
-        return this;
-    }
-    function g() pure public returns (bytes4) {
-        C x = C(address(0x123));
-        return x.f.selector;
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/smoke_test.sol b/test/libsolidity/syntaxTests/viewPureChecker/smoke_test.sol
deleted file mode 100644
index 60c684ae1e84..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/smoke_test.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint x;
-    function g() pure public {}
-    function f() view public returns (uint) { return block.timestamp; }
-    function h() public { x = 2; }
-    function i() payable public { x = 2; }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol
deleted file mode 100644
index f49327a92114..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() external view {}
-	function test(address a) external view returns (bool status) {
-		// This used to incorrectly raise an error about violating the view mutability.
-		(status,) = a.staticcall{gas: 42}("");
-		this.f{gas: 42}();
-	}
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/suggest_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/suggest_pure.sol
deleted file mode 100644
index 5ec6d06fd74b..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/suggest_pure.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-    function g() view public { }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/suggest_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/suggest_view.sol
deleted file mode 100644
index b504fdab4bb4..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/suggest_view.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    function g() public returns (uint) { return x; }
-}
-// ----
-// Warning 2018: (29-77): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol b/test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol
deleted file mode 100644
index eb7ce354dc6e..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-type Int is uint8;
-
-using {add as +} for Int global;
-
-function add(Int, Int) pure returns (Int) {}
-
-function f() pure {
-    Int.wrap(0) + Int.wrap(1);
-}
-
-function g() view {
-    Int.wrap(0) + Int.wrap(1);
-}
-
-function h() {
-    Int.wrap(0) + Int.wrap(1);
-}
-// ----
-// Warning 2018: (154-206): Function state mutability can be restricted to pure
-// Warning 2018: (208-255): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
deleted file mode 100644
index cfb41d32045a..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-contract C {
-	function f(address a) external view returns (bool success) {
-		(success,) = a.call{value: 42}("");
-	}
-	function h() external payable {}
-	function i() external view {
-		this.h{value: 42}();
-	}
-}
-// ----
-// TypeError 8961: (90-111): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (182-201): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/view_pure_abi_encode.sol b/test/libsolidity/syntaxTests/viewPureChecker/view_pure_abi_encode.sol
deleted file mode 100644
index 9e147e6b211b..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/view_pure_abi_encode.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    function f() pure public returns (bytes memory r) {
-        r = abi.encode(1, 2);
-        r = abi.encodePacked(f());
-        r = abi.encodeWithSelector(0x12345678, 1);
-        r = abi.encodeWithSignature("f(uint256)", 4);
-    }
-}
-// ----
-// Warning 5740: (142-237): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/view_pure_abi_encode_arguments.sol b/test/libsolidity/syntaxTests/viewPureChecker/view_pure_abi_encode_arguments.sol
deleted file mode 100644
index e855006c8255..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/view_pure_abi_encode_arguments.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-contract C {
-    uint x;
-    function gView() public view returns (uint) { return x; }
-    function gNonPayable() public returns (uint) { x = 4; return 0; }
-
-    function f1() view public returns (bytes memory) {
-        return abi.encode(gView());
-    }
-    function f2() view public returns (bytes memory) {
-        return abi.encodePacked(gView());
-    }
-    function f3() view public returns (bytes memory) {
-        return abi.encodeWithSelector(0x12345678, gView());
-    }
-    function f4() view public returns (bytes memory) {
-        return abi.encodeWithSignature("f(uint256)", gView());
-    }
-    function g1() public returns (bytes memory) {
-        return abi.encode(gNonPayable());
-    }
-    function g2() public returns (bytes memory) {
-        return abi.encodePacked(gNonPayable());
-    }
-    function g3() public returns (bytes memory) {
-        return abi.encodeWithSelector(0x12345678, gNonPayable());
-    }
-    function g4() public returns (bytes memory) {
-        return abi.encodeWithSignature("f(uint256)", gNonPayable());
-    }
-    // This will generate the only warning.
-    function check() public returns (bytes memory) {
-        return abi.encode(2);
-    }
-}
-// ----
-// Warning 2018: (1100-1184): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
deleted file mode 100644
index c3875f411b9a..000000000000
--- a/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    uint x;
-    function f() view public { x = 2; }
-}
-// ----
-// TypeError 8961: (56-57): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol b/test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol
deleted file mode 100644
index b033fd0c7649..000000000000
--- a/test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library WithModifier {
-    modifier mod() { require(msg.value > 10 ether); _; }
-    function withMod(uint self) mod() internal view { require(self > 0); }
-}
-
-contract Test {
-    using WithModifier for *;
-
-    function f(uint _value) public payable {
-        _value.withMod();
-        WithModifier.withMod(_value);
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/visibility/external_library_function.sol b/test/libsolidity/syntaxTests/visibility/external_library_function.sol
deleted file mode 100644
index 110e74dbd52b..000000000000
--- a/test/libsolidity/syntaxTests/visibility/external_library_function.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-library L {
-    function f(uint) pure external {}
-}
-
-contract C {
-    using L for *;
-
-    function f() public pure {
-        L.f(2);
-        uint x;
-        x.f();
-    }
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol b/test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol
deleted file mode 100644
index 3de9f3ae2398..000000000000
--- a/test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Source: A ====
-uint external a;
-==== Source: B ====
-uint internal a;
-==== Source: C ====
-uint public a;
-==== Source: D ====
-uint private a;
-// ----
-// ParserError 2314: (A:5-13): Expected identifier but got 'external'
-// ParserError 2314: (B:5-13): Expected identifier but got 'internal'
-// ParserError 2314: (C:5-11): Expected identifier but got 'public'
-// ParserError 2314: (D:5-12): Expected identifier but got 'private'
diff --git a/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol b/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol
deleted file mode 100644
index 75efcc964743..000000000000
--- a/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-    function f() pure { }
-}
-// ----
-// SyntaxError 4937: (17-38): No visibility specified. Did you intend to add "public"?
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_default.sol b/test/libsolidity/syntaxTests/visibility/interface/function_default.sol
deleted file mode 100644
index 7800b28a876e..000000000000
--- a/test/libsolidity/syntaxTests/visibility/interface/function_default.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-interface I {
-	function f();
-}
-// ----
-// SyntaxError 4937: (15-28): No visibility specified. Did you intend to add "external"?
-// TypeError 1560: (15-28): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_external.sol b/test/libsolidity/syntaxTests/visibility/interface/function_external.sol
deleted file mode 100644
index ed409e589dca..000000000000
--- a/test/libsolidity/syntaxTests/visibility/interface/function_external.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-interface I {
-	function f() external;
-}
-// ----
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol b/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol
deleted file mode 100644
index c666cb65f1f4..000000000000
--- a/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface I {
-	function f() internal;
-}
-// ----
-// TypeError 1560: (15-37): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_private.sol b/test/libsolidity/syntaxTests/visibility/interface/function_private.sol
deleted file mode 100644
index 0cfebdb4a815..000000000000
--- a/test/libsolidity/syntaxTests/visibility/interface/function_private.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface I {
-	function f() private;
-}
-// ----
-// TypeError 1560: (15-36): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_public.sol b/test/libsolidity/syntaxTests/visibility/interface/function_public.sol
deleted file mode 100644
index bf93473e3564..000000000000
--- a/test/libsolidity/syntaxTests/visibility/interface/function_public.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-interface I {
-	function f() public;
-}
-// ----
-// TypeError 1560: (15-35): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol b/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol
deleted file mode 100644
index 04626df0f73a..000000000000
--- a/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// State of the syntax checker has to be reset after the interface
-// was visited. The suggested visibility for g() should not be external.
-interface I {
-    function f();
-}
-abstract contract C {
-    function g() {}
-}
-// ----
-// SyntaxError 4937: (158-171): No visibility specified. Did you intend to add "external"?
-// SyntaxError 4937: (200-215): No visibility specified. Did you intend to add "public"?
-// TypeError 1560: (158-171): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol b/test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol
deleted file mode 100644
index 4f73e884d905..000000000000
--- a/test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-==== Source: A ====
-contract test {
-    function f(uint external a) public returns (uint) { }
-}
-==== Source: B ====
-contract test {
-    function f(uint internal a) public returns (uint) { }
-}
-==== Source: C ====
-contract test {
-    function f(uint public a) public returns (uint) { }
-}
-==== Source: D ====
-contract test {
-    function f(uint private a) public returns (uint) { }
-}
-==== Source: E ====
-contract test {
-    function f(uint a) public returns (uint external) { }
-}
-==== Source: F ====
-contract test {
-    function f(uint a) public returns (uint internal) { }
-}
-==== Source: G ====
-contract test {
-    function f(uint a) public returns (uint public) { }
-}
-==== Source: H ====
-contract test {
-    function f(uint a) public returns (uint private) { }
-}
-// ----
-// ParserError 2314: (A:36-44): Expected ',' but got 'external'
-// ParserError 2314: (B:36-44): Expected ',' but got 'internal'
-// ParserError 2314: (C:36-42): Expected ',' but got 'public'
-// ParserError 2314: (D:36-43): Expected ',' but got 'private'
-// ParserError 2314: (E:60-68): Expected ',' but got 'external'
-// ParserError 2314: (F:60-68): Expected ',' but got 'internal'
-// ParserError 2314: (G:60-66): Expected ',' but got 'public'
-// ParserError 2314: (H:60-67): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol b/test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol
deleted file mode 100644
index 4fc73dfbe1fe..000000000000
--- a/test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-==== Source: A ====
-contract test {
-    function f(uint a) public {
-        uint public a;
-    }
-}
-==== Source: B ====
-contract test {
-    function f(uint a) public {
-        uint private a;
-    }
-}
-==== Source: C ====
-contract test {
-    function f(uint a) public {
-        uint external a;
-    }
-}
-==== Source: D ====
-contract test {
-    function f(uint a) public {
-        uint internal a;
-    }
-}
-// ----
-// ParserError 2314: (A:61-67): Expected ';' but got 'public'
-// ParserError 2314: (B:61-68): Expected ';' but got 'private'
-// ParserError 2314: (C:61-69): Expected ';' but got 'external'
-// ParserError 2314: (D:61-69): Expected ';' but got 'internal'
diff --git a/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol b/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol
deleted file mode 100644
index bc10e1fdb7cc..000000000000
--- a/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-library L1 {
-    using L1 for *;
-    function f() public pure returns (uint r) { return r.g(); }
-    function g(uint) public pure returns (uint) { return 2; }
-}
-
-library L2 {
-    using L1 for *;
-    function f() public pure returns (uint r) { return r.g(); }
-    function g(uint) public pure returns (uint) { return 2; }
-}
-// ----
-// TypeError 6700: (88-93): Libraries cannot call their own functions externally.
diff --git a/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol b/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol
deleted file mode 100644
index 5f3d6d687643..000000000000
--- a/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-contract C {
-    uint private internal a;
-    uint private public b;
-    uint private private c;
-    uint internal internal e;
-    uint internal public f;
-    uint internal private g;
-    uint public internal h;
-    uint public public i;
-    uint public private j;
-    function f1() private external {}
-    function f2() private internal {}
-    function f3() private public {}
-    function f4() private private {}
-    function f5() external external {}
-    function f6() external internal {}
-    function f7() external public {}
-    function f8() external private {}
-    function f9() internal external {}
-    function f10() internal internal {}
-    function f11() internal public {}
-    function f12() internal private {}
-    function f13() public external {}
-    function f14() public internal {}
-    function f15() public public {}
-    function f16() public private {}
-}
-// ----
-// ParserError 4110: (30-38): Visibility already specified as "private".
-// ParserError 4110: (59-65): Visibility already specified as "private".
-// ParserError 4110: (86-93): Visibility already specified as "private".
-// ParserError 4110: (115-123): Visibility already specified as "internal".
-// ParserError 4110: (145-151): Visibility already specified as "internal".
-// ParserError 4110: (173-180): Visibility already specified as "internal".
-// ParserError 4110: (200-208): Visibility already specified as "public".
-// ParserError 4110: (228-234): Visibility already specified as "public".
-// ParserError 4110: (254-261): Visibility already specified as "public".
-// ParserError 9439: (291-299): Visibility already specified as "private".
-// ParserError 9439: (329-337): Visibility already specified as "private".
-// ParserError 9439: (367-373): Visibility already specified as "private".
-// ParserError 9439: (403-410): Visibility already specified as "private".
-// ParserError 9439: (441-449): Visibility already specified as "external".
-// ParserError 9439: (480-488): Visibility already specified as "external".
-// ParserError 9439: (519-525): Visibility already specified as "external".
-// ParserError 9439: (556-563): Visibility already specified as "external".
-// ParserError 9439: (594-602): Visibility already specified as "internal".
-// ParserError 9439: (634-642): Visibility already specified as "internal".
-// ParserError 9439: (674-680): Visibility already specified as "internal".
-// ParserError 9439: (712-719): Visibility already specified as "internal".
-// ParserError 9439: (749-757): Visibility already specified as "public".
-// ParserError 9439: (787-795): Visibility already specified as "public".
-// ParserError 9439: (825-831): Visibility already specified as "public".
-// ParserError 9439: (861-868): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol b/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol
deleted file mode 100644
index b543e10a4f10..000000000000
--- a/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-==== Source: A ====
-contract C {
-    uint external external x;
-}
-==== Source: B ====
-contract C {
-    uint internal external x;
-}
-==== Source: C ====
-contract C {
-    uint external internal x;
-}
-// ----
-// ParserError 2314: (A:22-30): Expected identifier but got 'external'
-// ParserError 2314: (B:31-39): Expected identifier but got 'external'
-// ParserError 2314: (C:22-30): Expected identifier but got 'external'
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
deleted file mode 100644
index fe519bf5b0d9..000000000000
--- a/test/libsolidity/util/BytesUtils.cpp
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/util/BytesUtils.h>
-#include <test/libsolidity/util/ContractABIUtils.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <algorithm>
-#include <iterator>
-#include <iomanip>
-#include <memory>
-#include <regex>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-
-bytes BytesUtils::alignLeft(bytes _bytes)
-{
-	soltestAssert(_bytes.size() <= 32, "");
-	size_t size = _bytes.size();
-	return std::move(_bytes) + bytes(32 - size, 0);
-}
-
-bytes BytesUtils::alignRight(bytes _bytes)
-{
-	soltestAssert(_bytes.size() <= 32, "");
-	return bytes(32 - _bytes.size(), 0) + std::move(_bytes);
-}
-
-bytes BytesUtils::applyAlign(
-	Parameter::Alignment _alignment,
-	ABIType& _abiType,
-	bytes _bytes
-)
-{
-	if (_alignment != Parameter::Alignment::None)
-		_abiType.alignDeclared = true;
-
-	switch (_alignment)
-	{
-	case Parameter::Alignment::Left:
-		_abiType.align = ABIType::AlignLeft;
-		return alignLeft(std::move(_bytes));
-	case Parameter::Alignment::Right:
-	default:
-		_abiType.align = ABIType::AlignRight;
-		return alignRight(std::move(_bytes));
-	}
-}
-
-bytes BytesUtils::convertBoolean(std::string const& _literal)
-{
-	if (_literal == "true")
-		return bytes{true};
-	else if (_literal == "false")
-		return bytes{false};
-	else
-		BOOST_THROW_EXCEPTION(TestParserError("Boolean literal invalid."));
-}
-
-bytes BytesUtils::convertNumber(std::string const& _literal)
-{
-	try
-	{
-		return toCompactBigEndian(u256{_literal});
-	}
-	catch (std::exception const&)
-	{
-		BOOST_THROW_EXCEPTION(TestParserError("Number encoding invalid."));
-	}
-}
-
-bytes BytesUtils::convertFixedPoint(std::string const& _literal, size_t& o_fractionalDigits)
-{
-	size_t dotPos = _literal.find('.');
-	o_fractionalDigits = dotPos < _literal.size() ? _literal.size() - dotPos : 0;
-	bool negative = !_literal.empty() && _literal.at(0) == '-';
-	// remove decimal point
-	std::string valueInteger = _literal.substr(0, dotPos) + _literal.substr(dotPos + 1);
-	// erase leading zeros to avoid parsing as octal.
-	while (!valueInteger.empty() && (valueInteger.at(0) == '0' || valueInteger.at(0) == '-'))
-		valueInteger.erase(valueInteger.begin());
-	if (valueInteger.empty())
-		valueInteger = "0";
-	try
-	{
-		u256 value(valueInteger);
-		if (negative)
-			value = s2u(-u2s(value));
-		return toBigEndian(value);
-	}
-	catch (std::exception const&)
-	{
-		BOOST_THROW_EXCEPTION(TestParserError("Number encoding invalid."));
-	}
-}
-
-bytes BytesUtils::convertHexNumber(std::string const& _literal)
-{
-	try
-	{
-		return fromHex(_literal);
-	}
-	catch (std::exception const&)
-	{
-		BOOST_THROW_EXCEPTION(TestParserError("Hex number encoding invalid."));
-	}
-}
-
-bytes BytesUtils::convertString(std::string const& _literal)
-{
-	try
-	{
-		return asBytes(_literal);
-	}
-	catch (std::exception const&)
-	{
-		BOOST_THROW_EXCEPTION(TestParserError("String encoding invalid."));
-	}
-}
-
-std::string BytesUtils::formatUnsigned(bytes const& _bytes)
-{
-	std::stringstream os;
-
-	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
-
-	return fromBigEndian<u256>(_bytes).str();
-}
-
-std::string BytesUtils::formatSigned(bytes const& _bytes)
-{
-	std::stringstream os;
-
-	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
-
-	if (*_bytes.begin() & 0x80)
-		os << u2s(fromBigEndian<u256>(_bytes));
-	else
-		os << fromBigEndian<u256>(_bytes);
-
-	return os.str();
-}
-
-std::string BytesUtils::formatBoolean(bytes const& _bytes)
-{
-	std::stringstream os;
-	u256 result = fromBigEndian<u256>(_bytes);
-
-	if (result == 0)
-		os << "false";
-	else if (result == 1)
-		os << "true";
-	else
-		os << result;
-
-	return os.str();
-}
-
-std::string BytesUtils::formatHex(bytes const& _bytes, bool _shorten)
-{
-	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
-	u256 value = fromBigEndian<u256>(_bytes);
-	std::string output = toCompactHexWithPrefix(value);
-
-	if (_shorten)
-		return output.substr(0, output.size() - countRightPaddedZeros(_bytes) * 2);
-	return output;
-}
-
-std::string BytesUtils::formatHexString(bytes const& _bytes)
-{
-	std::stringstream os;
-
-	os << "hex\"" << util::toHex(_bytes) << "\"";
-
-	return os.str();
-}
-
-std::string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
-{
-	std::stringstream os;
-
-	os << "\"";
-	for (size_t i = 0; i < std::min(_cutOff, _bytes.size()); ++i)
-	{
-		auto const v = _bytes[i];
-		switch (v)
-		{
-			case '\0':
-				os << "\\0";
-				break;
-			case '\n':
-				os << "\\n";
-				break;
-			default:
-				if (isPrint(static_cast<char>(v)))
-					os << v;
-				else
-					os << "\\x" << util::toHex(v, HexCase::Lower);
-		}
-	}
-	os << "\"";
-
-	return os.str();
-}
-
-std::string BytesUtils::formatFixedPoint(bytes const& _bytes, bool _signed, size_t _fractionalDigits)
-{
-	std::string decimal;
-	bool negative = false;
-	if (_signed)
-	{
-		s256 signedValue{u2s(fromBigEndian<u256>(_bytes))};
-		negative = (signedValue < 0);
-		decimal = signedValue.str();
-	}
-	else
-		decimal = fromBigEndian<u256>(_bytes).str();
-	if (_fractionalDigits > 0)
-	{
-		size_t numDigits = decimal.length() - (negative ? 1 : 0);
-		if (_fractionalDigits >= numDigits)
-			decimal.insert(negative ? 1 : 0, std::string(_fractionalDigits + 1 - numDigits, '0'));
-		decimal.insert(decimal.length() - _fractionalDigits, ".");
-	}
-	return decimal;
-}
-
-std::string BytesUtils::formatRawBytes(
-	bytes const& _bytes,
-	solidity::frontend::test::ParameterList const& _parameters,
-	std::string _linePrefix
-)
-{
-	std::stringstream os;
-	ParameterList parameters;
-	auto it = _bytes.begin();
-
-	if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
-	{
-		// Interpret all full 32-byte values as integers.
-		parameters = ContractABIUtils::defaultParameters(_bytes.size() / 32);
-
-		// We'd introduce trailing zero bytes if we interpreted the final bit as an integer.
-		// We want a right-aligned sequence of bytes instead.
-		if (_bytes.size() % 32 != 0)
-			parameters.push_back({
-				bytes(),
-				"",
-				ABIType{ABIType::HexString, ABIType::AlignRight, _bytes.size() % 32},
-				FormatInfo{},
-			});
-	}
-	else
-		parameters = _parameters;
-	soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());
-
-	for (auto const& parameter: parameters)
-	{
-		long actualSize = std::min(
-			distance(it, _bytes.end()),
-			static_cast<ParameterList::difference_type>(parameter.abiType.size)
-		);
-		bytes byteRange(parameter.abiType.size, 0);
-		copy(it, it + actualSize, byteRange.begin());
-
-		os << _linePrefix << byteRange;
-		if (&parameter != &parameters.back())
-			os << std::endl;
-
-		it += actualSize;
-	}
-
-	return os.str();
-}
-
-std::string BytesUtils::formatBytes(
-	bytes const& _bytes,
-	ABIType const& _abiType
-)
-{
-	std::stringstream os;
-
-	switch (_abiType.type)
-	{
-	case ABIType::UnsignedDec:
-		// Check if the detected type was wrong and if this could
-		// be signed. If an unsigned was detected in the expectations,
-		// but the actual result returned a signed, it would be formatted
-		// incorrectly.
-		if (*_bytes.begin() & 0x80)
-			os << formatSigned(_bytes);
-		else
-		{
-			std::string decimal(formatUnsigned(_bytes));
-			std::string hexadecimal(formatHex(_bytes));
-			unsigned int value = u256(_bytes).convert_to<unsigned int>();
-			if (value < 0x10)
-				os << decimal;
-			else if (value >= 0x10 && value <= 0xff) {
-				os << hexadecimal;
-			}
-			else
-			{
-				auto entropy = [](std::string const& str) -> double {
-					double result = 0;
-					std::map<char, double> frequencies;
-					for (char c: str)
-						frequencies[c]++;
-					for (auto p: frequencies)
-					{
-						double freq = p.second / double(str.length());
-						result -= freq * (log(freq) / log(2.0));
-					}
-					return result;
-				};
-				if (entropy(decimal) < entropy(hexadecimal.substr(2, hexadecimal.length())))
-					os << decimal;
-				else
-					os << hexadecimal;
-			}
-		}
-		break;
-	case ABIType::SignedDec:
-		os << formatSigned(_bytes);
-		break;
-	case ABIType::Boolean:
-		os << formatBoolean(_bytes);
-		break;
-	case ABIType::Hex:
-		os << formatHex(_bytes, _abiType.alignDeclared);
-		break;
-	case ABIType::HexString:
-		os << formatHexString(_bytes);
-		break;
-	case ABIType::String:
-		os << formatString(_bytes, _bytes.size() - countRightPaddedZeros(_bytes));
-		break;
-	case ABIType::UnsignedFixedPoint:
-	case ABIType::SignedFixedPoint:
-		os << formatFixedPoint(_bytes, _abiType.type == ABIType::SignedFixedPoint, _abiType.fractionalDigits);
-		break;
-	case ABIType::Failure:
-	case ABIType::None:
-		break;
-	}
-
-	if (_abiType.alignDeclared)
-		return (_abiType.align == ABIType::AlignLeft ? "left(" : "right(") + os.str() + ")";
-	return os.str();
-}
-
-std::string BytesUtils::formatBytesRange(
-	bytes _bytes,
-	solidity::frontend::test::ParameterList const& _parameters,
-	bool _highlight
-)
-{
-	std::stringstream os;
-	ParameterList parameters;
-	auto it = _bytes.begin();
-
-	if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
-	{
-		// Interpret all full 32-byte values as integers.
-		parameters = ContractABIUtils::defaultParameters(_bytes.size() / 32);
-
-		// We'd introduce trailing zero bytes if we interpreted the final bit as an integer.
-		// We want a right-aligned sequence of bytes instead.
-		if (_bytes.size() % 32 != 0)
-			parameters.push_back({
-				bytes(),
-				"",
-				ABIType{ABIType::HexString, ABIType::AlignRight, _bytes.size() % 32},
-				FormatInfo{},
-			});
-	}
-	else
-		parameters = _parameters;
-	soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());
-
-	for (auto const& parameter: parameters)
-	{
-		long actualSize = std::min(
-			distance(it, _bytes.end()),
-			static_cast<ParameterList::difference_type>(parameter.abiType.size)
-		);
-		bytes byteRange(parameter.abiType.size, 0);
-		copy(it, it + actualSize, byteRange.begin());
-
-		if (!parameter.matchesBytes(byteRange))
-			AnsiColorized(
-				os,
-				_highlight,
-				{util::formatting::RED_BACKGROUND}
-			) << formatBytes(byteRange, parameter.abiType);
-		else
-			os << parameter.rawString;
-
-		if (&parameter != &parameters.back())
-			os << ", ";
-
-		it += actualSize;
-	}
-
-	return os.str();
-}
-
-size_t BytesUtils::countRightPaddedZeros(bytes const& _bytes)
-{
-	return static_cast<size_t>(find_if(
-		_bytes.rbegin(),
-		_bytes.rend(),
-		[](uint8_t b) { return b != '\0'; }
-	) - _bytes.rbegin());
-}
-
diff --git a/test/libsolidity/util/BytesUtils.h b/test/libsolidity/util/BytesUtils.h
deleted file mode 100644
index a5a020821c42..000000000000
--- a/test/libsolidity/util/BytesUtils.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <test/libsolidity/util/SoltestTypes.h>
-
-#include <libsolutil/CommonData.h>
-
-namespace solidity::frontend::test
-{
-
-/**
- * Utility class that aids conversions from parsed strings to an
- * isoltest-internal, ABI-based bytes representation and vice-versa.
- */
-class BytesUtils
-{
-public:
-	/// Left-aligns and pads given _bytes and returns a new
-	/// bytes array.
-	static bytes alignLeft(bytes _bytes);
-
-	/// Right-aligns and pads given _bytes and returns a new
-	/// bytes array.
-	static bytes alignRight(bytes _bytes);
-
-	/// Applies given _alignment to _bytes and returns a new
-	/// bytes array.
-	/// TODO: Remove abiType reference from parameter list
-	/// and return the new alignment instead.
-	static bytes applyAlign(
-		Parameter::Alignment _alignment,
-		ABIType& _abiType,
-		bytes _bytes
-	);
-
-	/// Tries to convert \param _literal to an unpadded `bytes`
-	/// representation of the boolean number literal. Throws if conversion fails.
-	static bytes convertBoolean(std::string const& _literal);
-
-	/// Tries to convert \param _literal to an unpadded `bytes`
-	/// representation of the decimal number literal. Throws if conversion fails.
-	static bytes convertNumber(std::string const& _literal);
-
-	/// Tries to convert \param _literal to an unpadded `bytes`
-	/// representation of the decimal number literal. Throws if conversion fails.
-	static bytes convertFixedPoint(std::string const& _literal, size_t& o_fractionalDigits);
-
-	/// Tries to convert \param _literal to an unpadded `bytes`
-	/// representation of the hex literal. Throws if conversion fails.
-	static bytes convertHexNumber(std::string const& _literal);
-
-	/// Tries to convert \param _literal to an unpadded `bytes`
-	/// representation of the string literal. Throws if conversion fails.
-	static bytes convertString(std::string const& _literal);
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// string representation of a byte array which is assumed to hold
-	/// an unsigned value.
-	static std::string formatUnsigned(bytes const& _bytes);
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// string representation of a byte array which is assumed to hold
-	/// a signed value.
-	static std::string formatSigned(bytes const& _bytes);
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// string representation of a byte array which is assumed to hold
-	/// a boolean value.
-	static std::string formatBoolean(bytes const& _bytes);
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// string representation of a byte array which is assumed to hold
-	/// a hex value.
-	/// The _shorten flag is used to trim leading and trailing zeros.
-	static std::string formatHex(bytes const& _bytes, bool _shorten = false);
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// string representation of a byte array which is assumed to hold
-	/// a hexString value.
-	static std::string formatHexString(bytes const& _bytes);
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// string representation of a byte array which is assumed to hold
-	/// a string value.
-	static std::string formatString(bytes const& _bytes, size_t _cutOff);
-
-	static std::string formatString(bytes const& _bytes)
-	{
-		return formatString(_bytes, _bytes.size());
-	}
-
-	/// Converts \param _bytes to a soltest-compliant and human-readable
-	/// decimal string representation of a byte array. Format of \param _bytes is binary.
-	static std::string formatFixedPoint(bytes const& _bytes, bool _signed, size_t _fractionalDigits);
-
-	/// Used to print returned bytes from function calls to the commandline.
-	/// Returns a string representation of given _bytes in ranges of 32 bytes.
-	/// If _withSignature is true, the first 4 bytes will be formatted separately.
-	static std::string formatRawBytes(
-		bytes const& _bytes,
-		ParameterList const& _parameters,
-		std::string _linePrefix = ""
-	);
-
-	/// Formats given _bytes with type information passed in _abiType.
-	static std::string formatBytes(bytes const& _bytes, ABIType const& _abiType);
-
-	/// Formats given _bytes with type information passed in _abiTypes.
-	/// Prints obtained result if it does not match the expectation
-	/// and prints the expected result otherwise.
-	/// Highlights parameter only if it does not match.
-	static std::string formatBytesRange(
-		bytes _bytes,
-		ParameterList const& _parameters,
-		bool _highlight
-	);
-
-	/// Count the number of zeros between the last non-zero byte and the end of
-	/// \param _bytes.
-	static size_t countRightPaddedZeros(bytes const& _bytes);
-};
-
-}
diff --git a/test/libsolidity/util/BytesUtilsTests.cpp b/test/libsolidity/util/BytesUtilsTests.cpp
deleted file mode 100644
index f5a15db33871..000000000000
--- a/test/libsolidity/util/BytesUtilsTests.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <boost/test/unit_test.hpp>
-
-#include <test/libsolidity/util/BytesUtils.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity::util;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(BytesUtilsTest)
-
-BOOST_AUTO_TEST_CASE(format_fixed)
-{
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{0}), true, 2),
-		"0.00"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{1}), true, 2),
-		"0.01"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{123}), true, 2),
-		"1.23"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-1}), true, 2),
-		"-0.01"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-12}), true, 2),
-		"-0.12"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-123}), true, 2),
-		"-1.23"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-1234}), true, 2),
-		"-12.34"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-12345}), true, 2),
-		"-123.45"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-123456}), true, 2),
-		"-1234.56"
-	);
-	BOOST_CHECK_EQUAL(
-		BytesUtils::formatFixedPoint(toBigEndian(u256{-1234567}), true, 2),
-		"-12345.67"
-	);
-}
-
-
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/util/Common.cpp b/test/libsolidity/util/Common.cpp
deleted file mode 100644
index 6f96b7f6e5f7..000000000000
--- a/test/libsolidity/util/Common.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/util/Common.h>
-
-#include <regex>
-
-using namespace solidity;
-using namespace solidity::frontend;
-
-std::string test::withPreamble(std::string const& _sourceCode, bool _addAbicoderV1Pragma)
-{
-	static std::string const versionPragma = "pragma solidity >=0.0;\n";
-	static std::string const licenseComment = "// SPDX-License-Identifier: GPL-3.0\n";
-	static std::string const abicoderPragma = "pragma abicoder v1;\n";
-
-	// NOTE: These checks are intentionally loose to match weird cases.
-	// We can manually adjust a test case where this causes problem.
-	bool licenseMissing = _sourceCode.find("SPDX-License-Identifier:") == std::string::npos;
-	bool abicoderMissing =
-		_sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos &&
-		_sourceCode.find("pragma abicoder") == std::string::npos;
-
-	return
-		versionPragma +
-		(licenseMissing ? licenseComment : "") +
-		(abicoderMissing && _addAbicoderV1Pragma ? abicoderPragma : "") +
-		_sourceCode;
-}
-
-StringMap test::withPreamble(StringMap _sources, bool _addAbicoderV1Pragma)
-{
-	for (auto&& [sourceName, source]: _sources)
-		source = withPreamble(source, _addAbicoderV1Pragma);
-
-	return _sources;
-}
-
-std::string test::stripPreReleaseWarning(std::string const& _stderrContent)
-{
-	static std::regex const preReleaseWarningRegex{
-		R"(Warning( \(3805\))?: This is a pre-release compiler version, please do not use it in production\.\n)"
-		R"((\n)?)"
-	};
-	static std::regex const noOutputRegex{
-		R"(Compiler run successful, no output requested\.\n)"
-	};
-
-	std::string output = std::regex_replace(_stderrContent, preReleaseWarningRegex, "");
-	return std::regex_replace(std::move(output), noOutputRegex, "");
-}
diff --git a/test/libsolidity/util/Common.h b/test/libsolidity/util/Common.h
deleted file mode 100644
index 3f1750a66b56..000000000000
--- a/test/libsolidity/util/Common.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Utilities shared by multiple libsolidity tests.
-
-#include <libsolidity/interface/CompilerStack.h>
-
-#include <string>
-
-namespace solidity::frontend::test
-{
-
-/// @returns @p _sourceCode prefixed with the version pragma and the SPDX license identifier.
-/// Can optionally also insert an abicoder pragma when missing.
-std::string withPreamble(std::string const& _sourceCode, bool _addAbicoderV1Pragma = false);
-
-/// @returns a copy of @p _sources with preamble prepended to all sources.
-StringMap withPreamble(StringMap _sources, bool _addAbicoderV1Pragma = false);
-
-std::string stripPreReleaseWarning(std::string const& _stderrContent);
-
-} // namespace solidity::frontend::test
diff --git a/test/libsolidity/util/ContractABIUtils.cpp b/test/libsolidity/util/ContractABIUtils.cpp
deleted file mode 100644
index 641c9107d69b..000000000000
--- a/test/libsolidity/util/ContractABIUtils.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libsolidity/util/ContractABIUtils.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolidity/ast/Types.h>
-#include <libsolidity/ast/TypeProvider.h>
-#include <libsolutil/FunctionSelector.h>
-#include <libsolutil/CommonData.h>
-
-#include <liblangutil/Common.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/assign/list_of.hpp>
-#include <range/v3/view/zip.hpp>
-
-#include <fstream>
-#include <memory>
-#include <numeric>
-#include <regex>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend::test;
-
-namespace
-{
-
-using ParameterList = solidity::frontend::test::ParameterList;
-
-size_t arraySize(std::string const& _arrayType)
-{
-	auto leftBrack = _arrayType.find("[");
-	auto rightBrack = _arrayType.rfind("]");
-
-	soltestAssert(
-		leftBrack != std::string::npos &&
-		rightBrack != std::string::npos &&
-		rightBrack == _arrayType.size() - 1 &&
-		leftBrack < rightBrack,
-		""
-	);
-
-	std::string size = _arrayType.substr(leftBrack + 1, rightBrack - leftBrack - 1);
-
-	return static_cast<size_t>(stoi(size));
-}
-
-bool isBool(std::string const& _type)
-{
-	return _type == "bool";
-}
-
-bool isUint(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"uint\\d*"});
-}
-
-bool isInt(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"int\\d*"});
-}
-
-bool isFixedBytes(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"bytes\\d+"});
-}
-
-bool isBytes(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"\\bbytes\\b"});
-}
-
-bool isString(std::string const& _type)
-{
-	return _type == "string";
-}
-
-bool isFixedBoolArray(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"bool\\[\\d+\\]"});
-}
-
-bool isFixedUintArray(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"uint\\d*\\[\\d+\\]"});
-}
-
-bool isFixedIntArray(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"int\\d*\\[\\d+\\]"});
-}
-
-bool isFixedStringArray(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"string\\[\\d+\\]"});
-}
-
-bool isTuple(std::string const& _type)
-{
-	return _type == "tuple";
-}
-
-bool isFixedTupleArray(std::string const& _type)
-{
-	return regex_match(_type, std::regex{"tuple\\[\\d+\\]"});
-}
-
-std::optional<ABIType> isFixedPoint(std::string const& type)
-{
-	std::optional<ABIType> fixedPointType;
-	std::smatch matches;
-	if (regex_match(type, matches, std::regex{"(u?)fixed(\\d+)x(\\d+)"}))
-	{
-		ABIType abiType(ABIType::SignedFixedPoint);
-		if (matches[1].str() == "u")
-			abiType.type = ABIType::UnsignedFixedPoint;
-		abiType.fractionalDigits = static_cast<unsigned>(std::stoi(matches[3].str()));
-		fixedPointType = abiType;
-	}
-	return fixedPointType;
-}
-
-std::string functionSignatureFromABI(Json::Value const& _functionABI)
-{
-	auto inputs = _functionABI["inputs"];
-	std::string signature = {_functionABI["name"].asString() + "("};
-	size_t parameterCount = 0;
-
-	for (auto const& input: inputs)
-	{
-		parameterCount++;
-		signature += input["type"].asString();
-		if (parameterCount < inputs.size())
-			signature += ",";
-	}
-
-	return signature + ")";
-}
-
-}
-
-std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::parametersFromJsonOutputs(
-	ErrorReporter& _errorReporter,
-	Json::Value const& _contractABI,
-	std::string const& _functionSignature
-)
-{
-	if (!_contractABI)
-		return std::nullopt;
-
-	for (auto const& function: _contractABI)
-		if (_functionSignature == functionSignatureFromABI(function))
-		{
-			ParameterList inplaceTypeParams;
-			ParameterList dynamicTypeParams;
-			ParameterList finalParams;
-
-			for (auto const& output: function["outputs"])
-			{
-				std::string type = output["type"].asString();
-
-				ABITypes inplaceTypes;
-				ABITypes dynamicTypes;
-
-				if (appendTypesFromName(output, inplaceTypes, dynamicTypes))
-				{
-					for (auto const& type: inplaceTypes)
-						inplaceTypeParams.push_back(Parameter{bytes(), "", type, FormatInfo{}});
-					for (auto const& type: dynamicTypes)
-						dynamicTypeParams.push_back(Parameter{bytes(), "", type, FormatInfo{}});
-				}
-				else
-				{
-					_errorReporter.warning(
-						"Could not convert \"" + type +
-						"\" to internal ABI type representation. Falling back to default encoding."
-					);
-					return std::nullopt;
-				}
-
-				finalParams += inplaceTypeParams;
-
-				inplaceTypeParams.clear();
-			}
-			return std::optional<ParameterList>(finalParams + dynamicTypeParams);
-		}
-
-	return std::nullopt;
-}
-
-bool ContractABIUtils::appendTypesFromName(
-	Json::Value const& _functionOutput,
-	ABITypes& _inplaceTypes,
-	ABITypes& _dynamicTypes,
-	bool _isCompoundType
-)
-{
-	std::string type = _functionOutput["type"].asString();
-	if (isBool(type))
-		_inplaceTypes.push_back(ABIType{ABIType::Boolean});
-	else if (isUint(type))
-		_inplaceTypes.push_back(ABIType{ABIType::UnsignedDec});
-	else if (isInt(type))
-		_inplaceTypes.push_back(ABIType{ABIType::SignedDec});
-	else if (isFixedBytes(type))
-		_inplaceTypes.push_back(ABIType{ABIType::Hex});
-	else if (isString(type))
-	{
-		_inplaceTypes.push_back(ABIType{ABIType::Hex});
-
-		if (_isCompoundType)
-			_dynamicTypes.push_back(ABIType{ABIType::Hex});
-
-		_dynamicTypes.push_back(ABIType{ABIType::UnsignedDec});
-		_dynamicTypes.push_back(ABIType{ABIType::String, ABIType::AlignLeft});
-	}
-	else if (isTuple(type))
-	{
-		ABITypes inplaceTypes;
-		ABITypes dynamicTypes;
-
-		for (auto const& component: _functionOutput["components"])
-			appendTypesFromName(component, inplaceTypes, dynamicTypes, true);
-		_dynamicTypes += inplaceTypes + dynamicTypes;
-	}
-	else if (isFixedBoolArray(type))
-		_inplaceTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::Boolean});
-	else if (isFixedUintArray(type))
-		_inplaceTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::UnsignedDec});
-	else if (isFixedIntArray(type))
-		_inplaceTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::SignedDec});
-	else if (isFixedStringArray(type))
-	{
-		_inplaceTypes.push_back(ABIType{ABIType::Hex});
-
-		_dynamicTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::Hex});
-
-		for (size_t i = 0; i < arraySize(type); i++)
-		{
-			_dynamicTypes.push_back(ABIType{ABIType::UnsignedDec});
-			_dynamicTypes.push_back(ABIType{ABIType::String, ABIType::AlignLeft});
-		}
-	}
-	else if (std::optional<ABIType> fixedPointType = isFixedPoint(type))
-		_inplaceTypes.push_back(*fixedPointType);
-	else if (isBytes(type))
-		return false;
-	else if (isFixedTupleArray(type))
-		return false;
-	else
-		return false;
-
-	return true;
-}
-
-void ContractABIUtils::overwriteParameters(
-	ErrorReporter& _errorReporter,
-	solidity::frontend::test::ParameterList& _targetParameters,
-	solidity::frontend::test::ParameterList const& _sourceParameters
-)
-{
-	using namespace std::placeholders;
-	for (auto&& [source, target]: ranges::views::zip(_sourceParameters, _targetParameters))
-		if (
-				source.abiType.size != target.abiType.size ||
-				source.abiType.type != target.abiType.type ||
-				source.abiType.fractionalDigits != target.abiType.fractionalDigits
-			)
-			{
-				_errorReporter.warning("Type or size of parameter(s) does not match.");
-				target = source;
-			}
-}
-
-solidity::frontend::test::ParameterList ContractABIUtils::preferredParameters(
-	ErrorReporter& _errorReporter,
-	solidity::frontend::test::ParameterList const& _targetParameters,
-	solidity::frontend::test::ParameterList const& _sourceParameters,
-	bytes const& _bytes
-)
-{
-	if (_targetParameters.size() != _sourceParameters.size())
-	{
-		_errorReporter.warning(
-			"Encoding does not match byte range. The call returned " +
-			std::to_string(_bytes.size()) + " bytes, but " +
-			std::to_string(encodingSize(_targetParameters)) + " bytes were expected."
-		);
-		return _sourceParameters;
-	}
-	else
-		return _targetParameters;
-}
-
-solidity::frontend::test::ParameterList ContractABIUtils::defaultParameters(size_t count)
-{
-	ParameterList parameters;
-
-	fill_n(
-		back_inserter(parameters),
-		count,
-		Parameter{bytes(), "", ABIType{ABIType::UnsignedDec}, FormatInfo{}}
-	);
-
-	return parameters;
-}
-
-solidity::frontend::test::ParameterList ContractABIUtils::failureParameters(bytes const& _bytes)
-{
-	if (_bytes.empty())
-		return {};
-	else if (_bytes.size() < 4)
-		return {Parameter{bytes(), "", ABIType{ABIType::HexString, ABIType::AlignNone, _bytes.size()}, FormatInfo{}}};
-	else
-	{
-		ParameterList parameters;
-		parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::HexString, ABIType::AlignNone, 4}, FormatInfo{}});
-
-		uint64_t selector = fromBigEndian<uint64_t>(bytes{_bytes.begin(), _bytes.begin() + 4});
-		if (selector == selectorFromSignatureU32("Panic(uint256)"))
-			parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}});
-		else if (selector == selectorFromSignatureU32("Error(string)"))
-		{
-			parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}});
-			parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::UnsignedDec}, FormatInfo{}});
-			/// If _bytes contains at least a 1 byte message (function selector + tail pointer + message length + message)
-			/// append an additional string parameter to represent that message.
-			if (_bytes.size() > 68)
-				parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::String}, FormatInfo{}});
-		}
-		else
-			for (size_t i = 4; i < _bytes.size(); i += 32)
-				parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::HexString, ABIType::AlignNone, 32}, FormatInfo{}});
-		return parameters;
-	}
-}
-
-size_t ContractABIUtils::encodingSize(
-	solidity::frontend::test::ParameterList const& _parameters
-)
-{
-	auto sizeFold = [](size_t const _a, Parameter const& _b) { return _a + _b.abiType.size; };
-
-	return accumulate(_parameters.begin(), _parameters.end(), size_t{0}, sizeFold);
-}
diff --git a/test/libsolidity/util/ContractABIUtils.h b/test/libsolidity/util/ContractABIUtils.h
deleted file mode 100644
index 209eca4232ba..000000000000
--- a/test/libsolidity/util/ContractABIUtils.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <test/libsolidity/util/SoltestTypes.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <json/json.h>
-
-namespace solidity::frontend::test
-{
-
-using ABITypes = std::vector<ABIType>;
-
-/**
- * Utility class that aids conversions from contract ABI types stored in a
- * Json value to the internal ABIType representation of isoltest.
- */
-class ContractABIUtils
-{
-public:
-	/// Parses and translates Solidity's ABI types as Json string into
-	/// a list of internal type representations of isoltest.
-	/// Creates parameters from Contract ABI and is used to generate values for
-	/// auto-correction during interactive update routine.
-	static std::optional<ParameterList> parametersFromJsonOutputs(
-		ErrorReporter& _errorReporter,
-		Json::Value const& _contractABI,
-		std::string const& _functionSignature
-	);
-
-	/// Overwrites _targetParameters if ABI types or sizes given
-	/// by _sourceParameters do not match.
-	static void overwriteParameters(
-		ErrorReporter& _errorReporter,
-		ParameterList& _targetParameters,
-		ParameterList const& _sourceParameters
-	);
-
-	/// If parameter count does not match, take types defined _sourceParameters
-	/// and create a warning if so.
-	static ParameterList preferredParameters(
-		ErrorReporter& _errorReporter,
-		ParameterList const& _targetParameters,
-		ParameterList const& _sourceParameters,
-		bytes const& _bytes
-	);
-
-	/// Returns a list of parameters corresponding to the encoding of
-	/// returned values in case of a failure. Creates an additional parameter
-	/// for the error message if _bytes is larger than 68 bytes
-	/// (function_selector + tail_ptr + message_length).
-	static ParameterList failureParameters(bytes const& _bytes);
-
-	/// Returns _count parameters with their type set to ABIType::UnsignedDec
-	/// and their size set to 32 bytes.
-	static ParameterList defaultParameters(size_t count = 0);
-
-	/// Calculates the encoding size of given _parameters based
-	/// on the size of their types.
-	static size_t encodingSize(ParameterList const& _paremeters);
-
-private:
-	/// Parses and translates a single type and returns a list of
-	/// internal type representations of isoltest.
-	/// Types defined by the ABI will translate to ABITypes
-	/// as follows:
-	/// `bool` -> [`Boolean`]
-	/// `uint` -> [`Unsigned`]
-	/// `string` -> [`Unsigned`, `Unsigned`, `String`]
-	/// `bytes` -> [`Unsigned`, `Unsigned`, `HexString`]
-	/// ...
-	static bool appendTypesFromName(
-		Json::Value const& _functionOutput,
-		ABITypes& _inplaceTypes,
-		ABITypes& _dynamicTypes,
-		bool _isCompoundType = false
-	);
-};
-
-}
diff --git a/test/libsolidity/util/SoltestErrors.h b/test/libsolidity/util/SoltestErrors.h
deleted file mode 100644
index 849a8b34e18c..000000000000
--- a/test/libsolidity/util/SoltestErrors.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/Assertions.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Exceptions.h>
-
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/facilities/overload.hpp>
-
-namespace solidity::frontend::test
-{
-
-struct InternalSoltestError: virtual util::Exception {};
-
-#if !BOOST_PP_VARIADICS_MSVC
-#define soltestAssert(...) BOOST_PP_OVERLOAD(soltestAssert_,__VA_ARGS__)(__VA_ARGS__)
-#else
-#define soltestAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(soltestAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
-#endif
-
-#define soltestAssert_1(CONDITION) \
-	soltestAssert_2((CONDITION), "")
-
-#define soltestAssert_2(CONDITION, DESCRIPTION) \
-	assertThrowWithDefaultDescription( \
-		(CONDITION), \
-		::solidity::frontend::test::InternalSoltestError, \
-		(DESCRIPTION), \
-		"Soltest assertion failed" \
-	)
-
-class TestParserError: virtual public util::Exception
-{
-public:
-	explicit TestParserError(std::string const& _description)
-	{
-		*this << util::errinfo_comment(_description);
-	}
-};
-
-/**
- * Representation of a notice, warning or error that can occur while
- * formatting and therefore updating an interactive function call test.
- */
-struct FormatError
-{
-	enum Type
-	{
-		Notice,
-		Warning,
-		Error
-	};
-
-	explicit FormatError(Type _type, std::string _message):
-		type(_type),
-		message(std::move(_message))
-	{}
-
-	Type type;
-	std::string message;
-};
-using FormatErrors = std::vector<FormatError>;
-
-/**
- * Utility class that collects notices, warnings and errors and is able
- * to format them for ANSI colorized output during the interactive update
- * process in isoltest.
- * Its purpose is to help users of isoltest to automatically
- * update test files and always keep track of what is happening.
- */
-class ErrorReporter
-{
-public:
-	explicit ErrorReporter() {}
-
-	/// Adds a new FormatError of type Notice with the given message.
-	void notice(std::string _notice)
-	{
-		m_errors.push_back(FormatError{FormatError::Notice, std::move(_notice)});
-	}
-
-	/// Adds a new FormatError of type Warning with the given message.
-	void warning(std::string _warning)
-	{
-		m_errors.push_back(FormatError{FormatError::Warning, std::move(_warning)});
-	}
-
-	/// Adds a new FormatError of type Error with the given message.
-	void error(std::string _error)
-	{
-		m_errors.push_back(FormatError{FormatError::Error, std::move(_error)});
-	}
-
-	/// Prints all errors depending on their type using ANSI colorized output.
-	/// It will be used to print notices, warnings and errors during the
-	/// interactive update process.
-	std::string format(std::string const& _linePrefix, bool _formatted)
-	{
-		std::stringstream os;
-		for (auto const& error: m_errors)
-		{
-			switch (error.type)
-			{
-			case FormatError::Notice:
-
-				break;
-			case FormatError::Warning:
-				util::AnsiColorized(
-					os,
-					_formatted,
-					{util::formatting::YELLOW}
-				) << _linePrefix << "Warning: " << error.message << std::endl;
-				break;
-			case FormatError::Error:
-				util::AnsiColorized(
-					os,
-					_formatted,
-					{util::formatting::RED}
-				) << _linePrefix << "Error: " << error.message << std::endl;
-				break;
-			}
-		}
-		return os.str();
-	}
-
-private:
-	FormatErrors m_errors;
-};
-
-}
diff --git a/test/libsolidity/util/SoltestTypes.h b/test/libsolidity/util/SoltestTypes.h
deleted file mode 100644
index b5b746e325e5..000000000000
--- a/test/libsolidity/util/SoltestTypes.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/CommonData.h>
-
-#include <test/ExecutionFramework.h>
-
-#include <utility>
-
-namespace solidity::frontend::test
-{
-
-/**
- * All soltest tokens.
- */
-#define SOLT_TOKEN_LIST(T, K)          \
-	T(Unknown, "unknown", 0)           \
-	T(Invalid, "invalid", 0)           \
-	T(EOS, "EOS", 0)                   \
-	T(Whitespace, "_", 0)              \
-	/* punctuations */                 \
-	T(LParen, "(", 0)                  \
-	T(RParen, ")", 0)                  \
-	T(LBrack, "[", 0)                  \
-	T(RBrack, "]", 0)                  \
-	T(LBrace, "{", 0)                  \
-	T(RBrace, "}", 0)                  \
-	T(Sub,    "-", 0)                  \
-	T(Tilde,  "~", 0)                  \
-	T(Colon,  ":", 0)                  \
-	T(Comma,  ",", 0)                  \
-	T(Period, ".", 0)                  \
-	T(Arrow, "->", 0)                  \
-	T(Newline, "//", 0)                \
-	/* Literals & identifier */        \
-	T(Comment, "#", 0)                 \
-	T(Number, "number", 0)             \
-	T(HexNumber, "hex_number", 0)      \
-	T(String, "string", 0)             \
-	T(Identifier, "identifier", 0)     \
-	/* type keywords */                \
-	K(Ether, "ether", 0)               \
-	K(Wei, "wei", 0)                   \
-	K(Hex, "hex", 0)                   \
-	K(Boolean, "boolean", 0)           \
-	/* special keywords */             \
-	K(Left, "left", 0)                 \
-	K(Library, "library", 0)           \
-	K(Right, "right", 0)               \
-	K(Failure, "FAILURE", 0)           \
-	K(Gas, "gas", 0)                   \
-
-namespace soltest
-{
-	enum class Token : unsigned int {
-	#define T(name, string, precedence) name,
-		SOLT_TOKEN_LIST(T, T)
-		NUM_TOKENS
-	#undef T
-	};
-
-	/// Prints a friendly string representation of \param _token.
-	inline std::string formatToken(Token _token)
-	{
-		switch (_token)
-		{
-	#define T(name, string, precedence) case Token::name: return string;
-			SOLT_TOKEN_LIST(T, T)
-	#undef T
-			default: // Token::NUM_TOKENS:
-				return "";
-		}
-	}
-}
-
-/**
- * The purpose of the ABI type is the storage of type information
- * retrieved while parsing a test. This information is used
- * for the conversion of human-readable function arguments and
- * return values to `bytes` and vice-versa.
- * Defaults to None, a 0-byte representation. 0-bytes
- * can also be interpreted as Failure, which means
- * either a REVERT or another EVM failure.
- */
-struct ABIType
-{
-	enum Type
-	{
-		None,
-		Failure,
-		Boolean,
-		UnsignedDec,
-		SignedDec,
-		Hex,
-		HexString,
-		String,
-		UnsignedFixedPoint,
-		SignedFixedPoint
-	};
-	enum Align
-	{
-		AlignLeft,
-		AlignRight,
-		AlignNone,
-	};
-
-	explicit ABIType(
-		Type _type,
-		Align _align = ABIType::AlignRight,
-		size_t _size = 32
-	): type(_type), align(_align), size(_size) {}
-
-	Type type = ABIType::None;
-	Align align = ABIType::AlignRight;
-	size_t size = 32;
-
-	size_t fractionalDigits = 0;
-
-	bool alignDeclared = false;
-};
-
-/**
- * Helper that can hold format information retrieved
- * while scanning through a parameter list in soltest.
- */
-struct FormatInfo
-{
-	bool newline = false;
-};
-
-/**
- * Parameter abstraction used for the encoding and decoding of
- * function parameter and expectation / return value lists.
- * A parameter list is usually a comma-separated list of literals.
- * It should not be possible to create a parameter holding
- * an identifier, but if so, the ABI type would be invalid.
- */
-struct Parameter
-{
-	enum Alignment
-	{
-		Left,
-		Right,
-		None,
-	};
-
-	/// ABI encoded / decoded `bytes` of values.
-	/// These `bytes` are used to pass values to function calls
-	/// and also to store expected return vales. These are
-	/// compared to the actual result of a function call
-	/// and used for validating it.
-	bytes rawBytes;
-	/// Stores the raw string representation of this parameter.
-	/// Used to print the unformatted arguments of a function call.
-	std::string rawString;
-	/// Types that were used to encode `rawBytes`. Expectations
-	/// are usually comma separated literals. Their type is auto-
-	/// detected and retained in order to format them later on.
-	ABIType abiType = ABIType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	/// Format info attached to the parameter. It handles newlines given
-	/// in the declaration of it.
-	FormatInfo format;
-	/// Stores the parsed alignment, which can be either left(...) or right(...).
-	Alignment alignment = Alignment::None;
-	/// Compares _bytes to the bytes stored in this object.
-	bool matchesBytes(bytes const& _bytes) const
-	{
-		return rawBytes == _bytes;
-	}
-};
-using ParameterList = std::vector<Parameter>;
-
-struct FunctionCall;
-
-/**
- * Represents the expected result of a function call after it has been executed. This may be a single
- * return value or a comma-separated list of return values. It also contains the detected input
- * formats used to convert the values to `bytes` needed for the comparison with the actual result
- * of a call. In addition to that, it also stores the expected transaction status.
- * An optional comment can be assigned.
- */
-struct FunctionCallExpectations
-{
-	/// Representation of the comma-separated (or empty) list of expected result values
-	/// attached to the function call object. It is checked against the actual result of
-	/// a function call when used in test framework.
-	ParameterList result;
-	/// Expected status of the transaction. It can be either
-	/// a REVERT or a different EVM failure (e.g. out-of-gas).
-	bool failure = true;
-	/// A Comment that can be attached to the expectations,
-	/// that is retained and can be displayed.
-	std::string comment;
-
-	/// ABI encoded `bytes` of parsed expected return values. It is checked
-	/// against the actual result of a function call when used in test framework.
-	bytes rawBytes() const
-	{
-		bytes raw;
-		for (auto const& param: result)
-			raw += param.rawBytes;
-		return raw;
-	}
-	/// Gas used by function call
-	/// Should have values for Yul, YulOptimized, Legacy and LegacyOptimized
-	std::map<std::string, u256> gasUsed;
-};
-
-/**
- * Represents the arguments passed to a function call. This can be a single
- * argument or a comma-separated list of arguments. It also contains the detected input
- * formats used to convert the arguments to `bytes` needed for the call.
- * An optional comment can be assigned.
- */
-struct FunctionCallArgs
-{
-	/// Types that were used to encode `rawBytes`. Parameters
-	/// are usually comma separated literals. Their type is auto-
-	/// detected and retained in order to format them later on.
-	ParameterList parameters;
-	/// A Comment that can be attached to the expectations,
-	/// that is retained and can be displayed.
-	std::string comment;
-	/// ABI encoded `bytes` of parsed parameters. These `bytes`
-	/// passed to the function call.
-	bytes rawBytes() const
-	{
-		bytes raw;
-		for (auto const& param: parameters)
-			raw += param.rawBytes;
-		return raw;
-	}
-};
-
-/// Units that can be used to express function value
-enum class FunctionValueUnit
-{
-	Wei,
-	Ether
-};
-
-/// Holds value along with unit it was expressed in originally.
-/// @a value is always in wei - it is converted back when stringifying again.
-struct FunctionValue
-{
-	u256 value;
-	FunctionValueUnit unit = FunctionValueUnit::Wei;
-};
-
-/**
- * Represents a function call read from an input stream. It contains the signature, the
- * arguments, an optional ether value and an expected execution result.
- */
-struct FunctionCall
-{
-	/// Signature of the function call, e.g. `f(uint256, uint256)`.
-	/// For a library deployment, this contains the library name.
-	std::string signature;
-	/// Optional value that can be sent with the call.
-	/// Value is expressed in wei, smallest unit of ether
-	/// Value has a field unit which represents denomination on which value was expressed originally
-	FunctionValue value;
-	/// Object that holds all function parameters in their `bytes`
-	/// representations given by the contract ABI.
-	FunctionCallArgs arguments;
-	/// Object that holds all function call expectation in
-	/// their `bytes` representations given by the contract ABI.
-	/// They are checked against the actual results and their
-	/// `bytes` representation, as well as the transaction status.
-	FunctionCallExpectations expectations;
-	/// single / multi-line mode will be detected as follows:
-	/// every newline (//) in source results in a function call
-	/// that has its display mode set to multi-mode. Function and
-	/// result parameter lists are an exception: a single parameter
-	/// stores a format information that contains a newline definition.
-	enum DisplayMode {
-		SingleLine,
-		MultiLine
-	};
-	DisplayMode displayMode = DisplayMode::SingleLine;
-
-	enum class Kind {
-		Regular,
-		/// Marks this function call as the constructor.
-		Constructor,
-		/// If this function call's signature has no name and no arguments,
-		/// a low-level call with unstructured calldata will be issued.
-		LowLevel,
-		/// Marks a library deployment call.
-		Library,
-		/// Call to a builtin.
-		/// Builtins get registered in `SemanticTest::initializeBuiltins()`.
-		Builtin
-	};
-	Kind kind = Kind::Regular;
-	/// Marks this function call as "short-handed", meaning
-	/// no `->` declared.
-	bool omitsArrow = true;
-	/// A textual representation of the expected side-effect of the function call.
-	std::vector<std::string> expectedSideEffects{};
-	/// A textual representation of the actual side-effect of the function call.
-	std::vector<std::string> actualSideEffects{};
-	/// File name of the library. Always empty, unless this is a library deployment call.
-	std::string libraryFile{};
-};
-
-using Builtin = std::function<std::optional<bytes>(FunctionCall const&)>;
-using SideEffectHook = std::function<std::vector<std::string>(FunctionCall const&)>;
-
-struct LogRecord
-{
-	util::h160 creator;
-	bytes data;
-	std::vector<util::h256> topics;
-
-	LogRecord(util::h160 _creator, bytes _data, std::vector<util::h256> _topics):
-		creator(std::move(_creator)), data(std::move(_data)), topics(std::move(_topics)) {}
-
-	bool operator==(LogRecord const& other) const noexcept
-	{
-		return creator == other.creator && data == other.data && topics == other.topics;
-	}
-
-	bool operator!=(LogRecord const& other) const noexcept
-	{
-		return !operator==(other);
-	}
-};
-
-}
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
deleted file mode 100644
index 3fba998a07bf..000000000000
--- a/test/libsolidity/util/TestFileParser.cpp
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-
-#include <libsolutil/StringUtils.h>
-
-#include <test/libsolidity/util/TestFileParser.h>
-
-#include <test/libsolidity/util/BytesUtils.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-#include <test/Common.h>
-
-#include <liblangutil/Common.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/throw_exception.hpp>
-
-#include <fstream>
-#include <memory>
-#include <optional>
-#include <stdexcept>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-
-using Token = soltest::Token;
-
-char TestFileParser::Scanner::peek() const noexcept
-{
-	if (std::distance(m_char, m_source.end()) < 2)
-		return '\0';
-
-	auto next = m_char;
-	std::advance(next, 1);
-	return *next;
-}
-
-std::vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCalls(size_t _lineOffset)
-{
-	std::vector<FunctionCall> calls;
-	if (!accept(Token::EOS))
-	{
-		soltestAssert(m_scanner.currentToken() == Token::Unknown, "");
-		m_scanner.scanNextToken();
-
-		while (!accept(Token::EOS))
-		{
-			if (!accept(Token::Whitespace))
-			{
-				/// If this is not the first call in the test,
-				/// the last call to parseParameter could have eaten the
-				/// new line already. This could only be fixed with a one
-				/// token lookahead that checks parseParameter
-				/// if the next token is an identifier.
-				if (calls.empty())
-					expect(Token::Newline);
-				else
-					if (accept(Token::Newline, true))
-						m_lineNumber++;
-
-				try
-				{
-					if (accept(Token::Gas, true))
-					{
-						if (calls.empty())
-							BOOST_THROW_EXCEPTION(TestParserError("Expected function call before gas usage filter."));
-
-						std::string runType = m_scanner.currentLiteral();
-						if (std::set<std::string>{"ir", "irOptimized", "legacy", "legacyOptimized"}.count(runType) > 0)
-						{
-							m_scanner.scanNextToken();
-							expect(Token::Colon);
-							if (calls.back().expectations.gasUsed.count(runType) > 0)
-								throw TestParserError("Gas usage expectation set multiple times.");
-							calls.back().expectations.gasUsed[runType] = u256(parseDecimalNumber());
-						}
-						else
-							BOOST_THROW_EXCEPTION(TestParserError(
-								"Expected \"ir\", \"irOptimized\", \"legacy\", or \"legacyOptimized\"."
-							));
-					}
-					else
-					{
-						FunctionCall call;
-						if (accept(Token::Library, true))
-						{
-							expect(Token::Colon);
-							std::string libraryName;
-							if (accept(Token::String))
-							{
-								call.libraryFile = m_scanner.currentLiteral();
-								expect(Token::String);
-								expect(Token::Colon);
-								libraryName += m_scanner.currentLiteral();
-								expect(Token::Identifier);
-							}
-							else if (accept(Token::Colon, true))
-							{
-								libraryName = m_scanner.currentLiteral();
-								expect(Token::Identifier);
-							}
-							else
-							{
-								libraryName = m_scanner.currentLiteral();
-								expect(Token::Identifier);
-							}
-							call.signature = libraryName;
-							call.kind = FunctionCall::Kind::Library;
-							call.expectations.failure = false;
-						}
-						else
-						{
-							bool lowLevelCall = false;
-							tie(call.signature, lowLevelCall) = parseFunctionSignature();
-							if (lowLevelCall)
-								call.kind = FunctionCall::Kind::LowLevel;
-							else if (isBuiltinFunction(call.signature))
-								call.kind = FunctionCall::Kind::Builtin;
-
-							if (accept(Token::Comma, true))
-								call.value = parseFunctionCallValue();
-
-							if (accept(Token::Colon, true))
-								call.arguments = parseFunctionCallArguments();
-
-							if (accept(Token::Newline, true))
-							{
-								call.displayMode = FunctionCall::DisplayMode::MultiLine;
-								m_lineNumber++;
-							}
-
-							call.arguments.comment = parseComment();
-
-							if (accept(Token::Newline, true))
-							{
-								call.displayMode = FunctionCall::DisplayMode::MultiLine;
-								m_lineNumber++;
-							}
-
-							if (accept(Token::Arrow, true))
-							{
-								call.omitsArrow = false;
-								call.expectations = parseFunctionCallExpectations();
-								if (accept(Token::Newline, true))
-									m_lineNumber++;
-							}
-							else
-							{
-								call.expectations.failure = false;
-								call.displayMode = FunctionCall::DisplayMode::SingleLine;
-							}
-
-							call.expectations.comment = parseComment();
-
-							if (call.signature == "constructor()")
-								call.kind = FunctionCall::Kind::Constructor;
-						}
-
-						accept(Token::Newline, true);
-						call.expectedSideEffects = parseFunctionCallSideEffects();
-
-						calls.emplace_back(std::move(call));
-					}
-				}
-				catch (TestParserError const& _e)
-				{
-					BOOST_THROW_EXCEPTION(
-						TestParserError("Line " + std::to_string(_lineOffset + m_lineNumber) + ": " + _e.what())
-					);
-				}
-			}
-		}
-	}
-	return calls;
-}
-
-std::vector<std::string> TestFileParser::parseFunctionCallSideEffects()
-{
-	std::vector<std::string> result;
-	while (accept(Token::Tilde, false))
-	{
-		std::string effect = m_scanner.currentLiteral();
-		result.emplace_back(effect);
-		soltestAssert(m_scanner.currentToken() == Token::Tilde, "");
-		m_scanner.scanNextToken();
-		if (m_scanner.currentToken() == Token::Newline)
-			m_scanner.scanNextToken();
-	}
-
-	return result;
-}
-
-bool TestFileParser::accept(Token _token, bool const _expect)
-{
-	if (m_scanner.currentToken() != _token)
-		return false;
-	if (_expect)
-		return expect(_token);
-	return true;
-}
-
-bool TestFileParser::expect(Token _token, bool const _advance)
-{
-	if (m_scanner.currentToken() != _token || m_scanner.currentToken() == Token::Invalid)
-		BOOST_THROW_EXCEPTION(TestParserError(
-			"Unexpected " + formatToken(m_scanner.currentToken()) + ": \"" +
-			m_scanner.currentLiteral() + "\". " +
-			"Expected \"" + formatToken(_token) + "\"."
-			)
-		);
-	if (_advance)
-		m_scanner.scanNextToken();
-	return true;
-}
-
-std::pair<std::string, bool> TestFileParser::parseFunctionSignature()
-{
-	std::string signature;
-	bool hasName = false;
-
-	if (accept(Token::Identifier, false))
-	{
-		hasName = true;
-		signature = m_scanner.currentLiteral();
-		expect(Token::Identifier);
-	}
-
-	if (isBuiltinFunction(signature) && m_scanner.currentToken() != Token::LParen)
-		return {signature, false};
-
-	signature += formatToken(Token::LParen);
-	expect(Token::LParen);
-
-	std::string parameters;
-	if (!accept(Token::RParen, false))
-		parameters = parseIdentifierOrTuple();
-
-	while (accept(Token::Comma))
-	{
-		parameters += formatToken(Token::Comma);
-		expect(Token::Comma);
-		parameters += parseIdentifierOrTuple();
-	}
-	if (accept(Token::Arrow, true))
-		BOOST_THROW_EXCEPTION(TestParserError("Invalid signature detected: " + signature));
-
-	if (!hasName && !parameters.empty())
-		BOOST_THROW_EXCEPTION(TestParserError("Signatures without a name cannot have parameters: " + signature));
-	else
-		signature += parameters;
-
-	expect(Token::RParen);
-	signature += formatToken(Token::RParen);
-
-	return {signature, !hasName};
-}
-
-FunctionValue TestFileParser::parseFunctionCallValue()
-{
-	try
-	{
-		u256 value{ parseDecimalNumber() };
-		Token token = m_scanner.currentToken();
-		if (token != Token::Ether && token != Token::Wei)
-			BOOST_THROW_EXCEPTION(TestParserError("Invalid value unit provided. Coins can be wei or ether."));
-
-		m_scanner.scanNextToken();
-
-		FunctionValueUnit unit = token == Token::Wei ? FunctionValueUnit::Wei : FunctionValueUnit::Ether;
-		return { (unit == FunctionValueUnit::Wei ? u256(1) : exp256(u256(10), u256(18))) * value, unit };
-	}
-	catch (std::exception const&)
-	{
-		BOOST_THROW_EXCEPTION(TestParserError("Ether value encoding invalid."));
-	}
-}
-
-FunctionCallArgs TestFileParser::parseFunctionCallArguments()
-{
-	FunctionCallArgs arguments;
-
-	auto param = parseParameter();
-	if (param.abiType.type == ABIType::None)
-		BOOST_THROW_EXCEPTION(TestParserError("No argument provided."));
-	arguments.parameters.emplace_back(param);
-
-	while (accept(Token::Comma, true))
-		arguments.parameters.emplace_back(parseParameter());
-	return arguments;
-}
-
-FunctionCallExpectations TestFileParser::parseFunctionCallExpectations()
-{
-	FunctionCallExpectations expectations;
-
-	auto param = parseParameter();
-	if (param.abiType.type == ABIType::None)
-	{
-		expectations.failure = false;
-		return expectations;
-	}
-	expectations.result.emplace_back(param);
-
-	while (accept(Token::Comma, true))
-		expectations.result.emplace_back(parseParameter());
-
-	/// We have always one virtual parameter in the parameter list.
-	/// If its type is FAILURE, the expected result is also a REVERT etc.
-	if (expectations.result.at(0).abiType.type != ABIType::Failure)
-		expectations.failure = false;
-	return expectations;
-}
-
-Parameter TestFileParser::parseParameter()
-{
-	Parameter parameter;
-	if (accept(Token::Newline, true))
-	{
-		parameter.format.newline = true;
-		m_lineNumber++;
-	}
-	parameter.abiType = ABIType{ABIType::None, ABIType::AlignNone, 0};
-
-	bool isSigned = false;
-	if (accept(Token::Left, true))
-	{
-		parameter.rawString += formatToken(Token::Left);
-		expect(Token::LParen);
-		parameter.rawString += formatToken(Token::LParen);
-		parameter.alignment = Parameter::Alignment::Left;
-	}
-	if (accept(Token::Right, true))
-	{
-		parameter.rawString += formatToken(Token::Right);
-		expect(Token::LParen);
-		parameter.rawString += formatToken(Token::LParen);
-		parameter.alignment = Parameter::Alignment::Right;
-	}
-
-	if (accept(Token::Sub, true))
-	{
-		parameter.rawString += formatToken(Token::Sub);
-		isSigned = true;
-	}
-	if (accept(Token::Boolean))
-	{
-		if (isSigned)
-			BOOST_THROW_EXCEPTION(TestParserError("Invalid boolean literal."));
-
-		parameter.abiType = ABIType{ABIType::Boolean, ABIType::AlignRight, 32};
-		std::string parsed = parseBoolean();
-		parameter.rawString += parsed;
-		parameter.rawBytes = BytesUtils::applyAlign(
-			parameter.alignment,
-			parameter.abiType,
-			BytesUtils::convertBoolean(parsed)
-		);
-	}
-	else if (accept(Token::HexNumber))
-	{
-		if (isSigned)
-			BOOST_THROW_EXCEPTION(TestParserError("Invalid hex number literal."));
-
-		parameter.abiType = ABIType{ABIType::Hex, ABIType::AlignRight, 32};
-		std::string parsed = parseHexNumber();
-		parameter.rawString += parsed;
-		parameter.rawBytes = BytesUtils::applyAlign(
-			parameter.alignment,
-			parameter.abiType,
-			BytesUtils::convertHexNumber(parsed)
-		);
-	}
-	else if (accept(Token::Hex, true))
-	{
-		if (isSigned)
-			BOOST_THROW_EXCEPTION(TestParserError("Invalid hex string literal."));
-		if (parameter.alignment != Parameter::Alignment::None)
-			BOOST_THROW_EXCEPTION(TestParserError("Hex string literals cannot be aligned or padded."));
-
-		std::string parsed = parseString();
-		parameter.rawString += "hex\"" + parsed + "\"";
-		parameter.rawBytes = BytesUtils::convertHexNumber(parsed);
-		parameter.abiType = ABIType{
-			ABIType::HexString, ABIType::AlignNone, parameter.rawBytes.size()
-		};
-	}
-	else if (accept(Token::String))
-	{
-		if (isSigned)
-			BOOST_THROW_EXCEPTION(TestParserError("Invalid string literal."));
-		if (parameter.alignment != Parameter::Alignment::None)
-			BOOST_THROW_EXCEPTION(TestParserError("String literals cannot be aligned or padded."));
-
-		std::string parsed = parseString();
-		parameter.abiType = ABIType{ABIType::String, ABIType::AlignLeft, parsed.size()};
-		parameter.rawString += "\"" + parsed + "\"";
-		parameter.rawBytes = BytesUtils::applyAlign(
-			Parameter::Alignment::Left,
-			parameter.abiType,
-			BytesUtils::convertString(parsed)
-		);
-	}
-	else if (accept(Token::Number))
-	{
-		auto type = isSigned ? ABIType::SignedDec : ABIType::UnsignedDec;
-
-		parameter.abiType = ABIType{type, ABIType::AlignRight, 32};
-		std::string parsed = parseDecimalNumber();
-		parameter.rawString += parsed;
-		if (isSigned)
-			parsed = "-" + parsed;
-
-		if (parsed.find('.') == std::string::npos)
-			parameter.rawBytes = BytesUtils::applyAlign(
-				parameter.alignment,
-				parameter.abiType,
-				BytesUtils::convertNumber(parsed)
-			);
-		else
-		{
-			parameter.abiType.type = isSigned ? ABIType::SignedFixedPoint : ABIType::UnsignedFixedPoint;
-			parameter.rawBytes = BytesUtils::convertFixedPoint(parsed, parameter.abiType.fractionalDigits);
-		}
-	}
-	else if (accept(Token::Failure, true))
-	{
-		if (isSigned)
-			BOOST_THROW_EXCEPTION(TestParserError("Invalid failure literal."));
-
-		parameter.abiType = ABIType{ABIType::Failure, ABIType::AlignRight, 0};
-		parameter.rawBytes = bytes{};
-	}
-	if (parameter.alignment != Parameter::Alignment::None)
-	{
-		expect(Token::RParen);
-		parameter.rawString += formatToken(Token::RParen);
-	}
-
-	return parameter;
-}
-
-std::string TestFileParser::parseIdentifierOrTuple()
-{
-	std::string identOrTuple;
-
-	auto parseArrayDimensions = [&]()
-	{
-		while (accept(Token::LBrack))
-		{
-			identOrTuple += formatToken(Token::LBrack);
-			expect(Token::LBrack);
-			if (accept(Token::Number))
-				identOrTuple += parseDecimalNumber();
-			identOrTuple += formatToken(Token::RBrack);
-			expect(Token::RBrack);
-		}
-	};
-
-	if (accept(Token::Identifier))
-	{
-		identOrTuple = m_scanner.currentLiteral();
-		expect(Token::Identifier);
-		parseArrayDimensions();
-		return identOrTuple;
-	}
-	expect(Token::LParen);
-	identOrTuple += formatToken(Token::LParen);
-	identOrTuple += parseIdentifierOrTuple();
-
-	while (accept(Token::Comma))
-	{
-		identOrTuple += formatToken(Token::Comma);
-		expect(Token::Comma);
-		identOrTuple += parseIdentifierOrTuple();
-	}
-	expect(Token::RParen);
-	identOrTuple += formatToken(Token::RParen);
-
-	parseArrayDimensions();
-	return identOrTuple;
-}
-
-std::string TestFileParser::parseBoolean()
-{
-	std::string literal = m_scanner.currentLiteral();
-	expect(Token::Boolean);
-	return literal;
-}
-
-std::string TestFileParser::parseComment()
-{
-	std::string comment = m_scanner.currentLiteral();
-	if (accept(Token::Comment, true))
-		return comment;
-	return std::string{};
-}
-
-std::string TestFileParser::parseDecimalNumber()
-{
-	std::string literal = m_scanner.currentLiteral();
-	expect(Token::Number);
-	return literal;
-}
-
-std::string TestFileParser::parseHexNumber()
-{
-	std::string literal = m_scanner.currentLiteral();
-	expect(Token::HexNumber);
-	return literal;
-}
-
-std::string TestFileParser::parseString()
-{
-	std::string literal = m_scanner.currentLiteral();
-	expect(Token::String);
-	return literal;
-}
-
-void TestFileParser::Scanner::readStream(std::istream& _stream)
-{
-	std::string line;
-	// TODO: std::getline(..) removes newlines '\n', if present. This could be improved.
-	while (std::getline(_stream, line))
-		m_source += line;
-	m_char = m_source.begin();
-}
-
-void TestFileParser::Scanner::scanNextToken()
-{
-	// Make code coverage happy.
-	soltestAssert(formatToken(Token::NUM_TOKENS).empty(), "");
-
-	auto detectKeyword = [](std::string const& _literal = "") -> std::pair<Token, std::string> {
-		if (_literal == "true") return {Token::Boolean, "true"};
-		if (_literal == "false") return {Token::Boolean, "false"};
-		if (_literal == "ether") return {Token::Ether, ""};
-		if (_literal == "wei") return {Token::Wei, ""};
-		if (_literal == "left") return {Token::Left, ""};
-		if (_literal == "library") return {Token::Library, ""};
-		if (_literal == "right") return {Token::Right, ""};
-		if (_literal == "hex") return {Token::Hex, ""};
-		if (_literal == "FAILURE") return {Token::Failure, ""};
-		if (_literal == "gas") return {Token::Gas, ""};
-		return {Token::Identifier, _literal};
-	};
-
-	auto selectToken = [this](Token _token, std::string const& _literal = "") {
-		advance();
-		m_currentToken = _token;
-		m_currentLiteral = _literal;
-	};
-
-	m_currentToken = Token::Unknown;
-	m_currentLiteral = "";
-	do
-	{
-		switch(current())
-		{
-		case '/':
-			advance();
-			if (current() == '/')
-				selectToken(Token::Newline);
-			else
-				selectToken(Token::Invalid);
-			break;
-		case '-':
-			if (peek() == '>')
-			{
-				advance();
-				selectToken(Token::Arrow);
-			}
-			else
-				selectToken(Token::Sub);
-			break;
-		case '~':
-			advance();
-			selectToken(Token::Tilde, readLine());
-			break;
-		case ':':
-			selectToken(Token::Colon);
-			break;
-		case '#':
-			selectToken(Token::Comment, scanComment());
-			break;
-		case ',':
-			selectToken(Token::Comma);
-			break;
-		case '(':
-			selectToken(Token::LParen);
-			break;
-		case ')':
-			selectToken(Token::RParen);
-			break;
-		case '[':
-			selectToken(Token::LBrack);
-			break;
-		case ']':
-			selectToken(Token::RBrack);
-			break;
-		case '\"':
-			selectToken(Token::String, scanString());
-			break;
-		default:
-			if (langutil::isIdentifierStart(current()))
-			{
-				std::tie(m_currentToken, m_currentLiteral) = detectKeyword(scanIdentifierOrKeyword());
-				advance();
-			}
-			else if (langutil::isDecimalDigit(current()))
-			{
-				if (current() == '0' && peek() == 'x')
-				{
-					advance();
-					advance();
-					selectToken(Token::HexNumber, "0x" + scanHexNumber());
-				}
-				else
-					selectToken(Token::Number, scanDecimalNumber());
-			}
-			else if (langutil::isWhiteSpace(current()))
-				selectToken(Token::Whitespace);
-			else if (isEndOfFile())
-			{
-				m_currentToken = Token::EOS;
-				m_currentLiteral = "";
-			}
-			else
-				BOOST_THROW_EXCEPTION(TestParserError("Unexpected character: '" + std::string{current()} + "'"));
-			break;
-		}
-	}
-	while (m_currentToken == Token::Whitespace);
-}
-
-std::string TestFileParser::Scanner::readLine()
-{
-	std::string line;
-	// Right now the scanner discards all (real) new-lines '\n' in TestFileParser::Scanner::readStream(..).
-	// Token::NewLine is defined as `//`, and NOT '\n'. We are just searching here for the next `/`.
-	// Note that `/` anywhere else than at the beginning of a line is currently forbidden (TODO: until we fix newline handling).
-	// Once the end of the file would be reached (or beyond), peek() will return '\0'.
-	while (peek() != '\0' && peek() != '/')
-	{
-		advance();
-		line += current();
-	}
-	return line;
-}
-
-std::string TestFileParser::Scanner::scanComment()
-{
-	std::string comment;
-	advance();
-
-	while (current() != '#')
-	{
-		comment += current();
-		advance();
-	}
-	return comment;
-}
-
-std::string TestFileParser::Scanner::scanIdentifierOrKeyword()
-{
-	std::string identifier;
-	identifier += current();
-	while (langutil::isIdentifierPart(peek()))
-	{
-		advance();
-		identifier += current();
-	}
-	return identifier;
-}
-
-std::string TestFileParser::Scanner::scanDecimalNumber()
-{
-	std::string number;
-	number += current();
-	while (langutil::isDecimalDigit(peek()) || '.' == peek())
-	{
-		advance();
-		number += current();
-	}
-	return number;
-}
-
-std::string TestFileParser::Scanner::scanHexNumber()
-{
-	std::string number;
-	number += current();
-	while (langutil::isHexDigit(peek()))
-	{
-		advance();
-		number += current();
-	}
-	return number;
-}
-
-std::string TestFileParser::Scanner::scanString()
-{
-	std::string str;
-	advance();
-
-	while (current() != '\"')
-	{
-		if (current() == '\\')
-		{
-			advance();
-			switch (current())
-			{
-				case '\\':
-					str += current();
-					advance();
-					break;
-				case 'n':
-					str += '\n';
-					advance();
-					break;
-				case 'r':
-					str += '\r';
-					advance();
-					break;
-				case 't':
-					str += '\t';
-					advance();
-					break;
-				case '0':
-					str += '\0';
-					advance();
-					break;
-				case 'x':
-					str += scanHexPart();
-					break;
-				default:
-					BOOST_THROW_EXCEPTION(TestParserError("Invalid or escape sequence found in string literal."));
-			}
-		}
-		else
-		{
-			str += current();
-			advance();
-		}
-	}
-	return str;
-}
-
-// TODO: use fromHex() from CommonData
-char TestFileParser::Scanner::scanHexPart()
-{
-	auto toLower = [](char _c) -> char { return tolower(_c, std::locale::classic()); };
-
-	advance(); // skip 'x'
-
-	int value{};
-	if (isDigit(current()))
-		value = current() - '0';
-	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
-		value = toLower(current()) - 'a' + 10;
-	else
-		BOOST_THROW_EXCEPTION(TestParserError("\\x used with no following hex digits."));
-
-	advance();
-	if (current() == '"')
-		return static_cast<char>(value);
-
-	value <<= 4;
-	if (isDigit(current()))
-		value |= current() - '0';
-	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
-		value |= toLower(current()) - 'a' + 10;
-
-	advance();
-
-	return static_cast<char>(value);
-}
-
-bool TestFileParser::isBuiltinFunction(std::string const& _signature)
-{
-	return m_builtins.count(_signature) > 0;
-}
diff --git a/test/libsolidity/util/TestFileParser.h b/test/libsolidity/util/TestFileParser.h
deleted file mode 100644
index 80281126c6e0..000000000000
--- a/test/libsolidity/util/TestFileParser.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/CommonData.h>
-#include <test/libsolidity/util/SoltestTypes.h>
-
-#include <iosfwd>
-#include <iterator>
-#include <numeric>
-#include <stdexcept>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::frontend::test
-{
-
-/**
- * Class that is able to parse an additional and well-formed comment section in a Solidity
- * source file used by the file-based unit test environment. For now, it parses function
- * calls and their expected result after the call was made.
- *
- * - Function calls defined in blocks:
- * // f(uint256, uint256): 1, 1 # Signature and comma-separated list of arguments #
- * // -> 1, 1                   # Expected result value #
- * // g(), 2 ether              # (Optional) Ether to be send with the call #
- * // g(), 1 wei                # (Optional) Wei to be sent with the call #
- * // -> 2, 3
- * // h(uint256), 1 ether: 42
- * // -> FAILURE                # If REVERT or other EVM failure was detected #
- * // ()                        # Call fallback function #
- * // (), 1 ether               # Call receive ether function #
- * // EMPTY_STORAGE             # Check that storage is empty
- * ...
- */
-class TestFileParser
-{
-public:
-	/// Constructor that takes an input stream \param _stream to operate on
-	/// and creates the internal scanner.
-	explicit TestFileParser(std::istream& _stream, std::map<std::string, Builtin> const& _builtins):
-		m_scanner(_stream),
-		m_builtins(_builtins)
-	{}
-
-	/// Parses function calls blockwise and returns a list of function calls found.
-	/// Throws an exception if a function call cannot be parsed because of its
-	/// incorrect structure, an invalid or unsupported encoding
-	/// of its arguments or expected results.
-	/// Passes the source line offset, such that parsing errors can be enhanced
-	/// with a line number it occurred in.
-	std::vector<FunctionCall> parseFunctionCalls(std::size_t _lineOffset);
-
-private:
-	/**
-	 * Token scanner that is used internally to abstract away character traversal.
-	 */
-	class Scanner
-	{
-	public:
-		/// Constructor that takes an input stream \param _stream to operate on.
-		/// It reads all lines into one single line, keeping the newlines.
-		Scanner(std::istream& _stream) { readStream(_stream); }
-
-		/// Reads input stream into a single line and resets the current iterator.
-		void readStream(std::istream& _stream);
-
-		/// Reads character stream and creates token.
-		void scanNextToken();
-
-		soltest::Token currentToken() { return m_currentToken; }
-		std::string currentLiteral() { return m_currentLiteral; }
-
-		std::string scanComment();
-		std::string scanIdentifierOrKeyword();
-		std::string scanDecimalNumber();
-		std::string scanHexNumber();
-		std::string scanString();
-		std::string readLine();
-		char scanHexPart();
-
-	private:
-		/// Advances current position in the input stream.
-		void advance(unsigned n = 1)
-		{
-			solAssert(m_char != m_source.end(), "Cannot advance beyond end.");
-			m_char = std::next(m_char, static_cast<int>(n));
-		}
-
-		/// Returns the current character or '\0' if at end of input.
-		char current() const noexcept
-		{
-			if (m_char == m_source.end())
-				return '\0';
-
-			return *m_char;
-		}
-
-		/// Retrieves the next character ('\0' if that would be at (or beyond) the end of input)
-		/// without advancing the input stream iterator.
-		char peek() const noexcept;
-
-		/// Returns true if the end of the file is reached, false otherwise.
-		bool isEndOfFile() const { return m_char == m_source.end(); }
-
-		std::string m_source;
-		std::string::const_iterator m_char;
-
-		std::string m_currentLiteral;
-		soltest::Token m_currentToken = soltest::Token::Unknown;
-	};
-
-	bool accept(soltest::Token _token, bool const _expect = false);
-	bool expect(soltest::Token _token, bool const _advance = true);
-
-	/// Parses a function call signature in the form of `f(uint256, ...)` and
-	/// returns the signature and a flag that indicates if the function name was
-	/// empty. If so, the signature is not allowed to define any parameters.
-	std::pair<std::string, bool> parseFunctionSignature();
-
-	/// Parses the optional ether value that can be passed alongside the
-	/// function call arguments. Throws an InvalidEtherValueEncoding exception
-	/// if given value cannot be converted to `u256`.
-	FunctionValue parseFunctionCallValue();
-
-	/// Parses a comma-separated list of arguments passed with a function call.
-	/// Does not check for a potential mismatch between the signature and the number
-	/// or types of arguments.
-	FunctionCallArgs parseFunctionCallArguments();
-
-	/// Parses the expected result of a function call execution.
-	FunctionCallExpectations parseFunctionCallExpectations();
-
-	/// Parses the next parameter in a comma separated list.
-	/// Takes a newly parsed, and type-annotated `bytes` argument,
-	/// appends it to the internal `bytes` buffer of the parameter. It can also
-	/// store newlines found in the source, that are needed to
-	/// format input and output of the interactive update.
-	///  Parses and converts the current literal to its byte representation and
-	/// preserves the chosen ABI type, as well as a raw, unformatted string representation
-	/// of this literal.
-	/// Based on the type information retrieved, the driver of this parser may format arguments,
-	/// expectations and results. Supported types:
-	/// - unsigned and signed decimal number literals.
-	/// Returns invalid ABI type for empty literal. This is needed in order
-	/// to detect empty expectations. Throws a ParserError if data is encoded incorrectly or
-	/// if data type is not supported.
-	Parameter parseParameter();
-
-	/// Recursively parses an identifier or a tuple definition that contains identifiers
-	/// and / or parentheses like `((uint, uint), (uint, (uint, uint)), uint)`.
-	std::string parseIdentifierOrTuple();
-
-	/// Parses a boolean literal.
-	std::string parseBoolean();
-
-	/// Parses a comment that is defined like this:
-	/// # A nice comment. #
-	std::string parseComment();
-
-	/// Parses the current decimal number literal.
-	std::string parseDecimalNumber();
-
-	/// Parses the current hex number literal.
-	std::string parseHexNumber();
-
-	/// Parses the current string literal.
-	std::string parseString();
-
-	/// Parses the expected side effects of a function call execution.
-	std::vector<std::string> parseFunctionCallSideEffects();
-
-	/// Checks whether a builtin function with the given signature exist.
-	/// @returns true, if builtin found, false otherwise
-	bool isBuiltinFunction(std::string const& _signature);
-
-	/// A scanner instance
-	Scanner m_scanner;
-
-	/// The current line number. Incremented when Token::Newline (//) is found and
-	/// used to enhance parser error messages.
-	size_t m_lineNumber = 0;
-
-	std::map<std::string, Builtin> const& m_builtins;
-};
-
-}
diff --git a/test/libsolidity/util/TestFileParserTests.cpp b/test/libsolidity/util/TestFileParserTests.cpp
deleted file mode 100644
index 59934fdb25cc..000000000000
--- a/test/libsolidity/util/TestFileParserTests.cpp
+++ /dev/null
@@ -1,1068 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for Solidity's test expectation parser.
- */
-
-#include <functional>
-#include <string>
-#include <tuple>
-#include <boost/test/unit_test.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <liblangutil/Exceptions.h>
-#include <test/ExecutionFramework.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-#include <test/libsolidity/util/TestFileParser.h>
-
-using namespace solidity::util;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-using fmt = ExecutionFramework;
-using Mode = FunctionCall::DisplayMode;
-
-namespace
-{
-
-std::vector<FunctionCall> parse(std::string const& _source, std::map<std::string, Builtin> const& _builtins = {})
-{
-	std::istringstream stream{_source, std::ios_base::out};
-	return TestFileParser{stream, _builtins}.parseFunctionCalls(0);
-}
-
-void testFunctionCall(
-		FunctionCall const& _call,
-		FunctionCall::DisplayMode _mode,
-		std::string _signature = "",
-		bool _failure = true,
-		bytes _arguments = bytes{},
-		bytes _expectations = bytes{},
-		FunctionValue _value = { 0 },
-		std::string _argumentComment = "",
-		std::string _expectationComment = "",
-		std::vector<std::string> _rawArguments = std::vector<std::string>{},
-		bool _isConstructor = false,
-		bool _isLibrary = false
-)
-{
-	BOOST_REQUIRE_EQUAL(_call.expectations.failure, _failure);
-	BOOST_REQUIRE_EQUAL(_call.signature, _signature);
-	ABI_CHECK(_call.arguments.rawBytes(), _arguments);
-	ABI_CHECK(_call.expectations.rawBytes(), _expectations);
-	BOOST_REQUIRE_EQUAL(_call.displayMode, _mode);
-	BOOST_REQUIRE_EQUAL(_call.value.value, _value.value);
-	BOOST_REQUIRE_EQUAL(static_cast<size_t>(_call.value.unit), static_cast<size_t>(_value.unit));
-	BOOST_REQUIRE_EQUAL(_call.arguments.comment, _argumentComment);
-	BOOST_REQUIRE_EQUAL(_call.expectations.comment, _expectationComment);
-
-	if (!_rawArguments.empty())
-	{
-		BOOST_REQUIRE_EQUAL(_call.arguments.parameters.size(), _rawArguments.size());
-		size_t index = 0;
-		for (Parameter const& param: _call.arguments.parameters)
-		{
-			BOOST_REQUIRE_EQUAL(param.rawString, _rawArguments[index]);
-			++index;
-		}
-	}
-
-	BOOST_REQUIRE_EQUAL(_call.kind == FunctionCall::Kind::Constructor, _isConstructor);
-	BOOST_REQUIRE_EQUAL(_call.kind == FunctionCall::Kind::Library, _isLibrary);
-}
-
-}
-
-BOOST_AUTO_TEST_SUITE(TestFileParserTest)
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	char const* source = R"()";
-	BOOST_REQUIRE_EQUAL(parse(source).size(), 0);
-}
-
-BOOST_AUTO_TEST_CASE(call_success)
-{
-	char const* source = R"(
-		// success() ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "success()", false);
-}
-
-BOOST_AUTO_TEST_CASE(non_existent_call_revert_single_line)
-{
-	char const* source = R"(
-		// i_am_not_there() -> FAILURE
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "i_am_not_there()", true);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_success)
-{
-	char const* source = R"(
-		// f(uint256): 1
-		// ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::MultiLine, "f(uint256)", false, fmt::encodeArgs(u256{1}));
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_comments_success)
-{
-	char const* source = R"(
-		// f(uint256, uint256): 1, 1
-		// # Comment on the parameters. #
-		// ->
-		// # This call should not return a value, but still succeed. #
-		// f()
-		// # Comment on no parameters. #
-		// -> 1
-		// # This comment should be parsed. #
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"f(uint256,uint256)",
-		false,
-		fmt::encodeArgs(1, 1),
-		fmt::encodeArgs(),
-		{0},
-		" Comment on the parameters. ",
-		" This call should not return a value, but still succeed. "
-	);
-	testFunctionCall(
-		calls.at(1),
-		Mode::MultiLine,
-		"f()",
-		false,
-		fmt::encodeArgs(),
-		fmt::encodeArgs(1),
-		{0},
-		" Comment on no parameters. ",
-		" This comment should be parsed. "
-	);
-}
-
-BOOST_AUTO_TEST_CASE(simple_single_line_call_comment_success)
-{
-	char const* source = R"(
-		// f(uint256): 1 -> # f(uint256) does not return a value. #
-		// f(uint256): 1 -> 1
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(uint256)",
-		false,
-		fmt::encodeArgs(1),
-		fmt::encodeArgs(),
-		{0},
-		"",
-		" f(uint256) does not return a value. "
-	);
-	testFunctionCall(calls.at(1), Mode::SingleLine, "f(uint256)", false, fmt::encode(1), fmt::encode(1));
-}
-
-BOOST_AUTO_TEST_CASE(multiple_single_line)
-{
-	char const* source = R"(
-		// f(uint256): 1 -> 1
-		// g(uint256): 1 ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(1), fmt::encodeArgs(1));
-	testFunctionCall(calls.at(1), Mode::SingleLine, "g(uint256)", false, fmt::encodeArgs(1));
-}
-
-BOOST_AUTO_TEST_CASE(multiple_single_line_swapped)
-{
-	char const* source = R"(
-		// f(uint256): 1 ->
-		// g(uint256): 1 -> 1
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(1));
-	testFunctionCall(calls.at(1), Mode::SingleLine, "g(uint256)", false, fmt::encodeArgs(1), fmt::encodeArgs(1));
-
-}
-
-BOOST_AUTO_TEST_CASE(non_existent_call_revert)
-{
-	char const* source = R"(
-		// i_am_not_there()
-		// -> FAILURE
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::MultiLine, "i_am_not_there()", true);
-}
-
-BOOST_AUTO_TEST_CASE(call_revert_message)
-{
-	char const* source = R"(
-		// f() -> FAILURE, hex"08c379a0", 0x20, 6, "Revert"
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f()",
-		true,
-		fmt::encodeArgs(),
-		fromHex("08c379a0") + fmt::encodeDyn(std::string{"Revert"})
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_expectations_empty_single_line)
-{
-	char const* source = R"(
-		// _exp_() ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "_exp_()", false);
-}
-
-BOOST_AUTO_TEST_CASE(call_expectations_empty_multiline)
-{
-	char const* source = R"(
-		// _exp_()
-		// ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::MultiLine, "_exp_()", false);
-}
-
-BOOST_AUTO_TEST_CASE(call_comments)
-{
-	char const* source = R"(
-		// f() # Parameter comment # -> 1 # Expectation comment #
-		// f() # Parameter comment #
-		// -> 1 # Expectation comment #
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f()",
-		false,
-		fmt::encodeArgs(),
-		fmt::encodeArgs(1),
-		{0},
-		" Parameter comment ",
-		" Expectation comment "
-	);
-	testFunctionCall(
-		calls.at(1),
-		Mode::MultiLine,
-		"f()",
-		false,
-		fmt::encodeArgs(),
-		fmt::encodeArgs(1),
-		{0},
-		" Parameter comment ",
-		" Expectation comment "
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments)
-{
-	char const* source = R"(
-		// f(uint256), 314 wei: 5 # optional wei value #
-		// -> 4
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"f(uint256)",
-		false,
-		fmt::encodeArgs(5),
-		fmt::encodeArgs(4),
-		{314},
-		" optional wei value "
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_ether)
-{
-	char const* source = R"(
-		// f(uint256), 1 ether: 5 # optional ether value #
-		// -> 4
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"f(uint256)",
-		false,
-		fmt::encodeArgs(5),
-		fmt::encodeArgs(4),
-		{exp256(u256(10), u256(18)) , FunctionValueUnit::Ether},
-		" optional ether value "
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_bool)
-{
-	char const* source = R"(
-		// f(bool): true -> false
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(bool)",
-		false,
-		fmt::encodeArgs(true),
-		fmt::encodeArgs(false)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(scanner_hex_values)
-{
-	char const* source = R"(
-		// f(uint256): "\x20\x00\xFf" ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(std::string("\x20\x00\xff", 3)));
-}
-
-BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid1)
-{
-	char const* source = R"(
-		// f(uint256): "\x" ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid2)
-{
-	char const* source = R"(
-		// f(uint256): "\x1" ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(std::string("\x1", 1)));
-}
-
-BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid3)
-{
-	char const* source = R"(
-		// f(uint256): "\xZ" ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid4)
-{
-	char const* source = R"(
-		// f(uint256): "\xZZ" ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_hex_string)
-{
-	char const* source = R"(
-		// f(bytes): hex"4200ef" -> hex"ab0023"
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(bytes)",
-		false,
-		fromHex("4200ef"),
-		fromHex("ab0023")
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_hex_string_lowercase)
-{
-	char const* source = R"(
-		// f(bytes): hex"4200ef" -> hex"23ef00"
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(bytes)",
-		false,
-		fromHex("4200EF"),
-		fromHex("23EF00")
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_string)
-{
-	char const* source = R"(
-		// f(string): 0x20, 3, "any" ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(string)",
-		false,
-		fmt::encodeDyn(std::string{"any"})
-	);
-}
-
-
-BOOST_AUTO_TEST_CASE(call_hex_number)
-{
-	char const* source = R"(
-		// f(bytes32, bytes32): 0x616, 0x1042 -> 1
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(bytes32,bytes32)",
-		false,
-		fmt::encodeArgs(
-			fromHex("0x616"),
-			fromHex("0x1042")
-		),
-		fmt::encodeArgs(1)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_return_string)
-{
-	char const* source = R"(
-		// f() -> 0x20, 3, "any"
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f()",
-		false,
-		fmt::encodeArgs(),
-		fmt::encodeDyn(std::string{"any"})
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_tuple)
-{
-	char const* source = R"(
-		// f((uint256, bytes32), uint256) ->
-		// f((uint8), uint8) ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f((uint256,bytes32),uint256)", false);
-	testFunctionCall(calls.at(1), Mode::SingleLine, "f((uint8),uint8)", false);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_left_aligned)
-{
-	char const* source = R"(
-		// f(bytes32, bytes32): 0x6161, 0x420000EF -> 1
-		// g(bytes32, bytes32): 0x0616, 0x0042EF00 -> 1
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(bytes32,bytes32)",
-		false,
-		fmt::encodeArgs(
-			fromHex("0x6161"),
-			fromHex("0x420000EF")
-		),
-		fmt::encodeArgs(1)
-	);
-	testFunctionCall(
-		calls.at(1),
-		Mode::SingleLine,
-		"g(bytes32,bytes32)",
-		false,
-		fmt::encodeArgs(
-			fromHex("0x0616"),
-			fromHex("0x0042EF00")
-		),
-		fmt::encodeArgs(1)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_tuple_of_tuples)
-{
-	char const* source = R"(
-		// f(((uint256, bytes32), bytes32), uint256)
-		// # f(S memory s, uint256 b) #
-		// ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"f(((uint256,bytes32),bytes32),uint256)",
-		false,
-		fmt::encodeArgs(),
-		fmt::encodeArgs(),
-		{0},
-		" f(S memory s, uint256 b) "
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_recursive_tuples)
-{
-	char const* source = R"(
-		// f(((((bytes, bytes, bytes), bytes), bytes), bytes), bytes) ->
-		// f(((((bytes, bytes, (bytes)), bytes), bytes), (bytes, bytes)), (bytes, bytes)) ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f(((((bytes,bytes,bytes),bytes),bytes),bytes),bytes)",
-		false
-	);
-	testFunctionCall(
-		calls.at(1),
-		Mode::SingleLine,
-		"f(((((bytes,bytes,(bytes)),bytes),bytes),(bytes,bytes)),(bytes,bytes))",
-		false
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_mismatch)
-{
-	char const* source = R"(
-		// f(uint256):
-		// 1, 2
-		// # This only throws at runtime #
-		// -> 1
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"f(uint256)",
-		false,
-		fmt::encodeArgs(1, 2),
-		fmt::encodeArgs(1),
-		{0},
-		" This only throws at runtime "
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_multiple_arguments)
-{
-	char const* source = R"(
-		// test(uint256, uint256):
-		// 1,
-		// 2
-		// -> 1,
-		// 1
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"test(uint256,uint256)",
-		false,
-		fmt::encodeArgs(1, 2),
-		fmt::encodeArgs(1, 1)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_multiple_arguments_mixed_format)
-{
-	char const* source = R"(
-		// test(uint256, uint256), 314 wei:
-		// 1, -2
-		// -> -1, 2
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::MultiLine,
-		"test(uint256,uint256)",
-		false,
-		fmt::encodeArgs(1, -2),
-		fmt::encodeArgs(-1, 2),
-		{314}
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_signature_array)
-{
-	char const* source = R"(
-		// f(uint256[]) ->
-		// f(uint256[3]) ->
-		// f(uint256[3][][], uint8[9]) ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 3);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256[])", false);
-	testFunctionCall(calls.at(1), Mode::SingleLine, "f(uint256[3])", false);
-	testFunctionCall(calls.at(2), Mode::SingleLine, "f(uint256[3][][],uint8[9])", false);
-}
-
-BOOST_AUTO_TEST_CASE(call_signature_struct_array)
-{
-	char const* source = R"(
-		// f((uint256)[]) ->
-		// f((uint256)[3]) ->
-		// f((uint256, uint8)[3]) ->
-		// f((uint256)[3][][], (uint8, bool)[9]) ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 4);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f((uint256)[])", false);
-	testFunctionCall(calls.at(1), Mode::SingleLine, "f((uint256)[3])", false);
-	testFunctionCall(calls.at(2), Mode::SingleLine, "f((uint256,uint8)[3])", false);
-	testFunctionCall(calls.at(3), Mode::SingleLine, "f((uint256)[3][][],(uint8,bool)[9])", false);
-
-}
-
-BOOST_AUTO_TEST_CASE(call_signature_valid)
-{
-	char const* source = R"(
-		// f(uint256, uint8, string) -> FAILURE
-		// f(invalid, xyz, foo) -> FAILURE
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 2);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256,uint8,string)", true);
-	testFunctionCall(calls.at(1), Mode::SingleLine, "f(invalid,xyz,foo)", true);
-}
-
-BOOST_AUTO_TEST_CASE(call_raw_arguments)
-{
-	char const* source = R"(
-		// f(): 1, -2, -3 ->
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f()",
-		false,
-		fmt::encodeArgs(1, -2, -3),
-		fmt::encodeArgs(),
-		{0},
-		"",
-		"",
-		{"1", "-2", "-3"}
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_builtin_left_decimal)
-{
-	char const* source = R"(
-		// f(): left(1), left(0x20) -> left(-2), left(true)
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f()",
-		false,
-		fmt::encodeArgs(
-			fmt::encode(toCompactBigEndian(u256{1}), false),
-			fmt::encode(fromHex("0x20"), false)
-		),
-		fmt::encodeArgs(
-			fmt::encode(toCompactBigEndian(u256{-2}), false),
-			fmt::encode(bytes{true}, false)
-		)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_builtin_right_decimal)
-{
-	char const* source = R"(
-		// f(): right(1), right(0x20) -> right(-2), right(true)
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"f()",
-		false,
-		fmt::encodeArgs(1, fromHex("0x20")),
-		fmt::encodeArgs(-2, true)
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_hex_string_left_align)
-{
-	char const* source = R"(
-		// f(bytes): left(hex"4200ef") ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_hex_string_right_align)
-{
-	char const* source = R"(
-		// f(bytes): right(hex"4200ef") ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_newline_invalid)
-{
-	char const* source = R"(
-		/
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_invalid)
-{
-	char const* source = R"(
-		/ f() ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_signature_invalid)
-{
-	char const* source = R"(
-		// f(uint8,) -> FAILURE
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_tuple_invalid)
-{
-	char const* source = R"(
-		// f((uint8,) -> FAILURE
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_tuple_invalid_empty)
-{
-	char const* source = R"(
-		// f(uint8, ()) -> FAILURE
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_tuple_invalid_parantheses)
-{
-	char const* source = R"(
-		// f((uint8,() -> FAILURE
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_ether_value_expectations_missing)
-{
-	char const* source = R"(
-		// f(), 0)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_invalid)
-{
-	char const* source = R"(
-		// f(uint256): abc -> 1
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_invalid_decimal)
-{
-	char const* source = R"(
-		// sig(): 0.h3 ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_ether_value_invalid)
-{
-	char const* source = R"(
-		// f(uint256), abc : 1 -> 1
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_ether_value_invalid_decimal)
-{
-	char const* source = R"(
-		// sig(): 0.1hd ether ->
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_ether_type_invalid)
-{
-	char const* source = R"(
-		// f(uint256), 2 btc : 1 -> 1
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_signed_bool_invalid)
-{
-	char const* source = R"(
-		// f() -> -true
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_signed_failure_invalid)
-{
-	char const* source = R"(
-		// f() -> -FAILURE
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_signed_hex_number_invalid)
-{
-	char const* source = R"(
-		// f() -> -0x42
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_colon)
-{
-	char const* source = R"(
-		// h256():
-		// -> 1
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arguments_newline_colon)
-{
-	char const* source = R"(
-		// h256()
-		// :
-		// -> 1
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_arrow_missing)
-{
-	char const* source = R"(
-		// h256() FAILURE
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(call_unexpected_character)
-{
-	char const* source = R"(
-		// f() -> ??
-	)";
-	BOOST_REQUIRE_THROW(parse(source), TestParserError);
-}
-
-BOOST_AUTO_TEST_CASE(constructor)
-{
-	char const* source = R"(
-		// constructor()
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"constructor()",
-		false,
-		{},
-		{},
-		{0},
-		"",
-		"",
-		{},
-		true
-	);
-}
-
-BOOST_AUTO_TEST_CASE(library)
-{
-	char const* source = R"(
-		// library: L
-	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(
-		calls.at(0),
-		Mode::SingleLine,
-		"L",
-		false,
-		{},
-		{},
-		{0},
-		"",
-		"",
-		{},
-		false,
-		true
-	);
-}
-
-BOOST_AUTO_TEST_CASE(call_effects)
-{
-	std::map<std::string, Builtin> builtins;
-	builtins["builtin_returning_call_effect"] = [](FunctionCall const&) -> std::optional<bytes>
-	{
-		return toBigEndian(u256(0x1234));
-	};
-	builtins["builtin_returning_call_effect_no_ret"] = [](FunctionCall const&) -> std::optional<bytes>
-	{
-		return {};
-	};
-
-	char const* source = R"(
-		// builtin_returning_call_effect -> 1
-		// ~ bla
-		// ~ bla bla
-		// ~ bla bla bla
-	)";
-	std::vector<FunctionCall> calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 3);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "bla");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[1]), "bla bla");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[2]), "bla bla bla");
-	source = R"(
-		// builtin_returning_call_effect -> 1
-		// ~ bla
-		// ~ bla bla
-		// builtin_returning_call_effect -> 2
-		// ~ bla bla bla
-		// builtin_returning_call_effect -> 3
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 3);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 2);
-	BOOST_REQUIRE_EQUAL(calls[1].expectedSideEffects.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[2].expectedSideEffects.size(), 0);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "bla");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[1]), "bla bla");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[1].expectedSideEffects[0]), "bla bla bla");
-	source = R"(
-		// builtin_returning_call_effect -> 1
-		// ~ bla
-		// ~ bla bla bla
-		// ~ abc ~ def ~ ghi
-		// ~ ~ ~
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 4);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "bla");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[1]), "bla bla bla");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[2]), "abc ~ def ~ ghi");
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[3]), "~ ~");
-	source = R"(
-		// builtin_returning_call_effect_no_ret ->
-		// ~ hello world
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 1);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "hello world");
-	source = R"(
-		// builtin_returning_call_effect -> 1
-		// ~
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 1);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "");
-	source = R"(
-		// builtin_returning_call_effect -> 1 # a comment #
-		// ~ hello world
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 1);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "hello world");
-	source = R"(
-		// builtin_returning_call_effect_no_ret -> # another comment #
-		// ~ hello world
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 1);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "hello world");
-	source = R"(
-		// builtin_returning_call_effect_no_ret # another comment #
-		// ~ hello world
-	)";
-	calls = parse(source, builtins);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 1);
-	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "hello world");
-	source = R"(
-		// builtin_returning_call_effect_no_ret # another comment #
-		// ~ hello/world
-	)";
-	BOOST_CHECK_THROW(parse(source, builtins), std::exception);
-	source = R"(
-		// builtin_returning_call_effect_no_ret # another comment #
-		// ~ hello//world
-	)";
-	BOOST_CHECK_THROW(parse(source, builtins), std::exception);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
deleted file mode 100644
index 64dfbd98253e..000000000000
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <test/libsolidity/util/TestFunctionCall.h>
-
-#include <test/libsolidity/util/BytesUtils.h>
-#include <test/libsolidity/util/ContractABIUtils.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <optional>
-#include <stdexcept>
-#include <string>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend::test;
-
-using Token = soltest::Token;
-
-std::string TestFunctionCall::format(
-	ErrorReporter& _errorReporter,
-	std::string const& _linePrefix,
-	RenderMode _renderMode,
-	bool const _highlight,
-	bool const _interactivePrint
-) const
-{
-	std::stringstream stream;
-
-	bool highlight = !matchesExpectation() && _highlight;
-
-	auto formatOutput = [&](bool const _singleLine)
-	{
-		std::string ws = " ";
-		std::string arrow = formatToken(Token::Arrow);
-		std::string colon = formatToken(Token::Colon);
-		std::string comma = formatToken(Token::Comma);
-		std::string comment = formatToken(Token::Comment);
-		std::string ether = formatToken(Token::Ether);
-		std::string wei = formatToken(Token::Wei);
-		std::string newline = formatToken(Token::Newline);
-		std::string failure = formatToken(Token::Failure);
-
-		if (m_call.kind == FunctionCall::Kind::Library)
-		{
-			stream << _linePrefix << newline << ws << "library:" << ws;
-			if (!m_call.libraryFile.empty())
-				stream << "\"" << m_call.libraryFile << "\":";
-			stream << m_call.signature;
-			return;
-		}
-
-		/// Formats the function signature. This is the same independent from the display-mode.
-		stream << _linePrefix << newline << ws << m_call.signature;
-		if (m_call.value.value > u256(0))
-		{
-			switch (m_call.value.unit)
-			{
-			case FunctionValueUnit::Ether:
-				stream << comma << ws << (m_call.value.value / exp256(10, 18)) << ws << ether;
-				break;
-			case FunctionValueUnit::Wei:
-				stream << comma << ws << m_call.value.value << ws << wei;
-				break;
-			default:
-				soltestAssert(false, "");
-			}
-		}
-		if (!m_call.arguments.rawBytes().empty())
-		{
-			std::string output = formatRawParameters(m_call.arguments.parameters, _linePrefix);
-			stream << colon;
-			if (!m_call.arguments.parameters.at(0).format.newline)
-				stream << ws;
-			stream << output;
-		}
-
-		/// Formats comments on the function parameters and the arrow taking
-		/// the display-mode into account.
-		if (_singleLine)
-		{
-			if (!m_call.arguments.comment.empty())
-				stream << ws << comment << m_call.arguments.comment << comment;
-
-			if (m_call.omitsArrow)
-			{
-				if (_renderMode == RenderMode::ActualValuesExpectedGas && (m_failure || !matchesExpectation()))
-					stream << ws << arrow;
-			}
-			else
-				stream << ws << arrow;
-		}
-		else
-		{
-			stream << std::endl << _linePrefix << newline << ws;
-			if (!m_call.arguments.comment.empty())
-			{
-				 stream << comment << m_call.arguments.comment << comment;
-				 stream << std::endl << _linePrefix << newline << ws;
-			}
-			stream << arrow;
-		}
-
-		/// Format either the expected output or the actual result output
-		std::string result;
-		if (_renderMode != RenderMode::ActualValuesExpectedGas)
-		{
-			bool const isFailure = m_call.expectations.failure;
-			result = isFailure ?
-				formatFailure(_errorReporter, m_call, m_rawBytes, /* _renderResult */ false, highlight) :
-				formatRawParameters(m_call.expectations.result);
-			if (!result.empty())
-				AnsiColorized(stream, highlight, {util::formatting::RED_BACKGROUND}) << ws << result;
-		}
-		else
-		{
-			if (m_calledNonExistingFunction)
-				_errorReporter.warning("The function \"" + m_call.signature + "\" is not known to the compiler.");
-
-			bytes output = m_rawBytes;
-			bool const isFailure = m_failure;
-			result = isFailure ?
-				formatFailure(_errorReporter, m_call, output, _renderMode == RenderMode::ActualValuesExpectedGas, highlight) :
-				matchesExpectation() ?
-					formatRawParameters(m_call.expectations.result) :
-					formatBytesParameters(
-						_errorReporter,
-						output,
-						m_call.signature,
-						m_call.expectations.result,
-						highlight
-					);
-
-			if (!matchesExpectation())
-			{
-				std::optional<ParameterList> abiParams;
-
-				if (isFailure)
-				{
-					if (!output.empty())
-						abiParams = ContractABIUtils::failureParameters(output);
-				}
-				else
-					abiParams = ContractABIUtils::parametersFromJsonOutputs(
-						_errorReporter,
-						m_contractABI,
-						m_call.signature
-					);
-
-				std::string bytesOutput = abiParams ?
-					BytesUtils::formatRawBytes(output, abiParams.value(), _linePrefix) :
-					BytesUtils::formatRawBytes(
-						output,
-						ContractABIUtils::defaultParameters((output.size() + 31) / 32),
-						_linePrefix
-					);
-
-				_errorReporter.warning(
-					"The call to \"" + m_call.signature + "\" returned \n" +
-					bytesOutput
-				);
-			}
-
-			if (isFailure)
-				AnsiColorized(stream, highlight, {util::formatting::RED_BACKGROUND}) << ws << result;
-			else
-				if (!result.empty())
-					stream << ws << result;
-
-		}
-
-		/// Format comments on expectations taking the display-mode into account.
-		if (_singleLine)
-		{
-			if (!m_call.expectations.comment.empty())
-				stream << ws << comment << m_call.expectations.comment << comment;
-		}
-		else
-		{
-			if (!m_call.expectations.comment.empty())
-			{
-				stream << std::endl << _linePrefix << newline << ws;
-				stream << comment << m_call.expectations.comment << comment;
-			}
-		}
-
-		std::vector<std::string> sideEffects;
-		if (_renderMode == RenderMode::ExpectedValuesExpectedGas || _renderMode == RenderMode::ExpectedValuesActualGas)
-			sideEffects = m_call.expectedSideEffects;
-		else
-			sideEffects = m_call.actualSideEffects;
-
-		if (!sideEffects.empty())
-		{
-			stream << std::endl;
-			size_t i = 0;
-			for (; i < sideEffects.size() - 1; ++i)
-				stream << _linePrefix << "// ~ " << sideEffects[i] << std::endl;
-			stream << _linePrefix << "// ~ " << sideEffects[i];
-		}
-
-		stream << formatGasExpectations(_linePrefix, _renderMode == RenderMode::ExpectedValuesActualGas, _interactivePrint);
-	};
-
-	formatOutput(m_call.displayMode == FunctionCall::DisplayMode::SingleLine);
-	return stream.str();
-}
-
-std::string TestFunctionCall::formatBytesParameters(
-	ErrorReporter& _errorReporter,
-	bytes const& _bytes,
-	std::string const& _signature,
-	solidity::frontend::test::ParameterList const& _parameters,
-	bool _highlight,
-	bool _failure
-) const
-{
-	using ParameterList = solidity::frontend::test::ParameterList;
-
-	std::stringstream os;
-
-	if (_bytes.empty())
-		return {};
-
-	if (_failure)
-	{
-		os << BytesUtils::formatBytesRange(
-			_bytes,
-			ContractABIUtils::failureParameters(_bytes),
-			_highlight
-		);
-
-		return os.str();
-	}
-	else
-	{
-		std::optional<ParameterList> abiParams = ContractABIUtils::parametersFromJsonOutputs(
-			_errorReporter,
-			m_contractABI,
-			_signature
-		);
-
-		if (abiParams)
-		{
-			std::optional<ParameterList> preferredParams = ContractABIUtils::preferredParameters(
-				_errorReporter,
-				_parameters,
-				abiParams.value(),
-				_bytes
-			);
-
-			if (preferredParams)
-			{
-				ContractABIUtils::overwriteParameters(_errorReporter, preferredParams.value(), abiParams.value());
-				os << BytesUtils::formatBytesRange(_bytes, preferredParams.value(), _highlight);
-			}
-		}
-		else
-		{
-			ParameterList defaultParameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32);
-
-			ContractABIUtils::overwriteParameters(_errorReporter, defaultParameters, _parameters);
-			os << BytesUtils::formatBytesRange(_bytes, defaultParameters, _highlight);
-		}
-		return os.str();
-	}
-}
-
-std::string TestFunctionCall::formatFailure(
-	ErrorReporter& _errorReporter,
-	solidity::frontend::test::FunctionCall const& _call,
-	bytes const& _output,
-	bool _renderResult,
-	bool _highlight
-) const
-{
-	std::stringstream os;
-
-	os << formatToken(Token::Failure);
-
-	if (!_output.empty())
-		os << ", ";
-
-	if (_renderResult)
-		os << formatBytesParameters(
-			_errorReporter,
-			_output,
-			_call.signature,
-			_call.expectations.result,
-			_highlight,
-			true
-		);
-	else
-		os << formatRawParameters(_call.expectations.result);
-
-	return os.str();
-}
-
-std::string TestFunctionCall::formatRawParameters(
-	solidity::frontend::test::ParameterList const& _params,
-	std::string const& _linePrefix
-) const
-{
-	std::stringstream os;
-	for (auto const& param: _params)
-		if (!param.rawString.empty())
-		{
-			if (param.format.newline)
-				os << std::endl << _linePrefix << "// ";
-			for (auto const c: param.rawString)
-				// NOTE: Even though we have a toHex() overload specifically for uint8_t, the compiler
-				// chooses the one for bytes if the second argument is omitted.
-				os << (c >= ' ' ? std::string(1, c) : "\\x" + util::toHex(static_cast<uint8_t>(c), HexCase::Lower));
-			if (&param != &_params.back())
-				os << ", ";
-		}
-	return os.str();
-}
-
-std::string TestFunctionCall::formatGasExpectations(
-	std::string const& _linePrefix,
-	bool _useActualCost,
-	bool _showDifference
-) const
-{
-	std::stringstream os;
-	for (auto const& [runType, gasUsed]: (_useActualCost ? m_gasCosts : m_call.expectations.gasUsed))
-		if (!runType.empty())
-		{
-			bool differentResults =
-				m_gasCosts.count(runType) > 0 &&
-				m_call.expectations.gasUsed.count(runType) > 0 &&
-				m_gasCosts.at(runType) != m_call.expectations.gasUsed.at(runType);
-
-			s256 difference = 0;
-			if (differentResults)
-				difference =
-					static_cast<s256>(m_gasCosts.at(runType)) -
-					static_cast<s256>(m_call.expectations.gasUsed.at(runType));
-			int percent = 0;
-			if (differentResults)
-				percent = static_cast<int>(
-					100.0 * (static_cast<double>(difference) / static_cast<double>(m_call.expectations.gasUsed.at(runType)))
-				);
-			os << std::endl << _linePrefix << "// gas " << runType << ": " << (gasUsed.str());
-			if (_showDifference && differentResults && _useActualCost)
-				os << " [" << std::showpos << difference << " (" << percent << "%)]";
-		}
-	return os.str();
-}
-
-void TestFunctionCall::reset()
-{
-	m_rawBytes = bytes{};
-	m_failure = true;
-	m_contractABI = Json::Value{};
-	m_calledNonExistingFunction = false;
-}
-
-bool TestFunctionCall::matchesExpectation() const
-{
-	return m_failure == m_call.expectations.failure && m_rawBytes == m_call.expectations.rawBytes();
-}
diff --git a/test/libsolidity/util/TestFunctionCall.h b/test/libsolidity/util/TestFunctionCall.h
deleted file mode 100644
index 8b4ed5019d41..000000000000
--- a/test/libsolidity/util/TestFunctionCall.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-	This file is part of solidity.
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <test/libsolidity/util/TestFileParser.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-#include <test/libsolidity/util/ContractABIUtils.h>
-
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/JSON.h>
-
-#include <json/json.h>
-
-#include <iosfwd>
-#include <numeric>
-#include <stdexcept>
-#include <string>
-#include <vector>
-
-namespace solidity::frontend::test
-{
-
-/**
- * Represents a function call and the result it returned. It stores the call
- * representation itself, the actual byte result (if any) and a string representation
- * used for the interactive update routine provided by isoltest. It also provides
- * functionality to compare the actual result with the expectations attached to the
- * call object, as well as a way to reset the result if executed multiple times.
- */
-class TestFunctionCall
-{
-public:
-	enum class RenderMode
-	{
-		ExpectedValuesExpectedGas,
-		ActualValuesExpectedGas,
-		ExpectedValuesActualGas
-	};
-
-	TestFunctionCall(FunctionCall _call): m_call(std::move(_call)), m_gasCosts(m_call.expectations.gasUsed) {}
-
-	/// Formats this function call test and applies the format that was detected during parsing.
-	/// _renderMode determines the source of values to be inserted into the updated test expectations.
-	///     RenderMode::ActualValuesExpectedGas: use the values produced by the test but for gas preserve the original expectations,
-	///     RenderMode::ExpectedValuesExpectedGas: preserve the original expectations for both gas and other values,
-	///     RenderMode::ExpectedValuesActualGas: use the original expectations but for gas use actual values,
-	/// If _highlight is false, it's formatted without colorized highlighting. If it's true, AnsiColorized is
-	/// used to apply a colorized highlighting.
-	/// If _interactivePrint is true, we are producing output that will be interactively shown to the user
-	/// in the terminal rather than used to update the expectations in the test file.
-	/// If test expectations do not match, the contract ABI is consulted in order to get the
-	/// right encoding for returned bytes, based on the parsed return types.
-	/// Reports warnings and errors to the error reporter.
-	std::string format(
-		ErrorReporter& _errorReporter,
-		std::string const& _linePrefix = "",
-		RenderMode _renderMode = RenderMode::ExpectedValuesExpectedGas,
-		bool const _highlight = false,
-		bool const _interactivePrint = false
-	) const;
-
-	/// Overloaded version that passes an error reporter which is never used outside
-	/// of this function.
-	std::string format(
-		std::string const& _linePrefix = "",
-		RenderMode const _renderMode = RenderMode::ExpectedValuesExpectedGas,
-		bool const _highlight = false
-	) const
-	{
-		ErrorReporter reporter;
-		return format(reporter, _linePrefix, _renderMode, _highlight);
-	}
-
-	/// Resets current results in case the function was called and the result
-	/// stored already (e.g. if test case was updated via isoltest).
-	void reset();
-
-	FunctionCall const& call() const { return m_call; }
-	void calledNonExistingFunction() { m_calledNonExistingFunction = true; }
-	void setFailure(const bool _failure) { m_failure = _failure; }
-	void setRawBytes(const bytes _rawBytes) { m_rawBytes = _rawBytes; }
-	void setGasCost(std::string const& _runType, u256 const& _gasCost) { m_gasCosts[_runType] = _gasCost; }
-	void setContractABI(Json::Value _contractABI) { m_contractABI = std::move(_contractABI); }
-	void setSideEffects(std::vector<std::string> _sideEffects) { m_call.actualSideEffects = _sideEffects; }
-
-private:
-	/// Tries to format the given `bytes`, applying the detected ABI types that have be set for each parameter.
-	/// Throws if there's a mismatch in the size of `bytes` and the desired formats that are specified
-	/// in the ABI type.
-	/// Reports warnings and errors to the error reporter.
-	std::string formatBytesParameters(
-		ErrorReporter& _errorReporter,
-		bytes const& _bytes,
-		std::string const& _signature,
-		ParameterList const& _params,
-		bool highlight = false,
-		bool failure = false
-	) const;
-
-	/// Formats a FAILURE plus additional parameters, if e.g. a revert message was returned.
-	std::string formatFailure(
-		ErrorReporter& _errorReporter,
-		FunctionCall const& _call,
-		bytes const& _output,
-		bool _renderResult,
-		bool _highlight
-	) const;
-
-	/// Formats the given parameters using their raw string representation.
-	std::string formatRawParameters(
-		ParameterList const& _params,
-		std::string const& _linePrefix = ""
-	) const;
-
-	/// Formats gas usage expectations one per line
-	std::string formatGasExpectations(
-		std::string const& _linePrefix,
-		bool _useActualCost,
-		bool _showDifference
-	) const;
-
-	/// Compares raw expectations (which are converted to a byte representation before),
-	/// and also the expected transaction status of the function call to the actual test results.
-	bool matchesExpectation() const;
-
-	/// Function call that has been parsed and which holds all parameters / expectations.
-	FunctionCall m_call;
-	/// Result of the actual call been made.
-	bytes m_rawBytes = bytes{};
-	/// Actual gas costs
-	std::map<std::string, u256> m_gasCosts;
-	/// Transaction status of the actual call. False in case of a REVERT or any other failure.
-	bool m_failure = true;
-	/// JSON object which holds the contract ABI and that is used to set the output formatting
-	/// in the interactive update routine.
-	Json::Value m_contractABI = Json::Value{};
-	/// Flags that the test failed because the called function is not known to exist on the contract.
-	bool m_calledNonExistingFunction = false;
-};
-
-}
diff --git a/test/libsolidity/util/TestFunctionCallTests.cpp b/test/libsolidity/util/TestFunctionCallTests.cpp
deleted file mode 100644
index fa3fe995cac5..000000000000
--- a/test/libsolidity/util/TestFunctionCallTests.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <functional>
-#include <string>
-#include <tuple>
-#include <boost/test/unit_test.hpp>
-#include <liblangutil/Exceptions.h>
-#include <test/ExecutionFramework.h>
-
-#include <test/libsolidity/util/TestFunctionCall.h>
-
-using namespace solidity::util;
-using namespace solidity::test;
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(TestFunctionCallTest)
-
-BOOST_AUTO_TEST_CASE(format_unsigned_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{1});
-	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(uint8): 1 -> 1");
-
-	test.setRawBytes(toBigEndian(u256{2}));
-	test.setFailure(false);
-
-	BOOST_REQUIRE_EQUAL(test.format("", TestFunctionCall::RenderMode::ActualValuesExpectedGas), "// f(uint8): 1 -> 2");
-}
-
-BOOST_AUTO_TEST_CASE(format_unsigned_singleline_signed_encoding)
-{
-	bytes expectedBytes = toBigEndian(u256{1});
-	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(uint8): 1 -> 1");
-
-	test.setRawBytes(toBigEndian(u256{-1}));
-	test.setFailure(false);
-
-	BOOST_REQUIRE_EQUAL(test.format("", TestFunctionCall::RenderMode::ActualValuesExpectedGas), "// f(uint8): 1 -> -1");
-}
-
-BOOST_AUTO_TEST_CASE(format_unsigned_multiline)
-{
-	bytes expectedBytes = toBigEndian(u256{1});
-	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	Parameter result{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{result}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{}, std::string{}};
-	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	call.displayMode = FunctionCall::DisplayMode::MultiLine;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(),	"// f(uint8)\n// -> 1");
-}
-
-BOOST_AUTO_TEST_CASE(format_multiple_unsigned_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{1});
-	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param, param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param, param}, std::string{}};
-	FunctionCall call{"f(uint8, uint8)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(uint8, uint8): 1, 1 -> 1, 1");
-}
-
-BOOST_AUTO_TEST_CASE(format_signed_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{-1});
-	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "-1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(int8)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(int8): -1 -> -1");
-
-	test.setRawBytes(toBigEndian(u256{-2}));
-	test.setFailure(false);
-
-	BOOST_REQUIRE_EQUAL(test.format("", TestFunctionCall::RenderMode::ActualValuesExpectedGas), "// f(int8): -1 -> -2");
-}
-
-BOOST_AUTO_TEST_CASE(format_hex_singleline)
-{
-	bytes result = fromHex("0x31");
-	bytes expectedBytes = result + bytes(32 - result.size(), 0);
-	ABIType abiType{ABIType::Hex, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "0x31", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(bytes32)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(bytes32): 0x31 -> 0x31");
-
-	bytes actualResult = fromHex("0x32");
-	bytes actualBytes = bytes(32 - actualResult.size(), 0) + actualResult;
-
-	test.setRawBytes(actualBytes);
-	test.setFailure(false);
-
-	BOOST_REQUIRE_EQUAL(test.format("", TestFunctionCall::RenderMode::ActualValuesExpectedGas), "// f(bytes32): 0x31 -> 0x32");
-}
-
-BOOST_AUTO_TEST_CASE(format_hex_string_singleline)
-{
-	bytes expectedBytes = fromHex("4200ef");
-	ABIType abiType{ABIType::HexString, ABIType::AlignLeft, 3};
-	Parameter param{expectedBytes, "hex\"4200ef\"", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(string)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(string): hex\"4200ef\" -> hex\"4200ef\"");
-}
-
-BOOST_AUTO_TEST_CASE(format_bool_true_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{true});
-	ABIType abiType{ABIType::Boolean, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "true", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(bool)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(bool): true -> true");
-
-	bytes actualResult = bytes{false};
-	bytes actualBytes = actualResult + bytes(32 - actualResult.size(), 0);
-	test.setRawBytes(actualBytes);
-	test.setFailure(false);
-
-	BOOST_REQUIRE_EQUAL(test.format("", TestFunctionCall::RenderMode::ActualValuesExpectedGas), "// f(bool): true -> false");
-}
-
-BOOST_AUTO_TEST_CASE(format_bool_false_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{false});
-	ABIType abiType{ABIType::Boolean, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "false", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(bool)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(bool): false -> false");
-}
-
-BOOST_AUTO_TEST_CASE(format_bool_left_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{false});
-	ABIType abiType{ABIType::Boolean, ABIType::AlignLeft, 32};
-	Parameter param{expectedBytes, "left(false)", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(bool)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(bool): left(false) -> left(false)");
-}
-
-BOOST_AUTO_TEST_CASE(format_hex_number_right_singleline)
-{
-	bytes result = fromHex("0x42");
-	bytes expectedBytes = result + bytes(32 - result.size(), 0);
-	ABIType abiType{ABIType::Hex, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "right(0x42)", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(bool)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(bool): right(0x42) -> right(0x42)");
-}
-
-BOOST_AUTO_TEST_CASE(format_empty_byte_range)
-{
-	bytes expectedBytes;
-	ABIType abiType{ABIType::None, ABIType::AlignNone, 0};
-	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{}, std::string{}};
-	FunctionCall call{"f()", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f() -> 1");
-}
-
-BOOST_AUTO_TEST_CASE(format_failure_singleline)
-{
-	bytes expectedBytes = toBigEndian(u256{1});
-	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
-	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{std::vector<Parameter>{}, true, std::string{}, {}};
-	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
-	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
-	call.omitsArrow = false;
-	TestFunctionCall test{call};
-
-	BOOST_REQUIRE_EQUAL(test.format(), "// f(uint8): 1 -> FAILURE");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/Checksum.cpp b/test/libsolutil/Checksum.cpp
deleted file mode 100644
index c9987a8b18ec..000000000000
--- a/test/libsolutil/Checksum.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the address checksum.
- */
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Exceptions.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(Checksum)
-
-BOOST_AUTO_TEST_CASE(calculate)
-{
-	BOOST_CHECK(!getChecksummedAddress("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed").empty());
-	BOOST_CHECK(!getChecksummedAddress("0x0123456789abcdefABCDEF0123456789abcdefAB").empty());
-	// too short
-	BOOST_CHECK_THROW(getChecksummedAddress("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beae"), InvalidAddress);
-	BOOST_CHECK_THROW(getChecksummedAddress("5aaeb6053f3e94c9b9a09f33669435e7ef1beae"), InvalidAddress);
-	// too long
-	BOOST_CHECK_THROW(getChecksummedAddress("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed1"), InvalidAddress);
-	BOOST_CHECK_THROW(getChecksummedAddress("5aaeb6053f3e94c9b9a09f33669435e7ef1beaed1"), InvalidAddress);
-	// non-hex character
-	BOOST_CHECK_THROW(getChecksummedAddress("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaeK"), InvalidAddress);
-
-	// the official test suite from EIP-55
-	std::vector<std::string> cases {
-		// all upper case
-		"0x52908400098527886E0F7030069857D2E4169EE7",
-		"0x8617E340B3D01FA5F11F306F4090FD50E238070D",
-		// all lower case
-		"0xde709f2102306220921060314715629080e2fb77",
-		"0x27b1fdb04752bbc536007a920d24acb045561c26",
-		// regular
-		"0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed",
-		"0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
-		"0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB",
-		"0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb"
-	};
-
-	for (size_t i = 0; i < cases.size(); i++)
-		BOOST_REQUIRE_MESSAGE(getChecksummedAddress(cases[i]) == cases[i], cases[i]);
-}
-
-BOOST_AUTO_TEST_CASE(regular)
-{
-	BOOST_CHECK(passesAddressChecksum("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed", true));
-	BOOST_CHECK(passesAddressChecksum("0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359", true));
-	BOOST_CHECK(passesAddressChecksum("0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB", true));
-	BOOST_CHECK(passesAddressChecksum("0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb", true));
-}
-
-BOOST_AUTO_TEST_CASE(regular_negative)
-{
-	BOOST_CHECK(!passesAddressChecksum("0x6aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed", true));
-	BOOST_CHECK(!passesAddressChecksum("0xeB6916095ca1df60bB79Ce92cE3Ea74c37c5d359", true));
-	BOOST_CHECK(!passesAddressChecksum("0xebF03B407c01E7cD3CBea99509d93f8DDDC8C6FB", true));
-	BOOST_CHECK(!passesAddressChecksum("0xE1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb", true));
-}
-
-BOOST_AUTO_TEST_CASE(regular_invalid_length)
-{
-	BOOST_CHECK(passesAddressChecksum("0x9426cbfc57389778d313268E7F85F1CDc2fdad60", true));
-	BOOST_CHECK(!passesAddressChecksum("0x9426cbfc57389778d313268E7F85F1CDc2fdad6", true));
-	BOOST_CHECK(passesAddressChecksum("0x08A61851FFa4637dE289D630Ae8c5dFb0ff9171F", true));
-	BOOST_CHECK(!passesAddressChecksum("0x8A61851FFa4637dE289D630Ae8c5dFb0ff9171F", true));
-	BOOST_CHECK(passesAddressChecksum("0x00c40cC30cb4675673c9ee382de805c19734986A", true));
-	BOOST_CHECK(!passesAddressChecksum("0xc40cC30cb4675673c9ee382de805c19734986A", true));
-	BOOST_CHECK(passesAddressChecksum("0xC40CC30cb4675673C9ee382dE805c19734986a00", true));
-	BOOST_CHECK(!passesAddressChecksum("0xC40CC30cb4675673C9ee382dE805c19734986a", true));
-}
-
-BOOST_AUTO_TEST_CASE(homocaps_valid)
-{
-	BOOST_CHECK(passesAddressChecksum("0x52908400098527886E0F7030069857D2E4169EE7", true));
-	BOOST_CHECK(passesAddressChecksum("0x8617E340B3D01FA5F11F306F4090FD50E238070D", true));
-	BOOST_CHECK(passesAddressChecksum("0xde709f2102306220921060314715629080e2fb77", true));
-	BOOST_CHECK(passesAddressChecksum("0x27b1fdb04752bbc536007a920d24acb045561c26", true));
-}
-
-BOOST_AUTO_TEST_CASE(homocaps_invalid)
-{
-	std::string upper = "0x00AA0000000012400000000DDEEFF000000000BB";
-	BOOST_CHECK(passesAddressChecksum(upper, false));
-	BOOST_CHECK(!passesAddressChecksum(upper, true));
-	std::string lower = "0x11aa000000000000000d00cc00000000000000bb";
-	BOOST_CHECK(passesAddressChecksum(lower, false));
-	BOOST_CHECK(!passesAddressChecksum(lower, true));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/CommonData.cpp b/test/libsolutil/CommonData.cpp
deleted file mode 100644
index b4b0351bcd8d..000000000000
--- a/test/libsolutil/CommonData.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the CommonData routines.
- */
-
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/FixedHash.h>
-#include <libsolidity/ast/Types.h> // for IntegerType
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::frontend;
-
-// TODO: Fix Boost...
-BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::bytes)
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(CommonData)
-
-BOOST_AUTO_TEST_CASE(fromhex_char)
-{
-	BOOST_CHECK_EQUAL(fromHex('0', WhenError::DontThrow), 0x0);
-	BOOST_CHECK_EQUAL(fromHex('a', WhenError::DontThrow), 0xa);
-	BOOST_CHECK_EQUAL(fromHex('x', WhenError::DontThrow), -1);
-	BOOST_CHECK_EQUAL(fromHex('x', static_cast<WhenError>(42)), -1);
-
-	BOOST_CHECK_EQUAL(fromHex('0', WhenError::Throw), 0x0);
-	BOOST_CHECK_EQUAL(fromHex('a', WhenError::Throw), 0xa);
-	BOOST_CHECK_THROW(fromHex('x', WhenError::Throw), BadHexCharacter);
-}
-
-BOOST_AUTO_TEST_CASE(fromhex_string)
-{
-	bytes expectation_even = {{0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}};
-	bytes expectation_odd = {{0x00, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xbc, 0xcd, 0xde, 0xef, 0xf0}};
-
-	// Defaults to WhenError::DontThrow
-	BOOST_CHECK_EQUAL(fromHex(""), bytes());
-	BOOST_CHECK_EQUAL(fromHex("00112233445566778899aabbccddeeff"), expectation_even);
-	BOOST_CHECK_EQUAL(fromHex("0x00112233445566778899aabbccddeeff"), expectation_even);
-	BOOST_CHECK_EQUAL(fromHex("0x00112233445566778899aabbccddeeff0"), expectation_odd);
-	BOOST_CHECK_EQUAL(fromHex("gg"), bytes());
-	BOOST_CHECK_EQUAL(fromHex("0xgg"), bytes());
-
-	BOOST_CHECK_EQUAL(fromHex("", WhenError::Throw), bytes());
-	BOOST_CHECK_EQUAL(fromHex("00112233445566778899aabbccddeeff", WhenError::Throw), expectation_even);
-	BOOST_CHECK_EQUAL(fromHex("0x00112233445566778899aabbccddeeff", WhenError::Throw), expectation_even);
-	BOOST_CHECK_EQUAL(fromHex("0x00112233445566778899aabbccddeeff0", WhenError::Throw), expectation_odd);
-	BOOST_CHECK_THROW(fromHex("gg", WhenError::Throw), BadHexCharacter);
-	BOOST_CHECK_THROW(fromHex("0xgg", WhenError::Throw), BadHexCharacter);
-}
-
-BOOST_AUTO_TEST_CASE(tohex_uint8)
-{
-	BOOST_CHECK_EQUAL(toHex(0xaa), "aa");
-	BOOST_CHECK_EQUAL(toHex(0xaa, HexCase::Lower), "aa");
-	BOOST_CHECK_EQUAL(toHex(0xaa, HexCase::Upper), "AA");
-	BOOST_CHECK_THROW(toHex(0xaa, HexCase::Mixed), BadHexCase);
-	// Defaults to lower case on invalid setting.
-	BOOST_CHECK_EQUAL(toHex(0xaa, static_cast<HexCase>(42)), "aa");
-}
-
-BOOST_AUTO_TEST_CASE(tohex_bytes)
-{
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::DontAdd, HexCase::Lower), "00112233445566778899aabbccddeeff");
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::DontAdd, HexCase::Upper), "00112233445566778899AABBCCDDEEFF");
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::DontAdd, HexCase::Mixed), "00112233445566778899aabbCCDDeeff");
-	// Defaults to lower case on invalid setting.
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::DontAdd, static_cast<HexCase>(42)), "00112233445566778899aabbccddeeff");
-
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::Add, HexCase::Lower), "0x00112233445566778899aabbccddeeff");
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::Add, HexCase::Upper), "0x00112233445566778899AABBCCDDEEFF");
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899AaBbCcDdEeFf"), HexPrefix::Add, HexCase::Mixed), "0x00112233445566778899aabbCCDDeeff");
-	// Defaults to lower case on invalid setting.
-	BOOST_CHECK_EQUAL(toHex(fromHex("00112233445566778899aAbBcCdDeEfF"), HexPrefix::Add, static_cast<HexCase>(42)), "0x00112233445566778899aabbccddeeff");
-}
-
-BOOST_AUTO_TEST_CASE(test_format_number)
-{
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x8000000)), "0x08000000");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x80000000)), "0x80000000");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x800000000)), "0x0800000000");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x8000000000)), "0x8000000000");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x80000000000)), "0x080000000000");
-
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x7ffffff)), "0x07ffffff");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x7fffffff)), "0x7fffffff");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x7ffffffff)), "0x07ffffffff");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x7fffffffff)), "0x7fffffffff");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x7ffffffffff)), "0x07ffffffffff");
-
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x88000000)), "0x88000000");
-	BOOST_CHECK_EQUAL(formatNumber(u256(0x8888888888000000)), "0x8888888888000000");
-
-	u256 b = 0;
-	for (int i = 0; i < 32; i++)
-	{
-		b <<= 8;
-		b |= 0x55;
-	}
-	u256 c = u256(FixedHash<32>(
-		fromHex("0xabcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789")
-	));
-	u256 d = u256(0xAAAAaaaaAAAAaaaa) << 192 |
-		u256(0xFFFFffffFFFFffff) << 128 |
-		u256(0xFFFFffffFFFFffff) << 64 |
-		u256(0xFFFFffffFFFFffff);
-	BOOST_CHECK_EQUAL(formatNumber(b), "0x5555555555555555555555555555555555555555555555555555555555555555");
-	BOOST_CHECK_EQUAL(formatNumber(c), "0xabcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789");
-	BOOST_CHECK_EQUAL(formatNumber(d), "0xaaaaaaaaaaaaaaaaffffffffffffffffffffffffffffffffffffffffffffffff");
-
-	BOOST_CHECK_EQUAL(formatNumber(IntegerType(256).minValue()), "0");
-	BOOST_CHECK_EQUAL(
-		formatNumber(IntegerType(256).maxValue()),
-		"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/CommonIO.cpp b/test/libsolutil/CommonIO.cpp
deleted file mode 100644
index d31c9a560d02..000000000000
--- a/test/libsolutil/CommonIO.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Unit tests for the CommonIO routines.
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <test/Common.h>
-#include <test/FilesystemUtils.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-
-#include <fstream>
-#include <string>
-
-using namespace solidity::test;
-
-#define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(CommonIOTest)
-
-BOOST_AUTO_TEST_CASE(readFileAsString_regular_file)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	createFileWithContent(tempDir.path() / "test.txt", "ABC\ndef\n");
-
-	BOOST_TEST(readFileAsString(tempDir.path() / "test.txt") == "ABC\ndef\n");
-}
-
-BOOST_AUTO_TEST_CASE(readFileAsString_directory)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	BOOST_CHECK_THROW(readFileAsString(tempDir), NotAFile);
-}
-
-BOOST_AUTO_TEST_CASE(readFileAsString_symlink)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	createFileWithContent(tempDir.path() / "test.txt", "ABC\ndef\n");
-
-	if (!createSymlinkIfSupportedByFilesystem("test.txt", tempDir.path() / "symlink.txt", false))
-		return;
-
-	BOOST_TEST(readFileAsString(tempDir.path() / "symlink.txt") == "ABC\ndef\n");
-}
-
-BOOST_AUTO_TEST_CASE(readUntilEnd_no_ending_newline)
-{
-	std::istringstream inputStream("ABC\ndef");
-	BOOST_TEST(readUntilEnd(inputStream) == "ABC\ndef");
-}
-
-BOOST_AUTO_TEST_CASE(readUntilEnd_with_ending_newline)
-{
-	std::istringstream inputStream("ABC\ndef\n");
-	BOOST_TEST(readUntilEnd(inputStream) == "ABC\ndef\n");
-}
-
-BOOST_AUTO_TEST_CASE(readUntilEnd_cr_lf_newline)
-{
-	std::istringstream inputStream("ABC\r\ndef");
-	BOOST_TEST(readUntilEnd(inputStream) == "ABC\r\ndef");
-}
-
-BOOST_AUTO_TEST_CASE(readUntilEnd_empty)
-{
-	std::istringstream inputStream("");
-	BOOST_TEST(readUntilEnd(inputStream) == "");
-}
-
-BOOST_AUTO_TEST_CASE(readBytes_past_end)
-{
-	std::istringstream inputStream("abc");
-	BOOST_CHECK_EQUAL(readBytes(inputStream, 0), "");
-	BOOST_CHECK_EQUAL(readBytes(inputStream, 1), "a");
-	BOOST_CHECK_EQUAL(readBytes(inputStream, 20), "bc");
-	BOOST_CHECK_EQUAL(readBytes(inputStream, 20), "");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace solidity::util::test
diff --git a/test/libsolutil/FixedHash.cpp b/test/libsolutil/FixedHash.cpp
deleted file mode 100644
index 3b20a5054a2b..000000000000
--- a/test/libsolutil/FixedHash.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Unit tests for FixedHash.
- */
-
-#include <libsolutil/FixedHash.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <cstdint>
-#include <sstream>
-
-
-namespace solidity::util::test
-{
-
-static_assert(std::is_same<h160, FixedHash<20>>());
-static_assert(std::is_same<h256, FixedHash<32>>());
-
-BOOST_AUTO_TEST_SUITE(FixedHashTest)
-
-BOOST_AUTO_TEST_CASE(default_constructor)
-{
-	BOOST_CHECK_EQUAL(
-		FixedHash<1>{}.hex(),
-		"00"
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<1>{}.size,
-		1
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<8>{}.hex(),
-		"0000000000000000"
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<8>{}.size,
-		8
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<20>{}.hex(),
-		"0000000000000000000000000000000000000000"
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<20>{}.size,
-		20
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<32>{}.hex(),
-		"0000000000000000000000000000000000000000000000000000000000000000"
-	);
-	BOOST_CHECK_EQUAL(
-		FixedHash<32>{}.size,
-		32
-	);
-}
-
-BOOST_AUTO_TEST_CASE(bytes_constructor)
-{
-	FixedHash<8> a(bytes{});
-	BOOST_CHECK_EQUAL(a.size, 8);
-	BOOST_CHECK_EQUAL(a.hex(), "0000000000000000");
-
-	FixedHash<8> b(bytes{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88});
-	BOOST_CHECK_EQUAL(b.size, 8);
-	BOOST_CHECK_EQUAL(b.hex(), "1122334455667788");
-
-	// TODO: short input, this should fail
-	FixedHash<8> c(bytes{0x11, 0x22, 0x33, 0x44, 0x55, 0x66});
-	BOOST_CHECK_EQUAL(c.size, 8);
-	BOOST_CHECK_EQUAL(c.hex(), "0000000000000000");
-
-	// TODO: oversized input, this should fail
-	FixedHash<8> d(bytes{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99});
-	BOOST_CHECK_EQUAL(d.size, 8);
-	BOOST_CHECK_EQUAL(d.hex(), "0000000000000000");
-}
-
-// TODO: add FixedHash(bytesConstRef) constructor
-
-BOOST_AUTO_TEST_CASE(string_constructor_fromhex)
-{
-	// TODO: this tests the default settings ConstructFromStringType::fromHex, ConstructFromHashType::FailIfDifferent
-	//       should test other options too
-
-	FixedHash<8> a("");
-	BOOST_CHECK_EQUAL(a.size, 8);
-	BOOST_CHECK_EQUAL(a.hex(), "0000000000000000");
-
-	FixedHash<8> b("1122334455667788");
-	BOOST_CHECK_EQUAL(b.size, 8);
-	BOOST_CHECK_EQUAL(b.hex(), "1122334455667788");
-
-	FixedHash<8> c("0x1122334455667788");
-	BOOST_CHECK_EQUAL(c.size, 8);
-	BOOST_CHECK_EQUAL(c.hex(), "1122334455667788");
-
-	// TODO: short input, this should fail
-	FixedHash<8> d("112233445566");
-	BOOST_CHECK_EQUAL(d.size, 8);
-	BOOST_CHECK_EQUAL(d.hex(), "0000000000000000");
-
-	// TODO: oversized input, this should fail
-	FixedHash<8> e("112233445566778899");
-	BOOST_CHECK_EQUAL(e.size, 8);
-	BOOST_CHECK_EQUAL(e.hex(), "0000000000000000");
-}
-
-BOOST_AUTO_TEST_CASE(string_constructor_frombytes)
-{
-
-	FixedHash<8> b("", FixedHash<8>::FromBinary);
-	BOOST_CHECK_EQUAL(b.size, 8);
-	BOOST_CHECK_EQUAL(b.hex(), "0000000000000000");
-
-	FixedHash<8> c("abcdefgh", FixedHash<8>::FromBinary);
-	BOOST_CHECK_EQUAL(c.size, 8);
-	BOOST_CHECK_EQUAL(c.hex(), "6162636465666768");
-
-	// TODO: short input, this should fail
-	FixedHash<8> d("abcdefg", FixedHash<8>::FromBinary);
-	BOOST_CHECK_EQUAL(d.size, 8);
-	BOOST_CHECK_EQUAL(d.hex(), "0000000000000000");
-
-	// TODO: oversized input, this should fail
-	FixedHash<8> e("abcdefghi", FixedHash<8>::FromBinary);
-	BOOST_CHECK_EQUAL(e.size, 8);
-	BOOST_CHECK_EQUAL(e.hex(), "0000000000000000");
-}
-
-BOOST_AUTO_TEST_CASE(converting_constructor)
-{
-	// Left-aligned truncation
-	FixedHash<8> a = FixedHash<8>(FixedHash<12>("112233445566778899001122"), FixedHash<8>::AlignLeft);
-	BOOST_CHECK_EQUAL(a.size, 8);
-	BOOST_CHECK_EQUAL(a.hex(), "1122334455667788");
-
-	// Right-aligned truncation
-	FixedHash<8> b = FixedHash<8>(FixedHash<12>("112233445566778899001122"), FixedHash<8>::AlignRight);
-	BOOST_CHECK_EQUAL(b.size, 8);
-	BOOST_CHECK_EQUAL(b.hex(), "5566778899001122");
-
-	// Left-aligned extension
-	FixedHash<12> c = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::AlignLeft);
-	BOOST_CHECK_EQUAL(c.size, 12);
-	BOOST_CHECK_EQUAL(c.hex(), "112233445566778800000000");
-
-	// Right-aligned extension
-	FixedHash<12> d = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::AlignRight);
-	BOOST_CHECK_EQUAL(d.size, 12);
-	BOOST_CHECK_EQUAL(d.hex(), "000000001122334455667788");
-
-	// FailIfDifferent setting
-	// TODO: Shouldn't this throw?
-	FixedHash<12> e = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::FailIfDifferent);
-	BOOST_CHECK_EQUAL(e, c);
-}
-
-BOOST_AUTO_TEST_CASE(arith_constructor)
-{
-	FixedHash<32> b(u256(0x12340000));
-	BOOST_CHECK_EQUAL(
-		b.hex(),
-		"0000000000000000000000000000000000000000000000000000000012340000"
-	);
-
-	// NOTE: size-mismatched constructor is not available
-}
-
-BOOST_AUTO_TEST_CASE(to_arith)
-{
-	FixedHash<32> b("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-	BOOST_CHECK_EQUAL(u256(b), u256("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
-}
-
-BOOST_AUTO_TEST_CASE(comparison)
-{
-	FixedHash<32> a("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-	FixedHash<32> b("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-	FixedHash<32> c("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a471");
-	FixedHash<32> d("233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470c5d2460186f7");
-
-	BOOST_CHECK(a == a);
-	BOOST_CHECK(b == b);
-	BOOST_CHECK(a == b);
-	BOOST_CHECK(b == a);
-	BOOST_CHECK(a != c);
-	BOOST_CHECK(c != a);
-	BOOST_CHECK(a != d);
-	BOOST_CHECK(d != a);
-
-	// Only equal size comparison is supported.
-	BOOST_CHECK(FixedHash<8>{} == FixedHash<8>{});
-	BOOST_CHECK(FixedHash<32>{} != b);
-
-	// Only equal size less than comparison is supported.
-	BOOST_CHECK(!(a < b));
-	BOOST_CHECK(d < c);
-	BOOST_CHECK(FixedHash<32>{} < a);
-}
-
-BOOST_AUTO_TEST_CASE(indexing)
-{
-	// NOTE: uses std::array, so "Accessing a nonexistent element through this operator is undefined behavior."
-
-	FixedHash<32> a("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-	BOOST_CHECK_EQUAL(a[0], 0xc5);
-	BOOST_CHECK_EQUAL(a[1], 0xd2);
-	BOOST_CHECK_EQUAL(a[31], 0x70);
-	a[0] = 0xff;
-	a[31] = 0x54;
-	BOOST_CHECK_EQUAL(a[0], 0xff);
-	BOOST_CHECK_EQUAL(a[1], 0xd2);
-	BOOST_CHECK_EQUAL(a[31], 0x54);
-}
-
-BOOST_AUTO_TEST_CASE(misc)
-{
-	FixedHash<32> a("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-
-	uint8_t* mut_a = a.data();
-	uint8_t const* const_a = a.data();
-	BOOST_CHECK_EQUAL(mut_a, const_a);
-	BOOST_CHECK_EQUAL(memcmp(mut_a, const_a, a.size), 0);
-
-	bytes bytes_a = a.asBytes();
-	bytesRef bytesref_a = a.ref();
-	bytesConstRef bytesconstref_a = a.ref();
-
-	// There's no printing for bytesRef/bytesConstRef
-	BOOST_CHECK(bytes(a.data(), a.data() + a.size) == bytes_a);
-	BOOST_CHECK(bytesRef(a.data(), a.size) == bytesref_a);
-	BOOST_CHECK(bytesConstRef(a.data(), a.size) == bytesconstref_a);
-}
-
-BOOST_AUTO_TEST_CASE(tostream)
-{
-	std::ostringstream out;
-	out << FixedHash<4>("44114411");
-	out << FixedHash<32>{};
-	out << FixedHash<2>("f77f");
-	out << FixedHash<1>("1");
-	BOOST_CHECK_EQUAL(out.str(), "441144110000000000000000000000000000000000000000000000000000000000000000f77f01");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/FunctionSelector.cpp b/test/libsolutil/FunctionSelector.cpp
deleted file mode 100644
index e8080df49baf..000000000000
--- a/test/libsolutil/FunctionSelector.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Unit tests for FunctionSelector.
- */
-
-#include <libsolutil/FunctionSelector.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <cstdint>
-#include <sstream>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(FunctionSelectorTest)
-
-BOOST_AUTO_TEST_CASE(conversions)
-{
-	BOOST_CHECK_EQUAL(
-		util::selectorFromSignatureH32("test()"),
-		util::FixedHash<4>(0xf8a8fd6d)
-	);
-	BOOST_CHECK_EQUAL(
-		util::selectorFromSignatureU32("test()"),
-		0xf8a8fd6d
-	);
-	BOOST_CHECK_EQUAL(
-		util::selectorFromSignatureU256("test()"),
-		u256("0xf8a8fd6d00000000000000000000000000000000000000000000000000000000")
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/IpfsHash.cpp b/test/libsolutil/IpfsHash.cpp
deleted file mode 100644
index 47fa120ecdbc..000000000000
--- a/test/libsolutil/IpfsHash.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the ipfs hash computation routine.
- */
-
-#include <libsolutil/IpfsHash.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(IpfsHash, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(test_small)
-{
-	BOOST_CHECK_EQUAL(ipfsHashBase58({}), "QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH");
-	BOOST_CHECK_EQUAL(ipfsHashBase58("x"), "QmULKig5Fxrs2sC4qt9nNduucXfb92AFYQ6Hi3YRqDmrYC");
-	BOOST_CHECK_EQUAL(ipfsHashBase58("Solidity\n"), "QmSsm9M7PQRBnyiz1smizk8hZw3URfk8fSeHzeTo3oZidS");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(200ul, char(0))), "QmSXR1N23uWzsANi8wpxMPw5dmmhqBVUAb4hUrHVLpNaMr");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(10250ul, char(0))), "QmVJJBB3gKKBWYC9QTywpH8ZL1bDeTDJ17B63Af5kino9i");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(100000ul, char(0))), "QmYgKa25YqEGpQmmZtPPFMNK3kpqqneHk6nMSEUYryEX1C");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(121071ul, char(0))), "QmdMdRshQmqvyc92N82r7AKYdUF5FRh4DJo6GtrmEk3wgj");
-}
-
-BOOST_AUTO_TEST_CASE(test_medium)
-{
-	size_t length = 131071;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmSxYSToKHsPqqRdRnsM9gmr3EYS6dakhVaHgbFdgYQWi6");
-}
-
-BOOST_AUTO_TEST_CASE(test_largest_unchunked)
-{
-	size_t length = 1024 * 256 - 1;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmbNDspMkzkMFKyS3eCJGedG7GWRQHSCzJCZLjxP7wyVAx");
-}
-
-BOOST_AUTO_TEST_CASE(test_smallest_chunked)
-{
-	size_t length = 1024 * 256 + 1;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmbVuw4C4vcmVKqxoWtgDVobvcHrSn51qsmQmyxjk4sB2Q");
-}
-
-BOOST_AUTO_TEST_CASE(test_large)
-{
-	size_t length = 1310710;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmNg7BJo8gEMDK8yGQbHEwPtycesnE6FUULX5iVd5TAL9f");
-}
-
-BOOST_AUTO_TEST_CASE(test_largest_one_level)
-{
-	size_t length = 45613056; // 1024 * 256 * 174;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmY4HSz1oVGdUzb8poVYPLsoqBZjH6LZrtgnme9wWn2Qko");
-}
-
-BOOST_AUTO_TEST_CASE(test_smallest_multi_level)
-{
-	size_t length = 45613057; // 1024 * 256 * 174 + 1;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmehMASWcBsX7VcEQqs6rpR5AHoBfKyBVEgmkJHjpPg8jq");
-}
-
-BOOST_AUTO_TEST_CASE(test_multi_level_tree)
-{
-	size_t length = 46661632;
-	std::string data;
-	data.resize(length, 0);
-	BOOST_REQUIRE_EQUAL(data.size(), length);
-	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmaTb1sT9hrSXJLmf8bxJ9NuwndiHuMLsgNLgkS2eXu3Xj");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/IterateReplacing.cpp b/test/libsolutil/IterateReplacing.cpp
deleted file mode 100644
index 7b70f155f219..000000000000
--- a/test/libsolutil/IterateReplacing.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the iterateReplacing function
- */
-
-#include <libsolutil/CommonData.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(IterateReplacing, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(no_replacement)
-{
-	std::vector<std::string> v{"abc", "def", "ghi"};
-	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string&) -> std::optional<std::vector<std::string>> { return {}; };
-	iterateReplacing(v, f);
-	std::vector<std::string> expectation{"abc", "def", "ghi"};
-	BOOST_CHECK(v == expectation);
-}
-
-BOOST_AUTO_TEST_CASE(empty_input)
-{
-	std::vector<std::string> v;
-	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string&) -> std::optional<std::vector<std::string>> { return {}; };
-	iterateReplacing(v, f);
-	std::vector<std::string> expectation;
-	BOOST_CHECK(v == expectation);
-}
-
-BOOST_AUTO_TEST_CASE(delete_some)
-{
-	std::vector<std::string> v{"abc", "def", "ghi"};
-	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string& _s) -> std::optional<std::vector<std::string>> {
-		if (_s == "def")
-			return std::vector<std::string>();
-		else
-			return {};
-	};
-	iterateReplacing(v, f);
-	std::vector<std::string> expectation{"abc", "ghi"};
-	BOOST_CHECK(v == expectation);
-}
-
-BOOST_AUTO_TEST_CASE(inject_some_start)
-{
-	std::vector<std::string> v{"abc", "def", "ghi"};
-	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string& _s) -> std::optional<std::vector<std::string>> {
-		if (_s == "abc")
-			return std::vector<std::string>{"x", "y"};
-		else
-			return {};
-	};
-	iterateReplacing(v, f);
-	std::vector<std::string> expectation{"x", "y", "def", "ghi"};
-	BOOST_CHECK(v == expectation);
-}
-
-BOOST_AUTO_TEST_CASE(inject_some_end)
-{
-	std::vector<std::string> v{"abc", "def", "ghi"};
-	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string& _s) -> std::optional<std::vector<std::string>> {
-		if (_s == "ghi")
-			return std::vector<std::string>{"x", "y"};
-		else
-			return {};
-	};
-	iterateReplacing(v, f);
-	std::vector<std::string> expectation{"abc", "def", "x", "y"};
-	BOOST_CHECK(v == expectation);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/JSON.cpp b/test/libsolutil/JSON.cpp
deleted file mode 100644
index da10c0b3c6a9..000000000000
--- a/test/libsolutil/JSON.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2018
- * Unit tests for JSON.h.
- */
-
-#include <libsolutil/JSON.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(JsonTest, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(json_types)
-{
-	auto check = [](Json::Value value, std::string const& expectation) {
-		BOOST_CHECK(jsonCompactPrint(value) == expectation);
-	};
-
-	Json::Value value;
-	BOOST_CHECK(value.empty());
-	value = {};
-	BOOST_CHECK(value.empty());
-	value = Json::Value();
-	BOOST_CHECK(value.empty());
-	value = Json::nullValue;
-	BOOST_CHECK(value.empty());
-
-	check(value, "null");
-	check({}, "null");
-	check(Json::Value(), "null");
-	check(Json::nullValue, "null");
-	check(Json::objectValue, "{}");
-	check(Json::arrayValue, "[]");
-	check(Json::UInt(1), "1");
-	check(Json::UInt(-1), "4294967295");
-	check(Json::UInt64(1), "1");
-	check(Json::UInt64(-1), "18446744073709551615");
-	check(Json::LargestUInt(1), "1");
-	check(Json::LargestUInt(-1), "18446744073709551615");
-	check(Json::LargestUInt(0xffffffff), "4294967295");
-	check(Json::Value("test"), "\"test\"");
-	check("test", "\"test\"");
-	check(true, "true");
-
-	value = Json::objectValue;
-	value["key"] = "value";
-	check(value, "{\"key\":\"value\"}");
-
-	value = Json::arrayValue;
-	value.append(1);
-	value.append(2);
-	check(value, "[1,2]");
-}
-
-BOOST_AUTO_TEST_CASE(json_pretty_print)
-{
-	Json::Value json;
-	Json::Value jsonChild;
-
-	jsonChild["3.1"] = "3.1";
-	jsonChild["3.2"] = 2;
-	json["1"] = 1;
-	json["2"] = "2";
-	json["3"] = jsonChild;
-	json["4"] = "ऑ ऒ ओ औ क ख";
-	json["5"] = "\xff";
-
-	BOOST_CHECK(
-	"{\n"
-	"  \"1\": 1,\n"
-	"  \"2\": \"2\",\n"
-	"  \"3\":\n"
-	"  {\n"
-	"    \"3.1\": \"3.1\",\n"
-	"    \"3.2\": 2\n"
-	"  },\n"
-	"  \"4\": \"\\u0911 \\u0912 \\u0913 \\u0914 \\u0915 \\u0916\",\n"
-	"  \"5\": \"\\ufffd\"\n"
-	"}" == jsonPrettyPrint(json));
-}
-
-BOOST_AUTO_TEST_CASE(json_compact_print)
-{
-	Json::Value json;
-	Json::Value jsonChild;
-
-	jsonChild["3.1"] = "3.1";
-	jsonChild["3.2"] = 2;
-	json["1"] = 1;
-	json["2"] = "2";
-	json["3"] = jsonChild;
-	json["4"] = "ऑ ऒ ओ औ क ख";
-	json["5"] = "\xff";
-
-	BOOST_CHECK("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2},\"4\":\"\\u0911 \\u0912 \\u0913 \\u0914 \\u0915 \\u0916\",\"5\":\"\\ufffd\"}" == jsonCompactPrint(json));
-}
-
-BOOST_AUTO_TEST_CASE(parse_json_strict)
-{
-	// In this test we check conformance against JSON.parse (https://tc39.es/ecma262/multipage/structured-data.html#sec-json.parse)
-	// and ECMA-404 (https://www.ecma-international.org/publications-and-standards/standards/ecma-404/)
-
-	Json::Value json;
-	std::string errors;
-
-	// Just parse a valid json input
-	BOOST_CHECK(jsonParseStrict("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2}}", json, &errors));
-	BOOST_CHECK(json["1"] == 1);
-	BOOST_CHECK(json["2"] == "2");
-	BOOST_CHECK(json["3"]["3.1"] == "3.1");
-	BOOST_CHECK(json["3"]["3.2"] == 2);
-
-	// Trailing garbage is not allowed in ECMA-262
-	BOOST_CHECK(!jsonParseStrict("{\"1\":2,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":3}}}}}}}}}}", json, &errors));
-
-	// Comments are not allowed in ECMA-262
-	// ... but JSONCPP allows them
-	BOOST_CHECK(jsonParseStrict(
-		"{\"1\":3, // awesome comment\n\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":5}}", json, &errors
-	));
-	BOOST_CHECK(json["1"] == 3);
-	BOOST_CHECK(json["2"] == "2");
-	BOOST_CHECK(json["3"]["3.1"] == "3.1");
-	BOOST_CHECK(json["3"]["3.2"] == 5);
-
-	// According to ECMA-404 object, array, number, string, true, false, null are allowed
-	// ... but JSONCPP disallows value types
-	BOOST_CHECK(jsonParseStrict("[]", json, &errors));
-	BOOST_CHECK(json.isArray());
-	BOOST_CHECK(jsonParseStrict("{}", json, &errors));
-	BOOST_CHECK(json.isObject());
-	BOOST_CHECK(!jsonParseStrict("1", json, &errors));
-	// BOOST_CHECK(json.isNumeric());
-	BOOST_CHECK(!jsonParseStrict("\"hello\"", json, &errors));
-	// BOOST_CHECK(json.isString());
-	BOOST_CHECK(!jsonParseStrict("true", json, &errors));
-	// BOOST_CHECK(json.isBool());
-	BOOST_CHECK(!jsonParseStrict("null", json, &errors));
-	// BOOST_CHECK(json.isNull());
-
-	// Single quotes are also disallowed by ECMA-404
-	BOOST_CHECK(!jsonParseStrict("'hello'", json, &errors));
-	// BOOST_CHECK(json.isString());
-
-	// Only string keys in objects are allowed in ECMA-404
-	BOOST_CHECK(!jsonParseStrict("{ 42: \"hello\" }", json, &errors));
-
-	// According to ECMA-404 hex escape sequences are not allowed, only unicode (\uNNNN) and
-	// a few control characters (\b, \f, \n, \r, \t)
-	//
-	// More lenient parsers allow hex escapes as long as they translate to a valid UTF-8 encoding.
-	//
-	// ... but JSONCPP allows any hex escapes
-	BOOST_CHECK(jsonParseStrict("[ \"\x80\xec\x80\" ]", json, &errors));
-	BOOST_CHECK(json.isArray());
-	BOOST_CHECK(json[0] == "\x80\xec\x80");
-
-	// This would be valid more lenient parsers.
-	BOOST_CHECK(jsonParseStrict("[ \"\xF0\x9F\x98\x8A\" ]", json, &errors));
-	BOOST_CHECK(json.isArray());
-	BOOST_CHECK(json[0] == "😊");
-}
-
-BOOST_AUTO_TEST_CASE(json_isOfType)
-{
-	Json::Value json;
-
-	json["float"] = 3.1f;
-	json["double"] = 3.1;
-	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
-	json["string"] = "Hello World!";
-
-	BOOST_CHECK(isOfType<float>(json["float"]));
-	BOOST_CHECK(isOfType<double>(json["double"]));
-	BOOST_CHECK(isOfType<int>(json["int"]));
-	BOOST_CHECK(isOfType<Json::Int>(json["int"]));
-	BOOST_CHECK(isOfType<Json::UInt>(json["int"]));
-	BOOST_CHECK(isOfType<Json::Int64>(json["int"]));
-	BOOST_CHECK(isOfType<Json::Int64>(json["int64"]));
-	BOOST_CHECK(isOfType<Json::UInt64>(json["int64"]));
-	BOOST_CHECK(isOfType<std::string>(json["string"]));
-	BOOST_CHECK(!isOfType<Json::Int>(json["int64"]));
-	BOOST_CHECK(!isOfType<int>(json["double"]));
-	BOOST_CHECK(!isOfType<float>(json["string"]));
-	BOOST_CHECK(!isOfType<double>(json["string"]));
-	BOOST_CHECK(!isOfType<Json::Int>(json["string"]));
-	BOOST_CHECK(!isOfType<Json::Int64>(json["string"]));
-	BOOST_CHECK(!isOfType<Json::UInt>(json["string"]));
-	BOOST_CHECK(!isOfType<Json::UInt64>(json["string"]));
-}
-
-BOOST_AUTO_TEST_CASE(json_isisOfTypeIfExists)
-{
-	Json::Value json;
-
-	json["float"] = 3.1f;
-	json["double"] = 3.1;
-	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
-	json["string"] = "Hello World!";
-
-	BOOST_CHECK(isOfTypeIfExists<float>(json, "float"));
-	BOOST_CHECK(isOfTypeIfExists<double>(json, "double"));
-	BOOST_CHECK(isOfTypeIfExists<int>(json, "int"));
-	BOOST_CHECK(isOfTypeIfExists<Json::Int>(json, "int"));
-	BOOST_CHECK(isOfTypeIfExists<Json::UInt>(json, "int"));
-	BOOST_CHECK(isOfTypeIfExists<Json::Int64>(json, "int"));
-	BOOST_CHECK(isOfTypeIfExists<Json::Int64>(json, "int64"));
-	BOOST_CHECK(isOfTypeIfExists<Json::UInt64>(json, "int64"));
-	BOOST_CHECK(isOfTypeIfExists<std::string>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<Json::Int>(json, "int64"));
-	BOOST_CHECK(!isOfTypeIfExists<int>(json, "double"));
-	BOOST_CHECK(!isOfTypeIfExists<float>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<double>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<Json::Int>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<Json::Int64>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<Json::UInt>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<Json::UInt64>(json, "string"));
-	BOOST_CHECK(isOfTypeIfExists<Json::UInt64>(json, "NOT_EXISTING"));
-}
-
-BOOST_AUTO_TEST_CASE(json_getOrDefault)
-{
-	Json::Value json;
-
-	json["float"] = 3.1f;
-	json["double"] = 3.1;
-	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
-	json["uint64"] = Json::UInt64{0x5000000000000000};
-	json["string"] = "Hello World!";
-
-	BOOST_CHECK(getOrDefault<float>(json["float"]) == 3.1f);
-	BOOST_CHECK(getOrDefault<float>(json["float"], -1.1f) == 3.1f);
-	BOOST_CHECK(getOrDefault<float>(json["no_float"], -1.1f) == -1.1f);
-	BOOST_CHECK(getOrDefault<double>(json["double"]) == 3.1);
-	BOOST_CHECK(getOrDefault<double>(json["double"], -1) == 3.1);
-	BOOST_CHECK(getOrDefault<double>(json["no_double"], -1.1) == -1.1);
-	BOOST_CHECK(getOrDefault<int>(json["int"]) == 2);
-	BOOST_CHECK(getOrDefault<int>(json["int"], -1) == 2);
-	BOOST_CHECK(getOrDefault<int>(json["no_int"], -1) == -1);
-	BOOST_CHECK(getOrDefault<Json::Int>(json["int"]) == 2);
-	BOOST_CHECK(getOrDefault<Json::Int>(json["int"], -1) == 2);
-	BOOST_CHECK(getOrDefault<Json::Int>(json["no_int"], -1) == -1);
-	BOOST_CHECK(getOrDefault<Json::UInt>(json["int"]) == 2);
-	BOOST_CHECK(getOrDefault<Json::UInt>(json["int"], 1) == 2);
-	BOOST_CHECK(getOrDefault<Json::UInt>(json["no_int"], 1) == 1);
-	BOOST_CHECK(getOrDefault<Json::Int64>(json["int"]) == 2);
-	BOOST_CHECK(getOrDefault<Json::Int64>(json["int"], -1) == 2);
-	BOOST_CHECK(getOrDefault<Json::Int64>(json["no_int"], -1) == -1);
-	BOOST_CHECK(getOrDefault<Json::Int64>(json["int64"]) == 0x4000000000000000);
-	BOOST_CHECK(getOrDefault<Json::Int64>(json["int64"], -1) == 0x4000000000000000);
-	BOOST_CHECK(getOrDefault<Json::Int64>(json["no_int64"], -1) == -1);
-	BOOST_CHECK(getOrDefault<Json::UInt64>(json["int64"]) == 0x4000000000000000);
-	BOOST_CHECK(getOrDefault<Json::UInt64>(json["int64"], 1) == 0x4000000000000000);
-	BOOST_CHECK(getOrDefault<Json::UInt64>(json["no_int64"], 1) == 1);
-	BOOST_CHECK(getOrDefault<Json::UInt64>(json["uint64"]) == 0x5000000000000000);
-	BOOST_CHECK(getOrDefault<Json::UInt64>(json["uint64"], 1) == 0x5000000000000000);
-	BOOST_CHECK(getOrDefault<Json::UInt64>(json["no_uint64"], 1) == 1);
-	BOOST_CHECK(getOrDefault<std::string>(json["string"], "ERROR") == "Hello World!");
-	BOOST_CHECK(getOrDefault<std::string>(json["no_string"]).empty());
-	BOOST_CHECK(getOrDefault<std::string>(json["no_string"], "ERROR") == "ERROR");
-}
-
-BOOST_AUTO_TEST_CASE(json_get)
-{
-	Json::Value json;
-
-	json["float"] = 3.1f;
-	json["double"] = 3.1;
-	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
-	json["uint64"] = Json::UInt64{0x5000000000000000};
-	json["string"] = "Hello World!";
-
-	BOOST_CHECK(get<float>(json["float"]) == 3.1f);
-	BOOST_CHECK(get<double>(json["double"]) == 3.1);
-	BOOST_CHECK(get<int>(json["int"]) == 2);
-	BOOST_CHECK(get<Json::Int>(json["int"]) == 2);
-	BOOST_CHECK(get<Json::UInt>(json["int"]) == 2);
-	BOOST_CHECK(get<Json::Int64>(json["int"]) == 2);
-	BOOST_CHECK(get<Json::Int64>(json["int64"]) == 0x4000000000000000);
-	BOOST_CHECK(get<Json::UInt64>(json["int64"]) == 0x4000000000000000);
-	BOOST_CHECK(get<Json::UInt64>(json["uint64"]) == 0x5000000000000000);
-	BOOST_CHECK(get<std::string>(json["string"]) == "Hello World!");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/Keccak256.cpp b/test/libsolutil/Keccak256.cpp
deleted file mode 100644
index 066e909f7853..000000000000
--- a/test/libsolutil/Keccak256.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for keccak256.
- */
-#include <libsolutil/Keccak256.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(Keccak256, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(empty)
-{
-	BOOST_CHECK_EQUAL(
-		keccak256(bytes()),
-		FixedHash<32>("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
-	);
-}
-
-BOOST_AUTO_TEST_CASE(zeros)
-{
-	BOOST_CHECK_EQUAL(
-		keccak256(bytes(1, '\0')),
-		FixedHash<32>("0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a")
-	);
-	BOOST_CHECK_EQUAL(
-		keccak256(bytes(2, '\0')),
-		FixedHash<32>("0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798")
-	);
-	BOOST_CHECK_EQUAL(
-		keccak256(bytes(5, '\0')),
-		FixedHash<32>("0xc41589e7559804ea4a2080dad19d876a024ccb05117835447d72ce08c1d020ec")
-	);
-	BOOST_CHECK_EQUAL(
-		keccak256(bytes(10, '\0')),
-		FixedHash<32>("0x6bd2dd6bd408cbee33429358bf24fdc64612fbf8b1b4db604518f40ffd34b607")
-	);
-}
-
-BOOST_AUTO_TEST_CASE(strings)
-{
-	BOOST_CHECK_EQUAL(
-		keccak256("test"),
-		FixedHash<32>("0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658")
-	);
-	BOOST_CHECK_EQUAL(
-		keccak256("longer test string"),
-		FixedHash<32>("0x47bed17bfbbc08d6b5a0f603eff1b3e932c37c10b865847a7bc73d55b260f32a")
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/LEB128.cpp b/test/libsolutil/LEB128.cpp
deleted file mode 100644
index ccbacf13d6ab..000000000000
--- a/test/libsolutil/LEB128.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for LEB128.
- */
-
-#include <libsolutil/LEB128.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(LEB128Test)
-
-BOOST_AUTO_TEST_CASE(encode_unsigned)
-{
-	bytes zero = solidity::util::lebEncode(0);
-	BOOST_REQUIRE(zero.size() == 1);
-	BOOST_REQUIRE(zero[0] == 0x00);
-
-	bytes one = solidity::util::lebEncode(1);
-	BOOST_REQUIRE(one.size() == 1);
-	BOOST_REQUIRE(one[0] == 0x01);
-
-	bytes large = solidity::util::lebEncode(624485);
-	BOOST_REQUIRE(large.size() == 3);
-	BOOST_REQUIRE(large[0] == 0xE5);
-	BOOST_REQUIRE(large[1] == 0x8E);
-	BOOST_REQUIRE(large[2] == 0x26);
-
-	bytes larger = solidity::util::lebEncodeSigned(123456123456);
-	BOOST_REQUIRE(larger.size() == 6);
-	BOOST_REQUIRE(larger[0] == 0xC0);
-	BOOST_REQUIRE(larger[1] == 0xE4);
-	BOOST_REQUIRE(larger[2] == 0xBB);
-	BOOST_REQUIRE(larger[3] == 0xF4);
-	BOOST_REQUIRE(larger[4] == 0xCB);
-	BOOST_REQUIRE(larger[5] == 0x03);
-}
-
-BOOST_AUTO_TEST_CASE(encode_signed)
-{
-	bytes zero = solidity::util::lebEncodeSigned(0);
-	BOOST_REQUIRE(zero.size() == 1);
-	BOOST_REQUIRE(zero[0] == 0x00);
-
-	bytes one = solidity::util::lebEncodeSigned(1);
-	BOOST_REQUIRE(one.size() == 1);
-	BOOST_REQUIRE(one[0] == 0x01);
-
-	bytes negative_one = solidity::util::lebEncodeSigned(-1);
-	BOOST_REQUIRE(negative_one.size() == 1);
-	BOOST_REQUIRE(negative_one[0] == 0x7f);
-
-	bytes negative_two = solidity::util::lebEncodeSigned(-2);
-	BOOST_REQUIRE(negative_two.size() == 1);
-	BOOST_REQUIRE(negative_two[0] == 0x7e);
-
-	bytes large = solidity::util::lebEncodeSigned(624485);
-	BOOST_REQUIRE(large.size() == 3);
-	BOOST_REQUIRE(large[0] == 0xE5);
-	BOOST_REQUIRE(large[1] == 0x8E);
-	BOOST_REQUIRE(large[2] == 0x26);
-
-	bytes negative_large = solidity::util::lebEncodeSigned(-123456);
-	BOOST_REQUIRE(negative_large.size() == 3);
-	BOOST_REQUIRE(negative_large[0] == 0xC0);
-	BOOST_REQUIRE(negative_large[1] == 0xBB);
-	BOOST_REQUIRE(negative_large[2] == 0x78);
-
-	bytes negative_larger = solidity::util::lebEncodeSigned(-123456123456);
-	BOOST_REQUIRE(negative_larger.size() == 6);
-	BOOST_REQUIRE(negative_larger[0] == 0xC0);
-	BOOST_REQUIRE(negative_larger[1] == 0x9B);
-	BOOST_REQUIRE(negative_larger[2] == 0xC4);
-	BOOST_REQUIRE(negative_larger[3] == 0x8B);
-	BOOST_REQUIRE(negative_larger[4] == 0xB4);
-	BOOST_REQUIRE(negative_larger[5] == 0x7C);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/LazyInit.cpp b/test/libsolutil/LazyInit.cpp
deleted file mode 100644
index 51ee3ee1e720..000000000000
--- a/test/libsolutil/LazyInit.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/LazyInit.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <utility>
-
-namespace solidity::util::test
-{
-
-namespace
-{
-
-template<typename T>
-void assertInitCalled(LazyInit<T> lazyInit, bool target)
-{
-	bool initCalled = false;
-
-	lazyInit.init([&]{
-	  initCalled = true;
-	  return T();
-	});
-
-	BOOST_REQUIRE_EQUAL(initCalled, target);
-}
-
-// Take ownership to ensure that it doesn't "mutate"
-template<typename T>
-void assertNotEmpty(LazyInit<T> _lazyInit) { assertInitCalled(std::move(_lazyInit), false); }
-
-// Take ownership to ensure that it doesn't "mutate"
-template<typename T>
-void assertEmpty(LazyInit<T> _lazyInit) { assertInitCalled(std::move(_lazyInit), true); }
-
-template<typename T>
-T valueOf(LazyInit<T> _lazyInit)
-{
-	return _lazyInit.init([&]{
-		BOOST_REQUIRE(false); // this should never be called
-		return T();
-	});
-}
-
-}
-
-BOOST_AUTO_TEST_SUITE(LazyInitTests, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(default_constructed_is_empty)
-{
-	assertEmpty(LazyInit<int>());
-	assertEmpty(LazyInit<int const>());
-}
-
-BOOST_AUTO_TEST_CASE(initialized_is_not_empty)
-{
-	LazyInit<int> lazyInit;
-	lazyInit.init([]{ return 12; });
-
-	assertNotEmpty(std::move(lazyInit));
-}
-
-BOOST_AUTO_TEST_CASE(init_returns_init_value)
-{
-	LazyInit<int> lazyInit;
-
-	BOOST_CHECK_EQUAL(lazyInit.init([]{ return 12; }), 12);
-
-	// A second call to init should not change the value
-	BOOST_CHECK_EQUAL(lazyInit.init([]{ return 42; }), 12);
-}
-
-BOOST_AUTO_TEST_CASE(moved_from_is_empty)
-{
-	{
-		LazyInit<int> lazyInit;
-		{ [[maybe_unused]] auto pilfered = std::move(lazyInit); }
-
-		assertEmpty(std::move(lazyInit));
-	}
-
-	{
-		LazyInit<int> lazyInit;
-		lazyInit.init([]{ return 12; });
-
-		{ [[maybe_unused]] auto pilfered = std::move(lazyInit); }
-
-		assertEmpty(std::move(lazyInit));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(move_constructed_has_same_value_as_original)
-{
-	LazyInit<int> original;
-	original.init([]{ return 12; });
-
-	LazyInit<int> moveConstructed = std::move(original);
-	BOOST_CHECK_EQUAL(valueOf(std::move(moveConstructed)), 12);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/StringUtils.cpp b/test/libsolutil/StringUtils.cpp
deleted file mode 100644
index 589efa9060f7..000000000000
--- a/test/libsolutil/StringUtils.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the StringUtils routines.
- */
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/StringUtils.h>
-
-#include <libsolidity/ast/Types.h>  // for IntegerType
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(StringUtils, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(test_similarity)
-{
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hello", 0), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hello", 1), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hellw", 1), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "helol", 1), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "helo", 1), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "helllo", 1), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hlllo", 1), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hllllo", 1), false);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hllllo", 2), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("hello", "hlllo", 2), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("a", "", 2), false);
-	BOOST_CHECK_EQUAL(stringWithinDistance("abc", "ba", 2), false);
-	BOOST_CHECK_EQUAL(stringWithinDistance("abc", "abcdef", 2), false);
-	BOOST_CHECK_EQUAL(stringWithinDistance("abcd", "wxyz", 2), false);
-	BOOST_CHECK_EQUAL(stringWithinDistance("", "", 2), true);
-	BOOST_CHECK_EQUAL(stringWithinDistance("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY", "YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYZ", 2, 6400), false);
-}
-
-BOOST_AUTO_TEST_CASE(test_dldistance)
-{
-	BOOST_CHECK_EQUAL(stringDistance("hello", "hellw"), 1);
-	BOOST_CHECK_EQUAL(stringDistance("hello", "helol"), 1);
-	BOOST_CHECK_EQUAL(stringDistance("hello", "helo"), 1);
-	BOOST_CHECK_EQUAL(stringDistance("hello", "helllo"), 1);
-	BOOST_CHECK_EQUAL(stringDistance("hello", "hlllo"), 1);
-	BOOST_CHECK_EQUAL(stringDistance("hello", "hllllo"), 2);
-	BOOST_CHECK_EQUAL(stringDistance("a", ""), 1);
-	BOOST_CHECK_EQUAL(stringDistance("abc", "ba"), 2);
-	BOOST_CHECK_EQUAL(stringDistance("abc", "abcdef"), 3);
-	BOOST_CHECK_EQUAL(stringDistance("abcd", "wxyz"), 4);
-	BOOST_CHECK_EQUAL(stringDistance("", ""), 0);
-	BOOST_CHECK_EQUAL(stringDistance("abcdefghijklmnopqrstuvwxyz", "abcabcabcabcabcabcabcabca"), 23);
-
-}
-
-BOOST_AUTO_TEST_CASE(test_alternatives_list)
-{
-	std::vector<std::string> strings;
-	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "");
-	strings.emplace_back("a");
-	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "\"a\"");
-	strings.emplace_back("b");
-	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "\"a\" or \"b\"");
-	strings.emplace_back("c");
-	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "\"a\", \"b\" or \"c\"");
-	strings.emplace_back("d");
-	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "\"a\", \"b\", \"c\" or \"d\"");
-}
-
-BOOST_AUTO_TEST_CASE(test_human_readable_join)
-{
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({})), "");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a"})), "a");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b"})), "a, b");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b", "c"})), "a, b, c");
-
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({}), "; "), "");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a"}), "; "), "a");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b"}), "; "), "a; b");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b", "c"}), "; "), "a; b; c");
-
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({}), "; ", " or "), "");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a"}), "; ", " or "), "a");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b"}), "; ", " or "), "a or b");
-	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b", "c"}), "; ", " or "), "a; b or c");
-}
-
-BOOST_AUTO_TEST_CASE(test_format_number_readable)
-{
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x10000000)), "2**28");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x100000000)), "2**32");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8000000)), "2**27");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x80000000)), "2**31");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x800000000)), "2**35");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8000000000)), "2**39");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x80000000000)), "2**43");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffff)), "2**27 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7fffffff)), "2**31 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffffff)), "2**35 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7fffffffff)), "2**39 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffffffff)), "2**43 - 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xfffffff)), "2**28 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xffffffff)), "2**32 - 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x88000000)), "0x88 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8888888888000000)), "0x8888888888 * 2**24");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x100000000)), "2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xFFFFffff)), "2**32 - 1");
-
-	u256 b = 0;
-	for (int i = 0; i < 32; i++)
-	{
-		b <<= 8;
-		b |= 0x55;
-	}
-	u256 c = (u256)FixedHash<32>(
-		fromHex("0xabcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789")
-	);
-	u256 d = u256(0xAAAAaaaaAAAAaaaa) << 192;
-	u256 e = u256(0xAAAAaaaaAAAAaaaa) << 192 |
-		u256(0xFFFFffffFFFFffff) << 128 |
-		u256(0xFFFFffffFFFFffff) << 64 |
-		u256(0xFFFFffffFFFFffff);
-	BOOST_CHECK_EQUAL(formatNumberReadable(b, true), "0x5555...{+56 more}...5555");
-	BOOST_CHECK_EQUAL(formatNumberReadable(c, true), "0xABCD...{+56 more}...6789");
-	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "0xAAAAaaaaAAAAaaaa * 2**192");
-	BOOST_CHECK_EQUAL(formatNumberReadable(e, true), "0xAAAAaaaaAAAAaaab * 2**192 - 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x20000000)), "2**29");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x200000000)), "2**33");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2000000000)), "2**37");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x20000000000)), "2**41");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x200000000000)), "2**45");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFF)), "2**29 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFF)), "2**33 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFFF)), "2**37 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFFFF)), "2**41 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFFFFF)), "2**45 - 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3000000)), "0x03 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x30000000)), "0x30 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x300000000)), "0x03 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3000000000)), "0x30 * 2**32");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFF)), "0x03 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFFF)), "0x30 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFFFF)), "0x03 * 2**32 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFFFFF)), "0x30 * 2**32 - 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA3000000)), "0xa3 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA30000000)), "0x0a30 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA300000000)), "0xa3 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA3000000000)), "0x0a30 * 2**32");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFF)), "0xa3 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFFF)), "0x0a30 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFFFF)), "0xa3 * 2**32 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFFFFF)), "0x0a30 * 2**32 - 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 128, true), "0x03 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 129, true), "0x06 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 130, true), "0x0c * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 131, true), "0x18 * 2**128");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 248, true), "0x03 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 249, true), "0x06 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 250, true), "0x0c * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 251, true), "0x18 * 2**248");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 128, true), "0x09 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 129, true), "0x12 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 130, true), "0x24 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 131, true), "0x48 * 2**128");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 248, true), "0x09 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 249, true), "0x12 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 250, true), "0x24 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 251, true), "0x48 * 2**248");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0)), "0");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x10000)), "65536");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xFFFF)), "65535");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1000000)), "16777216");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xFFFFFF)), "16777215");
-
-	//for codegen/ExpressionCompiler
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(-1)), "2**256 - 1");
-
-	// for formal/SMTChecker
-	BOOST_CHECK_EQUAL(
-			formatNumberReadable(frontend::IntegerType(256).minValue()), "0");
-	BOOST_CHECK_EQUAL(
-			formatNumberReadable(frontend::IntegerType(256).maxValue()), "2**256 - 1");
-}
-
-BOOST_AUTO_TEST_CASE(test_format_number_readable_signed)
-{
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x10000000)), "-2**28");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x100000000)), "-2**32");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000)), "-2**27");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000)), "-2**31");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x800000000)), "-2**35");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000000)), "-2**39");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000000)), "-2**43");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffff)), "-2**27 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffff)), "-2**31 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffff)), "-2**35 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffffff)), "-2**39 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffffff)), "-2**43 + 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xfffffff)), "-2**28 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xffffffff)), "-2**32 + 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x88000000)), "-0x88 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8888888888000000)), "-0x8888888888 * 2**24");
-
-	s256 b = 0;
-	for (int i = 0; i < 32; i++)
-	{
-		b <<= 8;
-		b |= 0x55;
-	}
-	b = b * (-1);
-
-	s256 c = (-1) * u2s((u256)FixedHash<32>(
-		fromHex("0x0bcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789")
-	));
-
-	s256 d = (-1) * u2s(
-		u256(0x5555555555555555) << 192 |
-		u256(0xFFFFffffFFFFffff) << 128 |
-		u256(0xFFFFffffFFFFffff) << 64 |
-		u256(0xFFFFffffFFFFffff)
-	);
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(b, true), "-0x5555...{+56 more}...5555");
-	BOOST_CHECK_EQUAL(formatNumberReadable(c, true), "-0x0BCD...{+56 more}...6789");
-	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "-0x5555555555555556 * 2**192 + 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x20000000)), "-2**29");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x200000000)), "-2**33");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2000000000)), "-2**37");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x20000000000)), "-2**41");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x200000000000)), "-2**45");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFF)), "-2**29 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFF)), "-2**33 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFFF)), "-2**37 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFFFF)), "-2**41 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFFFFF)), "-2**45 + 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x3000000)), "-0x03 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x30000000)), "-0x30 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x300000000)), "-0x03 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x3000000000)), "-0x30 * 2**32");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFF)), "-0x03 * 2**24 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFFF)), "-0x30 * 2**24 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFFFF)), "-0x03 * 2**32 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFFFFF)), "-0x30 * 2**32 + 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA3000000)), "-0xa3 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA30000000)), "-0x0a30 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA300000000)), "-0xa3 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA3000000000)), "-0x0a30 * 2**32");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFF)), "-0xa3 * 2**24 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFFF)), "-0x0a30 * 2**24 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFFFF)), "-0xa3 * 2**32 + 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFFFFF)), "-0x0a30 * 2**32 + 1");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 128, true), "-0x03 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 129, true), "-0x06 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 130, true), "-0x0c * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 131, true), "-0x18 * 2**128");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 248, true), "-0x03 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 249, true), "-0x06 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 250, true), "-0x0c * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 251, true), "-0x18 * 2**248");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 128, true), "-0x09 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 129, true), "-0x12 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 130, true), "-0x24 * 2**128");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 131, true), "-0x48 * 2**128");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 248, true), "-0x09 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 249, true), "-0x12 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 250, true), "-0x24 * 2**248");
-	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 251, true), "-0x48 * 2**248");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(s256(-1)), "-1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x10000)), "-65536");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xFFFF)), "-65535");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1000000)), "-16777216");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xFFFFFF)), "-16777215");
-
-	BOOST_CHECK_EQUAL(
-		formatNumberReadable(
-			frontend::IntegerType(256, frontend::IntegerType::Modifier::Signed).minValue()
-		),
-		"-2**255"
-	);
-	BOOST_CHECK_EQUAL(
-		formatNumberReadable(
-			frontend::IntegerType(256, frontend::IntegerType::Modifier::Signed).maxValue()
-		),
-		"2**255 - 1"
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/SwarmHash.cpp b/test/libsolutil/SwarmHash.cpp
deleted file mode 100644
index 25c6b77cd390..000000000000
--- a/test/libsolutil/SwarmHash.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the swarm hash computation routine.
- */
-
-#include <libsolutil/SwarmHash.h>
-
-#include <test/Common.h>
-
-#include <libsolutil/Keccak256.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(SwarmHash, *boost::unit_test::label("nooptions"))
-
-namespace
-{
-
-std::string bzzr0HashHex(std::string const& _input)
-{
-	return toHex(bzzr0Hash(_input).asBytes());
-}
-
-std::string bzzr1HashHex(bytes const& _input)
-{
-	return toHex(bzzr1Hash(_input).asBytes());
-}
-
-bytes sequence(size_t _length)
-{
-	bytes data;
-	for (size_t i = 0; i < _length; i++)
-		data.push_back(uint8_t((i % 255) & 0xff));
-	return data;
-}
-
-}
-
-BOOST_AUTO_TEST_CASE(test_zeros)
-{
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string()), std::string("011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x1000 - 1, 0)), std::string("32f0faabc4265ac238cd945087133ce3d7e9bb2e536053a812b5373c54043adb"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x1000, 0)), std::string("411dd45de7246e94589ff5888362c41e85bd3e582a92d0fda8f0e90b76439bec"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x1000 + 1, 0)), std::string("69754a0098432bbc2e84fe1205276870748a61a065ab6ef44d6a2e7b13ce044d"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x2000 - 1, 0)), std::string("69ad3c581043404f775ffa8d6f1b25ad4a9ee812971190e90209c0966116a321"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x2000, 0)), std::string("f00222373ff82d0a178dc6271c78953e9c88f74130a52d401f5ec51475f63c43"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x2000 + 1, 0)), std::string("86d6773e79e02fd8145ee1aedba89ace0c15f2566db1249654000039a9a134bf"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x80000, 0)), std::string("cc0854fe2c6b98e920d5c14b1a88e6d4223e55b8f78883f60939aa2485e361bf"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x80020, 0)), std::string("ee9ffca246e70d3704740ba4df450fa6988d14a1c2439c7e734c7a77a4eb6fd3"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x800020, 0)), std::string("78b90b20c90559fb904535181a7c28929ea2f30a2329dbc25232de579709f12f"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(2095104, 0)), std::string("a9958184589fc11b4027a4c233e777ebe2e99c66f96b74aef2a0638a94dd5439"));
-}
-
-BOOST_AUTO_TEST_CASE(bzz_hash_short)
-{
-	// Special case: 32 zero bytes
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes()), toHex(bytes(32, 0)));
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(1, 0)), "fe60ba40b87599ddfb9e8947c1c872a4a1a5b56f7d1b80f0a646005b38db52a5");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(31, 0)), "36fe2d14c5fe9ed380dc67afd9da6c5824bffcb01ac7972219c3cc3b1c8cd6b1");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(asBytes("hello world")), "92672a471f4419b255d7cb0cf313474a6f5856fb347c5ece85fb706d644b630f");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(64, 0)), "24090f674316c306ea2a98bdd08f042d6f776d0ae1c23b27fca52750a9c7d4e5");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(65, 0)), "6ab1eaa91095215e30cacf47131d06ce5e9fc01611e406409705e190ee4440c6");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(4096, 0)), "09ae927d0f3aaa37324df178928d3826820f3dd3388ce4aaebfc3af410bde23a");
-}
-
-BOOST_AUTO_TEST_CASE(bzz_hash_large)
-{
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(4097, 0)), "c082943c4cb8a97c67947f290f5421cf4c61d021eb303c8df77de6fe208df516");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(4096 * 128, 0)), "392edbfc185187265cb5d50c2507965f2bb99ce8c255a24d3eb14257e40f2e33");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(4096 * 128 * 2, 0)), "f89af84ac550cdaa79639d5f6a1591ff1c9b3cb5d1fc55651ca63d4f80375447");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(4096 * 129, 0)), "8ab36734a15aef65221b024e47ee9a6bb727d8101eec42db364eef42285beb1d");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(bytes(4096 * 130, 0)), "21eafb87f2a2a7e51d96212296f8e970103add0527f2fc61fae99f244847a42d");
-}
-
-BOOST_AUTO_TEST_CASE(bzz_hash_nonzero)
-{
-	BOOST_CHECK_EQUAL(bzzr1HashHex(sequence(65)), "541552bae05e9a63a6cb561f69edf36ffe073e441667dbf7a0e9a3864bb744ea");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(sequence(4096)), "c10090961e7682a10890c334d759a28426647141213abda93b096b892824d2ef");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(sequence(4096 * 128 + 31)), "e5c76afa931e33ac94bce2e754b1bb6407d07f738f67856783d93934ca8fc576");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(sequence(4096 * 128 + 33)), "c2489aebad937b19384b61c7bd4ba494f9b14a710b2bcccce792856fb8fcfb3d");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(sequence(4096 * 129)), "b7e298f61b1bf23e21d8f45bf545eb1d6c0c4eaaca7d2c2690fb86038404a6d6");
-	BOOST_CHECK_EQUAL(bzzr1HashHex(sequence(4096 * 130)), "59de730bf6c67a941f3b2ffa2f920acfaa1713695ad5deea12b4a121e5f23fa1");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/TemporaryDirectoryTest.cpp b/test/libsolutil/TemporaryDirectoryTest.cpp
deleted file mode 100644
index b5e6edee2db5..000000000000
--- a/test/libsolutil/TemporaryDirectoryTest.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <libsolidity/util/SoltestErrors.h>
-
-#include <boost/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <fstream>
-
-using namespace boost::test_tools;
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(TemporaryDirectoryTest)
-
-BOOST_AUTO_TEST_CASE(TemporaryDirectory_should_create_and_delete_a_unique_and_empty_directory)
-{
-	boost::filesystem::path dirPath;
-	{
-		TemporaryDirectory tempDir("temporary-directory-test");
-		dirPath = tempDir.path();
-
-		BOOST_TEST(dirPath.stem().string().find("temporary-directory-test") == 0);
-		BOOST_TEST(boost::filesystem::equivalent(dirPath.parent_path(), boost::filesystem::temp_directory_path()));
-		BOOST_TEST(boost::filesystem::is_directory(dirPath));
-		BOOST_TEST(boost::filesystem::is_empty(dirPath));
-	}
-	BOOST_TEST(!boost::filesystem::exists(dirPath));
-}
-
-BOOST_AUTO_TEST_CASE(TemporaryDirectory_should_delete_its_directory_even_if_not_empty)
-{
-	boost::filesystem::path dirPath;
-	{
-		TemporaryDirectory tempDir("temporary-directory-test");
-		dirPath = tempDir.path();
-
-		BOOST_TEST(boost::filesystem::is_directory(dirPath));
-
-		{
-			std::ofstream tmpFile((dirPath / "test-file.txt").string());
-			tmpFile << "Delete me!" << std::endl;
-		}
-		soltestAssert(boost::filesystem::is_regular_file(dirPath / "test-file.txt"), "");
-	}
-	BOOST_TEST(!boost::filesystem::exists(dirPath / "test-file.txt"));
-}
-
-BOOST_AUTO_TEST_CASE(TemporaryDirectory_should_create_subdirectories)
-{
-	boost::filesystem::path dirPath;
-	{
-		TemporaryDirectory tempDir({"a", "a/", "a/b/c", "x.y/z"}, "temporary-directory-test");
-		dirPath = tempDir.path();
-
-		BOOST_TEST(boost::filesystem::is_directory(dirPath / "a"));
-		BOOST_TEST(boost::filesystem::is_directory(dirPath / "a/b/c"));
-		BOOST_TEST(boost::filesystem::is_directory(dirPath / "x.y/z"));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(TemporaryWorkingDirectory_should_change_and_restore_working_directory)
-{
-	boost::filesystem::path originalWorkingDirectory = boost::filesystem::current_path();
-
-	try
-	{
-		{
-			TemporaryDirectory tempDir("temporary-directory-test");
-			soltestAssert(boost::filesystem::equivalent(boost::filesystem::current_path(), originalWorkingDirectory), "");
-			soltestAssert(!boost::filesystem::equivalent(tempDir.path(), originalWorkingDirectory), "");
-
-			TemporaryWorkingDirectory tempWorkDir(tempDir.path());
-
-			BOOST_TEST(boost::filesystem::equivalent(boost::filesystem::current_path(), tempDir.path()));
-		}
-		BOOST_TEST(boost::filesystem::equivalent(boost::filesystem::current_path(), originalWorkingDirectory));
-
-		boost::filesystem::current_path(originalWorkingDirectory);
-	}
-	catch (...)
-	{
-		boost::filesystem::current_path(originalWorkingDirectory);
-	}
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/UTF8.cpp b/test/libsolutil/UTF8.cpp
deleted file mode 100644
index 449f221995cb..000000000000
--- a/test/libsolutil/UTF8.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for UTF-8 validation.
- */
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/UTF8.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(UTF8, *boost::unit_test::label("nooptions"))
-
-namespace {
-
-bool isValidUTF8(std::string const& _value)
-{
-	size_t pos;
-	return validateUTF8(asString(fromHex(_value)), pos);
-}
-
-bool isInvalidUTF8(std::string const& _value, size_t _expectedPos)
-{
-	size_t pos;
-	if (validateUTF8(asString(fromHex(_value)), pos))
-		return false;
-	if (pos != _expectedPos)
-		return false;
-	return true;
-}
-
-}
-
-BOOST_AUTO_TEST_CASE(valid)
-{
-	BOOST_CHECK(isValidUTF8("00"));
-	BOOST_CHECK(isValidUTF8("20"));
-	BOOST_CHECK(isValidUTF8("7f"));
-	BOOST_CHECK(isValidUTF8("c281"));
-	BOOST_CHECK(isValidUTF8("df81"));
-	BOOST_CHECK(isValidUTF8("e0a081"));
-	BOOST_CHECK(isValidUTF8("e18081"));
-	BOOST_CHECK(isValidUTF8("ec8081"));
-	BOOST_CHECK(isValidUTF8("ed8081"));
-	BOOST_CHECK(isValidUTF8("ee8081"));
-	BOOST_CHECK(isValidUTF8("ef8081"));
-	BOOST_CHECK(isValidUTF8("f0908081"));
-	BOOST_CHECK(isValidUTF8("f3808081"));
-	BOOST_CHECK(isValidUTF8("f2808081"));
-	BOOST_CHECK(isValidUTF8("f3808081"));
-	BOOST_CHECK(isValidUTF8("f48e8081"));
-}
-
-BOOST_AUTO_TEST_CASE(invalid)
-{
-	// anything between 0x80 and 0xc0 is disallowed
-	BOOST_CHECK(isInvalidUTF8("80", 0)); // invalid per table 3.6
-	BOOST_CHECK(isInvalidUTF8("a0", 0)); // invalid per table 3.6
-	BOOST_CHECK(isInvalidUTF8("c0", 0)); // invalid per table 3.7
-	BOOST_CHECK(isInvalidUTF8("c1", 0)); // invalid per table 3.7
-	BOOST_CHECK(isInvalidUTF8("c2", 0)); // too short (position is reported as the first byte)
-	BOOST_CHECK(isInvalidUTF8("e08081", 2)); // e0 must be followed by >= a0
-	BOOST_CHECK(isInvalidUTF8("e180", 0)); // too short
-	BOOST_CHECK(isInvalidUTF8("ec80", 0)); // too short
-	BOOST_CHECK(isInvalidUTF8("f08f8001", 2)); // f0 must be followed by >= 90
-	BOOST_CHECK(isInvalidUTF8("f18080", 0)); // too short
-	BOOST_CHECK(isInvalidUTF8("f4908081", 2)); // f4 must be followed by < 90
-	// anything above 0xf7 is disallowed
-	BOOST_CHECK(isInvalidUTF8("f8", 0)); // invalid per table 3.7
-	BOOST_CHECK(isInvalidUTF8("f9", 0)); // invalid per table 3.7
-}
-
-BOOST_AUTO_TEST_CASE(corpus)
-{
-	std::string source = R"(
-κόσμε
-
-hélló
-
-Ā � Ă ă Ą ą
-
-ƀ � Ƃ ƃ Ƅ ƅ
-
-� ɑ ɒ ɓ ɔ ɕ
-
-ʰ ʱ ʲ ʳ ʴ ʵ
-
-̀ � ̂ ̃ ̄ ̅
-
-ϩ Ϫ ϫ Ϭ ϭ Ϯ
-
-� Ђ Ѓ Є Ѕ І
-
-Ô± Ô² Ô³ Ô´ Ôµ Ô¶
-
- ק ר ש ת װ ױ
-
-Ú� Ú‚ Úƒ Ú„ Ú… Ú†
-
-ऑ ऒ ओ औ क ख
-
-ও ঔ ক খ গ ঘ
-
-ਘ ਙ ਚ ਛ ਜ �
-
-ઓ ઔ ક ખ ગ ઘ
-
-ଗ ଘ ଙ ଚ ଛ ଜ
-
-ஔ க ங ச ஜ ஞ
-
-à°Ž à°� à°� à°’ à°“ à°”
-
-ಓ ಔ ಕ ಖ ಗ ಘ
-
-à´� à´’ à´“ à´” à´•
-
-ฒ ณ ด ต ถ ท
-
-ມ ຢ ຣ ລ ວ ສ
-
-༄ ༅ ༆ ༇ ༈ ༉
-
-Ⴑ Ⴒ Ⴓ Ⴔ Ⴕ Ⴖ
-
-ᄌ � ᄎ � �
-
-Ḕ ḕ Ḗ ḗ Ḙ ḙ Ḛ
-
-� ἑ ἒ ἓ ἔ ἕ
-
-₠ ₡ ₢ ₣ ₤ ₥
-
-� ⃑ ⃒ ⃓ ⃔ ⃕ ⃖ ⃗ ⃘ ⃙ ⃚
-
-ℋ ℌ � ℎ � � ℑ
-
-â…“ â…” â…• â…– â…—
-
-∬ ∭ ∮ ∯ ∰
-
-⌖ ⌗ ⌘ ⌙ ⌚ ⌛
-
-� � � � � �
-
-⑀ � ⑂ ⑃ ⑄
-
-① ② ③ ④ ⑤
-
-╘ ╙ ╚ ╛ ╜ �
-
-â–� â–‚ â–ƒ â–„ â–… â–†
-
-â–¤ â–¥ â–¦ â–§ â–¨
-
-♔ ♕ ♖ ♗ ♘ ♙
-
-✈ ✉ ✌ � ✎
-
-� � � � �
-
-ァ ア ィ イ ゥ
-
-ㄅ ㄆ ㄇ ㄈ ㄉ
-
-ㄱ ㄲ ㄳ ㄴ ㄵ
-
-㆚ ㆛ ㆜ � ㆞
-
-㈀ � ㈂ ㈃ ㈄
-
-㌀ � ㌂ ㌃ ㌄
-
-乺 乻 乼 乽 乾
-
-걺 걻 걼 걽 걾
-
-豈 � 車 賈 滑
-
-שּׁ שּׂ אַ אָ אּ
-
-ﮄ ﮅ ﮆ ﮇ ﮈ ﮉ
-
- ﺵ ﺶ ﺷ ﺸ
-
-｢ ｣ ､ ･ ｦ ｧ ｨ ｩ
-	)";
-	size_t pos;
-	BOOST_CHECK(validateUTF8(source, pos));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libsolutil/Whiskers.cpp b/test/libsolutil/Whiskers.cpp
deleted file mode 100644
index 5bb4e3ad9f5a..000000000000
--- a/test/libsolutil/Whiskers.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Unit tests for the mini moustache class.
- */
-
-#include <libsolutil/Whiskers.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(WhiskersTest, *boost::unit_test::label("nooptions"))
-
-BOOST_AUTO_TEST_CASE(no_templates)
-{
-	std::string templ = "this text does not contain templates";
-	BOOST_CHECK_EQUAL(Whiskers(templ).render(), templ);
-}
-
-BOOST_AUTO_TEST_CASE(basic_replacement)
-{
-	std::string templ = "a <b> x <c> -> <d>.";
-	std::string result = Whiskers(templ)
-		("b", "BE")
-		("c", "CE")
-		("d", "DE")
-		.render();
-	BOOST_CHECK_EQUAL(result, "a BE x CE -> DE.");
-}
-
-BOOST_AUTO_TEST_CASE(tag_unavailable)
-{
-	std::string templ = "<b>";
-	Whiskers m(templ);
-	BOOST_CHECK_THROW(m.render(), WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(list_unavailable)
-{
-	std::string templ = "<#b></b>";
-	Whiskers m(templ);
-	BOOST_CHECK_THROW(m.render(), WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(name_type_collision)
-{
-	std::string templ = "<b><#b></b>";
-	Whiskers m(templ);
-	m("b", "x");
-	BOOST_CHECK_THROW(m("b", std::vector<std::map<std::string, std::string>>{}), WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(conditional)
-{
-	std::string templ = "<?b>X</b>";
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", true).render(), "X");
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "");
-}
-
-BOOST_AUTO_TEST_CASE(conditional_with_else)
-{
-	std::string templ = "<?b>X<!b>Y</b>";
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", true).render(), "X");
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "Y");
-}
-
-BOOST_AUTO_TEST_CASE(broken_conditional_with_else)
-{
-	std::string templ = "<?b>X<!bY</b>";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-
-	templ = "<?bX<!b>Y</b>";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-
-	templ = "<?b>X<!b>Y</b";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(broken_conditional_value_with_else)
-{
-	std::string templ = "<?+b>X<!+bY</+b>";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-
-	templ = "<?+bX<!+b>Y</+b>";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-
-	templ = "<?+b>X<!+b>Y</+b";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(broken_list_parameter)
-{
-	std::string templ = "<#b><a></b";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-
-	templ = "<#b<a></b>";
-	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(conditional_plus_params)
-{
-	std::string templ = " - <?b>_<r><!b>^<t></b> - ";
-	Whiskers m1(templ);
-	m1("b", true);
-	m1("r", "R");
-	m1("t", "T");
-	BOOST_CHECK_EQUAL(m1.render(), " - _R - ");
-
-	Whiskers m2(templ);
-	m2("b", false);
-	m2("r", "R");
-	m2("t", "T");
-	BOOST_CHECK_EQUAL(m2.render(), " - ^T - ");
-}
-
-BOOST_AUTO_TEST_CASE(conditional_plus_list)
-{
-	std::string templ = " - <?b>_<#l><x></l><!b><#l><y></l></b> - ";
-	Whiskers m(templ);
-	m("b", false);
-	std::vector<std::map<std::string, std::string>> list(2);
-	list[0]["x"] = "1";
-	list[0]["y"] = "a";
-	list[1]["x"] = "2";
-	list[1]["y"] = "b";
-	m("l", list);
-	BOOST_CHECK_EQUAL(m.render(), " - ab - ");
-}
-
-BOOST_AUTO_TEST_CASE(string_as_conditional)
-{
-	std::string templ = "<?+b>+<b><!+b>-</+b>";
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", "abc").render(), "+abc");
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", "").render(), "-");
-}
-
-BOOST_AUTO_TEST_CASE(string_as_conditional_wrong)
-{
-	std::string templ = "<?+b>+<b></b>";
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", "abc").render(), "<?+b>+abc</b>");
-}
-
-BOOST_AUTO_TEST_CASE(complicated_replacement)
-{
-	std::string templ = "a <b> x <complicated> \n <nested>>.";
-	std::string result = Whiskers(templ)
-		("b", "BE")
-		("complicated", "CO<M>PL")
-		("nested", "NEST")
-		.render();
-	BOOST_CHECK_EQUAL(result, "a BE x CO<M>PL \n NEST>.");
-}
-
-BOOST_AUTO_TEST_CASE(non_existing_list)
-{
-	std::string templ = "a <#b></b>";
-	Whiskers m(templ);
-	BOOST_CHECK_THROW(m.render(), WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(empty_list)
-{
-	std::string templ = "a <#b></b>x";
-	std::string result = Whiskers(templ)("b", std::vector<Whiskers::StringMap>{}).render();
-	BOOST_CHECK_EQUAL(result, "a x");
-}
-
-BOOST_AUTO_TEST_CASE(list)
-{
-	std::string templ = "a<#b>( <g> - <h> )</b>x";
-	std::vector<std::map<std::string, std::string>> list(2);
-	list[0]["g"] = "GE";
-	list[0]["h"] = "H";
-	list[1]["g"] = "2GE";
-	list[1]["h"] = "2H";
-	std::string result = Whiskers(templ)("b", list).render();
-	BOOST_CHECK_EQUAL(result, "a( GE - H )( 2GE - 2H )x");
-}
-
-BOOST_AUTO_TEST_CASE(recursive_list)
-{
-	// Check that templates resulting from lists are not expanded again
-	std::string templ = "a<#b> 1<g>3 </b><x>";
-	std::vector<std::map<std::string, std::string>> list(1);
-	list[0]["g"] = "<x>";
-	std::string result = Whiskers(templ)("x", "X")("b", list).render();
-	BOOST_CHECK_EQUAL(result, "a 1<x>3 X");
-}
-
-BOOST_AUTO_TEST_CASE(list_can_access_upper)
-{
-	std::string templ = "<#b>(<a>)</b>";
-	std::vector<std::map<std::string, std::string>> list(2);
-	Whiskers m(templ);
-	std::string result = m("a", "A")("b", list).render();
-	BOOST_CHECK_EQUAL(result, "(A)(A)");
-}
-
-BOOST_AUTO_TEST_CASE(parameter_collision)
-{
-	std::string templ = "a <#b></b>";
-	std::vector<std::map<std::string, std::string>> list(1);
-	list[0]["a"] = "x";
-	Whiskers m(templ);
-	BOOST_CHECK_THROW(m("a", "X")("b", list), WhiskersError);
-	BOOST_CHECK_THROW(m.render(), WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(invalid_param)
-{
-	std::string templ = "a <b >";
-	Whiskers m(templ);
-	BOOST_CHECK_THROW(m("b ", "X"), WhiskersError);
-}
-
-BOOST_AUTO_TEST_CASE(invalid_param_rendered)
-{
-	std::string templ = "a <b >";
-	Whiskers m(templ);
-	BOOST_CHECK_EQUAL(m.render(), templ);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
deleted file mode 100644
index f10414a9f7a1..000000000000
--- a/test/libyul/Common.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @date 2017
- * Common functions the Yul tests.
- */
-
-#include <test/libyul/Common.h>
-
-#include <test/Common.h>
-
-#include <libyul/optimiser/Disambiguator.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/YulStack.h>
-#include <libyul/AST.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <variant>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::langutil;
-
-namespace
-{
-Dialect const& defaultDialect(bool _yul)
-{
-	return _yul ? yul::Dialect::yulDeprecated() : yul::EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion());
-}
-}
-
-pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(string const& _source, bool _yul)
-{
-	YulStack stack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		_yul ? YulStack::Language::Yul : YulStack::Language::StrictAssembly,
-		solidity::test::CommonOptions::get().optimize ?
-			solidity::frontend::OptimiserSettings::standard() :
-			solidity::frontend::OptimiserSettings::minimal(),
-		DebugInfoSelection::All()
-	);
-	if (!stack.parseAndAnalyze("", _source) || !stack.errors().empty())
-		BOOST_FAIL("Invalid source.");
-	return make_pair(stack.parserResult()->code, stack.parserResult()->analysisInfo);
-}
-
-pair<shared_ptr<Object>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(
-	string const& _source,
-	Dialect const& _dialect,
-	ErrorList& _errors
-)
-{
-	ErrorReporter errorReporter(_errors);
-	CharStream stream(_source, "");
-	shared_ptr<Scanner> scanner = make_shared<Scanner>(stream);
-	shared_ptr<Object> parserResult = yul::ObjectParser(errorReporter, _dialect).parse(scanner, false);
-	if (!parserResult)
-		return {};
-	if (!parserResult->code || errorReporter.hasErrors())
-		return {};
-	shared_ptr<AsmAnalysisInfo> analysisInfo = make_shared<AsmAnalysisInfo>();
-	AsmAnalyzer analyzer(*analysisInfo, errorReporter, _dialect, {}, parserResult->qualifiedDataNames());
-	// TODO this should be done recursively.
-	if (!analyzer.analyze(*parserResult->code) || errorReporter.hasErrors())
-		return {};
-	return {std::move(parserResult), std::move(analysisInfo)};
-}
-
-yul::Block yul::test::disambiguate(string const& _source, bool _yul)
-{
-	auto result = parse(_source, _yul);
-	return std::get<Block>(Disambiguator(defaultDialect(_yul), *result.second, {})(*result.first));
-}
-
-string yul::test::format(string const& _source, bool _yul)
-{
-	return yul::AsmPrinter()(*parse(_source, _yul).first);
-}
-
-namespace
-{
-std::map<string const, yul::Dialect const& (*)(langutil::EVMVersion)> const validDialects = {
-	{
-		"evm",
-		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
-		{ return yul::EVMDialect::strictAssemblyForEVMObjects(_evmVersion); }
-	},
-	{
-		"evmTyped",
-		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
-		{ return yul::EVMDialectTyped::instance(_evmVersion); }
-	},
-	{
-		"yul",
-		[](langutil::EVMVersion) -> yul::Dialect const&
-		{ return yul::Dialect::yulDeprecated(); }
-	}
-};
-
-vector<string> validDialectNames()
-{
-	vector<string> names{size(validDialects), ""};
-	transform(begin(validDialects), end(validDialects), names.begin(), [](auto const& dialect) { return dialect.first; });
-
-	return names;
-}
-}
-
-yul::Dialect const& yul::test::dialect(std::string const& _name, langutil::EVMVersion _evmVersion)
-{
-	if (!validDialects.count(_name))
-		BOOST_THROW_EXCEPTION(runtime_error{
-			"Invalid Dialect \"" +
-			_name +
-			"\". Valid dialects are " +
-			util::joinHumanReadable(validDialectNames(), ", ", " and ") +
-			"."
-		});
-
-	return validDialects.at(_name)(_evmVersion);
-}
diff --git a/test/libyul/Common.h b/test/libyul/Common.h
deleted file mode 100644
index f6c63feb9bb2..000000000000
--- a/test/libyul/Common.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @date 2017
- * Common functions the Yul tests.
- */
-
-#pragma once
-
-#include <liblangutil/EVMVersion.h>
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace solidity::langutil
-{
-class Error;
-using ErrorList = std::vector<std::shared_ptr<Error const>>;
-}
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-struct Block;
-struct Object;
-struct Dialect;
-}
-
-namespace solidity::yul::test
-{
-
-std::pair<std::shared_ptr<Block>, std::shared_ptr<AsmAnalysisInfo>>
-parse(std::string const& _source, bool _yul = true);
-
-std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>>
-parse(std::string const& _source, Dialect const& _dialect, langutil::ErrorList& _errors);
-
-Block disambiguate(std::string const& _source, bool _yul = true);
-std::string format(std::string const& _source, bool _yul = true);
-
-solidity::yul::Dialect const& dialect(std::string const& _name, langutil::EVMVersion _evmVersion);
-
-}
diff --git a/test/libyul/CompilabilityChecker.cpp b/test/libyul/CompilabilityChecker.cpp
deleted file mode 100644
index b27f7ab54740..000000000000
--- a/test/libyul/CompilabilityChecker.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Unit tests for the compilability checker.
- */
-
-#include <test/Common.h>
-
-#include <test/libyul/Common.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libyul/CompilabilityChecker.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace std;
-
-namespace solidity::yul::test
-{
-
-namespace
-{
-string check(string const& _input)
-{
-	Object obj;
-	std::tie(obj.code, obj.analysisInfo) = yul::test::parse(_input, false);
-	BOOST_REQUIRE(obj.code);
-	auto functions = CompilabilityChecker(EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion()), obj, true).stackDeficit;
-	string out;
-	for (auto const& function: functions)
-		out += function.first.str() + ": " + to_string(function.second) + " ";
-	return out;
-}
-}
-
-BOOST_AUTO_TEST_SUITE(CompilabilityChecker)
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	string out = check("{}");
-	BOOST_CHECK_EQUAL(out, "");
-}
-
-BOOST_AUTO_TEST_CASE(simple_function)
-{
-	string out = check("{ function f(a, b) -> x, y { x := a y := b } }");
-	BOOST_CHECK_EQUAL(out, "");
-}
-
-BOOST_AUTO_TEST_CASE(many_variables_few_uses)
-{
-	string out = check(R"({
-		function f(a, b) -> x, y {
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			x := add(add(add(add(add(add(add(add(add(x, r9), r8), r7), r6), r5), r4), r3), r2), r1)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "f: 4 ");
-}
-
-BOOST_AUTO_TEST_CASE(many_variables_many_uses)
-{
-	string out = check(R"({
-		function f(a, b) -> x, y {
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "f: 10 ");
-}
-
-BOOST_AUTO_TEST_CASE(many_return_variables_unused_arguments)
-{
-	string out = check(R"({
-		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "f: 3 ");
-}
-
-BOOST_AUTO_TEST_CASE(many_return_variables_used_arguments)
-{
-	string out = check(R"({
-		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
-			r1 := 0
-			sstore(a, b)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "f: 5 ");
-}
-
-BOOST_AUTO_TEST_CASE(multiple_functions_used_arguments)
-{
-	string out = check(R"({
-		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
-			r1 := 0
-			sstore(a, b)
-		}
-		function g(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19) -> x, y {
-			x := 0
-			sstore(r1, r2)
-		}
-		function h(x) {
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "h: 9 g: 5 f: 5 ");
-}
-
-BOOST_AUTO_TEST_CASE(multiple_functions_unused_arguments)
-{
-	string out = check(R"({
-		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
-		}
-		function g(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19) -> x, y {
-		}
-		function h(x) {
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "h: 9 f: 3 ");
-}
-
-BOOST_AUTO_TEST_CASE(nested_used_arguments)
-{
-	string out = check(R"({
-		function h(x) {
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			function f(a, b) -> t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19 {
-				function g(s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18, s19) -> w, v {
-					w := v
-					sstore(s1, s2)
-				}
-				t1 := t2
-				sstore(a, b)
-			}
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "h: 9 g: 5 f: 5 ");
-}
-
-
-BOOST_AUTO_TEST_CASE(nested_unused_arguments)
-{
-	string out = check(R"({
-		function h(x) {
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			function f(a, b) -> t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19 {
-				function g(s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18, s19) -> w, v {
-				}
-			}
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-		}
-	})");
-	BOOST_CHECK_EQUAL(out, "h: 9 f: 3 ");
-}
-
-
-BOOST_AUTO_TEST_CASE(also_in_outer_block_used_arguments)
-{
-	string out = check(R"({
-			let x := 0
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-			function g(s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18, s19) -> w, v {
-				w := v
-				sstore(s1, s2)
-			}
-	})");
-	BOOST_CHECK_EQUAL(out, "g: 5 : 9 ");
-}
-
-BOOST_AUTO_TEST_CASE(also_in_outer_block_unused_arguments)
-{
-	string out = check(R"({
-			let x := 0
-			let r1 := 0
-			let r2 := 0
-			let r3 := 0
-			let r4 := 0
-			let r5 := 0
-			let r6 := 0
-			let r7 := 0
-			let r8 := 0
-			let r9 := 0
-			let r10 := 0
-			let r11 := 0
-			let r12 := 0
-			let r13 := 0
-			let r14 := 0
-			let r15 := 0
-			let r16 := 0
-			let r17 := 0
-			let r18 := 0
-			x := add(add(add(add(add(add(add(add(add(add(add(add(x, r12), r11), r10), r9), r8), r7), r6), r5), r4), r3), r2), r1)
-			function g(s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18, s19) -> w, v {
-			}
-	})");
-	BOOST_CHECK_EQUAL(out, ": 9 ");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
deleted file mode 100644
index 44fff4219fb4..000000000000
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/ControlFlowGraphTest.h>
-#include <test/libyul/Common.h>
-#include <test/Common.h>
-
-#include <libyul/backends/evm/ControlFlowGraph.h>
-#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
-#include <libyul/backends/evm/StackHelpers.h>
-#include <libyul/Object.h>
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/Visitor.h>
-
-#ifdef ISOLTEST
-#include <boost/process.hpp>
-#endif
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-ControlFlowGraphTest::ControlFlowGraphTest(string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
-	m_expectation = m_reader.simpleExpectations();
-}
-
-namespace
-{
-static std::string variableSlotToString(VariableSlot const& _slot)
-{
-	return _slot.variable.get().name.str();
-}
-}
-
-class ControlFlowGraphPrinter
-{
-public:
-	ControlFlowGraphPrinter(std::ostream& _stream):
-	m_stream(_stream)
-	{
-	}
-	void operator()(CFG::BasicBlock const& _block, bool _isMainEntry = true)
-	{
-		if (_isMainEntry)
-		{
-			m_stream << "Entry [label=\"Entry\"];\n";
-			m_stream << "Entry -> Block" << getBlockId(_block) << ";\n";
-		}
-		while (!m_blocksToPrint.empty())
-		{
-			CFG::BasicBlock const* block = *m_blocksToPrint.begin();
-			m_blocksToPrint.erase(m_blocksToPrint.begin());
-			printBlock(*block);
-		}
-
-	}
-	void operator()(
-		CFG::FunctionInfo const& _info
-	)
-	{
-		m_stream << "FunctionEntry_" << _info.function.name.str() << "_" << getBlockId(*_info.entry) << " [label=\"";
-		m_stream << "function " << _info.function.name.str() << "(";
-		m_stream << joinHumanReadable(_info.parameters | ranges::views::transform(variableSlotToString));
-		m_stream << ")";
-		if (!_info.returnVariables.empty())
-		{
-			m_stream << " -> ";
-			m_stream << joinHumanReadable(_info.returnVariables | ranges::views::transform(variableSlotToString));
-		}
-		m_stream << "\"];\n";
-		m_stream << "FunctionEntry_" << _info.function.name.str() << "_" << getBlockId(*_info.entry) << " -> Block" << getBlockId(*_info.entry) << ";\n";
-		(*this)(*_info.entry, false);
-	}
-
-private:
-	void printBlock(CFG::BasicBlock const& _block)
-	{
-		m_stream << "Block" << getBlockId(_block) << " [label=\"\\\n";
-
-		// Verify that the entries of this block exit into this block.
-		for (auto const& entry: _block.entries)
-			std::visit(util::GenericVisitor{
-				[&](CFG::BasicBlock::Jump const& _jump)
-				{
-					soltestAssert(_jump.target == &_block, "Invalid control flow graph.");
-				},
-				[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-				{
-					soltestAssert(
-						_conditionalJump.zero == &_block || _conditionalJump.nonZero == &_block,
-						"Invalid control flow graph."
-					);
-				},
-				[&](auto const&)
-				{
-					soltestAssert(false, "Invalid control flow graph.");
-				}
-			}, entry->exit);
-
-		for (auto const& operation: _block.operations)
-		{
-			std::visit(util::GenericVisitor{
-				[&](CFG::FunctionCall const& _call) {
-					m_stream << _call.function.get().name.str() << ": ";
-				},
-				[&](CFG::BuiltinCall const& _call) {
-					m_stream << _call.functionCall.get().functionName.name.str() << ": ";
-
-				},
-				[&](CFG::Assignment const& _assignment) {
-					m_stream << "Assignment(";
-					m_stream << joinHumanReadable(_assignment.variables | ranges::views::transform(variableSlotToString));
-					m_stream << "): ";
-				}
-			}, operation.operation);
-			m_stream << stackToString(operation.input) << " => " << stackToString(operation.output) << "\\l\\\n";
-		}
-		m_stream << "\"];\n";
-		std::visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::MainExit const&)
-			{
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"MainExit\"];\n";
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-			},
-			[&](CFG::BasicBlock::Jump const& _jump)
-			{
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit [arrowhead=none];\n";
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"";
-				if (_jump.backwards)
-					m_stream << "Backwards";
-				m_stream << "Jump\" shape=oval];\n";
-				m_stream << "Block" << getBlockId(_block) << "Exit -> Block" << getBlockId(*_jump.target) << ";\n";
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			{
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"{ ";
-				m_stream << stackSlotToString(_conditionalJump.condition);
-				m_stream << "| { <0> Zero | <1> NonZero }}\" shape=Mrecord];\n";
-				m_stream << "Block" << getBlockId(_block);
-				m_stream << "Exit:0 -> Block" << getBlockId(*_conditionalJump.zero) << ";\n";
-				m_stream << "Block" << getBlockId(_block);
-				m_stream << "Exit:1 -> Block" << getBlockId(*_conditionalJump.nonZero) << ";\n";
-			},
-			[&](CFG::BasicBlock::FunctionReturn const& _return)
-			{
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"FunctionReturn[" << _return.info->function.name.str() << "]\"];\n";
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-			},
-			[&](CFG::BasicBlock::Terminated const&)
-			{
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"Terminated\"];\n";
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-			}
-		}, _block.exit);
-		m_stream << "\n";
-	}
-	size_t getBlockId(CFG::BasicBlock const& _block)
-	{
-		if (size_t* id = util::valueOrNullptr(m_blockIds, &_block))
-			return *id;
-		size_t id = m_blockIds[&_block] = m_blockCount++;
-		m_blocksToPrint.emplace_back(&_block);
-		return id;
-	}
-	std::ostream& m_stream;
-	std::map<CFG::BasicBlock const*, size_t> m_blockIds;
-	size_t m_blockCount = 0;
-	std::list<CFG::BasicBlock const*> m_blocksToPrint;
-};
-
-TestCase::TestResult ControlFlowGraphTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	ErrorList errors;
-	auto [object, analysisInfo] = parse(m_source, *m_dialect, errors);
-	if (!object || !analysisInfo || Error::containsErrors(errors))
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		return TestResult::FatalError;
-	}
-
-	std::ostringstream output;
-
-	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, *object->code);
-
-	output << "digraph CFG {\nnodesep=0.7;\nnode[shape=box];\n\n";
-	ControlFlowGraphPrinter printer{output};
-	printer(*cfg->entry);
-	for (auto function: cfg->functions)
-		printer(cfg->functionInfo.at(function));
-	output << "}\n";
-
-	m_obtainedResult = output.str();
-
-	auto result = checkResult(_stream, _linePrefix, _formatted);
-
-#ifdef ISOLTEST
-	char* graphDisplayer = nullptr;
-	// The environment variables specify an optional command that will receive the graph encoded in DOT through stdin.
-	// Examples for suitable commands are ``dot -Tx11:cairo`` or ``xdot -``.
-	if (result == TestResult::Failure)
-		// ISOLTEST_DISPLAY_GRAPHS_ON_FAILURE_COMMAND will run on all failing tests (intended for use during modifications).
-		graphDisplayer = getenv("ISOLTEST_DISPLAY_GRAPHS_ON_FAILURE_COMMAND");
-	else if (result == TestResult::Success)
-		// ISOLTEST_DISPLAY_GRAPHS_ON_FAILURE_COMMAND will run on all succeeding tests (intended for use during reviews).
-		graphDisplayer = getenv("ISOLTEST_DISPLAY_GRAPHS_ON_SUCCESS_COMMAND");
-
-	if (graphDisplayer)
-	{
-		if (result == TestResult::Success)
-			std::cout << std::endl << m_source << std::endl;
-		boost::process::opstream pipe;
-		boost::process::child child(graphDisplayer, boost::process::std_in < pipe);
-
-		pipe << output.str();
-		pipe.flush();
-		pipe.pipe().close();
-		if (result == TestResult::Success)
-			child.wait();
-		else
-			child.detach();
-	}
-#endif
-
-	return result;
-
-}
diff --git a/test/libyul/ControlFlowGraphTest.h b/test/libyul/ControlFlowGraphTest.h
deleted file mode 100644
index 44cea06d3f7c..000000000000
--- a/test/libyul/ControlFlowGraphTest.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-namespace test
-{
-
-class ControlFlowGraphTest: public solidity::frontend::test::TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<ControlFlowGraphTest>(_config.filename);
-	}
-	explicit ControlFlowGraphTest(std::string const& _filename);
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-private:
-	Dialect const* m_dialect = nullptr;
-};
-}
-}
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
deleted file mode 100644
index ce6c18c3588f..000000000000
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/ControlFlowSideEffectsTest.h>
-
-#include <test/Common.h>
-#include <test/libyul/Common.h>
-
-#include <libyul/Object.h>
-#include <libyul/AST.h>
-#include <libyul/ControlFlowSideEffects.h>
-#include <libyul/ControlFlowSideEffectsCollector.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend::test;
-
-namespace
-{
-string toString(ControlFlowSideEffects const& _sideEffects)
-{
-	vector<string> r;
-	if (_sideEffects.canTerminate)
-		r.emplace_back("can terminate");
-	if (_sideEffects.canRevert)
-		r.emplace_back("can revert");
-	if (_sideEffects.canContinue)
-		r.emplace_back("can continue");
-	return util::joinHumanReadable(r);
-}
-}
-
-ControlFlowSideEffectsTest::ControlFlowSideEffectsTest(string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult ControlFlowSideEffectsTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	Object obj;
-	std::tie(obj.code, obj.analysisInfo) = yul::test::parse(m_source, false);
-	if (!obj.code)
-		BOOST_THROW_EXCEPTION(runtime_error("Parsing input failed."));
-
-	ControlFlowSideEffectsCollector sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		*obj.code
-	);
-	m_obtainedResult.clear();
-	forEach<FunctionDefinition const>(*obj.code, [&](FunctionDefinition const& _fun) {
-		string effectStr = toString(sideEffects.functionSideEffects().at(&_fun));
-		m_obtainedResult += _fun.name.str() + (effectStr.empty() ? ":" : ": " + effectStr) + "\n";
-	});
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libyul/ControlFlowSideEffectsTest.h b/test/libyul/ControlFlowSideEffectsTest.h
deleted file mode 100644
index f91378e559fa..000000000000
--- a/test/libyul/ControlFlowSideEffectsTest.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace solidity::yul::test
-{
-
-class ControlFlowSideEffectsTest: public solidity::frontend::test::TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{ return std::make_unique<ControlFlowSideEffectsTest>(_config.filename); }
-	explicit ControlFlowSideEffectsTest(std::string const& _filename);
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-};
-
-}
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
deleted file mode 100644
index 257893ad5f70..000000000000
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/EVMCodeTransformTest.h>
-#include <test/libyul/Common.h>
-
-#include <test/Common.h>
-
-#include <libyul/YulStack.h>
-#include <libyul/backends/evm/EthAssemblyAdapter.h>
-#include <libyul/backends/evm/EVMObjectCompiler.h>
-
-#include <libevmasm/Assembly.h>
-
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-EVMCodeTransformTest::EVMCodeTransformTest(string const& _filename):
-	EVMVersionRestrictedTestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_stackOpt = m_reader.boolSetting("stackOptimization", false);
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::none();
-	settings.runYulOptimiser = false;
-	settings.optimizeStackAllocation = m_stackOpt;
-	YulStack stack(
-		EVMVersion{},
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		settings,
-		DebugInfoSelection::All()
-	);
-	if (!stack.parseAndAnalyze("", m_source))
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		SourceReferenceFormatter{_stream, stack, true, false}
-			.printErrorInformation(stack.errors());
-		return TestResult::FatalError;
-	}
-
-	evmasm::Assembly assembly{solidity::test::CommonOptions::get().evmVersion(), false, {}};
-	EthAssemblyAdapter adapter(assembly);
-	EVMObjectCompiler::compile(
-		*stack.parserResult(),
-		adapter,
-		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}),
-		m_stackOpt,
-		nullopt
-	);
-
-	std::ostringstream output;
-	output << assembly;
-	m_obtainedResult = output.str();
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libyul/EVMCodeTransformTest.h b/test/libyul/EVMCodeTransformTest.h
deleted file mode 100644
index 9926d43a9023..000000000000
--- a/test/libyul/EVMCodeTransformTest.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-namespace solidity::yul::test
-{
-
-class EVMCodeTransformTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<EVMCodeTransformTest>(_config.filename);
-	}
-	explicit EVMCodeTransformTest(std::string const& _filename);
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-private:
-	bool m_stackOpt = false;
-};
-
-}
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
deleted file mode 100644
index dd960448209e..000000000000
--- a/test/libyul/FunctionSideEffects.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/FunctionSideEffects.h>
-#include <test/Common.h>
-#include <test/libyul/Common.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <libyul/SideEffects.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/Object.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libsolutil/StringUtils.h>
-
-#include <boost/algorithm/string.hpp>
-
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-namespace
-{
-string toString(SideEffects const& _sideEffects)
-{
-	vector<string> ret;
-	if (_sideEffects.movable)
-		ret.emplace_back("movable");
-	if (_sideEffects.movableApartFromEffects)
-		ret.emplace_back("movable apart from effects");
-	if (_sideEffects.canBeRemoved)
-		ret.emplace_back("can be removed");
-	if (_sideEffects.canBeRemovedIfNoMSize)
-		ret.emplace_back("can be removed if no msize");
-	if (!_sideEffects.cannotLoop)
-		ret.emplace_back("can loop");
-	if (_sideEffects.otherState == SideEffects::Write)
-		ret.emplace_back("writes other state");
-	else if (_sideEffects.otherState == SideEffects::Read)
-		ret.emplace_back("reads other state");
-	if (_sideEffects.storage == SideEffects::Write)
-		ret.emplace_back("writes storage");
-	else if (_sideEffects.storage == SideEffects::Read)
-		ret.emplace_back("reads storage");
-	if (_sideEffects.memory == SideEffects::Write)
-		ret.emplace_back("writes memory");
-	else if (_sideEffects.memory == SideEffects::Read)
-		ret.emplace_back("reads memory");
-
-	return joinHumanReadable(ret);
-}
-}
-
-FunctionSideEffects::FunctionSideEffects(string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult FunctionSideEffects::run(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	Object obj;
-	std::tie(obj.code, obj.analysisInfo) = yul::test::parse(m_source, false);
-	if (!obj.code)
-		BOOST_THROW_EXCEPTION(runtime_error("Parsing input failed."));
-
-	map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		CallGraphGenerator::callGraph(*obj.code)
-	);
-
-	std::map<std::string, std::string> functionSideEffectsStr;
-	for (auto const& fun: functionSideEffects)
-		functionSideEffectsStr[fun.first.str()] = toString(fun.second);
-
-	m_obtainedResult.clear();
-	for (auto const& fun: functionSideEffectsStr)
-		m_obtainedResult += fun.first + ":" + (fun.second.empty() ? "" : " ") + fun.second + "\n";
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libyul/FunctionSideEffects.h b/test/libyul/FunctionSideEffects.h
deleted file mode 100644
index ac0653733f03..000000000000
--- a/test/libyul/FunctionSideEffects.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/AnsiColorized.h>
-#include <test/TestCase.h>
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace solidity::yul::test
-{
-
-class FunctionSideEffects: public solidity::frontend::test::TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{ return std::make_unique<FunctionSideEffects>(_config.filename); }
-	explicit FunctionSideEffects(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-};
-
-}
diff --git a/test/libyul/Inliner.cpp b/test/libyul/Inliner.cpp
deleted file mode 100644
index 75ae064e5467..000000000000
--- a/test/libyul/Inliner.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * @date 2017
- * Unit tests for the Yul function inliner.
- */
-
-#include <test/libyul/Common.h>
-
-#include <libyul/optimiser/ExpressionInliner.h>
-#include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
-#include <libyul/optimiser/FullInliner.h>
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/AST.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <boost/algorithm/string/join.hpp>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-
-namespace
-{
-string inlinableFunctions(string const& _source)
-{
-	auto ast = disambiguate(_source);
-
-	InlinableExpressionFunctionFinder funFinder;
-	funFinder(ast);
-
-	vector<string> functionNames;
-	for (auto const& f: funFinder.inlinableFunctions())
-		functionNames.emplace_back(f.first.str());
-	return boost::algorithm::join(functionNames, ",");
-}
-
-}
-
-
-BOOST_AUTO_TEST_SUITE(YulInlinableFunctionFilter)
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ }"), "");
-}
-
-BOOST_AUTO_TEST_CASE(simple)
-{
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 } }"), "f");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{"
-		"function g(a:u256) -> b:u256 { b := a }"
-		"function f() -> x:u256 { x := g(2:u256) }"
-	"}"), "g,f");
-}
-
-BOOST_AUTO_TEST_CASE(simple_inside_structures)
-{
-	BOOST_CHECK_EQUAL(inlinableFunctions("{"
-		"switch 2:u256 "
-		"case 2:u256 {"
-			"function g(a:u256) -> b:u256 { b := a }"
-			"function f() -> x:u256 { x := g(2:u256) }"
-		"}"
-	"}"), "g,f");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{"
-		"function g(a:u256) -> b:u256 { b := a }"
-		"for {"
-		"} true {"
-			"function f() -> x:u256 { x := g(2:u256) }"
-		"}"
-		"{"
-			"function h() -> y:u256 { y := 2:u256 }"
-		"}"
-	"}"), "h,g,f");
-}
-
-BOOST_AUTO_TEST_CASE(negative)
-{
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 {} } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := f() } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := x } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256, y:u256 { x := 2:u256 } }"), "");
-  BOOST_CHECK_EQUAL(inlinableFunctions(
-    "{ function g() -> x:u256, y:u256 {} function f(y:u256) -> x:u256 { x,y := g() } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f(y:u256) -> x:u256 { y := 2:u256 } }"), "");
-}
-
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
deleted file mode 100644
index 7cb5a8ae3c05..000000000000
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Unit tests for KnowledgeBase
- */
-
-#include <test/Common.h>
-
-#include <test/libyul/Common.h>
-
-#include <libyul/Object.h>
-#include <libyul/optimiser/KnowledgeBase.h>
-#include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/optimiser/CommonSubexpressionEliminator.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <liblangutil/ErrorReporter.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace std;
-using namespace solidity::langutil;
-
-namespace solidity::yul::test
-{
-
-class KnowledgeBaseTest
-{
-protected:
-	KnowledgeBase constructKnowledgeBase(string const& _source)
-	{
-		ErrorList errorList;
-		shared_ptr<AsmAnalysisInfo> analysisInfo;
-		std::tie(m_object, analysisInfo) = yul::test::parse(_source, m_dialect, errorList);
-		BOOST_REQUIRE(m_object && errorList.empty() && m_object->code);
-
-		NameDispenser dispenser(m_dialect, *m_object->code);
-		std::set<YulString> reserved;
-		OptimiserStepContext context{m_dialect, dispenser, reserved, 0};
-		CommonSubexpressionEliminator::run(context, *m_object->code);
-
-		m_ssaValues(*m_object->code);
-		for (auto const& [name, expression]: m_ssaValues.values())
-			m_values[name].value = expression;
-
-		return KnowledgeBase([this](YulString _var) { return util::valueOrNullptr(m_values, _var); });
-	}
-
-	EVMDialect m_dialect{EVMVersion{}, true};
-	shared_ptr<Object> m_object;
-	SSAValueTracker m_ssaValues;
-	map<YulString, AssignedValue> m_values;
-};
-
-BOOST_FIXTURE_TEST_SUITE(KnowledgeBase, KnowledgeBaseTest)
-
-BOOST_AUTO_TEST_CASE(basic)
-{
-	yul::KnowledgeBase kb = constructKnowledgeBase(R"({
-		let a := calldataload(0)
-		let b := calldataload(0)
-		let zero := 0
-		let c := add(b, 0)
-		let d := mul(b, 0)
-		let e := sub(a, b)
-	})");
-
-	BOOST_CHECK(!kb.knownToBeDifferent("a"_yulstring, "b"_yulstring));
-	// This only works if the variable names are the same.
-	// It assumes that SSA+CSE+Simplifier actually replaces the variables.
-	BOOST_CHECK(!kb.valueIfKnownConstant("a"_yulstring));
-	BOOST_CHECK(kb.valueIfKnownConstant("zero"_yulstring) == u256(0));
-	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulstring, "b"_yulstring) == u256(0));
-	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulstring, "c"_yulstring) == u256(0));
-	BOOST_CHECK(kb.valueIfKnownConstant("e"_yulstring) == u256(0));
-}
-
-BOOST_AUTO_TEST_CASE(difference)
-{
-	yul::KnowledgeBase kb = constructKnowledgeBase(R"({
-		let a := calldataload(0)
-		let b := add(a, 200)
-		let c := add(a, 220)
-		let d := add(12, c)
-		let e := sub(c, 12)
-	})");
-
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("c"_yulstring, "b"_yulstring) ==
-		u256(20)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("b"_yulstring, "c"_yulstring) ==
-		u256(-20)
-	);
-	BOOST_CHECK(!kb.knownToBeDifferentByAtLeast32("b"_yulstring, "c"_yulstring));
-	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("b"_yulstring, "d"_yulstring));
-	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("a"_yulstring, "b"_yulstring));
-	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("b"_yulstring, "a"_yulstring));
-
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("e"_yulstring, "a"_yulstring) == u256(208)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("e"_yulstring, "b"_yulstring) == u256(8)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("a"_yulstring, "e"_yulstring) == u256(-208)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("b"_yulstring, "e"_yulstring) == u256(-8)
-	);
-}
-
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libyul/Metrics.cpp b/test/libyul/Metrics.cpp
deleted file mode 100644
index f8c5920f2acc..000000000000
--- a/test/libyul/Metrics.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * Unit tests for the code metrics.
- */
-
-#include <test/Common.h>
-
-#include <test/libyul/Common.h>
-
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/AST.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace std;
-using namespace solidity::langutil;
-
-namespace solidity::yul::test
-{
-
-namespace
-{
-
-size_t codeSize(string const& _source, CodeWeights const _weights = {})
-{
-	shared_ptr<Block> ast = parse(_source, false).first;
-	BOOST_REQUIRE(ast);
-	return CodeSize::codeSize(*ast, _weights);
-}
-
-}
-
-class CustomWeightFixture
-{
-protected:
-	CodeWeights m_weights{
-		/* expressionStatementCost = */ 1,
-		/* assignmentCost = */ 2,
-		/* variableDeclarationCost = */ 3,
-		/* functionDefinitionCost = */ 4,
-		/* ifCost = */ 5,
-		/* switchCost = */ 6,
-		/* caseCost = */ 7,
-		/* forLoopCost = */ 8,
-		/* breakCost = */ 9,
-		/* continueCost = */ 10,
-		/* leaveCost = */ 11,
-		/* blockCost = */ 12,
-
-		/* functionCallCost = */ 13,
-		/* identifierCost = */ 14,
-		/* literalCost = */ 15,
-	};
-};
-
-BOOST_AUTO_TEST_SUITE(YulCodeSize)
-
-BOOST_AUTO_TEST_CASE(empty_code)
-{
-	BOOST_CHECK_EQUAL(codeSize("{}"), 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(empty_code_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(codeSize("{}", m_weights), 0);
-}
-
-BOOST_AUTO_TEST_CASE(nested_blocks)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ {} {} {{ }} }"), 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(nested_blocks_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ {} {} {{ }} }", m_weights), 4 * m_weights.blockCost);
-}
-
-BOOST_AUTO_TEST_CASE(instruction)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ pop(calldatasize()) }"), 2);
-}
-
-BOOST_FIXTURE_TEST_CASE(instruction_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ pop(calldatasize()) }", m_weights),
-		2 * m_weights.functionCallCost +
-		1 * m_weights.expressionStatementCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(variables_are_free)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ let x let y let a, b, c }"), 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(variables_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ let x let y let a, b, c }", m_weights),
-		3 * m_weights.variableDeclarationCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(constants_cost_one)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ let x := 3 }"), 1);
-}
-
-BOOST_FIXTURE_TEST_CASE(constants_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ let x := 3 }", m_weights),
-		1 * m_weights.variableDeclarationCost +
-		1 * m_weights.literalCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(functions_are_skipped)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ function f(x) -> r { r := mload(x) } }"), 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(functions_are_skipped_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ function f(x) -> r { r := mload(x) } }", m_weights), 0);
-}
-
-BOOST_AUTO_TEST_CASE(function_with_arguments)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ function f(x) { sstore(x, 2) } f(2) }"), 2);
-}
-
-BOOST_FIXTURE_TEST_CASE(function_with_arguments_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ function f(x) { sstore(x, 2) } f(2) }", m_weights),
-		1 * m_weights.expressionStatementCost +
-		1 * m_weights.functionCallCost +
-		1 * m_weights.literalCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(function_with_variables_as_arguments)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ function f(x) { sstore(x, 2) } let y f(y) }"), 1);
-}
-
-BOOST_FIXTURE_TEST_CASE(function_with_variables_as_arguments_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ function f(x) { sstore(x, 2) } let y f(y) }", m_weights),
-		1 * m_weights.variableDeclarationCost +
-		1 * m_weights.expressionStatementCost +
-		1 * m_weights.functionCallCost +
-		1 * m_weights.identifierCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(function_with_variables_and_constants_as_arguments)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ function f(x, r) -> z { sstore(x, r) z := r } let y let t := f(y, 2) }"
-	), 2);
-}
-
-BOOST_FIXTURE_TEST_CASE(
-	function_with_variables_and_constants_as_arguments_custom_weights,
-	CustomWeightFixture
-)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize(
-			"{ function f(x, r) -> z { sstore(x, r) z := r } let y let t := f(y, 2) }",
-			m_weights
-		),
-		2 * m_weights.variableDeclarationCost +
-		1 * m_weights.functionCallCost +
-		1 * m_weights.identifierCost +
-		1 * m_weights.literalCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(assignment)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ let a a := 3 }"), 1);
-}
-
-BOOST_FIXTURE_TEST_CASE(assignment_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ let a a := 3 }", m_weights),
-		1 * m_weights.variableDeclarationCost +
-		1 * m_weights.assignmentCost +
-		1 * m_weights.literalCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(assignments_between_vars_are_free)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ let a let b := a a := b }"), 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(assignments_between_vars_are_free_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ let a let b := a a := b }", m_weights),
-		2 * m_weights.variableDeclarationCost +
-		1 * m_weights.assignmentCost +
-		2 * m_weights.identifierCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(assignment_complex)
-{
-	BOOST_CHECK_EQUAL(codeSize("{ let a let x := mload(a) a := sload(x) }"), 2);
-}
-
-BOOST_FIXTURE_TEST_CASE(assignment_complex_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ let a let x := mload(a) a := sload(x) }", m_weights),
-		2 * m_weights.variableDeclarationCost +
-		1 * m_weights.assignmentCost +
-		2 * m_weights.identifierCost +
-		2 * m_weights.functionCallCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(empty_for_loop)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ for {} 1 {} {} }"
-	), 4);
-}
-
-BOOST_FIXTURE_TEST_CASE(empty_for_loop_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ for {} 1 {} {} }", m_weights),
-		1 * m_weights.forLoopCost +
-		1 * m_weights.literalCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(break_statement)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ for {} 1 {} { break } }"
-	), 6);
-}
-
-BOOST_FIXTURE_TEST_CASE(break_statement_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ for {} 1 {} { break } }", m_weights),
-		1 * m_weights.forLoopCost +
-		1 * m_weights.literalCost +
-		1 * m_weights.breakCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(continue_statement)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ for {} 1 {} { continue } }"
-	), 6);
-}
-
-BOOST_FIXTURE_TEST_CASE(continue_statement_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ for {} 1 {} { continue } }", m_weights),
-		1 * m_weights.forLoopCost +
-		1 * m_weights.literalCost +
-		1 * m_weights.continueCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(regular_for_loop)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ for { let x := 0 } lt(x, 10) { x := add(x, 1) } { mstore(x, 1) } }"
-	), 9);
-}
-
-BOOST_FIXTURE_TEST_CASE(regular_for_loop_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ for { let x := 0 } lt(x, 10) { x := add(x, 1) } { mstore(x, 1) } }", m_weights),
-		1 * m_weights.forLoopCost +
-		1 * m_weights.variableDeclarationCost +
-		1 * m_weights.assignmentCost +
-		3 * m_weights.functionCallCost +
-		3 * m_weights.literalCost +
-		1 * m_weights.literalZeroCost +
-		3 * m_weights.identifierCost +
-		1 * m_weights.expressionStatementCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(if_statement)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ if 1 {} }"
-	), 3);
-}
-
-BOOST_FIXTURE_TEST_CASE(if_statement_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ if 1 {} }", m_weights),
-		1 * m_weights.ifCost +
-		1 * m_weights.literalCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(switch_statement_tiny)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ switch calldatasize() case 0 {} }"
-	), 4);
-}
-
-BOOST_AUTO_TEST_CASE(switch_statement_small)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ switch calldatasize() case 0 {} default {} }"
-	), 6);
-}
-
-BOOST_FIXTURE_TEST_CASE(switch_statement_small_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ switch calldatasize() case 0 {} default {} }", m_weights),
-		1 * m_weights.functionCallCost +
-		1 * m_weights.switchCost +
-		2 * m_weights.caseCost
-	);
-}
-
-BOOST_AUTO_TEST_CASE(switch_statement_medium)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ switch calldatasize() case 0 {} case 1 {} case 2 {} }"
-	), 8);
-}
-
-BOOST_AUTO_TEST_CASE(switch_statement_large)
-{
-	BOOST_CHECK_EQUAL(codeSize(
-		"{ switch calldatasize() case 0 {} case 1 {} case 2 {} default {} }"
-	), 10);
-}
-
-BOOST_FIXTURE_TEST_CASE(switch_statement_large_custom_weights, CustomWeightFixture)
-{
-	BOOST_CHECK_EQUAL(
-		codeSize("{ switch calldatasize() case 0 {} case 1 {} case 2 {} default {} }", m_weights),
-		1 * m_weights.functionCallCost +
-		1 * m_weights.switchCost +
-		4 * m_weights.caseCost
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
deleted file mode 100644
index 74a680b9b7c0..000000000000
--- a/test/libyul/ObjectCompilerTest.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/ObjectCompilerTest.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <test/Common.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <libyul/YulStack.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/Disassemble.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <fstream>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-ObjectCompilerTest::ObjectCompilerTest(string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_optimisationPreset = m_reader.enumSetting<OptimisationPreset>(
-		"optimizationPreset",
-		{
-			{"none", OptimisationPreset::None},
-			{"minimal", OptimisationPreset::Minimal},
-			{"standard", OptimisationPreset::Standard},
-			{"full", OptimisationPreset::Full},
-		},
-		"minimal"
-	);
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	YulStack stack(
-		EVMVersion(),
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		OptimiserSettings::preset(m_optimisationPreset),
-		DebugInfoSelection::All()
-	);
-	if (!stack.parseAndAnalyze("source", m_source))
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		SourceReferenceFormatter{_stream, stack, true, false}
-			.printErrorInformation(stack.errors());
-		return TestResult::FatalError;
-	}
-	stack.optimize();
-
-	MachineAssemblyObject obj = stack.assemble(YulStack::Machine::EVM);
-	solAssert(obj.bytecode, "");
-	solAssert(obj.sourceMappings, "");
-
-	m_obtainedResult = "Assembly:\n" + obj.assembly;
-	if (obj.bytecode->bytecode.empty())
-		m_obtainedResult += "-- empty bytecode --\n";
-	else
-		m_obtainedResult +=
-			"Bytecode: " +
-			util::toHex(obj.bytecode->bytecode) +
-			"\nOpcodes: " +
-			boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion())) +
-			"\nSourceMappings:" +
-			(obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) +
-			"\n";
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libyul/ObjectCompilerTest.h b/test/libyul/ObjectCompilerTest.h
deleted file mode 100644
index fe899870022e..000000000000
--- a/test/libyul/ObjectCompilerTest.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-namespace solidity::langutil
-{
-class Scanner;
-class Error;
-using ErrorList = std::vector<std::shared_ptr<Error const>>;
-}
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-struct Block;
-}
-
-namespace solidity::yul::test
-{
-
-class ObjectCompilerTest: public solidity::frontend::test::TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<ObjectCompilerTest>(_config.filename);
-	}
-
-	explicit ObjectCompilerTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-
-private:
-	bool parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted);
-	void disambiguate();
-
-	frontend::OptimisationPreset m_optimisationPreset;
-};
-
-}
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
deleted file mode 100644
index e78a8b0eb627..000000000000
--- a/test/libyul/ObjectParser.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @date 2018
- * Unit tests for the Yul object parser.
- */
-
-#include <test/Common.h>
-
-#include <test/libsolidity/ErrorCheck.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/Scanner.h>
-
-#include <libyul/YulStack.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <range/v3/view/iota.hpp>
-
-#include <memory>
-#include <optional>
-#include <string>
-#include <sstream>
-
-using namespace std;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-
-namespace solidity::yul::test
-{
-
-namespace
-{
-
-pair<bool, ErrorList> parse(string const& _source)
-{
-	try
-	{
-		YulStack asmStack(
-			solidity::test::CommonOptions::get().evmVersion(),
-			solidity::test::CommonOptions::get().eofVersion(),
-			YulStack::Language::StrictAssembly,
-			solidity::frontend::OptimiserSettings::none(),
-			DebugInfoSelection::All()
-		);
-		bool success = asmStack.parseAndAnalyze("source", _source);
-		return {success, asmStack.errors()};
-	}
-	catch (FatalError const&)
-	{
-		BOOST_FAIL("Fatal error leaked.");
-	}
-	return {false, {}};
-}
-
-optional<Error> parseAndReturnFirstError(string const& _source, bool _allowWarningsAndInfos = true)
-{
-	bool success;
-	ErrorList errors;
-	tie(success, errors) = parse(_source);
-	if (!success)
-	{
-		BOOST_REQUIRE_EQUAL(errors.size(), 1);
-		return *errors.front();
-	}
-	else
-	{
-		// If success is true, there might still be an error in the assembly stage.
-		if (_allowWarningsAndInfos && !Error::containsErrors(errors))
-			return {};
-		else if (!errors.empty())
-		{
-			if (!_allowWarningsAndInfos)
-				BOOST_CHECK_EQUAL(errors.size(), 1);
-			return *errors.front();
-		}
-	}
-	return {};
-}
-
-bool successParse(string const& _source, bool _allowWarningsAndInfos = true)
-{
-	return !parseAndReturnFirstError(_source, _allowWarningsAndInfos);
-}
-
-Error expectError(string const& _source, bool _allowWarningsAndInfos = false)
-{
-
-	auto error = parseAndReturnFirstError(_source, _allowWarningsAndInfos);
-	BOOST_REQUIRE(error);
-	return *error;
-}
-
-tuple<optional<SourceNameMap>, ErrorList> tryGetSourceLocationMapping(string _source)
-{
-	vector<string> lines;
-	boost::split(lines, _source, boost::is_any_of("\n"));
-	string source = util::joinHumanReadablePrefixed(lines, "\n///") + "\n{}\n";
-
-	ErrorList errors;
-	ErrorReporter reporter(errors);
-	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(EVMVersion::berlin());
-	ObjectParser objectParser{reporter, dialect};
-	CharStream stream(std::move(source), "");
-	auto object = objectParser.parse(make_shared<Scanner>(stream), false);
-	BOOST_REQUIRE(object && object->debugData);
-	return {object->debugData->sourceNames, std::move(errors)};
-}
-
-}
-
-#define CHECK_ERROR(text, typ, substring) \
-do \
-{ \
-	Error err = expectError((text), false); \
-	BOOST_CHECK(err.type() == (Error::Type::typ)); \
-	BOOST_CHECK(::solidity::frontend::test::searchErrorMessage(err, (substring))); \
-} while(0)
-
-BOOST_AUTO_TEST_SUITE(YulObjectParser)
-
-BOOST_AUTO_TEST_CASE(empty_code)
-{
-	BOOST_CHECK(successParse("{ }"));
-}
-
-BOOST_AUTO_TEST_CASE(recursion_depth)
-{
-	string input;
-	for (size_t i = 0; i < 20000; i++)
-		input += "object \"a" + to_string(i) + "\" { code {} ";
-	for (size_t i = 0; i < 20000; i++)
-		input += "}";
-
-	CHECK_ERROR(input, ParserError, "recursion");
-}
-
-BOOST_AUTO_TEST_CASE(to_string)
-{
-	string code = R"(
-		object "O" {
-			code { let x := mload(0) if x { sstore(0, 1) } }
-			object "i" { code {} data "j" "def" }
-			data "j" "abc"
-			data "k" hex"010203"
-		}
-	)";
-	string expectation = R"(object "O" {
-	code {
-		let x := mload(0)
-		if x { sstore(0, 1) }
-	}
-	object "i" {
-		code { }
-		data "j" hex"646566"
-	}
-	data "j" hex"616263"
-	data "k" hex"010203"
-}
-)";
-	expectation = boost::replace_all_copy(expectation, "\t", "    ");
-	YulStack asmStack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::none(),
-		DebugInfoSelection::All()
-	);
-	BOOST_REQUIRE(asmStack.parseAndAnalyze("source", code));
-	BOOST_CHECK_EQUAL(asmStack.print(), expectation);
-}
-
-BOOST_AUTO_TEST_CASE(use_src_empty)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping("");
-	BOOST_REQUIRE(!mapping);
-}
-
-BOOST_AUTO_TEST_CASE(use_src_simple)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping(R"(@use-src 0:"contract.sol")");
-	BOOST_REQUIRE(mapping.has_value());
-	BOOST_REQUIRE_EQUAL(mapping->size(), 1);
-	BOOST_REQUIRE_EQUAL(*mapping->at(0), "contract.sol");
-}
-
-BOOST_AUTO_TEST_CASE(use_src_multiple)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping(R"(@use-src 0:"contract.sol", 1:"misc.yul")");
-	BOOST_REQUIRE(mapping);
-	BOOST_REQUIRE_EQUAL(mapping->size(), 2);
-	BOOST_REQUIRE_EQUAL(*mapping->at(0), "contract.sol");
-	BOOST_REQUIRE_EQUAL(*mapping->at(1), "misc.yul");
-}
-
-BOOST_AUTO_TEST_CASE(use_src_escaped_filenames)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping(
-		R"(@use-src 42:"con\"tract@\".sol")"
-	);
-	BOOST_REQUIRE(mapping);
-	BOOST_REQUIRE_EQUAL(mapping->size(), 1);
-	BOOST_REQUIRE(mapping->count(42));
-	BOOST_REQUIRE_EQUAL(*mapping->at(42), "con\"tract@\".sol");
-}
-
-BOOST_AUTO_TEST_CASE(use_src_invalid_syntax_malformed_param_1)
-{
-	// open quote arg, missing closing quote
-	auto const [mapping, errors] = tryGetSourceLocationMapping(R"(@use-src 42_"con")");
-
-	BOOST_REQUIRE_EQUAL(errors.size(), 1);
-	BOOST_CHECK_EQUAL(errors.front()->errorId().error, 9804);
-}
-
-BOOST_AUTO_TEST_CASE(use_src_invalid_syntax_malformed_param_2)
-{
-	// open quote arg, missing closing quote
-	auto const [mapping, errors] = tryGetSourceLocationMapping(R"(@use-src 42:"con)");
-
-	BOOST_REQUIRE_EQUAL(errors.size(), 1);
-	BOOST_CHECK_EQUAL(errors.front()->errorId().error, 9804);
-}
-
-BOOST_AUTO_TEST_CASE(use_src_error_unexpected_trailing_tokens)
-{
-	auto const [mapping, errors] = tryGetSourceLocationMapping(
-		R"(@use-src 1:"file.sol" @use-src 2:"foo.sol")"
-	);
-
-	BOOST_REQUIRE_EQUAL(errors.size(), 1);
-	BOOST_CHECK_EQUAL(errors.front()->errorId().error, 9804);
-}
-
-BOOST_AUTO_TEST_CASE(use_src_multiline)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping(
-		" @use-src \n  0:\"contract.sol\" \n , \n 1:\"misc.yul\""
-	);
-	BOOST_REQUIRE(mapping);
-	BOOST_REQUIRE_EQUAL(mapping->size(), 2);
-	BOOST_REQUIRE_EQUAL(*mapping->at(0), "contract.sol");
-	BOOST_REQUIRE_EQUAL(*mapping->at(1), "misc.yul");
-}
-
-BOOST_AUTO_TEST_CASE(use_src_empty_body)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping("@use-src");
-	BOOST_REQUIRE(mapping);
-	BOOST_REQUIRE_EQUAL(mapping->size(), 0);
-}
-
-BOOST_AUTO_TEST_CASE(use_src_leading_text)
-{
-	auto const [mapping, _] = tryGetSourceLocationMapping(
-		"@something else @use-src 0:\"contract.sol\", 1:\"misc.sol\""s
-	);
-	BOOST_REQUIRE(mapping);
-	BOOST_REQUIRE_EQUAL(mapping->size(), 2);
-	BOOST_REQUIRE(mapping->find(0) != mapping->end());
-	BOOST_REQUIRE_EQUAL(*mapping->at(0), "contract.sol");
-	BOOST_REQUIRE_EQUAL(*mapping->at(1), "misc.sol");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
deleted file mode 100644
index 511ed6c19095..000000000000
--- a/test/libyul/Parser.cpp
+++ /dev/null
@@ -1,956 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @date 2017
- * Unit tests for parsing Yul.
- */
-
-#include <test/Common.h>
-
-#include <test/libsolidity/ErrorCheck.h>
-#include <test/libyul/Common.h>
-
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/Dialect.h>
-#include <liblangutil/ErrorReporter.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <memory>
-#include <optional>
-#include <string>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-BOOST_TEST_DONT_PRINT_LOG_VALUE(ErrorId)
-BOOST_TEST_DONT_PRINT_LOG_VALUE(Error::Type)
-
-namespace solidity::yul::test
-{
-
-namespace
-{
-
-shared_ptr<Block> parse(string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
-{
-	try
-	{
-		auto stream = CharStream(_source, "");
-		map<unsigned, shared_ptr<string const>> indicesToSourceNames;
-		indicesToSourceNames[0] = make_shared<string const>("source0");
-		indicesToSourceNames[1] = make_shared<string const>("source1");
-
-		auto parserResult = yul::Parser(
-			errorReporter,
-			_dialect,
-			std::move(indicesToSourceNames)
-		).parse(stream);
-		if (parserResult)
-		{
-			yul::AsmAnalysisInfo analysisInfo;
-			if (yul::AsmAnalyzer(
-				analysisInfo,
-				errorReporter,
-				_dialect
-			).analyze(*parserResult))
-				return parserResult;
-		}
-	}
-	catch (FatalError const&)
-	{
-		BOOST_FAIL("Fatal error leaked.");
-	}
-	return {};
-}
-
-std::optional<Error> parseAndReturnFirstError(string const& _source, Dialect const& _dialect, bool _allowWarningsAndInfos = true)
-{
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	if (!parse(_source, _dialect, errorReporter))
-	{
-		BOOST_REQUIRE(!errors.empty());
-		BOOST_CHECK_EQUAL(errors.size(), 1);
-		return *errors.front();
-	}
-	else
-	{
-		// If success is true, there might still be an error in the assembly stage.
-		if (_allowWarningsAndInfos && !Error::containsErrors(errors))
-			return {};
-		else if (!errors.empty())
-		{
-			if (!_allowWarningsAndInfos)
-				BOOST_CHECK_EQUAL(errors.size(), 1);
-			return *errors.front();
-		}
-	}
-	return {};
-}
-
-bool successParse(std::string const& _source, Dialect const& _dialect = Dialect::yulDeprecated(), bool _allowWarningsAndInfos = true)
-{
-	return !parseAndReturnFirstError(_source, _dialect, _allowWarningsAndInfos);
-}
-
-Error expectError(std::string const& _source, Dialect const& _dialect = Dialect::yulDeprecated(), bool _allowWarningsAndInfos = false)
-{
-
-	auto error = parseAndReturnFirstError(_source, _dialect, _allowWarningsAndInfos);
-	BOOST_REQUIRE(error);
-	return *error;
-}
-
-}
-
-#define CHECK_ERROR_DIALECT(text, typ, substring, dialect) \
-do \
-{ \
-	Error err = expectError((text), dialect, false); \
-	BOOST_CHECK(err.type() == (Error::Type::typ)); \
-	BOOST_CHECK(solidity::frontend::test::searchErrorMessage(err, (substring))); \
-} while(0)
-
-#define CHECK_ERROR(text, typ, substring) CHECK_ERROR_DIALECT(text, typ, substring, Dialect::yulDeprecated())
-
-BOOST_AUTO_TEST_SUITE(YulParser)
-
-BOOST_AUTO_TEST_CASE(builtins_analysis)
-{
-	struct SimpleDialect: public Dialect
-	{
-		BuiltinFunction const* builtin(YulString _name) const override
-		{
-			return _name == "builtin"_yulstring ? &f : nullptr;
-		}
-		BuiltinFunction f{"builtin"_yulstring, vector<Type>(2), vector<Type>(3), {}, {}, false, {}};
-	};
-
-	SimpleDialect dialect;
-	BOOST_CHECK(successParse("{ let a, b, c := builtin(1, 2) }", dialect));
-	CHECK_ERROR_DIALECT("{ let a, b, c := builtin(1) }", TypeError, "Function \"builtin\" expects 2 arguments but got 1", dialect);
-	CHECK_ERROR_DIALECT("{ let a, b := builtin(1, 2) }", DeclarationError, "Variable count mismatch for declaration of \"a, b\": 2 variables and 3 values.", dialect);
-}
-
-BOOST_AUTO_TEST_CASE(default_types_set)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	shared_ptr<Block> result = parse(
-		"{"
-			"let x:bool := true:bool "
-			"let z:bool := true "
-			"let y := add(1, 2) "
-			"switch y case 0 {} default {} "
-		"}",
-		EVMDialectTyped::instance(EVMVersion{}),
-		reporter
-	);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-
-	// Use no dialect so that all types are printed.
-	// This tests that the default types are properly assigned.
-	BOOST_CHECK_EQUAL(AsmPrinter{}(*result),
-		"{\n"
-		"    let x:bool := true:bool\n"
-		"    let z:bool := true:bool\n"
-		"    let y:u256 := add(1:u256, 2:u256)\n"
-		"    switch y\n"
-		"    case 0:u256 { }\n"
-		"    default { }\n"
-		"}"
-	);
-
-	// Now test again with type dialect. Now the default types
-	// should be omitted.
-	BOOST_CHECK_EQUAL(AsmPrinter{EVMDialectTyped::instance(EVMVersion{})}(*result),
-		"{\n"
-		"    let x:bool := true\n"
-		"    let z:bool := true\n"
-		"    let y := add(1, 2)\n"
-		"    switch y\n"
-		"    case 0 { }\n"
-		"    default { }\n"
-		"}"
-	);
-}
-
-#define CHECK_LOCATION(_actual, _sourceName, _start, _end) \
-	do { \
-		BOOST_CHECK_EQUAL((_sourceName), ((_actual).sourceName ? *(_actual).sourceName : "")); \
-		BOOST_CHECK_EQUAL((_start), (_actual).start); \
-		BOOST_CHECK_EQUAL((_end), (_actual).end); \
-	} while (0)
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_empty_block)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"/// @src 0:234:543\n"
-		"{}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"/// @src 0:234:543\n"
-		"{\n"
-			"let x:bool := true:bool\n"
-			"/// @src 0:123:432\n"
-			"let z:bool := true\n"
-			"let y := add(1, 2)\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
-	BOOST_REQUIRE_EQUAL(3, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 234, 543);
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source0", 123, 432);
-	// [2] is inherited source location
-	CHECK_LOCATION(originLocationOf(result->statements.at(2)), "source0", 123, 432);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"/// @src 0:234:543\n"
-		"{\n"
-			"let x:bool := true:bool\n"
-			"/// @src 1:123:432\n"
-			"let z:bool := true\n"
-			"let y := add(1, 2)\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
-	BOOST_REQUIRE_EQUAL(3, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 234, 543);
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source1", 123, 432);
-	// [2] is inherited source location
-	CHECK_LOCATION(originLocationOf(result->statements.at(2)), "source1", 123, 432);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"/// @src 0:234:543\n"
-		"{\n"
-			"let y := add(1, 2)\n"
-			"/// @src 0:343:434\n"
-			"switch y case 0 {} default {}\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
-	BOOST_REQUIRE_EQUAL(2, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source0", 343, 434);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"/// @src 0:234:543\n"
-		"{\n"
-			"let y := add(1, 2)\n"
-			"/// @src 0:343:434\n"
-			"switch y\n"
-			"/// @src 0:3141:59265\n"
-			"case 0 {\n"
-			"    /// @src 0:271:828\n"
-			"    let z := add(3, 4)\n"
-			"}\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
-
-	BOOST_REQUIRE_EQUAL(2, result->statements.size());
-	BOOST_REQUIRE(holds_alternative<Switch>(result->statements.at(1)));
-	auto const& switchStmt = get<Switch>(result->statements.at(1));
-
-	CHECK_LOCATION(switchStmt.debugData->originLocation, "source0", 343, 434);
-	BOOST_REQUIRE_EQUAL(1, switchStmt.cases.size());
-	CHECK_LOCATION(switchStmt.cases.at(0).debugData->originLocation, "source0", 3141, 59265);
-
-	auto const& caseBody = switchStmt.cases.at(0).body;
-	BOOST_REQUIRE_EQUAL(1, caseBody.statements.size());
-	CHECK_LOCATION(originLocationOf(caseBody.statements.at(0)), "source0", 271, 828);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"/// @src 0:1:100\n"
-		"{\n"
-			"{\n"
-				"/// @src 0:123:432\n"
-				"let x:bool := true:bool\n"
-			"}\n"
-			"let z:bool := true\n"
-			"let y := add(1, 2)\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 1, 100);
-
-	BOOST_REQUIRE_EQUAL(3, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 1, 100);
-
-	// First child element must be a block itself with one statement.
-	BOOST_REQUIRE(holds_alternative<Block>(result->statements.at(0)));
-	BOOST_REQUIRE_EQUAL(get<Block>(result->statements.at(0)).statements.size(), 1);
-	CHECK_LOCATION(originLocationOf(get<Block>(result->statements.at(0)).statements.at(0)), "source0", 123, 432);
-
-	// The next two elements have an inherited source location from the prior inner scope.
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source0", 123, 432);
-	CHECK_LOCATION(originLocationOf(result->statements.at(2)), "source0", 123, 432);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
-{
-	// Tests single AST node (e.g. VariableDeclaration) with different source locations for each child.
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"{\n"
-			"/// @src 0:123:432\n"
-			"let a:bool\n"
-			"/// @src 1:1:10\n"
-			"a := true:bool\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0); // should still parse
-	BOOST_REQUIRE_EQUAL(2, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 123, 432);
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source1", 1, 10);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
-{
-	// Tests single AST node (e.g. VariableDeclaration) with different source locations for each child.
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"{\n"
-			"/// @src 1:123:432\n"
-			"let a:bool := true:bool\n"
-			"/// @src 2345:0:8\n"
-			"let b:bool := true:bool\n"
-			"\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result); // should still parse
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 2674_error);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_1)
-{
-	// Tests single AST node (e.g. VariableDeclaration) with different source locations for each child.
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"{\n"
-			"/// @src 0:123:432\n"
-			"let x:bool \n"
-			"/// @src 0:234:2026\n"
-			":= true:bool\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-
-	BOOST_REQUIRE_EQUAL(1, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 123, 432);
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
-	CHECK_LOCATION(originLocationOf(*varDecl.value), "source0", 234, 2026);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_2)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:0:5
-		{
-			let x := /// @src 1:2:3
-			add(1,   /// @src 0:4:8
-			2)
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(1, result->statements.size());
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 0, 5);
-
-	// `let x := add(1, `
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
-	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 0, 5);
-	BOOST_REQUIRE(!!varDecl.value);
-	BOOST_REQUIRE(holds_alternative<FunctionCall>(*varDecl.value));
-	FunctionCall const& call = get<FunctionCall>(*varDecl.value);
-	CHECK_LOCATION(call.debugData->originLocation, "source1", 2, 3);
-
-	// `2`
-	BOOST_REQUIRE_EQUAL(2, call.arguments.size());
-	CHECK_LOCATION(originLocationOf(call.arguments.at(1)), "source0", 4, 8);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 1:23:45
-		{								// Block
-			{							// Block
-				sstore(0, 1)			// FunctionCall
-				/// @src 0:420:680
-			}
-			mstore(1, 2)				// FunctionCall
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(2, result->statements.size());
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 23, 45);
-
-	BOOST_REQUIRE(holds_alternative<Block>(result->statements.at(0)));
-	Block const& innerBlock = get<Block>(result->statements.at(0));
-	CHECK_LOCATION(innerBlock.debugData->originLocation, "source1", 23, 45);
-
-	BOOST_REQUIRE_EQUAL(1, innerBlock.statements.size());
-	BOOST_REQUIRE(holds_alternative<ExpressionStatement>(result->statements.at(1)));
-	ExpressionStatement const& sstoreStmt = get<ExpressionStatement>(innerBlock.statements.at(0));
-	BOOST_REQUIRE(holds_alternative<FunctionCall>(sstoreStmt.expression));
-	FunctionCall const& sstoreCall = get<FunctionCall>(sstoreStmt.expression);
-	CHECK_LOCATION(sstoreCall.debugData->originLocation, "source1", 23, 45);
-
-	BOOST_REQUIRE(holds_alternative<ExpressionStatement>(result->statements.at(1)));
-	ExpressionStatement mstoreStmt = get<ExpressionStatement>(result->statements.at(1));
-	BOOST_REQUIRE(holds_alternative<FunctionCall>(mstoreStmt.expression));
-	FunctionCall const& mstoreCall = get<FunctionCall>(mstoreStmt.expression);
-	CHECK_LOCATION(mstoreCall.debugData->originLocation, "source0", 420, 680);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_comments_after_valid)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 1:23:45
-		{
-			/// @src 0:420:680
-			/// @invalid
-			let a:bool := true
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(1, result->statements.size());
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 23, 45);
-
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
-	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 420, 680);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_suffix)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:420:680foo
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// abc@src 0:111:222
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src -1:-1:-1
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src a:b:c
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 111111111111111111111:222222222222222222222:333333333333333333333
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 6367_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:123:432
-		{
-			/// @src 1:10:20
-			/// @src 0:30:40
-			let x:bool := true
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
-
-	// Ensure the latest @src per documentation-comment is used (0:30:40).
-	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 30, 40);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_no_whitespace)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222@src 1:333:444
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_space)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222 @src 1:333:444
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 333, 444);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_leading_trailing_whitespace)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = "///     @src 0:111:222    \n{}";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 1:2:3
-		{
-			/// @src -1:10:20
-			let x:bool := true
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
-
-	// -1 points to original source code, which in this case is `"source0"` (which is also
-	CHECK_LOCATION(varDecl.debugData->originLocation, "", 10, 20);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"~~~(
-		{
-			/// @src 0:149:156  "new C(\"123\")"
-			let x := 123
-
-			let y := /** @src 1:96:165  "contract D {..." */ 128
-		}
-	)~~~";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(result->statements.size(), 2);
-
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = get<VariableDeclaration>(result->statements.at(0));
-	CHECK_LOCATION(varX.debugData->originLocation, "source0", 149, 156);
-
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(1)));
-	VariableDeclaration const& varY = get<VariableDeclaration>(result->statements.at(1));
-	BOOST_REQUIRE(!!varY.value);
-	BOOST_REQUIRE(holds_alternative<Literal>(*varY.value));
-	Literal const& literal128 = get<Literal>(*varY.value);
-	CHECK_LOCATION(literal128.debugData->originLocation, "source1", 96, 165);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_empty_snippet)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222 ""
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_before_snippet)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222"abc" def
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_after_snippet)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222 "abc"def
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whitespace)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222 "abc"@src 1:333:444 "abc"
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 333, 444);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_unterminated_quote)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src 0:111:222 " abc @src 1:333:444
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 1544_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locations)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"~~~(
-		{
-			/// @src 0:149:156  "new C(\"123\") /// @src 1:3:4 "
-			let x := 123
-
-			let y := /** @src 1:96:165  "function f() internal { \"\/** @src 0:6:7 *\/\"; }" */ 128
-		}
-	)~~~";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(result->statements.size(), 2);
-
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = get<VariableDeclaration>(result->statements.at(0));
-	CHECK_LOCATION(varX.debugData->originLocation, "source0", 149, 156);
-
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(1)));
-	VariableDeclaration const& varY = get<VariableDeclaration>(result->statements.at(1));
-	BOOST_REQUIRE(!!varY.value);
-	BOOST_REQUIRE(holds_alternative<Literal>(*varY.value));
-	Literal const& literal128 = get<Literal>(*varY.value);
-	CHECK_LOCATION(literal128.debugData->originLocation, "source1", 96, 165);
-}
-
-BOOST_AUTO_TEST_CASE(astid)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src -1:-1:-1 @ast-id 7
-		{
-			/** @ast-id 2 */
-			function f(x) -> y {}
-			mstore(1, 2)
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_CHECK(result->debugData->astID == int64_t(7));
-	auto const& funDef = get<FunctionDefinition>(result->statements.at(0));
-	BOOST_CHECK(funDef.debugData->astID == int64_t(2));
-	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == nullopt);
-	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(astid_reset)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src -1:-1:-1 @ast-id 7 @src 1:1:1
-		{
-			/** @ast-id 2 */
-			function f(x) -> y {}
-			mstore(1, 2)
-		}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_CHECK(result->debugData->astID == int64_t(7));
-	auto const& funDef = get<FunctionDefinition>(result->statements.at(0));
-	BOOST_CHECK(funDef.debugData->astID == int64_t(2));
-	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == nullopt);
-	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == nullopt);
-}
-
-BOOST_AUTO_TEST_CASE(astid_multi)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src -1:-1:-1 @ast-id 7 @src 1:1:1 @ast-id 8
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_CHECK(result->debugData->astID == int64_t(8));
-}
-
-BOOST_AUTO_TEST_CASE(astid_invalid)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @src -1:-1:-1 @ast-id abc @src 1:1:1
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 1749_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
-}
-
-BOOST_AUTO_TEST_CASE(astid_too_large)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @ast-id 9223372036854775808
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 1749_error);
-}
-
-BOOST_AUTO_TEST_CASE(astid_way_too_large)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @ast-id 999999999999999999999999999999999999999
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 1749_error);
-}
-
-BOOST_AUTO_TEST_CASE(astid_not_fully_numeric)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText = R"(
-		/// @ast-id 9x
-		{}
-	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result);
-	BOOST_REQUIRE(errorList.size() == 1);
-	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
-	BOOST_TEST(errorList[0]->errorId() == 1749_error);
-}
-
-BOOST_AUTO_TEST_CASE(customSourceLocations_multiple_src_tags_on_one_line)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	auto const sourceText =
-		"{\n"
-		"    /// "
-			R"~~(@src 1:2:3 ""@src 1:2:4 @src-1:2:5@src 1:2:6 @src 1:2:7     "" @src 1:2:8)~~"
-			R"~~( X "@src 0:10:20 "new C(\"123\") /// @src 1:4:5 "" XYZ)~~"
-			R"~~( @src0:20:30 "abc"@src0:2:4 @src-0:2:5@)~~"
-			R"~~( @some text with random @ signs @@@ @- @** 1:6:7 "src 1:8:9")~~"
-		"\n"
-		"    let x := 123\n"
-		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(result->statements.size(), 1);
-
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = get<VariableDeclaration>(result->statements.at(0));
-	CHECK_LOCATION(varX.debugData->originLocation, "source1", 4, 5);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // end namespaces
diff --git a/test/libyul/StackLayoutGeneratorTest.cpp b/test/libyul/StackLayoutGeneratorTest.cpp
deleted file mode 100644
index 70fda680e334..000000000000
--- a/test/libyul/StackLayoutGeneratorTest.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/StackLayoutGeneratorTest.h>
-#include <test/libyul/Common.h>
-#include <test/Common.h>
-
-#include <libyul/backends/evm/ControlFlowGraph.h>
-#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
-#include <libyul/backends/evm/StackHelpers.h>
-#include <libyul/backends/evm/StackLayoutGenerator.h>
-#include <libyul/Object.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/Visitor.h>
-
-#include <range/v3/view/reverse.hpp>
-
-#ifdef ISOLTEST
-#include <boost/process.hpp>
-#endif
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-StackLayoutGeneratorTest::StackLayoutGeneratorTest(string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
-	m_expectation = m_reader.simpleExpectations();
-}
-
-namespace
-{
-static std::string variableSlotToString(VariableSlot const& _slot)
-{
-	return _slot.variable.get().name.str();
-}
-}
-
-class StackLayoutPrinter
-{
-public:
-	StackLayoutPrinter(std::ostream& _stream, StackLayout const& _stackLayout):
-	m_stream(_stream), m_stackLayout(_stackLayout)
-	{
-	}
-	void operator()(CFG::BasicBlock const& _block, bool _isMainEntry = true)
-	{
-		if (_isMainEntry)
-		{
-			m_stream << "Entry [label=\"Entry\"];\n";
-			m_stream << "Entry -> Block" << getBlockId(_block) << ";\n";
-		}
-		while (!m_blocksToPrint.empty())
-		{
-			CFG::BasicBlock const* block = *m_blocksToPrint.begin();
-			m_blocksToPrint.erase(m_blocksToPrint.begin());
-			printBlock(*block);
-		}
-
-	}
-	void operator()(
-		CFG::FunctionInfo const& _info
-	)
-	{
-		m_stream << "FunctionEntry_" << _info.function.name.str() << " [label=\"";
-		m_stream << "function " << _info.function.name.str() << "(";
-		m_stream << joinHumanReadable(_info.parameters | ranges::views::transform(variableSlotToString));
-		m_stream << ")";
-		if (!_info.returnVariables.empty())
-		{
-			m_stream << " -> ";
-			m_stream << joinHumanReadable(_info.returnVariables | ranges::views::transform(variableSlotToString));
-		}
-		m_stream << "\\l\\\n";
-		Stack functionEntryStack = {FunctionReturnLabelSlot{_info.function}};
-		functionEntryStack += _info.parameters | ranges::views::reverse;
-		m_stream << stackToString(functionEntryStack) << "\"];\n";
-		m_stream << "FunctionEntry_" << _info.function.name.str() << " -> Block" << getBlockId(*_info.entry) << ";\n";
-		(*this)(*_info.entry, false);
-	}
-
-private:
-	void printBlock(CFG::BasicBlock const& _block)
-	{
-		m_stream << "Block" << getBlockId(_block) << " [label=\"\\\n";
-
-		// Verify that the entries of this block exit into this block.
-		for (auto const& entry: _block.entries)
-			std::visit(util::GenericVisitor{
-				[&](CFG::BasicBlock::Jump const& _jump)
-				{
-					soltestAssert(_jump.target == &_block, "Invalid control flow graph.");
-				},
-				[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-				{
-					soltestAssert(
-						_conditionalJump.zero == &_block || _conditionalJump.nonZero == &_block,
-						"Invalid control flow graph."
-					);
-				},
-				[&](auto const&)
-				{
-					soltestAssert(false, "Invalid control flow graph.");
-				}
-			}, entry->exit);
-
-		auto const& blockInfo = m_stackLayout.blockInfos.at(&_block);
-		m_stream << stackToString(blockInfo.entryLayout) << "\\l\\\n";
-		for (auto const& operation: _block.operations)
-		{
-			auto entryLayout = m_stackLayout.operationEntryLayout.at(&operation);
-			m_stream << stackToString(m_stackLayout.operationEntryLayout.at(&operation)) << "\\l\\\n";
-			std::visit(util::GenericVisitor{
-				[&](CFG::FunctionCall const& _call) {
-					m_stream << _call.function.get().name.str();
-				},
-				[&](CFG::BuiltinCall const& _call) {
-					m_stream << _call.functionCall.get().functionName.name.str();
-
-				},
-				[&](CFG::Assignment const& _assignment) {
-					m_stream << "Assignment(";
-					m_stream << joinHumanReadable(_assignment.variables | ranges::views::transform(variableSlotToString));
-					m_stream << ")";
-				}
-			}, operation.operation);
-			m_stream << "\\l\\\n";
-			soltestAssert(operation.input.size() <= entryLayout.size(), "Invalid Stack Layout.");
-			for (size_t i = 0; i < operation.input.size(); ++i)
-				entryLayout.pop_back();
-			entryLayout += operation.output;
-			m_stream << stackToString(entryLayout) << "\\l\\\n";
-		}
-		m_stream << stackToString(blockInfo.exitLayout) << "\\l\\\n";
-		m_stream << "\"];\n";
-		std::visit(util::GenericVisitor{
-			[&](CFG::BasicBlock::MainExit const&)
-			{
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"MainExit\"];\n";
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-			},
-			[&](CFG::BasicBlock::Jump const& _jump)
-			{
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit [arrowhead=none];\n";
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"";
-				if (_jump.backwards)
-					m_stream << "Backwards";
-				m_stream << "Jump\" shape=oval];\n";
-				m_stream << "Block" << getBlockId(_block) << "Exit -> Block" << getBlockId(*_jump.target) << ";\n";
-			},
-			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			{
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"{ ";
-				m_stream << stackSlotToString(_conditionalJump.condition);
-				m_stream << "| { <0> Zero | <1> NonZero }}\" shape=Mrecord];\n";
-				m_stream << "Block" << getBlockId(_block);
-				m_stream << "Exit:0 -> Block" << getBlockId(*_conditionalJump.zero) << ";\n";
-				m_stream << "Block" << getBlockId(_block);
-				m_stream << "Exit:1 -> Block" << getBlockId(*_conditionalJump.nonZero) << ";\n";
-			},
-			[&](CFG::BasicBlock::FunctionReturn const& _return)
-			{
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"FunctionReturn[" << _return.info->function.name.str() << "]\"];\n";
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-			},
-			[&](CFG::BasicBlock::Terminated const&)
-			{
-				m_stream << "Block" << getBlockId(_block) << "Exit [label=\"Terminated\"];\n";
-				m_stream << "Block" << getBlockId(_block) << " -> Block" << getBlockId(_block) << "Exit;\n";
-			}
-		}, _block.exit);
-		m_stream << "\n";
-	}
-	size_t getBlockId(CFG::BasicBlock const& _block)
-	{
-		if (size_t* id = util::valueOrNullptr(m_blockIds, &_block))
-			return *id;
-		size_t id = m_blockIds[&_block] = m_blockCount++;
-		m_blocksToPrint.emplace_back(&_block);
-		return id;
-	}
-	std::ostream& m_stream;
-	StackLayout const& m_stackLayout;
-	std::map<CFG::BasicBlock const*, size_t> m_blockIds;
-	size_t m_blockCount = 0;
-	std::list<CFG::BasicBlock const*> m_blocksToPrint;
-};
-
-TestCase::TestResult StackLayoutGeneratorTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	ErrorList errors;
-	auto [object, analysisInfo] = parse(m_source, *m_dialect, errors);
-	if (!object || !analysisInfo || Error::containsErrors(errors))
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		return TestResult::FatalError;
-	}
-
-	std::ostringstream output;
-
-	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, *object->code);
-	StackLayout stackLayout = StackLayoutGenerator::run(*cfg);
-
-	output << "digraph CFG {\nnodesep=0.7;\nnode[shape=box];\n\n";
-	StackLayoutPrinter printer{output, stackLayout};
-	printer(*cfg->entry);
-	for (auto function: cfg->functions)
-		printer(cfg->functionInfo.at(function));
-	output << "}\n";
-
-	m_obtainedResult = output.str();
-
-	auto result = checkResult(_stream, _linePrefix, _formatted);
-
-#ifdef ISOLTEST
-	char* graphDisplayer = nullptr;
-	if (result == TestResult::Failure)
-		graphDisplayer = getenv("ISOLTEST_DISPLAY_GRAPHS_FAILURE");
-	else if (result == TestResult::Success)
-		graphDisplayer = getenv("ISOLTEST_DISPLAY_GRAPHS_SUCCESS");
-
-	if (graphDisplayer)
-	{
-		if (result == TestResult::Success)
-			std::cout << std::endl << m_source << std::endl;
-		boost::process::opstream pipe;
-		boost::process::child child(graphDisplayer, boost::process::std_in < pipe);
-
-		pipe << output.str();
-		pipe.flush();
-		pipe.pipe().close();
-		if (result == TestResult::Success)
-			child.wait();
-		else
-			child.detach();
-	}
-#endif
-
-	return result;
-}
diff --git a/test/libyul/StackLayoutGeneratorTest.h b/test/libyul/StackLayoutGeneratorTest.h
deleted file mode 100644
index 9f570045f78e..000000000000
--- a/test/libyul/StackLayoutGeneratorTest.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-namespace test
-{
-
-class StackLayoutGeneratorTest: public solidity::frontend::test::TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<StackLayoutGeneratorTest>(_config.filename);
-	}
-	explicit StackLayoutGeneratorTest(std::string const& _filename);
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-private:
-	Dialect const* m_dialect = nullptr;
-};
-}
-}
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
deleted file mode 100644
index 35130c11b122..000000000000
--- a/test/libyul/StackShufflingTest.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <test/libyul/StackShufflingTest.h>
-
-#include <liblangutil/Scanner.h>
-#include <libsolutil/AnsiColorized.h>
-#include <libyul/backends/evm/StackHelpers.h>
-
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace std;
-
-bool StackShufflingTest::parse(string const& _source)
-{
-	CharStream stream(_source, "");
-	Scanner scanner(stream);
-
-	auto expectToken = [&](Token _token)
-	{
-		soltestAssert(
-			scanner.next() == _token,
-			"Invalid token. Expected: \"" + TokenTraits::friendlyName(_token) + "\"."
-        );
-	};
-
-	auto parseStack = [&](Stack& stack) -> bool
-	{
-		if (scanner.currentToken() != Token::LBrack)
-			return false;
-		scanner.next();
-		while (scanner.currentToken() != Token::RBrack &&
-			   scanner.currentToken() != Token::EOS)
-		{
-			string literal = scanner.currentLiteral();
-			if (literal == "RET")
-			{
-				scanner.next();
-				if (scanner.currentToken() == Token::LBrack)
-				{
-					scanner.next();
-					string functionName = scanner.currentLiteral();
-					auto call = yul::FunctionCall{
-						{},	yul::Identifier{{}, YulString(functionName)}, {}
-					};
-					stack.emplace_back(FunctionCallReturnLabelSlot{
-							m_functions.insert(
-								make_pair(functionName, call)
-							).first->second
-					});
-					expectToken(Token::RBrack);
-				}
-				else
-				{
-					static Scope::Function function;
-					stack.emplace_back(FunctionReturnLabelSlot{function});
-					continue;
-				}
-			}
-			else if (literal == "TMP")
-			{
-				expectToken(Token::LBrack);
-				scanner.next();
-				string functionName = scanner.currentLiteral();
-				auto call = yul::FunctionCall{
-				    {},	yul::Identifier{{}, YulString(functionName)}, {}
-			    };
-				expectToken(Token::Comma);
-				scanner.next();
-				size_t index = size_t(atoi(scanner.currentLiteral().c_str()));
-				stack.emplace_back(TemporarySlot{
-						m_functions.insert(make_pair(functionName, call)).first->second,
-						index
-				});
-				expectToken(Token::RBrack);
-			}
-			else if (literal.find("0x") != string::npos || scanner.currentToken() == Token::Number)
-			{
-				stack.emplace_back(LiteralSlot{u256(literal)});
-			}
-			else if (literal == "JUNK")
-			{
-				stack.emplace_back(JunkSlot());
-			}
-			else if (literal == "GHOST")
-			{
-				expectToken(Token::LBrack);
-				scanner.next(); // read number of ghost variables as ghostVariableId
-				string ghostVariableId = scanner.currentLiteral();
-				Scope::Variable ghostVar = Scope::Variable{""_yulstring, YulString(literal + "[" + ghostVariableId + "]")};
-				stack.emplace_back(VariableSlot{
-						m_variables.insert(make_pair(ghostVar.name, ghostVar)).first->second
-				});
-				expectToken(Token::RBrack);
-			}
-			else
-			{
-				Scope::Variable var = Scope::Variable{""_yulstring, YulString(literal)};
-				stack.emplace_back(VariableSlot{
-						m_variables.insert(
-							make_pair(literal, var)
-						).first->second
-				});
-			}
-			scanner.next();
-		}
-		return scanner.currentToken() == Token::RBrack;
-	};
-
-	if (!parseStack(m_sourceStack))
-		return false;
-	scanner.next();
-	return parseStack(m_targetStack);
-}
-
-StackShufflingTest::StackShufflingTest(string const& _filename):
-	TestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult StackShufflingTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	if (!parse(m_source))
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		return TestResult::FatalError;
-	}
-
-	ostringstream output;
-	createStackLayout(
-		m_sourceStack,
-		m_targetStack,
-		[&](unsigned _swapDepth) // swap
-		{
-			output << stackToString(m_sourceStack) << endl;
-			output << "SWAP" << _swapDepth << endl;
-		},
-		[&](StackSlot const& _slot) // dupOrPush
-		{
-			output << stackToString(m_sourceStack) << endl;
-			if (canBeFreelyGenerated(_slot))
-				output << "PUSH " << stackSlotToString(_slot) << endl;
-			else
-			{
-				if (auto depth = util::findOffset(m_sourceStack | ranges::views::reverse, _slot))
-					output << "DUP" << *depth + 1 << endl;
-				else
-					BOOST_THROW_EXCEPTION(runtime_error("Invalid DUP operation."));
-			}
-		},
-		[&](){ // pop
-			output << stackToString(m_sourceStack) << endl;
-			output << "POP" << endl;
-		}
-    );
-
-	output << stackToString(m_sourceStack) << endl;
-	m_obtainedResult = output.str();
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
diff --git a/test/libyul/StackShufflingTest.h b/test/libyul/StackShufflingTest.h
deleted file mode 100644
index 75715d25b90f..000000000000
--- a/test/libyul/StackShufflingTest.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-#include <libyul/backends/evm/ControlFlowGraph.h>
-
-using namespace solidity::frontend::test;
-
-namespace solidity::yul::test
-{
-
-class StackShufflingTest: public TestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<StackShufflingTest>(_config.filename);
-	}
-	explicit StackShufflingTest(std::string const& _filename);
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-private:
-	bool parse(std::string const& _source);
-
-	Stack m_sourceStack;
-	Stack m_targetStack;
-	std::map<YulString, yul::FunctionCall> m_functions;
-	std::map<YulString, Scope::Variable> m_variables;
-};
-}
diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
deleted file mode 100644
index 20aadcf19ab4..000000000000
--- a/test/libyul/SyntaxTest.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/Exceptions.h>
-
-#include <test/libyul/Common.h>
-#include <test/libyul/SyntaxTest.h>
-#include <test/TestCaseReader.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <test/Common.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul::test;
-using namespace solidity::frontend::test;
-
-void SyntaxTest::parseAndAnalyze()
-{
-	if (m_sources.sources.size() != 1)
-		BOOST_THROW_EXCEPTION(runtime_error{"Expected only one source for yul test."});
-
-	string const& name = m_sources.sources.begin()->first;
-	string const& source = m_sources.sources.begin()->second;
-
-	ErrorList errorList{};
-	soltestAssert(m_dialect, "");
-	// Silently ignoring the results.
-	yul::test::parse(source, *m_dialect, errorList);
-	for (auto const& error: errorList)
-	{
-		int locationStart = -1;
-		int locationEnd = -1;
-
-		if (SourceLocation const* location = error->sourceLocation())
-		{
-			locationStart = location->start;
-			locationEnd = location->end;
-		}
-
-		m_errorList.emplace_back(SyntaxTestError{
-			error->type(),
-			error->errorId(),
-			errorMessage(*error),
-			name,
-			locationStart,
-			locationEnd
-		});
-	}
-
-}
-
-SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion):
-	CommonSyntaxTest(_filename, _evmVersion)
-{
-	string dialectName = m_reader.stringSetting("dialect", "evmTyped");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
-}
diff --git a/test/libyul/SyntaxTest.h b/test/libyul/SyntaxTest.h
deleted file mode 100644
index 27e59ee61439..000000000000
--- a/test/libyul/SyntaxTest.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/CommonSyntaxTest.h>
-#include <libyul/Dialect.h>
-
-namespace solidity::yul::test
-{
-
-using solidity::test::SyntaxTestError;
-
-class SyntaxTest: public solidity::test::CommonSyntaxTest
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion);
-	}
-	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion);
-	~SyntaxTest() override {}
-protected:
-	void parseAndAnalyze() override;
-
-private:
-	Dialect const* m_dialect = nullptr;
-};
-
-}
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
deleted file mode 100644
index a1ada928b801..000000000000
--- a/test/libyul/YulInterpreterTest.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/YulInterpreterTest.h>
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-
-#include <test/Common.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/YulStack.h>
-#include <libyul/AsmAnalysisInfo.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <fstream>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-YulInterpreterTest::YulInterpreterTest(string const& _filename):
-	EVMVersionRestrictedTestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_expectation = m_reader.simpleExpectations();
-	m_simulateExternalCallsToSelf = m_reader.boolSetting("simulateExternalCall", false);
-}
-
-TestCase::TestResult YulInterpreterTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	if (!parse(_stream, _linePrefix, _formatted))
-		return TestResult::FatalError;
-
-	m_obtainedResult = interpret();
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
-
-bool YulInterpreterTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	YulStack stack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::none(),
-		DebugInfoSelection::All()
-	);
-	if (stack.parseAndAnalyze("", m_source))
-	{
-		m_ast = stack.parserResult()->code;
-		m_analysisInfo = stack.parserResult()->analysisInfo;
-		return true;
-	}
-	else
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		SourceReferenceFormatter{_stream, stack, true, false}
-			.printErrorInformation(stack.errors());
-		return false;
-	}
-}
-
-string YulInterpreterTest::interpret()
-{
-	InterpreterState state;
-	state.maxTraceSize = 32;
-	state.maxSteps = 512;
-	state.maxExprNesting = 64;
-	try
-	{
-		Interpreter::run(
-			state,
-			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion()),
-			*m_ast,
-			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
-			/*disableMemoryTracing=*/ false
-		);
-	}
-	catch (InterpreterTerminatedGeneric const&)
-	{
-	}
-
-	stringstream result;
-	state.dumpTraceAndState(result, false);
-	return result.str();
-}
diff --git a/test/libyul/YulInterpreterTest.h b/test/libyul/YulInterpreterTest.h
deleted file mode 100644
index a20b0688a236..000000000000
--- a/test/libyul/YulInterpreterTest.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-struct Block;
-}
-
-namespace solidity::yul::test
-{
-
-class YulInterpreterTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<YulInterpreterTest>(_config.filename);
-	}
-
-	explicit YulInterpreterTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-
-private:
-	bool parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted);
-	std::string interpret();
-
-	std::shared_ptr<Block> m_ast;
-	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
-	bool m_simulateExternalCallsToSelf = false;
-};
-
-}
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
deleted file mode 100644
index 6d7297c2c701..000000000000
--- a/test/libyul/YulOptimizerTest.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/YulOptimizerTest.h>
-#include <test/libyul/YulOptimizerTestCommon.h>
-
-#include <test/libsolidity/util/SoltestErrors.h>
-#include <test/libyul/Common.h>
-#include <test/Common.h>
-
-#include <libyul/Object.h>
-#include <libyul/AsmPrinter.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <liblangutil/Scanner.h>
-
-#include <libsolutil/AnsiColorized.h>
-#include <libsolutil/StringUtils.h>
-
-#include <fstream>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-YulOptimizerTest::YulOptimizerTest(string const& _filename):
-	EVMVersionRestrictedTestCase(_filename)
-{
-	boost::filesystem::path path(_filename);
-
-	if (path.empty() || std::next(path.begin()) == path.end() || std::next(std::next(path.begin())) == path.end())
-		BOOST_THROW_EXCEPTION(runtime_error("Filename path has to contain a directory: \"" + _filename + "\"."));
-	m_optimizerStep = std::prev(std::prev(path.end()))->string();
-
-	m_source = m_reader.source();
-
-	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
-
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	std::tie(m_object, m_analysisInfo) = parse(_stream, _linePrefix, _formatted, m_source);
-	if (!m_object)
-		return TestResult::FatalError;
-
-	soltestAssert(m_dialect, "Dialect not set.");
-
-	m_object->analysisInfo = m_analysisInfo;
-	YulOptimizerTestCommon tester(m_object, *m_dialect);
-	tester.setStep(m_optimizerStep);
-
-	if (!tester.runStep())
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;
-		return TestResult::FatalError;
-	}
-
-	auto const printed = (m_object->subObjects.empty() ? AsmPrinter{ *m_dialect }(*m_object->code) : m_object->toString(m_dialect));
-
-	// Re-parse new code for compilability
-	// TODO: support for wordSizeTransform which needs different input and output dialects
-	if (m_optimizerStep != "wordSizeTransform" && !std::get<0>(parse(_stream, _linePrefix, _formatted, printed)))
-	{
-		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
-			<< _linePrefix << "Result after the optimiser:" << endl;
-		printPrefixed(_stream, printed, _linePrefix + "  ");
-		return TestResult::FatalError;
-	}
-
-	m_obtainedResult = "step: " + m_optimizerStep + "\n\n" + printed + "\n";
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
-
-std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>> YulOptimizerTest::parse(
-	ostream& _stream,
-	string const& _linePrefix,
-	bool const _formatted,
-	string const& _source
-)
-{
-	ErrorList errors;
-	soltestAssert(m_dialect, "");
-	shared_ptr<Object> object;
-	shared_ptr<AsmAnalysisInfo> analysisInfo;
-	std::tie(object, analysisInfo) = yul::test::parse(_source, *m_dialect, errors);
-	if (!object || !analysisInfo || Error::containsErrors(errors))
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		CharStream charStream(_source, "");
-		SourceReferenceFormatter{_stream, SingletonCharStreamProvider(charStream), true, false}
-			.printErrorInformation(errors);
-		return {};
-	}
-	return {std::move(object), std::move(analysisInfo)};
-}
diff --git a/test/libyul/YulOptimizerTest.h b/test/libyul/YulOptimizerTest.h
deleted file mode 100644
index 832b5dfb8f7c..000000000000
--- a/test/libyul/YulOptimizerTest.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/TestCase.h>
-
-namespace solidity::langutil
-{
-class Error;
-using ErrorList = std::vector<std::shared_ptr<Error const>>;
-}
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-struct Object;
-struct Dialect;
-}
-
-namespace solidity::yul::test
-{
-
-class YulOptimizerTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<YulOptimizerTest>(_config.filename);
-	}
-
-	explicit YulOptimizerTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-private:
-	std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>> parse(
-		std::ostream& _stream, std::string const& _linePrefix, bool const _formatted, std::string const& _source
-	);
-
-	std::string m_optimizerStep;
-
-	Dialect const* m_dialect = nullptr;
-
-	std::shared_ptr<Object> m_object;
-	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
-};
-
-}
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
deleted file mode 100644
index 31ab55e96492..000000000000
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/libyul/YulOptimizerTestCommon.h>
-
-#include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/optimiser/VarDeclInitializer.h>
-#include <libyul/optimiser/VarNameCleaner.h>
-#include <libyul/optimiser/ControlFlowSimplifier.h>
-#include <libyul/optimiser/DeadCodeEliminator.h>
-#include <libyul/optimiser/Disambiguator.h>
-#include <libyul/optimiser/CircularReferencesPruner.h>
-#include <libyul/optimiser/ConditionalUnsimplifier.h>
-#include <libyul/optimiser/ConditionalSimplifier.h>
-#include <libyul/optimiser/CommonSubexpressionEliminator.h>
-#include <libyul/optimiser/EqualStoreEliminator.h>
-#include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/optimiser/ExpressionSplitter.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/FunctionSpecializer.h>
-#include <libyul/optimiser/ExpressionInliner.h>
-#include <libyul/optimiser/FullInliner.h>
-#include <libyul/optimiser/ForLoopConditionIntoBody.h>
-#include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/optimiser/LoadResolver.h>
-#include <libyul/optimiser/LoopInvariantCodeMotion.h>
-#include <libyul/optimiser/StackLimitEvader.h>
-#include <libyul/optimiser/NameDisplacer.h>
-#include <libyul/optimiser/Rematerialiser.h>
-#include <libyul/optimiser/ExpressionSimplifier.h>
-#include <libyul/optimiser/UnusedFunctionParameterPruner.h>
-#include <libyul/optimiser/UnusedPruner.h>
-#include <libyul/optimiser/ExpressionJoiner.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/SSAReverser.h>
-#include <libyul/optimiser/SSATransform.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/UnusedAssignEliminator.h>
-#include <libyul/optimiser/UnusedStoreEliminator.h>
-#include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/optimiser/StackCompressor.h>
-#include <libyul/optimiser/Suite.h>
-#include <libyul/backends/evm/ConstantOptimiser.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/CompilabilityChecker.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <random>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace std;
-
-YulOptimizerTestCommon::YulOptimizerTestCommon(
-	shared_ptr<Object> _obj,
-	Dialect const& _dialect
-)
-{
-	m_object = _obj;
-	m_ast = m_object->code;
-	m_analysisInfo = m_object->analysisInfo;
-	m_dialect = &_dialect;
-
-	m_namedSteps = {
-		{"disambiguator", [&]() { disambiguate(); }},
-		{"nameDisplacer", [&]() {
-			disambiguate();
-			NameDisplacer{
-				*m_nameDispenser,
-				{"illegal1"_yulstring, "illegal2"_yulstring, "illegal3"_yulstring, "illegal4"_yulstring, "illegal5"_yulstring}
-			}(*m_ast);
-		}},
-		{"blockFlattener", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
-			BlockFlattener::run(*m_context, *m_ast);
-		}},
-		{"constantOptimiser", [&]() {
-			GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
-			ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(*m_ast);
-		}},
-		{"varDeclInitializer", [&]() { VarDeclInitializer::run(*m_context, *m_ast); }},
-		{"varNameCleaner", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			VarNameCleaner::run(*m_context, *m_ast);
-		}},
-		{"forLoopConditionIntoBody", [&]() {
-			disambiguate();
-			ForLoopConditionIntoBody::run(*m_context, *m_ast);
-		}},
-		{"forLoopInitRewriter", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-		}},
-		{"commonSubexpressionEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-		}},
-		{"conditionalUnsimplifier", [&]() {
-			disambiguate();
-			ConditionalUnsimplifier::run(*m_context, *m_ast);
-		}},
-		{"conditionalSimplifier", [&]() {
-			disambiguate();
-			ConditionalSimplifier::run(*m_context, *m_ast);
-		}},
-		{"expressionSplitter", [&]() { ExpressionSplitter::run(*m_context, *m_ast); }},
-		{"expressionJoiner", [&]() {
-			disambiguate();
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"splitJoin", [&]() {
-			disambiguate();
-			ExpressionSplitter::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"functionGrouper", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
-		}},
-		{"functionHoister", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-		}},
-		{"functionSpecializer", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_object->code);
-			FunctionSpecializer::run(*m_context, *m_object->code);
-		}},
-		{"expressionInliner", [&]() {
-			disambiguate();
-			ExpressionInliner::run(*m_context, *m_ast);
-		}},
-		{"fullInliner", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			FullInliner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"fullInlinerWithoutSplitter", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			FullInliner::run(*m_context, *m_ast);
-		}},
-		{"rematerialiser", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			Rematerialiser::run(*m_context, *m_ast);
-		}},
-		{"expressionSimplifier", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			UnusedPruner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"fullSimplify", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
-			BlockFlattener::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			UnusedPruner::run(*m_context, *m_ast);
-			CircularReferencesPruner::run(*m_context, *m_ast);
-			DeadCodeEliminator::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"unusedFunctionParameterPruner", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_object->code);
-			LiteralRematerialiser::run(*m_context, *m_object->code);
-			UnusedFunctionParameterPruner::run(*m_context, *m_object->code);
-		}},
-		{"unusedPruner", [&]() {
-			disambiguate();
-			UnusedPruner::run(*m_context, *m_ast);
-		}},
-		{"circularReferencesPruner", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			CircularReferencesPruner::run(*m_context, *m_ast);
-		}},
-		{"deadCodeEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			DeadCodeEliminator::run(*m_context, *m_ast);
-		}},
-		{"ssaTransform", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			SSATransform::run(*m_context, *m_ast);
-		}},
-		{"unusedAssignEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			UnusedAssignEliminator::run(*m_context, *m_ast);
-		}},
-		{"unusedStoreEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			SSATransform::run(*m_context, *m_ast);
-			UnusedStoreEliminator::run(*m_context, *m_ast);
-			SSAReverser::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"equalStoreEliminator", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			EqualStoreEliminator::run(*m_context, *m_ast);
-		}},
-		{"ssaPlusCleanup", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			SSATransform::run(*m_context, *m_ast);
-			UnusedAssignEliminator::run(*m_context, *m_ast);
-		}},
-		{"loadResolver", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
-			BlockFlattener::run(*m_context, *m_ast);
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-
-			LoadResolver::run(*m_context, *m_ast);
-
-			UnusedPruner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-		}},
-		{"loopInvariantCodeMotion", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			LoopInvariantCodeMotion::run(*m_context, *m_ast);
-		}},
-		{"controlFlowSimplifier", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			ControlFlowSimplifier::run(*m_context, *m_ast);
-		}},
-		{"structuralSimplifier", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			LiteralRematerialiser::run(*m_context, *m_ast);
-			StructuralSimplifier::run(*m_context, *m_ast);
-		}},
-		{"equivalentFunctionCombiner", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			EquivalentFunctionCombiner::run(*m_context, *m_ast);
-		}},
-		{"ssaReverser", [&]() {
-			disambiguate();
-			SSAReverser::run(*m_context, *m_ast);
-		}},
-		{"ssaAndBack", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			// apply SSA
-			SSATransform::run(*m_context, *m_ast);
-			UnusedAssignEliminator::run(*m_context, *m_ast);
-			// reverse SSA
-			SSAReverser::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			UnusedPruner::run(*m_context, *m_ast);
-		}},
-		{"stackCompressor", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			size_t maxIterations = 16;
-			StackCompressor::run(*m_dialect, *m_object, true, maxIterations);
-			BlockFlattener::run(*m_context, *m_ast);
-		}},
-		{"fullSuite", [&]() {
-			GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
-			OptimiserSuite::run(
-				*m_dialect,
-				&meter,
-				*m_object,
-				true,
-				frontend::OptimiserSettings::DefaultYulOptimiserSteps,
-				frontend::OptimiserSettings::DefaultYulOptimiserCleanupSteps,
-				frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-			);
-		}},
-		{"stackLimitEvader", [&]() {
-			disambiguate();
-			StackLimitEvader::run(*m_context, *m_object, CompilabilityChecker{
-				*m_dialect,
-				*m_object,
-				true
-			}.unreachableVariables);
-		}},
-		{"fakeStackLimitEvader", [&]() {
-			disambiguate();
-			// Mark all variables with a name starting with "$" for escalation to memory.
-			struct FakeUnreachableGenerator: ASTWalker
-			{
-				map<YulString, vector<YulString>> fakeUnreachables;
-				using ASTWalker::operator();
-				void operator()(FunctionDefinition const& _function) override
-				{
-					YulString originalFunctionName = m_currentFunction;
-					m_currentFunction = _function.name;
-					for (TypedName const& _argument: _function.parameters)
-						visitVariableName(_argument.name);
-					for (TypedName const& _argument: _function.returnVariables)
-						visitVariableName(_argument.name);
-					ASTWalker::operator()(_function);
-					m_currentFunction = originalFunctionName;
-				}
-				void visitVariableName(YulString _var)
-				{
-					if (!_var.empty() && _var.str().front() == '$')
-						if (!util::contains(fakeUnreachables[m_currentFunction], _var))
-							fakeUnreachables[m_currentFunction].emplace_back(_var);
-				}
-				void operator()(VariableDeclaration const& _varDecl) override
-				{
-					for (auto const& var: _varDecl.variables)
-						visitVariableName(var.name);
-					ASTWalker::operator()(_varDecl);
-				}
-				void operator()(Identifier const& _identifier) override
-				{
-					visitVariableName(_identifier.name);
-					ASTWalker::operator()(_identifier);
-				}
-				YulString m_currentFunction = YulString{};
-			};
-			FakeUnreachableGenerator fakeUnreachableGenerator;
-			fakeUnreachableGenerator(*m_ast);
-			StackLimitEvader::run(*m_context, *m_object, fakeUnreachableGenerator.fakeUnreachables);
-		}}
-	};
-}
-
-void YulOptimizerTestCommon::setStep(string const& _optimizerStep)
-{
-	m_optimizerStep = _optimizerStep;
-}
-
-bool YulOptimizerTestCommon::runStep()
-{
-	yulAssert(m_dialect, "Dialect not set.");
-
-	updateContext();
-
-	if (m_namedSteps.count(m_optimizerStep))
-		m_namedSteps[m_optimizerStep]();
-	else
-		return false;
-
-	return true;
-}
-
-string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
-{
-	std::mt19937 prng(_seed);
-	std::uniform_int_distribution<size_t> dist(1, m_namedSteps.size());
-	size_t idx = dist(prng);
-	size_t count = 1;
-	for (auto &step: m_namedSteps)
-	{
-		if (count == idx)
-		{
-			string optimiserStep = step.first;
-			// Do not fuzz mainFunction and wordSizeTransform
-			// because they do not preserve yul code semantics.
-			// Do not fuzz reasoning based simplifier because
-			// it can sometimes drain memory.
-			if (
-				optimiserStep == "mainFunction"	||
-				optimiserStep == "wordSizeTransform"
-			)
-				// "Fullsuite" is fuzzed roughly four times more frequently than
-				// other steps because of the filtering in place above.
-				return "fullSuite";
-			else
-				return optimiserStep;
-		}
-		count++;
-	}
-	yulAssert(false, "Optimiser step selection failed.");
-}
-
-shared_ptr<Block> YulOptimizerTestCommon::run()
-{
-	return runStep() ? m_ast : nullptr;
-}
-
-void YulOptimizerTestCommon::disambiguate()
-{
-	*m_object->code = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(*m_object->code));
-	m_analysisInfo.reset();
-	updateContext();
-}
-
-void YulOptimizerTestCommon::updateContext()
-{
-	m_nameDispenser = make_unique<NameDispenser>(*m_dialect, *m_object->code, m_reservedIdentifiers);
-	m_context = make_unique<OptimiserStepContext>(OptimiserStepContext{
-		*m_dialect,
-		*m_nameDispenser,
-		m_reservedIdentifiers,
-		frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-	});
-}
diff --git a/test/libyul/YulOptimizerTestCommon.h b/test/libyul/YulOptimizerTestCommon.h
deleted file mode 100644
index 3dce998c56cc..000000000000
--- a/test/libyul/YulOptimizerTestCommon.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <libyul/YulString.h>
-
-#include <set>
-#include <memory>
-
-namespace solidity::yul
-{
-	struct AsmAnalysisInfo;
-	struct Object;
-	struct Dialect;
-}
-
-namespace solidity::yul::test
-{
-class YulOptimizerTestCommon
-{
-public:
-	explicit YulOptimizerTestCommon(
-		std::shared_ptr<Object> _obj,
-		Dialect const& _dialect
-	);
-	/// Sets optimiser step to be run to @param
-	/// _optimiserStep.
-	void setStep(std::string const& _optimizerStep);
-	/// Runs chosen optimiser step returning pointer
-	/// to yul AST Block post optimisation.
-	std::shared_ptr<Block> run();
-	/// Runs chosen optimiser step returning true if
-	/// successful, false otherwise.
-	bool runStep();
-	/// Returns the string name of a randomly chosen
-	/// optimiser step.
-	/// @param _seed is an unsigned integer that
-	/// seeds the random selection.
-	std::string randomOptimiserStep(unsigned _seed);
-private:
-	void disambiguate();
-	void updateContext();
-
-	std::string m_optimizerStep;
-
-	Dialect const* m_dialect = nullptr;
-	std::set<YulString> m_reservedIdentifiers;
-	std::unique_ptr<NameDispenser> m_nameDispenser;
-	std::unique_ptr<OptimiserStepContext> m_context;
-
-	std::shared_ptr<Object> m_object;
-	std::shared_ptr<Block> m_ast;
-	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
-	std::map<std::string, std::function<void(void)>> m_namedSteps;
-};
-
-}
diff --git a/test/libyul/controlFlowSideEffects/eval_order.yul b/test/libyul/controlFlowSideEffects/eval_order.yul
deleted file mode 100644
index a207d7a19e93..000000000000
--- a/test/libyul/controlFlowSideEffects/eval_order.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    function a() -> x {
-        revert(0, 0)
-    }
-    function b() -> x {
-        return(0, 0)
-    }
-    function c() {
-        sstore(a(), b())
-    }
-    function d() {
-        sstore(b(), a())
-    }
-}
-// ----
-// a: can revert
-// b: can terminate
-// c: can terminate
-// d: can revert
diff --git a/test/libyul/controlFlowSideEffects/for_loop.yul b/test/libyul/controlFlowSideEffects/for_loop.yul
deleted file mode 100644
index 1f3714a48659..000000000000
--- a/test/libyul/controlFlowSideEffects/for_loop.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    function a() {
-        for { leave } calldataload(0) { } {
-            break
-            revert(0, 0)
-        }
-    }
-    function b() {
-        for { } calldataload(0) { leave } {
-            break
-            revert(0, 0)
-        }
-    }
-    function b2() {
-        for { } calldataload(0) { leave } {
-            revert(0, 0)
-        }
-    }
-    function c() {
-        for { } calldataload(0) { revert(0, 0) } {
-            break
-        }
-    }
-    function c2() {
-        for { } calldataload(0) { revert(0, 0) } {
-            break
-            revert(0, 0)
-        }
-    }
-    function d() {
-        for { } calldataload(0) { revert(0, 0) } {
-            continue
-        }
-    }
-    function e() {
-        for { } calldataload(0) { revert(0, 0) } {
-            if calldataload(1) { break }
-        }
-    }
-    function f() {
-        for { } calldataload(0) {  } {
-            if calldataload(1) { continue }
-            revert(0, 0)
-        }
-    }
-}
-// ----
-// a: can continue
-// b: can continue
-// b2: can revert, can continue
-// c: can continue
-// c2: can continue
-// d: can revert, can continue
-// e: can revert, can continue
-// f: can revert, can continue
diff --git a/test/libyul/controlFlowSideEffects/leave.yul b/test/libyul/controlFlowSideEffects/leave.yul
deleted file mode 100644
index bbc9778202a0..000000000000
--- a/test/libyul/controlFlowSideEffects/leave.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function a() {
-        revert(0, 0)
-        leave
-    }
-    function b() {
-        leave
-        revert(0, 0)
-    }
-}
-// ----
-// a: can revert
-// b: can continue
diff --git a/test/libyul/controlFlowSideEffects/nondisambiguated.yul b/test/libyul/controlFlowSideEffects/nondisambiguated.yul
deleted file mode 100644
index 4cc68c140e78..000000000000
--- a/test/libyul/controlFlowSideEffects/nondisambiguated.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    function a() {
-        {
-            function b() { if calldataload(0) { return(0, 0) } }
-            b()
-        }
-        {
-            function b() { revert(0, 0) }
-            b()
-        }
-    }
-    {
-        function b() {
-            leave
-            revert(0, 0)
-        }
-    }
-}
-// ----
-// a: can terminate, can revert
-// b: can terminate, can continue
-// b: can revert
-// b: can continue
diff --git a/test/libyul/controlFlowSideEffects/recursion.yul b/test/libyul/controlFlowSideEffects/recursion.yul
deleted file mode 100644
index 69cd4a2da8c8..000000000000
--- a/test/libyul/controlFlowSideEffects/recursion.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    function a() {
-        if calldataload(0) {
-            revert(0, 0)
-        }
-        reg()
-        b()
-    }
-    function b() {
-        a()
-        return(0, 0)
-    }
-    function c() {
-        c()
-        revert(0, 0)
-    }
-    function d() {
-        switch calldataload(0)
-        case 0 { x() }
-        case 1 { y() reg() revert(0, 0) }
-        default { z() }
-    }
-    function x() { d() revert(0, 0) }
-    function y() { reg() x() }
-    function z() { y() }
-
-    function reg() {}
-}
-// ----
-// a: can revert
-// b: can revert
-// c:
-// d:
-// x:
-// y:
-// z:
-// reg: can continue
diff --git a/test/libyul/controlFlowSideEffects/simple_conditionals.yul b/test/libyul/controlFlowSideEffects/simple_conditionals.yul
deleted file mode 100644
index ec15193dfb13..000000000000
--- a/test/libyul/controlFlowSideEffects/simple_conditionals.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    function a() {
-        if calldataload(0) { g() }
-    }
-    function b() {
-        g()
-        if calldataload(0) { }
-    }
-    function c() {
-        if calldataload(0) { }
-        g()
-    }
-    function d() {
-        stop()
-        if calldataload(0) { g() }
-    }
-    function e() {
-        if calldataload(0) { g() }
-        stop()
-    }
-    function f() {
-        g()
-        if calldataload(0) { g() }
-    }
-    function g() { revert(0, 0) }
-}
-// ----
-// a: can revert, can continue
-// b: can revert
-// c: can revert
-// d: can terminate
-// e: can terminate, can revert
-// f: can revert
-// g: can revert
diff --git a/test/libyul/controlFlowSideEffects/simple_functions.yul b/test/libyul/controlFlowSideEffects/simple_functions.yul
deleted file mode 100644
index b6b14d39de63..000000000000
--- a/test/libyul/controlFlowSideEffects/simple_functions.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    function a() {}
-    function f() { g() }
-    function g() { revert(0, 0) }
-    function h() { stop() }
-    function i() { h() }
-    function j() { h() g() }
-    function k() { g() h() }
-}
-// ----
-// a: can continue
-// f: can revert
-// g: can revert
-// h: can terminate
-// i: can terminate
-// j: can terminate
-// k: can revert
diff --git a/test/libyul/controlFlowSideEffects/switch.yul b/test/libyul/controlFlowSideEffects/switch.yul
deleted file mode 100644
index 63b45ce30576..000000000000
--- a/test/libyul/controlFlowSideEffects/switch.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    function a() {
-        switch calldataload(0)
-        case 0 { revert(0, 0) }
-    }
-    function b() {
-        switch calldataload(0)
-        case 0 { revert(0, 0) }
-        default { revert(0, 0) }
-    }
-    function c() {
-        return(0, 0)
-        switch calldataload(0)
-        case 0 { revert(0, 0) }
-        default { }
-    }
-    function d() {
-        switch calldataload(0)
-        case 0 { return(0, 0) }
-        default { return(0, 0) }
-        revert(0, 0)
-    }
-    function e() {
-        switch calldataload(0)
-        case 0 { return(0, 0) }
-        revert(0, 0)
-    }
-    function f() {
-        switch calldataload(0)
-        case 0 { leave }
-        default { leave }
-        revert(0, 0)
-    }
-}
-// ----
-// a: can revert, can continue
-// b: can revert
-// c: can terminate
-// d: can terminate
-// e: can terminate, can revert
-// f: can continue
diff --git a/test/libyul/evmCodeTransform/after_terminating_function.yul b/test/libyul/evmCodeTransform/after_terminating_function.yul
deleted file mode 100644
index ee32b4431579..000000000000
--- a/test/libyul/evmCodeTransform/after_terminating_function.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	let b := f(1, 2)
-	function f(a, r) -> t { revert(0, 0) }
-	b := f(3, 4)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":17:18   */
-//   0x02
-//     /* "":14:15   */
-//   0x01
-//     /* "":12:19   */
-//   tag_1
-//   jump	// in
-//     /* "":21:59   */
-// tag_1:
-//     /* "":55:56   */
-//   0x00
-//     /* "":45:57   */
-//   dup1
-//   revert
diff --git a/test/libyul/evmCodeTransform/early_push_on_deep_swap.yul b/test/libyul/evmCodeTransform/early_push_on_deep_swap.yul
deleted file mode 100644
index 5e119cc73f8f..000000000000
--- a/test/libyul/evmCodeTransform/early_push_on_deep_swap.yul
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    extcodecopy(div(div(call(call(gas(),0x10000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000, 0x10000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000), 0x10000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000000, 0x10000000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000000000),0x10000000000000000000000000000000000000000000000000000000000000),0x100000000000000000000000000000000000000000000000000000000000000), 0x1000000000000000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000000000001, 0x100000000000000000000000000000000000000000000000000000000000001)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":1027:1092   */
-//   0x0100000000000000000000000000000000000000000000000000000000000001
-//     /* "":959:1025   */
-//   0x1000000000000000000000000000000000000000000000000000000000000001
-//     /* "":891:957   */
-//   0x1000000000000000000000000000000000000000000000000000000000000000
-//     /* "":823:888   */
-//   0x0100000000000000000000000000000000000000000000000000000000000000
-//     /* "":757:821   */
-//   0x10000000000000000000000000000000000000000000000000000000000000
-//     /* "":692:755   */
-//   0x01000000000000000000000000000000000000000000000000000000000000
-//     /* "":628:690   */
-//   0x100000000000000000000000000000000000000000000000000000000000
-//     /* "":565:626   */
-//   0x010000000000000000000000000000000000000000000000000000000000
-//     /* "":503:563   */
-//   0x1000000000000000000000000000000000000000000000000000000000
-//     /* "":442:501   */
-//   0x0100000000000000000000000000000000000000000000000000000000
-//     /* "":382:440   */
-//   0x10000000000000000000000000000000000000000000000000000000
-//     /* "":322:379   */
-//   0x01000000000000000000000000000000000000000000000000000000
-//     /* "":264:320   */
-//   0x100000000000000000000000000000000000000000000000000000
-//     /* "":207:262   */
-//   0x010000000000000000000000000000000000000000000000000000
-//     /* "":151:205   */
-//   0x1000000000000000000000000000000000000000000000000000
-//     /* "":96:149   */
-//   0x0100000000000000000000000000000000000000000000000000
-//     /* "":42:94   */
-//   0x10000000000000000000000000000000000000000000000000
-//     /* "":36:41   */
-//   gas
-//     /* "":31:380   */
-//   call
-//     /* "":26:756   */
-//   call
-//     /* "":22:822   */
-//   div
-//     /* "":18:889   */
-//   div
-//     /* "":6:1093   */
-//   extcodecopy
-//     /* "":0:1095   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/literal_loop.yul b/test/libyul/evmCodeTransform/literal_loop.yul
deleted file mode 100644
index d743836cbcdb..000000000000
--- a/test/libyul/evmCodeTransform/literal_loop.yul
+++ /dev/null
@@ -1,74 +0,0 @@
-object "main" {
-	code {
-		codecopy(0, dataoffset("deployed"), datasize("deployed"))
-		return(0, datasize("deployed"))
-	}
-	object "deployed" {
-		code {
-			for {}
-			add(delegatecall(delegatecall(call(selfbalance(), 0x0, 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0),0x0)
-			{}
-			{}
-		}
-	}
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":62:82   */
-//   dataSize(sub_0)
-//     /* "":38:60   */
-//   dataOffset(sub_0)
-//     /* "":35:36   */
-//   0x00
-//     /* "":26:83   */
-//   codecopy
-//     /* "":96:116   */
-//   dataSize(sub_0)
-//     /* "":93:94   */
-//   0x00
-//     /* "":86:117   */
-//   return
-// stop
-//
-// sub_0: assembly {
-//         /* "":164:300   */
-//     tag_1:
-//         /* "":296:299   */
-//       0x00
-//         /* "":199:212   */
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       dup1
-//       selfbalance
-//         /* "":194:243   */
-//       call
-//         /* "":181:269   */
-//       delegatecall
-//         /* "":168:295   */
-//       delegatecall
-//         /* "":164:300   */
-//       add
-//       tag_2
-//       jumpi
-//         /* "":154:312   */
-//     tag_3:
-//       stop
-//         /* "":310:312   */
-//     tag_2:
-//         /* "":304:306   */
-//       jump(tag_1)
-// }
diff --git a/test/libyul/evmCodeTransform/nonempty_initial_layout.yul b/test/libyul/evmCodeTransform/nonempty_initial_layout.yul
deleted file mode 100644
index eb1a787c061f..000000000000
--- a/test/libyul/evmCodeTransform/nonempty_initial_layout.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    if 0x2000000000000000000000000000000000000000000000000000000000 {}
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":9:69   */
-//   0x2000000000000000000000000000000000000000000000000000000000
-//     /* "":6:72   */
-//   tag_1
-//   jumpi
-//     /* "":0:74   */
-// tag_2:
-//   stop
-//     /* "":70:72   */
-// tag_1:
-//   jump(tag_2)
diff --git a/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul b/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
deleted file mode 100644
index 78bf0a168268..000000000000
--- a/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-object "main" {
-	code {
-	    let a := calldataload(0)
-	    let b := calldataload(32)
-	    if calldataload(64) {
-	        revert(0,0)
-	    }
-	    sstore(b, a)
-	}
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":51:52   */
-//   0x00
-//     /* "":38:53   */
-//   calldataload
-//     /* "":81:83   */
-//   0x20
-//     /* "":68:84   */
-//   calldataload
-//     /* "":106:108   */
-//   0x40
-//     /* "":93:109   */
-//   calldataload
-//     /* "":90:139   */
-//   tag_1
-//   jumpi
-//     /* "":22:160   */
-// tag_2:
-//     /* "":145:157   */
-//   sstore
-//     /* "":22:160   */
-//   stop
-//     /* "":110:139   */
-// tag_1:
-//     /* "":130:131   */
-//   0x00
-//     /* "":121:132   */
-//   dup1
-//   revert
diff --git a/test/libyul/evmCodeTransform/stackReuse/for_1.yul b/test/libyul/evmCodeTransform/stackReuse/for_1.yul
deleted file mode 100644
index b02710598fd5..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/for_1.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{ for { let z := 0 } 1 { } { let x := 3 } let t := 2 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":17:18   */
-//   0x00
-//     /* "":6:20   */
-//   pop
-//     /* "":27:41   */
-// tag_1:
-//     /* "":38:39   */
-//   0x03
-//     /* "":27:41   */
-//   pop
-//     /* "":23:26   */
-//   jump(tag_1)
diff --git a/test/libyul/evmCodeTransform/stackReuse/for_2.yul b/test/libyul/evmCodeTransform/stackReuse/for_2.yul
deleted file mode 100644
index 37d372fb9949..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/for_2.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{ for { let z := 0 } 1 { } { z := 8 let x := 3 } let t := 2 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":17:18   */
-//   0x00
-//     /* "":6:20   */
-//   pop
-//     /* "":27:48   */
-// tag_1:
-//     /* "":34:35   */
-//   0x08
-//     /* "":36:46   */
-//   pop
-//     /* "":45:46   */
-//   0x03
-//     /* "":27:48   */
-//   pop
-//     /* "":23:26   */
-//   jump(tag_1)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul
deleted file mode 100644
index 96637da89fc1..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    function f(a, b, c) -> x { pop(address()) sstore(a, c) pop(callvalue()) x := b }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:88   */
-//   stop
-//     /* "":6:86   */
-// tag_1:
-//   swap2
-//   swap1
-//   swap2
-//     /* "":37:46   */
-//   address
-//     /* "":33:47   */
-//   pop
-//     /* "":48:60   */
-//   sstore
-//     /* "":65:76   */
-//   callvalue
-//     /* "":61:77   */
-//   pop
-//     /* "":6:86   */
-//   swap1
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
deleted file mode 100644
index b5cc611879ec..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  function f(x, y) {
-    mstore(0x80, x)
-    if calldataload(0) { sstore(y, y) }
-  }
-}
-// ====
-// stackOptimization: true
-// EVMVersion: >=shanghai
-// ----
-//     /* "":0:88   */
-//   stop
-//     /* "":4:86   */
-// tag_1:
-//     /* "":34:38   */
-//   0x80
-//     /* "":27:42   */
-//   mstore
-//     /* "":63:64   */
-//   0x00
-//     /* "":50:65   */
-//   calldataload
-//     /* "":47:82   */
-//   tag_2
-//   jumpi
-//     /* "":21:86   */
-// tag_3:
-//     /* "":4:86   */
-//   pop
-//   jump	// out
-//     /* "":66:82   */
-// tag_2:
-//     /* "":68:80   */
-//   dup1
-//   sstore
-//     /* "":66:82   */
-//   0x00
-//   jump(tag_3)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_call.yul b/test/libyul/evmCodeTransform/stackReuse/function_call.yul
deleted file mode 100644
index 507b354413b6..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_call.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    let b := f(1, 2)
-    function f(a, r) -> t { }
-    b := f(3, 4)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":15:22   */
-//   tag_2
-//     /* "":20:21   */
-//   0x02
-//     /* "":17:18   */
-//   0x01
-//     /* "":15:22   */
-//   tag_1
-//   jump	// in
-// tag_2:
-//     /* "":62:69   */
-//   pop
-//   tag_3
-//     /* "":67:68   */
-//   0x04
-//     /* "":64:65   */
-//   0x03
-//     /* "":62:69   */
-//   tag_1
-//   jump	// in
-// tag_3:
-//     /* "":0:71   */
-//   stop
-//     /* "":27:52   */
-// tag_1:
-//   pop
-//   pop
-//     /* "":47:48   */
-//   0x00
-//     /* "":27:52   */
-//   swap1
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul b/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul
deleted file mode 100644
index 17ccdd3caf39..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    function f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) -> x {
-        mstore(0x0100, a1)
-        mstore(0x0120, a2)
-        mstore(0x0140, a3)
-        mstore(0x0160, a4)
-        mstore(0x0180, a5)
-        mstore(0x01A0, a6)
-        mstore(0x01C0, a7)
-        mstore(0x01E0, a8)
-        mstore(0x0200, a9)
-        mstore(0x0220, a10)
-        mstore(0x0240, a11)
-        mstore(0x0260, a12)
-        mstore(0x0280, a13)
-        mstore(0x02A0, a14)
-        mstore(0x02C0, a15)
-        mstore(0x02E0, a16)
-        mstore(0x0300, a17)
-        mstore(0x0320, a18)
-        mstore(0x0340, a19)
-        x := a20
-    }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:662   */
-//   stop
-//     /* "":6:660   */
-// tag_1:
-//     /* "":130:136   */
-//   0x0100
-//     /* "":123:141   */
-//   mstore
-//     /* "":157:163   */
-//   0x0120
-//     /* "":150:168   */
-//   mstore
-//     /* "":184:190   */
-//   0x0140
-//     /* "":177:195   */
-//   mstore
-//     /* "":211:217   */
-//   0x0160
-//     /* "":204:222   */
-//   mstore
-//     /* "":238:244   */
-//   0x0180
-//     /* "":231:249   */
-//   mstore
-//     /* "":265:271   */
-//   0x01a0
-//     /* "":258:276   */
-//   mstore
-//     /* "":292:298   */
-//   0x01c0
-//     /* "":285:303   */
-//   mstore
-//     /* "":319:325   */
-//   0x01e0
-//     /* "":312:330   */
-//   mstore
-//     /* "":346:352   */
-//   0x0200
-//     /* "":339:357   */
-//   mstore
-//     /* "":373:379   */
-//   0x0220
-//     /* "":366:385   */
-//   mstore
-//     /* "":401:407   */
-//   0x0240
-//     /* "":394:413   */
-//   mstore
-//     /* "":429:435   */
-//   0x0260
-//     /* "":422:441   */
-//   mstore
-//     /* "":457:463   */
-//   0x0280
-//     /* "":450:469   */
-//   mstore
-//     /* "":485:491   */
-//   0x02a0
-//     /* "":478:497   */
-//   mstore
-//     /* "":513:519   */
-//   0x02c0
-//     /* "":506:525   */
-//   mstore
-//     /* "":541:547   */
-//   0x02e0
-//     /* "":534:553   */
-//   mstore
-//     /* "":569:575   */
-//   0x0300
-//     /* "":562:581   */
-//   mstore
-//     /* "":597:603   */
-//   0x0320
-//     /* "":590:609   */
-//   mstore
-//     /* "":625:631   */
-//   0x0340
-//     /* "":618:637   */
-//   mstore
-//     /* "":6:660   */
-//   swap1
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_params.yul b/test/libyul/evmCodeTransform/stackReuse/function_params.yul
deleted file mode 100644
index e8d9bb30cc1b..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_params.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f(a, b) { }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:28   */
-//   stop
-//     /* "":6:26   */
-// tag_1:
-//   pop
-//   pop
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul b/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul
deleted file mode 100644
index 52920340055a..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-// This does not re-use the parameters for the return parameters
-// We do not expect parameters to be fully unused, so the stack
-// layout for a function is still fixed, even though parameters
-// can be re-used.
-{
-    function f(a, b, c, d) -> x, y { }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":212:254   */
-//   stop
-//     /* "":218:252   */
-// tag_1:
-//   pop
-//   pop
-//   pop
-//   pop
-//     /* "":247:248   */
-//   0x00
-//     /* "":244:245   */
-//   0x00
-//     /* "":218:252   */
-//   swap2
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul b/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul
deleted file mode 100644
index d0fc0506f88c..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    function f(a, b, c, d) -> x, y { b := 3 let s := 9 y := 2 mstore(s, y) }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:80   */
-//   stop
-//     /* "":6:78   */
-// tag_1:
-//   pop
-//   pop
-//   pop
-//   pop
-//     /* "":32:33   */
-//   0x00
-//     /* "":6:78   */
-//   swap1
-//     /* "":44:45   */
-//   0x03
-//     /* "":46:56   */
-//   pop
-//     /* "":55:56   */
-//   0x09
-//     /* "":57:63   */
-//   swap1
-//     /* "":62:63   */
-//   0x02
-//     /* "":64:76   */
-//   dup1
-//   swap3
-//   mstore
-//     /* "":6:78   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul
deleted file mode 100644
index bee0d3f635d9..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    function f() -> x, y { }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:32   */
-//   stop
-//     /* "":6:30   */
-// tag_1:
-//     /* "":25:26   */
-//   0x00
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:30   */
-//   swap2
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul
deleted file mode 100644
index 5a9e7704e68a..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    function f() -> x { pop(address()) { pop(callvalue()) } }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:65   */
-//   stop
-//     /* "":6:63   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:63   */
-//   swap1
-//     /* "":30:39   */
-//   address
-//     /* "":26:40   */
-//   pop
-//     /* "":47:58   */
-//   callvalue
-//     /* "":43:59   */
-//   pop
-//     /* "":6:63   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul
deleted file mode 100644
index 97bffac381a1..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    function f() -> x { pop(address()) let y := callvalue() }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:65   */
-//   stop
-//     /* "":6:63   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:63   */
-//   swap1
-//     /* "":30:39   */
-//   address
-//     /* "":26:40   */
-//   pop
-//     /* "":50:61   */
-//   callvalue
-//     /* "":6:63   */
-//   pop
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul
deleted file mode 100644
index c18fb7c37e50..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    function f() -> x { pop(address()) for { pop(callvalue()) } 0 {} { } }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:78   */
-//   stop
-//     /* "":6:76   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:76   */
-//   swap1
-//     /* "":30:39   */
-//   address
-//     /* "":26:40   */
-//   pop
-//     /* "":51:62   */
-//   callvalue
-//     /* "":47:63   */
-//   pop
-//     /* "":6:76   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul
deleted file mode 100644
index 08dda5a3bc28..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    function f() -> x { pop(address()) if 1 { pop(callvalue()) } }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:70   */
-//   stop
-//     /* "":6:68   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:68   */
-//   swap1
-//     /* "":44:45   */
-//   0x01
-//     /* "":30:39   */
-//   address
-//     /* "":26:40   */
-//   pop
-//     /* "":41:66   */
-//   tag_2
-//   jumpi
-//     /* "":24:68   */
-// tag_3:
-//     /* "":6:68   */
-//   jump	// out
-//     /* "":46:66   */
-// tag_2:
-//     /* "":52:63   */
-//   callvalue
-//     /* "":48:64   */
-//   pop
-//     /* "":46:66   */
-//   jump(tag_3)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul
deleted file mode 100644
index 9ac0c00bf8f2..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    function f() -> x { pop(address()) leave pop(callvalue()) }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:67   */
-//   stop
-//     /* "":6:65   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:65   */
-//   swap1
-//     /* "":30:39   */
-//   address
-//     /* "":26:40   */
-//   pop
-//     /* "":41:46   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul
deleted file mode 100644
index fcc8278e6719..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    function f() -> x { pop(address()) sstore(0, x) pop(callvalue()) }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:74   */
-//   stop
-//     /* "":6:72   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:72   */
-//   swap1
-//     /* "":30:39   */
-//   address
-//     /* "":26:40   */
-//   pop
-//     /* "":41:53   */
-//   dup2
-//     /* "":48:49   */
-//   0x00
-//     /* "":41:53   */
-//   sstore
-//     /* "":58:69   */
-//   callvalue
-//     /* "":54:70   */
-//   pop
-//     /* "":6:72   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul
deleted file mode 100644
index 1cc19a464105..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    function f() -> x { pop(callvalue()) }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:46   */
-//   stop
-//     /* "":6:44   */
-// tag_1:
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:44   */
-//   swap1
-//     /* "":30:41   */
-//   callvalue
-//     /* "":26:42   */
-//   pop
-//     /* "":6:44   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul
deleted file mode 100644
index e44e3b43729b..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    function f() -> x, y, z { pop(callvalue()) }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:52   */
-//   stop
-//     /* "":6:50   */
-// tag_1:
-//     /* "":25:26   */
-//   0x00
-//     /* "":28:29   */
-//   0x00
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:50   */
-//   swap3
-//     /* "":36:47   */
-//   callvalue
-//     /* "":32:48   */
-//   pop
-//     /* "":6:50   */
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul b/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul
deleted file mode 100644
index 3d6286efdb07..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-		function f() { }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:22   */
-//   stop
-//     /* "":4:20   */
-// tag_1:
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul b/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul
deleted file mode 100644
index f8480bc91ea8..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    let b := 3
-    function f(a, r) -> t {
-        // r could be removed right away, but a cannot - this is not implemented, though
-        let x := a a := 3 t := a
-    }
-    b := 7
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":15:16   */
-//   0x03
-//     /* "":177:183   */
-//   pop
-//     /* "":182:183   */
-//   0x07
-//     /* "":0:185   */
-//   stop
-//     /* "":21:172   */
-// tag_1:
-//   swap1
-//   pop
-//     /* "":153:159   */
-//   pop
-//     /* "":158:159   */
-//   0x03
-//     /* "":21:172   */
-//   swap1
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul b/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
deleted file mode 100644
index 1ce02483dcbf..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    function f(a, b) -> t { }
-    function g() -> r, s { }
-    let x := f(1, 2)
-    x := f(3, 4)
-    let y, z := g()
-    y, z := g()
-    let unused := 7
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":74:81   */
-//   tag_3
-//     /* "":79:80   */
-//   0x02
-//     /* "":76:77   */
-//   0x01
-//     /* "":74:81   */
-//   tag_1
-//   jump	// in
-// tag_3:
-//     /* "":91:98   */
-//   pop
-//   tag_4
-//     /* "":96:97   */
-//   0x04
-//     /* "":93:94   */
-//   0x03
-//     /* "":91:98   */
-//   tag_1
-//   jump	// in
-// tag_4:
-//     /* "":115:118   */
-//   pop
-//   tag_5
-//   tag_2
-//   jump	// in
-// tag_5:
-//     /* "":131:134   */
-//   pop
-//   pop
-//   tag_6
-//   tag_2
-//   jump	// in
-// tag_6:
-//     /* "":139:154   */
-//   pop
-//   pop
-//     /* "":153:154   */
-//   0x07
-//     /* "":0:156   */
-//   stop
-//     /* "":6:31   */
-// tag_1:
-//   pop
-//   pop
-//     /* "":26:27   */
-//   0x00
-//     /* "":6:31   */
-//   swap1
-//   jump	// out
-//     /* "":36:60   */
-// tag_2:
-//     /* "":55:56   */
-//   0x00
-//     /* "":52:53   */
-//   0x00
-//     /* "":36:60   */
-//   swap2
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/if.yul b/test/libyul/evmCodeTransform/stackReuse/if.yul
deleted file mode 100644
index cee19ab93fdc..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/if.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-// z is only removed after the if (after the jumpdest)
-{ let z := mload(0) if z { let x := z } let t := 3 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":72:73   */
-//   0x00
-//     /* "":66:74   */
-//   mload
-//     /* "":75:94   */
-//   dup1
-//   tag_1
-//   jumpi
-//     /* "":55:107   */
-// tag_2:
-//     /* "":104:105   */
-//   0x03
-//     /* "":55:107   */
-//   stop
-//     /* "":80:94   */
-// tag_1:
-//   jump(tag_2)
diff --git a/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul b/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul
deleted file mode 100644
index 49ffb3971be3..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{ let z := 0 { pop(z) } let x := 1 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x00
-//     /* "":15:21   */
-//   pop
-//     /* "":33:34   */
-//   0x01
-//     /* "":0:36   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul
deleted file mode 100644
index 3404dc53628c..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{ let z := mload(0) { let x := 1 x := 6 z := x } { let x := 2 z := x x := 4 } }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":17:18   */
-//   0x00
-//     /* "":11:19   */
-//   mload
-//     /* "":22:32   */
-//   pop
-//     /* "":31:32   */
-//   0x01
-//     /* "":33:39   */
-//   pop
-//     /* "":38:39   */
-//   0x06
-//     /* "":51:61   */
-//   pop
-//     /* "":60:61   */
-//   0x02
-//     /* "":69:75   */
-//   pop
-//     /* "":74:75   */
-//   0x04
-//     /* "":0:79   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul
deleted file mode 100644
index a80e66c10efa..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{ let x := 1 x := 6 let y := 2 y := 4 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x01
-//     /* "":13:19   */
-//   pop
-//     /* "":18:19   */
-//   0x06
-//     /* "":20:30   */
-//   pop
-//     /* "":29:30   */
-//   0x02
-//     /* "":31:37   */
-//   pop
-//     /* "":36:37   */
-//   0x04
-//     /* "":0:39   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul
deleted file mode 100644
index db8783502340..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{ let x := 1 x := 6 { let y := 2 y := 4 } }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x01
-//     /* "":13:19   */
-//   pop
-//     /* "":18:19   */
-//   0x06
-//     /* "":22:32   */
-//   pop
-//     /* "":31:32   */
-//   0x02
-//     /* "":33:39   */
-//   pop
-//     /* "":38:39   */
-//   0x04
-//     /* "":0:43   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul
deleted file mode 100644
index 9be91989d00a..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let x := 5
-    {
-        let y := x // y should not reuse the stack slot of x, since x is not in the same scope
-        sstore(y, y)
-    }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":15:16   */
-//   0x05
-//     /* "":126:138   */
-//   dup1
-//   sstore
-//     /* "":0:146   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul
deleted file mode 100644
index 11e77c62694e..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := 5
-    let y := x // y should reuse the stack slot of x
-    sstore(y, y)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":15:16   */
-//   0x05
-//     /* "":74:86   */
-//   dup1
-//   sstore
-//     /* "":0:88   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul
deleted file mode 100644
index 214020ccdc37..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let x := 5
-    let y := add(x, 2) // y should reuse the stack slot of x
-    sstore(y, y)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":37:38   */
-//   0x02
-//     /* "":15:16   */
-//   0x05
-//     /* "":30:39   */
-//   add
-//     /* "":82:94   */
-//   dup1
-//   sstore
-//     /* "":0:96   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul
deleted file mode 100644
index e3002f34d942..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    let x := 5
-    let y := x // y should not reuse the stack slot of x, since x is still used below
-    sstore(y, x)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":15:16   */
-//   0x05
-//     /* "":21:31   */
-//   dup1
-//     /* "":107:119   */
-//   sstore
-//     /* "":0:121   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul
deleted file mode 100644
index 13decd3231ae..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{ let a, b, c, d let x := 2 let y := 3 mstore(x, a) mstore(y, c) }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":2:16   */
-//   0x00
-//   dup1
-//   dup1
-//   dup1
-//     /* "":17:27   */
-//   pop
-//   swap2
-//   swap1
-//   pop
-//     /* "":26:27   */
-//   0x02
-//     /* "":28:38   */
-//   swap1
-//     /* "":37:38   */
-//   0x03
-//     /* "":39:51   */
-//   swap2
-//   mstore
-//     /* "":52:64   */
-//   mstore
-//     /* "":0:66   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
deleted file mode 100644
index 13e3065ccc97..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    function f() -> x, y, z, t {}
-    let a, b, c, d := f() let x1 := 2 let y1 := 3 mstore(x1, a) mstore(y1, c)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":58:61   */
-//   tag_2
-//   tag_1
-//   jump	// in
-// tag_2:
-//     /* "":62:73   */
-//   pop
-//   swap2
-//   swap1
-//   pop
-//     /* "":72:73   */
-//   0x02
-//     /* "":74:85   */
-//   swap1
-//     /* "":84:85   */
-//   0x03
-//     /* "":86:99   */
-//   swap2
-//   mstore
-//     /* "":100:113   */
-//   mstore
-//     /* "":0:115   */
-//   stop
-//     /* "":6:35   */
-// tag_1:
-//     /* "":25:26   */
-//   0x00
-//     /* "":28:29   */
-//   0x00
-//     /* "":31:32   */
-//   0x00
-//     /* "":22:23   */
-//   0x00
-//     /* "":6:35   */
-//   swap4
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
deleted file mode 100644
index f1cde362aef4..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    // Only x3 is actually used, the slots of
-    // x1 and x2 will be reused right away.
-    let x1 := 5 let x2 := 6 let x3 := 7
-    mstore(x1, x2)
-    function f() -> x, y, z, t {}
-    let a, b, c, d := f() mstore(x3, a) mstore(c, d)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":106:107   */
-//   0x05
-//     /* "":118:119   */
-//   0x06
-//     /* "":130:131   */
-//   0x07
-//     /* "":136:150   */
-//   swap2
-//   mstore
-//     /* "":207:210   */
-//   tag_2
-//   tag_1
-//   jump	// in
-// tag_2:
-//     /* "":211:224   */
-//   swap4
-//   swap1
-//   swap3
-//   swap2
-//   pop
-//   mstore
-//     /* "":225:237   */
-//   mstore
-//     /* "":0:239   */
-//   stop
-//     /* "":155:184   */
-// tag_1:
-//     /* "":174:175   */
-//   0x00
-//     /* "":177:178   */
-//   0x00
-//     /* "":180:181   */
-//   0x00
-//     /* "":171:172   */
-//   0x00
-//     /* "":155:184   */
-//   swap4
-//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul
deleted file mode 100644
index 2adfe7892bce..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-    let x := 7
-
-    let y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12, y13, y14, y15 := verbatim_0i_15o("\x60\x42") // the verbatim will show up as PUSH1 42
-
-    // last use of x - the slot of x will be marked as unused, but not popped, since it is not at the stack top
-    sstore(0,x)
-
-    // If the slot of x is blindly reused, this will fail.
-    let z1, z2 := verbatim_0i_2o("\x60\x43") // will show up as PUSH1 43
-
-    // prevent the z's from being popped immediately after their declaration above.
-    mstore(1, z1)
-    mstore(1, z2)
-
-    // use all y's to prevent them from being popped immediately after their declaration above
-    sstore(1, y1)
-    sstore(1, y2)
-    sstore(1, y3)
-    sstore(1, y4)
-    sstore(1, y5)
-    sstore(1, y6)
-    sstore(1, y7)
-    sstore(1, y8)
-    sstore(1, y9)
-    sstore(1, y10)
-    sstore(1, y11)
-    sstore(1, y12)
-    sstore(1, y13)
-    sstore(1, y14)
-    sstore(1, y15)
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":15:16   */
-//   0x07
-//     /* "":94:121   */
-//   verbatimbytecode_6042
-//     /* "":280:291   */
-//   swap15
-//     /* "":287:288   */
-//   0x00
-//     /* "":280:291   */
-//   swap15
-//   swap2
-//   swap15
-//   swap14
-//   swap3
-//   swap14
-//   swap13
-//   swap4
-//   swap13
-//   swap12
-//   swap5
-//   swap12
-//   swap11
-//   swap6
-//   swap11
-//   swap10
-//   swap7
-//   swap10
-//   swap9
-//   swap8
-//   swap9
-//   sstore
-//     /* "":370:396   */
-//   verbatimbytecode_6043
-//     /* "":514:527   */
-//   swap1
-//     /* "":521:522   */
-//   0x01
-//     /* "":514:527   */
-//   mstore
-//     /* "":539:540   */
-//   0x01
-//     /* "":532:545   */
-//   mstore
-//     /* "":653:654   */
-//   0x01
-//     /* "":646:659   */
-//   sstore
-//     /* "":671:672   */
-//   0x01
-//     /* "":664:677   */
-//   sstore
-//     /* "":689:690   */
-//   0x01
-//     /* "":682:695   */
-//   sstore
-//     /* "":707:708   */
-//   0x01
-//     /* "":700:713   */
-//   sstore
-//     /* "":725:726   */
-//   0x01
-//     /* "":718:731   */
-//   sstore
-//     /* "":743:744   */
-//   0x01
-//     /* "":736:749   */
-//   sstore
-//     /* "":761:762   */
-//   0x01
-//     /* "":754:767   */
-//   sstore
-//     /* "":779:780   */
-//   0x01
-//     /* "":772:785   */
-//   sstore
-//     /* "":797:798   */
-//   0x01
-//     /* "":790:803   */
-//   sstore
-//     /* "":815:816   */
-//   0x01
-//     /* "":808:822   */
-//   sstore
-//     /* "":834:835   */
-//   0x01
-//     /* "":827:841   */
-//   sstore
-//     /* "":853:854   */
-//   0x01
-//     /* "":846:860   */
-//   sstore
-//     /* "":872:873   */
-//   0x01
-//     /* "":865:879   */
-//   sstore
-//     /* "":891:892   */
-//   0x01
-//     /* "":884:898   */
-//   sstore
-//     /* "":910:911   */
-//   0x01
-//     /* "":903:917   */
-//   sstore
-//     /* "":0:919   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var.yul b/test/libyul/evmCodeTransform/stackReuse/single_var.yul
deleted file mode 100644
index 09a0d6feeb9e..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/single_var.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{ let x }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":2:7   */
-//   0x00
-//     /* "":0:9   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul
deleted file mode 100644
index ed497467d57e..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{ let x := 1 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x01
-//     /* "":0:14   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul
deleted file mode 100644
index bec4c834ff58..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{ let x := 1 mstore(3, 4) }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x01
-//     /* "":13:25   */
-//   pop
-//     /* "":23:24   */
-//   0x04
-//     /* "":20:21   */
-//   0x03
-//     /* "":13:25   */
-//   mstore
-//     /* "":0:27   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul
deleted file mode 100644
index b9a814700abd..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{ let x := 1 mstore(3, 4) pop(mload(x)) }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x01
-//     /* "":23:24   */
-//   0x04
-//     /* "":20:21   */
-//   0x03
-//     /* "":13:25   */
-//   mstore
-//     /* "":30:38   */
-//   mload
-//     /* "":26:39   */
-//   pop
-//     /* "":0:41   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/smoke.yul b/test/libyul/evmCodeTransform/stackReuse/smoke.yul
deleted file mode 100644
index aa46f7a4a538..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/smoke.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:2   */
-//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/switch.yul b/test/libyul/evmCodeTransform/stackReuse/switch.yul
deleted file mode 100644
index f72d80fad0b5..000000000000
--- a/test/libyul/evmCodeTransform/stackReuse/switch.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{ let z := 0 switch z case 0 { let x := 2 let y := 3 } default { z := 3 } let t := 9 }
-// ====
-// stackOptimization: true
-// ----
-//     /* "":11:12   */
-//   0x00
-//     /* "":27:28   */
-//   0x00
-//     /* "":22:54   */
-//   eq
-//   tag_1
-//   jumpi
-//     /* "":13:73   */
-// tag_2:
-//     /* "":70:71   */
-//   0x03
-//     /* "":63:73   */
-//   pop
-//     /* "":13:73   */
-// tag_3:
-//     /* "":83:84   */
-//   0x09
-//     /* "":13:73   */
-//   stop
-//     /* "":29:54   */
-// tag_1:
-//     /* "":40:41   */
-//   0x02
-//     /* "":42:52   */
-//   pop
-//     /* "":51:52   */
-//   0x03
-//     /* "":29:54   */
-//   pop
-//   jump(tag_3)
diff --git a/test/libyul/evmCodeTransform/stub.yul b/test/libyul/evmCodeTransform/stub.yul
deleted file mode 100644
index ef7cd668c1c1..000000000000
--- a/test/libyul/evmCodeTransform/stub.yul
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-            fun_c()
-            function fun_c()
-            {
-                switch iszero(calldataload(0))
-                case 0 { }
-                default {
-                    if calldataload(1)
-                    {
-                        leave
-                    }
-                    if calldataload(2)
-                    {
-                        revert(0, 0)
-                    }
-                }
-                revert(0, 0)
-            }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":14:21   */
-//   tag_2
-//   tag_1
-//   jump	// in
-// tag_2:
-//     /* "":0:460   */
-//   stop
-//     /* "":34:458   */
-// tag_1:
-//     /* "":108:109   */
-//   0x00
-//     /* "":95:110   */
-//   calldataload
-//     /* "":88:111   */
-//   iszero
-//     /* "":133:134   */
-//   0x00
-//     /* "":128:138   */
-//   eq
-//   tag_3
-//   jumpi
-//     /* "":81:415   */
-// tag_4:
-//     /* "":201:202   */
-//   0x01
-//     /* "":188:203   */
-//   calldataload
-//     /* "":185:277   */
-//   tag_5
-//   jumpi
-//     /* "":81:415   */
-// tag_6:
-//     /* "":301:316   */
-//   pop
-//     /* "":314:315   */
-//   0x02
-//     /* "":301:316   */
-//   calldataload
-//     /* "":298:397   */
-//   tag_7
-//   jumpi
-//     /* "":81:415   */
-// tag_8:
-// tag_9:
-//     /* "":442:443   */
-//   0x00
-//     /* "":432:444   */
-//   dup1
-//   revert
-//     /* "":337:397   */
-// tag_7:
-//     /* "":373:374   */
-//   0x00
-//     /* "":363:375   */
-//   dup1
-//   revert
-//     /* "":224:277   */
-// tag_5:
-//     /* "":250:255   */
-//   jump	// out
-//     /* "":135:138   */
-// tag_3:
-//   pop
-//   jump(tag_9)
diff --git a/test/libyul/evmCodeTransform/unassigned_return_variable.yul b/test/libyul/evmCodeTransform/unassigned_return_variable.yul
deleted file mode 100644
index 666fefe1aa64..000000000000
--- a/test/libyul/evmCodeTransform/unassigned_return_variable.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  // This used to throw during stack layout generation.
-  function g(b,s) -> y {
-    y := g(b, g(y, s))
-  }
-}
-// ====
-// stackOptimization: true
-// ----
-//     /* "":0:111   */
-//   stop
-//     /* "":60:109   */
-// tag_1:
-//   pop
-//     /* "":99:100   */
-//   0x00
-//     /* "":97:104   */
-//   tag_1
-//   jump	// in
diff --git a/test/libyul/functionSideEffects/cyclic_graph.yul b/test/libyul/functionSideEffects/cyclic_graph.yul
deleted file mode 100644
index 640bb7057d75..000000000000
--- a/test/libyul/functionSideEffects/cyclic_graph.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    function a() { b() }
-    function b() { c() }
-    function c() { b() }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: movable apart from effects, can loop
-// b: movable apart from effects, can loop
-// c: movable apart from effects, can loop
diff --git a/test/libyul/functionSideEffects/doubly_recursive_function.yul b/test/libyul/functionSideEffects/doubly_recursive_function.yul
deleted file mode 100644
index aa137abb0294..000000000000
--- a/test/libyul/functionSideEffects/doubly_recursive_function.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function a() { b() }
-    function b() { a() }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: movable apart from effects, can loop
-// b: movable apart from effects, can loop
diff --git a/test/libyul/functionSideEffects/empty.yul b/test/libyul/functionSideEffects/empty.yul
deleted file mode 100644
index e3cc25d670b4..000000000000
--- a/test/libyul/functionSideEffects/empty.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
diff --git a/test/libyul/functionSideEffects/empty_with_sstore.yul b/test/libyul/functionSideEffects/empty_with_sstore.yul
deleted file mode 100644
index b2cd4fa574bb..000000000000
--- a/test/libyul/functionSideEffects/empty_with_sstore.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    sstore(0, 1)
-}
-// ----
-// : writes storage
diff --git a/test/libyul/functionSideEffects/memory.yul b/test/libyul/functionSideEffects/memory.yul
deleted file mode 100644
index d39ffce6876d..000000000000
--- a/test/libyul/functionSideEffects/memory.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    function a() { mstore8(0, 32) }
-    function f() { a() }
-    function g() { sstore(0, 1) } // does not affect memory
-    function h() { pop(mload(0)) }
-    function i() { pop(msize()) }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: writes memory
-// f: writes memory
-// g: writes storage
-// h: movable apart from effects, can be removed if no msize, reads memory
-// i: can be removed, can be removed if no msize, reads memory
diff --git a/test/libyul/functionSideEffects/mload_in_function.yul b/test/libyul/functionSideEffects/mload_in_function.yul
deleted file mode 100644
index d7977e2b59e2..000000000000
--- a/test/libyul/functionSideEffects/mload_in_function.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-        function foo(x) {
-                for {} x { x := mload(0) mstore(0, 0)} {}
-        }
-        mstore(0, 1337)
-        foo(42)
-        sstore(0, mload(0))
-}
-// ----
-// : can loop, writes storage, writes memory
-// foo: can loop, writes memory
diff --git a/test/libyul/functionSideEffects/multi_calls.yul b/test/libyul/functionSideEffects/multi_calls.yul
deleted file mode 100644
index 5d36c10dfaa6..000000000000
--- a/test/libyul/functionSideEffects/multi_calls.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    function a() {
-        b()
-    }
-    function b() {
-        sstore(0, 1)
-        b()
-    }
-    function c() {
-        mstore(0, 1)
-        a()
-        d()
-    }
-    function d() {
-    }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: can loop, writes storage
-// b: can loop, writes storage
-// c: can loop, writes storage, writes memory
-// d: movable, movable apart from effects, can be removed, can be removed if no msize
diff --git a/test/libyul/functionSideEffects/otherImmovables.yul b/test/libyul/functionSideEffects/otherImmovables.yul
deleted file mode 100644
index bb02dba1d8ac..000000000000
--- a/test/libyul/functionSideEffects/otherImmovables.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    function a() { pop(gas()) }
-    function f() { a() }
-    function g() { stop() }
-    function h() { invalid() }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: can be removed, can be removed if no msize
-// f: can be removed, can be removed if no msize
-// g:
-// h:
diff --git a/test/libyul/functionSideEffects/recursive_function.yul b/test/libyul/functionSideEffects/recursive_function.yul
deleted file mode 100644
index e65a00c2b09d..000000000000
--- a/test/libyul/functionSideEffects/recursive_function.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    function a() { a() }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: movable apart from effects, can loop
diff --git a/test/libyul/functionSideEffects/simple_functions.yul b/test/libyul/functionSideEffects/simple_functions.yul
deleted file mode 100644
index 61db9d27b155..000000000000
--- a/test/libyul/functionSideEffects/simple_functions.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    function a() {}
-    function f() { mstore(0, 1) }
-    function g() { sstore(0, 1) }
-    function h() { let x := msize() }
-    function i() { let z := mload(0) }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: movable, movable apart from effects, can be removed, can be removed if no msize
-// f: writes memory
-// g: writes storage
-// h: can be removed, can be removed if no msize, reads memory
-// i: movable apart from effects, can be removed if no msize, reads memory
diff --git a/test/libyul/functionSideEffects/state.yul b/test/libyul/functionSideEffects/state.yul
deleted file mode 100644
index e605ff1e514a..000000000000
--- a/test/libyul/functionSideEffects/state.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    function a() { pop(call(100, 0x010, 10, 0x00, 32, 0x0100, 32))}
-    function f() { a() }
-    function g() { sstore(0, 1) }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: writes other state, writes storage, writes memory
-// f: writes other state, writes storage, writes memory
-// g: writes storage
diff --git a/test/libyul/functionSideEffects/storage.yul b/test/libyul/functionSideEffects/storage.yul
deleted file mode 100644
index 038c368a29d9..000000000000
--- a/test/libyul/functionSideEffects/storage.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    function a() { sstore(0, 1) }
-    function f() { a() }
-    function g() { pop(callcode(100, 0x010, 10, 0x00, 32, 0x0100, 32))}
-    function h() { pop(sload(0))}
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: writes storage
-// f: writes storage
-// g: writes other state, writes storage, writes memory
-// h: movable apart from effects, can be removed, can be removed if no msize, reads storage
diff --git a/test/libyul/functionSideEffects/structures.yul b/test/libyul/functionSideEffects/structures.yul
deleted file mode 100644
index 9c844f66fc6f..000000000000
--- a/test/libyul/functionSideEffects/structures.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    if calldataload(0)
-    {
-        f()
-    }
-    g()
-
-    function f() {
-        pop(mload(0))
-    }
-    function g() {
-        if sload(0)
-        {
-            h()
-        }
-    }
-    function h() {
-        switch t()
-        case 1 {
-            i()
-        }
-    }
-    function t() -> x {
-        mstore(0, 1)
-    }
-    function i() {
-        sstore(0, 1)
-    }
-    function r(a) -> b {
-        b := mul(a, 2)
-    }
-}
-// ----
-// : writes storage, writes memory
-// f: movable apart from effects, can be removed if no msize, reads memory
-// g: writes storage, writes memory
-// h: writes storage, writes memory
-// i: writes storage
-// r: movable, movable apart from effects, can be removed, can be removed if no msize
-// t: writes memory
diff --git a/test/libyul/functionSideEffects/verbatim.yul b/test/libyul/functionSideEffects/verbatim.yul
deleted file mode 100644
index 5c0f6f2c1a0c..000000000000
--- a/test/libyul/functionSideEffects/verbatim.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function a() -> x { x := verbatim_0i_1o(hex"6007") }
-    function b() { let t := a() }
-}
-// ----
-// : movable, movable apart from effects, can be removed, can be removed if no msize
-// a: can loop, writes other state, writes storage, writes memory
-// b: can loop, writes other state, writes storage, writes memory
diff --git a/test/libyul/functionSideEffects/with_loop.yul b/test/libyul/functionSideEffects/with_loop.yul
deleted file mode 100644
index 6e9bc643612e..000000000000
--- a/test/libyul/functionSideEffects/with_loop.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { for {} 1 {} {} }
-  pop(f())
-}
-// ----
-// : movable apart from effects, can loop
-// f: movable apart from effects, can loop
-// g: movable apart from effects, can loop
diff --git a/test/libyul/objectCompiler/data.yul b/test/libyul/objectCompiler/data.yul
deleted file mode 100644
index caa6499218db..000000000000
--- a/test/libyul/objectCompiler/data.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-object "a" {
-  code {}
-  // Unreferenced data is not added to the assembled bytecode.
-  data "str" "Hello, World!"
-}
-// ----
-// Assembly:
-//     /* "source":20:22   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 00fe
-// Opcodes: STOP INVALID
-// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/objectCompiler/datacopy.yul b/test/libyul/objectCompiler/datacopy.yul
deleted file mode 100644
index cb9fbcb18ba2..000000000000
--- a/test/libyul/objectCompiler/datacopy.yul
+++ /dev/null
@@ -1,52 +0,0 @@
-object "a" {
-  code {
-    datacopy(0, dataoffset("sub"), datasize("sub"))
-    return(0, datasize("sub"))
-  }
-  object "sub" {
-    code {
-      sstore(0, dataoffset("sub"))
-      mstore(0, datasize("data1"))
-    }
-    data "data1" "Hello, World!"
-  }
-}
-// ----
-// Assembly:
-//     /* "source":57:72   */
-//   dataSize(sub_0)
-//     /* "source":38:55   */
-//   dataOffset(sub_0)
-//     /* "source":35:36   */
-//   0x00
-//     /* "source":26:73   */
-//   codecopy
-//     /* "source":88:103   */
-//   dataSize(sub_0)
-//     /* "source":85:86   */
-//   0x00
-//     /* "source":78:104   */
-//   return
-// stop
-//
-// sub_0: assembly {
-//         /* "source":153:170   */
-//       0x00
-//         /* "source":150:151   */
-//       dup1
-//         /* "source":143:171   */
-//       sstore
-//         /* "source":188:205   */
-//       0x0d
-//         /* "source":185:186   */
-//       0x00
-//         /* "source":178:206   */
-//       mstore
-//         /* "source":135:212   */
-//       stop
-//     stop
-//     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// }
-// Bytecode: 6009600b5f3960095ff3fe5f8055600d5f5200fe
-// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
-// SourceMappings: 57:15:0:-:0;38:17;35:1;26:47;88:15;85:1;78:26
diff --git a/test/libyul/objectCompiler/dataoffset_code.yul b/test/libyul/objectCompiler/dataoffset_code.yul
deleted file mode 100644
index 58521c87f9be..000000000000
--- a/test/libyul/objectCompiler/dataoffset_code.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-object "a" {
-  code { sstore(0, dataoffset("sub")) }
-  object "sub" {
-    code { sstore(0, 8) }
-    data "data1" "Hello, World!"
-  }
-}
-// ----
-// Assembly:
-//     /* "source":32:49   */
-//   dataOffset(sub_0)
-//     /* "source":29:30   */
-//   0x00
-//     /* "source":22:50   */
-//   sstore
-//     /* "source":20:52   */
-//   stop
-// stop
-//
-// sub_0: assembly {
-//         /* "source":91:92   */
-//       0x08
-//         /* "source":88:89   */
-//       0x00
-//         /* "source":81:93   */
-//       sstore
-//         /* "source":79:95   */
-//       stop
-//     stop
-//     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// }
-// Bytecode: 60065f5500fe60085f5500fe
-// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID PUSH1 0x8 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:17:0:-:0;29:1;22:28;20:32
diff --git a/test/libyul/objectCompiler/dataoffset_data.yul b/test/libyul/objectCompiler/dataoffset_data.yul
deleted file mode 100644
index 61f0c4418957..000000000000
--- a/test/libyul/objectCompiler/dataoffset_data.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-object "a" {
-  code { sstore(0, dataoffset("data1")) }
-  data "data1" "Hello, World!"
-}
-// ----
-// Assembly:
-//     /* "source":32:51   */
-//   data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f
-//     /* "source":29:30   */
-//   0x00
-//     /* "source":22:52   */
-//   sstore
-//     /* "source":20:54   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 60065f5500fe48656c6c6f2c20576f726c6421
-// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID BASEFEE PUSH6 0x6C6C6F2C2057 PUSH16 0x726C6421000000000000000000000000
-// SourceMappings: 32:19:0:-:0;29:1;22:30;20:34
diff --git a/test/libyul/objectCompiler/dataoffset_self.yul b/test/libyul/objectCompiler/dataoffset_self.yul
deleted file mode 100644
index 7c38b9502a1b..000000000000
--- a/test/libyul/objectCompiler/dataoffset_self.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-object "a" {
-  code { sstore(0, dataoffset("a")) }
-  data "data1" "Hello, World!"
-}
-// ----
-// Assembly:
-//     /* "source":32:47   */
-//   0x00
-//     /* "source":29:30   */
-//   dup1
-//     /* "source":22:48   */
-//   sstore
-//     /* "source":20:50   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 5f805500fe
-// Opcodes: PUSH0 DUP1 SSTORE STOP INVALID
-// SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
diff --git a/test/libyul/objectCompiler/datasize_code.yul b/test/libyul/objectCompiler/datasize_code.yul
deleted file mode 100644
index 4e559ab895c6..000000000000
--- a/test/libyul/objectCompiler/datasize_code.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-object "a" {
-  code { sstore(0, datasize("sub")) }
-  object "sub" {
-    code { sstore(0, 8) }
-    data "data1" "Hello, World!"
-  }
-}
-// ----
-// Assembly:
-//     /* "source":32:47   */
-//   dataSize(sub_0)
-//     /* "source":29:30   */
-//   0x00
-//     /* "source":22:48   */
-//   sstore
-//     /* "source":20:50   */
-//   stop
-// stop
-//
-// sub_0: assembly {
-//         /* "source":89:90   */
-//       0x08
-//         /* "source":86:87   */
-//       0x00
-//         /* "source":79:91   */
-//       sstore
-//         /* "source":77:93   */
-//       stop
-//     stop
-//     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// }
-// Bytecode: 60065f5500fe
-// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
diff --git a/test/libyul/objectCompiler/datasize_data.yul b/test/libyul/objectCompiler/datasize_data.yul
deleted file mode 100644
index 3281bd9ba7c3..000000000000
--- a/test/libyul/objectCompiler/datasize_data.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-object "a" {
-  code { sstore(0, datasize("data1")) }
-  data "data1" "Hello, World!"
-}
-// ----
-// Assembly:
-//     /* "source":32:49   */
-//   0x0d
-//     /* "source":29:30   */
-//   0x00
-//     /* "source":22:50   */
-//   sstore
-//     /* "source":20:52   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 600d5f5500fe
-// Opcodes: PUSH1 0xD PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:17:0:-:0;29:1;22:28;20:32
diff --git a/test/libyul/objectCompiler/datasize_self.yul b/test/libyul/objectCompiler/datasize_self.yul
deleted file mode 100644
index 6bc520af58e7..000000000000
--- a/test/libyul/objectCompiler/datasize_self.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-object "a" {
-  code { sstore(0, datasize("a")) }
-  data "data1" "Hello, World!"
-}
-// ----
-// Assembly:
-//     /* "source":32:45   */
-//   bytecodeSize
-//     /* "source":29:30   */
-//   0x00
-//     /* "source":22:46   */
-//   sstore
-//     /* "source":20:48   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 60065f5500fe
-// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:13:0:-:0;29:1;22:24;20:28
diff --git a/test/libyul/objectCompiler/function_series.yul b/test/libyul/objectCompiler/function_series.yul
deleted file mode 100644
index 7be2db96b923..000000000000
--- a/test/libyul/objectCompiler/function_series.yul
+++ /dev/null
@@ -1,39 +0,0 @@
-object "Contract" {
-  code {
-    function f() {}
-    function g() {}
-    sstore(0, 1)
-
-    // NOTE: msize forces the compiler to completely disable the Yul optimizer.
-    // Otherwise the functions would get optimized out.
-    pop(msize())
-  }
-}
-
-// ====
-// optimizationPreset: none
-// ----
-// Assembly:
-//     /* "source":33:48   */
-//   jump(tag_3)
-// tag_1:
-// tag_4:
-//   jump	// out
-//     /* "source":53:68   */
-// tag_2:
-// tag_5:
-//   jump	// out
-// tag_3:
-//     /* "source":83:84   */
-//   0x01
-//     /* "source":80:81   */
-//   0x00
-//     /* "source":73:85   */
-//   sstore
-//     /* "source":231:238   */
-//   msize
-//     /* "source":227:239   */
-//   pop
-// Bytecode: 6009565b5b565b5b565b60015f555950
-// Opcodes: PUSH1 0x9 JUMP JUMPDEST JUMPDEST JUMP JUMPDEST JUMPDEST JUMP JUMPDEST PUSH1 0x1 PUSH0 SSTORE MSIZE POP
-// SourceMappings: 33:15:0:-:0;;;;:::o;53:::-;;:::o;:::-;83:1;80;73:12;231:7;227:12
diff --git a/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul b/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
deleted file mode 100644
index 285a8a8d548d..000000000000
--- a/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-object "a" {
-    code {
-        setimmutable(
-            0,
-            "long___name___that___definitely___exceeds___the___thirty___two___byte___limit",
-             0x1234567890123456789012345678901234567890
-        )
-    }
-}
-// ----
-// Assembly:
-//     /* "source":167:209   */
-//   0x1234567890123456789012345678901234567890
-//     /* "source":58:59   */
-//   0x00
-//     /* "source":32:219   */
-//   assignImmutable("0x85a5b1db611c82c46f5fa18e39ae218397536256c451e5de155a86de843a9ad6")
-//     /* "source":22:225   */
-//   stop
-// Bytecode: 7312345678901234567890123456789012345678905f505000
-// Opcodes: PUSH20 0x1234567890123456789012345678901234567890 PUSH0 POP POP STOP
-// SourceMappings: 167:42:0:-:0;58:1;32:187;;22:203
diff --git a/test/libyul/objectCompiler/jump_tags.yul b/test/libyul/objectCompiler/jump_tags.yul
deleted file mode 100644
index 0d1f1ff791ab..000000000000
--- a/test/libyul/objectCompiler/jump_tags.yul
+++ /dev/null
@@ -1,75 +0,0 @@
-object "Contract" {
-  code {
-    function f() { g(1) }
-    function g(x) { if x { leave } g(add(x, 2)) }
-    g(1)
-
-    // NOTE: msize forces the compiler to completely disable the Yul optimizer.
-    // Otherwise f() would get optimized out.
-    pop(msize())
-  }
-}
-
-// ====
-// optimizationPreset: none
-// ----
-// Assembly:
-//     /* "source":33:54   */
-//   jump(tag_3)
-// tag_1:
-//     /* "source":48:52   */
-//   tag_5
-//     /* "source":50:51   */
-//   0x01
-//     /* "source":48:52   */
-//   tag_2
-//   jump	// in
-// tag_5:
-//     /* "source":33:54   */
-// tag_4:
-//   jump	// out
-//     /* "source":59:104   */
-// tag_2:
-//     /* "source":78:79   */
-//   dup1
-//     /* "source":75:89   */
-//   iszero
-//   tag_7
-//   jumpi
-//     /* "source":82:87   */
-//   pop
-//   jump(tag_6)
-//     /* "source":75:89   */
-// tag_7:
-//     /* "source":90:102   */
-//   tag_8
-//     /* "source":99:100   */
-//   0x02
-//     /* "source":96:97   */
-//   dup3
-//     /* "source":92:101   */
-//   add
-//     /* "source":90:102   */
-//   tag_2
-//   jump	// in
-// tag_8:
-//     /* "source":59:104   */
-//   pop
-// tag_6:
-//   jump	// out
-// tag_3:
-//     /* "source":109:113   */
-//   tag_9
-//     /* "source":111:112   */
-//   0x01
-//     /* "source":109:113   */
-//   tag_2
-//   jump	// in
-// tag_9:
-//     /* "source":249:256   */
-//   msize
-//     /* "source":245:257   */
-//   pop
-// Bytecode: 6026565b600b6001600e565b5b565b8015601857506024565b602260028201600e565b505b565b602e6001600e565b5950
-// Opcodes: PUSH1 0x26 JUMP JUMPDEST PUSH1 0xB PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST JUMPDEST JUMP JUMPDEST DUP1 ISZERO PUSH1 0x18 JUMPI POP PUSH1 0x24 JUMP JUMPDEST PUSH1 0x22 PUSH1 0x2 DUP3 ADD PUSH1 0xE JUMP JUMPDEST POP JUMPDEST JUMP JUMPDEST PUSH1 0x2E PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST MSIZE POP
-// SourceMappings: 33:21:0:-:0;;;48:4;50:1;48:4;:::i;:::-;33:21;:::o;59:45::-;78:1;75:14;;;82:5;;;75:14;90:12;99:1;96;92:9;90:12;:::i;:::-;59:45;;:::o;:::-;109:4;111:1;109:4;:::i;:::-;249:7;245:12
diff --git a/test/libyul/objectCompiler/linkersymbol.yul b/test/libyul/objectCompiler/linkersymbol.yul
deleted file mode 100644
index c4da288e618f..000000000000
--- a/test/libyul/objectCompiler/linkersymbol.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-object "a" {
-    code {
-        let addr := linkersymbol("contract/test.sol:L")
-        mstore(128, shl(227, 0x18530aaf))
-        let success := call(gas(), addr, 0, 128, 4, 128, 0)
-    }
-}
-// ----
-// Assembly:
-//     /* "source":179:180   */
-//   0x00
-//     /* "source":174:177   */
-//   0x80
-//     /* "source":171:172   */
-//   0x04
-//     /* "source":44:79   */
-//   dup2
-//   dup4
-//   linkerSymbol("f919ba91ac99f96129544b80b9516b27a80e376b9dc693819d0b18b7e0395612")
-//     /* "source":109:119   */
-//   0x18530aaf
-//     /* "source":104:107   */
-//   0xe3
-//     /* "source":100:120   */
-//   shl
-//     /* "source":88:121   */
-//   dup4
-//   mstore
-//     /* "source":150:155   */
-//   gas
-//     /* "source":145:181   */
-//   call
-//     /* "source":130:181   */
-//   stop
-// Bytecode: 5f6080600481837300000000000000000000000000000000000000006318530aaf60e31b83525af100
-// Opcodes: PUSH0 PUSH1 0x80 PUSH1 0x4 DUP2 DUP4 PUSH20 0x0 PUSH4 0x18530AAF PUSH1 0xE3 SHL DUP4 MSTORE GAS CALL STOP
-// SourceMappings: 179:1:0:-:0;174:3;171:1;44:35;;;109:10;104:3;100:20;88:33;;150:5;145:36;130:51
diff --git a/test/libyul/objectCompiler/long_object_name.yul b/test/libyul/objectCompiler/long_object_name.yul
deleted file mode 100644
index aa2dd1ac2eee..000000000000
--- a/test/libyul/objectCompiler/long_object_name.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-object "t" {
-	code {
-		sstore(0, datasize("name_that_is_longer_than_32_bytes_name_that_is_longer_than_32_bytes_name_that_is_longer_than_32_bytes"))
-	}
-	object "name_that_is_longer_than_32_bytes_name_that_is_longer_than_32_bytes_name_that_is_longer_than_32_bytes" {
-		code {}
-	}
-}
-// ====
-// optimizationPreset: full
-// ----
-// Assembly:
-//     /* "source":33:146   */
-//   dataSize(sub_0)
-//     /* "source":30:31   */
-//   0x00
-//     /* "source":23:147   */
-//   sstore
-//     /* "source":19:150   */
-//   stop
-// stop
-//
-// sub_0: assembly {
-//         /* "source":272:274   */
-//       stop
-// }
-// Bytecode: 60015f5500fe
-// Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 33:113:0:-:0;30:1;23:124;19:131
diff --git a/test/libyul/objectCompiler/manySubObjects.yul b/test/libyul/objectCompiler/manySubObjects.yul
deleted file mode 100644
index 2f4b1638765f..000000000000
--- a/test/libyul/objectCompiler/manySubObjects.yul
+++ /dev/null
@@ -1,475 +0,0 @@
-object "root" {
-    code {
-        sstore(0, datasize("root"))
-        sstore(1, datasize("0"))
-        sstore(2, datasize("1"))
-        sstore(3, datasize("2"))
-        sstore(4, datasize("3"))
-        sstore(5, datasize("4"))
-        sstore(6, datasize("5"))
-        sstore(7, datasize("6"))
-        sstore(8, datasize("7"))
-        sstore(9, datasize("8"))
-        sstore(10, datasize("9"))
-        sstore(11, datasize("a"))
-        sstore(12, datasize("b"))
-        sstore(13, datasize("c"))
-        sstore(14, datasize("d"))
-        sstore(15, datasize("e"))
-        sstore(16, datasize("f"))
-        sstore(17, datasize("10"))
-    }
-
-    object "0" {
-        code {
-            sstore(100, 0)
-            sstore(200, datasize("sub0"))
-        }
-        object "sub0" {
-            code {
-                sstore(300, 0)
-            }
-        }
-    }
-
-    object "1" {
-        code {
-            sstore(100, 1)
-        }
-    }
-
-    object "2" {
-        code {
-            sstore(101, 2)
-        }
-    }
-
-    object "3" {
-        code {
-            sstore(102, 3)
-        }
-    }
-
-    object "4" {
-        code {
-            sstore(103, 4)
-        }
-    }
-
-    object "5" {
-        code {
-            sstore(104, 5)
-        }
-    }
-
-    object "6" {
-        code {
-            sstore(105, 6)
-        }
-    }
-
-    object "7" {
-        code {
-            sstore(106, 7)
-        }
-    }
-
-    object "8" {
-        code {
-            sstore(107, 8)
-        }
-    }
-
-    object "9" {
-        code {
-            sstore(108, 9)
-        }
-    }
-
-    object "a" {
-        code {
-            sstore(109, 10)
-        }
-    }
-
-    object "b" {
-        code {
-            sstore(110, 11)
-        }
-    }
-
-    object "c" {
-        code {
-            sstore(111, 12)
-        }
-    }
-
-    object "d" {
-        code {
-            sstore(112, 13)
-        }
-    }
-
-    object "e" {
-        code {
-            sstore(113, 14)
-        }
-    }
-
-    object "f" {
-        code {
-            sstore(114, 15)
-        }
-    }
-
-    object "10" {
-        code {
-            sstore(115, 16)
-            sstore(201, datasize("sub10"))
-        }
-        object "sub10" {
-            code {
-                sstore(300, 16)
-            }
-        }
-    }
-}
-// ----
-// Assembly:
-//     /* "source":45:61   */
-//   bytecodeSize
-//     /* "source":42:43   */
-//   0x00
-//     /* "source":35:62   */
-//   sstore
-//     /* "source":81:94   */
-//   dataSize(sub_0)
-//     /* "source":78:79   */
-//   0x01
-//     /* "source":71:95   */
-//   sstore
-//     /* "source":114:127   */
-//   dataSize(sub_1)
-//     /* "source":111:112   */
-//   0x02
-//     /* "source":104:128   */
-//   sstore
-//     /* "source":147:160   */
-//   dataSize(sub_2)
-//     /* "source":144:145   */
-//   0x03
-//     /* "source":137:161   */
-//   sstore
-//     /* "source":180:193   */
-//   dataSize(sub_3)
-//     /* "source":177:178   */
-//   0x04
-//     /* "source":170:194   */
-//   sstore
-//     /* "source":213:226   */
-//   dataSize(sub_4)
-//     /* "source":210:211   */
-//   0x05
-//     /* "source":203:227   */
-//   sstore
-//     /* "source":246:259   */
-//   dataSize(sub_5)
-//     /* "source":243:244   */
-//   0x06
-//     /* "source":236:260   */
-//   sstore
-//     /* "source":279:292   */
-//   dataSize(sub_6)
-//     /* "source":276:277   */
-//   0x07
-//     /* "source":269:293   */
-//   sstore
-//     /* "source":312:325   */
-//   dataSize(sub_7)
-//     /* "source":309:310   */
-//   0x08
-//     /* "source":302:326   */
-//   sstore
-//     /* "source":345:358   */
-//   dataSize(sub_8)
-//     /* "source":342:343   */
-//   0x09
-//     /* "source":335:359   */
-//   sstore
-//     /* "source":379:392   */
-//   dataSize(sub_9)
-//     /* "source":375:377   */
-//   0x0a
-//     /* "source":368:393   */
-//   sstore
-//     /* "source":413:426   */
-//   dataSize(sub_10)
-//     /* "source":409:411   */
-//   0x0b
-//     /* "source":402:427   */
-//   sstore
-//     /* "source":447:460   */
-//   dataSize(sub_11)
-//     /* "source":443:445   */
-//   0x0c
-//     /* "source":436:461   */
-//   sstore
-//     /* "source":481:494   */
-//   dataSize(sub_12)
-//     /* "source":477:479   */
-//   0x0d
-//     /* "source":470:495   */
-//   sstore
-//     /* "source":515:528   */
-//   dataSize(sub_13)
-//     /* "source":511:513   */
-//   0x0e
-//     /* "source":504:529   */
-//   sstore
-//     /* "source":549:562   */
-//   dataSize(sub_14)
-//     /* "source":545:547   */
-//   0x0f
-//     /* "source":538:563   */
-//   sstore
-//     /* "source":583:596   */
-//   dataSize(sub_15)
-//     /* "source":579:581   */
-//   0x10
-//     /* "source":572:597   */
-//   sstore
-//     /* "source":617:631   */
-//   dataSize(sub_16)
-//     /* "source":613:615   */
-//   0x11
-//     /* "source":606:632   */
-//   sstore
-//     /* "source":25:638   */
-//   stop
-// stop
-//
-// sub_0: assembly {
-//         /* "source":696:697   */
-//       0x00
-//         /* "source":691:694   */
-//       0x64
-//         /* "source":684:698   */
-//       sstore
-//         /* "source":723:739   */
-//       dataSize(sub_0)
-//         /* "source":718:721   */
-//       0xc8
-//         /* "source":711:740   */
-//       sstore
-//         /* "source":670:750   */
-//       stop
-//     stop
-//
-//     sub_0: assembly {
-//             /* "source":822:823   */
-//           0x00
-//             /* "source":817:820   */
-//           0x012c
-//             /* "source":810:824   */
-//           sstore
-//             /* "source":792:838   */
-//           stop
-//     }
-// }
-//
-// sub_1: assembly {
-//         /* "source":912:913   */
-//       0x01
-//         /* "source":907:910   */
-//       0x64
-//         /* "source":900:914   */
-//       sstore
-//         /* "source":886:924   */
-//       stop
-// }
-//
-// sub_2: assembly {
-//         /* "source":988:989   */
-//       0x02
-//         /* "source":983:986   */
-//       0x65
-//         /* "source":976:990   */
-//       sstore
-//         /* "source":962:1000   */
-//       stop
-// }
-//
-// sub_3: assembly {
-//         /* "source":1064:1065   */
-//       0x03
-//         /* "source":1059:1062   */
-//       0x66
-//         /* "source":1052:1066   */
-//       sstore
-//         /* "source":1038:1076   */
-//       stop
-// }
-//
-// sub_4: assembly {
-//         /* "source":1140:1141   */
-//       0x04
-//         /* "source":1135:1138   */
-//       0x67
-//         /* "source":1128:1142   */
-//       sstore
-//         /* "source":1114:1152   */
-//       stop
-// }
-//
-// sub_5: assembly {
-//         /* "source":1216:1217   */
-//       0x05
-//         /* "source":1211:1214   */
-//       0x68
-//         /* "source":1204:1218   */
-//       sstore
-//         /* "source":1190:1228   */
-//       stop
-// }
-//
-// sub_6: assembly {
-//         /* "source":1292:1293   */
-//       0x06
-//         /* "source":1287:1290   */
-//       0x69
-//         /* "source":1280:1294   */
-//       sstore
-//         /* "source":1266:1304   */
-//       stop
-// }
-//
-// sub_7: assembly {
-//         /* "source":1368:1369   */
-//       0x07
-//         /* "source":1363:1366   */
-//       0x6a
-//         /* "source":1356:1370   */
-//       sstore
-//         /* "source":1342:1380   */
-//       stop
-// }
-//
-// sub_8: assembly {
-//         /* "source":1444:1445   */
-//       0x08
-//         /* "source":1439:1442   */
-//       0x6b
-//         /* "source":1432:1446   */
-//       sstore
-//         /* "source":1418:1456   */
-//       stop
-// }
-//
-// sub_9: assembly {
-//         /* "source":1520:1521   */
-//       0x09
-//         /* "source":1515:1518   */
-//       0x6c
-//         /* "source":1508:1522   */
-//       sstore
-//         /* "source":1494:1532   */
-//       stop
-// }
-//
-// sub_10: assembly {
-//         /* "source":1596:1598   */
-//       0x0a
-//         /* "source":1591:1594   */
-//       0x6d
-//         /* "source":1584:1599   */
-//       sstore
-//         /* "source":1570:1609   */
-//       stop
-// }
-//
-// sub_11: assembly {
-//         /* "source":1673:1675   */
-//       0x0b
-//         /* "source":1668:1671   */
-//       0x6e
-//         /* "source":1661:1676   */
-//       sstore
-//         /* "source":1647:1686   */
-//       stop
-// }
-//
-// sub_12: assembly {
-//         /* "source":1750:1752   */
-//       0x0c
-//         /* "source":1745:1748   */
-//       0x6f
-//         /* "source":1738:1753   */
-//       sstore
-//         /* "source":1724:1763   */
-//       stop
-// }
-//
-// sub_13: assembly {
-//         /* "source":1827:1829   */
-//       0x0d
-//         /* "source":1822:1825   */
-//       0x70
-//         /* "source":1815:1830   */
-//       sstore
-//         /* "source":1801:1840   */
-//       stop
-// }
-//
-// sub_14: assembly {
-//         /* "source":1904:1906   */
-//       0x0e
-//         /* "source":1899:1902   */
-//       0x71
-//         /* "source":1892:1907   */
-//       sstore
-//         /* "source":1878:1917   */
-//       stop
-// }
-//
-// sub_15: assembly {
-//         /* "source":1981:1983   */
-//       0x0f
-//         /* "source":1976:1979   */
-//       0x72
-//         /* "source":1969:1984   */
-//       sstore
-//         /* "source":1955:1994   */
-//       stop
-// }
-//
-// sub_16: assembly {
-//         /* "source":2059:2061   */
-//       0x10
-//         /* "source":2054:2057   */
-//       0x73
-//         /* "source":2047:2062   */
-//       sstore
-//         /* "source":2087:2104   */
-//       dataSize(sub_0)
-//         /* "source":2082:2085   */
-//       0xc9
-//         /* "source":2075:2105   */
-//       sstore
-//         /* "source":2033:2115   */
-//       stop
-//     stop
-//
-//     sub_0: assembly {
-//             /* "source":2188:2190   */
-//           0x10
-//             /* "source":2183:2186   */
-//           0x012c
-//             /* "source":2176:2191   */
-//           sstore
-//             /* "source":2158:2205   */
-//           stop
-//     }
-// }
-// Bytecode: 61005c5f55600b600155600660025560066003556006600455600660055560066006556006600755600660085560066009556006600a556006600b556006600c556006600d556006600e556006600f556006601055600c60115500fe
-// Opcodes: PUSH2 0x5C PUSH0 SSTORE PUSH1 0xB PUSH1 0x1 SSTORE PUSH1 0x6 PUSH1 0x2 SSTORE PUSH1 0x6 PUSH1 0x3 SSTORE PUSH1 0x6 PUSH1 0x4 SSTORE PUSH1 0x6 PUSH1 0x5 SSTORE PUSH1 0x6 PUSH1 0x6 SSTORE PUSH1 0x6 PUSH1 0x7 SSTORE PUSH1 0x6 PUSH1 0x8 SSTORE PUSH1 0x6 PUSH1 0x9 SSTORE PUSH1 0x6 PUSH1 0xA SSTORE PUSH1 0x6 PUSH1 0xB SSTORE PUSH1 0x6 PUSH1 0xC SSTORE PUSH1 0x6 PUSH1 0xD SSTORE PUSH1 0x6 PUSH1 0xE SSTORE PUSH1 0x6 PUSH1 0xF SSTORE PUSH1 0x6 PUSH1 0x10 SSTORE PUSH1 0xC PUSH1 0x11 SSTORE STOP INVALID
-// SourceMappings: 45:16:0:-:0;42:1;35:27;81:13;78:1;71:24;114:13;111:1;104:24;147:13;144:1;137:24;180:13;177:1;170:24;213:13;210:1;203:24;246:13;243:1;236:24;279:13;276:1;269:24;312:13;309:1;302:24;345:13;342:1;335:24;379:13;375:2;368:25;413:13;409:2;402:25;447:13;443:2;436:25;481:13;477:2;470:25;515:13;511:2;504:25;549:13;545:2;538:25;583:13;579:2;572:25;617:14;613:2;606:26;25:613
diff --git a/test/libyul/objectCompiler/metadata.yul b/test/libyul/objectCompiler/metadata.yul
deleted file mode 100644
index 335522d04d2b..000000000000
--- a/test/libyul/objectCompiler/metadata.yul
+++ /dev/null
@@ -1,62 +0,0 @@
-object "A" {
-  code {
-    let x := datasize("x")
-    let c := datasize("C")
-    sstore(0, x)
-    sstore(32, c)
-  }
-
-  object "B" {
-    code {
-      let o := dataoffset("other")
-      sstore(0, o)
-    }
-    data ".metadata" "M1"
-    data "other" "Hello, World2!"
-  }
-
-  data "C" "ABC"
-  data ".metadata" "M2"
-  data "x" "Hello, World2!"
-}
-// ----
-// Assembly:
-//     /* "source":35:48   */
-//   0x0e
-//     /* "source":62:75   */
-//   0x03
-//     /* "source":80:92   */
-//   swap1
-//     /* "source":87:88   */
-//   0x00
-//     /* "source":80:92   */
-//   sstore
-//     /* "source":104:106   */
-//   0x20
-//     /* "source":97:110   */
-//   sstore
-//     /* "source":20:114   */
-//   stop
-// stop
-// data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336 48656c6c6f2c20576f726c643221
-// data_e1629b9dda060bb30c7908346f6af189c16773fa148d3366701fbaa35d54f3c8 414243
-//
-// sub_0: assembly {
-//         /* "source":157:176   */
-//       data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336
-//         /* "source":190:191   */
-//       0x00
-//         /* "source":183:195   */
-//       sstore
-//         /* "source":140:201   */
-//       stop
-//     stop
-//     data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336 48656c6c6f2c20576f726c643221
-//
-//     auxdata: 0x4d31
-// }
-//
-// auxdata: 0x4d32
-// Bytecode: 600e6003905f5560205500fe4d32
-// Opcodes: PUSH1 0xE PUSH1 0x3 SWAP1 PUSH0 SSTORE PUSH1 0x20 SSTORE STOP INVALID 0x4D ORIGIN
-// SourceMappings: 35:13:0:-:0;62;80:12;87:1;80:12;104:2;97:13;20:94
diff --git a/test/libyul/objectCompiler/namedObject.yul b/test/libyul/objectCompiler/namedObject.yul
deleted file mode 100644
index d55c3ca25335..000000000000
--- a/test/libyul/objectCompiler/namedObject.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-object "a" {
-  code {}
-}
-// ----
-// Assembly:
-//     /* "source":20:22   */
-//   stop
-// Bytecode: 00
-// Opcodes: STOP
-// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/objectCompiler/namedObjectCode.yul b/test/libyul/objectCompiler/namedObjectCode.yul
deleted file mode 100644
index 5936aa744337..000000000000
--- a/test/libyul/objectCompiler/namedObjectCode.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-object "a" {
-  code { sstore(0, 1) }
-}
-// ----
-// Assembly:
-//     /* "source":32:33   */
-//   0x01
-//     /* "source":29:30   */
-//   0x00
-//     /* "source":22:34   */
-//   sstore
-//     /* "source":20:36   */
-//   stop
-// Bytecode: 60015f5500
-// Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP
-// SourceMappings: 32:1:0:-:0;29;22:12;20:16
diff --git a/test/libyul/objectCompiler/nested_optimizer.yul b/test/libyul/objectCompiler/nested_optimizer.yul
deleted file mode 100644
index cde1210ff885..000000000000
--- a/test/libyul/objectCompiler/nested_optimizer.yul
+++ /dev/null
@@ -1,45 +0,0 @@
-object "a" {
-  code {
-    let x := calldataload(0)
-    let y := calldataload(0)
-    let z := sub(y, x)
-    sstore(add(x, 0), z)
-  }
-  object "sub" {
-    code {
-      let x := calldataload(0)
-      let y := calldataload(0)
-      let z := sub(y, x)
-      sstore(add(x, 0), z)
-    }
-  }
-}
-// ====
-// optimizationPreset: full
-// ----
-// Assembly:
-//     /* "source":48:49   */
-//   0x00
-//     /* "source":35:50   */
-//   dup1
-//   calldataload
-//     /* "source":107:127   */
-//   sstore
-//     /* "source":20:131   */
-//   stop
-// stop
-//
-// sub_0: assembly {
-//         /* "source":188:189   */
-//       0x00
-//         /* "source":175:190   */
-//       dup1
-//       calldataload
-//         /* "source":253:273   */
-//       sstore
-//         /* "source":158:279   */
-//       stop
-// }
-// Bytecode: 5f80355500fe
-// Opcodes: PUSH0 DUP1 CALLDATALOAD SSTORE STOP INVALID
-// SourceMappings: 48:1:0:-:0;35:15;;107:20;20:111
diff --git a/test/libyul/objectCompiler/simple.yul b/test/libyul/objectCompiler/simple.yul
deleted file mode 100644
index b84c49a5a43d..000000000000
--- a/test/libyul/objectCompiler/simple.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  sstore(0, 1)
-}
-// ----
-// Assembly:
-//     /* "source":14:15   */
-//   0x01
-//     /* "source":11:12   */
-//   0x00
-//     /* "source":4:16   */
-//   sstore
-//     /* "source":0:18   */
-//   stop
-// Bytecode: 60015f5500
-// Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP
-// SourceMappings: 14:1:0:-:0;11;4:12;0:18
diff --git a/test/libyul/objectCompiler/simple_optimizer.yul b/test/libyul/objectCompiler/simple_optimizer.yul
deleted file mode 100644
index 3ce4b7a4bb41..000000000000
--- a/test/libyul/objectCompiler/simple_optimizer.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  let x := calldataload(0)
-  let y := calldataload(0)
-  let z := sub(y, x)
-  sstore(add(x, 0), z)
-}
-// ====
-// optimizationPreset: full
-// ----
-// Assembly:
-//     /* "source":26:27   */
-//   0x00
-//     /* "source":13:28   */
-//   dup1
-//   calldataload
-//     /* "source":79:99   */
-//   sstore
-//     /* "source":0:101   */
-//   stop
-// Bytecode: 5f80355500
-// Opcodes: PUSH0 DUP1 CALLDATALOAD SSTORE STOP
-// SourceMappings: 26:1:0:-:0;13:15;;79:20;0:101
diff --git a/test/libyul/objectCompiler/smoke.yul b/test/libyul/objectCompiler/smoke.yul
deleted file mode 100644
index 3f1079aa7090..000000000000
--- a/test/libyul/objectCompiler/smoke.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-}
-// ----
-// Assembly:
-//     /* "source":0:3   */
-//   stop
-// Bytecode: 00
-// Opcodes: STOP
-// SourceMappings: 0:3:0:-:0
diff --git a/test/libyul/objectCompiler/sourceLocations.yul b/test/libyul/objectCompiler/sourceLocations.yul
deleted file mode 100644
index 1c84773249d7..000000000000
--- a/test/libyul/objectCompiler/sourceLocations.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-// something else
-/*-- another unrelated comment --*/
-/// @use-src 3: "abc.sol" , 2: "def.sol"
-object "a" {
-  code {
-    /// @src 3:0:2
-    datacopy(0, dataoffset("sub"), datasize("sub"))
-    return(0,
-      /** @src 2:5:6 */
-      datasize("sub")
-    )
-  }
-  /// @use-src 3: "abc.sol" , 2: "def.sol"
-  object "sub" {
-    code {
-      /// @src 2:70:72
-      sstore(0, dataoffset("sub"))
-      /**
-       * @something else
-       * @src 3:2:5
-       */
-      mstore(
-        0,
-        datasize("data1")
-        /// @src 3:90:2
-      )
-    }
-    data "data1" "Hello, World!"
-  }
-}
-// ----
-// Assembly:
-//     /* "abc.sol":0:2   */
-//   codecopy(0x00, dataOffset(sub_0), dataSize(sub_0))
-//     /* "def.sol":5:6   */
-//   dataSize(sub_0)
-//     /* "abc.sol":0:2   */
-//   0x00
-//   return
-// stop
-//
-// sub_0: assembly {
-//         /* "def.sol":70:72   */
-//       0x00
-//       dup1
-//       sstore
-//         /* "abc.sol":2:5   */
-//       mstore(0x00, 0x0d)
-//       stop
-//     stop
-//     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// }
-// Bytecode: 6009600b5f3960095ff3fe5f8055600d5f5200fe
-// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
-// SourceMappings: 0:2::-:0;;;;5:1;0:2;
diff --git a/test/libyul/objectCompiler/subObject.yul b/test/libyul/objectCompiler/subObject.yul
deleted file mode 100644
index 46fc03f10ea8..000000000000
--- a/test/libyul/objectCompiler/subObject.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-object "a" {
-  code {}
-  // Unreferenced data is not added to the assembled bytecode.
-  data "str" "Hello, World!"
-  object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Assembly:
-//     /* "source":20:22   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-//
-// sub_0: assembly {
-//         /* "source":149:150   */
-//       0x01
-//         /* "source":146:147   */
-//       0x00
-//         /* "source":139:151   */
-//       sstore
-//         /* "source":137:153   */
-//       stop
-// }
-// Bytecode: 00fe
-// Opcodes: STOP INVALID
-// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/objectCompiler/subObjectAccess.yul b/test/libyul/objectCompiler/subObjectAccess.yul
deleted file mode 100644
index 291749220a45..000000000000
--- a/test/libyul/objectCompiler/subObjectAccess.yul
+++ /dev/null
@@ -1,230 +0,0 @@
-object "A" {
-  code {
-    let a_o := dataoffset("A")
-    let a_s := datasize("A")
-    let b_o := dataoffset("B")
-    let b_s := datasize("B")
-    let bc_o := dataoffset("B.C")
-    let bc_s := datasize("B.C")
-    let be_o := dataoffset("B.E")
-    let be_s := datasize("B.E")
-    let bcd_o := dataoffset("B.C.D")
-    let bcd_s := datasize("B.C.D")
-
-    sstore(0, a_o)
-    sstore(32, a_s)
-    sstore(64, b_o)
-    sstore(96, b_s)
-    sstore(128, bc_o)
-    sstore(160, bc_s)
-    sstore(192, be_o)
-    sstore(224, be_s)
-    sstore(256, bcd_o)
-    sstore(288, bcd_s)
-    return(0, 320)
-  }
-
-  data "data1" "Hello, World!"
-
-  object "B" {
-    code {
-      let c_o := dataoffset("C")
-      let c_s := datasize("C")
-      let e_o := dataoffset("E")
-      let e_s := datasize("E")
-      let cd_o := dataoffset("C.D")
-      let cd_s := datasize("C.D")
-
-      sstore(0, c_o)
-      sstore(32, c_s)
-      sstore(64, e_o)
-      sstore(96, e_s)
-      sstore(128, cd_o)
-      sstore(160, cd_s)
-      return(0, 192)
-    }
-    object "C" {
-      code {
-        let d_o := dataoffset("D")
-        let d_s := datasize("D")
-
-        sstore(0, d_o)
-        sstore(32, d_s)
-        return(0, 64)
-      }
-      object "D" {
-        code {
-          invalid()
-        }
-      }
-    }
-    object "E" {
-      code {
-        invalid()
-      }
-    }
-  }
-}
-// ----
-// Assembly:
-//     /* "source":37:52   */
-//   0x00
-//     /* "source":68:81   */
-//   bytecodeSize
-//     /* "source":97:112   */
-//   dataOffset(sub_0)
-//     /* "source":128:141   */
-//   dataSize(sub_0)
-//     /* "source":158:175   */
-//   dataOffset(sub_0.sub_0)
-//     /* "source":192:207   */
-//   dataSize(sub_0.sub_0)
-//     /* "source":224:241   */
-//   swap1
-//   dataOffset(sub_0.sub_1)
-//     /* "source":258:273   */
-//   swap3
-//   dataSize(sub_0.sub_1)
-//     /* "source":291:310   */
-//   swap5
-//   dataOffset(sub_0.sub_0.sub_0)
-//     /* "source":328:345   */
-//   swap7
-//   dataSize(sub_0.sub_0.sub_0)
-//     /* "source":351:365   */
-//   swap9
-//     /* "source":358:359   */
-//   0x00
-//     /* "source":351:365   */
-//   sstore
-//     /* "source":377:379   */
-//   0x20
-//     /* "source":370:385   */
-//   sstore
-//     /* "source":397:399   */
-//   0x40
-//     /* "source":390:405   */
-//   sstore
-//     /* "source":417:419   */
-//   0x60
-//     /* "source":410:425   */
-//   sstore
-//     /* "source":437:440   */
-//   0x80
-//     /* "source":430:447   */
-//   sstore
-//     /* "source":459:462   */
-//   0xa0
-//     /* "source":452:469   */
-//   sstore
-//     /* "source":481:484   */
-//   0xc0
-//     /* "source":474:491   */
-//   sstore
-//     /* "source":503:506   */
-//   0xe0
-//     /* "source":496:513   */
-//   sstore
-//     /* "source":525:528   */
-//   0x0100
-//     /* "source":518:536   */
-//   sstore
-//     /* "source":548:551   */
-//   0x0120
-//     /* "source":541:559   */
-//   sstore
-//     /* "source":574:577   */
-//   0x0140
-//     /* "source":571:572   */
-//   0x00
-//     /* "source":564:578   */
-//   return
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-//
-// sub_0: assembly {
-//         /* "source":659:674   */
-//       dataOffset(sub_0)
-//         /* "source":692:705   */
-//       dataSize(sub_0)
-//         /* "source":723:738   */
-//       dataOffset(sub_1)
-//         /* "source":756:769   */
-//       dataSize(sub_1)
-//         /* "source":788:805   */
-//       swap1
-//       dataOffset(sub_0.sub_0)
-//         /* "source":824:839   */
-//       swap3
-//       dataSize(sub_0.sub_0)
-//         /* "source":847:861   */
-//       swap5
-//         /* "source":854:855   */
-//       0x00
-//         /* "source":847:861   */
-//       sstore
-//         /* "source":875:877   */
-//       0x20
-//         /* "source":868:883   */
-//       sstore
-//         /* "source":897:899   */
-//       0x40
-//         /* "source":890:905   */
-//       sstore
-//         /* "source":919:921   */
-//       0x60
-//         /* "source":912:927   */
-//       sstore
-//         /* "source":941:944   */
-//       0x80
-//         /* "source":934:951   */
-//       sstore
-//         /* "source":965:968   */
-//       0xa0
-//         /* "source":958:975   */
-//       sstore
-//         /* "source":992:995   */
-//       0xc0
-//         /* "source":989:990   */
-//       0x00
-//         /* "source":982:996   */
-//       return
-//     stop
-//
-//     sub_0: assembly {
-//             /* "source":1052:1067   */
-//           dataOffset(sub_0)
-//             /* "source":1087:1100   */
-//           dataSize(sub_0)
-//             /* "source":1110:1124   */
-//           swap1
-//             /* "source":1117:1118   */
-//           0x00
-//             /* "source":1110:1124   */
-//           sstore
-//             /* "source":1140:1142   */
-//           0x20
-//             /* "source":1133:1148   */
-//           sstore
-//             /* "source":1167:1169   */
-//           0x40
-//             /* "source":1164:1165   */
-//           0x00
-//             /* "source":1157:1170   */
-//           return
-//         stop
-//
-//         sub_0: assembly {
-//                 /* "source":1223:1232   */
-//               invalid
-//         }
-//     }
-//
-//     sub_1: assembly {
-//             /* "source":1295:1304   */
-//           invalid
-//     }
-// }
-// Bytecode: 5f6084603d603660746010906073926001946073966001985f5560205560405560605560805560a05560c05560e05561010055610120556101405ff3fe6025601060356001906035926001945f5560205560405560605560805560a05560c05ff3fe600f6001905f5560205560405ff3fefefefe600f6001905f5560205560405ff3fefe
-// Opcodes: PUSH0 PUSH1 0x84 PUSH1 0x3D PUSH1 0x36 PUSH1 0x74 PUSH1 0x10 SWAP1 PUSH1 0x73 SWAP3 PUSH1 0x1 SWAP5 PUSH1 0x73 SWAP7 PUSH1 0x1 SWAP9 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 SSTORE PUSH1 0x60 SSTORE PUSH1 0x80 SSTORE PUSH1 0xA0 SSTORE PUSH1 0xC0 SSTORE PUSH1 0xE0 SSTORE PUSH2 0x100 SSTORE PUSH2 0x120 SSTORE PUSH2 0x140 PUSH0 RETURN INVALID PUSH1 0x25 PUSH1 0x10 PUSH1 0x35 PUSH1 0x1 SWAP1 PUSH1 0x35 SWAP3 PUSH1 0x1 SWAP5 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 SSTORE PUSH1 0x60 SSTORE PUSH1 0x80 SSTORE PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH0 RETURN INVALID PUSH1 0xF PUSH1 0x1 SWAP1 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID INVALID INVALID PUSH1 0xF PUSH1 0x1 SWAP1 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID
-// SourceMappings: 37:15:0:-:0;68:13;97:15;128:13;158:17;192:15;224:17;;258:15;;291:19;;328:17;;351:14;358:1;351:14;377:2;370:15;397:2;390:15;417:2;410:15;437:3;430:17;459:3;452:17;481:3;474:17;503:3;496:17;525:3;518:18;548:3;541:18;574:3;571:1;564:14
diff --git a/test/libyul/objectCompiler/subSubObject.yul b/test/libyul/objectCompiler/subSubObject.yul
deleted file mode 100644
index a9936d58fbdb..000000000000
--- a/test/libyul/objectCompiler/subSubObject.yul
+++ /dev/null
@@ -1,46 +0,0 @@
-object "a" {
-  code {}
-  // Unreferenced data is not added to the assembled bytecode.
-  data "str" "Hello, World!"
-  object "sub" {
-    code { sstore(0, 1) }
-    object "subsub" {
-      code { sstore(2, 3) }
-      data "str" hex"123456"
-    }
-  }
-}
-// ----
-// Assembly:
-//     /* "source":20:22   */
-//   stop
-// stop
-// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-//
-// sub_0: assembly {
-//         /* "source":153:154   */
-//       0x01
-//         /* "source":150:151   */
-//       0x00
-//         /* "source":143:155   */
-//       sstore
-//         /* "source":141:157   */
-//       stop
-//     stop
-//
-//     sub_0: assembly {
-//             /* "source":203:204   */
-//           0x03
-//             /* "source":200:201   */
-//           0x02
-//             /* "source":193:205   */
-//           sstore
-//             /* "source":191:207   */
-//           stop
-//         stop
-//         data_6adf031833174bbe4c85eafe59ddb54e6584648c2c962c6f94791ab49caa0ad4 123456
-//     }
-// }
-// Bytecode: 00fe
-// Opcodes: STOP INVALID
-// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/yulControlFlowGraph/ambiguous_names.yul b/test/libyul/yulControlFlowGraph/ambiguous_names.yul
deleted file mode 100644
index fabeda45b80f..000000000000
--- a/test/libyul/yulControlFlowGraph/ambiguous_names.yul
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  a()
-  c()
-  function a() {
-    let x := 42
-    sstore(x,x)
-    b()
-    function b() {}
-  }
-  function c() {
-    let x := 21
-    mstore(x,x)
-    b()
-    function b() {}
-  }
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// a: [ RET[a] ] => [ ]\l\
-// c: [ RET[c] ] => [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// FunctionEntry_a_1 [label="function a()"];
-// FunctionEntry_a_1 -> Block1;
-// Block1 [label="\
-// Assignment(x): [ 0x2a ] => [ x ]\l\
-// sstore: [ x x ] => [ ]\l\
-// b: [ RET[b] ] => [ ]\l\
-// "];
-// Block1Exit [label="FunctionReturn[a]"];
-// Block1 -> Block1Exit;
-//
-// FunctionEntry_b_2 [label="function b()"];
-// FunctionEntry_b_2 -> Block2;
-// Block2 [label="\
-// "];
-// Block2Exit [label="FunctionReturn[b]"];
-// Block2 -> Block2Exit;
-//
-// FunctionEntry_c_3 [label="function c()"];
-// FunctionEntry_c_3 -> Block3;
-// Block3 [label="\
-// Assignment(x): [ 0x15 ] => [ x ]\l\
-// mstore: [ x x ] => [ ]\l\
-// b: [ RET[b] ] => [ ]\l\
-// "];
-// Block3Exit [label="FunctionReturn[c]"];
-// Block3 -> Block3Exit;
-//
-// FunctionEntry_b_4 [label="function b()"];
-// FunctionEntry_b_4 -> Block4;
-// Block4 [label="\
-// "];
-// Block4Exit [label="FunctionReturn[b]"];
-// Block4 -> Block4Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/break.yul b/test/libyul/yulControlFlowGraph/break.yul
deleted file mode 100644
index ceca7cce0205..000000000000
--- a/test/libyul/yulControlFlowGraph/break.yul
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    sstore(0x01, 0x0101)
-    for { sstore(0x02, 0x0202) } sload(0x03) { sstore(0x04, 0x0404) } {
-        sstore(0x05, 0x0505)
-        if sload(0x06) { sstore(0x07,0x0707) break }
-        sstore(0x08, 0x0808)
-        if sload(0x09) { sstore(0x0A,0x0A0A) continue }
-        sstore(0x0B, 0x0B0B)
-    }
-    sstore(0x0C, 0x0C0C)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// sstore: [ 0x0101 0x01 ] => [ ]\l\
-// sstore: [ 0x0202 0x02 ] => [ ]\l\
-// "];
-// Block0 -> Block0Exit [arrowhead=none];
-// Block0Exit [label="Jump" shape=oval];
-// Block0Exit -> Block1;
-//
-// Block1 [label="\
-// sload: [ 0x03 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block2;
-// Block1Exit:1 -> Block3;
-//
-// Block2 [label="\
-// sstore: [ 0x0c0c 0x0c ] => [ ]\l\
-// "];
-// Block2Exit [label="MainExit"];
-// Block2 -> Block2Exit;
-//
-// Block3 [label="\
-// sstore: [ 0x0505 0x05 ] => [ ]\l\
-// sload: [ 0x06 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block3 -> Block3Exit;
-// Block3Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block3Exit:0 -> Block4;
-// Block3Exit:1 -> Block5;
-//
-// Block4 [label="\
-// sstore: [ 0x0808 0x08 ] => [ ]\l\
-// sload: [ 0x09 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block4 -> Block4Exit;
-// Block4Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block4Exit:0 -> Block6;
-// Block4Exit:1 -> Block7;
-//
-// Block5 [label="\
-// sstore: [ 0x0707 0x07 ] => [ ]\l\
-// "];
-// Block5 -> Block5Exit [arrowhead=none];
-// Block5Exit [label="Jump" shape=oval];
-// Block5Exit -> Block2;
-//
-// Block6 [label="\
-// sstore: [ 0x0b0b 0x0b ] => [ ]\l\
-// "];
-// Block6 -> Block6Exit [arrowhead=none];
-// Block6Exit [label="Jump" shape=oval];
-// Block6Exit -> Block8;
-//
-// Block7 [label="\
-// sstore: [ 0x0a0a 0x0a ] => [ ]\l\
-// "];
-// Block7 -> Block7Exit [arrowhead=none];
-// Block7Exit [label="Jump" shape=oval];
-// Block7Exit -> Block8;
-//
-// Block8 [label="\
-// sstore: [ 0x0404 0x04 ] => [ ]\l\
-// "];
-// Block8 -> Block8Exit [arrowhead=none];
-// Block8Exit [label="BackwardsJump" shape=oval];
-// Block8Exit -> Block1;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/complex.yul b/test/libyul/yulControlFlowGraph/complex.yul
deleted file mode 100644
index 4001a93092e1..000000000000
--- a/test/libyul/yulControlFlowGraph/complex.yul
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-    function f(a, b) -> c {
-        for { let x := 42 } lt(x, a) {
-            x := add(x, 1)
-            if calldataload(x)
-            {
-                sstore(0, x)
-                leave
-                sstore(0x01, 0x0101)
-            }
-            sstore(0xFF, 0xFFFF)
-        }
-        {
-            switch mload(x)
-            case 0 {
-                sstore(0x02, 0x0202)
-                break
-                sstore(0x03, 0x0303)
-            }
-            case 1 {
-                sstore(0x04, 0x0404)
-                leave
-                sstore(0x05, 0x0505)
-            }
-            case 2 {
-                sstore(0x06, 0x0606)
-                revert(0, 0)
-                sstore(0x07, 0x0707)
-            }
-            case 3 {
-                sstore(0x08, 0x0808)
-            }
-            default {
-                if mload(b) {
-                    return(0, 0)
-                    sstore(0x09, 0x0909)
-                }
-                    sstore(0x0A, 0x0A0A)
-            }
-            sstore(0x0B, 0x0B0B)
-        }
-        sstore(0x0C, 0x0C0C)
-    }
-    pop(f(1,2))
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// f: [ RET[f] 0x02 0x01 ] => [ TMP[f, 0] ]\l\
-// pop: [ TMP[f, 0] ] => [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// FunctionEntry_f_1 [label="function f(a, b) -> c"];
-// FunctionEntry_f_1 -> Block1;
-// Block1 [label="\
-// Assignment(x): [ 0x2a ] => [ x ]\l\
-// "];
-// Block1 -> Block1Exit [arrowhead=none];
-// Block1Exit [label="Jump" shape=oval];
-// Block1Exit -> Block2;
-//
-// Block2 [label="\
-// lt: [ a x ] => [ TMP[lt, 0] ]\l\
-// "];
-// Block2 -> Block2Exit;
-// Block2Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block2Exit:0 -> Block3;
-// Block2Exit:1 -> Block4;
-//
-// Block3 [label="\
-// sstore: [ 0x0c0c 0x0c ] => [ ]\l\
-// "];
-// Block3Exit [label="FunctionReturn[f]"];
-// Block3 -> Block3Exit;
-//
-// Block4 [label="\
-// mload: [ x ] => [ TMP[mload, 0] ]\l\
-// Assignment(GHOST[0]): [ TMP[mload, 0] ] => [ GHOST[0] ]\l\
-// eq: [ GHOST[0] 0x00 ] => [ TMP[eq, 0] ]\l\
-// "];
-// Block4 -> Block4Exit;
-// Block4Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block4Exit:0 -> Block5;
-// Block4Exit:1 -> Block6;
-//
-// Block5 [label="\
-// eq: [ GHOST[0] 0x01 ] => [ TMP[eq, 0] ]\l\
-// "];
-// Block5 -> Block5Exit;
-// Block5Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block5Exit:0 -> Block7;
-// Block5Exit:1 -> Block8;
-//
-// Block6 [label="\
-// sstore: [ 0x0202 0x02 ] => [ ]\l\
-// "];
-// Block6 -> Block6Exit [arrowhead=none];
-// Block6Exit [label="Jump" shape=oval];
-// Block6Exit -> Block3;
-//
-// Block7 [label="\
-// eq: [ GHOST[0] 0x02 ] => [ TMP[eq, 0] ]\l\
-// "];
-// Block7 -> Block7Exit;
-// Block7Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block7Exit:0 -> Block9;
-// Block7Exit:1 -> Block10;
-//
-// Block8 [label="\
-// sstore: [ 0x0404 0x04 ] => [ ]\l\
-// "];
-// Block8Exit [label="FunctionReturn[f]"];
-// Block8 -> Block8Exit;
-//
-// Block9 [label="\
-// eq: [ GHOST[0] 0x03 ] => [ TMP[eq, 0] ]\l\
-// "];
-// Block9 -> Block9Exit;
-// Block9Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block9Exit:0 -> Block11;
-// Block9Exit:1 -> Block12;
-//
-// Block10 [label="\
-// sstore: [ 0x0606 0x06 ] => [ ]\l\
-// revert: [ 0x00 0x00 ] => [ ]\l\
-// "];
-// Block10Exit [label="Terminated"];
-// Block10 -> Block10Exit;
-//
-// Block11 [label="\
-// mload: [ b ] => [ TMP[mload, 0] ]\l\
-// "];
-// Block11 -> Block11Exit;
-// Block11Exit [label="{ TMP[mload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block11Exit:0 -> Block13;
-// Block11Exit:1 -> Block14;
-//
-// Block12 [label="\
-// sstore: [ 0x0808 0x08 ] => [ ]\l\
-// "];
-// Block12 -> Block12Exit [arrowhead=none];
-// Block12Exit [label="Jump" shape=oval];
-// Block12Exit -> Block15;
-//
-// Block13 [label="\
-// sstore: [ 0x0a0a 0x0a ] => [ ]\l\
-// "];
-// Block13 -> Block13Exit [arrowhead=none];
-// Block13Exit [label="Jump" shape=oval];
-// Block13Exit -> Block15;
-//
-// Block14 [label="\
-// return: [ 0x00 0x00 ] => [ ]\l\
-// "];
-// Block14Exit [label="Terminated"];
-// Block14 -> Block14Exit;
-//
-// Block15 [label="\
-// sstore: [ 0x0b0b 0x0b ] => [ ]\l\
-// "];
-// Block15 -> Block15Exit [arrowhead=none];
-// Block15Exit [label="Jump" shape=oval];
-// Block15Exit -> Block16;
-//
-// Block16 [label="\
-// add: [ 0x01 x ] => [ TMP[add, 0] ]\l\
-// Assignment(x): [ TMP[add, 0] ] => [ x ]\l\
-// calldataload: [ x ] => [ TMP[calldataload, 0] ]\l\
-// "];
-// Block16 -> Block16Exit;
-// Block16Exit [label="{ TMP[calldataload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block16Exit:0 -> Block17;
-// Block16Exit:1 -> Block18;
-//
-// Block17 [label="\
-// sstore: [ 0xffff 0xff ] => [ ]\l\
-// "];
-// Block17 -> Block17Exit [arrowhead=none];
-// Block17Exit [label="BackwardsJump" shape=oval];
-// Block17Exit -> Block2;
-//
-// Block18 [label="\
-// sstore: [ x 0x00 ] => [ ]\l\
-// "];
-// Block18Exit [label="FunctionReturn[f]"];
-// Block18 -> Block18Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/for.yul b/test/libyul/yulControlFlowGraph/for.yul
deleted file mode 100644
index 52658a1285fe..000000000000
--- a/test/libyul/yulControlFlowGraph/for.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    sstore(0x01, 0x0101)
-    for { sstore(0x02, 0x0202) } sload(0x03) { sstore(0x04, 0x0404) } {
-        sstore(0x05, 0x0505)
-    }
-    sstore(0x06, 0x0506)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// sstore: [ 0x0101 0x01 ] => [ ]\l\
-// sstore: [ 0x0202 0x02 ] => [ ]\l\
-// "];
-// Block0 -> Block0Exit [arrowhead=none];
-// Block0Exit [label="Jump" shape=oval];
-// Block0Exit -> Block1;
-//
-// Block1 [label="\
-// sload: [ 0x03 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block2;
-// Block1Exit:1 -> Block3;
-//
-// Block2 [label="\
-// sstore: [ 0x0506 0x06 ] => [ ]\l\
-// "];
-// Block2Exit [label="MainExit"];
-// Block2 -> Block2Exit;
-//
-// Block3 [label="\
-// sstore: [ 0x0505 0x05 ] => [ ]\l\
-// "];
-// Block3 -> Block3Exit [arrowhead=none];
-// Block3Exit [label="Jump" shape=oval];
-// Block3Exit -> Block4;
-//
-// Block4 [label="\
-// sstore: [ 0x0404 0x04 ] => [ ]\l\
-// "];
-// Block4 -> Block4Exit [arrowhead=none];
-// Block4Exit [label="BackwardsJump" shape=oval];
-// Block4Exit -> Block1;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/function.yul b/test/libyul/yulControlFlowGraph/function.yul
deleted file mode 100644
index 90c4b380e48c..000000000000
--- a/test/libyul/yulControlFlowGraph/function.yul
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    function f(a, b) -> r {
-        let x := add(a,b)
-        r := sub(x,a)
-    }
-    function g() {
-        sstore(0x01, 0x0101)
-    }
-    function h(x) {
-        h(f(x, 0))
-        g()
-    }
-    function i() -> v, w {
-        v := 0x0202
-        w := 0x0303
-    }
-    let x, y := i()
-    h(x)
-    h(y)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// i: [ RET[i] ] => [ TMP[i, 0] TMP[i, 1] ]\l\
-// Assignment(x, y): [ TMP[i, 0] TMP[i, 1] ] => [ x y ]\l\
-// h: [ x ] => [ ]\l\
-// "];
-// Block0Exit [label="Terminated"];
-// Block0 -> Block0Exit;
-//
-// FunctionEntry_f_1 [label="function f(a, b) -> r"];
-// FunctionEntry_f_1 -> Block1;
-// Block1 [label="\
-// add: [ b a ] => [ TMP[add, 0] ]\l\
-// Assignment(x): [ TMP[add, 0] ] => [ x ]\l\
-// sub: [ a x ] => [ TMP[sub, 0] ]\l\
-// Assignment(r): [ TMP[sub, 0] ] => [ r ]\l\
-// "];
-// Block1Exit [label="FunctionReturn[f]"];
-// Block1 -> Block1Exit;
-//
-// FunctionEntry_g_2 [label="function g()"];
-// FunctionEntry_g_2 -> Block2;
-// Block2 [label="\
-// sstore: [ 0x0101 0x01 ] => [ ]\l\
-// "];
-// Block2Exit [label="FunctionReturn[g]"];
-// Block2 -> Block2Exit;
-//
-// FunctionEntry_h_3 [label="function h(x)"];
-// FunctionEntry_h_3 -> Block3;
-// Block3 [label="\
-// f: [ RET[f] 0x00 x ] => [ TMP[f, 0] ]\l\
-// h: [ TMP[f, 0] ] => [ ]\l\
-// "];
-// Block3Exit [label="Terminated"];
-// Block3 -> Block3Exit;
-//
-// FunctionEntry_i_4 [label="function i() -> v, w"];
-// FunctionEntry_i_4 -> Block4;
-// Block4 [label="\
-// Assignment(v): [ 0x0202 ] => [ v ]\l\
-// Assignment(w): [ 0x0303 ] => [ w ]\l\
-// "];
-// Block4Exit [label="FunctionReturn[i]"];
-// Block4 -> Block4Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/if.yul b/test/libyul/yulControlFlowGraph/if.yul
deleted file mode 100644
index a313c53ee48d..000000000000
--- a/test/libyul/yulControlFlowGraph/if.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    sstore(0x01, 0x0101)
-    if calldataload(0) {
-        sstore(0x02, 0x0202)
-    }
-    sstore(0x03, 0x003)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// sstore: [ 0x0101 0x01 ] => [ ]\l\
-// calldataload: [ 0x00 ] => [ TMP[calldataload, 0] ]\l\
-// "];
-// Block0 -> Block0Exit;
-// Block0Exit [label="{ TMP[calldataload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0Exit:0 -> Block1;
-// Block0Exit:1 -> Block2;
-//
-// Block1 [label="\
-// sstore: [ 0x03 0x03 ] => [ ]\l\
-// "];
-// Block1Exit [label="MainExit"];
-// Block1 -> Block1Exit;
-//
-// Block2 [label="\
-// sstore: [ 0x0202 0x02 ] => [ ]\l\
-// "];
-// Block2 -> Block2Exit [arrowhead=none];
-// Block2Exit [label="Jump" shape=oval];
-// Block2Exit -> Block1;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/leave.yul b/test/libyul/yulControlFlowGraph/leave.yul
deleted file mode 100644
index 4d0a63af4805..000000000000
--- a/test/libyul/yulControlFlowGraph/leave.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    function f(a, b) -> c {
-        sstore(0x01, 0x0101)
-        if lt(a,b) {
-            sstore(0x02, 0x0202)
-            leave
-            sstore(0x03, 0x0303)
-        }
-        sstore(0x04, 0x0404)
-    }
-
-    pop(f(0,1))
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// f: [ RET[f] 0x01 0x00 ] => [ TMP[f, 0] ]\l\
-// pop: [ TMP[f, 0] ] => [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// FunctionEntry_f_1 [label="function f(a, b) -> c"];
-// FunctionEntry_f_1 -> Block1;
-// Block1 [label="\
-// sstore: [ 0x0101 0x01 ] => [ ]\l\
-// lt: [ b a ] => [ TMP[lt, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block2;
-// Block1Exit:1 -> Block3;
-//
-// Block2 [label="\
-// sstore: [ 0x0404 0x04 ] => [ ]\l\
-// "];
-// Block2Exit [label="FunctionReturn[f]"];
-// Block2 -> Block2Exit;
-//
-// Block3 [label="\
-// sstore: [ 0x0202 0x02 ] => [ ]\l\
-// "];
-// Block3Exit [label="FunctionReturn[f]"];
-// Block3 -> Block3Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/nested_loop_complex.yul b/test/libyul/yulControlFlowGraph/nested_loop_complex.yul
deleted file mode 100644
index ea9aedf766b1..000000000000
--- a/test/libyul/yulControlFlowGraph/nested_loop_complex.yul
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-    for { let x := 0 } lt(x, 0x0101) {
-        sstore(x, 0x0202)
-        for { let y := 0 } lt(y, 0x0303) { y := add(y, 0x0404) } {
-            sstore(y, 0x0505)
-        }
-        x := add(x, 0x0202)
-    }
-    {
-        sstore(0x0606, 0x0606)
-        if sload(0x0707) { continue }
-        sstore(0x0808, 0x0808)
-        if sload(0x0909) { break }
-        sstore(0x0A0A, 0x0B0B)
-        for { let z := 0 } lt(z, 0x0C0C) { z := add(z, 1) } {
-            sstore(0x0D0D, 0x0D0D)
-            if sload(0x0E0E) {
-                continue
-            }
-            sstore(0x0F0F, 0x0F0F)
-            if sload(0x1010) {
-                break
-            }
-            sstore(0x1111, 0x1111)
-        }
-        sstore(0x1212, 0x1212)
-    }
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// Assignment(x): [ 0x00 ] => [ x ]\l\
-// "];
-// Block0 -> Block0Exit [arrowhead=none];
-// Block0Exit [label="Jump" shape=oval];
-// Block0Exit -> Block1;
-//
-// Block1 [label="\
-// lt: [ 0x0101 x ] => [ TMP[lt, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block2;
-// Block1Exit:1 -> Block3;
-//
-// Block2 [label="\
-// "];
-// Block2Exit [label="MainExit"];
-// Block2 -> Block2Exit;
-//
-// Block3 [label="\
-// sstore: [ 0x0606 0x0606 ] => [ ]\l\
-// sload: [ 0x0707 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block3 -> Block3Exit;
-// Block3Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block3Exit:0 -> Block4;
-// Block3Exit:1 -> Block5;
-//
-// Block4 [label="\
-// sstore: [ 0x0808 0x0808 ] => [ ]\l\
-// sload: [ 0x0909 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block4 -> Block4Exit;
-// Block4Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block4Exit:0 -> Block6;
-// Block4Exit:1 -> Block7;
-//
-// Block5 [label="\
-// "];
-// Block5 -> Block5Exit [arrowhead=none];
-// Block5Exit [label="Jump" shape=oval];
-// Block5Exit -> Block8;
-//
-// Block6 [label="\
-// sstore: [ 0x0b0b 0x0a0a ] => [ ]\l\
-// Assignment(z): [ 0x00 ] => [ z ]\l\
-// "];
-// Block6 -> Block6Exit [arrowhead=none];
-// Block6Exit [label="Jump" shape=oval];
-// Block6Exit -> Block9;
-//
-// Block7 [label="\
-// "];
-// Block7 -> Block7Exit [arrowhead=none];
-// Block7Exit [label="Jump" shape=oval];
-// Block7Exit -> Block2;
-//
-// Block8 [label="\
-// sstore: [ 0x0202 x ] => [ ]\l\
-// Assignment(y): [ 0x00 ] => [ y ]\l\
-// "];
-// Block8 -> Block8Exit [arrowhead=none];
-// Block8Exit [label="Jump" shape=oval];
-// Block8Exit -> Block10;
-//
-// Block9 [label="\
-// lt: [ 0x0c0c z ] => [ TMP[lt, 0] ]\l\
-// "];
-// Block9 -> Block9Exit;
-// Block9Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block9Exit:0 -> Block11;
-// Block9Exit:1 -> Block12;
-//
-// Block10 [label="\
-// lt: [ 0x0303 y ] => [ TMP[lt, 0] ]\l\
-// "];
-// Block10 -> Block10Exit;
-// Block10Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block10Exit:0 -> Block13;
-// Block10Exit:1 -> Block14;
-//
-// Block11 [label="\
-// sstore: [ 0x1212 0x1212 ] => [ ]\l\
-// "];
-// Block11 -> Block11Exit [arrowhead=none];
-// Block11Exit [label="Jump" shape=oval];
-// Block11Exit -> Block8;
-//
-// Block12 [label="\
-// sstore: [ 0x0d0d 0x0d0d ] => [ ]\l\
-// sload: [ 0x0e0e ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block12 -> Block12Exit;
-// Block12Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block12Exit:0 -> Block15;
-// Block12Exit:1 -> Block16;
-//
-// Block13 [label="\
-// add: [ 0x0202 x ] => [ TMP[add, 0] ]\l\
-// Assignment(x): [ TMP[add, 0] ] => [ x ]\l\
-// "];
-// Block13 -> Block13Exit [arrowhead=none];
-// Block13Exit [label="BackwardsJump" shape=oval];
-// Block13Exit -> Block1;
-//
-// Block14 [label="\
-// sstore: [ 0x0505 y ] => [ ]\l\
-// "];
-// Block14 -> Block14Exit [arrowhead=none];
-// Block14Exit [label="Jump" shape=oval];
-// Block14Exit -> Block17;
-//
-// Block15 [label="\
-// sstore: [ 0x0f0f 0x0f0f ] => [ ]\l\
-// sload: [ 0x1010 ] => [ TMP[sload, 0] ]\l\
-// "];
-// Block15 -> Block15Exit;
-// Block15Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block15Exit:0 -> Block18;
-// Block15Exit:1 -> Block19;
-//
-// Block16 [label="\
-// "];
-// Block16 -> Block16Exit [arrowhead=none];
-// Block16Exit [label="Jump" shape=oval];
-// Block16Exit -> Block20;
-//
-// Block17 [label="\
-// add: [ 0x0404 y ] => [ TMP[add, 0] ]\l\
-// Assignment(y): [ TMP[add, 0] ] => [ y ]\l\
-// "];
-// Block17 -> Block17Exit [arrowhead=none];
-// Block17Exit [label="BackwardsJump" shape=oval];
-// Block17Exit -> Block10;
-//
-// Block18 [label="\
-// sstore: [ 0x1111 0x1111 ] => [ ]\l\
-// "];
-// Block18 -> Block18Exit [arrowhead=none];
-// Block18Exit [label="Jump" shape=oval];
-// Block18Exit -> Block20;
-//
-// Block19 [label="\
-// "];
-// Block19 -> Block19Exit [arrowhead=none];
-// Block19Exit [label="Jump" shape=oval];
-// Block19Exit -> Block11;
-//
-// Block20 [label="\
-// add: [ 0x01 z ] => [ TMP[add, 0] ]\l\
-// Assignment(z): [ TMP[add, 0] ] => [ z ]\l\
-// "];
-// Block20 -> Block20Exit [arrowhead=none];
-// Block20Exit [label="BackwardsJump" shape=oval];
-// Block20Exit -> Block9;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/stub.yul b/test/libyul/yulControlFlowGraph/stub.yul
deleted file mode 100644
index 4ec901619dbd..000000000000
--- a/test/libyul/yulControlFlowGraph/stub.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/switch.yul b/test/libyul/yulControlFlowGraph/switch.yul
deleted file mode 100644
index 2d6751d8a890..000000000000
--- a/test/libyul/yulControlFlowGraph/switch.yul
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    sstore(0, 0)
-    switch sload(0)
-    case 0 {
-        sstore(0x01, 0x0101)
-    }
-    case 1 {
-        sstore(0x02, 0x0101)
-    }
-    default {
-        sstore(0x03, 0x0101)
-    }
-    sstore(0x04, 0x0101)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// sstore: [ 0x00 0x00 ] => [ ]\l\
-// sload: [ 0x00 ] => [ TMP[sload, 0] ]\l\
-// Assignment(GHOST[0]): [ TMP[sload, 0] ] => [ GHOST[0] ]\l\
-// eq: [ GHOST[0] 0x00 ] => [ TMP[eq, 0] ]\l\
-// "];
-// Block0 -> Block0Exit;
-// Block0Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0Exit:0 -> Block1;
-// Block0Exit:1 -> Block2;
-//
-// Block1 [label="\
-// eq: [ GHOST[0] 0x01 ] => [ TMP[eq, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block3;
-// Block1Exit:1 -> Block4;
-//
-// Block2 [label="\
-// sstore: [ 0x0101 0x01 ] => [ ]\l\
-// "];
-// Block2 -> Block2Exit [arrowhead=none];
-// Block2Exit [label="Jump" shape=oval];
-// Block2Exit -> Block5;
-//
-// Block3 [label="\
-// sstore: [ 0x0101 0x03 ] => [ ]\l\
-// "];
-// Block3 -> Block3Exit [arrowhead=none];
-// Block3Exit [label="Jump" shape=oval];
-// Block3Exit -> Block5;
-//
-// Block4 [label="\
-// sstore: [ 0x0101 0x02 ] => [ ]\l\
-// "];
-// Block4 -> Block4Exit [arrowhead=none];
-// Block4Exit [label="Jump" shape=oval];
-// Block4Exit -> Block5;
-//
-// Block5 [label="\
-// sstore: [ 0x0101 0x04 ] => [ ]\l\
-// "];
-// Block5Exit [label="MainExit"];
-// Block5 -> Block5Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/variables.yul b/test/libyul/yulControlFlowGraph/variables.yul
deleted file mode 100644
index ecd274054f2b..000000000000
--- a/test/libyul/yulControlFlowGraph/variables.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(2)
-
-    x := calldataload(3)
-    y := calldataload(4)
-
-    sstore(x,y)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// calldataload: [ 0x00 ] => [ TMP[calldataload, 0] ]\l\
-// Assignment(x): [ TMP[calldataload, 0] ] => [ x ]\l\
-// calldataload: [ 0x02 ] => [ TMP[calldataload, 0] ]\l\
-// Assignment(y): [ TMP[calldataload, 0] ] => [ y ]\l\
-// calldataload: [ 0x03 ] => [ TMP[calldataload, 0] ]\l\
-// Assignment(x): [ TMP[calldataload, 0] ] => [ x ]\l\
-// calldataload: [ 0x04 ] => [ TMP[calldataload, 0] ]\l\
-// Assignment(y): [ TMP[calldataload, 0] ] => [ y ]\l\
-// sstore: [ y x ] => [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// }
diff --git a/test/libyul/yulControlFlowGraph/verbatim.yul b/test/libyul/yulControlFlowGraph/verbatim.yul
deleted file mode 100644
index 05a4cc0344a4..000000000000
--- a/test/libyul/yulControlFlowGraph/verbatim.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-        let a_1 := 42
-        let a_2 := 23
-        let a_3 := 1
-        let b := verbatim_10i_1o("test", a_1, a_2, a_3, 2, 3, 4, 5, 6, 7, 8)
-        sstore(b,b)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// Assignment(a_1): [ 0x2a ] => [ a_1 ]\l\
-// Assignment(a_2): [ 0x17 ] => [ a_2 ]\l\
-// Assignment(a_3): [ 0x01 ] => [ a_3 ]\l\
-// verbatim_10i_1o: [ 0x08 0x07 0x06 0x05 0x04 0x03 0x02 a_3 a_2 a_1 ] => [ TMP[verbatim_10i_1o, 0] ]\l\
-// Assignment(b): [ TMP[verbatim_10i_1o, 0] ] => [ b ]\l\
-// sstore: [ b b ] => [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// }
diff --git a/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul b/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul
deleted file mode 100644
index 483220bc1317..000000000000
--- a/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    mstore(0, 7)
-    sstore(0, mload(0))
-    mstore(sub(0, 1), sub(0, 1))
-    sstore(1, mload(sub(0, 1)))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff07
-//   FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0: 00000000000000000000000000000000000000000000000000000000000000ff
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000007
-//   0000000000000000000000000000000000000000000000000000000000000001: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libyul/yulInterpreterTests/ambiguous_vars.yul b/test/libyul/yulInterpreterTests/ambiguous_vars.yul
deleted file mode 100644
index 25e0928ae653..000000000000
--- a/test/libyul/yulInterpreterTests/ambiguous_vars.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  {
-     let a := 0x20
-     mstore(a, 2)
-  }
-  let a
-  mstore(a, 3)
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000003
-//     20: 0000000000000000000000000000000000000000000000000000000000000002
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/and_create.yul b/test/libyul/yulInterpreterTests/and_create.yul
deleted file mode 100644
index cf32c4658edb..000000000000
--- a/test/libyul/yulInterpreterTests/and_create.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let u160max := 0xffffffffffffffffffffffffffffffffffffffff
-    let a := create(0, u160max, 0)
-    let b := and(u160max, create(0, u160max, 0))
-    mstore(0, eq(a, b))
-}
-// ----
-// Trace:
-//   CREATE(0, 0, 0)
-//   CREATE(0, 0, 0)
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/and_create2.yul b/test/libyul/yulInterpreterTests/and_create2.yul
deleted file mode 100644
index 5201b0188a76..000000000000
--- a/test/libyul/yulInterpreterTests/and_create2.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let u160max := 0xffffffffffffffffffffffffffffffffffffffff
-    let a := create2(0, u160max, 0, 0)
-    let b := and(u160max, create2(0, u160max, 0, 0))
-    mstore(0, eq(a, b))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   CREATE2(0, 0, 0, 0)
-//   CREATE2(0, 0, 0, 0)
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/bounded_recursion.yul b/test/libyul/yulInterpreterTests/bounded_recursion.yul
deleted file mode 100644
index ce22638ca188..000000000000
--- a/test/libyul/yulInterpreterTests/bounded_recursion.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  function f(x) -> y {
-    if lt(x, 150) {
-      y := f(add(x, 1))
-    }
-    if eq(x, 150) {
-      y := x
-    }
-  }
-  mstore(0, f(0))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000096
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/create2.yul b/test/libyul/yulInterpreterTests/create2.yul
deleted file mode 100644
index 928a16304667..000000000000
--- a/test/libyul/yulInterpreterTests/create2.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    pop(create2(0, 0, 32, 32))
-    // This used to store 64
-    sstore(0, msize())
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   CREATE2(0, 0, 32, 32)
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000020
diff --git a/test/libyul/yulInterpreterTests/datacopy.yul b/test/libyul/yulInterpreterTests/datacopy.yul
deleted file mode 100644
index fb8998c8bc79..000000000000
--- a/test/libyul/yulInterpreterTests/datacopy.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-object "main"
-{
-    code {
-        datacopy(0, and(dataoffset("main"), 15), and(datasize("main"), 15))
-        datacopy(32, and(dataoffset("sub"), 15), and(datasize("sub"), 15))
-        sstore(0, mload(0))
-        sstore(1, mload(32))
-    }
-    object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 6465636f00000000000000000000000000000000000000000000000000000000
-//     20: 636f6465636f6465000000000000000000000000000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 6465636f00000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000001: 636f6465636f6465000000000000000000000000000000000000000000000000
diff --git a/test/libyul/yulInterpreterTests/dataoffset.yul b/test/libyul/yulInterpreterTests/dataoffset.yul
deleted file mode 100644
index 399a8c95ceb9..000000000000
--- a/test/libyul/yulInterpreterTests/dataoffset.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-object "main"
-{
-    code {
-        sstore(0, dataoffset("main"))
-        sstore(1, dataoffset("sub"))
-    }
-    object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 000000000000000000000000000000000000000000000000000000000000006e
-//   0000000000000000000000000000000000000000000000000000000000000001: 000000000000000000000000000000000000000000000000000000000000070c
diff --git a/test/libyul/yulInterpreterTests/datasize.yul b/test/libyul/yulInterpreterTests/datasize.yul
deleted file mode 100644
index 6e38e9321115..000000000000
--- a/test/libyul/yulInterpreterTests/datasize.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-object "main"
-{
-    code {
-        sstore(0, datasize("main"))
-        sstore(1, datasize("sub"))
-    }
-    object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000b64
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000109
diff --git a/test/libyul/yulInterpreterTests/difficulty.yul b/test/libyul/yulInterpreterTests/difficulty.yul
deleted file mode 100644
index 7a59bade2a47..000000000000
--- a/test/libyul/yulInterpreterTests/difficulty.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, difficulty())
-}
-// ====
-// EVMVersion: <paris
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000009999999
diff --git a/test/libyul/yulInterpreterTests/exp.yul b/test/libyul/yulInterpreterTests/exp.yul
deleted file mode 100644
index 07e7d7f7234c..000000000000
--- a/test/libyul/yulInterpreterTests/exp.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  mstore(0, exp(3,not(1)))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 8e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e39
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul b/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul
deleted file mode 100644
index c1456b00f355..000000000000
--- a/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  function f(x) -> y
-  {
-    // 32 nested additions are computed in
-    // exactly 66 expression evaluation steps
-    y := add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,x))))))))))))))))))))))))))))))))
-  }
-  mstore(0,f(0))
-}
-// ----
-// Trace:
-//   Maximum expression nesting level reached.
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul b/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul
deleted file mode 100644
index 0a347057129b..000000000000
--- a/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  function f(x) -> y
-  {
-    // 31 nested additions are computed in
-    // exactly 64 expression evaluation steps
-    y := add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,add(0x1,x)))))))))))))))))))))))))))))))
-  }
-  mstore(0,f(0))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000001f
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_call_to_self.yul b/test/libyul/yulInterpreterTests/external_call_to_self.yul
deleted file mode 100644
index ad2d2bb77f7d..000000000000
--- a/test/libyul/yulInterpreterTests/external_call_to_self.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	mstore(0x40, 0x42)
-
-	if iszero(calldatasize()) {
-		let x := call(gas(), address(), 0, 0x40, 0x20, 0x100, 0x20)
-		sstore(0x64, calldataload(0))
-		sstore(0x100, x)
-		return(0x0, 0)
-	}
-	return(0x40, 0x20)
-}
-// ====
-// simulateExternalCall: true
-// ----
-// Trace:
-//   CALL(153, 0x11111111, 0, 64, 32, 256, 32)
-//   RETURN(0, 0)
-// Memory dump:
-//     40: 0000000000000000000000000000000000000000000000000000000000000042
-//    100: 0000000000000000000000000000000000000000000000000000000000000042
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000100: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_call_unexecuted.yul b/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
deleted file mode 100644
index 5edfe600d25a..000000000000
--- a/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let x := call(gas(), 0x45, 0x5, 0, 0x20, 0x30, 0x20)
-	sstore(0x64, x)
-}
-// ----
-// Trace:
-//   CALL(153, 69, 5, 0, 32, 48, 32)
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul b/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
deleted file mode 100644
index 427d5604b36c..000000000000
--- a/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let x := callcode(gas(), 0x45, 0x5, 0, 0x20, 0x30, 0x20)
-	sstore(100, x)
-}
-// ----
-// Trace:
-//   CALLCODE(153, 69, 5, 0, 32, 48, 32)
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul b/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
deleted file mode 100644
index 661782589434..000000000000
--- a/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let x := delegatecall(gas(), 0x45, 0, 0x20, 0x30, 0x20)
-	sstore(100, x)
-}
-// ----
-// Trace:
-//   DELEGATECALL(153, 69, 0, 32, 48, 32)
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul b/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
deleted file mode 100644
index 32b50270dad6..000000000000
--- a/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	let x := staticcall(gas(), 0x45, 0, 0x20, 0x30, 0x20)
-	sstore(0x64, x)
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Trace:
-//   STATICCALL(153, 69, 0, 32, 48, 32)
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/function_calls.yul b/test/libyul/yulInterpreterTests/function_calls.yul
deleted file mode 100644
index 2abc26380aa6..000000000000
--- a/test/libyul/yulInterpreterTests/function_calls.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f(a, b) -> x, y {
-        x := add(a, b)
-        y := mul(a, b)
-    }
-    let r, t := f(6, 7)
-    sstore(r, t)
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   000000000000000000000000000000000000000000000000000000000000000d: 000000000000000000000000000000000000000000000000000000000000002a
diff --git a/test/libyul/yulInterpreterTests/function_scopes.yul b/test/libyul/yulInterpreterTests/function_scopes.yul
deleted file mode 100644
index 0150fa990b08..000000000000
--- a/test/libyul/yulInterpreterTests/function_scopes.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    f(1)
-    function f(i) {
-        if i { g(1) }
-        function g(j) {
-            if j { h() }
-            f(0)
-            function h() {
-                g(0)
-            }
-        }
-        sstore(i, add(i, 7))
-    }
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000007
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000008
diff --git a/test/libyul/yulInterpreterTests/hex_literals.yul b/test/libyul/yulInterpreterTests/hex_literals.yul
deleted file mode 100644
index 60e59b21932d..000000000000
--- a/test/libyul/yulInterpreterTests/hex_literals.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	let x := hex"112233445566778899aabbccddeeff6677889900"
-	let y := hex"1234_abcd"
-	sstore(0, x)
-	sstore(1, y)
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 112233445566778899aabbccddeeff6677889900000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000001: 1234abcd00000000000000000000000000000000000000000000000000000000
diff --git a/test/libyul/yulInterpreterTests/infinite_recursion.yul b/test/libyul/yulInterpreterTests/infinite_recursion.yul
deleted file mode 100644
index 0e3109ab5e07..000000000000
--- a/test/libyul/yulInterpreterTests/infinite_recursion.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  function f() {
-    f()
-  }
-  f()
-}
-// ----
-// Trace:
-//   Interpreter execution step limit reached.
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
deleted file mode 100644
index 45d3cc781c71..000000000000
--- a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  function f() {
-    log0(0x0, 0x0)
-    f()
-  }
-  f()
-}
-// ----
-// Trace:
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   Trace size limit reached.
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/leave.yul b/test/libyul/yulInterpreterTests/leave.yul
deleted file mode 100644
index 6f082ee33e83..000000000000
--- a/test/libyul/yulInterpreterTests/leave.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  function f() -> x, y
-  {
-    for { x := 0 } lt(x, 10) { x := add(x, 1) } {
-      if eq(x, 5) { y := 1 leave }
-    }
-    x := 9
-  }
-  {
-    let a, b := f()
-    sstore(a, b)
-  }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000005: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/leave_for_init.yul b/test/libyul/yulInterpreterTests/leave_for_init.yul
deleted file mode 100644
index cd0557e71ba1..000000000000
--- a/test/libyul/yulInterpreterTests/leave_for_init.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  function f() -> x
-  {
-    for { leave x := 2 } eq(x, 0) { } {
-    }
-  }
-  {
-    let a := f()
-    sstore(a, 7)
-  }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000007
diff --git a/test/libyul/yulInterpreterTests/long_obect_name.yul b/test/libyul/yulInterpreterTests/long_obect_name.yul
deleted file mode 100644
index 4105c6e42df4..000000000000
--- a/test/libyul/yulInterpreterTests/long_obect_name.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-object "t" {
-	code {
-		datacopy(not(datasize("object2.object3.object4.datablock")), 0, 0)
-	}
-	object "object2" {
-		code{}
-		object "object3" {
-			code{}
-			object "object4" {
-				code{}
-				data "datablock" ""
-			}
-		}
-	}
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/loop.yul b/test/libyul/yulInterpreterTests/loop.yul
deleted file mode 100644
index 08ed090c33c3..000000000000
--- a/test/libyul/yulInterpreterTests/loop.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    for { let x := 2 } lt(x, 10) { x := add(x, 1) } {
-        mstore(mul(x, 5), mul(x, 0x1000))
-    }
-}
-// ----
-// Trace:
-// Memory dump:
-//     40: 0000000000000000000000900000000000000000000000000000000000000000
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
deleted file mode 100644
index 4e431a6b182e..000000000000
--- a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  pop(byte(0, shr(0x8, call(0, 0, 0, 0, 0, 0, 0))))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   CALL(0, 0, 0, 0, 0, 0, 0)
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul b/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul
deleted file mode 100644
index b520b9181cbd..000000000000
--- a/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  function f() -> x { mstore(0, 0x1337) }
-  pop(byte(0, shr(0x8, f())))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000001337
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/prevrandao.yul b/test/libyul/yulInterpreterTests/prevrandao.yul
deleted file mode 100644
index 809506c9fe56..000000000000
--- a/test/libyul/yulInterpreterTests/prevrandao.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, prevrandao())
-}
-// ====
-// EVMVersion: >=paris
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000010000000000000001
diff --git a/test/libyul/yulInterpreterTests/recursion.yul b/test/libyul/yulInterpreterTests/recursion.yul
deleted file mode 100644
index 0d80faf30d62..000000000000
--- a/test/libyul/yulInterpreterTests/recursion.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  function fib(i) -> y {
-    y := 1
-    if gt(i, 2) {
-      y := add(fib(sub(i, 1)), fib(sub(i, 2)))
-    }
-  }
-  sstore(0, fib(8))
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000015
diff --git a/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul b/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul
deleted file mode 100644
index b3cd4b48c0e1..000000000000
--- a/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-        {
-            let a := foo_0(calldataload(0))
-            sstore(0, a)
-        }
-        function foo_0(x) -> y
-        {
-            y := 1
-            mstore8(1, 1)
-            for { } slt(1, keccak256(1, msize())) { let x_1 := foo_0(x) }
-            {
-                y := add(y, 1)
-                continue
-            }
-        }
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0001000000000000000000000000000000000000000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000002
diff --git a/test/libyul/yulInterpreterTests/self_balance.yul b/test/libyul/yulInterpreterTests/self_balance.yul
deleted file mode 100644
index 99b1f960c271..000000000000
--- a/test/libyul/yulInterpreterTests/self_balance.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  mstore(0, balance(address()))
-  mstore(0x20, selfbalance())
-  mstore(0x40, balance(div(mul(address(), 2), 2)))
-  mstore(0x60, balance(add(address(), 1)))
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000022223333
-//     20: 0000000000000000000000000000000000000000000000000000000022223333
-//     40: 0000000000000000000000000000000000000000000000000000000022223333
-//     60: 0000000000000000000000000000000000000000000000000000000022222222
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/shadowed_symbol.yul b/test/libyul/yulInterpreterTests/shadowed_symbol.yul
deleted file mode 100644
index 335f98a02c90..000000000000
--- a/test/libyul/yulInterpreterTests/shadowed_symbol.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  function f()
-  {
-    // Variable declaration does not shadow namesake function declaration
-    // because latter not visible here.
-    let shadow_id
-  }
-  {
-    // Function named `shadow_id` is in scope now.
-    f()
-    function shadow_id() {}
-  }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/side_effect_free.yul b/test/libyul/yulInterpreterTests/side_effect_free.yul
deleted file mode 100644
index 1b8107646ffc..000000000000
--- a/test/libyul/yulInterpreterTests/side_effect_free.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	// These can be removed by the optimizer and should not
-	// appear in the trace.
-	pop(gas())
-	pop(extcodesize(0))
-	pop(extcodehash(0))
-	pop(returndatasize())
-	pop(sload(0))
-	pop(msize())
-	pop(mload(0))
-	pop(sload(0))
-	pop(msize())
-	pop(keccak256(0, 10))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/simple_mstore.yul b/test/libyul/yulInterpreterTests/simple_mstore.yul
deleted file mode 100644
index 3beef347dbee..000000000000
--- a/test/libyul/yulInterpreterTests/simple_mstore.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  mstore(10, 11)
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000b00000000000000000000000000000000000000000000
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/smoke.yul b/test/libyul/yulInterpreterTests/smoke.yul
deleted file mode 100644
index f7f1a1aefb8a..000000000000
--- a/test/libyul/yulInterpreterTests/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/switch_statement.yul b/test/libyul/yulInterpreterTests/switch_statement.yul
deleted file mode 100644
index 1a067ee1bd0d..000000000000
--- a/test/libyul/yulInterpreterTests/switch_statement.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    switch 7
-        case 7 { mstore(1, 2) }
-        case 3 { mstore(6, 7) }
-        default { mstore(8, 9) }
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0200000000000000000000000000000000000000000000000000000000000000
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_length_reads.yul b/test/libyul/yulInterpreterTests/zero_length_reads.yul
deleted file mode 100644
index 6c1f38d1e9ff..000000000000
--- a/test/libyul/yulInterpreterTests/zero_length_reads.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  returndatacopy(1, 1, 0)
-  calldatacopy(1, 1, 0)
-  extcodecopy(1, 1, 1, 0)
-  codecopy(1, 1, 0)
-  log0(1, 0)
-  log1(1, 0, 1)
-  log2(1, 0, 1, 1)
-  log3(1, 0, 1, 1, 1)
-  log4(1, 0, 1, 1, 1, 1)
-  pop(create(1, 1, 0))
-  pop(create2(1, 1, 0, 1))
-  pop(call(1, 1, 1, 1, 0, 1, 0))
-  pop(callcode(1, 1, 1, 1, 0, 1, 0))
-  pop(delegatecall(1, 1, 1, 0, 1, 0))
-  pop(staticcall(1, 1, 1, 0, 1, 0))
-  return(1, 0)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   RETURNDATACOPY(0, 1, 0)
-//   CALLDATACOPY(0, 1, 0)
-//   EXTCODECOPY(1, 0, 1, 0)
-//   CODECOPY(0, 1, 0)
-//   LOG0(0, 0)
-//   LOG1(0, 0, 1)
-//   LOG2(0, 0, 1, 1)
-//   LOG3(0, 0, 1, 1, 1)
-//   LOG4(0, 0, 1, 1, 1, 1)
-//   CREATE(1, 0, 0)
-//   CREATE2(1, 0, 0, 1)
-//   CALL(1, 1, 1, 0, 0, 1, 0)
-//   CALLCODE(1, 1, 1, 0, 0, 1, 0)
-//   DELEGATECALL(1, 1, 0, 0, 1, 0)
-//   STATICCALL(1, 1, 0, 0, 1, 0)
-//   RETURN(0, 0)
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul b/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
deleted file mode 100644
index 4be49eeb0977..000000000000
--- a/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  returndatacopy(1, 1, 0)
-  calldatacopy(1, 1, 0)
-  extcodecopy(1, 1, 1, 0)
-  codecopy(1, 1, 0)
-  log0(1, 0)
-  log1(1, 0, 1)
-  log2(1, 0, 1, 1)
-  log3(1, 0, 1, 1, 1)
-  log4(1, 0, 1, 1, 1, 1)
-  pop(create(1, 1, 0))
-  pop(create2(1, 1, 0, 1))
-  pop(call(1, 1, 1, 1, 0, 1, 0))
-  pop(callcode(1, 1, 1, 1, 0, 1, 0))
-  pop(delegatecall(1, 1, 1, 0, 1, 0))
-  pop(staticcall(1, 1, 1, 0, 1, 0))
-  revert(1, 0)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   RETURNDATACOPY(0, 1, 0)
-//   CALLDATACOPY(0, 1, 0)
-//   EXTCODECOPY(1, 0, 1, 0)
-//   CODECOPY(0, 1, 0)
-//   LOG0(0, 0)
-//   LOG1(0, 0, 1)
-//   LOG2(0, 0, 1, 1)
-//   LOG3(0, 0, 1, 1, 1)
-//   LOG4(0, 0, 1, 1, 1, 1)
-//   CREATE(1, 0, 0)
-//   CREATE2(1, 0, 0, 1)
-//   CALL(1, 1, 1, 0, 0, 1, 0)
-//   CALLCODE(1, 1, 1, 0, 0, 1, 0)
-//   DELEGATECALL(1, 1, 0, 0, 1, 0)
-//   STATICCALL(1, 1, 0, 0, 1, 0)
-//   REVERT(0, 0)
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_range.yul b/test/libyul/yulInterpreterTests/zero_range.yul
deleted file mode 100644
index 1ad25ed37bca..000000000000
--- a/test/libyul/yulInterpreterTests/zero_range.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  calldatacopy(32, 0, 0)
-  // Used to store 32
-  sstore(0, msize())
-}
-// ----
-// Trace:
-//   CALLDATACOPY(0, 0, 0)
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/basic.yul b/test/libyul/yulOptimizerTests/blockFlattener/basic.yul
deleted file mode 100644
index 5b49552fb999..000000000000
--- a/test/libyul/yulOptimizerTests/blockFlattener/basic.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  {
-    let _1 := mload(0)
-    let f_a := mload(1)
-    let f_r
-    {
-      f_a := mload(f_a)
-      f_r := add(f_a, calldatasize())
-    }
-    let z := mload(2)
-  }
-}
-// ----
-// step: blockFlattener
-//
-// {
-//     {
-//         let _1 := mload(0)
-//         let f_a := mload(1)
-//         let f_r
-//         f_a := mload(f_a)
-//         f_r := add(f_a, calldatasize())
-//         let z := mload(2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul b/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul
deleted file mode 100644
index c587c47a3a19..000000000000
--- a/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    {
-        for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-            a := add(a, 1)
-        }
-    }
-}
-// ----
-// step: blockFlattener
-//
-// {
-//     {
-//         for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) }
-//         { a := add(a, 1) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul b/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul
deleted file mode 100644
index 00740fb13380..000000000000
--- a/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  {
-    if add(mload(7), sload(mload(3)))
-    {
-      let y := add(mload(3), 3)
-      {
-        y := add(y, 7)
-      }
-    }
-    let t := add(3, 9)
-  }
-}
-// ----
-// step: blockFlattener
-//
-// {
-//     {
-//         if add(mload(7), sload(mload(3)))
-//         {
-//             let y := add(mload(3), 3)
-//             y := add(y, 7)
-//         }
-//         let t := add(3, 9)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul b/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul
deleted file mode 100644
index d1051a115bf5..000000000000
--- a/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  {
-    let a := 3
-    let b := 4
-    {
-      a := add(b, 3)
-      let c := 5
-      {
-        b := add(b, 4)
-        {
-          c := add(a, 5)
-        }
-        b := add(a, b)
-      }
-      a := add(a, c)
-    }
-  }
-}
-// ----
-// step: blockFlattener
-//
-// {
-//     {
-//         let a := 3
-//         let b := 4
-//         a := add(b, 3)
-//         let c := 5
-//         b := add(b, 4)
-//         c := add(a, 5)
-//         b := add(a, b)
-//         a := add(a, c)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul b/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul
deleted file mode 100644
index 27b9d96dfd72..000000000000
--- a/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  {
-    let a := 1
-    switch calldataload(0)
-    case 0 { { { mstore(0, 1) } } a := 8 }
-    default { a := 3 { a := 4 } }
-    a := 5
-  }
-}
-// ----
-// step: blockFlattener
-//
-// {
-//     {
-//         let a := 1
-//         switch calldataload(0)
-//         case 0 {
-//             mstore(0, 1)
-//             a := 8
-//         }
-//         default {
-//             a := 3
-//             a := 4
-//         }
-//         a := 5
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul
deleted file mode 100644
index 909d12533c90..000000000000
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let a
-    function f() -> x { x := g() }
-    function g() -> y { y := f() }
-    function h() -> z { z := g() }
-    a := h()
-}
-// ----
-// step: circularReferencesPruner
-//
-// {
-//     {
-//         let a
-//         a := h()
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> y
-//     { y := f() }
-//     function h() -> z
-//     { z := g() }
-// }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
deleted file mode 100644
index f78b9fb99234..000000000000
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    {
-    	function a() -> x { x := b() }
-    	function b() -> y { y := a() }
-    }
-    {
-    	function c() -> z { z := d() }
-    	function d() -> w { w := c() }
-    }
-}
-// ----
-// step: circularReferencesPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
deleted file mode 100644
index 858a48d85baa..000000000000
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    {
-    	function z() -> x { x := y() }
-    	function y() -> x { x := z() }
-    }
-    {
-    	function z() -> x { x := y() }
-    	function y() -> x { x := z() }
-    }
-}
-// ----
-// step: circularReferencesPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul
deleted file mode 100644
index ebb8a329c8d4..000000000000
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function f() -> x { x := g() }
-    function g() -> x { x := f() }
-}
-// ----
-// step: circularReferencesPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul
deleted file mode 100644
index ac4ed1b0545e..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	let a := 1
-	let b := codesize()
-	for { } lt(1, codesize()) { mstore(1, codesize()) a := add(a, codesize()) } {
-		mstore(1, codesize())
-	}
-	mstore(1, codesize())
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := 1
-//     let b := codesize()
-//     for { }
-//     lt(1, b)
-//     {
-//         mstore(1, b)
-//         a := add(a, b)
-//     }
-//     { mstore(1, b) }
-//     mstore(1, b)
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul
deleted file mode 100644
index 8de646ae3547..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let b := 1
-    if b { b := 1 }
-    let c := 1
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let b := 1
-//     if b { b := b }
-//     let c := 1
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/case2.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/case2.yul
deleted file mode 100644
index 3a51b6626dec..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/case2.yul
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    let _13 := 0x20
-    let _14 := allocate(_13)
-    pop(_14)
-    let _15 := 2
-    let _16 := 3
-    let _17 := 0x40
-    let _18 := allocate(_17)
-    let _19 := array_index_access(_18, _16)
-    mstore(_19, _15)
-    function allocate(size) -> p
-    {
-        let _1 := 0x40
-        let p_2 := mload(_1)
-        p := p_2
-        let _20 := add(p_2, size)
-        mstore(_1, _20)
-    }
-    function array_index_access(array, index) -> p_1
-    {
-        let _21 := 0x20
-        let _22 := mul(index, _21)
-        p_1 := add(array, _22)
-    }
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let _13 := 0x20
-//     let _14 := allocate(_13)
-//     pop(_14)
-//     let _15 := 2
-//     let _16 := 3
-//     let _17 := 0x40
-//     let _18 := allocate(_17)
-//     let _19 := array_index_access(_18, _16)
-//     mstore(_19, _15)
-//     function allocate(size) -> p
-//     {
-//         let _1 := 0x40
-//         let p_2 := mload(_1)
-//         p := p_2
-//         let _20 := add(p_2, size)
-//         mstore(_1, _20)
-//     }
-//     function array_index_access(array, index) -> p_1
-//     {
-//         let _21 := 0x20
-//         let _22 := mul(index, _21)
-//         p_1 := add(array, _22)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/clear_not_needed.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/clear_not_needed.yul
deleted file mode 100644
index d0e124f6b52e..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/clear_not_needed.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let a := calldataload(0)
-    let x := calldataload(0x20)
-    x := a
-    let z := 0
-    x := z
-    a := 9
-    sstore(x, 3)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := calldataload(0)
-//     let x := calldataload(0x20)
-//     x := a
-//     let z := 0
-//     x := z
-//     a := 9
-//     sstore(z, 3)
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/function_scopes.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/function_scopes.yul
deleted file mode 100644
index 2fd765afc027..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/function_scopes.yul
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    function allocate(size) -> p
-    {
-        let _1 := 0x40
-        p := mload(_1)
-        let _2 := add(p, size)
-        let _3 := 0x40
-        mstore(_3, _2)
-    }
-    function array_index_access(array, index) -> p_1
-    {
-        let _4 := 0x20
-        let _5 := mul(index, _4)
-        p_1 := add(array, _5)
-    }
-    let _6 := 0x20
-    let _7 := allocate(_6)
-    pop(_7)
-    let _8 := 0x40
-    let x := allocate(_8)
-    let _9 := 2
-    let _10 := 3
-    let _11 := array_index_access(x, _10)
-    mstore(_11, _9)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let _6 := 0x20
-//     let _7 := allocate(_6)
-//     pop(_7)
-//     let _8 := 0x40
-//     let x := allocate(_8)
-//     let _9 := 2
-//     let _10 := 3
-//     let _11 := array_index_access(x, _10)
-//     mstore(_11, _9)
-//     function allocate(size) -> p
-//     {
-//         let _1 := 0x40
-//         p := mload(_1)
-//         let _2 := add(p, size)
-//         let _3 := _1
-//         mstore(_1, _2)
-//     }
-//     function array_index_access(array, index) -> p_1
-//     {
-//         let _4 := 0x20
-//         let _5 := mul(index, _4)
-//         p_1 := add(array, _5)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/loop.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/loop.yul
deleted file mode 100644
index 2848ef3f10eb..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/loop.yul
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    let _1 := 0
-    let _33 := calldataload(_1)
-    let sum_50_141 := _1
-    let sum_50_146 := _1
-    let sum_50 := _1
-    let length_51 := calldataload(_33)
-    let i_53_142 := _1
-    let i_53_147 := _1
-    let i_53 := _1
-    for { }
-    1
-    {
-        let _108 := 1
-        let i_53_121 := add(i_53, _108)
-        let i_53_144 := i_53_121
-        let i_53_149 := i_53_121
-        i_53 := i_53_121
-    }
-    {
-        let _109 := lt(i_53, length_51)
-        let _110 := iszero(_109)
-        if _110 { break }
-        let _114_128 := iszero(_109)
-        if _114_128 { revert(_1, _1) }
-        let _13_129 := 0x20
-        let _115_130 := mul(i_53, _13_129)
-        let _116_131 := add(_33, _115_130)
-        let _117_132 := add(_116_131, _13_129)
-        let v_122_133 := calldataload(_117_132)
-        let sum_50_120 := add(sum_50, v_122_133)
-        let sum_50_143 := sum_50_120
-        let sum_50_148 := sum_50_120
-        sum_50 := sum_50_120
-    }
-    sstore(_1, sum_50)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let _1 := 0
-//     let _33 := calldataload(_1)
-//     let sum_50_141 := _1
-//     let sum_50_146 := _1
-//     let sum_50 := _1
-//     let length_51 := calldataload(_33)
-//     let i_53_142 := _1
-//     let i_53_147 := _1
-//     let i_53 := _1
-//     for { }
-//     1
-//     {
-//         let _108 := 1
-//         let i_53_121 := add(i_53, _108)
-//         let i_53_144 := i_53_121
-//         let i_53_149 := i_53_121
-//         i_53 := i_53_121
-//     }
-//     {
-//         let _109 := lt(i_53, length_51)
-//         let _110 := iszero(_109)
-//         if _110 { break }
-//         let _114_128 := _110
-//         if _110 { revert(_1, _1) }
-//         let _13_129 := 0x20
-//         let _115_130 := mul(i_53, _13_129)
-//         let _116_131 := add(_33, _115_130)
-//         let _117_132 := add(_116_131, _13_129)
-//         let v_122_133 := calldataload(_117_132)
-//         let sum_50_120 := add(sum_50, v_122_133)
-//         let sum_50_143 := sum_50_120
-//         let sum_50_148 := sum_50_120
-//         sum_50 := sum_50_120
-//     }
-//     sstore(_1, sum_50)
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/movable_functions.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/movable_functions.yul
deleted file mode 100644
index d6041eb5e244..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/movable_functions.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    function double(x) -> y { y := add(x, x) }
-    function double_with_se(x) -> y { y := add(x, x) mstore(40, 4) }
-    let i := mload(3)
-    let a := double(i)
-    let b := double(i)
-    let c := double_with_se(i)
-    let d := double_with_se(i)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let i := mload(3)
-//     let a := double(i)
-//     let b := a
-//     let c := double_with_se(i)
-//     let d := double_with_se(i)
-//     function double(x) -> y
-//     { y := add(x, x) }
-//     function double_with_se(x_1) -> y_2
-//     {
-//         y_2 := add(x_1, x_1)
-//         mstore(40, 4)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul
deleted file mode 100644
index a9f5664eccd3..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    let a := mload(1)
-    let b := mload(1)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := mload(1)
-//     let b := mload(1)
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul
deleted file mode 100644
index ed8916e63723..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    let a := gas()
-    let b := gas()
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := gas()
-//     let b := gas()
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/object_access.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/object_access.yul
deleted file mode 100644
index c8c4e4e1388a..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/object_access.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-object "main" {
-    code {
-        // Arguments to ``datasize`` and ``dataoffset`` need to be
-        // literals. We cannot simplify their arguments, but we can
-        // simplify them as a full expression.
-        // ``datacopy`` does not have this restriction.
-        let r := "abc"
-        let a := datasize("abc")
-        let x := dataoffset("abc")
-        // should be replaced by a
-        let y := datasize("abc")
-        datacopy("abc", x, y)
-        mstore(a, x)
-    }
-    data "abc" "Hello, World!"
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// object "main" {
-//     code {
-//         let r := "abc"
-//         let a := datasize("abc")
-//         let x := dataoffset("abc")
-//         let y := a
-//         datacopy(r, x, a)
-//         mstore(a, x)
-//     }
-//     data "abc" hex"48656c6c6f2c20576f726c6421"
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/replace_return_nonzero.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/replace_return_nonzero.yul
deleted file mode 100644
index 8c6096629b1f..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/replace_return_nonzero.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    function f() -> x {
-        let t := 0
-        x := 1
-        let a := 0
-        let b := 1
-    }
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     function f() -> x
-//     {
-//         let t := 0
-//         x := 1
-//         let a := t
-//         let b := x
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/scopes.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/scopes.yul
deleted file mode 100644
index 5e5b79696c8b..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/scopes.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let a := 10
-    let x := 20
-    {
-        let b := calldataload(0)
-        let d := calldataload(1)
-        x := d
-    }
-    // We had a bug where "calldataload(0)" was incorrectly replaced by "b"
-    mstore(0, calldataload(0))
-    mstore(0, x)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := 10
-//     let x := 20
-//     {
-//         let b := calldataload(0)
-//         let d := calldataload(1)
-//         x := d
-//     }
-//     mstore(0, calldataload(0))
-//     mstore(0, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul
deleted file mode 100644
index ab0d0a1ea236..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: commonSubexpressionEliminator
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul
deleted file mode 100644
index c64fc93f9833..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    let a := mul(1, codesize())
-    let b := mul(1, codesize())
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := mul(1, codesize())
-//     let b := a
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_return.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_return.yul
deleted file mode 100644
index 35891b459939..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_return.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    function f() -> x {
-        // can re-use x
-        let y := 0
-        mstore(y, 7)
-    }
-    let a
-    // can re-use a
-    let b := 0
-    sstore(a, b)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a
-//     let b := a
-//     sstore(a, a)
-//     function f() -> x
-//     {
-//         let y := 0
-//         mstore(y, 7)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_variables.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_variables.yul
deleted file mode 100644
index ab14e04250a0..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_variables.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    // This does not replace b by a because there is no
-    // explicit assignment, even though both hold the same value.
-    let a
-    let b
-    mstore(sub(a, b), 7)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a
-//     let b
-//     mstore(sub(a, b), 7)
-// }
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul
deleted file mode 100644
index 52198a1732f3..000000000000
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-
-    let a := mload(0)
-    let b := add(a, 7)
-    let c := a
-    let d := c
-    let x := add(a, b)
-    // CSE has to recognize equality with x here.
-    let y := add(d, add(c, 7))
-    // some reassignments
-    b := mload(a)
-    a := b
-    mstore(2, a)
-}
-// ----
-// step: commonSubexpressionEliminator
-//
-// {
-//     let a := mload(0)
-//     let b := add(a, 7)
-//     let c := a
-//     let d := a
-//     let x := add(a, b)
-//     let y := x
-//     b := mload(a)
-//     a := b
-//     mstore(2, b)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
deleted file mode 100644
index c7cc17fc8fd4..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let y:bool := false
-    for {} true { } {
-        if y { break }
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let y:bool := false
-//     for { } true { }
-//     {
-//         if y { break }
-//         y := false
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_after_if_break.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_after_if_break.yul
deleted file mode 100644
index d49ec0709e79..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_after_if_break.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let y := mload(0x20)
-    for {} and(y, 8) { pop(y) } {
-        if y { break }
-    }
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let y := mload(0x20)
-//     for { } and(y, 8) { pop(y) }
-//     {
-//         if y { break }
-//         y := 0
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_after_if_continue.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_after_if_continue.yul
deleted file mode 100644
index 9246c162b1f4..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_after_if_continue.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let y := mload(0x20)
-    for {} and(y, 8) { pop(y) } {
-        if y { continue }
-    }
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let y := mload(0x20)
-//     for { } and(y, 8) { pop(y) }
-//     {
-//         if y { continue }
-//         y := 0
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_before_for_condition.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_before_for_condition.yul
deleted file mode 100644
index 35ba33c6ec44..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_before_for_condition.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let x := mload(0)
-    let y := mload(0)
-    if x { revert(0, 0) }
-    if y { revert(0, 0) }
-    for {} and(x, y) {} {
-        x := 2
-    }
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let x := mload(0)
-//     let y := mload(0)
-//     if x { revert(0, 0) }
-//     x := 0
-//     if y { revert(0, 0) }
-//     y := 0
-//     for { } and(x, y) { }
-//     { x := 2 }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_before_for_post.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_before_for_post.yul
deleted file mode 100644
index 4207525c7e8d..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/clear_before_for_post.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let x
-    for {} x { sstore(1, x) } {
-        if x { continue }
-        // x is 0 here, but should not be 0
-        // anymore in the for loop post block
-        sstore(0, x)
-    }
-    sstore(0, x)
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let x
-//     for { } x { sstore(1, x) }
-//     {
-//         if x { continue }
-//         x := 0
-//         sstore(0, x)
-//     }
-//     sstore(0, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/no_opt_if_break_is_not_last.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/no_opt_if_break_is_not_last.yul
deleted file mode 100644
index 6aa3ba57d71b..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/no_opt_if_break_is_not_last.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    let x := mload(0)
-    for {} 1 {} {
-        if x { sstore(7, 8) break sstore(8, 9) }
-        sstore(1, x)
-        if x { sstore(7, 8) break }
-        sstore(10, x)
-    }
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let x := mload(0)
-//     for { } 1 { }
-//     {
-//         if x
-//         {
-//             sstore(7, 8)
-//             break
-//             sstore(8, 9)
-//         }
-//         sstore(1, x)
-//         if x
-//         {
-//             sstore(7, 8)
-//             break
-//         }
-//         x := 0
-//         sstore(10, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/no_opt_inside_if.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/no_opt_inside_if.yul
deleted file mode 100644
index ef262b2e6ead..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/no_opt_inside_if.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let x := mload(0)
-    if x { sstore(0, x) }
-    sstore(1, x)
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let x := mload(0)
-//     if x { sstore(0, x) }
-//     sstore(1, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/opt_after_terminating_if.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/opt_after_terminating_if.yul
deleted file mode 100644
index 0326a5c3ad97..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/opt_after_terminating_if.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := mload(0)
-    if x { sstore(0, x) revert(0, 0) }
-    sstore(1, x)
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let x := mload(0)
-//     if x
-//     {
-//         sstore(0, x)
-//         revert(0, 0)
-//     }
-//     x := 0
-//     sstore(1, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/opt_switch.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/opt_switch.yul
deleted file mode 100644
index 58a43c0d2481..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/opt_switch.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let x := calldataload(0)
-    switch x
-    case 0 { }
-    case 1 { }
-    default { }
-
-    pop(x)
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let x := calldataload(0)
-//     switch x
-//     case 0 { x := 0 }
-//     case 1 { x := 1 }
-//     default { }
-//     pop(x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul
deleted file mode 100644
index c448fdf02333..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    function recursive() { recursive() }
-    function terminating() { stop() }
-    function maybeReverting() { if calldataload(0) { revert(0, 0) } }
-
-    let a := calldataload(7)
-    if a { recursive() }
-
-    a := calldataload(a)
-    if a { maybeReverting() }
-
-    a := calldataload(a)
-    if a { terminating() }
-
-    sstore(0, a)
-}
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     function recursive()
-//     { recursive() }
-//     function terminating()
-//     { stop() }
-//     function maybeReverting()
-//     {
-//         if calldataload(0) { revert(0, 0) }
-//     }
-//     let a := calldataload(7)
-//     if a { recursive() }
-//     a := 0
-//     a := calldataload(a)
-//     if a { maybeReverting() }
-//     a := calldataload(a)
-//     if a { terminating() }
-//     a := 0
-//     sstore(0, a)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/smoke.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/smoke.yul
deleted file mode 100644
index 17e4d03a2466..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: conditionalSimplifier
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_after_if_break.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_after_if_break.yul
deleted file mode 100644
index a12f171c650a..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_after_if_break.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let y := mload(0x20)
-    for {} and(y, 8) { pop(y) } {
-        if y { break }
-        y := 0
-    }
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let y := mload(0x20)
-//     for { } and(y, 8) { pop(y) }
-//     { if y { break } }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_after_if_continue.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_after_if_continue.yul
deleted file mode 100644
index 86f99e29873e..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_after_if_continue.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let y := mload(0x20)
-    for {} and(y, 8) { pop(y) } {
-        if y { continue }
-        y := 0
-    }
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let y := mload(0x20)
-//     for { } and(y, 8) { pop(y) }
-//     { if y { continue } }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_before_for_condition.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_before_for_condition.yul
deleted file mode 100644
index 2ea623e7a9d3..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_before_for_condition.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let x := mload(0)
-    let y := mload(0)
-    if x { revert(0, 0) }
-    x := 0
-    if y { revert(0, 0) }
-    y := 0
-    for {} and(x, y) {} {
-        x := 2
-    }
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let x := mload(0)
-//     let y := mload(0)
-//     if x { revert(0, 0) }
-//     if y { revert(0, 0) }
-//     for { } and(x, y) { }
-//     { x := 2 }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_before_for_post.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_before_for_post.yul
deleted file mode 100644
index a7fadc4345a1..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/clear_before_for_post.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let x
-    for {} x { sstore(1, x) } {
-        if x { continue }
-        x := 0
-        sstore(0, x)
-    }
-    sstore(0, x)
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let x
-//     for { } x { sstore(1, x) }
-//     {
-//         if x { continue }
-//         sstore(0, x)
-//     }
-//     sstore(0, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/no_opt_if_break_is_not_last.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/no_opt_if_break_is_not_last.yul
deleted file mode 100644
index e5342b2a63ff..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/no_opt_if_break_is_not_last.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    let x := mload(0)
-    for {} 1 {} {
-        if x { sstore(7, 8) break sstore(8, 9) }
-        x := 0
-        sstore(1, x)
-        if x { sstore(7, 8) break }
-        x := 0
-        sstore(10, x)
-    }
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let x := mload(0)
-//     for { } 1 { }
-//     {
-//         if x
-//         {
-//             sstore(7, 8)
-//             break
-//             sstore(8, 9)
-//         }
-//         x := 0
-//         sstore(1, x)
-//         if x
-//         {
-//             sstore(7, 8)
-//             break
-//         }
-//         sstore(10, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/no_opt_inside_if.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/no_opt_inside_if.yul
deleted file mode 100644
index 8c94644ce1ac..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/no_opt_inside_if.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := mload(0)
-    if x { sstore(0, x) }
-    x := 0
-    sstore(1, x)
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let x := mload(0)
-//     if x { sstore(0, x) }
-//     x := 0
-//     sstore(1, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/opt_after_terminating_if.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/opt_after_terminating_if.yul
deleted file mode 100644
index d90e1fc4bd5b..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/opt_after_terminating_if.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := mload(0)
-    if x { sstore(0, x) revert(0, 0) }
-    x := 0
-    sstore(1, x)
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let x := mload(0)
-//     if x
-//     {
-//         sstore(0, x)
-//         revert(0, 0)
-//     }
-//     sstore(1, x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/opt_switch.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/opt_switch.yul
deleted file mode 100644
index 361b0f77b26a..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/opt_switch.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let x := calldataload(0)
-    switch x
-    case 0 { x := 0 }
-    case 1 { x := 1 }
-    case 2 { x := 8 /* wrong literal */ }
-    default { }
-
-    pop(x)
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     let x := calldataload(0)
-//     switch x
-//     case 0 { }
-//     case 1 { }
-//     case 2 { x := 8 }
-//     default { }
-//     pop(x)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul
deleted file mode 100644
index 25e17d75ac0a..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    function recursive() { recursive() }
-    function terminating() { stop() }
-    function maybeReverting() { if calldataload(0) { revert(0, 0) } }
-
-    let a := calldataload(7)
-    if a { recursive() }
-    a := 0
-
-    a := calldataload(a)
-    if a { maybeReverting() }
-
-    a := calldataload(a)
-    if a { terminating() }
-    a := 0
-
-    sstore(0, a)
-}
-// ----
-// step: conditionalUnsimplifier
-//
-// {
-//     function recursive()
-//     { recursive() }
-//     function terminating()
-//     { stop() }
-//     function maybeReverting()
-//     {
-//         if calldataload(0) { revert(0, 0) }
-//     }
-//     let a := calldataload(7)
-//     if a { recursive() }
-//     a := calldataload(a)
-//     if a { maybeReverting() }
-//     a := calldataload(a)
-//     if a { terminating() }
-//     sstore(0, a)
-// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/smoke.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/smoke.yul
deleted file mode 100644
index 176d7fd57b72..000000000000
--- a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: conditionalUnsimplifier
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/constantOptimiser/difficult.yul b/test/libyul/yulOptimizerTests/constantOptimiser/difficult.yul
deleted file mode 100644
index a7c4126ac17c..000000000000
--- a/test/libyul/yulOptimizerTests/constantOptimiser/difficult.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  let x := 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00
-  let y := 0x1100ff00ff00ff001100ff00ff001100ff00ff001100ff00ff001100ff001100
-  let z := 0xffff0000ffff0000ffff0000ffff0000ff00ff00ffff0000ffff0000ffff0000
-  let w := 0xffffffff000000ffffef000001feff000067ffefff0000ff230002ffee00fff7
-}
-// ----
-// step: constantOptimiser
-//
-// {
-//     let x := 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00
-//     let y := 0x1100ff00ff00ff001100ff00ff001100ff00ff001100ff00ff001100ff001100
-//     let z := 0xffff0000ffff0000ffff0000ffff0000ff00ff00ffff0000ffff0000ffff0000
-//     let w := 0xffffffff000000ffffef000001feff000067ffefff0000ff230002ffee00fff7
-// }
diff --git a/test/libyul/yulOptimizerTests/constantOptimiser/gaps.yul b/test/libyul/yulOptimizerTests/constantOptimiser/gaps.yul
deleted file mode 100644
index 82dccdab41de..000000000000
--- a/test/libyul/yulOptimizerTests/constantOptimiser/gaps.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  let a := 0x10000000000000000000000000000000000000000000
-  let x := 0x11000000000000000000000000000000000000ffffffffffffffffffffffff23
-  let y := 0xfffffffff00000000000000000000000000000000000000000000000000000ff
-  for { let i := 0xff00000000000 } lt(i, 873687623427364) { i := add(i, 3234234234234) } {
-  }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: constantOptimiser
-//
-// {
-//     let a := shl(172, 1)
-//     let x := add(shl(248, 17), 0xffffffffffffffffffffffff23)
-//     let y := add(shl(220, 0x0fffffffff), 255)
-//     for { let i := 0xff00000000000 }
-//     lt(i, 873687623427364)
-//     { i := add(i, 3234234234234) }
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/constantOptimiser/smallNumbers.yul b/test/libyul/yulOptimizerTests/constantOptimiser/smallNumbers.yul
deleted file mode 100644
index af8a08886dd3..000000000000
--- a/test/libyul/yulOptimizerTests/constantOptimiser/smallNumbers.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  let x := 8
-  let y := 0xffff
-  for { let i := 0xff00 } lt(i, 2) { i := add(i, 3) } {
-  }
-}
-// ----
-// step: constantOptimiser
-//
-// {
-//     let x := 8
-//     let y := 0xffff
-//     for { let i := 0xff00 } lt(i, 2) { i := add(i, 3) }
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_movable_condition.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_movable_condition.yul
deleted file mode 100644
index bf74a266ce4a..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_movable_condition.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{ let a := mload(0) if a {} }
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     let a := mload(0)
-//     pop(a)
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_non_movable_condition.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_non_movable_condition.yul
deleted file mode 100644
index a204e6cec189..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_non_movable_condition.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if mload(0) {} }
-// ----
-// step: controlFlowSimplifier
-//
-// { pop(mload(0)) }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/remove_leave.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/remove_leave.yul
deleted file mode 100644
index f0bf4b7c2a9e..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/remove_leave.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    function f() -> x { x := 7 leave }
-    function g() -> x { leave x := 7 }
-    function h() -> x { if x { leave } }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     function f() -> x
-//     { x := 7 }
-//     function g() -> x_1
-//     {
-//         leave
-//         x_1 := 7
-//     }
-//     function h() -> x_2
-//     { if x_2 { leave } }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_only_default.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_only_default.yul
deleted file mode 100644
index f52551ab454d..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_only_default.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	switch mload(0) default { mstore(1, 2) }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     pop(mload(0))
-//     { mstore(1, 2) }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_all.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_all.yul
deleted file mode 100644
index a04b87ae6b46..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_all.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	let y := 200
-	switch add(y, 4)
-	case 0 { }
-	case 1 { }
-	default { }
-
-	switch mload(4)
-	case 0 { }
-	case 1 { }
-	default { }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     let y := 200
-//     pop(add(y, 4))
-//     pop(mload(4))
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_case.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_case.yul
deleted file mode 100644
index 03879b263bd2..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_case.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	let y := 200
-	switch calldataload(0)
-	case 0 { }
-	case 1 { y := 9 }
-	case 2 { y := 10 }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     let y := 200
-//     switch calldataload(0)
-//     case 1 { y := 9 }
-//     case 2 { y := 10 }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_cases.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_cases.yul
deleted file mode 100644
index 223760723382..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_cases.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	let y := 200
-	switch calldataload(0)
-	case 0 { }
-	case 1 { y := 9 }
-	default { }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     let y := 200
-//     if eq(1, calldataload(0)) { y := 9 }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_default_case.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_default_case.yul
deleted file mode 100644
index 7c6283a8fca0..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_default_case.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	let y := 200
-	switch calldataload(0)
-	case 1 { y := 9 }
-	case 2 { y := 10 }
-	default { }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     let y := 200
-//     switch calldataload(0)
-//     case 1 { y := 9 }
-//     case 2 { y := 10 }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_to_if.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_to_if.yul
deleted file mode 100644
index b314cd96de59..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_to_if.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	switch calldataload(0) case 2 { mstore(0, 0) }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     if eq(2, calldataload(0)) { mstore(0, 0) }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for.yul
deleted file mode 100644
index 8e48e2b6586f..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	for {} calldatasize() { mstore(1, 2) } {
-		mstore(4, 5)
-		break
-	}
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     if calldatasize() { mstore(4, 5) }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_nested.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_nested.yul
deleted file mode 100644
index 7bf16956eab3..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_nested.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    for {} calldatasize() { mstore(8, 9) } {
-        for {} calldatasize() { mstore(1, 2) } {
-            mstore(4, 5)
-            break
-        }
-        if mload(10) { continue }
-        break
-    }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     for { } calldatasize() { mstore(8, 9) }
-//     {
-//         if calldatasize() { mstore(4, 5) }
-//         if mload(10) { continue }
-//         break
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_nested_reversed.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_nested_reversed.yul
deleted file mode 100644
index 806a8ebcbdad..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_nested_reversed.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    for {} calldatasize() { mstore(8, 9) } {
-        for {} calldatasize() { mstore(1, 2) } {
-            mstore(4, 5)
-            continue
-        }
-        break
-    }
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     if calldatasize()
-//     {
-//         for { } calldatasize() { mstore(1, 2) }
-//         {
-//             mstore(4, 5)
-//             continue
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_revert.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_revert.yul
deleted file mode 100644
index b8bf66163026..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_revert.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	for {} calldatasize() { mstore(1, 2) } {
-		let x := 7
-		mstore(4, 5)
-		revert(0, x)
-	}
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     if calldatasize()
-//     {
-//         let x := 7
-//         mstore(4, 5)
-//         revert(0, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_revert_plus_break.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_revert_plus_break.yul
deleted file mode 100644
index e8d034733ccd..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_revert_plus_break.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	for {} calldatasize() { mstore(1, 2) } {
-		let x := 7
-		mstore(4, 5)
-		break
-		revert(0, x)
-	}
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     for { } calldatasize() { mstore(1, 2) }
-//     {
-//         let x := 7
-//         mstore(4, 5)
-//         break
-//         revert(0, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_with_continue.yul b/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_with_continue.yul
deleted file mode 100644
index b92efd885229..000000000000
--- a/test/libyul/yulOptimizerTests/controlFlowSimplifier/terminating_for_with_continue.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	for {} calldatasize() { mstore(1, 2) } {
-		if calldatasize() { continue }
-		mstore(4, 5)
-		break
-	}
-}
-// ----
-// step: controlFlowSimplifier
-//
-// {
-//     for { } calldatasize() { mstore(1, 2) }
-//     {
-//         if calldatasize() { continue }
-//         mstore(4, 5)
-//         break
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/conditional_break.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/conditional_break.yul
deleted file mode 100644
index ef17a9708a7d..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/conditional_break.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        if lt(a, 0)
-        { break }
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let a := 20
-//     for { } lt(a, 40) { a := add(a, 2) }
-//     {
-//         a := a
-//         if lt(a, 0) { break }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul
deleted file mode 100644
index 00293d71d157..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    switch calldataload(0)
-    case 0 {
-        recursive()
-        sstore(0, 1)
-    }
-    case 1 {
-        terminating()
-        sstore(0, 7)
-    }
-    case 2 {
-        reverting()
-        sstore(0, 7)
-    }
-
-
-    function recursive()
-    {
-        recursive()
-    }
-    function terminating()
-    {
-        return(0, 0)
-    }
-    function reverting()
-    {
-        revert(0, 0)
-    }
-}
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     switch calldataload(0)
-//     case 0 { recursive() }
-//     case 1 { terminating() }
-//     case 2 { reverting() }
-//     function recursive()
-//     { recursive() }
-//     function terminating()
-//     { return(0, 0) }
-//     function reverting()
-//     { revert(0, 0) }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_break.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/early_break.yul
deleted file mode 100644
index c7a3d98e1942..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_break.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        break
-        mstore(0, a)
-        a := add(a, 10)
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let a := 20
-//     for { } lt(a, 40) { a := add(a, 2) }
-//     {
-//         a := a
-//         break
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_continue.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/early_continue.yul
deleted file mode 100644
index d6b9f9d23995..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_continue.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        continue
-        mstore(0, a)
-        a := add(a, 10)
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let a := 20
-//     for { } lt(a, 40) { a := add(a, 2) }
-//     {
-//         a := a
-//         continue
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_leave.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/early_leave.yul
deleted file mode 100644
index ce3c006727b3..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_leave.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    function f() -> x {
-        for {
-            let a := 20
-        }
-        lt(a, 40)
-        {
-            a := add(a, 2)
-        }
-        {
-            a := a
-            leave
-            mstore(0, a)
-            a := add(a, 10)
-        }
-        x := 9
-    }
-    pop(f())
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     function f() -> x
-//     {
-//         let a := 20
-//         for { } lt(a, 40) { a := add(a, 2) }
-//         {
-//             a := a
-//             leave
-//         }
-//         x := 9
-//     }
-//     pop(f())
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_revert.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/early_revert.yul
deleted file mode 100644
index 7e37d6d4b256..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_revert.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let b := 20
-    revert(0, 0)
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        mstore(0, a)
-        a := add(a, 10)
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let b := 20
-//     revert(0, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_stop.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/early_stop.yul
deleted file mode 100644
index ad157573685f..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/early_stop.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let b := 20
-    stop()
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        mstore(0, a)
-        a := add(a, 10)
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let b := 20
-//     stop()
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/for_loop_init_decl.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/for_loop_init_decl.yul
deleted file mode 100644
index f5e67f77f530..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/for_loop_init_decl.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  for { stop() let i_0 := 0 } lt(i_0,2) { i_0 := add(i_0,1) }
-  {
-    let i_1 := i_0
-  }
-}
-// ----
-// step: deadCodeEliminator
-//
-// { stop() }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul
deleted file mode 100644
index a75636b76009..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    fun()
-
-    revert(0, 0)
-
-    function fun()
-    {
-        sstore(0, 1)
-    }
-
-    pop(add(1, 1))
-}
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     fun()
-//     revert(0, 0)
-//     function fun()
-//     { sstore(0, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/nested_revert.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/nested_revert.yul
deleted file mode 100644
index 088394ee0a3f..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/nested_revert.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let y := mload(0)
-    switch y
-    case 0 {
-        y := 8 }
-    case 1 {
-        y := 9
-        revert(0, 0)
-        y := 10
-    }
-    default {
-        y := 10 }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let y := mload(0)
-//     switch y
-//     case 0 { y := 8 }
-//     case 1 {
-//         y := 9
-//         revert(0, 0)
-//     }
-//     default { y := 10 }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/no_removal.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/no_removal.yul
deleted file mode 100644
index 0e0a2b9c4f4d..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/no_removal.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    {
-      revert(0, 0)
-    }
-    mstore(0, 0)
-}
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     { revert(0, 0) }
-//     mstore(0, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_break.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_break.yul
deleted file mode 100644
index 28425b6e18c0..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_break.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        break
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let a := 20
-//     for { } lt(a, 40) { a := add(a, 2) }
-//     {
-//         a := a
-//         break
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_continue.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_continue.yul
deleted file mode 100644
index e01ae0aed568..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_continue.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        continue
-    }
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let a := 20
-//     for { } lt(a, 40) { a := add(a, 2) }
-//     {
-//         a := a
-//         continue
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_stop.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_stop.yul
deleted file mode 100644
index 6999c39c0070..000000000000
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/normal_stop.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let b := 20
-    for {
-        let a := 20
-    }
-    lt(a, 40)
-    {
-        a := add(a, 2)
-    }
-    {
-        a := a
-        mstore(0, a)
-        a := add(a, 10)
-    }
-    stop()
-}
-
-// ----
-// step: deadCodeEliminator
-//
-// {
-//     let b := 20
-//     let a := 20
-//     for { } lt(a, 40) { a := add(a, 2) }
-//     {
-//         a := a
-//         mstore(0, a)
-//         a := add(a, 10)
-//     }
-//     stop()
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
deleted file mode 100644
index 30f2e54794a0..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    { let a:u256, b:u256 }
-    {
-        function eq(x: u256, y: u256) -> z: bool {}
-        for { let a:u256 } eq(a, a) { a := a } {
-            let b:u256 := a
-        }
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     { let a, b }
-//     {
-//         function eq(x, y) -> z:bool
-//         { }
-//         for { let a_1 } eq(a_1, a_1) { a_1 := a_1 }
-//         { let b_2 := a_1 }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
deleted file mode 100644
index f99c4e4476de..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    { let a:u256, b:u256, c:u256, d:u256, f:u256 }
-    {
-        function f(a:u256) -> c:u256, d:u256 {
-            let b:u256, c_1:u256 := f(a)
-        }
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     { let a, b, c, d, f }
-//     {
-//         function f_1(a_2) -> c_3, d_4
-//         { let b_5, c_1 := f_1(a_2) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
deleted file mode 100644
index 6b6da1f189fa..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    { let a:u256, b:u256, c:u256 }
-    {
-        let a:bool
-        if a { let b:bool := a }
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     { let a, b, c }
-//     {
-//         let a_1:bool
-//         if a_1 { let b_2:bool := a_1 }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
deleted file mode 100644
index d55afc4828b8..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{ { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } }
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     {
-//         let aanteuhdaoneudbrgkjiuaothduiathudaoeuh
-//     }
-//     {
-//         let aanteuhdaoneudbrgkjiuaothduiathudaoeuh_1
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/smoke.yul b/test/libyul/yulOptimizerTests/disambiguator/smoke.yul
deleted file mode 100644
index 4ea58a6ef3cb..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: disambiguator
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul b/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul
deleted file mode 100644
index 676416437795..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{ }
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
deleted file mode 100644
index 16ee5353f79b..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    { let a:u256, b:u256, c:u256 }
-    {
-        let a:u256
-        switch a
-        case 0:u256 { let b:u256 := a }
-        default { let c:u256 := a }
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     { let a, b, c }
-//     {
-//         let a_1
-//         switch a_1
-//         case 0 { let b_2 := a_1 }
-//         default { let c_3 := a_1 }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables.yul b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
deleted file mode 100644
index 65c93bbb9e88..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/variables.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{ { let a:u256 } { let a:u256 } }
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     { let a }
-//     { let a_1 }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
deleted file mode 100644
index e2cf23756d56..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{ { let a:u256 let a_1:u256 } { let a:u256 } }
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     {
-//         let a
-//         let a_1
-//     }
-//     { let a_2 }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
deleted file mode 100644
index a78af7dabcab..000000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    { let c:u256 let b:u256 }
-    function f(a:u256, c:u256) -> b:u256 { let x:u256 }
-    {
-        let a:u256 let x:u256
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: disambiguator
-//
-// {
-//     {
-//         let c
-//         let b
-//     }
-//     function f(a, c_1) -> b_2
-//     { let x }
-//     {
-//         let a_3
-//         let x_4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul
deleted file mode 100644
index 63f0d38e43fe..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let a := calldataload(0)
-    let b := 20
-    sstore(a, b)
-    if calldataload(32) {
-        sstore(a, b)
-        pop(staticcall(0, 0, 0, 0, 0, 0))
-        sstore(a, b)
-    }
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     let a := calldataload(0)
-//     let b := 20
-//     sstore(a, b)
-//     if calldataload(32)
-//     {
-//         pop(staticcall(0, 0, 0, 0, 0, 0))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul
deleted file mode 100644
index ccd7dd40bfd2..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(1)
-
-    sstore(x, y)
-    for {let a := 1} lt(a, 10) {a := add(a, 1) } {
-        sstore(x, y)
-    }
-}
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     let x := calldataload(0)
-//     let y := calldataload(1)
-//     sstore(x, y)
-//     let a := 1
-//     for { } lt(a, 10) { a := add(a, 1) }
-//     { sstore(x, y) }
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul
deleted file mode 100644
index 68839721cd76..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    f(calldataload(0), calldataload(32))
-    h(calldataload(64), calldataload(96))
-
-    function f(a, b) {
-        // gets removed
-        sstore(a, b)
-        g()
-        sstore(a, b)
-    }
-
-    function g() {
-        pop(staticcall(0, 0, 0, 0, 0, 0))
-    }
-
-    function h(a_, b_) {
-        // cannot be removed
-        sstore(a_, b_)
-        i()
-        sstore(a_, b_)
-    }
-
-    function i() {
-        pop(delegatecall(0, 0, 0, 0, 0, 0))
-    }
-
-
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     f(calldataload(0), calldataload(32))
-//     h(calldataload(64), calldataload(96))
-//     function f(a, b)
-//     {
-//         sstore(a, b)
-//         g()
-//     }
-//     function g()
-//     {
-//         pop(staticcall(0, 0, 0, 0, 0, 0))
-//     }
-//     function h(a_, b_)
-//     {
-//         sstore(a_, b_)
-//         i()
-//         sstore(a_, b_)
-//     }
-//     function i()
-//     {
-//         pop(delegatecall(0, 0, 0, 0, 0, 0))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul
deleted file mode 100644
index 2b68e63100a0..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := sload(x)
-    // both of these can be removed
-    sstore(x, y)
-    sstore(x, y)
-
-    let a := x
-    let b := mload(a)
-    // both of these can be removed
-    mstore(a, b)
-    mstore(a, b)
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     let x := calldataload(0)
-//     let y := sload(x)
-//     let a := x
-//     let b := mload(a)
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul
deleted file mode 100644
index 395fea6d025f..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let var_k := calldataload(0)
-    let _1 := 0x00
-    let _2 := 0x20
-    mstore(_1, var_k)
-    mstore(_2, _1)
-    sstore(keccak256(_1, 0x40), 0x01)
-    mstore(_1, var_k)
-    mstore(_2, _1)
-    sstore(add(keccak256(_1, 0x40), 0x01), 0x03)
-    mstore(_1, var_k)
-    mstore(_2, _1)
-    sstore(add(keccak256(_1, 0x40), 2), 0x04)
-    mstore(_1, var_k)
-    mstore(_2, _1)
-    sstore(add(keccak256(_1, 0x40), 0x03), 2)
-}
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     let var_k := calldataload(0)
-//     let _1 := 0x00
-//     let _2 := 0x20
-//     mstore(_1, var_k)
-//     mstore(_2, _1)
-//     sstore(keccak256(_1, 0x40), 0x01)
-//     sstore(add(keccak256(_1, 0x40), 0x01), 0x03)
-//     sstore(add(keccak256(_1, 0x40), 2), 0x04)
-//     sstore(add(keccak256(_1, 0x40), 0x03), 2)
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul
deleted file mode 100644
index bd1e08bcd7d4..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(32)
-    sstore(x, y)
-    y := calldataload(64)
-    // cannot be removed
-    sstore(x, y)
-}
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     let x := calldataload(0)
-//     let y := calldataload(32)
-//     sstore(x, y)
-//     y := calldataload(64)
-//     sstore(x, y)
-// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul
deleted file mode 100644
index fcaddd12134d..000000000000
--- a/test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let a := calldataload(0)
-    let b := 20
-    sstore(a, b)
-    if calldataload(32) {
-        sstore(a, b)
-        pop(staticcall(0, 0, 0, 0, 0, 0))
-        verbatim_0i_0o("xyz")
-    }
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// step: equalStoreEliminator
-//
-// {
-//     let a := calldataload(0)
-//     let b := 20
-//     sstore(a, b)
-//     if calldataload(32)
-//     {
-//         pop(staticcall(0, 0, 0, 0, 0, 0))
-//         verbatim_0i_0o("xyz")
-//     }
-//     sstore(a, b)
-// }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
deleted file mode 100644
index b7a815dd9703..000000000000
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  f()
-  g()
-  function f() { mstore(0x01, mload(0x00)) }
-  function g() { mstore(1, mload(0)) }
-}
-// ----
-// step: equivalentFunctionCombiner
-//
-// {
-//     f()
-//     f()
-//     function f()
-//     { mstore(0x01, mload(0x00)) }
-//     function g()
-//     { mstore(1, mload(0)) }
-// }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/multiple_complex.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/multiple_complex.yul
deleted file mode 100644
index 5f561185d53e..000000000000
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/multiple_complex.yul
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  pop(f(1,2,3))
-  pop(g(4,5,6))
-  pop(h(7,8,9))
-  function f(f1, f2, f3) -> rf
-  {
-    switch f1
-        case 0 {
-            if f2
-            {
-                rf := f3
-            }
-            if not(f2)
-            {
-                rf := f1
-            }
-        }
-        default {
-            rf := 3
-        }
-  }
-  function g(g1, g2, g3) -> rg
-  {
-    switch g1
-        case 0 {
-            if g2
-            {
-                rg := g3
-            }
-            if not(g2)
-            {
-                rg := g1
-            }
-        }
-        default {
-            rg := 3
-        }
-  }
-  function h(h1, h2, h3) -> rh
-  {
-    switch h1
-        case 1 {
-            if h2
-            {
-                rh := h3
-            }
-            if not(h2)
-            {
-                rh := h1
-            }
-        }
-        default {
-            rh := 3
-        }
-  }
-}
-// ----
-// step: equivalentFunctionCombiner
-//
-// {
-//     pop(f(1, 2, 3))
-//     pop(f(4, 5, 6))
-//     pop(h(7, 8, 9))
-//     function f(f1, f2, f3) -> rf
-//     {
-//         switch f1
-//         case 0 {
-//             if f2 { rf := f3 }
-//             if not(f2) { rf := f1 }
-//         }
-//         default { rf := 3 }
-//     }
-//     function g(g1, g2, g3) -> rg
-//     {
-//         switch g1
-//         case 0 {
-//             if g2 { rg := g3 }
-//             if not(g2) { rg := g1 }
-//         }
-//         default { rg := 3 }
-//     }
-//     function h(h1, h2, h3) -> rh
-//     {
-//         switch h1
-//         case 1 {
-//             if h2 { rh := h3 }
-//             if not(h2) { rh := h1 }
-//         }
-//         default { rh := 3 }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/simple.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/simple.yul
deleted file mode 100644
index 69045f364141..000000000000
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/simple.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  f()
-  g()
-  function f() { mstore(1, mload(0)) }
-  function g() { mstore(1, mload(0)) }
-}
-// ----
-// step: equivalentFunctionCombiner
-//
-// {
-//     f()
-//     f()
-//     function f()
-//     { mstore(1, mload(0)) }
-//     function g()
-//     { mstore(1, mload(0)) }
-// }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/simple_different_vars.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/simple_different_vars.yul
deleted file mode 100644
index 5967adc0e13c..000000000000
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/simple_different_vars.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  pop(f())
-  pop(g())
-  function f() -> b { let a := mload(0) b := a }
-  function g() -> a { let b := mload(0) a := b }
-}
-// ----
-// step: equivalentFunctionCombiner
-//
-// {
-//     pop(f())
-//     pop(f())
-//     function f() -> b
-//     {
-//         let a := mload(0)
-//         b := a
-//     }
-//     function g() -> a_1
-//     {
-//         let b_2 := mload(0)
-//         a_1 := b_2
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/switch_case_order.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/switch_case_order.yul
deleted file mode 100644
index 490bfd07229b..000000000000
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/switch_case_order.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  f(0)
-  g(1)
-  function f(x) { switch x case 0 { mstore(0, 42) } case 1 { mstore(1, 42) } }
-  function g(x) { switch x case 1 { mstore(1, 42) } case 0 { mstore(0, 42) } }
-}
-// ----
-// step: equivalentFunctionCombiner
-//
-// {
-//     f(0)
-//     f(1)
-//     function f(x)
-//     {
-//         switch x
-//         case 0 { mstore(0, 42) }
-//         case 1 { mstore(1, 42) }
-//     }
-//     function g(x_1)
-//     {
-//         switch x_1
-//         case 1 { mstore(1, 42) }
-//         case 0 { mstore(0, 42) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/argument_duplication_heuristic.yul b/test/libyul/yulOptimizerTests/expressionInliner/argument_duplication_heuristic.yul
deleted file mode 100644
index 12228009ab83..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/argument_duplication_heuristic.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    // references parameter 1 times in function body
-    function ref1(a) -> x { x := add(a, 1) }
-    // references parameter 3 times in function body
-    function ref3(a) -> x { x := add(a, mul(a, a)) }
-    let y1 := ref1(calldatasize())
-    let y2 := ref3(calldatasize())
-    let y3 := ref1(0xff)
-    let y4 := ref3(0xff)
-    let y5 := ref1(0x123)
-    let y6 := ref3(0x123)
-    let y7 := ref1(mload(42))
-    let y8 := ref3(mload(42))
-    let y9 := ref1(ref3(7))
-    let y10:= ref3(ref1(7))
-    let y11:= ref1(y1)
-    let y12:= ref3(y1)
-}
-// ----
-// step: expressionInliner
-//
-// {
-//     function ref1(a) -> x
-//     { x := add(a, 1) }
-//     function ref3(a_1) -> x_2
-//     {
-//         x_2 := add(a_1, mul(a_1, a_1))
-//     }
-//     let y1 := add(calldatasize(), 1)
-//     let y2 := add(calldatasize(), mul(calldatasize(), calldatasize()))
-//     let y3 := add(0xff, 1)
-//     let y4 := add(0xff, mul(0xff, 0xff))
-//     let y5 := add(0x123, 1)
-//     let y6 := ref3(0x123)
-//     let y7 := ref1(mload(42))
-//     let y8 := ref3(mload(42))
-//     let y9 := add(add(7, mul(7, 7)), 1)
-//     let y10 := ref3(add(7, 1))
-//     let y11 := add(y1, 1)
-//     let y12 := add(y1, mul(y1, y1))
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/complex_with_evm.yul b/test/libyul/yulOptimizerTests/expressionInliner/complex_with_evm.yul
deleted file mode 100644
index 49237c2f640a..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/complex_with_evm.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    function f(a) -> x { x := add(a, a) }
-    let y := f(calldatasize())
-}
-// ----
-// step: expressionInliner
-//
-// {
-//     function f(a) -> x
-//     { x := add(a, a) }
-//     let y := add(calldatasize(), calldatasize())
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/double_calls.yul b/test/libyul/yulOptimizerTests/expressionInliner/double_calls.yul
deleted file mode 100644
index 42dc4f015f19..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/double_calls.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	function f(a) -> x { x := add(a, a) }
-	function g(b, c) -> y { y := mul(mload(c), f(b)) }
-	let y := g(calldatasize(), 7)
-}
-// ----
-// step: expressionInliner
-//
-// {
-//     function f(a) -> x
-//     { x := add(a, a) }
-//     function g(b, c) -> y
-//     { y := mul(mload(c), add(b, b)) }
-//     let y_1 := mul(mload(7), add(calldatasize(), calldatasize()))
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/double_recursive_calls.yul b/test/libyul/yulOptimizerTests/expressionInliner/double_recursive_calls.yul
deleted file mode 100644
index 337751a7241f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/double_recursive_calls.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	function f(a, r) -> x { x := g(a, g(r, r)) }
-	function g(b, s) -> y { y := f(b, f(s, s)) }
-	let y := g(calldatasize(), 7)
-}
-// ----
-// step: expressionInliner
-//
-// {
-//     function f(a, r) -> x
-//     { x := g(a, f(r, f(r, r))) }
-//     function g(b, s) -> y
-//     {
-//         y := f(b, g(s, f(s, f(s, s))))
-//     }
-//     let y_1 := f(calldatasize(), g(7, f(7, f(7, 7))))
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/no_inline_mload.yul b/test/libyul/yulOptimizerTests/expressionInliner/no_inline_mload.yul
deleted file mode 100644
index 1698ac5ace27..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/no_inline_mload.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-// Does not inline because mload could be moved out of sequence
-{
-    function f(a) -> x { x := a }
-    let y := f(mload(2))
-}
-// ----
-// step: expressionInliner
-//
-// {
-//     function f(a) -> x
-//     { x := a }
-//     let y := f(mload(2))
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul b/test/libyul/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul
deleted file mode 100644
index 48acca95c9da..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-// The calls to g and h cannot be moved because g and h are not movable. Therefore, the call
-// to f is not inlined.
-{
-	function f(a, b) -> x { x := add(b, a) }
-	function g() -> y { y := mload(0) mstore(0, 4) }
-	function h() -> z { mstore(0, 4) z := mload(0) }
-	let r := f(g(), h())
-}
-// ----
-// step: expressionInliner
-//
-// {
-//     function f(a, b) -> x
-//     { x := add(b, a) }
-//     function g() -> y
-//     {
-//         y := mload(0)
-//         mstore(0, 4)
-//     }
-//     function h() -> z
-//     {
-//         mstore(0, 4)
-//         z := mload(0)
-//     }
-//     let r := f(g(), h())
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
deleted file mode 100644
index 2b6dba24069f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    function f() -> x:u256 { x := 2:u256 }
-    let y:u256 := f()
-}
-// ====
-// dialect: yul
-// ----
-// step: expressionInliner
-//
-// {
-//     function f() -> x
-//     { x := 2 }
-//     let y := 2
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
deleted file mode 100644
index 0456654e3a82..000000000000
--- a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    function f(a:u256) -> x:u256 { x := a }
-    let y:u256 := f(7:u256)
-}
-// ====
-// dialect: yul
-// ----
-// step: expressionInliner
-//
-// {
-//     function f(a) -> x
-//     { x := a }
-//     let y := 7
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul b/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
deleted file mode 100644
index f7e0e2ea162d..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	let a := mload(3)
-	let b := sload(a)
-	let c := mload(7)
-	let d := add(c, b)
-	if d {
-		let x := mload(3)
-		let y := add(x, 3)
-	}
-	let z := 3
-	let t := add(z, 9)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         if add(mload(7), sload(mload(3))) { let y := add(mload(3), 3) }
-//         let t := add(3, 9)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul b/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
deleted file mode 100644
index b2f75828e806..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	let a := mload(3)
-	let b := mload(6)
-	let x := mul(add(b, a), mload(2))
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let a := mload(3)
-//         let b := mload(6)
-//         sstore(mul(add(b, a), mload(2)), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
deleted file mode 100644
index 6a9e1a336e60..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	let a := mload(2)
-	let b := mload(6)
-	let x := mul(add(b, a), 2)
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         sstore(mul(add(mload(6), mload(2)), 2), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
deleted file mode 100644
index cf90aa836fd2..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	// This is not joined because a is referenced multiple times
-	let a := mload(2)
-	let b := add(a, a)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let a := mload(2)
-//         let b := add(a, a)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
deleted file mode 100644
index 16bd1adedd25..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	// We have an interleaved "add" here, so we cannot inline "a"
-	// (note that this component does not analyze whether
-	// functions are pure or not)
-	let a := mload(2)
-	let b := mload(6)
-	let x := mul(a, add(2, b))
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let a := mload(2)
-//         sstore(mul(a, add(2, mload(6))), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
deleted file mode 100644
index 25cf9676cb31..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	let a := mload(2)
-	let b := mload(6)
-	let x := mul(add(a, b), 2)
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let a := mload(2)
-//         sstore(mul(add(a, mload(6)), 2), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
deleted file mode 100644
index f31be09c96f6..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	// The component will remove the empty block after
-	// it has handled the outer block.
-	// The idea behind this test is that the component
-	// does not perform replacements across blocks because
-	// they usually have contents, but adding contents
-	// will reduce the scope of the test.
-	let a := mload(2)
-	let x := calldataload(a)
-	{
-	}
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let x := calldataload(mload(2))
-//         sstore(x, 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
deleted file mode 100644
index 7e81adc7dedc..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	for { let b := mload(1) } b {} {}
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         for { let b := mload(1) } b { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
deleted file mode 100644
index bc5c5106dfea..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	let a := mload(0)
-	for { } a {} {}
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let a := mload(0)
-//         for { } a { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul b/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
deleted file mode 100644
index ac3d8e622191..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	// This is not joined because a is referenced multiple times
-	function f(a) -> x {
-		a := mload(2)
-		x := add(a, 3)
-	}
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     { }
-//     function f(a) -> x
-//     {
-//         a := mload(2)
-//         x := add(a, 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul b/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
deleted file mode 100644
index 2b5cce251f0f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	// This is not joined because a is referenced multiple times
-	let a := mload(2)
-	let b := mload(a)
-	a := 4
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let a := mload(2)
-//         let b := mload(a)
-//         a := 4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul b/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
deleted file mode 100644
index ed8a2826228e..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	let a := mload(2)
-	let x := calldataload(a)
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         sstore(calldataload(mload(2)), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul b/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
deleted file mode 100644
index beb3b8ab59b0..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	let a := mload(3)
-	let b := sload(a)
-	let c := mload(7)
-	let d := add(b, c)
-	sstore(d, 0)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         let b := sload(mload(3))
-//         sstore(add(b, mload(7)), 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul b/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
deleted file mode 100644
index 69c4afdda6d5..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: expressionJoiner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul b/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
deleted file mode 100644
index c17e8d3dc154..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	let a := mload(3)
-	let b := sload(a)
-	let c := mload(7)
-	let d := add(c, b)
-	switch d
-	case 3 {
-		let x := mload(3)
-		let y := add(x, 3)
-	}
-	default {
-		sstore(1, 0)
-	}
-	let z := 3
-	let t := add(z, 9)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         switch add(mload(7), sload(mload(3)))
-//         case 3 { let y := add(mload(3), 3) }
-//         default { sstore(1, 0) }
-//         let t := add(3, 9)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul b/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
deleted file mode 100644
index e0a5dca4d2a1..000000000000
--- a/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	let a := mload(2)
-	let b := mload(6)
-	let c := mload(7)
-	let x := mul(add(c, b), a)
-	sstore(x, 3)
-}
-// ----
-// step: expressionJoiner
-//
-// {
-//     {
-//         sstore(mul(add(mload(7), mload(6)), mload(2)), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul
deleted file mode 100644
index 1fce6767ed5a..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	function f() -> x, z {}
-	let c, d := f()
-	let y := add(d, add(c, 7))
-	sstore(y, 20)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let c, d := f()
-//         sstore(add(add(d, c), 7), 20)
-//     }
-//     function f() -> x, z
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul
deleted file mode 100644
index f9405e101344..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, byte(0, shr(0x9, calldataload(0))))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul
deleted file mode 100644
index f462486ea196..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    mstore(0, mod(add(mload(0), mload(1)), 32))
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _3 := mload(1)
-//         let _4 := 0
-//         mstore(_4, addmod(mload(_4), _3, 32))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul
deleted file mode 100644
index 93edb5319658..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    mstore(0, mod(mul(mload(0), mload(1)), 32))
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _3 := mload(1)
-//         let _4 := 0
-//         mstore(_4, mulmod(mload(_4), _3, 32))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul
deleted file mode 100644
index 9bb106c89e4f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    // This is not fully simplified on purpose because we
-    // need another split step in between. The full simplification
-    // is tested in the fullSuite.
-    let x := calldataload(0)
-    let a := and(0xff, shr(248, shl(248, shr(248, x))))
-    let b := shr(12, shl(8, and(x, 0xf0f0)))
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let a := and(0xff, and(shr(248, x), 255))
-//         sstore(a, shr(12, and(shl(8, x), 15790080)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul
deleted file mode 100644
index 6e39f2a1dc36..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    // This is not fully simplified on purpose because we
-    // need another split step in between. The full simplification
-    // is tested in the fullSuite.
-    let x := calldataload(0)
-    let a := and(0xff, shr(248, shl(248, shr(248, and(x, 0xf)))))
-    let b := shl(12, shr(4, and(x, 0xf0f0)))
-    let c := shl(12, shr(4, and(0xf0f0, x)))
-    let d := shl(12, shr(255, and(0xf0f0, x)))
-    let e := shl(255, shr(4, and(0xf0f0, x)))
-    let f := shl(12, shr(256, and(0xf0f0, x)))
-    let g := shl(256, shr(4, and(0xf0f0, x)))
-    sstore(10, a)
-    sstore(11, b)
-    sstore(12, c)
-    sstore(13, d)
-    sstore(14, e)
-    sstore(15, f)
-    sstore(16, g)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let _2 := 0xf
-//         let _5 := and(shr(248, x), 0)
-//         let _10 := 0xff
-//         let a := and(_5, 255)
-//         let _14 := and(shr(4, x), 3855)
-//         let _15 := 12
-//         let b := shl(_15, _14)
-//         let _19 := and(shr(4, x), 3855)
-//         let c := shl(_15, _19)
-//         let d := shl(_15, and(shr(255, x), 0))
-//         let e := shl(_10, _19)
-//         let f := 0
-//         let g := 0
-//         sstore(10, a)
-//         sstore(11, b)
-//         sstore(_15, c)
-//         sstore(13, d)
-//         sstore(14, e)
-//         sstore(_2, f)
-//         sstore(16, g)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul
deleted file mode 100644
index 9df15b4e9c6f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    // This is not fully simplified on purpose because we
-    // need another split step in between. The full simplification
-    // is tested in the fullSuite.
-    let x := calldataload(0)
-    let a := shl(12, shr(4, x))
-    let b := shl(4, shr(12, x))
-    let c := shr(12, shl(4, x))
-    let d := shr(4, shl(12, x))
-    let e := shl(150, shr(2, shl(150, x)))
-    sstore(15, x)
-    sstore(16, a)
-    sstore(17, b)
-    sstore(18, c)
-    sstore(19, d)
-    sstore(20, e)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let a := and(shl(8, x), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000)
-//         let b := and(shr(8, x), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0)
-//         let c := and(shr(8, x), 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-//         let d := and(shl(8, x), 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00)
-//         let _14 := 150
-//         let e := shl(_14, and(shl(148, x), 0x3ffffffffffffffffffffffffff0000000000000000000000000000000000000))
-//         sstore(15, x)
-//         sstore(16, a)
-//         sstore(17, b)
-//         sstore(18, c)
-//         sstore(19, d)
-//         sstore(20, e)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
deleted file mode 100644
index 557142fa54b3..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  let a := add(7, sub(mload(0), 7))
-  mstore(20, a)
-}
-// ----
-// step: expressionSimplifier
-//
-// { { mstore(20, mload(0)) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
deleted file mode 100644
index bbd8f2d122d4..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  let a := add(1, mul(3, 4))
-  sstore(7, a)
-}
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(7, 13) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul
deleted file mode 100644
index a431c57a6c6c..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    // This is not fully simplified on purpose because we
-    // need another split step in between. The full simplification
-    // is tested in the fullSuite.
-    let a := and(create2(0, 0, 0x20, 0), 0xffffffffffffffffffffffffffffffffffffffff)
-    let b := and(0xffffffffffffffffffffffffffffffffffffffff, create2(0, 0, 0x20, 0))
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0xffffffffffffffffffffffffffffffffffffffff
-//         let _2 := 0
-//         let _3 := 0x20
-//         let a := and(create2(_2, _2, _3, _2), _1)
-//         sstore(a, and(_1, create2(_2, _2, _3, _2)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul
deleted file mode 100644
index 3710cbebdf48..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    // This is not fully simplified on purpose because we
-    // need another split step in between. The full simplification
-    // is tested in the fullSuite.
-    let c := create(0, 0, 0x20)
-    let a := and(c, 0xffffffffffffffffffffffffffffffffffffffff)
-    let b := and(0xffffffffffffffffffffffffffffffffffffffff, create(0, 0, 0x20))
-    sstore(a, b)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0x20
-//         let _2 := 0
-//         let c := create(_2, _2, _1)
-//         let _4 := 0xffffffffffffffffffffffffffffffffffffffff
-//         let a := and(c, _4)
-//         sstore(a, and(_4, create(_2, _2, _1)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul
deleted file mode 100644
index 4a5d218053c0..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let t := calldataload(0)
-    sstore(0, exp(0, t))
-    sstore(1, exp(1, t))
-    sstore(2, exp(2, t))
-    // The following should not be simplified
-    sstore(3, exp(8, t))
-    sstore(4, exp(115792089237316195423570985008687907853269984665640564039457584007913129639935, t))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         let t := calldataload(_1)
-//         sstore(_1, iszero(t))
-//         sstore(1, 1)
-//         let _8 := 2
-//         sstore(_8, shl(t, 1))
-//         sstore(3, exp(8, t))
-//         sstore(4, sub(iszero(and(t, 1)), and(t, 1)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul
deleted file mode 100644
index 5b11fa7c8e8a..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := calldataload(0)
-    let z := calldataload(1)
-    let t := and(and(x, z), x)
-    let w := or(or(x, z), x)
-    sstore(t, w)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let z := calldataload(1)
-//         let t := and(x, z)
-//         sstore(t, or(x, z))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
deleted file mode 100644
index af88cbac6de2..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let a := sub(calldataload(0), calldataload(0))
-    sstore(0, a)
-}
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
deleted file mode 100644
index 80f19a1b5350..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let a := sub(calldataload(1), calldataload(0))
-    sstore(0, a)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         sstore(_1, sub(calldataload(1), calldataload(_1)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
deleted file mode 100644
index 87677dfea24a..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let a := mload(0)
-    let b := sub(a, a)
-    sstore(0, b)
-}
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
deleted file mode 100644
index 42cd772e9fa2..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f() -> a {}
-    let b := add(7, sub(f(), 7))
-    sstore(0, b)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     { sstore(0, f()) }
-//     function f() -> a
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
deleted file mode 100644
index 5a7c8939a6ad..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let a := 10
-    for {  } iszero(eq(a, 0)) { a := add(a, 1) } {}
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let a := 10
-//         for { } iszero(iszero(a)) { a := add(a, 1) }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
deleted file mode 100644
index 78565bbe5b38..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let a := mload(sub(7, 7))
-    let b := sub(a, 0)
-    sstore(0, b)
-}
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(0, mload(0)) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul
deleted file mode 100644
index 3e0f785e954a..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := calldataload(0)
-    let b := calldataload(0x20)
-    let x := sub(a, b)
-    if iszero(x) {
-        sstore(0, 1)
-    }
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         let a := calldataload(_1)
-//         if eq(a, calldataload(0x20)) { sstore(_1, 1) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul
deleted file mode 100644
index 19d65dca4152..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    let a := calldataload(0)
-    let b := byte(33, a)
-    let c := byte(20, a)
-    // create cannot be removed.
-    let d := byte(33, create(0, 0, 0x20))
-    sstore(7, a)
-    sstore(8, b)
-    sstore(9, c)
-    sstore(10, d)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         let a := calldataload(_1)
-//         let b := 0
-//         let c := byte(20, a)
-//         pop(create(_1, _1, 0x20))
-//         let d := 0
-//         sstore(7, a)
-//         sstore(8, b)
-//         sstore(9, c)
-//         sstore(10, d)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
deleted file mode 100644
index 88ed926b18f7..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    mstore(0, mod(calldataload(0), exp(2, 8)))
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _4 := 0
-//         mstore(_4, and(calldataload(_4), 255))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
deleted file mode 100644
index a62c5904cfd5..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    mstore(0, mod(calldataload(0), exp(2, 255)))
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _4 := 0
-//         mstore(_4, and(calldataload(_4), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
deleted file mode 100644
index c4269352191c..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    function f(a) -> b { }
-    let c := sub(f(0), f(1))
-    sstore(0, c)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _2 := f(1)
-//         let _3 := 0
-//         sstore(_3, sub(f(_3), _2))
-//     }
-//     function f(a) -> b
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
deleted file mode 100644
index 524567705345..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	function f1() -> a { }
-	function f2() -> b { }
-	let c := sub(f1(), f2())
-	sstore(0, c)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     { sstore(0, sub(f1(), f2())) }
-//     function f1() -> a
-//     { }
-//     function f2() -> b
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
deleted file mode 100644
index b0215685de0f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-// Even if the functions pass the equality check, they are not movable.
-{
-	function f() -> a { mstore(0, 1) }
-	let b := sub(f(), f())
-	sstore(b, 8)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     { sstore(sub(f(), f()), 8) }
-//     function f() -> a
-//     { mstore(0, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
deleted file mode 100644
index a7be174e35a4..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-// The first argument of div is not constant.
-// keccak256 is not movable.
-{
-	sstore(0, msize())
-	let a := div(keccak256(0, 0), 0)
-	sstore(20, a)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := msize()
-//         let _2 := 0
-//         sstore(_2, _1)
-//         pop(keccak256(_2, _2))
-//         sstore(20, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul
deleted file mode 100644
index 27d1845f5651..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := and(shl(x, 248), shl(x, 12))
-    sstore(10, a)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         sstore(10, shl(calldataload(0), 8))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul
deleted file mode 100644
index abd1b1743d32..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  sstore(0, byte(0, shr(0x8, call(0, 0, 0, 0, 0, 0, 0))))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         pop(call(_1, _1, _1, _1, _1, _1, _1))
-//         sstore(_1, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul
deleted file mode 100644
index 6465aa7974ba..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  function f() -> x { mstore(0, 1337) }
-  mstore(0, byte(0, shr(0x8, f())))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         pop(f())
-//         mstore(0, 0)
-//     }
-//     function f() -> x
-//     { mstore(0, 1337) }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul
deleted file mode 100644
index b822b402b3ff..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  function f() -> x {}
-  sstore(0, byte(0, shr(0x8, f())))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul
deleted file mode 100644
index d0cf0a6eed0c..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	let x := mload(0)
-	x := 0
-	mstore(0, add(7, x))
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         let x := mload(_1)
-//         x := _1
-//         mstore(_1, 7)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul
deleted file mode 100644
index a4d3012c33b1..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let a := and(0xff, shr(248, calldataload(0)))
-    let b := and(shr(248, calldataload(0)), 0xff)
-    let c := and(shr(249, calldataload(0)), 0xfa)
-    let d := and(shr(247, calldataload(0)), 0xff)
-    sstore(a, b)
-    sstore(c, d)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _2 := calldataload(0)
-//         let _5 := 0xff
-//         let a := shr(248, _2)
-//         let b := shr(248, _2)
-//         let c := and(shr(249, _2), 0xfa)
-//         let d := and(shr(247, _2), _5)
-//         sstore(a, b)
-//         sstore(c, d)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul
deleted file mode 100644
index 85c86f0e4b99..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let a := shl(299, calldataload(0))
-    let b := shr(299, calldataload(1))
-    let c := shl(255, calldataload(2))
-    let d := shr(255, calldataload(3))
-    sstore(a, b)
-    sstore(c, d)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let a := 0
-//         let b := 0
-//         let _8 := calldataload(2)
-//         let _9 := 255
-//         let c := shl(_9, _8)
-//         let d := shr(_9, calldataload(3))
-//         sstore(a, b)
-//         sstore(c, d)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
deleted file mode 100644
index 73a79410dfeb..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-// return variables are assumed to be zero initially.
-{
-    function f() -> c, d {
-    	let y := add(d, add(c, 7))
-        sstore(0, y)
-    }
-    let t, v := f()
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     { let t, v := f() }
-//     function f() -> c, d
-//     { sstore(0, 7) }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
deleted file mode 100644
index b83b77c216a4..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let a := add(0, mload(0))
-    sstore(0, a)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         sstore(_1, mload(_1))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul
deleted file mode 100644
index 3f30eefd65b6..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    sstore(0, balance(address()))
-}
-// ====
-// EVMVersion: <istanbul
-// ----
-// step: expressionSimplifier
-//
-// {
-//     { sstore(0, balance(address())) }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul
deleted file mode 100644
index 72562a2fdea3..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    let a := address()
-    let ret := balance(a)
-    sstore(a, ret)
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let a := address()
-//         sstore(a, selfbalance())
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul
deleted file mode 100644
index 7ed42b360ee8..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    sstore(0, balance(address()))
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(0, selfbalance()) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
deleted file mode 100644
index 9c3a5c8ba29e..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  for {} div(create(0, 1, 1), shl(msize(), 1)) {}
-  {
-  }
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         for { } div(create(0, 1, 1), shl(msize(), 1)) { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
deleted file mode 100644
index 0fae4792fdff..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: expressionSimplifier
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul
deleted file mode 100644
index a15cca231d42..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-// Unassigned variables are assumed to be zero.
-{
-	let c, d
-	let y := add(d, add(c, 7))
-	sstore(0, y)
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let c, d
-//         sstore(d, 7)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul
deleted file mode 100644
index b6828cf8c46f..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-// Unassigned variables are assumed to be zero.
-{
-	let c
-	let d
-	let y := add(d, add(c, 7))
-	sstore(8, y)
-}
-// ----
-// step: expressionSimplifier
-//
-// { { sstore(8, 7) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul
deleted file mode 100644
index ee7464932d3a..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	revert(calldataload(0), 0)
-	revert(call(0,0,0,0,0,0,0), 0)
-	calldatacopy(calldataload(1), calldataload(2), 0)
-	return(calldataload(3), 0)
-	codecopy(calldataload(4), calldataload(5), sub(42,42))
-}
-// ----
-// step: expressionSimplifier
-//
-// {
-//     {
-//         let _1 := 0
-//         revert(0, _1)
-//         pop(call(_1, _1, _1, _1, _1, _1, _1))
-//         revert(0, _1)
-//         calldatacopy(0, calldataload(2), _1)
-//         return(0, _1)
-//         codecopy(0, calldataload(5), 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/control_flow.yul b/test/libyul/yulOptimizerTests/expressionSplitter/control_flow.yul
deleted file mode 100644
index d56a5285e519..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/control_flow.yul
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	let x := calldataload(0)
-	if mul(add(x, 2), 3) {
-		for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) } {
-			let b := mul(add(a, 2), 4)
-			sstore(b, mul(b, 2))
-		}
-	}
-}
-// ----
-// step: expressionSplitter
-//
-// {
-//     let _1 := 0
-//     let x := calldataload(_1)
-//     let _2 := 3
-//     let _3 := 2
-//     let _4 := add(x, _3)
-//     let _5 := mul(_4, _2)
-//     if _5
-//     {
-//         for { let a := 2 }
-//         lt(a, mload(a))
-//         {
-//             let _6 := 2
-//             let _7 := mul(a, _6)
-//             a := add(a, _7)
-//         }
-//         {
-//             let _8 := 4
-//             let _9 := 2
-//             let _10 := add(a, _9)
-//             let b := mul(_10, _8)
-//             let _11 := 2
-//             let _12 := mul(b, _11)
-//             sstore(b, _12)
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/inside_function.yul b/test/libyul/yulOptimizerTests/expressionSplitter/inside_function.yul
deleted file mode 100644
index 294cac14ab19..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/inside_function.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	let x := mul(f(0, mload(7)), 3)
-	function f(a, b) -> c {
-		c := mul(a, mload(add(b, c)))
-	}
-	sstore(x, f(mload(2), mload(2)))
-}
-// ----
-// step: expressionSplitter
-//
-// {
-//     let _1 := 3
-//     let _2 := 7
-//     let _3 := mload(_2)
-//     let _4 := 0
-//     let _5 := f(_4, _3)
-//     let x := mul(_5, _1)
-//     function f(a, b) -> c
-//     {
-//         let _6 := add(b, c)
-//         let _7 := mload(_6)
-//         c := mul(a, _7)
-//     }
-//     let _8 := 2
-//     let _9 := mload(_8)
-//     let _10 := 2
-//     let _11 := mload(_10)
-//     let _12 := f(_11, _9)
-//     sstore(x, _12)
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/object_access.yul b/test/libyul/yulOptimizerTests/expressionSplitter/object_access.yul
deleted file mode 100644
index bcd6d0f7bba5..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/object_access.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-object "main" {
-    code {
-        // We should never split arguments to ``dataoffset``
-        // or ``datasize`` because they need to be literals
-        let x := dataoffset("abc")
-        let y := datasize("abc")
-        // datacopy is fine, though
-        datacopy(mload(0), mload(1), mload(2))
-    }
-    data "abc" "Hello, World!"
-}
-// ----
-// step: expressionSplitter
-//
-// object "main" {
-//     code {
-//         let x := dataoffset("abc")
-//         let y := datasize("abc")
-//         let _1 := 2
-//         let _2 := mload(_1)
-//         let _3 := 1
-//         let _4 := mload(_3)
-//         let _5 := 0
-//         let _6 := mload(_5)
-//         datacopy(_6, _4, _2)
-//     }
-//     data "abc" hex"48656c6c6f2c20576f726c6421"
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/smoke.yul b/test/libyul/yulOptimizerTests/expressionSplitter/smoke.yul
deleted file mode 100644
index c5f979bf1a54..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: expressionSplitter
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/switch.yul b/test/libyul/yulOptimizerTests/expressionSplitter/switch.yul
deleted file mode 100644
index 3664a7e26474..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/switch.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    let x := 8
-    switch add(2, calldataload(0))
-    case 0 { sstore(0, mload(2)) }
-    default { mstore(0, mload(3)) }
-    x := add(mload(3), 4)
-}
-// ----
-// step: expressionSplitter
-//
-// {
-//     let x := 8
-//     let _1 := 0
-//     let _2 := calldataload(_1)
-//     let _3 := 2
-//     let _4 := add(_3, _2)
-//     switch _4
-//     case 0 {
-//         let _5 := 2
-//         let _6 := mload(_5)
-//         let _7 := 0
-//         sstore(_7, _6)
-//     }
-//     default {
-//         let _8 := 3
-//         let _9 := mload(_8)
-//         let _10 := 0
-//         mstore(_10, _9)
-//     }
-//     let _11 := 4
-//     let _12 := 3
-//     let _13 := mload(_12)
-//     x := add(_13, _11)
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/trivial.yul b/test/libyul/yulOptimizerTests/expressionSplitter/trivial.yul
deleted file mode 100644
index a70827b93048..000000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/trivial.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    mstore(add(calldataload(2), mload(3)), 8)
-}
-// ----
-// step: expressionSplitter
-//
-// {
-//     let _1 := 8
-//     let _2 := 3
-//     let _3 := mload(_2)
-//     let _4 := 2
-//     let _5 := calldataload(_4)
-//     let _6 := add(_5, _3)
-//     mstore(_6, _1)
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul
deleted file mode 100644
index 99e92c183edc..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	mstore(0x40, memoryguard(0))
-	function g() -> a, b {
-		a := 21
-		let $c := 1
-		b,a,$c := z()
-	}
-	function f() -> x {
-		let $x2
-		$x2 := 42
-		let $x3, $x4 := g()
-		x := mul(add($x2, $x3), h($x4))
-		sstore($x3, $x4)
-	}
-	function h(v) -> a {
-		let x, $z, y := z()
-		a, $z, v := z()
-	}
-	function z() -> a,b,c { let $x := 0 }
-	sstore(0, f())
-	let x, y := g()
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     function g() -> a, b
-//     {
-//         a := 21
-//         mstore(0x60, 1)
-//         let b_1, a_2, $c_3 := z()
-//         mstore(0x60, $c_3)
-//         a := a_2
-//         b := b_1
-//     }
-//     function f() -> x
-//     {
-//         mstore(0x40, 0)
-//         mstore(0x40, 42)
-//         let $x3_4, $x4_5 := g()
-//         mstore(0x00, $x4_5)
-//         mstore(0x20, $x3_4)
-//         x := mul(add(mload(0x40), mload(0x20)), h(mload(0x00)))
-//         sstore(mload(0x20), mload(0x00))
-//     }
-//     function h(v) -> a_1
-//     {
-//         let x_2_6, $z_7, y_8 := z()
-//         mstore(0x60, $z_7)
-//         let y := y_8
-//         let x_2 := x_2_6
-//         let a_1_9, $z_10, v_11 := z()
-//         mstore(0x60, $z_10)
-//         v := v_11
-//         a_1 := a_1_9
-//     }
-//     function z() -> a_3, b_4, c
-//     { mstore(0x80, 0) }
-//     sstore(0, f())
-//     let x_5, y_6 := g()
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/function_arg.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/function_arg.yul
deleted file mode 100644
index 0e5aa9e130f5..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/function_arg.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	mstore(0x40, memoryguard(0))
-	let $x := 0
-	sstore(0, $x)
-	function h($hx) -> y {
-		y := $hx
-	}
-	sstore(1, h(32))
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0x40))
-//     mstore(0x00, 0)
-//     sstore(0, mload(0x00))
-//     function h($hx) -> y
-//     {
-//         mstore(0x20, $hx)
-//         y := mload(0x20)
-//     }
-//     sstore(1, h(32))
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/multi_variable_declaration_without_value.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/multi_variable_declaration_without_value.yul
deleted file mode 100644
index 5650b580da5f..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/multi_variable_declaration_without_value.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  mstore(0x40, memoryguard(0x60))
-  {
-    let x, y
-  }
-  {
-    let z, $w
-  }
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0x80))
-//     { let x, y }
-//     {
-//         let z_1, $w_2
-//         mstore(0x60, $w_2)
-//         let z := z_1
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/outer_block.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/outer_block.yul
deleted file mode 100644
index 023100cddee6..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/outer_block.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    mstore(0x40, memoryguard(0x80))
-    let $x := 42
-    sstore(42, $x)
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     mstore(0x80, 42)
-//     sstore(42, mload(0x80))
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_leave.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_leave.yul
deleted file mode 100644
index 3b43bd534309..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_leave.yul
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(0x80))
-        let a1, a2 := f()
-        sstore(a1, a2)
-    }
-    function g(x) -> a, b { a := x b := 2 }
-    function f() -> $b1, $b2 {
-        if calldataload(0) {
-            $b1, $b2 := g(1)
-            leave
-        }
-        $b1, $b2 := g(2)
-    }
-
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0xc0))
-//         f()
-//         let a2 := mload(0x80)
-//         let a1 := mload(0xa0)
-//         sstore(a1, a2)
-//     }
-//     function g(x) -> a, b
-//     {
-//         a := x
-//         b := 2
-//     }
-//     function f()
-//     {
-//         mstore(0xa0, 0)
-//         mstore(0x80, 0)
-//         if calldataload(0)
-//         {
-//             let $b1_1, $b2_2 := g(1)
-//             mstore(0x80, $b2_2)
-//             mstore(0xa0, $b1_1)
-//             leave
-//         }
-//         let $b1_3, $b2_4 := g(2)
-//         mstore(0x80, $b2_4)
-//         mstore(0xa0, $b1_3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_one.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_one.yul
deleted file mode 100644
index 50a9d64869f5..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_one.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(0x80))
-        sstore(0, f())
-    }
-    function f() -> $b1 {
-        if calldataload(0) {
-            $b1 := 0
-            leave
-        }
-        $b1 := 1
-    }
-
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0xa0))
-//         sstore(0, f())
-//     }
-//     function f() -> $b1
-//     {
-//         mstore(0x80, 0)
-//         f_1()
-//         $b1 := mload(0x80)
-//     }
-//     function f_1()
-//     {
-//         if calldataload(0)
-//         {
-//             mstore(0x80, 0)
-//             leave
-//         }
-//         mstore(0x80, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_one_with_args.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_one_with_args.yul
deleted file mode 100644
index 706a46c6280c..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/return_one_with_args.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(0x80))
-        sstore(0, f(1,2,3))
-    }
-    function f(a, b, c) -> $b1 {
-        if calldataload(add(sub(a,b),c)) {
-            $b1 := 0
-            leave
-        }
-        $b1 := 1
-    }
-
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0xa0))
-//         sstore(0, f(1, 2, 3))
-//     }
-//     function f(a_2, b_3, c_4) -> $b1
-//     {
-//         mstore(0x80, 0)
-//         f_1(a_2, b_3, c_4)
-//         $b1 := mload(0x80)
-//     }
-//     function f_1(a, b, c)
-//     {
-//         if calldataload(add(sub(a, b), c))
-//         {
-//             mstore(0x80, 0)
-//             leave
-//         }
-//         mstore(0x80, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/same_variable_in_lhs_and_rhs.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/same_variable_in_lhs_and_rhs.yul
deleted file mode 100644
index e6a9379dfde2..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/same_variable_in_lhs_and_rhs.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    function f(x) -> y { y := x }
-    mstore(0x40, memoryguard(0))
-
-    let $z := 42
-    $z := f($z)
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     function f(x) -> y
-//     { y := x }
-//     mstore(0x40, memoryguard(0x20))
-//     mstore(0x00, 42)
-//     mstore(0x00, f(mload(0x00)))
-// }
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul
deleted file mode 100644
index e86619e464b2..000000000000
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-	mstore(0x40, memoryguard(0))
-	function f() {
-	    let $fx
-	    let $fy := 42
-	    sstore($fx, $fy)
-	    $fx := 21
-	}
-	function g(gx) {
-	    let $gx, $gy := tuple2()
-	    { $gx, $gy := tuple2() }
-	    { $gx, gx := tuple2() }
-	    { gx, $gy := tuple2() }
-	}
-	function h(hx, hy, hz, hw) {
-	    let $hx, $hy, $hz, $hw := tuple4()
-	    { hx, $hy, hz, $hw := tuple4() }
-	    { $hx, $hy, hz, hw := tuple4() }
-	}
-	function tuple2() -> a, b {}
-	function tuple4() -> a, b, c, d {}
-    f()
-    g(0)
-    h(1, 2, 3, 4)
-}
-// ----
-// step: fakeStackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0x80))
-//     function f()
-//     {
-//         mstore(0x60, 0)
-//         mstore(0x40, 42)
-//         sstore(mload(0x60), mload(0x40))
-//         mstore(0x60, 21)
-//     }
-//     function g(gx)
-//     {
-//         let $gx_1, $gy_2 := tuple2()
-//         mstore(0x40, $gy_2)
-//         mstore(0x60, $gx_1)
-//         {
-//             let $gx_3, $gy_4 := tuple2()
-//             mstore(0x40, $gy_4)
-//             mstore(0x60, $gx_3)
-//         }
-//         {
-//             let $gx_5, gx_6 := tuple2()
-//             mstore(0x60, $gx_5)
-//             gx := gx_6
-//         }
-//         {
-//             let gx_7, $gy_8 := tuple2()
-//             mstore(0x40, $gy_8)
-//             gx := gx_7
-//         }
-//     }
-//     function h(hx, hy, hz, hw)
-//     {
-//         let $hx_9, $hy_10, $hz_11, $hw_12 := tuple4()
-//         mstore(0x00, $hw_12)
-//         mstore(0x20, $hz_11)
-//         mstore(0x40, $hy_10)
-//         mstore(0x60, $hx_9)
-//         {
-//             let hx_13, $hy_14, hz_15, $hw_16 := tuple4()
-//             mstore(0x00, $hw_16)
-//             mstore(0x40, $hy_14)
-//             hz := hz_15
-//             hx := hx_13
-//         }
-//         {
-//             let $hx_17, $hy_18, hz_19, hw_20 := tuple4()
-//             mstore(0x40, $hy_18)
-//             mstore(0x60, $hx_17)
-//             hw := hw_20
-//             hz := hz_19
-//         }
-//     }
-//     function tuple2() -> a, b
-//     { }
-//     function tuple4() -> a_1, b_2, c, d
-//     { }
-//     f()
-//     g(0)
-//     h(1, 2, 3, 4)
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/cond_types.yul b/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/cond_types.yul
deleted file mode 100644
index 031507a38026..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/cond_types.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  let a := 1
-  for { } 42 { } { }
-  for { } "hello" { } { }
-  for { } 0 { } { }
-  for { } a { } { }
-  for { } add(a, a) { } { }
-}
-// ----
-// step: forLoopConditionIntoBody
-//
-// {
-//     let a := 1
-//     for { } 42 { }
-//     { }
-//     for { } "hello" { }
-//     { }
-//     for { } 0 { }
-//     { }
-//     for { } a { }
-//     { }
-//     for { } true { }
-//     {
-//         if iszero(add(a, a)) { break }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/empty_body.yul b/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/empty_body.yul
deleted file mode 100644
index 41c9e4234b77..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/empty_body.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } { }
-}
-// ----
-// step: forLoopConditionIntoBody
-//
-// {
-//     for { let a := 1 } true { a := add(a, 1) }
-//     {
-//         if iszero(iszero(eq(a, 10))) { break }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/nested.yul b/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/nested.yul
deleted file mode 100644
index acbe3e456918..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/nested.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  let random := 42
-  for {
-    for { let a := 1} iszero(eq(a,10)) {} {
-      a := add(a, 1)
-    }
-	let b := 1
-  } iszero(eq(b, 10)) {
-    for { let c := 1 } iszero(eq(c,2)) { c := add(c, 1) } {
-      b := add(b, 1)
-    }
-  } {
-    mstore(b,b)
-  }
-}
-// ----
-// step: forLoopConditionIntoBody
-//
-// {
-//     let random := 42
-//     for {
-//         for { let a := 1 } true { }
-//         {
-//             if iszero(iszero(eq(a, 10))) { break }
-//             a := add(a, 1)
-//         }
-//         let b := 1
-//     }
-//     true
-//     {
-//         for { let c := 1 } true { c := add(c, 1) }
-//         {
-//             if iszero(iszero(eq(c, 2))) { break }
-//             b := add(b, 1)
-//         }
-//     }
-//     {
-//         if iszero(iszero(eq(b, 10))) { break }
-//         mstore(b, b)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/simple.yul b/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/simple.yul
deleted file mode 100644
index bbe7823072dc..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopConditionIntoBody/simple.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  let random := 42
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    a := add(a, 1)
-  }
-}
-// ----
-// step: forLoopConditionIntoBody
-//
-// {
-//     let random := 42
-//     for { let a := 1 } true { a := add(a, 1) }
-//     {
-//         if iszero(iszero(eq(a, 10))) { break }
-//         a := add(a, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopInitRewriter/complex_pre.yul b/test/libyul/yulOptimizerTests/forLoopInitRewriter/complex_pre.yul
deleted file mode 100644
index 6304c4de57a3..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopInitRewriter/complex_pre.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  let random := 42
-  for { let a := 1
-	    let b := 1 } iszero(eq(a, 10)) { a := add(a, b) } {
-    a := add(a, 1)
-  }
-}
-// ----
-// step: forLoopInitRewriter
-//
-// {
-//     let random := 42
-//     let a := 1
-//     let b := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, b) }
-//     { a := add(a, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopInitRewriter/empty_pre.yul b/test/libyul/yulOptimizerTests/forLoopInitRewriter/empty_pre.yul
deleted file mode 100644
index 38a00f752860..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopInitRewriter/empty_pre.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  let a := 1
-  for {} iszero(eq(a, 10)) { a := add(a, 1) } {
-    a := add(a, 1)
-  }
-}
-// ----
-// step: forLoopInitRewriter
-//
-// {
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { a := add(a, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopInitRewriter/nested.yul b/test/libyul/yulOptimizerTests/forLoopInitRewriter/nested.yul
deleted file mode 100644
index 331d9cdde435..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopInitRewriter/nested.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  let random := 42
-  for {
-    for { let a := 1} iszero(eq(a,10)) {} {
-      a := add(a, 1)
-    }
-	let b := 1
-  } iszero(eq(b, 10)) {
-    for { let c := 1 } iszero(eq(c,2)) { c := add(c, 1) } {
-      b := add(b, 1)
-    }
-  } {
-    mstore(b,b)
-  }
-}
-// ----
-// step: forLoopInitRewriter
-//
-// {
-//     let random := 42
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { }
-//     { a := add(a, 1) }
-//     let b := 1
-//     for { }
-//     iszero(eq(b, 10))
-//     {
-//         let c := 1
-//         for { } iszero(eq(c, 2)) { c := add(c, 1) }
-//         { b := add(b, 1) }
-//     }
-//     { mstore(b, b) }
-// }
diff --git a/test/libyul/yulOptimizerTests/forLoopInitRewriter/simple.yul b/test/libyul/yulOptimizerTests/forLoopInitRewriter/simple.yul
deleted file mode 100644
index 0dad899616d5..000000000000
--- a/test/libyul/yulOptimizerTests/forLoopInitRewriter/simple.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  let random := 42
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    a := add(a, 1)
-  }
-}
-// ----
-// step: forLoopInitRewriter
-//
-// {
-//     let random := 42
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { a := add(a, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
deleted file mode 100644
index 94b0c72d2934..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    function fun_revert() -> ret { revert(0, 0) }
-    function fun_return() -> ret { return(0, 0) }
-    function empty(a, b) {}
-
-    // Evaluation order in Yul is right to left so fun_revert() should run first.
-    empty(fun_return(), fun_revert())
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let ret_7 := 0
-//         revert(0, 0)
-//         let _1 := ret_7
-//         let ret_1_10 := 0
-//         return(0, 0)
-//         let _2 := ret_1_10
-//         let b_13 := _1
-//         let a_14 := _2
-//     }
-//     function fun_revert() -> ret
-//     { revert(0, 0) }
-//     function fun_return() -> ret_1
-//     { return(0, 0) }
-//     function empty(a, b)
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
deleted file mode 100644
index 747ac8084912..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    function empty(a, b, c) {}
-
-    // Constants
-    empty(111, 222, 333)
-
-    // Variables
-    let x := 111
-    let y := 222
-    let z := 333
-    empty(x, y, z)
-
-    // Calls
-    empty(mload(111), sload(222), calldataload(333))
-
-    // Mix
-    let a := 222
-    empty(111, a, mload(333))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let _1 := 333
-//         let _2 := 222
-//         let _3 := 111
-//         let c_13 := _1
-//         let b_14 := _2
-//         let a_15 := _3
-//         let x := 111
-//         let y := 222
-//         let c_16 := 333
-//         let b_17 := y
-//         let a_18 := x
-//         let _5 := calldataload(333)
-//         let _7 := sload(222)
-//         let _9 := mload(111)
-//         let c_19 := _5
-//         let b_20 := _7
-//         let a_21 := _9
-//         let a_1 := 222
-//         let _11 := mload(333)
-//         let _12 := 111
-//         let c_22 := _11
-//         let b_23 := a_1
-//         let a_24 := _12
-//     }
-//     function empty(a, b, c)
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/double_inline.yul b/test/libyul/yulOptimizerTests/fullInliner/double_inline.yul
deleted file mode 100644
index 259e4aeda4c6..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/double_inline.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	function f(a) -> b, c { let x := mload(a) b := sload(x) c := 3 }
-    let a1 := calldataload(0)
-    let b3, c3 := f(a1)
-    let b4, c4 := f(c3)
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_2 := calldataload(0)
-//         let b_3 := 0
-//         let c_4 := 0
-//         b_3 := sload(mload(a_2))
-//         c_4 := 3
-//         let b3 := b_3
-//         let a_6 := c_4
-//         let b_7 := 0
-//         let c_8 := 0
-//         b_7 := sload(mload(a_6))
-//         c_8 := 3
-//         let b4 := b_7
-//         let c4 := c_8
-//     }
-//     function f(a) -> b, c
-//     {
-//         b := sload(mload(a))
-//         c := 3
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/inside_condition.yul b/test/libyul/yulOptimizerTests/fullInliner/inside_condition.yul
deleted file mode 100644
index 39c3bb2950c7..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/inside_condition.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-// This tests that splitting the expression inside the condition works properly.
-{
-	if gt(f(mload(1)), mload(0)) {
-		sstore(0, 2)
-	}
-	function f(a) -> r {
-		a := mload(a)
-		r := add(a, calldatasize())
-	}
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let _2 := mload(0)
-//         let a_10 := mload(1)
-//         let r_11 := 0
-//         a_10 := mload(a_10)
-//         r_11 := add(a_10, calldatasize())
-//         if gt(r_11, _2) { sstore(0, 2) }
-//     }
-//     function f(a) -> r
-//     {
-//         a := mload(a)
-//         r := add(a, calldatasize())
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/large_function_multi_use.yul b/test/libyul/yulOptimizerTests/fullInliner/large_function_multi_use.yul
deleted file mode 100644
index 151b7596ca43..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/large_function_multi_use.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	function f(a) -> b {
-        let x := mload(a)
-        b := sload(x)
-        let y := add(a, x)
-        sstore(y, 10)
-    }
-    let a := mload(2)
-    let a2 := 2
-    // This should not be inlined because it is not a constant
-    let r := f(a)
-    // This should be inlined because it is a constant
-    let t := f(a2)
-    let a3
-    // This should be inlined because it is a constant as well (zero)
-    let s := f(a3)
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_1 := mload(2)
-//         let a2 := 2
-//         let a_3 := a_1
-//         let b_4 := 0
-//         let x_5 := mload(a_3)
-//         b_4 := sload(x_5)
-//         let y_6 := add(a_3, x_5)
-//         sstore(y_6, 10)
-//         let r := b_4
-//         let a_8 := a2
-//         let b_9 := 0
-//         let x_10 := mload(a_8)
-//         b_9 := sload(x_10)
-//         let y_11 := add(a_8, x_10)
-//         sstore(y_11, 10)
-//         let t := b_9
-//         let a3
-//         let a_13 := a3
-//         let b_14 := 0
-//         let x_15 := mload(a_13)
-//         b_14 := sload(x_15)
-//         let y_16 := add(a_13, x_15)
-//         sstore(y_16, 10)
-//         let s := b_14
-//     }
-//     function f(a) -> b
-//     {
-//         let x := mload(a)
-//         b := sload(x)
-//         let y := add(a, x)
-//         sstore(y, 10)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/large_function_single_use.yul b/test/libyul/yulOptimizerTests/fullInliner/large_function_single_use.yul
deleted file mode 100644
index 4bcfe6f19465..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/large_function_single_use.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	function f(a) -> b {
-        let x := mload(a)
-        b := sload(x)
-        let c := 3
-        mstore(mul(a, b), mload(x))
-        let y := add(a, x)
-        sstore(y, 10)
-    }
-    // Single-use functions are always inlined.
-    let r := f(mload(1))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_6 := mload(1)
-//         let b_7 := 0
-//         let x_8 := mload(a_6)
-//         b_7 := sload(x_8)
-//         let c_9 := 3
-//         mstore(mul(a_6, b_7), mload(x_8))
-//         let y_12 := add(a_6, x_8)
-//         sstore(y_12, 10)
-//         let r := b_7
-//     }
-//     function f(a) -> b
-//     {
-//         let x := mload(a)
-//         b := sload(x)
-//         let c := 3
-//         mstore(mul(a, b), mload(x))
-//         let y := add(a, x)
-//         sstore(y, 10)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/long_names.yul b/test/libyul/yulOptimizerTests/fullInliner/long_names.yul
deleted file mode 100644
index b2162c520ec9..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/long_names.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	function verylongfunctionname(verylongvariablename) -> verylongvariablename2 {
-		verylongvariablename2 := add(verylongvariablename, verylongvariablename)
-	}
-	// same long name
-	let verylongvariablename2 := 3
-	mstore(0, verylongfunctionname(verylongvariablename2))
-	mstore(1, verylongvariablename2)
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let verylongvariablename2_1 := 3
-//         let verylongvariablename_4 := verylongvariablename2_1
-//         let verylongvariablename2_5 := 0
-//         verylongvariablename2_5 := add(verylongvariablename_4, verylongvariablename_4)
-//         mstore(0, verylongvariablename2_5)
-//         mstore(1, verylongvariablename2_1)
-//     }
-//     function verylongfunctionname(verylongvariablename) -> verylongvariablename2
-//     {
-//         verylongvariablename2 := add(verylongvariablename, verylongvariablename)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul b/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
deleted file mode 100644
index 1f777237ac82..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	function f(a, b, c) -> x {
-		x := add(a, b)
-		x := mul(x, c)
-	}
-	let y := add(mload(1), add(f(mload(2), mload(3), mload(4)), mload(5)))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let _2 := mload(5)
-//         let _4 := mload(4)
-//         let _6 := mload(3)
-//         let _8 := mload(2)
-//         let c_13 := _4
-//         let b_14 := _6
-//         let a_15 := _8
-//         let x_16 := 0
-//         x_16 := add(a_15, b_14)
-//         x_16 := mul(x_16, c_13)
-//         let _10 := add(x_16, _2)
-//         let y := add(mload(1), _10)
-//     }
-//     function f(a, b, c) -> x
-//     {
-//         x := add(a, b)
-//         x := mul(x, c)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
deleted file mode 100644
index b30078cb61f4..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	function f(a) -> x { x := add(a, a) }
-	function g(b, c) -> y { y := mul(mload(c), f(b)) }
-	let y := g(f(3), 7)
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let _1 := 7
-//         let a_8 := 3
-//         let x_9 := 0
-//         x_9 := add(a_8, a_8)
-//         let _3 := x_9
-//         let c_10 := _1
-//         let b_11 := _3
-//         let y_12 := 0
-//         let a_6_13 := b_11
-//         let x_7_14 := 0
-//         x_7_14 := add(a_6_13, a_6_13)
-//         y_12 := mul(mload(c_10), x_7_14)
-//         let y_1 := y_12
-//     }
-//     function f(a) -> x
-//     { x := add(a, a) }
-//     function g(b, c) -> y
-//     {
-//         let a_6 := b
-//         let x_7 := 0
-//         x_7 := add(a_6, a_6)
-//         y := mul(mload(c), x_7)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/multi_fun_callback.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_fun_callback.yul
deleted file mode 100644
index 14e977dd3a67..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/multi_fun_callback.yul
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	// This is a test for an older version where
-	// inlining was performed on a function
-	// just being called. This is a problem
-	// because the statemenst of the original
-	// function might be in an invalid state.
-
-	function f(x) {
-		mstore(0, x)
-		mstore(7, h())
-		g(10)
-		mstore(1, x)
-	}
-	function g(x) {
-		f(1)
-	}
-	function h() -> t {
-		t := 2
-
-	}
-	{
-		f(100)
-	}
-}
-// ----
-// step: fullInliner
-//
-// {
-//     { f(100) }
-//     function f(x)
-//     {
-//         mstore(0, x)
-//         let t_8 := 0
-//         t_8 := 2
-//         mstore(7, t_8)
-//         let x_1_9 := 10
-//         f(1)
-//         mstore(1, x)
-//     }
-//     function g(x_1)
-//     { f(1) }
-//     function h() -> t
-//     { t := 2 }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/multi_return.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_return.yul
deleted file mode 100644
index 21369f10b683..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/multi_return.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	function f(a) -> x, y {
-		x := mul(a, a)
-		y := add(a, x)
-	}
-	let r, s := f(mload(0))
-	mstore(r, s)
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_3 := mload(0)
-//         let x_4 := 0
-//         let y_5 := 0
-//         x_4 := mul(a_3, a_3)
-//         y_5 := add(a_3, x_4)
-//         let r := x_4
-//         mstore(r, y_5)
-//     }
-//     function f(a) -> x, y
-//     {
-//         x := mul(a, a)
-//         y := add(a, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul
deleted file mode 100644
index 143ae35b27b8..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	function f(a: u256) -> x: bool, y:u256 {
-		y := mul(a, a)
-	}
-	let r: bool, s: u256 := f(mload(3))
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_3 := mload(3)
-//         let x_4:bool := false
-//         let y_5 := 0
-//         y_5 := mul(a_3, a_3)
-//         let r:bool := x_4
-//         let s := y_5
-//     }
-//     function f(a) -> x:bool, y
-//     { y := mul(a, a) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
deleted file mode 100644
index d120d0152947..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    function f(a) -> b {
-        let x := mload(a)
-        b := sload(x)
-    }
-    // This will stop inlining at some point because
-    // the function gets too big.
-    function g() -> x {
-        x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
-    }
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: fullInliner
-//
-// {
-//     { }
-//     function f(a) -> b
-//     { b := sload(mload(a)) }
-//     function g() -> x_1
-//     {
-//         let a_20 := 2
-//         let b_21 := 0
-//         b_21 := sload(mload(a_20))
-//         let a_23 := b_21
-//         let b_24 := 0
-//         b_24 := sload(mload(a_23))
-//         let a_26 := b_24
-//         let b_27 := 0
-//         b_27 := sload(mload(a_26))
-//         let a_29 := b_27
-//         let b_30 := 0
-//         b_30 := sload(mload(a_29))
-//         let a_32 := b_30
-//         let b_33 := 0
-//         b_33 := sload(mload(a_32))
-//         let a_35 := b_33
-//         let b_36 := 0
-//         b_36 := sload(mload(a_35))
-//         let a_38 := b_36
-//         let b_39 := 0
-//         b_39 := sload(mload(a_38))
-//         let a_41 := b_39
-//         let b_42 := 0
-//         b_42 := sload(mload(a_41))
-//         let a_44 := b_42
-//         let b_45 := 0
-//         b_45 := sload(mload(a_44))
-//         let a_47 := b_45
-//         let b_48 := 0
-//         b_48 := sload(mload(a_47))
-//         let a_50 := b_48
-//         let b_51 := 0
-//         b_51 := sload(mload(a_50))
-//         let a_53 := b_51
-//         let b_54 := 0
-//         b_54 := sload(mload(a_53))
-//         let a_56 := b_54
-//         let b_57 := 0
-//         b_57 := sload(mload(a_56))
-//         x_1 := f(f(f(f(f(f(b_57))))))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul
deleted file mode 100644
index 04a9417d23f3..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    function f(a) -> b {
-        let x := mload(a)
-        b := sload(x)
-    }
-    // This will stop inlining at some point because
-    // the function gets too big.
-    function g() -> x {
-        x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
-    }
-}
-// ====
-// EVMVersion: <=homestead
-// ----
-// step: fullInliner
-//
-// {
-//     { }
-//     function f(a) -> b
-//     { b := sload(mload(a)) }
-//     function g() -> x_1
-//     {
-//         let a_20 := 2
-//         let b_21 := 0
-//         b_21 := sload(mload(a_20))
-//         let a_23 := b_21
-//         let b_24 := 0
-//         b_24 := sload(mload(a_23))
-//         let a_26 := b_24
-//         let b_27 := 0
-//         b_27 := sload(mload(a_26))
-//         let a_29 := b_27
-//         let b_30 := 0
-//         b_30 := sload(mload(a_29))
-//         let a_32 := b_30
-//         let b_33 := 0
-//         b_33 := sload(mload(a_32))
-//         let a_35 := b_33
-//         let b_36 := 0
-//         b_36 := sload(mload(a_35))
-//         let a_38 := b_36
-//         let b_39 := 0
-//         b_39 := sload(mload(a_38))
-//         let a_41 := b_39
-//         let b_42 := 0
-//         b_42 := sload(mload(a_41))
-//         let a_44 := b_42
-//         let b_45 := 0
-//         b_45 := sload(mload(a_44))
-//         let a_47 := b_45
-//         let b_48 := 0
-//         b_48 := sload(mload(a_47))
-//         let a_50 := b_48
-//         let b_51 := 0
-//         b_51 := sload(mload(a_50))
-//         let a_53 := b_51
-//         let b_54 := 0
-//         b_54 := sload(mload(a_53))
-//         let a_56 := b_54
-//         let b_57 := 0
-//         b_57 := sload(mload(a_56))
-//         x_1 := f(f(f(f(f(f(b_57))))))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul
deleted file mode 100644
index 875d715c5cb0..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    function f(a) -> b {
-        let x := mload(a)
-        b := sload(x)
-    }
-    // This will stop inlining at some point because
-    // the global context gets too big.
-    let x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_20 := 2
-//         let b_21 := 0
-//         b_21 := sload(mload(a_20))
-//         let a_23 := b_21
-//         let b_24 := 0
-//         b_24 := sload(mload(a_23))
-//         let a_26 := b_24
-//         let b_27 := 0
-//         b_27 := sload(mload(a_26))
-//         let a_29 := b_27
-//         let b_30 := 0
-//         b_30 := sload(mload(a_29))
-//         let a_32 := b_30
-//         let b_33 := 0
-//         b_33 := sload(mload(a_32))
-//         let a_35 := b_33
-//         let b_36 := 0
-//         b_36 := sload(mload(a_35))
-//         let a_38 := b_36
-//         let b_39 := 0
-//         b_39 := sload(mload(a_38))
-//         let a_41 := b_39
-//         let b_42 := 0
-//         b_42 := sload(mload(a_41))
-//         let a_44 := b_42
-//         let b_45 := 0
-//         b_45 := sload(mload(a_44))
-//         let a_47 := b_45
-//         let b_48 := 0
-//         b_48 := sload(mload(a_47))
-//         let a_50 := b_48
-//         let b_51 := 0
-//         b_51 := sload(mload(a_50))
-//         let a_53 := b_51
-//         let b_54 := 0
-//         b_54 := sload(mload(a_53))
-//         let a_56 := b_54
-//         let b_57 := 0
-//         b_57 := sload(mload(a_56))
-//         let x_1 := f(f(f(f(f(f(b_57))))))
-//     }
-//     function f(a) -> b
-//     { b := sload(mload(a)) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul
deleted file mode 100644
index 3d62caa2f34e..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    function f(a) -> b {
-        let x := mload(a)
-        b := sload(x)
-    }
-    // This will stop inlining at some point because
-    // the global context gets too big.
-    let x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
-}
-// ====
-// EVMVersion: <=homestead
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_20 := 2
-//         let b_21 := 0
-//         b_21 := sload(mload(a_20))
-//         let a_23 := b_21
-//         let b_24 := 0
-//         b_24 := sload(mload(a_23))
-//         let a_26 := b_24
-//         let b_27 := 0
-//         b_27 := sload(mload(a_26))
-//         let a_29 := b_27
-//         let b_30 := 0
-//         b_30 := sload(mload(a_29))
-//         let a_32 := b_30
-//         let b_33 := 0
-//         b_33 := sload(mload(a_32))
-//         let a_35 := b_33
-//         let b_36 := 0
-//         b_36 := sload(mload(a_35))
-//         let a_38 := b_36
-//         let b_39 := 0
-//         b_39 := sload(mload(a_38))
-//         let a_41 := b_39
-//         let b_42 := 0
-//         b_42 := sload(mload(a_41))
-//         let a_44 := b_42
-//         let b_45 := 0
-//         b_45 := sload(mload(a_44))
-//         let a_47 := b_45
-//         let b_48 := 0
-//         b_48 := sload(mload(a_47))
-//         let a_50 := b_48
-//         let b_51 := 0
-//         b_51 := sload(mload(a_50))
-//         let a_53 := b_51
-//         let b_54 := 0
-//         b_54 := sload(mload(a_53))
-//         let a_56 := b_54
-//         let b_57 := 0
-//         b_57 := sload(mload(a_56))
-//         let x_1 := f(f(f(f(f(f(b_57))))))
-//     }
-//     function f(a) -> b
-//     { b := sload(mload(a)) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_leave.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_leave.yul
deleted file mode 100644
index a22025c4b385..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_leave.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    function g() -> x { x := 8 leave }
-	function f(a) { a := g() }
-    let a1 := calldataload(0)
-    f(a1)
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_2 := calldataload(0)
-//         a_2 := g()
-//     }
-//     function g() -> x
-//     {
-//         x := 8
-//         leave
-//     }
-//     function f(a)
-//     { a := g() }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_return.yul b/test/libyul/yulOptimizerTests/fullInliner/no_return.yul
deleted file mode 100644
index 2897b5151d08..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/no_return.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	function f(a) {
-		sstore(a, a)
-	}
-	f(mload(0))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_3 := mload(0)
-//         sstore(a_3, a_3)
-//     }
-//     function f(a)
-//     { sstore(a, a) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/not_inside_for.yul b/test/libyul/yulOptimizerTests/fullInliner/not_inside_for.yul
deleted file mode 100644
index 5678a13fd9a1..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/not_inside_for.yul
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	let x := f(0)
-	for {  } f(x) { x := f(x) }
-	{
-		let t := f(x)
-	}
-	function f(a) -> r {
-		sstore(a, 0)
-		r := a
-	}
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_3 := 0
-//         let r_4 := 0
-//         sstore(a_3, 0)
-//         r_4 := a_3
-//         let x := r_4
-//         for { }
-//         f(x)
-//         {
-//             let a_6 := x
-//             let r_7 := 0
-//             sstore(a_6, 0)
-//             r_7 := a_6
-//             x := r_7
-//         }
-//         {
-//             let a_9 := x
-//             let r_10 := 0
-//             sstore(a_9, 0)
-//             r_10 := a_9
-//             let t := r_10
-//         }
-//     }
-//     function f(a) -> r
-//     {
-//         sstore(a, 0)
-//         r := a
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/pop_result.yul b/test/libyul/yulOptimizerTests/fullInliner/pop_result.yul
deleted file mode 100644
index c46505c79a17..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/pop_result.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-// An earlier version of the inliner produced
-// pop(...) statements and explicitly removed them.
-// This used to test that they are removed.
-{
-	function f(a) -> x {
-		let r := mul(a, a)
-		x := add(r, r)
-	}
-	pop(add(f(7), 2))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let _1 := 2
-//         let a_5 := 7
-//         let x_6 := 0
-//         let r_7 := mul(a_5, a_5)
-//         x_6 := add(r_7, r_7)
-//         pop(add(x_6, _1))
-//     }
-//     function f(a) -> x
-//     {
-//         let r := mul(a, a)
-//         x := add(r, r)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/recursion.yul b/test/libyul/yulOptimizerTests/fullInliner/recursion.yul
deleted file mode 100644
index 375327e652f9..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/recursion.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	function f(a) {
-		f(1)
-	}
-	f(mload(0))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     { f(mload(0)) }
-//     function f(a)
-//     { f(1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/simple.yul b/test/libyul/yulOptimizerTests/fullInliner/simple.yul
deleted file mode 100644
index 2c9d979b5832..000000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/simple.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	function f(a) -> x {
-		let r := mul(a, a)
-		x := add(r, r)
-	}
-	let y := add(f(sload(mload(2))), mload(7))
-}
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let _2 := mload(7)
-//         let a_7 := sload(mload(2))
-//         let x_8 := 0
-//         let r_9 := mul(a_7, a_7)
-//         x_8 := add(r_9, r_9)
-//         let y := add(x_8, _2)
-//     }
-//     function f(a) -> x
-//     {
-//         let r := mul(a, a)
-//         x := add(r, r)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
deleted file mode 100644
index a89dd89137d5..000000000000
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    function fun_revert() -> ret { revert(0, 0) }
-    function fun_return() -> ret { return(0, 0) }
-    function empty(a, b) {}
-
-    // Evaluation order in Yul is right to left so fun_revert() should run first.
-    empty(fun_return(), fun_revert())
-}
-// ----
-// step: fullInlinerWithoutSplitter
-//
-// {
-//     {
-//         empty(fun_return(), fun_revert())
-//     }
-//     function fun_revert() -> ret
-//     { revert(0, 0) }
-//     function fun_return() -> ret_1
-//     { return(0, 0) }
-//     function empty(a, b)
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
deleted file mode 100644
index 8f903b48445d..000000000000
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    function empty(a, b, c) {}
-
-    // Constants
-    empty(111, 222, 333)
-
-    // Variables
-    let x := 111
-    let y := 222
-    let z := 333
-    empty(x, y, z)
-
-    // Calls
-    empty(mload(111), sload(222), calldataload(333))
-
-    // Mix
-    let a := 222
-    empty(111, a, mload(333))
-}
-// ----
-// step: fullInlinerWithoutSplitter
-//
-// {
-//     {
-//         let c_1 := 333
-//         let b_2 := 222
-//         let a_3 := 111
-//         let x := 111
-//         let y := 222
-//         let z := 333
-//         let c_4 := z
-//         let b_5 := y
-//         let a_6 := x
-//         empty(mload(111), sload(222), calldataload(333))
-//         let a_1 := 222
-//         empty(111, a_1, mload(333))
-//     }
-//     function empty(a, b, c)
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol
deleted file mode 100644
index 80b975903ca7..000000000000
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    function f(a) -> x {
-        x := add(a, a)
-    }
-    let y := f(2)
-}
-// ----
-// step: fullInlinerWithoutSplitter
-//
-// {
-//     {
-//         let a_1 := 2
-//         let x_2 := 0
-//         x_2 := add(a_1, a_1)
-//         let y := x_2
-//     }
-//     function f(a) -> x
-//     { x := add(a, a) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul b/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul
deleted file mode 100644
index a13ad9395314..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let a := add(7, sub(mload(0), 7))
-    mstore(a, 0)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _2 := 0
-//         mstore(mload(_2), _2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/constants.yul b/test/libyul/yulOptimizerTests/fullSimplify/constants.yul
deleted file mode 100644
index 2d2fb70444ad..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/constants.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let a := add(1, mul(3, 4))
-    mstore(0, a)
-}
-// ----
-// step: fullSimplify
-//
-// { { mstore(0, 13) } }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul
deleted file mode 100644
index eb104f63376c..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let a := sub(calldataload(0), calldataload(0))
-    mstore(a, 0)
-}
-// ----
-// step: fullSimplify
-//
-// { { mstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul
deleted file mode 100644
index daf34eed5eb3..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let a := sub(calldataload(1), calldataload(0))
-    mstore(0, a)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _1 := 0
-//         mstore(_1, sub(calldataload(1), calldataload(_1)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
deleted file mode 100644
index 6f90c583ef86..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let a := mload(0)
-    mstore(0, sub(a, a))
-}
-// ----
-// step: fullSimplify
-//
-// { { mstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul b/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul
deleted file mode 100644
index 08dd01646d1a..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f() -> a {}
-    let b := add(7, sub(f(), 7))
-    mstore(b, 0)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     { mstore(f(), 0) }
-//     function f() -> a
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul b/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul
deleted file mode 100644
index 911c668172ef..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := calldataload(3)
-    let a := 10
-    for { } iszero(eq(a, sub(x, calldataload(3)))) { a := add(a, 1) } {}
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let a := 10
-//         for { } iszero(iszero(a)) { a := add(a, 1) }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul b/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul
deleted file mode 100644
index 0ab5cc6ed88f..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let a := calldataload(sub(7, 7))
-    let b := sub(a, 0)
-    // Below, `b` is not eliminated, because
-    // we run CSE and then Simplify.
-    // Elimination of `b` would require another
-    // run of CSE afterwards.
-    mstore(b, eq(calldataload(0), a))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let a := calldataload(0)
-//         let _4 := 0
-//         let b := a
-//         mstore(b, eq(calldataload(_4), a))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul b/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul
deleted file mode 100644
index c10345e4ee56..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    mstore(0, mod(calldataload(0), exp(2, 8)))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _4 := 0
-//         mstore(_4, and(calldataload(_4), 255))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul b/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul
deleted file mode 100644
index fc171337f9b1..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    mstore(0, mod(calldataload(0), exp(2, 255)))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _4 := 0
-//         mstore(_4, and(calldataload(_4), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul
deleted file mode 100644
index e42b6c098600..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    function f(a) -> b { }
-    mstore(0, sub(f(0), f(1)))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _2 := f(1)
-//         let _3 := 0
-//         mstore(_3, sub(f(_3), _2))
-//     }
-//     function f(a) -> b
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul
deleted file mode 100644
index 31490cbc06e3..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	function f1() -> a { }
-	function f2() -> b { }
-	let c := sub(f1(), f2())
-	mstore(0, c)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     { mstore(0, sub(f1(), f2())) }
-//     function f1() -> a
-//     { }
-//     function f2() -> b
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul
deleted file mode 100644
index 8162119e8ff8..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-// Even if the functions pass the equality check, they are not movable.
-{
-	function f() -> a { mstore(1, 2) }
-	let b := sub(f(), f())
-	mstore(0, b)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     { mstore(0, sub(f(), f())) }
-//     function f() -> a
-//     { mstore(1, 2) }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
deleted file mode 100644
index 0e366e6d4090..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-// div is eliminated, but create has side-effects.
-{
-	let a := div(create(0, 0, 0), 0)
-	mstore(0, a)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _1 := 0
-//         pop(create(_1, _1, _1))
-//         mstore(_1, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/operations.yul b/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
deleted file mode 100644
index a0fb67601446..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  let x := mload(0)
-  mstore(1, mul(x, 0))
-  mstore(2, div(x, 0))
-  mstore(3, div(0, x))
-  mstore(4, sdiv(x, 0))
-  mstore(5, sdiv(0, x))
-  mstore(6, and(0, x))
-  mstore(7, and(x, 0))
-  mstore(8, mod(0, x))
-  mstore(9, mod(x, 0))
-  mstore(10, lt(x, x))
-  mstore(11, gt(x, x))
-  mstore(12, slt(x, x))
-  mstore(13, sgt(x, x))
-  mstore(14, mod(x, x))
-  mstore(15, and(x, not(x)))
-  mstore(16, and(not(x), x))
-  mstore(17, or(x, not(x)))
-  mstore(18, or(not(x), x))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         mstore(1, 0)
-//         mstore(2, 0)
-//         mstore(3, 0)
-//         mstore(4, 0)
-//         mstore(5, 0)
-//         mstore(6, 0)
-//         mstore(7, 0)
-//         mstore(8, 0)
-//         mstore(9, 0)
-//         mstore(10, 0)
-//         mstore(11, 0)
-//         mstore(12, 0)
-//         mstore(13, 0)
-//         mstore(14, 0)
-//         mstore(15, 0)
-//         mstore(16, 0)
-//         mstore(17, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-//         mstore(18, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul b/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul
deleted file mode 100644
index b3b98d061a3f..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let a := add(0, mload(0))
-    mstore(0, a)
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let _1 := 0
-//         mstore(_1, mload(_1))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul b/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
deleted file mode 100644
index 38e5ab2108d7..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    function f(x) {}
-    let x
-    {
-        x := add(1, calldataload(0))
-    }
-    f(call(2, 0, 1, mod(x, 8), 1, 1, 1))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         let x_1
-//         let _2 := calldataload(x_1)
-//         let _3 := 1
-//         x_1 := add(_3, _2)
-//         pop(call(2, 0, _3, addmod(_3, _2, 8), _3, _3, _3))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul b/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul
deleted file mode 100644
index 2dd64525f911..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  let x := 7
-  mstore(0, signextend(50, x))
-  let y := 255
-  mstore(1, signextend(0, y))
-}
-// ----
-// step: fullSimplify
-//
-// {
-//     {
-//         mstore(0, 7)
-//         mstore(1, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul b/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul
deleted file mode 100644
index a5b71eea8d8e..000000000000
--- a/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: fullSimplify
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/abi2.yul b/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
deleted file mode 100644
index d8c8e90558ef..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
+++ /dev/null
@@ -1,1126 +0,0 @@
-// We require constantinople because numbers are represented using shifts.
-{
-	// This ignores many of the encoding / decoding functions. Over time,
-	// we should add them all here.
-
-    let a, b := abi_decode_tuple_t_contract$_Module_$1038t_contract$_Module_$1038(mload(0), mload(1))
-    sstore(0, a)
-    let x0, x1, x2, x3, x4 := abi_decode_tuple_t_addresst_uint256t_bytes_calldata_ptrt_enum$_Operation_$1949(mload(7), mload(8))
-    sstore(x1, x0)
-    sstore(x3, x2)
-    sstore(1, x4)
-    let r := abi_encode_tuple_t_bytes32_t_address_t_uint256_t_bytes32_t_enum$_Operation_$1949_t_uint256_t_uint256_t_uint256_t_address_t_address_t_uint256__to_t_bytes32_t_address_t_uint256_t_bytes32_t_uint8_t_uint256_t_uint256_t_uint256_t_address_t_address_t_uint256_(
-        mload(30),
-        mload(31),
-        mload(32),
-        mload(33),
-        mload(34),
-        mload(35),
-        mload(36),
-        mload(37),
-        mload(38),
-        mload(39),
-        mload(40),
-        mload(41)
-    )
-
-    function abi_decode_t_address(offset, end) -> value
-    {
-        value := cleanup_revert_t_address(calldataload(offset))
-    }
-    function abi_decode_t_address_payable(offset_1, end_2) -> value_3
-    {
-        value_3 := cleanup_revert_t_address_payable(calldataload(offset_1))
-    }
-    function abi_decode_t_array$_t_address_$dyn_calldata_ptr(offset_4, end_5) -> arrayPos, length
-    {
-        if iszero(slt(add(offset_4, 0x1f), end_5))
-        {
-            revert(0, 0)
-        }
-        length := calldataload(offset_4)
-        if gt(length, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        arrayPos := add(offset_4, 0x20)
-        if gt(add(arrayPos, mul(length, 0x20)), end_5)
-        {
-            revert(0, 0)
-        }
-    }
-    function abi_decode_t_bool_fromMemory(offset_6, end_7) -> value_8
-    {
-        value_8 := cleanup_revert_t_bool(mload(offset_6))
-    }
-    function abi_decode_t_bytes32(offset_9, end_10) -> value_11
-    {
-        value_11 := cleanup_revert_t_bytes32(calldataload(offset_9))
-    }
-    function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
-    {
-        if iszero(slt(add(offset_12, 0x1f), end_13))
-        {
-            revert(0, 0)
-        }
-        length_15 := calldataload(offset_12)
-        if gt(length_15, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        arrayPos_14 := add(offset_12, 0x20)
-        if gt(add(arrayPos_14, mul(length_15, 0x1)), end_13)
-        {
-            revert(0, 0)
-        }
-    }
-    function abi_decode_t_bytes_memory_ptr(offset_16, end_17) -> array
-    {
-        if iszero(slt(add(offset_16, 0x1f), end_17))
-        {
-            revert(0, 0)
-        }
-        let length_18 := calldataload(offset_16)
-        array := allocateMemory(array_allocation_size_t_bytes_memory_ptr(length_18))
-        mstore(array, length_18)
-        let src := add(offset_16, 0x20)
-        let dst := add(array, 0x20)
-        if gt(add(src, length_18), end_17)
-        {
-            revert(0, 0)
-        }
-        copy_calldata_to_memory(src, dst, length_18)
-    }
-    function abi_decode_t_contract$_Module_$1038(offset_19, end_20) -> value_21
-    {
-        value_21 := cleanup_revert_t_contract$_Module_$1038(calldataload(offset_19))
-    }
-    function abi_decode_t_enum$_Operation_$1949(offset_22, end_23) -> value_24
-    {
-        value_24 := cleanup_revert_t_enum$_Operation_$1949(calldataload(offset_22))
-    }
-    function abi_decode_t_uint256(offset_25, end_26) -> value_27
-    {
-        value_27 := cleanup_revert_t_uint256(calldataload(offset_25))
-    }
-    function abi_decode_tuple_t_address(headStart, dataEnd) -> value0
-    {
-        if slt(sub(dataEnd, headStart), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_28 := 0
-            value0 := abi_decode_t_address(add(headStart, offset_28), dataEnd)
-        }
-    }
-    function abi_decode_tuple_t_addresst_addresst_address(headStart_29, dataEnd_30) -> value0_31, value1, value2
-    {
-        if slt(sub(dataEnd_30, headStart_29), 96)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_32 := 0
-            value0_31 := abi_decode_t_address(add(headStart_29, offset_32), dataEnd_30)
-        }
-        {
-            let offset_33 := 32
-            value1 := abi_decode_t_address(add(headStart_29, offset_33), dataEnd_30)
-        }
-        {
-            let offset_34 := 64
-            value2 := abi_decode_t_address(add(headStart_29, offset_34), dataEnd_30)
-        }
-    }
-    function abi_decode_tuple_t_addresst_addresst_uint256(headStart_35, dataEnd_36) -> value0_37, value1_38, value2_39
-    {
-        if slt(sub(dataEnd_36, headStart_35), 96)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_40 := 0
-            value0_37 := abi_decode_t_address(add(headStart_35, offset_40), dataEnd_36)
-        }
-        {
-            let offset_41 := 32
-            value1_38 := abi_decode_t_address(add(headStart_35, offset_41), dataEnd_36)
-        }
-        {
-            let offset_42 := 64
-            value2_39 := abi_decode_t_uint256(add(headStart_35, offset_42), dataEnd_36)
-        }
-    }
-    function abi_decode_tuple_t_addresst_bytes32(headStart_43, dataEnd_44) -> value0_45, value1_46
-    {
-        if slt(sub(dataEnd_44, headStart_43), 64)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_47 := 0
-            value0_45 := abi_decode_t_address(add(headStart_43, offset_47), dataEnd_44)
-        }
-        {
-            let offset_48 := 32
-            value1_46 := abi_decode_t_bytes32(add(headStart_43, offset_48), dataEnd_44)
-        }
-    }
-    function abi_decode_tuple_t_addresst_uint256(headStart_49, dataEnd_50) -> value0_51, value1_52
-    {
-        if slt(sub(dataEnd_50, headStart_49), 64)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_53 := 0
-            value0_51 := abi_decode_t_address(add(headStart_49, offset_53), dataEnd_50)
-        }
-        {
-            let offset_54 := 32
-            value1_52 := abi_decode_t_uint256(add(headStart_49, offset_54), dataEnd_50)
-        }
-    }
-    function abi_decode_tuple_t_addresst_uint256t_bytes_calldata_ptrt_enum$_Operation_$1949(headStart_55, dataEnd_56) -> value0_57, value1_58, value2_59, value3, value4
-    {
-        if slt(sub(dataEnd_56, headStart_55), 128)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_60 := 0
-            value0_57 := abi_decode_t_address(add(headStart_55, offset_60), dataEnd_56)
-        }
-        {
-            let offset_61 := 32
-            value1_58 := abi_decode_t_uint256(add(headStart_55, offset_61), dataEnd_56)
-        }
-        {
-            let offset_62 := calldataload(add(headStart_55, 64))
-            if gt(offset_62, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value2_59, value3 := abi_decode_t_bytes_calldata_ptr(add(headStart_55, offset_62), dataEnd_56)
-        }
-        {
-            let offset_63 := 96
-            value4 := abi_decode_t_enum$_Operation_$1949(add(headStart_55, offset_63), dataEnd_56)
-        }
-    }
-    function abi_decode_tuple_t_addresst_uint256t_bytes_calldata_ptrt_enum$_Operation_$1949t_uint256t_uint256t_uint256t_addresst_address_payablet_bytes_calldata_ptr(headStart_64, dataEnd_65) -> value0_66, value1_67, value2_68, value3_69, value4_70, value5, value6, value7, value8, value9, value10, value11
-    {
-        if slt(sub(dataEnd_65, headStart_64), 320)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_71 := 0
-            value0_66 := abi_decode_t_address(add(headStart_64, offset_71), dataEnd_65)
-        }
-        {
-            let offset_72 := 32
-            value1_67 := abi_decode_t_uint256(add(headStart_64, offset_72), dataEnd_65)
-        }
-        {
-            let offset_73 := calldataload(add(headStart_64, 64))
-            if gt(offset_73, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value2_68, value3_69 := abi_decode_t_bytes_calldata_ptr(add(headStart_64, offset_73), dataEnd_65)
-        }
-        {
-            let offset_74 := 96
-            value4_70 := abi_decode_t_enum$_Operation_$1949(add(headStart_64, offset_74), dataEnd_65)
-        }
-        {
-            let offset_75 := 128
-            value5 := abi_decode_t_uint256(add(headStart_64, offset_75), dataEnd_65)
-        }
-        {
-            let offset_76 := 160
-            value6 := abi_decode_t_uint256(add(headStart_64, offset_76), dataEnd_65)
-        }
-        {
-            let offset_77 := 192
-            value7 := abi_decode_t_uint256(add(headStart_64, offset_77), dataEnd_65)
-        }
-        {
-            let offset_78 := 224
-            value8 := abi_decode_t_address(add(headStart_64, offset_78), dataEnd_65)
-        }
-        {
-            let offset_79 := 256
-            value9 := abi_decode_t_address_payable(add(headStart_64, offset_79), dataEnd_65)
-        }
-        {
-            let offset_80 := calldataload(add(headStart_64, 288))
-            if gt(offset_80, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value10, value11 := abi_decode_t_bytes_calldata_ptr(add(headStart_64, offset_80), dataEnd_65)
-        }
-    }
-    function abi_decode_tuple_t_addresst_uint256t_bytes_memory_ptrt_enum$_Operation_$1949(headStart_81, dataEnd_82) -> value0_83, value1_84, value2_85, value3_86
-    {
-        if slt(sub(dataEnd_82, headStart_81), 128)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_87 := 0
-            value0_83 := abi_decode_t_address(add(headStart_81, offset_87), dataEnd_82)
-        }
-        {
-            let offset_88 := 32
-            value1_84 := abi_decode_t_uint256(add(headStart_81, offset_88), dataEnd_82)
-        }
-        {
-            let offset_89 := calldataload(add(headStart_81, 64))
-            if gt(offset_89, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value2_85 := abi_decode_t_bytes_memory_ptr(add(headStart_81, offset_89), dataEnd_82)
-        }
-        {
-            let offset_90 := 96
-            value3_86 := abi_decode_t_enum$_Operation_$1949(add(headStart_81, offset_90), dataEnd_82)
-        }
-    }
-    function abi_decode_tuple_t_addresst_uint256t_bytes_memory_ptrt_enum$_Operation_$1949t_uint256t_uint256t_uint256t_addresst_addresst_uint256(headStart_91, dataEnd_92) -> value0_93, value1_94, value2_95, value3_96, value4_97, value5_98, value6_99, value7_100, value8_101, value9_102
-    {
-        if slt(sub(dataEnd_92, headStart_91), 320)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_103 := 0
-            value0_93 := abi_decode_t_address(add(headStart_91, offset_103), dataEnd_92)
-        }
-        {
-            let offset_104 := 32
-            value1_94 := abi_decode_t_uint256(add(headStart_91, offset_104), dataEnd_92)
-        }
-        {
-            let offset_105 := calldataload(add(headStart_91, 64))
-            if gt(offset_105, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value2_95 := abi_decode_t_bytes_memory_ptr(add(headStart_91, offset_105), dataEnd_92)
-        }
-        {
-            let offset_106 := 96
-            value3_96 := abi_decode_t_enum$_Operation_$1949(add(headStart_91, offset_106), dataEnd_92)
-        }
-        {
-            let offset_107 := 128
-            value4_97 := abi_decode_t_uint256(add(headStart_91, offset_107), dataEnd_92)
-        }
-        {
-            let offset_108 := 160
-            value5_98 := abi_decode_t_uint256(add(headStart_91, offset_108), dataEnd_92)
-        }
-        {
-            let offset_109 := 192
-            value6_99 := abi_decode_t_uint256(add(headStart_91, offset_109), dataEnd_92)
-        }
-        {
-            let offset_110 := 224
-            value7_100 := abi_decode_t_address(add(headStart_91, offset_110), dataEnd_92)
-        }
-        {
-            let offset_111 := 256
-            value8_101 := abi_decode_t_address(add(headStart_91, offset_111), dataEnd_92)
-        }
-        {
-            let offset_112 := 288
-            value9_102 := abi_decode_t_uint256(add(headStart_91, offset_112), dataEnd_92)
-        }
-    }
-    function abi_decode_tuple_t_array$_t_address_$dyn_calldata_ptrt_uint256t_addresst_bytes_calldata_ptr(headStart_113, dataEnd_114) -> value0_115, value1_116, value2_117, value3_118, value4_119, value5_120
-    {
-        if slt(sub(dataEnd_114, headStart_113), 128)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_121 := calldataload(add(headStart_113, 0))
-            if gt(offset_121, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value0_115, value1_116 := abi_decode_t_array$_t_address_$dyn_calldata_ptr(add(headStart_113, offset_121), dataEnd_114)
-        }
-        {
-            let offset_122 := 32
-            value2_117 := abi_decode_t_uint256(add(headStart_113, offset_122), dataEnd_114)
-        }
-        {
-            let offset_123 := 64
-            value3_118 := abi_decode_t_address(add(headStart_113, offset_123), dataEnd_114)
-        }
-        {
-            let offset_124 := calldataload(add(headStart_113, 96))
-            if gt(offset_124, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value4_119, value5_120 := abi_decode_t_bytes_calldata_ptr(add(headStart_113, offset_124), dataEnd_114)
-        }
-    }
-    function abi_decode_tuple_t_bool_fromMemory(headStart_125, dataEnd_126) -> value0_127
-    {
-        if slt(sub(dataEnd_126, headStart_125), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_128 := 0
-            value0_127 := abi_decode_t_bool_fromMemory(add(headStart_125, offset_128), dataEnd_126)
-        }
-    }
-    function abi_decode_tuple_t_bytes32(headStart_129, dataEnd_130) -> value0_131
-    {
-        if slt(sub(dataEnd_130, headStart_129), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_132 := 0
-            value0_131 := abi_decode_t_bytes32(add(headStart_129, offset_132), dataEnd_130)
-        }
-    }
-    function abi_decode_tuple_t_bytes_calldata_ptr(headStart_133, dataEnd_134) -> value0_135, value1_136
-    {
-        if slt(sub(dataEnd_134, headStart_133), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_137 := calldataload(add(headStart_133, 0))
-            if gt(offset_137, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value0_135, value1_136 := abi_decode_t_bytes_calldata_ptr(add(headStart_133, offset_137), dataEnd_134)
-        }
-    }
-    function abi_decode_tuple_t_bytes_calldata_ptrt_bytes_calldata_ptr(headStart_138, dataEnd_139) -> value0_140, value1_141, value2_142, value3_143
-    {
-        if slt(sub(dataEnd_139, headStart_138), 64)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_144 := calldataload(add(headStart_138, 0))
-            if gt(offset_144, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value0_140, value1_141 := abi_decode_t_bytes_calldata_ptr(add(headStart_138, offset_144), dataEnd_139)
-        }
-        {
-            let offset_145 := calldataload(add(headStart_138, 32))
-            if gt(offset_145, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value2_142, value3_143 := abi_decode_t_bytes_calldata_ptr(add(headStart_138, offset_145), dataEnd_139)
-        }
-    }
-    function abi_decode_tuple_t_bytes_memory_ptr(headStart_146, dataEnd_147) -> value0_148
-    {
-        if slt(sub(dataEnd_147, headStart_146), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_149 := calldataload(add(headStart_146, 0))
-            if gt(offset_149, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value0_148 := abi_decode_t_bytes_memory_ptr(add(headStart_146, offset_149), dataEnd_147)
-        }
-    }
-    function abi_decode_tuple_t_contract$_Module_$1038(headStart_150, dataEnd_151) -> value0_152
-    {
-        if slt(sub(dataEnd_151, headStart_150), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_153 := 0
-            value0_152 := abi_decode_t_contract$_Module_$1038(add(headStart_150, offset_153), dataEnd_151)
-        }
-    }
-    function abi_decode_tuple_t_contract$_Module_$1038t_contract$_Module_$1038(headStart_154, dataEnd_155) -> value0_156, value1_157
-    {
-        if slt(sub(dataEnd_155, headStart_154), 64)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_158 := 0
-            value0_156 := abi_decode_t_contract$_Module_$1038(add(headStart_154, offset_158), dataEnd_155)
-        }
-        {
-            let offset_159 := 32
-            value1_157 := abi_decode_t_contract$_Module_$1038(add(headStart_154, offset_159), dataEnd_155)
-        }
-    }
-    function abi_decode_tuple_t_uint256(headStart_160, dataEnd_161) -> value0_162
-    {
-        if slt(sub(dataEnd_161, headStart_160), 32)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset_163 := 0
-            value0_162 := abi_decode_t_uint256(add(headStart_160, offset_163), dataEnd_161)
-        }
-    }
-    function abi_encode_t_address_to_t_address(value_164, pos)
-    {
-        mstore(pos, cleanup_assert_t_address(value_164))
-    }
-    function abi_encode_t_array$_t_address_$dyn_memory_ptr_to_t_array$_t_address_$dyn_memory_ptr(value_165, pos_166) -> end_167
-    {
-        let length_168 := array_length_t_array$_t_address_$dyn_memory_ptr(value_165)
-        mstore(pos_166, length_168)
-        pos_166 := add(pos_166, 0x20)
-        let srcPtr := array_dataslot_t_array$_t_address_$dyn_memory_ptr(value_165)
-        for {
-            let i := 0
-        }
-        lt(i, length_168)
-        {
-            i := add(i, 1)
-        }
-        {
-            abi_encode_t_address_to_t_address(mload(srcPtr), pos_166)
-            srcPtr := array_nextElement_t_array$_t_address_$dyn_memory_ptr(srcPtr)
-            pos_166 := add(pos_166, 0x20)
-        }
-        end_167 := pos_166
-    }
-    function abi_encode_t_bool_to_t_bool(value_169, pos_170)
-    {
-        mstore(pos_170, cleanup_assert_t_bool(value_169))
-    }
-    function abi_encode_t_bytes32_to_t_bytes32(value_171, pos_172)
-    {
-        mstore(pos_172, cleanup_assert_t_bytes32(value_171))
-    }
-    function abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value_173, pos_174) -> end_175
-    {
-        let length_176 := array_length_t_bytes_memory_ptr(value_173)
-        mstore(pos_174, length_176)
-        copy_memory_to_memory(add(value_173, 0x20), add(pos_174, 0x20), length_176)
-        end_175 := add(add(pos_174, 0x20), round_up_to_mul_of_32(length_176))
-    }
-    function abi_encode_t_contract$_GnosisSafe_$710_to_t_address_payable(value_177, pos_178)
-    {
-        mstore(pos_178, convert_t_contract$_GnosisSafe_$710_to_t_address_payable(value_177))
-    }
-    function abi_encode_t_contract$_Module_$1038_to_t_address(value_179, pos_180)
-    {
-        mstore(pos_180, convert_t_contract$_Module_$1038_to_t_address(value_179))
-    }
-    function abi_encode_t_enum$_Operation_$1949_to_t_uint8(value_181, pos_182)
-    {
-        mstore(pos_182, convert_t_enum$_Operation_$1949_to_t_uint8(value_181))
-    }
-    function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr(value_183, pos_184) -> end_185
-    {
-        let length_186 := array_length_t_string_memory_ptr(value_183)
-        mstore(pos_184, length_186)
-        copy_memory_to_memory(add(value_183, 0x20), add(pos_184, 0x20), length_186)
-        end_185 := add(add(pos_184, 0x20), round_up_to_mul_of_32(length_186))
-    }
-    function abi_encode_t_string_memory_to_t_string_memory_ptr(value_187, pos_188) -> end_189
-    {
-        let length_190 := array_length_t_string_memory(value_187)
-        mstore(pos_188, length_190)
-        copy_memory_to_memory(add(value_187, 0x20), add(pos_188, 0x20), length_190)
-        end_189 := add(add(pos_188, 0x20), round_up_to_mul_of_32(length_190))
-    }
-    function abi_encode_t_stringliteral_108d84599042957b954e89d43b52f80be89321dfc114a37800028eba58dafc87_to_t_string_memory_ptr(pos_191) -> end_192
-    {
-        mstore(pos_191, 36)
-        mstore(add(pos_191, 32), 0x496e76616c6964206d617374657220636f707920616464726573732070726f76)
-        mstore(add(pos_191, 64), 0x6964656400000000000000000000000000000000000000000000000000000000)
-        end_192 := add(pos_191, 96)
-    }
-    function abi_encode_t_stringliteral_1e0428ffa69bff65645154a36d5017c238f946ddaf89430d30eec813f30bdd77_to_t_string_memory_ptr(pos_193) -> end_194
-    {
-        mstore(pos_193, 37)
-        mstore(add(pos_193, 32), 0x4d6f64756c6573206861766520616c7265616479206265656e20696e69746961)
-        mstore(add(pos_193, 64), 0x6c697a6564000000000000000000000000000000000000000000000000000000)
-        end_194 := add(pos_193, 96)
-    }
-    function abi_encode_t_stringliteral_21a1cd38818adb750881fbf07c26ce7223dde608fdd9dadd31a0d41afeca2094_to_t_string_memory_ptr(pos_195) -> end_196
-    {
-        mstore(pos_195, 30)
-        mstore(add(pos_195, 32), 0x496e76616c6964206f776e657220616464726573732070726f76696465640000)
-        end_196 := add(pos_195, 64)
-    }
-    function abi_encode_t_stringliteral_5caa315f9c5cf61be71c182eef2dc9ef7b6ce6b42c320d36694e1d23e09c287e_to_t_string_memory_ptr(pos_197) -> end_198
-    {
-        mstore(pos_197, 40)
-        mstore(add(pos_197, 32), 0x496e76616c696420707265764d6f64756c652c206d6f64756c65207061697220)
-        mstore(add(pos_197, 64), 0x70726f7669646564000000000000000000000000000000000000000000000000)
-        end_198 := add(pos_197, 96)
-    }
-    function abi_encode_t_stringliteral_60f21058f4a7689ef29853b3c9c17c9bf69856a949794649bb68878f00552475_to_t_string_memory_ptr(pos_199) -> end_200
-    {
-        mstore(pos_199, 30)
-        mstore(add(pos_199, 32), 0x4f6e6c79206f776e6572732063616e20617070726f7665206120686173680000)
-        end_200 := add(pos_199, 64)
-    }
-    function abi_encode_t_stringliteral_63d26a9feb8568677e5c255c04e4da88e86a25137d5152a9a089790b7e710e86_to_t_string_memory_ptr(pos_201) -> end_202
-    {
-        mstore(pos_201, 35)
-        mstore(add(pos_201, 32), 0x5468726573686f6c642063616e6e6f7420657863656564206f776e657220636f)
-        mstore(add(pos_201, 64), 0x756e740000000000000000000000000000000000000000000000000000000000)
-        end_202 := add(pos_201, 96)
-    }
-    function abi_encode_t_stringliteral_7913a3f9168bf3e458e3f42eb08db5c4b33f44228d345660887090b75e24c6aa_to_t_string_memory_ptr(pos_203) -> end_204
-    {
-        mstore(pos_203, 31)
-        mstore(add(pos_203, 32), 0x436f756c64206e6f742066696e69736820696e697469616c697a6174696f6e00)
-        end_204 := add(pos_203, 64)
-    }
-    function abi_encode_t_stringliteral_839b4c4db845de24ec74ef067d85431087d6987a4c904418ee4f6ec699c02482_to_t_string_memory_ptr(pos_205) -> end_206
-    {
-        mstore(pos_205, 53)
-        mstore(add(pos_205, 32), 0x4e6577206f776e657220636f756e74206e6565647320746f206265206c617267)
-        mstore(add(pos_205, 64), 0x6572207468616e206e6577207468726573686f6c640000000000000000000000)
-        end_206 := add(pos_205, 96)
-    }
-    function abi_encode_t_stringliteral_8560a13547eca5648355c8db1a9f8653b6f657d31d476c36bca25e47b45b08f4_to_t_string_memory_ptr(pos_207) -> end_208
-    {
-        mstore(pos_207, 34)
-        mstore(add(pos_207, 32), 0x436f756c64206e6f74207061792067617320636f737473207769746820746f6b)
-        mstore(add(pos_207, 64), 0x656e000000000000000000000000000000000000000000000000000000000000)
-        end_208 := add(pos_207, 96)
-    }
-    function abi_encode_t_stringliteral_85bcea44c930431ef19052d068cc504a81260341ae6c5ee84bb5a38ec55acf05_to_t_string_memory_ptr(pos_209) -> end_210
-    {
-        mstore(pos_209, 27)
-        mstore(add(pos_209, 32), 0x496e76616c6964207369676e6174757265732070726f76696465640000000000)
-        end_210 := add(pos_209, 64)
-    }
-    function abi_encode_t_stringliteral_8c2199b479423c52a835dfe8b0f2e9eb4c1ec1069ba198ccc38077a4a88a5c00_to_t_string_memory_ptr(pos_211) -> end_212
-    {
-        mstore(pos_211, 31)
-        mstore(add(pos_211, 32), 0x496e76616c6964206d6f64756c6520616464726573732070726f766964656400)
-        end_212 := add(pos_211, 64)
-    }
-    function abi_encode_t_stringliteral_960698caed81fce71c9b7d572ab2e035b6014a5b812b51df8462ea9817fc4ebc_to_t_string_memory_ptr(pos_213) -> end_214
-    {
-        mstore(pos_213, 38)
-        mstore(add(pos_213, 32), 0x496e76616c696420707265764f776e65722c206f776e65722070616972207072)
-        mstore(add(pos_213, 64), 0x6f76696465640000000000000000000000000000000000000000000000000000)
-        end_214 := add(pos_213, 96)
-    }
-    function abi_encode_t_stringliteral_9a45ae898fbe2bd07a0b33b5a6c421f76198e9deb66843b8d827b0b9e4a16f86_to_t_string_memory_ptr(pos_215) -> end_216
-    {
-        mstore(pos_215, 30)
-        mstore(add(pos_215, 32), 0x4f776e657273206861766520616c7265616479206265656e2073657475700000)
-        end_216 := add(pos_215, 64)
-    }
-    function abi_encode_t_stringliteral_9d461d71e19b25cd406798d062d7e61f961ad52541d3077a543e857810427d47_to_t_string_memory_ptr(pos_217) -> end_218
-    {
-        mstore(pos_217, 27)
-        mstore(add(pos_217, 32), 0x4164647265737320697320616c726561647920616e206f776e65720000000000)
-        end_218 := add(pos_217, 64)
-    }
-    function abi_encode_t_stringliteral_a2e1f2db9cd32eaa6a2caa3d6caa726a30dc0417d866440bfe13d6a6d030e5e2_to_t_string_memory_ptr(pos_219) -> end_220
-    {
-        mstore(pos_219, 29)
-        mstore(add(pos_219, 32), 0x446f6d61696e20536570617261746f7220616c72656164792073657421000000)
-        end_220 := add(pos_219, 64)
-    }
-    function abi_encode_t_stringliteral_a803fa289679098e38a7f1f6fe43056918c5ab5af07441cb8db77b949c165ca1_to_t_string_memory_ptr(pos_221) -> end_222
-    {
-        mstore(pos_221, 32)
-        mstore(add(pos_221, 32), 0x4475706c6963617465206f776e657220616464726573732070726f7669646564)
-        end_222 := add(pos_221, 64)
-    }
-    function abi_encode_t_stringliteral_ae2b4ea52eaf6de3fb2d8a64b7555be2dfd285b837a62821bf24e7dc6f329450_to_t_string_memory_ptr(pos_223) -> end_224
-    {
-        mstore(pos_223, 29)
-        mstore(add(pos_223, 32), 0x4d6f64756c652068617320616c7265616479206265656e206164646564000000)
-        end_224 := add(pos_223, 64)
-    }
-    function abi_encode_t_stringliteral_b995394ed6031392a784e6dd5e04285cca83077a8dc3873d2fb7fcb090297ab4_to_t_string_memory_ptr(pos_225) -> end_226
-    {
-        mstore(pos_225, 36)
-        mstore(add(pos_225, 32), 0x5468726573686f6c64206e6565647320746f2062652067726561746572207468)
-        mstore(add(pos_225, 64), 0x616e203000000000000000000000000000000000000000000000000000000000)
-        end_226 := add(pos_225, 96)
-    }
-    function abi_encode_t_stringliteral_c4780ef0a1d41d59bac8c510cf9ada421bccf2b90f75a8e4ba2e8c09e8d72733_to_t_string_memory_ptr(pos_227) -> end_228
-    {
-        mstore(pos_227, 44)
-        mstore(add(pos_227, 32), 0x4d6574686f642063616e206f6e6c792062652063616c6c65642066726f6d2074)
-        mstore(add(pos_227, 64), 0x68697320636f6e74726163740000000000000000000000000000000000000000)
-        end_228 := add(pos_227, 96)
-    }
-    function abi_encode_t_stringliteral_cd36462b17a97c5a3df33333c859d5933a4fb7f5e1a0750f5def8eb51f3272e4_to_t_string_memory_ptr(pos_229) -> end_230
-    {
-        mstore(pos_229, 48)
-        mstore(add(pos_229, 32), 0x4d6574686f642063616e206f6e6c792062652063616c6c65642066726f6d2061)
-        mstore(add(pos_229, 64), 0x6e20656e61626c6564206d6f64756c6500000000000000000000000000000000)
-        end_230 := add(pos_229, 96)
-    }
-    function abi_encode_t_stringliteral_e2a11e15f7be1214c1340779ad55027af8aa33aee6cb521776a28a0a44aea377_to_t_string_memory_ptr(pos_231) -> end_232
-    {
-        mstore(pos_231, 34)
-        mstore(add(pos_231, 32), 0x436f756c64206e6f74207061792067617320636f737473207769746820657468)
-        mstore(add(pos_231, 64), 0x6572000000000000000000000000000000000000000000000000000000000000)
-        end_232 := add(pos_231, 96)
-    }
-    function abi_encode_t_stringliteral_e7ccb05a0f2c66d12451cdfc6bbab488c38ab704d0f6af9ad18763542e9e5f18_to_t_string_memory_ptr(pos_233) -> end_234
-    {
-        mstore(pos_233, 42)
-        mstore(add(pos_233, 32), 0x4e6f7420656e6f7567682067617320746f206578656375746520736166652074)
-        mstore(add(pos_233, 64), 0x72616e73616374696f6e00000000000000000000000000000000000000000000)
-        end_234 := add(pos_233, 96)
-    }
-    function abi_encode_t_uint256_to_t_uint256(value_235, pos_236)
-    {
-        mstore(pos_236, cleanup_assert_t_uint256(value_235))
-    }
-    function abi_encode_tuple_t_address__to_t_address_(headStart_237, value0_238) -> tail
-    {
-        tail := add(headStart_237, 32)
-        abi_encode_t_address_to_t_address(value0_238, add(headStart_237, 0))
-    }
-    function abi_encode_tuple_t_address_t_uint256__to_t_address_t_uint256_(headStart_239, value1_240, value0_241) -> tail_242
-    {
-        tail_242 := add(headStart_239, 64)
-        abi_encode_t_address_to_t_address(value0_241, add(headStart_239, 0))
-        abi_encode_t_uint256_to_t_uint256(value1_240, add(headStart_239, 32))
-    }
-    function abi_encode_tuple_t_array$_t_address_$dyn_memory_ptr__to_t_array$_t_address_$dyn_memory_ptr_(headStart_243, value0_244) -> tail_245
-    {
-        tail_245 := add(headStart_243, 32)
-        mstore(add(headStart_243, 0), sub(tail_245, headStart_243))
-        tail_245 := abi_encode_t_array$_t_address_$dyn_memory_ptr_to_t_array$_t_address_$dyn_memory_ptr(value0_244, tail_245)
-    }
-    function abi_encode_tuple_t_bool__to_t_bool_(headStart_246, value0_247) -> tail_248
-    {
-        tail_248 := add(headStart_246, 32)
-        abi_encode_t_bool_to_t_bool(value0_247, add(headStart_246, 0))
-    }
-    function abi_encode_tuple_t_bytes32__to_t_bytes32_(headStart_249, value0_250) -> tail_251
-    {
-        tail_251 := add(headStart_249, 32)
-        abi_encode_t_bytes32_to_t_bytes32(value0_250, add(headStart_249, 0))
-    }
-    function abi_encode_tuple_t_bytes32_t_address_t_uint256_t_bytes32_t_enum$_Operation_$1949_t_uint256_t_uint256_t_uint256_t_address_t_address_t_uint256__to_t_bytes32_t_address_t_uint256_t_bytes32_t_uint8_t_uint256_t_uint256_t_uint256_t_address_t_address_t_uint256_(headStart_252, value10_253, value9_254, value8_255, value7_256, value6_257, value5_258, value4_259, value3_260, value2_261, value1_262, value0_263) -> tail_264
-    {
-        tail_264 := add(headStart_252, 352)
-        abi_encode_t_bytes32_to_t_bytes32(value0_263, add(headStart_252, 0))
-        abi_encode_t_address_to_t_address(value1_262, add(headStart_252, 32))
-        abi_encode_t_uint256_to_t_uint256(value2_261, add(headStart_252, 64))
-        abi_encode_t_bytes32_to_t_bytes32(value3_260, add(headStart_252, 96))
-        abi_encode_t_enum$_Operation_$1949_to_t_uint8(value4_259, add(headStart_252, 128))
-        abi_encode_t_uint256_to_t_uint256(value5_258, add(headStart_252, 160))
-        abi_encode_t_uint256_to_t_uint256(value6_257, add(headStart_252, 192))
-        abi_encode_t_uint256_to_t_uint256(value7_256, add(headStart_252, 224))
-        abi_encode_t_address_to_t_address(value8_255, add(headStart_252, 256))
-        abi_encode_t_address_to_t_address(value9_254, add(headStart_252, 288))
-        abi_encode_t_uint256_to_t_uint256(value10_253, add(headStart_252, 320))
-    }
-    function abi_encode_tuple_t_bytes32_t_bytes32__to_t_bytes32_t_bytes32_(headStart_265, value1_266, value0_267) -> tail_268
-    {
-        tail_268 := add(headStart_265, 64)
-        abi_encode_t_bytes32_to_t_bytes32(value0_267, add(headStart_265, 0))
-        abi_encode_t_bytes32_to_t_bytes32(value1_266, add(headStart_265, 32))
-    }
-    function abi_encode_tuple_t_bytes32_t_contract$_GnosisSafe_$710__to_t_bytes32_t_address_payable_(headStart_269, value1_270, value0_271) -> tail_272
-    {
-        tail_272 := add(headStart_269, 64)
-        abi_encode_t_bytes32_to_t_bytes32(value0_271, add(headStart_269, 0))
-        abi_encode_t_contract$_GnosisSafe_$710_to_t_address_payable(value1_270, add(headStart_269, 32))
-    }
-    function abi_encode_tuple_t_bytes_memory_ptr__to_t_bytes_memory_ptr_(headStart_273, value0_274) -> tail_275
-    {
-        tail_275 := add(headStart_273, 32)
-        mstore(add(headStart_273, 0), sub(tail_275, headStart_273))
-        tail_275 := abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value0_274, tail_275)
-    }
-    function abi_encode_tuple_t_bytes_memory_ptr_t_bytes_memory_ptr__to_t_bytes_memory_ptr_t_bytes_memory_ptr_(headStart_276, value1_277, value0_278) -> tail_279
-    {
-        tail_279 := add(headStart_276, 64)
-        mstore(add(headStart_276, 0), sub(tail_279, headStart_276))
-        tail_279 := abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value0_278, tail_279)
-        mstore(add(headStart_276, 32), sub(tail_279, headStart_276))
-        tail_279 := abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value1_277, tail_279)
-    }
-    function abi_encode_tuple_t_contract$_Module_$1038__to_t_address_(headStart_280, value0_281) -> tail_282
-    {
-        tail_282 := add(headStart_280, 32)
-        abi_encode_t_contract$_Module_$1038_to_t_address(value0_281, add(headStart_280, 0))
-    }
-    function abi_encode_tuple_t_string_memory__to_t_string_memory_ptr_(headStart_283, value0_284) -> tail_285
-    {
-        tail_285 := add(headStart_283, 32)
-        mstore(add(headStart_283, 0), sub(tail_285, headStart_283))
-        tail_285 := abi_encode_t_string_memory_to_t_string_memory_ptr(value0_284, tail_285)
-    }
-    function abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr_(headStart_286, value0_287) -> tail_288
-    {
-        tail_288 := add(headStart_286, 32)
-        mstore(add(headStart_286, 0), sub(tail_288, headStart_286))
-        tail_288 := abi_encode_t_string_memory_ptr_to_t_string_memory_ptr(value0_287, tail_288)
-    }
-    function abi_encode_tuple_t_stringliteral_108d84599042957b954e89d43b52f80be89321dfc114a37800028eba58dafc87__to_t_string_memory_ptr_(headStart_289) -> tail_290
-    {
-        tail_290 := add(headStart_289, 32)
-        mstore(add(headStart_289, 0), sub(tail_290, headStart_289))
-        tail_290 := abi_encode_t_stringliteral_108d84599042957b954e89d43b52f80be89321dfc114a37800028eba58dafc87_to_t_string_memory_ptr(tail_290)
-    }
-    function abi_encode_tuple_t_stringliteral_1e0428ffa69bff65645154a36d5017c238f946ddaf89430d30eec813f30bdd77__to_t_string_memory_ptr_(headStart_291) -> tail_292
-    {
-        tail_292 := add(headStart_291, 32)
-        mstore(add(headStart_291, 0), sub(tail_292, headStart_291))
-        tail_292 := abi_encode_t_stringliteral_1e0428ffa69bff65645154a36d5017c238f946ddaf89430d30eec813f30bdd77_to_t_string_memory_ptr(tail_292)
-    }
-    function abi_encode_tuple_t_stringliteral_21a1cd38818adb750881fbf07c26ce7223dde608fdd9dadd31a0d41afeca2094__to_t_string_memory_ptr_(headStart_293) -> tail_294
-    {
-        tail_294 := add(headStart_293, 32)
-        mstore(add(headStart_293, 0), sub(tail_294, headStart_293))
-        tail_294 := abi_encode_t_stringliteral_21a1cd38818adb750881fbf07c26ce7223dde608fdd9dadd31a0d41afeca2094_to_t_string_memory_ptr(tail_294)
-    }
-    function abi_encode_tuple_t_stringliteral_5caa315f9c5cf61be71c182eef2dc9ef7b6ce6b42c320d36694e1d23e09c287e__to_t_string_memory_ptr_(headStart_295) -> tail_296
-    {
-        tail_296 := add(headStart_295, 32)
-        mstore(add(headStart_295, 0), sub(tail_296, headStart_295))
-        tail_296 := abi_encode_t_stringliteral_5caa315f9c5cf61be71c182eef2dc9ef7b6ce6b42c320d36694e1d23e09c287e_to_t_string_memory_ptr(tail_296)
-    }
-    function abi_encode_tuple_t_stringliteral_60f21058f4a7689ef29853b3c9c17c9bf69856a949794649bb68878f00552475__to_t_string_memory_ptr_(headStart_297) -> tail_298
-    {
-        tail_298 := add(headStart_297, 32)
-        mstore(add(headStart_297, 0), sub(tail_298, headStart_297))
-        tail_298 := abi_encode_t_stringliteral_60f21058f4a7689ef29853b3c9c17c9bf69856a949794649bb68878f00552475_to_t_string_memory_ptr(tail_298)
-    }
-    function abi_encode_tuple_t_stringliteral_63d26a9feb8568677e5c255c04e4da88e86a25137d5152a9a089790b7e710e86__to_t_string_memory_ptr_(headStart_299) -> tail_300
-    {
-        tail_300 := add(headStart_299, 32)
-        mstore(add(headStart_299, 0), sub(tail_300, headStart_299))
-        tail_300 := abi_encode_t_stringliteral_63d26a9feb8568677e5c255c04e4da88e86a25137d5152a9a089790b7e710e86_to_t_string_memory_ptr(tail_300)
-    }
-    function abi_encode_tuple_t_stringliteral_7913a3f9168bf3e458e3f42eb08db5c4b33f44228d345660887090b75e24c6aa__to_t_string_memory_ptr_(headStart_301) -> tail_302
-    {
-        tail_302 := add(headStart_301, 32)
-        mstore(add(headStart_301, 0), sub(tail_302, headStart_301))
-        tail_302 := abi_encode_t_stringliteral_7913a3f9168bf3e458e3f42eb08db5c4b33f44228d345660887090b75e24c6aa_to_t_string_memory_ptr(tail_302)
-    }
-    function abi_encode_tuple_t_stringliteral_839b4c4db845de24ec74ef067d85431087d6987a4c904418ee4f6ec699c02482__to_t_string_memory_ptr_(headStart_303) -> tail_304
-    {
-        tail_304 := add(headStart_303, 32)
-        mstore(add(headStart_303, 0), sub(tail_304, headStart_303))
-        tail_304 := abi_encode_t_stringliteral_839b4c4db845de24ec74ef067d85431087d6987a4c904418ee4f6ec699c02482_to_t_string_memory_ptr(tail_304)
-    }
-    function abi_encode_tuple_t_stringliteral_8560a13547eca5648355c8db1a9f8653b6f657d31d476c36bca25e47b45b08f4__to_t_string_memory_ptr_(headStart_305) -> tail_306
-    {
-        tail_306 := add(headStart_305, 32)
-        mstore(add(headStart_305, 0), sub(tail_306, headStart_305))
-        tail_306 := abi_encode_t_stringliteral_8560a13547eca5648355c8db1a9f8653b6f657d31d476c36bca25e47b45b08f4_to_t_string_memory_ptr(tail_306)
-    }
-    function abi_encode_tuple_t_stringliteral_85bcea44c930431ef19052d068cc504a81260341ae6c5ee84bb5a38ec55acf05__to_t_string_memory_ptr_(headStart_307) -> tail_308
-    {
-        tail_308 := add(headStart_307, 32)
-        mstore(add(headStart_307, 0), sub(tail_308, headStart_307))
-        tail_308 := abi_encode_t_stringliteral_85bcea44c930431ef19052d068cc504a81260341ae6c5ee84bb5a38ec55acf05_to_t_string_memory_ptr(tail_308)
-    }
-    function abi_encode_tuple_t_stringliteral_8c2199b479423c52a835dfe8b0f2e9eb4c1ec1069ba198ccc38077a4a88a5c00__to_t_string_memory_ptr_(headStart_309) -> tail_310
-    {
-        tail_310 := add(headStart_309, 32)
-        mstore(add(headStart_309, 0), sub(tail_310, headStart_309))
-        tail_310 := abi_encode_t_stringliteral_8c2199b479423c52a835dfe8b0f2e9eb4c1ec1069ba198ccc38077a4a88a5c00_to_t_string_memory_ptr(tail_310)
-    }
-    function abi_encode_tuple_t_stringliteral_960698caed81fce71c9b7d572ab2e035b6014a5b812b51df8462ea9817fc4ebc__to_t_string_memory_ptr_(headStart_311) -> tail_312
-    {
-        tail_312 := add(headStart_311, 32)
-        mstore(add(headStart_311, 0), sub(tail_312, headStart_311))
-        tail_312 := abi_encode_t_stringliteral_960698caed81fce71c9b7d572ab2e035b6014a5b812b51df8462ea9817fc4ebc_to_t_string_memory_ptr(tail_312)
-    }
-    function abi_encode_tuple_t_stringliteral_9a45ae898fbe2bd07a0b33b5a6c421f76198e9deb66843b8d827b0b9e4a16f86__to_t_string_memory_ptr_(headStart_313) -> tail_314
-    {
-        tail_314 := add(headStart_313, 32)
-        mstore(add(headStart_313, 0), sub(tail_314, headStart_313))
-        tail_314 := abi_encode_t_stringliteral_9a45ae898fbe2bd07a0b33b5a6c421f76198e9deb66843b8d827b0b9e4a16f86_to_t_string_memory_ptr(tail_314)
-    }
-    function abi_encode_tuple_t_stringliteral_9d461d71e19b25cd406798d062d7e61f961ad52541d3077a543e857810427d47__to_t_string_memory_ptr_(headStart_315) -> tail_316
-    {
-        tail_316 := add(headStart_315, 32)
-        mstore(add(headStart_315, 0), sub(tail_316, headStart_315))
-        tail_316 := abi_encode_t_stringliteral_9d461d71e19b25cd406798d062d7e61f961ad52541d3077a543e857810427d47_to_t_string_memory_ptr(tail_316)
-    }
-    function abi_encode_tuple_t_stringliteral_a2e1f2db9cd32eaa6a2caa3d6caa726a30dc0417d866440bfe13d6a6d030e5e2__to_t_string_memory_ptr_(headStart_317) -> tail_318
-    {
-        tail_318 := add(headStart_317, 32)
-        mstore(add(headStart_317, 0), sub(tail_318, headStart_317))
-        tail_318 := abi_encode_t_stringliteral_a2e1f2db9cd32eaa6a2caa3d6caa726a30dc0417d866440bfe13d6a6d030e5e2_to_t_string_memory_ptr(tail_318)
-    }
-    function abi_encode_tuple_t_stringliteral_a803fa289679098e38a7f1f6fe43056918c5ab5af07441cb8db77b949c165ca1__to_t_string_memory_ptr_(headStart_319) -> tail_320
-    {
-        tail_320 := add(headStart_319, 32)
-        mstore(add(headStart_319, 0), sub(tail_320, headStart_319))
-        tail_320 := abi_encode_t_stringliteral_a803fa289679098e38a7f1f6fe43056918c5ab5af07441cb8db77b949c165ca1_to_t_string_memory_ptr(tail_320)
-    }
-    function abi_encode_tuple_t_stringliteral_ae2b4ea52eaf6de3fb2d8a64b7555be2dfd285b837a62821bf24e7dc6f329450__to_t_string_memory_ptr_(headStart_321) -> tail_322
-    {
-        tail_322 := add(headStart_321, 32)
-        mstore(add(headStart_321, 0), sub(tail_322, headStart_321))
-        tail_322 := abi_encode_t_stringliteral_ae2b4ea52eaf6de3fb2d8a64b7555be2dfd285b837a62821bf24e7dc6f329450_to_t_string_memory_ptr(tail_322)
-    }
-    function abi_encode_tuple_t_stringliteral_b995394ed6031392a784e6dd5e04285cca83077a8dc3873d2fb7fcb090297ab4__to_t_string_memory_ptr_(headStart_323) -> tail_324
-    {
-        tail_324 := add(headStart_323, 32)
-        mstore(add(headStart_323, 0), sub(tail_324, headStart_323))
-        tail_324 := abi_encode_t_stringliteral_b995394ed6031392a784e6dd5e04285cca83077a8dc3873d2fb7fcb090297ab4_to_t_string_memory_ptr(tail_324)
-    }
-    function abi_encode_tuple_t_stringliteral_c4780ef0a1d41d59bac8c510cf9ada421bccf2b90f75a8e4ba2e8c09e8d72733__to_t_string_memory_ptr_(headStart_325) -> tail_326
-    {
-        tail_326 := add(headStart_325, 32)
-        mstore(add(headStart_325, 0), sub(tail_326, headStart_325))
-        tail_326 := abi_encode_t_stringliteral_c4780ef0a1d41d59bac8c510cf9ada421bccf2b90f75a8e4ba2e8c09e8d72733_to_t_string_memory_ptr(tail_326)
-    }
-    function abi_encode_tuple_t_stringliteral_cd36462b17a97c5a3df33333c859d5933a4fb7f5e1a0750f5def8eb51f3272e4__to_t_string_memory_ptr_(headStart_327) -> tail_328
-    {
-        tail_328 := add(headStart_327, 32)
-        mstore(add(headStart_327, 0), sub(tail_328, headStart_327))
-        tail_328 := abi_encode_t_stringliteral_cd36462b17a97c5a3df33333c859d5933a4fb7f5e1a0750f5def8eb51f3272e4_to_t_string_memory_ptr(tail_328)
-    }
-    function abi_encode_tuple_t_stringliteral_e2a11e15f7be1214c1340779ad55027af8aa33aee6cb521776a28a0a44aea377__to_t_string_memory_ptr_(headStart_329) -> tail_330
-    {
-        tail_330 := add(headStart_329, 32)
-        mstore(add(headStart_329, 0), sub(tail_330, headStart_329))
-        tail_330 := abi_encode_t_stringliteral_e2a11e15f7be1214c1340779ad55027af8aa33aee6cb521776a28a0a44aea377_to_t_string_memory_ptr(tail_330)
-    }
-    function abi_encode_tuple_t_stringliteral_e7ccb05a0f2c66d12451cdfc6bbab488c38ab704d0f6af9ad18763542e9e5f18__to_t_string_memory_ptr_(headStart_331) -> tail_332
-    {
-        tail_332 := add(headStart_331, 32)
-        mstore(add(headStart_331, 0), sub(tail_332, headStart_331))
-        tail_332 := abi_encode_t_stringliteral_e7ccb05a0f2c66d12451cdfc6bbab488c38ab704d0f6af9ad18763542e9e5f18_to_t_string_memory_ptr(tail_332)
-    }
-    function abi_encode_tuple_t_uint256__to_t_uint256_(headStart_333, value0_334) -> tail_335
-    {
-        tail_335 := add(headStart_333, 32)
-        abi_encode_t_uint256_to_t_uint256(value0_334, add(headStart_333, 0))
-    }
-    function allocateMemory(size) -> memPtr
-    {
-        memPtr := mload(64)
-        let newFreePtr := add(memPtr, size)
-        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr))
-        {
-            revert(0, 0)
-        }
-        mstore(64, newFreePtr)
-    }
-    function array_allocation_size_t_bytes_memory_ptr(length_336) -> size_337
-    {
-        if gt(length_336, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        size_337 := and(add(length_336, 0x1f), not(0x1f))
-        size_337 := add(size_337, 0x20)
-    }
-    function array_dataslot_t_array$_t_address_$dyn_memory_ptr(memPtr_338) -> dataPtr
-    {
-        dataPtr := add(memPtr_338, 0x20)
-    }
-    function array_length_t_array$_t_address_$dyn_memory_ptr(value_339) -> length_340
-    {
-        length_340 := mload(value_339)
-    }
-    function array_length_t_bytes_memory_ptr(value_341) -> length_342
-    {
-        length_342 := mload(value_341)
-    }
-    function array_length_t_string_memory(value_343) -> length_344
-    {
-        length_344 := mload(value_343)
-    }
-    function array_length_t_string_memory_ptr(value_345) -> length_346
-    {
-        length_346 := mload(value_345)
-    }
-    function array_nextElement_t_array$_t_address_$dyn_memory_ptr(memPtr_347) -> nextPtr
-    {
-        nextPtr := add(memPtr_347, 0x20)
-    }
-    function cleanup_assert_t_address(value_348) -> cleaned
-    {
-        cleaned := cleanup_assert_t_uint160(value_348)
-    }
-    function cleanup_assert_t_bool(value_349) -> cleaned_350
-    {
-        cleaned_350 := iszero(iszero(value_349))
-    }
-    function cleanup_assert_t_bytes32(value_351) -> cleaned_352
-    {
-        cleaned_352 := value_351
-    }
-    function cleanup_assert_t_enum$_Operation_$1949(value_353) -> cleaned_354
-    {
-        if iszero(lt(value_353, 3))
-        {
-            invalid()
-        }
-        cleaned_354 := value_353
-    }
-    function cleanup_assert_t_uint160(value_355) -> cleaned_356
-    {
-        cleaned_356 := and(value_355, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    }
-    function cleanup_assert_t_uint256(value_357) -> cleaned_358
-    {
-        cleaned_358 := value_357
-    }
-    function cleanup_revert_t_address(value_359) -> cleaned_360
-    {
-        cleaned_360 := cleanup_assert_t_uint160(value_359)
-    }
-    function cleanup_revert_t_address_payable(value_361) -> cleaned_362
-    {
-        cleaned_362 := cleanup_assert_t_uint160(value_361)
-    }
-    function cleanup_revert_t_bool(value_363) -> cleaned_364
-    {
-        cleaned_364 := iszero(iszero(value_363))
-    }
-    function cleanup_revert_t_bytes32(value_365) -> cleaned_366
-    {
-        cleaned_366 := value_365
-    }
-    function cleanup_revert_t_contract$_Module_$1038(value_367) -> cleaned_368
-    {
-        cleaned_368 := cleanup_assert_t_address(value_367)
-    }
-    function cleanup_revert_t_enum$_Operation_$1949(value_369) -> cleaned_370
-    {
-        if iszero(lt(value_369, 3))
-        {
-            revert(0, 0)
-        }
-        cleaned_370 := value_369
-    }
-    function cleanup_revert_t_uint256(value_371) -> cleaned_372
-    {
-        cleaned_372 := value_371
-    }
-    function convert_t_contract$_GnosisSafe_$710_to_t_address_payable(value_373) -> converted
-    {
-        converted := convert_t_contract$_GnosisSafe_$710_to_t_uint160(value_373)
-    }
-    function convert_t_contract$_GnosisSafe_$710_to_t_uint160(value_374) -> converted_375
-    {
-        converted_375 := cleanup_assert_t_uint160(value_374)
-    }
-    function convert_t_contract$_Module_$1038_to_t_address(value_376) -> converted_377
-    {
-        converted_377 := convert_t_contract$_Module_$1038_to_t_uint160(value_376)
-    }
-    function convert_t_contract$_Module_$1038_to_t_uint160(value_378) -> converted_379
-    {
-        converted_379 := cleanup_assert_t_uint160(value_378)
-    }
-    function convert_t_enum$_Operation_$1949_to_t_uint8(value_380) -> converted_381
-    {
-        converted_381 := cleanup_assert_t_enum$_Operation_$1949(value_380)
-    }
-    function copy_calldata_to_memory(src_382, dst_383, length_384)
-    {
-        calldatacopy(dst_383, src_382, length_384)
-        mstore(add(dst_383, length_384), 0)
-    }
-    function copy_memory_to_memory(src_385, dst_386, length_387)
-    {
-        let i_388 := 0
-        for {
-        }
-        lt(i_388, length_387)
-        {
-            i_388 := add(i_388, 32)
-        }
-        {
-            mstore(add(dst_386, i_388), mload(add(src_385, i_388)))
-        }
-        if gt(i_388, length_387)
-        {
-            mstore(add(dst_386, length_387), 0)
-        }
-    }
-    function round_up_to_mul_of_32(value_389) -> result
-    {
-        result := and(add(value_389, 31), not(31))
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := mload(1)
-//         let _2 := mload(0)
-//         if slt(sub(_1, _2), 64) { revert(0, 0) }
-//         sstore(0, and(calldataload(_2), sub(shl(160, 1), 1)))
-//         let x0, x1, x2, x3, x4 := abi_decode_addresst_uint256t_bytes_calldatat_enum_Operation(mload(7), mload(8))
-//         sstore(x1, x0)
-//         sstore(x3, x2)
-//         sstore(1, x4)
-//         pop(abi_encode_bytes32_address_uint256_bytes32_enum_Operation_uint256_uint256_uint256_address_address_uint256(mload(30), mload(31), mload(32), mload(33), mload(34), mload(35), mload(36), mload(37), mload(38), mload(39), mload(40), mload(41)))
-//     }
-//     function abi_decode_addresst_uint256t_bytes_calldatat_enum_Operation(headStart, dataEnd) -> value0, value1, value2, value3, value4
-//     {
-//         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
-//         value0 := and(calldataload(headStart), sub(shl(160, 1), 1))
-//         value1 := calldataload(add(headStart, 32))
-//         let offset := calldataload(add(headStart, 64))
-//         let _1 := 0xffffffffffffffff
-//         if gt(offset, _1) { revert(0, 0) }
-//         let _2 := add(headStart, offset)
-//         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(0, 0) }
-//         let length := calldataload(_2)
-//         if gt(length, _1) { revert(0, 0) }
-//         if gt(add(add(_2, length), 32), dataEnd) { revert(0, 0) }
-//         value2 := add(_2, 32)
-//         value3 := length
-//         let _3 := calldataload(add(headStart, 96))
-//         if iszero(lt(_3, 3)) { revert(0, 0) }
-//         value4 := _3
-//     }
-//     function abi_encode_bytes32_address_uint256_bytes32_enum_Operation_uint256_uint256_uint256_address_address_uint256(headStart, value10, value9, value8, value7, value6, value5, value4, value3, value2, value1, value0) -> tail
-//     {
-//         tail := add(headStart, 352)
-//         mstore(headStart, value0)
-//         let _1 := sub(shl(160, 1), 1)
-//         mstore(add(headStart, 32), and(value1, _1))
-//         mstore(add(headStart, 64), value2)
-//         mstore(add(headStart, 96), value3)
-//         if iszero(lt(value4, 3)) { invalid() }
-//         mstore(add(headStart, 128), value4)
-//         mstore(add(headStart, 160), value5)
-//         mstore(add(headStart, 192), value6)
-//         mstore(add(headStart, 224), value7)
-//         mstore(add(headStart, 256), and(value8, _1))
-//         mstore(add(headStart, 288), and(value9, _1))
-//         mstore(add(headStart, 320), value10)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
deleted file mode 100644
index 2abdf6d9c283..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
+++ /dev/null
@@ -1,575 +0,0 @@
-// We require constantinople because numbers are represented using shifts.
-{
-    let x := abi_encode_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr_to_t_array$_t_array$_t_address_$3_memory_$dyn_memory_ptr(mload(0), 0x20)
-    let a, b, c, d := abi_decode_tuple_t_uint256t_uint256t_array$_t_uint256_$dyn_memory_ptrt_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(mload(0x20), mload(0x40))
-    sstore(a, b)
-    sstore(c, d)
-    sstore(0, x)
-
-    function abi_decode_t_address(offset, end) -> value
-    {
-        value := cleanup_revert_t_address(calldataload(offset))
-    }
-    function abi_decode_t_array$_t_address_$dyn_memory(offset, end) -> array
-    {
-        if iszero(slt(add(offset, 0x1f), end))
-        {
-            revert(0, 0)
-        }
-        let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
-        let dst := array
-        mstore(array, length)
-        offset := add(offset, 0x20)
-        dst := add(dst, 0x20)
-        let src := offset
-        if gt(add(src, mul(length, 0x20)), end)
-        {
-            revert(0, 0)
-        }
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            let elementPos := src
-            mstore(dst, abi_decode_t_address(elementPos, end))
-            dst := add(dst, 0x20)
-            src := add(src, 0x20)
-        }
-    }
-    function abi_decode_t_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(offset, end) -> array
-    {
-        if iszero(slt(add(offset, 0x1f), end))
-        {
-            revert(0, 0)
-        }
-        let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(length))
-        let dst := array
-        mstore(array, length)
-        offset := add(offset, 0x20)
-        dst := add(dst, 0x20)
-        let src := offset
-        if gt(add(src, mul(length, 0x40)), end)
-        {
-            revert(0, 0)
-        }
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            let elementPos := src
-            mstore(dst, abi_decode_t_array$_t_uint256_$2_memory(elementPos, end))
-            dst := add(dst, 0x20)
-            src := add(src, 0x40)
-        }
-    }
-    function abi_decode_t_array$_t_uint256_$2_memory(offset, end) -> array
-    {
-        if iszero(slt(add(offset, 0x1f), end))
-        {
-            revert(0, 0)
-        }
-        let length := 0x2
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$2_memory(length))
-        let dst := array
-        let src := offset
-        if gt(add(src, mul(length, 0x20)), end)
-        {
-            revert(0, 0)
-        }
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            let elementPos := src
-            mstore(dst, abi_decode_t_uint256(elementPos, end))
-            dst := add(dst, 0x20)
-            src := add(src, 0x20)
-        }
-    }
-    function abi_decode_t_array$_t_uint256_$dyn_memory(offset, end) -> array
-    {
-        if iszero(slt(add(offset, 0x1f), end))
-        {
-            revert(0, 0)
-        }
-        let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$dyn_memory(length))
-        let dst := array
-        mstore(array, length)
-        offset := add(offset, 0x20)
-        dst := add(dst, 0x20)
-        let src := offset
-        if gt(add(src, mul(length, 0x20)), end)
-        {
-            revert(0, 0)
-        }
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            let elementPos := src
-            mstore(dst, abi_decode_t_uint256(elementPos, end))
-            dst := add(dst, 0x20)
-            src := add(src, 0x20)
-        }
-    }
-    function abi_decode_t_array$_t_uint256_$dyn_memory_ptr(offset, end) -> array
-    {
-        if iszero(slt(add(offset, 0x1f), end))
-        {
-            revert(0, 0)
-        }
-        let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length))
-        let dst := array
-        mstore(array, length)
-        offset := add(offset, 0x20)
-        dst := add(dst, 0x20)
-        let src := offset
-        if gt(add(src, mul(length, 0x20)), end)
-        {
-            revert(0, 0)
-        }
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            let elementPos := src
-            mstore(dst, abi_decode_t_uint256(elementPos, end))
-            dst := add(dst, 0x20)
-            src := add(src, 0x20)
-        }
-    }
-    function abi_decode_t_contract$_C_$55(offset, end) -> value
-    {
-        value := cleanup_revert_t_contract$_C_$55(calldataload(offset))
-    }
-    function abi_decode_t_struct$_S_$11_memory_ptr(headStart, end) -> value
-    {
-        if slt(sub(end, headStart), 0x60)
-        {
-            revert(0, 0)
-        }
-        value := allocateMemory(0x60)
-        {
-            let offset := 0
-            mstore(add(value, 0x0), abi_decode_t_uint256(add(headStart, offset), end))
-        }
-        {
-            let offset := calldataload(add(headStart, 32))
-            if gt(offset, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            mstore(add(value, 0x20), abi_decode_t_array$_t_uint256_$dyn_memory(add(headStart, offset), end))
-        }
-        {
-            let offset := calldataload(add(headStart, 64))
-            if gt(offset, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            mstore(add(value, 0x40), abi_decode_t_array$_t_address_$dyn_memory(add(headStart, offset), end))
-        }
-    }
-    function abi_decode_t_uint256(offset, end) -> value
-    {
-        value := cleanup_revert_t_uint256(calldataload(offset))
-    }
-    function abi_decode_t_uint8(offset, end) -> value
-    {
-        value := cleanup_revert_t_uint8(calldataload(offset))
-    }
-    function abi_decode_tuple_t_contract$_C_$55t_uint8(headStart, dataEnd) -> value0, value1
-    {
-        if slt(sub(dataEnd, headStart), 64)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset := 0
-            value0 := abi_decode_t_contract$_C_$55(add(headStart, offset), dataEnd)
-        }
-        {
-            let offset := 32
-            value1 := abi_decode_t_uint8(add(headStart, offset), dataEnd)
-        }
-    }
-    function abi_decode_tuple_t_struct$_S_$11_memory_ptrt_uint256(headStart, dataEnd) -> value0, value1
-    {
-        if slt(sub(dataEnd, headStart), 64)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset := calldataload(add(headStart, 0))
-            if gt(offset, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value0 := abi_decode_t_struct$_S_$11_memory_ptr(add(headStart, offset), dataEnd)
-        }
-        {
-            let offset := 32
-            value1 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-        }
-    }
-    function abi_decode_tuple_t_uint256t_uint256t_array$_t_uint256_$dyn_memory_ptrt_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(headStart, dataEnd) -> value0, value1, value2, value3
-    {
-        if slt(sub(dataEnd, headStart), 128)
-        {
-            revert(0, 0)
-        }
-        {
-            let offset := 0
-            value0 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-        }
-        {
-            let offset := 32
-            value1 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
-        }
-        {
-            let offset := calldataload(add(headStart, 64))
-            if gt(offset, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value2 := abi_decode_t_array$_t_uint256_$dyn_memory_ptr(add(headStart, offset), dataEnd)
-        }
-        {
-            let offset := calldataload(add(headStart, 96))
-            if gt(offset, 0xffffffffffffffff)
-            {
-                revert(0, 0)
-            }
-            value3 := abi_decode_t_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(add(headStart, offset), dataEnd)
-        }
-    }
-    function abi_encode_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr_to_t_array$_t_array$_t_address_$3_memory_$dyn_memory_ptr(value, pos) -> end
-    {
-        let length := array_length_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr(value)
-        mstore(pos, length)
-        pos := add(pos, 0x20)
-        let srcPtr := array_dataslot_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr(value)
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            abi_encode_t_array$_t_contract$_C_$55_$3_memory_to_t_array$_t_address_$3_memory_ptr(mload(srcPtr), pos)
-            srcPtr := array_nextElement_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr(srcPtr)
-            pos := add(pos, 0x60)
-        }
-        end := pos
-    }
-    function abi_encode_t_array$_t_contract$_C_$55_$3_memory_to_t_array$_t_address_$3_memory_ptr(value, pos)
-    {
-        let length := array_length_t_array$_t_contract$_C_$55_$3_memory(value)
-        let srcPtr := array_dataslot_t_array$_t_contract$_C_$55_$3_memory(value)
-        for {
-            let i := 0
-        }
-        lt(i, length)
-        {
-            i := add(i, 1)
-        }
-        {
-            abi_encode_t_contract$_C_$55_to_t_address(mload(srcPtr), pos)
-            srcPtr := array_nextElement_t_array$_t_contract$_C_$55_$3_memory(srcPtr)
-            pos := add(pos, 0x20)
-        }
-    }
-    function abi_encode_t_bool_to_t_bool(value, pos)
-    {
-        mstore(pos, cleanup_assert_t_bool(value))
-    }
-    function abi_encode_t_contract$_C_$55_to_t_address(value, pos)
-    {
-        mstore(pos, convert_t_contract$_C_$55_to_t_address(value))
-    }
-    function abi_encode_t_uint16_to_t_uint16(value, pos)
-    {
-        mstore(pos, cleanup_assert_t_uint16(value))
-    }
-    function abi_encode_t_uint24_to_t_uint24(value, pos)
-    {
-        mstore(pos, cleanup_assert_t_uint24(value))
-    }
-    function abi_encode_tuple_t_bool__to_t_bool_(headStart, value0) -> tail
-    {
-        tail := add(headStart, 32)
-        abi_encode_t_bool_to_t_bool(value0, add(headStart, 0))
-    }
-    function abi_encode_tuple_t_uint16_t_uint24_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr__to_t_uint16_t_uint24_t_array$_t_array$_t_address_$3_memory_$dyn_memory_ptr_(headStart, value2, value1, value0) -> tail
-    {
-        tail := add(headStart, 96)
-        abi_encode_t_uint16_to_t_uint16(value0, add(headStart, 0))
-        abi_encode_t_uint24_to_t_uint24(value1, add(headStart, 32))
-        mstore(add(headStart, 64), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr_to_t_array$_t_array$_t_address_$3_memory_$dyn_memory_ptr(value2, tail)
-    }
-    function allocateMemory(size) -> memPtr
-    {
-        memPtr := mload(64)
-        let newFreePtr := add(memPtr, size)
-        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr))
-        {
-            revert(0, 0)
-        }
-        mstore(64, newFreePtr)
-    }
-    function array_allocation_size_t_array$_t_address_$dyn_memory(length) -> size
-    {
-        if gt(length, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        size := mul(length, 0x20)
-        size := add(size, 0x20)
-    }
-    function array_allocation_size_t_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(length) -> size
-    {
-        if gt(length, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        size := mul(length, 0x20)
-        size := add(size, 0x20)
-    }
-    function array_allocation_size_t_array$_t_uint256_$2_memory(length) -> size
-    {
-        if gt(length, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        size := mul(length, 0x20)
-    }
-    function array_allocation_size_t_array$_t_uint256_$dyn_memory(length) -> size
-    {
-        if gt(length, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        size := mul(length, 0x20)
-        size := add(size, 0x20)
-    }
-    function array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length) -> size
-    {
-        if gt(length, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        size := mul(length, 0x20)
-        size := add(size, 0x20)
-    }
-    function array_dataslot_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr(memPtr) -> dataPtr
-    {
-        dataPtr := add(memPtr, 0x20)
-    }
-    function array_dataslot_t_array$_t_contract$_C_$55_$3_memory(memPtr) -> dataPtr
-    {
-        dataPtr := memPtr
-    }
-    function array_length_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr(value) -> length
-    {
-        length := mload(value)
-    }
-    function array_length_t_array$_t_contract$_C_$55_$3_memory(value) -> length
-    {
-        length := 0x3
-    }
-    function array_nextElement_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr(memPtr) -> nextPtr
-    {
-        nextPtr := add(memPtr, 0x20)
-    }
-    function array_nextElement_t_array$_t_contract$_C_$55_$3_memory(memPtr) -> nextPtr
-    {
-        nextPtr := add(memPtr, 0x20)
-    }
-    function cleanup_assert_t_address(value) -> cleaned
-    {
-        cleaned := cleanup_assert_t_uint160(value)
-    }
-    function cleanup_assert_t_bool(value) -> cleaned
-    {
-        cleaned := iszero(iszero(value))
-    }
-    function cleanup_assert_t_uint16(value) -> cleaned
-    {
-        cleaned := and(value, 0xFFFF)
-    }
-    function cleanup_assert_t_uint160(value) -> cleaned
-    {
-        cleaned := and(value, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    }
-    function cleanup_assert_t_uint24(value) -> cleaned
-    {
-        cleaned := and(value, 0xFFFFFF)
-    }
-    function cleanup_revert_t_address(value) -> cleaned
-    {
-        cleaned := cleanup_assert_t_uint160(value)
-    }
-    function cleanup_revert_t_contract$_C_$55(value) -> cleaned
-    {
-        cleaned := cleanup_assert_t_address(value)
-    }
-    function cleanup_revert_t_uint256(value) -> cleaned
-    {
-        cleaned := value
-    }
-    function cleanup_revert_t_uint8(value) -> cleaned
-    {
-        cleaned := and(value, 0xFF)
-    }
-    function convert_t_contract$_C_$55_to_t_address(value) -> converted
-    {
-        converted := convert_t_contract$_C_$55_to_t_uint160(value)
-    }
-    function convert_t_contract$_C_$55_to_t_uint160(value) -> converted
-    {
-        converted := cleanup_assert_t_uint160(value)
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := mload(0)
-//         let pos := 0x20
-//         let length := mload(_1)
-//         mstore(pos, length)
-//         pos := 64
-//         let srcPtr := add(_1, 0x20)
-//         let i := 0
-//         for { } lt(i, length) { i := add(i, 1) }
-//         {
-//             let _2 := mload(srcPtr)
-//             let pos_1 := pos
-//             let srcPtr_1 := _2
-//             let i_1 := 0
-//             for { } lt(i_1, 0x3) { i_1 := add(i_1, 1) }
-//             {
-//                 mstore(pos_1, and(mload(srcPtr_1), sub(shl(160, 1), 1)))
-//                 srcPtr_1 := add(srcPtr_1, 0x20)
-//                 pos_1 := add(pos_1, 0x20)
-//             }
-//             srcPtr := add(srcPtr, 0x20)
-//             pos := add(pos, 0x60)
-//         }
-//         let a, b, c, d := abi_decode_uint256t_uint256t_array_uint256_dynt_array_array_uint256_memory_dyn(mload(0x20), mload(64))
-//         sstore(a, b)
-//         sstore(c, d)
-//         sstore(0, pos)
-//     }
-//     function abi_decode_array_array_uint256_memory_dyn(offset, end) -> array
-//     {
-//         let _1 := 0x1f
-//         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
-//         let length := calldataload(offset)
-//         array := allocateMemory(array_allocation_size_array_address_dyn_memory(length))
-//         let dst := array
-//         mstore(array, length)
-//         let _2 := 0x20
-//         dst := add(array, _2)
-//         let src := add(offset, _2)
-//         if gt(add(add(offset, shl(6, length)), _2), end) { revert(0, 0) }
-//         let i := 0
-//         for { } lt(i, length) { i := add(i, 1) }
-//         {
-//             if iszero(slt(add(src, _1), end)) { revert(0, 0) }
-//             let dst_1 := allocateMemory_967()
-//             let dst_2 := dst_1
-//             let src_1 := src
-//             let _3 := add(src, 64)
-//             if gt(_3, end) { revert(0, 0) }
-//             let i_1 := 0
-//             for { } lt(i_1, 0x2) { i_1 := add(i_1, 1) }
-//             {
-//                 mstore(dst_1, calldataload(src_1))
-//                 dst_1 := add(dst_1, _2)
-//                 src_1 := add(src_1, _2)
-//             }
-//             mstore(dst, dst_2)
-//             dst := add(dst, _2)
-//             src := _3
-//         }
-//     }
-//     function abi_decode_uint256t_uint256t_array_uint256_dynt_array_array_uint256_memory_dyn(headStart, dataEnd) -> value0, value1, value2, value3
-//     {
-//         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
-//         value0 := calldataload(headStart)
-//         let _1 := 32
-//         value1 := calldataload(add(headStart, _1))
-//         let offset := calldataload(add(headStart, 64))
-//         let _2 := 0xffffffffffffffff
-//         if gt(offset, _2) { revert(0, 0) }
-//         let _3 := add(headStart, offset)
-//         if iszero(slt(add(_3, 0x1f), dataEnd)) { revert(0, 0) }
-//         let length := calldataload(_3)
-//         let dst := allocateMemory(array_allocation_size_array_address_dyn_memory(length))
-//         let dst_1 := dst
-//         mstore(dst, length)
-//         dst := add(dst, _1)
-//         let src := add(_3, _1)
-//         if gt(add(add(_3, shl(5, length)), _1), dataEnd) { revert(0, 0) }
-//         let i := 0
-//         for { } lt(i, length) { i := add(i, 1) }
-//         {
-//             mstore(dst, calldataload(src))
-//             dst := add(dst, _1)
-//             src := add(src, _1)
-//         }
-//         value2 := dst_1
-//         let offset_1 := calldataload(add(headStart, 96))
-//         if gt(offset_1, _2) { revert(0, 0) }
-//         value3 := abi_decode_array_array_uint256_memory_dyn(add(headStart, offset_1), dataEnd)
-//     }
-//     function allocateMemory_967() -> memPtr
-//     {
-//         memPtr := mload(64)
-//         let newFreePtr := add(memPtr, 64)
-//         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
-//         mstore(64, newFreePtr)
-//     }
-//     function allocateMemory(size) -> memPtr
-//     {
-//         memPtr := mload(64)
-//         let newFreePtr := add(memPtr, size)
-//         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
-//         mstore(64, newFreePtr)
-//     }
-//     function array_allocation_size_array_address_dyn_memory(length) -> size
-//     {
-//         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
-//         size := add(shl(5, length), 0x20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul b/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul
deleted file mode 100644
index dd5facaf0315..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul
+++ /dev/null
@@ -1,44 +0,0 @@
-// https://en.wikipedia.org/wiki/Ackermann_function
-// Test to see how FunctionSpecializer deals with functions that are too recursive / resource intensive.
-{
-    // 5
-    sstore(0, A(2, 1))
-    // 7
-    sstore(1, A(2, 2))
-
-    // Too many unrolling needed. In arbitrary precision, the value is 2**65536 - 3.
-    sstore(2, A(4, 2))
-
-    function A(m, n) -> ret {
-        switch m
-        case 0 { ret := add(n, 1) }
-        default {
-            switch n
-            case 0 { ret := A(sub(m, 1), 1) }
-            default { ret := A(sub(m, 1), A(m, sub(n, 1))) }
-        }
-    }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(0, A(2, 1))
-//         sstore(1, A(2, 2))
-//         sstore(2, A(4, 2))
-//     }
-//     function A(m, n) -> ret
-//     {
-//         switch m
-//         case 0 { ret := add(n, 1) }
-//         default {
-//             switch n
-//             case 0 { ret := A(add(m, not(0)), 1) }
-//             default {
-//                 let _1 := not(0)
-//                 ret := A(add(m, _1), A(m, add(n, _1)))
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul b/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul
deleted file mode 100644
index 005c58778b87..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-// https://en.wikipedia.org/wiki/Ackermann_function
-// Test to see how FunctionSpecializer deals with functions that are too recursive / resource intensive.
-// Unlike the test ackermann_function.yul, this one implements it using `if` and leave
-{
-    // 5
-    sstore(0, A(2, 1))
-    // 7
-    sstore(1, A(2, 2))
-
-    // Too many unrolling needed. In arbitrary precision, the value is 2**65536 - 3.
-    sstore(2, A(4, 2))
-
-    function A(m, n) -> ret {
-        if eq(m, 0) {
-            ret := add(n, 1)
-            leave
-        }
-
-        if eq(n, 0) {
-            ret := A(sub(m, 1), 1)
-            leave
-        }
-
-        ret := A(sub(m, 1), A(m, sub(n, 1)))
-     }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(0, A(2, 1))
-//         sstore(1, A(2, 2))
-//         sstore(2, A(4, 2))
-//     }
-//     function A(m, n) -> ret
-//     {
-//         if iszero(m)
-//         {
-//             ret := add(n, 1)
-//             leave
-//         }
-//         if iszero(n)
-//         {
-//             ret := A(add(m, not(0)), 1)
-//             leave
-//         }
-//         let _1 := not(0)
-//         ret := A(add(m, _1), A(m, add(n, _1)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/and_or_combination.yul b/test/libyul/yulOptimizerTests/fullSuite/and_or_combination.yul
deleted file mode 100644
index b5f45605498d..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/and_or_combination.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    // Tests that masks that "add" up to
-    // the full bit width are removed.
-    let a := sload(0)
-    let x := sload(a)
-    let mask := 0xffffffffffffffff
-    x := or(and(x, not(mask)), 0x2b67)
-    mask := shl(64, mask)
-    x := or(and(x, not(mask)), 0x56ce0000000000000000)
-    mask := shl(64, mask)
-    x := or(and(x, not(mask)), shl(0x80, 0x8235))
-    mask := shl(64, mask)
-    x := or(and(x, not(mask)), shl(0xc2, 0x2b67))
-    sstore(a, x)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(sload(0), 0xad9c000000000000823500000000000056ce0000000000002b67)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/aztec.yul b/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
deleted file mode 100644
index 2b22055794c6..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
+++ /dev/null
@@ -1,386 +0,0 @@
-/**
- * @title Library to validate AZTEC zero-knowledge proofs
- * @author Zachary Williamson, AZTEC
- * @dev Don't include this as an internal library. This contract uses a static memory table to cache elliptic curve primitives and hashes.
- * Calling this internally from another function will lead to memory mutation and undefined behaviour.
- * The intended use case is to call this externally via `staticcall`. External calls to OptimizedAZTEC can be treated as pure functions as this contract contains no storage and makes no external calls (other than to precompiles)
- * Copyright Spilbury Holdings Ltd 2018. All rights reserved.
- * We will be releasing AZTEC as an open-source protocol that provides efficient transaction privacy for Ethereum.
- * This will include our bespoke AZTEC decentralized exchange, allowing for cross-asset transfers with full transaction privacy
- * and interopability with public decentralized exchanges.
- * Stay tuned for updates!
- *
- * Permission to use as test case in the Solidity compiler granted by the author:
- * https://github.com/ethereum/solidity/pull/5713#issuecomment-449042830
-**/
-{
-    validateJoinSplit()
-    // should not get here
-    mstore(0x00, 404)
-    revert(0x00, 0x20)
-
-
-    function validateJoinSplit() {
-        mstore(0x80, 7673901602397024137095011250362199966051872585513276903826533215767972925880) // h_x
-        mstore(0xa0, 8489654445897228341090914135473290831551238522473825886865492707826370766375) // h_y
-        let notes := add(0x04, calldataload(0x04))
-        let m := calldataload(0x24)
-        let n := calldataload(notes)
-        let gen_order := 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
-        let challenge := mod(calldataload(0x44), gen_order)
-
-        // validate m <= n
-        if gt(m, n) { mstore(0x00, 404) revert(0x00, 0x20) }
-
-        // recover k_{public} and calculate k_{public}
-        let kn := calldataload(sub(calldatasize(), 0xc0))
-
-        // add kn and m to final hash table
-        mstore(0x2a0, caller())
-        mstore(0x2c0, kn)
-        mstore(0x2e0, m)
-        kn := mulmod(sub(gen_order, kn), challenge, gen_order) // we actually want c*k_{public}
-        hashCommitments(notes, n)
-        let b := add(0x300, mul(n, 0x80))
-
-        // Iterate over every note and calculate the blinding factor B_i = \gamma_i^{kBar}h^{aBar}\sigma_i^{-c}.
-        // We use the AZTEC protocol pairing optimization to reduce the number of pairing comparisons to 1, which adds some minor alterations
-        for { let i := 0 } lt(i, n) { i := add(i, 0x01) } {
-
-            // Get the calldata index of this note
-            let noteIndex := add(add(notes, 0x20), mul(i, 0xc0))
-
-
-            let k
-            let a := calldataload(add(noteIndex, 0x20))
-            let c := challenge
-
-            switch eq(add(i, 0x01), n)
-            case 1 {
-                k := kn
-
-                // if all notes are input notes, invert k
-                if eq(m, n) {
-                    k := sub(gen_order, k)
-                }
-            }
-            case 0 { k := calldataload(noteIndex) }
-
-            // Check this commitment is well formed...
-            validateCommitment(noteIndex, k, a)
-
-            // If i > m then this is an output note.
-            // Set k = kx_j, a = ax_j, c = cx_j, where j = i - (m+1)
-            switch gt(add(i, 0x01), m)
-            case 1 {
-
-                // before we update k, update kn = \sum_{i=0}^{m-1}k_i - \sum_{i=m}^{n-1}k_i
-                kn := addmod(kn, sub(gen_order, k), gen_order)
-                let x := mod(mload(0x00), gen_order)
-                k := mulmod(k, x, gen_order)
-                a := mulmod(a, x, gen_order)
-                c := mulmod(challenge, x, gen_order)
-
-                // calculate x_{j+1}
-                mstore(0x00, keccak256(0x00, 0x20))
-            }
-            case 0 {
-
-                // nothing to do here except update kn = \sum_{i=0}^{m-1}k_i - \sum_{i=m}^{n-1}k_i
-                kn := addmod(kn, k, gen_order)
-            }
-
-            calldatacopy(0xe0, add(noteIndex, 0x80), 0x40)
-            calldatacopy(0x20, add(noteIndex, 0x40), 0x40)
-            mstore(0x120, sub(gen_order, c))
-            mstore(0x60, k)
-            mstore(0xc0, a)
-
-            // Using call instead of staticcall here to make it work on all targets.
-            let result := call(gas(), 7, 0, 0xe0, 0x60, 0x1a0, 0x40)
-            result := and(result, call(gas(), 7, 0, 0x20, 0x60, 0x120, 0x40))
-            result := and(result, call(gas(), 7, 0, 0x80, 0x60, 0x160, 0x40))
-
-            result := and(result, call(gas(), 6, 0, 0x120, 0x80, 0x160, 0x40))
-
-            result := and(result, call(gas(), 6, 0, 0x160, 0x80, b, 0x40))
-
-            if eq(i, m) {
-                mstore(0x260, mload(0x20))
-                mstore(0x280, mload(0x40))
-                mstore(0x1e0, mload(0xe0))
-                mstore(0x200, sub(0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47, mload(0x100)))
-            }
-
-            if gt(i, m) {
-                mstore(0x60, c)
-                result := and(result, call(gas(), 7, 0, 0x20, 0x60, 0x220, 0x40))
-
-                result := and(result, call(gas(), 6, 0, 0x220, 0x80, 0x260, 0x40))
-                result := and(result, call(gas(), 6, 0, 0x1a0, 0x80, 0x1e0, 0x40))
-            }
-
-            if iszero(result) { mstore(0x00, 400) revert(0x00, 0x20) }
-            b := add(b, 0x40) // increase B pointer by 2 words
-        }
-
-        if lt(m, n) {
-            validatePairing(0x64)
-        }
-
-        let expected := mod(keccak256(0x2a0, sub(b, 0x2a0)), gen_order)
-        if iszero(eq(expected, challenge)) {
-
-            // No! Bad! No soup for you!
-            mstore(0x00, 404)
-            revert(0x00, 0x20)
-        }
-
-        // Great! All done. This is a valid proof so return ```true```
-        mstore(0x00, 0x01)
-        return(0x00, 0x20)
-    }
-
-    function validatePairing(t2) {
-        let field_order := 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
-        let t2_x_1 := calldataload(t2)
-        let t2_x_2 := calldataload(add(t2, 0x20))
-        let t2_y_1 := calldataload(add(t2, 0x40))
-        let t2_y_2 := calldataload(add(t2, 0x60))
-
-        // check provided setup pubkey is not zero or g2
-        if or(or(or(or(or(or(or(
-            iszero(t2_x_1),
-            iszero(t2_x_2)),
-            iszero(t2_y_1)),
-            iszero(t2_y_2)),
-            eq(t2_x_1, 0x1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed)),
-            eq(t2_x_2, 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2)),
-            eq(t2_y_1, 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa)),
-            eq(t2_y_2, 0x90689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b))
-        {
-            mstore(0x00, 400)
-            revert(0x00, 0x20)
-        }
-
-        mstore(0x20, mload(0x1e0)) // sigma accumulator x
-        mstore(0x40, mload(0x200)) // sigma accumulator y
-        mstore(0x80, 0x1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed)
-        mstore(0x60, 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2)
-        mstore(0xc0, 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa)
-        mstore(0xa0, 0x90689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b)
-        mstore(0xe0, mload(0x260)) // gamma accumulator x
-        mstore(0x100, mload(0x280)) // gamma accumulator y
-        mstore(0x140, t2_x_1)
-        mstore(0x120, t2_x_2)
-        mstore(0x180, t2_y_1)
-        mstore(0x160, t2_y_2)
-
-        let success := call(gas(), 8, 0, 0x20, 0x180, 0x20, 0x20)
-
-        if or(iszero(success), iszero(mload(0x20))) {
-            mstore(0x00, 400)
-            revert(0x00, 0x20)
-        }
-    }
-
-    function validateCommitment(note, k, a) {
-        let gen_order := 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
-        let field_order := 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
-        let gammaX := calldataload(add(note, 0x40))
-        let gammaY := calldataload(add(note, 0x60))
-        let sigmaX := calldataload(add(note, 0x80))
-        let sigmaY := calldataload(add(note, 0xa0))
-        if iszero(
-            and(
-                and(
-                    and(
-                        eq(mod(a, gen_order), a), // a is modulo generator order?
-                        gt(a, 1)                  // can't be 0 or 1 either!
-                    ),
-                    and(
-                        eq(mod(k, gen_order), k), // k is modulo generator order?
-                        gt(k, 1)                  // and not 0 or 1
-                    )
-                ),
-                and(
-                    eq( // y^2 ?= x^3 + 3
-                        addmod(mulmod(mulmod(sigmaX, sigmaX, field_order), sigmaX, field_order), 3, field_order),
-                        mulmod(sigmaY, sigmaY, field_order)
-                    ),
-                    eq( // y^2 ?= x^3 + 3
-                        addmod(mulmod(mulmod(gammaX, gammaX, field_order), gammaX, field_order), 3, field_order),
-                        mulmod(gammaY, gammaY, field_order)
-                    )
-                )
-            )
-        ) {
-            mstore(0x00, 400)
-            revert(0x00, 0x20)
-        }
-    }
-
-    function hashCommitments(notes, n) {
-        for { let i := 0 } lt(i, n) { i := add(i, 0x01) } {
-            let index := add(add(notes, mul(i, 0xc0)), 0x60)
-            calldatacopy(add(0x300, mul(i, 0x80)), index, 0x80)
-        }
-        mstore(0x00, keccak256(0x300, mul(n, 0x80)))
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         mstore(0x80, 7673901602397024137095011250362199966051872585513276903826533215767972925880)
-//         mstore(0xa0, 8489654445897228341090914135473290831551238522473825886865492707826370766375)
-//         let notes := add(0x04, calldataload(0x04))
-//         let n := calldataload(notes)
-//         if gt(calldataload(0x24), n)
-//         {
-//             mstore(0x00, 404)
-//             revert(0x00, 0x20)
-//         }
-//         let kn := calldataload(add(calldatasize(), not(191)))
-//         let _1 := 0x2a0
-//         mstore(_1, caller())
-//         mstore(0x2c0, kn)
-//         mstore(0x2e0, calldataload(0x24))
-//         kn := mulmod(sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn), mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//         hashCommitments(notes, n)
-//         let b := add(0x300, shl(7, n))
-//         let i := 0
-//         for { } lt(i, n) { i := add(i, 0x01) }
-//         {
-//             let noteIndex := add(add(calldataload(0x04), mul(i, 0xc0)), 0x24)
-//             let k := 0
-//             let a := calldataload(add(add(calldataload(0x04), mul(i, 0xc0)), 0x44))
-//             let c := mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//             let _2 := add(i, 0x01)
-//             switch eq(_2, n)
-//             case 1 {
-//                 k := kn
-//                 if eq(calldataload(0x24), n)
-//                 {
-//                     k := sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn)
-//                 }
-//             }
-//             case 0 { k := calldataload(noteIndex) }
-//             validateCommitment(noteIndex, k, a)
-//             switch gt(_2, calldataload(0x24))
-//             case 1 {
-//                 kn := addmod(kn, sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, k), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//                 let x := mod(mload(0), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//                 k := mulmod(k, x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//                 a := mulmod(a, x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//                 c := mulmod(mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//                 mstore(0, keccak256(0, 0x20))
-//             }
-//             case 0 {
-//                 kn := addmod(kn, k, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
-//             }
-//             calldatacopy(0xe0, add(add(calldataload(0x04), mul(i, 0xc0)), 164), 0x40)
-//             calldatacopy(0x20, add(add(calldataload(0x04), mul(i, 0xc0)), 100), 0x40)
-//             mstore(0x120, sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, c))
-//             mstore(0x60, k)
-//             mstore(0xc0, a)
-//             let result := call(gas(), 7, 0, 0xe0, 0x60, 0x1a0, 0x40)
-//             let result_1 := and(result, call(gas(), 7, 0, 0x20, 0x60, 0x120, 0x40))
-//             let result_2 := and(result_1, call(gas(), 7, 0, 0x80, 0x60, 0x160, 0x40))
-//             let result_3 := and(result_2, call(gas(), 6, 0, 0x120, 0x80, 0x160, 0x40))
-//             result := and(result_3, call(gas(), 6, 0, 0x160, 0x80, b, 0x40))
-//             if eq(i, calldataload(0x24))
-//             {
-//                 mstore(0x260, mload(0x20))
-//                 mstore(0x280, mload(0x40))
-//                 mstore(0x1e0, mload(0xe0))
-//                 mstore(0x200, sub(0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47, mload(0x100)))
-//             }
-//             if gt(i, calldataload(0x24))
-//             {
-//                 mstore(0x60, c)
-//                 let _3 := 0x220
-//                 let result_4 := and(result, call(gas(), 7, 0, 0x20, 0x60, _3, 0x40))
-//                 let result_5 := and(result_4, call(gas(), 6, 0, _3, 0x80, 0x260, 0x40))
-//                 result := and(result_5, call(gas(), 6, 0, 0x1a0, 0x80, 0x1e0, 0x40))
-//             }
-//             if iszero(result)
-//             {
-//                 mstore(0, 400)
-//                 revert(0, 0x20)
-//             }
-//             b := add(b, 0x40)
-//         }
-//         if lt(calldataload(0x24), n) { validatePairing() }
-//         if iszero(eq(mod(keccak256(_1, add(b, not(671))), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)))
-//         {
-//             mstore(0, 404)
-//             revert(0, 0x20)
-//         }
-//         mstore(0, 0x01)
-//         return(0, 0x20)
-//     }
-//     function validatePairing()
-//     {
-//         let t2_x := calldataload(0x64)
-//         let t2_x_1 := calldataload(132)
-//         let t2_y := calldataload(164)
-//         let t2_y_1 := calldataload(196)
-//         let _1 := 0x90689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b
-//         let _2 := 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa
-//         let _3 := 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2
-//         let _4 := 0x1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed
-//         if or(or(or(or(or(or(or(iszero(t2_x), iszero(t2_x_1)), iszero(t2_y)), iszero(t2_y_1)), eq(t2_x, _4)), eq(t2_x_1, _3)), eq(t2_y, _2)), eq(t2_y_1, _1))
-//         {
-//             mstore(0x00, 400)
-//             revert(0x00, 0x20)
-//         }
-//         let _5 := mload(0x1e0)
-//         let _6 := 0x20
-//         mstore(_6, _5)
-//         mstore(0x40, mload(0x200))
-//         mstore(0x80, _4)
-//         mstore(0x60, _3)
-//         mstore(0xc0, _2)
-//         mstore(0xa0, _1)
-//         mstore(0xe0, mload(0x260))
-//         mstore(0x100, mload(0x280))
-//         mstore(0x140, t2_x)
-//         mstore(0x120, t2_x_1)
-//         let _7 := 0x180
-//         mstore(_7, t2_y)
-//         mstore(0x160, t2_y_1)
-//         let success := call(gas(), 8, 0, _6, _7, _6, _6)
-//         if or(iszero(success), iszero(mload(_6)))
-//         {
-//             mstore(0, 400)
-//             revert(0, _6)
-//         }
-//     }
-//     function validateCommitment(note, k, a)
-//     {
-//         let gammaX := calldataload(add(note, 0x40))
-//         let gammaY := calldataload(add(note, 0x60))
-//         let sigmaX := calldataload(add(note, 0x80))
-//         let sigmaY := calldataload(add(note, 0xa0))
-//         let _1 := 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
-//         let _2 := 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
-//         if iszero(and(and(and(eq(mod(a, _2), a), gt(a, 1)), and(eq(mod(k, _2), k), gt(k, 1))), and(eq(addmod(mulmod(mulmod(sigmaX, sigmaX, _1), sigmaX, _1), 3, _1), mulmod(sigmaY, sigmaY, _1)), eq(addmod(mulmod(mulmod(gammaX, gammaX, _1), gammaX, _1), 3, _1), mulmod(gammaY, gammaY, _1)))))
-//         {
-//             mstore(0x00, 400)
-//             revert(0x00, 0x20)
-//         }
-//     }
-//     function hashCommitments(notes, n)
-//     {
-//         let i := 0
-//         for { } lt(i, n) { i := add(i, 0x01) }
-//         {
-//             calldatacopy(add(0x300, shl(7, i)), add(add(notes, mul(i, 0xc0)), 0x60), 0x80)
-//         }
-//         mstore(0, keccak256(0x300, shl(7, n)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul
deleted file mode 100644
index c8c969d8846d..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    function fun_revert() -> ret { revert(0, 0) }
-    function fun_return() -> ret { return(0, 0) }
-    function empty(a, b) {}
-
-    // Evaluation order in Yul is always right to left so optimized code should reach the revert first.
-    empty(fun_return(), fun_revert())
-}
-// ----
-// step: fullSuite
-//
-// { { revert(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
deleted file mode 100644
index fc36bdfa37a0..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    function empty(a, b, c) {
-        mstore(a, 1)
-        mstore(b, 1)
-        mstore(c, 1)
-    }
-
-    // Constants
-    empty(1, 2, 3)
-
-    // Variables
-    let x := 4
-    let y := 5
-    let z := 6
-    empty(x, y, z)
-
-    // Calls
-    empty(mload(7), sload(8), calldataload(9))
-
-    // Mix
-    let a := 12
-    empty(11, a, mload(13))
-
-    return(0, 32)
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := 1
-//         mstore(_1, _1)
-//         mstore(2, _1)
-//         mstore(3, _1)
-//         mstore(4, _1)
-//         mstore(5, _1)
-//         mstore(6, _1)
-//         let _2 := sload(8)
-//         mstore(mload(7), _1)
-//         mstore(_2, _1)
-//         mstore(calldataload(9), _1)
-//         let _3 := mload(13)
-//         mstore(11, _1)
-//         mstore(12, _1)
-//         mstore(_3, _1)
-//         return(0, 32)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul b/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul
deleted file mode 100644
index d5a5af8338ce..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let y := mload(0x20)
-    for {} and(y, 8) { if y { revert(0, 0) } } {
-        if y { continue }
-        sstore(1, y)
-    }
-    if y { revert(0, 0) }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let y := mload(0x20)
-//         let _1 := iszero(and(y, 8))
-//         for { } iszero(_1) { if y { revert(0, 0) } }
-//         {
-//             if y { continue }
-//             sstore(1, 0)
-//         }
-//         if y { revert(0, 0) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and.yul b/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and.yul
deleted file mode 100644
index 1abea23e7802..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := and(0xff, shr(248, shl(248, shr(248, x))))
-    let b := shr(12, shl(8, and(x, 0xf0f0)))
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         sstore(shr(248, x), and(shr(4, x), 3855))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_2.yul b/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_2.yul
deleted file mode 100644
index 513a23aa5066..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_2.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := and(0xff, shr(248, shl(248, shr(248, and(x, 0xf)))))
-    let b := shl(12, shr(4, and(x, 0xf0f0)))
-    let c := shl(12, shr(4, and(0xf0f0, x)))
-    let d := shl(12, shr(255, and(0xf0f0, x)))
-    let e := shl(255, shr(4, and(0xf0f0, x)))
-    let f := shl(12, shr(256, and(0xf0f0, x)))
-    let g := shl(256, shr(4, and(0xf0f0, x)))
-    sstore(10, a)
-    sstore(11, b)
-    sstore(12, c)
-    sstore(13, d)
-    sstore(14, e)
-    sstore(15, f)
-    sstore(16, g)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let b := and(shl(8, x), 15790080)
-//         sstore(10, 0)
-//         sstore(11, b)
-//         sstore(12, b)
-//         sstore(13, 0)
-//         sstore(14, and(shl(251, x), shl(255, 1)))
-//         sstore(0xf, 0)
-//         sstore(16, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_3.yul b/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_3.yul
deleted file mode 100644
index 17de07de7cd7..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_3.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := shl(12, shr(4, x))
-    let b := shl(4, shr(12, x))
-    let c := shr(12, shl(4, x))
-    let d := shr(4, shl(12, x))
-    let e := shl(150, shr(2, shl(150, x)))
-    sstore(15, x)
-    sstore(16, a)
-    sstore(17, b)
-    sstore(18, c)
-    sstore(19, d)
-    sstore(20, e)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let _1 := shl(8, x)
-//         let _2 := shr(8, x)
-//         sstore(15, x)
-//         sstore(16, and(_1, not(4095)))
-//         sstore(17, and(_2, sub(shl(248, 1), 16)))
-//         sstore(18, and(_2, sub(shl(244, 1), 1)))
-//         sstore(19, and(_1, sub(shl(252, 1), 256)))
-//         sstore(20, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_unsplit.yul b/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_unsplit.yul
deleted file mode 100644
index 923a18f4fd91..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/combine_shift_and_and_unsplit.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let x := calldataload(0)
-    // This checks that the expression simplifier
-    // does not modify unsplit expressions.
-    let a := and(0xff, shr(248, shl(248, shr(248, x))))
-    let b := shr(12, shl(8, and(x, 0xf0f0)))
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         sstore(shr(248, x), and(shr(4, x), 3855))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul b/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
deleted file mode 100644
index f9d248e2feeb..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    // This does not optimize the masks away. Due to the way the expression simplifier
-    // is built, it would have to create another `create2` opcode for the simplification
-    // which would be fatal.
-    let a := and(create2(0, 0, 0x20, 0), 0xffffffffffffffffffffffffffffffffffffffff)
-    let b := and(0xffffffffffffffffffffffffffffffffffffffff, create2(0, 0, 0x20, 0))
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := sub(shl(160, 1), 1)
-//         let a := and(create2(0, 0, 0x20, 0), _1)
-//         sstore(a, and(_1, create2(0, 0, 0x20, 0)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul b/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul
deleted file mode 100644
index c89c620bb52d..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    // This does not optimize the masks away. Due to the way the expression simplifier
-    // is built, it would have to create another `create` opcode for the simplification
-    // which would be fatal.
-    let a := and(create(0, 0, 0x20), 0xffffffffffffffffffffffffffffffffffffffff)
-    let b := and(0xffffffffffffffffffffffffffffffffffffffff, create(0, 0, 0x20))
-    sstore(a, b)
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := sub(shl(160, 1), 1)
-//         let a := and(create(0, 0, 0x20), _1)
-//         sstore(a, and(_1, create(0, 0, 0x20)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
deleted file mode 100644
index fe06f1629bc3..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    sstore(0, array_sum(calldataload(0)))
-
-    function array_sum(x) -> sum {
-        let length := calldataload(x)
-        for { let i := 0 } lt(i, length) { i := add(i, 1) } {
-            sum := add(sum, array_load(x, i))
-        }
-    }
-    function array_load(x, i) -> v {
-        let len := calldataload(x)
-        if iszero(lt(i, len)) { revert(0, 0) }
-        let data := add(x, 0x20)
-        v := calldataload(add(data, mul(i, 0x20)))
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := calldataload(0)
-//         let sum := 0
-//         let length := calldataload(_1)
-//         let i := 0
-//         for { } lt(i, length) { i := add(i, 1) }
-//         {
-//             sum := add(sum, calldataload(add(add(_1, shl(5, i)), 0x20)))
-//         }
-//         sstore(0, sum)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
deleted file mode 100644
index 436f5d5fafc4..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    let _1 := 0
-    let value := calldataload(4)
-    if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(_1, _1) }
-    let length := extcodesize(value)
-    let _2 := 0xffffffffffffffff
-    if gt(length, _2) { revert(0, 0) }
-    let _3 := not(31)
-    let memPtr := mload(64)
-    let newFreePtr := add(memPtr, and(add(and(add(length, 31), _3), 63), _3))
-    if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { revert(0, 0) }
-    mstore(64, newFreePtr)
-    mstore(memPtr, length)
-
-    // We aim to optimize this out.
-    extcodecopy(value, add(memPtr, 32), _1, length)
-    sstore(_1, mload(memPtr))
-}
-// ====
-// EVMVersion: >byzantium
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let value := calldataload(4)
-//         if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
-//         let length := extcodesize(value)
-//         let _1 := 0xffffffffffffffff
-//         if gt(length, _1) { revert(0, 0) }
-//         let memPtr := mload(64)
-//         let _2 := not(31)
-//         let newFreePtr := add(memPtr, and(add(and(add(length, 31), _2), 63), _2))
-//         if or(gt(newFreePtr, _1), lt(newFreePtr, memPtr)) { revert(0, 0) }
-//         mstore(64, newFreePtr)
-//         mstore(memPtr, length)
-//         extcodecopy(value, add(memPtr, 32), 0, length)
-//         sstore(0, mload(memPtr))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/fibonacci.yul b/test/libyul/yulOptimizerTests/fullSuite/fibonacci.yul
deleted file mode 100644
index 479bd5f8b615..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/fibonacci.yul
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    sstore(0, fib(0))
-    sstore(1, fib(2))
-    sstore(2, fib(3))
-    sstore(3, fib(4))
-    sstore(4, fib(5))
-    sstore(5, fib(6))
-    sstore(7, fib(7))
-    sstore(8, fib(8))
-    sstore(9, fib(9))
-    sstore(10, fib(10))
-
-
-    function fib(i) -> y
-    {
-        y := 1
-        if gt(i, 2)
-        {
-            y := add(fib(sub(i, 1)), fib(sub(i, 2)))
-        }
-    }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(0, fib(0))
-//         sstore(1, fib(2))
-//         sstore(2, fib(3))
-//         sstore(3, fib(4))
-//         sstore(4, fib(5))
-//         sstore(5, fib(6))
-//         sstore(7, fib(7))
-//         sstore(8, fib(8))
-//         sstore(9, fib(9))
-//         sstore(10, fib(10))
-//     }
-//     function fib(i) -> y
-//     {
-//         y := 1
-//         if gt(i, 2)
-//         {
-//             y := add(fib(add(i, not(0))), fib(add(i, not(1))))
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
deleted file mode 100644
index 86329c3275f0..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    sstore(0, array_sum(calldataload(0)))
-
-    function array_sum(x) -> sum {
-        let length := calldataload(x)
-        for { let i := 0 } lt(i, length) { i := add(i, 1) } {
-            sum := add(sum, array_load(x, i))
-        }
-    }
-    function array_load(x, i) -> v {
-        let len := calldataload(x)
-        if iszero(lt(i, len)) { revert(0, 0) }
-        let data := add(x, 0x20)
-        v := calldataload(add(data, mul(i, 0x20)))
-        // this is just to have some additional code that
-        // can be moved out of the loop.
-        v := add(v, calldataload(7))
-    }
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := calldataload(0)
-//         let sum := 0
-//         let length := calldataload(_1)
-//         let i := 0
-//         let _2 := calldataload(7)
-//         for { } lt(i, length) { i := add(i, 1) }
-//         {
-//             sum := add(sum, add(calldataload(add(add(_1, shl(5, i)), 0x20)), _2))
-//         }
-//         sstore(0, sum)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/medium.yul b/test/libyul/yulOptimizerTests/fullSuite/medium.yul
deleted file mode 100644
index 9a6381d79913..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/medium.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    function allocate(size) -> p {
-        p := mload(0x40)
-        mstore(0x40, add(p, size))
-    }
-    function array_index_access(array, index) -> p {
-        p := add(array, mul(index, 0x20))
-    }
-    pop(allocate(0x20))
-    let x := allocate(0x40)
-    mstore(array_index_access(x, 3), 2)
-    if 0 {
-        mstore(0x40, 0x20)
-    }
-    if sub(2,1) {
-        for { switch mul(1,2) case 2 { mstore(0x40, 0x20) } } sub(1,1) {} { mstore(0x80, 0x40) }
-    }
-    sstore(0, array_index_access(x, 3))
-    sstore(1, mload(0x40))
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(0, add(mload(0x40), 128))
-//         sstore(1, 0x20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul b/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
deleted file mode 100644
index 05cf04a71024..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	// This function name can be shortened, the other cannot.
-	function nonmstore_(x) {
-		if calldataload(0) { nonmstore_(x) }
-		sstore(10, calldataload(2))
-	}
-	function mstore_(x) -> y {
-		if calldataload(0) { let t3_3_ := mstore_(x) }
-		y := 8
-		sstore(y, calldataload(y))
-	}
-	let t2_ := mstore_(7)
-	nonmstore_(70)
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         pop(mstore_(7))
-//         nonmstore(70)
-//     }
-//     function nonmstore(x)
-//     {
-//         if calldataload(0) { nonmstore(x) }
-//         sstore(10, calldataload(2))
-//     }
-//     function mstore_(x) -> y
-//     {
-//         if calldataload(0) { pop(mstore_(x)) }
-//         y := 8
-//         sstore(8, calldataload(8))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
deleted file mode 100644
index f0d4b49b1db5..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    main(0, 0)
-
-    function main(a, b) {
-        for {} 1 {}
-        {
-            if iszero(a) { break }
-
-            let mid := avg(a, a)
-            switch a
-            case 0 {
-                a := mid
-            }
-            default {
-                sstore(0, mid)
-            }
-        }
-    }
-
-    function avg(x, y) -> var {
-        // NOTE: Variable names should not affect CSE.
-        // This should not be optimized differently than name_dependent_cse_bug_part_2.yul.
-        // `let mid := var` should be present in both or missing in both.
-        let _1 := add(x, y)
-        var := add(_1, _1)
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let a := 0
-//         for { } a { }
-//         {
-//             let _1 := add(a, a)
-//             let var := add(_1, _1)
-//             switch a
-//             case 0 { a := var }
-//             default { sstore(0, var) }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
deleted file mode 100644
index d041cff1041f..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    main(0, 0)
-
-    function main(a, b) {
-        for {} 1 {}
-        {
-            if iszero(a) { break }
-
-            let mid := avg(a, a)
-            switch a
-            case 0 {
-                a := mid
-            }
-            default {
-                sstore(0, mid)
-            }
-        }
-    }
-
-    function avg(x, y) -> var {
-        // NOTE: Variable names should not affect CSE.
-        // This should not be optimized differently than name_dependent_cse_bug_part_2_pre_shanghai.yul.
-        // `let mid := var` should be present in both or missing in both.
-        let _1 := add(x, y)
-        var := add(_1, _1)
-    }
-}
-// ====
-// EVMVersion: <shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let a := 0
-//         let a_1 := 0
-//         for { } a_1 { }
-//         {
-//             let _1 := add(a_1, a_1)
-//             let var := add(_1, _1)
-//             switch a_1
-//             case 0 { a_1 := var }
-//             default { sstore(a, var) }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul
deleted file mode 100644
index 879f84834e96..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    main(0, 0)
-
-    function main(a, b) {
-        for {} 1 {}
-        {
-            if iszero(a) { break }
-
-            let mid := avg(a, a)
-            switch a
-            case 0 {
-                a := mid
-            }
-            default {
-                sstore(0, mid)
-            }
-        }
-    }
-
-    function avg(x, y) -> var {
-        // NOTE: Variable names should not affect CSE.
-        // This should not be optimized differently than name_dependent_cse_bug_part_1.yul.
-        // `let mid := var` should be present in both or missing in both.
-        let _2 := add(x, y)
-        var := add(_2, _2)
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let a := 0
-//         for { } a { }
-//         {
-//             let _1 := add(a, a)
-//             let var := add(_1, _1)
-//             switch a
-//             case 0 { a := var }
-//             default { sstore(0, var) }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul
deleted file mode 100644
index 06965e3ca695..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    main(0, 0)
-
-    function main(a, b) {
-        for {} 1 {}
-        {
-            if iszero(a) { break }
-
-            let mid := avg(a, a)
-            switch a
-            case 0 {
-                a := mid
-            }
-            default {
-                sstore(0, mid)
-            }
-        }
-    }
-
-    function avg(x, y) -> var {
-        // NOTE: Variable names should not affect CSE.
-        // This should not be optimized differently than name_dependent_cse_bug_part_1_pre_shanghai.yul.
-        // `let mid := var` should be present in both or missing in both.
-        let _2 := add(x, y)
-        var := add(_2, _2)
-    }
-}
-// ====
-// EVMVersion: <shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let a := 0
-//         let a_1 := 0
-//         for { } a_1 { }
-//         {
-//             let _1 := add(a_1, a_1)
-//             let var := add(_1, _1)
-//             switch a_1
-//             case 0 { a_1 := var }
-//             default { sstore(a, var) }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/no_move_loop_orig.yul b/test/libyul/yulOptimizerTests/fullSuite/no_move_loop_orig.yul
deleted file mode 100644
index f0ee054b9a01..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/no_move_loop_orig.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  for {} msize() {
-    function foo_s_0() -> x_1 { for {} caller() {} {} }
-    // x_3 used to be a movable loop invariant because `foo_s_0()` used to be movable
-    let x_3 := foo_s_0()
-    mstore(192, x_3)
-  }
-  {}
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := iszero(caller())
-//         for { }
-//         true
-//         {
-//             for { } iszero(_1) { }
-//             { }
-//             mstore(192, 0)
-//         }
-//         { if iszero(msize()) { break } }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul b/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul
deleted file mode 100644
index 31766132539b..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul
+++ /dev/null
@@ -1,19 +0,0 @@
- {
-    let x := 0
-    switch mload(x)
-    case 0 { x := x }
-    case 1 { x := 1 }
-    default { invalid() }
-    mstore(1, 1)
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         switch mload(0)
-//         case 0 { }
-//         case 1 { }
-//         default { invalid() }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/reserved_identifiers.yul b/test/libyul/yulOptimizerTests/fullSuite/reserved_identifiers.yul
deleted file mode 100644
index e8ddcf98539c..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/reserved_identifiers.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	function g_(x) -> z_ {
-		if calldataload(1) { z_ := g_(x) }
-		sstore(z_, calldataload(add(x, 1)))
-	}
-	function datasize_(x) -> linkersymbol_ {
-		if calldataload(0) { linkersymbol_ := datasize_(x) }
-		sstore(linkersymbol_, calldataload(linkersymbol_))
-	}
-	let dataoffset_ := datasize_(7)
-	let x_ := g_(9)
-	sstore(dataoffset_, x_)
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let dataoffset_ := datasize_(7)
-//         sstore(dataoffset_, g(9))
-//     }
-//     function g(x) -> z
-//     {
-//         if calldataload(1) { z := g(x) }
-//         sstore(z, calldataload(add(x, 1)))
-//     }
-//     function datasize_(x) -> linkersymbol_
-//     {
-//         if calldataload(0) { linkersymbol_ := datasize_(x) }
-//         sstore(linkersymbol_, calldataload(linkersymbol_))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/reuse_vars_bug_in_simplifier.yul b/test/libyul/yulOptimizerTests/fullSuite/reuse_vars_bug_in_simplifier.yul
deleted file mode 100644
index 93f2f4ad630a..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/reuse_vars_bug_in_simplifier.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	// This tests that a bug is fixed that was related to just taking
-	// values of SSA variables in account and not clearing them when
-	// a dependency was reassigned.
-	pop(foo())
-	function foo() -> x_9
-	{
-		x_9 := sub(1,sub(x_9,1))
-		sstore(sub(1,div(sub(x_9,1),sub(1,sub(x_9,1)))), 1)
-	}
-}
-// ----
-// step: fullSuite
-//
-// { { sstore(1, 1) } }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/shift_signextend.yul b/test/libyul/yulOptimizerTests/fullSuite/shift_signextend.yul
deleted file mode 100644
index 6e86edb8d7eb..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/shift_signextend.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := shl(sub(256, 8), signextend(0, x))
-    sstore(0, a)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(0, shl(248, calldataload(0)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/ssaReverse.yul b/test/libyul/yulOptimizerTests/fullSuite/ssaReverse.yul
deleted file mode 100644
index a7ecc0e46ba1..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/ssaReverse.yul
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    // This is an abi decode function with the SSA transform applied once.
-    // This test is supposed to verify that the SSA transform is correctly reversed by the full suite.
-    function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
-    {
-        if iszero(slt(add(offset_12, 0x1f), end_13))
-        {
-            revert(0, 0)
-        }
-        let length_15_1 := calldataload(offset_12)
-        length_15 := length_15_1
-        if gt(length_15_1, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        let arrayPos_14_2 := add(offset_12, 0x20)
-        arrayPos_14 := arrayPos_14_2
-        if gt(add(arrayPos_14_2, mul(length_15_1, 0x1)), end_13)
-        {
-            revert(0, 0)
-        }
-    }
-
-    // prevent inlining
-    let a,b := abi_decode_t_bytes_calldata_ptr(mload(0),mload(1))
-    a,b := abi_decode_t_bytes_calldata_ptr(a,b)
-    a,b := abi_decode_t_bytes_calldata_ptr(a,b)
-    a,b := abi_decode_t_bytes_calldata_ptr(a,b)
-    a,b := abi_decode_t_bytes_calldata_ptr(a,b)
-    a,b := abi_decode_t_bytes_calldata_ptr(a,b)
-    a,b := abi_decode_t_bytes_calldata_ptr(a,b)
-    sstore(a,b)
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let a, b := abi_decode_bytes_calldata(mload(0), mload(1))
-//         let a_1, b_1 := abi_decode_bytes_calldata(a, b)
-//         let a_2, b_2 := abi_decode_bytes_calldata(a_1, b_1)
-//         let a_3, b_3 := abi_decode_bytes_calldata(a_2, b_2)
-//         let a_4, b_4 := abi_decode_bytes_calldata(a_3, b_3)
-//         let a_5, b_5 := abi_decode_bytes_calldata(a_4, b_4)
-//         let a_6, b_6 := abi_decode_bytes_calldata(a_5, b_5)
-//         sstore(a_6, b_6)
-//     }
-//     function abi_decode_bytes_calldata(offset, end) -> arrayPos, length
-//     {
-//         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
-//         length := calldataload(offset)
-//         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
-//         arrayPos := add(offset, 0x20)
-//         if gt(add(add(offset, length), 0x20), end) { revert(0, 0) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/ssaReverseComplex.yul b/test/libyul/yulOptimizerTests/fullSuite/ssaReverseComplex.yul
deleted file mode 100644
index 3a061155bdc2..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/ssaReverseComplex.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let a := mload(0)
-    let b := mload(1)
-    if mload(2) {
-        a := mload(b)
-        b := mload(a)
-        a := mload(b)
-        b := mload(a)
-    }
-    sstore(a, b)
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let a := mload(0)
-//         let b := mload(1)
-//         if mload(2)
-//         {
-//             a := mload(mload(mload(b)))
-//             b := mload(a)
-//         }
-//         sstore(a, b)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
deleted file mode 100644
index 75e2ff4c2010..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-	let a
-
-	function gcd(_a, _b) -> out
-	{
-		// GCD algorithm. in order to test underlying stack compressor this function must not be inlined.
-		switch _b
-		case 0 { out := _a }
-		default { out := gcd(_b, mod(_a, _b)) }
-	}
-
-	function f() -> out
-	{
-		out := gcd(10, 15)
-	}
-
-	function foo_singlereturn_0() -> out
-	{
-		mstore(lt(or(gt(1,or(or(gt(or(or(or(1,gt(or(gt(or(or(keccak256(f(),or(gt(not(f()),1),1)),1),not(1)),f()),1),f())),lt(or(1,sub(f(),1)),1)),f()),1),1),gt(not(f()),1))),1),1),1)
-		sstore(not(f()),1)
-	}
-
-	function foo_singlereturn_1(in_1, in_2) -> out
-	{
-		extcodecopy(1,msize(),1,1)
-	}
-
-	a := foo_singlereturn_0()
-	sstore(0,0)
-	sstore(2,1)
-
-	a := foo_singlereturn_1(calldataload(0),calldataload(3))
-	sstore(0,0)
-	sstore(3,1)
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let _1 := 1
-//         let _2 := 15
-//         let _3 := 10
-//         let _4 := gt(not(gcd(_3, _2)), _1)
-//         let _5 := gcd(_3, _2)
-//         let _6 := not(0)
-//         let _7 := lt(or(_1, add(gcd(_3, _2), _6)), _1)
-//         let _8 := gcd(_3, _2)
-//         let _9 := gcd(_3, _2)
-//         pop(keccak256(gcd(_3, _2), or(gt(not(gcd(_3, _2)), _1), _1)))
-//         mstore(lt(or(gt(_1, or(or(gt(or(or(or(gt(or(gt(_6, _9), _1), _8), _7), _5), _1), _1), _4), _1)), _1), _1), _1)
-//         sstore(not(gcd(_3, _2)), _1)
-//         sstore(2, _1)
-//         extcodecopy(_1, msize(), _1, _1)
-//         sstore(0, 0)
-//         sstore(3, _1)
-//     }
-//     function gcd(_a, _b) -> out
-//     {
-//         switch _b
-//         case 0 { out := _a }
-//         default { out := gcd(_b, mod(_a, _b)) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
deleted file mode 100644
index bf74af6f4713..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
+++ /dev/null
@@ -1,44 +0,0 @@
-// The yul code for the following contract
-//  contract C {
-//	  uint256[] x;
-//	  function f() public { x[10] = 5; }
-//  }
-
-{
-    let _1 := 0
-    if eq(0x26121ff0, shr(224, calldataload(_1)))
-    {
-        if callvalue() { revert(_1, _1) }
-        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-        if iszero(lt(0x0a, sload(_1)))
-        {
-            mstore(_1, shl(224, 0x4e487b71))
-            mstore(4, 0x32)
-            revert(_1, 0x24)
-        }
-        mstore(_1, _1)
-        // The hash should be evaluated here
-        sstore(add(keccak256(_1, 0x20), 0x0a), 0x05)
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         if eq(0x26121ff0, shr(224, calldataload(0)))
-//         {
-//             if callvalue() { revert(0, 0) }
-//             if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-//             if iszero(lt(0x0a, sload(0)))
-//             {
-//                 mstore(0, shl(224, 0x4e487b71))
-//                 mstore(4, 0x32)
-//                 revert(0, 0x24)
-//             }
-//             sstore(0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56d, 0x05)
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/storage.yul b/test/libyul/yulOptimizerTests/fullSuite/storage.yul
deleted file mode 100644
index a60b3d3486ea..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/storage.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    sstore(4, 5)
-    sstore(4, 3)
-    sstore(8, sload(4))
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         sstore(4, 3)
-//         sstore(8, 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/switch_inline.yul b/test/libyul/yulOptimizerTests/fullSuite/switch_inline.yul
deleted file mode 100644
index 1ed99512406f..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/switch_inline.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	sstore(f(1), 0)
-	function f(x) -> y {
-		switch x
-		case 0 { y := 8 }
-		case 1 { y := 9 }
-	}
-}
-// ----
-// step: fullSuite
-//
-// { { sstore(9, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/switch_inline_match_default.yul b/test/libyul/yulOptimizerTests/fullSuite/switch_inline_match_default.yul
deleted file mode 100644
index 6ca3314ab98c..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/switch_inline_match_default.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	sstore(f(3), 0)
-	function f(x) -> y {
-		switch x
-		case 0 { y := 8 }
-		case 1 { y := 9 }
-		default { y := 10 }
-	}
-}
-// ----
-// step: fullSuite
-//
-// { { sstore(10, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul
deleted file mode 100644
index 6f82ab27a6d8..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    let x, y := foo(sload(0),sload(32))
-    sstore(0, x)
-    sstore(0, y)
-    x, y := foo(sload(32), sload(8))
-
-    function foo(a, b) -> out1, out2
-    {
-        out1 := mload(32)
-        out1 := sload(out1)
-        out2 := add(out1, 1)
-        extcodecopy(out1, out2, 1, b)
-        // to prevent foo from getting inlined
-        if iszero(out1) { leave }
-    }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let out1, out2 := foo(sload(32))
-//         sstore(0, out2)
-//         let out1_1, out2_1 := foo(sload(8))
-//     }
-//     function foo(b) -> out1, out2
-//     {
-//         out1 := sload(mload(32))
-//         out2 := add(out1, 1)
-//         extcodecopy(out1, out2, 1, b)
-//         if iszero(out1) { leave }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
deleted file mode 100644
index f0b7546d0592..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    sstore(f(1), 1)
-    sstore(f(2), 1)
-    sstore(f(3), 1)
-    function f(a) -> x {
-        for {let b := 10} iszero(b) { b := sub(b, 1) }
-        {
-            a := calldataload(0)
-            mstore(a, x)
-            // to prevent f from getting inlined
-            if iszero(a) { leave }
-        }
-    }
-}
-// ====
-// EVMVersion: >=shanghai
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         f()
-//         f()
-//         f()
-//         sstore(0, 1)
-//     }
-//     function f()
-//     {
-//         let b := 10
-//         let a := calldataload(0)
-//         let _1 := iszero(a)
-//         for { } iszero(b) { b := add(b, not(0)) }
-//         {
-//             mstore(a, 0)
-//             if _1 { leave }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
deleted file mode 100644
index 92d251cabe1a..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    let j, k, l := f(1, 2, 3)
-    sstore(0, j)
-    sstore(1, k)
-    sstore(1, l)
-    function f(a, b, c) -> x, y, z
-    {
-        if calldataload(0) {
-            x, y, z := f(1, 2, 3)
-        }
-        x := add(x, 1)
-    }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let x, y, z := f()
-//         sstore(0, x)
-//         sstore(1, z)
-//     }
-//     function f() -> x, y, z
-//     {
-//         if calldataload(0)
-//         {
-//             let x_1, y_1, z_1 := f()
-//             x := x_1
-//             y := y_1
-//             z := z_1
-//         }
-//         x := add(x, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul
deleted file mode 100644
index b066d998bafe..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    let x, y, z := foo(sload(0),sload(32))
-    sstore(0, x)
-    sstore(0, y)
-    sstore(0, z)
-    x, y, z := foo(sload(32), sload(8))
-
-    // out3 is unassigned.
-    function foo(a, b) -> out1, out2, out3
-    {
-        out1 := mload(32)
-        out1 := sload(out1)
-        out2 := add(out1, 1)
-        extcodecopy(out1, out1, 1, b)
-        // to prevent foo from getting inlined
-        if iszero(out1) { leave }
-    }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         let out1, out2 := foo(sload(32))
-//         sstore(0, 0)
-//         let out1_1, out2_1 := foo(sload(8))
-//     }
-//     function foo(b) -> out1, out2
-//     {
-//         out1 := sload(mload(32))
-//         out2 := add(out1, 1)
-//         extcodecopy(out1, out1, 1, b)
-//         if iszero(out1) { leave }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
deleted file mode 100644
index 785840baa372..000000000000
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    sstore(f(1), 1)
-    sstore(f(2), 1)
-    sstore(f(3), 1)
-    function f(a) -> x {
-        // The usage of a is redundant
-        a := calldataload(0)
-        mstore(a, x)
-        // to prevent f from getting inlined
-        if iszero(a) { leave }
-    }
-}
-// ----
-// step: fullSuite
-//
-// {
-//     {
-//         f()
-//         f()
-//         f()
-//         sstore(0, 1)
-//     }
-//     function f()
-//     {
-//         let a := calldataload(0)
-//         mstore(a, 0)
-//         if iszero(a) { leave }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/already_grouped.yul b/test/libyul/yulOptimizerTests/functionGrouper/already_grouped.yul
deleted file mode 100644
index b75efc54c408..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/already_grouped.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    {
-        let x := 2
-    }
-    function f() -> y { y := 8 }
-}
-// ----
-// step: functionGrouper
-//
-// {
-//     { let x := 2 }
-//     function f() -> y
-//     { y := 8 }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
deleted file mode 100644
index 7bfbb340124f..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{ let a:u256 { } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }
-// ====
-// dialect: yul
-// ----
-// step: functionGrouper
-//
-// {
-//     {
-//         let a
-//         { }
-//     }
-//     function f() -> x:bool
-//     {
-//         let b := 4
-//         { }
-//         for { } f() { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/grouped_but_not_ordered.yul b/test/libyul/yulOptimizerTests/functionGrouper/grouped_but_not_ordered.yul
deleted file mode 100644
index 2e5380d2c220..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/grouped_but_not_ordered.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    function f() -> y { y := 8 }
-    {
-        let x := 2
-    }
-}
-// ----
-// step: functionGrouper
-//
-// {
-//     { { let x := 2 } }
-//     function f() -> y
-//     { y := 8 }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
deleted file mode 100644
index 1aedecf6a348..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let a:u256
-    function f() { let b:u256 }
-    let c:u256 function g() { let d:u256 }
-    let e:u256
-}
-// ====
-// dialect: yul
-// ----
-// step: functionGrouper
-//
-// {
-//     {
-//         let a
-//         let c
-//         let e
-//     }
-//     function f()
-//     { let b }
-//     function g()
-//     { let d }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
deleted file mode 100644
index 9193da739c2b..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let a:u256
-    function f() {
-        let b:u256
-        function g() {
-            let c:u256
-        }
-        let d:u256
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: functionGrouper
-//
-// {
-//     { let a }
-//     function f()
-//     {
-//         let b
-//         function g()
-//         { let c }
-//         let d
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
deleted file mode 100644
index b007f1855a30..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	let a:u256 function f() {}
-}
-// ====
-// dialect: yul
-// ----
-// step: functionGrouper
-//
-// {
-//     { let a }
-//     function f()
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/smoke.yul b/test/libyul/yulOptimizerTests/functionGrouper/smoke.yul
deleted file mode 100644
index e292340f2985..000000000000
--- a/test/libyul/yulOptimizerTests/functionGrouper/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: functionGrouper
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
deleted file mode 100644
index bd66b3a2b1cd..000000000000
--- a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a:u256
-    { }
-    function f() -> x:bool {
-        let b:u256 := 4:u256
-        { }
-        for {} f() {} {}
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: functionHoister
-//
-// {
-//     let a
-//     function f() -> x:bool
-//     {
-//         let b := 4
-//         for { } f() { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
deleted file mode 100644
index 060fab314c96..000000000000
--- a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let a:u256
-    function f() { let b:u256 }
-    let c:u256
-    function g() { let d:u256 }
-    let e:u256
-}
-// ====
-// dialect: yul
-// ----
-// step: functionHoister
-//
-// {
-//     let a
-//     let c
-//     let e
-//     function f()
-//     { let b }
-//     function g()
-//     { let d }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/nested.yul b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
deleted file mode 100644
index 05eb4803b0a6..000000000000
--- a/test/libyul/yulOptimizerTests/functionHoister/nested.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a:u256
-    function f() {
-        let b:u256
-        function g() { let c:u256 }
-        let d:u256
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: functionHoister
-//
-// {
-//     let a
-//     function g()
-//     { let c }
-//     function f()
-//     {
-//         let b
-//         let d
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/single.yul b/test/libyul/yulOptimizerTests/functionHoister/single.yul
deleted file mode 100644
index 205626b57f58..000000000000
--- a/test/libyul/yulOptimizerTests/functionHoister/single.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let a:u256
-    function f() {}
-}
-// ====
-// dialect: yul
-// ----
-// step: functionHoister
-//
-// {
-//     let a
-//     function f()
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/smoke.yul b/test/libyul/yulOptimizerTests/functionHoister/smoke.yul
deleted file mode 100644
index e0d43adbb394..000000000000
--- a/test/libyul/yulOptimizerTests/functionHoister/smoke.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-}
-// ----
-// step: functionHoister
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/functionSpecializer/multiple.yul b/test/libyul/yulOptimizerTests/functionSpecializer/multiple.yul
deleted file mode 100644
index d4df4053729c..000000000000
--- a/test/libyul/yulOptimizerTests/functionSpecializer/multiple.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    f(1, 2)
-
-    let x := 1
-    f(x, 2)
-
-    f(calldataload(0), calldataload(1))
-
-    function f(a, b) {
-        sstore(a, b)
-    }
-
-}
-// ----
-// step: functionSpecializer
-//
-// {
-//     f_1()
-//     let x := 1
-//     f_2(x)
-//     f(calldataload(0), calldataload(1))
-//     function f_1()
-//     {
-//         let a_4 := 1
-//         let b_3 := 2
-//         sstore(a_4, b_3)
-//     }
-//     function f_2(a_6)
-//     {
-//         let b_5 := 2
-//         sstore(a_6, b_5)
-//     }
-//     function f(a, b)
-//     { sstore(a, b) }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionSpecializer/partial.yul b/test/libyul/yulOptimizerTests/functionSpecializer/partial.yul
deleted file mode 100644
index 6b18da019dea..000000000000
--- a/test/libyul/yulOptimizerTests/functionSpecializer/partial.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    // All arguments are constants
-    let x := 2
-    f(1, x, 3)
-
-    function f(a, b, c) {
-        sstore(a, b)
-        sstore(b, c)
-        // Prevents getting inlined
-        if calldataload(0) { leave }
-    }
-}
-// ----
-// step: functionSpecializer
-//
-// {
-//     let x := 2
-//     f_1(x)
-//     function f_1(b_3)
-//     {
-//         let a_4 := 1
-//         let c_2 := 3
-//         sstore(a_4, b_3)
-//         sstore(b_3, c_2)
-//         if calldataload(0) { leave }
-//     }
-//     function f(a, b, c)
-//     {
-//         sstore(a, b)
-//         sstore(b, c)
-//         if calldataload(0) { leave }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionSpecializer/recursion.yul b/test/libyul/yulOptimizerTests/functionSpecializer/recursion.yul
deleted file mode 100644
index 5cbc70236c5d..000000000000
--- a/test/libyul/yulOptimizerTests/functionSpecializer/recursion.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    sstore(0, fib(8))
-    function fib(i) -> y
-    {
-        y := 1
-        if gt(i, 2)
-        {
-            y := add(fib(sub(i, 1)), fib(sub(i, 2)))
-        }
-    }
-}
-// ----
-// step: functionSpecializer
-//
-// {
-//     sstore(0, fib(8))
-//     function fib(i) -> y
-//     {
-//         y := 1
-//         if gt(i, 2)
-//         {
-//             y := add(fib(sub(i, 1)), fib(sub(i, 2)))
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionSpecializer/simple.yul b/test/libyul/yulOptimizerTests/functionSpecializer/simple.yul
deleted file mode 100644
index 3ec298ebd953..000000000000
--- a/test/libyul/yulOptimizerTests/functionSpecializer/simple.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    // All arguments are constants
-    f(1, 2, 3)
-
-    function f(a, b, c) {
-        sstore(a, b)
-        sstore(b, c)
-    }
-}
-// ----
-// step: functionSpecializer
-//
-// {
-//     f_1()
-//     function f_1()
-//     {
-//         let a_4 := 1
-//         let b_3 := 2
-//         let c_2 := 3
-//         sstore(a_4, b_3)
-//         sstore(b_3, c_2)
-//     }
-//     function f(a, b, c)
-//     {
-//         sstore(a, b)
-//         sstore(b, c)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionSpecializer/smoke.yul b/test/libyul/yulOptimizerTests/functionSpecializer/smoke.yul
deleted file mode 100644
index 3da8c4089895..000000000000
--- a/test/libyul/yulOptimizerTests/functionSpecializer/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: functionSpecializer
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul b/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul
deleted file mode 100644
index 14483547636b..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := mload(x)
-    let b := mload(x)
-    sstore(a, b)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let a := mload(calldataload(0))
-//         sstore(a, a)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul b/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul
deleted file mode 100644
index 7ffac34c0b41..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := mload(x)
-    x := 7
-    let b := mload(x)
-    sstore(a, b)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let a := mload(x)
-//         x := 7
-//         sstore(a, mload(x))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul b/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul
deleted file mode 100644
index 7f8514875dd9..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := mload(x)
-    a := 7
-    let b := mload(x)
-    sstore(a, b)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let a := mload(x)
-//         a := 7
-//         sstore(a, mload(x))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak.yul
deleted file mode 100644
index 25b36f5fea39..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    mstore(0, 10)
-    /// >>> int.from_bytes(web3.Web3.keccak(int.to_bytes(10, 32, byteorder='big')), byteorder='big')
-    /// 89717814153306320011181716697424560163256864414616650038987186496166826726056
-    let val := keccak256(0, 32)
-    sstore(0, val)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 10
-//         let _2 := 0
-//         mstore(_2, _1)
-//         sstore(_2, 89717814153306320011181716697424560163256864414616650038987186496166826726056)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul
deleted file mode 100644
index 18c818d15ec6..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-// This test used to crash: https://github.com/ethereum/solidity/issues/11801
-{
-  for {} addmod(keccak256(0x0,create(0x0, 0x0, 0x0)), 0x0, 0x0) {} {}
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         for { }
-//         addmod(keccak256(0x0, create(0x0, 0x0, 0x0)), 0x0, 0x0)
-//         { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul
deleted file mode 100644
index e4fe6484ffbe..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    mstore(0, 30)
-    if calldataload(0) {
-        mstore(0, 20)
-    }
-    let val := keccak256(0, 32)
-    sstore(0, val)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 30
-//         let _2 := 0
-//         mstore(_2, _1)
-//         if calldataload(_2) { mstore(_2, 20) }
-//         sstore(_2, keccak256(_2, 32))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul
deleted file mode 100644
index 5a7d571a479d..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    mstore(100, 10)
-    mstore(132, 5)
-    // Won't be evaluated, even though the value is known
-    let val := keccak256(10, 33)
-    sstore(0, val)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 10
-//         mstore(100, _1)
-//         mstore(132, 5)
-//         sstore(0, keccak256(_1, 33))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul
deleted file mode 100644
index b838c87e03f4..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := keccak256(0, x)
-    sstore(a, 2)
-    let t := mload(2)
-    let b := keccak256(0, x)
-    sstore(b, 3)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let a := keccak256(_1, calldataload(_1))
-//         sstore(a, 2)
-//         sstore(a, 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul
deleted file mode 100644
index 7b37f8c95f58..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    let a := calldataload(0)
-    sstore(f(keccak256(0, a)), keccak256(0, a))
-    sstore(f(keccak256(0, a)), keccak256(0, a))
-    sstore(keccak256(0, a), f(keccak256(0, a)))
-
-    function f(x) -> y {
-        mstore(x, 2)
-        y := mload(8)
-    }
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let a := calldataload(_1)
-//         let _3 := keccak256(_1, a)
-//         sstore(f(_3), _3)
-//         let _8 := keccak256(_1, a)
-//         sstore(f(_8), _8)
-//         sstore(keccak256(_1, a), f(keccak256(_1, a)))
-//     }
-//     function f(x) -> y
-//     {
-//         mstore(x, 2)
-//         y := mload(8)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul
deleted file mode 100644
index f4d37d90e7b8..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let x := calldataload(0)
-    sstore(keccak256(0, x), keccak256(0, x))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let _3 := keccak256(_1, calldataload(_1))
-//         sstore(_3, _3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul
deleted file mode 100644
index 499a227c2c7c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := calldataload(0)
-    let t := msize()
-    let x := keccak256(0, a)
-    let y := keccak256(0, a)
-    sstore(x, y)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let a := calldataload(_1)
-//         let x := keccak256(_1, a)
-//         sstore(x, keccak256(_1, a))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul
deleted file mode 100644
index 65b5931a9da2..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let x := calldataload(0)
-    let a := keccak256(0x20, x)
-    sstore(a, 2)
-    // will disable loading for now, might improve later
-    mstore(0, 1)
-    let b := keccak256(0x20, x)
-    sstore(b, 3)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let x := calldataload(_1)
-//         let _2 := 0x20
-//         sstore(keccak256(_2, x), 2)
-//         mstore(_1, 1)
-//         sstore(keccak256(_2, x), 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul
deleted file mode 100644
index b780d62b0a18..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(1)
-    let a := keccak256(x, y)
-    if calldataload(2) {
-        a := 8
-    }
-    let b := keccak256(x, y)
-    sstore(b, 2)
-    if calldataload(3) {
-        x := 8
-    }
-    let c := keccak256(x, y)
-    sstore(c, 2)
-    if calldataload(4) {
-        y := 8
-    }
-    let d := keccak256(x, y)
-    sstore(d, 2)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let y := calldataload(1)
-//         let a := keccak256(x, y)
-//         let _3 := 2
-//         if calldataload(_3) { a := 8 }
-//         sstore(keccak256(x, y), _3)
-//         if calldataload(3) { x := 8 }
-//         sstore(keccak256(x, y), _3)
-//         if calldataload(4) { y := 8 }
-//         sstore(keccak256(x, y), _3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul
deleted file mode 100644
index 232d76f14575..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(1)
-    let a := keccak256(x, y)
-    sstore(a, 2)
-    // reassign value
-    a := calldataload(10)
-    let b := keccak256(x, y)
-    sstore(b, 3)
-    // reassign arg1
-    x := 10
-    let c := keccak256(x, y)
-    sstore(c, 4)
-    // reassign arg2
-    y := 9
-    let d := keccak256(x, y)
-    sstore(d, 5)
-    // no reassign, check that it is still working here.
-    let e := keccak256(x, y)
-    sstore(e, 6)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(0)
-//         let y := calldataload(1)
-//         let a := keccak256(x, y)
-//         sstore(a, 2)
-//         let _4 := 10
-//         a := calldataload(_4)
-//         sstore(keccak256(x, y), 3)
-//         x := _4
-//         sstore(keccak256(_4, y), 4)
-//         y := 9
-//         let d := keccak256(_4, y)
-//         sstore(d, 5)
-//         sstore(d, 6)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul
deleted file mode 100644
index 58cb7c264ce9..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-// import web3
-// >>> asBytes = int(10).to_bytes(32, byteorder='big')
-// >>> int.from_bytes(web3.Web3.keccak(asBytes[:31]), byteorder='big')
-// 9948786400348073077032572701554570401043517428989726124163377057770909578447
-// >>> int.from_bytes(web3.Web3.keccak(asBytes[:30]), byteorder='big')
-// 110945455955148346822663466543669633859020391897956790847617069135813044810108
-// >>> int.from_bytes(web3.Web3.keccak(asBytes[:1]), byteorder='big')
-// 85131057757245807317576516368191972321038229705283732634690444270750521936266
-// >>> int.from_bytes(web3.Web3.keccak(b''), byteorder='big')
-// 89477152217924674838424037953991966239322087453347756267410168184682657981552
-{
-    mstore(0, 10)
-    sstore(0, keccak256(0, 31))
-    sstore(1, keccak256(0, 30))
-    sstore(2, keccak256(0, 1))
-    sstore(2, keccak256(0, 0))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 10
-//         let _2 := 0
-//         mstore(_2, _1)
-//         sstore(_2, 9948786400348073077032572701554570401043517428989726124163377057770909578447)
-//         sstore(1, 110945455955148346822663466543669633859020391897956790847617069135813044810108)
-//         let _13 := 85131057757245807317576516368191972321038229705283732634690444270750521936266
-//         let _14 := 2
-//         sstore(_14, _13)
-//         sstore(_14, 89477152217924674838424037953991966239322087453347756267410168184682657981552)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul
deleted file mode 100644
index 261f38cd1f59..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let converted := 14
-    let _1 := 50
-    mstore(_1, "abcdefghijklmn")
-    // >>> int.from_bytes(web3.Web3.keccak(text="abcdefghijklmn"), byteorder='big')
-    // 51246744213555520563123611275127692828770413530219146609532820042079541949502
-
-    sstore(0, keccak256(_1, converted))
-    sstore(0, add(mload(_1), 1))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 50
-//         let _2 := "abcdefghijklmn"
-//         mstore(_1, _2)
-//         let _3 := 51246744213555520563123611275127692828770413530219146609532820042079541949502
-//         let _4 := 0
-//         sstore(_4, _3)
-//         sstore(_4, add(_2, 1))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul
deleted file mode 100644
index 46466a062f6c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-// Test where the location of the memory offset is not known at compile time
-// >>> import web3
-// >>> asBytes = int(500).to_bytes(32, byteorder='big')
-// >>> int.from_bytes(web3.Web3.keccak(asBytes), byteorder='big')
-// 92647596584187651892918913434663110448935397770592030057655219009846081465370
-// >>> int.from_bytes(web3.Web3.keccak(asBytes[:16]), byteorder='big')
-// 110620294328144418057589324861608220015688365608948720310623173341503153578932
-{
-    let offset := calldataload(0)
-    mstore(offset, 500)
-    sstore(0, keccak256(offset, 32))
-    sstore(1, keccak256(offset, 16))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         mstore(calldataload(_1), 500)
-//         sstore(_1, 92647596584187651892918913434663110448935397770592030057655219009846081465370)
-//         sstore(1, 110620294328144418057589324861608220015688365608948720310623173341503153578932)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul
deleted file mode 100644
index 5e1c7d419028..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    sstore(0, msize())
-    mstore(0, 10)
-    // Keccak-256 should not be evaluated because of the msize.
-    // Even though, though the code is likely equivalent,
-    // we skip steps if `msize` is present
-    let val := keccak256(0, 32)
-    sstore(1, val)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := msize()
-//         let _2 := 0
-//         sstore(_2, _1)
-//         mstore(_2, 10)
-//         sstore(1, keccak256(_2, 32))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/loop.yul b/test/libyul/yulOptimizerTests/loadResolver/loop.yul
deleted file mode 100644
index 45876716069c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/loop.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    sstore(0, 123213)
-    for {let x := 0 let y} lt(x, sload(0)) {
-        x := add(x, 1)} {y := add(x, y)
-    }
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 123213
-//         let _2 := 0
-//         sstore(_2, _1)
-//         let x := _2
-//         let y
-//         for { } lt(x, _1) { x := add(x, 1) }
-//         { y := add(x, y) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul b/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul
deleted file mode 100644
index 840f19005b06..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    mstore(2, 9)
-    sstore(0, mload(2))
-    pop(call(0, 0, 0, 0, 0, 0, 0))
-    sstore(0, mload(2))
-
-    mstore(2, 10)
-    mstore8(calldataload(0), 4)
-    sstore(0, mload(2))
-
-    mstore(2, 10)
-    g()
-    sstore(0, mload(2))
-
-    function g() {}
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 9
-//         let _2 := 2
-//         mstore(_2, _1)
-//         let _4 := _1
-//         let _5 := 0
-//         sstore(_5, _4)
-//         pop(call(_5, _5, _5, _5, _5, _5, _5))
-//         sstore(_5, mload(_2))
-//         let _17 := 10
-//         mstore(_2, _17)
-//         mstore8(calldataload(_5), 4)
-//         sstore(_5, mload(_2))
-//         mstore(_2, _17)
-//         sstore(_5, _17)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul b/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul
deleted file mode 100644
index f54053bb10f2..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    // No mload removal because of msize
-    mstore(calldataload(0), msize())
-    let t := mload(calldataload(10))
-    let q := mload(calldataload(0))
-    sstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := msize()
-//         let _3 := calldataload(0)
-//         mstore(_3, _1)
-//         let t := mload(calldataload(10))
-//         sstore(t, mload(_3))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul
deleted file mode 100644
index acb96c07b102..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    mstore(calldataload(0), calldataload(10))
-    if calldataload(1) {
-        mstore(calldataload(0), 1)
-    }
-    let t := mload(0)
-    let q := mload(calldataload(0))
-    sstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _2 := calldataload(10)
-//         let _3 := 0
-//         let _4 := calldataload(_3)
-//         mstore(_4, _2)
-//         let _5 := 1
-//         if calldataload(_5) { mstore(_4, _5) }
-//         let t := mload(_3)
-//         sstore(t, mload(_4))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul
deleted file mode 100644
index 1659949a3caf..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    mstore(calldataload(0), calldataload(10))
-    if calldataload(1) {
-        mstore(add(calldataload(0), 0x20), 1)
-    }
-    let t := mload(add(calldataload(0), 0x20))
-    let q := mload(calldataload(0))
-    sstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _2 := calldataload(10)
-//         let _4 := calldataload(0)
-//         mstore(_4, _2)
-//         let _5 := 1
-//         if calldataload(_5) { mstore(add(_4, 0x20), _5) }
-//         sstore(mload(add(_4, 0x20)), _2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul
deleted file mode 100644
index 18740c049095..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let x := mload(calldataload(0))
-    if calldataload(1) {
-        mstore(add(calldataload(0), 0x20), 1)
-    }
-    let t := mload(add(calldataload(0), 0x20))
-    let q := mload(calldataload(0))
-    sstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _2 := calldataload(0)
-//         let x := mload(_2)
-//         let _3 := 1
-//         if calldataload(_3) { mstore(add(_2, 0x20), _3) }
-//         sstore(mload(add(_2, 0x20)), x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul
deleted file mode 100644
index 00bb85c4c8af..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let b := mload(2)
-    if calldataload(1) {
-        mstore(2, 7)
-        // Re-writing the old value, should allow to eliminate the load below.
-        mstore(2, b)
-    }
-    sstore(0, mload(2))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 2
-//         let b := mload(_1)
-//         if calldataload(1)
-//         {
-//             mstore(_1, 7)
-//             mstore(_1, b)
-//         }
-//         sstore(0, b)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul
deleted file mode 100644
index 760641698255..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let b := mload(2)
-    sstore(0, b)
-    if calldataload(1) {
-        mstore(2, 7)
-    }
-    sstore(0, mload(2))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 2
-//         let b := mload(_1)
-//         let _2 := 0
-//         sstore(_2, b)
-//         if calldataload(1) { mstore(_1, 7) }
-//         sstore(_2, mload(_1))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul
deleted file mode 100644
index e8cc3cf4b010..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    mstore(calldataload(0), calldataload(10))
-    if calldataload(1) {
-        mstore(0, 1)
-    }
-    let t := mload(0)
-    let q := mload(calldataload(0))
-    sstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _2 := calldataload(10)
-//         let _3 := 0
-//         let _4 := calldataload(_3)
-//         mstore(_4, _2)
-//         let _5 := 1
-//         if calldataload(_5) { mstore(_3, _5) }
-//         let t := mload(_3)
-//         sstore(t, mload(_4))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul
deleted file mode 100644
index c6c76f425f2d..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    mstore(2, 3)
-    if calldataload(1) {
-        mstore(2, 7)
-        // Re-writing the old value, should allow to eliminate the load below.
-        mstore(2, 3)
-    }
-    sstore(0, mload(2))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 3
-//         let _2 := 2
-//         mstore(_2, _1)
-//         if calldataload(1)
-//         {
-//             mstore(_2, 7)
-//             mstore(_2, _1)
-//         }
-//         sstore(0, _1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul b/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul
deleted file mode 100644
index b76d071ae8f2..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-        function foo(x) {
-                for {} x { x := mload(0) mstore(0, 0)} {}
-        }
-        mstore(0, 1337)
-        foo(42)
-        sstore(0, mload(0))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 1337
-//         let _2 := 0
-//         mstore(_2, _1)
-//         foo(42)
-//         sstore(_2, mload(_2))
-//     }
-//     function foo(x)
-//     {
-//         for { }
-//         x
-//         {
-//             let _7 := 0
-//             x := mload(_7)
-//             mstore(_7, _7)
-//         }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul b/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul
deleted file mode 100644
index 6ad9d36ac76f..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let x := calldataload(0)
-    x := mload(x)
-    let y := mload(x)
-    sstore(0, y)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let x := calldataload(_1)
-//         x := mload(x)
-//         sstore(_1, mload(x))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul b/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul
deleted file mode 100644
index 901ea12efc8c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    function userNot(x) -> y {
-        y := iszero(x)
-    }
-
-    function funcWithLoop(x) {
-        for {} userNot(x) { mstore(0, 0) } {}
-    }
-
-    mstore(0, 1337)
-    funcWithLoop(42)
-    sstore(0, mload(0))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 1337
-//         let _2 := 0
-//         mstore(_2, _1)
-//         funcWithLoop(42)
-//         sstore(_2, mload(_2))
-//     }
-//     function userNot(x) -> y
-//     { y := iszero(x) }
-//     function funcWithLoop(x_1)
-//     {
-//         for { }
-//         userNot(x_1)
-//         {
-//             let _7 := 0
-//             mstore(_7, _7)
-//         }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul b/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul
deleted file mode 100644
index 6fb0fdcba99a..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    function userNot(x) -> y {
-        y := iszero(x)
-    }
-
-    function funcWithLoop(x) {
-        for { mstore(0, 0) } userNot(x) {} {}
-    }
-
-    mstore(0, 1337)
-    funcWithLoop(42)
-    sstore(0, mload(0))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 1337
-//         let _2 := 0
-//         mstore(_2, _1)
-//         funcWithLoop(42)
-//         sstore(_2, mload(_2))
-//     }
-//     function userNot(x) -> y
-//     { y := iszero(x) }
-//     function funcWithLoop(x_1)
-//     {
-//         let _7 := 0
-//         mstore(_7, _7)
-//         for { } userNot(x_1) { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul b/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul
deleted file mode 100644
index c367059eb90c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    let x := calldataload(0)
-    let len := sload(x)
-    let sum
-    for { let i := 0} lt(i, sload(x)) { i := add(i, 1) } {
-        let p := add(x, add(i, 1))
-        if gt(p, sload(x)) { revert(0, 0) }
-        sum := add(sum, sload(p))
-    }
-    mstore(0, sum)
-    return(0, 0x20)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let x := calldataload(_1)
-//         let len := sload(x)
-//         let sum
-//         let i := _1
-//         for { } lt(i, len) { i := add(i, 1) }
-//         {
-//             let p := add(add(x, i), 1)
-//             if gt(p, len) { revert(_1, _1) }
-//             sum := add(sum, sload(p))
-//         }
-//         mstore(_1, sum)
-//         return(_1, 0x20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul b/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul
deleted file mode 100644
index 031a5f22a5e1..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a := 0
-    let b := 1
-    let c := 2
-    mstore(a, b)
-    sstore(0, mload(a))
-    mstore(a, c)
-    sstore(10, mload(a))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let a := 0
-//         let b := 1
-//         let c := 2
-//         mstore(a, b)
-//         sstore(a, b)
-//         mstore(a, c)
-//         sstore(10, c)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul b/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul
deleted file mode 100644
index fab562208be0..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a := 0
-    let b := 1
-    let c := 2
-    sstore(a, b)
-    mstore(0, sload(a))
-    sstore(a, c)
-    mstore(32, sload(a))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let a := 0
-//         let b := 1
-//         let c := 2
-//         sstore(a, b)
-//         mstore(a, b)
-//         sstore(a, c)
-//         mstore(32, c)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/reassign.yul b/test/libyul/yulOptimizerTests/loadResolver/reassign.yul
deleted file mode 100644
index 694b59e26289..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/reassign.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := calldataload(0)
-    sstore(a, 6)
-    a := calldataload(2)
-    mstore(0, sload(a))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let a := calldataload(_1)
-//         sstore(a, 6)
-//         a := calldataload(2)
-//         mstore(_1, sload(a))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul b/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul
deleted file mode 100644
index 402987acb4ae..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    let x := calldataload(1)
-    let a := add(x, 10)
-    sstore(a, 7)
-    // This clears the expression assigned to ``a`` but
-    // should not clear storage knowledge
-    x := 9
-    mstore(sload(a), 11)
-    // This, on the other hand, actually clears knowledge
-    a := 33
-    mstore(sload(a), 11)
-    // Try again with different expression to avoid
-    // clearing because we cannot know if it is different
-    a := 39
-    mstore(sload(a), 11)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(1)
-//         let a := add(x, 10)
-//         let _3 := 7
-//         sstore(a, _3)
-//         x := 9
-//         let _4 := 11
-//         mstore(_3, _4)
-//         a := 33
-//         mstore(sload(a), _4)
-//         a := 39
-//         mstore(sload(a), _4)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul b/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
deleted file mode 100644
index 74660133817c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let x
-    {
-        let y := msize()
-        x := add(4, y)
-    }
-    x := keccak256(0, mod(x, 2))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x
-//         let y := msize()
-//         let _1 := 4
-//         x := add(_1, y)
-//         x := keccak256(0, addmod(_1, y, 2))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul b/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul
deleted file mode 100644
index 8f1cf338f66d..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let x := calldataload(1)
-    let a := add(x, 10)
-    let b := add(x, 42)
-    mstore(a, 7)
-    // does not invalidate the first store, because the
-    // difference is larger than 32, even if the absolute
-    // values are unknown
-    mstore(b, 8)
-    sstore(mload(a), mload(b))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(1)
-//         let a := add(x, 10)
-//         let b := add(x, 42)
-//         let _4 := 7
-//         mstore(a, _4)
-//         let _5 := 8
-//         mstore(b, _5)
-//         sstore(_4, _5)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_store.yul b/test/libyul/yulOptimizerTests/loadResolver/second_store.yul
deleted file mode 100644
index eb960a9f6e5c..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/second_store.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let x := calldataload(1)
-    sstore(x, 7)
-    sstore(calldataload(0), 6)
-    // We cannot replace this because we do not know
-    // if the two slots are different.
-    mstore(0, sload(x))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(1)
-//         sstore(x, 7)
-//         let _3 := 6
-//         let _4 := 0
-//         sstore(calldataload(_4), _3)
-//         mstore(_4, sload(x))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul b/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul
deleted file mode 100644
index e13b8aa5f64f..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let x := calldataload(1)
-    sstore(x, 7)
-    sstore(calldataload(0), 7)
-    // We can replace this because both values that were
-    // written are 7.
-    mstore(0, sload(x))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(1)
-//         let _2 := 7
-//         sstore(x, _2)
-//         let _4 := 0
-//         sstore(calldataload(_4), _2)
-//         mstore(_4, _2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul b/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul
deleted file mode 100644
index f301737ecaa1..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let x := calldataload(1)
-    let a := add(x, 10)
-    let b := add(x, 20)
-    sstore(a, 7)
-    // does not invalidate the first store, because the
-    // difference is a constant, even if the absolute
-    // values are unknown
-    sstore(b, 8)
-    mstore(sload(a), sload(b))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let x := calldataload(1)
-//         let a := add(x, 10)
-//         let b := add(x, 20)
-//         let _4 := 7
-//         sstore(a, _4)
-//         let _5 := 8
-//         sstore(b, _5)
-//         mstore(_4, _5)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul b/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul
deleted file mode 100644
index b1eefd0890d6..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    function stores() { mstore(0, 1) }
-    function reads() { sstore(9, mload(7)) }
-
-    mstore(2, 9)
-    reads()
-    sstore(0, mload(2))
-    stores()
-    sstore(0, mload(2))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 9
-//         let _2 := 2
-//         mstore(_2, _1)
-//         reads()
-//         let _4 := _1
-//         let _5 := 0
-//         sstore(_5, _4)
-//         stores()
-//         sstore(_5, mload(_2))
-//     }
-//     function stores()
-//     { mstore(0, 1) }
-//     function reads()
-//     { sstore(9, mload(7)) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/simple.yul b/test/libyul/yulOptimizerTests/loadResolver/simple.yul
deleted file mode 100644
index a20025bcdf09..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/simple.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    sstore(calldataload(0), calldataload(10))
-    let t := sload(calldataload(10))
-    let q := sload(calldataload(0))
-    mstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _2 := calldataload(10)
-//         sstore(calldataload(0), _2)
-//         mstore(sload(_2), _2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul b/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul
deleted file mode 100644
index 3aa1d740f496..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    mstore(calldataload(0), calldataload(10))
-    let t := mload(calldataload(10))
-    let q := mload(calldataload(0))
-    sstore(t, q)
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _2 := calldataload(10)
-//         mstore(calldataload(0), _2)
-//         sstore(mload(_2), _2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul b/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul
deleted file mode 100644
index 2a72eee3e215..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    let a := 0
-    let b := 1
-    let c := 2
-    sstore(a, b)
-    mstore(900, 7)
-    let d := staticcall(10000, 10, 0, 200, 0, 200)
-    sstore(add(a, 1), mload(900))
-    // Main test objective: replace this sload.
-    mstore(0, sload(a))
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let a := 0
-//         let b := 1
-//         sstore(a, b)
-//         let _1 := 7
-//         let _2 := 900
-//         mstore(_2, _1)
-//         let _3 := 200
-//         pop(staticcall(10000, 10, a, _3, a, _3))
-//         sstore(1, mload(_2))
-//         mstore(a, b)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul b/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul
deleted file mode 100644
index 8d417a177618..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    mstore(10, 20)
-    // cannot be resolved because of verbatim
-    sstore(0, mload(10))
-    verbatim_0i_0o("test")
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 20
-//         let _2 := 10
-//         mstore(_2, _1)
-//         sstore(0, mload(_2))
-//         verbatim_0i_0o("test")
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul b/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul
deleted file mode 100644
index 81479a509249..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    sstore(10, 20)
-    // will be resolved
-    sstore(30, sload(10))
-    verbatim_0i_0o("test")
-    // will not be resolved
-    sstore(30, sload(10))
-}
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 20
-//         let _2 := 10
-//         sstore(_2, _1)
-//         let _4 := _1
-//         let _5 := 30
-//         sstore(_5, _4)
-//         verbatim_0i_0o("test")
-//         sstore(_5, sload(_2))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul b/test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul
deleted file mode 100644
index 418221a93824..000000000000
--- a/test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  returndatacopy(1, 1, 0)
-  calldatacopy(1, 1, 0)
-  extcodecopy(1, 1, 1, 0)
-  codecopy(1, 1, 0)
-  log0(1, 0)
-  log1(1, 0, 1)
-  log2(1, 0, 1, 1)
-  log3(1, 0, 1, 1, 1)
-  log4(1, 0, 1, 1, 1, 1)
-  pop(create(1, 1, 0))
-  pop(create2(1, 1, 0, 1))
-  pop(call(1, 1, 1, 1, 0, 1, 0))
-  pop(callcode(1, 1, 1, 1, 0, 1, 0))
-  pop(delegatecall(1, 1, 1, 0, 1, 0))
-  pop(staticcall(1, 1, 1, 0, 1, 0))
-  return(1, 0)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: loadResolver
-//
-// {
-//     {
-//         let _1 := 0
-//         let _2 := 1
-//         returndatacopy(0, _2, _1)
-//         calldatacopy(0, _2, _1)
-//         extcodecopy(_2, 0, _2, _1)
-//         codecopy(0, _2, _1)
-//         log0(0, _1)
-//         log1(0, _1, _2)
-//         log2(0, _1, _2, _2)
-//         log3(0, _1, _2, _2, _2)
-//         log4(0, _1, _2, _2, _2, _2)
-//         pop(create(_2, 0, _1))
-//         pop(create2(_2, 0, _1, _2))
-//         pop(call(_2, _2, _2, 0, _1, _2, _1))
-//         pop(callcode(_2, _2, _2, 0, _1, _2, _1))
-//         pop(delegatecall(_2, _2, 0, _1, _2, _1))
-//         pop(staticcall(_2, _2, 0, _1, _2, _1))
-//         return(0, _1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/complex_move.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/complex_move.yul
deleted file mode 100644
index 3c11ca65f0db..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/complex_move.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := extcodesize(keccak256(mul(mload(inv), 3), 32))
-    a := add(x, 1)
-    sstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     let x := extcodesize(keccak256(mul(mload(inv), 3), 32))
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         a := add(x, 1)
-//         sstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/create_sload.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/create_sload.yul
deleted file mode 100644
index 41289503791a..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/create_sload.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  function g() -> x { x := create(100, 0, 32) }
-  function f() -> x { x := mload(0) }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    // cannot be moved because of the create call in g()
-    let q := sload(5)
-    let r := g()
-    // This can be moved
-    let z := f()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let z := f()
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let q := sload(5)
-//         let r := g()
-//     }
-//     function g() -> x
-//     { x := create(100, 0, 32) }
-//     function f() -> x_1
-//     { x_1 := mload(0) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/dependOnVarInLoop.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/dependOnVarInLoop.yul
deleted file mode 100644
index a1b58ceb2b7b..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/dependOnVarInLoop.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let c := mload(3)    // c cannot be moved because non-movable
-    let not_inv := add(b, c) // no_inv cannot be moved because its value depends on c
-    a := add(a, 1)
-    mstore(a, not_inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let c := mload(3)
-//         let not_inv := add(b, c)
-//         a := add(a, 1)
-//         mstore(a, not_inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_memory_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_memory_function.yul
deleted file mode 100644
index f8c18f5f4271..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_memory_function.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  function g() -> x { x := add(sload(mload(x)), 1) }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := mload(g())
-    let s := keccak256(g(), 32)
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let t := mload(g())
-//     let s := keccak256(g(), 32)
-//     let q := g()
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { }
-//     function g() -> x
-//     { x := add(sload(mload(x)), 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_state_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_state_function.yul
deleted file mode 100644
index 1d1a1491558f..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_state_function.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  function f() -> x { x := mload(g()) }
-  function g() -> x { x := add(sload(x), 1) }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := extcodesize(f())
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let t := extcodesize(f())
-//     let q := g()
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { }
-//     function f() -> x
-//     { x := mload(g()) }
-//     function g() -> x_1
-//     { x_1 := add(sload(x_1), 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_storage_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_storage_function.yul
deleted file mode 100644
index 230e13d144e7..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_storage_function.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { x := add(x, 1) }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := sload(f())
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let t := sload(f())
-//     let q := g()
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     { x_1 := add(x_1, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/multi.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/multi.yul
deleted file mode 100644
index 19a85c813841..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/multi.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  let b := 1
-  // tests if c, d, and inv can be moved outside in single pass
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let c := b
-    let d := mul(c, 2)
-    let inv := add(c, d)
-    a := add(a, 1)
-    mstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let c := b
-//     let d := mul(c, 2)
-//     let inv := add(c, d)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         a := add(a, 1)
-//         mstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_immovables.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_immovables.yul
deleted file mode 100644
index 8881fdc84887..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_immovables.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  let a := 1
-  function f() -> x {invalid()}
-  function g() -> y {return(0, 0)}
-  for { let i := 1 } iszero(eq(i, 10)) { a := add(i, 1) } {
-    let b := f()
-    let c := gas()
-    let d := g()
-    let e := sload(g())
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let a := 1
-//     let i := 1
-//     for { } iszero(eq(i, 10)) { a := add(i, 1) }
-//     {
-//         let b := f()
-//         let c := gas()
-//         let d := g()
-//         let e := sload(g())
-//     }
-//     function f() -> x
-//     { invalid() }
-//     function g() -> y
-//     { return(0, 0) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_loop.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_loop.yul
deleted file mode 100644
index 8632e3764131..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_loop.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { for {} 1 {} {} }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := f()
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let t := f()
-//         let q := g()
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     {
-//         for { } 1 { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory.yul
deleted file mode 100644
index 942a3c5802cb..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory.yul
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := keccak256(inv, 32)
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    // mload prevents moving of extcodesize
-    let x := extcodesize(mload(mul(inv, 3)))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let x := keccak256(inv, 32)
-//         a := add(x, 1)
-//         mstore(a, inv)
-//     }
-//     let a_1 := 1
-//     let inv_2 := add(b, 42)
-//     for { } iszero(eq(a_1, 10)) { a_1 := add(a_1, 1) }
-//     {
-//         let x_3 := extcodesize(mload(mul(inv_2, 3)))
-//         a_1 := add(x_3, 1)
-//         mstore(a_1, inv_2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_loop.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_loop.yul
deleted file mode 100644
index c55762461953..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_loop.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { for {} 1 {} {} }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := mload(f())
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let t := mload(f())
-//         let q := g()
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     {
-//         for { } 1 { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_msize.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_msize.yul
deleted file mode 100644
index 2033a9be91a4..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_msize.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  let b := 1
-  let c := msize() // prevents moving keccak and mload
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := keccak256(inv, 32)
-    a := add(x, 1)
-  }
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := extcodesize(mload(mul(inv, 3)))
-    a := add(x, 1)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let c := msize()
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let x := keccak256(inv, 32)
-//         a := add(x, 1)
-//     }
-//     let a_1 := 1
-//     let inv_2 := add(b, 42)
-//     for { } iszero(eq(a_1, 10)) { a_1 := add(a_1, 1) }
-//     {
-//         let x_3 := extcodesize(mload(mul(inv_2, 3)))
-//         a_1 := add(x_3, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_recursive_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_recursive_function.yul
deleted file mode 100644
index 27193a138a54..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_recursive_function.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { x := g() }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := f()
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let t := f()
-//         let q := g()
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     { x_1 := g() }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state.yul
deleted file mode 100644
index fa6c985b4f8a..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state.yul
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  let b := 1
-  // invalidates state in post
-  for { let a := 1 } iszero(eq(a, 10)) {pop(call(2, 0x01, 2, 0x00, 32, 0x010, 32))} {
-    let inv := add(b, 42)
-    let x := extcodesize(mul(inv, 3))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    pop(create(0x08, 0x00, 0x02)) // invalidates state
-    let x := extcodesize(mul(inv, 3))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-
-  // invalidates state in loop-condition
-  for { let a := 1 } iszero(create(0x08, 0x00, 0x02)) { a := add(a, 1)} {
-    let inv := add(b, 42)
-    let x := extcodesize(mul(inv, 3))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { }
-//     iszero(eq(a, 10))
-//     {
-//         pop(call(2, 0x01, 2, 0x00, 32, 0x010, 32))
-//     }
-//     {
-//         let x := extcodesize(mul(inv, 3))
-//         a := add(x, 1)
-//         mstore(a, inv)
-//     }
-//     let a_1 := 1
-//     let inv_2 := add(b, 42)
-//     for { } iszero(eq(a_1, 10)) { a_1 := add(a_1, 1) }
-//     {
-//         pop(create(0x08, 0x00, 0x02))
-//         let x_3 := extcodesize(mul(inv_2, 3))
-//         a_1 := add(x_3, 1)
-//         mstore(a_1, inv_2)
-//     }
-//     let a_4 := 1
-//     let inv_5 := add(b, 42)
-//     for { } iszero(create(0x08, 0x00, 0x02)) { a_4 := add(a_4, 1) }
-//     {
-//         let x_6 := extcodesize(mul(inv_5, 3))
-//         a_4 := add(x_6, 1)
-//         mstore(a_4, inv_5)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_function.yul
deleted file mode 100644
index d3dce8d781b6..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_function.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x {
-    x := add(x, 1)
-    sstore(0x00, 0x00)
-  }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := extcodesize(f())
-    let q := sload(g())
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let t := extcodesize(f())
-//         let q := sload(g())
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     {
-//         x_1 := add(x_1, 1)
-//         sstore(0x00, 0x00)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_loop.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_loop.yul
deleted file mode 100644
index 8de9147d8aed..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_loop.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { for {} 1 {} {} }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := extcodesize(f())
-    let q := g()
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let t := extcodesize(f())
-//         let q := g()
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     {
-//         for { } 1 { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_recursive_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_recursive_function.yul
deleted file mode 100644
index 1eb0ccd6dd96..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_recursive_function.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { x := g() }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := extcodesize(f())
-    let q := sload(g())
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let t := extcodesize(f())
-//         let q := sload(g())
-//     }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     { x_1 := g() }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_staticall_returndatasize.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_staticall_returndatasize.yul
deleted file mode 100644
index ae20f4904f88..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_staticall_returndatasize.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  let b := 1
-  // invalidates state in post
-  for { let a := 1 } iszero(eq(a, 10)) {pop(call(2, 0x01, 2, 0x00, 32, 0x010, 32))} {
-    let inv := add(b, 42)
-    let x := returndatasize()
-    a := add(x, 1)
-    pop(staticcall(2, 3, 0, 32, 64, 32)) // prevents moving returndatasize
-    mstore(a, inv)
-  }
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { }
-//     iszero(eq(a, 10))
-//     {
-//         pop(call(2, 0x01, 2, 0x00, 32, 0x010, 32))
-//     }
-//     {
-//         let x := returndatasize()
-//         a := add(x, 1)
-//         pop(staticcall(2, 3, 0, 32, 64, 32))
-//         mstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage.yul
deleted file mode 100644
index 0ef2fd78ad40..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage.yul
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  let b := 1
-  // invalidates storage in post
-  for { let a := 1 } iszero(eq(a, 10)) { sstore(0x00, 0x01)} {
-    let inv := add(b, 42)
-    let x := sload(mul(inv, 3))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-
-  // invalidates storage in body
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := sload(mul(inv, 3))
-    a := add(x, 1)
-    sstore(a, inv)
-  }
-
-  // invalidates state in body
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    pop(callcode(100, 0x010, 10, 0x00, 32, 0x0100, 32))
-    let x := sload(mul(inv, 3))
-    a := add(x, 1)
-  }
-
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { } iszero(eq(a, 10)) { sstore(0x00, 0x01) }
-//     {
-//         let x := sload(mul(inv, 3))
-//         a := add(x, 1)
-//         mstore(a, inv)
-//     }
-//     let a_1 := 1
-//     let inv_2 := add(b, 42)
-//     for { } iszero(eq(a_1, 10)) { a_1 := add(a_1, 1) }
-//     {
-//         let x_3 := sload(mul(inv_2, 3))
-//         a_1 := add(x_3, 1)
-//         sstore(a_1, inv_2)
-//     }
-//     let a_4 := 1
-//     let inv_5 := add(b, 42)
-//     for { } iszero(eq(a_4, 10)) { a_4 := add(a_4, 1) }
-//     {
-//         pop(callcode(100, 0x010, 10, 0x00, 32, 0x0100, 32))
-//         let x_6 := sload(mul(inv_5, 3))
-//         a_4 := add(x_6, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_function.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_function.yul
deleted file mode 100644
index 210f21f5c8c0..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_function.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x {
-    x := add(x, 1)
-    sstore(0x00, 0x00)
-  }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let q := sload(g())
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { let q := sload(g()) }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     {
-//         x_1 := add(x_1, 1)
-//         sstore(0x00, 0x00)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_loop.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_loop.yul
deleted file mode 100644
index 0dc110873db1..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_loop.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  function f() -> x { x := g() }
-  function g() -> x { for {} 1 {} {} }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let t := sload(f())
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { let t := sload(f()) }
-//     function f() -> x
-//     { x := g() }
-//     function g() -> x_1
-//     {
-//         for { } 1 { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/non-ssavar.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/non-ssavar.yul
deleted file mode 100644
index 18feab0c1178..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/non-ssavar.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let not_inv := add(b, 42)
-    not_inv := add(not_inv, 1)
-    a := add(a, 1)
-    mstore(a, not_inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let not_inv := add(b, 42)
-//         not_inv := add(not_inv, 1)
-//         a := add(a, 1)
-//         mstore(a, not_inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/nonMovable.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/nonMovable.yul
deleted file mode 100644
index 15fe39ccd08e..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/nonMovable.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  let b := 0
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := mload(b)
-    a := add(a, 1)
-    mstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 0
-//     let a := 1
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let inv := mload(b)
-//         a := add(a, 1)
-//         mstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/not_first.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/not_first.yul
deleted file mode 100644
index a1a2bd645835..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/not_first.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  function g() -> x { x := add(mload(x), 1) }
-
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    sstore(0, a)
-    let q := keccak256(g(), 32)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let q := keccak256(g(), 32)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { sstore(0, a) }
-//     function g() -> x
-//     { x := add(mload(x), 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/recursive.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/recursive.yul
deleted file mode 100644
index 5fdabc7cb6fb..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/recursive.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    for { let a2 := 1 } iszero(eq(a2, 10)) { a2 := add(a2, 1) } {
-      let inv := add(b, 42)
-      mstore(a, inv)
-    }
-    a := add(a, 1)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         let a2 := 1
-//         for { } iszero(eq(a2, 10)) { a2 := add(a2, 1) }
-//         { mstore(a, inv) }
-//         a := add(a, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple.yul
deleted file mode 100644
index b0527e2b646b..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    a := add(a, 1)
-    mstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         a := add(a, 1)
-//         mstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_memory.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_memory.yul
deleted file mode 100644
index 223f54ee706c..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_memory.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := mload(mul(inv, 3))
-    let y := keccak256(mul(b, 13), 32)
-    a := add(x, 1)
-    sstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     let x := mload(mul(inv, 3))
-//     let y := keccak256(mul(b, 13), 32)
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         a := add(x, 1)
-//         sstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_state.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_state.yul
deleted file mode 100644
index f8b5a3d53725..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_state.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := extcodesize(mul(inv, 3))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     let x := extcodesize(mul(inv, 3))
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         a := add(x, 1)
-//         mstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_storage.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_storage.yul
deleted file mode 100644
index 022d66b2da0c..000000000000
--- a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/simple_storage.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  let b := 1
-  for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-    let inv := add(b, 42)
-    let x := sload(mul(inv, 3))
-    a := add(x, 1)
-    mstore(a, inv)
-  }
-}
-// ----
-// step: loopInvariantCodeMotion
-//
-// {
-//     let b := 1
-//     let a := 1
-//     let inv := add(b, 42)
-//     let x := sload(mul(inv, 3))
-//     for { } iszero(eq(a, 10)) { a := add(a, 1) }
-//     {
-//         a := add(x, 1)
-//         mstore(a, inv)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/nameDisplacer/funtion_call.yul b/test/libyul/yulOptimizerTests/nameDisplacer/funtion_call.yul
deleted file mode 100644
index 54045ce379f1..000000000000
--- a/test/libyul/yulOptimizerTests/nameDisplacer/funtion_call.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let x := illegal4(1, 2)
-    function illegal4(illegal1, illegal2) -> illegal3 { illegal3 := add(illegal1, illegal2) }
-    {
-        let y := illegal5(3, 4)
-        function illegal5(illegal1, illegal2) -> illegal3 { illegal3 := add(illegal1, illegal2) }
-    }
-}
-// ----
-// step: nameDisplacer
-//
-// {
-//     let x := illegal4_1(1, 2)
-//     function illegal4_1(illegal1_2, illegal2_3) -> illegal3_4
-//     {
-//         illegal3_4 := add(illegal1_2, illegal2_3)
-//     }
-//     {
-//         let y := illegal5_5(3, 4)
-//         function illegal5_5(illegal1_1, illegal2_2) -> illegal3_3
-//         {
-//             illegal3_3 := add(illegal1_1, illegal2_2)
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/nameDisplacer/variables.yul b/test/libyul/yulOptimizerTests/nameDisplacer/variables.yul
deleted file mode 100644
index 08b7bc43121d..000000000000
--- a/test/libyul/yulOptimizerTests/nameDisplacer/variables.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{ { let illegal1 := 1 } { let illegal2 := 2 let illegal3, illegal4 } }
-// ----
-// step: nameDisplacer
-//
-// {
-//     { let illegal1_1 := 1 }
-//     {
-//         let illegal2_2 := 2
-//         let illegal3_3, illegal4_4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/nameDisplacer/variables_inside_functions.yul b/test/libyul/yulOptimizerTests/nameDisplacer/variables_inside_functions.yul
deleted file mode 100644
index 472aa6a33e8f..000000000000
--- a/test/libyul/yulOptimizerTests/nameDisplacer/variables_inside_functions.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    function f(illegal1, illegal2) -> illegal3 {
-        let illegal4 := illegal1
-        illegal3 := add(illegal1, illegal2)
-    }
-}
-// ----
-// step: nameDisplacer
-//
-// {
-//     function f(illegal1_1, illegal2_2) -> illegal3_3
-//     {
-//         let illegal4_4 := illegal1_1
-//         illegal3_3 := add(illegal1_1, illegal2_2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/branches_for1.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_for1.yul
deleted file mode 100644
index 39a7f91b3317..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/branches_for1.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    let a := caller()
-    pop(a)
-    for {  } a { pop(a) } {
-        pop(a)
-    }
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := caller()
-//     pop(caller())
-//     for { } caller() { pop(caller()) }
-//     { pop(caller()) }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/branches_for2.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_for2.yul
deleted file mode 100644
index 59731d61782b..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/branches_for2.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let a := caller()
-    pop(a)
-    for {  } a { pop(a) } {
-        a := address()
-        let c := a
-    }
-    let x := a
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := caller()
-//     pop(caller())
-//     for { } a { pop(address()) }
-//     {
-//         a := address()
-//         let c := address()
-//     }
-//     let x := a
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/branches_if.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_if.yul
deleted file mode 100644
index 0a1e38fa6851..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/branches_if.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let a := caller()
-    let b := address()
-    if b { pop(b) b := a }
-    let c := b
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := caller()
-//     let b := address()
-//     if address()
-//     {
-//         pop(address())
-//         b := caller()
-//     }
-//     let c := b
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/branches_switch.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_switch.yul
deleted file mode 100644
index 442d64654994..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/branches_switch.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a := 1
-    let b := 2
-    switch number()
-    case 1 { b := a }
-    default { let x := a let y := b b := a }
-    pop(add(a, b))
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 1
-//     let b := 2
-//     switch number()
-//     case 1 { b := 1 }
-//     default {
-//         let x := 1
-//         let y := b
-//         b := 1
-//     }
-//     pop(add(1, b))
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/cheap_caller.yul b/test/libyul/yulOptimizerTests/rematerialiser/cheap_caller.yul
deleted file mode 100644
index c3f6ea6a2ac3..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/cheap_caller.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    // The caller opcode is cheap, so inline it,
-    // no matter how often it is used
-    let a := caller()
-    mstore(a, a)
-    mstore(add(a, a), mload(a))
-    sstore(a, sload(a))
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := caller()
-//     mstore(caller(), caller())
-//     mstore(add(caller(), caller()), mload(caller()))
-//     sstore(caller(), sload(caller()))
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul b/test/libyul/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul
deleted file mode 100644
index 7fc927a4a267..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-// Cannot replace `let b := x` by `let b := a` since a is out of scope.
-{
-	let x
-	{
-		let a := sload(0)
-		x := a
-	}
-	let b := x
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let x
-//     {
-//         let a := sload(0)
-//         x := a
-//     }
-//     let b := x
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/do_remat_large_amounts_of_code_if_used_once.yul b/test/libyul/yulOptimizerTests/rematerialiser/do_remat_large_amounts_of_code_if_used_once.yul
deleted file mode 100644
index 6221f11606f4..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/do_remat_large_amounts_of_code_if_used_once.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	let x := add(mul(calldataload(2), calldataload(4)), mul(2, calldatasize()))
-	let b := x
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let x := add(mul(calldataload(2), calldataload(4)), mul(2, calldatasize()))
-//     let b := add(mul(calldataload(2), calldataload(4)), mul(2, calldatasize()))
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/for_break.yul b/test/libyul/yulOptimizerTests/rematerialiser/for_break.yul
deleted file mode 100644
index 2721600038e2..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/for_break.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	let a
-	let b
-	let i := 0
-	for {} lt(i, 10) {i := add(a, b)} {
-		a := origin()
-		b := origin()
-		b := caller()
-		// a=origin, b=caller
-		if callvalue() { break }
-		// a=origin, b=caller
-		a := caller()
-	}
-	mstore(a, b)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a
-//     let b
-//     let i := 0
-//     for { } lt(i, 10) { i := add(caller(), caller()) }
-//     {
-//         a := origin()
-//         b := origin()
-//         b := caller()
-//         if callvalue() { break }
-//         a := caller()
-//     }
-//     mstore(a, b)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/for_continue.yul b/test/libyul/yulOptimizerTests/rematerialiser/for_continue.yul
deleted file mode 100644
index ed80715e9de5..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/for_continue.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	let a
-	let b
-	let i := 0
-	for {  }
-		lt(i, 10)
-		{ i := add(a, b) } // `b` is always known to be caller() but `a` may be origin() or caller().
-	{
-		a := origin()
-		b := origin()
-
-		b := caller()
-		if callvalue() { continue }
-		a := caller()
-	}
-	mstore(a, b)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a
-//     let b
-//     let i := 0
-//     for { } lt(i, 10) { i := add(a, caller()) }
-//     {
-//         a := origin()
-//         b := origin()
-//         b := caller()
-//         if callvalue() { continue }
-//         a := caller()
-//     }
-//     mstore(a, b)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/for_continue_2.yul b/test/libyul/yulOptimizerTests/rematerialiser/for_continue_2.yul
deleted file mode 100644
index a5d8198b0628..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/for_continue_2.yul
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	let a
-	let b
-	let c
-	let i := 0
-	for {  }
-		lt(i, 10)
-		{ i := add(add(a, b), c) } // `b` is always known to be caller() but `a` and `c` may be origin() or caller().
-	{
-		a := origin()
-		b := origin()
-		c := origin()
-
-		b := caller()
-		if callvalue() { continue }
-		a := caller()
-
-		if callvalue() { continue }
-		c := caller()
-	}
-	mstore(a, b)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a
-//     let b
-//     let c
-//     let i := 0
-//     for { } lt(i, 10) { i := add(add(a, caller()), c) }
-//     {
-//         a := origin()
-//         b := origin()
-//         c := origin()
-//         b := caller()
-//         if callvalue() { continue }
-//         a := caller()
-//         if callvalue() { continue }
-//         c := caller()
-//     }
-//     mstore(a, b)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/for_continue_with_assignment_in_post.yul b/test/libyul/yulOptimizerTests/rematerialiser/for_continue_with_assignment_in_post.yul
deleted file mode 100644
index 1b9b3a84ae8d..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/for_continue_with_assignment_in_post.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	let a
-	let b
-	let c
-	let i := 0
-	b := origin()
-	c := origin()
-	for {
-	}
-	lt(i, 10)
-	{
-		i := add(a, b)
-		b := callvalue()
-		c := caller()
-	}
-	{
-		a := origin()
-
-		b := caller()
-		if callvalue() { continue }
-		a := caller()
-	}
-	let x := b // does not rematerialize as b may be either origin() or callvalue() (btw: not caller())
-	let y := c // does not rematerialize as c may be either origin() or caller()
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a
-//     let b
-//     let c
-//     let i := 0
-//     b := origin()
-//     c := origin()
-//     for { }
-//     lt(i, 10)
-//     {
-//         i := add(a, caller())
-//         b := callvalue()
-//         c := caller()
-//     }
-//     {
-//         a := origin()
-//         b := caller()
-//         if callvalue() { continue }
-//         a := caller()
-//     }
-//     let x := b
-//     let y := c
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/large_constant.yul b/test/libyul/yulOptimizerTests/rematerialiser/large_constant.yul
deleted file mode 100644
index b00d50f264cc..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/large_constant.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    // Constants cost depending on their magnitude.
-    // Do not rematerialize large constants.
-    let a := 0xffffffffffffffffffffff
-    mstore(a, a)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 0xffffffffffffffffffffff
-//     mstore(a, a)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/large_constant_used_once.yul b/test/libyul/yulOptimizerTests/rematerialiser/large_constant_used_once.yul
deleted file mode 100644
index cc8d233981b6..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/large_constant_used_once.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    // Constants cost depending on their magnitude.
-    // Do not rematerialize large constants,
-    // unless they are used exactly once.
-    let a := 0xffffffffffffffffffffff
-    mstore(0, a)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 0xffffffffffffffffffffff
-//     mstore(0, 0xffffffffffffffffffffff)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/many_refs_small_cost_loop.yul b/test/libyul/yulOptimizerTests/rematerialiser/many_refs_small_cost_loop.yul
deleted file mode 100644
index 92aacb22973d..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/many_refs_small_cost_loop.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	// Cost of rematerializating x is 1
-	let x := 0xff
-	// Although x has low cost, it is not considered for
-	// rematerialization because it is referenced more than 5 times
-	for {} lt(x, 0x100) {}
-	{
-		let y := add(x, 1)
-		let z := mul(x, 1)
-		let a := div(x, 2)
-		let b := mod(x, 3)
-		let c := sdiv(x, 4)
-	}
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let x := 0xff
-//     for { } lt(x, 0x100) { }
-//     {
-//         let y := add(x, 1)
-//         let z := mul(x, 1)
-//         let a := div(x, 2)
-//         let b := mod(x, 3)
-//         let c := sdiv(x, 4)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/medium_sized_constant.yul b/test/libyul/yulOptimizerTests/rematerialiser/medium_sized_constant.yul
deleted file mode 100644
index fb73227b71bd..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/medium_sized_constant.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    // Constants cost depending on their magnitude.
-    // Rematerialize small constants only if they are
-    // not used too often.
-    // b is used 5 times
-    let b := 2
-    mstore(b, b)
-    mstore(add(b, b), b)
-    // a is used 7 times
-    let a := 1
-    mstore(a, a)
-    mstore(add(a, a), a)
-    mstore(a, mload(a))
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let b := 2
-//     mstore(2, 2)
-//     mstore(add(2, 2), 2)
-//     let a := 1
-//     mstore(a, a)
-//     mstore(add(a, a), a)
-//     mstore(a, mload(a))
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/no_remat_in_loop.yul b/test/libyul/yulOptimizerTests/rematerialiser/no_remat_in_loop.yul
deleted file mode 100644
index 4255445b31b4..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/no_remat_in_loop.yul
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	// origin has zero cost and thus will be rematerialised,
-	// calldataload(0) has low cost and will not be rematerialised
-	let a := origin()
-	let b := calldataload(0)
-	let i := 0
-	let z := calldataload(9)
-	for {} lt(i, 10) {i := add(a, b)} {
-		// This will be rematerialised, because it stays inside
-		// the loop.
-		let x := calldataload(1)
-		mstore(9, x)
-		// No, because again one loop further down.
-		let y := calldataload(2)
-		for {} y {} {
-			// Again no.
-			mstore(12, z)
-		}
-	}
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := origin()
-//     let b := calldataload(0)
-//     let i := 0
-//     let z := calldataload(9)
-//     for { } lt(i, 10) { i := add(origin(), b) }
-//     {
-//         let x := calldataload(1)
-//         mstore(9, calldataload(1))
-//         let y := calldataload(2)
-//         for { } y { }
-//         { mstore(12, z) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/non_movable_function.yul b/test/libyul/yulOptimizerTests/rematerialiser/non_movable_function.yul
deleted file mode 100644
index 0d2d8fdf173d..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/non_movable_function.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    function f(x) -> y {}
-    let a := 1
-    let b := f(a)
-    let c := a
-    mstore(add(a, b), c)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 1
-//     let b := f(1)
-//     let c := 1
-//     mstore(add(1, b), 1)
-//     function f(x) -> y
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/non_movable_instruction.yul b/test/libyul/yulOptimizerTests/rematerialiser/non_movable_instruction.yul
deleted file mode 100644
index dc1d78c74a61..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/non_movable_instruction.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let a := 1
-    let b := mload(a)
-    let c := a
-    mstore(add(a, b), c)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 1
-//     let b := mload(1)
-//     let c := 1
-//     mstore(add(1, b), 1)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/reassign.yul b/test/libyul/yulOptimizerTests/rematerialiser/reassign.yul
deleted file mode 100644
index ef6e12ab6ec2..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/reassign.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let a := extcodesize(0)
-    let b := a
-    let c := b
-    a := 2
-    let d := add(b, c)
-    pop(a) pop(b) pop(c) pop(d)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := extcodesize(0)
-//     let b := a
-//     let c := a
-//     a := 2
-//     let d := add(b, c)
-//     pop(2)
-//     pop(b)
-//     pop(c)
-//     pop(add(b, c))
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/reassignment.yul b/test/libyul/yulOptimizerTests/rematerialiser/reassignment.yul
deleted file mode 100644
index 7af26af635c3..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/reassignment.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let a := 1
-    pop(a)
-    if a { a := 2 }
-    let b := mload(a)
-    pop(b)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 1
-//     pop(1)
-//     if 1 { a := 2 }
-//     let b := mload(a)
-//     pop(b)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/smoke.yul b/test/libyul/yulOptimizerTests/rematerialiser/smoke.yul
deleted file mode 100644
index e7c28202c5bf..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{}
-// ----
-// step: rematerialiser
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/some_refs_small_cost_loop.yul b/test/libyul/yulOptimizerTests/rematerialiser/some_refs_small_cost_loop.yul
deleted file mode 100644
index 071c3c463912..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/some_refs_small_cost_loop.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	// Cost of rematerializating x is 1
-	let x := 0xff
-	// Reference to x is not rematerialized because the reference is in a loop
-	for {} lt(x, 0x100) {}
-	{
-		let y := add(x, 1)
-	}
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let x := 0xff
-//     for { } lt(x, 0x100) { }
-//     { let y := add(x, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/some_refs_small_cost_nested_loop.yul b/test/libyul/yulOptimizerTests/rematerialiser/some_refs_small_cost_nested_loop.yul
deleted file mode 100644
index 3d4d65f0aebe..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/some_refs_small_cost_nested_loop.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	// Cost of rematerializating x is 1
-	let x := 0xff
-	// Although x has a low cost and fewer than 6 references,
-	// its references in a loop are not rematerialized
-	for {} lt(x, 0x100) {}
-	{
-		let y := add(x, 1)
-		for {} lt(x, 0x200) {}
-		{
-			let z := mul(x, 2)
-		}
-	}
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let x := 0xff
-//     for { } lt(x, 0x100) { }
-//     {
-//         let y := add(x, 1)
-//         for { } lt(x, 0x200) { }
-//         { let z := mul(x, 2) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/trivial.yul b/test/libyul/yulOptimizerTests/rematerialiser/trivial.yul
deleted file mode 100644
index 04a797e20fb7..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/trivial.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let a := 1
-    let b := a
-    mstore(0, b)
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := 1
-//     let b := 1
-//     mstore(0, 1)
-// }
diff --git a/test/libyul/yulOptimizerTests/rematerialiser/update_asignment_remat.yul b/test/libyul/yulOptimizerTests/rematerialiser/update_asignment_remat.yul
deleted file mode 100644
index bb5f029803fa..000000000000
--- a/test/libyul/yulOptimizerTests/rematerialiser/update_asignment_remat.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-// We cannot substitute `a` in `let b := a`
-{
-	let a := extcodesize(0)
-	a := mul(a, 2)
-	let b := a
-}
-// ----
-// step: rematerialiser
-//
-// {
-//     let a := extcodesize(0)
-//     a := mul(a, 2)
-//     let b := a
-// }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul b/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
deleted file mode 100644
index 875bececd641..000000000000
--- a/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    if mul(add(calldataload(0), 2), 3) {
-        for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) } {
-            let b := mul(add(a, 2), 4)
-            sstore(b, mul(b, 2))
-        }
-    }
-}
-// ----
-// step: splitJoin
-//
-// {
-//     {
-//         if mul(add(calldataload(0), 2), 3)
-//         {
-//             for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) }
-//             {
-//                 let b := mul(add(a, 2), 4)
-//                 sstore(b, mul(b, 2))
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/functions.yul b/test/libyul/yulOptimizerTests/splitJoin/functions.yul
deleted file mode 100644
index 08e741e8e9fb..000000000000
--- a/test/libyul/yulOptimizerTests/splitJoin/functions.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let x := f(0)
-    function f(y) -> r {
-        r := mload(mul(6, add(y, 0x20)))
-    }
-    for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) } {
-        let b := mul(add(a, f(a)), 4)
-        sstore(b, mul(b, 2))
-    }
-}
-// ----
-// step: splitJoin
-//
-// {
-//     {
-//         let x := f(0)
-//         for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) }
-//         {
-//             let b := mul(add(a, f(a)), 4)
-//             sstore(b, mul(b, 2))
-//         }
-//     }
-//     function f(y) -> r
-//     {
-//         r := mload(mul(6, add(y, 0x20)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/smoke.yul b/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
deleted file mode 100644
index 86e53ab1485d..000000000000
--- a/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{}
-// ----
-// step: splitJoin
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul b/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
deleted file mode 100644
index 19b3ba44ea02..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    let a := mload(0)
-    let b := mload(1)
-    for {
-    }
-    lt(mload(a),mload(b))
-    {
-       a := mload(b)
-    }
-    {
-        b := mload(a)
-        a := mload(b)
-        a := mload(b)
-        a := mload(b)
-        b := mload(a)
-    }
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         let b := mload(1)
-//         for { } lt(mload(a), mload(b)) { a := mload(b) }
-//         {
-//             let b_4 := mload(a)
-//             a := mload(b_4)
-//             b := mload(a)
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
deleted file mode 100644
index 1bfd89cd8384..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let a := mload(0)
-    a := mload(1)
-    a := mload(2)
-    a := mload(3)
-    a := mload(4)
-    mstore(a, 0)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a_5 := mload(4)
-//         mstore(a_5, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
deleted file mode 100644
index c0f3a4242a82..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let a := mload(0)
-    if mload(1)
-    {
-        a := mload(1)
-        a := mload(2)
-        a := mload(3)
-    }
-    mstore(a, 0)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         if mload(1) { a := mload(3) }
-//         mstore(a, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul
deleted file mode 100644
index e3a671028207..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    let a := mload(0)
-    let b := mload(1)
-    if mload(2) {
-        a := mload(b)
-        b := mload(a)
-        a := mload(b)
-        b := mload(a)
-    }
-    mstore(a, b)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         let b := mload(1)
-//         if mload(2)
-//         {
-//             let a_3 := mload(b)
-//             let b_4 := mload(a_3)
-//             a := mload(b_4)
-//             b := mload(a)
-//         }
-//         mstore(a, b)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul
deleted file mode 100644
index 89f3acaa63c9..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    let a := mload(0)
-    let b := mload(1)
-    switch mload(2)
-    case 0 {
-        a := mload(b)
-        b := mload(a)
-        a := mload(b)
-        b := mload(a)
-    }
-    default {
-        b := mload(a)
-        a := mload(b)
-        b := mload(a)
-        a := mload(b)
-    }
-    mstore(a, b)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         let b := mload(1)
-//         switch mload(2)
-//         case 0 {
-//             let a_3 := mload(b)
-//             let b_4 := mload(a_3)
-//             a := mload(b_4)
-//             b := mload(a)
-//         }
-//         default {
-//             let b_7 := mload(a)
-//             let a_8 := mload(b_7)
-//             b := mload(a_8)
-//             a := mload(b)
-//         }
-//         mstore(a, b)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
deleted file mode 100644
index b210c09c0e20..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let a := mload(0)
-    switch mload(1)
-    case 0 {
-        a := mload(1)
-        a := mload(2)
-        a := mload(3)
-    }
-    default {
-        a := mload(4)
-        a := mload(5)
-        a := mload(6)
-    }
-    mstore(a, 0)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         switch mload(1)
-//         case 0 { a := mload(3) }
-//         default { a := mload(6) }
-//         mstore(a, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul b/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
deleted file mode 100644
index b2979e76d2e8..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let a := mload(0)
-    a := mload(1)
-    mstore(a, 0)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a_2 := mload(1)
-//         mstore(a_2, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul
deleted file mode 100644
index 71823f105afb..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := mload(0)
-    if mload(1)
-    {
-        a := mload(1)
-    }
-    mstore(a, 0)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         if mload(1) { a := mload(1) }
-//         mstore(a, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul
deleted file mode 100644
index 8c53bd28ab71..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a := mload(0)
-    switch mload(1)
-    case 0 {
-        a := mload(1)
-    }
-    default {
-        a := mload(2)
-    }
-    mstore(a, 0)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a := mload(0)
-//         switch mload(1)
-//         case 0 { a := mload(1) }
-//         default { a := mload(2) }
-//         mstore(a, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul b/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul
deleted file mode 100644
index 21dfdf2cee72..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-     function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
-     {
-         if iszero(slt(add(offset_12, 0x1f), end_13))
-         {
-             revert(0, 0)
-         }
-         length_15 := calldataload(offset_12)
-         if gt(length_15, 0xffffffffffffffff)
-         {
-             revert(0, 0)
-         }
-         arrayPos_14 := add(offset_12, 0x20)
-         if gt(add(add(offset_12, length_15), 0x20), end_13)
-         {
-             revert(0, 0)
-         }
-     }
-     // prevent removal of the function
-     let a,b := abi_decode_t_bytes_calldata_ptr(mload(0),mload(1))
-     mstore(a,b)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a, b := abi_decode_t_bytes_calldata_ptr(mload(0), mload(1))
-//         mstore(a, b)
-//     }
-//     function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
-//     {
-//         if iszero(slt(add(offset_12, 0x1f), end_13)) { revert(0, 0) }
-//         length_15 := calldataload(offset_12)
-//         if gt(length_15, 0xffffffffffffffff) { revert(0, 0) }
-//         arrayPos_14 := add(offset_12, 0x20)
-//         if gt(add(add(offset_12, length_15), 0x20), end_13) { revert(0, 0) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul b/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul
deleted file mode 100644
index 1205993567b2..000000000000
--- a/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a := mload(0)
-    let b := mload(a)
-    a := mload(b)
-    b := mload(a)
-    a := mload(b)
-    b := mload(a)
-    mstore(a, b)
-}
-// ----
-// step: ssaAndBack
-//
-// {
-//     {
-//         let a_1 := mload(0)
-//         let b_2 := mload(a_1)
-//         let a_3 := mload(b_2)
-//         let b_4 := mload(a_3)
-//         let a_5 := mload(b_4)
-//         let b_6 := mload(a_5)
-//         mstore(a_5, b_6)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaPlusCleanup/control_structures.yul b/test/libyul/yulOptimizerTests/ssaPlusCleanup/control_structures.yul
deleted file mode 100644
index 104dc2822ea0..000000000000
--- a/test/libyul/yulOptimizerTests/ssaPlusCleanup/control_structures.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    function copy(from, to) -> length {
-        length := mload(from)
-        mstore(to, length)
-        from := add(from, 0x20)
-        to := add(to, 0x20)
-        let x := 1
-        for {  } lt(x, length) { x := add(x, 0x20) } {
-            mstore(add(to, x), mload(add(from, x)))
-        }
-    }
-}
-// ----
-// step: ssaPlusCleanup
-//
-// {
-//     function copy(from, to) -> length
-//     {
-//         let from_6 := from
-//         let to_7 := to
-//         let length_1 := mload(from_6)
-//         length := length_1
-//         mstore(to_7, length_1)
-//         let from_2 := add(from_6, 0x20)
-//         let to_3 := add(to_7, 0x20)
-//         let x_4 := 1
-//         let x := x_4
-//         for { }
-//         lt(x, length_1)
-//         {
-//             let x_9 := x
-//             let x_5 := add(x_9, 0x20)
-//             x := x_5
-//         }
-//         {
-//             let x_8 := x
-//             mstore(add(to_3, x_8), mload(add(from_2, x_8)))
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaPlusCleanup/multi_reassign.yul b/test/libyul/yulOptimizerTests/ssaPlusCleanup/multi_reassign.yul
deleted file mode 100644
index 85e86e005efa..000000000000
--- a/test/libyul/yulOptimizerTests/ssaPlusCleanup/multi_reassign.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := 1
-    a := 2
-    a := 3
-    a := 4
-    mstore(0, a)
-}
-// ----
-// step: ssaPlusCleanup
-//
-// {
-//     let a_1 := 1
-//     let a := a_1
-//     let a_2 := 2
-//     let a_3 := 3
-//     let a_4 := 4
-//     mstore(0, a_4)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaPlusCleanup/multi_reassign_with_use.yul b/test/libyul/yulOptimizerTests/ssaPlusCleanup/multi_reassign_with_use.yul
deleted file mode 100644
index 75a045d05c93..000000000000
--- a/test/libyul/yulOptimizerTests/ssaPlusCleanup/multi_reassign_with_use.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := 1
-    a := add(a, 2)
-    a := add(a, 3)
-    a := mload(add(a, 4))
-    mstore(0, a)
-}
-// ----
-// step: ssaPlusCleanup
-//
-// {
-//     let a_1 := 1
-//     let a := a_1
-//     let a_2 := add(a_1, 2)
-//     let a_3 := add(a_2, 3)
-//     let a_4 := mload(add(a_3, 4))
-//     mstore(0, a_4)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaReverser/abi_example.yul b/test/libyul/yulOptimizerTests/ssaReverser/abi_example.yul
deleted file mode 100644
index 1c79777d259d..000000000000
--- a/test/libyul/yulOptimizerTests/ssaReverser/abi_example.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
-    {
-        if iszero(slt(add(offset_12, 0x1f), end_13))
-        {
-            revert(0, 0)
-        }
-        let length_15_1 := calldataload(offset_12)
-        length_15 := length_15_1
-        if gt(length_15_1, 0xffffffffffffffff)
-        {
-            revert(0, 0)
-        }
-        let arrayPos_14_2 := add(offset_12, 0x20)
-        arrayPos_14 := arrayPos_14_2
-        if gt(add(arrayPos_14_2, mul(length_15_1, 0x1)), end_13)
-        {
-            revert(0, 0)
-        }
-    }
-}
-// ----
-// step: ssaReverser
-//
-// {
-//     function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
-//     {
-//         if iszero(slt(add(offset_12, 0x1f), end_13)) { revert(0, 0) }
-//         length_15 := calldataload(offset_12)
-//         let length_15_1 := length_15
-//         if gt(length_15_1, 0xffffffffffffffff) { revert(0, 0) }
-//         arrayPos_14 := add(offset_12, 0x20)
-//         let arrayPos_14_2 := arrayPos_14
-//         if gt(add(arrayPos_14_2, mul(length_15_1, 0x1)), end_13) { revert(0, 0) }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaReverser/self_assign.yul b/test/libyul/yulOptimizerTests/ssaReverser/self_assign.yul
deleted file mode 100644
index 1985f6c0888e..000000000000
--- a/test/libyul/yulOptimizerTests/ssaReverser/self_assign.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let a := calldataload(0)
-    a := a
-}
-// ----
-// step: ssaReverser
-//
-// { let a := calldataload(0) }
diff --git a/test/libyul/yulOptimizerTests/ssaReverser/simple.yul b/test/libyul/yulOptimizerTests/ssaReverser/simple.yul
deleted file mode 100644
index be2cfe9d75d3..000000000000
--- a/test/libyul/yulOptimizerTests/ssaReverser/simple.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	let a := mload(1)
-    let a_1 := mload(0)
-    a := a_1
-    mstore(a_1, 0)
-}
-// ----
-// step: ssaReverser
-//
-// {
-//     let a := mload(1)
-//     a := mload(0)
-//     let a_1 := a
-//     mstore(a_1, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/branches.yul b/test/libyul/yulOptimizerTests/ssaTransform/branches.yul
deleted file mode 100644
index 81f82451f33f..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/branches.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  let a := 1
-  a := add(a, 1)
-  if a {
-    a := add(a, 1)
-  }
-  a := add(a, 1)
-  mstore(a, 1)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := 1
-//     let a := a_1
-//     let a_2 := add(a_1, 1)
-//     a := a_2
-//     if a_2
-//     {
-//         let a_3 := add(a_2, 1)
-//         a := a_3
-//     }
-//     let a_5 := a
-//     let a_4 := add(a_5, 1)
-//     a := a_4
-//     mstore(a_4, 1)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/for_def_in_init.yul b/test/libyul/yulOptimizerTests/ssaTransform/for_def_in_init.yul
deleted file mode 100644
index 40fce8613e27..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/for_def_in_init.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  for { let x := 0 } 1 { x := 2 } {
-    for { let y := 0 } 1 { y := 6 } {
-    }
-  }
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let x_1 := 0
-//     let x := x_1
-//     for { }
-//     1
-//     {
-//         let x_7 := x
-//         let x_2 := 2
-//         x := x_2
-//     }
-//     {
-//         let x_5 := x
-//         let y_3 := 0
-//         let y := y_3
-//         for { }
-//         1
-//         {
-//             let y_6 := y
-//             let y_4 := 6
-//             y := y_4
-//         }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_body.yul b/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_body.yul
deleted file mode 100644
index 8894a789ef91..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_body.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    let a := mload(0)
-    for { mstore(0, a) } a { mstore(0, a) }
-    {
-        a := add(a, 3)
-    }
-    mstore(0, a)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     mstore(0, a_1)
-//     for { }
-//     a
-//     {
-//         let a_4 := a
-//         mstore(0, a_4)
-//     }
-//     {
-//         let a_3 := a
-//         let a_2 := add(a_3, 3)
-//         a := a_2
-//     }
-//     let a_5 := a
-//     mstore(0, a_5)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_init.yul b/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_init.yul
deleted file mode 100644
index d3a095285d45..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_init.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let a := mload(0)
-    for { a := add(a, 3) } a { mstore(0, a) }
-    {
-        mstore(0, a)
-    }
-    mstore(0, a)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     let a_2 := add(a_1, 3)
-//     a := a_2
-//     for { } a_2 { mstore(0, a_2) }
-//     { mstore(0, a_2) }
-//     mstore(0, a_2)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_post.yul b/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_post.yul
deleted file mode 100644
index cec17e553085..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/for_reassign_post.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    let a := mload(0)
-    for { mstore(0, a) } a { a := add(a, 3) }
-    {
-        mstore(0, a)
-    }
-    mstore(0, a)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     mstore(0, a_1)
-//     for { }
-//     a
-//     {
-//         let a_4 := a
-//         let a_2 := add(a_4, 3)
-//         a := a_2
-//     }
-//     {
-//         let a_3 := a
-//         mstore(0, a_3)
-//     }
-//     let a_5 := a
-//     mstore(0, a_5)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/for_simple.yul b/test/libyul/yulOptimizerTests/ssaTransform/for_simple.yul
deleted file mode 100644
index 846b22c6c631..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/for_simple.yul
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    let a := mload(0)
-    a := add(a, 1)
-    if a {
-        a := add(a, 2)
-    }
-    {
-        a := add(a, 4)
-    }
-    for { a := add(a, 3) } a { a := add(a, 6) }
-    {
-        a := add(a, 12)
-    }
-    a := add(a, 8)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     let a_2 := add(a_1, 1)
-//     a := a_2
-//     if a_2
-//     {
-//         let a_3 := add(a_2, 2)
-//         a := a_3
-//     }
-//     let a_9 := a
-//     {
-//         let a_4 := add(a_9, 4)
-//         a := a_4
-//     }
-//     let a_10 := a
-//     let a_5 := add(a_10, 3)
-//     a := a_5
-//     for { }
-//     a
-//     {
-//         let a_12 := a
-//         let a_6 := add(a_12, 6)
-//         a := a_6
-//     }
-//     {
-//         let a_11 := a
-//         let a_7 := add(a_11, 12)
-//         a := a_7
-//     }
-//     let a_13 := a
-//     let a_8 := add(a_13, 8)
-//     a := a_8
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/function.yul b/test/libyul/yulOptimizerTests/ssaTransform/function.yul
deleted file mode 100644
index d41c18b04c60..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/function.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  function f(a, b) -> c, d {
-    b := add(b, a)
-    c := add(c, b)
-    d := add(d, c)
-    a := add(a, d)
-  }
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     function f(a, b) -> c, d
-//     {
-//         let b_5 := b
-//         let a_6 := a
-//         let b_1 := add(b_5, a_6)
-//         b := b_1
-//         let c_2 := add(c, b_1)
-//         c := c_2
-//         let d_3 := add(d, c_2)
-//         d := d_3
-//         let a_4 := add(a_6, d_3)
-//         a := a_4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/multi_assign.yul b/test/libyul/yulOptimizerTests/ssaTransform/multi_assign.yul
deleted file mode 100644
index ff4a0eb1de8a..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/multi_assign.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  let a := mload(0)
-  let b := mload(1)
-  a, b := f()
-  sstore(a, b)
-  a := mload(5)
-  b := mload(a)
-  function f() -> x, y {}
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     let b_2 := mload(1)
-//     let b := b_2
-//     let a_3, b_4 := f()
-//     a := a_3
-//     b := b_4
-//     sstore(a_3, b_4)
-//     let a_5 := mload(5)
-//     a := a_5
-//     let b_6 := mload(a_5)
-//     b := b_6
-//     function f() -> x, y
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/multi_decl.yul b/test/libyul/yulOptimizerTests/ssaTransform/multi_decl.yul
deleted file mode 100644
index 06847711e465..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/multi_decl.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  let x, y := f(1, 2)
-  x := mload(y)
-  y := mload(x)
-  let a, b := f(x, y)
-  sstore(a, b)
-  function f(t, v) -> w, z {}
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let x_1, y_2 := f(1, 2)
-//     let x := x_1
-//     let y := y_2
-//     let x_3 := mload(y_2)
-//     x := x_3
-//     let y_4 := mload(x_3)
-//     y := y_4
-//     let a, b := f(x_3, y_4)
-//     sstore(a, b)
-//     function f(t, v) -> w, z
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/nested.yul b/test/libyul/yulOptimizerTests/ssaTransform/nested.yul
deleted file mode 100644
index e075f06a2462..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/nested.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  let a := 1
-  a := 2
-  let b := 3
-  b := 4
-  {
-    // b is not reassigned here
-    a := 3
-    a := 4
-  }
-  a := add(b, a)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := 1
-//     let a := a_1
-//     let a_2 := 2
-//     a := a_2
-//     let b_3 := 3
-//     let b := b_3
-//     let b_4 := 4
-//     b := b_4
-//     {
-//         let a_5 := 3
-//         a := a_5
-//         let a_6 := 4
-//         a := a_6
-//     }
-//     let a_8 := a
-//     let a_7 := add(b_4, a_8)
-//     a := a_7
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/nested_reassign.yul b/test/libyul/yulOptimizerTests/ssaTransform/nested_reassign.yul
deleted file mode 100644
index 32d74f180be1..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/nested_reassign.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    let a
-    let b
-    let x
-    if a {
-        if b {
-            x := 2
-        }
-    }
-    // Should create new SSA variables for x here,
-    // but not above because end of block
-    mstore(0, x)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a
-//     let b
-//     let x_1
-//     let x := x_1
-//     if a
-//     {
-//         if b
-//         {
-//             let x_2 := 2
-//             x := x_2
-//         }
-//     }
-//     let x_3 := x
-//     mstore(0, x_3)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/notransform.yul b/test/libyul/yulOptimizerTests/ssaTransform/notransform.yul
deleted file mode 100644
index b41998c59235..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/notransform.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  let a := 1
-  // this should not be transformed
-  let b := add(a, 2)
-  let c
-  mstore(c, 0)
-  c := add(a, b)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a := 1
-//     let b := add(a, 2)
-//     let c_1
-//     let c := c_1
-//     mstore(c_1, 0)
-//     let c_2 := add(a, b)
-//     c := c_2
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/simple.yul b/test/libyul/yulOptimizerTests/ssaTransform/simple.yul
deleted file mode 100644
index b52ec0c0504e..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/simple.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  let a := 1
-  a := 2
-  a := 3
-  a := 4
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := 1
-//     let a := a_1
-//     let a_2 := 2
-//     a := a_2
-//     let a_3 := 3
-//     a := a_3
-//     let a_4 := 4
-//     a := a_4
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/switch.yul b/test/libyul/yulOptimizerTests/ssaTransform/switch.yul
deleted file mode 100644
index 8604be0e32ea..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/switch.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    let a := mload(0)
-    // This could be more efficient:
-    // all cases could use the value of the variable from just before
-    // the switch and not just the first
-    switch a
-    case 0 { a := add(a, 4) }
-    default { a := add(a, 8) }
-    mstore(0, a)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     switch a_1
-//     case 0 {
-//         let a_2 := add(a_1, 4)
-//         a := a_2
-//     }
-//     default {
-//         let a_4 := a
-//         let a_3 := add(a_4, 8)
-//         a := a_3
-//     }
-//     let a_5 := a
-//     mstore(0, a_5)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/switch_reassign.yul b/test/libyul/yulOptimizerTests/ssaTransform/switch_reassign.yul
deleted file mode 100644
index 3cf38ef38869..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/switch_reassign.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a := mload(0)
-    switch a
-    case 0 { a := add(a, 4) }
-    default { }
-    // should still create an SSA variable for a
-    mstore(0, a)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := mload(0)
-//     let a := a_1
-//     switch a_1
-//     case 0 {
-//         let a_2 := add(a_1, 4)
-//         a := a_2
-//     }
-//     default { }
-//     let a_3 := a
-//     mstore(0, a_3)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/typed.yul b/test/libyul/yulOptimizerTests/ssaTransform/typed.yul
deleted file mode 100644
index 4b1aa164371c..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/typed.yul
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  let b:bool := true
-  let c:bool := false
-  c := b
-  b := false
-
-  let a:u256 := 1
-  a := add(a, 1)
-  if c {
-    a := add(a, 1)
-  }
-  a := add(a, 1)
-  mstore(a, 1)
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: ssaTransform
-//
-// {
-//     let b_1:bool := true
-//     let b:bool := b_1
-//     let c_2:bool := false
-//     let c:bool := c_2
-//     let c_3:bool := b_1
-//     c := c_3
-//     let b_4:bool := false
-//     b := b_4
-//     let a_5 := 1
-//     let a := a_5
-//     let a_6 := add(a_5, 1)
-//     a := a_6
-//     if c_3
-//     {
-//         let a_7 := add(a_6, 1)
-//         a := a_7
-//     }
-//     let a_9 := a
-//     let a_8 := add(a_9, 1)
-//     a := a_8
-//     mstore(a_8, 1)
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul b/test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul
deleted file mode 100644
index 596f56cb0369..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  let b:bool := true
-  let c:bool := false
-  for {} b {} {
-      c := true
-  }
-  let d: bool := c
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: ssaTransform
-//
-// {
-//     let b:bool := true
-//     let c_1:bool := false
-//     let c:bool := c_1
-//     for { } b { }
-//     {
-//         let c_3:bool := c
-//         let c_2:bool := true
-//         c := c_2
-//     }
-//     let c_4:bool := c
-//     let d:bool := c_4
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul b/test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul
deleted file mode 100644
index b87b5dbbc3e5..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  let b:bool := true
-  let c:bool := false
-  switch b
-  case true { c := true}
-  case false { }
-  let d: bool := c
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: ssaTransform
-//
-// {
-//     let b:bool := true
-//     let c_1:bool := false
-//     let c:bool := c_1
-//     switch b
-//     case true {
-//         let c_2:bool := true
-//         c := c_2
-//     }
-//     case false { }
-//     let c_3:bool := c
-//     let d:bool := c_3
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/used.yul b/test/libyul/yulOptimizerTests/ssaTransform/used.yul
deleted file mode 100644
index cbd0cdb25b0b..000000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/used.yul
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  let a := 1
-  mstore(a, 0)
-  a := 2
-  mstore(a, 0)
-  {
-    mstore(a, 0)
-    a := 3
-    mstore(a, 0)
-    a := 4
-    mstore(a, 0)
-  }
-  mstore(a, 0)
-  a := 4
-  mstore(a, 0)
-}
-// ----
-// step: ssaTransform
-//
-// {
-//     let a_1 := 1
-//     let a := a_1
-//     mstore(a_1, 0)
-//     let a_2 := 2
-//     a := a_2
-//     mstore(a_2, 0)
-//     {
-//         mstore(a_2, 0)
-//         let a_3 := 3
-//         a := a_3
-//         mstore(a_3, 0)
-//         let a_4 := 4
-//         a := a_4
-//         mstore(a_4, 0)
-//     }
-//     let a_6 := a
-//     mstore(a_6, 0)
-//     let a_5 := 4
-//     a := a_5
-//     mstore(a_5, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
deleted file mode 100644
index 3633b3f36cec..000000000000
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  let x := 8
-  let y := calldataload(calldataload(9))
-  mstore(y, add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(y, 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// step: stackCompressor
-//
-// {
-//     {
-//         mstore(calldataload(calldataload(9)), add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(calldataload(calldataload(9)), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
deleted file mode 100644
index a51c39f4f3b7..000000000000
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  let x := 8
-  function f() {
-    let y := calldataload(calldataload(9))
-    mstore(y, add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(y, 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
-  }
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// step: stackCompressor
-//
-// {
-//     function f()
-//     {
-//         mstore(calldataload(calldataload(9)), add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(calldataload(calldataload(9)), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul b/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul
deleted file mode 100644
index 1a178abf0958..000000000000
--- a/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  let x := 8
-  function f() { let y := 9 }
-}
-// ----
-// step: stackCompressor
-//
-// {
-//     { let x := 8 }
-//     function f()
-//     { let y := 9 }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul b/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
deleted file mode 100644
index 0556a2220284..000000000000
--- a/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    {
-        let _13_71 := 1
-        let _17_72 := msize()
-        let _22_75 := msize()
-        let _25_76 := msize()
-        let _30_80 := msize()
-        let _32_81 := msize()
-        // This should not be removed
-        pop(keccak256(1, 2))
-        let _104 := gt(not(_17_72), _13_71)
-        let _105 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-        mstore(lt(or(gt(_13_71, or(or(gt(or(or(or(gt(or(gt(_105, _32_81), _13_71), _30_80), lt(or(_13_71, add(_25_76, _105)), _13_71)), _22_75), _13_71), _13_71), _104), _13_71)), _13_71), _13_71), _13_71)
-        foo_singlereturn_1()
-    }
-    function foo_singlereturn_1()
-    {
-        extcodecopy(1, msize(), 1, 1)
-    }
-}
-// ====
-// EVMVersion: =homestead
-// ----
-// step: stackCompressor
-//
-// {
-//     {
-//         let _17_72 := msize()
-//         let _22_75 := msize()
-//         let _25_76 := msize()
-//         let _30_80 := msize()
-//         let _32_81 := msize()
-//         pop(keccak256(1, 2))
-//         let _105 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//         mstore(lt(or(gt(1, or(or(gt(or(or(or(gt(or(gt(_105, _32_81), 1), _30_80), lt(or(1, add(_25_76, _105)), 1)), _22_75), 1), 1), gt(not(_17_72), 1)), 1)), 1), 1), 1)
-//         foo_singlereturn_1()
-//     }
-//     function foo_singlereturn_1()
-//     { extcodecopy(1, msize(), 1, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/cycle.yul
deleted file mode 100644
index 37da7f9b83d6..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle.yul
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    mstore(0x40, memoryguard(128))
-    sstore(0, g(sload(3)))
-    function g(x) -> v {
-        v := f()
-    }
-    function f() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        sstore(23, g(sload(42)))
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(128))
-//     sstore(0, g(sload(3)))
-//     function g(x) -> v
-//     { v := f() }
-//     function f() -> v_1
-//     {
-//         let a1 := calldataload(mul(1, 4))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         a1 := calldataload(mul(0, 4))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, a1)
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), a1)
-//         sstore(23, g(sload(42)))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_after.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_after.yul
deleted file mode 100644
index 4480d012e69d..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_after.yul
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    mstore(0x40, memoryguard(128))
-    sstore(0, f())
-    function f() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        sstore(23, h())
-    }
-    function h() -> v {
-        v := h()
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     sstore(0, f())
-//     function f() -> v
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//         sstore(23, h())
-//     }
-//     function h() -> v_1
-//     { v_1 := h() }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_after_2.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_after_2.yul
deleted file mode 100644
index 4468165f1e55..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_after_2.yul
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    mstore(0x40, memoryguard(128))
-    sstore(0, f())
-    function f() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        sstore(23, h())
-    }
-    function h() -> v {
-        v := i()
-    }
-    function i() -> v {
-        v := h()
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     sstore(0, f())
-//     function f() -> v
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//         sstore(23, h())
-//     }
-//     function h() -> v_1
-//     { v_1 := i() }
-//     function i() -> v_2
-//     { v_2 := h() }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before.yul
deleted file mode 100644
index e6819ea903e7..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before.yul
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    mstore(0x40, memoryguard(128))
-    sstore(0, g(sload(3)))
-    function g(x) -> v {
-      switch lt(x, 3)
-      case 0 {
-          v := f()
-      }
-      case 1 {
-          v := g(sub(x,1))
-      }
-    }
-    function f() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     sstore(0, g(sload(3)))
-//     function g(x) -> v
-//     {
-//         switch lt(x, 3)
-//         case 0 { v := f() }
-//         case 1 { v := g(sub(x, 1)) }
-//     }
-//     function f() -> v_1
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before_2.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before_2.yul
deleted file mode 100644
index a0259b1800ef..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before_2.yul
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    mstore(0x40, memoryguard(128))
-    sstore(0, g(sload(3)))
-    function g(x) -> v {
-        switch lt(x, 3)
-        case 0 {
-            v := h(x)
-        }
-        case 1 {
-            v := g(sub(x,f()))
-        }
-    }
-    function h(x) -> v {
-        v := g(x)
-    }
-    function f() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     sstore(0, g(sload(3)))
-//     function g(x) -> v
-//     {
-//         switch lt(x, 3)
-//         case 0 { v := h(x) }
-//         case 1 { v := g(sub(x, f())) }
-//     }
-//     function h(x_1) -> v_2
-//     { v_2 := g(x_1) }
-//     function f() -> v_3
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before_after.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before_after.yul
deleted file mode 100644
index f5c068d5e382..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/cycle_before_after.yul
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    mstore(0x40, memoryguard(128))
-    sstore(0, g(sload(0)))
-    function g(x) -> v {
-      switch lt(x, 3)
-      case 0 {
-          v := f()
-      }
-      case 1 {
-          v := g(sub(x,1))
-      }
-    }
-    function f() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        sstore(23, h())
-    }
-    function h() -> v {
-        v := h()
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     mstore(0x40, memoryguard(0xa0))
-//     sstore(0, g(sload(0)))
-//     function g(x) -> v
-//     {
-//         switch lt(x, 3)
-//         case 0 { v := f() }
-//         case 1 { v := g(sub(x, 1)) }
-//     }
-//     function f() -> v_1
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//         sstore(23, h())
-//     }
-//     function h() -> v_2
-//     { v_2 := h() }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/function_arg.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/function_arg.yul
deleted file mode 100644
index 27f0705157c4..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/function_arg.yul
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        sstore(0, f(0))
-    }
-    function f(a1) -> v {
-	let a2 := calldataload(mul(2,4))
-	let a3 := calldataload(mul(3,4))
-	let a4 := calldataload(mul(4,4))
-	let a5 := calldataload(mul(5,4))
-	let a6 := calldataload(mul(6,4))
-	let a7 := calldataload(mul(7,4))
-	let a8 := calldataload(mul(8,4))
-	let a9 := calldataload(mul(9,4))
-	let a10 := calldataload(mul(10,4))
-	let a11 := calldataload(mul(11,4))
-	let a12 := calldataload(mul(12,4))
-	let a13 := calldataload(mul(13,4))
-	let a14 := calldataload(mul(14,4))
-	let a15 := calldataload(mul(15,4))
-	let a16 := calldataload(mul(16,4))
-	let a17 := calldataload(mul(17,4))
-	sstore(0, a1)
-	sstore(mul(17,4), a17)
-	sstore(mul(16,4), a16)
-	sstore(mul(15,4), a15)
-	sstore(mul(14,4), a14)
-	sstore(mul(13,4), a13)
-	sstore(mul(12,4), a12)
-	sstore(mul(11,4), a11)
-	sstore(mul(10,4), a10)
-	sstore(mul(9,4), a9)
-	sstore(mul(8,4), a8)
-	sstore(mul(7,4), a7)
-	sstore(mul(6,4), a6)
-	sstore(mul(5,4), a5)
-	sstore(mul(4,4), a4)
-	sstore(mul(3,4), a3)
-	sstore(mul(2,4), a2)
-	sstore(mul(1,4), a1)
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0xa0))
-//         sstore(0, f(0))
-//     }
-//     function f(a1) -> v
-//     {
-//         mstore(0x80, a1)
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/stub.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/stub.yul
deleted file mode 100644
index 9f5001c87686..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/stub.yul
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        sstore(g(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17), f())
-    }
-    function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17) -> v {
-        v := add(b16, b17)
-    }
-    function f() -> v {
-	let a1 := calldataload(mul(1,4))
-	let a2 := calldataload(mul(2,4))
-	let a3 := calldataload(mul(3,4))
-	let a4 := calldataload(mul(4,4))
-	let a5 := calldataload(mul(5,4))
-	let a6 := calldataload(mul(6,4))
-	let a7 := calldataload(mul(7,4))
-	let a8 := calldataload(mul(8,4))
-	let a9 := calldataload(mul(9,4))
-	a1 := calldataload(mul(0,4))
-	let a10 := calldataload(mul(10,4))
-	let a11 := calldataload(mul(11,4))
-	let a12 := calldataload(mul(12,4))
-	let a13 := calldataload(mul(13,4))
-	let a14 := calldataload(mul(14,4))
-	let a15 := calldataload(mul(15,4))
-	let a16 := calldataload(mul(16,4))
-	let a17 := calldataload(mul(17,4))
-	sstore(0, a1)
-	sstore(mul(17,4), a17)
-	sstore(mul(16,4), a16)
-	sstore(mul(15,4), a15)
-	sstore(mul(14,4), a14)
-	sstore(mul(13,4), a13)
-	sstore(mul(12,4), a12)
-	sstore(mul(11,4), a11)
-	sstore(mul(10,4), a10)
-	sstore(mul(9,4), a9)
-	sstore(mul(8,4), a8)
-	sstore(mul(7,4), a7)
-	sstore(mul(6,4), a6)
-	sstore(mul(5,4), a5)
-	sstore(mul(4,4), a4)
-	sstore(mul(3,4), a3)
-	sstore(mul(2,4), a2)
-	sstore(mul(1,4), a1)
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0xa0))
-//         sstore(g(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17), f())
-//     }
-//     function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17) -> v
-//     { v := add(b16, b17) }
-//     function f() -> v_1
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(mul(4, 4))
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, 4), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul
deleted file mode 100644
index 02614c492db8..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        sstore(g(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29), 0)
-    }
-    function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29) -> v {
-	sstore(0, b14)
-	sstore(1, b15)
-	sstore(2, b16)
-	sstore(3, b17)
-	sstore(4, b18)
-	sstore(5, b19)
-	sstore(6, b29)
-        v := add(b1,b29)
-    }
-
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x02c0))
-//         sstore(g(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29), 0)
-//     }
-//     function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29) -> v
-//     {
-//         mstore(0x02a0, b1)
-//         mstore(0x0280, b2)
-//         mstore(0x0260, b3)
-//         mstore(0x0240, b4)
-//         mstore(0x0220, b5)
-//         mstore(0x0200, b6)
-//         mstore(0x01e0, b7)
-//         mstore(0x01c0, b8)
-//         mstore(0x01a0, b9)
-//         mstore(0x0180, b10)
-//         mstore(0x0160, b11)
-//         mstore(0x0140, b12)
-//         mstore(0x0120, b13)
-//         mstore(0x0100, b14)
-//         mstore(0xe0, b17)
-//         mstore(0xc0, b18)
-//         mstore(0xa0, b19)
-//         mstore(0x80, b29)
-//         sstore(0, mload(0x0100))
-//         sstore(1, b15)
-//         sstore(2, b16)
-//         sstore(3, mload(0xe0))
-//         sstore(4, mload(0xc0))
-//         sstore(5, mload(0xa0))
-//         sstore(6, mload(0x80))
-//         v := add(mload(0x02a0), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul
deleted file mode 100644
index 9ce9be70ab88..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        sstore(g(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29, 30), 0)
-    }
-    function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30) -> v {
-	sstore(0, b14)
-	sstore(1, b15)
-	sstore(2, b16)
-	sstore(3, b17)
-	sstore(4, b18)
-	sstore(5, b19)
-	sstore(6, b29)
-	sstore(7, b30)
-        v := b30
-        sstore(b1, b30)
-    }
-
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0300))
-//         sstore(g(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30), 0)
-//     }
-//     function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30) -> v
-//     {
-//         mstore(0x02e0, b1)
-//         mstore(0x02c0, b2)
-//         mstore(0x02a0, b3)
-//         mstore(0x0280, b4)
-//         mstore(0x0260, b5)
-//         mstore(0x0240, b6)
-//         mstore(0x0220, b7)
-//         mstore(0x0200, b8)
-//         mstore(0x01e0, b9)
-//         mstore(0x01c0, b10)
-//         mstore(0x01a0, b11)
-//         mstore(0x0180, b12)
-//         mstore(0x0160, b13)
-//         mstore(0x0140, b14)
-//         mstore(0x0120, b15)
-//         mstore(0x0100, b17)
-//         mstore(0xe0, b18)
-//         mstore(0xc0, b19)
-//         mstore(0xa0, b29)
-//         mstore(0x80, b30)
-//         sstore(0, mload(0x0140))
-//         sstore(1, mload(0x0120))
-//         sstore(2, b16)
-//         sstore(3, mload(0x0100))
-//         sstore(4, mload(0xe0))
-//         sstore(5, mload(0xc0))
-//         sstore(6, mload(0xa0))
-//         sstore(7, mload(0x80))
-//         v := mload(0x80)
-//         sstore(mload(0x02e0), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul
deleted file mode 100644
index 5a3b3454c591..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        sstore(g(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31), 0)
-    }
-    function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30, b31) -> v {
-	sstore(0, b14)
-	sstore(1, b15)
-	sstore(2, b16)
-	sstore(3, b17)
-	sstore(4, b18)
-	sstore(5, b19)
-	sstore(6, b29)
-	sstore(7, b30)
-	sstore(8, b31)
-        v := add(b1,b31)
-    }
-
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0340))
-//         sstore(g(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31), 0)
-//     }
-//     function g(b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30, b31) -> v
-//     {
-//         mstore(0x0320, b1)
-//         mstore(0x0300, b2)
-//         mstore(0x02e0, b3)
-//         mstore(0x02c0, b4)
-//         mstore(0x02a0, b5)
-//         mstore(0x0280, b6)
-//         mstore(0x0260, b7)
-//         mstore(0x0240, b8)
-//         mstore(0x0220, b9)
-//         mstore(0x0200, b10)
-//         mstore(0x01e0, b11)
-//         mstore(0x01c0, b12)
-//         mstore(0x01a0, b13)
-//         mstore(0x0180, b14)
-//         mstore(0x0160, b15)
-//         mstore(0x0140, b16)
-//         mstore(0x0120, b17)
-//         mstore(0x0100, b18)
-//         mstore(0xe0, b19)
-//         mstore(0xc0, b29)
-//         mstore(0xa0, b30)
-//         mstore(0x80, b31)
-//         sstore(0, mload(0x0180))
-//         sstore(1, mload(0x0160))
-//         sstore(2, mload(0x0140))
-//         sstore(3, mload(0x0120))
-//         sstore(4, mload(0x0100))
-//         sstore(5, mload(0xe0))
-//         sstore(6, mload(0xc0))
-//         sstore(7, mload(0xa0))
-//         sstore(8, mload(0x80))
-//         v := add(mload(0x0320), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_returns_15.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_returns_15.yul
deleted file mode 100644
index b9d1a5571a9a..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_returns_15.yul
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-	let a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30)
-        sstore(0, 1)
-	a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30)
-    }
-    function g(b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30) -> b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15 {
-	b1 := 1
-	b2 := 2
-	b15 := 15
-	sstore(b16, b30)
-    }
-
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0260))
-//         let a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30)
-//         sstore(0, 1)
-//         a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30)
-//     }
-//     function g(b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30) -> b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15
-//     {
-//         mstore(0x0240, b16)
-//         mstore(0x0220, b17)
-//         mstore(0x0200, b18)
-//         mstore(0x01e0, b19)
-//         mstore(0x01c0, b20)
-//         mstore(0x01a0, b21)
-//         mstore(0x0180, b22)
-//         mstore(0x0160, b23)
-//         mstore(0x0140, b24)
-//         mstore(0x0120, b25)
-//         mstore(0x0100, b26)
-//         mstore(0xe0, b27)
-//         mstore(0xc0, b28)
-//         mstore(0xa0, b29)
-//         mstore(0x80, b30)
-//         b1 := 1
-//         b2 := 2
-//         b15 := 15
-//         sstore(mload(0x0240), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_returns_16.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_returns_16.yul
deleted file mode 100644
index 40553083ffaa..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_returns_16.yul
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-	let a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31)
-        sstore(0, 1)
-	a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31)
-    }
-    function g(b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30, b31) -> b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15 {
-	b1 := 1
-	b2 := 2
-	b15 := 15
-        sstore(b16, b31)
-    }
-
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0280))
-//         let a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31)
-//         sstore(0, 1)
-//         a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15 := g(16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31)
-//     }
-//     function g(b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, b26, b27, b28, b29, b30, b31) -> b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15
-//     {
-//         mstore(0x0260, b16)
-//         mstore(0x0240, b17)
-//         mstore(0x0220, b18)
-//         mstore(0x0200, b19)
-//         mstore(0x01e0, b20)
-//         mstore(0x01c0, b21)
-//         mstore(0x01a0, b22)
-//         mstore(0x0180, b23)
-//         mstore(0x0160, b24)
-//         mstore(0x0140, b25)
-//         mstore(0x0120, b26)
-//         mstore(0x0100, b27)
-//         mstore(0xe0, b28)
-//         mstore(0xc0, b29)
-//         mstore(0xa0, b30)
-//         mstore(0x80, b31)
-//         b1 := 1
-//         b2 := 2
-//         b15 := 15
-//         sstore(mload(0x0260), mload(0x80))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/tree.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/tree.yul
deleted file mode 100644
index 8407df5d0497..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/tree.yul
+++ /dev/null
@@ -1,339 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        sstore(23, f())
-    }
-    function f() -> v{
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(g())
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,h()), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-    }
-    function g() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        v := i()
-    }
-    function h() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(10,4))
-        a1 := calldataload(mul(0,4))
-        a2 := calldataload(mul(1,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        let a18 := calldataload(mul(18,4))
-        let a19 := calldataload(mul(19,4))
-        sstore(0, add(a1, a2))
-        sstore(mul(17,4), a19)
-        sstore(mul(17,4), a18)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        v := i()
-    }
-    function i() -> v {
-        let a1 := calldataload(mul(1,4))
-        let a2 := calldataload(mul(2,4))
-        let a3 := calldataload(mul(3,4))
-        let a4 := calldataload(mul(4,4))
-        let a5 := calldataload(mul(5,4))
-        let a6 := calldataload(mul(6,4))
-        let a7 := calldataload(mul(7,4))
-        let a8 := calldataload(mul(8,4))
-        let a9 := calldataload(mul(9,4))
-        a1 := calldataload(mul(0,4))
-        let a10 := calldataload(mul(10,4))
-        let a11 := calldataload(mul(11,4))
-        let a12 := calldataload(mul(12,4))
-        let a13 := calldataload(mul(13,4))
-        let a14 := calldataload(mul(14,4))
-        let a15 := calldataload(mul(15,4))
-        let a16 := calldataload(mul(16,4))
-        let a17 := calldataload(mul(17,4))
-        sstore(0, a1)
-        sstore(mul(17,4), a17)
-        sstore(mul(16,4), a16)
-        sstore(mul(15,4), a15)
-        sstore(mul(14,4), a14)
-        sstore(mul(13,4), a13)
-        sstore(mul(12,4), a12)
-        sstore(mul(11,4), a11)
-        sstore(mul(10,4), a10)
-        sstore(mul(9,4), a9)
-        sstore(mul(8,4), a8)
-        sstore(mul(7,4), a7)
-        sstore(mul(6,4), a6)
-        sstore(mul(5,4), a5)
-        sstore(mul(4,4), a4)
-        sstore(mul(3,4), a3)
-        sstore(mul(2,4), a2)
-        sstore(mul(1,4), a1)
-        v := sload(mul(42,8))
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0100))
-//         sstore(23, f())
-//     }
-//     function f() -> v
-//     {
-//         mstore(0x80, calldataload(mul(1, 4)))
-//         let a2 := calldataload(mul(2, 4))
-//         let a3 := calldataload(mul(3, 4))
-//         let a4 := calldataload(g())
-//         let a5 := calldataload(mul(5, 4))
-//         let a6 := calldataload(mul(6, 4))
-//         let a7 := calldataload(mul(7, 4))
-//         let a8 := calldataload(mul(8, 4))
-//         let a9 := calldataload(mul(9, 4))
-//         mstore(0x80, calldataload(mul(0, 4)))
-//         let a10 := calldataload(mul(10, 4))
-//         let a11 := calldataload(mul(11, 4))
-//         let a12 := calldataload(mul(12, 4))
-//         let a13 := calldataload(mul(13, 4))
-//         let a14 := calldataload(mul(14, 4))
-//         let a15 := calldataload(mul(15, 4))
-//         let a16 := calldataload(mul(16, 4))
-//         let a17 := calldataload(mul(17, 4))
-//         sstore(0, mload(0x80))
-//         sstore(mul(17, 4), a17)
-//         sstore(mul(16, 4), a16)
-//         sstore(mul(15, 4), a15)
-//         sstore(mul(14, 4), a14)
-//         sstore(mul(13, 4), a13)
-//         sstore(mul(12, 4), a12)
-//         sstore(mul(11, 4), a11)
-//         sstore(mul(10, 4), a10)
-//         sstore(mul(9, 4), a9)
-//         sstore(mul(8, h()), a8)
-//         sstore(mul(7, 4), a7)
-//         sstore(mul(6, 4), a6)
-//         sstore(mul(5, 4), a5)
-//         sstore(mul(4, 4), a4)
-//         sstore(mul(3, 4), a3)
-//         sstore(mul(2, 4), a2)
-//         sstore(mul(1, 4), mload(0x80))
-//     }
-//     function g() -> v_1
-//     {
-//         mstore(0xc0, calldataload(mul(1, 4)))
-//         let a2_3 := calldataload(mul(2, 4))
-//         let a3_4 := calldataload(mul(3, 4))
-//         let a4_5 := calldataload(mul(4, 4))
-//         let a5_6 := calldataload(mul(5, 4))
-//         let a6_7 := calldataload(mul(6, 4))
-//         let a7_8 := calldataload(mul(7, 4))
-//         let a8_9 := calldataload(mul(8, 4))
-//         let a9_10 := calldataload(mul(9, 4))
-//         mstore(0xc0, calldataload(mul(0, 4)))
-//         let a10_11 := calldataload(mul(10, 4))
-//         let a11_12 := calldataload(mul(11, 4))
-//         let a12_13 := calldataload(mul(12, 4))
-//         let a13_14 := calldataload(mul(13, 4))
-//         let a14_15 := calldataload(mul(14, 4))
-//         let a15_16 := calldataload(mul(15, 4))
-//         let a16_17 := calldataload(mul(16, 4))
-//         let a17_18 := calldataload(mul(17, 4))
-//         sstore(0, mload(0xc0))
-//         sstore(mul(17, 4), a17_18)
-//         sstore(mul(16, 4), a16_17)
-//         sstore(mul(15, 4), a15_16)
-//         sstore(mul(14, 4), a14_15)
-//         sstore(mul(13, 4), a13_14)
-//         sstore(mul(12, 4), a12_13)
-//         sstore(mul(11, 4), a11_12)
-//         sstore(mul(10, 4), a10_11)
-//         sstore(mul(9, 4), a9_10)
-//         sstore(mul(8, 4), a8_9)
-//         sstore(mul(7, 4), a7_8)
-//         sstore(mul(6, 4), a6_7)
-//         sstore(mul(5, 4), a5_6)
-//         sstore(mul(4, 4), a4_5)
-//         sstore(mul(3, 4), a3_4)
-//         sstore(mul(2, 4), a2_3)
-//         sstore(mul(1, 4), mload(0xc0))
-//         v_1 := i()
-//     }
-//     function h() -> v_19
-//     {
-//         mstore(0xa0, calldataload(mul(1, 4)))
-//         mstore(0xc0, calldataload(mul(2, 4)))
-//         let a3_22 := calldataload(mul(3, 4))
-//         let a4_23 := calldataload(mul(4, 4))
-//         let a5_24 := calldataload(mul(5, 4))
-//         let a6_25 := calldataload(mul(6, 4))
-//         let a7_26 := calldataload(mul(7, 4))
-//         let a8_27 := calldataload(mul(8, 4))
-//         let a9_28 := calldataload(mul(9, 4))
-//         let a10_29 := calldataload(mul(10, 4))
-//         let a11_30 := calldataload(mul(10, 4))
-//         mstore(0xa0, calldataload(mul(0, 4)))
-//         mstore(0xc0, calldataload(mul(1, 4)))
-//         let a12_31 := calldataload(mul(12, 4))
-//         let a13_32 := calldataload(mul(13, 4))
-//         let a14_33 := calldataload(mul(14, 4))
-//         let a15_34 := calldataload(mul(15, 4))
-//         let a16_35 := calldataload(mul(16, 4))
-//         let a17_36 := calldataload(mul(17, 4))
-//         let a18 := calldataload(mul(18, 4))
-//         let a19 := calldataload(mul(19, 4))
-//         sstore(0, add(mload(0xa0), mload(0xc0)))
-//         sstore(mul(17, 4), a19)
-//         sstore(mul(17, 4), a18)
-//         sstore(mul(17, 4), a17_36)
-//         sstore(mul(16, 4), a16_35)
-//         sstore(mul(15, 4), a15_34)
-//         sstore(mul(14, 4), a14_33)
-//         sstore(mul(13, 4), a13_32)
-//         sstore(mul(12, 4), a12_31)
-//         sstore(mul(11, 4), a11_30)
-//         sstore(mul(10, 4), a10_29)
-//         sstore(mul(9, 4), a9_28)
-//         sstore(mul(8, 4), a8_27)
-//         sstore(mul(7, 4), a7_26)
-//         sstore(mul(6, 4), a6_25)
-//         sstore(mul(5, 4), a5_24)
-//         sstore(mul(4, 4), a4_23)
-//         sstore(mul(3, 4), a3_22)
-//         sstore(mul(2, 4), mload(0xc0))
-//         sstore(mul(1, 4), mload(0xa0))
-//         v_19 := i()
-//     }
-//     function i() -> v_37
-//     {
-//         mstore(0xe0, calldataload(mul(1, 4)))
-//         let a2_39 := calldataload(mul(2, 4))
-//         let a3_40 := calldataload(mul(3, 4))
-//         let a4_41 := calldataload(mul(4, 4))
-//         let a5_42 := calldataload(mul(5, 4))
-//         let a6_43 := calldataload(mul(6, 4))
-//         let a7_44 := calldataload(mul(7, 4))
-//         let a8_45 := calldataload(mul(8, 4))
-//         let a9_46 := calldataload(mul(9, 4))
-//         mstore(0xe0, calldataload(mul(0, 4)))
-//         let a10_47 := calldataload(mul(10, 4))
-//         let a11_48 := calldataload(mul(11, 4))
-//         let a12_49 := calldataload(mul(12, 4))
-//         let a13_50 := calldataload(mul(13, 4))
-//         let a14_51 := calldataload(mul(14, 4))
-//         let a15_52 := calldataload(mul(15, 4))
-//         let a16_53 := calldataload(mul(16, 4))
-//         let a17_54 := calldataload(mul(17, 4))
-//         sstore(0, mload(0xe0))
-//         sstore(mul(17, 4), a17_54)
-//         sstore(mul(16, 4), a16_53)
-//         sstore(mul(15, 4), a15_52)
-//         sstore(mul(14, 4), a14_51)
-//         sstore(mul(13, 4), a13_50)
-//         sstore(mul(12, 4), a12_49)
-//         sstore(mul(11, 4), a11_48)
-//         sstore(mul(10, 4), a10_47)
-//         sstore(mul(9, 4), a9_46)
-//         sstore(mul(8, 4), a8_45)
-//         sstore(mul(7, 4), a7_44)
-//         sstore(mul(6, 4), a6_43)
-//         sstore(mul(5, 4), a5_42)
-//         sstore(mul(4, 4), a4_41)
-//         sstore(mul(3, 4), a3_40)
-//         sstore(mul(2, 4), a2_39)
-//         sstore(mul(1, 4), mload(0xe0))
-//         v_37 := sload(mul(42, 8))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul
deleted file mode 100644
index bde030f68ec3..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        let a_1 := 1
-        let a_2 := 2
-        let a_3 := 3
-        let a_4 := 4
-        let a_5 := 5
-        let a_6 := 6
-        let a_7 := 7
-        let a_8 := 8
-        let a_9 := 9
-        let a_10 := 10
-        let a_11 := 11
-        let a_12 := 12
-        let a_13 := 13
-        let a_14 := 14
-        let a_15 := 15
-        let a_16 := 16
-        let a_17 := 17
-        let a_18 := 18
-        let a_19 := 19
-        let a_20 := 20
-        verbatim_20i_0o("test", a_1, a_2, a_3, a_4, a_5, a_6, a_7, a_8, a_9, a_10, a_11, a_12, a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0200))
-//         mstore(0x80, 1)
-//         mstore(0xa0, 2)
-//         mstore(0xc0, 3)
-//         mstore(0xe0, 4)
-//         mstore(0x0100, 5)
-//         mstore(0x0120, 6)
-//         mstore(0x0140, 7)
-//         mstore(0x0160, 8)
-//         mstore(0x0180, 9)
-//         mstore(0x01a0, 10)
-//         mstore(0x01c0, 11)
-//         mstore(0x01e0, 12)
-//         let a_13 := 13
-//         let a_14 := 14
-//         let a_15 := 15
-//         let a_16 := 16
-//         let a_17 := 17
-//         let a_18 := 18
-//         let a_19 := 19
-//         let a_20 := 20
-//         verbatim_20i_0o("test", mload(0x80), mload(0xa0), mload(0xc0), mload(0xe0), mload(0x0100), mload(0x0120), mload(0x0140), mload(0x0160), mload(0x0180), mload(0x01a0), mload(0x01c0), mload(0x01e0), a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul
deleted file mode 100644
index 46435dd210dc..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        let a_1 := 1
-        let a_2 := 2
-        let a_3 := 3
-        let a_4 := 4
-        let a_5 := 5
-        let a_6 := 6
-        let a_7 := 7
-        let a_8 := 8
-        let a_9 := 9
-        let a_10 := 10
-        let a_11 := 11
-        let a_12 := 12
-        let a_13 := 13
-        let a_14 := 14
-        let a_15 := 15
-        let a_16 := 16
-        let a_17 := 17
-        let a_18 := 18
-        let a_19 := 19
-        let a_20 := 20
-        let b_1, b_2, b_3, b_4, b_5, b_6, b_7, b_8, b_9, b_10, b_11, b_12, b_13, b_14, b_15, b_16, b_17, b_18, b_19, b_20 := verbatim_20i_20o("test", a_1, a_2, a_3, a_4, a_5, a_6, a_7, a_8, a_9, a_10, a_11, a_12, a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
-        sstore(1, b_1)
-        sstore(2, b_2)
-        sstore(3, b_3)
-        sstore(4, b_4)
-        sstore(5, b_5)
-        sstore(6, b_6)
-        sstore(7, b_7)
-        sstore(8, b_8)
-        sstore(9, b_9)
-        sstore(10, b_10)
-        sstore(11, b_11)
-        sstore(12, b_12)
-        sstore(13, b_13)
-        sstore(14, b_14)
-        sstore(15, b_15)
-        sstore(16, b_16)
-        sstore(17, b_17)
-        sstore(18, b_18)
-        sstore(19, b_19)
-        sstore(20, b_20)
-
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0x0280))
-//         mstore(0x0100, 1)
-//         mstore(0x0120, 2)
-//         mstore(0x0140, 3)
-//         mstore(0x0160, 4)
-//         mstore(0x0180, 5)
-//         mstore(0x01a0, 6)
-//         mstore(0x01c0, 7)
-//         mstore(0x01e0, 8)
-//         mstore(0x0200, 9)
-//         mstore(0x0220, 10)
-//         mstore(0x0240, 11)
-//         mstore(0x0260, 12)
-//         let a_13 := 13
-//         let a_14 := 14
-//         let a_15 := 15
-//         let a_16 := 16
-//         let a_17 := 17
-//         let a_18 := 18
-//         let a_19 := 19
-//         let a_20 := 20
-//         let b_1_1, b_2_2, b_3_3, b_4_4, b_5_5, b_6_6, b_7_7, b_8_8, b_9_9, b_10_10, b_11_11, b_12_12, b_13_13, b_14_14, b_15_15, b_16_16, b_17_17, b_18_18, b_19_19, b_20_20 := verbatim_20i_20o("test", mload(0x0100), mload(0x0120), mload(0x0140), mload(0x0160), mload(0x0180), mload(0x01a0), mload(0x01c0), mload(0x01e0), mload(0x0200), mload(0x0220), mload(0x0240), mload(0x0260), a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
-//         mstore(0x80, b_4_4)
-//         mstore(0xa0, b_3_3)
-//         mstore(0xc0, b_2_2)
-//         mstore(0xe0, b_1_1)
-//         let b_20 := b_20_20
-//         let b_19 := b_19_19
-//         let b_18 := b_18_18
-//         let b_17 := b_17_17
-//         let b_16 := b_16_16
-//         let b_15 := b_15_15
-//         let b_14 := b_14_14
-//         let b_13 := b_13_13
-//         let b_12 := b_12_12
-//         let b_11 := b_11_11
-//         let b_10 := b_10_10
-//         let b_9 := b_9_9
-//         let b_8 := b_8_8
-//         let b_7 := b_7_7
-//         let b_6 := b_6_6
-//         let b_5 := b_5_5
-//         sstore(1, mload(0xe0))
-//         sstore(2, mload(0xc0))
-//         sstore(3, mload(0xa0))
-//         sstore(4, mload(0x80))
-//         sstore(5, b_5)
-//         sstore(6, b_6)
-//         sstore(7, b_7)
-//         sstore(8, b_8)
-//         sstore(9, b_9)
-//         sstore(10, b_10)
-//         sstore(11, b_11)
-//         sstore(12, b_12)
-//         sstore(13, b_13)
-//         sstore(14, b_14)
-//         sstore(15, b_15)
-//         sstore(16, b_16)
-//         sstore(17, b_17)
-//         sstore(18, b_18)
-//         sstore(19, b_19)
-//         sstore(20, b_20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_returns.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_returns.yul
deleted file mode 100644
index 47db17e21198..000000000000
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_returns.yul
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    {
-        mstore(0x40, memoryguard(128))
-        let a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a13, a14, a15, a16, a17, a18 := verbatim_0i_16o("test")
-        a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a13, a14, a15, a16, a17, a18 := verbatim_0i_16o("test")
-        sstore(a1, 10)
-        sstore(a18, 20)
-    }
-}
-// ----
-// step: stackLimitEvader
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(0xa0))
-//         let a1_1, a2_2, a3_3, a4_4, a5_5, a6_6, a7_7, a8_8, a9_9, a10_10, a13_11, a14_12, a15_13, a16_14, a17_15, a18_16 := verbatim_0i_16o("test")
-//         mstore(0x80, a1_1)
-//         let a18 := a18_16
-//         let a17 := a17_15
-//         let a16 := a16_14
-//         let a15 := a15_13
-//         let a14 := a14_12
-//         let a13 := a13_11
-//         let a10 := a10_10
-//         let a9 := a9_9
-//         let a8 := a8_8
-//         let a7 := a7_7
-//         let a6 := a6_6
-//         let a5 := a5_5
-//         let a4 := a4_4
-//         let a3 := a3_3
-//         let a2 := a2_2
-//         let a1_17, a2_18, a3_19, a4_20, a5_21, a6_22, a7_23, a8_24, a9_25, a10_26, a13_27, a14_28, a15_29, a16_30, a17_31, a18_32 := verbatim_0i_16o("test")
-//         mstore(0x80, a1_17)
-//         a18 := a18_32
-//         a17 := a17_31
-//         a16 := a16_30
-//         a15 := a15_29
-//         a14 := a14_28
-//         a13 := a13_27
-//         a10 := a10_26
-//         a9 := a9_25
-//         a8 := a8_24
-//         a7 := a7_23
-//         a6 := a6_22
-//         a5 := a5_21
-//         a4 := a4_20
-//         a3 := a3_19
-//         a2 := a2_18
-//         sstore(mload(0x80), 10)
-//         sstore(a18, 20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/bugfix_visit_after_change.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/bugfix_visit_after_change.yul
deleted file mode 100644
index 94da17faa09f..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/bugfix_visit_after_change.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	// This tests that a bug is fixed where x := 1 was wrongfully
-	// taken into account before actually visiting the if statement.
-	let x := 0
-	if x {
-		x := 1
-	}
-}
-// ----
-// step: structuralSimplifier
-//
-// { let x := 0 }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/for_false_condition.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/for_false_condition.yul
deleted file mode 100644
index edca6b642ded..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/for_false_condition.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    for { let a := 42 } 0 { a := a } {
-        let b := a
-    }
-}
-// ----
-// step: structuralSimplifier
-//
-// { let a := 42 }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/if_false_condition.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/if_false_condition.yul
deleted file mode 100644
index 3b7a391815c1..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/if_false_condition.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if 0 { mstore(0, 0) } }
-// ----
-// step: structuralSimplifier
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/if_multi_unassigned_condition.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/if_multi_unassigned_condition.yul
deleted file mode 100644
index bbed85bb011c..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/if_multi_unassigned_condition.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let x, y
-    if x { mstore(0, 0) }
-    if y { mstore(0, 0) }
-}
-// ----
-// step: structuralSimplifier
-//
-// { let x, y }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/if_true_condition.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/if_true_condition.yul
deleted file mode 100644
index bf1046fb269f..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/if_true_condition.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if 1 { mstore(0, 0) } }
-// ----
-// step: structuralSimplifier
-//
-// { mstore(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/if_unassigned_condition.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/if_unassigned_condition.yul
deleted file mode 100644
index bee5381c8627..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/if_unassigned_condition.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x
-    if x { mstore(0, 0) }
-}
-// ----
-// step: structuralSimplifier
-//
-// { let x }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/nested.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/nested.yul
deleted file mode 100644
index 44b2ecc61ea2..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/nested.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if 1 { if 1 { for { mstore(0, 0) } 0 {} { mstore(2, 3) }  if 0 { mstore(1, 2) } } } }
-// ----
-// step: structuralSimplifier
-//
-// { mstore(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline.yul
deleted file mode 100644
index faa0304df945..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	let y := 200
-	switch 1
-	case 0 { y := 8 }
-	case 1 { y := 9 }
-}
-// ----
-// step: structuralSimplifier
-//
-// {
-//     let y := 200
-//     { y := 9 }
-// }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_match_default.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_match_default.yul
deleted file mode 100644
index 9238cb05763a..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_match_default.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	let y := 200
-	switch 3
-	case 0 { y := 8 }
-	case 1 { y := 9 }
-	default { y := 10 }
-}
-// ----
-// step: structuralSimplifier
-//
-// {
-//     let y := 200
-//     { y := 10 }
-// }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_no_match.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_no_match.yul
deleted file mode 100644
index 9036db7092e1..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_no_match.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let y := 200
-	switch 3
-	case 0 { y := 8 }
-	case 1 { y := 9 }
-}
-// ----
-// step: structuralSimplifier
-//
-// { let y := 200 }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_no_match_mixed.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_no_match_mixed.yul
deleted file mode 100644
index 5eeae71ba265..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_inline_no_match_mixed.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	// Used to cause assert error
-	let y := 200
-	switch 3
-	case "" { y := 8 }
-	case 1 { y := 9 }
-}
-// ----
-// step: structuralSimplifier
-//
-// { let y := 200 }
diff --git a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_no_remove_empty_case.yul b/test/libyul/yulOptimizerTests/structuralSimplifier/switch_no_remove_empty_case.yul
deleted file mode 100644
index f8cc0558aa2e..000000000000
--- a/test/libyul/yulOptimizerTests/structuralSimplifier/switch_no_remove_empty_case.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	let y := 200
-	switch calldataload(0)
-	case 0 { }
-	case 1 { y := 9 }
-	default { y := 100 }
-}
-// ----
-// step: structuralSimplifier
-//
-// {
-//     let y := 200
-//     switch calldataload(0)
-//     case 0 { }
-//     case 1 { y := 9 }
-//     default { y := 100 }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul
deleted file mode 100644
index 3eeea6f4dd90..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    function g() {
-        if calldataload(10) { revert(0, 0) }
-    }
-    function f() {
-        let a := calldataload(0)
-        if calldataload(1) {
-            // this can NOT be removed
-            a := 2
-            g()
-        }
-        sstore(0, a)
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     function g()
-//     {
-//         if calldataload(10) { revert(0, 0) }
-//     }
-//     function f()
-//     {
-//         let a := calldataload(0)
-//         if calldataload(1)
-//         {
-//             a := 2
-//             g()
-//         }
-//         sstore(0, a)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul
deleted file mode 100644
index 4564f5d07524..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    function f() {
-        let a := calldataload(0)
-        if calldataload(1) {
-            // this can be removed
-            a := 2
-            leave
-        }
-        sstore(0, a)
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     function f()
-//     {
-//         let a := calldataload(0)
-//         if calldataload(1) { leave }
-//         sstore(0, a)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul
deleted file mode 100644
index 469da01fc46f..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let a := calldataload(0)
-    if calldataload(1) {
-        // this can be removed
-        a := 2
-        revert(0, 0)
-    }
-    sstore(0, a)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let a := calldataload(0)
-//     if calldataload(1) { revert(0, 0) }
-//     sstore(0, a)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
deleted file mode 100644
index 89de8920cd25..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a := 2
-    a := 3
-    for {
-    } a { a := add(a, 1) }
-    {
-        a := 7
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let a := 2
-//     a := 3
-//     for { } a { a := add(a, 1) }
-//     { a := 7 }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
deleted file mode 100644
index 8700c8d28b04..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let x
-    let y
-    // Cannot be removed, because we might skip the loop
-    x := 1
-    for { } calldataload(0) { }
-    {
-        // Cannot be removed
-        x := 2
-        // Can be removed
-        y := 3
-    }
-    y := 8
-    mstore(x, 0)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     let y
-//     x := 1
-//     for { } calldataload(0) { }
-//     { x := 2 }
-//     mstore(x, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
deleted file mode 100644
index db55bf7588c1..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let x
-    // Cannot be removed, because we might skip the loop
-    x := 1
-    for { } calldataload(0) { }
-    {
-        if callvalue() {
-            x := 2 // is preserved because of break stmt below.
-            break
-        }
-        x := 3
-    }
-    mstore(x, 0x42)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     x := 1
-//     for { } calldataload(0) { }
-//     {
-//         if callvalue()
-//         {
-//             x := 2
-//             break
-//         }
-//         x := 3
-//     }
-//     mstore(x, 0x42)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
deleted file mode 100644
index d3cfb0d84b0b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    let x
-    // Can be removed, because x is reassigned after the loop
-    x := 1
-    for { } calldataload(0) { }
-    {
-        x := 2 // Will not be removed as if-condition can be false.
-        if callvalue() {
-            // This can be removed because x is overwritten both after the
-            // loop at at the start of the next iteration.
-            x := 3
-            continue
-        }
-        mstore(x, 2)
-    }
-    x := 3
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     for { } calldataload(0) { }
-//     {
-//         x := 2
-//         if callvalue() { continue }
-//         mstore(x, 2)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
deleted file mode 100644
index 2d5bae46e2ac..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let x
-    // Cannot be removed, because we might skip the loop
-    x := 1
-    for { } calldataload(0) { }
-    {
-        if callvalue() {
-            x := 2 // is preserved because of continue stmt below.
-            continue
-        }
-        x := 3
-    }
-    mstore(x, 0x42)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     x := 1
-//     for { } calldataload(0) { }
-//     {
-//         if callvalue()
-//         {
-//             x := 2
-//             continue
-//         }
-//         x := 3
-//     }
-//     mstore(x, 0x42)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
deleted file mode 100644
index d9980d376dae..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    let x
-    // Can be removed, because x is not used after the loop.
-    x := 1
-    for { } calldataload(0) { mstore(x, 0x42) }
-    {
-        if callvalue() {
-            x := 2 // is preserved because of continue stmt below.
-            continue
-        }
-        x := 3
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     for { } calldataload(0) { mstore(x, 0x42) }
-//     {
-//         if callvalue()
-//         {
-//             x := 2
-//             continue
-//         }
-//         x := 3
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
deleted file mode 100644
index 94b100e2a9e9..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    let x := 1
-    for { } calldataload(0) { }
-    {
-        // This will go out of scope at the end of the block,
-        // but the continue/break statements still refer to it.
-        {
-            let y := 9
-            if callvalue() {
-                y := 2 // will be removed
-                break
-            }
-            if eq(callvalue(), 3) {
-                y := 12 // will be removed
-                continue
-            }
-        }
-    }
-    mstore(x, 0x42)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x := 1
-//     for { } calldataload(0) { }
-//     {
-//         {
-//             let y := 9
-//             if callvalue() { break }
-//             if eq(callvalue(), 3) { continue }
-//         }
-//     }
-//     mstore(x, 0x42)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
deleted file mode 100644
index c0a84c2450eb..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    let x := 1
-    let y := 2
-    let a := 3
-    let b := 4
-    for {} 1 {} {
-    for {} 1 {} {
-    for {} 1 {} {
-    // Here, the nesting is not yet too deep, so the assignment
-    // should be removed.
-    for {} 1 { x := 9 } {
-        y := 10
-        for {} 1 {} {
-        for {} 1 {} {
-        // Now we are too deep, assignments stay.
-        for {} 1 { a := 10 } {
-            b := 12
-            b := 11
-        }
-        }
-        }
-    }
-    }
-    }
-    }
-    x := 13
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x := 1
-//     let y := 2
-//     let a := 3
-//     let b := 4
-//     for { } 1 { }
-//     {
-//         for { } 1 { }
-//         {
-//             for { } 1 { }
-//             {
-//                 for { } 1 { }
-//                 {
-//                     for { } 1 { }
-//                     {
-//                         for { } 1 { }
-//                         {
-//                             for { } 1 { a := 10 }
-//                             { b := 11 }
-//                         }
-//                     }
-//                 }
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
deleted file mode 100644
index 039d856d96d0..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    for {} 1 {} {
-    for {} 1 {} {
-    for {} 1 {} {
-    for {} 1 {} {
-    for {} 1 {} {
-    for {} 1 {} {
-    for {} 1 { let a := 1 a := 2 a := 3 } {
-        // Declarations inside body and post should be handled as normal.
-        let b := 1
-        b := 2
-        b := 3
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     for { } 1 { }
-//     {
-//         for { } 1 { }
-//         {
-//             for { } 1 { }
-//             {
-//                 for { } 1 { }
-//                 {
-//                     for { } 1 { }
-//                     {
-//                         for { } 1 { }
-//                         {
-//                             for { } 1 { let a := 1 }
-//                             { let b := 1 }
-//                         }
-//                     }
-//                 }
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
deleted file mode 100644
index 3b18dcc8dcdc..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    let x := 1
-    let y := 1
-    let z := 1
-    for { } calldataload(0) { mstore(x, 2) mstore(z, 2) }
-    {
-        y := 3
-        switch callvalue()
-        case 0 {
-            x := 2
-            y := 2
-            z := 2
-            break
-        }
-        case 1 {
-            x := 3
-            y := 3
-            z := 3
-            continue
-        }
-        case 2 {
-            x := 4
-            y := 4
-            z := 4
-            break
-        }
-        case 3 {
-            x := 5
-            y := 5
-            z := 5
-            continue
-        }
-        mstore(y, 9)
-    }
-    mstore(x, 0x42)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x := 1
-//     let y := 1
-//     let z := 1
-//     for { }
-//     calldataload(0)
-//     {
-//         mstore(x, 2)
-//         mstore(z, 2)
-//     }
-//     {
-//         y := 3
-//         switch callvalue()
-//         case 0 {
-//             x := 2
-//             break
-//         }
-//         case 1 {
-//             x := 3
-//             z := 3
-//             continue
-//         }
-//         case 2 {
-//             x := 4
-//             break
-//         }
-//         case 3 {
-//             x := 5
-//             z := 5
-//             continue
-//         }
-//         mstore(y, 9)
-//     }
-//     mstore(x, 0x42)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
deleted file mode 100644
index 101101b92320..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    let x := 1
-    let y := 1
-    let a := 7
-    let b := 9
-    for { } calldataload(0) { }
-    {
-        y := 9
-        mstore(a, 7)
-        if callvalue() {
-            x := 2
-            for {} calldataload(1) {}
-            {
-                a := 2 // can be removed
-                if eq(x, 3) {
-                    b := 3 // cannot be removed
-                    y := 2 // will be removed
-                    continue
-                }
-            }
-            mstore(b, 2)
-            break
-        }
-        if eq(callvalue(), 3) {
-            x := 12
-            y := 12
-            continue
-        }
-        x := 3
-        mstore(y, 3)
-    }
-    mstore(x, 0x42)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x := 1
-//     let y := 1
-//     let a := 7
-//     let b := 9
-//     for { } calldataload(0) { }
-//     {
-//         y := 9
-//         mstore(a, 7)
-//         if callvalue()
-//         {
-//             x := 2
-//             for { } calldataload(1) { }
-//             {
-//                 if eq(x, 3)
-//                 {
-//                     b := 3
-//                     continue
-//                 }
-//             }
-//             mstore(b, 2)
-//             break
-//         }
-//         if eq(callvalue(), 3)
-//         {
-//             x := 12
-//             continue
-//         }
-//         x := 3
-//         mstore(y, 3)
-//     }
-//     mstore(x, 0x42)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
deleted file mode 100644
index 08cf63a52d65..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let x
-    // Cannot be removed, because we might run the loop only once
-    x := 1
-    for { } calldataload(0) { }
-    {
-        mstore(x, 2)
-        // Cannot be removed because of the line above
-        x := 2
-    }
-    x := 3
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     x := 1
-//     for { } calldataload(0) { }
-//     {
-//         mstore(x, 2)
-//         x := 2
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
deleted file mode 100644
index 1a92d3b8413c..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    let x := 1
-    let y := 1
-    for { } calldataload(0) { }
-    {
-        y := 9
-        if callvalue() {
-            x := 2
-            y := 2 // will be removed
-            break
-            x := 7 // after break, we start with fresh state.
-        }
-        if eq(callvalue(), 3) {
-            x := 12
-            y := 12 // will be removed
-            continue
-            x := 17 // after continue, we start with fresh state.
-            y := 9
-        }
-        x := 3
-        mstore(y, 3)
-    }
-    mstore(x, 0x42)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x := 1
-//     let y := 1
-//     for { } calldataload(0) { }
-//     {
-//         y := 9
-//         if callvalue()
-//         {
-//             x := 2
-//             break
-//         }
-//         if eq(callvalue(), 3)
-//         {
-//             x := 12
-//             continue
-//             y := 9
-//         }
-//         x := 3
-//         mstore(y, 3)
-//     }
-//     mstore(x, 0x42)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
deleted file mode 100644
index 044a5f418f85..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let r
-    r := 1
-    function f(x, y) -> a, b {
-        // Can be removed, is param
-        x := 1
-        y := 2
-        // Cannot be removed, is return param
-        a := 3
-        b := 4
-    }
-    r := 2
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let r
-//     function f(x, y) -> a, b
-//     {
-//         a := 3
-//         b := 4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
deleted file mode 100644
index 7c65680ae6a3..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let c
-    let d
-    c := calldataload(0)
-    d := 1
-    if c {
-        d := 2
-    }
-    // This enforces that none of the assignments above can be removed.
-    mstore(0, d)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let c
-//     let d
-//     c := calldataload(0)
-//     d := 1
-//     if c { d := 2 }
-//     mstore(0, d)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
deleted file mode 100644
index 860050e59dd3..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let c
-    let d
-    c := calldataload(0)
-    // This assignment will be overwritten in all branches and thus can be removed.
-    d := 1
-    if c {
-        d := 2
-    }
-    d := 3
-    mstore(0, d)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let c
-//     let d
-//     c := calldataload(0)
-//     if c { }
-//     d := 3
-//     mstore(0, d)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
deleted file mode 100644
index 90643f174cae..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let c
-    let d
-    c := calldataload(0)
-    d := 1
-    if c {
-        // Uses the assignment above
-        d := d
-    }
-    d := 3
-    mstore(0, d)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let c
-//     let d
-//     c := calldataload(0)
-//     d := 1
-//     if c { }
-//     d := 3
-//     mstore(0, d)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
deleted file mode 100644
index 82bf493470c8..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    function f(a, b) -> x {
-        let t
-        a := 2
-        x := 2
-        t := 2
-        if b { leave }
-        a := 8
-        x := 8
-        t := 8
-    }
-    function g(a, b) -> x {
-        let t
-        a := 2
-        x := 2
-        t := 2
-        if b { }
-        a := 8
-        x := 8
-        t := 8
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     function f(a, b) -> x
-//     {
-//         let t
-//         x := 2
-//         if b { leave }
-//         x := 8
-//     }
-//     function g(a_1, b_2) -> x_3
-//     {
-//         let t_4
-//         if b_2 { }
-//         x_3 := 8
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
deleted file mode 100644
index d4b35e7ee1f0..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    function f() -> a, b {}
-    let x, y
-    x := 1
-    x := 2
-    // Will not be used, but is a multi-assign, so not removed.
-    x, y := f()
-    x := 3
-    y := 4
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     function f() -> a, b
-//     { }
-//     let x, y
-//     x, y := f()
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
deleted file mode 100644
index d4dda8f902fa..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    let a := 2
-    a := 7
-    let b := 8
-    b := a
-    a := b
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let a := 2
-//     a := 7
-//     let b := 8
-//     b := a
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
deleted file mode 100644
index e131b3549e16..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    let a
-    a := 0
-    a := mload(0)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let a
-//     a := mload(0)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
deleted file mode 100644
index 76a536c2f371..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let i := 0
-    for {} lt(i, 2) { i := add(i, 1) }
-    {
-        let x
-        x := 1337
-        if lt(i,1) {
-            x := 42
-            break
-        }
-        mstore(0, x)
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let i := 0
-//     for { } lt(i, 2) { i := add(i, 1) }
-//     {
-//         let x
-//         x := 1337
-//         if lt(i, 1) { break }
-//         mstore(0, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
deleted file mode 100644
index 27083a73c285..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let i := 0
-    for {} lt(i, 2) { i := add(i, 1) }
-    {
-        let x
-        x := 1337
-        if lt(i,1) {
-            x := 42
-            continue
-        }
-        mstore(0, x)
-    }
-}
-
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let i := 0
-//     for { } lt(i, 2) { i := add(i, 1) }
-//     {
-//         let x
-//         x := 1337
-//         if lt(i, 1) { continue }
-//         mstore(0, x)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul
deleted file mode 100644
index 0a8a3582ff57..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    function g() -> x {
-        x := 7
-        if calldataload(0) {
-            x := 3
-            reverting()
-        }
-        if calldataload(1) {
-            x := 3
-            leave
-        }
-        x := 2
-        reverting()
-    }
-    function reverting() { revert(0, 0) }
-    sstore(0, g())
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     function g() -> x
-//     {
-//         if calldataload(0) { reverting() }
-//         if calldataload(1)
-//         {
-//             x := 3
-//             leave
-//         }
-//         reverting()
-//     }
-//     function reverting()
-//     { revert(0, 0) }
-//     sstore(0, g())
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
deleted file mode 100644
index bc2d4d80f6ff..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let a
-    {
-        let b
-        b := 2
-        a := 2
-    }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let a
-//     { let b }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
deleted file mode 100644
index 326ce29dcd45..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let a
-    a := 1
-    a := 2
-}
-// ----
-// step: unusedAssignEliminator
-//
-// { let a }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
deleted file mode 100644
index a6b77f897361..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let x
-    // Will be overwritten in all branches
-    x := 1
-    switch calldataload(0)
-    case 0 { x := 2 }
-    default { x := 3 }
-    mstore(x, 0)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     switch calldataload(0)
-//     case 0 { x := 2 }
-//     default { x := 3 }
-//     mstore(x, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
deleted file mode 100644
index 9b0a23cd883f..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x
-    // Will NOT be overwritten in all branches
-    x := 1
-    switch calldataload(0)
-    case 0 { x := 2 }
-    mstore(x, 0)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     x := 1
-//     switch calldataload(0)
-//     case 0 { x := 2 }
-//     mstore(x, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
deleted file mode 100644
index 611123db367b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let x
-    // Will be used in some and overwritten in others
-    x := 1
-    switch calldataload(0)
-    case 0 { x := 2 }
-    default { mstore(x, 1) }
-    mstore(x, 0)
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     x := 1
-//     switch calldataload(0)
-//     case 0 { x := 2 }
-//     default { mstore(x, 1) }
-//     mstore(x, 0)
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
deleted file mode 100644
index c15c8899192d..000000000000
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x
-    // Not referenced anywhere.
-    x := 1
-    switch calldataload(0)
-    case 0 { mstore(0, 1) }
-}
-// ----
-// step: unusedAssignEliminator
-//
-// {
-//     let x
-//     switch calldataload(0)
-//     case 0 { mstore(0, 1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/LiteralRematerialiser.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/LiteralRematerialiser.yul
deleted file mode 100644
index e11ea2a96f9e..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/LiteralRematerialiser.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let a := f(mload(1))
-    let b := f(a)
-    sstore(a, b)
-    function f(x) -> y
-    {
-        // Test if LiteralRematerializer can convert `y` to `0` and therefore allowing us to
-        // rewrite the function f
-        if iszero(x) { revert(y, y)}
-        if iszero(add(x, 1)) { revert(y, y)}
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     let a := f_1(mload(1))
-//     let b := f_1(a)
-//     sstore(a, b)
-//     function f(x)
-//     {
-//         if iszero(x) { revert(0, 0) }
-//         if iszero(add(x, 1)) { revert(0, 0) }
-//     }
-//     function f_1(x_2) -> y_3
-//     { f(x_2) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/multiple_param.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/multiple_param.yul
deleted file mode 100644
index f2a036459817..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/multiple_param.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let d, e, i := f(1, 2, 3)
-    sstore(d, 0)
-    // b and x are unused
-    function f(a, b, c) -> x, y, z
-    {
-       y := mload(a)
-       z := mload(c)
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     let d, e, i := f_1(1, 2, 3)
-//     sstore(d, 0)
-//     function f(a, c) -> y, z
-//     {
-//         y := mload(a)
-//         z := mload(c)
-//     }
-//     function f_1(a_2, b_3, c_4) -> x_5, y_6, z_7
-//     { y_6, z_7 := f(a_2, c_4) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/multiple_return.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/multiple_return.yul
deleted file mode 100644
index 51612a699b0f..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/multiple_return.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let a, b, c := f(sload(0))
-    sstore(a, 0)
-    // d is unused, x is unassigned
-    function f(d) -> x, y, z
-    {
-       y := mload(1)
-       z := mload(2)
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     let a, b, c := f_1(sload(0))
-//     sstore(a, 0)
-//     function f() -> y, z
-//     {
-//         y := mload(1)
-//         z := mload(2)
-//     }
-//     function f_1(d_2) -> x_3, y_4, z_5
-//     { y_4, z_5 := f() }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/nested_function.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/nested_function.yul
deleted file mode 100644
index d09ba44a6634..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/nested_function.yul
+++ /dev/null
@@ -1,56 +0,0 @@
-// Test case to see if the step applies for nested functions. The function `j` has an unused argument.
-{
-    sstore(f(1), 0)
-    sstore(h(1), 0)
-
-    function f(a) -> x
-    {
-        x := g(1)
-        x := add(x, 1)
-        function g(b) -> y
-        {
-            b := add(b, 1)
-            y := mload(b)
-        }
-    }
-
-    function h(c) -> u
-    {
-        u := j(c)
-        // d is unused
-        function j(d) -> w
-        {
-            w := 13
-            w := add(w, 1)
-        }
-    }
-
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     sstore(f_1(1), 0)
-//     sstore(h(1), 0)
-//     function g(b) -> y
-//     {
-//         b := add(b, 1)
-//         y := mload(b)
-//     }
-//     function f() -> x
-//     {
-//         x := g(1)
-//         x := add(x, 1)
-//     }
-//     function f_1(a_3) -> x_4
-//     { x_4 := f() }
-//     function j() -> w
-//     {
-//         w := 13
-//         w := add(13, 1)
-//     }
-//     function j_2(d_5) -> w_6
-//     { w_6 := j() }
-//     function h(c) -> u
-//     { u := j_2(c) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/nested_function_name_collision.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/nested_function_name_collision.yul
deleted file mode 100644
index 8ce80f140edb..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/nested_function_name_collision.yul
+++ /dev/null
@@ -1,52 +0,0 @@
-// Test case where the name `g` occurs at two different places. Test to see if name-collision can
-// cause issues.
-{
-    sstore(h(1), 0)
-    sstore(f(1), 0)
-
-    function f(c) -> u
-    {
-        u := g(c)
-        function g(d) -> w
-        {
-            w := 13
-            sstore(0, w)
-        }
-    }
-
-    function h(c) -> u
-    {
-        u := g(c)
-        function g(d) -> w
-        {
-            w := 13
-            sstore(0, w)
-        }
-    }
-
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     sstore(h(1), 0)
-//     sstore(f(1), 0)
-//     function g() -> w
-//     {
-//         w := 13
-//         sstore(0, 13)
-//     }
-//     function g_1(d_3) -> w_4
-//     { w_4 := g() }
-//     function f(c) -> u
-//     { u := g_1(c) }
-//     function g_3() -> w_5
-//     {
-//         w_5 := 13
-//         sstore(0, 13)
-//     }
-//     function g_3_2(d_4_5) -> w_5_6
-//     { w_5_6 := g_3() }
-//     function h(c_1) -> u_2
-//     { u_2 := g_3_2(c_1) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/no_return.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/no_return.yul
deleted file mode 100644
index 1cf059da2979..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/no_return.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    f(1, 2)
-    function f(a, b)
-    {
-        sstore(a, 0)
-        a := add(a, 1)
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     f_1(1, 2)
-//     function f(a)
-//     {
-//         sstore(a, 0)
-//         a := add(a, 1)
-//     }
-//     function f_1(a_2, b_3)
-//     { f(a_2) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/no_unused.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/no_unused.yul
deleted file mode 100644
index ebbb70536acc..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/no_unused.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-// A test where all parameters are used
-{
-    sstore(f(1), 0)
-    function f(a) -> x { x := a }
-    function g(b) -> y { y := g(b) }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     sstore(f(1), 0)
-//     function f(a) -> x
-//     { x := a }
-//     function g(b) -> y
-//     { y := g(b) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/recursion.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/recursion.yul
deleted file mode 100644
index 4a2c5b6ccc30..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/recursion.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let a1, b1, c1 := f(1, 2, 3)
-    function f(a, b, c) -> x, y, z
-    {
-        x, y, z := f(1, 2, 3)
-        x := add(x, 1)
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     let a1, b1, c1 := f_1(1, 2, 3)
-//     function f() -> x, y, z
-//     {
-//         x, y, z := f_1(1, 2, 3)
-//         x := add(x, 1)
-//     }
-//     function f_1(a_2, b_3, c_4) -> x_5, y_6, z_7
-//     { x_5, y_6, z_7 := f() }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/simple.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/simple.yul
deleted file mode 100644
index 873eef9777ab..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/simple.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    sstore(f(1), 0)
-    function f(x) -> y
-    {
-        let w := mload(1)
-        y := mload(w)
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     sstore(f_1(1), 0)
-//     function f() -> y
-//     {
-//         let w := mload(1)
-//         y := mload(w)
-//     }
-//     function f_1(x_2) -> y_3
-//     { y_3 := f() }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/smoke.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/smoke.yul
deleted file mode 100644
index 1e0f9eb6103d..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/too_many_arguments.yul b/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/too_many_arguments.yul
deleted file mode 100644
index 720489d57328..000000000000
--- a/test/libyul/yulOptimizerTests/unusedFunctionParameterPruner/too_many_arguments.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let a, b := f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)
-    sstore(a, b)
-    function f(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18) -> y, z
-    {
-       y := mload(x3)
-       z := mload(x7)
-    }
-}
-// ----
-// step: unusedFunctionParameterPruner
-//
-// {
-//     let a, b := f_1(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)
-//     sstore(a, b)
-//     function f(x3, x7) -> y, z
-//     {
-//         y := mload(x3)
-//         z := mload(x7)
-//     }
-//     function f_1(x1_2, x2_3, x3_4, x4_5, x5_6, x6_7, x7_8, x8_9, x9_10, x10_11, x11_12, x12_13, x13_14, x14_15, x15_16, x16_17, x17_18, x18_19) -> y_20, z_21
-//     { y_20, z_21 := f(x3_4, x7_8) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/functions.yul b/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
deleted file mode 100644
index cafb399f616a..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function f() { let a := 1 }
-    function g() { f() }
-}
-// ----
-// step: unusedPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
deleted file mode 100644
index 00bb145adbee..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let a := 1
-    a := 4
-    let b := 1
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         let a := 1
-//         a := 4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
deleted file mode 100644
index 4132a93f85c4..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a, b
-    function f() -> x { }
-    a := f()
-    b := 1
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         let a, b
-//         a := f()
-//         b := 1
-//     }
-//     function f() -> x
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul b/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul
deleted file mode 100644
index 357b3a33cf9c..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let a := 1
-    let b := keccak256(1, 1)
-    sstore(0, msize())
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         pop(keccak256(1, 1))
-//         sstore(0, msize())
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul b/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul
deleted file mode 100644
index 43a4297cb5e1..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    function f(x) -> t {
-        let b := 7
-    }
-    function g(x) -> t {
-        t := x
-    }
-    let x := f(g(2))
-}
-// ----
-// step: unusedPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/msize.yul b/test/libyul/yulOptimizerTests/unusedPruner/msize.yul
deleted file mode 100644
index 633b447cd92c..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/msize.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    let a := 1
-    let b := mload(10)
-    sstore(0, msize())
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         pop(mload(10))
-//         sstore(0, msize())
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
deleted file mode 100644
index aac772dcb9a0..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let a
-    let b
-    function f() -> x, y { }
-    a, b := f()
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         let a
-//         let b
-//         a, b := f()
-//     }
-//     function f() -> x, y
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
deleted file mode 100644
index a987efe80047..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x, y
-    x := 1
-    y := 2
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         let x, y
-//         x := 1
-//         y := 2
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
deleted file mode 100644
index 3f70d6638a5d..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x, y
-}
-// ----
-// step: unusedPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
deleted file mode 100644
index d65b4d5d7ecf..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function f() -> x, y { }
-    let a, b := f()
-}
-// ----
-// step: unusedPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
deleted file mode 100644
index d66889a8891b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let x, y
-    x := 1
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         let x, y
-//         x := 1
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul b/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul
deleted file mode 100644
index 0591c0e2a676..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let a := 1
-    let b := mload(10)
-    sstore(0, 5)
-}
-// ----
-// step: unusedPruner
-//
-// { { sstore(0, 5) } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/pop.yul b/test/libyul/yulOptimizerTests/unusedPruner/pop.yul
deleted file mode 100644
index 636552eee302..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/pop.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let a := 1
-    pop(a)
-}
-// ----
-// step: unusedPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul b/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
deleted file mode 100644
index 3315ce2c4216..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: unusedPruner
-//
-// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul b/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
deleted file mode 100644
index 8a47d2108388..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let a := 1
-    let b := 1
-    mstore(0, 1)
-}
-// ----
-// step: unusedPruner
-//
-// { { mstore(0, 1) } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul b/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul
deleted file mode 100644
index 7fea85c52c16..000000000000
--- a/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    // cannot be removed because of verbatim
-    let a := mload(10)
-    // cannot be removed because of verbatim
-    let b := keccak256(10, 32)
-    // can be removed
-    let c := add(a, b)
-    verbatim_0i_0o("test")
-}
-// ----
-// step: unusedPruner
-//
-// {
-//     {
-//         pop(mload(10))
-//         pop(keccak256(10, 32))
-//         verbatim_0i_0o("test")
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul
deleted file mode 100644
index eeff779f85e0..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  mstore(0, 1)
-  let x := call(
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0x32 // length is only a max length, so there is no guarantee that the mstore above is overwritten.
-    )
-  sstore(0, mload(0))
-}
-
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         mstore(0, 1)
-//         let x := call(0, 0, 0, 0, 0, 0, 0x32)
-//         sstore(0, mload(0))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul
deleted file mode 100644
index 7fd227089b83..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    let start := calldataload(0x10)
-    if calldataload(0) {
-        // not covered
-        mstore(add(start, 2), 7)
-        calldatacopy(start, 0, 0x20)
-    }
-    if calldataload(1) {
-        // covered
-        mstore(add(start, 2), 9)
-        calldatacopy(add(start, 1), 0, 0x21)
-    }
-    if calldataload(2) {
-        // covered
-        mstore8(add(start, 2), 7)
-        calldatacopy(start, 0, 3)
-    }
-    if calldataload(3) {
-        // not covered
-        mstore8(add(start, 3), 7)
-        calldatacopy(start, 0, 3)
-    }
-    sstore(0, keccak256(start, 0x40))
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let start := calldataload(0x10)
-//         if calldataload(0)
-//         {
-//             let _4 := 7
-//             mstore(add(start, 2), _4)
-//             calldatacopy(start, 0, 0x20)
-//         }
-//         if calldataload(1)
-//         {
-//             let _11 := 9
-//             mstore(add(start, 2), _11)
-//             let _14 := 0x21
-//             let _15 := 0
-//             calldatacopy(add(start, 1), _15, _14)
-//         }
-//         if calldataload(2)
-//         {
-//             let _20 := 7
-//             mstore8(add(start, 2), _20)
-//             calldatacopy(start, 0, 3)
-//         }
-//         if calldataload(3)
-//         {
-//             let _27 := 7
-//             mstore8(add(start, 3), _27)
-//             calldatacopy(start, 0, 3)
-//         }
-//         sstore(0, keccak256(start, 0x40))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul
deleted file mode 100644
index 47e0b95fa3a3..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    if calldataload(0) {
-        // not covered
-        mstore(2, 7)
-        calldatacopy(0, 0, 0x20)
-    }
-    if calldataload(1) {
-        // covered
-        mstore(2, 9)
-        calldatacopy(1, 0, 0x21)
-    }
-    if calldataload(2) {
-        // covered
-        mstore8(2, 7)
-        calldatacopy(0, 0, 3)
-    }
-    if calldataload(3) {
-        // not covered
-        mstore8(3, 7)
-        calldatacopy(0, 0, 3)
-    }
-    sstore(0, keccak256(0, 0x40))
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         if calldataload(0)
-//         {
-//             mstore(2, 7)
-//             calldatacopy(0, 0, 0x20)
-//         }
-//         if calldataload(1)
-//         {
-//             let _10 := 9
-//             let _11 := 2
-//             calldatacopy(1, 0, 0x21)
-//         }
-//         if calldataload(2)
-//         {
-//             let _17 := 7
-//             let _18 := 2
-//             calldatacopy(0, 0, 3)
-//         }
-//         if calldataload(3)
-//         {
-//             mstore8(3, 7)
-//             calldatacopy(0, 0, 3)
-//         }
-//         sstore(0, keccak256(0, 0x40))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul
deleted file mode 100644
index c3183d9ec83b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let x := 5
-    sstore(x, 10)
-    pop(create(0, 0, 0))
-    sstore(x, 20)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 5
-//         sstore(x, 10)
-//         pop(create(0, 0, 0))
-//         sstore(x, 20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul
deleted file mode 100644
index 782c68663b08..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    let x := 5
-    function f() {
-        pop(create(0, 0, 0))
-    }
-    sstore(x, 10)
-    f()
-    sstore(x, 20)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 5
-//         sstore(x, 10)
-//         f()
-//         sstore(x, 20)
-//     }
-//     function f()
-//     { pop(create(0, 0, 0)) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul
deleted file mode 100644
index cb69be363594..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    function f() {
-        let x := calldataload(2)
-        mstore(x, 2)
-        // This cannot be removed because we do not know what happens after the function.
-        mstore(x, 3)
-    }
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     { }
-//     function f()
-//     {
-//         let x := calldataload(2)
-//         let _2 := 2
-//         mstore(x, 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul
deleted file mode 100644
index 25f9355b3bb1..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    function justStop() { return(0, 0) }
-    function justRevert() { revert(0, 0) }
-
-    let x := 0
-    let y := 1
-    let a := 0x80
-    let b := 7
-    let c := 9
-    switch calldataload(0)
-    case 0
-    {
-        sstore(x, y)
-        mstore(a, b)
-        justStop()
-        sstore(x, y)
-        mstore(a, b)
-    }
-    case 1
-    {
-        sstore(x, y)
-        mstore(a, b)
-        justRevert()
-        sstore(x, y)
-        mstore(a, b)
-    }
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         let y := 1
-//         let a := 0x80
-//         let b := 7
-//         let c := 9
-//         switch calldataload(0)
-//         case 0 {
-//             sstore(x, y)
-//             mstore(a, b)
-//             justStop()
-//             sstore(x, y)
-//         }
-//         case 1 {
-//             mstore(a, b)
-//             justRevert()
-//             sstore(x, y)
-//         }
-//     }
-//     function justStop()
-//     { return(0, 0) }
-//     function justRevert()
-//     { revert(0, 0) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul
deleted file mode 100644
index 843f7f6e9f52..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-   let x := 0
-   let y := 1
-   sstore(x, y)
-   f()
-   sstore(x, y)
-   function f() {
-      // prevent inlining
-      f()
-      return(0, 0)
-   }
-  }
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         let y := 1
-//         f()
-//         sstore(x, y)
-//     }
-//     function f()
-//     {
-//         f()
-//         return(0, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul
deleted file mode 100644
index 7054dc255464..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let c := calldataload(0)
-    // This store will be overwritten in all branches and thus can be removed.
-    sstore(c, 1)
-    if c {
-        sstore(c, 2)
-    }
-    sstore(c, 3)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let c := calldataload(0)
-//         let _2 := 1
-//         if c { let _3 := 2 }
-//         sstore(c, 3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul
deleted file mode 100644
index 92a75155410b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    function f() {
-        mstore(0, 5)
-        if calldataload(0) { leave }
-        mstore(0x20, 5)
-        revert(0, 0)
-    }
-    f()
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     { f() }
-//     function f()
-//     {
-//         mstore(0, 5)
-//         if calldataload(0) { leave }
-//         let _5 := 5
-//         let _6 := 0x20
-//         revert(0, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul
deleted file mode 100644
index 466cd02e5331..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    mstore(0x40, memoryguard(100))
-    let free_mem_ptr := mload(0x40)
-    // redundant
-    mstore(free_mem_ptr, 100)
-    // redundant
-    mstore8(add(free_mem_ptr, 31), 200)
-    mstore(free_mem_ptr, 300)
-    return(free_mem_ptr, add(free_mem_ptr, 100))
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         mstore(0x40, memoryguard(100))
-//         let free_mem_ptr := mload(0x40)
-//         let _4 := 100
-//         let _5 := 200
-//         mstore8(add(free_mem_ptr, 31), _5)
-//         mstore(free_mem_ptr, 300)
-//         return(free_mem_ptr, add(free_mem_ptr, 100))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul
deleted file mode 100644
index 717332472c38..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    let zero := 0
-    mstore(zero, 5)
-    let x := mload(zero)
-    mstore(zero, 8)
-    let y := mload(zero)
-    sstore(zero, y)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let zero := 0
-//         mstore(zero, 5)
-//         let x := mload(zero)
-//         mstore(zero, 8)
-//         sstore(zero, mload(zero))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul
deleted file mode 100644
index 524b328e9e7e..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  function f() -> r {
-     r := mload(0x20)
-  }
-  let x := 5
-  sstore(x, 10) // should be removed
-  mstore(0, 42) // could be removed, but will probably stay?
-  pop(f())
-  sstore(x, 10)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 5
-//         let _2 := 10
-//         mstore(0, 42)
-//         pop(f())
-//         sstore(x, 10)
-//     }
-//     function f() -> r
-//     {
-//         r := mload(0x20)
-//         let r_7 := r
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul
deleted file mode 100644
index dda59873cb24..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    let x := 0
-
-    calldatacopy(0, 0, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
-    mstore(x, 20)
-    return(0, 32)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         calldatacopy(0, 0, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
-//         mstore(x, 20)
-//         return(0, 32)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul
deleted file mode 100644
index 78179dc3eab9..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let _1 := 0
-    if callvalue() { revert(_1, _1) }
-    mstore(_1, shl(224, 0x4e487b71))
-    mstore(4, 0x32)
-    revert(_1, 0x24)
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let _1 := 0
-//         if callvalue() { revert(_1, _1) }
-//         mstore(_1, shl(224, 0x4e487b71))
-//         mstore(4, 0x32)
-//         revert(_1, 0x24)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul
deleted file mode 100644
index 2950a04ce2fb..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    let _1 := 0
-    let _2 := callvalue()
-    let _3 := 0x4e487b71
-    let _4 := 224
-    let _5 := 7
-    mstore(_1, _5)
-    let _6 := 0x32
-    let _7 := 4
-    mstore(_7, _6)
-    let _8 := 0x24
-    revert(_1, _8)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let _1 := 0
-//         let _2 := callvalue()
-//         let _3 := 0x4e487b71
-//         let _4 := 224
-//         mstore(_1, 7)
-//         mstore(4, 0x32)
-//         revert(_1, 0x24)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul
deleted file mode 100644
index e7777964c20e..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    let c := calldataload(0)
-    mstore(c, 4)
-    if c {
-        sstore(c, 2)
-    }
-    let d := 0
-    revert(d, d)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let c := calldataload(0)
-//         let _2 := 4
-//         if c { let _3 := 2 }
-//         let d := 0
-//         revert(d, d)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul
deleted file mode 100644
index 50c05e8260bd..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  returndatacopy(0,0,32)
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: unusedStoreEliminator
-//
-// { { returndatacopy(0, 0, 32) } }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul
deleted file mode 100644
index e0d5cbf1c2d7..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  returndatacopy(0,0,returndatasize())
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let _1 := returndatasize()
-//         let _2 := 0
-//         let _3 := 0
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul
deleted file mode 100644
index a40e76955b3f..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  returndatacopy(0,1,returndatasize())
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         returndatacopy(0, 1, returndatasize())
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul
deleted file mode 100644
index eac2070f7411..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  let s := returndatasize()
-  returndatacopy(0,0,s)
-}
-// ====
-// EVMVersion: >homestead
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let s := returndatasize()
-//         let _1 := 0
-//         let _2 := 0
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call.yul
deleted file mode 100644
index 44fbb70115a4..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    function conditionallyStop() {
-        if calldataload(0) { leave }
-        return(0, 0)
-    }
-    let x := 0
-    let y := 1
-    sstore(x, y) // used to be removed due to the StorageWriteRemovalBeforeConditionalTermination
-    conditionallyStop()
-    sstore(x, y)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         let y := 1
-//         sstore(x, y)
-//         conditionallyStop()
-//         sstore(x, y)
-//     }
-//     function conditionallyStop()
-//     {
-//         if calldataload(0) { leave }
-//         return(0, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul
deleted file mode 100644
index dd88f4973a7b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    function conditionallyStop() {
-        if calldataload(0) { leave }
-        return(0, 0)
-    }
-    function g() {
-        let a := 0
-        let b := 1
-        sstore(a, b)
-    }
-    let x := 0
-    let y := 1
-    let z := 2
-    switch calldataload(64)
-    case 0 {
-        sstore(z, x)
-        g()
-    }
-    default {
-        sstore(x, z) // used to be removed due to the StorageWriteRemovalBeforeConditionalTermination
-    }
-    conditionallyStop()
-    switch calldataload(32)
-    case 0 {
-        revert(0, 0)
-    }
-    default {
-        sstore(x, z)
-    }
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         let y := 1
-//         let z := 2
-//         switch calldataload(64)
-//         case 0 {
-//             sstore(z, x)
-//             g()
-//         }
-//         default { sstore(x, z) }
-//         conditionallyStop()
-//         switch calldataload(32)
-//         case 0 { revert(0, 0) }
-//         default { sstore(x, z) }
-//     }
-//     function conditionallyStop()
-//     {
-//         if calldataload(0) { leave }
-//         return(0, 0)
-//     }
-//     function g()
-//     {
-//         let a := 0
-//         sstore(a, 1)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul
deleted file mode 100644
index fc45bb64c5c9..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    function conditionallyStop() {
-        if calldataload(0) { leave }
-        return(0, 0)
-    }
-    let x := 0
-    let y := 1
-    sstore(x, y) // used to be removed due to the to the StorageWriteRemovalBeforeConditionalTermination bug
-    conditionallyStop()
-    revert(0,0)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         sstore(x, 1)
-//         conditionallyStop()
-//         revert(0, 0)
-//     }
-//     function conditionallyStop()
-//     {
-//         if calldataload(0) { leave }
-//         return(0, 0)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul
deleted file mode 100644
index 1d15078eb95b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    function conditionallyStop() {
-        if calldataload(0) { leave }
-        returnEmpty()
-    }
-    function returnEmpty() {
-        return(0, 0)
-    }
-    let x := 0
-    let y := 1
-    sstore(x, y) // used to be removed due to a bug
-    conditionallyStop()
-    sstore(x, y)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         let y := 1
-//         sstore(x, y)
-//         conditionallyStop()
-//         sstore(x, y)
-//     }
-//     function conditionallyStop()
-//     {
-//         if calldataload(0) { leave }
-//         returnEmpty()
-//     }
-//     function returnEmpty()
-//     { return(0, 0) }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul
deleted file mode 100644
index c104e4d9b708..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    function neverStop() {
-        if calldataload(0) { leave } // prevent inlining
-    }
-    let x := 0
-    let y := 1
-    sstore(x, y) // should be removed
-    neverStop()
-    sstore(x, y)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let x := 0
-//         let y := 1
-//         neverStop()
-//         sstore(x, y)
-//     }
-//     function neverStop()
-//     { if calldataload(0) { leave } }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul
deleted file mode 100644
index 3bfd558fe08e..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let zero := 0
-    mstore(zero, 0x1234)
-    mstore(4, 0x456)
-    revert(zero, 5)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let zero := 0
-//         mstore(zero, 0x1234)
-//         mstore(4, 0x456)
-//         revert(zero, 5)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul
deleted file mode 100644
index db5f060a634d..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    let a
-    switch calldataload(0)
-    case 0 { a := calldataload(9) }
-    case 1 { a := calldataload(10) }
-
-    calldatacopy(0x20, 0, a)
-    let x := mload(0)
-    sstore(0, x)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let a_9
-//         let a := a_9
-//         switch calldataload(0)
-//         case 0 {
-//             a := calldataload(9)
-//             let a_10 := a
-//         }
-//         case 1 {
-//             let a_12 := a
-//             a := calldataload(10)
-//             let a_11 := a
-//         }
-//         let a_13 := a
-//         let _5 := 0
-//         let _6 := 0x20
-//         sstore(0, mload(0))
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul
deleted file mode 100644
index b0b42060f49c..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    let c := calldataload(0)
-    mstore(c, 4)
-    mstore(add(c, 0x20), 8)
-    sstore(0, mload(c))
-    mstore(c, 9)
-    mstore(add(c, 0x20), 20)
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let c := calldataload(0)
-//         mstore(c, 4)
-//         let _3 := 8
-//         let _5 := add(c, 0x20)
-//         sstore(0, mload(c))
-//         let _8 := 9
-//         let _9 := 20
-//         let _11 := add(c, 0x20)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul
deleted file mode 100644
index 855ae8325b7b..000000000000
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    sstore(0, 1)
-    mstore(0, 2)
-    f()
-    function f() {
-        g()
-    }
-    function g() {
-        f()
-    }
-}
-// ----
-// step: unusedStoreEliminator
-//
-// {
-//     {
-//         let _1 := 1
-//         let _2 := 0
-//         let _3 := 2
-//         let _4 := 0
-//         f()
-//     }
-//     function f()
-//     { g() }
-//     function g()
-//     { f() }
-// }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/ambiguous.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/ambiguous.yul
deleted file mode 100644
index 8d306ca16875..000000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/ambiguous.yul
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  // This component does not need the disambiguator
-  function f() -> x, y {
-    let a, b
-    mstore(a, b)
-    let d
-    d := 2
-  }
-  let a
-  a := 4
-  let b := 2
-  let x, y := f()
-}
-// ----
-// step: varDeclInitializer
-//
-// {
-//     function f() -> x, y
-//     {
-//         let a := 0
-//         let b := 0
-//         mstore(a, b)
-//         let d := 0
-//         d := 2
-//     }
-//     let a := 0
-//     a := 4
-//     let b := 2
-//     let x, y := f()
-// }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/inside_func.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/inside_func.yul
deleted file mode 100644
index 9a169b4354a1..000000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/inside_func.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  function f() -> x, y {
-    let a, b
-    mstore(a, b)
-    let d
-    d := 2
-  }
-  let r
-  r := 4
-}
-// ----
-// step: varDeclInitializer
-//
-// {
-//     function f() -> x, y
-//     {
-//         let a := 0
-//         let b := 0
-//         mstore(a, b)
-//         let d := 0
-//         d := 2
-//     }
-//     let r := 0
-//     r := 4
-// }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/multi.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/multi.yul
deleted file mode 100644
index 4968e2b0400f..000000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/multi.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  let x, y, z
-  let a
-  let b
-}
-// ----
-// step: varDeclInitializer
-//
-// {
-//     let x := 0
-//     let y := 0
-//     let z := 0
-//     let a := 0
-//     let b := 0
-// }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/multi_assign.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/multi_assign.yul
deleted file mode 100644
index f8c37f2c5016..000000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/multi_assign.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  function f() -> x, y {
-    let a, b := f()
-	let u
-  }
-  let r
-  let s := 3
-  let t
-}
-// ----
-// step: varDeclInitializer
-//
-// {
-//     function f() -> x, y
-//     {
-//         let a, b := f()
-//         let u := 0
-//     }
-//     let r := 0
-//     let s := 3
-//     let t := 0
-// }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/simple.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/simple.yul
deleted file mode 100644
index 2b7d1048f968..000000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/simple.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  let a
-}
-// ----
-// step: varDeclInitializer
-//
-// { let a := 0 }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul
deleted file mode 100644
index 069c68cab89e..000000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let a1
-    let a2: bool
-    let b1, b2: bool
-    function f(a:u256, b:u256, c:bool) -> r:bool, t {
-        let x1: bool, x2
-    }
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: varDeclInitializer
-//
-// {
-//     let a1 := 0
-//     let a2:bool := false
-//     let b1 := 0
-//     let b2:bool := false
-//     function f(a, b, c:bool) -> r:bool, t
-//     {
-//         let x1:bool := false
-//         let x2 := 0
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/builtins.yul b/test/libyul/yulOptimizerTests/varNameCleaner/builtins.yul
deleted file mode 100644
index 43c30137a869..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/builtins.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	let datasize_256 := 1
-}
-// ----
-// step: varNameCleaner
-//
-// { { let datasize_1 := 1 } }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/function_names.yul b/test/libyul/yulOptimizerTests/varNameCleaner/function_names.yul
deleted file mode 100644
index c8b2bef2429f..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/function_names.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	function f() { let f_1 }
-	let f_2
-	let f_10
-}
-// ----
-// step: varNameCleaner
-//
-// {
-//     {
-//         let f_1
-//         let f_2
-//     }
-//     function f()
-//     { let f_1 }
-// }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/function_parameters.yul b/test/libyul/yulOptimizerTests/varNameCleaner/function_parameters.yul
deleted file mode 100644
index c0656056eec0..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/function_parameters.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	let f_2
-	function f(x_12) -> x, y_14
-	{
-		let y := x_12
-		y_14 := y
-		x := y_14
-	}
-	let f_10
-}
-// ----
-// step: varNameCleaner
-//
-// {
-//     {
-//         let f_1
-//         let f_2
-//     }
-//     function f(x) -> x_1, y
-//     {
-//         let y_1 := x
-//         y := y_1
-//         x_1 := y
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/function_scopes.yul b/test/libyul/yulOptimizerTests/varNameCleaner/function_scopes.yul
deleted file mode 100644
index 2882459dbe93..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/function_scopes.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	function f() { let x_1 := 0 }
-	function g() { let x_2 := 0 }
-}
-// ----
-// step: varNameCleaner
-//
-// {
-//     { }
-//     function f()
-//     { let x := 0 }
-//     function g()
-//     { let x := 0 }
-// }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/instructions.yul b/test/libyul/yulOptimizerTests/varNameCleaner/instructions.yul
deleted file mode 100644
index 325ec7d8414a..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/instructions.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	let mul_256 := 1
-}
-// ----
-// step: varNameCleaner
-//
-// { { let mul_1 := 1 } }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/name_stripping.yul b/test/libyul/yulOptimizerTests/varNameCleaner/name_stripping.yul
deleted file mode 100644
index 7d7d763c5424..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/name_stripping.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  let a_1 := 1
-  let a_2_1 := 2
-  let a_4312 := 0xdeadbeef
-  let _42 := 21718
-}
-// ----
-// step: varNameCleaner
-//
-// {
-//     {
-//         let a := 1
-//         let a_1 := 2
-//         let a_2 := 0xdeadbeef
-//         let _1 := 21718
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/reshuffling-inverse.yul b/test/libyul/yulOptimizerTests/varNameCleaner/reshuffling-inverse.yul
deleted file mode 100644
index 237ab8612e92..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/reshuffling-inverse.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	let x_4 := 1
-	let x_3 := 2
-	let x_2 := 3
-	let x_1 := 4
-}
-// ----
-// step: varNameCleaner
-//
-// {
-//     {
-//         let x := 1
-//         let x_1 := 2
-//         let x_2 := 3
-//         let x_3 := 4
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/varNameCleaner/reshuffling.yul b/test/libyul/yulOptimizerTests/varNameCleaner/reshuffling.yul
deleted file mode 100644
index 0df1715d739b..000000000000
--- a/test/libyul/yulOptimizerTests/varNameCleaner/reshuffling.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	let x_1 := 1
-	let x_2 := 2
-	let x_3 := 3
-}
-// ----
-// step: varNameCleaner
-//
-// {
-//     {
-//         let x := 1
-//         let x_1 := 2
-//         let x_2 := 3
-//     }
-// }
diff --git a/test/libyul/yulStackLayout/complex.yul b/test/libyul/yulStackLayout/complex.yul
deleted file mode 100644
index 604dca1f46e2..000000000000
--- a/test/libyul/yulStackLayout/complex.yul
+++ /dev/null
@@ -1,318 +0,0 @@
-{
-    function f(a, b) -> c {
-        for { let x := 42 } lt(x, a) {
-            x := add(x, 1)
-            if calldataload(x)
-            {
-                sstore(0, x)
-                c := 0x21
-                leave
-                sstore(0x01, 0x0101)
-            }
-            sstore(0xFF, 0xFFFF)
-        }
-        {
-            switch mload(x)
-            case 0 {
-                sstore(a, b)
-                break
-                sstore(a, b)
-            }
-            case 1 {
-                sstore(0x04, x)
-                leave
-                sstore(a, 0x0505)
-            }
-            case 2 {
-                sstore(x, 0x06)
-                c := 42
-                revert(0, 0)
-                sstore(0x07, 0x0707)
-            }
-            case 3 {
-                sstore(0x08, 0x0808)
-            }
-            default {
-                if mload(b) {
-                    return(0, 0)
-                    sstore(0x09, 0x0909)
-                }
-                sstore(0x0A, 0x0A0A)
-            }
-            sstore(0x0B, 0x0B0B)
-        }
-        sstore(0x0C, 0x0C0C)
-        if sload(0x0D) {
-            c := 0x424242
-        }
-    }
-    pop(f(1,2))
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ RET[f] 0x02 0x01 ]\l\
-// f\l\
-// [ TMP[f, 0] ]\l\
-// [ TMP[f, 0] ]\l\
-// pop\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// FunctionEntry_f [label="function f(a, b) -> c\l\
-// [ RET b a ]"];
-// FunctionEntry_f -> Block1;
-// Block1 [label="\
-// [ c RET a b ]\l\
-// [ c RET a b 0x2a ]\l\
-// Assignment(x)\l\
-// [ c RET a b x ]\l\
-// [ c RET a b x ]\l\
-// "];
-// Block1 -> Block1Exit [arrowhead=none];
-// Block1Exit [label="Jump" shape=oval];
-// Block1Exit -> Block2;
-//
-// Block2 [label="\
-// [ c RET a b x ]\l\
-// [ c RET a b x a x ]\l\
-// lt\l\
-// [ c RET a b x TMP[lt, 0] ]\l\
-// [ c RET a b x TMP[lt, 0] ]\l\
-// "];
-// Block2 -> Block2Exit;
-// Block2Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block2Exit:0 -> Block3;
-// Block2Exit:1 -> Block4;
-//
-// Block3 [label="\
-// [ c RET JUNK JUNK JUNK ]\l\
-// [ c RET 0x0c0c 0x0c ]\l\
-// sstore\l\
-// [ c RET ]\l\
-// [ c RET 0x0d ]\l\
-// sload\l\
-// [ c RET TMP[sload, 0] ]\l\
-// [ c RET TMP[sload, 0] ]\l\
-// "];
-// Block3 -> Block3Exit;
-// Block3Exit [label="{ TMP[sload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block3Exit:0 -> Block5;
-// Block3Exit:1 -> Block6;
-//
-// Block4 [label="\
-// [ c RET a b x ]\l\
-// [ c RET a b x x ]\l\
-// mload\l\
-// [ c RET a b x TMP[mload, 0] ]\l\
-// [ c RET a b x TMP[mload, 0] ]\l\
-// Assignment(GHOST[0])\l\
-// [ c RET a b x GHOST[0] ]\l\
-// [ c RET a b x GHOST[0] GHOST[0] 0x00 ]\l\
-// eq\l\
-// [ c RET a b x GHOST[0] TMP[eq, 0] ]\l\
-// [ c RET a b x GHOST[0] TMP[eq, 0] ]\l\
-// "];
-// Block4 -> Block4Exit;
-// Block4Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block4Exit:0 -> Block7;
-// Block4Exit:1 -> Block8;
-//
-// Block5 [label="\
-// [ c RET ]\l\
-// [ c RET ]\l\
-// "];
-// Block5Exit [label="FunctionReturn[f]"];
-// Block5 -> Block5Exit;
-//
-// Block6 [label="\
-// [ JUNK RET ]\l\
-// [ RET 0x424242 ]\l\
-// Assignment(c)\l\
-// [ RET c ]\l\
-// [ c RET ]\l\
-// "];
-// Block6 -> Block6Exit [arrowhead=none];
-// Block6Exit [label="Jump" shape=oval];
-// Block6Exit -> Block5;
-//
-// Block7 [label="\
-// [ c RET a b x GHOST[0] ]\l\
-// [ c RET a b x GHOST[0] GHOST[0] 0x01 ]\l\
-// eq\l\
-// [ c RET a b x GHOST[0] TMP[eq, 0] ]\l\
-// [ c RET a b x GHOST[0] TMP[eq, 0] ]\l\
-// "];
-// Block7 -> Block7Exit;
-// Block7Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block7Exit:0 -> Block9;
-// Block7Exit:1 -> Block10;
-//
-// Block8 [label="\
-// [ c RET a b JUNK JUNK ]\l\
-// [ c RET b a ]\l\
-// sstore\l\
-// [ c RET ]\l\
-// [ c RET ]\l\
-// "];
-// Block8 -> Block8Exit [arrowhead=none];
-// Block8Exit [label="Jump" shape=oval];
-// Block8Exit -> Block3;
-//
-// Block9 [label="\
-// [ c RET a b x GHOST[0] ]\l\
-// [ c RET a b x GHOST[0] GHOST[0] 0x02 ]\l\
-// eq\l\
-// [ c RET a b x GHOST[0] TMP[eq, 0] ]\l\
-// [ c RET a b x GHOST[0] TMP[eq, 0] ]\l\
-// "];
-// Block9 -> Block9Exit;
-// Block9Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block9Exit:0 -> Block11;
-// Block9Exit:1 -> Block12;
-//
-// Block10 [label="\
-// [ c RET JUNK JUNK x JUNK ]\l\
-// [ c RET x 0x04 ]\l\
-// sstore\l\
-// [ c RET ]\l\
-// [ c RET ]\l\
-// "];
-// Block10Exit [label="FunctionReturn[f]"];
-// Block10 -> Block10Exit;
-//
-// Block11 [label="\
-// [ c RET a b x GHOST[0] ]\l\
-// [ c RET a b x GHOST[0] 0x03 ]\l\
-// eq\l\
-// [ c RET a b x TMP[eq, 0] ]\l\
-// [ c RET a b x TMP[eq, 0] ]\l\
-// "];
-// Block11 -> Block11Exit;
-// Block11Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block11Exit:0 -> Block13;
-// Block11Exit:1 -> Block14;
-//
-// Block12 [label="\
-// [ JUNK JUNK JUNK JUNK x JUNK ]\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK 0x06 x ]\l\
-// sstore\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK ]\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK 0x2a ]\l\
-// Assignment(c)\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK c ]\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK 0x00 0x00 ]\l\
-// revert\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK ]\l\
-// [ JUNK JUNK JUNK JUNK JUNK JUNK ]\l\
-// "];
-// Block12Exit [label="Terminated"];
-// Block12 -> Block12Exit;
-//
-// Block13 [label="\
-// [ c RET a b x ]\l\
-// [ c RET a b x b ]\l\
-// mload\l\
-// [ c RET a b x TMP[mload, 0] ]\l\
-// [ c RET a b x TMP[mload, 0] ]\l\
-// "];
-// Block13 -> Block13Exit;
-// Block13Exit [label="{ TMP[mload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block13Exit:0 -> Block15;
-// Block13Exit:1 -> Block16;
-//
-// Block14 [label="\
-// [ c RET a b x ]\l\
-// [ c RET a b 0x01 x 0x0808 0x08 ]\l\
-// sstore\l\
-// [ c RET a b 0x01 x ]\l\
-// [ c RET a b 0x01 x ]\l\
-// "];
-// Block14 -> Block14Exit [arrowhead=none];
-// Block14Exit [label="Jump" shape=oval];
-// Block14Exit -> Block17;
-//
-// Block15 [label="\
-// [ c RET a b x ]\l\
-// [ c RET a b 0x01 x 0x0a0a 0x0a ]\l\
-// sstore\l\
-// [ c RET a b 0x01 x ]\l\
-// [ c RET a b 0x01 x ]\l\
-// "];
-// Block15 -> Block15Exit [arrowhead=none];
-// Block15Exit [label="Jump" shape=oval];
-// Block15Exit -> Block17;
-//
-// Block16 [label="\
-// [ JUNK JUNK JUNK JUNK JUNK ]\l\
-// [ JUNK JUNK JUNK JUNK JUNK 0x00 0x00 ]\l\
-// return\l\
-// [ JUNK JUNK JUNK JUNK JUNK ]\l\
-// [ JUNK JUNK JUNK JUNK JUNK ]\l\
-// "];
-// Block16Exit [label="Terminated"];
-// Block16 -> Block16Exit;
-//
-// Block17 [label="\
-// [ c RET a b 0x01 x ]\l\
-// [ c RET a b 0x01 x 0x0b0b 0x0b ]\l\
-// sstore\l\
-// [ c RET a b 0x01 x ]\l\
-// [ c RET a b 0x01 x ]\l\
-// "];
-// Block17 -> Block17Exit [arrowhead=none];
-// Block17Exit [label="Jump" shape=oval];
-// Block17Exit -> Block18;
-//
-// Block18 [label="\
-// [ c RET a b 0x01 x ]\l\
-// [ c RET a b 0x01 x ]\l\
-// add\l\
-// [ c RET a b TMP[add, 0] ]\l\
-// [ c RET a b TMP[add, 0] ]\l\
-// Assignment(x)\l\
-// [ c RET a b x ]\l\
-// [ c RET x b a x ]\l\
-// calldataload\l\
-// [ c RET x b a TMP[calldataload, 0] ]\l\
-// [ c RET x b a TMP[calldataload, 0] ]\l\
-// "];
-// Block18 -> Block18Exit;
-// Block18Exit [label="{ TMP[calldataload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block18Exit:0 -> Block19;
-// Block18Exit:1 -> Block20;
-//
-// Block19 [label="\
-// [ c RET x b a ]\l\
-// [ c RET x b a 0xffff 0xff ]\l\
-// sstore\l\
-// [ c RET x b a ]\l\
-// [ c RET x b a ]\l\
-// "];
-// Block19 -> Block19Exit [arrowhead=none];
-// Block19Exit [label="BackwardsJump" shape=oval];
-// Block19Exit -> Block2;
-//
-// Block20 [label="\
-// [ JUNK RET x JUNK JUNK ]\l\
-// [ RET x 0x00 ]\l\
-// sstore\l\
-// [ RET ]\l\
-// [ RET 0x21 ]\l\
-// Assignment(c)\l\
-// [ RET c ]\l\
-// [ c RET ]\l\
-// "];
-// Block20Exit [label="FunctionReturn[f]"];
-// Block20 -> Block20Exit;
-//
-// }
diff --git a/test/libyul/yulStackLayout/for.yul b/test/libyul/yulStackLayout/for.yul
deleted file mode 100644
index 88aafad6b20a..000000000000
--- a/test/libyul/yulStackLayout/for.yul
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    let x := 0x01
-    let y := 0x02
-    sstore(0x01, x)
-    for { sstore(0x02, 0x0202) } lt(x, 0x0303) { x := add(x,0x0404) } {
-        sstore(0x05, 0x0505)
-        y := sload(x)
-    }
-    sstore(0x06, 0x0506)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ 0x01 ]\l\
-// Assignment(x)\l\
-// [ x ]\l\
-// [ x 0x02 ]\l\
-// Assignment(y)\l\
-// [ x y ]\l\
-// [ x x 0x01 ]\l\
-// sstore\l\
-// [ x ]\l\
-// [ x 0x0202 0x02 ]\l\
-// sstore\l\
-// [ x ]\l\
-// [ x ]\l\
-// "];
-// Block0 -> Block0Exit [arrowhead=none];
-// Block0Exit [label="Jump" shape=oval];
-// Block0Exit -> Block1;
-//
-// Block1 [label="\
-// [ x ]\l\
-// [ x 0x0303 x ]\l\
-// lt\l\
-// [ x TMP[lt, 0] ]\l\
-// [ x TMP[lt, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[lt, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block2;
-// Block1Exit:1 -> Block3;
-//
-// Block2 [label="\
-// [ JUNK ]\l\
-// [ JUNK 0x0506 0x06 ]\l\
-// sstore\l\
-// [ JUNK ]\l\
-// [ JUNK ]\l\
-// "];
-// Block2Exit [label="MainExit"];
-// Block2 -> Block2Exit;
-//
-// Block3 [label="\
-// [ x ]\l\
-// [ 0x0404 x 0x0505 0x05 ]\l\
-// sstore\l\
-// [ 0x0404 x ]\l\
-// [ 0x0404 x x ]\l\
-// sload\l\
-// [ 0x0404 x TMP[sload, 0] ]\l\
-// [ 0x0404 x TMP[sload, 0] ]\l\
-// Assignment(y)\l\
-// [ 0x0404 x y ]\l\
-// [ 0x0404 x ]\l\
-// "];
-// Block3 -> Block3Exit [arrowhead=none];
-// Block3Exit [label="Jump" shape=oval];
-// Block3Exit -> Block4;
-//
-// Block4 [label="\
-// [ 0x0404 x ]\l\
-// [ 0x0404 x ]\l\
-// add\l\
-// [ TMP[add, 0] ]\l\
-// [ TMP[add, 0] ]\l\
-// Assignment(x)\l\
-// [ x ]\l\
-// [ x ]\l\
-// "];
-// Block4 -> Block4Exit [arrowhead=none];
-// Block4Exit [label="BackwardsJump" shape=oval];
-// Block4Exit -> Block1;
-//
-// }
diff --git a/test/libyul/yulStackLayout/function.yul b/test/libyul/yulStackLayout/function.yul
deleted file mode 100644
index ccf97422f44f..000000000000
--- a/test/libyul/yulStackLayout/function.yul
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    function f(a, b) -> r {
-        let x := add(a,b)
-        r := sub(x,a)
-    }
-    function g() {
-        sstore(0x01, 0x0101)
-    }
-    function h(x) {
-        h(f(x, 0))
-        g()
-    }
-    function i() -> v, w {
-        v := 0x0202
-        w := 0x0303
-    }
-    let x, y := i()
-    h(x)
-    h(y)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ RET[i] ]\l\
-// i\l\
-// [ TMP[i, 0] TMP[i, 1] ]\l\
-// [ TMP[i, 0] TMP[i, 1] ]\l\
-// Assignment(x, y)\l\
-// [ x y ]\l\
-// [ x ]\l\
-// h\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block0Exit [label="Terminated"];
-// Block0 -> Block0Exit;
-//
-// FunctionEntry_f [label="function f(a, b) -> r\l\
-// [ RET b a ]"];
-// FunctionEntry_f -> Block1;
-// Block1 [label="\
-// [ RET a b ]\l\
-// [ RET a b a ]\l\
-// add\l\
-// [ RET a TMP[add, 0] ]\l\
-// [ RET a TMP[add, 0] ]\l\
-// Assignment(x)\l\
-// [ RET a x ]\l\
-// [ RET a x ]\l\
-// sub\l\
-// [ RET TMP[sub, 0] ]\l\
-// [ RET TMP[sub, 0] ]\l\
-// Assignment(r)\l\
-// [ RET r ]\l\
-// [ r RET ]\l\
-// "];
-// Block1Exit [label="FunctionReturn[f]"];
-// Block1 -> Block1Exit;
-//
-// FunctionEntry_g [label="function g()\l\
-// [ RET ]"];
-// FunctionEntry_g -> Block2;
-// Block2 [label="\
-// [ RET ]\l\
-// [ RET 0x0101 0x01 ]\l\
-// sstore\l\
-// [ RET ]\l\
-// [ RET ]\l\
-// "];
-// Block2Exit [label="FunctionReturn[g]"];
-// Block2 -> Block2Exit;
-//
-// FunctionEntry_h [label="function h(x)\l\
-// [ RET x ]"];
-// FunctionEntry_h -> Block3;
-// Block3 [label="\
-// [ RET[f] 0x00 x ]\l\
-// [ RET[f] 0x00 x ]\l\
-// f\l\
-// [ TMP[f, 0] ]\l\
-// [ TMP[f, 0] ]\l\
-// h\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block3Exit [label="Terminated"];
-// Block3 -> Block3Exit;
-//
-// FunctionEntry_i [label="function i() -> v, w\l\
-// [ RET ]"];
-// FunctionEntry_i -> Block4;
-// Block4 [label="\
-// [ RET ]\l\
-// [ RET 0x0202 ]\l\
-// Assignment(v)\l\
-// [ RET v ]\l\
-// [ v RET 0x0303 ]\l\
-// Assignment(w)\l\
-// [ v RET w ]\l\
-// [ v w RET ]\l\
-// "];
-// Block4Exit [label="FunctionReturn[i]"];
-// Block4 -> Block4Exit;
-//
-// }
diff --git a/test/libyul/yulStackLayout/if.yul b/test/libyul/yulStackLayout/if.yul
deleted file mode 100644
index a019788b3061..000000000000
--- a/test/libyul/yulStackLayout/if.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    sstore(0x01, 0x0101)
-    if calldataload(0) {
-        sstore(0x02, 0x0202)
-    }
-    sstore(0x03, 0x003)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ 0x0101 0x01 ]\l\
-// sstore\l\
-// [ ]\l\
-// [ 0x00 ]\l\
-// calldataload\l\
-// [ TMP[calldataload, 0] ]\l\
-// [ TMP[calldataload, 0] ]\l\
-// "];
-// Block0 -> Block0Exit;
-// Block0Exit [label="{ TMP[calldataload, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0Exit:0 -> Block1;
-// Block0Exit:1 -> Block2;
-//
-// Block1 [label="\
-// [ ]\l\
-// [ 0x03 0x03 ]\l\
-// sstore\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block1Exit [label="MainExit"];
-// Block1 -> Block1Exit;
-//
-// Block2 [label="\
-// [ ]\l\
-// [ 0x0202 0x02 ]\l\
-// sstore\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block2 -> Block2Exit [arrowhead=none];
-// Block2Exit [label="Jump" shape=oval];
-// Block2Exit -> Block1;
-//
-// }
diff --git a/test/libyul/yulStackLayout/literal_loop.yul b/test/libyul/yulStackLayout/literal_loop.yul
deleted file mode 100644
index 841c4106262d..000000000000
--- a/test/libyul/yulStackLayout/literal_loop.yul
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-			for {}
-			add(delegatecall(delegatecall(call(gas(), 0x0, 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0),0x0)
-			{}
-			{}
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block0 -> Block0Exit [arrowhead=none];
-// Block0Exit [label="Jump" shape=oval];
-// Block0Exit -> Block1;
-//
-// Block1 [label="\
-// [ ]\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 ]\l\
-// gas\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[gas, 0] ]\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[gas, 0] ]\l\
-// call\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[call, 0] ]\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[call, 0] ]\l\
-// delegatecall\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 TMP[delegatecall, 0] ]\l\
-// [ 0x00 0x00 0x00 0x00 0x00 0x00 TMP[delegatecall, 0] ]\l\
-// delegatecall\l\
-// [ 0x00 TMP[delegatecall, 0] ]\l\
-// [ 0x00 TMP[delegatecall, 0] ]\l\
-// add\l\
-// [ TMP[add, 0] ]\l\
-// [ TMP[add, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[add, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block2;
-// Block1Exit:1 -> Block3;
-//
-// Block2 [label="\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block2Exit [label="MainExit"];
-// Block2 -> Block2Exit;
-//
-// Block3 [label="\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block3 -> Block3Exit [arrowhead=none];
-// Block3Exit [label="Jump" shape=oval];
-// Block3Exit -> Block4;
-//
-// Block4 [label="\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block4 -> Block4Exit [arrowhead=none];
-// Block4Exit [label="BackwardsJump" shape=oval];
-// Block4Exit -> Block1;
-//
-// }
diff --git a/test/libyul/yulStackLayout/stub.yul b/test/libyul/yulStackLayout/stub.yul
deleted file mode 100644
index 5a16304aae53..000000000000
--- a/test/libyul/yulStackLayout/stub.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// }
diff --git a/test/libyul/yulStackLayout/switch.yul b/test/libyul/yulStackLayout/switch.yul
deleted file mode 100644
index 5f655731bedf..000000000000
--- a/test/libyul/yulStackLayout/switch.yul
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    let x := 0x0101
-    let y := 0x0202
-    let z := 0x0303
-    switch sload(x)
-    case 0 {
-        x := 0x42
-    }
-    case 1 {
-        y := 0x42
-    }
-    default {
-        sstore(z, z)
-    }
-
-    sstore(0x0404, y)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ 0x0101 ]\l\
-// Assignment(x)\l\
-// [ x ]\l\
-// [ x 0x0202 ]\l\
-// Assignment(y)\l\
-// [ x y ]\l\
-// [ y x 0x0303 ]\l\
-// Assignment(z)\l\
-// [ y x z ]\l\
-// [ y z x ]\l\
-// sload\l\
-// [ y z TMP[sload, 0] ]\l\
-// [ y z TMP[sload, 0] ]\l\
-// Assignment(GHOST[0])\l\
-// [ y z GHOST[0] ]\l\
-// [ y z GHOST[0] GHOST[0] 0x00 ]\l\
-// eq\l\
-// [ y z GHOST[0] TMP[eq, 0] ]\l\
-// [ y z GHOST[0] TMP[eq, 0] ]\l\
-// "];
-// Block0 -> Block0Exit;
-// Block0Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0Exit:0 -> Block1;
-// Block0Exit:1 -> Block2;
-//
-// Block1 [label="\
-// [ y z GHOST[0] ]\l\
-// [ y z GHOST[0] 0x01 ]\l\
-// eq\l\
-// [ y z TMP[eq, 0] ]\l\
-// [ y z TMP[eq, 0] ]\l\
-// "];
-// Block1 -> Block1Exit;
-// Block1Exit [label="{ TMP[eq, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1Exit:0 -> Block3;
-// Block1Exit:1 -> Block4;
-//
-// Block2 [label="\
-// [ y JUNK JUNK ]\l\
-// [ y 0x42 ]\l\
-// Assignment(x)\l\
-// [ y x ]\l\
-// [ y ]\l\
-// "];
-// Block2 -> Block2Exit [arrowhead=none];
-// Block2Exit [label="Jump" shape=oval];
-// Block2Exit -> Block5;
-//
-// Block3 [label="\
-// [ y z ]\l\
-// [ y z z ]\l\
-// sstore\l\
-// [ y ]\l\
-// [ y ]\l\
-// "];
-// Block3 -> Block3Exit [arrowhead=none];
-// Block3Exit [label="Jump" shape=oval];
-// Block3Exit -> Block5;
-//
-// Block4 [label="\
-// [ JUNK JUNK ]\l\
-// [ 0x42 ]\l\
-// Assignment(y)\l\
-// [ y ]\l\
-// [ y ]\l\
-// "];
-// Block4 -> Block4Exit [arrowhead=none];
-// Block4Exit [label="Jump" shape=oval];
-// Block4Exit -> Block5;
-//
-// Block5 [label="\
-// [ y ]\l\
-// [ y 0x0404 ]\l\
-// sstore\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block5Exit [label="MainExit"];
-// Block5 -> Block5Exit;
-//
-// }
diff --git a/test/libyul/yulStackLayout/variables.yul b/test/libyul/yulStackLayout/variables.yul
deleted file mode 100644
index 3e66d56863f9..000000000000
--- a/test/libyul/yulStackLayout/variables.yul
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(2)
-
-    x := calldataload(3)
-    y := calldataload(4)
-
-    sstore(x,y)
-}
-// ----
-// digraph CFG {
-// nodesep=0.7;
-// node[shape=box];
-//
-// Entry [label="Entry"];
-// Entry -> Block0;
-// Block0 [label="\
-// [ ]\l\
-// [ 0x00 ]\l\
-// calldataload\l\
-// [ TMP[calldataload, 0] ]\l\
-// [ TMP[calldataload, 0] ]\l\
-// Assignment(x)\l\
-// [ x ]\l\
-// [ 0x02 ]\l\
-// calldataload\l\
-// [ TMP[calldataload, 0] ]\l\
-// [ TMP[calldataload, 0] ]\l\
-// Assignment(y)\l\
-// [ y ]\l\
-// [ 0x03 ]\l\
-// calldataload\l\
-// [ TMP[calldataload, 0] ]\l\
-// [ TMP[calldataload, 0] ]\l\
-// Assignment(x)\l\
-// [ x ]\l\
-// [ x 0x04 ]\l\
-// calldataload\l\
-// [ x TMP[calldataload, 0] ]\l\
-// [ x TMP[calldataload, 0] ]\l\
-// Assignment(y)\l\
-// [ x y ]\l\
-// [ y x ]\l\
-// sstore\l\
-// [ ]\l\
-// [ ]\l\
-// "];
-// Block0Exit [label="MainExit"];
-// Block0 -> Block0Exit;
-//
-// }
diff --git a/test/libyul/yulStackShuffling/swap_cycle.stack b/test/libyul/yulStackShuffling/swap_cycle.stack
deleted file mode 100644
index fbda89ebfd2a..000000000000
--- a/test/libyul/yulStackShuffling/swap_cycle.stack
+++ /dev/null
@@ -1,22 +0,0 @@
-[ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET v5 ]
-[ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET JUNK JUNK ]
-// ----
-// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET v5 ]
-// POP
-// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET ]
-// SWAP16
-// [ v0 RET v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET v1 ]
-// SWAP16
-// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET ]
-// POP
-// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET ]
-// SWAP15
-// [ v0 RET v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 v1 ]
-// SWAP16
-// [ v1 RET v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 v0 ]
-// SWAP15
-// [ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET ]
-// PUSH JUNK
-// [ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET JUNK ]
-// PUSH JUNK
-// [ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET JUNK JUNK ]
diff --git a/test/libyul/yulSyntaxTests/are_we_perl_yet.yul b/test/libyul/yulSyntaxTests/are_we_perl_yet.yul
deleted file mode 100644
index 7a79436b4549..000000000000
--- a/test/libyul/yulSyntaxTests/are_we_perl_yet.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    function _...($..) {}
-    let a...
-    _...(a...)
-}
-// ----
-// SyntaxError 3384: (6-27): "_..." is not a valid identifier (ends with a dot).
-// SyntaxError 7771: (6-27): "_..." is not a valid identifier (contains consecutive dots).
-// SyntaxError 3384: (20-23): "$.." is not a valid identifier (ends with a dot).
-// SyntaxError 7771: (20-23): "$.." is not a valid identifier (contains consecutive dots).
-// SyntaxError 3384: (36-40): "a..." is not a valid identifier (ends with a dot).
-// SyntaxError 7771: (36-40): "a..." is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/assign_from_stack.yul b/test/libyul/yulSyntaxTests/assign_from_stack.yul
deleted file mode 100644
index 44f50ab5e5f2..000000000000
--- a/test/libyul/yulSyntaxTests/assign_from_stack.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ =: x:u256 }
-// ----
-// ParserError 1856: (2-3): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/assignment.yul b/test/libyul/yulSyntaxTests/assignment.yul
deleted file mode 100644
index 6c2c0f5a4c41..000000000000
--- a/test/libyul/yulSyntaxTests/assignment.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let x:u256 := 2:u256
-    let y:u256 := x
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul b/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul
deleted file mode 100644
index 9bb725fd61a6..000000000000
--- a/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  function f() -> a, b {}
-  function g() -> a, b, c {}
-  let x, y
-  x, x := f()
-  y, x, y := g()
-}
-// ----
-// DeclarationError 9005: (70-81): Variable x occurs multiple times on the left-hand side of the assignment.
-// DeclarationError 9005: (84-98): Variable y occurs multiple times on the left-hand side of the assignment.
diff --git a/test/libyul/yulSyntaxTests/assignment_fail.yul b/test/libyul/yulSyntaxTests/assignment_fail.yul
deleted file mode 100644
index 1bcf3fbb3fc6..000000000000
--- a/test/libyul/yulSyntaxTests/assignment_fail.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    let x:u256
-    let y := x
-    let z:bool
-    z := y
-    y := z
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 9547: (51-52): Assigning a value of type "u256" to a variable of type "bool".
-// TypeError 9547: (62-63): Assigning a value of type "bool" to a variable of type "u256".
diff --git a/test/libyul/yulSyntaxTests/assignment_of_function.yul b/test/libyul/yulSyntaxTests/assignment_of_function.yul
deleted file mode 100644
index e1ddfd604bac..000000000000
--- a/test/libyul/yulSyntaxTests/assignment_of_function.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    function f() {}
-    let x := f
-}
-// ----
-// TypeError 6041: (35-36): Function f used without being called.
diff --git a/test/libyul/yulSyntaxTests/blocks.yul b/test/libyul/yulSyntaxTests/blocks.yul
deleted file mode 100644
index 8c2fdd9a9108..000000000000
--- a/test/libyul/yulSyntaxTests/blocks.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    let x:u256 := 7:u256
-    {
-        let y:u256 := 3:u256
-    }
-    {
-        let z:u256 := 2:u256
-    }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul b/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
deleted file mode 100644
index 1d0f997e61d0..000000000000
--- a/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x:bool
-	if x { break }
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2592: (22-27): Keyword "break" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/builtin_function_literal.yul b/test/libyul/yulSyntaxTests/builtin_function_literal.yul
deleted file mode 100644
index 22f7216146a6..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_function_literal.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  datasize(x,1)
-}
-// ----
-// TypeError 7000: (4-12): Function "datasize" expects 1 arguments but got 2.
-// TypeError 9114: (4-12): Function expects direct literals as arguments.
-// DeclarationError 8198: (13-14): Identifier "x" not found.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_1.yul b/test/libyul/yulSyntaxTests/builtin_identifier_1.yul
deleted file mode 100644
index 3fbe25c088f4..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let add := 6
-}
-// ----
-// ParserError 5568: (7-10): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_2.yul b/test/libyul/yulSyntaxTests/builtin_identifier_2.yul
deleted file mode 100644
index 3c9f60955b02..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function add() {}
-}
-// ----
-// ParserError 5568: (12-15): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_3.yul b/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
deleted file mode 100644
index c7969b8ef2ad..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function f(x) { f(add) }
-}
-// ----
-// ParserError 7104: (21-24): Builtin function "add" must be called.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_4.yul b/test/libyul/yulSyntaxTests/builtin_identifier_4.yul
deleted file mode 100644
index 4e1bcc080cb7..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_4.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function f(add) {}
-}
-// ----
-// ParserError 5568: (14-17): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_5.yul b/test/libyul/yulSyntaxTests/builtin_identifier_5.yul
deleted file mode 100644
index 314cc8bbb783..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_5.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function f() -> add {}
-}
-// ----
-// ParserError 5568: (19-22): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
deleted file mode 100644
index e261354fcc6f..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	add := 1
-}
-// ----
-// ParserError 6272: (7-9): Cannot assign to builtin function "add".
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
deleted file mode 100644
index c34da03638e1..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	function f() -> a, b {}
-	add, mul := f()
-}
-// ----
-// ParserError 6272: (31-32): Cannot assign to builtin function "add".
diff --git a/test/libyul/yulSyntaxTests/builtin_types.yul b/test/libyul/yulSyntaxTests/builtin_types.yul
deleted file mode 100644
index becf342b8f37..000000000000
--- a/test/libyul/yulSyntaxTests/builtin_types.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    let x1:bool := true:bool
-    let x2:u8 := 1:u8
-    let x3:s8 := 1:s8
-    let x4:u32 := 1:u32
-    let x5:s32 := 1:s32
-    let x6:u64 := 1:u64
-    let x7:s64 := 1:s64
-    let x8:u128 := 1:u128
-    let x9:s128 := 1:s128
-    let x10:u256 := 1:u256
-    let x11:s256 := 1:s256
-}
-// ====
-// dialect: yul
-// ----
diff --git a/test/libyul/yulSyntaxTests/byte_of_string_literal.yul b/test/libyul/yulSyntaxTests/byte_of_string_literal.yul
deleted file mode 100644
index 9ed41172abe9..000000000000
--- a/test/libyul/yulSyntaxTests/byte_of_string_literal.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let x := byte(31, "11112222333344445555666677778888")
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/call_literal.yul b/test/libyul/yulSyntaxTests/call_literal.yul
deleted file mode 100644
index d1516f0ec578..000000000000
--- a/test/libyul/yulSyntaxTests/call_literal.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    1()
-}
-// ----
-// ParserError 9980: (7-8): Function name expected.
diff --git a/test/libyul/yulSyntaxTests/constants.yul b/test/libyul/yulSyntaxTests/constants.yul
deleted file mode 100644
index 82436a39d1d8..000000000000
--- a/test/libyul/yulSyntaxTests/constants.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	pop(mul(7, 8))
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul b/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
deleted file mode 100644
index c12f7945d453..000000000000
--- a/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x:bool
-	if x { continue }
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2592: (22-30): Keyword "continue" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/datacopy_shadowing.yul b/test/libyul/yulSyntaxTests/datacopy_shadowing.yul
deleted file mode 100644
index 3f14f47226a9..000000000000
--- a/test/libyul/yulSyntaxTests/datacopy_shadowing.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function datacopy(a, b, c) {}
-}
-// ----
-// ParserError 5568: (15-23): Cannot use builtin function name "datacopy" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul b/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul
deleted file mode 100644
index fb32fb61c17a..000000000000
--- a/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function dataoffset(a) -> b {}
-}
-// ----
-// ParserError 5568: (15-25): Cannot use builtin function name "dataoffset" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/datasize_shadowing.yul b/test/libyul/yulSyntaxTests/datasize_shadowing.yul
deleted file mode 100644
index 379401754cac..000000000000
--- a/test/libyul/yulSyntaxTests/datasize_shadowing.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function datasize(a) -> b {}
-}
-// ----
-// ParserError 5568: (15-23): Cannot use builtin function name "datasize" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul b/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul
deleted file mode 100644
index 7f786ac9a88c..000000000000
--- a/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  function f() -> a, b {}
-  let x, x := f()
-}
-// ----
-// DeclarationError 1395: (30-45): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_function.yul b/test/libyul/yulSyntaxTests/dot_consecutive_function.yul
deleted file mode 100644
index 3d58fd47d580..000000000000
--- a/test/libyul/yulSyntaxTests/dot_consecutive_function.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x..y() {}
-}
-// ----
-// SyntaxError 7771: (6-24): "x..y" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul b/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul
deleted file mode 100644
index 150b81405034..000000000000
--- a/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x(a..b) {}
-}
-// ----
-// SyntaxError 7771: (17-21): "a..b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul b/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul
deleted file mode 100644
index 0d3a7be3fea3..000000000000
--- a/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x() -> a..b {}
-}
-// ----
-// SyntaxError 7771: (22-26): "a..b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul
deleted file mode 100644
index d426a7b7d687..000000000000
--- a/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let a..b := 1
-}
-// ----
-// SyntaxError 7771: (10-14): "a..b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_function.yul b/test/libyul/yulSyntaxTests/dot_ellipse_function.yul
deleted file mode 100644
index ebfa0f5794b0..000000000000
--- a/test/libyul/yulSyntaxTests/dot_ellipse_function.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x...y() {}
-}
-// ----
-// SyntaxError 7771: (6-25): "x...y" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul b/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul
deleted file mode 100644
index 75298aa0e4db..000000000000
--- a/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x(a...b) {}
-}
-// ----
-// SyntaxError 7771: (17-22): "a...b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul b/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul
deleted file mode 100644
index 7d1b95155154..000000000000
--- a/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x() -> a...b {}
-}
-// ----
-// SyntaxError 7771: (22-27): "a...b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul
deleted file mode 100644
index c772073cd5df..000000000000
--- a/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let a...b := 1
-}
-// ----
-// SyntaxError 7771: (10-15): "a...b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_leading_function.yul b/test/libyul/yulSyntaxTests/dot_leading_function.yul
deleted file mode 100644
index 0c9581ec4c22..000000000000
--- a/test/libyul/yulSyntaxTests/dot_leading_function.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function .x() {}
-}
-// ----
-// ParserError 2314: (15-16): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul b/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul
deleted file mode 100644
index 93c8afa6fb06..000000000000
--- a/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x(.a) {}
-}
-// ----
-// ParserError 2314: (17-18): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul b/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul
deleted file mode 100644
index c516fd6479a4..000000000000
--- a/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x() -> .a {}
-}
-// ----
-// ParserError 2314: (22-23): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul
deleted file mode 100644
index b0f86d36de1a..000000000000
--- a/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let .a := 1
-}
-// ----
-// ParserError 2314: (10-11): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_middle_function.yul b/test/libyul/yulSyntaxTests/dot_middle_function.yul
deleted file mode 100644
index 5d5fa15fff08..000000000000
--- a/test/libyul/yulSyntaxTests/dot_middle_function.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    function x.y() {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/dot_middle_function_arg.yul b/test/libyul/yulSyntaxTests/dot_middle_function_arg.yul
deleted file mode 100644
index 61ecfcb2cda5..000000000000
--- a/test/libyul/yulSyntaxTests/dot_middle_function_arg.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    function x(a.b) {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/dot_middle_function_ret.yul b/test/libyul/yulSyntaxTests/dot_middle_function_ret.yul
deleted file mode 100644
index 06c41be62680..000000000000
--- a/test/libyul/yulSyntaxTests/dot_middle_function_ret.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    function x() -> a.b {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/dot_middle_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_middle_variabledeclaration.yul
deleted file mode 100644
index d7235badc031..000000000000
--- a/test/libyul/yulSyntaxTests/dot_middle_variabledeclaration.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let a.b := 1
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_function.yul b/test/libyul/yulSyntaxTests/dot_trailing_function.yul
deleted file mode 100644
index c3b151e89d60..000000000000
--- a/test/libyul/yulSyntaxTests/dot_trailing_function.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x.() {}
-}
-// ----
-// SyntaxError 3384: (6-22): "x." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul b/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul
deleted file mode 100644
index c81c18446ead..000000000000
--- a/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x(a.) {}
-}
-// ----
-// SyntaxError 3384: (17-19): "a." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul b/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul
deleted file mode 100644
index adfa02410ec1..000000000000
--- a/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function x() -> a. {}
-}
-// ----
-// SyntaxError 3384: (22-24): "a." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul
deleted file mode 100644
index cc86ca23e8ad..000000000000
--- a/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let a. := 1
-}
-// ----
-// SyntaxError 3384: (10-12): "a." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/empty_call.yul b/test/libyul/yulSyntaxTests/empty_call.yul
deleted file mode 100644
index 30491c114dc9..000000000000
--- a/test/libyul/yulSyntaxTests/empty_call.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ () }
-// ----
-// ParserError 1856: (2-3): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul
deleted file mode 100644
index 00f0a4d58f89..000000000000
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for {} {} {} {}
-}
-// ----
-// ParserError 1856: (10-11): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul
deleted file mode 100644
index d4d801204759..000000000000
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for 1 1 {} {}
-}
-// ----
-// ParserError 2314: (7-8): Expected '{' but got 'Number'
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul
deleted file mode 100644
index 8f82686599b2..000000000000
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for {} 1 1 {}
-}
-// ----
-// ParserError 2314: (12-13): Expected '{' but got 'Number'
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul
deleted file mode 100644
index abd2260d7e1b..000000000000
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for {} 1 {} 1
-}
-// ----
-// ParserError 2314: (15-16): Expected '{' but got 'Number'
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
deleted file mode 100644
index 5d739e81ea12..000000000000
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for {} mload {} {}
-}
-// ----
-// ParserError 7104: (10-15): Builtin function "mload" must be called.
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul
deleted file mode 100644
index 42883052e78d..000000000000
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} mstore(1, 1) {} {}
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 3950: (10-22): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition.yul b/test/libyul/yulSyntaxTests/for_loop_condition.yul
deleted file mode 100644
index 72ed7b71f15f..000000000000
--- a/test/libyul/yulSyntaxTests/for_loop_condition.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x:bool
-    for {} x {} {}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul b/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
deleted file mode 100644
index 98a52bf2474e..000000000000
--- a/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x
-    for {} x {} {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 1733: (23-24): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/for_statement.yul b/test/libyul/yulSyntaxTests/for_statement.yul
deleted file mode 100644
index 7f180ea8f5a2..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	let x:bool
-	for {let i := 0} x {i := add(i, 1)} {}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_2.yul b/test/libyul/yulSyntaxTests/for_statement_2.yul
deleted file mode 100644
index 1c74f4239ff1..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_2.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-
-	{ for {} 1 {} {} }
-	{ for { let i := 1 } lt(i, 5) { i := add(i, 1) } {} }
-	{ for {} 1 {} {} }
-	{ let x := calldatasize() for { let i := 0} lt(i, x) { i := add(i, 1) } { mstore(i, 2) } }
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break.yul b/test/libyul/yulSyntaxTests/for_statement_break.yul
deleted file mode 100644
index 4e432557baf9..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_break.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let x:bool
-	for {let i := 0} x {i := add(i, 1)}
-	{
-		break
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_init.yul b/test/libyul/yulSyntaxTests/for_statement_break_init.yul
deleted file mode 100644
index 7fb15faf0046..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_break_init.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x:bool
-	for {let i := 0 break} x {i := add(i, 1)} {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 9615: (31-36): Keyword "break" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul b/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul
deleted file mode 100644
index 9ffe751cc0b1..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {let x:bool for {} x {} { break }} 1:bool {}
-	{}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul b/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul
deleted file mode 100644
index ab012a73fa0f..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} 1:bool {let x:bool for {} x {} { break }}
-	{}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_post.yul b/test/libyul/yulSyntaxTests/for_statement_break_post.yul
deleted file mode 100644
index 93d1475d0696..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_break_post.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x:bool
-	for {let i := 0 } x {i := add(i, 1) break} {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2461: (51-56): Keyword "break" in for-loop post block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue.yul b/test/libyul/yulSyntaxTests/for_statement_continue.yul
deleted file mode 100644
index b7c2b02515af..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_continue.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let x:bool
-	for {let i := 0} x {i := add(i, 1)}
-	{
-		continue
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul b/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
deleted file mode 100644
index eca0d46928ea..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	let x:bool
-	for {let i := 0 continue} x {i := add(i, 1)}
-	{
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 9615: (31-39): Keyword "continue" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul b/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
deleted file mode 100644
index 7362b38b285a..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x:bool
-	for {let i := 0} x {i := add(i, 1) continue} {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2461: (50-58): Keyword "continue" in for-loop post block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul
deleted file mode 100644
index 305cdd36d4dc..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	for {let x:bool for {} x {} { continue }} 1:bool {}
-	{
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul
deleted file mode 100644
index e33bd2457b04..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} 1:bool {let x:bool for {} x {} { continue }}
-	{}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
deleted file mode 100644
index 1ff20943fbb9..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	for {} 1 {}
-	{
-		let x:bool
-		for { continue } x {} {}
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 9615: (39-47): Keyword "continue" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_nested_break.yul b/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
deleted file mode 100644
index ae3fd9da4732..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	let x:bool
-	for {let i := 0} x {}
-	{
-		function f() { break }
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2592: (57-62): Keyword "break" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul b/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
deleted file mode 100644
index 8e7eca428e24..000000000000
--- a/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	for {let i := 0} iszero(eq(i, 10)) {}
-	{
-		function f() { continue }
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2592: (61-69): Keyword "continue" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_1.yul b/test/libyul/yulSyntaxTests/for_visibility_1.yul
deleted file mode 100644
index fef82b9d3d8f..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_1.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	for { let i := 1 } i { pop(i) } { pop(i) }
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/for_visibility_2.yul b/test/libyul/yulSyntaxTests/for_visibility_2.yul
deleted file mode 100644
index 2cf365bacf0a..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_2.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} i { let i := 1 } {}
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (10-11): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_3.yul b/test/libyul/yulSyntaxTests/for_visibility_3.yul
deleted file mode 100644
index 5886e5336256..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_3.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} 1 { let i := 1 } { pop(i) }
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (33-34): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_4.yul b/test/libyul/yulSyntaxTests/for_visibility_4.yul
deleted file mode 100644
index 38edc270fb7c..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_4.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} 1 { pop(i) } { let i := 1 }
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (18-19): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_5.yul b/test/libyul/yulSyntaxTests/for_visibility_5.yul
deleted file mode 100644
index af5b35952487..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_5.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for { pop(i) } 1 { let i := 1 } {}
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (13-14): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_6.yul b/test/libyul/yulSyntaxTests/for_visibility_6.yul
deleted file mode 100644
index ccec08c1920d..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_6.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for { pop(i) } 1 { } { let i := 1 }
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (13-14): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_7.yul b/test/libyul/yulSyntaxTests/for_visibility_7.yul
deleted file mode 100644
index e08e8bb7459e..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_7.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} i {} { let i := 1 }
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (10-11): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_8.yul b/test/libyul/yulSyntaxTests/for_visibility_8.yul
deleted file mode 100644
index 38edc270fb7c..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_8.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for {} 1 { pop(i) } { let i := 1 }
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 8198: (18-19): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_9.yul b/test/libyul/yulSyntaxTests/for_visibility_9.yul
deleted file mode 100644
index 4cda1b165fd9..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_9.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for { let x := 1 } 1 { let x := 1 } {}
-}
-// ====
-// dialect: yul
-// ----
-// DeclarationError 1395: (26-36): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_A.yul b/test/libyul/yulSyntaxTests/for_visibility_A.yul
deleted file mode 100644
index a5761f52a919..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_A.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	for { let x := 1 } 1 {} { let x := 1 }
-}
-// ====
-// dialect: yul
-// ----
-// DeclarationError 1395: (29-39): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_B.yul b/test/libyul/yulSyntaxTests/for_visibility_B.yul
deleted file mode 100644
index d315a611d71a..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_B.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := 1 for { let x := 1 } 1 {} {}
-}
-// ----
-// DeclarationError 1395: (20-30): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_C.yul b/test/libyul/yulSyntaxTests/for_visibility_C.yul
deleted file mode 100644
index 81741fe7b512..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_C.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := 1 for {} 1 { let x := 1 } {}
-}
-// ----
-// DeclarationError 1395: (25-35): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_D.yul b/test/libyul/yulSyntaxTests/for_visibility_D.yul
deleted file mode 100644
index 409b10399bf0..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_D.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := 1 for {} 1 {} { let x := 1 }
-}
-// ----
-// DeclarationError 1395: (28-38): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_E.yul b/test/libyul/yulSyntaxTests/for_visibility_E.yul
deleted file mode 100644
index 13c0631fab06..000000000000
--- a/test/libyul/yulSyntaxTests/for_visibility_E.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	// Check that body and post are not sub-scopes of each other.
-	for {} 1 { let x := 1 } { let x := 1 }
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_calls.yul b/test/libyul/yulSyntaxTests/function_calls.yul
deleted file mode 100644
index 777382b125c1..000000000000
--- a/test/libyul/yulSyntaxTests/function_calls.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    function f(a:u256) -> b:u256 {}
-    function g(a:u256, b:u256, c:u256) {}
-    function x() {
-        g(1:u256, 2:u256, f(3:u256))
-        x()
-    }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_calls_2.yul b/test/libyul/yulSyntaxTests/function_calls_2.yul
deleted file mode 100644
index 3dc2cbd45087..000000000000
--- a/test/libyul/yulSyntaxTests/function_calls_2.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	{ function f() {} }
-	{ function f() { let y := 2 } }
-	{ function f() -> z { let y := 2 } }
-	{ function f(a) { let y := 2 } }
-	{ function f(a) { let y := a } }
-	{ function f() -> x, y, z {} }
-	{ function f(x, y, z) {} }
-	{ function f(a, b) -> x, y, z { y := a } }
-	{ function f() {} f() }
-	{ function f() -> x, y { x := 1 y := 2} let a, b := f() }
-	{ function f(a, b) -> x, y { x := b y := a } let a, b := f(2, 3) }
-	{ function rec(a) { rec(sub(a, 1)) } rec(2) }
-	{ let r := 2 function f() -> x, y { x := 1 y := 2} let a, b := f() b := r }
-	{ function f() { g() } function g() { f() } }
-	{ function f(a) -> b {} function g(a, b, c) {} function x() { g(1, 2, f(mul(2, 3))) x() } }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_def_multiple_args.yul b/test/libyul/yulSyntaxTests/function_def_multiple_args.yul
deleted file mode 100644
index 45d48104211c..000000000000
--- a/test/libyul/yulSyntaxTests/function_def_multiple_args.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function f(a, d) { }
-    function g(a, d) -> x, y { }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul
deleted file mode 100644
index 6f921a4ea82d..000000000000
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	for { } 1:bool { function f() {} } {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul
deleted file mode 100644
index f6c92d92a490..000000000000
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	for { } 1:bool {} { function f() {} }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
deleted file mode 100644
index 6e616630a112..000000000000
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for { function f() {} } 1:bool {} {}
-}
-// ----
-// SyntaxError 3441: (9-17): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul
deleted file mode 100644
index 766de17a95f0..000000000000
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	for {
-		for {} 1:bool { function f() {} }
-		{}
-	} 1:bool {}
-	{}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
deleted file mode 100644
index f5f3accd248f..000000000000
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	for { for {function foo() {}} 1:bool {} {} } 1:bool {} {}
-}
-// ----
-// SyntaxError 3441: (14-22): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
deleted file mode 100644
index d3a794c0afaf..000000000000
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	for {}
-		1:bool
-		{for {function foo() {}} 1:bool {} {} }
-	{}
-}
-// ----
-// SyntaxError 3441: (27-35): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_definition.yul b/test/libyul/yulSyntaxTests/function_definition.yul
deleted file mode 100644
index a1919f3da53c..000000000000
--- a/test/libyul/yulSyntaxTests/function_definition.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function f (a, b  , c ) ->    y,x,z {
-    }
-
-	function g() { }
-	function h(a) -> x { }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_definition_whitespace.yul b/test/libyul/yulSyntaxTests/function_definition_whitespace.yul
deleted file mode 100644
index 1c397982b9d6..000000000000
--- a/test/libyul/yulSyntaxTests/function_definition_whitespace.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    function f (a, b  , c ) -     >    y,x,z {
-    }
-}
-// ----
-// ParserError 2314: (30-31): Expected '{' but got '-'
diff --git a/test/libyul/yulSyntaxTests/function_definitions.yul b/test/libyul/yulSyntaxTests/function_definitions.yul
deleted file mode 100644
index 20dfbb131284..000000000000
--- a/test/libyul/yulSyntaxTests/function_definitions.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function f() { }
-    function g(a:u256) -> x:u256 { }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_embedded.yul b/test/libyul/yulSyntaxTests/function_embedded.yul
deleted file mode 100644
index 992aafc4b508..000000000000
--- a/test/libyul/yulSyntaxTests/function_embedded.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	function f(r, s) -> x {
-		function g(a) -> b { }
-		x := g(2)
-	}
-	let x := f(2, 3)
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_literal.yul b/test/libyul/yulSyntaxTests/function_literal.yul
deleted file mode 100644
index 80037dabffe2..000000000000
--- a/test/libyul/yulSyntaxTests/function_literal.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  function f(a,b) {}
-  f(x,1)
-}
-// ----
-// DeclarationError 8198: (27-28): Identifier "x" not found.
diff --git a/test/libyul/yulSyntaxTests/function_literal_valid.yul b/test/libyul/yulSyntaxTests/function_literal_valid.yul
deleted file mode 100644
index b36928ad49e2..000000000000
--- a/test/libyul/yulSyntaxTests/function_literal_valid.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  let x
-  function f(a,b) {}
-  f(x,1)
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul
deleted file mode 100644
index 22c89e2b5769..000000000000
--- a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	{ let x:u256 }
-	function f() -> x:u256 {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
deleted file mode 100644
index f7fb87278545..000000000000
--- a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	let x:u256
-	function f() -> x:u256 {}
-}
-// ----
-// DeclarationError 1395: (15-40): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/functional.yul b/test/libyul/yulSyntaxTests/functional.yul
deleted file mode 100644
index 167ceab609d9..000000000000
--- a/test/libyul/yulSyntaxTests/functional.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 2 x := add(add(7, mul(6, x)), mul(7, 8))
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/functional_assign_complex.yul b/test/libyul/yulSyntaxTests/functional_assign_complex.yul
deleted file mode 100644
index 167ceab609d9..000000000000
--- a/test/libyul/yulSyntaxTests/functional_assign_complex.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 2 x := add(add(7, mul(6, x)), mul(7, 8))
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/functional_assignment.yul b/test/libyul/yulSyntaxTests/functional_assignment.yul
deleted file mode 100644
index 08109e9473a5..000000000000
--- a/test/libyul/yulSyntaxTests/functional_assignment.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let x := 2
-    x := 7
-}
-
-// ----
diff --git a/test/libyul/yulSyntaxTests/functional_partial.yul b/test/libyul/yulSyntaxTests/functional_partial.yul
deleted file mode 100644
index ea28283d4ac6..000000000000
--- a/test/libyul/yulSyntaxTests/functional_partial.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let x := byte
-}
-// ----
-// ParserError 7104: (15-19): Builtin function "byte" must be called.
diff --git a/test/libyul/yulSyntaxTests/functional_partial_success.yul b/test/libyul/yulSyntaxTests/functional_partial_success.yul
deleted file mode 100644
index c7127243e6eb..000000000000
--- a/test/libyul/yulSyntaxTests/functional_partial_success.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	let x := byte(1, 2)
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/functional_returndatacopy.yul b/test/libyul/yulSyntaxTests/functional_returndatacopy.yul
deleted file mode 100644
index 925c4deeb60e..000000000000
--- a/test/libyul/yulSyntaxTests/functional_returndatacopy.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    returndatacopy(0, 32, 64)
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
diff --git a/test/libyul/yulSyntaxTests/functions_in_parallel_scopes.yul b/test/libyul/yulSyntaxTests/functions_in_parallel_scopes.yul
deleted file mode 100644
index c43c57a3abfd..000000000000
--- a/test/libyul/yulSyntaxTests/functions_in_parallel_scopes.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    { function g() {} }
-    { function g() {} }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/functions_multiple_args.yul b/test/libyul/yulSyntaxTests/functions_multiple_args.yul
deleted file mode 100644
index aa268dc1082d..000000000000
--- a/test/libyul/yulSyntaxTests/functions_multiple_args.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function f(a:u256, d:u256) { }
-    function g(a:u256, d:u256) -> x:u256, y:u256 { }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/hex_assignment.yul b/test/libyul/yulSyntaxTests/hex_assignment.yul
deleted file mode 100644
index cd37bf61675f..000000000000
--- a/test/libyul/yulSyntaxTests/hex_assignment.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := hex"0011"
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/hex_assignment_long.yul b/test/libyul/yulSyntaxTests/hex_assignment_long.yul
deleted file mode 100644
index eaedcd3b1734..000000000000
--- a/test/libyul/yulSyntaxTests/hex_assignment_long.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let x := hex"00110011001100110011001100110011001100110011001100110011001100110011001100110011"
-}
-// ----
-// TypeError 3069: (15-100): String literal too long (40 > 32)
diff --git a/test/libyul/yulSyntaxTests/hex_expression.yul b/test/libyul/yulSyntaxTests/hex_expression.yul
deleted file mode 100644
index 785681148c42..000000000000
--- a/test/libyul/yulSyntaxTests/hex_expression.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    pop(hex"2233")
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/hex_string_literal_non_printable_characters.yul b/test/libyul/yulSyntaxTests/hex_string_literal_non_printable_characters.yul
deleted file mode 100644
index 4a28c44a728a..000000000000
--- a/test/libyul/yulSyntaxTests/hex_string_literal_non_printable_characters.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let name := hex"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul b/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul
deleted file mode 100644
index e21bf6c59a44..000000000000
--- a/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let name := hex"abc"
-}
-// ====
-// dialect: evm
-// ----
-// ParserError 1465: (18-24): Illegal token: Expected even number of hex-nibbles.
diff --git a/test/libyul/yulSyntaxTests/hex_switch_case.yul b/test/libyul/yulSyntaxTests/hex_switch_case.yul
deleted file mode 100644
index e0d00539a4a8..000000000000
--- a/test/libyul/yulSyntaxTests/hex_switch_case.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    switch codesize()
-    case hex"00" {}
-    case hex"1122" {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/hex_switch_case_long.yul b/test/libyul/yulSyntaxTests/hex_switch_case_long.yul
deleted file mode 100644
index abdbc6ec15f6..000000000000
--- a/test/libyul/yulSyntaxTests/hex_switch_case_long.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    switch codesize()
-    case hex"00" {}
-    case hex"112233445566778899001122334455667788990011223344556677889900112233445566778899001122334455667788990011223344556677889900" {}
-}
-// ----
-// TypeError 3069: (53-178): String literal too long (60 > 32)
diff --git a/test/libyul/yulSyntaxTests/if_statement.yul b/test/libyul/yulSyntaxTests/if_statement.yul
deleted file mode 100644
index 2e8f9d592ece..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    { if 42 {} }
-    { if 42 { let x := 3 } }
-    { function f() -> x {} if f() { pop(f()) } }
-    { let x := 0 if eq(calldatasize(), 0) { x := 1 } mstore(0, x) }
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_1.yul b/test/libyul/yulSyntaxTests/if_statement_1.yul
deleted file mode 100644
index b631f8a953e0..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_1.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	if true:bool {}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_2.yul b/test/libyul/yulSyntaxTests/if_statement_2.yul
deleted file mode 100644
index 20be9b525cb0..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_2.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	if false:bool
-	{
-		let x:u256 := 3:u256
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_3.yul b/test/libyul/yulSyntaxTests/if_statement_3.yul
deleted file mode 100644
index 2ba20d39b916..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_3.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	function f() -> x:bool {}
-
-	if f()
-	{
-		let b:bool := f()
-	}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_1.yul b/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
deleted file mode 100644
index 6fc409ce3863..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if let x:u256 {} }
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 1856: (5-8): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_2.yul b/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
deleted file mode 100644
index 97ce0e9f9f2f..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if true:bool let x:u256 := 3:u256 }
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 2314: (15-18): Expected '{' but got reserved keyword 'let'
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_3.yul b/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
deleted file mode 100644
index 51e36790b6e9..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if 42:u256 { } }
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 1733: (5-12): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
deleted file mode 100644
index 0a4f338447b4..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    if mload {}
-}
-// ----
-// ParserError 7104: (9-14): Builtin function "mload" must be called.
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul
deleted file mode 100644
index 4e7970490002..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	if mstore(1, 1) {}
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 3950: (6-18): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
deleted file mode 100644
index fa396456fd1a..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    if 32 let x := 3
-}
-// ====
-// dialect: yul
-// ----
-// ParserError 2314: (12-15): Expected '{' but got reserved keyword 'let'
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
deleted file mode 100644
index b84004a8d802..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    if calldatasize {}
-}
-// ----
-// ParserError 7104: (9-21): Builtin function "calldatasize" must be called.
diff --git a/test/libyul/yulSyntaxTests/if_statement_scope_1.yul b/test/libyul/yulSyntaxTests/if_statement_scope_1.yul
deleted file mode 100644
index 669979ab4c75..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_scope_1.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	let x := 2
-	if 42 { x := 3 }
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_scope_2.yul b/test/libyul/yulSyntaxTests/if_statement_scope_2.yul
deleted file mode 100644
index e86578812e0b..000000000000
--- a/test/libyul/yulSyntaxTests/if_statement_scope_2.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	if 32 { let x := 3 }
-	x := 2
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 4634: (25-26): Variable not found or variable not lvalue.
diff --git a/test/libyul/yulSyntaxTests/instructions.yul b/test/libyul/yulSyntaxTests/instructions.yul
deleted file mode 100644
index 3d600812fb12..000000000000
--- a/test/libyul/yulSyntaxTests/instructions.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pop }
-// ====
-// dialect: yul
-// ----
-// ParserError 6913: (6-7): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul b/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul
deleted file mode 100644
index db482b6f441a..000000000000
--- a/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	pop(mul())
-}
-// ----
-// TypeError 7000: (7-10): Function "mul" expects 2 arguments but got 0.
diff --git a/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul b/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul
deleted file mode 100644
index f6239a95ea5a..000000000000
--- a/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	pop(mul(1))
-}
-// ----
-// TypeError 7000: (7-10): Function "mul" expects 2 arguments but got 1.
diff --git a/test/libyul/yulSyntaxTests/instructions_too_many_args.yul b/test/libyul/yulSyntaxTests/instructions_too_many_args.yul
deleted file mode 100644
index ae4f1ae9dad1..000000000000
--- a/test/libyul/yulSyntaxTests/instructions_too_many_args.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	pop(mul(1, 2, 3))
-}
-// ----
-// TypeError 7000: (7-10): Function "mul" expects 2 arguments but got 3.
diff --git a/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul
deleted file mode 100644
index 6fe9171d6220..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    dup0()
-    dup1()
-    dup2()
-    dup3()
-    dup4()
-    dup5()
-    dup6()
-    dup7()
-    dup8()
-    dup9()
-    dup10()
-    dup11()
-    dup12()
-    dup13()
-    dup14()
-    dup15()
-    dup16()
-    dup32()
-}
-// ----
-// DeclarationError 4619: (6-10): Function "dup0" not found.
-// DeclarationError 4619: (17-21): Function "dup1" not found.
-// DeclarationError 4619: (28-32): Function "dup2" not found.
-// DeclarationError 4619: (39-43): Function "dup3" not found.
-// DeclarationError 4619: (50-54): Function "dup4" not found.
-// DeclarationError 4619: (61-65): Function "dup5" not found.
-// DeclarationError 4619: (72-76): Function "dup6" not found.
-// DeclarationError 4619: (83-87): Function "dup7" not found.
-// DeclarationError 4619: (94-98): Function "dup8" not found.
-// DeclarationError 4619: (105-109): Function "dup9" not found.
-// DeclarationError 4619: (116-121): Function "dup10" not found.
-// DeclarationError 4619: (128-133): Function "dup11" not found.
-// DeclarationError 4619: (140-145): Function "dup12" not found.
-// DeclarationError 4619: (152-157): Function "dup13" not found.
-// DeclarationError 4619: (164-169): Function "dup14" not found.
-// DeclarationError 4619: (176-181): Function "dup15" not found.
-// DeclarationError 4619: (188-193): Function "dup16" not found.
-// DeclarationError 4619: (200-205): Function "dup32" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul b/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul
deleted file mode 100644
index 446c29315078..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let x := 0100
-}
-// ----
-// ParserError 1465: (15-16): Illegal token: Octal numbers not allowed.
diff --git a/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul
deleted file mode 100644
index f1b94af9e8e4..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    jump(2)
-}
-// ----
-// DeclarationError 4619: (6-10): Function "jump" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul
deleted file mode 100644
index 03c168692acb..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    jumpdest()
-}
-// ----
-// DeclarationError 4619: (6-14): Function "jumpdest" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul
deleted file mode 100644
index b5b7d8bdb96e..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    jumpi(2, 1)
-}
-// ----
-// DeclarationError 4619: (6-11): Function "jumpi" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul
deleted file mode 100644
index 63762bd318b7..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    label:
-}
-// ----
-// ParserError 6913: (11-12): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul b/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul
deleted file mode 100644
index dca68b7a03cd..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    mload(0)
-}
-// ----
-// TypeError 3083: (6-14): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
diff --git a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul b/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul
deleted file mode 100644
index ce93dd922669..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C" {
-    code {
-        /// @src 0:0:0
-        calldataload(0)
-    }
-}
-// ----
-// TypeError 3083: (82-97): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
diff --git a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul
deleted file mode 100644
index f57faf32a1ab..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    1
-}
-// ----
-// ParserError 6913: (8-9): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul b/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul
deleted file mode 100644
index 79ba4f83d52e..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C" {
-    code {
-        1
-    }
-}
-// ----
-// ParserError 6913: (65-66): Call or assignment expected.
-// ParserError 2314: (67-68): Expected end of source but got '}'
diff --git a/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
deleted file mode 100644
index e43d7a141b1c..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    pop(pc())
-}
-// ====
-// dialect: evmTyped
-// ----
-// SyntaxError 2450: (10-12): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul
deleted file mode 100644
index 00fe3c122381..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-// Based on ./push_disallowed.yul (which already includes push0).
-{
-    push0()
-}
-// ----
-// DeclarationError 4619: (72-77): Function "push0" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul
deleted file mode 100644
index cbb406aaf328..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    push0()
-    push1()
-    push2()
-    push3()
-    push4()
-    push5()
-    push6()
-    push7()
-    push8()
-    push9()
-    push10()
-    push11()
-    push12()
-    push13()
-    push14()
-    push15()
-    push16()
-    push17()
-    push18()
-    push19()
-    push20()
-    push21()
-    push22()
-    push23()
-    push24()
-    push25()
-    push26()
-    push27()
-    push28()
-    push29()
-    push30()
-    push31()
-    push32()
-}
-// ----
-// DeclarationError 4619: (6-11): Function "push0" not found.
-// DeclarationError 4619: (18-23): Function "push1" not found.
-// DeclarationError 4619: (30-35): Function "push2" not found.
-// DeclarationError 4619: (42-47): Function "push3" not found.
-// DeclarationError 4619: (54-59): Function "push4" not found.
-// DeclarationError 4619: (66-71): Function "push5" not found.
-// DeclarationError 4619: (78-83): Function "push6" not found.
-// DeclarationError 4619: (90-95): Function "push7" not found.
-// DeclarationError 4619: (102-107): Function "push8" not found.
-// DeclarationError 4619: (114-119): Function "push9" not found.
-// DeclarationError 4619: (126-132): Function "push10" not found.
-// DeclarationError 4619: (139-145): Function "push11" not found.
-// DeclarationError 4619: (152-158): Function "push12" not found.
-// DeclarationError 4619: (165-171): Function "push13" not found.
-// DeclarationError 4619: (178-184): Function "push14" not found.
-// DeclarationError 4619: (191-197): Function "push15" not found.
-// DeclarationError 4619: (204-210): Function "push16" not found.
-// DeclarationError 4619: (217-223): Function "push17" not found.
-// DeclarationError 4619: (230-236): Function "push18" not found.
-// DeclarationError 4619: (243-249): Function "push19" not found.
-// DeclarationError 4619: (256-262): Function "push20" not found.
-// DeclarationError 4619: (269-275): Function "push21" not found.
-// DeclarationError 4619: (282-288): Function "push22" not found.
-// DeclarationError 4619: (295-301): Function "push23" not found.
-// DeclarationError 4619: (308-314): Function "push24" not found.
-// DeclarationError 4619: (321-327): Function "push25" not found.
-// DeclarationError 4619: (334-340): Function "push26" not found.
-// DeclarationError 4619: (347-353): Function "push27" not found.
-// DeclarationError 4619: (360-366): Function "push28" not found.
-// DeclarationError 4619: (373-379): Function "push29" not found.
-// DeclarationError 4619: (386-392): Function "push30" not found.
-// DeclarationError 4619: (399-405): Function "push31" not found.
-// DeclarationError 4619: (412-418): Function "push32" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul
deleted file mode 100644
index 0d86cfef2cca..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    swap0()
-    swap1()
-    swap2()
-    swap3()
-    swap4()
-    swap5()
-    swap6()
-    swap7()
-    swap8()
-    swap9()
-    swap10()
-    swap11()
-    swap12()
-    swap13()
-    swap14()
-    swap15()
-    swap16()
-    swap32()
-}
-// ----
-// DeclarationError 4619: (6-11): Function "swap0" not found.
-// DeclarationError 4619: (18-23): Function "swap1" not found.
-// DeclarationError 4619: (30-35): Function "swap2" not found.
-// DeclarationError 4619: (42-47): Function "swap3" not found.
-// DeclarationError 4619: (54-59): Function "swap4" not found.
-// DeclarationError 4619: (66-71): Function "swap5" not found.
-// DeclarationError 4619: (78-83): Function "swap6" not found.
-// DeclarationError 4619: (90-95): Function "swap7" not found.
-// DeclarationError 4619: (102-107): Function "swap8" not found.
-// DeclarationError 4619: (114-119): Function "swap9" not found.
-// DeclarationError 4619: (126-132): Function "swap10" not found.
-// DeclarationError 4619: (139-145): Function "swap11" not found.
-// DeclarationError 4619: (152-158): Function "swap12" not found.
-// DeclarationError 4619: (165-171): Function "swap13" not found.
-// DeclarationError 4619: (178-184): Function "swap14" not found.
-// DeclarationError 4619: (191-197): Function "swap15" not found.
-// DeclarationError 4619: (204-210): Function "swap16" not found.
-// DeclarationError 4619: (217-223): Function "swap32" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol b/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol
deleted file mode 100644
index 7fb5547f7d49..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    // pop 1
-    // underflow ‬
-}
-// ----
-// ParserError 1465: (19-32): Illegal token: Unicode direction override underflow in comment or string literal.
diff --git a/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.yul b/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.yul
deleted file mode 100644
index 2dba69450b49..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    // pop 1
-    let s := unicode"underflow ‬";
-}
-// ----
-// ParserError 1465: (35-47): Illegal token: Invalid character in string.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul
deleted file mode 100644
index 89f155d9bd7d..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    verbatim_0i_0o(hex"")
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 1844: (21-26): The "verbatim_*" builtins cannot be used with empty bytecode.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul
deleted file mode 100644
index 777e2eb58c98..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let x := verbatim_01i_1o(hex"aa", 0)
-}
-// ----
-// DeclarationError 4619: (15-30): Function "verbatim_01i_1o" not found.
-// DeclarationError 3812: (6-42): Variable count mismatch for declaration of "x": 1 variables and 0 values.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul
deleted file mode 100644
index fd2f66571fe5..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let verbatim := 2
-    let verbatim_1i_2o := 3
-}
-// ----
-// ParserError 5568: (32-46): Cannot use builtin function name "verbatim_1i_2o" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul
deleted file mode 100644
index 3d86dda1239c..000000000000
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let verbatim := 2
-    let verbatim_abc := 3
-    function verbatim_fun() {}
-}
-// ----
-// DeclarationError 5017: (10-18): The identifier "verbatim" is reserved and can not be used.
-// DeclarationError 5017: (32-44): The identifier "verbatim_abc" is reserved and can not be used.
-// DeclarationError 5017: (54-80): The identifier "verbatim_fun" is reserved and can not be used.
diff --git a/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul b/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul
deleted file mode 100644
index 8a2768b654b5..000000000000
--- a/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x, y := 1
-}
-// ----
-// DeclarationError 3812: (3-16): Variable count mismatch for declaration of "x, y": 2 variables and 1 values.
diff --git a/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul b/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul
deleted file mode 100644
index 8ea0302eb37a..000000000000
--- a/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C" {
-    code {
-        let x, y := 1
-    }
-}
-// ----
-// DeclarationError 3812: (59-72): Variable count mismatch for declaration of "x, y": 2 variables and 1 values.
diff --git a/test/libyul/yulSyntaxTests/invalid_type.yul b/test/libyul/yulSyntaxTests/invalid_type.yul
deleted file mode 100644
index 99ed4c43b440..000000000000
--- a/test/libyul/yulSyntaxTests/invalid_type.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x: invalidType
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 5473: (10-24): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/invalid_type2.yul b/test/libyul/yulSyntaxTests/invalid_type2.yul
deleted file mode 100644
index 2ad035dcfc74..000000000000
--- a/test/libyul/yulSyntaxTests/invalid_type2.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x := 1:invalidType
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 5473: (15-28): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 3947: (10-11): Assigning value of type "invalidType" to variable of type "u256".
diff --git a/test/libyul/yulSyntaxTests/invalid_type3.yul b/test/libyul/yulSyntaxTests/invalid_type3.yul
deleted file mode 100644
index 1ce7092fe82d..000000000000
--- a/test/libyul/yulSyntaxTests/invalid_type3.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function f(a: invalidType) -> b: invalidType {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 5473: (17-31): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (36-50): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/invalid_type4.yul b/test/libyul/yulSyntaxTests/invalid_type4.yul
deleted file mode 100644
index 8195fcf90834..000000000000
--- a/test/libyul/yulSyntaxTests/invalid_type4.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    switch 1
-    case 8: invalidType {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 3781: (24-38): Expected a value of type "u256" but got "invalidType".
-// TypeError 5473: (24-38): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/keywords.yul b/test/libyul/yulSyntaxTests/keywords.yul
deleted file mode 100644
index 4f6457579ca1..000000000000
--- a/test/libyul/yulSyntaxTests/keywords.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	return (byte(1, 2), 2)
-	pop(address()) // this is valid (but unreachable) code
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul b/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul
deleted file mode 100644
index 15ac5dccb336..000000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    pop(linkersymbol(0))
-    pop(linkersymbol(true))
-    pop(linkersymbol(false))
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 5859: (23-24): Function expects string literal.
-// TypeError 5859: (48-52): Function expects string literal.
-// TypeError 5859: (76-81): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_evm.yul b/test/libyul/yulSyntaxTests/linkersymbol_evm.yul
deleted file mode 100644
index 2bec7e49c455..000000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_evm.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let addr := linkersymbol("contract/library.sol:L")
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul b/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
deleted file mode 100644
index aa9cc3adbf1a..000000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let addr:u256 := linkersymbol("contract/library.sol:L")
-    function linkersymbol(x) {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 5568: (75-87): Cannot use builtin function name "linkersymbol" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul b/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul
deleted file mode 100644
index e8b860a01e63..000000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let library_name := "contract/library.sol:L"
-    let addr := linkersymbol(library_name)
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 9114: (67-79): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul b/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul
deleted file mode 100644
index 68ce920e1fb3..000000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    function linkersymbol(a) {}
-}
-// ====
-// dialect: evm
-// ----
-// ParserError 5568: (15-27): Cannot use builtin function name "linkersymbol" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/literal_invalid_type.yul b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
deleted file mode 100644
index 07a51eb887d3..000000000000
--- a/test/libyul/yulSyntaxTests/literal_invalid_type.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x:bool := true:unhappy
-}
-// ----
-// TypeError 5473: (20-32): "unhappy" is not a valid type (user defined types are not yet supported).
-// TypeError 5170: (20-32): Invalid type "unhappy" for literal "true".
-// TypeError 3947: (10-16): Assigning value of type "unhappy" to variable of type "bool".
diff --git a/test/libyul/yulSyntaxTests/loadimmutable.yul b/test/libyul/yulSyntaxTests/loadimmutable.yul
deleted file mode 100644
index 6aea058b5d57..000000000000
--- a/test/libyul/yulSyntaxTests/loadimmutable.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let addr := loadimmutable("address")
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul b/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul
deleted file mode 100644
index 2aadd2f208f0..000000000000
--- a/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    pop(loadimmutable(0))
-    pop(loadimmutable(true))
-    pop(loadimmutable(false))
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 5859: (24-25): Function expects string literal.
-// TypeError 5859: (50-54): Function expects string literal.
-// TypeError 5859: (79-84): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul b/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul
deleted file mode 100644
index 8711d0b17757..000000000000
--- a/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    function loadimmutable(a) {}
-}
-// ====
-// dialect: evm
-// ----
-// ParserError 5568: (15-28): Cannot use builtin function name "loadimmutable" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/metadata_access.yul b/test/libyul/yulSyntaxTests/metadata_access.yul
deleted file mode 100644
index 63aeb4760296..000000000000
--- a/test/libyul/yulSyntaxTests/metadata_access.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-object "A" {
-  code {
-    pop(dataoffset(".other"))
-    pop(datasize(".other"))
-    pop(datasize("B..other"))
-    // "B.other" does not exist.
-    pop(datasize("B.other"))
-    // ".metadata" is not accessible by definition
-    pop(dataoffset(".metadata"))
-    pop(datasize(".metadata"))
-    pop(dataoffset("B..metadata"))
-    pop(datasize("B..metadata"))
-  }
-
-  object "B" {
-    code {}
-    data ".metadata" "Hello, World!"
-    data ".other" "Hello, World2!"
-  }
-
-  data ".metadata" "Hello, World!"
-  data ".other" "Hello, World2!"
-}
-// ----
-// TypeError 3517: (41-49): Unknown data object ".other".
-// TypeError 3517: (69-77): Unknown data object ".other".
-// TypeError 3517: (97-107): Unknown data object "B..other".
-// TypeError 3517: (160-169): Unknown data object "B.other".
-// TypeError 3517: (242-253): Unknown data object ".metadata".
-// TypeError 3517: (273-284): Unknown data object ".metadata".
-// TypeError 3517: (306-319): Unknown data object "B..metadata".
-// TypeError 3517: (339-352): Unknown data object "B..metadata".
diff --git a/test/libyul/yulSyntaxTests/metadata_access_2.yul b/test/libyul/yulSyntaxTests/metadata_access_2.yul
deleted file mode 100644
index a4b013e854ff..000000000000
--- a/test/libyul/yulSyntaxTests/metadata_access_2.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-object "A" {
-  code {
-    sstore(dataoffset("0"), dataoffset("1"))
-    sstore(0, datasize(".mightbereservedinthefuture"))
-  }
-
-  data "0"  "UVW"
-  data ".metadata" "ABC"
-  data "1" "XYZ"
-  data ".mightbereservedinthefuture" "TRS"
-}
-// ----
-// TypeError 3517: (90-119): Unknown data object ".mightbereservedinthefuture".
diff --git a/test/libyul/yulSyntaxTests/metadata_access_subobject.yul b/test/libyul/yulSyntaxTests/metadata_access_subobject.yul
deleted file mode 100644
index 216b56ac649c..000000000000
--- a/test/libyul/yulSyntaxTests/metadata_access_subobject.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-object "A" {
-	code {
-		sstore(dataoffset(".metadata.x"), 0)
-	}
-
-	object ".metadata" {
-		code {}
-		data "x" "ABC"
-	}
-}
-// ----
-// TypeError 3517: (41-54): Unknown data object ".metadata.x".
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_1.yul b/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
deleted file mode 100644
index b619007a55ea..000000000000
--- a/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	let x:u256
-	function f() -> a:u256, b:u256 {}
-	123:u256, x := f()
-}
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 2856: (58-59): Variable name must precede "," in multiple assignment.
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_2.yul b/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
deleted file mode 100644
index 852502447f08..000000000000
--- a/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	let x:u256
-	function f() -> a:u256, b:u256 {}
-	x, 123:u256 := f()
-}
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 2856: (62-64): Variable name must precede ":=" in assignment.
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_3.yul b/test/libyul/yulSyntaxTests/multiple_assignment_3.yul
deleted file mode 100644
index c7ac5eb8e5aa..000000000000
--- a/test/libyul/yulSyntaxTests/multiple_assignment_3.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	function f(a:u256) -> r1:u256, r2:u256 {
-		r1 := a
-		r2 := 7:u256
-	}
-	let x:u256 := 9:u256
-	let y:u256 := 2:u256
-	x, y := f(x)
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul b/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul
deleted file mode 100644
index f35913215c9d..000000000000
--- a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	function g() {
-		let g := 0
-	}
-}
-// ----
-// DeclarationError 1395: (20-30): Variable name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul b/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul
deleted file mode 100644
index 548c72d31b1b..000000000000
--- a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	{ let g := 0 }
-	function g() {}
-}
-// ----
-// DeclarationError 1395: (5-15): Variable name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul b/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul
deleted file mode 100644
index f671d034888f..000000000000
--- a/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	function g() {
-		function g() {}
-	}
-}
-// ----
-// DeclarationError 6052: (20-35): Function name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul b/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul
deleted file mode 100644
index 3fd2015a451b..000000000000
--- a/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	{
-		function g() {}
-	}
-	function g() {}
-}
-// ----
-// DeclarationError 6052: (7-22): Function name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul b/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul
deleted file mode 100644
index b6c2ab66c319..000000000000
--- a/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-/// @use-src 0:"input.sol"
-object "C" {
-    code {
-        /// @src 0:0:0
-        function g() {
-            function g() {}
-        }
-    }
-}
-// ----
-// DeclarationError 6052: (109-124): Function name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clashes.yul b/test/libyul/yulSyntaxTests/name_clashes.yul
deleted file mode 100644
index 19c5c9549881..000000000000
--- a/test/libyul/yulSyntaxTests/name_clashes.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let g := 2
-    function g() { }
-}
-// ----
-// DeclarationError 1395: (6-16): Variable name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/number_literal_1.yul b/test/libyul/yulSyntaxTests/number_literal_1.yul
deleted file mode 100644
index 5d5bcd150cc4..000000000000
--- a/test/libyul/yulSyntaxTests/number_literal_1.yul
+++ /dev/null
@@ -1,2 +0,0 @@
-{ let x:u256 := 1:u256 }
-// ----
diff --git a/test/libyul/yulSyntaxTests/number_literal_2.yul b/test/libyul/yulSyntaxTests/number_literal_2.yul
deleted file mode 100644
index 94c5929b5381..000000000000
--- a/test/libyul/yulSyntaxTests/number_literal_2.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x:u256 := .1:u256 }
-// ----
-// ParserError 4828: (16-18): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_3.yul b/test/libyul/yulSyntaxTests/number_literal_3.yul
deleted file mode 100644
index 4dbb6879a9e5..000000000000
--- a/test/libyul/yulSyntaxTests/number_literal_3.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x:u256 := 1e5:u256 }
-// ----
-// ParserError 4828: (16-19): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_4.yul b/test/libyul/yulSyntaxTests/number_literal_4.yul
deleted file mode 100644
index 7de784e88c20..000000000000
--- a/test/libyul/yulSyntaxTests/number_literal_4.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x:u256 := 67.235:u256 }
-// ----
-// ParserError 4828: (16-22): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_5.yul b/test/libyul/yulSyntaxTests/number_literal_5.yul
deleted file mode 100644
index df41e69eca0c..000000000000
--- a/test/libyul/yulSyntaxTests/number_literal_5.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x:u256 := 0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff:u256 }
-// ----
-// TypeError 6708: (16-88): Number literal too large (> 256 bits)
diff --git a/test/libyul/yulSyntaxTests/number_literals_1.yul b/test/libyul/yulSyntaxTests/number_literals_1.yul
deleted file mode 100644
index 9898635b5178..000000000000
--- a/test/libyul/yulSyntaxTests/number_literals_1.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	let x := 1
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/number_literals_2.yul b/test/libyul/yulSyntaxTests/number_literals_2.yul
deleted file mode 100644
index 7b054f0d3fe6..000000000000
--- a/test/libyul/yulSyntaxTests/number_literals_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := .1
-}
-// ----
-// ParserError 4828: (12-14): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literals_3.yul b/test/libyul/yulSyntaxTests/number_literals_3.yul
deleted file mode 100644
index acdffda51368..000000000000
--- a/test/libyul/yulSyntaxTests/number_literals_3.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := 1e5
-}
-// ----
-// ParserError 4828: (12-15): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literals_4.yul b/test/libyul/yulSyntaxTests/number_literals_4.yul
deleted file mode 100644
index 58b25bf57229..000000000000
--- a/test/libyul/yulSyntaxTests/number_literals_4.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := 67.235
-}
-// ----
-// ParserError 4828: (12-18): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literals_5.yul b/test/libyul/yulSyntaxTests/number_literals_5.yul
deleted file mode 100644
index 5fd87743db09..000000000000
--- a/test/libyul/yulSyntaxTests/number_literals_5.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	let x := 0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-}
-// ----
-// TypeError 6708: (12-79): Number literal too large (> 256 bits)
diff --git a/test/libyul/yulSyntaxTests/objects/basic_subobject.yul b/test/libyul/yulSyntaxTests/objects/basic_subobject.yul
deleted file mode 100644
index 9bd4b24386b8..000000000000
--- a/test/libyul/yulSyntaxTests/objects/basic_subobject.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {}
-
-  object "B" {
-    code {}
-  }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/code.yul b/test/libyul/yulSyntaxTests/objects/code.yul
deleted file mode 100644
index 89caa8e505d2..000000000000
--- a/test/libyul/yulSyntaxTests/objects/code.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-object "A" {
-  code {
-    function f() -> offset, len {
-      offset := dataoffset("A")
-      len := datasize("A")
-    }
-
-    let offset, len := f()
-    codecopy(0, offset, len)
-  }
-
-  data "hello" "hello world text"
-  object "hello" {
-    code {}
-  }
-}
-// ----
-// ParserError 8794: (226-233): Object name "hello" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/code_without_object.yul b/test/libyul/yulSyntaxTests/objects/code_without_object.yul
deleted file mode 100644
index e67c5c36d48a..000000000000
--- a/test/libyul/yulSyntaxTests/objects/code_without_object.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-code {
-}
-// ----
-// ParserError 4294: (0-4): Expected keyword "object".
diff --git a/test/libyul/yulSyntaxTests/objects/complex_subobject.yul b/test/libyul/yulSyntaxTests/objects/complex_subobject.yul
deleted file mode 100644
index 9c278feca400..000000000000
--- a/test/libyul/yulSyntaxTests/objects/complex_subobject.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-object "A" {
-  code {}
-  data "1" hex"001122"
-
-  object "B" {
-    code {}
-    data "2" ""
-
-    object "B_C" {
-      code {}
-
-      object "B_C_1" {
-        code {}
-      }
-      object "B_C_2" {
-        code {}
-      }
-    }
-  }
-
-  object "C" {
-    code {}
-  }
-
-  object "D" {
-    code {}
-
-    object "D_1" {
-      code {}
-    }
-    object "D_2" {
-      code {}
-    }
-  }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul b/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul
deleted file mode 100644
index e09bd8b37745..000000000000
--- a/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {}
-
-  data "B" ""
-  data "B" hex"00"
-}
-// ----
-// ParserError 8794: (45-48): Object name "B" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul b/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul
deleted file mode 100644
index 5edb1bd3a902..000000000000
--- a/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-object "A" {
-  code {}
-
-  object "A" {
-    code {}
-  }
-}
-// ----
-// ParserError 8311: (33-36): Object name cannot be the same as the name of the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul b/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul
deleted file mode 100644
index fd64093ad7e8..000000000000
--- a/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-object "A" {
-  code {}
-
-  data "B" ""
-  object "B" {
-    code {}
-  }
-}
-// ----
-// ParserError 8794: (47-50): Object name "B" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul b/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul
deleted file mode 100644
index 1b83be4f75c0..000000000000
--- a/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-object "A" {
-  code {}
-
-  object "B" {
-    code {}
-  }
-  object "B" {
-    code {}
-  }
-}
-// ----
-// ParserError 8794: (64-67): Object name "B" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul b/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul
deleted file mode 100644
index 44a3d3a2d17a..000000000000
--- a/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-object "A" {
-  code {}
-
-  data "A" ""
-}
-// ----
-// ParserError 8311: (31-34): Object name cannot be the same as the name of the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/data.yul b/test/libyul/yulSyntaxTests/objects/data.yul
deleted file mode 100644
index 47d7b59c7f0a..000000000000
--- a/test/libyul/yulSyntaxTests/objects/data.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-object "A" {
-  code {
-    datacopy(0, dataoffset("3"), datasize("3"))
-  }
-  data "1" ""
-  data "2" hex"0011"
-  data "3" "hello world this is longer than 32 bytes and should still work"
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/data_access.yul b/test/libyul/yulSyntaxTests/objects/data_access.yul
deleted file mode 100644
index e9455fafab33..000000000000
--- a/test/libyul/yulSyntaxTests/objects/data_access.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-object "A" {
-  code {
-    pop(dataoffset("B"))
-    pop(datasize("B"))
-  }
-
-  data "B" hex"00"
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/data_first.yul b/test/libyul/yulSyntaxTests/objects/data_first.yul
deleted file mode 100644
index 018674765248..000000000000
--- a/test/libyul/yulSyntaxTests/objects/data_first.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "A" {
-  data "B" ""
-  code {}
-}
-// ----
-// ParserError 4846: (15-19): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/data_hex_name.yul b/test/libyul/yulSyntaxTests/objects/data_hex_name.yul
deleted file mode 100644
index 28f7282d701a..000000000000
--- a/test/libyul/yulSyntaxTests/objects/data_hex_name.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "A" {
-  code {}
-  data hex"11" ""
-}
-// ----
-// ParserError 2314: (30-37): Expected 'StringLiteral' but got 'HexStringLiteral'
diff --git a/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul b/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul
deleted file mode 100644
index c80f82c202da..000000000000
--- a/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {
-  }
-  data "1" hex"0"
-  data "1" hex"wronghexencoding"
-}
-// ----
-// ParserError 2314: (37-41): Expected 'StringLiteral' but got 'ILLEGAL'
diff --git a/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul b/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul
deleted file mode 100644
index 17029e4f77d6..000000000000
--- a/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {
-  }
-  data "1" hex"wronghexencoding"
-  data "2" hex"0"
-}
-// ----
-// ParserError 2314: (37-41): Expected 'StringLiteral' but got 'ILLEGAL'
diff --git a/test/libyul/yulSyntaxTests/objects/datacopy.yul b/test/libyul/yulSyntaxTests/objects/datacopy.yul
deleted file mode 100644
index 6e36025fcbd1..000000000000
--- a/test/libyul/yulSyntaxTests/objects/datacopy.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    datacopy(0, 1, 2)
-
-    // datacopy also accepts pretty much anything which can be turned into a number
-    let x := 0
-    let s := ""
-    datacopy(x, "11", s)
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul b/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul
deleted file mode 100644
index d53e26281eae..000000000000
--- a/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-object "A" {
-  code {
-    let x := "B"
-    pop(dataoffset(x))
-  }
-
-  data "B" hex"00"
-}
-// ----
-// TypeError 9114: (47-57): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul b/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul
deleted file mode 100644
index 93a981d924e0..000000000000
--- a/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-object "A" {
-  code {
-    pop(dataoffset(0))
-  }
-}
-// ----
-// TypeError 5859: (41-42): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul b/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul
deleted file mode 100644
index 14df40201418..000000000000
--- a/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {
-    pop(dataoffset("C"))
-  }
-  data "B" ""
-}
-// ----
-// TypeError 3517: (41-44): Unknown data object "C".
diff --git a/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul b/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul
deleted file mode 100644
index 837408b9a00b..000000000000
--- a/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-object "A" {
-  code {
-    let x := "B"
-    pop(datasize(x))
-  }
-
-  data "B" hex"00"
-}
-// ----
-// TypeError 9114: (47-55): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul b/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul
deleted file mode 100644
index 19042a2df738..000000000000
--- a/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-object "A" {
-  code {
-    pop(datasize(0))
-  }
-}
-// ----
-// TypeError 5859: (39-40): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul b/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul
deleted file mode 100644
index 48a2c268e205..000000000000
--- a/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {
-    pop(datasize("C"))
-  }
-  data "B" ""
-}
-// ----
-// TypeError 3517: (39-42): Unknown data object "C".
diff --git a/test/libyul/yulSyntaxTests/objects/empty_code.yul b/test/libyul/yulSyntaxTests/objects/empty_code.yul
deleted file mode 100644
index 1b5d66fa2935..000000000000
--- a/test/libyul/yulSyntaxTests/objects/empty_code.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-object "A" {
-  code { }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/empty_data.yul b/test/libyul/yulSyntaxTests/objects/empty_data.yul
deleted file mode 100644
index b2456a7aeef3..000000000000
--- a/test/libyul/yulSyntaxTests/objects/empty_data.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-object "A" {
-  data "tmp" ""
-}
-// ----
-// ParserError 4846: (15-19): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/empty_object.yul b/test/libyul/yulSyntaxTests/objects/empty_object.yul
deleted file mode 100644
index cc9019e55ba9..000000000000
--- a/test/libyul/yulSyntaxTests/objects/empty_object.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-object "A" {
-}
-// ----
-// ParserError 4846: (13-14): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/empty_object_name.yul b/test/libyul/yulSyntaxTests/objects/empty_object_name.yul
deleted file mode 100644
index 653bf4a0ffae..000000000000
--- a/test/libyul/yulSyntaxTests/objects/empty_object_name.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-object "" {
-}
-// ----
-// ParserError 3287: (7-9): Object name cannot be empty.
-// ParserError 4846: (12-13): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/incomplete1.yul b/test/libyul/yulSyntaxTests/objects/incomplete1.yul
deleted file mode 100644
index 6698f45a2dfa..000000000000
--- a/test/libyul/yulSyntaxTests/objects/incomplete1.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-object {
-// ----
-// ParserError 2314: (7-8): Expected 'StringLiteral' but got '{'
diff --git a/test/libyul/yulSyntaxTests/objects/incomplete2.yul b/test/libyul/yulSyntaxTests/objects/incomplete2.yul
deleted file mode 100644
index f421074f5a25..000000000000
--- a/test/libyul/yulSyntaxTests/objects/incomplete2.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-object "A" {
-  code {}
-}
-
-object
-// ----
-// ParserError 2314: (26-32): Expected end of source but got identifier
diff --git a/test/libyul/yulSyntaxTests/objects/multiple_code.yul b/test/libyul/yulSyntaxTests/objects/multiple_code.yul
deleted file mode 100644
index fd3347600389..000000000000
--- a/test/libyul/yulSyntaxTests/objects/multiple_code.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "A" {
-  code { }
-  code { }
-}
-// ----
-// ParserError 8143: (26-30): Expected keyword "data" or "object" or "}".
diff --git a/test/libyul/yulSyntaxTests/objects/multiple_data.yul b/test/libyul/yulSyntaxTests/objects/multiple_data.yul
deleted file mode 100644
index 5a48edd914fe..000000000000
--- a/test/libyul/yulSyntaxTests/objects/multiple_data.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-object "A" {
-  code { }
-  data "one" ""
-  data "two" ""
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul b/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul
deleted file mode 100644
index 842cfcfb5cd1..000000000000
--- a/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code { }
-}
-object "B" {
-  code { }
-}
-// ----
-// ParserError 2314: (26-32): Expected end of source but got identifier
diff --git a/test/libyul/yulSyntaxTests/objects/nested_object.yul b/test/libyul/yulSyntaxTests/objects/nested_object.yul
deleted file mode 100644
index 66d2e406699d..000000000000
--- a/test/libyul/yulSyntaxTests/objects/nested_object.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-object "outer" {
-        code { let x := mload(0) }
-        data "x" "stringdata"
-        object "inner" {
-                code { mstore(0, 1) }
-                object "inner inner" { code {} }
-                data "innerx" "abc"
-                data "innery" "def"
-        }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/object_hex_name.yul b/test/libyul/yulSyntaxTests/objects/object_hex_name.yul
deleted file mode 100644
index c58b5fd191ed..000000000000
--- a/test/libyul/yulSyntaxTests/objects/object_hex_name.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-object hex"11" {
-  code {}
-}
-// ----
-// ParserError 2314: (7-14): Expected 'StringLiteral' but got 'HexStringLiteral'
diff --git a/test/libyul/yulSyntaxTests/objects/subobject_access.yul b/test/libyul/yulSyntaxTests/objects/subobject_access.yul
deleted file mode 100644
index 59426a0aa631..000000000000
--- a/test/libyul/yulSyntaxTests/objects/subobject_access.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-object "A" {
-  code {
-    pop(dataoffset("B"))
-    pop(datasize("B"))
-  }
-
-  object "B" {
-    code {}
-  }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/objects/subobject_first.yul b/test/libyul/yulSyntaxTests/objects/subobject_first.yul
deleted file mode 100644
index 369e7180e745..000000000000
--- a/test/libyul/yulSyntaxTests/objects/subobject_first.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-object "A" {
-  object "B" {
-    code {}
-  }
-
-  code {}
-}
-// ----
-// ParserError 4846: (15-21): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul b/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul
deleted file mode 100644
index af0581067872..000000000000
--- a/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "A" {
-  code {}
-  object hex"11" {
-    code {}
-  }
-}
-// ----
-// ParserError 2314: (32-39): Expected 'StringLiteral' but got 'HexStringLiteral'
diff --git a/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul b/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul
deleted file mode 100644
index 00c357bb44aa..000000000000
--- a/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function f(gas) {}
-}
-// ----
-// ParserError 5568: (14-17): Cannot use builtin function name "gas" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul b/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul
deleted file mode 100644
index 989cfce9e007..000000000000
--- a/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function f() -> gas {}
-}
-// ----
-// ParserError 5568: (19-22): Cannot use builtin function name "gas" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/opcode_for_functions.yul b/test/libyul/yulSyntaxTests/opcode_for_functions.yul
deleted file mode 100644
index 0efc7cbccedd..000000000000
--- a/test/libyul/yulSyntaxTests/opcode_for_functions.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	function gas() {}
-}
-// ----
-// ParserError 5568: (12-15): Cannot use builtin function name "gas" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/optional_types.yul b/test/libyul/yulSyntaxTests/optional_types.yul
deleted file mode 100644
index aa77ffca708c..000000000000
--- a/test/libyul/yulSyntaxTests/optional_types.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let x := 1:u256
-    let y:u256 := 1
-    function f(a) {}
-    function g(a:u256) -> b {}
-}
-// ====
-// dialect: yul
-// ----
diff --git a/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul b/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul
deleted file mode 100644
index 433d36683dfe..000000000000
--- a/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    setimmutable(0, loadimmutable("abc"), "abc")
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 9114: (6-18): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier.yul b/test/libyul/yulSyntaxTests/period_in_identifier.yul
deleted file mode 100644
index 4ee80a3f4c11..000000000000
--- a/test/libyul/yulSyntaxTests/period_in_identifier.yul
+++ /dev/null
@@ -1,2 +0,0 @@
-{ let x.y:u256 := 2:u256 }
-// ----
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
deleted file mode 100644
index dc889a2fbc25..000000000000
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x. y:u256 }
-// ----
-// ParserError 6913: (10-11): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
deleted file mode 100644
index 5602cbcebc49..000000000000
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x .y:u256 }
-// ----
-// ParserError 1856: (8-9): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
deleted file mode 100644
index 003341b339c8..000000000000
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let x . y:u256 }
-// ----
-// ParserError 1856: (8-9): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_start.yul b/test/libyul/yulSyntaxTests/period_in_identifier_start.yul
deleted file mode 100644
index 83da8389f13f..000000000000
--- a/test/libyul/yulSyntaxTests/period_in_identifier_start.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    x.y(2:u256)
-    function x.y(a:u256) {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul b/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul
deleted file mode 100644
index 51623599d67a..000000000000
--- a/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-/// comment
-{ x.y(2:u256) function x.y(a:u256) {} }
-// ----
diff --git a/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul b/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
deleted file mode 100644
index 0002b76fdb8b..000000000000
--- a/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ let .y:u256 }
-// ----
-// ParserError 2314: (6-7): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/push.yul b/test/libyul/yulSyntaxTests/push.yul
deleted file mode 100644
index f3dab144d54e..000000000000
--- a/test/libyul/yulSyntaxTests/push.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ 0x42:u256 }
-// ----
-// ParserError 6913: (12-13): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/recursion_depth.yul b/test/libyul/yulSyntaxTests/recursion_depth.yul
deleted file mode 100644
index 9c65013912e5..000000000000
--- a/test/libyul/yulSyntaxTests/recursion_depth.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
-let x:u256 := 0:u256
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 7319: (600-601): Maximum recursion depth reached during parsing.
diff --git a/test/libyul/yulSyntaxTests/selfdestruct.yul b/test/libyul/yulSyntaxTests/selfdestruct.yul
deleted file mode 100644
index 745fdc5c5afd..000000000000
--- a/test/libyul/yulSyntaxTests/selfdestruct.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	selfdestruct(0x02)
-}
-// ----
-// Warning 1699: (3-15): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
diff --git a/test/libyul/yulSyntaxTests/setimmutable.yul b/test/libyul/yulSyntaxTests/setimmutable.yul
deleted file mode 100644
index e1d6a74919c9..000000000000
--- a/test/libyul/yulSyntaxTests/setimmutable.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    setimmutable(0, "address", 0x1234567890123456789012345678901234567890)
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul b/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul
deleted file mode 100644
index 9e4bc8032c78..000000000000
--- a/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    setimmutable(0, 0, 0x1234567890123456789012345678901234567890)
-    setimmutable(0, true, 0x1234567890123456789012345678901234567890)
-    setimmutable(0, false, 0x1234567890123456789012345678901234567890)
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 5859: (22-23): Function expects string literal.
-// TypeError 5859: (89-93): Function expects string literal.
-// TypeError 5859: (159-164): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul b/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul
deleted file mode 100644
index b76a5de9b729..000000000000
--- a/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    function setimmutable(a, b) {}
-}
-// ====
-// dialect: evm
-// ----
-// ParserError 5568: (15-27): Cannot use builtin function name "setimmutable" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/simple_functions.yul b/test/libyul/yulSyntaxTests/simple_functions.yul
deleted file mode 100644
index 5b63885f2b5f..000000000000
--- a/test/libyul/yulSyntaxTests/simple_functions.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    function a() {}
-    function f() { mstore(0, 1) }
-    function g() { sstore(0, 1) }
-    function h() { let x := msize() }
-    function i() { let z := mload(0) }
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/simple_instructions.yul b/test/libyul/yulSyntaxTests/simple_instructions.yul
deleted file mode 100644
index 658277432a57..000000000000
--- a/test/libyul/yulSyntaxTests/simple_instructions.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	let y := mul(0x10, mul(0x20, mload(0x40)))
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/smoke.yul b/test/libyul/yulSyntaxTests/smoke.yul
deleted file mode 100644
index 43393d77315e..000000000000
--- a/test/libyul/yulSyntaxTests/smoke.yul
+++ /dev/null
@@ -1,2 +0,0 @@
-{}
-// ----
diff --git a/test/libyul/yulSyntaxTests/smoke_test.yul b/test/libyul/yulSyntaxTests/smoke_test.yul
deleted file mode 100644
index 9254046e24c4..000000000000
--- a/test/libyul/yulSyntaxTests/smoke_test.yul
+++ /dev/null
@@ -1,2 +0,0 @@
-{ { } }
-// ----
diff --git a/test/libyul/yulSyntaxTests/solidity_keywords.yul b/test/libyul/yulSyntaxTests/solidity_keywords.yul
deleted file mode 100644
index dfff919cc0a5..000000000000
--- a/test/libyul/yulSyntaxTests/solidity_keywords.yul
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  // These are keywords of Solidity -- a copy from liblangutil/Token.h.
-  let abstract := 1
-  let anonymous := 1
-  let as := 1
-  let assembly := 1
-  // break is Yul keyword
-  let catch := 1
-  let constant := 1
-  let constructor := 1
-  // continue is Yul keyword
-  let contract := 1
-  let do := 1
-  let else := 1
-  let enum := 1
-  let emit := 1
-  let event := 1
-  let external := 1
-  let fallback := 1
-  // for is a Yul keyword
-  // function is a Yul keyword
-  // hex is a Yul keyword
-  // if is a Yul keyword
-  let indexed := 1
-  let interface := 1
-  let internal := 1
-  let immutable := 1
-  let import := 1
-  let is := 1
-  let library := 1
-  let mapping := 1
-  let memory := 1
-  let modifier := 1
-  let new := 1
-  let override := 1
-  let payable := 1
-  let public := 1
-  let pragma := 1
-  let private := 1
-  let pure := 1
-  let receive := 1
-  // return is a builtin in EVMDialect
-  return(0, 0)
-  let returns := 1
-  let storage := 1
-  let calldata := 1
-  let struct := 1
-  let throw := 1
-  let try := 1
-  let type := 1
-  let unicode := 1
-  let using := 1
-  let view := 1
-  let virtual := 1
-  let while := 1
-  let wei := 1
-  let gwei := 1
-  let ether := 1
-  let seconds := 1
-  let minutes := 1
-  let hours := 1
-  let days := 1
-  let weeks := 1
-  let years := 1
-  let int := 1
-  let uint := 1
-  let bytes := 1
-  // byte is a builtin in EVMDialect
-  pop(byte(1, 1))
-  let string := 1
-  // address is a builtin in EVMDialect
-  pop(address())
-  let bool := 1
-  let fixed := 1
-  let ufixed := 1
-  let after := 1
-  let alias := 1
-  let apply := 1
-  let auto := 1
-  // case is a Yul keyword
-  let copyof := 1
-  // default is a Yul keyword
-  let define := 1
-  let final := 1
-  let implements := 1
-  let in := 1
-  let inline := 1
-  // let is a Yul keyword
-  let macro := 1
-  let match := 1
-  let mutable := 1
-  let null := 1
-  let of := 1
-  let partial := 1
-  let promise := 1
-  let reference := 1
-  let relocatable := 1
-  let sealed := 1
-  let sizeof := 1
-  let static := 1
-  let supports := 1
-  // switch is a Yul keyword
-  let typedef := 1
-  let typeof := 1
-  let unchecked := 1
-  let var := 1
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/string_literal_switch_case.yul b/test/libyul/yulSyntaxTests/string_literal_switch_case.yul
deleted file mode 100644
index 6f0d72229947..000000000000
--- a/test/libyul/yulSyntaxTests/string_literal_switch_case.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    switch codesize()
-    case "1" {}
-    case "2" {}
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/string_literal_too_long.yul b/test/libyul/yulSyntaxTests/string_literal_too_long.yul
deleted file mode 100644
index 2ae5be44a658..000000000000
--- a/test/libyul/yulSyntaxTests/string_literal_too_long.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let name := "long___name___that___definitely___exceeds___the___thirty___two___byte___limit"
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 3069: (18-97): String literal too long (77 > 32)
diff --git a/test/libyul/yulSyntaxTests/string_literal_too_long_byte.yul b/test/libyul/yulSyntaxTests/string_literal_too_long_byte.yul
deleted file mode 100644
index 0ae6d3beb876..000000000000
--- a/test/libyul/yulSyntaxTests/string_literal_too_long_byte.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x := byte(40, "long___value__that___definitely___exceeds___the___thirty___two___byte___limit")
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 3069: (24-103): String literal too long (77 > 32)
diff --git a/test/libyul/yulSyntaxTests/string_literal_too_long_immutable.yul b/test/libyul/yulSyntaxTests/string_literal_too_long_immutable.yul
deleted file mode 100644
index 98707451e600..000000000000
--- a/test/libyul/yulSyntaxTests/string_literal_too_long_immutable.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    setimmutable(
-        0,
-        "long___name___that___definitely___exceeds___the___thirty___two___byte___limit",
-        0x1234567890123456789012345678901234567890
-    )
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/string_literal_too_long_linkersymbol.yul b/test/libyul/yulSyntaxTests/string_literal_too_long_linkersymbol.yul
deleted file mode 100644
index cf8ef95e16ef..000000000000
--- a/test/libyul/yulSyntaxTests/string_literal_too_long_linkersymbol.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let addr := linkersymbol("contract/long___name___that___definitely___exceeds___the___thirty___two___byte___limit.sol:L")
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/surplus_input.yul b/test/libyul/yulSyntaxTests/surplus_input.yul
deleted file mode 100644
index 3db8feec986f..000000000000
--- a/test/libyul/yulSyntaxTests/surplus_input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{}
-{}
-// ----
-// ParserError 2314: (3-4): Expected end of source but got '{'
diff --git a/test/libyul/yulSyntaxTests/switch_case.yul b/test/libyul/yulSyntaxTests/switch_case.yul
deleted file mode 100644
index 88bda992946a..000000000000
--- a/test/libyul/yulSyntaxTests/switch_case.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	switch 0:u256
-	case 42:u256 {}
-	case 0x42:u256 {}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/switch_case_different_literal.yul b/test/libyul/yulSyntaxTests/switch_case_different_literal.yul
deleted file mode 100644
index 8514b835d2fc..000000000000
--- a/test/libyul/yulSyntaxTests/switch_case_different_literal.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	switch 1:u256
-	case "1":u256 {}
-	case "2":u256 {}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul b/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul
deleted file mode 100644
index dceb9db16092..000000000000
--- a/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	let x:u256
-	switch x
-	case "012345678901234567890123456789012":u256 {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 3069: (30-70): String literal too long (33 > 32)
diff --git a/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul b/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul
deleted file mode 100644
index 55f25124b2ad..000000000000
--- a/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x:u256
-	switch x
-	case "01234567890123456789012345678901":u256 {}
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/switch_default_before_case.yul b/test/libyul/yulSyntaxTests/switch_default_before_case.yul
deleted file mode 100644
index 14434b7acd2f..000000000000
--- a/test/libyul/yulSyntaxTests/switch_default_before_case.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    switch 42
-    default {}
-    case 1 {}
-}
-// ----
-// ParserError 4904: (35-39): Case not allowed after default case.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
deleted file mode 100644
index 861f721acdac..000000000000
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	switch 0:u256
-	case 0:u256 {}
-	case 0x0:u256 {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// DeclarationError 6792: (34-50): Duplicate case "0" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
deleted file mode 100644
index e3367b175b6f..000000000000
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	switch 0:u256
-	case 0:u256 {}
-	case "":u256 {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// DeclarationError 6792: (34-49): Duplicate case "0" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_default.yul b/test/libyul/yulSyntaxTests/switch_duplicate_default.yul
deleted file mode 100644
index 4b73953fe8e4..000000000000
--- a/test/libyul/yulSyntaxTests/switch_duplicate_default.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    switch 42
-    default {}
-    default {}
-}
-// ----
-// ParserError 6931: (35-42): Only one default case allowed.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_body.yul b/test/libyul/yulSyntaxTests/switch_invalid_body.yul
deleted file mode 100644
index b6c4816fb169..000000000000
--- a/test/libyul/yulSyntaxTests/switch_invalid_body.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    switch 42
-    case 1 mul
-    case 2 {}
-    default {}
-}
-// ----
-// ParserError 2314: (27-30): Expected '{' but got identifier
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_case.yul b/test/libyul/yulSyntaxTests/switch_invalid_case.yul
deleted file mode 100644
index 0aa52d371e75..000000000000
--- a/test/libyul/yulSyntaxTests/switch_invalid_case.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    switch 42
-    case mul(1, 2) {}
-    case 2 {}
-    default {}
-}
-// ----
-// ParserError 4805: (28-29): Literal expected.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul
deleted file mode 100644
index 6609a9ef3f00..000000000000
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    switch {}
-    case 1 {}
-    default {}
-}
-// ----
-// ParserError 1856: (13-14): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
deleted file mode 100644
index 9378297ca05c..000000000000
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    switch mload
-    case 1 {}
-    default {}
-}
-// ----
-// ParserError 7104: (13-18): Builtin function "mload" must be called.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul
deleted file mode 100644
index 6ab68d7ea9a3..000000000000
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	switch mstore(1, 1)
-	case 1 {}
-	default {}
-}
-// ====
-// dialect: evm
-// ----
-// TypeError 3950: (10-22): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libyul/yulSyntaxTests/switch_statement_1.yul b/test/libyul/yulSyntaxTests/switch_statement_1.yul
deleted file mode 100644
index 13115a922930..000000000000
--- a/test/libyul/yulSyntaxTests/switch_statement_1.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{ switch 42 default {} }
-// ----
-// Warning 9592: (2-22): "switch" statement with only a default case.
diff --git a/test/libyul/yulSyntaxTests/switch_statement_2.yul b/test/libyul/yulSyntaxTests/switch_statement_2.yul
deleted file mode 100644
index 490f5fcfaa72..000000000000
--- a/test/libyul/yulSyntaxTests/switch_statement_2.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    { switch 42 case 1 {} }
-    { switch 42 case 1 {} case 2 {} }
-    { switch 42 case 1 {} default {} }
-    { switch 42 case 1 {} case 2 {} default {} }
-    { switch mul(1, 2) case 1 {} case 2 {} default {} }
-    { function f() -> x {} switch f() case 1 {} case 2 {} default {} }
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul b/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul
deleted file mode 100644
index 4ba258c2bcf4..000000000000
--- a/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	switch 42
-	case 1 {}
-	case 1 {}
-	default {}
-}
-// ====
-// dialect: evm
-// ----
-// DeclarationError 6792: (25-34): Duplicate case "1" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_statement_no_access.yul b/test/libyul/yulSyntaxTests/switch_statement_no_access.yul
deleted file mode 100644
index 4f40f264036d..000000000000
--- a/test/libyul/yulSyntaxTests/switch_statement_no_access.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    switch 42
-}
-// ----
-// ParserError 2418: (16-17): Switch statement without any cases.
diff --git a/test/libyul/yulSyntaxTests/token_as_identifier.yul b/test/libyul/yulSyntaxTests/token_as_identifier.yul
deleted file mode 100644
index eaeceb7c46f8..000000000000
--- a/test/libyul/yulSyntaxTests/token_as_identifier.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    let return:u256 := 1:u256
-    let byte:u256 := 1:u256
-    let address:u256 := 1:u256
-    let bool:u256 := 1:u256
-}
-// ====
-// dialect: yul
-// ----
diff --git a/test/libyul/yulSyntaxTests/tuple_assignment.yul b/test/libyul/yulSyntaxTests/tuple_assignment.yul
deleted file mode 100644
index 4ac961c265e5..000000000000
--- a/test/libyul/yulSyntaxTests/tuple_assignment.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function f() -> a:u256, b:u256, c:u256 {}
-    let x:u256, y:u256, z:u256 := f()
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul b/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
deleted file mode 100644
index 35926ccb29ee..000000000000
--- a/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    switch 7
-    case true:bool {}
-    case true:bool {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 3781: (24-33): Expected a value of type "u256" but got "bool".
-// TypeError 3781: (46-55): Expected a value of type "u256" but got "bool".
diff --git a/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul b/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
deleted file mode 100644
index 7b8d012bb597..000000000000
--- a/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    function f(a:u256, b:u256, c:bool) -> r:bool, t {
-        r := lt(a, b)
-        t := bool_to_u256(not(c))
-    }
-    let x, y: bool := f(1, 2: u256, true)
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 3947: (126-127): Assigning value of type "bool" to variable of type "u256".
-// TypeError 3947: (129-136): Assigning value of type "u256" to variable of type "bool".
diff --git a/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul b/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul
deleted file mode 100644
index e24ea923ec75..000000000000
--- a/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    function f(a:u256, b:u256, c:bool) -> r:bool, t {
-        r := lt(a, b)
-        t := bool_to_u256(not(c))
-    }
-    let x: bool, y: u256 := f(1, 2: u256, true)
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/vardecl.yul b/test/libyul/yulSyntaxTests/vardecl.yul
deleted file mode 100644
index fd7d06bfbc0e..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    let x := 7
-}
-// ====
-// dialect: yul
-// ----
diff --git a/test/libyul/yulSyntaxTests/vardecl_bool.yul b/test/libyul/yulSyntaxTests/vardecl_bool.yul
deleted file mode 100644
index 7122d03d5041..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl_bool.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x := true
-    let y := false
-}
-// ====
-// dialect: evm
-// ----
diff --git a/test/libyul/yulSyntaxTests/vardecl_complex.yul b/test/libyul/yulSyntaxTests/vardecl_complex.yul
deleted file mode 100644
index 1a160a438e68..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl_complex.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let y := 2
-    let x := add(add(7, mul(6, y)), mul(7, 8))
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/vardecl_empty.yul b/test/libyul/yulSyntaxTests/vardecl_empty.yul
deleted file mode 100644
index b6ee20e3d3ad..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl_empty.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	let x
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/vardecl_multi.yul b/test/libyul/yulSyntaxTests/vardecl_multi.yul
deleted file mode 100644
index a21f4de5f4c0..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl_multi.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    function f() -> x, y {}
-    let x, y := f()
-}
-// ----
diff --git a/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul b/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul
deleted file mode 100644
index c40c79740188..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	function f() -> x, y {}
-	let x, x := f()
-}
-// ----
-// DeclarationError 1395: (28-43): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul b/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul
deleted file mode 100644
index 2906078cf622..000000000000
--- a/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	let x := 1
-	let x := 2
-}
-// ----
-// DeclarationError 1395: (15-25): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul b/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul
deleted file mode 100644
index 0f0e9e82727c..000000000000
--- a/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	let x := 2
-	function g() {
-		pop(x)
-	}
-}
-// ----
-// DeclarationError 8198: (36-37): Identifier "x" not found.
diff --git a/test/libyul/yulSyntaxTests/variable_declaration.yul b/test/libyul/yulSyntaxTests/variable_declaration.yul
deleted file mode 100644
index 3d7c9d595c54..000000000000
--- a/test/libyul/yulSyntaxTests/variable_declaration.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{ let x:u256 := 7:u256 }
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_bool.yul b/test/libyul/yulSyntaxTests/variable_declaration_bool.yul
deleted file mode 100644
index 3e97d5d4dae1..000000000000
--- a/test/libyul/yulSyntaxTests/variable_declaration_bool.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x:bool := true:bool
-    let y:bool := false:bool
-}
-// ====
-// dialect: evmTyped
-// ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_complex.yul b/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
deleted file mode 100644
index 4b93cdb04f15..000000000000
--- a/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    function add(a:u256, b:u256) -> c:u256 {}
-    let y:u256 := 2:u256
-    let x:u256 := add(7:u256, add(6:u256, y))
-}
-// ====
-// dialect: yul
-// ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_empty.yul b/test/libyul/yulSyntaxTests/variable_declaration_empty.yul
deleted file mode 100644
index afbccb293a52..000000000000
--- a/test/libyul/yulSyntaxTests/variable_declaration_empty.yul
+++ /dev/null
@@ -1,2 +0,0 @@
-{ let x:u256 }
-// ----
diff --git a/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul b/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul
deleted file mode 100644
index 76bcd1d0d626..000000000000
--- a/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	x := 2
-	let x := 3
-}
-// ----
-// DeclarationError 1133: (3-4): Variable x used before it was declared.
diff --git a/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul b/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul
deleted file mode 100644
index c6612fd8cb70..000000000000
--- a/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	let x := mul(2, x)
-}
-
-// ----
-// DeclarationError 4990: (19-20): Variable x used before it was declared.
diff --git a/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul b/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul
deleted file mode 100644
index 2b061dd0250c..000000000000
--- a/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    let verbatim_01i_02o := 2
-}
-// ----
-// DeclarationError 5017: (10-26): The identifier "verbatim_01i_02o" is reserved and can not be used.
diff --git a/test/localeTest.sh b/test/localeTest.sh
deleted file mode 100755
index 58e2aad4d994..000000000000
--- a/test/localeTest.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Script that tests that the compiler works correctly regardless of the locale
-# setting. As a prerequisite, the following locales must be enabled system-wide:
-# C, tr_TR.utf8, ja_JP.eucjp.
-#
-# Usage:
-#    <script name>.sh <path to solc binary>
-#
-# ------------------------------------------------------------------------------
-# This file is part of solidity.
-#
-# solidity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# solidity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with solidity.  If not, see <http://www.gnu.org/licenses/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -eo pipefail
-
-REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
-# shellcheck source=scripts/common.sh
-source "${REPO_ROOT}/scripts/common.sh"
-
-solc_binary="$1"
-(( $# == 1 )) || fail "Expected exactly 1 argument."
-
-# This test won't work without some specific locales installed
-locale -a | grep -e "^tr_TR\.utf8$" || fail "Locale 'tr_TR.utf8' not available."
-locale -a | grep -e "^ja_JP\.eucjp$" || fail "Locale 'ja_JP.eucjp' not available."
-locale -a | grep -e "^C$" || fail "Locale 'C' not available."
-locale -a | grep -e "^__invalid_locale__$" && fail "'__invalid_locale__' is not supposed to be a valid locale name."
-
-i="i"
-
-test_code=$(cat <<'EOF'
-    // SPDX-License-Identifier: GPL-3.0
-    pragma solidity *;
-    library L {}
-EOF
-)
-
-# Whatever locale is set by default.
-printTask "Testing the default locale..."
-default_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
-
-# Plain C locale
-printTask "Testing the C locale..."
-export LC_ALL=C
-[[ ${i^^} == "I" ]] || assertFail
-c_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
-diff_values "$default_locale_output" "$c_locale_output"
-
-# Turkish locale, which has capitalization rules (`i` -> `İ` and `I` to `ı`) that can make identifiers invalid.
-printTask "Testing the Turkish locale..."
-export LC_ALL=tr_TR.utf8
-[[ ${i^^} != "I" ]] || assertFail
-tr_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
-diff_values "$default_locale_output" "$tr_locale_output"
-
-# A different locale, that should not do anything special to ASCII chars.
-printTask "Testing the Japanese locale..."
-export LC_ALL=ja_JP.eucjp
-[[ ${i^^} == "I" ]] || assertFail
-ja_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
-diff_values "$default_locale_output" "$ja_locale_output"
-
-# The compiler should not crash if the locale is not valid.
-printTask "Testing an invalid locale..."
-export LC_ALL=__invalid_locale__ || true
-invalid_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
-diff_values "$default_locale_output" "$invalid_locale_output"
diff --git a/test/lsp.py b/test/lsp.py
deleted file mode 100755
index 11007ae822ec..000000000000
--- a/test/lsp.py
+++ /dev/null
@@ -1,2061 +0,0 @@
-#!/usr/bin/env python3
-# pragma pylint: disable=too-many-lines
-# test line 1
-from __future__ import annotations # See: https://github.com/PyCQA/pylint/issues/3320
-import argparse
-import fnmatch
-import functools
-import json
-import os
-import re
-import subprocess
-import sys
-import traceback
-from collections import namedtuple
-from copy import deepcopy
-from enum import Enum, auto
-from itertools import islice
-from pathlib import PurePath
-from typing import Any, List, Optional, Tuple, Union, NewType
-
-import colorama  # Enables the use of SGR & CUP terminal VT sequences on Windows.
-from deepdiff import DeepDiff
-
-if os.name == 'nt':
-    # pragma pylint: disable=import-error
-    import msvcrt
-else:
-    import tty
-    # Turn off user input buffering so we get the input immediately,
-    # not only after a line break
-    if os.isatty(sys.stdin.fileno()):
-        tty.setcbreak(sys.stdin.fileno())
-
-
-# Type for the pure test name without .sol suffix or sub directory
-TestName = NewType("TestName", str)
-
-# Type for the test path, e.g.  subdir/mytest.sol
-RelativeTestPath = NewType("RelativeTestPath", str)
-
-
-def escape_string(text: str) -> str:
-    """
-    Trivially escapes given input string's \r \n and \\.
-    """
-    return text.translate(str.maketrans({
-        "\r": r"\r",
-        "\n": r"\n",
-        "\\": r"\\"
-    }))
-
-
-def getCharFromStdin() -> str:
-    """
-    Gets a single character from stdin without line-buffering.
-    """
-    if os.name == 'nt':
-        # pragma pylint: disable=import-error
-        return msvcrt.getch().decode("utf-8")
-    else:
-        return sys.stdin.read(1)
-
-
-"""
-Named tuple that holds various regexes used to parse the test specification.
-"""
-TestRegexesTuple = namedtuple("TestRegexesTuple", [
-    "sendRequest", # regex to find requests to be sent & tested
-    "findQuotedTag", # regex to find tags wrapped in quotes
-    "findTag", # regex to find tags
-    "fileDiagnostics", # regex to find diagnostic expectations for a file
-    "diagnostic" # regex to find a single diagnostic within the file expectations
-])
-"""
-Instance of the named tuple holding the regexes
-"""
-TEST_REGEXES = TestRegexesTuple(
-    re.compile(R'^// -> (?P<method>[\w\/]+) {'),
-    re.compile(R'(?P<tag>"@\w+")'),
-    re.compile(R'(?P<tag>@\w+)'),
-    re.compile(R'// (?P<testname>\S+):([ ](?P<diagnostics>[\w @]*))?'),
-    re.compile(R'(?P<tag>@\w+) (?P<code>\d\d\d\d)')
-)
-
-"""
-Named tuple holding regexes to find tags in the solidity code
-"""
-TagRegexesTuple = namedtuple("TagRegexestuple", ["simpleRange", "multilineRange"])
-TAG_REGEXES = TagRegexesTuple(
-    re.compile(R"(?P<range>[\^]+) (?P<tag>@\w+)"),
-    re.compile(R"\^(?P<delimiter>[()]{1,2}) (?P<tag>@\w+)$")
-)
-
-def split_path(path):
-    """
-    Return the test name and the subdir path of the given path.
-    """
-    sub_dir_separator = path.rfind("/")
-
-    if sub_dir_separator == -1:
-        return (path, None)
-
-    return (path[sub_dir_separator+1:], path[:sub_dir_separator])
-
-def count_index(lines, start=0):
-    """
-    Takes an iterable of lines and adds the current byte index so it's available
-    when iterating or looping.
-    """
-    n = start
-    for elem in lines:
-        yield n, elem
-        n += 1 + len(elem)
-
-def tags_only(lines, start=0):
-    """
-    Filter the lines for tag comments and report the line number that the tags
-    _refer_ to (which is not the line they are on!).
-    """
-    n = start
-    numCommentLines = 0
-
-    def hasTag(line):
-        if line.find("// ") != -1:
-            for _, regex in TAG_REGEXES._asdict().items():
-                if regex.search(line[len("// "):]) is not None:
-                    return True
-        return False
-
-    for line in lines:
-        if hasTag(line):
-            numCommentLines += 1
-            yield n - numCommentLines, line
-        else:
-            numCommentLines = 0
-
-        n += 1
-
-
-def prepend_comments(sequence):
-    """
-    Prepends a comment indicator to each element
-    """
-    result = ""
-    for line in sequence.splitlines(True):
-        result = result + "// " + line
-    return result
-
-
-# {{{ JsonRpcProcess
-class BadHeader(Exception):
-    def __init__(self, msg: str):
-        super().__init__("Bad header: " + msg)
-
-class JsonRpcProcess:
-    exe_path: str
-    exe_args: List[str]
-    process: subprocess.Popen
-    trace_io: bool
-    print_pid: bool
-
-    def __init__(self, exe_path: str, exe_args: List[str], trace_io: bool = True, print_pid = False):
-        self.exe_path = exe_path
-        self.exe_args = exe_args
-        self.trace_io = trace_io
-        self.print_pid = print_pid
-
-    def __enter__(self):
-        self.process = subprocess.Popen(
-            [self.exe_path, *self.exe_args],
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
-        )
-
-        if self.print_pid:
-            print(f"solc pid: {self.process.pid}. Attach with sudo gdb -p {self.process.pid}")
-
-        return self
-
-    def __exit__(self, exception_type, exception_value, traceback) -> None:
-        self.process.kill()
-        self.process.wait(timeout=2.0)
-
-    def trace(self, topic: str, message: str) -> None:
-        if self.trace_io:
-            print(f"{SGR_TRACE}{topic}:{SGR_RESET} {message}")
-
-    def receive_message(self) -> Union[None, dict]:
-        # Note, we should make use of timeout to avoid infinite blocking if nothing is received.
-        CONTENT_LENGTH_HEADER = "Content-Length: "
-        CONTENT_TYPE_HEADER = "Content-Type: "
-        if self.process.stdout is None:
-            return None
-        message_size = None
-        while True:
-            # read header
-            line = self.process.stdout.readline()
-            if len(line) == 0:
-                # server quit
-                return None
-            line = line.decode("utf-8")
-            if self.trace_io:
-                print(f"Received header-line: {escape_string(line)}")
-            if not line.endswith("\r\n"):
-                raise BadHeader("missing newline")
-            # Safely remove the "\r\n".
-            line = line.rstrip("\r\n")
-            if line == '':
-                break # done with the headers
-            if line.startswith(CONTENT_LENGTH_HEADER):
-                line = line[len(CONTENT_LENGTH_HEADER):]
-                if not line.isdigit():
-                    raise BadHeader("size is not int")
-                message_size = int(line)
-            elif line.startswith(CONTENT_TYPE_HEADER):
-                # nothing todo with type for now.
-                pass
-            else:
-                raise BadHeader("unknown header")
-        if message_size is None:
-            raise BadHeader("missing size")
-        rpc_message = self.process.stdout.read(message_size).decode("utf-8")
-        json_object = json.loads(rpc_message)
-        self.trace('receive_message', json.dumps(json_object, indent=4, sort_keys=True))
-        return json_object
-
-    def send_message(self, method_name: str, params: Optional[dict]) -> None:
-        if self.process.stdin is None:
-            return
-        message = {
-            'jsonrpc': '2.0',
-            'method': method_name,
-            'params': params
-        }
-        json_string = json.dumps(obj=message)
-        rpc_message = f"Content-Length: {len(json_string)}\r\n\r\n{json_string}"
-        self.trace(f'send_message ({method_name})', json.dumps(message, indent=4, sort_keys=True))
-        self.process.stdin.write(rpc_message.encode("utf-8"))
-        self.process.stdin.flush()
-
-    def call_method(self, method_name: str, params: Optional[dict], expects_response: bool = True) -> Any:
-        self.send_message(method_name, params)
-        if not expects_response:
-            return None
-        return self.receive_message()
-
-    def send_notification(self, name: str, params: Optional[dict] = None) -> None:
-        self.send_message(name, params)
-
-# }}}
-
-SGR_RESET = '\033[m'
-SGR_TRACE = '\033[1;36m'
-SGR_NOTICE = '\033[1;35m'
-SGR_TEST_BEGIN = '\033[1;33m'
-SGR_ASSERT_BEGIN = '\033[1;34m'
-SGR_STATUS_OKAY = '\033[1;32m'
-SGR_STATUS_FAIL = '\033[1;31m'
-
-class ExpectationFailed(Exception):
-    class Part(Enum):
-        Diagnostics = auto()
-        Methods = auto()
-
-    def __init__(self, reason: str, part):
-        self.part = part
-        super().__init__(reason)
-
-class JSONExpectationFailed(ExpectationFailed):
-    def __init__(self, actual, expected, part):
-        self.actual = actual
-        self.expected = expected
-
-        expected_pretty = ""
-
-        if expected is not None:
-            expected_pretty = json.dumps(expected, sort_keys=True)
-
-        diff = DeepDiff(actual, expected)
-
-        super().__init__(
-            f"\n\tExpected {expected_pretty}" + \
-            f"\n\tbut got {json.dumps(actual, sort_keys=True)}.\n\t{diff}",
-            part
-        )
-
-
-def create_cli_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser(description="Solidity LSP Test suite")
-    parser.set_defaults(fail_fast=False)
-    parser.add_argument(
-        "-f", "--fail-fast",
-        dest="fail_fast",
-        action="store_true",
-        help="Terminates the running tests on first failure."
-    )
-    parser.set_defaults(non_interactive=False)
-    parser.add_argument(
-        "-n", "--non-interactive",
-        dest="non_interactive",
-        action="store_true",
-        help="Prevent interactive queries and just fail instead."
-    )
-    parser.set_defaults(print_solc_pid=False)
-    parser.add_argument(
-        "-p", "--print-solc-pid",
-        dest="print_solc_pid",
-        action="store_true",
-        help="Print pid of each started solc for debugging purposes."
-    )
-    parser.set_defaults(trace_io=False)
-    parser.add_argument(
-        "-T", "--trace-io",
-        dest="trace_io",
-        action="store_true",
-        help="Be more verbose by also printing assertions."
-    )
-    parser.set_defaults(print_assertions=False)
-    parser.add_argument(
-        "-v", "--print-assertions",
-        dest="print_assertions",
-        action="store_true",
-        help="Be more verbose by also printing assertions."
-    )
-    parser.add_argument(
-        "-t", "--test-pattern",
-        dest="test_pattern",
-        type=str,
-        default="*",
-        help="Filters all available tests by matching against this test pattern (using globbing)",
-        nargs="?"
-    )
-    parser.add_argument(
-        "solc_path",
-        type=str,
-        default="solc",
-        help="Path to solc binary to test against",
-        nargs="?"
-    )
-    parser.add_argument(
-        "project_root_dir",
-        type=str,
-        default=f"{os.path.dirname(os.path.realpath(__file__))}/..",
-        help="Path to Solidity project's root directory (must be fully qualified).",
-        nargs="?"
-    )
-    return parser
-
-class Counter:
-    total: int = 0
-    passed: int = 0
-    failed: int = 0
-
-
-# Returns the given marker with the end extended by 'amount'
-def extendEnd(marker, amount=1):
-    newMarker = deepcopy(marker)
-    newMarker["end"]["character"] += amount
-    return newMarker
-
-class TestParserException(Exception):
-    def __init__(self, incompleteResult, msg: str):
-        self.result = incompleteResult
-        super().__init__("Failed to parse test specification: " + msg)
-
-class TestParser:
-    """
-    Parses test specifications.
-    Usage example:
-
-    parsed_testcases = TestParser(content).parse()
-
-    # First diagnostics are yielded.
-    # Type is "TestParser.Diagnostics"
-    expected_diagnostics = next(parsed_testcases)
-
-    ...
-    # Now each request/response pair in the test definition
-    # Type is "TestParser.RequestAndResponse"
-    for testcase in self.parsed_testcases:
-        ...
-    """
-    RequestAndResponse = namedtuple('RequestAndResponse',
-        "method, request, response, responseBegin, responseEnd",
-        defaults=(None, None, None, None)
-    )
-    Diagnostics = namedtuple('Diagnostics', 'tests start end has_header')
-    Diagnostic = namedtuple('Diagnostic', 'marker code')
-
-    TEST_START = "// ----"
-
-    def __init__(self, content: str):
-        self.content = content
-        self.lines = None
-        self.current_line_tuple = None
-
-    def parse(self):
-        """
-        Starts parsing the test specifications.
-        Will first yield with the diagnostics expectations as type 'Diagnostics'.
-        After that, it will yield once for every Request/Response pair found in
-        the file, each time as type 'RequestAndResponse'.
-
-        """
-        testDefStartIdx = self.content.rfind(f"\n{self.TEST_START}\n")
-
-        if testDefStartIdx == -1:
-            # Set start/end to end of file if there is no test section
-            yield self.Diagnostics({}, len(self.content), len(self.content), False)
-            return
-
-        self.lines = islice(
-            count_index(self.content[testDefStartIdx+1:].splitlines(), testDefStartIdx+1),
-            1,
-            None
-        )
-        self.next_line()
-
-        yield self.parseDiagnostics()
-
-        while not self.at_end():
-            yield self.parseRequestAndResponse()
-            self.next_line()
-
-
-    def parseDiagnostics(self) -> TestParser.Diagnostics:
-        """
-        Parse diagnostic expectations specified in the file.
-        Returns a named tuple instance of "Diagnostics"
-        """
-        diagnostics = { "tests": {}, "has_header": True }
-
-        diagnostics["start"] = self.position()
-
-        while not self.at_end():
-            fileDiagMatch = TEST_REGEXES.fileDiagnostics.match(self.current_line())
-            if fileDiagMatch is None:
-                break
-
-            testDiagnostics = []
-
-            diagnostics_string = fileDiagMatch.group("diagnostics")
-            if diagnostics_string is not None:
-                for diagnosticMatch in TEST_REGEXES.diagnostic.finditer(diagnostics_string):
-                    testDiagnostics.append(self.Diagnostic(
-                        diagnosticMatch.group("tag"),
-                        int(diagnosticMatch.group("code"))
-                    ))
-
-            diagnostics["tests"][fileDiagMatch.group("testname")] = testDiagnostics
-
-            self.next_line()
-
-        diagnostics["end"] = self.position()
-        return self.Diagnostics(**diagnostics)
-
-
-    def parseRequestAndResponse(self) -> TestParser.RequestAndResponse:
-        RESPONSE_START = "// <- "
-        REQUEST_END = "// }"
-        COMMENT_PREFIX = "// "
-
-        ret = {}
-        start_character = None
-
-        # Parse request header
-        requestResult = TEST_REGEXES.sendRequest.match(self.current_line())
-        if requestResult is None:
-            raise TestParserException(ret, "Method for request not found on line " + self.current_line())
-
-        ret["method"] = requestResult.group("method")
-        ret["request"] = "{\n"
-
-        self.next_line()
-
-        # Search for request block end
-        while not self.at_end():
-            line = self.current_line()
-            ret["request"] += line[len(COMMENT_PREFIX):] + "\n"
-
-            self.next_line()
-
-            if line.startswith(REQUEST_END):
-                break
-
-            # Reached end without finding request_end. Abort.
-            if self.at_end():
-                raise TestParserException(ret, "Request body not found")
-
-        if self.at_end():
-            return self.RequestAndResponse(**ret)
-
-        # Parse response header
-        if self.current_line().startswith(RESPONSE_START):
-            start_character = self.current_line()[len(RESPONSE_START)]
-            if start_character not in ("{", "["):
-                raise TestParserException(ret, "Response header malformed")
-            ret["response"] = self.current_line()[len(RESPONSE_START):] + "\n"
-            ret["responseBegin"] = self.position()
-
-        self.next_line()
-
-        end_character = "}" if start_character == "{" else "]"
-
-        # Search for request block end
-        while not self.at_end():
-            ret["response"] += self.current_line()[len(COMMENT_PREFIX):] + "\n"
-
-            if self.current_line().startswith(f"// {end_character}"):
-                ret["responseEnd"] = self.position() + len(self.current_line())
-                break
-
-            self.next_line()
-
-            # Reached end without finding block_end. Abort.
-            if self.at_end():
-                raise TestParserException(ret, "Response footer not found")
-
-        return self.RequestAndResponse(**ret)
-
-    def next_line(self):
-        self.current_line_tuple = next(self.lines, None)
-
-    def current_line(self):
-        return self.current_line_tuple[1]
-
-    def position(self):
-        """
-        Returns current byte position
-        """
-        if self.current_line_tuple is None:
-            return len(self.content)
-        return self.current_line_tuple[0]
-
-    def at_end(self):
-        """
-        Returns True if we exhausted the lines
-        """
-        return self.current_line_tuple is None
-
-class FileLoadStrategy(Enum):
-    Undefined = None
-    ProjectDirectory = 'project-directory'
-    DirectlyOpenedAndOnImport =  'directly-opened-and-on-import'
-
-class FileTestRunner:
-    """
-    Runs all tests in a given file.
-    It is required to call test_diagnostics() before calling test_methods().
-
-    When a test fails, asks the user how to proceed.
-    Offers automatic test expectation updates and rerunning of the tests.
-    """
-
-    class TestResult(Enum):
-        SuccessOrIgnored = auto()
-        Reparse = auto()
-
-    def __init__(self, test_name, sub_dir, solc, suite):
-        self.test_name = test_name
-        self.sub_dir = sub_dir
-        self.suite = suite
-        self.solc = solc
-        self.open_tests = []
-        self.content = self.suite.get_test_file_contents(self.test_name, self.sub_dir)
-        self.markers = self.suite.get_test_tags(self.test_name, self.sub_dir)
-        self.parsed_testcases = None
-        self.expected_diagnostics = None
-
-    def test_diagnostics(self):
-        """
-        Test that the expected diagnostics match the actual diagnostics
-        """
-        try:
-            self.parsed_testcases = TestParser(self.content).parse()
-
-            # Process diagnostics first
-            self.expected_diagnostics = next(self.parsed_testcases)
-            assert isinstance(self.expected_diagnostics, TestParser.Diagnostics)
-            if not self.expected_diagnostics.has_header:
-                return
-
-            expected_diagnostics_per_file = self.expected_diagnostics.tests
-
-            # Add our own test diagnostics if they didn't exist
-            if self.test_name not in expected_diagnostics_per_file:
-                expected_diagnostics_per_file[self.test_name] = []
-
-            published_diagnostics = \
-                self.suite.open_file_and_wait_for_diagnostics(self.solc, self.test_name, self.sub_dir)
-
-            for diagnostics in published_diagnostics:
-                if not diagnostics["uri"].startswith(self.suite.project_root_uri + "/"):
-                    raise RuntimeError(
-                        f"'{self.test_name}.sol' imported file outside of test directory: '{diagnostics['uri']}'"
-                    )
-                self.open_tests.append(self.suite.normalizeUri(diagnostics["uri"]))
-
-            self.suite.expect_equal(
-                len(published_diagnostics),
-                len(expected_diagnostics_per_file),
-                description="Amount of reports does not match!")
-
-            for diagnostics_per_file in published_diagnostics:
-                testname, sub_dir = split_path(self.suite.normalizeUri(diagnostics_per_file['uri']))
-
-                # Clear all processed expectations so we can check at the end
-                # what's missing
-                expected_diagnostics = expected_diagnostics_per_file.pop(testname, {})
-
-                self.suite.expect_equal(
-                    len(diagnostics_per_file["diagnostics"]),
-                    len(expected_diagnostics),
-                    description="Unexpected amount of diagnostics"
-                )
-                markers = self.suite.get_test_tags(testname, sub_dir)
-                for actual_diagnostic in diagnostics_per_file["diagnostics"]:
-                    expected_diagnostic = next((diagnostic for diagnostic in
-                        expected_diagnostics if actual_diagnostic['range'] ==
-                        markers[diagnostic.marker]), None)
-
-                    if expected_diagnostic is None:
-                        raise ExpectationFailed(
-                            f"Unexpected diagnostic: {json.dumps(actual_diagnostic, indent=4, sort_keys=True)}",
-                            ExpectationFailed.Part.Diagnostics
-                        )
-
-                    self.suite.expect_diagnostic(
-                        actual_diagnostic,
-                        code=expected_diagnostic.code,
-                        marker=markers[expected_diagnostic.marker]
-                    )
-
-            if len(expected_diagnostics_per_file) > 0:
-                raise ExpectationFailed(
-                    f"Expected diagnostics but received none for {expected_diagnostics_per_file}",
-                    ExpectationFailed.Part.Diagnostics
-                )
-
-        except Exception:
-            self.close_all_open_files()
-            raise
-
-    def close_all_open_files(self):
-        for testpath in self.open_tests:
-            test, sub_dir = split_path(testpath)
-
-            self.solc.send_message(
-                'textDocument/didClose',
-                { 'textDocument': { 'uri': self.suite.get_test_file_uri(test, sub_dir) }}
-            )
-            self.suite.wait_for_diagnostics(self.solc)
-
-        self.open_tests.clear()
-
-    def test_methods(self) -> bool:
-        """
-        Test all methods. Returns False if a reparsing is required, else True
-        """
-        try:
-            # Now handle each request/response pair in the test definition
-            for testcase in self.parsed_testcases:
-                try:
-                    self.run_testcase(testcase)
-                except JSONExpectationFailed as e:
-                    result = self.user_interaction_failed_method_test(testcase, e.actual, e.expected)
-
-                    if result == self.TestResult.Reparse:
-                        return False
-
-            return True
-        except TestParserException as e:
-            print(e)
-            print(e.result)
-            raise
-        finally:
-            self.close_all_open_files()
-
-    def user_interaction_failed_method_test(
-        self,
-        testcase: TestParser.RequestAndResponse,
-        actual,
-        expected
-    ) -> TestResult:
-
-        actual_pretty = self.suite.replace_ranges_with_tags(actual, self.sub_dir)
-
-        if expected is None:
-            print("Failed to parse expected response, received:\n" + actual)
-        else:
-            print("Expected:\n" + \
-                self.suite.replace_ranges_with_tags(expected, self.sub_dir) + \
-                "\nbut got:\n" + actual_pretty
-            )
-
-        if self.suite.non_interactive:
-            return self.TestResult.SuccessOrIgnored
-
-        while True:
-            print("(u)pdate/(r)etry/(i)gnore?")
-            user_response = getCharFromStdin()
-            if user_response == "i":
-                return self.TestResult.SuccessOrIgnored
-
-            if user_response == "u":
-                actual = actual["result"]
-                self.content = self.content[:testcase.responseBegin] + \
-                    prepend_comments(
-                        "<- " + \
-                        self.suite.replace_ranges_with_tags(actual, self.sub_dir)) + \
-                    self.content[testcase.responseEnd:]
-
-                with open(self.suite.get_test_file_path(\
-                    self.test_name, self.sub_dir), \
-                    mode="w", \
-                    encoding="utf-8", \
-                    newline='') as f:
-                    f.write(self.content)
-                return self.TestResult.Reparse
-            if user_response == "r":
-                return self.TestResult.Reparse
-
-            print("Invalid response.")
-
-
-    def run_testcase(self, testcase: TestParser.RequestAndResponse):
-        """
-        Runs the given testcase.
-        """
-
-        requestBodyJson = self.parse_json_with_tags(testcase.request, self.markers)
-        # add textDocument/uri if missing
-        if 'textDocument' not in requestBodyJson:
-            requestBodyJson['textDocument'] = { 'uri': self.suite.get_test_file_uri(self.test_name, self.sub_dir) }
-
-        actualResponseJson = self.solc.call_method(
-            testcase.method,
-            requestBodyJson,
-            expects_response=testcase.response is not None
-        )
-
-        if testcase.response is None:
-            return
-
-        # simplify response
-        if "result" in actualResponseJson:
-            if isinstance(actualResponseJson["result"], list):
-                for result in actualResponseJson["result"]:
-                    if "uri" in result:
-                        result["uri"] = result["uri"].replace(self.suite.project_root_uri + "/" + self.sub_dir + "/", "")
-
-            elif isinstance(actualResponseJson["result"], dict):
-                if "changes" in actualResponseJson["result"]:
-                    changes = actualResponseJson["result"]["changes"]
-                    for key in list(changes.keys()):
-                        new_key = key.replace(self.suite.project_root_uri + "/", "")
-                        changes[new_key] = changes[key]
-                        del changes[key]
-
-        if "jsonrpc" in actualResponseJson:
-            actualResponseJson.pop("jsonrpc")
-
-        try:
-            expectedResponseJson = self.parse_json_with_tags(testcase.response, self.markers)
-        except json.decoder.JSONDecodeError:
-            expectedResponseJson = None
-
-        expectedResponseJson = { "result": expectedResponseJson }
-
-        self.suite.expect_equal(
-            actualResponseJson,
-            expectedResponseJson,
-            f"Request failed: \n{testcase.request}",
-            ExpectationFailed.Part.Methods
-        )
-
-
-    def parse_json_with_tags(self, content, markersFallback):
-        """
-        Replaces any tags with their actual content and parsers the result as
-        json to return it.
-        """
-        split_by_tag = TEST_REGEXES.findTag.split(content)
-
-        # add quotes so we can parse it as json
-        contentReplaced = '"'.join(split_by_tag)
-        contentJson = json.loads(contentReplaced)
-
-        def replace_tag(data, markers):
-
-            if isinstance(data, list):
-                for el in data:
-                    replace_tag(el, markers)
-                return data
-
-            if not isinstance(data, dict):
-                return data
-
-            def findMarker(desired_tag):
-                if not isinstance(desired_tag, str):
-                    return desired_tag
-
-                for tag, tagRange in markers.items():
-                    if tag == desired_tag:
-                        return tagRange
-                    elif tag.lower() == desired_tag.lower():
-                        raise RuntimeError(f"Detected lower/upper case mismatch: Requested {desired_tag} but only found {tag}")
-
-                raise RuntimeError(f"Marker {desired_tag} not found in file")
-
-
-            # Check if we need markers from a specific file
-            # Needs to be done before the loop or it might be called only after
-            # we found "range" or "position"
-            if "uri" in data:
-                markers = self.suite.get_test_tags(data["uri"][:-len(".sol")], self.sub_dir)
-
-            for key, val in data.items():
-                if key == "range":
-                    data[key] = findMarker(val)
-                elif key == "position":
-                    tag_range = findMarker(val)
-                    if "start" in tag_range:
-                        data[key] = tag_range["start"]
-                elif key == "changes":
-                    for path, list_of_changes in val.items():
-                        test_name, file_sub_dir = split_path(path)
-                        markers = self.suite.get_test_tags(test_name[:-len(".sol")], file_sub_dir)
-                        for change in list_of_changes:
-                            if "range" in change:
-                                change["range"] = findMarker(change["range"])
-                elif isinstance(val, dict):
-                    replace_tag(val, markers)
-                elif isinstance(val, list):
-                    for el in val:
-                        replace_tag(el, markers)
-            return data
-
-        return replace_tag(contentJson, markersFallback)
-
-
-class SolidityLSPTestSuite: # {{{
-    test_counter = Counter()
-    assertion_counter = Counter()
-    print_assertions: bool = False
-    trace_io: bool = False
-    fail_fast: bool = False
-    test_pattern: str
-
-    def __init__(self):
-        colorama.init()
-        args = create_cli_parser().parse_args()
-        self.solc_path = args.solc_path
-        self.project_root_dir = os.path.realpath(args.project_root_dir) + "/test/libsolidity/lsp"
-        self.project_root_uri = PurePath(self.project_root_dir).as_uri()
-        self.print_assertions = args.print_assertions
-        self.trace_io = args.trace_io
-        self.test_pattern = args.test_pattern
-        self.fail_fast = args.fail_fast
-        self.non_interactive = args.non_interactive
-        self.print_solc_pid = args.print_solc_pid
-
-        print(f"{SGR_NOTICE}test pattern: {self.test_pattern}{SGR_RESET}")
-
-    def main(self) -> int:
-        """
-        Runs all test cases.
-        Returns 0 on success and the number of failing assertions (capped to 127) otherwise.
-        """
-        all_tests = sorted([
-            str(name)[5:]
-            for name in dir(SolidityLSPTestSuite)
-            if callable(getattr(SolidityLSPTestSuite, name)) and name.startswith("test_")
-        ])
-        filtered_tests = fnmatch.filter(all_tests, self.test_pattern)
-        if filtered_tests.count("generic") == 0:
-            filtered_tests.append("generic")
-
-        for method_name in filtered_tests:
-            test_fn = getattr(self, 'test_' + method_name)
-            title: str = test_fn.__name__[5:]
-            print(f"{SGR_TEST_BEGIN}Testing {title} ...{SGR_RESET}")
-            try:
-                with JsonRpcProcess(self.solc_path, ["--lsp"], trace_io=self.trace_io, print_pid=self.print_solc_pid) as solc:
-                    test_fn(solc)
-                    self.test_counter.passed += 1
-            except ExpectationFailed:
-                self.test_counter.failed += 1
-                print(traceback.format_exc())
-                if self.fail_fast:
-                    break
-            except Exception as e: # pragma pylint: disable=broad-except
-                self.test_counter.failed += 1
-                print(f"Unhandled exception {e.__class__.__name__} caught: {e}")
-                print(traceback.format_exc())
-                if self.fail_fast:
-                    break
-
-        print(
-            f"\n{SGR_NOTICE}Summary:{SGR_RESET}\n\n"
-            f"  Test cases: {self.test_counter.passed} passed, {self.test_counter.failed} failed\n"
-            f"  Assertions: {self.assertion_counter.passed} passed, {self.assertion_counter.failed} failed\n"
-        )
-
-        return min(max(self.test_counter.failed, self.assertion_counter.failed), 127)
-
-    def setup_lsp(
-        self,
-        lsp: JsonRpcProcess,
-        expose_project_root=True,
-        file_load_strategy: FileLoadStrategy=FileLoadStrategy.DirectlyOpenedAndOnImport,
-        custom_include_paths: list[str] = None,
-        project_root_subdir=None
-    ):
-        """
-        Prepares the solc LSP server by calling `initialize`,
-        and `initialized` methods.
-        """
-        project_root_uri_with_maybe_subdir = self.project_root_uri
-        if project_root_subdir is not None:
-            project_root_uri_with_maybe_subdir = self.project_root_uri + '/' + project_root_subdir
-        params = {
-            'processId': None,
-            'rootUri': project_root_uri_with_maybe_subdir,
-            # Enable traces to receive the amount of expected diagnostics before
-            # actually receiving them.
-            'trace': 'messages',
-            'capabilities': {
-                'textDocument': {
-                    'publishDiagnostics': {'relatedInformation': True}
-                },
-                'workspace': {
-                    'applyEdit': True,
-                    'configuration': True,
-                    'didChangeConfiguration': {'dynamicRegistration': True},
-                    'workspaceEdit': {'documentChanges': True},
-                    'workspaceFolders': True
-                }
-            }
-        }
-
-        if file_load_strategy != FileLoadStrategy.Undefined:
-            params['initializationOptions'] = {}
-            params['initializationOptions']['file-load-strategy'] = file_load_strategy.value
-
-        if custom_include_paths is not None and len(custom_include_paths) != 0:
-            if params['initializationOptions'] is None:
-                params['initializationOptions'] = {}
-            params['initializationOptions']['include-paths'] = custom_include_paths
-
-        if not expose_project_root:
-            params['rootUri'] = None
-
-        lsp.call_method('initialize', params)
-        lsp.send_notification('initialized')
-
-    # {{{ helpers
-    def get_test_file_path(self, test_case_name, sub_dir=None):
-        if sub_dir:
-            return f"{self.project_root_dir}/{sub_dir}/{test_case_name}.sol"
-        return f"{self.project_root_dir}/{test_case_name}.sol"
-
-    def get_test_file_uri(self, test_case_name, sub_dir=None):
-        return PurePath(self.get_test_file_path(test_case_name, sub_dir)).as_uri()
-
-    def get_test_file_contents(self, test_case_name, sub_dir=None):
-        """
-        Reads the file contents from disc for a given test case.
-        The `test_case_name` will be the basename of the file
-        in the test path (test/libsolidity/lsp/{sub_dir}).
-        """
-        with open(self.get_test_file_path(test_case_name, sub_dir), mode="r", encoding="utf-8", newline='') as f:
-            return f.read().replace("\r\n", "\n")
-
-    def require_params_for_method(self, method_name: str, message: dict) -> Any:
-        """
-        Ensures the given RPC message does contain the
-        field 'method' with the given method name,
-        and then returns its passed params.
-        An exception is raised on expectation failures.
-        """
-        assert message is not None
-        if 'error' in message.keys():
-            code = message['error']["code"]
-            text = message['error']['message']
-            raise RuntimeError(f"Error {code} received. {text}")
-        if 'method' not in message.keys():
-            raise RuntimeError("No method received but something else.")
-        self.expect_equal(message['method'], method_name, description="Ensure expected method name")
-        return message['params']
-
-    def wait_for_diagnostics(self, solc: JsonRpcProcess) -> List[dict]:
-        """
-        Return all published diagnostic reports sorted by file URI.
-        """
-        reports = []
-
-        num_files = solc.receive_message()["params"]["openFileCount"]
-
-        for _ in range(0, num_files):
-            message = solc.receive_message()
-
-            assert message is not None # This can happen if the server aborts early.
-
-            reports.append(
-                self.require_params_for_method(
-                    'textDocument/publishDiagnostics',
-                    message,
-                )
-            )
-
-        return sorted(reports, key=lambda x: x['uri'])
-
-    def normalizeUri(self, uri):
-        return uri.replace(self.project_root_uri + "/", "")[:-len(".sol")]
-
-    def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test, sub_dir=None):
-        expectations = ""
-
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, test, sub_dir)
-
-        for file_diagnostics in published_diagnostics:
-            testname, local_sub_dir = split_path(self.normalizeUri(file_diagnostics["uri"]))
-
-            # Skip empty diagnostics within the same file
-            if len(file_diagnostics["diagnostics"]) == 0 and testname == test:
-                continue
-
-            expectations += f"// {testname}:"
-
-            for diagnostic in file_diagnostics["diagnostics"]:
-                tag = self.find_tag_with_range(testname, local_sub_dir, diagnostic['range'])
-
-                if tag is None:
-                    raise RuntimeError(f"No tag found for diagnostic range {diagnostic['range']}")
-
-                expectations += f" {tag} {diagnostic['code']}"
-            expectations += "\n"
-
-        return expectations
-
-    def update_diagnostics_in_file(
-        self,
-        solc: JsonRpcProcess,
-        test,
-        sub_dir,
-        content,
-        current_diagnostics: TestParser.Diagnostics
-    ):
-        test_header = ""
-
-        if not current_diagnostics.has_header:
-            test_header = f"{TestParser.TEST_START}\n"
-
-        content = content[:current_diagnostics.start] + \
-            test_header + \
-            self.fetch_and_format_diagnostics(solc, test, sub_dir) + \
-            content[current_diagnostics.end:]
-
-        with open(self.get_test_file_path(test, sub_dir), mode="w", encoding="utf-8", newline='') as f:
-            f.write(content)
-
-        return content
-
-    def open_file_and_wait_for_diagnostics(
-        self,
-        solc_process: JsonRpcProcess,
-        test_case_name: str,
-        sub_dir=None
-    ) -> List[Any]:
-        """
-        Opens file for given test case and waits for diagnostics to be published.
-        """
-        solc_process.send_message(
-            'textDocument/didOpen',
-            {
-                'textDocument':
-                {
-                    'uri': self.get_test_file_uri(test_case_name, sub_dir),
-                    'languageId': 'Solidity',
-                    'version': 1,
-                    'text': self.get_test_file_contents(test_case_name, sub_dir)
-                }
-            }
-        )
-        return self.wait_for_diagnostics(solc_process)
-
-    def expect_true(
-        self,
-        actual,
-        description="Expected True value",
-        part=ExpectationFailed.Part.Diagnostics
-    ) -> None:
-        self.expect_equal(actual, True, description, part)
-
-    def expect_equal(
-        self,
-        actual,
-        expected,
-        description="Equality",
-        part=ExpectationFailed.Part.Diagnostics
-    ) -> None:
-        self.assertion_counter.total += 1
-        prefix = f"[{self.assertion_counter.total}] {SGR_ASSERT_BEGIN}{description}: "
-        diff = DeepDiff(actual, expected)
-        if len(diff) == 0:
-            self.assertion_counter.passed += 1
-            if self.print_assertions:
-                print(prefix + SGR_STATUS_OKAY + 'OK' + SGR_RESET)
-            return
-
-        # Failed assertions are always printed.
-        self.assertion_counter.failed += 1
-        print(prefix + SGR_STATUS_FAIL + 'FAILED' + SGR_RESET)
-        raise JSONExpectationFailed(actual, expected, part)
-
-    def expect_empty_diagnostics(self, published_diagnostics: List[dict]) -> None:
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "should not contain diagnostics")
-
-    def expect_diagnostic(
-        self,
-        diagnostic,
-        code: int,
-        lineNo: int = None,
-        startEndColumns: Tuple[int, int] = None,
-        marker: {} = None
-    ):
-        self.expect_equal(
-            diagnostic['code'],
-            code,
-            ExpectationFailed.Part.Diagnostics,
-            f'diagnostic: {code}'
-        )
-
-        if marker:
-            self.expect_equal(
-                diagnostic['range'],
-                marker,
-                ExpectationFailed.Part.Diagnostics,
-                "diagnostic: check range"
-            )
-
-        else:
-            assert len(startEndColumns) == 2
-            [startColumn, endColumn] = startEndColumns
-            self.expect_equal(
-                diagnostic['range'],
-                {
-                    'start': {'character': startColumn, 'line': lineNo},
-                    'end': {'character': endColumn, 'line': lineNo}
-                },
-                ExpectationFailed.Part.Diagnostics,
-                "diagnostic: check range"
-            )
-
-
-    def expect_location(
-        self,
-        obj: dict,
-        uri: str,
-        lineNo: int,
-        startEndColumns: Tuple[int, int]
-    ):
-        """
-        obj is an JSON object containing two keys:
-            - 'uri': a string of the document URI
-            - 'range': the location range, two child objects 'start' and 'end',
-                        each having a 'line' and 'character' integer value.
-        """
-        [startColumn, endColumn] = startEndColumns
-        self.expect_equal(obj['uri'], uri)
-        self.expect_equal(obj['range']['start']['line'], lineNo)
-        self.expect_equal(obj['range']['start']['character'], startColumn)
-        self.expect_equal(obj['range']['end']['line'], lineNo)
-        self.expect_equal(obj['range']['end']['character'], endColumn)
-
-    def expect_goto_definition_location(
-        self,
-        solc: JsonRpcProcess,
-        document_uri: str,
-        document_position: Tuple[int, int],
-        expected_uri: str,
-        expected_lineNo: int,
-        expected_startEndColumns: Tuple[int, int],
-        description: str
-    ):
-        response = solc.call_method(
-            'textDocument/definition',
-            {
-                'textDocument': {
-                    'uri': document_uri,
-                },
-                'position': {
-                    'line': document_position[0],
-                    'character': document_position[1]
-                }
-            }
-        )
-        message = "Goto definition (" + description + ")"
-        self.expect_equal(len(response['result']), 1, message)
-        self.expect_location(response['result'][0], expected_uri, expected_lineNo, expected_startEndColumns)
-
-
-    def find_tag_with_range(self, test, sub_dir, target_range):
-        """
-        Find and return the tag that represents the requested range otherwise
-        return None.
-        """
-        markers = self.get_test_tags(test, sub_dir)
-
-        for tag, tag_range in markers.items():
-            if tag_range == target_range:
-                return str(tag)
-
-        return None
-
-    def replace_ranges_with_tags(self, content, sub_dir):
-        """
-        Replace matching ranges with "@<tagname>".
-
-        Recognized patterns:
-            { "changes": { "<uri>": { "range": "<range>" } } }
-            { "uri": "<uri>", "range": "<range> }
-
-        """
-
-        def replace_range(item: dict, markers):
-            for tag, tagRange in markers.items():
-                if "range" in item and tagRange == item["range"]:
-                    item["range"] = str(tag)
-
-        def recursive_iter(obj):
-            if isinstance(obj, dict):
-                yield obj
-                for item in obj.values():
-                    yield from recursive_iter(item)
-            elif any(isinstance(obj, t) for t in (list, tuple)):
-                for item in obj:
-                    yield from recursive_iter(item)
-
-        for item in recursive_iter(content):
-            if "uri" in item and "range" in item:
-                try:
-                    markers = self.get_test_tags(item["uri"][:-len(".sol")], sub_dir)
-                    replace_range(item, markers)
-                except FileNotFoundError:
-                    # Skip over errors as this is user provided input that can
-                    # point to non-existing files
-                    pass
-            elif "changes" in item:
-                for file, changes_for_file in item["changes"].items():
-                    test_name, file_sub_dir = split_path(file)
-                    try:
-                        markers = self.get_test_tags(test_name[:-len(".sol")], file_sub_dir)
-                        for change in changes_for_file:
-                            replace_range(change, markers)
-
-                    except FileNotFoundError:
-                        # Skip over errors as this is user provided input that can
-                        # point to non-existing files
-                        pass
-
-
-
-        # Convert JSON to string and split it at the quoted tags
-        split_by_tag = TEST_REGEXES.findQuotedTag.split(json.dumps(content, indent=4, sort_keys=True))
-
-        # remove the quotes and return result
-        return "".join(map(lambda p: p[1:-1] if p.startswith('"@') else p, split_by_tag))
-
-    def user_interaction_failed_diagnostics(
-        self,
-        solc: JsonRpcProcess,
-        test,
-        sub_dir,
-        content,
-        current_diagnostics: TestParser.Diagnostics
-    ):
-        """
-        Asks the user how to proceed after an error.
-        Returns True if the test/file should be ignored, otherwise False
-        """
-
-        # Prevent user interaction when in non-interactive mode
-        if self.non_interactive:
-            return False
-
-        while True:
-            print("(u)pdate/(r)etry/(s)kip file?")
-            user_response = getCharFromStdin()
-            if user_response == "u":
-                while True:
-                    try:
-                        self.update_diagnostics_in_file(solc, test, sub_dir, content, current_diagnostics)
-                        return False
-                    # pragma pylint: disable=broad-except
-                    except Exception as e:
-                        print(e)
-                        if self.user_interaction_failed_autoupdate(test, sub_dir):
-                            return True
-            elif user_response == 's':
-                return True
-            elif user_response == 'r':
-                return False
-
-    def user_interaction_failed_autoupdate(self, test, sub_dir):
-        print("(e)dit/(r)etry/(s)kip file?")
-        user_response = getCharFromStdin()
-        if user_response == "r":
-            print("retrying...")
-            # pragma pylint: disable=no-member
-            self.get_test_tags.cache_clear()
-            return False
-        if user_response == "e":
-            editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
-            subprocess.run(
-                f'{editor} {self.get_test_file_path(test, sub_dir)}',
-                shell=True,
-                check=True
-            )
-            # pragma pylint: disable=no-member
-            self.get_test_tags.cache_clear()
-        elif user_response == "s":
-            print("skipping...")
-
-        return True
-
-    # }}}
-
-    # {{{ actual tests
-    def test_analyze_all_project_files_flat(self, solc: JsonRpcProcess) -> None:
-        """
-        Tests the option (default) to analyze all .sol project files even when they have not been actively
-        opened yet. This is how other LSPs (at least for C++) work too and it makes cross-unit tasks
-        actually correct (e.g. symbolic rename, find all references, ...).
-
-        In this test, we simply open up a custom project and ensure we're receiving the diagnostics
-        for all existing files in that project (while having none of these files opened).
-        """
-        SUBDIR = 'analyze-full-project'
-        self.setup_lsp(
-            solc,
-            file_load_strategy=FileLoadStrategy.ProjectDirectory,
-            project_root_subdir=SUBDIR
-        )
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 3, "Diagnostic reports for 3 files")
-
-        # C.sol
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri('C', SUBDIR), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
-
-        # D.sol
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('D', SUBDIR), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
-
-        # E.sol
-        report = published_diagnostics[2]
-        self.expect_equal(report['uri'], self.get_test_file_uri('E', SUBDIR), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
-
-    def test_analyze_all_project_files_nested(self, solc: JsonRpcProcess) -> None:
-        """
-        Same as first test on that matter but with deeper nesting levels.
-        """
-        SUBDIR = 'include-paths-nested'
-        EXPECTED_FILES = {
-            "A/B/C/foo",
-            "A/B/foo",
-            "A/foo",
-            "foo",
-        }
-        EXPECTED_URIS = {self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES}
-        self.setup_lsp(
-            solc,
-            file_load_strategy=FileLoadStrategy.ProjectDirectory,
-            project_root_subdir=SUBDIR
-        )
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), len(EXPECTED_FILES), "Test number of files analyzed.")
-        self.expect_equal({report['uri'] for report in published_diagnostics}, EXPECTED_URIS)
-        self.expect_equal([len(report['diagnostics']) for report in published_diagnostics], [0] * len(EXPECTED_URIS))
-
-    def test_analyze_all_project_files_nested_with_include_paths(self, solc: JsonRpcProcess) -> None:
-        """
-        Same as first test on that matter but with deeper nesting levels.
-        """
-        SUBDIR = 'include-paths-nested-2'
-        EXPECTED_FILES = {
-            "A/B/C/foo",
-            "A/B/foo",
-            "A/foo",
-            "foo",
-        }
-        IMPLICITLY_LOADED_FILE_COUNT = 1
-        EXPECTED_URIS = {self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES}
-        self.setup_lsp(
-            solc,
-            file_load_strategy=FileLoadStrategy.ProjectDirectory,
-            project_root_subdir=SUBDIR,
-            custom_include_paths=[f"{self.project_root_dir}/other-include-dir"]
-        )
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(
-            len(published_diagnostics),
-            len(EXPECTED_FILES) + IMPLICITLY_LOADED_FILE_COUNT,
-            "Test number of files analyzed."
-        )
-
-        # All but the last report should be from expected files
-        for report in published_diagnostics[:-IMPLICITLY_LOADED_FILE_COUNT]:
-            self.expect_true(report['uri'] in EXPECTED_URIS, "Correct file URI")
-            self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
-
-        # Check last report (should be the custom imported lib).
-        # This file is analyzed because it was imported via "A/B/C/foo.sol".
-        last_report = published_diagnostics[len(EXPECTED_URIS)]
-        self.expect_equal(last_report['uri'], self.get_test_file_uri('second', 'other-include-dir/otherlib'), "Correct file URI")
-        self.expect_equal(len(last_report['diagnostics']), 0, "no diagnostics")
-
-
-    def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        TEST_NAME = 'publish_diagnostics_3'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
-
-        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
-        report = published_diagnostics[0]
-
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
-        diagnostics = report['diagnostics']
-
-        self.expect_equal(len(diagnostics), 1, "1 diagnostic messages")
-        self.expect_equal(diagnostics[0]['code'], 3656, "diagnostic: check code")
-        self.expect_equal(
-            diagnostics[0]['range'],
-            {
-                'start': {'character': 0, 'line': 7},
-                'end': {'character': 1, 'line': 10}
-            },
-            "diagnostic: check range"
-        )
-
-    def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        TEST_NAME = 'didOpen_with_import'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
-
-        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
-
-        # primary file:
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
-
-        # imported file (goto/lib.sol):
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        marker = self.get_test_tags("lib", "goto")["@diagnostics"]
-        self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
-
-    @functools.lru_cache() # pragma pylint: disable=lru-cache-decorating-method
-    def get_test_tags(self, test_name: TestName, sub_dir=None, verbose=False):
-        """
-        Finds all tags (e.g. @tagname) in the given test and returns them as a
-        dictionary having the following structure: {
-            "@tagname": {
-             "start": { "character": 3, "line": 2 },
-             "end":   { "character": 30, "line": 2 }
-            }
-        }
-        """
-        content = self.get_test_file_contents(test_name, sub_dir)
-
-        markers = {}
-
-        for lineNum, line in tags_only(content.splitlines()):
-            commentStart = line.find("//")
-
-            for kind, regex in TAG_REGEXES._asdict().items():
-                for match in regex.finditer(line[commentStart:]):
-                    if kind == "simpleRange":
-                        markers[match.group("tag")] = {
-                            "start": {
-                                "line": lineNum,
-                                "character": match.start("range") + commentStart
-                            },
-                            "end": {
-                                "line": lineNum,
-                                "character": match.end("range") + commentStart
-                        }}
-                    elif kind == "multilineRange":
-                        if match.group("delimiter") == "(":
-                            markers[match.group("tag")] = \
-                                { "start": { "line": lineNum, "character": 0 } }
-                        elif match.group("delimiter") == ")":
-                            markers[match.group("tag")]["end"] = \
-                                { "line": lineNum, "character": 0 }
-
-        if verbose:
-            print(markers)
-        return markers
-
-
-    def test_custom_includes(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc, expose_project_root=False)
-        solc.send_notification(
-            'workspace/didChangeConfiguration', {
-                'settings': {
-                    'include-paths': [
-                        f"{self.project_root_dir}/other-include-dir"
-                    ]
-                }
-            }
-        )
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, 'include-paths/using-custom-includes')
-
-        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
-
-        # test file
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri('using-custom-includes', 'include-paths'))
-        diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 0, "no diagnostics")
-
-        # imported file
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
-        diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 1, "no diagnostics")
-        self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
-
-    def test_custom_includes_with_full_project(self, solc: JsonRpcProcess) -> None:
-        """
-        Tests loading all project files while having custom include directories configured.
-        In such a scenario, all project files should be analyzed and those being included via search path
-        but not those include files that are not directly nor indirectly included.
-        """
-        self.setup_lsp(
-            solc,
-            expose_project_root=True,
-            project_root_subdir=''
-        )
-        solc.send_notification(
-            'workspace/didChangeConfiguration', {
-                'settings': {
-                    'include-paths': [
-                        f"{self.project_root_dir}/other-include-dir"
-                    ]
-                }
-            }
-        )
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, 'include-paths/using-custom-includes')
-
-        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
-
-        # test file
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri('using-custom-includes', 'include-paths'))
-        diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 0, "no diagnostics")
-
-        # imported file
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
-        diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 1)
-        self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
-
-    def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
-        # Reusing another test but now change some file that generates an error in the other.
-        self.test_textDocument_didOpen_with_relative_import(solc)
-        marker = self.get_test_tags("lib", "goto")["@addFunction"]
-        self.open_file_and_wait_for_diagnostics(solc, 'lib', "goto")
-        solc.send_message(
-            'textDocument/didChange',
-            {
-                'textDocument':
-                {
-                    'uri': self.get_test_file_uri('lib', 'goto')
-                },
-                'contentChanges':
-                [
-                    {
-                        'range': marker,
-                        'text': "" # deleting function `add`
-                    }
-                ]
-            }
-        )
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
-
-        # Main file now contains a new diagnostic
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri('didOpen_with_import'))
-        diagnostics = report['diagnostics']
-        marker = self.get_test_tags("didOpen_with_import")["@diagnostics"]
-        self.expect_equal(len(diagnostics), 1, "now, no diagnostics")
-        self.expect_diagnostic(diagnostics[0], code=9582, marker=marker)
-
-        # The modified file retains the same diagnostics.
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'))
-        self.expect_equal(len(report['diagnostics']), 0)
-        # The warning went away because the compiler aborts further processing after the error.
-
-    def test_textDocument_didOpen_with_relative_import_without_project_url(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc, expose_project_root=False)
-        TEST_NAME = 'didOpen_with_import'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
-        self.verify_didOpen_with_import_diagnostics(published_diagnostics)
-
-    def verify_didOpen_with_import_diagnostics(
-        self,
-        published_diagnostics: List[Any],
-        main_file_name='didOpen_with_import'
-    ):
-        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
-
-        # primary file:
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri(main_file_name), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 0, "one diagnostic")
-
-        # imported file (./goto/lib.sol):
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-
-        markers = self.get_test_tags('lib', 'goto')
-        marker = markers["@diagnostics"]
-        self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
-
-    def test_generic(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-
-        sub_dirs = filter(
-            lambda filepath: filepath.is_dir() and filepath.name != 'node_modules',
-            os.scandir(self.project_root_dir)
-        )
-
-        for sub_dir in map(lambda filepath: filepath.name, sub_dirs):
-            tests = map(
-                lambda file_object, sd=sub_dir: sd + "/" + file_object.name[:-len(".sol")],
-                filter(
-                    lambda filepath: filepath.is_file() and filepath.name.endswith('.sol'),
-                    os.scandir(f"{self.project_root_dir}/{sub_dir}")
-                )
-            )
-
-            tests = map(
-                lambda path, sd=sub_dir: path[len(sd)+1:],
-                fnmatch.filter(tests, self.test_pattern)
-            )
-
-            print(f"Running tests in subdirectory '{sub_dir}'...")
-            for test in tests:
-                try_again = True
-                print(f"\t{test}")
-
-                while try_again:
-                    runner = FileTestRunner(test, sub_dir, solc, self)
-
-                    try:
-                        runner.test_diagnostics()
-                        try_again = not runner.test_methods()
-                    except ExpectationFailed as e:
-                        print(e)
-
-                        if e.part == e.Part.Diagnostics:
-                            try_again = not self.user_interaction_failed_diagnostics(
-                                solc,
-                                test,
-                                sub_dir,
-                                runner.content,
-                                runner.expected_diagnostics
-                            )
-                        else:
-                            raise
-
-    def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        TEST_NAME = 'publish_diagnostics_1'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME, "goto")
-        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME, "goto"), "Correct file URI")
-        diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        markers = self.get_test_tags(TEST_NAME, "goto")
-        self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
-        self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedVariable"])
-        self.expect_diagnostic(diagnostics[2], code=2072, marker=markers["@unusedContractVariable"])
-
-        solc.send_message(
-            'textDocument/didChange',
-            {
-                'textDocument': {
-                    'uri': self.get_test_file_uri(TEST_NAME, "goto")
-                },
-                'contentChanges': [
-                    {
-                        'range': extendEnd(markers["@unusedVariable"]),
-                        'text': ""
-                    }
-                ]
-            }
-        )
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1)
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME, "goto"), "Correct file URI")
-        diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 2)
-        self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
-        self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedContractVariable"])
-
-    def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess) -> None:
-        # Reuse this test to prepare and ensure it is as expected
-        self.test_textDocument_didOpen_with_relative_import(solc)
-        self.open_file_and_wait_for_diagnostics(solc, 'lib', 'goto')
-
-        marker = self.get_test_tags('lib', 'goto')["@diagnostics"]
-
-        # lib.sol: Fix the unused variable message by removing it.
-        solc.send_message(
-            'textDocument/didChange',
-            {
-                'textDocument':
-                {
-                    'uri': self.get_test_file_uri('lib', 'goto')
-                },
-                'contentChanges': # delete the in-body statement: `uint unused;`
-                [
-                    {
-                        'range': extendEnd(marker),
-                        'text': ""
-                    }
-                ]
-            }
-        )
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 2, "published diagnostics count")
-        report1 = published_diagnostics[0]
-        self.expect_equal(report1['uri'], self.get_test_file_uri('didOpen_with_import'), "Correct file URI")
-        self.expect_equal(len(report1['diagnostics']), 0, "no diagnostics in didOpen_with_import.sol")
-        report2 = published_diagnostics[1]
-        self.expect_equal(report2['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
-        self.expect_equal(len(report2['diagnostics']), 0, "no diagnostics in lib.sol")
-
-        # Now close the file and expect the warning to re-appear
-        solc.send_message(
-            'textDocument/didClose',
-            { 'textDocument': { 'uri': self.get_test_file_uri('lib', 'goto') }}
-        )
-
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.verify_didOpen_with_import_diagnostics(published_diagnostics)
-
-    def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcProcess) -> None:
-        """
-        Open two new files A and B, let A import B, expect no error,
-        then close B and now expect the error of file B not being found.
-        """
-
-        self.setup_lsp(solc)
-        FILE_A_URI = 'file:///a.sol'
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_A_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': ''.join([
-                    '// SPDX-License-Identifier: UNLICENSED\n',
-                    'pragma solidity >=0.8.0;\n',
-                ])
-            }
-        })
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 1, "one publish diagnostics notification")
-        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-
-        FILE_B_URI = 'file:///b.sol'
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_B_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': ''.join([
-                    '// SPDX-License-Identifier: UNLICENSED\n',
-                    'pragma solidity >=0.8.0;\n',
-                ])
-            }
-        })
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 2, "one publish diagnostics notification")
-        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-        self.expect_equal(len(reports[1]['diagnostics']), 0, "should not contain diagnostics")
-
-        solc.send_message('textDocument/didChange', {
-            'textDocument': {
-                'uri': FILE_A_URI
-            },
-            'contentChanges': [
-                {
-                    'range': {
-                        'start': { 'line': 2, 'character': 0 },
-                        'end': { 'line': 2, 'character': 0 }
-                    },
-                    'text': 'import "./b.sol";\n'
-                }
-            ]
-        })
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 2, "one publish diagnostics notification")
-        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-        self.expect_equal(len(reports[1]['diagnostics']), 0, "should not contain diagnostics")
-
-        solc.send_message(
-            'textDocument/didClose',
-            { 'textDocument': { 'uri': FILE_B_URI }}
-        )
-        # We only get one diagnostics message since the diagnostics for b.sol was empty.
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 1, "one publish diagnostics notification")
-        self.expect_diagnostic(reports[0]['diagnostics'][0], 6275, 2, (0, 17)) # a.sol: File B not found
-        self.expect_equal(reports[0]['uri'], FILE_A_URI, "Correct uri")
-
-    def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc: JsonRpcProcess) -> None:
-        """
-        We open a virtual file that imports a real file with a warning.
-        Once we close the virtual file, the warning is removed from the diagnostics,
-        since the real file is not considered part of the project anymore.
-        """
-
-        self.setup_lsp(solc)
-        FILE_A_URI = f'{self.project_root_uri}/a.sol'
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_A_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text':
-                    '// SPDX-License-Identifier: UNLICENSED\n'
-                    'pragma solidity >=0.8.0;\n'
-                    'import "./goto/lib.sol";\n'
-            }
-        })
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 2, '')
-        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-
-        marker = self.get_test_tags("lib", 'goto')["@diagnostics"]
-
-        # unused variable in lib.sol
-        self.expect_diagnostic(reports[1]['diagnostics'][0], code=2072, marker=marker)
-
-        # Now close the file and expect the warning for lib.sol to be removed
-        solc.send_message(
-            'textDocument/didClose',
-            { 'textDocument': { 'uri': FILE_A_URI }}
-        )
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 1, '')
-        self.expect_equal(reports[0]['uri'], f'{self.project_root_uri}/goto/lib.sol', "")
-        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-
-    def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
-        """
-        Append at one line and insert a new one below.
-        """
-        self.setup_lsp(solc)
-        FILE_NAME = 'didChange_template'
-        FILE_URI = self.get_test_file_uri(FILE_NAME)
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': self.get_test_file_contents(FILE_NAME)
-            }
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "no diagnostics")
-        solc.send_message('textDocument/didChange', {
-            'textDocument': {
-                'uri': FILE_URI
-            },
-            'contentChanges': [
-                {
-                    'range': {
-                        'start': { 'line': 6, 'character': 0 },
-                        'end': { 'line': 6, 'character': 0 }
-                    },
-                    'text': " f"
-                }
-            ]
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        report2 = published_diagnostics[0]
-        self.expect_equal(report2['uri'], FILE_URI, "Correct file URI")
-        self.expect_equal(len(report2['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report2['diagnostics'][0], 7858, 6, (1, 2))
-
-        solc.send_message('textDocument/didChange', {
-            'textDocument': { 'uri': FILE_URI },
-            'contentChanges': [
-                {
-                    'range': {
-                        'start': { 'line': 6, 'character': 2 },
-                        'end': { 'line': 6, 'character': 2 }
-                    },
-                    'text': 'unction f() public {}'
-                }
-            ]
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        report3 = published_diagnostics[0]
-        self.expect_equal(report3['uri'], FILE_URI, "Correct file URI")
-        self.expect_equal(len(report3['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report3['diagnostics'][0], 4126, 6, (1, 23))
-
-    def test_textDocument_didChange_empty_file(self, solc: JsonRpcProcess) -> None:
-        """
-        Starts with an empty file and changes it to look like
-        the didOpen_with_import test case. Then we can use
-        the same verification calls to ensure it worked as expected.
-        """
-        # This FILE_NAME must be alphabetically before lib.sol to not over-complify
-        # the test logic in verify_didOpen_with_import_diagnostics.
-        FILE_NAME = 'a_new_file'
-        FILE_URI = self.get_test_file_uri(FILE_NAME)
-        self.setup_lsp(solc)
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': ''
-            }
-        })
-        reports = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(reports), 1)
-        report = reports[0]
-        published_diagnostics = report['diagnostics']
-        self.expect_equal(len(published_diagnostics), 2)
-        self.expect_diagnostic(published_diagnostics[0], code=1878, lineNo=0, startEndColumns=(0, 0))
-        self.expect_diagnostic(published_diagnostics[1], code=3420, lineNo=0, startEndColumns=(0, 0))
-        solc.send_message('textDocument/didChange', {
-            'textDocument': {
-                'uri': self.get_test_file_uri('a_new_file')
-            },
-            'contentChanges': [
-                {
-                    'range': {
-                        'start': { 'line': 0, 'character': 0 },
-                        'end': { 'line': 0, 'character': 0 }
-                    },
-                    'text': self.get_test_file_contents('didOpen_with_import')
-                }
-            ]
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.verify_didOpen_with_import_diagnostics(published_diagnostics, 'a_new_file')
-
-    def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
-        """
-        Starts with an empty file and changes it to multiple times, changing
-        content across lines.
-        """
-        self.setup_lsp(solc)
-        FILE_NAME = 'didChange_template'
-        FILE_URI = self.get_test_file_uri(FILE_NAME)
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': self.get_test_file_contents(FILE_NAME)
-            }
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "no diagnostics")
-        solc.send_message('textDocument/didChange', {
-            'textDocument': { 'uri': FILE_URI },
-            'contentChanges': [
-                {
-                    'range': {
-                        'start': { 'line': 3, 'character': 3 },
-                        'end': { 'line': 4, 'character': 1 }
-                    },
-                    'text': "tract D {\n\n  uint x\n = -1; \n "
-                }
-            ]
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        report2 = published_diagnostics[0]
-        self.expect_equal(report2['uri'], FILE_URI, "Correct file URI")
-        self.expect_equal(len(report2['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report2['diagnostics'][0], 7407, 6, (3, 5))
-
-        # Now we are changing the part "x\n = -" of "uint x\n = -1;"
-        solc.send_message('textDocument/didChange', {
-            'textDocument': { 'uri': FILE_URI },
-            'contentChanges': [
-                {
-                    'range': {
-                        'start': { 'line': 5, 'character': 7 },
-                        'end': { 'line': 6, 'character': 4 }
-                    },
-                    'text': "y\n = [\nuint(1),\n3,4]+"
-                }
-            ]
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
-        report3 = published_diagnostics[0]
-        self.expect_equal(report3['uri'], FILE_URI, "Correct file URI")
-        self.expect_equal(len(report3['diagnostics']), 2, "two diagnostics")
-        diagnostic = report3['diagnostics'][0]
-        self.expect_equal(diagnostic['code'], 2271, 'diagnostic: 2271')
-        # check multi-line error code
-        self.expect_equal(
-            diagnostic['range'],
-            {
-                'end': {'character': 6, 'line': 8},
-                'start': {'character': 3, 'line': 6}
-            },
-            "diagnostic: check range"
-        )
-        diagnostic = report3['diagnostics'][1]
-        self.expect_equal(diagnostic['code'], 7407, 'diagnostic: 7407')
-        # check multi-line error code
-        self.expect_equal(
-            diagnostic['range'],
-            {
-                'end': {'character': 6, 'line': 8},
-                'start': {'character': 3, 'line': 6}
-            },
-            "diagnostic: check range"
-        )
-
-    # }}}
-    # }}}
-
-
-if __name__ == "__main__":
-    suite = SolidityLSPTestSuite()
-    exit_code = suite.main()
-    sys.exit(exit_code)
diff --git a/test/pyscriptTests.py b/test/pyscriptTests.py
deleted file mode 100755
index 17b095d648cd..000000000000
--- a/test/pyscriptTests.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python3
-
-# Runs all tests for Python-based scripts.
-# Any Python test suites located in test/scripts/ will be executed automatically by this script.
-
-import sys
-from pathlib import Path
-from unittest import TestLoader, TextTestRunner
-
-SCRIPTS_DIR = Path(__file__).parent.parent / "scripts"
-TEST_DIR = Path(__file__).parent.parent / "test/scripts/"
-
-
-if __name__ == '__main__':
-    # Add the directory containing scripts to be tested to PYTHONPATH. This means that these
-    # scripts can be imported from anywhere (in particular from the test suites) as if they were
-    # installed globally. This is necessary because scripts and their tests are in separate
-    # directories not recognized by Python as a part of the same package (i.e. their common parent
-    # directory does not have an __init__.py file).
-    # NOTE: This does not play well with relative imports from test suites so the suites must be
-    # placed directly in TEST_DIR and not in its subdirectories. Relative imports from scripts
-    # themselves work fine though.
-    sys.path.insert(0, str(SCRIPTS_DIR))
-
-    # This is equivalent to `python -m unittest discover --start-directory $TEST_DIR`
-    test_suite = TestLoader().discover(start_dir=TEST_DIR)
-    result = TextTestRunner().run(test_suite)
-
-    if len(result.errors) > 0 or len(result.failures) > 0:
-        sys.exit(1)
diff --git a/test/scripts/fixtures/code_block.rst b/test/scripts/fixtures/code_block.rst
deleted file mode 100644
index a0bb7a91e823..000000000000
--- a/test/scripts/fixtures/code_block.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-Some text
-
-
-.. code-block:: solidity
-
-    // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.7.0 <0.9.0;
-
-    contract C {
-        function foo() public view {}
-    }
-
-
-.. warning::
-
-    A Warning.
-
-::
-
-    contract C {}
-
-More text.
-
-.. code-block:: yul
-
-    let x := add(1, 5)
-
-.. code-block:: yul
-
-    // Yul code wrapped in object
-    {
-        {
-            let y := mul(3, 5)
-        }
-    }
-
-.. code-block:: yul
-    // Yul code wrapped in named object
-    object "Test" {
-        {
-            let y := mul(6, 9)
-        }
-    }
-
diff --git a/test/scripts/fixtures/code_block_with_directives.rst b/test/scripts/fixtures/code_block_with_directives.rst
deleted file mode 100644
index fba8ed7dd9da..000000000000
--- a/test/scripts/fixtures/code_block_with_directives.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-A normal block with parameters.
-
-.. code-block:: solidity
-    :force:
-    :language: Solidity
-
-    // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.7.0 <0.9.0;
-
-    contract C {
-        function foo() public view {}
-    }
-
-
-.. warning::
-    A Warning.
-
-.. code-block:: solidity
-
-    uint constant x = 42;
-
-Text.
-
-::
-
-    contract C {}
-
-A block with blank lines between block parameters.
-Sphinx will treat the second one as a part of the code.
-
-.. code-block:: solidity
-    :force:
-
-    :language: Solidity
-
-    contract D {}
-    :linenos:
-
-Block with parameters indented less than code.
-Sphinx does not complain about these.
-
-.. code-block:: solidity
-  :force:
-  :linenos:
-
-    contract E {}
-
-More text.
-
-.. code-block:: yul
-
-    :force:
-    let x := add(1, 5)
-
-.. code-block:: yul
-
-    :linenos:
-    :language: Yul
-    // Yul code wrapped in object
-    {
-        let y := mul(3, 5)
-    }
-
-.. code-block:: yul
-
-    // Yul code wrapped in named object
-    object "Test" {
-        let y := mul(3, 5)
-    :linenos:
-    }
-
diff --git a/test/scripts/fixtures/code_generation_error_cli_output.txt b/test/scripts/fixtures/code_generation_error_cli_output.txt
deleted file mode 100644
index 2badab1da546..000000000000
--- a/test/scripts/fixtures/code_generation_error_cli_output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
---> test_1c3426238b8296745d8d8bd0ff995ab65a51992b568dc7c5ce73c3f59b107825_no_assignments_sol.sol
-
-Warning: Source file does not specify required compiler version! Consider adding "pragma solidity ^0.8.0;"
---> test_1c3426238b8296745d8d8bd0ff995ab65a51992b568dc7c5ce73c3f59b107825_no_assignments_sol.sol
-
-Error: Some immutables were read from but never assigned, possibly because of optimization.
-
diff --git a/test/scripts/fixtures/code_generation_error_json_output.json b/test/scripts/fixtures/code_generation_error_json_output.json
deleted file mode 100644
index 949bf33eae85..000000000000
--- a/test/scripts/fixtures/code_generation_error_json_output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "contracts": {
-        "syntaxTests/immutable/no_assignments.sol": {
-            "C": {
-                "metadata": "{\"compiler\":{\"version\":\"0.8.0+commit.c7dfd78e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"f\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"syntaxTests/immutable/no_assignments.sol\":\"C\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"syntaxTests/immutable/no_assignments.sol\":{\"keccak256\":\"0xbafaec265150d52cd293787144247b1a0a782adf3cb89296fb4f0eb05dc25739\",\"urls\":[\"bzz-raw://7c01dbb8146347c8cf62469d57a0e290f7ef1b871426d86d995315160db665c0\",\"dweb:/ipfs/QmPrYtxVbFCFeXwnhcHoBgbg546EqMzQCT5kK7wLc3rat8\"]}},\"version\":1}"
-            }
-        }
-    },
-    "errors": [
-        {
-            "component": "general",
-            "errorCode": "1878",
-            "formattedMessage": "Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing \"SPDX-License-Identifier: <SPDX-License>\" to each source file. Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. Please see https://spdx.org for more information.\n--> syntaxTests/immutable/no_assignments.sol\n\n",
-            "message": "SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing \"SPDX-License-Identifier: <SPDX-License>\" to each source file. Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. Please see https://spdx.org for more information.",
-            "severity": "warning",
-            "sourceLocation": {
-                "end": -1,
-                "file": "syntaxTests/immutable/no_assignments.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "3420",
-            "formattedMessage": "Warning: Source file does not specify required compiler version! Consider adding \"pragma solidity ^0.8.0;\"\n--> syntaxTests/immutable/no_assignments.sol\n\n",
-            "message": "Source file does not specify required compiler version! Consider adding \"pragma solidity ^0.8.0;\"",
-            "severity": "warning",
-            "sourceLocation": {
-                "end": -1,
-                "file": "syntaxTests/immutable/no_assignments.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "1284",
-            "formattedMessage": "CodeGenerationError: Some immutables were read from but never assigned, possibly because of optimization.\n\n",
-            "message": "Some immutables were read from but never assigned, possibly because of optimization.",
-            "severity": "error",
-            "type": "CodeGenerationError"
-        }
-    ],
-    "sources": {
-        "syntaxTests/immutable/no_assignments.sol": {
-            "id": 0
-        }
-    }
-}
diff --git a/test/scripts/fixtures/eth_gas_report_gnosis.rst b/test/scripts/fixtures/eth_gas_report_gnosis.rst
deleted file mode 100644
index c2e77f9bed83..000000000000
--- a/test/scripts/fixtures/eth_gas_report_gnosis.rst
+++ /dev/null
@@ -1,381 +0,0 @@
-·----------------------------------------------------------------------------------------------------------------------------------------|---------------------------|-------------|------------------------------·
-|                                                          Solc version: 0.8.10                                                          ·  Optimizer enabled: true  ·  Runs: 200  ·  Block limit: 100000000 gas  │
-·········································································································································|···························|·············|·······························
-|  Methods                                                                                                                                                                                                        │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  Contract                      ·  Method                                                                                               ·  Min        ·  Max        ·  Avg        ·  # calls      ·  eur (avg)   │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  getMessageHash(bytes)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  getMessageHashForSafe(address,bytes)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  getModules()                                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  isValidSignature(bytes,bytes)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  isValidSignature(bytes32,bytes)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  NAME()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  onERC1155Received(address,address,uint256,uint256,bytes)                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  onERC721Received(address,address,uint256,bytes)                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  simulate(address,bytes)                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  tokensReceived(address,address,address,uint256,bytes,bytes)                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CompatibilityFallbackHandler  ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CreateCall                    ·  performCreate(uint256,bytes)                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  CreateCall                    ·  performCreate2(uint256,bytes,bytes32)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DebugTransactionGuard         ·  checkAfterExecution(bytes32,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DebugTransactionGuard         ·  checkTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes,address)  ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DebugTransactionGuard         ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DebugTransactionGuard         ·  txNonces(bytes32)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  NAME()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  onERC1155Received(address,address,uint256,uint256,bytes)                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  onERC721Received(address,address,uint256,bytes)                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  tokensReceived(address,address,address,uint256,bytes,bytes)                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DefaultCallbackHandler        ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DelegateCallTransactionGuard  ·  allowedTarget()                                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DelegateCallTransactionGuard  ·  checkAfterExecution(bytes32,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DelegateCallTransactionGuard  ·  checkTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes,address)  ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  DelegateCallTransactionGuard  ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC1155Token                  ·  balanceOf(address,uint256)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC1155Token                  ·  mint(address,uint256,uint256,bytes)                                                                  ·      47934  ·      59804  ·      57826  ·            6  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC1155Token                  ·  safeTransferFrom(address,address,uint256,uint256,bytes)                                              ·          -  ·          -  ·      53900  ·            2  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  allowance(address,address)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  approve(address,uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  balanceOf(address)                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  decimals()                                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  decreaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  increaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  name()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  symbol()                                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  totalSupply()                                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  transfer(address,uint256)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20                         ·  transferFrom(address,address,uint256)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  allowance(address,address)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  approve(address,uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  balanceOf(address)                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  decimals()                                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  decreaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  increaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  name()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  symbol()                                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  totalSupply()                                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  transfer(address,uint256)                                                                            ·          -  ·          -  ·      51567  ·            8  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ERC20Token                    ·  transferFrom(address,address,uint256)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  FallbackManager               ·  setFallbackHandler(address)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  addOwnerWithThreshold(address,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  approvedHashes(address,bytes32)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  approveHash(bytes32)                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  changeThreshold(uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  checkNSignatures(bytes32,bytes,bytes,uint256)                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  checkSignatures(bytes32,bytes,bytes)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  disableModule(address,address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  domainSeparator()                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  enableModule(address)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  encodeTransactionData(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)           ·      59563  ·     151736  ·      94816  ·           85  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  execTransactionFromModule(address,uint256,bytes,uint8)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  execTransactionFromModuleReturnData(address,uint256,bytes,uint8)                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  getChainId()                                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  getModulesPaginated(address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  getOwners()                                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  getStorageAt(uint256,uint256)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  getThreshold()                                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  getTransactionHash(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  isModuleEnabled(address)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  isOwner(address)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  nonce()                                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  removeOwner(address,address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  requiredTxGas(address,uint256,bytes,uint8)                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  setFallbackHandler(address)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  setGuard(address)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  setup(address[],uint256,address,bytes,address,address,uint256,address)                               ·     167642  ·     263690  ·     201944  ·           49  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  signedMessages(bytes32)                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  simulateAndRevert(address,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  swapOwner(address,address,address)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafe                    ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  addOwnerWithThreshold(address,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  approvedHashes(address,bytes32)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  approveHash(bytes32)                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  changeThreshold(uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  checkNSignatures(bytes32,bytes,bytes,uint256)                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  checkSignatures(bytes32,bytes,bytes)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  disableModule(address,address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  domainSeparator()                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  enableModule(address)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  encodeTransactionData(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  execTransactionFromModule(address,uint256,bytes,uint8)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  execTransactionFromModuleReturnData(address,uint256,bytes,uint8)                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  getChainId()                                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  getModulesPaginated(address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  getOwners()                                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  getStorageAt(uint256,uint256)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  getThreshold()                                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  getTransactionHash(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  isModuleEnabled(address)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  isOwner(address)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  nonce()                                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  removeOwner(address,address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  requiredTxGas(address,uint256,bytes,uint8)                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  setFallbackHandler(address)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  setGuard(address)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  setup(address[],uint256,address,bytes,address,address,uint256,address)                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  signedMessages(bytes32)                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  simulateAndRevert(address,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  swapOwner(address,address,address)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeL2                  ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeProxyFactory        ·  calculateCreateProxyWithNonceAddress(address,bytes,uint256)                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeProxyFactory        ·  createProxy(address,bytes)                                                                           ·     105568  ·     105580  ·     105568  ·           52  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeProxyFactory        ·  createProxyWithCallback(address,bytes,uint256,address)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeProxyFactory        ·  createProxyWithNonce(address,bytes,uint256)                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeProxyFactory        ·  proxyCreationCode()                                                                                  ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GnosisSafeProxyFactory        ·  proxyRuntimeCode()                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  GuardManager                  ·  setGuard(address)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  Migration                     ·  migrate()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  Migration                     ·  migrationSingleton()                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  Migration                     ·  safe120Singleton()                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  DEFAULT_FALLBACK_VALUE()                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyReturn(bytes)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyReturnAddress(address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyReturnBool(bool)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyReturnUint(uint256)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyRevert()                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyRevertWithMessage(string)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenAnyRunOutOfGas()                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataReturn(bytes,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataReturnAddress(bytes,address)                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataReturnBool(bytes,bool)                                                                  ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataReturnUint(bytes,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataRevert(bytes)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataRevertWithMessage(bytes,string)                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenCalldataRunOutOfGas(bytes)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodReturn(bytes,bytes)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodReturnAddress(bytes,address)                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodReturnBool(bytes,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodReturnUint(bytes,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodRevert(bytes)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodRevertWithMessage(bytes,string)                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  givenMethodRunOutOfGas(bytes)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  invocationCount()                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  invocationCountForCalldata(bytes)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  invocationCountForMethod(bytes)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  MOCKS_LIST_END_HASH()                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  MOCKS_LIST_END()                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  MOCKS_LIST_START()                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  reset()                                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  SENTINEL_ANY_MOCKS()                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MockContract                  ·  updateInvocationCount(bytes4,bytes)                                                                  ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ModuleManager                 ·  disableModule(address,address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ModuleManager                 ·  enableModule(address)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ModuleManager                 ·  execTransactionFromModule(address,uint256,bytes,uint8)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ModuleManager                 ·  execTransactionFromModuleReturnData(address,uint256,bytes,uint8)                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ModuleManager                 ·  getModulesPaginated(address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ModuleManager                 ·  isModuleEnabled(address)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MultiSend                     ·  multiSend(bytes)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  MultiSendCallOnly             ·  multiSend(bytes)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  addOwnerWithThreshold(address,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  changeThreshold(uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  getOwners()                                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  getThreshold()                                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  isOwner(address)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  removeOwner(address,address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  OwnerManager                  ·  swapOwner(address,address,address)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ReentrancyTransactionGuard    ·  checkAfterExecution(bytes32,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ReentrancyTransactionGuard    ·  checkTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes,address)  ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  ReentrancyTransactionGuard    ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  SignMessageLib                ·  getMessageHash(bytes)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  SignMessageLib                ·  signMessage(bytes)                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  SimulateTxAccessor            ·  simulate(address,uint256,bytes,uint8)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  StorageAccessible             ·  getStorageAt(uint256,uint256)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  StorageAccessible             ·  simulateAndRevert(address,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  TestHandler                   ·  dudududu()                                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
-·································|·······································································································|·············|·············|·············|···············|···············
-|  Deployments                                                                                                                           ·                                         ·  % of limit   ·              │
-·········································································································································|·············|·············|·············|···············|···············
-|  DelegateCallTransactionGuard                                                                                                          ·     283510  ·     283522  ·     283516  ·        0.3 %  ·           -  │
-·········································································································································|·············|·············|·············|···············|···············
-|  ERC1155Token                                                                                                                          ·          -  ·          -  ·     525869  ·        0.5 %  ·           -  │
-·········································································································································|·············|·············|·············|···············|···············
-|  ERC20Token                                                                                                                            ·          -  ·          -  ·     733462  ·        0.7 %  ·           -  │
-·----------------------------------------------------------------------------------------------------------------------------------------|-------------|-------------|-------------|---------------|--------------·
diff --git a/test/scripts/fixtures/library_inherited2_sol_cli_output.txt b/test/scripts/fixtures/library_inherited2_sol_cli_output.txt
deleted file mode 100644
index 45aa83f78dbe..000000000000
--- a/test/scripts/fixtures/library_inherited2_sol_cli_output.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
---> syntaxTests/scoping/library_inherited2.sol
-
-Warning: Source file does not specify required compiler version! Consider adding "pragma solidity ^0.8.0;"
---> syntaxTests/scoping/library_inherited2.sol
-
-
-======= syntaxTests/scoping/library_inherited2.sol:A =======
-Binary:
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122086e727f29d40b264a19bbfcad38d64493dca4bab5dbba8c82ffdaae389d2bba064736f6c63430008000033
-Metadata:
-{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"A"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}
-
-======= syntaxTests/scoping/library_inherited2.sol:B =======
-Binary:
-608060405234801561001057600080fd5b506101cc806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630423a13214610030575b600080fd5b61004a6004803603810190610045919061009d565b610060565b60405161005791906100d5565b60405180910390f35b600061006b82610072565b9050919050565b6000602a8261008191906100f0565b9050919050565b6000813590506100978161017f565b92915050565b6000602082840312156100af57600080fd5b60006100bd84828501610088565b91505092915050565b6100cf81610146565b82525050565b60006020820190506100ea60008301846100c6565b92915050565b60006100fb82610146565b915061010683610146565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561013b5761013a610150565b5b828201905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b61018881610146565b811461019357600080fd5b5056fea2646970667358221220104c345633313efe410492448844d96d78452c3044ce126b5e041b7fbeaa790064736f6c63430008000033
-Metadata:
-{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"}],"name":"bar","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"B"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}
-
-======= syntaxTests/scoping/library_inherited2.sol:Lib =======
-Binary:
-60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207f9515e2263fa71a7984707e2aefd82241fac15c497386ca798b526f14f8ba6664736f6c63430008000033
-Metadata:
-{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"Lib"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}
diff --git a/test/scripts/fixtures/library_inherited2_sol_json_output.json b/test/scripts/fixtures/library_inherited2_sol_json_output.json
deleted file mode 100644
index 2e48c685b3e9..000000000000
--- a/test/scripts/fixtures/library_inherited2_sol_json_output.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "contracts": {
-        "syntaxTests/scoping/library_inherited2.sol": {
-            "A": {
-                "evm": {
-                    "bytecode": {
-                        "object": "6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122086e727f29d40b264a19bbfcad38d64493dca4bab5dbba8c82ffdaae389d2bba064736f6c63430008000033"
-                    }
-                },
-                "metadata": "{\"compiler\":{\"version\":\"0.8.0+commit.c7dfd78e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"syntaxTests/scoping/library_inherited2.sol\":\"A\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"syntaxTests/scoping/library_inherited2.sol\":{\"keccak256\":\"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96\",\"urls\":[\"bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55\",\"dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet\"]}},\"version\":1}"
-            },
-            "B": {
-                "evm": {
-                    "bytecode": {
-                        "object": "608060405234801561001057600080fd5b506101cc806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630423a13214610030575b600080fd5b61004a6004803603810190610045919061009d565b610060565b60405161005791906100d5565b60405180910390f35b600061006b82610072565b9050919050565b6000602a8261008191906100f0565b9050919050565b6000813590506100978161017f565b92915050565b6000602082840312156100af57600080fd5b60006100bd84828501610088565b91505092915050565b6100cf81610146565b82525050565b60006020820190506100ea60008301846100c6565b92915050565b60006100fb82610146565b915061010683610146565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561013b5761013a610150565b5b828201905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b61018881610146565b811461019357600080fd5b5056fea2646970667358221220104c345633313efe410492448844d96d78452c3044ce126b5e041b7fbeaa790064736f6c63430008000033"
-                    }
-                },
-                "metadata": "{\"compiler\":{\"version\":\"0.8.0+commit.c7dfd78e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"bar\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"syntaxTests/scoping/library_inherited2.sol\":\"B\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"syntaxTests/scoping/library_inherited2.sol\":{\"keccak256\":\"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96\",\"urls\":[\"bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55\",\"dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet\"]}},\"version\":1}"
-            },
-            "Lib": {
-                "evm": {
-                    "bytecode": {
-                        "object": "60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207f9515e2263fa71a7984707e2aefd82241fac15c497386ca798b526f14f8ba6664736f6c63430008000033"
-                    }
-                },
-                "metadata": "{\"compiler\":{\"version\":\"0.8.0+commit.c7dfd78e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"syntaxTests/scoping/library_inherited2.sol\":\"Lib\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"syntaxTests/scoping/library_inherited2.sol\":{\"keccak256\":\"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96\",\"urls\":[\"bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55\",\"dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet\"]}},\"version\":1}"
-            }
-        }
-    },
-    "errors": [
-        {
-            "component": "general",
-            "errorCode": "1878",
-            "formattedMessage": "Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing \"SPDX-License-Identifier: <SPDX-License>\" to each source file. Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. Please see https://spdx.org for more information.\n--> syntaxTests/scoping/library_inherited2.sol\n\n",
-            "message": "SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing \"SPDX-License-Identifier: <SPDX-License>\" to each source file. Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. Please see https://spdx.org for more information.",
-            "severity": "warning",
-            "sourceLocation": {
-                "end": -1,
-                "file": "syntaxTests/scoping/library_inherited2.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "3420",
-            "formattedMessage": "Warning: Source file does not specify required compiler version! Consider adding \"pragma solidity ^0.8.0;\"\n--> syntaxTests/scoping/library_inherited2.sol\n\n",
-            "message": "Source file does not specify required compiler version! Consider adding \"pragma solidity ^0.8.0;\"",
-            "severity": "warning",
-            "sourceLocation": {
-                "end": -1,
-                "file": "syntaxTests/scoping/library_inherited2.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources": {
-        "syntaxTests/scoping/library_inherited2.sol": {
-            "id": 0
-        }
-    }
-}
diff --git a/test/scripts/fixtures/smt_contract_with_cr_newlines.sol b/test/scripts/fixtures/smt_contract_with_cr_newlines.sol
deleted file mode 100644
index 1f9994caab94..000000000000
--- a/test/scripts/fixtures/smt_contract_with_cr_newlines.sol
+++ /dev/null
@@ -1 +0,0 @@
-pragma experimental SMTChecker;

contract C {
}
\ No newline at end of file
diff --git a/test/scripts/fixtures/smt_contract_with_crlf_newlines.sol b/test/scripts/fixtures/smt_contract_with_crlf_newlines.sol
deleted file mode 100644
index f1ea8f40b32e..000000000000
--- a/test/scripts/fixtures/smt_contract_with_crlf_newlines.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma experimental SMTChecker;
-
-contract C {
-}
diff --git a/test/scripts/fixtures/smt_contract_with_lf_newlines.sol b/test/scripts/fixtures/smt_contract_with_lf_newlines.sol
deleted file mode 100644
index 80aa57ff5651..000000000000
--- a/test/scripts/fixtures/smt_contract_with_lf_newlines.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma experimental SMTChecker;
-
-contract C {
-}
diff --git a/test/scripts/fixtures/smt_contract_with_mixed_newlines.sol b/test/scripts/fixtures/smt_contract_with_mixed_newlines.sol
deleted file mode 100644
index 50bb65928e8d..000000000000
--- a/test/scripts/fixtures/smt_contract_with_mixed_newlines.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental SMTChecker;
-
-contract C {
}
diff --git a/test/scripts/fixtures/smt_smoke_test.sol b/test/scripts/fixtures/smt_smoke_test.sol
deleted file mode 100644
index 8b7b77da62f1..000000000000
--- a/test/scripts/fixtures/smt_smoke_test.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma experimental SMTChecker;
-contract C {
-}
diff --git a/test/scripts/fixtures/solc_0.4.0_cli_output.txt b/test/scripts/fixtures/solc_0.4.0_cli_output.txt
deleted file mode 100644
index 2000013c5753..000000000000
--- a/test/scripts/fixtures/solc_0.4.0_cli_output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-contract.sol:1:1: Warning: Source file does not specify required compiler version! Consider adding "pragma solidity ^0.4.0;".
-contract C {}
-^
-Spanning multiple lines.
-
-======= C =======
-Binary:
-6060604052600c8060106000396000f360606040526008565b600256
diff --git a/test/scripts/fixtures/solc_0.4.8_cli_output.txt b/test/scripts/fixtures/solc_0.4.8_cli_output.txt
deleted file mode 100644
index 619e5c39ed81..000000000000
--- a/test/scripts/fixtures/solc_0.4.8_cli_output.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-contract.sol:1:1: Warning: Source file does not specify required compiler version!Consider adding "pragma solidity ^0.4.8
-contract C {}
-^
-Spanning multiple lines.
-
-======= C =======
-Binary:
-6060604052346000575b60358060166000396000f30060606040525b60005600a165627a7a72305820ccf9337430b4c4f7d6ad41efb10a94411a2af6a9f173ef52daeadd31f4bf11890029
-Metadata:
-{"compiler":{"version":"0.4.8+commit.60cc1668.mod.Darwin.appleclang"},"language":"Solidity","output":{"abi":[],"devdoc":{"methods":{}},"userdoc":{"methods":{}}},"settings":{"compilationTarget":{"contract.sol":"C"},"libraries":{},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"contract.sol":{"keccak256":"0xbe86d3681a198587296ad6d4a834606197e1a8f8944922c501631b04e21eeba2","urls":["bzzr://af16957d3d86013309d64d3cc572d007b1d8b08a821f2ff366840deb54a78524"]}},"version":1}
diff --git a/test/scripts/fixtures/stack_too_deep_cli_output.txt b/test/scripts/fixtures/stack_too_deep_cli_output.txt
deleted file mode 100644
index d0ff06d47ea5..000000000000
--- a/test/scripts/fixtures/stack_too_deep_cli_output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Compiler error: Stack too deep when compiling inline assembly: Variable value0 is 1 slot(s) too deep inside the stack.
-
diff --git a/test/scripts/fixtures/stack_too_deep_json_output.json b/test/scripts/fixtures/stack_too_deep_json_output.json
deleted file mode 100644
index 4a259aa3526c..000000000000
--- a/test/scripts/fixtures/stack_too_deep_json_output.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "contracts": {
-        "syntaxTests/tupleAssignments/large_component_count.sol": {
-            "C": {
-                "metadata": "{\"compiler\":{\"version\":\"0.8.0+commit.c7dfd78e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"f\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"g\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"syntaxTests/tupleAssignments/large_component_count.sol\":\"C\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"syntaxTests/tupleAssignments/large_component_count.sol\":{\"keccak256\":\"0xb5478857c30ab2e7cf6b0fdcad0fdc70f4715129a7dd3f3f1dda5b3892a83846\",\"urls\":[\"bzz-raw://abc14e4a2a61618b712c4ac3ba0cab07d9214d0637af78aa7648e3d2f89eb725\",\"dweb:/ipfs/QmTqrQzwWbZgdAck6ma9xY3sL1mGiw61Nsg36P21mZdxLG\"]}},\"version\":1}"
-            }
-        }
-    },
-    "errors": [
-        {
-            "component": "general",
-            "formattedMessage": "CompilerError: Stack too deep when compiling inline assembly: Variable value0 is 1 slot(s) too deep inside the stack.\n\n",
-            "message": "Compiler error (/solidity/libyul/backends/evm/AsmCodeGen.cpp:248):Stack too deep when compiling inline assembly: Variable value0 is 1 slot(s) too deep inside the stack.",
-            "severity": "error",
-            "type": "CompilerError"
-        }
-    ],
-    "sources": {
-        "syntaxTests/tupleAssignments/large_component_count.sol": {
-            "id": 0
-        }
-    }
-}
diff --git a/test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md b/test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md
deleted file mode 100644
index ce351a5b709c..000000000000
--- a/test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md
+++ /dev/null
@@ -1,75 +0,0 @@
-
-### `ir-no-optimize`
-|   project |  bytecode_size | deployment_gas |     method_gas |
-|:---------:|---------------:|---------------:|---------------:|
-|    bleeps |                |                |                |
-|    colony |                |                |                |
-| elementfi |                |                |           `0%` |
-|       ens |           `!A` |           `!A` |           `!A` |
-|     euler | **`+1.43% �`** |           `0%` | **`+2.47% �`** |
-|    gnosis |           `!B` |           `!B` |           `!B` |
-|  zeppelin |                |                |                |
-
-### `ir-optimize-evm+yul`
-|   project |   bytecode_size |  deployment_gas | method_gas |
-|:---------:|----------------:|----------------:|-----------:|
-|    bleeps |  **`+0.53% �`** |            `0%` |      `-0%` |
-|    colony |            `!A` |            `!A` |       `!A` |
-| elementfi |                 |                 |            |
-|       ens |            `!A` |            `!A` |       `!A` |
-|     euler | **`+12.64% �`** | **`+11.98% �`** |       `0%` |
-|    gnosis |            `!B` |            `!B` |       `!B` |
-|  zeppelin |                 |                 |            |
-
-### `ir-optimize-evm-only`
-|   project | bytecode_size | deployment_gas | method_gas |
-|:---------:|--------------:|---------------:|-----------:|
-|    bleeps |               |                |            |
-|    colony |               |                |            |
-| elementfi |          `!B` |           `!B` |       `!B` |
-|       ens |          `!A` |           `!A` |       `!A` |
-|     euler |          `!V` |           `!V` |       `!V` |
-|    gnosis |          `!B` |           `!B` |       `!B` |
-|  zeppelin |               |                |            |
-
-### `legacy-no-optimize`
-|   project | bytecode_size | deployment_gas | method_gas |
-|:---------:|--------------:|---------------:|-----------:|
-|    bleeps |               |                |            |
-|    colony |          `!B` |           `!B` |       `!B` |
-| elementfi |          `!A` |           `!B` |            |
-|       ens |          `!A` |           `!A` |       `!A` |
-|     euler |          `!V` |           `!V` |       `!V` |
-|    gnosis |          `!B` |           `!B` |       `!B` |
-|  zeppelin |               |                |            |
-
-### `legacy-optimize-evm+yul`
-|   project | bytecode_size | deployment_gas | method_gas |
-|:---------:|--------------:|---------------:|-----------:|
-|    bleeps |          `0%` |           `0%` |       `0%` |
-|    colony |          `0%` |                |            |
-| elementfi |          `!A` |           `!B` |            |
-|       ens |          `!A` |           `!A` |       `!A` |
-|     euler |          `!V` |           `!V` |       `!V` |
-|    gnosis |          `!B` |           `!B` |       `!B` |
-|  zeppelin |          `0%` |           `0%` |            |
-
-### `legacy-optimize-evm-only`
-|   project | bytecode_size | deployment_gas | method_gas |
-|:---------:|--------------:|---------------:|-----------:|
-|    bleeps |               |                |            |
-|    colony |               |                |            |
-| elementfi |          `!A` |           `!A` |       `!A` |
-|       ens |          `!A` |           `!A` |       `!A` |
-|     euler |          `!V` |           `!V` |       `!V` |
-|    gnosis |          `!B` |           `!B` |       `!B` |
-|  zeppelin |               |                |            |
-
-
-`!V` = version mismatch
-`!B` = no value in the "before" version
-`!A` = no value in the "after" version
-`!T` = one or both values were not numeric and could not be compared
-`-0` = very small negative value rounded to zero
-`+0` = very small positive value rounded to zero
-
diff --git a/test/scripts/fixtures/summarized-benchmarks-branch.json b/test/scripts/fixtures/summarized-benchmarks-branch.json
deleted file mode 100644
index 0ba46b87d682..000000000000
--- a/test/scripts/fixtures/summarized-benchmarks-branch.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "bleeps": {
-        "ir-optimize-evm+yul": {
-            "bytecode_size": 132868,
-            "deployment_gas": 0,
-            "method_gas": 39289198,
-            "version": "bb90cd0"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 137869,
-            "deployment_gas": 0,
-            "method_gas": 38863224,
-            "version": "bb90cd0"
-        }
-    },
-    "colony": {
-        "legacy-no-optimize": {
-            "bytecode_size": 664190,
-            "deployment_gas": null,
-            "method_gas": null,
-            "version": "573399b"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 363606,
-            "deployment_gas": null,
-            "method_gas": null,
-            "version": "573399b"
-        }
-    },
-    "elementfi": {
-        "legacy-no-optimize": {
-            "bytecode_size": null,
-            "deployment_gas": 69200158,
-            "method_gas": null,
-            "version": "87f8b5e"
-        },
-        "legacy-optimize-evm+yul": {
-            "deployment_gas": 40951128,
-            "version": "87f8b5e"
-        },
-        "ir-optimize-evm-only": {},
-        "ir-no-optimize": {
-            "deployment_gas": null,
-            "method_gas": 2777867251,
-            "version": "87f8b5e"
-        }
-    },
-    "euler": {
-        "ir-no-optimize": {
-            "bytecode_size": 328540,
-            "deployment_gas": 61591870,
-            "method_gas": 3537419168,
-            "version": "2ef99fc"
-        },
-        "legacy-no-optimize": {
-            "bytecode_size": 328540,
-            "deployment_gas": 62590688,
-            "method_gas": 3537419168,
-            "version": "2ef99fc"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 182190,
-            "deployment_gas": 35236828,
-            "method_gas": 2777867251,
-            "version": "2ef99fc"
-        },
-        "legacy-optimize-evm-only": {
-            "bytecode_size": 205211,
-            "deployment_gas": 39459629,
-            "method_gas": 2978467272,
-            "version": "2ef99fc"
-        },
-        "ir-optimize-evm-only": {
-            "bytecode_size": 205211,
-            "deployment_gas": 39459629,
-            "method_gas": 2978467272,
-            "version": "2ef99fc"
-        },
-        "ir-optimize-evm+yul": {
-            "bytecode_size": 205211,
-            "deployment_gas": 39459629,
-            "method_gas": 2777867251
-        }
-    },
-    "gnosis": {
-        "ir-optimize-evm+yul": {
-            "bytecode_size": 56069,
-            "deployment_gas": null,
-            "method_gas": null,
-            "version": "ea09294"
-        }
-    },
-    "zeppelin": {
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 510428,
-            "deployment_gas": 94501114,
-            "version": "af7ec04"
-        }
-    }
-}
diff --git a/test/scripts/fixtures/summarized-benchmarks-develop.json b/test/scripts/fixtures/summarized-benchmarks-develop.json
deleted file mode 100644
index 1961870f3f45..000000000000
--- a/test/scripts/fixtures/summarized-benchmarks-develop.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "bleeps": {
-        "ir-optimize-evm+yul": {
-            "bytecode_size": 132165,
-            "deployment_gas": 0,
-            "method_gas": 39289935,
-            "version": "bb90cd0"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 137869,
-            "deployment_gas": 0,
-            "method_gas": 38863224,
-            "version": "bb90cd0"
-        }
-    },
-    "colony": {
-        "ir-optimize-evm+yul": {
-            "bytecode_size": 363606,
-            "deployment_gas": null,
-            "method_gas": null,
-            "version": "573399b"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 363606,
-            "deployment_gas": null,
-            "method_gas": null,
-            "version": "573399b"
-        }
-    },
-    "elementfi": {
-        "legacy-no-optimize": {
-            "bytecode_size": 890560,
-            "deployment_gas": null,
-            "method_gas": null,
-            "version": "87f8b5e"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 536668,
-            "version": "87f8b5e"
-        },
-        "legacy-optimize-evm-only": {},
-        "ir-no-optimize": {
-            "bytecode_size": null,
-            "method_gas": 2777867251,
-            "version": "87f8b5e"
-        }
-    },
-    "euler": {
-        "ir-no-optimize": {
-            "bytecode_size": 323909,
-            "deployment_gas": 61591870,
-            "method_gas": 3452105184,
-            "version": "2ef99fc"
-        },
-        "legacy-no-optimize": {
-            "bytecode_size": 323909,
-            "deployment_gas": 61591870,
-            "method_gas": 3452105184,
-            "version": "c23e8bd"
-        },
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 182190,
-            "deployment_gas": 35236828,
-            "method_gas": 2777867251,
-            "version": "c23e8bd"
-        },
-        "legacy-optimize-evm-only": {
-            "bytecode_size": 202106,
-            "deployment_gas": 38790600,
-            "method_gas": 2907368790,
-            "version": "v1.2.3"
-        },
-        "ir-optimize-evm-only": {
-            "bytecode_size": 182190,
-            "deployment_gas": 35236828,
-            "method_gas": 2777867251
-        },
-        "ir-optimize-evm+yul": {
-            "bytecode_size": 182190,
-            "deployment_gas": 35236828,
-            "method_gas": 2777867251
-        }
-    },
-    "ens": {
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 156937,
-            "deployment_gas": 30073789,
-            "method_gas": 105365362,
-            "version": "v0.0.8"
-        }
-    },
-    "zeppelin": {
-        "legacy-optimize-evm+yul": {
-            "bytecode_size": 510428,
-            "deployment_gas": 94501114,
-            "version": "af7ec04"
-        }
-    }
-}
diff --git a/test/scripts/fixtures/unimplemented_feature_cli_output.txt b/test/scripts/fixtures/unimplemented_feature_cli_output.txt
deleted file mode 100644
index 2278b832d044..000000000000
--- a/test/scripts/fixtures/unimplemented_feature_cli_output.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Unimplemented feature:
-/solidity/libsolidity/codegen/CompilerUtils.cpp(771): Throw in function void solidity::frontend::CompilerUtils::convertType(const solidity::frontend::Type&, const solidity::frontend::Type&, bool, bool, bool)
-Dynamic exception type: boost::wrapexcept<solidity::langutil::UnimplementedFeatureError>
-std::exception::what: Not yet implemented - FixedPointType.
-[solidity::util::tag_comment*] = Not yet implemented - FixedPointType.
diff --git a/test/scripts/fixtures/unimplemented_feature_json_output.json b/test/scripts/fixtures/unimplemented_feature_json_output.json
deleted file mode 100644
index 0a1e9db27267..000000000000
--- a/test/scripts/fixtures/unimplemented_feature_json_output.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "contracts": {
-        "syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol": {
-            "test": {
-                "metadata": "{\"compiler\":{\"version\":\"0.8.0+commit.c7dfd78e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"f\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol\":\"test\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol\":{\"keccak256\":\"0x44b85b2db00441b574d40d11a6be684517d4312de0f6ef0550e02aea33e2a05f\",\"urls\":[\"bzz-raw://c7a9416a8634c5bd1451742f09d633acab37a6e0db1441d0bb7ea4e8f4af214b\",\"dweb:/ipfs/QmZNMQcZu9wnD6sFH2c7PymZReYeroBXDyKkJ5YEhWtCjc\"]}},\"version\":1}"
-            }
-        }
-    },
-    "errors": [
-        {
-            "component": "general",
-            "formattedMessage": "UnimplementedFeatureError: Not yet implemented - FixedPointType.\n\n",
-            "message": "Unimplemented feature (/solidity/libsolidity/codegen/CompilerUtils.cpp:771):Not yet implemented - FixedPointType.",
-            "severity": "error",
-            "type": "UnimplementedFeatureError"
-        }
-    ],
-    "sources": {
-        "syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol": {
-            "id": 0
-        }
-    }
-}
diff --git a/test/scripts/fixtures/unknown_pragma_sol_cli_output.txt b/test/scripts/fixtures/unknown_pragma_sol_cli_output.txt
deleted file mode 100644
index 3a4e8aba116d..000000000000
--- a/test/scripts/fixtures/unknown_pragma_sol_cli_output.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
---> syntaxTests/pragma/unknown_pragma.sol
-
-Error: Unknown pragma "thisdoesntexist"
---> syntaxTests/pragma/unknown_pragma.sol:1:1:
-|
-1 | pragma thisdoesntexist;
-| ^^^^^^^^^^^^^^^^^^^^^^^
-
-Warning: Source file does not specify required compiler version! Consider adding "pragma solidity ^0.8.0;"
---> syntaxTests/pragma/unknown_pragma.sol
diff --git a/test/scripts/fixtures/unknown_pragma_sol_json_output.json b/test/scripts/fixtures/unknown_pragma_sol_json_output.json
deleted file mode 100644
index 94d40398458c..000000000000
--- a/test/scripts/fixtures/unknown_pragma_sol_json_output.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "errors": [
-        {
-            "component": "general",
-            "errorCode": "1878",
-            "formattedMessage": "Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing \"SPDX-License-Identifier: <SPDX-License>\" to each source file. Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. Please see https://spdx.org for more information.\n--> syntaxTests/pragma/unknown_pragma.sol\n\n",
-            "message": "SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing \"SPDX-License-Identifier: <SPDX-License>\" to each source file. Use \"SPDX-License-Identifier: UNLICENSED\" for non-open-source code. Please see https://spdx.org for more information.",
-            "severity": "warning",
-            "sourceLocation": {
-                "end": -1,
-                "file": "syntaxTests/pragma/unknown_pragma.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        },
-        {
-            "component": "general",
-            "errorCode": "4936",
-            "formattedMessage": "SyntaxError: Unknown pragma \"thisdoesntexist\"\n --> syntaxTests/pragma/unknown_pragma.sol:1:1:\n  |\n1 | pragma thisdoesntexist;\n  | ^^^^^^^^^^^^^^^^^^^^^^^\n\n",
-            "message": "Unknown pragma \"thisdoesntexist\"",
-            "severity": "error",
-            "sourceLocation": {
-                "end": 23,
-                "file": "syntaxTests/pragma/unknown_pragma.sol",
-                "start": 0
-            },
-            "type": "SyntaxError"
-        },
-        {
-            "component": "general",
-            "errorCode": "3420",
-            "formattedMessage": "Warning: Source file does not specify required compiler version! Consider adding \"pragma solidity ^0.8.0;\"\n--> syntaxTests/pragma/unknown_pragma.sol\n\n",
-            "message": "Source file does not specify required compiler version! Consider adding \"pragma solidity ^0.8.0;\"",
-            "severity": "warning",
-            "sourceLocation": {
-                "end": -1,
-                "file": "syntaxTests/pragma/unknown_pragma.sol",
-                "start": -1
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/scripts/test_bytecodecompare_prepare_report.py b/test/scripts/test_bytecodecompare_prepare_report.py
deleted file mode 100644
index b8a1791d652c..000000000000
--- a/test/scripts/test_bytecodecompare_prepare_report.py
+++ /dev/null
@@ -1,665 +0,0 @@
-#!/usr/bin/env python
-
-import json
-import unittest
-from pathlib import Path
-from textwrap import dedent
-
-from unittest_helpers import FIXTURE_DIR, LIBSOLIDITY_TEST_DIR, load_fixture, load_libsolidity_test_case
-
-# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
-# pragma pylint: disable=import-error
-from bytecodecompare.prepare_report import CompilerInterface, FileReport, ContractReport, SettingsPreset, SMTUse, Statistics
-from bytecodecompare.prepare_report import load_source, parse_cli_output, parse_standard_json_output, prepare_compiler_input
-# pragma pylint: enable=import-error
-
-
-SMT_SMOKE_TEST_SOL_PATH = FIXTURE_DIR / 'smt_smoke_test.sol'
-SMT_SMOKE_TEST_SOL_CODE = load_fixture(SMT_SMOKE_TEST_SOL_PATH)
-
-SMT_CONTRACT_WITH_LF_NEWLINES_SOL_PATH = FIXTURE_DIR / 'smt_contract_with_lf_newlines.sol'
-SMT_CONTRACT_WITH_CRLF_NEWLINES_SOL_PATH = FIXTURE_DIR / 'smt_contract_with_crlf_newlines.sol'
-SMT_CONTRACT_WITH_CR_NEWLINES_SOL_PATH = FIXTURE_DIR / 'smt_contract_with_cr_newlines.sol'
-SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH = FIXTURE_DIR / 'smt_contract_with_mixed_newlines.sol'
-SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_CODE = load_fixture(SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH)
-
-SYNTAX_SMOKE_TEST_SOL_PATH = LIBSOLIDITY_TEST_DIR / 'syntaxTests/smoke_test.sol'
-SYNTAX_SMOKE_TEST_SOL_CODE = load_libsolidity_test_case(SYNTAX_SMOKE_TEST_SOL_PATH)
-
-LIBRARY_INHERITED2_SOL_JSON_OUTPUT = load_fixture('library_inherited2_sol_json_output.json')
-LIBRARY_INHERITED2_SOL_CLI_OUTPUT = load_fixture('library_inherited2_sol_cli_output.txt')
-
-UNKNOWN_PRAGMA_SOL_JSON_OUTPUT = load_fixture('unknown_pragma_sol_json_output.json')
-UNKNOWN_PRAGMA_SOL_CLI_OUTPUT = load_fixture('unknown_pragma_sol_cli_output.txt')
-
-UNIMPLEMENTED_FEATURE_JSON_OUTPUT = load_fixture('unimplemented_feature_json_output.json')
-UNIMPLEMENTED_FEATURE_CLI_OUTPUT = load_fixture('unimplemented_feature_cli_output.txt')
-
-STACK_TOO_DEEP_JSON_OUTPUT = load_fixture('stack_too_deep_json_output.json')
-STACK_TOO_DEEP_CLI_OUTPUT = load_fixture('stack_too_deep_cli_output.txt')
-
-CODE_GENERATION_ERROR_JSON_OUTPUT = load_fixture('code_generation_error_json_output.json')
-CODE_GENERATION_ERROR_CLI_OUTPUT = load_fixture('code_generation_error_cli_output.txt')
-
-SOLC_0_4_0_CLI_OUTPUT = load_fixture('solc_0.4.0_cli_output.txt')
-SOLC_0_4_8_CLI_OUTPUT = load_fixture('solc_0.4.8_cli_output.txt')
-
-
-class PrepareReportTestBase(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-
-class TestFileReport(PrepareReportTestBase):
-    def test_format_report(self):
-        report = FileReport(
-            file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-            contract_reports=[
-                ContractReport(
-                    contract_name='A',
-                    file_name=Path('syntaxTests/smoke_test.sol'),
-                    bytecode=None,
-                    metadata=None,
-                ),
-                ContractReport(
-                    contract_name='B',
-                    file_name=Path('syntaxTests/smoke_test.sol'),
-                    bytecode=None,
-                    metadata='{"language":"Solidity"}',
-                ),
-                ContractReport(
-                    contract_name='Lib',
-                    file_name=Path('syntaxTests/smoke_test.sol'),
-                    bytecode='60566050600b828282398051',
-                    metadata=None,
-                ),
-            ]
-        )
-
-        expected_output = (
-            "syntaxTests/scoping/library_inherited2.sol:A <NO BYTECODE>\n"
-            "syntaxTests/scoping/library_inherited2.sol:A <NO METADATA>\n"
-            "syntaxTests/scoping/library_inherited2.sol:B <NO BYTECODE>\n"
-            "syntaxTests/scoping/library_inherited2.sol:B {\"language\":\"Solidity\"}\n"
-            "syntaxTests/scoping/library_inherited2.sol:Lib 60566050600b828282398051\n"
-            "syntaxTests/scoping/library_inherited2.sol:Lib <NO METADATA>\n"
-        )
-
-        self.assertEqual(report.format_report(), expected_output)
-
-    def test_format_report_should_print_error_if_contract_report_list_is_missing(self):
-        report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        expected_output = "file.sol: <ERROR>\n"
-
-        self.assertEqual(report.format_report(), expected_output)
-
-    def test_format_report_should_not_print_anything_if_contract_report_list_is_empty(self):
-        report = FileReport(file_name=Path('file.sol'), contract_reports=[])
-
-        self.assertEqual(report.format_report(), '')
-
-class TestPrepareReport_Statistics(unittest.TestCase):
-    def test_initialization(self):
-        self.assertEqual(Statistics(), Statistics(0, 0, 0, 0, 0))
-
-    def test_aggregate_bytecode_and_metadata_present(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=[ContractReport('C', 'c.sol', 'B', 'M')]))
-        self.assertEqual(statistics, Statistics(1, 1, 0, 0, 0))
-
-    def test_aggregate_bytecode_missing(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=[ContractReport('C', 'c.sol', None, 'M')]))
-        self.assertEqual(statistics, Statistics(1, 1, 0, 1, 0))
-
-    def test_aggregate_metadata_missing(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=[ContractReport('C', 'c.sol', 'B', None)]))
-        self.assertEqual(statistics, Statistics(1, 1, 0, 0, 1))
-
-    def test_aggregate_no_contract_reports(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=[]))
-        self.assertEqual(statistics, Statistics(1, 0, 0, 0, 0))
-
-    def test_aggregate_missing_contract_report_list(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=None))
-        self.assertEqual(statistics, Statistics(1, 0, 1, 0, 0))
-
-    def test_aggregate_multiple_contract_reports(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=[
-            ContractReport('C', 'c.sol', 'B', 'M'),
-            ContractReport('C', 'c.sol', None, 'M'),
-            ContractReport('C', 'c.sol', 'B', None),
-            ContractReport('C', 'c.sol', None, None),
-        ]))
-        self.assertEqual(statistics, Statistics(1, 4, 0, 2, 2))
-
-    def test_str(self):
-        statistics = Statistics()
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=[
-            ContractReport('C', 'c.sol', 'B', 'M'),
-            ContractReport('C', 'c.sol', None, 'M'),
-            ContractReport('C', 'c.sol', 'B', None),
-            ContractReport('C', 'c.sol', None, None),
-        ]))
-        statistics.aggregate(FileReport(file_name=Path('F'), contract_reports=None))
-
-        self.assertEqual(statistics, Statistics(2, 4, 1, 2, 2))
-        self.assertEqual(str(statistics), "test cases: 2, contracts: 4+, errors: 1, missing bytecode: 2, missing metadata: 2")
-
-
-class TestLoadSource(PrepareReportTestBase):
-    def test_load_source_should_strip_smt_pragmas_if_requested(self):
-        expected_file_content = (
-            "\n"
-            "contract C {\n"
-            "}\n"
-        )
-
-        self.assertEqual(load_source(SMT_SMOKE_TEST_SOL_PATH, SMTUse.STRIP_PRAGMAS), expected_file_content)
-
-    def test_load_source_should_not_strip_smt_pragmas_if_not_requested(self):
-        self.assertEqual(load_source(SMT_SMOKE_TEST_SOL_PATH, SMTUse.DISABLE), SMT_SMOKE_TEST_SOL_CODE)
-        self.assertEqual(load_source(SMT_SMOKE_TEST_SOL_PATH, SMTUse.PRESERVE), SMT_SMOKE_TEST_SOL_CODE)
-
-    def test_load_source_preserves_lf_newlines(self):
-        expected_output = (
-            "\n"
-            "\n"
-            "contract C {\n"
-            "}\n"
-        )
-
-        self.assertEqual(load_source(SMT_CONTRACT_WITH_LF_NEWLINES_SOL_PATH, SMTUse.STRIP_PRAGMAS), expected_output)
-
-    def test_load_source_preserves_crlf_newlines(self):
-        expected_output = (
-            "\r\n"
-            "\r\n"
-            "contract C {\r\n"
-            "}\r\n"
-        )
-
-        self.assertEqual(load_source(SMT_CONTRACT_WITH_CRLF_NEWLINES_SOL_PATH, SMTUse.STRIP_PRAGMAS), expected_output)
-
-    def test_load_source_preserves_cr_newlines(self):
-        expected_output = (
-            "\r"
-            "\r"
-            "contract C {\r"
-            "}\r"
-        )
-
-        self.assertEqual(load_source(SMT_CONTRACT_WITH_CR_NEWLINES_SOL_PATH, SMTUse.STRIP_PRAGMAS), expected_output)
-
-    def test_load_source_preserves_mixed_newlines(self):
-        expected_output = (
-            "\n"
-            "\n"
-            "contract C {\r"
-            "}\r\n"
-        )
-
-        self.assertEqual(load_source(SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH, SMTUse.STRIP_PRAGMAS), expected_output)
-
-
-class TestPrepareCompilerInput(PrepareReportTestBase):
-    def test_prepare_compiler_input_should_work_with_standard_json_interface(self):
-        expected_compiler_input = {
-            'language': 'Solidity',
-            'sources': {
-                str(SMT_SMOKE_TEST_SOL_PATH): {'content': SMT_SMOKE_TEST_SOL_CODE},
-            },
-            'settings': {
-                'optimizer': {'enabled': True},
-                'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
-                'modelChecker': {'engine': 'none'},
-            }
-        }
-
-        (command_line, compiler_input) = prepare_compiler_input(
-            Path('solc'),
-            SMT_SMOKE_TEST_SOL_PATH,
-            preset=SettingsPreset.LEGACY_OPTIMIZE,
-            force_no_optimize_yul=False,
-            interface=CompilerInterface.STANDARD_JSON,
-            smt_use=SMTUse.DISABLE,
-            metadata_option_supported=True,
-        )
-
-        self.assertEqual(command_line, ['solc', '--standard-json'])
-        self.assertEqual(json.loads(compiler_input), expected_compiler_input)
-
-    def test_prepare_compiler_input_should_work_with_cli_interface(self):
-        (command_line, compiler_input) = prepare_compiler_input(
-            Path('solc'),
-            SMT_SMOKE_TEST_SOL_PATH,
-            preset=SettingsPreset.LEGACY_OPTIMIZE,
-            force_no_optimize_yul=False,
-            interface=CompilerInterface.CLI,
-            smt_use=SMTUse.DISABLE,
-            metadata_option_supported=True,
-        )
-
-        self.assertEqual(
-            command_line,
-            ['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--metadata', '--optimize', '--model-checker-engine', 'none']
-        )
-        self.assertEqual(compiler_input, SMT_SMOKE_TEST_SOL_CODE)
-
-    def test_prepare_compiler_input_for_json_preserves_newlines(self):
-        expected_compiler_input = {
-            'language': 'Solidity',
-            'sources': {
-                str(SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH): {
-                    'content':
-                        "pragma experimental SMTChecker;\n"
-                        "\n"
-                        "contract C {\r"
-                        "}\r\n"
-                },
-            },
-            'settings': {
-                'optimizer': {'enabled': True},
-                'viaIR': True,
-                'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
-                'modelChecker': {'engine': 'none'},
-            }
-        }
-
-        (command_line, compiler_input) = prepare_compiler_input(
-            Path('solc'),
-            SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
-            preset=SettingsPreset.VIA_IR_OPTIMIZE,
-            force_no_optimize_yul=False,
-            interface=CompilerInterface.STANDARD_JSON,
-            smt_use=SMTUse.DISABLE,
-            metadata_option_supported=True,
-        )
-
-        self.assertEqual(command_line, ['solc', '--standard-json'])
-        self.assertEqual(json.loads(compiler_input), expected_compiler_input)
-
-    def test_prepare_compiler_input_for_cli_preserves_newlines(self):
-        (_command_line, compiler_input) = prepare_compiler_input(
-            Path('solc'),
-            SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
-            preset=SettingsPreset.LEGACY_OPTIMIZE,
-            force_no_optimize_yul=True,
-            interface=CompilerInterface.CLI,
-            smt_use=SMTUse.DISABLE,
-            metadata_option_supported=True,
-        )
-
-        self.assertEqual(compiler_input, SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_CODE)
-
-    def test_prepare_compiler_input_for_cli_should_handle_force_no_optimize_yul_flag(self):
-        (command_line, compiler_input) = prepare_compiler_input(
-            Path('solc'),
-            SMT_SMOKE_TEST_SOL_PATH,
-            preset=SettingsPreset.LEGACY_NO_OPTIMIZE,
-            force_no_optimize_yul=True,
-            interface=CompilerInterface.CLI,
-            smt_use=SMTUse.DISABLE,
-            metadata_option_supported=True,
-        )
-
-        self.assertEqual(
-            command_line,
-            ['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--metadata', '--no-optimize-yul', '--model-checker-engine', 'none'],
-        )
-        self.assertEqual(compiler_input, SMT_SMOKE_TEST_SOL_CODE)
-
-    def test_prepare_compiler_input_for_cli_should_not_use_metadata_option_if_not_supported(self):
-        (command_line, compiler_input) = prepare_compiler_input(
-            Path('solc'),
-            SMT_SMOKE_TEST_SOL_PATH,
-            preset=SettingsPreset.VIA_IR_OPTIMIZE,
-            force_no_optimize_yul=False,
-            interface=CompilerInterface.CLI,
-            smt_use=SMTUse.PRESERVE,
-            metadata_option_supported=False,
-        )
-
-        self.assertEqual(
-            command_line,
-            ['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--optimize', '--via-ir'],
-        )
-        self.assertEqual(compiler_input, SMT_SMOKE_TEST_SOL_CODE)
-
-
-class TestParseStandardJSONOutput(PrepareReportTestBase):
-    def test_parse_standard_json_output(self):
-        expected_report = FileReport(
-            file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-            contract_reports=[
-                # pragma pylint: disable=line-too-long
-                ContractReport(
-                    contract_name='A',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122086e727f29d40b264a19bbfcad38d64493dca4bab5dbba8c82ffdaae389d2bba064736f6c63430008000033',
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"A"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                ContractReport(
-                    contract_name='B',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='608060405234801561001057600080fd5b506101cc806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630423a13214610030575b600080fd5b61004a6004803603810190610045919061009d565b610060565b60405161005791906100d5565b60405180910390f35b600061006b82610072565b9050919050565b6000602a8261008191906100f0565b9050919050565b6000813590506100978161017f565b92915050565b6000602082840312156100af57600080fd5b60006100bd84828501610088565b91505092915050565b6100cf81610146565b82525050565b60006020820190506100ea60008301846100c6565b92915050565b60006100fb82610146565b915061010683610146565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561013b5761013a610150565b5b828201905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b61018881610146565b811461019357600080fd5b5056fea2646970667358221220104c345633313efe410492448844d96d78452c3044ce126b5e041b7fbeaa790064736f6c63430008000033',
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"}],"name":"bar","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"B"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                ContractReport(
-                    contract_name='Lib',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207f9515e2263fa71a7984707e2aefd82241fac15c497386ca798b526f14f8ba6664736f6c63430008000033',
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"Lib"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                # pragma pylint: enable=line-too-long
-            ]
-        )
-
-        report = parse_standard_json_output(
-            Path('syntaxTests/scoping/library_inherited2.sol'),
-            LIBRARY_INHERITED2_SOL_JSON_OUTPUT,
-        )
-        self.assertEqual(report, expected_report)
-
-    def test_parse_standard_json_output_should_report_error_on_compiler_errors(self):
-        expected_report = FileReport(file_name=Path('syntaxTests/pragma/unknown_pragma.sol'), contract_reports=None)
-
-        report = parse_standard_json_output(Path('syntaxTests/pragma/unknown_pragma.sol'), UNKNOWN_PRAGMA_SOL_JSON_OUTPUT)
-        self.assertEqual(report, expected_report)
-
-    def test_parse_standard_json_output_should_report_error_on_empty_json(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_standard_json_output(Path('file.sol'), '{}'), expected_report)
-
-    def test_parse_standard_json_output_should_report_error_if_contracts_is_empty(self):
-        compiler_output = '{"contracts": {}}'
-
-        expected_report = FileReport(file_name=Path('contract.sol'), contract_reports=None)
-
-        self.assertEqual(parse_standard_json_output(Path('contract.sol'), compiler_output), expected_report)
-
-    def test_parse_standard_json_output_should_report_error_if_every_file_has_no_contracts(self):
-        compiler_output = (
-            "{\n"
-            "    \"contracts\": {\n"
-            "        \"contract1.sol\": {},\n"
-            "        \"contract2.sol\": {}\n"
-            "    }\n"
-            "}\n"
-        )
-
-        expected_report = FileReport(file_name=Path('contract.sol'), contract_reports=None)
-
-        self.assertEqual(parse_standard_json_output(Path('contract.sol'), compiler_output), expected_report)
-
-    def test_parse_standard_json_output_should_not_report_error_if_there_is_at_least_one_file_with_contracts(self):
-        compiler_output = (
-            "{\n"
-            "    \"contracts\": {\n"
-            "        \"contract1.sol\": {\"A\": {}},\n"
-            "        \"contract2.sol\": {}\n"
-            "    }\n"
-            "}\n"
-        )
-
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[ContractReport(contract_name='A', file_name=Path('contract1.sol'), bytecode=None, metadata=None)]
-        )
-
-        self.assertEqual(parse_standard_json_output(Path('contract.sol'), compiler_output), expected_report)
-
-    def test_parse_standard_json_output_should_report_error_on_unimplemented_feature_error(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_standard_json_output(Path('file.sol'), UNIMPLEMENTED_FEATURE_JSON_OUTPUT), expected_report)
-
-    def test_parse_standard_json_output_should_report_error_on_stack_too_deep_error(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_standard_json_output(Path('file.sol'), STACK_TOO_DEEP_JSON_OUTPUT), expected_report)
-
-    def test_parse_standard_json_output_should_report_error_on_code_generation_error(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_standard_json_output(Path('file.sol'), CODE_GENERATION_ERROR_JSON_OUTPUT), expected_report)
-
-
-class TestParseCLIOutput(PrepareReportTestBase):
-    def test_parse_standard_json_output_should_report_missing_if_value_is_just_whitespace(self):
-        compiler_output = dedent("""\
-            {
-                "contracts": {
-                    "contract.sol": {
-                        "A": {
-                            "evm": {"bytecode": {"object": ""}},
-                            "metadata": ""
-                        },
-                        "B": {
-                            "evm": {"bytecode": {"object": "  "}},
-                            "metadata": "  "
-                        }
-                    }
-                }
-            }
-        """)
-
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[
-                ContractReport(contract_name='A', file_name=Path('contract.sol'), bytecode=None, metadata=None),
-                ContractReport(contract_name='B', file_name=Path('contract.sol'), bytecode=None, metadata=None),
-            ]
-        )
-
-        self.assertEqual(parse_standard_json_output(Path('contract.sol'), compiler_output), expected_report)
-
-    def test_parse_cli_output(self):
-        expected_report = FileReport(
-            file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-            contract_reports=[
-                # pragma pylint: disable=line-too-long
-                ContractReport(
-                    contract_name='A',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122086e727f29d40b264a19bbfcad38d64493dca4bab5dbba8c82ffdaae389d2bba064736f6c63430008000033',
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"A"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                ContractReport(
-                    contract_name='B',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='608060405234801561001057600080fd5b506101cc806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630423a13214610030575b600080fd5b61004a6004803603810190610045919061009d565b610060565b60405161005791906100d5565b60405180910390f35b600061006b82610072565b9050919050565b6000602a8261008191906100f0565b9050919050565b6000813590506100978161017f565b92915050565b6000602082840312156100af57600080fd5b60006100bd84828501610088565b91505092915050565b6100cf81610146565b82525050565b60006020820190506100ea60008301846100c6565b92915050565b60006100fb82610146565b915061010683610146565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561013b5761013a610150565b5b828201905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b61018881610146565b811461019357600080fd5b5056fea2646970667358221220104c345633313efe410492448844d96d78452c3044ce126b5e041b7fbeaa790064736f6c63430008000033',
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"}],"name":"bar","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"B"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                ContractReport(
-                    contract_name='Lib',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207f9515e2263fa71a7984707e2aefd82241fac15c497386ca798b526f14f8ba6664736f6c63430008000033',
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"Lib"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                # pragma pylint: enable=line-too-long
-            ]
-        )
-
-        report = parse_cli_output(Path('syntaxTests/scoping/library_inherited2.sol'), LIBRARY_INHERITED2_SOL_CLI_OUTPUT)
-        self.assertEqual(report, expected_report)
-
-    def test_parse_cli_output_should_report_error_on_compiler_errors(self):
-        expected_report = FileReport(file_name=Path('syntaxTests/pragma/unknown_pragma.sol'), contract_reports=None)
-
-        report = parse_cli_output(Path('syntaxTests/pragma/unknown_pragma.sol'), UNKNOWN_PRAGMA_SOL_CLI_OUTPUT)
-        self.assertEqual(report, expected_report)
-
-    def test_parse_cli_output_should_report_error_on_empty_output(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_cli_output(Path('file.sol'), ''), expected_report)
-
-    def test_parse_cli_output_should_report_missing_bytecode_and_metadata(self):
-        compiler_output = dedent("""\
-            ======= syntaxTests/scoping/library_inherited2.sol:A =======
-            ======= syntaxTests/scoping/library_inherited2.sol:B =======
-            608060405234801561001057600080fd5b506101cc806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630423a13214610030575b600080fd5b61004a6004803603810190610045919061009d565b610060565b60405161005791906100d5565b60405180910390f35b600061006b82610072565b9050919050565b6000602a8261008191906100f0565b9050919050565b6000813590506100978161017f565b92915050565b6000602082840312156100af57600080fd5b60006100bd84828501610088565b91505092915050565b6100cf81610146565b82525050565b60006020820190506100ea60008301846100c6565b92915050565b60006100fb82610146565b915061010683610146565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561013b5761013a610150565b5b828201905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b61018881610146565b811461019357600080fd5b5056fea2646970667358221220104c345633313efe410492448844d96d78452c3044ce126b5e041b7fbeaa790064736f6c63430008000033
-            Metadata:
-            {"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"}],"name":"bar","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"B"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}
-
-            ======= syntaxTests/scoping/library_inherited2.sol:Lib =======
-            Binary:
-            60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207f9515e2263fa71a7984707e2aefd82241fac15c497386ca798b526f14f8ba6664736f6c63430008000033
-            Metadata:
-        """)
-
-        expected_report = FileReport(
-            file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-            contract_reports=[
-                ContractReport(
-                    contract_name='A',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode=None,
-                    metadata=None,
-                ),
-                # pragma pylint: disable=line-too-long
-                ContractReport(
-                    contract_name='B',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode=None,
-                    metadata='{"compiler":{"version":"0.8.0+commit.c7dfd78e"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"}],"name":"bar","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"syntaxTests/scoping/library_inherited2.sol":"B"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"syntaxTests/scoping/library_inherited2.sol":{"keccak256":"0xd0619f00638fdfea187368965615dbd599fead93dd14b6558725e85ec7011d96","urls":["bzz-raw://ec7af066be66a223f0d25ba3bf9ba6dc103e1a57531a66a38a5ca2b6ce172f55","dweb:/ipfs/QmW1NrqQNhnY1Tkgr3Z9oM8buCGLUJCJVCDTVejJTT5Vet"]}},"version":1}',
-                ),
-                ContractReport(
-                    contract_name='Lib',
-                    file_name=Path('syntaxTests/scoping/library_inherited2.sol'),
-                    bytecode='60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207f9515e2263fa71a7984707e2aefd82241fac15c497386ca798b526f14f8ba6664736f6c63430008000033',
-                    metadata=None,
-                ),
-                # pragma pylint: enable=line-too-long
-            ]
-        )
-
-        self.assertEqual(parse_cli_output(Path('syntaxTests/scoping/library_inherited2.sol'), compiler_output), expected_report)
-
-    def test_parse_cli_output_should_report_error_on_unimplemented_feature_error(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_cli_output(Path('file.sol'), UNIMPLEMENTED_FEATURE_CLI_OUTPUT), expected_report)
-
-    def test_parse_cli_output_should_report_error_on_stack_too_deep_error(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_cli_output(Path('file.sol'), STACK_TOO_DEEP_CLI_OUTPUT), expected_report)
-
-    def test_parse_cli_output_should_report_error_on_code_generation_error(self):
-        expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
-
-        self.assertEqual(parse_cli_output(Path('file.sol'), CODE_GENERATION_ERROR_CLI_OUTPUT), expected_report)
-
-    def test_parse_cli_output_should_handle_output_from_solc_0_4_0(self):
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[
-                ContractReport(
-                    contract_name='C',
-                    file_name=None,
-                    bytecode='6060604052600c8060106000396000f360606040526008565b600256',
-                    metadata=None,
-                )
-            ]
-        )
-
-        self.assertEqual(parse_cli_output(Path('contract.sol'), SOLC_0_4_0_CLI_OUTPUT), expected_report)
-
-    def test_parse_cli_output_should_handle_output_from_solc_0_4_8(self):
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[
-                # pragma pylint: disable=line-too-long
-                ContractReport(
-                    contract_name='C',
-                    file_name=None,
-                    bytecode='6060604052346000575b60358060166000396000f30060606040525b60005600a165627a7a72305820ccf9337430b4c4f7d6ad41efb10a94411a2af6a9f173ef52daeadd31f4bf11890029',
-                    metadata='{"compiler":{"version":"0.4.8+commit.60cc1668.mod.Darwin.appleclang"},"language":"Solidity","output":{"abi":[],"devdoc":{"methods":{}},"userdoc":{"methods":{}}},"settings":{"compilationTarget":{"contract.sol":"C"},"libraries":{},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"contract.sol":{"keccak256":"0xbe86d3681a198587296ad6d4a834606197e1a8f8944922c501631b04e21eeba2","urls":["bzzr://af16957d3d86013309d64d3cc572d007b1d8b08a821f2ff366840deb54a78524"]}},"version":1}',
-                )
-                # pragma pylint: enable=line-too-long
-            ]
-        )
-
-        self.assertEqual(parse_cli_output(Path('contract.sol'), SOLC_0_4_8_CLI_OUTPUT), expected_report)
-
-    def test_parse_cli_output_should_handle_leading_and_trailing_spaces(self):
-        compiler_output = (
-            ' =======  contract.sol : C  ======= \n'
-            ' Binary: \n'
-            ' 60806040523480156 \n'
-            ' Metadata: \n'
-            ' {  } \n'
-        )
-
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[
-                ContractReport(contract_name='C', file_name=Path('contract.sol'), bytecode='60806040523480156', metadata='{  }')
-            ]
-        )
-
-        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output), expected_report)
-
-    def test_parse_cli_output_should_handle_empty_bytecode_and_metadata_lines(self):
-        compiler_output = dedent("""\
-            ======= contract.sol:C =======
-            Binary:
-            60806040523480156
-            Metadata:
-
-
-            ======= contract.sol:D =======
-            Binary:
-
-            Metadata:
-            {}
-
-
-            ======= contract.sol:E =======
-            Binary:
-
-            Metadata:
-
-
-        """)
-
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[
-                ContractReport(contract_name='C', file_name=Path('contract.sol'), bytecode='60806040523480156', metadata=None),
-                ContractReport(contract_name='D', file_name=Path('contract.sol'), bytecode=None, metadata='{}'),
-                ContractReport(contract_name='E', file_name=Path('contract.sol'), bytecode=None, metadata=None),
-            ]
-        )
-
-        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output), expected_report)
-
-    def test_parse_cli_output_should_handle_link_references_in_bytecode(self):
-        compiler_output = dedent("""\
-            ======= contract.sol:C =======
-            Binary:
-            73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__5050
-            ======= contract.sol:D =======
-            Binary:
-            __$fb58009a6b1ecea3b9d99bedd645df4ec3$__
-        """)
-
-        # pragma pylint: disable=line-too-long
-        expected_report = FileReport(
-            file_name=Path('contract.sol'),
-            contract_reports=[
-                ContractReport(contract_name='C', file_name=Path('contract.sol'), bytecode='73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__5050', metadata=None),
-                ContractReport(contract_name='D', file_name=Path('contract.sol'), bytecode='__$fb58009a6b1ecea3b9d99bedd645df4ec3$__', metadata=None),
-            ]
-        )
-        # pragma pylint: enable=line-too-long
-
-        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output), expected_report)
diff --git a/test/scripts/test_externalTests_benchmark_diff.py b/test/scripts/test_externalTests_benchmark_diff.py
deleted file mode 100644
index b40db8e63384..000000000000
--- a/test/scripts/test_externalTests_benchmark_diff.py
+++ /dev/null
@@ -1,508 +0,0 @@
-#!/usr/bin/env python3
-
-from textwrap import dedent
-import json
-import unittest
-
-from unittest_helpers import FIXTURE_DIR, load_fixture
-
-# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
-# pragma pylint: disable=import-error
-from externalTests.benchmark_diff import BenchmarkDiffer, DifferenceStyle, DiffTableSet, DiffTableFormatter, OutputFormat
-# pragma pylint: enable=import-error
-
-SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH = FIXTURE_DIR / 'summarized-benchmarks-develop.json'
-SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH = FIXTURE_DIR / 'summarized-benchmarks-branch.json'
-
-SUMMARIZED_DIFF_HUMANIZED_MD_PATH = FIXTURE_DIR / 'summarized-benchmark-diff-develop-branch-humanized.md'
-SUMMARIZED_DIFF_HUMANIZED_MD = load_fixture(SUMMARIZED_DIFF_HUMANIZED_MD_PATH)
-
-
-class TestBenchmarkDiff(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-    def test_benchmark_diff(self):
-        report_before = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH))
-        report_after = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH))
-        expected_diff = {
-            "bleeps": {
-                "ir-optimize-evm+yul": {
-                    # Numerical difference -> negative/positive/zero.
-                    # Zeros are not skipped to differentiate them from missing values.
-                    "bytecode_size": 132868 - 132165,
-                    "deployment_gas": 0,
-                    "method_gas": 39289198 - 39289935,
-                },
-                "legacy-optimize-evm+yul": {
-                    # No differences within preset -> zeros still present.
-                    "bytecode_size": 0,
-                    "deployment_gas": 0,
-                    "method_gas": 0,
-                },
-            },
-            "colony": {
-                # Preset missing on one side -> replace dict with string
-                "ir-optimize-evm+yul": "!A",
-                "legacy-no-optimize": "!B",
-                "legacy-optimize-evm+yul": {
-                    "bytecode_size": 0,
-                    # Attribute missing on both sides -> skip
-                    #"deployment_gas":
-                    #"method_gas":
-                },
-            },
-            "elementfi": {
-                "legacy-no-optimize": {
-                    # Attributes null on one side -> replace value with string
-                    "bytecode_size": "!A",
-                    "deployment_gas": "!B",
-                    # Attribute null on both sides -> skip
-                    #"method_gas":
-                },
-                "legacy-optimize-evm+yul": {
-                    # Attributes missing on one side -> replace value with string
-                    "bytecode_size": "!A",
-                    "deployment_gas": "!B",
-                    # Attribute missing on both sides -> skip
-                    #"method_gas":
-                },
-                "ir-no-optimize": {
-                    # Attributes missing on one side, null on the other -> skip
-                    #"bytecode_size":
-                    #"deployment_gas":
-                    "method_gas": 0,
-                },
-                # Empty preset missing on one side -> replace dict with string
-                "legacy-optimize-evm-only": "!A",
-                "ir-optimize-evm-only": "!B",
-            },
-            "euler": {
-                # Matching versions -> show attributes, skip version
-                "ir-no-optimize": {
-                    "bytecode_size": 328540 - 323909,
-                    "deployment_gas": 0,
-                    "method_gas": 3537419168 - 3452105184,
-                },
-                # Different versions, different values -> replace whole preset with string
-                "legacy-no-optimize": "!V",
-                # Different versions, same values -> replace whole preset with string
-                "legacy-optimize-evm+yul": "!V",
-                # Different versions (not a commit hash), different values -> replace whole preset with string
-                "legacy-optimize-evm-only": "!V",
-                # Version missing on one side -> replace whole preset with string
-                "ir-optimize-evm-only": "!V",
-                # Version missing on both sides -> assume same version
-                "ir-optimize-evm+yul": {
-                    "bytecode_size": 205211 - 182190,
-                    "deployment_gas": 39459629 - 35236828,
-                    "method_gas": 0,
-                },
-            },
-            "zeppelin": {
-                "legacy-optimize-evm+yul": {
-                    # Whole project identical -> attributes still present, with zeros
-                    "bytecode_size": 0,
-                    "deployment_gas": 0,
-                    # Field missing on both sides -> skip
-                    #"method_gas":
-                }
-            },
-            # Empty project missing on one side -> replace its dict with a string
-            "gnosis": "!B",
-            "ens": "!A",
-        }
-        differ = BenchmarkDiffer(DifferenceStyle.ABSOLUTE, None, OutputFormat.JSON)
-        self.assertEqual(differ.run(report_before, report_after), expected_diff)
-
-
-class TestBenchmarkDiffer(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-    @staticmethod
-    def _nest(value, levels):
-        nested_value = value
-        for level in levels:
-            nested_value = {level: nested_value}
-
-        return nested_value
-
-    def _assert_single_value_diff_matches(self, differ, cases, nest_result=True, nestings=None):
-        if nestings is None:
-            nestings = [[], ['p'], ['p', 's'], ['p', 's', 'a']]
-
-        for levels in nestings:
-            for (before, after, expected_diff) in cases:
-                self.assertEqual(
-                    differ.run(self._nest(before, levels), self._nest(after, levels)),
-                    self._nest(expected_diff, levels) if nest_result else expected_diff,
-                    f'Wrong diff for {self._nest(before, levels)} vs {self._nest(after, levels)}'
-                )
-
-    def test_empty(self):
-        for style in DifferenceStyle:
-            differ = BenchmarkDiffer(style, None, OutputFormat.JSON)
-            self._assert_single_value_diff_matches(differ, [({}, {}, {})], nest_result=False)
-
-    def test_null(self):
-        for style in DifferenceStyle:
-            differ = BenchmarkDiffer(style, None, OutputFormat.JSON)
-            self._assert_single_value_diff_matches(differ, [(None, None, {})], nest_result=False)
-
-    def test_number_diff_absolute_json(self):
-        for output_format in OutputFormat:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(DifferenceStyle.ABSOLUTE, 4, output_format),
-                [
-                    (2,   2,    0),
-                    (2,   5,    3),
-                    (5,   2,   -3),
-                    (2.0, 2.0,  0),
-                    (2,   2.0,  0),
-                    (2.0, 2,    0),
-                    (2,   2.5,  2.5 - 2),
-                    (2.5, 2,    2 - 2.5),
-
-                    (0,   0,    0),
-                    (0,   2,    2),
-                    (0,   -2,  -2),
-
-                    (-3, -1,    2),
-                    (-1, -3,   -2),
-                    (2,   0,   -2),
-                    (-2,  0,    2),
-
-                    (1.00006, 1,  1 - 1.00006),
-                    (1, 1.00006,  1.00006 - 1),
-                    (1.00004, 1, 1 - 1.00004),
-                    (1, 1.00004, 1.00004 - 1),
-                ],
-            )
-
-    def test_number_diff_json(self):
-        for output_format in OutputFormat:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(DifferenceStyle.RELATIVE, 4, output_format),
-                [
-                    (2,   2,   0),
-                    (2,   5,   (5 - 2) / 2),
-                    (5,   2,   (2 - 5) / 5),
-                    (2.0, 2.0, 0),
-                    (2,   2.0, 0),
-                    (2.0, 2,   0),
-                    (2,   2.5, (2.5 - 2) / 2),
-                    (2.5, 2,   (2 - 2.5) / 2.5),
-
-                    (0,   0,   0),
-                    (0,   2,   '+INF'),
-                    (0,   -2,  '-INF'),
-
-                    (-3, -1,   0.6667),
-                    (-1, -3,  -2),
-                    (2,   0,  -1),
-                    (-2,  0,   1),
-
-                    (1.00006, 1,   -0.0001),
-                    (1, 1.00006,    0.0001),
-                    (1.000004, 1, '-0'),
-                    (1, 1.000004, '+0'),
-                ],
-            )
-
-    def test_number_diff_humanized_json_and_console(self):
-        for output_format in [OutputFormat.JSON, OutputFormat.CONSOLE]:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, output_format),
-                [
-                    (2,   2,      '0%'),
-                    (2,   5,   '+150%'),
-                    (5,   2,    '-60%'),
-                    (2.0, 2.0,    '0%'),
-                    (2,   2.0,    '0%'),
-                    (2.0, 2,      '0%'),
-                    (2,   2.5,  '+25%'),
-                    (2.5, 2,    '-20%'),
-
-                    (0,   0,      '0%'),
-                    (0,   2,   '+INF%'),
-                    (0,   -2,  '-INF%'),
-
-                    (-3, -1, '+66.67%'),
-                    (-1, -3,   '-200%'),
-                    (2,   0,   '-100%'),
-                    (-2,  0,   '+100%'),
-
-                    (1.00006, 1,  '-0.01%'),
-                    (1, 1.00006,  '+0.01%'),
-                    (1.000004, 1,    '-0%'),
-                    (1, 1.000004,    '+0%'),
-                ],
-            )
-
-    def test_number_diff_humanized_markdown(self):
-        self._assert_single_value_diff_matches(
-            BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, OutputFormat.MARKDOWN),
-            [
-                (2,   2,             '`0%`'),
-                (2,   5,   '**`+150% �`**'),
-                (5,   2,    '**`-60% ✅`**'),
-                (2.0, 2.0,           '`0%`'),
-                (2,   2.0,           '`0%`'),
-                (2.0, 2,             '`0%`'),
-                (2,   2.5,  '**`+25% �`**'),
-                (2.5, 2,    '**`-20% ✅`**'),
-
-                (0,   0,             '`0%`'),
-                (0,   2,          '`+INF%`'),
-                (0,   -2,         '`-INF%`'),
-
-                (-3, -1, '**`+66.67% �`**'),
-                (-1, -3,   '**`-200% ✅`**'),
-                (2,   0,   '**`-100% ✅`**'),
-                (-2,  0,   '**`+100% �`**'),
-
-                (1.00006, 1,  '**`-0.01% ✅`**'),
-                (1, 1.00006,  '**`+0.01% �`**'),
-                (1.000004, 1,           '`-0%`'),
-                (1, 1.000004,           '`+0%`'),
-            ],
-        )
-
-    def test_type_mismatch(self):
-        for style in DifferenceStyle:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, 4, OutputFormat.JSON),
-                [
-                    (1, {}, '!T'),
-                    ({}, 1, '!T'),
-                    (1.5, {}, '!T'),
-                    ({}, 1.5, '!T'),
-                    ('1', {}, '!T'),
-                    ({}, '1', '!T'),
-                    (1, '1', '!T'),
-                    ('1', 1, '!T'),
-                    (1.5, '1', '!T'),
-                    ('1', 1.5, '!T'),
-                    ('1', '1', '!T'),
-                ],
-            )
-
-    def test_version_mismatch(self):
-        for style in DifferenceStyle:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, 4, OutputFormat.JSON),
-                [
-                    ({'a': 123, 'version': 1}, {'a': 123, 'version': 2}, '!V'),
-                    ({'a': 123, 'version': 2}, {'a': 123, 'version': 1}, '!V'),
-                    ({'a': 123, 'version': 'a'}, {'a': 123, 'version': 'b'}, '!V'),
-                    ({'a': 123, 'version': 'a'}, {'a': 123, 'version': 1}, '!V'),
-
-                    ({'a': 'a', 'version': 1}, {'a': 'a', 'version': 2}, '!V'),
-                    ({'a': {}, 'version': 1}, {'a': {}, 'version': 2}, '!V'),
-                    ({'s': {'a': 1}, 'version': 1}, {'s': {'a': 1}, 'version': 2}, '!V'),
-
-                    ({'a': 123, 'version': 1}, {'a': 456, 'version': 2}, '!V'),
-                    ({'a': 'a', 'version': 1}, {'a': 'b', 'version': 2}, '!V'),
-                    ({'s': {'a': 1}, 'version': 1}, {'s': {'a': 2}, 'version': 2}, '!V'),
-                ],
-            )
-
-    def test_missing(self):
-        for style in DifferenceStyle:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, None, OutputFormat.JSON),
-                [
-                    (1, None, '!A'),
-                    (None, 1, '!B'),
-                    ('1', None, '!A'),
-                    (None, '1', '!B'),
-                    ({}, None, '!A'),
-                    (None, {}, '!B'),
-
-                    ({'x': 1}, {}, {'x': '!A'}),
-                    ({}, {'x': 1}, {'x': '!B'}),
-                    ({'x': 1}, {'x': None}, {'x': '!A'}),
-                    ({'x': None}, {'x': 1}, {'x': '!B'}),
-                    ({'x': 1}, {'y': 1}, {'x': '!A', 'y': '!B'}),
-
-                    ({'x': {}}, {}, {'x': '!A'}),
-                    ({}, {'x': {}}, {'x': '!B'}),
-                    ({'p': {'x': {}}}, {}, {'p': '!A'}),
-                    ({}, {'p': {'x': {}}}, {'p': '!B'}),
-                ],
-            )
-
-    def test_missing_vs_null(self):
-        for style in DifferenceStyle:
-            self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, None, OutputFormat.JSON),
-                [
-                    ({'a': None}, {}, {}),
-                    ({}, {'a': None}, {}),
-                ],
-                nest_result=False,
-            )
-
-
-class TestDiffTableFormatter(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-        self.report_before = {
-            'project A': {
-                'preset X': {'A1':  99, 'A2': 50, 'version': 1},
-                'preset Y': {'A1':   0, 'A2': 50, 'version': 1},
-            },
-            'project B': {
-                'preset X': {           'A2': 50},
-                'preset Y': {'A1':   0},
-            },
-            'project C': {
-                'preset X': {'A1':   0, 'A2': 50, 'version': 1},
-            },
-            'project D': {
-                'preset X': {'A1': 999},
-            },
-        }
-        self.report_after = {
-            'project A': {
-                'preset X': {'A1': 100, 'A2':  50, 'version': 1},
-                'preset Y': {'A1': 500, 'A2': 500, 'version': 2},
-            },
-            'project B': {
-                'preset X': {'A1':   0},
-                'preset Y': {           'A2': 50},
-            },
-            'project C': {
-                'preset Y': {'A1':   0, 'A2': 50, 'version': 1},
-            },
-            'project E': {
-                'preset Y': {           'A2': 999},
-            },
-        }
-
-    def test_diff_table_formatter(self):
-        report_before = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH))
-        report_after = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH))
-        differ = BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, OutputFormat.MARKDOWN)
-        diff = differ.run(report_before, report_after)
-
-        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.MARKDOWN), SUMMARIZED_DIFF_HUMANIZED_MD)
-
-    def test_diff_table_formatter_json_absolute(self):
-        differ = BenchmarkDiffer(DifferenceStyle.ABSOLUTE, 4, OutputFormat.JSON)
-        diff = differ.run(self.report_before, self.report_after)
-
-        expected_formatted_table = dedent("""\
-            {
-                "preset X": {
-                    "project A": {
-                        "A1": 1,
-                        "A2": 0
-                    },
-                    "project B": {
-                        "A1": "!B",
-                        "A2": "!A"
-                    },
-                    "project C": {
-                        "A1": "!A",
-                        "A2": "!A"
-                    },
-                    "project D": {
-                        "A1": "!A",
-                        "A2": "!A"
-                    },
-                    "project E": {
-                        "A1": "!B",
-                        "A2": "!B"
-                    }
-                },
-                "preset Y": {
-                    "project A": {
-                        "A1": "!V",
-                        "A2": "!V"
-                    },
-                    "project B": {
-                        "A1": "!A",
-                        "A2": "!B"
-                    },
-                    "project C": {
-                        "A1": "!B",
-                        "A2": "!B"
-                    },
-                    "project D": {
-                        "A1": "!A",
-                        "A2": "!A"
-                    },
-                    "project E": {
-                        "A1": "!B",
-                        "A2": "!B"
-                    }
-                }
-            }"""
-        )
-        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.JSON), expected_formatted_table)
-
-    def test_diff_table_formatter_console_relative(self):
-        differ = BenchmarkDiffer(DifferenceStyle.RELATIVE, 4, OutputFormat.CONSOLE)
-        diff = differ.run(self.report_before, self.report_after)
-
-        expected_formatted_table = dedent("""
-            PRESET X
-            |-----------|--------|----|
-            |   project |     A1 | A2 |
-            |-----------|--------|----|
-            | project A | 0.0101 |  0 |
-            | project B |     !B | !A |
-            | project C |     !A | !A |
-            | project D |     !A | !A |
-            | project E |     !B | !B |
-            |-----------|--------|----|
-
-            PRESET Y
-            |-----------|----|----|
-            |   project | A1 | A2 |
-            |-----------|----|----|
-            | project A | !V | !V |
-            | project B | !A | !B |
-            | project C | !B | !B |
-            | project D | !A | !A |
-            | project E | !B | !B |
-            |-----------|----|----|
-        """)
-        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.CONSOLE), expected_formatted_table)
-
-    def test_diff_table_formatter_markdown_humanized(self):
-        differ = BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, OutputFormat.MARKDOWN)
-        diff = differ.run(self.report_before, self.report_after)
-
-        expected_formatted_table = dedent("""
-            ### `preset X`
-            |   project |             A1 |   A2 |
-            |:---------:|---------------:|-----:|
-            | project A | **`+1.01% �`** | `0%` |
-            | project B |           `!B` | `!A` |
-            | project C |           `!A` | `!A` |
-            | project D |           `!A` | `!A` |
-            | project E |           `!B` | `!B` |
-
-            ### `preset Y`
-            |   project |   A1 |   A2 |
-            |:---------:|-----:|-----:|
-            | project A | `!V` | `!V` |
-            | project B | `!A` | `!B` |
-            | project C | `!B` | `!B` |
-            | project D | `!A` | `!A` |
-            | project E | `!B` | `!B` |
-
-
-            `!V` = version mismatch
-            `!B` = no value in the "before" version
-            `!A` = no value in the "after" version
-            `!T` = one or both values were not numeric and could not be compared
-            `-0` = very small negative value rounded to zero
-            `+0` = very small positive value rounded to zero
-
-        """)
-        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.MARKDOWN), expected_formatted_table)
diff --git a/test/scripts/test_externalTests_benchmark_downloader.py b/test/scripts/test_externalTests_benchmark_downloader.py
deleted file mode 100644
index aead618470c5..000000000000
--- a/test/scripts/test_externalTests_benchmark_downloader.py
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/usr/bin/env python3
-
-from pathlib import Path
-from unittest import TestCase
-from unittest.mock import call, Mock, patch
-
-# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
-# pragma pylint: disable=import-error
-from externalTests.download_benchmarks import download_benchmarks
-# pragma pylint: enable=import-error
-
-
-def _git_run_command_mock(command):
-    if command == ['git', 'symbolic-ref', 'HEAD', '--short']:
-        return 'benchmark-downloader'
-
-    if len(command) == 4 and command[:3] == ['git', 'rev-parse', '--verify']:
-        ref = command[3]
-        if ref == 'HEAD':
-            ref = 'benchmark-downloader'
-
-        if ref == 'benchmark-downloader':
-            return 'fa1ddc6f412100d531f6d3a77008c73b474692d6'
-
-        if ref == 'develop':
-            return '43f29c00da02e19ff10d43f7eb6955d627c57728'
-
-    raise RuntimeError(
-        "The test tried to run an unexpected git command.\n"
-        f"command: {command}\n"
-        "If you have updated the code, please remember to add matching command fixtures above."
-    )
-
-def _requests_get_mock(url, params, timeout):
-    response_mock = Mock()
-
-    if url == 'https://api.github.com/repos/ethereum/solidity/pulls/12818':
-        response_mock.json.return_value = {
-            "head": {
-                "ref": "benchmark-downloader",
-                "sha": "fa1ddc6f412100d531f6d3a77008c73b474692d6",
-            },
-            "base": {
-                "ref": "develop",
-                "sha": "43f29c00da02e19ff10d43f7eb6955d627c57728",
-            },
-        }
-        return response_mock
-
-    if (
-        url == 'https://circleci.com/api/v2/project/gh/ethereum/solidity/pipeline' and
-        params.get('branch') == 'develop'
-    ):
-        response_mock.json.return_value = {
-            "next_page_token": None,
-            "items": [
-                {
-                    "id": "3b15a41f-6933-4a35-9823-08ebb1ff9336",
-                    "created_at": "2022-03-23T00:10:31.659Z",
-                    "trigger": {"type": "schedule"},
-                    "vcs": {
-                        "revision": "43f29c00da02e19ff10d43f7eb6955d627c57728",
-                        "branch": "develop"
-                    },
-                },
-                {
-                    "id": "f9036a2d-be2b-4315-bd57-4d35b87502d2",
-                    "created_at": "2022-03-22T00:10:30.304Z",
-                    "trigger": {"type": "webhook"},
-                    "vcs": {
-                        "revision": "43f29c00da02e19ff10d43f7eb6955d627c57728",
-                        "branch": "develop"
-                    },
-                },
-                {
-                    "id": "1d389e7c-b7dc-4d4d-9e58-c21ae48901a5",
-                    "created_at": "2022-03-21T00:10:30.579Z",
-                    "trigger": {"type": "schedule"},
-                    "vcs": {
-                        "revision": "430ecb6e16c346005315dbdd3edf3c3e64e9b1d8",
-                        "branch": "develop"
-                    },
-                },
-                {
-                    "id": "7185a3f6-6338-4c2c-952d-4c30e7561e61",
-                    "created_at": "2022-03-21T12:54:41.817Z",
-                    "trigger": {"type": "webhook"},
-                    "vcs": {
-                        "revision": "43f29c00da02e19ff10d43f7eb6955d627c57728",
-                        "branch": "develop"
-                    }
-                },
-            ]
-        }
-        return response_mock
-
-    if (
-        url == 'https://circleci.com/api/v2/project/gh/ethereum/solidity/pipeline' and
-        params.get('branch') == 'benchmark-downloader'
-    ):
-        response_mock.json.return_value = {
-            "next_page_token": None,
-            "items": [
-                {
-                    "id": "9af60346-a6b9-41b9-8a16-16ccf8996373",
-                    "created_at": "2022-03-23T10:11:34.683Z",
-                    "trigger": {"type": "webhook"},
-                    "vcs": {
-                        "revision": "fa1ddc6f412100d531f6d3a77008c73b474692d6",
-                        "branch": "benchmark-downloader"
-                    }
-                }
-            ]
-        }
-        return response_mock
-
-    if (url in [
-        # To reduce the number of fixtures, let's use this workflow for multiple pipelines.
-        # This would not be the case in practice.
-        'https://circleci.com/api/v2/pipeline/f9036a2d-be2b-4315-bd57-4d35b87502d2/workflow',
-        'https://circleci.com/api/v2/pipeline/9af60346-a6b9-41b9-8a16-16ccf8996373/workflow'
-    ]):
-        response_mock.json.return_value = {
-            "next_page_token": None,
-            "items": [
-                {
-                    "id": "7a54e9cc-513d-4134-afdb-db62ab8146e5",
-                    "created_at": "2022-03-21T12:54:42Z",
-                }
-            ]
-        }
-        return response_mock
-
-    if url == 'https://circleci.com/api/v2/workflow/7a54e9cc-513d-4134-afdb-db62ab8146e5/job':
-        response_mock.json.return_value = {
-            "next_page_token": None,
-            "items": [
-                {
-                    "job_number": 1017975,
-                    "name": "chk_coding_style",
-                    "status": "success",
-                },
-                {
-                    "job_number": 1017969,
-                    "name": "b_ubu",
-                    "status": "success",
-                },
-                {
-                    "job_number": 1018023,
-                    "name": "c_ext_benchmarks",
-                    "status": "success",
-                },
-            ]
-        }
-        return response_mock
-
-    if url == 'https://circleci.com/api/v2/project/gh/ethereum/solidity/1018023/artifacts':
-        response_mock.json.return_value = {
-            "next_page_token": None,
-            "items": [
-                {
-                    "path": "reports/externalTests/all-benchmarks.json",
-                    "url": "https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json"
-                },
-                {
-                    "path": "reports/externalTests/summarized-benchmarks.json",
-                    "url": "https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json"
-                }
-            ]
-        }
-        return response_mock
-
-    raise RuntimeError(
-        "The test tried to perform an unexpected GET request.\n"
-        f"URL: {url}\n" +
-        (f"query: {params}\n" if len(params) > 0 else "") +
-        f"timeout: {timeout}\n" +
-        "If you have updated the code, please remember to add matching response fixtures above."
-    )
-
-class TestBenchmarkDownloader(TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-    @staticmethod
-    @patch('externalTests.download_benchmarks.download_file')
-    @patch('requests.get', _requests_get_mock)
-    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
-    def test_download_benchmarks(download_file_mock):
-        download_benchmarks(None, None, None, silent=True)
-        download_file_mock.assert_has_calls([
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
-                Path('summarized-benchmarks-benchmark-downloader-fa1ddc6f.json'),
-                False
-            ),
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
-                Path('all-benchmarks-benchmark-downloader-fa1ddc6f.json'),
-                False
-            ),
-        ])
-
-    @staticmethod
-    @patch('externalTests.download_benchmarks.download_file')
-    @patch('requests.get', _requests_get_mock)
-    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
-    def test_download_benchmarks_branch(download_file_mock):
-        download_benchmarks('develop', None, None, silent=True)
-        download_file_mock.assert_has_calls([
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
-                Path('summarized-benchmarks-develop-43f29c00.json'),
-                False
-            ),
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
-                Path('all-benchmarks-develop-43f29c00.json'),
-                False
-            ),
-        ])
-
-    @staticmethod
-    @patch('externalTests.download_benchmarks.download_file')
-    @patch('requests.get', _requests_get_mock)
-    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
-    def test_download_benchmarks_pr(download_file_mock):
-        download_benchmarks(None, 12818, None, silent=True)
-        download_file_mock.assert_has_calls([
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
-                Path('summarized-benchmarks-benchmark-downloader-fa1ddc6f.json'),
-                False
-            ),
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
-                Path('all-benchmarks-benchmark-downloader-fa1ddc6f.json'),
-                False
-            ),
-        ])
-
-    @staticmethod
-    @patch('externalTests.download_benchmarks.download_file')
-    @patch('requests.get', _requests_get_mock)
-    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
-    def test_download_benchmarks_base_of_pr(download_file_mock):
-        download_benchmarks(None, None, 12818, silent=True)
-        download_file_mock.assert_has_calls([
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
-                Path('summarized-benchmarks-develop-43f29c00.json'),
-                False
-            ),
-            call(
-                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
-                Path('all-benchmarks-develop-43f29c00.json'),
-                False
-            ),
-        ])
diff --git a/test/scripts/test_externalTests_parse_eth_gas_report.py b/test/scripts/test_externalTests_parse_eth_gas_report.py
deleted file mode 100644
index cefa0487a2d6..000000000000
--- a/test/scripts/test_externalTests_parse_eth_gas_report.py
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/env python3
-
-from dataclasses import asdict
-import unittest
-
-from textwrap import dedent
-
-from unittest_helpers import FIXTURE_DIR, load_fixture
-
-# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
-# pragma pylint: disable=import-error
-from externalTests.parse_eth_gas_report import parse_report, ReportParsingError, ReportValidationError
-# pragma pylint: enable=import-error
-
-ETH_GAS_REPORT_GNOSIS_RST_PATH = FIXTURE_DIR / 'eth_gas_report_gnosis.rst'
-ETH_GAS_REPORT_GNOSIS_RST_CONTENT = load_fixture(ETH_GAS_REPORT_GNOSIS_RST_PATH)
-
-
-class TestEthGasReport(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-    def test_parse_report(self):
-        parsed_report = parse_report(ETH_GAS_REPORT_GNOSIS_RST_CONTENT)
-
-        expected_report = {
-            'solc_version': '0.8.10',
-            'optimize': True,
-            'runs': 200,
-            'block_limit': 100000000,
-            'total_method_gas': 57826 * 6 + 53900 * 2 + 51567 * 8 + 94816 * 85 + 201944 * 49 + 105568 * 52,
-            'total_deployment_gas': 283516 + 525869 + 733462,
-            'contracts': {
-                'DelegateCallTransactionGuard': {
-                    'total_method_gas': 0,
-                    'min_deployment_gas': 283510,
-                    'max_deployment_gas': 283522,
-                    'avg_deployment_gas': 283516,
-                    'methods': None,
-                },
-                'ERC1155Token': {
-                    'total_method_gas': 57826 * 6 + 53900 * 2,
-                    'min_deployment_gas': None,
-                    'max_deployment_gas': None,
-                    'avg_deployment_gas': 525869,
-                    'methods': {
-                        'mint(address,uint256,uint256,bytes)': {
-                            'total_gas': 57826 * 6,
-                            'min_gas': 47934,
-                            'max_gas': 59804,
-                            'avg_gas': 57826,
-                            'call_count': 6
-                        },
-                        'safeTransferFrom(address,address,uint256,uint256,bytes)': {
-                            'total_gas': 53900 * 2,
-                            'min_gas': 53900,
-                            'max_gas': 53900,
-                            'avg_gas': 53900,
-                            'call_count': 2,
-                        },
-                    },
-                },
-                'ERC20Token': {
-                    'total_method_gas': 51567 * 8,
-                    'min_deployment_gas': None,
-                    'max_deployment_gas': None,
-                    'avg_deployment_gas': 733462,
-                    'methods': {
-                        'transfer(address,uint256)': {
-                            'total_gas': 51567 * 8,
-                            'min_gas': 51567,
-                            'max_gas': 51567,
-                            'avg_gas': 51567,
-                            'call_count': 8,
-                        },
-                    },
-                },
-                'GnosisSafe': {
-                    'total_method_gas': 94816 * 85 + 201944 * 49,
-                    'min_deployment_gas': None,
-                    'max_deployment_gas': None,
-                    'avg_deployment_gas': None,
-                    'methods': {
-                        'execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)': {
-                            'total_gas': 94816 * 85,
-                            'min_gas': 59563,
-                            'max_gas': 151736,
-                            'avg_gas': 94816,
-                            'call_count': 85,
-                        },
-                        'setup(address[],uint256,address,bytes,address,address,uint256,address)': {
-                            'total_gas': 201944 * 49,
-                            'min_gas': 167642,
-                            'max_gas': 263690,
-                            'avg_gas': 201944,
-                            'call_count': 49,
-                        },
-                    },
-                },
-                'GnosisSafeProxyFactory': {
-                    'total_method_gas': 105568 * 52,
-                    'min_deployment_gas': None,
-                    'max_deployment_gas': None,
-                    'avg_deployment_gas': None,
-                    'methods': {
-                        'createProxy(address,bytes)': {
-                            'total_gas': 105568 * 52,
-                            'min_gas': 105568,
-                            'max_gas': 105580,
-                            'avg_gas': 105568,
-                            'call_count': 52,
-                        },
-                    },
-                },
-            }
-        }
-        self.assertEqual(asdict(parsed_report), expected_report)
-
-    def test_parse_report_should_fail_if_report_is_empty(self):
-        text_report = ""
-        with self.assertRaises(ReportValidationError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), "Report header not found.")
-
-    def test_parse_report_should_fail_if_report_has_no_header(self):
-        text_report = dedent("""
-            | Methods                                            |
-            | ERC1155Token · mint() · 1 · 3 · 2 ·          6 · - |
-            | Deployments           ·           · % of limit ·   │
-            | ERC1155Token          · - · - · 5 ·        1 % · - |
-        """).strip('\n')
-        with self.assertRaises(ReportValidationError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), "Report header not found.")
-
-    def test_parse_report_should_fail_if_data_rows_have_no_headers(self):
-        text_report = dedent("""
-            | ERC1155Token · mint() · 1 · 3 · 2 · 6 · - |
-        """).strip('\n')
-        expected_message = dedent("""
-            Parsing error on line 1: Found data row without a section header.
-            | ERC1155Token | mint() | 1 | 3 | 2 | 6 | - |
-        """).strip('\n')
-
-        with self.assertRaises(ReportParsingError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), expected_message)
-
-    def test_parse_report_should_fail_if_report_has_more_than_one_header(self):
-        text_report = dedent("""
-            | Solc version: 0.8.10 · Optimizer enabled: true  · Runs: 200 · Block limit: 100000000 gas |
-            | Solc version: 0.8.9  · Optimizer enabled: false · Runs: 111 · Block limit: 999999999 gas |
-        """).strip('\n')
-        expected_message = dedent("""
-            Parsing error on line 2: Duplicate report header.
-            | Solc version: 0.8.9  | Optimizer enabled: false | Runs: 111 | Block limit: 999999999 gas |
-        """).strip('\n')
-
-        with self.assertRaises(ReportParsingError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), expected_message)
-
-    def test_parse_report_should_fail_if_row_matching_same_method_call_appears_twice(self):
-        text_report = dedent("""
-            | Methods                                               |
-            | ERC1155Token · mint() · 47934 · 59804 · 57826 · 6 · - |
-            | ERC1155Token · mint() · 11111 · 22222 · 33333 · 4 · - |
-        """).strip('\n')
-        expected_message = dedent("""
-            Parsing error on line 3: Duplicate method row for 'ERC1155Token.mint()'.
-            | ERC1155Token | mint() | 11111 | 22222 | 33333 | 4 | - |
-        """).strip('\n')
-
-        with self.assertRaises(ReportParsingError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), expected_message)
-
-    def test_parse_report_should_fail_if_row_matching_same_contract_deployment_appears_twice(self):
-        text_report = dedent("""
-            | Deployments          ·        · % of limit ·   │
-            | ERC1155Token · - · - · 525869 ·      0.5 % · - |
-            | ERC1155Token · - · - · 111111 ·      0.6 % · - |
-        """).strip('\n')
-        expected_message = dedent("""
-            Parsing error on line 3: Duplicate contract deployment row for 'ERC1155Token'.
-            | ERC1155Token | - | - | 111111 |      0.6 % | - |
-        """).strip('\n')
-
-        with self.assertRaises(ReportParsingError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), expected_message)
-
-    def test_parse_report_should_fail_if_method_row_appears_under_deployments_header(self):
-        text_report = dedent("""
-            | Deployments           ·                       · % of limit ·   │
-            | ERC1155Token · mint() · 47934 · 59804 · 57826 ·          6 · - |
-        """).strip('\n')
-        expected_message = dedent("""
-            Parsing error on line 2: Expected a table row with deployment details.
-            | ERC1155Token | mint() | 47934 | 59804 | 57826 |          6 | - |
-        """).strip('\n')
-
-        with self.assertRaises(ReportParsingError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), expected_message)
-
-    def test_parse_report_should_fail_if_deployment_row_appears_under_methods_header(self):
-        text_report = dedent("""
-            | Methods                               |
-            | ERC1155Token · - · - · 525869 · 5 · - |
-        """).strip('\n')
-        expected_message = dedent("""
-            Parsing error on line 2: Expected a table row with method details.
-            | ERC1155Token | - | - | 525869 | 5 | - |
-        """).strip('\n')
-
-        with self.assertRaises(ReportParsingError) as manager:
-            parse_report(text_report)
-        self.assertEqual(str(manager.exception), expected_message)
diff --git a/test/scripts/test_isolate_tests.py b/test/scripts/test_isolate_tests.py
deleted file mode 100644
index 16874b747625..000000000000
--- a/test/scripts/test_isolate_tests.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env python
-
-import unittest
-
-from textwrap import dedent, indent
-
-from unittest_helpers import FIXTURE_DIR, load_fixture
-
-# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
-# pragma pylint: disable=import-error
-from isolate_tests import extract_solidity_docs_cases, extract_yul_docs_cases
-# pragma pylint: enable=import-error
-
-CODE_BLOCK_RST_PATH = FIXTURE_DIR / 'code_block.rst'
-CODE_BLOCK_RST_CONTENT = load_fixture(CODE_BLOCK_RST_PATH)
-CODE_BLOCK_WITH_DIRECTIVES_RST_PATH = FIXTURE_DIR / 'code_block_with_directives.rst'
-CODE_BLOCK_WITH_DIRECTIVES_RST_CONTENT = load_fixture(CODE_BLOCK_WITH_DIRECTIVES_RST_PATH)
-
-def formatCase(text):
-    """Formats code to contain only one indentation and terminate with a \n"""
-    return indent(dedent(text.lstrip("\n")), "    ") + "\n"
-
-class TestExtractDocsCases(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = 10000
-
-
-    def test_solidity_block(self):
-        expected_cases = [formatCase(case) for case in [
-            """
-                // SPDX-License-Identifier: GPL-3.0
-                pragma solidity >=0.7.0 <0.9.0;
-
-                contract C {
-                    function foo() public view {}
-                }
-
-            """,
-            """
-                contract C {}
-            """,
-        ]]
-
-        self.assertEqual(extract_solidity_docs_cases(CODE_BLOCK_RST_PATH), expected_cases)
-
-    def test_solidity_block_with_directives(self):
-        expected_cases = [formatCase(case) for case in [
-            """
-                // SPDX-License-Identifier: GPL-3.0
-                pragma solidity >=0.7.0 <0.9.0;
-
-                contract C {
-                    function foo() public view {}
-                }
-
-            """,
-            """
-                contract C {}
-            """,
-            """
-                contract D {}
-                :linenos:
-            """,
-            """
-                contract E {}
-            """,
-        ]]
-
-        self.assertEqual(extract_solidity_docs_cases(CODE_BLOCK_WITH_DIRECTIVES_RST_PATH), expected_cases)
-
-    def test_yul_block(self):
-        expected_cases = [formatCase(case) for case in [
-            """
-            {
-                let x := add(1, 5)
-            }
-            """,
-            """
-            // Yul code wrapped in object
-            {
-                {
-                    let y := mul(3, 5)
-                }
-            }
-            """,
-            """
-            // Yul code wrapped in named object
-            object "Test" {
-                {
-                    let y := mul(6, 9)
-                }
-            }
-            """,
-        ]]
-
-        self.assertEqual(extract_yul_docs_cases(CODE_BLOCK_RST_PATH), expected_cases)
-
-    def test_yul_block_with_directives(self):
-        expected_cases = [formatCase(case) for case in [
-            """
-            {
-                let x := add(1, 5)
-            }
-            """,
-            """
-            // Yul code wrapped in object
-            {
-                let y := mul(3, 5)
-            }
-            """,
-            """
-            // Yul code wrapped in named object
-            object "Test" {
-                let y := mul(3, 5)
-            :linenos:
-            }
-            """,
-        ]]
-
-        self.assertEqual(extract_yul_docs_cases(CODE_BLOCK_WITH_DIRECTIVES_RST_PATH), expected_cases)
diff --git a/test/scripts/unittest_helpers.py b/test/scripts/unittest_helpers.py
deleted file mode 100644
index e666485eb1e4..000000000000
--- a/test/scripts/unittest_helpers.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-LIBSOLIDITY_TEST_DIR = Path(__file__).parent.parent / 'libsolidity'
-FIXTURE_DIR = Path(__file__).parent / 'fixtures'
-
-def load_file(path: Union[Path, str]) -> str:
-    # NOTE: newline='' disables newline conversion.
-    # We want the file exactly as is because changing even a single byte in the source affects metadata.
-    with open(path, 'r', encoding='utf-8', newline='') as f:
-        return f.read()
-
-def load_fixture(relative_path: Union[Path, str]) -> str:
-    return load_file(FIXTURE_DIR / relative_path)
-
-def load_libsolidity_test_case(relative_path: Union[Path, str]) -> str:
-    return load_file(LIBSOLIDITY_TEST_DIR / relative_path)
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
deleted file mode 100644
index df57572a5349..000000000000
--- a/test/solc/CommandLineInterface.cpp
+++ /dev/null
@@ -1,1391 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Unit tests for solc/CommandLineInterface.h
-
-#include <solc/CommandLineInterface.h>
-#include <solc/Exceptions.h>
-
-#include <test/solc/Common.h>
-
-#include <test/Common.h>
-#include <test/libsolidity/util/Common.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-#include <liblangutil/SemVerHandler.h>
-#include <test/FilesystemUtils.h>
-
-#include <libsolutil/JSON.h>
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <range/v3/view/transform.hpp>
-
-#include <map>
-#include <ostream>
-#include <set>
-#include <string>
-#include <vector>
-
-using namespace std;
-using namespace solidity::frontend;
-using namespace solidity::test;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-using PathSet = set<boost::filesystem::path>;
-
-#define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
-
-namespace
-{
-
-ostream& operator<<(ostream& _out, vector<ImportRemapper::Remapping> const& _remappings)
-{
-	static auto remappingToString = [](auto const& _remapping)
-	{
-		return _remapping.context + ":" + _remapping.prefix + "=" + _remapping.target;
-	};
-
-	_out << "[" << joinHumanReadable(_remappings | ranges::views::transform(remappingToString)) << "]";
-	return _out;
-}
-
-ostream& operator<<(ostream& _out, map<string, string> const& _map)
-{
-	_out << "{" << endl;
-	for (auto const& [key, value]: _map)
-		_out << "" << key << ": " << value << "," << endl;
-	_out << "}";
-
-	return _out;
-}
-
-ostream& operator<<(ostream& _out, PathSet const& _paths)
-{
-	static auto pathString = [](auto const& _path) { return _path.string(); };
-
-	_out << "{" << joinHumanReadable(_paths | ranges::views::transform(pathString)) << "}";
-	return _out;
-}
-
-} // namespace
-
-namespace boost::test_tools::tt_detail
-{
-
-// Boost won't find the << operator unless we put it in the std namespace which is illegal.
-// The recommended solution is to overload print_log_value<> struct and make it use our operator.
-
-template<>
-struct print_log_value<vector<ImportRemapper::Remapping>>
-{
-	void operator()(std::ostream& _out, vector<ImportRemapper::Remapping> const& _value) { ::operator<<(_out, _value); }
-};
-
-template<>
-struct print_log_value<map<string, string>>
-{
-	void operator()(std::ostream& _out, map<string, string> const& _value) { ::operator<<(_out, _value); }
-};
-
-template<>
-struct print_log_value<PathSet>
-{
-	void operator()(std::ostream& _out, PathSet const& _value) { ::operator<<(_out, _value); }
-};
-
-} // namespace boost::test_tools::tt_detail
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(CommandLineInterfaceTest)
-
-BOOST_AUTO_TEST_CASE(help)
-{
-	OptionsReaderAndMessages result = runCLI({"solc", "--help"}, "");
-
-	BOOST_TEST(result.success);
-	BOOST_TEST(boost::starts_with(result.stdoutContent, "solc, the Solidity commandline compiler."));
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::Help);
-}
-
-BOOST_AUTO_TEST_CASE(license)
-{
-	OptionsReaderAndMessages result = runCLI({"solc", "--license"}, "");
-
-	BOOST_TEST(result.success);
-	BOOST_TEST(boost::starts_with(result.stdoutContent, "Most of the code is licensed under GPLv3"));
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::License);
-}
-
-BOOST_AUTO_TEST_CASE(version)
-{
-	OptionsReaderAndMessages result = runCLI({"solc", "--version"}, "");
-
-	BOOST_TEST(result.success);
-	BOOST_TEST(boost::ends_with(result.stdoutContent, "Version: " + solidity::frontend::VersionString + "\n"));
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::Version);
-}
-
-BOOST_AUTO_TEST_CASE(multiple_input_modes)
-{
-	array<string, 10> inputModeOptions = {
-		"--help",
-		"--license",
-		"--version",
-		"--standard-json",
-		"--link",
-		"--assemble",
-		"--strict-assembly",
-		"--yul",
-		"--import-ast",
-		"--import-asm-json",
-	};
-	string expectedMessage =
-		"The following options are mutually exclusive: "
-		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast, --lsp, --import-asm-json. "
-		"Select at most one.";
-
-	for (string const& mode1: inputModeOptions)
-		for (string const& mode2: inputModeOptions)
-			if (mode1 != mode2)
-				BOOST_CHECK_EXCEPTION(
-					parseCommandLineAndReadInputFiles({"solc", mode1, mode2}),
-					CommandLineValidationError,
-					[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-				);
-}
-
-BOOST_AUTO_TEST_CASE(no_import_callback_allowed_paths)
-{
-	array<string, 2> options = {
-		"--no-import-callback",
-		"--allow-paths"
-	};
-
-	string expectedMessage =
-		"The following options are mutually exclusive: "
-		"--no-import-callback, --allow-paths. "
-		"Select at most one.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({"solc", options[0], options[1], "."}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(cli_input)
-{
-	TemporaryDirectory tempDir1(TEST_CASE_NAME);
-	TemporaryDirectory tempDir2(TEST_CASE_NAME);
-	createFilesWithParentDirs({tempDir1.path() / "input1.sol"});
-	createFilesWithParentDirs({tempDir2.path() / "input2.sol"});
-
-	boost::filesystem::path expectedRootPath = FileReader::normalizeCLIRootPathForVFS(tempDir1);
-	boost::filesystem::path expectedDir1 = expectedRootPath / tempDir1.path().relative_path();
-	boost::filesystem::path expectedDir2 = expectedRootPath / tempDir2.path().relative_path();
-	soltestAssert(expectedDir1.is_absolute() || expectedDir1.root_path() == "/", "");
-	soltestAssert(expectedDir2.is_absolute() || expectedDir2.root_path() == "/", "");
-
-	vector<ImportRemapper::Remapping> expectedRemappings = {
-		{"", "a", "b/c/d"},
-		{"a", "b", "c/d/e/"},
-	};
-	map<string, string> expectedSources = {
-		{"<stdin>", ""},
-		{(expectedDir1 / "input1.sol").generic_string(), ""},
-		{(expectedDir2 / "input2.sol").generic_string(), ""},
-	};
-	PathSet expectedAllowedPaths = {
-		boost::filesystem::canonical(tempDir1),
-		boost::filesystem::canonical(tempDir2),
-		"b/c",
-		"c/d/e",
-	};
-
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({
-		"solc",
-		"a=b/c/d",
-		(tempDir1.path() / "input1.sol").string(),
-		(tempDir2.path() / "input2.sol").string(),
-		"a:b=c/d/e/",
-		"-",
-	});
-
-	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::Compiler);
-	BOOST_TEST(result.options.input.addStdin);
-	BOOST_CHECK_EQUAL(result.options.input.remappings, expectedRemappings);
-	BOOST_CHECK_EQUAL(result.reader.sourceUnits(), expectedSources);
-	BOOST_CHECK_EQUAL(result.reader.allowedDirectories(), expectedAllowedPaths);
-}
-
-BOOST_AUTO_TEST_CASE(cli_ignore_missing_some_files_exist)
-{
-	TemporaryDirectory tempDir1(TEST_CASE_NAME);
-	TemporaryDirectory tempDir2(TEST_CASE_NAME);
-	createFilesWithParentDirs({tempDir1.path() / "input1.sol"});
-
-	boost::filesystem::path expectedRootPath = FileReader::normalizeCLIRootPathForVFS(tempDir1);
-	boost::filesystem::path expectedDir1 = expectedRootPath / tempDir1.path().relative_path();
-	soltestAssert(expectedDir1.is_absolute() || expectedDir1.root_path() == "/", "");
-
-	// NOTE: Allowed paths should not be added for skipped files.
-	map<string, string> expectedSources = {{(expectedDir1 / "input1.sol").generic_string(), ""}};
-	PathSet expectedAllowedPaths = {boost::filesystem::canonical(tempDir1)};
-
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({
-		"solc",
-		(tempDir1.path() / "input1.sol").string(),
-		(tempDir2.path() / "input2.sol").string(),
-		"--ignore-missing",
-		"--no-color",
-	});
-	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "Info: \"" + (tempDir2.path() / "input2.sol").string() + "\" is not found. Skipping.\n");
-	BOOST_TEST(result.options.input.mode == InputMode::Compiler);
-	BOOST_TEST(!result.options.input.addStdin);
-	BOOST_CHECK_EQUAL(result.reader.sourceUnits(), expectedSources);
-	BOOST_CHECK_EQUAL(result.reader.allowedDirectories(), expectedAllowedPaths);
-}
-
-BOOST_AUTO_TEST_CASE(cli_ignore_missing_no_files_exist)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-
-	string expectedMessage =
-		"Info: \"" + (tempDir.path() / "input1.sol").string() + "\" is not found. Skipping.\n"
-		"Info: \"" + (tempDir.path() / "input2.sol").string() + "\" is not found. Skipping.\n"
-		"Error: All specified input files either do not exist or are not regular files.\n";
-
-	OptionsReaderAndMessages result = runCLI({
-		"solc",
-		(tempDir.path() / "input1.sol").string(),
-		(tempDir.path() / "input2.sol").string(),
-		"--ignore-missing",
-		"--no-color",
-	});
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
-}
-
-BOOST_AUTO_TEST_CASE(cli_not_a_file)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-
-	string expectedMessage = "\"" + tempDir.path().string() + "\" is not a valid file.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({"solc", tempDir.path().string()}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_base_path)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir.path().root_path());
-
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({
-		"solc",
-		"--standard-json",
-		"--base-path=" + tempDir.path().string(),
-	});
-	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
-	BOOST_TEST(result.options.input.addStdin);
-	BOOST_TEST(result.options.input.paths.empty());
-	BOOST_TEST(result.reader.sourceUnits().empty());
-	BOOST_TEST(result.reader.allowedDirectories().empty());
-	BOOST_TEST(result.reader.basePath() == "/" / tempDir.path().relative_path());
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_no_input_file)
-{
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--standard-json"});
-	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
-	BOOST_TEST(result.options.input.addStdin);
-	BOOST_TEST(result.options.input.paths.empty());
-	BOOST_TEST(result.reader.sourceUnits().empty());
-	BOOST_TEST(result.reader.allowedDirectories().empty());
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_dash)
-{
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--standard-json", "-"});
-	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
-	BOOST_TEST(result.options.input.addStdin);
-	BOOST_TEST(result.reader.sourceUnits().empty());
-	BOOST_TEST(result.reader.allowedDirectories().empty());
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_one_input_file)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	createFilesWithParentDirs({tempDir.path() / "input.json"});
-
-	vector<string> commandLine = {"solc", "--standard-json", (tempDir.path() / "input.json").string()};
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
-	BOOST_TEST(!result.options.input.addStdin);
-	BOOST_TEST(result.options.input.paths == PathSet{tempDir.path() / "input.json"});
-	BOOST_TEST(result.reader.allowedDirectories().empty());
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_two_input_files)
-{
-	string expectedMessage =
-		"Too many input files for --standard-json.\n"
-		"Please either specify a single file name or provide its content on standard input.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({"solc", "--standard-json", "input1.json", "input2.json"}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_one_input_file_and_stdin)
-{
-	string expectedMessage =
-		"Too many input files for --standard-json.\n"
-		"Please either specify a single file name or provide its content on standard input.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({"solc", "--standard-json", "input1.json", "-"}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_ignore_missing)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-
-	// This option is pretty much useless Standard JSON mode.
-	string expectedMessage =
-		"All specified input files either do not exist or are not regular files.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({
-			"solc",
-			"--standard-json",
-			(tempDir.path() / "input.json").string(),
-			"--ignore-missing",
-		}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_remapping)
-{
-	string expectedMessage =
-		"Import remappings are not accepted on the command line in Standard JSON mode.\n"
-		"Please put them under 'settings.remappings' in the JSON input.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({"solc", "--standard-json", "a=b"}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_no_base_path)
-{
-	TemporaryDirectory tempDirCurrent(TEST_CASE_NAME);
-	TemporaryDirectory tempDirOther(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDirCurrent);
-	soltestAssert(tempDirCurrent.path().is_absolute(), "");
-	soltestAssert(tempDirOther.path().is_absolute(), "");
-
-	// NOTE: On macOS the path usually contains symlinks which prevents base path from being stripped.
-	// Use canonical() to resolve symnlinks and get consistent results on all platforms.
-	boost::filesystem::path currentDirNoSymlinks = boost::filesystem::canonical(tempDirCurrent);
-	boost::filesystem::path otherDirNoSymlinks = boost::filesystem::canonical(tempDirOther);
-
-	boost::filesystem::path expectedOtherDir = "/" / otherDirNoSymlinks.relative_path();
-	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
-
-	vector<string> commandLine = {
-		"solc",
-		"contract1.sol",                                   // Relative path
-		"c/d/contract2.sol",                               // Relative path with subdirectories
-		currentDirNoSymlinks.string() + "/contract3.sol",  // Absolute path inside working dir
-		otherDirNoSymlinks.string() + "/contract4.sol",    // Absolute path outside of working dir
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-		"contract1.sol",
-		"c/d/contract2.sol",
-		currentDirNoSymlinks / "contract3.sol",
-		otherDirNoSymlinks / "contract4.sol",
-	};
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{"contract1.sol", ""},
-		{"c/d/contract2.sol", ""},
-		{"contract3.sol", ""},
-		{expectedOtherDir.generic_string() + "/contract4.sol", ""},
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-		currentDirNoSymlinks / "c/d",
-		currentDirNoSymlinks,
-		otherDirNoSymlinks,
-	};
-
-	createFilesWithParentDirs(expectedOptions.input.paths);
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == "");
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_same_as_work_dir)
-{
-	TemporaryDirectory tempDirCurrent(TEST_CASE_NAME);
-	TemporaryDirectory tempDirOther(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDirCurrent);
-	soltestAssert(tempDirCurrent.path().is_absolute(), "");
-	soltestAssert(tempDirOther.path().is_absolute(), "");
-
-	// NOTE: On macOS the path usually contains symlinks which prevents base path from being stripped.
-	// Use canonical() to resolve symnlinks and get consistent results on all platforms.
-	boost::filesystem::path currentDirNoSymlinks = boost::filesystem::canonical(tempDirCurrent);
-	boost::filesystem::path otherDirNoSymlinks = boost::filesystem::canonical(tempDirOther);
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	boost::filesystem::path expectedOtherDir = "/" / otherDirNoSymlinks.relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
-
-	vector<string> commandLine = {
-		"solc",
-		"--base-path=" + currentDirNoSymlinks.string(),
-		"contract1.sol",                                   // Relative path
-		"c/d/contract2.sol",                               // Relative path with subdirectories
-		currentDirNoSymlinks.string() + "/contract3.sol",  // Absolute path inside working dir
-		otherDirNoSymlinks.string() + "/contract4.sol",    // Absolute path outside of working dir
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-		"contract1.sol",
-		"c/d/contract2.sol",
-		currentDirNoSymlinks / "contract3.sol",
-		otherDirNoSymlinks / "contract4.sol",
-	};
-	expectedOptions.input.basePath = currentDirNoSymlinks;
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{"contract1.sol", ""},
-		{"c/d/contract2.sol", ""},
-		{"contract3.sol", ""},
-		{expectedOtherDir.generic_string() + "/contract4.sol", ""},
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-		currentDirNoSymlinks / "c/d",
-		currentDirNoSymlinks,
-		otherDirNoSymlinks,
-	};
-
-	createFilesWithParentDirs(expectedOptions.input.paths);
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir);
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_different_from_work_dir)
-{
-	TemporaryDirectory tempDirCurrent(TEST_CASE_NAME);
-	TemporaryDirectory tempDirOther(TEST_CASE_NAME);
-	TemporaryDirectory tempDirBase(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDirCurrent);
-	soltestAssert(tempDirCurrent.path().is_absolute(), "");
-	soltestAssert(tempDirOther.path().is_absolute(), "");
-	soltestAssert(tempDirBase.path().is_absolute(), "");
-
-	// NOTE: On macOS the path usually contains symlinks which prevents base path from being stripped.
-	// Use canonical() to resolve symnlinks and get consistent results on all platforms.
-	boost::filesystem::path currentDirNoSymlinks = boost::filesystem::canonical(tempDirCurrent);
-	boost::filesystem::path otherDirNoSymlinks = boost::filesystem::canonical(tempDirOther);
-	boost::filesystem::path baseDirNoSymlinks = boost::filesystem::canonical(tempDirBase);
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	boost::filesystem::path expectedCurrentDir = "/" / currentDirNoSymlinks.relative_path();
-	boost::filesystem::path expectedOtherDir = "/" / otherDirNoSymlinks.relative_path();
-	boost::filesystem::path expectedBaseDir = "/" / baseDirNoSymlinks.relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-	soltestAssert(expectedCurrentDir.is_absolute() || expectedCurrentDir.root_path() == "/", "");
-	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
-	soltestAssert(expectedBaseDir.is_absolute() || expectedBaseDir.root_path() == "/", "");
-
-	vector<string> commandLine = {
-		"solc",
-		"--base-path=" + baseDirNoSymlinks.string(),
-		"contract1.sol",                                   // Relative path
-		"c/d/contract2.sol",                               // Relative path with subdirectories
-		currentDirNoSymlinks.string() + "/contract3.sol",  // Absolute path inside working dir
-		otherDirNoSymlinks.string() + "/contract4.sol",    // Absolute path outside of working dir
-		baseDirNoSymlinks.string() + "/contract5.sol",     // Absolute path inside base path
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-		"contract1.sol",
-		"c/d/contract2.sol",
-		currentDirNoSymlinks / "contract3.sol",
-		otherDirNoSymlinks / "contract4.sol",
-		baseDirNoSymlinks / "contract5.sol",
-	};
-	expectedOptions.input.basePath = baseDirNoSymlinks;
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{expectedWorkDir.generic_string() + "/contract1.sol", ""},
-		{expectedWorkDir.generic_string() + "/c/d/contract2.sol", ""},
-		{expectedCurrentDir.generic_string() + "/contract3.sol", ""},
-		{expectedOtherDir.generic_string() + "/contract4.sol", ""},
-		{"contract5.sol", ""},
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-		currentDirNoSymlinks / "c/d",
-		currentDirNoSymlinks,
-		otherDirNoSymlinks,
-		baseDirNoSymlinks,
-	};
-
-	createFilesWithParentDirs(expectedOptions.input.paths);
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedBaseDir);
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_relative_base_path)
-{
-	TemporaryDirectory tempDirCurrent(TEST_CASE_NAME);
-	TemporaryDirectory tempDirOther(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDirCurrent);
-	soltestAssert(tempDirCurrent.path().is_absolute(), "");
-	soltestAssert(tempDirOther.path().is_absolute(), "");
-
-	// NOTE: On macOS the path usually contains symlinks which prevents base path from being stripped.
-	// Use canonical() to resolve symnlinks and get consistent results on all platforms.
-	boost::filesystem::path currentDirNoSymlinks = boost::filesystem::canonical(tempDirCurrent);
-	boost::filesystem::path otherDirNoSymlinks = boost::filesystem::canonical(tempDirOther);
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	boost::filesystem::path expectedOtherDir = "/" / otherDirNoSymlinks.relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
-
-	vector<string> commandLine = {
-		"solc",
-		"--base-path=base",
-		"contract1.sol",                                       // Relative path outside of base path
-		"base/contract2.sol",                                  // Relative path inside base path
-		currentDirNoSymlinks.string() + "/contract3.sol",      // Absolute path inside working dir
-		currentDirNoSymlinks.string() + "/base/contract4.sol", // Absolute path inside base path
-		otherDirNoSymlinks.string() + "/contract5.sol",        // Absolute path outside of working dir
-		otherDirNoSymlinks.string() + "/base/contract6.sol",   // Absolute path outside of working dir
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-		"contract1.sol",
-		"base/contract2.sol",
-		currentDirNoSymlinks / "contract3.sol",
-		currentDirNoSymlinks / "base/contract4.sol",
-		otherDirNoSymlinks / "contract5.sol",
-		otherDirNoSymlinks / "base/contract6.sol",
-	};
-	expectedOptions.input.basePath = "base";
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{expectedWorkDir.generic_string() + "/contract1.sol", ""},
-		{"contract2.sol", ""},
-		{expectedWorkDir.generic_string() + "/contract3.sol", ""},
-		{"contract4.sol", ""},
-		{expectedOtherDir.generic_string() + "/contract5.sol", ""},
-		{expectedOtherDir.generic_string() + "/base/contract6.sol", ""},
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-		currentDirNoSymlinks / "base",
-		currentDirNoSymlinks,
-		otherDirNoSymlinks,
-		otherDirNoSymlinks / "base",
-	};
-
-	createFilesWithParentDirs(expectedOptions.input.paths);
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base");
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_normalization_and_weird_names)
-{
-	TemporaryDirectory tempDir({"x/y/z"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir.path() / "x/y/z");
-	soltestAssert(tempDir.path().is_absolute(), "");
-
-	string uncPath = "//" + tempDir.path().relative_path().generic_string();
-	soltestAssert(FileReader::isUNCPath(uncPath), "");
-
-	boost::filesystem::path tempDirNoSymlinks = boost::filesystem::canonical(tempDir);
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-
-	vector<string> commandLine = {
-		"solc",
-
-#if !defined(_WIN32)
-		// URLs. We interpret them as local paths.
-		// Note that : is not allowed in file names on Windows.
-		"file://c/d/contract1.sol",
-		"file:///c/d/contract2.sol",
-		"https://example.com/contract3.sol",
-#endif
-
-		// Redundant slashes
-		"a/b//contract4.sol",
-		"a/b///contract5.sol",
-		"a/b////contract6.sol",
-
-		// Dot segments
-		"./a/b/contract7.sol",
-		"././a/b/contract8.sol",
-		"a/./b/contract9.sol",
-		"a/././b/contract10.sol",
-
-		// Dot dot segments
-		"../a/b/contract11.sol",
-		"../../a/b/contract12.sol",
-		"a/../b/contract13.sol",
-		"a/b/../../contract14.sol",
-		tempDirNoSymlinks.string() + "/x/y/z/a/../b/contract15.sol",
-		tempDirNoSymlinks.string() + "/x/y/z/a/b/../../contract16.sol",
-
-		// Dot dot segments going beyond filesystem root
-		"/../" + tempDir.path().relative_path().generic_string() + "/contract17.sol",
-		"/../../" + tempDir.path().relative_path().generic_string() + "/contract18.sol",
-
-#if !defined(_WIN32)
-		// Name conflict with source unit name of stdin.
-		// Note that < and > are not allowed in file names on Windows.
-		"<stdin>",
-
-		// UNC paths on UNIX just resolve into normal paths. On Windows this would be an network
-		// share (and an error unless the share actually exists so I can't test it here).
-		uncPath + "/contract19.sol",
-
-		// Windows paths on non-Windows systems.
-		// Note that on Windows we tested them already just by using absolute paths.
-		"a\\b\\contract20.sol",
-		"C:\\a\\b\\contract21.sol",
-#endif
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-#if !defined(_WIN32)
-		"file://c/d/contract1.sol",
-		"file:///c/d/contract2.sol",
-		"https://example.com/contract3.sol",
-#endif
-
-		"a/b//contract4.sol",
-		"a/b///contract5.sol",
-		"a/b////contract6.sol",
-
-		"./a/b/contract7.sol",
-		"././a/b/contract8.sol",
-		"a/./b/contract9.sol",
-		"a/././b/contract10.sol",
-
-		"../a/b/contract11.sol",
-		"../../a/b/contract12.sol",
-		"a/../b/contract13.sol",
-		"a/b/../../contract14.sol",
-		tempDirNoSymlinks.string() + "/x/y/z/a/../b/contract15.sol",
-		tempDirNoSymlinks.string() + "/x/y/z/a/b/../../contract16.sol",
-
-		"/../" + tempDir.path().relative_path().string() + "/contract17.sol",
-		"/../../" + tempDir.path().relative_path().string() + "/contract18.sol",
-
-#if !defined(_WIN32)
-		"<stdin>",
-
-		uncPath + "/contract19.sol",
-
-		"a\\b\\contract20.sol",
-		"C:\\a\\b\\contract21.sol",
-#endif
-	};
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-#if !defined(_WIN32)
-		{"file:/c/d/contract1.sol", ""},
-		{"file:/c/d/contract2.sol", ""},
-		{"https:/example.com/contract3.sol", ""},
-#endif
-
-		{"a/b/contract4.sol", ""},
-		{"a/b/contract5.sol", ""},
-		{"a/b/contract6.sol", ""},
-
-		{"a/b/contract7.sol", ""},
-		{"a/b/contract8.sol", ""},
-		{"a/b/contract9.sol", ""},
-		{"a/b/contract10.sol", ""},
-
-		{expectedWorkDir.parent_path().generic_string() + "/a/b/contract11.sol", ""},
-		{expectedWorkDir.parent_path().parent_path().generic_string() + "/a/b/contract12.sol", ""},
-		{"b/contract13.sol", ""},
-		{"contract14.sol", ""},
-		{"b/contract15.sol", ""},
-		{"contract16.sol", ""},
-
-		{"/" + tempDir.path().relative_path().generic_string() + "/contract17.sol", ""},
-		{"/" + tempDir.path().relative_path().generic_string() + "/contract18.sol", ""},
-
-#if !defined(_WIN32)
-		{"<stdin>", ""},
-
-		{uncPath + "/contract19.sol", ""},
-
-		{"a\\b\\contract20.sol", ""},
-		{"C:\\a\\b\\contract21.sol", ""},
-#endif
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-#if !defined(_WIN32)
-		tempDirNoSymlinks / "x/y/z/file:/c/d",
-		tempDirNoSymlinks / "x/y/z/https:/example.com",
-#endif
-		tempDirNoSymlinks / "x/y/z/a/b",
-		tempDirNoSymlinks / "x/y/z",
-		tempDirNoSymlinks / "x/y/z/b",
-		tempDirNoSymlinks / "x/y/a/b",
-		tempDirNoSymlinks / "x/a/b",
-		tempDirNoSymlinks,
-#if !defined(_WIN32)
-		boost::filesystem::canonical(uncPath),
-#endif
-	};
-
-	createFilesWithParentDirs(expectedOptions.input.paths);
-
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedOptions.input.basePath);
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_symlinks)
-{
-	TemporaryDirectory tempDir({"r/"}, TEST_CASE_NAME);
-	createFilesWithParentDirs({tempDir.path() / "x/y/z/contract.sol"});
-	TemporaryWorkingDirectory tempWorkDir(tempDir.path() / "r");
-
-	if (
-		!createSymlinkIfSupportedByFilesystem("../x/y", tempDir.path() / "r/sym", true) ||
-		!createSymlinkIfSupportedByFilesystem("contract.sol", tempDir.path() / "x/y/z/contract_symlink.sol", false)
-	)
-		return;
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
-
-	vector<string> commandLine = {
-		"solc",
-
-		"--base-path=../r/sym/z/",
-		"sym/z/contract.sol",            // File accessed directly + same dir symlink as base path
-		"../x/y/z/contract.sol",         // File accessed directly + different dir symlink than base path
-		"sym/z/contract_symlink.sol",    // File accessed via symlink + same dir symlink as base path
-		"../x/y/z/contract_symlink.sol", // File accessed via symlink + different dir symlink than base path
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-		"sym/z/contract.sol",
-		"../x/y/z/contract.sol",
-		"sym/z/contract_symlink.sol",
-		"../x/y/z/contract_symlink.sol",
-	};
-	expectedOptions.input.basePath = "../r/sym/z/";
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{"contract.sol", ""},
-		{(expectedWorkDir.parent_path() / "x/y/z/contract.sol").generic_string(), ""},
-		{"contract_symlink.sol", ""},
-		{(expectedWorkDir.parent_path() / "x/y/z/contract_symlink.sol").generic_string(), ""},
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-		boost::filesystem::canonical(tempDir) / "x/y/z",
-	};
-
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "sym/z/");
-}
-
-BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_and_stdin)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-	boost::filesystem::create_directories(tempDir.path() / "base");
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
-
-	vector<string> commandLine = {"solc", "--base-path=base", "-"};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.addStdin = true;
-	expectedOptions.input.basePath = "base";
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{"<stdin>", ""},
-	};
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {};
-
-	createFilesWithParentDirs(expectedOptions.input.paths);
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base");
-}
-
-BOOST_AUTO_TEST_CASE(cli_include_paths)
-{
-	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	string const mainContractSource = withPreamble(
-		"import \"contract.sol\";\n"
-		"import \"contract_via_callback.sol\";\n"
-		"import \"include.sol\";\n"
-		"import \"include_via_callback.sol\";\n"
-		"import \"nested.sol\";\n"
-		"import \"nested_via_callback.sol\";\n"
-		"import \"lib.sol\";\n"
-		"import \"lib_via_callback.sol\";\n"
-	);
-
-	string const onlyPreamble = withPreamble("");
-	createFilesWithParentDirs(
-		{
-			tempDir.path() / "base/contract.sol",
-			tempDir.path() / "base/contract_via_callback.sol",
-			tempDir.path() / "include/include.sol",
-			tempDir.path() / "include/include_via_callback.sol",
-			tempDir.path() / "lib/nested/nested.sol",
-			tempDir.path() / "lib/nested/nested_via_callback.sol",
-			tempDir.path() / "lib/lib.sol",
-			tempDir.path() / "lib/lib_via_callback.sol",
-		},
-		onlyPreamble
-	);
-	createFilesWithParentDirs({tempDir.path() / "base/main.sol"}, mainContractSource);
-
-	boost::filesystem::path canonicalWorkDir = boost::filesystem::canonical(tempDir);
-	boost::filesystem::path expectedWorkDir = "/" / canonicalWorkDir.relative_path();
-
-	vector<string> commandLine = {
-		"solc",
-		"--no-color",
-		"--base-path=base/",
-		"--include-path=include/",
-		"--include-path=lib/nested",
-		"--include-path=lib/",
-		"base/main.sol",
-		"base/contract.sol",
-		"include/include.sol",
-		"lib/nested/nested.sol",
-		"lib/lib.sol",
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {
-		"base/main.sol",
-		"base/contract.sol",
-		"include/include.sol",
-		"lib/nested/nested.sol",
-		"lib/lib.sol",
-	};
-	expectedOptions.input.basePath = "base/";
-	expectedOptions.input.includePaths = {
-		"include/",
-		"lib/nested",
-		"lib/",
-	};
-	expectedOptions.formatting.coloredOutput = false;
-	expectedOptions.modelChecker.initialize = true;
-
-	map<string, string> expectedSources = {
-		{"main.sol", mainContractSource},
-		{"contract.sol", onlyPreamble},
-		{"contract_via_callback.sol", onlyPreamble},
-		{"include.sol", onlyPreamble},
-		{"include_via_callback.sol", onlyPreamble},
-		{"nested.sol", onlyPreamble},
-		{"nested_via_callback.sol", onlyPreamble},
-		{"lib.sol", onlyPreamble},
-		{"lib_via_callback.sol", onlyPreamble},
-	};
-
-	vector<boost::filesystem::path> expectedIncludePaths = {
-		expectedWorkDir / "include/",
-		expectedWorkDir / "lib/nested",
-		expectedWorkDir / "lib/",
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {
-		canonicalWorkDir / "base",
-		canonicalWorkDir / "include",
-		canonicalWorkDir / "lib/nested",
-		canonicalWorkDir / "lib",
-	};
-
-	string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
-	OptionsReaderAndMessages result = runCLI(commandLine, "");
-
-	BOOST_TEST(result.stderrContent == "");
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
-		BOOST_TEST(result.stdoutContent == "");
-	else
-		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.includePaths() == expectedIncludePaths);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base/");
-}
-
-BOOST_AUTO_TEST_CASE(cli_no_contracts_to_compile)
-{
-	string const contractSource = R"(
-		// SPDX-License-Identifier: GPL-3.0
-		pragma solidity >=0.0;
-		enum Status { test }
-	)";
-
-	string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
-	OptionsReaderAndMessages result = runCLI({"solc", "-"}, contractSource);
-
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
-		BOOST_TEST(result.stdoutContent == "");
-	else
-		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
-	BOOST_REQUIRE(result.success);
-}
-
-BOOST_AUTO_TEST_CASE(cli_no_output)
-{
-	string const contractSource = R"(
-		// SPDX-License-Identifier: GPL-3.0
-		pragma solidity >=0.0;
-		abstract contract A {
-			function B() public virtual returns(uint);
-		})";
-
-	string const expectedStdoutContent = "Compiler run successful. No output generated.\n";
-	OptionsReaderAndMessages result = runCLI({"solc", "-"}, contractSource);
-
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
-		BOOST_TEST(result.stdoutContent == "");
-	else
-		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
-	BOOST_REQUIRE(result.success);
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_include_paths)
-{
-	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	string const mainContractSource = withPreamble(
-		"import 'contract_via_callback.sol';\n"
-		"import 'include_via_callback.sol';\n"
-		"import 'nested_via_callback.sol';\n"
-		"import 'lib_via_callback.sol';\n"
-	);
-
-	string const standardJsonInput = R"(
-		{
-			"language": "Solidity",
-			"sources": {
-				"main.sol": {"content": ")" + mainContractSource + R"("}
-			}
-		}
-	)";
-
-	string const onlyPreamble = withPreamble("");
-	createFilesWithParentDirs(
-		{
-			tempDir.path() / "base/contract_via_callback.sol",
-			tempDir.path() / "include/include_via_callback.sol",
-			tempDir.path() / "lib/nested/nested_via_callback.sol",
-			tempDir.path() / "lib/lib_via_callback.sol",
-		},
-		onlyPreamble
-	);
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
-
-	vector<string> commandLine = {
-		"solc",
-		"--base-path=base/",
-		"--include-path=include/",
-		"--include-path=lib/nested",
-		"--include-path=lib/",
-		"--standard-json",
-	};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.mode = InputMode::StandardJson;
-	expectedOptions.input.paths = {};
-	expectedOptions.input.addStdin = true;
-	expectedOptions.input.basePath = "base/";
-	expectedOptions.input.includePaths = {
-		"include/",
-		"lib/nested",
-		"lib/",
-	};
-	expectedOptions.modelChecker.initialize = false;
-
-	// NOTE: Source code from Standard JSON does not end up in FileReader. This is not a problem
-	// because FileReader is only used once to initialize the compiler stack and after that
-	// its sources are irrelevant (even though the callback still stores everything it loads).
-	map<string, string> expectedSources = {
-		{"contract_via_callback.sol", onlyPreamble},
-		{"include_via_callback.sol", onlyPreamble},
-		{"nested_via_callback.sol", onlyPreamble},
-		{"lib_via_callback.sol", onlyPreamble},
-	};
-
-	vector<boost::filesystem::path> expectedIncludePaths = {
-		expectedWorkDir / "include/",
-		expectedWorkDir / "lib/nested",
-		expectedWorkDir / "lib/",
-	};
-
-	FileReader::FileSystemPathSet expectedAllowedDirectories = {};
-
-	OptionsReaderAndMessages result = runCLI(commandLine, standardJsonInput);
-
-	Json::Value parsedStdout;
-	string jsonParsingErrors;
-	BOOST_TEST(util::jsonParseStrict(result.stdoutContent, parsedStdout, &jsonParsingErrors));
-	BOOST_TEST(jsonParsingErrors == "");
-	for (Json::Value const& errorDict: parsedStdout["errors"])
-		// The error list might contain pre-release compiler warning
-		BOOST_TEST(errorDict["severity"] != "error");
-	BOOST_TEST(
-		(parsedStdout["sources"].getMemberNames() | ranges::to<set>) ==
-		(expectedSources | ranges::views::keys | ranges::to<set>) + set<string>{"main.sol"}
-	);
-
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
-	BOOST_TEST(result.reader.includePaths() == expectedIncludePaths);
-	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base/");
-}
-
-BOOST_AUTO_TEST_CASE(cli_include_paths_empty_path)
-{
-	TemporaryDirectory tempDir({"base/", "include/"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-	createFilesWithParentDirs({tempDir.path() / "base/main.sol"});
-
-	string expectedMessage = "Empty values are not allowed in --include-path.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({
-			"solc",
-			"--base-path=base/",
-			"--include-path", "include/",
-			"--include-path", "",
-			"base/main.sol",
-		}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(cli_include_paths_without_base_path)
-{
-	TemporaryDirectory tempDir(TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-	createFilesWithParentDirs({tempDir.path() / "contract.sol"});
-
-	string expectedMessage = "--include-path option requires a non-empty base path.";
-
-	BOOST_CHECK_EXCEPTION(
-		parseCommandLineAndReadInputFiles({"solc", "--include-path", "include/", "contract.sol"}),
-		CommandLineValidationError,
-		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-	);
-}
-
-BOOST_AUTO_TEST_CASE(cli_include_paths_should_detect_source_unit_name_collisions)
-{
-	TemporaryDirectory tempDir({"dir1/", "dir2/", "dir3/"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-	createFilesWithParentDirs({
-		"dir1/contract1.sol",
-		"dir1/contract2.sol",
-		"dir2/contract1.sol",
-		"dir2/contract2.sol",
-	});
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
-
-	string expectedMessage =
-		"Source unit name collision detected. "
-		"The specified values of base path and/or include paths would result in multiple "
-		"input files being assigned the same source unit name:\n"
-		"contract1.sol matches: "
-		"\"" + (expectedWorkDir / "dir1/contract1.sol").generic_string() + "\", "
-		"\"" + (expectedWorkDir / "dir2/contract1.sol").generic_string() + "\"\n"
-		"contract2.sol matches: "
-		"\"" + (expectedWorkDir / "dir1/contract2.sol").generic_string() + "\", "
-		"\"" + (expectedWorkDir / "dir2/contract2.sol").generic_string() + "\"\n";
-
-	{
-		// import "contract1.sol" and import "contract2.sol" would be ambiguous:
-		BOOST_CHECK_EXCEPTION(
-			parseCommandLineAndReadInputFiles({
-				"solc",
-				"--base-path=dir1/",
-				"--include-path=dir2/",
-				"dir1/contract1.sol",
-				"dir2/contract1.sol",
-				"dir1/contract2.sol",
-				"dir2/contract2.sol",
-			}),
-			CommandLineValidationError,
-			[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-		);
-	}
-
-	{
-		// import "contract1.sol" and import "contract2.sol" would be ambiguous:
-		BOOST_CHECK_EXCEPTION(
-			parseCommandLineAndReadInputFiles({
-				"solc",
-				"--base-path=dir3/",
-				"--include-path=dir1/",
-				"--include-path=dir2/",
-				"dir1/contract1.sol",
-				"dir2/contract1.sol",
-				"dir1/contract2.sol",
-				"dir2/contract2.sol",
-			}),
-			CommandLineValidationError,
-			[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
-		);
-	}
-
-	{
-		// No conflict if files with the same name exist but only one is given to the compiler.
-		vector<string> commandLine = {
-			"solc",
-			"--base-path=dir3/",
-			"--include-path=dir1/",
-			"--include-path=dir2/",
-			"dir1/contract1.sol",
-			"dir1/contract2.sol",
-		};
-		OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-		BOOST_TEST(result.stderrContent == "");
-		BOOST_REQUIRE(result.success);
-	}
-
-	{
-		// The same file specified multiple times is not a conflict.
-		vector<string> commandLine = {
-			"solc",
-			"--base-path=dir3/",
-			"--include-path=dir1/",
-			"--include-path=dir2/",
-			"dir1/contract1.sol",
-			"dir1/contract1.sol",
-			"./dir1/contract1.sol",
-		};
-		OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-		BOOST_TEST(result.stderrContent == "");
-		BOOST_REQUIRE(result.success);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(cli_include_paths_should_allow_duplicate_paths)
-{
-	TemporaryDirectory tempDir({"dir1/", "dir2/"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-	createFilesWithParentDirs({"dir1/contract.sol"});
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
-	boost::filesystem::path expectedTempDir = "/" / tempDir.path().relative_path();
-
-	vector<string> commandLine = {
-		"solc",
-		"--base-path=dir1/",
-		"--include-path", "dir1",
-		"--include-path", "dir1",
-		"--include-path", "dir1/",
-		"--include-path", "dir1/",
-		"--include-path", "./dir1/",
-		"--include-path", "dir2/../dir1/",
-		"--include-path", (tempDir.path() / "dir1/").string(),
-		"--include-path", (expectedWorkDir / "dir1/").string(),
-		"--include-path", "dir1/",
-		"dir1/contract.sol",
-	};
-
-	// Duplicates do not affect the result but are not removed from the include path list.
-	vector<boost::filesystem::path> expectedIncludePaths = {
-		expectedWorkDir / "dir1",
-		expectedWorkDir / "dir1",
-		expectedWorkDir / "dir1/",
-		expectedWorkDir / "dir1/",
-		expectedWorkDir / "dir1/",
-		expectedWorkDir / "dir1/",
-		// NOTE: On macOS expectedTempDir usually contains a symlink and therefore for us it's
-		// different from expectedWorkDir.
-		expectedTempDir / "dir1/",
-		expectedWorkDir / "dir1/",
-		expectedWorkDir / "dir1/",
-	};
-
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(result.stderrContent == "");
-	BOOST_REQUIRE(result.success);
-	BOOST_TEST(result.reader.includePaths() == expectedIncludePaths);
-	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "dir1/");
-}
-
-BOOST_AUTO_TEST_CASE(cli_include_paths_ambiguous_import)
-{
-	TemporaryDirectory tempDir({"base/", "include/"}, TEST_CASE_NAME);
-	TemporaryWorkingDirectory tempWorkDir(tempDir);
-
-	// Ambiguous: both base/contract.sol and include/contract.sol match the import.
-	string const mainContractSource = withPreamble("import \"contract.sol\";");
-
-	createFilesWithParentDirs({"base/contract.sol", "include/contract.sol"}, withPreamble(""));
-
-	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
-
-	vector<string> commandLine = {
-		"solc",
-		"--no-color",
-		"--base-path=base/",
-		"--include-path=include/",
-		"-",
-	};
-
-	string expectedMessage =
-		"Error: Source \"contract.sol\" not found: Ambiguous import. "
-		"Multiple matching files found inside base path and/or include paths: \"" +
-		(expectedWorkDir / "base/contract.sol").generic_string() + "\", \"" +
-		(expectedWorkDir / "include/contract.sol").generic_string() + "\".\n"
-		" --> <stdin>:3:1:\n"
-		"  |\n"
-		"3 | import \"contract.sol\";\n"
-		"  | ^^^^^^^^^^^^^^^^^^^^^^\n\n";
-
-	OptionsReaderAndMessages result = runCLI(commandLine, mainContractSource);
-	BOOST_TEST(result.stderrContent == expectedMessage);
-	BOOST_REQUIRE(!result.success);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace solidity::frontend::test
diff --git a/test/solc/CommandLineInterfaceAllowPaths.cpp b/test/solc/CommandLineInterfaceAllowPaths.cpp
deleted file mode 100644
index cd301819de1a..000000000000
--- a/test/solc/CommandLineInterfaceAllowPaths.cpp
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Unit tests for solc/CommandLineInterface.h
-
-#include <solc/CommandLineInterface.h>
-
-#include <test/solc/Common.h>
-
-#include <test/Common.h>
-#include <test/FilesystemUtils.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <fstream>
-#include <regex>
-#include <string>
-#include <vector>
-
-using namespace std;
-using namespace solidity::frontend;
-using namespace solidity::util;
-using namespace solidity::test;
-
-#define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
-
-namespace
-{
-
-struct ImportCheck
-{
-	enum class Result
-	{
-		Unknown,        ///< Status is unknown due to a failure of the status check.
-		OK,             ///< Passed compilation without errors.
-		FileNotFound,   ///< Error was reported: file not found.
-		PathDisallowed, ///< Error was reported: file not allowed paths.
-	};
-
-	bool operator==(ImportCheck const& _other) const { return result == _other.result && message == _other.message; }
-	bool operator!=(ImportCheck const& _other) const { return !(*this == _other); }
-
-	operator bool() const { return this->result == Result::OK; }
-
-	static ImportCheck const OK() { return {Result::OK, ""}; }
-	static ImportCheck const FileNotFound() { return {Result::FileNotFound, ""}; }
-	static ImportCheck const PathDisallowed() { return {Result::PathDisallowed, ""}; }
-	static ImportCheck const Unknown(const string& _message) { return {Result::Unknown, _message}; }
-
-	Result result;
-	std::string message;
-};
-
-ImportCheck checkImport(
-	string const& _import,
-	vector<string> const& _cliOptions
-)
-{
-	soltestAssert(regex_match(_import, regex{R"(import '[^']*')"}), "");
-	for (string const& option: _cliOptions)
-		soltestAssert(
-			boost::starts_with(option, "--base-path") ||
-			boost::starts_with(option, "--include-path") ||
-			boost::starts_with(option, "--allow-paths") ||
-			!boost::starts_with(option, "--"),
-			""
-		);
-
-	vector<string> commandLine = {
-		"solc",
-		"-",
-		"--no-color",
-		"--error-codes",
-	};
-	commandLine += _cliOptions;
-
-	string standardInputContent =
-		"// SPDX-License-Identifier: GPL-3.0\n"
-		"pragma solidity >=0.0;\n" +
-		_import + ";";
-
-	test::OptionsReaderAndMessages cliResult = test::runCLI(commandLine, standardInputContent);
-	if (cliResult.success)
-		return ImportCheck::OK();
-
-	static regex const sourceNotFoundErrorRegex{
-		R"(^Error \(6275\): Source "[^"]+" not found: (.*)\.\n)"
-		R"(\s*--> .*<stdin>:\d+:\d+:\n)"
-		R"(\s*\|\n)"
-		R"(\d+\s*\| import '.+';\n)"
-		R"(\s*\| \^+\n\s*$)"
-	};
-
-	smatch submatches;
-	if (!regex_match(cliResult.stderrContent, submatches, sourceNotFoundErrorRegex))
-		return ImportCheck::Unknown("Unexpected stderr content: '" + cliResult.stderrContent + "'");
-	if (submatches[1] != "File not found" && !boost::starts_with(string(submatches[1]), "File outside of allowed directories"))
-		return ImportCheck::Unknown("Unexpected error message: '" + cliResult.stderrContent + "'");
-
-	if (submatches[1] == "File not found")
-		return ImportCheck::FileNotFound();
-	else if (boost::starts_with(string(submatches[1]), "File outside of allowed directories"))
-		return ImportCheck::PathDisallowed();
-	else
-		return ImportCheck::Unknown("Unexpected error message '" + submatches[1].str() + "'");
-}
-
-class AllowPathsFixture
-{
-protected:
-	AllowPathsFixture():
-		m_tempDir({"code/", "work/"}, TEST_CASE_NAME),
-		m_tempWorkDir(m_tempDir.path() / "work"),
-		m_codeDir(m_tempDir.path() / "code"),
-		m_workDir(m_tempDir.path() / "work"),
-		m_portablePrefix(("/" / boost::filesystem::canonical(m_codeDir).relative_path()).generic_string())
-	{
-		createFilesWithParentDirs(
-			{
-				m_codeDir / "a/b/c/d.sol",
-				m_codeDir / "a/b/c.sol",
-				m_codeDir / "a/b/X.sol",
-				m_codeDir / "a/X/c.sol",
-				m_codeDir / "X/b/c.sol",
-
-				m_codeDir / "a/bc/d.sol",
-				m_codeDir / "X/bc/d.sol",
-
-				m_codeDir / "x/y/z.sol",
-				m_codeDir / "1/2/3.sol",
-				m_codeDir / "contract.sol",
-
-				m_workDir / "a/b/c/d.sol",
-				m_workDir / "a/b/c.sol",
-				m_workDir / "a/b/X.sol",
-				m_workDir / "a/X/c.sol",
-				m_workDir / "X/b/c.sol",
-
-				m_workDir / "contract.sol",
-			},
-			"// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;"
-		);
-
-		if (
-			!createSymlinkIfSupportedByFilesystem("b", m_codeDir / "a/b_sym", true) ||
-			!createSymlinkIfSupportedByFilesystem("../x/y", m_codeDir / "a/y_sym", true) ||
-			!createSymlinkIfSupportedByFilesystem("../../a/b/c.sol", m_codeDir / "a/b/c_sym.sol", false) ||
-			!createSymlinkIfSupportedByFilesystem("../../x/y/z.sol", m_codeDir / "a/b/z_sym.sol", false)
-		)
-			return;
-
-		m_caseSensitiveFilesystem = boost::filesystem::create_directories(m_codeDir / "A/B/C");
-		soltestAssert(boost::filesystem::equivalent(m_codeDir / "a/b/c", m_codeDir / "A/B/C") != m_caseSensitiveFilesystem, "");
-	}
-
-	TemporaryDirectory m_tempDir;
-	TemporaryWorkingDirectory m_tempWorkDir;
-	boost::filesystem::path const m_codeDir;
-	boost::filesystem::path const m_workDir;
-	string m_portablePrefix;
-	bool m_caseSensitiveFilesystem = true;
-};
-
-ostream& operator<<(ostream& _out, ImportCheck const& _value)
-{
-	switch (_value.result)
-	{
-	case ImportCheck::Result::Unknown: _out << "Unknown"; break;
-	case ImportCheck::Result::OK: _out << "OK"; break;
-	case ImportCheck::Result::FileNotFound: _out << "FileNotFound"; break;
-	case ImportCheck::Result::PathDisallowed: _out << "PathDisallowed"; break;
-	}
-	if (_value.message != "")
-		_out << "(" << _value.message << ")";
-	return _out;
-}
-
-} // namespace
-
-namespace boost::test_tools::tt_detail
-{
-
-// Boost won't find the << operator unless we put it in the std namespace which is illegal.
-// The recommended solution is to overload print_log_value<> struct and make it use our operator.
-
-template<>
-struct print_log_value<ImportCheck>
-{
-	void operator()(std::ostream& _out, ImportCheck const& _value) { ::operator<<(_out, _value); }
-};
-
-} // namespace boost::test_tools::tt_detail
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(CommandLineInterfaceAllowPathsTest)
-
-BOOST_FIXTURE_TEST_CASE(allow_path_multiple_paths, AllowPathsFixture)
-{
-	string allowedPaths =
-		m_codeDir.generic_string() + "/a/b/X.sol," +
-		m_codeDir.generic_string() + "/X/," +
-		m_codeDir.generic_string() + "/z," +
-		m_codeDir.generic_string() + "/a/b";
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths", allowedPaths}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"--allow-paths", allowedPaths}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"--allow-paths", allowedPaths}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"--allow-paths", allowedPaths}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_should_work_with_various_path_forms, AllowPathsFixture)
-{
-	string import = "import '" + m_portablePrefix + "/a/b/c.sol'";
-
-	// Without --allow-path
-	BOOST_TEST(checkImport(import, {}) == ImportCheck::PathDisallowed());
-
-	// Absolute paths allowed
-	BOOST_TEST(checkImport(import, {"--allow-paths", m_codeDir.string()}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", m_codeDir.string() + "/a/"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", m_codeDir.string() + "/a/b"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", m_codeDir.string() + "/a/b/c.sol"}));
-
-	// Relative paths allowed
-	BOOST_TEST(checkImport(import, {"--allow-paths=../code/a"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=../code/a/"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=../code/a/b"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=../code/a/b/c.sol"}));
-
-	// Non-normalized paths allowed
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/."}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/./"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/.."}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/../"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/b"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/./b"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/../a/b"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a///b"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/b//"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths", "./../code/a/b///"}));
-
-	// Root path allowed
-	BOOST_TEST(checkImport(import, {"--allow-paths=/"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=///"}));
-
-	// UNC paths should be treated differently from normal paths
-	soltestAssert(FileReader::isUNCPath("/" + m_portablePrefix), "");
-	BOOST_TEST(checkImport(import, {"--allow-paths=//"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport(import, {"--allow-paths=/" + m_portablePrefix}) == ImportCheck::PathDisallowed());
-
-	// Paths going beyond root allowed
-	BOOST_TEST(checkImport(import, {"--allow-paths=/../../"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=/../.."}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=/../../a/../"}));
-	BOOST_TEST(checkImport(import, {"--allow-paths=/../../" + m_portablePrefix}));
-
-	// File named like a directory
-	BOOST_TEST(checkImport(import, {"--allow-paths", m_codeDir.string() + "/a/b/c.sol/"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_should_handle_empty_paths, AllowPathsFixture)
-{
-	// Work dir is base path
-	BOOST_TEST(checkImport("import 'a/../../work/a/b/c.sol'", {"--allow-paths", ""}));
-	BOOST_TEST(checkImport("import 'a/../../work/a/b/c.sol'", {"--allow-paths", "x,,y"}));
-	BOOST_TEST(checkImport("import 'a/../../code/a/b/c.sol'", {"--allow-paths", ""}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'a/../../code/a/b/c.sol'", {"--allow-paths", "x,,y"}) == ImportCheck::PathDisallowed());
-
-	// Work dir is not base path
-	BOOST_TEST(checkImport("import 'a/../../work/a/b/c.sol'", {"--allow-paths", "", "--base-path=../code/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'a/../../work/a/b/c.sol'", {"--allow-paths", "x,,y", "--base-path=../code/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'a/../../code/a/b/c.sol'", {"--allow-paths", "", "--base-path=../code/"}));
-	BOOST_TEST(checkImport("import 'a/../../code/a/b/c.sol'", {"--allow-paths", "x,,y", "--base-path=../code/"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_case_sensitive, AllowPathsFixture)
-{
-	// Allowed paths are case-sensitive even on case-insensitive filesystems
-	BOOST_TEST(
-		checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths", m_codeDir.string() + "/A/B/"}) ==
-		ImportCheck::PathDisallowed()
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_should_work_with_various_import_forms, AllowPathsFixture)
-{
-	// Absolute import paths
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths", "../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"--allow-paths", "../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"--allow-paths", "../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"--allow-paths", "../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths", "../code/a/b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"--allow-paths", "../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"--allow-paths", "../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"--allow-paths", "../code/a/b/"}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths", "../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"--allow-paths", "../code/a/b"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"--allow-paths", "../code/a/b"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"--allow-paths", "../code/a/b"}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths", "../code/a"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"--allow-paths", "../code/a"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"--allow-paths", "../code/a"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"--allow-paths", "../code/a"}));
-
-	// Relative import paths
-	// NOTE: Base path is whitelisted by default so we need the 'a/../../code/' part to get
-	// outside of it. And it can't be just '../code/' because that would not be a direct import.
-	BOOST_TEST(checkImport("import 'a/../../code/a/b/c.sol'", {"--allow-paths", "../code/a/b"}));
-	BOOST_TEST(checkImport("import 'a/../../code/X/b/c.sol'", {"--allow-paths", "../code/a/b"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'a/../../code/a/X/c.sol'", {"--allow-paths", "../code/a/b"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'a/../../code/a/b/X.sol'", {"--allow-paths", "../code/a/b"}));
-
-	// Non-normalized relative import paths
-	BOOST_TEST(checkImport("import 'a/../../code/a/./b/c.sol'", {"--allow-paths", "../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import 'a/../../code/a/../a/b/c.sol'", {"--allow-paths", "../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import 'a/../../code/a///b/c.sol'", {"--allow-paths", "../code/a/b/c.sol"}));
-
-#if !defined(_WIN32)
-	// UNC paths in imports.
-	// Unfortunately can't test it on Windows without having an existing UNC path. On Linux we can
-	// at least rely on the fact that `//` works like `/`.
-	string uncImportPath = "/" + m_portablePrefix + "/a/b/c.sol";
-	soltestAssert(FileReader::isUNCPath(uncImportPath), "");
-	BOOST_TEST(checkImport("import '" + uncImportPath + "'", {"--allow-paths", "../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-#endif
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_automatic_whitelisting_input_files, AllowPathsFixture)
-{
-	// By default none of the files is whitelisted
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c/d.sol'", {}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {}) == ImportCheck::PathDisallowed());
-
-	// Compiling a file whitelists its directory and subdirectories
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {m_codeDir.string() + "/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c/d.sol'", {m_codeDir.string() + "/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {m_codeDir.string() + "/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {m_codeDir.string() + "/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {m_codeDir.string() + "/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {m_codeDir.string() + "/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-
-	// If only file name is specified, its parent dir path is empty. This should be equivalent to
-	// whitelisting the work dir.
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/contract.sol'", {"contract.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'contract.sol'", {"contract.sol"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_automatic_whitelisting_remappings, AllowPathsFixture)
-{
-	// Adding a remapping whitelists target's parent directory and subdirectories
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c/d.sol'", {"x=../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"x=../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {"x=../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=/contract.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=/contract.sol/"}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {m_portablePrefix + "/a/b=../code/X/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {m_portablePrefix + "/a/b/=../code/X/b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {m_portablePrefix + "/a/b=../code/X/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {m_portablePrefix + "/a/b/=../code/X/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {m_portablePrefix + "/a/b:y/z=x/w"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {m_portablePrefix + "/a/b:y/z=x/w"}) == ImportCheck::PathDisallowed());
-
-	// Adding a remapping whitelists the target and subdirectories when the target is a directory
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c/d.sol'", {"x=../code/a/b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"x=../code/a/b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {"x=../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {"x=../code/a/c/"}) == ImportCheck::PathDisallowed());
-
-	// Adding a remapping whitelists target's parent directory and subdirectories when the target
-	// is a directory but does not have a trailing slash
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c/d.sol'", {"x=../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/X.sol'", {"x=../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {"x=../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/bc/d.sol'", {"x=../code/a/c"}));
-
-	// Adding a remapping to a relative target at VFS root whitelists the work dir
-	BOOST_TEST(checkImport("import '/../../x/y/z.sol'", {"x=contract.sol", "--base-path=../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '/../../../work/a/b/c.sol'", {"x=contract.sol", "--base-path=../code/a/b/"}));
-
-	BOOST_TEST(checkImport("import '/../../x/y/z.sol'", {"x=contract.sol/", "--base-path=../code/a/b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '/../../../work/a/b/c.sol'", {"x=contract.sol/", "--base-path=../code/a/b/"}) == ImportCheck::PathDisallowed());
-
-	// Adding a remapping with an empty target does not whitelist anything
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + m_portablePrefix + "/a/b/c.sol'", {m_portablePrefix + "="}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"../code/="}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '/../work/a/b/c.sol'", {"../code/=", "--base-path", m_portablePrefix}) == ImportCheck::PathDisallowed());
-
-	// Adding a remapping that includes .. or . segments whitelists the parent dir and subdirectories
-	// of the resolved target
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=."}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=."}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=./"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=./"}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=.."}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=.."}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../"}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b/./.."}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b/./.."}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b/./.."}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b/./../"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b/./../"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b/./../"}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b/./../b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b/./../b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b/./../b"}) == ImportCheck::PathDisallowed());
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"x=../code/a/b/./../b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/X/c.sol'", {"x=../code/a/b/./../b/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/X/b/c.sol'", {"x=../code/a/b/./../b/"}) == ImportCheck::PathDisallowed());
-
-	// If the target is just a file name, its parent dir path is empty. This should be equivalent to
-	// whitelisting the work dir.
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/contract.sol'", {"x=contract.sol"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import 'contract.sol'", {"x=contract.sol"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_automatic_whitelisting_base_path, AllowPathsFixture)
-{
-	// Relative base path whitelists its content
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=../code/a"}));
-	BOOST_TEST(checkImport("import 'b/c/d.sol'", {"--base-path=../code/a"}));
-	BOOST_TEST(checkImport("import 'b/X.sol'", {"--base-path=../code/a"}));
-	BOOST_TEST(checkImport("import 'X/c.sol'", {"--base-path=../code/a"}));
-
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=../code/a/"}));
-	BOOST_TEST(checkImport("import 'b/c/d.sol'", {"--base-path=../code/a/"}));
-	BOOST_TEST(checkImport("import 'b/X.sol'", {"--base-path=../code/a/"}));
-	BOOST_TEST(checkImport("import 'X/c.sol'", {"--base-path=../code/a/"}));
-
-	BOOST_TEST(checkImport("import 'a/b/c.sol'", {"--base-path=../code/."}));
-	BOOST_TEST(checkImport("import 'a/b/c.sol'", {"--base-path=../code/./"}));
-	BOOST_TEST(checkImport("import 'code/a/b/c.sol'", {"--base-path=.."}));
-	BOOST_TEST(checkImport("import 'code/a/b/c.sol'", {"--base-path=../"}));
-
-	// Absolute base path whitelists its content
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport("import 'b/c/d.sol'", {"--base-path", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport("import 'b/X.sol'", {"--base-path", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport("import 'X/c.sol'", {"--base-path", m_codeDir.string() + "/a"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_automatic_whitelisting_work_dir, AllowPathsFixture)
-{
-	// Work dir is only automatically whitelisted if it matches base path
-	BOOST_TEST(checkImport("import 'b/../../../work/a/b/c.sol'", {"--base-path=../code/a/"}) == ImportCheck::PathDisallowed());
-
-	// Compiling a file in the work dir whitelists it even if it's not in base path
-	BOOST_TEST(checkImport("import 'b/../../../work/a/b/c.sol'", {"--base-path", "../code/a/", "a/b/c.sol"}));
-
-	// Work dir can also be whitelisted manually
-	BOOST_TEST(checkImport("import 'b/../../../work/a/b/c.sol'", {"--base-path", "../code/a/", "--allow-paths=."}));
-
-	// Not setting base path whitelists the working directory
-	BOOST_TEST(checkImport("import 'a/b/c.sol'", {}));
-	BOOST_TEST(checkImport("import 'a/b/c/d.sol'", {}));
-	BOOST_TEST(checkImport("import 'a/b/X.sol'", {}));
-	BOOST_TEST(checkImport("import 'a/X/c.sol'", {}));
-
-	// Setting base path to an empty value whitelists the working directory
-	BOOST_TEST(checkImport("import 'a/b/c.sol'", {"--base-path", ""}));
-	BOOST_TEST(checkImport("import 'a/b/c/d.sol'", {"--base-path", ""}));
-	BOOST_TEST(checkImport("import 'a/b/X.sol'", {"--base-path", ""}));
-	BOOST_TEST(checkImport("import 'a/X/c.sol'", {"--base-path", ""}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_automatic_whitelisting_include_paths, AllowPathsFixture)
-{
-	// Relative include path whitelists its content
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=a/b/c", "--include-path=../code/a"}));
-	BOOST_TEST(checkImport("import 'b/c/d.sol'", {"--base-path=a/b/c", "--include-path=../code/a"}));
-	BOOST_TEST(checkImport("import 'b/X.sol'", {"--base-path=a/b/c", "--include-path=../code/a"}));
-	BOOST_TEST(checkImport("import 'X/c.sol'", {"--base-path=a/b/c", "--include-path=../code/a"}));
-
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=a/b/c", "--include-path=../code/a/"}));
-	BOOST_TEST(checkImport("import 'b/c/d.sol'", {"--base-path=a/b/c", "--include-path=../code/a/"}));
-	BOOST_TEST(checkImport("import 'b/X.sol'", {"--base-path=a/b/c", "--include-path=../code/a/"}));
-	BOOST_TEST(checkImport("import 'X/c.sol'", {"--base-path=a/b/c", "--include-path=../code/a/"}));
-
-	BOOST_TEST(checkImport("import 'a/b/c.sol'", {"--base-path=a/b/c", "--include-path=../code/."}));
-	BOOST_TEST(checkImport("import 'a/b/c.sol'", {"--base-path=a/b/c", "--include-path=../code/./"}));
-	BOOST_TEST(checkImport("import 'code/a/b/c.sol'", {"--base-path=a/b/c", "--include-path=.."}));
-	BOOST_TEST(checkImport("import 'code/a/b/c.sol'", {"--base-path=a/b/c", "--include-path=../"}));
-
-	// Absolute include path whitelists its content
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=a/b/c", "--include-path", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport("import 'b/c/d.sol'", {"--base-path=a/b/c", "--include-path", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport("import 'b/X.sol'", {"--base-path=a/b/c", "--include-path", m_codeDir.string() + "/a"}));
-	BOOST_TEST(checkImport("import 'X/c.sol'", {"--base-path=a/b/c", "--include-path", m_codeDir.string() + "/a"}));
-
-	// If there are multiple include paths, all of them get whitelisted
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=a/b/c", "--include-path=../code/a", "--include-path=../code/1"}));
-	BOOST_TEST(checkImport("import '2/3.sol'", {"--base-path=a/b/c", "--include-path=../code/a", "--include-path=../code/1"}));
-	BOOST_TEST(checkImport("import 'b/c.sol'", {"--base-path=a/b/c", "--include-path=../code/1", "--include-path=../code/a"}));
-	BOOST_TEST(checkImport("import '2/3.sol'", {"--base-path=a/b/c", "--include-path=../code/1", "--include-path=../code/a"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_symlinks_within_whitelisted_dir, AllowPathsFixture)
-{
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b_sym/c.sol'", {"--allow-paths=../code/a/b/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths=../code/a/b_sym/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b_sym/c.sol'", {"--allow-paths=../code/a/b_sym/"}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b_sym/c.sol'", {"--allow-paths=../code/a/b"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths=../code/a/b_sym"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b_sym/c.sol'", {"--allow-paths=../code/a/b_sym"}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c_sym.sol'", {"--allow-paths=../code/a/b/c.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c.sol'", {"--allow-paths=../code/a/b/c_sym.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/c_sym.sol'", {"--allow-paths=../code/a/b/c_sym.sol"}));
-}
-
-BOOST_FIXTURE_TEST_CASE(allow_path_symlinks_outside_whitelisted_dir, AllowPathsFixture)
-{
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/y_sym/z.sol'", {"--allow-paths=../code/a/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/y_sym/z.sol'", {"--allow-paths=../code/x/"}));
-
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/z_sym.sol'", {"--allow-paths=../code/a/"}) == ImportCheck::PathDisallowed());
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/z_sym.sol'", {"--allow-paths=../code/x/"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/z_sym.sol'", {"--allow-paths=../code/a/b/z_sym.sol"}));
-	BOOST_TEST(checkImport("import '" + m_portablePrefix + "/a/b/z_sym.sol'", {"--allow-paths=../code/x/y/z.sol"}));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace solidity::frontend::test
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
deleted file mode 100644
index caad98f999a2..000000000000
--- a/test/solc/CommandLineParser.cpp
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Unit tests for solc/CommandLineParser.h
-
-#include <solc/CommandLineParser.h>
-#include <solc/Exceptions.h>
-
-#include <test/solc/Common.h>
-
-#include <test/Common.h>
-#include <test/libsolidity/util/SoltestErrors.h>
-
-#include <libsolutil/CommonData.h>
-#include <liblangutil/EVMVersion.h>
-#include <libsmtutil/SolverInterface.h>
-#include <libsolidity/interface/Version.h>
-
-#include <map>
-#include <optional>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-using namespace std;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-namespace
-{
-
-CommandLineOptions parseCommandLine(vector<string> const& _commandLine)
-{
-	vector<char const*> argv = test::makeArgv(_commandLine);
-
-	CommandLineParser cliParser;
-	cliParser.parse(static_cast<int>(_commandLine.size()), argv.data());
-	return cliParser.options();
-}
-
-} // namespace
-
-namespace solidity::frontend::test
-{
-
-BOOST_AUTO_TEST_SUITE(CommandLineParserTest)
-
-BOOST_AUTO_TEST_CASE(no_options)
-{
-	vector<string> commandLine = {"solc", "contract.sol"};
-
-	CommandLineOptions expectedOptions;
-	expectedOptions.input.paths = {"contract.sol"};
-	expectedOptions.modelChecker.initialize = true;
-	expectedOptions.modelChecker.settings = {};
-
-	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
-
-	BOOST_TEST(parsedOptions == expectedOptions);
-}
-
-BOOST_AUTO_TEST_CASE(help_license_version)
-{
-	map<string, InputMode> expectedModePerOption = {
-		{"--help", InputMode::Help},
-		{"--license", InputMode::License},
-		{"--version", InputMode::Version},
-	};
-
-	for (auto const& [option, expectedMode]: expectedModePerOption)
-	{
-		CommandLineOptions parsedOptions = parseCommandLine({"solc", option});
-
-		CommandLineOptions expectedOptions;
-		expectedOptions.input.mode = expectedMode;
-
-		BOOST_TEST(parsedOptions == expectedOptions);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(cli_mode_options)
-{
-	for (InputMode inputMode: {InputMode::Compiler, InputMode::CompilerWithASTImport})
-	{
-		vector<string> commandLine = {
-			"solc",
-			"contract.sol",             // Both modes do not care about file names, just about
-			"/tmp/projects/token.sol",  // their content. They also both support stdin.
-			"/home/user/lib/dex.sol",
-			"file",
-			"input.json",
-			"-",
-			"/tmp=/usr/lib/",
-			"a:b=c/d",
-			":contract.sol=",
-			"--base-path=/home/user/",
-			"--include-path=/usr/lib/include/",
-			"--include-path=/home/user/include",
-			"--allow-paths=/tmp,/home,project,../contracts",
-			"--ignore-missing",
-			"--output-dir=/tmp/out",
-			"--overwrite",
-			"--evm-version=spuriousDragon",
-			"--via-ir",
-			"--experimental-via-ir",
-			"--revert-strings=strip",
-			"--debug-info=location",
-			"--pretty-json",
-			"--json-indent=7",
-			"--no-color",
-			"--error-codes",
-			"--libraries="
-				"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
-				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
-			"--ast-compact-json", "--asm", "--asm-json", "--opcodes", "--bin", "--bin-runtime", "--abi",
-			"--ir", "--ir-ast-json", "--ir-optimized", "--ir-optimized-ast-json", "--hashes", "--userdoc", "--devdoc", "--metadata", "--storage-layout",
-			"--gas",
-			"--combined-json="
-				"abi,metadata,bin,bin-runtime,opcodes,asm,storage-layout,generated-sources,generated-sources-runtime,"
-				"srcmap,srcmap-runtime,function-debug,function-debug-runtime,hashes,devdoc,userdoc,ast",
-			"--metadata-hash=swarm",
-			"--metadata-literal",
-			"--optimize",
-			"--optimize-yul",
-			"--optimize-runs=1000",
-			"--yul-optimizations=agf",
-			"--model-checker-bmc-loop-iterations=2",
-			"--model-checker-contracts=contract1.yul:A,contract2.yul:B",
-			"--model-checker-div-mod-no-slacks",
-			"--model-checker-engine=bmc",
-			"--model-checker-ext-calls=trusted",
-			"--model-checker-invariants=contract,reentrancy",
-			"--model-checker-show-proved-safe",
-			"--model-checker-show-unproved",
-			"--model-checker-show-unsupported",
-			"--model-checker-solvers=z3,smtlib2",
-			"--model-checker-targets=underflow,divByZero",
-			"--model-checker-timeout=5"
-		};
-
-		if (inputMode == InputMode::CompilerWithASTImport)
-			commandLine += vector<string>{
-				"--import-ast",
-			};
-
-		CommandLineOptions expectedOptions;
-		expectedOptions.input.mode = inputMode;
-		expectedOptions.input.paths = {"contract.sol", "/tmp/projects/token.sol", "/home/user/lib/dex.sol", "file", "input.json"};
-		expectedOptions.input.remappings = {
-			{"", "/tmp", "/usr/lib/"},
-			{"a", "b", "c/d"},
-			{"", "contract.sol", ""},
-		};
-
-		expectedOptions.input.addStdin = true;
-		expectedOptions.input.basePath = "/home/user/";
-		expectedOptions.input.includePaths = {"/usr/lib/include/", "/home/user/include"};
-
-		expectedOptions.input.allowedDirectories = {"/tmp", "/home", "project", "../contracts", "c", "/usr/lib"};
-		expectedOptions.input.ignoreMissingFiles = true;
-		expectedOptions.output.dir = "/tmp/out";
-		expectedOptions.output.overwriteFiles = true;
-		expectedOptions.output.evmVersion = EVMVersion::spuriousDragon();
-		expectedOptions.output.viaIR = true;
-		expectedOptions.output.revertStrings = RevertStrings::Strip;
-		expectedOptions.output.debugInfoSelection = DebugInfoSelection::fromString("location");
-		expectedOptions.formatting.json = JsonFormat{JsonFormat::Pretty, 7};
-		expectedOptions.linker.libraries = {
-			{"dir1/file1.sol:L", h160("1234567890123456789012345678901234567890")},
-			{"dir2/file2.sol:L", h160("1111122222333334444455555666667777788888")},
-		};
-		expectedOptions.formatting.coloredOutput = false;
-		expectedOptions.formatting.withErrorIds = true;
-		expectedOptions.compiler.outputs = {
-			true, true, true, true, true,
-			true, true, true, true, true,
-			true, true, true, true, true,
-			true,
-		};
-		expectedOptions.compiler.estimateGas = true;
-		expectedOptions.compiler.combinedJsonRequests = {
-			true, true, true, true, true,
-			true, true, true, true, true,
-			true, true, true, true, true,
-			true, true,
-		};
-		expectedOptions.metadata.hash = CompilerStack::MetadataHash::Bzzr1;
-		expectedOptions.metadata.literalSources = true;
-		expectedOptions.optimizer.optimizeEvmasm = true;
-		expectedOptions.optimizer.optimizeYul = true;
-		expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
-		expectedOptions.optimizer.yulSteps = "agf";
-
-		expectedOptions.modelChecker.initialize = true;
-		expectedOptions.modelChecker.settings = {
-			2,
-			{{{"contract1.yul", {"A"}}, {"contract2.yul", {"B"}}}},
-			true,
-			{true, false},
-			{ModelCheckerExtCalls::Mode::TRUSTED},
-			{{InvariantType::Contract, InvariantType::Reentrancy}},
-			false, // --model-checker-print-query
-			true,
-			true,
-			true,
-			{false, false, true, true},
-			{{VerificationTargetType::Underflow, VerificationTargetType::DivByZero}},
-			5,
-		};
-
-		CommandLineOptions parsedOptions = parseCommandLine(commandLine);
-
-		BOOST_TEST(parsedOptions == expectedOptions);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(no_cbor_metadata)
-{
-	vector<string> commandLine = {"solc", "--no-cbor-metadata", "contract.sol"};
-	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
-	bool assert = parsedOptions.metadata.format == CompilerStack::MetadataFormat::NoMetadata;
-
-	BOOST_TEST(assert);
-}
-
-BOOST_AUTO_TEST_CASE(no_import_callback)
-{
-	std::vector<std::vector<std::string>> commandLinePerInputMode = {
-		{"solc", "--no-import-callback", "contract.sol"},
-		{"solc", "--standard-json", "--no-import-callback", "input.json"},
-		{"solc", "--assemble", "--no-import-callback", "input.yul"},
-		{"solc", "--strict-assembly", "--no-import-callback", "input.yul"},
-		{"solc", "--import-ast", "--no-import-callback", "ast.json"},
-		{"solc", "--link", "--no-import-callback", "input.bin"},
-		{"solc", "--yul", "--no-import-callback", "input.yul"},
-	};
-
-	for (auto const& commandLine: commandLinePerInputMode)
-	{
-		CommandLineOptions parsedOptions = parseCommandLine(commandLine);
-		BOOST_TEST(parsedOptions.input.noImportCallback);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(via_ir_options)
-{
-	BOOST_TEST(!parseCommandLine({"solc", "contract.sol"}).output.viaIR);
-	for (string viaIrOption: {"--via-ir", "--experimental-via-ir"})
-		BOOST_TEST(parseCommandLine({"solc", viaIrOption, "contract.sol"}).output.viaIR);
-}
-
-BOOST_AUTO_TEST_CASE(assembly_mode_options)
-{
-	static vector<tuple<vector<string>, YulStack::Machine, YulStack::Language>> const allowedCombinations = {
-		{{"--machine=evm", "--yul-dialect=evm", "--assemble"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
-		{{"--machine=evm", "--yul-dialect=evm", "--yul"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
-		{{"--machine=evm", "--yul-dialect=evm", "--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
-		{{"--machine=evm", "--assemble"}, YulStack::Machine::EVM, YulStack::Language::Assembly},
-		{{"--machine=evm", "--yul"}, YulStack::Machine::EVM, YulStack::Language::Yul},
-		{{"--machine=evm", "--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
-		{{"--assemble"}, YulStack::Machine::EVM, YulStack::Language::Assembly},
-		{{"--yul"}, YulStack::Machine::EVM, YulStack::Language::Yul},
-		{{"--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
-	};
-
-	for (auto const& [assemblyOptions, expectedMachine, expectedLanguage]: allowedCombinations)
-	{
-		vector<string> commandLine = {
-			"solc",
-			"contract.yul",
-			"/tmp/projects/token.yul",
-			"/home/user/lib/dex.yul",
-			"file",
-			"input.json",
-			"-",
-			"/tmp=/usr/lib/",
-			"a:b=c/d",
-			":contract.yul=",
-			"--base-path=/home/user/",
-			"--include-path=/usr/lib/include/",
-			"--include-path=/home/user/include",
-			"--allow-paths=/tmp,/home,project,../contracts",
-			"--ignore-missing",
-			"--overwrite",
-			"--evm-version=spuriousDragon",
-			"--revert-strings=strip",      // Accepted but has no effect in assembly mode
-			"--debug-info=location",
-			"--pretty-json",
-			"--json-indent=1",
-			"--no-color",
-			"--error-codes",
-			"--libraries="
-				"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
-				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
-			"--asm",
-			"--bin",
-			"--ir-optimized",
-			"--ast-compact-json",
-		};
-		commandLine += assemblyOptions;
-		if (expectedLanguage == YulStack::Language::StrictAssembly)
-			commandLine += vector<string>{
-				"--optimize",
-				"--optimize-runs=1000",
-				"--yul-optimizations=agf",
-			};
-
-		CommandLineOptions expectedOptions;
-		expectedOptions.input.mode = InputMode::Assembler;
-
-		expectedOptions.input.paths = {"contract.yul", "/tmp/projects/token.yul", "/home/user/lib/dex.yul", "file", "input.json"};
-		expectedOptions.input.remappings = {
-			{"", "/tmp", "/usr/lib/"},
-			{"a", "b", "c/d"},
-			{"", "contract.yul", ""},
-		};
-		expectedOptions.input.addStdin = true;
-		expectedOptions.input.basePath = "/home/user/";
-		expectedOptions.input.includePaths = {"/usr/lib/include/", "/home/user/include"};
-		expectedOptions.input.allowedDirectories = {"/tmp", "/home", "project", "../contracts", "c", "/usr/lib"};
-		expectedOptions.input.ignoreMissingFiles = true;
-		expectedOptions.output.overwriteFiles = true;
-		expectedOptions.output.evmVersion = EVMVersion::spuriousDragon();
-		expectedOptions.output.revertStrings = RevertStrings::Strip;
-		expectedOptions.output.debugInfoSelection = DebugInfoSelection::fromString("location");
-		expectedOptions.formatting.json = JsonFormat {JsonFormat::Pretty, 1};
-		expectedOptions.assembly.targetMachine = expectedMachine;
-		expectedOptions.assembly.inputLanguage = expectedLanguage;
-		expectedOptions.linker.libraries = {
-			{"dir1/file1.sol:L", h160("1234567890123456789012345678901234567890")},
-			{"dir2/file2.sol:L", h160("1111122222333334444455555666667777788888")},
-		};
-		expectedOptions.formatting.coloredOutput = false;
-		expectedOptions.formatting.withErrorIds = true;
-		expectedOptions.compiler.outputs.asm_ = true;
-		expectedOptions.compiler.outputs.binary = true;
-		expectedOptions.compiler.outputs.irOptimized = true;
-		expectedOptions.compiler.outputs.astCompactJson = true;
-		if (expectedLanguage == YulStack::Language::StrictAssembly)
-		{
-			expectedOptions.optimizer.optimizeEvmasm = true;
-			expectedOptions.optimizer.optimizeYul = true;
-			expectedOptions.optimizer.yulSteps = "agf";
-			expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
-		}
-
-		CommandLineOptions parsedOptions = parseCommandLine(commandLine);
-
-		BOOST_TEST(parsedOptions == expectedOptions);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(standard_json_mode_options)
-{
-	vector<string> commandLine = {
-		"solc",
-		"input.json",
-		"--standard-json",
-		"--base-path=/home/user/",
-		"--include-path=/usr/lib/include/",
-		"--include-path=/home/user/include",
-		"--allow-paths=/tmp,/home,project,../contracts",
-		"--ignore-missing",
-		"--output-dir=/tmp/out",           // Accepted but has no effect in Standard JSON mode
-		"--overwrite",                     // Accepted but has no effect in Standard JSON mode
-		"--evm-version=spuriousDragon",    // Ignored in Standard JSON mode
-		"--revert-strings=strip",          // Accepted but has no effect in Standard JSON mode
-		"--pretty-json",
-		"--json-indent=1",
-		"--no-color",                      // Accepted but has no effect in Standard JSON mode
-		"--error-codes",                   // Accepted but has no effect in Standard JSON mode
-		"--libraries="                     // Ignored in Standard JSON mode
-			"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
-			"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
-		"--gas",                           // Accepted but has no effect in Standard JSON mode
-		"--combined-json=abi,bin",         // Accepted but has no effect in Standard JSON mode
-	};
-
-	CommandLineOptions expectedOptions;
-
-	expectedOptions.input.mode = InputMode::StandardJson;
-	expectedOptions.input.paths = {"input.json"};
-	expectedOptions.input.basePath = "/home/user/";
-	expectedOptions.input.includePaths = {"/usr/lib/include/", "/home/user/include"};
-	expectedOptions.input.allowedDirectories = {"/tmp", "/home", "project", "../contracts"};
-	expectedOptions.input.ignoreMissingFiles = true;
-	expectedOptions.output.dir = "/tmp/out";
-	expectedOptions.output.overwriteFiles = true;
-	expectedOptions.output.revertStrings = RevertStrings::Strip;
-	expectedOptions.formatting.json = JsonFormat {JsonFormat::Pretty, 1};
-	expectedOptions.formatting.coloredOutput = false;
-	expectedOptions.formatting.withErrorIds = true;
-	expectedOptions.compiler.estimateGas = true;
-	expectedOptions.compiler.combinedJsonRequests = CombinedJsonRequests{};
-	expectedOptions.compiler.combinedJsonRequests->abi = true;
-	expectedOptions.compiler.combinedJsonRequests->binary = true;
-
-	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
-
-	BOOST_TEST(parsedOptions == expectedOptions);
-}
-
-BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
-{
-	map<string, vector<string>> invalidOptionInputModeCombinations = {
-		// TODO: This should eventually contain all options.
-		{"--experimental-via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--metadata-literal", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--metadata-hash=swarm", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-show-proved-safe", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-show-unproved", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-show-unsupported", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-div-mod-no-slacks", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-engine=bmc", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-invariants=contract,reentrancy", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-solvers=z3,smtlib2", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-timeout=5", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-contracts=contract1.yul:A,contract2.yul:B", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--model-checker-targets=underflow,divByZero", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}}
-	};
-
-	for (auto const& [optionName, inputModes]: invalidOptionInputModeCombinations)
-		for (string const& inputMode: inputModes)
-		{
-			stringstream serr;
-			size_t separatorPosition = optionName.find("=");
-			string optionNameWithoutValue = optionName.substr(0, separatorPosition);
-			soltestAssert(!optionNameWithoutValue.empty());
-
-			vector<string> commandLine = {"solc", optionName, "file", inputMode};
-
-			string expectedMessage = "The following options are not supported in the current input mode: " + optionNameWithoutValue;
-			auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
-
-			BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
-		}
-}
-
-BOOST_AUTO_TEST_CASE(optimizer_flags)
-{
-	OptimiserSettings yulOnly = OptimiserSettings::minimal();
-	yulOnly.runYulOptimiser = true;
-	yulOnly.optimizeStackAllocation = true;
-
-	OptimiserSettings evmasmOnly = OptimiserSettings::standard();
-	evmasmOnly.runYulOptimiser = false;
-
-	map<vector<string>, OptimiserSettings> settingsMap = {
-		{{}, OptimiserSettings::minimal()},
-		{{"--optimize"}, OptimiserSettings::standard()},
-		{{"--no-optimize-yul"}, OptimiserSettings::minimal()},
-		{{"--optimize-yul"}, yulOnly},
-		{{"--optimize", "--no-optimize-yul"}, evmasmOnly},
-		{{"--optimize", "--optimize-yul"}, OptimiserSettings::standard()},
-	};
-
-	map<InputMode, string> inputModeFlagMap = {
-		{InputMode::Compiler, ""},
-		{InputMode::CompilerWithASTImport, "--import-ast"},
-		{InputMode::Assembler, "--strict-assembly"},
-	};
-
-	for (auto const& [inputMode, inputModeFlag]: inputModeFlagMap)
-		for (auto const& [optimizerFlags, expectedOptimizerSettings]: settingsMap)
-		{
-			vector<string> commandLine = {"solc", inputModeFlag, "file"};
-			commandLine += optimizerFlags;
-			BOOST_CHECK(parseCommandLine(commandLine).optimiserSettings() == expectedOptimizerSettings);
-		}
-}
-
-BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
-{
-	CommandLineOptions const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize"});
-	BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, OptimiserSettings::DefaultYulOptimiserSteps);
-	BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, OptimiserSettings::DefaultYulOptimiserCleanupSteps);
-}
-
-BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
-{
-	vector<string> validSequenceInputs {
-		":",                         // Empty optimization sequence and empty cleanup sequence
-		":fDn",                      // Empty optimization sequence and specified cleanup sequence
-		"dhfoDgvulfnTUtnIf:",        // Specified optimization sequence and empty cleanup sequence
-		"dhfoDgvulfnTUtnIf:fDn",     // Specified optimization sequence and cleanup sequence
-		"dhfo[Dgvulfn]TUtnIf:f[D]n", // Specified and nested optimization and cleanup sequence
-		"dhfoDgvulfnTUtnIf",         // Specified optimizer sequence only
-		"iDu",                       // Short optimizer sequence
-		"a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]" // Nested brackets
-	};
-
-	vector<tuple<string, string>> const expectedParsedSequences {
-		{"", ""},
-		{"", "fDn"},
-		{"dhfoDgvulfnTUtnIf", ""},
-		{"dhfoDgvulfnTUtnIf", "fDn"},
-		{"dhfo[Dgvulfn]TUtnIf", "f[D]n"},
-		{"dhfoDgvulfnTUtnIf", OptimiserSettings::DefaultYulOptimiserCleanupSteps},
-		{"iDu", OptimiserSettings::DefaultYulOptimiserCleanupSteps},
-		{"a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]", OptimiserSettings::DefaultYulOptimiserCleanupSteps}
-	};
-
-	BOOST_CHECK_EQUAL(validSequenceInputs.size(), expectedParsedSequences.size());
-
-	for (size_t i = 0; i < validSequenceInputs.size(); ++i)
-	{
-		CommandLineOptions const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize", "--yul-optimizations=" + validSequenceInputs[i]});
-		auto const& [expectedYulOptimiserSteps, expectedYulCleanupSteps] = expectedParsedSequences[i];
-		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, expectedYulOptimiserSteps);
-		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, expectedYulCleanupSteps);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
-{
-	vector<string> const invalidSequenceInputs {
-		"abcdefg{hijklmno}pqr[st]uvwxyz", // Invalid abbreviation
-		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
-		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
-		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
-		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
-		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[a]"
-		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",  // Brackets nested too deep
-		"a]a][",                          // Unbalanced closing bracket
-		"a[a][",                          // Unbalanced opening bracket
-		"dhfoDgvulfnTUt[nIf:fd]N",        // Nested cleanup sequence delimiter
-		"dhfoDgvulfnTU:tnIf:fdN"          // Too many cleanup sequence delimiters
-	};
-
-	vector<string> const expectedErrorMessages {
-		"'b' is not a valid step abbreviation",
-		"Brackets nested too deep",
-		"Unbalanced brackets",
-		"Unbalanced brackets",
-		"Cleanup sequence delimiter cannot be placed inside the brackets",
-		"Too many cleanup sequence delimiters"
-	};
-
-	BOOST_CHECK_EQUAL(invalidSequenceInputs.size(), expectedErrorMessages.size());
-
-	string const baseExpectedErrorMessage = "Invalid optimizer step sequence in --yul-optimizations: ";
-
-	for (size_t i = 0; i < invalidSequenceInputs.size(); ++i)
-	{
-		vector<string> const commandLineOptions = {"solc", "contract.sol", "--optimize", "--yul-optimizations=" + invalidSequenceInputs[i]};
-		string const expectedErrorMessage = baseExpectedErrorMessage + expectedErrorMessages[i];
-		auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedErrorMessage; };
-		BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
-	}
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace solidity::frontend::test
diff --git a/test/solc/Common.cpp b/test/solc/Common.cpp
deleted file mode 100644
index 24acd6b6c80d..000000000000
--- a/test/solc/Common.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/solc/Common.h>
-#include <test/libsolidity/util/Common.h>
-
-#include <solc/CommandLineInterface.h>
-
-#include <sstream>
-
-using namespace std;
-using namespace solidity::frontend;
-
-vector<char const*> test::makeArgv(vector<string> const& _commandLine)
-{
-	size_t argc = _commandLine.size();
-	vector<char const*> argv(_commandLine.size() + 1);
-
-	// C++ standard mandates argv[argc] to be NULL
-	argv[argc] = nullptr;
-
-	for (size_t i = 0; i < argc; ++i)
-		argv[i] = _commandLine[i].c_str();
-
-	return argv;
-}
-
-test::OptionsReaderAndMessages test::parseCommandLineAndReadInputFiles(
-	vector<string> const& _commandLine,
-	string const& _standardInputContent
-)
-{
-	vector<char const*> argv = makeArgv(_commandLine);
-	stringstream sin(_standardInputContent), sout, serr;
-	CommandLineInterface cli(sin, sout, serr);
-	bool success = cli.parseArguments(static_cast<int>(_commandLine.size()), argv.data());
-	cli.readInputFiles();
-
-	return {
-		success,
-		cli.options(),
-		cli.fileReader(),
-		cli.standardJsonInput(),
-		sout.str(),
-		stripPreReleaseWarning(serr.str()),
-	};
-}
-
-test::OptionsReaderAndMessages test::runCLI(
-	vector<string> const& _commandLine,
-	string const& _standardInputContent
-)
-{
-	vector<char const*> argv = makeArgv(_commandLine);
-	stringstream sin(_standardInputContent), sout, serr;
-	CommandLineInterface cli(sin, sout, serr);
-	bool success = cli.run(static_cast<int>(_commandLine.size()), argv.data());
-
-	return {
-		success,
-		cli.options(),
-		cli.fileReader(),
-		cli.standardJsonInput(),
-		sout.str(),
-		stripPreReleaseWarning(serr.str()),
-	};
-}
diff --git a/test/solc/Common.h b/test/solc/Common.h
deleted file mode 100644
index e2ddee691311..000000000000
--- a/test/solc/Common.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-/// Utilities shared by multiple tests for code in solc/.
-
-#include <solc/CommandLineParser.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <optional>
-#include <string>
-#include <vector>
-
-BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::frontend::CommandLineOptions)
-BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::frontend::InputMode)
-BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::frontend::OptimiserSettings)
-
-namespace solidity::frontend::test
-{
-
-struct OptionsReaderAndMessages
-{
-	bool success;
-	CommandLineOptions options;
-	FileReader reader;
-	std::optional<std::string> standardJsonInput;
-	std::string stdoutContent;
-	std::string stderrContent;
-};
-
-std::vector<char const*> makeArgv(std::vector<std::string> const& _commandLine);
-
-/// Runs only command-line parsing, without compilation, assembling or any other input processing.
-/// Lets through any @a CommandLineErrors throw by the CLI.
-/// Note: This uses the @a CommandLineInterface class and does not actually spawn a new process.
-/// @param _commandLine Arguments in the form of strings that would be specified on the command-line.
-///                     You must specify the program name as the first item.
-/// @param _standardInputContent Content that the CLI will be able to read from its standard input.
-OptionsReaderAndMessages parseCommandLineAndReadInputFiles(
-	std::vector<std::string> const& _commandLine,
-	std::string const& _standardInputContent = ""
-);
-
-/// Runs all stages of command-line interface processing, including error handling.
-/// Never throws @a CommandLineError - validation errors are included in the returned stderr content.
-/// Note: This uses the @a CommandLineInterface class and does not actually spawn a new process.
-/// @param _commandLine Arguments in the form of strings that would be specified on the command-line.
-///                     You must specify the program name as the first item.
-/// @param _standardInputContent Content that the CLI will be able to read from its standard input.
-OptionsReaderAndMessages runCLI(
-	std::vector<std::string> const& _commandLine,
-	std::string const& _standardInputContent = ""
-);
-
-} // namespace solidity::frontend::test
diff --git a/test/soltest.cpp b/test/soltest.cpp
deleted file mode 100644
index 6aa100248875..000000000000
--- a/test/soltest.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file boostTest.cpp
- * @author Marko Simovic <markobarko@gmail.com>
- * @date 2014
- * Stub for generating main boost.test module.
- * Original code taken from boost sources.
- */
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4535) // calling _set_se_translator requires /EHa
-#endif
-#include <boost/test/unit_test.hpp>
-#include <boost/test/tree/traverse.hpp>
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#pragma GCC diagnostic pop
-
-#include <test/InteractiveTests.h>
-#include <test/Common.h>
-#include <test/EVMHost.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
-#include <string>
-
-using namespace boost::unit_test;
-using namespace solidity::frontend::test;
-namespace fs = boost::filesystem;
-using namespace std;
-
-namespace
-{
-void removeTestSuite(std::string const& _name)
-{
-	master_test_suite_t& master = framework::master_test_suite();
-	auto id = master.get(_name);
-	soltestAssert(id != INV_TEST_UNIT_ID, "Removing non-existent test suite!");
-	master.remove(id);
-}
-
-/**
- * Class that traverses the boost test tree and removes unit tests that are
- * not in the current batch.
- */
-class BoostBatcher: public test_tree_visitor
-{
-public:
-	BoostBatcher(solidity::test::Batcher& _batcher):
-		m_batcher(_batcher)
-	{}
-
-	void visit(test_case const& _testCase) override
-	{
-		if (!m_batcher.checkAndAdvance())
-			// disabling them would be nicer, but it does not work like this:
-			// const_cast<test_case&>(_testCase).p_run_status.value = test_unit::RS_DISABLED;
-			m_path.back()->remove(_testCase.p_id);
-	}
-	bool test_suite_start(test_suite const& _testSuite) override
-	{
-		m_path.push_back(&const_cast<test_suite&>(_testSuite));
-		return test_tree_visitor::test_suite_start(_testSuite);
-	}
-	void test_suite_finish(test_suite const& _testSuite) override
-	{
-		m_path.pop_back();
-		test_tree_visitor::test_suite_finish(_testSuite);
-	}
-
-private:
-	solidity::test::Batcher& m_batcher;
-	std::vector<test_suite*> m_path;
-};
-
-
-void runTestCase(TestCase::Config const& _config, TestCase::TestCaseCreator const& _testCaseCreator)
-{
-	try
-	{
-		stringstream errorStream;
-		auto testCase = _testCaseCreator(_config);
-		if (testCase->shouldRun())
-			switch (testCase->run(errorStream))
-			{
-				case TestCase::TestResult::Success:
-					break;
-				case TestCase::TestResult::Failure:
-					BOOST_ERROR("Test expectation mismatch.\n" + errorStream.str());
-					break;
-				case TestCase::TestResult::FatalError:
-					BOOST_ERROR("Fatal error during test.\n" + errorStream.str());
-					break;
-			}
-	}
-	catch (boost::exception const& _e)
-	{
-		BOOST_ERROR("Exception during extracted test: " << boost::diagnostic_information(_e));
-	}
-	catch (std::exception const& _e)
-	{
-		BOOST_ERROR("Exception during extracted test: " << boost::diagnostic_information(_e));
-	}
-	catch (...)
-	{
-		BOOST_ERROR("Unknown exception during extracted test: " << boost::current_exception_diagnostic_information());
-	}
-}
-
-int registerTests(
-	boost::unit_test::test_suite& _suite,
-	boost::filesystem::path const& _basepath,
-	boost::filesystem::path const& _path,
-	vector<string> const& _labels,
-	TestCase::TestCaseCreator _testCaseCreator,
-	solidity::test::Batcher& _batcher
-)
-{
-	int numTestsAdded = 0;
-	fs::path fullpath = _basepath / _path;
-	TestCase::Config config{
-		fullpath.string(),
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		solidity::test::CommonOptions::get().vmPaths,
-		solidity::test::CommonOptions::get().enforceGasTest,
-		solidity::test::CommonOptions::get().enforceGasTestMinValue,
-	};
-	if (fs::is_directory(fullpath))
-	{
-		test_suite* sub_suite = BOOST_TEST_SUITE(_path.filename().string());
-		for (auto const& entry: boost::iterator_range<fs::directory_iterator>(
-			fs::directory_iterator(fullpath),
-			fs::directory_iterator()
-		))
-			if (
-				solidity::test::isValidSemanticTestPath(entry) &&
-				(fs::is_directory(entry.path()) || TestCase::isTestFilename(entry.path().filename()))
-			)
-				numTestsAdded += registerTests(
-					*sub_suite,
-					_basepath, _path / entry.path().filename(),
-					_labels,
-					_testCaseCreator,
-					_batcher
-				);
-		_suite.add(sub_suite);
-	}
-	else
-	{
-		// TODO would be better to set the test to disabled.
-		if (_batcher.checkAndAdvance())
-		{
-			// This must be a vector of unique_ptrs because Boost.Test keeps the equivalent of a string_view to the filename
-			// that is passed in. If the strings were stored directly in the vector, pointers/references to them would be
-			// invalidated on reallocation.
-			static vector<unique_ptr<string const>> filenames;
-
-			filenames.emplace_back(make_unique<string>(_path.string()));
-			auto test_case = make_test_case(
-				[config, _testCaseCreator]
-				{
-					BOOST_REQUIRE_NO_THROW({
-						runTestCase(config, _testCaseCreator);
-					});
-				},
-				_path.stem().string(),
-				*filenames.back(),
-				0
-			);
-			for (auto const& _label: _labels)
-				test_case->add_label(_label);
-			_suite.add(test_case);
-			numTestsAdded = 1;
-		}
-	}
-	return numTestsAdded;
-}
-
-bool initializeOptions()
-{
-	auto const& suite = boost::unit_test::framework::master_test_suite();
-
-	auto options = std::make_unique<solidity::test::CommonOptions>();
-	bool shouldContinue = options->parse(suite.argc, suite.argv);
-	if (!shouldContinue)
-		return false;
-	options->validate();
-
-	solidity::test::CommonOptions::setSingleton(std::move(options));
-	return true;
-}
-
-}
-
-// TODO: Prototype -- why isn't this declared in the boost headers?
-// TODO: replace this with a (global) fixture.
-test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[]);
-
-test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
-{
-	using namespace solidity::test;
-
-	master_test_suite_t& master = framework::master_test_suite();
-	master.p_name.value = "SolidityTests";
-
-	try
-	{
-		bool shouldContinue = initializeOptions();
-		if (!shouldContinue)
-			exit(EXIT_SUCCESS);
-
-		if (!solidity::test::loadVMs(solidity::test::CommonOptions::get()))
-			exit(EXIT_FAILURE);
-
-		if (solidity::test::CommonOptions::get().disableSemanticTests)
-			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
-
-		if (!solidity::test::CommonOptions::get().enforceGasTest)
-			cout << endl << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
-
-		Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
-		if (CommonOptions::get().batches > 1)
-			cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
-
-		// Batch the boost tests
-		BoostBatcher boostBatcher(batcher);
-		traverse_test_tree(master, boostBatcher, true);
-
-		// Include the interactive tests in the automatic tests as well
-		for (auto const& ts: g_interactiveTestsuites)
-		{
-			auto const& options = solidity::test::CommonOptions::get();
-
-			if (ts.smt && options.disableSMT)
-				continue;
-
-			if (ts.needsVM && solidity::test::CommonOptions::get().disableSemanticTests)
-				continue;
-
-			//TODO
-			//solAssert(
-			registerTests(
-				master,
-				options.testPath / ts.path,
-				ts.subpath,
-				ts.labels,
-				ts.testCaseCreator,
-				batcher
-			);
-			// > 0, std::string("no ") + ts.title + " tests found");
-		 }
-
-		if (solidity::test::CommonOptions::get().disableSemanticTests)
-		{
-			for (auto suite: {
-				"ABIDecoderTest",
-				"ABIEncoderTest",
-				"SolidityAuctionRegistrar",
-				"SolidityWallet",
-				"GasMeterTests",
-				"GasCostTests",
-				"SolidityEndToEndTest",
-				"SolidityOptimizer"
-			})
-				removeTestSuite(suite);
-		}
-	}
-	catch (solidity::test::ConfigException const& exception)
-	{
-		cerr << exception.what() << endl;
-		exit(EXIT_FAILURE);
-	}
-	catch (std::runtime_error const& exception)
-	{
-		cerr << exception.what() << endl;
-		exit(EXIT_FAILURE);
-	}
-
-	return nullptr;
-}
-
-// BOOST_TEST_DYN_LINK should be defined if user want to link against shared boost test library
-#ifdef BOOST_TEST_DYN_LINK
-
-// Because we want to have customized initialization function and support shared boost libraries at the same time,
-// we are forced to customize the entry point.
-// see: https://www.boost.org/doc/libs/1_67_0/libs/test/doc/html/boost_test/adv_scenarios/shared_lib_customizations/init_func.html
-
-int main(int argc, char* argv[])
-{
-	auto init_unit_test = []() -> bool { init_unit_test_suite(0, nullptr); return true; };
-	return boost::unit_test::unit_test_main(init_unit_test, argc, argv);
-}
-
-#endif
diff --git a/test/stopAfterParseTests.sh b/test/stopAfterParseTests.sh
deleted file mode 100755
index 7d74704c5e38..000000000000
--- a/test/stopAfterParseTests.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-READLINK=readlink
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	READLINK=greadlink
-fi
-REPO_ROOT=$(${READLINK} -f "$(dirname "$0")"/..)
-SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-SOLC=${SOLIDITY_BUILD_DIR}/solc/solc
-SPLITSOURCES=${REPO_ROOT}/scripts/splitSources.py
-
-FILETMP=$(mktemp -d -t "stop-after-parse-tests-XXXXXX")
-cd "$FILETMP" || exit 1
-
-
-function testFile
-{
-	set +e
-	ALLOUTPUT=$($SOLC --combined-json ast --pretty-json "$@" --stop-after parsing 2>&1)
-	local RESULT=$?
-	set -e
-	if test ${RESULT} -ne 0; then
-		# solc returned failure. Compilation errors and unimplemented features
-		# are okay, everything else is a failed test (segfault)
-		if ! echo "$ALLOUTPUT" | grep -e "Unimplemented feature:" -e "Error:" -q; then
-			echo -n "Test failed on "
-			echo "$@"
-			echo "$ALLOUTPUT"
-			return 1
-		fi
-	else
-		echo -n .
-	fi
-
-	return 0;
-}
-
-while read -r file; do
-	set +e
-	OUTPUT=$($SPLITSOURCES "$file")
-	RETURN_CODE=$?
-	set -e
-	FAILED=0
-
-	if [ $RETURN_CODE -eq 0 ]
-	then
-		# shellcheck disable=SC2086
-		testFile $OUTPUT
-		FAILED=$?
-		rm -r "${FILETMP:?}"/*
-	elif [ $RETURN_CODE -eq 1 ]
-	then
-		testFile "$file"
-		FAILED=$?
-	elif [ $RETURN_CODE -eq 2 ]
-	then
-		echo -n "<skipping utf8 error>"
-	else
-		echo "Received unexpected return code $RETURN_CODE while processing $file: "
-		echo "-----"
-		echo "$OUTPUT"
-		exit 3
-	fi
-
-	if [ $FAILED -eq 1 ]
-	then
-		echo -n "Failure on "
-		echo "$file"
-		exit 1
-	fi
-done < <(find "${REPO_ROOT}/test" -iname "*.sol" -and -not -name "documentation.sol" -and -not -name "boost_filesystem_bug.sol")
-echo
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
deleted file mode 100644
index a86e6382df8d..000000000000
--- a/test/tools/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-add_subdirectory(ossfuzz)
-
-add_subdirectory(yulInterpreter)
-add_executable(yulrun yulrun.cpp)
-target_link_libraries(yulrun PRIVATE yulInterpreter libsolc evmasm Boost::boost Boost::program_options)
-
-add_executable(solfuzzer afl_fuzzer.cpp fuzzer_common.cpp)
-target_link_libraries(solfuzzer PRIVATE libsolc evmasm Boost::boost Boost::program_options Boost::system)
-
-add_executable(yulopti yulopti.cpp)
-target_link_libraries(yulopti PRIVATE solidity Boost::boost Boost::program_options Boost::system)
-
-add_executable(isoltest
-	isoltest.cpp
-	IsolTestOptions.cpp
-	../Common.cpp
-	../CommonSyntaxTest.cpp
-	../EVMHost.cpp
-	../TestCase.cpp
-	../TestCaseReader.cpp
-	../libsolidity/util/BytesUtils.cpp
-	../libsolidity/util/Common.cpp
-	../libsolidity/util/ContractABIUtils.cpp
-	../libsolidity/util/TestFileParser.cpp
-	../libsolidity/util/TestFunctionCall.cpp
-	../libsolidity/GasTest.cpp
-	../libsolidity/MemoryGuardTest.cpp
-	../libsolidity/NatspecJSONTest.cpp
-	../libsolidity/SyntaxTest.cpp
-	../libsolidity/SemanticTest.cpp
-	../libsolidity/AnalysisFramework.cpp
-	../libsolidity/SolidityExecutionFramework.cpp
-	../ExecutionFramework.cpp
-	../libsolidity/ABIJsonTest.cpp
-	../libsolidity/ASTJSONTest.cpp
-	../libsolidity/ASTPropertyTest.cpp
-	../libsolidity/SMTCheckerTest.cpp
-	../libyul/Common.cpp
-	../libyul/ControlFlowGraphTest.cpp
-	../libyul/ControlFlowSideEffectsTest.cpp
-	../libyul/EVMCodeTransformTest.cpp
-	../libyul/FunctionSideEffects.cpp
-	../libyul/ObjectCompilerTest.cpp
-	../libyul/SyntaxTest.cpp
-	../libyul/StackShufflingTest.cpp
-	../libyul/StackLayoutGeneratorTest.cpp
-	../libyul/YulOptimizerTest.cpp
-	../libyul/YulOptimizerTestCommon.cpp
-	../libyul/YulInterpreterTest.cpp
-)
-target_compile_definitions(isoltest PRIVATE ISOLTEST)
-target_link_libraries(isoltest PRIVATE evmc libsolc solidity yulInterpreter evmasm Boost::boost Boost::program_options Boost::unit_test_framework Threads::Threads)
diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp
deleted file mode 100644
index 0994b63a83ef..000000000000
--- a/test/tools/IsolTestOptions.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file IsolTestOptions.cpp
-* @date 2019
-*/
-
-#include <test/tools/IsolTestOptions.h>
-
-#include <libsolutil/Assertions.h>
-
-#include <boost/filesystem.hpp>
-
-#include <iostream>
-#include <regex>
-#include <string>
-
-namespace fs = boost::filesystem;
-namespace po = boost::program_options;
-
-namespace solidity::test
-{
-
-namespace
-{
-
-auto const description = R"(isoltest, tool for interactively managing test contracts.
-Usage: isoltest [Options]
-Interactively validates test contracts.
-
-Allowed options)";
-
-std::string editorPath()
-{
-	if (getenv("EDITOR"))
-		return getenv("EDITOR");
-	else if (fs::exists("/usr/bin/editor"))
-		return "/usr/bin/editor";
-
-	return std::string{};
-}
-
-}
-
-IsolTestOptions::IsolTestOptions():
-	CommonOptions(description)
-{
-}
-
-void IsolTestOptions::addOptions()
-{
-	CommonOptions::addOptions();
-	options.add_options()
-		("editor", po::value<std::string>(&editor)->default_value(editorPath()), "Path to editor for opening test files.")
-		("help", po::bool_switch(&showHelp)->default_value(showHelp), "Show this help screen.")
-		("no-color", po::bool_switch(&noColor)->default_value(noColor), "Don't use colors.")
-		("accept-updates", po::bool_switch(&acceptUpdates)->default_value(acceptUpdates), "Automatically accept expectation updates.")
-		("test,t", po::value<std::string>(&testFilter)->default_value("*/*"), "Filters which test units to include.");
-}
-
-bool IsolTestOptions::parse(int _argc, char const* const* _argv)
-{
-	bool const shouldContinue = CommonOptions::parse(_argc, _argv);
-
-	if (showHelp || !shouldContinue)
-	{
-		std::cout << options << std::endl;
-		return false;
-	}
-
-	enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1);
-
-	return shouldContinue;
-}
-
-void IsolTestOptions::validate() const
-{
-	CommonOptions::validate();
-	static std::string filterString{"[a-zA-Z0-9_/*]*"};
-	static std::regex filterExpression{filterString};
-	assertThrow(
-		regex_match(testFilter, filterExpression),
-		ConfigException,
-		"Invalid test unit filter - can only contain '" + filterString + ": " + testFilter
-	);
-}
-
-}
diff --git a/test/tools/IsolTestOptions.h b/test/tools/IsolTestOptions.h
deleted file mode 100644
index 5bb02c2bce24..000000000000
--- a/test/tools/IsolTestOptions.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/** @file IsolTestOptions.h
- */
-
-#pragma once
-
-#include <liblangutil/EVMVersion.h>
-
-#include <test/Common.h>
-
-namespace solidity::test
-{
-
-struct IsolTestOptions: CommonOptions
-{
-	bool showHelp = false;
-	bool noColor = false;
-	bool acceptUpdates = false;
-	std::string testFilter = std::string{};
-	std::string editor = std::string{};
-
-	explicit IsolTestOptions();
-	void addOptions() override;
-	bool parse(int _argc, char const* const* _argv) override;
-	void validate() const override;
-};
-
-}
diff --git a/test/tools/afl_fuzzer.cpp b/test/tools/afl_fuzzer.cpp
deleted file mode 100644
index af0939c2bd2c..000000000000
--- a/test/tools/afl_fuzzer.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Executable for use with AFL <http://lcamtuf.coredump.cx/afl>.
- */
-
-#include <test/tools/fuzzer_common.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/program_options.hpp>
-
-#include <string>
-#include <iostream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-
-namespace po = boost::program_options;
-
-int main(int argc, char** argv)
-{
-	po::options_description options(
-		R"(solfuzzer, fuzz-testing binary for use with AFL.
-Usage: solfuzzer [Options] < input
-Reads a single source from stdin, compiles it and signals a failure for internal errors.
-
-Allowed options)",
-		po::options_description::m_default_line_length,
-		po::options_description::m_default_line_length - 23);
-	options.add_options()
-		("help", "Show this help screen.")
-		("quiet", "Only output errors.")
-		(
-			"standard-json",
-			"Test via the standard-json interface, i.e. "
-			"input is expected to be JSON-encoded instead of "
-			"plain source file."
-		)
-		(
-			"const-opt",
-			"Run the constant optimizer instead of compiling. "
-			"Expects a binary string of up to 32 bytes on stdin."
-		)
-		(
-			"input-file",
-			po::value<string>(),
-			"input file"
-		)(
-			"input-files",
-			po::value<std::vector<string>>()->multitoken(),
-			"input files"
-		)
-		(
-			"without-optimizer",
-			"Run without optimizations. Cannot be used together with standard-json."
-		);
-
-	// All positional options should be interpreted as input files
-	po::positional_options_description filesPositions;
-	filesPositions.add("input-file", 1);
-	bool quiet = false;
-
-	po::variables_map arguments;
-	try
-	{
-		po::command_line_parser cmdLineParser(argc, argv);
-		cmdLineParser.options(options).positional(filesPositions);
-		po::store(cmdLineParser.run(), arguments);
-	}
-	catch (po::error const& _exception)
-	{
-		cerr << _exception.what() << endl;
-		return 1;
-	}
-
-	if (arguments.count("quiet"))
-		quiet = true;
-
-	if (arguments.count("help"))
-	{
-		cout << options;
-		return 0;
-	}
-
-	vector<string> inputs;
-	if (arguments.count("input-file"))
-		inputs.push_back(arguments["input-file"].as<string>());
-	else if (arguments.count("input-files"))
-		inputs = arguments["input-files"].as<vector<string>>();
-	else
-		inputs.emplace_back("");
-
-	bool optimize = !arguments.count("without-optimizer");
-	int retResult = 0;
-
-	for (string const& inputFile: inputs)
-	{
-		string input;
-		if (inputFile.size() == 0)
-			input = readUntilEnd(cin);
-		else
-			input = readFileAsString(inputFile);
-
-		try
-		{
-			if (arguments.count("const-opt"))
-				FuzzerUtil::testConstantOptimizer(input, quiet);
-			else if (arguments.count("standard-json"))
-				FuzzerUtil::testStandardCompiler(input, quiet);
-			else
-				FuzzerUtil::testCompilerJsonInterface(input, optimize, quiet);
-		}
-		catch (...)
-		{
-			retResult = 1;
-
-			if (inputFile.size() == 0)
-				throw;
-
-			cerr << "Fuzzer "
-				<< (optimize ? "" : "(without optimizer) ")
-				<< "failed on "
-				<< inputFile;
-		}
-	}
-
-	return retResult;
-}
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
deleted file mode 100644
index 1bb04bf66aad..000000000000
--- a/test/tools/fuzzer_common.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/fuzzer_common.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/formal/ModelCheckerSettings.h>
-
-#include <libsolutil/JSON.h>
-
-#include <libevmasm/Assembly.h>
-#include <libevmasm/ConstantOptimiser.h>
-
-#include <libsolc/libsolc.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <sstream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::util;
-
-static vector<EVMVersion> s_evmVersions = {
-	EVMVersion::homestead(),
-	EVMVersion::tangerineWhistle(),
-	EVMVersion::spuriousDragon(),
-	EVMVersion::byzantium(),
-	EVMVersion::constantinople(),
-	EVMVersion::petersburg(),
-	EVMVersion::istanbul(),
-	EVMVersion::berlin(),
-	EVMVersion::london(),
-	EVMVersion::paris()
-};
-
-void FuzzerUtil::testCompilerJsonInterface(string const& _input, bool _optimize, bool _quiet)
-{
-	if (!_quiet)
-		cout << "Testing compiler " << (_optimize ? "with" : "without") << " optimizer." << endl;
-
-	Json::Value config = Json::objectValue;
-	config["language"] = "Solidity";
-	config["sources"] = Json::objectValue;
-	config["sources"][""] = Json::objectValue;
-	config["sources"][""]["content"] = _input;
-	config["settings"] = Json::objectValue;
-	config["settings"]["optimizer"] = Json::objectValue;
-	config["settings"]["optimizer"]["enabled"] = _optimize;
-	config["settings"]["optimizer"]["runs"] = static_cast<int>(OptimiserSettings{}.expectedExecutionsPerDeployment);
-	config["settings"]["evmVersion"] = "berlin";
-
-	// Enable all SourceUnit-level outputs.
-	config["settings"]["outputSelection"]["*"][""][0] = "*";
-	// Enable all Contract-level outputs.
-	config["settings"]["outputSelection"]["*"]["*"][0] = "*";
-
-	runCompiler(jsonCompactPrint(config), _quiet);
-}
-
-void FuzzerUtil::forceSMT(StringMap& _input)
-{
-	// Add SMT checker pragma if not already present in source
-	static auto constexpr smtPragma = "pragma experimental SMTChecker;";
-	for (auto &sourceUnit: _input)
-		if (sourceUnit.second.find(smtPragma) == string::npos)
-			sourceUnit.second += smtPragma;
-}
-
-void FuzzerUtil::testCompiler(
-	StringMap& _input,
-	bool _optimize,
-	unsigned _rand,
-	bool _forceSMT,
-	bool _compileViaYul
-)
-{
-	frontend::CompilerStack compiler;
-	EVMVersion evmVersion = s_evmVersions[_rand % s_evmVersions.size()];
-	frontend::OptimiserSettings optimiserSettings;
-	if (_optimize)
-		optimiserSettings = frontend::OptimiserSettings::standard();
-	else
-		optimiserSettings = frontend::OptimiserSettings::minimal();
-	if (_forceSMT)
-	{
-		forceSMT(_input);
-		compiler.setModelCheckerSettings({
-			/*bmcLoopIterations*/1,
-			frontend::ModelCheckerContracts::Default(),
-			/*divModWithSlacks*/true,
-			frontend::ModelCheckerEngine::All(),
-			frontend::ModelCheckerExtCalls{},
-			frontend::ModelCheckerInvariants::All(),
-			/*printQuery=*/false,
-			/*showProvedSafe=*/false,
-			/*showUnproved=*/false,
-			/*showUnsupported=*/false,
-			smtutil::SMTSolverChoice::All(),
-			frontend::ModelCheckerTargets::Default(),
-			/*timeout=*/1
-		});
-	}
-	compiler.setSources(_input);
-	compiler.setEVMVersion(evmVersion);
-	compiler.setOptimiserSettings(optimiserSettings);
-	compiler.setViaIR(_compileViaYul);
-	try
-	{
-		compiler.compile();
-	}
-	catch (Error const&)
-	{
-	}
-	catch (FatalError const&)
-	{
-	}
-	catch (UnimplementedFeatureError const&)
-	{
-	}
-	catch (StackTooDeepError const&)
-	{
-		if (_optimize && _compileViaYul)
-			throw;
-	}
-}
-
-void FuzzerUtil::runCompiler(string const& _input, bool _quiet)
-{
-	if (!_quiet)
-		cout << "Input JSON: " << _input << endl;
-	string outputString(solidity_compile(_input.c_str(), nullptr, nullptr));
-	if (!_quiet)
-		cout << "Output JSON: " << outputString << endl;
-
-	// This should be safe given the above copies the output.
-	solidity_reset();
-
-	Json::Value output;
-	if (!jsonParseStrict(outputString, output))
-	{
-		string msg{"Compiler produced invalid JSON output."};
-		cout << msg << endl;
-		BOOST_THROW_EXCEPTION(std::runtime_error(std::move(msg)));
-	}
-	if (output.isMember("errors"))
-		for (auto const& error: output["errors"])
-		{
-			string invalid = findAnyOf(error["type"].asString(), vector<string>{
-					"Exception",
-					"InternalCompilerError"
-			});
-			if (!invalid.empty())
-			{
-				string msg = "Invalid error: \"" + error["type"].asString() + "\"";
-				cout << msg << endl;
-				BOOST_THROW_EXCEPTION(std::runtime_error(std::move(msg)));
-			}
-		}
-}
-
-void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
-{
-	if (!_quiet)
-		cout << "Testing constant optimizer" << endl;
-	vector<u256> numbers;
-	stringstream sin(_input);
-
-	while (!sin.eof())
-	{
-		h256 data;
-		sin.read(reinterpret_cast<char *>(data.data()), 32);
-		numbers.push_back(u256(data));
-	}
-	if (!_quiet)
-		cout << "Got " << numbers.size() << " inputs:" << endl;
-
-	for (bool isCreation: {false, true})
-	{
-		Assembly assembly{langutil::EVMVersion{}, isCreation, {}};
-		for (u256 const& n: numbers)
-		{
-			if (!_quiet)
-				cout << n << endl;
-			assembly.append(n);
-		}
-		for (unsigned runs: {1u, 2u, 3u, 20u, 40u, 100u, 200u, 400u, 1000u})
-		{
-			// Make a copy here so that each time we start with the original state.
-			Assembly tmp = assembly;
-			ConstantOptimisationMethod::optimiseConstants(
-				isCreation,
-				runs,
-				langutil::EVMVersion{},
-				tmp
-			);
-		}
-	}
-}
-
-void FuzzerUtil::testStandardCompiler(string const& _input, bool _quiet)
-{
-	if (!_quiet)
-		cout << "Testing compiler via JSON interface." << endl;
-
-	runCompiler(_input, _quiet);
-}
diff --git a/test/tools/fuzzer_common.h b/test/tools/fuzzer_common.h
deleted file mode 100644
index 6da501d92485..000000000000
--- a/test/tools/fuzzer_common.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/Common.h>
-
-#include <map>
-#include <string>
-
-/**
- * Functions to be used for fuzz-testing of various components.
- * They throw exceptions or error.
- */
-struct FuzzerUtil
-{
-	static void runCompiler(std::string const& _input, bool _quiet);
-	static void testCompilerJsonInterface(std::string const& _input, bool _optimize, bool _quiet);
-	static void testConstantOptimizer(std::string const& _input, bool _quiet);
-	static void testStandardCompiler(std::string const& _input, bool _quiet);
-	/// Compiles @param _input which is a map of input file name to source code
-	/// string with optimisation turned on if @param _optimize is true
-	/// (off otherwise), a pseudo-random @param _rand that selects the EVM
-	/// version to be compiled for, and bool @param _forceSMT that, if true,
-	/// adds the experimental SMTChecker pragma to each source file in the
-	/// source map.
-	static void testCompiler(
-		solidity::StringMap& _input,
-		bool _optimize,
-		unsigned _rand,
-		bool _forceSMT,
-		bool _compileViaYul
-	);
-	/// Adds the experimental SMTChecker pragma to each source file in the
-	/// source map.
-	static void forceSMT(solidity::StringMap& _input);
-};
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
deleted file mode 100644
index 2d93bdbc2b9a..000000000000
--- a/test/tools/isoltest.cpp
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/AnsiColorized.h>
-
-#include <memory>
-#include <test/Common.h>
-#include <test/tools/IsolTestOptions.h>
-#include <test/InteractiveTests.h>
-#include <test/EVMHost.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/filesystem.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <queue>
-#include <regex>
-#include <utility>
-
-#if defined(_WIN32)
-#include <windows.h>
-#endif
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace solidity::util::formatting;
-
-namespace po = boost::program_options;
-namespace fs = boost::filesystem;
-
-using TestCreator = TestCase::TestCaseCreator;
-using TestOptions = solidity::test::IsolTestOptions;
-
-struct TestStats
-{
-	int successCount = 0;
-	int testCount = 0;
-	int skippedCount = 0;
-	operator bool() const noexcept { return successCount + skippedCount == testCount; }
-	TestStats& operator+=(TestStats const& _other) noexcept
-	{
-		successCount += _other.successCount;
-		testCount += _other.testCount;
-		skippedCount += _other.skippedCount;
-		return *this;
-	}
-};
-
-class TestFilter
-{
-public:
-	explicit TestFilter(string _filter): m_filter(std::move(_filter))
-	{
-		string filter{m_filter};
-
-		boost::replace_all(filter, "/", "\\/");
-		boost::replace_all(filter, "*", ".*");
-
-		m_filterExpression = regex{"(" + filter + "(\\.sol|\\.yul|\\.stack))"};
-	}
-
-	bool matches(fs::path const& _path, string const& _name) const
-	{
-		return regex_match(_name, m_filterExpression) && solidity::test::isValidSemanticTestPath(_path);
-	}
-
-private:
-	string m_filter;
-	regex m_filterExpression;
-};
-
-class TestTool
-{
-public:
-	TestTool(
-		TestCreator _testCaseCreator,
-		TestOptions const& _options,
-		fs::path _path,
-		string _name
-	):
-		m_testCaseCreator(_testCaseCreator),
-		m_options(_options),
-		m_filter(TestFilter{_options.testFilter}),
-		m_path(std::move(_path)),
-		m_name(std::move(_name))
-	{}
-
-	enum class Result
-	{
-		Success,
-		Failure,
-		Exception,
-		Skipped
-	};
-
-	Result process();
-
-	static TestStats processPath(
-		TestCreator _testCaseCreator,
-		TestOptions const& _options,
-		fs::path const& _basepath,
-		fs::path const& _path,
-		solidity::test::Batcher& _batcher
-	);
-private:
-	enum class Request
-	{
-		Skip,
-		Rerun,
-		Quit
-	};
-
-	void updateTestCase();
-	Request handleResponse(bool _exception);
-
-	TestCreator m_testCaseCreator;
-	TestOptions const& m_options;
-	TestFilter m_filter;
-	fs::path const m_path;
-	string const m_name;
-
-	unique_ptr<TestCase> m_test;
-
-	static bool m_exitRequested;
-};
-
-bool TestTool::m_exitRequested = false;
-
-TestTool::Result TestTool::process()
-{
-	bool formatted{!m_options.noColor};
-
-	try
-	{
-		if (m_filter.matches(m_path, m_name))
-		{
-			(AnsiColorized(cout, formatted, {BOLD}) << m_name << ": ").flush();
-
-			m_test = m_testCaseCreator(TestCase::Config{
-				m_path.string(),
-				m_options.evmVersion(),
-				m_options.eofVersion(),
-				m_options.vmPaths,
-				m_options.enforceGasTest,
-				m_options.enforceGasTestMinValue
-			});
-			if (m_test->shouldRun())
-			{
-				std::stringstream outputMessages;
-				switch (TestCase::TestResult result = m_test->run(outputMessages, "  ", formatted))
-				{
-					case TestCase::TestResult::Success:
-						AnsiColorized(cout, formatted, {BOLD, GREEN}) << "OK" << endl;
-						return Result::Success;
-					default:
-						AnsiColorized(cout, formatted, {BOLD, RED}) << "FAIL" << endl;
-
-						AnsiColorized(cout, formatted, {BOLD, CYAN}) << "  Contract:" << endl;
-						m_test->printSource(cout, "    ", formatted);
-						m_test->printSettings(cout, "    ", formatted);
-
-						cout << endl << outputMessages.str() << endl;
-						return result == TestCase::TestResult::FatalError ? Result::Exception : Result::Failure;
-				}
-			}
-			else
-			{
-				AnsiColorized(cout, formatted, {BOLD, YELLOW}) << "NOT RUN" << endl;
-				return Result::Skipped;
-			}
-		}
-		else
-			return Result::Skipped;
-	}
-	catch (boost::exception const& _e)
-	{
-		AnsiColorized(cout, formatted, {BOLD, RED}) <<
-			"Exception during test: " << boost::diagnostic_information(_e) << endl;
-		return Result::Exception;
-	}
-	catch (std::exception const& _e)
-	{
-		AnsiColorized(cout, formatted, {BOLD, RED}) <<
-			"Exception during test: " << boost::diagnostic_information(_e) << endl;
-		return Result::Exception;
-	}
-	catch (...)
-	{
-		AnsiColorized(cout, formatted, {BOLD, RED}) <<
-			"Unknown exception during test: " << boost::current_exception_diagnostic_information() << endl;
-		return Result::Exception;
-	}
-}
-
-void TestTool::updateTestCase()
-{
-	ofstream file(m_path.string(), ios::trunc);
-	m_test->printSource(file);
-	m_test->printUpdatedSettings(file);
-	file << "// ----" << endl;
-	m_test->printUpdatedExpectations(file, "// ");
-}
-
-TestTool::Request TestTool::handleResponse(bool _exception)
-{
-	if (!_exception && m_options.acceptUpdates)
-	{
-		updateTestCase();
-		return Request::Rerun;
-	}
-
-	if (_exception)
-		cout << "(e)dit/(s)kip/(q)uit? ";
-	else
-		cout << "(e)dit/(u)pdate expectations/(s)kip/(q)uit? ";
-	cout.flush();
-
-	while (true)
-	{
-		switch(readStandardInputChar())
-		{
-		case 's':
-			cout << endl;
-			return Request::Skip;
-		case 'u':
-			if (_exception)
-				break;
-			else
-			{
-				cout << endl;
-				updateTestCase();
-				return Request::Rerun;
-			}
-		case 'e':
-			cout << endl << endl;
-			if (system((m_options.editor + " \"" + m_path.string() + "\"").c_str()))
-				cerr << "Error running editor command." << endl << endl;
-			return Request::Rerun;
-		case 'q':
-			cout << endl;
-			return Request::Quit;
-		default:
-			break;
-		}
-	}
-}
-
-TestStats TestTool::processPath(
-	TestCreator _testCaseCreator,
-	TestOptions const& _options,
-	fs::path const& _basepath,
-	fs::path const& _path,
-	solidity::test::Batcher& _batcher
-)
-{
-	std::queue<fs::path> paths;
-	paths.push(_path);
-	int successCount = 0;
-	int testCount = 0;
-	int skippedCount = 0;
-
-	while (!paths.empty())
-	{
-		auto currentPath = paths.front();
-
-		fs::path fullpath = _basepath / currentPath;
-		if (fs::is_directory(fullpath))
-		{
-			paths.pop();
-			for (auto const& entry: boost::iterator_range<fs::directory_iterator>(
-				fs::directory_iterator(fullpath),
-				fs::directory_iterator()
-			))
-				if (fs::is_directory(entry.path()) || TestCase::isTestFilename(entry.path().filename()))
-					paths.push(currentPath / entry.path().filename());
-		}
-		else if (m_exitRequested)
-		{
-			++testCount;
-			paths.pop();
-		}
-		else if (!_batcher.checkAndAdvance())
-		{
-			paths.pop();
-			++skippedCount;
-		}
-		else
-		{
-			++testCount;
-			TestTool testTool(
-				_testCaseCreator,
-				_options,
-				fullpath,
-				currentPath.generic_path().string()
-			);
-			auto result = testTool.process();
-
-			switch(result)
-			{
-			case Result::Failure:
-			case Result::Exception:
-				switch(testTool.handleResponse(result == Result::Exception))
-				{
-				case Request::Quit:
-					paths.pop();
-					m_exitRequested = true;
-					break;
-				case Request::Rerun:
-					cout << "Re-running test case..." << endl;
-					--testCount;
-					break;
-				case Request::Skip:
-					paths.pop();
-					++skippedCount;
-					break;
-				}
-				break;
-			case Result::Success:
-				paths.pop();
-				++successCount;
-				break;
-			case Result::Skipped:
-				paths.pop();
-				++skippedCount;
-				break;
-			}
-		}
-	}
-
-	return { successCount, testCount, skippedCount };
-
-}
-
-namespace
-{
-
-void setupTerminal()
-{
-#if defined(_WIN32) && defined(ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-	// Set output mode to handle virtual terminal (ANSI escape sequences)
-	// ignore any error, as this is just a "nice-to-have"
-	// only windows needs to be taken care of, as other platforms (Linux/OSX) support them natively.
-	HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	if (hOut == INVALID_HANDLE_VALUE)
-		return;
-
-	DWORD dwMode = 0;
-	if (!GetConsoleMode(hOut, &dwMode))
-		return;
-
-	dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-	if (!SetConsoleMode(hOut, dwMode))
-		return;
-#endif
-}
-
-std::optional<TestStats> runTestSuite(
-	TestCreator _testCaseCreator,
-	TestOptions const& _options,
-	fs::path const& _basePath,
-	fs::path const& _subdirectory,
-	string const& _name,
-	solidity::test::Batcher& _batcher
-)
-{
-	fs::path testPath{_basePath / _subdirectory};
-	bool formatted{!_options.noColor};
-
-	if (!fs::exists(testPath) || !fs::is_directory(testPath))
-	{
-		cerr << _name << " tests not found. Use the --testpath argument." << endl;
-		return std::nullopt;
-	}
-
-	TestStats stats = TestTool::processPath(
-		_testCaseCreator,
-		_options,
-		_basePath,
-		_subdirectory,
-		_batcher
-	);
-
-	if (stats.skippedCount != stats.testCount)
-	{
-		cout << endl << _name << " Test Summary: ";
-		AnsiColorized(cout, formatted, {BOLD, stats ? GREEN : RED}) <<
-			stats.successCount <<
-			"/" <<
-			stats.testCount;
-		cout << " tests successful";
-		if (stats.skippedCount > 0)
-		{
-			cout << " (";
-			AnsiColorized(cout, formatted, {BOLD, YELLOW}) << stats.skippedCount;
-			cout<< " tests skipped)";
-		}
-		cout << "." << endl << endl;
-	}
-	return stats;
-}
-
-}
-
-int main(int argc, char const *argv[])
-{
-	using namespace solidity::test;
-
-	try
-	{
-		setupTerminal();
-
-		{
-			auto options = std::make_unique<IsolTestOptions>();
-
-			bool shouldContinue = options->parse(argc, argv);
-			if (!shouldContinue)
-				return EXIT_SUCCESS;
-
-			options->validate();
-			CommonOptions::setSingleton(std::move(options));
-		}
-
-		auto& options = dynamic_cast<IsolTestOptions const&>(CommonOptions::get());
-
-		if (!solidity::test::loadVMs(options))
-			return EXIT_FAILURE;
-
-		if (options.disableSemanticTests)
-			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
-
-		if (!options.enforceGasTest)
-			cout << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
-
-		TestStats global_stats{0, 0};
-		cout << "Running tests..." << endl << endl;
-
-		Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
-		if (CommonOptions::get().batches > 1)
-			cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
-
-		// Actually run the tests.
-		// Interactive tests are added in InteractiveTests.h
-		for (auto const& ts: g_interactiveTestsuites)
-		{
-			if (ts.needsVM && options.disableSemanticTests)
-				continue;
-
-			if (ts.smt && options.disableSMT)
-				continue;
-
-			auto stats = runTestSuite(
-				ts.testCaseCreator,
-				options,
-				options.testPath / ts.path,
-				ts.subpath,
-				ts.title,
-				batcher
-			);
-			if (stats)
-				global_stats += *stats;
-			else
-				return EXIT_FAILURE;
-		}
-
-		cout << endl << "Summary: ";
-		AnsiColorized(cout, !options.noColor, {BOLD, global_stats ? GREEN : RED}) <<
-			 global_stats.successCount << "/" << global_stats.testCount;
-		cout << " tests successful";
-		if (global_stats.skippedCount > 0)
-		{
-			cout << " (";
-			AnsiColorized(cout, !options.noColor, {BOLD, YELLOW}) << global_stats.skippedCount;
-			cout << " tests skipped)";
-		}
-		cout << "." << endl;
-
-		if (options.disableSemanticTests)
-			cout << "\nNOTE: Skipped semantics tests.\n" << endl;
-
-		return global_stats ? EXIT_SUCCESS : EXIT_FAILURE;
-	}
-	catch (boost::program_options::error const& exception)
-	{
-		cerr << exception.what() << endl;
-		return 2;
-	}
-	catch (std::runtime_error const& exception)
-	{
-		cerr << exception.what() << endl;
-		return 2;
-	}
-	catch (solidity::test::ConfigException const& exception)
-	{
-		cerr << exception.what() << endl;
-		return 2;
-	}
-	catch (...)
-	{
-		cerr << "Unhandled exception caught." << endl;
-		cerr << boost::current_exception_diagnostic_information() << endl;
-		return 2;
-	}
-}
diff --git a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
deleted file mode 100644
index 78697a9ddd10..000000000000
--- a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/SolidityEvmoneInterface.h>
-
-#include <test/tools/ossfuzz/protoToAbiV2.h>
-
-#include <src/libfuzzer/libfuzzer_macro.h>
-#include <abicoder.hpp>
-
-using namespace solidity::frontend;
-using namespace solidity::test::fuzzer;
-using namespace solidity::test::abiv2fuzzer;
-using namespace solidity::test;
-using namespace solidity::util;
-using namespace solidity;
-using namespace std;
-
-static constexpr size_t abiCoderHeapSize = 1024 * 512;
-static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
-
-DEFINE_PROTO_FUZZER(Contract const& _contract)
-{
-	ProtoConverter converter(_contract.seed());
-	string contractSource = converter.contractToString(_contract);
-
-	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
-	{
-		// With libFuzzer binary run this to generate the solidity source file x.sol from a proto input:
-		// PROTO_FUZZER_DUMP_PATH=x.sol ./a.out proto-input
-		ofstream of(dump_path);
-		of << contractSource;
-	}
-
-	string typeString = converter.isabelleTypeString();
-	string valueString = converter.isabelleValueString();
-	abicoder::ABICoder coder(abiCoderHeapSize);
-	if (!typeString.empty() && converter.coderFunction())
-	{
-		auto [encodeStatus, encodedData] = coder.encode(typeString, valueString);
-		solAssert(encodeStatus, "Isabelle abicoder fuzzer: Encoding failed");
-
-		// We target the default EVM which is the latest
-		langutil::EVMVersion version;
-		EVMHost hostContext(version, evmone);
-		string contractName = "C";
-		StringMap source({{"test.sol", contractSource}});
-		CompilerInput cInput(version, source, contractName, OptimiserSettings::minimal(), {});
-		EvmoneUtility evmoneUtil(
-			hostContext,
-			cInput,
-			contractName,
-			{},
-			{}
-		);
-		auto result = evmoneUtil.compileDeployAndExecute(encodedData);
-		solAssert(result.status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted.");
-		if (result.status_code == EVMC_SUCCESS)
-			solAssert(
-				EvmoneUtility::zeroWord(result.output_data, result.output_size),
-				"Proto ABIv2 fuzzer: ABIv2 coding failure found."
-			);
-	}
-}
diff --git a/test/tools/ossfuzz/CMakeLists.txt b/test/tools/ossfuzz/CMakeLists.txt
deleted file mode 100644
index 9449eddbad55..000000000000
--- a/test/tools/ossfuzz/CMakeLists.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-add_custom_target(ossfuzz)
-add_dependencies(ossfuzz
-        solc_ossfuzz
-        solc_mutator_ossfuzz
-        const_opt_ossfuzz
-        strictasm_diff_ossfuzz
-        strictasm_opt_ossfuzz
-        strictasm_assembly_ossfuzz
-)
-
-if (OSSFUZZ)
-    add_custom_target(ossfuzz_proto)
-    add_dependencies(ossfuzz_proto
-            sol_proto_ossfuzz
-            yul_proto_ossfuzz
-            yul_proto_diff_ossfuzz
-            yul_proto_diff_custom_mutate_ossfuzz
-            stack_reuse_codegen_ossfuzz
-    )
-
-    add_custom_target(ossfuzz_abiv2)
-    add_dependencies(ossfuzz_abiv2 abiv2_proto_ossfuzz abiv2_isabelle_ossfuzz)
-endif()
-
-if (OSSFUZZ)
-    add_executable(solc_ossfuzz
-            solc_ossfuzz.cpp
-            ../fuzzer_common.cpp
-            ../../TestCaseReader.cpp
-    )
-    target_link_libraries(solc_ossfuzz PRIVATE libsolc evmasm)
-    set_target_properties(solc_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-
-    add_executable(solc_mutator_ossfuzz
-            solc_ossfuzz.cpp
-            ../fuzzer_common.cpp
-            ../../TestCaseReader.cpp
-            SolidityGenerator.cpp
-            SolidityCustomMutatorInterface.cpp
-    )
-    target_link_libraries(solc_mutator_ossfuzz PRIVATE libsolc evmasm)
-    set_target_properties(solc_mutator_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-
-    add_executable(const_opt_ossfuzz const_opt_ossfuzz.cpp ../fuzzer_common.cpp)
-    target_link_libraries(const_opt_ossfuzz PRIVATE libsolc evmasm)
-    set_target_properties(const_opt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-
-    add_executable(strictasm_diff_ossfuzz strictasm_diff_ossfuzz.cpp yulFuzzerCommon.cpp)
-    target_link_libraries(strictasm_diff_ossfuzz PRIVATE libsolc evmasm yulInterpreter)
-    set_target_properties(strictasm_diff_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-
-    add_executable(strictasm_opt_ossfuzz strictasm_opt_ossfuzz.cpp)
-    target_link_libraries(strictasm_opt_ossfuzz PRIVATE yul)
-    set_target_properties(strictasm_opt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-
-    add_executable(strictasm_assembly_ossfuzz strictasm_assembly_ossfuzz.cpp)
-    target_link_libraries(strictasm_assembly_ossfuzz PRIVATE yul)
-    set_target_properties(strictasm_assembly_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-
-    add_executable(yul_proto_ossfuzz
-	    yulProtoFuzzer.cpp
-	    protoToYul.cpp
-	    yulProto.pb.cc
-	    ../../libyul/YulOptimizerTestCommon.cpp
-    )
-    target_include_directories(yul_proto_ossfuzz PRIVATE /usr/include/libprotobuf-mutator)
-    target_link_libraries(yul_proto_ossfuzz PRIVATE yul
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-    )
-    set_target_properties(yul_proto_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    # The -Wno-* compile options are required for source files that
-    # are auto-generated by the protobuf compiler because the compiler
-    # does not generate warning-free C++ bindings with regard to
-    # upstream Clang builds that are used by ossfuzz.
-    target_compile_options(yul_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
-
-    add_executable(
-	    yul_proto_diff_ossfuzz
-	    yulProto_diff_ossfuzz.cpp
-	    yulFuzzerCommon.cpp
-	    protoToYul.cpp
-	    yulProto.pb.cc
-	    ../../libyul/YulOptimizerTestCommon.cpp
-    )
-    target_include_directories(yul_proto_diff_ossfuzz PRIVATE /usr/include/libprotobuf-mutator)
-    target_link_libraries(yul_proto_diff_ossfuzz PRIVATE yul
-            yulInterpreter
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-    )
-    set_target_properties(yul_proto_diff_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(yul_proto_diff_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
-
-    add_executable(yul_proto_diff_custom_mutate_ossfuzz
-            yulProto_diff_ossfuzz.cpp
-            yulFuzzerCommon.cpp
-            protoToYul.cpp
-            yulProto.pb.cc
-            protomutators/YulProtoMutator.cpp
-            ../../libyul/YulOptimizerTestCommon.cpp
-    )
-    target_include_directories(yul_proto_diff_custom_mutate_ossfuzz PRIVATE /usr/include/libprotobuf-mutator)
-    target_link_libraries(yul_proto_diff_custom_mutate_ossfuzz PRIVATE yul
-            yulInterpreter
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-    )
-    set_target_properties(yul_proto_diff_custom_mutate_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(yul_proto_diff_custom_mutate_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
-
-    add_executable(stack_reuse_codegen_ossfuzz
-            StackReuseCodegenFuzzer.cpp
-            protoToYul.cpp
-            yulProto.pb.cc
-            ../../EVMHost.cpp
-            YulEvmoneInterface.cpp
-    )
-    target_include_directories(stack_reuse_codegen_ossfuzz PRIVATE /usr/include/libprotobuf-mutator)
-    target_link_libraries(stack_reuse_codegen_ossfuzz PRIVATE yul
-            evmc
-            evmone-standalone
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-    )
-    set_target_properties(stack_reuse_codegen_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(stack_reuse_codegen_ossfuzz PUBLIC
-            ${COMPILE_OPTIONS}
-            -Wno-sign-conversion
-            -Wno-inconsistent-missing-destructor-override
-            -Wno-unused-parameter
-            -Wno-zero-length-array
-            -Wno-suggest-destructor-override
-            -Wno-shorten-64-to-32
-    )
-
-    add_executable(abiv2_proto_ossfuzz
-            ../../EVMHost.cpp
-            abiV2ProtoFuzzer.cpp
-            SolidityEvmoneInterface.cpp
-            protoToAbiV2.cpp
-            abiV2Proto.pb.cc
-    )
-    target_include_directories(abiv2_proto_ossfuzz PRIVATE
-            /usr/include/libprotobuf-mutator
-    )
-    target_link_libraries(abiv2_proto_ossfuzz PRIVATE solidity
-            evmc
-            evmone-standalone
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-    )
-    set_target_properties(abiv2_proto_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(abiv2_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
-
-    add_executable(abiv2_isabelle_ossfuzz
-            AbiV2IsabelleFuzzer.cpp
-            SolidityEvmoneInterface.cpp
-            ../../EVMHost.cpp
-            protoToAbiV2.cpp
-            abiV2Proto.pb.cc
-    )
-    target_include_directories(abiv2_isabelle_ossfuzz PRIVATE
-            /usr/include/libprotobuf-mutator
-    )
-    target_link_libraries(abiv2_isabelle_ossfuzz PRIVATE solidity
-            evmc
-            evmone-standalone
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-            abicoder
-            gmp.a
-    )
-    set_target_properties(abiv2_isabelle_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(abiv2_isabelle_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
-
-    add_executable(sol_proto_ossfuzz
-            solProtoFuzzer.cpp
-            SolidityEvmoneInterface.cpp
-            protoToSol.cpp
-            solProto.pb.cc
-            ../../EVMHost.cpp
-    )
-    target_include_directories(sol_proto_ossfuzz PRIVATE
-            /usr/include/libprotobuf-mutator
-    )
-    target_link_libraries(sol_proto_ossfuzz PRIVATE solidity libsolc
-            evmc
-            evmone-standalone
-            protobuf-mutator-libfuzzer.a
-            protobuf-mutator.a
-            protobuf.a
-    )
-    set_target_properties(sol_proto_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(sol_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
-else()
-    add_library(solc_ossfuzz
-            solc_ossfuzz.cpp
-            ../fuzzer_common.cpp
-            )
-    target_link_libraries(solc_ossfuzz PRIVATE libsolc evmasm)
-
-    add_library(solc_mutator_ossfuzz
-            solc_ossfuzz.cpp
-            ../fuzzer_common.cpp
-            )
-    target_link_libraries(solc_mutator_ossfuzz PRIVATE libsolc evmasm)
-
-    add_library(const_opt_ossfuzz
-            const_opt_ossfuzz.cpp
-            ../fuzzer_common.cpp)
-    target_link_libraries(const_opt_ossfuzz PRIVATE libsolc evmasm)
-
-    add_library(strictasm_diff_ossfuzz
-            strictasm_diff_ossfuzz.cpp
-            yulFuzzerCommon.cpp
-            )
-    target_link_libraries(strictasm_diff_ossfuzz PRIVATE libsolc evmasm yulInterpreter)
-
-    add_library(strictasm_opt_ossfuzz
-            strictasm_opt_ossfuzz.cpp
-            )
-    target_link_libraries(strictasm_opt_ossfuzz PRIVATE yul)
-
-    add_library(strictasm_assembly_ossfuzz
-            strictasm_assembly_ossfuzz.cpp
-            )
-    target_link_libraries(strictasm_assembly_ossfuzz PRIVATE yul)
-
-#    add_executable(yul_proto_ossfuzz yulProtoFuzzer.cpp protoToYul.cpp yulProto.pb.cc)
-#    target_include_directories(yul_proto_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include)
-#    target_link_libraries(yul_proto_ossfuzz PRIVATE yul
-#            protobuf-mutator-libfuzzer.a
-#            protobuf-mutator.a
-#            protobuf.a
-#            FuzzingEngine.a)
-#
-#    add_executable(yul_proto_diff_ossfuzz yulProto_diff_ossfuzz.cpp yulFuzzerCommon.cpp protoToYul.cpp yulProto.pb.cc)
-#    target_include_directories(yul_proto_diff_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include)
-#    target_link_libraries(yul_proto_diff_ossfuzz PRIVATE yul
-#            yulInterpreter
-#            protobuf-mutator-libfuzzer.a
-#            protobuf-mutator.a
-#            protobuf.a
-#            FuzzingEngine.a)
-#    add_executable(abiv2_proto_ossfuzz
-#            ../../EVMHost.cpp
-#            abiV2ProtoFuzzer.cpp
-#            abiV2FuzzerCommon.cpp
-#            protoToAbiV2.cpp
-#            abiV2Proto.pb.cc
-#    )
-#    target_include_directories(abiv2_proto_ossfuzz PRIVATE
-#            /src/LPM/external.protobuf/include
-#            /src/libprotobuf-mutator
-#            /src/evmone/include
-#    )
-#    target_link_libraries(abiv2_proto_ossfuzz PRIVATE solidity
-#            evmone intx ethash keccak evmc-instructions evmc
-#            protobuf-mutator-libfuzzer.a
-#            protobuf-mutator.a
-#            protobuf.a
-#            FuzzingEngine.a
-#    )
-endif()
diff --git a/test/tools/ossfuzz/Generators.h b/test/tools/ossfuzz/Generators.h
deleted file mode 100644
index 4a5aae999eb9..000000000000
--- a/test/tools/ossfuzz/Generators.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Convenience macros for Solidity generator type declarations.
- */
-
-#pragma once
-
-/*
- * Alphabetically sorted Generator types.
- * SEP must appear between two elements and ENDSEP must
- * appear after the last element.
- *
- * This macro applies another macro (MACRO) that is
- * passed as input to this macro on the list of Generator
- * types. Example that uses forward declaration:
- *
- * #define MACRO(G) class G;
- * #define SEMICOLON() ;
- *
- * GENERATORLIST(MACRO, SEMICOLON(), SEMICOLON())
- *
- * produces
- *
- * class PragmaGenerator;class SourceUnitGenerator;class TestCaseGenerator;
- *
- */
-#define GENERATORLIST(MACRO, SEP, ENDSEP) \
-	MACRO(ImportGenerator) SEP \
-	MACRO(PragmaGenerator) SEP \
-	MACRO(SourceUnitGenerator) SEP \
-	MACRO(TestCaseGenerator) ENDSEP
diff --git a/test/tools/ossfuzz/README.md b/test/tools/ossfuzz/README.md
deleted file mode 100644
index 9343602d44d2..000000000000
--- a/test/tools/ossfuzz/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-## Intro
-
-[oss-fuzz][1] is Google's fuzzing infrastructure that performs continuous fuzzing. What this means is that, each and every upstream commit is automatically fetched by the infrastructure and fuzzed on a daily basis.
-
-## How to build fuzzers?
-
-We have multiple fuzzers, some based on string input and others on protobuf input. To build them, please do the following:
-
-- Create a local docker image from `Dockerfile.ubuntu.clang.ossfuzz` in the `.circleci/docker` sub-directory. Please note that this step is likely to take at least an hour to complete. Therefore, it is recommended to do it when you are away from the computer (and the computer is plugged to power since we do not want a battery drain).
-
-```
-$ cd .circleci/docker
-$ docker build -t solidity-ossfuzz-local -f Dockerfile.ubuntu.clang.ossfuzz .
-```
-
-- Login to the docker container sourced from the image built in the previous step from the solidity parent directory
-
-```
-## Host
-$ cd solidity
-$ docker run -v `pwd`:/src/solidity -ti solidity-ossfuzz-local /bin/bash
-## Docker shell
-$ cd /src/solidity
-```
-
-- Run cmake and build fuzzer harnesses
-
-```
-## Docker shell
-$ cd /src/solidity
-$ rm -rf fuzzer-build && mkdir fuzzer-build && cd fuzzer-build
-## Compile protobuf C++ bindings
-$ protoc --proto_path=../test/tools/ossfuzz yulProto.proto --cpp_out=../test/tools/ossfuzz
-$ protoc --proto_path=../test/tools/ossfuzz abiV2Proto.proto --cpp_out=../test/tools/ossfuzz
-## Run cmake
-$ export CC=clang CXX=clang++
-$ cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/libfuzzer.cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} ..
-$ make ossfuzz ossfuzz_proto ossfuzz_abiv2 -j
-```
-
-## Why the elaborate docker image to build fuzzers?
-
-For the following reasons:
-
-- Fuzzing binaries **must** link against libc++ and not libstdc++
-  - This is [because][2] (1) MemorySanitizer (which flags uses of uninitialized memory) depends on libc++; and (2) because libc++ is instrumented (to check for memory and type errors) and libstdc++ not, the former may find more bugs.
-
-- Linking against libc++ requires us to compile everything solidity depends on from source (and link these against libc++ as well)
-
-- To reproduce the compiler versions used by upstream oss-fuzz bots, we need to reuse their docker image containing the said compiler versions
-
-- Some fuzzers depend on libprotobuf, libprotobuf-mutator, libevmone etc. which may not be available locally; even if they were they might not be the right versions
-
-## What is LIB\_FUZZING\_ENGINE?
-
-oss-fuzz contains multiple fuzzer back-ends i.e., fuzzers. Each back-end may require different linker flags. oss-fuzz builder bot defines the correct linker flags via a bash environment variable called `LIB_FUZZING_ENGINE`.
-
-For the solidity ossfuzz CI build, we use the libFuzzer back-end. This back-end requires us to manually set the `LIB_FUZZING_ENGINE` to `-fsanitize=fuzzer`.
-
-## What does the ossfuzz directory contain?
-
-To help oss-fuzz do this, we (as project maintainers) need to provide the following:
-
-- test harnesses: C/C++ tests that define the `LLVMFuzzerTestOneInput` API. This determines what is to be fuzz tested.
-- build infrastructure: (c)make targets per fuzzing binary. Fuzzing requires coverage and memory instrumentation of the code to be fuzzed.
-- configuration files: These are files with the `.options` extension that are parsed by oss-fuzz. The only option that we use currently is the `dictionary` option that asks the fuzzing engines behind oss-fuzz to use the specified dictionary. The specified dictionary happens to be `solidity.dict.`
-
-`solidity.dict` contains Solidity-specific syntactical tokens that are more likely to guide the fuzzer towards generating parseable and varied Solidity input.
-
-To be consistent and aid better evaluation of the utility of the fuzzing dictionary, we stick to the following rules-of-thumb:
-  - Full tokens such as `block.number` are preceded and followed by a whitespace
-  - Incomplete tokens including function calls such as `msg.sender.send()` are abbreviated `.send(` to provide some leeway to the fuzzer to sythesize variants such as `address(this).send()`
-  - Language keywords are suffixed by a whitespace with the exception of those that end a line of code such as `break;` and `continue;`
-
-[1]: https://github.com/google/oss-fuzz
-[2]: https://github.com/google/oss-fuzz/issues/1114#issuecomment-360660201
diff --git a/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp b/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp
deleted file mode 100644
index ea5fa20ce4a7..000000000000
--- a/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/SolidityCustomMutatorInterface.h>
-#include <test/tools/ossfuzz/SolidityGenerator.h>
-
-#include <liblangutil/Exceptions.h>
-
-using namespace std;
-using namespace solidity::test::fuzzer::mutator;
-
-// Prototype as we can't use the FuzzerInterface.h header.
-extern "C" size_t LLVMFuzzerMutate(uint8_t* _data, size_t _size, size_t _maxSize);
-extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* _data, size_t size, size_t _maxSize, unsigned int seed);
-namespace
-{
-/// Define Solidity's custom mutator by implementing libFuzzer's
-/// custom mutator external interface.
-extern "C" size_t LLVMFuzzerCustomMutator(
-	uint8_t* _data,
-	size_t _size,
-	size_t _maxSize,
-	unsigned int _seed
-)
-{
-	solAssert(_data, "libFuzzerInterface: libFuzzer supplied bad buffer");
-	if (_maxSize <= _size || _size == 0)
-		return LLVMFuzzerMutate(_data, _size, _maxSize);
-	return SolidityCustomMutatorInterface{_data, _size, _maxSize, _seed}.generate();
-}
-}
-
-SolidityCustomMutatorInterface::SolidityCustomMutatorInterface(
-	uint8_t* _data,
-	size_t _size,
-	size_t _maxSize,
-	unsigned int _seed
-	):
-	data(_data),
-	size(_size),
-	maxMutantSize(_maxSize),
-	generator(make_shared<SolidityGenerator>(_seed))
-{}
-
-size_t SolidityCustomMutatorInterface::generate()
-{
-	string testCase = generator->generateTestProgram();
-	solAssert(
-		!testCase.empty() && data,
-		"Solc custom mutator: Invalid mutant or memory pointer"
-	);
-	size_t mutantSize = min(testCase.size(), maxMutantSize - 1);
-	mempcpy(data, testCase.data(), mutantSize);
-	return mutantSize;
-}
diff --git a/test/tools/ossfuzz/SolidityCustomMutatorInterface.h b/test/tools/ossfuzz/SolidityCustomMutatorInterface.h
deleted file mode 100644
index 9cdbf505f92c..000000000000
--- a/test/tools/ossfuzz/SolidityCustomMutatorInterface.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Implements libFuzzer's custom mutator interface.
- */
-
-#pragma once
-
-#include <test/tools/ossfuzz/SolidityGenerator.h>
-
-#include <memory>
-
-namespace solidity::test::fuzzer::mutator
-{
-struct SolidityCustomMutatorInterface
-{
-	SolidityCustomMutatorInterface(uint8_t* _data, size_t _size, size_t _maxSize, unsigned _seed);
-	/// Generates Solidity test program, copies it into buffer
-	/// provided by libFuzzer and @returns size of the test program.
-	size_t generate();
-
-	/// Raw pointer to libFuzzer provided input
-	uint8_t* data;
-	/// Size of libFuzzer provided input
-	size_t size;
-	/// Maximum length of mutant specified by libFuzzer
-	size_t maxMutantSize;
-	/// Solidity generator handle
-	std::shared_ptr<SolidityGenerator> generator;
-};
-}
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
deleted file mode 100644
index 34147090882c..000000000000
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/SolidityEvmoneInterface.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-#include <range/v3/span.hpp>
-
-using namespace solidity::test::fuzzer;
-using namespace solidity::frontend;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace std;
-
-optional<CompilerOutput> SolidityCompilationFramework::compileContract()
-{
-	m_compiler.setSources(m_compilerInput.sourceCode);
-	m_compiler.setLibraries(m_compilerInput.libraryAddresses);
-	m_compiler.setEVMVersion(m_compilerInput.evmVersion);
-	m_compiler.setOptimiserSettings(m_compilerInput.optimiserSettings);
-	m_compiler.setViaIR(m_compilerInput.viaIR);
-	if (!m_compiler.compile())
-	{
-		if (m_compilerInput.debugFailure)
-		{
-			cerr << "Compiling contract failed" << endl;
-			cerr << SourceReferenceFormatter::formatErrorInformation(
-				m_compiler.errors(),
-				m_compiler
-			);
-		}
-		return {};
-	}
-	else
-	{
-		string contractName;
-		if (m_compilerInput.contractName.empty())
-			contractName = m_compiler.lastContractName();
-		else
-			contractName = m_compilerInput.contractName;
-		evmasm::LinkerObject obj = m_compiler.object(contractName);
-		Json::Value methodIdentifiers = m_compiler.interfaceSymbols(contractName)["methods"];
-		return CompilerOutput{obj.bytecode, methodIdentifiers};
-	}
-}
-
-bool EvmoneUtility::zeroWord(uint8_t const* _result, size_t _length)
-{
-	return _length == 32 &&
-		ranges::all_of(
-			ranges::span(_result, static_cast<long>(_length)),
-			[](uint8_t _v) { return _v == 0; });
-}
-
-evmc_message EvmoneUtility::initializeMessage(bytes const& _input)
-{
-	// Zero initialize all message fields
-	evmc_message msg = {};
-	// Gas available (value of type int64_t) is set to its maximum
-	// value.
-	msg.gas = std::numeric_limits<int64_t>::max();
-	msg.input_data = _input.data();
-	msg.input_size = _input.size();
-	return msg;
-}
-
-evmc::Result EvmoneUtility::executeContract(
-	bytes const& _functionHash,
-	evmc_address _deployedAddress
-)
-{
-	evmc_message message = initializeMessage(_functionHash);
-	message.recipient = _deployedAddress;
-	message.code_address = _deployedAddress;
-	message.kind = EVMC_CALL;
-	return m_evmHost.call(message);
-}
-
-evmc::Result EvmoneUtility::deployContract(bytes const& _code)
-{
-	evmc_message message = initializeMessage(_code);
-	message.kind = EVMC_CREATE;
-	return m_evmHost.call(message);
-}
-
-evmc::Result EvmoneUtility::deployAndExecute(
-	bytes const& _byteCode,
-	string const& _hexEncodedInput
-)
-{
-	// Deploy contract and signal failure if deploy failed
-	evmc::Result createResult = deployContract(_byteCode);
-	solAssert(
-		createResult.status_code == EVMC_SUCCESS,
-		"SolidityEvmoneInterface: Contract creation failed"
-	);
-
-	// Execute test function and signal failure if EVM reverted or
-	// did not return expected output on successful execution.
-	evmc::Result callResult = executeContract(
-		util::fromHex(_hexEncodedInput),
-		createResult.create_address
-	);
-
-	// We don't care about EVM One failures other than EVMC_REVERT
-	solAssert(
-		callResult.status_code != EVMC_REVERT,
-		"SolidityEvmoneInterface: EVM One reverted"
-	);
-	return callResult;
-}
-
-evmc::Result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
-{
-	map<string, h160> libraryAddressMap;
-	// Stage 1: Compile and deploy library if present.
-	if (!m_libraryName.empty())
-	{
-		m_compilationFramework.contractName(m_libraryName);
-		auto compilationOutput = m_compilationFramework.compileContract();
-		solAssert(compilationOutput.has_value(), "Compiling library failed");
-		CompilerOutput cOutput = compilationOutput.value();
-		// Deploy contract and signal failure if deploy failed
-		evmc::Result createResult = deployContract(cOutput.byteCode);
-		solAssert(
-			createResult.status_code == EVMC_SUCCESS,
-			"SolidityEvmoneInterface: Library deployment failed"
-		);
-		libraryAddressMap[m_libraryName] = EVMHost::convertFromEVMC(createResult.create_address);
-		m_compilationFramework.libraryAddresses(libraryAddressMap);
-	}
-
-	// Stage 2: Compile, deploy, and execute contract, optionally using library
-	// address map.
-	m_compilationFramework.contractName(m_contractName);
-	auto cOutput = m_compilationFramework.compileContract();
-	solAssert(cOutput.has_value(), "Compiling contract failed");
-	solAssert(
-		!cOutput->byteCode.empty() && !cOutput->methodIdentifiersInContract.empty(),
-		"SolidityEvmoneInterface: Invalid compilation output."
-	);
-
-	string methodName;
-	if (!_fuzzIsabelle.empty())
-		// TODO: Remove this once a cleaner solution is found for querying
-		// isabelle test entry point. At the moment, we are sure that the
-		// entry point is the second method in the contract (hence the ++)
-		// but not its name.
-		methodName = (++cOutput->methodIdentifiersInContract.begin())->asString() +
-			_fuzzIsabelle.substr(2, _fuzzIsabelle.size());
-	else
-		methodName = cOutput->methodIdentifiersInContract[m_methodName].asString();
-
-	return deployAndExecute(
-		cOutput->byteCode,
-		methodName
-	);
-}
-
-optional<CompilerOutput> EvmoneUtility::compileContract()
-{
-	try
-	{
-		return m_compilationFramework.compileContract();
-	}
-	catch (evmasm::StackTooDeepException const&)
-	{
-		return {};
-	}
-}
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
deleted file mode 100644
index ea684ea72332..000000000000
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <test/EVMHost.h>
-
-#include <libsolidity/interface/CompilerStack.h>
-
-#include <libyul/YulStack.h>
-
-#include <libsolutil/Keccak256.h>
-
-#include <evmone/evmone.h>
-
-namespace solidity::test::fuzzer
-{
-struct CompilerOutput
-{
-	/// EVM bytecode returned by compiler
-	solidity::bytes byteCode;
-	/// Method identifiers in a contract
-	Json::Value methodIdentifiersInContract;
-};
-
-struct CompilerInput
-{
-	CompilerInput(
-		langutil::EVMVersion _evmVersion,
-		StringMap const& _sourceCode,
-		std::string const& _contractName,
-		frontend::OptimiserSettings _optimiserSettings,
-		std::map<std::string, solidity::util::h160> _libraryAddresses,
-		bool _debugFailure = false,
-		bool _viaIR = false
-	):
-		evmVersion(_evmVersion),
-		sourceCode(_sourceCode),
-		contractName(_contractName),
-		optimiserSettings(_optimiserSettings),
-		libraryAddresses(_libraryAddresses),
-		debugFailure(_debugFailure),
-		viaIR(_viaIR)
-	{}
-	/// EVM target version
-	langutil::EVMVersion evmVersion;
-	/// Source code to be compiled
-	StringMap const& sourceCode;
-	/// Contract name without a colon prefix
-	std::string contractName;
-	/// Optimiser setting to be used during compilation
-	frontend::OptimiserSettings optimiserSettings;
-	/// Information on which library is deployed where
-	std::map<std::string, solidity::util::h160> libraryAddresses;
-	/// Flag used for debugging
-	bool debugFailure;
-	/// Flag to enable new code generator.
-	bool viaIR;
-};
-
-class SolidityCompilationFramework
-{
-public:
-	SolidityCompilationFramework(CompilerInput _input): m_compilerInput(_input)
-	{}
-	/// Sets contract name to @param _contractName.
-	void contractName(std::string const& _contractName)
-	{
-		m_compilerInput.contractName = _contractName;
-	}
-	/// Sets library addresses to @param _libraryAddresses.
-	void libraryAddresses(std::map<std::string, solidity::util::h160> _libraryAddresses)
-	{
-		m_compilerInput.libraryAddresses = std::move(_libraryAddresses);
-	}
-	/// @returns method identifiers in contract called @param _contractName.
-	Json::Value methodIdentifiers(std::string const& _contractName)
-	{
-		return m_compiler.interfaceSymbols(_contractName)["methods"];
-	}
-	/// @returns Compilation output comprising EVM bytecode and list of
-	/// method identifiers in contract if compilation is successful,
-	/// null value otherwise.
-	std::optional<CompilerOutput> compileContract();
-private:
-	frontend::CompilerStack m_compiler;
-	CompilerInput m_compilerInput;
-};
-
-class EvmoneUtility
-{
-public:
-	EvmoneUtility(
-		solidity::test::EVMHost& _evmHost,
-		CompilerInput _compilerInput,
-		std::string const& _contractName,
-		std::string const& _libraryName,
-		std::string const& _methodName
-	):
-		m_evmHost(_evmHost),
-		m_compilationFramework(_compilerInput),
-		m_contractName(_contractName),
-		m_libraryName(_libraryName),
-		m_methodName(_methodName)
-	{}
-	/// @returns the result returned by the EVM host on compiling, deploying,
-	/// and executing test configuration.
-	/// @param _isabelleData contains encoding data to be passed to the
-	/// isabelle test entry point.
-	evmc::Result compileDeployAndExecute(std::string _isabelleData = {});
-	/// Compares the contents of the memory address pointed to
-	/// by `_result` of `_length` bytes to u256 zero.
-	/// @returns true if `_result` is zero, false
-	/// otherwise.
-	static bool zeroWord(uint8_t const* _result, size_t _length);
-	/// @returns an evmc_message with all of its fields zero
-	/// initialized except gas and input fields.
-	/// The gas field is set to the maximum permissible value so that we
-	/// don't run into out of gas errors. The input field is copied from
-	/// @param _input.
-	static evmc_message initializeMessage(bytes const& _input);
-private:
-	/// @returns the result of the execution of the function whose
-	/// keccak256 hash is @param _functionHash that is deployed at
-	/// @param _deployedAddress in @param _hostContext.
-	evmc::Result executeContract(
-		bytes const& _functionHash,
-		evmc_address _deployedAddress
-	);
-	/// @returns the result of deployment of @param _code on @param _hostContext.
-	evmc::Result deployContract(bytes const& _code);
-	/// Deploys and executes EVM byte code in @param _byteCode on
-	/// EVM Host referenced by @param _hostContext. Input passed
-	/// to execution context is @param _hexEncodedInput.
-	/// @returns result returning by @param _hostContext.
-	evmc::Result deployAndExecute(
-		bytes const& _byteCode,
-		std::string const& _hexEncodedInput
-	);
-	/// Compiles contract named @param _contractName present in
-	/// @param _sourceCode, optionally using a precompiled library
-	/// specified via a library mapping and an optimisation setting.
-	/// @returns a pair containing the generated byte code and method
-	/// identifiers for methods in @param _contractName.
-	std::optional<CompilerOutput> compileContract();
-
-	/// EVM Host implementation
-	solidity::test::EVMHost& m_evmHost;
-	/// Solidity compilation framework
-	SolidityCompilationFramework m_compilationFramework;
-	/// Contract name
-	std::string m_contractName;
-	/// Library name
-	std::string m_libraryName;
-	/// Method name
-	std::string m_methodName;
-};
-
-}
diff --git a/test/tools/ossfuzz/SolidityGenerator.cpp b/test/tools/ossfuzz/SolidityGenerator.cpp
deleted file mode 100644
index 1d836a4aee36..000000000000
--- a/test/tools/ossfuzz/SolidityGenerator.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/SolidityGenerator.h>
-
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/Visitor.h>
-
-using namespace solidity::test::fuzzer::mutator;
-using namespace solidity::util;
-using namespace std;
-
-GeneratorBase::GeneratorBase(std::shared_ptr<SolidityGenerator> _mutator)
-{
-	mutator = std::move(_mutator);
-	state = mutator->testState();
-	uRandDist = mutator->uniformRandomDist();
-}
-
-string GeneratorBase::visitChildren()
-{
-	ostringstream os;
-	// Randomise visit order
-	vector<GeneratorPtr> randomisedChildren;
-	for (auto const& child: generators)
-		randomisedChildren.push_back(child);
-	shuffle(randomisedChildren.begin(), randomisedChildren.end(), *uRandDist->randomEngine);
-	for (auto child: randomisedChildren)
-		os << std::visit(GenericVisitor{
-			[&](auto const& _item) { return _item->generate(); }
-		}, child);
-	return os.str();
-}
-
-string TestState::randomPath(set<string> const& _sourceUnitPaths) const
-{
-	auto it = _sourceUnitPaths.begin();
-	/// Advance iterator by n where 0 <= n <= sourceUnitPaths.size() - 1
-	size_t increment = uRandDist->distributionOneToN(_sourceUnitPaths.size()) - 1;
-	solAssert(
-		increment >= 0 && increment < _sourceUnitPaths.size(),
-		"Solc custom mutator: Invalid increment"
-	);
-	advance(it, increment);
-	return *it;
-}
-
-string TestState::randomPath() const
-{
-	solAssert(!empty(), "Solc custom mutator: Null test state");
-	return randomPath(sourceUnitPaths);
-}
-
-void TestState::print(std::ostream& _os) const
-{
-	_os << "Printing test state" << std::endl;
-	for (auto const& item: sourceUnitPaths)
-		_os << "Source path: " << item << std::endl;
-}
-
-string TestState::randomNonCurrentPath() const
-{
-	/// To obtain a source path that is not the currently visited
-	/// source unit itself, we require at least one other source
-	/// unit to be previously visited.
-	solAssert(size() >= 2, "Solc custom mutator: Invalid test state");
-
-	set<string> filteredSourcePaths;
-	string currentPath = currentSourceUnitPath;
-	copy_if(
-		sourceUnitPaths.begin(),
-		sourceUnitPaths.end(),
-		inserter(filteredSourcePaths, filteredSourcePaths.begin()),
-		[currentPath](string const& _item) {
-			return _item != currentPath;
-		}
-	);
-	return randomPath(filteredSourcePaths);
-}
-
-void TestCaseGenerator::setup()
-{
-	addGenerators({
-		mutator->generator<SourceUnitGenerator>()
-	});
-}
-
-string TestCaseGenerator::visit()
-{
-	ostringstream os;
-	for (unsigned i = 0; i < uRandDist->distributionOneToN(s_maxSourceUnits); i++)
-	{
-		string sourcePath = path();
-		os << "\n"
-			<< "==== Source: "
-			<< sourcePath
-			<< " ===="
-	        << "\n";
-		updateSourcePath(sourcePath);
-		m_numSourceUnits++;
-		os << visitChildren();
-	}
-	return os.str();
-}
-
-void SourceUnitGenerator::setup()
-{
-	addGenerators({
-		mutator->generator<ImportGenerator>(),
-		mutator->generator<PragmaGenerator>()
-	});
-}
-
-string SourceUnitGenerator::visit()
-{
-	return visitChildren();
-}
-
-string PragmaGenerator::visit()
-{
-	static constexpr const char* preamble = R"(
-		pragma solidity >= 0.0.0;
-		pragma experimental SMTChecker;
-	)";
-	// Choose equally at random from coder v1 and v2
-	string abiPragma = "pragma abicoder v" +
-		to_string(uRandDist->distributionOneToN(2)) +
-		";\n";
-	return preamble + abiPragma;
-}
-
-string ImportGenerator::visit()
-{
-	/*
-	 * Case 1: No source units defined
-	 * Case 2: One source unit defined
-	 * Case 3: At least two source units defined
-	 */
-	ostringstream os;
-	// Self import with a small probability only if
-	// there is one source unit present in test.
-	if (state->size() == 1)
-	{
-		if (uRandDist->probable(s_selfImportInvProb))
-			os << "import "
-			   << "\""
-			   << state->randomPath()
-			   << "\";";
-	}
-	else
-	{
-		// Import a different source unit if at least
-		// two source units available.
-		os << "import "
-			<< "\""
-			<< state->randomNonCurrentPath()
-			<< "\";";
-	}
-	return os.str();
-}
-
-template <typename T>
-shared_ptr<T> SolidityGenerator::generator()
-{
-	for (auto& g: m_generators)
-		if (holds_alternative<shared_ptr<T>>(g))
-			return get<shared_ptr<T>>(g);
-	solAssert(false, "");
-}
-
-SolidityGenerator::SolidityGenerator(unsigned _seed)
-{
-	m_generators = {};
-	m_urd = make_shared<UniformRandomDistribution>(make_unique<RandomEngine>(_seed));
-	m_state = make_shared<TestState>(m_urd);
-}
-
-template <size_t I>
-void SolidityGenerator::createGenerators()
-{
-	if constexpr (I < std::variant_size_v<Generator>)
-	{
-		createGenerator<std::variant_alternative_t<I, Generator>>();
-		createGenerators<I + 1>();
-	}
-}
-
-string SolidityGenerator::generateTestProgram()
-{
-	createGenerators();
-	for (auto& g: m_generators)
-		std::visit(GenericVisitor{
-			[&](auto const& _item) { return _item->setup(); }
-		}, g);
-	string program = generator<TestCaseGenerator>()->generate();
-	destroyGenerators();
-	return program;
-}
diff --git a/test/tools/ossfuzz/SolidityGenerator.h b/test/tools/ossfuzz/SolidityGenerator.h
deleted file mode 100644
index f56efe9a8984..000000000000
--- a/test/tools/ossfuzz/SolidityGenerator.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Implements generators for synthesizing mostly syntactically valid
- * Solidity test programs.
- */
-
-#pragma once
-
-#include <test/tools/ossfuzz/Generators.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <memory>
-#include <random>
-#include <set>
-#include <variant>
-
-namespace solidity::test::fuzzer::mutator
-{
-/// Forward declarations
-class SolidityGenerator;
-
-/// Type declarations
-#define SEMICOLON() ;
-#define FORWARDDECLAREGENERATORS(G) class G
-GENERATORLIST(FORWARDDECLAREGENERATORS, SEMICOLON(), SEMICOLON())
-#undef FORWARDDECLAREGENERATORS
-#undef SEMICOLON
-
-#define COMMA() ,
-using GeneratorPtr = std::variant<
-#define VARIANTOFSHARED(G) std::shared_ptr<G>
-GENERATORLIST(VARIANTOFSHARED, COMMA(), )
->;
-#undef VARIANTOFSHARED
-using Generator = std::variant<
-#define VARIANTOFGENERATOR(G) G
-GENERATORLIST(VARIANTOFGENERATOR, COMMA(), )
->;
-#undef VARIANTOFGENERATOR
-#undef COMMA
-using RandomEngine = std::mt19937_64;
-using Distribution = std::uniform_int_distribution<size_t>;
-
-struct UniformRandomDistribution
-{
-	explicit UniformRandomDistribution(std::unique_ptr<RandomEngine> _randomEngine):
-		randomEngine(std::move(_randomEngine))
-	{}
-
-	/// @returns an unsigned integer in the range [1, @param _n] chosen
-	/// uniformly at random.
-	[[nodiscard]] size_t distributionOneToN(size_t _n) const
-	{
-		return Distribution(1, _n)(*randomEngine);
-	}
-	/// @returns true with a probability of 1/(@param _n), false otherwise.
-	/// @param _n must be non zero.
-	[[nodiscard]] bool probable(size_t _n) const
-	{
-		solAssert(_n > 0, "");
-		return distributionOneToN(_n) == 1;
-	}
-	std::unique_ptr<RandomEngine> randomEngine;
-};
-
-struct TestState
-{
-	explicit TestState(std::shared_ptr<UniformRandomDistribution> _urd):
-		sourceUnitPaths({}),
-		currentSourceUnitPath({}),
-		uRandDist(std::move(_urd))
-	{}
-	/// Adds @param _path to @name sourceUnitPaths updates
-	/// @name currentSourceUnitPath.
-	void addSourceUnit(std::string const& _path)
-	{
-		sourceUnitPaths.insert(_path);
-		currentSourceUnitPath = _path;
-	}
-	/// @returns true if @name sourceUnitPaths is empty,
-	/// false otherwise.
-	[[nodiscard]] bool empty() const
-	{
-		return sourceUnitPaths.empty();
-	}
-	/// @returns the number of items in @name sourceUnitPaths.
-	[[nodiscard]] size_t size() const
-	{
-		return sourceUnitPaths.size();
-	}
-	/// Prints test state to @param _os.
-	void print(std::ostream& _os) const;
-	/// @returns a randomly chosen path from @param _sourceUnitPaths.
-	[[nodiscard]] std::string randomPath(std::set<std::string> const& _sourceUnitPaths) const;
-	/// @returns a randomly chosen path from @name sourceUnitPaths.
-	[[nodiscard]] std::string randomPath() const;
-	/// @returns a randomly chosen non current source unit path.
-	[[nodiscard]] std::string randomNonCurrentPath() const;
-	/// List of source paths in test input.
-	std::set<std::string> sourceUnitPaths;
-	/// Source path being currently visited.
-	std::string currentSourceUnitPath;
-	/// Uniform random distribution.
-	std::shared_ptr<UniformRandomDistribution> uRandDist;
-};
-
-struct GeneratorBase
-{
-	explicit GeneratorBase(std::shared_ptr<SolidityGenerator> _mutator);
-	template <typename T>
-	std::shared_ptr<T> generator()
-	{
-		for (auto& g: generators)
-			if (std::holds_alternative<std::shared_ptr<T>>(g))
-				return std::get<std::shared_ptr<T>>(g);
-		solAssert(false, "");
-	}
-	/// @returns test fragment created by this generator.
-	std::string generate()
-	{
-		std::string generatedCode = visit();
-		endVisit();
-		return generatedCode;
-	}
-	/// @returns a string representing the generation of
-	/// the Solidity grammar element.
-	virtual std::string visit() = 0;
-	/// Method called after visiting this generator. Used
-	/// for clearing state if necessary.
-	virtual void endVisit() {}
-	/// Visitor that invokes child grammar elements of
-	/// this grammar element returning their string
-	/// representations.
-	std::string visitChildren();
-	/// Adds generators for child grammar elements of
-	/// this grammar element.
-	void addGenerators(std::set<GeneratorPtr> _generators)
-	{
-		generators += _generators;
-	}
-	/// Virtual method to obtain string name of generator.
-	virtual std::string name() = 0;
-	/// Virtual method to add generators that this grammar
-	/// element depends on. If not overridden, there are
-	/// no dependencies.
-	virtual void setup() {}
-	virtual ~GeneratorBase()
-	{
-		generators.clear();
-	}
-	/// Shared pointer to the mutator instance
-	std::shared_ptr<SolidityGenerator> mutator;
-	/// Set of generators used by this generator.
-	std::set<GeneratorPtr> generators;
-	/// Shared ptr to global test state.
-	std::shared_ptr<TestState> state;
-	/// Uniform random distribution
-	std::shared_ptr<UniformRandomDistribution> uRandDist;
-};
-
-class TestCaseGenerator: public GeneratorBase
-{
-public:
-	explicit TestCaseGenerator(std::shared_ptr<SolidityGenerator> _mutator):
-		GeneratorBase(std::move(_mutator)),
-		m_numSourceUnits(0)
-	{}
-	void setup() override;
-	std::string visit() override;
-	std::string name() override
-	{
-		return "Test case generator";
-	}
-private:
-	/// @returns a new source path name that is formed by concatenating
-	/// a static prefix @name m_sourceUnitNamePrefix, a monotonically
-	/// increasing counter starting from 0 and the postfix (extension)
-	/// ".sol".
-	[[nodiscard]] std::string path() const
-	{
-		return m_sourceUnitNamePrefix + std::to_string(m_numSourceUnits) + ".sol";
-	}
-	/// Adds @param _path to list of source paths in global test
-	/// state and increments @name m_numSourceUnits.
-	void updateSourcePath(std::string const& _path)
-	{
-		state->addSourceUnit(_path);
-		m_numSourceUnits++;
-	}
-	/// Number of source units in test input
-	size_t m_numSourceUnits;
-	/// String prefix of source unit names
-	std::string const m_sourceUnitNamePrefix = "su";
-	/// Maximum number of source units per test input
-	static constexpr unsigned s_maxSourceUnits = 3;
-};
-
-class SourceUnitGenerator: public GeneratorBase
-{
-public:
-	explicit SourceUnitGenerator(std::shared_ptr<SolidityGenerator> _mutator):
-		GeneratorBase(std::move(_mutator))
-	{}
-	void setup() override;
-	std::string visit() override;
-	std::string name() override { return "Source unit generator"; }
-};
-
-class PragmaGenerator: public GeneratorBase
-{
-public:
-	explicit PragmaGenerator(std::shared_ptr<SolidityGenerator> _mutator):
-		GeneratorBase(std::move(_mutator))
-	{}
-	std::string visit() override;
-	std::string name() override { return "Pragma generator"; }
-};
-
-class ImportGenerator: public GeneratorBase
-{
-public:
-	explicit ImportGenerator(std::shared_ptr<SolidityGenerator> _mutator):
-	       GeneratorBase(std::move(_mutator))
-	{}
-	std::string visit() override;
-	std::string name() override { return "Import generator"; }
-private:
-	/// Inverse probability with which a source unit
-	/// imports itself. Keeping this at 17 seems to
-	/// produce self imported source units with a
-	/// frequency small enough so that it does not
-	/// consume too many fuzzing cycles but large
-	/// enough so that the fuzzer generates self
-	/// import statements every once in a while.
-	static constexpr size_t s_selfImportInvProb = 17;
-};
-
-class SolidityGenerator: public std::enable_shared_from_this<SolidityGenerator>
-{
-public:
-	explicit SolidityGenerator(unsigned _seed);
-
-	/// @returns the generator of type @param T.
-	template <typename T>
-	std::shared_ptr<T> generator();
-	/// @returns a shared ptr to underlying random
-	/// number distribution.
-	std::shared_ptr<UniformRandomDistribution> uniformRandomDist()
-	{
-		return m_urd;
-	}
-	/// @returns a pseudo randomly generated test case.
-	std::string generateTestProgram();
-	/// @returns shared ptr to global test state.
-	std::shared_ptr<TestState> testState()
-	{
-		return m_state;
-	}
-private:
-	template <typename T>
-	void createGenerator()
-	{
-		m_generators.insert(
-			std::make_shared<T>(shared_from_this())
-		);
-	}
-	template <std::size_t I = 0>
-	void createGenerators();
-	void destroyGenerators()
-	{
-		m_generators.clear();
-	}
-	/// Sub generators
-	std::set<GeneratorPtr> m_generators;
-	/// Shared global test state
-	std::shared_ptr<TestState> m_state;
-	/// Uniform random distribution
-	std::shared_ptr<UniformRandomDistribution> m_urd;
-};
-}
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
deleted file mode 100644
index fb502af52778..000000000000
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <test/tools/ossfuzz/yulProto.pb.h>
-#include <test/tools/ossfuzz/protoToYul.h>
-
-#include <test/EVMHost.h>
-
-#include <test/tools/ossfuzz/YulEvmoneInterface.h>
-
-#include <libyul/Exceptions.h>
-
-#include <libyul/backends/evm/EVMCodeTransform.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/CompilabilityChecker.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <evmone/evmone.h>
-
-#include <src/libfuzzer/libfuzzer_macro.h>
-
-#include <fstream>
-
-using namespace solidity;
-using namespace solidity::test;
-using namespace solidity::test::fuzzer;
-using namespace solidity::yul;
-using namespace solidity::yul::test::yul_fuzzer;
-using namespace solidity::langutil;
-using namespace std;
-
-static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
-
-namespace
-{
-/// @returns true if there are recursive functions, false otherwise.
-bool recursiveFunctionExists(Dialect const& _dialect, yul::Object& _object)
-{
-	auto recursiveFunctions = CallGraphGenerator::callGraph(*_object.code).recursiveFunctions();
-	for(auto&& [function, variables]: CompilabilityChecker{
-			_dialect,
-			_object,
-			true
-		}.unreachableVariables
-	)
-		if(recursiveFunctions.count(function))
-			return true;
-	return false;
-}
-}
-
-DEFINE_PROTO_FUZZER(Program const& _input)
-{
-	// Solidity creates an invalid instruction for subobjects, so we simply
-	// ignore them in this fuzzer.
-	if (_input.has_obj())
-		return;
-	bool filterStatefulInstructions = true;
-	bool filterUnboundedLoops = true;
-	ProtoConverter converter(
-		filterStatefulInstructions,
-		filterUnboundedLoops
-	);
-	string yul_source = converter.programToString(_input);
-	// Do not fuzz the EVM Version field.
-	// See https://github.com/ethereum/solidity/issues/12590
-	langutil::EVMVersion version;
-	EVMHost hostContext(version, evmone);
-	hostContext.reset();
-
-	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
-	{
-		ofstream of(dump_path);
-		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
-	}
-
-	YulStringRepository::reset();
-
-	solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::full();
-	settings.runYulOptimiser = false;
-	settings.optimizeStackAllocation = false;
-	bytes unoptimisedByteCode;
-	bool recursiveFunction = false;
-	bool unoptimizedStackTooDeep = false;
-	try
-	{
-		YulAssembler assembler{version, nullopt, settings, yul_source};
-		unoptimisedByteCode = assembler.assemble();
-		auto yulObject = assembler.object();
-		recursiveFunction = recursiveFunctionExists(
-			EVMDialect::strictAssemblyForEVMObjects(version),
-			*yulObject
-		);
-	}
-	catch (solidity::yul::StackTooDeepError const&)
-	{
-		unoptimizedStackTooDeep = true;
-	}
-
-	ostringstream unoptimizedState;
-	bool noRevertInSource = true;
-	bool noInvalidInSource = true;
-	if (!unoptimizedStackTooDeep)
-	{
-		evmc::Result deployResult = YulEvmoneUtility{}.deployCode(unoptimisedByteCode, hostContext);
-		if (deployResult.status_code != EVMC_SUCCESS)
-			return;
-		auto callMessage = YulEvmoneUtility{}.callMessage(deployResult.create_address);
-		evmc::Result callResult = hostContext.call(callMessage);
-		// If the fuzzer synthesized input does not contain the revert opcode which
-		// we lazily check by string find, the EVM call should not revert.
-		noRevertInSource = yul_source.find("revert") == string::npos;
-		noInvalidInSource = yul_source.find("invalid") == string::npos;
-		if (noInvalidInSource)
-			solAssert(
-				callResult.status_code != EVMC_INVALID_INSTRUCTION,
-				"Invalid instruction."
-			);
-		if (noRevertInSource)
-			solAssert(
-				callResult.status_code != EVMC_REVERT,
-				"SolidityEvmoneInterface: EVM One reverted"
-			);
-		// Bail out on serious errors encountered during a call.
-		if (YulEvmoneUtility{}.seriousCallError(callResult.status_code))
-			return;
-		solAssert(
-			(callResult.status_code == EVMC_SUCCESS ||
-			(!noRevertInSource && callResult.status_code == EVMC_REVERT) ||
-			(!noInvalidInSource && callResult.status_code == EVMC_INVALID_INSTRUCTION)),
-			"Unoptimised call failed."
-		);
-		unoptimizedState << EVMHostPrinter{hostContext, deployResult.create_address}.state();
-	}
-
-	settings.runYulOptimiser = true;
-	settings.optimizeStackAllocation = true;
-	bytes optimisedByteCode;
-	try
-	{
-		optimisedByteCode = YulAssembler{version, nullopt, settings, yul_source}.assemble();
-	}
-	catch (solidity::yul::StackTooDeepError const&)
-	{
-		if (!recursiveFunction)
-			throw;
-		else
-			return;
-	}
-
-	if (unoptimizedStackTooDeep)
-		return;
-	// Reset host before running optimised code.
-	hostContext.reset();
-	evmc::Result deployResultOpt = YulEvmoneUtility{}.deployCode(optimisedByteCode, hostContext);
-	solAssert(
-		deployResultOpt.status_code == EVMC_SUCCESS,
-		"Evmone: Optimized contract creation failed"
-	);
-	auto callMessageOpt = YulEvmoneUtility{}.callMessage(deployResultOpt.create_address);
-	evmc::Result callResultOpt = hostContext.call(callMessageOpt);
-	if (noRevertInSource)
-		solAssert(
-			callResultOpt.status_code != EVMC_REVERT,
-			"SolidityEvmoneInterface: EVM One reverted"
-		);
-	if (noInvalidInSource)
-		solAssert(
-			callResultOpt.status_code != EVMC_INVALID_INSTRUCTION,
-			"Invalid instruction."
-		);
-	solAssert(
-		(callResultOpt.status_code == EVMC_SUCCESS ||
-		 (!noRevertInSource && callResultOpt.status_code == EVMC_REVERT) ||
-		 (!noInvalidInSource && callResultOpt.status_code == EVMC_INVALID_INSTRUCTION)),
-		"Optimised call failed."
-	);
-	ostringstream optimizedState;
-	optimizedState << EVMHostPrinter{hostContext, deployResultOpt.create_address}.state();
-
-	if (unoptimizedState.str() != optimizedState.str())
-	{
-		cout << unoptimizedState.str() << endl;
-		cout << optimizedState.str() << endl;
-		solAssert(
-			false,
-			"State of unoptimised and optimised stack reused code do not match."
-		);
-	}
-}
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.cpp b/test/tools/ossfuzz/YulEvmoneInterface.cpp
deleted file mode 100644
index b89245443049..000000000000
--- a/test/tools/ossfuzz/YulEvmoneInterface.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <test/tools/ossfuzz/YulEvmoneInterface.h>
-
-#include <libyul/Exceptions.h>
-
-using namespace solidity;
-using namespace solidity::test::fuzzer;
-using namespace solidity::yul;
-
-bytes YulAssembler::assemble()
-{
-	if (
-		!m_stack.parseAndAnalyze("source", m_yulProgram) ||
-		!m_stack.parserResult()->code ||
-		!m_stack.parserResult()->analysisInfo ||
-		langutil::Error::containsErrors(m_stack.errors())
-	)
-		yulAssert(false, "Yul program could not be parsed successfully.");
-
-	if (m_optimiseYul)
-		m_stack.optimize();
-	return m_stack.assemble(YulStack::Machine::EVM).bytecode->bytecode;
-}
-
-std::shared_ptr<yul::Object> YulAssembler::object()
-{
-	return m_stack.parserResult();
-}
-
-evmc::Result YulEvmoneUtility::deployCode(bytes const& _input, EVMHost& _host)
-{
-	// Zero initialize all message fields
-	evmc_message msg = {};
-	// Gas available (value of type int64_t) is set to its maximum value
-	msg.gas = std::numeric_limits<int64_t>::max();
-	solAssert(
-		_input.size() <= 0xffff,
-		"Deployed byte code is larger than the permissible 65535 bytes."
-	);
-	uint8_t inputSizeHigher = static_cast<uint8_t>(_input.size() >> 8);
-	uint8_t inputSizeLower = _input.size() & 0xff;
-	/*
-	 * CODESIZE
-	 * PUSH0 0xc
-	 * PUSH0 0x0
-	 * CODECOPY
-	 * PUSH1 <INPUTSIZE>
-	 * PUSH0 0x0
-	 * RETURN
-	 */
-	bytes deployCode = bytes{
-		0x38, 0x60, 0x0c, 0x60, 0x00, 0x39, 0x61,
-		inputSizeHigher, inputSizeLower,
-		0x60, 0x00, 0xf3
-	} + _input;
-	msg.input_data = deployCode.data();
-	msg.input_size = deployCode.size();
-	msg.kind = EVMC_CREATE;
-	return _host.call(msg);
-}
-
-evmc_message YulEvmoneUtility::callMessage(evmc_address _address)
-{
-	evmc_message call = {};
-	call.gas = std::numeric_limits<int64_t>::max();
-	call.recipient = _address;
-	call.code_address = _address;
-	call.kind = EVMC_CALL;
-	return call;
-}
-
-bool YulEvmoneUtility::seriousCallError(evmc_status_code _code)
-{
-	if (_code == EVMC_OUT_OF_GAS)
-		return true;
-	else if (_code == EVMC_STACK_OVERFLOW)
-		return true;
-	else if (_code == EVMC_STACK_UNDERFLOW)
-		return true;
-	else if (_code == EVMC_INTERNAL_ERROR)
-		return true;
-	else if (_code == EVMC_UNDEFINED_INSTRUCTION)
-		return true;
-	else if (_code == EVMC_INVALID_MEMORY_ACCESS)
-		return true;
-	else
-		return false;
-}
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.h b/test/tools/ossfuzz/YulEvmoneInterface.h
deleted file mode 100644
index 71a47507e817..000000000000
--- a/test/tools/ossfuzz/YulEvmoneInterface.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    This file is part of solidity.
-
-    solidity is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    solidity is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <test/EVMHost.h>
-
-#include <libyul/YulStack.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-
-namespace solidity::test::fuzzer
-{
-class YulAssembler
-{
-public:
-	YulAssembler(
-		langutil::EVMVersion _evmVersion,
-		std::optional<uint8_t> _eofVersion,
-		solidity::frontend::OptimiserSettings _optSettings,
-		std::string const& _yulSource
-	):
-		m_stack(
-			_evmVersion,
-			_eofVersion,
-			solidity::yul::YulStack::Language::StrictAssembly,
-			_optSettings,
-			langutil::DebugInfoSelection::All()
-		),
-		m_yulProgram(_yulSource),
-		m_optimiseYul(_optSettings.runYulOptimiser)
-	{}
-	solidity::bytes assemble();
-	std::shared_ptr<yul::Object> object();
-private:
-	solidity::yul::YulStack m_stack;
-	std::string m_yulProgram;
-	bool m_optimiseYul;
-};
-
-struct YulEvmoneUtility
-{
-	/// @returns the result of deploying bytecode @param _input on @param _host.
-	static evmc::Result deployCode(solidity::bytes const& _input, EVMHost& _host);
-	/// @returns call message to be sent to @param _address.
-	static evmc_message callMessage(evmc_address _address);
-	/// @returns true if call result indicates a serious error, false otherwise.
-	static bool seriousCallError(evmc_status_code _code);
-};
-}
diff --git a/test/tools/ossfuzz/abiV2Proto.proto b/test/tools/ossfuzz/abiV2Proto.proto
deleted file mode 100644
index ec6fe1d55e40..000000000000
--- a/test/tools/ossfuzz/abiV2Proto.proto
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-syntax = "proto2";
-
-// bool
-message BoolType {}
-
-// uint8...256, int8...256
-message IntegerType {
-    required bool is_signed = 1;
-    required uint32 width = 2;
-}
-
-// bytes1, bytes2,..., bytes32
-message FixedByteType {
-    required uint32 width = 1;
-}
-
-// address
-message AddressType {}
-
-message ValueType {
-    oneof value_type_oneof {
-        IntegerType inty = 1;
-        FixedByteType byty = 2;
-        AddressType adty = 3;
-        BoolType boolty = 4;
-    }
-}
-
-// bytes
-message DynamicByteArrayType {}
-
-message ArrayType {
-    required Type t = 1;
-    required uint32 length = 2;
-    required bool is_static = 3;
-}
-
-message StructType {
-    repeated Type t = 1;
-}
-
-message NonValueType {
-    oneof nonvalue_type_oneof {
-        DynamicByteArrayType dynbytearray = 1;
-        ArrayType arrtype = 2;
-        StructType stype = 3;
-    }
-}
-
-// TODO: Add more types
-// See https://github.com/ethereum/solidity/issues/6749
-message Type {
-    oneof type_oneof {
-        ValueType vtype = 1;
-        NonValueType nvtype = 2;
-    }
-}
-
-message VarDecl {
-    required Type type = 1;
-}
-
-message TestFunction {
-    required VarDecl local_vars = 1;
-    // Length of invalid encoding
-    required uint64 invalid_encoding_length = 2;
-}
-
-message Contract {
-    enum Test {
-        CALLDATA_CODER = 1;
-        RETURNDATA_CODER = 2;
-    }
-    required VarDecl state_vars = 1;
-    required TestFunction testfunction = 2;
-    required Test test = 3;
-    required uint32 seed = 4;
-}
-
-package solidity.test.abiv2fuzzer;
diff --git a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
deleted file mode 100644
index 6d792a70c56f..000000000000
--- a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/SolidityEvmoneInterface.h>
-#include <test/tools/ossfuzz/protoToAbiV2.h>
-
-#include <src/libfuzzer/libfuzzer_macro.h>
-
-#include <fstream>
-
-using namespace solidity::frontend;
-using namespace solidity::test::fuzzer;
-using namespace solidity::test::abiv2fuzzer;
-using namespace solidity::test;
-using namespace solidity::util;
-using namespace solidity;
-using namespace std;
-
-static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
-
-DEFINE_PROTO_FUZZER(Contract const& _input)
-{
-	string contract_source = ProtoConverter{_input.seed()}.contractToString(_input);
-
-	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
-	{
-		// With libFuzzer binary run this to generate the solidity source file x.sol from a proto input:
-		// PROTO_FUZZER_DUMP_PATH=x.sol ./a.out proto-input
-		ofstream of(dump_path);
-		of << contract_source;
-	}
-
-	// We target the default EVM which is the latest
-	langutil::EVMVersion version;
-	EVMHost hostContext(version, evmone);
-	string contractName = "C";
-	string methodName = "test()";
-	StringMap source({{"test.sol", contract_source}});
-	CompilerInput cInput(version, source, contractName, OptimiserSettings::minimal(), {});
-	EvmoneUtility evmoneUtil(
-		hostContext,
-		cInput,
-		contractName,
-		{},
-		methodName
-	);
-	// Invoke test function
-	auto result = evmoneUtil.compileDeployAndExecute();
-	// We don't care about EVM One failures other than EVMC_REVERT
-	solAssert(result.status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted");
-	if (result.status_code == EVMC_SUCCESS)
-		if (!EvmoneUtility::zeroWord(result.output_data, result.output_size))
-		{
-			solidity::bytes res;
-			for (size_t i = 0; i < result.output_size; i++)
-				res.push_back(result.output_data[i]);
-			cout << solidity::util::toHex(res) << endl;
-			solAssert(
-				false,
-				"Proto ABIv2 fuzzer: ABIv2 coding failure found"
-			);
-		}
-}
diff --git a/test/tools/ossfuzz/config/solc_noopt_ossfuzz.options b/test/tools/ossfuzz/config/solc_noopt_ossfuzz.options
deleted file mode 100644
index d596157f5b19..000000000000
--- a/test/tools/ossfuzz/config/solc_noopt_ossfuzz.options
+++ /dev/null
@@ -1,2 +0,0 @@
-[libfuzzer]
-dict = solidity.dict
diff --git a/test/tools/ossfuzz/config/solc_opt_ossfuzz.options b/test/tools/ossfuzz/config/solc_opt_ossfuzz.options
deleted file mode 100644
index d596157f5b19..000000000000
--- a/test/tools/ossfuzz/config/solc_opt_ossfuzz.options
+++ /dev/null
@@ -1,2 +0,0 @@
-[libfuzzer]
-dict = solidity.dict
diff --git a/test/tools/ossfuzz/config/solidity.dict b/test/tools/ossfuzz/config/solidity.dict
deleted file mode 100644
index 9de58c56b7ae..000000000000
--- a/test/tools/ossfuzz/config/solidity.dict
+++ /dev/null
@@ -1,230 +0,0 @@
-" address(this).balance "
-" block.coinbase "
-" block.difficulty "
-" block.gaslimit "
-" block.number "
-" block.timestamp "
-" days "
-" ether "
-" gasleft() "
-" gwei "
-" hours "
-" is "
-" minutes "
-" msg.data "
-" msg.gas "
-" msg.sender "
-" msg.sig "
-" msg.value "
-" now "
-" seconds "
-" tx.gasprice "
-" tx.origin "
-" weeks "
-" wei "
-" years "
-"!="
-"%"
-"&"
-"("
-")"
-"*"
-"**"
-"+"
-"++"
-"-"
-"--"
-".balance"
-".call("
-".callcode("
-".creationCode"
-".delegatecall("
-".gas("
-".kill("
-".length"
-".pop();"
-".push("
-".runtimeCode"
-".send("
-".shutdown("
-".staticcall("
-".transfer("
-".value"
-"/"
-"// compileViaYul: false"
-"// compileViaYul: true"
-"// optimize: false"
-"// optimize: true"
-"//"
-"0**0"
-"1.1"
-"2e10"
-":="
-";"
-"<"
-"<<"
-"<="
-"=="
-"===="
-"====Source:"
-">"
-">="
-">>"
-"[a, b, c]"
-"\\udead"
-"\\xff"
-"^"
-"a[1:2]"
-"abi.encode("
-"abi.encodePacked("
-"abi.encodeWithSelector("
-"abi.encodeWithSignature("
-"add("
-"addmod("
-"address(this).call("
-"address(this).callcode("
-"address(this).delegatecall("
-"address(this).send("
-"address(this).transfer("
-"anonymous"
-"assembly { "
-"assert("
-"block.blockhash("
-"bool "
-"break;"
-"byte "
-"bytes("
-"bytes1 "
-"bytes10 "
-"bytes11 "
-"bytes12 "
-"bytes13 "
-"bytes14 "
-"bytes15 "
-"bytes16 "
-"bytes17 "
-"bytes18 "
-"bytes19 "
-"bytes2 "
-"bytes20 "
-"bytes21 "
-"bytes22 "
-"bytes23 "
-"bytes24 "
-"bytes25 "
-"bytes26 "
-"bytes27 "
-"bytes28 "
-"bytes29 "
-"bytes3 "
-"bytes30 "
-"bytes32 "
-"bytes4 "
-"bytes5 "
-"bytes6 "
-"bytes7 "
-"bytes8 "
-"bytes9 "
-"catch (bytes memory ) {}"
-"catch Error() {}"
-"constant "
-"constructor() "
-"continue;"
-"contract "
-"delete "
-"do "
-"ecrecover("
-"else "
-"emit a("
-"enum B { "
-"event e("
-"external "
-"fallback() "
-"false "
-"fixed "
-"fixed128x128 "
-"for (a=0;a<2;a++) "
-"function bid() public payable { "
-"hex\"001122FF\""
-"if "
-"int "
-"int x = -2**255;"
-"int256 "
-"int8 "
-"interface i { "
-"internal "
-"is "
-"keccak256("
-"keccak256.gas("
-"keccak256.value("
-"leave"
-"let x := "
-"library l { "
-"log0("
-"log1("
-"log2("
-"log3("
-"log4("
-"mapping("
-"memory m = "
-"modifier onlySeller() { "
-"mulmod("
-"new "
-"override"
-"payable "
-"pragma experimental ABIEncoderV2;"
-"pragma experimental SMTChecker;"
-"pragma solidity >=0.4.0;"
-"pragma solidity ^90.90.0"
-"public "
-"pure "
-"receive() "
-"require("
-"require(msg.sender == 0,\"\""
-"return "
-"returns ("
-"revert("
-"ripemd160("
-"ripemd160.gas("
-"ripemd160.value("
-"self"
-"selfdestruct("
-"sha256("
-"sha256.gas("
-"sha256.value("
-"sha3("
-"storage sto = "
-"string memory str = "
-"string storage str = "
-"struct V { "
-"suicide("
-"super "
-"switch "
-"this"
-"throw "
-"true "
-"try "
-"type("
-"ufixed "
-"ufixed128x128 "
-"uint "
-"uint256 "
-"uint8 "
-"uint[] "
-"uint[][5] "
-"using "
-"var "
-"view "
-"virtual"
-"while "
-"x % y"
-"x * 2**y"
-"x / 2**y"
-"x << y"
-"{ uint x; }"
-"{"
-"{salt: "salt", value: 10}"
-"{value: 1, gas: 2}"
-"|"
-"}"
-"~"
diff --git a/test/tools/ossfuzz/config/strict_assembly.dict b/test/tools/ossfuzz/config/strict_assembly.dict
deleted file mode 100644
index 7f4fe4b5b5e3..000000000000
--- a/test/tools/ossfuzz/config/strict_assembly.dict
+++ /dev/null
@@ -1,92 +0,0 @@
-" -> "
-" := "
-" address() "
-" calldatasize() "
-" caller() "
-" callvalue() "
-" codesize() "
-" coinbase() "
-" difficulty() "
-" gas() "
-" gaslimit() "
-" gasprice() "
-" invalid() "
-" number() "
-" origin() "
-" pc() "
-" returndatasize() "
-" stop() "
-" timestamp() "
-"("
-")"
-", "
-"0x42"
-"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-":"
-"add("
-"addmod("
-"and("
-"balance("
-"blockhash("
-"byte("
-"call("
-"callcode("
-"calldatacopy("
-"calldataload("
-"case "
-"codecopy("
-"create("
-"create2("
-"default "
-"delegatecall("
-"div("
-"eq("
-"exp("
-"extcodecopy("
-"extcodehash("
-"extcodesize("
-"for "
-"function "
-"gt("
-"hello"
-"if "
-"iszero("
-"keccak256("
-"let "
-"log0("
-"log1("
-"log2("
-"log3("
-"log4("
-"lt("
-"mload("
-"mod("
-"msize"
-"mstore("
-"mstore8("
-"mul("
-"mulmod("
-"not("
-"or("
-"pop("
-"return("
-"returndatacopy("
-"revert("
-"sar("
-"sdiv("
-"selfdestruct("
-"sgt("
-"shl("
-"shr("
-"signextend("
-"sload("
-"slt("
-"smod("
-"sstore("
-"staticcall("
-"sub("
-"switch "
-"xor("
-"{"
-"}"
-"leave"
diff --git a/test/tools/ossfuzz/config/strictasm_assembly_ossfuzz.options b/test/tools/ossfuzz/config/strictasm_assembly_ossfuzz.options
deleted file mode 100644
index c6170959fecb..000000000000
--- a/test/tools/ossfuzz/config/strictasm_assembly_ossfuzz.options
+++ /dev/null
@@ -1,2 +0,0 @@
-[libfuzzer]
-dict = strict_assembly.dict
diff --git a/test/tools/ossfuzz/config/strictasm_opt_ossfuzz.options b/test/tools/ossfuzz/config/strictasm_opt_ossfuzz.options
deleted file mode 100644
index c6170959fecb..000000000000
--- a/test/tools/ossfuzz/config/strictasm_opt_ossfuzz.options
+++ /dev/null
@@ -1,2 +0,0 @@
-[libfuzzer]
-dict = strict_assembly.dict
diff --git a/test/tools/ossfuzz/const_opt_ossfuzz.cpp b/test/tools/ossfuzz/const_opt_ossfuzz.cpp
deleted file mode 100644
index 0b799c956e6e..000000000000
--- a/test/tools/ossfuzz/const_opt_ossfuzz.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/fuzzer_common.h>
-
-using namespace std;
-
-// Prototype as we can't use the FuzzerInterface.h header.
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
-
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
-{
-	if (_size <= 250)
-	{
-		string input(reinterpret_cast<char const*>(_data), _size);
-		FuzzerUtil::testConstantOptimizer(input, /*quiet=*/true);
-	}
-	return 0;
-}
diff --git a/test/tools/ossfuzz/protoToAbiV2.cpp b/test/tools/ossfuzz/protoToAbiV2.cpp
deleted file mode 100644
index 98de7dd359ba..000000000000
--- a/test/tools/ossfuzz/protoToAbiV2.cpp
+++ /dev/null
@@ -1,1408 +0,0 @@
-#include <test/tools/ossfuzz/protoToAbiV2.h>
-
-#include <boost/preprocessor.hpp>
-#include <regex>
-
-/// Convenience macros
-/// Returns a valid Solidity integer width w such that 8 <= w <= 256.
-#define INTWIDTH(z, n, _ununsed) BOOST_PP_MUL(BOOST_PP_ADD(n, 1), 8)
-/// Using declaration that aliases long boost multiprecision types with
-/// s(u)<width> where <width> is a valid Solidity integer width and "s"
-/// stands for "signed" and "u" for "unsigned".
-#define USINGDECL(z, n, sign) \
-	using BOOST_PP_CAT(BOOST_PP_IF(sign, s, u), INTWIDTH(z, n,)) =             \
-	boost::multiprecision::number<                                             \
-		boost::multiprecision::cpp_int_backend<                                \
-			INTWIDTH(z, n,),                                                   \
-			INTWIDTH(z, n,),                                                   \
-			BOOST_PP_IF(                                                       \
-				sign,                                                          \
-				boost::multiprecision::signed_magnitude,                       \
-				boost::multiprecision::unsigned_magnitude                      \
-			),                                                                 \
-			boost::multiprecision::unchecked,                                  \
-			void                                                               \
-		>                                                                      \
-	>;
-/// Instantiate the using declarations for signed and unsigned integer types.
-BOOST_PP_REPEAT(32, USINGDECL, 1)
-BOOST_PP_REPEAT(32, USINGDECL, 0)
-/// Case implementation that returns an integer value of the specified type.
-/// For signed integers, we divide by two because the range for boost multiprecision
-/// types is double that of Solidity integer types. Example, 8-bit signed boost
-/// number range is [-255, 255] but Solidity `int8` range is [-128, 127]
-#define CASEIMPL(z, n, sign)                                                   \
-	case INTWIDTH(z, n,):                                                      \
-		stream << BOOST_PP_IF(                                                 \
-			sign,                                                              \
-			integerValue<                                                      \
-				BOOST_PP_CAT(                                                  \
-					BOOST_PP_IF(sign, s, u),                                   \
-					INTWIDTH(z, n,)                                            \
-                )>(_counter) / 2,                                              \
-			integerValue<                                                      \
-				BOOST_PP_CAT(                                                  \
-					BOOST_PP_IF(sign, s, u),                                   \
-					INTWIDTH(z, n,)                                            \
-                )>(_counter)                                                   \
-        );                                                                     \
-		break;
-/// Switch implementation that instantiates case statements for (un)signed
-/// Solidity integer types.
-#define SWITCHIMPL(sign)                                                       \
-	ostringstream stream;                                                      \
-	switch (_intWidth)                                                         \
-	{                                                                          \
-	BOOST_PP_REPEAT(32, CASEIMPL, sign)	                                       \
-	}	                                                                       \
-	return stream.str();
-
-using namespace std;
-using namespace solidity::util;
-using namespace solidity::test::abiv2fuzzer;
-
-namespace
-{
-template <typename V>
-static V integerValue(unsigned _counter)
-{
-	V value = V(
-		u256(solidity::util::keccak256(solidity::util::h256(_counter))) % u256(boost::math::tools::max_value<V>())
-	);
-	if (boost::multiprecision::is_signed_number<V>::value && value % 2 == 0)
-		return value * (-1);
-	else
-		return value;
-}
-
-static string signedIntegerValue(unsigned _counter, unsigned _intWidth)
-{
-	SWITCHIMPL(1)
-}
-
-static string unsignedIntegerValue(unsigned _counter, unsigned _intWidth)
-{
-	SWITCHIMPL(0)
-}
-
-static string integerValue(unsigned _counter, unsigned _intWidth, bool _signed)
-{
-	if (_signed)
-		return signedIntegerValue(_counter, _intWidth);
-	else
-		return unsignedIntegerValue(_counter, _intWidth);
-}
-}
-
-string ProtoConverter::getVarDecl(
-	string const& _type,
-	string const& _varName,
-	string const& _qualifier
-)
-{
-	// One level of indentation for state variable declarations
-	// Two levels of indentation for local variable declarations
-	return Whiskers(R"(
-	<?isLocalVar>	</isLocalVar><type><?qual> <qualifier></qual> <varName>;)"
-		)
-		("isLocalVar", !m_isStateVar)
-		("type", _type)
-		("qual", !_qualifier.empty())
-		("qualifier", _qualifier)
-		("varName", _varName)
-		.render() +
-		"\n";
-}
-
-pair<string, string> ProtoConverter::visit(Type const& _type)
-{
-	switch (_type.type_oneof_case())
-	{
-	case Type::kVtype:
-		return visit(_type.vtype());
-	case Type::kNvtype:
-		return visit(_type.nvtype());
-	case Type::TYPE_ONEOF_NOT_SET:
-		return make_pair("", "");
-	}
-}
-
-pair<string, string> ProtoConverter::visit(ValueType const& _type)
-{
-	switch (_type.value_type_oneof_case())
-	{
-	case ValueType::kBoolty:
-		return visit(_type.boolty());
-	case ValueType::kInty:
-		return visit(_type.inty());
-	case ValueType::kByty:
-		return visit(_type.byty());
-	case ValueType::kAdty:
-		return visit(_type.adty());
-	case ValueType::VALUE_TYPE_ONEOF_NOT_SET:
-		return make_pair("", "");
-	}
-}
-
-pair<string, string> ProtoConverter::visit(NonValueType const& _type)
-{
-	switch (_type.nonvalue_type_oneof_case())
-	{
-	case NonValueType::kDynbytearray:
-		return visit(_type.dynbytearray());
-	case NonValueType::kArrtype:
-		if (ValidityVisitor().visit(_type.arrtype()))
-			return visit(_type.arrtype());
-		else
-			return make_pair("", "");
-	case NonValueType::kStype:
-		if (ValidityVisitor().visit(_type.stype()))
-			return visit(_type.stype());
-		else
-			return make_pair("", "");
-	case NonValueType::NONVALUE_TYPE_ONEOF_NOT_SET:
-		return make_pair("", "");
-	}
-}
-
-pair<string, string> ProtoConverter::visit(BoolType const& _type)
-{
-	return processType(_type, true);
-}
-
-pair<string, string> ProtoConverter::visit(IntegerType const& _type)
-{
-	return processType(_type, true);
-}
-
-pair<string, string> ProtoConverter::visit(FixedByteType const& _type)
-{
-	return processType(_type, true);
-}
-
-pair<string, string> ProtoConverter::visit(AddressType const& _type)
-{
-	return processType(_type, true);
-}
-
-pair<string, string> ProtoConverter::visit(DynamicByteArrayType const& _type)
-{
-	return processType(_type, false);
-}
-
-pair<string, string> ProtoConverter::visit(ArrayType const& _type)
-{
-	return processType(_type, false);
-}
-
-pair<string, string> ProtoConverter::visit(StructType const& _type)
-{
-	return processType(_type, false);
-}
-
-template <typename T>
-pair<string, string> ProtoConverter::processType(T const& _type, bool _isValueType)
-{
-	ostringstream local, global;
-	auto [varName, paramName] = newVarNames(getNextVarCounter(), m_isStateVar);
-
-	// Add variable name to the argument list of coder function call
-	if (m_argsCoder.str().empty())
-		m_argsCoder << varName;
-	else
-		m_argsCoder << ", " << varName;
-
-	string location{};
-	if (!m_isStateVar && !_isValueType)
-		location = "memory";
-
-	auto varDeclBuffers = varDecl(
-		varName,
-		paramName,
-		_type,
-		_isValueType,
-		location
-	);
-	global << varDeclBuffers.first;
-	local << varDeclBuffers.second;
-	auto assignCheckBuffers = assignChecker(varName, paramName, _type);
-	global << assignCheckBuffers.first;
-	local << assignCheckBuffers.second;
-
-	m_structCounter += m_numStructsAdded;
-	return make_pair(global.str(), local.str());
-}
-
-template <typename T>
-pair<string, string> ProtoConverter::varDecl(
-	string const& _varName,
-	string const& _paramName,
-	T _type,
-	bool _isValueType,
-	string const& _location
-)
-{
-	ostringstream local, global;
-
-	TypeVisitor tVisitor(m_structCounter);
-	string typeStr = tVisitor.visit(_type);
-	if (typeStr.empty())
-		return make_pair("", "");
-
-	// Append struct defs
-	global << tVisitor.structDef();
-	m_numStructsAdded = tVisitor.numStructs();
-
-	// variable declaration
-	if (m_isStateVar)
-		global << getVarDecl(typeStr, _varName, _location);
-	else
-		local << getVarDecl(typeStr, _varName, _location);
-
-	// Add typed params for calling public and external functions with said type
-	appendTypedParams(
-		CalleeType::PUBLIC,
-		_isValueType,
-		typeStr,
-		_paramName,
-		((m_varCounter == 1) ? Delimiter::SKIP : Delimiter::ADD)
-	);
-	appendTypedParams(
-		CalleeType::EXTERNAL,
-		_isValueType,
-		typeStr,
-		_paramName,
-		((m_varCounter == 1) ? Delimiter::SKIP : Delimiter::ADD)
-	);
-	appendTypes(
-		_isValueType,
-		typeStr,
-		((m_varCounter == 1) ? Delimiter::SKIP : Delimiter::ADD)
-	);
-	appendTypedReturn(
-		_isValueType,
-		typeStr,
-		((m_varCounter == 1) ? Delimiter::SKIP : Delimiter::ADD)
-	);
-	appendToIsabelleTypeString(
-		tVisitor.isabelleTypeString(),
-		((m_varCounter == 1) ? Delimiter::SKIP : Delimiter::ADD)
-	);
-	// Update dyn param only if necessary
-	if (tVisitor.isLastDynParamRightPadded())
-		m_isLastDynParamRightPadded = true;
-
-	return make_pair(global.str(), local.str());
-}
-
-template <typename T>
-pair<string, string> ProtoConverter::assignChecker(
-	string const& _varName,
-	string const& _paramName,
-	T _type
-)
-{
-	ostringstream local;
-	AssignCheckVisitor acVisitor(
-		_varName,
-		_paramName,
-		m_returnValue,
-		m_isStateVar,
-		m_counter,
-		m_structCounter
-	);
-	pair<string, string> assignCheckStrPair = acVisitor.visit(_type);
-	m_returnValue += acVisitor.errorStmts();
-	m_counter += acVisitor.counted();
-
-	m_checks << assignCheckStrPair.second;
-	appendToIsabelleValueString(
-		acVisitor.isabelleValueString(),
-		((m_varCounter == 1) ? Delimiter::SKIP : Delimiter::ADD)
-	);
-
-	// State variables cannot be assigned in contract-scope
-	// Therefore, we buffer their assignments and
-	// render them in function scope later.
-	local << assignCheckStrPair.first;
-	return make_pair("", local.str());
-}
-
-pair<string, string> ProtoConverter::visit(VarDecl const& _x)
-{
-	return visit(_x.type());
-}
-
-std::string ProtoConverter::equalityChecksAsString()
-{
-	return m_checks.str();
-}
-
-std::string ProtoConverter::delimiterToString(Delimiter _delimiter, bool _space)
-{
-	switch (_delimiter)
-	{
-	case Delimiter::ADD:
-		return _space ? ", " : ",";
-	case Delimiter::SKIP:
-		return "";
-	}
-}
-
-/* When a new variable is declared, we can invoke this function
- * to prepare the typed param list to be passed to callee functions.
- * We independently prepare this list for "public" and "external"
- * callee functions.
- */
-void ProtoConverter::appendTypedParams(
-	CalleeType _calleeType,
-	bool _isValueType,
-	std::string const& _typeString,
-	std::string const& _varName,
-	Delimiter _delimiter
-)
-{
-	switch (_calleeType)
-	{
-	case CalleeType::PUBLIC:
-		appendTypedParamsPublic(_isValueType, _typeString, _varName, _delimiter);
-		break;
-	case CalleeType::EXTERNAL:
-		appendTypedParamsExternal(_isValueType, _typeString, _varName, _delimiter);
-		break;
-	}
-}
-
-void ProtoConverter::appendTypes(
-	bool _isValueType,
-	string const& _typeString,
-	Delimiter _delimiter
-)
-{
-	string qualifiedTypeString = (
-		_isValueType ?
-		_typeString :
-		_typeString + " memory"
-	);
-	m_types << Whiskers(R"(<delimiter><type>)")
-		("delimiter", delimiterToString(_delimiter))
-		("type", qualifiedTypeString)
-		.render();
-}
-
-void ProtoConverter::appendTypedReturn(
-	bool _isValueType,
-	string const& _typeString,
-	Delimiter _delimiter
-)
-{
-	string qualifiedTypeString = (
-		_isValueType ?
-		_typeString :
-		_typeString + " memory"
-	);
-	m_typedReturn << Whiskers(R"(<delimiter><type> <varName>)")
-		("delimiter", delimiterToString(_delimiter))
-		("type", qualifiedTypeString)
-		("varName", "lv_" + to_string(m_varCounter - 1))
-		.render();
-}
-
-// Adds the qualifier "calldata" to non-value parameter of an external function.
-void ProtoConverter::appendTypedParamsExternal(
-	bool _isValueType,
-    std::string const& _typeString,
-    std::string const& _varName,
-    Delimiter _delimiter
-)
-{
-	m_externalParamsRep.push_back({_delimiter, _isValueType, _typeString, _varName});
-	m_untypedParamsExternal << Whiskers(R"(<delimiter><varName>)")
-		("delimiter", delimiterToString(_delimiter))
-		("varName", _varName)
-		.render();
-}
-
-// Adds the qualifier "memory" to non-value parameter of an external function.
-void ProtoConverter::appendTypedParamsPublic(
-	bool _isValueType,
-	std::string const& _typeString,
-	std::string const& _varName,
-	Delimiter _delimiter
-)
-{
-	std::string qualifiedTypeString = (
-		_isValueType ?
-		_typeString :
-		_typeString + " memory"
-		);
-	m_typedParamsPublic << Whiskers(R"(<delimiter><type> <varName>)")
-		("delimiter", delimiterToString(_delimiter))
-		("type", qualifiedTypeString)
-		("varName", _varName)
-		.render();
-}
-
-void ProtoConverter::appendToIsabelleTypeString(
-	std::string const& _typeString,
-	Delimiter _delimiter
-)
-{
-	m_isabelleTypeString << delimiterToString(_delimiter, false) << _typeString;
-}
-
-void ProtoConverter::appendToIsabelleValueString(
-	std::string const& _valueString,
-	Delimiter _delimiter
-)
-{
-	m_isabelleValueString << delimiterToString(_delimiter, false) << _valueString;
-}
-
-std::string ProtoConverter::typedParametersAsString(CalleeType _calleeType)
-{
-	switch (_calleeType)
-	{
-	case CalleeType::PUBLIC:
-		return m_typedParamsPublic.str();
-	case CalleeType::EXTERNAL:
-	{
-		ostringstream typedParamsExternal;
-		for (auto const& i: m_externalParamsRep)
-		{
-			Delimiter del = get<0>(i);
-			bool valueType = get<1>(i);
-			string typeString = get<2>(i);
-			string varName = get<3>(i);
-			bool isCalldata = randomBool(/*probability=*/0.5);
-			string location = (isCalldata ? "calldata" : "memory");
-			string qualifiedTypeString = (valueType ? typeString : typeString + " " + location);
-			typedParamsExternal << Whiskers(R"(<delimiter><type> <varName>)")
-				("delimiter", delimiterToString(del))
-				("type", qualifiedTypeString)
-				("varName", varName)
-				.render();
-		}
-		return typedParamsExternal.str();
-	}
-	}
-}
-
-string ProtoConverter::visit(TestFunction const& _x, string const& _storageVarDefs)
-{
-	// TODO: Support more than one but less than N local variables
-	auto localVarBuffers = visit(_x.local_vars());
-
-	string structTypeDecl = localVarBuffers.first;
-	string localVarDefs = localVarBuffers.second;
-
-	ostringstream testBuffer;
-
-	string testFunction = Whiskers(R"(
-	function test() public returns (uint) {
-		<?calldata>return test_calldata_coding();</calldata>
-		<?returndata>return test_returndata_coding();</returndata>
-	})")
-	("calldata", m_test == Contract_Test::Contract_Test_CALLDATA_CODER)
-	("returndata", m_test == Contract_Test::Contract_Test_RETURNDATA_CODER)
-	.render();
-
-	string functionDeclCalldata = "function test_calldata_coding() internal returns (uint)";
-	string functionDeclReturndata = "function test_returndata_coding() internal returns (uint)";
-
-	testBuffer << Whiskers(R"(<structTypeDecl>
-<testFunction>
-<?calldata>
-	<functionDeclCalldata> {
-<storageVarDefs>
-<localVarDefs>
-<calldataTestCode>
-	}
-<calldataHelperFuncs>
-</calldata>
-<?returndata>
-	<functionDeclReturndata> {
-<returndataTestCode>
-	}
-
-<?varsPresent>
-	function coder_returndata_external() external returns (<return_types>) {
-<storageVarDefs>
-<localVarDefs>
-		return (<return_values>);
-	}
-</varsPresent>
-</returndata>)")
-		("testFunction", testFunction)
-		("calldata", m_test == Contract_Test::Contract_Test_CALLDATA_CODER)
-		("returndata", m_test == Contract_Test::Contract_Test_RETURNDATA_CODER)
-		("calldataHelperFuncs", calldataHelperFunctions())
-		("varsPresent", !m_types.str().empty())
-		("structTypeDecl", structTypeDecl)
-		("functionDeclCalldata", functionDeclCalldata)
-		("functionDeclReturndata", functionDeclReturndata)
-		("storageVarDefs", _storageVarDefs)
-		("localVarDefs", localVarDefs)
-		("calldataTestCode", testCallDataFunction(static_cast<unsigned>(_x.invalid_encoding_length())))
-		("returndataTestCode", testReturnDataFunction())
-		("return_types", m_types.str())
-		("return_values", m_argsCoder.str())
-		.render();
-	return testBuffer.str();
-}
-
-string ProtoConverter::testCallDataFunction(unsigned _invalidLength)
-{
-	return Whiskers(R"(
-		uint returnVal = this.coder_calldata_public(<argumentNames>);
-		if (returnVal != 0)
-			return returnVal;
-
-		returnVal = this.coder_calldata_external(<argumentNames>);
-		if (returnVal != 0)
-			return uint(200000) + returnVal;
-
-		<?atLeastOneVar>
-		bytes memory argumentEncoding = abi.encode(<argumentNames>);
-
-		returnVal = checkEncodedCall(
-			this.coder_calldata_public.selector,
-			argumentEncoding,
-			<invalidLengthFuzz>,
-			<isRightPadded>
-		);
-		if (returnVal != 0)
-			return returnVal;
-
-		returnVal = checkEncodedCall(
-			this.coder_calldata_external.selector,
-			argumentEncoding,
-			<invalidLengthFuzz>,
-			<isRightPadded>
-		);
-		if (returnVal != 0)
-			return uint(200000) + returnVal;
-		</atLeastOneVar>
-		return 0;
-		)")
-		("argumentNames", m_argsCoder.str())
-		("invalidLengthFuzz", std::to_string(_invalidLength))
-		("isRightPadded", isLastDynParamRightPadded() ? "true" : "false")
-		("atLeastOneVar", m_varCounter > 0)
-		.render();
-}
-
-string ProtoConverter::testReturnDataFunction()
-{
-	return Whiskers(R"(
-<?varsPresent>
-		(<varDecl>) = this.coder_returndata_external();
-<equality_checks>
-</varsPresent>
-		return 0;
-		)")
-		("varsPresent", !m_typedReturn.str().empty())
-		("varDecl", m_typedReturn.str())
-		("equality_checks", m_checks.str())
-		.render();
-}
-
-string ProtoConverter::calldataHelperFunctions()
-{
-	stringstream calldataHelperFuncs;
-	calldataHelperFuncs << R"(
-	/// Accepts function selector, correct argument encoding, and length of
-	/// invalid encoding and returns the correct and incorrect abi encoding
-	/// for calling the function specified by the function selector.
-	function createEncoding(
-		bytes4 funcSelector,
-		bytes memory argumentEncoding,
-		uint invalidLengthFuzz,
-		bool isRightPadded
-	) internal pure returns (bytes memory, bytes memory)
-	{
-		bytes memory validEncoding = new bytes(4 + argumentEncoding.length);
-		// Ensure that invalidEncoding crops at least 32 bytes (padding length
-		// is at most 31 bytes) if `isRightPadded` is true.
-		// This is because shorter bytes/string values (whose encoding is right
-		// padded) can lead to successful decoding when fewer than 32 bytes have
-		// been cropped in the worst case. In other words, if `isRightPadded` is
-		// true, then
-		//  0 <= invalidLength <= argumentEncoding.length - 32
-		// otherwise
-		//  0 <= invalidLength <= argumentEncoding.length - 1
-		uint invalidLength;
-		if (isRightPadded)
-			invalidLength = invalidLengthFuzz % (argumentEncoding.length - 31);
-		else
-			invalidLength = invalidLengthFuzz % argumentEncoding.length;
-		bytes memory invalidEncoding = new bytes(4 + invalidLength);
-		for (uint i = 0; i < 4; i++)
-			validEncoding[i] = invalidEncoding[i] = funcSelector[i];
-		for (uint i = 0; i < argumentEncoding.length; i++)
-			validEncoding[i+4] = argumentEncoding[i];
-		for (uint i = 0; i < invalidLength; i++)
-			invalidEncoding[i+4] = argumentEncoding[i];
-		return (validEncoding, invalidEncoding);
-	}
-
-	/// Accepts function selector, correct argument encoding, and an invalid
-	/// encoding length as input. Returns a non-zero value if either call with
-	/// correct encoding fails or call with incorrect encoding succeeds.
-	/// Returns zero if both calls meet expectation.
-	function checkEncodedCall(
-		bytes4 funcSelector,
-		bytes memory argumentEncoding,
-		uint invalidLengthFuzz,
-		bool isRightPadded
-	) public returns (uint)
-	{
-		(bytes memory validEncoding, bytes memory invalidEncoding) = createEncoding(
-			funcSelector,
-			argumentEncoding,
-			invalidLengthFuzz,
-			isRightPadded
-		);
-		(bool success, bytes memory returnVal) = address(this).call(validEncoding);
-		uint returnCode = abi.decode(returnVal, (uint));
-		// Return non-zero value if call fails for correct encoding
-		if (success == false || returnCode != 0)
-			return 400000;
-		(success, ) = address(this).call(invalidEncoding);
-		// Return non-zero value if call succeeds for incorrect encoding
-		if (success == true)
-			return 400001;
-		return 0;
-	})";
-
-	/// These are indirections to test memory-calldata codings more robustly.
-	stringstream indirections;
-	unsigned numIndirections = randomNumberOneToN(s_maxIndirections);
-	for (unsigned i = 1; i <= numIndirections; i++)
-	{
-		bool finalIndirection = i == numIndirections;
-		string mutability = (finalIndirection ? "pure" : "view");
-		indirections << Whiskers(R"(
-	function coder_calldata_external_i<N>(<parameters>) external <mutability> returns (uint) {
-<?finalIndirection>
-<equality_checks>
-		return 0;
-<!finalIndirection>
-		return this.coder_calldata_external_i<NPlusOne>(<untyped_parameters>);
-</finalIndirection>
-	}
-		)")
-		("N", to_string(i))
-		("parameters", typedParametersAsString(CalleeType::EXTERNAL))
-		("mutability", mutability)
-		("finalIndirection", finalIndirection)
-		("equality_checks", equalityChecksAsString())
-		("NPlusOne", to_string(i + 1))
-		("untyped_parameters", m_untypedParamsExternal.str())
-		.render();
-	}
-
-	// These are callee functions that encode from storage, decode to
-	// memory/calldata and check if decoded value matches storage value
-	// return true on successful match, false otherwise
-	calldataHelperFuncs << Whiskers(R"(
-	function coder_calldata_public(<parameters_memory>) public pure returns (uint) {
-<equality_checks>
-		return 0;
-	}
-
-	function coder_calldata_external(<parameters_calldata>) external view returns (uint) {
-		return this.coder_calldata_external_i1(<untyped_parameters>);
-	}
-<indirections>
-	)")
-	("parameters_memory", typedParametersAsString(CalleeType::PUBLIC))
-	("equality_checks", equalityChecksAsString())
-	("parameters_calldata", typedParametersAsString(CalleeType::EXTERNAL))
-	("untyped_parameters", m_untypedParamsExternal.str())
-	("indirections", indirections.str())
-	.render();
-
-	return calldataHelperFuncs.str();
-}
-
-string ProtoConverter::commonHelperFunctions()
-{
-	stringstream helperFuncs;
-	helperFuncs << R"(
-	/// Compares bytes, returning true if they are equal and false otherwise.
-	function bytesCompare(bytes memory a, bytes memory b) internal pure returns (bool) {
-		if(a.length != b.length)
-			return false;
-		for (uint i = 0; i < a.length; i++)
-			if (a[i] != b[i])
-				return false;
-		return true;
-	}
-	)";
-
-	return helperFuncs.str();
-}
-
-void ProtoConverter::visit(Contract const& _x)
-{
-	string pragmas = R"(pragma solidity >=0.0;
-pragma experimental ABIEncoderV2;)";
-
-	// Record test spec
-	m_test = _x.test();
-
-	// TODO: Support more than one but less than N state variables
-	auto storageBuffers = visit(_x.state_vars());
-	string storageVarDecls = storageBuffers.first;
-	string storageVarDefs = storageBuffers.second;
-	m_isStateVar = false;
-	string testFunction = visit(_x.testfunction(), storageVarDefs);
-	/* Structure of contract body
-	 * - Storage variable declarations
-	 * - Struct definitions
-	 * - Test function
-	 *     - Storage variable assignments
-	 *     - Local variable definitions and assignments
-	 *     - Test code proper (calls public and external functions)
-	 * - Helper functions
-	 */
-	ostringstream contractBody;
-	contractBody << storageVarDecls
-	             << testFunction
-	             << commonHelperFunctions();
-	m_output << Whiskers(R"(<pragmas>
-<contractStart>
-<contractBody>
-<contractEnd>)")
-		("pragmas", pragmas)
-		("contractStart", "contract C {")
-		("contractBody", contractBody.str())
-		("contractEnd", "}")
-		.render();
-}
-
-string ProtoConverter::isabelleTypeString() const
-{
-	string typeString = m_isabelleTypeString.str();
-	if (!typeString.empty())
-		return "(" + typeString + ")";
-	else
-		return typeString;
-}
-
-string ProtoConverter::isabelleValueString() const
-{
-	string valueString = m_isabelleValueString.str();
-	if (!valueString.empty())
-		return "(" + valueString + ")";
-	else
-		return valueString;
-}
-
-string ProtoConverter::contractToString(Contract const& _input)
-{
-	visit(_input);
-	return m_output.str();
-}
-
-/// Type visitor
-void TypeVisitor::StructTupleString::addTypeStringToTuple(string& _typeString)
-{
-	index++;
-	if (index > 1)
-		stream << ",";
-	stream << _typeString;
-}
-
-void TypeVisitor::StructTupleString::addArrayBracketToType(string& _arrayBracket)
-{
-	stream << _arrayBracket;
-}
-
-string TypeVisitor::visit(BoolType const&)
-{
-	m_baseType = "bool";
-	m_structTupleString.addTypeStringToTuple(m_baseType);
-	return m_baseType;
-}
-
-string TypeVisitor::visit(IntegerType const& _type)
-{
-	m_baseType = getIntTypeAsString(_type);
-	m_structTupleString.addTypeStringToTuple(m_baseType);
-	return m_baseType;
-}
-
-string TypeVisitor::visit(FixedByteType const& _type)
-{
-	m_baseType = getFixedByteTypeAsString(_type);
-	m_structTupleString.addTypeStringToTuple(m_baseType);
-	return m_baseType;
-}
-
-string TypeVisitor::visit(AddressType const&)
-{
-	m_baseType = "address";
-	m_structTupleString.addTypeStringToTuple(m_baseType);
-	return m_baseType;
-}
-
-string TypeVisitor::visit(ArrayType const& _type)
-{
-	if (!ValidityVisitor().visit(_type))
-		return "";
-
-	string baseType = visit(_type.t());
-	solAssert(!baseType.empty(), "");
-	string arrayBracket = _type.is_static() ?
-	                     string("[") +
-	                     to_string(getStaticArrayLengthFromFuzz(_type.length())) +
-	                     string("]") :
-	                     string("[]");
-	m_baseType += arrayBracket;
-	m_structTupleString.addArrayBracketToType(arrayBracket);
-
-	// If we don't know yet if the array will be dynamically encoded,
-	// check again. If we already know that it will be, there's no
-	// need to do anything.
-	if (!m_isLastDynParamRightPadded)
-		m_isLastDynParamRightPadded = DynParamVisitor().visit(_type);
-
-	return baseType + arrayBracket;
-}
-
-string TypeVisitor::visit(DynamicByteArrayType const&)
-{
-	m_isLastDynParamRightPadded = true;
-	m_baseType = "bytes";
-	m_structTupleString.addTypeStringToTuple(m_baseType);
-	return m_baseType;
-}
-
-void TypeVisitor::structDefinition(StructType const& _type)
-{
-	// Return an empty string if struct is empty
-	solAssert(ValidityVisitor().visit(_type), "");
-
-	// Reset field counter and indentation
-	unsigned wasFieldCounter = m_structFieldCounter;
-	unsigned wasIndentation = m_indentation;
-
-	m_indentation = 1;
-	m_structFieldCounter = 0;
-
-	// Commence struct declaration
-	string structDef = lineString(
-		"struct " +
-		string(s_structNamePrefix) +
-		to_string(m_structCounter) +
-		" {"
-	);
-	// Start tuple of types with parenthesis
-	m_structTupleString.start();
-	// Increase indentation for struct fields
-	m_indentation++;
-	for (auto const& t: _type.t())
-	{
-		string type{};
-
-		if (!ValidityVisitor().visit(t))
-			continue;
-
-		TypeVisitor tVisitor(m_structCounter + 1);
-		type = tVisitor.visit(t);
-		m_structCounter += tVisitor.numStructs();
-		m_structDef << tVisitor.structDef();
-
-		solAssert(!type.empty(), "");
-
-		structDef += lineString(
-			Whiskers(R"(<type> <member>;)")
-				("type", type)
-				("member", "m" + to_string(m_structFieldCounter++))
-				.render()
-		);
-		string isabelleTypeStr = tVisitor.isabelleTypeString();
-		m_structTupleString.addTypeStringToTuple(isabelleTypeStr);
-	}
-	m_indentation--;
-	structDef += lineString("}");
-	// End tuple of types with parenthesis
-	m_structTupleString.end();
-	m_structCounter++;
-	m_structDef << structDef;
-	m_indentation = wasIndentation;
-	m_structFieldCounter = wasFieldCounter;
-}
-
-string TypeVisitor::visit(StructType const& _type)
-{
-	if (ValidityVisitor().visit(_type))
-	{
-		// Add struct definition
-		structDefinition(_type);
-		// Set last dyn param if struct contains a dyn param e.g., bytes, array etc.
-		m_isLastDynParamRightPadded = DynParamVisitor().visit(_type);
-		// If top-level struct is a non-empty struct, assign the name S<suffix>
-		m_baseType = s_structTypeName + to_string(m_structStartCounter);
-	}
-	else
-		m_baseType = {};
-
-	return m_baseType;
-}
-
-/// AssignCheckVisitor implementation
-void AssignCheckVisitor::ValueStream::appendValue(string& _value)
-{
-	solAssert(!_value.empty(), "Abiv2 fuzzer: Empty value");
-	index++;
-	if (index > 1)
-		stream << ",";
-	stream << _value;
-}
-
-pair<string, string> AssignCheckVisitor::visit(BoolType const& _type)
-{
-	string value = ValueGetterVisitor(counter()).visit(_type);
-	if (!m_forcedVisit)
-		m_valueStream.appendValue(value);
-	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
-}
-
-pair<string, string> AssignCheckVisitor::visit(IntegerType const& _type)
-{
-	string value = ValueGetterVisitor(counter()).visit(_type);
-	if (!m_forcedVisit)
-		m_valueStream.appendValue(value);
-	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
-}
-
-pair<string, string> AssignCheckVisitor::visit(FixedByteType const& _type)
-{
-	string value = ValueGetterVisitor(counter()).visit(_type);
-	if (!m_forcedVisit)
-	{
-		string isabelleValue = ValueGetterVisitor{}.isabelleBytesValueAsString(value);
-		m_valueStream.appendValue(isabelleValue);
-	}
-	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
-}
-
-pair<string, string> AssignCheckVisitor::visit(AddressType const& _type)
-{
-	string value = ValueGetterVisitor(counter()).visit(_type);
-	if (!m_forcedVisit)
-	{
-		string isabelleValue = ValueGetterVisitor{}.isabelleAddressValueAsString(value);
-		m_valueStream.appendValue(isabelleValue);
-	}
-	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
-}
-
-pair<string, string> AssignCheckVisitor::visit(DynamicByteArrayType const& _type)
-{
-	string value = ValueGetterVisitor(counter()).visit(_type);
-	if (!m_forcedVisit)
-	{
-		string isabelleValue = ValueGetterVisitor{}.isabelleBytesValueAsString(value);
-		m_valueStream.appendValue(isabelleValue);
-	}
-	DataType dataType = DataType::BYTES;
-	return assignAndCheckStringPair(m_varName, m_paramName, value, value, dataType);
-}
-
-pair<string, string> AssignCheckVisitor::visit(ArrayType const& _type)
-{
-	if (!ValidityVisitor().visit(_type))
-		return make_pair("", "");
-
-	// Obtain type of array to be resized and initialized
-	string typeStr{};
-
-	unsigned wasStructCounter = m_structCounter;
-	TypeVisitor tVisitor(m_structCounter);
-	typeStr = tVisitor.visit(_type);
-
-	pair<string, string> resizeBuffer;
-	string lengthStr;
-	unsigned length;
-
-	// Resize dynamic arrays
-	if (!_type.is_static())
-	{
-		length = getDynArrayLengthFromFuzz(_type.length(), counter());
-		lengthStr = to_string(length);
-		if (m_stateVar)
-		{
-			// Dynamic storage arrays are resized via the empty push() operation
-			resizeBuffer.first = Whiskers(R"(<indentation>for (uint i = 0; i < <length>; i++) <arrayRef>.push();)")
-				("indentation", indentation())
-				("length", lengthStr)
-				("arrayRef", m_varName)
-				.render() + "\n";
-			// Add a dynamic check on the resized length
-			resizeBuffer.second = checkString(m_paramName + ".length", lengthStr, DataType::VALUE);
-		}
-		else
-		{
-			// Resizing memory arrays via the new operator
-			string resizeOp = Whiskers(R"(new <fullTypeStr>(<length>))")
-				("fullTypeStr", typeStr)
-				("length", lengthStr)
-				.render();
-			resizeBuffer = assignAndCheckStringPair(
-				m_varName,
-				m_paramName + ".length",
-				resizeOp,
-				lengthStr,
-				DataType::VALUE
-				);
-		}
-	}
-	else
-	{
-		length = getStaticArrayLengthFromFuzz(_type.length());
-		lengthStr = to_string(length);
-		// Add check on length
-		resizeBuffer.second = checkString(m_paramName + ".length", lengthStr, DataType::VALUE);
-	}
-
-	// Add assignCheckBuffer and check statements
-	pair<string, string> assignCheckBuffer;
-	string wasVarName = m_varName;
-	string wasParamName = m_paramName;
-	if (!m_forcedVisit)
-		m_valueStream.startArray();
-	for (unsigned i = 0; i < length; i++)
-	{
-		m_varName = wasVarName + "[" + to_string(i) + "]";
-		m_paramName = wasParamName + "[" + to_string(i) + "]";
-		pair<string, string> assign = visit(_type.t());
-		assignCheckBuffer.first += assign.first;
-		assignCheckBuffer.second += assign.second;
-		if (i < length - 1)
-			m_structCounter = wasStructCounter;
-	}
-	// Since struct visitor won't be called for zero-length
-	// arrays, struct counter will not get incremented. Therefore,
-	// we need to manually force a recursive struct visit.
-	if (length == 0 && TypeVisitor().arrayOfStruct(_type))
-	{
-		bool previousState = m_forcedVisit;
-		m_forcedVisit = true;
-		visit(_type.t());
-		m_forcedVisit = previousState;
-	}
-	if (!m_forcedVisit)
-		m_valueStream.endArray();
-
-	m_varName = wasVarName;
-	m_paramName = wasParamName;
-
-	// Compose resize and initialization assignment and check
-	return make_pair(
-		resizeBuffer.first + assignCheckBuffer.first,
-		resizeBuffer.second + assignCheckBuffer.second
-	);
-}
-
-pair<string, string> AssignCheckVisitor::visit(StructType const& _type)
-{
-	if (!ValidityVisitor().visit(_type))
-		return make_pair("", "");
-
-	pair<string, string> assignCheckBuffer;
-	unsigned i = 0;
-
-	// Increment struct counter
-	m_structCounter++;
-
-	string wasVarName = m_varName;
-	string wasParamName = m_paramName;
-
-	if (!m_forcedVisit)
-		m_valueStream.startStruct();
-	for (auto const& t: _type.t())
-	{
-		m_varName = wasVarName + ".m" + to_string(i);
-		m_paramName = wasParamName + ".m" + to_string(i);
-		pair<string, string> assign = visit(t);
-		// If type is not well formed continue without
-		// updating state.
-		if (assign.first.empty() && assign.second.empty())
-			continue;
-		assignCheckBuffer.first += assign.first;
-		assignCheckBuffer.second += assign.second;
-		i++;
-	}
-	if (!m_forcedVisit)
-		m_valueStream.endStruct();
-	m_varName = wasVarName;
-	m_paramName = wasParamName;
-	return assignCheckBuffer;
-}
-
-pair<string, string> AssignCheckVisitor::assignAndCheckStringPair(
-	string const& _varRef,
-	string const& _checkRef,
-	string const& _assignValue,
-	string const& _checkValue,
-	DataType _type
-)
-{
-	return make_pair(assignString(_varRef, _assignValue), checkString(_checkRef, _checkValue, _type));
-}
-
-string AssignCheckVisitor::assignString(string const& _ref, string const& _value)
-{
-	string assignStmt = Whiskers(R"(<ref> = <value>;)")
-		("ref", _ref)
-		("value", _value)
-		.render();
-	return indentation() + assignStmt + "\n";
-}
-
-string AssignCheckVisitor::checkString(string const& _ref, string const& _value, DataType _type)
-{
-	string checkPred;
-	switch (_type)
-	{
-	case DataType::BYTES:
-		checkPred = Whiskers(R"(!bytesCompare(<varName>, <value>))")
-			("varName", _ref)
-			("value", _value)
-			.render();
-		break;
-	case DataType::VALUE:
-		checkPred = Whiskers(R"(<varName> != <value>)")
-			("varName", _ref)
-			("value", _value)
-			.render();
-		break;
-	case DataType::ARRAY:
-		solUnimplemented("Proto ABIv2 fuzzer: Invalid data type.");
-	}
-	string checkStmt = Whiskers(R"(if (<checkPred>) return <errCode>;)")
-		("checkPred", checkPred)
-		("errCode", to_string(m_errorCode++))
-		.render();
-	return indentation() + checkStmt + "\n";
-}
-
-/// ValueGetterVisitor
-string ValueGetterVisitor::visit(BoolType const&)
-{
-	return counter() % 2 ? "true" : "false";
-}
-
-string ValueGetterVisitor::visit(IntegerType const& _type)
-{
-	return integerValue(counter(), getIntWidth(_type), _type.is_signed());
-}
-
-string ValueGetterVisitor::visit(FixedByteType const& _type)
-{
-	return fixedByteValueAsString(
-		getFixedByteWidth(_type),
-		counter()
-	);
-}
-
-string ValueGetterVisitor::visit(AddressType const&)
-{
-	return addressValueAsString(counter());
-}
-
-string ValueGetterVisitor::visit(DynamicByteArrayType const&)
-{
-	return bytesArrayValueAsString(
-		counter(),
-		true
-	);
-}
-
-std::string ValueGetterVisitor::croppedString(
-	unsigned _numBytes,
-	unsigned _counter,
-	bool _isHexLiteral
-)
-{
-	solAssert(
-		_numBytes > 0 && _numBytes <= 32,
-		"Proto ABIv2 fuzzer: Too short or too long a cropped string"
-	);
-
-	// Number of masked nibbles is twice the number of bytes for a
-	// hex literal of _numBytes bytes. For a string literal, each nibble
-	// is treated as a character.
-	unsigned numMaskNibbles = _isHexLiteral ? _numBytes * 2 : _numBytes;
-
-	// Start position of substring equals totalHexStringLength - numMaskNibbles
-	// totalHexStringLength = 64 + 2 = 66
-	// e.g., 0x12345678901234567890123456789012 is a total of 66 characters
-	//      |---------------------^-----------|
-	//      <--- start position---><--numMask->
-	//      <-----------total length --------->
-	// Note: This assumes that maskUnsignedIntToHex() invokes toHex(..., HexPrefix::Add)
-	unsigned startPos = 66 - numMaskNibbles;
-	// Extracts the least significant numMaskNibbles from the result
-	// of maskUnsignedIntToHex().
-	return maskUnsignedIntToHex(
-		_counter,
-		numMaskNibbles
-	).substr(startPos, numMaskNibbles);
-}
-
-std::string ValueGetterVisitor::hexValueAsString(
-	unsigned _numBytes,
-	unsigned _counter,
-	bool _isHexLiteral,
-	bool _decorate
-)
-{
-	solAssert(_numBytes > 0 && _numBytes <= 32,
-	          "Proto ABIv2 fuzzer: Invalid hex length"
-	);
-
-	// If _decorate is set, then we return a hex"" or a "" string.
-	if (_numBytes == 0)
-		return Whiskers(R"(<?decorate><?isHex>hex</isHex>""</decorate>)")
-			("decorate", _decorate)
-			("isHex", _isHexLiteral)
-			.render();
-
-	// This is needed because solidity interprets a 20-byte 0x prefixed hex literal as an address
-	// payable type.
-	return Whiskers(R"(<?decorate><?isHex>hex</isHex>"</decorate><value><?decorate>"</decorate>)")
-		("decorate", _decorate)
-		("isHex", _isHexLiteral)
-		("value", croppedString(_numBytes, _counter, _isHexLiteral))
-		.render();
-}
-
-std::string ValueGetterVisitor::fixedByteValueAsString(unsigned _width, unsigned _counter)
-{
-	solAssert(
-		(_width >= 1 && _width <= 32),
-		"Proto ABIv2 Fuzzer: Fixed byte width is not between 1--32"
-	);
-	return hexValueAsString(_width, _counter, /*isHexLiteral=*/true);
-}
-
-std::string ValueGetterVisitor::addressValueAsString(unsigned _counter)
-{
-	return "address(" + maskUnsignedIntToHex(_counter, 40) + ")";
-}
-
-std::string ValueGetterVisitor::isabelleAddressValueAsString(std::string& _solAddressString)
-{
-	// Isabelle encoder expects address literal to be exactly
-	// 20 bytes and a hex string.
-	// Example: 0x0102030405060708090a0102030405060708090a
-	std::regex const addressPattern("address\\((.*)\\)");
-	std::smatch match;
-	solAssert(std::regex_match(_solAddressString, match, addressPattern), "Abiv2 fuzzer: Invalid address string");
-	std::string addressHex = match[1].str();
-	addressHex.erase(2, 24);
-	return addressHex;
-}
-
-std::string ValueGetterVisitor::isabelleBytesValueAsString(std::string& _solBytesString)
-{
-	std::regex const bytesPattern("hex\"(.*)\"");
-	std::smatch match;
-	solAssert(std::regex_match(_solBytesString, match, bytesPattern), "Abiv2 fuzzer: Invalid bytes string");
-	std::string bytesHex = match[1].str();
-	return "0x" + bytesHex;
-}
-
-std::string ValueGetterVisitor::variableLengthValueAsString(
-	unsigned _numBytes,
-	unsigned _counter,
-	bool _isHexLiteral
-)
-{
-	if (_numBytes == 0)
-		return Whiskers(R"(<?isHex>hex</isHex>"")")
-			("isHex", _isHexLiteral)
-			.render();
-
-	unsigned numBytesRemaining = _numBytes;
-	// Stores the literal
-	string output{};
-	// If requested value is shorter than or exactly 32 bytes,
-	// the literal is the return value of hexValueAsString.
-	if (numBytesRemaining <= 32)
-		output = hexValueAsString(
-			numBytesRemaining,
-			_counter,
-			_isHexLiteral,
-			/*decorate=*/false
-		);
-		// If requested value is longer than 32 bytes, the literal
-		// is obtained by duplicating the return value of hexValueAsString
-		// until we reach a value of the requested size.
-	else
-	{
-		// Create a 32-byte value to be duplicated and
-		// update number of bytes to be appended.
-		// Stores the cached literal that saves us
-		// (expensive) calls to keccak256.
-		string cachedString = hexValueAsString(
-			/*numBytes=*/32,
-			             _counter,
-			             _isHexLiteral,
-			/*decorate=*/false
-		);
-		output = cachedString;
-		numBytesRemaining -= 32;
-
-		// Append bytes from cachedString until
-		// we create a value of desired length.
-		unsigned numAppendedBytes;
-		while (numBytesRemaining > 0)
-		{
-			// We append at most 32 bytes at a time
-			numAppendedBytes = numBytesRemaining >= 32 ? 32 : numBytesRemaining;
-			output += cachedString.substr(
-				0,
-				// Double the substring length for hex literals since each
-				// character is actually half a byte (or a nibble).
-				_isHexLiteral ? numAppendedBytes * 2 : numAppendedBytes
-			);
-			numBytesRemaining -= numAppendedBytes;
-		}
-		solAssert(
-			numBytesRemaining == 0,
-			"Proto ABIv2 fuzzer: Logic flaw in variable literal creation"
-		);
-	}
-
-	if (_isHexLiteral)
-		solAssert(
-			output.size() == 2 * _numBytes,
-			"Proto ABIv2 fuzzer: Generated hex literal is of incorrect length"
-		);
-	else
-		solAssert(
-			output.size() == _numBytes,
-			"Proto ABIv2 fuzzer: Generated string literal is of incorrect length"
-		);
-
-	// Decorate output
-	return Whiskers(R"(<?isHexLiteral>hex</isHexLiteral>"<value>")")
-		("isHexLiteral", _isHexLiteral)
-		("value", output)
-		.render();
-}
-
-string ValueGetterVisitor::bytesArrayValueAsString(unsigned _counter, bool _isHexLiteral)
-{
-	return variableLengthValueAsString(
-		getVarLength(_counter),
-		_counter,
-		_isHexLiteral
-	);
-}
diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
deleted file mode 100644
index be583d49711c..000000000000
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ /dev/null
@@ -1,1027 +0,0 @@
-#pragma once
-
-#include <test/tools/ossfuzz/abiV2Proto.pb.h>
-
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/Whiskers.h>
-#include <libsolutil/Numeric.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <ostream>
-#include <random>
-#include <sstream>
-
-/**
- * Template of the solidity test program generated by this converter is as follows:
- *
- *	pragma solidity >=0.0;
- *	pragma experimental ABIEncoderV2;
- *
- *	contract C {
- *		// State variable
- *		string sv_0;
- *		// Test function that is called by the VM.
- *		// There are 2 variations of this function: one returns
- *		// the output of test_calldata_coding() and the other
- *		// returns the output of test_returndata_coding(). The
- *		// proto field called Test decides which one of the two
- *		// are chosen for creating a test case.
- *		function test() public returns (uint) {
- *			// The protobuf field "Contract.test" decides which of
- *			// the two internal functions "test_calldata_coding()"
- *			// and "test_returndata_coding()" are called. Here,
- *			// we assume that the protobuf field equals "CALLDATA_CODER"
- *			return this.test_calldata_coding()
- *		}
- *
- *		// The following function is generated if the protobuf field
- *		// "Contract.test" is equal to "RETURNDATA_CODER".
- *		function test_returndata_coding() internal returns (uint) {
- *			string memory lv_0, bytes memory lv_1 = test_returndata_external();
- *			if (lv_0 != 044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d)
- *				return 1;
- *			if (lv_1 != "1")
- *				return 2;
- *			return 0;
- *		}
- *
- *		// The following function is generated if the protobuf field
- *		// "Contract.test" is equal to "RETURNDATA_CODER".
- *		function test_returndata_external() external returns (string memory, bytes memory)
- *		{
- *			sv_0 = "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d";
- *			bytes memory lv_0 = "1";
- *			return (sv_0, lv_0);
- *		}
- *
-  *		// The following function is generated if the protobuf field
- *		// "Contract.test" is equal to "CALLDATA_CODER".
- *		function test_calldata_coding() internal returns (uint) {
- *			// Local variable
- *			bytes lv_1 = "1";
- *			sv_0 = "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d";
- *			uint returnVal = this.coder_public(sv_0, lv_1);
- *			if (returnVal != 0)
- *				return returnVal;
- *			// Since the return codes in the public and external coder functions are identical
- *			// we offset error code by a fixed amount (200000) for differentiation.
- *			returnVal = this.coder_external(sv_0, lv_1);
- *			if (returnVal != 0)
- *				return 200000 + returnVal;
- *			// Encode parameters
- *			bytes memory argumentEncoding = abi.encode(<parameter_names>);
- *			returnVal = checkEncodedCall(this.coder_public.selector, argumentEncoding, <invalidLengthFuzz>);
- *			// Check if calls to coder_public meet expectations for correctly/incorrectly encoded data.
- *			if (returnVal != 0)
- *				return returnVal;
- *
- *			returnVal = checkEncodedCall(this.coder_external.selector, argumentEncoding, <invalidLengthFuzz>);
- *			// Check if calls to coder_external meet expectations for correctly/incorrectly encoded data.
- *			// Offset return value to distinguish between failures originating from coder_public and coder_external.
- *			if (returnVal != 0)
- *				return uint(200000) + returnVal;
- *			// Return zero if all checks pass.
- *			return 0;
- *		}
- *
- *		/// Accepts function selector, correct argument encoding, and an invalid encoding length as input.
- *		/// Returns a non-zero value if either call with correct encoding fails or call with incorrect encoding
- *		/// succeeds. Returns zero if both calls meet expectation.
- *		function checkEncodedCall(bytes4 funcSelector, bytes memory argumentEncoding, uint invalidLengthFuzz)
- *			public returns (uint) {
- *			...
- *		}
- *
- *		/// Accepts function selector, correct argument encoding, and length of invalid encoding and returns
- *		/// the correct and incorrect abi encoding for calling the function specified by the function selector.
- *		function createEncoding(bytes4 funcSelector, bytes memory argumentEncoding, uint invalidLengthFuzz)
- *			internal pure returns (bytes memory, bytes memory) {
- *			...
- *		}
- *
- *		/// Compares two dynamically sized bytes arrays for equality.
- *		function bytesCompare(bytes memory a, bytes memory b) internal pure returns (bool) {
- *			...
- *		}
- *
- *		// Public function that is called by test() function. Accepts one or more arguments and returns
- *		// a uint value (zero if abi en/decoding was successful, non-zero otherwise)
- *		function coder_public(string memory c_0, bytes memory c_1) public pure returns (uint) {
- *			if (!bytesCompare(bytes(c_0), "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"))
- *				return 1;
- *			if (!bytesCompare(c_1, "1"))
- *				return 2;
- *			return 0;
- *		}
- *
- *		// External function that is called by test() function. Accepts one or more arguments and returns
- *		// a uint value (zero if abi en/decoding was successful, non-zero otherwise)
- *		function coder_external(string calldata c_0, bytes calldata c_1) external pure returns (uint) {
- *			if (!bytesCompare(bytes(c_0), "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"))
- *				return 1;
- *			if (!bytesCompare(c_1, "1"))
- *				return 2;
- *			return 0;
- *		}
- *	}
- */
-
-namespace solidity::test::abiv2fuzzer
-{
-using RandomEngine = std::mt19937_64;
-using Distribution = std::uniform_int_distribution<unsigned>;
-using Bernoulli = std::bernoulli_distribution;
-
-/// Converts a protobuf input into a Solidity program that tests
-/// abi coding.
-class ProtoConverter
-{
-public:
-	ProtoConverter(unsigned _seed):
-		m_isStateVar(true),
-		m_counter(0),
-		m_varCounter(0),
-		m_returnValue(1),
-		m_isLastDynParamRightPadded(false),
-		m_structCounter(0),
-		m_numStructsAdded(0)
-	{
-		m_random = std::make_unique<RandomEngine>(_seed);
-	}
-
-	ProtoConverter(ProtoConverter const&) = delete;
-	ProtoConverter(ProtoConverter&&) = delete;
-	std::string contractToString(Contract const& _input);
-	std::string isabelleTypeString() const;
-	std::string isabelleValueString() const;
-	bool coderFunction() const
-	{
-		return m_test == Contract_Test::Contract_Test_CALLDATA_CODER;
-	}
-private:
-	enum class Delimiter
-	{
-		ADD,
-		SKIP
-	};
-	/// Enum of possible function types that decode abi
-	/// encoded parameters.
-	enum class CalleeType
-	{
-		PUBLIC,
-		EXTERNAL
-	};
-
-	/// Each external parameter representation contains the following:
-	/// - Delimiter prefix
-	/// - Boolean that is true if value type, false otherwise
-	/// - String representation of type
-	/// - Parameter name
-	using ParameterPack = std::tuple<Delimiter, bool, std::string, std::string>;
-
-	/// Visitors for various Protobuf types
-	/// Visit top-level contract specification
-	void visit(Contract const&);
-
-	/// Convert test function specification into Solidity test
-	/// function
-	/// @param _testSpec: Protobuf test function specification
-	/// @param _storageDefs: String containing Solidity assignment
-	/// statements to be placed inside the scope of the test function.
-	std::string visit(TestFunction const& _testSpec, std::string const& _storageDefs);
-
-	/// Visitors for the remaining protobuf types. They convert
-	/// the input protobuf specification type into Solidity code.
-	/// @return A pair of strings, first of which contains Solidity
-	/// code to be placed inside contract scope, second of which contains
-	/// Solidity code to be placed inside test function scope.
-	std::pair<std::string, std::string> visit(VarDecl const&);
-	std::pair<std::string, std::string> visit(Type const&);
-	std::pair<std::string, std::string> visit(ValueType const&);
-	std::pair<std::string, std::string> visit(NonValueType const&);
-	std::pair<std::string, std::string> visit(BoolType const&);
-	std::pair<std::string, std::string> visit(IntegerType const&);
-	std::pair<std::string, std::string> visit(FixedByteType const&);
-	std::pair<std::string, std::string> visit(AddressType const&);
-	std::pair<std::string, std::string> visit(DynamicByteArrayType const&);
-	std::pair<std::string, std::string> visit(ArrayType const&);
-	std::pair<std::string, std::string> visit(StructType const&);
-
-	/// Convert a protobuf type @a _T into Solidity code to be placed
-	/// inside contract and test function scopes.
-	/// @param: _type (of parameterized type protobuf type T) is the type
-	/// of protobuf input to be converted.
-	/// @param: _isValueType is true if _type is a Solidity value type e.g., uint
-	/// and false otherwise e.g., string
-	/// @return: A pair of strings, first of which contains Solidity
-	/// code to be placed inside contract scope, second of which contains
-	/// Solidity code to be placed inside test function scope.
-	template <typename T>
-	std::pair<std::string, std::string> processType(T const& _type, bool _isValueType);
-
-	/// Convert a protobuf type @a _T into Solidity variable assignment and check
-	/// statements to be placed inside contract and test function scopes.
-	/// @param: _varName is the name of the Solidity variable
-	/// @param: _paramName is the name of the Solidity parameter that is passed
-	/// to the test function
-	/// @param: _type (of parameterized type protobuf type T) is the type
-	/// of protobuf input to be converted.
-	/// @return: A pair of strings, first of which contains Solidity
-	/// statements to be placed inside contract scope, second of which contains
-	/// Solidity statements to be placed inside test function scope.
-	template <typename T>
-	std::pair<std::string, std::string> assignChecker(
-		std::string const& _varName,
-		std::string const& _paramName,
-		T _type
-	);
-
-	/// Convert a protobuf type @a _T into Solidity variable declaration statement.
-	/// @param: _varName is the name of the Solidity variable
-	/// @param: _paramName is the name of the Solidity parameter that is passed
-	/// to the test function
-	/// @param: _type (of parameterized type protobuf type T) is the type
-	/// of protobuf input to be converted.
-	/// @param: _isValueType is a boolean that is true if _type is a
-	/// Solidity value type e.g., uint and false otherwise e.g., string
-	/// @param: _location is the Solidity location qualifier string to
-	/// be used inside variable declaration statements
-	/// @return: A pair of strings, first of which contains Solidity
-	/// variable declaration statement to be placed inside contract scope,
-	/// second of which contains Solidity variable declaration statement
-	/// to be placed inside test function scope.
-	template <typename T>
-	std::pair<std::string, std::string> varDecl(
-		std::string const& _varName,
-		std::string const& _paramName,
-		T _type,
-		bool _isValueType,
-		std::string const& _location
-	);
-
-	/// Appends a function parameter to the function parameter stream.
-	void appendTypedParams(
-		CalleeType _calleeType,
-		bool _isValueType,
-		std::string const& _typeString,
-		std::string const& _varName,
-		Delimiter _delimiter
-	);
-
-	/// Appends a function parameter to the public test function's
-	/// parameter stream.
-	void appendTypedParamsPublic(
-		bool _isValueType,
-		std::string const& _typeString,
-		std::string const& _varName,
-		Delimiter _delimiter = Delimiter::ADD
-	);
-
-	/// Appends a function parameter to the external test function's
-	/// parameter stream.
-	void appendTypedParamsExternal(
-		bool _isValueType,
-		std::string const& _typeString,
-		std::string const& _varName,
-		Delimiter _delimiter = Delimiter::ADD
-	);
-
-	/// Append types to typed stream used by returndata coders.
-	void appendTypes(
-		bool _isValueType,
-		std::string const& _typeString,
-		Delimiter _delimiter
-	);
-
-	/// Append typed return value.
-	void appendTypedReturn(
-		bool _isValueType,
-		std::string const& _typeString,
-		Delimiter _delimiter
-	);
-
-	/// Append type name to type string meant to be
-	/// passed to Isabelle coder API.
-	void appendToIsabelleTypeString(
-		std::string const& _typeString,
-		Delimiter _delimiter
-	);
-
-	/// Append @a _valueString to value string meant to be
-	/// passed to Isabelle coder API.
-	void appendToIsabelleValueString(
-		std::string const& _valueString,
-		Delimiter _delimiter
-	);
-
-	/// Returns a Solidity variable declaration statement
-	/// @param _type: string containing Solidity type of the
-	/// variable to be declared.
-	/// @param _varName: string containing Solidity variable
-	/// name
-	/// @param _qualifier: string containing location where
-	/// the variable will be placed
-	std::string getVarDecl(
-		std::string const& _type,
-		std::string const& _varName,
-		std::string const& _qualifier
-	);
-
-	/// Return checks that are encoded as Solidity if statements
-	/// as string
-	std::string equalityChecksAsString();
-
-	/// Return comma separated typed function parameters as string
-	std::string typedParametersAsString(CalleeType _calleeType);
-
-	/// Return commonly used Solidity helper functions as string
-	std::string commonHelperFunctions();
-
-	/// Return helper functions used to test calldata coding
-	std::string calldataHelperFunctions();
-
-	/// Return top-level calldata coder test function as string
-	std::string testCallDataFunction(unsigned _invalidLength);
-
-	/// Return top-level returndata coder test function as string
-	std::string testReturnDataFunction();
-
-	/// Return the next variable count that is used for
-	/// variable naming.
-	unsigned getNextVarCounter()
-	{
-		return m_varCounter++;
-	}
-
-	/// Return a pair of names for Solidity variable and the same variable when
-	/// passed either as a function parameter or used to store the tuple
-	/// returned from a function.
-	/// @param _varCounter: name suffix
-	/// @param _stateVar: predicate that is true for state variables, false otherwise
-	std::pair<std::string, std::string> newVarNames(unsigned _varCounter, bool _stateVar)
-	{
-		std::string varName = _stateVar ? s_stateVarNamePrefix : s_localVarNamePrefix;
-		return std::make_pair(
-			varName + std::to_string(_varCounter),
-			paramName() + std::to_string(_varCounter)
-		);
-	}
-
-	std::string paramName()
-	{
-		switch (m_test)
-		{
-		case Contract_Test::Contract_Test_CALLDATA_CODER:
-			return s_paramNamePrefix;
-		case Contract_Test::Contract_Test_RETURNDATA_CODER:
-			return s_localVarNamePrefix;
-		}
-	}
-
-	/// Checks if the last dynamically encoded Solidity type is right
-	/// padded, returning true if it is and false otherwise.
-	bool isLastDynParamRightPadded()
-	{
-		return m_isLastDynParamRightPadded;
-	}
-
-	/// Convert delimiter to a comma or null string.
-	static std::string delimiterToString(Delimiter _delimiter, bool _space = true);
-	/// Generates number in the range [1, @param _n] uniformly at random.
-	unsigned randomNumberOneToN(unsigned _n)
-	{
-		return Distribution(1, _n)(*m_random);
-	}
-	/// Generates boolean that has a bernoulli distribution defined by @param _p.
-	bool randomBool(double _p)
-	{
-		return Bernoulli{_p}(*m_random);
-	}
-
-	/// Contains the test program
-	std::ostringstream m_output;
-	/// Contains a subset of the test program. This subset contains
-	/// checks to be encoded in the test program
-	std::ostringstream m_checks;
-	/// Contains typed parameter list to be passed to callee functions
-	std::ostringstream m_typedParamsPublic;
-	/// Contains parameter list to be passed to callee functions
-	std::ostringstream m_untypedParamsExternal;
-	/// Contains type string to be passed to Isabelle API
-	std::ostringstream m_isabelleTypeString;
-	/// Contains values to be encoded in the format accepted
-	/// by the Isabelle API.
-	std::ostringstream m_isabelleValueString;
-	/// Contains type stream to be used in returndata coder function
-	/// signature
-	std::ostringstream m_types;
-	std::ostringstream m_typedReturn;
-	/// Argument names to be passed to coder functions
-	std::ostringstream m_argsCoder;
-	/// Predicate that is true if we are in contract scope
-	bool m_isStateVar;
-	unsigned m_counter;
-	unsigned m_varCounter;
-	/// Monotonically increasing return value for error reporting
-	unsigned m_returnValue;
-	/// Flag that indicates if last dynamically encoded parameter
-	/// passed to a function call is of a type that is going to be
-	/// right padded by the ABI encoder.
-	bool m_isLastDynParamRightPadded;
-	/// Struct counter
-	unsigned m_structCounter;
-	unsigned m_numStructsAdded;
-	/// Enum stating abiv2 coder to be tested
-	Contract_Test m_test;
-	/// Representation of external parameters
-	std::vector<ParameterPack> m_externalParamsRep;
-	/// Random number generator
-	std::unique_ptr<RandomEngine> m_random;
-	/// Prefixes for declared and parameterized variable names
-	static auto constexpr s_localVarNamePrefix = "lv_";
-	static auto constexpr s_stateVarNamePrefix = "sv_";
-	static auto constexpr s_paramNamePrefix = "p_";
-	/// Maximum number of indirections to test calldata coding
-	static unsigned constexpr s_maxIndirections = 5;
-};
-
-/// Visitor interface for Solidity protobuf types.
-template <typename T>
-class AbiV2ProtoVisitor
-{
-public:
-	static unsigned constexpr s_maxArrayDimensions = 3;
-	virtual ~AbiV2ProtoVisitor() = default;
-
-	virtual T visit(BoolType const& _node) = 0;
-	virtual T visit(IntegerType const& _node) = 0;
-	virtual T visit(FixedByteType const& _node) = 0;
-	virtual T visit(AddressType const& _node) = 0;
-	virtual T visit(DynamicByteArrayType const& _node) = 0;
-	virtual T visit(ArrayType const& _node) = 0;
-	virtual T visit(StructType const& _node) = 0;
-	virtual T visit(ValueType const& _node)
-	{
-		return visitValueType(_node);
-	}
-	virtual T visit(NonValueType const& _node)
-	{
-		return visitNonValueType(_node);
-	}
-	virtual T visit(Type const& _node)
-	{
-		return visitType(_node);
-	}
-
-	enum class DataType
-	{
-		BYTES,
-		VALUE,
-		ARRAY
-	};
-
-	/// Prefixes for declared and parameterized variable names
-	static auto constexpr s_structNamePrefix = "S";
-
-	// Static function definitions
-	static bool isValueType(DataType _dataType)
-	{
-		return _dataType == DataType::VALUE;
-	}
-
-	static unsigned getIntWidth(IntegerType const& _x)
-	{
-		return 8 * ((_x.width() % 32) + 1);
-	}
-
-	static bool isIntSigned(IntegerType const& _x)
-	{
-		return _x.is_signed();
-	}
-
-	static std::string getIntTypeAsString(IntegerType const& _x)
-	{
-		return ((isIntSigned(_x) ? "int" : "uint") + std::to_string(getIntWidth(_x)));
-	}
-
-	static unsigned getFixedByteWidth(FixedByteType const& _x)
-	{
-		return (_x.width() % 32) + 1;
-	}
-
-	static std::string getFixedByteTypeAsString(FixedByteType const& _x)
-	{
-		return "bytes" + std::to_string(getFixedByteWidth(_x));
-	}
-
-	// Convert _counter to string and return its keccak256 hash
-	static u256 hashUnsignedInt(unsigned _counter)
-	{
-		return util::keccak256(util::h256(_counter));
-	}
-
-	static u256 maskUnsignedInt(unsigned _counter, unsigned _numMaskNibbles)
-	{
-		return hashUnsignedInt(_counter) & u256("0x" + std::string(_numMaskNibbles, 'f'));
-	}
-
-	// Requires caller to pass number of nibbles (twice the number of bytes) as second argument.
-	// Note: Don't change HexPrefix::Add. See comment in fixedByteValueAsString().
-	static std::string maskUnsignedIntToHex(unsigned _counter, unsigned _numMaskNibbles)
-	{
-		return "0x" + toHex(maskUnsignedInt(_counter, _numMaskNibbles));
-	}
-
-	/// Dynamically sized arrays can have a length of at least zero
-	/// and at most s_maxArrayLength.
-	static unsigned getDynArrayLengthFromFuzz(unsigned _fuzz, unsigned _counter)
-	{
-		// Increment modulo value by one in order to meet upper bound
-		return (_fuzz + _counter) % (s_maxArrayLength + 1);
-	}
-
-	/// Statically sized arrays must have a length of at least one
-	/// and at most s_maxArrayLength.
-	static unsigned getStaticArrayLengthFromFuzz(unsigned _fuzz)
-	{
-		return _fuzz % s_maxArrayLength + 1;
-	}
-
-	/// Returns a pseudo-random value for the size of a string/hex
-	/// literal. Used for creating variable length hex/string literals.
-	/// @param _counter Monotonically increasing counter value
-	static unsigned getVarLength(unsigned _counter)
-	{
-		// Since _counter values are usually small, we use
-		// this linear equation to make the number derived from
-		// _counter approach a uniform distribution over
-		// [0, s_maxDynArrayLength]
-		auto v = (_counter + 879) * 32 % (s_maxDynArrayLength + 1);
-		/// Always return an even number because Isabelle string
-		/// values are formatted as hex literals
-		if (v % 2 == 1)
-			return v + 1;
-		else
-			return v;
-	}
-protected:
-T visitValueType(ValueType const& _type)
-{
-	switch (_type.value_type_oneof_case())
-	{
-	case ValueType::kInty:
-		return visit(_type.inty());
-	case ValueType::kByty:
-		return visit(_type.byty());
-	case ValueType::kAdty:
-		return visit(_type.adty());
-	case ValueType::kBoolty:
-		return visit(_type.boolty());
-	case ValueType::VALUE_TYPE_ONEOF_NOT_SET:
-		return T();
-	}
-}
-
-T visitNonValueType(NonValueType const& _type)
-{
-	switch (_type.nonvalue_type_oneof_case())
-	{
-	case NonValueType::kDynbytearray:
-		return visit(_type.dynbytearray());
-	case NonValueType::kArrtype:
-		return visit(_type.arrtype());
-	case NonValueType::kStype:
-		return visit(_type.stype());
-	case NonValueType::NONVALUE_TYPE_ONEOF_NOT_SET:
-		return T();
-	}
-}
-
-T visitType(Type const& _type)
-{
-	switch (_type.type_oneof_case())
-	{
-	case Type::kVtype:
-		return visit(_type.vtype());
-	case Type::kNvtype:
-		return visit(_type.nvtype());
-	case Type::TYPE_ONEOF_NOT_SET:
-		return T();
-	}
-}
-private:
-	static unsigned constexpr s_maxArrayLength = 4;
-	static unsigned constexpr s_maxDynArrayLength = 256;
-};
-
-/// Converts a protobuf type into a Solidity type string.
-class TypeVisitor: public AbiV2ProtoVisitor<std::string>
-{
-public:
-	TypeVisitor(unsigned _structSuffix = 0):
-		m_indentation(1),
-		m_structCounter(_structSuffix),
-		m_structStartCounter(_structSuffix),
-		m_structFieldCounter(0),
-		m_isLastDynParamRightPadded(false)
-	{}
-
-	std::string visit(BoolType const&) override;
-	std::string visit(IntegerType const&) override;
-	std::string visit(FixedByteType const&) override;
-	std::string visit(AddressType const&) override;
-	std::string visit(ArrayType const&) override;
-	std::string visit(DynamicByteArrayType const&) override;
-	std::string visit(StructType const&) override;
-	using AbiV2ProtoVisitor<std::string>::visit;
-	std::string baseType()
-	{
-		return m_baseType;
-	}
-	bool isLastDynParamRightPadded()
-	{
-		return m_isLastDynParamRightPadded;
-	}
-	std::string structDef()
-	{
-		return m_structDef.str();
-	}
-	unsigned numStructs()
-	{
-		return m_structCounter - m_structStartCounter;
-	}
-	static bool arrayOfStruct(ArrayType const& _type)
-	{
-		Type const& baseType = _type.t();
-		if (baseType.has_nvtype() && baseType.nvtype().has_stype())
-			return true;
-		else if (baseType.has_nvtype() && baseType.nvtype().has_arrtype())
-			return arrayOfStruct(baseType.nvtype().arrtype());
-		else
-			return false;
-	}
-	std::string isabelleTypeString()
-	{
-		return m_structTupleString.stream.str();
-	}
-private:
-	struct StructTupleString
-	{
-		StructTupleString() = default;
-		unsigned index = 0;
-		std::ostringstream stream;
-		void start()
-		{
-			stream << "(";
-		}
-		void end()
-		{
-			stream << ")";
-		}
-		void addTypeStringToTuple(std::string& _typeString);
-		void addArrayBracketToType(std::string& _arrayBracket);
-	};
-	void structDefinition(StructType const&);
-
-	std::string indentation()
-	{
-		return std::string(m_indentation * 1, '\t');
-	}
-	std::string lineString(std::string const& _line)
-	{
-		return indentation() + _line + "\n";
-	}
-	std::string m_baseType;
-	std::ostringstream m_structDef;
-	/// Utility type for conveniently composing a tuple
-	/// string for struct types.
-	StructTupleString m_structTupleString;
-	unsigned m_indentation;
-	unsigned m_structCounter;
-	unsigned m_structStartCounter;
-	unsigned m_structFieldCounter;
-	bool m_isLastDynParamRightPadded;
-
-	static auto constexpr s_structTypeName = "S";
-};
-
-/// Returns a pair of strings, first of which contains assignment statements
-/// to initialize a given type, and second of which contains checks to be
-/// placed inside the coder function to test abi en/decoding.
-class AssignCheckVisitor: public AbiV2ProtoVisitor<std::pair<std::string, std::string>>
-{
-public:
-	AssignCheckVisitor(
-		std::string _varName,
-		std::string _paramName,
-		unsigned _errorStart,
-		bool _stateVar,
-		unsigned _counter,
-		unsigned _structCounter
-	)
-	{
-		m_counter = m_counterStart = _counter;
-		m_varName = _varName;
-		m_paramName = _paramName;
-		m_errorCode = m_errorStart = _errorStart;
-		m_indentation = 2;
-		m_stateVar = _stateVar;
-		m_structCounter = m_structStart = _structCounter;
-	}
-	std::pair<std::string, std::string> visit(BoolType const&) override;
-	std::pair<std::string, std::string> visit(IntegerType const&) override;
-	std::pair<std::string, std::string> visit(FixedByteType const&) override;
-	std::pair<std::string, std::string> visit(AddressType const&) override;
-	std::pair<std::string, std::string> visit(ArrayType const&) override;
-	std::pair<std::string, std::string> visit(DynamicByteArrayType const&) override;
-	std::pair<std::string, std::string> visit(StructType const&) override;
-	using AbiV2ProtoVisitor<std::pair<std::string, std::string>>::visit;
-
-	unsigned errorStmts()
-	{
-		return m_errorCode - m_errorStart;
-	}
-
-	unsigned counted()
-	{
-		return m_counter - m_counterStart;
-	}
-
-	unsigned structs()
-	{
-		return m_structCounter - m_structStart;
-	}
-
-	std::string isabelleValueString()
-	{
-		return m_valueStream.stream.str();
-	}
-private:
-	struct ValueStream
-	{
-		ValueStream() = default;
-		unsigned index = 0;
-		std::ostringstream stream;
-		void startStruct()
-		{
-			if (index >= 1)
-				stream << ",";
-			index = 0;
-			stream << "(";
-		}
-		void endStruct()
-		{
-			stream << ")";
-		}
-		void startArray()
-		{
-			if (index >= 1)
-				stream << ",";
-			index = 0;
-			stream << "[";
-		}
-		void endArray()
-		{
-			stream << "]";
-			index++;
-		}
-		void appendValue(std::string& _value);
-	};
-	std::string indentation()
-	{
-		return std::string(m_indentation * 1, '\t');
-	}
-	unsigned counter()
-	{
-		return m_counter++;
-	}
-
-	std::pair<std::string, std::string> assignAndCheckStringPair(
-		std::string const& _varRef,
-		std::string const& _checkRef,
-		std::string const& _assignValue,
-		std::string const& _checkValue,
-		DataType _type
-	);
-	std::string assignString(std::string const&, std::string const&);
-	std::string checkString(std::string const&, std::string const&, DataType);
-	unsigned m_counter;
-	unsigned m_counterStart;
-	std::string m_varName;
-	std::string m_paramName;
-	unsigned m_errorCode;
-	unsigned m_errorStart;
-	unsigned m_indentation;
-	bool m_stateVar;
-	unsigned m_structCounter;
-	unsigned m_structStart;
-	ValueStream m_valueStream;
-	bool m_forcedVisit = false;
-};
-
-/// Returns a valid value (as a string) for a given type.
-class ValueGetterVisitor: AbiV2ProtoVisitor<std::string>
-{
-public:
-	ValueGetterVisitor(unsigned _counter = 0): m_counter(_counter) {}
-
-	std::string visit(BoolType const&) override;
-	std::string visit(IntegerType const&) override;
-	std::string visit(FixedByteType const&) override;
-	std::string visit(AddressType const&) override;
-	std::string visit(DynamicByteArrayType const&) override;
-	std::string visit(ArrayType const&) override
-	{
-		solAssert(false, "ABIv2 proto fuzzer: Cannot call valuegettervisitor on complex type");
-	}
-	std::string visit(StructType const&) override
-	{
-		solAssert(false, "ABIv2 proto fuzzer: Cannot call valuegettervisitor on complex type");
-	}
-	using AbiV2ProtoVisitor<std::string>::visit;
-	static std::string isabelleAddressValueAsString(std::string& _solAddressString);
-	static std::string isabelleBytesValueAsString(std::string& _solFixedBytesString);
-private:
-	unsigned counter()
-	{
-		return m_counter++;
-	}
-
-	static std::string addressValueAsString(unsigned _counter);
-	static std::string fixedByteValueAsString(unsigned _width, unsigned _counter);
-
-	/// Returns a hex literal if _isHexLiteral is true, a string literal otherwise.
-	/// The size of the returned literal is _numBytes bytes.
-	/// @param _decorate If true, the returned string is enclosed within double quotes
-	/// if _isHexLiteral is false.
-	/// @param _isHexLiteral If true, the returned string is enclosed within
-	/// double quotes prefixed by the string "hex" if _decorate is true. If
-	/// _decorate is false, the returned string is returned as-is.
-	/// @return hex value as string
-	static std::string hexValueAsString(
-		unsigned _numBytes,
-		unsigned _counter,
-		bool _isHexLiteral,
-		bool _decorate = true
-	);
-
-	/// Returns a hex/string literal of variable length whose value and
-	/// size are pseudo-randomly determined from the counter value.
-	/// @param _counter A monotonically increasing counter value
-	/// @param _isHexLiteral Flag that indicates whether hex (if true) or
-	/// string literal (false) is desired
-	/// @return A variable length hex/string value
-	static std::string bytesArrayValueAsString(unsigned _counter, bool _isHexLiteral);
-
-	/// Concatenates the hash value obtained from monotonically increasing counter
-	/// until the desired number of bytes determined by _numBytes.
-	/// @param _width Desired number of bytes for hex value
-	/// @param _counter A counter value used for creating a keccak256 hash
-	/// @param _isHexLiteral Since this routine may be used to construct
-	/// string or hex literals, this flag is used to construct a valid output.
-	/// @return Valid hex or string literal of size _width bytes
-	static std::string variableLengthValueAsString(
-		unsigned _width,
-		unsigned _counter,
-		bool _isHexLiteral
-	);
-
-	/// Returns a value that is @a _numBytes bytes long.
-	/// @param _numBytes: Number of bytes of desired value
-	/// @param _counter: A counter value
-	/// @param _isHexLiteral: True if desired value is a hex literal, false otherwise
-	static std::string croppedString(unsigned _numBytes, unsigned _counter, bool _isHexLiteral);
-
-	unsigned m_counter;
-};
-
-/// Returns true if protobuf array specification is well-formed, false otherwise
-class ValidityVisitor: AbiV2ProtoVisitor<bool>
-{
-public:
-	ValidityVisitor(): m_arrayDimensions(0) {}
-
-	bool visit(BoolType const&) override
-	{
-		return true;
-	}
-
-	bool visit(IntegerType const&) override
-	{
-		return true;
-	}
-
-	bool visit(FixedByteType const&) override
-	{
-		return true;
-	}
-
-	bool visit(AddressType const&) override
-	{
-		return true;
-	}
-
-	bool visit(DynamicByteArrayType const&) override
-	{
-		return true;
-	}
-
-	bool visit(ArrayType const& _type) override
-	{
-		// Mark array type as invalid in one of the following is true
-		//  - contains more than s_maxArrayDimensions dimensions
-		//  - contains an invalid base type, which happens in the
-		//  following cases
-		//    - array base type is invalid
-		//    - array base type is empty
-		m_arrayDimensions++;
-		if (m_arrayDimensions > s_maxArrayDimensions)
-			return false;
-		return visit(_type.t());
-	}
-
-	bool visit(StructType const& _type) override
-	{
-		// A struct is marked invalid only if all of its fields
-		// are invalid. This is done to prevent an empty struct
-		// being defined (which is a Solidity error).
-		for (auto const& t: _type.t())
-			if (visit(t))
-				return true;
-		return false;
-	}
-
-	unsigned m_arrayDimensions;
-	using AbiV2ProtoVisitor<bool>::visit;
-};
-
-/// Returns true if visited type is dynamically encoded by the abi coder,
-/// false otherwise.
-class DynParamVisitor: AbiV2ProtoVisitor<bool>
-{
-public:
-	DynParamVisitor() = default;
-
-	bool visit(BoolType const&) override
-	{
-		return false;
-	}
-
-	bool visit(IntegerType const&) override
-	{
-		return false;
-	}
-
-	bool visit(FixedByteType const&) override
-	{
-		return false;
-	}
-
-	bool visit(AddressType const&) override
-	{
-		return false;
-	}
-
-	bool visit(DynamicByteArrayType const&) override
-	{
-		return true;
-	}
-
-	bool visit(ArrayType const& _type) override
-	{
-		// Return early if array spec is not well-formed
-		if (!ValidityVisitor().visit(_type))
-			return false;
-
-		// Array is dynamically encoded if it at least one of the following is true
-		//   - at least one dimension is dynamically sized
-		//   - base type is dynamically encoded
-		if (!_type.is_static())
-			return true;
-		else
-			return visit(_type.t());
-	}
-
-	bool visit(StructType const& _type) override
-	{
-		// Return early if empty struct
-		if (!ValidityVisitor().visit(_type))
-			return false;
-
-		// Struct is dynamically encoded if at least one of its fields
-		// is dynamically encoded.
-		for (auto const& t: _type.t())
-			if (visit(t))
-				return true;
-		return false;
-	}
-
-	using AbiV2ProtoVisitor<bool>::visit;
-};
-
-}
diff --git a/test/tools/ossfuzz/protoToSol.cpp b/test/tools/ossfuzz/protoToSol.cpp
deleted file mode 100644
index 73ed34b0d352..000000000000
--- a/test/tools/ossfuzz/protoToSol.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/protoToSol.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/Whiskers.h>
-
-#include <sstream>
-
-using namespace solidity::test::solprotofuzzer;
-using namespace solidity::util;
-using namespace std;
-
-string ProtoConverter::protoToSolidity(Program const& _p)
-{
-	// Create random number generator with fuzzer supplied
-	// seed.
-	m_randomGen = make_shared<SolRandomNumGenerator>(_p.seed());
-	return visit(_p);
-}
-
-pair<string, string> ProtoConverter::generateTestCase(TestContract const& _testContract)
-{
-	ostringstream testCode;
-	string usingLibDecl;
-	switch (_testContract.type())
-	{
-	case TestContract::LIBRARY:
-	{
-		m_libraryTest = true;
-		auto testTuple = pseudoRandomLibraryTest();
-		m_libraryName = get<0>(testTuple);
-		Whiskers u(R"(<ind>using <libraryName> for uint;)");
-		u("ind", "\t");
-		u("libraryName", get<0>(testTuple));
-		usingLibDecl = u.render();
-		Whiskers test(R"(<endl><ind><varDecl><endl><ind><ifStmt>)");
-		test("endl", "\n");
-		test("ind", "\t\t");
-		test("varDecl", "uint x;");
-		Whiskers ifStmt(R"(if (<cond>)<endl><ind>return 1;)");
-		Whiskers ifCond(R"(x.<testFunction>() != <expectedOutput>)");
-		ifCond("testFunction", get<1>(testTuple));
-		ifCond("expectedOutput", get<2>(testTuple));
-		ifStmt("cond", ifCond.render());
-		ifStmt("endl", "\n");
-		ifStmt("ind", "\t\t\t");
-		test("ifStmt", ifStmt.render());
-		break;
-	}
-	case TestContract::CONTRACT:
-	{
-		unsigned errorCode = 1;
-		unsigned contractVarIndex = 0;
-		for (auto const& testTuple: m_contractTests)
-		{
-			// Do this to avoid stack too deep errors
-			// We require uint as a return var, so we
-			// cannot have more than 16 variables without
-			// running into stack too deep errors
-			if (contractVarIndex >= s_maxVars)
-				break;
-			string contractName = testTuple.first;
-			string contractVarName = "tc" + to_string(contractVarIndex);
-			Whiskers init(R"(<endl><ind><contractName> <contractVarName> = new <contractName>();)");
-			init("endl", "\n");
-			init("ind", "\t\t");
-			init("contractName", contractName);
-			init("contractVarName", contractVarName);
-			testCode << init.render();
-			for (auto const& t: testTuple.second)
-			{
-				Whiskers tc(R"(<endl><ind><ifStmt>)");
-				tc("endl", "\n");
-				tc("ind", "\t\t");
-				Whiskers ifStmt(R"(if (<cond>)<endl><ind>return <errorCode>;)");
-				Whiskers ifCond(R"(<contractVarName>.<testFunction>() != <expectedOutput>)");
-				ifCond("contractVarName", contractVarName);
-				ifCond("testFunction", t.first);
-				ifCond("expectedOutput", t.second);
-				ifStmt("endl", "\n");
-				ifStmt("cond", ifCond.render());
-				ifStmt("ind", "\t\t\t");
-				ifStmt("errorCode", to_string(errorCode));
-				tc("ifStmt", ifStmt.render());
-				testCode << tc.render();
-				errorCode++;
-			}
-			contractVarIndex++;
-		}
-		break;
-	}
-	}
-	// Expected return value when all tests pass
-	testCode << Whiskers(R"(<endl><ind>return 0;)")("endl", "\n")("ind", "\t\t").render();
-	return {usingLibDecl, testCode.str()};
-}
-
-string ProtoConverter::visit(TestContract const& _testContract)
-{
-	string testCode;
-	string usingLibDecl;
-	m_libraryTest = false;
-
-	// Simply return valid uint (zero) if there are
-	// no tests.
-	if (emptyLibraryTests() || emptyContractTests())
-		testCode = Whiskers(R"(<endl><ind>return 0;)")("endl", "\n")("ind", "\t\t").render();
-	else
-		tie(usingLibDecl, testCode) = generateTestCase(_testContract);
-
-	Whiskers c(R"(<endl>contract C {<?isLibrary><usingDecl></isLibrary><endl><function><endl>})");
-	c("endl", "\n");
-	c("isLibrary", m_libraryTest);
-	c("usingDecl", usingLibDecl);
-	Whiskers f("<ind>function test() public returns (uint)<endl><ind>{<testCode><endl><ind>}");
-	f("ind", "\t");
-	f("endl", "\n");
-	f("testCode", testCode);
-	c("function", f.render());
-	return c.render();
-}
-
-bool ProtoConverter::libraryTest() const
-{
-	return m_libraryTest;
-}
-
-string ProtoConverter::libraryName() const
-{
-	return m_libraryName;
-}
-
-string ProtoConverter::visit(Program const& _p)
-{
-	ostringstream program;
-	ostringstream contracts;
-
-	for (auto &contract: _p.contracts())
-		contracts << visit(contract);
-
-	Whiskers p(R"(<endl>pragma solidity >=0.0;<endl><contracts><endl><test>)");
-	p("endl", "\n");
-	p("contracts", contracts.str());
-	p("test", visit(_p.test()));
-	return p.render();
-}
-
-string ProtoConverter::visit(ContractType const& _contractType)
-{
-	switch (_contractType.contract_type_oneof_case())
-	{
-	case ContractType::kC:
-		return visit(_contractType.c());
-	case ContractType::kL:
-		return visit(_contractType.l());
-	case ContractType::kI:
-		return visit(_contractType.i());
-	case ContractType::CONTRACT_TYPE_ONEOF_NOT_SET:
-		return "";
-	}
-}
-
-string ProtoConverter::visit(Contract const& _contract)
-{
-	openProgramScope(&_contract);
-	return "";
-}
-
-string ProtoConverter::visit(Interface const& _interface)
-{
-	openProgramScope(&_interface);
-	return "";
-}
-
-string ProtoConverter::visit(Library const& _library)
-{
-	openProgramScope(&_library);
-	return "";
-}
-
-tuple<string, string, string> ProtoConverter::pseudoRandomLibraryTest()
-{
-	solAssert(m_libraryTests.size() > 0, "Sol proto fuzzer: No library tests found");
-	unsigned index = randomNumber() % m_libraryTests.size();
-	return m_libraryTests[index];
-}
-
-void ProtoConverter::openProgramScope(CIL _program)
-{
-	string programNamePrefix;
-	if (holds_alternative<Contract const*>(_program))
-		programNamePrefix = "C";
-	else if (holds_alternative<Interface const*>(_program))
-		programNamePrefix = "I";
-	else
-		programNamePrefix = "L";
-	string programName = programNamePrefix + to_string(m_programNumericSuffix++);
-	m_programNameMap.emplace(_program, programName);
-}
-
-string ProtoConverter::programName(CIL _program)
-{
-	solAssert(m_programNameMap.count(_program), "Sol proto fuzzer: Unregistered program");
-	return m_programNameMap[_program];
-}
-
-unsigned ProtoConverter::randomNumber()
-{
-	solAssert(m_randomGen, "Sol proto fuzzer: Uninitialized random number generator");
-	return m_randomGen->operator()();
-}
diff --git a/test/tools/ossfuzz/protoToSol.h b/test/tools/ossfuzz/protoToSol.h
deleted file mode 100644
index b367acb0350d..000000000000
--- a/test/tools/ossfuzz/protoToSol.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#pragma once
-
-#include <test/tools/ossfuzz/solProto.pb.h>
-
-#include <random>
-#include <string>
-#include <utility>
-#include <variant>
-
-namespace solidity::test::solprotofuzzer
-{
-/// Random number generator that is seeded with a fuzzer
-/// supplied unsigned integer.
-struct SolRandomNumGenerator
-{
-	using RandomEngine = std::minstd_rand;
-
-	explicit SolRandomNumGenerator(unsigned _seed): m_random(RandomEngine(_seed)) {}
-
-	/// @returns a pseudo random unsigned integer
-	unsigned operator()()
-	{
-		return static_cast<unsigned>(m_random());
-	}
-
-	RandomEngine m_random;
-};
-
-/* There are two types of tests created by the converter:
- * - library test
- * - contract test
- *
- * The template for library test is the following:
- *
- * // Library generated from fuzzer protobuf specification
- * library L0 {
- *      function f0(uint) public view returns (uint) {
- *          return 31337;
- *      }
- *      function f1(uint) public pure returns (uint) {
- *          return 455;
- *      }
- * }
- * library L1 {
- *      function f0(uint) external view returns (uint) {
- *          return 607;
- *      }
- * }
- *
- * // Test entry point
- * contract C {
- *     // Uses a single pseudo randomly chosen library
- *     // and calls a pseudo randomly chosen function
- *     // returning a non-zero error code on failure or
- *     // a zero uint when test passes.
- *     using L0 for uint;
- *     function test() public pure returns (uint) {
- *          uint x;
- *          if (x.f1() != 455)
- *              return 1;
- *          return 0;
- *     }
- * }
- *
- * The template for contract test is the following
- * // Contracts generated from fuzzer protobuf specification
- * contract C0B {
- *      function f0() public pure virtual returns (uint)
- *      {
- *          return 42;
- *      }
- * }
- * contract C0 is C0B {
- *      function f0() public pure override returns (uint)
- *      {
- *          return 1337;
- *      }
- * }
- *
- * // Test entry point
- * contract C {
- *      // Invokes one or more contract functions returning
- *      // a non-zero error code for failure, a zero uint
- *      // when all tests pass
- *      function test() public pure returns (uint)
- *      {
- *          C0 tc0 = new C0();
- *          if (tc0.f0() != 1337)
- *              return 1;
- *          C0B tc1 = new C0B();
- *          if (tc1.f0() != 42)
- *              return 2;
- *          // Expected return value if all tests pass
- *          return 0;
- *      }
- * }
- */
-class ProtoConverter
-{
-public:
-	ProtoConverter() {}
-	ProtoConverter(ProtoConverter const&) = delete;
-	ProtoConverter(ProtoConverter&&) = delete;
-	std::string protoToSolidity(Program const&);
-	/// @returns true if test calls a library function, false
-	/// otherwise
-	bool libraryTest() const;
-	/// @returns name of the library under test
-	std::string libraryName() const;
-private:
-	/// Variant type that points to one of contract, interface, library protobuf messages
-	using CIL = std::variant<Contract const*, Interface const*, Library const*>;
-	/// Protobuf message visitors that accept a const reference to a protobuf message
-	/// type and return its solidity translation.
-	std::string visit(Program const&);
-	std::string visit(TestContract const&);
-	std::string visit(ContractType const&);
-	std::string visit(Interface const& _interface);
-	std::string visit(Library const& _library);
-	std::string visit(Contract const& _contract);
-	/// @returns a string pair containing a library declaration (relevant for library
-	/// tests only) and a solidity test case
-	std::pair<std::string, std::string> generateTestCase(TestContract const& _testContract);
-	/// @returns name of a program i.e., contract, library or interface
-	std::string programName(CIL _program);
-	/// @returns a tuple containing the names of the library and function under
-	/// test, and its expected output.
-	std::tuple<std::string, std::string, std::string> pseudoRandomLibraryTest();
-	/// Performs bookkeeping for a fuzzer-supplied program
-	void openProgramScope(CIL _program);
-	/// @returns a deterministic pseudo random unsigned integer
-	unsigned randomNumber();
-	/// @returns true if fuzzer supplied Library protobuf message
-	/// contains zero functions, false otherwise.
-	static bool emptyLibrary(Library const& _library)
-	{
-		return _library.funcdef_size() == 0;
-	}
-	/// @returns true if there are no valid library test cases, false
-	/// otherwise.
-	bool emptyLibraryTests()
-	{
-		return m_libraryTests.empty();
-	}
-	/// @returns true if there are no valid contract test cases, false
-	/// otherwise.
-	bool emptyContractTests()
-	{
-		return m_contractTests.empty();
-	}
-	/// Numeric suffix that is part of program names e.g., "0" in "C0"
-	unsigned m_programNumericSuffix = 0;
-	/// Flag that states whether library call is tested (true) or not (false).
-	bool m_libraryTest = false;
-	/// A smart pointer to fuzzer driven random number generator
-	std::shared_ptr<SolRandomNumGenerator> m_randomGen;
-	/// Maps protobuf program to its string name
-	std::map<CIL, std::string> m_programNameMap;
-	/// List of tuples containing library name, function and its expected output
-	std::vector<std::tuple<std::string, std::string, std::string>> m_libraryTests;
-	/// Maps contract name to a map of function names and their expected output
-	std::map<std::string, std::map<std::string, std::string>> m_contractTests;
-	/// Name of the library under test, relevant if m_libraryTest is set
-	std::string m_libraryName;
-	/// Maximum number of local variables in test function to avoid stack too deep
-	/// errors
-	static unsigned constexpr s_maxVars = 15;
-};
-}
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
deleted file mode 100644
index 80768578934b..000000000000
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ /dev/null
@@ -1,1988 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/protoToYul.h>
-#include <test/tools/ossfuzz/yulOptimizerFuzzDictionary.h>
-
-#include <libyul/Exceptions.h>
-
-#include <libsolutil/StringUtils.h>
-
-#include <range/v3/algorithm/all_of.hpp>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-#include <range/v3/action/remove_if.hpp>
-
-#include <algorithm>
-
-using namespace std;
-using namespace solidity::yul::test::yul_fuzzer;
-using namespace solidity::yul::test;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity;
-
-string ProtoConverter::dictionaryToken(HexPrefix _p)
-{
-	std::string token;
-	// If dictionary constant is requested while converting
-	// for loop condition, then return zero so that we don't
-	// generate infinite for loops.
-	if (m_inForCond)
-		token = "0";
-	else
-	{
-		unsigned indexVar = m_inputSize * m_inputSize + counter();
-		token = hexDictionary[indexVar % hexDictionary.size()];
-		yulAssert(token.size() <= 64, "Proto Fuzzer: Dictionary token too large");
-	}
-
-	return _p == HexPrefix::Add ? "0x" + token : token;
-}
-
-string ProtoConverter::createHex(string const& _hexBytes)
-{
-	string tmp{_hexBytes};
-	if (!tmp.empty())
-	{
-		ranges::actions::remove_if(tmp, [=](char c) -> bool {
-			return !std::isxdigit(c);
-		});
-		tmp = tmp.substr(0, 64);
-	}
-	// We need this awkward if case because hex literals cannot be empty.
-	// Use a dictionary token.
-	if (tmp.empty())
-		tmp = dictionaryToken(HexPrefix::DontAdd);
-	// Hex literals must have even number of digits
-	if (tmp.size() % 2)
-		tmp.insert(0, "0");
-
-	yulAssert(tmp.size() <= 64, "Proto Fuzzer: Dictionary token too large");
-	return tmp;
-}
-
-string ProtoConverter::createAlphaNum(string const& _strBytes)
-{
-	string tmp{_strBytes};
-	if (!tmp.empty())
-	{
-		ranges::actions::remove_if(tmp, [=](char c) -> bool {
-			return !(std::isalpha(c) || std::isdigit(c));
-		});
-		tmp = tmp.substr(0, 32);
-	}
-	return tmp;
-}
-
-EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
-{
-	switch (_ver)
-	{
-	case Program::HOMESTEAD:
-		return EVMVersion::homestead();
-	case Program::TANGERINE:
-		return EVMVersion::tangerineWhistle();
-	case Program::SPURIOUS:
-		return EVMVersion::spuriousDragon();
-	case Program::BYZANTIUM:
-		return EVMVersion::byzantium();
-	case Program::CONSTANTINOPLE:
-		return EVMVersion::constantinople();
-	case Program::PETERSBURG:
-		return EVMVersion::petersburg();
-	case Program::ISTANBUL:
-		return EVMVersion::istanbul();
-	case Program::BERLIN:
-		return EVMVersion::berlin();
-	case Program::LONDON:
-		return EVMVersion::london();
-	case Program::PARIS:
-		return EVMVersion::paris();
-	}
-}
-
-string ProtoConverter::visit(Literal const& _x)
-{
-	switch (_x.literal_oneof_case())
-	{
-	case Literal::kIntval:
-		return to_string(_x.intval());
-	case Literal::kHexval:
-		return "0x" + createHex(_x.hexval());
-	case Literal::kStrval:
-		return "\"" + createAlphaNum(_x.strval()) + "\"";
-	case Literal::kBoolval:
-		return _x.boolval() ? "true" : "false";
-	case Literal::LITERAL_ONEOF_NOT_SET:
-		return dictionaryToken();
-	}
-}
-
-void ProtoConverter::consolidateVarDeclsInFunctionDef()
-{
-	m_currentFuncVars.clear();
-	yulAssert(!m_funcVars.empty(), "Proto fuzzer: Invalid operation");
-
-	auto const& scopes = m_funcVars.back();
-	for (auto const& s: scopes)
-		for (auto const& var: s)
-			m_currentFuncVars.push_back(&var);
-	yulAssert(!m_funcForLoopInitVars.empty(), "Proto fuzzer: Invalid operation");
-	auto const& forinitscopes = m_funcForLoopInitVars.back();
-	for (auto const& s: forinitscopes)
-		for (auto const& var: s)
-			m_currentFuncVars.push_back(&var);
-}
-
-void ProtoConverter::consolidateGlobalVarDecls()
-{
-	m_currentGlobalVars.clear();
-	// Place pointers to all global variables that are in scope
-	// into a single vector
-	for (auto const& scope: m_globalVars)
-		for (auto const& var: scope)
-			m_currentGlobalVars.push_back(&var);
-	// Place pointers to all variables declared in for-init blocks
-	// that are still live into the same vector
-	for (auto const& init: m_globalForLoopInitVars)
-		for (auto const& var: init)
-			m_currentGlobalVars.push_back(&var);
-}
-
-bool ProtoConverter::varDeclAvailable()
-{
-	if (m_inFunctionDef)
-	{
-		consolidateVarDeclsInFunctionDef();
-		return !m_currentFuncVars.empty();
-	}
-	else
-	{
-		consolidateGlobalVarDecls();
-		return !m_currentGlobalVars.empty();
-	}
-}
-
-void ProtoConverter::visit(VarRef const& _x)
-{
-	if (m_inFunctionDef)
-	{
-		// Ensure that there is at least one variable declaration to reference in function scope.
-		yulAssert(!m_currentFuncVars.empty(), "Proto fuzzer: No variables to reference.");
-		m_output << *m_currentFuncVars[static_cast<size_t>(_x.varnum()) % m_currentFuncVars.size()];
-	}
-	else
-	{
-		// Ensure that there is at least one variable declaration to reference in nested scopes.
-		yulAssert(!m_currentGlobalVars.empty(), "Proto fuzzer: No global variables to reference.");
-		m_output << *m_currentGlobalVars[static_cast<size_t>(_x.varnum()) % m_currentGlobalVars.size()];
-	}
-}
-
-void ProtoConverter::visit(Expression const& _x)
-{
-	switch (_x.expr_oneof_case())
-	{
-	case Expression::kVarref:
-		// If the expression requires a variable reference that we cannot provide
-		// (because there are no variables in scope), we silently output a literal
-		// expression from the optimizer dictionary.
-		if (!varDeclAvailable())
-			m_output << dictionaryToken();
-		else
-			visit(_x.varref());
-		break;
-	case Expression::kCons:
-		// If literal expression describes for-loop condition
-		// then force it to zero, so we don't generate infinite
-		// for loops
-		if (m_inForCond)
-			m_output << "0";
-		else
-			m_output << visit(_x.cons());
-		break;
-	case Expression::kBinop:
-		visit(_x.binop());
-		break;
-	case Expression::kUnop:
-		visit(_x.unop());
-		break;
-	case Expression::kTop:
-		visit(_x.top());
-		break;
-	case Expression::kNop:
-		visit(_x.nop());
-		break;
-	case Expression::kFuncExpr:
-		if (auto v = functionExists(NumFunctionReturns::Single); v.has_value())
-		{
-			string functionName = v.value();
-			visit(_x.func_expr(), functionName, true);
-		}
-		else
-			m_output << dictionaryToken();
-		break;
-	case Expression::kLowcall:
-		visit(_x.lowcall());
-		break;
-	case Expression::kCreate:
-		// Create and create2 return address of created contract which
-		// may lead to state change via sstore of the returned address.
-		if (!m_filterStatefulInstructions)
-			visit(_x.create());
-		else
-			m_output << dictionaryToken();
-		break;
-	case Expression::kUnopdata:
-		// Filter datasize and dataoffset because these instructions may return
-		// a value that is a function of optimisation. Therefore, when run on
-		// an EVM client, the execution traces for unoptimised vs optimised
-		// programs may differ. This ends up as a false-positive bug report.
-		if (m_isObject && !m_filterStatefulInstructions)
-			visit(_x.unopdata());
-		else
-			m_output << dictionaryToken();
-		break;
-	case Expression::EXPR_ONEOF_NOT_SET:
-		m_output << dictionaryToken();
-		break;
-	}
-}
-
-void ProtoConverter::visit(BinaryOp const& _x)
-{
-	BinaryOp_BOp op = _x.op();
-
-	if ((op == BinaryOp::SHL || op == BinaryOp::SHR || op == BinaryOp::SAR) &&
-		!m_evmVersion.hasBitwiseShifting())
-	{
-		m_output << dictionaryToken();
-		return;
-	}
-
-	switch (op)
-	{
-	case BinaryOp::ADD:
-		m_output << "add";
-		break;
-	case BinaryOp::SUB:
-		m_output << "sub";
-		break;
-	case BinaryOp::MUL:
-		m_output << "mul";
-		break;
-	case BinaryOp::DIV:
-		m_output << "div";
-		break;
-	case BinaryOp::MOD:
-		m_output << "mod";
-		break;
-	case BinaryOp::XOR:
-		m_output << "xor";
-		break;
-	case BinaryOp::AND:
-		m_output << "and";
-		break;
-	case BinaryOp::OR:
-		m_output << "or";
-		break;
-	case BinaryOp::EQ:
-		m_output << "eq";
-		break;
-	case BinaryOp::LT:
-		m_output << "lt";
-		break;
-	case BinaryOp::GT:
-		m_output << "gt";
-		break;
-	case BinaryOp::SHR:
-		yulAssert(m_evmVersion.hasBitwiseShifting(), "Proto fuzzer: Invalid evm version");
-		m_output << "shr";
-		break;
-	case BinaryOp::SHL:
-		yulAssert(m_evmVersion.hasBitwiseShifting(), "Proto fuzzer: Invalid evm version");
-		m_output << "shl";
-		break;
-	case BinaryOp::SAR:
-		yulAssert(m_evmVersion.hasBitwiseShifting(), "Proto fuzzer: Invalid evm version");
-		m_output << "sar";
-		break;
-	case BinaryOp::SDIV:
-		m_output << "sdiv";
-		break;
-	case BinaryOp::SMOD:
-		m_output << "smod";
-		break;
-	case BinaryOp::EXP:
-		m_output << "exp";
-		break;
-	case BinaryOp::SLT:
-		m_output << "slt";
-		break;
-	case BinaryOp::SGT:
-		m_output << "sgt";
-		break;
-	case BinaryOp::BYTE:
-		m_output << "byte";
-		break;
-	case BinaryOp::SI:
-		m_output << "signextend";
-		break;
-	case BinaryOp::KECCAK:
-		m_output << "keccak256";
-		break;
-	}
-	m_output << "(";
-	if (op == BinaryOp::KECCAK)
-	{
-		m_output << "mod(";
-		visit(_x.left());
-		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-		m_output << ",";
-		m_output << "mod(";
-		visit(_x.right());
-		m_output << ", " << to_string(s_maxSize) << ")";
-	}
-	else
-	{
-		visit(_x.left());
-		m_output << ",";
-		visit(_x.right());
-	}
-	m_output << ")";
-}
-
-void ProtoConverter::scopeVariables(vector<string> const& _varNames)
-{
-	// If we are inside a for-init block, there are two places
-	// where the visited vardecl may have been defined:
-	// - directly inside the for-init block
-	// - inside a block within the for-init block
-	// In the latter case, we don't scope extend. The flag
-	// m_forInitScopeExtEnabled (= true) indicates whether we are directly
-	// inside a for-init block e.g., for { let x } or (= false) inside a
-	// nested for-init block e.g., for { { let x } }
-	bool forInitScopeExtendVariable = m_inForInitScope && m_forInitScopeExtEnabled;
-
-	// There are four cases that are tackled here
-	// Case 1. We are inside a function definition and the variable declaration's
-	// scope needs to be extended.
-	// Case 2. We are inside a function definition but scope extension is disabled
-	// Case 3. We are inside global scope and scope extension is required
-	// Case 4. We are inside global scope but scope extension is disabled
-	if (m_inFunctionDef)
-	{
-		// Variables declared directly in for-init block
-		// are tracked separately because their scope
-		// extends beyond the block they are defined in
-		// to the rest of the for-loop statement.
-		// Case 1
-		if (forInitScopeExtendVariable)
-		{
-			yulAssert(
-				!m_funcForLoopInitVars.empty() && !m_funcForLoopInitVars.back().empty(),
-				"Proto fuzzer: Invalid operation"
-			);
-			for (auto const& varName: _varNames)
-				m_funcForLoopInitVars.back().back().push_back(varName);
-		}
-		// Case 2
-		else
-		{
-			yulAssert(
-				!m_funcVars.empty() && !m_funcVars.back().empty(),
-				"Proto fuzzer: Invalid operation"
-			);
-			for (auto const& varName: _varNames)
-				m_funcVars.back().back().push_back(varName);
-		}
-	}
-	// If m_inFunctionDef is false, we are in global scope
-	else
-	{
-		// Case 3
-		if (forInitScopeExtendVariable)
-		{
-			yulAssert(!m_globalForLoopInitVars.empty(), "Proto fuzzer: Invalid operation");
-
-			for (auto const& varName: _varNames)
-				m_globalForLoopInitVars.back().push_back(varName);
-		}
-		// Case 4
-		else
-		{
-			yulAssert(!m_globalVars.empty(), "Proto fuzzer: Invalid operation");
-
-			for (auto const& varName: _varNames)
-				m_globalVars.back().push_back(varName);
-		}
-	}
-}
-
-void ProtoConverter::visit(VarDecl const& _x)
-{
-	string varName = newVarName();
-	m_output << "let " << varName << " := ";
-	visit(_x.expr());
-	m_output << "\n";
-	scopeVariables({varName});
-}
-
-void ProtoConverter::visit(MultiVarDecl const& _x)
-{
-	m_output << "let ";
-	vector<string> varNames;
-	// We support up to 4 variables in a single
-	// declaration statement.
-	unsigned numVars = _x.num_vars() % 3 + 2;
-	string delimiter;
-	for (unsigned i = 0; i < numVars; i++)
-	{
-		string varName = newVarName();
-		varNames.push_back(varName);
-		m_output << delimiter << varName;
-		if (i == 0)
-			delimiter = ", ";
-	}
-	m_output << "\n";
-	scopeVariables(varNames);
-}
-
-void ProtoConverter::visit(TypedVarDecl const& _x)
-{
-	string varName = newVarName();
-	m_output << "let " << varName;
-	switch (_x.type())
-	{
-	case TypedVarDecl::BOOL:
-		m_output << ": bool := ";
-		visit(_x.expr());
-		m_output << " : bool\n";
-		break;
-	case TypedVarDecl::S8:
-		m_output << ": s8 := ";
-		visit(_x.expr());
-		m_output << " : s8\n";
-		break;
-	case TypedVarDecl::S32:
-		m_output << ": s32 := ";
-		visit(_x.expr());
-		m_output << " : s32\n";
-		break;
-	case TypedVarDecl::S64:
-		m_output << ": s64 := ";
-		visit(_x.expr());
-		m_output << " : s64\n";
-		break;
-	case TypedVarDecl::S128:
-		m_output << ": s128 := ";
-		visit(_x.expr());
-		m_output << " : s128\n";
-		break;
-	case TypedVarDecl::S256:
-		m_output << ": s256 := ";
-		visit(_x.expr());
-		m_output << " : s256\n";
-		break;
-	case TypedVarDecl::U8:
-		m_output << ": u8 := ";
-		visit(_x.expr());
-		m_output << " : u8\n";
-		break;
-	case TypedVarDecl::U32:
-		m_output << ": u32 := ";
-		visit(_x.expr());
-		m_output << " : u32\n";
-		break;
-	case TypedVarDecl::U64:
-		m_output << ": u64 := ";
-		visit(_x.expr());
-		m_output << " : u64\n";
-		break;
-	case TypedVarDecl::U128:
-		m_output << ": u128 := ";
-		visit(_x.expr());
-		m_output << " : u128\n";
-		break;
-	case TypedVarDecl::U256:
-		m_output << ": u256 := ";
-		visit(_x.expr());
-		m_output << " : u256\n";
-		break;
-	}
-	// If we are inside a for-init block, there are two places
-	// where the visited vardecl may have been defined:
-	// - directly inside the for-init block
-	// - inside a block within the for-init block
-	// In the latter case, we don't scope extend.
-	if (m_inFunctionDef)
-	{
-		// Variables declared directly in for-init block
-		// are tracked separately because their scope
-		// extends beyond the block they are defined in
-		// to the rest of the for-loop statement.
-		if (m_inForInitScope && m_forInitScopeExtEnabled)
-		{
-			yulAssert(
-				!m_funcForLoopInitVars.empty() && !m_funcForLoopInitVars.back().empty(),
-				"Proto fuzzer: Invalid operation"
-			);
-			m_funcForLoopInitVars.back().back().push_back(varName);
-		}
-		else
-		{
-			yulAssert(
-				!m_funcVars.empty() && !m_funcVars.back().empty(),
-				"Proto fuzzer: Invalid operation"
-			);
-			m_funcVars.back().back().push_back(varName);
-		}
-	}
-	else
-	{
-		if (m_inForInitScope && m_forInitScopeExtEnabled)
-		{
-			yulAssert(
-				!m_globalForLoopInitVars.empty(),
-				"Proto fuzzer: Invalid operation"
-			);
-			m_globalForLoopInitVars.back().push_back(varName);
-		}
-		else
-		{
-			yulAssert(
-				!m_globalVars.empty(),
-				"Proto fuzzer: Invalid operation"
-			);
-			m_globalVars.back().push_back(varName);
-		}
-	}
-}
-
-void ProtoConverter::visit(UnaryOp const& _x)
-{
-	UnaryOp_UOp op = _x.op();
-
-	// Replace calls to extcodehash on unsupported EVMs with a dictionary
-	// token.
-	if (op == UnaryOp::EXTCODEHASH && !m_evmVersion.hasExtCodeHash())
-	{
-		m_output << dictionaryToken();
-		return;
-	}
-
-	// The following instructions may lead to change of EVM state and are hence
-	// excluded to avoid false positives.
-	if (
-		m_filterStatefulInstructions &&
-		(
-			op == UnaryOp::EXTCODEHASH ||
-			op == UnaryOp::EXTCODESIZE ||
-			op == UnaryOp::BALANCE ||
-			op == UnaryOp::BLOCKHASH
-		)
-	)
-	{
-		m_output << dictionaryToken();
-		return;
-	}
-
-	switch (op)
-	{
-	case UnaryOp::NOT:
-		m_output << "not";
-		break;
-	case UnaryOp::MLOAD:
-		m_output << "mload";
-		break;
-	case UnaryOp::SLOAD:
-		m_output << "sload";
-		break;
-	case UnaryOp::ISZERO:
-		m_output << "iszero";
-		break;
-	case UnaryOp::CALLDATALOAD:
-		m_output << "calldataload";
-		break;
-	case UnaryOp::EXTCODESIZE:
-		m_output << "extcodesize";
-		break;
-	case UnaryOp::EXTCODEHASH:
-		m_output << "extcodehash";
-		break;
-	case UnaryOp::BALANCE:
-		m_output << "balance";
-		break;
-	case UnaryOp::BLOCKHASH:
-		m_output << "blockhash";
-		break;
-	}
-	m_output << "(";
-	if (op == UnaryOp::MLOAD)
-	{
-		m_output << "mod(";
-		visit(_x.operand());
-		m_output << ", " << to_string(s_maxMemory - 32) << ")";
-	}
-	else
-		visit(_x.operand());
-	m_output << ")";
-}
-
-void ProtoConverter::visit(TernaryOp const& _x)
-{
-	switch (_x.op())
-	{
-	case TernaryOp::ADDM:
-		m_output << "addmod";
-		break;
-	case TernaryOp::MULM:
-		m_output << "mulmod";
-		break;
-	}
-	m_output << "(";
-	visit(_x.arg1());
-	m_output << ", ";
-	visit(_x.arg2());
-	m_output << ", ";
-	visit(_x.arg3());
-	m_output << ")";
-}
-
-void ProtoConverter::visit(NullaryOp const& _x)
-{
-	auto op = _x.op();
-	// The following instructions may lead to a change in EVM state and are
-	// excluded to avoid false positive reports.
-	if (
-		m_filterStatefulInstructions &&
-		(
-			op == NullaryOp::GAS ||
-			op == NullaryOp::CODESIZE ||
-			op == NullaryOp::ADDRESS ||
-			op == NullaryOp::TIMESTAMP ||
-			op == NullaryOp::NUMBER ||
-			op == NullaryOp::DIFFICULTY
-		)
-	)
-	{
-		m_output << dictionaryToken();
-		return;
-	}
-
-	switch (op)
-	{
-	case NullaryOp::MSIZE:
-		m_output << "msize()";
-		break;
-	case NullaryOp::GAS:
-		m_output << "gas()";
-		break;
-	case NullaryOp::CALLDATASIZE:
-		m_output << "calldatasize()";
-		break;
-	case NullaryOp::CODESIZE:
-		m_output << "codesize()";
-		break;
-	case NullaryOp::RETURNDATASIZE:
-		// If evm supports returndatasize, we generate it. Otherwise,
-		// we output a dictionary token.
-		if (m_evmVersion.supportsReturndata())
-			m_output << "returndatasize()";
-		else
-			m_output << dictionaryToken();
-		break;
-	case NullaryOp::ADDRESS:
-		m_output << "address()";
-		break;
-	case NullaryOp::ORIGIN:
-		m_output << "origin()";
-		break;
-	case NullaryOp::CALLER:
-		m_output << "caller()";
-		break;
-	case NullaryOp::CALLVALUE:
-		m_output << "callvalue()";
-		break;
-	case NullaryOp::GASPRICE:
-		m_output << "gasprice()";
-		break;
-	case NullaryOp::COINBASE:
-		m_output << "coinbase()";
-		break;
-	case NullaryOp::TIMESTAMP:
-		m_output << "timestamp()";
-		break;
-	case NullaryOp::NUMBER:
-		m_output << "number()";
-		break;
-	case NullaryOp::DIFFICULTY:
-		if (m_evmVersion >= EVMVersion::paris())
-			m_output << "prevrandao()";
-		else
-			m_output << "difficulty()";
-		break;
-	case NullaryOp::GASLIMIT:
-		m_output << "gaslimit()";
-		break;
-	case NullaryOp::SELFBALANCE:
-		// Replace calls to selfbalance() on unsupported EVMs with a dictionary
-		// token.
-		if (m_evmVersion.hasSelfBalance())
-			m_output << "selfbalance()";
-		else
-			m_output << dictionaryToken();
-		break;
-	case NullaryOp::CHAINID:
-		// Replace calls to chainid() on unsupported EVMs with a dictionary
-		// token.
-		if (m_evmVersion.hasChainID())
-			m_output << "chainid()";
-		else
-			m_output << dictionaryToken();
-		break;
-	}
-}
-
-void ProtoConverter::visit(CopyFunc const& _x)
-{
-	CopyFunc_CopyType type = _x.ct();
-
-	// datacopy() is valid only if we are inside
-	// a Yul object.
-	if (type == CopyFunc::DATA && !m_isObject)
-		return;
-
-	// We don't generate code if the copy function is returndatacopy
-	// and the underlying evm does not support it.
-	if (type == CopyFunc::RETURNDATA && !m_evmVersion.supportsReturndata())
-		return;
-
-	// Code copy may change state if e.g., some byte of code
-	// is stored to storage via a sequence of mload and sstore.
-	if (m_filterStatefulInstructions && type == CopyFunc::CODE)
-		return;
-
-	switch (type)
-	{
-	case CopyFunc::CALLDATA:
-		m_output << "calldatacopy";
-		break;
-	case CopyFunc::CODE:
-		m_output << "codecopy";
-		break;
-	case CopyFunc::RETURNDATA:
-		yulAssert(m_evmVersion.supportsReturndata(), "Proto fuzzer: Invalid evm version");
-		m_output << "returndatacopy";
-		break;
-	case CopyFunc::DATA:
-		m_output << "datacopy";
-		break;
-	}
-	m_output << "(";
-	m_output << "mod(";
-	visit(_x.target());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-	m_output << ", ";
-	visit(_x.source());
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
-	m_output << ")\n";
-}
-
-void ProtoConverter::visit(ExtCodeCopy const& _x)
-{
-	m_output << "extcodecopy";
-	m_output << "(";
-	visit(_x.addr());
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.target());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-	m_output << ", ";
-	visit(_x.source());
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
-	m_output << ")\n";
-}
-
-void ProtoConverter::visit(LogFunc const& _x)
-{
-	auto visitPosAndSize = [&](LogFunc const& _y) {
-		m_output << "mod(";
-		visit(_y.pos());
-		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-		m_output << ", ";
-		m_output << "mod(";
-		visit(_y.size());
-		m_output << ", " << to_string(s_maxSize) << ")";
-	};
-
-	switch (_x.num_topics())
-	{
-	case LogFunc::ZERO:
-		m_output << "log0";
-		m_output << "(";
-		visitPosAndSize(_x);
-		m_output << ")\n";
-		break;
-	case LogFunc::ONE:
-		m_output << "log1";
-		m_output << "(";
-		visitPosAndSize(_x);
-		m_output << ", ";
-		visit(_x.t1());
-		m_output << ")\n";
-		break;
-	case LogFunc::TWO:
-		m_output << "log2";
-		m_output << "(";
-		visitPosAndSize(_x);
-		m_output << ", ";
-		visit(_x.t1());
-		m_output << ", ";
-		visit(_x.t2());
-		m_output << ")\n";
-		break;
-	case LogFunc::THREE:
-		m_output << "log3";
-		m_output << "(";
-		visitPosAndSize(_x);
-		m_output << ", ";
-		visit(_x.t1());
-		m_output << ", ";
-		visit(_x.t2());
-		m_output << ", ";
-		visit(_x.t3());
-		m_output << ")\n";
-		break;
-	case LogFunc::FOUR:
-		m_output << "log4";
-		m_output << "(";
-		visitPosAndSize(_x);
-		m_output << ", ";
-		visit(_x.t1());
-		m_output << ", ";
-		visit(_x.t2());
-		m_output << ", ";
-		visit(_x.t3());
-		m_output << ", ";
-		visit(_x.t4());
-		m_output << ")\n";
-		break;
-	}
-}
-
-void ProtoConverter::visit(AssignmentStatement const& _x)
-{
-	visit(_x.ref_id());
-	m_output << " := ";
-	visit(_x.expr());
-	m_output << "\n";
-}
-
-void ProtoConverter::visitFunctionInputParams(FunctionCall const& _x, unsigned _numInputParams)
-{
-	// We reverse the order of function input visits since it helps keep this switch case concise.
-	switch (_numInputParams)
-	{
-	case 4:
-		visit(_x.in_param4());
-		m_output << ", ";
-		[[fallthrough]];
-	case 3:
-		visit(_x.in_param3());
-		m_output << ", ";
-		[[fallthrough]];
-	case 2:
-		visit(_x.in_param2());
-		m_output << ", ";
-		[[fallthrough]];
-	case 1:
-		visit(_x.in_param1());
-		[[fallthrough]];
-	case 0:
-		break;
-	default:
-		yulAssert(false, "Proto fuzzer: Function call with too many input parameters.");
-		break;
-	}
-}
-
-void ProtoConverter::convertFunctionCall(
-	FunctionCall const& _x,
-	string const& _name,
-	unsigned _numInParams,
-	bool _newLine
-)
-{
-	m_output << _name << "(";
-	visitFunctionInputParams(_x, _numInParams);
-	m_output << ")";
-	if (_newLine)
-		m_output << "\n";
-}
-
-vector<string> ProtoConverter::createVarDecls(unsigned _start, unsigned _end, bool _isAssignment)
-{
-	m_output << "let ";
-	vector<string> varsVec = createVars(_start, _end);
-	if (_isAssignment)
-		m_output << " := ";
-	else
-		m_output << "\n";
-	return varsVec;
-}
-
-optional<string> ProtoConverter::functionExists(NumFunctionReturns _numReturns)
-{
-	for (auto const& item: m_functionSigMap)
-		if (_numReturns == NumFunctionReturns::None || _numReturns == NumFunctionReturns::Single)
-		{
-			if (item.second.second == static_cast<unsigned>(_numReturns))
-				return item.first;
-		}
-		else
-		{
-			if (item.second.second >= static_cast<unsigned>(_numReturns))
-				return item.first;
-		}
-	return nullopt;
-}
-
-void ProtoConverter::visit(FunctionCall const& _x, string const& _functionName, bool _expression)
-{
-	yulAssert(m_functionSigMap.count(_functionName), "Proto fuzzer: Invalid function.");
-	auto ret = m_functionSigMap.at(_functionName);
-	unsigned numInParams = ret.first;
-	unsigned numOutParams = ret.second;
-
-	if (numOutParams == 0)
-	{
-		convertFunctionCall(_x, _functionName, numInParams);
-		return;
-	}
-	else
-	{
-		yulAssert(numOutParams > 0, "");
-		vector<string> varsVec;
-		if (!_expression)
-		{
-			// Obtain variable name suffix
-			unsigned startIdx = counter();
-			varsVec = createVarDecls(
-				startIdx,
-				startIdx + numOutParams,
-				/*isAssignment=*/true
-			);
-		}
-		convertFunctionCall(_x, _functionName, numInParams);
-		// Add newly minted vars in the multidecl statement to current scope
-		if (!_expression)
-			addVarsToScope(varsVec);
-	}
-}
-
-void ProtoConverter::visit(LowLevelCall const& _x)
-{
-	LowLevelCall_Type type = _x.callty();
-
-	// Generate staticcall if it is supported by the underlying evm
-	if (type == LowLevelCall::STATICCALL && !m_evmVersion.hasStaticCall())
-	{
-		// Since staticcall is supposed to return 0 on success and 1 on
-		// failure, we can use counter value to emulate it
-		m_output << ((counter() % 2) ? "0" : "1");
-		return;
-	}
-
-	switch (type)
-	{
-	case LowLevelCall::CALL:
-		m_output << "call(";
-		break;
-	case LowLevelCall::CALLCODE:
-		m_output << "callcode(";
-		break;
-	case LowLevelCall::DELEGATECALL:
-		m_output << "delegatecall(";
-		break;
-	case LowLevelCall::STATICCALL:
-		yulAssert(m_evmVersion.hasStaticCall(), "Proto fuzzer: Invalid evm version");
-		m_output << "staticcall(";
-		break;
-	}
-	visit(_x.gas());
-	m_output << ", ";
-	visit(_x.addr());
-	m_output << ", ";
-	if (type == LowLevelCall::CALL || type == LowLevelCall::CALLCODE)
-	{
-		visit(_x.wei());
-		m_output << ", ";
-	}
-	m_output << "mod(";
-	visit(_x.in());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.insize());
-	m_output << ", " << to_string(s_maxSize) << ")";
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.out());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.outsize());
-	m_output << ", " << to_string(s_maxSize) << ")";
-	m_output << ")";
-}
-
-void ProtoConverter::visit(Create const& _x)
-{
-	Create_Type type = _x.createty();
-
-	// Replace a call to create2 on unsupported EVMs with a dictionary
-	// token.
-	if (type == Create::CREATE2 && !m_evmVersion.hasCreate2())
-	{
-		m_output << dictionaryToken();
-		return;
-	}
-
-	switch (type)
-	{
-	case Create::CREATE:
-		m_output << "create(";
-		break;
-	case Create::CREATE2:
-		m_output << "create2(";
-		break;
-	}
-	visit(_x.wei());
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.position());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
-	if (type == Create::CREATE2)
-	{
-		m_output << ", ";
-		visit(_x.value());
-	}
-	m_output << ")";
-}
-
-void ProtoConverter::visit(IfStmt const& _x)
-{
-	m_output << "if ";
-	visit(_x.cond());
-	m_output << " ";
-	visit(_x.if_body());
-}
-
-void ProtoConverter::visit(StoreFunc const& _x)
-{
-	auto storeType = _x.st();
-	switch (storeType)
-	{
-	case StoreFunc::MSTORE:
-		m_output << "mstore(";
-		break;
-	case StoreFunc::SSTORE:
-		m_output << "sstore(";
-		break;
-	case StoreFunc::MSTORE8:
-		m_output << "mstore8(";
-		break;
-	}
-	// Write to memory within bounds, storage is unbounded
-	if (storeType == StoreFunc::SSTORE)
-		visit(_x.loc());
-	else if (storeType == StoreFunc::MSTORE8)
-	{
-		m_output << "mod(";
-		visit(_x.loc());
-		m_output << ", " << to_string(s_maxMemory) << ")";
-	}
-	else if (storeType == StoreFunc::MSTORE)
-	{
-		// Since we write 32 bytes, ensure it does not exceed
-		// upper bound on memory.
-		m_output << "mod(";
-		visit(_x.loc());
-		m_output << ", " << to_string(s_maxMemory - 32) << ")";
-
-	}
-	m_output << ", ";
-	visit(_x.val());
-	m_output << ")\n";
-}
-
-void ProtoConverter::visit(ForStmt const& _x)
-{
-	if (++m_numForLoops > s_maxForLoops)
-		return;
-	bool wasInForBody = m_inForBodyScope;
-	bool wasInForInit = m_inForInitScope;
-	bool wasForInitScopeExtEnabled = m_forInitScopeExtEnabled;
-	m_inForBodyScope = false;
-	m_inForInitScope = true;
-	m_forInitScopeExtEnabled = true;
-	m_inForCond = false;
-	m_output << "for ";
-	visit(_x.for_init());
-	m_inForInitScope = false;
-	m_forInitScopeExtEnabled = wasForInitScopeExtEnabled;
-	m_inForCond = true;
-	visit(_x.for_cond());
-	m_inForCond = false;
-	visit(_x.for_post());
-	m_inForBodyScope = true;
-	visit(_x.for_body());
-	m_inForBodyScope = wasInForBody;
-	m_inForInitScope = wasInForInit;
-	if (m_inFunctionDef)
-	{
-		yulAssert(
-			!m_funcForLoopInitVars.empty() && !m_funcForLoopInitVars.back().empty(),
-			"Proto fuzzer: Invalid data structure"
-		);
-		// Remove variables in for-init
-		m_funcForLoopInitVars.back().pop_back();
-	}
-	else
-	{
-		yulAssert(!m_globalForLoopInitVars.empty(), "Proto fuzzer: Invalid data structure");
-		m_globalForLoopInitVars.pop_back();
-	}
-}
-
-void ProtoConverter::visit(BoundedForStmt const& _x)
-{
-	if (++m_numForLoops > s_maxForLoops)
-		return;
-
-	// Boilerplate for loop that limits the number of iterations to a maximum of 4.
-	std::string loopVarName("i_" + std::to_string(m_numNestedForLoops++));
-	m_output << "for { let " << loopVarName << " := 0 } "
-	       << "lt(" << loopVarName << ", 0x60) "
-	       << "{ " << loopVarName << " := add(" << loopVarName << ", 0x20) } ";
-	// Store previous for body scope
-	bool wasInForBody = m_inForBodyScope;
-	bool wasInForInit = m_inForInitScope;
-	m_inForBodyScope = true;
-	m_inForInitScope = false;
-	visit(_x.for_body());
-	// Restore previous for body scope and init
-	m_inForBodyScope = wasInForBody;
-	m_inForInitScope = wasInForInit;
-}
-
-void ProtoConverter::visit(CaseStmt const& _x)
-{
-	string literal = visit(_x.case_lit());
-	// u256 value of literal
-	u256 literalVal;
-
-	// Convert string to u256 before looking for duplicate case literals
-	if (_x.case_lit().has_strval())
-	{
-		// Since string literals returned by the Literal visitor are enclosed within
-		// double quotes (like this "\"<string>\""), their size is at least two in the worst case
-		// that <string> is empty. Here we assert this invariant.
-		yulAssert(literal.size() >= 2, "Proto fuzzer: String literal too short");
-		// This variable stores the <string> part i.e., literal minus the first and last
-		// double quote characters. This is used to compute the keccak256 hash of the
-		// string literal. The hashing is done to check whether we are about to create
-		// a case statement containing a case literal that has already been used in a
-		// previous case statement. If the hash (u256 value) matches a previous hash,
-		// then we simply don't create a new case statement.
-		string noDoubleQuoteStr;
-		if (literal.size() > 2)
-		{
-			// Ensure that all characters in the string literal except the first
-			// and the last (double quote characters) are alphanumeric.
-			yulAssert(
-				ranges::all_of(
-					literal.begin() + 1,
-					literal.end() - 2,
-					[=](char c) { return isalpha(c) || isdigit(c); }),
-				"Proto fuzzer: Invalid string literal encountered"
-			);
-
-			// Make a copy because literal will need to be used later
-			noDoubleQuoteStr = literal.substr(1, literal.size() - 2);
-		}
-		// Hash the result to check for duplicate case literal strings
-		literalVal = u256(h256(noDoubleQuoteStr, h256::FromBinary, h256::AlignLeft));
-
-		// Make sure that an empty string literal evaluates to zero. This is to detect creation of
-		// duplicate case literals like so
-		// switch (x)
-		// {
-		//    case "": { x := 0 }
-		//    case 0: { x:= 1 } // Case statement with duplicate literal is invalid
-		// } // This snippet will not be parsed successfully.
-		if (noDoubleQuoteStr.empty())
-			yulAssert(literalVal == 0, "Proto fuzzer: Empty string does not evaluate to zero");
-	}
-	else if (_x.case_lit().has_boolval())
-		literalVal = _x.case_lit().boolval() ? u256(1) : u256(0);
-	else
-		literalVal = u256(literal);
-
-	// Check if set insertion fails (case literal present) or succeeds (case literal
-	// absent).
-	bool isUnique = m_switchLiteralSetPerScope.top().insert(literalVal).second;
-
-	// It is fine to bail out if we encounter a duplicate case literal because
-	// we can be assured that the switch statement is well-formed i.e., contains
-	// at least one case statement or a default block.
-	if (isUnique)
-	{
-		m_output << "case " << literal << " ";
-		visit(_x.case_block());
-	}
-}
-
-void ProtoConverter::visit(SwitchStmt const& _x)
-{
-	if (_x.case_stmt_size() > 0 || _x.has_default_block())
-	{
-		std::set<u256> s;
-		m_switchLiteralSetPerScope.push(s);
-		m_output << "switch ";
-		visit(_x.switch_expr());
-		m_output << "\n";
-
-		for (auto const& caseStmt: _x.case_stmt())
-			visit(caseStmt);
-
-		m_switchLiteralSetPerScope.pop();
-
-		if (_x.has_default_block())
-		{
-			m_output << "default ";
-			visit(_x.default_block());
-		}
-	}
-}
-
-void ProtoConverter::visit(StopInvalidStmt const& _x)
-{
-	switch (_x.stmt())
-	{
-	case StopInvalidStmt::STOP:
-		m_output << "stop()\n";
-		break;
-	case StopInvalidStmt::INVALID:
-		m_output << "invalid()\n";
-		break;
-	}
-}
-
-void ProtoConverter::visit(RetRevStmt const& _x)
-{
-	switch (_x.stmt())
-	{
-	case RetRevStmt::RETURN:
-		m_output << "return";
-		break;
-	case RetRevStmt::REVERT:
-		m_output << "revert";
-		break;
-	}
-	m_output << "(";
-	m_output << "mod(";
-	visit(_x.pos());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
-	m_output << ", ";
-	m_output << "mod(";
-	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
-	m_output << ")\n";
-}
-
-void ProtoConverter::visit(SelfDestructStmt const& _x)
-{
-	m_output << "selfdestruct";
-	m_output << "(";
-	visit(_x.addr());
-	m_output << ")\n";
-}
-
-void ProtoConverter::visit(TerminatingStmt const& _x)
-{
-	switch (_x.term_oneof_case())
-	{
-	case TerminatingStmt::kStopInvalid:
-		visit(_x.stop_invalid());
-		break;
-	case TerminatingStmt::kRetRev:
-		visit(_x.ret_rev());
-		break;
-	case TerminatingStmt::kSelfDes:
-		visit(_x.self_des());
-		break;
-	case TerminatingStmt::TERM_ONEOF_NOT_SET:
-		break;
-	}
-}
-
-void ProtoConverter::visit(UnaryOpData const& _x)
-{
-	switch (_x.op())
-	{
-	case UnaryOpData::SIZE:
-		m_output << Whiskers(R"(datasize("<id>"))")
-			("id", getObjectIdentifier(static_cast<unsigned>(_x.identifier())))
-			.render();
-		break;
-	case UnaryOpData::OFFSET:
-		m_output << Whiskers(R"(dataoffset("<id>"))")
-			("id", getObjectIdentifier(static_cast<unsigned>(_x.identifier())))
-			.render();
-		break;
-	}
-}
-
-void ProtoConverter::visit(Statement const& _x)
-{
-	switch (_x.stmt_oneof_case())
-	{
-	case Statement::kDecl:
-		visit(_x.decl());
-		break;
-	case Statement::kAssignment:
-		// Create an assignment statement only if there is at least one variable
-		// declaration that is in scope.
-		if (varDeclAvailable())
-			visit(_x.assignment());
-		break;
-	case Statement::kIfstmt:
-		if (_x.ifstmt().if_body().statements_size() > 0)
-			visit(_x.ifstmt());
-		break;
-	case Statement::kStorageFunc:
-		visit(_x.storage_func());
-		break;
-	case Statement::kBlockstmt:
-		if (_x.blockstmt().statements_size() > 0)
-			visit(_x.blockstmt());
-		break;
-	case Statement::kForstmt:
-		if (_x.forstmt().for_body().statements_size() > 0 && !m_filterUnboundedLoops)
-			visit(_x.forstmt());
-		break;
-	case Statement::kBoundedforstmt:
-		if (_x.boundedforstmt().for_body().statements_size() > 0)
-			visit(_x.boundedforstmt());
-		break;
-	case Statement::kSwitchstmt:
-		visit(_x.switchstmt());
-		break;
-	case Statement::kBreakstmt:
-		if (m_inForBodyScope)
-			m_output << "break\n";
-		break;
-	case Statement::kContstmt:
-		if (m_inForBodyScope)
-			m_output << "continue\n";
-		break;
-	case Statement::kLogFunc:
-		// Log is a stateful statement since it writes to storage.
-		if (!m_filterStatefulInstructions)
-			visit(_x.log_func());
-		break;
-	case Statement::kCopyFunc:
-		visit(_x.copy_func());
-		break;
-	case Statement::kExtcodeCopy:
-		// Extcodecopy may change state if external code is copied via a
-		// sequence of mload/sstore.
-		if (!m_filterStatefulInstructions)
-			visit(_x.extcode_copy());
-		break;
-	case Statement::kTerminatestmt:
-		visit(_x.terminatestmt());
-		break;
-	case Statement::kFunctioncall:
-		if (!m_functionSigMap.empty())
-		{
-			unsigned index = counter() % m_functionSigMap.size();
-			auto iter = m_functionSigMap.begin();
-			advance(iter, index);
-			visit(_x.functioncall(), iter->first);
-		}
-		break;
-	case Statement::kFuncdef:
-		if (_x.funcdef().block().statements_size() > 0)
-			if (!m_inForInitScope)
-				visit(_x.funcdef());
-		break;
-	case Statement::kPop:
-		visit(_x.pop());
-		break;
-	case Statement::kLeave:
-		if (m_inFunctionDef)
-			visit(_x.leave());
-		break;
-	case Statement::kMultidecl:
-		visit(_x.multidecl());
-		break;
-	case Statement::STMT_ONEOF_NOT_SET:
-		break;
-	}
-}
-
-void ProtoConverter::openBlockScope()
-{
-	m_scopeFuncs.emplace_back();
-
-	// Create new block scope inside current function scope
-	if (m_inFunctionDef)
-	{
-		yulAssert(
-			!m_funcVars.empty(),
-			"Proto fuzzer: Invalid data structure"
-		);
-		m_funcVars.back().push_back(vector<string>{});
-		if (m_inForInitScope && m_forInitScopeExtEnabled)
-		{
-			yulAssert(
-				!m_funcForLoopInitVars.empty(),
-				"Proto fuzzer: Invalid data structure"
-			);
-			m_funcForLoopInitVars.back().push_back(vector<string>{});
-		}
-	}
-	else
-	{
-		m_globalVars.emplace_back();
-		if (m_inForInitScope && m_forInitScopeExtEnabled)
-			m_globalForLoopInitVars.emplace_back();
-	}
-}
-
-void ProtoConverter::openFunctionScope(vector<string> const& _funcParams)
-{
-	m_funcVars.push_back(vector<vector<string>>({_funcParams}));
-	m_funcForLoopInitVars.push_back(vector<vector<string>>({}));
-}
-
-void ProtoConverter::updateFunctionMaps(string const& _var)
-{
-	size_t erased = m_functionSigMap.erase(_var);
-
-	for (auto const& i: m_functionDefMap)
-		if (i.second == _var)
-		{
-			erased += m_functionDefMap.erase(i.first);
-			break;
-		}
-
-	yulAssert(erased == 2, "Proto fuzzer: Function maps not updated");
-}
-
-void ProtoConverter::closeBlockScope()
-{
-	// Remove functions declared in the block that is going
-	// out of scope from the global function map.
-	for (auto const& f: m_scopeFuncs.back())
-	{
-		size_t numFuncsRemoved = m_functions.size();
-		m_functions.erase(remove(m_functions.begin(), m_functions.end(), f), m_functions.end());
-		numFuncsRemoved -= m_functions.size();
-		yulAssert(
-			numFuncsRemoved == 1,
-			"Proto fuzzer: Nothing or too much went out of scope"
-		);
-		updateFunctionMaps(f);
-	}
-	// Pop back the vector of scoped functions.
-	if (!m_scopeFuncs.empty())
-		m_scopeFuncs.pop_back();
-
-	// If block belongs to function body, then remove
-	// local variables in function body that are going out of scope.
-	if (m_inFunctionDef)
-	{
-		yulAssert(!m_funcVars.empty(), "Proto fuzzer: Invalid data structure");
-		if (!m_funcVars.back().empty())
-			m_funcVars.back().pop_back();
-	}
-	// Remove variables declared in vanilla block from current
-	// global scope.
-	else
-	{
-		yulAssert(!m_globalVars.empty(), "Proto fuzzer: Invalid data structure");
-		m_globalVars.pop_back();
-	}
-}
-
-void ProtoConverter::closeFunctionScope()
-{
-	yulAssert(!m_funcVars.empty(), "Proto fuzzer: Invalid data structure");
-	m_funcVars.pop_back();
-	yulAssert(!m_funcForLoopInitVars.empty(), "Proto fuzzer: Invalid data structure");
-	m_funcForLoopInitVars.pop_back();
-}
-
-void ProtoConverter::addVarsToScope(vector<string> const& _vars)
-{
-	// If we are in function definition, add the new vars to current function scope
-	if (m_inFunctionDef)
-	{
-		// If we are directly in for-init block, add the newly created vars to the
-		// stack of for-init variables.
-		if (m_inForInitScope && m_forInitScopeExtEnabled)
-		{
-			yulAssert(
-				!m_funcForLoopInitVars.empty() && !m_funcForLoopInitVars.back().empty(),
-				"Proto fuzzer: Invalid data structure"
-			);
-			m_funcForLoopInitVars.back().back().insert(
-				m_funcForLoopInitVars.back().back().end(),
-				_vars.begin(),
-				_vars.end()
-			);
-		}
-		else
-		{
-			yulAssert(
-				!m_funcVars.empty() && !m_funcVars.back().empty(),
-				"Proto fuzzer: Invalid data structure"
-			);
-			m_funcVars.back().back().insert(
-				m_funcVars.back().back().end(),
-				_vars.begin(),
-				_vars.end()
-			);
-		}
-	}
-	// If we are in a vanilla block, add the new vars to current global scope
-	else
-	{
-		if (m_inForInitScope && m_forInitScopeExtEnabled)
-		{
-			yulAssert(
-				!m_globalForLoopInitVars.empty(),
-				"Proto fuzzer: Invalid data structure"
-			);
-			m_globalForLoopInitVars.back().insert(
-				m_globalForLoopInitVars.back().end(),
-				_vars.begin(),
-				_vars.end()
-			);
-		}
-		else
-		{
-			yulAssert(
-				!m_globalVars.empty(),
-				"Proto fuzzer: Invalid data structure"
-			);
-			m_globalVars.back().insert(
-				m_globalVars.back().end(),
-				_vars.begin(),
-				_vars.end()
-			);
-		}
-	}
-}
-
-void ProtoConverter::visit(Block const& _x)
-{
-	openBlockScope();
-
-	// Register function declarations in this scope unless this
-	// scope belongs to for-init (in which function declarations
-	// are forbidden).
-	for (auto const& statement: _x.statements())
-		if (statement.has_funcdef() && statement.funcdef().block().statements_size() > 0 && !m_inForInitScope)
-			registerFunction(&statement.funcdef());
-
-	if (_x.statements_size() > 0)
-	{
-		m_output << "{\n";
-		bool wasForInitScopeExtEnabled = m_forInitScopeExtEnabled;
-		for (auto const& st: _x.statements())
-		{
-			// If statement is block or introduces one and we are in for-init block
-			// then temporarily disable scope extension if it is not already disabled.
-			if (
-				(st.has_blockstmt() || st.has_switchstmt() || st.has_ifstmt()) &&
-				m_inForInitScope &&
-				m_forInitScopeExtEnabled
-			)
-				m_forInitScopeExtEnabled = false;
-			visit(st);
-			m_forInitScopeExtEnabled = wasForInitScopeExtEnabled;
-		}
-		m_output << "}\n";
-	}
-	else
-		m_output << "{}\n";
-	closeBlockScope();
-}
-
-vector<string> ProtoConverter::createVars(unsigned _startIdx, unsigned _endIdx)
-{
-	yulAssert(_endIdx > _startIdx, "Proto fuzzer: Variable indices not in range");
-	string varsStr = suffixedVariableNameList("x_", _startIdx, _endIdx);
-	m_output << varsStr;
-	vector<string> varsVec;
-	boost::split(
-		varsVec,
-		varsStr,
-		boost::algorithm::is_any_of(", "),
-		boost::algorithm::token_compress_on
-	);
-
-	yulAssert(
-		varsVec.size() == (_endIdx - _startIdx),
-		"Proto fuzzer: Variable count mismatch during function definition"
-	);
-	m_counter += varsVec.size();
-	return varsVec;
-}
-
-void ProtoConverter::registerFunction(FunctionDef const* _x)
-{
-	unsigned numInParams = _x->num_input_params() % s_modInputParams;
-	unsigned numOutParams = _x->num_output_params() % s_modOutputParams;
-	NumFunctionReturns numReturns;
-	if (numOutParams == 0)
-		numReturns = NumFunctionReturns::None;
-	else if (numOutParams == 1)
-		numReturns = NumFunctionReturns::Single;
-	else
-		numReturns = NumFunctionReturns::Multiple;
-
-	// Generate function name
-	string funcName = functionName(numReturns);
-
-	// Register function
-	auto ret = m_functionSigMap.emplace(make_pair(funcName, make_pair(numInParams, numOutParams)));
-	yulAssert(ret.second, "Proto fuzzer: Function already exists.");
-	m_functions.push_back(funcName);
-	m_scopeFuncs.back().push_back(funcName);
-	m_functionDefMap.emplace(make_pair(_x, funcName));
-}
-
-void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
-{
-	for (unsigned i = 0; i < _numInParams; i++)
-	{
-		// Throw a 4-sided dice to choose whether to populate function input
-		// argument from a pseudo-randomly chosen slot in one of the following
-		// locations: calldata, memory, storage, or Yul optimizer dictionary.
-		unsigned diceValue = counter() % 4;
-		// Pseudo-randomly choose one of the first ten 32-byte
-		// aligned slots.
-		string slot = to_string((counter() % 10) * 32);
-		switch (diceValue)
-		{
-		case 0:
-			m_output << "calldataload(" << slot << ")";
-			break;
-		case 1:
-		{
-			// Access memory within stipulated bounds
-			slot = "mod(" + dictionaryToken() + ", " + to_string(s_maxMemory - 32) + ")";
-			m_output << "mload(" << slot << ")";
-			break;
-		}
-		case 2:
-			m_output << "sload(" << slot << ")";
-			break;
-		default:
-			// Call to dictionaryToken() automatically picks a token
-			// at a pseudo-random location.
-			m_output << dictionaryToken();
-			break;
-		}
-		if (i < _numInParams - 1)
-			m_output << ",";
-	}
-}
-
-void ProtoConverter::saveFunctionCallOutput(vector<string> const& _varsVec)
-{
-	for (auto const& var: _varsVec)
-	{
-		// Flip a dice to choose whether to save output values
-		// in storage or memory.
-		bool coinFlip = counter() % 2 == 0;
-		// Pseudo-randomly choose one of the first ten 32-byte
-		// aligned slots.
-		string slot = to_string((counter() % 10) * 32);
-		if (coinFlip)
-			m_output << "sstore(" << slot << ", " << var << ")\n";
-		else
-			m_output << "mstore(" << slot << ", " << var << ")\n";
-	}
-}
-
-void ProtoConverter::createFunctionCall(
-	string const& _funcName,
-	unsigned _numInParams,
-	unsigned _numOutParams
-)
-{
-	vector<string> varsVec{};
-	if (_numOutParams > 0)
-	{
-		unsigned startIdx = counter();
-		// Prints the following to output stream "let x_i,...,x_n := "
-		varsVec = createVarDecls(
-			startIdx,
-			startIdx + _numOutParams,
-			/*isAssignment=*/true
-		);
-	}
-
-	// Call the function with the correct number of input parameters
-	m_output << _funcName << "(";
-	if (_numInParams > 0)
-		fillFunctionCallInput(_numInParams);
-	m_output << ")\n";
-
-	if (!varsVec.empty())
-	{
-		// Save values returned by function so that they are reflected
-		// in the interpreter trace.
-		saveFunctionCallOutput(varsVec);
-		// Add newly minted vars to current scope
-		addVarsToScope(varsVec);
-	}
-	else
-		yulAssert(_numOutParams == 0, "Proto fuzzer: Function return value not saved");
-}
-
-void ProtoConverter::createFunctionDefAndCall(
-	FunctionDef const& _x,
-	unsigned _numInParams,
-	unsigned _numOutParams
-)
-{
-	yulAssert(
-		((_numInParams <= s_modInputParams - 1) && (_numOutParams <= s_modOutputParams - 1)),
-		"Proto fuzzer: Too many function I/O parameters requested."
-	);
-
-	// Obtain function name
-	yulAssert(m_functionDefMap.count(&_x), "Proto fuzzer: Unregistered function");
-	string funcName = m_functionDefMap.at(&_x);
-
-	vector<string> varsVec = {};
-	m_output << "function " << funcName << "(";
-	unsigned startIdx = counter();
-	if (_numInParams > 0)
-		varsVec = createVars(startIdx, startIdx + _numInParams);
-	m_output << ")";
-
-	vector<string> outVarsVec = {};
-	// This creates -> x_n+1,...,x_r
-	if (_numOutParams > 0)
-	{
-		m_output << " -> ";
-		if (varsVec.empty())
-		{
-			yulAssert(_numInParams == 0, "Proto fuzzer: Input parameters not processed correctly");
-			varsVec = createVars(startIdx, startIdx + _numOutParams);
-		}
-		else
-		{
-			outVarsVec = createVars(startIdx + _numInParams, startIdx + _numInParams + _numOutParams);
-			varsVec.insert(varsVec.end(), outVarsVec.begin(), outVarsVec.end());
-		}
-	}
-	yulAssert(varsVec.size() == _numInParams + _numOutParams, "Proto fuzzer: Function parameters not processed correctly");
-
-	m_output << "\n";
-
-	// If function definition is in for-loop body, update
-	bool wasInForBody = m_inForBodyScope;
-	m_inForBodyScope = false;
-
-	bool wasInFunctionDef = m_inFunctionDef;
-	m_inFunctionDef = true;
-
-	// Create new function scope and add function input and return
-	// parameters to it.
-	openFunctionScope(varsVec);
-	// Visit function body
-	visit(_x.block());
-	closeFunctionScope();
-
-	m_inForBodyScope = wasInForBody;
-	m_inFunctionDef = wasInFunctionDef;
-
-	yulAssert(
-		!m_inForInitScope,
-		"Proto fuzzer: Trying to create function call inside a for-init block"
-	);
-	if (_x.force_call())
-		createFunctionCall(funcName, _numInParams, _numOutParams);
-}
-
-void ProtoConverter::visit(FunctionDef const& _x)
-{
-	unsigned numInParams = _x.num_input_params() % s_modInputParams;
-	unsigned numOutParams = _x.num_output_params() % s_modOutputParams;
-	createFunctionDefAndCall(_x, numInParams, numOutParams);
-}
-
-void ProtoConverter::visit(PopStmt const& _x)
-{
-	m_output << "pop(";
-	visit(_x.expr());
-	m_output << ")\n";
-}
-
-void ProtoConverter::visit(LeaveStmt const&)
-{
-	m_output << "leave\n";
-}
-
-string ProtoConverter::getObjectIdentifier(unsigned _x)
-{
-	unsigned currentId = currentObjectId();
-	string currentObjName = "object" + to_string(currentId);
-	yulAssert(
-		m_objectScope.count(currentObjName) && !m_objectScope.at(currentObjName).empty(),
-		"Yul proto fuzzer: Error referencing object"
-	);
-	vector<string> objectIdsInScope = m_objectScope.at(currentObjName);
-	return objectIdsInScope[_x % objectIdsInScope.size()];
-}
-
-void ProtoConverter::visit(Code const& _x)
-{
-	m_output << "code {\n";
-	visit(_x.block());
-	m_output << "}\n";
-}
-
-void ProtoConverter::visit(Data const& _x)
-{
-	// TODO: Generate random data block identifier
-	m_output << "data \"" << s_dataIdentifier << "\" hex\"" << createHex(_x.hex()) << "\"\n";
-}
-
-void ProtoConverter::visit(Object const& _x)
-{
-	// object "object<n>" {
-	// ...
-	// }
-	m_output << "object " << newObjectId() << " {\n";
-	visit(_x.code());
-	if (_x.has_data())
-		visit(_x.data());
-	for (auto const& subObj: _x.sub_obj())
-		visit(subObj);
-	m_output << "}\n";
-}
-
-void ProtoConverter::buildObjectScopeTree(Object const& _x)
-{
-	// Identifies object being visited
-	string objectName = newObjectId(false);
-	vector<string> node{objectName};
-	if (_x.has_data())
-		node.emplace_back(s_dataIdentifier);
-	for (auto const& subObj: _x.sub_obj())
-	{
-		// Identifies sub object whose numeric suffix is
-		// m_objectId
-		unsigned subObjectId = m_objectId;
-		string subObjectName = "object" + to_string(subObjectId);
-		node.push_back(subObjectName);
-		buildObjectScopeTree(subObj);
-		// Add sub-object to object's ancestors
-		yulAssert(m_objectScope.count(subObjectName), "Yul proto fuzzer: Invalid object hierarchy");
-		for (string const& item: m_objectScope.at(subObjectName))
-			if (item != subObjectName)
-				node.emplace_back(subObjectName + "." + item);
-	}
-	m_objectScope.emplace(objectName, node);
-}
-
-void ProtoConverter::visit(Program const& _x)
-{
-	// Initialize input size
-	m_inputSize = static_cast<unsigned>(_x.ByteSizeLong());
-
-	// Record EVM Version
-	m_evmVersion = evmVersionMapping(_x.ver());
-
-	// Program is either a Yul object or a block of
-	// statements.
-	switch (_x.program_oneof_case())
-	{
-	case Program::kBlock:
-		m_output << "{\n";
-		m_output << "mstore(memoryguard(0x10000), 1)\n";
-		m_output << "sstore(mload(calldataload(0)), 1)\n";
-		visit(_x.block());
-		m_output << "}\n";
-		break;
-	case Program::kObj:
-		m_isObject = true;
-		buildObjectScopeTree(_x.obj());
-		// Reset object id counter
-		m_objectId = 0;
-		visit(_x.obj());
-		break;
-	case Program::PROGRAM_ONEOF_NOT_SET:
-		// {} is a trivial Yul program
-		m_output << "{}";
-		break;
-	}
-}
-
-string ProtoConverter::programToString(Program const& _input)
-{
-	visit(_input);
-	return m_output.str();
-}
-
-string ProtoConverter::functionTypeToString(NumFunctionReturns _type)
-{
-	switch (_type)
-	{
-	case NumFunctionReturns::None:
-		return "n";
-	case NumFunctionReturns::Single:
-		return "s";
-	case NumFunctionReturns::Multiple:
-		return "m";
-	}
-}
diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h
deleted file mode 100644
index b7f7c72e5a8e..000000000000
--- a/test/tools/ossfuzz/protoToYul.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <cstdint>
-#include <cstddef>
-#include <string>
-#include <ostream>
-#include <sstream>
-#include <stack>
-#include <set>
-#include <vector>
-#include <tuple>
-
-#include <test/tools/ossfuzz/yulProto.pb.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/Whiskers.h>
-
-#include <liblangutil/EVMVersion.h>
-
-namespace solidity::yul::test::yul_fuzzer
-{
-class ProtoConverter
-{
-public:
-	ProtoConverter(
-		bool _filterStatefulInstructions = false,
-		bool _filterUnboundedLoops = false
-	)
-	{
-		m_funcVars = std::vector<std::vector<std::vector<std::string>>>{};
-		m_globalVars = std::vector<std::vector<std::string>>{};
-		m_inForBodyScope = false;
-		m_inForInitScope = false;
-		m_inForCond = false;
-		m_numNestedForLoops = 0;
-		m_numForLoops = 0;
-		m_counter = 0;
-		m_inputSize = 0;
-		m_inFunctionDef = false;
-		m_objectId = 0;
-		m_isObject = false;
-		m_forInitScopeExtEnabled = true;
-		m_filterStatefulInstructions = _filterStatefulInstructions;
-		m_filterUnboundedLoops = _filterUnboundedLoops;
-	}
-	ProtoConverter(ProtoConverter const&) = delete;
-	ProtoConverter(ProtoConverter&&) = delete;
-	std::string programToString(Program const& _input);
-
-	/// Returns evm version
-	solidity::langutil::EVMVersion version()
-	{
-		return m_evmVersion;
-	}
-private:
-	void visit(BinaryOp const&);
-
-	/// Visits a basic block optionally adding @a _funcParams to scope.
-	/// @param _block Reference to a basic block of Yul statements.
-	/// @param _funcParams List of function parameter names, defaults to
-	/// an empty vector.
-	void visit(Block const& _block);
-
-	std::string visit(Literal const&);
-	void visit(VarRef const&);
-	void visit(Expression const&);
-	void visit(VarDecl const&);
-	void visit(MultiVarDecl const&);
-	void visit(TypedVarDecl const&);
-	void visit(UnaryOp const&);
-	void visit(AssignmentStatement const&);
-	void visit(IfStmt const&);
-	void visit(StoreFunc const&);
-	void visit(Statement const&);
-	void visit(ForStmt const&);
-	void visit(BoundedForStmt const&);
-	void visit(CaseStmt const&);
-	void visit(SwitchStmt const&);
-	void visit(TernaryOp const&);
-	void visit(NullaryOp const&);
-	void visit(LogFunc const&);
-	void visit(CopyFunc const&);
-	void visit(ExtCodeCopy const&);
-	void visit(StopInvalidStmt const&);
-	void visit(RetRevStmt const&);
-	void visit(SelfDestructStmt const&);
-	void visit(TerminatingStmt const&);
-	/// @param _f is the function call to be visited.
-	/// @param _name is the name of the function called.
-	/// @param _expression is a flag that is true if the function is called
-	/// as a single-value expression, false otherwise.
-	void visit(
-		FunctionCall const& _f,
-		std::string const& _name,
-		bool _expression = false
-	);
-	void visit(FunctionDef const&);
-	void visit(PopStmt const&);
-	void visit(LeaveStmt const&);
-	void visit(LowLevelCall const&);
-	void visit(Create const&);
-	void visit(UnaryOpData const&);
-	void visit(Object const&);
-	void visit(Data const&);
-	void visit(Code const&);
-	void visit(Program const&);
-
-	/// Creates a new block scope.
-	void openBlockScope();
-	/// Creates a new function scope, and adds @a _funcParams to it if it
-	/// is non-empty.
-	void openFunctionScope(std::vector<std::string> const& _funcParams);
-	/// Closes current block scope
-	void closeBlockScope();
-	/// Closes current function scope
-	void closeFunctionScope();
-	/// Adds @a _vars to current scope
-	void addVarsToScope(std::vector<std::string> const& _vars);
-
-	std::string createHex(std::string const& _hexBytes);
-
-	/// Returns a new variable name.
-	std::string newVarName()
-	{
-		return "x_" + std::to_string(counter());
-	}
-
-	/// Accepts an arbitrary string, removes all characters that are neither
-	/// alphabets nor digits from it and returns the said string.
-	static std::string createAlphaNum(std::string const& _strBytes);
-
-	enum class NumFunctionReturns: unsigned
-	{
-		None = 0,
-		Single,
-		Multiple
-	};
-
-	void visitFunctionInputParams(FunctionCall const&, unsigned);
-	void createFunctionDefAndCall(FunctionDef const&, unsigned, unsigned);
-
-	/// Convert function type to a string to be used while naming a
-	/// function that is created by a function declaration statement.
-	/// @param _type Type classified according to the number of
-	/// values returned by function.
-	/// @return A string as follows. If _type is
-	/// None -> "n"
-	/// Single -> "s"
-	/// Multiple -> "m"
-	static std::string functionTypeToString(NumFunctionReturns _type);
-
-	/// Builds a single vector containing variables declared in
-	/// function scope.
-	void consolidateVarDeclsInFunctionDef();
-
-	/// Builds a single vector containing variables declared in
-	/// global scope.
-	void consolidateGlobalVarDecls();
-
-	/// Return true if at least one variable declaration is in scope,
-	/// false otherwise.
-	/// @return True in the following cases:
-	/// - If we are inside a function that has already declared a variable
-	/// - If there is at least one variable declaration that is
-	/// in scope
-	bool varDeclAvailable();
-
-	/// Converts protobuf function call to a Yul function call and appends
-	/// it to output stream.
-	/// @param _x Protobuf function call
-	/// @param _name Function name
-	/// @param _numInParams Number of input arguments accepted by function
-	/// @param _newLine Flag that prints a new line to the output stream if
-	/// true. Default value for the flag is true.
-	void convertFunctionCall(
-		FunctionCall const& _x,
-		std::string const& _name,
-		unsigned _numInParams,
-		bool _newLine = true
-	);
-
-	/// Prints a Yul formatted variable declaration statement to the output
-	/// stream.
-	/// Example 1: createVarDecls(0, 1, true) returns {"x_0"} and prints
-	///		let x_0 :=
-	/// Example 2: createVarDecls(0, 2, false) returns {"x_0", "x_1"} and prints
-	///		let x_0, x_1
-	/// @param _start Start index of variable (inclusive)
-	/// @param _end End index of variable (exclusive)
-	/// @param _isAssignment Flag indicating if variable declaration is also
-	/// an assignment. If true, the string " := " follows the variable
-	/// declaration. Otherwise, a new line is follows the variable
-	/// declaration.
-	/// @return A vector of strings containing the variable names used in
-	/// the declaration statement.
-	std::vector<std::string> createVarDecls(unsigned _start, unsigned _end, bool _isAssignment);
-
-	/// Prints comma separated variable names to output stream and
-	/// returns a vector containing the printed variable names.
-	/// Example: createVars(0, 2) returns {"x_0", "x_1"} and prints
-	///		x_0, x_1
-	/// @param _startIdx Start index of variable (inclusive)
-	/// @param _endIdx End index of variable (exclusive)
-	/// @return A vector of strings containing the printed variable names.
-	std::vector<std::string> createVars(unsigned _startIdx, unsigned _endIdx);
-
-	/// Manages scope of Yul variables
-	/// @param _varNames is a list of Yul variable names whose scope needs
-	/// to be tracked according to Yul scoping rules.
-	void scopeVariables(std::vector<std::string> const& _varNames);
-
-	/// Print the Yul syntax to make a call to a function named @a _funcName to
-	/// the output stream.
-	/// @param _funcName Name of the function to be called
-	/// @param _numInParams Number of input parameters in function signature
-	/// @param _numOutParams Number of output parameters in function signature
-	void createFunctionCall(std::string const& _funcName, unsigned _numInParams, unsigned _numOutParams);
-
-	/// Print the Yul syntax to pass input arguments to a function that has
-	/// @a _numInParams number of input parameters to the output stream.
-	/// The input arguments are pseudo-randomly chosen from calldata, memory,
-	/// storage, or the Yul optimizer hex dictionary.
-	/// @param _numInParams Number of input arguments to fill
-	void fillFunctionCallInput(unsigned _numInParams);
-
-	/// Print the Yul syntax to save values returned by a function call
-	/// to the output stream. The values are either stored to memory or
-	/// storage based on a simulated coin flip. The saved location is
-	/// decided pseudo-randomly.
-	/// @param _varsVec A vector of strings that reference variables
-	/// holding the return values of a function call.
-	void saveFunctionCallOutput(std::vector<std::string> const& _varsVec);
-
-	/// Register a function declaration
-	/// @param _f Pointer to a FunctionDef object
-	void registerFunction(FunctionDef const* _f);
-
-	/// Removes entry from m_functionMap and m_functionName
-	void updateFunctionMaps(std::string const& _x);
-
-	/// Build a tree of objects that contains the object/data
-	/// identifiers that are in scope in a given object.
-	/// @param _x root object of the Yul protobuf specification.
-	void buildObjectScopeTree(Object const& _x);
-
-	/// Returns a pseudo-random dictionary token.
-	/// @param _p Enum that decides if the returned token is hex prefixed ("0x") or not
-	/// @return Dictionary token at the index computed using a
-	/// monotonically increasing counter as follows:
-	///		index = (m_inputSize * m_inputSize + counter) % dictionarySize
-	/// where m_inputSize is the size of the protobuf input and
-	/// dictionarySize is the total number of entries in the dictionary.
-	std::string dictionaryToken(util::HexPrefix _p = util::HexPrefix::Add);
-
-	/// Returns an EVMVersion object corresponding to the protobuf
-	/// enum of type Program_Version
-	static solidity::langutil::EVMVersion evmVersionMapping(Program_Version const& _x);
-
-	/// @returns name of Yul function with return type of @param _numReturns.
-	std::optional<std::string> functionExists(NumFunctionReturns _numReturns);
-
-	/// Returns a monotonically increasing counter that starts from zero.
-	unsigned counter()
-	{
-		return m_counter++;
-	}
-
-	/// Generate function name of the form "foo_<typeSuffix>_<counter>".
-	/// @param _type Type classified according to the number of
-	/// values returned by function.
-	std::string functionName(NumFunctionReturns _type)
-	{
-		return "foo_" + functionTypeToString(_type) + "_" + std::to_string(counter());
-	}
-
-	/// Returns a pseudo-randomly chosen object identifier that is in the
-	/// scope of the Yul object being visited.
-	std::string getObjectIdentifier(unsigned _x);
-
-	/// Return new object identifier as string. Identifier string
-	/// is a template of the form "\"object<n>\"" where <n> is
-	/// a monotonically increasing object ID counter.
-	/// @param _decorate If true (default value), object ID is
-	/// enclosed within double quotes.
-	std::string newObjectId(bool _decorate = true)
-	{
-		return util::Whiskers(R"(<?decorate>"</decorate>object<id><?decorate>"</decorate>)")
-			("decorate", _decorate)
-			("id", std::to_string(m_objectId++))
-			.render();
-	}
-
-	/// Returns the object counter value corresponding to the object
-	/// being visited.
-	unsigned currentObjectId() const
-	{
-		return m_objectId - 1;
-	}
-
-	std::ostringstream m_output;
-	/// Variables in all function definitions
-	std::vector<std::vector<std::vector<std::string>>> m_funcVars;
-	/// Variables in current function definition
-	std::vector<std::string const*> m_currentFuncVars;
-	/// Variables in global scope
-	std::vector<std::string const*> m_currentGlobalVars;
-	/// Functions in current scope
-	std::vector<std::vector<std::string>> m_scopeFuncs;
-	/// Global variables
-	std::vector<std::vector<std::string>> m_globalVars;
-	/// Variables declared in for loop init block that is in global scope
-	std::vector<std::vector<std::string>> m_globalForLoopInitVars;
-	/// Variables declared in for loop init block that is in function scope
-	std::vector<std::vector<std::vector<std::string>>> m_funcForLoopInitVars;
-	/// Vector of function names
-	std::vector<std::string> m_functions;
-	/// Maps FunctionDef object to its name
-	std::map<FunctionDef const*, std::string> m_functionDefMap;
-	// Set that is used for deduplicating switch case literals
-	std::stack<std::set<u256>> m_switchLiteralSetPerScope;
-	// Look-up table per function type that holds the number of input (output) function parameters
-	std::map<std::string, std::pair<unsigned, unsigned>> m_functionSigMap;
-	/// Map of object name to list of sub-object namespace(s) in scope
-	std::map<std::string, std::vector<std::string>> m_objectScope;
-	// mod input/output parameters impose an upper bound on the number of input/output parameters a function may have.
-	static unsigned constexpr s_modInputParams = 5;
-	static unsigned constexpr s_modOutputParams = 5;
-	/// Hard-coded identifier for a Yul object's data block
-	static auto constexpr s_dataIdentifier = "datablock";
-	/// Upper bound on memory writes is 64KB in order to
-	/// preserve semantic equivalence in the presence of
-	/// memory guard
-	static unsigned constexpr s_maxMemory = 65536;
-	/// Upper bound on size for range copy functions
-	static unsigned constexpr s_maxSize = 32768;
-	/// Predicate to keep track of for body scope. If false, break/continue
-	/// statements can not be created.
-	bool m_inForBodyScope;
-	/// Maximum number of for loops that a test case may contain
-	static auto constexpr s_maxForLoops = 2;
-	// Index used for naming loop variable of bounded for loops
-	unsigned m_numNestedForLoops;
-	/// Counter for number of for loops
-	unsigned m_numForLoops;
-	/// Predicate to keep track of for loop init scope. If true, variable
-	/// or function declarations can not be created.
-	bool m_inForInitScope;
-	/// Flag that is true while converting for loop condition,
-	/// false otherwise.
-	bool m_inForCond;
-	/// Monotonically increasing counter
-	unsigned m_counter;
-	/// Size of protobuf input
-	unsigned m_inputSize;
-	/// Predicate that is true if inside function definition, false otherwise
-	bool m_inFunctionDef;
-	/// Index used for naming objects
-	unsigned m_objectId;
-	/// Flag to track whether program is an object (true) or a statement block
-	/// (false: default value)
-	bool m_isObject;
-	/// Flag to track whether scope extension of variables defined in for-init
-	/// block is enabled.
-	bool m_forInitScopeExtEnabled;
-	/// Object that holds the targeted evm version specified by protobuf input
-	solidity::langutil::EVMVersion m_evmVersion;
-	/// Flag that, if set, stops the converter from generating state changing
-	/// opcodes.
-	bool m_filterStatefulInstructions;
-	/// Flat that, if set, stops the converter from generating potentially
-	/// unbounded loops.
-	bool m_filterUnboundedLoops;
-};
-}
diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
deleted file mode 100644
index 9b0c97a22df0..000000000000
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-#include <test/tools/ossfuzz/protomutators/YulProtoMutator.h>
-
-#include <libyul/Exceptions.h>
-
-#include <src/text_format.h>
-
-using namespace solidity::yul::test::yul_fuzzer;
-using namespace protobuf_mutator;
-using namespace std;
-
-using YPM = YulProtoMutator;
-
-MutationInfo::MutationInfo(ProtobufMessage const* _message, string const& _info):
-	ScopeGuard([&]{ exitInfo(); }),
-	m_protobufMsg(_message)
-{
-	writeLine("----------------------------------");
-	writeLine("YULMUTATOR: " + _info);
-	writeLine("Before");
-	writeLine(SaveMessageAsText(*m_protobufMsg));
-}
-
-void MutationInfo::exitInfo()
-{
-	writeLine("After");
-	writeLine(SaveMessageAsText(*m_protobufMsg));
-}
-
-/// Add m/sstore(0, variable)
-static LPMPostProcessor<Block> addStoreToZero(
-	[](Block* _message, unsigned _seed)
-	{
-		if (_seed % YPM::s_highIP == 0)
-		{
-			YulRandomNumGenerator yrand(_seed);
-			MutationInfo m{_message, "Added store to zero"};
-			auto storeStmt = new StoreFunc();
-			storeStmt->set_st(YPM::EnumTypeConverter<StoreFunc_Storage>{}.enumFromSeed(yrand()));
-			storeStmt->set_allocated_loc(YPM::litExpression(0));
-			storeStmt->set_allocated_val(YPM::refExpression(yrand));
-			auto stmt = _message->add_statements();
-			stmt->set_allocated_storage_func(storeStmt);
-		}
-	}
-);
-
-
-namespace
-{
-template <typename T>
-struct addControlFlow
-{
-	addControlFlow()
-	{
-		function = [](T* _message, unsigned _seed)
-		{
-			MutationInfo m{_message, "Added control flow."};
-			YPM::addControlFlow(_message, _seed);
-		};
-		/// Unused variable registers callback.
-		LPMPostProcessor<T> callback(function);
-	}
-	function<void(T*, unsigned)> function;
-};
-}
-
-static addControlFlow<ForStmt> c1;
-static addControlFlow<BoundedForStmt> c2;
-static addControlFlow<IfStmt> c3;
-static addControlFlow<SwitchStmt> c4;
-static addControlFlow<FunctionDef> c5;
-static addControlFlow<CaseStmt> c6;
-static addControlFlow<Code> c7;
-static addControlFlow<Program> c8;
-
-Literal* YPM::intLiteral(unsigned _value)
-{
-	auto lit = new Literal();
-	lit->set_intval(_value);
-	return lit;
-}
-
-VarRef* YPM::varRef(unsigned _seed)
-{
-	auto varref = new VarRef();
-	varref->set_varnum(_seed);
-	return varref;
-}
-
-Expression* YPM::refExpression(YulRandomNumGenerator& _rand)
-{
-	auto refExpr = new Expression();
-	refExpr->set_allocated_varref(varRef(_rand()));
-	return refExpr;
-}
-
-Expression* YPM::litExpression(unsigned _value)
-{
-	auto lit = intLiteral(_value);
-	auto expr = new Expression();
-	expr->set_allocated_cons(lit);
-	return expr;
-}
-
-template <typename T>
-T YPM::EnumTypeConverter<T>::validEnum(unsigned _seed)
-{
-	auto ret = static_cast<T>(_seed % (enumMax() - enumMin() + 1) + enumMin());
-	if constexpr (std::is_same_v<std::decay_t<T>, StoreFunc_Storage>)
-		yulAssert(StoreFunc_Storage_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else if constexpr (std::is_same_v<std::decay_t<T>, NullaryOp_NOp>)
-		yulAssert(NullaryOp_NOp_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else if constexpr (std::is_same_v<std::decay_t<T>, BinaryOp_BOp>)
-		yulAssert(BinaryOp_BOp_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else if constexpr (std::is_same_v<std::decay_t<T>, UnaryOp_UOp>)
-		yulAssert(UnaryOp_UOp_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else if constexpr (std::is_same_v<std::decay_t<T>, LowLevelCall_Type>)
-		yulAssert(LowLevelCall_Type_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else if constexpr (std::is_same_v<std::decay_t<T>, Create_Type>)
-		yulAssert(Create_Type_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else if constexpr (std::is_same_v<std::decay_t<T>, UnaryOpData_UOpData>)
-		yulAssert(UnaryOpData_UOpData_IsValid(ret), "Yul proto mutator: Invalid enum");
-	else
-		static_assert(AlwaysFalse<T>::value, "Yul proto mutator: non-exhaustive visitor.");
-	return ret;
-}
-
-template <typename T>
-unsigned YPM::EnumTypeConverter<T>::enumMax()
-{
-	if constexpr (std::is_same_v<std::decay_t<T>, StoreFunc_Storage>)
-		return StoreFunc_Storage_Storage_MAX;
-	else if constexpr (std::is_same_v<std::decay_t<T>, NullaryOp_NOp>)
-		return NullaryOp_NOp_NOp_MAX;
-	else if constexpr (std::is_same_v<std::decay_t<T>, BinaryOp_BOp>)
-		return BinaryOp_BOp_BOp_MAX;
-	else if constexpr (std::is_same_v<std::decay_t<T>, UnaryOp_UOp>)
-		return UnaryOp_UOp_UOp_MAX;
-	else if constexpr (std::is_same_v<std::decay_t<T>, LowLevelCall_Type>)
-		return LowLevelCall_Type_Type_MAX;
-	else if constexpr (std::is_same_v<std::decay_t<T>, Create_Type>)
-		return Create_Type_Type_MAX;
-	else if constexpr (std::is_same_v<std::decay_t<T>, UnaryOpData_UOpData>)
-		return UnaryOpData_UOpData_UOpData_MAX;
-	else
-		static_assert(AlwaysFalse<T>::value, "Yul proto mutator: non-exhaustive visitor.");
-}
-
-template <typename T>
-unsigned YPM::EnumTypeConverter<T>::enumMin()
-{
-	if constexpr (std::is_same_v<std::decay_t<T>, StoreFunc_Storage>)
-		return StoreFunc_Storage_Storage_MIN;
-	else if constexpr (std::is_same_v<std::decay_t<T>, NullaryOp_NOp>)
-		return NullaryOp_NOp_NOp_MIN;
-	else if constexpr (std::is_same_v<std::decay_t<T>, BinaryOp_BOp>)
-		return BinaryOp_BOp_BOp_MIN;
-	else if constexpr (std::is_same_v<std::decay_t<T>, UnaryOp_UOp>)
-		return UnaryOp_UOp_UOp_MIN;
-	else if constexpr (std::is_same_v<std::decay_t<T>, LowLevelCall_Type>)
-		return LowLevelCall_Type_Type_MIN;
-	else if constexpr (std::is_same_v<std::decay_t<T>, Create_Type>)
-		return Create_Type_Type_MIN;
-	else if constexpr (std::is_same_v<std::decay_t<T>, UnaryOpData_UOpData>)
-		return UnaryOpData_UOpData_UOpData_MIN;
-	else
-		static_assert(AlwaysFalse<T>::value, "Yul proto mutator: non-exhaustive visitor.");
-}
-
-template <typename T>
-void YPM::addControlFlow(T* _msg, unsigned _seed)
-{
-	enum class ControlFlowStmt: unsigned
-	{
-		For = 0,
-		BoundedFor,
-		If,
-		Switch,
-		FunctionCall,
-		Break,
-		Continue,
-		Leave,
-		Termination
-	};
-	uniform_int_distribution<unsigned> d(
-		static_cast<unsigned>(ControlFlowStmt::For),
-		static_cast<unsigned>(ControlFlowStmt::Termination)
-	);
-	YulRandomNumGenerator yrand(_seed);
-	auto random = static_cast<ControlFlowStmt>(d(yrand.m_random));
-	Statement* s = basicBlock(_msg, _seed)->add_statements();
-	switch (random)
-	{
-	case ControlFlowStmt::For:
-		s->set_allocated_forstmt(new ForStmt());
-		break;
-	case ControlFlowStmt::BoundedFor:
-		s->set_allocated_boundedforstmt(new BoundedForStmt());
-		break;
-	case ControlFlowStmt::If:
-		s->set_allocated_ifstmt(new IfStmt());
-		break;
-	case ControlFlowStmt::Switch:
-		s->set_allocated_switchstmt(new SwitchStmt());
-		break;
-	case ControlFlowStmt::FunctionCall:
-		s->set_allocated_functioncall(new FunctionCall());
-		break;
-	case ControlFlowStmt::Break:
-		s->set_allocated_breakstmt(new BreakStmt());
-		break;
-	case ControlFlowStmt::Continue:
-		s->set_allocated_contstmt(new ContinueStmt());
-		break;
-	case ControlFlowStmt::Leave:
-		s->set_allocated_leave(new LeaveStmt());
-		break;
-	case ControlFlowStmt::Termination:
-		s->set_allocated_terminatestmt(new TerminatingStmt());
-		break;
-	}
-}
-
-Block* YPM::randomBlock(ForStmt* _stmt, unsigned _seed)
-{
-	enum class ForBlocks: unsigned
-	{
-		Init = 0,
-		Post = 1,
-		Body = 2
-	};
-	uniform_int_distribution<unsigned> d(
-		static_cast<unsigned>(ForBlocks::Init),
-		static_cast<unsigned>(ForBlocks::Body)
-	);
-	YulRandomNumGenerator yrand(_seed);
-	switch (static_cast<ForBlocks>(d(yrand.m_random)))
-	{
-	case ForBlocks::Init:
-		return _stmt->mutable_for_init();
-	case ForBlocks::Post:
-		return _stmt->mutable_for_post();
-	case ForBlocks::Body:
-		return _stmt->mutable_for_body();
-	}
-}
-
-template <typename T>
-Block* YPM::basicBlock(T* _msg, unsigned _seed)
-{
-	if constexpr (std::is_same_v<T, ForStmt>)
-		return randomBlock(_msg, _seed);
-	else if constexpr (std::is_same_v<T, BoundedForStmt>)
-		return _msg->mutable_for_body();
-	else if constexpr (std::is_same_v<T, SwitchStmt>)
-		return _msg->mutable_default_block();
-	else if constexpr (std::is_same_v<T, FunctionDef>)
-		return _msg->mutable_block();
-	else if constexpr (std::is_same_v<T, IfStmt>)
-		return _msg->mutable_if_body();
-	else if constexpr (std::is_same_v<T, CaseStmt>)
-		return _msg->mutable_case_block();
-	else if constexpr (std::is_same_v<T, Code>)
-		return _msg->mutable_block();
-	else if constexpr (std::is_same_v<T, Program>)
-		return globalBlock(_msg);
-	else
-		static_assert(AlwaysFalse<T>::value, "Yul proto mutator: non-exhaustive visitor.");
-}
-
-Block* YPM::globalBlock(Program* _program)
-{
-	switch (_program->program_oneof_case())
-	{
-	case Program::kBlock:
-		return _program->mutable_block();
-	case Program::kObj:
-		return _program->mutable_obj()->mutable_code()->mutable_block();
-	case Program::PROGRAM_ONEOF_NOT_SET:
-	{
-		_program->set_allocated_block(new Block());
-		return _program->mutable_block();
-	}
-	}
-}
diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.h b/test/tools/ossfuzz/protomutators/YulProtoMutator.h
deleted file mode 100644
index 0d68b95c50ac..000000000000
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include <test/tools/ossfuzz/yulProto.pb.h>
-
-#include <libsolutil/Common.h>
-
-#include <src/libfuzzer/libfuzzer_macro.h>
-
-#include <random>
-
-namespace solidity::yul::test::yul_fuzzer
-{
-
-using ProtobufMessage = google::protobuf::Message;
-
-template <typename Proto>
-using LPMPostProcessor = protobuf_mutator::libfuzzer::PostProcessorRegistration<Proto>;
-
-class MutationInfo: public ScopeGuard
-{
-public:
-	MutationInfo(ProtobufMessage const* _message, std::string const& _info);
-
-	static void writeLine(std::string const& _str)
-	{
-		std::cout << _str << std::endl;
-	}
-	void exitInfo();
-
-	ProtobufMessage const* m_protobufMsg;
-};
-
-struct YulRandomNumGenerator
-{
-	using RandomEngine = std::minstd_rand;
-
-	explicit YulRandomNumGenerator(unsigned _seed): m_random(RandomEngine(_seed)) {}
-
-	unsigned operator()()
-	{
-		return static_cast<unsigned>(m_random());
-	}
-
-	RandomEngine m_random;
-};
-
-struct YulProtoMutator
-{
-	/// @param _value: Value of the integer literal
-	/// @returns an integer literal protobuf message initialized with
-	/// the given value.
-	static Literal* intLiteral(unsigned _value);
-
-	/// @param _seed: Pseudo-random unsigned integer used as index
-	/// of variable to be referenced
-	/// @returns a variable reference protobuf message.
-	static VarRef* varRef(unsigned _seed);
-
-	/// @param _value: value of literal expression
-	/// @returns an expression protobuf message
-	static Expression* litExpression(unsigned _value);
-
-	/// @param _rand: Pseudo-random number generator
-	/// of variable to be referenced
-	/// @returns a variable reference protobuf message
-	static Expression* refExpression(YulRandomNumGenerator& _rand);
-
-	/// Helper type for type matching visitor.
-	template<class T> struct AlwaysFalse: std::false_type {};
-
-	/// Template struct for obtaining a valid enum value of
-	/// template type from a pseudo-random unsigned integer.
-	/// @param _seed: Pseudo-random integer
-	/// @returns Valid enum of enum type T
-	template <typename T>
-	struct EnumTypeConverter
-	{
-		T enumFromSeed(unsigned _seed)
-		{
-			return validEnum(_seed);
-		}
-
-		/// @returns a valid enum of type T from _seed
-		T validEnum(unsigned _seed);
-		/// @returns maximum enum value for enum of type T
-		static unsigned enumMax();
-		/// @returns minimum enum value for enum of type T
-		static unsigned enumMin();
-	};
-
-	/// Modulo for mutations that should occur rarely
-	static constexpr unsigned s_lowIP = 31;
-	/// Modulo for mutations that should occur not too often
-	static constexpr unsigned s_mediumIP = 29;
-	/// Modulo for mutations that should occur often
-	static constexpr unsigned s_highIP = 23;
-	/// Add control-flow statement to basic block.
-	template <typename T>
-	static void addControlFlow(T* _msg, unsigned _seed);
-	/// Obtain basic block for statement type.
-	template <typename T>
-	static Block* basicBlock(T* _msg, unsigned _seed);
-	/// Obtain a basic block in a for stmt uniformly
-	/// at random
-	static Block* randomBlock(ForStmt* _msg, unsigned _seed);
-	/// Obtain a basic block in global scope.
-	static Block* globalBlock(Program* _program);
-};
-}
diff --git a/test/tools/ossfuzz/solProto.proto b/test/tools/ossfuzz/solProto.proto
deleted file mode 100644
index 59d989cf903b..000000000000
--- a/test/tools/ossfuzz/solProto.proto
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-syntax = "proto2";
-
-message InterfaceFunction {
-    enum StateMutability {
-        PURE = 0;
-        VIEW = 1;
-        PAYABLE = 2;
-        NONPAYABLE = 3;
-    }
-    required StateMutability mut = 1;
-}
-
-message LibraryFunction {
-    // Library functions cannot be payable
-    enum StateMutability {
-        PURE = 0;
-        VIEW = 1;
-        NONPAYABLE = 2;
-    }
-    enum Visibility {
-        PUBLIC = 0;
-        EXTERNAL = 1;
-        INTERNAL = 2;
-        PRIVATE = 3;
-    }
-    required Visibility vis = 1;
-    required StateMutability mut = 2;
-}
-
-message ContractFunction {
-    enum StateMutability {
-        PURE = 0;
-        VIEW = 1;
-        PAYABLE = 2;
-        NONPAYABLE = 3;
-    }
-    enum Visibility {
-        PUBLIC = 0;
-        EXTERNAL = 1;
-        INTERNAL = 2;
-        PRIVATE = 3;
-    }
-    required Visibility vis = 1;
-    required StateMutability mut = 2;
-    required bool virtualfunc = 3;
-}
-
-message Library {
-    repeated LibraryFunction funcdef = 1;
-}
-
-message Interface {
-    repeated InterfaceFunction funcdef = 1;
-    repeated Interface bases = 2;
-}
-
-message Contract {
-    repeated ContractFunction funcdef = 1;
-    required bool abstract = 2;
-    repeated ContractOrInterface bases = 3;
-}
-
-message ContractOrInterface {
-    oneof contract_or_interface_oneof {
-        Contract c = 1;
-        Interface i = 2;
-    }
-}
-
-message ContractType {
-    oneof contract_type_oneof {
-        Contract c = 1;
-        Library l = 2;
-        Interface i = 3;
-    }
-}
-
-message TestContract {
-    enum Type {
-        LIBRARY = 0;
-        CONTRACT = 1;
-    }
-    required Type type = 1;
-}
-
-message Program {
-    repeated ContractType contracts = 1;
-    required TestContract test = 2;
-    // Seed is an unsigned integer that initializes
-    // a pseudo random number generator.
-    required uint64 seed = 3;
-}
-
-package solidity.test.solprotofuzzer;
diff --git a/test/tools/ossfuzz/solProtoFuzzer.cpp b/test/tools/ossfuzz/solProtoFuzzer.cpp
deleted file mode 100644
index f7acc6c10de7..000000000000
--- a/test/tools/ossfuzz/solProtoFuzzer.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/ossfuzz/protoToSol.h>
-#include <test/tools/ossfuzz/SolidityEvmoneInterface.h>
-#include <test/tools/ossfuzz/solProto.pb.h>
-
-#include <test/EVMHost.h>
-
-#include <evmone/evmone.h>
-#include <src/libfuzzer/libfuzzer_macro.h>
-
-#include <fstream>
-
-static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
-
-using namespace solidity::test::fuzzer;
-using namespace solidity::test::solprotofuzzer;
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::test;
-using namespace solidity::util;
-using namespace std;
-
-DEFINE_PROTO_FUZZER(Program const& _input)
-{
-	ProtoConverter converter;
-	string sol_source = converter.protoToSolidity(_input);
-
-	if (char const* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
-	{
-		// With libFuzzer binary run this to generate a YUL source file x.yul:
-		// PROTO_FUZZER_DUMP_PATH=x.yul ./a.out proto-input
-		ofstream of(dump_path);
-		of.write(sol_source.data(), static_cast<streamsize>(sol_source.size()));
-	}
-
-	if (char const* dump_path = getenv("SOL_DEBUG_FILE"))
-	{
-		sol_source.clear();
-		// With libFuzzer binary run this to generate a YUL source file x.yul:
-		// PROTO_FUZZER_LOAD_PATH=x.yul ./a.out proto-input
-		ifstream ifstr(dump_path);
-		sol_source = {
-			std::istreambuf_iterator<char>(ifstr),
-			std::istreambuf_iterator<char>()
-		};
-		std::cout << sol_source << std::endl;
-	}
-
-	// We target the default EVM which is the latest
-	langutil::EVMVersion version;
-	EVMHost hostContext(version, evmone);
-	string contractName = "C";
-	string libraryName = converter.libraryTest() ? converter.libraryName() : "";
-	string methodName = "test()";
-	StringMap source({{"test.sol", sol_source}});
-	CompilerInput cInput(version, source, contractName, OptimiserSettings::minimal(), {});
-	EvmoneUtility evmoneUtil(
-		hostContext,
-		cInput,
-		contractName,
-		libraryName,
-		methodName
-	);
-	auto minimalResult = evmoneUtil.compileDeployAndExecute();
-	solAssert(minimalResult.status_code != EVMC_REVERT, "Sol proto fuzzer: Evmone reverted.");
-	if (minimalResult.status_code == EVMC_SUCCESS)
-		solAssert(
-			EvmoneUtility::zeroWord(minimalResult.output_data, minimalResult.output_size),
-			"Proto solc fuzzer: Output incorrect"
-		);
-}
diff --git a/test/tools/ossfuzz/solc_ossfuzz.cpp b/test/tools/ossfuzz/solc_ossfuzz.cpp
deleted file mode 100644
index 620ef332b976..000000000000
--- a/test/tools/ossfuzz/solc_ossfuzz.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/tools/fuzzer_common.h>
-
-#include <test/TestCaseReader.h>
-
-#include <sstream>
-
-using namespace solidity::frontend::test;
-using namespace std;
-
-// Prototype as we can't use the FuzzerInterface.h header.
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
-
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
-{
-	if (_size <= 600)
-	{
-		string input(reinterpret_cast<char const*>(_data), _size);
-		map<string, string> sourceCode;
-		try
-		{
-			TestCaseReader t = TestCaseReader(std::istringstream(input));
-			sourceCode = t.sources().sources;
-			map<string, string> settings = t.settings();
-			bool compileViaYul =
-				settings.count("compileViaYul") &&
-				(settings.at("compileViaYul") == "also" || settings.at("compileViaYul") == "true");
-			bool optimize = settings.count("optimize") && settings.at("optimize") == "true";
-			FuzzerUtil::testCompiler(
-				sourceCode,
-				optimize,
-				/*_rand=*/static_cast<unsigned>(_size),
-				/*forceSMT=*/true,
-				compileViaYul
-			);
-		}
-		catch (runtime_error const&)
-		{
-			return 0;
-		}
-	}
-	return 0;
-}
diff --git a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
deleted file mode 100644
index c7ffd3d417a3..000000000000
--- a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/YulStack.h>
-#include <libyul/backends/evm/EVMCodeTransform.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace std;
-
-// Prototype as we can't use the FuzzerInterface.h header.
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
-
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
-{
-	if (_size > 600)
-		return 0;
-
-	YulStringRepository::reset();
-
-	string input(reinterpret_cast<char const*>(_data), _size);
-	YulStack stack(
-		langutil::EVMVersion(),
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::minimal(),
-		langutil::DebugInfoSelection::All()
-	);
-
-	if (!stack.parseAndAnalyze("source", input))
-		return 0;
-
-	try
-	{
-		MachineAssemblyObject obj = stack.assemble(YulStack::Machine::EVM);
-		solAssert(obj.bytecode, "");
-	}
-	catch (StackTooDeepError const&)
-	{
-
-	}
-
-	return 0;
-}
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
deleted file mode 100644
index 5c923a3ea718..000000000000
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/Dialect.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/YulStack.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/StringUtils.h>
-
-#include <test/tools/ossfuzz/yulFuzzerCommon.h>
-
-#include <string>
-#include <memory>
-#include <iostream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul::test::yul_fuzzer;
-
-// Prototype as we can't use the FuzzerInterface.h header.
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
-
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
-{
-	if (_size > 600)
-		return 0;
-
-	string input(reinterpret_cast<char const*>(_data), _size);
-
-	if (std::any_of(input.begin(), input.end(), [](char c) {
-		return ((static_cast<unsigned char>(c) > 127) || !(isPrint(c) || (c == '\n') || (c == '\t')));
-	}))
-		return 0;
-
-	YulStringRepository::reset();
-
-	YulStack stack(
-		langutil::EVMVersion(),
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::full(),
-		DebugInfoSelection::All()
-	);
-	try
-	{
-		if (
-			!stack.parseAndAnalyze("source", input) ||
-			!stack.parserResult()->code ||
-			!stack.parserResult()->analysisInfo
-		)
-			return 0;
-	}
-	catch (Exception const&)
-	{
-		return 0;
-	}
-
-	ostringstream os1;
-	ostringstream os2;
-	// Disable memory tracing to avoid false positive reports
-	// such as unused write to memory e.g.,
-	// { mstore(0, 1) }
-	// that would be removed by the redundant store eliminator.
-	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
-		os1,
-		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		/*disableMemoryTracing=*/true
-	);
-	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
-		return 0;
-
-	stack.optimize();
-	termReason = yulFuzzerUtil::interpret(
-		os2,
-		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		/*disableMemoryTracing=*/true
-	);
-
-	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
-		return 0;
-
-	bool isTraceEq = (os1.str() == os2.str());
-	yulAssert(isTraceEq, "Interpreted traces for optimized and unoptimized code differ.");
-	return 0;
-}
diff --git a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
deleted file mode 100644
index db35cc865241..000000000000
--- a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <libyul/YulStack.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace std;
-
-// Prototype as we can't use the FuzzerInterface.h header.
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
-
-extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
-{
-	if (_size > 600)
-		return 0;
-
-	YulStringRepository::reset();
-
-	string input(reinterpret_cast<char const*>(_data), _size);
-	YulStack stack(
-		langutil::EVMVersion(),
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::full(),
-		DebugInfoSelection::All()
-	);
-
-	if (!stack.parseAndAnalyze("source", input))
-		return 0;
-
-	stack.optimize();
-	return 0;
-}
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.cpp b/test/tools/ossfuzz/yulFuzzerCommon.cpp
deleted file mode 100644
index 57f930cfe1e1..000000000000
--- a/test/tools/ossfuzz/yulFuzzerCommon.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <test/tools/ossfuzz/yulFuzzerCommon.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::test::yul_fuzzer;
-
-yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
-	ostream& _os,
-	shared_ptr<yul::Block> _ast,
-	Dialect const& _dialect,
-	bool _disableMemoryTracing,
-	bool _outputStorageOnly,
-	size_t _maxSteps,
-	size_t _maxTraceSize,
-	size_t _maxExprNesting
-)
-{
-	InterpreterState state;
-	state.maxTraceSize = _maxTraceSize;
-	state.maxSteps = _maxSteps;
-	state.maxExprNesting = _maxExprNesting;
-	// Add 64 bytes of pseudo-randomly generated calldata so that
-	// calldata opcodes perform non trivial work.
-	state.calldata = {
-		0xe9, 0x96, 0x40, 0x7d, 0xa5, 0xda, 0xb0, 0x2d,
-		0x97, 0xf5, 0xc3, 0x44, 0xd7, 0x65, 0x0a, 0xd8,
-		0x2c, 0x14, 0x3a, 0xf3, 0xe7, 0x40, 0x0f, 0x1e,
-		0x67, 0xce, 0x90, 0x44, 0x2e, 0x92, 0xdb, 0x88,
-		0xb8, 0x43, 0x9c, 0x41, 0x42, 0x08, 0xf1, 0xd7,
-		0x65, 0xe9, 0x7f, 0xeb, 0x7b, 0xb9, 0x56, 0x9f,
-		0xc7, 0x60, 0x5f, 0x7c, 0xcd, 0xfb, 0x92, 0xcd,
-		0x8e, 0xf3, 0x9b, 0xe4, 0x4f, 0x6c, 0x14, 0xde
-	};
-
-	TerminationReason reason = TerminationReason::None;
-	try
-	{
-		Interpreter::run(state, _dialect, *_ast, true, _disableMemoryTracing);
-	}
-	catch (StepLimitReached const&)
-	{
-		reason = TerminationReason::StepLimitReached;
-	}
-	catch (TraceLimitReached const&)
-	{
-		reason = TerminationReason::TraceLimitReached;
-	}
-	catch (ExpressionNestingLimitReached const&)
-	{
-		reason = TerminationReason::ExpresionNestingLimitReached;
-	}
-	catch (ExplicitlyTerminated const&)
-	{
-		reason = TerminationReason::ExplicitlyTerminated;
-	}
-
-	if (_outputStorageOnly)
-		state.dumpStorage(_os);
-	else
-		state.dumpTraceAndState(_os, _disableMemoryTracing);
-	return reason;
-}
-
-bool yulFuzzerUtil::resourceLimitsExceeded(TerminationReason _reason)
-{
-	return
-		_reason == yulFuzzerUtil::TerminationReason::StepLimitReached ||
-		_reason == yulFuzzerUtil::TerminationReason::TraceLimitReached ||
-		_reason == yulFuzzerUtil::TerminationReason::ExpresionNestingLimitReached;
-}
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.h b/test/tools/ossfuzz/yulFuzzerCommon.h
deleted file mode 100644
index 4c8f665f616c..000000000000
--- a/test/tools/ossfuzz/yulFuzzerCommon.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-#include <test/tools/yulInterpreter/Interpreter.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-namespace solidity::yul::test::yul_fuzzer
-{
-
-struct yulFuzzerUtil
-{
-	enum class TerminationReason
-	{
-		ExplicitlyTerminated,
-		StepLimitReached,
-		TraceLimitReached,
-		ExpresionNestingLimitReached,
-		None
-	};
-
-	/// Interprets the Yul AST pointed to by @param _ast. Flag @param _outputStorageOnly
-	/// (unset by default) outputs an execution trace of both memory and storage;
-	/// if set, only storage contents are output as part of the execution trace. The
-	/// latter avoids false positives that will be produced by the fuzzer when certain
-	/// optimizer steps are activated e.g., Redundant store eliminator, Equal store
-	/// eliminator.
-	static TerminationReason interpret(
-		std::ostream& _os,
-		std::shared_ptr<yul::Block> _ast,
-		Dialect const& _dialect,
-		bool _disableMemoryTracing = false,
-		bool _outputStorageOnly = false,
-		size_t _maxSteps = maxSteps,
-		size_t _maxTraceSize = maxTraceSize,
-		size_t _maxExprNesting = maxExprNesting
-	);
-
-	/// @returns true if @param _reason for Yul interpreter terminating is
-	/// resource exhaustion of some form e.g., exceeded maximum time-out
-	/// threshold, number of nested expressions etc.
-	static bool resourceLimitsExceeded(TerminationReason _reason);
-	static size_t constexpr maxSteps = 100;
-	static size_t constexpr maxTraceSize = 75;
-	static size_t constexpr maxExprNesting = 64;
-};
-
-}
diff --git a/test/tools/ossfuzz/yulOptimizerFuzzDictionary.h b/test/tools/ossfuzz/yulOptimizerFuzzDictionary.h
deleted file mode 100644
index 22ba98ce9c5b..000000000000
--- a/test/tools/ossfuzz/yulOptimizerFuzzDictionary.h
+++ /dev/null
@@ -1,777 +0,0 @@
-
-static const std::vector<std::string> hexDictionary = {
-	"0",
-	"1",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1f",
-	"9f",
-	"a0",
-	"a1",
-	"ff",
-	"100",
-	"101",
-	"10",
-	"100",
-	"1000",
-	"10000",
-	"100000",
-	"1000000",
-	"10000000",
-	"100000000",
-	"1000000000",
-	"10000000000",
-	"100000000000",
-	"1000000000000",
-	"10000000000000",
-	"100000000000000",
-	"1000000000000000",
-	"10000000000000000",
-	"100000000000000000",
-	"1000000000000000000",
-	"10000000000000000000",
-	"100000000000000000000",
-	"1000000000000000000000",
-	"10000000000000000000000",
-	"100000000000000000000000",
-	"1000000000000000000000000",
-	"10000000000000000000000000",
-	"100000000000000000000000000",
-	"1000000000000000000000000000",
-	"10000000000000000000000000000",
-	"100000000000000000000000000000",
-	"1000000000000000000000000000000",
-	"10000000000000000000000000000000",
-	"100000000000000000000000000000000",
-	"1000000000000000000000000000000000",
-	"10000000000000000000000000000000000",
-	"100000000000000000000000000000000000",
-	"1000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000000000000000",
-	"10000000000000000000000000000000000000000000000000000000000000",
-	"100000000000000000000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000000000000000000",
-	"1000000000000000000000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000000001",
-	"10000000000000000000000000000000000000001",
-	"1000000000000000000000000000000000000001",
-	"100000000000000000000000000000000000001",
-	"10000000000000000000000000000000000001",
-	"1000000000000000000000000000000000001",
-	"100000000000000000000000000000000001",
-	"10000000000000000000000000000000001",
-	"1000000000000000000000000000000001",
-	"100000000000000000000000000000001",
-	"10000000000000000000000000000001",
-	"1000000000000000000000000000001",
-	"100000000000000000000000000001",
-	"10000000000000000000000000001",
-	"1000000000000000000000000001",
-	"100000000000000000000000001",
-	"10000000000000000000000001",
-	"1000000000000000000000001",
-	"100000000000000000000001",
-	"10000000000000000000001",
-	"1000000000000000000001",
-	"100000000000000000001",
-	"10000000000000000001",
-	"1000000000000000001",
-	"100000000000000001",
-	"10000000000000001",
-	"1000000000000001",
-	"100000000000001",
-	"10000000000001",
-	"1000000000001",
-	"100000000001",
-	"10000000001",
-	"1000000001",
-	"100000001",
-	"10000001",
-	"1000001",
-	"100001",
-	"10001",
-	"1001",
-	"101",
-	"11",
-	"1f",
-	"1ff",
-	"1fff",
-	"1ffff",
-	"1fffff",
-	"1ffffff",
-	"1fffffff",
-	"1ffffffff",
-	"1fffffffff",
-	"1ffffffffff",
-	"1fffffffffff",
-	"1ffffffffffff",
-	"1fffffffffffff",
-	"1ffffffffffffff",
-	"1fffffffffffffff",
-	"1ffffffffffffffff",
-	"1fffffffffffffffff",
-	"1ffffffffffffffffff",
-	"1fffffffffffffffffff",
-	"1ffffffffffffffffffff",
-	"1fffffffffffffffffffff",
-	"1ffffffffffffffffffffff",
-	"1fffffffffffffffffffffff",
-	"1ffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"2",
-	"20",
-	"200",
-	"2000",
-	"20000",
-	"200000",
-	"2000000",
-	"20000000",
-	"200000000",
-	"2000000000",
-	"20000000000",
-	"200000000000",
-	"2000000000000",
-	"20000000000000",
-	"200000000000000",
-	"2000000000000000",
-	"20000000000000000",
-	"200000000000000000",
-	"2000000000000000000",
-	"20000000000000000000",
-	"200000000000000000000",
-	"2000000000000000000000",
-	"20000000000000000000000",
-	"200000000000000000000000",
-	"2000000000000000000000000",
-	"20000000000000000000000000",
-	"200000000000000000000000000",
-	"2000000000000000000000000000",
-	"20000000000000000000000000000",
-	"200000000000000000000000000000",
-	"2000000000000000000000000000000",
-	"20000000000000000000000000000000",
-	"200000000000000000000000000000000",
-	"2000000000000000000000000000000000",
-	"20000000000000000000000000000000000",
-	"200000000000000000000000000000000000",
-	"2000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000000000000000",
-	"20000000000000000000000000000000000000000000000000000000000000",
-	"200000000000000000000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000000000000000000",
-	"2000000000000000000000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000000001",
-	"20000000000000000000000000000000000000001",
-	"2000000000000000000000000000000000000001",
-	"200000000000000000000000000000000000001",
-	"20000000000000000000000000000000000001",
-	"2000000000000000000000000000000000001",
-	"200000000000000000000000000000000001",
-	"20000000000000000000000000000000001",
-	"2000000000000000000000000000000001",
-	"200000000000000000000000000000001",
-	"20000000000000000000000000000001",
-	"2000000000000000000000000000001",
-	"200000000000000000000000000001",
-	"20000000000000000000000000001",
-	"2000000000000000000000000001",
-	"200000000000000000000000001",
-	"20000000000000000000000001",
-	"2000000000000000000000001",
-	"200000000000000000000001",
-	"20000000000000000000001",
-	"2000000000000000000001",
-	"200000000000000000001",
-	"20000000000000000001",
-	"2000000000000000001",
-	"200000000000000001",
-	"20000000000000001",
-	"2000000000000001",
-	"200000000000001",
-	"20000000000001",
-	"2000000000001",
-	"200000000001",
-	"20000000001",
-	"2000000001",
-	"200000001",
-	"20000001",
-	"2000001",
-	"200001",
-	"20001",
-	"2001",
-	"201",
-	"21",
-	"3",
-	"3f",
-	"3ff",
-	"3fff",
-	"3ffff",
-	"3fffff",
-	"3ffffff",
-	"3fffffff",
-	"3ffffffff",
-	"3fffffffff",
-	"3ffffffffff",
-	"3fffffffffff",
-	"3ffffffffffff",
-	"3fffffffffffff",
-	"3ffffffffffffff",
-	"3fffffffffffffff",
-	"3ffffffffffffffff",
-	"3fffffffffffffffff",
-	"3ffffffffffffffffff",
-	"3fffffffffffffffffff",
-	"3ffffffffffffffffffff",
-	"3fffffffffffffffffffff",
-	"3ffffffffffffffffffffff",
-	"3fffffffffffffffffffffff",
-	"3ffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"4",
-	"40",
-	"400",
-	"4000",
-	"40000",
-	"400000",
-	"4000000",
-	"40000000",
-	"400000000",
-	"4000000000",
-	"40000000000",
-	"400000000000",
-	"4000000000000",
-	"40000000000000",
-	"400000000000000",
-	"4000000000000000",
-	"40000000000000000",
-	"400000000000000000",
-	"4000000000000000000",
-	"40000000000000000000",
-	"400000000000000000000",
-	"4000000000000000000000",
-	"40000000000000000000000",
-	"400000000000000000000000",
-	"4000000000000000000000000",
-	"40000000000000000000000000",
-	"400000000000000000000000000",
-	"4000000000000000000000000000",
-	"40000000000000000000000000000",
-	"400000000000000000000000000000",
-	"4000000000000000000000000000000",
-	"40000000000000000000000000000000",
-	"400000000000000000000000000000000",
-	"4000000000000000000000000000000000",
-	"40000000000000000000000000000000000",
-	"400000000000000000000000000000000000",
-	"4000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000000000000000",
-	"40000000000000000000000000000000000000000000000000000000000000",
-	"400000000000000000000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000000000000000000",
-	"4000000000000000000000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000000001",
-	"40000000000000000000000000000000000000001",
-	"4000000000000000000000000000000000000001",
-	"400000000000000000000000000000000000001",
-	"40000000000000000000000000000000000001",
-	"4000000000000000000000000000000000001",
-	"400000000000000000000000000000000001",
-	"40000000000000000000000000000000001",
-	"4000000000000000000000000000000001",
-	"400000000000000000000000000000001",
-	"40000000000000000000000000000001",
-	"4000000000000000000000000000001",
-	"400000000000000000000000000001",
-	"40000000000000000000000000001",
-	"4000000000000000000000000001",
-	"400000000000000000000000001",
-	"40000000000000000000000001",
-	"4000000000000000000000001",
-	"400000000000000000000001",
-	"40000000000000000000001",
-	"4000000000000000000001",
-	"400000000000000000001",
-	"40000000000000000001",
-	"4000000000000000001",
-	"400000000000000001",
-	"40000000000000001",
-	"4000000000000001",
-	"400000000000001",
-	"40000000000001",
-	"4000000000001",
-	"400000000001",
-	"40000000001",
-	"4000000001",
-	"400000001",
-	"40000001",
-	"4000001",
-	"400001",
-	"40001",
-	"4001",
-	"401",
-	"41",
-	"5",
-	"7",
-	"7f",
-	"7ff",
-	"7fff",
-	"7ffff",
-	"7fffff",
-	"7ffffff",
-	"7fffffff",
-	"7ffffffff",
-	"7fffffffff",
-	"7ffffffffff",
-	"7fffffffffff",
-	"7ffffffffffff",
-	"7fffffffffffff",
-	"7ffffffffffffff",
-	"7fffffffffffffff",
-	"7ffffffffffffffff",
-	"7fffffffffffffffff",
-	"7ffffffffffffffffff",
-	"7fffffffffffffffffff",
-	"7ffffffffffffffffffff",
-	"7fffffffffffffffffffff",
-	"7ffffffffffffffffffffff",
-	"7fffffffffffffffffffffff",
-	"7ffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"8",
-	"80",
-	"800",
-	"8000",
-	"80000",
-	"800000",
-	"8000000",
-	"80000000",
-	"800000000",
-	"8000000000",
-	"80000000000",
-	"800000000000",
-	"8000000000000",
-	"80000000000000",
-	"800000000000000",
-	"8000000000000000",
-	"80000000000000000",
-	"800000000000000000",
-	"8000000000000000000",
-	"80000000000000000000",
-	"800000000000000000000",
-	"8000000000000000000000",
-	"80000000000000000000000",
-	"800000000000000000000000",
-	"8000000000000000000000000",
-	"80000000000000000000000000",
-	"800000000000000000000000000",
-	"8000000000000000000000000000",
-	"80000000000000000000000000000",
-	"800000000000000000000000000000",
-	"8000000000000000000000000000000",
-	"80000000000000000000000000000000",
-	"800000000000000000000000000000000",
-	"8000000000000000000000000000000000",
-	"80000000000000000000000000000000000",
-	"800000000000000000000000000000000000",
-	"8000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000000000000000",
-	"80000000000000000000000000000000000000000000000000000000000000",
-	"800000000000000000000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000000000000000000",
-	"8000000000000000000000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000000001",
-	"80000000000000000000000000000000000000001",
-	"8000000000000000000000000000000000000001",
-	"800000000000000000000000000000000000001",
-	"80000000000000000000000000000000000001",
-	"8000000000000000000000000000000000001",
-	"800000000000000000000000000000000001",
-	"80000000000000000000000000000000001",
-	"8000000000000000000000000000000001",
-	"800000000000000000000000000000001",
-	"80000000000000000000000000000001",
-	"8000000000000000000000000000001",
-	"800000000000000000000000000001",
-	"80000000000000000000000000001",
-	"8000000000000000000000000001",
-	"800000000000000000000000001",
-	"80000000000000000000000001",
-	"8000000000000000000000001",
-	"800000000000000000000001",
-	"80000000000000000000001",
-	"8000000000000000000001",
-	"800000000000000000001",
-	"80000000000000000001",
-	"8000000000000000001",
-	"800000000000000001",
-	"80000000000000001",
-	"8000000000000001",
-	"800000000000001",
-	"80000000000001",
-	"8000000000001",
-	"800000000001",
-	"80000000001",
-	"8000000001",
-	"800000001",
-	"80000001",
-	"8000001",
-	"800001",
-	"80001",
-	"8001",
-	"801",
-	"81",
-	"9",
-	"f",
-	"ff",
-	"fff",
-	"ffff",
-	"fffff",
-	"ffffff",
-	"fffffff",
-	"ffffffff",
-	"fffffffff",
-	"ffffffffff",
-	"fffffffffff",
-	"ffffffffffff",
-	"fffffffffffff",
-	"ffffffffffffff",
-	"fffffffffffffff",
-	"ffffffffffffffff",
-	"fffffffffffffffff",
-	"ffffffffffffffffff",
-	"fffffffffffffffffff",
-	"ffffffffffffffffffff",
-	"fffffffffffffffffffff",
-	"ffffffffffffffffffffff",
-	"fffffffffffffffffffffff",
-	"ffffffffffffffffffffffff",
-	"fffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-	"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-};
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
deleted file mode 100644
index 76d85068d3ad..000000000000
--- a/test/tools/ossfuzz/yulProto.proto
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-syntax = "proto2";
-
-message VarDecl {
-  required Expression expr = 1;
-}
-
-message MultiVarDecl {
-  required uint32 num_vars = 1;
-}
-
-message LowLevelCall {
-  enum Type {
-    CALL = 0;
-    CALLCODE = 1;
-    DELEGATECALL = 2;
-    STATICCALL = 3;
-  }
-  required Type callty = 1;
-  required Expression gas = 2;
-  required Expression addr = 3;
-  // Valid for call and callcode only
-  required Expression wei = 4;
-  required Expression in = 5;
-  required Expression insize = 6;
-  required Expression out = 7;
-  required Expression outsize = 8;
-}
-
-message Create {
-  enum Type {
-    CREATE = 0;
-    CREATE2 = 1;
-  }
-  required Type createty = 1;
-  required Expression wei = 2;
-  required Expression position = 3;
-  required Expression size = 4;
-  // Valid for create2 only
-  required Expression value = 5;
-}
-
-message FunctionCall {
-  required Expression in_param1 = 1;
-  required Expression in_param2 = 2;
-  required Expression in_param3 = 3;
-  required Expression in_param4 = 4;
-}
-
-message TypedVarDecl {
-  enum TypeName {
-    BOOL = 1;
-    U8 = 2;
-    U32 = 3;
-    U64 = 4;
-    U128 = 5;
-    U256 = 6;
-    S8 = 7;
-    S32 = 8;
-    S64 = 9;
-    S128 = 10;
-    S256 = 11;
-  };
-  required int32 id = 1;
-  required TypeName type = 2;
-  required Expression expr = 3;
-}
-
-message VarRef {
-  required int32 varnum = 1;
-}
-
-message Literal {
-  oneof literal_oneof {
-    uint64 intval = 1;
-    string hexval = 2;
-    string strval = 3;
-    bool boolval = 4;
-  }
-}
-
-message TypedLiteral {
-  enum TypeName {
-    BOOL = 1;
-    U8 = 2;
-    U32 = 3;
-    U64 = 4;
-    U128 = 5;
-    U256 = 6;
-    S8 = 7;
-    S32 = 8;
-    S64 = 9;
-    S128 = 10;
-    S256 = 11;
-  };
-  required int32 val = 1;
-  required TypeName type = 2;
-}
-
-message BinaryOp {
-  enum BOp {
-    ADD = 0;
-    SUB = 1;
-    MUL = 2;
-    DIV = 3;
-    MOD = 4;
-    XOR = 5;
-    AND = 6;
-    OR = 7;
-    EQ = 8;
-    LT = 9;
-    GT = 10;
-    SHR = 11;
-    SHL = 12;
-    SAR = 13;
-    SDIV = 14;
-    SMOD = 15;
-    EXP = 16;
-    SLT = 17;
-    SGT = 18;
-    BYTE = 19;
-    SI = 20;
-    KECCAK = 21;
-  };
-  required BOp op = 1;
-  required Expression left = 2;
-  required Expression right = 3;
-}
-
-message UnaryOp {
-  enum UOp {
-    NOT = 0;
-    MLOAD = 1;
-    SLOAD = 2;
-    ISZERO = 3;
-    CALLDATALOAD = 4;
-    EXTCODESIZE = 5;
-    EXTCODEHASH = 6;
-    BALANCE = 7;
-    BLOCKHASH = 8;
-  }
-  required UOp op = 1;
-  required Expression operand = 2;
-}
-
-message UnaryOpData {
-  enum UOpData {
-    SIZE = 1;
-    OFFSET = 2;
-  }
-  required UOpData op = 1;
-  required uint64 identifier = 2;
-}
-
-message TernaryOp {
-  enum TOp {
-    ADDM = 0;
-    MULM = 1;
-  }
-  required TOp op = 1;
-  required Expression arg1 = 2;
-  required Expression arg2 = 3;
-  required Expression arg3 = 4;
-}
-
-message CopyFunc {
-  enum CopyType {
-    CALLDATA = 0;
-    CODE = 1;
-    RETURNDATA = 2;
-    DATA = 3;
-  }
-  required CopyType ct = 1;
-  required Expression target = 2;
-  required Expression source = 3;
-  required Expression size = 4;
-}
-
-message ExtCodeCopy {
-  required Expression addr = 1;
-  required Expression target = 2;
-  required Expression source = 3;
-  required Expression size = 4;
-}
-
-message NullaryOp {
-  enum NOp {
-    MSIZE = 1;
-    GAS = 2;
-    CALLDATASIZE = 3;
-    CODESIZE = 4;
-    RETURNDATASIZE = 5;
-    ADDRESS = 6;
-    ORIGIN = 7;
-    CALLER = 8;
-    CALLVALUE = 9;
-    GASPRICE = 10;
-    COINBASE = 11;
-    TIMESTAMP = 12;
-    NUMBER = 13;
-    DIFFICULTY = 14;
-    GASLIMIT = 15;
-    SELFBALANCE = 16;
-    CHAINID = 17;
-  }
-  required NOp op = 1;
-}
-
-message StoreFunc {
-  enum Storage {
-    MSTORE = 0;
-    SSTORE = 1;
-    MSTORE8 = 2;
-  }
-  required Expression loc = 1;
-  required Expression val = 2;
-  required Storage st = 3;
-}
-
-message LogFunc {
-  enum NumTopics {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-    THREE = 3;
-    FOUR = 4;
-  }
-  required Expression pos = 1;
-  required Expression size = 2;
-  required NumTopics num_topics = 3;
-  required Expression t1 = 4;
-  required Expression t2 = 5;
-  required Expression t3 = 6;
-  required Expression t4 = 7;
-}
-
-message Expression {
-  oneof expr_oneof {
-    VarRef varref = 1;
-    Literal cons = 2;
-    BinaryOp binop = 3;
-    UnaryOp unop = 4;
-    TernaryOp top = 5;
-    NullaryOp nop = 6;
-    FunctionCall func_expr = 7;
-    LowLevelCall lowcall = 8;
-    Create create = 9;
-    UnaryOpData unopdata = 10;
-  }
-}
-
-message AssignmentStatement {
-  required VarRef ref_id = 1;
-  required Expression expr = 2;
-}
-
-message IfStmt {
-  required Expression cond = 1;
-  required Block if_body = 2;
-}
-
-message BoundedForStmt {
-  required Block for_body = 1;
-}
-
-message ForStmt {
-  required Block for_body = 1;
-  required Block for_init = 2;
-  required Block for_post = 3;
-  required Expression for_cond = 4;
-}
-
-message CaseStmt {
-  required Literal case_lit = 1;
-  required Block case_block = 2;
-}
-
-message SwitchStmt {
-  required Expression switch_expr = 1;
-  repeated CaseStmt case_stmt = 2;
-  optional Block default_block = 3;
-}
-
-message BreakStmt {}
-message ContinueStmt {}
-
-message StopInvalidStmt {
-  enum Type {
-    STOP = 0;
-    INVALID = 1;
-  }
-  required Type stmt = 1;
-}
-
-message RetRevStmt {
-  enum Type {
-    RETURN = 0;
-    REVERT = 1;
-  }
-  required Type stmt = 1;
-  required Expression pos = 2;
-  required Expression size = 3;
-}
-
-message SelfDestructStmt {
-  required Expression addr = 1;
-}
-
-message TerminatingStmt {
-  oneof term_oneof {
-    StopInvalidStmt   stop_invalid = 1;
-    RetRevStmt        ret_rev = 2;
-    SelfDestructStmt  self_des = 3;
-  }
-}
-
-message FunctionDef {
-  required uint32 num_input_params = 1;
-  required uint32 num_output_params = 2;
-  required Block block = 3;
-  required bool force_call = 4;
-}
-
-message PopStmt {
-  required Expression expr = 1;
-}
-
-message LeaveStmt {}
-
-message Statement {
-  oneof stmt_oneof {
-    VarDecl             decl            = 1;
-    AssignmentStatement assignment      = 2;
-    IfStmt              ifstmt          = 3;
-    StoreFunc           storage_func    = 4;
-    Block               blockstmt       = 5;
-    ForStmt             forstmt         = 6;
-    SwitchStmt          switchstmt      = 7;
-    BreakStmt           breakstmt       = 8;
-    ContinueStmt        contstmt        = 9;
-    LogFunc             log_func        = 10;
-    CopyFunc            copy_func       = 11;
-    ExtCodeCopy         extcode_copy    = 12;
-    TerminatingStmt     terminatestmt   = 13;
-    FunctionCall        functioncall    = 14;
-    BoundedForStmt      boundedforstmt  = 15;
-    FunctionDef         funcdef         = 16;
-    PopStmt             pop             = 17;
-    LeaveStmt           leave           = 18;
-    MultiVarDecl        multidecl       = 19;
-  }
-}
-
-message Block {
-  repeated Statement statements = 1;
-}
-
-message Object {
-  required Code code = 1;
-  optional Data data = 2;
-  repeated Object sub_obj = 3;
-}
-
-message Code {
-  required Block block = 1;
-}
-
-message Data {
-  required string hex = 1;
-}
-
-message Program {
-  enum Version {
-    HOMESTEAD = 0;
-    TANGERINE = 1;
-    SPURIOUS = 2;
-    BYZANTIUM = 3;
-    CONSTANTINOPLE = 4;
-    PETERSBURG = 5;
-    ISTANBUL = 6;
-    BERLIN = 7;
-    LONDON = 8;
-    PARIS = 9;
-  }
-  oneof program_oneof {
-    Block block = 1;
-    Object obj = 2;
-  }
-  required Version ver = 3;
-  required uint32 step = 4;
-}
-
-package solidity.yul.test.yul_fuzzer;
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
deleted file mode 100644
index c2ac680934e5..000000000000
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <fstream>
-
-#include <test/tools/ossfuzz/yulProto.pb.h>
-#include <test/tools/ossfuzz/protoToYul.h>
-
-#include <test/tools/fuzzer_common.h>
-
-#include <test/libyul/YulOptimizerTestCommon.h>
-
-#include <libyul/YulStack.h>
-#include <libyul/Exceptions.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <src/libfuzzer/libfuzzer_macro.h>
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::yul::test::yul_fuzzer;
-using namespace std;
-
-DEFINE_PROTO_FUZZER(Program const& _input)
-{
-	ProtoConverter converter;
-	string yul_source = converter.programToString(_input);
-	EVMVersion version = converter.version();
-
-	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
-	{
-		// With libFuzzer binary run this to generate a YUL source file x.yul:
-		// PROTO_FUZZER_DUMP_PATH=x.yul ./a.out proto-input
-		ofstream of(dump_path);
-		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
-	}
-
-	if (yul_source.size() > 1200)
-		return;
-
-	YulStringRepository::reset();
-
-	// YulStack entry point
-	YulStack stack(
-		version,
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::full(),
-		DebugInfoSelection::All()
-	);
-
-	// Parse protobuf mutated YUL code
-	if (
-		!stack.parseAndAnalyze("source", yul_source) ||
-		!stack.parserResult()->code ||
-		!stack.parserResult()->analysisInfo ||
-		Error::containsErrors(stack.errors())
-	)
-		yulAssert(false, "Proto fuzzer generated malformed program");
-
-	// Optimize
-	YulOptimizerTestCommon optimizerTest(
-		stack.parserResult(),
-		EVMDialect::strictAssemblyForEVMObjects(version)
-	);
-	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
-	shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
-	yulAssert(astBlock != nullptr, "Optimiser error.");
-}
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
deleted file mode 100644
index d1717a159a5e..000000000000
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <fstream>
-
-#include <test/tools/ossfuzz/yulProto.pb.h>
-#include <test/tools/fuzzer_common.h>
-#include <test/tools/ossfuzz/protoToYul.h>
-
-#include <test/libyul/YulOptimizerTestCommon.h>
-
-#include <src/libfuzzer/libfuzzer_macro.h>
-
-#include <libyul/YulStack.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/Exceptions.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <test/tools/ossfuzz/yulFuzzerCommon.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::yul::test::yul_fuzzer;
-
-DEFINE_PROTO_FUZZER(Program const& _input)
-{
-	ProtoConverter converter;
-	string yul_source = converter.programToString(_input);
-	EVMVersion version = converter.version();
-
-	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
-	{
-		// With libFuzzer binary run this to generate a YUL source file x.yul:
-		// PROTO_FUZZER_DUMP_PATH=x.yul ./a.out proto-input
-		ofstream of(dump_path);
-		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
-	}
-
-	YulStringRepository::reset();
-
-	// YulStack entry point
-	YulStack stack(
-		version,
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::full(),
-		DebugInfoSelection::All()
-	);
-
-	// Parse protobuf mutated YUL code
-	if (
-		!stack.parseAndAnalyze("source", yul_source) ||
-		!stack.parserResult()->code ||
-		!stack.parserResult()->analysisInfo ||
-		Error::containsErrors(stack.errors())
-	)
-	{
-		SourceReferenceFormatter{std::cout, stack, false, false}.printErrorInformation(stack.errors());
-		yulAssert(false, "Proto fuzzer generated malformed program");
-	}
-
-	ostringstream os1;
-	ostringstream os2;
-	// Disable memory tracing to avoid false positive reports
-	// such as unused write to memory e.g.,
-	// { mstore(0, 1) }
-	// that would be removed by the redundant store eliminator.
-	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
-		os1,
-		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(version),
-		/*disableMemoryTracing=*/true
-	);
-
-	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
-		return;
-
-	YulOptimizerTestCommon optimizerTest(
-		stack.parserResult(),
-		EVMDialect::strictAssemblyForEVMObjects(version)
-	);
-	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
-	shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
-	yulAssert(astBlock != nullptr, "Optimiser error.");
-	termReason = yulFuzzerUtil::interpret(
-		os2,
-		astBlock,
-		EVMDialect::strictAssemblyForEVMObjects(version),
-		true
-	);
-	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
-		return;
-
-	bool isTraceEq = (os1.str() == os2.str());
-	if (!isTraceEq)
-	{
-		cout << os1.str() << endl;
-		cout << os2.str() << endl;
-		yulAssert(false, "Interpreted traces for optimized and unoptimized code differ.");
-	}
-	return;
-}
diff --git a/test/tools/yulInterpreter/CMakeLists.txt b/test/tools/yulInterpreter/CMakeLists.txt
deleted file mode 100644
index 235e8fac10a6..000000000000
--- a/test/tools/yulInterpreter/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(sources
-	EVMInstructionInterpreter.h
-	EVMInstructionInterpreter.cpp
-	Interpreter.h
-	Interpreter.cpp
-	Inspector.h
-	Inspector.cpp
-)
-
-add_library(yulInterpreter ${sources})
-target_link_libraries(yulInterpreter PUBLIC yul solidity solutil)
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
deleted file mode 100644
index 132066f4ad31..000000000000
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul interpreter module that evaluates EVM instructions.
- */
-
-#include <test/tools/yulInterpreter/EVMInstructionInterpreter.h>
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AST.h>
-
-#include <libevmasm/Instruction.h>
-#include <libevmasm/SemanticInformation.h>
-
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/Numeric.h>
-
-#include <limits>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::evmasm;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-
-using solidity::util::h160;
-using solidity::util::h256;
-using solidity::util::keccak256;
-
-namespace
-{
-
-/// Reads 32 bytes from @a _data at position @a _offset bytes while
-/// interpreting @a _data to be padded with an infinite number of zero
-/// bytes beyond its end.
-u256 readZeroExtended(bytes const& _data, u256 const& _offset)
-{
-	if (_offset >= _data.size())
-		return 0;
-	else if (_offset + 32 <= _data.size())
-		return *reinterpret_cast<h256 const*>(_data.data() + static_cast<size_t>(_offset));
-	else
-	{
-		size_t off = static_cast<size_t>(_offset);
-		u256 val;
-		for (size_t i = 0; i < 32; ++i)
-		{
-			val <<= 8;
-			if (off + i < _data.size())
-				val += _data[off + i];
-		}
-		return val;
-	}
-}
-
-}
-
-namespace solidity::yul::test
-{
-/// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
-/// @a _target at offset @a _targetOffset. Behaves as if @a _source would
-/// continue with an infinite sequence of zero bytes beyond its end.
-void copyZeroExtended(
-	map<u256, uint8_t>& _target, bytes const& _source,
-	size_t _targetOffset, size_t _sourceOffset, size_t _size
-)
-{
-	for (size_t i = 0; i < _size; ++i)
-		_target[_targetOffset + i] = _sourceOffset + i < _source.size() ? _source[_sourceOffset + i] : 0;
-}
-
-}
-
-using u512 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<512, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
-
-u256 EVMInstructionInterpreter::eval(
-	evmasm::Instruction _instruction,
-	vector<u256> const& _arguments
-)
-{
-	using namespace solidity::evmasm;
-	using evmasm::Instruction;
-
-	auto info = instructionInfo(_instruction, m_evmVersion);
-	yulAssert(static_cast<size_t>(info.args) == _arguments.size(), "");
-
-	auto const& arg = _arguments;
-	switch (_instruction)
-	{
-	case Instruction::STOP:
-		logTrace(_instruction);
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	// --------------- arithmetic ---------------
-	case Instruction::ADD:
-		return arg[0] + arg[1];
-	case Instruction::MUL:
-		return arg[0] * arg[1];
-	case Instruction::SUB:
-		return arg[0] - arg[1];
-	case Instruction::DIV:
-		return arg[1] == 0 ? 0 : arg[0] / arg[1];
-	case Instruction::SDIV:
-		return arg[1] == 0 ? 0 : s2u(u2s(arg[0]) / u2s(arg[1]));
-	case Instruction::MOD:
-		return arg[1] == 0 ? 0 : arg[0] % arg[1];
-	case Instruction::SMOD:
-		return arg[1] == 0 ? 0 : s2u(u2s(arg[0]) % u2s(arg[1]));
-	case Instruction::EXP:
-		return exp256(arg[0], arg[1]);
-	case Instruction::NOT:
-		return ~arg[0];
-	case Instruction::LT:
-		return arg[0] < arg[1] ? 1 : 0;
-	case Instruction::GT:
-		return arg[0] > arg[1] ? 1 : 0;
-	case Instruction::SLT:
-		return u2s(arg[0]) < u2s(arg[1]) ? 1 : 0;
-	case Instruction::SGT:
-		return u2s(arg[0]) > u2s(arg[1]) ? 1 : 0;
-	case Instruction::EQ:
-		return arg[0] == arg[1] ? 1 : 0;
-	case Instruction::ISZERO:
-		return arg[0] == 0 ? 1 : 0;
-	case Instruction::AND:
-		return arg[0] & arg[1];
-	case Instruction::OR:
-		return arg[0] | arg[1];
-	case Instruction::XOR:
-		return arg[0] ^ arg[1];
-	case Instruction::BYTE:
-		return arg[0] >= 32 ? 0 : (arg[1] >> unsigned(8 * (31 - arg[0]))) & 0xff;
-	case Instruction::SHL:
-		return arg[0] > 255 ? 0 : (arg[1] << unsigned(arg[0]));
-	case Instruction::SHR:
-		return arg[0] > 255 ? 0 : (arg[1] >> unsigned(arg[0]));
-	case Instruction::SAR:
-	{
-		static u256 const hibit = u256(1) << 255;
-		if (arg[0] >= 256)
-			return arg[1] & hibit ? u256(-1) : 0;
-		else
-		{
-			unsigned amount = unsigned(arg[0]);
-			u256 v = arg[1] >> amount;
-			if (arg[1] & hibit)
-				v |= u256(-1) << (256 - amount);
-			return v;
-		}
-	}
-	case Instruction::ADDMOD:
-		return arg[2] == 0 ? 0 : u256((u512(arg[0]) + u512(arg[1])) % arg[2]);
-	case Instruction::MULMOD:
-		return arg[2] == 0 ? 0 : u256((u512(arg[0]) * u512(arg[1])) % arg[2]);
-	case Instruction::SIGNEXTEND:
-		if (arg[0] >= 31)
-			return arg[1];
-		else
-		{
-			unsigned testBit = unsigned(arg[0]) * 8 + 7;
-			u256 ret = arg[1];
-			u256 mask = ((u256(1) << testBit) - 1);
-			if (boost::multiprecision::bit_test(ret, testBit))
-				ret |= ~mask;
-			else
-				ret &= mask;
-			return ret;
-		}
-	// --------------- blockchain stuff ---------------
-	case Instruction::KECCAK256:
-	{
-		if (!accessMemory(arg[0], arg[1]))
-			return u256("0x1234cafe1234cafe1234cafe") + arg[0];
-		uint64_t offset = uint64_t(arg[0] & uint64_t(-1));
-		uint64_t size = uint64_t(arg[1] & uint64_t(-1));
-		return u256(keccak256(m_state.readMemory(offset, size)));
-	}
-	case Instruction::ADDRESS:
-		return h256(m_state.address, h256::AlignRight);
-	case Instruction::BALANCE:
-		if (arg[0] == h256(m_state.address, h256::AlignRight))
-			return m_state.selfbalance;
-		else
-			return m_state.balance;
-	case Instruction::SELFBALANCE:
-		return m_state.selfbalance;
-	case Instruction::ORIGIN:
-		return h256(m_state.origin, h256::AlignRight);
-	case Instruction::CALLER:
-		return h256(m_state.caller, h256::AlignRight);
-	case Instruction::CALLVALUE:
-		return m_state.callvalue;
-	case Instruction::CALLDATALOAD:
-		return readZeroExtended(m_state.calldata, arg[0]);
-	case Instruction::CALLDATASIZE:
-		return m_state.calldata.size();
-	case Instruction::CALLDATACOPY:
-		if (accessMemory(arg[0], arg[2]))
-			copyZeroExtended(
-				m_state.memory, m_state.calldata,
-				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
-			);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::CODESIZE:
-		return m_state.code.size();
-	case Instruction::CODECOPY:
-		if (accessMemory(arg[0], arg[2]))
-			copyZeroExtended(
-				m_state.memory, m_state.code,
-				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
-			);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::GASPRICE:
-		return m_state.gasprice;
-	case Instruction::CHAINID:
-		return m_state.chainid;
-	case Instruction::BASEFEE:
-		return m_state.basefee;
-	case Instruction::EXTCODESIZE:
-		return u256(keccak256(h256(arg[0]))) & 0xffffff;
-	case Instruction::EXTCODEHASH:
-		return u256(keccak256(h256(arg[0] + 1)));
-	case Instruction::EXTCODECOPY:
-		if (accessMemory(arg[1], arg[3]))
-			// TODO this way extcodecopy and codecopy do the same thing.
-			copyZeroExtended(
-				m_state.memory, m_state.code,
-				size_t(arg[1]), size_t(arg[2]), size_t(arg[3])
-			);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::RETURNDATASIZE:
-		return m_state.returndata.size();
-	case Instruction::RETURNDATACOPY:
-		if (accessMemory(arg[0], arg[2]))
-			copyZeroExtended(
-				m_state.memory, m_state.returndata,
-				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
-			);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::BLOCKHASH:
-		if (arg[0] >= m_state.blockNumber || arg[0] + 256 < m_state.blockNumber)
-			return 0;
-		else
-			return 0xaaaaaaaa + (arg[0] - m_state.blockNumber - 256);
-	case Instruction::COINBASE:
-		return h256(m_state.coinbase, h256::AlignRight);
-	case Instruction::TIMESTAMP:
-		return m_state.timestamp;
-	case Instruction::NUMBER:
-		return m_state.blockNumber;
-	case Instruction::PREVRANDAO:
-		return (m_evmVersion < langutil::EVMVersion::paris()) ? m_state.difficulty : m_state.prevrandao;
-	case Instruction::GASLIMIT:
-		return m_state.gaslimit;
-	// --------------- memory / storage / logs ---------------
-	case Instruction::MLOAD:
-		accessMemory(arg[0], 0x20);
-		return readMemoryWord(arg[0]);
-	case Instruction::MSTORE:
-		accessMemory(arg[0], 0x20);
-		writeMemoryWord(arg[0], arg[1]);
-		return 0;
-	case Instruction::MSTORE8:
-		accessMemory(arg[0], 1);
-		m_state.memory[arg[0]] = uint8_t(arg[1] & 0xff);
-		return 0;
-	case Instruction::SLOAD:
-		return m_state.storage[h256(arg[0])];
-	case Instruction::SSTORE:
-		m_state.storage[h256(arg[0])] = h256(arg[1]);
-		return 0;
-	case Instruction::PC:
-		return 0x77;
-	case Instruction::MSIZE:
-		return m_state.msize;
-	case Instruction::GAS:
-		return 0x99;
-	case Instruction::LOG0:
-		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::LOG1:
-		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::LOG2:
-		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::LOG3:
-		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
-		return 0;
-	case Instruction::LOG4:
-		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
-		return 0;
-	// --------------- calls ---------------
-	case Instruction::CREATE:
-		accessMemory(arg[1], arg[2]);
-		logTrace(_instruction, arg);
-		if (arg[2] != 0)
-			return (0xcccccc + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
-		else
-			return 0xcccccc;
-	case Instruction::CREATE2:
-		accessMemory(arg[1], arg[2]);
-		logTrace(_instruction, arg);
-		if (arg[2] != 0)
-			return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
-		else
-			return 0xdddddd;
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-		accessMemory(arg[3], arg[4]);
-		accessMemory(arg[5], arg[6]);
-		logTrace(_instruction, arg);
-		// Randomly fail based on the called address if it isn't a call to self.
-		// Used for fuzzing.
-		return (
-			(arg[0] > 0) &&
-			(arg[1] == util::h160::Arith(m_state.address) || (arg[1] & 1))
-		) ? 1 : 0;
-	case Instruction::DELEGATECALL:
-	case Instruction::STATICCALL:
-		accessMemory(arg[2], arg[3]);
-		accessMemory(arg[4], arg[5]);
-		logTrace(_instruction, arg);
-		// Randomly fail based on the called address if it isn't a call to self.
-		// Used for fuzzing.
-		return (
-			(arg[0] > 0) &&
-			(arg[1] == util::h160::Arith(m_state.address) || (arg[1] & 1))
-		) ? 1 : 0;
-	case Instruction::RETURN:
-	{
-		m_state.returndata = {};
-		if (accessMemory(arg[0], arg[1]))
-			m_state.returndata = m_state.readMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg, m_state.returndata);
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminatedWithReturn());
-	}
-	case Instruction::REVERT:
-		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
-		m_state.storage.clear();
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	case Instruction::INVALID:
-		logTrace(_instruction);
-		m_state.storage.clear();
-		m_state.trace.clear();
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	case Instruction::SELFDESTRUCT:
-		logTrace(_instruction, arg);
-		m_state.storage.clear();
-		m_state.trace.clear();
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	case Instruction::POP:
-		break;
-	// --------------- invalid in strict assembly ---------------
-	case Instruction::JUMP:
-	case Instruction::JUMPI:
-	case Instruction::JUMPDEST:
-	case Instruction::PUSH0:
-	case Instruction::PUSH1:
-	case Instruction::PUSH2:
-	case Instruction::PUSH3:
-	case Instruction::PUSH4:
-	case Instruction::PUSH5:
-	case Instruction::PUSH6:
-	case Instruction::PUSH7:
-	case Instruction::PUSH8:
-	case Instruction::PUSH9:
-	case Instruction::PUSH10:
-	case Instruction::PUSH11:
-	case Instruction::PUSH12:
-	case Instruction::PUSH13:
-	case Instruction::PUSH14:
-	case Instruction::PUSH15:
-	case Instruction::PUSH16:
-	case Instruction::PUSH17:
-	case Instruction::PUSH18:
-	case Instruction::PUSH19:
-	case Instruction::PUSH20:
-	case Instruction::PUSH21:
-	case Instruction::PUSH22:
-	case Instruction::PUSH23:
-	case Instruction::PUSH24:
-	case Instruction::PUSH25:
-	case Instruction::PUSH26:
-	case Instruction::PUSH27:
-	case Instruction::PUSH28:
-	case Instruction::PUSH29:
-	case Instruction::PUSH30:
-	case Instruction::PUSH31:
-	case Instruction::PUSH32:
-	case Instruction::DUP1:
-	case Instruction::DUP2:
-	case Instruction::DUP3:
-	case Instruction::DUP4:
-	case Instruction::DUP5:
-	case Instruction::DUP6:
-	case Instruction::DUP7:
-	case Instruction::DUP8:
-	case Instruction::DUP9:
-	case Instruction::DUP10:
-	case Instruction::DUP11:
-	case Instruction::DUP12:
-	case Instruction::DUP13:
-	case Instruction::DUP14:
-	case Instruction::DUP15:
-	case Instruction::DUP16:
-	case Instruction::SWAP1:
-	case Instruction::SWAP2:
-	case Instruction::SWAP3:
-	case Instruction::SWAP4:
-	case Instruction::SWAP5:
-	case Instruction::SWAP6:
-	case Instruction::SWAP7:
-	case Instruction::SWAP8:
-	case Instruction::SWAP9:
-	case Instruction::SWAP10:
-	case Instruction::SWAP11:
-	case Instruction::SWAP12:
-	case Instruction::SWAP13:
-	case Instruction::SWAP14:
-	case Instruction::SWAP15:
-	case Instruction::SWAP16:
-	{
-		yulAssert(false, "");
-		return 0;
-	}
-	}
-
-	return 0;
-}
-
-u256 EVMInstructionInterpreter::evalBuiltin(
-	BuiltinFunctionForEVM const& _fun,
-	vector<Expression> const& _arguments,
-	vector<u256> const& _evaluatedArguments
-)
-{
-	if (_fun.instruction)
-		return eval(*_fun.instruction, _evaluatedArguments);
-
-	string fun = _fun.name.str();
-	// Evaluate datasize/offset/copy instructions
-	if (fun == "datasize" || fun == "dataoffset")
-	{
-		string arg = std::get<Literal>(_arguments.at(0)).value.str();
-		if (arg.length() < 32)
-			arg.resize(32, 0);
-		if (fun == "datasize")
-			return u256(keccak256(arg)) & 0xfff;
-		else
-		{
-			// Force different value than for datasize
-			arg[31]++;
-			arg[31]++;
-			return u256(keccak256(arg)) & 0xfff;
-		}
-	}
-	else if (fun == "datacopy")
-	{
-		// This is identical to codecopy.
-		if (
-				_evaluatedArguments.at(2) != 0 &&
-				accessMemory(_evaluatedArguments.at(0), _evaluatedArguments.at(2))
-		)
-			copyZeroExtended(
-				m_state.memory,
-				m_state.code,
-				size_t(_evaluatedArguments.at(0)),
-				size_t(_evaluatedArguments.at(1) & numeric_limits<size_t>::max()),
-				size_t(_evaluatedArguments.at(2))
-			);
-		return 0;
-	}
-	else if (fun == "memoryguard")
-		return _evaluatedArguments.at(0);
-	else
-		yulAssert(false, "Unknown builtin: " + fun);
-	return 0;
-}
-
-
-bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _size)
-{
-	if (_size == 0)
-		return true;
-	else if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
-	{
-		u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
-		m_state.msize = max(m_state.msize, newSize);
-		// We only record accesses to contiguous memory chunks that are at most s_maxRangeSize bytes
-		// in size and at an offset of at most numeric_limits<size_t>::max() - s_maxRangeSize
-		return _size <= s_maxRangeSize && _offset <= u256(numeric_limits<size_t>::max() - s_maxRangeSize);
-	}
-	else
-		m_state.msize = u256(-1);
-
-	return false;
-}
-
-bytes EVMInstructionInterpreter::readMemory(u256 const& _offset, u256 const& _size)
-{
-	yulAssert(_size <= s_maxRangeSize, "Too large read.");
-	bytes data(size_t(_size), uint8_t(0));
-	for (size_t i = 0; i < data.size(); ++i)
-		data[i] = m_state.memory[_offset + i];
-	return data;
-}
-
-u256 EVMInstructionInterpreter::readMemoryWord(u256 const& _offset)
-{
-	return u256(h256(m_state.readMemory(_offset, 32)));
-}
-
-void EVMInstructionInterpreter::writeMemoryWord(u256 const& _offset, u256 const& _value)
-{
-	for (size_t i = 0; i < 32; i++)
-		m_state.memory[_offset + i] = uint8_t((_value >> (8 * (31 - i))) & 0xff);
-}
-
-
-void EVMInstructionInterpreter::logTrace(
-	evmasm::Instruction _instruction,
-	std::vector<u256> const& _arguments,
-	bytes const& _data
-)
-{
-	logTrace(
-		evmasm::instructionInfo(_instruction, m_evmVersion).name,
-		SemanticInformation::memory(_instruction) == SemanticInformation::Effect::Write,
-		_arguments,
-		_data
-	);
-}
-
-void EVMInstructionInterpreter::logTrace(
-	std::string const& _pseudoInstruction,
-	bool _writesToMemory,
-	std::vector<u256> const& _arguments,
-	bytes const& _data
-)
-{
-	if (!(_writesToMemory && memWriteTracingDisabled()))
-	{
-		string message = _pseudoInstruction + "(";
-		std::pair<bool, size_t> inputMemoryPtrModified = isInputMemoryPtrModified(_pseudoInstruction, _arguments);
-		for (size_t i = 0; i < _arguments.size(); ++i)
-		{
-			bool printZero = inputMemoryPtrModified.first && inputMemoryPtrModified.second == i;
-			u256 arg = printZero ? 0 : _arguments[i];
-			message += (i > 0 ? ", " : "") + formatNumber(arg);
-		}
-		message += ")";
-		if (!_data.empty())
-			message += " [" + util::toHex(_data) + "]";
-		m_state.trace.emplace_back(std::move(message));
-		if (m_state.maxTraceSize > 0 && m_state.trace.size() >= m_state.maxTraceSize)
-		{
-			m_state.trace.emplace_back("Trace size limit reached.");
-			BOOST_THROW_EXCEPTION(TraceLimitReached());
-		}
-	}
-}
-
-std::pair<bool, size_t> EVMInstructionInterpreter::isInputMemoryPtrModified(
-	std::string const& _pseudoInstruction,
-	std::vector<u256> const& _arguments
-)
-{
-	if (_pseudoInstruction == "RETURN" || _pseudoInstruction == "REVERT")
-	{
-		if (_arguments[1] == 0)
-			return {true, 0};
-		else
-			return {false, 0};
-	}
-	else if (
-		_pseudoInstruction == "RETURNDATACOPY" || _pseudoInstruction == "CALLDATACOPY"
-		|| _pseudoInstruction == "CODECOPY")
-	{
-		if (_arguments[2] == 0)
-			return {true, 0};
-		else
-			return {false, 0};
-	}
-	else if (_pseudoInstruction == "EXTCODECOPY")
-	{
-		if (_arguments[3] == 0)
-			return {true, 1};
-		else
-			return {false, 0};
-	}
-	else if (
-		_pseudoInstruction == "LOG0" || _pseudoInstruction == "LOG1" || _pseudoInstruction == "LOG2"
-		|| _pseudoInstruction == "LOG3" || _pseudoInstruction == "LOG4")
-	{
-		if (_arguments[1] == 0)
-			return {true, 0};
-		else
-			return {false, 0};
-	}
-	if (_pseudoInstruction == "CREATE" || _pseudoInstruction == "CREATE2")
-	{
-		if (_arguments[2] == 0)
-			return {true, 1};
-		else
-			return {false, 0};
-	}
-	if (_pseudoInstruction == "CALL" || _pseudoInstruction == "CALLCODE")
-	{
-		if (_arguments[4] == 0)
-			return {true, 3};
-		else
-			return {false, 0};
-	}
-	else if (_pseudoInstruction == "DELEGATECALL" || _pseudoInstruction == "STATICCALL")
-	{
-		if (_arguments[3] == 0)
-			return {true, 2};
-		else
-			return {false, 0};
-	}
-	else
-		return {false, 0};
-}
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
deleted file mode 100644
index d37cae542f9d..000000000000
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul interpreter module that evaluates EVM instructions.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-
-#include <liblangutil/EVMVersion.h>
-
-#include <vector>
-
-namespace solidity::evmasm
-{
-enum class Instruction: uint8_t;
-}
-
-namespace solidity::yul
-{
-class YulString;
-struct BuiltinFunctionForEVM;
-}
-
-namespace solidity::yul::test
-{
-
-/// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
-/// @a _target at offset @a _targetOffset. Behaves as if @a _source would
-/// continue with an infinite sequence of zero bytes beyond its end.
-void copyZeroExtended(
-	std::map<u256, uint8_t>& _target, bytes const& _source,
-	size_t _targetOffset, size_t _sourceOffset, size_t _size
-);
-
-struct InterpreterState;
-
-/**
- * Interprets EVM instructions based on the current state and logs instructions with
- * side-effects.
- *
- * Since this is mainly meant to be used for differential fuzz testing, it is focused
- * on a single contract only, does not do any gas counting and differs from the correct
- * implementation in many ways:
- *
- * - If memory access to a "large" memory position is performed, a deterministic
- *   value is returned. Data that is stored in a "large" memory position is not
- *   retained.
- * - The blockhash instruction returns a fixed value if the argument is in range.
- * - Extcodesize returns a deterministic value depending on the address.
- * - Extcodecopy copies a deterministic value depending on the address.
- * - And many other things
- *
- * The main focus is that the generated execution trace is the same for equivalent executions
- * and likely to be different for non-equivalent executions.
- */
-class EVMInstructionInterpreter
-{
-public:
-	explicit EVMInstructionInterpreter(langutil::EVMVersion _evmVersion, InterpreterState& _state, bool _disableMemWriteTrace):
-		m_evmVersion(_evmVersion),
-		m_state(_state),
-		m_disableMemoryWriteInstructions(_disableMemWriteTrace)
-	{}
-	/// Evaluate instruction
-	u256 eval(evmasm::Instruction _instruction, std::vector<u256> const& _arguments);
-	/// Evaluate builtin function
-	u256 evalBuiltin(
-		BuiltinFunctionForEVM const& _fun,
-		std::vector<Expression> const& _arguments,
-		std::vector<u256> const& _evaluatedArguments
-	);
-
-private:
-	/// Checks if the memory access is valid and adjusts msize accordingly.
-	/// @returns true if memory access is valid, false otherwise
-	/// A valid memory access must satisfy all of the following pre-requisites:
-	/// - Sum of @param _offset and @param _size do not overflow modulo u256
-	/// - Sum of @param _offset, @param _size, and 31 do not overflow modulo u256 (see note below)
-	/// - @param _size is lesser than or equal to @a s_maxRangeSize
-	/// - @param _offset is lesser than or equal to the difference of numeric_limits<size_t>::max()
-	/// and @a s_maxRangeSize
-	/// Note: Memory expansion is carried out in multiples of 32 bytes.
-	bool accessMemory(u256 const& _offset, u256 const& _size = 32);
-	/// @returns the memory contents at the provided address.
-	/// Does not adjust msize, use @a accessMemory for that
-	bytes readMemory(u256 const& _offset, u256 const& _size = 32);
-	/// @returns the memory contents at the provided address.
-	/// Does not adjust msize, use @a accessMemory for that
-	u256 readMemoryWord(u256 const& _offset);
-	/// @returns writes a word to memory
-	/// Does not adjust msize, use @a accessMemory for that
-	void writeMemoryWord(u256 const& _offset, u256 const& _value);
-
-	void logTrace(
-		evmasm::Instruction _instruction,
-		std::vector<u256> const& _arguments = {},
-		bytes const& _data = {}
-	);
-	/// Appends a log to the trace representing an instruction or similar operation by string,
-	/// with arguments and auxiliary data (if nonempty). Flag @param _writesToMemory indicates
-	/// whether the instruction writes to (true) or does not write to (false) memory.
-	void logTrace(
-		std::string const& _pseudoInstruction,
-		bool _writesToMemory,
-		std::vector<u256> const& _arguments = {},
-		bytes const& _data = {}
-	);
-
-	/// @returns a pair of boolean and size_t whose first value is true if @param _pseudoInstruction
-	/// is a Yul instruction that the Yul optimizer's loadResolver step rewrites the input
-	/// memory pointer value to zero if that instruction's read length (contained within @param
-	// _arguments) is zero, and whose second value is the positional index of the input memory
-	// pointer argument.
-	/// If the Yul instruction is unaffected or affected but read length is non-zero, the first
-	/// value is false.
-	std::pair<bool, size_t> isInputMemoryPtrModified(
-		std::string const& _pseudoInstruction,
-		std::vector<u256> const& _arguments
-	);
-
-	/// @returns disable trace flag.
-	bool memWriteTracingDisabled()
-	{
-		return m_disableMemoryWriteInstructions;
-	}
-
-	langutil::EVMVersion m_evmVersion;
-	InterpreterState& m_state;
-	/// Flag to disable trace of instructions that write to memory.
-	bool m_disableMemoryWriteInstructions;
-public:
-	/// Maximum length for range-based memory access operations.
-	static constexpr unsigned s_maxRangeSize = 0xffff;
-};
-
-} // solidity::yul::test
diff --git a/test/tools/yulInterpreter/Inspector.cpp b/test/tools/yulInterpreter/Inspector.cpp
deleted file mode 100644
index 3ded7367f61a..000000000000
--- a/test/tools/yulInterpreter/Inspector.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul interpreter.
- */
-
-#include <test/tools/yulInterpreter/Inspector.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string.hpp>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-
-using namespace std;
-
-namespace
-{
-
-void printVariable(YulString const& _name, u256 const& _value)
-{
-	cout << "\t" << _name.str() << " = " << _value.str();
-
-	if (_value != 0)
-		cout << " (" << toCompactHexWithPrefix(_value) << ")";
-
-	cout << endl;
-}
-
-}
-
-void InspectedInterpreter::run(
-	std::shared_ptr<Inspector> _inspector,
-	InterpreterState& _state,
-	Dialect const& _dialect,
-	Block const& _ast,
-	bool _disableExternalCalls,
-	bool _disableMemoryTrace
-)
-{
-	Scope scope;
-	InspectedInterpreter{_inspector, _state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
-}
-
-Inspector::NodeAction Inspector::queryUser(DebugData const& _data, map<YulString, u256> const& _variables)
-{
-	if (m_stepMode == NodeAction::RunNode)
-	{
-		// Output instructions that are being skipped/run
-		cout << "Running " << currentSource(_data) << endl;
-
-		return NodeAction::StepThroughNode;
-	}
-
-	string input;
-
-	while (true)
-	{
-		// Output sourcecode about to run.
-		cout << "> " << currentSource(_data) << endl;
-
-		// Ask user for action
-		cout << endl
-			<< "(s)tep/(n)ext/(i)nspect/(p)rint/all (v)ariables?"
-			<< endl
-			<< "# ";
-
-		cout.flush();
-
-		getline(cin, input);
-		boost::algorithm::trim(input);
-
-		// Imitate GDB and repeat last cmd for empty string input.
-		if (input == "")
-			input = m_lastInput;
-		else
-			m_lastInput = input;
-
-		if (input == "next" || input == "n")
-			return NodeAction::RunNode;
-		else if (input == "step" || input == "s")
-			return NodeAction::StepThroughNode;
-		else if (input == "inspect" || input == "i")
-			m_state.dumpTraceAndState(cout, false);
-		else if (input == "variables" || input == "v")
-		{
-			for (auto &&[yulStr, val]: _variables)
-				printVariable(yulStr, val);
-			cout << endl;
-		}
-		else if (
-			boost::starts_with(input, "print") ||
-			boost::starts_with(input, "p")
-		)
-		{
-			size_t whitespacePos = input.find(' ');
-
-			if (whitespacePos == string::npos)
-				cout << "Error parsing command! Expected variable name." << endl;
-
-			string const varname = input.substr(whitespacePos + 1);
-
-			vector<string> candidates;
-
-			bool found = false;
-			for (auto &&[yulStr, val]: _variables)
-				if (yulStr.str() == varname)
-				{
-					printVariable(yulStr, val);
-					found = true;
-					break;
-				}
-
-			if (!found)
-				cout << varname << " not found." << endl;
-		}
-	}
-}
-
-std::string Inspector::currentSource(DebugData const& _data) const
-{
-	return m_source.substr(
-		static_cast<size_t>(_data.nativeLocation.start),
-		static_cast<size_t>(_data.nativeLocation.end - _data.nativeLocation.start)
-	);
-}
-
-u256 InspectedInterpreter::evaluate(Expression const& _expression)
-{
-	InspectedExpressionEvaluator ev(m_inspector, m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
-	ev.visit(_expression);
-	return ev.value();
-}
-
-std::vector<u256> InspectedInterpreter::evaluateMulti(Expression const& _expression)
-{
-	InspectedExpressionEvaluator ev(m_inspector, m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
-	ev.visit(_expression);
-	return ev.values();
-}
diff --git a/test/tools/yulInterpreter/Inspector.h b/test/tools/yulInterpreter/Inspector.h
deleted file mode 100644
index 611279c6fe1c..000000000000
--- a/test/tools/yulInterpreter/Inspector.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul inspector.
- */
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-
-#include <libyul/AST.h>
-
-#include <string>
-
-#pragma once
-
-namespace solidity::yul::test
-{
-
-/**
- * Inspector class to respond to queries by the user for:
- *
- * * Stepping through and over instructions.
- * * Printing a specific or all variables.
- * * Inspecting memory, storage and calldata memory.
- */
-class Inspector
-{
-public:
-	enum class NodeAction
-	{
-		RunNode,
-		StepThroughNode,
-	};
-
-	Inspector(std::string const& _source, InterpreterState const& _state)
-		:m_source(_source), m_state(_state) {}
-
-	/* Asks the user what action to take.
-	 * @returns NodeAction::RunNode if the current AST node (and all children nodes!) should be
-	 *          processed without stopping, else NodeAction::StepThroughNode.
-	 */
-	NodeAction queryUser(DebugData const& _data, std::map<YulString, u256> const& _variables);
-
-	void stepMode(NodeAction _action) { m_stepMode = _action; }
-
-	std::string const& source() const { return m_source; }
-
-	void interactiveVisit(DebugData const& _debugData, std::map<YulString, u256> const& _variables, std::function<void()> _visitNode)
-	{
-		Inspector::NodeAction action = queryUser(_debugData, _variables);
-
-		if (action == NodeAction::RunNode)
-		{
-			// user requested to run the whole node without stopping
-			stepMode(Inspector::NodeAction::RunNode);
-
-			_visitNode();
-
-			// Reset step mode back
-			stepMode(Inspector::NodeAction::StepThroughNode);
-		}
-		else
-			_visitNode();
-	}
-
-private:
-	std::string currentSource(DebugData const& _data) const;
-
-	/// Source of the file
-	std::string const& m_source;
-
-	/// State of the interpreter
-	InterpreterState const& m_state;
-
-	/// Last user query command
-	std::string m_lastInput;
-
-	/// Used to run AST nodes without user interaction
-	NodeAction m_stepMode = NodeAction::StepThroughNode;
-};
-
-/**
- * Yul Interpreter with inspection. Allows the user to go through the code step
- * by step and inspect the state using the `Inspector` class
- */
-class InspectedInterpreter: public Interpreter
-{
-public:
-	static void run(
-		std::shared_ptr<Inspector> _inspector,
-		InterpreterState& _state,
-		Dialect const& _dialect,
-		Block const& _ast,
-		bool _disableExternalCalls,
-		bool _disableMemoryTracing
-	);
-
-	InspectedInterpreter(
-		std::shared_ptr<Inspector> _inspector,
-		InterpreterState& _state,
-		Dialect const& _dialect,
-		Scope& _scope,
-		bool _disableExternalCalls,
-		bool _disableMemoryTracing,
-		std::map<YulString, u256> _variables = {}
-	):
-		Interpreter(_state, _dialect, _scope, _disableExternalCalls, _disableMemoryTracing, _variables),
-		m_inspector(_inspector)
-	{
-	}
-
-	void operator()(ExpressionStatement const& _node) override { helper(_node); }
-	void operator()(Assignment const& _node) override { helper(_node); }
-	void operator()(VariableDeclaration const& _node) override { helper(_node); }
-	void operator()(If const& _node) override { helper(_node); }
-	void operator()(Switch const& _node) override { helper(_node); }
-	void operator()(ForLoop const& _node) override { helper(_node); }
-	void operator()(Break const& _node) override { helper(_node); }
-	void operator()(Continue const& _node) override { helper(_node); }
-	void operator()(Leave const& _node) override { helper(_node); }
-	void operator()(Block const& _node) override { helper(_node); }
-protected:
-	/// Asserts that the expression evaluates to exactly one value and returns it.
-	u256 evaluate(Expression const& _expression) override;
-	/// Evaluates the expression and returns its value.
-	std::vector<u256> evaluateMulti(Expression const& _expression) override;
-private:
-	std::shared_ptr<Inspector> m_inspector;
-
-	template <typename ConcreteNode>
-	void helper(ConcreteNode const& _node)
-	{
-		m_inspector->interactiveVisit(*_node.debugData, m_variables, [&]() {
-			Interpreter::operator()(_node);
-		});
-	}
-
-};
-
-
-class InspectedExpressionEvaluator: public ExpressionEvaluator
-{
-public:
-	InspectedExpressionEvaluator(
-		std::shared_ptr<Inspector> _inspector,
-		InterpreterState& _state,
-		Dialect const& _dialect,
-		Scope& _scope,
-		std::map<YulString, u256> const& _variables,
-		bool _disableExternalCalls,
-		bool _disableMemoryTrace
-	):
-		ExpressionEvaluator(_state, _dialect, _scope, _variables, _disableExternalCalls, _disableMemoryTrace),
-		m_inspector(_inspector)
-	{}
-
-	template <typename ConcreteNode>
-	void helper(ConcreteNode const& _node)
-	{
-		m_inspector->interactiveVisit(*_node.debugData, m_variables, [&]() {
-			ExpressionEvaluator::operator()(_node);
-		});
-	}
-
-	void operator()(Literal const& _node) override { helper(_node); }
-	void operator()(Identifier const& _node) override { helper(_node); }
-	void operator()(FunctionCall const& _node) override { helper(_node); }
-protected:
-	std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulString, u256> _variables = {}) const override
-	{
-		return std::make_unique<InspectedInterpreter>(
-			m_inspector,
-			m_state,
-			m_dialect,
-			m_scope,
-			m_disableExternalCalls,
-			m_disableMemoryTrace,
-			std::move(_variables)
-		);
-	}
-	std::unique_ptr<Interpreter> makeInterpreterNew(InterpreterState& _state, Scope& _scope) const override
-	{
-		return std::make_unique<InspectedInterpreter>(
-			std::make_unique<Inspector>(
-				m_inspector->source(),
-				_state
-			),
-			_state,
-			m_dialect,
-			_scope,
-			m_disableExternalCalls,
-			m_disableMemoryTrace
-		);
-	}
-private:
-	std::shared_ptr<Inspector> m_inspector;
-};
-
-}
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
deleted file mode 100644
index aadd22b4db77..000000000000
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul interpreter.
- */
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-
-#include <test/tools/yulInterpreter/EVMInstructionInterpreter.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/Utilities.h>
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <libsolutil/FixedHash.h>
-
-#include <range/v3/view/reverse.hpp>
-
-#include <ostream>
-#include <variant>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-
-using solidity::util::h256;
-
-void InterpreterState::dumpStorage(ostream& _out) const
-{
-	for (auto const& slot: storage)
-		if (slot.second != h256{})
-			_out << "  " << slot.first.hex() << ": " << slot.second.hex() << endl;
-}
-
-void InterpreterState::dumpTraceAndState(ostream& _out, bool _disableMemoryTrace) const
-{
-	_out << "Trace:" << endl;
-	for (auto const& line: trace)
-		_out << "  " << line << endl;
-	if (!_disableMemoryTrace)
-	{
-		_out << "Memory dump:\n";
-		map<u256, u256> words;
-		for (auto const& [offset, value]: memory)
-			words[(offset / 0x20) * 0x20] |= u256(uint32_t(value)) << (256 - 8 - 8 * static_cast<size_t>(offset % 0x20));
-		for (auto const& [offset, value]: words)
-			if (value != 0)
-				_out << "  " << std::uppercase << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << endl;
-	}
-	_out << "Storage dump:" << endl;
-	dumpStorage(_out);
-
-	if (!calldata.empty())
-	{
-		_out << "Calldata dump:";
-
-		for (size_t offset = 0; offset < calldata.size(); ++offset)
-			if (calldata[offset] != 0)
-			{
-				if (offset % 32 == 0)
-					_out <<
-						std::endl <<
-						"  " <<
-						std::uppercase <<
-						std::hex <<
-						std::setfill(' ') <<
-						std::setw(4) <<
-						offset <<
-						": ";
-
-				_out <<
-					std::hex <<
-					std::setw(2) <<
-					std::setfill('0') <<
-					static_cast<int>(calldata[offset]);
-			}
-
-		_out << endl;
-	}
-}
-
-void Interpreter::run(
-	InterpreterState& _state,
-	Dialect const& _dialect,
-	Block const& _ast,
-	bool _disableExternalCalls,
-	bool _disableMemoryTrace
-)
-{
-	Scope scope;
-	Interpreter{_state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
-}
-
-void Interpreter::operator()(ExpressionStatement const& _expressionStatement)
-{
-	evaluateMulti(_expressionStatement.expression);
-}
-
-void Interpreter::operator()(Assignment const& _assignment)
-{
-	solAssert(_assignment.value, "");
-	vector<u256> values = evaluateMulti(*_assignment.value);
-	solAssert(values.size() == _assignment.variableNames.size(), "");
-	for (size_t i = 0; i < values.size(); ++i)
-	{
-		YulString varName = _assignment.variableNames.at(i).name;
-		solAssert(m_variables.count(varName), "");
-		m_variables[varName] = values.at(i);
-	}
-}
-
-void Interpreter::operator()(VariableDeclaration const& _declaration)
-{
-	vector<u256> values(_declaration.variables.size(), 0);
-	if (_declaration.value)
-		values = evaluateMulti(*_declaration.value);
-
-	solAssert(values.size() == _declaration.variables.size(), "");
-	for (size_t i = 0; i < values.size(); ++i)
-	{
-		YulString varName = _declaration.variables.at(i).name;
-		solAssert(!m_variables.count(varName), "");
-		m_variables[varName] = values.at(i);
-		m_scope->names.emplace(varName, nullptr);
-	}
-}
-
-void Interpreter::operator()(If const& _if)
-{
-	solAssert(_if.condition, "");
-	if (evaluate(*_if.condition) != 0)
-		(*this)(_if.body);
-}
-
-void Interpreter::operator()(Switch const& _switch)
-{
-	solAssert(_switch.expression, "");
-	u256 val = evaluate(*_switch.expression);
-	solAssert(!_switch.cases.empty(), "");
-	for (auto const& c: _switch.cases)
-		// Default case has to be last.
-		if (!c.value || evaluate(*c.value) == val)
-		{
-			(*this)(c.body);
-			break;
-		}
-}
-
-void Interpreter::operator()(FunctionDefinition const&)
-{
-}
-
-void Interpreter::operator()(ForLoop const& _forLoop)
-{
-	solAssert(_forLoop.condition, "");
-
-	enterScope(_forLoop.pre);
-	ScopeGuard g([this]{ leaveScope(); });
-
-	for (auto const& statement: _forLoop.pre.statements)
-	{
-		visit(statement);
-		if (m_state.controlFlowState == ControlFlowState::Leave)
-			return;
-	}
-	while (evaluate(*_forLoop.condition) != 0)
-	{
-		// Increment step for each loop iteration for loops with
-		// an empty body and post blocks to prevent a deadlock.
-		if (_forLoop.body.statements.size() == 0 && _forLoop.post.statements.size() == 0)
-			incrementStep();
-
-		m_state.controlFlowState = ControlFlowState::Default;
-		(*this)(_forLoop.body);
-		if (m_state.controlFlowState == ControlFlowState::Break || m_state.controlFlowState == ControlFlowState::Leave)
-			break;
-
-		m_state.controlFlowState = ControlFlowState::Default;
-		(*this)(_forLoop.post);
-		if (m_state.controlFlowState == ControlFlowState::Leave)
-			break;
-	}
-	if (m_state.controlFlowState != ControlFlowState::Leave)
-		m_state.controlFlowState = ControlFlowState::Default;
-}
-
-void Interpreter::operator()(Break const&)
-{
-	m_state.controlFlowState = ControlFlowState::Break;
-}
-
-void Interpreter::operator()(Continue const&)
-{
-	m_state.controlFlowState = ControlFlowState::Continue;
-}
-
-void Interpreter::operator()(Leave const&)
-{
-	m_state.controlFlowState = ControlFlowState::Leave;
-}
-
-void Interpreter::operator()(Block const& _block)
-{
-	enterScope(_block);
-	// Register functions.
-	for (auto const& statement: _block.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
-		{
-			FunctionDefinition const& funDef = std::get<FunctionDefinition>(statement);
-			m_scope->names.emplace(funDef.name, &funDef);
-		}
-
-	for (auto const& statement: _block.statements)
-	{
-		incrementStep();
-		visit(statement);
-		if (m_state.controlFlowState != ControlFlowState::Default)
-			break;
-	}
-
-	leaveScope();
-}
-
-u256 Interpreter::evaluate(Expression const& _expression)
-{
-	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
-	ev.visit(_expression);
-	return ev.value();
-}
-
-vector<u256> Interpreter::evaluateMulti(Expression const& _expression)
-{
-	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
-	ev.visit(_expression);
-	return ev.values();
-}
-
-void Interpreter::enterScope(Block const& _block)
-{
-	if (!m_scope->subScopes.count(&_block))
-		m_scope->subScopes[&_block] = make_unique<Scope>(Scope{
-			{},
-			{},
-			m_scope
-		});
-	m_scope = m_scope->subScopes[&_block].get();
-}
-
-void Interpreter::leaveScope()
-{
-	for (auto const& [var, funDeclaration]: m_scope->names)
-		if (!funDeclaration)
-			m_variables.erase(var);
-	m_scope = m_scope->parent;
-	yulAssert(m_scope, "");
-}
-
-void Interpreter::incrementStep()
-{
-	m_state.numSteps++;
-	if (m_state.maxSteps > 0 && m_state.numSteps >= m_state.maxSteps)
-	{
-		m_state.trace.emplace_back("Interpreter execution step limit reached.");
-		BOOST_THROW_EXCEPTION(StepLimitReached());
-	}
-}
-
-void ExpressionEvaluator::operator()(Literal const& _literal)
-{
-	incrementStep();
-	static YulString const trueString("true");
-	static YulString const falseString("false");
-
-	setValue(valueOfLiteral(_literal));
-}
-
-void ExpressionEvaluator::operator()(Identifier const& _identifier)
-{
-	solAssert(m_variables.count(_identifier.name), "");
-	incrementStep();
-	setValue(m_variables.at(_identifier.name));
-}
-
-void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
-{
-	vector<optional<LiteralKind>> const* literalArguments = nullptr;
-	if (BuiltinFunction const* builtin = m_dialect.builtin(_funCall.functionName.name))
-		if (!builtin->literalArguments.empty())
-			literalArguments = &builtin->literalArguments;
-	evaluateArgs(_funCall.arguments, literalArguments);
-
-	if (EVMDialect const* dialect = dynamic_cast<EVMDialect const*>(&m_dialect))
-	{
-		if (BuiltinFunctionForEVM const* fun = dialect->builtin(_funCall.functionName.name))
-		{
-			EVMInstructionInterpreter interpreter(dialect->evmVersion(), m_state, m_disableMemoryTrace);
-
-			u256 const value = interpreter.evalBuiltin(*fun, _funCall.arguments, values());
-
-			if (
-				!m_disableExternalCalls &&
-				fun->instruction &&
-				evmasm::isCallInstruction(*fun->instruction)
-			)
-				runExternalCall(*fun->instruction);
-
-			setValue(value);
-			return;
-		}
-	}
-
-	Scope* scope = &m_scope;
-	for (; scope; scope = scope->parent)
-		if (scope->names.count(_funCall.functionName.name))
-			break;
-	yulAssert(scope, "");
-
-	FunctionDefinition const* fun = scope->names.at(_funCall.functionName.name);
-	yulAssert(fun, "Function not found.");
-	yulAssert(m_values.size() == fun->parameters.size(), "");
-	map<YulString, u256> variables;
-	for (size_t i = 0; i < fun->parameters.size(); ++i)
-		variables[fun->parameters.at(i).name] = m_values.at(i);
-	for (size_t i = 0; i < fun->returnVariables.size(); ++i)
-		variables[fun->returnVariables.at(i).name] = 0;
-
-	m_state.controlFlowState = ControlFlowState::Default;
-	unique_ptr<Interpreter> interpreter = makeInterpreterCopy(std::move(variables));
-	(*interpreter)(fun->body);
-	m_state.controlFlowState = ControlFlowState::Default;
-
-	m_values.clear();
-	for (auto const& retVar: fun->returnVariables)
-		m_values.emplace_back(interpreter->valueOfVariable(retVar.name));
-}
-
-u256 ExpressionEvaluator::value() const
-{
-	solAssert(m_values.size() == 1, "");
-	return m_values.front();
-}
-
-void ExpressionEvaluator::setValue(u256 _value)
-{
-	m_values.clear();
-	m_values.emplace_back(std::move(_value));
-}
-
-void ExpressionEvaluator::evaluateArgs(
-	vector<Expression> const& _expr,
-	vector<optional<LiteralKind>> const* _literalArguments
-)
-{
-	incrementStep();
-	vector<u256> values;
-	size_t i = 0;
-	/// Function arguments are evaluated in reverse.
-	for (auto const& expr: _expr | ranges::views::reverse)
-	{
-		if (!_literalArguments || !_literalArguments->at(_expr.size() - i - 1))
-			visit(expr);
-		else
-		{
-			string literal = std::get<Literal>(expr).value.str();
-
-			try
-			{
-				m_values = {u256(literal)};
-			}
-			catch (exception&)
-			{
-				m_values = {u256(0)};
-			}
-		}
-
-		values.push_back(value());
-		++i;
-	}
-	m_values = std::move(values);
-	std::reverse(m_values.begin(), m_values.end());
-}
-
-void ExpressionEvaluator::incrementStep()
-{
-	m_nestingLevel++;
-	if (m_state.maxExprNesting > 0 && m_nestingLevel > m_state.maxExprNesting)
-	{
-		m_state.trace.emplace_back("Maximum expression nesting level reached.");
-		BOOST_THROW_EXCEPTION(ExpressionNestingLimitReached());
-	}
-}
-
-void ExpressionEvaluator::runExternalCall(evmasm::Instruction _instruction)
-{
-	u256 memOutOffset = 0;
-	u256 memOutSize = 0;
-	u256 callvalue = 0;
-	u256 memInOffset = 0;
-	u256 memInSize = 0;
-
-	// Setup memOut* values
-	if (
-		_instruction == evmasm::Instruction::CALL ||
-		_instruction == evmasm::Instruction::CALLCODE
-	)
-	{
-		memOutOffset = values()[5];
-		memOutSize = values()[6];
-		callvalue = values()[2];
-		memInOffset = values()[3];
-		memInSize = values()[4];
-	}
-	else if (
-		_instruction == evmasm::Instruction::DELEGATECALL ||
-		_instruction == evmasm::Instruction::STATICCALL
-	)
-	{
-		memOutOffset = values()[4];
-		memOutSize = values()[5];
-		memInOffset = values()[2];
-		memInSize = values()[3];
-	}
-	else
-		yulAssert(false);
-
-	// Don't execute external call if it isn't our own address
-	if (values()[1] != util::h160::Arith(m_state.address))
-		return;
-
-	Scope tmpScope;
-	InterpreterState tmpState;
-	tmpState.calldata = m_state.readMemory(memInOffset, memInSize);
-	tmpState.callvalue = callvalue;
-	tmpState.numInstance = m_state.numInstance + 1;
-
-	yulAssert(tmpState.numInstance < 1024, "Detected more than 1024 recursive calls, aborting...");
-
-	// Create new interpreter for the called contract
-	unique_ptr<Interpreter> newInterpreter = makeInterpreterNew(tmpState, tmpScope);
-
-	Scope* abstractRootScope = &m_scope;
-	Scope* fileScope = nullptr;
-	Block const* ast = nullptr;
-
-	// Find file scope
-	while (abstractRootScope->parent)
-	{
-		fileScope = abstractRootScope;
-		abstractRootScope = abstractRootScope->parent;
-	}
-
-	// Get AST for file scope
-	for (auto&& [block, scope]: abstractRootScope->subScopes)
-		if (scope.get() == fileScope)
-		{
-			ast = block;
-			break;
-		}
-
-	yulAssert(ast);
-
-	try
-	{
-		(*newInterpreter)(*ast);
-	}
-	catch (ExplicitlyTerminatedWithReturn const&)
-	{
-		// Copy return data to our memory
-		copyZeroExtended(
-			m_state.memory,
-			newInterpreter->returnData(),
-			memOutOffset.convert_to<size_t>(),
-			0,
-			memOutSize.convert_to<size_t>()
-		);
-		m_state.returndata = newInterpreter->returnData();
-	}
-}
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
deleted file mode 100644
index 26a8b2701215..000000000000
--- a/test/tools/yulInterpreter/Interpreter.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul interpreter.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/CommonData.h>
-
-#include <libsolutil/Exceptions.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-struct Dialect;
-}
-
-namespace solidity::yul::test
-{
-
-class InterpreterTerminatedGeneric: public util::Exception
-{
-};
-
-class ExplicitlyTerminated: public InterpreterTerminatedGeneric
-{
-};
-
-class ExplicitlyTerminatedWithReturn: public ExplicitlyTerminated
-{
-};
-
-class StepLimitReached: public InterpreterTerminatedGeneric
-{
-};
-
-class TraceLimitReached: public InterpreterTerminatedGeneric
-{
-};
-
-class ExpressionNestingLimitReached: public InterpreterTerminatedGeneric
-{
-};
-
-enum class ControlFlowState
-{
-	Default,
-	Continue,
-	Break,
-	Leave
-};
-
-struct InterpreterState
-{
-	bytes calldata;
-	bytes returndata;
-	std::map<u256, uint8_t> memory;
-	/// This is different than memory.size() because we ignore gas.
-	u256 msize;
-	std::map<util::h256, util::h256> storage;
-	util::h160 address = util::h160("0x0000000000000000000000000000000011111111");
-	u256 balance = 0x22222222;
-	u256 selfbalance = 0x22223333;
-	util::h160 origin = util::h160("0x0000000000000000000000000000000033333333");
-	util::h160 caller = util::h160("0x0000000000000000000000000000000044444444");
-	u256 callvalue = 0x55555555;
-	/// Deployed code
-	bytes code = util::asBytes("codecodecodecodecode");
-	u256 gasprice = 0x66666666;
-	util::h160 coinbase = util::h160("0x0000000000000000000000000000000077777777");
-	u256 timestamp = 0x88888888;
-	u256 blockNumber = 1024;
-	u256 difficulty = 0x9999999;
-	u256 prevrandao = (u256(1) << 64) + 1;
-	u256 gaslimit = 4000000;
-	u256 chainid = 0x01;
-	/// The minimum value of basefee: 7 wei.
-	u256 basefee = 0x07;
-	/// Log of changes / effects. Sholud be structured data in the future.
-	std::vector<std::string> trace;
-	/// This is actually an input parameter that more or less limits the runtime.
-	size_t maxTraceSize = 0;
-	size_t maxSteps = 0;
-	size_t numSteps = 0;
-	size_t maxExprNesting = 0;
-	ControlFlowState controlFlowState = ControlFlowState::Default;
-
-	/// Number of the current state instance, used for recursion protection
-	size_t numInstance = 0;
-
-	/// Prints execution trace and non-zero storage to @param _out.
-	/// Flag @param _disableMemoryTrace, if set, does not produce a memory dump. This
-	/// avoids false positives reports by the fuzzer when certain optimizer steps are
-	/// activated e.g., Redundant store eliminator, Equal store eliminator.
-	void dumpTraceAndState(std::ostream& _out, bool _disableMemoryTrace) const;
-	/// Prints non-zero storage to @param _out.
-	void dumpStorage(std::ostream& _out) const;
-
-	bytes readMemory(u256 const& _offset, u256 const& _size)
-	{
-		yulAssert(_size <= 0xffff, "Too large read.");
-		bytes data(size_t(_size), uint8_t(0));
-		for (size_t i = 0; i < data.size(); ++i)
-			data[i] = memory[_offset + i];
-		return data;
-	}
-};
-
-/**
- * Scope structure built and maintained during execution.
- */
-struct Scope
-{
-	/// Used for variables and functions. Value is nullptr for variables.
-	std::map<YulString, FunctionDefinition const*> names;
-	std::map<Block const*, std::unique_ptr<Scope>> subScopes;
-	Scope* parent = nullptr;
-};
-
-/**
- * Yul interpreter.
- */
-class Interpreter: public ASTWalker
-{
-public:
-	/// Executes the Yul interpreter. Flag @param _disableMemoryTracing if set ensures that
-	/// instructions that write to memory do not affect @param _state. This
-	/// avoids false positives reports by the fuzzer when certain optimizer steps are
-	/// activated e.g., Redundant store eliminator, Equal store eliminator.
-	static void run(
-		InterpreterState& _state,
-		Dialect const& _dialect,
-		Block const& _ast,
-		bool _disableExternalCalls,
-		bool _disableMemoryTracing
-	);
-
-	Interpreter(
-		InterpreterState& _state,
-		Dialect const& _dialect,
-		Scope& _scope,
-		bool _disableExternalCalls,
-		bool _disableMemoryTracing,
-		std::map<YulString, u256> _variables = {}
-	):
-		m_dialect(_dialect),
-		m_state(_state),
-		m_variables(std::move(_variables)),
-		m_scope(&_scope),
-		m_disableExternalCalls(_disableExternalCalls),
-		m_disableMemoryTrace(_disableMemoryTracing)
-	{
-	}
-
-	void operator()(ExpressionStatement const& _statement) override;
-	void operator()(Assignment const& _assignment) override;
-	void operator()(VariableDeclaration const& _varDecl) override;
-	void operator()(If const& _if) override;
-	void operator()(Switch const& _switch) override;
-	void operator()(FunctionDefinition const&) override;
-	void operator()(ForLoop const&) override;
-	void operator()(Break const&) override;
-	void operator()(Continue const&) override;
-	void operator()(Leave const&) override;
-	void operator()(Block const& _block) override;
-
-	bytes returnData() const { return m_state.returndata; }
-	std::vector<std::string> const& trace() const { return m_state.trace; }
-
-	u256 valueOfVariable(YulString _name) const { return m_variables.at(_name); }
-
-protected:
-	/// Asserts that the expression evaluates to exactly one value and returns it.
-	virtual u256 evaluate(Expression const& _expression);
-	/// Evaluates the expression and returns its value.
-	virtual std::vector<u256> evaluateMulti(Expression const& _expression);
-
-	void enterScope(Block const& _block);
-	void leaveScope();
-
-	/// Increment interpreter step count, throwing exception if step limit
-	/// is reached.
-	void incrementStep();
-
-	Dialect const& m_dialect;
-	InterpreterState& m_state;
-	/// Values of variables.
-	std::map<YulString, u256> m_variables;
-	Scope* m_scope;
-	/// If not set, external calls (e.g. using `call()`) to the same contract
-	/// are evaluated in a new parser instance.
-	bool m_disableExternalCalls;
-	bool m_disableMemoryTrace;
-};
-
-/**
- * Yul expression evaluator.
- */
-class ExpressionEvaluator: public ASTWalker
-{
-public:
-	ExpressionEvaluator(
-		InterpreterState& _state,
-		Dialect const& _dialect,
-		Scope& _scope,
-		std::map<YulString, u256> const& _variables,
-		bool _disableExternalCalls,
-		bool _disableMemoryTrace
-	):
-		m_state(_state),
-		m_dialect(_dialect),
-		m_variables(_variables),
-		m_scope(_scope),
-		m_disableExternalCalls(_disableExternalCalls),
-		m_disableMemoryTrace(_disableMemoryTrace)
-	{}
-
-	void operator()(Literal const&) override;
-	void operator()(Identifier const&) override;
-	void operator()(FunctionCall const& _funCall) override;
-
-	/// Asserts that the expression has exactly one value and returns it.
-	u256 value() const;
-	/// Returns the list of values of the expression.
-	std::vector<u256> values() const { return m_values; }
-
-protected:
-	void runExternalCall(evmasm::Instruction _instruction);
-	virtual std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulString, u256> _variables = {}) const
-	{
-		return std::make_unique<Interpreter>(
-			m_state,
-			m_dialect,
-			m_scope,
-			m_disableExternalCalls,
-			m_disableMemoryTrace,
-			std::move(_variables)
-		);
-	}
-	virtual std::unique_ptr<Interpreter> makeInterpreterNew(InterpreterState& _state, Scope& _scope) const
-	{
-		return std::make_unique<Interpreter>(
-			_state,
-			m_dialect,
-			_scope,
-			m_disableExternalCalls,
-			m_disableMemoryTrace
-		);
-	}
-
-	void setValue(u256 _value);
-
-	/// Evaluates the given expression from right to left and
-	/// stores it in m_value.
-	void evaluateArgs(
-		std::vector<Expression> const& _expr,
-		std::vector<std::optional<LiteralKind>> const* _literalArguments
-	);
-
-	/// Increment evaluation count, throwing exception if the
-	/// nesting level is beyond the upper bound configured in
-	/// the interpreter state.
-	void incrementStep();
-
-	InterpreterState& m_state;
-	Dialect const& m_dialect;
-	/// Values of variables.
-	std::map<YulString, u256> const& m_variables;
-	Scope& m_scope;
-	/// Current value of the expression
-	std::vector<u256> m_values;
-	/// Current expression nesting level
-	unsigned m_nestingLevel = 0;
-	bool m_disableExternalCalls;
-	/// Flag to disable memory tracing
-	bool m_disableMemoryTrace;
-};
-
-}
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
deleted file mode 100644
index 20491afe1657..000000000000
--- a/test/tools/yulopti.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Interactive yul optimizer
- */
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-#include <libsolutil/StringUtils.h>
-#include <liblangutil/ErrorReporter.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libsolidity/parsing/Parser.h>
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/Object.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libyul/optimiser/Disambiguator.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/StackCompressor.h>
-#include <libyul/optimiser/VarNameCleaner.h>
-#include <libyul/optimiser/Suite.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libsolutil/JSON.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-#include <liblangutil/CharStreamProvider.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/join.hpp>
-#include <boost/program_options.hpp>
-
-#include <range/v3/action/sort.hpp>
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/concat.hpp>
-#include <range/v3/view/drop.hpp>
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/set_algorithm.hpp>
-#include <range/v3/view/stride.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <cctype>
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <variant>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::frontend;
-using namespace solidity::yul;
-
-namespace po = boost::program_options;
-
-class YulOpti
-{
-public:
-	static void printErrors(CharStream const& _charStream, ErrorList const& _errors)
-	{
-		SourceReferenceFormatter{
-			cerr,
-			SingletonCharStreamProvider(_charStream),
-			true,
-			false
-		}.printErrorInformation(_errors);
-	}
-
-	void parse(string const& _input)
-	{
-		ErrorList errors;
-		ErrorReporter errorReporter(errors);
-		CharStream _charStream(_input, "");
-		try
-		{
-			m_ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
-			if (!m_ast || !errorReporter.errors().empty())
-			{
-				cerr << "Error parsing source." << endl;
-				printErrors(_charStream, errors);
-				throw std::runtime_error("Could not parse source.");
-			}
-			m_analysisInfo = make_unique<yul::AsmAnalysisInfo>();
-			AsmAnalyzer analyzer(
-				*m_analysisInfo,
-				errorReporter,
-				m_dialect
-			);
-			if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())
-			{
-				cerr << "Error analyzing source." << endl;
-				printErrors(_charStream, errors);
-				throw std::runtime_error("Could not analyze source.");
-			}
-		}
-		catch(...)
-		{
-			cerr << "Fatal error during parsing: " << endl;
-			printErrors(_charStream, errors);
-			throw;
-		}
-	}
-
-	void printUsageBanner(
-		map<char, string> const& _extraOptions,
-		size_t _columns
-	)
-	{
-		yulAssert(_columns > 0);
-		auto const& optimiserSteps = OptimiserSuite::stepAbbreviationToNameMap();
-		auto hasShorterString = [](auto const& a, auto const& b) { return a.second.size() < b.second.size(); };
-		size_t longestDescriptionLength = std::max(
-			max_element(optimiserSteps.begin(), optimiserSteps.end(), hasShorterString)->second.size(),
-			max_element(_extraOptions.begin(), _extraOptions.end(), hasShorterString)->second.size()
-		);
-
-		vector<string> overlappingAbbreviations =
-			ranges::views::set_intersection(_extraOptions | ranges::views::keys, optimiserSteps | ranges::views::keys) |
-			ranges::views::transform([](char _abbreviation){ return string(1, _abbreviation); }) |
-			ranges::to<vector>();
-
-		yulAssert(
-			overlappingAbbreviations.empty(),
-			"ERROR: Conflict between yulopti controls and the following Yul optimizer step abbreviations: " +
-			boost::join(overlappingAbbreviations, ", ") + ".\n"
-			"This is most likely caused by someone adding a new step abbreviation to "
-			"OptimiserSuite::stepNameToAbbreviationMap() and not realizing that it's used by yulopti.\n"
-			"Please update the code to use a different character and recompile yulopti."
-		);
-
-		vector<tuple<char, string>> sortedOptions =
-			ranges::views::concat(optimiserSteps, _extraOptions) |
-			ranges::to<vector<tuple<char, string>>>() |
-			ranges::actions::sort([](tuple<char, string> const& _a, tuple<char, string> const& _b) {
-				return (
-					!boost::algorithm::iequals(get<1>(_a), get<1>(_b)) ?
-					boost::algorithm::lexicographical_compare(get<1>(_a), get<1>(_b), boost::algorithm::is_iless()) :
-					toLower(get<0>(_a)) < toLower(get<0>(_b))
-				);
-			});
-
-		yulAssert(sortedOptions.size() > 0);
-		size_t rows = (sortedOptions.size() - 1) / _columns + 1;
-		for (size_t row = 0; row < rows; ++row)
-		{
-			for (auto const& [key, name]: sortedOptions | ranges::views::drop(row) | ranges::views::stride(rows))
-				cout << key << ": " << setw(static_cast<int>(longestDescriptionLength)) << setiosflags(ios::left) << name << " ";
-
-			cout << endl;
-		}
-	}
-
-	void disambiguate()
-	{
-		*m_ast = std::get<yul::Block>(Disambiguator(m_dialect, *m_analysisInfo)(*m_ast));
-		m_analysisInfo.reset();
-		m_nameDispenser.reset(*m_ast);
-	}
-
-	void runSteps(string _source, string _steps)
-	{
-		parse(_source);
-		disambiguate();
-		OptimiserSuite{m_context}.runSequence(_steps, *m_ast);
-		cout << AsmPrinter{m_dialect}(*m_ast) << endl;
-	}
-
-	void runInteractive(string _source, bool _disambiguated = false)
-	{
-		bool disambiguated = _disambiguated;
-		while (true)
-		{
-			parse(_source);
-			disambiguated = disambiguated || (disambiguate(), true);
-			map<char, string> const& extraOptions = {
-				// QUIT starts with a non-letter character on purpose to get it to show up on top of the list
-				{'#', ">>> QUIT <<<"},
-				{',', "VarNameCleaner"},
-				{';', "StackCompressor"}
-			};
-
-			printUsageBanner(extraOptions, 4);
-			cout << "? ";
-			cout.flush();
-			char option = static_cast<char>(readStandardInputChar());
-			cout << ' ' << option << endl;
-
-			try
-			{
-				switch (option)
-				{
-					case 4:
-					case '#':
-						return;
-					case ',':
-						VarNameCleaner::run(m_context, *m_ast);
-						// VarNameCleaner destroys the unique names guarantee of the disambiguator.
-						disambiguated = false;
-						break;
-					case ';':
-					{
-						Object obj;
-						obj.code = m_ast;
-						StackCompressor::run(m_dialect, obj, true, 16);
-						break;
-					}
-					default:
-						OptimiserSuite{m_context}.runSequence(
-							std::string_view(&option, 1),
-							*m_ast
-						);
-				}
-				_source = AsmPrinter{m_dialect}(*m_ast);
-			}
-			catch (...)
-			{
-				cerr << endl << "Exception during optimiser step:" << endl;
-				cerr << boost::current_exception_diagnostic_information() << endl;
-			}
-			cout << "----------------------" << endl;
-			cout << _source << endl;
-		}
-	}
-
-private:
-	shared_ptr<yul::Block> m_ast;
-	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{})};
-	unique_ptr<AsmAnalysisInfo> m_analysisInfo;
-	set<YulString> const m_reservedIdentifiers = {};
-	NameDispenser m_nameDispenser{m_dialect, m_reservedIdentifiers};
-	OptimiserStepContext m_context{
-		m_dialect,
-		m_nameDispenser,
-		m_reservedIdentifiers,
-		solidity::frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-	};
-};
-
-int main(int argc, char** argv)
-{
-	try
-	{
-		bool nonInteractive = false;
-		po::options_description options(
-			R"(yulopti, yul optimizer exploration tool.
-	Usage: yulopti [Options] <file>
-	Reads <file> as yul code and applies optimizer steps to it,
-	interactively read from stdin.
-	In non-interactive mode a list of steps has to be provided.
-	If <file> is -, yul code is read from stdin and run non-interactively.
-
-	Allowed options)",
-			po::options_description::m_default_line_length,
-			po::options_description::m_default_line_length - 23);
-		options.add_options()
-			(
-				"input-file",
-				po::value<string>(),
-				"input file"
-			)
-			(
-				"steps",
-				po::value<string>(),
-				"steps to execute non-interactively"
-			)
-			(
-				"non-interactive,n",
-				po::bool_switch(&nonInteractive)->default_value(false),
-				"stop after executing the provided steps"
-			)
-			("help,h", "Show this help screen.");
-
-		// All positional options should be interpreted as input files
-		po::positional_options_description filesPositions;
-		filesPositions.add("input-file", 1);
-
-		po::variables_map arguments;
-		po::command_line_parser cmdLineParser(argc, argv);
-		cmdLineParser.options(options).positional(filesPositions);
-		po::store(cmdLineParser.run(), arguments);
-		po::notify(arguments);
-
-		if (arguments.count("help"))
-		{
-			cout << options;
-			return 0;
-		}
-
-		string input;
-		if (arguments.count("input-file"))
-		{
-			string filename = arguments["input-file"].as<string>();
-			if (filename == "-")
-			{
-				nonInteractive = true;
-				input = readUntilEnd(cin);
-			}
-			else
-				input = readFileAsString(arguments["input-file"].as<string>());
-		}
-		else
-		{
-			cout << options;
-			return 1;
-		}
-
-		if (nonInteractive && !arguments.count("steps"))
-		{
-			cout << options;
-			return 1;
-		}
-
-		YulOpti yulOpti;
-		bool disambiguated = false;
-		if (!nonInteractive)
-			cout << input << endl;
-		if (arguments.count("steps"))
-		{
-			string sequence = arguments["steps"].as<string>();
-			if (!nonInteractive)
-				cout << "----------------------" << endl;
-			yulOpti.runSteps(input, sequence);
-			disambiguated = true;
-		}
-		if (!nonInteractive)
-			yulOpti.runInteractive(input, disambiguated);
-
-		return 0;
-	}
-	catch (po::error const& _exception)
-	{
-		cerr << _exception.what() << endl;
-		return 1;
-	}
-	catch (FileNotFound const& _exception)
-	{
-		cerr << "File not found:" << _exception.comment() << endl;
-		return 1;
-	}
-	catch (NotAFile const& _exception)
-	{
-		cerr << "Not a regular file:" << _exception.comment() << endl;
-		return 1;
-	}
-	catch(...)
-	{
-		cerr << endl << "Exception:" << endl;
-		cerr << boost::current_exception_diagnostic_information() << endl;
-		return 1;
-	}
-}
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
deleted file mode 100644
index 2e1bcc013e45..000000000000
--- a/test/tools/yulrun.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Yul interpreter.
- */
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-#include <test/tools/yulInterpreter/Inspector.h>
-
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/Dialect.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/YulStack.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/EVMVersion.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Exceptions.h>
-
-#include <boost/program_options.hpp>
-
-#include <string>
-#include <memory>
-#include <iostream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-
-namespace po = boost::program_options;
-
-namespace
-{
-
-pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source)
-{
-	YulStack stack(
-		langutil::EVMVersion(),
-		nullopt,
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::none(),
-		DebugInfoSelection::Default()
-	);
-	if (stack.parseAndAnalyze("--INPUT--", _source))
-	{
-		yulAssert(stack.errors().empty(), "Parsed successfully but had errors.");
-		return make_pair(stack.parserResult()->code, stack.parserResult()->analysisInfo);
-	}
-	else
-	{
-		SourceReferenceFormatter(cout, stack, true, false).printErrorInformation(stack.errors());
-		return {};
-	}
-}
-
-void interpret(string const& _source, bool _inspect, bool _disableExternalCalls)
-{
-	shared_ptr<Block> ast;
-	shared_ptr<AsmAnalysisInfo> analysisInfo;
-	tie(ast, analysisInfo) = parse(_source);
-	if (!ast || !analysisInfo)
-		return;
-
-	InterpreterState state;
-	state.maxTraceSize = 10000;
-	try
-	{
-		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}));
-
-		if (_inspect)
-			InspectedInterpreter::run(std::make_shared<Inspector>(_source, state), state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
-
-		else
-			Interpreter::run(state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
-	}
-	catch (InterpreterTerminatedGeneric const&)
-	{
-	}
-
-	state.dumpTraceAndState(cout, /*disableMemoryTracing=*/false);
-}
-
-}
-
-int main(int argc, char** argv)
-{
-	po::options_description options(
-		R"(yulrun, the Yul interpreter.
-Usage: yulrun [Options] < input
-Reads a single source from stdin, runs it and prints a trace of all side-effects.
-
-Allowed options)",
-		po::options_description::m_default_line_length,
-		po::options_description::m_default_line_length - 23);
-	options.add_options()
-		("help", "Show this help screen.")
-		("enable-external-calls", "Enable external calls")
-		("interactive", "Run interactive")
-		("input-file", po::value<vector<string>>(), "input file");
-	po::positional_options_description filesPositions;
-	filesPositions.add("input-file", -1);
-
-	po::variables_map arguments;
-	try
-	{
-		po::command_line_parser cmdLineParser(argc, argv);
-		cmdLineParser.options(options).positional(filesPositions);
-		po::store(cmdLineParser.run(), arguments);
-	}
-	catch (po::error const& _exception)
-	{
-		cerr << _exception.what() << endl;
-		return 1;
-	}
-
-	if (arguments.count("help"))
-		cout << options;
-	else
-	{
-		string input;
-		if (arguments.count("input-file"))
-			for (string path: arguments["input-file"].as<vector<string>>())
-			{
-				try
-				{
-					input += readFileAsString(path);
-				}
-				catch (FileNotFound const&)
-				{
-					cerr << "File not found: " << path << endl;
-					return 1;
-				}
-				catch (NotAFile const&)
-				{
-					cerr << "Not a regular file: " << path << endl;
-					return 1;
-				}
-			}
-		else
-			input = readUntilEnd(cin);
-
-		interpret(input, arguments.count("interactive"), !arguments.count("enable-external-calls"));
-	}
-
-	return 0;
-}
diff --git a/test/yulPhaser/AlgorithmRunner.cpp b/test/yulPhaser/AlgorithmRunner.cpp
deleted file mode 100644
index 003403929eb2..000000000000
--- a/test/yulPhaser/AlgorithmRunner.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/AlgorithmRunner.h>
-#include <tools/yulPhaser/Common.h>
-#include <tools/yulPhaser/FitnessMetrics.h>
-
-#include <liblangutil/CharStream.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
-
-#include <fstream>
-#include <regex>
-#include <sstream>
-
-using namespace std;
-using namespace boost::unit_test::framework;
-using namespace boost::test_tools;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-namespace fs = boost::filesystem;
-
-namespace solidity::phaser::test
-{
-
-class CountingAlgorithm: public GeneticAlgorithm
-{
-public:
-	using GeneticAlgorithm::GeneticAlgorithm;
-	Population runNextRound(Population _population) override
-	{
-		++m_currentRound;
-		return _population;
-	}
-
-	size_t m_currentRound = 0;
-};
-
-class RandomisingAlgorithm: public GeneticAlgorithm
-{
-public:
-	using GeneticAlgorithm::GeneticAlgorithm;
-	Population runNextRound(Population _population) override
-	{
-		return Population::makeRandom(_population.fitnessMetric(), _population.individuals().size(), 10, 20);
-	}
-};
-
-class AlgorithmRunnerFixture
-{
-protected:
-	// NOTE: Regexes here should not contain spaces because we strip them before matching
-	regex RoundSummaryRegex{R"(-+ROUND\d+\[round:[0-9.]+s,total:[0-9.]+s\]-+)"};
-	regex InitialPopulationHeaderRegex{"-+INITIALPOPULATION-+"};
-
-	string individualPattern(Individual const& individual) const
-	{
-		ostringstream output;
-		output << individual.fitness << individual.chromosome;
-		return output.str();
-	}
-
-	string topChromosomePattern(size_t roundNumber, Individual const& individual) const
-	{
-		ostringstream output;
-		output << roundNumber << R"(\|[0-9.]+\|)" << individualPattern(individual);
-		return output.str();
-	}
-
-	bool nextLineMatches(stringstream& stream, regex const& pattern) const
-	{
-		string line;
-		if (getline(stream, line).fail())
-			return false;
-
-		return regex_match(stripWhitespace(line), pattern);
-	}
-
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
-	Population const m_population = Population::makeRandom(m_fitnessMetric, 5, 0, 20);
-	stringstream m_output;
-	AlgorithmRunner::Options m_options;
-};
-
-class AlgorithmRunnerAutosaveFixture: public AlgorithmRunnerFixture
-{
-public:
-	static vector<string> chromosomeStrings(Population const& _population)
-	{
-		vector<string> lines;
-		for (auto const& individual: _population.individuals())
-			lines.push_back(toString(individual.chromosome));
-
-		return lines;
-	}
-
-protected:
-	TemporaryDirectory m_tempDir;
-	string const m_autosavePath = (m_tempDir.path() / "population-autosave.txt").string();
-	RandomisingAlgorithm m_algorithm;
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(AlgorithmRunnerTest)
-
-BOOST_FIXTURE_TEST_CASE(run_should_call_runNextRound_once_per_round, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 5;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-
-	CountingAlgorithm algorithm;
-
-	BOOST_TEST(algorithm.m_currentRound == 0);
-	runner.run(algorithm);
-	BOOST_TEST(algorithm.m_currentRound == 5);
-	runner.run(algorithm);
-	BOOST_TEST(algorithm.m_currentRound == 10);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_round_summary_after_each_round, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showOnlyTopChromosome = false;
-	m_options.showRoundInfo = true;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	RandomisingAlgorithm algorithm;
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, RoundSummaryRegex));
-	for (auto const& individual: runner.population().individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, RoundSummaryRegex));
-	for (auto const& individual: runner.population().individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_print_round_summary_if_not_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showOnlyTopChromosome = false;
-	m_options.showRoundInfo = false;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	RandomisingAlgorithm algorithm;
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex("")));
-	for (auto const& individual: runner.population().individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_print_population_if_its_empty, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showOnlyTopChromosome = false;
-	m_options.showRoundInfo = true;
-	AlgorithmRunner runner(Population(m_fitnessMetric), {}, m_options, m_output);
-	RandomisingAlgorithm algorithm;
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, RoundSummaryRegex));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_only_top_chromosome_if_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showOnlyTopChromosome = true;
-	m_options.showRoundInfo = true;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	RandomisingAlgorithm algorithm;
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex(topChromosomePattern(1, runner.population().individuals()[0]))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_print_round_number_for_top_chromosome_if_round_info_not_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showOnlyTopChromosome = true;
-	m_options.showRoundInfo = false;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	RandomisingAlgorithm algorithm;
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(runner.population().individuals()[0]))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_print_population_if_its_empty_and_only_top_chromosome_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 3;
-	m_options.showRoundInfo = true;
-	m_options.showInitialPopulation = false;
-	m_options.showOnlyTopChromosome = true;
-	AlgorithmRunner runner(Population(m_fitnessMetric), {}, m_options, m_output);
-	RandomisingAlgorithm algorithm;
-
-	runner.run(algorithm);
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_initial_population_if_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 0;
-	m_options.showInitialPopulation = true;
-	m_options.showRoundInfo = false;
-	m_options.showOnlyTopChromosome = false;
-	RandomisingAlgorithm algorithm;
-
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	runner.run(algorithm);
-
-	BOOST_TEST(nextLineMatches(m_output, InitialPopulationHeaderRegex));
-	for (auto const& individual: m_population.individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_print_initial_population_if_not_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 0;
-	m_options.showInitialPopulation = false;
-	m_options.showRoundInfo = false;
-	m_options.showOnlyTopChromosome = false;
-	RandomisingAlgorithm algorithm;
-
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	runner.run(algorithm);
-
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_whole_initial_population_even_if_only_top_chromosome_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 0;
-	m_options.showInitialPopulation = true;
-	m_options.showRoundInfo = false;
-	m_options.showOnlyTopChromosome = true;
-	RandomisingAlgorithm algorithm;
-
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	runner.run(algorithm);
-
-	BOOST_TEST(nextLineMatches(m_output, InitialPopulationHeaderRegex));
-	for (auto const& individual: m_population.individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_cache_stats_if_requested, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 4;
-	m_options.showInitialPopulation = false;
-	m_options.showRoundInfo = false;
-	m_options.showOnlyTopChromosome = true;
-	m_options.showCacheStats = true;
-	RandomisingAlgorithm algorithm;
-
-	vector<CharStream> sourceStreams = {
-		CharStream("{mstore(10, 20)}", ""),
-		CharStream("{mstore(10, 20)\nsstore(10, 20)}", ""),
-	};
-	vector<Program> programs = {
-		get<Program>(Program::load(sourceStreams[0])),
-		get<Program>(Program::load(sourceStreams[1])),
-	};
-	vector<shared_ptr<ProgramCache>> caches = {
-		make_shared<ProgramCache>(programs[0]),
-		make_shared<ProgramCache>(programs[1]),
-	};
-	shared_ptr<FitnessMetric> fitnessMetric = make_shared<FitnessMetricAverage>(vector<shared_ptr<FitnessMetric>>{
-		make_shared<ProgramSize>(nullopt, caches[0], CodeWeights{}),
-		make_shared<ProgramSize>(nullopt, caches[1], CodeWeights{}),
-	});
-	Population population = Population::makeRandom(fitnessMetric, 2, 0, 5);
-
-	AlgorithmRunner runner(population, caches, m_options, m_output);
-	runner.run(algorithm);
-
-	BOOST_TEST(caches[0]->currentRound() == m_options.maxRounds.value());
-	BOOST_TEST(caches[1]->currentRound() == m_options.maxRounds.value());
-
-	CacheStats stats = caches[0]->gatherStats() + caches[1]->gatherStats();
-
-	for (size_t i = 0; i < m_options.maxRounds.value() - 1; ++i)
-	{
-		BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-		BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-		if (i > 0)
-			BOOST_TEST(nextLineMatches(m_output, regex(R"(Round\d+:\d+entries)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Round\d+:\d+entries)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalhits:\d+)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalmisses:\d+)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Sizeofcachedcode:\d+)")));
-	}
-
-	BOOST_REQUIRE(stats.roundEntryCounts.size() == 2);
-	BOOST_REQUIRE(stats.roundEntryCounts.count(m_options.maxRounds.value() - 1) == 1);
-	BOOST_REQUIRE(stats.roundEntryCounts.count(m_options.maxRounds.value()) == 1);
-
-	size_t round = m_options.maxRounds.value();
-	BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-	BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-	BOOST_TEST(nextLineMatches(m_output, regex("Round" + toString(round - 1) + ":" + toString(stats.roundEntryCounts[round - 1]) + "entries")));
-	BOOST_TEST(nextLineMatches(m_output, regex("Round" + toString(round) + ":" + toString(stats.roundEntryCounts[round]) + "entries")));
-	BOOST_TEST(nextLineMatches(m_output, regex("Totalhits:" + toString(stats.hits))));
-	BOOST_TEST(nextLineMatches(m_output, regex("Totalmisses:" + toString(stats.misses))));
-	BOOST_TEST(nextLineMatches(m_output, regex("Sizeofcachedcode:" + toString(stats.totalCodeSize))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_message_if_cache_stats_requested_but_cache_disabled, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showRoundInfo = false;
-	m_options.showOnlyTopChromosome = true;
-	m_options.showCacheStats = true;
-	RandomisingAlgorithm algorithm;
-
-	AlgorithmRunner runner(m_population, {nullptr}, m_options, m_output);
-	runner.run(algorithm);
-
-	BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-	BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-	BOOST_TEST(nextLineMatches(m_output, regex(stripWhitespace("Program cache disabled"))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_print_partial_stats_and_message_if_some_caches_disabled, AlgorithmRunnerFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.showInitialPopulation = false;
-	m_options.showRoundInfo = false;
-	m_options.showOnlyTopChromosome = true;
-	m_options.showCacheStats = true;
-	RandomisingAlgorithm algorithm;
-
-	CharStream sourceStream = CharStream("{}", "");
-	shared_ptr<ProgramCache> cache = make_shared<ProgramCache>(get<Program>(Program::load(sourceStream)));
-
-	AlgorithmRunner runner(m_population, {cache, nullptr}, m_options, m_output);
-	BOOST_REQUIRE(cache->gatherStats().roundEntryCounts.size() == 0);
-
-	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-	BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-	BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalhits:\d+)")));
-	BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalmisses:\d+)")));
-	BOOST_TEST(nextLineMatches(m_output, regex(R"(Sizeofcachedcode:\d+)")));
-	BOOST_TEST(nextLineMatches(m_output, regex(stripWhitespace("Program cache disabled for 1 out of 2 programs"))));
-	BOOST_TEST(m_output.peek() == EOF);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_save_initial_population_to_file_if_autosave_file_specified, AlgorithmRunnerAutosaveFixture)
-{
-	m_options.maxRounds = 0;
-	m_options.populationAutosaveFile = m_autosavePath;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	assert(!fs::exists(m_autosavePath));
-
-	runner.run(m_algorithm);
-	assert(runner.population() == m_population);
-
-	BOOST_TEST(fs::is_regular_file(m_autosavePath));
-	BOOST_TEST(readLinesFromFile(m_autosavePath) == chromosomeStrings(runner.population()));
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_save_population_to_file_if_autosave_file_specified, AlgorithmRunnerAutosaveFixture)
-{
-	m_options.maxRounds = 1;
-	m_options.populationAutosaveFile = m_autosavePath;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	assert(!fs::exists(m_autosavePath));
-
-	runner.run(m_algorithm);
-	assert(runner.population() != m_population);
-
-	BOOST_TEST(fs::is_regular_file(m_autosavePath));
-	BOOST_TEST(readLinesFromFile(m_autosavePath) == chromosomeStrings(runner.population()));
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_overwrite_existing_file_if_autosave_file_specified, AlgorithmRunnerAutosaveFixture)
-{
-	m_options.maxRounds = 5;
-	m_options.populationAutosaveFile = m_autosavePath;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	assert(!fs::exists(m_autosavePath));
-
-	vector<string> originalContent = {"Original content"};
-	{
-		ofstream tmpFile(m_autosavePath);
-		tmpFile << originalContent[0] << endl;
-	}
-	assert(fs::exists(m_autosavePath));
-	assert(readLinesFromFile(m_autosavePath) == originalContent);
-
-	runner.run(m_algorithm);
-
-	BOOST_TEST(fs::is_regular_file(m_autosavePath));
-	BOOST_TEST(readLinesFromFile(m_autosavePath) != originalContent);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_save_population_to_file_if_autosave_file_not_specified, AlgorithmRunnerAutosaveFixture)
-{
-	m_options.maxRounds = 5;
-	m_options.populationAutosaveFile = nullopt;
-	AlgorithmRunner runner(m_population, {}, m_options, m_output);
-	assert(!fs::exists(m_autosavePath));
-
-	runner.run(m_algorithm);
-
-	BOOST_TEST(!fs::exists(m_autosavePath));
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_randomise_duplicate_chromosomes_if_requested, AlgorithmRunnerFixture)
-{
-	Chromosome duplicate("afc");
-	Population population(m_fitnessMetric, {duplicate, duplicate, duplicate});
-	CountingAlgorithm algorithm;
-
-	m_options.maxRounds = 1;
-	m_options.randomiseDuplicates = true;
-	m_options.minChromosomeLength = 50;
-	m_options.maxChromosomeLength = 50;
-	AlgorithmRunner runner(population, {}, m_options, m_output);
-
-	runner.run(algorithm);
-
-	auto const& newIndividuals = runner.population().individuals();
-
-	BOOST_TEST(newIndividuals.size() == 3);
-	BOOST_TEST((
-		newIndividuals[0].chromosome == duplicate ||
-		newIndividuals[1].chromosome == duplicate ||
-		newIndividuals[2].chromosome == duplicate
-	));
-	BOOST_TEST(newIndividuals[0] != newIndividuals[1]);
-	BOOST_TEST(newIndividuals[0] != newIndividuals[2]);
-	BOOST_TEST(newIndividuals[1] != newIndividuals[2]);
-
-	BOOST_TEST((newIndividuals[0].chromosome.length() == 50 || newIndividuals[0].chromosome == duplicate));
-	BOOST_TEST((newIndividuals[1].chromosome.length() == 50 || newIndividuals[1].chromosome == duplicate));
-	BOOST_TEST((newIndividuals[2].chromosome.length() == 50 || newIndividuals[2].chromosome == duplicate));
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_not_randomise_duplicate_chromosomes_if_not_requested, AlgorithmRunnerFixture)
-{
-	Chromosome duplicate("afc");
-	Population population(m_fitnessMetric, {duplicate, duplicate, duplicate});
-	CountingAlgorithm algorithm;
-
-	m_options.maxRounds = 1;
-	m_options.randomiseDuplicates = false;
-	AlgorithmRunner runner(population, {}, m_options, m_output);
-
-	runner.run(algorithm);
-
-	BOOST_TEST(runner.population().individuals().size() == 3);
-	BOOST_TEST(runner.population().individuals()[0].chromosome == duplicate);
-	BOOST_TEST(runner.population().individuals()[1].chromosome == duplicate);
-	BOOST_TEST(runner.population().individuals()[2].chromosome == duplicate);
-}
-
-BOOST_FIXTURE_TEST_CASE(run_should_clear_cache_at_the_beginning_and_update_it_before_each_round, AlgorithmRunnerFixture)
-{
-	CharStream sourceStream = CharStream("{}", current_test_case().p_name);
-	vector<shared_ptr<ProgramCache>> caches = {
-		make_shared<ProgramCache>(get<Program>(Program::load(sourceStream))),
-		make_shared<ProgramCache>(get<Program>(Program::load(sourceStream))),
-	};
-
-	m_options.maxRounds = 10;
-	AlgorithmRunner runner(m_population, caches, m_options, m_output);
-	CountingAlgorithm algorithm;
-
-	BOOST_TEST(algorithm.m_currentRound == 0);
-	BOOST_TEST(caches[0]->currentRound() == 0);
-	BOOST_TEST(caches[1]->currentRound() == 0);
-
-	runner.run(algorithm);
-	BOOST_TEST(algorithm.m_currentRound == 10);
-	BOOST_TEST(caches[0]->currentRound() == 10);
-	BOOST_TEST(caches[1]->currentRound() == 10);
-
-	runner.run(algorithm);
-	BOOST_TEST(algorithm.m_currentRound == 20);
-	BOOST_TEST(caches[0]->currentRound() == 10);
-	BOOST_TEST(caches[1]->currentRound() == 10);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
deleted file mode 100644
index 1d12bf18c161..000000000000
--- a/test/yulPhaser/Chromosome.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Chromosome.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/optimiser/ConditionalSimplifier.h>
-#include <libyul/optimiser/ExpressionInliner.h>
-#include <libyul/optimiser/ExpressionSimplifier.h>
-#include <libyul/optimiser/ForLoopConditionOutOfBody.h>
-#include <libyul/optimiser/ForLoopConditionOutOfBody.h>
-#include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/LoopInvariantCodeMotion.h>
-#include <libyul/optimiser/UnusedAssignEliminator.h>
-#include <libyul/optimiser/Rematerialiser.h>
-#include <libyul/optimiser/Suite.h>
-#include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/optimiser/UnusedPruner.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace std;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-namespace solidity::phaser::test
-{
-
-vector<string> const ChrOmOsoMeSteps{
-	ConditionalSimplifier::name,
-	FunctionHoister::name,
-	UnusedAssignEliminator::name,
-	ForLoopConditionOutOfBody::name,
-	Rematerialiser::name,
-	ForLoopConditionOutOfBody::name,
-	ExpressionSimplifier::name,
-	ForLoopInitRewriter::name,
-	LoopInvariantCodeMotion::name,
-	ExpressionInliner::name
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(ChromosomeTest)
-
-BOOST_AUTO_TEST_CASE(makeRandom_should_return_different_chromosome_each_time)
-{
-	SimulationRNG::reset(1);
-	for (size_t i = 0; i < 10; ++i)
-		BOOST_TEST(Chromosome::makeRandom(100) != Chromosome::makeRandom(100));
-}
-
-BOOST_AUTO_TEST_CASE(makeRandom_should_use_every_possible_step_with_the_same_probability)
-{
-	SimulationRNG::reset(1);
-	constexpr int samplesPerStep = 500;
-	constexpr double relativeTolerance = 0.02;
-
-	map<string, size_t> stepIndices = enumerateOptmisationSteps();
-	auto chromosome = Chromosome::makeRandom(stepIndices.size() * samplesPerStep);
-
-	vector<size_t> samples;
-	for (auto& step: chromosome.optimisationSteps())
-		samples.push_back(stepIndices.at(step));
-
-	const double expectedValue = double(stepIndices.size() - 1) / 2.0;
-	const double variance = double(stepIndices.size() * stepIndices.size() - 1) / 12.0;
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(constructor_should_store_genes)
-{
-	BOOST_TEST(Chromosome("ChrOmOsoMe").genes() == "ChrOmOsoMe");
-}
-
-BOOST_AUTO_TEST_CASE(constructor_should_store_optimisation_steps)
-{
-	vector<string> steps = {
-		StructuralSimplifier::name,
-		BlockFlattener::name,
-		UnusedPruner::name,
-	};
-
-	BOOST_TEST(Chromosome(steps).genes() == "tfu");
-}
-
-BOOST_AUTO_TEST_CASE(constructor_should_allow_duplicate_steps)
-{
-	vector<string> steps = {
-		StructuralSimplifier::name,
-		StructuralSimplifier::name,
-		BlockFlattener::name,
-		UnusedPruner::name,
-		BlockFlattener::name,
-	};
-
-	BOOST_TEST(Chromosome(steps).genes() == "ttfuf");
-	BOOST_TEST(Chromosome("ttfuf").genes() == "ttfuf");
-}
-
-BOOST_AUTO_TEST_CASE(constructor_should_allow_genes_that_do_not_correspond_to_any_step)
-{
-	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	assert(OptimiserSuite::stepAbbreviationToNameMap().count('b') == 0);
-
-	BOOST_TEST(Chromosome(".").genes() == ".");
-	BOOST_TEST(Chromosome("a..abatbb").genes() == "a..abatbb");
-}
-
-BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_string_representation)
-{
-	vector<string> allSteps;
-	for (auto const& step: OptimiserSuite::allSteps())
-		allSteps.push_back(step.first);
-	Chromosome chromosome(allSteps);
-
-	BOOST_TEST(chromosome.length() == allSteps.size());
-	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMmVatrpuSd");
-}
-
-BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)
-{
-	BOOST_TEST(Chromosome("ChrOmOsoMe").optimisationSteps() == ChrOmOsoMeSteps);
-}
-
-BOOST_AUTO_TEST_CASE(randomOptimisationStep_should_return_each_step_with_same_probability)
-{
-	SimulationRNG::reset(1);
-	constexpr int samplesPerStep = 500;
-	constexpr double relativeTolerance = 0.02;
-
-	map<string, size_t> stepIndices = enumerateOptmisationSteps();
-	vector<size_t> samples;
-	for (size_t i = 0; i <= stepIndices.size() * samplesPerStep; ++i)
-		samples.push_back(stepIndices.at(Chromosome::randomOptimisationStep()));
-
-	const double expectedValue = double(stepIndices.size() - 1) / 2.0;
-	const double variance = double(stepIndices.size() * stepIndices.size() - 1) / 12.0;
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(stepsToGenes_should_translate_optimisation_step_names_to_abbreviations)
-{
-	BOOST_TEST(Chromosome::stepsToGenes({}) == "");
-	BOOST_TEST(Chromosome::stepsToGenes(ChrOmOsoMeSteps) == "ChrOmOsoMe");
-}
-
-BOOST_AUTO_TEST_CASE(genesToSteps_should_translate_optimisation_step_abbreviations_to_names)
-{
-	BOOST_TEST(Chromosome::genesToSteps("") == vector<string>{});
-	BOOST_TEST(Chromosome::genesToSteps("ChrOmOsoMe") == ChrOmOsoMeSteps);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Common.cpp b/test/yulPhaser/Common.cpp
deleted file mode 100644
index 734738483547..000000000000
--- a/test/yulPhaser/Common.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Common.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
-
-#include <fstream>
-#include <sstream>
-#include <string>
-
-using namespace std;
-using namespace boost::test_tools;
-using namespace solidity::util;
-
-namespace solidity::phaser::test
-{
-
-class ReadLinesFromFileFixture
-{
-protected:
-	TemporaryDirectory m_tempDir;
-};
-
-namespace
-{
-
-enum class TestEnum
-{
-	A,
-	B,
-	AB,
-	CD,
-	EF,
-	GH,
-};
-
-map<TestEnum, string> const TestEnumToStringMap =
-{
-	{TestEnum::A, "a"},
-	{TestEnum::B, "b"},
-	{TestEnum::AB, "a b"},
-	{TestEnum::CD, "c-d"},
-	{TestEnum::EF, "e f"},
-};
-map<string, TestEnum> const StringToTestEnumMap = invertMap(TestEnumToStringMap);
-
-}
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(CommonTest)
-
-BOOST_FIXTURE_TEST_CASE(readLinesFromFile_should_return_all_lines_from_a_text_file_as_strings_without_newlines, ReadLinesFromFileFixture)
-{
-	{
-		ofstream tmpFile((m_tempDir.path() / "test-file.txt").string());
-		tmpFile << endl << "Line 1" << endl << endl << endl << "Line 2" << endl << "#" << endl << endl;
-	}
-
-	vector<string> lines = readLinesFromFile((m_tempDir.path() / "test-file.txt").string());
-	BOOST_TEST((lines == vector<string>{"", "Line 1", "", "", "Line 2", "#", ""}));
-}
-
-BOOST_AUTO_TEST_CASE(deserializeChoice_should_convert_string_to_enum)
-{
-	istringstream aStream("a");
-	TestEnum aResult;
-	deserializeChoice(aStream, aResult, StringToTestEnumMap);
-	BOOST_CHECK(aResult == TestEnum::A);
-	BOOST_TEST(!aStream.fail());
-
-	istringstream bStream("b");
-	TestEnum bResult;
-	deserializeChoice(bStream, bResult, StringToTestEnumMap);
-	BOOST_CHECK(bResult == TestEnum::B);
-	BOOST_TEST(!bStream.fail());
-
-	istringstream cdStream("c-d");
-	TestEnum cdResult;
-	deserializeChoice(cdStream, cdResult, StringToTestEnumMap);
-	BOOST_CHECK(cdResult == TestEnum::CD);
-	BOOST_TEST(!cdStream.fail());
-}
-
-BOOST_AUTO_TEST_CASE(deserializeChoice_should_set_failbit_if_there_is_no_enum_corresponding_to_string)
-{
-	istringstream xyzStream("xyz");
-	TestEnum xyzResult;
-	deserializeChoice(xyzStream, xyzResult, StringToTestEnumMap);
-	BOOST_TEST(xyzStream.fail());
-}
-
-BOOST_AUTO_TEST_CASE(deserializeChoice_does_not_have_to_support_strings_with_spaces)
-{
-	istringstream abStream("a b");
-	TestEnum abResult;
-	deserializeChoice(abStream, abResult, StringToTestEnumMap);
-	BOOST_CHECK(abResult == TestEnum::A);
-	BOOST_TEST(!abStream.fail());
-
-	istringstream efStream("e f");
-	TestEnum efResult;
-	deserializeChoice(efStream, efResult, StringToTestEnumMap);
-	BOOST_TEST(efStream.fail());
-}
-
-BOOST_AUTO_TEST_CASE(serializeChoice_should_convert_enum_to_string)
-{
-	output_test_stream output;
-
-	serializeChoice(output, TestEnum::A, TestEnumToStringMap);
-	BOOST_CHECK(output.is_equal("a"));
-	BOOST_TEST(!output.fail());
-
-	serializeChoice(output, TestEnum::AB, TestEnumToStringMap);
-	BOOST_CHECK(output.is_equal("a b"));
-	BOOST_TEST(!output.fail());
-}
-
-BOOST_AUTO_TEST_CASE(serializeChoice_should_set_failbit_if_there_is_no_string_corresponding_to_enum)
-{
-	output_test_stream output;
-	serializeChoice(output, TestEnum::GH, TestEnumToStringMap);
-	BOOST_TEST(output.fail());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/FitnessMetrics.cpp b/test/yulPhaser/FitnessMetrics.cpp
deleted file mode 100644
index bde15a537fd8..000000000000
--- a/test/yulPhaser/FitnessMetrics.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/FitnessMetrics.h>
-
-#include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/optimiser/UnusedPruner.h>
-
-#include <liblangutil/CharStream.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <cmath>
-
-using namespace std;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-namespace solidity::phaser::test
-{
-
-class DummyProgramBasedMetric: public ProgramBasedMetric
-{
-public:
-	using ProgramBasedMetric::ProgramBasedMetric;
-	size_t evaluate(Chromosome const&) override { return 0; }
-};
-
-class ProgramBasedMetricFixture
-{
-protected:
-	static constexpr char SampleSourceCode[] =
-		"{\n"
-		"    function foo() -> result\n"
-		"    {\n"
-		"        let x := 1\n"
-		"        result := 15\n"
-		"    }\n"
-		"    function bar() -> result\n"
-		"    {\n"
-		"        result := 15\n"
-		"    }\n"
-		"    mstore(foo(), bar())\n"
-		"}\n";
-
-	Program optimisedProgram(Program _program) const
-	{
-		[[maybe_unused]] size_t originalSize = _program.codeSize(m_weights);
-		Program result = std::move(_program);
-		result.optimise(m_chromosome.optimisationSteps());
-
-		// Make sure that the program and the chromosome we have chosen are suitable for the test
-		assert(result.codeSize(m_weights) != originalSize);
-
-		return result;
-	}
-
-	CharStream m_sourceStream = CharStream(SampleSourceCode, "");
-	Chromosome m_chromosome{vector<string>{UnusedPruner::name, EquivalentFunctionCombiner::name}};
-	Program m_program = get<Program>(Program::load(m_sourceStream));
-	Program m_optimisedProgram = optimisedProgram(m_program);
-	shared_ptr<ProgramCache> m_programCache = make_shared<ProgramCache>(m_program);
-	static constexpr CodeWeights m_weights{};
-};
-
-class FitnessMetricCombinationFixture: public ProgramBasedMetricFixture
-{
-protected:
-	vector<shared_ptr<FitnessMetric>> m_simpleMetrics = {
-		make_shared<ProgramSize>(m_program, nullptr, m_weights, 1),
-		make_shared<ProgramSize>(m_program, nullptr, m_weights, 2),
-		make_shared<ProgramSize>(m_program, nullptr, m_weights, 3),
-	};
-	vector<size_t> m_fitness = {
-		m_simpleMetrics[0]->evaluate(m_chromosome),
-		m_simpleMetrics[1]->evaluate(m_chromosome),
-		m_simpleMetrics[2]->evaluate(m_chromosome),
-	};
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(FitnessMetricsTest)
-BOOST_AUTO_TEST_SUITE(ProgramBasedMetricTest)
-
-BOOST_FIXTURE_TEST_CASE(optimisedProgram_should_return_optimised_program_even_if_cache_not_available, ProgramBasedMetricFixture)
-{
-	string code = toString(DummyProgramBasedMetric(m_program, nullptr, m_weights).optimisedProgram(m_chromosome));
-
-	BOOST_TEST(code != toString(m_program));
-	BOOST_TEST(code == toString(m_optimisedProgram));
-}
-
-BOOST_FIXTURE_TEST_CASE(optimisedProgram_should_use_cache_if_available, ProgramBasedMetricFixture)
-{
-	string code = toString(DummyProgramBasedMetric(nullopt, m_programCache, m_weights).optimisedProgram(m_chromosome));
-
-	BOOST_TEST(code != toString(m_program));
-	BOOST_TEST(code == toString(m_optimisedProgram));
-	BOOST_TEST(m_programCache->size() == m_chromosome.length());
-}
-
-BOOST_FIXTURE_TEST_CASE(optimisedProgramNoCache_should_return_optimised_program_even_if_cache_not_available, ProgramBasedMetricFixture)
-{
-	string code = toString(DummyProgramBasedMetric(m_program, nullptr, m_weights).optimisedProgramNoCache(m_chromosome));
-
-	BOOST_TEST(code != toString(m_program));
-	BOOST_TEST(code == toString(m_optimisedProgram));
-}
-
-BOOST_FIXTURE_TEST_CASE(optimisedProgramNoCache_should_not_use_cache_even_if_available, ProgramBasedMetricFixture)
-{
-	string code = toString(DummyProgramBasedMetric(nullopt, m_programCache, m_weights).optimisedProgramNoCache(m_chromosome));
-
-	BOOST_TEST(code != toString(m_program));
-	BOOST_TEST(code == toString(m_optimisedProgram));
-	BOOST_TEST(m_programCache->size() == 0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(ProgramSizeTest)
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_compute_size_of_the_optimised_program, ProgramBasedMetricFixture)
-{
-	size_t fitness = ProgramSize(m_program, nullptr, m_weights).evaluate(m_chromosome);
-
-	BOOST_TEST(fitness != m_program.codeSize(m_weights));
-	BOOST_TEST(fitness == m_optimisedProgram.codeSize(m_weights));
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_be_able_to_use_program_cache_if_available, ProgramBasedMetricFixture)
-{
-	size_t fitness = ProgramSize(nullopt, m_programCache, m_weights).evaluate(m_chromosome);
-
-	BOOST_TEST(fitness != m_program.codeSize(m_weights));
-	BOOST_TEST(fitness == m_optimisedProgram.codeSize(m_weights));
-	BOOST_TEST(m_programCache->size() == m_chromosome.length());
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_repeat_the_optimisation_specified_number_of_times, ProgramBasedMetricFixture)
-{
-	Program const& programOptimisedOnce = m_optimisedProgram;
-	Program programOptimisedTwice = optimisedProgram(programOptimisedOnce);
-
-	ProgramSize metric(m_program, nullptr, m_weights, 2);
-	size_t fitness = metric.evaluate(m_chromosome);
-
-	BOOST_TEST(fitness != m_program.codeSize(m_weights));
-	BOOST_TEST(fitness != programOptimisedOnce.codeSize(m_weights));
-	BOOST_TEST(fitness == programOptimisedTwice.codeSize(m_weights));
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_not_optimise_if_number_of_repetitions_is_zero, ProgramBasedMetricFixture)
-{
-	ProgramSize metric(m_program, nullptr, m_weights, 0);
-	size_t fitness = metric.evaluate(m_chromosome);
-
-	BOOST_TEST(fitness == m_program.codeSize(m_weights));
-	BOOST_TEST(fitness != m_optimisedProgram.codeSize(m_weights));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(RelativeProgramSizeTest)
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_compute_the_size_ratio_between_optimised_program_and_original_program, ProgramBasedMetricFixture)
-{
-	BOOST_TEST(
-		RelativeProgramSize(m_program, nullptr, 3, m_weights).evaluate(m_chromosome) ==
-		round(1000.0 * double(m_optimisedProgram.codeSize(m_weights)) / double(m_program.codeSize(m_weights)))
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_be_able_to_use_program_cache_if_available, ProgramBasedMetricFixture)
-{
-	BOOST_TEST(
-		RelativeProgramSize(nullopt, m_programCache, 3, m_weights).evaluate(m_chromosome) ==
-		round(1000.0 * double(m_optimisedProgram.codeSize(m_weights)) / double(m_program.codeSize(m_weights)))
-	);
-	BOOST_TEST(m_programCache->size() == m_chromosome.length());
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_repeat_the_optimisation_specified_number_of_times, ProgramBasedMetricFixture)
-{
-	Program const& programOptimisedOnce = m_optimisedProgram;
-	Program programOptimisedTwice = optimisedProgram(programOptimisedOnce);
-
-	RelativeProgramSize metric(m_program, nullptr, 3, m_weights, 2);
-	size_t fitness = metric.evaluate(m_chromosome);
-
-	BOOST_TEST(fitness != 1000);
-	BOOST_TEST(fitness != RelativeProgramSize(programOptimisedTwice, nullptr, 3, m_weights, 1).evaluate(m_chromosome));
-	BOOST_TEST(fitness == round(1000.0 * double(programOptimisedTwice.codeSize(m_weights)) / double(m_program.codeSize(m_weights))));
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_return_one_if_number_of_repetitions_is_zero, ProgramBasedMetricFixture)
-{
-	RelativeProgramSize metric(m_program, nullptr, 3, m_weights, 0);
-
-	BOOST_TEST(metric.evaluate(m_chromosome) == 1000);
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_return_one_if_the_original_program_size_is_zero, ProgramBasedMetricFixture)
-{
-	CharStream sourceStream = CharStream("{}", "");
-	Program program = get<Program>(Program::load(sourceStream));
-
-	RelativeProgramSize metric(program, nullptr, 3, m_weights);
-
-	BOOST_TEST(metric.evaluate(m_chromosome) == 1000);
-	BOOST_TEST(metric.evaluate(Chromosome("")) == 1000);
-	BOOST_TEST(metric.evaluate(Chromosome("afcxjLTLTDoO")) == 1000);
-}
-
-BOOST_FIXTURE_TEST_CASE(evaluate_should_multiply_the_result_by_scaling_factor, ProgramBasedMetricFixture)
-{
-	double sizeRatio = double(m_optimisedProgram.codeSize(m_weights)) / double(m_program.codeSize(m_weights));
-	BOOST_TEST(RelativeProgramSize(m_program, nullptr, 0, m_weights).evaluate(m_chromosome) == round(1.0 * sizeRatio));
-	BOOST_TEST(RelativeProgramSize(m_program, nullptr, 1, m_weights).evaluate(m_chromosome) == round(10.0 * sizeRatio));
-	BOOST_TEST(RelativeProgramSize(m_program, nullptr, 2, m_weights).evaluate(m_chromosome) == round(100.0 * sizeRatio));
-	BOOST_TEST(RelativeProgramSize(m_program, nullptr, 3, m_weights).evaluate(m_chromosome) == round(1000.0 * sizeRatio));
-	BOOST_TEST(RelativeProgramSize(m_program, nullptr, 4, m_weights).evaluate(m_chromosome) == round(10000.0 * sizeRatio));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(FitnessMetricCombinationTest)
-
-BOOST_FIXTURE_TEST_CASE(FitnessMetricAverage_evaluate_should_compute_average_of_values_returned_by_metrics_passed_to_it, FitnessMetricCombinationFixture)
-{
-	FitnessMetricAverage metric(m_simpleMetrics);
-
-	assert(m_simpleMetrics.size() == 3);
-	BOOST_TEST(metric.evaluate(m_chromosome) == (m_fitness[0] + m_fitness[1] + m_fitness[2]) / 3);
-	BOOST_TEST(metric.metrics() == m_simpleMetrics);
-}
-
-BOOST_FIXTURE_TEST_CASE(FitnessMetricSum_evaluate_should_compute_sum_of_values_returned_by_metrics_passed_to_it, FitnessMetricCombinationFixture)
-{
-	FitnessMetricSum metric(m_simpleMetrics);
-
-	assert(m_simpleMetrics.size() == 3);
-	BOOST_TEST(metric.evaluate(m_chromosome) == m_fitness[0] + m_fitness[1] + m_fitness[2]);
-	BOOST_TEST(metric.metrics() == m_simpleMetrics);
-}
-
-BOOST_FIXTURE_TEST_CASE(FitnessMetricMaximum_evaluate_should_compute_maximum_of_values_returned_by_metrics_passed_to_it, FitnessMetricCombinationFixture)
-{
-	FitnessMetricMaximum metric(m_simpleMetrics);
-
-	assert(m_simpleMetrics.size() == 3);
-	BOOST_TEST(metric.evaluate(m_chromosome) == max(m_fitness[0], max(m_fitness[1], m_fitness[2])));
-	BOOST_TEST(metric.metrics() == m_simpleMetrics);
-}
-
-BOOST_FIXTURE_TEST_CASE(FitnessMetricMinimum_evaluate_should_compute_minimum_of_values_returned_by_metrics_passed_to_it, FitnessMetricCombinationFixture)
-{
-	FitnessMetricMinimum metric(m_simpleMetrics);
-
-	assert(m_simpleMetrics.size() == 3);
-	BOOST_TEST(metric.evaluate(m_chromosome) == min(m_fitness[0], min(m_fitness[1], m_fitness[2])));
-	BOOST_TEST(metric.metrics() == m_simpleMetrics);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/GeneticAlgorithms.cpp b/test/yulPhaser/GeneticAlgorithms.cpp
deleted file mode 100644
index 29c9cfa2ecaf..000000000000
--- a/test/yulPhaser/GeneticAlgorithms.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/FitnessMetrics.h>
-#include <tools/yulPhaser/GeneticAlgorithms.h>
-#include <tools/yulPhaser/Population.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <vector>
-
-using namespace std;
-using namespace boost::unit_test::framework;
-using namespace boost::test_tools;
-using namespace solidity::util;
-
-namespace solidity::phaser::test
-{
-
-class GeneticAlgorithmFixture
-{
-protected:
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
-};
-
-class ClassicGeneticAlgorithmFixture: public GeneticAlgorithmFixture
-{
-protected:
-	ClassicGeneticAlgorithm::Options m_options = {
-		/* elitePoolSize = */ 0.0,
-		/* crossoverChance = */ 0.0,
-		/* mutationChance = */ 0.0,
-		/* deletionChance = */ 0.0,
-		/* additionChance = */ 0.0,
-		/* CrossoverChoice = */ CrossoverChoice::SinglePoint,
-		/* uniformCrossoverSwapChance= */ 0.5,
-	};
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(GeneticAlgorithmsTest)
-BOOST_AUTO_TEST_SUITE(RandomAlgorithmTest)
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite_and_randomise_rest_of_population, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
-	RandomAlgorithm algorithm({0.5, 1, 1});
-
-	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{1, 1, 1, 1, 3, 3, 3, 3}));
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_elite_with_worse_individuals, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
-	RandomAlgorithm algorithm({0.5, 7, 7});
-
-	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{3, 3, 3, 3, 7, 7, 7, 7}));
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_replace_all_chromosomes_if_zero_size_elite, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
-	RandomAlgorithm algorithm({0.0, 1, 1});
-
-	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{1, 1, 1, 1, 1, 1, 1, 1}));
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_any_chromosomes_if_whole_population_is_the_elite, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
-	RandomAlgorithm algorithm({1.0, 1, 1});
-
-	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(GenerationalElitistWithExclusivePoolsTest)
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite_and_regenerate_rest_of_population, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 6, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 3, 3, 5, 5, 5, 5}));
-
-	GenerationalElitistWithExclusivePools::Options options = {
-		/* mutationPoolSize = */ 0.2,
-		/* crossoverPoolSize = */ 0.2,
-		/* randomisationChance = */ 0.0,
-		/* deletionVsAdditionChance = */ 1.0,
-		/* percentGenesToRandomise = */ 0.0,
-		/* percentGenesToAddOrDelete = */ 1.0,
-		/* CrossoverChoice = */ CrossoverChoice::SinglePoint,
-		/* uniformCrossoverSwapChance= */ 0.5,
-	};
-	GenerationalElitistWithExclusivePools algorithm(options);
-
-	Population newPopulation = algorithm.runNextRound(population);
-
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{0, 0, 3, 3, 3, 3, 3, 3, 3, 3}));
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_elite_with_worse_individuals, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 6, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert(chromosomeLengths(population) == (vector<size_t>{3, 3, 3, 3, 3, 3, 5, 5, 5, 5}));
-
-	GenerationalElitistWithExclusivePools::Options options = {
-		/* mutationPoolSize = */ 0.2,
-		/* crossoverPoolSize = */ 0.2,
-		/* randomisationChance = */ 0.0,
-		/* deletionVsAdditionChance = */ 0.0,
-		/* percentGenesToRandomise = */ 0.0,
-		/* percentGenesToAddOrDelete = */ 1.0,
-		/* CrossoverChoice = */ CrossoverChoice::SinglePoint,
-		/* uniformCrossoverSwapChance= */ 0.5,
-	};
-	GenerationalElitistWithExclusivePools algorithm(options);
-
-	Population newPopulation = algorithm.runNextRound(population);
-
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{3, 3, 3, 3, 3, 3, 3, 3, 7, 7}));
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_generate_individuals_in_the_crossover_pool_by_mutating_the_elite, GeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 20, 5, 5);
-
-	GenerationalElitistWithExclusivePools::Options options = {
-		/* mutationPoolSize = */ 0.8,
-		/* crossoverPoolSize = */ 0.0,
-		/* randomisationChance = */ 0.5,
-		/* deletionVsAdditionChance = */ 0.5,
-		/* percentGenesToRandomise = */ 1.0,
-		/* percentGenesToAddOrDelete = */ 1.0,
-		/* CrossoverChoice = */ CrossoverChoice::SinglePoint,
-		/* uniformCrossoverSwapChance= */ 0.5,
-	};
-	GenerationalElitistWithExclusivePools algorithm(options);
-
-	SimulationRNG::reset(1);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	BOOST_TEST((
-		chromosomeLengths(newPopulation) ==
-		vector<size_t>{0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 11, 11, 11}
-	));
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_generate_individuals_in_the_crossover_pool_by_crossing_over_the_elite, GeneticAlgorithmFixture)
-{
-	auto population = (
-		Population(m_fitnessMetric, {Chromosome("aa"), Chromosome("ff")}) +
-		Population::makeRandom(m_fitnessMetric, 8, 6, 6)
-	);
-	assert((chromosomeLengths(population) == vector<size_t>{2, 2, 6, 6, 6, 6, 6, 6, 6, 6}));
-
-	GenerationalElitistWithExclusivePools::Options options = {
-		/* mutationPoolSize = */ 0.0,
-		/* crossoverPoolSize = */ 0.8,
-		/* randomisationChance = */ 0.0,
-		/* deletionVsAdditionChance = */ 0.0,
-		/* percentGenesToRandomise = */ 0.0,
-		/* percentGenesToAddOrDelete = */ 0.0,
-		/* CrossoverChoice = */ CrossoverChoice::SinglePoint,
-		/* uniformCrossoverSwapChance= */ 0.5,
-	};
-	GenerationalElitistWithExclusivePools algorithm(options);
-
-	SimulationRNG::reset(1);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	vector<Individual> const& newIndividuals = newPopulation.individuals();
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{2, 2, 2, 2, 2, 2, 2, 2, 2, 2}));
-	for (auto& individual: newIndividuals)
-		BOOST_TEST((
-			individual.chromosome == Chromosome("aa") ||
-			individual.chromosome == Chromosome("af") ||
-			individual.chromosome == Chromosome("fa") ||
-			individual.chromosome == Chromosome("ff")
-		));
-	BOOST_TEST(any_of(newIndividuals.begin() + 2, newIndividuals.end(), [](auto& individual){
-		return individual.chromosome != Chromosome("aa") && individual.chromosome != Chromosome("ff");
-	}));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(ClassicGeneticAlgorithmTest)
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_individuals_with_probability_proportional_to_fitness, ClassicGeneticAlgorithmFixture)
-{
-	constexpr double relativeTolerance = 0.1;
-	constexpr size_t populationSize = 1000;
-
-	SimulationRNG::reset(1);
-
-	assert(populationSize % 4 == 0 && "Choose a number divisible by 4 for this test");
-
-	auto population =
-		Population::makeRandom(m_fitnessMetric, populationSize / 4, 0, 0) +
-		Population::makeRandom(m_fitnessMetric, populationSize / 4, 1, 1) +
-		Population::makeRandom(m_fitnessMetric, populationSize / 4, 2, 2) +
-		Population::makeRandom(m_fitnessMetric, populationSize / 4, 3, 3);
-
-	map<size_t, double> expectedProbabilities = {
-		{0, 4.0 / (4 + 3 + 2 + 1)},
-		{1, 3.0 / (4 + 3 + 2 + 1)},
-		{2, 2.0 / (4 + 3 + 2 + 1)},
-		{3, 1.0 / (4 + 3 + 2 + 1)},
-	};
-	double const expectedValue = (
-		0.0 * expectedProbabilities[0] +
-		1.0 * expectedProbabilities[1] +
-		2.0 * expectedProbabilities[2] +
-		3.0 * expectedProbabilities[3]
-	);
-	double const variance = (
-		(0.0 - expectedValue) * (0.0 - expectedValue) * expectedProbabilities[0] +
-		(1.0 - expectedValue) * (1.0 - expectedValue) * expectedProbabilities[1] +
-		(2.0 - expectedValue) * (2.0 - expectedValue) * expectedProbabilities[2] +
-		(3.0 - expectedValue) * (3.0 - expectedValue) * expectedProbabilities[3]
-	);
-
-	ClassicGeneticAlgorithm algorithm(m_options);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	BOOST_TEST(newPopulation.individuals().size() == population.individuals().size());
-
-	vector<size_t> newFitness = chromosomeLengths(newPopulation);
-	BOOST_TEST(abs(mean(newFitness) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(newFitness, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_only_individuals_existing_in_the_original_population, ClassicGeneticAlgorithmFixture)
-{
-	constexpr size_t populationSize = 1000;
-	auto population = Population::makeRandom(m_fitnessMetric, populationSize, 1, 10);
-
-	set<string> originalSteps;
-	for (auto const& individual: population.individuals())
-		originalSteps.insert(toString(individual.chromosome));
-
-	ClassicGeneticAlgorithm algorithm(m_options);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	for (auto const& individual: newPopulation.individuals())
-		BOOST_TEST(originalSteps.count(toString(individual.chromosome)) == 1);
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_crossover, ClassicGeneticAlgorithmFixture)
-{
-	auto population = Population(m_fitnessMetric, {
-		Chromosome("aa"), Chromosome("aa"), Chromosome("aa"),
-		Chromosome("ff"), Chromosome("ff"), Chromosome("ff"),
-		Chromosome("gg"), Chromosome("gg"), Chromosome("gg"),
-	});
-
-	set<string> originalSteps{"aa", "ff", "gg"};
-	set<string> crossedSteps{"af", "fa", "fg", "gf", "ga", "ag"};
-
-	m_options.crossoverChance = 0.8;
-	ClassicGeneticAlgorithm algorithm(m_options);
-
-	SimulationRNG::reset(1);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	size_t totalCrossed = 0;
-	size_t totalUnchanged = 0;
-	for (auto const& individual: newPopulation.individuals())
-	{
-		totalCrossed += crossedSteps.count(toString(individual.chromosome));
-		totalUnchanged += originalSteps.count(toString(individual.chromosome));
-	}
-	BOOST_TEST(totalCrossed + totalUnchanged == newPopulation.individuals().size());
-	BOOST_TEST(totalCrossed >= 2);
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_mutation, ClassicGeneticAlgorithmFixture)
-{
-	m_options.mutationChance = 0.6;
-	ClassicGeneticAlgorithm algorithm(m_options);
-
-	constexpr size_t populationSize = 1000;
-	constexpr double relativeTolerance = 0.05;
-	double const expectedValue = m_options.mutationChance;
-	double const variance = m_options.mutationChance * (1 - m_options.mutationChance);
-
-	Chromosome chromosome("aaaaaaaaaa");
-	vector<Chromosome> chromosomes(populationSize, chromosome);
-	Population population(m_fitnessMetric, chromosomes);
-
-	SimulationRNG::reset(1);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	vector<size_t> bernoulliTrials;
-	for (auto const& individual: newPopulation.individuals())
-	{
-		string steps = toString(individual.chromosome);
-		for (char step: steps)
-			bernoulliTrials.push_back(static_cast<size_t>(step != 'a'));
-	}
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_deletion, ClassicGeneticAlgorithmFixture)
-{
-	m_options.deletionChance = 0.6;
-	ClassicGeneticAlgorithm algorithm(m_options);
-
-	constexpr size_t populationSize = 1000;
-	constexpr double relativeTolerance = 0.05;
-	double const expectedValue = m_options.deletionChance;
-	double const variance = m_options.deletionChance * (1 - m_options.deletionChance);
-
-	Chromosome chromosome("aaaaaaaaaa");
-	vector<Chromosome> chromosomes(populationSize, chromosome);
-	Population population(m_fitnessMetric, chromosomes);
-
-	SimulationRNG::reset(1);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	vector<size_t> bernoulliTrials;
-	for (auto const& individual: newPopulation.individuals())
-	{
-		string steps = toString(individual.chromosome);
-		for (size_t i = 0; i < chromosome.length(); ++i)
-			bernoulliTrials.push_back(static_cast<size_t>(i >= steps.size()));
-	}
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_addition, ClassicGeneticAlgorithmFixture)
-{
-	m_options.additionChance = 0.6;
-	ClassicGeneticAlgorithm algorithm(m_options);
-
-	constexpr size_t populationSize = 1000;
-	constexpr double relativeTolerance = 0.05;
-	double const expectedValue = m_options.additionChance;
-	double const variance = m_options.additionChance * (1 - m_options.additionChance);
-
-	Chromosome chromosome("aaaaaaaaaa");
-	vector<Chromosome> chromosomes(populationSize, chromosome);
-	Population population(m_fitnessMetric, chromosomes);
-
-	SimulationRNG::reset(1);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	vector<size_t> bernoulliTrials;
-	for (auto const& individual: newPopulation.individuals())
-	{
-		string steps = toString(individual.chromosome);
-		for (size_t i = 0; i < chromosome.length() + 1; ++i)
-		{
-			BOOST_REQUIRE(chromosome.length() <= steps.size() && steps.size() <= 2 * chromosome.length() + 1);
-			bernoulliTrials.push_back(static_cast<size_t>(i < steps.size() - chromosome.length()));
-		}
-	}
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite, ClassicGeneticAlgorithmFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 6, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5, 5, 5}));
-
-	m_options.elitePoolSize = 0.5;
-	m_options.deletionChance = 1.0;
-	ClassicGeneticAlgorithm algorithm(m_options);
-	Population newPopulation = algorithm.runNextRound(population);
-
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{0, 0, 0, 0, 0, 3, 3, 3, 3, 5}));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Mutations.cpp b/test/yulPhaser/Mutations.cpp
deleted file mode 100644
index 8e1d0238b3ef..000000000000
--- a/test/yulPhaser/Mutations.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Mutations.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libyul/optimiser/Suite.h>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <algorithm>
-#include <vector>
-
-using namespace std;
-using namespace solidity::util;
-using namespace solidity::yul;
-
-namespace solidity::phaser::test
-{
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(MutationsTest)
-BOOST_AUTO_TEST_SUITE(GeneRandomisationTest)
-
-BOOST_AUTO_TEST_CASE(geneRandomisation_should_iterate_over_genes_and_replace_them_with_random_ones_with_given_probability)
-{
-	size_t constexpr inputLength = 1000;
-	double constexpr tolerance = 0.05;
-
-	// Use genes that do not represent valid step abbreviations to be able to easily spot added steps.
-	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	Chromosome input = Chromosome(string(inputLength, '.'));
-
-	SimulationRNG::reset(1);
-	for (size_t randomisationChancePercent = 20; randomisationChancePercent <= 100; randomisationChancePercent += 20)
-	{
-		double const randomisationChance = double(randomisationChancePercent) / 100.0;
-
-		Chromosome output = geneRandomisation(randomisationChance)(input);
-		string outputGenes = output.genes();
-		BOOST_REQUIRE(output.length() == input.length());
-
-		double const expectedValue = randomisationChance;
-		double const variance = randomisationChance * (1 - randomisationChance);
-		double const randomisedGeneCount = double(input.length() - static_cast<size_t>(count(outputGenes.begin(), outputGenes.end(), '.')));
-		double const squaredError =
-			(inputLength - randomisedGeneCount) * expectedValue * expectedValue +
-			randomisedGeneCount * (1 - expectedValue) * (1 - expectedValue);
-
-		BOOST_TEST(abs(randomisedGeneCount / inputLength - expectedValue) < tolerance);
-		BOOST_TEST(abs(squaredError / inputLength - variance) < tolerance);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(geneRandomisation_should_return_identical_chromosome_if_probability_is_zero)
-{
-	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneRandomisation(0.0);
-
-	BOOST_TEST(mutation(chromosome) == chromosome);
-}
-
-BOOST_AUTO_TEST_CASE(geneDeletion_should_iterate_over_genes_and_delete_them_with_given_probability)
-{
-	size_t constexpr inputLength = 1000;
-	double constexpr tolerance = 0.05;
-
-	// Use genes that do not represent valid step abbreviations to be able to easily spot added steps.
-	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	Chromosome input = Chromosome(string(inputLength, '.'));
-
-	SimulationRNG::reset(1);
-	for (size_t deletionChancePercent = 20; deletionChancePercent < 100; deletionChancePercent += 20)
-	{
-		double const deletionChance = double(deletionChancePercent) / 100.0;
-
-		Chromosome output = geneDeletion(deletionChance)(input);
-		string outputGenes = output.genes();
-		BOOST_REQUIRE(output.length() <= input.length());
-		BOOST_REQUIRE(static_cast<size_t>(count(outputGenes.begin(), outputGenes.end(), '.')) == output.length());
-
-		double const expectedValue = deletionChance;
-		double const variance = deletionChance * (1.0 - deletionChance);
-		double const deletedGeneCount = double(input.length() - output.length());
-		double const squaredError =
-			(double(inputLength) - deletedGeneCount) * expectedValue * expectedValue +
-			deletedGeneCount * (1.0 - expectedValue) * (1.0 - expectedValue);
-
-		BOOST_TEST(abs(deletedGeneCount / double(inputLength) - expectedValue) < tolerance);
-		BOOST_TEST(abs(squaredError / double(inputLength) - variance) < tolerance);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(geneDeletion_should_return_identical_chromosome_if_probability_is_zero)
-{
-	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneDeletion(0.0);
-
-	BOOST_TEST(mutation(chromosome) == chromosome);
-}
-
-BOOST_AUTO_TEST_CASE(geneDeletion_should_delete_all_genes_if_probability_is_one)
-{
-	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneDeletion(1.0);
-
-	BOOST_TEST(mutation(chromosome) == Chromosome(""));
-}
-
-BOOST_AUTO_TEST_CASE(geneAddition_should_iterate_over_gene_positions_and_insert_new_genes_with_given_probability)
-{
-	size_t constexpr inputLength = 1000;
-	double constexpr tolerance = 0.05;
-	size_t constexpr maxAdditions = inputLength + 1;
-
-	// Use genes that do not represent valid step abbreviations to be able to easily spot added steps.
-	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	Chromosome input = Chromosome(string(inputLength, '.'));
-
-	SimulationRNG::reset(1);
-	for (size_t additionChancePercent = 20; additionChancePercent < 100; additionChancePercent += 20)
-	{
-		double const additionChance = double(additionChancePercent) / 100.0;
-
-		Chromosome output = geneAddition(additionChance)(input);
-		BOOST_REQUIRE(output.length() >= input.length());
-		BOOST_REQUIRE(output.length() <= inputLength + maxAdditions);
-
-		string_view outputGenes = output.genes();
-		size_t preservedGeneCount = static_cast<size_t>(count(outputGenes.begin(), outputGenes.end(), '.'));
-		BOOST_REQUIRE(preservedGeneCount == input.length());
-
-		double const expectedValue = additionChance;
-		double const variance = additionChance * (1.0 - additionChance);
-		double const addedGeneCount = double(output.length() - preservedGeneCount);
-		double const squaredError =
-			(double(maxAdditions) - addedGeneCount) * expectedValue * expectedValue +
-			addedGeneCount * (1.0 - expectedValue) * (1.0 - expectedValue);
-
-		BOOST_TEST(abs(addedGeneCount / double(maxAdditions) - expectedValue) < tolerance);
-		BOOST_TEST(abs(squaredError / double(maxAdditions) - variance) < tolerance);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_before_first_position)
-{
-	SimulationRNG::reset(7);
-	Chromosome chromosome("fcCUnDvejs");
-	function<Mutation> mutation = geneAddition(0.1);
-
-	Chromosome mutatedChromosome = mutation(chromosome);
-	BOOST_TEST(mutatedChromosome.length() > chromosome.length());
-	BOOST_TEST(boost::ends_with(mutatedChromosome.genes(), chromosome.genes()));
-}
-
-BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_after_last_position)
-{
-	SimulationRNG::reset(81);
-	Chromosome chromosome("fcCUnDvejs");
-	function<Mutation> mutation = geneAddition(0.1);
-
-	Chromosome mutatedChromosome = mutation(chromosome);
-	BOOST_TEST(mutatedChromosome.length() > chromosome.length());
-	BOOST_TEST(boost::starts_with(mutatedChromosome.genes(), chromosome.genes()));
-}
-
-BOOST_AUTO_TEST_CASE(geneAddition_should_return_identical_chromosome_if_probability_is_zero)
-{
-	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneAddition(0.0);
-
-	BOOST_TEST(mutation(chromosome) == chromosome);
-}
-
-BOOST_AUTO_TEST_CASE(geneAddition_should_insert_genes_at_all_positions_if_probability_is_one)
-{
-	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneAddition(1.0);
-
-	Chromosome mutatedChromosome = mutation(chromosome);
-	BOOST_TEST(mutatedChromosome.length() == chromosome.length() * 2 + 1);
-
-	vector<string> originalGenes;
-	for (size_t i = 0; i < mutatedChromosome.length() - 1; ++i)
-		if (i % 2 == 1)
-			originalGenes.push_back(mutatedChromosome.optimisationSteps()[i]);
-
-	BOOST_TEST(Chromosome(originalGenes) == chromosome);
-}
-
-BOOST_AUTO_TEST_CASE(alternativeMutations_should_choose_between_mutations_with_given_probability)
-{
-	SimulationRNG::reset(1);
-	Chromosome chromosome("a");
-	function<Mutation> mutation = alternativeMutations(
-		0.8,
-		wholeChromosomeReplacement(Chromosome("c")),
-		wholeChromosomeReplacement(Chromosome("f"))
-	);
-
-	size_t cCount = 0;
-	size_t fCount = 0;
-	for (size_t i = 0; i < 10; ++i)
-	{
-		Chromosome mutatedChromosome = mutation(chromosome);
-		cCount += (mutatedChromosome == Chromosome("c") ? 1u : 0u);
-		fCount += (mutatedChromosome == Chromosome("f") ? 1u : 0u);
-	}
-
-	// This particular seed results in 7 "c"s out of 10 which looks plausible given the 80% chance.
-	BOOST_TEST(cCount == 7);
-	BOOST_TEST(fCount == 3);
-}
-
-BOOST_AUTO_TEST_CASE(alternativeMutations_should_always_choose_first_mutation_if_probability_is_one)
-{
-	Chromosome chromosome("a");
-	function<Mutation> mutation = alternativeMutations(
-		1.0,
-		wholeChromosomeReplacement(Chromosome("c")),
-		wholeChromosomeReplacement(Chromosome("f"))
-	);
-
-	for (size_t i = 0; i < 10; ++i)
-		BOOST_TEST(mutation(chromosome) == Chromosome("c"));
-}
-
-BOOST_AUTO_TEST_CASE(alternativeMutations_should_always_choose_second_mutation_if_probability_is_zero)
-{
-	Chromosome chromosome("a");
-	function<Mutation> mutation = alternativeMutations(
-		0.0,
-		wholeChromosomeReplacement(Chromosome("c")),
-		wholeChromosomeReplacement(Chromosome("f"))
-	);
-
-	for (size_t i = 0; i < 10; ++i)
-		BOOST_TEST(mutation(chromosome) == Chromosome("f"));
-}
-
-BOOST_AUTO_TEST_CASE(mutationSequence_should_apply_all_mutations)
-{
-	Chromosome chromosome("aaaaa");
-	vector<string> steps = Chromosome::genesToSteps("gfc");
-	function<Mutation> mutation = mutationSequence({
-		geneSubstitution(3, steps[0]),
-		geneSubstitution(2, steps[1]),
-		geneSubstitution(1, steps[2]),
-	});
-
-	BOOST_TEST(mutation(chromosome) == Chromosome("acfga"));
-}
-
-BOOST_AUTO_TEST_CASE(mutationSequence_apply_mutations_in_the_order_they_are_given)
-{
-	Chromosome chromosome("aa");
-	vector<string> steps = Chromosome::genesToSteps("gcfo");
-	function<Mutation> mutation = mutationSequence({
-		geneSubstitution(0, steps[0]),
-		geneSubstitution(1, steps[1]),
-		geneSubstitution(0, steps[2]),
-		geneSubstitution(1, steps[3]),
-	});
-
-	BOOST_TEST(mutation(chromosome) == Chromosome("fo"));
-}
-
-BOOST_AUTO_TEST_CASE(mutationSequence_should_return_unmodified_chromosome_if_given_no_mutations)
-{
-	Chromosome chromosome("aa");
-	function<Mutation> mutation = mutationSequence({});
-
-	BOOST_TEST(mutation(chromosome) == chromosome);
-}
-
-BOOST_AUTO_TEST_CASE(randomPointCrossover_should_swap_chromosome_parts_at_random_point)
-{
-	function<Crossover> crossover = randomPointCrossover();
-
-	SimulationRNG::reset(1);
-	Chromosome result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	BOOST_TEST(result1 == Chromosome("aaaccc"));
-
-	SimulationRNG::reset(1);
-	Chromosome result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	BOOST_TEST(result2 == Chromosome("cccaaaaaaa"));
-}
-
-BOOST_AUTO_TEST_CASE(symmetricRandomPointCrossover_should_swap_chromosome_parts_at_random_point)
-{
-	function<SymmetricCrossover> crossover = symmetricRandomPointCrossover();
-
-	SimulationRNG::reset(1);
-	tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("aaaccc"), Chromosome("cccaaaaaaa")};
-	BOOST_TEST(result1 == expectedPair1);
-
-	tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("ccccccaaaa"), Chromosome("aaaaaa")};
-	BOOST_TEST(result2 == expectedPair2);
-}
-
-BOOST_AUTO_TEST_CASE(randomPointCrossover_should_only_consider_points_available_on_both_chromosomes)
-{
-	SimulationRNG::reset(1);
-	function<Crossover> crossover = randomPointCrossover();
-
-	for (size_t i = 0; i < 30; ++i)
-	{
-		Chromosome result1 = crossover(Chromosome("aaa"), Chromosome("TTTTTTTTTTTTTTTTTTTT"));
-		Chromosome result2 = crossover(Chromosome("TTTTTTTTTTTTTTTTTTTT"), Chromosome("aaa"));
-		BOOST_TEST((
-			result1 == Chromosome("TTTTTTTTTTTTTTTTTTTT") ||
-			result1 == Chromosome("aTTTTTTTTTTTTTTTTTTT") ||
-			result1 == Chromosome("aaTTTTTTTTTTTTTTTTTT") ||
-			result1 == Chromosome("aaaTTTTTTTTTTTTTTTTT")
-		));
-		BOOST_TEST((
-			result2 == Chromosome("aaa") ||
-			result2 == Chromosome("Taa") ||
-			result2 == Chromosome("TTa") ||
-			result2 == Chromosome("TTT")
-		));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(randomPointCrossover_should_never_split_at_position_zero_if_chromosomes_are_splittable)
-{
-	SimulationRNG::reset(1);
-	function<Crossover> crossover = randomPointCrossover();
-
-	for (size_t i = 0; i < 30; ++i)
-	{
-		Chromosome result1 = crossover(Chromosome("aa"), Chromosome("TTTTTTTTTTTTTTTTTTTT"));
-		Chromosome result2 = crossover(Chromosome("TTTTTTTTTTTTTTTTTTTT"), Chromosome("aa"));
-		BOOST_TEST(result1 != Chromosome("TTTTTTTTTTTTTTTTTTTT"));
-		BOOST_TEST(result2 != Chromosome("aa"));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(randomPointCrossover_should_never_split_at_position_zero_if_chromosomes_are_not_empty)
-{
-	SimulationRNG::reset(1);
-	function<Crossover> crossover = randomPointCrossover();
-
-	for (size_t i = 0; i < 30; ++i)
-	{
-		Chromosome result1 = crossover(Chromosome("a"), Chromosome("T"));
-		Chromosome result2 = crossover(Chromosome("T"), Chromosome("a"));
-		BOOST_TEST(result1 == Chromosome("a"));
-		BOOST_TEST(result2 == Chromosome("T"));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(randomPointCrossover_should_work_even_if_one_chromosome_is_unsplittable)
-{
-	function<Crossover> crossover = randomPointCrossover();
-
-	SimulationRNG::reset(1);
-	BOOST_CHECK(crossover(Chromosome("ff"), Chromosome("a")) == Chromosome("f"));
-	BOOST_CHECK(crossover(Chromosome("a"), Chromosome("ff")) == Chromosome("af"));
-}
-
-BOOST_AUTO_TEST_CASE(randomPointCrossover_should_split_at_position_zero_only_if_at_least_one_chromosome_is_empty)
-{
-	Chromosome empty("");
-	Chromosome unsplittable("a");
-	Chromosome splittable("aaaa");
-	function<Crossover> crossover = randomPointCrossover();
-
-	SimulationRNG::reset(1);
-	BOOST_CHECK(crossover(empty, empty) == empty);
-	BOOST_CHECK(crossover(unsplittable, empty) == empty);
-	BOOST_CHECK(crossover(empty, unsplittable) == unsplittable);
-	BOOST_CHECK(crossover(splittable, empty) == empty);
-	BOOST_CHECK(crossover(empty, splittable) == splittable);
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_swap_chromosome_parts_at_given_point)
-{
-	Chromosome result1 = fixedPointCrossover(0.8)(Chromosome("aaaaaaaaaa"), Chromosome("cccccccccc"));
-	Chromosome result2 = fixedPointCrossover(0.8)(Chromosome("cccccccccc"), Chromosome("aaaaaaaaaa"));
-	BOOST_TEST(result1 == Chromosome("aaaaaaaacc"));
-	BOOST_TEST(result2 == Chromosome("ccccccccaa"));
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_determine_crossover_point_based_on_length_of_shorter_chromosome)
-{
-	Chromosome result1 = fixedPointCrossover(0.4)(Chromosome("aaaaa"), Chromosome("cccccccccc"));
-	Chromosome result2 = fixedPointCrossover(0.4)(Chromosome("cccccccccc"), Chromosome("aaaaa"));
-	BOOST_TEST(result1 == Chromosome("aacccccccc"));
-	BOOST_TEST(result2 == Chromosome("ccaaa"));
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_round_split_point)
-{
-	Chromosome result1 = fixedPointCrossover(0.49)(Chromosome("aaaaa"), Chromosome("ccccc"));
-	Chromosome result2 = fixedPointCrossover(0.49)(Chromosome("ccccc"), Chromosome("aaaaa"));
-	BOOST_TEST(result1 == Chromosome("aaccc"));
-	BOOST_TEST(result2 == Chromosome("ccaaa"));
-
-	Chromosome result3 = fixedPointCrossover(0.50)(Chromosome("aaaaa"), Chromosome("ccccc"));
-	Chromosome result4 = fixedPointCrossover(0.50)(Chromosome("ccccc"), Chromosome("aaaaa"));
-	BOOST_TEST(result3 == Chromosome("aaacc"));
-	BOOST_TEST(result4 == Chromosome("cccaa"));
-
-	Chromosome result5 = fixedPointCrossover(0.51)(Chromosome("aaaaa"), Chromosome("ccccc"));
-	Chromosome result6 = fixedPointCrossover(0.51)(Chromosome("ccccc"), Chromosome("aaaaa"));
-	BOOST_TEST(result5 == Chromosome("aaacc"));
-	BOOST_TEST(result6 == Chromosome("cccaa"));
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_split_at_position_zero_if_explicitly_requested)
-{
-	Chromosome result1 = fixedPointCrossover(0.0)(Chromosome("aaaaa"), Chromosome("cccccccccc"));
-	Chromosome result2 = fixedPointCrossover(0.0)(Chromosome("cccccccccc"), Chromosome("aaaaa"));
-	BOOST_TEST(result1 == Chromosome("cccccccccc"));
-	BOOST_TEST(result2 == Chromosome("aaaaa"));
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_split_at_end_of_shorter_chromosome_if_crossover_point_is_after_last_position)
-{
-	Chromosome result1 = fixedPointCrossover(1.0)(Chromosome("aaaaa"), Chromosome("cccccccccc"));
-	Chromosome result2 = fixedPointCrossover(1.0)(Chromosome("cccccccccc"), Chromosome("aaaaa"));
-	BOOST_TEST(result1 == Chromosome("aaaaaccccc"));
-	BOOST_TEST(result2 == Chromosome("ccccc"));
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_select_correct_split_point_for_unsplittable_chromosomes)
-{
-	function<Crossover> crossover00 = fixedPointCrossover(0.0);
-	BOOST_CHECK(crossover00(Chromosome("fff"), Chromosome("a")) == Chromosome("a"));
-	BOOST_CHECK(crossover00(Chromosome("a"), Chromosome("fff")) == Chromosome("fff"));
-
-	BOOST_CHECK(crossover00(Chromosome("f"), Chromosome("a")) == Chromosome("a"));
-
-	function<Crossover> crossover10 = fixedPointCrossover(1.0);
-	BOOST_CHECK(crossover10(Chromosome("fff"), Chromosome("a")) == Chromosome("f"));
-	BOOST_CHECK(crossover10(Chromosome("a"), Chromosome("fff")) == Chromosome("aff"));
-
-	BOOST_CHECK(crossover10(Chromosome("f"), Chromosome("a")) == Chromosome("f"));
-}
-
-BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_always_use_position_zero_as_split_point_when_chromosome_empty)
-{
-	Chromosome empty("");
-	Chromosome unsplittable("f");
-	Chromosome splittable("aaaa");
-
-	function<Crossover> crossover00 = fixedPointCrossover(0.0);
-	BOOST_CHECK(crossover00(empty, empty) == empty);
-	BOOST_CHECK(crossover00(unsplittable, empty) == empty);
-	BOOST_CHECK(crossover00(empty, unsplittable) == unsplittable);
-	BOOST_CHECK(crossover00(splittable, empty) == empty);
-	BOOST_CHECK(crossover00(empty, splittable) == splittable);
-
-	function<Crossover> crossover10 = fixedPointCrossover(1.0);
-	BOOST_CHECK(crossover10(empty, empty) == empty);
-	BOOST_CHECK(crossover10(unsplittable, empty) == empty);
-	BOOST_CHECK(crossover10(empty, unsplittable) == unsplittable);
-	BOOST_CHECK(crossover10(splittable, empty) == empty);
-	BOOST_CHECK(crossover10(empty, splittable) == splittable);
-}
-
-BOOST_AUTO_TEST_CASE(randomTwoPointCrossover_should_swap_chromosome_parts_between_two_random_points)
-{
-	function<Crossover> crossover = randomTwoPointCrossover();
-
-	SimulationRNG::reset(1);
-	Chromosome result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	BOOST_TEST(result1 == Chromosome("aaacccaaaa"));
-
-	SimulationRNG::reset(1);
-	Chromosome result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	BOOST_TEST(result2 == Chromosome("cccaaa"));
-}
-
-BOOST_AUTO_TEST_CASE(symmetricRandomTwoPointCrossover_should_swap_chromosome_parts_at_random_point)
-{
-	function<SymmetricCrossover> crossover = symmetricRandomTwoPointCrossover();
-
-	SimulationRNG::reset(1);
-	tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("aaacccaaaa"), Chromosome("cccaaa")};
-	BOOST_TEST(result1 == expectedPair1);
-
-	tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("ccccca"), Chromosome("aaaaacaaaa")};
-	BOOST_TEST(result2 == expectedPair2);
-}
-
-BOOST_AUTO_TEST_CASE(randomTwoPointCrossover_should_only_consider_points_available_on_both_chromosomes)
-{
-	function<Crossover> crossover = randomTwoPointCrossover();
-
-	for (size_t i = 0; i < 30; ++i)
-	{
-		Chromosome result1 = crossover(Chromosome("aaa"), Chromosome("TTTTTTTTTTTTTTTTTTTT"));
-		Chromosome result2 = crossover(Chromosome("TTTTTTTTTTTTTTTTTTTT"), Chromosome("aaa"));
-		BOOST_TEST((
-			result1 == Chromosome("aaa") ||
-			result1 == Chromosome("Taa") ||
-			result1 == Chromosome("TTa") ||
-			result1 == Chromosome("TTT") ||
-			result1 == Chromosome("aTa") ||
-			result1 == Chromosome("aTT") ||
-			result1 == Chromosome("aaT")
-		));
-		BOOST_TEST((
-			result2 == Chromosome("TTTTTTTTTTTTTTTTTTTT") ||
-			result2 == Chromosome("aTTTTTTTTTTTTTTTTTTT") ||
-			result2 == Chromosome("aaTTTTTTTTTTTTTTTTTT") ||
-			result2 == Chromosome("aaaTTTTTTTTTTTTTTTTT") ||
-			result2 == Chromosome("TaTTTTTTTTTTTTTTTTTT") ||
-			result2 == Chromosome("TaaTTTTTTTTTTTTTTTTT") ||
-			result2 == Chromosome("TTaTTTTTTTTTTTTTTTTT")
-		));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_randomly_selected_genes)
-{
-	function<Crossover> crossover = uniformCrossover(0.7);
-
-	SimulationRNG::reset(1);
-	Chromosome result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	BOOST_TEST(result1 == Chromosome("caaacc"));
-
-	SimulationRNG::reset(1);
-	Chromosome result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	BOOST_TEST(result2 == Chromosome("acccaaaaaa"));
-}
-
-BOOST_AUTO_TEST_CASE(symmetricUniformCrossover_should_swap_randomly_selected_genes)
-{
-	function<SymmetricCrossover> crossover = symmetricUniformCrossover(0.7);
-
-	SimulationRNG::reset(1);
-	tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("caaacc"), Chromosome("acccaaaaaa")};
-	BOOST_TEST(result1 == expectedPair1);
-
-	tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("caaaaaaaaa"), Chromosome("accccc")};
-	BOOST_TEST(result2 == expectedPair2);
-}
-
-BOOST_AUTO_TEST_CASE(uniformCrossover_should_only_consider_points_available_on_both_chromosomes)
-{
-	function<Crossover> crossover = uniformCrossover(0.7);
-
-	set<string> expectedPatterns = {
-		"TTTTTTTTTTTTTTTTTTTT",
-		"aTTTTTTTTTTTTTTTTTTT",
-		"TaTTTTTTTTTTTTTTTTTT",
-		"TTaTTTTTTTTTTTTTTTTT",
-		"aaTTTTTTTTTTTTTTTTTT",
-		"TaaTTTTTTTTTTTTTTTTT",
-		"aTaTTTTTTTTTTTTTTTTT",
-		"aaaTTTTTTTTTTTTTTTTT",
-		"aaa",
-		"Taa",
-		"aTa",
-		"aaT",
-		"TTa",
-		"aTT",
-		"TaT",
-		"TTT",
-	};
-
-	for (size_t i = 0; i < 30; ++i)
-	{
-		Chromosome result1 = crossover(Chromosome("aaa"), Chromosome("TTTTTTTTTTTTTTTTTTTT"));
-		Chromosome result2 = crossover(Chromosome("TTTTTTTTTTTTTTTTTTTT"), Chromosome("aaa"));
-		BOOST_TEST(expectedPatterns.count(toString(result1)) == 1);
-		BOOST_TEST(expectedPatterns.count(toString(result2)) == 1);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(uniformCrossover_should_not_swap_anything_if_chance_is_zero)
-{
-	BOOST_TEST(uniformCrossover(0.0)(Chromosome("aaaaaaaaaa"), Chromosome("cccccc")) == Chromosome("aaaaaaaaaa"));
-	BOOST_TEST(uniformCrossover(0.0)(Chromosome("cccccc"), Chromosome("aaaaaaaaaa")) == Chromosome("cccccc"));
-}
-
-BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_whole_chromosomes_if_chance_is_one)
-{
-	BOOST_TEST(uniformCrossover(1.0)(Chromosome("aaaaaaaaaa"), Chromosome("cccccc")) == Chromosome("cccccc"));
-	BOOST_TEST(uniformCrossover(1.0)(Chromosome("cccccc"), Chromosome("aaaaaaaaaa")) == Chromosome("aaaaaaaaaa"));
-}
-
-BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_genes_with_uniform_probability)
-{
-	constexpr size_t operationCount = 1000;
-	constexpr double swapChance = 0.8;
-	constexpr double relativeTolerance = 0.05;
-	double const expectedValue = swapChance;
-	double const variance = swapChance * (1 - swapChance);
-
-	function<Crossover> crossover = uniformCrossover(swapChance);
-	Chromosome chromosome1("aaaaaaaaaa");
-	Chromosome chromosome2("cccccccccc");
-
-	vector<size_t> bernoulliTrials;
-	for (size_t i = 0; i < operationCount; ++i)
-	{
-		string genes = toString(crossover(chromosome1, chromosome2));
-		for (size_t j = 0; j < chromosome1.length(); ++j)
-			bernoulliTrials.push_back(static_cast<size_t>(genes[j] == 'c'));
-	}
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_tail_with_uniform_probability)
-{
-	constexpr size_t operationCount = 1000;
-	constexpr double swapChance = 0.3;
-	constexpr double relativeTolerance = 0.05;
-	double const expectedValue = swapChance;
-	double const variance = swapChance * (1 - swapChance);
-
-	function<Crossover> crossover = uniformCrossover(swapChance);
-	Chromosome chromosome1("aaaaa");
-	Chromosome chromosome2("cccccccccc");
-
-	SimulationRNG::reset(1);
-
-	vector<size_t> bernoulliTrials;
-	for (size_t i = 0; i < operationCount; ++i)
-	{
-		string genes = toString(crossover(chromosome1, chromosome2));
-		BOOST_REQUIRE(genes.size() == 5 || genes.size() == 10);
-		bernoulliTrials.push_back(static_cast<size_t>(genes.size() == 10));
-	}
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/PairSelections.cpp b/test/yulPhaser/PairSelections.cpp
deleted file mode 100644
index f3d13a5b3b27..000000000000
--- a/test/yulPhaser/PairSelections.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/PairSelections.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <tuple>
-#include <vector>
-
-using namespace std;
-
-namespace solidity::phaser::test
-{
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(PairSelectionsTest)
-BOOST_AUTO_TEST_SUITE(RandomPairSelectionTest)
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabilities)
-{
-	constexpr int collectionSize = 10;
-	constexpr int selectionSize = 100;
-	constexpr double relativeTolerance = 0.1;
-	constexpr double expectedValue = (collectionSize - 1) / 2.0;
-	constexpr double variance = (collectionSize * collectionSize - 1) / 12.0;
-
-	SimulationRNG::reset(1);
-	vector<tuple<size_t, size_t>> pairs = RandomPairSelection(selectionSize).materialise(collectionSize);
-	vector<size_t> samples;
-	for (auto& [first, second]: pairs)
-	{
-		samples.push_back(first);
-		samples.push_back(second);
-	}
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
-{
-	const size_t collectionSize = 200;
-
-	vector<tuple<size_t, size_t>> pairs = RandomPairSelection(0.5).materialise(collectionSize);
-
-	BOOST_TEST(pairs.size() == 100);
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<0>(pair) <= collectionSize; }));
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<1>(pair) <= collectionSize; }));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_never_return_a_pair_of_identical_indices)
-{
-	vector<tuple<size_t, size_t>> pairs = RandomPairSelection(0.5).materialise(100);
-
-	BOOST_TEST(pairs.size() == 50);
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [](auto const& pair){ return get<0>(pair) != get<1>(pair); }));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_number_of_pairs_thats_a_fraction_of_collection_size)
-{
-	BOOST_TEST(RandomPairSelection(0.0).materialise(10).size() == 0);
-	BOOST_TEST(RandomPairSelection(0.3).materialise(10).size() == 3);
-	BOOST_TEST(RandomPairSelection(0.5).materialise(10).size() == 5);
-	BOOST_TEST(RandomPairSelection(0.7).materialise(10).size() == 7);
-	BOOST_TEST(RandomPairSelection(1.0).materialise(10).size() == 10);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_support_number_of_pairs_bigger_than_collection_size)
-{
-	BOOST_TEST(RandomPairSelection(2.0).materialise(5).size() == 10);
-	BOOST_TEST(RandomPairSelection(1.5).materialise(10).size() == 15);
-	BOOST_TEST(RandomPairSelection(10.0).materialise(10).size() == 100);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_round_the_number_of_pairs_to_the_nearest_integer)
-{
-	BOOST_TEST(RandomPairSelection(0.49).materialise(3).size() == 1);
-	BOOST_TEST(RandomPairSelection(0.50).materialise(3).size() == 2);
-	BOOST_TEST(RandomPairSelection(0.51).materialise(3).size() == 2);
-
-	BOOST_TEST(RandomPairSelection(1.51).materialise(3).size() == 5);
-
-	BOOST_TEST(RandomPairSelection(0.01).materialise(2).size() == 0);
-	BOOST_TEST(RandomPairSelection(0.01).materialise(3).size() == 0);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_pairs_if_collection_is_empty)
-{
-	BOOST_TEST(RandomPairSelection(0).materialise(0).empty());
-	BOOST_TEST(RandomPairSelection(0.5).materialise(0).empty());
-	BOOST_TEST(RandomPairSelection(1.0).materialise(0).empty());
-	BOOST_TEST(RandomPairSelection(2.0).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_pairs_if_collection_has_one_element)
-{
-	BOOST_TEST(RandomPairSelection(0).materialise(1).empty());
-	BOOST_TEST(RandomPairSelection(0.5).materialise(1).empty());
-	BOOST_TEST(RandomPairSelection(1.0).materialise(1).empty());
-	BOOST_TEST(RandomPairSelection(2.0).materialise(1).empty());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(PairsFromRandomSubsetTest)
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabilities)
-{
-	constexpr int collectionSize = 1000;
-	constexpr double selectionChance = 0.7;
-	constexpr double relativeTolerance = 0.001;
-	constexpr double expectedValue = selectionChance;
-	constexpr double variance = selectionChance * (1 - selectionChance);
-
-	SimulationRNG::reset(1);
-	vector<tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
-	vector<double> bernoulliTrials(collectionSize, 0);
-	for (auto& pair: pairs)
-	{
-		BOOST_REQUIRE(get<1>(pair) < collectionSize);
-		BOOST_REQUIRE(get<1>(pair) < collectionSize);
-		bernoulliTrials[get<0>(pair)] = 1.0;
-		bernoulliTrials[get<1>(pair)] = 1.0;
-	}
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
-{
-	const size_t collectionSize = 200;
-	constexpr double selectionChance = 0.5;
-
-	vector<tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
-
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<0>(pair) <= collectionSize; }));
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<1>(pair) <= collectionSize; }));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_use_unique_indices)
-{
-	constexpr size_t collectionSize = 200;
-	constexpr double selectionChance = 0.5;
-
-	vector<tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
-	set<size_t> indices;
-	for (auto& pair: pairs)
-	{
-		indices.insert(get<0>(pair));
-		indices.insert(get<1>(pair));
-	}
-
-	BOOST_TEST(indices.size() == 2 * pairs.size());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_indices_if_collection_is_empty)
-{
-	BOOST_TEST(PairsFromRandomSubset(0.0).materialise(0).empty());
-	BOOST_TEST(PairsFromRandomSubset(0.5).materialise(0).empty());
-	BOOST_TEST(PairsFromRandomSubset(1.0).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_pairs_if_selection_chance_is_zero)
-{
-	BOOST_TEST(PairsFromRandomSubset(0.0).materialise(0).empty());
-	BOOST_TEST(PairsFromRandomSubset(0.0).materialise(100).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_all_pairs_if_selection_chance_is_one)
-{
-	BOOST_TEST(PairsFromRandomSubset(1.0).materialise(0).empty());
-	BOOST_TEST(PairsFromRandomSubset(1.0).materialise(100).size() == 50);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(PairMosaicSelectionTest)
-
-using IndexPairs = vector<tuple<size_t, size_t>>;
-
-BOOST_AUTO_TEST_CASE(materialise)
-{
-	BOOST_TEST(PairMosaicSelection({{1, 1}}, 0.5).materialise(4) == IndexPairs({{1, 1}, {1, 1}}));
-	BOOST_TEST(PairMosaicSelection({{1, 1}}, 1.0).materialise(4) == IndexPairs({{1, 1}, {1, 1}, {1, 1}, {1, 1}}));
-	BOOST_TEST(PairMosaicSelection({{1, 1}}, 2.0).materialise(4) == IndexPairs({{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}));
-	BOOST_TEST(PairMosaicSelection({{1, 1}}, 1.0).materialise(2) == IndexPairs({{1, 1}, {1, 1}}));
-
-	IndexPairs pairs1{{0, 1}, {1, 0}};
-	BOOST_TEST(PairMosaicSelection(pairs1, 0.5).materialise(4) == IndexPairs({{0, 1}, {1, 0}}));
-	BOOST_TEST(PairMosaicSelection(pairs1, 1.0).materialise(4) == IndexPairs({{0, 1}, {1, 0}, {0, 1}, {1, 0}}));
-	BOOST_TEST(PairMosaicSelection(pairs1, 2.0).materialise(4) == IndexPairs({{0, 1}, {1, 0}, {0, 1}, {1, 0}, {0, 1}, {1, 0}, {0, 1}, {1, 0}}));
-	BOOST_TEST(PairMosaicSelection(pairs1, 1.0).materialise(2) == IndexPairs({{0, 1}, {1, 0}}));
-
-	IndexPairs pairs2{{3, 2}, {2, 3}, {1, 0}, {1, 1}};
-	BOOST_TEST(PairMosaicSelection(pairs2, 0.5).materialise(4) == IndexPairs({{3, 2}, {2, 3}}));
-	BOOST_TEST(PairMosaicSelection(pairs2, 1.0).materialise(4) == IndexPairs({{3, 2}, {2, 3}, {1, 0}, {1, 1}}));
-	BOOST_TEST(PairMosaicSelection(pairs2, 2.0).materialise(4) == IndexPairs({{3, 2}, {2, 3}, {1, 0}, {1, 1}, {3, 2}, {2, 3}, {1, 0}, {1, 1}}));
-
-	IndexPairs pairs3{{1, 0}, {1, 1}, {1, 0}, {1, 1}};
-	BOOST_TEST(PairMosaicSelection(pairs3, 1.0).materialise(2) == IndexPairs({{1, 0}, {1, 1}}));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_round_indices)
-{
-	IndexPairs pairs{{4, 4}, {3, 3}, {2, 2}, {1, 1}, {0, 0}};
-	BOOST_TEST(PairMosaicSelection(pairs, 0.49).materialise(5) == IndexPairs({{4, 4}, {3, 3}}));
-	BOOST_TEST(PairMosaicSelection(pairs, 0.50).materialise(5) == IndexPairs({{4, 4}, {3, 3}, {2, 2}}));
-	BOOST_TEST(PairMosaicSelection(pairs, 0.51).materialise(5) == IndexPairs({{4, 4}, {3, 3}, {2, 2}}));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_pairs_if_collection_is_empty)
-{
-	BOOST_TEST(PairMosaicSelection({{1, 1}}, 1.0).materialise(0).empty());
-	BOOST_TEST(PairMosaicSelection({{1, 1}, {3, 3}}, 2.0).materialise(0).empty());
-	BOOST_TEST(PairMosaicSelection({{5, 5}, {4, 4}, {3, 3}, {2, 2}}, 0.5).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_pairs_if_collection_has_one_element)
-{
-	IndexPairs pairs{{4, 4}, {3, 3}, {2, 2}, {1, 1}, {0, 0}};
-	BOOST_TEST(PairMosaicSelection(pairs, 0.0).materialise(1).empty());
-	BOOST_TEST(PairMosaicSelection(pairs, 0.5).materialise(1).empty());
-	BOOST_TEST(PairMosaicSelection(pairs, 1.0).materialise(1).empty());
-	BOOST_TEST(PairMosaicSelection(pairs, 7.0).materialise(1).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_clamp_indices_at_collection_size)
-{
-	IndexPairs pairs{{4, 4}, {3, 3}, {2, 2}, {1, 1}, {0, 0}};
-	BOOST_TEST(PairMosaicSelection(pairs, 1.0).materialise(4) == IndexPairs({{3, 3}, {3, 3}, {2, 2}, {1, 1}}));
-	BOOST_TEST(PairMosaicSelection(pairs, 2.0).materialise(3) == IndexPairs({{2, 2}, {2, 2}, {2, 2}, {1, 1}, {0, 0}, {2, 2}}));
-
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Phaser.cpp b/test/yulPhaser/Phaser.cpp
deleted file mode 100644
index feee2269e761..000000000000
--- a/test/yulPhaser/Phaser.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Exceptions.h>
-#include <tools/yulPhaser/Phaser.h>
-
-#include <liblangutil/CharStream.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/TemporaryDirectory.h>
-
-#include <boost/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <fstream>
-
-using namespace std;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-
-namespace fs = boost::filesystem;
-
-namespace solidity::phaser::test
-{
-
-class GeneticAlgorithmFactoryFixture
-{
-protected:
-	GeneticAlgorithmFactory::Options m_options = {
-		/* algorithm = */ Algorithm::Random,
-		/* minChromosomeLength = */ 50,
-		/* maxChromosomeLength = */ 100,
-		/* CrossoverChoice = */ CrossoverChoice::Uniform,
-		/* uniformCrossoverSwapChance = */ 0.5,
-		/* randomElitePoolSize = */ 0.5,
-		/* gewepMutationPoolSize = */ 0.1,
-		/* gewepCrossoverPoolSize = */ 0.1,
-		/* gewepRandomisationChance = */ 0.6,
-		/* gewepDeletionVsAdditionChance = */ 0.3,
-		/* gewepGenesToRandomise = */ 0.4,
-		/* gewepGenesToAddOrDelete = */ 0.2,
-		/* classicElitePoolSize = */ 0.0,
-		/* classicCrossoverChance = */ 0.75,
-		/* classicMutationChance = */ 0.2,
-		/* classicDeletionChance = */ 0.2,
-		/* classicAdditionChance = */ 0.2,
-	};
-};
-
-class FixtureWithPrograms
-{
-protected:
-	vector<CharStream> m_sourceStreams = {
-		CharStream("{}", ""),
-		CharStream("{{}}", ""),
-		CharStream("{{{}}}", ""),
-	};
-	vector<Program> m_programs = {
-		get<Program>(Program::load(m_sourceStreams[0])),
-		get<Program>(Program::load(m_sourceStreams[1])),
-		get<Program>(Program::load(m_sourceStreams[2])),
-	};
-};
-
-class FitnessMetricFactoryFixture: public FixtureWithPrograms
-{
-protected:
-	FitnessMetricFactory::Options m_options = {
-		/* metric = */ MetricChoice::CodeSize,
-		/* metricAggregator = */ MetricAggregatorChoice::Average,
-		/* relativeMetricScale = */ 5,
-		/* chromosomeRepetitions = */ 1,
-	};
-	CodeWeights const m_weights{};
-};
-
-class PoulationFactoryFixture
-{
-protected:
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
-	PopulationFactory::Options m_options = {
-		/* minChromosomeLength = */ 0,
-		/* maxChromosomeLength = */ 0,
-		/* population = */ {},
-		/* randomPopulation = */ {},
-		/* populationFromFile = */ {},
-	};
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(PhaserTest)
-BOOST_AUTO_TEST_SUITE(GeneticAlgorithmFactoryTest)
-
-BOOST_FIXTURE_TEST_CASE(build_should_select_the_right_algorithm_and_pass_the_options_to_it, GeneticAlgorithmFactoryFixture)
-{
-	m_options.algorithm = Algorithm::Random;
-	unique_ptr<GeneticAlgorithm> algorithm1 = GeneticAlgorithmFactory::build(m_options, 100);
-	BOOST_REQUIRE(algorithm1 != nullptr);
-
-	auto randomAlgorithm = dynamic_cast<RandomAlgorithm*>(algorithm1.get());
-	BOOST_REQUIRE(randomAlgorithm != nullptr);
-	BOOST_TEST(randomAlgorithm->options().elitePoolSize == m_options.randomElitePoolSize.value());
-	BOOST_TEST(randomAlgorithm->options().minChromosomeLength == m_options.minChromosomeLength);
-	BOOST_TEST(randomAlgorithm->options().maxChromosomeLength == m_options.maxChromosomeLength);
-
-	m_options.algorithm = Algorithm::GEWEP;
-	unique_ptr<GeneticAlgorithm> algorithm2 = GeneticAlgorithmFactory::build(m_options, 100);
-	BOOST_REQUIRE(algorithm2 != nullptr);
-
-	auto gewepAlgorithm = dynamic_cast<GenerationalElitistWithExclusivePools*>(algorithm2.get());
-	BOOST_REQUIRE(gewepAlgorithm != nullptr);
-	BOOST_TEST(gewepAlgorithm->options().crossover == m_options.crossover);
-	BOOST_TEST(gewepAlgorithm->options().uniformCrossoverSwapChance.has_value());
-	BOOST_TEST(gewepAlgorithm->options().uniformCrossoverSwapChance.value() == m_options.uniformCrossoverSwapChance);
-	BOOST_TEST(gewepAlgorithm->options().mutationPoolSize == m_options.gewepMutationPoolSize);
-	BOOST_TEST(gewepAlgorithm->options().crossoverPoolSize == m_options.gewepCrossoverPoolSize);
-	BOOST_TEST(gewepAlgorithm->options().randomisationChance == m_options.gewepRandomisationChance);
-	BOOST_TEST(gewepAlgorithm->options().deletionVsAdditionChance == m_options.gewepDeletionVsAdditionChance);
-	BOOST_TEST(gewepAlgorithm->options().percentGenesToRandomise == m_options.gewepGenesToRandomise.value());
-	BOOST_TEST(gewepAlgorithm->options().percentGenesToAddOrDelete == m_options.gewepGenesToAddOrDelete.value());
-
-	m_options.algorithm = Algorithm::Classic;
-	unique_ptr<GeneticAlgorithm> algorithm3 = GeneticAlgorithmFactory::build(m_options, 100);
-	BOOST_REQUIRE(algorithm3 != nullptr);
-
-	auto classicAlgorithm = dynamic_cast<ClassicGeneticAlgorithm*>(algorithm3.get());
-	BOOST_REQUIRE(classicAlgorithm != nullptr);
-	BOOST_TEST(classicAlgorithm->options().uniformCrossoverSwapChance.has_value());
-	BOOST_TEST(classicAlgorithm->options().uniformCrossoverSwapChance.value() == m_options.uniformCrossoverSwapChance);
-	BOOST_TEST(classicAlgorithm->options().elitePoolSize == m_options.classicElitePoolSize);
-	BOOST_TEST(classicAlgorithm->options().crossoverChance == m_options.classicCrossoverChance);
-	BOOST_TEST(classicAlgorithm->options().mutationChance == m_options.classicMutationChance);
-	BOOST_TEST(classicAlgorithm->options().deletionChance == m_options.classicDeletionChance);
-	BOOST_TEST(classicAlgorithm->options().additionChance == m_options.classicAdditionChance);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_set_random_algorithm_elite_pool_size_based_on_population_size_if_not_specified, GeneticAlgorithmFactoryFixture)
-{
-	m_options.algorithm = Algorithm::Random;
-	m_options.randomElitePoolSize = nullopt;
-	unique_ptr<GeneticAlgorithm> algorithm = GeneticAlgorithmFactory::build(m_options, 100);
-	BOOST_REQUIRE(algorithm != nullptr);
-
-	auto randomAlgorithm = dynamic_cast<RandomAlgorithm*>(algorithm.get());
-	BOOST_REQUIRE(randomAlgorithm != nullptr);
-	BOOST_TEST(randomAlgorithm->options().elitePoolSize == 1.0 / 100.0);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_set_gewep_mutation_percentages_based_on_maximum_chromosome_length_if_not_specified, GeneticAlgorithmFactoryFixture)
-{
-	m_options.algorithm = Algorithm::GEWEP;
-	m_options.gewepGenesToRandomise = nullopt;
-	m_options.gewepGenesToAddOrDelete = nullopt;
-	m_options.maxChromosomeLength = 125;
-
-	unique_ptr<GeneticAlgorithm> algorithm = GeneticAlgorithmFactory::build(m_options, 100);
-	BOOST_REQUIRE(algorithm != nullptr);
-
-	auto gewepAlgorithm = dynamic_cast<GenerationalElitistWithExclusivePools*>(algorithm.get());
-	BOOST_REQUIRE(gewepAlgorithm != nullptr);
-	BOOST_TEST(gewepAlgorithm->options().percentGenesToRandomise == 1.0 / 125.0);
-	BOOST_TEST(gewepAlgorithm->options().percentGenesToAddOrDelete == 1.0 / 125.0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(FitnessMetricFactoryTest)
-
-BOOST_FIXTURE_TEST_CASE(build_should_create_metric_of_the_right_type, FitnessMetricFactoryFixture)
-{
-	m_options.metric = MetricChoice::RelativeCodeSize;
-	m_options.metricAggregator = MetricAggregatorChoice::Sum;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
-	BOOST_REQUIRE(metric != nullptr);
-
-	auto sumMetric = dynamic_cast<FitnessMetricSum*>(metric.get());
-	BOOST_REQUIRE(sumMetric != nullptr);
-	BOOST_REQUIRE(sumMetric->metrics().size() == 1);
-	BOOST_REQUIRE(sumMetric->metrics()[0] != nullptr);
-
-	auto relativeProgramSizeMetric = dynamic_cast<RelativeProgramSize*>(sumMetric->metrics()[0].get());
-	BOOST_REQUIRE(relativeProgramSizeMetric != nullptr);
-	BOOST_TEST(toString(relativeProgramSizeMetric->program()) == toString(m_programs[0]));
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_respect_chromosome_repetitions_option, FitnessMetricFactoryFixture)
-{
-	m_options.metric = MetricChoice::CodeSize;
-	m_options.metricAggregator = MetricAggregatorChoice::Average;
-	m_options.chromosomeRepetitions = 5;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
-	BOOST_REQUIRE(metric != nullptr);
-
-	auto averageMetric = dynamic_cast<FitnessMetricAverage*>(metric.get());
-	BOOST_REQUIRE(averageMetric != nullptr);
-	BOOST_REQUIRE(averageMetric->metrics().size() == 1);
-	BOOST_REQUIRE(averageMetric->metrics()[0] != nullptr);
-
-	auto programSizeMetric = dynamic_cast<ProgramSize*>(averageMetric->metrics()[0].get());
-	BOOST_REQUIRE(programSizeMetric != nullptr);
-	BOOST_TEST(programSizeMetric->repetitionCount() == m_options.chromosomeRepetitions);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_set_relative_metric_scale, FitnessMetricFactoryFixture)
-{
-	m_options.metric = MetricChoice::RelativeCodeSize;
-	m_options.metricAggregator = MetricAggregatorChoice::Average;
-	m_options.relativeMetricScale = 10;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
-	BOOST_REQUIRE(metric != nullptr);
-
-	auto averageMetric = dynamic_cast<FitnessMetricAverage*>(metric.get());
-	BOOST_REQUIRE(averageMetric != nullptr);
-	BOOST_REQUIRE(averageMetric->metrics().size() == 1);
-	BOOST_REQUIRE(averageMetric->metrics()[0] != nullptr);
-
-	auto relativeProgramSizeMetric = dynamic_cast<RelativeProgramSize*>(averageMetric->metrics()[0].get());
-	BOOST_REQUIRE(relativeProgramSizeMetric != nullptr);
-	BOOST_TEST(relativeProgramSizeMetric->fixedPointPrecision() == m_options.relativeMetricScale);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_create_metric_for_each_input_program, FitnessMetricFactoryFixture)
-{
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(
-		m_options,
-		m_programs,
-		vector<shared_ptr<ProgramCache>>(m_programs.size(), nullptr),
-		m_weights
-	);
-	BOOST_REQUIRE(metric != nullptr);
-
-	auto combinedMetric = dynamic_cast<FitnessMetricCombination*>(metric.get());
-	BOOST_REQUIRE(combinedMetric != nullptr);
-	BOOST_REQUIRE(combinedMetric->metrics().size() == m_programs.size());
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_pass_program_caches_to_metrics, FitnessMetricFactoryFixture)
-{
-	assert(m_programs.size() == 3);
-	vector<shared_ptr<ProgramCache>> caches = {
-		make_shared<ProgramCache>(m_programs[0]),
-		make_shared<ProgramCache>(m_programs[1]),
-		make_shared<ProgramCache>(m_programs[2]),
-	};
-
-	m_options.metric = MetricChoice::RelativeCodeSize;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, m_programs, caches, m_weights);
-	BOOST_REQUIRE(metric != nullptr);
-
-	auto combinedMetric = dynamic_cast<FitnessMetricCombination*>(metric.get());
-	BOOST_REQUIRE(combinedMetric != nullptr);
-	BOOST_REQUIRE(combinedMetric->metrics().size() == caches.size());
-
-	for (size_t i = 0; i < caches.size(); ++i)
-	{
-		auto programBasedMetric = dynamic_cast<ProgramBasedMetric*>(combinedMetric->metrics()[i].get());
-		BOOST_REQUIRE(programBasedMetric != nullptr);
-		BOOST_TEST(programBasedMetric->programCache() == caches[i].get());
-	}
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(PopulationFactoryTest)
-
-BOOST_FIXTURE_TEST_CASE(build_should_create_an_empty_population_if_no_specific_options_given, PoulationFactoryFixture)
-{
-	m_options.population = {};
-	m_options.randomPopulation = {};
-	m_options.populationFromFile = {};
-	BOOST_TEST(
-		PopulationFactory::build(m_options, m_fitnessMetric) ==
-		Population(m_fitnessMetric, vector<Chromosome>{})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_respect_population_option, PoulationFactoryFixture)
-{
-	m_options.population = {"a", "afc", "xadd"};
-	BOOST_TEST(
-		PopulationFactory::build(m_options, m_fitnessMetric) ==
-		Population(m_fitnessMetric, {Chromosome("a"), Chromosome("afc"), Chromosome("xadd")})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_respect_random_population_option, PoulationFactoryFixture)
-{
-	m_options.randomPopulation = {5, 3, 2};
-	m_options.minChromosomeLength = 5;
-	m_options.maxChromosomeLength = 10;
-
-	auto population = PopulationFactory::build(m_options, m_fitnessMetric);
-
-	BOOST_TEST(population.individuals().size() == 10);
-	BOOST_TEST(all_of(
-		population.individuals().begin(),
-		population.individuals().end(),
-		[](auto const& individual){ return 5 <= individual.chromosome.length() && individual.chromosome.length() <= 10; }
-	));
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_respect_population_from_file_option, PoulationFactoryFixture)
-{
-	map<string, vector<string>> fileContent = {
-		{"a.txt", {"a", "fff", "", "jxccLTa"}},
-		{"b.txt", {}},
-		{"c.txt", {""}},
-		{"d.txt", {"c", "T"}},
-	};
-
-	TemporaryDirectory tempDir;
-	for (auto const& [fileName, chromosomes]: fileContent)
-	{
-		ofstream tmpFile((tempDir.path() / fileName).string());
-		for (auto const& chromosome: chromosomes)
-			tmpFile << chromosome << endl;
-
-		m_options.populationFromFile.push_back((tempDir.path() / fileName).string());
-	}
-
-	BOOST_TEST(
-		PopulationFactory::build(m_options, m_fitnessMetric) ==
-		Population(m_fitnessMetric, {
-			Chromosome("a"),
-			Chromosome("fff"),
-			Chromosome(""),
-			Chromosome("jxccLTa"),
-			Chromosome(""),
-			Chromosome("c"),
-			Chromosome("T"),
-		})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_throw_FileOpenError_if_population_file_does_not_exist, PoulationFactoryFixture)
-{
-	m_options.populationFromFile = {"a-file-that-does-not-exist.abcdefgh"};
-	assert(!fs::exists(m_options.populationFromFile[0]));
-
-	BOOST_CHECK_THROW(PopulationFactory::build(m_options, m_fitnessMetric), FileOpenError);
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_combine_populations_from_all_sources, PoulationFactoryFixture)
-{
-	TemporaryDirectory tempDir;
-	{
-		ofstream tmpFile((tempDir.path() / "population.txt").string());
-		tmpFile << "axc" << endl << "fcL" << endl;
-	}
-
-	m_options.population = {"axc", "fcL"};
-	m_options.randomPopulation = {2};
-	m_options.populationFromFile = {(tempDir.path() / "population.txt").string()};
-	m_options.minChromosomeLength = 3;
-	m_options.maxChromosomeLength = 3;
-
-	auto population = PopulationFactory::build(m_options, m_fitnessMetric);
-
-	auto begin = population.individuals().begin();
-	auto end = population.individuals().end();
-	BOOST_TEST(population.individuals().size() == 6);
-	BOOST_TEST(all_of(begin, end, [](auto const& individual){ return individual.chromosome.length() == 3; }));
-	BOOST_TEST(count(begin, end, Individual(Chromosome("axc"), *m_fitnessMetric)) >= 2);
-	BOOST_TEST(count(begin, end, Individual(Chromosome("fcL"), *m_fitnessMetric)) >= 2);
-}
-
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(ProgramCacheFactoryTest)
-
-BOOST_FIXTURE_TEST_CASE(build_should_create_cache_for_each_input_program_if_cache_enabled, FixtureWithPrograms)
-{
-	ProgramCacheFactory::Options options{/* programCacheEnabled = */ true};
-	vector<shared_ptr<ProgramCache>> caches = ProgramCacheFactory::build(options, m_programs);
-	assert(m_programs.size() >= 2 && "There must be at least 2 programs for this test to be meaningful");
-
-	BOOST_TEST(caches.size() == m_programs.size());
-	for (size_t i = 0; i < m_programs.size(); ++i)
-	{
-		BOOST_REQUIRE(caches[i] != nullptr);
-		BOOST_TEST(toString(caches[i]->program()) == toString(m_programs[i]));
-	}
-}
-
-BOOST_FIXTURE_TEST_CASE(build_should_return_nullptr_for_each_input_program_if_cache_disabled, FixtureWithPrograms)
-{
-	ProgramCacheFactory::Options options{/* programCacheEnabled = */ false};
-	vector<shared_ptr<ProgramCache>> caches = ProgramCacheFactory::build(options, m_programs);
-	assert(m_programs.size() >= 2 && "There must be at least 2 programs for this test to be meaningful");
-
-	BOOST_TEST(caches.size() == m_programs.size());
-	for (size_t i = 0; i < m_programs.size(); ++i)
-		BOOST_TEST(caches[i] == nullptr);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(ProgramFactoryTest)
-
-BOOST_AUTO_TEST_CASE(build_should_load_programs_from_files)
-{
-	TemporaryDirectory tempDir;
-	vector<string> sources{"{}", "{{}}", "{{{}}}"};
-	ProgramFactory::Options options{
-		/* inputFiles = */ {
-			(tempDir.path() / "program1.yul").string(),
-			(tempDir.path() / "program2.yul").string(),
-			(tempDir.path() / "program3.yul").string(),
-		},
-		/* prefix = */ "",
-	};
-
-	for (size_t i = 0; i < sources.size(); ++i)
-	{
-		ofstream tmpFile(options.inputFiles[i]);
-		tmpFile << sources[i] << endl;
-	}
-
-	vector<Program> programs = ProgramFactory::build(options);
-
-	BOOST_TEST(programs.size() == sources.size());
-	for (size_t i = 0; i < sources.size(); ++i)
-	{
-		CharStream sourceStream(sources[i], options.inputFiles[i]);
-		BOOST_TEST(toString(programs[i]) == toString(get<Program>(Program::load(sourceStream))));
-	}
-}
-
-BOOST_AUTO_TEST_CASE(build_should_apply_prefix)
-{
-	TemporaryDirectory tempDir;
-	ProgramFactory::Options options{
-		/* inputFiles = */ {(tempDir.path() / "program1.yul").string()},
-		/* prefix = */ "f",
-	};
-
-	CharStream nestedSource("{{{let x:= 1}}}", "");
-	Program nestedProgram = get<Program>(Program::load(nestedSource));
-	Program flatProgram = get<Program>(Program::load(nestedSource));
-	flatProgram.optimise(Chromosome::genesToSteps("f"));
-	assert(toString(nestedProgram) != toString(flatProgram));
-
-	{
-		ofstream tmpFile(options.inputFiles[0]);
-		tmpFile << nestedSource.source() << endl;
-	}
-
-	vector<Program> programs = ProgramFactory::build(options);
-
-	BOOST_TEST(programs.size() == 1);
-	BOOST_TEST(toString(programs[0]) == toString(flatProgram));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Population.cpp b/test/yulPhaser/Population.cpp
deleted file mode 100644
index 13d06b521030..000000000000
--- a/test/yulPhaser/Population.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Chromosome.h>
-#include <tools/yulPhaser/PairSelections.h>
-#include <tools/yulPhaser/Population.h>
-#include <tools/yulPhaser/Program.h>
-#include <tools/yulPhaser/Selections.h>
-
-#include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/optimiser/SSAReverser.h>
-#include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/optimiser/UnusedPruner.h>
-
-#include <liblangutil/CharStream.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <cmath>
-#include <optional>
-#include <string>
-#include <sstream>
-
-using namespace std;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace boost::unit_test::framework;
-
-namespace solidity::phaser::test
-{
-
-class PopulationFixture
-{
-protected:
-	static ChromosomePair twoStepSwap(Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		return ChromosomePair{
-			Chromosome(vector<string>{_chromosome1.optimisationSteps()[0], _chromosome2.optimisationSteps()[1]}),
-			Chromosome(vector<string>{_chromosome2.optimisationSteps()[0], _chromosome1.optimisationSteps()[1]}),
-		};
-	}
-
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(PopulationTest)
-
-BOOST_AUTO_TEST_CASE(isFitter_should_use_fitness_as_the_main_criterion)
-{
-	BOOST_TEST(isFitter(Individual(Chromosome("a"), 5), Individual(Chromosome("a"), 10)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("a"), 10), Individual(Chromosome("a"), 5)));
-
-	BOOST_TEST(isFitter(Individual(Chromosome("aaa"), 5), Individual(Chromosome("aaaaa"), 10)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("aaaaa"), 10), Individual(Chromosome("aaa"), 5)));
-
-	BOOST_TEST(isFitter(Individual(Chromosome("aaaaa"), 5), Individual(Chromosome("aaa"), 10)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("aaa"), 10), Individual(Chromosome("aaaaa"), 5)));
-}
-
-BOOST_AUTO_TEST_CASE(isFitter_should_use_alphabetical_order_when_fitness_is_the_same)
-{
-	BOOST_TEST(isFitter(Individual(Chromosome("a"), 3), Individual(Chromosome("c"), 3)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("c"), 3), Individual(Chromosome("a"), 3)));
-
-	BOOST_TEST(isFitter(Individual(Chromosome("a"), 3), Individual(Chromosome("aa"), 3)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("aa"), 3), Individual(Chromosome("a"), 3)));
-
-	BOOST_TEST(isFitter(Individual(Chromosome("T"), 3), Individual(Chromosome("a"), 3)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("a"), 3), Individual(Chromosome("T"), 3)));
-}
-
-BOOST_AUTO_TEST_CASE(isFitter_should_return_false_for_identical_individuals)
-{
-	BOOST_TEST(!isFitter(Individual(Chromosome("a"), 3), Individual(Chromosome("a"), 3)));
-	BOOST_TEST(!isFitter(Individual(Chromosome("acT"), 0), Individual(Chromosome("acT"), 0)));
-}
-
-BOOST_FIXTURE_TEST_CASE(constructor_should_copy_chromosomes_compute_fitness_and_sort_chromosomes, PopulationFixture)
-{
-	vector<Chromosome> chromosomes = {
-		Chromosome::makeRandom(5),
-		Chromosome::makeRandom(15),
-		Chromosome::makeRandom(10),
-	};
-	Population population(m_fitnessMetric, chromosomes);
-
-	vector<Individual> const& individuals = population.individuals();
-
-	BOOST_TEST(individuals.size() == 3);
-	BOOST_TEST(individuals[0].fitness == 5);
-	BOOST_TEST(individuals[1].fitness == 10);
-	BOOST_TEST(individuals[2].fitness == 15);
-	BOOST_TEST(individuals[0].chromosome == chromosomes[0]);
-	BOOST_TEST(individuals[1].chromosome == chromosomes[2]);
-	BOOST_TEST(individuals[2].chromosome == chromosomes[1]);
-}
-
-BOOST_FIXTURE_TEST_CASE(constructor_should_accept_individuals_without_recalculating_fitness, PopulationFixture)
-{
-	vector<Individual> customIndividuals = {
-		Individual(Chromosome("aaaccc"), 20),
-		Individual(Chromosome("aaa"), 10),
-		Individual(Chromosome("aaaf"), 30),
-	};
-	assert(customIndividuals[0].fitness != m_fitnessMetric->evaluate(customIndividuals[0].chromosome));
-	assert(customIndividuals[1].fitness != m_fitnessMetric->evaluate(customIndividuals[1].chromosome));
-	assert(customIndividuals[2].fitness != m_fitnessMetric->evaluate(customIndividuals[2].chromosome));
-
-	Population population(m_fitnessMetric, customIndividuals);
-
-	vector<Individual> expectedIndividuals{customIndividuals[1], customIndividuals[0], customIndividuals[2]};
-	BOOST_TEST(population.individuals() == expectedIndividuals);
-}
-
-BOOST_FIXTURE_TEST_CASE(makeRandom_should_get_chromosome_lengths_from_specified_generator, PopulationFixture)
-{
-	size_t chromosomeCount = 30;
-	size_t maxLength = 5;
-	assert(chromosomeCount % maxLength == 0);
-
-	auto nextLength = [counter = 0ul, maxLength]() mutable { return counter++ % maxLength; };
-	auto population = Population::makeRandom(m_fitnessMetric, chromosomeCount, nextLength);
-
-	// We can't rely on the order since the population sorts its chromosomes immediately but
-	// we can check the number of occurrences of each length.
-	for (size_t length = 0; length < maxLength; ++length)
-		BOOST_TEST(
-			count_if(
-				population.individuals().begin(),
-				population.individuals().end(),
-				[&length](auto const& individual) { return individual.chromosome.length() == length; }
-			) == chromosomeCount / maxLength
-		);
-}
-
-BOOST_FIXTURE_TEST_CASE(makeRandom_should_get_chromosome_lengths_from_specified_range, PopulationFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 100, 5, 10);
-	BOOST_TEST(all_of(
-		population.individuals().begin(),
-		population.individuals().end(),
-		[](auto const& individual){ return 5 <= individual.chromosome.length() && individual.chromosome.length() <= 10; }
-	));
-}
-
-BOOST_FIXTURE_TEST_CASE(makeRandom_should_use_random_chromosome_length, PopulationFixture)
-{
-	SimulationRNG::reset(1);
-	constexpr int populationSize = 200;
-	constexpr int minLength = 5;
-	constexpr int maxLength = 10;
-	constexpr double relativeTolerance = 0.05;
-
-	auto population = Population::makeRandom(m_fitnessMetric, populationSize, minLength, maxLength);
-	vector<size_t> samples = chromosomeLengths(population);
-
-	const double expectedValue = (maxLength + minLength) / 2.0;
-	const double variance = ((maxLength - minLength + 1) * (maxLength - minLength + 1) - 1) / 12.0;
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_FIXTURE_TEST_CASE(makeRandom_should_return_population_with_random_chromosomes, PopulationFixture)
-{
-	SimulationRNG::reset(1);
-	constexpr int populationSize = 100;
-	constexpr int chromosomeLength = 30;
-	constexpr double relativeTolerance = 0.01;
-
-	map<string, size_t> stepIndices = enumerateOptmisationSteps();
-	auto population = Population::makeRandom(m_fitnessMetric, populationSize, chromosomeLength, chromosomeLength);
-
-	vector<size_t> samples;
-	for (auto& individual: population.individuals())
-		for (auto& step: individual.chromosome.optimisationSteps())
-			samples.push_back(stepIndices.at(step));
-
-	const double expectedValue = double(stepIndices.size() - 1) / 2.0;
-	const double variance = double(stepIndices.size() * stepIndices.size() - 1) / 12.0;
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_FIXTURE_TEST_CASE(makeRandom_should_compute_fitness, PopulationFixture)
-{
-	auto population = Population::makeRandom(m_fitnessMetric, 3, 5, 10);
-
-	BOOST_TEST(population.individuals()[0].fitness == m_fitnessMetric->evaluate(population.individuals()[0].chromosome));
-	BOOST_TEST(population.individuals()[1].fitness == m_fitnessMetric->evaluate(population.individuals()[1].chromosome));
-	BOOST_TEST(population.individuals()[2].fitness == m_fitnessMetric->evaluate(population.individuals()[2].chromosome));
-}
-
-BOOST_FIXTURE_TEST_CASE(plus_operator_should_add_two_populations, PopulationFixture)
-{
-	BOOST_CHECK_EQUAL(
-		Population(m_fitnessMetric, {Chromosome("ac"), Chromosome("cx")}) +
-		Population(m_fitnessMetric, {Chromosome("g"), Chromosome("h"), Chromosome("iI")}),
-		Population(m_fitnessMetric, {Chromosome("ac"), Chromosome("cx"), Chromosome("g"), Chromosome("h"), Chromosome("iI")})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(select_should_return_population_containing_individuals_indicated_by_selection, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("a"), Chromosome("c"), Chromosome("g"), Chromosome("h")});
-	RangeSelection selection(0.25, 0.75);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{1, 2}));
-
-	BOOST_TEST(
-		population.select(selection) ==
-		Population(m_fitnessMetric, {population.individuals()[1].chromosome, population.individuals()[2].chromosome})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(select_should_include_duplicates_if_selection_contains_duplicates, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("a"), Chromosome("c")});
-	MosaicSelection selection({0, 1}, 2.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{0, 1, 0, 1}));
-
-	BOOST_TEST(population.select(selection) == Population(m_fitnessMetric, {
-		population.individuals()[0].chromosome,
-		population.individuals()[1].chromosome,
-		population.individuals()[0].chromosome,
-		population.individuals()[1].chromosome,
-	}));
-}
-
-BOOST_FIXTURE_TEST_CASE(select_should_return_empty_population_if_selection_is_empty, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("a"), Chromosome("c")});
-	RangeSelection selection(0.0, 0.0);
-	assert(selection.materialise(population.individuals().size()).empty());
-
-	BOOST_TEST(population.select(selection).individuals().empty());
-}
-
-BOOST_FIXTURE_TEST_CASE(mutate_should_return_population_containing_individuals_indicated_by_selection_with_mutation_applied, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
-	RangeSelection selection(0.25, 0.75);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{1, 2}));
-
-	Population expectedPopulation(m_fitnessMetric, {Chromosome("fc"), Chromosome("fg")});
-
-	BOOST_TEST(population.mutate(selection, geneSubstitution(0, BlockFlattener::name)) == expectedPopulation);
-}
-
-BOOST_FIXTURE_TEST_CASE(mutate_should_include_duplicates_if_selection_contains_duplicates, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("aa")});
-	RangeSelection selection(0.0, 1.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{0, 1}));
-
-	BOOST_TEST(
-		population.mutate(selection, geneSubstitution(0, BlockFlattener::name)) ==
-		Population(m_fitnessMetric, {Chromosome("fa"), Chromosome("fa")})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(mutate_should_return_empty_population_if_selection_is_empty, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc")});
-	RangeSelection selection(0.0, 0.0);
-	assert(selection.materialise(population.individuals().size()).empty());
-
-	BOOST_TEST(population.mutate(selection, geneSubstitution(0, BlockFlattener::name)).individuals().empty());
-}
-
-BOOST_FIXTURE_TEST_CASE(crossover_should_return_population_containing_individuals_indicated_by_selection_with_crossover_applied, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
-	PairMosaicSelection selection({{0, 1}, {2, 1}}, 1.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{0, 1}, {2, 1}, {0, 1}, {2, 1}}));
-
-	Population expectedPopulation(m_fitnessMetric, {Chromosome("ac"), Chromosome("ac"), Chromosome("gc"), Chromosome("gc")});
-
-	BOOST_TEST(population.crossover(selection, fixedPointCrossover(0.5)) == expectedPopulation);
-}
-
-BOOST_FIXTURE_TEST_CASE(crossover_should_include_duplicates_if_selection_contains_duplicates, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("aa")});
-	PairMosaicSelection selection({{0, 0}, {1, 1}}, 2.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{0, 0}, {1, 1}, {0, 0}, {1, 1}}));
-
-	BOOST_TEST(
-		population.crossover(selection, fixedPointCrossover(0.5)) ==
-		Population(m_fitnessMetric, {Chromosome("aa"), Chromosome("aa"), Chromosome("aa"), Chromosome("aa")})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(crossover_should_return_empty_population_if_selection_is_empty, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc")});
-	PairMosaicSelection selection({}, 0.0);
-	assert(selection.materialise(population.individuals().size()).empty());
-
-	BOOST_TEST(population.crossover(selection, fixedPointCrossover(0.5)).individuals().empty());
-}
-
-BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_return_crossed_population_and_remainder, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
-	PairMosaicSelection selection({{2, 1}}, 0.25);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{2, 1}}));
-
-	Population expectedCrossedPopulation(m_fitnessMetric, {Chromosome("gc"), Chromosome("cg")});
-	Population expectedRemainder(m_fitnessMetric, {Chromosome("aa"), Chromosome("hh")});
-
-	BOOST_TEST(
-		population.symmetricCrossoverWithRemainder(selection, twoStepSwap) ==
-		(tuple<Population, Population>{expectedCrossedPopulation, expectedRemainder})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_allow_crossing_the_same_individual_multiple_times, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
-	PairMosaicSelection selection({{0, 0}, {2, 1}}, 1.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{0, 0}, {2, 1}, {0, 0}, {2, 1}}));
-
-	Population expectedCrossedPopulation(m_fitnessMetric, {
-		Chromosome("aa"), Chromosome("aa"),
-		Chromosome("aa"), Chromosome("aa"),
-		Chromosome("gc"), Chromosome("cg"),
-		Chromosome("gc"), Chromosome("cg"),
-	});
-	Population expectedRemainder(m_fitnessMetric, {Chromosome("hh")});
-
-	BOOST_TEST(
-		population.symmetricCrossoverWithRemainder(selection, twoStepSwap) ==
-		(tuple<Population, Population>{expectedCrossedPopulation, expectedRemainder})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_return_empty_population_if_selection_is_empty, PopulationFixture)
-{
-	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc")});
-	PairMosaicSelection selection({}, 0.0);
-	assert(selection.materialise(population.individuals().size()).empty());
-
-	BOOST_TEST(
-		population.symmetricCrossoverWithRemainder(selection, twoStepSwap) ==
-		(tuple<Population, Population>{Population(m_fitnessMetric), population})
-	);
-}
-
-BOOST_FIXTURE_TEST_CASE(combine_should_add_two_populations_from_a_pair, PopulationFixture)
-{
-	Population population1(m_fitnessMetric, {Chromosome("aa"), Chromosome("hh")});
-	Population population2(m_fitnessMetric, {Chromosome("gg"), Chromosome("cc")});
-
-	BOOST_TEST(Population::combine({population1, population2}) == population1 + population2);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Program.cpp b/test/yulPhaser/Program.cpp
deleted file mode 100644
index 2e91926d059f..000000000000
--- a/test/yulPhaser/Program.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Exceptions.h>
-#include <tools/yulPhaser/Program.h>
-
-#include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/StructuralSimplifier.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/JSON.h>
-#include <liblangutil/CharStream.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <cassert>
-#include <string>
-
-using namespace std;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace boost::unit_test::framework;
-
-namespace
-{
-	/// If the specified block is redundant (i.e. the only thing it contains is another block)
-	/// the function recurses into it and returns the first non-redundant one it finds.
-	/// If the block isn't redundant it just returns it immediately.
-	Block const& skipRedundantBlocks(Block const& _block)
-	{
-		if (_block.statements.size() == 1 && holds_alternative<Block>(_block.statements[0]))
-			return skipRedundantBlocks(get<Block>(_block.statements[0]));
-		else
-			return _block;
-	}
-}
-
-namespace solidity::phaser::test
-{
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(ProgramTest)
-
-BOOST_AUTO_TEST_CASE(copy_constructor_should_make_deep_copy_of_ast)
-{
-	string sourceCode(
-		"{\n"
-		"    let x := 1\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	Program programCopy(program);
-
-	BOOST_TEST(&programCopy.ast() != &program.ast());
-
-	// There might be a more direct way to compare ASTs but converting to JSON should be good enough
-	// as long as the conversion is deterministic. A very nice side effect of doing it this way is
-	// that BOOST_TEST will print the complete AST structure of both programs in case of a mismatch.
-	BOOST_TEST(programCopy.toJson() == program.toJson());
-}
-
-BOOST_AUTO_TEST_CASE(load_should_rewind_the_stream)
-{
-	string sourceCode(
-		"{\n"
-		"    let x := 1\n"
-		"    let y := 2\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	sourceStream.setPosition(5);
-
-	Program program = get<Program>(Program::load(sourceStream));
-
-	BOOST_TEST(CodeSize::codeSize(program.ast()) == 2);
-}
-
-BOOST_AUTO_TEST_CASE(load_should_disambiguate)
-{
-	string sourceCode(
-		"{\n"
-		"    {\n"
-		"        let x := 1\n"
-		"    }\n"
-		"    {\n"
-		"        let x := 2\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	// skipRedundantBlocks() makes the test independent of whether load() includes function grouping or not.
-	Block const& parentBlock = skipRedundantBlocks(program.ast());
-	BOOST_TEST(parentBlock.statements.size() == 2);
-
-	Block const& innerBlock1 = get<Block>(parentBlock.statements[0]);
-	Block const& innerBlock2 = get<Block>(parentBlock.statements[1]);
-	VariableDeclaration const& declaration1 = get<VariableDeclaration>(innerBlock1.statements[0]);
-	VariableDeclaration const& declaration2 = get<VariableDeclaration>(innerBlock2.statements[0]);
-
-	BOOST_TEST(declaration1.variables[0].name.str() == "x");
-	BOOST_TEST(declaration2.variables[0].name.str() != "x");
-}
-
-BOOST_AUTO_TEST_CASE(load_should_do_function_grouping_and_hoisting)
-{
-	string sourceCode(
-		"{\n"
-		"    function foo() -> result\n"
-		"    {\n"
-		"        result := 1\n"
-		"    }\n"
-		"    let x := 1\n"
-		"    function bar(a) -> result\n"
-		"    {\n"
-		"        result := 2\n"
-		"    }\n"
-		"    let y := 2\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	BOOST_TEST(program.ast().statements.size() == 3);
-	BOOST_TEST(holds_alternative<Block>(program.ast().statements[0]));
-	BOOST_TEST(holds_alternative<FunctionDefinition>(program.ast().statements[1]));
-	BOOST_TEST(holds_alternative<FunctionDefinition>(program.ast().statements[2]));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_do_loop_init_rewriting)
-{
-	string sourceCode(
-		"{\n"
-		"    for { let i := 0 } true {}\n"
-		"    {\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	// skipRedundantBlocks() makes the test independent of whether load() includes function grouping or not.
-	Block const& parentBlock = skipRedundantBlocks(program.ast());
-	BOOST_TEST(holds_alternative<VariableDeclaration>(parentBlock.statements[0]));
-	BOOST_TEST(holds_alternative<ForLoop>(parentBlock.statements[1]));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_throw_InvalidProgram_if_program_cant_be_parsed)
-{
-	string sourceCode("invalid program\n");
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-
-	BOOST_TEST(holds_alternative<ErrorList>(Program::load(sourceStream)));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_throw_InvalidProgram_if_program_cant_be_analyzed)
-{
-	// This should be parsed just fine but fail the analysis with:
-	//     Error: Variable not found or variable not lvalue.
-	string sourceCode(
-		"{\n"
-		"    x := 1\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-
-	BOOST_TEST(holds_alternative<ErrorList>(Program::load(sourceStream)));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_accept_yul_objects_as_input)
-{
-	string sourceCode(
-		"object \"C_178\" {\n"
-		"    code {\n"
-		"        mstore(64, 128)\n"
-		"        if iszero(calldatasize()) {}\n"
-		"            revert(0, 0)\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	auto programOrErrors = Program::load(sourceStream);
-
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_return_errors_if_analysis_of_object_code_fails)
-{
-	string sourceCode(
-		"object \"C_178\" {\n"
-		"    code {\n"
-		"        return(0, datasize(\"C_178_deployed\"))\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	auto programOrErrors = Program::load(sourceStream);
-
-	BOOST_TEST(holds_alternative<ErrorList>(programOrErrors));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_return_errors_if_parsing_of_nested_object_fails)
-{
-	string sourceCode(
-		"object \"C_178\" {\n"
-		"    code {\n"
-		"        return(0, datasize(\"C_178_deployed\"))\n"
-		"    }\n"
-		"    object \"duplicate_name\" {\n"
-		"        code {\n"
-		"            mstore(64, 128)\n"
-		"        }\n"
-		"    }\n"
-		"    object \"duplicate_name\" {\n"
-		"        code {\n"
-		"            mstore(64, 128)\n"
-		"        }\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	auto programOrErrors = Program::load(sourceStream);
-
-	BOOST_TEST(holds_alternative<ErrorList>(programOrErrors));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_extract_nested_object_with_deployed_suffix_if_present)
-{
-	string sourceCode(
-		"object \"C_178\" {\n"
-		"    code {\n"
-		"        return(0, datasize(\"C_178_deployed\"))\n"
-		"    }\n"
-		"    object \"C_178_deployed\" {\n"
-		"        code {\n"
-		"            mstore(64, 128)\n"
-		"            if iszero(calldatasize()) {}\n"
-		"                revert(0, 0)\n"
-		"        }\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	auto programOrErrors = Program::load(sourceStream);
-
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_fall_back_to_parsing_the_whole_object_if_there_is_no_subobject_with_the_right_name)
-{
-	string sourceCode(
-		"object \"C_178\" {\n"
-		"    code {\n"
-		"        mstore(64, 128)\n"
-		"    }\n"
-		"    object \"subobject\" {\n"
-		"        code {\n"
-		"            if iszero(calldatasize()) {}\n"
-		"                revert(0, 0)\n"
-		"        }\n"
-		"    }\n"
-		"    object \"C_177_deployed\" {\n"
-		"        code {\n"
-		"            if iszero(calldatasize()) {}\n"
-		"                revert(0, 0)\n"
-		"        }\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	auto programOrErrors = Program::load(sourceStream);
-
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
-
-	Block const& parentBlock = skipRedundantBlocks(get<Program>(programOrErrors).ast());
-	BOOST_TEST(parentBlock.statements.size() == 1);
-	BOOST_TEST(holds_alternative<ExpressionStatement>(parentBlock.statements[0]));
-}
-
-BOOST_AUTO_TEST_CASE(load_should_ignore_data_in_objects)
-{
-	string sourceCode(
-		"object \"C_178\" {\n"
-		"    code {\n"
-		"        mstore(64, 128)\n"
-		"    }\n"
-		"    data \"C_178_deployed\" hex\"4123\"\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	auto programOrErrors = Program::load(sourceStream);
-
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
-}
-
-BOOST_AUTO_TEST_CASE(optimise)
-{
-	string sourceCode(
-		"{\n"
-		"    {\n"
-		"        if 1 { let x := 1 }\n"
-		"        if 0 { let y := 2 }\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	[[maybe_unused]] Block const& parentBlockBefore = skipRedundantBlocks(program.ast());
-	assert(parentBlockBefore.statements.size() == 2);
-	assert(holds_alternative<If>(parentBlockBefore.statements[0]));
-	assert(holds_alternative<If>(parentBlockBefore.statements[1]));
-
-	program.optimise({StructuralSimplifier::name, BlockFlattener::name});
-
-	Block const& parentBlockAfter = program.ast();
-	BOOST_TEST(parentBlockAfter.statements.size() == 1);
-	BOOST_TEST(holds_alternative<Block>(parentBlockAfter.statements[0]));
-	Block const& innerBlock = get<Block>(parentBlockAfter.statements[0]);
-	BOOST_TEST(innerBlock.statements.size() == 1);
-	BOOST_TEST(holds_alternative<VariableDeclaration>(innerBlock.statements[0]));
-}
-
-BOOST_AUTO_TEST_CASE(output_operator)
-{
-	string sourceCode(
-		"{\n"
-		"    let factor := 13\n"
-		"    {\n"
-		"        if factor\n"
-		"        {\n"
-		"            let variable := add(1, 2)\n"
-		"        }\n"
-		"        let result := factor\n"
-		"    }\n"
-		"    let something := 6\n"
-		"    let something_else := mul(something, factor)\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	// NOTE: The snippet above was chosen so that the few optimisations applied automatically by load()
-	// as of now do not change the code significantly. If that changes, you may have to update it.
-	BOOST_TEST(stripWhitespace(toString(program)) == stripWhitespace("{" + sourceCode + "}"));
-}
-
-BOOST_AUTO_TEST_CASE(toJson)
-{
-	string sourceCode(
-		"{\n"
-		"    let a := 3\n"
-		"    if a\n"
-		"    {\n"
-		"        let abc := add(1, 2)\n"
-		"    }\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	Json::Value parsingResult;
-	string errors;
-	BOOST_TEST(jsonParseStrict(program.toJson(), parsingResult, &errors));
-	BOOST_TEST(errors.empty());
-}
-
-BOOST_AUTO_TEST_CASE(codeSize)
-{
-	string sourceCode(
-		"{\n"
-		"    function foo() -> result\n"
-		"    {\n"
-		"        result := 15\n"
-		"    }\n"
-		"    let a := 1\n"
-		"}\n"
-	);
-	CharStream sourceStream(sourceCode, current_test_case().p_name);
-	Program program = get<Program>(Program::load(sourceStream));
-
-	BOOST_TEST(program.codeSize(CodeWeights{}) == CodeSize::codeSizeIncludingFunctions(program.ast()));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/ProgramCache.cpp b/test/yulPhaser/ProgramCache.cpp
deleted file mode 100644
index 2dab86fcda17..000000000000
--- a/test/yulPhaser/ProgramCache.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/ProgramCache.h>
-#include <tools/yulPhaser/Chromosome.h>
-
-#include <libyul/optimiser/Metrics.h>
-
-#include <liblangutil/CharStream.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-#include <set>
-
-using namespace std;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-
-namespace solidity::phaser::test
-{
-
-class ProgramCacheFixture
-{
-protected:
-	static constexpr char SampleSourceCode[] =
-		"{\n"
-		"    for { let i := 0 } not(eq(i, 15)) { i := add(i, 1) }\n"
-		"    {\n"
-		"        let x := 1\n"
-		"        mstore(i, 2)\n"
-		"    }\n"
-		"}\n";
-
-	Program optimisedProgram(Program _program, string _abbreviatedOptimisationSteps) const
-	{
-		Program result = std::move(_program);
-		result.optimise(Chromosome::genesToSteps(_abbreviatedOptimisationSteps));
-		return result;
-	}
-
-	static set<string> cachedKeys(ProgramCache const& _programCache)
-	{
-		 set<string> keys;
-		for (auto pair = _programCache.entries().begin(); pair != _programCache.entries().end(); ++pair)
-			keys.insert(pair->first);
-
-		return keys;
-	}
-
-	CharStream m_sourceStream = CharStream(SampleSourceCode, "program-cache-test");
-	Program m_program = get<Program>(Program::load(m_sourceStream));
-	ProgramCache m_programCache{m_program};
-};
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(ProgramCacheTest)
-
-BOOST_AUTO_TEST_CASE(CacheStats_operator_plus_should_add_stats_together)
-{
-	CacheStats statsA{11, 12, 13, {{1, 14}, {2, 15}}};
-	CacheStats statsB{21, 22, 23, {{2, 24}, {3, 25}}};
-	CacheStats statsC{32, 34, 36, {{1, 14}, {2, 39}, {3, 25}}};
-
-	BOOST_CHECK(statsA + statsB == statsC);
-}
-
-BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_apply_optimisation_steps_to_program, ProgramCacheFixture)
-{
-	Program expectedProgram = optimisedProgram(m_program, "IuO");
-	assert(toString(expectedProgram) != toString(m_program));
-
-	Program cachedProgram = m_programCache.optimiseProgram("IuO");
-
-	BOOST_TEST(toString(cachedProgram) == toString(expectedProgram));
-}
-
-BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_store_programs_for_all_prefixes, ProgramCacheFixture)
-{
-	Program programI = optimisedProgram(m_program, "I");
-	Program programIu = optimisedProgram(programI, "u");
-	Program programIuO = optimisedProgram(programIu, "O");
-	assert(toString(m_program) != toString(programI));
-	assert(toString(m_program) != toString(programIu));
-	assert(toString(m_program) != toString(programIuO));
-	assert(toString(programI) != toString(programIu));
-	assert(toString(programI) != toString(programIuO));
-	assert(toString(programIu) != toString(programIuO));
-
-	BOOST_REQUIRE(m_programCache.size() == 0);
-
-	Program cachedProgram = m_programCache.optimiseProgram("IuO");
-
-	BOOST_TEST(toString(cachedProgram) == toString(programIuO));
-
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "IuO"}));
-	BOOST_TEST(toString(*m_programCache.find("I")) == toString(programI));
-	BOOST_TEST(toString(*m_programCache.find("Iu")) == toString(programIu));
-	BOOST_TEST(toString(*m_programCache.find("IuO")) == toString(programIuO));
-}
-
-BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_repeat_the_chromosome_requested_number_of_times, ProgramCacheFixture)
-{
-	string steps = "IuOIuO";
-
-	Program cachedProgram = m_programCache.optimiseProgram("IuO", 2);
-
-	ProgramCache cacheNoRepetitions(m_program);
-	Program cachedProgramNoRepetitions = cacheNoRepetitions.optimiseProgram("IuOIuO");
-
-	BOOST_TEST(toString(cachedProgram) == toString(cachedProgramNoRepetitions));
-
-	for (size_t size = 1; size <= 6; ++size)
-	{
-		BOOST_REQUIRE(m_programCache.contains(steps.substr(0, size)));
-		BOOST_REQUIRE(cacheNoRepetitions.contains(steps.substr(0, size)));
-		BOOST_TEST(
-			toString(*cacheNoRepetitions.find(steps.substr(0, size))) ==
-			toString(*m_programCache.find(steps.substr(0, size)))
-		);
-	}
-}
-
-BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_reuse_the_longest_prefix_and_move_it_to_the_next_round, ProgramCacheFixture)
-{
-	BOOST_TEST(m_programCache.currentRound() == 0);
-
-	m_programCache.optimiseProgram("Iu");
-	m_programCache.optimiseProgram("Ia");
-	m_programCache.startRound(1);
-
-	BOOST_TEST(m_programCache.currentRound() == 1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "Ia"}));
-	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("Ia")->second.roundNumber == 0);
-
-	m_programCache.optimiseProgram("IuOI");
-
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "Ia", "IuO", "IuOI"}));
-	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 1);
-	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 1);
-	BOOST_TEST(m_programCache.entries().find("Ia")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("IuO")->second.roundNumber == 1);
-	BOOST_TEST(m_programCache.entries().find("IuOI")->second.roundNumber == 1);
-}
-
-BOOST_FIXTURE_TEST_CASE(startRound_should_remove_entries_older_than_two_rounds, ProgramCacheFixture)
-{
-	BOOST_TEST(m_programCache.currentRound() == 0);
-	BOOST_TEST(m_programCache.size() == 0);
-
-	m_programCache.optimiseProgram("Iu");
-
-	BOOST_TEST(m_programCache.currentRound() == 0);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu"}));
-	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
-
-	m_programCache.optimiseProgram("a");
-
-	BOOST_TEST(m_programCache.currentRound() == 0);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "a"}));
-	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 0);
-
-	m_programCache.startRound(1);
-
-	BOOST_TEST(m_programCache.currentRound() == 1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "a"}));
-	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 0);
-
-	m_programCache.optimiseProgram("af");
-
-	BOOST_TEST(m_programCache.currentRound() == 1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "a", "af"}));
-	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
-	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 1);
-	BOOST_TEST(m_programCache.entries().find("af")->second.roundNumber == 1);
-
-	m_programCache.startRound(2);
-
-	BOOST_TEST(m_programCache.currentRound() == 2);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"a", "af"}));
-	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 1);
-	BOOST_TEST(m_programCache.entries().find("af")->second.roundNumber == 1);
-
-	m_programCache.startRound(3);
-
-	BOOST_TEST(m_programCache.currentRound() == 3);
-	BOOST_TEST(m_programCache.size() == 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(gatherStats_should_return_cache_statistics, ProgramCacheFixture)
-{
-	size_t sizeI = optimisedProgram(m_program, "I").codeSize(CacheStats::StorageWeights);
-	size_t sizeIu = optimisedProgram(m_program, "Iu").codeSize(CacheStats::StorageWeights);
-	size_t sizeIuO = optimisedProgram(m_program, "IuO").codeSize(CacheStats::StorageWeights);
-	size_t sizeL = optimisedProgram(m_program, "L").codeSize(CacheStats::StorageWeights);
-	size_t sizeLT = optimisedProgram(m_program, "LT").codeSize(CacheStats::StorageWeights);
-
-	m_programCache.optimiseProgram("L");
-	m_programCache.optimiseProgram("Iu");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu"}));
-	CacheStats expectedStats1{0, 3, sizeL + sizeI + sizeIu, {{0, 3}}};
-	BOOST_CHECK(m_programCache.gatherStats() == expectedStats1);
-
-	m_programCache.optimiseProgram("IuO");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu", "IuO"}));
-	CacheStats expectedStats2{2, 4, sizeL + sizeI + sizeIu + sizeIuO, {{0, 4}}};
-	BOOST_CHECK(m_programCache.gatherStats() == expectedStats2);
-
-	m_programCache.startRound(1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu", "IuO"}));
-	BOOST_CHECK(m_programCache.gatherStats() == expectedStats2);
-
-	m_programCache.optimiseProgram("IuO");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu", "IuO"}));
-	CacheStats expectedStats3{5, 4, sizeL + sizeI + sizeIu + sizeIuO, {{0, 1}, {1, 3}}};
-	BOOST_CHECK(m_programCache.gatherStats() == expectedStats3);
-
-	m_programCache.startRound(2);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "IuO"}));
-	CacheStats expectedStats4{5, 4, sizeI + sizeIu + sizeIuO, {{1, 3}}};
-	BOOST_CHECK(m_programCache.gatherStats() == expectedStats4);
-
-	m_programCache.optimiseProgram("LT");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "LT", "I", "Iu", "IuO"}));
-	CacheStats expectedStats5{5, 6, sizeL + sizeLT + sizeI + sizeIu + sizeIuO, {{1, 3}, {2, 2}}};
-	BOOST_CHECK(m_programCache.gatherStats() == expectedStats5);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/Selections.cpp b/test/yulPhaser/Selections.cpp
deleted file mode 100644
index 28c8b8a879dc..000000000000
--- a/test/yulPhaser/Selections.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/Selections.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <set>
-#include <vector>
-
-using namespace std;
-using namespace solidity::util;
-
-namespace solidity::phaser::test
-{
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(SelectionsTest)
-BOOST_AUTO_TEST_SUITE(RangeSelectionTest)
-
-BOOST_AUTO_TEST_CASE(materialise)
-{
-	BOOST_TEST(RangeSelection(0.0, 1.0).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.0, 0.1).materialise(10) == vector<size_t>({0}));
-	BOOST_TEST(RangeSelection(0.0, 0.2).materialise(10) == vector<size_t>({0, 1}));
-	BOOST_TEST(RangeSelection(0.0, 0.7).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6}));
-
-	BOOST_TEST(RangeSelection(0.9, 1.0).materialise(10) == vector<size_t>({                           9}));
-	BOOST_TEST(RangeSelection(0.8, 1.0).materialise(10) == vector<size_t>({                        8, 9}));
-	BOOST_TEST(RangeSelection(0.5, 1.0).materialise(10) == vector<size_t>({               5, 6, 7, 8, 9}));
-
-	BOOST_TEST(RangeSelection(0.3, 0.6).materialise(10) == vector<size_t>({         3, 4, 5            }));
-	BOOST_TEST(RangeSelection(0.2, 0.7).materialise(10) == vector<size_t>({      2, 3, 4, 5, 6         }));
-	BOOST_TEST(RangeSelection(0.4, 0.7).materialise(10) == vector<size_t>({            4, 5, 6         }));
-
-	BOOST_TEST(RangeSelection(0.4, 0.7).materialise(5) == vector<size_t>({2, 3}));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_round_indices)
-{
-	BOOST_TEST(RangeSelection(0.01, 0.99).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.04, 0.96).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.05, 0.95).materialise(10) == vector<size_t>({   1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.06, 0.94).materialise(10) == vector<size_t>({   1, 2, 3, 4, 5, 6, 7, 8   }));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_collections)
-{
-	BOOST_TEST(RangeSelection(0.0, 0.0).materialise(0).empty());
-	BOOST_TEST(RangeSelection(0.0, 1.0).materialise(0).empty());
-	BOOST_TEST(RangeSelection(0.5, 1.0).materialise(0).empty());
-	BOOST_TEST(RangeSelection(0.0, 0.5).materialise(0).empty());
-	BOOST_TEST(RangeSelection(0.2, 0.7).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_selection_ranges)
-{
-	BOOST_TEST(RangeSelection(0.0, 0.0).materialise(1).empty());
-	BOOST_TEST(RangeSelection(1.0, 1.0).materialise(1).empty());
-
-	BOOST_TEST(RangeSelection(0.0, 0.0).materialise(100).empty());
-	BOOST_TEST(RangeSelection(1.0, 1.0).materialise(100).empty());
-	BOOST_TEST(RangeSelection(0.5, 0.5).materialise(100).empty());
-
-	BOOST_TEST(RangeSelection(0.45, 0.54).materialise(10).empty());
-	BOOST_TEST(!RangeSelection(0.45, 0.54).materialise(100).empty());
-	BOOST_TEST(RangeSelection(0.045, 0.054).materialise(100).empty());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(MosaicSelectionTest)
-
-BOOST_AUTO_TEST_CASE(materialise)
-{
-	BOOST_TEST(MosaicSelection({1}, 0.5).materialise(4) == vector<size_t>({1, 1}));
-	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(4) == vector<size_t>({1, 1, 1, 1}));
-	BOOST_TEST(MosaicSelection({1}, 2.0).materialise(4) == vector<size_t>({1, 1, 1, 1, 1, 1, 1, 1}));
-	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(2) == vector<size_t>({1, 1}));
-
-	BOOST_TEST(MosaicSelection({0, 1}, 0.5).materialise(4) == vector<size_t>({0, 1}));
-	BOOST_TEST(MosaicSelection({0, 1}, 1.0).materialise(4) == vector<size_t>({0, 1, 0, 1}));
-	BOOST_TEST(MosaicSelection({0, 1}, 2.0).materialise(4) == vector<size_t>({0, 1, 0, 1, 0, 1, 0, 1}));
-	BOOST_TEST(MosaicSelection({0, 1}, 1.0).materialise(2) == vector<size_t>({0, 1}));
-
-	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 0.5).materialise(4) == vector<size_t>({3, 2}));
-	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 1.0).materialise(4) == vector<size_t>({3, 2, 1, 0}));
-	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 2.0).materialise(4) == vector<size_t>({3, 2, 1, 0, 3, 2, 1, 0}));
-	BOOST_TEST(MosaicSelection({1, 0, 1, 0}, 1.0).materialise(2) == vector<size_t>({1, 0}));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_round_indices)
-{
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.49).materialise(5) == vector<size_t>({4, 3}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.50).materialise(5) == vector<size_t>({4, 3, 2}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.51).materialise(5) == vector<size_t>({4, 3, 2}));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_collections)
-{
-	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(0).empty());
-	BOOST_TEST(MosaicSelection({1, 3}, 2.0).materialise(0).empty());
-	BOOST_TEST(MosaicSelection({5, 4, 3, 2}, 0.5).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_selections)
-{
-	BOOST_TEST(MosaicSelection({1}, 0.0).materialise(8).empty());
-	BOOST_TEST(MosaicSelection({1, 3}, 0.0).materialise(8).empty());
-	BOOST_TEST(MosaicSelection({5, 4, 3, 2}, 0.0).materialise(8).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_clamp_indices_at_collection_size)
-{
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 1.0).materialise(4) == vector<size_t>({3, 3, 2, 1}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 2.0).materialise(3) == vector<size_t>({2, 2, 2, 1, 0, 2}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 1.0).materialise(1) == vector<size_t>({0}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 7.0).materialise(1) == vector<size_t>({0, 0, 0, 0, 0, 0, 0}));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(RandomSelectionTest)
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabilities)
-{
-	constexpr int collectionSize = 10;
-	constexpr int selectionSize = 100;
-	constexpr double relativeTolerance = 0.1;
-	constexpr double expectedValue = (collectionSize - 1) / 2.0;
-	constexpr double variance = (collectionSize * collectionSize - 1) / 12.0;
-
-	SimulationRNG::reset(1);
-	vector<size_t> samples = RandomSelection(selectionSize).materialise(collectionSize);
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
-{
-	const size_t collectionSize = 200;
-
-	vector<size_t> indices = RandomSelection(0.5).materialise(collectionSize);
-
-	BOOST_TEST(indices.size() == 100);
-	BOOST_TEST(all_of(indices.begin(), indices.end(), [&](auto const& index){ return index <= collectionSize; }));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_number_of_indices_thats_a_fraction_of_collection_size)
-{
-	BOOST_TEST(RandomSelection(0.0).materialise(10).size() == 0);
-	BOOST_TEST(RandomSelection(0.3).materialise(10).size() == 3);
-	BOOST_TEST(RandomSelection(0.5).materialise(10).size() == 5);
-	BOOST_TEST(RandomSelection(0.7).materialise(10).size() == 7);
-	BOOST_TEST(RandomSelection(1.0).materialise(10).size() == 10);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_support_number_of_indices_bigger_than_collection_size)
-{
-	BOOST_TEST(RandomSelection(2.0).materialise(5).size() == 10);
-	BOOST_TEST(RandomSelection(1.5).materialise(10).size() == 15);
-	BOOST_TEST(RandomSelection(10.0).materialise(10).size() == 100);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_round_the_number_of_indices_to_the_nearest_integer)
-{
-	BOOST_TEST(RandomSelection(0.49).materialise(3).size() == 1);
-	BOOST_TEST(RandomSelection(0.50).materialise(3).size() == 2);
-	BOOST_TEST(RandomSelection(0.51).materialise(3).size() == 2);
-
-	BOOST_TEST(RandomSelection(1.51).materialise(3).size() == 5);
-
-	BOOST_TEST(RandomSelection(0.01).materialise(2).size() == 0);
-	BOOST_TEST(RandomSelection(0.01).materialise(3).size() == 0);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_indices_if_collection_is_empty)
-{
-	BOOST_TEST(RandomSelection(0.0).materialise(0).empty());
-	BOOST_TEST(RandomSelection(0.5).materialise(0).empty());
-	BOOST_TEST(RandomSelection(1.0).materialise(0).empty());
-	BOOST_TEST(RandomSelection(2.0).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE(RandomSubsetTest)
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabilities)
-{
-	constexpr int collectionSize = 1000;
-	constexpr double selectionChance = 0.7;
-	constexpr double relativeTolerance = 0.001;
-	constexpr double expectedValue = selectionChance;
-	constexpr double variance = selectionChance * (1 - selectionChance);
-
-	SimulationRNG::reset(1);
-	auto indices = convertContainer<set<size_t>>(RandomSubset(selectionChance).materialise(collectionSize));
-
-	vector<double> bernoulliTrials(collectionSize);
-	for (size_t i = 0; i < collectionSize; ++i)
-		bernoulliTrials[i] = double(indices.count(i));
-
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
-{
-	const size_t collectionSize = 200;
-	vector<size_t> indices = RandomSubset(0.5).materialise(collectionSize);
-
-	BOOST_TEST(all_of(indices.begin(), indices.end(), [&](auto const& index){ return index <= collectionSize; }));
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_indices_in_the_same_order_they_are_in_the_container)
-{
-	const size_t collectionSize = 200;
-	vector<size_t> indices = RandomSubset(0.5).materialise(collectionSize);
-
-	for (size_t i = 1; i < indices.size(); ++i)
-		BOOST_TEST(indices[i - 1] < indices[i]);
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_indices_if_collection_is_empty)
-{
-	BOOST_TEST(RandomSubset(0.5).materialise(0).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_no_indices_if_selection_chance_is_zero)
-{
-	BOOST_TEST(RandomSubset(0.0).materialise(10).empty());
-}
-
-BOOST_AUTO_TEST_CASE(materialise_should_return_all_indices_if_selection_chance_is_one)
-{
-	BOOST_TEST(RandomSubset(1.0).materialise(10).size() == 10);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/SimulationRNG.cpp b/test/yulPhaser/SimulationRNG.cpp
deleted file mode 100644
index d6e8c3a81150..000000000000
--- a/test/yulPhaser/SimulationRNG.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <cassert>
-
-using namespace std;
-
-namespace solidity::phaser::test
-{
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(RandomTest)
-
-BOOST_AUTO_TEST_CASE(bernoulliTrial_should_produce_samples_with_right_expected_value_and_variance)
-{
-	SimulationRNG::reset(1);
-	constexpr size_t numSamples = 10000;
-	constexpr double successProbability = 0.4;
-	constexpr double relativeTolerance = 0.05;
-
-	// For bernoulli distribution with success probability p: EX = p, VarX = p(1 - p)
-	constexpr double expectedValue = successProbability;
-	constexpr double variance = successProbability * (1 - successProbability);
-
-	vector<uint32_t> samples;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(bernoulliTrial_can_be_reset)
-{
-	constexpr size_t numSamples = 10;
-	constexpr double successProbability = 0.4;
-
-	SimulationRNG::reset(1);
-	vector<uint32_t> samples1;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples1.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
-
-	vector<uint32_t> samples2;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples2.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
-
-	SimulationRNG::reset(1);
-	vector<uint32_t> samples3;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples3.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
-
-	SimulationRNG::reset(2);
-	vector<uint32_t> samples4;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples4.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
-
-	BOOST_TEST(samples1 != samples2);
-	BOOST_TEST(samples1 == samples3);
-	BOOST_TEST(samples1 != samples4);
-	BOOST_TEST(samples2 != samples3);
-	BOOST_TEST(samples2 != samples4);
-	BOOST_TEST(samples3 != samples4);
-}
-
-BOOST_AUTO_TEST_CASE(uniformInt_returns_different_values_when_called_multiple_times)
-{
-	SimulationRNG::reset(1);
-	constexpr size_t numSamples = 1000;
-	constexpr uint32_t minValue = 50;
-	constexpr uint32_t maxValue = 80;
-	constexpr double relativeTolerance = 0.05;
-
-	// For uniform distribution from range a..b: EX = (a + b) / 2, VarX = ((b - a + 1)^2 - 1) / 12
-	constexpr double expectedValue = (minValue + maxValue) / 2.0;
-	constexpr double variance = ((maxValue - minValue + 1) * (maxValue - minValue + 1) - 1) / 12.0;
-
-	vector<size_t> samples;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples.push_back(SimulationRNG::uniformInt(minValue, maxValue));
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(uniformInt_can_be_reset)
-{
-	constexpr size_t numSamples = 10;
-	constexpr uint32_t minValue = 50;
-	constexpr uint32_t maxValue = 80;
-
-	SimulationRNG::reset(1);
-	vector<size_t> samples1;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples1.push_back(SimulationRNG::uniformInt(minValue, maxValue));
-
-	vector<size_t> samples2;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples2.push_back(SimulationRNG::uniformInt(minValue, maxValue));
-
-	SimulationRNG::reset(1);
-	vector<size_t> samples3;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples3.push_back(SimulationRNG::uniformInt(minValue, maxValue));
-
-	SimulationRNG::reset(2);
-	vector<size_t> samples4;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples4.push_back(SimulationRNG::uniformInt(minValue, maxValue));
-
-	BOOST_TEST(samples1 != samples2);
-	BOOST_TEST(samples1 == samples3);
-	BOOST_TEST(samples1 != samples4);
-	BOOST_TEST(samples2 != samples3);
-	BOOST_TEST(samples2 != samples4);
-	BOOST_TEST(samples3 != samples4);
-}
-
-BOOST_AUTO_TEST_CASE(binomialInt_should_produce_samples_with_right_expected_value_and_variance)
-{
-	SimulationRNG::reset(1);
-	constexpr size_t numSamples = 1000;
-	constexpr uint32_t numTrials = 100;
-	constexpr double successProbability = 0.2;
-	constexpr double relativeTolerance = 0.05;
-
-	// For binomial distribution with n trials and success probability p: EX = np, VarX = np(1 - p)
-	constexpr double expectedValue = numTrials * successProbability;
-	constexpr double variance = numTrials * successProbability * (1 - successProbability);
-
-	vector<size_t> samples;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
-
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
-}
-
-BOOST_AUTO_TEST_CASE(binomialInt_can_be_reset)
-{
-	constexpr size_t numSamples = 10;
-	constexpr uint32_t numTrials = 10;
-	constexpr double successProbability = 0.6;
-
-	SimulationRNG::reset(1);
-	vector<size_t> samples1;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples1.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
-
-	vector<size_t> samples2;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples2.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
-
-	SimulationRNG::reset(1);
-	vector<size_t> samples3;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples3.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
-
-	SimulationRNG::reset(2);
-	vector<size_t> samples4;
-	for (uint32_t i = 0; i < numSamples; ++i)
-		samples4.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
-
-	BOOST_TEST(samples1 != samples2);
-	BOOST_TEST(samples1 == samples3);
-	BOOST_TEST(samples1 != samples4);
-	BOOST_TEST(samples2 != samples3);
-	BOOST_TEST(samples2 != samples4);
-	BOOST_TEST(samples3 != samples4);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/test/yulPhaser/TestHelpers.cpp b/test/yulPhaser/TestHelpers.cpp
deleted file mode 100644
index 50afd70a3eb3..000000000000
--- a/test/yulPhaser/TestHelpers.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <libyul/optimiser/Suite.h>
-
-#include <regex>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::phaser;
-using namespace solidity::phaser::test;
-
-function<Mutation> phaser::test::wholeChromosomeReplacement(Chromosome _newChromosome)
-{
-	return [_newChromosome = std::move(_newChromosome)](Chromosome const&) { return _newChromosome; };
-}
-
-function<Mutation> phaser::test::geneSubstitution(size_t _geneIndex, string _geneValue)
-{
-	return [=](Chromosome const& _chromosome)
-	{
-		vector<string> newGenes = _chromosome.optimisationSteps();
-		assert(_geneIndex < newGenes.size());
-		newGenes[_geneIndex] = _geneValue;
-
-		return Chromosome(newGenes);
-	};
-}
-
-vector<size_t> phaser::test::chromosomeLengths(Population const& _population)
-{
-	vector<size_t> lengths;
-	for (auto const& individual: _population.individuals())
-		lengths.push_back(individual.chromosome.length());
-
-	return lengths;
-}
-
-map<string, size_t> phaser::test::enumerateOptmisationSteps()
-{
-	map<string, size_t> stepIndices;
-	size_t i = 0;
-	for (auto const& nameAndAbbreviation: OptimiserSuite::stepNameToAbbreviationMap())
-		stepIndices.insert({nameAndAbbreviation.first, i++});
-
-	return stepIndices;
-}
-
-size_t phaser::test::countDifferences(Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-{
-	size_t count = 0;
-	for (size_t i = 0; i < min(_chromosome1.length(), _chromosome2.length()); ++i)
-		if (_chromosome1.optimisationSteps()[i] != _chromosome2.optimisationSteps()[i])
-			++count;
-
-	return count + static_cast<size_t>(abs(
-		static_cast<long>(_chromosome1.length()) -
-		static_cast<long>(_chromosome2.length())
-	));
-}
-
-string phaser::test::stripWhitespace(string const& input)
-{
-	regex whitespaceRegex("\\s+");
-	return regex_replace(input, whitespaceRegex, "");
-}
-
-size_t phaser::test::countSubstringOccurrences(string const& _inputString, string const& _substring)
-{
-	assert(_substring.size() > 0);
-
-	size_t count = 0;
-	size_t lastOccurrence = 0;
-	while ((lastOccurrence = _inputString.find(_substring, lastOccurrence)) != string::npos)
-	{
-		++count;
-		lastOccurrence += _substring.size();
-	}
-
-	return count;
-}
diff --git a/test/yulPhaser/TestHelpers.h b/test/yulPhaser/TestHelpers.h
deleted file mode 100644
index f9d0afa4cf59..000000000000
--- a/test/yulPhaser/TestHelpers.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Miscellaneous utilities for use in yul-phaser's test cases.
- *
- * - Generic code that's only used in these particular tests.
- * - Convenience functions and wrappers to make tests more concise.
- * - Mocks and dummy objects/functions used in multiple test suites.
- *
- * Note that the code included here may be not as generic, robust and/or complete as it could be
- * since it's not meant for production use. If some utility seems useful enough to be moved to
- * the normal code base, you should review its implementation before doing so.
- */
-
-#pragma once
-
-#include <tools/yulPhaser/Chromosome.h>
-#include <tools/yulPhaser/FitnessMetrics.h>
-#include <tools/yulPhaser/Mutations.h>
-#include <tools/yulPhaser/Population.h>
-
-#include <boost/test/tools/detail/print_helper.hpp>
-
-#include <cassert>
-#include <functional>
-#include <map>
-#include <string>
-#include <tuple>
-#include <vector>
-
-// OPERATORS FOR BOOST::TEST
-
-/// Output operator for arbitrary two-element tuples.
-/// Necessary to make BOOST_TEST() work with such tuples.
-template<typename T1, typename T2>
-std::ostream& operator<<(std::ostream& _output, std::tuple<T1, T2> const& _tuple)
-{
-	_output << "(" << std::get<0>(_tuple) << ", " << std::get<1>(_tuple) << ")";
-	return _output;
-}
-
-namespace boost::test_tools::tt_detail
-{
-
-// Boost won't find the << operator unless we put it in the std namespace which is illegal.
-// The recommended solution is to overload print_log_value<> struct and make it use our global operator.
-template<typename T1,typename T2>
-struct print_log_value<std::tuple<T1, T2>>
-{
-	void operator()(std::ostream& _output, std::tuple<T1, T2> const& _tuple) { ::operator<<(_output, _tuple); }
-};
-
-}
-
-namespace solidity::phaser::test
-{
-
-/**
- * Fitness metric that only takes into account the number of optimisation steps in the chromosome.
- * Recommended for use in tests because it's much faster than ProgramSize metric and it's very
- * easy to guess the result at a glance.
- */
-class ChromosomeLengthMetric: public FitnessMetric
-{
-public:
-	using FitnessMetric::FitnessMetric;
-	size_t evaluate(Chromosome const& _chromosome) override { return _chromosome.length(); }
-};
-
-// MUTATIONS
-
-/// Mutation that always replaces the whole chromosome with the one specified in the parameter.
-std::function<Mutation> wholeChromosomeReplacement(Chromosome _newChromosome);
-
-/// Mutation that always replaces the optimisation step at position @a _geneIndex with @a _geneValue.
-///
-/// The chromosome must be long enough for this position to exist.
-std::function<Mutation> geneSubstitution(size_t _geneIndex, std::string _geneValue);
-
-// CHROMOSOME AND POPULATION HELPERS
-
-/// Returns a vector containing lengths of all chromosomes in the population (in the same order).
-std::vector<size_t> chromosomeLengths(Population const& _population);
-
-/// Returns the number of genes that differ between two chromosomes.
-/// If the chromnosomes have different lengths, the positions that are present in only one of them
-/// are counted as mismatches.
-size_t countDifferences(Chromosome const& _chromosome1, Chromosome const& _chromosome2);
-
-/// Assigns indices from 0 to N to all optimisation steps available in the OptimiserSuite.
-/// This is a convenience helper to make it easier to test their distribution with tools made for
-/// integers.
-std::map<std::string, size_t> enumerateOptmisationSteps();
-
-// STRING UTILITIES
-
-/// Returns the input string with all the whitespace characters (spaces, line endings, etc.) removed.
-std::string stripWhitespace(std::string const& input);
-
-/// Counts the number of times one strinng can be found inside another. Only non-overlapping
-/// occurrences are counted.
-size_t countSubstringOccurrences(std::string const& _inputString, std::string const& _substring);
-
-// STATISTICAL UTILITIES
-
-/// Calculates the mean value of a series of samples given in a vector.
-///
-/// Supports any integer and real type as a convenience but the precision of the result is limited
-/// to the precision of type @a double as all the values are internally converted to it.
-///
-/// This is a very simple, naive implementation that's more than enough for tests where we usually
-/// deal with relatively short sequences of small, positive integers. It's not numerically stable
-/// in more complicated cases. Don't use in production.
-template <typename T>
-double mean(std::vector<T> const& _samples)
-{
-	assert(_samples.size() > 0);
-
-	double sum = 0;
-	for (T const& sample: _samples)
-		sum += double(sample);
-
-	return sum / double(_samples.size());
-}
-
-/// Calculates the sum of squared differences between @a _expectedValue and the values of a series
-/// of samples given in a vector.
-///
-/// Supports any integer and real type as a convenience but the precision of the result is limited
-/// to the precision of type @a double as all the values are internally converted to it.
-///
-/// This is a very simple, naive implementation that's more than enough for tests where we usually
-/// deal with relatively short sequences of small, positive integers. It's not numerically stable
-/// in more complicated cases. Don't use in production.
-template <typename T>
-double meanSquaredError(std::vector<T> const& _samples, double _expectedValue)
-{
-	assert(_samples.size() > 0);
-
-	double sumOfSquaredDifferences = 0;
-	for (T const& sample: _samples)
-		sumOfSquaredDifferences += (double(sample) - _expectedValue) * (double(sample) - _expectedValue);
-
-	return sumOfSquaredDifferences / double(_samples.size());
-}
-
-}
diff --git a/test/yulPhaser/TestHelpersTest.cpp b/test/yulPhaser/TestHelpersTest.cpp
deleted file mode 100644
index 89b98ecad7aa..000000000000
--- a/test/yulPhaser/TestHelpersTest.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <test/yulPhaser/TestHelpers.h>
-
-#include <libyul/optimiser/Suite.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <set>
-
-using namespace std;
-using namespace solidity::yul;
-using namespace boost::test_tools;
-
-namespace solidity::phaser::test
-{
-
-BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
-BOOST_AUTO_TEST_SUITE(TestHelpersTest)
-
-BOOST_AUTO_TEST_CASE(ChromosomeLengthMetric_evaluate_should_return_chromosome_length)
-{
-	BOOST_TEST(ChromosomeLengthMetric{}.evaluate(Chromosome()) == 0);
-	BOOST_TEST(ChromosomeLengthMetric{}.evaluate(Chromosome("a")) == 1);
-	BOOST_TEST(ChromosomeLengthMetric{}.evaluate(Chromosome("aaaaa")) == 5);
-}
-
-BOOST_AUTO_TEST_CASE(wholeChromosomeReplacement_should_replace_whole_chromosome_with_another)
-{
-	function<Mutation> mutation = wholeChromosomeReplacement(Chromosome("aaa"));
-	BOOST_TEST(mutation(Chromosome("ccc")) == Chromosome("aaa"));
-}
-
-BOOST_AUTO_TEST_CASE(geneSubstitution_should_change_a_single_gene_at_a_given_index)
-{
-	Chromosome chromosome("aaccff");
-
-	function<Mutation> mutation1 = geneSubstitution(0, chromosome.optimisationSteps()[5]);
-	BOOST_TEST(mutation1(chromosome) == Chromosome("faccff"));
-
-	function<Mutation> mutation2 = geneSubstitution(5, chromosome.optimisationSteps()[0]);
-	BOOST_TEST(mutation2(chromosome) == Chromosome("aaccfa"));
-}
-
-BOOST_AUTO_TEST_CASE(chromosomeLengths_should_return_lengths_of_all_chromosomes_in_a_population)
-{
-	shared_ptr<FitnessMetric> fitnessMetric = make_shared<ChromosomeLengthMetric>();
-
-	Population population1(fitnessMetric, {Chromosome(), Chromosome("a"), Chromosome("aa"), Chromosome("aaa")});
-	BOOST_TEST((chromosomeLengths(population1) == vector<size_t>{0, 1, 2, 3}));
-
-	Population population2(fitnessMetric);
-	BOOST_TEST((chromosomeLengths(population2) == vector<size_t>{}));
-}
-
-BOOST_AUTO_TEST_CASE(countDifferences_should_return_zero_for_identical_chromosomes)
-{
-	BOOST_TEST(countDifferences(Chromosome(), Chromosome()) == 0);
-	BOOST_TEST(countDifferences(Chromosome("a"), Chromosome("a")) == 0);
-	BOOST_TEST(countDifferences(Chromosome("afxT"), Chromosome("afxT")) == 0);
-}
-
-BOOST_AUTO_TEST_CASE(countDifferences_should_count_mismatched_positions_in_chromosomes_of_the_same_length)
-{
-	BOOST_TEST(countDifferences(Chromosome("a"), Chromosome("f")) == 1);
-	BOOST_TEST(countDifferences(Chromosome("aa"), Chromosome("ac")) == 1);
-	BOOST_TEST(countDifferences(Chromosome("ac"), Chromosome("cc")) == 1);
-	BOOST_TEST(countDifferences(Chromosome("aa"), Chromosome("cc")) == 2);
-	BOOST_TEST(countDifferences(Chromosome("afxT"), Chromosome("Txfa")) == 4);
-}
-
-BOOST_AUTO_TEST_CASE(countDifferences_should_count_missing_characters_as_differences)
-{
-	BOOST_TEST(countDifferences(Chromosome(""), Chromosome("a")) == 1);
-	BOOST_TEST(countDifferences(Chromosome("a"), Chromosome("")) == 1);
-	BOOST_TEST(countDifferences(Chromosome("aa"), Chromosome("")) == 2);
-	BOOST_TEST(countDifferences(Chromosome("aaa"), Chromosome("")) == 3);
-
-	BOOST_TEST(countDifferences(Chromosome("aa"), Chromosome("aaaa")) == 2);
-	BOOST_TEST(countDifferences(Chromosome("aa"), Chromosome("aacc")) == 2);
-	BOOST_TEST(countDifferences(Chromosome("aa"), Chromosome("cccc")) == 4);
-}
-
-BOOST_AUTO_TEST_CASE(enumerateOptimisationSteps_should_assing_indices_to_all_available_optimisation_steps)
-{
-	map<string, char> stepsAndAbbreviations = OptimiserSuite::stepNameToAbbreviationMap();
-	map<string, size_t> stepsAndIndices = enumerateOptmisationSteps();
-	BOOST_TEST(stepsAndIndices.size() == stepsAndAbbreviations.size());
-
-	set<string> stepsSoFar;
-	for (auto& [name, index]: stepsAndIndices)
-	{
-		BOOST_TEST(index >= 0);
-		BOOST_TEST(index <= stepsAndAbbreviations.size());
-		BOOST_TEST(stepsAndAbbreviations.count(name) == 1);
-		BOOST_TEST(stepsSoFar.count(name) == 0);
-
-		stepsSoFar.insert(name);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(stripWhitespace_should_remove_all_whitespace_characters_from_a_string)
-{
-	BOOST_TEST(stripWhitespace("") == "");
-	BOOST_TEST(stripWhitespace(" ") == "");
-	BOOST_TEST(stripWhitespace(" \n\t\v ") == "");
-
-	BOOST_TEST(stripWhitespace("abc") == "abc");
-	BOOST_TEST(stripWhitespace(" abc") == "abc");
-	BOOST_TEST(stripWhitespace("abc ") == "abc");
-	BOOST_TEST(stripWhitespace(" a b c ") == "abc");
-	BOOST_TEST(stripWhitespace(" a b\tc\n") == "abc");
-	BOOST_TEST(stripWhitespace("   a   b \n\n  c \n\t\v") == "abc");
-}
-
-BOOST_AUTO_TEST_CASE(countSubstringOccurrences_should_count_non_overlapping_substring_occurrences_in_a_string)
-{
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "a") == 6);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "aa") == 2);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "aaa") == 2);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "aaab") == 1);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "b") == 2);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "d") == 1);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "cdc") == 1);
-
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "x") == 0);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "aaaa") == 0);
-	BOOST_TEST(countSubstringOccurrences("aaabcdcbaaa", "dcd") == 0);
-
-	BOOST_TEST(countSubstringOccurrences("", "a") == 0);
-	BOOST_TEST(countSubstringOccurrences("", "aa") == 0);
-	BOOST_TEST(countSubstringOccurrences("a", "aa") == 0);
-}
-
-BOOST_AUTO_TEST_CASE(mean_should_calculate_statistical_mean)
-{
-	BOOST_TEST(mean<int>({0}) == 0.0);
-	BOOST_TEST(mean<int>({0, 0, 0, 0}) == 0.0);
-	BOOST_TEST(mean<int>({5, 5, 5, 5}) == 5.0);
-	BOOST_TEST(mean<int>({0, 1, 2, 3}) == 1.5);
-	BOOST_TEST(mean<int>({-4, -3, -2, -1, 0, 1, 2, 3}) == -0.5);
-
-	BOOST_TEST(mean<double>({1.3, 1.1, 0.0, 1.5, 1.1, 2.0, 1.5, 1.5}) == 1.25);
-}
-
-BOOST_AUTO_TEST_CASE(meanSquaredError_should_calculate_average_squared_difference_between_samples_and_expected_value)
-{
-	BOOST_TEST(meanSquaredError<int>({0}, 0.0) == 0.0);
-	BOOST_TEST(meanSquaredError<int>({0}, 1.0) == 1.0);
-	BOOST_TEST(meanSquaredError<int>({0, 0, 0, 0}, 0.0) == 0.0);
-	BOOST_TEST(meanSquaredError<int>({0, 0, 0, 0}, 1.0) == 1.0);
-	BOOST_TEST(meanSquaredError<int>({0, 0, 0, 0}, 2.0) == 4.0);
-	BOOST_TEST(meanSquaredError<int>({5, 5, 5, 5}, 1.0) == 16.0);
-	BOOST_TEST(meanSquaredError<int>({0, 1, 2, 3}, 2.0) == 1.5);
-	BOOST_TEST(meanSquaredError<int>({-4, -3, -2, -1, 0, 1, 2, 3}, -4.0) == 17.5);
-
-	BOOST_TEST(meanSquaredError<double>({1.3, 1.1, 0.0, 1.5, 1.1, 2.0, 1.5, 1.5}, 1.0) == 0.3575, tolerance(0.0001));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-
-}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
deleted file mode 100644
index c67a509e1b73..000000000000
--- a/tools/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-include(GNUInstallDirs)
-
-set(libphaser_sources
-	yulPhaser/Common.h
-	yulPhaser/Common.cpp
-	yulPhaser/AlgorithmRunner.h
-	yulPhaser/AlgorithmRunner.cpp
-	yulPhaser/Phaser.h
-	yulPhaser/Phaser.cpp
-	yulPhaser/GeneticAlgorithms.h
-	yulPhaser/GeneticAlgorithms.cpp
-	yulPhaser/Population.h
-	yulPhaser/Population.cpp
-	yulPhaser/FitnessMetrics.h
-	yulPhaser/FitnessMetrics.cpp
-	yulPhaser/Chromosome.h
-	yulPhaser/Chromosome.cpp
-	yulPhaser/Mutations.h
-	yulPhaser/Mutations.cpp
-	yulPhaser/PairSelections.h
-	yulPhaser/PairSelections.cpp
-	yulPhaser/Selections.h
-	yulPhaser/Selections.cpp
-	yulPhaser/ProgramCache.h
-	yulPhaser/ProgramCache.cpp
-	yulPhaser/Program.h
-	yulPhaser/Program.cpp
-	yulPhaser/SimulationRNG.h
-	yulPhaser/SimulationRNG.cpp
-)
-add_library(phaser ${libphaser_sources})
-target_link_libraries(phaser PUBLIC solidity Boost::boost Boost::program_options)
-
-add_executable(yul-phaser yulPhaser/main.cpp)
-target_link_libraries(yul-phaser PRIVATE phaser)
-
-install(TARGETS yul-phaser DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/tools/yulPhaser/AlgorithmRunner.cpp b/tools/yulPhaser/AlgorithmRunner.cpp
deleted file mode 100644
index d5ad75575c54..000000000000
--- a/tools/yulPhaser/AlgorithmRunner.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/AlgorithmRunner.h>
-
-#include <tools/yulPhaser/Exceptions.h>
-
-#include <libsolutil/Assertions.h>
-
-#include <cerrno>
-#include <cstring>
-#include <fstream>
-
-using namespace std;
-using namespace solidity::phaser;
-
-void AlgorithmRunner::run(GeneticAlgorithm& _algorithm)
-{
-	populationAutosave();
-	printInitialPopulation();
-	cacheClear();
-
-	clock_t totalTimeStart = clock();
-	for (size_t round = 0; !m_options.maxRounds.has_value() || round < m_options.maxRounds.value(); ++round)
-	{
-		clock_t roundTimeStart = clock();
-		cacheStartRound(round + 1);
-
-		m_population = _algorithm.runNextRound(m_population);
-		randomiseDuplicates();
-
-		printRoundSummary(round, roundTimeStart, totalTimeStart);
-		printCacheStats();
-		populationAutosave();
-	}
-}
-
-void AlgorithmRunner::printRoundSummary(
-	size_t _round,
-	clock_t _roundTimeStart,
-	clock_t _totalTimeStart
-) const
-{
-	clock_t now = clock();
-	double roundTime = static_cast<double>(now - _roundTimeStart) / CLOCKS_PER_SEC;
-	double totalTime = static_cast<double>(now - _totalTimeStart) / CLOCKS_PER_SEC;
-
-	if (!m_options.showOnlyTopChromosome)
-	{
-		if (m_options.showRoundInfo)
-		{
-			m_outputStream << "---------- ROUND " << _round + 1;
-			m_outputStream << " [round: " << fixed << setprecision(1) << roundTime << " s,";
-			m_outputStream << " total: " << fixed << setprecision(1) << totalTime << " s]";
-			m_outputStream << " ----------" << endl;
-		}
-		else if (m_population.individuals().size() > 0)
-			m_outputStream << endl;
-
-		m_outputStream << m_population;
-	}
-	else if (m_population.individuals().size() > 0)
-	{
-		if (m_options.showRoundInfo)
-		{
-			m_outputStream << setw(5) << _round + 1 << " | ";
-			m_outputStream << setw(5) << fixed << setprecision(1) << totalTime << " | ";
-		}
-
-		m_outputStream << m_population.individuals()[0] << endl;
-	}
-}
-
-void AlgorithmRunner::printInitialPopulation() const
-{
-	if (!m_options.showInitialPopulation)
-		return;
-
-	m_outputStream << "---------- INITIAL POPULATION ----------" << endl;
-	m_outputStream << m_population;
-}
-
-void AlgorithmRunner::printCacheStats() const
-{
-	if (!m_options.showCacheStats)
-		return;
-
-	CacheStats totalStats{};
-	size_t disabledCacheCount = 0;
-	for (size_t i = 0; i < m_programCaches.size(); ++i)
-		if (m_programCaches[i] != nullptr)
-			totalStats += m_programCaches[i]->gatherStats();
-		else
-			++disabledCacheCount;
-
-	m_outputStream << "---------- CACHE STATS ----------" << endl;
-
-	if (disabledCacheCount < m_programCaches.size())
-	{
-		for (auto& [round, count]: totalStats.roundEntryCounts)
-			m_outputStream << "Round " << round << ": " << count << " entries" << endl;
-		m_outputStream << "Total hits: " << totalStats.hits << endl;
-		m_outputStream << "Total misses: " << totalStats.misses << endl;
-		m_outputStream << "Size of cached code: " << totalStats.totalCodeSize << endl;
-	}
-
-	if (disabledCacheCount == m_programCaches.size())
-		m_outputStream << "Program cache disabled" << endl;
-	else if (disabledCacheCount > 0)
-	{
-		m_outputStream << "Program cache disabled for " << disabledCacheCount << " out of ";
-		m_outputStream << m_programCaches.size() << " programs" << endl;
-	}
-}
-
-void AlgorithmRunner::populationAutosave() const
-{
-	if (!m_options.populationAutosaveFile.has_value())
-		return;
-
-	ofstream outputStream(m_options.populationAutosaveFile.value(), ios::out | ios::trunc);
-	assertThrow(
-		outputStream.is_open(),
-		FileOpenError,
-		"Could not open file '" + m_options.populationAutosaveFile.value() + "': " + strerror(errno)
-	);
-
-	for (auto& individual: m_population.individuals())
-		outputStream << individual.chromosome << endl;
-
-	assertThrow(
-		!outputStream.bad(),
-		FileWriteError,
-		"Error while writing to file '" + m_options.populationAutosaveFile.value() + "': " + strerror(errno)
-	);
-}
-
-void AlgorithmRunner::cacheClear()
-{
-	for (auto& cache: m_programCaches)
-		if (cache != nullptr)
-			cache->clear();
-}
-
-void AlgorithmRunner::cacheStartRound(size_t _roundNumber)
-{
-	for (auto& cache: m_programCaches)
-		if (cache != nullptr)
-			cache->startRound(_roundNumber);
-}
-
-void AlgorithmRunner::randomiseDuplicates()
-{
-	if (m_options.randomiseDuplicates)
-	{
-		assert(m_options.minChromosomeLength.has_value());
-		assert(m_options.maxChromosomeLength.has_value());
-
-		m_population = randomiseDuplicates(
-			m_population,
-			m_options.minChromosomeLength.value(),
-			m_options.maxChromosomeLength.value()
-		);
-	}
-}
-
-Population AlgorithmRunner::randomiseDuplicates(
-	Population _population,
-	size_t _minChromosomeLength,
-	size_t _maxChromosomeLength
-)
-{
-	if (_population.individuals().size() == 0)
-		return _population;
-
-	vector<Individual> individuals{_population.individuals()[0]};
-	size_t duplicateCount = 0;
-	for (size_t i = 1; i < _population.individuals().size(); ++i)
-		if (_population.individuals()[i].chromosome == _population.individuals()[i - 1].chromosome)
-			++duplicateCount;
-		else
-			individuals.push_back(_population.individuals()[i]);
-
-	return (
-		Population(_population.fitnessMetric(), individuals) +
-		Population::makeRandom(_population.fitnessMetric(), duplicateCount, _minChromosomeLength, _maxChromosomeLength)
-	);
-}
diff --git a/tools/yulPhaser/AlgorithmRunner.h b/tools/yulPhaser/AlgorithmRunner.h
deleted file mode 100644
index 6e3804a1af5a..000000000000
--- a/tools/yulPhaser/AlgorithmRunner.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Contains the implementation of a class that manages the execution of a genetic algorithm.
- */
-
-#pragma once
-
-#include <tools/yulPhaser/GeneticAlgorithms.h>
-#include <tools/yulPhaser/Population.h>
-#include <tools/yulPhaser/ProgramCache.h>
-
-#include <cstddef>
-#include <ctime>
-#include <optional>
-#include <ostream>
-
-namespace solidity::phaser
-{
-
-/**
- * Manages a population and executes a genetic algorithm on it. It's independent of the
- * implementation details of a specific algorithm which is pluggable via @a GeneticAlgorithm class.
- *
- * The class is also responsible for providing text feedback on the execution of the algorithm
- * to the associated output stream.
- */
-class AlgorithmRunner
-{
-public:
-	struct Options
-	{
-		std::optional<size_t> maxRounds = std::nullopt;
-		std::optional<std::string> populationAutosaveFile = std::nullopt;
-		bool randomiseDuplicates = false;
-		std::optional<size_t> minChromosomeLength = std::nullopt;
-		std::optional<size_t> maxChromosomeLength = std::nullopt;
-		bool showInitialPopulation = false;
-		bool showOnlyTopChromosome = false;
-		bool showRoundInfo = true;
-		bool showCacheStats = false;
-	};
-
-	AlgorithmRunner(
-		Population _initialPopulation,
-		std::vector<std::shared_ptr<ProgramCache>> _programCaches,
-		Options _options,
-		std::ostream& _outputStream
-	):
-		m_population(std::move(_initialPopulation)),
-		m_programCaches(std::move(_programCaches)),
-		m_options(std::move(_options)),
-		m_outputStream(_outputStream) {}
-
-	void run(GeneticAlgorithm& _algorithm);
-
-	Options const& options() const { return m_options; }
-	Population const& population() const { return m_population; }
-
-private:
-	void printRoundSummary(
-		size_t _round,
-		clock_t _roundTimeStart,
-		clock_t _totalTimeStart
-	) const;
-	void printInitialPopulation() const;
-	void printCacheStats() const;
-	void populationAutosave() const;
-	void randomiseDuplicates();
-	void cacheClear();
-	void cacheStartRound(size_t _roundNumber);
-
-	static Population randomiseDuplicates(
-		Population _population,
-		size_t _minChromosomeLength,
-		size_t _maxChromosomeLength
-	);
-
-	Population m_population;
-	std::vector<std::shared_ptr<ProgramCache>> m_programCaches;
-	Options m_options;
-	std::ostream& m_outputStream;
-};
-
-}
diff --git a/tools/yulPhaser/Chromosome.cpp b/tools/yulPhaser/Chromosome.cpp
deleted file mode 100644
index 6e8d3544e136..000000000000
--- a/tools/yulPhaser/Chromosome.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Chromosome.h>
-
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <libyul/optimiser/Suite.h>
-#include <libsolutil/CommonData.h>
-
-#include <sstream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::phaser;
-
-namespace solidity::phaser
-{
-
-ostream& operator<<(ostream& _stream, Chromosome const& _chromosome);
-
-}
-
-Chromosome Chromosome::makeRandom(size_t _length)
-{
-	vector<string> steps;
-	for (size_t i = 0; i < _length; ++i)
-		steps.push_back(randomOptimisationStep());
-
-	return Chromosome(std::move(steps));
-}
-
-ostream& phaser::operator<<(ostream& _stream, Chromosome const& _chromosome)
-{
-	return _stream << _chromosome.m_genes;
-}
-
-vector<string> Chromosome::allStepNames()
-{
-	vector<string> stepNames;
-	for (auto const& step: OptimiserSuite::allSteps())
-		stepNames.push_back(step.first);
-
-	return stepNames;
-}
-
-string const& Chromosome::randomOptimisationStep()
-{
-	static vector<string> stepNames = allStepNames();
-
-	return stepNames[SimulationRNG::uniformInt(0, stepNames.size() - 1)];
-}
-
-char Chromosome::randomGene()
-{
-	return OptimiserSuite::stepNameToAbbreviationMap().at(randomOptimisationStep());
-}
-
-string Chromosome::stepsToGenes(vector<string> const& _optimisationSteps)
-{
-	string genes;
-	for (string const& stepName: _optimisationSteps)
-		genes.push_back(OptimiserSuite::stepNameToAbbreviationMap().at(stepName));
-
-	return genes;
-}
-
-vector<string> Chromosome::genesToSteps(string const& _genes)
-{
-	vector<string> steps;
-	for (char abbreviation: _genes)
-		steps.push_back(OptimiserSuite::stepAbbreviationToNameMap().at(abbreviation));
-
-	return steps;
-}
diff --git a/tools/yulPhaser/Chromosome.h b/tools/yulPhaser/Chromosome.h
deleted file mode 100644
index 7dd0a32d953d..000000000000
--- a/tools/yulPhaser/Chromosome.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <cstddef>
-#include <map>
-#include <ostream>
-#include <string>
-#include <vector>
-
-namespace solidity::phaser
-{
-
-/**
- * An object that represents a sequence of optimiser steps that can be applied to a program.
- * Such sequences are used in our genetic algorithm to represent individual members of the
- * population.
- *
- * To calculate the fitness of an individual one must apply its sequence to a specific program.
- * This class does not provide any means to do so. It just stores information.
- *
- * Once created a sequence cannot be changed. The only way to mutate it is to generate a new
- * chromosome based on the old one.
- */
-class Chromosome
-{
-public:
-	Chromosome() = default;
-	explicit Chromosome(std::vector<std::string> _optimisationSteps):
-		m_genes(stepsToGenes(_optimisationSteps)) {}
-	explicit Chromosome(std::string _genes):
-		// NOTE: We don't validate the genes - they're only checked at the point of conversion to
-		// actual optimisation steps names. This is very convenient in mutation tests.
-		m_genes(std::move(_genes)) {}
-	static Chromosome makeRandom(size_t _length);
-
-	size_t length() const { return m_genes.size(); }
-	std::string const& genes() const { return m_genes; }
-
-	std::vector<std::string> optimisationSteps() const { return genesToSteps(m_genes); }
-
-	friend std::ostream& operator<<(std::ostream& _stream, Chromosome const& _chromosome);
-
-	bool operator==(Chromosome const& _other) const { return m_genes == _other.m_genes; }
-	bool operator!=(Chromosome const& _other) const { return !(*this == _other); }
-
-	static std::string const& randomOptimisationStep();
-	static char randomGene();
-	static std::string stepsToGenes(std::vector<std::string> const& _optimisationSteps);
-	static std::vector<std::string> genesToSteps(std::string const& _genes);
-
-private:
-	static std::vector<std::string> allStepNames();
-
-	std::string m_genes;
-};
-
-}
diff --git a/tools/yulPhaser/Common.cpp b/tools/yulPhaser/Common.cpp
deleted file mode 100644
index a23210172d49..000000000000
--- a/tools/yulPhaser/Common.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Common.h>
-
-#include <tools/yulPhaser/Exceptions.h>
-
-#include <libsolutil/Assertions.h>
-
-#include <cerrno>
-#include <cstring>
-#include <fstream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::phaser;
-
-vector<string> phaser::readLinesFromFile(string const& _path)
-{
-	ifstream inputStream(_path);
-	assertThrow(inputStream.is_open(), FileOpenError, "Could not open file '" + _path + "': " + strerror(errno));
-
-	string line;
-	vector<string> lines;
-	while (!getline(inputStream, line).fail())
-		lines.push_back(line);
-
-	assertThrow(!inputStream.bad(), FileReadError, "Error while reading from file '" + _path + "': " + strerror(errno));
-
-	return lines;
-}
diff --git a/tools/yulPhaser/Common.h b/tools/yulPhaser/Common.h
deleted file mode 100644
index b2164cc9ee3d..000000000000
--- a/tools/yulPhaser/Common.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Miscellaneous utilities for use in yul-phaser.
- */
-
-#pragma once
-
-#include <iostream>
-#include <map>
-#include <string>
-#include <vector>
-
-namespace solidity::phaser
-{
-
-/// Loads the whole file into memory, splits the content into lines, strips newlines and
-/// returns the result as a list of strings.
-///
-/// Throws FileOpenError if the file does not exist or cannot be opened for reading.
-/// Throws FileReadError if any read operation fails during the whole process.
-std::vector<std::string> readLinesFromFile(std::string const& _path);
-
-/// Reads a token from the input stream and translates it to a string using a map.
-/// Sets the failbit in the stream if there's no matching value in the map.
-template <typename C>
-std::istream& deserializeChoice(
-	std::istream& _inputStream,
-	C& _choice,
-	std::map<std::string, C> const& _stringToValueMap
-)
-{
-	std::string deserializedValue;
-	_inputStream >> deserializedValue;
-
-	auto const& pair = _stringToValueMap.find(deserializedValue);
-	if (pair != _stringToValueMap.end())
-		_choice = pair->second;
-	else
-		_inputStream.setstate(std::ios_base::failbit);
-
-	return _inputStream;
-}
-
-/// Translates a value to a string using a map and prints it to the output stream.
-/// Sets the failbit if the value is not in the map.
-template <typename C>
-std::ostream& serializeChoice(
-	std::ostream& _outputStream,
-	C const& _choice,
-	std::map<C, std::string> const& _valueToStringMap
-)
-{
-	auto const& pair = _valueToStringMap.find(_choice);
-	if (pair != _valueToStringMap.end())
-		_outputStream << pair->second;
-	else
-		_outputStream.setstate(std::ios_base::failbit);
-
-	return _outputStream;
-}
-
-}
diff --git a/tools/yulPhaser/Exceptions.h b/tools/yulPhaser/Exceptions.h
deleted file mode 100644
index e4aa19b52736..000000000000
--- a/tools/yulPhaser/Exceptions.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libsolutil/Exceptions.h>
-
-namespace solidity::phaser
-{
-
-struct BadInput: virtual util::Exception {};
-struct InvalidProgram: virtual BadInput {};
-struct NoInputFiles: virtual BadInput {};
-struct MissingFile: virtual BadInput {};
-
-struct FileOpenError: virtual util::Exception {};
-struct FileReadError: virtual util::Exception {};
-struct FileWriteError: virtual util::Exception {};
-
-}
diff --git a/tools/yulPhaser/FitnessMetrics.cpp b/tools/yulPhaser/FitnessMetrics.cpp
deleted file mode 100644
index e0b719e25555..000000000000
--- a/tools/yulPhaser/FitnessMetrics.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/FitnessMetrics.h>
-
-#include <libsolutil/CommonIO.h>
-
-#include <cmath>
-
-using namespace std;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace solidity::phaser;
-
-Program const& ProgramBasedMetric::program() const
-{
-	if (m_programCache == nullptr)
-		return m_program.value();
-	else
-		return m_programCache->program();
-}
-
-Program ProgramBasedMetric::optimisedProgram(Chromosome const& _chromosome)
-{
-	if (m_programCache == nullptr)
-		return optimisedProgramNoCache(_chromosome);
-
-	return m_programCache->optimiseProgram(
-		toString(_chromosome),
-		m_repetitionCount
-	);
-}
-
-Program ProgramBasedMetric::optimisedProgramNoCache(Chromosome const& _chromosome) const
-{
-	Program programCopy = program();
-	for (size_t i = 0; i < m_repetitionCount; ++i)
-		programCopy.optimise(_chromosome.optimisationSteps());
-
-	return programCopy;
-}
-
-size_t ProgramSize::evaluate(Chromosome const& _chromosome)
-{
-	return optimisedProgram(_chromosome).codeSize(codeWeights());
-}
-
-size_t RelativeProgramSize::evaluate(Chromosome const& _chromosome)
-{
-	double const scalingFactor = pow(10, m_fixedPointPrecision);
-
-	size_t unoptimisedSize = optimisedProgram(Chromosome("")).codeSize(codeWeights());
-	if (unoptimisedSize == 0)
-		return static_cast<size_t>(scalingFactor);
-
-	size_t optimisedSize = optimisedProgram(_chromosome).codeSize(codeWeights());
-
-	return static_cast<size_t>(round(
-		double(optimisedSize) / double(unoptimisedSize) * scalingFactor
-	));
-}
-
-size_t FitnessMetricAverage::evaluate(Chromosome const& _chromosome)
-{
-	assert(m_metrics.size() > 0);
-
-	size_t total = m_metrics[0]->evaluate(_chromosome);
-	for (size_t i = 1; i < m_metrics.size(); ++i)
-		total += m_metrics[i]->evaluate(_chromosome);
-
-	return total / m_metrics.size();
-}
-
-size_t FitnessMetricSum::evaluate(Chromosome const& _chromosome)
-{
-	assert(m_metrics.size() > 0);
-
-	size_t total = m_metrics[0]->evaluate(_chromosome);
-	for (size_t i = 1; i < m_metrics.size(); ++i)
-		total += m_metrics[i]->evaluate(_chromosome);
-
-	return total;
-}
-
-size_t FitnessMetricMaximum::evaluate(Chromosome const& _chromosome)
-{
-	assert(m_metrics.size() > 0);
-
-	size_t maximum = m_metrics[0]->evaluate(_chromosome);
-	for (size_t i = 1; i < m_metrics.size(); ++i)
-		maximum = max(maximum, m_metrics[i]->evaluate(_chromosome));
-
-	return maximum;
-}
-
-size_t FitnessMetricMinimum::evaluate(Chromosome const& _chromosome)
-{
-	assert(m_metrics.size() > 0);
-
-	size_t minimum = m_metrics[0]->evaluate(_chromosome);
-	for (size_t i = 1; i < m_metrics.size(); ++i)
-		minimum = min(minimum, m_metrics[i]->evaluate(_chromosome));
-
-	return minimum;
-}
diff --git a/tools/yulPhaser/FitnessMetrics.h b/tools/yulPhaser/FitnessMetrics.h
deleted file mode 100644
index f881df7a583a..000000000000
--- a/tools/yulPhaser/FitnessMetrics.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Contains an abstract base class representing a fitness metric and its concrete implementations.
- */
-
-#pragma once
-
-#include <tools/yulPhaser/Chromosome.h>
-#include <tools/yulPhaser/Program.h>
-#include <tools/yulPhaser/ProgramCache.h>
-
-#include <libyul/optimiser/Metrics.h>
-
-#include <cstddef>
-#include <optional>
-
-namespace solidity::phaser
-{
-
-/**
- * Abstract base class for fitness metrics.
- *
- * The main feature is the @a evaluate() method that can tell how good a given chromosome is.
- * The lower the value, the better the fitness is. The result should be deterministic and depend
- * only on the chromosome and metric's state (which is constant).
- */
-class FitnessMetric
-{
-public:
-	FitnessMetric() = default;
-	FitnessMetric(FitnessMetric const&) = delete;
-	FitnessMetric& operator=(FitnessMetric const&) = delete;
-	virtual ~FitnessMetric() = default;
-
-	virtual size_t evaluate(Chromosome const& _chromosome) = 0;
-};
-
-/**
- * Abstract base class for fitness metrics that return values based on program size.
- *
- * The class provides utilities for optimising programs according to the information stored in
- * chromosomes. Allows using @a ProgramCache.
- *
- * It can also store weights for the @a CodeSize metric. It does not do anything with
- * them because it does not actually compute the code size but they are readily available for use
- * by derived classes.
- */
-class ProgramBasedMetric: public FitnessMetric
-{
-public:
-	explicit ProgramBasedMetric(
-		std::optional<Program> _program,
-		std::shared_ptr<ProgramCache> _programCache,
-		yul::CodeWeights const& _codeWeights,
-		size_t _repetitionCount = 1
-	):
-		m_program(std::move(_program)),
-		m_programCache(std::move(_programCache)),
-		m_codeWeights(_codeWeights),
-		m_repetitionCount(_repetitionCount)
-	{
-		assert(m_program.has_value() == (m_programCache == nullptr));
-	}
-
-	Program const& program() const;
-	ProgramCache const* programCache() const { return m_programCache.get(); }
-	yul::CodeWeights const& codeWeights() const { return m_codeWeights; }
-	size_t repetitionCount() const { return m_repetitionCount; }
-
-	Program optimisedProgram(Chromosome const& _chromosome);
-	Program optimisedProgramNoCache(Chromosome const& _chromosome) const;
-
-private:
-	std::optional<Program> m_program;
-	std::shared_ptr<ProgramCache> m_programCache;
-	yul::CodeWeights m_codeWeights;
-	size_t m_repetitionCount;
-};
-
-/**
- * Fitness metric based on the size of a specific program after applying the optimisations from the
- * chromosome to it.
- */
-class ProgramSize: public ProgramBasedMetric
-{
-public:
-	using ProgramBasedMetric::ProgramBasedMetric;
-	size_t evaluate(Chromosome const& _chromosome) override;
-};
-
-/**
- * Fitness metric based on the size of a specific program after applying the optimisations from the
- * chromosome to it in relation to the original, unoptimised program.
- *
- * Since metric values are integers, the class multiplies the ratio by 10^@a _fixedPointPrecision
- * before rounding it.
- */
-class RelativeProgramSize: public ProgramBasedMetric
-{
-public:
-	explicit RelativeProgramSize(
-		std::optional<Program> _program,
-		std::shared_ptr<ProgramCache> _programCache,
-		size_t _fixedPointPrecision,
-		yul::CodeWeights const& _weights,
-		size_t _repetitionCount = 1
-	):
-		ProgramBasedMetric(std::move(_program), std::move(_programCache), _weights, _repetitionCount),
-		m_fixedPointPrecision(_fixedPointPrecision) {}
-
-	size_t fixedPointPrecision() const { return m_fixedPointPrecision; }
-
-	size_t evaluate(Chromosome const& _chromosome) override;
-
-private:
-	size_t m_fixedPointPrecision;
-};
-
-/**
- * Abstract base class for fitness metrics that compute their value based on values of multiple
- * other, nested metrics.
- */
-class FitnessMetricCombination: public FitnessMetric
-{
-public:
-	explicit FitnessMetricCombination(std::vector<std::shared_ptr<FitnessMetric>> _metrics):
-		m_metrics(std::move(_metrics)) {}
-
-	std::vector<std::shared_ptr<FitnessMetric>> const& metrics() const { return m_metrics; }
-
-protected:
-	std::vector<std::shared_ptr<FitnessMetric>> m_metrics;
-};
-
-/**
- * Fitness metric that returns the average of values of its nested metrics.
- */
-class FitnessMetricAverage: public FitnessMetricCombination
-{
-public:
-	using FitnessMetricCombination::FitnessMetricCombination;
-	size_t evaluate(Chromosome const& _chromosome) override;
-};
-
-/**
- * Fitness metric that returns the sum of values of its nested metrics.
- */
-class FitnessMetricSum: public FitnessMetricCombination
-{
-public:
-	using FitnessMetricCombination::FitnessMetricCombination;
-	size_t evaluate(Chromosome const& _chromosome) override;
-};
-
-/**
- * Fitness metric that returns the highest of values of its nested metrics.
- */
-class FitnessMetricMaximum: public FitnessMetricCombination
-{
-public:
-	using FitnessMetricCombination::FitnessMetricCombination;
-	size_t evaluate(Chromosome const& _chromosome) override;
-};
-
-/**
- * Fitness metric that returns the lowest of values of its nested metrics.
- */
-class FitnessMetricMinimum: public FitnessMetricCombination
-{
-public:
-	using FitnessMetricCombination::FitnessMetricCombination;
-	size_t evaluate(Chromosome const& _chromosome) override;
-};
-
-}
diff --git a/tools/yulPhaser/GeneticAlgorithms.cpp b/tools/yulPhaser/GeneticAlgorithms.cpp
deleted file mode 100644
index ff40d222a786..000000000000
--- a/tools/yulPhaser/GeneticAlgorithms.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/GeneticAlgorithms.h>
-#include <tools/yulPhaser/Mutations.h>
-#include <tools/yulPhaser/Selections.h>
-#include <tools/yulPhaser/PairSelections.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::phaser;
-
-function<Crossover> phaser::buildCrossoverOperator(
-	CrossoverChoice _choice,
-	optional<double> _uniformCrossoverSwapChance
-)
-{
-	switch (_choice)
-	{
-		case CrossoverChoice::SinglePoint:
-			return randomPointCrossover();
-		case CrossoverChoice::TwoPoint:
-			return randomTwoPointCrossover();
-		case CrossoverChoice::Uniform:
-			assert(_uniformCrossoverSwapChance.has_value());
-			return uniformCrossover(_uniformCrossoverSwapChance.value());
-		default:
-			assertThrow(false, solidity::util::Exception, "Invalid CrossoverChoice value.");
-	};
-}
-
-function<SymmetricCrossover> phaser::buildSymmetricCrossoverOperator(
-	CrossoverChoice _choice,
-	optional<double> _uniformCrossoverSwapChance
-)
-{
-	switch (_choice)
-	{
-		case CrossoverChoice::SinglePoint:
-			return symmetricRandomPointCrossover();
-		case CrossoverChoice::TwoPoint:
-			return symmetricRandomTwoPointCrossover();
-		case CrossoverChoice::Uniform:
-			assert(_uniformCrossoverSwapChance.has_value());
-			return symmetricUniformCrossover(_uniformCrossoverSwapChance.value());
-		default:
-			assertThrow(false, solidity::util::Exception, "Invalid CrossoverChoice value.");
-	};
-}
-
-Population RandomAlgorithm::runNextRound(Population _population)
-{
-	RangeSelection elite(0.0, m_options.elitePoolSize);
-
-	Population elitePopulation = _population.select(elite);
-	size_t replacementCount = _population.individuals().size() - elitePopulation.individuals().size();
-
-	return
-		std::move(elitePopulation) +
-		Population::makeRandom(
-			_population.fitnessMetric(),
-			replacementCount,
-			m_options.minChromosomeLength,
-			m_options.maxChromosomeLength
-		);
-}
-
-Population GenerationalElitistWithExclusivePools::runNextRound(Population _population)
-{
-	double elitePoolSize = 1.0 - (m_options.mutationPoolSize + m_options.crossoverPoolSize);
-
-	RangeSelection elitePool(0.0, elitePoolSize);
-	RandomSelection mutationPoolFromElite(m_options.mutationPoolSize / elitePoolSize);
-	RandomPairSelection crossoverPoolFromElite(m_options.crossoverPoolSize / elitePoolSize);
-
-	std::function<Mutation> mutationOperator = alternativeMutations(
-		m_options.randomisationChance,
-		geneRandomisation(m_options.percentGenesToRandomise),
-		alternativeMutations(
-			m_options.deletionVsAdditionChance,
-			geneDeletion(m_options.percentGenesToAddOrDelete),
-			geneAddition(m_options.percentGenesToAddOrDelete)
-		)
-	);
-	std::function<Crossover> crossoverOperator = buildCrossoverOperator(
-		m_options.crossover,
-		m_options.uniformCrossoverSwapChance
-	);
-
-	return
-		_population.select(elitePool) +
-		_population.select(elitePool).mutate(mutationPoolFromElite, mutationOperator) +
-		_population.select(elitePool).crossover(crossoverPoolFromElite, crossoverOperator);
-}
-
-Population ClassicGeneticAlgorithm::runNextRound(Population _population)
-{
-	Population elite = _population.select(RangeSelection(0.0, m_options.elitePoolSize));
-	Population rest = _population.select(RangeSelection(m_options.elitePoolSize, 1.0));
-
-	Population selectedPopulation = select(_population, rest.individuals().size());
-
-	std::function<SymmetricCrossover> crossoverOperator = buildSymmetricCrossoverOperator(
-		m_options.crossover,
-		m_options.uniformCrossoverSwapChance
-	);
-
-	Population crossedPopulation = Population::combine(
-		selectedPopulation.symmetricCrossoverWithRemainder(
-			PairsFromRandomSubset(m_options.crossoverChance),
-			crossoverOperator
-		)
-	);
-
-	std::function<Mutation> mutationOperator = mutationSequence({
-		geneRandomisation(m_options.mutationChance),
-		geneDeletion(m_options.deletionChance),
-		geneAddition(m_options.additionChance),
-	});
-
-	RangeSelection all(0.0, 1.0);
-	Population mutatedPopulation = crossedPopulation.mutate(all, mutationOperator);
-
-	return elite + mutatedPopulation;
-}
-
-Population ClassicGeneticAlgorithm::select(Population _population, size_t _selectionSize)
-{
-	if (_population.individuals().size() == 0)
-		return _population;
-
-	size_t maxFitness = 0;
-	for (auto const& individual: _population.individuals())
-		maxFitness = max(maxFitness, individual.fitness);
-
-	size_t rouletteRange = 0;
-	for (auto const& individual: _population.individuals())
-		// Add 1 to make sure that every chromosome has non-zero probability of being chosen
-		rouletteRange += maxFitness + 1 - individual.fitness;
-
-	vector<Individual> selectedIndividuals;
-	for (size_t i = 0; i < _selectionSize; ++i)
-	{
-		size_t ball = SimulationRNG::uniformInt(0, rouletteRange - 1);
-
-		size_t cumulativeFitness = 0;
-		for (auto const& individual: _population.individuals())
-		{
-			size_t pocketSize = maxFitness + 1 - individual.fitness;
-			if (ball < cumulativeFitness + pocketSize)
-			{
-				selectedIndividuals.push_back(individual);
-				break;
-			}
-			cumulativeFitness += pocketSize;
-		}
-	}
-
-	assert(selectedIndividuals.size() == _selectionSize);
-	return Population(_population.fitnessMetric(), selectedIndividuals);
-}
diff --git a/tools/yulPhaser/GeneticAlgorithms.h b/tools/yulPhaser/GeneticAlgorithms.h
deleted file mode 100644
index 936139aff6d3..000000000000
--- a/tools/yulPhaser/GeneticAlgorithms.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Contains an abstract base class representing a genetic algorithm and its concrete implementations.
- */
-
-#pragma once
-
-#include <tools/yulPhaser/Mutations.h>
-#include <tools/yulPhaser/Population.h>
-
-#include <cstddef>
-#include <optional>
-
-namespace solidity::phaser
-{
-
-enum class CrossoverChoice
-{
-	SinglePoint,
-	TwoPoint,
-	Uniform,
-};
-
-std::function<Crossover> buildCrossoverOperator(
-	CrossoverChoice _choice,
-	std::optional<double> _uniformCrossoverSwapChance
-);
-
-std::function<SymmetricCrossover> buildSymmetricCrossoverOperator(
-	CrossoverChoice _choice,
-	std::optional<double> _uniformCrossoverSwapChance
-);
-
-/**
- * Abstract base class for genetic algorithms.
- * The main feature is the @a runNextRound() method that executes one round of the algorithm,
- * on the supplied population.
- */
-class GeneticAlgorithm
-{
-public:
-	GeneticAlgorithm() {}
-	GeneticAlgorithm(GeneticAlgorithm const&) = delete;
-	GeneticAlgorithm& operator=(GeneticAlgorithm const&) = delete;
-	virtual ~GeneticAlgorithm() = default;
-
-	/// The method that actually implements the algorithm. Should accept the current population in
-	/// @a _population and return the updated one after the round.
-	virtual Population runNextRound(Population _population) = 0;
-};
-
-/**
- * Completely random genetic algorithm,
- *
- * The algorithm simply replaces the worst chromosomes with entirely new ones, generated
- * randomly and not based on any member of the current population. Only a constant proportion of the
- * chromosomes (the elite) is preserved in each round.
- *
- * Preserves the size of the population. You can use @a elitePoolSize to make the algorithm
- * generational (replacing most members in each round) or steady state (replacing only one member).
- * Both versions are equivalent in terms of the outcome but the generational one converges in a
- * smaller number of rounds while the steady state one does less work per round. This may matter
- * in case of metrics that take a long time to compute though in case of this particular
- * algorithm the same result could also be achieved by simply making the population smaller.
- */
-class RandomAlgorithm: public GeneticAlgorithm
-{
-public:
-	struct Options
-	{
-		double elitePoolSize;        ///< Percentage of the population treated as the elite
-		size_t minChromosomeLength;  ///< Minimum length of newly generated chromosomes
-		size_t maxChromosomeLength;  ///< Maximum length of newly generated chromosomes
-
-		bool isValid() const
-		{
-			return (
-				0 <= elitePoolSize && elitePoolSize <= 1.0 &&
-				minChromosomeLength <= maxChromosomeLength
-			);
-		}
-	};
-
-	explicit RandomAlgorithm(Options const& _options):
-		m_options(_options)
-	{
-		assert(_options.isValid());
-	}
-
-	Options const& options() const { return m_options; }
-
-	Population runNextRound(Population _population) override;
-
-private:
-	Options m_options;
-};
-
-/**
- * A generational, elitist genetic algorithm that replaces the population by mutating and crossing
- * over chromosomes from the elite.
- *
- * The elite consists of individuals not included in the crossover and mutation pools.
- * The crossover operator used is @a randomPointCrossover. The mutation operator is randomly chosen
- * from three possibilities: @a geneRandomisation, @a geneDeletion or @a geneAddition (with
- * configurable probabilities). Each mutation also has a parameter determining the chance of a gene
- * being affected by it.
- */
-class GenerationalElitistWithExclusivePools: public GeneticAlgorithm
-{
-public:
-	struct Options
-	{
-		double mutationPoolSize;          ///< Percentage of population to regenerate using mutations in each round.
-		double crossoverPoolSize;         ///< Percentage of population to regenerate using crossover in each round.
-		double randomisationChance;       ///< The chance of choosing @a geneRandomisation as the mutation to perform
-		double deletionVsAdditionChance;  ///< The chance of choosing @a geneDeletion as the mutation if randomisation was not chosen.
-		double percentGenesToRandomise;   ///< The chance of any given gene being mutated in gene randomisation.
-		double percentGenesToAddOrDelete; ///< The chance of a gene being added (or deleted) in gene addition (or deletion).
-		CrossoverChoice crossover;        ///< The crossover operator to use.
-		std::optional<double> uniformCrossoverSwapChance; ///< Chance of a pair of genes being swapped in uniform crossover.
-
-		bool isValid() const
-		{
-			return (
-				0 <= mutationPoolSize && mutationPoolSize <= 1.0 &&
-				0 <= crossoverPoolSize && crossoverPoolSize <= 1.0 &&
-				0 <= randomisationChance && randomisationChance <= 1.0 &&
-				0 <= deletionVsAdditionChance && deletionVsAdditionChance <= 1.0 &&
-				0 <= percentGenesToRandomise && percentGenesToRandomise <= 1.0 &&
-				0 <= percentGenesToAddOrDelete && percentGenesToAddOrDelete <= 1.0 &&
-				0 <= uniformCrossoverSwapChance && uniformCrossoverSwapChance <= 1.0 &&
-				mutationPoolSize + crossoverPoolSize <= 1.0
-			);
-		}
-	};
-
-	GenerationalElitistWithExclusivePools(Options const& _options):
-		m_options(_options)
-	{
-		assert(_options.isValid());
-	}
-
-	Options const& options() const { return m_options; }
-
-	Population runNextRound(Population _population) override;
-
-private:
-	Options m_options;
-};
-
-/**
- * A typical genetic algorithm that works in three distinct phases, each resulting in a new,
- * modified population:
- * - selection: chromosomes are selected from the population with probability proportional to their
- *   fitness. A chromosome can be selected more than once. The new population has the same size as
- *   the old one.
- * - crossover: first, for each chromosome we decide whether it undergoes crossover or not
- *   (according to crossover chance parameter). Then each selected chromosome is randomly paired
- *   with one other selected chromosome. Each pair produces a pair of children and gets replaced by
- *   it in the population.
- * - mutation: we go over each gene in the population and independently decide whether to mutate it
- *   or not (according to mutation chance parameters). This is repeated for every mutation type so
- *   one gene can undergo mutations of multiple types in a single round.
- *
- * This implementation also has the ability to preserve the top chromosomes in each round.
- */
-class ClassicGeneticAlgorithm: public GeneticAlgorithm
-{
-public:
-	struct Options
-	{
-		double elitePoolSize;      ///< Percentage of the population treated as the elite.
-		double crossoverChance;    ///< The chance of a particular chromosome being selected for crossover.
-		double mutationChance;     ///< The chance of a particular gene being randomised in @a geneRandomisation mutation.
-		double deletionChance;     ///< The chance of a particular gene being deleted in @a geneDeletion mutation.
-		double additionChance;     ///< The chance of a particular gene being added in @a geneAddition mutation.
-		CrossoverChoice crossover; ///< The crossover operator to use
-		std::optional<double> uniformCrossoverSwapChance; ///< Chance of a pair of genes being swapped in uniform crossover.
-
-		bool isValid() const
-		{
-			return (
-				0 <= elitePoolSize && elitePoolSize <= 1.0 &&
-				0 <= crossoverChance && crossoverChance <= 1.0 &&
-				0 <= mutationChance && mutationChance <= 1.0 &&
-				0 <= deletionChance && deletionChance <= 1.0 &&
-				0 <= additionChance && additionChance <= 1.0 &&
-				0 <= uniformCrossoverSwapChance && uniformCrossoverSwapChance <= 1.0
-			);
-		}
-	};
-
-	ClassicGeneticAlgorithm(Options const& _options):
-		m_options(_options)
-	{
-		assert(_options.isValid());
-	}
-
-	Options const& options() const { return m_options; }
-
-	Population runNextRound(Population _population) override;
-
-private:
-	static Population select(Population _population, size_t _selectionSize);
-
-	Options m_options;
-};
-
-}
diff --git a/tools/yulPhaser/Mutations.cpp b/tools/yulPhaser/Mutations.cpp
deleted file mode 100644
index 873fbbb9ba65..000000000000
--- a/tools/yulPhaser/Mutations.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Mutations.h>
-
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <string>
-#include <vector>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::phaser;
-
-function<Mutation> phaser::geneRandomisation(double _chance)
-{
-	return [=](Chromosome const& _chromosome)
-	{
-		string genes;
-		for (char gene: _chromosome.genes())
-			genes.push_back(
-				SimulationRNG::bernoulliTrial(_chance) ?
-				Chromosome::randomGene() :
-				gene
-			);
-
-		return Chromosome(std::move(genes));
-	};
-}
-
-function<Mutation> phaser::geneDeletion(double _chance)
-{
-	return [=](Chromosome const& _chromosome)
-	{
-		string genes;
-		for (char gene: _chromosome.genes())
-			if (!SimulationRNG::bernoulliTrial(_chance))
-				genes.push_back(gene);
-
-		return Chromosome(std::move(genes));
-	};
-}
-
-function<Mutation> phaser::geneAddition(double _chance)
-{
-	return [=](Chromosome const& _chromosome)
-	{
-		string genes;
-
-		if (SimulationRNG::bernoulliTrial(_chance))
-			genes.push_back(Chromosome::randomGene());
-
-		for (char gene: _chromosome.genes())
-		{
-			genes.push_back(gene);
-			if (SimulationRNG::bernoulliTrial(_chance))
-				genes.push_back(Chromosome::randomGene());
-		}
-
-		return Chromosome(std::move(genes));
-	};
-}
-
-function<Mutation> phaser::alternativeMutations(
-	double _firstMutationChance,
-	function<Mutation> _mutation1,
-	function<Mutation> _mutation2
-)
-{
-	return [=](Chromosome const& _chromosome)
-	{
-		if (SimulationRNG::bernoulliTrial(_firstMutationChance))
-			return _mutation1(_chromosome);
-		else
-			return _mutation2(_chromosome);
-	};
-}
-
-function<Mutation> phaser::mutationSequence(vector<function<Mutation>> _mutations)
-{
-	return [=](Chromosome const& _chromosome)
-	{
-		Chromosome mutatedChromosome = _chromosome;
-		for (size_t i = 0; i < _mutations.size(); ++i)
-			mutatedChromosome = _mutations[i](std::move(mutatedChromosome));
-
-		return mutatedChromosome;
-	};
-}
-
-namespace
-{
-
-ChromosomePair fixedPointSwap(
-	Chromosome const& _chromosome1,
-	Chromosome const& _chromosome2,
-	size_t _crossoverPoint
-)
-{
-	assert(_crossoverPoint <= _chromosome1.length());
-	assert(_crossoverPoint <= _chromosome2.length());
-
-	return {
-		Chromosome(
-			_chromosome1.genes().substr(0, _crossoverPoint) +
-			_chromosome2.genes().substr(_crossoverPoint, _chromosome2.length() - _crossoverPoint)
-		),
-		Chromosome(
-			_chromosome2.genes().substr(0, _crossoverPoint) +
-			_chromosome1.genes().substr(_crossoverPoint, _chromosome1.length() - _crossoverPoint)
-		),
-	};
-}
-
-}
-
-function<Crossover> phaser::randomPointCrossover()
-{
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-
-		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
-		size_t minPoint = (minLength > 0 ? 1 : 0);
-		assert(minPoint <= minLength);
-
-		size_t randomPoint = SimulationRNG::uniformInt(minPoint, minLength);
-		return get<0>(fixedPointSwap(_chromosome1, _chromosome2, randomPoint));
-	};
-}
-
-function<SymmetricCrossover> phaser::symmetricRandomPointCrossover()
-{
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-
-		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
-		size_t minPoint = (minLength > 0 ? 1 : 0);
-		assert(minPoint <= minLength);
-
-		size_t randomPoint = SimulationRNG::uniformInt(minPoint, minLength);
-		return fixedPointSwap(_chromosome1, _chromosome2, randomPoint);
-	};
-}
-
-function<Crossover> phaser::fixedPointCrossover(double _crossoverPoint)
-{
-	assert(0.0 <= _crossoverPoint && _crossoverPoint <= 1.0);
-
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-		size_t concretePoint = static_cast<size_t>(round(double(minLength) * _crossoverPoint));
-
-		return get<0>(fixedPointSwap(_chromosome1, _chromosome2, concretePoint));
-	};
-}
-
-namespace
-{
-
-ChromosomePair fixedTwoPointSwap(
-	Chromosome const& _chromosome1,
-	Chromosome const& _chromosome2,
-	size_t _crossoverPoint1,
-	size_t _crossoverPoint2
-)
-{
-	assert(_crossoverPoint1 <= _chromosome1.length());
-	assert(_crossoverPoint1 <= _chromosome2.length());
-	assert(_crossoverPoint2 <= _chromosome1.length());
-	assert(_crossoverPoint2 <= _chromosome2.length());
-
-	size_t lowPoint = min(_crossoverPoint1, _crossoverPoint2);
-	size_t highPoint = max(_crossoverPoint1, _crossoverPoint2);
-
-	return {
-		Chromosome(
-			_chromosome1.genes().substr(0, lowPoint) +
-			_chromosome2.genes().substr(lowPoint, highPoint - lowPoint) +
-			_chromosome1.genes().substr(highPoint, _chromosome1.length() - highPoint)
-		),
-		Chromosome(
-			_chromosome2.genes().substr(0, lowPoint) +
-			_chromosome1.genes().substr(lowPoint, highPoint - lowPoint) +
-			_chromosome2.genes().substr(highPoint, _chromosome2.length() - highPoint)
-		),
-	};
-}
-
-}
-
-function<Crossover> phaser::randomTwoPointCrossover()
-{
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-
-		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
-		size_t minPoint = (minLength > 0 ? 1 : 0);
-		assert(minPoint <= minLength);
-
-		size_t randomPoint1 = SimulationRNG::uniformInt(minPoint, minLength);
-		size_t randomPoint2 = SimulationRNG::uniformInt(randomPoint1, minLength);
-		return get<0>(fixedTwoPointSwap(_chromosome1, _chromosome2, randomPoint1, randomPoint2));
-	};
-}
-
-function<SymmetricCrossover> phaser::symmetricRandomTwoPointCrossover()
-{
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-
-		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
-		size_t minPoint = (minLength > 0 ? 1 : 0);
-		assert(minPoint <= minLength);
-
-		size_t randomPoint1 = SimulationRNG::uniformInt(minPoint, minLength);
-		size_t randomPoint2 = SimulationRNG::uniformInt(randomPoint1, minLength);
-		return fixedTwoPointSwap(_chromosome1, _chromosome2, randomPoint1, randomPoint2);
-	};
-}
-
-namespace
-{
-
-ChromosomePair uniformSwap(Chromosome const& _chromosome1, Chromosome const& _chromosome2, double _swapChance)
-{
-	string steps1;
-	string steps2;
-
-	size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-	for (size_t i = 0; i < minLength; ++i)
-		if (SimulationRNG::bernoulliTrial(_swapChance))
-		{
-			steps1.push_back(_chromosome2.genes()[i]);
-			steps2.push_back(_chromosome1.genes()[i]);
-		}
-		else
-		{
-			steps1.push_back(_chromosome1.genes()[i]);
-			steps2.push_back(_chromosome2.genes()[i]);
-		}
-
-	bool swapTail = SimulationRNG::bernoulliTrial(_swapChance);
-	if (_chromosome1.length() > minLength)
-	{
-		if (swapTail)
-			steps2 += _chromosome1.genes().substr(minLength, _chromosome1.length() - minLength);
-		else
-			steps1 += _chromosome1.genes().substr(minLength, _chromosome1.length() - minLength);
-	}
-
-	if (_chromosome2.length() > minLength)
-	{
-		if (swapTail)
-			steps1 += _chromosome2.genes().substr(minLength, _chromosome2.length() - minLength);
-		else
-			steps2 += _chromosome2.genes().substr(minLength, _chromosome2.length() - minLength);
-	}
-
-	return {Chromosome(steps1), Chromosome(steps2)};
-}
-
-}
-
-function<Crossover> phaser::uniformCrossover(double _swapChance)
-{
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		return get<0>(uniformSwap(_chromosome1, _chromosome2, _swapChance));
-	};
-}
-
-function<SymmetricCrossover> phaser::symmetricUniformCrossover(double _swapChance)
-{
-	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
-	{
-		return uniformSwap(_chromosome1, _chromosome2, _swapChance);
-	};
-}
diff --git a/tools/yulPhaser/Mutations.h b/tools/yulPhaser/Mutations.h
deleted file mode 100644
index abdc4b10c753..000000000000
--- a/tools/yulPhaser/Mutations.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Mutation and crossover operators for use in genetic algorithms.
- */
-
-#pragma once
-
-#include <tools/yulPhaser/Chromosome.h>
-
-#include <functional>
-#include <tuple>
-
-namespace solidity::phaser
-{
-
-using ChromosomePair = std::tuple<Chromosome, Chromosome>;
-
-using Mutation = Chromosome(Chromosome const&);
-using Crossover = Chromosome(Chromosome const&, Chromosome const&);
-using SymmetricCrossover = ChromosomePair(Chromosome const&, Chromosome const&);
-
-// MUTATIONS
-
-/// Creates a mutation operator that iterates over all genes in a chromosome and with probability
-/// @a _chance replaces a gene with a random one (which could also be the same as the original).
-std::function<Mutation> geneRandomisation(double _chance);
-
-/// Creates a mutation operator that iterates over all genes in a chromosome and with probability
-/// @a _chance deletes it.
-std::function<Mutation> geneDeletion(double _chance);
-
-/// Creates a mutation operator that iterates over all positions in a chromosome (including spots
-/// at the beginning and at the end of the sequence) and with probability @a _chance insert a new,
-/// randomly chosen gene.
-std::function<Mutation> geneAddition(double _chance);
-
-/// Creates a mutation operator that always applies one of the mutations passed to it.
-/// The probability that the chosen mutation is the first one is @a _firstMutationChance.
-/// randomly chosen gene.
-std::function<Mutation> alternativeMutations(
-	double _firstMutationChance,
-	std::function<Mutation> _mutation1,
-	std::function<Mutation> _mutation2
-);
-
-/// Creates a mutation operator that sequentially applies all the operators given in @a _mutations.
-std::function<Mutation> mutationSequence(std::vector<std::function<Mutation>> _mutations);
-
-// CROSSOVER
-
-/// Creates a crossover operator that randomly selects a number between 0 and 1 and uses it as the
-/// position at which to perform perform @a fixedPointCrossover.
-std::function<Crossover> randomPointCrossover();
-
-/// Symmetric version of @a randomPointCrossover(). Creates an operator that returns a pair
-/// containing both possible results for the same crossover point.
-std::function<SymmetricCrossover> symmetricRandomPointCrossover();
-
-/// Creates a crossover operator that always chooses a point that lies at @a _crossoverPoint
-/// percent of the length of the shorter chromosome. Then creates a new chromosome by
-/// splitting both inputs at the crossover point and stitching output from the first half or first
-/// input and the second half of the second input.
-///
-/// Avoids selecting position 0 (since this just produces a chromosome identical to the second one)
-/// unless there is no other choice (i.e. one of the chromosomes is empty).
-std::function<Crossover> fixedPointCrossover(double _crossoverPoint);
-
-/// Creates a crossover operator that randomly selects two points between 0 and 1 and swaps genes
-/// from the resulting interval. The interval may be empty in which case no genes are swapped.
-std::function<Crossover> randomTwoPointCrossover();
-
-/// Symmetric version of @a randomTwoPointCrossover(). Creates an operator that returns a pair
-/// containing both possible results for the same crossover points.
-std::function<SymmetricCrossover> symmetricRandomTwoPointCrossover();
-
-/// Creates a crossover operator that goes over the length of the shorter chromosomes and for
-/// each gene independently decides whether to swap it or not (with probability given by
-/// @a _swapChance). The tail of the longer chromosome (the part that's past the length of the
-/// shorter one) is treated as a single gene and can potentially be swapped too.
-std::function<Crossover> uniformCrossover(double _swapChance);
-
-/// Symmetric version of @a uniformCrossover(). Creates an operator that returns a pair
-/// containing both possible results for the same set or swap decisions.
-std::function<SymmetricCrossover> symmetricUniformCrossover(double _swapChance);
-
-}
diff --git a/tools/yulPhaser/PairSelections.cpp b/tools/yulPhaser/PairSelections.cpp
deleted file mode 100644
index 4c9d4ee5f961..000000000000
--- a/tools/yulPhaser/PairSelections.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/PairSelections.h>
-
-#include <tools/yulPhaser/Selections.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <cmath>
-
-using namespace std;
-using namespace solidity::phaser;
-
-vector<tuple<size_t, size_t>> RandomPairSelection::materialise(size_t _poolSize) const
-{
-	if (_poolSize < 2)
-		return {};
-
-	auto count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
-
-	vector<tuple<size_t, size_t>> selection;
-	for (size_t i = 0; i < count; ++i)
-	{
-		size_t index1 = SimulationRNG::uniformInt(0, _poolSize - 1);
-		size_t index2;
-		do
-		{
-			index2 = SimulationRNG::uniformInt(0, _poolSize - 1);
-		} while (index1 == index2);
-
-		selection.emplace_back(index1, index2);
-	}
-
-	return selection;
-}
-
-vector<tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSize) const
-{
-	vector<size_t> selectedIndices = RandomSubset(m_selectionChance).materialise(_poolSize);
-
-	if (selectedIndices.size() % 2 != 0)
-	{
-		if (selectedIndices.size() < _poolSize && SimulationRNG::bernoulliTrial(0.5))
-		{
-			do
-			{
-				size_t extraIndex = SimulationRNG::uniformInt(0, selectedIndices.size() - 1);
-				if (find(selectedIndices.begin(), selectedIndices.end(), extraIndex) == selectedIndices.end())
-					selectedIndices.push_back(extraIndex);
-			} while (selectedIndices.size() % 2 != 0);
-		}
-		else
-			selectedIndices.erase(
-				selectedIndices.begin() +
-				static_cast<ptrdiff_t>(SimulationRNG::uniformInt(0, selectedIndices.size() - 1))
-			);
-	}
-	assert(selectedIndices.size() % 2 == 0);
-
-	vector<tuple<size_t, size_t>> selectedPairs;
-	for (size_t i = selectedIndices.size() / 2; i > 0; --i)
-	{
-		size_t position1 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1);
-		size_t value1 = selectedIndices[position1];
-		selectedIndices.erase(selectedIndices.begin() + static_cast<ptrdiff_t>(position1));
-		size_t position2 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1);
-		size_t value2 = selectedIndices[position2];
-		selectedIndices.erase(selectedIndices.begin() + static_cast<ptrdiff_t>(position2));
-
-		selectedPairs.emplace_back(value1, value2);
-	}
-	assert(selectedIndices.empty());
-
-	return selectedPairs;
-}
-
-vector<tuple<size_t, size_t>> PairMosaicSelection::materialise(size_t _poolSize) const
-{
-	if (_poolSize < 2)
-		return {};
-
-	size_t count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
-
-	vector<tuple<size_t, size_t>> selection;
-	for (size_t i = 0; i < count; ++i)
-	{
-		tuple<size_t, size_t> pair = m_pattern[i % m_pattern.size()];
-		selection.emplace_back(min(get<0>(pair), _poolSize - 1), min(get<1>(pair), _poolSize - 1));
-	}
-
-	return selection;
-}
diff --git a/tools/yulPhaser/PairSelections.h b/tools/yulPhaser/PairSelections.h
deleted file mode 100644
index 12532c76abf7..000000000000
--- a/tools/yulPhaser/PairSelections.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Contains an abstract base class representing a selection of pairs of elements from a collection
- * and its concrete implementations.
- */
-
-#pragma once
-
-#include <cassert>
-#include <cstddef>
-#include <tuple>
-#include <vector>
-
-namespace solidity::phaser
-{
-
-/**
- * Abstract base class for selections of pairs elements from a collection.
- *
- * An instance of this class represents a specific method of selecting a set of pairs of elements
- * from containers of arbitrary sizes. The selected pairs always point at a subset of the elements
- * from the container but may indicate the same element more than once. The pairs themselves can
- * repeat too. The selection may or may not be fixed - it's up to a specific implementation whether
- * subsequent calls for the same container produce the same indices or not.
- *
- * Derived classes are meant to override the @a materialise() method.
- * This method is expected to produce pairs of selected elements given the size of the collection.
- */
-class PairSelection
-{
-public:
-	PairSelection() = default;
-	PairSelection(PairSelection const&) = delete;
-	PairSelection& operator=(PairSelection const&) = delete;
-	virtual ~PairSelection() = default;
-
-	virtual std::vector<std::tuple<size_t, size_t>> materialise(size_t _poolSize) const = 0;
-};
-
-/**
- * A selection that selects pairs of random elements from a container. The resulting set of pairs
- * may contain the same pair more than once but does not contain pairs of duplicates. Always
- * selects as many pairs as the size of the container multiplied by @a _selectionSize (unless the
- * container is empty).
- */
-class RandomPairSelection: public PairSelection
-{
-public:
-	explicit RandomPairSelection(double _selectionSize):
-		m_selectionSize(_selectionSize) {}
-
-	std::vector<std::tuple<size_t, size_t>> materialise(size_t _poolSize) const override;
-
-private:
-	double m_selectionSize;
-};
-
-
-/**
- * A selection that goes over all elements in a container, for each one independently decides
- * whether to select it or not and then randomly combines those elements into pairs. If the number
- * of elements is odd, randomly decides whether to take one more or exclude one.
- *
- * Each element has the same chance of being selected and can be selected at most once.
- * The number of selected elements is random and can be different with each call to
- * @a materialise().
- */
-class PairsFromRandomSubset: public PairSelection
-{
-public:
-	explicit PairsFromRandomSubset(double _selectionChance):
-		m_selectionChance(_selectionChance) {}
-
-	std::vector<std::tuple<size_t, size_t>> materialise(size_t _poolSize) const override;
-
-private:
-	double m_selectionChance;
-};
-
-/**
- * A selection that selects pairs of elements at specific, fixed positions indicated by a repeating
- * "pattern". If the positions in the pattern exceed the size of the container, they are capped at
- * the maximum available position. Always selects as many pairs as the size of the container
- * multiplied by @a _selectionSize (unless the container is empty).
- *
- * E.g. if the pattern is {{0, 1}, {3, 9}} and collection size is 5, the selection will materialise
- * into {{0, 1}, {3, 4}, {0, 1}, {3, 4}, {0, 1}}. If the size is 3, it will be
- * {{0, 1}, {2, 2}, {0, 1}}.
- */
-class PairMosaicSelection: public PairSelection
-{
-public:
-	explicit PairMosaicSelection(std::vector<std::tuple<size_t, size_t>> _pattern, double _selectionSize = 1.0):
-		m_pattern(std::move(_pattern)),
-		m_selectionSize(_selectionSize)
-	{
-		assert(m_pattern.size() > 0 || _selectionSize == 0.0);
-	}
-
-	std::vector<std::tuple<size_t, size_t>> materialise(size_t _poolSize) const override;
-
-private:
-	std::vector<std::tuple<size_t, size_t>> m_pattern;
-	double m_selectionSize;
-};
-
-}
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
deleted file mode 100644
index db5ec35cedfa..000000000000
--- a/tools/yulPhaser/Phaser.cpp
+++ /dev/null
@@ -1,884 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Phaser.h>
-
-#include <tools/yulPhaser/AlgorithmRunner.h>
-#include <tools/yulPhaser/Common.h>
-#include <tools/yulPhaser/Exceptions.h>
-#include <tools/yulPhaser/FitnessMetrics.h>
-#include <tools/yulPhaser/GeneticAlgorithms.h>
-#include <tools/yulPhaser/Program.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <liblangutil/Scanner.h>
-
-#include <libsolutil/Assertions.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-
-#include <iostream>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace solidity::phaser;
-
-namespace po = boost::program_options;
-
-namespace
-{
-
-map<PhaserMode, string> const PhaserModeToStringMap =
-{
-	{PhaserMode::RunAlgorithm, "run-algorithm"},
-	{PhaserMode::PrintOptimisedPrograms, "print-optimised-programs"},
-	{PhaserMode::PrintOptimisedASTs, "print-optimised-asts"},
-};
-map<string, PhaserMode> const StringToPhaserModeMap = invertMap(PhaserModeToStringMap);
-
-map<Algorithm, string> const AlgorithmToStringMap =
-{
-	{Algorithm::Random, "random"},
-	{Algorithm::GEWEP, "GEWEP"},
-	{Algorithm::Classic, "classic"},
-};
-map<string, Algorithm> const StringToAlgorithmMap = invertMap(AlgorithmToStringMap);
-
-map<MetricChoice, string> MetricChoiceToStringMap =
-{
-	{MetricChoice::CodeSize, "code-size"},
-	{MetricChoice::RelativeCodeSize, "relative-code-size"},
-};
-map<string, MetricChoice> const StringToMetricChoiceMap = invertMap(MetricChoiceToStringMap);
-
-map<MetricAggregatorChoice, string> const MetricAggregatorChoiceToStringMap =
-{
-	{MetricAggregatorChoice::Average, "average"},
-	{MetricAggregatorChoice::Sum, "sum"},
-	{MetricAggregatorChoice::Maximum, "maximum"},
-	{MetricAggregatorChoice::Minimum, "minimum"},
-};
-map<string, MetricAggregatorChoice> const StringToMetricAggregatorChoiceMap = invertMap(MetricAggregatorChoiceToStringMap);
-
-map<CrossoverChoice, string> const CrossoverChoiceToStringMap =
-{
-	{CrossoverChoice::SinglePoint, "single-point"},
-	{CrossoverChoice::TwoPoint, "two-point"},
-	{CrossoverChoice::Uniform, "uniform"},
-};
-map<string, CrossoverChoice> const StringToCrossoverChoiceMap = invertMap(CrossoverChoiceToStringMap);
-
-}
-
-istream& phaser::operator>>(istream& _inputStream, PhaserMode& _phaserMode) { return deserializeChoice(_inputStream, _phaserMode, StringToPhaserModeMap); }
-ostream& phaser::operator<<(ostream& _outputStream, PhaserMode _phaserMode) { return serializeChoice(_outputStream, _phaserMode, PhaserModeToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, Algorithm& _algorithm) { return deserializeChoice(_inputStream, _algorithm, StringToAlgorithmMap); }
-ostream& phaser::operator<<(ostream& _outputStream, Algorithm _algorithm) { return serializeChoice(_outputStream, _algorithm, AlgorithmToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, MetricChoice& _metric) { return deserializeChoice(_inputStream, _metric, StringToMetricChoiceMap); }
-ostream& phaser::operator<<(ostream& _outputStream, MetricChoice _metric) { return serializeChoice(_outputStream, _metric, MetricChoiceToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, MetricAggregatorChoice& _aggregator) { return deserializeChoice(_inputStream, _aggregator, StringToMetricAggregatorChoiceMap); }
-ostream& phaser::operator<<(ostream& _outputStream, MetricAggregatorChoice _aggregator) { return serializeChoice(_outputStream, _aggregator, MetricAggregatorChoiceToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, CrossoverChoice& _crossover) { return deserializeChoice(_inputStream, _crossover, StringToCrossoverChoiceMap); }
-ostream& phaser::operator<<(ostream& _outputStream, CrossoverChoice _crossover) { return serializeChoice(_outputStream, _crossover, CrossoverChoiceToStringMap); }
-
-GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLine(po::variables_map const& _arguments)
-{
-	return {
-		_arguments["algorithm"].as<Algorithm>(),
-		_arguments["min-chromosome-length"].as<size_t>(),
-		_arguments["max-chromosome-length"].as<size_t>(),
-		_arguments["crossover"].as<CrossoverChoice>(),
-		_arguments["uniform-crossover-swap-chance"].as<double>(),
-		_arguments.count("random-elite-pool-size") > 0 ?
-			_arguments["random-elite-pool-size"].as<double>() :
-			optional<double>{},
-		_arguments["gewep-mutation-pool-size"].as<double>(),
-		_arguments["gewep-crossover-pool-size"].as<double>(),
-		_arguments["gewep-randomisation-chance"].as<double>(),
-		_arguments["gewep-deletion-vs-addition-chance"].as<double>(),
-		_arguments.count("gewep-genes-to-randomise") > 0 ?
-			_arguments["gewep-genes-to-randomise"].as<double>() :
-			optional<double>{},
-		_arguments.count("gewep-genes-to-add-or-delete") > 0 ?
-			_arguments["gewep-genes-to-add-or-delete"].as<double>() :
-			optional<double>{},
-		_arguments["classic-elite-pool-size"].as<double>(),
-		_arguments["classic-crossover-chance"].as<double>(),
-		_arguments["classic-mutation-chance"].as<double>(),
-		_arguments["classic-deletion-chance"].as<double>(),
-		_arguments["classic-addition-chance"].as<double>(),
-	};
-}
-
-unique_ptr<GeneticAlgorithm> GeneticAlgorithmFactory::build(
-	Options const& _options,
-	size_t _populationSize
-)
-{
-	assert(_populationSize > 0);
-
-	switch (_options.algorithm)
-	{
-		case Algorithm::Random:
-		{
-			double elitePoolSize = 1.0 / double(_populationSize);
-
-			if (_options.randomElitePoolSize.has_value())
-				elitePoolSize = _options.randomElitePoolSize.value();
-
-			return make_unique<RandomAlgorithm>(RandomAlgorithm::Options{
-				/* elitePoolSize = */ elitePoolSize,
-				/* minChromosomeLength = */ _options.minChromosomeLength,
-				/* maxChromosomeLength = */ _options.maxChromosomeLength,
-			});
-		}
-		case Algorithm::GEWEP:
-		{
-			double percentGenesToRandomise = 1.0 / double(_options.maxChromosomeLength);
-			double percentGenesToAddOrDelete = percentGenesToRandomise;
-
-			if (_options.gewepGenesToRandomise.has_value())
-				percentGenesToRandomise = _options.gewepGenesToRandomise.value();
-			if (_options.gewepGenesToAddOrDelete.has_value())
-				percentGenesToAddOrDelete = _options.gewepGenesToAddOrDelete.value();
-
-			return make_unique<GenerationalElitistWithExclusivePools>(GenerationalElitistWithExclusivePools::Options{
-				/* mutationPoolSize = */ _options.gewepMutationPoolSize,
-				/* crossoverPoolSize = */ _options.gewepCrossoverPoolSize,
-				/* randomisationChance = */ _options.gewepRandomisationChance,
-				/* deletionVsAdditionChance = */ _options.gewepDeletionVsAdditionChance,
-				/* percentGenesToRandomise = */ percentGenesToRandomise,
-				/* percentGenesToAddOrDelete = */ percentGenesToAddOrDelete,
-				/* crossover = */ _options.crossover,
-				/* uniformCrossoverSwapChance = */ _options.uniformCrossoverSwapChance,
-			});
-		}
-		case Algorithm::Classic:
-		{
-			return make_unique<ClassicGeneticAlgorithm>(ClassicGeneticAlgorithm::Options{
-				/* elitePoolSize = */ _options.classicElitePoolSize,
-				/* crossoverChance = */ _options.classicCrossoverChance,
-				/* mutationChance = */ _options.classicMutationChance,
-				/* deletionChance = */ _options.classicDeletionChance,
-				/* additionChance = */ _options.classicAdditionChance,
-				/* crossover = */ _options.crossover,
-				/* uniformCrossoverSwapChance = */ _options.uniformCrossoverSwapChance,
-			});
-		}
-		default:
-			assertThrow(false, solidity::util::Exception, "Invalid Algorithm value.");
-	}
-}
-
-CodeWeights CodeWeightFactory::buildFromCommandLine(po::variables_map const& _arguments)
-{
-	return {
-		_arguments["expression-statement-cost"].as<size_t>(),
-		_arguments["assignment-cost"].as<size_t>(),
-		_arguments["variable-declaration-cost"].as<size_t>(),
-		_arguments["function-definition-cost"].as<size_t>(),
-		_arguments["if-cost"].as<size_t>(),
-		_arguments["switch-cost"].as<size_t>(),
-		_arguments["case-cost"].as<size_t>(),
-		_arguments["for-loop-cost"].as<size_t>(),
-		_arguments["break-cost"].as<size_t>(),
-		_arguments["continue-cost"].as<size_t>(),
-		_arguments["leave-cost"].as<size_t>(),
-		_arguments["block-cost"].as<size_t>(),
-		_arguments["function-call-cost"].as<size_t>(),
-		_arguments["identifier-cost"].as<size_t>(),
-		_arguments["literal-cost"].as<size_t>(),
-	};
-}
-
-FitnessMetricFactory::Options FitnessMetricFactory::Options::fromCommandLine(po::variables_map const& _arguments)
-{
-	return {
-		_arguments["metric"].as<MetricChoice>(),
-		_arguments["metric-aggregator"].as<MetricAggregatorChoice>(),
-		_arguments["relative-metric-scale"].as<size_t>(),
-		_arguments["chromosome-repetitions"].as<size_t>(),
-	};
-}
-
-unique_ptr<FitnessMetric> FitnessMetricFactory::build(
-	Options const& _options,
-	vector<Program> _programs,
-	vector<shared_ptr<ProgramCache>> _programCaches,
-	CodeWeights const& _weights
-)
-{
-	assert(_programCaches.size() == _programs.size());
-	assert(_programs.size() > 0 && "Validations should prevent this from being executed with zero files.");
-
-	vector<shared_ptr<FitnessMetric>> metrics;
-	switch (_options.metric)
-	{
-		case MetricChoice::CodeSize:
-		{
-			for (size_t i = 0; i < _programs.size(); ++i)
-				metrics.push_back(make_unique<ProgramSize>(
-					_programCaches[i] != nullptr ? optional<Program>{} : std::move(_programs[i]),
-					std::move(_programCaches[i]),
-					_weights,
-					_options.chromosomeRepetitions
-				));
-
-			break;
-		}
-		case MetricChoice::RelativeCodeSize:
-		{
-			for (size_t i = 0; i < _programs.size(); ++i)
-				metrics.push_back(make_unique<RelativeProgramSize>(
-					_programCaches[i] != nullptr ? optional<Program>{} : std::move(_programs[i]),
-					std::move(_programCaches[i]),
-					_options.relativeMetricScale,
-					_weights,
-					_options.chromosomeRepetitions
-				));
-			break;
-		}
-		default:
-			assertThrow(false, solidity::util::Exception, "Invalid MetricChoice value.");
-	}
-
-	switch (_options.metricAggregator)
-	{
-		case MetricAggregatorChoice::Average:
-			return make_unique<FitnessMetricAverage>(std::move(metrics));
-		case MetricAggregatorChoice::Sum:
-			return make_unique<FitnessMetricSum>(std::move(metrics));
-		case MetricAggregatorChoice::Maximum:
-			return make_unique<FitnessMetricMaximum>(std::move(metrics));
-		case MetricAggregatorChoice::Minimum:
-			return make_unique<FitnessMetricMinimum>(std::move(metrics));
-		default:
-			assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");
-	}
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)
-{
-	return {
-		_arguments["min-chromosome-length"].as<size_t>(),
-		_arguments["max-chromosome-length"].as<size_t>(),
-		_arguments.count("population") > 0 ?
-			_arguments["population"].as<vector<string>>() :
-			vector<string>{},
-		_arguments.count("random-population") > 0 ?
-			_arguments["random-population"].as<vector<size_t>>() :
-			vector<size_t>{},
-		_arguments.count("population-from-file") > 0 ?
-			_arguments["population-from-file"].as<vector<string>>() :
-			vector<string>{},
-	};
-}
-
-Population PopulationFactory::build(
-	Options const& _options,
-	shared_ptr<FitnessMetric> _fitnessMetric
-)
-{
-	Population population = buildFromStrings(_options.population, _fitnessMetric);
-
-	size_t combinedSize = 0;
-	for (size_t populationSize: _options.randomPopulation)
-		combinedSize += populationSize;
-
-	population = std::move(population) + buildRandom(
-		combinedSize,
-		_options.minChromosomeLength,
-		_options.maxChromosomeLength,
-		_fitnessMetric
-	);
-
-	for (string const& populationFilePath: _options.populationFromFile)
-		population = std::move(population) + buildFromFile(populationFilePath, _fitnessMetric);
-
-	return population;
-}
-
-Population PopulationFactory::buildFromStrings(
-	vector<string> const& _geneSequences,
-	shared_ptr<FitnessMetric> _fitnessMetric
-)
-{
-	vector<Chromosome> chromosomes;
-	for (string const& geneSequence: _geneSequences)
-		chromosomes.emplace_back(geneSequence);
-
-	return Population(std::move(_fitnessMetric), std::move(chromosomes));
-}
-
-Population PopulationFactory::buildRandom(
-	size_t _populationSize,
-	size_t _minChromosomeLength,
-	size_t _maxChromosomeLength,
-	shared_ptr<FitnessMetric> _fitnessMetric
-)
-{
-	return Population::makeRandom(
-		std::move(_fitnessMetric),
-		_populationSize,
-		_minChromosomeLength,
-		_maxChromosomeLength
-	);
-}
-
-Population PopulationFactory::buildFromFile(
-	string const& _filePath,
-	shared_ptr<FitnessMetric> _fitnessMetric
-)
-{
-	return buildFromStrings(readLinesFromFile(_filePath), std::move(_fitnessMetric));
-}
-
-ProgramCacheFactory::Options ProgramCacheFactory::Options::fromCommandLine(po::variables_map const& _arguments)
-{
-	return {
-		_arguments["program-cache"].as<bool>(),
-	};
-}
-
-vector<shared_ptr<ProgramCache>> ProgramCacheFactory::build(
-	Options const& _options,
-	vector<Program> _programs
-)
-{
-	vector<shared_ptr<ProgramCache>> programCaches;
-	for (Program& program: _programs)
-		programCaches.push_back(_options.programCacheEnabled ? make_shared<ProgramCache>(std::move(program)) : nullptr);
-
-	return programCaches;
-}
-
-ProgramFactory::Options ProgramFactory::Options::fromCommandLine(po::variables_map const& _arguments)
-{
-	return {
-		_arguments["input-files"].as<vector<string>>(),
-		_arguments["prefix"].as<string>(),
-	};
-}
-
-vector<Program> ProgramFactory::build(Options const& _options)
-{
-	vector<Program> inputPrograms;
-	for (auto& path: _options.inputFiles)
-	{
-		CharStream sourceCode = loadSource(path);
-		variant<Program, ErrorList> programOrErrors = Program::load(sourceCode);
-		if (holds_alternative<ErrorList>(programOrErrors))
-		{
-			SourceReferenceFormatter{cerr, SingletonCharStreamProvider(sourceCode), true, false}
-				.printErrorInformation(get<ErrorList>(programOrErrors));
-			cerr << endl;
-			assertThrow(false, InvalidProgram, "Failed to load program " + path);
-		}
-
-		get<Program>(programOrErrors).optimise(Chromosome(_options.prefix).optimisationSteps());
-		inputPrograms.push_back(std::move(get<Program>(programOrErrors)));
-	}
-
-	return inputPrograms;
-}
-
-CharStream ProgramFactory::loadSource(boost::filesystem::path const& _sourcePath)
-{
-	assertThrow(boost::filesystem::exists(_sourcePath), MissingFile, "Source file does not exist: " + _sourcePath.string());
-
-	string sourceCode = readFileAsString(_sourcePath);
-	return CharStream(sourceCode, _sourcePath.string());
-}
-
-void Phaser::main(int _argc, char** _argv)
-{
-	optional<po::variables_map> arguments = parseCommandLine(_argc, _argv);
-	if (!arguments.has_value())
-		return;
-
-	initialiseRNG(arguments.value());
-
-	runPhaser(arguments.value());
-}
-
-Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
-{
-	unsigned const lineLength = po::options_description::m_default_line_length;
-	unsigned const minDescriptionLength = lineLength - 23;
-
-	po::options_description keywordDescription(
-		"yul-phaser, a tool for finding the best sequence of Yul optimisation phases.\n"
-		"\n"
-		"Usage: yul-phaser [options] <file>\n"
-		"Reads <file> as Yul code and tries to find the best order in which to run optimisation"
-		" phases using a genetic algorithm.\n"
-		"Example:\n"
-		"yul-phaser program.yul\n"
-		"\n"
-		"Allowed options",
-		lineLength,
-		minDescriptionLength
-	);
-
-	po::options_description generalDescription("GENERAL", lineLength, minDescriptionLength);
-	generalDescription.add_options()
-		("help", "Show help message and exit.")
-		("input-files", po::value<vector<string>>()->required()->value_name("<PATH>"), "Input files.")
-		(
-			"prefix",
-			po::value<string>()->value_name("<CHROMOSOME>")->default_value(""),
-			"Initial optimisation steps automatically applied to every input program.\n"
-			"The result is treated as if it was the actual input, i.e. the steps are not considered "
-			"a part of the chromosomes and cannot be mutated. The values of relative metric values "
-			"are also relative to the fitness of a program with these steps applied rather than the "
-			"fitness of the original program.\n"
-			"Note that phaser always adds a 'hgo' prefix to ensure that chromosomes can "
-			"contain arbitrary optimisation steps. This implicit prefix cannot be changed or "
-			"or removed using this option. The value given here is applied after it."
-		)
-		("seed", po::value<uint32_t>()->value_name("<NUM>"), "Seed for the random number generator.")
-		(
-			"rounds",
-			po::value<size_t>()->value_name("<NUM>"),
-			"The number of rounds after which the algorithm should stop. (default=no limit)."
-		)
-		(
-			"mode",
-			po::value<PhaserMode>()->value_name("<NAME>")->default_value(PhaserMode::RunAlgorithm),
-			(
-				"Mode of operation. The default is to run the algorithm but you can also tell phaser "
-				"to do something else with its parameters, e.g. just print the optimised programs and exit.\n"
-				"\n"
-				"AVAILABLE MODES:\n"
-				"* " + toString(PhaserMode::RunAlgorithm) + "\n" +
-				"* " + toString(PhaserMode::PrintOptimisedPrograms) + "\n" +
-				"* " + toString(PhaserMode::PrintOptimisedASTs)
-			).c_str()
-		)
-	;
-	keywordDescription.add(generalDescription);
-
-	po::options_description algorithmDescription("ALGORITHM", lineLength, minDescriptionLength);
-	algorithmDescription.add_options()
-		(
-			"algorithm",
-			po::value<Algorithm>()->value_name("<NAME>")->default_value(Algorithm::GEWEP),
-			(
-				"Algorithm\n"
-				"\n"
-				"AVAILABLE ALGORITHMS:\n"
-				"* " + toString(Algorithm::GEWEP) + "\n" +
-				"* " + toString(Algorithm::Classic) + "\n" +
-				"* " + toString(Algorithm::Random)
-			).c_str()
-		)
-		(
-			"no-randomise-duplicates",
-			po::bool_switch(),
-			"By default, after each round of the algorithm duplicate chromosomes are removed from"
-			"the population and replaced with randomly generated ones. "
-			"This option disables this postprocessing."
-		)
-		(
-			"min-chromosome-length",
-			po::value<size_t>()->value_name("<NUM>")->default_value(100),
-			"Minimum length of randomly generated chromosomes."
-		)
-		(
-			"max-chromosome-length",
-			po::value<size_t>()->value_name("<NUM>")->default_value(100),
-			"Maximum length of randomly generated chromosomes."
-		)
-		(
-			"crossover",
-			po::value<CrossoverChoice>()->value_name("<NAME>")->default_value(CrossoverChoice::Uniform),
-			(
-				"Type of the crossover operator to use.\n"
-				"\n"
-				"AVAILABLE CROSSOVER OPERATORS:\n"
-				"* " + toString(CrossoverChoice::SinglePoint) + "\n" +
-				"* " + toString(CrossoverChoice::TwoPoint) + "\n" +
-				"* " + toString(CrossoverChoice::Uniform)
-			).c_str()
-		)
-		(
-			"uniform-crossover-swap-chance",
-			po::value<double>()->value_name("<PROBABILITY>")->default_value(0.5),
-			"Chance of two genes being swapped between chromosomes in uniform crossover."
-		)
-	;
-	keywordDescription.add(algorithmDescription);
-
-	po::options_description gewepAlgorithmDescription("GEWEP ALGORITHM", lineLength, minDescriptionLength);
-	gewepAlgorithmDescription.add_options()
-		(
-			"gewep-mutation-pool-size",
-			po::value<double>()->value_name("<FRACTION>")->default_value(0.25),
-			"Percentage of population to regenerate using mutations in each round."
-		)
-		(
-			"gewep-crossover-pool-size",
-			po::value<double>()->value_name("<FRACTION>")->default_value(0.25),
-			"Percentage of population to regenerate using crossover in each round."
-		)
-		(
-			"gewep-randomisation-chance",
-			po::value<double>()->value_name("<PROBABILITY>")->default_value(0.9),
-			"The chance of choosing gene randomisation as the mutation to perform."
-		)
-		(
-			"gewep-deletion-vs-addition-chance",
-			po::value<double>()->value_name("<PROBABILITY>")->default_value(0.5),
-			"The chance of choosing gene deletion as the mutation if randomisation was not chosen."
-		)
-		(
-			"gewep-genes-to-randomise",
-			po::value<double>()->value_name("<PROBABILITY>"),
-			"The chance of any given gene being mutated in gene randomisation. "
-			"(default=1/max-chromosome-length)"
-		)
-		(
-			"gewep-genes-to-add-or-delete",
-			po::value<double>()->value_name("<PROBABILITY>"),
-			"The chance of a gene being added (or deleted) in gene addition (or deletion). "
-			"(default=1/max-chromosome-length)"
-		)
-	;
-	keywordDescription.add(gewepAlgorithmDescription);
-
-	po::options_description classicGeneticAlgorithmDescription("CLASSIC GENETIC ALGORITHM", lineLength, minDescriptionLength);
-	classicGeneticAlgorithmDescription.add_options()
-		(
-			"classic-elite-pool-size",
-			po::value<double>()->value_name("<FRACTION>")->default_value(0.25),
-			"Percentage of population to regenerate using mutations in each round."
-		)
-		(
-			"classic-crossover-chance",
-			po::value<double>()->value_name("<FRACTION>")->default_value(0.75),
-			"Chance of a chromosome being selected for crossover."
-		)
-		(
-			"classic-mutation-chance",
-			po::value<double>()->value_name("<FRACTION>")->default_value(0.01),
-			"Chance of a gene being mutated."
-		)
-		(
-			"classic-deletion-chance",
-			po::value<double>()->value_name("<PROBABILITY>")->default_value(0.01),
-			"Chance of a gene being deleted."
-		)
-		(
-			"classic-addition-chance",
-			po::value<double>()->value_name("<PROBABILITY>")->default_value(0.01),
-			"Chance of a random gene being added."
-		)
-	;
-	keywordDescription.add(classicGeneticAlgorithmDescription);
-
-	po::options_description randomAlgorithmDescription("RANDOM ALGORITHM", lineLength, minDescriptionLength);
-	randomAlgorithmDescription.add_options()
-		(
-			"random-elite-pool-size",
-			po::value<double>()->value_name("<FRACTION>"),
-			"Percentage of the population preserved in each round. "
-			"(default=one individual, regardless of population size)"
-		)
-	;
-	keywordDescription.add(randomAlgorithmDescription);
-
-	po::options_description populationDescription("POPULATION", lineLength, minDescriptionLength);
-	populationDescription.add_options()
-		(
-			"population",
-			po::value<vector<string>>()->multitoken()->value_name("<CHROMOSOMES>"),
-			"List of chromosomes to be included in the initial population. "
-			"You can specify multiple values separated with spaces or invoke the option multiple times "
-			"and all the values will be included."
-		)
-		(
-			"random-population",
-			po::value<vector<size_t>>()->value_name("<SIZE>"),
-			"The number of randomly generated chromosomes to be included in the initial population."
-		)
-		(
-			"population-from-file",
-			po::value<vector<string>>()->value_name("<FILE>"),
-			"A text file with a list of chromosomes (one per line) to be included in the initial population."
-		)
-		(
-			"population-autosave",
-			po::value<string>()->value_name("<FILE>"),
-			"If specified, the population is saved in the specified file after each round. (default=autosave disabled)"
-		)
-	;
-	keywordDescription.add(populationDescription);
-
-	po::options_description metricsDescription("METRICS", lineLength, minDescriptionLength);
-	metricsDescription.add_options()
-		(
-			"metric",
-			po::value<MetricChoice>()->value_name("<NAME>")->default_value(MetricChoice::RelativeCodeSize),
-			(
-				"Metric used to evaluate the fitness of a chromosome.\n"
-				"\n"
-				"AVAILABLE METRICS:\n"
-				"* " + toString(MetricChoice::CodeSize) + "\n" +
-				"* " + toString(MetricChoice::RelativeCodeSize)
-			).c_str()
-		)
-		(
-			"metric-aggregator",
-			po::value<MetricAggregatorChoice>()->value_name("<NAME>")->default_value(MetricAggregatorChoice::Average),
-			(
-				"Operator used to combine multiple fitness metric values obtained by evaluating a "
-				"chromosome separately for each input program.\n"
-				"\n"
-				"AVAILABLE METRIC AGGREGATORS:\n"
-				"* " + toString(MetricAggregatorChoice::Average) + "\n" +
-				"* " + toString(MetricAggregatorChoice::Sum) + "\n" +
-				"* " + toString(MetricAggregatorChoice::Maximum) + "\n" +
-				"* " + toString(MetricAggregatorChoice::Minimum)
-			).c_str()
-		)
-		(
-			"relative-metric-scale",
-			po::value<size_t>()->value_name("<EXPONENT>")->default_value(3),
-			"Scaling factor for values produced by relative fitness metrics. \n"
-			"Since all metrics must produce integer values, the fractional part of the result is discarded. "
-			"To keep the numbers meaningful, a relative metric multiples its values by a scaling factor "
-			"and this option specifies the exponent of this factor. "
-			"For example with value of 3 the factor is 10^3 = 1000 and the metric will return "
-			"500 to represent 0.5, 1000 for 1.0, 2000 for 2.0 and so on. "
-			"Using a bigger factor allows discerning smaller relative differences between chromosomes "
-			"but makes the numbers less readable and may also lose precision if the numbers are very large."
-		)
-		(
-			"chromosome-repetitions",
-			po::value<size_t>()->value_name("<COUNT>")->default_value(1),
-			"Number of times to repeat the sequence optimisation steps represented by a chromosome."
-		)
-	;
-	keywordDescription.add(metricsDescription);
-
-	po::options_description metricWeightDescription("METRIC WEIGHTS", lineLength, minDescriptionLength);
-	metricWeightDescription.add_options()
-		// TODO: We need to figure out the best set of weights for the phaser.
-		// This one is just a stopgap to make sure no statement or expression has zero cost.
-		("expression-statement-cost", po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("assignment-cost",           po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("variable-declaration-cost", po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("function-definition-cost",  po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("if-cost",                   po::value<size_t>()->value_name("<COST>")->default_value(2))
-		("switch-cost",               po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("case-cost",                 po::value<size_t>()->value_name("<COST>")->default_value(2))
-		("for-loop-cost",             po::value<size_t>()->value_name("<COST>")->default_value(3))
-		("break-cost",                po::value<size_t>()->value_name("<COST>")->default_value(2))
-		("continue-cost",             po::value<size_t>()->value_name("<COST>")->default_value(2))
-		("leave-cost",                po::value<size_t>()->value_name("<COST>")->default_value(2))
-		("block-cost",                po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("function-call-cost",        po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("identifier-cost",           po::value<size_t>()->value_name("<COST>")->default_value(1))
-		("literal-cost",              po::value<size_t>()->value_name("<COST>")->default_value(1))
-	;
-	keywordDescription.add(metricWeightDescription);
-
-	po::options_description cacheDescription("CACHE", lineLength, minDescriptionLength);
-	cacheDescription.add_options()
-		(
-			"program-cache",
-			po::bool_switch(),
-			"Enables caching of intermediate programs corresponding to chromosome prefixes.\n"
-			"This speeds up fitness evaluation by a lot but eats tons of memory if the chromosomes are long. "
-			"Disabled by default since there's currently no way to set an upper limit on memory usage but "
-			"highly recommended if your computer has enough RAM."
-		)
-	;
-	keywordDescription.add(cacheDescription);
-
-	po::options_description outputDescription("OUTPUT", lineLength, minDescriptionLength);
-	outputDescription.add_options()
-		(
-			"show-initial-population",
-			po::bool_switch(),
-			"Print the state of the population before the algorithm starts."
-		)
-		(
-			"show-only-top-chromosome",
-			po::bool_switch(),
-			"Print only the best chromosome found in each round rather than the whole population."
-		)
-		(
-			"hide-round",
-			po::bool_switch(),
-			"Hide information about the current round (round number and elapsed time)."
-		)
-		(
-			"show-cache-stats",
-			po::bool_switch(),
-			"Print information about cache size and effectiveness after each round."
-		)
-		(
-			"show-seed",
-			po::bool_switch(),
-			"Print the selected random seed."
-		)
-	;
-	keywordDescription.add(outputDescription);
-
-	po::positional_options_description positionalDescription;
-	positionalDescription.add("input-files", -1);
-
-	return {keywordDescription, positionalDescription};
-}
-
-optional<po::variables_map> Phaser::parseCommandLine(int _argc, char** _argv)
-{
-	auto [keywordDescription, positionalDescription] = buildCommandLineDescription();
-
-	po::variables_map arguments;
-	po::notify(arguments);
-
-	po::command_line_parser parser(_argc, _argv);
-	parser.options(keywordDescription).positional(positionalDescription);
-	po::store(parser.run(), arguments);
-
-	if (arguments.count("help") > 0)
-	{
-		cout << keywordDescription << endl;
-		return nullopt;
-	}
-
-	if (arguments.count("input-files") == 0)
-		assertThrow(false, NoInputFiles, "Missing argument: input-files.");
-
-	return arguments;
-}
-
-void Phaser::initialiseRNG(po::variables_map const& _arguments)
-{
-	uint32_t seed;
-	if (_arguments.count("seed") > 0)
-		seed = _arguments["seed"].as<uint32_t>();
-	else
-		seed = SimulationRNG::generateSeed();
-
-	SimulationRNG::reset(seed);
-	if (_arguments["show-seed"].as<bool>())
-		cout << "Random seed: " << seed << endl;
-}
-
-AlgorithmRunner::Options Phaser::buildAlgorithmRunnerOptions(po::variables_map const& _arguments)
-{
-	return {
-		_arguments.count("rounds") > 0 ? static_cast<optional<size_t>>(_arguments["rounds"].as<size_t>()) : nullopt,
-		_arguments.count("population-autosave") > 0 ? static_cast<optional<string>>(_arguments["population-autosave"].as<string>()) : nullopt,
-		!_arguments["no-randomise-duplicates"].as<bool>(),
-		_arguments["min-chromosome-length"].as<size_t>(),
-		_arguments["max-chromosome-length"].as<size_t>(),
-		_arguments["show-initial-population"].as<bool>(),
-		_arguments["show-only-top-chromosome"].as<bool>(),
-		!_arguments["hide-round"].as<bool>(),
-		_arguments["show-cache-stats"].as<bool>(),
-	};
-}
-
-void Phaser::runPhaser(po::variables_map const& _arguments)
-{
-	auto programOptions = ProgramFactory::Options::fromCommandLine(_arguments);
-	auto cacheOptions = ProgramCacheFactory::Options::fromCommandLine(_arguments);
-	auto metricOptions = FitnessMetricFactory::Options::fromCommandLine(_arguments);
-	auto populationOptions = PopulationFactory::Options::fromCommandLine(_arguments);
-
-	vector<Program> programs = ProgramFactory::build(programOptions);
-	vector<shared_ptr<ProgramCache>> programCaches = ProgramCacheFactory::build(cacheOptions, programs);
-	CodeWeights codeWeights = CodeWeightFactory::buildFromCommandLine(_arguments);
-	unique_ptr<FitnessMetric> fitnessMetric = FitnessMetricFactory::build(
-		metricOptions,
-		programs,
-		programCaches,
-		codeWeights
-	);
-	Population population = PopulationFactory::build(populationOptions, std::move(fitnessMetric));
-
-	if (_arguments["mode"].as<PhaserMode>() == PhaserMode::RunAlgorithm)
-		runAlgorithm(_arguments, std::move(population), std::move(programCaches));
-	else
-		printOptimisedProgramsOrASTs(_arguments, population, std::move(programs), _arguments["mode"].as<PhaserMode>());
-}
-
-void Phaser::runAlgorithm(
-	po::variables_map const& _arguments,
-	Population _population,
-	vector<shared_ptr<ProgramCache>> _programCaches
-)
-{
-	auto algorithmOptions = GeneticAlgorithmFactory::Options::fromCommandLine(_arguments);
-
-	unique_ptr<GeneticAlgorithm> geneticAlgorithm = GeneticAlgorithmFactory::build(
-		algorithmOptions,
-		_population.individuals().size()
-	);
-
-	AlgorithmRunner algorithmRunner(std::move(_population), std::move(_programCaches), buildAlgorithmRunnerOptions(_arguments), cout);
-	algorithmRunner.run(*geneticAlgorithm);
-}
-
-void Phaser::printOptimisedProgramsOrASTs(
-	po::variables_map const& _arguments,
-	Population const& _population,
-	vector<Program> _programs,
-	PhaserMode phaserMode
-)
-{
-	assert(phaserMode == PhaserMode::PrintOptimisedPrograms || phaserMode == PhaserMode::PrintOptimisedASTs);
-	assert(_programs.size() == _arguments["input-files"].as<vector<string>>().size());
-
-	if (_population.individuals().size() == 0)
-	{
-		cout << "<EMPTY POPULATION>" << endl;
-		return;
-	}
-
-	vector<string> const& paths = _arguments["input-files"].as<vector<string>>();
-	for (auto& individual: _population.individuals())
-	{
-		cout << "Chromosome: " << individual.chromosome << endl;
-
-		for (size_t i = 0; i < _programs.size(); ++i)
-		{
-			for (size_t j = 0; j < _arguments["chromosome-repetitions"].as<size_t>(); ++j)
-				_programs[i].optimise(individual.chromosome.optimisationSteps());
-
-			cout << "Program: " << paths[i] << endl;
-			if (phaserMode == PhaserMode::PrintOptimisedPrograms)
-				cout << _programs[i] << endl;
-			else
-				cout << _programs[i].toJson() << endl;
-		}
-	}
-}
diff --git a/tools/yulPhaser/Phaser.h b/tools/yulPhaser/Phaser.h
deleted file mode 100644
index 1d5c1cc2d4f6..000000000000
--- a/tools/yulPhaser/Phaser.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Contains the main class that controls yul-phaser based on command-line parameters and
- * associated factories for building instances of phaser's components.
- */
-
-#pragma once
-
-#include <tools/yulPhaser/AlgorithmRunner.h>
-#include <tools/yulPhaser/GeneticAlgorithms.h>
-
-#include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
-
-#include <cstddef>
-#include <istream>
-#include <memory>
-#include <optional>
-#include <ostream>
-#include <string>
-
-namespace solidity::langutil
-{
-
-class CharStream;
-
-}
-
-namespace solidity::yul
-{
-
-struct CodeWeights;
-
-}
-
-namespace solidity::phaser
-{
-
-class FitnessMetric;
-class GeneticAlgorithm;
-class Population;
-class Program;
-class ProgramCache;
-
-enum class PhaserMode
-{
-	RunAlgorithm,
-	PrintOptimisedPrograms,
-	PrintOptimisedASTs,
-};
-
-enum class Algorithm
-{
-	Random,
-	GEWEP,
-	Classic,
-};
-
-enum class MetricChoice
-{
-	CodeSize,
-	RelativeCodeSize,
-};
-
-enum class MetricAggregatorChoice
-{
-	Average,
-	Sum,
-	Maximum,
-	Minimum,
-};
-
-std::istream& operator>>(std::istream& _inputStream, solidity::phaser::PhaserMode& _phaserMode);
-std::ostream& operator<<(std::ostream& _outputStream, solidity::phaser::PhaserMode _phaserMode);
-std::istream& operator>>(std::istream& _inputStream, solidity::phaser::Algorithm& _algorithm);
-std::ostream& operator<<(std::ostream& _outputStream, solidity::phaser::Algorithm _algorithm);
-std::istream& operator>>(std::istream& _inputStream, solidity::phaser::MetricChoice& _metric);
-std::ostream& operator<<(std::ostream& _outputStream, solidity::phaser::MetricChoice _metric);
-std::istream& operator>>(std::istream& _inputStream, solidity::phaser::MetricAggregatorChoice& _aggregator);
-std::ostream& operator<<(std::ostream& _outputStream, solidity::phaser::MetricAggregatorChoice _aggregator);
-std::istream& operator>>(std::istream& _inputStream, solidity::phaser::CrossoverChoice& _crossover);
-std::ostream& operator<<(std::ostream& _outputStream, solidity::phaser::CrossoverChoice _crossover);
-
-/**
- * Builds and validates instances of @a GeneticAlgorithm and its derived classes.
- */
-class GeneticAlgorithmFactory
-{
-public:
-	struct Options
-	{
-		Algorithm algorithm;
-		size_t minChromosomeLength;
-		size_t maxChromosomeLength;
-		CrossoverChoice crossover;
-		double uniformCrossoverSwapChance;
-
-		std::optional<double> randomElitePoolSize;
-
-		double gewepMutationPoolSize;
-		double gewepCrossoverPoolSize;
-		double gewepRandomisationChance;
-		double gewepDeletionVsAdditionChance;
-		std::optional<double> gewepGenesToRandomise;
-		std::optional<double> gewepGenesToAddOrDelete;
-
-		double classicElitePoolSize;
-		double classicCrossoverChance;
-		double classicMutationChance;
-		double classicDeletionChance;
-		double classicAdditionChance;
-
-		static Options fromCommandLine(boost::program_options::variables_map const& _arguments);
-	};
-
-	static std::unique_ptr<GeneticAlgorithm> build(
-		Options const& _options,
-		size_t _populationSize
-	);
-};
-
-/**
- * Builds and validates instances of @a CodeWeights.
- */
-class CodeWeightFactory
-{
-public:
-	static yul::CodeWeights buildFromCommandLine(
-		boost::program_options::variables_map const& _arguments
-	);
-};
-
-/**
- * Builds and validates instances of @a FitnessMetric and its derived classes.
- */
-class FitnessMetricFactory
-{
-public:
-	struct Options
-	{
-		MetricChoice metric;
-		MetricAggregatorChoice metricAggregator;
-		size_t relativeMetricScale;
-		size_t chromosomeRepetitions;
-
-		static Options fromCommandLine(boost::program_options::variables_map const& _arguments);
-	};
-
-	static std::unique_ptr<FitnessMetric> build(
-		Options const& _options,
-		std::vector<Program> _programs,
-		std::vector<std::shared_ptr<ProgramCache>> _programCaches,
-		yul::CodeWeights const& _weights
-	);
-};
-
-/**
- * Builds and validates instances of @a Population.
- */
-class PopulationFactory
-{
-public:
-	struct Options
-	{
-		size_t minChromosomeLength;
-		size_t maxChromosomeLength;
-		std::vector<std::string> population;
-		std::vector<size_t> randomPopulation;
-		std::vector<std::string> populationFromFile;
-
-		static Options fromCommandLine(boost::program_options::variables_map const& _arguments);
-	};
-
-	static Population build(
-		Options const& _options,
-		std::shared_ptr<FitnessMetric> _fitnessMetric
-	);
-	static Population buildFromStrings(
-		std::vector<std::string> const& _geneSequences,
-		std::shared_ptr<FitnessMetric> _fitnessMetric
-	);
-	static Population buildRandom(
-		size_t _populationSize,
-		size_t _minChromosomeLength,
-		size_t _maxChromosomeLength,
-		std::shared_ptr<FitnessMetric> _fitnessMetric
-	);
-	static Population buildFromFile(
-		std::string const& _filePath,
-		std::shared_ptr<FitnessMetric> _fitnessMetric
-	);
-};
-
-/**
- * Builds and validates instances of @a ProgramCache.
- */
-class ProgramCacheFactory
-{
-public:
-	struct Options
-	{
-		bool programCacheEnabled;
-
-		static Options fromCommandLine(boost::program_options::variables_map const& _arguments);
-	};
-
-	static std::vector<std::shared_ptr<ProgramCache>> build(
-		Options const& _options,
-		std::vector<Program> _programs
-	);
-};
-
-/**
- * Builds and validates instances of @a Program.
- */
-class ProgramFactory
-{
-public:
-	struct Options
-	{
-		std::vector<std::string> inputFiles;
-		std::string prefix;
-
-		static Options fromCommandLine(boost::program_options::variables_map const& _arguments);
-	};
-
-	static std::vector<Program> build(Options const& _options);
-
-private:
-	static langutil::CharStream loadSource(boost::filesystem::path const& _sourcePath);
-};
-
-/**
- * Main class that controls yul-phaser based on command-line parameters. The class is responsible
- * for command-line parsing, initialisation of global objects (like the random number generator),
- * creating instances of main components using factories and feeding them into @a AlgorithmRunner.
- */
-class Phaser
-{
-public:
-	static void main(int argc, char** argv);
-
-private:
-	struct CommandLineDescription
-	{
-		boost::program_options::options_description keywordDescription;
-		boost::program_options::positional_options_description positionalDescription;
-	};
-
-	static CommandLineDescription buildCommandLineDescription();
-	static std::optional<boost::program_options::variables_map> parseCommandLine(int _argc, char** _argv);
-	static void initialiseRNG(boost::program_options::variables_map const& _arguments);
-	static AlgorithmRunner::Options buildAlgorithmRunnerOptions(boost::program_options::variables_map const& _arguments);
-
-	static void runPhaser(boost::program_options::variables_map const& _arguments);
-	static void runAlgorithm(
-		boost::program_options::variables_map const& _arguments,
-		Population _population,
-		std::vector<std::shared_ptr<ProgramCache>> _programCaches
-	);
-	static void printOptimisedProgramsOrASTs(
-		boost::program_options::variables_map const& _arguments,
-		Population const& _population,
-		std::vector<Program> _programs,
-		PhaserMode phaserMode
-	);
-};
-
-}
diff --git a/tools/yulPhaser/Population.cpp b/tools/yulPhaser/Population.cpp
deleted file mode 100644
index d4fe1f0bd046..000000000000
--- a/tools/yulPhaser/Population.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Population.h>
-
-#include <tools/yulPhaser/PairSelections.h>
-#include <tools/yulPhaser/Selections.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/CommonIO.h>
-
-#include <algorithm>
-#include <cassert>
-#include <numeric>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::phaser;
-
-namespace solidity::phaser
-{
-
-ostream& operator<<(ostream& _stream, Individual const& _individual);
-ostream& operator<<(ostream& _stream, Population const& _population);
-
-}
-
-ostream& phaser::operator<<(ostream& _stream, Individual const& _individual)
-{
-	_stream << _individual.fitness << " " << _individual.chromosome;
-
-	return _stream;
-}
-
-bool phaser::isFitter(Individual const& a, Individual const& b)
-{
-	return (
-		(a.fitness < b.fitness) ||
-		(a.fitness == b.fitness && a.chromosome.length() < b.chromosome.length()) ||
-		(a.fitness == b.fitness && a.chromosome.length() == b.chromosome.length() && a.chromosome.genes() < b.chromosome.genes())
-	);
-}
-
-Population Population::makeRandom(
-	shared_ptr<FitnessMetric> _fitnessMetric,
-	size_t _size,
-	function<size_t()> _chromosomeLengthGenerator
-)
-{
-	vector<Chromosome> chromosomes;
-	for (size_t i = 0; i < _size; ++i)
-		chromosomes.push_back(Chromosome::makeRandom(_chromosomeLengthGenerator()));
-
-	return Population(std::move(_fitnessMetric), std::move(chromosomes));
-}
-
-Population Population::makeRandom(
-	shared_ptr<FitnessMetric> _fitnessMetric,
-	size_t _size,
-	size_t _minChromosomeLength,
-	size_t _maxChromosomeLength
-)
-{
-	return makeRandom(
-		std::move(_fitnessMetric),
-		_size,
-		std::bind(uniformChromosomeLength, _minChromosomeLength, _maxChromosomeLength)
-	);
-}
-
-Population Population::select(Selection const& _selection) const
-{
-	vector<Individual> selectedIndividuals;
-	for (size_t i: _selection.materialise(m_individuals.size()))
-		selectedIndividuals.emplace_back(m_individuals[i]);
-
-	return Population(m_fitnessMetric, selectedIndividuals);
-}
-
-Population Population::mutate(Selection const& _selection, function<Mutation> _mutation) const
-{
-	vector<Individual> mutatedIndividuals;
-	for (size_t i: _selection.materialise(m_individuals.size()))
-		mutatedIndividuals.emplace_back(_mutation(m_individuals[i].chromosome), *m_fitnessMetric);
-
-	return Population(m_fitnessMetric, mutatedIndividuals);
-}
-
-Population Population::crossover(PairSelection const& _selection, function<Crossover> _crossover) const
-{
-	vector<Individual> crossedIndividuals;
-	for (auto const& [i, j]: _selection.materialise(m_individuals.size()))
-	{
-		auto childChromosome = _crossover(
-			m_individuals[i].chromosome,
-			m_individuals[j].chromosome
-		);
-		crossedIndividuals.emplace_back(std::move(childChromosome), *m_fitnessMetric);
-	}
-
-	return Population(m_fitnessMetric, crossedIndividuals);
-}
-
-tuple<Population, Population> Population::symmetricCrossoverWithRemainder(
-	PairSelection const& _selection,
-	function<SymmetricCrossover> _symmetricCrossover
-) const
-{
-	vector<int> indexSelected(m_individuals.size(), false);
-
-	vector<Individual> crossedIndividuals;
-	for (auto const& [i, j]: _selection.materialise(m_individuals.size()))
-	{
-		auto children = _symmetricCrossover(
-			m_individuals[i].chromosome,
-			m_individuals[j].chromosome
-		);
-		crossedIndividuals.emplace_back(std::move(get<0>(children)), *m_fitnessMetric);
-		crossedIndividuals.emplace_back(std::move(get<1>(children)), *m_fitnessMetric);
-		indexSelected[i] = true;
-		indexSelected[j] = true;
-	}
-
-	vector<Individual> remainder;
-	for (size_t i = 0; i < indexSelected.size(); ++i)
-		if (!indexSelected[i])
-			remainder.emplace_back(m_individuals[i]);
-
-	return {
-		Population(m_fitnessMetric, crossedIndividuals),
-		Population(m_fitnessMetric, remainder),
-	};
-}
-
-namespace solidity::phaser
-{
-
-Population operator+(Population _a, Population _b)
-{
-	// This operator is meant to be used only with populations sharing the same metric (and, to make
-	// things simple, "the same" here means the same exact object in memory).
-	assert(_a.m_fitnessMetric == _b.m_fitnessMetric);
-
-	using ::operator+; // Import the std::vector concat operator from CommonData.h
-	return Population(_a.m_fitnessMetric, std::move(_a.m_individuals) + std::move(_b.m_individuals));
-}
-
-}
-
-Population Population::combine(std::tuple<Population, Population> _populationPair)
-{
-	return get<0>(_populationPair) + get<1>(_populationPair);
-}
-
-bool Population::operator==(Population const& _other) const
-{
-	// We consider populations identical only if they share the same exact instance of the metric.
-	// It might be possible to define some notion of equality for metric objects but it would
-	// be an overkill since mixing populations using different metrics is not a common use case.
-	return m_individuals == _other.m_individuals && m_fitnessMetric == _other.m_fitnessMetric;
-}
-
-ostream& phaser::operator<<(ostream& _stream, Population const& _population)
-{
-	auto individual = _population.m_individuals.begin();
-	for (; individual != _population.m_individuals.end(); ++individual)
-		_stream << *individual << endl;
-
-	return _stream;
-}
-
-vector<Individual> Population::chromosomesToIndividuals(
-	FitnessMetric& _fitnessMetric,
-	vector<Chromosome> _chromosomes
-)
-{
-	vector<Individual> individuals;
-	for (auto& chromosome: _chromosomes)
-		individuals.emplace_back(std::move(chromosome), _fitnessMetric);
-
-	return individuals;
-}
-
-vector<Individual> Population::sortedIndividuals(vector<Individual> _individuals)
-{
-	sort(_individuals.begin(), _individuals.end(), isFitter);
-	return _individuals;
-}
diff --git a/tools/yulPhaser/Population.h b/tools/yulPhaser/Population.h
deleted file mode 100644
index 00c3e0d30335..000000000000
--- a/tools/yulPhaser/Population.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <tools/yulPhaser/Chromosome.h>
-#include <tools/yulPhaser/FitnessMetrics.h>
-#include <tools/yulPhaser/Mutations.h>
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <cstddef>
-#include <optional>
-#include <ostream>
-#include <vector>
-
-namespace solidity::phaser
-{
-
-class PairSelection;
-class Selection;
-
-/**
- * Information describing the state of an individual member of the population during the course
- * of the genetic algorithm.
- */
-struct Individual
-{
-	Chromosome chromosome;
-	size_t fitness;
-
-	Individual(Chromosome _chromosome, size_t _fitness):
-		chromosome(std::move(_chromosome)),
-		fitness(_fitness) {}
-	Individual(Chromosome _chromosome, FitnessMetric& _fitnessMetric):
-		chromosome(std::move(_chromosome)),
-		fitness(_fitnessMetric.evaluate(chromosome)) {}
-
-	bool operator==(Individual const& _other) const { return fitness == _other.fitness && chromosome == _other.chromosome; }
-	bool operator!=(Individual const& _other) const { return !(*this == _other); }
-
-	friend std::ostream& operator<<(std::ostream& _stream, Individual const& _individual);
-};
-
-/// Determines which individual is better by comparing fitness values. If fitness is the same
-/// takes into account all the other properties of the individual to make the comparison
-/// deterministic as long as the individuals are not equal.
-bool isFitter(Individual const& a, Individual const& b);
-
-/**
- * Represents a snapshot of a population undergoing a genetic algorithm. Consists of a set of
- * chromosomes with associated fitness values.
- *
- * An individual is a sequence of optimiser steps represented by a @a Chromosome instance.
- * Individuals are always ordered by their fitness (based on @_fitnessMetric and @a isFitter()).
- * The fitness is computed using the metric as soon as an individual is inserted into the population.
- *
- * The population is immutable. Selections, mutations and crossover work by producing a new
- * instance and copying the individuals.
- */
-class Population
-{
-public:
-	explicit Population(
-		std::shared_ptr<FitnessMetric> _fitnessMetric,
-		std::vector<Chromosome> _chromosomes = {}
-	):
-		Population(
-			_fitnessMetric,
-			chromosomesToIndividuals(*_fitnessMetric, std::move(_chromosomes))
-		) {}
-	explicit Population(std::shared_ptr<FitnessMetric> _fitnessMetric, std::vector<Individual> _individuals):
-		m_fitnessMetric(std::move(_fitnessMetric)),
-		m_individuals{sortedIndividuals(std::move(_individuals))} {}
-
-	static Population makeRandom(
-		std::shared_ptr<FitnessMetric> _fitnessMetric,
-		size_t _size,
-		std::function<size_t()> _chromosomeLengthGenerator
-	);
-	static Population makeRandom(
-		std::shared_ptr<FitnessMetric> _fitnessMetric,
-		size_t _size,
-		size_t _minChromosomeLength,
-		size_t _maxChromosomeLength
-	);
-
-	Population select(Selection const& _selection) const;
-	Population mutate(Selection const& _selection, std::function<Mutation> _mutation) const;
-	Population crossover(PairSelection const& _selection, std::function<Crossover> _crossover) const;
-	std::tuple<Population, Population> symmetricCrossoverWithRemainder(
-		PairSelection const& _selection,
-		std::function<SymmetricCrossover> _symmetricCrossover
-	) const;
-
-	friend Population operator+(Population _a, Population _b);
-	static Population combine(std::tuple<Population, Population> _populationPair);
-
-	std::shared_ptr<FitnessMetric> fitnessMetric() { return m_fitnessMetric; }
-	std::vector<Individual> const& individuals() const { return m_individuals; }
-
-	static size_t uniformChromosomeLength(size_t _min, size_t _max) { return SimulationRNG::uniformInt(_min, _max); }
-	static size_t binomialChromosomeLength(size_t _max) { return SimulationRNG::binomialInt(_max, 0.5); }
-
-	bool operator==(Population const& _other) const;
-	bool operator!=(Population const& _other) const { return !(*this == _other); }
-
-	friend std::ostream& operator<<(std::ostream& _stream, Population const& _population);
-
-private:
-	static std::vector<Individual> chromosomesToIndividuals(
-		FitnessMetric& _fitnessMetric,
-		std::vector<Chromosome> _chromosomes
-	);
-	static std::vector<Individual> sortedIndividuals(std::vector<Individual> _individuals);
-
-	std::shared_ptr<FitnessMetric> m_fitnessMetric;
-	std::vector<Individual> m_individuals;
-};
-
-}
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
deleted file mode 100644
index 3089591ed8ba..000000000000
--- a/tools/yulPhaser/Program.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Program.h>
-
-#include <liblangutil/CharStream.h>
-#include <liblangutil/ErrorReporter.h>
-
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmJsonConverter.h>
-#include <libyul/AsmParser.h>
-#include <libyul/AsmPrinter.h>
-#include <libyul/AST.h>
-#include <libyul/ObjectParser.h>
-#include <libyul/YulString.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/optimiser/Disambiguator.h>
-#include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/Metrics.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/Suite.h>
-
-#include <libsolutil/JSON.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-#include <cassert>
-#include <memory>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::phaser;
-
-namespace solidity::phaser
-{
-
-ostream& operator<<(ostream& _stream, Program const& _program);
-
-}
-
-Program::Program(Program const& program):
-	m_ast(make_unique<Block>(get<Block>(ASTCopier{}(*program.m_ast)))),
-	m_dialect{program.m_dialect},
-	m_nameDispenser(program.m_nameDispenser)
-{
-}
-
-variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
-{
-	// ASSUMPTION: parseSource() rewinds the stream on its own
-	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(EVMVersion{});
-
-	variant<unique_ptr<Block>, ErrorList> astOrErrors = parseObject(dialect, _sourceCode);
-	if (holds_alternative<ErrorList>(astOrErrors))
-		return get<ErrorList>(astOrErrors);
-
-	variant<unique_ptr<AsmAnalysisInfo>, ErrorList> analysisInfoOrErrors = analyzeAST(
-		dialect,
-		*get<unique_ptr<Block>>(astOrErrors)
-	);
-	if (holds_alternative<ErrorList>(analysisInfoOrErrors))
-		return get<ErrorList>(analysisInfoOrErrors);
-
-	Program program(
-		dialect,
-		disambiguateAST(
-			dialect,
-			*get<unique_ptr<Block>>(astOrErrors),
-			*get<unique_ptr<AsmAnalysisInfo>>(analysisInfoOrErrors)
-		)
-	);
-	program.optimise({
-		FunctionHoister::name,
-		FunctionGrouper::name,
-		ForLoopInitRewriter::name,
-	});
-
-	return program;
-}
-
-void Program::optimise(vector<string> const& _optimisationSteps)
-{
-	m_ast = applyOptimisationSteps(m_dialect, m_nameDispenser, std::move(m_ast), _optimisationSteps);
-}
-
-ostream& phaser::operator<<(ostream& _stream, Program const& _program)
-{
-	return _stream << AsmPrinter()(*_program.m_ast);
-}
-
-string Program::toJson() const
-{
-	Json::Value serializedAst = AsmJsonConverter(0)(*m_ast);
-	return jsonPrettyPrint(removeNullMembers(std::move(serializedAst)));
-}
-
-variant<unique_ptr<Block>, ErrorList> Program::parseObject(Dialect const& _dialect, CharStream _source)
-{
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	auto scanner = make_shared<Scanner>(_source);
-
-	ObjectParser parser(errorReporter, _dialect);
-	shared_ptr<Object> object = parser.parse(scanner, false);
-	if (object == nullptr || !errorReporter.errors().empty())
-		// NOTE: It's possible to get errors even if the returned object is non-null.
-		// For example when there are errors in a nested object.
-		return errors;
-
-	Object* deployedObject = nullptr;
-	if (object->subObjects.size() > 0)
-		for (auto& subObject: object->subObjects)
-			// solc --ir produces an object with a subobject of the same name as the outer object
-			// but suffixed with  "_deployed".
-			// The other object references the nested one which makes analysis fail. Below we try to
-			// extract just the nested one for that reason. This is just a heuristic. If there's no
-			// subobject with such a suffix we fall back to accepting the whole object as is.
-			if (subObject != nullptr && subObject->name.str() == object->name.str() + "_deployed")
-			{
-				deployedObject = dynamic_cast<Object*>(subObject.get());
-				if (deployedObject != nullptr)
-					break;
-			}
-	Object* selectedObject = (deployedObject != nullptr ? deployedObject : object.get());
-
-	// NOTE: I'm making a copy of the whole AST to get unique_ptr rather than shared_ptr.
-	// This is a slight performance hit but it's much less than the parsing itself.
-	// unique_ptr lets me be sure that two Program instances can never share the AST by mistake.
-	// The public API of the class does not provide access to the smart pointer so it won't be hard
-	// to switch to shared_ptr if the copying turns out to be an issue (though it would be better
-	// to refactor ObjectParser and Object to use unique_ptr instead).
-	auto astCopy = make_unique<Block>(get<Block>(ASTCopier{}(*selectedObject->code)));
-
-	return variant<unique_ptr<Block>, ErrorList>(std::move(astCopy));
-}
-
-variant<unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect const& _dialect, Block const& _ast)
-{
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	auto analysisInfo = make_unique<AsmAnalysisInfo>();
-	AsmAnalyzer analyzer(*analysisInfo, errorReporter, _dialect);
-
-	bool analysisSuccessful = analyzer.analyze(_ast);
-	if (!analysisSuccessful)
-		return errors;
-
-	assert(errorReporter.errors().empty());
-	return variant<unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
-}
-
-unique_ptr<Block> Program::disambiguateAST(
-	Dialect const& _dialect,
-	Block const& _ast,
-	AsmAnalysisInfo const& _analysisInfo
-)
-{
-	set<YulString> const externallyUsedIdentifiers = {};
-	Disambiguator disambiguator(_dialect, _analysisInfo, externallyUsedIdentifiers);
-
-	return make_unique<Block>(get<Block>(disambiguator(_ast)));
-}
-
-unique_ptr<Block> Program::applyOptimisationSteps(
-	Dialect const& _dialect,
-	NameDispenser& _nameDispenser,
-	unique_ptr<Block> _ast,
-	vector<string> const& _optimisationSteps
-)
-{
-	// An empty set of reserved identifiers. It could be a constructor parameter but I don't
-	// think it would be useful in this tool. Other tools (like yulopti) have it empty too.
-	set<YulString> const externallyUsedIdentifiers = {};
-	OptimiserStepContext context{
-		_dialect,
-		_nameDispenser,
-		externallyUsedIdentifiers,
-		frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-	};
-
-	for (string const& step: _optimisationSteps)
-		OptimiserSuite::allSteps().at(step)->run(context, *_ast);
-
-	return _ast;
-}
-
-size_t Program::computeCodeSize(Block const& _ast, CodeWeights const& _weights)
-{
-	return CodeSize::codeSizeIncludingFunctions(_ast, _weights);
-}
diff --git a/tools/yulPhaser/Program.h b/tools/yulPhaser/Program.h
deleted file mode 100644
index e42471d77947..000000000000
--- a/tools/yulPhaser/Program.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AST.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <cstddef>
-#include <optional>
-#include <ostream>
-#include <set>
-#include <string>
-#include <variant>
-#include <vector>
-
-namespace solidity::langutil
-{
-
-class CharStream;
-class Scanner;
-
-}
-
-namespace solidity::yul
-{
-
-struct AsmAnalysisInfo;
-struct Dialect;
-struct CodeWeights;
-
-}
-
-namespace solidity::phaser
-{
-
-/**
- * Class representing parsed and analysed Yul program that we can apply optimisations to.
- * The program is already disambiguated and has several prerequisite optimiser steps applied to it
- * so that the requirements of any possible step that could be later applied by the user are
- * already satisfied.
- *
- * The class allows the user to apply extra optimisations and obtain metrics and general
- * information about the resulting syntax tree.
- */
-class Program
-{
-public:
-	Program(Program const& program);
-	Program(Program&& program):
-		m_ast(std::move(program.m_ast)),
-		m_dialect{program.m_dialect},
-		m_nameDispenser(std::move(program.m_nameDispenser))
-	{}
-	Program operator=(Program const& program) = delete;
-	Program operator=(Program&& program) = delete;
-
-	static std::variant<Program, langutil::ErrorList> load(langutil::CharStream& _sourceCode);
-	void optimise(std::vector<std::string> const& _optimisationSteps);
-
-	size_t codeSize(yul::CodeWeights const& _weights) const { return computeCodeSize(*m_ast, _weights); }
-	yul::Block const& ast() const { return *m_ast; }
-
-	friend std::ostream& operator<<(std::ostream& _stream, Program const& _program);
-	std::string toJson() const;
-
-private:
-	Program(
-		yul::Dialect const& _dialect,
-		std::unique_ptr<yul::Block> _ast
-	):
-		m_ast(std::move(_ast)),
-		m_dialect{_dialect},
-		m_nameDispenser(_dialect, *m_ast, {})
-	{}
-
-	static std::variant<std::unique_ptr<yul::Block>, langutil::ErrorList> parseObject(
-		yul::Dialect const& _dialect,
-		langutil::CharStream _source
-	);
-	static std::variant<std::unique_ptr<yul::AsmAnalysisInfo>, langutil::ErrorList> analyzeAST(
-		yul::Dialect const& _dialect,
-		yul::Block const& _ast
-	);
-	static std::unique_ptr<yul::Block> disambiguateAST(
-		yul::Dialect const& _dialect,
-		yul::Block const& _ast,
-		yul::AsmAnalysisInfo const& _analysisInfo
-	);
-	static std::unique_ptr<yul::Block> applyOptimisationSteps(
-		yul::Dialect const& _dialect,
-		yul::NameDispenser& _nameDispenser,
-		std::unique_ptr<yul::Block> _ast,
-		std::vector<std::string> const& _optimisationSteps
-	);
-	static size_t computeCodeSize(yul::Block const& _ast, yul::CodeWeights const& _weights);
-
-	std::unique_ptr<yul::Block> m_ast;
-	yul::Dialect const& m_dialect;
-	yul::NameDispenser m_nameDispenser;
-};
-
-}
diff --git a/tools/yulPhaser/ProgramCache.cpp b/tools/yulPhaser/ProgramCache.cpp
deleted file mode 100644
index 351532aa74fa..000000000000
--- a/tools/yulPhaser/ProgramCache.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/ProgramCache.h>
-
-#include <libyul/optimiser/Metrics.h>
-
-#include <libyul/optimiser/Suite.h>
-
-using namespace std;
-using namespace solidity::yul;
-using namespace solidity::phaser;
-
-CacheStats& CacheStats::operator+=(CacheStats const& _other)
-{
-	hits += _other.hits;
-	misses += _other.misses;
-	totalCodeSize += _other.totalCodeSize;
-
-	for (auto& [round, count]: _other.roundEntryCounts)
-		if (roundEntryCounts.find(round) != roundEntryCounts.end())
-			roundEntryCounts.at(round) += count;
-		else
-			roundEntryCounts.insert({round, count});
-
-	return *this;
-}
-
-bool CacheStats::operator==(CacheStats const& _other) const
-{
-	return
-		hits == _other.hits &&
-		misses == _other.misses &&
-		totalCodeSize == _other.totalCodeSize &&
-		roundEntryCounts == _other.roundEntryCounts;
-}
-
-Program ProgramCache::optimiseProgram(
-	string const& _abbreviatedOptimisationSteps,
-	size_t _repetitionCount
-)
-{
-	string targetOptimisations = _abbreviatedOptimisationSteps;
-	for (size_t i = 1; i < _repetitionCount; ++i)
-		targetOptimisations += _abbreviatedOptimisationSteps;
-
-	size_t prefixSize = 0;
-	for (size_t i = 1; i <= targetOptimisations.size(); ++i)
-	{
-		auto const& pair = m_entries.find(targetOptimisations.substr(0, i));
-		if (pair != m_entries.end())
-		{
-			pair->second.roundNumber = m_currentRound;
-			++prefixSize;
-			++m_hits;
-		}
-		else
-			break;
-	}
-
-	Program intermediateProgram = (
-		prefixSize == 0 ?
-		m_program :
-		m_entries.at(targetOptimisations.substr(0, prefixSize)).program
-	);
-
-	for (size_t i = prefixSize + 1; i <= targetOptimisations.size(); ++i)
-	{
-		string stepName = OptimiserSuite::stepAbbreviationToNameMap().at(targetOptimisations[i - 1]);
-		intermediateProgram.optimise({stepName});
-
-		m_entries.insert({targetOptimisations.substr(0, i), {intermediateProgram, m_currentRound}});
-		++m_misses;
-	}
-
-	return intermediateProgram;
-}
-
-void ProgramCache::startRound(size_t _roundNumber)
-{
-	assert(_roundNumber > m_currentRound);
-	m_currentRound = _roundNumber;
-
-	for (auto pair = m_entries.begin(); pair != m_entries.end();)
-	{
-		assert(pair->second.roundNumber < m_currentRound);
-
-		if (pair->second.roundNumber < m_currentRound - 1)
-			m_entries.erase(pair++);
-		else
-			++pair;
-	}
-}
-
-void ProgramCache::clear()
-{
-	m_entries.clear();
-	m_currentRound = 0;
-}
-
-Program const* ProgramCache::find(string const& _abbreviatedOptimisationSteps) const
-{
-	auto const& pair = m_entries.find(_abbreviatedOptimisationSteps);
-	if (pair == m_entries.end())
-		return nullptr;
-
-	return &(pair->second.program);
-}
-
-CacheStats ProgramCache::gatherStats() const
-{
-	return {
-		/* hits = */ m_hits,
-		/* misses = */ m_misses,
-		/* totalCodeSize = */ calculateTotalCachedCodeSize(),
-		/* roundEntryCounts = */ countRoundEntries(),
-	};
-}
-
-size_t ProgramCache::calculateTotalCachedCodeSize() const
-{
-	size_t size = 0;
-	for (auto const& pair: m_entries)
-		size += pair.second.program.codeSize(CacheStats::StorageWeights);
-
-	return size;
-}
-
-map<size_t, size_t> ProgramCache::countRoundEntries() const
-{
-	map<size_t, size_t> counts;
-	for (auto& pair: m_entries)
-		if (counts.find(pair.second.roundNumber) != counts.end())
-			++counts.at(pair.second.roundNumber);
-		else
-			counts.insert({pair.second.roundNumber, 1});
-
-	return counts;
-}
diff --git a/tools/yulPhaser/ProgramCache.h b/tools/yulPhaser/ProgramCache.h
deleted file mode 100644
index d7eb70d631ea..000000000000
--- a/tools/yulPhaser/ProgramCache.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <tools/yulPhaser/Program.h>
-
-#include <libyul/optimiser/Metrics.h>
-
-#include <cstddef>
-#include <map>
-#include <string>
-
-namespace solidity::phaser
-{
-
-/**
- * Structure used by @a ProgramCache to store intermediate programs and metadata associated
- * with them.
- */
-struct CacheEntry
-{
-	Program program;
-	size_t roundNumber;
-
-	CacheEntry(Program _program, size_t _roundNumber):
-		program(std::move(_program)),
-		roundNumber(_roundNumber) {}
-};
-
-/**
- * Stores statistics about current cache usage.
- */
-struct CacheStats
-{
-	/// Weights used to compute totalCodeSize.
-	/// The goal here is to get a result proportional to the amount of memory taken by the AST.
-	/// Each statement/expression gets 1 just for existing. We add more if it contains any extra
-	/// data that won't be visited separately by ASTWalker.
-	static yul::CodeWeights constexpr StorageWeights = {
-		/* expressionStatementCost = */ 1,
-		/* assignmentCost = */ 1,
-		/* variableDeclarationCost = */ 1,
-		/* functionDefinitionCost = */ 1,
-		/* ifCost = */ 1,
-		/* switchCost = */ 1,
-		/* caseCost = */ 1,
-		/* forLoopCost = */ 1,
-		/* breakCost = */ 1,
-		/* continueCost = */ 1,
-		/* leaveCost = */ 1,
-		/* blockCost = */ 1,
-
-		/* functionCallCost = */ 1,
-		/* identifierCost = */ 1,
-		/* literalCost = */ 1,
-	};
-
-	size_t hits;
-	size_t misses;
-	size_t totalCodeSize;
-	std::map<size_t, size_t> roundEntryCounts;
-
-	CacheStats& operator+=(CacheStats const& _other);
-	CacheStats operator+(CacheStats const& _other) const { return CacheStats(*this) += _other; }
-
-	bool operator==(CacheStats const& _other) const;
-	bool operator!=(CacheStats const& _other) const { return !(*this == _other); }
-};
-
-/**
- * Class that optimises programs one step at a time which allows it to store and later reuse the
- * results of the intermediate steps.
- *
- * The cache keeps track of the current round number and associates newly created entries with it.
- * @a startRound() must be called at the beginning of a round so that entries that are too old
- * can be purged. The current strategy is to store programs corresponding to all possible prefixes
- * encountered in the current and the previous rounds. Entries older than that get removed to
- * conserve memory.
- *
- * @a gatherStats() allows getting statistics useful for determining cache effectiveness.
- *
- * The current strategy does speed things up (about 4:1 hit:miss ratio observed in my limited
- * experiments) but there's room for improvement. We could fit more useful programs in
- * the cache by being more picky about which ones we choose.
- *
- * There is currently no way to purge entries without starting a new round. Since the programs
- * take a lot of memory, this may lead to the cache eating up all the available RAM if sequences are
- * long and programs large. A limiter based on entry count or total program size would be useful.
- */
-class ProgramCache
-{
-public:
-	explicit ProgramCache(Program _program):
-		m_program(std::move(_program)) {}
-
-	Program optimiseProgram(
-		std::string const& _abbreviatedOptimisationSteps,
-		size_t _repetitionCount = 1
-	);
-	void startRound(size_t _nextRoundNumber);
-	void clear();
-
-	size_t size() const { return m_entries.size(); }
-	Program const* find(std::string const& _abbreviatedOptimisationSteps) const;
-	bool contains(std::string const& _abbreviatedOptimisationSteps) const { return find(_abbreviatedOptimisationSteps) != nullptr; }
-
-	CacheStats gatherStats() const;
-
-	std::map<std::string, CacheEntry> const& entries() const { return m_entries; }
-	Program const& program() const { return m_program; }
-	size_t currentRound() const { return m_currentRound; }
-
-private:
-	size_t calculateTotalCachedCodeSize() const;
-	std::map<size_t, size_t> countRoundEntries() const;
-
-	// The best matching data structure here would be a trie of chromosome prefixes but since
-	// the programs are orders of magnitude larger than the prefixes, it does not really matter.
-	// A map should be good enough.
-	std::map<std::string, CacheEntry> m_entries;
-
-	Program m_program;
-	size_t m_currentRound = 0;
-	size_t m_hits = 0;
-	size_t m_misses = 0;
-};
-
-}
diff --git a/tools/yulPhaser/README.md b/tools/yulPhaser/README.md
deleted file mode 100644
index 99004d4c93cc..000000000000
--- a/tools/yulPhaser/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-## yul-phaser
-`yul-phaser` is an internal tool for finding good sequences of [optimisation steps](/libyul/optimiser/README.md) for Yul optimiser.
-
-### How it works
-The space of possible solutions to this problem (usually referred to as _phase-ordering problem_) is extremely large and there may even be no single sequence that produces optimal results for all possible programs.
-
-The tool uses genetic algorithms to find sequences that result in better programs than others and to iteratively refine them.
-The input is a set of one or more [Yul](/docs/yul.rst) programs and each sequence is applied to all of these programs.
-Optimised programs are given numeric scores according to the selected metric.
-
-Optimisation step sequences are presented in an abbreviated form - as strings of letters where each character represents one step.
-There's a [table listing available abbreviations in the optimiser docs](/docs/yul.rst#optimization-step-sequence).
-
-### How to use it
-The application has sensible defaults for most parameters.
-An invocation can be as simple as:
-
-``` bash
-tools/yul-phaser ../test/libyul/yulOptimizerTests/fullSuite/*.yul \
-    --random-population 100
-```
-
-This assumes that you have a working copy of the Solidity repository and you're in the build directory within that working copy.
-
-Run `yul-phaser --help` for a full list of available options.
-
-#### Restarting from a previous state
-`yul-phaser` can save the list of sequences found after each round:
-
-``` bash
-tools/yul-phaser *.yul        \
-    --random-population   100 \
-    --population-autosave /tmp/population.txt
-```
-
-If you stop the application, you can later use the file to continue the search from the point you left off:
-
-``` bash
-tools/yul-phaser *.yul                         \
-    --population-from-file /tmp/population.txt \
-    --population-autosave  /tmp/population.txt
-```
-
-#### Analysing a sequence
-Apart from running the genetic algorithm, `yul-phaser` can also provide useful information about a particular sequence.
-
-For example, to see the value of a particular metric for a given sequence and program run:
-``` bash
-tools/yul-phaser *.yul            \
-    --show-initial-population     \
-    --rounds            0         \
-    --metric            code-size \
-    --metric-aggregator sum       \
-    --population        <your sequence>
-```
-
-You can also easily see program code after being optimised using that sequence:
-``` bash
-tools/yul-phaser *.yul                    \
-    --rounds     0                        \
-    --mode       print-optimised-programs \
-    --population <your sequence>
-```
-
-#### Using output from Solidity compiler
-`yul-phaser` can process the intermediate representation produced by `solc`:
-
-``` bash
-solc/solc <sol file> --ir --output-dir <output directory>
-```
-
-After running this command you'll find one or more .yul files in the output directory.
-These files contain whole Yul objects rather than just raw Yul programs but `yul-phaser` is prepared to handle them too.
-
-#### Using optimisation step sequences with the compiler
-You can tell Yul optimiser to use a specific sequence for your code by passing `--yul-optimizations` option to `solc`:
-
-``` bash
-solc/solc <sol file> --optimize --ir-optimized --yul-optimizations <sequence>
-```
-
-### How to choose good parameters
-Choosing good parameters for a genetic algorithm is not a trivial task but phaser's defaults are generally enough to find a sequence that gives results comparable or better than one hand-crafted by an experienced developer for a given set of programs.
-The difficult part is providing a fairly representative set of input files.
-If the files you give do not need certain optimisations the tool will find sequences that do not use these optimisations and perform badly for programs that could benefit from them.
-If all the provided files greatly benefit from a specific optimisation, the sequence may not work well for programs that do not.
-
-We have conducted [a set of rough experiments](https://github.com/ethereum/solidity/issues/7806#issuecomment-598644491) to evaluate some combinations of parameter values.
-The conclusions were used to adjust the defaults but you might still benefit from some general observations:
-
-1. The algorithm that performed the best was `GEWEP`.
-2. Using longer sequences in the initial population yields better results. The algorithm is good at removing superfluous steps.
-3. Preserving the top sequences from previous rounds improves results. Elite should contain at least a few individuals, especially when using the `classic` algorithm.
-4. Do not set mutation/deletion/addition chance too high. It makes results worse because it destroys the good patterns preserved by crossover. Values around 1-5% seem to work best.
-5. Keep the algorithm running for 1000 rounds or more. It usually finds good sequences faster than that but it can shorten them significantly if you let it run longer. This is especially important when starting with long sequences.
diff --git a/tools/yulPhaser/Selections.cpp b/tools/yulPhaser/Selections.cpp
deleted file mode 100644
index 5c55706454a9..000000000000
--- a/tools/yulPhaser/Selections.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Selections.h>
-
-#include <tools/yulPhaser/SimulationRNG.h>
-
-#include <cmath>
-#include <numeric>
-
-using namespace std;
-using namespace solidity::phaser;
-
-vector<size_t> RangeSelection::materialise(size_t _poolSize) const
-{
-	size_t beginIndex = static_cast<size_t>(round(double(_poolSize) * m_startPercent));
-	size_t endIndex = static_cast<size_t>(round(double(_poolSize) * m_endPercent));
-	vector<size_t> selection;
-
-	for (size_t i = beginIndex; i < endIndex; ++i)
-		selection.push_back(i);
-
-	return selection;
-}
-
-vector<size_t> MosaicSelection::materialise(size_t _poolSize) const
-{
-	size_t count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
-
-	vector<size_t> selection;
-	for (size_t i = 0; i < count; ++i)
-		selection.push_back(min(m_pattern[i % m_pattern.size()], _poolSize - 1));
-
-	return selection;
-}
-
-vector<size_t> RandomSelection::materialise(size_t _poolSize) const
-{
-	size_t count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
-
-	vector<size_t> selection;
-	for (size_t i = 0; i < count; ++i)
-		selection.push_back(SimulationRNG::uniformInt(0, _poolSize - 1));
-
-	return selection;
-}
-
-vector<size_t> RandomSubset::materialise(size_t _poolSize) const
-{
-	vector<size_t> selection;
-	for (size_t index = 0; index < _poolSize; ++index)
-		if (SimulationRNG::bernoulliTrial(m_selectionChance))
-			selection.push_back(index);
-
-	return selection;
-}
diff --git a/tools/yulPhaser/Selections.h b/tools/yulPhaser/Selections.h
deleted file mode 100644
index bd51cfe78ed0..000000000000
--- a/tools/yulPhaser/Selections.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-/**
- * Contains an abstract base class representing a selection of elements from a collection
- * and its concrete implementations.
- */
-
-#pragma once
-
-#include <cassert>
-#include <cstddef>
-#include <vector>
-
-namespace solidity::phaser
-{
-
-/**
- * Abstract base class for selections of elements from a collection.
- *
- * An instance of this class represents a specific method of selecting a set of elements from
- * containers of arbitrary sizes. The set of selected elements is always a subset of the container
- * but may indicate the same element more than once. The selection may or may not be fixed - it's
- * up to a specific implementation whether subsequent calls for the same container produce the same
- * indices or not.
- *
- * Derived classes are meant to override the @a materialise() method.
- * This method is expected to produce indices of selected elements given the size of the collection.
- */
-class Selection
-{
-public:
-	Selection() = default;
-	Selection(Selection const&) = delete;
-	Selection& operator=(Selection const&) = delete;
-	virtual ~Selection() = default;
-
-	virtual std::vector<size_t> materialise(size_t _poolSize) const = 0;
-};
-
-/**
- * A selection that selects a contiguous slice of the container. Start and end of this part are
- * specified as percentages of its size.
- */
-class RangeSelection: public Selection
-{
-public:
-	explicit RangeSelection(double _startPercent = 0.0, double _endPercent = 1.0):
-		m_startPercent(_startPercent),
-		m_endPercent(_endPercent)
-	{
-		assert(0 <= m_startPercent && m_startPercent <= m_endPercent && m_endPercent <= 1.0);
-	}
-
-	std::vector<size_t> materialise(size_t _poolSize) const override;
-
-private:
-	double m_startPercent;
-	double m_endPercent;
-};
-
-/**
- * A selection that selects elements at specific, fixed positions indicated by a repeating "pattern".
- * If the positions in the pattern exceed the size of the container, they are capped at the maximum
- * available position. Always selects as many elements as the size of the container multiplied by
- * @a _selectionSize (unless the container is empty).
- *
- * E.g. if the pattern is {0, 9} and collection size is 5, the selection will materialise into
- * {0, 4, 0, 4, 0}. If the size is 3, it will be {0, 2, 0}.
- */
-class MosaicSelection: public Selection
-{
-public:
-	explicit MosaicSelection(std::vector<size_t> _pattern, double _selectionSize = 1.0):
-		m_pattern(std::move(_pattern)),
-		m_selectionSize(_selectionSize)
-	{
-		assert(m_pattern.size() > 0 || _selectionSize == 0.0);
-	}
-
-	std::vector<size_t> materialise(size_t _poolSize) const override;
-
-private:
-	std::vector<size_t> m_pattern;
-	double m_selectionSize;
-};
-
-/**
- * A selection that randomly selects elements from a container. The resulting set of indices may
- * contain duplicates and is different on each call to @a materialise(). Always selects as many
- * elements as the size of the container multiplied by @a _selectionSize (unless the container is
- * empty).
- */
-class RandomSelection: public Selection
-{
-public:
-	explicit RandomSelection(double _selectionSize):
-		m_selectionSize(_selectionSize)
-	{
-		assert(_selectionSize >= 0);
-	}
-
-	std::vector<size_t> materialise(size_t _poolSize) const override;
-
-private:
-	double m_selectionSize;
-};
-
-/**
- * A selection that goes over all elements in a container, for each one independently deciding
- * whether to select it or not. Each element has the same chance of being selected and can be
- * selected at most once. The order of selected elements is the same as the order of elements in
- * the container. The number of selected elements is random and can be different with each call
- * to @a materialise().
- */
-class RandomSubset: public Selection
-{
-public:
-	explicit RandomSubset(double _selectionChance):
-		m_selectionChance(_selectionChance)
-	{
-		assert(0.0 <= _selectionChance && _selectionChance <= 1.0);
-	}
-
-	std::vector<size_t> materialise(size_t _poolSize) const override;
-
-private:
-	double m_selectionChance;
-};
-
-}
diff --git a/tools/yulPhaser/SimulationRNG.cpp b/tools/yulPhaser/SimulationRNG.cpp
deleted file mode 100644
index 5fca4d99e5eb..000000000000
--- a/tools/yulPhaser/SimulationRNG.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/SimulationRNG.h>
-
-// NOTE: The code would work with std::random but the results for a given seed would not be reproducible
-// across different STL implementations. Boost does not guarantee this either but at least it has only one
-// implementation. Reproducibility is not a hard requirement for yul-phaser but it's nice to have.
-#include <boost/random/bernoulli_distribution.hpp>
-#include <boost/random/binomial_distribution.hpp>
-#include <boost/random/uniform_int_distribution.hpp>
-
-#include <ctime>
-#include <limits>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::phaser;
-
-thread_local boost::random::mt19937 SimulationRNG::s_generator(SimulationRNG::generateSeed());
-
-bool SimulationRNG::bernoulliTrial(double _successProbability)
-{
-	boost::random::bernoulli_distribution<double> distribution(_successProbability);
-
-	return distribution(s_generator);
-}
-
-size_t SimulationRNG::uniformInt(size_t _min, size_t _max)
-{
-	boost::random::uniform_int_distribution<size_t> distribution(_min, _max);
-	return distribution(s_generator);
-}
-
-size_t SimulationRNG::binomialInt(size_t _numTrials, double _successProbability)
-{
-	// NOTE: binomial_distribution<size_t> would not work because it internally tries to use abs()
-	// and fails to compile due to ambiguous conversion.
-	assert(_numTrials <= static_cast<size_t>(numeric_limits<long>::max()));
-
-	boost::random::binomial_distribution<long> distribution(static_cast<long>(_numTrials), _successProbability);
-	return static_cast<size_t>(distribution(s_generator));
-}
-
-uint32_t SimulationRNG::generateSeed()
-{
-	// This is not a secure way to seed the generator but it's good enough for simulation purposes.
-	// The only thing that matters for us is that the sequence is different on each run and that
-	// it fits the expected distribution. It does not have to be 100% unpredictable.
-	return static_cast<uint32_t>(time(nullptr));
-}
diff --git a/tools/yulPhaser/SimulationRNG.h b/tools/yulPhaser/SimulationRNG.h
deleted file mode 100644
index b36aeba24677..000000000000
--- a/tools/yulPhaser/SimulationRNG.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#pragma once
-
-#include <boost/random/mersenne_twister.hpp>
-
-#include <cstddef>
-#include <cstdint>
-
-namespace solidity::phaser
-{
-
-/**
- * A class that provides functions for generating random numbers good enough for simulation purposes.
- *
- * The functions share a common instance of the generator which can be reset with a known seed
- * to deterministically generate a given sequence of numbers. Initially the generator is seeded with
- * a value from @a generateSeed() which is different on each run.
- *
- * The numbers are not cryptographically secure so do not use this for anything that requires
- * them to be truly unpredictable.
- */
-class SimulationRNG
-{
-public:
-	static bool bernoulliTrial(double _successProbability);
-	static size_t uniformInt(size_t _min, size_t _max);
-	static size_t binomialInt(size_t _numTrials, double _successProbability);
-
-	/// Resets generator to a known state given by the @a seed. Given the same seed, a fixed
-	/// sequence of calls to the members generating random values is guaranteed to produce the
-	/// same results.
-	static void reset(uint32_t seed) { s_generator = boost::random::mt19937(seed); }
-
-	/// Generates a seed that's different on each run of the program.
-	/// Does **not** use the generator and is not affected by @a reset().
-	static uint32_t generateSeed();
-
-private:
-	thread_local static boost::random::mt19937 s_generator;
-};
-
-}
diff --git a/tools/yulPhaser/main.cpp b/tools/yulPhaser/main.cpp
deleted file mode 100644
index 21502b525f9a..000000000000
--- a/tools/yulPhaser/main.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-	This file is part of solidity.
-
-	solidity is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	solidity is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// SPDX-License-Identifier: GPL-3.0
-
-#include <tools/yulPhaser/Exceptions.h>
-#include <tools/yulPhaser/Phaser.h>
-
-#include <libsolutil/Exceptions.h>
-
-#include <iostream>
-
-int main(int argc, char** argv)
-{
-	try
-	{
-		solidity::phaser::Phaser::main(argc, argv);
-		return 0;
-	}
-	catch (boost::program_options::error const& exception)
-	{
-		// Bad input data. Invalid command-line parameters.
-
-		std::cerr << std::endl;
-		std::cerr << "ERROR: " << exception.what() << std::endl;
-		return 2;
-	}
-	catch (solidity::phaser::BadInput const& exception)
-	{
-		// Bad input data. Syntax errors in the input program, semantic errors in command-line
-		// parameters, etc.
-
-		std::cerr << std::endl;
-		std::cerr << "ERROR: " << exception.what() << std::endl;
-		return 2;
-	}
-	catch (...)
-	{
-		std::cerr << "Uncaught exception:" << std::endl;
-		std::cerr << boost::current_exception_diagnostic_information() << std::endl;
-		return 2;
-	}
-}
diff --git a/translation-bot.json b/translation-bot.json
new file mode 100644
index 000000000000..ef199dcac1b5
--- /dev/null
+++ b/translation-bot.json
@@ -0,0 +1,3 @@
+{
+    "disabled": false
+}